$out/nix-support/setup-hook
+ if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi
+ EOF
+ '';
+
+ postFixup = ''
+ # Build the set of output library directories to rpath against
+ LIBDIRS=""
+ for output in $outputs; do
+ if [ "$output" = debug ]; then continue; fi
+ LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS"
+ done
+ # Add the local library paths to remove dependencies on the bootstrap
+ for output in $outputs; do
+ if [ "$output" = debug ]; then continue; fi
+ OUTPUTDIR=$(eval echo \$$output)
+ BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
+ echo "$BINLIBS" | while read i; do
+ patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true
+ patchelf --shrink-rpath "$i" || true
+ done
+ done
+ '';
+
+ disallowedReferences = [ openjdk13-bootstrap ];
+
+ meta = with stdenv.lib; {
+ homepage = http://openjdk.java.net/;
+ license = licenses.gpl2;
+ description = "The open-source Java Development Kit";
+ maintainers = with maintainers; [ edwtjo ];
+ platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
+ };
+
+ passthru = {
+ architecture = "";
+ home = "${openjdk}/lib/openjdk";
+ };
+ };
+in openjdk
diff --git a/pkgs/development/compilers/openjdk/darwin/default.nix b/pkgs/development/compilers/openjdk/darwin/default.nix
index 775fd3cd3c43..c6498cb45302 100644
--- a/pkgs/development/compilers/openjdk/darwin/default.nix
+++ b/pkgs/development/compilers/openjdk/darwin/default.nix
@@ -7,11 +7,11 @@ let
};
jdk = stdenv.mkDerivation rec {
- name = "zulu13.29.9-ca-jdk13.0.2";
+ name = "zulu14.28.21-ca-jdk14.0.1";
src = fetchurl {
url = "https://cdn.azul.com/zulu/bin/${name}-macosx_x64.tar.gz";
- sha256 = "1x8ja3x880a1izrwi7bdrwz1ljdvracjx627slzjd2xk8c4211pf";
+ sha256 = "1pc0y3fxhlf42a51qbdha1fabci61yzq70kk5c1rzk0ai78d92q8";
curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/";
};
diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index b3842ba7cad2..063976d8765f 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, bash, pkgconfig, autoconf, cpio, file, which, unzip
, zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2
, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
-, libXcursor, libXrandr, fontconfig, openjdk13-bootstrap
+, libXcursor, libXrandr, fontconfig, openjdk14-bootstrap
, setJavaClassPath
, headless ? false
, enableJavaFX ? openjfx.meta.available, openjfx
@@ -9,8 +9,8 @@
}:
let
- major = "13";
- update = ".0.2";
+ major = "14";
+ update = ".0.1";
build = "-ga";
openjdk = stdenv.mkDerivation rec {
@@ -19,14 +19,14 @@ let
src = fetchurl {
url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz";
- sha256 = "1871ziss7ny19rw8f7bay5vznmhpqbfi4ihn3yygs06wyxhm0zmv";
+ sha256 = "0ic7dcrzk62jc65yrshs6xlclmsha7z52bia5s2bkllw1zpmdmip";
};
nativeBuildInputs = [ pkgconfig autoconf ];
buildInputs = [
cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
- libXi libXinerama libXcursor libXrandr fontconfig openjdk13-bootstrap
+ libXi libXinerama libXcursor libXrandr fontconfig openjdk14-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [
gtk3 gnome_vfs GConf glib
];
@@ -54,7 +54,7 @@ let
'';
configureFlags = [
- "--with-boot-jdk=${openjdk13-bootstrap.home}"
+ "--with-boot-jdk=${openjdk14-bootstrap.home}"
"--enable-unlimited-crypto"
"--with-native-debug-symbols=internal"
"--with-libjpeg=system"
@@ -137,7 +137,7 @@ let
done
'';
- disallowedReferences = [ openjdk13-bootstrap ];
+ disallowedReferences = [ openjdk14-bootstrap ];
meta = with stdenv.lib; {
homepage = "http://openjdk.java.net/";
diff --git a/pkgs/development/compilers/openjdk/openjfx/13.nix b/pkgs/development/compilers/openjdk/openjfx/14.nix
similarity index 85%
rename from pkgs/development/compilers/openjdk/openjfx/13.nix
rename to pkgs/development/compilers/openjdk/openjfx/14.nix
index 54267a757b88..12d9448595e3 100644
--- a/pkgs/development/compilers/openjdk/openjfx/13.nix
+++ b/pkgs/development/compilers/openjdk/openjfx/14.nix
@@ -1,22 +1,24 @@
-{ stdenv, lib, fetchurl, writeText, openjdk11_headless, gradleGen
+{ stdenv, lib, fetchFromGitHub, writeText, openjdk11_headless, gradleGen
, pkgconfig, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib
, ffmpeg, python, ruby }:
let
- major = "13";
- update = ".0.2";
- build = "1";
- repover = "${major}${update}+${build}";
+ major = "14";
+ update = "";
+ build = "-ga";
+ repover = "${major}${update}${build}";
gradle_ = (gradleGen.override {
java = openjdk11_headless;
- }).gradle_4_10;
+ }).gradle_5_6;
makePackage = args: stdenv.mkDerivation ({
- version = "${major}${update}-${build}";
+ version = "${major}${update}${build}";
- src = fetchurl {
- url = "https://hg.openjdk.java.net/openjfx/${major}-dev/rt/archive/${repover}.tar.gz";
- sha256 = "1si9wpb9malnf8zzz57l6b80088z2370zfxp1b0kk6rs0cnvpr74";
+ src = fetchFromGitHub {
+ owner = "openjdk";
+ repo = "jfx";
+ rev = repover;
+ sha256 = "16aj15xksc266gv3y42m0g277pfvp71901lrngndcnpr7i2zshnr";
};
buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg ];
@@ -75,9 +77,6 @@ in makePackage {
COMPILE_WEBKIT = true
'';
- #openjdk build fails if licenses are identical, so we must patch this trivial difference
- patches = [ ./openjfx-mesa-license.patch ];
-
preBuild = ''
swtJar="$(find ${deps} -name org.eclipse.swt\*.jar)"
substituteInPlace build.gradle \
diff --git a/pkgs/development/compilers/openjdk/openjfx/openjfx-mesa-license.patch b/pkgs/development/compilers/openjdk/openjfx/openjfx-mesa-license.patch
deleted file mode 100644
index d3bf9e17c22b..000000000000
--- a/pkgs/development/compilers/openjdk/openjfx/openjfx-mesa-license.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/modules/javafx.graphics/src/main/legal/mesa3d.md 1969-12-31 19:00:01.000000000 -0500
-+++ b/modules/javafx.graphics/src/main/legal/mesa3d.md 2019-08-08 01:05:04.000000000 -0400
-@@ -1,7 +1,7 @@
- ## Mesa 3-D Graphics Library v5.0
-
- ### Mesa License
--```
-+
-
- Mesa 3-D graphics library
- Version: 5.0
-@@ -25,4 +25,4 @@
- AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
--```
-+
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index b14c26c69478..8638c32262e0 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -371,7 +371,7 @@ self: super: {
static-resources = dontCheck super.static-resources;
strive = dontCheck super.strive; # fails its own hlint test with tons of warnings
svndump = dontCheck super.svndump;
- tar = dontCheck super.tar; #http://hydra.nixos.org/build/25088435/nixlog/2 (fails only on 32-bit)
+ tar = dontCheck super.tar; #https://hydra.nixos.org/build/25088435/nixlog/2 (fails only on 32-bit)
th-printf = dontCheck super.th-printf;
thumbnail-plus = dontCheck super.thumbnail-plus;
tickle = dontCheck super.tickle;
diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix
index 35672116ca06..bbc38e515424 100644
--- a/pkgs/development/interpreters/bats/default.nix
+++ b/pkgs/development/interpreters/bats/default.nix
@@ -1,17 +1,21 @@
-{ stdenv, fetchzip, gnugrep }:
+{ stdenv, fetchzip, coreutils, gnugrep }:
stdenv.mkDerivation rec {
pname = "bats";
- version = "1.1.0";
+ version = "1.2.0";
src = fetchzip {
url = "https://github.com/bats-core/bats-core/archive/v${version}.tar.gz";
- sha256 = "1kkh0j2alql3xiyhw9wsvcc3xclv52g0ivgyk8h85q9fn3qdqakz";
+ sha256 = "0f59zh4d4pa1a7ybs5zl6h0csbqqv11lbnq0jl1dgwm1s6p49bsq";
};
patchPhase = ''
patchShebangs ./install.sh
- substituteInPlace ./libexec/bats-core/bats-format-tap-stream --replace grep ${gnugrep}/bin/grep
+
+ substituteInPlace ./libexec/bats-core/bats \
+ --replace 'type -p greadlink readlink' 'type -p ${coreutils}/bin/readlink'
+ substituteInPlace ./libexec/bats-core/bats-format-tap-stream \
+ --replace grep ${gnugrep}/bin/grep
'';
installPhase = "./install.sh $out";
diff --git a/pkgs/development/interpreters/clojurescript/lumo/package.json b/pkgs/development/interpreters/clojurescript/lumo/package.json
index 6ab3f9616c78..acfd5c4ed498 100644
--- a/pkgs/development/interpreters/clojurescript/lumo/package.json
+++ b/pkgs/development/interpreters/clojurescript/lumo/package.json
@@ -27,7 +27,7 @@
"glob": "^7.1.3",
"gunzip-maybe": "^1.4.1",
"insert-module-globals": "^7.2.0",
- "jszip": "github:anmonteiro/jszip#patch-1",
+ "jszip": "2.x",
"mkdirp": "^1.0.3",
"ncp": "^2.0.0",
"node-fetch": "^2.2.1",
diff --git a/pkgs/development/interpreters/elixir/1.10.nix b/pkgs/development/interpreters/elixir/1.10.nix
index afab770da353..d63a94d98d6d 100644
--- a/pkgs/development/interpreters/elixir/1.10.nix
+++ b/pkgs/development/interpreters/elixir/1.10.nix
@@ -3,7 +3,7 @@
# How to obtain `sha256`:
# nix-prefetch-url --unpack https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz
mkDerivation {
- version = "1.10.2";
- sha256 = "04yi1hljq7ii9flh6pmb5411z7q1bdq9f9sq8323k9hm1f5jwkx6";
+ version = "1.10.3";
+ sha256 = "18bqqqzvhr1zj491wc3d36a310mg1wcs12npp70zfmgqrc60q65a";
minimumOTPVersion = "21";
}
diff --git a/pkgs/development/interpreters/jelly/default.nix b/pkgs/development/interpreters/jelly/default.nix
new file mode 100644
index 000000000000..a317f35d2a78
--- /dev/null
+++ b/pkgs/development/interpreters/jelly/default.nix
@@ -0,0 +1,28 @@
+{ lib, python3Packages, fetchFromGitHub }:
+
+python3Packages.buildPythonApplication {
+ pname = "jelly";
+ version = "0.1.31";
+
+ src = fetchFromGitHub {
+ owner = "DennisMitchell";
+ repo = "jellylanguage";
+ rev = "70c9fd93ab009c05dc396f8cc091f72b212fb188";
+ sha256 = "1rpclqagvigp5qhvgnjavvy463f1drshnc1mfxm6z7ygzs0l0yz6";
+ };
+
+ propagatedBuildInputs = [ python3Packages.sympy ];
+
+ # checks are disabled because jelly has no tests, and the default is to run
+ # the output binary with no arguments, which exits with status 1 and causes
+ # the build to fail
+ doCheck = false;
+
+ meta = with lib; {
+ description = "A recreational programming language inspired by J";
+ homepage = https://github.com/DennisMitchell/jellylanguage;
+ license = licenses.mit;
+ maintainers = [ maintainers.tckmn ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix
index b176c55cbfd1..39588a0c363b 100644
--- a/pkgs/development/interpreters/joker/default.nix
+++ b/pkgs/development/interpreters/joker/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "joker";
- version = "0.15.0";
+ version = "0.15.3";
src = fetchFromGitHub {
rev = "v${version}";
owner = "candid82";
repo = "joker";
- sha256 = "03lbvxmkn0rr7yv7kj6c4dh4zayiwbhrkqbz2m22dw568rjbp8az";
+ sha256 = "1pxj6flyhf522zjab1dfvxfajyx3v3rzs7l8ma7ma6b8zmwp2wdn";
};
- modSha256 = "1mylgim9nm0v5wybgzi74nqzmvzwzws0027wzl86dbj5id83ab9v";
+ modSha256 = "165mjfjk4x95ckw7wg96bg9pzb3297sggnip38nz2jxxbqr0ff8b";
preBuild = ''
go generate ./...
diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix
index 2abcec68c866..692aed3e4ee6 100644
--- a/pkgs/development/interpreters/mujs/default.nix
+++ b/pkgs/development/interpreters/mujs/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mujs";
- version = "1.0.6";
+ version = "1.0.7";
src = fetchurl {
url = "https://mujs.com/downloads/mujs-${version}.tar.xz";
- sha256 = "1q9w2dcspfp580pzx7sw7x9gbn8j0ak6dvj75wd1ml3f3q3i43df";
+ sha256 = "1ilhay15z4k7mlzs6g2d00snivin7vp72dfw5wwpmc0x70jr31l2";
};
buildInputs = [ readline ];
diff --git a/pkgs/development/interpreters/picoc/default.nix b/pkgs/development/interpreters/picoc/default.nix
index 00e77033575f..f7343f6e4d60 100644
--- a/pkgs/development/interpreters/picoc/default.nix
+++ b/pkgs/development/interpreters/picoc/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
# Tests are currently broken on i686 see
- # http://hydra.nixos.org/build/24003763/nixlog/1
+ # https://hydra.nixos.org/build/24003763/nixlog/1
doCheck = if stdenv.isi686 then false else true;
checkTarget = "test";
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index 5dc3b224720a..2def54de12d1 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -23,8 +23,6 @@ with pkgs;
};
in rec {
isPy27 = pythonVersion == "2.7";
- isPy33 = pythonVersion == "3.3"; # TODO: remove
- isPy34 = pythonVersion == "3.4"; # TODO: remove
isPy35 = pythonVersion == "3.5";
isPy36 = pythonVersion == "3.6";
isPy37 = pythonVersion == "3.7";
diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index 725b1d5106df..1db01c0d7758 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -46,7 +46,7 @@ in
stdenv.mkDerivation rec {
pname = "racket";
- version = "7.6"; # always change at once with ./minimal.nix
+ version = "7.7"; # always change at once with ./minimal.nix
src = (stdenv.lib.makeOverridable ({ name, sha256 }:
fetchurl {
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
}
)) {
name = "${pname}-${version}";
- sha256 = "0yagy7qrnz96gwafnj3whh2vs54788k1ci3vkm100h68gsw638b8";
+ sha256 = "0cx5h3k0n58cb442qzp3jlc7n1b9dbaxv9blg2rjil2rn119yrb2";
};
FONTCONFIG_FILE = fontsConf;
@@ -82,10 +82,7 @@ stdenv.mkDerivation rec {
'';
shared = if stdenv.isDarwin then "dylib" else "shared";
- configureFlags = [ "--enable-${shared}" "--enable-lt=${libtool}/bin/libtool"
- # The following flag is a temporary workaround for an upstream bug:
- # https://github.com/racket/racket/issues/3046
- "--enable-useprefix" ]
+ configureFlags = [ "--enable-${shared}" "--enable-lt=${libtool}/bin/libtool" ]
++ stdenv.lib.optional disableDocs [ "--disable-docs" ]
++ stdenv.lib.optional stdenv.isDarwin [ "--enable-xonx" ];
diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix
index 9e817b760003..a4a7a5c12cd4 100644
--- a/pkgs/development/interpreters/racket/minimal.nix
+++ b/pkgs/development/interpreters/racket/minimal.nix
@@ -5,7 +5,7 @@ racket.overrideAttrs (oldAttrs: rec {
name = "racket-minimal-${oldAttrs.version}";
src = oldAttrs.src.override {
inherit name;
- sha256 = "0id094q9024hj2n3907l7dblp3iix1v5289xzskmh5c26xfygp9y";
+ sha256 = "1lxcd4ix8q3089xql48hwccxvcpkinfxwxnc6fhcjdgzqcyxh3ln";
};
meta = oldAttrs.meta // {
diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix
index 37abbd97746a..e4501d852389 100644
--- a/pkgs/development/interpreters/rakudo/default.nix
+++ b/pkgs/development/interpreters/rakudo/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "rakudo";
- version = "2020.02.1";
+ version = "2020.05";
src = fetchurl {
url = "https://www.rakudo.org/dl/rakudo/rakudo-${version}.tar.gz";
- sha256 = "1qfaiqfclqd6zz04xl90yiqkvmm610r905nnbd6gszgyq1k77ckv";
+ sha256 = "08d1591k8lhyw3kmxq53lf24wg6d61lg2xc81zzcglask9n9ilc6";
};
buildInputs = [ icu zlib gmp perl ];
diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix
index ade97b56a648..a7b57c9287ac 100644
--- a/pkgs/development/interpreters/rakudo/moarvm.nix
+++ b/pkgs/development/interpreters/rakudo/moarvm.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "moarvm";
- version = "2020.02.1";
+ version = "2020.05";
src = fetchurl {
url = "https://www.moarvm.org/releases/MoarVM-${version}.tar.gz";
- sha256 = "0cnnyjyci24pbws2cic80xdr7a5g3qvrsi221c6bpbnpkar81jw2";
+ sha256 = "0jw29846nky7gz129knjcx58qr7nbn8j7hs8k92i11zaj73d4s4k";
};
buildInputs = [ perl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ];
diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix
index f12e60b14f06..40133287f9e0 100644
--- a/pkgs/development/interpreters/rakudo/nqp.nix
+++ b/pkgs/development/interpreters/rakudo/nqp.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "nqp";
- version = "2020.02.1";
+ version = "2020.05";
src = fetchurl {
url = "https://github.com/perl6/nqp/releases/download/${version}/nqp-${version}.tar.gz";
- sha256 = "0zw3g7viyq4n4qwy0laww2mzz6wrzkfcq4fm82scy1mh65r7bdgj";
+ sha256 = "0xxm0vlra1g467cxc5v65p8pc46w7r9wkcddjl8nk2lnvgcr46r9";
};
buildInputs = [ perl ];
diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix
index 9a8c11324a21..5c8fe16408b4 100644
--- a/pkgs/development/interpreters/rakudo/zef.nix
+++ b/pkgs/development/interpreters/rakudo/zef.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "zef";
- version = "0.8.3";
+ version = "0.8.4";
src = fetchFromGitHub {
owner = "ugexe";
repo = "zef";
rev = "v${version}";
- sha256 = "1fscv8fbaa5l8dcwclmq3hvg3c59l4dvyjqb316mgnc5anxpzy2f";
+ sha256 = "02a3awnjr1mgb9275xvp3xms80vcxkq55ffi8sbjzxpwyadj5y5k";
};
buildInputs = [ rakudo makeWrapper ];
diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix
index 79222749dc4b..67d54af7bb2a 100644
--- a/pkgs/development/interpreters/wasmtime/default.nix
+++ b/pkgs/development/interpreters/wasmtime/default.nix
@@ -2,24 +2,26 @@
rustPlatform.buildRustPackage rec {
pname = "wasmtime";
- version = "0.12.0";
+ version = "0.15.0";
src = fetchFromGitHub {
owner = "bytecodealliance";
repo = "${pname}";
rev = "v${version}";
- sha256 = "08dhk5s8rv41mjqbwfqwqmp6p6p9y7qc5yc76ljjd9l7j1phl7mr";
+ sha256 = "1df99iak0psydlg9m8f8qq4zyh4wbi5l4qgsdjr2lm74ci3483xy";
fetchSubmodules = true;
};
- cargoSha256 = "0vyxp74jlnrisk0kblsbj9d9a54wcgzbyjm7iqav1k4ns3syrnmh";
+ cargoSha256 = "170bz48jrc1k2ylfmd3bcry0xpcxx8p3rzzv9mprlfmrfpb0b28r";
nativeBuildInputs = [ python cmake clang ];
buildInputs = [ llvmPackages.libclang ] ++
lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
- doCheck = false; # https://github.com/bytecodealliance/wasmtime/issues/1197
+ # no test on darwin due to
+ # https://github.com/bytecodealliance/wasmtime/issues/1556
+ doCheck = !stdenv.isDarwin;
meta = with lib; {
description = "Standalone JIT-style runtime for WebAssembly, using Cranelift";
diff --git a/pkgs/development/libraries/abseil-cpp/default.nix b/pkgs/development/libraries/abseil-cpp/default.nix
index 6b7739b322da..45e73410d28e 100644
--- a/pkgs/development/libraries/abseil-cpp/default.nix
+++ b/pkgs/development/libraries/abseil-cpp/default.nix
@@ -2,15 +2,13 @@
stdenv.mkDerivation rec {
pname = "abseil-cpp";
- date = "20191119";
- rev = "8ba96a8244bbe334d09542e92d566673a65c1f78";
- version = "${date}-${rev}";
+ version = "20200225.2";
src = fetchFromGitHub {
owner = "abseil";
repo = "abseil-cpp";
- rev = rev;
- sha256 = "089bvlspgdgi40fham20qy1m97gr1jh5k5czz49dincpd18j6inb";
+ rev = version;
+ sha256 = "0dwxg54pv6ihphbia0iw65r64whd7v8nm4wwhcz219642cgpv54y";
};
nativeBuildInputs = [ cmake ];
@@ -19,6 +17,7 @@ stdenv.mkDerivation rec {
description = "An open-source collection of C++ code designed to augment the C++ standard library";
homepage = "https://abseil.io/";
license = licenses.asl20;
+ platforms = platforms.all;
maintainers = [ maintainers.andersk ];
};
}
diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix
index 3251b1c9e0d2..9b32d46b3b2f 100644
--- a/pkgs/development/libraries/armadillo/default.nix
+++ b/pkgs/development/libraries/armadillo/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "armadillo";
- version = "9.860.1";
+ version = "9.870.2";
src = fetchurl {
url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
- sha256 = "1ab5y4ll6js2w4p9dabj2dmzzc3f8dja8dqsvy40azrvny58h0qn";
+ sha256 = "0mpp1iq4ws9yhcv0bnn0czzyim7whcan34c7a052sh8w9kp5y6sl";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/audio/libbass/default.nix b/pkgs/development/libraries/audio/libbass/default.nix
index 84fa46eed273..593854bb280d 100644
--- a/pkgs/development/libraries/audio/libbass/default.nix
+++ b/pkgs/development/libraries/audio/libbass/default.nix
@@ -9,7 +9,7 @@ let
allBass = {
bass = {
h = "bass.h";
- version = "2.4.14";
+ version = "2.4.15";
so = {
i686_linux = "libbass.so";
x86_64-linux = "x64/libbass.so";
diff --git a/pkgs/development/libraries/aws-sdk-cpp/cmake-dirs.patch b/pkgs/development/libraries/aws-sdk-cpp/cmake-dirs.patch
new file mode 100644
index 000000000000..6e4cad9e73cf
--- /dev/null
+++ b/pkgs/development/libraries/aws-sdk-cpp/cmake-dirs.patch
@@ -0,0 +1,75 @@
+diff --git a/cmake/AWSSDKConfig.cmake b/cmake/AWSSDKConfig.cmake
+index e87252123e..5457bd5910 100644
+--- a/cmake/AWSSDKConfig.cmake
++++ b/cmake/AWSSDKConfig.cmake
+@@ -82,6 +82,7 @@ if (AWSSDK_ROOT_DIR)
+ )
+ else()
+ find_file(AWSSDK_CORE_HEADER_FILE Aws.h
++ "/${AWSSDK_INSTALL_INCLUDEDIR}/aws/core"
+ "/usr/${AWSSDK_INSTALL_INCLUDEDIR}/aws/core"
+ "/usr/local/${AWSSDK_INSTALL_INCLUDEDIR}/aws/core"
+ "C:/Progra~1/AWSSDK/${AWSSDK_INSTALL_INCLUDEDIR}/aws/core"
+@@ -97,14 +98,18 @@ if (NOT AWSSDK_CORE_HEADER_FILE)
+ message(FATAL_ERROR "AWS SDK for C++ is missing, please install it first")
+ endif()
+
+-# based on core header file path, inspects the actual AWSSDK_ROOT_DIR
+-get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_CORE_HEADER_FILE}" PATH)
+-get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_ROOT_DIR}" PATH)
+-get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_ROOT_DIR}" PATH)
+-get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_ROOT_DIR}" PATH)
+-
+-if (NOT AWSSDK_ROOT_DIR)
+- message(FATAL_ERROR "AWSSDK_ROOT_DIR is not set or can't be calculated from the path of core header file")
++if (IS_ABSOLUTE ${AWSSDK_INSTALL_LIBDIR})
++ set(AWSSDK_ROOT_DIR "")
++else()
++ # based on core header file path, inspects the actual AWSSDK_ROOT_DIR
++ get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_CORE_HEADER_FILE}" PATH)
++ get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_ROOT_DIR}" PATH)
++ get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_ROOT_DIR}" PATH)
++ get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_ROOT_DIR}" PATH)
++
++ if (NOT AWSSDK_ROOT_DIR)
++ message(FATAL_ERROR "AWSSDK_ROOT_DIR is not set or can't be calculated from the path of core header file")
++ endif()
+ endif()
+
+
+diff --git a/cmake/utilities.cmake b/cmake/utilities.cmake
+index 283a14a138..646aea1da3 100644
+--- a/cmake/utilities.cmake
++++ b/cmake/utilities.cmake
+@@ -43,7 +43,8 @@ macro(setup_install)
+ EXPORT "${PROJECT_NAME}-targets"
+ ARCHIVE DESTINATION ${ARCHIVE_DIRECTORY}
+ LIBRARY DESTINATION ${LIBRARY_DIRECTORY}
+- RUNTIME DESTINATION ${BINARY_DIRECTORY} )
++ RUNTIME DESTINATION ${BINARY_DIRECTORY}
++ INCLUDES DESTINATION ${INCLUDE_DIRECTORY} )
+
+ if (BUILD_SHARED_LIBS)
+ install(
+@@ -57,7 +58,8 @@ macro(setup_install)
+ install (TARGETS ${PROJECT_NAME}
+ ARCHIVE DESTINATION ${ARCHIVE_DIRECTORY}/${SDK_INSTALL_BINARY_PREFIX}/${PLATFORM_INSTALL_QUALIFIER}/\${CMAKE_INSTALL_CONFIG_NAME}
+ LIBRARY DESTINATION ${LIBRARY_DIRECTORY}/${SDK_INSTALL_BINARY_PREFIX}/${PLATFORM_INSTALL_QUALIFIER}/\${CMAKE_INSTALL_CONFIG_NAME}
+- RUNTIME DESTINATION ${BINARY_DIRECTORY}/${SDK_INSTALL_BINARY_PREFIX}/${PLATFORM_INSTALL_QUALIFIER}/\${CMAKE_INSTALL_CONFIG_NAME})
++ RUNTIME DESTINATION ${BINARY_DIRECTORY}/${SDK_INSTALL_BINARY_PREFIX}/${PLATFORM_INSTALL_QUALIFIER}/\${CMAKE_INSTALL_CONFIG_NAME}
++ INCLUDES DESTINATION ${INCLUDE_DIRECTORY}/${SDK_INSTALL_BINARY_PREFIX}/${PLATFORM_INSTALL_QUALIFIER}/\${CMAKE_INSTALL_CONFIG_NAME})
+ endif()
+ endif()
+ endmacro()
+diff --git a/toolchains/pkg-config.pc.in b/toolchains/pkg-config.pc.in
+index 9b519d2772..a61069225c 100644
+--- a/toolchains/pkg-config.pc.in
++++ b/toolchains/pkg-config.pc.in
+@@ -1,5 +1,5 @@
+-includedir=@CMAKE_INSTALL_PREFIX@/@INCLUDE_DIRECTORY@
+-libdir=@CMAKE_INSTALL_PREFIX@/@LIBRARY_DIRECTORY@
++includedir=@INCLUDE_DIRECTORY@
++libdir=@LIBRARY_DIRECTORY@
+
+ Name: @PROJECT_NAME@
+ Description: @PROJECT_DESCRIPTION@
diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix
index f6878cd9396e..94827743bf3d 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -50,6 +50,12 @@ stdenv.mkDerivation rec {
rm aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp
'';
+ postFixupHooks = [
+ # This bodge is necessary so that the file that the generated -config.cmake file
+ # points to an existing directory.
+ ''mkdir -p $out/include''
+ ];
+
__darwinAllowLocalNetworking = true;
patches = [
@@ -57,6 +63,7 @@ stdenv.mkDerivation rec {
url = "https://github.com/aws/aws-sdk-cpp/commit/42991ab549087c81cb630e5d3d2413e8a9cf8a97.patch";
sha256 = "0myq5cm3lvl5r56hg0sc0zyn1clbkd9ys0wr95ghw6bhwpvfv8gr";
})
+ ./cmake-dirs.patch
];
meta = with lib; {
diff --git a/pkgs/development/libraries/boost/cmake-paths.patch b/pkgs/development/libraries/boost/cmake-paths.patch
new file mode 100644
index 000000000000..b7f90148f9dc
--- /dev/null
+++ b/pkgs/development/libraries/boost/cmake-paths.patch
@@ -0,0 +1,21 @@
+diff --git a/tools/boost_install/boost-install.jam b/tools/boost_install/boost-install.jam
+index ad19f7b55..ec6bf57ff 100644
+--- a/tools/boost_install/boost-install.jam
++++ b/tools/boost_install/boost-install.jam
+@@ -587,6 +587,7 @@ rule generate-cmake-config- ( target : sources * : properties * )
+ "# Compute the include and library directories relative to this file."
+ ""
+ "get_filename_component(_BOOST_CMAKEDIR \"${CMAKE_CURRENT_LIST_DIR}/../\" ABSOLUTE)"
++ "get_filename_component(_BOOST_REAL_CMAKEDIR \"${CMAKE_CURRENT_LIST_DIR}/../\" ABSOLUTE)"
+ : true ;
+
+ if [ path.is-rooted $(cmakedir) ]
+@@ -607,6 +608,8 @@ rule generate-cmake-config- ( target : sources * : properties * )
+ " unset(_BOOST_CMAKEDIR_ORIGINAL)"
+ "endif()"
+ ""
++ "# Assume that the installer actually did know where the libs were to be installed"
++ "get_filename_component(_BOOST_CMAKEDIR \"$(cmakedir-native)\" REALPATH)"
+ : true ;
+ }
+
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index 7fe3c185c04a..6d1c20f323d3 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -112,7 +112,8 @@ stdenv.mkDerivation {
++ optional stdenv.isDarwin (
if version == "1.55.0"
then ./darwin-1.55-no-system-python.patch
- else ./darwin-no-system-python.patch);
+ else ./darwin-no-system-python.patch)
+ ++ optional (versionAtLeast version "1.70") ./cmake-paths.patch;
meta = {
homepage = "http://boost.org/";
diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix
index 67e2794c8a29..20524cf179cf 100644
--- a/pkgs/development/libraries/boringssl/default.nix
+++ b/pkgs/development/libraries/boringssl/default.nix
@@ -3,24 +3,23 @@
# reference: https://boringssl.googlesource.com/boringssl/+/2661/BUILDING.md
stdenv.mkDerivation {
pname = "boringssl";
- version = "2017-02-23";
+ version = "2019-12-04";
src = fetchgit {
url = "https://boringssl.googlesource.com/boringssl";
- rev = "be2ee342d3781ddb954f91f8a7e660c6f59e87e5";
- sha256 = "022zq7wlkhrg6al7drr3555lam3zw5bb10ylf9mznp83s854f975";
+ rev = "243b5cc9e33979ae2afa79eaa4e4c8d59db161d4";
+ sha256 = "1ak27dln0zqy2vj4llqsb99g03sk0sg25wlp09b58cymrh3gccvl";
};
- buildInputs = [ cmake perl go ];
+ nativeBuildInputs = [ cmake perl go ];
enableParallelBuilding = true;
- NIX_CFLAGS_COMPILE = "-Wno-error";
makeFlags = [ "GOCACHE=$(TMPDIR)/go-cache" ];
installPhase = ''
- mkdir -p $out/bin $out/include $out/lib
+ mkdir -p $bin/bin $out/include $out/lib
- mv tool/bssl $out/bin
+ mv tool/bssl $bin/bin
mv ssl/libssl.a $out/lib
mv crypto/libcrypto.a $out/lib
@@ -29,6 +28,8 @@ stdenv.mkDerivation {
mv ../include/openssl $out/include
'';
+ outputs = [ "out" "bin" ];
+
meta = with stdenv.lib; {
description = "Free TLS/SSL implementation";
homepage = "https://boringssl.googlesource.com";
diff --git a/pkgs/development/libraries/catch2/default.nix b/pkgs/development/libraries/catch2/default.nix
index a2b65c9bbb41..960c07e29df4 100644
--- a/pkgs/development/libraries/catch2/default.nix
+++ b/pkgs/development/libraries/catch2/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "catch2";
- version = "2.11.3";
+ version = "2.12.1";
src = fetchFromGitHub {
owner = "catchorg";
repo = "Catch2";
rev = "v${version}";
- sha256="012j7fnlsdyvg6d7gwdab7yzllkv4wqb164lfg4ixahx9l9schmp";
+ sha256="163198lizcr84ify34xjj1955rcgsqhwn87dwifiwyamnggn445f";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix
index 193bdda3445d..0a51e7e592b1 100644
--- a/pkgs/development/libraries/check/default.nix
+++ b/pkgs/development/libraries/check/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "02zkfiyklckmivrfvdsrlzvzphkdsgjrz3igncw05dv5pshhq3xx";
};
- # Test can randomly fail: http://hydra.nixos.org/build/7243912
+ # Test can randomly fail: https://hydra.nixos.org/build/7243912
doCheck = false;
buildInputs = stdenv.lib.optional stdenv.isDarwin CoreServices;
diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix
index 6453ff2a3e91..4b2520d714bd 100644
--- a/pkgs/development/libraries/cpp-utilities/default.nix
+++ b/pkgs/development/libraries/cpp-utilities/default.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "cpp-utilities";
- version = "5.3.0";
+ version = "5.4.0";
src = fetchFromGitHub {
owner = "Martchus";
repo = pname;
rev = "v${version}";
- sha256 = "1c5rs28pavv8zabprjbd2y1sblgqbbhww07qvairh149rahvxi85";
+ sha256 = "18sy1jrz5adzy7c8k42kqlpicc4h0igimjqwaa6m9swwkhwiqqjz";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/enet/default.nix b/pkgs/development/libraries/enet/default.nix
index 90c312bb7a64..e1172870ede7 100644
--- a/pkgs/development/libraries/enet/default.nix
+++ b/pkgs/development/libraries/enet/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
- name = "enet-1.3.14";
+ name = "enet-1.3.15";
src = fetchurl {
url = "http://enet.bespin.org/download/${name}.tar.gz";
- sha256 = "0w780zc6cy8yq4cskpphx0f91lzh51vh9lwyc5ll8hhamdxgbxlq";
+ sha256 = "1yxxf9bkx6dx3j8j70fj17c05likyfibb1419ls74hp58qrzdgas";
};
meta = {
diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix
index a192a4c2cab6..8a6dfd1983ef 100644
--- a/pkgs/development/libraries/exiv2/default.nix
+++ b/pkgs/development/libraries/exiv2/default.nix
@@ -79,8 +79,9 @@ stdenv.mkDerivation rec {
mkdir ../test/tmp
export LD_LIBRARY_PATH="$(realpath ../build/lib)"
- # Fix tests on Aarch64
- ${stdenv.lib.optionalString stdenv.isAarch64 ''
+ ${stdenv.lib.optionalString (stdenv.isAarch64 || stdenv.isAarch32) ''
+ # Fix tests on arm
+ # https://github.com/Exiv2/exiv2/issues/933
rm -f ../tests/bugfixes/github/test_CVE_2018_12265.py
''}
diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix
index f6a7f6c12fbf..8973eda5d826 100644
--- a/pkgs/development/libraries/faudio/default.nix
+++ b/pkgs/development/libraries/faudio/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "faudio";
- version = "20.04";
+ version = "20.05";
src = fetchFromGitHub {
owner = "FNA-XNA";
repo = "FAudio";
rev = version;
- sha256 = "0ykc2y1w0wh6s3g9xzk3zqscvdjnf59923zxh2x0whxlcvndab2d";
+ sha256 = "14i0s0m1n57wjwzy54v1czq0w38xplcdsfn4nz5v6fryaxzr5z60";
};
nativeBuildInputs = [cmake];
diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix
index 89ea40c1c65e..31ce6602963c 100644
--- a/pkgs/development/libraries/freetds/default.nix
+++ b/pkgs/development/libraries/freetds/default.nix
@@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null;
stdenv.mkDerivation rec {
pname = "freetds";
- version = "1.1.26";
+ version = "1.1.33";
src = fetchurl {
url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2";
- sha256 = "1nqxcnf6lax7grsxhajq87h92ngm487nzzz87kkmh1nzk33r7dwd";
+ sha256 = "1gq972ngpdmpb63mc6myxsd0rf3qph95qx542021xh9f2791qffi";
};
buildInputs = [
diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix
index be0edab3155d..4e7ce1d5ac85 100644
--- a/pkgs/development/libraries/geos/default.nix
+++ b/pkgs/development/libraries/geos/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, python }:
stdenv.mkDerivation rec {
- name = "geos-3.8.0";
+ name = "geos-3.8.1";
src = fetchurl {
url = "https://download.osgeo.org/geos/${name}.tar.bz2";
- sha256 = "1mb2v9fy1gnbjhcgv0xny11ggfb17vkzsajdyibigwsxr4ylq4cr";
+ sha256 = "1xqpmr10xi0n9sj47fbwc89qb0yr9imh4ybk0jsxpffy111syn22";
};
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix
index 1f25abd2cf38..ee29c6a97a45 100644
--- a/pkgs/development/libraries/gjs/default.nix
+++ b/pkgs/development/libraries/gjs/default.nix
@@ -28,11 +28,11 @@ let
];
in stdenv.mkDerivation rec {
pname = "gjs";
- version = "1.64.1";
+ version = "1.64.2";
src = fetchurl {
url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0z4qx4s3174b1w5b0slnn6jwpy2c18s4fvx4xii2kflr7s4q7bsm";
+ sha256 = "0ywrsfmkxaw11z83dnmb9yqkn6k3c1mkxw2mv6arbwad6x6q7zqm";
};
outputs = [ "out" "dev" "installedTests" ];
diff --git a/pkgs/development/libraries/gl2ps/default.nix b/pkgs/development/libraries/gl2ps/default.nix
index 2ed717a49b85..85a9944fcf7b 100644
--- a/pkgs/development/libraries/gl2ps/default.nix
+++ b/pkgs/development/libraries/gl2ps/default.nix
@@ -2,12 +2,12 @@
, zlib, libGL, libGLU, libpng, freeglut }:
stdenv.mkDerivation rec {
- version = "1.4.1";
+ version = "1.4.2";
pname = "gl2ps";
src = fetchurl {
url = "http://geuz.org/gl2ps/src/${pname}-${version}.tgz";
- sha256 = "0fsx5lh9pz1xswr4yng24j4ngiijnanksbgz05bfzkh07m5h6qkk";
+ sha256 = "1sgzv547h7hrskb9qd0x5yp45kmhvibjwj2mfswv95lg070h074d";
};
buildInputs = [
diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix
index 78cfa40d1966..a027d58de396 100644
--- a/pkgs/development/libraries/gmp/5.1.x.nix
+++ b/pkgs/development/libraries/gmp/5.1.x.nix
@@ -25,7 +25,7 @@ let self = stdenv.mkDerivation rec {
(stdenv.lib.enableFeature cxx "cxx")
# Build a "fat binary", with routines for several sub-architectures
# (x86), except on Solaris where some tests crash with "Memory fault".
- # See , for instance.
+ # See , for instance.
#
# no darwin because gmp uses ASM that clang doesn't like
(stdenv.lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat")
diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix
index cca0f8d68e14..c5fffa09bf0b 100644
--- a/pkgs/development/libraries/gmp/6.x.nix
+++ b/pkgs/development/libraries/gmp/6.x.nix
@@ -27,7 +27,7 @@ let self = stdenv.mkDerivation rec {
(stdenv.lib.enableFeature cxx "cxx")
# Build a "fat binary", with routines for several sub-architectures
# (x86), except on Solaris where some tests crash with "Memory fault".
- # See , for instance.
+ # See , for instance.
#
# no darwin because gmp uses ASM that clang doesn't like
(stdenv.lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat")
diff --git a/pkgs/development/libraries/gnutls-kdh/generic.nix b/pkgs/development/libraries/gnutls-kdh/generic.nix
index 90e863760e92..c6d35b682360 100644
--- a/pkgs/development/libraries/gnutls-kdh/generic.nix
+++ b/pkgs/development/libraries/gnutls-kdh/generic.nix
@@ -11,7 +11,7 @@
assert guileBindings -> guile != null;
let
# XXX: Gnulib's `test-select' fails on FreeBSD:
- # http://hydra.nixos.org/build/2962084/nixlog/1/raw .
+ # https://hydra.nixos.org/build/2962084/nixlog/1/raw .
doCheck = !stdenv.isFreeBSD && !stdenv.isDarwin && lib.versionAtLeast version "3.4";
in
stdenv.mkDerivation {
diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix
index 4e7e19d9ff04..6d0faa03a888 100644
--- a/pkgs/development/libraries/gnutls/default.nix
+++ b/pkgs/development/libraries/gnutls/default.nix
@@ -11,7 +11,7 @@ let
version = "3.6.13";
# XXX: Gnulib's `test-select' fails on FreeBSD:
- # http://hydra.nixos.org/build/2962084/nixlog/1/raw .
+ # https://hydra.nixos.org/build/2962084/nixlog/1/raw .
doCheck = !stdenv.isFreeBSD && !stdenv.isDarwin && lib.versionAtLeast version "3.4"
&& stdenv.buildPlatform == stdenv.hostPlatform;
@@ -48,6 +48,8 @@ stdenv.mkDerivation {
sed '2iexit 77' -i tests/{pkgconfig,fastopen}.sh
sed '/^void doit(void)/,/^{/ s/{/{ exit(77);/' -i tests/{trust-store,psk-file}.c
sed 's:/usr/lib64/pkcs11/ /usr/lib/pkcs11/ /usr/lib/x86_64-linux-gnu/pkcs11/:`pkg-config --variable=p11_module_path p11-kit-1`:' -i tests/p11-kit-trust.sh
+ '' + lib.optionalString stdenv.hostPlatform.isMusl '' # See https://gitlab.com/gnutls/gnutls/-/issues/945
+ sed '2iecho "certtool tests skipped in musl build"\nexit 0' -i tests/cert-tests/certtool
'';
preConfigure = "patchShebangs .";
@@ -57,8 +59,12 @@ stdenv.mkDerivation {
"--disable-dependency-tracking"
"--enable-fast-install"
"--with-unbound-root-key-file=${dns-root-data}/root.key"
- ] ++ lib.optional guileBindings
- [ "--enable-guile" "--with-guile-site-dir=\${out}/share/guile/site" ];
+ ] ++ lib.optional guileBindings [
+ "--enable-guile"
+ "--with-guile-site-dir=\${out}/share/guile/site"
+ "--with-guile-site-ccache-dir=\${out}/share/guile/site"
+ "--with-guile-extension-dir=\${out}/share/guile/site"
+ ];
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/icu/67.nix b/pkgs/development/libraries/icu/67.nix
new file mode 100644
index 000000000000..23a1069ea14f
--- /dev/null
+++ b/pkgs/development/libraries/icu/67.nix
@@ -0,0 +1,4 @@
+import ./base.nix {
+ version = "67.1";
+ sha256 = "1p6mhvxl0xr2n0g6xdps3mwzwlv6mjsz3xlpm793p9aiybb0ra4l";
+}
diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/development/libraries/intel-media-sdk/default.nix
index cbfb943d3758..411cc227b304 100644
--- a/pkgs/development/libraries/intel-media-sdk/default.nix
+++ b/pkgs/development/libraries/intel-media-sdk/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "intel-media-sdk";
- version = "20.1.0";
+ version = "20.1.1";
src = fetchurl {
url = "https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-${version}.tar.gz";
- sha256 = "1afck8wgxb23jy1jd5sn9aiyd7nj3yi3q08hw180wwnpbvmiaicn";
+ sha256 = "1p13b4abslq31pbgqf0bzs2ixns85yfdsm94326h2vcg0q7hqc24";
};
# patchelf is needed for binaries in $out/share/samples
diff --git a/pkgs/development/libraries/java/commons/compress/default.nix b/pkgs/development/libraries/java/commons/compress/default.nix
index a9624ff243cb..5307c635834c 100644
--- a/pkgs/development/libraries/java/commons/compress/default.nix
+++ b/pkgs/development/libraries/java/commons/compress/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- version = "1.18";
+ version = "1.20";
pname = "commons-compress";
src = fetchurl {
url = "mirror://apache/commons/compress/binaries/${pname}-${version}-bin.tar.gz";
- sha256 = "0ciwzq134rqh1fp7qba091rajf2pdagfb665rarni7glb2x4lha1";
+ sha256 = "0zx1sc0rw3vzjan69vxr2qw82y9b0hqdzp4plcahc3c1y0vkz3fg";
};
installPhase = ''
diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix
index aa72aeb0d36c..155103af3c4e 100644
--- a/pkgs/development/libraries/jsoncpp/default.nix
+++ b/pkgs/development/libraries/jsoncpp/default.nix
@@ -30,8 +30,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake python ];
- # fix inverted sense in isAnyCharRequiredQuoting on aarch64. See: https://github.com/open-source-parsers/jsoncpp/pull/1120
- patches = stdenv.lib.optionals stdenv.isAarch64 [
+ # fix inverted sense in isAnyCharRequiredQuoting on arm. See: https://github.com/open-source-parsers/jsoncpp/pull/1120
+ patches = stdenv.lib.optionals (stdenv.isAarch64 || stdenv.isAarch32) [
(fetchpatch {
url = "https://github.com/open-source-parsers/jsoncpp/commit/9093358efae9e5981aa60013487fc7215f040a59.patch";
sha256 = "1wiqp70sck2md14sfc0zdkblqk9750cl55ykf9d6b9vs1ifzzzq5";
diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix
index a0cb8a7762b5..702738fdfc04 100644
--- a/pkgs/development/libraries/ldb/default.nix
+++ b/pkgs/development/libraries/ldb/default.nix
@@ -16,11 +16,11 @@
stdenv.mkDerivation rec {
pname = "ldb";
- version = "2.1.1";
+ version = "2.1.2";
src = fetchurl {
url = "mirror://samba/ldb/${pname}-${version}.tar.gz";
- sha256 = "jO+y8l/KkT+hinktDvsDrwf4f1uVGkze0DD1uY8lx7A=";
+ sha256 = "0x6yr14znp42b92i7br4wxfjri6i689dsifzz9kbyzvn558a16b4";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix
index 1fab7ee28a8a..8a34f05f6cf0 100644
--- a/pkgs/development/libraries/leatherman/default.nix
+++ b/pkgs/development/libraries/leatherman/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "leatherman";
- version = "1.11.0";
+ version = "1.12.0";
src = fetchFromGitHub {
- sha256 = "1kp35gnph9myqxdxzyj1871ay19nfajxglzwai1gvsnh5840xnxy";
+ sha256 = "00qigglp67a14ki4dhjxd3j540a80rkmzhysx7hra8v2rgbsqgj8";
rev = version;
repo = "leatherman";
owner = "puppetlabs";
diff --git a/pkgs/development/libraries/libamqpcpp/default.nix b/pkgs/development/libraries/libamqpcpp/default.nix
index bdf081222b6d..885338793f1e 100644
--- a/pkgs/development/libraries/libamqpcpp/default.nix
+++ b/pkgs/development/libraries/libamqpcpp/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libamqpcpp";
- version = "4.1.6";
+ version = "4.1.7";
src = fetchFromGitHub {
owner = "CopernicaMarketingSoftware";
repo = "AMQP-CPP";
rev = "v${version}";
- sha256 = "0cw1apj4qxfxpp0gz4my4656d5ijjj6s2y4rjahhj67h10qj4bd2";
+ sha256 = "16xgl0yqzqkqfrz7x9rbbv8rj5rg5jlz4a7apj9igqb58q0w362x";
};
buildInputs = [ openssl ];
diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix
index 09ebac93869b..a1c2967dde73 100644
--- a/pkgs/development/libraries/libcec/default.nix
+++ b/pkgs/development/libraries/libcec/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, cmake, pkgconfig, udev, libcec_platform, libraspberrypi ? null }:
-let version = "4.0.4"; in
+let version = "4.0.5"; in
stdenv.mkDerivation {
pname = "libcec";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz";
- sha256 = "02j09y06csaic4m0fyb4dr9l3hl15nxbbniwq0i1qlccpxjak0j3";
+ sha256 = "0hvp33mq0kg544hw20aq3vy5lxf5zid6gxm3qdga7wxw1r1lkmz4";
};
nativeBuildInputs = [ pkgconfig cmake ];
diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix
index 71a4620161e6..25917c44bd02 100644
--- a/pkgs/development/libraries/libgnurl/default.nix
+++ b/pkgs/development/libraries/libgnurl/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "libgnurl";
- version = "7.69.1";
+ version = "7.70.0";
src = fetchurl {
url = "mirror://gnu/gnunet/gnurl-${version}.tar.gz";
- sha256 = "0x8m26y3klndis6a28j8i0b7ab04d38q3rmlvgaqa65bjhlfdrp0";
+ sha256 = "0px9la8v4bj1dzxb95fx3yxk0rcjqjrxpj733ga27cza45wwzkqa";
};
nativeBuildInputs = [ libtool groff perl pkgconfig python2 ];
diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix
index 0b2e7341513e..e170e4931b83 100644
--- a/pkgs/development/libraries/libgpg-error/default.nix
+++ b/pkgs/development/libraries/libgpg-error/default.nix
@@ -60,7 +60,7 @@ in stdenv.mkDerivation (rec {
# For some reason, /bin/sh on OpenIndiana leads to this at the end of the
# `config.status' run:
# ./config.status[1401]: shift: (null): bad number
- # (See .)
+ # (See .)
# Thus, re-run it with Bash.
"${stdenv.shell} config.status";
diff --git a/pkgs/development/libraries/libjcat/default.nix b/pkgs/development/libraries/libjcat/default.nix
index dc95f9199326..54ab31e2702b 100644
--- a/pkgs/development/libraries/libjcat/default.nix
+++ b/pkgs/development/libraries/libjcat/default.nix
@@ -1,6 +1,5 @@
{ stdenv
, fetchFromGitHub
-, fetchpatch
, docbook_xml_dtd_43
, docbook-xsl-nons
, glib
@@ -20,7 +19,7 @@
stdenv.mkDerivation rec {
pname = "libjcat";
- version = "0.1.1";
+ version = "0.1.2";
outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ];
@@ -28,18 +27,12 @@ stdenv.mkDerivation rec {
owner = "hughsie";
repo = "libjcat";
rev = version;
- sha256 = "hWJUzpQvy2V4pS8C/nW7Xrs9U9LQWMsGuTVOnm5UJc0=";
+ sha256 = "zb9zKEvYUOSyo/j6hXTYZlQOSLdMkkT2I+Pe/0wMrWo=";
};
patches = [
# Installed tests are installed to different output
./installed-tests-path.patch
-
- # Fix version file generation
- (fetchpatch {
- url = "https://github.com/hughsie/libjcat/commit/cf2d9298a5fab7278ee040bc0b4be384a7b5538e.patch";
- sha256 = "3749qih+wfhU8ECklh5BvReJ7pS+Ao1Q7YueZ1tT0Is=";
- })
];
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/libmypaint/default.nix b/pkgs/development/libraries/libmypaint/default.nix
index 409867695fc0..5cb971f5db89 100644
--- a/pkgs/development/libraries/libmypaint/default.nix
+++ b/pkgs/development/libraries/libmypaint/default.nix
@@ -12,7 +12,7 @@
stdenv.mkDerivation rec {
pname = "libmypaint";
- version = "1.5.1";
+ version = "1.6.0";
outputs = [ "out" "dev" ];
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
owner = "mypaint";
repo = "libmypaint";
rev = "v${version}";
- sha256 = "1pxx8fjdabcindxhzgbhg4p7yanl4ihbd8kq71y2nyi9dqsjr2fw";
+ sha256 = "1fdyywm915mmilfmzp7lz4rnmm05kkw0adrdqpqi4n8icp4d530g";
};
nativeBuildInputs = [
@@ -43,10 +43,6 @@ stdenv.mkDerivation rec {
doCheck = true;
- postPatch = ''
- sed 's|python2|python|' -i autogen.sh
- '';
-
preConfigure = "./autogen.sh";
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix
index 898c659d0f73..71fbda7b4713 100644
--- a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix
+++ b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix
@@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "libmysqlconnectorcpp";
- version = "8.0.19";
+ version = "8.0.20";
src = fetchurl {
url = "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}-src.tar.gz";
- sha256 = "fDvXTOZKkwDn1IG3aziK2VAXpSSAxpi3VVea7GLUoh4=";
+ sha256 = "1jrrbfy6sw4pni72c1hgvchx1zzfpnamp34sjnv82mlvsp8ypsjh";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/libosmium/default.nix b/pkgs/development/libraries/libosmium/default.nix
index e6abe620aaf0..29edf37d80ef 100644
--- a/pkgs/development/libraries/libosmium/default.nix
+++ b/pkgs/development/libraries/libosmium/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libosmium";
- version = "2.15.4";
+ version = "2.15.5";
src = fetchFromGitHub {
owner = "osmcode";
repo = "libosmium";
rev = "v${version}";
- sha256 = "0mlcvqrhp40bzj5r5j9nfc5vbis8hmzcq9xi8jylkciyydaynhz4";
+ sha256 = "1f21dzzkxzi74hv17fs9kb2w6indqvvm4lkxclz4j4x98k8q3n59";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix
index 17f9537e418a..7d0eb7f67dd8 100644
--- a/pkgs/development/libraries/librelp/default.nix
+++ b/pkgs/development/libraries/librelp/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "librelp";
- version = "1.5.0";
+ version = "1.6.0";
src = fetchFromGitHub {
owner = "rsyslog";
repo = "librelp";
rev = "v${version}";
- sha256 = "1il8dany6y981ficrwnxjlc13v5lj6gqia5678p5pj6bcbq7l7lb";
+ sha256 = "132i1b1m7c7hkbxsnpa7n07cbghxjxmcbb8zhgwziaxg4nzxsa6l";
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix
index b4dd8ccbfb55..9443846acf1e 100644
--- a/pkgs/development/libraries/libsolv/default.nix
+++ b/pkgs/development/libraries/libsolv/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }:
stdenv.mkDerivation rec {
- version = "0.7.11";
+ version = "0.7.13";
pname = "libsolv";
src = fetchFromGitHub {
owner = "openSUSE";
repo = "libsolv";
rev = version;
- sha256 = "1jq08qgj05cr9zk5paj3qvma7y2ixvkqlvbszcgmfvx0yq4gl1af";
+ sha256 = "1hjk7r7047i451xjgw72in62pya1h1436fvx945vxlvswl5s6iw8";
};
cmakeFlags = [
diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.2/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.2/default.nix
index 8b9992ec66d4..91e5a54bab16 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/1.2/default.nix
+++ b/pkgs/development/libraries/libtorrent-rasterbar/1.2/default.nix
@@ -3,7 +3,7 @@
}:
let
- version = "1.2.5";
+ version = "1.2.6";
formattedVersion = lib.replaceChars ["."] ["_"] version;
# Make sure we override python, so the correct version is chosen
@@ -18,7 +18,7 @@ in stdenv.mkDerivation {
owner = "arvidn";
repo = "libtorrent";
rev = "libtorrent-${formattedVersion}";
- sha256 = "0y2fzqbvb1bxvf93d7sphwzxih6j40p5p3fay943k26w0nrq802w";
+ sha256 = "140gc9j6lymy5kr0gviqznpg4hl57rz2q6vpb9sjkkimr19lrvdr";
};
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/development/libraries/nco/default.nix
index 321e4e0560d9..629c064404ba 100644
--- a/pkgs/development/libraries/nco/default.nix
+++ b/pkgs/development/libraries/nco/default.nix
@@ -1,17 +1,24 @@
-{ stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr, which, curl, flex }:
+{ stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr, which, curl, flex, coreutils }:
stdenv.mkDerivation rec {
version = "4.9.2";
pname = "nco";
nativeBuildInputs = [ flex which ];
- buildInputs = [ netcdf netcdfcxx4 gsl udunits antlr curl ];
+ buildInputs = [ netcdf netcdfcxx4 gsl udunits antlr curl coreutils ];
src = fetchzip {
url = "https://github.com/nco/nco/archive/${version}.tar.gz";
sha256 = "0nip9dmdx3d5nc30bz1d2w9his1dph136l53r160aa3bmb29xwqn";
};
+ prePatch = ''
+ substituteInPlace src/nco/nco_fl_utl.c \
+ --replace "/bin/cp" "${coreutils}/bin/cp"
+ substituteInPlace src/nco/nco_fl_utl.c \
+ --replace "/bin/mv" "${coreutils}/bin/mv"
+ '';
+
meta = {
description = "NetCDF Operator toolkit";
longDescription = "The NCO (netCDF Operator) toolkit manipulates and analyzes data stored in netCDF-accessible formats, including DAP, HDF4, and HDF5";
diff --git a/pkgs/development/libraries/ndi/default.nix b/pkgs/development/libraries/ndi/default.nix
index 7a4407a17f0d..ec39bbd65937 100644
--- a/pkgs/development/libraries/ndi/default.nix
+++ b/pkgs/development/libraries/ndi/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "ndi";
- fullVersion = "4.1.6";
+ fullVersion = "4.5.1";
version = builtins.head (builtins.splitVersion fullVersion);
src = requireFile rec {
name = "InstallNDISDK_v${version}_Linux.tar.gz";
- sha256 = "0hki805j3hlci6w5ca2cajm5q0y9yihgvpsykkn8dzx8chw4pmsk";
+ sha256 = "04l57cfc88cdqa9015h5g1csr7xfjxp75x8qz8bsqk1dizp9ir6r";
message = ''
In order to use NDI SDK version ${fullVersion}, you need to comply with
NewTek's license and download the appropriate Linux tarball from:
diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix
index 0cda3d6ac9a2..57c47c79f843 100644
--- a/pkgs/development/libraries/nuspell/default.nix
+++ b/pkgs/development/libraries/nuspell/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "nuspell";
- version = "3.1.0";
+ version = "3.1.1";
src = fetchFromGitHub {
owner = "nuspell";
repo = "nuspell";
rev = "v${version}";
- sha256 = "19mwjg5mz645i4ijhx93rqbcim14ca6nczymr20p0z0pn5mx5p18";
+ sha256 = "18zz3rdzlb3knzsd98vw8cfyb3iq0ilipnlz7rz10zgb5ail73s2";
};
nativeBuildInputs = [ cmake pkgconfig ronn ];
diff --git a/pkgs/development/libraries/dnnl/default.nix b/pkgs/development/libraries/oneDNN/default.nix
similarity index 83%
rename from pkgs/development/libraries/dnnl/default.nix
rename to pkgs/development/libraries/oneDNN/default.nix
index 0d29c6eae8bf..7d9adca074c6 100644
--- a/pkgs/development/libraries/dnnl/default.nix
+++ b/pkgs/development/libraries/oneDNN/default.nix
@@ -1,11 +1,10 @@
-{ stdenv, lib, fetchFromGitHub, substituteAll, cmake, bash }:
+{ stdenv, lib, fetchFromGitHub, cmake }:
# This was originally called mkl-dnn, then it was renamed to dnnl, and it has
-# just recently been renamed again to oneDNN. In a follow-up, let's move the
-# attr and alias dnnl -> oneDNN. See here for details:
+# just recently been renamed again to oneDNN. See here for details:
# https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn
stdenv.mkDerivation rec {
- pname = "dnnl";
+ pname = "oneDNN";
version = "1.4";
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/openfst/default.nix b/pkgs/development/libraries/openfst/default.nix
index 49c3c2629c5d..a8e65aebc450 100644
--- a/pkgs/development/libraries/openfst/default.nix
+++ b/pkgs/development/libraries/openfst/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "openfst";
- version = "1.7.4";
+ version = "1.7.6";
src = fetchurl {
url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${pname}-${version}.tar.gz";
- sha256 = "0drhq5348vbaccpa0z3jvd5hyv5bm2i9xrak1wb4yvl2mx77dbmh";
+ sha256 = "03hs0196qbjfbviqn6nnb7igvv3cnpxyizlwlzmx88a6fhiq97bm";
};
meta = {
description = "Library for working with finite-state transducers";
diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix
index f955f464d32d..d8f20d74a0df 100644
--- a/pkgs/development/libraries/rdkafka/default.nix
+++ b/pkgs/development/libraries/rdkafka/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "rdkafka";
- version = "1.3.0";
+ version = "1.4.0";
src = fetchFromGitHub {
owner = "edenhill";
repo = "librdkafka";
rev = "v${version}";
- sha256 = "1arwpvva2b1m3yd618s59v38gwsi0nnm07g6yc9dapcgxrkg5n0h";
+ sha256 = "0axrzjmih1njjpxpwfb6pwjwkjy1b6s5s1sjf165m2cmd6x3vbap";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix
index ce6780f0046a..a69ae5af15f3 100644
--- a/pkgs/development/libraries/science/math/or-tools/default.nix
+++ b/pkgs/development/libraries/science/math/or-tools/default.nix
@@ -8,13 +8,13 @@ let
in stdenv.mkDerivation rec {
pname = "or-tools";
- version = "7.5";
+ version = "7.6";
src = fetchFromGitHub {
owner = "google";
repo = "or-tools";
rev = "v${version}";
- sha256 = "1p9jwdwzcsaa58ap912hdf2w27vna3xl9g4lh6kjskddwi8l3wac";
+ sha256 = "0605q3y7vh7x7m9azrbkx44blq12zrab6v28b9wmpcn1lmykbw1b";
};
# The original build system uses cmake which does things like pull
diff --git a/pkgs/development/libraries/vapoursynth-mvtools/default.nix b/pkgs/development/libraries/vapoursynth-mvtools/default.nix
index dc2869f37239..5fa35751e24f 100644
--- a/pkgs/development/libraries/vapoursynth-mvtools/default.nix
+++ b/pkgs/development/libraries/vapoursynth-mvtools/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "vapoursynth-mvtools";
- version = "21";
+ version = "22";
src = fetchFromGitHub {
owner = "dubhater";
repo = "vapoursynth-mvtools";
rev = "v${version}";
- sha256 = "0vjxpp4jmmjhcp8z81idsbgq6jyx0l4r4i32b8alnp6c9fahjh6p";
+ sha256 = "11al56liaahkr3819iynq83k8n42wvijfv2ja5fsjdl6j4zfzpbr";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix
index 897d3433f19e..811921df3e7c 100644
--- a/pkgs/development/libraries/vte/default.nix
+++ b/pkgs/development/libraries/vte/default.nix
@@ -24,13 +24,13 @@
stdenv.mkDerivation rec {
pname = "vte";
- version = "0.60.1";
+ version = "0.60.2";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1i7h1jvsg115l5djn29n06xsqvygpfagczxy0i9f39zq6dr809ay";
+ sha256 = "19ccbw0yca78h5qcnm8claj4fg1pj68nj1fsjqqfpzhj7w72i81m";
};
passthru = {
diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix
index 438b40d91404..2815520f5179 100644
--- a/pkgs/development/libraries/wolfssl/default.nix
+++ b/pkgs/development/libraries/wolfssl/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "wolfssl";
- version = "4.3.0";
+ version = "4.4.0";
src = fetchFromGitHub {
owner = "wolfSSL";
repo = "wolfssl";
rev = "v${version}-stable";
- sha256 = "1gd613k4qh9yhl0d8yh0flqn2cvm9qb5pp2p0khk31b1fh1p4vin";
+ sha256 = "1bgkxqgxwa5dvi7fkna64wpcs552f3yxvs6fh6d32v7vg88vpfx9";
};
configureFlags = [ "--enable-all" ];
diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix
index 70b650eecb1f..9bea7f5e848b 100644
--- a/pkgs/development/libraries/wxsqlite3/default.nix
+++ b/pkgs/development/libraries/wxsqlite3/default.nix
@@ -1,20 +1,23 @@
-{ stdenv, fetchFromGitHub, wxGTK, sqlite
-, darwin }:
+{ stdenv
+, fetchFromGitHub
+, autoreconfHook
+, wxGTK
+, sqlite
+, darwin
+}:
stdenv.mkDerivation rec {
pname = "wxsqlite3";
- version = "3.3.1";
+ version = "4.5.1";
src = fetchFromGitHub {
owner = "utelle";
repo = "wxsqlite3";
rev = "v${version}";
- sha1 = "bb8p58g88nkdcsj3h4acx7h925n2cy9g";
+ sha256 = "0090f7r3blks18vifkna4l890fwaya58ajh9qblbw9065zj5hrm3";
};
- preBuild = stdenv.lib.optionalString stdenv.isDarwin ''
- cp build28/Info.plist.in build28/wxmac.icns build/
- '';
+ nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ wxGTK sqlite ]
++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.stubs.setfile darwin.stubs.rez darwin.stubs.derez ];
diff --git a/pkgs/development/libraries/wxsqliteplus/default.nix b/pkgs/development/libraries/wxsqliteplus/default.nix
index 6a2e33f9a9f3..18ecea4cbe18 100644
--- a/pkgs/development/libraries/wxsqliteplus/default.nix
+++ b/pkgs/development/libraries/wxsqliteplus/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
owner = "guanlisheng";
repo = "wxsqliteplus";
rev = "v${version}";
- sha1 = "yr9ysviv4hbrxn900z1wz8j32frimvx1";
+ sha256 = "0mgfq813pli56mar7pdxlhwjf5k10j196rs3jd0nc8b6dkzkzlnf";
};
buildInputs = [ wxGTK wxsqlite3 sqlite ];
@@ -24,12 +24,11 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
- mkdir -p $out/bin
- cp wxsqliteplus $out/bin/
+ install -D wxsqliteplus $out/bin/wxsqliteplus
'';
meta = with stdenv.lib; {
- homepage = "http://guanlisheng.com/";
+ homepage = "https://github.com/guanlisheng/wxsqliteplus";
description = "A simple SQLite database browser built with wxWidgets";
platforms = platforms.unix;
maintainers = with maintainers; [ vrthra ];
diff --git a/pkgs/development/lisp-modules/define-package.nix b/pkgs/development/lisp-modules/define-package.nix
index 67a688342b2d..96ceb76f6f22 100644
--- a/pkgs/development/lisp-modules/define-package.nix
+++ b/pkgs/development/lisp-modules/define-package.nix
@@ -43,7 +43,7 @@ let
chmod a+x "$launch_script"
echo "#! ${stdenv.shell}" >> "$launch_script"
echo "source '$config_script'" >> "$launch_script"
- echo "test -n \"\$NIX_LISP_LD_LIBRARY_PATH\" export LD_LIBRARY_PATH=\"\$NIX_LISP_LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}\$LD_LIBRARY_PATH\"" >> "$launch_script"
+ echo "test -n \"\$NIX_LISP_LD_LIBRARY_PATH\" && export LD_LIBRARY_PATH=\"\$NIX_LISP_LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}\$LD_LIBRARY_PATH\"" >> "$launch_script"
echo '"${clwrapper}/bin/common-lisp.sh" "$@"' >> "$launch_script"
'';
moveAsdFiles = ''
diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix
index 95edbef44e34..ce2c91bfac17 100644
--- a/pkgs/development/node-packages/node-packages-v10.nix
+++ b/pkgs/development/node-packages/node-packages-v10.nix
@@ -22,67 +22,67 @@ let
sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ==";
};
};
- "@angular-devkit/architect-0.901.3" = {
+ "@angular-devkit/architect-0.901.4" = {
name = "_at_angular-devkit_slash_architect";
packageName = "@angular-devkit/architect";
- version = "0.901.3";
+ version = "0.901.4";
src = fetchurl {
- url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.901.3.tgz";
- sha512 = "CFjSj48nOJwejmFFtenIqSZWyxRe4fRQsg16l0R4sagW7YwMJSaW6Yl9hRHM8bviPRrTpGHnxeq1x506v1ARLw==";
+ url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.901.4.tgz";
+ sha512 = "w4RMj7eLhUSh70HUy5tW4EXjLQFXk0Lfr9WiSy5gvPGp+zzYxknI+Wn4Xid1wU/WS+4tuMv5nJIaNaH2sABESQ==";
};
};
- "@angular-devkit/core-9.1.3" = {
+ "@angular-devkit/core-9.1.4" = {
name = "_at_angular-devkit_slash_core";
packageName = "@angular-devkit/core";
- version = "9.1.3";
+ version = "9.1.4";
src = fetchurl {
- url = "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.3.tgz";
- sha512 = "VRV96prPy0Kdlm6XmI7DITqSMSc1bINimnOhzQre3euDX5OQty+EUqaexHtMv/SPDZX1agP+buHr6viv9YEhzA==";
+ url = "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.4.tgz";
+ sha512 = "OPFQDmT4XabLMSRDgmnzedlOrc83DzQIgLcfoh/UhZ7aJKf/2Vq4l09p/DkMNI36vN5BRL0zDZt7TjvKNgyYgA==";
};
};
- "@angular-devkit/schematics-9.1.3" = {
+ "@angular-devkit/schematics-9.1.4" = {
name = "_at_angular-devkit_slash_schematics";
packageName = "@angular-devkit/schematics";
- version = "9.1.3";
+ version = "9.1.4";
src = fetchurl {
- url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.1.3.tgz";
- sha512 = "nNRoQPqoin5jzLKmTabIPLSqVw2Zjnk78XC4AhAM7rSisWMsZ6pw5+BNDITiKfq0LkSXfOs0DoJV/Vr9mLkn/A==";
+ url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.1.4.tgz";
+ sha512 = "RAbdnUEZ3JTLmWSBiXT5trsVx8Fi72fxN9CiRaluM09Cytg6BUc1wC5XCO0YPvhI400+3Ro1nwjPXezjg7LXzQ==";
};
};
- "@antora/asciidoc-loader-2.3.0" = {
+ "@antora/asciidoc-loader-2.3.1" = {
name = "_at_antora_slash_asciidoc-loader";
packageName = "@antora/asciidoc-loader";
- version = "2.3.0";
+ version = "2.3.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@antora/asciidoc-loader/-/asciidoc-loader-2.3.0.tgz";
- sha512 = "mncSlmkk6rYH5SGplZtHjuieG3ve5bhm4x0f9WIFE+GhqajIogDjxTBNWNr9B2dVA4bMves7Sy+c5h+f9V3iVw==";
+ url = "https://registry.npmjs.org/@antora/asciidoc-loader/-/asciidoc-loader-2.3.1.tgz";
+ sha512 = "YSf5oEExzrR+O7FizQAeIYyP/BAGvhGw9inACFF3Er3fzCR/sOvPadT6a/slW//tVGLF3eul0ARvw7QAvo6yHQ==";
};
};
- "@antora/content-aggregator-2.3.0" = {
+ "@antora/content-aggregator-2.3.1" = {
name = "_at_antora_slash_content-aggregator";
packageName = "@antora/content-aggregator";
- version = "2.3.0";
+ version = "2.3.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@antora/content-aggregator/-/content-aggregator-2.3.0.tgz";
- sha512 = "LbH65Hw5uk3QCX8sCsJGnIVapQbtkxgyaDAfxYJlXnBI4jjd92391k0vitFL7f+9dzEvSdzxUHJU/lPyi9eB6g==";
+ url = "https://registry.npmjs.org/@antora/content-aggregator/-/content-aggregator-2.3.1.tgz";
+ sha512 = "DKrM7FtK5ivWHmQjMkPYkn3S4jQ9Sy6QiNfKYcg/EcIee5k3VPRjYHn40nPY0gS+R4zElRJhru6bHOpnkGJYVA==";
};
};
- "@antora/content-classifier-2.3.0" = {
+ "@antora/content-classifier-2.3.1" = {
name = "_at_antora_slash_content-classifier";
packageName = "@antora/content-classifier";
- version = "2.3.0";
+ version = "2.3.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@antora/content-classifier/-/content-classifier-2.3.0.tgz";
- sha512 = "x/GUrm62+zSA8uQYaPG1y8NDALSDeKKl+um0CrxV5nt8c6vEO80KODN4YEPqoC0tOq8zdT99J6ElYblpkxrW6Q==";
+ url = "https://registry.npmjs.org/@antora/content-classifier/-/content-classifier-2.3.1.tgz";
+ sha512 = "d9vfhxcJY8DdU43h93cK96/Te2eKcJeA4pCljQrRUFpguZndMVrmWMxp8wzOYYSMIIukwcZVa3AISz86RNvrYA==";
};
};
- "@antora/document-converter-2.3.0" = {
+ "@antora/document-converter-2.3.1" = {
name = "_at_antora_slash_document-converter";
packageName = "@antora/document-converter";
- version = "2.3.0";
+ version = "2.3.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@antora/document-converter/-/document-converter-2.3.0.tgz";
- sha512 = "RMvdqBIz+pXf5znuyVeR7GF8qw/zLfaRMmEzMzywYa+8Cappxy+pgs+BuAuH1TdAnsFzpPrIO211c2FE1OxXBg==";
+ url = "https://registry.npmjs.org/@antora/document-converter/-/document-converter-2.3.1.tgz";
+ sha512 = "5vnr3twkunAkv04NaqgLtXQTTlRNsvTo/jpVrUQ6DNQHE3l3Sr0z/6u4GWkueI95L/PFlFQ79WUNsBPLICfLrA==";
};
};
"@antora/expand-path-helper-1.0.0" = {
@@ -94,67 +94,67 @@ let
sha512 = "hg3y6M3OvRTb7jtLAnwwloYDxafbyKYttcf16kGCXvP7Wqosh7c+Ag+ltaZ7VSebpzpphO/umb/BXdpU7rxapw==";
};
};
- "@antora/navigation-builder-2.3.0" = {
+ "@antora/navigation-builder-2.3.1" = {
name = "_at_antora_slash_navigation-builder";
packageName = "@antora/navigation-builder";
- version = "2.3.0";
+ version = "2.3.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@antora/navigation-builder/-/navigation-builder-2.3.0.tgz";
- sha512 = "bpdT50pUW8IbRHAwlwaRdMlqwdTCOGdh0novW2Z6uBi6KKKbl6K3BdbaVs/jwXalESWqkYHcyBpinMivsX4bBA==";
+ url = "https://registry.npmjs.org/@antora/navigation-builder/-/navigation-builder-2.3.1.tgz";
+ sha512 = "kWsi/wn/+IEljBdR6dSE6TFrF+KUfOlDQTnq9YmMzdUCLJRk7Cvz36zsbDFRE8cgqkuunddfsA6oOECgXLQyrw==";
};
};
- "@antora/page-composer-2.3.0" = {
+ "@antora/page-composer-2.3.1" = {
name = "_at_antora_slash_page-composer";
packageName = "@antora/page-composer";
- version = "2.3.0";
+ version = "2.3.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@antora/page-composer/-/page-composer-2.3.0.tgz";
- sha512 = "ve4h3uColNuqGehSJ2qUw5dar1Ls3i+RBYh2HyVZZ84qjLoOjPGAALFYzRVJnYlEX6nAswNFhh5ll/hIuaxuHQ==";
+ url = "https://registry.npmjs.org/@antora/page-composer/-/page-composer-2.3.1.tgz";
+ sha512 = "HVZR5GgF+aA41Y0FVOmRHkI5Hn+ab4giJ5FvKwMZlqF10zd0u+rne6+0664kC08wYUIr40/OMayCRgIHPqEwuQ==";
};
};
- "@antora/playbook-builder-2.3.0" = {
+ "@antora/playbook-builder-2.3.1" = {
name = "_at_antora_slash_playbook-builder";
packageName = "@antora/playbook-builder";
- version = "2.3.0";
+ version = "2.3.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@antora/playbook-builder/-/playbook-builder-2.3.0.tgz";
- sha512 = "zuuTqY5dDXYhu4LfmFW3qzdFXSrXSo9NCDX9eBJ6MCXsuj64PqdOljzv4rWNy3HvmKOSCupfWCashJS0vuH2Dw==";
+ url = "https://registry.npmjs.org/@antora/playbook-builder/-/playbook-builder-2.3.1.tgz";
+ sha512 = "/gl4H/0ey/Uc80GaomZoz10c/f8TX4bQ70SR+BlKrwjwsHCskfffVa+jvMAjnOlP0SGEPwIGkifWPGQbTHdH7A==";
};
};
- "@antora/redirect-producer-2.3.0" = {
+ "@antora/redirect-producer-2.3.1" = {
name = "_at_antora_slash_redirect-producer";
packageName = "@antora/redirect-producer";
- version = "2.3.0";
+ version = "2.3.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@antora/redirect-producer/-/redirect-producer-2.3.0.tgz";
- sha512 = "/632VZlkpFIh5KlV3A9LqE4yGtYyQ+1vOb5A9yajYWsCnhqNfEMslMWuoLoQk4gzs3Ju+hz5MrAXp8sn1vbRvg==";
+ url = "https://registry.npmjs.org/@antora/redirect-producer/-/redirect-producer-2.3.1.tgz";
+ sha512 = "2iDYwygpZ5xHrSflnDIn+kzLt+9jXKOTRHXXqCQHYZuHANQVEYLI93yOXivvFZZvX/jaRzZBF7uTI3FGwg2Isw==";
};
};
- "@antora/site-mapper-2.3.0" = {
+ "@antora/site-mapper-2.3.1" = {
name = "_at_antora_slash_site-mapper";
packageName = "@antora/site-mapper";
- version = "2.3.0";
+ version = "2.3.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@antora/site-mapper/-/site-mapper-2.3.0.tgz";
- sha512 = "XzIoYKJQXgOzsDeUlL/edVR9B9aaCYUHADvzYqDc1S5/czFQxpqIIgMfYCiYYc7pHk6nmj5rgx/6HfvDImv87w==";
+ url = "https://registry.npmjs.org/@antora/site-mapper/-/site-mapper-2.3.1.tgz";
+ sha512 = "EkHEEPz0CfLJuE8lx6s9b8+jEC8krFN29zAqK6WaOTi34Tqhv5H/W14mk7IJfy8nWjIjZgP/q/a8gJK9LegYaw==";
};
};
- "@antora/site-publisher-2.3.0" = {
+ "@antora/site-publisher-2.3.1" = {
name = "_at_antora_slash_site-publisher";
packageName = "@antora/site-publisher";
- version = "2.3.0";
+ version = "2.3.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@antora/site-publisher/-/site-publisher-2.3.0.tgz";
- sha512 = "2qC0fDE70VKtyttPpRx9glPWL4M5x7HYVCs1K6+GmpuISmljO3c/09L+ExPsJiSVVFarnWmMu0w+76XqSRHlog==";
+ url = "https://registry.npmjs.org/@antora/site-publisher/-/site-publisher-2.3.1.tgz";
+ sha512 = "s42S+e3IF5qLgL7N42LpcGc2+UcsJBrY9B10fUP0WQFM51LsNWIwQmU3EheoSEUjo5JvQYi5vlQsHlb7j8TCPA==";
};
};
- "@antora/ui-loader-2.3.0" = {
+ "@antora/ui-loader-2.3.1" = {
name = "_at_antora_slash_ui-loader";
packageName = "@antora/ui-loader";
- version = "2.3.0";
+ version = "2.3.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@antora/ui-loader/-/ui-loader-2.3.0.tgz";
- sha512 = "EcBUwd4ImWI/BH0dZpH6CfDzBnAtQ2qUPChaeqVbmfCNpBvH6t09YYRVA713no21ypAF3AwBs3FGU1+vR6T/IQ==";
+ url = "https://registry.npmjs.org/@antora/ui-loader/-/ui-loader-2.3.1.tgz";
+ sha512 = "0uZDixaamnMnGJvl1M5bqW2ac8+6W2KZcfOTwPBEJJCLTGiZe4GASB+zR7tXNyrUr51zLuCjxPNcEbzGEfRxAQ==";
};
};
"@apollo/federation-0.14.1" = {
@@ -256,22 +256,22 @@ let
sha512 = "a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==";
};
};
- "@babel/compat-data-7.9.0" = {
+ "@babel/compat-data-7.9.6" = {
name = "_at_babel_slash_compat-data";
packageName = "@babel/compat-data";
- version = "7.9.0";
+ version = "7.9.6";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.9.0.tgz";
- sha512 = "zeFQrr+284Ekvd9e7KAX954LkapWiOmQtsfHirhxqfdlX6MEC32iRE+pqUGlYIBchdevaCwvzxWGSy/YBNI85g==";
+ url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.9.6.tgz";
+ sha512 = "5QPTrNen2bm7RBc7dsOmcA5hbrS4O2Vhmk5XOL4zWW/zD/hV0iinpefDlkm+tBBy8kDtFaaeEvmAqt+nURAV2g==";
};
};
- "@babel/core-7.9.0" = {
+ "@babel/core-7.9.6" = {
name = "_at_babel_slash_core";
packageName = "@babel/core";
- version = "7.9.0";
+ version = "7.9.6";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz";
- sha512 = "kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==";
+ url = "https://registry.npmjs.org/@babel/core/-/core-7.9.6.tgz";
+ sha512 = "nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==";
};
};
"@babel/generator-7.0.0-beta.38" = {
@@ -292,6 +292,15 @@ let
sha512 = "GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==";
};
};
+ "@babel/generator-7.9.6" = {
+ name = "_at_babel_slash_generator";
+ packageName = "@babel/generator";
+ version = "7.9.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz";
+ sha512 = "+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==";
+ };
+ };
"@babel/helper-annotate-as-pure-7.8.3" = {
name = "_at_babel_slash_helper-annotate-as-pure";
packageName = "@babel/helper-annotate-as-pure";
@@ -328,22 +337,22 @@ let
sha512 = "HAagjAC93tk748jcXpZ7oYRZH485RCq/+yEv9SIWezHRPv9moZArTnkUNciUNzvwHUABmiWKlcxJvMcu59UwTg==";
};
};
- "@babel/helper-compilation-targets-7.8.7" = {
+ "@babel/helper-compilation-targets-7.9.6" = {
name = "_at_babel_slash_helper-compilation-targets";
packageName = "@babel/helper-compilation-targets";
- version = "7.8.7";
+ version = "7.9.6";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.7.tgz";
- sha512 = "4mWm8DCK2LugIS+p1yArqvG1Pf162upsIsjE7cNBjez+NjliQpVhj20obE520nao0o14DaTnFJv+Fw5a0JpoUw==";
+ url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.9.6.tgz";
+ sha512 = "x2Nvu0igO0ejXzx09B/1fGBxY9NXQlBW2kZsSxCJft+KHN8t9XWzIvFxtPHnBOAXpVsdxZKZFbRUC8TsNKajMw==";
};
};
- "@babel/helper-create-class-features-plugin-7.9.5" = {
+ "@babel/helper-create-class-features-plugin-7.9.6" = {
name = "_at_babel_slash_helper-create-class-features-plugin";
packageName = "@babel/helper-create-class-features-plugin";
- version = "7.9.5";
+ version = "7.9.6";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.9.5.tgz";
- sha512 = "IipaxGaQmW4TfWoXdqjY0TzoXQ1HRS0kPpEgvjosb3u7Uedcq297xFqDQiCcQtRRwzIMif+N1MLVI8C5a4/PAA==";
+ url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.9.6.tgz";
+ sha512 = "6N9IeuyHvMBRyjNYOMJHrhwtu4WJMrYf8hVbEHD3pbbbmNOk1kmXSQs7bA4dYDUaIx4ZEzdnvo6NwC3WHd/Qow==";
};
};
"@babel/helper-create-regexp-features-plugin-7.8.8" = {
@@ -463,13 +472,13 @@ let
sha512 = "kgwDmw4fCg7AVgS4DukQR/roGp+jP+XluJE5hsRZwxCYGg+Rv9wSGErDWhlI90FODdYfd4xG4AQRiMDjjN0GzA==";
};
};
- "@babel/helper-replace-supers-7.8.6" = {
+ "@babel/helper-replace-supers-7.9.6" = {
name = "_at_babel_slash_helper-replace-supers";
packageName = "@babel/helper-replace-supers";
- version = "7.8.6";
+ version = "7.9.6";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz";
- sha512 = "PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==";
+ url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.9.6.tgz";
+ sha512 = "qX+chbxkbArLyCImk3bWV+jB5gTNU/rsze+JlcF6Nf8tVTigPJSI1o1oBow/9Resa1yehUO9lIipsmu9oG4RzA==";
};
};
"@babel/helper-simple-access-7.8.3" = {
@@ -508,13 +517,13 @@ let
sha512 = "LACJrbUET9cQDzb6kG7EeD7+7doC3JNvUgTEQOx2qaO1fKlzE/Bf05qs9w1oXQMmXlPO65lC3Tq9S6gZpTErEQ==";
};
};
- "@babel/helpers-7.9.2" = {
+ "@babel/helpers-7.9.6" = {
name = "_at_babel_slash_helpers";
packageName = "@babel/helpers";
- version = "7.9.2";
+ version = "7.9.6";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.2.tgz";
- sha512 = "JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA==";
+ url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.6.tgz";
+ sha512 = "tI4bUbldloLcHWoRUMAj4g1bF313M/o6fBKhIsb3QnGVPwRm9JsNf/gqMkQ7zjqReABiffPV6RWj7hEglID5Iw==";
};
};
"@babel/highlight-7.9.0" = {
@@ -526,13 +535,13 @@ let
sha512 = "lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==";
};
};
- "@babel/parser-7.9.4" = {
+ "@babel/parser-7.9.6" = {
name = "_at_babel_slash_parser";
packageName = "@babel/parser";
- version = "7.9.4";
+ version = "7.9.6";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz";
- sha512 = "bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==";
+ url = "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz";
+ sha512 = "AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==";
};
};
"@babel/plugin-external-helpers-7.8.3" = {
@@ -598,13 +607,13 @@ let
sha512 = "jWioO1s6R/R+wEHizfaScNsAx+xKgwTLNXSh7tTC4Usj3ItsPEhYkEpU4h+lpnBwq7NBVOJXfO6cRFYcX69JUQ==";
};
};
- "@babel/plugin-proposal-object-rest-spread-7.9.5" = {
+ "@babel/plugin-proposal-object-rest-spread-7.9.6" = {
name = "_at_babel_slash_plugin-proposal-object-rest-spread";
packageName = "@babel/plugin-proposal-object-rest-spread";
- version = "7.9.5";
+ version = "7.9.6";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.5.tgz";
- sha512 = "VP2oXvAf7KCYTthbUHwBlewbl1Iq059f6seJGsxMizaCdgHIeczOr7FBqELhSqfkIl04Fi8okzWzl63UKbQmmg==";
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.6.tgz";
+ sha512 = "Ga6/fhGqA9Hj+y6whNpPv8psyaK5xzrQwSPsGPloVkvmH+PqW1ixdnfJ9uIO06OjQNYol3PMnfmJ8vfZtkzF+A==";
};
};
"@babel/plugin-proposal-optional-catch-binding-7.8.3" = {
@@ -904,31 +913,31 @@ let
sha512 = "3Wk2EXhnw+rP+IDkK6BdtPKsUE5IeZ6QOGrPYvw52NwBStw9V1ZVzxgK6fSKSxqUvH9eQPR3tm3cOq79HlsKYA==";
};
};
- "@babel/plugin-transform-modules-amd-7.9.0" = {
+ "@babel/plugin-transform-modules-amd-7.9.6" = {
name = "_at_babel_slash_plugin-transform-modules-amd";
packageName = "@babel/plugin-transform-modules-amd";
- version = "7.9.0";
+ version = "7.9.6";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.0.tgz";
- sha512 = "vZgDDF003B14O8zJy0XXLnPH4sg+9X5hFBBGN1V+B2rgrB+J2xIypSN6Rk9imB2hSTHQi5OHLrFWsZab1GMk+Q==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.6.tgz";
+ sha512 = "zoT0kgC3EixAyIAU+9vfaUVKTv9IxBDSabgHoUCBP6FqEJ+iNiN7ip7NBKcYqbfUDfuC2mFCbM7vbu4qJgOnDw==";
};
};
- "@babel/plugin-transform-modules-commonjs-7.9.0" = {
+ "@babel/plugin-transform-modules-commonjs-7.9.6" = {
name = "_at_babel_slash_plugin-transform-modules-commonjs";
packageName = "@babel/plugin-transform-modules-commonjs";
- version = "7.9.0";
+ version = "7.9.6";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.0.tgz";
- sha512 = "qzlCrLnKqio4SlgJ6FMMLBe4bySNis8DFn1VkGmOcxG9gqEyPIOzeQrA//u0HAKrWpJlpZbZMPB1n/OPa4+n8g==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.6.tgz";
+ sha512 = "7H25fSlLcn+iYimmsNe3uK1at79IE6SKW9q0/QeEHTMC9MdOZ+4bA+T1VFB5fgOqBWoqlifXRzYD0JPdmIrgSQ==";
};
};
- "@babel/plugin-transform-modules-systemjs-7.9.0" = {
+ "@babel/plugin-transform-modules-systemjs-7.9.6" = {
name = "_at_babel_slash_plugin-transform-modules-systemjs";
packageName = "@babel/plugin-transform-modules-systemjs";
- version = "7.9.0";
+ version = "7.9.6";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.0.tgz";
- sha512 = "FsiAv/nao/ud2ZWy4wFacoLOm5uxl0ExSQ7ErvP7jpoihLR6Cq90ilOFyX9UXct3rbtKsAiZ9kFt5XGfPe/5SQ==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.6.tgz";
+ sha512 = "NW5XQuW3N2tTHim8e1b7qGy7s0kZ2OH3m5octc49K1SdAKGxYxeIx7hiIz05kS1R2R+hOWcsr1eYwcGhrdHsrg==";
};
};
"@babel/plugin-transform-modules-umd-7.9.0" = {
@@ -1012,13 +1021,13 @@ let
sha512 = "mwMxcycN3omKFDjDQUl+8zyMsBfjRFr0Zn/64I41pmjv4NJuqcYlEtezwYtw9TFd9WR1vN5kiM+O0gMZzO6L0A==";
};
};
- "@babel/plugin-transform-runtime-7.9.0" = {
+ "@babel/plugin-transform-runtime-7.9.6" = {
name = "_at_babel_slash_plugin-transform-runtime";
packageName = "@babel/plugin-transform-runtime";
- version = "7.9.0";
+ version = "7.9.6";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.0.tgz";
- sha512 = "pUu9VSf3kI1OqbWINQ7MaugnitRss1z533436waNXp+0N3ur3zfut37sXiQMxkuCF4VUjwZucen/quskCh7NHw==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.6.tgz";
+ sha512 = "qcmiECD0mYOjOIt8YHNsAP1SxPooC/rDmfmiSK9BNY72EitdSc7l44WTEklaWuFtbOEBjNhWWyph/kOImbNJ4w==";
};
};
"@babel/plugin-transform-shorthand-properties-7.8.3" = {
@@ -1066,13 +1075,13 @@ let
sha512 = "2QKyfjGdvuNfHsb7qnBBlKclbD4CfshH2KvDabiijLMGXPHJXGxtDzwIF7bQP+T0ysw8fYTtxPafgfs/c1Lrqg==";
};
};
- "@babel/plugin-transform-typescript-7.9.4" = {
+ "@babel/plugin-transform-typescript-7.9.6" = {
name = "_at_babel_slash_plugin-transform-typescript";
packageName = "@babel/plugin-transform-typescript";
- version = "7.9.4";
+ version = "7.9.6";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.9.4.tgz";
- sha512 = "yeWeUkKx2auDbSxRe8MusAG+n4m9BFY/v+lPjmQDgOFX5qnySkUY5oXzkp6FwPdsYqnKay6lorXYdC0n3bZO7w==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.9.6.tgz";
+ sha512 = "8OvsRdvpt3Iesf2qsAn+YdlwAJD7zJ+vhFZmDCa4b8dTp7MmHtKk5FF2mCsGxjZwuwsy/yIIay/nLmxST1ctVQ==";
};
};
"@babel/plugin-transform-unicode-regex-7.8.3" = {
@@ -1093,13 +1102,13 @@ let
sha512 = "/TS23MVvo34dFmf8mwCisCbWGrfhbiWZSwBo6HkADTBhUa2Q/jWltyY/tpofz/b6/RIhqaqQcquptCirqIhOaQ==";
};
};
- "@babel/preset-env-7.9.5" = {
+ "@babel/preset-env-7.9.6" = {
name = "_at_babel_slash_preset-env";
packageName = "@babel/preset-env";
- version = "7.9.5";
+ version = "7.9.6";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.9.5.tgz";
- sha512 = "eWGYeADTlPJH+wq1F0wNfPbVS1w1wtmMJiYk55Td5Yu28AsdR9AsC97sZ0Qq8fHqQuslVSIYSGJMcblr345GfQ==";
+ url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.9.6.tgz";
+ sha512 = "0gQJ9RTzO0heXOhzftog+a/WyOuqMrAIugVYxMYf83gh1CQaQDjMtsOpqOwXyDL/5JcWsrCm8l4ju8QC97O7EQ==";
};
};
"@babel/preset-flow-7.9.0" = {
@@ -1165,13 +1174,22 @@ let
sha512 = "NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==";
};
};
- "@babel/runtime-corejs3-7.9.2" = {
+ "@babel/runtime-7.9.6" = {
+ name = "_at_babel_slash_runtime";
+ packageName = "@babel/runtime";
+ version = "7.9.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz";
+ sha512 = "64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==";
+ };
+ };
+ "@babel/runtime-corejs3-7.9.6" = {
name = "_at_babel_slash_runtime-corejs3";
packageName = "@babel/runtime-corejs3";
- version = "7.9.2";
+ version = "7.9.6";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.9.2.tgz";
- sha512 = "HHxmgxbIzOfFlZ+tdeRKtaxWOMUoCG5Mu3wKeUmOxjYrwb3AAHgnmtCUbPPK11/raIWLIBK250t8E2BPO0p7jA==";
+ url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.9.6.tgz";
+ sha512 = "6toWAfaALQjt3KMZQc6fABqZwUDDuWzz+cAfPhqyEnzxvdWOAkjwPNxgF8xlmo7OWLsSjaKjsskpKHRLaMArOA==";
};
};
"@babel/template-7.8.6" = {
@@ -1183,13 +1201,13 @@ let
sha512 = "zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==";
};
};
- "@babel/traverse-7.9.5" = {
+ "@babel/traverse-7.9.6" = {
name = "_at_babel_slash_traverse";
packageName = "@babel/traverse";
- version = "7.9.5";
+ version = "7.9.6";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.5.tgz";
- sha512 = "c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==";
+ url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.6.tgz";
+ sha512 = "b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==";
};
};
"@babel/types-7.0.0-beta.38" = {
@@ -1210,6 +1228,15 @@ let
sha512 = "XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==";
};
};
+ "@babel/types-7.9.6" = {
+ name = "_at_babel_slash_types";
+ packageName = "@babel/types";
+ version = "7.9.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz";
+ sha512 = "qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==";
+ };
+ };
"@chemzqm/neovim-5.1.9" = {
name = "_at_chemzqm_slash_neovim";
packageName = "@chemzqm/neovim";
@@ -1561,22 +1588,22 @@ let
sha512 = "tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==";
};
};
- "@jest/transform-25.4.0" = {
+ "@jest/transform-25.5.1" = {
name = "_at_jest_slash_transform";
packageName = "@jest/transform";
- version = "25.4.0";
+ version = "25.5.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@jest/transform/-/transform-25.4.0.tgz";
- sha512 = "t1w2S6V1sk++1HHsxboWxPEuSpN8pxEvNrZN+Ud/knkROWtf8LeUmz73A4ezE8476a5AM00IZr9a8FO9x1+j3g==";
+ url = "https://registry.npmjs.org/@jest/transform/-/transform-25.5.1.tgz";
+ sha512 = "Y8CEoVwXb4QwA6Y/9uDkn0Xfz0finGkieuV0xkdF9UtZGJeLukD5nLkaVrVsODB1ojRWlaoD0AJZpVHCSnJEvg==";
};
};
- "@jest/types-25.4.0" = {
+ "@jest/types-25.5.0" = {
name = "_at_jest_slash_types";
packageName = "@jest/types";
- version = "25.4.0";
+ version = "25.5.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz";
- sha512 = "XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==";
+ url = "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz";
+ sha512 = "OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==";
};
};
"@kbrandwijk/swagger-to-graphql-2.4.3" = {
@@ -2137,58 +2164,58 @@ let
sha512 = "nGwwmkdm3tuLdEkWMIwLBgFBfMFILILxcZIQY0dfqsdboN2iZdKfOYKUOKoa0wXw1FL1PL3yEYGPCXhwodQDTA==";
};
};
- "@node-red/editor-api-1.0.5" = {
+ "@node-red/editor-api-1.0.6" = {
name = "_at_node-red_slash_editor-api";
packageName = "@node-red/editor-api";
- version = "1.0.5";
+ version = "1.0.6";
src = fetchurl {
- url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.0.5.tgz";
- sha512 = "YYzc+EQJBSqkzip9Gm+sw8yK0HVLougiLs9xmqOxmMXQCiH56kyB1Tip+CRExsAgSqM1fLITxtBNkzAPgiP0pQ==";
+ url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.0.6.tgz";
+ sha512 = "9LieY6LSDtvj43IbpmCs9MmSGdPjOEmtsi+T13dXxxmil4ngedvJ7uMP1d96eKLW/b6Viuk7kx2olSGtUqgqLg==";
};
};
- "@node-red/editor-client-1.0.5" = {
+ "@node-red/editor-client-1.0.6" = {
name = "_at_node-red_slash_editor-client";
packageName = "@node-red/editor-client";
- version = "1.0.5";
+ version = "1.0.6";
src = fetchurl {
- url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.0.5.tgz";
- sha512 = "7SDm0JxWnME3gWgTkbZey0zaWE18ehWLxNkI+A/CSp/ubwJJf8YGDAXWzDOW/ZxQumjWI3PrMnck/p/U2F6I/w==";
+ url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.0.6.tgz";
+ sha512 = "V8zsj+wKY6RzOX92ePdgJtJdmOT9Whfz6CTN34/H2pZlzFA/+KE/sippkInRrx+ujTp4uI2ycAGJ7i1Qkt8ztw==";
};
};
- "@node-red/nodes-1.0.5" = {
+ "@node-red/nodes-1.0.6" = {
name = "_at_node-red_slash_nodes";
packageName = "@node-red/nodes";
- version = "1.0.5";
+ version = "1.0.6";
src = fetchurl {
- url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.0.5.tgz";
- sha512 = "rS+qVwY/I0sapyhQ695OO3GxdSfrV9FShZ8DywIwkrMq8Xzmhbi0WmOyQASok/2TPROGYRcTPq5QITtWWh7saA==";
+ url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.0.6.tgz";
+ sha512 = "4+wTiwhJlhLL6HV3YBLOGHSIcfygf4YxP/fJDkG+vy09pRyux/NqZ06NiqhYs+d+Ndf13LIc20KTEzN3pLW2Rw==";
};
};
- "@node-red/registry-1.0.5" = {
+ "@node-red/registry-1.0.6" = {
name = "_at_node-red_slash_registry";
packageName = "@node-red/registry";
- version = "1.0.5";
+ version = "1.0.6";
src = fetchurl {
- url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.0.5.tgz";
- sha512 = "UJEJp3oBVfkoy0ajQeU531GS5RRph5Gg2eDrTICYTASAwR/VuuoSBziRVSwxIYBOTqBiNc1Uc3cCzp7JSvt0rw==";
+ url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.0.6.tgz";
+ sha512 = "jDNfcNyphjpywHmXfNuZhM593ox9qHMYmL6ZQQiyERwiJwSkGp2zzNicNBe10ysk5ENr36xdP46BryWu/j9xIA==";
};
};
- "@node-red/runtime-1.0.5" = {
+ "@node-red/runtime-1.0.6" = {
name = "_at_node-red_slash_runtime";
packageName = "@node-red/runtime";
- version = "1.0.5";
+ version = "1.0.6";
src = fetchurl {
- url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.0.5.tgz";
- sha512 = "NWpRW9j2DGBU85zihjXz7fDj8RfwFmBmoMvzJ3XsbXJNFjK78loKqrLgzPscSECVZh/ouXRCQ7tQThzdGUYE9A==";
+ url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.0.6.tgz";
+ sha512 = "6eat9FZlIcydm0+VoUjlbxf9TyyLu0zTCWWANqGhu5Ab8o366WSOAxyIzJ5QL56FLQ+V6040YWmurBl+bGRGjg==";
};
};
- "@node-red/util-1.0.5" = {
+ "@node-red/util-1.0.6" = {
name = "_at_node-red_slash_util";
packageName = "@node-red/util";
- version = "1.0.5";
+ version = "1.0.6";
src = fetchurl {
- url = "https://registry.npmjs.org/@node-red/util/-/util-1.0.5.tgz";
- sha512 = "4exRjV72vzrr62vaVz0tvviq6rimuqIFxsOMq0tdbNFyXNmdwU6VXB9WaMBhEnSgIhljo2OO2vrXIUyeCagVmA==";
+ url = "https://registry.npmjs.org/@node-red/util/-/util-1.0.6.tgz";
+ sha512 = "uncyHShA6strCJr1puqrpxsKcb7We2bmo/8xHk91pAQw4dr3jm4S+v/m9tYqVqtXkkW2cfJ6n3bRHJHbOZNW0Q==";
};
};
"@nodelib/fs.scandir-2.1.3" = {
@@ -2236,13 +2263,13 @@ let
sha512 = "JtktVH7ASBVIWsQTFlFpeOzhBJskvoBCTfeeRhhZy7ybATcUvwiwotZ8j5rkqUUyB69lIy/AvboiiiGBjYBKBA==";
};
};
- "@npmcli/git-2.0.1" = {
+ "@npmcli/git-2.0.2" = {
name = "_at_npmcli_slash_git";
packageName = "@npmcli/git";
- version = "2.0.1";
+ version = "2.0.2";
src = fetchurl {
- url = "https://registry.npmjs.org/@npmcli/git/-/git-2.0.1.tgz";
- sha512 = "hVatexiBtx71F01Ars38Hr5AFUGmJgHAfQtRlO5fJlnAawRGSXwEFgjB5i3XdUUmElZU/RXy7fefN02dZKxgPw==";
+ url = "https://registry.npmjs.org/@npmcli/git/-/git-2.0.2.tgz";
+ sha512 = "uv9+EuP5YWluNPgkEOL+iyB/+MVt4U5PMBCfl+I8korKluFdiSp7RxjXYzpWM/wU4wXaROAUFiOiCMmBftonjw==";
};
};
"@npmcli/installed-package-contents-1.0.5" = {
@@ -2263,6 +2290,15 @@ let
sha512 = "nFtqjVETliApiRdjbYwKwhlSHx2ZMagyj5b9YbNt0BWeeOVxJd47ZVE2u16vxDHyTOZvk+YLV7INwfAE9a2uow==";
};
};
+ "@npmcli/run-script-1.3.1" = {
+ name = "_at_npmcli_slash_run-script";
+ packageName = "@npmcli/run-script";
+ version = "1.3.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.3.1.tgz";
+ sha512 = "9Ea57XJjNLtBFRAaiKqqdoqRrL2QkM0vvCbMjPecljhog5IHupStPtZULbl0CoGN00N3lhLWJ4PaIEC0MGjqJw==";
+ };
+ };
"@oclif/color-0.0.0" = {
name = "_at_oclif_slash_color";
packageName = "@oclif/color";
@@ -2461,13 +2497,13 @@ let
sha512 = "gfFKwRT/wFxq5qlNjnW2dh+qh74XgTQ2B179UX5K1HYCluioWj8Ndbgqw2PVqa1NnVJkGHp2ovMpVn/DImlmkw==";
};
};
- "@octokit/types-2.12.1" = {
+ "@octokit/types-2.12.2" = {
name = "_at_octokit_slash_types";
packageName = "@octokit/types";
- version = "2.12.1";
+ version = "2.12.2";
src = fetchurl {
- url = "https://registry.npmjs.org/@octokit/types/-/types-2.12.1.tgz";
- sha512 = "LRLR1tjbcCfAmUElvTmMvLEzstpx6Xt/aQVTg2xvd+kHA2Ekp1eWl5t+gU7bcwjXHYEAzh4hH4WH+kS3vh+wRw==";
+ url = "https://registry.npmjs.org/@octokit/types/-/types-2.12.2.tgz";
+ sha512 = "1GHLI/Jll3j6F0GbYyZPFTcHZMGjAiRfkTEoRUyaVVk2IWbDdwEiClAJvXzfXCDayuGSNCqAUH8lpjZtqW9GDw==";
};
};
"@parcel/fs-1.11.0" = {
@@ -2632,13 +2668,13 @@ let
sha512 = "RxtSL3XmdTAE2byxekYLnx+98kEUOrPHF/KRVjLH+DEIHy6kjIw7YINQzn+NXiH/NTrQLAwYs0GWB+csWygA9Q==";
};
};
- "@rollup/pluginutils-3.0.9" = {
+ "@rollup/pluginutils-3.0.10" = {
name = "_at_rollup_slash_pluginutils";
packageName = "@rollup/pluginutils";
- version = "3.0.9";
+ version = "3.0.10";
src = fetchurl {
- url = "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.0.9.tgz";
- sha512 = "TLZavlfPAZYI7v33wQh4mTP6zojne14yok3DNSLcjoG/Hirxfkonn6icP5rrNWRn8nZsirJBFFpijVOJzkUHDg==";
+ url = "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.0.10.tgz";
+ sha512 = "d44M7t+PjmMrASHbhgpSbVgtL6EFyX7J4mYxwQ/c5eoaE6N2VgCgEcWVzNnwycIloti+/MpwFr8qfw+nRw00sw==";
};
};
"@sailshq/lodash-3.10.4" = {
@@ -2659,22 +2695,22 @@ let
sha512 = "MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg==";
};
};
- "@schematics/angular-9.1.3" = {
+ "@schematics/angular-9.1.4" = {
name = "_at_schematics_slash_angular";
packageName = "@schematics/angular";
- version = "9.1.3";
+ version = "9.1.4";
src = fetchurl {
- url = "https://registry.npmjs.org/@schematics/angular/-/angular-9.1.3.tgz";
- sha512 = "3vxrPyvcIWvyWgbx/fpeQvMThXlmcnHTXVn2dpTcE2BzstAYdG17W3qouhvmlqd6m28orxkKKiZaJYMNTtnV/A==";
+ url = "https://registry.npmjs.org/@schematics/angular/-/angular-9.1.4.tgz";
+ sha512 = "7nbiYBRgXc+f0sa5iXTcF6/VMy/Xq0wyKKnDFiLCb2aFYR7EXRHWF2GuwDIg2bvFugLuCBDoNnXeddLE1TXGWg==";
};
};
- "@schematics/update-0.901.3" = {
+ "@schematics/update-0.901.4" = {
name = "_at_schematics_slash_update";
packageName = "@schematics/update";
- version = "0.901.3";
+ version = "0.901.4";
src = fetchurl {
- url = "https://registry.npmjs.org/@schematics/update/-/update-0.901.3.tgz";
- sha512 = "kwfc9LMMi6ryN2oiat9vTqGMK1jKwI1c45Nm1xala35nsbQSQ12qeL3MrVmnSCeI14+cinFUbp8mWI9/3M+/Lg==";
+ url = "https://registry.npmjs.org/@schematics/update/-/update-0.901.4.tgz";
+ sha512 = "jCtZY2Fbj502gKN5gdu1brnRy/ssyzTrWm69Ty73V+t8uL7nLr+/hny/VBJ8CiQnKQvxcgVl1xgvI1cXzpysVA==";
};
};
"@serverless/cli-1.4.0" = {
@@ -2695,13 +2731,13 @@ let
sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang==";
};
};
- "@serverless/components-2.30.1" = {
+ "@serverless/components-2.30.5" = {
name = "_at_serverless_slash_components";
packageName = "@serverless/components";
- version = "2.30.1";
+ version = "2.30.5";
src = fetchurl {
- url = "https://registry.npmjs.org/@serverless/components/-/components-2.30.1.tgz";
- sha512 = "blqZP6aRg9oj1A30ip2hndcvA1g+J8g8vFbUHtAfs5mp/r4KTD63tNagscSNKTSbc6csM3Z9w6yjW4KSarl8LQ==";
+ url = "https://registry.npmjs.org/@serverless/components/-/components-2.30.5.tgz";
+ sha512 = "c/d60iqzS2NlmRGgIU0S4i6EryjXVwEWcW0bzJ04CwFDQBlvi5kSk8Q59lv0pQ5MwHk+Fw2zMnmMtBQbJxu2vw==";
};
};
"@serverless/core-1.1.2" = {
@@ -2713,13 +2749,13 @@ let
sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ==";
};
};
- "@serverless/enterprise-plugin-3.6.6" = {
+ "@serverless/enterprise-plugin-3.6.9" = {
name = "_at_serverless_slash_enterprise-plugin";
packageName = "@serverless/enterprise-plugin";
- version = "3.6.6";
+ version = "3.6.9";
src = fetchurl {
- url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.6.6.tgz";
- sha512 = "ZkzHp8WVOQv2opdXSYES39uorZV3m61+QDPK5W2PtV6InddYlYNTVuhH8vIynNYFrK8tZ95ZjpPi0BQkQ8q2EQ==";
+ url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.6.9.tgz";
+ sha512 = "ZiZlRbqGerqMuR/OmrJTjDzuccfpdS6YV+VbKu+DM/9tEA9z87n7VrtjZ320C0V20wC+vFNnHl2EE26lCePyxg==";
};
};
"@serverless/event-mocks-1.1.1" = {
@@ -2740,31 +2776,22 @@ let
sha512 = "MpNMmV0uADfmGF8jVQ3Vmw+cdh7vAc8Ga/N9LHDhlbWh+EVHkqlpTi6bb3Xv6WsaPlWrx55Wo389IwpbhA0nPQ==";
};
};
- "@serverless/platform-client-0.24.0" = {
+ "@serverless/platform-client-0.25.7" = {
name = "_at_serverless_slash_platform-client";
packageName = "@serverless/platform-client";
- version = "0.24.0";
+ version = "0.25.7";
src = fetchurl {
- url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-0.24.0.tgz";
- sha512 = "ppxR5wONzzxNSmt/9agfSzC0F4yrkHZWAR5IPLm4yj+dMxb+768XrbqBU6vnOfCcmjb89OX5Bk0GvyQh+T5gLw==";
+ url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-0.25.7.tgz";
+ sha512 = "ZOKgT49qQPGjv0tDN46INO0gkc5syL2y5t0pau5ljQPtQpJzHrUL87xRlDj3BD+4Y9QFZV1UXXNsOQZsyCBsPw==";
};
};
- "@serverless/platform-client-0.25.5" = {
- name = "_at_serverless_slash_platform-client";
- packageName = "@serverless/platform-client";
- version = "0.25.5";
- src = fetchurl {
- url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-0.25.5.tgz";
- sha512 = "29JV8XpJPTUSWgDwxhvZZ9fi9/5jCn1x5IeT+xEiEkpuXZU79wXlSfMfc8XtptOsDouZnOhBpKEZrItGp67CFw==";
- };
- };
- "@serverless/platform-client-china-1.0.6" = {
+ "@serverless/platform-client-china-1.0.9" = {
name = "_at_serverless_slash_platform-client-china";
packageName = "@serverless/platform-client-china";
- version = "1.0.6";
+ version = "1.0.9";
src = fetchurl {
- url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-1.0.6.tgz";
- sha512 = "565LsU74rDQQJAN6y8dTJpDNktqGGs2EvafXXEX021F+YlN3fIJebXRASN2Mgj4XWmzY7DbqC3v2wXF9j3LsGg==";
+ url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-1.0.9.tgz";
+ sha512 = "P2OXDa3S9meOOGJm2i4/d/9HlEjg8FwwfWl4Vq7jjJlA12cJaJnXy/mKgx16eA/YSYNtfW7i4NGyeADvIGNzmg==";
};
};
"@serverless/platform-sdk-2.3.0" = {
@@ -2785,13 +2812,13 @@ let
sha512 = "hcMiX523rkp6kHeKnM1x6/dXEY+d1UFSr901yVKeeCgpFy4u33UI9vlKaPweAZCF6Ahzqywf01IsFTuBVadCrQ==";
};
};
- "@serverless/utils-china-0.1.6" = {
+ "@serverless/utils-china-0.1.7" = {
name = "_at_serverless_slash_utils-china";
packageName = "@serverless/utils-china";
- version = "0.1.6";
+ version = "0.1.7";
src = fetchurl {
- url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-0.1.6.tgz";
- sha512 = "BPaKkRJ47yKTIqRkwF62V5Z/SGdNDmNtinu3fK4988CG1gXBVG2yb3Cq34A98B4BAwZdKzxKCV2n9q4dl1zolw==";
+ url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-0.1.7.tgz";
+ sha512 = "xpsokLjRK7PQtoNuA+1LxZ4whLlmAuJvtv9m9ARYtMaZhJkmlHD8cEh9Y0/uTcvzcA+pWtxRSHQ92TonpXqVow==";
};
};
"@sindresorhus/is-0.14.0" = {
@@ -2839,15 +2866,6 @@ let
sha512 = "+Qo+IO3YOXWgazlo+CKxOuWFLQQdaNCJ9cSfhFQd687/FuesaIxWdInaAdfpsLScq0c6M1ieZslXgiZELSzxbg==";
};
};
- "@snyk/cli-interface-2.2.0" = {
- name = "_at_snyk_slash_cli-interface";
- packageName = "@snyk/cli-interface";
- version = "2.2.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.2.0.tgz";
- sha512 = "sA7V2JhgqJB9z5uYotgQc5iNDv//y+Mdm39rANxmFjtZMSYJZHkP80arzPjw1mB5ni/sWec7ieYUUFeySZBfVg==";
- };
- };
"@snyk/cli-interface-2.3.0" = {
name = "_at_snyk_slash_cli-interface";
packageName = "@snyk/cli-interface";
@@ -2857,31 +2875,49 @@ let
sha512 = "ecbylK5Ol2ySb/WbfPj0s0GuLQR+KWKFzUgVaoNHaSoN6371qRWwf2uVr+hPUP4gXqCai21Ug/RDArfOhlPwrQ==";
};
};
- "@snyk/cli-interface-2.4.0" = {
+ "@snyk/cli-interface-2.3.2" = {
name = "_at_snyk_slash_cli-interface";
packageName = "@snyk/cli-interface";
- version = "2.4.0";
+ version = "2.3.2";
src = fetchurl {
- url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.4.0.tgz";
- sha512 = "FH3RpJV83SFmNWR7FXS4O4sAF7oZZxAWmN6vwhADGJNAdgJYW4Acc6677ZSMnRpIHiFBHrsxso3Au+NQuu73xA==";
+ url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.3.2.tgz";
+ sha512 = "jmZyxVHqzYU1GfdnWCGdd68WY/lAzpPVyqalHazPj4tFJehrSfEFc82RMTYAMgXEJuvFRFIwhsvXh3sWUhIQmg==";
};
};
- "@snyk/cocoapods-lockfile-parser-3.1.0" = {
+ "@snyk/cli-interface-2.5.0" = {
+ name = "_at_snyk_slash_cli-interface";
+ packageName = "@snyk/cli-interface";
+ version = "2.5.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.5.0.tgz";
+ sha512 = "XMc2SCFH4RBSncZgoPb+BBlNq0NYpEpCzptKi69qyMpBy0VsRqIQqddedaazMCU1xEpXTytq6KMYpzUafZzp5Q==";
+ };
+ };
+ "@snyk/cli-interface-2.6.0" = {
+ name = "_at_snyk_slash_cli-interface";
+ packageName = "@snyk/cli-interface";
+ version = "2.6.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.6.0.tgz";
+ sha512 = "jtk0gf80v4mFyDqaQNokD8GOPMTXpIUL35ewg6jtmuZw41xt56WF9kqCjiiViSRRRYA0RK+RuiVfmJA5pxvMUQ==";
+ };
+ };
+ "@snyk/cocoapods-lockfile-parser-3.2.0" = {
name = "_at_snyk_slash_cocoapods-lockfile-parser";
packageName = "@snyk/cocoapods-lockfile-parser";
- version = "3.1.0";
+ version = "3.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@snyk/cocoapods-lockfile-parser/-/cocoapods-lockfile-parser-3.1.0.tgz";
- sha512 = "9288PnbsBNW4Q+T8Q7qAYf0LoRXpBPzJ0ZyLKezmTaWynQ4bk4L4l5F3ENqRRPhwPKOv+eFemUggKQiBBtWD4w==";
+ url = "https://registry.npmjs.org/@snyk/cocoapods-lockfile-parser/-/cocoapods-lockfile-parser-3.2.0.tgz";
+ sha512 = "DyFqZudOlGXHBOVneLnQnyQ97xZLq+PTF9PhWOmrEzH/tKcLyXhdW/WmDPVNJVyNvogyRZ4cXIj487xy/EeZEw==";
};
};
- "@snyk/composer-lockfile-parser-1.2.0" = {
+ "@snyk/composer-lockfile-parser-1.4.0" = {
name = "_at_snyk_slash_composer-lockfile-parser";
packageName = "@snyk/composer-lockfile-parser";
- version = "1.2.0";
+ version = "1.4.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@snyk/composer-lockfile-parser/-/composer-lockfile-parser-1.2.0.tgz";
- sha512 = "kZT+HTqgNcQMeoE5NM9M3jj463M8zI7ZxqZXLw9WoyVs5JTt9g0qFWxIG1cNwZdGVI+y7tzZbNWw9BlMD1vCCQ==";
+ url = "https://registry.npmjs.org/@snyk/composer-lockfile-parser/-/composer-lockfile-parser-1.4.0.tgz";
+ sha512 = "ga4YTRjJUuP0Ufr+t1IucwVjEFAv66JSBB/zVHP2zy/jmfA3l3ZjlGQSjsRC6Me9P2Z0esQ83AYNZvmIf9pq2w==";
};
};
"@snyk/configstore-3.2.0-rc1" = {
@@ -2893,13 +2929,13 @@ let
sha512 = "CV3QggFY8BY3u8PdSSlUGLibqbqCG1zJRmGM2DhnhcxQDRRPTGTP//l7vJphOVsUP1Oe23+UQsj7KRWpRUZiqg==";
};
};
- "@snyk/dep-graph-1.16.1" = {
+ "@snyk/dep-graph-1.18.2" = {
name = "_at_snyk_slash_dep-graph";
packageName = "@snyk/dep-graph";
- version = "1.16.1";
+ version = "1.18.2";
src = fetchurl {
- url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.16.1.tgz";
- sha512 = "2RbstN/z5A3iTmgDQr0vfpWpqsjcJY54PXXP0gVXTf137QLdvgPEsZikjlofF4qoNO1io5t1VGvf69v9E8UrOw==";
+ url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.18.2.tgz";
+ sha512 = "v7tIiCH4LmYOSc0xGHKSxSZ2PEDv8zDlYU7ZKSH+1Hk8Qvj3YYEFvtV1iFBHUEQFUen4kQA6lWxlwF8chsNw+w==";
};
};
"@snyk/gemfile-1.2.0" = {
@@ -2911,31 +2947,67 @@ let
sha512 = "nI7ELxukf7pT4/VraL4iabtNNMz8mUo7EXlqCFld8O5z6mIMLX9llps24iPpaIZOwArkY3FWA+4t+ixyvtTSIA==";
};
};
- "@snyk/java-call-graph-builder-1.3.4" = {
+ "@snyk/graphlib-2.1.9-patch" = {
+ name = "_at_snyk_slash_graphlib";
+ packageName = "@snyk/graphlib";
+ version = "2.1.9-patch";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@snyk/graphlib/-/graphlib-2.1.9-patch.tgz";
+ sha512 = "uFO/pNMm3pN15QB+hVMU7uaQXhsBNwEA8lOET/VDcdOzLptODhXzkJqSHqt0tZlpdAz6/6Uaj8jY00UvPFgFMA==";
+ };
+ };
+ "@snyk/inquirer-6.2.2-patch" = {
+ name = "_at_snyk_slash_inquirer";
+ packageName = "@snyk/inquirer";
+ version = "6.2.2-patch";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@snyk/inquirer/-/inquirer-6.2.2-patch.tgz";
+ sha512 = "IUq5bHRL0vtVKtfvd4GOccAIaLYHbcertug2UVZzk5+yY6R/CxfYsnFUTho1h4BdkfNdin2tPjE/5jRF4SKSrw==";
+ };
+ };
+ "@snyk/java-call-graph-builder-1.8.0" = {
name = "_at_snyk_slash_java-call-graph-builder";
packageName = "@snyk/java-call-graph-builder";
- version = "1.3.4";
+ version = "1.8.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.3.4.tgz";
- sha512 = "3KXA5hTqvn6EZBEyMhA5zj0QCzu1WBPVBeUbQ4sNfftbVgfy/OFc9I/NPi39ALA2+tFYl1aKVIy1ECRea4Mc1w==";
+ url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.8.0.tgz";
+ sha512 = "dD7hVdEKMMU9CP0jQLm6Q1+l6506rjW0dqQflJ3QOVohNzptYJtTv9pHKzgRu5+q/fgEc35oYi02A0WIQwSvpw==";
};
};
- "@snyk/ruby-semver-2.1.0" = {
+ "@snyk/lodash-4.17.15-patch" = {
+ name = "_at_snyk_slash_lodash";
+ packageName = "@snyk/lodash";
+ version = "4.17.15-patch";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@snyk/lodash/-/lodash-4.17.15-patch.tgz";
+ sha512 = "e4+t34bGyjjRnwXwI14hqye9J/nRbG9iwaqTgXWHskm5qC+iK0UrjgYdWXiHJCf3Plbpr+1rpW+4LPzZnCGMhQ==";
+ };
+ };
+ "@snyk/rpm-parser-1.1.0" = {
+ name = "_at_snyk_slash_rpm-parser";
+ packageName = "@snyk/rpm-parser";
+ version = "1.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@snyk/rpm-parser/-/rpm-parser-1.1.0.tgz";
+ sha512 = "+DyCagvnpyBjwYTxaPMQGLW4rkpKAw1Jrh8YbZCg7Ix172InBxdve/0zud18Lu2H6xWtDDdMvRDdfl82wlTBvA==";
+ };
+ };
+ "@snyk/ruby-semver-2.2.0" = {
name = "_at_snyk_slash_ruby-semver";
packageName = "@snyk/ruby-semver";
- version = "2.1.0";
+ version = "2.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@snyk/ruby-semver/-/ruby-semver-2.1.0.tgz";
- sha512 = "u8ez8kWyqge+N+FxRDx/uPBmcHzY7BMfODvzEVeoTOeoD0CHPymEaVlkEKA8ZHtxzXjUzPIl2I8f2siZEzLjYg==";
+ url = "https://registry.npmjs.org/@snyk/ruby-semver/-/ruby-semver-2.2.0.tgz";
+ sha512 = "FqUayoVjcyCsQFYPm3DcaCKdFR4xmapUkCGY+bcNBs3jqCUw687PoP9CPQ1Jvtaw5YpfBNl/62jyntsWCeciuA==";
};
};
- "@snyk/snyk-cocoapods-plugin-2.1.1" = {
+ "@snyk/snyk-cocoapods-plugin-2.2.0" = {
name = "_at_snyk_slash_snyk-cocoapods-plugin";
packageName = "@snyk/snyk-cocoapods-plugin";
- version = "2.1.1";
+ version = "2.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@snyk/snyk-cocoapods-plugin/-/snyk-cocoapods-plugin-2.1.1.tgz";
- sha512 = "bUo69YaZfBD/vPookJjdskcnUNGNzPbqgBLzjyDqzmG9zCArW1LEU4A8pwfw1mxjp8NzBreex6K74tC8ssIN4g==";
+ url = "https://registry.npmjs.org/@snyk/snyk-cocoapods-plugin/-/snyk-cocoapods-plugin-2.2.0.tgz";
+ sha512 = "Ux7hXKawbk30niGBToGkKqHyKzhT3E7sCl0FNkPkHaaGZwPwhFCDyNFxBd4uGgWiQ+kT+RjtH5ahna+bSP69Yg==";
};
};
"@snyk/update-notifier-2.5.1-rc2" = {
@@ -3271,13 +3343,13 @@ let
sha512 = "/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg==";
};
};
- "@types/babel__traverse-7.0.10" = {
+ "@types/babel__traverse-7.0.11" = {
name = "_at_types_slash_babel__traverse";
packageName = "@types/babel__traverse";
- version = "7.0.10";
+ version = "7.0.11";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.10.tgz";
- sha512 = "74fNdUGrWsgIB/V9kTO5FGHPWYY6Eqn+3Z7L6Hc4e/BxjYV7puvBqp5HwsVYYfLm6iURYBNCx4Ut37OF9yitCw==";
+ url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.11.tgz";
+ sha512 = "ddHK5icION5U6q11+tV2f9Mo6CZVuT8GJKld2q9LqHSZbvLbH34Kcu2yFGckZut453+eQU6btIA3RihmnRgI+Q==";
};
};
"@types/babylon-6.16.5" = {
@@ -3298,15 +3370,6 @@ let
sha512 = "W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ==";
};
};
- "@types/bunyan-1.8.6" = {
- name = "_at_types_slash_bunyan";
- packageName = "@types/bunyan";
- version = "1.8.6";
- src = fetchurl {
- url = "https://registry.npmjs.org/@types/bunyan/-/bunyan-1.8.6.tgz";
- sha512 = "YiozPOOsS6bIuz31ilYqR5SlLif4TBWsousN2aCWLi5233nZSX19tFbcQUPdR7xJ8ypPyxkCGNxg0CIV5n9qxQ==";
- };
- };
"@types/cacheable-request-6.0.1" = {
name = "_at_types_slash_cacheable-request";
packageName = "@types/cacheable-request";
@@ -3415,13 +3478,13 @@ let
sha512 = "EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==";
};
};
- "@types/express-4.17.3" = {
+ "@types/express-4.17.4" = {
name = "_at_types_slash_express";
packageName = "@types/express";
- version = "4.17.3";
+ version = "4.17.4";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/express/-/express-4.17.3.tgz";
- sha512 = "I8cGRJj3pyOLs/HndoP+25vOqhqWkAZsWMEmq1qXy/b/M3ppufecUwaK2/TVDVxcV61/iSdhykUjQQ2DLSrTdg==";
+ url = "https://registry.npmjs.org/@types/express/-/express-4.17.4.tgz";
+ sha512 = "DO1L53rGqIDUEvOjJKmbMEQ5Z+BM2cIEPy/eV3En+s166Gz+FeuzRerxcab757u/U4v4XF4RYrZPmqKa+aY/2w==";
};
};
"@types/express-serve-static-core-4.17.5" = {
@@ -3451,6 +3514,15 @@ let
sha512 = "1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==";
};
};
+ "@types/graceful-fs-4.1.3" = {
+ name = "_at_types_slash_graceful-fs";
+ packageName = "@types/graceful-fs";
+ version = "4.1.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.3.tgz";
+ sha512 = "AiHRaEB50LQg0pZmm659vNBb9f4SJ0qrAnteuzhSeAUcJKxoYgEnprg/83kppCnc2zvtCKbdZry1a5pVY3lOTQ==";
+ };
+ };
"@types/graphql-upload-8.0.3" = {
name = "_at_types_slash_graphql-upload";
packageName = "@types/graphql-upload";
@@ -3505,13 +3577,13 @@ let
sha512 = "UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA==";
};
};
- "@types/jquery-3.3.35" = {
+ "@types/jquery-3.3.37" = {
name = "_at_types_slash_jquery";
packageName = "@types/jquery";
- version = "3.3.35";
+ version = "3.3.37";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.35.tgz";
- sha512 = "pnIELWhHXJ7RgoFylhiTxD+96QlKBJfEx8JCLj963/dh7zBOKFkZ6rlNqbaCcn2JZrsAxCI8WhgRXznBx2iDsA==";
+ url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.37.tgz";
+ sha512 = "4MNntGYm6xdDiz2+B92xEmWcFN9mOeMXqS854lSe7LDpBhzscUjvXjCAl6JwPBtAkqmPZq+L4I5UyXXNDZyq4Q==";
};
};
"@types/js-yaml-3.12.3" = {
@@ -3631,13 +3703,13 @@ let
sha512 = "4mXKoDptrXAwZErQHrLzpe0FN/0Wmf5JRniSVIdwUrtDf9wnmEV1teCNLBo/TwuXhkK/bVegoEn/wmb+x0AuPg==";
};
};
- "@types/node-13.13.2" = {
+ "@types/node-13.13.4" = {
name = "_at_types_slash_node";
packageName = "@types/node";
- version = "13.13.2";
+ version = "13.13.4";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/node/-/node-13.13.2.tgz";
- sha512 = "LB2R1Oyhpg8gu4SON/mfforE525+Hi/M1ineICEDftqNVTyFg1aRIeGuTvXAoWHc4nbrFncWtJgMmoyRvuGh7A==";
+ url = "https://registry.npmjs.org/@types/node/-/node-13.13.4.tgz";
+ sha512 = "x26ur3dSXgv5AwKS0lNfbjpCakGIduWU1DU91Zz58ONRWrIKGunmZBNv4P7N+e27sJkiGDsw/3fT4AtsqQBrBA==";
};
};
"@types/node-6.14.10" = {
@@ -3658,6 +3730,15 @@ let
sha512 = "2w0NTwMWF1d3NJMK0Uiq2UNN8htVCyOWOD0jIPjPgC5Ph/YP4dVhs9YxxcMcuLuwAslz0dVEcZQUaqkLs3IzOQ==";
};
};
+ "@types/node-fetch-2.5.7" = {
+ name = "_at_types_slash_node-fetch";
+ packageName = "@types/node-fetch";
+ version = "2.5.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.7.tgz";
+ sha512 = "o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw==";
+ };
+ };
"@types/normalize-package-data-2.4.0" = {
name = "_at_types_slash_normalize-package-data";
packageName = "@types/normalize-package-data";
@@ -3676,6 +3757,15 @@ let
sha512 = "ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==";
};
};
+ "@types/qs-6.9.1" = {
+ name = "_at_types_slash_qs";
+ packageName = "@types/qs";
+ version = "6.9.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.1.tgz";
+ sha512 = "lhbQXx9HKZAPgBkISrBcmAcMpZsmpe/Cd/hY7LGZS5OfkySUBItnPZHgQPssWYUET8elF+yCFBbP1Q0RZPTdaw==";
+ };
+ };
"@types/range-parser-1.2.3" = {
name = "_at_types_slash_range-parser";
packageName = "@types/range-parser";
@@ -3703,15 +3793,6 @@ let
sha512 = "85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==";
};
};
- "@types/restify-4.3.6" = {
- name = "_at_types_slash_restify";
- packageName = "@types/restify";
- version = "4.3.6";
- src = fetchurl {
- url = "https://registry.npmjs.org/@types/restify/-/restify-4.3.6.tgz";
- sha512 = "4l4f0EXnleXQttlhRCXtTuJ8UelsKiAKIK2AAEd2epBHu41aEbM0U2z6E5tUrNwlbxz7qaNBISduGMeg+G3PaA==";
- };
- };
"@types/semver-5.5.0" = {
name = "_at_types_slash_semver";
packageName = "@types/semver";
@@ -3784,22 +3865,22 @@ let
sha512 = "WJZtZlinE3meRdH+I7wTsIhpz/GLhqEQwmPGeh4s1irWLwMzCeTV8WZ+pgPTwrDXoafVUWwo1LiZ9HJVHFlJSQ==";
};
};
- "@types/ws-6.0.4" = {
+ "@types/ws-7.2.4" = {
name = "_at_types_slash_ws";
packageName = "@types/ws";
- version = "6.0.4";
+ version = "7.2.4";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/ws/-/ws-6.0.4.tgz";
- sha512 = "PpPrX7SZW9re6+Ha8ojZG4Se8AZXgf0GK6zmfqEuCsY49LFDNXO3SByp44X3dFEqtB73lkCDAdUazhAjVPiNwg==";
+ url = "https://registry.npmjs.org/@types/ws/-/ws-7.2.4.tgz";
+ sha512 = "9S6Ask71vujkVyeEXKxjBSUV8ZUB0mjL5la4IncBoheu04bDaYyUKErh1BQcY9+WzOUOiKqz/OnpJHYckbMfNg==";
};
};
- "@types/xml2js-0.4.3" = {
+ "@types/xml2js-0.4.5" = {
name = "_at_types_slash_xml2js";
packageName = "@types/xml2js";
- version = "0.4.3";
+ version = "0.4.5";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/xml2js/-/xml2js-0.4.3.tgz";
- sha512 = "Pv2HGRE4gWLs31In7nsyXEH4uVVsd0HNV9i2dyASvtDIlOtSTr1eczPLDpdEuyv5LWH5LT20GIXwPjkshKWI1g==";
+ url = "https://registry.npmjs.org/@types/xml2js/-/xml2js-0.4.5.tgz";
+ sha512 = "yohU3zMn0fkhlape1nxXG2bLEGZRc1FeqF80RoHaYXJN7uibaauXfhzhOJr1Xh36sn+/tx21QAOf07b/xYVk1w==";
};
};
"@types/yargs-15.0.4" = {
@@ -3838,13 +3919,13 @@ let
sha512 = "te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg==";
};
};
- "@typescript-eslint/eslint-plugin-2.29.0" = {
+ "@typescript-eslint/eslint-plugin-2.31.0" = {
name = "_at_typescript-eslint_slash_eslint-plugin";
packageName = "@typescript-eslint/eslint-plugin";
- version = "2.29.0";
+ version = "2.31.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.29.0.tgz";
- sha512 = "X/YAY7azKirENm4QRpT7OVmzok02cSkqeIcLmdz6gXUQG4Hk0Fi9oBAynSAyNXeGdMRuZvjBa0c1Lu0dn/u6VA==";
+ url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.31.0.tgz";
+ sha512 = "iIC0Pb8qDaoit+m80Ln/aaeu9zKQdOLF4SHcGLarSeY1gurW6aU4JsOPMjKQwXlw70MvWKZQc6S2NamA8SJ/gg==";
};
};
"@typescript-eslint/experimental-utils-1.13.0" = {
@@ -3856,13 +3937,13 @@ let
sha512 = "zmpS6SyqG4ZF64ffaJ6uah6tWWWgZ8m+c54XXgwFtUv0jNz8aJAVx8chMCvnk7yl6xwn8d+d96+tWp7fXzTuDg==";
};
};
- "@typescript-eslint/experimental-utils-2.29.0" = {
+ "@typescript-eslint/experimental-utils-2.31.0" = {
name = "_at_typescript-eslint_slash_experimental-utils";
packageName = "@typescript-eslint/experimental-utils";
- version = "2.29.0";
+ version = "2.31.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.29.0.tgz";
- sha512 = "H/6VJr6eWYstyqjWXBP2Nn1hQJyvJoFdDtsHxGiD+lEP7piGnGpb/ZQd+z1ZSB1F7dN+WsxUDh8+S4LwI+f3jw==";
+ url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.31.0.tgz";
+ sha512 = "MI6IWkutLYQYTQgZ48IVnRXmLR/0Q6oAyJgiOror74arUMh7EWjJkADfirZhRsUMHeLJ85U2iySDwHTSnNi9vA==";
};
};
"@typescript-eslint/parser-1.13.0" = {
@@ -3874,13 +3955,13 @@ let
sha512 = "ITMBs52PCPgLb2nGPoeT4iU3HdQZHcPaZVw+7CsFagRJHUhyeTgorEwHXhFf3e7Evzi8oujKNpHc8TONth8AdQ==";
};
};
- "@typescript-eslint/parser-2.29.0" = {
+ "@typescript-eslint/parser-2.31.0" = {
name = "_at_typescript-eslint_slash_parser";
packageName = "@typescript-eslint/parser";
- version = "2.29.0";
+ version = "2.31.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.29.0.tgz";
- sha512 = "H78M+jcu5Tf6m/5N8iiFblUUv+HJDguMSdFfzwa6vSg9lKR8Mk9BsgeSjO8l2EshKnJKcbv0e8IDDOvSNjl0EA==";
+ url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.31.0.tgz";
+ sha512 = "uph+w6xUOlyV2DLSC6o+fBDzZ5i7+3/TxAsH4h3eC64tlga57oMb96vVlXoMwjR/nN+xyWlsnxtbDkB46M2EPQ==";
};
};
"@typescript-eslint/typescript-estree-1.13.0" = {
@@ -3892,13 +3973,13 @@ let
sha512 = "b5rCmd2e6DCC6tCTN9GSUAuxdYwCM/k/2wdjHGrIRGPSJotWMCe/dGpi66u42bhuh8q3QBzqM4TMA1GUUCJvdw==";
};
};
- "@typescript-eslint/typescript-estree-2.29.0" = {
+ "@typescript-eslint/typescript-estree-2.31.0" = {
name = "_at_typescript-eslint_slash_typescript-estree";
packageName = "@typescript-eslint/typescript-estree";
- version = "2.29.0";
+ version = "2.31.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.29.0.tgz";
- sha512 = "3YGbtnWy4az16Egy5Fj5CckkVlpIh0MADtAQza+jiMADRSKkjdpzZp/5WuvwK/Qib3Z0HtzrDFeWanS99dNhnA==";
+ url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.31.0.tgz";
+ sha512 = "vxW149bXFXXuBrAak0eKHOzbcu9cvi6iNcJDzEtOkRwGHxJG15chiAQAwhLOsk+86p9GTr/TziYvw+H9kMaIgA==";
};
};
"@vue/cli-shared-utils-4.3.1" = {
@@ -4828,13 +4909,13 @@ let
sha512 = "e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==";
};
};
- "agentkeepalive-4.1.0" = {
+ "agentkeepalive-4.1.2" = {
name = "agentkeepalive";
packageName = "agentkeepalive";
- version = "4.1.0";
+ version = "4.1.2";
src = fetchurl {
- url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.1.0.tgz";
- sha512 = "CW/n1wxF8RpEuuiq6Vbn9S8m0VSYDMnZESqaJ6F2cWN9fY8rei2qaxweIaRgq+ek8TqfoFIsUjaGNKGGEHElSg==";
+ url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.1.2.tgz";
+ sha512 = "waNHE7tQBBn+2qXucI8HY0o2Y0OBPWldWOWsZwY71JcCm4SvrPnWdceFfB5NIXSqE8Ewq6VR/Qt5b1i69P6KCQ==";
};
};
"aggregate-error-3.0.1" = {
@@ -5413,13 +5494,13 @@ let
sha512 = "7X5aGbqaOWYG+SSkCzJNHTz2ZKDcyRwtmvW4mGVLRqdQs+HxfXS4dUS2CcwrAj449se6tZ6NLUMnjko4KMt3KA==";
};
};
- "apollo-cache-control-0.9.1" = {
+ "apollo-cache-control-0.10.0" = {
name = "apollo-cache-control";
packageName = "apollo-cache-control";
- version = "0.9.1";
+ version = "0.10.0";
src = fetchurl {
- url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.9.1.tgz";
- sha512 = "9t2EcRevUrANuGhF5XUbKJEfnc6Jy2Rn7Y8nOIKlsEEC+AX7Ko4svWYTyyTxj0h0RXfiegY2nbz4sVry/pS3rA==";
+ url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.10.0.tgz";
+ sha512 = "UIcPlrPdRTOKrF7kc5/WD5i6EVkGEEqgOK/fMj92fnnxR1KnQDiN82lqaxu02eZJvWjFJjik0JVJNXKOJXVrpQ==";
};
};
"apollo-cache-inmemory-1.6.5" = {
@@ -5566,22 +5647,22 @@ let
sha512 = "Yja12BgNQhzuFGG/5Nw2MQe0hkuQy2+9er09HxeEyAf2rUDIPnhPrn1MDoZTB8MU7UGfjwITC+1ofzKkkrZobA==";
};
};
- "apollo-engine-reporting-1.7.1" = {
+ "apollo-engine-reporting-1.8.0" = {
name = "apollo-engine-reporting";
packageName = "apollo-engine-reporting";
- version = "1.7.1";
+ version = "1.8.0";
src = fetchurl {
- url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-1.7.1.tgz";
- sha512 = "9ykddPxlC95R9CkkJaPaGriRbOGfzeKqqPXRAunyX1h4sG/8g+MJ/gGzmnNf63k6RvRUdRENCE83wPk2OeU+2A==";
+ url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-1.8.0.tgz";
+ sha512 = "VPVpIGW6lbYXga6sqq/fG8ZaPR70bFuxvCov6X0npuVQPXwgZrzBp50cHx9uIaBVxDDxD3leeznsQbmF37RAww==";
};
};
- "apollo-engine-reporting-protobuf-0.4.4" = {
+ "apollo-engine-reporting-protobuf-0.5.0" = {
name = "apollo-engine-reporting-protobuf";
packageName = "apollo-engine-reporting-protobuf";
- version = "0.4.4";
+ version = "0.5.0";
src = fetchurl {
- url = "https://registry.npmjs.org/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.4.4.tgz";
- sha512 = "SGrIkUR7Q/VjU8YG98xcvo340C4DaNUhg/TXOtGsMlfiJDzHwVau/Bv6zifAzBafp2lj0XND6Daj5kyT/eSI/w==";
+ url = "https://registry.npmjs.org/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.5.0.tgz";
+ sha512 = "OgMwtLcuL+YAaO2xgkPbnRJnISLDSNE5F11p7oq+1ws+ws71CPfHAthDCxSObCPSALdhsLAGD0v3u3soBuNmMg==";
};
};
"apollo-env-0.6.4" = {
@@ -5692,13 +5773,13 @@ let
sha512 = "L7LHZ3k9Ao5OSf2WStvQhxdsNVplRQi7kCAPfqf9Z3GBEnQ2uaL0EgO0hSmtVHfXTbk5CTRziMT1Pe87bXrFIw==";
};
};
- "apollo-server-core-2.12.0" = {
+ "apollo-server-core-2.13.0" = {
name = "apollo-server-core";
packageName = "apollo-server-core";
- version = "2.12.0";
+ version = "2.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.12.0.tgz";
- sha512 = "BRVdOyZrRJ1ALlmis0vaOLIHHYu5K3UVKAQKIgHkRh/YY0Av4lpeEXr49ELK04LTeh0DG0pQ5YYYhaX1wFcDEw==";
+ url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.13.0.tgz";
+ sha512 = "PqfsexbyObaQYb2jODs8v/XzrJcn+5mh0jA8ZfQCg5GENlua/CjeTZbRm2X0p3qpwc2E5jFAXSshrIWvhQAGZQ==";
};
};
"apollo-server-env-2.4.3" = {
@@ -5719,40 +5800,40 @@ let
sha512 = "7oEd6pUxqyWYUbQ9TA8tM0NU/3aGtXSEibo6+txUkuHe7QaxfZ2wHRp+pfT1LC1K3RXYjKj61/C2xEO19s3Kdg==";
};
};
- "apollo-server-express-2.12.0" = {
+ "apollo-server-express-2.13.0" = {
name = "apollo-server-express";
packageName = "apollo-server-express";
- version = "2.12.0";
+ version = "2.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.12.0.tgz";
- sha512 = "oTBKM2SsziCoFW+ta+ubJ/ypvsc+EWrbJnyZhJ5FBYzSXPstt/jvgZHgMO+kOQgHEHrbJwugNDUuLMSm608L7A==";
+ url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.13.0.tgz";
+ sha512 = "xDc+kRqWCXs4MeRjls37G45V6PmKYwo7OlpWCXyWDSPGgY9UD4E5A6rUBCyIhoNr7RnVYMkNuySOOqzX1QJ7EA==";
};
};
- "apollo-server-plugin-base-0.7.1" = {
+ "apollo-server-plugin-base-0.8.0" = {
name = "apollo-server-plugin-base";
packageName = "apollo-server-plugin-base";
- version = "0.7.1";
+ version = "0.8.0";
src = fetchurl {
- url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.7.1.tgz";
- sha512 = "PRavvoWq7/Xufqc+qkDQg3Aqueq4QrPBFfoCFIjhkJ4n2d2YoqE3gTGccb8YoWusfa62ASMn6R47OdNuVtEbXw==";
+ url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.8.0.tgz";
+ sha512 = "H8sJlOVJrF0IhYIFMv7NOgB6BFgqobXSZrj1y9ju6dq13OotsqcZC4fJOYc9oWzb/+/mqg/odtVioE71mj68yg==";
};
};
- "apollo-server-types-0.3.1" = {
+ "apollo-server-types-0.4.0" = {
name = "apollo-server-types";
packageName = "apollo-server-types";
- version = "0.3.1";
+ version = "0.4.0";
src = fetchurl {
- url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.3.1.tgz";
- sha512 = "6nX5VC3icOGf1RZIs7/SYQZff+Cl16LQu1FHUOIk9gAMN2XjlRCyJgCeMj5YHJzQ8Mhg4BO0weWuydEg+JxLzg==";
+ url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.4.0.tgz";
+ sha512 = "U+6qKCdrucVSMEVvLSqSwxIGr3VI6vcfbhpD86sdb8MgHHGH6egjNAcLrPVRk1AyXs8RV0Ysus+vlj8rpouBzA==";
};
};
- "apollo-tracing-0.9.1" = {
+ "apollo-tracing-0.10.0" = {
name = "apollo-tracing";
packageName = "apollo-tracing";
- version = "0.9.1";
+ version = "0.10.0";
src = fetchurl {
- url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.9.1.tgz";
- sha512 = "4wVNM6rc70XhwWxuDWrMBLaHA8NjB9pUS2sNpddQvP36ZtQfsa08XLSUxGAZT+bej+TzW26hKNtuO31RgqC9Hg==";
+ url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.10.0.tgz";
+ sha512 = "yuqA1KT0FQUfzVK3ZIk0hRIE8eUKx9Oklq83AGQxLtS/oafBj/VOCZAtJNJkyEqMJxXQT9uIBtbfO1789Gczkw==";
};
};
"apollo-upload-client-11.0.0" = {
@@ -6961,13 +7042,13 @@ let
sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3";
};
};
- "aws-sdk-2.661.0" = {
+ "aws-sdk-2.669.0" = {
name = "aws-sdk";
packageName = "aws-sdk";
- version = "2.661.0";
+ version = "2.669.0";
src = fetchurl {
- url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.661.0.tgz";
- sha512 = "dfGtbRQQUmcpj6WGVhj7q2PADCvDhLf+/aRGPXcMrm0cnHavkmHPVaSvrw2lJJJ5N9MsBKoUyacrVcIQkfNsgw==";
+ url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.669.0.tgz";
+ sha512 = "kuVcSRpDzvkgmeSmMX6Q32eTOb8UeihhUdavMrvUOP6fzSU19cNWS9HAIkYOi/jrEDK85cCZxXjxqE3JGZIGcw==";
};
};
"aws-sign2-0.6.0" = {
@@ -6997,6 +7078,15 @@ let
sha512 = "wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==";
};
};
+ "axios-0.18.1" = {
+ name = "axios";
+ packageName = "axios";
+ version = "0.18.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/axios/-/axios-0.18.1.tgz";
+ sha512 = "0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g==";
+ };
+ };
"axios-0.19.2" = {
name = "axios";
packageName = "axios";
@@ -7105,13 +7195,13 @@ let
sha512 = "m2CvfDW4+1qfDdsrtf4dwOslQC3yhbgyBFptncp4wvtdrDHqueW7slsYv4gArie056phvQFhT2nRcGS4bnm6mA==";
};
};
- "babel-jest-25.4.0" = {
+ "babel-jest-25.5.1" = {
name = "babel-jest";
packageName = "babel-jest";
- version = "25.4.0";
+ version = "25.5.1";
src = fetchurl {
- url = "https://registry.npmjs.org/babel-jest/-/babel-jest-25.4.0.tgz";
- sha512 = "p+epx4K0ypmHuCnd8BapfyOwWwosNCYhedetQey1awddtfmEX0MmdxctGl956uwUmjwXR5VSS5xJcGX9DvdIog==";
+ url = "https://registry.npmjs.org/babel-jest/-/babel-jest-25.5.1.tgz";
+ sha512 = "9dA9+GmMjIzgPnYtkhBg73gOo/RHqPmLruP3BaGL4KEX3Dwz6pI8auSN8G8+iuEG90+GSswyKvslN+JYSaacaQ==";
};
};
"babel-loader-8.1.0" = {
@@ -7141,13 +7231,13 @@ let
sha512 = "AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==";
};
};
- "babel-plugin-jest-hoist-25.4.0" = {
+ "babel-plugin-jest-hoist-25.5.0" = {
name = "babel-plugin-jest-hoist";
packageName = "babel-plugin-jest-hoist";
- version = "25.4.0";
+ version = "25.5.0";
src = fetchurl {
- url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.4.0.tgz";
- sha512 = "M3a10JCtTyKevb0MjuH6tU+cP/NVQZ82QPADqI1RQYY1OphztsCeIeQmTsHmF/NS6m0E51Zl4QNsI3odXSQF5w==";
+ url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.5.0.tgz";
+ sha512 = "u+/W+WAjMlvoocYGTwthAiQSxDcJAyHpQ6oWlHdFZaaN+Rlk8Q7iiwDPg2lN/FyJtAYnKjFxbn7xus4HCFkg5g==";
};
};
"babel-plugin-minify-builtins-0.5.0" = {
@@ -7375,13 +7465,13 @@ let
sha512 = "u/8cS+dEiK1SFILbOC8/rUI3ml9lboKuuMvZ/4aQnQmhecQAgPw5ew066C1ObnEAUmlx7dv/s2z52psWEtLNiw==";
};
};
- "babel-preset-jest-25.4.0" = {
+ "babel-preset-jest-25.5.0" = {
name = "babel-preset-jest";
packageName = "babel-preset-jest";
- version = "25.4.0";
+ version = "25.5.0";
src = fetchurl {
- url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-25.4.0.tgz";
- sha512 = "PwFiEWflHdu3JCeTr0Pb9NcHHE34qWFnPQRVPvqQITx4CsDCzs6o05923I10XvLvn9nNsRHuiVgB72wG/90ZHQ==";
+ url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-25.5.0.tgz";
+ sha512 = "8ZczygctQkBU+63DtSOKGh7tFL0CeCuz+1ieud9lJ1WPQ9O6A1a/r+LGn6Y705PA6whHQ3T1XuB/PmpfNYf8Fw==";
};
};
"babel-preset-minify-0.5.1" = {
@@ -8059,13 +8149,13 @@ let
sha1 = "f962d687ec2c369570ae71af843256e6d0ca1129";
};
};
- "blessed-contrib-4.8.19" = {
+ "blessed-contrib-4.8.20" = {
name = "blessed-contrib";
packageName = "blessed-contrib";
- version = "4.8.19";
+ version = "4.8.20";
src = fetchurl {
- url = "https://registry.npmjs.org/blessed-contrib/-/blessed-contrib-4.8.19.tgz";
- sha512 = "g2EVkuCd8r46XVI+pgGuTYK0MGKOn30slJTUlV4m/1d/THIb4lUbY2S+yAtqiJ1q3IFu5TfwURb9/eAKZtJLNQ==";
+ url = "https://registry.npmjs.org/blessed-contrib/-/blessed-contrib-4.8.20.tgz";
+ sha512 = "jLLXR9pjjm/T2jY0Q8OCCpuDquWiMULkPyT8YNaiLUR0j1MchTQK/Q7SiuD63jn9ekn9BrohwP1Kom/FylmeHQ==";
};
};
"blob-0.0.2" = {
@@ -9112,13 +9202,13 @@ let
sha512 = "a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==";
};
};
- "cacache-15.0.0" = {
+ "cacache-15.0.3" = {
name = "cacache";
packageName = "cacache";
- version = "15.0.0";
+ version = "15.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/cacache/-/cacache-15.0.0.tgz";
- sha512 = "L0JpXHhplbJSiDGzyJJnJCTL7er7NzbBgxzVqLswEb4bO91Zbv17OUMuUeu/q0ZwKn3V+1HM4wb9tO4eVE/K8g==";
+ url = "https://registry.npmjs.org/cacache/-/cacache-15.0.3.tgz";
+ sha512 = "bc3jKYjqv7k4pWh7I/ixIjfcjPul4V4jme/WbjvwGS5LzoPL/GzXr4C5EgPNLO/QEZl9Oi61iGitYEdwcrwLCQ==";
};
};
"cache-base-1.0.1" = {
@@ -9391,13 +9481,13 @@ let
sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==";
};
};
- "caniuse-lite-1.0.30001046" = {
+ "caniuse-lite-1.0.30001050" = {
name = "caniuse-lite";
packageName = "caniuse-lite";
- version = "1.0.30001046";
+ version = "1.0.30001050";
src = fetchurl {
- url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001046.tgz";
- sha512 = "CsGjBRYWG6FvgbyGy+hBbaezpwiqIOLkxQPY4A4Ea49g1eNsnQuESB+n4QM0BKii1j80MyJ26Ir5ywTQkbRE4g==";
+ url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001050.tgz";
+ sha512 = "OvGZqalCwmapci76ISq5q4kuAskb1ebqF3FEQBv1LE1kWht0pojlDDqzFlmk5jgYkuZN7MNZ1n+ULwe/7MaDNQ==";
};
};
"capture-exit-2.0.0" = {
@@ -9859,13 +9949,13 @@ let
sha512 = "dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A==";
};
};
- "chokidar-3.3.1" = {
+ "chokidar-3.4.0" = {
name = "chokidar";
packageName = "chokidar";
- version = "3.3.1";
+ version = "3.4.0";
src = fetchurl {
- url = "https://registry.npmjs.org/chokidar/-/chokidar-3.3.1.tgz";
- sha512 = "4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg==";
+ url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz";
+ sha512 = "aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==";
};
};
"chownr-0.0.2" = {
@@ -9886,6 +9976,15 @@ let
sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==";
};
};
+ "chownr-2.0.0" = {
+ name = "chownr";
+ packageName = "chownr";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz";
+ sha512 = "bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==";
+ };
+ };
"chroma-js-2.1.0" = {
name = "chroma-js";
packageName = "chroma-js";
@@ -10210,13 +10309,13 @@ let
sha1 = "7e673ee0dd39a611a486476e53f3c6b3941cb582";
};
};
- "cli-progress-3.8.0" = {
+ "cli-progress-3.8.2" = {
name = "cli-progress";
packageName = "cli-progress";
- version = "3.8.0";
+ version = "3.8.2";
src = fetchurl {
- url = "https://registry.npmjs.org/cli-progress/-/cli-progress-3.8.0.tgz";
- sha512 = "3e+m7ecKbVTF2yo186vrrt/5217ZwE64z61kMwhSFmgrF3qZiTUuV9Fdh2RyzSkhLRfsqFf721KiUDEAJlP5pA==";
+ url = "https://registry.npmjs.org/cli-progress/-/cli-progress-3.8.2.tgz";
+ sha512 = "qRwBxLldMSfxB+YGFgNRaj5vyyHe1yMpVeDL79c+7puGujdKJHQHydgqXDcrkvQgJ5U/d3lpf6vffSoVVUftVQ==";
};
};
"cli-spinner-0.2.10" = {
@@ -10696,13 +10795,13 @@ let
sha512 = "SPnx+ZHXVJ0qTInRXmnxuyu8PDvSzvop5MXp1BOr/urFQI3yL2n5ewE755skTklF/hKVlWj8cinGxdR2gvLvTA==";
};
};
- "codecs-2.0.0" = {
+ "codecs-2.1.0" = {
name = "codecs";
packageName = "codecs";
- version = "2.0.0";
+ version = "2.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/codecs/-/codecs-2.0.0.tgz";
- sha512 = "WXvpJRAgc693oqYvZte9uYEiL5YHtfrxyEq12uVny9oBJ1k37zSva5vVz7trsnt6R9Y15hEgOSC7VFZT2pfYnA==";
+ url = "https://registry.npmjs.org/codecs/-/codecs-2.1.0.tgz";
+ sha512 = "nSWYToViFEpZXOxhtMQ6IDs76TN9xKIkHOu1KCr/iFiBcgzKuY1AFPZktuXN8r82FbZ/TXP9fwITszLgcp3eQg==";
};
};
"codepage-1.4.0" = {
@@ -11128,13 +11227,13 @@ let
sha512 = "NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==";
};
};
- "commander-5.0.0" = {
+ "commander-5.1.0" = {
name = "commander";
packageName = "commander";
- version = "5.0.0";
+ version = "5.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/commander/-/commander-5.0.0.tgz";
- sha512 = "JrDGPAKjMGSP1G0DUoaceEJ3DZgAfr/q6X7FVk4+U5KxUSKviYGM2k6zWkfyyBHy5rAtzgYJFa1ro2O9PtoxwQ==";
+ url = "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz";
+ sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==";
};
};
"commandpost-1.4.0" = {
@@ -11993,6 +12092,15 @@ let
sha512 = "h479g/5a0PXn//yiFuMrD5MDEbB+mtihNkWcE6uD/aCh/6z0FRZ9sWH3NfZbHDB+Bp1yGLYsjbH8LZBL8KOQ0w==";
};
};
+ "core-js-2.3.0" = {
+ name = "core-js";
+ packageName = "core-js";
+ version = "2.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/core-js/-/core-js-2.3.0.tgz";
+ sha1 = "fab83fbb0b2d8dc85fa636c4b9d34c75420c6d65";
+ };
+ };
"core-js-2.6.11" = {
name = "core-js";
packageName = "core-js";
@@ -12236,22 +12344,22 @@ let
sha512 = "LuoXnCRMKEo3KR3jEbCRpP3Nu2TUhLTlb/axP9+rl+ouhBpxTaHaTTN1bdUS2x2VK3wWyCBl1OZHyHhlRBntWg==";
};
};
- "creato-1.1.1" = {
+ "creato-1.1.2" = {
name = "creato";
packageName = "creato";
- version = "1.1.1";
+ version = "1.1.2";
src = fetchurl {
- url = "https://registry.npmjs.org/creato/-/creato-1.1.1.tgz";
- sha512 = "FIliDIw0V3V0lWR+pVmGh45rJSemv4EBr46SNvafpxu8UJKUovEaeP5c19jSe/4m2DOEVnBeA5zcEjo1koMolg==";
+ url = "https://registry.npmjs.org/creato/-/creato-1.1.2.tgz";
+ sha512 = "BSna+qXnoIhNugGcUz9wnC6UtyRRKRm3QMQ/42BDw97/8eW0Y6b5Z5ecyaDbZdWMW6ipvvCbuj7H9NEkd1C0jA==";
};
};
- "cron-1.8.2" = {
+ "cron-1.7.2" = {
name = "cron";
packageName = "cron";
- version = "1.8.2";
+ version = "1.7.2";
src = fetchurl {
- url = "https://registry.npmjs.org/cron/-/cron-1.8.2.tgz";
- sha512 = "Gk2c4y6xKEO8FSAUTklqtfSr7oTq0CiPQeLBG5Fl0qoXpZyMcj1SG59YL+hqq04bu6/IuEA7lMkYDAplQNKkyg==";
+ url = "https://registry.npmjs.org/cron/-/cron-1.7.2.tgz";
+ sha512 = "+SaJ2OfeRvfQqwXQ2kgr0Y5pzBR/lijf5OpnnaruwWnmI799JfWr2jN2ItOV9s3A/+TFOt6mxvKzQq5F0Jp6VQ==";
};
};
"cross-env-6.0.3" = {
@@ -12659,13 +12767,13 @@ let
sha512 = "GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA==";
};
};
- "cssstyle-2.2.0" = {
+ "cssstyle-2.3.0" = {
name = "cssstyle";
packageName = "cssstyle";
- version = "2.2.0";
+ version = "2.3.0";
src = fetchurl {
- url = "https://registry.npmjs.org/cssstyle/-/cssstyle-2.2.0.tgz";
- sha512 = "sEb3XFPx3jNnCAMtqrXPDeSgQr+jojtCeNf8cvMNMh1cG970+lljssvQDzPq6lmmJu2Vhqood/gtEomBiHOGnA==";
+ url = "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz";
+ sha512 = "AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==";
};
};
"csstype-2.6.10" = {
@@ -13082,13 +13190,13 @@ let
sha512 = "jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==";
};
};
- "dayjs-1.8.25" = {
+ "dayjs-1.8.26" = {
name = "dayjs";
packageName = "dayjs";
- version = "1.8.25";
+ version = "1.8.26";
src = fetchurl {
- url = "https://registry.npmjs.org/dayjs/-/dayjs-1.8.25.tgz";
- sha512 = "Pk36juDfQQGDCgr0Lqd1kw15w3OS6xt21JaLPE3lCfsEf8KrERGwDNwvK1tRjrjqFC0uZBJncT4smZQ4F+uV5g==";
+ url = "https://registry.npmjs.org/dayjs/-/dayjs-1.8.26.tgz";
+ sha512 = "KqtAuIfdNfZR5sJY1Dixr2Is4ZvcCqhb0dZpCOt5dGEFiMzoIbjkTSzUb4QKTCsP+WNpGwUjAFIZrnZvUxxkhw==";
};
};
"de-indent-1.0.2" = {
@@ -13100,13 +13208,13 @@ let
sha1 = "b2038e846dc33baa5796128d0804b455b8c1e21d";
};
};
- "deasync-0.1.19" = {
+ "deasync-0.1.20" = {
name = "deasync";
packageName = "deasync";
- version = "0.1.19";
+ version = "0.1.20";
src = fetchurl {
- url = "https://registry.npmjs.org/deasync/-/deasync-0.1.19.tgz";
- sha512 = "oh3MRktfnPlLysCPpBpKZZzb4cUC/p0aA3SyRGp15lN30juJBTo/CiD0d4fR+f1kBtUQoJj1NE9RPNWQ7BQ9Mg==";
+ url = "https://registry.npmjs.org/deasync/-/deasync-0.1.20.tgz";
+ sha512 = "E1GI7jMI57hL30OX6Ht/hfQU8DO4AuB9m72WFm4c38GNbUD4Q03//XZaOIHZiY+H1xUaomcot5yk2q/qIZQkGQ==";
};
};
"death-1.1.0" = {
@@ -13433,13 +13541,13 @@ let
sha512 = "yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==";
};
};
- "deep-equal-2.0.2" = {
+ "deep-equal-2.0.3" = {
name = "deep-equal";
packageName = "deep-equal";
- version = "2.0.2";
+ version = "2.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/deep-equal/-/deep-equal-2.0.2.tgz";
- sha512 = "kX0bjV7tdMuhrhzKPEnVwqfQCuf+IEfN+4Xqv4eKd75xGRyn8yzdQ9ujPY6a221rgJKyQC4KBu1PibDTpa6m9w==";
+ url = "https://registry.npmjs.org/deep-equal/-/deep-equal-2.0.3.tgz";
+ sha512 = "Spqdl4H+ky45I9ByyJtXteOm9CaIrPmnIPmOhrkKGNYWeDgCvJ8jNYVCTjChxW4FqGuZnLHADc8EKRMX6+CgvA==";
};
};
"deep-extend-0.2.11" = {
@@ -13469,15 +13577,6 @@ let
sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==";
};
};
- "deep-freeze-node-1.1.3" = {
- name = "deep-freeze-node";
- packageName = "deep-freeze-node";
- version = "1.1.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/deep-freeze-node/-/deep-freeze-node-1.1.3.tgz";
- sha512 = "CrA+1BVGfs9ZrGFMYtHfFHncWivh9XPb+6g8bLOzYPJmW8FmUs1dXLjALzU1SMqOMdoD5pQJARXtzxfeLqE9HQ==";
- };
- };
"deep-is-0.1.2" = {
name = "deep-is";
packageName = "deep-is";
@@ -13829,13 +13928,13 @@ let
sha512 = "g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==";
};
};
- "dependency-graph-0.8.1" = {
+ "dependency-graph-0.9.0" = {
name = "dependency-graph";
packageName = "dependency-graph";
- version = "0.8.1";
+ version = "0.9.0";
src = fetchurl {
- url = "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.8.1.tgz";
- sha512 = "g213uqF8fyk40W8SBjm079n3CZB4qSpCrA2ye1fLGzH/4HEgB6tzuW2CbLE7leb4t45/6h44Ud59Su1/ROTfqw==";
+ url = "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.9.0.tgz";
+ sha512 = "9YLIBURXj4DJMFALxXw9K3Y3rwb5Fk0X5/8ipCzaN84+gKxoHK43tVKRNakCQbiEx07E8Uwhuq21BpUagFhZ8w==";
};
};
"dependency-tree-7.2.1" = {
@@ -14477,13 +14576,13 @@ let
sha512 = "Yiolk/ktLUjThacBuIEqyoRYzDdGrp8rjKjcdZA/hhtIUHrU5iVrS1MIm3p3PWKpnD7va4Jlp/FV0ywP3AdKrg==";
};
};
- "dockerfile-language-service-0.0.11" = {
+ "dockerfile-language-service-0.0.12" = {
name = "dockerfile-language-service";
packageName = "dockerfile-language-service";
- version = "0.0.11";
+ version = "0.0.12";
src = fetchurl {
- url = "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.0.11.tgz";
- sha512 = "fTCa36gGPpveIsdNTa5GkvJzL/j78ga8kZ7pnF/OaJiuXKzphDetVVfeamgtXLsviAwIXyUDmofxaVKCT/XWSw==";
+ url = "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.0.12.tgz";
+ sha512 = "73ZEQW8LCL/SIWzWekqqLdH41pZ8+N2BYD5K16cBQCQfsZPjFoJC04tv7jlTnEPypJZs3zV0hpBLVTi7zhRFfw==";
};
};
"dockerfile-utils-0.0.11" = {
@@ -14666,13 +14765,13 @@ let
sha512 = "eKLdI5v9m67kbXQbJSNn1zjh0SDzvzWVWtX+qEI3eMjZw8daH9k8rlj1FZY9memPwjiskQFbe7vHVVJIAqoEhw==";
};
};
- "domino-2.1.4" = {
+ "domino-2.1.5" = {
name = "domino";
packageName = "domino";
- version = "2.1.4";
+ version = "2.1.5";
src = fetchurl {
- url = "https://registry.npmjs.org/domino/-/domino-2.1.4.tgz";
- sha512 = "l70mlQ7IjPKC8kT7GljQXJZmt5OqFL+RE91ik5y5WWQtsd9wP8R7gpFnNu96fK5MqAAZRXfLLsnzKtkty5fWGQ==";
+ url = "https://registry.npmjs.org/domino/-/domino-2.1.5.tgz";
+ sha512 = "vMDo7f6ogUV9PkzmxXLiXzJkJZqU09Le4C40mj+HmAGS/2FPmdetoNOQZXpu2kekn0GJKvtwKMAVoruTj60Xww==";
};
};
"domutils-1.4.3" = {
@@ -14810,13 +14909,13 @@ let
sha512 = "UGGGWfSauusaVJC+8fgV+NVvBXkCTmVv7sk6nojDZZvuOUNGUy0Zk4UpHQD6EDjS0jpBwcACvH4eofvyzBcRDw==";
};
};
- "dotnet-deps-parser-4.9.0" = {
+ "dotnet-deps-parser-4.10.0" = {
name = "dotnet-deps-parser";
packageName = "dotnet-deps-parser";
- version = "4.9.0";
+ version = "4.10.0";
src = fetchurl {
- url = "https://registry.npmjs.org/dotnet-deps-parser/-/dotnet-deps-parser-4.9.0.tgz";
- sha512 = "V0O+7pI7Ei+iL5Kgy6nYq1UTwzrpqci5K/zf8cXyP5RWBSQBUl/JOE9I67zLUkKiwOdfPhbMQgcRj/yGA+NL1A==";
+ url = "https://registry.npmjs.org/dotnet-deps-parser/-/dotnet-deps-parser-4.10.0.tgz";
+ sha512 = "dEO1oTvreaDCtcvhRdOmmAMubyC+MWqVr1c/1Wvasi+NW4NZeB67qGh1taqowUFh+aCXtPw3SP2eExn6aNkhwA==";
};
};
"downgrade-root-1.2.2" = {
@@ -14891,6 +14990,15 @@ let
sha512 = "RyOSTL7B3qzrhCOfhgzxNrcZD1klFOAJcw2YG345AIB4su1KC4WSk6fzRz3xpg1tp/plr5v8aDlvZy+LDtf6uA==";
};
};
+ "download-stats-0.3.4" = {
+ name = "download-stats";
+ packageName = "download-stats";
+ version = "0.3.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/download-stats/-/download-stats-0.3.4.tgz";
+ sha512 = "ic2BigbyUWx7/CBbsfGjf71zUNZB4edBGC3oRliSzsoNmvyVx3Ycfp1w3vp2Y78Ee0eIIkjIEO5KzW0zThDGaA==";
+ };
+ };
"draftlog-1.0.12" = {
name = "draftlog";
packageName = "draftlog";
@@ -15170,13 +15278,13 @@ let
sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==";
};
};
- "electron-to-chromium-1.3.415" = {
+ "electron-to-chromium-1.3.427" = {
name = "electron-to-chromium";
packageName = "electron-to-chromium";
- version = "1.3.415";
+ version = "1.3.427";
src = fetchurl {
- url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.415.tgz";
- sha512 = "GbtYqKffx3sU8G0HxwXuJFfs58Q7+iwLa5rBwaULwET6jWW8IAQSrVnu7vEfiUIcMVfbYyFg7cw3zdm+EbBJmw==";
+ url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.427.tgz";
+ sha512 = "/rG5G7Opcw68/Yrb4qYkz07h3bESVRJjUl4X/FrKLXzoUJleKm6D7K7rTTz8V5LUWnd+BbTOyxJX2XprRqHD8A==";
};
};
"elegant-spinner-1.0.1" = {
@@ -15639,6 +15747,15 @@ let
sha512 = "jDgnJaF/Btomk+m3PZDTTCb5XIIIX3zYItnCRfF73zVgvinLoRomuhi75Y4su0PtQxWz4v66XnLLckyvyJTOIQ==";
};
};
+ "envinfo-7.5.1" = {
+ name = "envinfo";
+ packageName = "envinfo";
+ version = "7.5.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/envinfo/-/envinfo-7.5.1.tgz";
+ sha512 = "hQBkDf2iO4Nv0CNHpCuSBeaSrveU6nThVxFGTrq/eDlV716UQk09zChaJae4mZRsos1x4YLY2TaH3LHUae3ZmQ==";
+ };
+ };
"epidemic-broadcast-trees-7.0.0" = {
name = "epidemic-broadcast-trees";
packageName = "epidemic-broadcast-trees";
@@ -15657,13 +15774,13 @@ let
sha1 = "06e0116d3028f6aef4806849eb0ea6a748ae6960";
};
};
- "errlop-2.1.0" = {
+ "errlop-2.2.0" = {
name = "errlop";
packageName = "errlop";
- version = "2.1.0";
+ version = "2.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/errlop/-/errlop-2.1.0.tgz";
- sha512 = "sEmQX03aJkWsqTPDYaymq3ROJmKxMHhFS4UN8fWwr5ZiRtw3p61QHRk2QQj68DiaTIXWujJP+uEUS1Zx3spxlw==";
+ url = "https://registry.npmjs.org/errlop/-/errlop-2.2.0.tgz";
+ sha512 = "e64Qj9+4aZzjzzFpZC7p5kmm/ccCrbLhAJplhsDXQFs87XTsXwOpH4s1Io2s90Tau/8r2j9f4l/thhDevRjzxw==";
};
};
"errno-0.1.7" = {
@@ -15801,6 +15918,15 @@ let
sha1 = "96edb9f2fdb01995822b263dd8aadab6748181bc";
};
};
+ "es6-promise-3.0.2" = {
+ name = "es6-promise";
+ packageName = "es6-promise";
+ version = "3.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz";
+ sha1 = "010d5858423a5f118979665f46486a95c6ee2bb6";
+ };
+ };
"es6-promise-3.3.1" = {
name = "es6-promise";
packageName = "es6-promise";
@@ -15855,6 +15981,15 @@ let
sha512 = "jCsk2fpfEFusVv1MDkF4Uf0hAzIKNDMgR6LyOIw6a3jwkN1sCgWzuwgnsHY9YSQ8n8P31HoncvE0LC44cpWTrw==";
};
};
+ "es6-promisify-6.1.1" = {
+ name = "es6-promisify";
+ packageName = "es6-promisify";
+ version = "6.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-6.1.1.tgz";
+ sha512 = "HBL8I3mIki5C1Cc9QjKUenHtnG0A5/xA8Q/AllRcfiwl2CZFXGK7ddBiCoRwAix4i2KxcQfjtIVcrVbB3vbmwg==";
+ };
+ };
"es6-set-0.1.5" = {
name = "es6-set";
packageName = "es6-set";
@@ -17547,13 +17682,13 @@ let
sha512 = "0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==";
};
};
- "filelist-0.0.6" = {
+ "filelist-1.0.1" = {
name = "filelist";
packageName = "filelist";
- version = "0.0.6";
+ version = "1.0.1";
src = fetchurl {
- url = "https://registry.npmjs.org/filelist/-/filelist-0.0.6.tgz";
- sha1 = "58a641ad1f57574a27fe87a440ef318834b55719";
+ url = "https://registry.npmjs.org/filelist/-/filelist-1.0.1.tgz";
+ sha512 = "8zSK6Nu0DQIC08mUC46sWGXi+q3GGpKydAG36k+JDba6VRpkevvOWUW5a/PhShij4+vHT9M+ghgG7eM+a9JDUQ==";
};
};
"filename-regex-2.0.1" = {
@@ -17889,13 +18024,13 @@ let
sha512 = "VoPpKScAzvZ07jtciOY0bJieJwyd/VVCuo4fn3nBLh4iBagzYED7GLQeFBpMpy7HP5edEKTDo8yxaIrYrwb7hg==";
};
};
- "fkill-7.0.0" = {
+ "fkill-7.0.1" = {
name = "fkill";
packageName = "fkill";
- version = "7.0.0";
+ version = "7.0.1";
src = fetchurl {
- url = "https://registry.npmjs.org/fkill/-/fkill-7.0.0.tgz";
- sha512 = "i61SqvPdfCxl1/VQulh9SXrC+4dudCtINzTHbKaEx3Jr0kD9SvxKDeXzej7Saurnj3al/jMJwQnsUc62VrBMHQ==";
+ url = "https://registry.npmjs.org/fkill/-/fkill-7.0.1.tgz";
+ sha512 = "rziuWzpWErC2aGQUuvGo9dcVBDeHowK9g75u4fnkTCAqPgvUVRMtlDW6KWsWonxY1tjF+p1mIys33yNvLRlAtw==";
};
};
"flagged-respawn-1.0.1" = {
@@ -18384,13 +18519,13 @@ let
sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84";
};
};
- "fp-ts-2.5.3" = {
+ "fp-ts-2.5.4" = {
name = "fp-ts";
packageName = "fp-ts";
- version = "2.5.3";
+ version = "2.5.4";
src = fetchurl {
- url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.5.3.tgz";
- sha512 = "lQd+hahLd8cygNoXbEHDjH/cbF6XVWlEPb8h5GXXlozjCSDxWgclvkpOoTRfBA0P+r69l9VvW1nEsSGIJRQpWw==";
+ url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.5.4.tgz";
+ sha512 = "cZlLeEneRYypc2dOzB9h8+bd9mQhJVyt2g0Dny2gKR7uWNgA4EmLSJyguLYsTU44nJSSG9EjurUalEc0wQqeKw==";
};
};
"fraction.js-4.0.12" = {
@@ -18690,13 +18825,13 @@ let
sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
};
};
- "fs2-0.3.7" = {
+ "fs2-0.3.8" = {
name = "fs2";
packageName = "fs2";
- version = "0.3.7";
+ version = "0.3.8";
src = fetchurl {
- url = "https://registry.npmjs.org/fs2/-/fs2-0.3.7.tgz";
- sha512 = "fwfd9MBI/fnXtR/ClVTyeuPXJ+oI5WNyXvBQPmc4btgqLYTKOuBRTRUVjmVpDUri0C88HLwMlc5ESg48fEAGjw==";
+ url = "https://registry.npmjs.org/fs2/-/fs2-0.3.8.tgz";
+ sha512 = "HxOTRiFS3PqwAOmlp1mTwLA+xhQBdaP82b5aBamc/rHKFVyn4qL8YpngaAleD52PNMzBm6TsGOoU/Hq+bAfBhA==";
};
};
"fsevents-1.2.12" = {
@@ -19708,6 +19843,15 @@ let
sha512 = "7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==";
};
};
+ "globby-11.0.0" = {
+ name = "globby";
+ packageName = "globby";
+ version = "11.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/globby/-/globby-11.0.0.tgz";
+ sha512 = "iuehFnR3xu5wBBtm4xi0dMe92Ob87ufyu/dHwpDYfbcpYpIbrO5OnS8M1vWvrBhSGEJ3/Ecj7gnX76P8YxpPEg==";
+ };
+ };
"globby-4.1.0" = {
name = "globby";
packageName = "globby";
@@ -19942,13 +20086,13 @@ let
sha512 = "6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==";
};
};
- "graceful-fs-4.2.3" = {
+ "graceful-fs-4.2.4" = {
name = "graceful-fs";
packageName = "graceful-fs";
- version = "4.2.3";
+ version = "4.2.4";
src = fetchurl {
- url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz";
- sha512 = "a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==";
+ url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz";
+ sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==";
};
};
"graceful-readlink-1.0.1" = {
@@ -20068,13 +20212,13 @@ let
sha512 = "bOufkkog0cSfHJ9gVD3Wy+KHmkSTHWcFfPaV/NVpIvfJx15gU0/CzuC6lcTjioWmn+UGzYdoqmP7OrJAWT57sw==";
};
};
- "graphql-extensions-0.11.1" = {
+ "graphql-extensions-0.12.0" = {
name = "graphql-extensions";
packageName = "graphql-extensions";
- version = "0.11.1";
+ version = "0.12.0";
src = fetchurl {
- url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.11.1.tgz";
- sha512 = "1bstq6YKaC579PTw9gchw2VlXqjPo3vn8NjRMaUqF2SxyYTjVSgXaCAbaeNa0B7xlLVigxi3DV1zh4A+ss+Lwg==";
+ url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.12.0.tgz";
+ sha512 = "kBRLtNeknrFl0W/UQQYebj6qnvb1E1RpQ2+C7Y8pwMc6yV8+9pWFx5RP0HzfeEuScCmK93i3H5sdPedoQWwENw==";
};
};
"graphql-import-0.4.5" = {
@@ -20653,13 +20797,13 @@ let
sha512 = "UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==";
};
};
- "hash-base-3.0.4" = {
+ "hash-base-3.1.0" = {
name = "hash-base";
packageName = "hash-base";
- version = "3.0.4";
+ version = "3.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz";
- sha1 = "5fc8686847ecd73499403319a6b0a3f3f6ae4918";
+ url = "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz";
+ sha512 = "1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==";
};
};
"hash-sum-2.0.0" = {
@@ -23345,13 +23489,13 @@ let
sha1 = "207bab91638499c07b2adf240a41a87210034575";
};
};
- "is-promise-2.1.0" = {
+ "is-promise-2.2.2" = {
name = "is-promise";
packageName = "is-promise";
- version = "2.1.0";
+ version = "2.2.2";
src = fetchurl {
- url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz";
- sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa";
+ url = "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz";
+ sha512 = "+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==";
};
};
"is-property-1.0.2" = {
@@ -23732,13 +23876,13 @@ let
sha1 = "1f16e4aa22b04d1336b66188a66af3c600c3a66d";
};
};
- "is-wsl-2.1.1" = {
+ "is-wsl-2.2.0" = {
name = "is-wsl";
packageName = "is-wsl";
- version = "2.1.1";
+ version = "2.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/is-wsl/-/is-wsl-2.1.1.tgz";
- sha512 = "umZHcSrwlDHo2TGMXv0DZ8dIUGunZ2Iv68YZnrmCiBPkZ4aaOhtv7pXJKeki9k3qJ3RJr0cDyitcl5wEH3AYog==";
+ url = "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz";
+ sha512 = "fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==";
};
};
"is-yarn-global-0.3.0" = {
@@ -24047,13 +24191,13 @@ let
sha1 = "7a549bbd9ffe1585b0cd0a191e203055bee574b4";
};
};
- "jest-haste-map-25.4.0" = {
+ "jest-haste-map-25.5.1" = {
name = "jest-haste-map";
packageName = "jest-haste-map";
- version = "25.4.0";
+ version = "25.5.1";
src = fetchurl {
- url = "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-25.4.0.tgz";
- sha512 = "5EoCe1gXfGC7jmXbKzqxESrgRcaO3SzWXGCnvp9BcT0CFMyrB1Q6LIsjl9RmvmJGQgW297TCfrdgiy574Rl9HQ==";
+ url = "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-25.5.1.tgz";
+ sha512 = "dddgh9UZjV7SCDQUrQ+5t9yy8iEgKc1AKqZR9YDww8xsVOtzPQSMVLDChc21+g29oTRexb9/B0bIlZL+sWmvAQ==";
};
};
"jest-regex-util-25.2.6" = {
@@ -24065,31 +24209,31 @@ let
sha512 = "KQqf7a0NrtCkYmZZzodPftn7fL1cq3GQAFVMn5Hg8uKx/fIenLEobNanUxb7abQ1sjADHBseG/2FGpsv/wr+Qw==";
};
};
- "jest-serializer-25.2.6" = {
+ "jest-serializer-25.5.0" = {
name = "jest-serializer";
packageName = "jest-serializer";
- version = "25.2.6";
+ version = "25.5.0";
src = fetchurl {
- url = "https://registry.npmjs.org/jest-serializer/-/jest-serializer-25.2.6.tgz";
- sha512 = "RMVCfZsezQS2Ww4kB5HJTMaMJ0asmC0BHlnobQC6yEtxiFKIxohFA4QSXSabKwSggaNkqxn6Z2VwdFCjhUWuiQ==";
+ url = "https://registry.npmjs.org/jest-serializer/-/jest-serializer-25.5.0.tgz";
+ sha512 = "LxD8fY1lByomEPflwur9o4e2a5twSQ7TaVNLlFUuToIdoJuBt8tzHfCsZ42Ok6LkKXWzFWf3AGmheuLAA7LcCA==";
};
};
- "jest-util-25.4.0" = {
+ "jest-util-25.5.0" = {
name = "jest-util";
packageName = "jest-util";
- version = "25.4.0";
+ version = "25.5.0";
src = fetchurl {
- url = "https://registry.npmjs.org/jest-util/-/jest-util-25.4.0.tgz";
- sha512 = "WSZD59sBtAUjLv1hMeKbNZXmMcrLRWcYqpO8Dz8b4CeCTZpfNQw2q9uwrYAD+BbJoLJlu4ezVPwtAmM/9/SlZA==";
+ url = "https://registry.npmjs.org/jest-util/-/jest-util-25.5.0.tgz";
+ sha512 = "KVlX+WWg1zUTB9ktvhsg2PXZVdkI1NBevOJSkTKYAyXyH4QSvh+Lay/e/v+bmaFfrkfx43xD8QTfgobzlEXdIA==";
};
};
- "jest-worker-25.4.0" = {
+ "jest-worker-25.5.0" = {
name = "jest-worker";
packageName = "jest-worker";
- version = "25.4.0";
+ version = "25.5.0";
src = fetchurl {
- url = "https://registry.npmjs.org/jest-worker/-/jest-worker-25.4.0.tgz";
- sha512 = "ghAs/1FtfYpMmYQ0AHqxV62XPvKdUDIBBApMZfly+E9JEmYh2K45G0R5dWxx986RN12pRCxsViwQVtGl+N4whw==";
+ url = "https://registry.npmjs.org/jest-worker/-/jest-worker-25.5.0.tgz";
+ sha512 = "/dsSmUkIy5EBGfv/IjjqmFxrNAUpBERfGs1oHROyD7yxjG/w+t0GOJDX8O1k32ySmd7+a5IhnJU2qQFcJ4n1vw==";
};
};
"jetpack-id-1.0.0" = {
@@ -24326,13 +24470,13 @@ let
sha1 = "b01307cb29b618a1ed26ec79e911f803c4da0040";
};
};
- "jscodeshift-0.7.0" = {
+ "jscodeshift-0.7.1" = {
name = "jscodeshift";
packageName = "jscodeshift";
- version = "0.7.0";
+ version = "0.7.1";
src = fetchurl {
- url = "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.7.0.tgz";
- sha512 = "Kt6rpTa1HVhAWagD6J0y6qxxqRmDgkFvczerLgOsDNSGoUZSmq2CO1vFRcda9OV1BaZKSHCIh+VREPts5tB/Ig==";
+ url = "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.7.1.tgz";
+ sha512 = "YMkZSyoc8zg5woZL23cmWlnFLPH/mHilonGA7Qbzs7H6M4v4PH0Qsn4jeDyw+CHhVoAnm9UxQyB0Yw1OT+mktA==";
};
};
"jsdom-11.12.0" = {
@@ -24659,15 +24803,6 @@ let
sha512 = "KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==";
};
};
- "jsonata-1.8.2" = {
- name = "jsonata";
- packageName = "jsonata";
- version = "1.8.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/jsonata/-/jsonata-1.8.2.tgz";
- sha512 = "ma5F/Bs47dZfJfDZ0Dt37eIbzVBVKZIDqsZSqdCCAPNHxKn+s3+CfMA6ahVVlf8Y1hyIjXkVLFU7yv4XxRfihA==";
- };
- };
"jsonata-1.8.3" = {
name = "jsonata";
packageName = "jsonata";
@@ -24875,6 +25010,15 @@ let
sha1 = "b88f3a7b2e67a2a048152982c7a3756d9c4828f0";
};
};
+ "jszip-3.1.5" = {
+ name = "jszip";
+ packageName = "jszip";
+ version = "3.1.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jszip/-/jszip-3.1.5.tgz";
+ sha512 = "5W8NUaFRFRqTOL7ZDDrx5qWHJyBXy6velVudIzQUSoqAAYqzSh2Z7/m0Rf1QbmQJccegD0r+YZxBjzqoBiEeJQ==";
+ };
+ };
"jszip-3.4.0" = {
name = "jszip";
packageName = "jszip";
@@ -24884,16 +25028,6 @@ let
sha512 = "gZAOYuPl4EhPTXT0GjhI3o+ZAz3su6EhLrKUoAivcKqyqC7laS5JEv4XWZND9BgcDcF83vI85yGbDmDR6UhrIg==";
};
};
- "jszip-git://github.com/anmonteiro/jszip#patch-1" = {
- name = "jszip";
- packageName = "jszip";
- version = "2.6.1";
- src = fetchgit {
- url = "git://github.com/anmonteiro/jszip";
- rev = "5a92e8c9153a3557daa8d3540b00c50bd8554c49";
- sha256 = "00016993634d04b6f7eea8fae529b804d5a0b7ed2636361c7546a48b866e9c5c";
- };
- };
"junk-3.1.0" = {
name = "junk";
packageName = "junk";
@@ -25390,6 +25524,15 @@ let
sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e";
};
};
+ "lazy-cache-2.0.2" = {
+ name = "lazy-cache";
+ packageName = "lazy-cache";
+ version = "2.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz";
+ sha1 = "b9190a4f913354694840859f8a8f7084d8822264";
+ };
+ };
"lazyness-1.1.1" = {
name = "lazyness";
packageName = "lazyness";
@@ -25741,6 +25884,15 @@ let
sha1 = "86652b0009a6d84ea79a5320bdca5f00612ee439";
};
};
+ "lie-3.1.1" = {
+ name = "lie";
+ packageName = "lie";
+ version = "3.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz";
+ sha1 = "9a436b2cc7746ca59de7a41fa469b3efb76bd87e";
+ };
+ };
"lie-3.3.0" = {
name = "lie";
packageName = "lie";
@@ -27685,13 +27837,13 @@ let
sha512 = "07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag==";
};
};
- "make-fetch-happen-8.0.4" = {
+ "make-fetch-happen-8.0.6" = {
name = "make-fetch-happen";
packageName = "make-fetch-happen";
- version = "8.0.4";
+ version = "8.0.6";
src = fetchurl {
- url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-8.0.4.tgz";
- sha512 = "hIFoqGq1db0QMiy/Atr/pI1Rs4rDV+ZdGSey2SQyF3KK3u1z4aj9mS5UdNnZkdQpA+H3pGn0J3KlEwsi2x4EqA==";
+ url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-8.0.6.tgz";
+ sha512 = "QJ4pB5VBY9H9e+3t/o+fPjsVUlPULpAllxuKertRo/7ii47TfxeEEnneM6NCmhyn4MQPTYL+M+RkiU9bR+hAfg==";
};
};
"make-iterator-1.0.1" = {
@@ -28045,13 +28197,13 @@ let
sha512 = "EGwzEeCcLniFX51DhTpmTom+dSA/MG/OBUDjnWtHbEnjAH180VzUeAw+oE4+Zv+CoYBWyRlYOTR0N8SO9R1PVw==";
};
};
- "marked-terminal-4.0.0" = {
+ "marked-terminal-4.1.0" = {
name = "marked-terminal";
packageName = "marked-terminal";
- version = "4.0.0";
+ version = "4.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/marked-terminal/-/marked-terminal-4.0.0.tgz";
- sha512 = "mzU3VD7aVz12FfGoKFAceijehA6Ocjfg3rVimvJbFAB/NOYCsuzRVtq3PSFdPmWI5mhdGeEh3/aMJ5DSxAz94Q==";
+ url = "https://registry.npmjs.org/marked-terminal/-/marked-terminal-4.1.0.tgz";
+ sha512 = "5KllfAOW02WS6hLRQ7cNvGOxvKW1BKuXELH4EtbWfyWgxQhROoMxEvuQ/3fTgkNjledR0J48F4HbapvYp1zWkQ==";
};
};
"marky-1.2.1" = {
@@ -28495,13 +28647,13 @@ let
sha512 = "CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig==";
};
};
- "meow-6.1.0" = {
+ "meow-6.1.1" = {
name = "meow";
packageName = "meow";
- version = "6.1.0";
+ version = "6.1.1";
src = fetchurl {
- url = "https://registry.npmjs.org/meow/-/meow-6.1.0.tgz";
- sha512 = "iIAoeI01v6pmSfObAAWFoITAA4GgiT45m4SmJgoxtZfvI0fyZwhV4d0lTwiUXvAKIPlma05Feb2Xngl52Mj5Cg==";
+ url = "https://registry.npmjs.org/meow/-/meow-6.1.1.tgz";
+ sha512 = "3YffViIt2QWgTy6Pale5QpopX/IvU3LPL03jOTqp6pGj3VjesdO/U8CuHMKpnQr4shCNCM5fd5XFFvIIl6JBHg==";
};
};
"merge-1.2.1" = {
@@ -28756,6 +28908,15 @@ let
sha512 = "LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==";
};
};
+ "mime-2.4.5" = {
+ name = "mime";
+ packageName = "mime";
+ version = "2.4.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mime/-/mime-2.4.5.tgz";
+ sha512 = "3hQhEUF027BuxZjQA3s7rIv/7VCQPa27hN9u9g87sEkWaKwQPuXOkVKtOeiyUrnWqTDiOs8Ed2rwg733mB0R5w==";
+ };
+ };
"mime-db-1.12.0" = {
name = "mime-db";
packageName = "mime-db";
@@ -28819,6 +28980,15 @@ let
sha512 = "01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==";
};
};
+ "mime-types-2.1.27" = {
+ name = "mime-types";
+ packageName = "mime-types";
+ version = "2.1.27";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz";
+ sha512 = "JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==";
+ };
+ };
"mimic-fn-1.2.0" = {
name = "mimic-fn";
packageName = "mimic-fn";
@@ -29125,13 +29295,13 @@ let
sha1 = "f98ee7b5fffd3f4dadc5733827db0aa57f861880";
};
};
- "mirror-folder-3.0.1" = {
+ "mirror-folder-3.1.0" = {
name = "mirror-folder";
packageName = "mirror-folder";
- version = "3.0.1";
+ version = "3.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/mirror-folder/-/mirror-folder-3.0.1.tgz";
- sha512 = "AWYvbeZbHljMuu+49wgCdLGVOekNh/vpIsIMkFZYcRAJCY9vH7+vHM/aEIY3mrbbrBkHyBDnbmoOWUTbHN4A8g==";
+ url = "https://registry.npmjs.org/mirror-folder/-/mirror-folder-3.1.0.tgz";
+ sha512 = "OI7i/f1OjPWyloZi8kEZFSe50V9gMdMsCOzeS6DZ8OgpJP9bCDXDJRiDWYEfYNF2sCY7TBZBbLfKuEo3vohJhw==";
};
};
"mississippi-3.0.0" = {
@@ -29188,15 +29358,6 @@ let
sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
};
};
- "mkdirp-0.5.3" = {
- name = "mkdirp";
- packageName = "mkdirp";
- version = "0.5.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz";
- sha512 = "P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg==";
- };
- };
"mkdirp-0.5.5" = {
name = "mkdirp";
packageName = "mkdirp";
@@ -29224,13 +29385,13 @@ let
sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==";
};
};
- "mkdirp-classic-0.5.2" = {
+ "mkdirp-classic-0.5.3" = {
name = "mkdirp-classic";
packageName = "mkdirp-classic";
- version = "0.5.2";
+ version = "0.5.3";
src = fetchurl {
- url = "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.2.tgz";
- sha512 = "ejdnDQcR75gwknmMw/tx02AuRs8jCtqFoFqDZMjiNxsu85sRIJVXDKHuLYvUUPRBUtV2FpSZa9bL1BUa3BdR2g==";
+ url = "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz";
+ sha512 = "gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==";
};
};
"mkdirp-promise-5.0.1" = {
@@ -29341,6 +29502,15 @@ let
sha512 = "bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==";
};
};
+ "moment-2.25.3" = {
+ name = "moment";
+ packageName = "moment";
+ version = "2.25.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/moment/-/moment-2.25.3.tgz";
+ sha512 = "PuYv0PHxZvzc15Sp8ybUCoQ+xpyPWvjOuK72a5ovzp2LI32rJXOiIfyoFoYvG3s6EwwrdkMyWuRiEHSZRLJNdg==";
+ };
+ };
"moment-2.7.0" = {
name = "moment";
packageName = "moment";
@@ -29413,6 +29583,15 @@ let
sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92";
};
};
+ "move-file-2.0.0" = {
+ name = "move-file";
+ packageName = "move-file";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/move-file/-/move-file-2.0.0.tgz";
+ sha512 = "cdkdhNCgbP5dvS4tlGxZbD+nloio9GIimP57EjqFhwLcMjnU+XJKAZzlmg/TN/AK1LuNAdTSvm3CPPP4Xkv0iQ==";
+ };
+ };
"mp4-box-encoding-1.4.1" = {
name = "mp4-box-encoding";
packageName = "mp4-box-encoding";
@@ -29800,13 +29979,13 @@ let
sha512 = "nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==";
};
};
- "mutexify-1.2.0" = {
+ "mutexify-1.3.0" = {
name = "mutexify";
packageName = "mutexify";
- version = "1.2.0";
+ version = "1.3.0";
src = fetchurl {
- url = "https://registry.npmjs.org/mutexify/-/mutexify-1.2.0.tgz";
- sha512 = "oprzxd2zhfrJqEuB98qc1dRMMonClBQ57UPDjnbcrah4orEMTq1jq3+AcdFe5ePzdbJXI7zmdhfftIdMnhYFoQ==";
+ url = "https://registry.npmjs.org/mutexify/-/mutexify-1.3.0.tgz";
+ sha512 = "WNPlgZ3AHETGSa4jeRP4aW6BPQ/a++MwoMFFIgrDg80+m70mbxuNOrevANfBDmur82zxTFAY3OwvMAvqrkV2sA==";
};
};
"muxrpc-6.5.0" = {
@@ -30200,13 +30379,13 @@ let
sha1 = "ae603b36b134bcec347b452422b0bf98d5832ec8";
};
};
- "nearley-2.19.2" = {
+ "nearley-2.19.3" = {
name = "nearley";
packageName = "nearley";
- version = "2.19.2";
+ version = "2.19.3";
src = fetchurl {
- url = "https://registry.npmjs.org/nearley/-/nearley-2.19.2.tgz";
- sha512 = "h6lygT0BWAGErDvoE2LfI+tDeY2+UUrqG5dcBPdCmjnjud9z1wE0P7ljb85iNbE93YA+xJLpoSYGMuUqhnSSSA==";
+ url = "https://registry.npmjs.org/nearley/-/nearley-2.19.3.tgz";
+ sha512 = "FpAy1PmTsUpOtgxr23g4jRNvJHYzZEW2PixXeSzksLR/ykPfwKhAodc2+9wQhY+JneWLcvkDw6q7FJIsIdF/aQ==";
};
};
"neat-csv-2.1.0" = {
@@ -30706,6 +30885,15 @@ let
sha512 = "OUTryc5bt/P8zVgNUmC6xdXiDJxLMAW8cF5tLQOT9E5sOQj+UeQxnnPy74K3CLCa/SOjjBlbuzDLR8ANwA+wmw==";
};
};
+ "node-gyp-6.1.0" = {
+ name = "node-gyp";
+ packageName = "node-gyp";
+ version = "6.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/node-gyp/-/node-gyp-6.1.0.tgz";
+ sha512 = "h4A2zDlOujeeaaTx06r4Vy+8MZ1679lU+wbCKDS4ZtvY2A37DESo37oejIw0mtmR3+rvNwts5B6Kpt1KrNYdNw==";
+ };
+ };
"node-gyp-build-3.7.0" = {
name = "node-gyp-build";
packageName = "node-gyp-build";
@@ -30733,13 +30921,13 @@ let
sha512 = "dSq1xmcPDKPZ2EED2S6zw/b9NKsqzXRE6dVr8TVQnI3FJOTteUMuqF3Qqs6LZg+mLGYJWqQzMbIjMtJqTv87nQ==";
};
};
- "node-gyp-build-4.2.1" = {
+ "node-gyp-build-4.2.2" = {
name = "node-gyp-build";
packageName = "node-gyp-build";
- version = "4.2.1";
+ version = "4.2.2";
src = fetchurl {
- url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.1.tgz";
- sha512 = "XyCKXsqZfLqHep1hhsMncoXuUNt/cXCjg1+8CLbu69V1TKuPiOeSGbL9n+k/ByKH8UT0p4rdIX8XkTRZV0i7Sw==";
+ url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.2.tgz";
+ sha512 = "Lqh7mrByWCM8Cf9UPqpeoVBBo5Ugx+RKu885GAzmLBVYjeywScxHXPGLa4JfYNZmcNGwzR0Glu5/9GaQZMFqyA==";
};
};
"node-int64-0.4.0" = {
@@ -31183,6 +31371,15 @@ let
sha1 = "df7c3ed5a277c3f9d4b5d819b05311d10a200ae6";
};
};
+ "npm-api-1.0.0" = {
+ name = "npm-api";
+ packageName = "npm-api";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/npm-api/-/npm-api-1.0.0.tgz";
+ sha512 = "gtJhIhGq07g9H5sIAB9TZzTySW8MYtcYqg+e+J+5q1GmDsDLLVfyvVBL1VklzjtRsElph11GUtLBS191RDOJxQ==";
+ };
+ };
"npm-bundled-1.1.1" = {
name = "npm-bundled";
packageName = "npm-bundled";
@@ -31390,22 +31587,22 @@ let
sha512 = "Qs6P6nnopig+Y8gbzpeN/dkt+n7IyVd8f45NTMotGk6Qo7GfBmzwYx6jRLoOOgKiMnaQfYxsuyQlD8Mc3guBhg==";
};
};
- "npm-registry-fetch-4.0.3" = {
+ "npm-registry-fetch-4.0.4" = {
name = "npm-registry-fetch";
packageName = "npm-registry-fetch";
- version = "4.0.3";
+ version = "4.0.4";
src = fetchurl {
- url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.3.tgz";
- sha512 = "WGvUx0lkKFhu9MbiGFuT9nG2NpfQ+4dCJwRwwtK2HK5izJEvwDxMeUyqbuMS7N/OkpVCqDorV6rO5E4V9F8lJw==";
+ url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.4.tgz";
+ sha512 = "6jb34hX/iYNQebqWUHtU8YF6Cjb1H6ouTFPClYsyiW6lpFkljTpdeftm53rRojtja1rKAvKNIIiTS5Sjpw4wsA==";
};
};
- "npm-registry-fetch-8.0.0" = {
+ "npm-registry-fetch-8.0.2" = {
name = "npm-registry-fetch";
packageName = "npm-registry-fetch";
- version = "8.0.0";
+ version = "8.0.2";
src = fetchurl {
- url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-8.0.0.tgz";
- sha512 = "975WwLvZjX97y9UWWQ8nAyr7bw02s9xKPHqvEm5T900LQsB1HXb8Gb9ebYtCBLSX+K8gSOrO5KS/9yV/naLZmQ==";
+ url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-8.0.2.tgz";
+ sha512 = "/UteT/LQ+0eegPh96w2sVjpAJk2kuphWASp1SPBFBWtSyuPoUW5gf4utzQm5A5FLrZF3eZJGH59j4X6KBUa40g==";
};
};
"npm-run-4.1.2" = {
@@ -32714,13 +32911,13 @@ let
sha512 = "3cRXXn3/O0o3+eVmUroJPSj/esxoEFIm0ZOno/T+NzG/VZgPOqQ8WKmlNqubSEpZmCIngEy34unkHGg83ZIBmg==";
};
};
- "p-queue-6.3.0" = {
+ "p-queue-6.4.0" = {
name = "p-queue";
packageName = "p-queue";
- version = "6.3.0";
+ version = "6.4.0";
src = fetchurl {
- url = "https://registry.npmjs.org/p-queue/-/p-queue-6.3.0.tgz";
- sha512 = "fg5dJlFpd5+3CgG3/0ogpVZUeJbjiyXFg0nu53hrOYsybqSiDyxyOpad0Rm6tAiGjgztAwkyvhlYHC53OiAJOA==";
+ url = "https://registry.npmjs.org/p-queue/-/p-queue-6.4.0.tgz";
+ sha512 = "X7ddxxiQ+bLR/CUt3/BVKrGcJDNxBr0pEEFKHHB6vTPWNUhgDv36GpIH18RmGM3YGPpBT+JWGjDDqsVGuF0ERw==";
};
};
"p-reduce-1.0.0" = {
@@ -32876,13 +33073,13 @@ let
sha1 = "79b302fc144cdfbb4ab6feba7040e6a5d99c79c7";
};
};
- "pacote-11.1.4" = {
+ "pacote-11.1.8" = {
name = "pacote";
packageName = "pacote";
- version = "11.1.4";
+ version = "11.1.8";
src = fetchurl {
- url = "https://registry.npmjs.org/pacote/-/pacote-11.1.4.tgz";
- sha512 = "eUGJvSSpWFZKn3z8gig/HgnBmUl6gIWByIIaHzSyEr3tOWX0w8tFEADXtpu8HGv5E0ShCeTP6enRq8iHKCHSvw==";
+ url = "https://registry.npmjs.org/pacote/-/pacote-11.1.8.tgz";
+ sha512 = "oBXbdsqA0pnk4lNmWDHMm20uSbZiYCjE0MHeSFG3esxw1mubhSJizVc1rKVI0KMkYTMz4M7OTEqY1h2lx+wbPw==";
};
};
"pacote-9.5.12" = {
@@ -32912,6 +33109,15 @@ let
sha1 = "ad1f22ce1bf0fdc0d6ddd908af17f351a404b8ac";
};
};
+ "paged-request-2.0.1" = {
+ name = "paged-request";
+ packageName = "paged-request";
+ version = "2.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/paged-request/-/paged-request-2.0.1.tgz";
+ sha512 = "C0bB/PFk9rQskD1YEiz7uuchzqKDQGgdsEHN1ahify0UUWzgmMK4NDG9fhlQg2waogmNFwEvEeHfMRvJySpdVw==";
+ };
+ };
"pako-0.2.9" = {
name = "pako";
packageName = "pako";
@@ -34226,13 +34432,13 @@ let
sha1 = "11d1e12b9cb64d63e30c143a330f4c1f567da85f";
};
};
- "portfinder-1.0.25" = {
+ "portfinder-1.0.26" = {
name = "portfinder";
packageName = "portfinder";
- version = "1.0.25";
+ version = "1.0.26";
src = fetchurl {
- url = "https://registry.npmjs.org/portfinder/-/portfinder-1.0.25.tgz";
- sha512 = "6ElJnHBbxVA1XSLgBp7G1FiCkQdlqGzuF7DswL5tcea+E8UpuvPU7beVAjjRwCioTS9ZluNbu+ZyRvgTsmqEBg==";
+ url = "https://registry.npmjs.org/portfinder/-/portfinder-1.0.26.tgz";
+ sha512 = "Xi7mKxJHHMI3rIUrnm/jjUgwhbYMkp/XKEcZX3aG4BrumLpq3nmoQMX+ClYnDZnZ/New7IatC1no5RX0zo1vXQ==";
};
};
"posix-character-classes-0.1.1" = {
@@ -34290,6 +34496,15 @@ let
sha512 = "WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==";
};
};
+ "postcss-7.0.29" = {
+ name = "postcss";
+ packageName = "postcss";
+ version = "7.0.29";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/postcss/-/postcss-7.0.29.tgz";
+ sha512 = "ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw==";
+ };
+ };
"postcss-calc-7.0.2" = {
name = "postcss-calc";
packageName = "postcss-calc";
@@ -34758,13 +34973,13 @@ let
sha512 = "pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==";
};
};
- "postcss-value-parser-4.0.3" = {
+ "postcss-value-parser-4.1.0" = {
name = "postcss-value-parser";
packageName = "postcss-value-parser";
- version = "4.0.3";
+ version = "4.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.3.tgz";
- sha512 = "N7h4pG+Nnu5BEIzyeaaIYWs0LI5XC40OrRh5L60z0QjFsqGWcHcbkBvpe1WYpcIS9yQ8sOi/vIPt1ejQCrMVrg==";
+ url = "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz";
+ sha512 = "97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==";
};
};
"postcss-values-parser-1.5.0" = {
@@ -35343,13 +35558,13 @@ let
sha1 = "0ee97a7fc020b1a2a55b8659eda4aa8d869094bd";
};
};
- "property-information-5.4.0" = {
+ "property-information-5.5.0" = {
name = "property-information";
packageName = "property-information";
- version = "5.4.0";
+ version = "5.5.0";
src = fetchurl {
- url = "https://registry.npmjs.org/property-information/-/property-information-5.4.0.tgz";
- sha512 = "nmMWAm/3vKFGmmOWOcdLjgq/Hlxa+hsuR/px1Lp/UGEyc5A22A6l78Shc2C0E71sPmAqglni+HrS7L7VJ7AUCA==";
+ url = "https://registry.npmjs.org/property-information/-/property-information-5.5.0.tgz";
+ sha512 = "RgEbCx2HLa1chNgvChcx+rrCWD0ctBmGSE0M7lVm1yyv4UbvbrWoXp/BkVLZefzjrRBGW8/Js6uh/BnlHXFyjA==";
};
};
"proto-list-1.2.4" = {
@@ -36432,13 +36647,13 @@ let
sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==";
};
};
- "qs-6.9.3" = {
+ "qs-6.9.4" = {
name = "qs";
packageName = "qs";
- version = "6.9.3";
+ version = "6.9.4";
src = fetchurl {
- url = "https://registry.npmjs.org/qs/-/qs-6.9.3.tgz";
- sha512 = "EbZYNarm6138UKKq46tdx08Yo/q9ZhFoAXAI1meAFd2GtbRDhbZY2WQSICskT0c5q99aFzLG1D4nvTk9tqfXIw==";
+ url = "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz";
+ sha512 = "A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ==";
};
};
"query-string-1.0.1" = {
@@ -37152,13 +37367,13 @@ let
sha512 = "crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==";
};
};
- "readdirp-3.3.0" = {
+ "readdirp-3.4.0" = {
name = "readdirp";
packageName = "readdirp";
- version = "3.3.0";
+ version = "3.4.0";
src = fetchurl {
- url = "https://registry.npmjs.org/readdirp/-/readdirp-3.3.0.tgz";
- sha512 = "zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ==";
+ url = "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz";
+ sha512 = "0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==";
};
};
"readline2-0.1.1" = {
@@ -37206,13 +37421,13 @@ let
sha512 = "XNvYvkfdAN9QewbrxeTOjgINkdY/odTgTS56ZNEWL9Ml0weT4T3sFtvnTuF+Gxyu46ANcRm1ntrF6F5LAJPAaQ==";
};
};
- "recast-0.19.0" = {
+ "recast-0.19.1" = {
name = "recast";
packageName = "recast";
- version = "0.19.0";
+ version = "0.19.1";
src = fetchurl {
- url = "https://registry.npmjs.org/recast/-/recast-0.19.0.tgz";
- sha512 = "HymYANYaUFpKoAkOZ2od16SB7A/BwCZbvYIs9Rc8K+wNThQctiCJ0AjLkPbo9eWdy3w5Eemk6I4MeEYbH12PBg==";
+ url = "https://registry.npmjs.org/recast/-/recast-0.19.1.tgz";
+ sha512 = "8FCjrBxjeEU2O6I+2hyHyBFH1siJbMBLwIRvVr1T3FD2cL754sOaJDsJ/8h3xYltasbJ8jqWRIhMuDGBSiSbjw==";
};
};
"rechoir-0.6.2" = {
@@ -37791,6 +38006,15 @@ let
sha1 = "de63128373fcbf7c3ccfa4de5a480c45a67958eb";
};
};
+ "replace-ext-1.0.1" = {
+ name = "replace-ext";
+ packageName = "replace-ext";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz";
+ sha512 = "yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==";
+ };
+ };
"replace-homedir-1.0.0" = {
name = "replace-homedir";
packageName = "replace-homedir";
@@ -38520,13 +38744,13 @@ let
sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A==";
};
};
- "rollup-2.7.2" = {
+ "rollup-2.7.6" = {
name = "rollup";
packageName = "rollup";
- version = "2.7.2";
+ version = "2.7.6";
src = fetchurl {
- url = "https://registry.npmjs.org/rollup/-/rollup-2.7.2.tgz";
- sha512 = "SdtTZVMMVSPe7SNv4exUyPXARe5v/p3TeeG3LRA5WabLPJt4Usi3wVrvVlyAUTG40JJmqS6zbIHt2vWTss2prw==";
+ url = "https://registry.npmjs.org/rollup/-/rollup-2.7.6.tgz";
+ sha512 = "AdHosxHBKyBsdtbT1/AqbWNQ87O4SSxS4N9iMwEpoCDAT6e4Du3uJSy83mp3ckgmCxly5VeXGx0WHsm21Djytg==";
};
};
"rollup-plugin-babel-4.4.0" = {
@@ -38664,13 +38888,13 @@ let
sha1 = "c8ad4a5e110661e402a7d21b530e009f25f8e389";
};
};
- "run-async-2.4.0" = {
+ "run-async-2.4.1" = {
name = "run-async";
packageName = "run-async";
- version = "2.4.0";
+ version = "2.4.1";
src = fetchurl {
- url = "https://registry.npmjs.org/run-async/-/run-async-2.4.0.tgz";
- sha512 = "xJTbh/d7Lm7SBhc1tNvTpeCHaEzoyxPrqNlvSdMfBTYwaY++UJFyXUOxAtsRUXjlqOfj8luNaR9vjCh4KeV+pg==";
+ url = "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz";
+ sha512 = "tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==";
};
};
"run-in-dir-0.3.0" = {
@@ -39555,6 +39779,15 @@ let
sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7";
};
};
+ "set-getter-0.1.0" = {
+ name = "set-getter";
+ packageName = "set-getter";
+ version = "0.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/set-getter/-/set-getter-0.1.0.tgz";
+ sha1 = "d769c182c9d5a51f409145f2fba82e5e86e80376";
+ };
+ };
"set-immediate-shim-1.0.1" = {
name = "set-immediate-shim";
packageName = "set-immediate-shim";
@@ -39753,13 +39986,13 @@ let
sha1 = "decbcf874b0d1e5fb72e14b164a9683048e9acb3";
};
};
- "shelljs-0.8.3" = {
+ "shelljs-0.8.4" = {
name = "shelljs";
packageName = "shelljs";
- version = "0.8.3";
+ version = "0.8.4";
src = fetchurl {
- url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.3.tgz";
- sha512 = "fc0BKlAWiLpwZljmOvAOTE/gXawtCoNrP5oaY7KIaQbbyHeQVg01pSEuEGvGh3HEdBU4baCD7wQBwADmM/7f7A==";
+ url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz";
+ sha512 = "7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==";
};
};
"shellsubstitute-1.2.0" = {
@@ -40248,31 +40481,22 @@ let
sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198";
};
};
- "snyk-config-2.2.3" = {
+ "snyk-config-3.1.0" = {
name = "snyk-config";
packageName = "snyk-config";
- version = "2.2.3";
+ version = "3.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/snyk-config/-/snyk-config-2.2.3.tgz";
- sha512 = "9NjxHVMd1U1LFw66Lya4LXgrsFUiuRiL4opxfTFo0LmMNzUoU5Bk/p0zDdg3FE5Wg61r4fP2D8w+QTl6M8CGiw==";
+ url = "https://registry.npmjs.org/snyk-config/-/snyk-config-3.1.0.tgz";
+ sha512 = "3UlyogA67/9WOssJ7s4d7gqWQRWyO/LbgdBBNMhhmFDKa7eTUSW+A782CVHgyDSJZ2kNANcMWwMiOL+h3p6zQg==";
};
};
- "snyk-config-3.0.0" = {
- name = "snyk-config";
- packageName = "snyk-config";
- version = "3.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/snyk-config/-/snyk-config-3.0.0.tgz";
- sha512 = "sXjd7gUqPTmgkhtLowFkFU5J4xyS7tDIRUbHmpW/dvTjgmiH0ujobJzSdaim4W6pbiIf4snkGJsvHM3/wmdR5w==";
- };
- };
- "snyk-docker-plugin-2.6.1" = {
+ "snyk-docker-plugin-3.1.0" = {
name = "snyk-docker-plugin";
packageName = "snyk-docker-plugin";
- version = "2.6.1";
+ version = "3.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-2.6.1.tgz";
- sha512 = "v3LIPILRL5faZ+qiIhF9on0rAxuFaQku3UwaiGumoTrfXywLkv7x8PJgdMnrsWUxDwB8EZFc1k2qvI6V6rTF5g==";
+ url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-3.1.0.tgz";
+ sha512 = "ggGTiiCuwLYGdlGW/UBuUXJ7omliH0EnbpLfdlTBoRKvmvgoUo1l4Menk18R1ZVXgcXTwwGK9jmuUpPH+X0VNw==";
};
};
"snyk-go-parser-1.4.0" = {
@@ -40284,13 +40508,13 @@ let
sha512 = "zcLA8u/WreycCjFKBblYfxszg7Fmnemuu9Ug/CE/jqF0yBXsI5DCWMteUvFkoa8DRntfGTlgf98TRl2aTSc2MQ==";
};
};
- "snyk-go-plugin-1.13.0" = {
+ "snyk-go-plugin-1.14.0" = {
name = "snyk-go-plugin";
packageName = "snyk-go-plugin";
- version = "1.13.0";
+ version = "1.14.0";
src = fetchurl {
- url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.13.0.tgz";
- sha512 = "6lN9S8uO6LE1Y6ZJMZm3EZ8kvvI/vZh8r+JJGAPfVO2C265xymEpFBJ4Nn2or0Q0LlqZ8W8lWi1HUMXXid6k+w==";
+ url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.14.0.tgz";
+ sha512 = "9L+76De8F6yXWb+O3DA8QUi7+eDF2mOzCOveEPUJGkqWIDmurIiFcVxHJoj0EStjcxb3dX367KKlDlfFx+HiyA==";
};
};
"snyk-gradle-plugin-3.2.5" = {
@@ -40311,49 +40535,49 @@ let
sha512 = "A+CCyBSa4IKok5uEhqT+hV/35RO6APFNLqk9DRRHg7xW2/j//nPX8wTSZUPF8QeRNEk/sX+6df7M1y6PBHGSHA==";
};
};
- "snyk-mvn-plugin-2.10.0" = {
+ "snyk-mvn-plugin-2.15.0" = {
name = "snyk-mvn-plugin";
packageName = "snyk-mvn-plugin";
- version = "2.10.0";
+ version = "2.15.0";
src = fetchurl {
- url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.10.0.tgz";
- sha512 = "npslocHJXUbdFxehMPQ8w4oX6bB6J6vHTWNRDF7u2+pIhVumQe1QOvZGjwh3up+vOCoKiEprO7gdt7vC8im1Vg==";
+ url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.15.0.tgz";
+ sha512 = "24HWz27Hc5sw+iHtxtQFy0kltjyFZXJ3vfsPA0TTZAL0tOJXInIuZpWD6njC0Y3/sn9CH5kS2KM8GAM7FyKVig==";
};
};
- "snyk-nodejs-lockfile-parser-1.18.0" = {
+ "snyk-nodejs-lockfile-parser-1.22.0" = {
name = "snyk-nodejs-lockfile-parser";
packageName = "snyk-nodejs-lockfile-parser";
- version = "1.18.0";
+ version = "1.22.0";
src = fetchurl {
- url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.18.0.tgz";
- sha512 = "QGb6HBtnqefbVtrDyUqA3vXGo2DZJAlDxrsgIpKxFalhxmxmWQE3Fxx44V3aRq9H8iZ1eXb7s/drTsa/s9qGJQ==";
+ url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.22.0.tgz";
+ sha512 = "l6jLoJxqcIIkQopSdQuAstXdMw5AIgLu+uGc5CYpHyw8fYqOwna8rawwofNeGuwJAAv4nEiNiexeYaR88OCq6Q==";
};
};
- "snyk-nuget-plugin-1.16.0" = {
+ "snyk-nuget-plugin-1.17.0" = {
name = "snyk-nuget-plugin";
packageName = "snyk-nuget-plugin";
- version = "1.16.0";
+ version = "1.17.0";
src = fetchurl {
- url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.16.0.tgz";
- sha512 = "OEusK3JKKpR4Yto5KwuqjQGgb9wAhmDqBWSQomWdtKQVFrzn5B6BMzOFikUzmeMTnUGGON7gurQBLXeZZLhRqg==";
+ url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.17.0.tgz";
+ sha512 = "t7iZ87LBhCK6P2/mJsQh7Dmk3J9zd+IHL4yoSK95Iyk/gP8r++DZijoRHEXy8BlS+eOtSAj1vgCYvv2eAmG28w==";
};
};
- "snyk-paket-parser-1.5.0" = {
+ "snyk-paket-parser-1.6.0" = {
name = "snyk-paket-parser";
packageName = "snyk-paket-parser";
- version = "1.5.0";
+ version = "1.6.0";
src = fetchurl {
- url = "https://registry.npmjs.org/snyk-paket-parser/-/snyk-paket-parser-1.5.0.tgz";
- sha512 = "1CYMPChJ9D9LBy3NLqHyv8TY7pR/LMISSr08LhfFw/FpfRZ+gTH8W6bbxCmybAYrOFNCqZkRprqOYDqZQFHipA==";
+ url = "https://registry.npmjs.org/snyk-paket-parser/-/snyk-paket-parser-1.6.0.tgz";
+ sha512 = "6htFynjBe/nakclEHUZ1A3j5Eu32/0pNve5Qm4MFn3YQmJgj7UcAO8hdyK3QfzEY29/kAv/rkJQg+SKshn+N9Q==";
};
};
- "snyk-php-plugin-1.7.0" = {
+ "snyk-php-plugin-1.9.0" = {
name = "snyk-php-plugin";
packageName = "snyk-php-plugin";
- version = "1.7.0";
+ version = "1.9.0";
src = fetchurl {
- url = "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.7.0.tgz";
- sha512 = "mDe90xkqSEVrpx1ZC7ItqCOc6fZCySbE+pHVI+dAPUmf1C1LSWZrZVmAVeo/Dw9sJzJfzmcdAFQl+jZP8/uV0A==";
+ url = "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.9.0.tgz";
+ sha512 = "uORrEoC47dw0ITZYu5vKqQtmXnbbQs+ZkWeo5bRHGdf10W8e4rNr1S1R4bReiLrSbSisYhVHeFMkdOAiLIPJVQ==";
};
};
"snyk-policy-1.13.5" = {
@@ -40851,13 +41075,13 @@ let
sha512 = "efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==";
};
};
- "source-map-support-0.5.18" = {
+ "source-map-support-0.5.19" = {
name = "source-map-support";
packageName = "source-map-support";
- version = "0.5.18";
+ version = "0.5.19";
src = fetchurl {
- url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.18.tgz";
- sha512 = "9luZr/BZ2QeU6tO2uG8N2aZpVSli4TSAOAqFOyTO51AJcD9P99c0K1h6dD6r6qo5dyT44BR5exweOaLLeldTkQ==";
+ url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz";
+ sha512 = "Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==";
};
};
"source-map-url-0.4.0" = {
@@ -41211,6 +41435,15 @@ let
sha512 = "CvT5XY+MWnn0HkbwVKJAyWEMfzpAPwnTiB3TobA5Mri44SrTovmmh499NPQP+gatkeOipqPlBLel7rn4E/PCQg==";
};
};
+ "sqlite3-4.2.0" = {
+ name = "sqlite3";
+ packageName = "sqlite3";
+ version = "4.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/sqlite3/-/sqlite3-4.2.0.tgz";
+ sha512 = "roEOz41hxui2Q7uYnWsjMOTry6TcNUNmp8audCx18gF10P2NknwdpF+E+HKvz/F2NvPKGGBF4NGc+ZPQ+AABwg==";
+ };
+ };
"srt2vtt-1.3.1" = {
name = "srt2vtt";
packageName = "srt2vtt";
@@ -43155,13 +43388,13 @@ let
sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==";
};
};
- "systeminformation-4.23.5" = {
+ "systeminformation-4.24.1" = {
name = "systeminformation";
packageName = "systeminformation";
- version = "4.23.5";
+ version = "4.24.1";
src = fetchurl {
- url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.23.5.tgz";
- sha512 = "Zxd1wxN8KigQsDhZupVNAyHnkl+ombejuLpNhJ+LNezMxTLn7nBx9HNAIWUJnhAnSS0ZElQLQ1muqgnwbhgOHg==";
+ url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.24.1.tgz";
+ sha512 = "LRksOe2mBvtbD0Y1hZMsaICHpIglhjz758K5XKUiHKcTBc6BV4O7ozbExZc+5BcCYrniMI9ka7piXFeCaymRRQ==";
};
};
"syswide-cas-5.3.0" = {
@@ -43354,13 +43587,13 @@ let
sha512 = "MNIgJddrV2TkuwChwcSNds/5E9VijOiw7kAc1y5hTNJoLDSuIyid2QtLYiCYNnICebpuvjhPQZsXwUL0O3l7OQ==";
};
};
- "tar-6.0.1" = {
+ "tar-6.0.2" = {
name = "tar";
packageName = "tar";
- version = "6.0.1";
+ version = "6.0.2";
src = fetchurl {
- url = "https://registry.npmjs.org/tar/-/tar-6.0.1.tgz";
- sha512 = "bKhKrrz2FJJj5s7wynxy/fyxpE0CmCjmOQ1KV4KkgXFWOgoIT/NbTMnB1n+LFNrNk0SSBVGGxcK5AGsyC+pW5Q==";
+ url = "https://registry.npmjs.org/tar/-/tar-6.0.2.tgz";
+ sha512 = "Glo3jkRtPcvpDlAs/0+hozav78yoXKFr+c4wgw62NNMO3oo4AaJdCo21Uu7lcwr55h39W2XD1LMERc64wtbItg==";
};
};
"tar-fs-2.0.1" = {
@@ -43426,13 +43659,13 @@ let
sha1 = "9450e8768c83b416fd4d1a6a9449eeccbf496c29";
};
};
- "telegraf-3.37.0" = {
+ "telegraf-3.38.0" = {
name = "telegraf";
packageName = "telegraf";
- version = "3.37.0";
+ version = "3.38.0";
src = fetchurl {
- url = "https://registry.npmjs.org/telegraf/-/telegraf-3.37.0.tgz";
- sha512 = "V3448qwfOolBqkIc87yxjW4zMvR2P6AIF24pPTlX9WhZPwA1TF/x3nQhnWPRLtGh2SJuvDcr83iTkXPXT7Opnw==";
+ url = "https://registry.npmjs.org/telegraf/-/telegraf-3.38.0.tgz";
+ sha512 = "va4VlrKWp64JrowFoZX/NPzzA6q38kvaIukVXOWFO1V+jR1G8+hCfgJy4TX8Z3rwLJzwaBEet1QhikHDRZWl3A==";
};
};
"telegram-typings-3.6.1" = {
@@ -43579,13 +43812,13 @@ let
sha512 = "/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==";
};
};
- "terser-4.6.11" = {
+ "terser-4.6.13" = {
name = "terser";
packageName = "terser";
- version = "4.6.11";
+ version = "4.6.13";
src = fetchurl {
- url = "https://registry.npmjs.org/terser/-/terser-4.6.11.tgz";
- sha512 = "76Ynm7OXUG5xhOpblhytE7X58oeNSmC8xnNhjWVo8CksHit0U0kO4hfNbPrrYwowLWFgM2n9L176VNx2QaHmtA==";
+ url = "https://registry.npmjs.org/terser/-/terser-4.6.13.tgz";
+ sha512 = "wMvqukYgVpQlymbnNbabVZbtM6PN63AzqexpwJL8tbh/mRT9LE5o+ruVduAGL7D6Fpjl+Q+06U5I9Ul82odAhw==";
};
};
"terser-webpack-plugin-1.4.3" = {
@@ -44056,6 +44289,15 @@ let
sha512 = "J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==";
};
};
+ "tmp-0.2.1" = {
+ name = "tmp";
+ packageName = "tmp";
+ version = "0.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz";
+ sha512 = "76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==";
+ };
+ };
"tmp-graphql-config-extension-openapi-1.0.7" = {
name = "tmp-graphql-config-extension-openapi";
packageName = "tmp-graphql-config-extension-openapi";
@@ -44704,13 +44946,13 @@ let
sha512 = "uEtWkFM/sdZvRNNDL3Ehu4WVpwaulhwQszV8mrtcdeE8nN00BV9mAmQ88RkrBhFgl9gMgvjJLAQcZbnPXI9mlA==";
};
};
- "ts-node-8.9.0" = {
+ "ts-node-8.10.1" = {
name = "ts-node";
packageName = "ts-node";
- version = "8.9.0";
+ version = "8.10.1";
src = fetchurl {
- url = "https://registry.npmjs.org/ts-node/-/ts-node-8.9.0.tgz";
- sha512 = "rwkXfOs9zmoHrV8xE++dmNd6ZIS+nmHHCxcV53ekGJrxFLMbp+pizpPS07ARvhwneCIECPppOwbZHvw9sQtU4w==";
+ url = "https://registry.npmjs.org/ts-node/-/ts-node-8.10.1.tgz";
+ sha512 = "bdNz1L4ekHiJul6SHtZWs1ujEKERJnHs4HxN7rjTyyVOFf3HaJ6sLqe6aPG62XTzAB/63pKRh5jTSWL0D7bsvw==";
};
};
"ts-process-promises-1.0.2" = {
@@ -44722,15 +44964,6 @@ let
sha512 = "6qWWz2HdFbD2uAfgS5t65Dd6HQKYjfra+YXQzKzxIG+RKTpoeDi+x+TW85SEF3cWUI2UecrOXJobvD+04MiTZg==";
};
};
- "tslib-1.11.0" = {
- name = "tslib";
- packageName = "tslib";
- version = "1.11.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/tslib/-/tslib-1.11.0.tgz";
- sha512 = "BmndXUtiTn/VDDrJzQE7Mm22Ix3PxgLltW9bSNLoeCY31gnG2OPx0QqJnuc9oMIKioYrz487i6K9o4Pdn0j+Kg==";
- };
- };
"tslib-1.11.1" = {
name = "tslib";
packageName = "tslib";
@@ -45001,6 +45234,15 @@ let
sha512 = "OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==";
};
};
+ "type-fest-0.13.1" = {
+ name = "type-fest";
+ packageName = "type-fest";
+ version = "0.13.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz";
+ sha512 = "34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==";
+ };
+ };
"type-fest-0.3.1" = {
name = "type-fest";
packageName = "type-fest";
@@ -45226,13 +45468,13 @@ let
sha512 = "W7KxyzeaQmZvUFbGj4+YFshhVrMBGSg2IbcYAjGWGvx8DHvJMclbTDMpffdxFUGPBHjIytk7KJUR/KUXstUGDw==";
};
};
- "uglify-js-3.9.1" = {
+ "uglify-js-3.9.2" = {
name = "uglify-js";
packageName = "uglify-js";
- version = "3.9.1";
+ version = "3.9.2";
src = fetchurl {
- url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.9.1.tgz";
- sha512 = "JUPoL1jHsc9fOjVFHdQIhqEEJsQvfKDjlubcCilu8U26uZ73qOg8VsN8O1jbuei44ZPlwL7kmbAdM4tzaUvqnA==";
+ url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.9.2.tgz";
+ sha512 = "zGVwKslUAD/EeqOrD1nQaBmXIHl1Vw371we8cvS8I6mYK9rmgX5tv8AAeJdfsQ3Kk5mGax2SVV/AizxdNGhl7Q==";
};
};
"uglify-to-browserify-1.0.2" = {
@@ -46477,24 +46719,6 @@ let
sha1 = "1352c340eb820e4d8ddba039a4fbfaa32ed4ef3a";
};
};
- "utilities-0.0.37" = {
- name = "utilities";
- packageName = "utilities";
- version = "0.0.37";
- src = fetchurl {
- url = "https://registry.npmjs.org/utilities/-/utilities-0.0.37.tgz";
- sha1 = "a3470d0a7f688142d9e8a57cee1128f12e19e196";
- };
- };
- "utilities-1.0.5" = {
- name = "utilities";
- packageName = "utilities";
- version = "1.0.5";
- src = fetchurl {
- url = "https://registry.npmjs.org/utilities/-/utilities-1.0.5.tgz";
- sha1 = "f2b77a88f3510733fc7215b5c486a504a75ab245";
- };
- };
"utils-merge-1.0.0" = {
name = "utils-merge";
packageName = "utils-merge";
@@ -46531,13 +46755,13 @@ let
sha512 = "vRAKaS8WcYNgzbxyH2LdheqgL4sQLis8LXl7r/mN+O4mpWlUpoCsTtietxepLrft2q0TFA2gaIvSWN1iRkzW/w==";
};
};
- "utp-native-2.1.7" = {
+ "utp-native-2.1.10" = {
name = "utp-native";
packageName = "utp-native";
- version = "2.1.7";
+ version = "2.1.10";
src = fetchurl {
- url = "https://registry.npmjs.org/utp-native/-/utp-native-2.1.7.tgz";
- sha512 = "PQmXCdZOkmADtIqmhoiFEIdNlvkPouO8ktXqThFDBAt850B752bjQMF5KAJeMBJ5gzuI70ZiP9Qsr9mwCwzSyg==";
+ url = "https://registry.npmjs.org/utp-native/-/utp-native-2.1.10.tgz";
+ sha512 = "VTjBvb/uE9gYqx2NGVPtAWhqv9itieW+wJceJg5G6Cl/2kBCnHDaFafw3fNgCvii7meTpC4AoZfy6OG0pnuQ/Q==";
};
};
"uuid-2.0.3" = {
@@ -47224,13 +47448,13 @@ let
sha512 = "RWkO/c/A7iXhHEy3OuEqkCqavDjpD4NF2Ca8vjai+ZtEYNeHrm1ybTnBYLP4Ft1uXvvaaVtYA9HrDjD6+CUONg==";
};
};
- "vscode-css-languageservice-4.1.1" = {
+ "vscode-css-languageservice-4.1.2" = {
name = "vscode-css-languageservice";
packageName = "vscode-css-languageservice";
- version = "4.1.1";
+ version = "4.1.2";
src = fetchurl {
- url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-4.1.1.tgz";
- sha512 = "2r2bYbhscivRu1zqh5kNe8aYpFnfksMYC7wTpKX2HqFsSzSJYXk0sCqPaWsP5ptqz0OFBTXnzx2JlE+Nb5Edgw==";
+ url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-4.1.2.tgz";
+ sha512 = "clIjSS940NPBvtfubZokKT/YDNfE5ST9VDwsuwdCbQSkJAVZPAbmIgfmgrz/f/o8PawYQU/ooUBEuRIvIYq3ag==";
};
};
"vscode-emmet-helper-1.2.17" = {
@@ -47251,13 +47475,13 @@ let
sha512 = "mIb5VMXM5jI97HzCk2eadI1K//rCEZXte0wBqA7PGXsyJH4KTyJUaYk9MR+mbfpUl2vMi3HZw9GUOLGYLc6l5w==";
};
};
- "vscode-json-languageservice-3.5.2" = {
+ "vscode-json-languageservice-3.6.0" = {
name = "vscode-json-languageservice";
packageName = "vscode-json-languageservice";
- version = "3.5.2";
+ version = "3.6.0";
src = fetchurl {
- url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.5.2.tgz";
- sha512 = "9cUvBq00O08lpWVVOx6tQ1yLxCHss79nsUdEAVYGomRyMbnPBmc0AkYPcXI9WK1EM6HBo0R9Zo3NjFhcICpy4A==";
+ url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.6.0.tgz";
+ sha512 = "dXzFywypUZ9T0tjr4fREZiknXDz6vAGx1zsxbQY1+9DOpjMfbz0VLP873KmcbuvL4K3nseKTxc4TKHu8kLXRMw==";
};
};
"vscode-jsonrpc-3.6.0" = {
@@ -48538,6 +48762,15 @@ let
sha512 = "HTDl9G9hbkNDk98naoR/cHDws7+EyYMOdL1BmjsZXRUjf7d+MficC4B7HLUPlSiho0vg+CWKrGIt/VJBd1xunQ==";
};
};
+ "ws-7.2.5" = {
+ name = "ws";
+ packageName = "ws";
+ version = "7.2.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ws/-/ws-7.2.5.tgz";
+ sha512 = "C34cIU4+DB2vMyAbmEKossWq2ZQDr6QEyuuCzWrM9zfw1sGc0mYiJ0UnG9zzNykt49C2Fi34hvr2vssFQRS6EA==";
+ };
+ };
"x-default-browser-0.3.1" = {
name = "x-default-browser";
packageName = "x-default-browser";
@@ -49385,22 +49618,22 @@ let
sha512 = "CP0fwGk5Y+jel+A0AQbyqnIFZRRpkKOeYUibiTSmlgV9PcgNFFVwn86VcUIpDLOqVjF+9v+O9FWQMo+IUcV2mA==";
};
};
- "yeoman-environment-2.9.5" = {
+ "yeoman-environment-2.10.0" = {
name = "yeoman-environment";
packageName = "yeoman-environment";
- version = "2.9.5";
+ version = "2.10.0";
src = fetchurl {
- url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.9.5.tgz";
- sha512 = "ntxV8VTZbP8QFuJZGT7vG8AsKeyGz8lXlfq2V2T5sl6SrU6UAEVgRreEGz9t+JbFGx1CSM/Ly2atG/avGuheyQ==";
+ url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.10.0.tgz";
+ sha512 = "dn754zZm1kTWS94V5riNLNjs9Wn6Zjl+9jgbQ37EmHEhcRR30fY1sgBnhYZyTpa+zK7ipFI6dMH9Sg0SAMW3hw==";
};
};
- "yeoman-generator-4.8.3" = {
+ "yeoman-generator-4.10.0" = {
name = "yeoman-generator";
packageName = "yeoman-generator";
- version = "4.8.3";
+ version = "4.10.0";
src = fetchurl {
- url = "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-4.8.3.tgz";
- sha512 = "yDPHBhfglqiyYlqBnaAmcE/wPznwSx11HCGVCpnnsqpnp45HmdsuBtiFSNDcygiFmz1HmkFWRLWHTai/b+9eiQ==";
+ url = "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-4.10.0.tgz";
+ sha512 = "NuY9bt7r6kvjvWjAVcujZwHux5xXy4Vdmz3uabyjioh679ry97+dl+MgtlAkgdSQ7kGI0Iz1GC92tZ33XdxaDw==";
};
};
"yn-3.1.1" = {
@@ -49526,17 +49759,17 @@ in
"@angular/cli" = nodeEnv.buildNodePackage {
name = "_at_angular_slash_cli";
packageName = "@angular/cli";
- version = "9.1.3";
+ version = "9.1.4";
src = fetchurl {
- url = "https://registry.npmjs.org/@angular/cli/-/cli-9.1.3.tgz";
- sha512 = "/7yHOuiyMgpcoBuADPrF4Eo9VDysA57fsyrMlOH2WZmKdsjW032StS9EIOue5RNQ7y0DwrtgtnkjbpZ6nYo3Pw==";
+ url = "https://registry.npmjs.org/@angular/cli/-/cli-9.1.4.tgz";
+ sha512 = "H9MqoT4zyIv+Yo3cvRVkzafWGHsqt7jUvtvGwMHIDMTfEX+Q8yiYlDLL6WM3Eb6/hDmLcRGC/GI495sKS1z5qA==";
};
dependencies = [
- sources."@angular-devkit/architect-0.901.3"
- sources."@angular-devkit/core-9.1.3"
- sources."@angular-devkit/schematics-9.1.3"
- sources."@schematics/angular-9.1.3"
- sources."@schematics/update-0.901.3"
+ sources."@angular-devkit/architect-0.901.4"
+ sources."@angular-devkit/core-9.1.4"
+ sources."@angular-devkit/schematics-9.1.4"
+ sources."@schematics/angular-9.1.4"
+ sources."@schematics/update-0.901.4"
sources."@types/color-name-1.1.1"
sources."@yarnpkg/lockfile-1.1.0"
sources."JSONStream-1.3.5"
@@ -49622,7 +49855,7 @@ in
sources."get-stream-4.1.0"
sources."getpass-0.1.7"
sources."glob-7.1.6"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
sources."has-1.0.3"
@@ -49658,11 +49891,10 @@ in
sources."is-docker-2.0.0"
sources."is-fullwidth-code-point-3.0.0"
sources."is-interactive-1.0.0"
- sources."is-promise-2.1.0"
sources."is-regex-1.0.5"
sources."is-symbol-1.0.3"
sources."is-typedarray-1.0.0"
- sources."is-wsl-2.1.1"
+ sources."is-wsl-2.2.0"
sources."isarray-1.0.0"
sources."isexe-2.0.0"
sources."isstream-0.1.2"
@@ -49687,8 +49919,8 @@ in
sources."lru-cache-5.1.1"
sources."magic-string-0.25.7"
sources."make-fetch-happen-5.0.2"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."mimic-fn-2.1.0"
sources."minimatch-3.0.4"
sources."minimist-1.2.5"
@@ -49716,7 +49948,7 @@ in
sources."npm-package-arg-8.0.1"
sources."npm-packlist-1.4.8"
sources."npm-pick-manifest-6.0.0"
- (sources."npm-registry-fetch-4.0.3" // {
+ (sources."npm-registry-fetch-4.0.4" // {
dependencies = [
sources."hosted-git-info-2.8.8"
sources."npm-package-arg-6.1.1"
@@ -49778,7 +50010,7 @@ in
sources."restore-cursor-3.1.0"
sources."retry-0.10.1"
sources."rimraf-3.0.2"
- sources."run-async-2.4.0"
+ sources."run-async-2.4.1"
sources."run-queue-1.0.3"
sources."rxjs-6.5.4"
sources."safe-buffer-5.2.0"
@@ -49865,25 +50097,24 @@ in
"@antora/cli" = nodeEnv.buildNodePackage {
name = "_at_antora_slash_cli";
packageName = "@antora/cli";
- version = "2.3.0";
+ version = "2.3.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@antora/cli/-/cli-2.3.0.tgz";
- sha512 = "YiAP7Ib4zhAE+owOKg1/cJ+1AQX4BGfvaMnGkHaSf6srutoLLCRIbD0InpSNobf+ouSMqqk6fiLmBVt/cu03og==";
+ url = "https://registry.npmjs.org/@antora/cli/-/cli-2.3.1.tgz";
+ sha512 = "AtqlCYdlvwfRUtqaSzjR3Ji4WpCHq/AyD+rcagD3lg/WGiZdwgppiy4Oj36s7rUfR0SDl5GIIWmA5zdDSBRNvw==";
};
dependencies = [
- sources."@antora/playbook-builder-2.3.0"
+ sources."@antora/playbook-builder-2.3.1"
sources."@iarna/toml-2.2.5"
sources."argparse-1.0.10"
sources."camelcase-5.3.1"
sources."camelcase-keys-6.2.2"
- sources."commander-5.0.0"
+ sources."commander-5.1.0"
(sources."convict-5.2.0" // {
dependencies = [
sources."json5-2.1.0"
];
})
sources."decamelize-1.2.0"
- sources."deep-freeze-node-1.1.3"
sources."esprima-4.0.1"
sources."js-yaml-3.13.1"
sources."json5-2.1.3"
@@ -49909,24 +50140,24 @@ in
"@antora/site-generator-default" = nodeEnv.buildNodePackage {
name = "_at_antora_slash_site-generator-default";
packageName = "@antora/site-generator-default";
- version = "2.3.0";
+ version = "2.3.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@antora/site-generator-default/-/site-generator-default-2.3.0.tgz";
- sha512 = "swDQeAEnC/ClmhHJ50UNJppUSAneOp2cHwZiRr3zUQ9+5+mvOrDEdHbyxH7mIwkoeiIcQ/UVw00bg4MwmQ0M0g==";
+ url = "https://registry.npmjs.org/@antora/site-generator-default/-/site-generator-default-2.3.1.tgz";
+ sha512 = "uAt6pCfMfTs2m+IUZjcivN4fDmt2D3C2lI9dfWAkAe2P9vIY7oZuVqCuBQfAwnkJg8mOTk0J2gLEyspbRDsK7w==";
};
dependencies = [
- sources."@antora/asciidoc-loader-2.3.0"
- sources."@antora/content-aggregator-2.3.0"
- sources."@antora/content-classifier-2.3.0"
- sources."@antora/document-converter-2.3.0"
+ sources."@antora/asciidoc-loader-2.3.1"
+ sources."@antora/content-aggregator-2.3.1"
+ sources."@antora/content-classifier-2.3.1"
+ sources."@antora/document-converter-2.3.1"
sources."@antora/expand-path-helper-1.0.0"
- sources."@antora/navigation-builder-2.3.0"
- sources."@antora/page-composer-2.3.0"
- sources."@antora/playbook-builder-2.3.0"
- sources."@antora/redirect-producer-2.3.0"
- sources."@antora/site-mapper-2.3.0"
- sources."@antora/site-publisher-2.3.0"
- sources."@antora/ui-loader-2.3.0"
+ sources."@antora/navigation-builder-2.3.1"
+ sources."@antora/page-composer-2.3.1"
+ sources."@antora/playbook-builder-2.3.1"
+ sources."@antora/redirect-producer-2.3.1"
+ sources."@antora/site-mapper-2.3.1"
+ sources."@antora/site-publisher-2.3.1"
+ sources."@antora/ui-loader-2.3.1"
sources."@iarna/toml-2.2.5"
sources."@sindresorhus/is-0.14.0"
sources."@szmarczak/http-timer-1.1.2"
@@ -49989,7 +50220,6 @@ in
sources."crc-32-1.2.0"
sources."decamelize-1.2.0"
sources."decompress-response-4.2.1"
- sources."deep-freeze-node-1.1.3"
sources."defer-to-connect-1.1.3"
sources."define-properties-1.1.3"
sources."diff3-0.0.3"
@@ -50050,7 +50280,7 @@ in
sources."mimic-response-1.0.1"
];
})
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
(sources."gulp-vinyl-zip-2.2.0" // {
dependencies = [
sources."readable-stream-2.3.7"
@@ -50098,8 +50328,8 @@ in
sources."map-obj-4.1.0"
sources."marky-1.2.1"
sources."matcher-2.1.0"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."mimic-response-2.1.0"
sources."minimatch-3.0.4"
sources."minimatch-all-1.1.0"
@@ -50155,7 +50385,7 @@ in
];
})
sources."remove-trailing-separator-1.1.0"
- sources."replace-ext-1.0.0"
+ sources."replace-ext-1.0.1"
sources."require-from-string-2.0.2"
sources."resolve-options-1.1.0"
sources."responselike-1.0.2"
@@ -50189,7 +50419,7 @@ in
];
})
sources."to-utf8-0.0.1"
- sources."uglify-js-3.9.1"
+ sources."uglify-js-3.9.2"
sources."unc-path-regex-0.1.2"
sources."unique-stream-2.3.1"
sources."universalify-0.1.2"
@@ -50289,7 +50519,7 @@ in
sources."forever-agent-0.6.1"
sources."form-data-2.3.2"
sources."getpass-0.1.7"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
sources."has-flag-3.0.0"
@@ -50299,7 +50529,7 @@ in
sources."iconv-lite-0.4.24"
sources."inquirer-6.2.0"
sources."is-fullwidth-code-point-2.0.0"
- sources."is-promise-2.1.0"
+ sources."is-promise-2.2.2"
sources."is-typedarray-1.0.0"
sources."isstream-0.1.2"
sources."jsbn-0.1.1"
@@ -50313,8 +50543,8 @@ in
sources."lodash.sortby-4.7.0"
sources."lowdb-1.0.0"
sources."lunr-2.3.3"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."mimic-fn-1.2.0"
sources."ms-2.1.2"
sources."mute-stream-0.0.7"
@@ -50338,7 +50568,7 @@ in
sources."request-promise-core-1.1.3"
sources."request-promise-native-1.0.8"
sources."restore-cursor-2.0.0"
- sources."run-async-2.4.0"
+ sources."run-async-2.4.1"
sources."rxjs-6.5.5"
sources."safe-buffer-5.2.0"
sources."safer-buffer-2.1.2"
@@ -50413,25 +50643,27 @@ in
sources."@apollographql/graphql-language-service-utils-2.0.2"
sources."@apollographql/graphql-playground-html-1.6.24"
sources."@babel/code-frame-7.8.3"
- (sources."@babel/compat-data-7.9.0" // {
+ (sources."@babel/compat-data-7.9.6" // {
dependencies = [
sources."semver-5.7.1"
];
})
- (sources."@babel/core-7.9.0" // {
+ (sources."@babel/core-7.9.6" // {
dependencies = [
+ sources."@babel/generator-7.9.6"
+ sources."@babel/types-7.9.6"
sources."semver-5.7.1"
];
})
sources."@babel/generator-7.9.5"
sources."@babel/helper-annotate-as-pure-7.8.3"
sources."@babel/helper-builder-binary-assignment-operator-visitor-7.8.3"
- (sources."@babel/helper-compilation-targets-7.8.7" // {
+ (sources."@babel/helper-compilation-targets-7.9.6" // {
dependencies = [
sources."semver-5.7.1"
];
})
- sources."@babel/helper-create-class-features-plugin-7.9.5"
+ sources."@babel/helper-create-class-features-plugin-7.9.6"
sources."@babel/helper-create-regexp-features-plugin-7.8.8"
sources."@babel/helper-define-map-7.8.3"
sources."@babel/helper-explode-assignable-expression-7.8.3"
@@ -50445,21 +50677,29 @@ in
sources."@babel/helper-plugin-utils-7.8.3"
sources."@babel/helper-regex-7.8.3"
sources."@babel/helper-remap-async-to-generator-7.8.3"
- sources."@babel/helper-replace-supers-7.8.6"
+ (sources."@babel/helper-replace-supers-7.9.6" // {
+ dependencies = [
+ sources."@babel/types-7.9.6"
+ ];
+ })
sources."@babel/helper-simple-access-7.8.3"
sources."@babel/helper-split-export-declaration-7.8.3"
sources."@babel/helper-validator-identifier-7.9.5"
sources."@babel/helper-wrap-function-7.8.3"
- sources."@babel/helpers-7.9.2"
+ (sources."@babel/helpers-7.9.6" // {
+ dependencies = [
+ sources."@babel/types-7.9.6"
+ ];
+ })
sources."@babel/highlight-7.9.0"
- sources."@babel/parser-7.9.4"
+ sources."@babel/parser-7.9.6"
sources."@babel/plugin-proposal-async-generator-functions-7.8.3"
sources."@babel/plugin-proposal-class-properties-7.8.3"
sources."@babel/plugin-proposal-dynamic-import-7.8.3"
sources."@babel/plugin-proposal-json-strings-7.8.3"
sources."@babel/plugin-proposal-nullish-coalescing-operator-7.8.3"
sources."@babel/plugin-proposal-numeric-separator-7.8.3"
- sources."@babel/plugin-proposal-object-rest-spread-7.9.5"
+ sources."@babel/plugin-proposal-object-rest-spread-7.9.6"
sources."@babel/plugin-proposal-optional-catch-binding-7.8.3"
sources."@babel/plugin-proposal-optional-chaining-7.9.0"
sources."@babel/plugin-proposal-unicode-property-regex-7.8.8"
@@ -50489,9 +50729,9 @@ in
sources."@babel/plugin-transform-function-name-7.8.3"
sources."@babel/plugin-transform-literals-7.8.3"
sources."@babel/plugin-transform-member-expression-literals-7.8.3"
- sources."@babel/plugin-transform-modules-amd-7.9.0"
- sources."@babel/plugin-transform-modules-commonjs-7.9.0"
- sources."@babel/plugin-transform-modules-systemjs-7.9.0"
+ sources."@babel/plugin-transform-modules-amd-7.9.6"
+ sources."@babel/plugin-transform-modules-commonjs-7.9.6"
+ sources."@babel/plugin-transform-modules-systemjs-7.9.6"
sources."@babel/plugin-transform-modules-umd-7.9.0"
sources."@babel/plugin-transform-named-capturing-groups-regex-7.8.3"
sources."@babel/plugin-transform-new-target-7.8.3"
@@ -50505,10 +50745,11 @@ in
sources."@babel/plugin-transform-sticky-regex-7.8.3"
sources."@babel/plugin-transform-template-literals-7.8.3"
sources."@babel/plugin-transform-typeof-symbol-7.8.4"
- sources."@babel/plugin-transform-typescript-7.9.4"
+ sources."@babel/plugin-transform-typescript-7.9.6"
sources."@babel/plugin-transform-unicode-regex-7.8.3"
- (sources."@babel/preset-env-7.9.5" // {
+ (sources."@babel/preset-env-7.9.6" // {
dependencies = [
+ sources."@babel/types-7.9.6"
sources."semver-5.7.1"
];
})
@@ -50522,9 +50763,14 @@ in
sources."semver-5.7.1"
];
})
- sources."@babel/runtime-7.9.2"
+ sources."@babel/runtime-7.9.6"
sources."@babel/template-7.8.6"
- sources."@babel/traverse-7.9.5"
+ (sources."@babel/traverse-7.9.6" // {
+ dependencies = [
+ sources."@babel/generator-7.9.6"
+ sources."@babel/types-7.9.6"
+ ];
+ })
sources."@babel/types-7.9.5"
sources."@endemolshinegroup/cosmiconfig-typescript-loader-1.0.1"
sources."@hapi/address-2.1.4"
@@ -50612,7 +50858,7 @@ in
sources."@types/cookies-0.7.4"
sources."@types/cors-2.8.6"
sources."@types/events-3.0.0"
- sources."@types/express-4.17.3"
+ sources."@types/express-4.17.4"
sources."@types/express-serve-static-core-4.17.5"
sources."@types/fs-capacitor-2.0.0"
sources."@types/glob-7.1.1"
@@ -50624,16 +50870,17 @@ in
sources."@types/long-4.0.1"
sources."@types/mime-2.0.1"
sources."@types/minimatch-3.0.3"
- sources."@types/node-13.13.2"
+ sources."@types/node-13.13.4"
(sources."@types/node-fetch-2.5.6" // {
dependencies = [
sources."form-data-3.0.0"
];
})
sources."@types/normalize-package-data-2.4.0"
+ sources."@types/qs-6.9.1"
sources."@types/range-parser-1.2.3"
sources."@types/serve-static-1.13.3"
- sources."@types/ws-6.0.4"
+ sources."@types/ws-7.2.4"
sources."@types/zen-observable-0.8.0"
sources."@vue/cli-shared-utils-4.3.1"
(sources."@vue/cli-ui-4.3.1" // {
@@ -50666,12 +50913,12 @@ in
];
})
sources."apollo-cache-1.3.4"
- sources."apollo-cache-control-0.9.1"
+ sources."apollo-cache-control-0.10.0"
sources."apollo-cache-inmemory-1.6.5"
sources."apollo-client-2.6.8"
(sources."apollo-codegen-core-0.36.8" // {
dependencies = [
- sources."recast-0.19.0"
+ sources."recast-0.19.1"
sources."source-map-0.6.1"
];
})
@@ -50680,8 +50927,8 @@ in
sources."apollo-codegen-swift-0.36.8"
sources."apollo-codegen-typescript-0.36.8"
sources."apollo-datasource-0.7.0"
- sources."apollo-engine-reporting-1.7.1"
- sources."apollo-engine-reporting-protobuf-0.4.4"
+ sources."apollo-engine-reporting-1.8.0"
+ sources."apollo-engine-reporting-protobuf-0.5.0"
sources."apollo-env-0.6.4"
sources."apollo-graphql-0.4.3"
sources."apollo-language-server-1.21.3"
@@ -50694,13 +50941,13 @@ in
sources."apollo-link-state-0.4.2"
sources."apollo-link-ws-1.0.20"
sources."apollo-server-caching-0.5.1"
- sources."apollo-server-core-2.12.0"
+ sources."apollo-server-core-2.13.0"
sources."apollo-server-env-2.4.3"
sources."apollo-server-errors-2.4.1"
- sources."apollo-server-express-2.12.0"
- sources."apollo-server-plugin-base-0.7.1"
- sources."apollo-server-types-0.3.1"
- sources."apollo-tracing-0.9.1"
+ sources."apollo-server-express-2.13.0"
+ sources."apollo-server-plugin-base-0.8.0"
+ sources."apollo-server-types-0.4.0"
+ sources."apollo-tracing-0.10.0"
sources."apollo-upload-client-11.0.0"
sources."apollo-utilities-1.3.3"
(sources."archive-type-4.0.0" // {
@@ -50810,7 +51057,7 @@ in
sources."callsites-2.0.0"
sources."camel-case-3.0.0"
sources."camelcase-4.1.0"
- sources."caniuse-lite-1.0.30001046"
+ sources."caniuse-lite-1.0.30001050"
sources."capture-stack-trace-1.0.1"
sources."cardinal-2.1.1"
sources."caseless-0.12.0"
@@ -50841,7 +51088,7 @@ in
sources."clean-stack-2.2.0"
sources."cli-boxes-1.0.0"
sources."cli-cursor-2.1.0"
- (sources."cli-progress-3.8.0" // {
+ (sources."cli-progress-3.8.2" // {
dependencies = [
sources."emoji-regex-8.0.0"
sources."is-fullwidth-code-point-3.0.0"
@@ -50993,14 +51240,14 @@ in
sources."ecc-jsbn-0.1.2"
sources."ee-first-1.1.1"
sources."ejs-2.7.4"
- sources."electron-to-chromium-1.3.415"
+ sources."electron-to-chromium-1.3.427"
sources."elegant-spinner-1.0.1"
sources."emoji-regex-7.0.3"
sources."encodeurl-1.0.2"
sources."end-of-stream-1.4.4"
sources."entities-1.1.2"
sources."env-ci-3.2.2"
- sources."envinfo-7.5.0"
+ sources."envinfo-7.5.1"
sources."error-ex-1.3.2"
sources."es-abstract-1.17.5"
sources."es-to-primitive-1.2.1"
@@ -51133,7 +51380,7 @@ in
sources."get-stream-3.0.0"
];
})
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."graceful-readlink-1.0.1"
sources."graphql-14.6.0"
(sources."graphql-anywhere-4.2.6" // {
@@ -51141,7 +51388,7 @@ in
sources."ts-invariant-0.3.3"
];
})
- sources."graphql-extensions-0.11.1"
+ sources."graphql-extensions-0.12.0"
sources."graphql-subscriptions-1.1.0"
sources."graphql-tag-2.10.3"
sources."graphql-tools-4.0.8"
@@ -51234,6 +51481,7 @@ in
sources."is-date-object-1.0.2"
sources."is-descriptor-1.0.2"
sources."is-directory-0.3.1"
+ sources."is-docker-2.0.0"
sources."is-extendable-0.1.1"
sources."is-extglob-2.1.1"
sources."is-fullwidth-code-point-2.0.0"
@@ -51253,7 +51501,7 @@ in
sources."is-path-inside-1.0.1"
sources."is-plain-obj-1.1.0"
sources."is-plain-object-2.0.4"
- sources."is-promise-2.1.0"
+ sources."is-promise-2.2.2"
sources."is-property-1.0.2"
sources."is-redirect-1.0.0"
sources."is-regex-1.0.5"
@@ -51278,7 +51526,7 @@ in
sources."js-tokens-4.0.0"
sources."js-yaml-3.13.1"
sources."jsbn-0.1.1"
- sources."jscodeshift-0.7.0"
+ sources."jscodeshift-0.7.1"
sources."jsesc-2.5.2"
sources."json-buffer-3.0.0"
sources."json-parse-better-errors-1.0.2"
@@ -51370,8 +51618,8 @@ in
];
})
sources."mime-1.6.0"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."mimic-fn-1.2.0"
sources."mimic-response-1.0.1"
sources."minimalistic-assert-1.0.1"
@@ -51411,7 +51659,7 @@ in
sources."node-modules-regexp-1.0.0"
(sources."node-notifier-6.0.0" // {
dependencies = [
- sources."is-wsl-2.1.1"
+ sources."is-wsl-2.2.0"
];
})
sources."node-releases-1.1.53"
@@ -51528,7 +51776,7 @@ in
];
})
sources."pkg-up-2.0.0"
- (sources."portfinder-1.0.25" // {
+ (sources."portfinder-1.0.26" // {
dependencies = [
sources."debug-3.2.6"
sources."ms-2.1.2"
@@ -51606,7 +51854,7 @@ in
sources."retry-0.12.0"
sources."rimraf-3.0.2"
sources."rss-parser-3.7.6"
- sources."run-async-2.4.0"
+ sources."run-async-2.4.1"
sources."rxjs-6.5.5"
sources."safe-buffer-5.2.0"
sources."safe-regex-1.1.0"
@@ -51682,7 +51930,7 @@ in
sources."sort-keys-length-1.0.1"
sources."source-map-0.5.7"
sources."source-map-resolve-0.5.3"
- (sources."source-map-support-0.5.18" // {
+ (sources."source-map-support-0.5.19" // {
dependencies = [
sources."source-map-0.6.1"
];
@@ -51830,7 +52078,7 @@ in
sources."treeify-1.1.0"
sources."trim-repeated-1.0.0"
sources."ts-invariant-0.4.4"
- sources."ts-node-8.9.0"
+ sources."ts-node-8.10.1"
sources."tslib-1.11.1"
sources."tty-1.0.1"
sources."tunnel-agent-0.6.0"
@@ -52078,12 +52326,12 @@ in
};
dependencies = [
sources."@babel/code-frame-7.8.3"
- sources."@babel/generator-7.9.5"
+ sources."@babel/generator-7.9.6"
sources."@babel/helper-validator-identifier-7.9.5"
sources."@babel/highlight-7.9.0"
- sources."@babel/parser-7.9.4"
+ sources."@babel/parser-7.9.6"
sources."@babel/template-7.8.6"
- sources."@babel/types-7.9.5"
+ sources."@babel/types-7.9.6"
sources."@webassemblyjs/ast-1.9.0"
sources."@webassemblyjs/floating-point-hex-parser-1.9.0"
sources."@webassemblyjs/helper-api-error-1.9.0"
@@ -52163,12 +52411,12 @@ in
};
dependencies = [
sources."@babel/code-frame-7.8.3"
- (sources."@babel/core-7.9.0" // {
+ (sources."@babel/core-7.9.6" // {
dependencies = [
sources."source-map-0.5.7"
];
})
- (sources."@babel/generator-7.9.5" // {
+ (sources."@babel/generator-7.9.6" // {
dependencies = [
sources."source-map-0.5.7"
];
@@ -52179,16 +52427,16 @@ in
sources."@babel/helper-module-imports-7.8.3"
sources."@babel/helper-module-transforms-7.9.0"
sources."@babel/helper-optimise-call-expression-7.8.3"
- sources."@babel/helper-replace-supers-7.8.6"
+ sources."@babel/helper-replace-supers-7.9.6"
sources."@babel/helper-simple-access-7.8.3"
sources."@babel/helper-split-export-declaration-7.8.3"
sources."@babel/helper-validator-identifier-7.9.5"
- sources."@babel/helpers-7.9.2"
+ sources."@babel/helpers-7.9.6"
sources."@babel/highlight-7.9.0"
- sources."@babel/parser-7.9.4"
+ sources."@babel/parser-7.9.6"
sources."@babel/template-7.8.6"
- sources."@babel/traverse-7.9.5"
- sources."@babel/types-7.9.5"
+ sources."@babel/traverse-7.9.6"
+ sources."@babel/types-7.9.6"
sources."JSV-4.0.2"
sources."ansi-styles-3.2.1"
sources."array-unique-0.3.2"
@@ -52222,7 +52470,7 @@ in
];
})
sources."globals-11.12.0"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."has-1.0.3"
sources."has-color-0.1.7"
sources."has-flag-3.0.0"
@@ -52290,11 +52538,11 @@ in
sources."@types/events-3.0.0"
sources."@types/glob-7.1.1"
sources."@types/minimatch-3.0.3"
- sources."@types/node-13.13.2"
+ sources."@types/node-13.13.4"
sources."balanced-match-1.0.0"
sources."brace-expansion-1.1.11"
sources."chromium-pickle-js-0.2.0"
- sources."commander-5.0.0"
+ sources."commander-5.1.0"
sources."concat-map-0.0.1"
sources."fs.realpath-1.0.0"
sources."glob-7.1.6"
@@ -52394,8 +52642,8 @@ in
sources."levn-0.3.0"
sources."lodash-4.17.15"
sources."lodash.sortby-4.7.0"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."minimatch-3.0.4"
sources."nwsapi-2.2.0"
sources."oauth-sign-0.9.0"
@@ -52504,7 +52752,7 @@ in
sources."find-up-1.1.2"
(sources."fs-extra-0.26.7" // {
dependencies = [
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
];
})
sources."fs.realpath-1.0.0"
@@ -52522,17 +52770,17 @@ in
sources."is-utf8-0.2.1"
(sources."jsonfile-2.4.0" // {
dependencies = [
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
];
})
(sources."klaw-1.3.1" // {
dependencies = [
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
];
})
(sources."load-json-file-1.1.0" // {
dependencies = [
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
];
})
sources."lodash-4.2.1"
@@ -52555,7 +52803,7 @@ in
sources."path-parse-1.0.6"
(sources."path-type-1.1.0" // {
dependencies = [
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
];
})
sources."pify-2.3.0"
@@ -52674,7 +52922,11 @@ in
sources."get-assigned-identifiers-1.2.0"
sources."glob-7.1.6"
sources."has-1.0.3"
- sources."hash-base-3.0.4"
+ (sources."hash-base-3.1.0" // {
+ dependencies = [
+ sources."readable-stream-3.6.0"
+ ];
+ })
sources."hash.js-1.1.7"
sources."hmac-drbg-1.0.1"
sources."htmlescape-1.1.1"
@@ -52697,7 +52949,7 @@ in
sources."minimalistic-crypto-utils-1.0.1"
sources."minimatch-3.0.4"
sources."minimist-1.2.5"
- sources."mkdirp-classic-0.5.2"
+ sources."mkdirp-classic-0.5.3"
sources."module-deps-6.2.2"
sources."object-assign-4.1.1"
sources."once-1.4.0"
@@ -52797,7 +53049,7 @@ in
sources."@protobufjs/pool-1.1.0"
sources."@protobufjs/utf8-1.1.0"
sources."@types/long-4.0.1"
- sources."@types/node-13.13.2"
+ sources."@types/node-13.13.4"
sources."addr-to-ip-port-1.5.1"
sources."airplay-js-0.2.16"
sources."ajv-6.12.2"
@@ -52858,7 +53110,7 @@ in
sources."co-3.1.0"
sources."codepage-1.4.0"
sources."combined-stream-1.0.8"
- sources."commander-5.0.0"
+ sources."commander-5.1.0"
sources."compact2string-1.4.1"
sources."concat-map-0.0.1"
(sources."concat-stream-2.0.0" // {
@@ -52918,7 +53170,7 @@ in
sources."getpass-0.1.7"
sources."glob-7.1.6"
sources."got-1.2.2"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
sources."has-ansi-1.0.3"
@@ -52974,13 +53226,13 @@ in
];
})
sources."mime-1.6.0"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."mimic-response-1.0.1"
sources."minimatch-3.0.4"
sources."minimist-1.2.5"
sources."mkdirp-0.3.5"
- sources."mkdirp-classic-0.5.2"
+ sources."mkdirp-classic-0.5.3"
sources."ms-2.1.2"
sources."multicast-dns-4.0.1"
sources."mutate.js-0.2.0"
@@ -53272,10 +53524,10 @@ in
coc-git = nodeEnv.buildNodePackage {
name = "coc-git";
packageName = "coc-git";
- version = "1.7.9";
+ version = "1.7.11";
src = fetchurl {
- url = "https://registry.npmjs.org/coc-git/-/coc-git-1.7.9.tgz";
- sha512 = "xPHy9q9jsw3Wj9pa+SVjIPMqu9ye33CCmNWYOfGpNfiImQzecPUN619SDViQ0xxSpRgnvtqDYk9ABCWfl3hMDQ==";
+ url = "https://registry.npmjs.org/coc-git/-/coc-git-1.7.11.tgz";
+ sha512 = "4fifGZfy4vLhoKV1riYb3FhOuOUyd98KNCeUg2vG6f9qjbL+VXE8rJgigHMuGWBIJMbJf6NTLbPFRjuUewu0LQ==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -53367,10 +53619,10 @@ in
coc-java = nodeEnv.buildNodePackage {
name = "coc-java";
packageName = "coc-java";
- version = "1.4.9";
+ version = "1.4.10";
src = fetchurl {
- url = "https://registry.npmjs.org/coc-java/-/coc-java-1.4.9.tgz";
- sha512 = "Vj2K520HZRWl01Mbw3+zFBfLins+bn5s53dNgRNr+9F8f6gZvzdww4dtleU1vqqCfuwb3ly6PSU4DZBWFpU92w==";
+ url = "https://registry.npmjs.org/coc-java/-/coc-java-1.4.10.tgz";
+ sha512 = "WgJuqBpxWM0c1DHDl+UZyDzdD1vdcGInWOMs4bB+dVfCbXktTUEweFty2HViue6G9Clql5hu2+6VB2K3Jx+0Yg==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -53444,7 +53696,7 @@ in
sha512 = "69jOo9oD2JJUo5bMeoV5lcgaAJzMWO7KzWllckc+ZOGB46dE2Qev4MogRnwE/94GI6qc8Cx4RiMoRRLXYIWhyg==";
};
dependencies = [
- sources."@babel/runtime-7.9.2"
+ sources."@babel/runtime-7.9.6"
sources."@chemzqm/neovim-5.1.9"
sources."async-2.6.3"
sources."await-semaphore-0.1.3"
@@ -53463,12 +53715,12 @@ in
sources."fb-watchman-2.0.1"
sources."flatted-2.0.2"
sources."follow-redirects-1.11.0"
- sources."fp-ts-2.5.3"
+ sources."fp-ts-2.5.4"
sources."fs-extra-8.1.0"
sources."fs-minipass-1.2.7"
sources."fs.realpath-1.0.0"
sources."glob-7.1.6"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."ieee754-1.1.13"
sources."inflight-1.0.6"
sources."inherits-2.0.4"
@@ -53635,7 +53887,7 @@ in
sources."callsites-3.1.0"
sources."camelcase-2.1.1"
sources."camelcase-keys-2.1.0"
- sources."caniuse-lite-1.0.30001046"
+ sources."caniuse-lite-1.0.30001050"
sources."capture-stack-trace-1.0.1"
sources."ccount-1.0.5"
sources."chalk-2.4.2"
@@ -53721,7 +53973,7 @@ in
sources."domutils-1.7.0"
sources."dot-prop-5.2.0"
sources."duplexer3-0.1.4"
- sources."electron-to-chromium-1.3.415"
+ sources."electron-to-chromium-1.3.427"
sources."emoji-regex-7.0.3"
sources."end-of-stream-1.4.4"
sources."entities-1.1.2"
@@ -53854,7 +54106,7 @@ in
sources."globjoin-0.1.4"
sources."gonzales-pe-4.3.0"
sources."got-6.7.1"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
(sources."has-ansi-2.0.0" // {
dependencies = [
sources."ansi-regex-2.1.1"
@@ -53940,7 +54192,6 @@ in
})
sources."is-posix-bracket-0.1.1"
sources."is-primitive-2.0.0"
- sources."is-promise-2.1.0"
sources."is-redirect-1.0.0"
sources."is-regexp-1.0.0"
sources."is-retry-allowed-1.2.0"
@@ -54205,7 +54456,7 @@ in
sources."restore-cursor-2.0.0"
sources."ret-0.1.15"
sources."rimraf-2.6.3"
- sources."run-async-2.4.0"
+ sources."run-async-2.4.1"
sources."rxjs-6.5.5"
sources."safe-buffer-5.2.0"
sources."safe-regex-1.1.0"
@@ -54441,10 +54692,10 @@ in
coc-python = nodeEnv.buildNodePackage {
name = "coc-python";
packageName = "coc-python";
- version = "1.2.9";
+ version = "1.2.12";
src = fetchurl {
- url = "https://registry.npmjs.org/coc-python/-/coc-python-1.2.9.tgz";
- sha512 = "ouwZI3MZnCsO/sa5O1rQYzBgPjZ8h3OkJbBYm3DzaX+x49Gp3ARHpvSF4BMphOE16HUD/bHt+RnE+HSSweGFlg==";
+ url = "https://registry.npmjs.org/coc-python/-/coc-python-1.2.12.tgz";
+ sha512 = "cwZ/uIJT5id6zwBE6RWC/HcGy7uw2hLjC0OyvcjFzidazH73e3fQBBoEMJNtLKgPuAJfNjo4BPu+cDsCSAkCAw==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -54476,10 +54727,10 @@ in
coc-rls = nodeEnv.buildNodePackage {
name = "coc-rls";
packageName = "coc-rls";
- version = "1.1.4";
+ version = "1.1.5";
src = fetchurl {
- url = "https://registry.npmjs.org/coc-rls/-/coc-rls-1.1.4.tgz";
- sha512 = "UcQCBSp/Mzt5SR2mS4Qukvn7mBoh86cB1Fb1/oD88+sn1RHRl67eTrdlbswzdrXyd6WotQi62okCuIhyVoqAig==";
+ url = "https://registry.npmjs.org/coc-rls/-/coc-rls-1.1.5.tgz";
+ sha512 = "JXM7iLC1rlu7IsnGp7Rwt4sCtnaAQdQQ+brC/HhAWApOZjazPclSs+/IwPqot9fwcitjE0me7BiEyErx07qyFw==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -54494,10 +54745,10 @@ in
coc-rust-analyzer = nodeEnv.buildNodePackage {
name = "coc-rust-analyzer";
packageName = "coc-rust-analyzer";
- version = "0.5.5";
+ version = "0.6.1";
src = fetchurl {
- url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.5.5.tgz";
- sha512 = "l44UBTzSWkEL/uHb5GCR5m6HnheJmuJFbYqqJ+5n6Q+PJIpKSyzyNgMiC3nmsOWCT6W3Js83s1i6zTAu8Zy8LA==";
+ url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.6.1.tgz";
+ sha512 = "zyD0N3RBjBCx3KiBMaT3wwo3p+9VpANIXxhnSy/iByxN8UkgHlH6vawaL3hQu3sEGnhNrlql+A7qZx1qM3fjsg==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -54530,10 +54781,10 @@ in
coc-snippets = nodeEnv.buildNodePackage {
name = "coc-snippets";
packageName = "coc-snippets";
- version = "2.1.25";
+ version = "2.1.26";
src = fetchurl {
- url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.1.25.tgz";
- sha512 = "td3vAVOoFgswef3iCO3rDQrmoizKiKw/+5cLIYYiahnxx7SwmKcNZ1AV6OSdks/l/hOJEhtLZw3BqhxaI3+Z4w==";
+ url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.1.26.tgz";
+ sha512 = "4/XHrxJV5kN0aCrW/Kkw6s19ORs/V26zzZzQ/jFP8BT+HWZegbqPZIP9c+xB9nwknCwa9Tovx3mzcUMq0w0KMw==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -54571,30 +54822,30 @@ in
};
dependencies = [
sources."@babel/code-frame-7.8.3"
- sources."@babel/core-7.9.0"
- sources."@babel/generator-7.9.5"
+ sources."@babel/core-7.9.6"
+ sources."@babel/generator-7.9.6"
sources."@babel/helper-function-name-7.9.5"
sources."@babel/helper-get-function-arity-7.8.3"
sources."@babel/helper-member-expression-to-functions-7.8.3"
sources."@babel/helper-module-imports-7.8.3"
sources."@babel/helper-module-transforms-7.9.0"
sources."@babel/helper-optimise-call-expression-7.8.3"
- sources."@babel/helper-replace-supers-7.8.6"
+ sources."@babel/helper-replace-supers-7.9.6"
sources."@babel/helper-simple-access-7.8.3"
sources."@babel/helper-split-export-declaration-7.8.3"
sources."@babel/helper-validator-identifier-7.9.5"
- sources."@babel/helpers-7.9.2"
+ sources."@babel/helpers-7.9.6"
sources."@babel/highlight-7.9.0"
- sources."@babel/parser-7.9.4"
+ sources."@babel/parser-7.9.6"
sources."@babel/template-7.8.6"
- sources."@babel/traverse-7.9.5"
- sources."@babel/types-7.9.5"
+ sources."@babel/traverse-7.9.6"
+ sources."@babel/types-7.9.6"
sources."@mrmlnc/readdir-enhanced-2.2.1"
sources."@nodelib/fs.stat-1.1.3"
sources."@types/events-3.0.0"
sources."@types/glob-7.1.1"
sources."@types/minimatch-3.0.3"
- sources."@types/node-13.13.2"
+ sources."@types/node-13.13.4"
sources."@types/unist-2.0.3"
sources."@types/vfile-3.0.2"
sources."@types/vfile-message-2.0.0"
@@ -54621,7 +54872,7 @@ in
sources."atob-2.1.2"
(sources."autoprefixer-9.7.6" // {
dependencies = [
- sources."postcss-value-parser-4.0.3"
+ sources."postcss-value-parser-4.1.0"
];
})
sources."bail-1.0.5"
@@ -54645,7 +54896,7 @@ in
sources."callsites-2.0.0"
sources."camelcase-4.1.0"
sources."camelcase-keys-4.2.0"
- sources."caniuse-lite-1.0.30001046"
+ sources."caniuse-lite-1.0.30001050"
sources."ccount-1.0.5"
sources."chalk-2.4.2"
sources."character-entities-1.2.4"
@@ -54704,7 +54955,7 @@ in
sources."domhandler-2.4.2"
sources."domutils-1.7.0"
sources."dot-prop-5.2.0"
- sources."electron-to-chromium-1.3.415"
+ sources."electron-to-chromium-1.3.427"
sources."emoji-regex-8.0.0"
sources."entities-1.1.2"
sources."error-ex-1.3.2"
@@ -54783,7 +55034,7 @@ in
})
sources."globjoin-0.1.4"
sources."gonzales-pe-4.3.0"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."has-flag-3.0.0"
sources."has-value-1.0.0"
(sources."has-values-1.0.0" // {
@@ -54925,7 +55176,7 @@ in
sources."pify-4.0.1"
sources."pkg-up-2.0.0"
sources."posix-character-classes-0.1.1"
- (sources."postcss-7.0.27" // {
+ (sources."postcss-7.0.29" // {
dependencies = [
sources."source-map-0.6.1"
sources."supports-color-6.1.0"
@@ -55307,7 +55558,7 @@ in
sources."@types/glob-7.1.1"
sources."@types/json-schema-7.0.4"
sources."@types/minimatch-3.0.3"
- sources."@types/node-13.13.2"
+ sources."@types/node-13.13.4"
sources."@types/normalize-package-data-2.4.0"
sources."@types/unist-2.0.3"
sources."@types/vfile-3.0.2"
@@ -55663,7 +55914,7 @@ in
sources."get-stream-4.1.0"
];
})
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."gridsome-helper-json-1.0.3"
sources."has-1.0.3"
(sources."has-ansi-2.0.0" // {
@@ -55755,7 +56006,6 @@ in
sources."is-plain-object-2.0.4"
sources."is-posix-bracket-0.1.1"
sources."is-primitive-2.0.0"
- sources."is-promise-2.1.0"
sources."is-stream-1.1.0"
sources."is-utf8-0.2.1"
sources."is-windows-1.0.2"
@@ -55969,7 +56219,7 @@ in
sources."pretty-format-23.6.0"
sources."process-nextick-args-2.0.1"
sources."progress-2.0.3"
- sources."property-information-5.4.0"
+ sources."property-information-5.5.0"
sources."proto-list-1.2.4"
sources."pseudomap-1.0.2"
sources."pump-3.0.0"
@@ -56035,7 +56285,7 @@ in
sources."ret-0.1.15"
sources."reusify-1.0.4"
sources."rimraf-2.6.3"
- sources."run-async-2.4.0"
+ sources."run-async-2.4.1"
sources."run-parallel-1.1.9"
sources."rxjs-6.5.5"
sources."s.color-0.0.13"
@@ -56276,7 +56526,7 @@ in
sources."vfile-sort-2.2.2"
sources."vfile-statistics-1.1.4"
sources."vls-0.2.0"
- (sources."vscode-css-languageservice-4.1.1" // {
+ (sources."vscode-css-languageservice-4.1.2" // {
dependencies = [
sources."vscode-uri-2.1.1"
];
@@ -56389,7 +56639,7 @@ in
sources."prettier-1.19.1"
sources."request-light-0.2.5"
sources."sprintf-js-1.0.3"
- sources."vscode-json-languageservice-3.5.2"
+ sources."vscode-json-languageservice-3.6.0"
sources."vscode-jsonrpc-4.0.0"
(sources."vscode-languageserver-5.2.1" // {
dependencies = [
@@ -56584,7 +56834,7 @@ in
sources."@types/events-3.0.0"
sources."@types/glob-7.1.1"
sources."@types/minimatch-3.0.3"
- sources."@types/node-13.13.2"
+ sources."@types/node-13.13.4"
sources."abbrev-1.1.1"
sources."accepts-1.3.7"
sources."ajv-6.12.2"
@@ -56805,7 +57055,7 @@ in
sources."get-stream-3.0.0"
];
})
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
sources."has-flag-3.0.0"
@@ -56859,7 +57109,6 @@ in
sources."is-obj-1.0.1"
sources."is-path-inside-1.0.1"
sources."is-plain-object-2.0.4"
- sources."is-promise-2.1.0"
sources."is-redirect-1.0.0"
sources."is-retry-allowed-1.2.0"
sources."is-stream-1.1.0"
@@ -56897,8 +57146,8 @@ in
sources."methods-1.1.2"
sources."micromatch-3.1.10"
sources."mime-1.6.0"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."mimic-fn-1.2.0"
sources."minimatch-3.0.4"
sources."minimist-1.2.5"
@@ -57007,7 +57256,7 @@ in
sources."resolve-url-0.2.1"
sources."restore-cursor-2.0.0"
sources."ret-0.1.15"
- sources."run-async-2.4.0"
+ sources."run-async-2.4.1"
sources."rxjs-6.5.5"
sources."safe-buffer-5.1.2"
sources."safe-regex-1.1.0"
@@ -57183,23 +57432,28 @@ in
cpy-cli = nodeEnv.buildNodePackage {
name = "cpy-cli";
packageName = "cpy-cli";
- version = "3.1.0";
+ version = "3.1.1";
src = fetchurl {
- url = "https://registry.npmjs.org/cpy-cli/-/cpy-cli-3.1.0.tgz";
- sha512 = "LJhHvFragWvIsJH1kjhzZwGSagukewJZ5nV5yjMc5TILs+Z/CbZSvX0W9t9XC26Mw32j56UHjR3co5kAXaeTwg==";
+ url = "https://registry.npmjs.org/cpy-cli/-/cpy-cli-3.1.1.tgz";
+ sha512 = "HCpNdBkQy3rw+uARLuIf0YurqsMXYzBa9ihhSAuxYJcNIrqrSq3BstPfr0cQN38AdMrQiO9Dp4hYy7GtGJsLPg==";
};
dependencies = [
+ sources."@babel/code-frame-7.8.3"
+ sources."@babel/helper-validator-identifier-7.9.5"
+ sources."@babel/highlight-7.9.0"
sources."@mrmlnc/readdir-enhanced-2.2.1"
sources."@nodelib/fs.stat-1.1.3"
sources."@types/events-3.0.0"
sources."@types/glob-7.1.1"
sources."@types/minimatch-3.0.3"
- sources."@types/node-13.13.2"
+ sources."@types/minimist-1.2.0"
+ sources."@types/node-13.13.4"
+ sources."@types/normalize-package-data-2.4.0"
sources."aggregate-error-3.0.1"
+ sources."ansi-styles-3.2.1"
sources."arr-diff-4.0.0"
sources."arr-flatten-1.1.0"
sources."arr-union-3.1.0"
- sources."array-find-index-1.0.2"
sources."array-union-1.0.2"
sources."array-uniq-1.0.3"
sources."array-unique-0.3.2"
@@ -57220,8 +57474,9 @@ in
})
sources."cache-base-1.0.1"
sources."call-me-maybe-1.0.1"
- sources."camelcase-4.1.0"
- sources."camelcase-keys-4.2.0"
+ sources."camelcase-5.3.1"
+ sources."camelcase-keys-6.2.2"
+ sources."chalk-2.4.2"
(sources."class-utils-0.3.6" // {
dependencies = [
sources."define-property-0.2.5"
@@ -57241,12 +57496,13 @@ in
})
sources."clean-stack-2.2.0"
sources."collection-visit-1.0.0"
+ sources."color-convert-1.9.3"
+ sources."color-name-1.1.3"
sources."component-emitter-1.3.0"
sources."concat-map-0.0.1"
sources."copy-descriptor-0.1.1"
sources."cp-file-7.0.0"
sources."cpy-8.1.0"
- sources."currently-unhandled-0.4.1"
sources."debug-2.6.9"
sources."decamelize-1.2.0"
(sources."decamelize-keys-1.1.0" // {
@@ -57258,6 +57514,7 @@ in
sources."define-property-2.0.2"
sources."dir-glob-2.2.2"
sources."error-ex-1.3.2"
+ sources."escape-string-regexp-1.0.5"
(sources."expand-brackets-2.1.4" // {
dependencies = [
sources."define-property-0.2.5"
@@ -57293,7 +57550,7 @@ in
sources."extend-shallow-2.0.1"
];
})
- sources."find-up-2.1.0"
+ sources."find-up-4.1.0"
sources."for-in-1.0.2"
sources."fragment-cache-0.2.1"
sources."fs.realpath-1.0.0"
@@ -57306,7 +57563,9 @@ in
})
sources."glob-to-regexp-0.3.0"
sources."globby-9.2.0"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
+ sources."hard-rejection-2.1.0"
+ sources."has-flag-3.0.0"
(sources."has-glob-1.0.0" // {
dependencies = [
sources."is-glob-3.1.0"
@@ -57341,25 +57600,22 @@ in
sources."is-windows-1.0.2"
sources."isarray-1.0.0"
sources."isobject-3.0.1"
+ sources."js-tokens-4.0.0"
sources."json-parse-better-errors-1.0.2"
sources."junk-3.1.0"
sources."kind-of-6.0.3"
- (sources."load-json-file-4.0.0" // {
- dependencies = [
- sources."pify-3.0.0"
- ];
- })
- sources."locate-path-2.0.0"
- sources."loud-rejection-1.6.0"
+ sources."lines-and-columns-1.1.6"
+ sources."locate-path-5.0.0"
sources."make-dir-3.1.0"
sources."map-cache-0.2.2"
- sources."map-obj-2.0.0"
+ sources."map-obj-4.1.0"
sources."map-visit-1.0.0"
- sources."meow-5.0.0"
+ sources."meow-6.1.1"
sources."merge2-1.3.0"
sources."micromatch-3.1.10"
+ sources."min-indent-1.0.0"
sources."minimatch-3.0.4"
- (sources."minimist-options-3.0.2" // {
+ (sources."minimist-options-4.0.2" // {
dependencies = [
sources."arrify-1.0.1"
];
@@ -57405,15 +57661,15 @@ in
];
})
sources."p-finally-1.0.0"
- sources."p-limit-1.3.0"
- sources."p-locate-2.0.0"
+ sources."p-limit-2.3.0"
+ sources."p-locate-4.1.0"
sources."p-map-3.0.0"
sources."p-timeout-2.0.1"
- sources."p-try-1.0.0"
- sources."parse-json-4.0.0"
+ sources."p-try-2.2.0"
+ sources."parse-json-5.0.0"
sources."pascalcase-0.1.1"
sources."path-dirname-1.0.2"
- sources."path-exists-3.0.0"
+ sources."path-exists-4.0.0"
sources."path-is-absolute-1.0.1"
sources."path-parse-1.0.6"
(sources."path-type-3.0.0" // {
@@ -57423,14 +57679,18 @@ in
})
sources."pify-4.0.1"
sources."posix-character-classes-0.1.1"
- sources."quick-lru-1.1.0"
- sources."read-pkg-3.0.0"
- sources."read-pkg-up-3.0.0"
- (sources."redent-2.0.0" // {
+ sources."quick-lru-4.0.1"
+ (sources."read-pkg-5.2.0" // {
dependencies = [
- sources."indent-string-3.2.0"
+ sources."type-fest-0.6.0"
];
})
+ (sources."read-pkg-up-7.0.1" // {
+ dependencies = [
+ sources."type-fest-0.8.1"
+ ];
+ })
+ sources."redent-3.0.0"
sources."regex-not-1.0.2"
sources."repeat-element-1.1.3"
sources."repeat-string-1.6.1"
@@ -57444,7 +57704,6 @@ in
sources."extend-shallow-2.0.1"
];
})
- sources."signal-exit-3.0.3"
sources."slash-2.0.0"
(sources."snapdragon-0.8.2" // {
dependencies = [
@@ -57499,8 +57758,8 @@ in
sources."kind-of-5.1.0"
];
})
- sources."strip-bom-3.0.0"
- sources."strip-indent-2.0.0"
+ sources."strip-indent-3.0.0"
+ sources."supports-color-5.5.0"
(sources."to-object-path-0.3.0" // {
dependencies = [
sources."kind-of-3.2.2"
@@ -57508,7 +57767,8 @@ in
})
sources."to-regex-3.0.2"
sources."to-regex-range-2.1.1"
- sources."trim-newlines-2.0.0"
+ sources."trim-newlines-3.0.0"
+ sources."type-fest-0.13.1"
sources."union-value-1.0.1"
(sources."unset-value-1.0.0" // {
dependencies = [
@@ -57524,7 +57784,7 @@ in
sources."use-3.1.1"
sources."validate-npm-package-license-3.0.4"
sources."wrappy-1.0.2"
- sources."yargs-parser-10.1.0"
+ sources."yargs-parser-18.1.3"
];
buildInputs = globalBuildInputs;
meta = {
@@ -57555,7 +57815,7 @@ in
sources."@cycle/run-3.4.0"
sources."@cycle/time-0.10.1"
sources."@types/cookiejar-2.1.1"
- sources."@types/node-13.13.2"
+ sources."@types/node-13.13.4"
sources."@types/superagent-3.8.2"
sources."ansi-escapes-3.2.0"
sources."ansi-regex-2.1.1"
@@ -57616,7 +57876,6 @@ in
];
})
sources."is-fullwidth-code-point-2.0.0"
- sources."is-promise-2.1.0"
sources."isarray-1.0.0"
sources."isexe-2.0.0"
sources."lodash-4.17.15"
@@ -57630,8 +57889,8 @@ in
sources."lru-cache-4.1.5"
sources."methods-1.1.2"
sources."mime-1.6.0"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."mimic-fn-1.2.0"
sources."minimist-1.2.5"
sources."ms-2.1.2"
@@ -57643,12 +57902,12 @@ in
sources."performance-now-2.1.0"
sources."process-nextick-args-2.0.1"
sources."pseudomap-1.0.2"
- sources."qs-6.9.3"
+ sources."qs-6.9.4"
sources."quicktask-1.1.0"
sources."raf-3.3.2"
sources."readable-stream-2.3.7"
sources."restore-cursor-2.0.0"
- sources."run-async-2.4.0"
+ sources."run-async-2.4.1"
sources."rx-lite-4.0.8"
sources."rx-lite-aggregates-4.0.8"
sources."safe-buffer-5.1.2"
@@ -57738,7 +57997,7 @@ in
sources."fstream-1.0.12"
sources."fstream-ignore-1.0.5"
sources."glob-7.1.6"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."has-flag-4.0.0"
sources."hyperquest-2.1.3"
sources."iconv-lite-0.4.24"
@@ -57755,7 +58014,6 @@ in
];
})
sources."is-fullwidth-code-point-3.0.0"
- sources."is-promise-2.1.0"
sources."isarray-0.0.1"
sources."isexe-2.0.0"
sources."jsonfile-4.0.0"
@@ -57775,7 +58033,7 @@ in
sources."readable-stream-1.1.14"
sources."restore-cursor-3.1.0"
sources."rimraf-2.7.1"
- sources."run-async-2.4.0"
+ sources."run-async-2.4.1"
sources."rxjs-6.5.5"
sources."safe-buffer-5.1.2"
sources."safer-buffer-2.1.2"
@@ -58113,7 +58371,7 @@ in
sources."global-4.3.2"
sources."global-dirs-0.1.1"
sources."got-6.7.1"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
sources."has-flag-3.0.0"
@@ -58127,7 +58385,7 @@ in
sources."http-signature-1.2.0"
(sources."hypercore-7.7.1" // {
dependencies = [
- sources."codecs-2.0.0"
+ sources."codecs-2.1.0"
sources."unordered-set-2.0.1"
];
})
@@ -58214,27 +58472,27 @@ in
sources."menu-string-1.3.0"
sources."merkle-tree-stream-3.0.3"
sources."micromatch-3.1.10"
- sources."mime-2.4.4"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-2.4.5"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."mimic-response-2.1.0"
sources."min-document-2.19.0"
sources."minimatch-3.0.4"
sources."minimist-1.2.5"
- sources."mirror-folder-3.0.1"
+ sources."mirror-folder-3.1.0"
(sources."mixin-deep-1.3.2" // {
dependencies = [
sources."is-extendable-1.0.1"
];
})
sources."mkdirp-0.5.5"
- sources."mkdirp-classic-0.5.2"
+ sources."mkdirp-classic-0.5.3"
sources."ms-2.1.2"
sources."multi-random-access-2.1.1"
sources."multicast-dns-7.2.2"
sources."multistream-2.1.1"
sources."mute-stream-0.0.8"
- sources."mutexify-1.2.0"
+ sources."mutexify-1.3.0"
sources."nan-2.14.1"
sources."nanoassert-1.1.0"
sources."nanobus-4.4.0"
@@ -58382,7 +58640,7 @@ in
sources."sodium-javascript-0.5.6"
(sources."sodium-native-2.4.9" // {
dependencies = [
- sources."node-gyp-build-4.2.1"
+ sources."node-gyp-build-4.2.2"
];
})
sources."sodium-universal-2.0.0"
@@ -58488,9 +58746,9 @@ in
sources."use-3.1.1"
sources."util-deprecate-1.0.2"
sources."utile-0.3.0"
- (sources."utp-native-2.1.7" // {
+ (sources."utp-native-2.1.10" // {
dependencies = [
- sources."node-gyp-build-4.2.1"
+ sources."node-gyp-build-4.2.2"
sources."readable-stream-3.6.0"
sources."unordered-set-2.0.1"
];
@@ -58617,8 +58875,8 @@ in
sources."merge-descriptors-0.0.2"
sources."methods-1.1.2"
sources."mime-1.2.11"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."minimist-0.0.10"
sources."ms-0.7.0"
sources."nan-2.14.1"
@@ -58694,14 +58952,14 @@ in
dockerfile-language-server-nodejs = nodeEnv.buildNodePackage {
name = "dockerfile-language-server-nodejs";
packageName = "dockerfile-language-server-nodejs";
- version = "0.0.23";
+ version = "0.0.24";
src = fetchurl {
- url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.0.23.tgz";
- sha512 = "cOMMCsZ2hAt68NjLaBMTWHgCZvM5UfnQI25yIAAVJ6o6srqlUcDzl39CmO7OZsDVOtyG7n+T72PelVmQH2ymlw==";
+ url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.0.24.tgz";
+ sha512 = "tG0cE6yIyj80eKHMbDBMNPHc1l40GW8v7b8jeDRs0Jv42boG0s6DEsM/eDFQw92mwAtBry07mB1tM+jSwqGzJw==";
};
dependencies = [
sources."dockerfile-ast-0.0.25"
- (sources."dockerfile-language-service-0.0.11" // {
+ (sources."dockerfile-language-service-0.0.12" // {
dependencies = [
(sources."dockerfile-utils-0.0.16" // {
dependencies = [
@@ -58734,10 +58992,10 @@ in
elasticdump = nodeEnv.buildNodePackage {
name = "elasticdump";
packageName = "elasticdump";
- version = "6.27.3";
+ version = "6.28.0";
src = fetchurl {
- url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.27.3.tgz";
- sha512 = "nzkJS9Z/bEXk+AOouAU2SGuhU1OSXjuhvn+48/l97YbREWk2nY1bmguTe/dHW7w8vBxg1cQW/yqTZ8o+rxTAmw==";
+ url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.28.0.tgz";
+ sha512 = "JVT1VyJqRdSqg9xFy7FQtdcHlWfBLiW08DUtJZaRRsU/4mEvLtUXU1y+h6n3nRtoe5HplVMsP/Dlwj0jUMSPug==";
};
dependencies = [
sources."JSONStream-1.3.5"
@@ -58746,7 +59004,7 @@ in
sources."assert-plus-1.0.0"
sources."async-2.6.3"
sources."asynckit-0.4.0"
- sources."aws-sdk-2.661.0"
+ sources."aws-sdk-2.669.0"
sources."aws-sign2-0.7.0"
sources."aws4-1.9.1"
sources."base64-js-1.3.1"
@@ -58795,13 +59053,13 @@ in
sources."jsprim-1.4.1"
sources."lodash-4.17.15"
sources."lossless-json-1.0.3"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."minimist-1.2.5"
sources."oauth-sign-0.9.0"
sources."once-1.4.0"
sources."p-finally-1.0.0"
- sources."p-queue-6.3.0"
+ sources."p-queue-6.4.0"
sources."p-timeout-3.2.0"
sources."performance-now-2.1.0"
sources."process-nextick-args-2.0.1"
@@ -58893,8 +59151,8 @@ in
};
dependencies = [
sources."@babel/code-frame-7.8.3"
- sources."@babel/core-7.9.0"
- sources."@babel/generator-7.9.5"
+ sources."@babel/core-7.9.6"
+ sources."@babel/generator-7.9.6"
sources."@babel/helper-annotate-as-pure-7.8.3"
sources."@babel/helper-builder-react-jsx-7.9.0"
sources."@babel/helper-builder-react-jsx-experimental-7.9.5"
@@ -58905,22 +59163,22 @@ in
sources."@babel/helper-module-transforms-7.9.0"
sources."@babel/helper-optimise-call-expression-7.8.3"
sources."@babel/helper-plugin-utils-7.8.3"
- sources."@babel/helper-replace-supers-7.8.6"
+ sources."@babel/helper-replace-supers-7.9.6"
sources."@babel/helper-simple-access-7.8.3"
sources."@babel/helper-split-export-declaration-7.8.3"
sources."@babel/helper-validator-identifier-7.9.5"
- sources."@babel/helpers-7.9.2"
+ sources."@babel/helpers-7.9.6"
sources."@babel/highlight-7.9.0"
- sources."@babel/parser-7.9.4"
- sources."@babel/plugin-proposal-object-rest-spread-7.9.5"
+ sources."@babel/parser-7.9.6"
+ sources."@babel/plugin-proposal-object-rest-spread-7.9.6"
sources."@babel/plugin-syntax-jsx-7.8.3"
sources."@babel/plugin-syntax-object-rest-spread-7.8.3"
sources."@babel/plugin-transform-destructuring-7.9.5"
sources."@babel/plugin-transform-parameters-7.9.5"
sources."@babel/plugin-transform-react-jsx-7.9.4"
sources."@babel/template-7.8.6"
- sources."@babel/traverse-7.9.5"
- sources."@babel/types-7.9.5"
+ sources."@babel/traverse-7.9.6"
+ sources."@babel/types-7.9.6"
sources."@sindresorhus/is-2.1.1"
sources."@szmarczak/http-timer-4.0.5"
sources."@types/cacheable-request-6.0.1"
@@ -58928,7 +59186,7 @@ in
sources."@types/http-cache-semantics-4.0.0"
sources."@types/keyv-3.1.1"
sources."@types/minimist-1.2.0"
- sources."@types/node-13.13.2"
+ sources."@types/node-13.13.4"
sources."@types/normalize-package-data-2.4.0"
sources."@types/responselike-1.0.0"
sources."@types/yoga-layout-1.9.1"
@@ -59033,12 +59291,13 @@ in
})
sources."is-arrayish-0.2.1"
sources."is-ci-2.0.0"
+ sources."is-docker-2.0.0"
sources."is-fullwidth-code-point-3.0.0"
sources."is-obj-2.0.0"
sources."is-plain-obj-1.1.0"
sources."is-stream-1.1.0"
sources."is-typedarray-1.0.0"
- sources."is-wsl-2.1.1"
+ sources."is-wsl-2.2.0"
sources."isexe-2.0.0"
sources."js-tokens-4.0.0"
sources."jsesc-2.5.2"
@@ -59082,9 +59341,9 @@ in
sources."mimic-fn-3.0.0"
];
})
- (sources."meow-6.1.0" // {
+ (sources."meow-6.1.1" // {
dependencies = [
- sources."type-fest-0.8.1"
+ sources."type-fest-0.13.1"
];
})
sources."mimic-fn-2.1.0"
@@ -59315,7 +59574,6 @@ in
sources."is-extglob-2.1.1"
sources."is-fullwidth-code-point-3.0.0"
sources."is-glob-4.0.1"
- sources."is-promise-2.1.0"
sources."isexe-2.0.0"
sources."js-tokens-4.0.0"
sources."js-yaml-3.13.1"
@@ -59345,7 +59603,7 @@ in
sources."resolve-from-4.0.0"
sources."restore-cursor-3.1.0"
sources."rimraf-2.6.3"
- sources."run-async-2.4.0"
+ sources."run-async-2.4.1"
sources."rxjs-6.5.5"
sources."safer-buffer-2.1.2"
sources."semver-6.3.0"
@@ -59494,7 +59752,6 @@ in
sources."is-extglob-2.1.1"
sources."is-fullwidth-code-point-3.0.0"
sources."is-glob-4.0.1"
- sources."is-promise-2.1.0"
sources."isexe-2.0.0"
sources."js-tokens-4.0.0"
sources."js-yaml-3.13.1"
@@ -59527,7 +59784,7 @@ in
sources."resolve-from-4.0.0"
sources."restore-cursor-3.1.0"
sources."rimraf-2.6.3"
- sources."run-async-2.4.0"
+ sources."run-async-2.4.1"
sources."rxjs-6.5.5"
sources."safer-buffer-2.1.2"
sources."semver-6.3.0"
@@ -59638,7 +59895,7 @@ in
sources."fs-extra-1.0.0"
sources."get-stdin-4.0.1"
sources."getpass-0.1.7"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
sources."has-ansi-2.0.0"
@@ -59676,8 +59933,8 @@ in
sources."loud-rejection-1.6.0"
sources."map-obj-1.0.1"
sources."meow-3.7.0"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."mimic-fn-1.2.0"
sources."minimist-1.2.5"
sources."mkdirp-0.5.5"
@@ -59820,7 +60077,7 @@ in
sources."external-editor-3.1.0"
sources."figures-3.2.0"
sources."find-up-4.1.0"
- (sources."fkill-7.0.0" // {
+ (sources."fkill-7.0.1" // {
dependencies = [
sources."ps-list-7.0.0"
];
@@ -59848,7 +60105,6 @@ in
sources."is-arrayish-0.2.1"
sources."is-fullwidth-code-point-3.0.0"
sources."is-plain-obj-1.1.0"
- sources."is-promise-2.1.0"
sources."is-stream-2.0.0"
sources."isexe-2.0.0"
sources."js-tokens-4.0.0"
@@ -59858,9 +60114,9 @@ in
sources."lodash-4.17.15"
sources."lru-cache-4.1.5"
sources."map-obj-4.1.0"
- (sources."meow-6.1.0" // {
+ (sources."meow-6.1.1" // {
dependencies = [
- sources."type-fest-0.8.1"
+ sources."type-fest-0.13.1"
];
})
sources."merge-stream-2.0.0"
@@ -59918,7 +60174,7 @@ in
sources."redent-3.0.0"
sources."resolve-1.17.0"
sources."restore-cursor-3.1.0"
- sources."run-async-2.4.0"
+ sources."run-async-2.4.1"
sources."rxjs-6.5.5"
sources."safer-buffer-2.1.2"
sources."semver-5.7.1"
@@ -60055,7 +60311,7 @@ in
sources."debug-2.6.9"
sources."decamelize-1.2.0"
sources."decode-uri-component-0.2.0"
- sources."deep-equal-2.0.2"
+ sources."deep-equal-2.0.3"
sources."define-properties-1.1.3"
sources."define-property-2.0.2"
sources."defined-0.0.0"
@@ -60127,7 +60383,7 @@ in
sources."is-glob-3.1.0"
];
})
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."has-1.0.3"
sources."has-symbols-1.0.1"
sources."has-value-1.0.0"
@@ -60467,11 +60723,11 @@ in
sources."lodash.get-4.4.2"
sources."looper-4.0.0"
sources."lrucache-1.0.3"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."minimist-1.2.5"
sources."mkdirp-0.5.5"
- sources."moment-2.24.0"
+ sources."moment-2.25.3"
sources."moo-0.5.1"
sources."ms-2.1.2"
sources."multicb-1.2.2"
@@ -60480,8 +60736,8 @@ in
sources."multiserver-scopes-1.0.0"
sources."muxrpc-6.5.0"
sources."nan-2.14.1"
- sources."nearley-2.19.2"
- sources."node-gyp-build-4.2.1"
+ sources."nearley-2.19.3"
+ sources."node-gyp-build-4.2.2"
sources."node-polyglot-1.0.0"
sources."non-private-ip-1.4.4"
sources."options-0.0.6"
@@ -60628,10 +60884,10 @@ in
gitmoji-cli = nodeEnv.buildNodePackage {
name = "gitmoji-cli";
packageName = "gitmoji-cli";
- version = "3.2.3";
+ version = "3.2.4";
src = fetchurl {
- url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-3.2.3.tgz";
- sha512 = "xUNP+b2CUzMIURcnEVXNgQo51ShKjjjfAO1U4a0A9KzathisjtGrsrrDUnXJlqojGOBYm/z2sAq/h0GfO6DX8A==";
+ url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-3.2.4.tgz";
+ sha512 = "rf0NbwZobW2Kwwomf41Ooas7rm7yg1z68fyKgrKaUs/VaaNtwIYMp/J11iQxcFu5p6i73huCytzmmo/8v4usDA==";
};
dependencies = [
sources."@babel/code-frame-7.8.3"
@@ -60725,7 +60981,7 @@ in
sources."get-stream-4.1.0"
];
})
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."hard-rejection-2.1.0"
sources."has-flag-4.0.0"
sources."has-yarn-2.1.0"
@@ -60759,7 +61015,6 @@ in
sources."is-obj-2.0.0"
sources."is-path-inside-3.0.2"
sources."is-plain-obj-1.1.0"
- sources."is-promise-2.1.0"
sources."is-stream-2.0.0"
sources."is-typedarray-1.0.0"
sources."is-yarn-global-0.3.0"
@@ -60787,9 +61042,9 @@ in
sources."lowercase-keys-1.0.1"
sources."make-dir-3.1.0"
sources."map-obj-4.1.0"
- (sources."meow-6.1.0" // {
+ (sources."meow-6.1.1" // {
dependencies = [
- sources."type-fest-0.8.1"
+ sources."type-fest-0.13.1"
];
})
sources."merge-stream-2.0.0"
@@ -60847,7 +61102,7 @@ in
sources."resolve-1.17.0"
sources."responselike-1.0.2"
sources."restore-cursor-3.1.0"
- sources."run-async-2.4.0"
+ sources."run-async-2.4.1"
sources."rxjs-6.5.5"
sources."safer-buffer-2.1.2"
sources."semver-6.3.0"
@@ -60998,7 +61253,7 @@ in
sources."chalk-2.4.2"
sources."change-case-3.1.0"
sources."chardet-0.7.0"
- sources."chownr-1.1.4"
+ sources."chownr-2.0.0"
sources."ci-info-2.0.0"
sources."cli-boxes-2.2.0"
sources."cli-cursor-3.1.0"
@@ -61036,7 +61291,7 @@ in
sources."core-util-is-1.0.2"
sources."cosmiconfig-5.2.1"
sources."create-error-class-3.0.2"
- (sources."creato-1.1.1" // {
+ (sources."creato-1.1.2" // {
dependencies = [
sources."ansi-regex-5.0.0"
sources."ansi-styles-4.2.1"
@@ -61165,7 +61420,7 @@ in
sources."get-stream-4.1.0"
];
})
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."graphcool-json-schema-1.2.1"
(sources."graphcool-yml-0.4.15" // {
dependencies = [
@@ -61258,7 +61513,6 @@ in
sources."is-npm-3.0.0"
sources."is-obj-1.0.1"
sources."is-path-inside-1.0.1"
- sources."is-promise-2.1.0"
sources."is-redirect-1.0.0"
sources."is-retry-allowed-1.2.0"
sources."is-stream-1.1.0"
@@ -61336,8 +61590,8 @@ in
sources."merge-descriptors-1.0.1"
sources."methods-1.1.2"
sources."mime-1.6.0"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."mimic-fn-1.2.0"
sources."mimic-response-1.0.1"
sources."minimatch-3.0.4"
@@ -61475,7 +61729,7 @@ in
sources."responselike-1.0.2"
sources."restore-cursor-3.1.0"
sources."rimraf-2.7.1"
- sources."run-async-2.4.0"
+ sources."run-async-2.4.1"
sources."rxjs-6.5.5"
sources."safe-buffer-5.2.0"
sources."safer-buffer-2.1.2"
@@ -61502,7 +61756,7 @@ in
sources."simple-errors-1.0.1"
sources."snake-case-2.1.0"
sources."source-map-0.5.7"
- (sources."source-map-support-0.5.18" // {
+ (sources."source-map-support-0.5.19" // {
dependencies = [
sources."source-map-0.6.1"
];
@@ -61532,7 +61786,7 @@ in
sources."supports-color-5.5.0"
sources."swap-case-1.1.2"
sources."sync-exec-0.6.2"
- (sources."tar-6.0.1" // {
+ (sources."tar-6.0.2" // {
dependencies = [
sources."mkdirp-1.0.4"
sources."yallist-4.0.0"
@@ -61543,7 +61797,11 @@ in
sources."through2-2.0.5"
sources."timed-out-4.0.1"
sources."title-case-2.1.1"
- sources."tmp-0.1.0"
+ (sources."tmp-0.2.1" // {
+ dependencies = [
+ sources."rimraf-3.0.2"
+ ];
+ })
sources."tmp-graphql-config-extension-openapi-1.0.7"
sources."to-fast-properties-2.0.0"
sources."to-readable-stream-1.0.0"
@@ -61925,7 +62183,7 @@ in
sources."ansi-term-0.0.2"
sources."ansicolors-0.3.2"
sources."blessed-0.1.81"
- sources."blessed-contrib-4.8.19"
+ sources."blessed-contrib-4.8.20"
sources."bresenham-0.0.3"
sources."buffers-0.1.1"
sources."cardinal-2.1.1"
@@ -61955,10 +62213,10 @@ in
sources."lodash.toarray-4.4.0"
sources."map-canvas-0.1.5"
sources."marked-0.7.0"
- (sources."marked-terminal-4.0.0" // {
+ (sources."marked-terminal-4.1.0" // {
dependencies = [
sources."ansi-styles-4.2.1"
- sources."chalk-3.0.0"
+ sources."chalk-4.0.0"
sources."supports-color-7.1.0"
];
})
@@ -61981,7 +62239,7 @@ in
sources."supports-color-7.1.0"
];
})
- sources."systeminformation-4.23.5"
+ sources."systeminformation-4.24.1"
sources."term-canvas-0.0.5"
sources."type-fest-0.11.0"
sources."wordwrap-0.0.3"
@@ -62189,7 +62447,7 @@ in
sources."global-modules-1.0.0"
sources."global-prefix-1.0.2"
sources."glogg-1.0.2"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."gulp-cli-2.2.0"
sources."gulplog-1.0.0"
sources."has-symbols-1.0.1"
@@ -62320,7 +62578,7 @@ in
sources."remove-trailing-separator-1.1.0"
sources."repeat-element-1.1.3"
sources."repeat-string-1.6.1"
- sources."replace-ext-1.0.0"
+ sources."replace-ext-1.0.1"
sources."replace-homedir-1.0.0"
sources."require-directory-2.1.1"
sources."require-main-filename-1.0.1"
@@ -62571,7 +62829,7 @@ in
sources."global-modules-1.0.0"
sources."global-prefix-1.0.2"
sources."glogg-1.0.2"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."gulplog-1.0.0"
sources."has-value-1.0.0"
(sources."has-values-1.0.0" // {
@@ -62822,7 +63080,7 @@ in
sources."param-case-2.1.1"
sources."relateurl-0.2.7"
sources."source-map-0.6.1"
- sources."uglify-js-3.9.1"
+ sources."uglify-js-3.9.2"
sources."upper-case-1.1.3"
];
buildInputs = globalBuildInputs;
@@ -62913,8 +63171,8 @@ in
sources."json-stringify-safe-5.0.1"
sources."jsprim-1.4.1"
sources."lodash-4.17.15"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."minimatch-3.0.4"
sources."oauth-sign-0.9.0"
sources."once-1.4.0"
@@ -62960,10 +63218,10 @@ in
http-server = nodeEnv.buildNodePackage {
name = "http-server";
packageName = "http-server";
- version = "0.12.1";
+ version = "0.12.3";
src = fetchurl {
- url = "https://registry.npmjs.org/http-server/-/http-server-0.12.1.tgz";
- sha512 = "T0jB+7J7GJ2Vo+a4/T7P7SbQ3x2GPDnqRqQXdfEuPuUOmES/9NBxPnDm7dh1HGEeUWqUmLUNtGV63ZC5Uy3tGA==";
+ url = "https://registry.npmjs.org/http-server/-/http-server-0.12.3.tgz";
+ sha512 = "be0dKG6pni92bRjq0kvExtj/NrrAd28/8fCXkaI/4piTwQMSDSLMhWyW0NI1V+DBI3aa1HMlQu46/HjVLfmugA==";
};
dependencies = [
sources."async-2.6.3"
@@ -62982,18 +63240,12 @@ in
sources."mkdirp-0.5.5"
sources."ms-2.1.2"
sources."opener-1.5.1"
- (sources."optimist-0.6.1" // {
- dependencies = [
- sources."minimist-0.0.10"
- ];
- })
- sources."portfinder-1.0.25"
- sources."qs-6.9.3"
+ sources."portfinder-1.0.26"
+ sources."qs-6.9.4"
sources."requires-port-1.0.0"
sources."secure-compare-3.0.1"
sources."union-0.5.0"
sources."url-join-2.0.5"
- sources."wordwrap-0.0.3"
];
buildInputs = globalBuildInputs;
meta = {
@@ -63093,7 +63345,7 @@ in
sources."minimist-1.2.5"
];
})
- sources."moment-2.24.0"
+ sources."moment-2.25.3"
sources."mv-2.1.1"
sources."nan-2.14.1"
sources."ncp-2.0.0"
@@ -63160,7 +63412,7 @@ in
sha512 = "l4g7U75E+WgrgNGH774djfTyp5Aw+2jJokYe9iCunSAbi/w+nRGHqTJfwbODLwiJQTnbXkM42FxgPRA29Ce7Bg==";
};
dependencies = [
- sources."@types/jquery-3.3.35"
+ sources."@types/jquery-3.3.37"
sources."@types/sizzle-2.3.2"
sources."balanced-match-1.0.0"
sources."brace-expansion-1.1.11"
@@ -63174,7 +63426,7 @@ in
sources."fs.realpath-1.0.0"
sources."glob-7.1.6"
sources."good-listener-1.2.2"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."historic-readline-1.0.8"
sources."inflight-1.0.6"
sources."inherits-2.0.4"
@@ -63322,7 +63574,7 @@ in
];
})
sources."glob-7.1.6"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."has-flag-4.0.0"
sources."http-errors-1.7.3"
(sources."http-proxy-agent-2.1.0" // {
@@ -63352,10 +63604,9 @@ in
sources."ip-1.1.5"
sources."is-docker-2.0.0"
sources."is-fullwidth-code-point-2.0.0"
- sources."is-promise-2.1.0"
sources."is-stream-1.1.0"
sources."is-typedarray-1.0.0"
- sources."is-wsl-2.1.1"
+ sources."is-wsl-2.2.0"
sources."isarray-1.0.0"
sources."isexe-2.0.0"
sources."jsonfile-4.0.0"
@@ -63388,9 +63639,9 @@ in
sources."lru-cache-5.1.1"
sources."macos-release-2.3.0"
sources."methods-1.1.2"
- sources."mime-2.4.4"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-2.4.5"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."mimic-fn-1.2.0"
sources."minimatch-3.0.4"
sources."minimist-1.2.5"
@@ -63422,13 +63673,13 @@ in
sources."proxy-agent-3.1.1"
sources."proxy-from-env-1.1.0"
sources."pump-3.0.0"
- sources."qs-6.9.3"
+ sources."qs-6.9.4"
sources."raw-body-2.4.1"
sources."readable-stream-3.6.0"
sources."restore-cursor-2.0.0"
sources."rimraf-3.0.2"
sources."rsvp-3.6.2"
- sources."run-async-2.4.0"
+ sources."run-async-2.4.1"
sources."rxjs-6.5.5"
sources."safe-buffer-5.2.0"
sources."safer-buffer-2.1.2"
@@ -63512,7 +63763,7 @@ in
})
sources."wrappy-1.0.2"
sources."write-file-atomic-3.0.3"
- sources."ws-7.2.3"
+ sources."ws-7.2.5"
sources."xregexp-2.0.0"
sources."yallist-3.1.1"
];
@@ -63667,7 +63918,7 @@ in
sources."get-stream-3.0.0"
sources."getpass-0.1.7"
sources."glob-7.1.6"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
sources."has-flag-4.0.0"
@@ -63703,8 +63954,8 @@ in
sources."megaminx-0.9.0"
sources."mem-1.1.0"
sources."microbuffer-1.0.0"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."mimic-fn-1.2.0"
sources."minimatch-3.0.4"
sources."minimist-1.2.5"
@@ -63942,10 +64193,10 @@ in
jake = nodeEnv.buildNodePackage {
name = "jake";
packageName = "jake";
- version = "10.5.2";
+ version = "10.6.1";
src = fetchurl {
- url = "https://registry.npmjs.org/jake/-/jake-10.5.2.tgz";
- sha512 = "2twpudoNYV7izUgKoLoVCwLFV+x8W5PQHri4ZPSm3L2viTq+DxVPQi9WJoeDSTCKE/G3lB5e78KAbeFhYQpgKA==";
+ url = "https://registry.npmjs.org/jake/-/jake-10.6.1.tgz";
+ sha512 = "pHUK3+V0BjOb1XSi95rbBksrMdIqLVC9bJqDnshVyleYsET3H0XAq+3VB2E3notcYvv4wRdRHn13p7vobG+wfQ==";
};
dependencies = [
sources."ansi-styles-3.2.1"
@@ -63957,15 +64208,10 @@ in
sources."color-name-1.1.3"
sources."concat-map-0.0.1"
sources."escape-string-regexp-1.0.5"
- (sources."filelist-0.0.6" // {
- dependencies = [
- sources."utilities-0.0.37"
- ];
- })
+ sources."filelist-1.0.1"
sources."has-flag-3.0.0"
sources."minimatch-3.0.4"
sources."supports-color-5.5.0"
- sources."utilities-1.0.5"
];
buildInputs = globalBuildInputs;
meta = {
@@ -64200,7 +64446,7 @@ in
sources."crypt-0.0.2"
sources."css-2.2.4"
sources."cssom-0.4.4"
- (sources."cssstyle-2.2.0" // {
+ (sources."cssstyle-2.3.0" // {
dependencies = [
sources."cssom-0.3.8"
];
@@ -64326,7 +64572,7 @@ in
sources."getpass-0.1.7"
sources."github-from-package-0.0.0"
sources."glob-7.1.6"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
sources."has-ansi-2.0.0"
@@ -64490,9 +64736,9 @@ in
sources."mdurl-1.0.1"
sources."memory-cache-0.2.0"
sources."micromatch-3.1.10"
- sources."mime-2.4.4"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-2.4.5"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."mimic-response-2.1.0"
sources."minimatch-3.0.4"
sources."minimist-1.2.5"
@@ -64504,8 +64750,8 @@ in
];
})
sources."mkdirp-0.5.5"
- sources."mkdirp-classic-0.5.2"
- sources."moment-2.24.0"
+ sources."mkdirp-classic-0.5.3"
+ sources."moment-2.25.3"
sources."ms-2.1.2"
(sources."multiparty-4.2.1" // {
dependencies = [
@@ -64704,7 +64950,7 @@ in
sources."split-skip-0.0.2"
sources."split-string-3.1.0"
sources."sprintf-js-1.1.2"
- sources."sqlite3-4.1.1"
+ sources."sqlite3-4.2.0"
sources."sshpk-1.16.1"
(sources."static-extend-0.1.2" // {
dependencies = [
@@ -64848,7 +65094,7 @@ in
];
})
sources."wrappy-1.0.2"
- sources."ws-7.2.3"
+ sources."ws-7.2.5"
sources."xml-name-validator-3.0.0"
sources."xml2js-0.4.23"
sources."xmlbuilder-11.0.1"
@@ -64945,13 +65191,13 @@ in
sha512 = "3G9d37VHv7MFdheviDCjUfQoIjdv4TC5zTTf5G9VODLtOnVS6La1eoYBDlbWfsRT3/Xo+j2MIqki2EV12BZfwA==";
};
dependencies = [
- sources."@babel/parser-7.9.4"
+ sources."@babel/parser-7.9.6"
sources."argparse-1.0.10"
sources."bluebird-3.7.2"
sources."catharsis-0.8.11"
sources."entities-2.0.0"
sources."escape-string-regexp-2.0.0"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."js2xmlparser-4.0.1"
sources."klaw-3.0.0"
sources."linkify-it-2.2.0"
@@ -65103,14 +65349,14 @@ in
sources."lodash-4.17.15"
sources."methods-1.1.2"
sources."mime-1.6.0"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."ms-2.1.2"
sources."native-promise-only-0.8.1"
sources."path-loader-1.0.10"
sources."process-nextick-args-2.0.1"
sources."punycode-2.1.1"
- sources."qs-6.9.3"
+ sources."qs-6.9.4"
sources."readable-stream-2.3.7"
sources."safe-buffer-5.1.2"
sources."slash-3.0.0"
@@ -65239,7 +65485,7 @@ in
sources."getpass-0.1.7"
sources."global-dirs-2.0.1"
sources."got-9.6.0"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
sources."has-flag-4.0.0"
@@ -65259,7 +65505,7 @@ in
sources."is-npm-4.0.0"
sources."is-obj-2.0.0"
sources."is-path-inside-3.0.2"
- sources."is-promise-2.1.0"
+ sources."is-promise-2.2.2"
sources."is-typedarray-1.0.0"
sources."is-yarn-global-0.3.0"
sources."isarray-0.0.1"
@@ -65289,8 +65535,8 @@ in
})
sources."methods-1.1.2"
sources."mime-1.6.0"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."mimic-response-1.0.1"
sources."minimist-1.2.5"
(sources."morgan-1.10.0" // {
@@ -65440,10 +65686,10 @@ in
karma = nodeEnv.buildNodePackage {
name = "karma";
packageName = "karma";
- version = "5.0.2";
+ version = "5.0.4";
src = fetchurl {
- url = "https://registry.npmjs.org/karma/-/karma-5.0.2.tgz";
- sha512 = "RpUuCuGJfN3WnjYPGIH+VBF8023Lfm3TQH6D1kcNL+FxtEPc2UUz/nVjbVAGXH4Pm+Q7FVOAQjdAeFUpXpQ3IA==";
+ url = "https://registry.npmjs.org/karma/-/karma-5.0.4.tgz";
+ sha512 = "UGqTe2LBiGQBXRN+Fygeiq63tbfOX45639SKSbPkLpARwnxROWJZg+froGkpHxr84FXCe8UGCf+1PITM6frT5w==";
};
dependencies = [
sources."@types/color-name-1.1.1"
@@ -65468,7 +65714,7 @@ in
sources."bytes-3.1.0"
sources."callsite-1.0.0"
sources."camelcase-5.3.1"
- sources."chokidar-3.3.1"
+ sources."chokidar-3.4.0"
sources."cliui-6.0.0"
sources."color-convert-2.0.1"
sources."color-name-1.1.4"
@@ -65521,7 +65767,7 @@ in
sources."get-caller-file-2.0.5"
sources."glob-7.1.6"
sources."glob-parent-5.1.1"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."has-binary2-1.0.3"
sources."has-cors-1.1.0"
sources."http-errors-1.7.2"
@@ -65547,9 +65793,9 @@ in
];
})
sources."media-typer-0.3.0"
- sources."mime-2.4.4"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-2.4.5"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."minimatch-3.0.4"
sources."ms-2.0.0"
sources."negotiator-0.6.2"
@@ -65571,7 +65817,7 @@ in
sources."qs-6.7.0"
sources."range-parser-1.2.1"
sources."raw-body-2.4.0"
- sources."readdirp-3.3.0"
+ sources."readdirp-3.4.0"
sources."require-directory-2.1.1"
sources."require-main-filename-2.0.0"
sources."requires-port-1.0.0"
@@ -65669,7 +65915,7 @@ in
sources."glob-7.1.6"
sources."glob-parent-3.1.0"
sources."glob-stream-6.1.0"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."has-symbols-1.0.1"
sources."inflight-1.0.6"
sources."inherits-2.0.4"
@@ -65703,7 +65949,7 @@ in
sources."remove-bom-buffer-3.0.0"
sources."remove-bom-stream-1.2.0"
sources."remove-trailing-separator-1.1.0"
- sources."replace-ext-1.0.0"
+ sources."replace-ext-1.0.1"
sources."resolve-options-1.1.0"
sources."safe-buffer-5.1.2"
sources."stream-shift-1.0.1"
@@ -65849,13 +66095,13 @@ in
sources."mimic-fn-2.1.0"
];
})
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."mimic-fn-1.2.0"
sources."minimatch-3.0.4"
sources."minimist-0.0.8"
sources."mkdirp-0.5.1"
- sources."moment-2.24.0"
+ sources."moment-2.25.3"
sources."mute-stream-0.0.8"
(sources."nconf-0.10.0" // {
dependencies = [
@@ -66114,11 +66360,11 @@ in
})
sources."@octokit/request-error-1.2.1"
sources."@octokit/rest-16.43.1"
- sources."@octokit/types-2.12.1"
+ sources."@octokit/types-2.12.2"
sources."@types/events-3.0.0"
sources."@types/glob-7.1.1"
sources."@types/minimatch-3.0.3"
- sources."@types/node-13.13.2"
+ sources."@types/node-13.13.4"
sources."@zkochan/cmd-shim-3.1.0"
sources."JSONStream-1.3.5"
sources."abbrev-1.1.1"
@@ -66303,7 +66549,7 @@ in
sources."encoding-0.1.12"
sources."end-of-stream-1.4.4"
sources."env-paths-2.2.0"
- sources."envinfo-7.5.0"
+ sources."envinfo-7.5.1"
sources."err-code-1.1.2"
sources."error-ex-1.3.2"
sources."es-abstract-1.17.5"
@@ -66438,7 +66684,7 @@ in
sources."pify-4.0.1"
];
})
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
(sources."handlebars-4.7.6" // {
dependencies = [
sources."source-map-0.6.1"
@@ -66512,7 +66758,6 @@ in
sources."is-obj-1.0.1"
sources."is-plain-obj-1.1.0"
sources."is-plain-object-2.0.4"
- sources."is-promise-2.1.0"
sources."is-regex-1.0.5"
sources."is-ssh-1.3.1"
sources."is-stream-1.1.0"
@@ -66567,8 +66812,8 @@ in
})
sources."merge2-1.3.0"
sources."micromatch-3.1.10"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."mimic-fn-1.2.0"
sources."minimatch-3.0.4"
sources."minimist-1.2.5"
@@ -66741,7 +66986,7 @@ in
sources."ret-0.1.15"
sources."retry-0.10.1"
sources."rimraf-2.7.1"
- sources."run-async-2.4.0"
+ sources."run-async-2.4.1"
sources."run-queue-1.0.3"
sources."rxjs-6.5.5"
sources."safe-buffer-5.2.0"
@@ -66876,7 +67121,7 @@ in
sources."tweetnacl-0.14.5"
sources."type-fest-0.3.1"
sources."typedarray-0.0.6"
- sources."uglify-js-3.9.1"
+ sources."uglify-js-3.9.2"
sources."uid-number-0.0.6"
sources."umask-1.1.0"
sources."union-value-1.0.1"
@@ -66987,7 +67232,7 @@ in
sources."forever-agent-0.6.1"
sources."form-data-2.3.3"
sources."getpass-0.1.7"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
sources."http-signature-1.2.0"
@@ -67000,8 +67245,8 @@ in
sources."json-stringify-safe-5.0.1"
sources."jsprim-1.4.1"
sources."mime-1.6.0"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."minimist-1.2.5"
sources."mkdirp-0.5.5"
sources."oauth-sign-0.9.0"
@@ -67182,7 +67427,7 @@ in
sources."is-glob-3.1.0"
];
})
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."has-value-1.0.0"
(sources."has-values-1.0.0" // {
dependencies = [
@@ -67221,8 +67466,8 @@ in
sources."map-visit-1.0.0"
sources."micromatch-3.1.10"
sources."mime-1.6.0"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."mixin-deep-1.3.2"
sources."morgan-1.10.0"
sources."ms-2.0.0"
@@ -67536,7 +67781,7 @@ in
sources."github-slugger-1.3.0"
sources."glob-base-0.3.0"
sources."glob-parent-2.0.0"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
(sources."has-binary2-1.0.3" // {
@@ -67624,8 +67869,8 @@ in
sources."methods-1.1.2"
sources."micromatch-2.3.11"
sources."mime-1.6.0"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."minimist-1.2.5"
(sources."mixin-deep-1.3.2" // {
dependencies = [
@@ -67886,7 +68131,7 @@ in
sources."uuid-3.4.0"
sources."vary-1.1.2"
sources."verror-1.10.0"
- sources."ws-7.2.3"
+ sources."ws-7.2.5"
sources."xmlhttprequest-ssl-1.5.5"
sources."yeast-0.1.2"
];
@@ -67907,13 +68152,13 @@ in
src = ../interpreters/clojurescript/lumo;
dependencies = [
sources."@babel/code-frame-7.8.3"
- sources."@babel/compat-data-7.9.0"
- sources."@babel/core-7.9.0"
- sources."@babel/generator-7.9.5"
+ sources."@babel/compat-data-7.9.6"
+ sources."@babel/core-7.9.6"
+ sources."@babel/generator-7.9.6"
sources."@babel/helper-annotate-as-pure-7.8.3"
sources."@babel/helper-builder-binary-assignment-operator-visitor-7.8.3"
- sources."@babel/helper-compilation-targets-7.8.7"
- sources."@babel/helper-create-class-features-plugin-7.9.5"
+ sources."@babel/helper-compilation-targets-7.9.6"
+ sources."@babel/helper-create-class-features-plugin-7.9.6"
sources."@babel/helper-create-regexp-features-plugin-7.8.8"
sources."@babel/helper-define-map-7.8.3"
sources."@babel/helper-explode-assignable-expression-7.8.3"
@@ -67927,18 +68172,18 @@ in
sources."@babel/helper-plugin-utils-7.8.3"
sources."@babel/helper-regex-7.8.3"
sources."@babel/helper-remap-async-to-generator-7.8.3"
- sources."@babel/helper-replace-supers-7.8.6"
+ sources."@babel/helper-replace-supers-7.9.6"
sources."@babel/helper-simple-access-7.8.3"
sources."@babel/helper-split-export-declaration-7.8.3"
sources."@babel/helper-validator-identifier-7.9.5"
sources."@babel/helper-wrap-function-7.8.3"
- sources."@babel/helpers-7.9.2"
+ sources."@babel/helpers-7.9.6"
(sources."@babel/highlight-7.9.0" // {
dependencies = [
sources."chalk-2.4.2"
];
})
- sources."@babel/parser-7.9.4"
+ sources."@babel/parser-7.9.6"
sources."@babel/plugin-external-helpers-7.8.3"
sources."@babel/plugin-proposal-async-generator-functions-7.8.3"
sources."@babel/plugin-proposal-class-properties-7.8.3"
@@ -67946,7 +68191,7 @@ in
sources."@babel/plugin-proposal-json-strings-7.8.3"
sources."@babel/plugin-proposal-nullish-coalescing-operator-7.8.3"
sources."@babel/plugin-proposal-numeric-separator-7.8.3"
- sources."@babel/plugin-proposal-object-rest-spread-7.9.5"
+ sources."@babel/plugin-proposal-object-rest-spread-7.9.6"
sources."@babel/plugin-proposal-optional-catch-binding-7.8.3"
sources."@babel/plugin-proposal-optional-chaining-7.9.0"
sources."@babel/plugin-proposal-unicode-property-regex-7.8.8"
@@ -67976,9 +68221,9 @@ in
sources."@babel/plugin-transform-function-name-7.8.3"
sources."@babel/plugin-transform-literals-7.8.3"
sources."@babel/plugin-transform-member-expression-literals-7.8.3"
- sources."@babel/plugin-transform-modules-amd-7.9.0"
- sources."@babel/plugin-transform-modules-commonjs-7.9.0"
- sources."@babel/plugin-transform-modules-systemjs-7.9.0"
+ sources."@babel/plugin-transform-modules-amd-7.9.6"
+ sources."@babel/plugin-transform-modules-commonjs-7.9.6"
+ sources."@babel/plugin-transform-modules-systemjs-7.9.6"
sources."@babel/plugin-transform-modules-umd-7.9.0"
sources."@babel/plugin-transform-named-capturing-groups-regex-7.8.3"
sources."@babel/plugin-transform-new-target-7.8.3"
@@ -67987,20 +68232,20 @@ in
sources."@babel/plugin-transform-property-literals-7.8.3"
sources."@babel/plugin-transform-regenerator-7.8.7"
sources."@babel/plugin-transform-reserved-words-7.8.3"
- sources."@babel/plugin-transform-runtime-7.9.0"
+ sources."@babel/plugin-transform-runtime-7.9.6"
sources."@babel/plugin-transform-shorthand-properties-7.8.3"
sources."@babel/plugin-transform-spread-7.8.3"
sources."@babel/plugin-transform-sticky-regex-7.8.3"
sources."@babel/plugin-transform-template-literals-7.8.3"
sources."@babel/plugin-transform-typeof-symbol-7.8.4"
sources."@babel/plugin-transform-unicode-regex-7.8.3"
- sources."@babel/preset-env-7.9.5"
+ sources."@babel/preset-env-7.9.6"
sources."@babel/preset-modules-0.1.3"
sources."@babel/preset-stage-2-7.8.3"
- sources."@babel/runtime-7.9.2"
+ sources."@babel/runtime-7.9.6"
sources."@babel/template-7.8.6"
- sources."@babel/traverse-7.9.5"
- sources."@babel/types-7.9.5"
+ sources."@babel/traverse-7.9.6"
+ sources."@babel/types-7.9.6"
sources."@cnakazawa/watch-1.0.4"
sources."@comandeer/babel-plugin-banner-5.0.0"
(sources."@istanbuljs/load-nyc-config-1.0.0" // {
@@ -68014,22 +68259,23 @@ in
];
})
sources."@istanbuljs/schema-0.1.2"
- (sources."@jest/transform-25.4.0" // {
+ (sources."@jest/transform-25.5.1" // {
dependencies = [
sources."source-map-0.6.1"
];
})
- sources."@jest/types-25.4.0"
+ sources."@jest/types-25.5.0"
sources."@types/babel__core-7.1.7"
sources."@types/babel__generator-7.6.1"
sources."@types/babel__template-7.0.2"
- sources."@types/babel__traverse-7.0.10"
+ sources."@types/babel__traverse-7.0.11"
sources."@types/color-name-1.1.1"
sources."@types/estree-0.0.44"
+ sources."@types/graceful-fs-4.1.3"
sources."@types/istanbul-lib-coverage-2.0.1"
sources."@types/istanbul-lib-report-3.0.0"
sources."@types/istanbul-reports-1.1.1"
- sources."@types/node-13.13.2"
+ sources."@types/node-13.13.4"
sources."@types/normalize-package-data-2.4.0"
sources."@types/resolve-0.0.8"
sources."@types/yargs-15.0.4"
@@ -68098,7 +68344,7 @@ in
sources."babel-helper-mark-eval-scopes-0.4.3"
sources."babel-helper-remove-or-void-0.4.3"
sources."babel-helper-to-multiple-sequence-expressions-0.5.0"
- sources."babel-jest-25.4.0"
+ sources."babel-jest-25.5.1"
(sources."babel-loader-8.1.0" // {
dependencies = [
sources."mkdirp-0.5.5"
@@ -68106,7 +68352,7 @@ in
})
sources."babel-plugin-dynamic-import-node-2.3.3"
sources."babel-plugin-istanbul-6.0.0"
- sources."babel-plugin-jest-hoist-25.4.0"
+ sources."babel-plugin-jest-hoist-25.5.0"
sources."babel-plugin-minify-builtins-0.5.0"
sources."babel-plugin-minify-constant-folding-0.5.0"
sources."babel-plugin-minify-dead-code-elimination-0.5.1"
@@ -68132,7 +68378,7 @@ in
sources."babel-plugin-transform-simplify-comparison-operators-6.9.4"
sources."babel-plugin-transform-undefined-to-void-6.9.4"
sources."babel-preset-current-node-syntax-0.1.2"
- sources."babel-preset-jest-25.4.0"
+ sources."babel-preset-jest-25.5.0"
sources."babel-preset-minify-0.5.1"
(sources."babel-runtime-6.26.0" // {
dependencies = [
@@ -68197,7 +68443,7 @@ in
sources."cache-base-1.0.1"
sources."cached-path-relative-1.0.2"
sources."camelcase-5.3.1"
- sources."caniuse-lite-1.0.30001046"
+ sources."caniuse-lite-1.0.30001050"
sources."capture-exit-2.0.0"
sources."caseless-0.12.0"
(sources."chalk-3.0.0" // {
@@ -68314,7 +68560,7 @@ in
sources."duplexer2-0.1.4"
sources."duplexify-3.7.1"
sources."ecc-jsbn-0.1.2"
- sources."electron-to-chromium-1.3.415"
+ sources."electron-to-chromium-1.3.427"
sources."elliptic-6.5.2"
sources."emoji-regex-7.0.3"
sources."emojis-list-3.0.0"
@@ -68431,7 +68677,7 @@ in
})
sources."globals-11.12.0"
sources."google-closure-compiler-js-20170910.0.1"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
(sources."gunzip-maybe-1.4.2" // {
dependencies = [
sources."browserify-zlib-0.1.4"
@@ -68449,7 +68695,12 @@ in
sources."kind-of-4.0.0"
];
})
- sources."hash-base-3.0.4"
+ (sources."hash-base-3.1.0" // {
+ dependencies = [
+ sources."readable-stream-3.6.0"
+ sources."safe-buffer-5.2.0"
+ ];
+ })
sources."hash.js-1.1.7"
sources."hmac-drbg-1.0.1"
sources."homedir-polyfill-1.0.3"
@@ -68509,11 +68760,11 @@ in
sources."semver-6.3.0"
];
})
- sources."jest-haste-map-25.4.0"
+ sources."jest-haste-map-25.5.1"
sources."jest-regex-util-25.2.6"
- sources."jest-serializer-25.2.6"
- sources."jest-util-25.4.0"
- (sources."jest-worker-25.4.0" // {
+ sources."jest-serializer-25.5.0"
+ sources."jest-util-25.5.0"
+ (sources."jest-worker-25.5.0" // {
dependencies = [
sources."has-flag-4.0.0"
sources."supports-color-7.1.0"
@@ -68532,7 +68783,7 @@ in
sources."jsonify-0.0.0"
sources."jsonparse-1.3.1"
sources."jsprim-1.4.1"
- sources."jszip-git://github.com/anmonteiro/jszip#patch-1"
+ sources."jszip-2.6.1"
sources."kind-of-6.0.3"
sources."labeled-stream-splicer-2.0.2"
sources."lcid-2.0.0"
@@ -68573,8 +68824,8 @@ in
];
})
sources."miller-rabin-4.0.1"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."mimic-fn-2.1.0"
sources."minimalistic-assert-1.0.1"
sources."minimalistic-crypto-utils-1.0.1"
@@ -68587,7 +68838,7 @@ in
];
})
sources."mkdirp-1.0.4"
- sources."mkdirp-classic-0.5.2"
+ sources."mkdirp-classic-0.5.3"
sources."module-deps-6.2.2"
(sources."move-concurrently-1.0.1" // {
dependencies = [
@@ -68731,7 +68982,7 @@ in
sources."remove-trailing-separator-1.1.0"
sources."repeat-element-1.1.3"
sources."repeat-string-1.6.1"
- sources."replace-ext-1.0.0"
+ sources."replace-ext-1.0.1"
sources."request-2.88.2"
sources."require-directory-2.1.1"
sources."require-main-filename-2.0.0"
@@ -68823,7 +69074,7 @@ in
sources."source-list-map-0.1.8"
sources."source-map-0.5.7"
sources."source-map-resolve-0.5.3"
- (sources."source-map-support-0.5.18" // {
+ (sources."source-map-support-0.5.19" // {
dependencies = [
sources."source-map-0.6.1"
];
@@ -68882,7 +69133,7 @@ in
sources."readable-stream-3.6.0"
];
})
- (sources."terser-4.6.11" // {
+ (sources."terser-4.6.13" // {
dependencies = [
sources."source-map-0.6.1"
];
@@ -69081,7 +69332,7 @@ in
sources."color-convert-2.0.1"
sources."color-name-1.1.4"
sources."combined-stream-1.0.8"
- sources."commander-5.0.0"
+ sources."commander-5.1.0"
sources."core-util-is-1.0.2"
sources."dashdash-1.14.1"
sources."delayed-stream-1.0.0"
@@ -69111,8 +69362,8 @@ in
sources."lodash-4.17.15"
sources."markdown-link-extractor-1.2.3"
sources."marked-0.8.2"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."ms-2.1.2"
sources."oauth-sign-0.9.0"
sources."performance-now-2.1.0"
@@ -69442,7 +69693,7 @@ in
sources."fragment-cache-0.2.1"
(sources."fs-mkdirp-stream-1.0.0" // {
dependencies = [
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."readable-stream-2.3.7"
sources."string_decoder-1.1.1"
sources."through2-2.0.5"
@@ -69497,7 +69748,7 @@ in
})
(sources."gulp-sourcemaps-2.6.5" // {
dependencies = [
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."readable-stream-2.3.7"
sources."source-map-0.6.1"
sources."string_decoder-1.1.1"
@@ -69514,7 +69765,7 @@ in
sources."extend-shallow-1.1.4"
sources."glob-7.1.6"
sources."glob-stream-6.1.0"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."kind-of-1.1.0"
sources."minimatch-3.0.4"
sources."ordered-read-streams-1.0.1"
@@ -69582,7 +69833,7 @@ in
];
})
sources."is-plain-object-2.0.4"
- sources."is-promise-2.1.0"
+ sources."is-promise-2.2.2"
sources."is-relative-1.0.0"
sources."is-typedarray-1.0.0"
sources."is-unc-path-1.0.0"
@@ -69615,7 +69866,7 @@ in
sources."lead-1.0.0"
(sources."less-2.7.3" // {
dependencies = [
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
];
})
sources."liftoff-2.5.0"
@@ -69654,8 +69905,8 @@ in
sources."memoizee-0.4.14"
sources."micromatch-3.1.10"
sources."mime-1.6.0"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."minimatch-2.0.10"
sources."minimist-1.2.5"
(sources."mixin-deep-1.3.2" // {
@@ -69742,7 +69993,7 @@ in
sources."remove-trailing-separator-1.1.0"
sources."repeat-element-1.1.3"
sources."repeat-string-1.6.1"
- sources."replace-ext-1.0.0"
+ sources."replace-ext-1.0.1"
sources."request-2.81.0"
sources."resolve-1.17.0"
sources."resolve-dir-1.0.1"
@@ -69856,7 +70107,7 @@ in
sources."tweetnacl-0.14.5"
sources."type-1.2.0"
sources."typescript-3.8.3"
- sources."uglify-js-3.9.1"
+ sources."uglify-js-3.9.2"
sources."uglify-to-browserify-1.0.2"
sources."unc-path-regex-0.1.2"
sources."union-value-1.0.1"
@@ -69893,7 +70144,7 @@ in
dependencies = [
sources."clone-2.1.2"
sources."clone-stats-1.0.0"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."vinyl-2.2.0"
];
})
@@ -69919,10 +70170,10 @@ in
mocha = nodeEnv.buildNodePackage {
name = "mocha";
packageName = "mocha";
- version = "7.1.1";
+ version = "7.1.2";
src = fetchurl {
- url = "https://registry.npmjs.org/mocha/-/mocha-7.1.1.tgz";
- sha512 = "3qQsu3ijNS3GkWcccT5Zw0hf/rWvu1fTN9sPvEd81hlwsr30GX2GcDSSoBxo24IR8FelmrAydGC6/1J5QQP4WA==";
+ url = "https://registry.npmjs.org/mocha/-/mocha-7.1.2.tgz";
+ sha512 = "o96kdRKMKI3E8U0bjnfqW4QMk12MwZ4mhdBTf+B5a1q9+aq2HRnj+3ZdJu0B/ZhJeK78MgYuv6L8d/rA5AeBJA==";
};
dependencies = [
sources."ansi-colors-3.2.3"
@@ -69994,7 +70245,7 @@ in
sources."log-symbols-3.0.0"
sources."minimatch-3.0.4"
sources."minimist-1.2.5"
- sources."mkdirp-0.5.3"
+ sources."mkdirp-0.5.5"
sources."ms-2.1.1"
sources."node-environment-flags-1.0.6"
sources."normalize-path-3.0.0"
@@ -70090,14 +70341,14 @@ in
sources."lodash-4.17.15"
sources."methods-1.1.2"
sources."mime-1.6.0"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."ms-2.1.2"
sources."native-promise-only-0.8.1"
sources."path-loader-1.0.10"
sources."process-nextick-args-2.0.1"
sources."punycode-2.1.1"
- sources."qs-6.9.3"
+ sources."qs-6.9.4"
sources."readable-stream-2.3.7"
sources."safe-buffer-5.1.2"
sources."slash-3.0.0"
@@ -70247,7 +70498,7 @@ in
sources."gauge-2.7.4"
sources."getpass-0.1.7"
sources."glob-7.1.6"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
sources."has-unicode-2.0.1"
@@ -70264,8 +70515,8 @@ in
sources."json-schema-traverse-0.4.1"
sources."json-stringify-safe-5.0.1"
sources."jsprim-1.4.1"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."minimatch-3.0.4"
sources."minimist-1.2.5"
sources."minipass-2.9.0"
@@ -70324,10 +70575,10 @@ in
node-gyp-build = nodeEnv.buildNodePackage {
name = "node-gyp-build";
packageName = "node-gyp-build";
- version = "4.2.1";
+ version = "4.2.2";
src = fetchurl {
- url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.1.tgz";
- sha512 = "XyCKXsqZfLqHep1hhsMncoXuUNt/cXCjg1+8CLbu69V1TKuPiOeSGbL9n+k/ByKH8UT0p4rdIX8XkTRZV0i7Sw==";
+ url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.2.tgz";
+ sha512 = "Lqh7mrByWCM8Cf9UPqpeoVBBo5Ugx+RKu885GAzmLBVYjeywScxHXPGLa4JfYNZmcNGwzR0Glu5/9GaQZMFqyA==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -70431,7 +70682,7 @@ in
];
})
sources."glob-5.0.15"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."har-schema-1.0.5"
sources."har-validator-4.2.1"
sources."has-unicode-2.0.1"
@@ -70476,8 +70727,8 @@ in
sources."merge-descriptors-1.0.1"
sources."methods-1.1.2"
sources."mime-1.6.0"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."minimatch-3.0.4"
sources."minimist-1.2.5"
sources."mkdirp-0.5.5"
@@ -70722,16 +70973,16 @@ in
node-red = nodeEnv.buildNodePackage {
name = "node-red";
packageName = "node-red";
- version = "1.0.5";
+ version = "1.0.6";
src = fetchurl {
- url = "https://registry.npmjs.org/node-red/-/node-red-1.0.5.tgz";
- sha512 = "va9ovLft0HDG0//KGwLU+4r4ZtUpQ8qPmH/FasnJUURROqeTcQpAd49T/3FtJuapJQML5ulSKL6jeD57DDMiyA==";
+ url = "https://registry.npmjs.org/node-red/-/node-red-1.0.6.tgz";
+ sha512 = "5K7LKdy232xLSHMo3ZprAEHbLilszSD/qQkt+9PxByJnEMACeHJ7SH4Gpt/1FX+K75gHHNtlnHsWwpQ53lggEA==";
};
dependencies = [
- sources."@babel/runtime-7.9.2"
- sources."@node-red/editor-api-1.0.5"
- sources."@node-red/editor-client-1.0.5"
- (sources."@node-red/nodes-1.0.5" // {
+ sources."@babel/runtime-7.9.6"
+ sources."@node-red/editor-api-1.0.6"
+ sources."@node-red/editor-client-1.0.6"
+ (sources."@node-red/nodes-1.0.6" // {
dependencies = [
sources."http-errors-1.7.3"
sources."iconv-lite-0.5.1"
@@ -70744,9 +70995,9 @@ in
})
];
})
- sources."@node-red/registry-1.0.5"
- sources."@node-red/runtime-1.0.5"
- sources."@node-red/util-1.0.5"
+ sources."@node-red/registry-1.0.6"
+ sources."@node-red/runtime-1.0.6"
+ sources."@node-red/util-1.0.6"
sources."abbrev-1.1.1"
sources."accepts-1.3.7"
(sources."agent-base-6.0.0" // {
@@ -70845,7 +71096,7 @@ in
sources."cookie-signature-1.0.6"
sources."core-util-is-1.0.2"
sources."cors-2.8.5"
- sources."cron-1.8.2"
+ sources."cron-1.7.2"
sources."css-select-1.2.0"
sources."css-what-2.1.3"
sources."d-1.0.1"
@@ -70933,7 +71184,7 @@ in
sources."string_decoder-1.1.1"
];
})
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
sources."has-unicode-2.0.1"
@@ -70973,7 +71224,7 @@ in
sources."json-schema-traverse-0.4.1"
sources."json-stable-stringify-without-jsonify-1.0.1"
sources."json-stringify-safe-5.0.1"
- sources."jsonata-1.8.2"
+ sources."jsonata-1.8.3"
sources."jsonfile-4.0.0"
sources."jsprim-1.4.1"
sources."leven-2.1.0"
@@ -70999,8 +71250,8 @@ in
sources."merge-descriptors-1.0.1"
sources."methods-1.1.2"
sources."mime-2.4.4"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."minimatch-3.0.4"
sources."minimist-1.2.5"
(sources."minipass-2.9.0" // {
@@ -71010,7 +71261,7 @@ in
})
sources."minizlib-1.3.3"
sources."mkdirp-0.5.5"
- sources."moment-2.24.0"
+ sources."moment-2.25.3"
sources."moment-timezone-0.5.28"
(sources."mqtt-2.18.8" // {
dependencies = [
@@ -71228,7 +71479,7 @@ in
sources."buffer-from-1.1.1"
sources."builtins-1.0.3"
sources."caseless-0.12.0"
- sources."chownr-1.1.4"
+ sources."chownr-2.0.0"
sources."code-point-at-1.1.0"
sources."combined-stream-1.0.8"
sources."concat-map-0.0.1"
@@ -71264,7 +71515,7 @@ in
sources."gauge-2.7.4"
sources."getpass-0.1.7"
sources."glob-7.1.6"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
sources."has-unicode-2.0.1"
@@ -71283,8 +71534,8 @@ in
sources."json-stringify-safe-5.0.1"
sources."jsonfile-1.0.1"
sources."jsprim-1.4.1"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."minimatch-3.0.4"
sources."minimist-1.2.5"
sources."minipass-3.1.1"
@@ -71360,7 +71611,7 @@ in
];
})
sources."strip-ansi-3.0.1"
- (sources."tar-6.0.1" // {
+ (sources."tar-6.0.2" // {
dependencies = [
sources."mkdirp-1.0.4"
];
@@ -71431,7 +71682,7 @@ in
sources."supports-color-7.1.0"
];
})
- sources."chokidar-3.3.1"
+ sources."chokidar-3.4.0"
sources."ci-info-2.0.0"
sources."cli-boxes-2.2.0"
sources."clone-response-1.0.2"
@@ -71455,7 +71706,7 @@ in
sources."glob-parent-5.1.1"
sources."global-dirs-2.0.1"
sources."got-9.6.0"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."has-flag-3.0.0"
sources."has-yarn-2.1.0"
sources."http-cache-semantics-4.1.0"
@@ -71504,7 +71755,7 @@ in
sources."pump-3.0.0"
sources."pupa-2.0.1"
sources."rc-1.2.8"
- sources."readdirp-3.3.0"
+ sources."readdirp-3.4.0"
sources."registry-auth-token-4.1.1"
sources."registry-url-5.1.0"
sources."responselike-1.0.2"
@@ -71559,10 +71810,10 @@ in
npm = nodeEnv.buildNodePackage {
name = "npm";
packageName = "npm";
- version = "6.14.4";
+ version = "6.14.5";
src = fetchurl {
- url = "https://registry.npmjs.org/npm/-/npm-6.14.4.tgz";
- sha512 = "B8UDDbWvdkW6RgXFn8/h2cHJP/u/FPa4HWeGzW23aNEBARN3QPrRaHqPIZW2NSN3fW649gtgUDNZpaRs0zTMPw==";
+ url = "https://registry.npmjs.org/npm/-/npm-6.14.5.tgz";
+ sha512 = "CDwa3FJd0XJpKDbWCST484H+mCNjF26dPrU+xnREW+upR0UODjMEfXPl3bxWuAwZIX6c2ASg1plLO7jP8ehWeA==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -71584,19 +71835,23 @@ in
};
dependencies = [
sources."@npmcli/ci-detect-1.2.0"
- sources."@npmcli/git-2.0.1"
+ sources."@npmcli/git-2.0.2"
sources."@npmcli/installed-package-contents-1.0.5"
sources."@npmcli/promise-spawn-1.2.0"
+ sources."@npmcli/run-script-1.3.1"
sources."@sindresorhus/is-0.14.0"
sources."@szmarczak/http-timer-1.1.2"
sources."@tootallnate/once-1.1.2"
sources."@types/color-name-1.1.1"
+ sources."abbrev-1.1.1"
sources."agent-base-6.0.0"
- sources."agentkeepalive-4.1.0"
+ sources."agentkeepalive-4.1.2"
sources."aggregate-error-3.0.1"
+ sources."ajv-6.12.2"
(sources."ansi-align-3.0.0" // {
dependencies = [
sources."ansi-regex-4.1.0"
+ sources."is-fullwidth-code-point-2.0.0"
sources."string-width-3.1.0"
sources."strip-ansi-5.2.0"
];
@@ -71604,17 +71859,28 @@ in
sources."ansi-regex-2.1.1"
sources."ansi-styles-4.2.1"
sources."aproba-1.2.0"
+ sources."are-we-there-yet-1.1.5"
sources."argparse-1.0.10"
sources."asap-2.0.6"
+ sources."asn1-0.2.4"
+ sources."assert-plus-1.0.0"
+ sources."asynckit-0.4.0"
+ sources."aws-sign2-0.7.0"
+ sources."aws4-1.9.1"
sources."balanced-match-1.0.0"
- sources."boxen-4.2.0"
- sources."brace-expansion-1.1.11"
- sources."builtins-1.0.3"
- (sources."cacache-15.0.0" // {
+ sources."bcrypt-pbkdf-1.0.2"
+ (sources."boxen-4.2.0" // {
dependencies = [
- sources."p-map-3.0.0"
+ sources."ansi-regex-5.0.0"
+ sources."emoji-regex-8.0.0"
+ sources."is-fullwidth-code-point-3.0.0"
+ sources."string-width-4.2.0"
+ sources."strip-ansi-6.0.0"
];
})
+ sources."brace-expansion-1.1.11"
+ sources."builtins-1.0.3"
+ sources."cacache-15.0.3"
(sources."cacheable-request-6.1.0" // {
dependencies = [
sources."get-stream-5.1.0"
@@ -71622,65 +71888,79 @@ in
];
})
sources."camelcase-5.3.1"
+ sources."caseless-0.12.0"
sources."chalk-3.0.0"
- sources."chownr-1.1.4"
+ sources."chownr-2.0.0"
sources."ci-info-2.0.0"
sources."cint-8.2.1"
sources."clean-stack-2.2.0"
sources."cli-boxes-2.2.0"
sources."cli-table-0.3.1"
sources."clone-response-1.0.2"
+ sources."code-point-at-1.1.0"
sources."color-convert-2.0.1"
sources."color-name-1.1.4"
sources."colors-1.0.3"
- sources."commander-5.0.0"
+ sources."combined-stream-1.0.8"
+ sources."commander-5.1.0"
sources."concat-map-0.0.1"
sources."configstore-5.0.1"
- (sources."copy-concurrently-1.0.5" // {
- dependencies = [
- sources."mkdirp-0.5.5"
- ];
- })
+ sources."console-control-strings-1.1.0"
sources."core-util-is-1.0.2"
sources."crypto-random-string-2.0.0"
+ sources."dashdash-1.14.1"
sources."debug-4.1.1"
sources."debuglog-1.0.1"
sources."decompress-response-3.3.0"
sources."deep-extend-0.6.0"
sources."defer-to-connect-1.1.3"
+ sources."delayed-stream-1.0.0"
+ sources."delegates-1.0.0"
sources."depd-1.1.2"
sources."dezalgo-1.0.3"
sources."dot-prop-5.2.0"
sources."duplexer3-0.1.4"
+ sources."ecc-jsbn-0.1.2"
sources."emoji-regex-7.0.3"
sources."encoding-0.1.12"
sources."end-of-stream-1.4.4"
+ sources."env-paths-2.2.0"
sources."err-code-1.1.2"
sources."escape-goat-2.1.1"
sources."escape-string-regexp-1.0.5"
sources."esprima-4.0.1"
+ sources."extend-3.0.2"
+ sources."extsprintf-1.3.0"
+ sources."fast-deep-equal-3.1.1"
sources."fast-diff-1.2.0"
+ sources."fast-json-stable-stringify-2.1.0"
sources."figgy-pudding-3.5.2"
sources."find-up-4.1.0"
+ sources."forever-agent-0.6.1"
+ sources."form-data-2.3.3"
sources."fs-minipass-2.1.0"
- sources."fs-write-stream-atomic-1.0.10"
sources."fs.realpath-1.0.0"
+ sources."gauge-2.7.4"
sources."get-stdin-7.0.0"
sources."get-stream-4.1.0"
+ sources."getpass-0.1.7"
sources."glob-7.1.6"
sources."global-dirs-2.0.1"
sources."got-9.6.0"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
+ sources."har-schema-2.0.0"
+ sources."har-validator-5.1.3"
sources."has-ansi-2.0.0"
sources."has-flag-4.0.0"
+ sources."has-unicode-2.0.1"
sources."has-yarn-2.1.0"
sources."hosted-git-info-3.0.4"
sources."http-cache-semantics-4.1.0"
sources."http-proxy-agent-4.0.1"
+ sources."http-signature-1.2.0"
sources."https-proxy-agent-5.0.0"
sources."humanize-ms-1.2.1"
sources."iconv-lite-0.4.24"
- sources."iferr-0.1.5"
sources."ignore-walk-3.0.3"
sources."import-lazy-2.1.0"
sources."imurmurhash-0.1.4"
@@ -71691,7 +71971,7 @@ in
sources."ini-1.3.5"
sources."ip-1.1.5"
sources."is-ci-2.0.0"
- sources."is-fullwidth-code-point-2.0.0"
+ sources."is-fullwidth-code-point-1.0.0"
sources."is-installed-globally-0.3.2"
sources."is-lambda-1.0.1"
sources."is-npm-4.0.0"
@@ -71701,13 +71981,19 @@ in
sources."is-yarn-global-0.3.0"
sources."isarray-1.0.0"
sources."isexe-2.0.0"
+ sources."isstream-0.1.2"
sources."jju-1.4.0"
sources."js-yaml-3.13.1"
+ sources."jsbn-0.1.1"
sources."json-buffer-3.0.0"
sources."json-parse-even-better-errors-2.2.0"
sources."json-parse-helpfulerror-1.0.3"
+ sources."json-schema-0.2.3"
+ sources."json-schema-traverse-0.4.1"
+ sources."json-stringify-safe-5.0.1"
sources."json5-2.1.3"
sources."jsonparse-1.3.1"
+ sources."jsprim-1.4.1"
sources."keyv-3.1.0"
sources."kleur-3.0.3"
sources."latest-version-5.1.0"
@@ -71728,7 +72014,9 @@ in
sources."semver-6.3.0"
];
})
- sources."make-fetch-happen-8.0.4"
+ sources."make-fetch-happen-8.0.6"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."mimic-response-1.0.1"
sources."minimatch-3.0.4"
sources."minimist-1.2.5"
@@ -71738,22 +72026,23 @@ in
];
})
sources."minipass-collect-1.0.2"
- sources."minipass-fetch-1.2.1"
+ (sources."minipass-fetch-1.2.1" // {
+ dependencies = [
+ sources."minizlib-2.1.0"
+ sources."yallist-4.0.0"
+ ];
+ })
sources."minipass-flush-1.0.5"
sources."minipass-json-stream-1.0.1"
sources."minipass-pipeline-1.2.2"
sources."minipass-sized-1.0.3"
- (sources."minizlib-2.1.0" // {
+ (sources."minizlib-1.3.3" // {
dependencies = [
- sources."yallist-4.0.0"
+ sources."minipass-2.9.0"
];
})
sources."mkdirp-1.0.4"
- (sources."move-concurrently-1.0.1" // {
- dependencies = [
- sources."mkdirp-0.5.5"
- ];
- })
+ sources."move-file-2.0.0"
sources."ms-2.1.2"
sources."nested-error-stacks-2.0.1"
(sources."node-alias-1.0.4" // {
@@ -71763,6 +72052,19 @@ in
sources."supports-color-2.0.0"
];
})
+ (sources."node-gyp-6.1.0" // {
+ dependencies = [
+ sources."chownr-1.1.4"
+ sources."fs-minipass-1.2.7"
+ sources."minipass-2.9.0"
+ sources."mkdirp-0.5.5"
+ sources."rimraf-2.7.1"
+ sources."semver-5.7.1"
+ sources."tar-4.4.13"
+ sources."which-1.3.1"
+ ];
+ })
+ sources."nopt-4.0.3"
sources."normalize-url-4.5.0"
sources."npm-bundled-1.1.1"
sources."npm-install-checks-4.0.0"
@@ -71770,8 +72072,20 @@ in
sources."npm-package-arg-8.0.1"
sources."npm-packlist-2.1.1"
sources."npm-pick-manifest-6.1.0"
- sources."npm-registry-fetch-8.0.0"
+ (sources."npm-registry-fetch-8.0.2" // {
+ dependencies = [
+ sources."minizlib-2.1.0"
+ sources."yallist-4.0.0"
+ ];
+ })
+ sources."npmlog-4.1.2"
+ sources."number-is-nan-1.0.1"
+ sources."oauth-sign-0.9.0"
+ sources."object-assign-4.1.1"
sources."once-1.4.0"
+ sources."os-homedir-1.0.2"
+ sources."os-tmpdir-1.0.2"
+ sources."osenv-0.1.5"
sources."p-cancelable-1.1.0"
sources."p-limit-2.3.0"
sources."p-locate-4.1.0"
@@ -71782,18 +72096,22 @@ in
sources."semver-6.3.0"
];
})
- sources."pacote-11.1.4"
+ sources."pacote-11.1.8"
sources."path-exists-4.0.0"
sources."path-is-absolute-1.0.1"
sources."path-parse-1.0.6"
+ sources."performance-now-2.1.0"
sources."prepend-http-2.0.0"
sources."process-nextick-args-2.0.1"
sources."progress-2.0.3"
sources."promise-inflight-1.0.1"
sources."promise-retry-1.1.1"
sources."prompts-2.3.2"
+ sources."psl-1.8.0"
sources."pump-3.0.0"
+ sources."punycode-2.1.1"
sources."pupa-2.0.1"
+ sources."qs-6.5.2"
sources."rc-1.2.8"
sources."rc-config-loader-3.0.0"
sources."read-package-json-fast-1.1.3"
@@ -71801,13 +72119,13 @@ in
sources."readdir-scoped-modules-1.1.0"
sources."registry-auth-token-4.1.1"
sources."registry-url-5.1.0"
+ sources."request-2.88.2"
sources."require-from-string-2.0.2"
sources."requireg-0.2.2"
sources."resolve-1.7.1"
sources."responselike-1.0.2"
sources."retry-0.10.1"
- sources."rimraf-2.7.1"
- sources."run-queue-1.0.3"
+ sources."rimraf-3.0.2"
sources."safe-buffer-5.1.2"
sources."safer-buffer-2.1.2"
sources."semver-7.3.2"
@@ -71817,6 +72135,7 @@ in
];
})
sources."semver-utils-1.1.4"
+ sources."set-blocking-2.0.0"
sources."signal-exit-3.0.3"
sources."sisteransi-1.0.5"
sources."smart-buffer-4.1.0"
@@ -71824,37 +72143,47 @@ in
sources."socks-proxy-agent-5.0.0"
sources."spawn-please-0.3.0"
sources."sprintf-js-1.0.3"
+ sources."sshpk-1.16.1"
sources."ssri-8.0.0"
- (sources."string-width-4.2.0" // {
- dependencies = [
- sources."ansi-regex-5.0.0"
- sources."emoji-regex-8.0.0"
- sources."is-fullwidth-code-point-3.0.0"
- sources."strip-ansi-6.0.0"
- ];
- })
+ sources."string-width-1.0.2"
sources."string_decoder-1.1.1"
sources."strip-ansi-3.0.1"
sources."strip-json-comments-2.0.1"
sources."supports-color-7.1.0"
- (sources."tar-6.0.1" // {
+ (sources."tar-6.0.2" // {
dependencies = [
+ sources."minizlib-2.1.0"
sources."yallist-4.0.0"
];
})
sources."term-size-2.2.0"
sources."to-readable-stream-1.0.0"
+ sources."tough-cookie-2.5.0"
+ sources."tunnel-agent-0.6.0"
+ sources."tweetnacl-0.14.5"
sources."type-fest-0.8.1"
sources."typedarray-to-buffer-3.1.5"
sources."unique-filename-1.1.1"
sources."unique-slug-2.0.2"
sources."unique-string-2.0.0"
sources."update-notifier-4.1.0"
+ sources."uri-js-4.2.2"
sources."url-parse-lax-3.0.0"
sources."util-deprecate-1.0.2"
+ sources."uuid-3.4.0"
sources."validate-npm-package-name-3.0.0"
+ sources."verror-1.10.0"
sources."which-2.0.2"
- sources."widest-line-3.1.0"
+ sources."wide-align-1.1.3"
+ (sources."widest-line-3.1.0" // {
+ dependencies = [
+ sources."ansi-regex-5.0.0"
+ sources."emoji-regex-8.0.0"
+ sources."is-fullwidth-code-point-3.0.0"
+ sources."string-width-4.2.0"
+ sources."strip-ansi-6.0.0"
+ ];
+ })
sources."wrappy-1.0.2"
sources."write-file-atomic-3.0.3"
sources."xdg-basedir-4.0.0"
@@ -71955,8 +72284,8 @@ in
sources."json-stringify-safe-5.0.1"
sources."jsonfile-1.0.1"
sources."jsprim-1.4.1"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."minimatch-3.0.4"
sources."minimist-1.2.5"
sources."mkdirp-0.3.5"
@@ -72095,14 +72424,14 @@ in
};
dependencies = [
sources."@babel/code-frame-7.8.3"
- sources."@babel/compat-data-7.9.0"
- (sources."@babel/core-7.9.0" // {
+ sources."@babel/compat-data-7.9.6"
+ (sources."@babel/core-7.9.6" // {
dependencies = [
sources."json5-2.1.3"
sources."source-map-0.5.7"
];
})
- (sources."@babel/generator-7.9.5" // {
+ (sources."@babel/generator-7.9.6" // {
dependencies = [
sources."source-map-0.5.7"
];
@@ -72111,7 +72440,7 @@ in
sources."@babel/helper-builder-binary-assignment-operator-visitor-7.8.3"
sources."@babel/helper-builder-react-jsx-7.9.0"
sources."@babel/helper-builder-react-jsx-experimental-7.9.5"
- sources."@babel/helper-compilation-targets-7.8.7"
+ sources."@babel/helper-compilation-targets-7.9.6"
sources."@babel/helper-create-regexp-features-plugin-7.8.8"
sources."@babel/helper-define-map-7.8.3"
sources."@babel/helper-explode-assignable-expression-7.8.3"
@@ -72125,20 +72454,20 @@ in
sources."@babel/helper-plugin-utils-7.8.3"
sources."@babel/helper-regex-7.8.3"
sources."@babel/helper-remap-async-to-generator-7.8.3"
- sources."@babel/helper-replace-supers-7.8.6"
+ sources."@babel/helper-replace-supers-7.9.6"
sources."@babel/helper-simple-access-7.8.3"
sources."@babel/helper-split-export-declaration-7.8.3"
sources."@babel/helper-validator-identifier-7.9.5"
sources."@babel/helper-wrap-function-7.8.3"
- sources."@babel/helpers-7.9.2"
+ sources."@babel/helpers-7.9.6"
sources."@babel/highlight-7.9.0"
- sources."@babel/parser-7.9.4"
+ sources."@babel/parser-7.9.6"
sources."@babel/plugin-proposal-async-generator-functions-7.8.3"
sources."@babel/plugin-proposal-dynamic-import-7.8.3"
sources."@babel/plugin-proposal-json-strings-7.8.3"
sources."@babel/plugin-proposal-nullish-coalescing-operator-7.8.3"
sources."@babel/plugin-proposal-numeric-separator-7.8.3"
- sources."@babel/plugin-proposal-object-rest-spread-7.9.5"
+ sources."@babel/plugin-proposal-object-rest-spread-7.9.6"
sources."@babel/plugin-proposal-optional-catch-binding-7.8.3"
sources."@babel/plugin-proposal-optional-chaining-7.9.0"
sources."@babel/plugin-proposal-unicode-property-regex-7.8.8"
@@ -72168,9 +72497,9 @@ in
sources."@babel/plugin-transform-function-name-7.8.3"
sources."@babel/plugin-transform-literals-7.8.3"
sources."@babel/plugin-transform-member-expression-literals-7.8.3"
- sources."@babel/plugin-transform-modules-amd-7.9.0"
- sources."@babel/plugin-transform-modules-commonjs-7.9.0"
- sources."@babel/plugin-transform-modules-systemjs-7.9.0"
+ sources."@babel/plugin-transform-modules-amd-7.9.6"
+ sources."@babel/plugin-transform-modules-commonjs-7.9.6"
+ sources."@babel/plugin-transform-modules-systemjs-7.9.6"
sources."@babel/plugin-transform-modules-umd-7.9.0"
sources."@babel/plugin-transform-named-capturing-groups-regex-7.8.3"
sources."@babel/plugin-transform-new-target-7.8.3"
@@ -72186,12 +72515,12 @@ in
sources."@babel/plugin-transform-template-literals-7.8.3"
sources."@babel/plugin-transform-typeof-symbol-7.8.4"
sources."@babel/plugin-transform-unicode-regex-7.8.3"
- sources."@babel/preset-env-7.9.5"
+ sources."@babel/preset-env-7.9.6"
sources."@babel/preset-modules-0.1.3"
- sources."@babel/runtime-7.9.2"
+ sources."@babel/runtime-7.9.6"
sources."@babel/template-7.8.6"
- sources."@babel/traverse-7.9.5"
- sources."@babel/types-7.9.5"
+ sources."@babel/traverse-7.9.6"
+ sources."@babel/types-7.9.6"
sources."@iarna/toml-2.2.5"
sources."@mrmlnc/readdir-enhanced-2.2.1"
sources."@nodelib/fs.stat-1.1.3"
@@ -72297,7 +72626,7 @@ in
sources."callsites-2.0.0"
sources."camelcase-5.3.1"
sources."caniuse-api-3.0.0"
- sources."caniuse-lite-1.0.30001046"
+ sources."caniuse-lite-1.0.30001050"
sources."caseless-0.12.0"
sources."chalk-2.4.2"
sources."chokidar-2.1.8"
@@ -72381,7 +72710,7 @@ in
sources."cssstyle-1.4.0"
sources."dashdash-1.14.1"
sources."data-urls-1.1.0"
- sources."deasync-0.1.19"
+ sources."deasync-0.1.20"
sources."debug-4.1.1"
sources."decamelize-1.2.0"
sources."decode-uri-component-0.2.0"
@@ -72430,12 +72759,12 @@ in
sources."duplexer2-0.1.4"
sources."ecc-jsbn-0.1.2"
sources."ee-first-1.1.1"
- sources."electron-to-chromium-1.3.415"
+ sources."electron-to-chromium-1.3.427"
sources."elliptic-6.5.2"
sources."emoji-regex-7.0.3"
sources."encodeurl-1.0.2"
sources."entities-1.1.2"
- sources."envinfo-7.5.0"
+ sources."envinfo-7.5.1"
sources."error-ex-1.3.2"
(sources."es-abstract-1.17.5" // {
dependencies = [
@@ -72498,7 +72827,7 @@ in
})
sources."glob-to-regexp-0.3.0"
sources."globals-11.12.0"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."grapheme-breaker-0.3.2"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
@@ -72516,7 +72845,12 @@ in
sources."kind-of-4.0.0"
];
})
- sources."hash-base-3.0.4"
+ (sources."hash-base-3.1.0" // {
+ dependencies = [
+ sources."readable-stream-3.6.0"
+ sources."safe-buffer-5.2.0"
+ ];
+ })
sources."hash.js-1.1.7"
sources."hex-color-regex-1.1.0"
sources."hmac-drbg-1.0.1"
@@ -72528,7 +72862,7 @@ in
(sources."htmlnano-0.2.5" // {
dependencies = [
sources."posthtml-0.12.3"
- sources."terser-4.6.11"
+ sources."terser-4.6.13"
];
})
(sources."htmlparser2-3.10.1" // {
@@ -72645,8 +72979,8 @@ in
})
sources."miller-rabin-4.0.1"
sources."mime-1.6.0"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."mimic-fn-1.2.0"
sources."minimalistic-assert-1.0.1"
sources."minimalistic-crypto-utils-1.0.1"
@@ -72720,14 +73054,14 @@ in
sources."pkg-up-2.0.0"
sources."pn-1.1.0"
sources."posix-character-classes-0.1.1"
- (sources."postcss-7.0.27" // {
+ (sources."postcss-7.0.29" // {
dependencies = [
sources."supports-color-6.1.0"
];
})
(sources."postcss-calc-7.0.2" // {
dependencies = [
- sources."postcss-value-parser-4.0.3"
+ sources."postcss-value-parser-4.1.0"
];
})
sources."postcss-colormin-4.0.3"
@@ -72892,7 +73226,7 @@ in
sources."snapdragon-util-3.0.1"
sources."source-map-0.6.1"
sources."source-map-resolve-0.5.3"
- sources."source-map-support-0.5.18"
+ sources."source-map-support-0.5.19"
sources."source-map-url-0.4.0"
(sources."split-string-3.1.0" // {
dependencies = [
@@ -73121,7 +73455,7 @@ in
sources."dicer-0.3.0"
sources."dnscache-1.0.2"
sources."dom-storage-2.1.0"
- sources."domino-2.1.4"
+ sources."domino-2.1.5"
sources."dtrace-provider-0.8.8"
sources."ecc-jsbn-0.1.2"
sources."ee-first-1.1.1"
@@ -73157,7 +73491,7 @@ in
sources."get-caller-file-2.0.5"
sources."getpass-0.1.7"
sources."glob-7.1.6"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."handlebars-4.7.6"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
@@ -73200,12 +73534,12 @@ in
sources."merge-descriptors-1.0.1"
sources."methods-1.1.2"
sources."mime-1.6.0"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."minimatch-3.0.4"
sources."minimist-1.2.5"
sources."mkdirp-0.5.5"
- sources."moment-2.24.0"
+ sources."moment-2.25.3"
sources."ms-2.0.0"
sources."msgpack5-3.6.0"
sources."mv-2.1.1"
@@ -73293,7 +73627,7 @@ in
sources."tunnel-agent-0.6.0"
sources."tweetnacl-0.14.5"
sources."type-is-1.6.18"
- sources."uglify-js-3.9.1"
+ sources."uglify-js-3.9.2"
sources."unix-dgram-2.0.4"
sources."unpipe-1.0.0"
sources."uri-js-4.2.2"
@@ -73428,7 +73762,7 @@ in
sources."get-browser-rtc-1.0.2"
sources."get-stdin-4.0.1"
sources."glob-7.1.6"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."has-1.0.3"
sources."has-ansi-2.0.0"
sources."has-flag-3.0.0"
@@ -73464,7 +73798,6 @@ in
sources."is-date-object-1.0.2"
sources."is-finite-1.1.0"
sources."is-fullwidth-code-point-1.0.0"
- sources."is-promise-2.1.0"
sources."is-regex-1.0.5"
sources."is-symbol-1.0.3"
sources."is-utf8-0.2.1"
@@ -73484,13 +73817,13 @@ in
sources."magnet-uri-5.2.4"
sources."map-obj-1.0.1"
sources."meow-3.7.0"
- sources."mime-2.4.4"
+ sources."mime-2.4.5"
sources."mimic-fn-1.2.0"
sources."mimic-response-1.0.1"
sources."minimatch-3.0.4"
sources."minimist-1.2.5"
sources."mkdirp-0.3.5"
- sources."mkdirp-classic-0.5.2"
+ sources."mkdirp-classic-0.5.3"
sources."ms-2.0.0"
sources."multicast-dns-6.2.3"
sources."multicast-dns-service-types-1.1.0"
@@ -73562,7 +73895,7 @@ in
sources."restore-cursor-2.0.0"
sources."reverse-http-1.3.0"
sources."rimraf-2.7.1"
- sources."run-async-2.4.0"
+ sources."run-async-2.4.1"
sources."run-parallel-1.1.9"
sources."run-series-1.1.8"
sources."rusha-0.8.13"
@@ -73783,7 +74116,7 @@ in
sources."get-browser-rtc-1.0.2"
sources."getpass-0.1.7"
sources."glob-7.1.6"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
(sources."has-binary2-1.0.3" // {
@@ -73845,13 +74178,13 @@ in
sources."merge-descriptors-1.0.1"
sources."methods-1.1.2"
sources."mime-1.6.0"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."mimic-response-1.0.1"
sources."minimatch-3.0.4"
sources."minimist-1.2.5"
sources."mkdirp-0.5.5"
- sources."mkdirp-classic-0.5.2"
+ sources."mkdirp-classic-0.5.3"
(sources."morgan-1.10.0" // {
dependencies = [
sources."depd-2.0.0"
@@ -74001,7 +74334,7 @@ in
sources."verror-1.10.0"
sources."which-1.3.1"
sources."wrappy-1.0.2"
- sources."ws-7.2.3"
+ sources."ws-7.2.5"
sources."xmlhttprequest-ssl-1.5.5"
sources."xtend-4.0.2"
sources."yeast-0.1.2"
@@ -74020,10 +74353,10 @@ in
pnpm = nodeEnv.buildNodePackage {
name = "pnpm";
packageName = "pnpm";
- version = "4.14.0";
+ version = "4.14.2";
src = fetchurl {
- url = "https://registry.npmjs.org/pnpm/-/pnpm-4.14.0.tgz";
- sha512 = "O6B5OD+wiO4srzegQTs0LiOrdExLvoKgG7UFL5+Lu1DhgqhW9NFP/pPg8+zKSrOQTontH3GGSWAkinxM3tCqnw==";
+ url = "https://registry.npmjs.org/pnpm/-/pnpm-4.14.2.tgz";
+ sha512 = "srFTvu4mm2tzo+bt1QkahH3JJnBDXPbjboYOPSZRwocoyGcTxYgGr0aUHg6non0i8eFzbhUFqQiqG+iCJ5spbA==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -74038,42 +74371,36 @@ in
postcss-cli = nodeEnv.buildNodePackage {
name = "postcss-cli";
packageName = "postcss-cli";
- version = "7.1.0";
+ version = "7.1.1";
src = fetchurl {
- url = "https://registry.npmjs.org/postcss-cli/-/postcss-cli-7.1.0.tgz";
- sha512 = "tCGK0GO2reu644dUHxks8U2SAtKnzftQTAXN1dwzFPoKXZr0b7VX4vTkQ2Pl2Lunas6+o8uHR56hlcYBm1srZg==";
+ url = "https://registry.npmjs.org/postcss-cli/-/postcss-cli-7.1.1.tgz";
+ sha512 = "bYQy5ydAQJKCMSpvaMg0ThPBeGYqhQXumjbFOmWnL4u65CYXQ16RfS6afGQpit0dGv/fNzxbdDtx8dkqOhhIbg==";
};
dependencies = [
sources."@nodelib/fs.scandir-2.1.3"
sources."@nodelib/fs.stat-2.0.3"
sources."@nodelib/fs.walk-1.2.4"
sources."@types/color-name-1.1.1"
- sources."@types/events-3.0.0"
- sources."@types/glob-7.1.1"
- sources."@types/minimatch-3.0.3"
- sources."@types/node-13.13.2"
sources."ansi-regex-5.0.0"
sources."ansi-styles-4.2.1"
sources."anymatch-3.1.1"
sources."argparse-1.0.10"
sources."array-union-2.1.0"
- sources."balanced-match-1.0.0"
+ sources."at-least-node-1.0.0"
sources."binary-extensions-2.0.0"
- sources."brace-expansion-1.1.11"
sources."braces-3.0.2"
sources."caller-callsite-2.0.0"
sources."caller-path-2.0.0"
sources."callsites-2.0.0"
sources."camelcase-5.3.1"
- sources."chalk-3.0.0"
- sources."chokidar-3.3.1"
+ sources."chalk-4.0.0"
+ sources."chokidar-3.4.0"
sources."cliui-6.0.0"
sources."color-convert-2.0.1"
sources."color-name-1.1.4"
- sources."concat-map-0.0.1"
sources."cosmiconfig-5.2.1"
sources."decamelize-1.2.0"
- sources."dependency-graph-0.8.1"
+ sources."dependency-graph-0.9.0"
sources."dir-glob-3.0.1"
sources."emoji-regex-8.0.0"
sources."error-ex-1.3.2"
@@ -74083,22 +74410,18 @@ in
sources."fastq-1.7.0"
sources."fill-range-7.0.1"
sources."find-up-4.1.0"
- sources."fs-extra-8.1.0"
- sources."fs.realpath-1.0.0"
+ sources."fs-extra-9.0.0"
sources."fsevents-2.1.3"
sources."get-caller-file-2.0.5"
sources."get-stdin-7.0.0"
- sources."glob-7.1.6"
sources."glob-parent-5.1.1"
- sources."globby-10.0.2"
- sources."graceful-fs-4.2.3"
+ sources."globby-11.0.0"
+ sources."graceful-fs-4.2.4"
sources."has-flag-4.0.0"
sources."ignore-5.1.4"
sources."import-cwd-2.1.0"
sources."import-fresh-2.0.0"
sources."import-from-2.1.0"
- sources."inflight-1.0.6"
- sources."inherits-2.0.4"
sources."is-arrayish-0.2.1"
sources."is-binary-path-2.1.0"
sources."is-directory-0.3.1"
@@ -74108,7 +74431,7 @@ in
sources."is-number-7.0.0"
sources."js-yaml-3.13.1"
sources."json-parse-better-errors-1.0.2"
- sources."jsonfile-4.0.0"
+ sources."jsonfile-6.0.1"
sources."locate-path-5.0.0"
sources."lodash-4.17.15"
(sources."log-symbols-2.2.0" // {
@@ -74123,19 +74446,16 @@ in
})
sources."merge2-1.3.0"
sources."micromatch-4.0.2"
- sources."minimatch-3.0.4"
sources."normalize-path-3.0.0"
- sources."once-1.4.0"
sources."p-limit-2.3.0"
sources."p-locate-4.1.0"
sources."p-try-2.2.0"
sources."parse-json-4.0.0"
sources."path-exists-4.0.0"
- sources."path-is-absolute-1.0.1"
sources."path-type-4.0.0"
sources."picomatch-2.2.2"
sources."pify-2.3.0"
- (sources."postcss-7.0.27" // {
+ (sources."postcss-7.0.29" // {
dependencies = [
sources."ansi-styles-3.2.1"
(sources."chalk-2.4.2" // {
@@ -74162,7 +74482,7 @@ in
})
sources."pretty-hrtime-1.0.3"
sources."read-cache-1.0.0"
- sources."readdirp-3.3.0"
+ sources."readdirp-3.4.0"
sources."require-directory-2.1.1"
sources."require-main-filename-2.0.0"
sources."resolve-from-3.0.0"
@@ -74176,10 +74496,9 @@ in
sources."strip-ansi-6.0.0"
sources."supports-color-7.1.0"
sources."to-regex-range-5.0.1"
- sources."universalify-0.1.2"
+ sources."universalify-1.0.0"
sources."which-module-2.0.0"
sources."wrap-ansi-6.2.0"
- sources."wrappy-1.0.2"
sources."y18n-4.0.0"
sources."yargs-15.3.1"
sources."yargs-parser-18.1.3"
@@ -74374,10 +74693,14 @@ in
sources."get-stream-4.1.0"
sources."glob-7.1.6"
sources."globule-1.3.1"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."has-1.0.3"
sources."has-flag-3.0.0"
- sources."hash-base-3.0.4"
+ (sources."hash-base-3.1.0" // {
+ dependencies = [
+ sources."readable-stream-3.6.0"
+ ];
+ })
sources."hash.js-1.1.7"
sources."hmac-drbg-1.0.1"
sources."htmlescape-1.1.1"
@@ -74423,7 +74746,7 @@ in
sources."minipass-2.9.0"
sources."minizlib-1.3.3"
sources."mkdirp-0.5.5"
- sources."mkdirp-classic-0.5.2"
+ sources."mkdirp-classic-0.5.3"
(sources."module-deps-6.2.2" // {
dependencies = [
sources."concat-stream-1.6.2"
@@ -74512,7 +74835,7 @@ in
sources."slice-ansi-2.1.0"
sources."sorcery-0.10.0"
sources."source-map-0.5.7"
- (sources."source-map-support-0.5.18" // {
+ (sources."source-map-support-0.5.19" // {
dependencies = [
sources."source-map-0.6.1"
];
@@ -74540,7 +74863,7 @@ in
sources."rimraf-2.6.3"
];
})
- (sources."terser-4.6.11" // {
+ (sources."terser-4.6.13" // {
dependencies = [
sources."source-map-0.6.1"
];
@@ -74637,7 +74960,7 @@ in
sources."colors-0.6.2"
sources."concat-map-0.0.1"
sources."cycle-1.0.3"
- sources."deep-equal-2.0.2"
+ sources."deep-equal-2.0.3"
sources."define-properties-1.1.3"
sources."es-abstract-1.17.5"
sources."es-get-iterator-1.1.0"
@@ -74740,7 +75063,7 @@ in
sources."esprima-3.1.3"
sources."esprima-fb-13001.1001.0-dev-harmony-fb"
sources."glob-5.0.15"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."iconv-lite-0.4.24"
sources."inflight-1.0.6"
sources."inherits-2.0.4"
@@ -74800,19 +75123,19 @@ in
sources."@babel/highlight-7.9.0"
sources."@rollup/plugin-commonjs-11.1.0"
sources."@rollup/plugin-node-resolve-7.1.3"
- sources."@rollup/pluginutils-3.0.9"
+ sources."@rollup/pluginutils-3.0.10"
sources."@types/color-name-1.1.1"
sources."@types/eslint-visitor-keys-1.0.0"
sources."@types/estree-0.0.39"
sources."@types/json-schema-7.0.4"
sources."@types/node-12.12.37"
- sources."@types/node-fetch-2.5.6"
+ sources."@types/node-fetch-2.5.7"
sources."@types/resolve-0.0.8"
sources."@types/vscode-1.44.0"
- sources."@typescript-eslint/eslint-plugin-2.29.0"
- sources."@typescript-eslint/experimental-utils-2.29.0"
- sources."@typescript-eslint/parser-2.29.0"
- sources."@typescript-eslint/typescript-estree-2.29.0"
+ sources."@typescript-eslint/eslint-plugin-2.31.0"
+ sources."@typescript-eslint/experimental-utils-2.31.0"
+ sources."@typescript-eslint/parser-2.31.0"
+ sources."@typescript-eslint/typescript-estree-2.31.0"
sources."acorn-7.1.1"
sources."acorn-jsx-5.2.0"
sources."ajv-6.12.2"
@@ -74830,7 +75153,6 @@ in
sources."balanced-match-1.0.0"
sources."boolbase-1.0.0"
sources."brace-expansion-1.1.11"
- sources."braces-3.0.2"
sources."buffer-crc32-0.2.13"
sources."builtin-modules-3.1.0"
sources."callsites-3.1.0"
@@ -74897,7 +75219,6 @@ in
sources."fd-slicer-1.1.0"
sources."figures-3.2.0"
sources."file-entry-cache-5.0.1"
- sources."fill-range-7.0.1"
sources."flat-cache-2.0.1"
sources."flatted-2.0.2"
sources."form-data-3.0.0"
@@ -74930,8 +75251,6 @@ in
sources."is-fullwidth-code-point-3.0.0"
sources."is-glob-4.0.1"
sources."is-module-1.0.0"
- sources."is-number-7.0.0"
- sources."is-promise-2.1.0"
sources."is-reference-1.1.4"
sources."isexe-2.0.0"
sources."js-tokens-4.0.0"
@@ -74951,10 +75270,9 @@ in
];
})
sources."mdurl-1.0.1"
- sources."micromatch-4.0.2"
sources."mime-1.6.0"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."mimic-fn-2.1.0"
sources."minimatch-3.0.4"
sources."minimist-1.2.5"
@@ -74995,8 +75313,8 @@ in
sources."resolve-from-4.0.0"
sources."restore-cursor-3.1.0"
sources."rimraf-2.6.3"
- sources."rollup-2.7.2"
- sources."run-async-2.4.0"
+ sources."rollup-2.7.6"
+ sources."run-async-2.4.1"
sources."rxjs-6.5.5"
sources."safe-buffer-5.2.0"
sources."safer-buffer-2.1.2"
@@ -75035,7 +75353,6 @@ in
sources."text-table-0.2.0"
sources."through-2.3.8"
sources."tmp-0.0.33"
- sources."to-regex-range-5.0.1"
sources."tslib-1.11.1"
sources."tsutils-3.17.1"
sources."tunnel-0.0.4"
@@ -75155,8 +75472,8 @@ in
sources."keypress-0.1.0"
sources."methods-0.1.0"
sources."mime-1.2.11"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."mkdirp-0.3.5"
sources."ms-2.1.2"
sources."multiparty-2.2.0"
@@ -75280,8 +75597,8 @@ in
sources."isexe-2.0.0"
sources."json-schema-traverse-0.4.1"
sources."lru-cache-4.1.5"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."minimatch-3.0.4"
sources."minimist-1.2.5"
sources."ms-2.0.0"
@@ -75334,14 +75651,14 @@ in
serverless = nodeEnv.buildNodePackage {
name = "serverless";
packageName = "serverless";
- version = "1.68.0";
+ version = "1.69.0";
src = fetchurl {
- url = "https://registry.npmjs.org/serverless/-/serverless-1.68.0.tgz";
- sha512 = "CLA8K4B/oZm1LwgUDAfCHiVYGszveDSlAUr2mIdzdcVc3CLjzlRZn7IVipy3myXOc7/+kocxOqs3VXogm9A4Wg==";
+ url = "https://registry.npmjs.org/serverless/-/serverless-1.69.0.tgz";
+ sha512 = "af4gBZeto9JCkObSErzSXI+UcxoGNxUP4oQq7b/+QoCFa0NYjO4lCtW66MD6ONYg0YxDEukTQwzgkbD9VmunWg==";
};
dependencies = [
sources."2-thenable-1.0.0"
- sources."@babel/parser-7.9.4"
+ sources."@babel/parser-7.9.6"
sources."@nodelib/fs.scandir-2.1.3"
sources."@nodelib/fs.stat-2.0.3"
sources."@nodelib/fs.walk-1.2.4"
@@ -75351,7 +75668,7 @@ in
sources."node-fetch-2.6.0"
];
})
- (sources."@serverless/components-2.30.1" // {
+ (sources."@serverless/components-2.30.5" // {
dependencies = [
sources."fs-extra-8.1.0"
sources."globby-10.0.2"
@@ -75364,11 +75681,9 @@ in
sources."semver-6.3.0"
];
})
- (sources."@serverless/enterprise-plugin-3.6.6" // {
+ (sources."@serverless/enterprise-plugin-3.6.9" // {
dependencies = [
- sources."@serverless/platform-client-0.24.0"
sources."fs-extra-8.1.0"
- sources."https-proxy-agent-5.0.0"
sources."node-fetch-2.6.0"
sources."semver-6.3.0"
sources."uuid-3.4.0"
@@ -75383,12 +75698,12 @@ in
sources."strip-ansi-6.0.0"
];
})
- (sources."@serverless/platform-client-0.25.5" // {
+ (sources."@serverless/platform-client-0.25.7" // {
dependencies = [
sources."https-proxy-agent-5.0.0"
];
})
- (sources."@serverless/platform-client-china-1.0.6" // {
+ (sources."@serverless/platform-client-china-1.0.9" // {
dependencies = [
sources."https-proxy-agent-5.0.0"
];
@@ -75401,7 +75716,7 @@ in
];
})
sources."@serverless/template-1.1.3"
- (sources."@serverless/utils-china-0.1.6" // {
+ (sources."@serverless/utils-china-0.1.7" // {
dependencies = [
sources."https-proxy-agent-5.0.0"
];
@@ -75414,8 +75729,8 @@ in
sources."@types/glob-7.1.1"
sources."@types/lodash-4.14.150"
sources."@types/minimatch-3.0.3"
- sources."@types/node-13.13.2"
- (sources."@typescript-eslint/typescript-estree-2.29.0" // {
+ sources."@types/node-13.13.4"
+ (sources."@typescript-eslint/typescript-estree-2.31.0" // {
dependencies = [
sources."semver-6.3.0"
];
@@ -75459,7 +75774,11 @@ in
sources."string_decoder-1.1.1"
];
})
- sources."argparse-1.0.10"
+ (sources."argparse-1.0.10" // {
+ dependencies = [
+ sources."sprintf-js-1.0.3"
+ ];
+ })
sources."arr-diff-4.0.0"
sources."arr-union-3.1.0"
sources."array-union-2.1.0"
@@ -75474,7 +75793,7 @@ in
sources."async-limiter-1.0.1"
sources."asynckit-0.4.0"
sources."atob-2.1.2"
- (sources."aws-sdk-2.661.0" // {
+ (sources."aws-sdk-2.669.0" // {
dependencies = [
sources."buffer-4.9.1"
sources."isarray-1.0.0"
@@ -75513,6 +75832,7 @@ in
})
sources."blob-0.0.5"
sources."bluebird-3.7.2"
+ sources."boolean-3.0.1"
(sources."boxen-3.2.0" // {
dependencies = [
sources."emoji-regex-7.0.3"
@@ -75558,7 +75878,7 @@ in
sources."cross-spawn-6.0.5"
];
})
- sources."chokidar-3.3.1"
+ sources."chokidar-3.4.0"
sources."ci-info-1.6.0"
(sources."class-utils-0.3.6" // {
dependencies = [
@@ -75630,6 +75950,7 @@ in
sources."cookie-0.3.1"
sources."cookiejar-2.1.2"
sources."copy-descriptor-0.1.1"
+ sources."core-js-3.6.5"
sources."core-util-is-1.0.2"
sources."crc-3.8.0"
(sources."crc32-stream-2.0.0" // {
@@ -75649,7 +75970,7 @@ in
];
})
sources."dashdash-1.14.1"
- sources."dayjs-1.8.25"
+ sources."dayjs-1.8.26"
sources."debug-4.1.1"
sources."decamelize-1.2.0"
sources."decode-uri-component-0.2.0"
@@ -75683,9 +76004,11 @@ in
sources."deep-is-0.1.3"
sources."defer-to-connect-1.1.3"
sources."deferred-0.7.11"
+ sources."define-properties-1.1.3"
sources."define-property-2.0.2"
sources."delayed-stream-1.0.0"
sources."dependency-tree-7.2.1"
+ sources."detect-node-2.0.4"
sources."detective-amd-3.0.0"
sources."detective-cjs-3.1.1"
sources."detective-es6-2.1.0"
@@ -75736,8 +76059,9 @@ in
sources."env-variable-0.0.6"
sources."errno-0.1.7"
sources."es5-ext-0.10.53"
+ sources."es6-error-4.1.1"
sources."es6-iterator-2.0.3"
- sources."es6-promisify-6.1.0"
+ sources."es6-promisify-6.1.1"
(sources."es6-set-0.1.5" // {
dependencies = [
sources."es6-symbol-3.1.1"
@@ -75819,11 +76143,7 @@ in
];
})
sources."fs.realpath-1.0.0"
- (sources."fs2-0.3.7" // {
- dependencies = [
- sources."type-1.2.0"
- ];
- })
+ sources."fs2-0.3.8"
sources."fsevents-2.1.3"
sources."get-amd-module-type-3.0.0"
sources."get-own-enumerable-property-symbols-3.0.2"
@@ -75834,7 +76154,13 @@ in
sources."getpass-0.1.7"
sources."glob-7.1.6"
sources."glob-parent-5.1.1"
+ (sources."global-agent-2.1.8" // {
+ dependencies = [
+ sources."semver-7.3.2"
+ ];
+ })
sources."global-dirs-0.1.1"
+ sources."globalthis-1.0.1"
(sources."globby-6.1.0" // {
dependencies = [
sources."array-union-1.0.2"
@@ -75843,7 +76169,7 @@ in
})
sources."gonzales-pe-4.3.0"
sources."got-9.6.0"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."graceful-readlink-1.0.1"
sources."graphlib-2.1.8"
sources."har-schema-2.0.0"
@@ -75923,7 +76249,7 @@ in
sources."is-path-inside-1.0.1"
sources."is-plain-obj-1.1.0"
sources."is-plain-object-2.0.4"
- sources."is-promise-2.1.0"
+ sources."is-promise-2.2.2"
sources."is-redirect-1.0.0"
sources."is-regexp-1.0.0"
sources."is-relative-path-1.0.2"
@@ -75932,7 +76258,11 @@ in
sources."is-typedarray-1.0.0"
sources."is-url-1.2.4"
sources."is-windows-1.0.2"
- sources."is-wsl-2.1.1"
+ (sources."is-wsl-2.2.0" // {
+ dependencies = [
+ sources."is-docker-2.0.0"
+ ];
+ })
sources."isarray-2.0.1"
sources."isexe-2.0.0"
sources."iso8601-duration-1.2.0"
@@ -76006,6 +76336,11 @@ in
sources."make-dir-2.1.0"
sources."map-cache-0.2.2"
sources."map-visit-1.0.0"
+ (sources."matcher-2.1.0" // {
+ dependencies = [
+ sources."escape-string-regexp-2.0.0"
+ ];
+ })
sources."memoizee-0.4.14"
(sources."memory-fs-0.5.0" // {
dependencies = [
@@ -76019,8 +76354,8 @@ in
sources."methods-1.1.2"
sources."micromatch-4.0.2"
sources."mime-1.6.0"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."mimic-fn-2.1.0"
sources."mimic-response-1.0.1"
sources."minimatch-3.0.4"
@@ -76029,7 +76364,7 @@ in
sources."mkdirp-0.5.5"
sources."module-definition-3.3.0"
sources."module-lookup-amd-6.2.0"
- sources."moment-2.24.0"
+ sources."moment-2.25.3"
sources."ms-2.1.2"
sources."mute-stream-0.0.8"
sources."nanoid-2.1.11"
@@ -76067,6 +76402,7 @@ in
];
})
sources."object-hash-2.0.3"
+ sources."object-keys-1.1.1"
sources."object-visit-1.0.1"
sources."object.pick-1.3.0"
sources."once-1.4.0"
@@ -76112,7 +76448,7 @@ in
sources."pify-4.0.1"
sources."pinkie-2.0.4"
sources."pinkie-promise-2.0.1"
- (sources."postcss-7.0.27" // {
+ (sources."postcss-7.0.29" // {
dependencies = [
sources."has-flag-3.0.0"
sources."supports-color-6.1.0"
@@ -76143,7 +76479,7 @@ in
})
sources."rc-1.2.8"
sources."readable-stream-3.6.0"
- sources."readdirp-3.3.0"
+ sources."readdirp-3.4.0"
sources."regenerator-runtime-0.13.5"
sources."regex-not-1.0.2"
sources."registry-auth-token-4.1.1"
@@ -76167,7 +76503,8 @@ in
sources."ret-0.1.15"
sources."reusify-1.0.4"
sources."rimraf-2.7.1"
- sources."run-async-2.4.0"
+ sources."roarr-2.15.3"
+ sources."run-async-2.4.1"
sources."run-parallel-1.1.9"
sources."rxjs-6.5.5"
sources."safe-buffer-5.2.0"
@@ -76181,8 +76518,14 @@ in
];
})
sources."semver-5.7.1"
+ sources."semver-compare-1.0.0"
sources."semver-diff-2.1.0"
sources."semver-regex-1.0.0"
+ (sources."serialize-error-5.0.0" // {
+ dependencies = [
+ sources."type-fest-0.8.1"
+ ];
+ })
sources."set-immediate-shim-1.0.1"
(sources."set-value-2.0.1" // {
dependencies = [
@@ -76237,11 +76580,11 @@ in
sources."sort-keys-length-1.0.1"
sources."source-map-0.6.1"
sources."source-map-resolve-0.5.3"
- sources."source-map-support-0.5.18"
+ sources."source-map-support-0.5.19"
sources."source-map-url-0.4.0"
sources."split-string-3.1.0"
sources."split2-3.1.1"
- sources."sprintf-js-1.0.3"
+ sources."sprintf-js-1.1.2"
sources."sprintf-kit-2.0.0"
sources."sshpk-1.16.1"
sources."stack-trace-0.0.10"
@@ -76406,7 +76749,7 @@ in
sources."word-wrap-1.2.3"
sources."wrappy-1.0.2"
sources."write-file-atomic-2.4.3"
- sources."ws-7.2.3"
+ sources."ws-7.2.5"
sources."xdg-basedir-3.0.0"
sources."xml2js-0.4.19"
sources."xmlbuilder-9.0.7"
@@ -76562,8 +76905,8 @@ in
sources."merge-descriptors-1.0.1"
sources."methods-1.1.2"
sources."mime-1.6.0"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."minimist-1.2.5"
sources."mkdirp-0.5.5"
sources."moment-2.7.0"
@@ -76760,7 +77103,7 @@ in
sources."for-in-1.0.2"
sources."fragment-cache-0.2.1"
sources."get-value-2.0.6"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."graceful-readlink-1.0.1"
sources."has-value-1.0.0"
(sources."has-values-1.0.0" // {
@@ -77064,41 +77407,42 @@ in
snyk = nodeEnv.buildNodePackage {
name = "snyk";
packageName = "snyk";
- version = "1.309.0";
+ version = "1.317.0";
src = fetchurl {
- url = "https://registry.npmjs.org/snyk/-/snyk-1.309.0.tgz";
- sha512 = "NVizsLhGNhgjI+wCy1TajQoko+GVjop3r10BxX12KKxj3bUE9cDhqzkXmngHzuyFhTfdhED6yOzdg+jDvm1VpA==";
+ url = "https://registry.npmjs.org/snyk/-/snyk-1.317.0.tgz";
+ sha512 = "zNUvvT50Ii5TpHEo9YmDo+j5tqO1b8jXQK9XygfgiuXPRUwxf6PMSqDM5hKkfzuBhaBYZ4IbZWQFQPbMkprj0w==";
};
dependencies = [
- sources."@snyk/cli-interface-2.4.0"
- sources."@snyk/cocoapods-lockfile-parser-3.1.0"
- sources."@snyk/composer-lockfile-parser-1.2.0"
+ sources."@snyk/cli-interface-2.6.0"
+ sources."@snyk/cocoapods-lockfile-parser-3.2.0"
+ sources."@snyk/composer-lockfile-parser-1.4.0"
sources."@snyk/configstore-3.2.0-rc1"
- sources."@snyk/dep-graph-1.16.1"
+ sources."@snyk/dep-graph-1.18.2"
sources."@snyk/gemfile-1.2.0"
- (sources."@snyk/java-call-graph-builder-1.3.4" // {
+ sources."@snyk/graphlib-2.1.9-patch"
+ sources."@snyk/inquirer-6.2.2-patch"
+ (sources."@snyk/java-call-graph-builder-1.8.0" // {
dependencies = [
sources."ci-info-2.0.0"
sources."debug-4.1.1"
- sources."snyk-config-3.0.0"
];
})
- sources."@snyk/ruby-semver-2.1.0"
- (sources."@snyk/snyk-cocoapods-plugin-2.1.1" // {
+ sources."@snyk/lodash-4.17.15-patch"
+ sources."@snyk/rpm-parser-1.1.0"
+ sources."@snyk/ruby-semver-2.2.0"
+ (sources."@snyk/snyk-cocoapods-plugin-2.2.0" // {
dependencies = [
sources."@snyk/cli-interface-1.5.0"
];
})
sources."@snyk/update-notifier-2.5.1-rc2"
sources."@types/agent-base-4.2.0"
- sources."@types/bunyan-1.8.6"
sources."@types/debug-4.1.5"
sources."@types/events-3.0.0"
sources."@types/js-yaml-3.12.3"
- sources."@types/node-13.13.2"
- sources."@types/restify-4.3.6"
+ sources."@types/node-13.13.4"
sources."@types/semver-5.5.0"
- sources."@types/xml2js-0.4.3"
+ sources."@types/xml2js-0.4.5"
sources."@yarnpkg/lockfile-1.1.0"
sources."abbrev-1.1.1"
sources."agent-base-4.3.0"
@@ -77167,11 +77511,7 @@ in
sources."diff-4.0.2"
sources."dockerfile-ast-0.0.19"
sources."dot-prop-5.2.0"
- (sources."dotnet-deps-parser-4.9.0" // {
- dependencies = [
- sources."xml2js-0.4.19"
- ];
- })
+ sources."dotnet-deps-parser-4.10.0"
sources."duplexer3-0.1.4"
sources."email-validator-2.0.4"
sources."emoji-regex-7.0.3"
@@ -77209,8 +77549,7 @@ in
sources."glob-7.1.6"
sources."global-dirs-0.1.1"
sources."got-6.7.1"
- sources."graceful-fs-4.2.3"
- sources."graphlib-2.1.8"
+ sources."graceful-fs-4.2.4"
sources."has-flag-3.0.0"
sources."hosted-git-info-2.8.8"
sources."http-errors-1.7.3"
@@ -77229,21 +77568,20 @@ in
sources."inflight-1.0.6"
sources."inherits-2.0.4"
sources."ini-1.3.5"
- sources."inquirer-6.5.2"
sources."invert-kv-1.0.0"
sources."ip-1.1.5"
sources."is-ci-1.2.1"
+ sources."is-docker-2.0.0"
sources."is-fullwidth-code-point-2.0.0"
sources."is-installed-globally-0.1.0"
sources."is-npm-1.0.0"
sources."is-obj-2.0.0"
sources."is-path-inside-1.0.1"
- sources."is-promise-2.1.0"
sources."is-redirect-1.0.0"
sources."is-retry-allowed-1.2.0"
sources."is-ssh-1.3.1"
sources."is-stream-1.1.0"
- sources."is-wsl-1.1.0"
+ sources."is-wsl-2.2.0"
sources."isarray-0.0.1"
sources."isexe-2.0.0"
sources."js-yaml-3.13.1"
@@ -77252,7 +77590,6 @@ in
sources."lcid-1.0.0"
sources."levn-0.3.0"
sources."lie-3.3.0"
- sources."lodash-4.17.15"
sources."lodash.assign-4.2.0"
sources."lodash.assignin-4.2.0"
sources."lodash.clone-4.5.0"
@@ -77279,7 +77616,7 @@ in
sources."object-hash-1.3.1"
sources."once-1.4.0"
sources."onetime-2.0.1"
- sources."opn-5.5.0"
+ sources."open-7.0.3"
sources."optionator-0.8.3"
sources."os-locale-1.4.0"
sources."os-name-3.1.0"
@@ -77306,6 +77643,7 @@ in
sources."pify-3.0.0"
sources."prelude-ls-1.1.2"
sources."prepend-http-1.0.4"
+ sources."prettier-1.19.1"
sources."process-nextick-args-2.0.1"
sources."progress-2.0.3"
sources."promise-7.3.1"
@@ -77333,7 +77671,7 @@ in
sources."registry-url-3.1.0"
sources."restore-cursor-2.0.0"
sources."rimraf-2.7.1"
- sources."run-async-2.4.0"
+ sources."run-async-2.4.1"
sources."rxjs-6.5.5"
sources."safe-buffer-5.2.0"
sources."safer-buffer-2.1.2"
@@ -77351,14 +77689,18 @@ in
sources."shebang-regex-1.0.0"
sources."signal-exit-3.0.3"
sources."smart-buffer-4.1.0"
- sources."snyk-config-2.2.3"
- (sources."snyk-docker-plugin-2.6.1" // {
+ (sources."snyk-config-3.1.0" // {
+ dependencies = [
+ sources."debug-4.1.1"
+ ];
+ })
+ (sources."snyk-docker-plugin-3.1.0" // {
dependencies = [
sources."debug-4.1.1"
];
})
sources."snyk-go-parser-1.4.0"
- (sources."snyk-go-plugin-1.13.0" // {
+ (sources."snyk-go-plugin-1.14.0" // {
dependencies = [
sources."debug-4.1.1"
sources."tmp-0.1.0"
@@ -77371,20 +77713,29 @@ in
];
})
sources."snyk-module-1.9.1"
- (sources."snyk-mvn-plugin-2.10.0" // {
+ (sources."snyk-mvn-plugin-2.15.0" // {
dependencies = [
+ sources."@snyk/cli-interface-2.5.0"
sources."debug-4.1.1"
sources."tmp-0.1.0"
- sources."tslib-1.11.0"
];
})
- sources."snyk-nodejs-lockfile-parser-1.18.0"
- sources."snyk-nuget-plugin-1.16.0"
- sources."snyk-paket-parser-1.5.0"
- (sources."snyk-php-plugin-1.7.0" // {
+ sources."snyk-nodejs-lockfile-parser-1.22.0"
+ (sources."snyk-nuget-plugin-1.17.0" // {
dependencies = [
- sources."@snyk/cli-interface-2.2.0"
- sources."tslib-1.9.3"
+ sources."core-js-2.3.0"
+ sources."es6-promise-3.0.2"
+ sources."isarray-1.0.0"
+ sources."jszip-3.1.5"
+ sources."lie-3.1.1"
+ sources."process-nextick-args-1.0.7"
+ sources."readable-stream-2.0.6"
+ ];
+ })
+ sources."snyk-paket-parser-1.6.0"
+ (sources."snyk-php-plugin-1.9.0" // {
+ dependencies = [
+ sources."@snyk/cli-interface-2.3.2"
];
})
sources."snyk-policy-1.13.5"
@@ -77411,7 +77762,7 @@ in
];
})
sources."source-map-0.6.1"
- sources."source-map-support-0.5.18"
+ sources."source-map-support-0.5.19"
sources."sprintf-js-1.0.3"
sources."statuses-1.5.0"
(sources."string-width-2.1.1" // {
@@ -77451,6 +77802,7 @@ in
sources."tree-kill-1.2.2"
sources."tslib-1.11.1"
sources."type-check-0.3.2"
+ sources."typescript-3.8.3"
sources."unique-string-1.0.0"
sources."unpipe-1.0.0"
sources."unzip-response-2.0.1"
@@ -77478,12 +77830,8 @@ in
sources."wrappy-1.0.2"
sources."write-file-atomic-2.4.3"
sources."xdg-basedir-3.0.0"
- (sources."xml2js-0.4.23" // {
- dependencies = [
- sources."xmlbuilder-11.0.1"
- ];
- })
- sources."xmlbuilder-9.0.7"
+ sources."xml2js-0.4.23"
+ sources."xmlbuilder-11.0.1"
sources."xregexp-2.0.0"
sources."y18n-3.2.1"
sources."yallist-2.1.2"
@@ -77542,8 +77890,8 @@ in
sources."has-cors-1.1.0"
sources."indexof-0.0.1"
sources."isarray-2.0.1"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."ms-2.1.2"
sources."negotiator-0.6.2"
sources."object-component-0.0.3"
@@ -77562,7 +77910,7 @@ in
})
sources."socket.io-parser-3.4.0"
sources."to-array-0.1.4"
- sources."ws-7.2.3"
+ sources."ws-7.2.5"
sources."xmlhttprequest-ssl-1.5.5"
sources."yeast-0.1.2"
];
@@ -77630,7 +77978,7 @@ in
sources."get-stream-3.0.0"
sources."global-dirs-0.1.1"
sources."got-6.7.1"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."has-flag-3.0.0"
sources."hosted-git-info-2.8.8"
sources."http-proxy-agent-2.1.0"
@@ -77954,7 +78302,7 @@ in
sources."glob-parent-2.0.0"
sources."globby-4.1.0"
sources."gossip-query-2.0.2"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."has-1.0.3"
sources."has-ansi-2.0.0"
sources."has-network-0.0.1"
@@ -78134,9 +78482,9 @@ in
})
sources."napi-macros-2.0.0"
sources."ncp-2.0.0"
- sources."nearley-2.19.2"
+ sources."nearley-2.19.3"
sources."nice-try-1.0.5"
- sources."node-gyp-build-4.2.1"
+ sources."node-gyp-build-4.2.2"
sources."non-private-ip-1.4.4"
sources."normalize-path-2.1.1"
sources."normalize-uri-1.1.3"
@@ -78636,7 +78984,7 @@ in
sources."async-1.5.2"
sources."async-limiter-1.0.1"
sources."asynckit-0.4.0"
- (sources."aws-sdk-2.661.0" // {
+ (sources."aws-sdk-2.669.0" // {
dependencies = [
sources."uuid-3.3.2"
];
@@ -78776,7 +79124,7 @@ in
dependencies = [
sources."cookie-0.3.1"
sources."debug-4.1.1"
- sources."ws-7.2.3"
+ sources."ws-7.2.5"
];
})
(sources."engine.io-client-3.4.1" // {
@@ -78847,7 +79195,7 @@ in
sources."debug-3.2.6"
];
})
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."graphlib-2.1.8"
sources."har-schema-2.0.0"
sources."har-validator-2.0.6"
@@ -78898,7 +79246,7 @@ in
sources."is-fullwidth-code-point-1.0.0"
sources."is-my-ip-valid-1.0.0"
sources."is-my-json-valid-2.20.0"
- sources."is-promise-2.1.0"
+ sources."is-promise-2.2.2"
sources."is-property-1.0.2"
sources."is-regex-1.0.5"
sources."is-stream-1.1.0"
@@ -78993,15 +79341,15 @@ in
sources."merge-descriptors-1.0.1"
sources."methods-1.1.2"
sources."mime-1.6.0"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."mimic-fn-2.1.0"
sources."minicap-prebuilt-2.3.0"
sources."minimatch-3.0.4"
sources."minimist-1.2.5"
sources."minitouch-prebuilt-1.2.0"
sources."mkdirp-0.5.5"
- sources."moment-2.24.0"
+ sources."moment-2.25.3"
sources."ms-2.1.2"
sources."multer-1.4.2"
sources."mustache-2.3.2"
@@ -79231,7 +79579,7 @@ in
dependencies = [
sources."debug-3.2.6"
sources."form-data-2.5.1"
- sources."qs-6.9.3"
+ sources."qs-6.9.4"
sources."readable-stream-2.3.7"
sources."string_decoder-1.1.1"
];
@@ -79244,7 +79592,7 @@ in
sources."esprima-4.0.1"
sources."js-yaml-3.13.1"
sources."lodash-3.10.1"
- sources."qs-6.9.3"
+ sources."qs-6.9.4"
];
})
sources."swagger-schema-official-2.0.0-bab6bed"
@@ -79692,7 +80040,7 @@ in
})
sources."global-dirs-0.1.1"
sources."got-6.7.1"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
(sources."graphlib-2.1.8" // {
dependencies = [
sources."lodash-4.17.15"
@@ -79815,8 +80163,8 @@ in
sources."methods-1.1.2"
sources."micromatch-3.1.10"
sources."mime-1.6.0"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."minimatch-3.0.4"
sources."minimist-0.0.8"
sources."mixin-deep-1.3.2"
@@ -79882,7 +80230,7 @@ in
dependencies = [
sources."debug-3.2.6"
sources."ms-2.1.2"
- sources."qs-6.9.3"
+ sources."qs-6.9.4"
sources."superagent-3.8.3"
];
})
@@ -80059,7 +80407,7 @@ in
sources."truncate-utf8-bytes-1.0.2"
sources."type-is-1.6.18"
sources."typedarray-0.0.6"
- sources."uglify-js-3.9.1"
+ sources."uglify-js-3.9.2"
sources."undefsafe-2.0.3"
(sources."union-value-1.0.1" // {
dependencies = [
@@ -80179,12 +80527,12 @@ in
sources."jsprim-1.4.1"
sources."locate-path-3.0.0"
sources."long-4.0.0"
- sources."mime-2.4.4"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-2.4.5"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."minimist-1.2.5"
sources."module-alias-2.2.2"
- sources."moment-2.24.0"
+ sources."moment-2.25.3"
sources."ms-2.1.2"
sources."node-fetch-2.6.0"
sources."oauth-sign-0.9.0"
@@ -80215,7 +80563,7 @@ in
})
sources."string-width-3.1.0"
sources."strip-ansi-5.2.0"
- sources."telegraf-3.37.0"
+ sources."telegraf-3.38.0"
sources."telegram-typings-3.6.1"
sources."tough-cookie-2.5.0"
sources."tunnel-agent-0.6.0"
@@ -80259,7 +80607,7 @@ in
sources."errno-0.1.7"
sources."fs.realpath-1.0.0"
sources."glob-7.1.6"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."inflight-1.0.6"
sources."inherits-2.0.4"
sources."isarray-1.0.0"
@@ -80361,7 +80709,7 @@ in
sources."function-bind-1.1.1"
sources."get-stdin-5.0.1"
sources."glob-7.1.6"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."has-1.0.3"
sources."has-ansi-2.0.0"
sources."has-symbols-1.0.1"
@@ -80667,7 +81015,7 @@ in
sources."glob-7.1.6"
sources."global-dirs-0.1.1"
sources."got-6.7.1"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."has-flag-3.0.0"
sources."hosted-git-info-2.8.8"
sources."ignore-3.3.10"
@@ -81178,10 +81526,10 @@ in
textlint-rule-unexpanded-acronym = nodeEnv.buildNodePackage {
name = "textlint-rule-unexpanded-acronym";
packageName = "textlint-rule-unexpanded-acronym";
- version = "1.2.3";
+ version = "1.2.4";
src = fetchurl {
- url = "https://registry.npmjs.org/textlint-rule-unexpanded-acronym/-/textlint-rule-unexpanded-acronym-1.2.3.tgz";
- sha512 = "kkbsbUlI3Gw4VTr79E825+2wuxPG8dM8T4VjEH25zlNhh3j8vpsVDjpbXRkVFl+EvDBCtDZEDaFPwhXy85toVQ==";
+ url = "https://registry.npmjs.org/textlint-rule-unexpanded-acronym/-/textlint-rule-unexpanded-acronym-1.2.4.tgz";
+ sha512 = "F1kV06CdonOM2awtXjCSRYUsRJfDfZIujQQo4zEMqNqD6UwpkapxpZOiwcwbeaQz00+17ljbJEoGqIe2XeiU+w==";
};
dependencies = [
sources."array-includes-3.1.1"
@@ -81272,7 +81620,7 @@ in
sources."@types/debug-4.1.5"
sources."@types/http-cache-semantics-4.0.0"
sources."@types/keyv-3.1.1"
- sources."@types/node-13.13.2"
+ sources."@types/node-13.13.4"
sources."@types/responselike-1.0.0"
sources."abbrev-1.1.1"
sources."abstract-logging-1.0.0"
@@ -81419,7 +81767,7 @@ in
sources."getpass-0.1.7"
sources."glob-7.1.6"
sources."got-10.6.0"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."grapheme-splitter-1.0.4"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
@@ -81674,7 +82022,7 @@ in
sources."wide-align-1.1.3"
sources."with-open-file-0.1.7"
sources."wrappy-1.0.2"
- sources."ws-7.2.3"
+ sources."ws-7.2.5"
sources."xmlhttprequest-ssl-1.5.5"
sources."yallist-3.1.1"
sources."yarn-1.22.0"
@@ -81693,10 +82041,10 @@ in
three = nodeEnv.buildNodePackage {
name = "three";
packageName = "three";
- version = "0.115.0";
+ version = "0.116.1";
src = fetchurl {
- url = "https://registry.npmjs.org/three/-/three-0.115.0.tgz";
- sha512 = "mAV2Ky3RdcbdSbR9capI+tKLvRldWYxd4151PZTT/o7+U2jh9Is3a4KmnYwzyUAhB2ZA3pXSgCd2DOY4Tj5kow==";
+ url = "https://registry.npmjs.org/three/-/three-0.116.1.tgz";
+ sha512 = "l2JCMiA/lVZAuSrLWRYMalvpR+0j8hbIhCpfs4V6JFnw2+JQEQJ5HltNpfFr+9TDpQts1BhtcISehWf/xBGPvQ==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -81773,7 +82121,7 @@ in
sources."fs.realpath-1.0.0"
sources."getpass-0.1.7"
sources."glob-7.1.6"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
sources."http-signature-1.2.0"
@@ -81790,11 +82138,11 @@ in
sources."jsprim-1.4.1"
sources."keypress-0.2.1"
sources."lodash-4.17.15"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."minimatch-3.0.4"
sources."minimist-0.0.10"
- sources."moment-2.24.0"
+ sources."moment-2.25.3"
(sources."node-appc-0.2.49" // {
dependencies = [
sources."temp-0.8.4"
@@ -81854,10 +82202,10 @@ in
triton = nodeEnv.buildNodePackage {
name = "triton";
packageName = "triton";
- version = "7.8.0";
+ version = "7.9.0";
src = fetchurl {
- url = "https://registry.npmjs.org/triton/-/triton-7.8.0.tgz";
- sha512 = "/f9E08NvOvOyudT1ar0ENjtJqcFuEnVMBhEpgQda8dQibxgOEbK7dOkc6T0OZ3ve1E3wXn8JVnY+l1EBZ/8/5w==";
+ url = "https://registry.npmjs.org/triton/-/triton-7.9.0.tgz";
+ sha512 = "PCZVVbdI90e07avgNyBJiw32Q0YIFwqgIW/HFbU5g3Hh/+P5VBJP8TBlkXM27VCM7L3hyCC3z9K8uq9mI8aIVQ==";
};
dependencies = [
sources."asn1-0.2.4"
@@ -81926,7 +82274,7 @@ in
sources."minimatch-3.0.4"
sources."minimist-0.0.8"
sources."mkdirp-0.5.1"
- sources."moment-2.24.0"
+ sources."moment-2.25.3"
sources."mooremachine-2.3.0"
sources."mute-stream-0.0.8"
sources."mv-2.1.1"
@@ -82152,7 +82500,7 @@ in
sources."commander-2.20.3"
sources."crypto-random-string-1.0.0"
sources."fs-extra-7.0.1"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."jsonfile-4.0.0"
sources."p-debounce-1.0.0"
sources."temp-dir-1.0.0"
@@ -82178,10 +82526,10 @@ in
uglify-js = nodeEnv.buildNodePackage {
name = "uglify-js";
packageName = "uglify-js";
- version = "3.9.1";
+ version = "3.9.2";
src = fetchurl {
- url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.9.1.tgz";
- sha512 = "JUPoL1jHsc9fOjVFHdQIhqEEJsQvfKDjlubcCilu8U26uZ73qOg8VsN8O1jbuei44ZPlwL7kmbAdM4tzaUvqnA==";
+ url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.9.2.tgz";
+ sha512 = "zGVwKslUAD/EeqOrD1nQaBmXIHl1Vw371we8cvS8I6mYK9rmgX5tv8AAeJdfsQ3Kk5mGax2SVV/AizxdNGhl7Q==";
};
dependencies = [
sources."commander-2.20.3"
@@ -82209,7 +82557,7 @@ in
sources."@sindresorhus/is-0.14.0"
sources."@szmarczak/http-timer-1.1.2"
sources."@types/color-name-1.1.1"
- sources."@types/node-13.13.2"
+ sources."@types/node-13.13.4"
sources."abbrev-1.1.1"
sources."accepts-1.3.7"
sources."after-0.8.2"
@@ -82351,7 +82699,7 @@ in
sources."is-docker-2.0.0"
sources."is-fullwidth-code-point-3.0.0"
sources."is-stream-1.1.0"
- sources."is-wsl-2.1.1"
+ sources."is-wsl-2.2.0"
sources."isarray-2.0.1"
sources."jquery-3.4.1"
sources."jquery-ui-bundle-1.12.1"
@@ -82380,8 +82728,8 @@ in
sources."merge-descriptors-1.0.1"
sources."methods-1.1.2"
sources."mime-1.6.0"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."mimic-response-1.0.1"
sources."minimatch-3.0.4"
sources."minimist-1.2.5"
@@ -82490,9 +82838,9 @@ in
dependencies = [
sources."component-emitter-1.3.0"
sources."debug-4.1.1"
- sources."mime-2.4.4"
+ sources."mime-2.4.5"
sources."ms-2.1.2"
- sources."qs-6.9.3"
+ sources."qs-6.9.4"
sources."semver-6.3.0"
];
})
@@ -82524,7 +82872,7 @@ in
})
sources."wrap-ansi-6.2.0"
sources."wrappy-1.0.2"
- sources."ws-7.2.3"
+ sources."ws-7.2.5"
sources."xmlhttprequest-ssl-1.5.5"
sources."y18n-4.0.0"
sources."yallist-2.1.2"
@@ -82716,7 +83064,7 @@ in
sources."git-clone-0.1.0"
sources."glob-7.1.6"
sources."got-6.7.1"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."graceful-readlink-1.0.1"
sources."gray-matter-2.1.1"
sources."handlebars-4.7.6"
@@ -82743,7 +83091,6 @@ in
sources."is-fullwidth-code-point-2.0.0"
sources."is-natural-number-4.0.1"
sources."is-object-1.0.1"
- sources."is-promise-2.1.0"
sources."is-redirect-1.0.0"
sources."is-retry-allowed-1.2.0"
sources."is-stream-1.1.0"
@@ -82777,8 +83124,8 @@ in
sources."supports-color-2.0.0"
];
})
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."mimic-fn-1.2.0"
sources."minimatch-3.0.4"
sources."minimist-1.2.5"
@@ -82820,7 +83167,7 @@ in
sources."request-2.88.2"
sources."restore-cursor-2.0.0"
sources."rimraf-2.7.1"
- sources."run-async-2.4.0"
+ sources."run-async-2.4.1"
sources."rxjs-6.5.5"
sources."safe-buffer-5.2.0"
sources."safer-buffer-2.1.2"
@@ -82867,7 +83214,7 @@ in
sources."tslib-1.11.1"
sources."tunnel-agent-0.6.0"
sources."tweetnacl-0.14.5"
- sources."uglify-js-3.9.1"
+ sources."uglify-js-3.9.2"
sources."uid-0.0.2"
sources."unbzip2-stream-1.4.2"
sources."unyield-0.0.1"
@@ -82926,7 +83273,7 @@ in
sources."@starptech/rehype-webparser-0.10.0"
sources."@starptech/webparser-0.10.0"
sources."@szmarczak/http-timer-1.1.2"
- sources."@types/node-13.13.2"
+ sources."@types/node-13.13.4"
sources."@types/unist-2.0.3"
sources."@types/vfile-3.0.2"
sources."@types/vfile-message-2.0.0"
@@ -83250,7 +83597,7 @@ in
sources."get-stream-4.1.0"
];
})
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."gridsome-helper-json-1.0.3"
sources."has-1.0.3"
(sources."has-ansi-2.0.0" // {
@@ -83332,7 +83679,6 @@ in
sources."is-plain-object-2.0.4"
sources."is-posix-bracket-0.1.1"
sources."is-primitive-2.0.0"
- sources."is-promise-2.1.0"
sources."is-resolvable-1.1.0"
sources."is-stream-1.1.0"
sources."is-utf8-0.2.1"
@@ -83541,7 +83887,7 @@ in
sources."pretty-format-23.6.0"
sources."process-nextick-args-2.0.1"
sources."progress-2.0.3"
- sources."property-information-5.4.0"
+ sources."property-information-5.5.0"
sources."proto-list-1.2.4"
sources."pseudomap-1.0.2"
sources."pump-3.0.0"
@@ -83604,7 +83950,7 @@ in
sources."restore-cursor-2.0.0"
sources."ret-0.1.15"
sources."rimraf-2.6.3"
- sources."run-async-2.4.0"
+ sources."run-async-2.4.1"
sources."rx-lite-4.0.8"
sources."rx-lite-aggregates-4.0.8"
sources."rxjs-6.5.5"
@@ -83843,7 +84189,7 @@ in
})
sources."vfile-sort-2.2.2"
sources."vfile-statistics-1.1.4"
- (sources."vscode-css-languageservice-4.1.1" // {
+ (sources."vscode-css-languageservice-4.1.2" // {
dependencies = [
sources."vscode-uri-2.1.1"
];
@@ -83926,14 +84272,14 @@ in
})
sources."@babel/polyfill-7.7.0"
sources."@babel/runtime-7.7.7"
- sources."@babel/runtime-corejs3-7.9.2"
+ sources."@babel/runtime-corejs3-7.9.6"
sources."@cliqz-oss/firefox-client-0.3.1"
sources."@cliqz-oss/node-firefox-connect-1.2.1"
sources."@sindresorhus/is-0.14.0"
sources."@szmarczak/http-timer-1.1.2"
sources."@types/color-name-1.1.1"
sources."@types/minimatch-3.0.3"
- sources."@types/node-13.13.2"
+ sources."@types/node-13.13.4"
sources."JSONSelect-0.2.1"
sources."acorn-6.4.1"
sources."acorn-jsx-5.2.0"
@@ -84414,7 +84760,7 @@ in
sources."get-stream-4.1.0"
];
})
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."graceful-readlink-1.0.1"
sources."growly-1.3.0"
sources."har-schema-2.0.0"
@@ -84482,6 +84828,7 @@ in
sources."is-data-descriptor-1.0.0"
sources."is-date-object-1.0.2"
sources."is-descriptor-1.0.2"
+ sources."is-docker-2.0.0"
sources."is-extendable-1.0.1"
sources."is-extglob-2.1.1"
sources."is-fullwidth-code-point-3.0.0"
@@ -84499,7 +84846,6 @@ in
sources."is-obj-2.0.0"
sources."is-path-inside-3.0.2"
sources."is-plain-object-2.0.4"
- sources."is-promise-2.1.0"
sources."is-property-1.0.2"
sources."is-regex-1.0.5"
sources."is-relative-0.1.3"
@@ -84509,7 +84855,7 @@ in
sources."is-typedarray-1.0.0"
sources."is-utf8-0.2.1"
sources."is-windows-1.0.2"
- sources."is-wsl-2.1.1"
+ sources."is-wsl-2.2.0"
sources."is-yarn-global-0.3.0"
sources."isarray-1.0.0"
sources."isexe-2.0.0"
@@ -84584,15 +84930,15 @@ in
})
sources."merge-stream-2.0.0"
sources."micromatch-3.1.10"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."mimic-fn-1.2.0"
sources."mimic-response-1.0.1"
sources."minimatch-3.0.4"
sources."minimist-1.2.5"
sources."mixin-deep-1.3.2"
sources."mkdirp-1.0.3"
- sources."moment-2.24.0"
+ sources."moment-2.25.3"
sources."ms-2.0.0"
sources."multimatch-4.0.0"
sources."mute-stream-0.0.7"
@@ -84762,7 +85108,7 @@ in
sources."restore-cursor-2.0.0"
sources."ret-0.1.15"
sources."rimraf-2.6.3"
- sources."run-async-2.4.0"
+ sources."run-async-2.4.1"
sources."rx-lite-3.1.2"
sources."rxjs-6.5.5"
sources."safe-buffer-5.2.0"
@@ -85222,14 +85568,19 @@ in
sources."is-glob-3.1.0"
];
})
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."has-value-1.0.0"
(sources."has-values-1.0.0" // {
dependencies = [
sources."kind-of-4.0.0"
];
})
- sources."hash-base-3.0.4"
+ (sources."hash-base-3.1.0" // {
+ dependencies = [
+ sources."readable-stream-3.6.0"
+ sources."safe-buffer-5.2.0"
+ ];
+ })
sources."hash.js-1.1.7"
sources."hmac-drbg-1.0.1"
sources."https-browserify-1.0.0"
@@ -85397,7 +85748,7 @@ in
sources."source-list-map-2.0.1"
sources."source-map-0.5.7"
sources."source-map-resolve-0.5.3"
- (sources."source-map-support-0.5.18" // {
+ (sources."source-map-support-0.5.19" // {
dependencies = [
sources."source-map-0.6.1"
];
@@ -85428,7 +85779,7 @@ in
sources."stream-shift-1.0.1"
sources."string_decoder-1.1.1"
sources."tapable-1.1.3"
- (sources."terser-4.6.11" // {
+ (sources."terser-4.6.13" // {
dependencies = [
sources."source-map-0.6.1"
];
@@ -85622,7 +85973,7 @@ in
];
})
sources."global-prefix-1.0.2"
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."has-flag-3.0.0"
sources."has-value-1.0.0"
(sources."has-values-1.0.0" // {
@@ -85843,7 +86194,7 @@ in
sources."@types/events-3.0.0"
sources."@types/glob-7.1.1"
sources."@types/minimatch-3.0.3"
- sources."@types/node-13.13.2"
+ sources."@types/node-13.13.4"
sources."accepts-1.3.7"
sources."ajv-6.12.2"
sources."ajv-errors-1.0.1"
@@ -86053,7 +86404,7 @@ in
sources."pify-2.3.0"
];
})
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."handle-thing-2.0.1"
sources."has-1.0.3"
sources."has-flag-3.0.0"
@@ -86132,8 +86483,8 @@ in
sources."methods-1.1.2"
sources."micromatch-3.1.10"
sources."mime-1.6.0"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."mimic-fn-2.1.0"
sources."minimalistic-assert-1.0.1"
sources."minimatch-3.0.4"
@@ -86198,7 +86549,7 @@ in
sources."pinkie-2.0.4"
sources."pinkie-promise-2.0.1"
sources."pkg-dir-3.0.0"
- (sources."portfinder-1.0.25" // {
+ (sources."portfinder-1.0.26" // {
dependencies = [
sources."debug-3.2.6"
sources."ms-2.1.2"
@@ -86404,7 +86755,7 @@ in
sources."wbuf-1.7.3"
(sources."webpack-dev-middleware-3.7.2" // {
dependencies = [
- sources."mime-2.4.4"
+ sources."mime-2.4.5"
];
})
sources."webpack-log-2.0.0"
@@ -86486,7 +86837,7 @@ in
sources."pify-3.0.0"
];
})
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."iferr-0.1.5"
sources."ignore-3.3.10"
sources."imurmurhash-0.1.4"
@@ -86587,7 +86938,7 @@ in
sources."@protobufjs/pool-1.1.0"
sources."@protobufjs/utf8-1.1.0"
sources."@types/long-4.0.1"
- sources."@types/node-13.13.2"
+ sources."@types/node-13.13.4"
sources."addr-to-ip-port-1.5.1"
sources."airplay-js-0.3.0"
sources."balanced-match-1.0.0"
@@ -86696,7 +87047,7 @@ in
sources."is-docker-2.0.0"
sources."is-file-1.0.0"
sources."is-typedarray-1.0.0"
- sources."is-wsl-2.1.1"
+ sources."is-wsl-2.2.0"
sources."isarray-1.0.0"
sources."junk-3.1.0"
sources."k-bucket-5.0.0"
@@ -86717,12 +87068,12 @@ in
sources."mdns-js-packet-0.2.0"
sources."mediasource-2.3.0"
sources."memory-chunk-store-1.3.0"
- sources."mime-2.4.4"
+ sources."mime-2.4.5"
sources."mimic-response-1.0.1"
sources."minimatch-3.0.4"
sources."minimist-1.2.5"
- sources."mkdirp-classic-0.5.2"
- sources."moment-2.24.0"
+ sources."mkdirp-classic-0.5.3"
+ sources."moment-2.25.3"
sources."mp4-box-encoding-1.4.1"
sources."mp4-stream-3.1.0"
sources."ms-2.0.0"
@@ -86849,7 +87200,7 @@ in
})
sources."winreg-1.2.4"
sources."wrappy-1.0.2"
- sources."ws-7.2.3"
+ sources."ws-7.2.5"
sources."xml2js-0.4.23"
sources."xmlbuilder-11.0.1"
sources."xmldom-0.1.31"
@@ -86932,7 +87283,7 @@ in
sources."prettier-1.19.1"
sources."request-light-0.2.5"
sources."sprintf-js-1.0.3"
- sources."vscode-json-languageservice-3.5.2"
+ sources."vscode-json-languageservice-3.6.0"
sources."vscode-jsonrpc-4.0.0"
(sources."vscode-languageserver-5.2.1" // {
dependencies = [
@@ -86990,7 +87341,7 @@ in
sources."@babel/code-frame-7.8.3"
sources."@babel/helper-validator-identifier-7.9.5"
sources."@babel/highlight-7.9.0"
- sources."@babel/runtime-7.9.2"
+ sources."@babel/runtime-7.9.6"
sources."@mrmlnc/readdir-enhanced-2.2.1"
sources."@nodelib/fs.stat-1.1.3"
sources."@sindresorhus/is-0.7.0"
@@ -86998,8 +87349,9 @@ in
sources."@types/events-3.0.0"
sources."@types/glob-7.1.1"
sources."@types/minimatch-3.0.3"
- sources."@types/node-13.13.2"
+ sources."@types/node-13.13.4"
sources."@types/normalize-package-data-2.4.0"
+ sources."JSONStream-1.3.5"
sources."aggregate-error-3.0.1"
sources."ajv-6.12.2"
sources."ansi-0.3.1"
@@ -87026,6 +87378,11 @@ in
sources."atob-2.1.2"
sources."aws-sign2-0.7.0"
sources."aws4-1.9.1"
+ (sources."axios-0.18.1" // {
+ dependencies = [
+ sources."is-buffer-2.0.4"
+ ];
+ })
sources."balanced-match-1.0.0"
(sources."base-0.11.2" // {
dependencies = [
@@ -87093,6 +87450,7 @@ in
sources."cli-width-2.2.1"
sources."clone-1.0.4"
sources."clone-buffer-1.0.0"
+ sources."clone-deep-4.0.1"
sources."clone-regexp-1.0.1"
sources."clone-response-1.0.2"
sources."clone-stats-0.0.1"
@@ -87140,6 +87498,7 @@ in
})
sources."dot-prop-4.2.0"
sources."downgrade-root-1.2.2"
+ sources."download-stats-0.3.4"
sources."duplexer3-0.1.4"
sources."ecc-jsbn-0.1.2"
(sources."editions-2.3.0" // {
@@ -87152,7 +87511,7 @@ in
sources."encodeurl-1.0.2"
sources."end-of-stream-1.4.4"
sources."env-paths-1.0.0"
- sources."errlop-2.1.0"
+ sources."errlop-2.2.0"
sources."error-7.2.1"
sources."error-ex-1.3.2"
sources."es6-error-4.1.1"
@@ -87206,6 +87565,11 @@ in
sources."find-up-2.1.0"
sources."find-versions-2.0.0"
sources."first-chunk-stream-2.0.0"
+ (sources."follow-redirects-1.5.10" // {
+ dependencies = [
+ sources."debug-3.1.0"
+ ];
+ })
sources."for-in-1.0.2"
sources."foreachasync-3.0.0"
sources."forever-agent-0.6.1"
@@ -87250,7 +87614,7 @@ in
sources."p-cancelable-0.4.1"
];
})
- sources."graceful-fs-4.2.3"
+ sources."graceful-fs-4.2.4"
sources."grouped-queue-1.1.0"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
@@ -87315,7 +87679,6 @@ in
sources."is-path-inside-1.0.1"
sources."is-plain-obj-1.1.0"
sources."is-plain-object-2.0.4"
- sources."is-promise-2.1.0"
sources."is-redirect-1.0.0"
sources."is-regexp-1.0.0"
sources."is-retry-allowed-1.2.0"
@@ -87341,6 +87704,7 @@ in
sources."json-schema-0.2.3"
sources."json-schema-traverse-0.4.1"
sources."json-stringify-safe-5.0.1"
+ sources."jsonparse-1.3.1"
sources."jsprim-1.4.1"
sources."keyv-3.0.0"
sources."kind-of-6.0.3"
@@ -87353,6 +87717,7 @@ in
sources."url-parse-lax-1.0.0"
];
})
+ sources."lazy-cache-2.0.2"
sources."lines-and-columns-1.1.6"
(sources."load-json-file-1.1.0" // {
dependencies = [
@@ -87396,7 +87761,7 @@ in
];
})
sources."pify-4.0.1"
- sources."replace-ext-1.0.0"
+ sources."replace-ext-1.0.1"
sources."slash-2.0.0"
sources."through2-3.0.1"
sources."vinyl-2.2.0"
@@ -87412,8 +87777,8 @@ in
sources."merge-stream-2.0.0"
sources."merge2-1.3.0"
sources."micromatch-3.1.10"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."mimic-fn-2.1.0"
sources."mimic-response-1.0.1"
sources."minimatch-3.0.4"
@@ -87424,6 +87789,7 @@ in
];
})
sources."mkdirp-0.5.5"
+ sources."moment-2.25.3"
sources."ms-2.0.0"
(sources."multimatch-4.0.0" // {
dependencies = [
@@ -87436,6 +87802,7 @@ in
sources."nice-try-1.0.5"
sources."normalize-package-data-2.5.0"
sources."normalize-url-2.0.1"
+ sources."npm-api-1.0.0"
sources."npm-conf-1.1.3"
(sources."npm-keyword-5.0.0" // {
dependencies = [
@@ -87491,6 +87858,7 @@ in
sources."p-try-1.0.0"
sources."package-json-5.0.0"
sources."pad-component-0.0.1"
+ sources."paged-request-2.0.1"
sources."parse-help-1.0.0"
sources."parse-json-2.2.0"
sources."pascalcase-0.1.1"
@@ -87576,7 +87944,7 @@ in
sources."rimraf-2.7.1"
sources."roarr-2.15.3"
sources."root-check-1.0.0"
- sources."run-async-2.4.0"
+ sources."run-async-2.4.1"
sources."rx-4.1.0"
sources."rxjs-6.5.5"
sources."safe-buffer-5.2.0"
@@ -87593,14 +87961,16 @@ in
sources."type-fest-0.8.1"
];
})
+ sources."set-getter-0.1.0"
(sources."set-value-2.0.1" // {
dependencies = [
sources."extend-shallow-2.0.1"
];
})
+ sources."shallow-clone-3.0.1"
sources."shebang-command-1.2.0"
sources."shebang-regex-1.0.0"
- sources."shelljs-0.8.3"
+ sources."shelljs-0.8.4"
sources."signal-exit-3.0.3"
sources."slash-1.0.0"
(sources."snapdragon-0.8.2" // {
@@ -87811,7 +88181,7 @@ in
];
})
sources."yeoman-doctor-4.0.0"
- (sources."yeoman-environment-2.9.5" // {
+ (sources."yeoman-environment-2.10.0" // {
dependencies = [
sources."ansi-escapes-4.3.1"
sources."ansi-regex-5.0.0"
@@ -87857,7 +88227,7 @@ in
sources."which-2.0.2"
];
})
- (sources."yeoman-generator-4.8.3" // {
+ (sources."yeoman-generator-4.10.0" // {
dependencies = [
sources."debug-4.1.1"
sources."diff-4.0.2"
diff --git a/pkgs/development/ocaml-modules/async_find/default.nix b/pkgs/development/ocaml-modules/async_find/default.nix
deleted file mode 100644
index aa797cdace35..000000000000
--- a/pkgs/development/ocaml-modules/async_find/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{stdenv, buildOcaml, fetchurl, async_p4, core_p4, sexplib_p4}:
-
-buildOcaml rec {
- name = "async_find";
- version = "111.28.00";
-
- minimumSupportedOcamlVersion = "4.02";
-
- src = fetchurl {
- url = "https://github.com/janestreet/async_find/archive/${version}.tar.gz";
- sha256 = "4e3fda72f50174f05d96a5a09323f236c041b1a685890c155822956f3deb8803";
- };
-
- propagatedBuildInputs = [ async_p4 core_p4 sexplib_p4 ];
-
- meta = with stdenv.lib; {
- homepage = "https://github.com/janestreet/async_find";
- description = "Directory traversal with Async";
- license = licenses.asl20;
- maintainers = [ maintainers.ericbmerritt ];
- };
-}
diff --git a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
index 20ade26f9099..b01d4b4a04c2 100644
--- a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
+++ b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
@@ -1,8 +1,10 @@
-{ stdenv, fetchFromGitHub, buildDunePackage, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm }:
+{ stdenv, fetchFromGitHub, buildDunePackage
+, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm
+}:
buildDunePackage rec {
pname = "gapi-ocaml";
- version = "0.3.6";
+ version = "0.3.19";
minimumOCamlVersion = "4.02";
@@ -10,10 +12,11 @@ buildDunePackage rec {
owner = "astrada";
repo = pname;
rev = "v${version}";
- sha256 = "0qgsy51bhkpfgl5rdnjw4bqs5fbh2w4vwrfbl8y3lh1wrqmnwci4";
+ sha256 = "04arif1p1vj5yr24cwicj70b7yx17hrgf4pl47vqg8ngcrdh71v9";
};
- propagatedBuildInputs = [ ocurl cryptokit ocaml_extlib yojson ocamlnet xmlm ];
+ propagatedBuildInputs = [ ocurl cryptokit ocaml_extlib ocamlnet yojson ];
+ buildInputs = [ xmlm ];
meta = {
description = "OCaml client for google services";
diff --git a/pkgs/development/ocaml-modules/owl/default.nix b/pkgs/development/ocaml-modules/owl/default.nix
index b306ee9ce6d2..7dd1d525a462 100644
--- a/pkgs/development/ocaml-modules/owl/default.nix
+++ b/pkgs/development/ocaml-modules/owl/default.nix
@@ -6,13 +6,11 @@
, eigen
, stdio
, stdlib-shims
-, openblas, blas, lapack
+, openblasCompat
, owl-base
, npy
}:
-assert (!blas.isILP64) && (!lapack.isILP64);
-assert blas.implementation == "openblas" && lapack.implementation == "openblas";
buildDunePackage rec {
pname = "owl";
@@ -22,7 +20,7 @@ buildDunePackage rec {
checkInputs = [ alcotest ];
buildInputs = [ dune-configurator ];
propagatedBuildInputs = [
- eigen stdio stdlib-shims openblas owl-base npy
+ eigen stdio stdlib-shims openblasCompat owl-base npy
];
doCheck = !stdenv.isDarwin; # https://github.com/owlbarn/owl/issues/462
diff --git a/pkgs/development/python-modules/aiohttp-socks/default.nix b/pkgs/development/python-modules/aiohttp-socks/default.nix
index 392c77036ca3..7b0bfe80684a 100644
--- a/pkgs/development/python-modules/aiohttp-socks/default.nix
+++ b/pkgs/development/python-modules/aiohttp-socks/default.nix
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "aiohttp-socks";
- version = "0.3.7";
+ version = "0.3.9";
src = fetchPypi {
inherit version;
pname = "aiohttp_socks";
- sha256 = "00zqlkhfrp1jczgjppaksriidyfshnj0jvrcryn1x77dmy73m023";
+ sha256 = "1mn2ng66951mri49f99zh3660j83kvqhr6dpx90s9fkjwk83hmjy";
};
propagatedBuildInputs = [ aiohttp attrs ];
diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix
index bd3e5662e185..b9c710e68884 100644
--- a/pkgs/development/python-modules/ansible/default.nix
+++ b/pkgs/development/python-modules/ansible/default.nix
@@ -18,13 +18,13 @@
buildPythonPackage rec {
pname = "ansible";
- version = "2.9.2";
+ version = "2.9.7";
src = fetchFromGitHub {
owner = "ansible";
repo = "ansible";
rev = "v${version}";
- sha256 = "06vxvn5q13rxzndwzq3g6yxiqm361ma9zcvwbrfn630xkmsg4pd8";
+ sha256 = "0miid7h720i630qljcjdmgdblflhrl2pwqjgiq5wm8jr61c3ld6s";
};
prePatch = ''
diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix
index ccefe60ea089..715e4da8f44e 100644
--- a/pkgs/development/python-modules/autopep8/default.nix
+++ b/pkgs/development/python-modules/autopep8/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "autopep8";
- version = "1.5.1";
+ version = "1.5.2";
src = fetchPypi {
inherit pname version;
- sha256 = "1swr8ccm3mafcm3zpbwyn22kjs39lbqmg8w41sh7yb3gskgy2syc";
+ sha256 = "0m29ndgrcgrzi3y1fsxmdl421x6n4gn02l70hsz8486h8zzdhbqm";
};
propagatedBuildInputs = [ pycodestyle ];
diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix
index 97c6b957a437..e8a20b6df47d 100644
--- a/pkgs/development/python-modules/binwalk/default.nix
+++ b/pkgs/development/python-modules/binwalk/default.nix
@@ -7,7 +7,6 @@
, gzip
, bzip2
, gnutar
-, p7zip
, cabextract
, lzma
, nose
@@ -29,7 +28,7 @@ buildPythonPackage {
sha256 = "1bxgj569fzwv6jhcbl864nmlsi9x1k1r20aywjxc8b9b1zgqrlvc";
};
- propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract lzma pycrypto ]
+ propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar cabextract lzma pycrypto ]
++ stdenv.lib.optional visualizationSupport pyqtgraph;
# setup.py only installs version.py during install, not test
diff --git a/pkgs/development/python-modules/bitstruct/default.nix b/pkgs/development/python-modules/bitstruct/default.nix
index 7c58aab85c4c..aff3f70cb88a 100644
--- a/pkgs/development/python-modules/bitstruct/default.nix
+++ b/pkgs/development/python-modules/bitstruct/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "bitstruct";
- version = "8.8.1";
+ version = "8.10.0";
src = fetchPypi {
inherit pname version;
- sha256 = "84893f90eb78f8179af24a87622ef964ede5c7e785562022917033987d6ce198";
+ sha256 = "0dncll29a0lx8hn1xlhr32abkvj1rh8xa6gc0aas8wnqzh7bvqqm";
};
meta = with lib; {
diff --git a/pkgs/development/python-modules/cftime/default.nix b/pkgs/development/python-modules/cftime/default.nix
index 5046017a94d3..60946d23a1ed 100644
--- a/pkgs/development/python-modules/cftime/default.nix
+++ b/pkgs/development/python-modules/cftime/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "cftime";
- version = "1.0.4.2";
+ version = "1.1.2";
src = fetchPypi {
inherit pname version;
- sha256 = "1ac64f8f9066ea756ea27d67cedaf064e7c866275218fa7c84684066a5890f70";
+ sha256 = "17w9myl8mg4isv4lb1nv64zim53ishi32f6m5m0s00q9a6v5qfb0";
};
checkInputs = [ pytest coveralls pytestcov ];
diff --git a/pkgs/development/python-modules/clikit/default.nix b/pkgs/development/python-modules/clikit/default.nix
index 32e9b4fcb4a6..98533f95f922 100644
--- a/pkgs/development/python-modules/clikit/default.nix
+++ b/pkgs/development/python-modules/clikit/default.nix
@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi
-, isPy27, isPy34
+, isPy27
, pylev, pastel, typing, enum34 }:
buildPythonPackage rec {
@@ -13,8 +13,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
pylev pastel
- ] ++ lib.optional (isPy27 || isPy34) typing
- ++ lib.optional isPy27 enum34;
+ ] ++ lib.optionals isPy27 [ typing enum34 ];
# The Pypi tarball doesn't include tests, and the GitHub source isn't
# buildable until we bootstrap poetry, see
diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix
index 13f68d6a3927..9d58c130582e 100644
--- a/pkgs/development/python-modules/cmd2/default.nix
+++ b/pkgs/development/python-modules/cmd2/default.nix
@@ -6,11 +6,11 @@
}:
buildPythonPackage rec {
pname = "cmd2";
- version = "1.0.1";
+ version = "1.0.2";
src = fetchPypi {
inherit pname version;
- sha256 = "0fjwc095y97n3a7jxl9pk4h1i5hghas7y6zhgprl5lv5ixnicffk";
+ sha256 = "1f18plbc9yyvhn0js3d2bii9yld8zfl775gxsaw9jza5pmlg9ss2";
};
LC_ALL="en_US.UTF-8";
diff --git a/pkgs/development/python-modules/deprecation/default.nix b/pkgs/development/python-modules/deprecation/default.nix
index 7478c18b2c0f..fb5698062f77 100644
--- a/pkgs/development/python-modules/deprecation/default.nix
+++ b/pkgs/development/python-modules/deprecation/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "deprecation";
- version = "2.0.7";
+ version = "2.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1vcjy6flqbzgjh4zhcs0sl83b946wxrlsx5miliz0ik1d9kjyff0";
+ sha256 = "1zqqjlgmhgkpzg9ss5ki8wamxl83xn51fs6gn2a8cxsx9vkbvcvj";
};
propagatedBuildInputs = [ packaging ];
diff --git a/pkgs/development/python-modules/dicom2nifti/default.nix b/pkgs/development/python-modules/dicom2nifti/default.nix
new file mode 100644
index 000000000000..abc07346efd3
--- /dev/null
+++ b/pkgs/development/python-modules/dicom2nifti/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, isPy27
+, gdcm
+, nose
+, nibabel
+, numpy
+, pydicom
+, scipy
+}:
+
+buildPythonPackage rec {
+ pname = "dicom2nifti";
+ version = "2.2.8";
+ disabled = isPy27;
+
+ # no tests in PyPI dist
+ src = fetchFromGitHub {
+ owner = "icometrix";
+ repo = pname;
+ rev = version;
+ sha256 = "1qi2map6f4pa1l8wsif7ff7rhja6ynrjlm7w306dzvi9l25mia34";
+ };
+
+ propagatedBuildInputs = [ gdcm nibabel numpy pydicom scipy ];
+
+ checkInputs = [ nose gdcm ];
+ checkPhase = "nosetests tests";
+
+ meta = with lib; {
+ homepage = "https://github.com/icometrix/dicom2nifti";
+ description = "Library for converting dicom files to nifti";
+ license = licenses.mit;
+ maintainers = with maintainers; [ bcdarwin ];
+ };
+}
diff --git a/pkgs/development/python-modules/easyprocess/default.nix b/pkgs/development/python-modules/easyprocess/default.nix
index 41a4c1a7a2a5..878b882810f3 100644
--- a/pkgs/development/python-modules/easyprocess/default.nix
+++ b/pkgs/development/python-modules/easyprocess/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "EasyProcess";
- version = "0.2.8";
+ version = "0.2.10";
src = fetchPypi {
inherit pname version;
- sha256 = "da7f67a006e2eb63d86a8f3f4baa9d6752dab9676009a67193a4e433f2f41c2a";
+ sha256 = "06zaxydyqvb5mk5kxs6y3pjbq5nm6lmi3h5g3y41xpic48q5wsv3";
};
# No tests
diff --git a/pkgs/development/python-modules/eggdeps/default.nix b/pkgs/development/python-modules/eggdeps/default.nix
index d10c1a0be654..8c7d7679005e 100644
--- a/pkgs/development/python-modules/eggdeps/default.nix
+++ b/pkgs/development/python-modules/eggdeps/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ zope_interface zope_testing ];
- # tests fail, see http://hydra.nixos.org/build/4316603/log/raw
+ # tests fail, see https://hydra.nixos.org/build/4316603/log/raw
doCheck = false;
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/evdev/default.nix b/pkgs/development/python-modules/evdev/default.nix
index cef6c27e59cf..ab169fe679d8 100644
--- a/pkgs/development/python-modules/evdev/default.nix
+++ b/pkgs/development/python-modules/evdev/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, isPy34, fetchPypi, linuxHeaders }:
+{ lib, buildPythonPackage, fetchPypi, linuxHeaders }:
buildPythonPackage rec {
pname = "evdev";
@@ -17,8 +17,6 @@ buildPythonPackage rec {
doCheck = false;
- disabled = isPy34; # see http://bugs.python.org/issue21121
-
meta = with lib; {
description = "Provides bindings to the generic input event interface in Linux";
homepage = "https://pythonhosted.org/evdev";
diff --git a/pkgs/development/python-modules/ezdxf/default.nix b/pkgs/development/python-modules/ezdxf/default.nix
index 0184ae9ffd77..a745566a6451 100644
--- a/pkgs/development/python-modules/ezdxf/default.nix
+++ b/pkgs/development/python-modules/ezdxf/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, pyparsing, pytest }:
buildPythonPackage rec {
- version = "0.11";
+ version = "0.12";
pname = "ezdxf";
disabled = pythonOlder "3.5";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
owner = "mozman";
repo = "ezdxf";
rev = "v${version}";
- sha256 = "167iw1j1c6195bwv6i8z1m7s0i27r0y0acxd2w76hvnq3a72jbsd";
+ sha256 = "1flcq96ljk5wqrmgsb4acflqzkg7rhlaxz0j5jxky9za0mj1x6dq";
};
checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/filetype/default.nix b/pkgs/development/python-modules/filetype/default.nix
index 40bbc688e205..4bbb6c41f543 100644
--- a/pkgs/development/python-modules/filetype/default.nix
+++ b/pkgs/development/python-modules/filetype/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "filetype";
- version = "1.0.6";
+ version = "1.0.7";
src = fetchPypi {
inherit pname version;
- sha256 = "10985zfx90m527binx3fxvm4nsqmlwf0jj8j8mpbxb8wj8ivkllr";
+ sha256 = "19vav4w8vvcnrps1mirjkrv4pr1khwn5ma6m5pgpxd4qip73wffs";
};
checkPhase = ''
diff --git a/pkgs/development/python-modules/heudiconv/default.nix b/pkgs/development/python-modules/heudiconv/default.nix
new file mode 100644
index 000000000000..29a29a3b6522
--- /dev/null
+++ b/pkgs/development/python-modules/heudiconv/default.nix
@@ -0,0 +1,49 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, isPy27
+, pytest
+, mock
+, dcm2niix
+, nibabel
+, pydicom
+, nipype
+, dcmstack
+, etelemetry
+, filelock
+}:
+
+buildPythonPackage rec {
+ version = "0.8.0";
+ pname = "heudiconv";
+
+ disabled = isPy27;
+
+ src = fetchPypi {
+ inherit pname version;
+ #sha256 = "0gzqqa4pzhywdbvks2qjniwhr89sgipl5k7h9hcjs7cagmy9gb05";
+ sha256 = "1r6y93125mc84c09970ifps5xysp8ffp62rwlzili3q2k1m3fh4v";
+ };
+
+ postPatch = ''
+ # doesn't exist as a separate package with Python 3:
+ substituteInPlace heudiconv/info.py --replace "'pathlib'," ""
+ '';
+
+ propagatedBuildInputs = [
+ dcm2niix nibabel pydicom nipype dcmstack etelemetry filelock
+ ];
+
+ checkInputs = [ dcm2niix pytest mock ];
+
+ # test_monitor and test_dlad require 'inotify' and 'datalad' respectively,
+ # and these aren't in Nixpkgs
+ checkPhase = "pytest -k 'not test_dlad and not test_monitor' heudiconv/tests";
+
+ meta = with stdenv.lib; {
+ homepage = "https://heudiconv.readthedocs.io";
+ description = "Flexible DICOM converter for organizing imaging data";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ bcdarwin ];
+ };
+}
diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix
index 6fcb31a94589..437f03276708 100644
--- a/pkgs/development/python-modules/kombu/default.nix
+++ b/pkgs/development/python-modules/kombu/default.nix
@@ -5,6 +5,8 @@
, pytest
, pytz
, sqlalchemy
+, importlib-metadata
+, pythonOlder
}:
buildPythonPackage rec {
@@ -23,7 +25,11 @@ buildPythonPackage rec {
--replace "amqp==2.5.1" "amqp~=2.5"
'';
- propagatedBuildInputs = [ amqp ];
+ propagatedBuildInputs = [
+ amqp
+ ] ++ lib.optionals (pythonOlder "3.8") [
+ importlib-metadata
+ ];
checkInputs = [ pytest case pytz Pyro4 sqlalchemy ];
# test_redis requires fakeredis, which isn't trivial to package
diff --git a/pkgs/development/python-modules/langcodes/default.nix b/pkgs/development/python-modules/langcodes/default.nix
index 4426e9cb9a88..f5686c1afb40 100644
--- a/pkgs/development/python-modules/langcodes/default.nix
+++ b/pkgs/development/python-modules/langcodes/default.nix
@@ -8,17 +8,16 @@
buildPythonPackage rec {
pname = "langcodes";
- version = "1.4.1";
+ version = "2.0.0";
+ disabled = pythonOlder "3.3";
src = fetchPypi {
inherit pname version;
- sha256 = "1axdiva2qglsjmnx2ak7i6hm0yhp6kbc4lcsgn8ckwy0nq1z3kr2";
+ sha256 = "0xszgmydymzhb0dhx5qvdn3x5z477ld0paw17lwwhlrxffkq5jxz";
};
propagatedBuildInputs = [ marisa-trie ];
- disabled = pythonOlder "3.3";
-
checkInputs = [ nose ];
checkPhase = ''
diff --git a/pkgs/development/python-modules/livestreamer/default.nix b/pkgs/development/python-modules/livestreamer/default.nix
index da789c0f6a66..83bd4bcfb72c 100644
--- a/pkgs/development/python-modules/livestreamer/default.nix
+++ b/pkgs/development/python-modules/livestreamer/default.nix
@@ -7,7 +7,6 @@
, singledispatch
, futures
, isPy27
-, isPy33
}:
buildPythonPackage rec {
@@ -23,8 +22,7 @@ buildPythonPackage rec {
buildInputs = [ pkgs.makeWrapper ];
propagatedBuildInputs = [ pkgs.rtmpdump pycrypto requests ]
- ++ stdenv.lib.optionals isPy27 [ singledispatch futures ]
- ++ stdenv.lib.optionals isPy33 [ singledispatch ];
+ ++ stdenv.lib.optionals isPy27 [ singledispatch futures ];
postInstall = ''
wrapProgram $out/bin/livestreamer --prefix PATH : ${pkgs.rtmpdump}/bin
diff --git a/pkgs/development/python-modules/mortgage/default.nix b/pkgs/development/python-modules/mortgage/default.nix
new file mode 100644
index 000000000000..8861a19811f7
--- /dev/null
+++ b/pkgs/development/python-modules/mortgage/default.nix
@@ -0,0 +1,30 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+ pname = "mortgage";
+ version = "1.0.5";
+
+ src = fetchPypi {
+ inherit version pname;
+ hash = "sha256:18fcb356c631e9cc27fa7019f6ff6021707e34b9ce3a3b7dc815661288709921";
+ };
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ doCheck = false; # No tests in sdist
+
+ disabled = pythonOlder "3.5";
+
+ meta = {
+ description = "Mortgage calculator";
+ license = lib.licenses.mit;
+ };
+
+}
\ No newline at end of file
diff --git a/pkgs/development/python-modules/neo/default.nix b/pkgs/development/python-modules/neo/default.nix
new file mode 100644
index 000000000000..631beabea8a2
--- /dev/null
+++ b/pkgs/development/python-modules/neo/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+, numpy
+, quantities
+}:
+
+buildPythonPackage rec {
+ pname = "neo";
+ version = "0.8.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0n74miad4dadavnzi1hqlyzyk795x7qq2adp71i011534ixs70ik";
+ };
+
+ propagatedBuildInputs = [ numpy quantities ];
+
+ checkInputs = [ nose ];
+
+ checkPhase = ''
+ nosetests --exclude=iotest
+ '';
+
+ meta = with lib; {
+ homepage = "https://neuralensemble.org/neo/";
+ description = "Package for representing electrophysiology data in Python";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ bcdarwin ];
+ };
+}
diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix
index 436c9fe63794..06c6f9cb0c1f 100644
--- a/pkgs/development/python-modules/nipype/default.nix
+++ b/pkgs/development/python-modules/nipype/default.nix
@@ -31,6 +31,7 @@
, xvfbwrapper
, pytestcov
, codecov
+, sphinx
# other dependencies
, which
, bash
@@ -49,11 +50,11 @@ in
buildPythonPackage rec {
pname = "nipype";
- version = "1.3.1";
+ version = "1.4.2";
src = fetchPypi {
inherit pname version;
- sha256 = "bb190964b568d64b04b73d2aa7eae31061fdbc3051d8c27bb34b1632db07ec71";
+ sha256 = "1nr0z0k4xx1vswkp03g1lf8141mr4j2fbwd7wmpay4vz46qcp786";
};
postPatch = ''
@@ -61,6 +62,10 @@ buildPythonPackage rec {
--replace "/usr/bin/env bash" "${bash}/bin/bash"
'';
+ nativeBuildInputs = [
+ sphinx
+ ];
+
propagatedBuildInputs = [
click
dateutil
@@ -102,15 +107,14 @@ buildPythonPackage rec {
doCheck = !stdenv.isDarwin;
# ignore tests which incorrect fail to detect xvfb
checkPhase = ''
- LC_ALL="en_US.UTF-8" pytest -v nipype -k 'not display'
+ LC_ALL="en_US.UTF-8" pytest nipype/tests -k 'not display'
'';
+ pythonImportsCheck = [ "nipype" ];
meta = with stdenv.lib; {
homepage = "https://nipy.org/nipype/";
description = "Neuroimaging in Python: Pipelines and Interfaces";
license = licenses.bsd3;
maintainers = with maintainers; [ ashgillman ];
- # tests hang, blocking reviews of other packages
- broken = isPy38;
};
}
diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix
index 8fbbdb677fd5..71e8eec39416 100644
--- a/pkgs/development/python-modules/numba/default.nix
+++ b/pkgs/development/python-modules/numba/default.nix
@@ -4,7 +4,6 @@
, python
, buildPythonPackage
, isPy27
-, isPy33
, isPy3k
, numpy
, llvmlite
@@ -26,7 +25,8 @@ buildPythonPackage rec {
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
- propagatedBuildInputs = [numpy llvmlite] ++ stdenv.lib.optional (!isPy3k) funcsigs ++ stdenv.lib.optional (isPy27 || isPy33) singledispatch;
+ propagatedBuildInputs = [numpy llvmlite]
+ ++ stdenv.lib.optionals isPy27 [ funcsigs singledispatch];
# Copy test script into $out and run the test suite.
checkPhase = ''
diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix
index 481fd2c5feb7..46be9bc92a28 100644
--- a/pkgs/development/python-modules/poetry/default.nix
+++ b/pkgs/development/python-modules/poetry/default.nix
@@ -1,5 +1,6 @@
{ lib, buildPythonPackage, fetchPypi, callPackage
-, isPy27, isPy34, pythonOlder
+, isPy27
+, pythonOlder
, cleo
, requests
, cachy
@@ -66,8 +67,7 @@ in buildPythonPackage rec {
pexpect
keyring
lockfile
- ] ++ lib.optionals (isPy27 || isPy34) [ typing pathlib2 glob2 ]
- ++ lib.optionals isPy27 [ virtualenv functools32 subprocess32 ]
+ ] ++ lib.optionals isPy27 [ typing pathlib2 glob2 virtualenv functools32 subprocess32 ]
++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
postInstall = ''
diff --git a/pkgs/development/python-modules/powerline/default.nix b/pkgs/development/python-modules/powerline/default.nix
index 098ad5300848..3c4c6ae4ec7d 100644
--- a/pkgs/development/python-modules/powerline/default.nix
+++ b/pkgs/development/python-modules/powerline/default.nix
@@ -37,6 +37,10 @@ buildPythonPackage rec {
install -dm755 "$out/share/tmux"
install -m644 "powerline/bindings/tmux/powerline.conf" "$out/share/tmux/powerline.conf"
+
+ install -dm755 "$out/share/fish/vendor_functions.d"
+ install -m644 "powerline/bindings/fish/powerline-setup.fish" "$out/share/fish/vendor_functions.d/powerline-setup.fish"
+
'';
meta = {
diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix
index fbefd7efefa6..d61279e38d5d 100644
--- a/pkgs/development/python-modules/pycairo/default.nix
+++ b/pkgs/development/python-modules/pycairo/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, meson, ninja, buildPythonPackage, pytest, pkgconfig, cairo, xlibsWrapper, isPy33, isPy3k }:
+{ lib, fetchFromGitHub, meson, ninja, buildPythonPackage, pytest, pkgconfig, cairo, xlibsWrapper, isPy3k }:
buildPythonPackage rec {
pname = "pycairo";
@@ -6,8 +6,6 @@ buildPythonPackage rec {
format = "other";
- disabled = isPy33;
-
src = fetchFromGitHub {
owner = "pygobject";
repo = "pycairo";
diff --git a/pkgs/development/python-modules/pydicom/default.nix b/pkgs/development/python-modules/pydicom/default.nix
index 339775c2f54f..6f4e4c97fd1c 100644
--- a/pkgs/development/python-modules/pydicom/default.nix
+++ b/pkgs/development/python-modules/pydicom/default.nix
@@ -8,12 +8,12 @@
}:
buildPythonPackage rec {
- version = "1.4.1";
+ version = "1.4.2";
pname = "pydicom";
src = fetchPypi {
inherit pname version;
- sha256 = "0ki4736h6mp77733rsrwicl8pyig39idywzcmwvw3nzi2r1yc7w8";
+ sha256 = "1483hv74fhfk4q18r4rda7yixqqdxrd1djzp3492s81ykxd4k24l";
};
propagatedBuildInputs = [ numpy pillow ];
diff --git a/pkgs/development/python-modules/pylibftdi/default.nix b/pkgs/development/python-modules/pylibftdi/default.nix
index 9e8f96665d0b..54058ae1982d 100644
--- a/pkgs/development/python-modules/pylibftdi/default.nix
+++ b/pkgs/development/python-modules/pylibftdi/default.nix
@@ -1,7 +1,6 @@
{ lib
, buildPythonPackage
, fetchPypi
-, httpserver
, libftdi1
, libusb1
}:
@@ -16,14 +15,13 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [
- httpserver
libftdi1
libusb1
];
postPatch = ''
substituteInPlace pylibftdi/driver.py \
- --replace "self._load_library('libusb')" "cdll.LoadLibrary('${libusb1.out}/lib/libusb1.so')" \
+ --replace "self._load_library('libusb')" "cdll.LoadLibrary('${libusb1.out}/lib/libusb-1.0.so')" \
--replace "self._load_library('libftdi')" "cdll.LoadLibrary('${libftdi1.out}/lib/libftdi1.so')"
'';
diff --git a/pkgs/development/python-modules/pymssql/default.nix b/pkgs/development/python-modules/pymssql/default.nix
deleted file mode 100644
index 5c013efc2d1b..000000000000
--- a/pkgs/development/python-modules/pymssql/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi, freetds, cython, setuptools-git }:
-
-buildPythonPackage rec {
- pname = "pymssql";
- version = "3.0.3";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "4d0ed31c76983d723c0c979b18e2273623621e630ca4901f17a86128aca13f84";
- };
-
- buildInputs = [cython setuptools-git];
- propagatedBuildInputs = [freetds];
-
- # The tests require a running instance of SQLServer, so we skip them
- doCheck = false;
-
- meta = with lib; {
- homepage = "http://pymssql.org/en/stable/";
- description = "A simple database interface for Python that builds on top
- of FreeTDS to provide a Python DB-API (PEP-249) interface to Microsoft
- SQL Server";
- license = licenses.lgpl21;
- maintainers = with maintainers; [ mredaelli ];
- };
-}
diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix
index 4305487b6564..33fd3c6e10d4 100644
--- a/pkgs/development/python-modules/pyopenssl/default.nix
+++ b/pkgs/development/python-modules/pyopenssl/default.nix
@@ -102,7 +102,7 @@ buildPythonPackage rec {
})
];
- # Seems to fail unpredictably on Darwin. See http://hydra.nixos.org/build/49877419/nixlog/1
+ # Seems to fail unpredictably on Darwin. See https://hydra.nixos.org/build/49877419/nixlog/1
# for one example, but I've also seen ContextTests.test_set_verify_callback_exception fail.
doCheck = !stdenv.isDarwin;
diff --git a/pkgs/development/python-modules/python-efl/default.nix b/pkgs/development/python-modules/python-efl/default.nix
index 0657c6277700..419b49064873 100644
--- a/pkgs/development/python-modules/python-efl/default.nix
+++ b/pkgs/development/python-modules/python-efl/default.nix
@@ -1,29 +1,40 @@
-{ stdenv, fetchurl, buildPythonPackage, pkgconfig, python, enlightenment }:
+{ stdenv
+, fetchurl
+, buildPythonPackage
+, pkgconfig
+, python
+, dbus-python
+, enlightenment
+}:
# Should be bumped along with EFL!
buildPythonPackage rec {
pname = "python-efl";
- version = "1.23.0";
+ version = "1.24.0";
src = fetchurl {
url = "http://download.enlightenment.org/rel/bindings/python/${pname}-${version}.tar.xz";
- sha256 = "16yn6a1b9167nfmryyi44ma40m20ansfpwgrvqzfvwix7qaz9pib";
+ sha256 = "1vk1cdd959gia4a9qzyq56a9zw3lqf9ck66k8c9g3c631mp5cfpy";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ enlightenment.efl ];
- propagatedBuildInputs = [ python.pkgs.dbus-python ];
+ propagatedBuildInputs = [ dbus-python ];
preConfigure = ''
- export NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl) -I${stdenv.lib.getDev python.pkgs.dbus-python}/include/dbus-1.0 $NIX_CFLAGS_COMPILE"
+ NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl evas) $NIX_CFLAGS_COMPILE"
'';
- preBuild = "${python.interpreter} setup.py build_ext";
+ preBuild = ''
+ ${python.interpreter} setup.py build_ext
+ '';
- installPhase= "${python.interpreter} setup.py install --prefix=$out";
+ installPhase = ''
+ ${python.interpreter} setup.py install --prefix=$out
+ '';
doCheck = false;
diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix
index d2b1a6570b12..0c1f7c67e3df 100644
--- a/pkgs/development/python-modules/python-gitlab/default.nix
+++ b/pkgs/development/python-modules/python-gitlab/default.nix
@@ -1,22 +1,24 @@
-{ stdenv, buildPythonPackage, fetchPypi, requests, six, mock, httmock }:
+{ stdenv, buildPythonPackage, fetchPypi, requests, mock, httmock, pythonOlder }:
buildPythonPackage rec {
- pname = "python-gitlab";
- version = "1.15.0";
+ pname = "python-gitlab";
+ version = "2.2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "45125a0ed4d0027d4317bdbd71ca02fc52b0ac160b9d2c3c5be131b4d19f867e";
+ sha256 = "4c4ea60c8303f4214522b18038df017cae35afda7474efa0b4e19c2e73bc3ae2";
};
- propagatedBuildInputs = [ requests six ];
+ propagatedBuildInputs = [ requests ];
checkInputs = [ mock httmock ];
+ disabled = pythonOlder "3.6";
+
meta = with stdenv.lib; {
description = "Interact with GitLab API";
- homepage = "https://github.com/python-gitlab/python-gitlab";
- license = licenses.lgpl3;
+ homepage = "https://github.com/python-gitlab/python-gitlab";
+ license = licenses.lgpl3;
maintainers = with maintainers; [ nyanloutre ];
};
}
diff --git a/pkgs/development/python-modules/python-miio/default.nix b/pkgs/development/python-modules/python-miio/default.nix
index 20393d40ccea..5b8c140df67e 100644
--- a/pkgs/development/python-modules/python-miio/default.nix
+++ b/pkgs/development/python-modules/python-miio/default.nix
@@ -15,11 +15,11 @@
buildPythonPackage rec {
pname = "python-miio";
- version = "0.4.8";
+ version = "0.5.0.1";
src = fetchPypi {
inherit pname version;
- sha256 = "19423b3386b23d2e0fc94a8f6a358bcfbb44eed05376e33fd434d26d168bd18c";
+ sha256 = "fa9c318256945ad4a8623fdf921ce81c466a7aea18b04a6711efb662f520b195";
};
checkInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix
index 5b921e326678..f36f82395685 100644
--- a/pkgs/development/python-modules/python-telegram-bot/default.nix
+++ b/pkgs/development/python-modules/python-telegram-bot/default.nix
@@ -2,38 +2,36 @@
, fetchPypi
, buildPythonPackage
, certifi
+, decorator
, future
, urllib3
, tornado
, pytest
+, isPy3k
}:
buildPythonPackage rec {
pname = "python-telegram-bot";
- version = "12.3.0";
+ version = "12.7";
+ disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "0yrg5342zz0hpf2pc85ffwx57msa6jpcmvvjfkzh8nh2lc98aq21";
+ sha256 = "1vwf4pgjrg9a6w51ds9wmzq31bmi3f7xs79gdzzfxfmqmy1hb2r1";
};
- prePatch = ''
- rm -rf telegram/vendor
- substituteInPlace telegram/utils/request.py \
- --replace "import telegram.vendor.ptb_urllib3.urllib3 as urllib3" "import urllib3 as urllib3" \
- --replace "import telegram.vendor.ptb_urllib3.urllib3.contrib.appengine as appengine" "import urllib3.contrib.appengine as appengine" \
- --replace "from telegram.vendor.ptb_urllib3.urllib3.connection import HTTPConnection" "from urllib3.connection import HTTPConnection" \
- --replace "from telegram.vendor.ptb_urllib3.urllib3.util.timeout import Timeout" "from urllib3.util.timeout import Timeout" \
- --replace "from telegram.vendor.ptb_urllib3.urllib3.fields import RequestField" "from urllib3.fields import RequestField"
-
- touch LICENSE.dual
- '';
-
checkInputs = [ pytest ];
- propagatedBuildInputs = [ certifi future urllib3 tornado ];
+ propagatedBuildInputs = [ certifi future urllib3 tornado decorator ];
+
+ # --with-upstream-urllib3 is not working properly
+ postPatch = ''
+ rm -rf telegram/vendor
+ '';
+ setupPyGlobalFlags = "--with-upstream-urllib3";
# tests not included with release
doCheck = false;
+ pythonImportsCheck = [ "telegram" ];
meta = with stdenv.lib; {
description = "This library provides a pure Python interface for the Telegram Bot API.";
diff --git a/pkgs/development/python-modules/rencode/default.nix b/pkgs/development/python-modules/rencode/default.nix
index 7769adf22194..3240c524d3bd 100644
--- a/pkgs/development/python-modules/rencode/default.nix
+++ b/pkgs/development/python-modules/rencode/default.nix
@@ -1,6 +1,5 @@
{ stdenv
, buildPythonPackage
-, isPy33
, fetchgit
, cython
}:
@@ -8,7 +7,6 @@
buildPythonPackage {
pname = "rencode";
version = "git20150810";
- disabled = isPy33;
src = fetchgit {
url = "https://github.com/aresch/rencode";
diff --git a/pkgs/development/python-modules/rig/default.nix b/pkgs/development/python-modules/rig/default.nix
index d83afd7885f0..bc43aac3551a 100644
--- a/pkgs/development/python-modules/rig/default.nix
+++ b/pkgs/development/python-modules/rig/default.nix
@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi
-, isPy34, isPy35, isPy27
+, isPy35, isPy27
, numpy, pytz, six, enum-compat, sentinel
}:
@@ -16,7 +16,7 @@ buildPythonPackage rec {
# This is the list of officially supported versions. Other versions may work
# as well.
- disabled = !(isPy35 || isPy34 || isPy27);
+ disabled = !(isPy27 || isPy35);
# Test Phase is only supported in development sources.
doCheck = false;
diff --git a/pkgs/development/python-modules/rl-coach/default.nix b/pkgs/development/python-modules/rl-coach/default.nix
index bee588457ff2..e9efb0c02b4e 100644
--- a/pkgs/development/python-modules/rl-coach/default.nix
+++ b/pkgs/development/python-modules/rl-coach/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "0c4f3a334ff55d534d2fc7f83d5e791f64b780391039e367f6cd9b4381838744";
+ sha256 = "0i47hf0l76ydyrky6f8h760bfr0zg5g3vy675x6m6pgm9wrklkqc";
};
propagatedBuildInputs = [
@@ -94,5 +94,7 @@ buildPythonPackage rec {
homepage = "https://nervanasystems.github.io/coach/";
license = licenses.asl20;
maintainers = with maintainers; [ timokau ];
+ # pythonPackages.gym is too new
+ broken = true; # since 2020-04-20
};
}
diff --git a/pkgs/development/python-modules/secure/default.nix b/pkgs/development/python-modules/secure/default.nix
index 6d2f2871ec2d..49fcb52a154f 100644
--- a/pkgs/development/python-modules/secure/default.nix
+++ b/pkgs/development/python-modules/secure/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchFromGitHub
+{ lib, buildPythonPackage, fetchFromGitHub, isPy27
, maya
, requests
}:
@@ -6,6 +6,7 @@
buildPythonPackage rec {
version = "0.2.1";
pname = "secure";
+ disabled = isPy27;
src = fetchFromGitHub {
owner = "typeerror";
diff --git a/pkgs/development/python-modules/serpent/default.nix b/pkgs/development/python-modules/serpent/default.nix
index 353ea1cbe26b..701de5200461 100644
--- a/pkgs/development/python-modules/serpent/default.nix
+++ b/pkgs/development/python-modules/serpent/default.nix
@@ -4,7 +4,6 @@
, lib
, python
, isPy27
-, isPy33
, enum34
, attrs
, pytz
@@ -19,7 +18,7 @@ buildPythonPackage rec {
sha256 = "1arnckykpkvv2qrp49l1k7q5mr5pisswl0rvdx98x8wsl1n361pk";
};
- propagatedBuildInputs = lib.optionals (isPy27 || isPy33) [ enum34 ];
+ propagatedBuildInputs = lib.optionals isPy27 [ enum34 ];
checkInputs = [ attrs pytz ];
checkPhase = ''
diff --git a/pkgs/development/python-modules/softlayer/default.nix b/pkgs/development/python-modules/softlayer/default.nix
index 93b0e309b7c4..3c2a5e2a356d 100644
--- a/pkgs/development/python-modules/softlayer/default.nix
+++ b/pkgs/development/python-modules/softlayer/default.nix
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
+, isPy27
, ptable
, click
, requests
@@ -17,6 +18,7 @@
buildPythonPackage rec {
pname = "softlayer-python";
version = "5.8.4";
+ disabled = isPy27;
propagatedBuildInputs = [ ptable click requests prompt_toolkit pygments urllib3 ];
diff --git a/pkgs/development/python-modules/spyder/3.nix b/pkgs/development/python-modules/spyder/3.nix
index 7987775cee1d..e5c5683f5dc4 100644
--- a/pkgs/development/python-modules/spyder/3.nix
+++ b/pkgs/development/python-modules/spyder/3.nix
@@ -1,62 +1,38 @@
-{ stdenv, buildPythonPackage, fetchPypi, makeDesktopItem, jedi, pycodestyle,
- psutil, pyflakes, rope, numpy, scipy, matplotlib, pylint, keyring, numpydoc,
+{ stdenv, buildPythonPackage, fetchFromGitHub, jedi, pycodestyle,
+ psutil, pyflakes, rope, pylint, keyring, numpydoc,
qtconsole, qtawesome, nbconvert, mccabe, pyopengl, cloudpickle, pygments,
- spyder-kernels_0_5, qtpy, pyzmq, chardet
-, pyqtwebengine
+ spyder-kernels_0_5, qtpy, pyzmq, chardet, pyqtwebengine
}:
buildPythonPackage rec {
pname = "spyder";
version = "3.3.6";
- src = fetchPypi {
- inherit pname version;
- sha256 = "1z7qw1h3rhca12ycv8xrzw6z2gf81v0j6lfq9kpwh472w4vk75v1";
+ src = fetchFromGitHub {
+ owner = "spyder-ide";
+ repo = "spyder";
+ rev = "v3.3.6";
+ sha256 = "1sk9xajhzpklk5bcbdhpfhx3gxhyrahsmj9bv2m6kvbqxdlx6bq6";
};
- nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ];
-
propagatedBuildInputs = [
- jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring
- numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels_0_5
+ jedi pycodestyle psutil pyflakes rope pylint keyring numpydoc
+ qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels_0_5
pygments qtpy pyzmq chardet pyqtwebengine
];
- # There is no test for spyder
+ # tests fail with a segfault
doCheck = false;
- desktopItem = makeDesktopItem {
- name = "Spyder";
- exec = "spyder";
- icon = "spyder";
- comment = "Scientific Python Development Environment";
- desktopName = "Spyder";
- genericName = "Python IDE";
- categories = "Application;Development;Editor;IDE;";
- };
-
postPatch = ''
# remove dependency on pyqtwebengine
- # this is still part of the pyqt 5.11 version we have in nixpkgs
+ # this is still part of the pyqt 5.13 version we have in nixpkgs
sed -i /pyqtwebengine/d setup.py
substituteInPlace setup.py --replace "pyqt5<5.13" "pyqt5"
'';
- # Create desktop item
- postInstall = ''
- mkdir -p $out/share/icons
- cp spyder/images/spyder.svg $out/share/icons
- cp -r $desktopItem/share/applications/ $out/share
- '';
-
- dontWrapQtApps = true;
-
- preFixup = ''
- makeWrapperArgs+=("''${qtWrapperArgs[@]}")
- '';
-
meta = with stdenv.lib; {
- description = "Scientific python development environment";
+ description = "Library providing a scientific python development environment";
longDescription = ''
Spyder (previously known as Pydee) is a powerful interactive development
environment for the Python language with advanced editing, interactive
@@ -65,6 +41,6 @@ buildPythonPackage rec {
homepage = "https://github.com/spyder-ide/spyder/";
license = licenses.mit;
platforms = platforms.linux;
- maintainers = with maintainers; [ gebner ];
+ maintainers = with maintainers; [ gebner marcus7070 ];
};
}
diff --git a/pkgs/development/python-modules/tensorflow/2/bin.nix b/pkgs/development/python-modules/tensorflow/2/bin.nix
index d32305ff5133..acb5f473ec9d 100644
--- a/pkgs/development/python-modules/tensorflow/2/bin.nix
+++ b/pkgs/development/python-modules/tensorflow/2/bin.nix
@@ -19,7 +19,7 @@
, opt-einsum
, backports_weakref
, tensorflow-estimator_2
-, tensorflow-tensorboard
+, tensorflow-tensorboard_2
, cudaSupport ? false
, cudatoolkit ? null
, cudnn ? null
@@ -77,7 +77,7 @@ in buildPythonPackage {
google-pasta
wrapt
tensorflow-estimator_2
- tensorflow-tensorboard
+ tensorflow-tensorboard_2
keras-applications
keras-preprocessing
] ++ lib.optional (!isPy3k) mock
@@ -159,6 +159,14 @@ in buildPythonPackage {
done
'';
+ # Upstream has a pip hack that results in bin/tensorboard being in both tensorflow
+ # and the propagated input tensorflow-tensorboard, which causes environment collisions.
+ # Another possibility would be to have tensorboard only in the buildInputs
+ # See https://github.com/NixOS/nixpkgs/pull/44381 for more information.
+ postInstall = ''
+ rm $out/bin/tensorboard
+ '';
+
pythonImportsCheck = [
"tensorflow"
"tensorflow.keras"
diff --git a/pkgs/development/python-modules/toggl-cli/default.nix b/pkgs/development/python-modules/toggl-cli/default.nix
index 6834876d8f81..62d3f2dde24d 100644
--- a/pkgs/development/python-modules/toggl-cli/default.nix
+++ b/pkgs/development/python-modules/toggl-cli/default.nix
@@ -19,6 +19,7 @@ buildPythonPackage rec {
substituteInPlace requirements.txt \
--replace "pendulum==2.0.4" "pendulum>=2.0.4" \
--replace "click-completion==0.5.0" "click-completion>=0.5.0" \
+ --replace "click==7.0" "click>=7.0" \
--replace "pbr==5.1.2" "pbr>=5.1.2" \
--replace "inquirer==2.5.1" "inquirer>=2.5.1"
'';
diff --git a/pkgs/development/python-modules/tomlkit/default.nix b/pkgs/development/python-modules/tomlkit/default.nix
index de48b3736cfc..deff7769dfb4 100644
--- a/pkgs/development/python-modules/tomlkit/default.nix
+++ b/pkgs/development/python-modules/tomlkit/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, isPy27, isPy34
+{ lib, buildPythonPackage, fetchPypi, isPy27
, enum34, functools32, typing
}:
@@ -13,7 +13,7 @@ buildPythonPackage rec {
propagatedBuildInputs =
lib.optionals isPy27 [ enum34 functools32 ]
- ++ lib.optional (isPy27 || isPy34) typing;
+ ++ lib.optional isPy27 typing;
# The Pypi tarball doesn't include tests, and the GitHub source isn't
# buildable until we bootstrap poetry, see
diff --git a/pkgs/development/python-modules/traits/default.nix b/pkgs/development/python-modules/traits/default.nix
index 47bbbee04e7e..5bd849908356 100644
--- a/pkgs/development/python-modules/traits/default.nix
+++ b/pkgs/development/python-modules/traits/default.nix
@@ -4,7 +4,6 @@
, python
, pytest
, numpy
-, isPy33
}:
buildPythonPackage rec {
@@ -28,7 +27,7 @@ buildPythonPackage rec {
# https://github.com/enthought/traits/issues/187
# https://github.com/enthought/traits/pull/188
# Furthermore, some tests fail due to being in a chroot
- doCheck = isPy33;
+ doCheck = false;
meta = with stdenv.lib; {
description = "Explicitly typed attributes for Python";
diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix
index 1e5ab9a9f2f4..5347c696cc22 100644
--- a/pkgs/development/python-modules/watchdog/default.nix
+++ b/pkgs/development/python-modules/watchdog/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "watchdog";
- version = "0.9.0";
+ version = "0.10.2";
src = fetchPypi {
inherit pname version;
- sha256 = "965f658d0732de3188211932aeb0bb457587f04f63ab4c1e33eab878e9de961d";
+ sha256 = "0ss58k33l5vah894lykid6ar6kw7z1f29cl4hzr5xvgs8fvfyq65";
};
buildInputs = stdenv.lib.optionals stdenv.isDarwin
diff --git a/pkgs/development/python-modules/wordfreq/default.nix b/pkgs/development/python-modules/wordfreq/default.nix
index 0dab52348604..d687ffd2d0b9 100644
--- a/pkgs/development/python-modules/wordfreq/default.nix
+++ b/pkgs/development/python-modules/wordfreq/default.nix
@@ -11,34 +11,33 @@
, fetchFromGitHub
}:
-buildPythonPackage {
+buildPythonPackage rec {
pname = "wordfreq";
- version = "2.2.0";
+ version = "2.3.2";
+ disabled = pythonOlder "3";
src = fetchFromGitHub {
owner = "LuminosoInsight";
repo = "wordfreq";
# upstream don't tag by version
- rev = "bc12599010c8181a725ec97d0b3990758a48da36";
- sha256 = "195794vkzq5wsq3mg1dgfhlnz2f7vi1xajlifq6wkg4lzwyq262m";
+ rev = "v${version}";
+ sha256 = "078657iiksrqzcc2wvwhiilf3xxq5vlinsv0kz03qzqr1qyvbmas";
};
+ propagatedBuildInputs = [ regex langcodes ftfy msgpack mecab-python3 jieba ];
+
+ # patch to relax version requirements for regex
+ # dependency to prevent break in upgrade
+ postPatch = ''
+ substituteInPlace setup.py --replace "regex ==" "regex >="
+ '';
+
checkInputs = [ pytest ];
checkPhase = ''
# These languages require additional dictionaries
pytest tests -k 'not test_japanese and not test_korean and not test_languages and not test_french_and_related'
'';
-
- propagatedBuildInputs = [ regex langcodes ftfy msgpack mecab-python3 jieba ];
-
- # patch to relax version requirements for regex
- # dependency to prevent break in upgrade
- postPatch = ''
- substituteInPlace setup.py --replace "regex ==" "regex >="
- '';
-
- disabled = pythonOlder "3";
meta = with lib; {
description = "A library for looking up the frequencies of words in many languages, based on many sources of data";
diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix
index 539c2f7d1910..3367588bb3b9 100644
--- a/pkgs/development/tools/analysis/checkstyle/default.nix
+++ b/pkgs/development/tools/analysis/checkstyle/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, makeWrapper, jre }:
stdenv.mkDerivation rec {
- version = "8.31";
+ version = "8.32";
pname = "checkstyle";
src = fetchurl {
url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
- sha256 = "03dn07lissr2dkhi44wlkrbsby4zfvwai8gykc3xjgs46jy05rf8";
+ sha256 = "18ahdphxfcfi2vghl11kmj089hyh9iawll3cwxrqsdqak0748ijs";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix
index f722a155086f..c6b97f21bded 100644
--- a/pkgs/development/tools/analysis/codeql/default.nix
+++ b/pkgs/development/tools/analysis/codeql/default.nix
@@ -12,7 +12,7 @@
stdenv.mkDerivation rec {
pname = "codeql";
- version = "2.1.0";
+ version = "2.1.1";
dontConfigure = true;
dontBuild = true;
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
src = fetchzip {
url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
- sha256 = "1vp4f5kwmxc4j59cdzwj0jh0n4c05hkvssvv9ii6w88phzblzpjk";
+ sha256 = "0yaxv89p5pdj1qymc5bnz0mphrypil9dnijvp3ml9hk1vxw6lfvb";
};
nativeBuildInputs = [
diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index 29ea3993b1c6..c9c5dd873def 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "flow";
- version = "0.123.0";
+ version = "0.124.0";
src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "refs/tags/v${version}";
- sha256 = "0dsp8q3v9smjli2bkldkhzh2z032zjmqbzzchb5j18r4vz4hif16";
+ sha256 = "1isy67fx0lrszvkf3bw3pp8mzvcyab4qnssmv4kvvz32vls8gh25";
};
installPhase = ''
diff --git a/pkgs/development/tools/analysis/hopper/default.nix b/pkgs/development/tools/analysis/hopper/default.nix
index 4fbf986e41a1..d854065d601e 100644
--- a/pkgs/development/tools/analysis/hopper/default.nix
+++ b/pkgs/development/tools/analysis/hopper/default.nix
@@ -12,12 +12,12 @@
}:
stdenv.mkDerivation rec {
pname = "hopper";
- version = "4.5.22";
+ version = "4.5.25";
rev = "v${lib.versions.major version}";
src = fetchurl {
url = "https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-${rev}-${version}-Linux.pkg.tar.xz";
- sha256 = "1321i9ls5k677diwfccrjinzzb5586ygdgax7ryyha3ccdj1ikda";
+ sha256 = "1xv4q41kz7a4cqkkdfgwaw2kgi81z62r9l7hmm8qmsnnlbk4xd5j";
};
sourceRoot = ".";
diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix
index 328092feafc5..87e732e8dc70 100644
--- a/pkgs/development/tools/azcopy/default.nix
+++ b/pkgs/development/tools/azcopy/default.nix
@@ -2,18 +2,18 @@
buildGoModule rec {
pname = "azure-storage-azcopy";
- version = "10.3.4";
+ version = "10.4.3";
src = fetchFromGitHub {
owner = "Azure";
repo = "azure-storage-azcopy";
rev = version;
- sha256 = "16pdvcgy1d5dfqk3as23j45rkwfrv232n384cj5wfz9qwijkcy5g";
+ sha256 = "0yl7iznjyng1i3d994qrryllni702gga7h45sx8i3sgpy8544yjf";
};
subPackages = [ "." ];
- modSha256 = "07cy2zi7m2pkbfdcy659x4k5j2w60cmjy8kxv1dcii3dc6ls4bvb";
+ modSha256 = "02c668bp1pfrd994lhg6z3hm1qg3530nk9aw1cahiwj549vxxfhm";
postInstall = ''
ln -rs "$out/bin/azure-storage-azcopy" "$out/bin/azcopy"
diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix
index 944bbd9d4bb3..7550068274c5 100644
--- a/pkgs/development/tools/build-managers/bmake/default.nix
+++ b/pkgs/development/tools/build-managers/bmake/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "bmake";
- version = "20200318";
+ version = "20200402";
src = fetchurl {
url = "http://www.crufty.net/ftp/pub/sjg/${pname}-${version}.tar.gz";
- sha256 = "10rcgv0hd5axm2b41a5xaig6iqbpyqfp2q7llr7zc3mnbacwaz35";
+ sha256 = "0a49pfmbqb3g1h2r2vwbcb4hdyygq1g9n5y7qab37slfml2g45fg";
};
nativeBuildInputs = [ getopt ];
diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix
index cc44ac1a2208..d7aec3527b3b 100644
--- a/pkgs/development/tools/build-managers/conan/default.nix
+++ b/pkgs/development/tools/build-managers/conan/default.nix
@@ -1,7 +1,7 @@
{ lib, python3, git, pkgconfig }:
# Note:
-# Conan has specific dependency demanands; check
+# Conan has specific dependency demands; check
# https://github.com/conan-io/conan/blob/master/conans/requirements.txt
# https://github.com/conan-io/conan/blob/master/conans/requirements_server.txt
# on the release branch/commit we're packaging.
@@ -39,12 +39,12 @@ let newPython = python3.override {
};
in newPython.pkgs.buildPythonApplication rec {
- version = "1.24.0";
+ version = "1.25.0";
pname = "conan";
src = newPython.pkgs.fetchPypi {
inherit pname version;
- sha256 = "0nkh4f6plamijwcfw536ydm0i04y74qmkh5l1nanyb8p0c3z3x0y";
+ sha256 = "1wgmx6s4h5m6zixb3wlaicy56rsqcy2srzmvii80xdx9g5wvi9pv";
};
propagatedBuildInputs = with newPython.pkgs; [
@@ -90,7 +90,8 @@ in newPython.pkgs.buildPythonApplication rec {
postPatch = ''
substituteInPlace conans/requirements.txt \
- --replace "PyYAML>=3.11, <3.14.0" "PyYAML"
+ --replace "PyYAML>=3.11, <3.14.0" "PyYAML" \
+ --replace "deprecation>=2.0, <2.1" "deprecation"
'';
meta = with lib; {
diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix
index 844442611327..0e7a4f3d9798 100644
--- a/pkgs/development/tools/build-managers/mill/default.nix
+++ b/pkgs/development/tools/build-managers/mill/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mill";
- version = "0.6.1";
+ version = "0.6.2";
src = fetchurl {
url = "https://github.com/lihaoyi/mill/releases/download/${version}/${version}";
- sha256 = "1blar5dxhmxlwxhmq8wv0xvhy200qks6xj12n54qx9d5qp300ncw";
+ sha256 = "1s2ndry0mpjs8hy8rrxnyarkzqjz7zzh5h541v3fkzgc9rsd6ifb";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index 2336900bf856..64a2cedd1c97 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "sbt";
- version = "1.3.9";
+ version = "1.3.10";
src = fetchurl {
urls = [
"https://piccolo.link/sbt-${version}.tgz"
"https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"
];
- sha256 = "06k4dyb5gjnqx70akjfb65hiafh683800bncbq33kmq77arfkm7c";
+ sha256 = "1023qcbdbwl40l7mgyd3j0ggr6paz1zs2q787ym52dhrcibhcq1h";
};
patchPhase = ''
diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix
index 042929e750a5..2626ae719420 100644
--- a/pkgs/development/tools/buildkit/default.nix
+++ b/pkgs/development/tools/buildkit/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "buildkit";
- version = "0.6.3";
+ version = "0.7.1";
goPackagePath = "github.com/moby/buildkit";
subPackages = [ "cmd/buildctl" ] ++ stdenv.lib.optionals stdenv.isLinux [ "cmd/buildkitd" ];
@@ -11,7 +11,7 @@ buildGoPackage rec {
owner = "moby";
repo = "buildkit";
rev = "v${version}";
- sha256 = "032jq74n9mkw22s4ba9blfmi0hqvk587m5v23xz3sxx2rkg0wlbn";
+ sha256 = "048h69ffgmpir2ix9ldi6zrzlwxa5yz3idg5ajspz2dihmzmnwws";
};
buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/version.Version=${version}" ];
diff --git a/pkgs/development/tools/cmake-format/default.nix b/pkgs/development/tools/cmake-format/default.nix
index cdf15f3ad707..394dc7b2f514 100644
--- a/pkgs/development/tools/cmake-format/default.nix
+++ b/pkgs/development/tools/cmake-format/default.nix
@@ -10,12 +10,12 @@
buildPythonApplication rec {
pname = "cmake-format";
- version = "0.6.9";
+ version = "0.6.10";
src = fetchPypi {
inherit version;
pname = "cmake_format";
- sha256 = "082d7949gsk5v72ap7k4p3vgmc126a0bfm195xpi4lb6khpbzy5j";
+ sha256 = "14ypplkjah4hcb1ad8978xip4vvzxy1nkysvyi1wn9b24cbfzw42";
};
propagatedBuildInputs = [ autopep8 flake8 jinja2 pylint pyyaml ];
diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix
index 133526c569a0..2d7c2c03cea8 100644
--- a/pkgs/development/tools/conftest/default.nix
+++ b/pkgs/development/tools/conftest/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "conftest";
- version = "0.18.1";
+ version = "0.18.2";
src = fetchFromGitHub {
owner = "instrumenta";
repo = "conftest";
rev = "v${version}";
- sha256 = "0ial1zs5aqcwza813ny6zqn9ybq6ibrqjmaccwbbam1k9f5rplqv";
+ sha256 = "15xzldcmnpfg1hd5zr5i7x2zjrgkwnp4nylxbn9kfic2dpjp1a38";
};
- modSha256 = "17j5fhgwfpyg9r7a5g9rmvkaz510xx9s4mbl1cmyzysvddc6f5wp";
+ modSha256 = "0nwmxmh1pmism5r9zzghfrzizr1fbyc8d4jljrbzjjq1l449r2ja";
buildFlagsArray = ''
-ldflags=
diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix
index 14673cb40c81..c710aeaa5167 100644
--- a/pkgs/development/tools/database/dbmate/default.nix
+++ b/pkgs/development/tools/database/dbmate/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "dbmate";
- version = "1.7.0";
+ version = "1.8.0";
src = fetchFromGitHub {
owner = "amacneil";
repo = "dbmate";
rev = "v${version}";
- sha256 = "0jvizj616rsh3aw9z3bijk7ixpbnqmm3xqmdxznjzqd46avr54c3";
+ sha256 = "16grd03r41n0vj5fs7j6jk395zs2q0i878p9nh1ycicy64nzmxky";
};
- modSha256 = "12x3m5bjyx3blh5i51pd99phv73m96pmm6i3ir4vf2kms3viif9i";
+ modSha256 = "1ky6cxpmw93nrk26vyrxz8kqa7247axzaxilm6ciypxf30ad0vdq";
meta = with stdenv.lib; {
description = "Database migration tool";
diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix
index d66d54ef45bb..f246a0a806df 100644
--- a/pkgs/development/tools/database/liquibase/default.nix
+++ b/pkgs/development/tools/database/liquibase/default.nix
@@ -10,11 +10,11 @@ in
stdenv.mkDerivation rec {
pname = "liquibase";
- version = "3.8.8";
+ version = "3.8.9";
src = fetchurl {
url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz";
- sha256 = "1pl9wgnwykvbnis0ndym0lbsj6a7lvpghrc98cw2hdnp5dglxjjl";
+ sha256 = "13qpva81y98gp84zbcx6b4wsfgpsbv18aj5ihkw6l9ndbxfcrxdl";
};
buildInputs = [ jre makeWrapper ];
diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix
index 746d66c2dbe8..2d639467910d 100644
--- a/pkgs/development/tools/flyway/default.nix
+++ b/pkgs/development/tools/flyway/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, jre_headless, makeWrapper }:
let
- version = "6.3.2";
+ version = "6.4.1";
in
stdenv.mkDerivation {
pname = "flyway";
inherit version;
src = fetchurl {
url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz";
- sha256 = "1av1q7znphpsi1iz4dbh0fgh3jsx9prz980b25yk5r89h518s76q";
+ sha256 = "00vm2p4xn8jnldjxcj0djpjjx2hppq0ii8367abhbswq7xfhy2d2";
};
nativeBuildInputs = [ makeWrapper ];
dontBuild = true;
diff --git a/pkgs/development/tools/git-quick-stats/default.nix b/pkgs/development/tools/git-quick-stats/default.nix
index 2681b2705ef4..1532f64c2462 100644
--- a/pkgs/development/tools/git-quick-stats/default.nix
+++ b/pkgs/development/tools/git-quick-stats/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "git-quick-stats";
- version = "2.0.15";
+ version = "2.0.16";
src = fetchFromGitHub {
repo = "git-quick-stats";
owner = "arzzen";
rev = version;
- sha256 = "1m8b0bskhpwjbs0qjp0rdzrjj613639pn92isv1cg0srj8grjcai";
+ sha256 = "03v06r6gbn8bhya1ig9wdc92hh2ip7072syxkam3sjv150ld80cn";
};
PREFIX = builtins.placeholder "out";
meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix
index c33a4cf69f59..be5820471570 100644
--- a/pkgs/development/tools/golangci-lint/default.nix
+++ b/pkgs/development/tools/golangci-lint/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "golangci-lint";
- version = "1.25.1";
+ version = "1.26.0";
src = fetchFromGitHub {
owner = "golangci";
repo = "golangci-lint";
rev = "v${version}";
- sha256 = "04r26nn72myacs6v2jq8mi4kjik82iwsh6w59h4k9yk0my3fjwia";
+ sha256 = "1xw6m4ps6yw8gnkwy8v7rrz2b8c8n72cd7vkpx481dkd36vccpkc";
};
- modSha256 = "1pz5f2hv2lssiwsp60hsycg2ijyafb7r5fl2yrvflqg547k3n8x2";
+ modSha256 = "0xgnimr1jydrgwhbyjaz710kx3m3505nhy5cs10p501qxbnzkjf9";
subPackages = [ "cmd/golangci-lint" ];
meta = with lib; {
diff --git a/pkgs/development/tools/gotestsum/default.nix b/pkgs/development/tools/gotestsum/default.nix
index 45629338d9ea..3dd7fb9e3523 100644
--- a/pkgs/development/tools/gotestsum/default.nix
+++ b/pkgs/development/tools/gotestsum/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gotestsum";
- version = "0.4.1";
+ version = "0.4.2";
src = fetchFromGitHub {
owner = "gotestyourself";
repo = "gotestsum";
rev = "v${version}";
- sha256 = "1wllcmc2c8ch2ggknhxwgdm6g70ppmxr492kbxvlbwif9p6ms0ci";
+ sha256 = "0zifha3mj7386q2accrdmd8qniingadxz1v8vg4mciwi723msr44";
};
- modSha256 = "08vil1jb7dpkld59b6qhsfh9cx450vbgfaji7777immzsd1azf4m";
+ modSha256 = "10zkk4zqla5yqs5sq2qc7x1vhadfyd1l7s29xyjmg4grs8iimk2j";
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
diff --git a/pkgs/development/tools/jbake/default.nix b/pkgs/development/tools/jbake/default.nix
index 79054c7f667b..ad127b94960f 100644
--- a/pkgs/development/tools/jbake/default.nix
+++ b/pkgs/development/tools/jbake/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchzip, makeWrapper, jre }:
stdenv.mkDerivation rec {
- version = "2.6.4";
+ version = "2.6.5";
pname = "jbake";
src = fetchzip {
url = "https://dl.bintray.com/jbake/binary/${pname}-${version}-bin.zip";
- sha256 = "0zgp0wwxxmi13v5q5jvr610igx2vxg0bwck9j1imnn9ciakg1aaw";
+ sha256 = "0ripayv1vf4f4ylxr7h9kad2xhy3y98ca8s4p38z7dn8l47zg0qw";
};
buildInputs = [ makeWrapper jre ];
diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix
index 5ae2ee1c14d0..8ba536e3b5f5 100644
--- a/pkgs/development/tools/just/default.nix
+++ b/pkgs/development/tools/just/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitHub, rustPlatform, coreutils, bash, dash }:
+{ stdenv, fetchFromGitHub, rustPlatform, coreutils, bash, dash
+, installShellFiles }:
rustPlatform.buildRustPackage rec {
pname = "just";
@@ -13,14 +14,14 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "05mrzav3aydvwac9jjckdmlxvxnlcncmkfsdb9z7zvxia4k89w1l";
+ nativeBuildInputs = [ installShellFiles ];
+
postInstall = ''
- # generate completion scripts for just
+ installManPage man/just.1
- mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions}
-
- $out/bin/just --completions bash > "$out/share/bash-completion/completions/just"
- $out/bin/just --completions fish > "$out/share/fish/vendor_completions.d/just.fish"
- $out/bin/just --completions zsh > "$out/share/zsh/site-functions/_just"
+ installShellCompletion --bash --name just.bash completions/just.bash
+ installShellCompletion --fish --name just.fish completions/just.fish
+ installShellCompletion --zsh --name _just completions/just.zsh
'';
checkInputs = [ coreutils bash dash ];
diff --git a/pkgs/development/tools/kubectx/default.nix b/pkgs/development/tools/kubectx/default.nix
index fd5bdc64dd6b..8b980dc7e31e 100644
--- a/pkgs/development/tools/kubectx/default.nix
+++ b/pkgs/development/tools/kubectx/default.nix
@@ -4,13 +4,13 @@ with lib;
stdenv.mkDerivation rec {
pname = "kubectx";
- version = "0.8.0";
+ version = "0.9.0";
src = fetchFromGitHub {
owner = "ahmetb";
repo = pname;
rev = "v${version}";
- sha256 = "1wkvmic29mkzfs6619wjs3mya8ffigwv9n1w9y7zkfvpi8gxa0a6";
+ sha256 = "1b22jk8zl944w5zn3s7ybkkbmzp9519x32pfqwd1malfly7dzf55";
};
buildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix
index 4cd87480070a..cf9ce2bd265e 100644
--- a/pkgs/development/tools/metals/default.nix
+++ b/pkgs/development/tools/metals/default.nix
@@ -2,7 +2,7 @@
let
baseName = "metals";
- version = "0.8.4";
+ version = "0.9.0";
deps = stdenv.mkDerivation {
name = "${baseName}-deps-${version}";
buildCommand = ''
@@ -15,7 +15,7 @@ let
'';
outputHashMode = "recursive";
outputHashAlgo = "sha256";
- outputHash = "1r8aff082m3kh6wy5diyvq8bzg5x4dp1da9sfz223ii0kc1yp6w5";
+ outputHash = "116q2jzqlmdhkqvjg31b9ib8w1k7rlr8gmjcr7z32idpn16hqg59";
};
in
stdenv.mkDerivation rec {
diff --git a/pkgs/development/tools/misc/ccls/default.nix b/pkgs/development/tools/misc/ccls/default.nix
index cb5653583fd7..ba57ef561f3e 100644
--- a/pkgs/development/tools/misc/ccls/default.nix
+++ b/pkgs/development/tools/misc/ccls/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "ccls";
- version = "0.20190823.5";
+ version = "0.20190823.6";
src = fetchFromGitHub {
owner = "MaskRay";
repo = "ccls";
rev = version;
- sha256 = "0b2pkpzn576b92zcxpwchpkyw2fww6s69818rx4g9z34kzm35zy5";
+ sha256 = "11h5nwk4qqshf3i8yr4bxpnvmidrhkzd0zxhf1xqv8cv6r08k47f";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix
index fde1c68d34d0..5b3b728ea986 100644
--- a/pkgs/development/tools/misc/circleci-cli/default.nix
+++ b/pkgs/development/tools/misc/circleci-cli/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "circleci-cli";
- version = "0.1.6949";
+ version = "0.1.7179";
src = fetchFromGitHub {
owner = "CircleCI-Public";
repo = pname;
rev = "v${version}";
- sha256 = "0r64m4lcm9w0rzi61rsi3sm719ydwiv5axxnikwhzmvkdz0rd7dq";
+ sha256 = "0md6y2rnzhkpxc2pm3c46jrhwicrswy9qlr6a4mmvpjq1imj1hjq";
};
- modSha256 = "199ai38knp50mjjhddjd70qfwx63c69rf7ddw4hpzgx5cm5a04q2";
+ modSha256 = "169d0mm52l6w6jln5ak6zkh97q65m9jpg3bm8qll6sfrmrnfncfi";
buildFlagsArray = [ "-ldflags=-s -w -X github.com/CircleCI-Public/circleci-cli/version.Version=${version}" ];
diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix
index cd805069df56..a29af8b60ebc 100644
--- a/pkgs/development/tools/misc/clojure-lsp/default.nix
+++ b/pkgs/development/tools/misc/clojure-lsp/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "clojure-lsp";
- version = "20200412T033138";
+ version = "20200413T141742";
src = fetchurl {
url = "https://github.com/snoe/clojure-lsp/releases/download/release-${version}/${pname}";
- sha256 = "19i6sikg5x5qzcbakzbiqbcy5q2srqk6ihpmb3l90n1p4jn4605c";
+ sha256 = "0bgyl791l8qaja9p22p77llis39kgdm8x1djz1dm8iy6qn22hm1y";
};
dontUnpack = true;
diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix
index e547fef46c4c..75a960c80c50 100644
--- a/pkgs/development/tools/misc/strace/default.nix
+++ b/pkgs/development/tools/misc/strace/default.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
buildInputs = stdenv.lib.optional libunwind.supportsHost libunwind; # support -k
+ postPatch = "patchShebangs strace-graph";
+
configureFlags = stdenv.lib.optional (!stdenv.hostPlatform.isx86) "--enable-mpers=check";
# fails 1 out of 523 tests with
diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix
index 10748d751595..616a1cbc3fbd 100644
--- a/pkgs/development/tools/misc/sysbench/default.nix
+++ b/pkgs/development/tools/misc/sysbench/default.nix
@@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
pname = "sysbench";
- version = "1.0.19";
+ version = "1.0.20";
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ libmysqlclient libaio ];
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
owner = "akopytov";
repo = pname;
rev = version;
- sha256 = "1zgqb9cr7ld3vw4a3jhq1mlszhcyjlpr0c8q1jcp1d27l9dcvd1w";
+ sha256 = "1sanvl2a52ff4shj62nw395zzgdgywplqvwip74ky8q7s6qjf5qy";
};
enableParallelBuilding = true;
diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix
index 9b84a713af51..ca625a28c94b 100644
--- a/pkgs/development/tools/misc/tokei/default.nix
+++ b/pkgs/development/tools/misc/tokei/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "tokei";
- version = "11.1.0";
+ version = "11.1.1";
src = fetchFromGitHub {
owner = "XAMPPRocky";
repo = pname;
rev = "v${version}";
- sha256 = "11nmh2b7pal67nhcygp5gpzf3n158671fjjxw0vwjgrb87hkdry9";
+ sha256 = "1sribqcyalgl66im92pmla0hnp07zvg3pbxxakm7jk5l6p13wiw3";
};
- cargoSha256 = "1axfkyghf6gzv24is4n6kgc28nx0d6laqpdv7j1xzkf6hdixkch7";
+ cargoSha256 = "0jcy3p896ykc6s3m21pnh4jv4lhpvhzlrrl1y67ink2lqkamdhvv";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [
libiconv darwin.apple_sdk.frameworks.Security
diff --git a/pkgs/development/tools/mod/default.nix b/pkgs/development/tools/mod/default.nix
index 3261c8af2024..5237d131af02 100644
--- a/pkgs/development/tools/mod/default.nix
+++ b/pkgs/development/tools/mod/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "mod";
- version = "0.3.0";
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "marwan-at-work";
repo = "mod";
rev = "v${version}";
- sha256 = "1kcsdi9qls9kgklj96ycyrq5fsz5m2qj3ij63d2rwqjggqk0cab6";
+ sha256 = "1n0pipbq4fjban8hsxhyl5w8xrl4ai1pvgd02i1j1awmm2l3ykzl";
};
- modSha256 = "0famjypv5qg9lgzw4pz2kz70l50cn6n6nbjyk7jrzmd6bjzd0ypl";
+ modSha256 = "1nl7d00prw1663xrl1nvj1xbs7wzkbqn75i92al821pz12dybdif";
subPackages = [ "cmd/mod" ];
diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix
index 5daeb384cc51..a81b7133e92f 100644
--- a/pkgs/development/tools/omnisharp-roslyn/default.nix
+++ b/pkgs/development/tools/omnisharp-roslyn/default.nix
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "omnisharp-roslyn";
- version = "1.34.15";
+ version = "1.35.0";
src = fetchurl {
url = "https://github.com/OmniSharp/omnisharp-roslyn/releases/download/v${version}/omnisharp-mono.tar.gz";
- sha256 = "16wjp89lzg33cap99jv1vgqvdx0y0xvb892fpihwg62iafh10b8m";
+ sha256 = "191jiyw6kx1rw241bg9nv5splfpz6ny90g9yf28cd0xwpx978p83";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix
index d158f3bf1558..32ac95cff6a4 100644
--- a/pkgs/development/tools/packer/default.nix
+++ b/pkgs/development/tools/packer/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "packer";
- version = "1.5.5";
+ version = "1.5.6";
goPackagePath = "github.com/hashicorp/packer";
@@ -11,7 +11,7 @@ buildGoPackage rec {
owner = "hashicorp";
repo = "packer";
rev = "v${version}";
- sha256 = "1l5n6s4fg6rgb7k845hsxgrs44y9bs2hmdxqzfbayiv8nz1qg286";
+ sha256 = "0pwygrh6pjmx8a1jc12929x0slj7w3b8p3pzswnbk7klyhj4jkp8";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/parsing/jshon/default.nix b/pkgs/development/tools/parsing/jshon/default.nix
index cff36d2cb523..04a1a637207d 100644
--- a/pkgs/development/tools/parsing/jshon/default.nix
+++ b/pkgs/development/tools/parsing/jshon/default.nix
@@ -1,29 +1,27 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, jansson }:
stdenv.mkDerivation rec {
- name = "jshon-20160111.2";
-
- rev = "a61d7f2f85f4627bc3facdf951746f0fd62334b7";
- sha256 = "1053w7jbl90q3p5y34pi4i8an1ddsjzwaib5cfji75ivamc5wdmh";
+ pname = "jshon";
+ version = "20170302";
src = fetchFromGitHub {
- inherit rev sha256;
owner = "keenerd";
repo = "jshon";
+ rev = "d919aeaece37962251dbe6c1ee50f0028a5c90e4";
+ sha256 = "1x4zfmsjq0l2y994bxkhx3mn5vzjxxr39iib213zjchi9h6yxvnc";
};
- patches = [
- # Fix null termination in read_stream.
- # https://github.com/keenerd/jshon/issues/53
- (fetchpatch {
- url = "https://github.com/mbrock/jshon/commit/32288dd186573ceb58164f30be1782d4580466d8.patch";
- sha256 = "04rss2nprl9nqblc7smq0477n54hm801xgnnmvyzni313i1n6vhl";
- })
- ];
-
buildInputs = [ jansson ];
- patchPhase =
+ patches = [
+ (fetchpatch {
+ # https://github.com/keenerd/jshon/pull/62
+ url = "https://github.com/keenerd/jshon/commit/96b4e9dbf578be7b31f29740b608aa7b34df3318.patch";
+ sha256 = "0kwbn3xb37iqb5y1n8vhzjiwlbg5jmki3f38pzakc24kzc5ksmaa";
+ })
+ ];
+
+ postPatch =
''
substituteInPlace Makefile --replace "/usr/" "/"
'';
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix b/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix
index fbcee749b7cd..b96316e59d83 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix
@@ -1,4 +1,4 @@
-{ pkgs ? import {}
+{ pkgs ? import { }
, lib ? pkgs.lib
, version
}:
@@ -33,8 +33,8 @@ pkgs.stdenv.mkDerivation {
mv poetry2nix $out/bin
wrapProgram $out/bin/poetry2nix --prefix PATH ":" ${lib.makeBinPath [
- pkgs.nix-prefetch-git
- ]}
+ pkgs.nix-prefetch-git
+ ]}
runHook postInstall
'';
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
index e7f718519a59..a7fb382c7553 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
@@ -1,22 +1,20 @@
-{ pkgs ? import {}
+{ pkgs ? import { }
, lib ? pkgs.lib
, poetry ? null
, poetryLib ? import ./lib.nix { inherit lib pkgs; }
}:
let
- inherit (poetryLib) isCompatible readTOML;
+ inherit (poetryLib) isCompatible readTOML moduleName;
# Poetry2nix version
- version = "1.7.1";
+ version = "1.8.0";
/* The default list of poetry2nix override overlays */
defaultPoetryOverrides = (import ./overrides.nix { inherit pkgs lib; });
-
mkEvalPep508 = import ./pep508.nix {
inherit lib poetryLib;
stdenv = pkgs.stdenv;
};
-
getFunctorFn = fn: if builtins.typeOf fn == "set" then fn.__functor else fn;
# Map SPDX identifiers to license names
@@ -34,95 +32,99 @@ let
, overrides ? [ defaultPoetryOverrides ]
, python ? pkgs.python3
, pwd ? projectDir
+ , preferWheels ? false
}@attrs:
- let
- poetryPkg = poetry.override { inherit python; };
+ let
+ poetryPkg = poetry.override { inherit python; };
+ pyProject = readTOML pyproject;
+ poetryLock = readTOML poetrylock;
+ lockFiles =
+ let
+ lockfiles = lib.getAttrFromPath [ "metadata" "files" ] poetryLock;
+ in
+ lib.listToAttrs (lib.mapAttrsToList (n: v: { name = moduleName n; value = v; }) lockfiles);
+ specialAttrs = [
+ "overrides"
+ "poetrylock"
+ "projectDir"
+ "pwd"
+ "preferWheels"
+ ];
+ passedAttrs = builtins.removeAttrs attrs specialAttrs;
+ evalPep508 = mkEvalPep508 python;
- pyProject = readTOML pyproject;
- poetryLock = readTOML poetrylock;
- lockFiles = lib.getAttrFromPath [ "metadata" "files" ] poetryLock;
-
- specialAttrs = [
- "overrides"
- "poetrylock"
- "projectDir"
- "pwd"
- ];
- passedAttrs = builtins.removeAttrs attrs specialAttrs;
-
- evalPep508 = mkEvalPep508 python;
-
- # Filter packages by their PEP508 markers & pyproject interpreter version
- partitions = let
+ # Filter packages by their PEP508 markers & pyproject interpreter version
+ partitions =
+ let
supportsPythonVersion = pkgMeta: if pkgMeta ? marker then (evalPep508 pkgMeta.marker) else true;
in
- lib.partition supportsPythonVersion poetryLock.package;
+ lib.partition supportsPythonVersion poetryLock.package;
+ compatible = partitions.right;
+ incompatible = partitions.wrong;
- compatible = partitions.right;
- incompatible = partitions.wrong;
-
- # Create an overriden version of pythonPackages
- #
- # We need to avoid mixing multiple versions of pythonPackages in the same
- # closure as python can only ever have one version of a dependency
- baseOverlay = self: super:
- let
- getDep = depName: self.${depName};
-
- lockPkgs = builtins.listToAttrs (
- builtins.map (
- pkgMeta: rec {
- name = pkgMeta.name;
- value = self.mkPoetryDep (
- pkgMeta // {
- inherit pwd;
- source = pkgMeta.source or null;
- files = lockFiles.${name};
- pythonPackages = self;
- sourceSpec = pyProject.tool.poetry.dependencies.${name} or pyProject.tool.poetry.dev-dependencies.${name};
- }
- );
- }
- ) compatible
+ # Create an overriden version of pythonPackages
+ #
+ # We need to avoid mixing multiple versions of pythonPackages in the same
+ # closure as python can only ever have one version of a dependency
+ baseOverlay = self: super:
+ let
+ getDep = depName: self.${depName};
+ lockPkgs = builtins.listToAttrs
+ (
+ builtins.map
+ (
+ pkgMeta: rec {
+ name = moduleName pkgMeta.name;
+ value = self.mkPoetryDep
+ (
+ pkgMeta // {
+ inherit pwd preferWheels;
+ source = pkgMeta.source or null;
+ files = lockFiles.${name};
+ pythonPackages = self;
+ sourceSpec = pyProject.tool.poetry.dependencies.${name} or pyProject.tool.poetry.dev-dependencies.${name};
+ }
+ );
+ }
+ ) compatible
);
- in
- lockPkgs;
- overlays = builtins.map getFunctorFn (
+ in
+ lockPkgs;
+ overlays = builtins.map getFunctorFn
+ (
[
(
self: super:
let
- hooks = self.callPackage ./hooks {};
+ hooks = self.callPackage ./hooks { };
in
- {
- mkPoetryDep = self.callPackage ./mk-poetry-dep.nix {
- inherit pkgs lib python poetryLib;
- };
- poetry = poetryPkg;
- # The canonical name is setuptools-scm
- setuptools-scm = super.setuptools_scm;
+ {
+ mkPoetryDep = self.callPackage ./mk-poetry-dep.nix {
+ inherit pkgs lib python poetryLib;
+ };
+ poetry = poetryPkg;
+ # The canonical name is setuptools-scm
+ setuptools-scm = super.setuptools_scm;
- inherit (hooks) removePathDependenciesHook poetry2nixFixupHook;
- }
+ inherit (hooks) pipBuildHook removePathDependenciesHook poetry2nixFixupHook;
+ }
)
# Null out any filtered packages, we don't want python.pkgs from nixpkgs
- (self: super: builtins.listToAttrs (builtins.map (x: { name = x.name; value = null; }) incompatible))
+ (self: super: builtins.listToAttrs (builtins.map (x: { name = moduleName x.name; value = null; }) incompatible))
# Create poetry2nix layer
baseOverlay
] ++ # User provided overrides
overrides
);
-
- packageOverrides = lib.foldr lib.composeExtensions (self: super: {}) overlays;
-
- py = python.override { inherit packageOverrides; self = py; };
- in
- {
- python = py;
- poetryPackages = map (pkg: py.pkgs.${pkg.name}) compatible;
- poetryLock = poetryLock;
- inherit pyProject;
- };
+ packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) overlays;
+ py = python.override { inherit packageOverrides; self = py; };
+ in
+ {
+ python = py;
+ poetryPackages = map (pkg: py.pkgs.${moduleName pkg.name}) compatible;
+ poetryLock = poetryLock;
+ inherit pyProject;
+ };
/* Returns a package with a python interpreter and all packages specified in the poetry.lock lock file.
@@ -136,15 +138,17 @@ let
, overrides ? [ defaultPoetryOverrides ]
, pwd ? projectDir
, python ? pkgs.python3
+ , preferWheels ? false
}:
- let
- py = mkPoetryPackages (
+ let
+ py = mkPoetryPackages
+ (
{
- inherit pyproject poetrylock overrides python pwd;
+ inherit pyproject poetrylock overrides python pwd preferWheels;
}
);
- in
- py.python.withPackages (_: py.poetryPackages);
+ in
+ py.python.withPackages (_: py.poetryPackages);
/* Creates a Python application from pyproject.toml and poetry.lock */
mkPoetryApplication =
@@ -153,79 +157,79 @@ let
, pyproject ? projectDir + "/pyproject.toml"
, poetrylock ? projectDir + "/poetry.lock"
, overrides ? [ defaultPoetryOverrides ]
- , meta ? {}
+ , meta ? { }
, python ? pkgs.python3
, pwd ? projectDir
+ , preferWheels ? false
, ...
}@attrs:
- let
- poetryPython = mkPoetryPackages {
- inherit pyproject poetrylock overrides python pwd;
- };
- py = poetryPython.python;
+ let
+ poetryPython = mkPoetryPackages {
+ inherit pyproject poetrylock overrides python pwd preferWheels;
+ };
+ py = poetryPython.python;
- inherit (poetryPython) pyProject;
+ inherit (poetryPython) pyProject;
+ specialAttrs = [
+ "overrides"
+ "poetrylock"
+ "projectDir"
+ "pwd"
+ "pyproject"
+ "preferWheels"
+ ];
+ passedAttrs = builtins.removeAttrs attrs specialAttrs;
- specialAttrs = [
- "overrides"
- "poetrylock"
- "projectDir"
- "pwd"
- "pyproject"
- ];
- passedAttrs = builtins.removeAttrs attrs specialAttrs;
+ # Get dependencies and filter out depending on interpreter version
+ getDeps = depAttr:
+ let
+ compat = isCompatible (poetryLib.getPythonVersion py);
+ deps = pyProject.tool.poetry.${depAttr} or { };
+ depAttrs = builtins.map (d: lib.toLower d) (builtins.attrNames deps);
+ in
+ builtins.map
+ (
+ dep:
+ let
+ pkg = py.pkgs."${dep}";
+ constraints = deps.${dep}.python or "";
+ isCompat = compat constraints;
+ in if isCompat then pkg else null
+ ) depAttrs;
+ getInputs = attr: attrs.${attr} or [ ];
+ mkInput = attr: extraInputs: getInputs attr ++ extraInputs;
+ buildSystemPkgs = poetryLib.getBuildSystemPkgs {
+ inherit pyProject;
+ pythonPackages = py.pkgs;
+ };
+ in
+ py.pkgs.buildPythonApplication
+ (
+ passedAttrs // {
+ pname = moduleName pyProject.tool.poetry.name;
+ version = pyProject.tool.poetry.version;
- # Get dependencies and filter out depending on interpreter version
- getDeps = depAttr:
- let
- compat = isCompatible py.pythonVersion;
- deps = pyProject.tool.poetry.${depAttr} or {};
- depAttrs = builtins.map (d: lib.toLower d) (builtins.attrNames deps);
- in
- builtins.map (
- dep:
- let
- pkg = py.pkgs."${dep}";
- constraints = deps.${dep}.python or "";
- isCompat = compat constraints;
- in
- if isCompat then pkg else null
- ) depAttrs;
+ inherit src;
- getInputs = attr: attrs.${attr} or [];
- mkInput = attr: extraInputs: getInputs attr ++ extraInputs;
+ format = "pyproject";
- buildSystemPkgs = poetryLib.getBuildSystemPkgs {
- inherit pyProject;
- pythonPackages = py.pkgs;
- };
- in
- py.pkgs.buildPythonApplication (
- passedAttrs // {
- pname = pyProject.tool.poetry.name;
- version = pyProject.tool.poetry.version;
+ buildInputs = mkInput "buildInputs" buildSystemPkgs;
+ propagatedBuildInputs = mkInput "propagatedBuildInputs" (getDeps "dependencies") ++ ([ py.pkgs.setuptools ]);
+ nativeBuildInputs = mkInput "nativeBuildInputs" [ pkgs.yj py.pkgs.removePathDependenciesHook ];
+ checkInputs = mkInput "checkInputs" (getDeps "dev-dependencies");
- inherit src;
+ passthru = {
+ python = py;
+ };
- format = "pyproject";
+ meta = meta // {
+ inherit (pyProject.tool.poetry) description homepage;
+ inherit (py.meta) platforms;
+ license = getLicenseBySpdxId (pyProject.tool.poetry.license or "unknown");
+ };
- buildInputs = mkInput "buildInputs" buildSystemPkgs;
- propagatedBuildInputs = mkInput "propagatedBuildInputs" (getDeps "dependencies") ++ ([ py.pkgs.setuptools ]);
- nativeBuildInputs = mkInput "nativeBuildInputs" [ pkgs.yj py.pkgs.removePathDependenciesHook ];
- checkInputs = mkInput "checkInputs" (getDeps "dev-dependencies");
-
- passthru = {
- python = py;
- };
-
- meta = meta // {
- inherit (pyProject.tool.poetry) description homepage;
- inherit (py.meta) platforms;
- license = getLicenseBySpdxId (pyProject.tool.poetry.license or "unknown");
- };
-
- }
- );
+ }
+ );
/* Poetry2nix CLI used to supplement SHA-256 hashes for git dependencies */
cli = import ./cli.nix { inherit pkgs lib version; };
@@ -247,7 +251,7 @@ in
defaultSet = defaultPoetryOverrides self super;
customSet = fn self super;
in
- defaultSet // customSet;
+ defaultSet // customSet;
};
/*
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/fetch-wheel.sh b/pkgs/development/tools/poetry2nix/poetry2nix/fetch-wheel.sh
new file mode 100644
index 000000000000..97f54b23416d
--- /dev/null
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/fetch-wheel.sh
@@ -0,0 +1,24 @@
+source $stdenv/setup
+set -euo pipefail
+
+curl="curl \
+ --location \
+ --max-redirs 20 \
+ --retry 2 \
+ --disable-epsv \
+ --cookie-jar cookies \
+ --insecure \
+ --speed-time 5 \
+ -# \
+ --fail \
+ $curlOpts \
+ $NIX_CURL_FLAGS"
+
+echo "Trying to fetch wheel with predicted URL: $predictedURL"
+
+$curl $predictedURL --output $out && exit 0
+
+echo "Predicted URL '$predictedURL' failed, querying pypi.org"
+$curl "https://pypi.org/pypi/$pname/json" | jq -r ".releases.\"$version\"[] | select(.filename == \"$file\") | .url" > url
+url=$(cat url)
+$curl -k $url --output $out
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix
index 12d2bc962065..ae5867b83372 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix
@@ -2,31 +2,48 @@
, callPackage
, makeSetupHook
, yj
+, wheel
+, pip
}:
let
pythonInterpreter = python.pythonForBuild.interpreter;
+ pythonSitePackages = python.sitePackages;
in
{
- removePathDependenciesHook = callPackage (
- {}:
+ removePathDependenciesHook = callPackage
+ (
+ {}:
makeSetupHook {
name = "remove-path-dependencies.sh";
- deps = [];
+ deps = [ ];
substitutions = {
inherit pythonInterpreter;
yj = "${yj}/bin/yj";
pyprojectPatchScript = "${./pyproject-without-path.py}";
};
} ./remove-path-dependencies.sh
- ) {};
+ ) { };
- poetry2nixFixupHook = callPackage (
- {}:
+ pipBuildHook = callPackage
+ (
+ { pip, wheel }:
+ makeSetupHook {
+ name = "pip-build-hook.sh";
+ deps = [ pip wheel ];
+ substitutions = {
+ inherit pythonInterpreter pythonSitePackages;
+ };
+ } ./pip-build-hook.sh
+ ) { };
+
+ poetry2nixFixupHook = callPackage
+ (
+ {}:
makeSetupHook {
name = "fixup-hook.sh";
- deps = [];
+ deps = [ ];
} ./fixup-hook.sh
- ) {};
+ ) { };
}
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pip-build-hook.sh b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pip-build-hook.sh
new file mode 100644
index 000000000000..fa7b698fb510
--- /dev/null
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pip-build-hook.sh
@@ -0,0 +1,50 @@
+# Setup hook to use for pip projects
+echo "Sourcing pip-build-hook"
+
+pipBuildPhase() {
+ echo "Executing pipBuildPhase"
+ runHook preBuild
+
+ # Prefer using setup.py to avoid build-system dependencies if we have a setup.py
+ if [ -z "${dontPreferSetupPy-}" ]; then
+ if test -e setup.py && test -e pyproject.toml; then
+ echo "Removing pyproject.toml..."
+ rm -f pyproject.toml
+ fi
+ fi
+
+ mkdir -p dist
+ echo "Creating a wheel..."
+ @pythonInterpreter@ -m pip wheel --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist .
+ echo "Finished creating a wheel..."
+
+ runHook postBuild
+ echo "Finished executing pipBuildPhase"
+}
+
+pipShellHook() {
+ echo "Executing pipShellHook"
+ runHook preShellHook
+
+ # Long-term setup.py should be dropped.
+ if [ -e pyproject.toml ]; then
+ tmp_path=$(mktemp -d)
+ export PATH="$tmp_path/bin:$PATH"
+ export PYTHONPATH="$tmp_path/@pythonSitePackages@:$PYTHONPATH"
+ mkdir -p "$tmp_path/@pythonSitePackages@"
+ @pythonInterpreter@ -m pip install -e . --prefix "$tmp_path" >&2
+ fi
+
+ runHook postShellHook
+ echo "Finished executing pipShellHook"
+}
+
+if [ -z "${dontUsePipBuild-}" ] && [ -z "${buildPhase-}" ]; then
+ echo "Using pipBuildPhase"
+ buildPhase=pipBuildPhase
+fi
+
+if [ -z "${shellHook-}" ]; then
+ echo "Using pipShellHook"
+ shellHook=pipShellHook
+fi
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pyproject-without-path.py b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pyproject-without-path.py
index bb61e4a5cb4b..5d8fbcfe6b4d 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pyproject-without-path.py
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pyproject-without-path.py
@@ -6,7 +6,14 @@ import sys
data = json.load(sys.stdin)
-for dep in data['tool']['poetry']['dependencies'].values():
+
+def get_deep(o, path):
+ for p in path.split('.'):
+ o = o.get(p, {})
+ return o
+
+
+for dep in get_deep(data, 'tool.poetry.dependencies').values():
if isinstance(dep, dict):
try:
del dep['path'];
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix
index f4497afb8bc9..ed47837ee439 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix
@@ -8,6 +8,20 @@ let
genList (i: if i == idx then value else (builtins.elemAt list i)) (length list)
);
+ # Do some canonicalisation of module names
+ moduleName = name: lib.toLower (lib.replaceStrings [ "_" "." ] [ "-" "-" ] name);
+
+ # Get a full semver pythonVersion from a python derivation
+ getPythonVersion = python:
+ let
+ pyVer = lib.splitVersion python.pythonVersion ++ [ "0" ];
+ ver = lib.splitVersion python.version;
+ major = l: lib.elemAt l 0;
+ minor = l: lib.elemAt l 1;
+ joinVersion = v: lib.concatStringsSep "." v;
+ in
+ joinVersion ( if major pyVer == major ver && minor pyVer == minor ver then ver else pyVer);
+
# Compare a semver expression with a version
isCompatible = version:
let
@@ -18,41 +32,41 @@ let
};
splitRe = "(" + (builtins.concatStringsSep "|" (builtins.map (x: lib.replaceStrings [ "|" ] [ "\\|" ] x) (lib.attrNames operators))) + ")";
in
- expr:
+ expr:
+ let
+ tokens = builtins.filter (x: x != "") (builtins.split splitRe expr);
+ combine = acc: v:
let
- tokens = builtins.filter (x: x != "") (builtins.split splitRe expr);
- combine = acc: v:
- let
- isOperator = builtins.typeOf v == "list";
- operator = if isOperator then (builtins.elemAt v 0) else acc.operator;
- in
- if isOperator then (acc // { inherit operator; }) else {
- inherit operator;
- state = operators."${operator}" acc.state (satisfiesSemver version v);
- };
- initial = { operator = "&&"; state = true; };
+ isOperator = builtins.typeOf v == "list";
+ operator = if isOperator then (builtins.elemAt v 0) else acc.operator;
in
- if expr == "" then true else (builtins.foldl' combine initial tokens).state;
-
+ if isOperator then (acc // { inherit operator; }) else {
+ inherit operator;
+ state = operators."${operator}" acc.state (satisfiesSemver version v);
+ };
+ initial = { operator = "&&"; state = true; };
+ in if expr == "" then true else (builtins.foldl' combine initial tokens).state;
fromTOML = builtins.fromTOML or
(
- toml: builtins.fromJSON (
- builtins.readFile (
- pkgs.runCommand "from-toml"
- {
- inherit toml;
- allowSubstitutes = false;
- preferLocalBuild = true;
- }
- ''
- ${pkgs.remarshal}/bin/remarshal \
- -if toml \
- -i <(echo "$toml") \
- -of json \
- -o $out
- ''
+ toml: builtins.fromJSON
+ (
+ builtins.readFile
+ (
+ pkgs.runCommand "from-toml"
+ {
+ inherit toml;
+ allowSubstitutes = false;
+ preferLocalBuild = true;
+ }
+ ''
+ ${pkgs.remarshal}/bin/remarshal \
+ -if toml \
+ -i <(echo "$toml") \
+ -of json \
+ -o $out
+ ''
+ )
)
- )
);
readTOML = path: fromTOML (builtins.readFile path);
@@ -63,10 +77,61 @@ let
let
ml = pkgs.pythonManylinuxPackages;
in
- if lib.strings.hasInfix "manylinux1" f then { pkg = [ ml.manylinux1 ]; str = "1"; }
- else if lib.strings.hasInfix "manylinux2010" f then { pkg = [ ml.manylinux2010 ]; str = "2010"; }
- else if lib.strings.hasInfix "manylinux2014" f then { pkg = [ ml.manylinux2014 ]; str = "2014"; }
- else { pkg = []; str = null; };
+ if lib.strings.hasInfix "manylinux1" f then { pkg = [ ml.manylinux1 ]; str = "1"; }
+ else if lib.strings.hasInfix "manylinux2010" f then { pkg = [ ml.manylinux2010 ]; str = "2010"; }
+ else if lib.strings.hasInfix "manylinux2014" f then { pkg = [ ml.manylinux2014 ]; str = "2014"; }
+ else { pkg = [ ]; str = null; };
+
+ # Predict URL from the PyPI index.
+ # Args:
+ # pname: package name
+ # file: filename including extension
+ # hash: SRI hash
+ # kind: Language implementation and version tag
+ predictURLFromPypi = lib.makeOverridable
+ (
+ { pname, file, hash, kind }:
+ "https://files.pythonhosted.org/packages/${kind}/${lib.toLower (builtins.substring 0 1 file)}/${pname}/${file}"
+ );
+
+
+ # Fetch the wheels from the PyPI index.
+ # We need to first get the proper URL to the wheel.
+ # Args:
+ # pname: package name
+ # file: filename including extension
+ # hash: SRI hash
+ # kind: Language implementation and version tag
+ fetchWheelFromPypi = lib.makeOverridable
+ (
+ { pname, file, hash, kind, curlOpts ? "" }:
+ let
+ version = builtins.elemAt (builtins.split "-" file) 2;
+ in
+ (pkgs.stdenvNoCC.mkDerivation {
+ name = file;
+ nativeBuildInputs = [
+ pkgs.curl
+ pkgs.jq
+ ];
+ isWheel = true;
+ system = "builtin";
+
+ preferLocalBuild = true;
+ impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [
+ "NIX_CURL_FLAGS"
+ ];
+
+ predictedURL = predictURLFromPypi { inherit pname file hash kind; };
+ inherit pname file version curlOpts;
+
+ builder = ./fetch-wheel.sh;
+
+ outputHashMode = "flat";
+ outputHashAlgo = "sha256";
+ outputHash = hash;
+ })
+ );
# Fetch the artifacts from the PyPI index. Since we get all
# info we need from the lock file we don't use nixpkgs' fetchPyPi
@@ -78,25 +143,27 @@ let
# file: filename including extension
# hash: SRI hash
# kind: Language implementation and version tag https://www.python.org/dev/peps/pep-0427/#file-name-convention
- fetchFromPypi = lib.makeOverridable (
- { pname, file, hash, kind }:
- pkgs.fetchurl {
- url = "https://files.pythonhosted.org/packages/${kind}/${lib.toLower (builtins.substring 0 1 file)}/${pname}/${file}";
- inherit hash;
- }
- );
-
+ fetchFromPypi = lib.makeOverridable
+ (
+ { pname, file, hash, kind }:
+ if lib.strings.hasSuffix "whl" file then fetchWheelFromPypi { inherit pname file hash kind; }
+ else
+ pkgs.fetchurl {
+ url = predictURLFromPypi { inherit pname file hash kind; };
+ inherit hash;
+ }
+ );
getBuildSystemPkgs =
{ pythonPackages
, pyProject
}:
- let
- buildSystem = lib.getAttrFromPath [ "build-system" "build-backend" ] pyProject;
- drvAttr = builtins.elemAt (builtins.split "\\.|:" buildSystem) 0;
- in
- if buildSystem == "" then [] else (
- [ pythonPackages.${drvAttr} or (throw "unsupported build system ${buildSystem}") ]
- );
+ let
+ buildSystem = lib.attrByPath [ "build-system" "build-backend" ] "" pyProject;
+ drvAttr = moduleName (builtins.elemAt (builtins.split "\\.|:" buildSystem) 0);
+ in
+ if buildSystem == "" then [ ] else (
+ [ pythonPackages.${drvAttr} or (throw "unsupported build system ${buildSystem}") ]
+ );
# Find gitignore files recursively in parent directory stopping with .git
findGitIgnores = path:
@@ -105,9 +172,9 @@ let
gitIgnore = path + "/.gitignore";
isGitRoot = builtins.pathExists (path + "/.git");
hasGitIgnore = builtins.pathExists gitIgnore;
- gitIgnores = if hasGitIgnore then [ gitIgnore ] else [];
+ gitIgnores = if hasGitIgnore then [ gitIgnore ] else [ ];
in
- lib.optionals (builtins.toString path != "/" && ! isGitRoot) (findGitIgnores parent) ++ gitIgnores;
+ lib.optionals (builtins.toString path != "/" && ! isGitRoot) (findGitIgnores parent) ++ gitIgnores;
/*
Provides a source filtering mechanism that:
@@ -124,22 +191,25 @@ let
|| (type == "regular" && ! lib.strings.hasSuffix ".pyc" name)
;
in
- lib.cleanSourceWith {
- filter = lib.cleanSourceFilter;
- src = lib.cleanSourceWith {
- filter = pkgs.nix-gitignore.gitignoreFilterPure pycacheFilter gitIgnores src;
- inherit src;
- };
+ lib.cleanSourceWith {
+ filter = lib.cleanSourceFilter;
+ src = lib.cleanSourceWith {
+ filter = pkgs.nix-gitignore.gitignoreFilterPure pycacheFilter gitIgnores src;
+ inherit src;
};
+ };
in
{
inherit
fetchFromPypi
+ fetchWheelFromPypi
getManyLinuxDeps
isCompatible
readTOML
getBuildSystemPkgs
satisfiesSemver
cleanPythonSources
+ moduleName
+ getPythonVersion
;
}
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix
index 5e71190d28fe..2467dad31e1a 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix
@@ -10,74 +10,68 @@
, version
, files
, source
-, dependencies ? {}
+, dependencies ? { }
, pythonPackages
, python-versions
, pwd
, sourceSpec
, supportedExtensions ? lib.importJSON ./extensions.json
+, preferWheels ? false
, ...
}:
-pythonPackages.callPackage (
- { preferWheel ? false
- , ...
- }@args:
+pythonPackages.callPackage
+ (
+ { preferWheel ? preferWheels
+ , ...
+ }@args:
let
- inherit (poetryLib) isCompatible getManyLinuxDeps fetchFromPypi;
+ inherit (poetryLib) isCompatible getManyLinuxDeps fetchFromPypi moduleName;
inherit (import ./pep425.nix {
inherit lib python;
inherit (pkgs) stdenv;
}) selectWheel
;
-
- fileCandidates = let
- supportedRegex = ("^.*?(" + builtins.concatStringsSep "|" supportedExtensions + ")");
- matchesVersion = fname: builtins.match ("^.*" + builtins.replaceStrings [ "." ] [ "\\." ] version + ".*$") fname != null;
- hasSupportedExtension = fname: builtins.match supportedRegex fname != null;
- isCompatibleEgg = fname: ! lib.strings.hasSuffix ".egg" fname || lib.strings.hasSuffix "py${python.pythonVersion}.egg" fname;
- in
+ fileCandidates =
+ let
+ supportedRegex = ("^.*?(" + builtins.concatStringsSep "|" supportedExtensions + ")");
+ matchesVersion = fname: builtins.match ("^.*" + builtins.replaceStrings [ "." ] [ "\\." ] version + ".*$") fname != null;
+ hasSupportedExtension = fname: builtins.match supportedRegex fname != null;
+ isCompatibleEgg = fname: ! lib.strings.hasSuffix ".egg" fname || lib.strings.hasSuffix "py${python.pythonVersion}.egg" fname;
+ in
builtins.filter (f: matchesVersion f.file && hasSupportedExtension f.file && isCompatibleEgg f.file) files;
-
toPath = s: pwd + "/${s}";
-
isSource = source != null;
isGit = isSource && source.type == "git";
isLocal = isSource && source.type == "directory";
-
localDepPath = toPath source.url;
pyProject = poetryLib.readTOML (localDepPath + "/pyproject.toml");
-
buildSystemPkgs = poetryLib.getBuildSystemPkgs {
inherit pythonPackages pyProject;
};
-
- fileInfo = let
- isBdist = f: lib.strings.hasSuffix "whl" f.file;
- isSdist = f: ! isBdist f && ! isEgg f;
- isEgg = f: lib.strings.hasSuffix ".egg" f.file;
-
- binaryDist = selectWheel fileCandidates;
- sourceDist = builtins.filter isSdist fileCandidates;
- eggs = builtins.filter isEgg fileCandidates;
-
- entries = (if preferWheel then binaryDist ++ sourceDist else sourceDist ++ binaryDist) ++ eggs;
-
- lockFileEntry = builtins.head entries;
-
- _isEgg = isEgg lockFileEntry;
- in
+ fileInfo =
+ let
+ isBdist = f: lib.strings.hasSuffix "whl" f.file;
+ isSdist = f: ! isBdist f && ! isEgg f;
+ isEgg = f: lib.strings.hasSuffix ".egg" f.file;
+ binaryDist = selectWheel fileCandidates;
+ sourceDist = builtins.filter isSdist fileCandidates;
+ eggs = builtins.filter isEgg fileCandidates;
+ entries = ( if preferWheel then binaryDist ++ sourceDist else sourceDist ++ binaryDist) ++ eggs;
+ lockFileEntry = builtins.head entries;
+ _isEgg = isEgg lockFileEntry;
+ in
rec {
inherit (lockFileEntry) file hash;
name = file;
format =
if _isEgg then "egg"
else if lib.strings.hasSuffix ".whl" name then "wheel"
- else "setuptools";
+ else "pyproject";
kind =
if _isEgg then python.pythonVersion
- else if format == "setuptools" then "source"
+ else if format == "pyproject" then "source"
else (builtins.elemAt (lib.strings.splitString "-" name) 2);
};
@@ -88,63 +82,65 @@ pythonPackages.callPackage (
"toml" # Toml is an extra for setuptools-scm
];
baseBuildInputs = lib.optional (! lib.elem name skipSetupToolsSCM) pythonPackages.setuptools-scm;
-
- format = if isLocal then "pyproject" else if isGit then "setuptools" else fileInfo.format;
+ format = if isLocal then "pyproject" else if isGit then "pyproject" else fileInfo.format;
in
+ buildPythonPackage {
+ pname = moduleName name;
+ version = version;
- buildPythonPackage {
- pname = name;
- version = version;
+ inherit format;
- inherit format;
+ doCheck = false; # We never get development deps
- doCheck = false; # We never get development deps
+ # Stripping pre-built wheels lead to `ELF load command address/offset not properly aligned`
+ dontStrip = format == "wheel";
- # Stripping pre-built wheels lead to `ELF load command address/offset not properly aligned`
- dontStrip = format == "wheel";
+ nativeBuildInputs = [
+ pythonPackages.poetry2nixFixupHook
+ ]
+ ++ lib.optional (!isSource && (getManyLinuxDeps fileInfo.name).str != null) autoPatchelfHook
+ ++ lib.optional (format == "pyproject") pythonPackages.removePathDependenciesHook
+ ;
- nativeBuildInputs = [
- pythonPackages.poetry2nixFixupHook
- ]
- ++ lib.optional (!isSource && (getManyLinuxDeps fileInfo.name).str != null) autoPatchelfHook
- ++ lib.optional (format == "pyproject") pythonPackages.removePathDependenciesHook
- ;
+ buildInputs = (
+ baseBuildInputs
+ ++ lib.optional (!isSource) (getManyLinuxDeps fileInfo.name).pkg
+ ++ lib.optional isLocal buildSystemPkgs
+ );
- buildInputs = (
- baseBuildInputs
- ++ lib.optional (!isSource) (getManyLinuxDeps fileInfo.name).pkg
- ++ lib.optional isLocal buildSystemPkgs
- );
-
- propagatedBuildInputs = let
- compat = isCompatible python.pythonVersion;
- deps = lib.filterAttrs (n: v: v) (
- lib.mapAttrs (
- n: v:
- let
- constraints = v.python or "";
- in
- compat constraints
- ) dependencies
- );
+ propagatedBuildInputs =
+ let
+ compat = isCompatible (poetryLib.getPythonVersion python);
+ deps = lib.filterAttrs (n: v: v)
+ (
+ lib.mapAttrs
+ (
+ n: v:
+ let
+ constraints = v.python or "";
+ in
+ compat constraints
+ ) dependencies
+ );
depAttrs = lib.attrNames deps;
in
- builtins.map (n: pythonPackages.${lib.toLower n}) depAttrs;
+ builtins.map (n: pythonPackages.${moduleName n}) depAttrs;
- meta = {
- broken = ! isCompatible python.pythonVersion python-versions;
- license = [];
- inherit (python.meta) platforms;
- };
+ meta = {
+ broken = ! isCompatible (poetryLib.getPythonVersion python) python-versions;
+ license = [ ];
+ inherit (python.meta) platforms;
+ };
- passthru = {
- inherit args;
- };
+ passthru = {
+ inherit args;
+ };
- # We need to retrieve kind from the interpreter and the filename of the package
- # Interpreters should declare what wheel types they're compatible with (python type + ABI)
- # Here we can then choose a file based on that info.
- src = if isGit then (
+ # We need to retrieve kind from the interpreter and the filename of the package
+ # Interpreters should declare what wheel types they're compatible with (python type + ABI)
+ # Here we can then choose a file based on that info.
+ src =
+ if isGit then (
builtins.fetchGit {
inherit (source) url;
rev = source.reference;
@@ -154,6 +150,5 @@ pythonPackages.callPackage (
pname = name;
inherit (fileInfo) file hash kind;
};
- }
-
-) {}
+ }
+ ) { }
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
index 04340ac4e89f..d18e6b8293f3 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
@@ -1,4 +1,4 @@
-{ pkgs ? import {}
+{ pkgs ? import { }
, lib ? pkgs.lib
, stdenv ? pkgs.stdenv
}:
@@ -6,202 +6,256 @@
self: super:
{
- astroid = super.astroid.overridePythonAttrs (
- old: rec {
- buildInputs = old.buildInputs ++ [ self.pytest-runner ];
- doCheck = false;
- }
- );
+ astroid = super.astroid.overridePythonAttrs
+ (
+ old: rec {
+ buildInputs = old.buildInputs ++ [ self.pytest-runner ];
+ doCheck = false;
+ }
+ );
- av = super.av.overridePythonAttrs (
- old: {
- nativeBuildInputs = old.nativeBuildInputs ++ [
- pkgs.pkgconfig
- ];
- buildInputs = old.buildInputs ++ [ pkgs.ffmpeg_4 ];
- }
- );
+ av = super.av.overridePythonAttrs
+ (
+ old: {
+ nativeBuildInputs = old.nativeBuildInputs ++ [
+ pkgs.pkgconfig
+ ];
+ buildInputs = old.buildInputs ++ [ pkgs.ffmpeg_4 ];
+ }
+ );
- bcrypt = super.bcrypt.overridePythonAttrs (
- old: {
- buildInputs = old.buildInputs ++ [ pkgs.libffi ];
- }
- );
+ bcrypt = super.bcrypt.overridePythonAttrs
+ (
+ old: {
+ buildInputs = old.buildInputs ++ [ pkgs.libffi ];
+ }
+ );
cffi =
# cffi is bundled with pypy
if self.python.implementation == "pypy" then null else (
- super.cffi.overridePythonAttrs (
- old: {
- buildInputs = old.buildInputs ++ [ pkgs.libffi ];
- }
- )
+ super.cffi.overridePythonAttrs
+ (
+ old: {
+ buildInputs = old.buildInputs ++ [ pkgs.libffi ];
+ }
+ )
);
- cftime = super.cftime.overridePythonAttrs (
- old: {
- buildInputs = old.buildInputs ++ [
- self.cython
- ];
- }
- );
+ cftime = super.cftime.overridePythonAttrs
+ (
+ old: {
+ buildInputs = old.buildInputs ++ [
+ self.cython
+ ];
+ }
+ );
- cryptography = super.cryptography.overridePythonAttrs (
- old: {
- buildInputs = old.buildInputs ++ [ pkgs.openssl ];
- }
- );
+ configparser = super.configparser.overridePythonAttrs
+ (
+ old: {
+ buildInputs = old.buildInputs ++ [
+ self.toml
+ ];
+
+ postPatch = ''
+ substituteInPlace setup.py --replace 'setuptools.setup()' 'setuptools.setup(version="${old.version}")'
+ '';
+ }
+ );
+
+ cryptography = super.cryptography.overridePythonAttrs
+ (
+ old: {
+ buildInputs = old.buildInputs ++ [ pkgs.openssl ];
+ }
+ );
django = (
- super.django.overridePythonAttrs (
+ super.django.overridePythonAttrs
+ (
+ old: {
+ propagatedNativeBuildInputs = (old.propagatedNativeBuildInputs or [ ])
+ ++ [ pkgs.gettext ];
+ }
+ )
+ );
+
+ django-bakery = super.django-bakery.overridePythonAttrs
+ (
old: {
- propagatedNativeBuildInputs = (old.propagatedNativeBuildInputs or [])
- ++ [ pkgs.gettext ];
+ configurePhase = ''
+ if ! test -e LICENSE; then
+ touch LICENSE
+ fi
+ '' + (old.configurePhase or "");
}
- )
- );
+ );
- django-bakery = super.django-bakery.overridePythonAttrs (
- old: {
- configurePhase = ''
- if ! test -e LICENSE; then
- touch LICENSE
- fi
- '' + (old.configurePhase or "");
- }
- );
+ dlib = super.dlib.overridePythonAttrs
+ (
+ old: {
+ # Parallel building enabled
+ inherit (pkgs.python.pkgs.dlib) patches;
- dlib = super.dlib.overridePythonAttrs (
- old: {
- # Parallel building enabled
- inherit (pkgs.python.pkgs.dlib) patches;
+ enableParallelBuilding = true;
+ dontUseCmakeConfigure = true;
- enableParallelBuilding = true;
- dontUseCmakeConfigure = true;
-
- nativeBuildInputs = old.nativeBuildInputs ++ pkgs.dlib.nativeBuildInputs;
- buildInputs = old.buildInputs ++ pkgs.dlib.buildInputs;
- }
- );
+ nativeBuildInputs = old.nativeBuildInputs ++ pkgs.dlib.nativeBuildInputs;
+ buildInputs = old.buildInputs ++ pkgs.dlib.buildInputs;
+ }
+ );
# Environment markers are not always included (depending on how a dep was defined)
enum34 = if self.pythonAtLeast "3.4" then null else super.enum34;
- faker = super.faker.overridePythonAttrs (
- old: {
- buildInputs = old.buildInputs ++ [ self.pytest-runner ];
- doCheck = false;
- }
- );
+ faker = super.faker.overridePythonAttrs
+ (
+ old: {
+ buildInputs = old.buildInputs ++ [ self.pytest-runner ];
+ doCheck = false;
+ }
+ );
- fancycompleter = super.fancycompleter.overridePythonAttrs (
- old: {
- postPatch = ''
- substituteInPlace setup.py \
- --replace 'setup_requires="setupmeta"' 'setup_requires=[]' \
- --replace 'versioning="devcommit"' 'version="${old.version}"'
- '';
- }
- );
+ fancycompleter = super.fancycompleter.overridePythonAttrs
+ (
+ old: {
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace 'setup_requires="setupmeta"' 'setup_requires=[]' \
+ --replace 'versioning="devcommit"' 'version="${old.version}"'
+ '';
+ }
+ );
- fastparquet = super.fastparquet.overridePythonAttrs (
- old: {
- buildInputs = old.buildInputs ++ [ self.pytest-runner ];
- }
- );
+ fastparquet = super.fastparquet.overridePythonAttrs
+ (
+ old: {
+ buildInputs = old.buildInputs ++ [ self.pytest-runner ];
+ }
+ );
- grandalf = super.grandalf.overridePythonAttrs (
- old: {
- buildInputs = old.buildInputs ++ [ self.pytest-runner ];
- doCheck = false;
- }
- );
+ grandalf = super.grandalf.overridePythonAttrs
+ (
+ old: {
+ buildInputs = old.buildInputs ++ [ self.pytest-runner ];
+ doCheck = false;
+ }
+ );
- h5py = super.h5py.overridePythonAttrs (
- old: rec {
- nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ];
- buildInputs = old.buildInputs ++ [ pkgs.hdf5 self.pkgconfig self.cython ];
- configure_flags = "--hdf5=${pkgs.hdf5}";
- postConfigure = ''
- ${self.python.executable} setup.py configure ${configure_flags}
- '';
- }
- );
+ h5py = super.h5py.overridePythonAttrs
+ (
+ old:
+ if old.format != "wheel" then rec {
+ nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ];
+ buildInputs = old.buildInputs ++ [ pkgs.hdf5 self.pkgconfig self.cython ];
+ configure_flags = "--hdf5=${pkgs.hdf5}";
+ postConfigure = ''
+ ${self.python.executable} setup.py configure ${configure_flags}
+ '';
+ } else old
+ );
- horovod = super.horovod.overridePythonAttrs (
- old: {
- propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.openmpi ];
- }
- );
+ horovod = super.horovod.overridePythonAttrs
+ (
+ old: {
+ propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.openmpi ];
+ }
+ );
# importlib-metadata has an incomplete dependency specification
- importlib-metadata = super.importlib-metadata.overridePythonAttrs (
- old: {
- propagatedBuildInputs = old.propagatedBuildInputs ++ lib.optional self.python.isPy2 self.pathlib2;
- }
- );
+ importlib-metadata = super.importlib-metadata.overridePythonAttrs
+ (
+ old: {
+ propagatedBuildInputs = old.propagatedBuildInputs ++ lib.optional self.python.isPy2 self.pathlib2;
+ }
+ );
- jupyter = super.jupyter.overridePythonAttrs (
- old: rec {
- # jupyter is a meta-package. Everything relevant comes from the
- # dependencies. It does however have a jupyter.py file that conflicts
- # with jupyter-core so this meta solves this conflict.
- meta.priority = 100;
- }
- );
+ isort = super.isort.overridePythonAttrs
+ (
+ old: {
+ propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.setuptools ];
+ }
+ );
- lap = super.lap.overridePythonAttrs (
- old: {
- propagatedBuildInputs = old.propagatedBuildInputs ++ [
- self.numpy
- ];
- }
- );
+ jupyter = super.jupyter.overridePythonAttrs
+ (
+ old: rec {
+ # jupyter is a meta-package. Everything relevant comes from the
+ # dependencies. It does however have a jupyter.py file that conflicts
+ # with jupyter-core so this meta solves this conflict.
+ meta.priority = 100;
+ }
+ );
- llvmlite = super.llvmlite.overridePythonAttrs (
- old: {
- nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.llvm ];
+ kiwisolver = super.kiwisolver.overridePythonAttrs
+ (
+ old: {
+ buildInputs = old.buildInputs ++ [
+ # cppy is at the time of writing not in nixpkgs
+ (self.cppy or null)
+ ];
+ }
+ );
- # Disable static linking
- # https://github.com/numba/llvmlite/issues/93
- postPatch = ''
- substituteInPlace ffi/Makefile.linux --replace "-static-libstdc++" ""
+ lap = super.lap.overridePythonAttrs
+ (
+ old: {
+ propagatedBuildInputs = old.propagatedBuildInputs ++ [
+ self.numpy
+ ];
+ }
+ );
- substituteInPlace llvmlite/tests/test_binding.py --replace "test_linux" "nope"
- '';
+ llvmlite = super.llvmlite.overridePythonAttrs
+ (
+ old: {
+ nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.llvm ];
- # Set directory containing llvm-config binary
- preConfigure = ''
- export LLVM_CONFIG=${pkgs.llvm}/bin/llvm-config
- '';
+ # Disable static linking
+ # https://github.com/numba/llvmlite/issues/93
+ postPatch = ''
+ substituteInPlace ffi/Makefile.linux --replace "-static-libstdc++" ""
- __impureHostDeps = pkgs.stdenv.lib.optionals pkgs.stdenv.isDarwin [ "/usr/lib/libm.dylib" ];
+ substituteInPlace llvmlite/tests/test_binding.py --replace "test_linux" "nope"
+ '';
- passthru = old.passthru // { llvm = pkgs.llvm; };
- }
- );
+ # Set directory containing llvm-config binary
+ preConfigure = ''
+ export LLVM_CONFIG=${pkgs.llvm}/bin/llvm-config
+ '';
- lockfile = super.lockfile.overridePythonAttrs (
- old: {
- propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.pbr ];
- }
- );
+ __impureHostDeps = pkgs.stdenv.lib.optionals pkgs.stdenv.isDarwin [ "/usr/lib/libm.dylib" ];
- lxml = super.lxml.overridePythonAttrs (
- old: {
- nativeBuildInputs = with pkgs; old.nativeBuildInputs ++ [ pkgconfig libxml2.dev libxslt.dev ];
- buildInputs = with pkgs; old.buildInputs ++ [ libxml2 libxslt ];
- }
- );
+ passthru = old.passthru // { llvm = pkgs.llvm; };
+ }
+ );
- markupsafe = super.markupsafe.overridePythonAttrs (
- old: {
- src = old.src.override { pname = builtins.replaceStrings [ "markupsafe" ] [ "MarkupSafe" ] old.pname; };
- }
- );
+ lockfile = super.lockfile.overridePythonAttrs
+ (
+ old: {
+ propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.pbr ];
+ }
+ );
- matplotlib = super.matplotlib.overridePythonAttrs (
- old:
+ lxml = super.lxml.overridePythonAttrs
+ (
+ old: {
+ nativeBuildInputs = with pkgs; old.nativeBuildInputs ++ [ pkgconfig libxml2.dev libxslt.dev ];
+ buildInputs = with pkgs; old.buildInputs ++ [ libxml2 libxslt ];
+ }
+ );
+
+ markupsafe = super.markupsafe.overridePythonAttrs
+ (
+ old: {
+ src = old.src.override { pname = builtins.replaceStrings [ "markupsafe" ] [ "MarkupSafe" ] old.pname; };
+ }
+ );
+
+ matplotlib = super.matplotlib.overridePythonAttrs
+ (
+ old:
let
enableGhostscript = old.passthru.enableGhostscript or false;
enableGtk3 = old.passthru.enableTk or false;
@@ -210,484 +264,583 @@ self: super:
inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa;
in
- {
- NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${pkgs.libcxx}/include/c++/v1";
+ {
+ NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${pkgs.libcxx}/include/c++/v1";
- XDG_RUNTIME_DIR = "/tmp";
+ XDG_RUNTIME_DIR = "/tmp";
- buildInputs = old.buildInputs
+ buildInputs = old.buildInputs
++ lib.optional enableGhostscript pkgs.ghostscript
++ lib.optional stdenv.isDarwin [ Cocoa ];
- nativeBuildInputs = old.nativeBuildInputs ++ [
- pkgs.pkgconfig
- ];
+ nativeBuildInputs = old.nativeBuildInputs ++ [
+ pkgs.pkgconfig
+ ];
- propagatedBuildInputs = old.propagatedBuildInputs ++ [
- pkgs.libpng
- pkgs.freetype
- ]
+ propagatedBuildInputs = old.propagatedBuildInputs ++ [
+ pkgs.libpng
+ pkgs.freetype
+ ]
++ stdenv.lib.optionals enableGtk3 [ pkgs.cairo self.pycairo pkgs.gtk3 pkgs.gobject-introspection self.pygobject3 ]
++ stdenv.lib.optionals enableTk [ pkgs.tcl pkgs.tk self.tkinter pkgs.libX11 ]
++ stdenv.lib.optionals enableQt [ self.pyqt5 ]
- ;
+ ;
- inherit (super.matplotlib) patches;
- }
- );
+ inherit (super.matplotlib) patches;
+ }
+ );
# Calls Cargo at build time for source builds and is really tricky to package
maturin = super.maturin.override {
preferWheel = true;
};
- mccabe = super.mccabe.overridePythonAttrs (
- old: {
- buildInputs = old.buildInputs ++ [ self.pytest-runner ];
- doCheck = false;
- }
- );
+ mccabe = super.mccabe.overridePythonAttrs
+ (
+ old: {
+ buildInputs = old.buildInputs ++ [ self.pytest-runner ];
+ doCheck = false;
+ }
+ );
- netcdf4 = super.netcdf4.overridePythonAttrs (
- old: {
- buildInputs = old.buildInputs ++ [
- self.cython
- ];
+ netcdf4 = super.netcdf4.overridePythonAttrs
+ (
+ old: {
+ buildInputs = old.buildInputs ++ [
+ self.cython
+ ];
- propagatedBuildInputs = old.propagatedBuildInputs ++ [
- pkgs.zlib
- pkgs.netcdf
- pkgs.hdf5
- pkgs.curl
- pkgs.libjpeg
- ];
+ propagatedBuildInputs = old.propagatedBuildInputs ++ [
+ pkgs.zlib
+ pkgs.netcdf
+ pkgs.hdf5
+ pkgs.curl
+ pkgs.libjpeg
+ ];
- # Variables used to configure the build process
- USE_NCCONFIG = "0";
- HDF5_DIR = lib.getDev pkgs.hdf5;
- NETCDF4_DIR = pkgs.netcdf;
- CURL_DIR = pkgs.curl.dev;
- JPEG_DIR = pkgs.libjpeg.dev;
- }
- );
+ # Variables used to configure the build process
+ USE_NCCONFIG = "0";
+ HDF5_DIR = lib.getDev pkgs.hdf5;
+ NETCDF4_DIR = pkgs.netcdf;
+ CURL_DIR = pkgs.curl.dev;
+ JPEG_DIR = pkgs.libjpeg.dev;
+ }
+ );
- numpy = super.numpy.overridePythonAttrs (
- old:
+ numpy = super.numpy.overridePythonAttrs
+ (
+ old:
let
blas = old.passthru.args.blas or pkgs.openblasCompat;
- lapack = old.passthru.args.lapack or pkgs.openblasCompat;
+ blasImplementation = lib.nameFromURL blas.name "-";
cfg = pkgs.writeTextFile {
name = "site.cfg";
- text = (lib.generators.toINI {} {
- ${blas.implementation} = {
- include_dirs = "${blas}/include:${lapack}/include";
- library_dirs = "${blas}/lib:${lapack}/lib";
- };
- });
+ text = (
+ lib.generators.toINI { } {
+ ${blasImplementation} = {
+ include_dirs = "${blas}/include";
+ library_dirs = "${blas}/lib";
+ } // lib.optionalAttrs (blasImplementation == "mkl") {
+ mkl_libs = "mkl_rt";
+ lapack_libs = "";
+ };
+ }
+ );
};
in
- {
- nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gfortran ];
- buildInputs = old.buildInputs ++ [ blas self.cython ];
- enableParallelBuilding = true;
- preBuild = ''
- ln -s ${cfg} site.cfg
- '';
- passthru = old.passthru // {
- blsaImplementation = blas.implementation;
- inherit blas cfg;
- };
- }
- );
+ {
+ nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gfortran ];
+ buildInputs = old.buildInputs ++ [ blas self.cython ];
+ enableParallelBuilding = true;
+ preBuild = ''
+ ln -s ${cfg} site.cfg
+ '';
+ passthru = old.passthru // {
+ blas = blas;
+ inherit blasImplementation cfg;
+ };
+ }
+ );
- openexr = super.openexr.overridePythonAttrs (
- old: rec {
- buildInputs = old.buildInputs ++ [ pkgs.openexr pkgs.ilmbase ];
- NIX_CFLAGS_COMPILE = [ "-I${pkgs.openexr.dev}/include/OpenEXR" "-I${pkgs.ilmbase.dev}/include/OpenEXR" ];
- }
- );
+ openexr = super.openexr.overridePythonAttrs
+ (
+ old: rec {
+ buildInputs = old.buildInputs ++ [ pkgs.openexr pkgs.ilmbase ];
+ NIX_CFLAGS_COMPILE = [ "-I${pkgs.openexr.dev}/include/OpenEXR" "-I${pkgs.ilmbase.dev}/include/OpenEXR" ];
+ }
+ );
- peewee = super.peewee.overridePythonAttrs (
- old:
+ peewee = super.peewee.overridePythonAttrs
+ (
+ old:
let
withPostgres = old.passthru.withPostgres or false;
withMysql = old.passthru.withMysql or false;
in
- {
- buildInputs = old.buildInputs ++ [ self.cython pkgs.sqlite ];
- propagatedBuildInputs = old.propagatedBuildInputs
+ {
+ buildInputs = old.buildInputs ++ [ self.cython pkgs.sqlite ];
+ propagatedBuildInputs = old.propagatedBuildInputs
++ lib.optional withPostgres self.psycopg2
++ lib.optional withMysql self.mysql-connector;
- }
- );
-
- pillow = super.pillow.overridePythonAttrs (
- old: {
- nativeBuildInputs = [ pkgs.pkgconfig ] ++ old.nativeBuildInputs;
- buildInputs = with pkgs; [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ] ++ old.buildInputs;
- }
- );
-
- psycopg2 = super.psycopg2.overridePythonAttrs (
- old: {
- nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ];
- }
- );
-
- psycopg2-binary = super.psycopg2-binary.overridePythonAttrs (
- old: {
- nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ];
- }
- );
-
- pyarrow = super.pyarrow.overridePythonAttrs (
- old: {
- buildInputs = old.buildInputs ++ [
- self.cython
- ];
- }
- );
-
- pycairo = (
- drv: (
- drv.overridePythonAttrs (
- _: {
- format = "other";
- }
- )
- ).overridePythonAttrs (
- old: {
-
- nativeBuildInputs = old.nativeBuildInputs ++ [
- pkgs.meson
- pkgs.ninja
- pkgs.pkgconfig
- ];
-
- propagatedBuildInputs = old.propagatedBuildInputs ++ [
- pkgs.cairo
- pkgs.xlibsWrapper
- ];
-
- mesonFlags = [ "-Dpython=${if self.isPy3k then "python3" else "python"}" ];
}
- )
- ) super.pycairo;
+ );
- pycocotools = super.pycocotools.overridePythonAttrs (
- old: {
- buildInputs = old.buildInputs ++ [
- self.cython
- self.numpy
- ];
- }
- );
-
- pygobject = super.pygobject.overridePythonAttrs (
- old: {
- nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ];
- buildInputs = old.buildInputs ++ [ pkgs.glib pkgs.gobject-introspection ];
- }
- );
-
- pylint = super.pylint.overridePythonAttrs (
- old: {
- buildInputs = old.buildInputs ++ [ self.pytest-runner ];
- doCheck = false;
- }
- );
-
- pyopenssl = super.pyopenssl.overridePythonAttrs (
- old: {
- buildInputs = old.buildInputs ++ [ pkgs.openssl ];
- }
- );
-
- pyqt5 = let
- drv = super.pyqt5;
- withConnectivity = drv.passthru.args.withConnectivity or false;
- withMultimedia = drv.passthru.args.withMultimedia or false;
- withWebKit = drv.passthru.args.withWebKit or false;
- withWebSockets = drv.passthru.args.withWebSockets or false;
- in
- super.pyqt5.overridePythonAttrs (
+ pillow = super.pillow.overridePythonAttrs
+ (
old: {
- format = "other";
+ nativeBuildInputs = [ pkgs.pkgconfig ] ++ old.nativeBuildInputs;
+ buildInputs = with pkgs; [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ] ++ old.buildInputs;
+ }
+ );
- nativeBuildInputs = old.nativeBuildInputs ++ [
- pkgs.pkgconfig
- pkgs.qt5.qmake
- pkgs.xorg.lndir
- pkgs.qt5.qtbase
- pkgs.qt5.qtsvg
- pkgs.qt5.qtdeclarative
- pkgs.qt5.qtwebchannel
- # self.pyqt5-sip
- self.sip
- ]
- ++ lib.optional withConnectivity pkgs.qt5.qtconnectivity
- ++ lib.optional withMultimedia pkgs.qt5.qtmultimedia
- ++ lib.optional withWebKit pkgs.qt5.qtwebkit
- ++ lib.optional withWebSockets pkgs.qt5.qtwebsockets
- ;
+ psycopg2 = super.psycopg2.overridePythonAttrs
+ (
+ old: {
+ nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ];
+ }
+ );
- buildInputs = old.buildInputs ++ [
- pkgs.dbus
- pkgs.qt5.qtbase
- pkgs.qt5.qtsvg
- pkgs.qt5.qtdeclarative
- self.sip
- ]
- ++ lib.optional withConnectivity pkgs.qt5.qtconnectivity
- ++ lib.optional withWebKit pkgs.qt5.qtwebkit
- ++ lib.optional withWebSockets pkgs.qt5.qtwebsockets
- ;
+ psycopg2-binary = super.psycopg2-binary.overridePythonAttrs
+ (
+ old: {
+ nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ];
+ }
+ );
- # Fix dbus mainloop
- patches = pkgs.python3.pkgs.pyqt5.patches or [];
-
- configurePhase = ''
- runHook preConfigure
-
- export PYTHONPATH=$PYTHONPATH:$out/${self.python.sitePackages}
-
- mkdir -p $out/${self.python.sitePackages}/dbus/mainloop
- ${self.python.executable} configure.py -w \
- --confirm-license \
- --no-qml-plugin \
- --bindir=$out/bin \
- --destdir=$out/${self.python.sitePackages} \
- --stubsdir=$out/${self.python.sitePackages}/PyQt5 \
- --sipdir=$out/share/sip/PyQt5 \
- --designer-plugindir=$out/plugins/designer
-
- runHook postConfigure
- '';
-
- postInstall = ''
- ln -s ${self.pyqt5-sip}/${self.python.sitePackages}/PyQt5/sip.* $out/${self.python.sitePackages}/PyQt5/
- for i in $out/bin/*; do
- wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH"
- done
-
- # Let's make it a namespace package
- cat << EOF > $out/${self.python.sitePackages}/PyQt5/__init__.py
- from pkgutil import extend_path
- __path__ = extend_path(__path__, __name__)
- EOF
- '';
-
- installCheckPhase = let
- modules = [
- "PyQt5"
- "PyQt5.QtCore"
- "PyQt5.QtQml"
- "PyQt5.QtWidgets"
- "PyQt5.QtGui"
- ]
- ++ lib.optional withWebSockets "PyQt5.QtWebSockets"
- ++ lib.optional withWebKit "PyQt5.QtWebKit"
- ++ lib.optional withMultimedia "PyQt5.QtMultimedia"
- ++ lib.optional withConnectivity "PyQt5.QtConnectivity"
- ;
-
- imports = lib.concatMapStrings (module: "import ${module};") modules;
+ pyarrow =
+ if lib.versionAtLeast super.pyarrow.version "0.16.0" then super.pyarrow.overridePythonAttrs
+ (
+ old:
+ let
+ parseMinor = drv: lib.concatStringsSep "." (lib.take 2 (lib.splitVersion drv.version));
+ _arrow-cpp = pkgs.arrow-cpp.override { inherit (self) python; };
+ ARROW_HOME = _arrow-cpp;
+ arrowCppVersion = parseMinor pkgs.arrow-cpp;
+ pyArrowVersion = parseMinor super.pyarrow;
+ errorMessage = "arrow-cpp version (${arrowCppVersion}) mismatches pyarrow version (${pyArrowVersion})";
in
- ''
- echo "Checking whether modules can be imported..."
- ${self.python.interpreter} -c "${imports}"
+ if arrowCppVersion != pyArrowVersion then throw errorMessage else {
+
+ nativeBuildInputs = old.nativeBuildInputs ++ [
+ self.cython
+ pkgs.pkgconfig
+ pkgs.cmake
+ ];
+
+ preBuild = ''
+ export PYARROW_PARALLEL=$NIX_BUILD_CORES
'';
- doCheck = true;
+ PARQUET_HOME = _arrow-cpp;
+ inherit ARROW_HOME;
+
+ buildInputs = old.buildInputs ++ [
+ pkgs.arrow-cpp
+ ];
+
+ PYARROW_BUILD_TYPE = "release";
+ PYARROW_WITH_PARQUET = true;
+ PYARROW_CMAKE_OPTIONS = [
+ "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib"
+
+ # This doesn't use setup hook to call cmake so we need to workaround #54606
+ # ourselves
+ "-DCMAKE_POLICY_DEFAULT_CMP0025=NEW"
+ ];
+
+ dontUseCmakeConfigure = true;
+ }
+ ) else super.pyarrow.overridePythonAttrs
+ (
+ old: {
+ nativeBuildInputs = old.nativeBuildInputs ++ [
+ self.cython
+ ];
+ }
+ );
+
+ pycairo =
+ (
+ drv: (
+ drv.overridePythonAttrs
+ (
+ _: {
+ format = "other";
+ }
+ )
+ ).overridePythonAttrs
+ (
+ old: {
+
+ nativeBuildInputs = old.nativeBuildInputs ++ [
+ pkgs.meson
+ pkgs.ninja
+ pkgs.pkgconfig
+ ];
+
+ propagatedBuildInputs = old.propagatedBuildInputs ++ [
+ pkgs.cairo
+ pkgs.xlibsWrapper
+ ];
+
+ mesonFlags = [ "-Dpython=${ if self.isPy3k then "python3" else "python"}" ];
+ }
+ )
+ ) super.pycairo;
+
+ pycocotools = super.pycocotools.overridePythonAttrs
+ (
+ old: {
+ buildInputs = old.buildInputs ++ [
+ self.cython
+ self.numpy
+ ];
+ }
+ );
+
+ pygobject = super.pygobject.overridePythonAttrs
+ (
+ old: {
+ nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ];
+ buildInputs = old.buildInputs ++ [ pkgs.glib pkgs.gobject-introspection ];
+ }
+ );
+
+ pylint = super.pylint.overridePythonAttrs
+ (
+ old: {
+ buildInputs = old.buildInputs ++ [ self.pytest-runner ];
+ doCheck = false;
+ }
+ );
+
+ pyopenssl = super.pyopenssl.overridePythonAttrs
+ (
+ old: {
+ buildInputs = old.buildInputs ++ [ pkgs.openssl ];
+ }
+ );
+
+ pyqt5 =
+ let
+ drv = super.pyqt5;
+ withConnectivity = drv.passthru.args.withConnectivity or false;
+ withMultimedia = drv.passthru.args.withMultimedia or false;
+ withWebKit = drv.passthru.args.withWebKit or false;
+ withWebSockets = drv.passthru.args.withWebSockets or false;
+ in
+ super.pyqt5.overridePythonAttrs
+ (
+ old: {
+ format = "other";
+
+ nativeBuildInputs = old.nativeBuildInputs ++ [
+ pkgs.pkgconfig
+ pkgs.qt5.qmake
+ pkgs.xorg.lndir
+ pkgs.qt5.qtbase
+ pkgs.qt5.qtsvg
+ pkgs.qt5.qtdeclarative
+ pkgs.qt5.qtwebchannel
+ # self.pyqt5-sip
+ self.sip
+ ]
+ ++ lib.optional withConnectivity pkgs.qt5.qtconnectivity
+ ++ lib.optional withMultimedia pkgs.qt5.qtmultimedia
+ ++ lib.optional withWebKit pkgs.qt5.qtwebkit
+ ++ lib.optional withWebSockets pkgs.qt5.qtwebsockets
+ ;
+
+ buildInputs = old.buildInputs ++ [
+ pkgs.dbus
+ pkgs.qt5.qtbase
+ pkgs.qt5.qtsvg
+ pkgs.qt5.qtdeclarative
+ self.sip
+ ]
+ ++ lib.optional withConnectivity pkgs.qt5.qtconnectivity
+ ++ lib.optional withWebKit pkgs.qt5.qtwebkit
+ ++ lib.optional withWebSockets pkgs.qt5.qtwebsockets
+ ;
+
+ # Fix dbus mainloop
+ patches = pkgs.python3.pkgs.pyqt5.patches or [ ];
+
+ configurePhase = ''
+ runHook preConfigure
+
+ export PYTHONPATH=$PYTHONPATH:$out/${self.python.sitePackages}
+
+ mkdir -p $out/${self.python.sitePackages}/dbus/mainloop
+ ${self.python.executable} configure.py -w \
+ --confirm-license \
+ --no-qml-plugin \
+ --bindir=$out/bin \
+ --destdir=$out/${self.python.sitePackages} \
+ --stubsdir=$out/${self.python.sitePackages}/PyQt5 \
+ --sipdir=$out/share/sip/PyQt5 \
+ --designer-plugindir=$out/plugins/designer
+
+ runHook postConfigure
+ '';
+
+ postInstall = ''
+ ln -s ${self.pyqt5-sip}/${self.python.sitePackages}/PyQt5/sip.* $out/${self.python.sitePackages}/PyQt5/
+ for i in $out/bin/*; do
+ wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH"
+ done
+
+ # Let's make it a namespace package
+ cat << EOF > $out/${self.python.sitePackages}/PyQt5/__init__.py
+ from pkgutil import extend_path
+ __path__ = extend_path(__path__, __name__)
+ EOF
+ '';
+
+ installCheckPhase =
+ let
+ modules = [
+ "PyQt5"
+ "PyQt5.QtCore"
+ "PyQt5.QtQml"
+ "PyQt5.QtWidgets"
+ "PyQt5.QtGui"
+ ]
+ ++ lib.optional withWebSockets "PyQt5.QtWebSockets"
+ ++ lib.optional withWebKit "PyQt5.QtWebKit"
+ ++ lib.optional withMultimedia "PyQt5.QtMultimedia"
+ ++ lib.optional withConnectivity "PyQt5.QtConnectivity"
+ ;
+ imports = lib.concatMapStrings (module: "import ${module};") modules;
+ in
+ ''
+ echo "Checking whether modules can be imported..."
+ ${self.python.interpreter} -c "${imports}"
+ '';
+
+ doCheck = true;
+
+ enableParallelBuilding = true;
+ }
+ );
+
+ pytest-datadir = super.pytest-datadir.overridePythonAttrs
+ (
+ old: {
+ postInstall = ''
+ rm -f $out/LICENSE
+ '';
+ }
+ );
+
+ pytest = super.pytest.overridePythonAttrs
+ (
+ old: {
+ doCheck = false;
+ }
+ );
+
+ pytest-runner = super.pytest-runner or super.pytestrunner;
+
+ python-jose = super.python-jose.overridePythonAttrs
+ (
+ old: {
+ postPath = ''
+ substituteInPlace setup.py --replace "'pytest-runner'," ""
+ substituteInPlace setup.py --replace "'pytest-runner'" ""
+ '';
+ }
+ );
+
+ python-prctl = super.python-prctl.overridePythonAttrs
+ (
+ old: {
+ buildInputs = old.buildInputs ++ [
+ pkgs.libcap
+ ];
+ }
+ );
+
+ pyzmq = super.pyzmq.overridePythonAttrs
+ (
+ old: {
+ nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ];
+ propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.zeromq ];
+ }
+ );
+
+ rockset = super.rockset.overridePythonAttrs
+ (
+ old: rec {
+ postPatch = ''
+ cp ./setup_rockset.py ./setup.py
+ '';
+ }
+ );
+
+ scaleapi = super.scaleapi.overridePythonAttrs
+ (
+ old: {
+ postPatch = ''
+ substituteInPlace setup.py --replace "install_requires = ['requests>=2.4.2', 'enum34']" "install_requires = ['requests>=2.4.2']" || true
+ '';
+ }
+ );
+
+ pandas = super.pandas.overridePythonAttrs
+ (
+ old: {
+ nativeBuildInputs = old.nativeBuildInputs ++ [ self.cython ];
+ }
+ );
+
+ # Pybind11 is an undeclared dependency of scipy that we need to pick from nixpkgs
+ # Make it not fail with infinite recursion
+ pybind11 = super.pybind11.overridePythonAttrs
+ (
+ old: {
+ cmakeFlags = (old.cmakeFlags or [ ]) ++ [
+ "-DPYBIND11_TEST=off"
+ ];
+ doCheck = false; # Circular test dependency
+ }
+ );
+
+ scipy = super.scipy.overridePythonAttrs
+ (
+ old:
+ if old.format != "wheel" then {
+ nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gfortran ];
+ propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.pybind11 ];
+ setupPyBuildFlags = [ "--fcompiler='gnu95'" ];
+ enableParallelBuilding = true;
+ buildInputs = old.buildInputs ++ [ self.numpy.blas ];
+ preConfigure = ''
+ sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py
+ export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES
+ '';
+ preBuild = ''
+ ln -s ${self.numpy.cfg} site.cfg
+ '';
+ } else old
+ );
+
+ scikit-learn = super.scikit-learn.overridePythonAttrs
+ (
+ old: {
+ buildInputs = old.buildInputs ++ [
+ pkgs.gfortran
+ pkgs.glibcLocales
+ ] ++ lib.optionals stdenv.cc.isClang [
+ pkgs.llvmPackages.openmp
+ ];
+
+ nativeBuildInputs = old.nativeBuildInputs ++ [
+ self.cython
+ ];
enableParallelBuilding = true;
}
);
- pytest-datadir = super.pytest-datadir.overridePythonAttrs (
- old: {
- postInstall = ''
- rm -f $out/LICENSE
- '';
- }
- );
-
- pytest = super.pytest.overridePythonAttrs (
- old: {
- doCheck = false;
- }
- );
-
- pytest-runner = super.pytest-runner or super.pytestrunner;
-
- python-prctl = super.python-prctl.overridePythonAttrs (
- old: {
- buildInputs = old.buildInputs ++ [
- pkgs.libcap
- ];
- }
- );
-
- pyzmq = super.pyzmq.overridePythonAttrs (
- old: {
- nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ];
- propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.zeromq ];
- }
- );
-
- rockset = super.rockset.overridePythonAttrs (
- old: rec {
- postPatch = ''
- cp ./setup_rockset.py ./setup.py
- '';
- }
- );
-
- scaleapi = super.scaleapi.overridePythonAttrs (
- old: {
- postPatch = ''
- substituteInPlace setup.py --replace "install_requires = ['requests>=2.4.2', 'enum34']" "install_requires = ['requests>=2.4.2']" || true
- '';
- }
- );
-
- pandas = super.pandas.overridePythonAttrs (
- old: {
- nativeBuildInputs = old.nativeBuildInputs ++ [ self.cython ];
- }
- );
-
- # Pybind11 is an undeclared dependency of scipy that we need to pick from nixpkgs
- # Make it not fail with infinite recursion
- pybind11 = super.pybind11.overridePythonAttrs (
- old: {
- cmakeFlags = (old.cmakeFlags or []) ++ [
- "-DPYBIND11_TEST=off"
- ];
- doCheck = false; # Circular test dependency
- }
- );
-
- scipy = super.scipy.overridePythonAttrs (
- old: {
- nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gfortran ];
- propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.pybind11 ];
- setupPyBuildFlags = [ "--fcompiler='gnu95'" ];
- enableParallelBuilding = true;
- buildInputs = old.buildInputs ++ [ self.numpy.blas ];
- preConfigure = ''
- sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py
- export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES
- '';
- preBuild = ''
- ln -s ${self.numpy.cfg} site.cfg
- '';
- }
- );
-
- scikit-learn = super.scikit-learn.overridePythonAttrs (
- old: {
- buildInputs = old.buildInputs ++ [
- pkgs.gfortran
- pkgs.glibcLocales
- ] ++ lib.optionals stdenv.cc.isClang [
- pkgs.llvmPackages.openmp
- ];
-
- nativeBuildInputs = old.nativeBuildInputs ++ [
- self.cython
- ];
-
- enableParallelBuilding = true;
- }
- );
-
- shapely = super.shapely.overridePythonAttrs (
- old: {
- buildInputs = old.buildInputs ++ [ pkgs.geos self.cython ];
- inherit (pkgs.python3.pkgs.shapely) patches GEOS_LIBRARY_PATH;
- }
- );
-
- shellingham = if lib.versionAtLeast super.shellingham.version "1.3.2" then (
- super.shellingham.overridePythonAttrs (
+ shapely = super.shapely.overridePythonAttrs
+ (
old: {
- format = "pyproject";
+ buildInputs = old.buildInputs ++ [ pkgs.geos self.cython ];
+ inherit (pkgs.python3.pkgs.shapely) patches GEOS_LIBRARY_PATH;
}
- )
- ) else super.shellingham;
+ );
- tables = super.tables.overridePythonAttrs (
- old: {
- HDF5_DIR = "${pkgs.hdf5}";
- nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ];
- propagatedBuildInputs = old.nativeBuildInputs ++ [ pkgs.hdf5 self.numpy self.numexpr ];
- }
- );
+ shellingham =
+ if lib.versionAtLeast super.shellingham.version "1.3.2" then (
+ super.shellingham.overridePythonAttrs
+ (
+ old: {
+ format = "pyproject";
+ }
+ )
+ ) else super.shellingham;
- tensorpack = super.tensorpack.overridePythonAttrs (
- old: {
- postPatch = ''
- substituteInPlace setup.cfg --replace "# will call find_packages()" ""
- '';
- }
- );
+ tables = super.tables.overridePythonAttrs
+ (
+ old: {
+ HDF5_DIR = "${pkgs.hdf5}";
+ nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ];
+ propagatedBuildInputs = old.nativeBuildInputs ++ [ pkgs.hdf5 self.numpy self.numexpr ];
+ }
+ );
- urwidtrees = super.urwidtrees.overridePythonAttrs (
- old: {
- propagatedBuildInputs = old.propagatedBuildInputs ++ [
- self.urwid
- ];
- }
- );
+ tensorpack = super.tensorpack.overridePythonAttrs
+ (
+ old: {
+ postPatch = ''
+ substituteInPlace setup.cfg --replace "# will call find_packages()" ""
+ '';
+ }
+ );
- vose-alias-method = super.vose-alias-method.overridePythonAttrs (
- old: {
- postInstall = ''
- rm -f $out/LICENSE
- '';
- }
- );
+ urwidtrees = super.urwidtrees.overridePythonAttrs
+ (
+ old: {
+ propagatedBuildInputs = old.propagatedBuildInputs ++ [
+ self.urwid
+ ];
+ }
+ );
- uvloop = super.uvloop.overridePythonAttrs (
- old: {
- buildInputs = old.buildInputs ++ lib.optionals stdenv.isDarwin [
- pkgs.darwin.apple_sdk.frameworks.ApplicationServices
- pkgs.darwin.apple_sdk.frameworks.CoreServices
- ];
- }
- );
+ vose-alias-method = super.vose-alias-method.overridePythonAttrs
+ (
+ old: {
+ postInstall = ''
+ rm -f $out/LICENSE
+ '';
+ }
+ );
+
+ uvloop = super.uvloop.overridePythonAttrs
+ (
+ old: {
+ buildInputs = old.buildInputs ++ lib.optionals stdenv.isDarwin [
+ pkgs.darwin.apple_sdk.frameworks.ApplicationServices
+ pkgs.darwin.apple_sdk.frameworks.CoreServices
+ ];
+ }
+ );
# Stop infinite recursion by using bootstrapped pkg from nixpkgs
wheel = (
pkgs.python3.pkgs.override {
python = self.python;
}
- ).wheel.overridePythonAttrs (
- _: {
- inherit (super.wheel) pname name version src;
- }
- );
+ ).wheel.overridePythonAttrs
+ (
+ old:
+ if old.format == "other" then old else {
+ inherit (super.wheel) pname name version src;
+ }
+ );
zipp =
(
if lib.versionAtLeast super.zipp.version "2.0.0" then (
- super.zipp.overridePythonAttrs (
- old: {
- prePatch = ''
- substituteInPlace setup.py --replace \
- 'setuptools.setup()' \
- 'setuptools.setup(version="${super.zipp.version}")'
- '';
- }
- )
+ super.zipp.overridePythonAttrs
+ (
+ old: {
+ prePatch = ''
+ substituteInPlace setup.py --replace \
+ 'setuptools.setup()' \
+ 'setuptools.setup(version="${super.zipp.version}")'
+ '';
+ }
+ )
) else super.zipp
- ).overridePythonAttrs (
- old: {
- propagatedBuildInputs = old.propagatedBuildInputs ++ [
- self.toml
- ];
- }
- );
+ ).overridePythonAttrs
+ (
+ old: {
+ propagatedBuildInputs = old.propagatedBuildInputs ++ [
+ self.toml
+ ];
+ }
+ );
}
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix
index cda4e8c78d4d..496c4ff15818 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix
@@ -12,8 +12,7 @@ let
major = builtins.elemAt ver 0;
minor = builtins.elemAt ver 1;
in
- "cp${major}${minor}";
-
+ "cp${major}${minor}";
abiTag = "${pythonTag}m";
#
@@ -24,13 +23,13 @@ let
entries = splitString "-" str;
p = removeSuffix ".whl" (builtins.elemAt entries 4);
in
- {
- pkgName = builtins.elemAt entries 0;
- pkgVer = builtins.elemAt entries 1;
- pyVer = builtins.elemAt entries 2;
- abi = builtins.elemAt entries 3;
- platform = p;
- };
+ {
+ pkgName = builtins.elemAt entries 0;
+ pkgVer = builtins.elemAt entries 1;
+ pyVer = builtins.elemAt entries 2;
+ abi = builtins.elemAt entries 3;
+ platform = p;
+ };
#
# Builds list of acceptable osx wheel files
@@ -42,9 +41,9 @@ let
v = lib.lists.head versions;
vs = lib.lists.tail versions;
in
- if (builtins.length versions == 0)
- then []
- else (builtins.filter (x: hasInfix v x.file) candidates) ++ (findBestMatches vs candidates);
+ if (builtins.length versions == 0)
+ then [ ]
+ else (builtins.filter (x: hasInfix v x.file) candidates) ++ (findBestMatches vs candidates);
# pyver = "cpXX"
# x = "cpXX" | "py2" | "py3" | "py2.py3"
@@ -53,7 +52,7 @@ let
normalize = y: ''cp${lib.strings.removePrefix "cp" (lib.strings.removePrefix "py" y)}'';
isCompat = p: x: lib.strings.hasPrefix (normalize x) p;
in
- lib.lists.any (isCompat pyver) (lib.strings.splitString "." x);
+ lib.lists.any (isCompat pyver) (lib.strings.splitString "." x);
#
# Selects the best matching wheel file from a list of files
@@ -61,42 +60,37 @@ let
selectWheel = files:
let
filesWithoutSources = (builtins.filter (x: hasSuffix ".whl" x.file) files);
-
isPyAbiCompatible = pyabi: x: x == "none" || pyabi == x;
-
withPython = ver: abi: x: (isPyVersionCompatible ver x.pyVer) && (isPyAbiCompatible abi x.abi);
-
- withPlatform = if isLinux
- then (
- x: x.platform == "manylinux1_${stdenv.platform.kernelArch}"
- || x.platform == "manylinux2010_${stdenv.platform.kernelArch}"
- || x.platform == "manylinux2014_${stdenv.platform.kernelArch}"
- || x.platform == "any"
- )
- else (x: hasInfix "macosx" x.platform || x.platform == "any");
-
+ withPlatform =
+ if isLinux
+ then (
+ x: x.platform == "manylinux1_${stdenv.platform.kernelArch}"
+ || x.platform == "manylinux2010_${stdenv.platform.kernelArch}"
+ || x.platform == "manylinux2014_${stdenv.platform.kernelArch}"
+ || x.platform == "any"
+ )
+ else (x: hasInfix "macosx" x.platform || x.platform == "any");
filterWheel = x:
let
f = toWheelAttrs x.file;
in
- (withPython pythonTag abiTag f) && (withPlatform f);
-
+ (withPython pythonTag abiTag f) && (withPlatform f);
filtered = builtins.filter filterWheel filesWithoutSources;
-
choose = files:
let
osxMatches = [ "10_12" "10_11" "10_10" "10_9" "any" ];
linuxMatches = [ "manylinux1_" "manylinux2010_" "manylinux2014_" "any" ];
- chooseLinux = x: lib.singleton (builtins.head (findBestMatches linuxMatches x));
- chooseOSX = x: lib.singleton (builtins.head (findBestMatches osxMatches x));
+ chooseLinux = x: lib.take 1 (findBestMatches linuxMatches x);
+ chooseOSX = x: lib.take 1 (findBestMatches osxMatches x);
in
- if isLinux
- then chooseLinux files
- else chooseOSX files;
+ if isLinux
+ then chooseLinux files
+ else chooseOSX files;
in
- if (builtins.length filtered == 0)
- then []
- else choose (filtered);
+ if (builtins.length filtered == 0)
+ then [ ]
+ else choose (filtered);
in
{
inherit selectWheel toWheelAttrs isPyVersionCompatible;
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix
index 67ffdddb4bd8..773e0a60e093 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix
@@ -7,7 +7,6 @@ let
# Strip leading/trailing whitespace from string
stripStr = s: lib.elemAt (builtins.split "^ *" (lib.elemAt (builtins.split " *$" s) 0)) 2;
-
findSubExpressionsFun = acc: c: (
if c == "(" then (
let
@@ -15,23 +14,23 @@ let
isOpen = acc.openP == 0;
startPos = if isOpen then posNew else acc.startPos;
in
- acc // {
- inherit startPos;
- exprs = acc.exprs ++ [ (substr acc.exprPos (acc.pos - 1) acc.expr) ];
- pos = posNew;
- openP = acc.openP + 1;
- }
+ acc // {
+ inherit startPos;
+ exprs = acc.exprs ++ [ (substr acc.exprPos (acc.pos - 1) acc.expr) ];
+ pos = posNew;
+ openP = acc.openP + 1;
+ }
) else if c == ")" then (
let
openP = acc.openP - 1;
exprs = findSubExpressions (substr acc.startPos acc.pos acc.expr);
in
- acc // {
- inherit openP;
- pos = acc.pos + 1;
- exprs = if openP == 0 then acc.exprs ++ [ exprs ] else acc.exprs;
- exprPos = if openP == 0 then acc.pos + 1 else acc.exprPos;
- }
+ acc // {
+ inherit openP;
+ pos = acc.pos + 1;
+ exprs = if openP == 0 then acc.exprs ++ [ exprs ] else acc.exprs;
+ exprPos = if openP == 0 then acc.pos + 1 else acc.exprPos;
+ }
) else acc // { pos = acc.pos + 1; }
);
@@ -39,7 +38,7 @@ let
findSubExpressions = expr:
let
acc = builtins.foldl' findSubExpressionsFun {
- exprs = [];
+ exprs = [ ];
expr = expr;
pos = 0;
openP = 0;
@@ -47,18 +46,16 @@ let
startPos = 0;
} (lib.stringToCharacters expr);
tailExpr = (substr acc.exprPos acc.pos expr);
- tailExprs = if tailExpr != "" then [ tailExpr ] else [];
+ tailExprs = if tailExpr != "" then [ tailExpr ] else [ ];
in
- acc.exprs ++ tailExprs;
-
+ acc.exprs ++ tailExprs;
parseExpressions = exprs:
let
splitCond = (
s: builtins.map
- (x: stripStr (if builtins.typeOf x == "list" then (builtins.elemAt x 0) else x))
+ (x: stripStr ( if builtins.typeOf x == "list" then (builtins.elemAt x 0) else x))
(builtins.split " (and|or) " (s + " "))
);
-
mapfn = expr: (
if (builtins.match "^ ?$" expr != null) then null # Filter empty
else if (builtins.elem expr [ "and" "or" ]) then {
@@ -70,14 +67,12 @@ let
value = expr;
}
);
-
parse = expr: builtins.filter (x: x != null) (builtins.map mapfn (splitCond expr));
in
- builtins.foldl' (
- acc: v: acc ++ (
- if builtins.typeOf v == "string" then parse v else [ (parseExpressions v) ]
- )
- ) [] exprs;
+ builtins.foldl'
+ (
+ acc: v: acc ++ ( if builtins.typeOf v == "string" then parse v else [ (parseExpressions v) ])
+ ) [ ] exprs;
# Transform individual expressions to structured expressions
# This function also performs variable substitution, replacing environment markers with their explicit values
@@ -94,9 +89,10 @@ let
else throw "Unsupported platform"
);
platform_machine = stdenv.platform.kernelArch;
- platform_python_implementation = let
- impl = python.passthru.implementation;
- in
+ platform_python_implementation =
+ let
+ impl = python.passthru.implementation;
+ in
(
if impl == "cpython" then "CPython"
else if impl == "pypy" then "PyPy"
@@ -115,34 +111,32 @@ let
implementation_version = python.version;
extra = "";
};
-
substituteVar = value: if builtins.hasAttr value variables then (builtins.toJSON variables."${value}") else value;
-
processVar = value: builtins.foldl' (acc: v: v acc) value [
stripStr
substituteVar
];
in
- if builtins.typeOf exprs == "set" then (
- if exprs.type == "expr" then (
- let
- mVal = ''[a-zA-Z0-9\'"_\. ]+'';
- mOp = "in|[!=<>]+";
- e = stripStr exprs.value;
- m = builtins.map stripStr (builtins.match ''^(${mVal}) *(${mOp}) *(${mVal})$'' e);
- in
- {
- type = "expr";
- value = {
- op = builtins.elemAt m 1;
- values = [
- (processVar (builtins.elemAt m 0))
- (processVar (builtins.elemAt m 2))
- ];
- };
- }
- ) else exprs
- ) else builtins.map transformExpressions exprs;
+ if builtins.typeOf exprs == "set" then (
+ if exprs.type == "expr" then (
+ let
+ mVal = ''[a-zA-Z0-9\'"_\. ]+'';
+ mOp = "in|[!=<>]+";
+ e = stripStr exprs.value;
+ m = builtins.map stripStr (builtins.match ''^(${mVal}) *(${mOp}) *(${mVal})$'' e);
+ in
+ {
+ type = "expr";
+ value = {
+ op = builtins.elemAt m 1;
+ values = [
+ (processVar (builtins.elemAt m 0))
+ (processVar (builtins.elemAt m 2))
+ ];
+ };
+ }
+ ) else exprs
+ ) else builtins.map transformExpressions exprs;
# Recursively eval all expressions
evalExpressions = exprs:
@@ -165,32 +159,33 @@ let
let
parts = builtins.splitVersion c;
pruned = lib.take ((builtins.length parts) - 1) parts;
- upper = builtins.toString (
- (lib.toInt (builtins.elemAt pruned (builtins.length pruned - 1))) + 1
- );
+ upper = builtins.toString
+ (
+ (lib.toInt (builtins.elemAt pruned (builtins.length pruned - 1))) + 1
+ );
upperConstraint = builtins.concatStringsSep "." (ireplace (builtins.length pruned - 1) upper pruned);
in
- op.">=" v c && op."<" v upperConstraint;
+ op.">=" v c && op."<" v upperConstraint;
"===" = x: y: x == y;
"in" = x: y:
let
values = builtins.filter (x: builtins.typeOf x == "string") (builtins.split " " (unmarshal y));
in
- builtins.elem (unmarshal x) values;
+ builtins.elem (unmarshal x) values;
};
in
- if builtins.typeOf exprs == "set" then (
- if exprs.type == "expr" then (
- let
- expr = exprs;
- result = (op."${expr.value.op}") (builtins.elemAt expr.value.values 0) (builtins.elemAt expr.value.values 1);
- in
- {
- type = "value";
- value = result;
- }
- ) else exprs
- ) else builtins.map evalExpressions exprs;
+ if builtins.typeOf exprs == "set" then (
+ if exprs.type == "expr" then (
+ let
+ expr = exprs;
+ result = (op."${expr.value.op}") (builtins.elemAt expr.value.values 0) (builtins.elemAt expr.value.values 1);
+ in
+ {
+ type = "value";
+ value = result;
+ }
+ ) else exprs
+ ) else builtins.map evalExpressions exprs;
# Now that we have performed an eval all that's left to do is to concat the graph into a single bool
reduceExpressions = exprs:
@@ -217,18 +212,18 @@ let
cond = "and";
} v;
in
- acc // {
- value = cond."${acc.cond}" acc.value ret.value;
- }
+ acc // {
+ value = cond."${acc.cond}" acc.value ret.value;
+ }
) else throw "Unsupported type"
);
in
- (
- builtins.foldl' reduceExpressionsFun {
- value = true;
- cond = "and";
- } exprs
- ).value;
+ (
+ builtins.foldl' reduceExpressionsFun {
+ value = true;
+ cond = "and";
+ } exprs
+ ).value;
in
e: builtins.foldl' (acc: v: v acc) e [
findSubExpressions
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix b/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix
index 07dcbbc5eacb..e86b1d3ac660 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix
@@ -1,28 +1,28 @@
{ lib, ireplace }:
let
inherit (builtins) elemAt match;
-
- operators = let
- matchWildCard = s: match "([^\*])(\.[\*])" s;
- mkComparison = ret: version: v: builtins.compareVersions version v == ret;
- mkIdxComparison = idx: version: v:
- let
- ver = builtins.splitVersion v;
- minor = builtins.toString (lib.toInt (elemAt ver idx) + 1);
- upper = builtins.concatStringsSep "." (ireplace idx minor ver);
- in
+ operators =
+ let
+ matchWildCard = s: match "([^\*])(\.[\*])" s;
+ mkComparison = ret: version: v: builtins.compareVersions version v == ret;
+ mkIdxComparison = idx: version: v:
+ let
+ ver = builtins.splitVersion v;
+ minor = builtins.toString (lib.toInt (elemAt ver idx) + 1);
+ upper = builtins.concatStringsSep "." (ireplace idx minor ver);
+ in
operators.">=" version v && operators."<" version upper;
- dropWildcardPrecision = f: version: constraint:
- let
- m = matchWildCard constraint;
- hasWildcard = m != null;
- c = if hasWildcard then (elemAt m 0) else constraint;
- v =
- if hasWildcard then (builtins.substring 0 (builtins.stringLength c) version)
- else version;
- in
+ dropWildcardPrecision = f: version: constraint:
+ let
+ m = matchWildCard constraint;
+ hasWildcard = m != null;
+ c = if hasWildcard then (elemAt m 0) else constraint;
+ v =
+ if hasWildcard then (builtins.substring 0 (builtins.stringLength c) version)
+ else version;
+ in
f v c;
- in
+ in
{
# Prefix operators
"==" = dropWildcardPrecision (mkComparison 0);
@@ -39,24 +39,23 @@ let
# Prune constraint
parts = builtins.splitVersion c;
pruned = lib.take ((builtins.length parts) - 1) parts;
- upper = builtins.toString (
- (lib.toInt (builtins.elemAt pruned (builtins.length pruned - 1))) + 1
- );
+ upper = builtins.toString
+ (
+ (lib.toInt (builtins.elemAt pruned (builtins.length pruned - 1))) + 1
+ );
upperConstraint = builtins.concatStringsSep "." (ireplace (builtins.length pruned - 1) upper pruned);
in
- operators.">=" v c && operators."<" v upperConstraint;
+ operators.">=" v c && operators."<" v upperConstraint;
# Infix operators
"-" = version: v: operators.">=" version v.vl && operators."<=" version v.vu;
# Arbitrary equality clause, just run simple comparison
"===" = v: c: v == c;
#
};
-
re = {
operators = "([=>
-Date: Thu, 30 Apr 2020 00:24:57 +0200
+Date: Fri, 1 May 2020 23:44:08 +0200
Subject: [PATCH] Add cargo.lock
---
@@ -10,7 +10,7 @@ Subject: [PATCH] Add cargo.lock
diff --git a/Cargo.lock b/Cargo.lock
new file mode 100644
-index 00000000..8ae15438
+index 00000000..4822cea1
--- /dev/null
+++ b/Cargo.lock
@@ -0,0 +1,2527 @@
@@ -605,7 +605,7 @@ index 00000000..8ae15438
+dependencies = [
+ "proc-macro-hack",
+ "proc-macro2 1.0.10",
-+ "quote 1.0.3",
++ "quote 1.0.4",
+ "syn 1.0.18",
+]
+
@@ -782,7 +782,7 @@ index 00000000..8ae15438
+
+[[package]]
+name = "js-sys"
-+version = "0.3.38"
++version = "0.3.39"
+dependencies = [
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
@@ -1173,7 +1173,7 @@ index 00000000..8ae15438
+dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2 1.0.10",
-+ "quote 1.0.3",
++ "quote 1.0.4",
+ "syn 1.0.18",
+ "version_check 0.9.1",
+]
@@ -1185,7 +1185,7 @@ index 00000000..8ae15438
+checksum = "4f5444ead4e9935abd7f27dc51f7e852a0569ac888096d5ec2499470794e2e53"
+dependencies = [
+ "proc-macro2 1.0.10",
-+ "quote 1.0.3",
++ "quote 1.0.4",
+ "syn 1.0.18",
+ "syn-mid",
+ "version_check 0.9.1",
@@ -1238,9 +1238,9 @@ index 00000000..8ae15438
+
+[[package]]
+name = "quote"
-+version = "1.0.3"
++version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2bdc6c187c65bca4260c9011c9e3132efe4909da44726bad24cf7572ae338d7f"
++checksum = "4c1f4b0efa5fc5e8ceb705136bfee52cfdb6a4e3509f770b478cd6ed434232a7"
+dependencies = [
+ "proc-macro2 1.0.10",
+]
@@ -1642,7 +1642,7 @@ index 00000000..8ae15438
+checksum = "9e549e3abf4fb8621bd1609f11dfc9f5e50320802273b12f3811a67e6716ea6c"
+dependencies = [
+ "proc-macro2 1.0.10",
-+ "quote 1.0.3",
++ "quote 1.0.4",
+ "syn 1.0.18",
+]
+
@@ -1731,7 +1731,7 @@ index 00000000..8ae15438
+ "heck",
+ "proc-macro-error",
+ "proc-macro2 1.0.10",
-+ "quote 1.0.3",
++ "quote 1.0.4",
+ "syn 1.0.18",
+]
+
@@ -1753,7 +1753,7 @@ index 00000000..8ae15438
+checksum = "410a7488c0a728c7ceb4ad59b9567eb4053d02e8cc7f5c0e0eeeb39518369213"
+dependencies = [
+ "proc-macro2 1.0.10",
-+ "quote 1.0.3",
++ "quote 1.0.4",
+ "unicode-xid 0.2.0",
+]
+
@@ -1764,7 +1764,7 @@ index 00000000..8ae15438
+checksum = "7be3539f6c128a931cf19dcee741c1af532c7fd387baa739c03dd2e96479338a"
+dependencies = [
+ "proc-macro2 1.0.10",
-+ "quote 1.0.3",
++ "quote 1.0.4",
+ "syn 1.0.18",
+]
+
@@ -2038,7 +2038,7 @@ index 00000000..8ae15438
+dependencies = [
+ "heck",
+ "proc-macro2 1.0.10",
-+ "quote 1.0.3",
++ "quote 1.0.4",
+ "syn 1.0.18",
+]
+
@@ -2050,7 +2050,7 @@ index 00000000..8ae15438
+
+[[package]]
+name = "wasm-bindgen"
-+version = "0.2.61"
++version = "0.2.62"
+dependencies = [
+ "cfg-if",
+ "js-sys",
@@ -2066,7 +2066,7 @@ index 00000000..8ae15438
+
+[[package]]
+name = "wasm-bindgen-anyref-xform"
-+version = "0.2.61"
++version = "0.2.62"
+dependencies = [
+ "anyhow",
+ "rayon",
@@ -2078,13 +2078,13 @@ index 00000000..8ae15438
+
+[[package]]
+name = "wasm-bindgen-backend"
-+version = "0.2.61"
++version = "0.2.62"
+dependencies = [
+ "bumpalo",
+ "lazy_static",
+ "log 0.4.8",
+ "proc-macro2 1.0.10",
-+ "quote 1.0.3",
++ "quote 1.0.4",
+ "syn 1.0.18",
+ "wasm-bindgen-shared",
+]
@@ -2099,7 +2099,7 @@ index 00000000..8ae15438
+
+[[package]]
+name = "wasm-bindgen-cli"
-+version = "0.2.61"
++version = "0.2.62"
+dependencies = [
+ "anyhow",
+ "assert_cmd",
@@ -2127,7 +2127,7 @@ index 00000000..8ae15438
+
+[[package]]
+name = "wasm-bindgen-cli-support"
-+version = "0.2.61"
++version = "0.2.62"
+dependencies = [
+ "anyhow",
+ "base64 0.9.3",
@@ -2149,7 +2149,7 @@ index 00000000..8ae15438
+
+[[package]]
+name = "wasm-bindgen-futures"
-+version = "0.4.11"
++version = "0.4.12"
+dependencies = [
+ "cfg-if",
+ "futures-channel-preview",
@@ -2161,9 +2161,9 @@ index 00000000..8ae15438
+
+[[package]]
+name = "wasm-bindgen-macro"
-+version = "0.2.61"
++version = "0.2.62"
+dependencies = [
-+ "quote 1.0.3",
++ "quote 1.0.4",
+ "trybuild",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
@@ -2172,10 +2172,10 @@ index 00000000..8ae15438
+
+[[package]]
+name = "wasm-bindgen-macro-support"
-+version = "0.2.61"
++version = "0.2.62"
+dependencies = [
+ "proc-macro2 1.0.10",
-+ "quote 1.0.3",
++ "quote 1.0.4",
+ "syn 1.0.18",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
@@ -2183,7 +2183,7 @@ index 00000000..8ae15438
+
+[[package]]
+name = "wasm-bindgen-multi-value-xform"
-+version = "0.2.61"
++version = "0.2.62"
+dependencies = [
+ "anyhow",
+ "rayon",
@@ -2204,11 +2204,11 @@ index 00000000..8ae15438
+
+[[package]]
+name = "wasm-bindgen-shared"
-+version = "0.2.61"
++version = "0.2.62"
+
+[[package]]
+name = "wasm-bindgen-test"
-+version = "0.3.11"
++version = "0.3.12"
+dependencies = [
+ "console_error_panic_hook",
+ "js-sys",
@@ -2234,15 +2234,15 @@ index 00000000..8ae15438
+
+[[package]]
+name = "wasm-bindgen-test-macro"
-+version = "0.3.11"
++version = "0.3.12"
+dependencies = [
+ "proc-macro2 1.0.10",
-+ "quote 1.0.3",
++ "quote 1.0.4",
+]
+
+[[package]]
+name = "wasm-bindgen-threads-xform"
-+version = "0.2.61"
++version = "0.2.62"
+dependencies = [
+ "anyhow",
+ "walrus",
@@ -2251,7 +2251,7 @@ index 00000000..8ae15438
+
+[[package]]
+name = "wasm-bindgen-wasm-conventions"
-+version = "0.2.61"
++version = "0.2.62"
+dependencies = [
+ "anyhow",
+ "walrus",
@@ -2259,7 +2259,7 @@ index 00000000..8ae15438
+
+[[package]]
+name = "wasm-bindgen-wasm-interpreter"
-+version = "0.2.61"
++version = "0.2.62"
+dependencies = [
+ "anyhow",
+ "log 0.4.8",
@@ -2270,7 +2270,7 @@ index 00000000..8ae15438
+
+[[package]]
+name = "wasm-bindgen-webidl"
-+version = "0.2.61"
++version = "0.2.62"
+dependencies = [
+ "anyhow",
+ "env_logger",
@@ -2278,7 +2278,7 @@ index 00000000..8ae15438
+ "lazy_static",
+ "log 0.4.8",
+ "proc-macro2 1.0.10",
-+ "quote 1.0.3",
++ "quote 1.0.4",
+ "sourcefile",
+ "structopt",
+ "syn 1.0.18",
@@ -2353,7 +2353,7 @@ index 00000000..8ae15438
+
+[[package]]
+name = "web-sys"
-+version = "0.3.38"
++version = "0.3.39"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix
index 0385ba79d7fc..9adabeb573fd 100644
--- a/pkgs/development/tools/wasm-bindgen-cli/default.nix
+++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix
@@ -2,19 +2,19 @@
rustPlatform.buildRustPackage rec {
pname = "wasm-bindgen-cli";
- version = "0.2.61";
+ version = "0.2.62";
src = fetchFromGitHub {
owner = "rustwasm";
repo = "wasm-bindgen";
rev = version;
- sha256 = "1lz4yscs17vix96isqpwwjhjcgj46zh2ljiwvfsk44wky8vwkyb7";
+ sha256 = "0d3ph3g220nvzwxa71rch03j5c0w06v8z4lmlyp5kky6p86r37hz";
};
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ];
nativeBuildInputs = [ pkgconfig ];
- cargoSha256 = "1vblvajhx5gn08rinv6bnw61zah62il015rzm0d4vs2b9p0iaann";
+ cargoSha256 = "13lj2yx2bcwac1b4gpwcgiwqvy178zis6r1pidn4pgwqv7zxa7p2";
cargoPatches = [ ./0001-Add-cargo.lock.patch ];
cargoBuildFlags = [ "-p" pname ];
diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix
index 965a53dcdbda..22da8cd75189 100644
--- a/pkgs/development/web/flyctl/default.nix
+++ b/pkgs/development/web/flyctl/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "flyctl";
- version = "0.0.110";
+ version = "0.0.117";
src = fetchFromGitHub {
owner = "superfly";
repo = "flyctl";
rev = "v${version}";
- sha256 = "1fvvanyzrai41fq98msjwzgwsidxbaly6f6knma6lwmicv4f9svg";
+ sha256 = "0i9azvhlwp5g699yagfbd5rnsr5kdnbw6lsz28nz1dzvmrj9xp7w";
};
preBuild = ''
@@ -20,7 +20,7 @@ buildGoModule rec {
rm $out/bin/helpgen
'';
- modSha256 = "0lnk2g5msqhhshh99s32sqd793rdlzmp7vhqdb1fd6qafrrrxm5w";
+ modSha256 = "0d0hfmdk81apha3r7zspam8wqadpy6qmqkgbq0sbiwrji4155hrh";
meta = with lib; {
description = "Command line tools for fly.io services";
diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix
index e2f8dd7173c7..1c9c353fd511 100644
--- a/pkgs/development/web/nodejs/v14.nix
+++ b/pkgs/development/web/nodejs/v14.nix
@@ -9,6 +9,6 @@ let
in
buildNodejs {
inherit enableNpm;
- version = "14.1.0";
- sha256 = "0pw39628y8qi2jagmmnfj0fkcbv00qcd1cqybiprf1v22hhij44n";
+ version = "14.2.0";
+ sha256 = "1kqnkqkv2chw9s0hazbaba5y1555h526825xqk4rr441wcxcrzcf";
}
diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix
index ba304972d9a1..2b3bf34807a4 100644
--- a/pkgs/development/web/postman/default.nix
+++ b/pkgs/development/web/postman/default.nix
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "postman";
- version = "7.21.2";
+ version = "7.23.0";
src = fetchurl {
url = "https://dl.pstmn.io/download/version/${version}/linux64";
- sha256 = "18lb8csfmy5j97zdg3c5l23aaw9hjg04qhfc1sz9pgi7xhwz5g1b";
+ sha256 = "0m3pjimpahc3kiwdq21rwyg6ckdh3avhzx3apmygisaz4gnab94d";
name = "${pname}.tar.gz";
};
diff --git a/pkgs/games/bzflag/default.nix b/pkgs/games/bzflag/default.nix
index c1d1c38990d6..1ec24e02be05 100644
--- a/pkgs/games/bzflag/default.nix
+++ b/pkgs/games/bzflag/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "bzflag";
- version = "2.4.18";
+ version = "2.4.20";
src = fetchurl {
url = "https://download.bzflag.org/${pname}/source/${version}/${pname}-${version}.tar.bz2";
- sha256 = "1gmz31wmn3f8zq1bfilkgbf4qmi4fa0c93cs76mhg8h978pm23cx";
+ sha256 = "16brxqmfiyz4j4lb8ihzjcbwqmpsms6vm3ijbp34lnw0blbwdjb2";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/games/crispy-doom/default.nix b/pkgs/games/crispy-doom/default.nix
index c10e79418be4..ea7c3c6e4784 100644
--- a/pkgs/games/crispy-doom/default.nix
+++ b/pkgs/games/crispy-doom/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "crispy-doom";
- version = "5.7.2";
+ version = "5.8.0";
src = fetchFromGitHub {
owner = "fabiangreffrath";
repo = pname;
rev = "${pname}-${version}";
- sha256 = "002aqbgsksrgzqridwdlkrjincaxh0dkvwlrbb8d2f3kwk7lj4fq";
+ sha256 = "1b6gn0dysv631jynh769whww9xcss1gms78sz3nrn855q1dsvcb4";
};
postPatch = ''
diff --git a/pkgs/games/cutemaze/default.nix b/pkgs/games/cutemaze/default.nix
index 32e173de2b8a..a293989d5e6a 100644
--- a/pkgs/games/cutemaze/default.nix
+++ b/pkgs/games/cutemaze/default.nix
@@ -2,11 +2,11 @@
mkDerivation rec {
pname = "cutemaze";
- version = "1.2.5";
+ version = "1.2.6";
src = fetchurl {
url = "https://gottcode.org/cutemaze/${pname}-${version}-src.tar.bz2";
- sha256 = "1xrjv3h1bpbji1dl9hkcvmp6qk4j618saffl41455vhrzn170lrj";
+ sha256 = "0pw31j2i3ifndikhz9w684ia00r8zvcgnb66ign9w4lgs1zjgcrw";
};
nativeBuildInputs = [ qmake qttools ];
diff --git a/pkgs/games/dwarf-fortress/df_permission b/pkgs/games/dwarf-fortress/df_permission
index b0121bb3fa37..dc1c0c151e0b 100644
--- a/pkgs/games/dwarf-fortress/df_permission
+++ b/pkgs/games/dwarf-fortress/df_permission
@@ -12,7 +12,7 @@ Tarn
On Fri, Oct 29, 2010 at 6:56 AM, wrote:
> I'd like to distribute a *slightly* modified version of Dwarf Fortress which
> is needed to run it under the NixOS distribution of Linux (see
->
+>
>
> Modification: The interpreter location /lib/ld-linux.so.2 in
> lib/Dwarf_Fortress is replaced with the location of ld-linux.so.2 under the
diff --git a/pkgs/games/endless-sky/default.nix b/pkgs/games/endless-sky/default.nix
index f0950cf4d349..76ab6542a7f3 100644
--- a/pkgs/games/endless-sky/default.nix
+++ b/pkgs/games/endless-sky/default.nix
@@ -3,7 +3,7 @@
}:
let
- version = "0.9.11";
+ version = "0.9.12";
in
stdenv.mkDerivation {
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
owner = "endless-sky";
repo = "endless-sky";
rev = "v${version}";
- sha256 = "0f4svg448bg8qx49f8fr8l4yzks7an6673jwgva15p3zzfxy6w03";
+ sha256 = "1hly68ljm7yv01jfxyr7g6jivhj0igg6xx7vi92zqymick0hlh7a";
};
enableParallelBuilding = true;
diff --git a/pkgs/games/ezquake/default.nix b/pkgs/games/ezquake/default.nix
index 86db4a3209e8..83dadb7192cb 100644
--- a/pkgs/games/ezquake/default.nix
+++ b/pkgs/games/ezquake/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "ezquake";
- version = "3.1";
+ version = "3.2";
src = fetchFromGitHub {
owner = "ezQuake";
repo = pname + "-source";
rev = version;
- sha256 = "0375jndynhkl59m80fhmq12v5g24zy16c7ly08h004cmjzqsikn4";
+ sha256 = "11kyrqpc8w393kvfz2p2h2m7k8rm4w644m86w733b8w157f2fsk0";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/games/hyperrogue/default.nix b/pkgs/games/hyperrogue/default.nix
index 24ea0e8c5c0a..1ef0fd147d87 100644
--- a/pkgs/games/hyperrogue/default.nix
+++ b/pkgs/games/hyperrogue/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "hyperrogue";
- version = "11.3f";
+ version = "11.3l";
src = fetchFromGitHub {
owner = "zenorogue";
repo = "hyperrogue";
rev = "v${version}";
- sha256 = "0i6dksxx33xga4pq41qsfllqras1hzk14ffqhnk11aj5lrfg98rm";
+ sha256 = "0fniyaf9mgg99s03wbdc36zg909kshpdfk9pn8pkai0x99lghkwb";
};
CPPFLAGS = "-I${SDL.dev}/include/SDL";
diff --git a/pkgs/games/mari0/default.nix b/pkgs/games/mari0/default.nix
new file mode 100644
index 000000000000..b8c4ea281dfd
--- /dev/null
+++ b/pkgs/games/mari0/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchFromGitHub, zip, love_11, lua, makeWrapper, makeDesktopItem }:
+
+let
+ pname = "mari0";
+ version = "1.6.2";
+
+ desktopItem = makeDesktopItem {
+ name = "mari0";
+ exec = pname;
+ comment = "Crossover between Super Mario Bros. and Portal";
+ desktopName = "mari0";
+ genericName = "mari0";
+ categories = "Game";
+ };
+
+in
+
+stdenv.mkDerivation {
+ inherit pname version;
+
+ src = fetchFromGitHub {
+ owner = "Stabyourself";
+ repo = pname;
+ rev = "${version}";
+ sha256 = "1zqaq4w599scsjvy1rsb21fd2r8j3srx9vym4ir9bh666dp36gxa";
+ };
+
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ lua love_11 zip ];
+
+ phases = [ "unpackPhase" "installPhase" ];
+
+ installPhase =
+ ''
+ mkdir -p $out/bin $out/share/games/lovegames $out/share/applications
+ zip -9 -r ${pname}.love ./*
+ mv ${pname}.love $out/share/games/lovegames/${pname}.love
+ makeWrapper ${love_11}/bin/love $out/bin/${pname} --add-flags $out/share/games/lovegames/${pname}.love
+ ln -s ${desktopItem}/share/applications/* $out/share/applications/
+ chmod +x $out/bin/${pname}
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Crossover between Super Mario Bros. and Portal";
+ platforms = platforms.linux;
+ license = licenses.mit;
+ downloadPage = "https://stabyourself.net/mari0/";
+ };
+
+}
diff --git a/pkgs/games/netris/default.nix b/pkgs/games/netris/default.nix
new file mode 100644
index 000000000000..994db4e67f8a
--- /dev/null
+++ b/pkgs/games/netris/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, ncurses }:
+
+stdenv.mkDerivation {
+ pname = "netris";
+ version = "0.52";
+
+ src = fetchFromGitHub {
+ owner = "naclander";
+ repo = "netris";
+ rev = "6773c9b2d39a70481a5d6eb5368e9ced6229ad2b";
+ sha256 = "0gmxbpn50pnffidwjchkzph9rh2jm4wfq7hj8msp5vhdq5h0z9hm";
+ };
+
+ buildInputs = [
+ ncurses
+ ];
+
+ configureScript = "./Configure";
+ dontAddPrefix = true;
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp ./netris $out/bin
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A free networked version of T*tris";
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ patryk27 ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/games/pokerth/default.nix b/pkgs/games/pokerth/default.nix
index 5d6316b1ddd6..00b1f68e1371 100644
--- a/pkgs/games/pokerth/default.nix
+++ b/pkgs/games/pokerth/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, runCommand, fetchpatch, patchutils, qmake, qtbase
+{ mkDerivation, stdenv, fetchFromGitHub, runCommand, fetchpatch, patchutils, qmake, qtbase
, SDL, SDL_mixer, boost, curl, gsasl, libgcrypt, libircclient, protobuf, sqlite
, wrapQtAppsHook
, tinyxml2, target ? "client" }:
@@ -16,7 +16,7 @@ let
'';
in
-stdenv.mkDerivation rec {
+mkDerivation rec {
name = "pokerth-${target}-${version}";
version = "1.1.2";
diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix
index dcf1081e4d0b..70c5657508bd 100644
--- a/pkgs/games/super-tux-kart/default.nix
+++ b/pkgs/games/super-tux-kart/default.nix
@@ -1,9 +1,15 @@
-{ stdenv, fetchFromGitHub, fetchsvn, cmake, pkgconfig
+{ stdenv, fetchFromGitHub, fetchsvn, cmake, pkgconfig, makeWrapper
, openal, freealut, libGLU, libGL, libvorbis, libogg, gettext, curl, freetype
, fribidi, libtool, bluez, libjpeg, libpng, zlib, libX11, libXrandr, enet, harfbuzz }:
let
dir = "stk-code";
+ assets = fetchsvn {
+ url = "https://svn.code.sf.net/p/supertuxkart/code/stk-assets";
+ rev = "18212";
+ sha256 = "1dyj8r5rfifhnhayga8w8irkpa99vw57xjmy74cp8xz8g7zvdzqf";
+ name = "stk-assets";
+ };
in stdenv.mkDerivation rec {
pname = "supertuxkart";
@@ -17,15 +23,9 @@ in stdenv.mkDerivation rec {
sha256 = "01vxxl94583ixswzmi4caz8dk64r56pn3zxh7v63zml60yfvxbvp";
name = dir;
})
- (fetchsvn {
- url = "https://svn.code.sf.net/p/supertuxkart/code/stk-assets";
- rev = "18212";
- sha256 = "1dyj8r5rfifhnhayga8w8irkpa99vw57xjmy74cp8xz8g7zvdzqf";
- name = "stk-assets";
- })
];
- nativeBuildInputs = [ cmake gettext libtool pkgconfig ];
+ nativeBuildInputs = [ cmake gettext libtool pkgconfig makeWrapper ];
buildInputs = [
libX11 libXrandr
@@ -38,8 +38,14 @@ in stdenv.mkDerivation rec {
cmakeFlags = [
"-DBUILD_RECORDER=OFF" # libopenglrecorder is not in nixpkgs
"-DUSE_SYSTEM_ANGELSCRIPT=OFF" # doesn't work with 2.31.2 or 2.32.0
+ "-DCHECK_ASSETS=OFF"
];
+ # Obtain the assets directly from the fetched store path, to avoid duplicating assets across multiple engine builds
+ preFixup = ''
+ wrapProgram $out/bin/supertuxkart --set-default SUPERTUXKART_ASSETS_DIR "${assets}"
+ '';
+
sourceRoot = dir;
meta = with stdenv.lib; {
diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix
index 13918d2f7a52..3035c02e2623 100644
--- a/pkgs/games/teeworlds/default.nix
+++ b/pkgs/games/teeworlds/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "teeworlds";
- version = "0.7.4";
+ version = "0.7.5";
src = fetchFromGitHub {
owner = "teeworlds";
repo = "teeworlds";
rev = version;
- sha256 = "1llrzcc9p8pswk58rj4qh4g67nlji8q2kw3hxh3qpli85jvkdmyx";
+ sha256 = "1l19ksmimg6b8zzjy0skyhh7z11ql7n5gvilkv7ay5x2b9ndbqwz";
fetchSubmodules = true;
};
diff --git a/pkgs/misc/apulse/default.nix b/pkgs/misc/apulse/default.nix
index 273e358184d3..33ba0bf86761 100644
--- a/pkgs/misc/apulse/default.nix
+++ b/pkgs/misc/apulse/default.nix
@@ -5,13 +5,13 @@ let oz = x: if x then "1" else "0"; in
stdenv.mkDerivation rec {
pname = "apulse";
- version = "0.1.12";
+ version = "0.1.13";
src = fetchFromGitHub {
owner = "i-rinat";
repo = pname;
rev = "v${version}";
- sha256 = "0yk9vgb4aws8xnkhdhgpxp5c0rri8yq61yxk85j99j8ax806i3r8";
+ sha256 = "1p6fh6ah5v3qz7dxhcsixx38bxg44ypbim4m03bxk3ls5i9xslmn";
};
enableParallelBuilding = true;
diff --git a/pkgs/misc/drivers/foomatic-filters/default.nix b/pkgs/misc/drivers/foomatic-filters/default.nix
index 9bee05bfb254..3ca64e0e8f8f 100644
--- a/pkgs/misc/drivers/foomatic-filters/default.nix
+++ b/pkgs/misc/drivers/foomatic-filters/default.nix
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
buildInputs = [ perl cups dbus enscript ];
patches = [
- # for CVE-2015-8327 & CVE-2015-8560
(fetchpatch {
+ name = "CVE-2015-8327+CVE-2015-8560.patch";
url = "https://salsa.debian.org/debian/foomatic-filters/raw/a3abbef2d2f8c7e62d2fe64f64afe294563fdf8f/debian/patches/0500-r7406_also_consider_the_back_tick_as_an_illegal_shell_escape_character.patch";
sha256 = "055nwi3sjf578nk40bqsch3wx8m2h65hdih0wmxflb6l0hwkq4p4";
})
diff --git a/pkgs/misc/drivers/pentablet-driver/default.nix b/pkgs/misc/drivers/pentablet-driver/default.nix
new file mode 100644
index 000000000000..2f46d950d584
--- /dev/null
+++ b/pkgs/misc/drivers/pentablet-driver/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, mkDerivation, fetchzip, autoPatchelfHook, libusb1, libX11, libXtst, qtbase, libglvnd }:
+
+mkDerivation rec {
+ pname = "pentablet-driver";
+ version = "1.2.13.1";
+
+ src = fetchzip {
+ url = "https://download01.xp-pen.com/file/2020/04/Linux_Pentablet_V${version}.tar.gz(20200428).zip";
+ sha256 = "1r423hcpi26v82pzl59br1zw5vablikclqsy6mcqi0v5p84hfrdd";
+ } + /Linux_Pentablet_V1.2.13.1.tar.gz;
+
+ nativeBuildInputs = [
+ autoPatchelfHook
+ ];
+
+ buildInputs = [
+ libusb1
+ libX11
+ libXtst
+ qtbase
+ libglvnd
+ stdenv.cc.cc.lib
+ ];
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp Pentablet_Driver $out/bin/pentablet-driver
+ cp config.xml $out/bin/config.xml
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "https://www.xp-pen.com/download-46.html";
+ description = "Driver for XP-PEN Pentablet drawing tablets";
+ license = licenses.unfree;
+ platforms = [ "x86_64-linux" ];
+ maintainers = with maintainers; [ ivar ];
+ };
+}
diff --git a/pkgs/misc/drivers/xp-pen-g430/default.nix b/pkgs/misc/drivers/xp-pen-g430/default.nix
deleted file mode 100644
index c382239f26a6..000000000000
--- a/pkgs/misc/drivers/xp-pen-g430/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, fetchzip, autoPatchelfHook, libusb1, libX11, libXtst, qtbase, wrapQtAppsHook, libglvnd }:
-stdenv.mkDerivation rec {
- pname = "xp-pen-G430";
- version = "20190820";
-
- src = fetchzip {
- url = "https://download01.xp-pen.com/file/2019/08/Linux%20Beta%20Driver(${version}).zip";
- sha256 = "091kfqxxj90pdmwncgfl8ldi70pdhwryh3cls30654983m8cgnby";
- } + /Linux_Pentablet_V1.3.0.0.tar.gz;
-
- nativeBuildInputs = [
- autoPatchelfHook
- wrapQtAppsHook
- ];
-
- buildInputs = [
- libusb1
- libX11
- libXtst
- qtbase
- libglvnd
- stdenv.cc.cc.lib
- ];
-
- installPhase = ''
- mkdir -p $out/bin
- cp {Pentablet_Driver,config.xml} "$out"/bin
- '';
-
- meta = with stdenv.lib; {
- homepage = "https://www.xp-pen.com/download-46.html";
- description = "Driver for the XP-PEN G430 drawing tablet";
- license = licenses.unfree;
- platforms = platforms.linux;
- maintainers = with maintainers; [ ivar ];
- };
-}
diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/misc/emulators/fs-uae/default.nix
index 38730ec752ba..214c1e6e75b8 100644
--- a/pkgs/misc/emulators/fs-uae/default.nix
+++ b/pkgs/misc/emulators/fs-uae/default.nix
@@ -5,11 +5,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "fs-uae";
- version = "3.0.3";
+ version = "3.0.5";
src = fetchurl {
url = "https://fs-uae.net/stable/${version}/${pname}-${version}.tar.gz";
- sha256 = "0v5c8ns00bam4myj7454hpkrnm9i81jwdzrp5nl7gaa18qb60hjq";
+ sha256 = "1qwzhp34wy7bnd3c0plv11rg9fs5m92rh3ffnr9pn6ng0cpc8vpj";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix
index ea860af1fdf5..a8ab7e908f23 100644
--- a/pkgs/misc/emulators/mednafen/default.nix
+++ b/pkgs/misc/emulators/mednafen/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "mednafen";
- version = "1.24.1";
+ version = "1.24.2";
src = fetchurl {
url = "https://mednafen.github.io/releases/files/${pname}-${version}.tar.xz";
- sha256 = "1rszcy5lgfrw0f9b62sd69kgz1xziki3d55vpqh6k9jdmwzxyym4";
+ sha256 = "0v3w0miyz86ihcir7ab82zjfklp550pk6g9xjxcx6mmvhp9dws8i";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix
index 72dc48c1f4d0..14189e5b3871 100644
--- a/pkgs/misc/emulators/stella/default.nix
+++ b/pkgs/misc/emulators/stella/default.nix
@@ -4,13 +4,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "stella";
- version = "6.1.1";
+ version = "6.1.2";
src = fetchFromGitHub {
owner = "stella-emu";
repo = "stella";
rev = version;
- sha256 = "1iwhslrkq887v035j68lhblybww8r792515rp2m5qzmdgnjzsvbb";
+ sha256 = "0m4vdgn7gqhga7hamy4djnlkfgz78gfkmg8by3mai5lw0cps7hr1";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix
index d745198e6a40..5e1703c8cc36 100644
--- a/pkgs/misc/vim-plugins/vim-utils.nix
+++ b/pkgs/misc/vim-plugins/vim-utils.nix
@@ -188,6 +188,7 @@ let
vam ? null,
pathogen ? null,
plug ? null,
+ beforePlugins ? "",
customRC ? ""
}:
@@ -341,6 +342,8 @@ let
" configuration generated by NIX
set nocompatible
+ ${beforePlugins}
+
${vamImpl}
${pathogenImpl}
${plugImpl}
diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index 475d18e3ac7b..cb145ade054c 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -158,8 +158,8 @@ in
mktplcRef = {
name = "metals";
publisher = "scalameta";
- version = "1.6.3";
- sha256 = "1mc3awybzd2ql1b86inirhsw3j2c7cs0b0nvbjp38jjpq674bmj7";
+ version = "1.9.0";
+ sha256 = "0p2wbnw98zmjbfiz4mi1mh131s78r01kjnja339lwdigqxg88gi6";
};
meta = {
license = stdenv.lib.licenses.asl20;
diff --git a/pkgs/os-specific/darwin/skhd/default.nix b/pkgs/os-specific/darwin/skhd/default.nix
index f4a9991f8ee2..d145c0d75d09 100644
--- a/pkgs/os-specific/darwin/skhd/default.nix
+++ b/pkgs/os-specific/darwin/skhd/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "skhd";
- version = "0.3.0";
+ version = "0.3.5";
src = fetchFromGitHub {
owner = "koekeishiya";
- repo = "skhd";
+ repo = pname;
rev = "v${version}";
- sha256 = "13pqnassmzppy2ipv995rh8lzw9rraxvi0ph6zgy63cbsdfzbhgl";
+ sha256 = "0x099979kgpim18r0vi9vd821qnv0rl3rkj0nd1nx3wljxgf7mrg";
};
buildInputs = [ Carbon ];
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
description = "Simple hotkey daemon for macOS";
homepage = "https://github.com/koekeishiya/skhd";
platforms = platforms.darwin;
- maintainers = with maintainers; [ lnl7 periklis ];
+ maintainers = with maintainers; [ cmacrae lnl7 periklis ];
license = licenses.mit;
};
}
diff --git a/pkgs/os-specific/darwin/spacebar/default.nix b/pkgs/os-specific/darwin/spacebar/default.nix
new file mode 100644
index 000000000000..9cbd6e62c7a2
--- /dev/null
+++ b/pkgs/os-specific/darwin/spacebar/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, Carbon, Cocoa, ScriptingBridge }:
+
+stdenv.mkDerivation rec {
+ pname = "spacebar";
+ version = "0.5.0";
+
+ src = fetchFromGitHub {
+ owner = "somdoron";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0v8v4xsc67qpzm859r93ggq7rr7hmaj6dahdlg6g3ppj81cq0khz";
+ };
+
+ buildInputs = [ Carbon Cocoa ScriptingBridge ];
+
+ installPhase = ''
+ mkdir -p $out/bin
+ mkdir -p $out/share/man/man1/
+ cp ./bin/spacebar $out/bin/spacebar
+ cp ./doc/spacebar.1 $out/share/man/man1/spacebar.1
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A status bar for yabai tiling window management";
+ homepage = "https://github.com/somdoron/spacebar";
+ platforms = platforms.darwin;
+ maintainers = [ maintainers.cmacrae ];
+ license = licenses.mit;
+ };
+}
diff --git a/pkgs/os-specific/darwin/yabai/default.nix b/pkgs/os-specific/darwin/yabai/default.nix
index aa10a3a20f74..7103c7825ccc 100644
--- a/pkgs/os-specific/darwin/yabai/default.nix
+++ b/pkgs/os-specific/darwin/yabai/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "yabai";
- version = "2.4.3";
+ version = "3.0.0";
src = fetchFromGitHub {
owner = "koekeishiya";
repo = pname;
rev = "v${version}";
- sha256 = "1a6pqms5kwdsvr9vcshfa000xf2f5a2qbp5qapx0b3wzclnchjbn";
+ sha256 = "0ajsh85p2vx18h3s4nicasyhdbh82zg97b1ryhi6l5lkbjpdl4ah";
};
buildInputs = [ Carbon Cocoa ScriptingBridge ];
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
description = ''
A tiling window manager for macOS based on binary space partitioning
'';
- homepage = https://github.com/koekeishiya/yabai;
+ homepage = "https://github.com/koekeishiya/yabai";
platforms = platforms.darwin;
maintainers = [ maintainers.cmacrae ];
license = licenses.mit;
diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix
index 79e32a05f463..7f95ef47ee9c 100644
--- a/pkgs/os-specific/linux/bcc/default.nix
+++ b/pkgs/os-specific/linux/bcc/default.nix
@@ -5,11 +5,11 @@
python.pkgs.buildPythonApplication rec {
pname = "bcc";
- version = "0.13.0";
+ version = "0.14.0";
src = fetchurl {
url = "https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz";
- sha256 = "15xpwf17x2j1c1wcb84cgfs35dp5w0rjd9mllmddmdjvn303wffx";
+ sha256 = "1hw02bib06fjyw61as5pmhf0qxy0wv0nw8fff2i8a9d1zcd8xf3p";
};
format = "other";
diff --git a/pkgs/os-specific/linux/conntrack-tools/default.nix b/pkgs/os-specific/linux/conntrack-tools/default.nix
index 8346fb1c73cb..80785015e766 100644
--- a/pkgs/os-specific/linux/conntrack-tools/default.nix
+++ b/pkgs/os-specific/linux/conntrack-tools/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "conntrack-tools";
- version = "1.4.5";
+ version = "1.4.6";
src = fetchurl {
url = "https://www.netfilter.org/projects/conntrack-tools/files/${pname}-${version}.tar.bz2";
- sha256 = "0qm4m78hr6a4fbmnkw5nyjm1pzzhydzx0nz7f96iv1c4fsfdkiin";
+ sha256 = "0psx41bclqrh4514yzq03rvs3cq3scfpd1v4kkyxnic2hk65j22r";
};
buildInputs = [
diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix
index 4f7dae930aac..462658396c8a 100644
--- a/pkgs/os-specific/linux/criu/default.nix
+++ b/pkgs/os-specific/linux/criu/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "criu";
- version = "3.13";
+ version = "3.14";
src = fetchurl {
url = "https://download.openvz.org/criu/${pname}-${version}.tar.bz2";
- sha256 = "1yn9ix9lqvqvjrs3a3g6g1wqfniyf9n7giy0mr3jvijmrcm7y0pa";
+ sha256 = "1jrr3v99g18gc0hriz0avq6ccdvyya0j6wwz888sdsc4icc30gzn";
};
enableParallelBuilding = true;
diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix
index 13f4f71c3c14..2a0e52c658ae 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/default.nix
+++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix
@@ -87,11 +87,11 @@ in
stdenv.mkDerivation rec {
pname = "fwupd";
- version = "1.4.0";
+ version = "1.4.1";
src = fetchurl {
url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
- sha256 = "V131/l05FKYFavRMXRaiW1bQkTCEn7MTyyD+bqYClU4=";
+ sha256 = "ga8MpbY9tTwr0jsmjEAMyFxDC+yD4LBTx5gXRXig31M=";
};
# libfwupd goes to lib
@@ -154,34 +154,6 @@ stdenv.mkDerivation rec {
# they are not really part of the library.
./install-fwupdplugin-to-out.patch
- # Make it easier to patch installed-tests directory.
- # https://github.com/fwupd/fwupd/pull/2002
- (fetchpatch {
- url = "https://github.com/fwupd/fwupd/commit/2f12e38e61d982dea63778736e2b71d16f0e9925.patch";
- sha256 = "goTyDj0v50FOQYCS+LhPjo0AEugubr6aBIGfO9ztZOA=";
- })
-
- # Install systemd files to our prefix.
- # https://github.com/fwupd/fwupd/pull/2006
- (fetchpatch {
- url = "https://github.com/fwupd/fwupd/commit/463db5162fe4f6fea417973ff95a44ed51ec6402.patch";
- sha256 = "I0TIfnCca83QpINABUINtl8nIB78dG8OR9MC/hP2hg8=";
- })
-
- # Fix installed tests.
- # https://github.com/fwupd/fwupd/issues/2007
- (fetchpatch {
- url = "https://github.com/fwupd/fwupd/commit/c727742df3702fc934e2d9488c883dcbdfa59e9c.patch";
- sha256 = "b9D2Xblf1VbpS5XZpHtwEJhzuq7+840l7skW5w0NMBU=";
- })
-
- # Fix build with bash-completion 2.10
- # https://github.com/fwupd/fwupd/pull/2014
- (fetchpatch {
- url = "https://github.com/fwupd/fwupd/commit/0f035013dfb150c2c3fc7f51090103ba84bd1c06.patch";
- sha256 = "VXRf5N3inaWThudk6pc4mtp6cMEIyybkdfqKin+9XSw=";
- })
-
# Installed tests are installed to different output
# we also cannot have fwupd-tests.conf in $out/etc since it would form a cycle.
(substituteAll {
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 088ec4ebf44d..636d174b1551 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -630,6 +630,9 @@ let
misc = {
HID_BATTERY_STRENGTH = yes;
+ # enabled by default in x86_64 but not arm64, so we do that here
+ HIDRAW = yes;
+
MODULE_COMPRESS = yes;
MODULE_COMPRESS_XZ = yes;
KERNEL_XZ = yes;
diff --git a/pkgs/os-specific/linux/kernel/gpio-utils.nix b/pkgs/os-specific/linux/kernel/gpio-utils.nix
new file mode 100644
index 000000000000..447704eedc8d
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/gpio-utils.nix
@@ -0,0 +1,24 @@
+{ lib, stdenv, linux }:
+
+with lib;
+
+assert versionAtLeast linux.version "4.6";
+
+stdenv.mkDerivation {
+ name = "gpio-utils-${linux.version}";
+
+ inherit (linux) src makeFlags;
+
+ preConfigure = ''
+ cd tools/gpio
+ '';
+
+ separateDebugInfo = true;
+ installFlags = [ "install" "DESTDIR=$(out)" "bindir=/bin" ];
+
+ meta = {
+ description = "Linux tools to inspect the gpiochip interface";
+ maintainers = with stdenv.lib.maintainers; [ kwohlfahrt ];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/os-specific/linux/kernel/hardened-patches.json b/pkgs/os-specific/linux/kernel/hardened-patches.json
index aa0650138cce..118998a605b2 100644
--- a/pkgs/os-specific/linux/kernel/hardened-patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened-patches.json
@@ -1,18 +1,18 @@
{
"4.14": {
- "name": "linux-hardened-4.14.177.a.patch",
- "sha256": "0wiapq4nj16m5ywnz0k7k0fr5hpw2gjy68mjlk6x866rf8vhndrq",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.177.a/linux-hardened-4.14.177.a.patch"
+ "name": "linux-hardened-4.14.179.a.patch",
+ "sha256": "0vdcg8713vhraqp04b6lw15qdrvg4iw646d54x6ic0421nxp9zmj",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.179.a/linux-hardened-4.14.179.a.patch"
},
"4.19": {
- "name": "linux-hardened-4.19.119.a.patch",
- "sha256": "1arm4833lkgsd27fhgrxbdxisvn20fsk6250x5yh6c8svjr759jx",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.119.a/linux-hardened-4.19.119.a.patch"
+ "name": "linux-hardened-4.19.121.a.patch",
+ "sha256": "0bwjx7qbzd50607kr1abx3rd19iciry3p1y3a8sz5w3vb62j8m6z",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.121.a/linux-hardened-4.19.121.a.patch"
},
"5.4": {
- "name": "linux-hardened-5.4.36.a.patch",
- "sha256": "00bmpzrma0nrgwwari6072g11cwhdk2riqmphlnkpxbarh7dwf4z",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.36.a/linux-hardened-5.4.36.a.patch"
+ "name": "linux-hardened-5.4.39.a.patch",
+ "sha256": "1w9yc0j8vshjyvb2qgxjvrdgwiy5lmjn3s1rmlch649vqp97j9w7",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.39.a/linux-hardened-5.4.39.a.patch"
},
"5.5": {
"name": "linux-hardened-5.5.19.a.patch",
@@ -20,8 +20,8 @@
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.5.19.a/linux-hardened-5.5.19.a.patch"
},
"5.6": {
- "name": "linux-hardened-5.6.8.a.patch",
- "sha256": "06nrjv1v3m3phgcahpmf228jcgr496n9rlvvmbklc307q6w0g8f6",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.8.a/linux-hardened-5.6.8.a.patch"
+ "name": "linux-hardened-5.6.11.a.patch",
+ "sha256": "1b6cwffb2b21h9xh2acm9q9j55cay87zbv9jjayv69znry4mzsx3",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.11.a/linux-hardened-5.6.11.a.patch"
}
}
diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 6c5d86a0e69e..b3dea589cd65 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "4.14.177";
+ version = "4.14.179";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "04hq0i06mg2yc09jj2xk0vhf5q9yigzjzm55a5bvfy2a6j43r9rk";
+ sha256 = "10arrj3ppbxkn15yxqpxlz4k8yp2afzbfpp2nwfy6klhjiffp9sx";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index b3073ac17794..450c44f0aa09 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "4.19.119";
+ version = "4.19.121";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "1klvdzz8sndg2zsr1anfy9p5fc1aapjqvc249myrbndyf55bk91b";
+ sha256 = "11bhjdaihhc42xhf4qxdkkjznc0i6igh0ahjbzr3fb8bmq9sirgv";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index d846a015477f..81b32a932e1d 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
- version = "4.4.220";
+ version = "4.4.222";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "1knj3qsl7x3fysdz1h0s980ddbafs3658z2y67w6sn79wp7d8blg";
+ sha256 = "02zxy5vjxgrqs0mkz5aj70v6pazhif7x5cm26rf8zh4idpmhk2zh";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index b05a3685c276..a9757aa2f10d 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
- version = "4.9.220";
+ version = "4.9.222";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0bhbkybzbdsbmrjmb5m7hxxl8b3v6n79zhh86cbr95kzg1hcgnfs";
+ sha256 = "0aajgflf96bj7chbd83rdmgcdwd025c6mz6li4cwbfx7xcb91kjc";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix
index 2672a239e3bb..5ca72d8a6a5d 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "5.4.36";
+ version = "5.4.39";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "13avfvimjyg4lhj9micgib9bb5qpx11cja5liypid0rf2acfmymr";
+ sha256 = "1j35yf1nilb9z7lw8w2drpww7q2zy8zfr0ip8hwcbcd7c5d9chai";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-5.6.nix b/pkgs/os-specific/linux/kernel/linux-5.6.nix
index c5bd84abf168..7cd3987f87c3 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.6.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.6.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "5.6.8";
+ version = "5.6.11";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "1pw2q9509jzp84b6qasaais2ws25v2wrjh072q0x3j520zzl5q8r";
+ sha256 = "1ahv4a3mnszqs3qcnwmhbvjgis1jg37anj5jvn70i7s2k6z6rpfn";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 05617f869174..8b5f1e58d142 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "5.7-rc3";
+ version = "5.7-rc4";
extraMeta.branch = "5.7";
# modDirVersion needs to be x.y.z, will always add .0
@@ -11,7 +11,7 @@ buildLinux (args // rec {
src = fetchurl {
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
- sha256 = "0gq4bdzz2px85l3fa9dq3jh3lp4c9kgph4njq6yxf9g3h0ifq7c6";
+ sha256 = "1mnknjiax24iaj9n5k0s55vp6fvmb40s931qxj24v5p1lc5fznvb";
};
# Should the testing kernels ever be built on Hydra?
diff --git a/pkgs/os-specific/linux/libcgroup/default.nix b/pkgs/os-specific/linux/libcgroup/default.nix
index 026b43fc615d..4d93c3bb4fe4 100644
--- a/pkgs/os-specific/linux/libcgroup/default.nix
+++ b/pkgs/os-specific/linux/libcgroup/default.nix
@@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
patches = [
(fetchpatch {
+ name = "CVE-2018-14348.patch";
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/libcgroup/files/libcgroup-0.41-remove-umask.patch?id=33e9f4c81de754bbf76b893ea1133ed023f2a0e5";
sha256 = "1x0x29ld0cgmfwq4qy13s6d5c8sym1frfh1j2q47d8gfw6qaxka5";
})
diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix
index 65615f5c2406..68d05f0be65d 100644
--- a/pkgs/os-specific/linux/lxcfs/default.nix
+++ b/pkgs/os-specific/linux/lxcfs/default.nix
@@ -3,13 +3,13 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "lxcfs-4.0.1";
+ name = "lxcfs-4.0.3";
src = fetchFromGitHub {
owner = "lxc";
repo = "lxcfs";
rev = name;
- sha256 = "09y26ln2wxpi809kd3r352my64aal0yz2a5kin0i25gnvivl32cs";
+ sha256 = "0v6c5vc3i1l4sy4iamzdqvwibj6xr1lna4w1hxkn3s6jggcbxwca";
};
nativeBuildInputs = [ pkgconfig help2man autoreconfHook ];
diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix
index f8c75b1913bc..f69b2bd7fcec 100644
--- a/pkgs/os-specific/linux/pax-utils/default.nix
+++ b/pkgs/os-specific/linux/pax-utils/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "pax-utils";
- version = "1.2.5";
+ version = "1.2.6";
src = fetchurl {
url = "http://distfiles.gentoo.org/distfiles/${pname}-${version}.tar.xz";
- sha256 = "1v4jwbda25w07qhlx5xc5i0hwsv3pjy8hfy0r93vnmfjxq61grvw";
+ sha256 = "08bzvgv1z3371sqf7zlm9i0b1y3wdymj2dqdvzvf192k3nix4hlp";
};
makeFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/os-specific/linux/setools/default.nix
index ae632c072cb3..c0ed4102aaf1 100644
--- a/pkgs/os-specific/linux/setools/default.nix
+++ b/pkgs/os-specific/linux/setools/default.nix
@@ -8,13 +8,13 @@ with python3.pkgs;
buildPythonApplication rec {
pname = "setools";
- version = "4.2.2";
+ version = "4.3.0";
src = fetchFromGitHub {
owner = "SELinuxProject";
repo = pname;
rev = version;
- sha256 = "18kklv26dwm2fdjjzfflvxsq83b2svnwf4g18xq7wsfsri121a90";
+ sha256 = "0vr20bi8w147z5lclqz1l0j1b34137zg2r04pkafkgqqk7qbyjk6";
};
nativeBuildInputs = [ cython ];
diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index b0becd82d19f..59577eb8d519 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -5,13 +5,13 @@
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "sysdig";
- version = "0.26.6";
+ version = "0.26.7";
src = fetchFromGitHub {
owner = "draios";
repo = "sysdig";
rev = version;
- sha256 = "1rw9s5lamr02036z26vfmnp5dnn97f00hcnp4xv6gdxim6rpmbz7";
+ sha256 = "09m6j2cl70jxb0k4ydsgrida381bipf0v026xz661152cy23r3ff";
};
nativeBuildInputs = [ cmake perl ];
diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix
index 94df0649ad4a..edb951dae3da 100644
--- a/pkgs/os-specific/linux/syslinux/default.nix
+++ b/pkgs/os-specific/linux/syslinux/default.nix
@@ -1,14 +1,16 @@
-{ stdenv, fetchFromRepoOrCz, fetchurl, nasm, perl, python3, libuuid, mtools, makeWrapper }:
+{ stdenv, fetchgit, fetchurl, fetchpatch, nasm, perl, python3, libuuid, mtools, makeWrapper }:
stdenv.mkDerivation {
- name = "syslinux-2019-02-07";
+ pname = "syslinux";
+ version = "unstable-20190207";
# This is syslinux-6.04-pre3^1; syslinux-6.04-pre3 fails to run.
# Same issue here https://www.syslinux.org/archives/2019-February/026330.html
- src = fetchFromRepoOrCz {
- repo = "syslinux";
+ src = fetchgit {
+ url = "https://repo.or.cz/syslinux";
rev = "b40487005223a78c3bb4c300ef6c436b3f6ec1f7";
- sha256 = "1qrxl1114sr2i2791z9rf8v53g200aq30f08808d7i8qnmgvxl2w";
+ sha256 = "1acf6byx7i6vz8hq6mra526g8mf7fmfhid211y8nq0v6px7d3aqs";
+ fetchSubmodules = true;
};
patches = let
@@ -20,9 +22,9 @@ stdenv.mkDerivation {
url = mkURL "fa1349f1" "0002-gfxboot-menu-label.patch";
sha256 = "06ifgzbpjj4picpj17zgprsfi501zf4pp85qjjgn29i5rs291zni";
})
- (fetchurl {
- url = mkURL "477e56d2" "0005-gnu-efi-version-compatibility.patch";
- sha256 = "041568b4abb79wynyps1n04lg4fr26rc3sbjncz99pp0mbz0ajlm";
+ (fetchpatch {
+ url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/0005-gnu-efi-version-compatibility.patch?h=packages/syslinux";
+ sha256 = "0fbqz56hj8az8ws26m39hyp3l5fvcbzvzdddqz3x6n56hzdpz1p6";
})
(fetchurl {
# mbr.bin: too big (452 > 440)
@@ -48,6 +50,10 @@ stdenv.mkDerivation {
# fix tests
substituteInPlace tests/unittest/include/unittest/unittest.h \
--replace /usr/include/ ""
+
+ # Hack to get `gcc -m32' to work without having 32-bit Glibc headers.
+ mkdir gnu-efi/inc/ia32/gnu
+ touch gnu-efi/inc/ia32/gnu/stubs-32.h
'';
nativeBuildInputs = [ nasm perl python3 ];
@@ -61,13 +67,11 @@ stdenv.mkDerivation {
makeFlags = [
"BINDIR=$(out)/bin"
"SBINDIR=$(out)/sbin"
- "LIBDIR=$(out)/lib"
- "INCDIR=$(out)/include"
"DATADIR=$(out)/share"
"MANDIR=$(out)/share/man"
"PERL=perl"
- "bios"
- ];
+ ]
+ ++ stdenv.lib.optionals stdenv.hostPlatform.isi686 [ "bios" "efi32" ];
doCheck = false; # fails. some fail in a sandbox, others require qemu
diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index 8c3f489753df..63487733605a 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -7,11 +7,11 @@ assert stdenv.lib.versionOlder kernel.version "5.6";
stdenv.mkDerivation rec {
pname = "wireguard";
- version = "1.0.20200426";
+ version = "1.0.20200429";
src = fetchzip {
url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz";
- sha256 = "0j343xk9qgmzn0j6kgvydfqjqslf2rv6r4ikfc59982xxny6f6l5";
+ sha256 = "161srq06qa6ag2lycqz19mfms4ha2pmwn778jhvi96729rmivjkd";
};
hardeningDisable = [ "pic" ];
diff --git a/pkgs/servers/caddy/v2.nix b/pkgs/servers/caddy/v2.nix
index 35c1f497850a..4175dfa20fcb 100644
--- a/pkgs/servers/caddy/v2.nix
+++ b/pkgs/servers/caddy/v2.nix
@@ -1,10 +1,8 @@
-{ stdenv, callPackage, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "caddy";
- version = "2.0.0-rc.1";
-
- goPackagePath = "github.com/caddyserver/caddy";
+ version = "2.0.0";
subPackages = [ "cmd/caddy" ];
@@ -12,9 +10,10 @@ buildGoModule rec {
owner = "caddyserver";
repo = pname;
rev = "v${version}";
- sha256 = "0ir394nmdrqvslghqky4d2py65ff77fqsp0nmxdlsdps49szwh7h";
+ sha256 = "1c1frfx0qkprhf4var70cncvrw8s9gjag2hygndbd9055hb52bvv";
};
- modSha256 = "0sqnw81l73gssnpd4dsl3vd10584riq0417z4dvbhjnc8b3z4xwv";
+
+ modSha256 = "19sxyvfq1bpg85w8cd1yk2s6rd8759cf2zqs5b6wyny4cak2bl83";
meta = with stdenv.lib; {
homepage = "https://caddyserver.com";
diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix
index 299ad0bdbcb7..dd6484344e85 100644
--- a/pkgs/servers/consul/default.nix
+++ b/pkgs/servers/consul/default.nix
@@ -1,33 +1,38 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }:
buildGoModule rec {
pname = "consul";
- version = "1.7.2";
+ version = "1.7.3";
rev = "v${version}";
- # Note: Currently only release tags are supported, because they have the Consul UI
- # vendored. See
- # https://github.com/NixOS/nixpkgs/pull/48714#issuecomment-433454834
- # If you want to use a non-release commit as `src`, you probably want to improve
- # this derivation so that it can build the UI's JavaScript from source.
- # See https://github.com/NixOS/nixpkgs/pull/49082 for something like that.
- # Or, if you want to patch something that doesn't touch the UI, you may want
+ # Note: Currently only release tags are supported, because they have the Consul UI
+ # vendored. See
+ # https://github.com/NixOS/nixpkgs/pull/48714#issuecomment-433454834
+ # If you want to use a non-release commit as `src`, you probably want to improve
+ # this derivation so that it can build the UI's JavaScript from source.
+ # See https://github.com/NixOS/nixpkgs/pull/49082 for something like that.
+ # Or, if you want to patch something that doesn't touch the UI, you may want
# to apply your changes as patches on top of a release commit.
src = fetchFromGitHub {
owner = "hashicorp";
repo = pname;
inherit rev;
- sha256 = "1q587d8aqfkwg4fymr56fnf038vkxbdqz5yilz96dzny27dhspj4";
+ sha256 = "05p893mfdrlf5fy9ywwnqb7blw1ffidgviyyh6a3bp82wk49f8ph";
};
+ passthru.tests.consul = nixosTests.consul;
+
# This corresponds to paths with package main - normally unneeded but consul
# has a split module structure in one repo
subPackages = ["." "connect/certgen"];
- modSha256 = "164834gr8a7qvp72ccjpkbbg4h8idrcxvcp1fl7yi59iqsswfr7b";
+ modSha256 = "01vyamfy9lcljzy99jmr48x0ypb12wab66n9kmj71mrvl50v8rzr";
- preBuild = ''
- buildFlagsArray+=("-ldflags" "-X github.com/hashicorp/consul/version.GitDescribe=v${version} -X github.com/hashicorp/consul/version.Version=${version} -X github.com/hashicorp/consul/version.VersionPrerelease=")
+ preBuild = ''
+ buildFlagsArray+=("-ldflags"
+ "-X github.com/hashicorp/consul/version.GitDescribe=v${version}
+ -X github.com/hashicorp/consul/version.Version=${version}
+ -X github.com/hashicorp/consul/version.VersionPrerelease=")
'';
meta = with stdenv.lib; {
diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix
index 51502c3fd97f..f50a5afa81e7 100644
--- a/pkgs/servers/coturn/default.nix
+++ b/pkgs/servers/coturn/default.nix
@@ -2,24 +2,19 @@
stdenv.mkDerivation rec {
pname = "coturn";
- version = "4.5.1.1";
+ version = "4.5.1.2";
src = fetchFromGitHub {
owner = "coturn";
repo = "coturn";
rev = version;
- sha256 = "12x604lgva1d3g4wvl3f66rdj6lkjk5cqr0l3xas33xgzgm13pwr";
+ sha256 = "01y65az8qyv2kjnb4fj7rgl4zq5pc2b286gfn727x3hfhksx9zp2";
};
buildInputs = [ openssl libevent ];
patches = [
./pure-configure.patch
- (fetchpatch {
- name = "CVE-2020-6061+6062.patch";
- url = "https://sources.debian.org/data/main/c/coturn/4.5.1.1-1.2/debian/patches/CVE-2020-6061+6062.patch";
- sha256 = "0fcy1wp91bb4hlhnp96sf9bs0d9hf3pwx5f7b1r9cfvr3l5c1bk2";
- })
];
meta = with stdenv.lib; {
diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index 73881ff1092d..d76b51bcc661 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -8,11 +8,11 @@ let inherit (stdenv.lib) optional optionals; in
# Note: ATM only the libraries have been tested in nixpkgs.
stdenv.mkDerivation rec {
pname = "knot-dns";
- version = "2.9.3";
+ version = "2.9.4";
src = fetchurl {
url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
- sha256 = "f2adf137d70955a4a20df90c5409e10be8e1127204a98b27d626ac090531a07e";
+ sha256 = "57f3c93a1b40dfa0431508203f559b7ea257afab79078c38bcddf960d5a4a501";
};
outputs = [ "bin" "out" "dev" ];
diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix
index d815771c66cb..43c2900443e2 100644
--- a/pkgs/servers/dns/nsd/default.nix
+++ b/pkgs/servers/dns/nsd/default.nix
@@ -16,11 +16,11 @@
stdenv.mkDerivation rec {
pname = "nsd";
- version = "4.3.0";
+ version = "4.3.1";
src = fetchurl {
url = "https://www.nlnetlabs.nl/downloads/${pname}/${pname}-${version}.tar.gz";
- sha256 = "15qy25210j9nq2i3pm8rwphnc6b5gq83js10078fvw9hbmjps03s";
+ sha256 = "11w9kl99fs888f3zwx2j92i8lcp78vq91jac8s317a2icv74mczl";
};
prePatch = ''
diff --git a/pkgs/servers/hasura/ci-info.nix b/pkgs/servers/hasura/ci-info.nix
new file mode 100644
index 000000000000..53c85a2e5ba1
--- /dev/null
+++ b/pkgs/servers/hasura/ci-info.nix
@@ -0,0 +1,22 @@
+{ mkDerivation, aeson, aeson-casing, base, fetchgit, hashable
+, hpack, stdenv, template-haskell, text, th-lift-instances
+, unordered-containers
+}:
+mkDerivation {
+ pname = "ci-info";
+ version = "0.1.0.0";
+ src = fetchgit {
+ url = "https://github.com/hasura/ci-info-hs.git";
+ sha256 = "0rn1799z4y7z1c6ijrr0gscarg25zmnfq0z9rrmk4ad727vf1ppc";
+ rev = "6af5a68450347a02295a9cd050d05a8b2f5c06ab";
+ fetchSubmodules = true;
+ };
+ libraryHaskellDepends = [
+ aeson aeson-casing base hashable template-haskell text
+ th-lift-instances unordered-containers
+ ];
+ libraryToolDepends = [ hpack ];
+ prePatch = "hpack";
+ homepage = "https://github.com/hasura/ci-info-hs#readme";
+ license = stdenv.lib.licenses.mit;
+}
diff --git a/pkgs/servers/hasura/cli.nix b/pkgs/servers/hasura/cli.nix
new file mode 100644
index 000000000000..f19ffe12f5d9
--- /dev/null
+++ b/pkgs/servers/hasura/cli.nix
@@ -0,0 +1,33 @@
+{ buildGoModule, hasura-graphql-engine }:
+
+buildGoModule rec {
+ name = "hasura-${version}";
+ version = hasura-graphql-engine.version;
+
+ src = hasura-graphql-engine.src;
+ modRoot = "./cli";
+
+ goPackagePath = "github.com/hasura/graphql-engine/cli";
+ subPackages = [ "cmd/hasura" ];
+
+ modSha256 = "0bpb9r0n8n8c1p8sas3qanhvqw45rq8kygb4dmkfhj3d9vlgn6d2";
+
+ buildFlagsArray = [''-ldflags=
+ -X github.com/hasura/graphql-engine/cli/version.BuildVersion=${version}
+ -s
+ -w
+ ''];
+
+ postInstall = ''
+ mkdir -p $out/share/{bash-completion/completions,zsh/site-functions}
+
+ export HOME=$PWD
+ $out/bin/hasura completion bash > $out/share/bash-completion/completions/hasura
+ $out/bin/hasura completion zsh > $out/share/zsh/site-functions/_hasura
+ '';
+
+ meta = {
+ inherit (hasura-graphql-engine.meta) license homepage maintainers;
+ description = "Hasura GraphQL Engine CLI";
+ };
+}
diff --git a/pkgs/servers/hasura/default.nix b/pkgs/servers/hasura/default.nix
new file mode 100644
index 000000000000..085274660351
--- /dev/null
+++ b/pkgs/servers/hasura/default.nix
@@ -0,0 +1,63 @@
+{ haskell }:
+
+with haskell.lib;
+
+let
+ # version in cabal file is invalid
+ version = "1.2.1";
+
+ pkgs = haskell.packages.ghc865.override {
+ overrides = self: super: {
+ # cabal2nix --subpath server --maintainer offline --no-check --revision 1.2.1 https://github.com/hasura/graphql-engine.git
+ hasura-graphql-engine = justStaticExecutables
+ ((self.callPackage ./graphql-engine.nix { }).overrideDerivation (d: {
+ name = "graphql-engine-${version}";
+
+ inherit version;
+
+ # hasura needs VERSION env exported during build
+ preBuild = "export VERSION=${version}";
+ }));
+
+ hasura-cli = self.callPackage ./cli.nix {
+ hasura-graphql-engine = self.hasura-graphql-engine // {
+ inherit version;
+ };
+ };
+
+ # internal dependencies, non published on hackage (find revisions in cabal.project file)
+ # cabal2nix --revision https://github.com/hasura/ci-info-hs.git
+ ci-info = self.callPackage ./ci-info.nix { };
+ # cabal2nix --revision https://github.com/hasura/graphql-parser-hs.git
+ graphql-parser = self.callPackage ./graphql-parser.nix { };
+ # cabal2nix --revision https://github.com/hasura/pg-client-hs.git
+ pg-client = self.callPackage ./pg-client.nix { };
+
+ # version constrained dependencies, without these hasura will not build,
+ # find versions in graphql-engine.cabal
+ # cabal2nix cabal://dependent-map-0.2.4.0
+ dependent-map = self.callPackage ./dependent-map.nix { };
+ # cabal2nix cabal://dependent-sum-0.4
+ dependent-sum = self.callPackage ./dependent-sum.nix { };
+ # cabal2nix cabal://these-0.7.6
+ these = doJailbreak (self.callPackage ./these.nix { });
+ # cabal2nix cabal://immortal-0.2.2.1
+ immortal = self.callPackage ./immortal.nix { };
+ # cabal2nix cabal://network-uri-2.6.1.0
+ network-uri = self.callPackage ./network-uri.nix { };
+ # cabal2nix cabal://ghc-heap-view-0.6.0
+ ghc-heap-view = disableLibraryProfiling (self.callPackage ./ghc-heap-view.nix { });
+
+ # unmark broewn packages and do required modifications
+ stm-hamt = doJailbreak (unmarkBroken super.stm-hamt);
+ superbuffer = dontCheck (doJailbreak (unmarkBroken super.superbuffer));
+ Spock-core = dontCheck (unmarkBroken super.Spock-core);
+ stm-containers = dontCheck (unmarkBroken super.stm-containers);
+ ekg-json = unmarkBroken super.ekg-json;
+ list-t = dontCheck (unmarkBroken super.list-t);
+ primitive-extras = unmarkBroken super.primitive-extras;
+ };
+ };
+in {
+ inherit (pkgs) hasura-graphql-engine hasura-cli;
+}
diff --git a/pkgs/servers/hasura/dependent-map.nix b/pkgs/servers/hasura/dependent-map.nix
new file mode 100644
index 000000000000..68ebb616b5f6
--- /dev/null
+++ b/pkgs/servers/hasura/dependent-map.nix
@@ -0,0 +1,13 @@
+{ mkDerivation, base, containers, dependent-sum, stdenv }:
+mkDerivation {
+ pname = "dependent-map";
+ version = "0.2.4.0";
+ sha256 = "5db396bdb5d156434af920c074316c3b84b4d39ba8e1cd349c7bb6679cb28246";
+ revision = "1";
+ editedCabalFile = "0a5f35d1sgfq1cl1r5bgb5pwfjniiycxiif4ycxglaizp8g5rlr1";
+ libraryHaskellDepends = [ base containers dependent-sum ];
+ homepage = "https://github.com/mokus0/dependent-map";
+ description = "Dependent finite maps (partial dependent products)";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+}
diff --git a/pkgs/servers/hasura/dependent-sum.nix b/pkgs/servers/hasura/dependent-sum.nix
new file mode 100644
index 000000000000..90717b873660
--- /dev/null
+++ b/pkgs/servers/hasura/dependent-sum.nix
@@ -0,0 +1,10 @@
+{ mkDerivation, base, stdenv }:
+mkDerivation {
+ pname = "dependent-sum";
+ version = "0.4";
+ sha256 = "a8deecb4153a1878173f8d0a18de0378ab068bc15e5035b9e4cb478e8e4e1a1e";
+ libraryHaskellDepends = [ base ];
+ homepage = "https://github.com/mokus0/dependent-sum";
+ description = "Dependent sum type";
+ license = stdenv.lib.licenses.publicDomain;
+}
diff --git a/pkgs/servers/hasura/ghc-heap-view.nix b/pkgs/servers/hasura/ghc-heap-view.nix
new file mode 100644
index 000000000000..54c873baee4b
--- /dev/null
+++ b/pkgs/servers/hasura/ghc-heap-view.nix
@@ -0,0 +1,18 @@
+{ mkDerivation, base, binary, bytestring, Cabal, containers
+, deepseq, filepath, ghc-heap, stdenv, template-haskell
+, transformers
+}:
+mkDerivation {
+ pname = "ghc-heap-view";
+ version = "0.6.0";
+ sha256 = "99ed6034d02a7a942e1b6ed970e9f7028dcdfd5b5d29fd8a0fb89f1a5e7c5ec8";
+ enableSeparateDataOutput = true;
+ setupHaskellDepends = [ base Cabal filepath ];
+ libraryHaskellDepends = [
+ base binary bytestring containers ghc-heap template-haskell
+ transformers
+ ];
+ testHaskellDepends = [ base deepseq ];
+ description = "Extract the heap representation of Haskell values and thunks";
+ license = stdenv.lib.licenses.bsd3;
+}
diff --git a/pkgs/servers/hasura/graphql-engine.nix b/pkgs/servers/hasura/graphql-engine.nix
new file mode 100644
index 000000000000..05ba895be080
--- /dev/null
+++ b/pkgs/servers/hasura/graphql-engine.nix
@@ -0,0 +1,71 @@
+{ mkDerivation, aeson, aeson-casing, ansi-wl-pprint, asn1-encoding
+, asn1-types, async, attoparsec, attoparsec-iso8601, auto-update
+, base, base64-bytestring, byteorder, bytestring, case-insensitive
+, ci-info, containers, criterion, cryptonite, data-has, deepseq
+, dependent-map, dependent-sum, directory, ekg-core, ekg-json
+, fast-logger, fetchgit, file-embed, filepath, generic-arbitrary
+, ghc-heap-view, graphql-parser, hashable, hspec, hspec-core
+, hspec-expectations-lifted, http-client, http-client-tls
+, http-types, immortal, insert-ordered-containers, jose, lens
+, lifted-async, lifted-base, list-t, mime-types, monad-control
+, monad-time, monad-validate, mtl, mustache, mwc-probability
+, mwc-random, natural-transformation, network, network-uri
+, optparse-applicative, pem, pg-client, postgresql-binary
+, postgresql-libpq, process, profunctors, psqueues, QuickCheck
+, regex-tdfa, safe, scientific, semver, shakespeare, split
+, Spock-core, stdenv, stm, stm-containers, template-haskell, text
+, text-builder, text-conversions, th-lift-instances, these, time
+, transformers, transformers-base, unix, unordered-containers
+, uri-encode, uuid, vector, wai, wai-websockets, warp, websockets
+, wreq, x509, yaml, zlib
+}:
+mkDerivation {
+ pname = "graphql-engine";
+ version = "1.0.0";
+ src = fetchgit {
+ url = "https://github.com/hasura/graphql-engine.git";
+ sha256 = "0hg44zl3gqa8lq7kggwgmgbsgdc7zrv5cxs507vilg11xklsbz4l";
+ rev = "27b0b59361cebecd074bd59123f602e7b013bac1";
+ fetchSubmodules = true;
+ };
+ postUnpack = "sourceRoot+=/server; echo source root reset to $sourceRoot";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson aeson-casing ansi-wl-pprint asn1-encoding asn1-types async
+ attoparsec attoparsec-iso8601 auto-update base base64-bytestring
+ byteorder bytestring case-insensitive ci-info containers cryptonite
+ data-has deepseq dependent-map dependent-sum directory ekg-core
+ ekg-json fast-logger file-embed filepath generic-arbitrary
+ ghc-heap-view graphql-parser hashable http-client http-client-tls
+ http-types immortal insert-ordered-containers jose lens
+ lifted-async lifted-base list-t mime-types monad-control monad-time
+ monad-validate mtl mustache network network-uri
+ optparse-applicative pem pg-client postgresql-binary
+ postgresql-libpq process profunctors psqueues QuickCheck regex-tdfa
+ scientific semver shakespeare split Spock-core stm stm-containers
+ template-haskell text text-builder text-conversions
+ th-lift-instances these time transformers transformers-base unix
+ unordered-containers uri-encode uuid vector wai wai-websockets warp
+ websockets wreq x509 yaml zlib
+ ];
+ executableHaskellDepends = [
+ base bytestring pg-client text text-conversions
+ ];
+ testHaskellDepends = [
+ aeson base bytestring hspec hspec-core hspec-expectations-lifted
+ http-client http-client-tls lifted-base monad-control mtl
+ natural-transformation optparse-applicative pg-client process
+ QuickCheck safe split text time transformers-base
+ unordered-containers
+ ];
+ benchmarkHaskellDepends = [
+ async base bytestring criterion deepseq mwc-probability mwc-random
+ split text vector
+ ];
+ doCheck = false;
+ homepage = "https://www.hasura.io";
+ description = "GraphQL API over Postgres";
+ license = stdenv.lib.licenses.asl20;
+ maintainers = with stdenv.lib.maintainers; [ offline ];
+}
diff --git a/pkgs/servers/hasura/graphql-parser.nix b/pkgs/servers/hasura/graphql-parser.nix
new file mode 100644
index 000000000000..8066bb83dd0a
--- /dev/null
+++ b/pkgs/servers/hasura/graphql-parser.nix
@@ -0,0 +1,35 @@
+{ mkDerivation, aeson, attoparsec, base, bytestring, containers
+, criterion, fetchgit, filepath, hedgehog, hpack, prettyprinter
+, protolude, regex-tdfa, scientific, stdenv, template-haskell, text
+, text-builder, th-lift-instances, unordered-containers, vector
+}:
+mkDerivation {
+ pname = "graphql-parser";
+ version = "0.1.0.0";
+ src = fetchgit {
+ url = "https://github.com/hasura/graphql-parser-hs.git";
+ sha256 = "0vz0sqqmr1l02d3f1pc5k7rm7vpxmg5d5ijvdcwdm34yw6x5lz1v";
+ rev = "623ad78aa46e7ba2ef1aa58134ad6136b0a85071";
+ fetchSubmodules = true;
+ };
+ libraryHaskellDepends = [
+ aeson attoparsec base bytestring containers filepath hedgehog
+ prettyprinter protolude regex-tdfa scientific template-haskell text
+ text-builder th-lift-instances unordered-containers vector
+ ];
+ libraryToolDepends = [ hpack ];
+ testHaskellDepends = [
+ aeson attoparsec base bytestring containers filepath hedgehog
+ prettyprinter protolude regex-tdfa scientific template-haskell text
+ text-builder th-lift-instances unordered-containers vector
+ ];
+ benchmarkHaskellDepends = [
+ aeson attoparsec base bytestring containers criterion filepath
+ hedgehog prettyprinter protolude regex-tdfa scientific
+ template-haskell text text-builder th-lift-instances
+ unordered-containers vector
+ ];
+ prePatch = "hpack";
+ homepage = "https://github.com/hasura/graphql-parser-hs#readme";
+ license = stdenv.lib.licenses.bsd3;
+}
diff --git a/pkgs/servers/hasura/immortal.nix b/pkgs/servers/hasura/immortal.nix
new file mode 100644
index 000000000000..c53f0f18709c
--- /dev/null
+++ b/pkgs/servers/hasura/immortal.nix
@@ -0,0 +1,17 @@
+{ mkDerivation, base, lifted-base, monad-control, stdenv, stm
+, tasty, tasty-hunit, transformers, transformers-base
+}:
+mkDerivation {
+ pname = "immortal";
+ version = "0.2.2.1";
+ sha256 = "ed4aa1a2883a693a73fec47c8c2d5332d61a0626a2013403e1a8fb25cc6c8d8e";
+ libraryHaskellDepends = [
+ base lifted-base monad-control stm transformers-base
+ ];
+ testHaskellDepends = [
+ base lifted-base stm tasty tasty-hunit transformers
+ ];
+ homepage = "https://github.com/feuerbach/immortal";
+ description = "Spawn threads that never die (unless told to do so)";
+ license = stdenv.lib.licenses.mit;
+}
diff --git a/pkgs/servers/hasura/network-uri.nix b/pkgs/servers/hasura/network-uri.nix
new file mode 100644
index 000000000000..45016d470a8d
--- /dev/null
+++ b/pkgs/servers/hasura/network-uri.nix
@@ -0,0 +1,18 @@
+{ mkDerivation, base, deepseq, HUnit, parsec, stdenv
+, test-framework, test-framework-hunit, test-framework-quickcheck2
+}:
+mkDerivation {
+ pname = "network-uri";
+ version = "2.6.1.0";
+ sha256 = "423e0a2351236f3fcfd24e39cdbc38050ec2910f82245e69ca72a661f7fc47f0";
+ revision = "1";
+ editedCabalFile = "141nj7q0p9wkn5gr41ayc63cgaanr9m59yym47wpxqr3c334bk32";
+ libraryHaskellDepends = [ base deepseq parsec ];
+ testHaskellDepends = [
+ base HUnit test-framework test-framework-hunit
+ test-framework-quickcheck2
+ ];
+ homepage = "https://github.com/haskell/network-uri";
+ description = "URI manipulation";
+ license = stdenv.lib.licenses.bsd3;
+}
diff --git a/pkgs/servers/hasura/pg-client.nix b/pkgs/servers/hasura/pg-client.nix
new file mode 100644
index 000000000000..725e5e7f6408
--- /dev/null
+++ b/pkgs/servers/hasura/pg-client.nix
@@ -0,0 +1,30 @@
+{ mkDerivation, aeson, aeson-casing, attoparsec, base, bytestring
+, criterion, fetchgit, file-embed, hashable, hashtables, hasql
+, hasql-pool, hasql-transaction, monad-control, mtl
+, postgresql-binary, postgresql-libpq, resource-pool, retry
+, scientific, stdenv, template-haskell, text, text-builder, th-lift
+, th-lift-instances, time, transformers-base, uuid, vector
+}:
+mkDerivation {
+ pname = "pg-client";
+ version = "0.1.0";
+ src = fetchgit {
+ url = "https://github.com/hasura/pg-client-hs.git";
+ sha256 = "1941gj5yp24kx0xb1nd774nwp5vnpsp6m83isqkwpyz9spl4sq7l";
+ rev = "70a849d09bea9461e72c5a5bbde06df65aab61c0";
+ fetchSubmodules = true;
+ };
+ libraryHaskellDepends = [
+ aeson aeson-casing attoparsec base bytestring hashable hashtables
+ monad-control mtl postgresql-binary postgresql-libpq resource-pool
+ retry scientific template-haskell text text-builder th-lift
+ th-lift-instances time transformers-base uuid vector
+ ];
+ testHaskellDepends = [ base ];
+ benchmarkHaskellDepends = [
+ base bytestring criterion file-embed hashable hasql hasql-pool
+ hasql-transaction mtl postgresql-libpq text text-builder
+ ];
+ homepage = "https://github.com/hasura/platform";
+ license = stdenv.lib.licenses.bsd3;
+}
diff --git a/pkgs/servers/hasura/these.nix b/pkgs/servers/hasura/these.nix
new file mode 100644
index 000000000000..396f9e2a2824
--- /dev/null
+++ b/pkgs/servers/hasura/these.nix
@@ -0,0 +1,25 @@
+{ mkDerivation, aeson, base, base-compat, bifunctors, binary
+, containers, data-default-class, deepseq, hashable, keys, lens
+, mtl, QuickCheck, quickcheck-instances, semigroupoids, stdenv
+, tasty, tasty-quickcheck, transformers, transformers-compat
+, unordered-containers, vector, vector-instances
+}:
+mkDerivation {
+ pname = "these";
+ version = "0.7.6";
+ sha256 = "9464b83d98e626360a8ad9836ba77e5201cd1e9c89b95b1b11a28ef3c23ac746";
+ libraryHaskellDepends = [
+ aeson base base-compat bifunctors binary containers
+ data-default-class deepseq hashable keys lens mtl QuickCheck
+ semigroupoids transformers transformers-compat unordered-containers
+ vector vector-instances
+ ];
+ testHaskellDepends = [
+ aeson base base-compat bifunctors binary containers hashable lens
+ QuickCheck quickcheck-instances tasty tasty-quickcheck transformers
+ unordered-containers vector
+ ];
+ homepage = "https://github.com/isomorphism/these";
+ description = "An either-or-both data type & a generalized 'zip with padding' typeclass";
+ license = stdenv.lib.licenses.bsd3;
+}
diff --git a/pkgs/servers/http/apt-cacher-ng/default.nix b/pkgs/servers/http/apt-cacher-ng/default.nix
index 99dd63c7ce6d..f8c4b8002045 100644
--- a/pkgs/servers/http/apt-cacher-ng/default.nix
+++ b/pkgs/servers/http/apt-cacher-ng/default.nix
@@ -4,6 +4,7 @@
, doxygen
, fetchurl
, fuse
+, libevent
, lzma
, openssl
, pkgconfig
@@ -14,15 +15,15 @@
stdenv.mkDerivation rec {
pname = "apt-cacher-ng";
- version = "3.2";
+ version = "3.5";
src = fetchurl {
url = "http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_${version}.orig.tar.xz";
- sha256 = "1kas5xq44rx33pczhrz05dsdhjaavxdmcs5h1ygfi76bpqvyhpa0";
+ sha256 = "0h76n02nnpg7ir9247qrxb8p4d4p282nh13zrv5bb9sfm12pril2";
};
nativeBuildInputs = [ cmake doxygen pkgconfig ];
- buildInputs = [ bzip2 fuse lzma openssl systemd tcp_wrappers zlib ];
+ buildInputs = [ bzip2 fuse libevent lzma openssl systemd tcp_wrappers zlib ];
meta = with stdenv.lib; {
description = "A caching proxy specialized for linux distribution files";
diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix
index 4a3a3f2da016..49c11bf462e6 100644
--- a/pkgs/servers/http/jetty/default.nix
+++ b/pkgs/servers/http/jetty/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "jetty";
- version = "9.4.25.v20191220";
+ version = "9.4.26.v20200117";
src = fetchurl {
url = "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz";
name = "jetty-distribution-${version}.tar.gz";
- sha256 = "1jnx4hnvd2krsdisqwpws1qd1r0f8gm9a4sx4a8c7zqrmfd2zx1a";
+ sha256 = "0wgh7vap0h6gkz6pk8iycvhwmybyxv25ssinwxxrnzk8jg25g89i";
};
phases = [ "unpackPhase" "installPhase" ];
diff --git a/pkgs/servers/http/tomcat/tomcat-native.nix b/pkgs/servers/http/tomcat/tomcat-native.nix
index 57ab2a96b4df..17c4367866fb 100644
--- a/pkgs/servers/http/tomcat/tomcat-native.nix
+++ b/pkgs/servers/http/tomcat/tomcat-native.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "tomcat-native";
- version = "1.2.23";
+ version = "1.2.24";
src = fetchurl {
url = "mirror://apache/tomcat/tomcat-connectors/native/${version}/source/${pname}-${version}-src.tar.gz";
- sha512 = "89a0363961d322a87f4e752f4727f54f28ac6e4ad10fa21b6b7390c62b041d4068672d95495d9233c1cad7d6c1dc3c85fbd0186894085b3b94e476876af160ee";
+ sha512 = "5dae151a60f8bd5a9a29d63eca838c77174426025ee65a826f0698943494dd3656d50bcd417e220a926b9ce111ea167043d4b806264030e951873d06767b3d6f";
};
sourceRoot = "${pname}-${version}-src/native";
diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix
index 0779a31f1064..c161566d329f 100644
--- a/pkgs/servers/http/unit/default.nix
+++ b/pkgs/servers/http/unit/default.nix
@@ -1,8 +1,9 @@
-{ stdenv, fetchFromGitHub, which
+{ stdenv, fetchFromGitHub, nixosTests, which
, withPython2 ? false, python2
, withPython3 ? true, python3, ncurses
, withPHP72 ? false, php72
-, withPHP73 ? true, php73
+, withPHP73 ? false, php73
+, withPHP74 ? true, php74
, withPerl528 ? false, perl528
, withPerl530 ? true, perl530
, withPerldevel ? false, perldevel
@@ -28,22 +29,19 @@ let
php72-unit = php72.override phpConfig;
php73-unit = php73.override phpConfig;
+ php74-unit = php74.override phpConfig;
+
in stdenv.mkDerivation rec {
- version = "1.16.0";
+ version = "1.17.0";
pname = "unit";
src = fetchFromGitHub {
owner = "nginx";
repo = "unit";
rev = version;
- sha256 = "19gclqhwccpi7y4386ap33ycwhylv4s4kwfc6ik8scmc4pw3sj9l";
+ sha256 = "1q3659vw8rxv4fk7ljkjav8ga72sb3arljfxcqw8b080f9hvi7hh";
};
- patches = [
- # https://github.com/nginx/unit/issues/357
- ./drop_cap.patch
- ];
-
nativeBuildInputs = [ which ];
buildInputs = [ ]
@@ -51,6 +49,7 @@ in stdenv.mkDerivation rec {
++ optionals withPython3 [ python3 ncurses ]
++ optional withPHP72 php72-unit
++ optional withPHP73 php73-unit
+ ++ optional withPHP73 php74-unit
++ optional withPerl528 perl528
++ optional withPerl530 perl530
++ optional withPerldevel perldevel
@@ -73,6 +72,7 @@ in stdenv.mkDerivation rec {
${optionalString withPython3 "./configure python --module=python3 --config=${python3}/bin/python3-config --lib-path=${python3}/lib"}
${optionalString withPHP72 "./configure php --module=php72 --config=${php72-unit.unwrapped.dev}/bin/php-config --lib-path=${php72-unit}/lib"}
${optionalString withPHP73 "./configure php --module=php73 --config=${php73-unit.unwrapped.dev}/bin/php-config --lib-path=${php73-unit}/lib"}
+ ${optionalString withPHP74 "./configure php --module=php74 --config=${php74-unit.unwrapped.dev}/bin/php-config --lib-path=${php74-unit}/lib"}
${optionalString withPerl528 "./configure perl --module=perl528 --perl=${perl528}/bin/perl"}
${optionalString withPerl530 "./configure perl --module=perl530 --perl=${perl530}/bin/perl"}
${optionalString withPerldevel "./configure perl --module=perldev --perl=${perldevel}/bin/perl"}
@@ -81,6 +81,8 @@ in stdenv.mkDerivation rec {
${optionalString withRuby_2_7 "./configure ruby --module=ruby27 --ruby=${ruby_2_7}/bin/ruby"}
'';
+ passthru.tests.unit-php = nixosTests.unit-php;
+
meta = {
description = "Dynamic web and application server, designed to run applications in multiple languages.";
homepage = "https://unit.nginx.org/";
diff --git a/pkgs/servers/http/unit/drop_cap.patch b/pkgs/servers/http/unit/drop_cap.patch
deleted file mode 100644
index 87caf77904e2..000000000000
--- a/pkgs/servers/http/unit/drop_cap.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff -r ed17ce89119f src/nxt_capability.c
---- a/src/nxt_capability.c Fri Dec 06 17:02:23 2019 +0000
-+++ b/src/nxt_capability.c Mon Dec 09 23:23:00 2019 +0000
-@@ -93,6 +93,26 @@ nxt_capability_specific_set(nxt_task_t *
- return NXT_OK;
- }
-
-+
-+nxt_int_t
-+nxt_capability_drop_all(nxt_task_t *task)
-+{
-+ struct __user_cap_header_struct hdr;
-+ struct __user_cap_data_struct data[2];
-+
-+ hdr.version = nxt_capability_linux_get_version();
-+ hdr.pid = nxt_pid;
-+
-+ nxt_memset(data, 0, sizeof(data));
-+
-+ if (nxt_slow_path(nxt_capset(&hdr, data) == -1)) {
-+ nxt_alert(task, "failed to drop capabilities %E", nxt_errno);
-+ return NXT_ERROR;
-+ }
-+
-+ return NXT_OK;
-+}
-+
- #else
-
- static nxt_int_t
-diff -r ed17ce89119f src/nxt_capability.h
---- a/src/nxt_capability.h Fri Dec 06 17:02:23 2019 +0000
-+++ b/src/nxt_capability.h Mon Dec 09 23:23:00 2019 +0000
-@@ -14,4 +14,6 @@ typedef struct {
- NXT_EXPORT nxt_int_t nxt_capability_set(nxt_task_t *task,
- nxt_capabilities_t *cap);
-
-+NXT_EXPORT nxt_int_t nxt_capability_drop_all(nxt_task_t *task);
-+
- #endif /* _NXT_CAPABILITY_INCLUDED_ */
-diff -r ed17ce89119f src/nxt_process.c
---- a/src/nxt_process.c Fri Dec 06 17:02:23 2019 +0000
-+++ b/src/nxt_process.c Mon Dec 09 23:23:00 2019 +0000
-@@ -264,7 +264,7 @@ cleanup:
- static void
- nxt_process_start(nxt_task_t *task, nxt_process_t *process)
- {
-- nxt_int_t ret, cap_setid;
-+ nxt_int_t ret, cap_setid, drop_caps;
- nxt_port_t *port, *main_port;
- nxt_thread_t *thread;
- nxt_runtime_t *rt;
-@@ -285,9 +285,12 @@ nxt_process_start(nxt_task_t *task, nxt_
-
- cap_setid = rt->capabilities.setid;
-
-+ drop_caps = cap_setid;
-+
- #if (NXT_HAVE_CLONE_NEWUSER)
-- if (!cap_setid && NXT_CLONE_USER(init->isolation.clone.flags)) {
-+ if (NXT_CLONE_USER(init->isolation.clone.flags)) {
- cap_setid = 1;
-+ drop_caps = 0;
- }
- #endif
-
-@@ -301,6 +304,12 @@ nxt_process_start(nxt_task_t *task, nxt_
- if (nxt_slow_path(ret != NXT_OK)) {
- goto fail;
- }
-+
-+#if (NXT_HAVE_LINUX_CAPABILITY)
-+ if (drop_caps && nxt_capability_drop_all(task) != NXT_OK) {
-+ goto fail;
-+ }
-+#endif
- }
-
- rt->type = init->type;
\ No newline at end of file
diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix
index faaad1ac7a71..21caebec0f37 100644
--- a/pkgs/servers/imgproxy/default.nix
+++ b/pkgs/servers/imgproxy/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "imgproxy";
- version = "2.11.0";
+ version = "2.13.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
- sha256 = "1n91snf5sxsiy2r8y2nksw4ah70f70nxamy7k0ylgkpfxp4dxwb8";
+ sha256 = "0lzk9nv7fbyc0jbsigw54310pvpwfrvji58z7a08j03vypc0v3x4";
rev = "v${version}";
};
- modSha256 = "1fm3s1ksah0w86xv8xjhrbf5ia0ynfg2qgajnldy3dpdbxa3yh7s";
+ modSha256 = "02pj8ryis89dl4wjp2mvx6h5d0xdvskxdxiwarg7q0x23m9r7kpg";
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix
index 932081ad22fe..35476db92152 100644
--- a/pkgs/servers/jellyfin/default.nix
+++ b/pkgs/servers/jellyfin/default.nix
@@ -18,12 +18,12 @@ let
in stdenv.mkDerivation rec {
pname = "jellyfin";
- version = "10.5.4";
+ version = "10.5.5";
# Impossible to build anything offline with dotnet
src = fetchurl {
url = "https://github.com/jellyfin/jellyfin/releases/download/v${version}/jellyfin_${version}_portable.tar.gz";
- sha256 = "0jfqkbr5n5l7k3dpmjsy0bhvy4y1s6sccwcmcx239r6dhc7x0f9y";
+ sha256 = "1s3hva1j5w74qc9wyqnmr5clk4smzfi7wvx8qrzrwy81mx7r5w27";
};
buildInputs = [
diff --git a/pkgs/servers/mail/opensmtpd/extras.nix b/pkgs/servers/mail/opensmtpd/extras.nix
index 803ba0ee6c75..6c29de8cddbc 100644
--- a/pkgs/servers/mail/opensmtpd/extras.nix
+++ b/pkgs/servers/mail/opensmtpd/extras.nix
@@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "opensmtpd-extras";
- version = "6.4.0";
+ version = "6.7.1";
src = fetchurl {
url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz";
- sha256 = "09k25l7zy5ch3fk6qphni2h0rxdp8wacmfag1whi608dgimrhrnb";
+ sha256 = "1b1mx71bvmv92lbm08wr2p60g3qhikvv3n15zsr6dcwbk9aqahzq";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix
index 9af470f8310f..7de8cd858a3d 100644
--- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix
+++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix
@@ -13,13 +13,22 @@ let
sha512 = "a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==";
};
};
- "@babel/highlight-7.8.3" = {
+ "@babel/helper-validator-identifier-7.9.5" = {
+ name = "_at_babel_slash_helper-validator-identifier";
+ packageName = "@babel/helper-validator-identifier";
+ version = "7.9.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz";
+ sha512 = "/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==";
+ };
+ };
+ "@babel/highlight-7.9.0" = {
name = "_at_babel_slash_highlight";
packageName = "@babel/highlight";
- version = "7.8.3";
+ version = "7.9.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz";
- sha512 = "PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==";
+ url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz";
+ sha512 = "lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==";
};
};
"@slack/logger-1.1.1" = {
@@ -31,31 +40,31 @@ let
sha512 = "PAC5CMnNAv/FPtJ0le+YD2wUV+tZ7n3Bnjj9dBI+deIcHsExCnQkQmZE79cLvfuYXbz3PWyv5coti30MJQhEjA==";
};
};
- "@slack/rtm-api-5.0.3" = {
+ "@slack/rtm-api-5.0.4" = {
name = "_at_slack_slash_rtm-api";
packageName = "@slack/rtm-api";
- version = "5.0.3";
+ version = "5.0.4";
src = fetchurl {
- url = "https://registry.npmjs.org/@slack/rtm-api/-/rtm-api-5.0.3.tgz";
- sha512 = "rzNIFst8iuVYyHdE7e3KSrbAtIA7sfS4Pth9ObKUm5KDemX0zyI7YfAijO1kgr1EMriQkjlpKBhlNq9Y+aQr6g==";
+ url = "https://registry.npmjs.org/@slack/rtm-api/-/rtm-api-5.0.4.tgz";
+ sha512 = "5xXOjLPb4H8a+URLrCjnFXA62Kf4IrvSfp9KtuOxv6vTtFVvxNW4WqhWgAcxwXolD43xRuB/pikxLu76vLDTfw==";
};
};
- "@slack/types-1.5.0" = {
+ "@slack/types-1.6.0" = {
name = "_at_slack_slash_types";
packageName = "@slack/types";
- version = "1.5.0";
+ version = "1.6.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@slack/types/-/types-1.5.0.tgz";
- sha512 = "oCYgatJYxHf9wE3tKXzOLeeTsF0ghX1TIcguNfVmO2V6NDe+cHAzZRglEOmJLdRINDS5gscAgSkeZpDhpKBeUA==";
+ url = "https://registry.npmjs.org/@slack/types/-/types-1.6.0.tgz";
+ sha512 = "SrrAD/ZxDN4szQ35V/mY2TvKSyGsUWP8def1C8NMg9AvdYG0VyaL5f+Dd6jw8STosMFXd3zqjekMowT9LB9/IQ==";
};
};
- "@slack/web-api-5.8.0" = {
+ "@slack/web-api-5.8.1" = {
name = "_at_slack_slash_web-api";
packageName = "@slack/web-api";
- version = "5.8.0";
+ version = "5.8.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@slack/web-api/-/web-api-5.8.0.tgz";
- sha512 = "lUMFM9jtdn+9Q0kHLegf5RjIgQlmb1PGWwWdTsc9mQ8PJu2BogI5ZttG8/tA6r2bX/C4bgXhd0JJ4syUR0AAhQ==";
+ url = "https://registry.npmjs.org/@slack/web-api/-/web-api-5.8.1.tgz";
+ sha512 = "MONzkjWOXV39Dejo8B9WSl/F0dxcVh9wyeW6R0jf6T6BhwN4f24iErYtTh19g+MRhb0oiyeKfnFsJTSKQulfDA==";
};
};
"@types/body-parser-1.19.0" = {
@@ -103,22 +112,22 @@ let
sha512 = "EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==";
};
};
- "@types/express-4.17.3" = {
+ "@types/express-4.17.6" = {
name = "_at_types_slash_express";
packageName = "@types/express";
- version = "4.17.3";
+ version = "4.17.6";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/express/-/express-4.17.3.tgz";
- sha512 = "I8cGRJj3pyOLs/HndoP+25vOqhqWkAZsWMEmq1qXy/b/M3ppufecUwaK2/TVDVxcV61/iSdhykUjQQ2DLSrTdg==";
+ url = "https://registry.npmjs.org/@types/express/-/express-4.17.6.tgz";
+ sha512 = "n/mr9tZI83kd4azlPG5y997C/M4DNABK9yErhFM6hKdym4kkmd9j0vtsJyjFIwfRBxtrxZtAfGZCNRIBMFLK5w==";
};
};
- "@types/express-serve-static-core-4.17.2" = {
+ "@types/express-serve-static-core-4.17.6" = {
name = "_at_types_slash_express-serve-static-core";
packageName = "@types/express-serve-static-core";
- version = "4.17.2";
+ version = "4.17.6";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.2.tgz";
- sha512 = "El9yMpctM6tORDAiBwZVLMcxoTMcqqRO9dVyYcn7ycLWbvR8klrDn8CAOwRfZujZtWD7yS/mshTdz43jMOejbg==";
+ url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.6.tgz";
+ sha512 = "U2oynuRIB17GIbEdvjFrrEACOy7GQkzsX7bPEBz1H41vZYEU4j0fLL97sawmHDwHUXpUQDBMHIyM9vejqP9o1A==";
};
};
"@types/is-stream-1.1.0" = {
@@ -139,13 +148,13 @@ let
sha512 = "FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw==";
};
};
- "@types/mocha-5.2.7" = {
+ "@types/mocha-7.0.2" = {
name = "_at_types_slash_mocha";
packageName = "@types/mocha";
- version = "5.2.7";
+ version = "7.0.2";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/mocha/-/mocha-5.2.7.tgz";
- sha512 = "NYrtPht0wGzhwe9+/idPaBB+TqkY9AhTvOLMkThm0IoEfLaiVQZwBwyJ5puCkO3AUCWrmcoePjp2mbFocKy4SQ==";
+ url = "https://registry.npmjs.org/@types/mocha/-/mocha-7.0.2.tgz";
+ sha512 = "ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w==";
};
};
"@types/nedb-1.8.9" = {
@@ -157,13 +166,13 @@ let
sha512 = "w9Tl3DQCkdT0Ghes+PKhe+3/pZppBXuFFpSCjPJbb2KE3DjYmUpEyCYzjrAYlT9Y1TndnbbnChzkax2h/JorVQ==";
};
};
- "@types/node-12.12.30" = {
+ "@types/node-13.9.3" = {
name = "_at_types_slash_node";
packageName = "@types/node";
- version = "12.12.30";
+ version = "13.9.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/node/-/node-12.12.30.tgz";
- sha512 = "sz9MF/zk6qVr3pAnM0BSQvYIBK44tS75QC5N+VbWSE4DjCV/pJ+UzCW/F+vVnl7TkOPcuwQureKNtSSwjBTaMg==";
+ url = "https://registry.npmjs.org/@types/node/-/node-13.9.3.tgz";
+ sha512 = "28ci34pqk99zkrqa473xlzfms3j6nj4nl2i69ghpbjvw2mh68bd0nd2shb78i09gng4d0fj65l2njrqbdjzmhqix4fvqyiarrlkwnyk";
};
};
"@types/node-emoji-1.8.1" = {
@@ -184,6 +193,15 @@ let
sha512 = "eKAv5Ql6k78dh3ULCsSBxX6bFNuGjTmof5Q/T6PiECDq0Yf8IIn46jCyp3RJvCi8owaEmm3DZH1PEImjBMd/vQ==";
};
};
+ "@types/qs-6.9.2" = {
+ name = "_at_types_slash_qs";
+ packageName = "@types/qs";
+ version = "6.9.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.2.tgz";
+ sha512 = "a9bDi4Z3zCZf4Lv1X/vwnvbbDYSNz59h3i3KdyuYYN+YrLjSeJD0dnphdULDfySvUv6Exy/O0K6wX/kQpnPQ+A==";
+ };
+ };
"@types/randomstring-1.1.6" = {
name = "_at_types_slash_randomstring";
packageName = "@types/randomstring";
@@ -238,22 +256,22 @@ let
sha512 = "oprSwp094zOglVrXdlo/4bAHtKTAxX6VT8FOZlBKrmyLbNvE1zxZyJ6yikMVtHIvwP45+ZQGJn+FdXGKTozq0g==";
};
};
- "@types/tough-cookie-2.3.6" = {
+ "@types/tough-cookie-4.0.0" = {
name = "_at_types_slash_tough-cookie";
packageName = "@types/tough-cookie";
- version = "2.3.6";
+ version = "4.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.6.tgz";
- sha512 = "wHNBMnkoEBiRAd3s8KTKwIuO9biFtTf0LehITzBhSco+HQI0xkXZbLOD55SW3Aqw3oUkHstkm5SPv58yaAdFPQ==";
+ url = "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.0.tgz";
+ sha512 = "I99sngh224D0M7XgW1s120zxCt3VYQ3IQsuw3P3jbq5GG4yc79+ZjyKznyOGIQrflfylLgcfekeZW/vk0yng6A==";
};
};
- "@types/uuid-3.4.8" = {
+ "@types/uuid-7.0.3" = {
name = "_at_types_slash_uuid";
packageName = "@types/uuid";
- version = "3.4.8";
+ version = "7.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.8.tgz";
- sha512 = "zHWce3allXWSmRx6/AGXKCtSOA7JjeWd2L3t4aHfysNk8mouQnWCocveaT7a4IEIlPVHp81jzlnknqTgCjCLXA==";
+ url = "https://registry.npmjs.org/@types/uuid/-/uuid-7.0.3.tgz";
+ sha512 = "PUdqTZVrNYTNcIhLHkiaYzoOIaUi5LFg/XLerAdgvwQrUCx+oSbtoBze1AMyvYbcwzUSNC+Isl58SM4Sm/6COw==";
};
};
"@types/ws-5.1.2" = {
@@ -311,13 +329,13 @@ let
sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==";
};
};
- "ajv-6.12.0" = {
+ "ajv-6.12.2" = {
name = "ajv";
packageName = "ajv";
- version = "6.12.0";
+ version = "6.12.2";
src = fetchurl {
- url = "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz";
- sha512 = "D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==";
+ url = "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz";
+ sha512 = "k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==";
};
};
"another-json-0.2.0" = {
@@ -365,6 +383,15 @@ let
sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==";
};
};
+ "anymatch-3.1.1" = {
+ name = "anymatch";
+ packageName = "anymatch";
+ version = "3.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz";
+ sha512 = "mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==";
+ };
+ };
"arg-4.1.3" = {
name = "arg";
packageName = "arg";
@@ -410,13 +437,13 @@ let
sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==";
};
};
- "assert-options-0.6.0" = {
+ "assert-options-0.6.2" = {
name = "assert-options";
packageName = "assert-options";
- version = "0.6.0";
+ version = "0.6.2";
src = fetchurl {
- url = "https://registry.npmjs.org/assert-options/-/assert-options-0.6.0.tgz";
- sha512 = "xmBFb5sY0AO8SNihIfavR6uMhOyzq6D7RoFKJxxAditMQc876szBBQ9RQVwLi6Bm3zUoG0nexZK11Gy5TBX69A==";
+ url = "https://registry.npmjs.org/assert-options/-/assert-options-0.6.2.tgz";
+ sha512 = "KP9S549XptFAPGYmLRnIjQBL4/Ry8Jx5YNLQZ/l+eejqbTidBMnw4uZSAsUrzBq/lgyqDYqxcTF7cOxZb9gyEw==";
};
};
"assert-plus-1.0.0" = {
@@ -545,6 +572,15 @@ let
sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e";
};
};
+ "binary-extensions-2.0.0" = {
+ name = "binary-extensions";
+ packageName = "binary-extensions";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz";
+ sha512 = "Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==";
+ };
+ };
"binary-search-tree-0.2.5" = {
name = "binary-search-tree";
packageName = "binary-search-tree";
@@ -599,6 +635,15 @@ let
sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==";
};
};
+ "braces-3.0.2" = {
+ name = "braces";
+ packageName = "braces";
+ version = "3.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz";
+ sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==";
+ };
+ };
"browser-request-0.3.3" = {
name = "browser-request";
packageName = "browser-request";
@@ -707,6 +752,15 @@ let
sha1 = "574d312edd88bb5dd8912e9286dd6c0aed4aac82";
};
};
+ "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==";
+ };
+ };
"cliui-5.0.0" = {
name = "cliui";
packageName = "cliui";
@@ -950,6 +1004,15 @@ let
sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9";
};
};
+ "depd-2.0.0" = {
+ name = "depd";
+ packageName = "depd";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz";
+ sha512 = "g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==";
+ };
+ };
"destroy-1.0.4" = {
name = "destroy";
packageName = "destroy";
@@ -1040,13 +1103,13 @@ let
sha512 = "bHz59NlBbtS0NhftmR8+ExBEekE7br0e01jw+kk0NDro7TtZzBYZ5ScGPs3OmwnpyfHTHOtr1Y6uedCdrIldtg==";
};
};
- "es-abstract-1.17.4" = {
+ "es-abstract-1.17.5" = {
name = "es-abstract";
packageName = "es-abstract";
- version = "1.17.4";
+ version = "1.17.5";
src = fetchurl {
- url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz";
- sha512 = "Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==";
+ url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz";
+ sha512 = "BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==";
};
};
"es-to-primitive-1.2.1" = {
@@ -1094,15 +1157,6 @@ let
sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==";
};
};
- "esutils-2.0.3" = {
- name = "esutils";
- packageName = "esutils";
- version = "2.0.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz";
- sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==";
- };
- };
"etag-1.8.1" = {
name = "etag";
packageName = "etag";
@@ -1202,6 +1256,15 @@ let
sha512 = "W3aa3QJEc8BS2MmdVpQiYLKHj3ijpto1gMDlsgCRSKfIUe6MwkcpODGPQ3vZfb0XvCeCqlu9CBQTN7oQri2TZQ==";
};
};
+ "fill-range-7.0.1" = {
+ name = "fill-range";
+ packageName = "fill-range";
+ version = "7.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz";
+ sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==";
+ };
+ };
"finalhandler-1.1.2" = {
name = "finalhandler";
packageName = "finalhandler";
@@ -1301,6 +1364,15 @@ let
sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
};
};
+ "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==";
+ };
+ };
"function-bind-1.1.1" = {
name = "function-bind";
packageName = "function-bind";
@@ -1364,6 +1436,15 @@ let
sha512 = "vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==";
};
};
+ "glob-parent-5.1.1" = {
+ name = "glob-parent";
+ packageName = "glob-parent";
+ version = "5.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz";
+ sha512 = "FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==";
+ };
+ };
"growl-1.10.5" = {
name = "growl";
packageName = "growl";
@@ -1499,6 +1580,15 @@ let
sha512 = "eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==";
};
};
+ "is-binary-path-2.1.0" = {
+ name = "is-binary-path";
+ packageName = "is-binary-path";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz";
+ sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==";
+ };
+ };
"is-buffer-2.0.4" = {
name = "is-buffer";
packageName = "is-buffer";
@@ -1526,6 +1616,15 @@ let
sha512 = "USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==";
};
};
+ "is-extglob-2.1.1" = {
+ name = "is-extglob";
+ packageName = "is-extglob";
+ version = "2.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz";
+ sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2";
+ };
+ };
"is-fullwidth-code-point-2.0.0" = {
name = "is-fullwidth-code-point";
packageName = "is-fullwidth-code-point";
@@ -1535,6 +1634,15 @@ let
sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f";
};
};
+ "is-glob-4.0.1" = {
+ name = "is-glob";
+ packageName = "is-glob";
+ version = "4.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz";
+ sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==";
+ };
+ };
"is-my-ip-valid-1.0.0" = {
name = "is-my-ip-valid";
packageName = "is-my-ip-valid";
@@ -1553,6 +1661,15 @@ let
sha512 = "XTHBZSIIxNsIsZXg7XB5l8z/OBFosl1Wao4tXLpeC7eKU4Vm/kdop2azkPqULwnfGQjmeDIyey9g7afMMtdWAA==";
};
};
+ "is-number-7.0.0" = {
+ name = "is-number";
+ packageName = "is-number";
+ version = "7.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz";
+ sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==";
+ };
+ };
"is-property-1.0.2" = {
name = "is-property";
packageName = "is-property";
@@ -1751,13 +1868,13 @@ let
sha1 = "24c4bfcd6b2fba38bfd0594db1179d8e9b656561";
};
};
- "log-symbols-2.2.0" = {
+ "log-symbols-3.0.0" = {
name = "log-symbols";
packageName = "log-symbols";
- version = "2.2.0";
+ version = "3.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz";
- sha512 = "VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==";
+ url = "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz";
+ sha512 = "dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==";
};
};
"logform-1.10.0" = {
@@ -1778,13 +1895,13 @@ let
sha512 = "+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ==";
};
};
- "loglevel-1.6.7" = {
+ "loglevel-1.6.8" = {
name = "loglevel";
packageName = "loglevel";
- version = "1.6.7";
+ version = "1.6.8";
src = fetchurl {
- url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.7.tgz";
- sha512 = "cY2eLFrQSAfVPhCgH1s7JI73tMbg9YC3v3+ZHVW67sBS7UxWzNEk/ZBbSfLykBWHp33dqqtOv82gjhKEi81T/A==";
+ url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.8.tgz";
+ sha512 = "bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA==";
};
};
"make-error-1.3.6" = {
@@ -1796,15 +1913,6 @@ let
sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==";
};
};
- "manakin-0.5.2" = {
- name = "manakin";
- packageName = "manakin";
- version = "0.5.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/manakin/-/manakin-0.5.2.tgz";
- sha512 = "pfDSB7QYoVg0Io4KMV9hhPoXpj6p0uBscgtyUSKCOFZe8bqgbpStfgnKIbF/ulnr6U3ICu4OqdyxAqBgOhZwBQ==";
- };
- };
"matrix-appservice-0.4.1" = {
name = "matrix-appservice";
packageName = "matrix-appservice";
@@ -1814,13 +1922,13 @@ let
sha512 = "mxHr9XDOvN/p6OFrfb4kkcEjCPftnXNzMS8Lg9Cz/pDy1arfRWq11vl9pL9bjzBaAouBGLpW1JzmCR2MsW+VKA==";
};
};
- "matrix-appservice-bridge-1.11.1" = {
+ "matrix-appservice-bridge-1.12.2" = {
name = "matrix-appservice-bridge";
packageName = "matrix-appservice-bridge";
- version = "1.11.1";
+ version = "1.12.2";
src = fetchurl {
- url = "https://registry.npmjs.org/matrix-appservice-bridge/-/matrix-appservice-bridge-1.11.1.tgz";
- sha512 = "xrtjxScBIx33HRkiK/5G6wkUxZ9jxF9GqTiKzM/Fn7CgMZoHVDIms3sTc7ybZKA6RHAqH68bg4Eg4JbGCtUrhw==";
+ url = "https://registry.npmjs.org/matrix-appservice-bridge/-/matrix-appservice-bridge-1.12.2.tgz";
+ sha512 = "cGD31MLi4ARnx4DIyJndIhHIsNjaWUoBMXeAbnHhvkwkdVgZ9pgA6IKKmcBCFfsNX1r/I04KjcjlKpVdmZu4VQ==";
};
};
"matrix-js-sdk-2.4.6" = {
@@ -1868,22 +1976,22 @@ let
sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==";
};
};
- "mime-db-1.43.0" = {
+ "mime-db-1.44.0" = {
name = "mime-db";
packageName = "mime-db";
- version = "1.43.0";
+ version = "1.44.0";
src = fetchurl {
- url = "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz";
- sha512 = "+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==";
+ url = "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz";
+ sha512 = "/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==";
};
};
- "mime-types-2.1.26" = {
+ "mime-types-2.1.27" = {
name = "mime-types";
packageName = "mime-types";
- version = "2.1.26";
+ version = "2.1.27";
src = fetchurl {
- url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz";
- sha512 = "01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==";
+ url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz";
+ sha512 = "JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==";
};
};
"minimatch-3.0.4" = {
@@ -1895,15 +2003,6 @@ let
sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==";
};
};
- "minimist-0.0.8" = {
- name = "minimist";
- packageName = "minimist";
- version = "0.0.8";
- src = fetchurl {
- url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
- sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
- };
- };
"minimist-1.2.5" = {
name = "minimist";
packageName = "minimist";
@@ -1913,49 +2012,40 @@ let
sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==";
};
};
- "mkdirp-0.5.1" = {
+ "mkdirp-0.5.5" = {
name = "mkdirp";
packageName = "mkdirp";
- version = "0.5.1";
+ version = "0.5.5";
src = fetchurl {
- url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
- sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
+ url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz";
+ sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==";
};
};
- "mkdirp-0.5.3" = {
- name = "mkdirp";
- packageName = "mkdirp";
- version = "0.5.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz";
- sha512 = "P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg==";
- };
- };
- "mocha-6.2.2" = {
+ "mocha-7.1.2" = {
name = "mocha";
packageName = "mocha";
- version = "6.2.2";
+ version = "7.1.2";
src = fetchurl {
- url = "https://registry.npmjs.org/mocha/-/mocha-6.2.2.tgz";
- sha512 = "FgDS9Re79yU1xz5d+C4rv1G7QagNGHZ+iXF81hO8zY35YZZcLEsJVfFolfsqKFWunATEvNzMK0r/CwWd/szO9A==";
+ url = "https://registry.npmjs.org/mocha/-/mocha-7.1.2.tgz";
+ sha512 = "o96kdRKMKI3E8U0bjnfqW4QMk12MwZ4mhdBTf+B5a1q9+aq2HRnj+3ZdJu0B/ZhJeK78MgYuv6L8d/rA5AeBJA==";
};
};
- "moment-2.24.0" = {
+ "moment-2.25.3" = {
name = "moment";
packageName = "moment";
- version = "2.24.0";
+ version = "2.25.3";
src = fetchurl {
- url = "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz";
- sha512 = "bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==";
+ url = "https://registry.npmjs.org/moment/-/moment-2.25.3.tgz";
+ sha512 = "PuYv0PHxZvzc15Sp8ybUCoQ+xpyPWvjOuK72a5ovzp2LI32rJXOiIfyoFoYvG3s6EwwrdkMyWuRiEHSZRLJNdg==";
};
};
- "morgan-1.9.1" = {
+ "morgan-1.10.0" = {
name = "morgan";
packageName = "morgan";
- version = "1.9.1";
+ version = "1.10.0";
src = fetchurl {
- url = "https://registry.npmjs.org/morgan/-/morgan-1.9.1.tgz";
- sha512 = "HQStPIV4y3afTiCYVxirakhlCfGkI161c76kKFca7Fk1JusM//Qeo1ej2XaMniiNeaZklMVrh3vTtIzpzwbpmA==";
+ url = "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz";
+ sha512 = "AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==";
};
};
"ms-2.0.0" = {
@@ -2012,13 +2102,13 @@ let
sha512 = "Yt3384If5H6BYGVHiHwTL+99OzJKHhgp82S8/dktEK73T26BazdgZ4JZh92xSVtGNJvz9UbXdNAc5hcrXV42vw==";
};
};
- "node-environment-flags-1.0.5" = {
+ "node-environment-flags-1.0.6" = {
name = "node-environment-flags";
packageName = "node-environment-flags";
- version = "1.0.5";
+ version = "1.0.6";
src = fetchurl {
- url = "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.5.tgz";
- sha512 = "VNYPRfGfmZLx0Ye20jWzHUjyTW/c+6Wq+iLhDzUI4XmhrDd9l/FozXV3F2xOaXjvp0co0+v1YSR3CMP6g+VvLQ==";
+ url = "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz";
+ sha512 = "5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw==";
};
};
"nopt-3.0.6" = {
@@ -2030,6 +2120,15 @@ let
sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9";
};
};
+ "normalize-path-3.0.0" = {
+ name = "normalize-path";
+ packageName = "normalize-path";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz";
+ sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==";
+ };
+ };
"oauth-sign-0.9.0" = {
name = "oauth-sign";
packageName = "oauth-sign";
@@ -2138,13 +2237,13 @@ let
sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae";
};
};
- "p-limit-2.2.2" = {
+ "p-limit-2.3.0" = {
name = "p-limit";
packageName = "p-limit";
- version = "2.2.2";
+ version = "2.3.0";
src = fetchurl {
- url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz";
- sha512 = "WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==";
+ url = "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz";
+ sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==";
};
};
"p-locate-3.0.0" = {
@@ -2165,13 +2264,13 @@ let
sha512 = "n8/y+yDJwBjoLQe1GSJbbaYQLTI7QHNZI2+rpmCDbe++WLf9HC3gf6iqj5yfPAV71W4UF3ql5W1+UBPXoXTxng==";
};
};
- "p-queue-6.3.0" = {
+ "p-queue-6.4.0" = {
name = "p-queue";
packageName = "p-queue";
- version = "6.3.0";
+ version = "6.4.0";
src = fetchurl {
- url = "https://registry.npmjs.org/p-queue/-/p-queue-6.3.0.tgz";
- sha512 = "fg5dJlFpd5+3CgG3/0ogpVZUeJbjiyXFg0nu53hrOYsybqSiDyxyOpad0Rm6tAiGjgztAwkyvhlYHC53OiAJOA==";
+ url = "https://registry.npmjs.org/p-queue/-/p-queue-6.4.0.tgz";
+ sha512 = "X7ddxxiQ+bLR/CUt3/BVKrGcJDNxBr0pEEFKHHB6vTPWNUhgDv36GpIH18RmGM3YGPpBT+JWGjDDqsVGuF0ERw==";
};
};
"p-retry-4.2.0" = {
@@ -2273,13 +2372,13 @@ let
sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b";
};
};
- "pg-7.12.1" = {
+ "pg-8.0.3" = {
name = "pg";
packageName = "pg";
- version = "7.12.1";
+ version = "8.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/pg/-/pg-7.12.1.tgz";
- sha512 = "l1UuyfEvoswYfcUe6k+JaxiN+5vkOgYcVSbSuw3FvdLqDbaoa2RJo1zfJKfPsSYPFVERd4GHvX3s2PjG1asSDA==";
+ url = "https://registry.npmjs.org/pg/-/pg-8.0.3.tgz";
+ sha512 = "fvcNXn4o/iq4jKq15Ix/e58q3jPSmzOp6/8C3CaHoSR/bsxdg+1FXfDRePdtE/zBb3++TytvOrS1hNef3WC/Kg==";
};
};
"pg-connection-string-0.1.3" = {
@@ -2300,31 +2399,40 @@ let
sha512 = "WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==";
};
};
- "pg-minify-1.5.1" = {
+ "pg-minify-1.5.2" = {
name = "pg-minify";
packageName = "pg-minify";
- version = "1.5.1";
+ version = "1.5.2";
src = fetchurl {
- url = "https://registry.npmjs.org/pg-minify/-/pg-minify-1.5.1.tgz";
- sha512 = "nqUTo8y9T0VhiJoWC0sK0+2S8hYDiu7CdH0Z9ijPi2iikiQ44mfcAFxEJxfvF8H3h/bDBvXthtOQPIB3pLWIow==";
+ url = "https://registry.npmjs.org/pg-minify/-/pg-minify-1.5.2.tgz";
+ sha512 = "uZn/gXkGmO5JBdopxNLSpFMS1lXr+KJqynI8Di1Qyr8ZVXt67ruh+XNfzLMVdLzYv+MQRdNYQdVwWPSs0qM7xQ==";
};
};
- "pg-pool-2.0.10" = {
+ "pg-pool-3.1.1" = {
name = "pg-pool";
packageName = "pg-pool";
- version = "2.0.10";
+ version = "3.1.1";
src = fetchurl {
- url = "https://registry.npmjs.org/pg-pool/-/pg-pool-2.0.10.tgz";
- sha512 = "qdwzY92bHf3nwzIUcj+zJ0Qo5lpG/YxchahxIN8+ZVmXqkahKXsnl2aiJPHLYN9o5mB/leG+Xh6XKxtP7e0sjg==";
+ url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.1.1.tgz";
+ sha512 = "kYH6S0mcZF1TPg1F9boFee2JlCSm2oqnlR2Mz2Wgn1psQbEBNVeNTJCw2wCK48QsctwvGUzbxLMg/lYV6hL/3A==";
};
};
- "pg-promise-9.3.6" = {
+ "pg-promise-10.5.3" = {
name = "pg-promise";
packageName = "pg-promise";
- version = "9.3.6";
+ version = "10.5.3";
src = fetchurl {
- url = "https://registry.npmjs.org/pg-promise/-/pg-promise-9.3.6.tgz";
- sha512 = "b64UalKAkUImn01z7LeG2NtTTsp0TYfqMzo1vXjO2bDAshL+kXJ2HvCyHstJ4Nj8hLeqtCe0Tar5TbB4QGUHfw==";
+ url = "https://registry.npmjs.org/pg-promise/-/pg-promise-10.5.3.tgz";
+ sha512 = "cfHgFpcqOc0IIRDABre//k1eda7s94Wys67P9r3q590nmvO0AzZucqWTVmgRUzNTIrDChUwY4hVOMBTIsU/ZiA==";
+ };
+ };
+ "pg-protocol-1.2.2" = {
+ name = "pg-protocol";
+ packageName = "pg-protocol";
+ version = "1.2.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.2.2.tgz";
+ sha512 = "r8hGxHOk3ccMjjmhFJ/QOSVW5A+PP84TeRlEwB/cQ9Zu+bvtZg8Z59Cx3AMfVQc9S0Z+EG+HKhicF1W1GN5Eqg==";
};
};
"pg-types-2.2.0" = {
@@ -2345,6 +2453,15 @@ let
sha1 = "2a7bb41b6065b67907e91da1b07c1847c877b306";
};
};
+ "picomatch-2.2.2" = {
+ name = "picomatch";
+ packageName = "picomatch";
+ version = "2.2.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz";
+ sha512 = "q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==";
+ };
+ };
"postgres-array-2.0.0" = {
name = "postgres-array";
packageName = "postgres-array";
@@ -2363,13 +2480,13 @@ let
sha1 = "027b533c0aa890e26d172d47cf9ccecc521acd35";
};
};
- "postgres-date-1.0.4" = {
+ "postgres-date-1.0.5" = {
name = "postgres-date";
packageName = "postgres-date";
- version = "1.0.4";
+ version = "1.0.5";
src = fetchurl {
- url = "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.4.tgz";
- sha512 = "bESRvKVuTrjoBluEcpv2346+6kgB7UlnqWZsnbnCccTNq/pqfj1j6oBaN5+b/NrDXepYUT/HKadqv3iS9lJuVA==";
+ url = "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.5.tgz";
+ sha512 = "pdau6GRPERdAYUQwkBnGKxEfPyhVZXG/JiS44iZWiNdSOWE09N2lUgN6yshuq6fVSon4Pm0VMXd1srUUkLe9iA==";
};
};
"postgres-interval-1.2.0" = {
@@ -2408,13 +2525,13 @@ let
sha512 = "dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==";
};
};
- "psl-1.7.0" = {
+ "psl-1.8.0" = {
name = "psl";
packageName = "psl";
- version = "1.7.0";
+ version = "1.8.0";
src = fetchurl {
- url = "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz";
- sha512 = "5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ==";
+ url = "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz";
+ sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==";
};
};
"punycode-2.1.1" = {
@@ -2444,13 +2561,13 @@ let
sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==";
};
};
- "quick-lru-4.0.1" = {
+ "quick-lru-5.1.0" = {
name = "quick-lru";
packageName = "quick-lru";
- version = "4.0.1";
+ version = "5.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz";
- sha512 = "ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==";
+ url = "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.0.tgz";
+ sha512 = "WjAKQ9ORzvqjLijJXiXWqc3Gcs1ivoxCj6KJmEjoWBE6OtHwuaDLSAUqGHALUiid7A1KqGqsSHZs8prxF5xxAQ==";
};
};
"randomstring-1.1.5" = {
@@ -2498,6 +2615,15 @@ let
sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==";
};
};
+ "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==";
+ };
+ };
"regenerator-runtime-0.11.1" = {
name = "regenerator-runtime";
packageName = "regenerator-runtime";
@@ -2552,13 +2678,13 @@ let
sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==";
};
};
- "resolve-1.15.1" = {
+ "resolve-1.17.0" = {
name = "resolve";
packageName = "resolve";
- version = "1.15.1";
+ version = "1.17.0";
src = fetchurl {
- url = "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz";
- sha512 = "84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==";
+ url = "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz";
+ sha512 = "ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==";
};
};
"retry-0.12.0" = {
@@ -2678,22 +2804,22 @@ let
sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==";
};
};
- "source-map-support-0.5.16" = {
+ "source-map-support-0.5.19" = {
name = "source-map-support";
packageName = "source-map-support";
- version = "0.5.16";
+ version = "0.5.19";
src = fetchurl {
- url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz";
- sha512 = "efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==";
+ url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz";
+ sha512 = "Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==";
};
};
- "spex-3.0.0" = {
+ "spex-3.0.1" = {
name = "spex";
packageName = "spex";
- version = "3.0.0";
+ version = "3.0.1";
src = fetchurl {
- url = "https://registry.npmjs.org/spex/-/spex-3.0.0.tgz";
- sha512 = "JoMfgbrJcEPn53JCLkSNH1o7fZ9rzkb24UKEt5LTcsp0YsaN+yxtb5MEmibbMRltj9CdXDNGitPrYi11JY2hog==";
+ url = "https://registry.npmjs.org/spex/-/spex-3.0.1.tgz";
+ sha512 = "priWZUrXBmVPHTOmtUeS7gZzCOUwRK87OHJw5K8bTC6MLOq93mQocx+vWccNyKPT2EY+goZvKGguGn2lx8TBDA==";
};
};
"split-1.0.1" = {
@@ -2768,22 +2894,40 @@ let
sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==";
};
};
- "string.prototype.trimleft-2.1.1" = {
- name = "string.prototype.trimleft";
- packageName = "string.prototype.trimleft";
- version = "2.1.1";
+ "string.prototype.trimend-1.0.1" = {
+ name = "string.prototype.trimend";
+ packageName = "string.prototype.trimend";
+ version = "1.0.1";
src = fetchurl {
- url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz";
- sha512 = "iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==";
+ url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz";
+ sha512 = "LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==";
};
};
- "string.prototype.trimright-2.1.1" = {
+ "string.prototype.trimleft-2.1.2" = {
+ name = "string.prototype.trimleft";
+ packageName = "string.prototype.trimleft";
+ version = "2.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz";
+ sha512 = "gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==";
+ };
+ };
+ "string.prototype.trimright-2.1.2" = {
name = "string.prototype.trimright";
packageName = "string.prototype.trimright";
- version = "2.1.1";
+ version = "2.1.2";
src = fetchurl {
- url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz";
- sha512 = "qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==";
+ url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz";
+ sha512 = "ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==";
+ };
+ };
+ "string.prototype.trimstart-1.0.1" = {
+ name = "string.prototype.trimstart";
+ packageName = "string.prototype.trimstart";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz";
+ sha512 = "XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==";
};
};
"string_decoder-1.1.1" = {
@@ -2876,6 +3020,15 @@ let
sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5";
};
};
+ "to-regex-range-5.0.1" = {
+ name = "to-regex-range";
+ packageName = "to-regex-range";
+ version = "5.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz";
+ sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==";
+ };
+ };
"toidentifier-1.0.0" = {
name = "toidentifier";
packageName = "toidentifier";
@@ -2903,31 +3056,31 @@ let
sha512 = "XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==";
};
};
- "ts-node-8.7.0" = {
+ "ts-node-8.10.1" = {
name = "ts-node";
packageName = "ts-node";
- version = "8.7.0";
+ version = "8.10.1";
src = fetchurl {
- url = "https://registry.npmjs.org/ts-node/-/ts-node-8.7.0.tgz";
- sha512 = "s659CsHrsxaRVDEleuOkGvbsA0rWHtszUNEt1r0CgAFN5ZZTQtDzpsluS7W5pOGJIa1xZE8R/zK4dEs+ldFezg==";
+ url = "https://registry.npmjs.org/ts-node/-/ts-node-8.10.1.tgz";
+ sha512 = "bdNz1L4ekHiJul6SHtZWs1ujEKERJnHs4HxN7rjTyyVOFf3HaJ6sLqe6aPG62XTzAB/63pKRh5jTSWL0D7bsvw==";
};
};
- "tslib-1.11.1" = {
+ "tslib-1.11.2" = {
name = "tslib";
packageName = "tslib";
- version = "1.11.1";
+ version = "1.11.2";
src = fetchurl {
- url = "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz";
- sha512 = "aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==";
+ url = "https://registry.npmjs.org/tslib/-/tslib-1.11.2.tgz";
+ sha512 = "tTSkux6IGPnUGUd1XAZHcpu85MOkIl5zX49pO+jfsie3eP0B6pyhOlLXm3cAC6T7s+euSDDUUV+Acop5WmtkVg==";
};
};
- "tslint-5.20.1" = {
+ "tslint-6.1.2" = {
name = "tslint";
packageName = "tslint";
- version = "5.20.1";
+ version = "6.1.2";
src = fetchurl {
- url = "https://registry.npmjs.org/tslint/-/tslint-5.20.1.tgz";
- sha512 = "EcMxhzCFt8k+/UP5r8waCf/lzmeSyVlqxqMEDQE7rWYiQky8KpIBz1JAoYXfROHrPZ1XXd43q8yQnULOLiBRQg==";
+ url = "https://registry.npmjs.org/tslint/-/tslint-6.1.2.tgz";
+ sha512 = "UyNrLdK3E0fQG/xWNqAFAC5ugtFyPO4JJR1KyyfQAyzR8W0fTRrC91A8Wej4BntFzcvETdCSDa/4PnNYJQLYiA==";
};
};
"tsutils-2.29.0" = {
@@ -3047,6 +3200,15 @@ let
sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==";
};
};
+ "uuid-7.0.3" = {
+ name = "uuid";
+ packageName = "uuid";
+ version = "7.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz";
+ sha512 = "DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==";
+ };
+ };
"vary-1.1.2" = {
name = "vary";
packageName = "vary";
@@ -3173,15 +3335,6 @@ let
sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==";
};
};
- "yargs-13.3.0" = {
- name = "yargs";
- packageName = "yargs";
- version = "13.3.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz";
- sha512 = "2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==";
- };
- };
"yargs-13.3.2" = {
name = "yargs";
packageName = "yargs";
@@ -3191,15 +3344,6 @@ let
sha512 = "AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==";
};
};
- "yargs-parser-13.1.1" = {
- name = "yargs-parser";
- packageName = "yargs-parser";
- version = "13.1.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz";
- sha512 = "oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==";
- };
- };
"yargs-parser-13.1.2" = {
name = "yargs-parser";
packageName = "yargs-parser";
@@ -3230,26 +3374,27 @@ let
};
in
{
- "matrix-appservice-slack-git+https://github.com/matrix-org/matrix-appservice-slack.git#1.1.0" = nodeEnv.buildNodePackage {
+ "matrix-appservice-slack-git+https://github.com/matrix-org/matrix-appservice-slack.git#1.2.0" = nodeEnv.buildNodePackage {
name = "matrix-appservice-slack";
packageName = "matrix-appservice-slack";
- version = "1.1.0";
+ version = "1.2.0";
src = fetchgit {
url = "https://github.com/matrix-org/matrix-appservice-slack.git";
- rev = "62b2a05c99bbefb0b268adc8b0fedfe91a4f76bd";
- sha256 = "64e930cecb11de9df3cb03367a22ff7dc78d44b7f992d9379fae8b692bf35157";
+ rev = "2967f02484a3cdb386336b328438ec65fa8be382";
+ sha256 = "bc7f87744046561d8dcd5b75d2469950f11ceac9d6d69a49eac4e05354f34834";
};
dependencies = [
sources."@babel/code-frame-7.8.3"
- sources."@babel/highlight-7.8.3"
+ sources."@babel/helper-validator-identifier-7.9.5"
+ sources."@babel/highlight-7.9.0"
sources."@slack/logger-1.1.1"
- (sources."@slack/rtm-api-5.0.3" // {
+ (sources."@slack/rtm-api-5.0.4" // {
dependencies = [
sources."p-queue-2.4.2"
];
})
- sources."@slack/types-1.5.0"
- (sources."@slack/web-api-5.8.0" // {
+ sources."@slack/types-1.6.0"
+ (sources."@slack/web-api-5.8.1" // {
dependencies = [
sources."p-queue-2.4.2"
];
@@ -3259,40 +3404,42 @@ in
sources."@types/chai-4.2.11"
sources."@types/connect-3.4.33"
sources."@types/events-3.0.0"
- sources."@types/express-4.17.3"
- sources."@types/express-serve-static-core-4.17.2"
+ sources."@types/express-4.17.6"
+ sources."@types/express-serve-static-core-4.17.6"
sources."@types/is-stream-1.1.0"
sources."@types/mime-2.0.1"
- sources."@types/mocha-5.2.7"
+ sources."@types/mocha-7.0.2"
sources."@types/nedb-1.8.9"
- sources."@types/node-12.12.30"
+ sources."@types/node-13.9.3"
sources."@types/node-emoji-1.8.1"
sources."@types/p-queue-2.3.2"
+ sources."@types/qs-6.9.2"
sources."@types/randomstring-1.1.6"
sources."@types/range-parser-1.2.3"
sources."@types/request-2.48.4"
sources."@types/request-promise-native-1.0.17"
sources."@types/retry-0.12.0"
sources."@types/serve-static-1.13.3"
- sources."@types/tough-cookie-2.3.6"
- sources."@types/uuid-3.4.8"
+ sources."@types/tough-cookie-4.0.0"
+ sources."@types/uuid-7.0.3"
sources."@types/ws-5.1.2"
sources."@types/yargs-13.0.8"
sources."@types/yargs-parser-13.1.0"
sources."Slackdown-git://github.com/Half-Shot/slackdown#efd8934a3d9c3bf0064c0b217c5cf6b62ee697e4"
sources."abbrev-1.1.1"
sources."accepts-1.3.7"
- sources."ajv-6.12.0"
+ sources."ajv-6.12.2"
sources."another-json-0.2.0"
sources."ansi-colors-3.2.3"
sources."ansi-regex-4.1.0"
sources."ansi-styles-3.2.1"
+ sources."anymatch-3.1.1"
sources."arg-4.1.3"
sources."argparse-1.0.10"
sources."array-flatten-1.1.1"
sources."array-uniq-1.0.2"
sources."asn1-0.2.4"
- sources."assert-options-0.6.0"
+ sources."assert-options-0.6.2"
sources."assert-plus-1.0.0"
sources."assertion-error-1.1.0"
sources."async-0.2.10"
@@ -3306,6 +3453,7 @@ in
sources."base-x-3.0.8"
sources."basic-auth-2.0.1"
sources."bcrypt-pbkdf-1.0.2"
+ sources."binary-extensions-2.0.0"
sources."binary-search-tree-0.2.5"
sources."bintrees-1.0.1"
sources."bluebird-2.11.0"
@@ -3315,6 +3463,7 @@ in
];
})
sources."brace-expansion-1.1.11"
+ sources."braces-3.0.2"
sources."browser-request-0.3.3"
sources."browser-stdout-1.3.1"
sources."bs58-4.0.1"
@@ -3331,6 +3480,7 @@ in
];
})
sources."check-error-1.0.2"
+ sources."chokidar-3.3.0"
sources."cliui-5.0.0"
sources."color-3.0.0"
sources."color-convert-1.9.3"
@@ -3365,12 +3515,11 @@ in
sources."enabled-1.0.2"
sources."encodeurl-1.0.2"
sources."env-variable-0.0.6"
- sources."es-abstract-1.17.4"
+ sources."es-abstract-1.17.5"
sources."es-to-primitive-1.2.1"
sources."escape-html-1.0.3"
sources."escape-string-regexp-2.0.0"
sources."esprima-4.0.1"
- sources."esutils-2.0.3"
sources."etag-1.8.1"
sources."eventemitter3-3.1.2"
(sources."express-4.17.1" // {
@@ -3385,6 +3534,7 @@ in
sources."fast-safe-stringify-2.0.7"
sources."fecha-2.3.3"
sources."file-stream-rotator-0.4.1"
+ sources."fill-range-7.0.1"
(sources."finalhandler-1.1.2" // {
dependencies = [
sources."debug-2.6.9"
@@ -3399,6 +3549,7 @@ in
sources."forwarded-0.1.2"
sources."fresh-0.5.2"
sources."fs.realpath-1.0.0"
+ sources."fsevents-2.1.3"
sources."function-bind-1.1.1"
sources."generate-function-2.3.1"
sources."generate-object-property-1.2.0"
@@ -3406,6 +3557,7 @@ in
sources."get-func-name-2.0.0"
sources."getpass-0.1.7"
sources."glob-7.1.3"
+ sources."glob-parent-5.1.1"
sources."growl-1.10.5"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
@@ -3421,12 +3573,16 @@ in
sources."inherits-2.0.3"
sources."ipaddr.js-1.9.1"
sources."is-arrayish-0.3.2"
+ sources."is-binary-path-2.1.0"
sources."is-buffer-2.0.4"
sources."is-callable-1.1.5"
sources."is-date-object-1.0.2"
+ sources."is-extglob-2.1.1"
sources."is-fullwidth-code-point-2.0.0"
+ sources."is-glob-4.0.1"
sources."is-my-ip-valid-1.0.0"
sources."is-my-json-valid-2.20.0"
+ sources."is-number-7.0.0"
sources."is-property-1.0.2"
sources."is-regex-1.0.5"
sources."is-stream-1.1.0"
@@ -3449,17 +3605,16 @@ in
sources."locate-path-3.0.0"
sources."lodash-4.17.15"
sources."lodash.toarray-4.4.0"
- sources."log-symbols-2.2.0"
+ sources."log-symbols-3.0.0"
(sources."logform-2.1.2" // {
dependencies = [
sources."ms-2.1.2"
];
})
- sources."loglevel-1.6.7"
+ sources."loglevel-1.6.8"
sources."make-error-1.3.6"
- sources."manakin-0.5.2"
sources."matrix-appservice-0.4.1"
- sources."matrix-appservice-bridge-1.11.1"
+ sources."matrix-appservice-bridge-1.12.2"
(sources."matrix-js-sdk-2.4.6" // {
dependencies = [
sources."bluebird-3.5.5"
@@ -3469,39 +3624,37 @@ in
sources."merge-descriptors-1.0.1"
sources."methods-1.1.2"
sources."mime-1.6.0"
- sources."mime-db-1.43.0"
- sources."mime-types-2.1.26"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
sources."minimatch-3.0.4"
sources."minimist-1.2.5"
- sources."mkdirp-0.5.3"
- (sources."mocha-6.2.2" // {
+ sources."mkdirp-0.5.5"
+ (sources."mocha-7.1.2" // {
dependencies = [
sources."debug-3.2.6"
sources."escape-string-regexp-1.0.5"
- sources."minimist-0.0.8"
- sources."mkdirp-0.5.1"
sources."ms-2.1.1"
sources."supports-color-6.0.0"
- sources."yargs-13.3.0"
- sources."yargs-parser-13.1.1"
];
})
- sources."moment-2.24.0"
- (sources."morgan-1.9.1" // {
+ sources."moment-2.25.3"
+ (sources."morgan-1.10.0" // {
dependencies = [
sources."debug-2.6.9"
+ sources."depd-2.0.0"
];
})
sources."ms-2.0.0"
sources."nedb-1.8.0"
sources."negotiator-0.6.2"
sources."node-emoji-1.10.0"
- (sources."node-environment-flags-1.0.5" // {
+ (sources."node-environment-flags-1.0.6" // {
dependencies = [
sources."semver-5.7.1"
];
})
sources."nopt-3.0.6"
+ sources."normalize-path-3.0.0"
sources."oauth-sign-0.9.0"
sources."object-hash-1.3.1"
sources."object-inspect-1.7.0"
@@ -3514,9 +3667,9 @@ in
sources."one-time-0.0.4"
sources."p-cancelable-1.1.0"
sources."p-finally-1.0.0"
- sources."p-limit-2.2.2"
+ sources."p-limit-2.3.0"
sources."p-locate-3.0.0"
- (sources."p-queue-6.3.0" // {
+ (sources."p-queue-6.4.0" // {
dependencies = [
sources."eventemitter3-4.0.0"
];
@@ -3532,41 +3685,45 @@ in
sources."path-to-regexp-0.1.7"
sources."pathval-1.1.0"
sources."performance-now-2.1.0"
- sources."pg-7.12.1"
+ sources."pg-8.0.3"
sources."pg-connection-string-0.1.3"
sources."pg-int8-1.0.1"
- sources."pg-minify-1.5.1"
- sources."pg-pool-2.0.10"
- sources."pg-promise-9.3.6"
+ sources."pg-minify-1.5.2"
+ sources."pg-pool-3.1.1"
+ sources."pg-promise-10.5.3"
+ sources."pg-protocol-1.2.2"
sources."pg-types-2.2.0"
sources."pgpass-1.0.2"
+ sources."picomatch-2.2.2"
sources."postgres-array-2.0.0"
sources."postgres-bytea-1.0.0"
- sources."postgres-date-1.0.4"
+ sources."postgres-date-1.0.5"
sources."postgres-interval-1.2.0"
sources."process-nextick-args-2.0.1"
sources."prom-client-11.5.3"
sources."proxy-addr-2.0.6"
- sources."psl-1.7.0"
+ sources."psl-1.8.0"
sources."punycode-2.1.1"
sources."qs-6.7.0"
- sources."quick-lru-4.0.1"
+ sources."quick-lru-5.1.0"
sources."randomstring-1.1.5"
sources."range-parser-1.2.1"
sources."raw-body-2.4.0"
sources."readable-stream-3.6.0"
+ sources."readdirp-3.2.0"
sources."regenerator-runtime-0.11.1"
(sources."request-2.88.2" // {
dependencies = [
sources."form-data-2.3.3"
sources."qs-6.5.2"
+ sources."uuid-3.4.0"
];
})
sources."request-promise-core-1.1.3"
sources."request-promise-native-1.0.8"
sources."require-directory-2.1.1"
sources."require-main-filename-2.0.0"
- sources."resolve-1.15.1"
+ sources."resolve-1.17.0"
sources."retry-0.12.0"
sources."safe-buffer-5.1.2"
sources."safer-buffer-2.1.2"
@@ -3586,8 +3743,8 @@ in
sources."setprototypeof-1.1.1"
sources."simple-swizzle-0.2.2"
sources."source-map-0.6.1"
- sources."source-map-support-0.5.16"
- sources."spex-3.0.0"
+ sources."source-map-support-0.5.19"
+ sources."spex-3.0.1"
sources."split-1.0.1"
sources."sprintf-js-1.0.3"
sources."sshpk-1.16.1"
@@ -3595,8 +3752,10 @@ in
sources."statuses-1.5.0"
sources."stealthy-require-1.1.1"
sources."string-width-3.1.0"
- sources."string.prototype.trimleft-2.1.1"
- sources."string.prototype.trimright-2.1.1"
+ sources."string.prototype.trimend-1.0.1"
+ sources."string.prototype.trimleft-2.1.2"
+ sources."string.prototype.trimright-2.1.2"
+ sources."string.prototype.trimstart-1.0.1"
(sources."string_decoder-1.3.0" // {
dependencies = [
sources."safe-buffer-5.2.0"
@@ -3608,16 +3767,17 @@ in
sources."tdigest-0.1.1"
sources."text-hex-1.0.0"
sources."through-2.3.8"
+ sources."to-regex-range-5.0.1"
sources."toidentifier-1.0.0"
sources."tough-cookie-2.5.0"
sources."triple-beam-1.3.0"
- (sources."ts-node-8.7.0" // {
+ (sources."ts-node-8.10.1" // {
dependencies = [
sources."diff-4.0.2"
];
})
- sources."tslib-1.11.1"
- (sources."tslint-5.20.1" // {
+ sources."tslib-1.11.2"
+ (sources."tslint-6.1.2" // {
dependencies = [
sources."diff-4.0.2"
sources."semver-5.7.1"
@@ -3635,7 +3795,7 @@ in
sources."uri-js-4.2.2"
sources."util-deprecate-1.0.2"
sources."utils-merge-1.0.1"
- sources."uuid-3.4.0"
+ sources."uuid-7.0.3"
sources."vary-1.1.2"
sources."verror-1.10.0"
sources."which-1.3.1"
@@ -3689,4 +3849,4 @@ in
bypassCache = true;
reconstructLock = true;
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json b/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json
index 8fb44891dd42..a197abdda2e7 100644
--- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json
+++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json
@@ -1,3 +1,3 @@
[
- {"matrix-appservice-slack": "git+https://github.com/matrix-org/matrix-appservice-slack.git#1.1.0" }
+ {"matrix-appservice-slack": "git+https://github.com/matrix-org/matrix-appservice-slack.git#1.2.0" }
]
diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix
index 89d3220aa695..fb284970af06 100644
--- a/pkgs/servers/memcached/default.nix
+++ b/pkgs/servers/memcached/default.nix
@@ -1,12 +1,12 @@
{stdenv, fetchurl, cyrus_sasl, libevent, nixosTests }:
stdenv.mkDerivation rec {
- version = "1.6.3";
+ version = "1.6.5";
pname = "memcached";
src = fetchurl {
url = "https://memcached.org/files/${pname}-${version}.tar.gz";
- sha256 = "0h0mlg3xz1y889xj6lcsb4sz9bar1birc2wzjf7x4ig31qib6r0w";
+ sha256 = "1pr7igk7ic9wc2yax26wy3ar223vilf2qyzrknz36g61dxqa6k8z";
};
configureFlags = [
diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix
index b2e040748ab3..5d50f8c9b0c8 100644
--- a/pkgs/servers/metabase/default.nix
+++ b/pkgs/servers/metabase/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "metabase";
- version = "0.35.1";
+ version = "0.35.3";
src = fetchurl {
url = "http://downloads.metabase.com/v${version}/metabase.jar";
- sha256 = "1c8mxadf8siakhgdkbw5d8r6ph9lqxrw5wlrrc8a5ycp43h0z226";
+ sha256 = "1iax99id47a8mkdyr5wp2dwvl0d1lfh9gsamd1m0qpxw9mbvpkbq";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix
index b6abec241a5e..0a0d3aa7bd8a 100644
--- a/pkgs/servers/meteor/default.nix
+++ b/pkgs/servers/meteor/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, zlib, patchelf, runtimeShell }:
let
- version = "1.9.3";
+ version = "1.10.1";
in
stdenv.mkDerivation {
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
pname = "meteor";
src = fetchurl {
url = "https://static-meteor.netdna-ssl.com/packages-bootstrap/${version}/meteor-bootstrap-os.linux.x86_64.tar.gz";
- sha256 = "1njp2db939w3ah5k943bkgm62k969fj47qwmlzvhmmg87xwnq3fb";
+ sha256 = "1xck7pi7rhkgssic7adbg1slypjjkqxa18wlf3jffbgj0zzr87nx";
};
#dontStrip = true;
diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix
index 953cc9fb77cd..8b30d7dbbc88 100644
--- a/pkgs/servers/minio/default.nix
+++ b/pkgs/servers/minio/default.nix
@@ -1,24 +1,26 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }:
buildGoModule rec {
pname = "minio";
- version = "2020-03-25T07-03-04Z";
+ version = "2020-05-01T22-19-14Z";
src = fetchFromGitHub {
owner = "minio";
repo = "minio";
rev = "RELEASE.${version}";
- sha256 = "0xdflc7pfx1misbh695x8kmqpysi5iydsarr9mwmjragf5b1kbl5";
+ sha256 = "0yyq5j82rcl8yhn2jg8sjfxii6kzbrbmxvb05yiwv7p0q42ag5rn";
};
- modSha256 = "09kbibsfa7qq55paqr7wcs4gpwk6g5pknc5fjssmd12nm2cji96k";
+ modSha256 = "1g5vwllxpiy4qlfhn3v5k6sn4g4qpbv0hpg32y1vi2q342lag116";
subPackages = [ "." ];
buildFlagsArray = [''-ldflags=
- -X github.com/minio/minio/cmd.Version=${version}
+ -s -w -X github.com/minio/minio/cmd.Version=${version}
''];
+ passthru.tests.minio = nixosTests.minio;
+
meta = with stdenv.lib; {
homepage = "https://www.minio.io/";
description = "An S3-compatible object storage server";
diff --git a/pkgs/servers/misc/airsonic/default.nix b/pkgs/servers/misc/airsonic/default.nix
index 2c529ef7b32b..be7480354305 100644
--- a/pkgs/servers/misc/airsonic/default.nix
+++ b/pkgs/servers/misc/airsonic/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "airsonic";
- version = "10.5.0";
+ version = "10.6.1";
src = fetchurl {
url = "https://github.com/airsonic/airsonic/releases/download/v${version}/airsonic.war";
- sha256 = "0nja33x3qh8zylqc7dn6x8j1wyxf7pzf9vdg9rzaq1hl6mi573jq";
+ sha256 = "0dgk9i7981wydp44zax21y48psybcsd4i68cmlp9izl8aa5gk2vb";
};
buildCommand = ''
diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix
index 02a81bfe33cc..ecbed520bbdc 100644
--- a/pkgs/servers/monitoring/munin/default.nix
+++ b/pkgs/servers/monitoring/munin/default.nix
@@ -3,14 +3,14 @@
}:
stdenv.mkDerivation rec {
- version = "2.0.59";
+ version = "2.0.61";
pname = "munin";
src = fetchFromGitHub {
owner = "munin-monitoring";
repo = "munin";
rev = version;
- sha256 = "1i28ba53gh9z0mb3fk0y3cb88wh73qdlbg7rl5g9mc6iwqrbvg97";
+ sha256 = "0gjbz8zdj1rdx2azgpdh64isna0l77wm42gr1jhwb5an3lf6sgxs";
};
buildInputs = [
diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix
index dc0ad6ae2cf2..b8246c27b47d 100644
--- a/pkgs/servers/monitoring/nagios/default.nix
+++ b/pkgs/servers/monitoring/nagios/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "nagios";
- version = "4.4.5";
+ version = "4.4.6";
src = fetchurl {
url = "mirror://sourceforge/nagios/nagios-4.x/${pname}-${version}/${pname}-${version}.tar.gz";
- sha256 = "079rgi3dqdg6h511c96hrch62rxsap9p4x37hm2nj672zb9f4sdz";
+ sha256 = "1x5hb97zbvkm73q53ydp1gwj8nnznm72q9c4rm6ny7phr995l3db";
};
patches = [ ./nagios.patch ];
diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix
index f307032f4141..a6122b317535 100644
--- a/pkgs/servers/monitoring/thanos/default.nix
+++ b/pkgs/servers/monitoring/thanos/default.nix
@@ -1,16 +1,16 @@
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "thanos";
- version = "0.11.0";
+ version = "0.12.2";
src = fetchFromGitHub {
rev = "v${version}";
owner = "thanos-io";
repo = "thanos";
- sha256 = "152ic9pga0wjg4r7b66hdnbsj9wrzfzbbps7wjas3rcbcv1f2i90";
+ sha256 = "10xscm9h2krha66v96v2q85fynnxfizjcc47h7yz4xhjwvb5dgz2";
};
- modSha256 = "1pdypyyy352l6wy5lr94fv8j890lh863h8zg2hxchiymrs5pgq1c";
+ modSha256 = "0c8gc4qzdazxxnabfms63df8vlf2iy6iy0jrm710x76m4vm6mrbj";
subPackages = "cmd/thanos";
diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index d5a3b9de3c0a..8d862373b995 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -103,13 +103,13 @@ let
in stdenv.mkDerivation rec {
pname = "mpd";
- version = "0.21.21";
+ version = "0.21.23";
src = fetchFromGitHub {
owner = "MusicPlayerDaemon";
repo = "MPD";
rev = "v${version}";
- sha256 = "0ysyjlmmfm1y5jqyv83bs9p7zqr9pgj1hmdq2b7kx9kridclbnng";
+ sha256 = "0jnhjhm1ilpcwb4f58b8pgyzjq3dlr0j2xyk0zck0afwkdxyj9cb";
};
buildInputs = [ glib boost ]
diff --git a/pkgs/servers/routinator/default.nix b/pkgs/servers/routinator/default.nix
index 9c99faca4842..46416c982760 100644
--- a/pkgs/servers/routinator/default.nix
+++ b/pkgs/servers/routinator/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "routinator";
- version = "0.6.4";
+ version = "0.7.0";
src = fetchFromGitHub {
owner = "NLnetLabs";
repo = pname;
rev = "v${version}";
- sha256 = "1hbqvjv9h1aghpyrl03w5f4j8gjy6n9lx83rmpsh5p7yd9ahwmf9";
+ sha256 = "1qbaibmbiw3pffi0cm6d06k1gra4acgxr97gj7f1ckvql5rni4h0";
};
- cargoSha256 = "1chf1l9jlnhi9cyqpmcz8yfzwzmkn4lfxqhdhclvl8j4b2zvbcgc";
+ cargoSha256 = "138h99l3vv34higbqj59fa88w7c63c80g3rw07n9j2f834cvr901";
meta = with stdenv.lib; {
description = "An RPKI Validator written in Rust";
diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix
index 40d59611da2a..b53a207a6c57 100644
--- a/pkgs/servers/search/groonga/default.nix
+++ b/pkgs/servers/search/groonga/default.nix
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "groonga";
- version = "10.0.0";
+ version = "10.0.2";
src = fetchurl {
url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz";
- sha256 = "01wacd9rijnjydshsl7z0waasr87gxkwr0kr647chczcxlh1b9gr";
+ sha256 = "0851sdzgg5krf05b1pg29gmwzvzxvawfp37ny3lrb5xcdqbr379c";
};
buildInputs = with stdenv.lib;
diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix
index cd98af51e086..3bf72043ec50 100644
--- a/pkgs/servers/sickbeard/sickgear.nix
+++ b/pkgs/servers/sickbeard/sickgear.nix
@@ -4,13 +4,13 @@ let
pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]);
in stdenv.mkDerivation rec {
pname = "sickgear";
- version = "0.21.22";
+ version = "0.21.30";
src = fetchFromGitHub {
owner = "SickGear";
repo = "SickGear";
rev = "release_${version}";
- sha256 = "16jwvg9mcv0yr94ldncfs6bczyv4n3q9v7g7v0ssrkrnkxh722zx";
+ sha256 = "19j0hm2d2q279kzmdjbjgfhjwcp7071a2mmvsnb0167wdyaq4bcf";
};
dontBuild = true;
diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix
index 6f7f81f23780..4015e2097ee0 100644
--- a/pkgs/servers/sql/dolt/default.nix
+++ b/pkgs/servers/sql/dolt/default.nix
@@ -2,18 +2,18 @@
buildGoModule rec {
pname = "dolt";
- version = "0.15.2";
+ version = "0.16.3";
src = fetchFromGitHub {
owner = "liquidata-inc";
repo = "dolt";
rev = "v${version}";
- sha256 = "0av21czfxpwy4y7n9x6hy6m2fliqcazjx7ww0rwm6kdwxipq1xsz";
+ sha256 = "141wv5av7hms4wa3s4md7mnb77bbyn3854d7gj7fy6f6jvzghdny";
};
modRoot = "./go";
subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ];
- modSha256 = "0c120gkkswg0cqvvhjkxvalr4fsjv81khwg0x0fm8fr6lipkfksn";
+ modSha256 = "1fx830dif9cq2rvigdbqbc3vmmq01ywj9b095adbrwddvay8m8si";
meta = with lib; {
description = "Relational database with version control and CLI a-la Git.";
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index ea11faf1efcf..9b5118eacc36 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, makeWrapper, ncurses
+{ stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, makeWrapper, ncurses, nixosTests
, libiconv, openssl, pcre, boost, judy, bison, libxml2, libkrb5, linux-pam, curl
, libaio, libevent, jemalloc450, jemalloc, cracklib, systemd, perl
, bzip2, lz4, lzo, snappy, xz, zlib, zstd
@@ -101,6 +101,15 @@ common = rec { # attributes common to both builds
passthru.mysqlVersion = "5.7";
+ passthru.tests = {
+ mariadb-galera-mariabackup = nixosTests.mariadb-galera-mariabackup;
+ mariadb-galera-rsync = nixosTests.mariadb-galera-rsync;
+ mysql = nixosTests.mysql;
+ mysql-autobackup = nixosTests.mysql-autobackup;
+ mysql-backup = nixosTests.mysql-backup;
+ mysql-replication = nixosTests.mysql-replication;
+ };
+
meta = {
description = "An enhanced, drop-in replacement for MySQL";
diff --git a/pkgs/servers/sql/pgbouncer/default.nix b/pkgs/servers/sql/pgbouncer/default.nix
index f71afc2b674e..0a6d1a8cf613 100644
--- a/pkgs/servers/sql/pgbouncer/default.nix
+++ b/pkgs/servers/sql/pgbouncer/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "pgbouncer";
- version = "1.12.0";
+ version = "1.13.0";
src = fetchurl {
url = "https://pgbouncer.github.io/downloads/files/${version}/${pname}-${version}.tar.gz";
- sha256 = "0gi7ggmyjqd4kxdwm5csmzmjmfrjx7q20dfzk3da1bvc6xj6ag0v";
+ sha256 = "0ccxr0hbj9h5pwsj2712mxif197j770qkfjv6na5aqh5bz4j3f2c";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
index 257af21cec97..168cee9711bc 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "pg_auto_failover";
- version = "1.2";
+ version = "1.3";
src = fetchFromGitHub {
owner = "citusdata";
repo = pname;
rev = "v${version}";
- sha256 = "128bfxy7aabyvlcrzdi20f51k9xxgynd76f01v6w1314wrjg2r8f";
+ sha256 = "1si4k37azigp7hqibnkzr1p6zknadxm7pb33lygrxarqkifx67j4";
};
buildInputs = [ postgresql openssl zlib readline ];
diff --git a/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/pg_partman.nix
index ee59e683ce85..314e9275c8c3 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_partman.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_partman.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "pg_partman";
- version = "4.3.0";
+ version = "4.3.1";
buildInputs = [ postgresql ];
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "pgpartman";
repo = pname;
rev = "refs/tags/v${version}";
- sha256 = "1zkjz4hkjqzg0j7i7bjxgdcv2kfcgqwahirh06yag6hvm4qf9y9w";
+ sha256 = "12mfydlva05dczjhrw14xq9zr0hqqyszlwivvq2zj9h1p9agm7fn";
};
installPhase = ''
diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix
index 0487ed177d04..40b85fc949e1 100644
--- a/pkgs/servers/traefik/default.nix
+++ b/pkgs/servers/traefik/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "traefik";
- version = "2.2.0";
+ version = "2.2.1";
src = fetchFromGitHub {
owner = "containous";
repo = "traefik";
rev = "v${version}";
- sha256 = "1dcazssabqxr9wv3dds3z7ks3y628qa07vgnn3hpdwxzm2b2ma92";
+ sha256 = "0byi2h1lma95l77sdj8jkidmwb12ryjqwxa0zz6vwjg07p5ps3k4";
};
- modSha256 = "0w3ssxvsmq8i6hbfmn4ig2x13i2nlqy5q1khcblf9pq5vhk202qx";
+ modSha256 = "17imp24abfgh75g8161daknzqzk2m19q9d1mij6487046lk75hqz";
subPackages = [ "cmd/traefik" ];
nativeBuildInputs = [ go-bindata ];
diff --git a/pkgs/servers/ums/default.nix b/pkgs/servers/ums/default.nix
index 503ff16caeeb..3e58edba42fb 100644
--- a/pkgs/servers/ums/default.nix
+++ b/pkgs/servers/ums/default.nix
@@ -4,13 +4,18 @@
stdenv.mkDerivation rec {
pname = "ums";
- version = "9.1.0";
-
- src = fetchurl {
- url = "mirror://sourceforge/project/unimediaserver/Official%20Releases/Linux/" + stdenv.lib.toUpper "${pname}-${version}" + ".tgz";
- sha256 = "07wprjpwqids96v5q5fhwcxqlg8jp1vy585vl2nqbfi1vf5v294s";
- name = "${pname}-${version}.tgz";
- };
+ version = "9.4.2";
+
+ src = {
+ i686-linux = fetchurl {
+ url = "mirror://sourceforge/project/unimediaserver/${version}/" + stdenv.lib.toUpper "${pname}-${version}" + "-x86.tgz";
+ sha256 = "0i319g2c3z9j131nwh5m92clgnxxxs3izplzhjb30bx4lldmjs1j";
+ };
+ x86_64-linux = fetchurl {
+ url = "mirror://sourceforge/project/unimediaserver/${version}/" + stdenv.lib.toUpper "${pname}-${version}" + "-x86_64.tgz";
+ sha256 = "07wc0is86fdfyz4as3f17q8pfzl8x55ci65zvpls0a9rfyyvjjw3";
+ };
+ }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
buildInputs = [ makeWrapper ];
@@ -21,7 +26,7 @@ stdenv.mkDerivation rec {
# ums >= 9.0.0 ships its own JRE in the package. if we remove it, the `UMS.sh`
# script will correctly fall back to the JRE specified by JAVA_HOME
- rm -rf $out/linux/jre-x64 $out/linux/jre-x86
+ rm -rf $out/jre
makeWrapper "$out/UMS.sh" "$out/bin/ums" \
--prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [ libzen libmediainfo] }" \
@@ -32,6 +37,6 @@ stdenv.mkDerivation rec {
description = "Universal Media Server: a DLNA-compliant UPnP Media Server";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.thall ];
+ maintainers = with stdenv.lib.maintainers; [ thall snicket2100 ];
};
}
diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix
index 372bda4061b6..76d1a5f0b755 100644
--- a/pkgs/servers/web-apps/matomo/default.nix
+++ b/pkgs/servers/web-apps/matomo/default.nix
@@ -3,16 +3,16 @@
let
versions = {
matomo = {
- version = "3.13.4";
- sha256 = "0yd24hn3ajj5bhzv8f5xr6wpgh2ma9zilzbm9c1n225q553scgjw";
+ version = "3.13.5";
+ sha256 = "1b9a9jj86bb3f0093k6sz235iivvvqbcvkjqxwn7c9z7qsmpvbxr";
};
matomo-beta = {
- version = "3.13.4";
+ version = "3.13.5";
# `beta` examples: "b1", "rc1", null
# TOOD when updating: use null if stable version is >= latest beta or release candidate
beta = null;
- sha256 = "0yd24hn3ajj5bhzv8f5xr6wpgh2ma9zilzbm9c1n225q553scgjw";
+ sha256 = "1b9a9jj86bb3f0093k6sz235iivvvqbcvkjqxwn7c9z7qsmpvbxr";
};
};
common = pname: { version, sha256, beta ? null }:
diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix
index 9cab8c4a9bab..ca4b5d832a62 100644
--- a/pkgs/servers/web-apps/wordpress/default.nix
+++ b/pkgs/servers/web-apps/wordpress/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "wordpress";
- version = "5.4";
+ version = "5.4.1";
src = fetchurl {
url = "https://wordpress.org/${pname}-${version}.tar.gz";
- sha256 = "10zjgbr96ri87r5v7860vg5ndbnjfhjhily4m9nyl60f1lbjdhrr";
+ sha256 = "0i9ndfhm9iwilqwbqs3dngmzzjmazw4vwbyccjabs3zmzliis6vv";
};
installPhase = ''
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index 0f18eb79d2d8..11d9e48008fa 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -16,6 +16,7 @@
, python3
, cmake
+, runCommand
, writeText
, nixosTests
, useOperatingSystemEtc ? true
@@ -202,38 +203,41 @@ let
passthru = {
shellPath = "/bin/fish";
- tests.nixos = nixosTests.fish;
+ tests = {
+ nixos = nixosTests.fish;
+
+ # Test the fish_config tool by checking the generated splash page.
+ # Since the webserver requires a port to run, it is not started.
+ fishConfig =
+ let fishScript = writeText "test.fish" ''
+ set -x __fish_bin_dir ${fish}/bin
+ echo $__fish_bin_dir
+ cp -r ${fish}/share/fish/tools/web_config/* .
+ chmod -R +w *
+
+ # if we don't set `delete=False`, the file will get cleaned up
+ # automatically (leading the test to fail because there's no
+ # tempfile to check)
+ sed -e "s@, mode='w'@, mode='w', delete=False@" -i webconfig.py
+
+ # we delete everything after the fileurl is assigned
+ sed -e '/fileurl =/q' -i webconfig.py
+ echo "print(fileurl)" >> webconfig.py
+
+ # and check whether the message appears on the page
+ cat (${python3}/bin/python ./webconfig.py \
+ | tail -n1 | sed -ne 's|.*\(/build/.*\)|\1|p' \
+ ) | grep 'a href="http://localhost.*Start the Fish Web config'
+
+ # cannot test the http server because it needs a localhost port
+ '';
+ in
+ runCommand "test-web-config" { } ''
+ HOME=$(mktemp -d)
+ ${fish}/bin/fish ${fishScript} && touch $out
+ '';
+ };
};
};
-
- tests = {
-
- # Test the fish_config tool by checking the generated splash page.
- # Since the webserver requires a port to run, it is not started.
- fishConfig =
- let
- fishScript = writeText "test.fish" ''
- set -x __fish_bin_dir ${fish}/bin
- echo $__fish_bin_dir
- cp -r ${fish}/share/fish/tools/web_config/* .
- chmod -R +w *
- # we delete everything after the fileurl is assigned
- sed -e '/fileurl =/q' -i webconfig.py
- echo "print(fileurl)" >> webconfig.py
- # and check whether the message appears on the page
- cat (${python3}/bin/python ./webconfig.py \
- | tail -n1 | sed -ne 's|.*\(/tmp/.*\)|\1|p' \
- ) | grep 'a href="http://localhost.*Start the Fish Web config'
-
- # cannot test the http server because it needs a localhost port
- '';
- in ''
- HOME=$(mktemp -d)
- ${fish}/bin/fish ${fishScript}
- '';
- };
-
- # FIXME(Profpatsch) replace withTests stub
- withTests = with lib; flip const;
in
-withTests tests fish
+fish
diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix
index d4c18f9f5815..a5c22d125afb 100644
--- a/pkgs/shells/powershell/default.nix
+++ b/pkgs/shells/powershell/default.nix
@@ -1,21 +1,21 @@
-{ stdenv, autoPatchelfHook, fetchzip, libunwind, libuuid, icu, curl
-, darwin, makeWrapper, less, openssl_1_0_2, pam, lttng-ust }:
+{ stdenv, lib, autoPatchelfHook, fetchzip, libunwind, libuuid, icu, curl
+, darwin, makeWrapper, less, openssl_1_1, pam, lttng-ust }:
let platformString = if stdenv.isDarwin then "osx"
else if stdenv.isLinux then "linux"
else throw "unsupported platform";
- platformSha = if stdenv.isDarwin then "0jb2xm79m3m14zk7v730ai1zvxcb5a13jbkkya0qy7332k6gn6bl"
- else if stdenv.isLinux then "0s0jvc9ha6fw8qy7f5n0v6zf043rawsjdlm5wvqxq1q2idz7xcw1"
+ platformSha = if stdenv.isDarwin then "0c71w6z6sc86si07i6vy4w3069jal7476wyiizyr7qjm9m22963f"
+ else if stdenv.isLinux then "0m13y66a6w64s31qbi3j5x8jll6dfrin890jah8kyncsvlyisqg3"
else throw "unsupported platform";
platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH"
else if stdenv.isLinux then "LD_LIBRARY_PATH"
else throw "unsupported platform";
- libraries = [ libunwind libuuid icu curl openssl_1_0_2 ] ++
+ libraries = [ libunwind libuuid icu curl openssl_1_1 ] ++
(if stdenv.isLinux then [ pam lttng-ust ] else [ darwin.Libsystem ]);
in
stdenv.mkDerivation rec {
pname = "powershell";
- version = "6.2.3";
+ version = "7.0.0";
src = fetchzip {
url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-x64.tar.gz";
@@ -26,21 +26,42 @@ stdenv.mkDerivation rec {
buildInputs = [ less ] ++ libraries;
nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
- installPhase = ''
+ installPhase =
+ let
+ ext = stdenv.hostPlatform.extensions.sharedLibrary;
+ in ''
+ pslibs=$out/share/powershell
+ mkdir -p $pslibs
+
+ cp -r * $pslibs
+
+ rm -f $pslibs/libcrypto${ext}.1.0.0
+ rm -f $pslibs/libssl${ext}.1.0.0
+
+ ls $pslibs
+ '' + lib.optionalString (!stdenv.isDarwin) ''
+ patchelf --replace-needed libcrypto${ext}.1.0.0 libcrypto${ext}.1.1 $pslibs/libmi.so
+ patchelf --replace-needed libssl${ext}.1.0.0 libssl${ext}.1.1 $pslibs/libmi.so
+ '' + ''
+
mkdir -p $out/bin
- mkdir -p $out/share/powershell
- cp -r * $out/share/powershell
- makeWrapper $out/share/powershell/pwsh $out/bin/pwsh \
+
+ makeWrapper $pslibs/pwsh $out/bin/pwsh \
--prefix ${platformLdLibraryPath} : "${stdenv.lib.makeLibraryPath libraries}" \
--set TERM xterm --set POWERSHELL_TELEMETRY_OPTOUT 1 --set DOTNET_CLI_TELEMETRY_OPTOUT 1
'';
dontStrip = true;
- meta = with stdenv.lib; {
- description = "Cross-platform (Windows, Linux, and macOS) automation and configuration tool/framework";
+ doInstallCheck = true;
+ installCheck = ''
+ $out/bin/pwsh --help > /dev/null
+ '';
+
+ meta = with lib; {
+ description = "Powerful cross-platform (Windows, Linux, and macOS) shell and scripting language based on .NET";
homepage = "https://github.com/PowerShell/PowerShell";
- maintainers = [ maintainers.yrashk ];
+ maintainers = with maintainers; [ yrashk srgom ];
platforms = [ "x86_64-darwin" "x86_64-linux" ];
license = with licenses; [ mit ];
};
diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix
index dc0a45c3e523..192e38b963d3 100644
--- a/pkgs/shells/xonsh/default.nix
+++ b/pkgs/shells/xonsh/default.nix
@@ -8,14 +8,14 @@
python3Packages.buildPythonApplication rec {
pname = "xonsh";
- version = "0.9.17";
+ version = "0.9.18";
# fetch from github because the pypi package ships incomplete tests
src = fetchFromGitHub {
owner = "xonsh";
repo = "xonsh";
rev = version;
- sha256 = "0ynfnphbp69am390m5zfzk5rzj1749vs7rzyq310f6mk7xdq6j4v";
+ sha256 = "1zg5dl9qdysbaw2djy9f7f1ydp7vzjv840cjwqxlmg9615lgg7xa";
};
LC_ALL = "en_US.UTF-8";
diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index 6e679f16e304..87ef5ecbde52 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -4,13 +4,13 @@
{ stdenv, fetchgit }:
stdenv.mkDerivation rec {
- version = "2020-04-30";
+ version = "2020-05-07";
pname = "oh-my-zsh";
- rev = "06b0276675e978d80535259915fbb44011e10101";
+ rev = "b876198575cbf23d589ddc8da6b22254d3d5358b";
src = fetchgit { inherit rev;
url = "https://github.com/ohmyzsh/ohmyzsh";
- sha256 = "1y1c8v2akxwffrmcq8lmxvdnirqkxbxbrhcws76dlcgp2m3drvgq";
+ sha256 = "0vx3pi9wk9crmwgkpd3nwp88ci6ly0savj6v2md7qazmimgffsfi";
};
pathsToLink = [ "/share/oh-my-zsh" ];
diff --git a/pkgs/tools/admin/acme.sh/default.nix b/pkgs/tools/admin/acme.sh/default.nix
index 8d4863757ade..2254f2e22d9d 100644
--- a/pkgs/tools/admin/acme.sh/default.nix
+++ b/pkgs/tools/admin/acme.sh/default.nix
@@ -1,13 +1,13 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute, unixtools, dnsutils }:
stdenv.mkDerivation rec {
pname = "acme.sh";
- version = "2.8.5";
+ version = "2.8.6";
src = fetchFromGitHub {
owner = "Neilpang";
repo = "acme.sh";
rev = version;
- sha256 = "0yxhfdb0jz0wn10ka6c79qvcx07656vsaxmjls8qgcfgc472ymhs";
+ sha256 = "0zbs8vzbh89wxf36h9mvhin2p85n3jrsq6l5i40q1zkzgwi3648n";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix
index 4af031118693..d0cb07197cd3 100644
--- a/pkgs/tools/admin/ansible/default.nix
+++ b/pkgs/tools/admin/ansible/default.nix
@@ -7,21 +7,21 @@ rec {
ansible_2_8 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec {
pname = "ansible";
- version = "2.8.7";
+ version = "2.8.11";
src = fetchurl {
url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz";
- sha256 = "0iy90kqxs52nspfkhj1y7z4zf017jfm5qhdb01d8d4jd5g53k0l2";
+ sha256 = "14f1m4jjkicadaz4d1dm8xhj53kdwksf0znmqzaz1fb0dj5slv0m";
};
}));
ansible_2_7 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec {
pname = "ansible";
- version = "2.7.15";
+ version = "2.7.17";
src = fetchurl {
url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz";
- sha256 = "1kjqr35c11njyi3f2rjab6821bhqcrdykv4285q76gwv0qynigwr";
+ sha256 = "1k2cz4w3r3an37305f40vi93wqixapls9y6ggkf75nbs7z27knwz";
};
}));
diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix
index ce250d33e946..b2d3ebfa5829 100644
--- a/pkgs/tools/admin/lego/default.nix
+++ b/pkgs/tools/admin/lego/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "lego";
- version = "3.5.0";
+ version = "3.6.0";
src = fetchFromGitHub {
owner = "go-acme";
repo = pname;
rev = "v${version}";
- sha256 = "08mh2q426gmhcaz578lw08jbxfqb7qm37cd00ap937dymi1zs9qw";
+ sha256 = "0jqq1ricy8971a27zcc6qm61cv6pjk4984dab1cgz86qzama7nil";
};
- modSha256 = "10n8pcbmzlnk63gzsjb1xnmjwxfhxsqx8ffpcbwdzq9fc5yvjiii";
+ modSha256 = "0a3d7snnchxk5n4m0v725689pwqjgwz7g94yzh9akc55nwy33sfj";
subPackages = [ "cmd/lego" ];
buildFlagsArray = [
diff --git a/pkgs/tools/admin/lexicon/default.nix b/pkgs/tools/admin/lexicon/default.nix
index 31705d1e79c2..de967578d5c9 100644
--- a/pkgs/tools/admin/lexicon/default.nix
+++ b/pkgs/tools/admin/lexicon/default.nix
@@ -5,7 +5,7 @@
python3Packages.buildPythonApplication rec {
pname = "lexicon";
- version = "3.3.17";
+ version = "3.3.22";
propagatedBuildInputs = with python3Packages; [ requests tldextract future cryptography pyyaml boto3 zeep xmltodict beautifulsoup4 dnspython pynamecheap softlayer transip localzone ];
@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec {
owner = "AnalogJ";
repo = pname;
rev = "v${version}";
- sha256 = "1wrsw759am6yp2m9b34iv82m371df3ssp2vhdjr18ys3xk7dvj89";
+ sha256 = "1adwqglh3lrx04y0f6slp1l97xzbsqgw0v5i4jll3a54aqyzfz0a";
};
meta = with lib; {
diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix
index e4ac149a8edb..a3c94d74897d 100644
--- a/pkgs/tools/admin/lxd/default.nix
+++ b/pkgs/tools/admin/lxd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgconfig, lxc, buildGoPackage, fetchurl
+{ stdenv, hwdata, pkgconfig, lxc, buildGoPackage, fetchurl
, makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq
, squashfsTools, iproute, iptables, ebtables, libcap, libco-canonical, dqlite
, raft-canonical, sqlite-replication, udev
@@ -19,6 +19,11 @@ buildGoPackage rec {
sha256 = "0sxkyjayn7yyiy9kvbdlpkl58lwsl2rhlxnncg628f2kad2zgkdx";
};
+ postPatch = ''
+ substituteInPlace shared/usbid/load.go \
+ --replace "/usr/share/misc/usb.ids" "${hwdata}/share/hwdata/usb.ids"
+ '';
+
preBuild = ''
# unpack vendor
pushd go/src/github.com/lxc/lxd
diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix
index b648cdb25124..b378f0828659 100644
--- a/pkgs/tools/admin/salt/default.nix
+++ b/pkgs/tools/admin/salt/default.nix
@@ -1,21 +1,38 @@
-{
- stdenv, pythonPackages, openssl,
-
+{ lib
+, python3
+, openssl
# Many Salt modules require various Python modules to be installed,
# passing them in this array enables Salt to find them.
- extraInputs ? []
+, extraInputs ? []
}:
+let
-pythonPackages.buildPythonApplication rec {
- pname = "salt";
- version = "2019.2.0";
-
- src = pythonPackages.fetchPypi {
- inherit pname version;
- sha256 = "1kgn3lway0zwwysyzpphv05j4xgxk92dk4rv1vybr2527wmvp5an";
+ py = python3.override {
+ packageOverrides = self: super: {
+ # Can be unpinned once https://github.com/saltstack/salt/issues/56007 is resolved
+ msgpack = super.msgpack.overridePythonAttrs (
+ oldAttrs: rec {
+ version = "0.6.2";
+ src = oldAttrs.src.override {
+ inherit version;
+ sha256 = "0c0q3vx0x137567msgs5dnizghnr059qi5kfqigxbz26jf2jyg7a";
+ };
+ }
+ );
+ };
};
- propagatedBuildInputs = with pythonPackages; [
+in
+py.pkgs.buildPythonApplication rec {
+ pname = "salt";
+ version = "3000.2";
+
+ src = py.pkgs.fetchPypi {
+ inherit pname version;
+ sha256 = "1n90qqhsvbf4pc4pcbya3rjfkblbccf4np4mxpghjqaa16fl4cqf";
+ };
+
+ propagatedBuildInputs = with py.pkgs; [
jinja2
markupsafe
msgpack
@@ -24,8 +41,6 @@ pythonPackages.buildPythonApplication rec {
pyzmq
requests
tornado_4
- ] ++ stdenv.lib.optionals (!pythonPackages.isPy3k) [
- futures
] ++ extraInputs;
patches = [ ./fix-libcrypto-loading.patch ];
@@ -40,7 +55,7 @@ pythonPackages.buildPythonApplication rec {
# as is it rather long.
doCheck = false;
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = "https://saltstack.com/";
description = "Portable, distributed, remote execution and configuration management system";
maintainers = with maintainers; [ aneeshusa ];
diff --git a/pkgs/tools/archivers/afio/default.nix b/pkgs/tools/archivers/afio/default.nix
index e2fe3d90ee6c..3b4eb6a5ea56 100644
--- a/pkgs/tools/archivers/afio/default.nix
+++ b/pkgs/tools/archivers/afio/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchurl } :
+{ stdenv, fetchFromGitHub } :
stdenv.mkDerivation rec {
version = "2.5.2";
pname = "afio";
- src = fetchurl {
- url = "http://members.chello.nl/~k.holtman/${pname}-${version}.tgz";
- sha256 = "1fa29wlqv76hzf8bxp1qpza1r23pm2f3m7rcf0jpwm6z150s2k66";
+ src = fetchFromGitHub {
+ owner = "kholtman";
+ repo = "afio";
+ rev = "v${version}";
+ sha256 = "1vbxl66r5rp5a1qssjrkfsjqjjgld1cq57c871gd0m4qiq9rmcfy";
};
/*
@@ -18,7 +20,7 @@ stdenv.mkDerivation rec {
installFlags = [ "DESTDIR=$(out)" ];
meta = {
- homepage = "http://members.chello.nl/~k.holtman/afio.html";
+ homepage = "https://github.com/kholtman/afio";
description = "Fault tolerant cpio archiver targeting backups";
platforms = stdenv.lib.platforms.all;
/*
diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix
index b7a97b3766b5..d6ad699eaa8d 100644
--- a/pkgs/tools/archivers/p7zip/default.nix
+++ b/pkgs/tools/archivers/p7zip/default.nix
@@ -13,10 +13,12 @@ stdenv.mkDerivation rec {
./12-CVE-2016-9296.patch
./13-CVE-2017-17969.patch
(fetchpatch {
+ name = "3-CVE-2018-5996.patch";
url = "https://raw.githubusercontent.com/termux/termux-packages/master/packages/p7zip/3-CVE-2018-5996.patch";
sha256 = "1zivvkazmza0653i498ccp3zbpbpc7dvxl3zxwllbx41b6n589yp";
})
(fetchpatch {
+ name = "4-CVE-2018-10115.patch";
url = "https://raw.githubusercontent.com/termux/termux-packages/master/packages/p7zip/4-CVE-2018-10115.patch";
sha256 = "1cr7q8gnrk9yp6dcvxaqi1yhdbgp964nkv65ls41mw1kdfm44zn6";
})
diff --git a/pkgs/tools/archivers/unar/default.nix b/pkgs/tools/archivers/unar/default.nix
index 259238cdec5e..9fdbada9ab8d 100644
--- a/pkgs/tools/archivers/unar/default.nix
+++ b/pkgs/tools/archivers/unar/default.nix
@@ -1,52 +1,54 @@
-{ stdenv, fetchurl, gnustep, unzip, bzip2, zlib, icu, openssl }:
+{ stdenv, fetchFromGitHub, installShellFiles, gnustep, bzip2, zlib, icu, openssl, wavpack }:
-let
+stdenv.mkDerivation rec {
pname = "unar";
+ version = "1.10.7";
-in stdenv.mkDerivation rec {
- name = "${pname}-${version}";
- version = "1.10.1";
-
- src = fetchurl {
- url = "http://unarchiver.c3.cx/downloads/${pname}${version}_src.zip";
- sha256 = "0aq9zlar5vzr5qxphws8dm7ax60bsfsw77f4ciwa5dq5lla715j0";
+ src = fetchFromGitHub {
+ owner = "MacPaw";
+ # the unar repo contains a shallow clone of both XADMaster and universal-detector
+ repo = "unar";
+ rev = "v${version}";
+ sha256 = "0p846q1l66k3rnd512sncp26zpv411b8ahi145sghfcsz9w8abc4";
};
- buildInputs = [ gnustep.base bzip2 icu openssl zlib ];
-
- nativeBuildInputs = [ gnustep.make unzip ];
-
- enableParallelBuilding = true;
-
postPatch = ''
for f in Makefile.linux ../UniversalDetector/Makefile.linux ; do
substituteInPlace $f \
- --replace "CC = gcc" "CC=cc" \
- --replace "CXX = g++" "CXX=c++" \
- --replace "OBJCC = gcc" "OBJCC=cc" \
- --replace "OBJCXX = g++" "OBJCXX=c++"
+ --replace "= gcc" "=cc" \
+ --replace "= g++" "=c++"
done
+
+ # we need to build inside this directory as well, so we have to make it writeable
+ chmod +w ../UniversalDetector -R
'';
+ buildInputs = [ gnustep.base bzip2 icu openssl wavpack zlib ];
+
+ nativeBuildInputs = [ gnustep.make installShellFiles ];
+
+ enableParallelBuilding = true;
+
+ dontConfigure = true;
+
makefile = "Makefile.linux";
- sourceRoot = "./The Unarchiver/XADMaster";
+ sourceRoot = "./source/XADMaster";
installPhase = ''
runHook preInstall
- install -Dm755 -t $out/bin lsar unar
- install -Dm644 -t $out/share/man/man1 ../Extra/{lsar,unar}.1
-
- mkdir -p $out/etc/bash_completion.d
- cp ../Extra/lsar.bash_completion $out/etc/bash_completion.d/lsar
- cp ../Extra/unar.bash_completion $out/etc/bash_completion.d/unar
+ install -Dm555 -t $out/bin lsar unar
+ for f in lsar unar; do
+ installManPage ./Extra/$f.?
+ installShellCompletion --bash --name $f ./Extra/$f.bash_completion
+ done
runHook postInstall
'';
meta = with stdenv.lib; {
- homepage = "http://unarchiver.c3.cx/unarchiver";
+ homepage = "https://theunarchiver.com";
description = "An archive unpacker program";
longDescription = ''
The Unarchiver is an archive unpacker program with support for the popular \
@@ -55,7 +57,8 @@ in stdenv.mkDerivation rec {
Compact Pro, Packit, cpio, compress (.Z), ARJ, ARC, PAK, ACE, ZOO, LZH, \
ADF, DMS, LZX, PowerPacker, LBR, Squeeze, Crunch, and other old formats.
'';
- license = with licenses; [ lgpl21Plus ];
+ license = licenses.lgpl21Plus;
+ maintainers = with maintainers; [ peterhoeg ];
platforms = with platforms; linux;
};
}
diff --git a/pkgs/tools/backup/znapzend/default.nix b/pkgs/tools/backup/znapzend/default.nix
index 90ed1068ca6e..5ca460beb3be 100644
--- a/pkgs/tools/backup/znapzend/default.nix
+++ b/pkgs/tools/backup/znapzend/default.nix
@@ -1,27 +1,28 @@
-{ stdenv, fetchFromGitHub, fetchurl, perl, perlPackages, wget, autoconf, automake }:
+{ stdenv, fetchFromGitHub, fetchurl, perl, perlPackages, wget, autoconf, automake, autoreconfHook }:
let
- # when upgrade znapzend, check versions of Perl libs here: https://github.com/oetiker/znapzend/blob/master/PERL_MODULES
- Mojolicious-6-46 = perlPackages.buildPerlPackage rec {
+ # when upgrade znapzend, check versions of Perl libs here: https://github.com/oetiker/znapzend/blob/master/cpanfile
+ # pinned versions are listed at https://github.com/oetiker/znapzend/blob/master/thirdparty/cpanfile-5.26.1.snapshot
+ Mojolicious-8-35 = perlPackages.buildPerlPackage rec {
pname = "Mojolicious";
- version = "6.46";
+ version = "8.35";
src = fetchurl {
url = "mirror://cpan/authors/id/S/SR/SRI/${pname}-${version}.tar.gz";
- sha256 = "0i3axmx4506fx5gms148pj65x6ys7flaz1aqjd8hd9zfkd8pzdfr";
+ sha256 = "1bll0ahh5v1y3x0ql29klwsa68cj46wzqc385srsnn2m8kh2ak8h";
};
};
- MojoIOLoopForkCall-0-17 = perlPackages.buildPerlModule rec {
+ MojoIOLoopForkCall-0-20 = perlPackages.buildPerlModule rec {
pname = "Mojo-IOLoop-ForkCall";
- version = "0.17";
+ version = "0.20";
src = fetchurl {
url = "mirror://cpan/authors/id/J/JB/JBERGER/${pname}-${version}.tar.gz";
- sha256 = "090qxz1nbah2qxvfg4whl6yp6q03qkx7a42751iai521nk1yavc8";
+ sha256 = "19pih5x0ayxs2m8j29qwdpi6ky3w4ghv6vrmax3ix9r59hj6569b";
};
- propagatedBuildInputs = [ perlPackages.IOPipely Mojolicious-6-46 ];
+ propagatedBuildInputs = [ perlPackages.IOPipely Mojolicious-8-35 ];
};
- version = "0.18.0";
- checksum = "1nlvw56viwgafma506slywfg54z6009jmzc9q6wljgr6mqfmmchd";
+ version = "0.20.0";
+ checksum = "15lb5qwksa508m9bj6d3n4rrjpakfaas9qxspg408bcqfp7pqjw3";
in
stdenv.mkDerivation {
pname = "znapzend";
@@ -34,9 +35,9 @@ stdenv.mkDerivation {
sha256 = checksum;
};
- buildInputs = [ wget perl MojoIOLoopForkCall-0-17 perlPackages.TAPParserSourceHandlerpgTAP ];
+ buildInputs = [ wget perl MojoIOLoopForkCall-0-20 perlPackages.TAPParserSourceHandlerpgTAP ];
- nativeBuildInputs = [ autoconf automake ];
+ nativeBuildInputs = [ autoconf automake autoreconfHook ];
preConfigure = ''
sed -i 's/^SUBDIRS =.*$/SUBDIRS = lib/' Makefile.am
@@ -55,23 +56,23 @@ stdenv.mkDerivation {
postInstall = ''
substituteInPlace $out/bin/znapzend --replace "${perl}/bin/perl" \
"${perl}/bin/perl \
- -I${Mojolicious-6-46}/${perl.libPrefix} \
+ -I${Mojolicious-8-35}/${perl.libPrefix} \
-I${perlPackages.TAPParserSourceHandlerpgTAP}/${perl.libPrefix} \
- -I${MojoIOLoopForkCall-0-17}/${perl.libPrefix} \
+ -I${MojoIOLoopForkCall-0-20}/${perl.libPrefix} \
-I${perlPackages.IOPipely}/${perl.libPrefix} \
"
substituteInPlace $out/bin/znapzendzetup --replace "${perl}/bin/perl" \
"${perl}/bin/perl \
- -I${Mojolicious-6-46}/${perl.libPrefix} \
+ -I${Mojolicious-8-35}/${perl.libPrefix} \
-I${perlPackages.TAPParserSourceHandlerpgTAP}/${perl.libPrefix} \
- -I${MojoIOLoopForkCall-0-17}/${perl.libPrefix} \
+ -I${MojoIOLoopForkCall-0-20}/${perl.libPrefix} \
-I${perlPackages.IOPipely}/${perl.libPrefix} \
"
substituteInPlace $out/bin/znapzendztatz --replace "${perl}/bin/perl" \
"${perl}/bin/perl \
- -I${Mojolicious-6-46}/${perl.libPrefix} \
+ -I${Mojolicious-8-35}/${perl.libPrefix} \
-I${perlPackages.TAPParserSourceHandlerpgTAP}/${perl.libPrefix} \
- -I${MojoIOLoopForkCall-0-17}/${perl.libPrefix} \
+ -I${MojoIOLoopForkCall-0-20}/${perl.libPrefix} \
-I${perlPackages.IOPipely}/${perl.libPrefix} \
"
'';
diff --git a/pkgs/tools/compression/hactool/default.nix b/pkgs/tools/compression/hactool/default.nix
new file mode 100644
index 000000000000..77382d980e54
--- /dev/null
+++ b/pkgs/tools/compression/hactool/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation {
+ pname = "hactool";
+ version = "1.3.3";
+
+ src = fetchFromGitHub {
+ owner = "SciresM";
+ repo = "hactool";
+ rev = "1.3.3";
+ sha256 = "1qb51fck7liqc1ridms8wdlzgbdbvp6iv4an8jvmzhcj5p5xq631";
+ };
+
+ preBuild = ''
+ mv config.mk.template config.mk
+ '';
+
+ installPhase = ''
+ install -D hactool $out/bin/hactool
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/SciresM/hactool";
+ description = "A tool to manipulate common file formats for the Nintendo Switch";
+ longDescription = "A tool to view information about, decrypt, and extract common file formats for the Nintendo Switch, especially Nintendo Content Archives";
+ license = licenses.isc;
+ maintainers = with maintainers; [ ivar ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/tools/filesystems/avfs/default.nix b/pkgs/tools/filesystems/avfs/default.nix
index 2df5043867aa..eaf9ac634a17 100644
--- a/pkgs/tools/filesystems/avfs/default.nix
+++ b/pkgs/tools/filesystems/avfs/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "avfs";
- version = "1.1.1";
+ version = "1.1.2";
src = fetchurl {
url = "mirror://sourceforge/avf/${version}/${pname}-${version}.tar.bz2";
- sha256 = "0fxzigpyi08ipqz30ihjcpqmmx8g7r1kqdqq1bnnznvnhrzyygn8";
+ sha256 = "035b6y49nzgswf5n70aph8pm48sbv9nqwlnp3wwbq892c39kk4xn";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix
index 065a673eb03b..bf6c68072aa2 100644
--- a/pkgs/tools/filesystems/bindfs/default.nix
+++ b/pkgs/tools/filesystems/bindfs/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, fuse, pkgconfig }:
stdenv.mkDerivation rec {
- version = "1.14.4";
+ version = "1.14.5";
pname = "bindfs";
src = fetchurl {
url = "https://bindfs.org/downloads/${pname}-${version}.tar.gz";
- sha256 = "1vk42bq8y13gv4yvajf65qsh59lscwcaw3xv94qpjxld3786i8c7";
+ sha256 = "173c5fcnfbnlw5a437r2x899ax77j3wp8gg8gffhryahcgyn1abq";
};
dontStrip = true;
diff --git a/pkgs/tools/filesystems/catcli/default.nix b/pkgs/tools/filesystems/catcli/default.nix
index 4ac6c1d5b21e..25de04467ef9 100644
--- a/pkgs/tools/filesystems/catcli/default.nix
+++ b/pkgs/tools/filesystems/catcli/default.nix
@@ -7,13 +7,13 @@
buildPythonApplication rec {
pname = "catcli";
- version = "0.5.13";
+ version = "0.6.0";
src = fetchFromGitHub {
owner = "deadc0de6";
repo = pname;
rev = "v${version}";
- sha256 = "04mrkqmm2c8fhi1h1hddc4yh3dqhcvkmcwzhj0ggn34v7wavgb5i";
+ sha256 = "0myhvflph4fayl2bg8m9a7prh5pcnvnb75p0jb4jpmbx7jyn7ihp";
};
propagatedBuildInputs = [ docopt anytree ];
diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix
index ea610dfcc7f0..c2234404d34a 100644
--- a/pkgs/tools/filesystems/ceph/default.nix
+++ b/pkgs/tools/filesystems/ceph/default.nix
@@ -93,7 +93,7 @@ let
]);
sitePackages = ceph-python-env.python.sitePackages;
- version = "14.2.8";
+ version = "14.2.9";
in rec {
ceph = stdenv.mkDerivation {
pname = "ceph";
@@ -101,7 +101,7 @@ in rec {
src = fetchurl {
url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz";
- sha256 = "0p7pjycqhxqg1mmix8ykx3xqq01d560p54iiidxps0rcvwfkyyki";
+ sha256 = "0zkh1a23v8g1fa5flqa2d53lv08ancab3li57gybpqpnja90k7il";
};
patches = [
diff --git a/pkgs/tools/filesystems/fuseiso/default.nix b/pkgs/tools/filesystems/fuseiso/default.nix
index 2d24cb71bbed..0a4472d7123d 100644
--- a/pkgs/tools/filesystems/fuseiso/default.nix
+++ b/pkgs/tools/filesystems/fuseiso/default.nix
@@ -1,40 +1,55 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, fuse, zlib, glib }:
+{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, fuse, glib, zlib }:
-stdenv.mkDerivation {
- name = "fuseiso-20070708";
+stdenv.mkDerivation rec {
+ pname = "fuseiso";
+ version = "20070708";
src = fetchurl {
- url = "mirror://sourceforge/project/fuseiso/fuseiso/20070708/fuseiso-20070708.tar.bz2";
+ url = "mirror://sourceforge/project/fuseiso/fuseiso/${version}/fuseiso-${version}.tar.bz2";
sha256 = "127xql52dcdhmh7s5m9xc6q39jdlj3zhbjar1j821kb6gl3jw94b";
};
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ fuse zlib glib ];
-
- patches = let fetchPatchFromDebian = { patch, sha256 }:
- fetchpatch {
- inherit sha256;
- url = "https://sources.debian.net/data/main/f/fuseiso/20070708-3.2/debian/patches/${patch}";
- };
- in [
- (fetchPatchFromDebian {
- patch = "00-support_large_iso.patch";
+ patches = [
+ (fetchpatch {
+ name = "00-support_large_iso.patch";
+ url = "https://sources.debian.net/data/main/f/fuseiso/${version}-3.2/debian/patches/00-support_large_iso.patch";
sha256 = "1lmclb1qwzz5f4wlq693g83bblwnjjl73qhgfxbsaac5hnn2shjw";
})
- (fetchPatchFromDebian { # CVE-2015-8837
- patch = "02-prevent-buffer-overflow.patch";
+ (fetchpatch {
+ name = "01-fix_typo.patch";
+ url = "https://sources.debian.net/data/main/f/fuseiso/${version}-3.2/debian/patches/01-fix_typo.patch";
+ sha256 = "14rpxp0yylzsgqv0r19l4wx1h5hvqp617gpv1yg0w48amr9drasa";
+ })
+ (fetchpatch {
+ name = "02-prevent-buffer-overflow_CVE-2015-8837.patch";
+ url = "https://sources.debian.net/data/main/f/fuseiso/${version}-3.2/debian/patches/02-prevent-buffer-overflow.patch";
sha256 = "1ls2pp3mh91pdb51qz1fsd8pwhbky6988bpd156bn7wgfxqzh8ig";
})
- (fetchPatchFromDebian { # CVE-2015-8836
- patch = "03-prevent-integer-overflow.patch";
+ (fetchpatch {
+ name = "03-prevent-integer-overflow_CVE-2015-8836.patch";
+ url = "https://sources.debian.net/data/main/f/fuseiso/${version}-3.2/debian/patches/03-prevent-integer-overflow.patch";
sha256 = "100cw07fk4sa3hl7a1gk2hgz4qsxdw99y20r7wpidwwwzy463zcv";
})
];
- meta = {
- homepage = "https://sourceforge.net/projects/fuseiso";
+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
+
+ buildInputs = [ fuse glib zlib ];
+
+ # after autoreconfHook, glib and zlib are not found, so force link against
+ # them
+ NIX_LDFLAGS = "-lglib-2.0 -lz";
+
+ enableParallelBuilding = true;
+
+ postInstall = ''
+ install -Dm444 -t $out/share/doc/${pname} NEWS README
+ '';
+
+ meta = with stdenv.lib; {
description = "FUSE module to mount ISO filesystem images";
- platforms = stdenv.lib.platforms.linux;
- license = stdenv.lib.licenses.gpl2;
+ homepage = "https://sourceforge.net/projects/fuseiso";
+ license = licenses.gpl2;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix
index 5cc6e5c156b2..fa7574767d88 100644
--- a/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/pkgs/tools/filesystems/glusterfs/default.nix
@@ -15,10 +15,10 @@ let
# The command
# find /nix/store/...-glusterfs-.../ -name '*.py' -executable
# can help with finding new Python scripts.
- version = "7.4";
+ version = "7.5";
name="${baseName}-${version}";
url="https://github.com/gluster/glusterfs/archive/v${version}.tar.gz";
- sha256 = "1f7z1dacnx7pd3ri4nka6851fzhdfandbf94blds8bqfqc1263h6";
+ sha256 = "1zahld2v1y920i0p25zcn15a593g3bl5sgnmhkdmn7kvk7mx4p93";
};
buildInputs = [
diff --git a/pkgs/tools/filesystems/tmsu/default.nix b/pkgs/tools/filesystems/tmsu/default.nix
index c7d11d415a51..d8533a4e7778 100644
--- a/pkgs/tools/filesystems/tmsu/default.nix
+++ b/pkgs/tools/filesystems/tmsu/default.nix
@@ -1,55 +1,33 @@
-{ stdenv, fetchgit, fetchFromGitHub, go, fuse }:
+{ stdenv, buildGoPackage, fetchgit, fetchFromGitHub, go, fuse, installShellFiles }:
-stdenv.mkDerivation rec {
+buildGoPackage rec {
pname = "tmsu";
- version = "0.7.4";
-
- go-sqlite3 = fetchgit {
- url = "git://github.com/mattn/go-sqlite3";
- rev = "c9a0db5d8951646743317f0756da0339fe144dd5";
- sha256 = "1m0q9869fis0dhg34g5wc5xi6pby491spfxi23w461h29higbrqh";
- };
-
- go-fuse = fetchgit {
- url = "git://github.com/hanwen/go-fuse";
- rev = "8c85ded140ac1889372a0e22d8d21e3d10a303bd";
- sha256 = "1iph2hpvby2mfwqg9pp39xjqdl9a09h4442yfdn5l67pznljh2bi";
- };
+ version = "0.7.5";
+ goPackagePath = "github.com/oniony/TMSU";
src = fetchFromGitHub {
owner = "oniony";
repo = "tmsu";
rev = "v${version}";
- sha256 = "1g9gxlll2g4qkqbrshq3888sy1lgw6p5dvcrl5qyh6w73yimi1cq";
+ sha256 = "0834hah7p6ad81w60ifnxyh9zn09ddfgrll04kwjxwp7ypbv38wq";
};
- buildInputs = [ go fuse ];
+ goDeps = ./deps.nix;
+
+ buildInputs = [ fuse ];
+ nativeBuildInputs = [ installShellFiles ];
preBuild = ''
- mkdir -p src/github.com/mattn/go-sqlite3/
- ln -s ${go-sqlite3}/* src/github.com/mattn/go-sqlite3
-
- mkdir -p src/github.com/hanwen/go-fuse
- ln -s ${go-fuse}/* src/github.com/hanwen/go-fuse
-
- mkdir -p src/github.com/oniony/tmsu
- ln -s ${src}/* src/github.com/oniony/tmsu
-
- patchShebangs tests/.
-
- export GOPATH=$PWD
- export GOCACHE=$TMPDIR/go-cache
+ mv go/src/${goPackagePath} src
+ mv src/src/${goPackagePath} go/src/${goPackagePath}
+ export GOPATH=$PWD:$GOPATH
'';
- installPhase = ''
- mkdir -p $out/bin
- mkdir -p $out/sbin
- mkdir -p $out/share/man/man1
- mkdir -p $out/share/zsh/site-functions
- make install INSTALL_DIR=$out/bin \
- MOUNT_INSTALL_DIR=$out/sbin \
- MAN_INSTALL_DIR=$out/share/man/man1 \
- ZSH_COMP_INSTALL_DIR=$out/share/zsh/site-functions
+ postInstall = ''
+ mv $bin/bin/{TMSU,tmsu}
+ cp src/misc/bin/* $bin/bin/
+ installManPage src/misc/man/tmsu.1
+ installShellCompletion --zsh src/misc/zsh/_tmsu
'';
meta = with stdenv.lib; {
diff --git a/pkgs/tools/filesystems/tmsu/deps.nix b/pkgs/tools/filesystems/tmsu/deps.nix
new file mode 100644
index 000000000000..90e64b434c4a
--- /dev/null
+++ b/pkgs/tools/filesystems/tmsu/deps.nix
@@ -0,0 +1,39 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
+[
+ {
+ goPackagePath = "github.com/hanwen/go-fuse";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hanwen/go-fuse";
+ rev = "730713460d4fc41afdc2533bd37ff60c94c0c586";
+ sha256 = "1y44d08fxyis99s6jxdr6dbbw5kv3wb8lkhq3xmr886i4w41lz03";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-sqlite3";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-sqlite3";
+ rev = "98a44bcf5949f178c8116fa30e62c9ac2ef65927";
+ sha256 = "108rk74ringkkyx05zlq5khh32fsfi0przyzrpsr1r5j57xrhxj0";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/crypto";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/crypto";
+ rev = "3c4aac89819a5fdc28d906456729d3423fd46969";
+ sha256 = "16q9ay6bl28zrnb377p8lvrs2nd98h7i6y3yi8ccjwzg1czbfdsi";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/sys";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/sys";
+ rev = "1957bb5e6d1f523308b49060df02171d06ddfc77";
+ sha256 = "0imqk4l9785rw7ddvywyf8zn7k3ga6f17ky8rmf8wrri7nknr03f";
+ };
+ }
+]
diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix
index 051adb0742f9..1c437a3f05cd 100644
--- a/pkgs/tools/graphics/pfstools/default.nix
+++ b/pkgs/tools/graphics/pfstools/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, cmake, pkgconfig, darwin
, openexr, zlib, imagemagick, libGLU, libGL, freeglut, fftwFloat
-, fftw, gsl, libexif, perl, opencv, qt5, netpbm
+, fftw, gsl, libexif, perl, opencv2, qt5, netpbm
}:
stdenv.mkDerivation rec {
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [
openexr zlib imagemagick fftwFloat
- fftw gsl libexif perl opencv qt5.qtbase netpbm
+ fftw gsl libexif perl opencv2 qt5.qtbase netpbm
] ++ (if stdenv.isDarwin then (with darwin.apple_sdk.frameworks; [
OpenGL GLUT
]) else [
diff --git a/pkgs/tools/graphics/scrot/default.nix b/pkgs/tools/graphics/scrot/default.nix
index 56df615e5750..f9042645be0b 100644
--- a/pkgs/tools/graphics/scrot/default.nix
+++ b/pkgs/tools/graphics/scrot/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "scrot";
- version = "1.2";
+ version = "1.3";
src = fetchFromGitHub {
owner = "resurrecting-open-source-projects";
repo = pname;
rev = version;
- sha256 = "08gkdby0ysx2mki57z81zlm7vfnq9c1gq692xw67cg5vv2p3320w";
+ sha256 = "0x70hd59ik37kqd8xqpwrz46np01jv324iz28x2s0kk36d7sblsj";
};
nativeBuildInputs = [ autoreconfHook autoconf-archive ];
diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix
index c6f664a10086..9588d0ae9486 100644
--- a/pkgs/tools/misc/autorandr/default.nix
+++ b/pkgs/tools/misc/autorandr/default.nix
@@ -6,7 +6,7 @@
let
python = python3Packages.python;
- version = "1.9";
+ version = "1.10";
in
stdenv.mkDerivation {
pname = "autorandr";
@@ -49,7 +49,7 @@ in
owner = "phillipberndt";
repo = "autorandr";
rev = version;
- sha256 = "1bb0l7fcm5lcx9y02zdxv7pfdqf4v4gsc5br3v1x9gzjvqj64l7n";
+ sha256 = "0rcgs1n09p0p16lr5y239s0yrw7bch0x2cqwgc2dyh7rz7d9qmwn";
};
meta = with stdenv.lib; {
diff --git a/pkgs/tools/misc/bat-extras/default.nix b/pkgs/tools/misc/bat-extras/default.nix
new file mode 100644
index 000000000000..0f98b819b0f7
--- /dev/null
+++ b/pkgs/tools/misc/bat-extras/default.nix
@@ -0,0 +1,147 @@
+{ stdenv, callPackage, fetchFromGitHub, bash, makeWrapper, ncurses, bat
+# batgrep and batwatch
+, less
+# batgrep
+, ripgrep
+# prettybat
+, withShFmt ? shfmt != null, shfmt ? null
+, withPrettier ? nodePackages?prettier, nodePackages ? null
+, withClangTools ? clang-tools != null, clang-tools ? null
+, withRustFmt ? rustfmt != null, rustfmt ? null
+# batwatch
+, withEntr ? entr != null, entr ? null
+ }:
+
+let
+ # Core derivation that all the others are based on.
+ # This includes the complete source so the per-script derivations can run the tests.
+ core = stdenv.mkDerivation rec {
+ pname = "bat-extras";
+ version = "20200408";
+
+ src = fetchFromGitHub {
+ owner = "eth-p";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "184d5rwasfpgbj2k98alg3wy8jmzna2dgfik98w2a297ky67s51v";
+ fetchSubmodules = true;
+ };
+
+ nativeBuildInputs = [ bash makeWrapper ];
+
+ dontConfigure = true;
+
+ postPatch = ''
+ substituteInPlace lib/constants.sh \
+ --replace 'EXECUTABLE_BAT="bat"' 'EXECUTABLE_BAT="${bat}/bin/bat"'
+
+ patchShebangs --build test.sh test/shimexec .test-framework/bin/best.sh
+ wrapProgram .test-framework/bin/best.sh \
+ --prefix PATH : "${ncurses}/bin"
+ '';
+
+ buildPhase = ''
+ runHook preBuild
+ bash ./build.sh --minify=none --no-verify
+ runHook postBuild
+ '';
+
+ # Run the library tests as they don't have external dependencies
+ doCheck = true;
+ checkPhase = ''
+ runHook preCheck
+ # test list repeats suites. Unique them
+ declare -A test_suites
+ while read -r action arg _; do
+ [[ "$action" == "test_suite" && "$arg" == lib_* ]] &&
+ test_suites+=(["$arg"]=1)
+ done <<<"$(bash ./test.sh --compiled --list --porcelain)"
+ (( ''${#test_suites[@]} != 0 )) || {
+ echo "Couldn't find any library test suites"
+ exit 1
+ }
+ bash ./test.sh --compiled $(printf -- "--suite %q\n" "''${!test_suites[@]}")
+ runHook postCheck
+ '';
+
+ installPhase = ''
+ runHook preInstall
+ cp -a . $out
+ runHook postInstall
+ '';
+
+ # A few random files have shebangs. Don't patch them, they don't make it into the final output.
+ # The per-script derivations will go ahead and patch the files they actually install.
+ dontPatchShebangs = true;
+
+ meta = with stdenv.lib; {
+ description = "Bash scripts that integrate bat with various command line tools";
+ homepage = "https://github.com/eth-p/bat-extras";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ bbigras lilyball ];
+ platforms = platforms.all;
+ };
+ };
+ script =
+ name: # the name of the script
+ dependencies: # the tools we need to prefix onto PATH
+ stdenv.mkDerivation {
+ pname = "${core.pname}-${name}";
+ inherit (core) version;
+
+ src = core;
+
+ nativeBuildInputs = [ bash makeWrapper ];
+ # Make the dependencies available to the tests.
+ buildInputs = dependencies;
+
+ # Patch shebangs now because our tests rely on them
+ postPatch = ''
+ patchShebangs --host bin/${name}
+ '';
+
+ dontConfigure = true;
+ dontBuild = true; # we've already built
+
+ doCheck = true;
+ checkPhase = ''
+ runHook preCheck
+ bash ./test.sh --compiled --suite ${name}
+ runHook postCheck
+ '';
+
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $out/bin
+ cp -p bin/${name} $out/bin/${name}
+ '' + stdenv.lib.optionalString (dependencies != []) ''
+ wrapProgram $out/bin/${name} \
+ --prefix PATH : ${stdenv.lib.makeBinPath dependencies}
+ '' + ''
+ runHook postInstall
+ '';
+
+ # We already patched
+ dontPatchShebangs = true;
+
+ inherit (core) meta;
+ };
+ optionalDep = cond: dep:
+ assert cond -> dep != null;
+ stdenv.lib.optional cond dep;
+in
+{
+ batgrep = script "batgrep" [ less ripgrep ];
+ batman = (script "batman" []).overrideAttrs (drv: {
+ doCheck = stdenv.isDarwin; # test fails on Linux due to SIGPIPE (eth-p/bat-extras#19)
+ });
+ batwatch = script "batwatch" ([ less ] ++ optionalDep withEntr entr);
+ prettybat = (script "prettybat" ([]
+ ++ optionalDep withShFmt shfmt
+ ++ optionalDep withPrettier nodePackages.prettier
+ ++ optionalDep withClangTools clang-tools
+ ++ optionalDep withRustFmt rustfmt)
+ ).overrideAttrs (drv: {
+ doCheck = stdenv.isDarwin; # test fails on Linux due to SIGPIPE (eth-p/bat-extras#19)
+ });
+}
diff --git a/pkgs/tools/misc/blsd/default.nix b/pkgs/tools/misc/blsd/default.nix
deleted file mode 100644
index 6e6a9b7c5abd..000000000000
--- a/pkgs/tools/misc/blsd/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, libgit2 }:
-
-buildGoPackage {
- pname = "blsd";
- version = "2017-07-27";
-
- goPackagePath = "github.com/junegunn/blsd";
-
- src = fetchFromGitHub {
- owner = "junegunn";
- repo = "blsd";
- rev = "a2ac619821e502452abdeae9ebab45026893b9e8";
- sha256 = "0b0q6i4i28cjqgxqmwxbps22gp9rcd3jz562q5wvxrwlpbzlls2h";
- };
-
- goDeps = ./deps.nix;
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ libgit2 ];
-
- meta = with stdenv.lib; {
- homepage = "https://github.com/junegunn/blsd";
- description = "List directories in breadth-first order";
- license = licenses.mit;
- maintainers = [ maintainers.magnetophon ];
- platforms = platforms.unix;
- broken = true; # since 2020-02-08, libgit2 is incompatible upstream is dead.
- };
-}
diff --git a/pkgs/tools/misc/blsd/deps.nix b/pkgs/tools/misc/blsd/deps.nix
deleted file mode 100644
index d212f213a60e..000000000000
--- a/pkgs/tools/misc/blsd/deps.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
-[
- {
- goPackagePath = "github.com/libgit2/git2go";
- fetch = {
- type = "git";
- url = "https://github.com/libgit2/git2go";
- rev = "14280de4da0f392935854a7cbdd67b2a5505c3a8";
- sha256 = "17ppd7byzir8rhdk645dmggi700scb8f401yiwx8zy81q41dk1qi";
- };
- }
-]
diff --git a/pkgs/tools/misc/brotab/default.nix b/pkgs/tools/misc/brotab/default.nix
index 7e827f007eb9..854958dc8a3b 100644
--- a/pkgs/tools/misc/brotab/default.nix
+++ b/pkgs/tools/misc/brotab/default.nix
@@ -1,14 +1,14 @@
{ lib, fetchFromGitHub, glibcLocales, python }:
python.pkgs.buildPythonApplication rec {
- version = "1.2.1";
+ version = "1.2.2";
pname = "brotab";
src = fetchFromGitHub {
owner = "balta2ar";
repo = pname;
rev = version;
- sha256 = "14yz0szwzdjvwkw24rma34y6iiwnw9qzsm89gkglc0xxa6msg6j3";
+ sha256 = "1c6npyws705qf9rv70mmh7d0almmpxz87a0n65lhw08lms1h3dl2";
};
propagatedBuildInputs = with python.pkgs; [
diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix
index e63ad0e42af5..9e1671aec9de 100644
--- a/pkgs/tools/misc/chafa/default.nix
+++ b/pkgs/tools/misc/chafa/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec{
- version = "1.4.0";
+ version = "1.4.1";
pname = "chafa";
src = fetchFromGitHub {
owner = "hpjansson";
repo = "chafa";
rev = version;
- sha256 = "0vf658dd9sb2d3yh65c8nals9z0z7rykqqigmxq2h92x2ysjbg6x";
+ sha256 = "13vv2xmfh0dr949bh75448lidvzwxks6f1mjawdg1q8qwzxhzry4";
};
nativeBuildInputs = [ autoconf
diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix
index c42e8cacc73e..96e33e0de244 100644
--- a/pkgs/tools/misc/chezmoi/default.nix
+++ b/pkgs/tools/misc/chezmoi/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "chezmoi";
- version = "1.8.0";
+ version = "1.8.1";
src = fetchFromGitHub {
owner = "twpayne";
repo = "chezmoi";
rev = "v${version}";
- sha256 = "1ww8xcf57csazj3q2569irxg5il29jrx43mq5cif8dvn8xjm00nn";
+ sha256 = "1b8y0wq3myhvjdnwl0i4x85iil7i7kmsjajvbw1a47afm83jkbaw";
};
- modSha256 = "1zmvav19nyqv6yp71mk3lx6szc5vwyf81m8kvcjj9rlzlygmcl8g";
+ modSha256 = "147bbhbcf81i6vyiv9q8abx5qw44fx3qw5v5f6zjnkfajdqlvbsx";
buildFlagsArray = [
"-ldflags=-s -w -X main.version=${version} -X main.builtBy=nixpkgs"
diff --git a/pkgs/tools/misc/clipman/default.nix b/pkgs/tools/misc/clipman/default.nix
index 15eeb8b7b86d..e75ddaa5bab2 100644
--- a/pkgs/tools/misc/clipman/default.nix
+++ b/pkgs/tools/misc/clipman/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "clipman";
- version = "1.4.0";
+ version = "1.5.0";
src = fetchFromGitHub {
owner = "yory8";
repo = pname;
rev = "v${version}";
- sha256 = "0d5w94cylrzhwyb4zfgidh6rr1h82dx5y7cxfa37wx5xxcjyyja1";
+ sha256 = "15s7np57pvh7mqmq016mvhz34f189wd1vrfiamzmps37mdz2nq9i";
};
modSha256 = "1sim3x794kj3wdw0g432zbgh1cimdmmg1hjgynh9jgm3y8w9q7ij";
diff --git a/pkgs/tools/misc/datamash/default.nix b/pkgs/tools/misc/datamash/default.nix
index f66f2b97d141..8e9782506fb9 100644
--- a/pkgs/tools/misc/datamash/default.nix
+++ b/pkgs/tools/misc/datamash/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "datamash";
- version = "1.6";
+ version = "1.7";
src = fetchurl {
url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
- sha256 = "1jvqxcyh0aghnqh3m2rk5av1x0038flcmfzd493vasv1k69vgfdr";
+ sha256 = "1cxdlhgz3wzjqlq8bgwad93fgqymk2abbldfzw1ffnhcp4mmjjjp";
};
meta = with stdenv.lib; {
diff --git a/pkgs/tools/misc/dmg2img/default.nix b/pkgs/tools/misc/dmg2img/default.nix
index df084579b79a..267983dd432c 100644
--- a/pkgs/tools/misc/dmg2img/default.nix
+++ b/pkgs/tools/misc/dmg2img/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib, bzip2, openssl }:
+{ stdenv, fetchurl, zlib, bzip2, openssl, fetchpatch }:
stdenv.mkDerivation rec {
name = "dmg2img-1.6.7";
@@ -8,11 +8,20 @@ stdenv.mkDerivation rec {
sha256 = "066hqhg7k90xcw5aq86pgr4l7apzvnb4559vj5s010avbk8adbh2";
};
- buildInputs = [zlib bzip2 openssl];
+ buildInputs = [ zlib bzip2 openssl ];
+
+ patches = [
+ (fetchpatch {
+ url = "https://raw.githubusercontent.com/Homebrew/formula-patches/85fa66a9/dmg2img/openssl-1.1.diff";
+ sha256 = "076sz69hf3ryylplg025vl8sj991cb81g3yazsmrf8anrd7ffmxx";
+ })
+ ];
+
+ patchFlags = [ "-p0" ];
installPhase = ''
- mkdir -p $out/bin
- cp dmg2img $out/bin
+ install -D dmg2img $out/bin/dmg2img
+ install -D vfdecrypt $out/bin/vfdecrypt
'';
meta = {
diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix
index 2dea0f179a1e..cb000b294723 100644
--- a/pkgs/tools/misc/dua/default.nix
+++ b/pkgs/tools/misc/dua/default.nix
@@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "dua";
- version = "2.5.0";
+ version = "2.6.0";
src = fetchFromGitHub {
owner = "Byron";
repo = "dua-cli";
rev = "v${version}";
- sha256 = "1r94fcygp9mmg457dkksx3mjdxfddzfzl6n0rmxasiinsz0hak4c";
+ sha256 = "1697z9j0xd4il01bcvz1xwzkcg5mbkpp207mshb9csdhwi9a50wg";
# Remove unicode file names which leads to different checksums on HFS+
# vs. other filesystems because of unicode normalisation.
extraPostFetch = ''
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
'';
};
- cargoSha256 = "15a4hari3my59xvmkll2jlvb1jyf8gg8alp91nvh3bagpajpvdx6";
+ cargoSha256 = "1rczq41jpds7kfyf31nxj4v8rk9rccijjixpznhlriam6xhgm90b";
doCheck = false;
diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix
index aeb88d0c68b1..be8134a92a33 100644
--- a/pkgs/tools/misc/entr/default.nix
+++ b/pkgs/tools/misc/entr/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "entr";
- version = "4.4";
+ version = "4.5";
src = fetchurl {
url = "http://entrproject.org/code/${pname}-${version}.tar.gz";
- sha256 = "1x2hyc8vc5dz6k7b3291vxz36wllhinvqrb0d8zx9bv0ydj6qmjl";
+ sha256 = "08gsd99w20fdi0apppmzsh06z29ga8y89nfcizidil2hkl8b7jyn";
};
postPatch = ''
diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix
index 0933e6eae900..38f2145df44a 100644
--- a/pkgs/tools/misc/fluent-bit/default.nix
+++ b/pkgs/tools/misc/fluent-bit/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "fluent-bit";
- version = "1.4.1";
+ version = "1.4.3";
src = fetchFromGitHub {
owner = "fluent";
repo = "fluent-bit";
rev = "v${version}";
- sha256 = "1xfbghaylzsh48ag4aw77nmzm1cds4nx53m4s1fiy0r31sm8vqwl";
+ sha256 = "1x5izsm0b3514i2vl1b3x40chjlzidr5zssn5cpgrw9a8w4jpv6h";
};
nativeBuildInputs = [ cmake flex bison ];
diff --git a/pkgs/tools/misc/hpcg/default.nix b/pkgs/tools/misc/hpcg/default.nix
new file mode 100644
index 000000000000..6274178c266a
--- /dev/null
+++ b/pkgs/tools/misc/hpcg/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, openmpi } :
+
+stdenv.mkDerivation rec {
+ pname = "hpcg";
+ version = "3.1";
+
+ src = fetchurl {
+ url = "http://www.hpcg-benchmark.org/downloads/${pname}-${version}.tar.gz";
+ sha256 = "197lw2nwmzsmfsbvgvi8z7kj69n374kgfzzp8pkmk7mp2vkk991k";
+ };
+
+ dontConfigure = true;
+
+ enableParallelBuilding = true;
+
+ buildInputs = [ openmpi ];
+
+ makeFlags = [ "arch=Linux_MPI" ];
+
+ installPhase = ''
+ mkdir -p $out/bin $out/share/hpcg
+
+ cp bin/xhpcg $out/bin
+ cp bin/hpcg.dat $out/share/hpcg
+ '';
+
+ meta = with stdenv.lib; {
+ description = "HPC conjugate gradient benchmark";
+ homepage = "https://www.hpcg-benchmark.org";
+ platforms = platforms.linux;
+ license = licenses.bsd3;
+ maintainers = [ maintainers.markuskowa ];
+ };
+}
+
diff --git a/pkgs/tools/misc/kak-lsp/default.nix b/pkgs/tools/misc/kak-lsp/default.nix
index 3048b4c93960..2f63eaf43806 100644
--- a/pkgs/tools/misc/kak-lsp/default.nix
+++ b/pkgs/tools/misc/kak-lsp/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "kak-lsp";
- version = "7.0.0";
+ version = "8.0.0";
src = fetchFromGitHub {
owner = "ul";
repo = pname;
rev = "v${version}";
- sha256 = "1b9v417g0z9q1sqgnms5vy740xggg4fcz0fdwbc4hfvfj6jkyaad";
+ sha256 = "0nka51szivwhlfkimjiyzj67nxh75m784c28ass6ihlfax631w9m";
};
- cargoSha256 = "1cmms8kvh24sjb0w77i1bwl09wkx3x65p49pkg1j0lipwic3apm3";
+ cargoSha256 = "174qy50m9487vv151vm8q6sby79dq3gbqjbz6h4326jwsc9wwi8c";
buildInputs = lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
diff --git a/pkgs/tools/misc/mcrypt/default.nix b/pkgs/tools/misc/mcrypt/default.nix
index 9969148e2232..afbe811e7f2f 100644
--- a/pkgs/tools/misc/mcrypt/default.nix
+++ b/pkgs/tools/misc/mcrypt/default.nix
@@ -9,7 +9,12 @@ stdenv.mkDerivation rec {
sha256 = "5145aa844e54cca89ddab6fb7dd9e5952811d8d787c4f4bf27eb261e6c182098";
};
- patches = [ ./format-string.patch ./overflow.patch ./segv.patch ./sprintf.patch ];
+ patches = [
+ ./format-string_CVE-2012-4426.patch
+ ./overflow_CVE-2012-4409.patch
+ ./segv.patch
+ ./sprintf_CVE-2012-4527.patch
+ ];
buildInputs = [ libmcrypt libmhash ];
diff --git a/pkgs/tools/misc/mcrypt/format-string.patch b/pkgs/tools/misc/mcrypt/format-string_CVE-2012-4426.patch
similarity index 100%
rename from pkgs/tools/misc/mcrypt/format-string.patch
rename to pkgs/tools/misc/mcrypt/format-string_CVE-2012-4426.patch
diff --git a/pkgs/tools/misc/mcrypt/overflow.patch b/pkgs/tools/misc/mcrypt/overflow_CVE-2012-4409.patch
similarity index 100%
rename from pkgs/tools/misc/mcrypt/overflow.patch
rename to pkgs/tools/misc/mcrypt/overflow_CVE-2012-4409.patch
diff --git a/pkgs/tools/misc/mcrypt/sprintf.patch b/pkgs/tools/misc/mcrypt/sprintf_CVE-2012-4527.patch
similarity index 100%
rename from pkgs/tools/misc/mcrypt/sprintf.patch
rename to pkgs/tools/misc/mcrypt/sprintf_CVE-2012-4527.patch
diff --git a/pkgs/tools/misc/memtest86-efi/default.nix b/pkgs/tools/misc/memtest86-efi/default.nix
index f2adadc0840b..c33aa074404f 100644
--- a/pkgs/tools/misc/memtest86-efi/default.nix
+++ b/pkgs/tools/misc/memtest86-efi/default.nix
@@ -1,4 +1,10 @@
-{ fetchzip, lib, stdenv, mtools }:
+{ stdenv
+, lib
+, fetchzip
+, utillinux
+, jq
+, mtools
+}:
stdenv.mkDerivation rec {
pname = "memtest86-efi";
@@ -22,19 +28,28 @@ stdenv.mkDerivation rec {
stripRoot = false;
};
- nativeBuildInputs = [ mtools ];
+ nativeBuildInputs = [
+ utillinux
+ jq
+ mtools
+ ];
installPhase = ''
- mkdir -p $out $TEMP/memtest86-files
-
# memtest86 is distributed as a bootable USB image. It contains the actual
# memtest86 EFI app.
#
- # The following uses dd and mcopy to extract the actual EFI app from the
- # usb image so that it can be installed directly on the hard drive.
- dd if=$src/memtest86-usb.img of=$TEMP/ESP.img skip=2048
- mcopy -i $TEMP/ESP.img ::/EFI/BOOT/ $TEMP/memtest86-files/
- mv $TEMP/memtest86-files/BOOT/* $out/
+ # The following uses sfdisk to calculate the offset of the FAT EFI System
+ # Partition in the disk image, and mcopy to extract the actual EFI app from
+ # the filesystem so that it can be installed directly on the hard drive.
+ IMG=$src/memtest86-usb.img
+ ESP_OFFSET=$(sfdisk --json $IMG | jq -r '
+ # Partition type GUID identifying EFI System Partitions
+ def ESP_GUID: "C12A7328-F81F-11D2-BA4B-00A0C93EC93B";
+ .partitiontable |
+ .sectorsize * (.partitions[] | select(.type == ESP_GUID) | .start)
+ ')
+ mkdir $out
+ mcopy -vsi $IMG@@$ESP_OFFSET ::'/EFI/BOOT/*' $out/
'';
meta = with lib; {
diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index d55b2cd6f248..0720ca76f253 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,11 +1,11 @@
{ fetchurl, stdenv, perl, makeWrapper, procps }:
stdenv.mkDerivation rec {
- name = "parallel-20200322";
+ name = "parallel-20200422";
src = fetchurl {
url = "mirror://gnu/parallel/${name}.tar.bz2";
- sha256 = "0kg95glnfg25i1w7qg2vr5v4671vigsazmz4qdf223l64khq8x10";
+ sha256 = "0c2mr2rzsz0y24q4mbm2zmc2fz6bcda4gbc4qgg59sirrj8vzpjb";
};
outputs = [ "out" "man" ];
diff --git a/pkgs/tools/misc/phoronix-test-suite/default.nix b/pkgs/tools/misc/phoronix-test-suite/default.nix
index 617d6675c68c..0abbcd5c3a28 100644
--- a/pkgs/tools/misc/phoronix-test-suite/default.nix
+++ b/pkgs/tools/misc/phoronix-test-suite/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "phoronix-test-suite";
- version = "9.4.1";
+ version = "9.6.0";
src = fetchurl {
url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz";
- sha256 = "1c33c8aihsfdxaqkwy4isrvmjam5j5rdz98vv2apy73638vx3q04";
+ sha256 = "1wgw5lwpm3ylby2llnjiq356cdb3v1jghj7xq659c722wj617i88";
};
buildInputs = [ php ];
diff --git a/pkgs/tools/misc/pistol/default.nix b/pkgs/tools/misc/pistol/default.nix
index 17e9dcbc33a1..1a244cd41039 100644
--- a/pkgs/tools/misc/pistol/default.nix
+++ b/pkgs/tools/misc/pistol/default.nix
@@ -6,16 +6,17 @@
buildGoModule rec {
pname = "pistol";
- version = "0.0.5";
+ version = "0.1.1";
src = fetchFromGitHub {
owner = "doronbehar";
repo = pname;
rev = "v${version}";
- sha256 = "1zxvpmy6c26dhg5wpk5cgaqipw5372crkhm1vaghm8jkiw7sjwvw";
+ sha256 = "1d9c1bhidh781dis4427wramfrla4avqw9y2bmpjp81cqq3nc27d";
};
- modSha256 = "13yxcfd29ziprjsjl2ji7w5i2506hwwl3y0ycaphj2wlcd75rdxs";
+ modSha256 = "0r062nka72ah2nb2gf8dfrrj4sxadkykcqjzkp4c9vwk93mhw41k";
+ buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ];
subPackages = [ "cmd/pistol" ];
diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix
index fec1bee160f9..df76ddf2662c 100644
--- a/pkgs/tools/misc/plantuml/default.nix
+++ b/pkgs/tools/misc/plantuml/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, makeWrapper, jre, graphviz }:
stdenv.mkDerivation rec {
- version = "1.2020.5";
+ version = "1.2020.8";
pname = "plantuml";
src = fetchurl {
url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar";
- sha256 = "1cn1bjah9qvhh3hixa92v804crkgz69mg30k8229a551x3alykhd";
+ sha256 = "0xkv8d31dc0dchr40zzgmjw2wyh4i5vxwdk3fhqpw0pk2frxwc1w";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/tools/misc/profile-sync-daemon/default.nix
index fd17de60f202..790bf73a44dc 100644
--- a/pkgs/tools/misc/profile-sync-daemon/default.nix
+++ b/pkgs/tools/misc/profile-sync-daemon/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, utillinux, coreutils}:
stdenv.mkDerivation rec {
- version = "6.36";
+ version = "6.38";
pname = "profile-sync-daemon";
src = fetchurl {
url = "https://github.com/graysky2/profile-sync-daemon/archive/v${version}.tar.gz";
- sha256 = "0zw9fqpfiz1ld443cw2vp54y86maksmq4mnjs73nlp00nn5z2047";
+ sha256 = "0mhjgd2b3grdaad64b72m8i5rm9k58yx7kpiqmhmd3kl5qlgxagy";
};
installPhase = ''
diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix
index 1bd2fc259eea..1bb7f9582c42 100644
--- a/pkgs/tools/misc/pspg/default.nix
+++ b/pkgs/tools/misc/pspg/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "pspg";
- version = "2.7.1";
+ version = "3.0.7";
src = fetchFromGitHub {
owner = "okbob";
repo = pname;
rev = version;
- sha256 = "1fq8n5naicfv0lsyzfb52c84w40zrsks0x9rrvyyzih4vkhic4vm";
+ sha256 = "10w47hbi6y92imzh1rlwkh5bfj1pnlkfxhbi8lhmy6ggxa62xmf7";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/misc/silicon/default.nix b/pkgs/tools/misc/silicon/default.nix
index 7fc1a63c5abc..a59a14d4b901 100644
--- a/pkgs/tools/misc/silicon/default.nix
+++ b/pkgs/tools/misc/silicon/default.nix
@@ -16,16 +16,16 @@
rustPlatform.buildRustPackage rec {
pname = "silicon";
- version = "0.3.0";
+ version = "0.3.1";
src = fetchFromGitHub {
owner = "Aloxaf";
repo = "silicon";
rev = "v${version}";
- sha256 = "0j211qrkwgll7rm15dk4fcazmxkcqk2zah0qg2s3y0k7cx65bcxy";
+ sha256 = "1avdzs3v6k4jhkadm8i8dlwg0iffqd99xqpi53smd0zgwks744l5";
};
- cargoSha256 = "1i0y3x5rmg27gxrr2lv04sqq7qyiv1bnazfy24l5zgb4akvdg3r5";
+ cargoSha256 = "0bdb4nadrms5jq3s8pby2qfky7112ynd7vd6mw720mshqklk5zyb";
buildInputs = [ llvmPackages.libclang expat freetype ]
++ lib.optionals stdenv.isLinux [ libxcb ]
diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix
index 4d17768b8dcd..12ea456b9f7e 100644
--- a/pkgs/tools/misc/tmux/default.nix
+++ b/pkgs/tools/misc/tmux/default.nix
@@ -21,7 +21,7 @@ in
stdenv.mkDerivation rec {
pname = "tmux";
- version = "3.1a";
+ version = "3.1b";
outputs = [ "out" "man" ];
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
owner = "tmux";
repo = "tmux";
rev = version;
- sha256 = "1j85d5mj7zf3k17wsrm45m79ygc6dljc4as3crvp12r45k8xg9k6";
+ sha256 = "0jvyq4r691bn0wsr8i6c0q0lzss25vm9nx8sv3fhw9cs63ncq04y";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/misc/woeusb/default.nix b/pkgs/tools/misc/woeusb/default.nix
index 4c235b4866f2..991ab6224907 100644
--- a/pkgs/tools/misc/woeusb/default.nix
+++ b/pkgs/tools/misc/woeusb/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, autoreconfHook, makeWrapper
-, coreutils, dosfstools, findutils, gawk, gnugrep, grub2_light, ncurses, ntfs3g, parted, p7zip, utillinux, wget
+, coreutils, dosfstools, findutils, gawk, gnugrep, grub2_light, ncurses, ntfs3g, parted, utillinux, wget
, wxGTK30 }:
stdenv.mkDerivation rec {
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
# should be patched with a less useless default PATH, but for now
# we add everything we need manually.
wrapProgram "$out/bin/woeusb" \
- --set PATH '${stdenv.lib.makeBinPath [ coreutils dosfstools findutils gawk gnugrep grub2_light ncurses ntfs3g parted utillinux wget p7zip ]}'
+ --set PATH '${stdenv.lib.makeBinPath [ coreutils dosfstools findutils gawk gnugrep grub2_light ncurses ntfs3g parted utillinux wget ]}'
'';
doInstallCheck = true;
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 7b58ccfa8531..0a45c27a7a8d 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -18,11 +18,11 @@ buildPythonPackage rec {
# The websites youtube-dl deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
- version = "2020.03.24";
+ version = "2020.05.03";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
- sha256 = "05l4asakakxn53wrvxn6c03fd80zdizdbj6r2cj8c1ja3sj9i8s5";
+ sha256 = "0qigk1bml6vkck4rs0wnmr46j5gkz04zn30jvnw1r4czjs7vnpal";
};
nativeBuildInputs = [ installShellFiles makeWrapper ];
diff --git a/pkgs/tools/misc/zoxide/default.nix b/pkgs/tools/misc/zoxide/default.nix
index a43d41637b10..d2abd143ce45 100644
--- a/pkgs/tools/misc/zoxide/default.nix
+++ b/pkgs/tools/misc/zoxide/default.nix
@@ -6,20 +6,20 @@
rustPlatform.buildRustPackage rec {
pname = "zoxide";
- version = "0.3.1";
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "ajeetdsouza";
repo = "zoxide";
rev = "v${version}";
- sha256 = "1sad18d0pxfdy9gvjmixzgdskg1l7djvzp0aipx7pz0lyi6gs23z";
+ sha256 = "1qkvmjrkcivfzbm6swl5lgvpqz9av9jxcn9i8ms3wz4vfsibmlxv";
};
buildInputs = [
fzf
];
- cargoSha256 = "1sx3s1jnfxylbjr3x6v6j8a6zkl7hfyj4alzlyrsw36b1b64pwqm";
+ cargoSha256 = "1w921f7b6kzc1mjzff1bcs3mg4cp9h48698w2zlv5jzjs7nwgb8n";
meta = with lib; {
description = "A fast cd command that learns your habits";
diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix
index 6398c4b91f13..be6d05ef4269 100644
--- a/pkgs/tools/networking/amass/default.nix
+++ b/pkgs/tools/networking/amass/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "amass";
- version = "3.5.4";
+ version = "3.5.5";
src = fetchFromGitHub {
owner = "OWASP";
repo = "Amass";
rev = "v${version}";
- sha256 = "0sxcyrlgqajmlsicr4j2b8hq2fzw8ai1xsq176bz0f33q9m9wvhf";
+ sha256 = "1w93ia9jr2afgkbaklx2rj0ccd0ghg1qbdg363aqqvyw40ccya1r";
};
- modSha256 = "1yjvwkm2zaf017lai5xl088x1z1ifwsbw56dagyf8z9jk9lhkcj7";
+ modSha256 = "051fxfh7lwrj3hzsgr2c2ga6hksz56673lg35y36sz4d93yldj6f";
outputs = [ "out" "wordlists" ];
diff --git a/pkgs/tools/networking/bandwhich/default.nix b/pkgs/tools/networking/bandwhich/default.nix
index 7522b1629cc4..1a52a7f8987c 100644
--- a/pkgs/tools/networking/bandwhich/default.nix
+++ b/pkgs/tools/networking/bandwhich/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "bandwhich";
- version = "0.13.0";
+ version = "0.14.0";
src = fetchFromGitHub {
owner = "imsnif";
repo = pname;
rev = version;
- sha256 = "0xcn65j2q2pmbvrd5dkjg8anw1r12vizazr1wz4cinhrpsxx8p1p";
+ sha256 = "09lyl9cpb5li7kyh0y78lhgvvb24ssfjmkz65xzbgm5jyrz8rmr4";
};
- cargoSha256 = "16nkmmkla3dlz40qhy04sknm3p2f5qik0ijczcw5ibg5w1jsydfr";
+ cargoSha256 = "0m57cdbghzzjyxr6c0diyrfsjqip1dnqsh0zlapv8myizxy4rrzy";
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix
index 12bfad0c8dfa..f9c1ee4bc315 100644
--- a/pkgs/tools/networking/clash/default.nix
+++ b/pkgs/tools/networking/clash/default.nix
@@ -2,17 +2,17 @@
buildGoModule rec {
pname = "clash";
- version = "0.19.0";
+ version = "0.20.0";
src = fetchFromGitHub {
owner = "Dreamacro";
repo = pname;
rev = "v${version}";
- sha256 = "08zwrnpiihlir83fryani8pr972lmj1sjvhjc5pzlw1hks88i9m2";
+ sha256 = "1nb4hl9x2lj0hy8byz14c2xn6yhrb6pqmhzl002k83qd3zrc6s3p";
};
goPackagePath = "github.com/Dreamacro/clash";
- modSha256 = "05i8mzhxzkgcmaa4gazfl8pq3n8mc4prww0ghl6m28cy7a0vsh7f";
+ modSha256 = "113ynl1f01ihmbc376rb421rrjlxxbc8p9fhxrvpxcsm10rjky8w";
buildFlagsArray = [
"-ldflags="
diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix
index b4a74b620035..a0ee38031390 100644
--- a/pkgs/tools/networking/croc/default.nix
+++ b/pkgs/tools/networking/croc/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "croc";
- version = "8.0.7";
+ version = "8.0.9";
src = fetchFromGitHub {
owner = "schollz";
repo = pname;
rev = "v${version}";
- sha256 = "06iwb2wm9wwcwl88rqhwbrky2ab0kbcyzmcv89vw533glknycw04";
+ sha256 = "0kwpn1nv93f8swzc70j8srddqz7qb33pxc9nhqrd92jhcl4cc7iv";
};
- modSha256 = "1gjigbc9511h3qd12j9ypdnmb5ia4x9f2mk7mxasy9p2xkcfyhpg";
+ modSha256 = "1wcnf3sd4hkfm38q2z03ixys1hbscay5rsac49ng4kabqjh7rxhg";
subPackages = [ "." ];
diff --git a/pkgs/tools/networking/davix/default.nix b/pkgs/tools/networking/davix/default.nix
index 9f1eff220c3c..797791e1c0b9 100644
--- a/pkgs/tools/networking/davix/default.nix
+++ b/pkgs/tools/networking/davix/default.nix
@@ -1,17 +1,17 @@
{ stdenv, fetchurl, cmake, pkgconfig, openssl, libxml2, boost, python3, libuuid }:
stdenv.mkDerivation rec {
- version = "0.7.5";
+ version = "0.7.6";
pname = "davix";
nativeBuildInputs = [ cmake pkgconfig python3 ];
buildInputs = [ openssl libxml2 boost libuuid ];
- # using the url below since the 0.7.5 release did carry a broken CMake file,
+ # using the url below since the 0.7.6 release did carry a broken CMake file,
# supposedly fixed in the next release
# https://github.com/cern-fts/davix/issues/40
src = fetchurl {
url = "http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/davix/${version}/davix-${version}.tar.gz";
- sha256 = "1j3gzsjhzrsk6irxalc3rwgp9cqb52chriadmy1mv1s6d2bwl86r";
+ sha256 = "0wq66spnr616cns72f9dvr2xfvkdvfqqmc6d7dx29fpp57zzvrx2";
};
diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix
index 6f57e9812397..3877e6f0e1ac 100644
--- a/pkgs/tools/networking/dnsproxy/default.nix
+++ b/pkgs/tools/networking/dnsproxy/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "dnsproxy";
- version = "0.24.0";
+ version = "0.27.1";
src = fetchFromGitHub {
owner = "AdguardTeam";
repo = pname;
rev = "v${version}";
- sha256 = "1jwy2qi99ks6zcas6h1n0zq3b0k47036ayas0mprdips60azw0hg";
+ sha256 = "0nsj75aw5dym1pzn18p6fzh17vcryz1xs4xly6ga79dkpyijr9j8";
};
- modSha256 = "0kba3jay6m9ir1pc7i833p7ylbs610g0lkp8kc3gm47xnxy7j4gz";
+ modSha256 = "1m8565hkn981b6xld8jyrbxay48ww8lzr94kgakx0rg5548kd7v5";
meta = with stdenv.lib; {
description = "Simple DNS proxy with DoH, DoT, and DNSCrypt support";
diff --git a/pkgs/tools/networking/drill/default.nix b/pkgs/tools/networking/drill/default.nix
new file mode 100644
index 000000000000..572dc0d83848
--- /dev/null
+++ b/pkgs/tools/networking/drill/default.nix
@@ -0,0 +1,33 @@
+{ stdenv
+, rustPlatform
+, fetchFromGitHub
+, pkg-config
+, openssl
+, Security
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "drill";
+ version = "0.6.0";
+
+ src = fetchFromGitHub {
+ owner = "fcsonline";
+ repo = pname;
+ rev = version;
+ sha256 = "0pcc91nk68z7hlhj7xvh6v3rybxpy6bzv3pzjcyaq7l0szjljrpw";
+ };
+
+ cargoSha256 = "1611w8b60d3x16ik8v96za0mkr5p0f9gdpz0awprfgj6c3r6s16m";
+
+ nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ];
+ buildInputs = [ ]
+ ++ stdenv.lib.optionals stdenv.isLinux [ openssl ]
+ ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
+ meta = with stdenv.lib; {
+ description = "HTTP load testing application inspired by Ansible syntax";
+ homepage = "https://github.com/fcsonline/drill";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ filalex77 ];
+ };
+}
diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix
index 9f7d79bdd88c..2a551c56768c 100644
--- a/pkgs/tools/networking/inadyn/default.nix
+++ b/pkgs/tools/networking/inadyn/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "inadyn";
- version = "2.6";
+ version = "2.7";
src = fetchFromGitHub {
owner = "troglobit";
repo = "inadyn";
rev = "v${version}";
- sha256 = "013kxlglxliajv3lrsix4w88w40g709rvycajb6ad6gbh8giqv47";
+ sha256 = "00jhayx0hfl9dw78d58bdxa5390bvxq73lz26q9h1gg1xw76adan";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix
index 3bd03f385646..0649eb021720 100644
--- a/pkgs/tools/networking/minio-client/default.nix
+++ b/pkgs/tools/networking/minio-client/default.nix
@@ -2,22 +2,20 @@
buildGoModule rec {
pname = "minio-client";
- version = "2020-04-04T05-28-55Z";
+ version = "2020-04-25T00-43-23Z";
src = fetchFromGitHub {
owner = "minio";
repo = "mc";
rev = "RELEASE.${version}";
- sha256 = "09z28fq492d4l0089d1knq4zah9p2b212pkz777vznw9lzfqqip8";
+ sha256 = "0ff2fyr3787zp0lpgbph064am33py2wzjikzmxd3zwp3y0dic770";
};
- modSha256 = "0cv824ar5ifsg93sylrfjmax6zqm5073y95hqqfcc1dfp0mv2ki3";
+ modSha256 = "1bcz7jchfnglypr2md9hhqbvcbghic2yp6njdrx3m5nqhylypzfx";
subPackages = [ "." ];
- preBuild = ''
- buildFlagsArray+=("-ldflags=-X github.com/minio/mc/cmd.Version=${version}")
- '';
+ buildFlagsArray = [ "-ldflags=-s -w -X github.com/minio/mc/cmd.Version=${version}" ];
meta = with stdenv.lib; {
homepage = "https://github.com/minio/mc";
diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix
index c103637c6858..79c314f9860a 100644
--- a/pkgs/tools/networking/mu/default.nix
+++ b/pkgs/tools/networking/mu/default.nix
@@ -1,7 +1,8 @@
{ stdenv, fetchFromGitHub, sqlite, pkgconfig, autoreconfHook, pmccabe
, xapian, glib, gmime3, texinfo , emacs, guile
, gtk3, webkitgtk, libsoup, icu
-, withMug ? false }:
+, withMug ? false
+, batchSize ? null }:
stdenv.mkDerivation rec {
pname = "mu";
@@ -14,6 +15,11 @@ stdenv.mkDerivation rec {
sha256 = "1i9chd8ks1q4g5pyscsir6pw4kahkx3k8ckzbi8j3gr6jz1qzzsg";
};
+ postPatch = stdenv.lib.optionalString (batchSize != null) ''
+ sed -i lib/mu-store.cc --regexp-extended \
+ -e 's@(constexpr auto BatchSize).*@\1 = ${toString batchSize};@'
+ '';
+
buildInputs = [
sqlite xapian glib gmime3 texinfo emacs guile libsoup icu
] ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk ];
diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix
index c0c7b6782dfc..9eb9afcb0e78 100644
--- a/pkgs/tools/networking/netsniff-ng/default.nix
+++ b/pkgs/tools/networking/netsniff-ng/default.nix
@@ -4,14 +4,14 @@
stdenv.mkDerivation rec {
pname = "netsniff-ng";
- version = "0.6.6";
+ version = "0.6.7";
# Upstream recommends and supports git
src = fetchFromGitHub {
repo = pname;
owner = pname;
rev = "v${version}";
- sha256 = "0spp8dl4i5xcqfbqxxcpdf3gwcmyf4ywl1dd79w6gzbr07p894p5";
+ sha256 = "1jvihq30cwlpjqwny0lcrciysn40wscq6xik3s9b81nw2s7wiyqr";
};
nativeBuildInputs = [ pkgconfig makeWrapper bison flex ];
diff --git a/pkgs/tools/networking/network-manager/strongswan/default.nix b/pkgs/tools/networking/network-manager/strongswan/default.nix
index 4f0a516b4201..a1c6962d3f9a 100644
--- a/pkgs/tools/networking/network-manager/strongswan/default.nix
+++ b/pkgs/tools/networking/network-manager/strongswan/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "NetworkManager-strongswan";
- version = "1.4.5";
+ version = "1.5.0";
src = fetchurl {
url = "https://download.strongswan.org/NetworkManager/${pname}-${version}.tar.bz2";
- sha256 = "015xcj42pd84apa0j0n9r3fhldp42mj72dqvl2xf4r9gwg5nhfrl";
+ sha256 = "1x6hivr1v76fxy1dn82xrj9rj8k3r097kf4yiblqq16y631hxzy4";
};
buildInputs = [ networkmanager strongswanNM libsecret gtk3 libnma ];
diff --git a/pkgs/tools/networking/tendermint/default.nix b/pkgs/tools/networking/tendermint/default.nix
index 2bf907380e06..90b16e37ed78 100644
--- a/pkgs/tools/networking/tendermint/default.nix
+++ b/pkgs/tools/networking/tendermint/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "tendermint";
- version = "0.32.10";
+ version = "0.32.11";
src = fetchFromGitHub {
owner = "tendermint";
repo = pname;
rev = "v${version}";
- sha256 = "0rf00fqbf8xvxbxnhki93knwdp4bqjvv548ia8c0w6cryj07plyg";
+ sha256 = "17p7khfiv5aflpl4imbqp8v7gignd6v6a7g80xlnzgix5ismh84l";
};
- modSha256 = "08f03haxzpi57gaxymsbzs0nbbgnf6z4gmpal476xy3gvc0dyi3r";
+ modSha256 = "1sdjzj52gkqk51ml29hijzv64clmi38km5z7j7paf28dla2brfxq";
meta = with stdenv.lib; {
description = "Byzantine-Fault Tolerant State Machines. Or Blockchain, for short.";
diff --git a/pkgs/tools/networking/tridactyl-native/default.nix b/pkgs/tools/networking/tridactyl-native/default.nix
index 5efca2cb7fd3..bca0fcb81c7e 100644
--- a/pkgs/tools/networking/tridactyl-native/default.nix
+++ b/pkgs/tools/networking/tridactyl-native/default.nix
@@ -7,13 +7,13 @@ stdenv.mkDerivation rec {
pname = "tridactyl-native";
# this is actually the version of tridactyl itself; the native messenger will
# probably not change with every tridactyl version
- version = "1.17.1";
+ version = "1.18.1";
src = fetchFromGitHub {
owner = "tridactyl";
repo = "tridactyl";
rev = version;
- sha256 = "197vh3k9nh58djl6ph0lznkdb2schqlksxxr93xjkk4xsc7k6j1g";
+ sha256 = "0f4agsh0gqpyhl3nysv4x9f74hlnch27gp3l8bpl645kbbfkg0di";
};
sourceRoot = "source/native";
diff --git a/pkgs/tools/nix/cached-nix-shell/default.nix b/pkgs/tools/nix/cached-nix-shell/default.nix
index dc69d3f030d7..03f6bc2b1171 100644
--- a/pkgs/tools/nix/cached-nix-shell/default.nix
+++ b/pkgs/tools/nix/cached-nix-shell/default.nix
@@ -34,7 +34,7 @@ in rustPlatform.buildRustPackage rec {
postInstall = ''
mkdir -p $out/lib $out/share/cached-nix-shell $out/share/man/man1 $out/var/empty
- cp target/release/build/cached-nix-shell-*/out/trace-nix.so $out/lib
+ cp $releaseDir/build/cached-nix-shell-*/out/trace-nix.so $out/lib
cp rcfile.sh $out/share/cached-nix-shell/rcfile.sh
cp cached-nix-shell.1 $out/share/man/man1
'';
diff --git a/pkgs/tools/nix/nixpkgs-fmt/default.nix b/pkgs/tools/nix/nixpkgs-fmt/default.nix
index b95bb46a8440..53e70ad7bd7d 100644
--- a/pkgs/tools/nix/nixpkgs-fmt/default.nix
+++ b/pkgs/tools/nix/nixpkgs-fmt/default.nix
@@ -1,16 +1,16 @@
-{ lib, rustPlatform, fetchFromGitHub }:
+{ lib, rustPlatform, fetchFromGitHub, fetchpatch }:
rustPlatform.buildRustPackage rec {
pname = "nixpkgs-fmt";
- version = "0.8.0";
+ version = "0.9.0";
src = fetchFromGitHub {
owner = "nix-community";
repo = pname;
rev = "v${version}";
- sha256 = "09lhi8aidw9qf94n07mgs2nfac32a96wkx50glj35dhn06iwzwqr";
+ sha256 = "1kkw87c63nx5pqsxcwn6iw27k02j9ls21zyhb5dvf0zaqd9sz7ad";
};
-
- cargoSha256 = "15m40d9354412h51zn806pxsqjai48xiw8chf8slbi0cjxd268j9";
+
+ cargoSha256 = "1wybvm9qckx9cd656gx9zrbszmaj66ihh2kk6qqdb6maixcq5k0x";
meta = with lib; {
description = "Nix code formatter for nixpkgs";
diff --git a/pkgs/tools/package-management/cargo-audit/default.nix b/pkgs/tools/package-management/cargo-audit/default.nix
index fba2b82ff32b..01acc2ed6ed8 100644
--- a/pkgs/tools/package-management/cargo-audit/default.nix
+++ b/pkgs/tools/package-management/cargo-audit/default.nix
@@ -1,16 +1,16 @@
{ stdenv, lib, rustPlatform, fetchFromGitHub, openssl, pkg-config, Security, libiconv }:
rustPlatform.buildRustPackage rec {
pname = "cargo-audit";
- version = "0.11.2";
+ version = "0.12.0";
src = fetchFromGitHub {
owner = "RustSec";
repo = "cargo-audit";
rev = "v${version}";
- sha256 = "0py4z50ld4vs0g7vh8ga6v5h11nz2yfcpr3xqzpihf4p7sg1mdf4";
+ sha256 = "0zby9bd64bmrkb229ic7ckn2ycf9bpwsisx2a7z0id0j4mjaca4k";
};
- cargoSha256 = "0n4q8767aby6fgq0z7wj966zgqydlwirrzgyahf234dz6arsxw2l";
+ cargoSha256 = "1w4618w5yj1205d7s2hq273fb35qfcd7cnxdwxn4pq8x3ahgy4kx";
buildInputs = [ openssl libiconv ] ++ lib.optionals stdenv.isDarwin [ Security ];
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/tools/package-management/cargo-outdated/default.nix b/pkgs/tools/package-management/cargo-outdated/default.nix
index 41b6d26d02d8..1a20c6b9ab64 100644
--- a/pkgs/tools/package-management/cargo-outdated/default.nix
+++ b/pkgs/tools/package-management/cargo-outdated/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-outdated";
- version = "0.9.9";
+ version = "0.9.10";
src = fetchFromGitHub {
owner = "kbknapp";
repo = pname;
rev = "v${version}";
- sha256 = "01yvkfclrynv7gpvdckzbcv03xr28yb4v6333a6nv6gy05p26g3a";
+ sha256 = "1aj76wwpnvniv5xdygfv17kj74rxxkvngkvw2019qinm2nv81c3p";
};
- cargoSha256 = "152f2f16d5vlww51aldvh1r2r4kx8ad5d48dc30xsfj669zzw24h";
+ cargoSha256 = "0nzxx31nlmrcrcs67z1wci0d4n6kdq83z2ld4bq8xgp6p916f4sl";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]
diff --git a/pkgs/tools/package-management/clib/default.nix b/pkgs/tools/package-management/clib/default.nix
index 5fdf6d663627..c7e3c0fb6653 100644
--- a/pkgs/tools/package-management/clib/default.nix
+++ b/pkgs/tools/package-management/clib/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, curl }:
stdenv.mkDerivation rec {
- version = "1.11.2";
+ version = "1.11.3";
pname = "clib";
src = fetchFromGitHub {
rev = version;
owner = "clibs";
repo = "clib";
- sha256 = "03q5l873zc1dm478f35ibqandypakf47hzqb5gjpnpbcyb2m2jxz";
+ sha256 = "0qwds9w9y2dy39bwh2523wra5dj820cjl11ynkshh7k94fk7qgpm";
};
hardeningDisable = [ "fortify" ];
diff --git a/pkgs/tools/package-management/emplace/default.nix b/pkgs/tools/package-management/emplace/default.nix
index 389d1feb346d..4c5917776914 100644
--- a/pkgs/tools/package-management/emplace/default.nix
+++ b/pkgs/tools/package-management/emplace/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "emplace";
- version = "0.2.19";
+ version = "0.3.1";
src = fetchFromGitHub {
owner = "tversteeg";
repo = pname;
rev = "v${version}";
- sha256 = "0vw0axnb7gil6lr72rixp4v3pspi0jq99x8h954mdcff2jr031x5";
+ sha256 = "0wg8wavbs063dnpjia7wd60nf97v7pl4lm6s9xndpai1r1c99c2d";
};
- cargoSha256 = "118rxiwvi9k6jq5y0k7yn4w9zlb0fd6xdcyrv38ipr8qrj16cjrq";
+ cargoSha256 = "0igq8aml22c26w43zgk2gii8yl8mhs8ikfh0bn32ajwigqfk4vaq";
meta = with lib; {
description = "Mirror installed software on multiple machines";
diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/tools/package-management/home-manager/default.nix
index 8c70a5a47242..d82664ff903d 100644
--- a/pkgs/tools/package-management/home-manager/default.nix
+++ b/pkgs/tools/package-management/home-manager/default.nix
@@ -35,6 +35,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A user environment configurator";
+ homepage = "https://rycee.gitlab.io/home-manager/";
maintainers = with maintainers; [ rycee ];
platforms = platforms.unix;
license = licenses.mit;
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 96fd1bebdd45..62192485391f 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -177,7 +177,7 @@ in rec {
nixStable = callPackage common (rec {
name = "nix-2.3.4";
src = fetchurl {
- url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
+ url = "https://nixos.org/releases/nix/${name}/${name}.tar.xz";
sha256 = "1c626a0de0acc69830b1891ec4d3c96aabe673b2a9fd04cef84f2304d05ad00d";
};
@@ -207,18 +207,18 @@ in rec {
nixFlakes = lib.lowPrio (callPackage common rec {
name = "nix-2.4${suffix}";
- suffix = "pre20200403_3473b19";
+ suffix = "pre20200501_941f952";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
- rev = "3473b1950a90d596a3baa080fdfdb080f55a5cc0";
- sha256 = "1bb7a8a5lzmb3pzq80zxd3s9y3qv757q7032s5wvp75la9wgvmvr";
+ rev = "941f95284ab57e9baa317791327cf1715d8564b5";
+ sha256 = "0d99jl5baxji5dmqb4fwmbffx0z04k0naanms5zzbwvxdmzn3yhs";
};
crates = fetchurl {
- url = "https://hydra.nixos.org/build/115942497/download/1/nix-vendored-crates-2.4pre20200403_3473b19.tar.xz";
- sha256 = "a83785553bb4bc5b28220562153e201ec555a00171466ac08b716f0c97aee45a";
+ url = "https://hydra.nixos.org/build/118093786/download/1/nix-vendored-crates-2.4pre20200501_941f952.tar.xz";
+ sha256 = "060f4n5srdbb8vsj0m14aqch7im79a4h5g3nrs41p1xc602vhcdl";
};
inherit storeDir stateDir confDir boehmgc;
diff --git a/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix b/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix
index e6e30b26240f..dc0c733ca7b1 100644
--- a/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix
+++ b/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix
@@ -3,7 +3,7 @@
callPackage ./generic.nix (rec {
version = "1.6.1";
src = fetchurl {
- url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2";
+ url = "https://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2";
sha256 = "0lfx5fhyg3z6725ydsk0ibg5qqzp5s0x9nbdww02k8s307axiah3";
};
nixopsAzurePackages = with python2Packages; [
diff --git a/pkgs/tools/security/aflplusplus/default.nix b/pkgs/tools/security/aflplusplus/default.nix
index a52ea88950c0..f99be6d75758 100644
--- a/pkgs/tools/security/aflplusplus/default.nix
+++ b/pkgs/tools/security/aflplusplus/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, callPackage, makeWrapper
-, clang, llvm, gcc, which, libcgroup, python, perl, gmp
-, wine ? null
+{ stdenv, stdenvNoCC, fetchFromGitHub, callPackage, makeWrapper
+, clang_9, llvm_9, gcc, which, libcgroup, python, perl, gmp
+, file, cmocka, wine ? null, fetchpatch
}:
# wine fuzzing is only known to work for win32 binaries, and using a mixture of
@@ -15,24 +15,52 @@ let
else throw "aflplusplus: no support for ${stdenv.targetPlatform.system}!";
libdislocator = callPackage ./libdislocator.nix { inherit aflplusplus; };
libtokencap = callPackage ./libtokencap.nix { inherit aflplusplus; };
- aflplusplus = stdenv.mkDerivation rec {
+ aflplusplus = stdenvNoCC.mkDerivation rec {
pname = "aflplusplus";
- version = "2.59c";
+ version = "2.64c";
src = fetchFromGitHub {
- owner = "vanhauser-thc";
+ owner = "AFLplusplus";
repo = "AFLplusplus";
rev = version;
- sha256 = "1ik33ifk4n96762iv1h4kl4jf9yvsq2hgs097wkiy589siw44g5r";
+ sha256 = "0n618pk6nlmkcbv1qm05fny4mnhcprrw0ppmra1phvk1y22iildj";
};
enableParallelBuilding = true;
+ # build of unsigaction32 broken in 2.64c:
+ # https://github.com/AFLplusplus/AFLplusplus/commit/079fdbf9bc5be1adba19e4bd08be965bd4dd79dc#commitcomment-38428357
+ # The applied patch fixes it.
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/AFLplusplus/AFLplusplus/commit/5b9928f1a9d4b017ea04365ca8b522fde71236eb.patch";
+ sha256 = "1m4w9w4jaxb2mjkwvr6r4qa2j5cdzzpchjphpwd95861h0zvb6hh";
+ })
+ ];
+
# Note: libcgroup isn't needed for building, just for the afl-cgroup
# script.
- nativeBuildInputs = [ makeWrapper which ];
- buildInputs = [ llvm python gmp ]
+ nativeBuildInputs = [ makeWrapper which clang_9 gcc ];
+ buildInputs = [ llvm_9 python gmp ]
++ stdenv.lib.optional (wine != null) python.pkgs.wrapPython;
+
+ postPatch = ''
+ # Replace the CLANG_BIN variables with the correct path
+ substituteInPlace llvm_mode/afl-clang-fast.c \
+ --replace "CLANGPP_BIN" '"${clang_9}/bin/clang++"' \
+ --replace "CLANG_BIN" '"${clang_9}/bin/clang"' \
+ --replace 'getenv("AFL_PATH")' "(getenv(\"AFL_PATH\") ? getenv(\"AFL_PATH\") : \"$out/lib/afl\")"
+
+ # Replace "gcc" and friends with full paths in afl-gcc
+ # Prevents afl-gcc picking up any (possibly incorrect) gcc from the path
+ substituteInPlace src/afl-gcc.c \
+ --replace '"gcc"' '"${gcc}/bin/gcc"' \
+ --replace '"g++"' '"${gcc}/bin/g++"' \
+ --replace '"gcj"' '"gcj-UNSUPPORTED"' \
+ --replace '"clang"' '"clang-UNSUPPORTED"' \
+ --replace '"clang++"' '"clang++-UNSUPPORTED"'
+ '';
+
makeFlags = [ "PREFIX=$(out)" ];
buildPhase = ''
common="$makeFlags -j$NIX_BUILD_CORES"
@@ -45,6 +73,9 @@ let
'';
postInstall = ''
+ # remove afl-clang(++) which are just symlinks to afl-clang-fast
+ rm $out/bin/afl-clang $out/bin/afl-clang++
+
# the makefile neglects to install unsigaction
cp qemu_mode/unsigaction/unsigaction*.so $out/lib/afl/
@@ -61,36 +92,15 @@ let
cp ${libtokencap}/bin/get-libtokencap-so $out/bin/
# Install the cgroups wrapper for asan-based fuzzing.
- cp experimental/asan_cgroups/limit_memory.sh $out/bin/afl-cgroup
+ cp examples/asan_cgroups/limit_memory.sh $out/bin/afl-cgroup
chmod +x $out/bin/afl-cgroup
substituteInPlace $out/bin/afl-cgroup \
--replace "cgcreate" "${libcgroup}/bin/cgcreate" \
--replace "cgexec" "${libcgroup}/bin/cgexec" \
--replace "cgdelete" "${libcgroup}/bin/cgdelete"
- # Patch shebangs before wrapping
patchShebangs $out/bin
- # Wrap afl-clang-fast(++) with a *different* AFL_PATH, because it
- # has totally different semantics in that case(?) - and also set a
- # proper AFL_CC and AFL_CXX so we don't pick up the wrong one out
- # of $PATH.
- # first though we need to replace the afl-clang-fast++ symlink with
- # a real copy to prevent wrapProgram skipping the symlink and confusing
- # nix's cc wrapper
- rm $out/bin/afl-clang-fast++
- cp $out/bin/afl-clang-fast $out/bin/afl-clang-fast++
- for x in $out/bin/afl-clang-fast $out/bin/afl-clang-fast++; do
- wrapProgram $x \
- --set-default AFL_PATH "$out/lib/afl" \
- --run 'export AFL_CC=''${AFL_CC:-${clang}/bin/clang} AFL_CXX=''${AFL_CXX:-${clang}/bin/clang++}'
- done
- # do similar for afl-gcc and afl-gcc-fast
- for x in $out/bin/afl-gcc $out/bin/afl-gcc-fast; do
- wrapProgram $x \
- --set-default AFL_PATH "$out/lib/afl" \
- --run 'export AFL_CC=''${AFL_CC:-${gcc}/bin/gcc} AFL_CXX=''${AFL_CXX:-${gcc}/bin/g++}'
- done
'' + stdenv.lib.optionalString (wine != null) ''
substitute afl-wine-trace $out/bin/afl-wine-trace \
--replace "qemu_mode/unsigaction" "$out/lib/afl"
@@ -105,17 +115,15 @@ let
wrapPythonProgramsIn $out/bin ${python.pkgs.pefile}
'';
- installCheckInputs = [ perl ];
+ installCheckInputs = [ perl file cmocka ];
doInstallCheck = true;
installCheckPhase = ''
# replace references to tools in build directory with references to installed locations
substituteInPlace test/test.sh \
- --replace '`which gcc`' "" \
--replace '../libcompcov.so' '`$out/bin/get-afl-qemu-libcompcov-so`' \
--replace '../libdislocator.so' '`$out/bin/get-libdislocator-so`' \
--replace '../libtokencap.so' '`$out/bin/get-libtokencap-so`'
- perl -pi -e 's|(?<=\s)gcc(?=\s)|${gcc}/bin/gcc|g' test/test.sh
- perl -pi -e 's|(\.\./)(\S+?)(? all.patch
'';
diff --git a/pkgs/tools/security/bitwarden_rs/default.nix b/pkgs/tools/security/bitwarden_rs/default.nix
index 6accefa58a4f..6d3c4bccef9f 100644
--- a/pkgs/tools/security/bitwarden_rs/default.nix
+++ b/pkgs/tools/security/bitwarden_rs/default.nix
@@ -8,13 +8,13 @@ let
in rustPlatform.buildRustPackage rec {
pname = "bitwarden_rs";
- version = "1.14.1";
+ version = "1.14.2";
src = fetchFromGitHub {
owner = "dani-garcia";
repo = pname;
rev = version;
- sha256 = "10fi5vvckmdbjvlg6mlaqh2dsm33sbkq1z1b6gmz8qjbijc8i7gw";
+ sha256 = "0413yjbnj4k917x48h1gnj64kygbr6c1n55f23qkvj0hgbxpgssz";
};
nativeBuildInputs = [ pkgconfig ];
@@ -25,7 +25,7 @@ in rustPlatform.buildRustPackage rec {
RUSTC_BOOTSTRAP = 1;
- cargoSha256 = "1p8wpndj1aydhcjl15z3xhjf52a0l5rh5cy9qs6w4776crya2jjr";
+ cargoSha256 = "09747f9g7yyq9c8wbfdb3hwxii5xq23ynhba0vc01nhjpjyn0ksd";
cargoBuildFlags = [ featuresFlag ];
checkPhase = ''
diff --git a/pkgs/tools/security/bitwarden_rs/vault.nix b/pkgs/tools/security/bitwarden_rs/vault.nix
index 43d8d3a9b118..0c60ab621063 100644
--- a/pkgs/tools/security/bitwarden_rs/vault.nix
+++ b/pkgs/tools/security/bitwarden_rs/vault.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "bitwarden_rs-vault";
- version = "2.13.2";
+ version = "2.13.2b";
src = fetchurl {
url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz";
- sha256 = "1000iqjr670imm1dlw9r003d8psp5sq0m0p62sjnll7wnycd805r";
+ sha256 = "1pba3d04gfnviv8r98anpv7m8r9r417s352r5fz8qzg8lr070540";
};
buildCommand = ''
diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix
index b9cffc7f769d..e74e1b61438a 100644
--- a/pkgs/tools/security/ccid/default.nix
+++ b/pkgs/tools/security/ccid/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ccid";
- version = "1.4.31";
+ version = "1.4.32";
src = fetchurl {
url = "https://ccid.apdu.fr/files/${pname}-${version}.tar.bz2";
- sha256 = "1xz8ikr6vk73w3xnwb931yq8lqc1zrj8c3v34n6h63irwjvdfj3b";
+ sha256 = "0f8nzk7379ip4x2ii5vn6h67jyx733pq0ywnnsj2llbxi2vllpsl";
};
postPatch = ''
diff --git a/pkgs/tools/security/doas/default.nix b/pkgs/tools/security/doas/default.nix
index ce8b5825647c..58ada1086bcf 100644
--- a/pkgs/tools/security/doas/default.nix
+++ b/pkgs/tools/security/doas/default.nix
@@ -1,15 +1,19 @@
-{ stdenv, lib, fetchFromGitHub, bison, pam }:
+{ stdenv
+, lib
+, fetchFromGitHub
+, bison
+, pam
+}:
stdenv.mkDerivation rec {
pname = "doas";
-
- version = "6.0";
+ version = "6.6.1";
src = fetchFromGitHub {
owner = "Duncaen";
repo = "OpenDoas";
rev = "v${version}";
- sha256 = "1j50l3jvbgvg8vmp1nx6vrjxkbj5bvfh3m01bymzfn25lkwwhz1x";
+ sha256 = "07kkc5729p654jrgfsc8zyhiwicgmq38yacmwfvay2b3gmy728zn";
};
# otherwise confuses ./configure
@@ -26,6 +30,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/Duncaen/OpenDoas";
license = licenses.isc;
platforms = platforms.linux;
- maintainers = with maintainers; [ cstrahan ];
+ maintainers = with maintainers; [ cole-h cstrahan ];
};
}
diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix
index 410b63ec7d75..59a5e800aedb 100644
--- a/pkgs/tools/security/gopass/default.nix
+++ b/pkgs/tools/security/gopass/default.nix
@@ -1,4 +1,11 @@
-{ stdenv, buildGoModule, fetchFromGitHub, git, gnupg, xclip, wl-clipboard, installShellFiles, makeWrapper }:
+{ stdenv, makeWrapper
+, buildGoModule, fetchFromGitHub, installShellFiles
+, git
+, gnupg
+, xclip
+, wl-clipboard
+, passAlias ? false
+}:
buildGoModule rec {
pname = "gopass";
@@ -28,6 +35,8 @@ buildGoModule rec {
$out/bin/gopass completion $shell > gopass.$shell
installShellCompletion gopass.$shell
done
+ '' + stdenv.lib.optionalString passAlias ''
+ ln -s $out/bin/gopass $out/bin/pass
'';
postFixup = ''
@@ -39,7 +48,7 @@ buildGoModule rec {
description = "The slightly more awesome Standard Unix Password Manager for Teams. Written in Go.";
homepage = "https://www.gopass.pw/";
license = licenses.mit;
- maintainers = with maintainers; [ andir ];
+ maintainers = with maintainers; [ andir rvolosatovs ];
platforms = platforms.unix;
longDescription = ''
diff --git a/pkgs/tools/security/hcxtools/default.nix b/pkgs/tools/security/hcxtools/default.nix
index 84517ce2bd8b..5634ee6cff06 100644
--- a/pkgs/tools/security/hcxtools/default.nix
+++ b/pkgs/tools/security/hcxtools/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "hcxtools";
- version = "6.0.1";
+ version = "6.0.2";
src = fetchFromGitHub {
owner = "ZerBea";
repo = pname;
rev = version;
- sha256 = "0r7pjz89chgb7zl2pqgw3zb1z8cgwp0nxmqvmkv0jn1m9dw3f44f";
+ sha256 = "0a36184igdgs2h83zr4zihc5acps91ipmgph37jakvzwrsn64ma6";
};
buildInputs = [ curl openssl zlib ];
diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix
index 2d8957a9d540..bbc99c2ac410 100644
--- a/pkgs/tools/security/keybase/default.nix
+++ b/pkgs/tools/security/keybase/default.nix
@@ -6,7 +6,7 @@
buildGoPackage rec {
pname = "keybase";
- version = "5.3.1";
+ version = "5.4.2";
goPackagePath = "github.com/keybase/client";
subPackages = [ "go/kbnm" "go/keybase" ];
@@ -17,7 +17,7 @@ buildGoPackage rec {
owner = "keybase";
repo = "client";
rev = "v${version}";
- sha256 = "1a1h2c8jr4r20w4gyvyrpsslmh69bl8syl3jbr0fcr2kka7vqnzg";
+ sha256 = "08lw5aw962f75xi42bwbgba94hiql2n2jnsxrkx84czi0ijs1wlr";
};
patches = [
@@ -35,7 +35,7 @@ buildGoPackage rec {
homepage = "https://www.keybase.io/";
description = "The Keybase official command-line utility and service.";
platforms = platforms.linux ++ platforms.darwin;
- maintainers = with maintainers; [ carlsverre np rvolosatovs filalex77 ];
+ maintainers = with maintainers; [ avaq carlsverre np rvolosatovs filalex77 ];
license = licenses.bsd3;
};
}
diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix
index 9c34d78aee8e..054907843909 100644
--- a/pkgs/tools/security/keybase/gui.nix
+++ b/pkgs/tools/security/keybase/gui.nix
@@ -4,16 +4,16 @@
, runtimeShell, gsettings-desktop-schemas }:
let
- versionSuffix = "20200320154633.3e235215b3";
+ versionSuffix = "20200424214931.7b0bbf1e3c";
in
stdenv.mkDerivation rec {
pname = "keybase-gui";
- version = "5.3.1"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages
+ version = "5.4.2"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages
src = fetchurl {
url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb";
- sha256 = "00k1xg27arbqpa836c55fhkxjvjbhjgkf6jqzprjzz76zksfdcx4";
+ sha256 = "06iksmrr959mlzxc3nwd70apmvhij1xarxvvflys5qa31vravizs";
};
nativeBuildInputs = [
@@ -108,7 +108,7 @@ stdenv.mkDerivation rec {
homepage = "https://www.keybase.io/";
description = "The Keybase official GUI";
platforms = platforms.linux;
- maintainers = with maintainers; [ rvolosatovs puffnfresh np filalex77 ];
+ maintainers = with maintainers; [ avaq rvolosatovs puffnfresh np filalex77 ];
license = licenses.bsd3;
};
}
diff --git a/pkgs/tools/security/keybase/kbfs.nix b/pkgs/tools/security/keybase/kbfs.nix
index 20fadee6a40e..e9284e7230fb 100644
--- a/pkgs/tools/security/keybase/kbfs.nix
+++ b/pkgs/tools/security/keybase/kbfs.nix
@@ -16,7 +16,7 @@ buildGoPackage {
homepage = "https://keybase.io/docs/kbfs";
description = "The Keybase filesystem";
platforms = platforms.unix;
- maintainers = with maintainers; [ rvolosatovs bennofs np ];
+ maintainers = with maintainers; [ avaq rvolosatovs bennofs np ];
license = licenses.bsd3;
};
}
diff --git a/pkgs/tools/security/kpcli/default.nix b/pkgs/tools/security/kpcli/default.nix
index f56bd59cd9af..09916f85f9e6 100644
--- a/pkgs/tools/security/kpcli/default.nix
+++ b/pkgs/tools/security/kpcli/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, makeWrapper, perl, perlPackages }:
stdenv.mkDerivation rec {
- version = "3.3";
+ version = "3.4";
pname = "kpcli";
src = fetchurl {
url = "mirror://sourceforge/kpcli/${pname}-${version}.pl";
- sha256 = "1z6dy70d3ag16vgzzafcnxb8gap3wahfmy4vd22fpgbrdd6riph4";
+ sha256 = "0s46cni16ph93havmkrlai3k13mdppyca1s2bqm751a6rirmsgj0";
};
buildInputs = [ makeWrapper perl ];
diff --git a/pkgs/tools/security/pdfcrack/default.nix b/pkgs/tools/security/pdfcrack/default.nix
index 9d05304cf2f6..afef0d4c4723 100644
--- a/pkgs/tools/security/pdfcrack/default.nix
+++ b/pkgs/tools/security/pdfcrack/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "pdfcrack";
- version = "0.18";
+ version = "0.19";
src = fetchurl {
url = "mirror://sourceforge/pdfcrack/pdfcrack/pdfcrack-${version}.tar.gz";
- sha256 = "035s3jzrs3ci0i53x04dzpqp9225c4s52cd722d6zqra5b2sw8w2";
+ sha256 = "1vf0l83xk627fg0a3b10wabgqxy08q4vbm0xjw9xzkdpk1lj059i";
};
installPhase = ''
diff --git a/pkgs/tools/security/super/default.nix b/pkgs/tools/security/super/default.nix
index 73321fd618e3..070517310696 100644
--- a/pkgs/tools/security/super/default.nix
+++ b/pkgs/tools/security/super/default.nix
@@ -17,9 +17,11 @@ stdenv.mkDerivation rec {
'';
patches = [
- (fetchpatch { url = "https://salsa.debian.org/debian/super/raw/debian/3.30.0-7/debian/patches/14-Fix-unchecked-setuid-call.patch";
- sha256 = "08m9hw4kyfjv0kqns1cqha4v5hkgp4s4z0q1rgif1fnk14xh7wqh";
- })
+ (fetchpatch {
+ name = "CVE-2014-0470.patch";
+ url = "https://salsa.debian.org/debian/super/raw/debian/3.30.0-7/debian/patches/14-Fix-unchecked-setuid-call.patch";
+ sha256 = "08m9hw4kyfjv0kqns1cqha4v5hkgp4s4z0q1rgif1fnk14xh7wqh";
+ })
];
NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE";
diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix
index a02059703664..353590ed87c8 100644
--- a/pkgs/tools/security/trufflehog/default.nix
+++ b/pkgs/tools/security/trufflehog/default.nix
@@ -1,22 +1,22 @@
-{ lib, pythonPackages }:
+{ lib, python3Packages }:
let
- truffleHogRegexes = pythonPackages.buildPythonPackage rec {
+ truffleHogRegexes = python3Packages.buildPythonPackage rec {
pname = "truffleHogRegexes";
- version = "0.0.4";
- src = pythonPackages.fetchPypi {
+ version = "0.0.7";
+ src = python3Packages.fetchPypi {
inherit pname version;
- sha256 = "09vrscbb4h4w01gmamlzghxx6cvrqdscylrbdcnbjsd05xl7zh4z";
+ sha256 = "b81dfc60c86c1e353f436a0e201fd88edb72d5a574615a7858485c59edf32405";
};
};
in
- pythonPackages.buildPythonApplication rec {
+ python3Packages.buildPythonApplication rec {
pname = "truffleHog";
- version = "2.0.97";
+ version = "2.1.11";
- src = pythonPackages.fetchPypi {
+ src = python3Packages.fetchPypi {
inherit pname version;
- sha256 = "034kpv1p4m90286slvc6d4mlrzaf0b5jbd4qaj87hj65wbpcpg8r";
+ sha256 = "53619f0c5be082abd377f987291ace80bc3b88f864972b1a30494780980f769e";
};
# Relax overly restricted version constraint
@@ -24,7 +24,7 @@ in
substituteInPlace setup.py --replace "GitPython ==" "GitPython >= "
'';
- propagatedBuildInputs = [ pythonPackages.GitPython truffleHogRegexes ];
+ propagatedBuildInputs = [ python3Packages.GitPython truffleHogRegexes ];
# Test cases run git clone and require network access
doCheck = false;
diff --git a/pkgs/tools/system/acpica-tools/default.nix b/pkgs/tools/system/acpica-tools/default.nix
index 583bbd2ebd94..62b1be619650 100644
--- a/pkgs/tools/system/acpica-tools/default.nix
+++ b/pkgs/tools/system/acpica-tools/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "acpica-tools";
- version = "20200326";
+ version = "20200430";
src = fetchurl {
url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz";
- sha256 = "1zr2sziiy5jvwgmxpgy2imzsmmb6hlncfd816i7qxrixg2ag7ycr";
+ sha256 = "0z19bniqsa8y0n1qrxmb6gz7m63jpwx22zgk5ablyriixhfpz07v";
};
NIX_CFLAGS_COMPILE = "-O3";
diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix
index 50146f0aad31..78e92e01c6ea 100644
--- a/pkgs/tools/system/bfs/default.nix
+++ b/pkgs/tools/system/bfs/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "bfs";
- version = "1.6";
+ version = "1.7";
src = fetchFromGitHub {
repo = "bfs";
owner = "tavianator";
rev = version;
- sha256 = "0qrxd1vdz2crk7jf7cdda5bhm1f841hjvin7fn497wymwr5qyjah";
+ sha256 = "1jkz99i10y6dwc4dyh2vp3p549jscgwjdp6x17mcw561bnam2287";
};
buildInputs = stdenv.lib.optionals stdenv.isLinux [ libcap acl ];
diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix
index d6f7a782824d..0d2d704ea6c2 100644
--- a/pkgs/tools/system/facter/default.nix
+++ b/pkgs/tools/system/facter/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "facter";
- version = "3.14.9";
+ version = "3.14.10";
src = fetchFromGitHub {
- sha256 = "1c8g4fg8c9x816xx3m33njfn9h6ksl8g4rmc20y39v1y9jn72vxk";
+ sha256 = "0yblz8k30kv9jpfs6bd0hcx5nfr23l7nxyw0q7p7c4ygkx3mb1ji";
rev = version;
repo = pname;
owner = "puppetlabs";
diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix
index b8bbe09fcb73..6b6aa40a0f73 100644
--- a/pkgs/tools/system/hwinfo/default.nix
+++ b/pkgs/tools/system/hwinfo/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "hwinfo";
- version = "21.69";
+ version = "21.70";
src = fetchFromGitHub {
owner = "opensuse";
repo = "hwinfo";
rev = version;
- sha256 = "01lmxyqhx092ahbls7z9gwgmsinlqcv8zb7xvklbwyhzy5c02fxx";
+ sha256 = "13vvsxj06wy86m7fy6bwy63ga49a2k4chdnk8jj3klj2cnh7ql8z";
};
patchPhase = ''
diff --git a/pkgs/tools/system/kmon/default.nix b/pkgs/tools/system/kmon/default.nix
index 1a4cdb9acdfe..afb59b25059e 100644
--- a/pkgs/tools/system/kmon/default.nix
+++ b/pkgs/tools/system/kmon/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "kmon";
- version = "1.1.0";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "orhun";
repo = pname;
rev = "v${version}";
- sha256 = "0lpwp5fzlf037bn03x1dldw8nfa5pyqi4qsqbscwn42idvs94mhx";
+ sha256 = "1l2zdp5f9spkfx1dhxyj32791kgvc8hqjr1kk75vds4c1wgwq8gk";
};
- cargoSha256 = "1g5k6dkv0zznh8q359n7sg9wf0gcix6m36pg9ql8wi5hnlsvg1s1";
+ cargoSha256 = "08a7gr70a3rh7a52gglck16qlwngb6ap723lg3b3mxmkyigdf6i6";
nativeBuildInputs = [ python3 ];
diff --git a/pkgs/tools/text/a2ps/default.nix b/pkgs/tools/text/a2ps/default.nix
index 39f1b7e5bc2c..c29060cb82fc 100644
--- a/pkgs/tools/text/a2ps/default.nix
+++ b/pkgs/tools/text/a2ps/default.nix
@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
sha256 = "0grqqsc3m45niac56m19m5gx7gc0m8zvia5iman1l4rlq31shf8s";
})
(fetchpatch {
+ name = "CVE-2015-8107.patch";
url = "https://sources.debian.net/data/main/a/a2ps/1:4.14-1.3/debian/patches/fix-format-security.diff";
sha256 = "0pq7zl41gf2kc6ahwyjnzn93vbxb4jc2c5g8j20isp4vw6dqrnwv";
})
diff --git a/pkgs/tools/text/colordiff/default.nix b/pkgs/tools/text/colordiff/default.nix
index 1ba1db1f7cb5..c3da9a605558 100644
--- a/pkgs/tools/text/colordiff/default.nix
+++ b/pkgs/tools/text/colordiff/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, perl /*, xmlto */}:
stdenv.mkDerivation rec {
- name = "colordiff-1.0.18";
+ name = "colordiff-1.0.19";
src = fetchurl {
urls = [
"https://www.colordiff.org/${name}.tar.gz"
"http://www.colordiff.org/archive/${name}.tar.gz"
];
- sha256 = "1q6n60n4b9fnzccxyxv04mxjsql4ddq17vl2c74ijvjdhpcfrkr9";
+ sha256 = "069vzzgs7b44bmfh3ks2psrdb26s1w19gp9w4xxbgi7nhx6w3s26";
};
buildInputs = [ perl /* xmlto */ ];
diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix
index ac90b4d7792c..6fc27bdf00cb 100644
--- a/pkgs/tools/text/fanficfare/default.nix
+++ b/pkgs/tools/text/fanficfare/default.nix
@@ -2,11 +2,11 @@
python3Packages.buildPythonApplication rec {
pname = "FanFicFare";
- version = "3.17.0";
+ version = "3.19.0";
src = python3Packages.fetchPypi {
inherit pname version;
- sha256 = "1h7kzlw516w9qk5vcn0rqibxbhvzbmxgnf9l6yjxj30x53ynrvzj";
+ sha256 = "01cr4941sg6is6k6sajlbr6hs5s47aq9xhp7gadhq4h3x6dilj40";
};
propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix
index 154e099d3dd2..fccd2174a6d6 100644
--- a/pkgs/tools/text/languagetool/default.nix
+++ b/pkgs/tools/text/languagetool/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "LanguageTool";
- version = "4.9";
+ version = "4.9.1";
src = fetchzip {
url = "https://www.languagetool.org/download/${pname}-${version}.zip";
- sha256 = "05jqqamdvi5x35yy9bqw6wf7qagrm1r9488f7cfbbv764zfirz17";
+ sha256 = "0hvzckb92yijzmp2vphjp1wgql3xqq0xd83v5x6pbhziq9yxc5yh";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jre ];
diff --git a/pkgs/tools/text/nawk/default.nix b/pkgs/tools/text/nawk/default.nix
index 57f036a47f0d..aafce117ee4a 100644
--- a/pkgs/tools/text/nawk/default.nix
+++ b/pkgs/tools/text/nawk/default.nix
@@ -1,21 +1,18 @@
-{ stdenv, fetchurl, yacc }:
+{ stdenv, fetchFromGitHub, yacc }:
stdenv.mkDerivation rec {
- name = "nawk-20121220";
+ pname = "nawk";
+ version = "20180827";
- src = fetchurl {
- url = "https://www.cs.princeton.edu/~bwk/btl.mirror/awk.tar.gz";
- sha256 = "10wvdn7xwc5bbp5h7l0b9fxby3bds21n8a34z54i8kjsbhb95h4d";
+ src = fetchFromGitHub {
+ owner = "onetrueawk";
+ repo = "awk";
+ rev = version;
+ sha256 = "0qcsxhcwg6g3c0zxmbipqa8d8d5n8zxrq0hymb8yavsaz103fcl6";
};
nativeBuildInputs = [ yacc ];
- unpackPhase = ''
- mkdir build
- cd build
- tar xvf ${src}
- '';
-
patchPhase = ''
substituteInPlace ./makefile \
--replace "YACC = yacc -d -S" ""
diff --git a/pkgs/tools/text/ocrmypdf/default.nix b/pkgs/tools/text/ocrmypdf/default.nix
index 83d0bdd92c74..19690e270af0 100644
--- a/pkgs/tools/text/ocrmypdf/default.nix
+++ b/pkgs/tools/text/ocrmypdf/default.nix
@@ -29,14 +29,14 @@ let
in buildPythonApplication rec {
pname = "ocrmypdf";
- version = "9.6.1";
+ version = "9.8.0";
disabled = ! python3Packages.isPy3k;
src = fetchFromGitHub {
owner = "jbarlow83";
repo = "OCRmyPDF";
rev = "v${version}";
- sha256 = "0lbld11r8zds79183hh5y2f5fi7cacl7bx9f7f2g58j38y1c65vj";
+ sha256 = "1l4bwnbd3g0wmdx8yv8hi5wm2z2q67y9mwrvrc4xxmkdrb5y8jcd";
};
nativeBuildInputs = with python3Packages; [
diff --git a/pkgs/tools/text/sd/default.nix b/pkgs/tools/text/sd/default.nix
index 0e905be01f22..a540918e56d2 100644
--- a/pkgs/tools/text/sd/default.nix
+++ b/pkgs/tools/text/sd/default.nix
@@ -3,16 +3,16 @@
rustPlatform.buildRustPackage rec {
pname = "sd";
- version = "0.7.4";
+ version = "0.7.5";
src = fetchFromGitHub {
owner = "chmln";
repo = pname;
rev = "v${version}";
- sha256 = "0y1mabnp0sbvayn695x1yfw04d2bky0r69wyidld6hllq3kqn9y2";
+ sha256 = "04jsni80jzhbb106283df34cdyp5p362l6m29kp30hnc6x49853q";
};
- cargoSha256 = "1ra6argxs5dmpxhrr3az21myp27fl3nkdjfqn8cam2xhld1y270l";
+ cargoSha256 = "1gwb76zys7gky42clzjs5g4hhgpfvzcw63chw9mnj703c7h0cgfh";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
@@ -21,6 +21,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/chmln/sd";
license = licenses.mit;
platforms = platforms.all;
- maintainers = [ maintainers.amar1729 ];
+ maintainers = with maintainers; [ amar1729 filalex77 ];
};
}
diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix
index 71f79724b9cb..cad595079037 100644
--- a/pkgs/tools/text/shfmt/default.nix
+++ b/pkgs/tools/text/shfmt/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "shfmt";
- version = "3.1.0";
+ version = "3.1.1";
src = fetchFromGitHub {
owner = "mvdan";
repo = "sh";
rev = "v${version}";
- sha256 = "1k0bq4b4rv6wrh24jvcnpg1mfqrzqhl90zg4zibxzv3zkhjdskzh";
+ sha256 = "0zlk1jjk65jwd9cx0xarz4yg2r2h86kd5g00gcnsav6dp6rx3aw8";
};
modSha256 = "080k8d5rp8kyg0x7vjxm758b9ya9z336yd4rcqws7yhqawxiv55z";
diff --git a/pkgs/tools/typesetting/asciidoctorj/default.nix b/pkgs/tools/typesetting/asciidoctorj/default.nix
index 80b99284e491..ba46d36814ac 100644
--- a/pkgs/tools/typesetting/asciidoctorj/default.nix
+++ b/pkgs/tools/typesetting/asciidoctorj/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "asciidoctorj";
- version = "2.2.0";
+ version = "2.3.0";
src = fetchzip {
url = "http://dl.bintray.com/asciidoctor/maven/org/asciidoctor/${pname}/${version}/${pname}-${version}-bin.zip";
- sha256 = "0akxzfibfa8msnardvyy9hkj2z6sqn7pnwphz6avixdcclg6yxa5";
+ sha256 = "1hmra1pg79hj9kqbj6702y5b03vyvfzqf6hq65jg1vxjqlq7h3xx";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index 52a107118753..bb6432fc3e61 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -1,6 +1,6 @@
/* TeX Live user docs
- source: ../../../../../doc/languages-frameworks/texlive.xml
- - current html: http://nixos.org/nixpkgs/manual/#sec-language-texlive
+ - current html: https://nixos.org/nixpkgs/manual/#sec-language-texlive
*/
{ stdenv, lib, fetchurl, runCommand, writeText, buildEnv
, callPackage, ghostscriptX, harfbuzz, poppler_min
diff --git a/pkgs/tools/virtualization/cri-tools/default.nix b/pkgs/tools/virtualization/cri-tools/default.nix
index 65a7f7d19809..7254b3d63d97 100644
--- a/pkgs/tools/virtualization/cri-tools/default.nix
+++ b/pkgs/tools/virtualization/cri-tools/default.nix
@@ -1,8 +1,13 @@
-{ buildGoPackage, fetchFromGitHub, lib }:
+{ lib
+, buildGoPackage
+, fetchFromGitHub
+, installShellFiles
+}:
buildGoPackage rec {
pname = "cri-tools";
version = "1.18.0";
+
src = fetchFromGitHub {
owner = "kubernetes-sigs";
repo = pname;
@@ -12,15 +17,26 @@ buildGoPackage rec {
goPackagePath = "github.com/kubernetes-sigs/cri-tools";
+ nativeBuildInputs = [ installShellFiles ];
+
buildPhase = ''
pushd go/src/${goPackagePath}
- make all install BINDIR=$out/bin
+ make binaries VERSION=${version}
+ '';
+
+ installPhase = ''
+ make install BINDIR=$out/bin
+
+ for shell in bash fish zsh; do
+ $out/bin/crictl completion $shell > crictl.$shell
+ installShellCompletion crictl.$shell
+ done
'';
meta = with lib; {
description = "CLI and validation tools for Kubelet Container Runtime Interface (CRI)";
homepage = "https://github.com/kubernetes-sigs/cri-tools";
- license = lib.licenses.asl20;
+ license = licenses.asl20;
maintainers = with maintainers; [ ] ++ teams.podman.members;
};
}
diff --git a/pkgs/tools/virtualization/linode-cli/default.nix b/pkgs/tools/virtualization/linode-cli/default.nix
index bcb0c545d455..c16eb003d8d4 100644
--- a/pkgs/tools/virtualization/linode-cli/default.nix
+++ b/pkgs/tools/virtualization/linode-cli/default.nix
@@ -13,8 +13,8 @@
let
spec = fetchurl {
- url = "https://developers.linode.com/api/docs/v4/openapi.yaml";
- sha256 = "1l2fahdcmv7sp1qkwr5nv2vls8fypvlybwylqfzhyjmn7jqkw4hq";
+ url = "https://raw.githubusercontent.com/linode/linode-api-docs/v4.63.1/openapi.yaml";
+ sha256 = "03ngzbq24zazfqmfd7xjmxixkcb9vv1jgamplsj633j7sjj708s0";
};
in
diff --git a/pkgs/tools/virtualization/vpsfree-client/Gemfile b/pkgs/tools/virtualization/vpsfree-client/Gemfile
new file mode 100644
index 000000000000..87c9aeebb90c
--- /dev/null
+++ b/pkgs/tools/virtualization/vpsfree-client/Gemfile
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+gem "vpsfree-client"
diff --git a/pkgs/tools/virtualization/vpsfree-client/Gemfile.lock b/pkgs/tools/virtualization/vpsfree-client/Gemfile.lock
new file mode 100644
index 000000000000..9b8fd4b918a3
--- /dev/null
+++ b/pkgs/tools/virtualization/vpsfree-client/Gemfile.lock
@@ -0,0 +1,75 @@
+GEM
+ remote: https://rubygems.org/
+ specs:
+ activesupport (6.0.2.2)
+ concurrent-ruby (~> 1.0, >= 1.0.2)
+ i18n (>= 0.7, < 2)
+ minitest (~> 5.1)
+ tzinfo (~> 1.1)
+ zeitwerk (~> 2.2)
+ addressable (2.7.0)
+ public_suffix (>= 2.0.2, < 5.0)
+ concurrent-ruby (1.1.6)
+ cookiejar (0.3.3)
+ curses (1.3.2)
+ domain_name (0.5.20190701)
+ unf (>= 0.0.5, < 1.0.0)
+ em-http-request (1.1.5)
+ addressable (>= 2.3.4)
+ cookiejar (!= 0.3.1)
+ em-socksify (>= 0.3)
+ eventmachine (>= 1.0.3)
+ http_parser.rb (>= 0.6.0)
+ em-socksify (0.3.2)
+ eventmachine (>= 1.0.0.beta.4)
+ eventmachine (1.0.9.1)
+ haveapi-client (0.13.2)
+ activesupport (>= 4.0)
+ highline (~> 1.7.8)
+ json
+ require_all (~> 2.0.0)
+ rest-client (~> 2.0.2)
+ ruby-progressbar (~> 1.7.5)
+ highline (1.7.10)
+ http-cookie (1.0.3)
+ domain_name (~> 0.5)
+ http_parser.rb (0.6.0)
+ i18n (1.8.2)
+ concurrent-ruby (~> 1.0)
+ json (2.3.0)
+ mime-types (3.3.1)
+ mime-types-data (~> 3.2015)
+ mime-types-data (3.2020.0425)
+ minitest (5.14.0)
+ netrc (0.11.0)
+ public_suffix (4.0.4)
+ require_all (2.0.0)
+ rest-client (2.0.2)
+ http-cookie (>= 1.0.2, < 2.0)
+ mime-types (>= 1.16, < 4.0)
+ netrc (~> 0.8)
+ ruby-progressbar (1.7.5)
+ thread_safe (0.3.6)
+ tzinfo (1.2.7)
+ thread_safe (~> 0.1)
+ unf (0.1.4)
+ unf_ext
+ unf_ext (0.0.7.7)
+ vpsadmin-client (3.0.0.master.20190517.pre.0.3ab5ddfe)
+ curses
+ em-http-request (~> 1.1.3)
+ eventmachine (~> 1.0.3)
+ haveapi-client (~> 0.13.0)
+ json
+ vpsfree-client (0.11.0)
+ vpsadmin-client (= 3.0.0.master.20190517.pre.0.3ab5ddfe)
+ zeitwerk (2.3.0)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ vpsfree-client
+
+BUNDLED WITH
+ 2.1.4
diff --git a/pkgs/tools/virtualization/vpsfree-client/default.nix b/pkgs/tools/virtualization/vpsfree-client/default.nix
new file mode 100644
index 000000000000..17d570414882
--- /dev/null
+++ b/pkgs/tools/virtualization/vpsfree-client/default.nix
@@ -0,0 +1,17 @@
+{ lib, bundlerApp, bundlerUpdateScript }:
+
+bundlerApp {
+ pname = "vpsfree-client";
+ gemdir = ./.;
+ exes = [ "vpsfreectl" ];
+
+ passthru.updateScript = bundlerUpdateScript "vpsfree-client";
+
+ meta = with lib; {
+ description = "Ruby API and CLI for the vpsFree.cz API";
+ homepage = "https://github.com/vpsfreecz/vpsfree-client";
+ maintainers = with maintainers; [ zimbatm ];
+ license = licenses.gpl3;
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/tools/virtualization/vpsfree-client/gemset.nix b/pkgs/tools/virtualization/vpsfree-client/gemset.nix
new file mode 100644
index 000000000000..366c5836bd3a
--- /dev/null
+++ b/pkgs/tools/virtualization/vpsfree-client/gemset.nix
@@ -0,0 +1,316 @@
+{
+ activesupport = {
+ dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1md98dkbirc8mq5nbz1vqq3hwqjiv7b54q7180w8wyxgd4k1awwb";
+ type = "gem";
+ };
+ version = "6.0.2.2";
+ };
+ addressable = {
+ dependencies = ["public_suffix"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy";
+ type = "gem";
+ };
+ version = "2.7.0";
+ };
+ concurrent-ruby = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl";
+ type = "gem";
+ };
+ version = "1.1.6";
+ };
+ cookiejar = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0q0kmbks9l3hl0wdq744hzy97ssq9dvlzywyqv9k9y1p3qc9va2a";
+ type = "gem";
+ };
+ version = "0.3.3";
+ };
+ curses = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0hic9kq09dhh8jqjx3k1991rnqhlj3glz82w0g7ndcri52m1hgqg";
+ type = "gem";
+ };
+ version = "1.3.2";
+ };
+ domain_name = {
+ dependencies = ["unf"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0";
+ type = "gem";
+ };
+ version = "0.5.20190701";
+ };
+ em-http-request = {
+ dependencies = ["addressable" "cookiejar" "em-socksify" "eventmachine" "http_parser.rb"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "13rxmbi0fv91n4sg300v3i9iiwd0jxv0i6xd0sp81dx3jlx7kasx";
+ type = "gem";
+ };
+ version = "1.1.5";
+ };
+ em-socksify = {
+ dependencies = ["eventmachine"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0rk43ywaanfrd8180d98287xv2pxyl7llj291cwy87g1s735d5nk";
+ type = "gem";
+ };
+ version = "0.3.2";
+ };
+ eventmachine = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "17jr1caa3ggg696dd02g2zqzdjqj9x9q2nl7va82l36f7c5v6k4z";
+ type = "gem";
+ };
+ version = "1.0.9.1";
+ };
+ haveapi-client = {
+ dependencies = ["activesupport" "highline" "json" "require_all" "rest-client" "ruby-progressbar"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1wn5zvyy3w3q74m2fsb4jwxfdbdnpyyzxdf9iklpggcdmjhb78z0";
+ type = "gem";
+ };
+ version = "0.13.2";
+ };
+ highline = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "01ib7jp85xjc4gh4jg0wyzllm46hwv8p0w1m4c75pbgi41fps50y";
+ type = "gem";
+ };
+ version = "1.7.10";
+ };
+ http-cookie = {
+ dependencies = ["domain_name"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g";
+ type = "gem";
+ };
+ version = "1.0.3";
+ };
+ "http_parser.rb" = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi";
+ type = "gem";
+ };
+ version = "0.6.0";
+ };
+ i18n = {
+ dependencies = ["concurrent-ruby"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0jwrd1l4mxz06iyx6053lr6hz2zy7ah2k3ranfzisvych5q19kwm";
+ type = "gem";
+ };
+ version = "1.8.2";
+ };
+ json = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0nrmw2r4nfxlfgprfgki3hjifgrcrs3l5zvm3ca3gb4743yr25mn";
+ type = "gem";
+ };
+ version = "2.3.0";
+ };
+ mime-types = {
+ dependencies = ["mime-types-data"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh";
+ type = "gem";
+ };
+ version = "3.3.1";
+ };
+ mime-types-data = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1zin0q26wc5p7zb7glpwary7ms60s676vcq987yv22jgm6hnlwlh";
+ type = "gem";
+ };
+ version = "3.2020.0425";
+ };
+ minitest = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0g73x65hmjph8dg1h3rkzfg7ys3ffxm35hj35grw75fixmq53qyz";
+ type = "gem";
+ };
+ version = "5.14.0";
+ };
+ netrc = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y";
+ type = "gem";
+ };
+ version = "0.11.0";
+ };
+ public_suffix = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1l1kqw75asziwmzrig8rywxswxz8l91sc3pvns02ffsqac1a3wiz";
+ type = "gem";
+ };
+ version = "4.0.4";
+ };
+ require_all = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0sjf2vigdg4wq7z0xlw14zyhcz4992s05wgr2s58kjgin12bkmv8";
+ type = "gem";
+ };
+ version = "2.0.0";
+ };
+ rest-client = {
+ dependencies = ["http-cookie" "mime-types" "netrc"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1hzcs2r7b5bjkf2x2z3n8z6082maz0j8vqjiciwgg3hzb63f958j";
+ type = "gem";
+ };
+ version = "2.0.2";
+ };
+ ruby-progressbar = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0hynaavnqzld17qdx9r7hfw00y16ybldwq730zrqfszjwgi59ivi";
+ type = "gem";
+ };
+ version = "1.7.5";
+ };
+ thread_safe = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
+ type = "gem";
+ };
+ version = "0.3.6";
+ };
+ tzinfo = {
+ dependencies = ["thread_safe"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r";
+ type = "gem";
+ };
+ version = "1.2.7";
+ };
+ unf = {
+ dependencies = ["unf_ext"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9";
+ type = "gem";
+ };
+ version = "0.1.4";
+ };
+ unf_ext = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0wc47r23h063l8ysws8sy24gzh74mks81cak3lkzlrw4qkqb3sg4";
+ type = "gem";
+ };
+ version = "0.0.7.7";
+ };
+ vpsadmin-client = {
+ dependencies = ["curses" "em-http-request" "eventmachine" "haveapi-client" "json"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0ki3204pkg3f9wk9plbq5n9lrnsmc364smfxyrbq32gi8ag2y2s8";
+ type = "gem";
+ };
+ version = "3.0.0.master.20190517.pre.0.3ab5ddfe";
+ };
+ vpsfree-client = {
+ dependencies = ["vpsadmin-client"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0cs2ibl9kl39hnpzyhyczaqv4i58pn106vx2m6lds9p3av5mcbxs";
+ type = "gem";
+ };
+ version = "0.11.0";
+ };
+ zeitwerk = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1akpm3pwvyiack2zk6giv9yn3cqb8pw6g40p4394pdc3xmy3s4k0";
+ type = "gem";
+ };
+ version = "2.3.0";
+ };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 66a2e36fa15f..8c4e6f9d4237 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -100,6 +100,7 @@ mapAliases ({
devicemapper = lvm2; # added 2018-04-25
digikam5 = digikam; # added 2017-02-18
dmtx = dmtx-utils; # added 2018-04-25
+ dnnl = oneDNN; # added 2020-04-22
docbook5_xsl = docbook_xsl_ns; # added 2018-04-25
docbook_xml_xslt = docbook_xsl; # added 2018-04-25
double_conversion = double-conversion; # 2017-11-22
@@ -576,6 +577,7 @@ mapAliases ({
transmission_gtk = transmission-gtk; # added 2018-01-06
transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06
transporter = throw "transporter has been removed. It was archived upstream, so it's considered abandoned.";
+ trilium = throw "trilium has been removed. Please use trilium-desktop instead."; # added 2020-04-29
truecrypt = veracrypt; # added 2018-10-24
tshark = wireshark-cli; # added 2018-04-25
uberwriter = apostrophe; # added 2020-04-23
@@ -605,6 +607,7 @@ mapAliases ({
winswitch = throw "winswitch has been removed from nixpkgs."; # added 2019-12-10
wireguard = wireguard-tools; # added 2018-05-19
morituri = whipper; # added 2018-09-13
+ xp-pen-g430 = pentablet-driver; # added 2020-05-03
xfceUnstable = xfce4-14; # added 2019-09-17
xfce4-14 = xfce;
xfce4-12 = throw "xfce4-12 has been replaced by xfce4-14"; # added 2020-03-14
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 92d23eb9cb4a..37082a34c0e1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1174,6 +1174,8 @@ in
inherit (darwin.apple_sdk.frameworks) Security;
};
+ bat-extras = recurseIntoAttrs (callPackages ../tools/misc/bat-extras { });
+
bc = callPackage ../tools/misc/bc { };
bdf2psf = callPackage ../tools/misc/bdf2psf { };
@@ -1268,8 +1270,6 @@ in
blockdiag = with python3Packages; toPythonApplication blockdiag;
- blsd = callPackage ../tools/misc/blsd { };
-
bluez-alsa = callPackage ../tools/bluetooth/bluez-alsa { };
bluez-tools = callPackage ../tools/bluetooth/bluez-tools { };
@@ -2927,9 +2927,7 @@ in
dmd = callPackage ../development/compilers/dmd { };
- dmg2img = callPackage ../tools/misc/dmg2img {
- openssl = openssl_1_0_2;
- };
+ dmg2img = callPackage ../tools/misc/dmg2img { };
docbook2odf = callPackage ../tools/typesetting/docbook2odf { };
@@ -2974,6 +2972,10 @@ in
driftnet = callPackage ../tools/networking/driftnet {};
+ drill = callPackage ../tools/networking/drill {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
+
drone = callPackage ../development/tools/continuous-integration/drone { };
drone-cli = callPackage ../development/tools/continuous-integration/drone-cli { };
@@ -3064,6 +3066,8 @@ in
kramdown-asciidoc = callPackage ../tools/typesetting/kramdown-asciidoc { };
+ magic-vlsi = callPackage ../applications/science/electronics/magic-vlsi { };
+
mcrcon = callPackage ../tools/networking/mcrcon {};
rage = callPackage ../tools/security/rage {
@@ -3118,6 +3122,8 @@ in
wob = callPackage ../tools/misc/wob { };
+ xkcdpass = with pythonPackages; toPythonApplication xkcdpass;
+
xob = callPackage ../tools/X11/xob { };
z-lua = callPackage ../tools/misc/z-lua { };
@@ -4547,6 +4553,8 @@ in
kst = libsForQt5.callPackage ../tools/graphics/kst { gsl = gsl_1; };
+ kstars = libsForQt5.callPackage ../applications/science/astronomy/kstars { };
+
kytea = callPackage ../tools/text/kytea { };
k6 = callPackage ../development/tools/k6 { };
@@ -6701,6 +6709,11 @@ in
sourceHighlight = callPackage ../tools/text/source-highlight { };
+ spacebar = callPackage ../os-specific/darwin/spacebar {
+ inherit (darwin.apple_sdk.frameworks)
+ Carbon Cocoa ScriptingBridge;
+ };
+
spaceFM = callPackage ../applications/misc/spacefm { };
speech-denoiser = callPackage ../applications/audio/speech-denoiser {};
@@ -7086,7 +7099,6 @@ in
trilium-desktop
trilium-server
;
- trilium = trilium-desktop;
trousers = callPackage ../tools/security/trousers { };
@@ -7588,6 +7600,8 @@ in
which = callPackage ../tools/system/which { };
+ whsniff = callPackage ../applications/networking/sniffers/whsniff { };
+
woeusb = callPackage ../tools/misc/woeusb { };
chase = callPackage ../tools/system/chase { };
@@ -8106,8 +8120,7 @@ in
cryptol = haskell.lib.justStaticExecutables haskellPackages.cryptol;
inherit (callPackages ../development/compilers/crystal {
- stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv;
- inherit (llvmPackages) clang llvm;
+ inherit (llvmPackages_10) stdenv clang llvm;
})
crystal_0_31
crystal_0_32
@@ -8611,7 +8624,7 @@ in
openjfx11 = callPackage ../development/compilers/openjdk/openjfx/11.nix { };
- openjfx13 = callPackage ../development/compilers/openjdk/openjfx/13.nix { };
+ openjfx14 = callPackage ../development/compilers/openjdk/openjfx/14.nix { };
openjdk8-bootstrap =
if adoptopenjdk-hotspot-bin-8.meta.available then
@@ -8656,33 +8669,39 @@ in
else
openjdk11.override { headless = true; };
- openjdk13-bootstrap =
+ openjdk14-bootstrap =
if adoptopenjdk-hotspot-bin-13.meta.available then
adoptopenjdk-hotspot-bin-13
else
- /* adoptopenjdk not available for i686, so fall back to our old build of 12 for bootstrapping */
- callPackage ../development/compilers/openjdk/12.nix {
+ /* adoptopenjdk not available for i686, so fall back to our old builds of 12 & 13 for bootstrapping */
+ callPackage ../development/compilers/openjdk/13.nix {
openjfx = openjfx11; /* need this despite next line :-( */
enableJavaFX = false;
headless = true;
inherit (gnome2) GConf gnome_vfs;
+ openjdk13-bootstrap = callPackage ../development/compilers/openjdk/12.nix {
+ openjfx = openjfx11; /* need this despite next line :-( */
+ enableJavaFX = false;
+ headless = true;
+ inherit (gnome2) GConf gnome_vfs;
+ };
};
/* current JDK */
- openjdk13 =
+ openjdk14 =
if stdenv.isDarwin then
callPackage ../development/compilers/openjdk/darwin { }
else
callPackage ../development/compilers/openjdk {
- openjfx = openjfx13;
+ openjfx = openjfx14;
inherit (gnome2) GConf gnome_vfs;
};
- openjdk13_headless =
+ openjdk14_headless =
if stdenv.isDarwin then
- openjdk13
+ openjdk14
else
- openjdk13.override { headless = true; };
+ openjdk14.override { headless = true; };
openjdk = openjdk8;
openjdk_headless = openjdk8_headless;
@@ -8694,8 +8713,8 @@ in
jdk11 = openjdk11;
jdk11_headless = openjdk11_headless;
- jdk13 = openjdk13;
- jdk13_headless = openjdk13_headless;
+ jdk14 = openjdk14;
+ jdk14_headless = openjdk14_headless;
jdk = jdk8;
jre = jre8;
@@ -9349,6 +9368,8 @@ in
janet = callPackage ../development/interpreters/janet {};
+ jelly = callPackage ../development/interpreters/jelly {};
+
jimtcl = callPackage ../development/interpreters/jimtcl {};
jmeter = callPackage ../applications/networking/jmeter {};
@@ -9670,6 +9691,7 @@ in
spidermonkey = spidermonkey_38;
ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { };
+ ssm-session-manager-plugin = callPackage ../applications/networking/cluster/ssm-session-manager-plugin { };
supercollider = libsForQt5.callPackage ../development/interpreters/supercollider {
fftw = fftwSinglePrec;
@@ -11399,8 +11421,6 @@ in
dhex = callPackage ../applications/editors/dhex { };
- dnnl = callPackage ../development/libraries/dnnl { };
-
double-conversion = callPackage ../development/libraries/double-conversion { };
dclib = callPackage ../development/libraries/dclib { };
@@ -12198,6 +12218,11 @@ in
}));
icu66 = callPackage ../development/libraries/icu/66.nix ({
nativeBuildRoot = buildPackages.icu66.override { buildRootOnly = true; };
+ } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) {
+ stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
+ }));
+ icu67 = callPackage ../development/libraries/icu/67.nix ({
+ nativeBuildRoot = buildPackages.icu67.override { buildRootOnly = true; };
} // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) {
stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
}));
@@ -13755,6 +13780,8 @@ in
one_gadget = callPackage ../development/tools/misc/one_gadget { };
+ oneDNN = callPackage ../development/libraries/oneDNN { };
+
onedrive = callPackage ../applications/networking/sync/onedrive { };
oneko = callPackage ../applications/misc/oneko { };
@@ -13788,7 +13815,7 @@ in
openct = callPackage ../development/libraries/openct { };
- opencv = callPackage ../development/libraries/opencv {
+ opencv2 = callPackage ../development/libraries/opencv {
inherit (darwin.apple_sdk.frameworks) Cocoa QTKit;
};
@@ -13804,6 +13831,8 @@ in
inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration;
};
+ opencv = opencv4;
+
openexr = callPackage ../development/libraries/openexr { };
openexrid-unstable = callPackage ../development/libraries/openexrid-unstable { };
@@ -15509,6 +15538,10 @@ in
hashi-ui = callPackage ../servers/hashi-ui {};
+ inherit (callPackage ../servers/hasura { })
+ hasura-cli
+ hasura-graphql-engine;
+
heapster = callPackage ../servers/monitoring/heapster { };
hbase = callPackage ../servers/hbase {};
@@ -18084,6 +18117,8 @@ in
pop-gtk-theme = callPackage ../data/themes/pop-gtk { };
+ pop-icon-theme = callPackage ../data/icons/pop-icon-theme { };
+
posix_man_pages = callPackage ../data/documentation/man-pages-posix { };
powerline-fonts = callPackage ../data/fonts/powerline-fonts { };
@@ -19788,6 +19823,8 @@ in
hashit = callPackage ../tools/misc/hashit { };
+ hactool = callPackage ../tools/compression/hactool { };
+
heimer = libsForQt5.callPackage ../applications/misc/heimer { };
hello = callPackage ../applications/misc/hello { };
@@ -19827,6 +19864,8 @@ in
howl = callPackage ../applications/editors/howl { };
+ hpcg = callPackage ../tools/misc/hpcg/default.nix { };
+
hpl = callPackage ../tools/misc/hpl { mpi = openmpi; };
hpmyroom = libsForQt5.callPackage ../applications/networking/hpmyroom { };
@@ -20724,7 +20763,7 @@ in
mpv-with-scripts = callPackage ../applications/video/mpv/wrapper.nix { };
- mpvScripts = {
+ mpvScripts = recurseIntoAttrs {
convert = callPackage ../applications/video/mpv/scripts/convert.nix {};
mpris = callPackage ../applications/video/mpv/scripts/mpris.nix {};
};
@@ -20797,6 +20836,8 @@ in
node-problem-detector = callPackage ../applications/networking/cluster/node-problem-detector { };
+ ninjas2 = callPackage ../applications/audio/ninjas2 {};
+
notion = callPackage ../applications/window-managers/notion { };
nootka = qt5.callPackage ../applications/audio/nootka { };
@@ -21046,7 +21087,7 @@ in
octoprint = callPackage ../applications/misc/octoprint { };
- octoprint-plugins = callPackage ../applications/misc/octoprint/plugins.nix { };
+ octoprint-plugins = throw ''octoprint-plugins are now part of the octoprint.python.pkgs package set.'';
ocrad = callPackage ../applications/graphics/ocrad { };
@@ -21058,6 +21099,8 @@ in
omxplayer = callPackage ../applications/video/omxplayer { };
+ inherit (python3Packages.callPackage ../applications/networking/onionshare { }) onionshare onionshare-gui;
+
openbox = callPackage ../applications/window-managers/openbox { };
openbox-menu = callPackage ../applications/misc/openbox-menu {
@@ -21090,6 +21133,8 @@ in
inherit (pkgs) pkgconfig;
};
+ orca-c = callPackage ../applications/audio/orca-c {};
+
osm2xmap = callPackage ../applications/misc/osm2xmap {
libyamlcpp = libyamlcpp_0_3;
};
@@ -23534,6 +23579,8 @@ in
gtk = gtk2;
};
+ mari0 = callPackage ../games/mari0 { };
+
mars = callPackage ../games/mars { };
megaglest = callPackage ../games/megaglest {};
@@ -23572,7 +23619,7 @@ in
lua = lua5_1;
};
- n2048 = callPackage ../games/n2048 {};
+ n2048 = callPackage ../games/n2048 { };
naev = callPackage ../games/naev { };
@@ -23585,6 +23632,8 @@ in
nethack-x11 = callPackage ../games/nethack { x11Mode = true; };
+ netris = callPackage ../games/netris { };
+
neverball = callPackage ../games/neverball { };
nexuiz = callPackage ../games/nexuiz { };
@@ -25710,7 +25759,9 @@ in
physlock = callPackage ../misc/screensavers/physlock { };
- pjsip = callPackage ../applications/networking/pjsip { };
+ pjsip = callPackage ../applications/networking/pjsip {
+ inherit (darwin.apple_sdk.frameworks) AppKit;
+ };
pounce = callPackage ../servers/pounce { };
@@ -25926,7 +25977,7 @@ in
texFunctions = callPackage ../tools/typesetting/tex/nix pkgs;
- # TeX Live; see http://nixos.org/nixpkgs/manual/#sec-language-texlive
+ # TeX Live; see https://nixos.org/nixpkgs/manual/#sec-language-texlive
texlive = recurseIntoAttrs
(callPackage ../tools/typesetting/tex/texlive { });
@@ -26366,7 +26417,7 @@ in
bcompare = libsForQt5.callPackage ../applications/version-management/bcompare {};
- xp-pen-g430 = libsForQt5.callPackage ../misc/drivers/xp-pen-g430 {};
+ pentablet-driver = libsForQt5.callPackage ../misc/drivers/pentablet-driver { };
qmk_firmware = callPackage ../development/misc/qmk_firmware {
avrgcc = pkgsCross.avr.buildPackages.gcc;
@@ -26443,4 +26494,8 @@ in
jitsi-meet-electron = callPackage ../applications/networking/instant-messengers/jitsi-meet-electron { };
zenstates = callPackage ../os-specific/linux/zenstates {};
+
+ vpsfree-client = callPackage ../tools/virtualization/vpsfree-client {};
+
+ gpio-utils = callPackage ../os-specific/linux/kernel/gpio-utils.nix { };
}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 9517769f7b38..44b90219606e 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -38,11 +38,6 @@ let
async_extra_p4 = callPackage ../development/ocaml-modules/async_extra { };
- async_find =
- if lib.versionOlder "4.03" ocaml.version
- then janeStreet.async_find
- else callPackage ../development/ocaml-modules/async_find { };
-
async_kernel_p4 = callPackage ../development/ocaml-modules/async_kernel { };
async_unix_p4 = callPackage ../development/ocaml-modules/async_unix { };
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 2f933eeff1f5..17d605742154 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3224,6 +3224,19 @@ let
};
};
+ ConvertBencode = buildPerlPackage rec {
+ pname = "Convert-Bencode";
+ version = "1.03";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/O/OR/ORCLEV/${pname}-${version}.tar.gz";
+ sha256 = "0v2ywj18px67mg97xnrdq9mnlzgqvj92pr2g47g9c9b9cpw3v7r6";
+ };
+ meta = {
+ description = "Functions for converting to/from bencoded strings";
+ license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
ConvertColor = buildPerlModule {
pname = "Convert-Color";
version = "0.11";
@@ -17042,6 +17055,20 @@ let
};
};
+ StringSimilarity = buildPerlPackage {
+ pname = "String-Similarity";
+ version = "1.04";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/M/ML/MLEHMANN/String-Similarity-1.04.tar.gz";
+ sha256 = "0i9j3hljxw7j6yiii9nsscfj009vw6zv1q8cxwd75jxvj0idm3hz";
+ };
+ doCheck = true;
+ meta = {
+ license = with stdenv.lib.licenses; [ gpl2 ];
+ description = "Calculate the similarity of two strings";
+ };
+ };
+
ShellCommand = buildPerlPackage {
pname = "Shell-Command";
version = "0.06";
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 43c4e5fc90d9..9532f113ae3d 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -580,10 +580,10 @@ in
};
pdo_sqlsrv = buildPecl {
- version = "5.8.0";
+ version = "5.8.1";
pname = "pdo_sqlsrv";
- sha256 = "0z4vbyd851b4jr6p69l2ylk91iihndsm2qjb429pxcv8g6dqzqll";
+ sha256 = "06ba4x34fgs092qq9w62y2afsm1nyasqiprirk4951ax9v5vcir0";
internalDeps = [ php.extensions.pdo ];
@@ -691,10 +691,10 @@ in
};
sqlsrv = buildPecl {
- version = "5.8.0";
+ version = "5.8.1";
pname = "sqlsrv";
- sha256 = "1kv4krk1w4hri99b0sdgwgy9c4y0yh217wx2y3irhkfi46kdrjnw";
+ sha256 = "0c9a6ghch2537vi0274vx0mn6nb1xg2qv7nprnf3xdfqi5ww1i9r";
buildInputs = [ pkgs.unixODBC ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.libiconv ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5548f8c75a7d..f51df792754f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18,7 +18,7 @@ let
packages = ( self:
let
- inherit (python.passthru) isPy27 isPy33 isPy34 isPy35 isPy36 isPy37 isPy38 isPy39 isPy3k isPyPy pythonAtLeast pythonOlder;
+ inherit (python.passthru) isPy27 isPy35 isPy36 isPy37 isPy38 isPy39 isPy3k isPyPy pythonAtLeast pythonOlder;
callPackage = pkgs.newScope self;
@@ -100,7 +100,7 @@ let
in {
- inherit (python.passthru) isPy27 isPy33 isPy34 isPy35 isPy36 isPy37 isPy38 isPy39 isPy3k isPyPy pythonAtLeast pythonOlder;
+ inherit (python.passthru) isPy27 isPy35 isPy36 isPy37 isPy38 isPy39 isPy3k isPyPy pythonAtLeast pythonOlder;
inherit python bootstrapped-pip buildPythonPackage buildPythonApplication;
inherit fetchPypi callPackage;
inherit hasPythonModule requiredPythonModules makePythonPath disabledIf;
@@ -676,6 +676,8 @@ in {
dftfit = callPackage ../development/python-modules/dftfit { };
+ dicom2nifti = callPackage ../development/python-modules/dicom2nifti { };
+
discid = callPackage ../development/python-modules/discid { };
discordpy = callPackage ../development/python-modules/discordpy { };
@@ -941,6 +943,8 @@ in {
python-mpv-jsonipc = callPackage ../development/python-modules/python-mpv-jsonipc { };
+ mortgage = callPackage ../development/python-modules/mortgage { };
+
msal = callPackage ../development/python-modules/msal { };
msal-extensions = callPackage ../development/python-modules/msal-extensions { };
@@ -967,6 +971,8 @@ in {
ndtypes = callPackage ../development/python-modules/ndtypes { };
+ neo = callPackage ../development/python-modules/neo { };
+
nest-asyncio = callPackage ../development/python-modules/nest-asyncio { };
neuron = pkgs.neuron.override {
@@ -2915,6 +2921,8 @@ in {
helpdev = callPackage ../development/python-modules/helpdev { };
+ heudiconv = callPackage ../development/python-modules/heudiconv { };
+
hickle = callPackage ../development/python-modules/hickle { };
hiro = callPackage ../development/python-modules/hiro {};
@@ -7266,7 +7274,7 @@ in {
scour = callPackage ../development/python-modules/scour { };
- pymssql = callPackage ../development/python-modules/pymssql { };
+ pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04
nanoleaf = callPackage ../development/python-modules/nanoleaf { };