diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-06-23 08:16:49 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-06-23 08:16:49 +0000 |
| commit | 4dc730a187d41f9f2dce4fe2680c32dcecb79b93 (patch) | |
| tree | 67673deb1649dc0a40962e70e6da302d7b6c4bf0 /nixpkgs/pkgs/development | |
| parent | 633cab0ecb07627706c6b523e219490f019eaab5 (diff) | |
| parent | 7e567a3d092b7de69cdf5deaeb8d9526de230916 (diff) | |
| download | nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.gz nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.bz2 nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.lz nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.xz nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.zst nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.zip | |
Merge commit '7e567a3d092b7de69cdf5deaeb8d9526de230916'
# Conflicts: # nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development')
635 files changed, 14848 insertions, 7937 deletions
diff --git a/nixpkgs/pkgs/development/beam-modules/erlang-ls/default.nix b/nixpkgs/pkgs/development/beam-modules/erlang-ls/default.nix index b2a69a692783..4e9461dc743b 100644 --- a/nixpkgs/pkgs/development/beam-modules/erlang-ls/default.nix +++ b/nixpkgs/pkgs/development/beam-modules/erlang-ls/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, fetchHex, rebar3Relx, buildRebar3, rebar3-proper, lib }: let - version = "0.16.0"; + version = "0.17.0"; owner = "erlang-ls"; repo = "erlang_ls"; deps = import ./rebar-deps.nix { @@ -17,7 +17,7 @@ in rebar3Relx { inherit version; src = fetchFromGitHub { inherit owner repo; - sha256 = "0l09yhj3rsb9zj4cs6a1bcfmi6zbyb3xk1lv494xbyiv5d61vkwm"; + sha256 = "0szg9hx436cvy80sh94dzmf2rainnw3fjc84bv3hlzjwwzmxj9aw"; rev = version; }; releaseType = "escript"; diff --git a/nixpkgs/pkgs/development/compilers/armips/default.nix b/nixpkgs/pkgs/development/compilers/armips/default.nix new file mode 100644 index 000000000000..b6fbb5ef34c8 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/armips/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "armips"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "Kingcom"; + repo = "armips"; + rev = "v${version}"; + sha256 = "sha256-L+Uxww/WtvDJn1xZqoqA6Pkzq/98sy1qTxZbv6eEjbA="; + }; + + nativeBuildInputs = [ cmake ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp armips $out/bin + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/Kingcom/armips"; + description = "Assembler for various ARM and MIPS platforms."; + license = licenses.mit; + maintainers = with maintainers; [ marius851000 ]; + }; +} diff --git a/nixpkgs/pkgs/development/compilers/compcert/default.nix b/nixpkgs/pkgs/development/compilers/compcert/default.nix deleted file mode 100644 index beafd6414f43..000000000000 --- a/nixpkgs/pkgs/development/compilers/compcert/default.nix +++ /dev/null @@ -1,125 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper -, coqPackages, ocamlPackages, coq2html -, tools ? stdenv.cc -, version ? "3.9" -}: - -let - ocaml-pkgs = with ocamlPackages; [ ocaml findlib menhir menhirLib ]; - ccomp-platform = if stdenv.isDarwin then "x86_64-macosx" else "x86_64-linux"; - inherit (coqPackages) coq flocq; - inherit (lib) optional optionalString; -in - -let param = { - "3.7" = { - sha256 = "1h4zhk9rrqki193nxs9vjvya7nl9yxjcf07hfqb6g77riy1vd2jr"; - patches = [ - (fetchpatch { - url = "https://github.com/AbsInt/CompCert/commit/0a2db0269809539ccc66f8ec73637c37fbd23580.patch"; - sha256 = "0n8qrba70x8f422jdvq9ddgsx6avf2dkg892g4ldh3jiiidyhspy"; - }) - (fetchpatch { - url = "https://github.com/AbsInt/CompCert/commit/5e29f8b5ba9582ecf2a1d0baeaef195873640607.patch"; - sha256 = "184nfdgxrkci880lkaj5pgnify3plka7xfgqrgv16275sqppc5hc"; - }) - ]; - }; - "3.8" = { - sha256 = "1gzlyxvw64ca12qql3wnq3bidcx9ygsklv9grjma3ib4hvg7vnr7"; - patches = [ - # Support for Coq 8.12.2 - (fetchpatch { - url = "https://github.com/AbsInt/CompCert/commit/06956421b4307054af221c118c5f59593c0e67b9.patch"; - sha256 = "1f90q6j3xfvnf3z830bkd4d8526issvmdlrjlc95bfsqs78i1yrl"; - }) - # Support for Coq 8.13.0 - (fetchpatch { - url = "https://github.com/AbsInt/CompCert/commit/0895388e7ebf9c9f3176d225107e21968919fb97.patch"; - sha256 = "0qhkzgb2xl5kxys81pldp3mr39gd30lvr2l2wmplij319vp3xavd"; - }) - # Support for Coq 8.13.1 - (fetchpatch { - url = "https://github.com/AbsInt/CompCert/commit/6bf310dd678285dc193798e89fc2c441d8430892.patch"; - sha256 = "026ahhvpj5pksy90f8pnxgmhgwfqk4kwyvcf8x3dsanvz98d4pj5"; - }) - # Drop support for Coq < 8.9 - (fetchpatch { - url = "https://github.com/AbsInt/CompCert/commit/7563a5df926a4c6fb1489a7a4c847641c8a35095.patch"; - sha256 = "05vkslzy399r3dm6dmjs722rrajnyfa30xsyy3djl52isvn4gyfb"; - }) - # Support for Coq 8.13.2 - (fetchpatch { - url = "https://github.com/AbsInt/CompCert/commit/48bc183167c4ce01a5c9ea86e49d60530adf7290.patch"; - sha256 = "0j62lppfk26d1brdp3qwll2wi4gvpx1k70qivpvby5f7dpkrkax1"; - }) - ]; - useExternalFlocq = true; - }; - "3.9" = { - sha256 = "1srcz2dqrvmbvv5cl66r34zqkm0hsbryk7gd3i9xx4slahc9zvdb"; - useExternalFlocq = true; - }; -}."${version}"; in - -stdenv.mkDerivation rec { - pname = "compcert"; - inherit version; - - src = fetchFromGitHub { - owner = "AbsInt"; - repo = "CompCert"; - rev = "v${version}"; - inherit (param) sha256; - }; - - patches = param.patches or []; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = ocaml-pkgs ++ [ coq coq2html ]; - propagatedBuildInputs = optional (param.useExternalFlocq or false) flocq; - enableParallelBuilding = true; - - postPatch = '' - substituteInPlace ./configure \ - --replace \$\{toolprefix\}ar 'ar' \ - --replace '{toolprefix}gcc' '{toolprefix}cc' - ''; - - configurePhase = '' - ./configure -clightgen \ - -prefix $out \ - -coqdevdir $lib/lib/coq/${coq.coq-version}/user-contrib/compcert/ \ - -toolprefix ${tools}/bin/ \ - ${optionalString (param.useExternalFlocq or false) "-use-external-Flocq"} \ - ${ccomp-platform} - ''; - - installTargets = "documentation install"; - postInstall = '' - # move man into place - mkdir -p $man/share - mv $out/share/man/ $man/share/ - - # move docs into place - mkdir -p $doc/share/doc/compcert - mv doc/html $doc/share/doc/compcert/ - - # wrap ccomp to undefine _FORTIFY_SOURCE; ccomp invokes cc1 which sets - # _FORTIFY_SOURCE=2 by default, but undefines __GNUC__ (as it should), - # which causes a warning in libc. this suppresses it. - for x in ccomp clightgen; do - wrapProgram $out/bin/$x --add-flags "-U_FORTIFY_SOURCE" - done - ''; - - outputs = [ "out" "lib" "doc" "man" ]; - - meta = with lib; { - description = "Formally verified C compiler"; - homepage = "https://compcert.org"; - license = licenses.inria-compcert; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; - maintainers = with maintainers; [ thoughtpolice jwiegley vbgl ]; - }; -} diff --git a/nixpkgs/pkgs/development/compilers/flutter/default.nix b/nixpkgs/pkgs/development/compilers/flutter/default.nix index 736178e76ca2..f7dc6f8e87c3 100644 --- a/nixpkgs/pkgs/development/compilers/flutter/default.nix +++ b/nixpkgs/pkgs/development/compilers/flutter/default.nix @@ -4,7 +4,7 @@ let getPatches = dir: let files = builtins.attrNames (builtins.readDir dir); in map (f: dir + ("/" + f)) files; - version = "2.0.3"; + version = "2.2.1"; channel = "stable"; filename = "flutter_linux_${version}-${channel}.tar.xz"; in @@ -15,7 +15,7 @@ in pname = "flutter"; src = fetchurl { url = "https://storage.googleapis.com/flutter_infra/releases/${channel}/linux/${filename}"; - sha256 = "14a63cpkp78rgymmlrppds69jsrdarg33dr43nb7s61r0xfh9icm"; + sha256 = "009pwk2casz10gibgjpz08102wxmkq9iq3994b3c2q342g6526g0"; }; patches = getPatches ./patches; }; diff --git a/nixpkgs/pkgs/development/compilers/flutter/patches/disable-auto-update.patch b/nixpkgs/pkgs/development/compilers/flutter/patches/disable-auto-update.patch index 1fe098136843..d0fd363d3c64 100644 --- a/nixpkgs/pkgs/development/compilers/flutter/patches/disable-auto-update.patch +++ b/nixpkgs/pkgs/development/compilers/flutter/patches/disable-auto-update.patch @@ -1,5 +1,5 @@ diff --git a/bin/internal/shared.sh b/bin/internal/shared.sh -index c44f867746..c9eda34e26 100644 +index be9320210e..6eb50aae95 100644 --- a/bin/internal/shared.sh +++ b/bin/internal/shared.sh @@ -218,8 +218,6 @@ function shared::execute() { @@ -12,16 +12,23 @@ index c44f867746..c9eda34e26 100644 case "$BIN_NAME" in flutter*) diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -index 3dc7929dd1..e65d70d55b 100644 +index 550a75bc65..c98a4591cc 100644 --- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart +++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -@@ -246,11 +246,7 @@ class FlutterCommandRunner extends CommandRunner<void> { +@@ -244,7 +244,6 @@ class FlutterCommandRunner extends CommandRunner<void> { globals.flutterUsage.suppressAnalytics = true; } - globals.flutterVersion.ensureVersionFile(); final bool machineFlag = topLevelResults['machine'] as bool; -- if (topLevelResults.command?.name != 'upgrade' && topLevelResults['version-check'] as bool && !machineFlag) { + final bool ci = await globals.botDetector.isRunningOnBot; + final bool redirectedCompletion = !globals.stdio.hasTerminal && +@@ -253,10 +252,6 @@ class FlutterCommandRunner extends CommandRunner<void> { + final bool versionCheckFlag = topLevelResults['version-check'] as bool; + final bool explicitVersionCheckPassed = topLevelResults.wasParsed('version-check') && versionCheckFlag; + +- if (topLevelResults.command?.name != 'upgrade' && +- (explicitVersionCheckPassed || (versionCheckFlag && !isMachine))) { - await globals.flutterVersion.checkFlutterVersionFreshness(); - } diff --git a/nixpkgs/pkgs/development/compilers/flutter/patches/move-cache.patch b/nixpkgs/pkgs/development/compilers/flutter/patches/move-cache.patch index d6a45a97e581..2610c155804b 100644 --- a/nixpkgs/pkgs/development/compilers/flutter/patches/move-cache.patch +++ b/nixpkgs/pkgs/development/compilers/flutter/patches/move-cache.patch @@ -1,24 +1,24 @@ diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart -index a6c59bae07..21f6c9812a 100644 +index 80fb16673f..5723f93f9f 100644 --- a/packages/flutter_tools/lib/src/asset.dart +++ b/packages/flutter_tools/lib/src/asset.dart -@@ -5,6 +5,7 @@ +@@ -7,6 +7,7 @@ import 'package:meta/meta.dart'; import 'package:package_config/package_config.dart'; +import 'base/common.dart'; import 'base/context.dart'; + import 'base/deferred_component.dart'; import 'base/file_system.dart'; - import 'base/logger.dart'; -@@ -14,6 +15,7 @@ import 'cache.dart'; +@@ -16,6 +17,7 @@ import 'build_info.dart'; + import 'cache.dart'; import 'convert.dart'; import 'dart/package_map.dart'; - import 'devfs.dart'; +import 'globals.dart' as globals; + import 'devfs.dart'; import 'flutter_manifest.dart'; import 'license_collector.dart'; - import 'project.dart'; -@@ -377,7 +379,7 @@ class ManifestAssetBundle implements AssetBundle { +@@ -449,7 +451,7 @@ class ManifestAssetBundle implements AssetBundle { for (final Map<String, Object> font in family['fonts'] as List<Map<String, Object>>) { final Uri entryUri = _fileSystem.path.toUri(font['asset'] as String); result.add(_Asset( @@ -28,32 +28,40 @@ index a6c59bae07..21f6c9812a 100644 entryUri: entryUri, package: null, diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart -index 11e3bf3e11..39d6fae0d1 100644 +index 152d4e75e5..1fcff7e2bd 100644 --- a/packages/flutter_tools/lib/src/cache.dart +++ b/packages/flutter_tools/lib/src/cache.dart -@@ -321,8 +321,15 @@ class Cache { +@@ -9,6 +9,7 @@ import 'package:file/memory.dart'; + import 'package:meta/meta.dart'; + import 'package:process/process.dart'; + ++import 'globals.dart' as globals; + import 'base/common.dart'; + import 'base/error_handling_io.dart'; + import 'base/file_system.dart'; +@@ -298,8 +299,15 @@ class Cache { return; } assert(_lock == null); + -+ final Directory dir = _fileSystem.directory(_fileSystem.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter')); ++ final Directory dir = _fileSystem.directory(_fileSystem.path.join(globals.fsUtils.homeDirPath!, '.cache', 'flutter')); + if (!dir.existsSync()) { + dir.createSync(recursive: true); + globals.os.chmod(dir, '755'); + } + final File lockFile = -- _fileSystem.file(_fileSystem.path.join(flutterRoot, 'bin', 'cache', 'lockfile')); -+ _fileSystem.file(_fileSystem.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'lockfile')); +- _fileSystem.file(_fileSystem.path.join(flutterRoot!, 'bin', 'cache', 'lockfile')); ++ _fileSystem.file(_fileSystem.path.join(globals.fsUtils.homeDirPath!, '.cache', 'flutter', 'lockfile')); try { _lock = lockFile.openSync(mode: FileMode.write); } on FileSystemException catch (e) { -@@ -424,7 +431,7 @@ class Cache { +@@ -404,7 +412,7 @@ class Cache { if (_rootOverride != null) { - return _fileSystem.directory(_fileSystem.path.join(_rootOverride.path, 'bin', 'cache')); + return _fileSystem.directory(_fileSystem.path.join(_rootOverride!.path, 'bin', 'cache')); } else { -- return _fileSystem.directory(_fileSystem.path.join(flutterRoot, 'bin', 'cache')); -+ return _fileSystem.directory(_fileSystem.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter')); +- return _fileSystem.directory(_fileSystem.path.join(flutterRoot!, 'bin', 'cache')); ++ return _fileSystem.directory(_fileSystem.path.join(globals.fsUtils.homeDirPath!, '.cache', 'flutter')); } } diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.10.4.nix b/nixpkgs/pkgs/development/compilers/ghc/8.10.4.nix index da957f93520b..fe42d0c1c6a3 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/8.10.4.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/8.10.4.nix @@ -89,9 +89,19 @@ let targetCC = builtins.head toolsForTarget; - # ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 + # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues. + # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 # see #84670 and #49071 for more background. - useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl; + useLdGold = targetPlatform.linker == "gold" || (targetPlatform.linker == "bfd" && !targetPlatform.isMusl); + + runtimeDeps = [ + targetPackages.stdenv.cc.bintools + coreutils + ] + # On darwin, we need unwrapped bintools as well (for otool) + ++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [ + targetPackages.stdenv.cc.bintools.bintools + ]; in stdenv.mkDerivation (rec { @@ -235,7 +245,7 @@ stdenv.mkDerivation (rec { for i in "$out/bin/"*; do test ! -h $i || continue egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i + sed -i -e '2i export PATH="$PATH:${lib.makeBinPath runtimeDeps}"' $i done ''; diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix b/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix index b0336ad3992d..002d83ef6be1 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix @@ -98,9 +98,19 @@ let targetCC = builtins.head toolsForTarget; - # ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 + # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues. + # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 # see #84670 and #49071 for more background. - useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl; + useLdGold = targetPlatform.linker == "gold" || (targetPlatform.linker == "bfd" && !targetPlatform.isMusl); + + runtimeDeps = [ + targetPackages.stdenv.cc.bintools + coreutils + ] + # On darwin, we need unwrapped bintools as well (for otool) + ++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [ + targetPackages.stdenv.cc.bintools.bintools + ]; in stdenv.mkDerivation (rec { @@ -242,7 +252,7 @@ stdenv.mkDerivation (rec { for i in "$out/bin/"*; do test ! -h $i || continue egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i + sed -i -e '2i export PATH="$PATH:${lib.makeBinPath runtimeDeps}"' $i done ''; diff --git a/nixpkgs/pkgs/development/compilers/ghc/9.0.1.nix b/nixpkgs/pkgs/development/compilers/ghc/9.0.1.nix index 58beef5d6882..f5a6b5f32fa8 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/9.0.1.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/9.0.1.nix @@ -90,9 +90,19 @@ let targetCC = builtins.head toolsForTarget; - # ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 + # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues. + # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 # see #84670 and #49071 for more background. - useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl; + useLdGold = targetPlatform.linker == "gold" || (targetPlatform.linker == "bfd" && !targetPlatform.isMusl); + + runtimeDeps = [ + targetPackages.stdenv.cc.bintools + coreutils + ] + # On darwin, we need unwrapped bintools as well (for otool) + ++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [ + targetPackages.stdenv.cc.bintools.bintools + ]; in stdenv.mkDerivation (rec { @@ -225,7 +235,7 @@ stdenv.mkDerivation (rec { for i in "$out/bin/"*; do test ! -h $i || continue egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i + sed -i -e '2i export PATH="$PATH:${lib.makeBinPath runtimeDeps}"' $i done ''; diff --git a/nixpkgs/pkgs/development/compilers/ghc/head.nix b/nixpkgs/pkgs/development/compilers/ghc/head.nix index a0ca13270a24..ec236731afd7 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/head.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/head.nix @@ -100,9 +100,19 @@ let targetCC = builtins.head toolsForTarget; - # ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 + # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues. + # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 # see #84670 and #49071 for more background. - useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl; + useLdGold = targetPlatform.linker == "gold" || (targetPlatform.linker == "bfd" && !targetPlatform.isMusl); + + runtimeDeps = [ + targetPackages.stdenv.cc.bintools + coreutils + ] + # On darwin, we need unwrapped bintools as well (for otool) + ++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [ + targetPackages.stdenv.cc.bintools.bintools + ]; in stdenv.mkDerivation (rec { @@ -242,7 +252,7 @@ stdenv.mkDerivation (rec { for i in "$out/bin/"*; do test ! -h $i || continue egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i + sed -i -e '2i export PATH="$PATH:${lib.makeBinPath runtimeDeps}"' $i done ''; diff --git a/nixpkgs/pkgs/development/compilers/gleam/default.nix b/nixpkgs/pkgs/development/compilers/gleam/default.nix index 7bce45c455f2..5c88be00ba8f 100644 --- a/nixpkgs/pkgs/development/compilers/gleam/default.nix +++ b/nixpkgs/pkgs/development/compilers/gleam/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vBxVGIgg2BpVvEYjmX99YSf1zy9aWOHr6ftaYxJWkzY="; + sha256 = "sha256-QcJudP4zhtY1CxV3XLkiC06hrKOqlLdb+X6lHvqc7ZA="; }; nativeBuildInputs = [ pkg-config ]; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; - cargoSha256 = "sha256-2zHc7xk5MuEUO9YGifSWbgRTi51ZUk84QLro94LsBtQ="; + cargoSha256 = "sha256-een2aI6gDVx450mQcwF1uRG/tn9FzahTMWpPdvUBumE="; meta = with lib; { description = "A statically typed language for the Erlang VM"; diff --git a/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix b/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix index 4012aa260f8c..f3bd5d9f4a31 100644 --- a/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -24,9 +24,8 @@ openjdk11.overrideAttrs (oldAttrs: rec { your own risk. ''; homepage = "https://bintray.com/jetbrains/intellij-jdk/"; - license = licenses.gpl2; + inherit (openjdk11.meta) license platforms mainProgram; maintainers = with maintainers; [ edwtjo petabyteboy ]; - platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; }; passthru = oldAttrs.passthru // { home = "${jetbrains.jdk}/lib/openjdk"; diff --git a/nixpkgs/pkgs/development/compilers/jrsonnet/default.nix b/nixpkgs/pkgs/development/compilers/jrsonnet/default.nix new file mode 100644 index 000000000000..82e15db66858 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/jrsonnet/default.nix @@ -0,0 +1,26 @@ +{ stdenv, lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "jrsonnet"; + version = "0.3.8"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "CertainLach"; + repo = "jrsonnet"; + sha256 = "sha256-u6P/j7j6S7iPQQh00YFtp2G9Kt4xdWJGsxbuBjvHHZ4="; + }; + + postInstall = '' + ln -s $out/bin/jrsonnet $out/bin/jsonnet + ''; + + cargoSha256 = "sha256-KGQ3n3BBgLCT3ITIM8p9AxNa62ek4GHymqoD0eQSVKQ="; + + meta = { + description = "Purely-functional configuration language that helps you define JSON data"; + maintainers = with lib.maintainers; [ lach ]; + license = lib.licenses.mit; + homepage = "https://github.com/CertainLach/jrsonnet"; + }; +} diff --git a/nixpkgs/pkgs/development/compilers/kotlin/default.nix b/nixpkgs/pkgs/development/compilers/kotlin/default.nix index 5fdf58e56f5d..a2021c836fec 100644 --- a/nixpkgs/pkgs/development/compilers/kotlin/default.nix +++ b/nixpkgs/pkgs/development/compilers/kotlin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kotlin"; - version = "1.5.0"; + version = "1.5.10"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "1dyiis96skflhlsmc8byp5j8j3vsicmlslwyrkn1pv4gc8gzqhq3"; + sha256 = "0kiwddq5b0dk63nlifb8bbaimh8inxsbk97nbw2m8qw17gby339g"; }; propagatedBuildInputs = [ jre ] ; @@ -37,8 +37,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://kotlinlang.org/"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; - [ ]; + maintainers = with lib.maintainers; [ SubhrajyotiSen ]; platforms = lib.platforms.all; }; } diff --git a/nixpkgs/pkgs/development/compilers/llvm/10/clang/default.nix b/nixpkgs/pkgs/development/compilers/llvm/10/clang/default.nix index e0c52651cadc..b42f40b96943 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/10/clang/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/10/clang/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, llvm_meta, fetch, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 +{ lib, stdenv, llvm_meta, fetch, substituteAll, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 , buildLlvmTools , fixDarwinDylibNames , enableManpages ? false @@ -46,6 +46,10 @@ let # https://reviews.llvm.org/D51899 ./compiler-rt-baremetal.patch ./gnu-install-dirs.patch + (substituteAll { + src = ../../clang-6-10-LLVMgold-path.patch; + libllvmLibdir = "${libllvm.lib}/lib"; + }) ]; postPatch = '' @@ -64,12 +68,7 @@ let outputs = [ "out" "lib" "dev" "python" ]; - # Clang expects to find LLVMgold in its own prefix postInstall = '' - if [ -e ${libllvm.lib}/lib/LLVMgold.so ]; then - ln -sv ${libllvm.lib}/lib/LLVMgold.so $lib/lib - fi - ln -sv $out/bin/clang $out/bin/cpp # Move libclang to 'lib' output diff --git a/nixpkgs/pkgs/development/compilers/llvm/10/lldb/default.nix b/nixpkgs/pkgs/development/compilers/llvm/10/lldb/default.nix index 04b9e06e77a3..a762151a586c 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/10/lldb/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/10/lldb/default.nix @@ -13,6 +13,7 @@ , version , darwin , lit +, makeWrapper , enableManpages ? false }: @@ -30,7 +31,7 @@ stdenv.mkDerivation (rec { outputs = [ "out" "lib" "dev" ]; nativeBuildInputs = [ - cmake python3 which swig lit + cmake python3 which swig lit makeWrapper ] ++ lib.optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ]; @@ -68,7 +69,15 @@ stdenv.mkDerivation (rec { doCheck = false; + installCheckPhase = '' + if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then + return 1; + fi + ''; + postInstall = '' + wrapProgram $out/bin/lldb --prefix PYTHONPATH : $lib/${python3.sitePackages}/ + # Editor support # vscode: install -D ../tools/lldb-vscode/package.json $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/package.json diff --git a/nixpkgs/pkgs/development/compilers/llvm/10/lldb/gnu-install-dirs.patch b/nixpkgs/pkgs/development/compilers/llvm/10/lldb/gnu-install-dirs.patch index 053a580e45ec..0a7539db5e6b 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/10/lldb/gnu-install-dirs.patch +++ b/nixpkgs/pkgs/development/compilers/llvm/10/lldb/gnu-install-dirs.patch @@ -63,3 +63,29 @@ index aff75d7db334..98a527c5e761 100644 install(TARGETS lldbIntelFeatures - LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) +diff --git a/cmake/modules/LLDBStandalone.cmake b/cmake/modules/LLDBStandalone.cmake +index 752113b..010f187 100644 +--- a/cmake/modules/LLDBStandalone.cmake ++++ b/cmake/modules/LLDBStandalone.cmake +@@ -62,7 +62,7 @@ endif() + + # They are used as destination of target generators. + set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin) +-set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) ++set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + if(WIN32 OR CYGWIN) + # DLL platform -- put DLLs into bin. + set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_RUNTIME_OUTPUT_INTDIR}) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bf74802..1c98cae 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -222,7 +222,7 @@ if (LLDB_ENABLE_PYTHON) + if(LLDB_BUILD_FRAMEWORK) + set(LLDB_PYTHON_INSTALL_PATH ${LLDB_FRAMEWORK_INSTALL_DIR}/LLDB.framework/Resources/Python) + else() +- set(LLDB_PYTHON_INSTALL_PATH ${LLDB_PYTHON_RELATIVE_PATH}) ++ set(LLDB_PYTHON_INSTALL_PATH ${CMAKE_INSTALL_LIBDIR}/../${LLDB_PYTHON_RELATIVE_PATH}) + endif() + if (NOT CMAKE_CFG_INTDIR STREQUAL ".") + string(REPLACE ${CMAKE_CFG_INTDIR} "\$\{CMAKE_INSTALL_CONFIG_NAME\}" LLDB_PYTHON_INSTALL_PATH ${LLDB_PYTHON_INSTALL_PATH}) diff --git a/nixpkgs/pkgs/development/compilers/llvm/11/clang/default.nix b/nixpkgs/pkgs/development/compilers/llvm/11/clang/default.nix index 74078c1ac667..9eed5269da6b 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/11/clang/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/11/clang/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, llvm_meta, fetch, fetchpatch, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 +{ lib, stdenv, llvm_meta, fetch, fetchpatch, substituteAll, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 , buildLlvmTools , fixDarwinDylibNames , enableManpages ? false @@ -62,6 +62,10 @@ let excludes = [ "docs/*" "test/*" ]; sha256 = "0gxgmi0qbm89mq911dahallhi8m6wa9vpklklqmxafx4rplrr8ph"; }) + (substituteAll { + src = ../../clang-11-12-LLVMgold-path.patch; + libllvmLibdir = "${libllvm.lib}/lib"; + }) ]; postPatch = '' @@ -80,12 +84,7 @@ let outputs = [ "out" "lib" "dev" "python" ]; - # Clang expects to find LLVMgold in its own prefix postInstall = '' - if [ -e ${libllvm.lib}/lib/LLVMgold.so ]; then - ln -sv ${libllvm.lib}/lib/LLVMgold.so $lib/lib - fi - ln -sv $out/bin/clang $out/bin/cpp # Move libclang to 'lib' output diff --git a/nixpkgs/pkgs/development/compilers/llvm/11/lldb/default.nix b/nixpkgs/pkgs/development/compilers/llvm/11/lldb/default.nix index 785ac4671ef5..46d6c6628e10 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/11/lldb/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/11/lldb/default.nix @@ -13,6 +13,7 @@ , version , darwin , lit +, makeWrapper , enableManpages ? false }: @@ -30,7 +31,7 @@ stdenv.mkDerivation (rec { outputs = [ "out" "lib" "dev" ]; nativeBuildInputs = [ - cmake python3 which swig lit + cmake python3 which swig lit makeWrapper ] ++ lib.optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ]; @@ -68,7 +69,15 @@ stdenv.mkDerivation (rec { doCheck = false; + installCheckPhase = '' + if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then + return 1; + fi + ''; + postInstall = '' + wrapProgram $out/bin/lldb --prefix PYTHONPATH : $lib/${python3.sitePackages}/ + # Editor support # vscode: install -D ../tools/lldb-vscode/package.json $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/package.json diff --git a/nixpkgs/pkgs/development/compilers/llvm/11/lldb/gnu-install-dirs.patch b/nixpkgs/pkgs/development/compilers/llvm/11/lldb/gnu-install-dirs.patch index a4769109523d..fd49be395a3a 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/11/lldb/gnu-install-dirs.patch +++ b/nixpkgs/pkgs/development/compilers/llvm/11/lldb/gnu-install-dirs.patch @@ -63,3 +63,29 @@ index efba2f74904f..e08413b1dbb1 100644 install(TARGETS lldbIntelFeatures - LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) +diff --git a/cmake/modules/LLDBStandalone.cmake b/cmake/modules/LLDBStandalone.cmake +index 752113b..010f187 100644 +--- a/cmake/modules/LLDBStandalone.cmake ++++ b/cmake/modules/LLDBStandalone.cmake +@@ -62,7 +62,7 @@ endif() + + # They are used as destination of target generators. + set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin) +-set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) ++set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + if(WIN32 OR CYGWIN) + # DLL platform -- put DLLs into bin. + set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_RUNTIME_OUTPUT_INTDIR}) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bf74802..1c98cae 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -222,7 +222,7 @@ if (LLDB_ENABLE_PYTHON) + if(LLDB_BUILD_FRAMEWORK) + set(LLDB_PYTHON_INSTALL_PATH ${LLDB_FRAMEWORK_INSTALL_DIR}/LLDB.framework/Resources/Python) + else() +- set(LLDB_PYTHON_INSTALL_PATH ${LLDB_PYTHON_RELATIVE_PATH}) ++ set(LLDB_PYTHON_INSTALL_PATH ${CMAKE_INSTALL_LIBDIR}/../${LLDB_PYTHON_RELATIVE_PATH}) + endif() + if (NOT CMAKE_CFG_INTDIR STREQUAL ".") + string(REPLACE ${CMAKE_CFG_INTDIR} "\$\{CMAKE_INSTALL_CONFIG_NAME\}" LLDB_PYTHON_INSTALL_PATH ${LLDB_PYTHON_INSTALL_PATH}) diff --git a/nixpkgs/pkgs/development/compilers/llvm/12/clang/default.nix b/nixpkgs/pkgs/development/compilers/llvm/12/clang/default.nix index 3d1106dbc52c..dbd6ea1e1ac4 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/12/clang/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/12/clang/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, llvm_meta, fetch, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 +{ lib, stdenv, llvm_meta, fetch, substituteAll, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 , buildLlvmTools , fixDarwinDylibNames , enableManpages ? false @@ -44,6 +44,10 @@ let ./purity.patch # https://reviews.llvm.org/D51899 ./gnu-install-dirs.patch + (substituteAll { + src = ../../clang-11-12-LLVMgold-path.patch; + libllvmLibdir = "${libllvm.lib}/lib"; + }) ]; postPatch = '' @@ -59,12 +63,7 @@ let outputs = [ "out" "lib" "dev" "python" ]; - # Clang expects to find LLVMgold in its own prefix postInstall = '' - if [ -e ${libllvm.lib}/lib/LLVMgold.so ]; then - ln -sv ${libllvm.lib}/lib/LLVMgold.so $lib/lib - fi - ln -sv $out/bin/clang $out/bin/cpp # Move libclang to 'lib' output diff --git a/nixpkgs/pkgs/development/compilers/llvm/12/lldb/default.nix b/nixpkgs/pkgs/development/compilers/llvm/12/lldb/default.nix index 07517308b467..0712396cccfa 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/12/lldb/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/12/lldb/default.nix @@ -19,6 +19,7 @@ , Carbon , Cocoa , lit +, makeWrapper , enableManpages ? false }: @@ -41,7 +42,7 @@ stdenv.mkDerivation (rec { outputs = [ "out" "lib" "dev" ]; nativeBuildInputs = [ - cmake python3 which swig lit + cmake python3 which swig lit makeWrapper ] ++ lib.optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ]; @@ -84,7 +85,15 @@ stdenv.mkDerivation (rec { doCheck = false; + installCheckPhase = '' + if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then + return 1; + fi + ''; + postInstall = '' + wrapProgram $out/bin/lldb --prefix PYTHONPATH : $lib/${python3.sitePackages}/ + # Editor support # vscode: install -D ../tools/lldb-vscode/package.json $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/package.json diff --git a/nixpkgs/pkgs/development/compilers/llvm/12/lldb/gnu-install-dirs.patch b/nixpkgs/pkgs/development/compilers/llvm/12/lldb/gnu-install-dirs.patch index 98321f4479e6..afc945ce2614 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/12/lldb/gnu-install-dirs.patch +++ b/nixpkgs/pkgs/development/compilers/llvm/12/lldb/gnu-install-dirs.patch @@ -63,3 +63,29 @@ index 734167e51bc5..f95761b5df58 100644 install(TARGETS lldbIntelFeatures - LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) +diff --git a/cmake/modules/LLDBStandalone.cmake b/cmake/modules/LLDBStandalone.cmake +index 752113b..010f187 100644 +--- a/cmake/modules/LLDBStandalone.cmake ++++ b/cmake/modules/LLDBStandalone.cmake +@@ -62,7 +62,7 @@ endif() + + # They are used as destination of target generators. + set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin) +-set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) ++set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + if(WIN32 OR CYGWIN) + # DLL platform -- put DLLs into bin. + set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_RUNTIME_OUTPUT_INTDIR}) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b5633e2..86e4738 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -79,7 +79,7 @@ if (LLDB_ENABLE_PYTHON) + if(LLDB_BUILD_FRAMEWORK) + set(lldb_python_target_dir "${LLDB_FRAMEWORK_ABSOLUTE_BUILD_DIR}/LLDB.framework/Resources/Python/lldb") + else() +- set(lldb_python_target_dir "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${LLDB_PYTHON_RELATIVE_PATH}/lldb") ++ set(lldb_python_target_dir "${CMAKE_INSTALL_LIBDIR}/../${LLDB_PYTHON_RELATIVE_PATH}/lldb") + endif() + get_target_property(lldb_python_bindings_dir swig_wrapper_python BINARY_DIR) + finish_swig_python("lldb-python" "${lldb_python_bindings_dir}" "${lldb_python_target_dir}") diff --git a/nixpkgs/pkgs/development/compilers/llvm/5/clang/LLVMgold-path.patch b/nixpkgs/pkgs/development/compilers/llvm/5/clang/LLVMgold-path.patch new file mode 100644 index 000000000000..6a09c91b5132 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/5/clang/LLVMgold-path.patch @@ -0,0 +1,14 @@ +diff --git a/lib/Driver/ToolChains/CommonArgs.cpp b/lib/Driver/ToolChains/CommonArgs.cpp +index 00bd60bc24bb..17416b0bd3c0 100644 +--- a/lib/Driver/ToolChains/CommonArgs.cpp ++++ b/lib/Driver/ToolChains/CommonArgs.cpp +@@ -376,8 +376,7 @@ void tools::AddGoldPlugin(const ToolChain &ToolChain, const ArgList &Args, + // as gold requires -plugin to come before any -plugin-opt that -Wl might + // forward. + CmdArgs.push_back("-plugin"); +- std::string Plugin = +- ToolChain.getDriver().Dir + "/../lib" CLANG_LIBDIR_SUFFIX "/LLVMgold.so"; ++ std::string Plugin = "@libllvmLibdir@" "/LLVMgold.so"; + CmdArgs.push_back(Args.MakeArgString(Plugin)); + + // Try to pass driver level flags relevant to LTO code generation down to diff --git a/nixpkgs/pkgs/development/compilers/llvm/5/clang/default.nix b/nixpkgs/pkgs/development/compilers/llvm/5/clang/default.nix index b5887a23c65e..df3d26139866 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/5/clang/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/5/clang/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, llvm_meta, fetch, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 +{ lib, stdenv, llvm_meta, fetch, substituteAll, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 , buildLlvmTools , fixDarwinDylibNames , enableManpages ? false @@ -43,6 +43,10 @@ let patches = [ ./purity.patch ./gnu-install-dirs.patch + (substituteAll { + src = ./LLVMgold-path.patch; + libllvmLibdir = "${libllvm.lib}/lib"; + }) ]; postPatch = '' @@ -58,12 +62,7 @@ let outputs = [ "out" "lib" "dev" "python" ]; - # Clang expects to find LLVMgold in its own prefix postInstall = '' - if [ -e ${libllvm.lib}/lib/LLVMgold.so ]; then - ln -sv ${libllvm.lib}/lib/LLVMgold.so $lib/lib - fi - ln -sv $out/bin/clang $out/bin/cpp # Move libclang to 'lib' output diff --git a/nixpkgs/pkgs/development/compilers/llvm/6/clang/default.nix b/nixpkgs/pkgs/development/compilers/llvm/6/clang/default.nix index eba9111d9d32..ee8859c159a1 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/6/clang/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/6/clang/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, llvm_meta, fetch, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 +{ lib, stdenv, llvm_meta, fetch, substituteAll, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 , buildLlvmTools , fixDarwinDylibNames , enableManpages ? false @@ -43,6 +43,10 @@ let patches = [ ./purity.patch ./gnu-install-dirs.patch + (substituteAll { + src = ../../clang-6-10-LLVMgold-path.patch; + libllvmLibdir = "${libllvm.lib}/lib"; + }) ]; postPatch = '' @@ -58,12 +62,7 @@ let outputs = [ "out" "lib" "dev" "python" ]; - # Clang expects to find LLVMgold in its own prefix postInstall = '' - if [ -e ${libllvm.lib}/lib/LLVMgold.so ]; then - ln -sv ${libllvm.lib}/lib/LLVMgold.so $lib/lib - fi - ln -sv $out/bin/clang $out/bin/cpp # Move libclang to 'lib' output diff --git a/nixpkgs/pkgs/development/compilers/llvm/7/clang/default.nix b/nixpkgs/pkgs/development/compilers/llvm/7/clang/default.nix index e1b031ad352b..afa1669ace61 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/7/clang/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/7/clang/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, llvm_meta, fetch, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 +{ lib, stdenv, llvm_meta, fetch, substituteAll, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 , buildLlvmTools , fixDarwinDylibNames , enableManpages ? false @@ -52,6 +52,10 @@ let # needed for our bootstrapping to not interfere with C. ./unwindlib.patch ./gnu-install-dirs.patch + (substituteAll { + src = ../../clang-6-10-LLVMgold-path.patch; + libllvmLibdir = "${libllvm.lib}/lib"; + }) ]; postPatch = '' @@ -70,12 +74,7 @@ let outputs = [ "out" "lib" "dev" "python" ]; - # Clang expects to find LLVMgold in its own prefix postInstall = '' - if [ -e ${libllvm.lib}/lib/LLVMgold.so ]; then - ln -sv ${libllvm.lib}/lib/LLVMgold.so $lib/lib - fi - ln -sv $out/bin/clang $out/bin/cpp # Move libclang to 'lib' output diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/clang/default.nix b/nixpkgs/pkgs/development/compilers/llvm/8/clang/default.nix index c3399dccd1d7..5cb7720d026f 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/8/clang/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/8/clang/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, llvm_meta, fetch, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 +{ lib, stdenv, llvm_meta, fetch, substituteAll, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 , buildLlvmTools , fixDarwinDylibNames , enableManpages ? false @@ -59,6 +59,10 @@ let # make clang -xhip use $PATH to find executables ./HIP-use-PATH-8.patch ./gnu-install-dirs.patch + (substituteAll { + src = ../../clang-6-10-LLVMgold-path.patch; + libllvmLibdir = "${libllvm.lib}/lib"; + }) ]; postPatch = '' @@ -77,12 +81,7 @@ let outputs = [ "out" "lib" "dev" "python" ]; - # Clang expects to find LLVMgold in its own prefix postInstall = '' - if [ -e ${libllvm.lib}/lib/LLVMgold.so ]; then - ln -sv ${libllvm.lib}/lib/LLVMgold.so $lib/lib - fi - ln -sv $out/bin/clang $out/bin/cpp # Move libclang to 'lib' output diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/lldb/default.nix b/nixpkgs/pkgs/development/compilers/llvm/8/lldb/default.nix index ee1f678996a6..b6025f722ebb 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/8/lldb/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/8/lldb/default.nix @@ -12,6 +12,7 @@ , python3 , version , darwin +, makeWrapper }: stdenv.mkDerivation rec { @@ -37,7 +38,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" ]; nativeBuildInputs = [ - cmake python3 which swig + cmake python3 which swig makeWrapper ]; buildInputs = [ @@ -61,7 +62,15 @@ stdenv.mkDerivation rec { doCheck = false; + installCheckPhase = '' + if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then + return 1; + fi + ''; + postInstall = '' + wrapProgram $out/bin/lldb --prefix PYTHONPATH : $lib/${python3.sitePackages}/ + mkdir -p $out/share/man/man1 cp ../docs/lldb.1 $out/share/man/man1/ diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/lldb/gnu-install-dirs.patch b/nixpkgs/pkgs/development/compilers/llvm/8/lldb/gnu-install-dirs.patch index b2e79086beda..08b6fae654e5 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/8/lldb/gnu-install-dirs.patch +++ b/nixpkgs/pkgs/development/compilers/llvm/8/lldb/gnu-install-dirs.patch @@ -79,3 +79,42 @@ index b5316540fdf3..3c3c882d503f 100644 install(TARGETS lldbIntelFeatures - LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cdf22c4..d56fc6a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -146,7 +146,7 @@ if (NOT LLDB_DISABLE_PYTHON) + --cfgBldDir=${lldb_scripts_dir} + --prefix=${CMAKE_BINARY_DIR} + --cmakeBuildConfiguration=${CMAKE_CFG_INTDIR} +- --lldbLibDir=lib${LLVM_LIBDIR_SUFFIX} ++ --lldbLibDir=${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} + ${use_python_wrapper_from_src_dir} + ${use_six_py_from_system} + VERBATIM +diff --git a/cmake/modules/LLDBStandalone.cmake b/cmake/modules/LLDBStandalone.cmake +index a9059dd..d76a47d 100644 +--- a/cmake/modules/LLDBStandalone.cmake ++++ b/cmake/modules/LLDBStandalone.cmake +@@ -124,7 +124,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) + link_directories("${LLVM_LIBRARY_DIR}") + + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) +- set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}) ++ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_INSTALL_LIBDIR}/lib${LLVM_LIBDIR_SUFFIX}) + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}) + + set(LLDB_BUILT_STANDALONE 1) +diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt +index 3598247..bd60451 100644 +--- a/scripts/CMakeLists.txt ++++ b/scripts/CMakeLists.txt +@@ -47,7 +47,7 @@ if(NOT LLDB_BUILD_FRAMEWORK) + endif() + + set(SWIG_PYTHON_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${swig_python_subdir}) +- set(SWIG_INSTALL_DIR lib${LLVM_LIBDIR_SUFFIX}) ++ set(SWIG_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + + # Install the LLDB python module + install(DIRECTORY ${SWIG_PYTHON_DIR} DESTINATION ${SWIG_INSTALL_DIR}) diff --git a/nixpkgs/pkgs/development/compilers/llvm/9/clang/default.nix b/nixpkgs/pkgs/development/compilers/llvm/9/clang/default.nix index 700fcb414fce..c98b4a830c42 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/9/clang/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/9/clang/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, llvm_meta, fetch, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 +{ lib, stdenv, llvm_meta, fetch, substituteAll, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 , buildLlvmTools , fixDarwinDylibNames , enableManpages ? false @@ -52,6 +52,10 @@ let # make clang -xhip use $PATH to find executables ./HIP-use-PATH-9.patch ./gnu-install-dirs.patch + (substituteAll { + src = ../../clang-6-10-LLVMgold-path.patch; + libllvmLibdir = "${libllvm.lib}/lib"; + }) ]; postPatch = '' @@ -70,12 +74,7 @@ let outputs = [ "out" "lib" "dev" "python" ]; - # Clang expects to find LLVMgold in its own prefix postInstall = '' - if [ -e ${libllvm.lib}/lib/LLVMgold.so ]; then - ln -sv ${libllvm.lib}/lib/LLVMgold.so $lib/lib - fi - ln -sv $out/bin/clang $out/bin/cpp # Move libclang to 'lib' output diff --git a/nixpkgs/pkgs/development/compilers/llvm/9/lldb/default.nix b/nixpkgs/pkgs/development/compilers/llvm/9/lldb/default.nix index 9957a0218da8..63edc60828eb 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/9/lldb/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/9/lldb/default.nix @@ -12,6 +12,7 @@ , python3 , version , darwin +, makeWrapper , lit }: @@ -29,7 +30,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" ]; nativeBuildInputs = [ - cmake python3 which swig lit + cmake python3 which swig lit makeWrapper ]; buildInputs = [ @@ -58,7 +59,15 @@ stdenv.mkDerivation rec { doCheck = false; + installCheckPhase = '' + if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then + return 1; + fi + ''; + postInstall = '' + wrapProgram $out/bin/lldb --prefix PYTHONPATH : $lib/${python3.sitePackages}/ + # man page mkdir -p $out/share/man/man1 install ../docs/lldb.1 -t $out/share/man/man1/ diff --git a/nixpkgs/pkgs/development/compilers/llvm/9/lldb/gnu-install-dirs.patch b/nixpkgs/pkgs/development/compilers/llvm/9/lldb/gnu-install-dirs.patch index cb4e400b3678..6ceb29ced92f 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/9/lldb/gnu-install-dirs.patch +++ b/nixpkgs/pkgs/development/compilers/llvm/9/lldb/gnu-install-dirs.patch @@ -63,3 +63,43 @@ index b5316540fdf3..3c3c882d503f 100644 install(TARGETS lldbIntelFeatures - LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cdf22c4..d56fc6a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -146,7 +146,7 @@ if (NOT LLDB_DISABLE_PYTHON) + --cfgBldDir=${lldb_scripts_dir} + --prefix=${CMAKE_BINARY_DIR} + --cmakeBuildConfiguration=${CMAKE_CFG_INTDIR} +- --lldbLibDir=lib${LLVM_LIBDIR_SUFFIX} ++ --lldbLibDir=${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} + ${use_python_wrapper_from_src_dir} + ${use_six_py_from_system} + VERBATIM +diff --git a/cmake/modules/LLDBStandalone.cmake b/cmake/modules/LLDBStandalone.cmake +index b726797..1f057ac 100644 +--- a/cmake/modules/LLDBStandalone.cmake ++++ b/cmake/modules/LLDBStandalone.cmake +@@ -95,7 +95,7 @@ include_directories( + "${CLANG_INCLUDE_DIRS}") + + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) +-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}) ++set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_INSTALL_LIBDIR}/lib${LLVM_LIBDIR_SUFFIX}) + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}) + + set(LLDB_BUILT_STANDALONE 1) +diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt +index 7de7973..b70aecc 100644 +--- a/scripts/CMakeLists.txt ++++ b/scripts/CMakeLists.txt +@@ -50,7 +50,8 @@ if(NOT LLDB_BUILD_FRAMEWORK) + OUTPUT_STRIP_TRAILING_WHITESPACE) + execute_process( + COMMAND ${PYTHON_EXECUTABLE} +- -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_lib(True, False, ''))" ++ -c "import distutils.sysconfig, sys; print(distutils.sysconfig.get_python_lib(True, False, sys.argv[1]))" ++ ${CMAKE_INSTALL_LIBDIR}/../ + OUTPUT_VARIABLE SWIG_INSTALL_DIR + OUTPUT_STRIP_TRAILING_WHITESPACE) + diff --git a/nixpkgs/pkgs/development/compilers/llvm/clang-11-12-LLVMgold-path.patch b/nixpkgs/pkgs/development/compilers/llvm/clang-11-12-LLVMgold-path.patch new file mode 100644 index 000000000000..8f8991976f33 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/clang-11-12-LLVMgold-path.patch @@ -0,0 +1,13 @@ +diff --git a/lib/Driver/ToolChains/CommonArgs.cpp b/lib/Driver/ToolChains/CommonArgs.cpp +index 6b6e276b8ce7..7896542a1202 100644 +--- a/lib/Driver/ToolChains/CommonArgs.cpp ++++ b/lib/Driver/ToolChains/CommonArgs.cpp +@@ -409,7 +409,7 @@ void tools::addLTOOptions(const ToolChain &ToolChain, const ArgList &Args, + + SmallString<1024> Plugin; + llvm::sys::path::native( +- Twine(D.Dir) + "/../lib" CLANG_LIBDIR_SUFFIX "/LLVMgold" + Suffix, ++ Twine("@libllvmLibdir@" "/LLVMgold") + Suffix, + Plugin); + CmdArgs.push_back(Args.MakeArgString(Plugin)); + } diff --git a/nixpkgs/pkgs/development/compilers/llvm/clang-6-10-LLVMgold-path.patch b/nixpkgs/pkgs/development/compilers/llvm/clang-6-10-LLVMgold-path.patch new file mode 100644 index 000000000000..93504316edf3 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/clang-6-10-LLVMgold-path.patch @@ -0,0 +1,15 @@ +diff --git a/lib/Driver/ToolChains/CommonArgs.cpp b/lib/Driver/ToolChains/CommonArgs.cpp +index 37ec73468570..b73e75aa6e59 100644 +--- a/lib/Driver/ToolChains/CommonArgs.cpp ++++ b/lib/Driver/ToolChains/CommonArgs.cpp +@@ -370,8 +370,8 @@ void tools::AddGoldPlugin(const ToolChain &ToolChain, const ArgList &Args, + #endif + + SmallString<1024> Plugin; +- llvm::sys::path::native(Twine(ToolChain.getDriver().Dir) + +- "/../lib" CLANG_LIBDIR_SUFFIX "/LLVMgold" + ++ llvm::sys::path::native(Twine("@libllvmLibdir@" ++ "/LLVMgold") + + Suffix, + Plugin); + CmdArgs.push_back(Args.MakeArgString(Plugin)); diff --git a/nixpkgs/pkgs/development/compilers/llvm/git/default.nix b/nixpkgs/pkgs/development/compilers/llvm/git/default.nix index 38de0f70cf2e..1bbbbd963f68 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/git/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/git/default.nix @@ -18,18 +18,19 @@ }: let - release_version = "12.0.0"; + release_version = "13.0.0"; candidate = ""; # empty or "rcN" dash-candidate = lib.optionalString (candidate != "") "-${candidate}"; - rev = ""; # When using a Git commit - version = "${release_version}${dash-candidate}"; # differentiating these (variables) is important for RCs + rev = "643b6407faf460915679f304420cfbee87c47734"; # When using a Git commit + rev-version = "unstable-2021-06-11"; # When using a Git commit + version = if rev != "" then rev-version else "${release_version}${dash-candidate}"; targetConfig = stdenv.targetPlatform.config; src = fetchFromGitHub { owner = "llvm"; repo = "llvm-project"; rev = if rev != "" then rev else "llvmorg-${version}"; - sha256 = "07jz8pywc2qqa1srdnqg5p2y4lx3ki1inpigarzgxc3j20r4gb58"; + sha256 = "0b06qqbks20m1cy9g1k8y4w8vh9zcbh9ag2bpk9xgg2xkmbq42az"; }; llvm_meta = { @@ -256,9 +257,7 @@ let libunwind = callPackage ./libunwind { inherit llvm_meta; - stdenv = if stdenv.hostPlatform.useLLVM or false - then overrideCC stdenv buildLlvmTools.clangNoLibcxx - else stdenv; + stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; }; openmp = callPackage ./openmp { diff --git a/nixpkgs/pkgs/development/compilers/llvm/git/libcxx/default.nix b/nixpkgs/pkgs/development/compilers/llvm/git/libcxx/default.nix index 8fb6b4a7dbd4..f511eba81dc5 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/git/libcxx/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/git/libcxx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, llvm_meta, src, cmake, python3, libcxxabi, fixDarwinDylibNames, version +{ lib, stdenv, llvm_meta, src, cmake, python3, fixDarwinDylibNames, version , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -24,10 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - buildInputs = [ libcxxabi ]; - cmakeFlags = [ - "-DLIBCXX_CXX_ABI=libcxxabi" ] ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1" ++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON" ++ lib.optional stdenv.hostPlatform.isWasm [ diff --git a/nixpkgs/pkgs/development/compilers/llvm/git/libcxx/gnu-install-dirs.patch b/nixpkgs/pkgs/development/compilers/llvm/git/libcxx/gnu-install-dirs.patch index 1f9de00a9d56..f59d7f8dfafc 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/git/libcxx/gnu-install-dirs.patch +++ b/nixpkgs/pkgs/development/compilers/llvm/git/libcxx/gnu-install-dirs.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9bf1a02f0908..612cd4aab76c 100644 +index 06ee1d74a03e..6c3c6f8f8d47 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,6 +28,8 @@ set(LIBCXX_BINARY_INCLUDE_DIR "${LIBCXX_BINARY_DIR}/include/c++build") @@ -9,92 +9,73 @@ index 9bf1a02f0908..612cd4aab76c 100644 + include(GNUInstallDirs) + set(PACKAGE_NAME libcxx) - set(PACKAGE_VERSION 12.0.0) + set(PACKAGE_VERSION 13.0.0git) set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") -@@ -402,7 +404,7 @@ endif () - if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) - set(LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) - set(LIBCXX_HEADER_DIR ${LLVM_BINARY_DIR}) -- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) -+ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) +@@ -409,7 +411,7 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + set(LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}) + set(LIBCXX_GENERATED_INCLUDE_DIR "${LLVM_BINARY_DIR}/include/c++/v1") + set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LLVM_BINARY_DIR}/include/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1") +- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}) ++ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}) + set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1") + set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "include/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1") if(LIBCXX_LIBDIR_SUBDIR) - string(APPEND LIBCXX_LIBRARY_DIR /${LIBCXX_LIBDIR_SUBDIR}) - string(APPEND LIBCXX_INSTALL_LIBRARY_DIR /${LIBCXX_LIBDIR_SUBDIR}) -@@ -410,11 +412,11 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) - elseif(LLVM_LIBRARY_OUTPUT_INTDIR) +@@ -420,14 +422,14 @@ elseif(LLVM_LIBRARY_OUTPUT_INTDIR) set(LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) - set(LIBCXX_HEADER_DIR ${LLVM_BINARY_DIR}) + set(LIBCXX_GENERATED_INCLUDE_DIR "${LLVM_BINARY_DIR}/include/c++/v1") + set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LIBCXX_GENERATED_INCLUDE_DIR}") - set(LIBCXX_INSTALL_LIBRARY_DIR lib${LIBCXX_LIBDIR_SUFFIX}) + set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX}) + set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1") + set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${LIBCXX_INSTALL_INCLUDE_DIR}") else() set(LIBCXX_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXX_LIBDIR_SUFFIX}) - set(LIBCXX_HEADER_DIR ${CMAKE_BINARY_DIR}) + set(LIBCXX_GENERATED_INCLUDE_DIR "${CMAKE_BINARY_DIR}/include/c++/v1") + set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LIBCXX_GENERATED_INCLUDE_DIR}") - set(LIBCXX_INSTALL_LIBRARY_DIR lib${LIBCXX_LIBDIR_SUFFIX}) + set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX}) + set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1") + set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${LIBCXX_INSTALL_INCLUDE_DIR}") endif() - - file(MAKE_DIRECTORY "${LIBCXX_BINARY_INCLUDE_DIR}") diff --git a/cmake/Modules/HandleLibCXXABI.cmake b/cmake/Modules/HandleLibCXXABI.cmake -index 5d2764e870e9..bb1ec5de6ca2 100644 +index 5a8a4a270a1a..c06bae0001aa 100644 --- a/cmake/Modules/HandleLibCXXABI.cmake +++ b/cmake/Modules/HandleLibCXXABI.cmake @@ -63,7 +63,7 @@ macro(setup_abi_lib abidefines abishared abistatic abifiles abidirs) if (LIBCXX_INSTALL_HEADERS) install(FILES "${LIBCXX_BINARY_INCLUDE_DIR}/${fpath}" -- DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}include/c++/v1/${dstdir} -+ DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1/${dstdir} +- DESTINATION include/c++/v1/${dstdir} ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/c++/v1/${dstdir} COMPONENT cxx-headers PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ ) -diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt -index 29a317b8ae9a..4747263cfd1b 100644 ---- a/include/CMakeLists.txt -+++ b/include/CMakeLists.txt -@@ -252,7 +252,7 @@ if (LIBCXX_INSTALL_HEADERS) - foreach(file ${files}) - get_filename_component(dir ${file} DIRECTORY) - install(FILES ${file} -- DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}include/c++/v1/${dir} -+ DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1/${dir} - COMPONENT cxx-headers - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ - ) -@@ -260,7 +260,7 @@ if (LIBCXX_INSTALL_HEADERS) - - # Install the generated header as __config. - install(FILES ${LIBCXX_BINARY_DIR}/__generated_config -- DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}include/c++/v1 -+ DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1 - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ - RENAME __config - COMPONENT cxx-headers) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 9965104cb5b2..9b55dbb1d822 100644 +index 87b71f7ba334..d20a783079b7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -352,21 +352,21 @@ if (LIBCXX_INSTALL_SHARED_LIBRARY) +@@ -369,21 +369,21 @@ if (LIBCXX_INSTALL_SHARED_LIBRARY) install(TARGETS cxx_shared - ARCHIVE DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx - LIBRARY DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx -- RUNTIME DESTINATION ${LIBCXX_INSTALL_PREFIX}bin COMPONENT cxx) -+ RUNTIME DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_BINDIR} COMPONENT cxx) + ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx + LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx +- RUNTIME DESTINATION bin COMPONENT cxx) ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT cxx) endif() if (LIBCXX_INSTALL_STATIC_LIBRARY) install(TARGETS cxx_static - ARCHIVE DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx - LIBRARY DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx -- RUNTIME DESTINATION ${LIBCXX_INSTALL_PREFIX}bin COMPONENT cxx) -+ RUNTIME DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_BINDIR} COMPONENT cxx) + ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx + LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx +- RUNTIME DESTINATION bin COMPONENT cxx) ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT cxx) endif() if(LIBCXX_INSTALL_EXPERIMENTAL_LIBRARY) install(TARGETS cxx_experimental - LIBRARY DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx - ARCHIVE DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx -- RUNTIME DESTINATION ${LIBCXX_INSTALL_PREFIX}bin COMPONENT cxx) -+ RUNTIME DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_BINDIR} COMPONENT cxx) + LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx + ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx +- RUNTIME DESTINATION bin COMPONENT cxx) ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT cxx) endif() # NOTE: This install command must go after the cxx install command otherwise diff --git a/nixpkgs/pkgs/development/compilers/llvm/git/libcxxabi/default.nix b/nixpkgs/pkgs/development/compilers/llvm/git/libcxxabi/default.nix index 3bb82d651ec7..7fadc6d6dcac 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/git/libcxxabi/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/git/libcxxabi/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, llvm_meta, cmake, python3, src, libunwind, version , enableShared ? !stdenv.hostPlatform.isStatic +, libcxx }: stdenv.mkDerivation rec { @@ -26,7 +27,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 ]; buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind; - cmakeFlags = lib.optionals (stdenv.hostPlatform.useLLVM or false) [ + cmakeFlags = [ + "-DLIBCXXABI_LIBCXX_INCLUDES=${libcxx.dev}/include/c++/v1" + ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" ] ++ lib.optionals stdenv.hostPlatform.isWasm [ diff --git a/nixpkgs/pkgs/development/compilers/llvm/git/libcxxabi/gnu-install-dirs.patch b/nixpkgs/pkgs/development/compilers/llvm/git/libcxxabi/gnu-install-dirs.patch index b49b1685940f..45641acb0c74 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/git/libcxxabi/gnu-install-dirs.patch +++ b/nixpkgs/pkgs/development/compilers/llvm/git/libcxxabi/gnu-install-dirs.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 426c855288fc..a9812a994f53 100644 +index 1e8b73aa38cc..6f7b2a25d205 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,6 +27,8 @@ set(LIBCXXABI_LIBCXX_PATH "${CMAKE_CURRENT_LIST_DIR}/../libcxx" CACHE PATH @@ -9,26 +9,28 @@ index 426c855288fc..a9812a994f53 100644 + include(GNUInstallDirs) + set(PACKAGE_NAME libcxxabi) - set(PACKAGE_VERSION 11.0.0) + set(PACKAGE_VERSION 11.0.0git) set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") -@@ -180,17 +182,17 @@ set(CMAKE_MODULE_PATH - +@@ -196,7 +198,7 @@ set(CMAKE_MODULE_PATH if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) - set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) -- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) -+ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) + set(LIBCXXABI_HEADER_DIR ${LLVM_BINARY_DIR}) + set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}) +- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}) ++ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}) if(LIBCXX_LIBDIR_SUBDIR) string(APPEND LIBCXXABI_LIBRARY_DIR /${LIBCXXABI_LIBDIR_SUBDIR}) string(APPEND LIBCXXABI_INSTALL_LIBRARY_DIR /${LIBCXXABI_LIBDIR_SUBDIR}) - endif() +@@ -204,11 +206,11 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) elseif(LLVM_LIBRARY_OUTPUT_INTDIR) + set(LIBCXXABI_HEADER_DIR ${LLVM_BINARY_DIR}) set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) - set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX}) + set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX}) else() + set(LIBCXXABI_HEADER_DIR ${CMAKE_BINARY_DIR}) set(LIBCXXABI_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXXABI_LIBDIR_SUFFIX}) - set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX}) + set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX}) endif() - set(LIBCXXABI_INSTALL_PREFIX "" CACHE STRING "Define libc++abi destination prefix.") + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIBCXXABI_LIBRARY_DIR}) diff --git a/nixpkgs/pkgs/development/compilers/llvm/git/libunwind/gnu-install-dirs.patch b/nixpkgs/pkgs/development/compilers/llvm/git/libunwind/gnu-install-dirs.patch index a791d6c43231..56231cd31b2a 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/git/libunwind/gnu-install-dirs.patch +++ b/nixpkgs/pkgs/development/compilers/llvm/git/libunwind/gnu-install-dirs.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 48cb8e004e08..fec8144fb95a 100644 +index a2c03fd3f8aa..98de2f8ea7c8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,6 +23,8 @@ set(LIBUNWIND_LIBCXX_PATH "${CMAKE_CURRENT_LIST_DIR}/../libcxx" CACHE PATH @@ -9,14 +9,14 @@ index 48cb8e004e08..fec8144fb95a 100644 + include(GNUInstallDirs) + set(PACKAGE_NAME libunwind) - set(PACKAGE_VERSION 12.0.0) + set(PACKAGE_VERSION 13.0.0git) set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") -@@ -115,17 +117,17 @@ set(CMAKE_MODULE_PATH +@@ -116,17 +118,17 @@ set(CMAKE_MODULE_PATH if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) - set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) -- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) -+ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++) + set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}) +- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}) ++ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}) if(LIBCXX_LIBDIR_SUBDIR) string(APPEND LIBUNWIND_LIBRARY_DIR /${LIBUNWIND_LIBDIR_SUBDIR}) string(APPEND LIBUNWIND_INSTALL_LIBRARY_DIR /${LIBUNWIND_LIBDIR_SUBDIR}) @@ -24,11 +24,11 @@ index 48cb8e004e08..fec8144fb95a 100644 elseif(LLVM_LIBRARY_OUTPUT_INTDIR) set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) - set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX}) -+ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBUNWIND_LIBDIR_SUFFIX}) ++ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) else() set(LIBUNWIND_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBUNWIND_LIBDIR_SUFFIX}) - set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX}) -+ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBUNWIND_LIBDIR_SUFFIX}) ++ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) endif() set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIBUNWIND_LIBRARY_DIR}) diff --git a/nixpkgs/pkgs/development/compilers/llvm/git/llvm/default.nix b/nixpkgs/pkgs/development/compilers/llvm/git/llvm/default.nix index f65476a6fddd..daf4cfe808b6 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/git/llvm/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/git/llvm/default.nix @@ -12,6 +12,7 @@ , version , release_version , zlib +, which , buildLlvmTools , debugVersion ? false , enableManpages ? false @@ -47,15 +48,10 @@ in stdenv.mkDerivation (rec { propagatedBuildInputs = [ ncurses zlib ]; + checkInputs = [ which ]; + patches = [ ./gnu-install-dirs.patch - # On older CPUs (e.g. Hydra/wendy) we'd be getting an error in this test. - (fetchpatch { - name = "uops-CMOV16rm-noreg.diff"; - url = "https://github.com/llvm/llvm-project/commit/9e9f991ac033.diff"; - sha256 = "sha256:12s8vr6ibri8b48h2z38f3afhwam10arfiqfy4yg37bmc054p5hi"; - stripLen = 1; - }) ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; postPatch = optionalString stdenv.isDarwin '' @@ -75,6 +71,7 @@ in stdenv.mkDerivation (rec { substituteInPlace unittests/IR/CMakeLists.txt \ --replace "PassBuilderCallbacksTest.cpp" "" rm unittests/IR/PassBuilderCallbacksTest.cpp + rm test/tools/llvm-objcopy/ELF/mirror-permissions-unix.test '' + optionalString stdenv.hostPlatform.isMusl '' patch -p1 -i ${../../TLI-musl.patch} substituteInPlace unittests/Support/CMakeLists.txt \ diff --git a/nixpkgs/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs.patch b/nixpkgs/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs.patch index da8dc1445171..18fa5fc6d89c 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs.patch +++ b/nixpkgs/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 277d0fe54d7b..af69c8be8745 100644 +index 135036f509d2..265c36f8211b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -256,15 +256,21 @@ if (CMAKE_BUILD_TYPE AND +@@ -270,15 +270,21 @@ if (CMAKE_BUILD_TYPE AND message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") endif() @@ -25,7 +25,7 @@ index 277d0fe54d7b..af69c8be8745 100644 # They are used as destination of target generators. set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin) set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) -@@ -567,9 +573,9 @@ option (LLVM_ENABLE_SPHINX "Use Sphinx to generate llvm documentation." OFF) +@@ -581,9 +587,9 @@ option (LLVM_ENABLE_SPHINX "Use Sphinx to generate llvm documentation." OFF) option (LLVM_ENABLE_OCAMLDOC "Build OCaml bindings documentation." ON) option (LLVM_ENABLE_BINDINGS "Build bindings." ON) @@ -37,7 +37,7 @@ index 277d0fe54d7b..af69c8be8745 100644 CACHE STRING "OCamldoc-generated HTML documentation install directory") option (LLVM_BUILD_EXTERNAL_COMPILER_RT -@@ -1027,7 +1033,7 @@ endif() +@@ -1048,7 +1054,7 @@ endif() if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) install(DIRECTORY include/llvm include/llvm-c @@ -46,7 +46,7 @@ index 277d0fe54d7b..af69c8be8745 100644 COMPONENT llvm-headers FILES_MATCHING PATTERN "*.def" -@@ -1038,7 +1044,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) +@@ -1059,7 +1065,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) ) install(DIRECTORY ${LLVM_INCLUDE_DIR}/llvm ${LLVM_INCLUDE_DIR}/llvm-c @@ -55,7 +55,7 @@ index 277d0fe54d7b..af69c8be8745 100644 COMPONENT llvm-headers FILES_MATCHING PATTERN "*.def" -@@ -1052,13 +1058,13 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) +@@ -1073,13 +1079,13 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) if (LLVM_INSTALL_MODULEMAPS) install(DIRECTORY include/llvm include/llvm-c @@ -72,11 +72,11 @@ index 277d0fe54d7b..af69c8be8745 100644 RENAME "module.extern.modulemap" ) diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake -index 97c9980c7de3..409e8b615f75 100644 +index 9c2b85374307..5531ceeb2eeb 100644 --- a/cmake/modules/AddLLVM.cmake +++ b/cmake/modules/AddLLVM.cmake -@@ -804,9 +804,9 @@ macro(add_llvm_library name) - +@@ -818,9 +818,9 @@ macro(add_llvm_library name) + get_target_export_arg(${name} LLVM export_to_llvmexports ${umbrella}) install(TARGETS ${name} ${export_to_llvmexports} - LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} @@ -88,7 +88,7 @@ index 97c9980c7de3..409e8b615f75 100644 if (NOT LLVM_ENABLE_IDE) add_llvm_install_targets(install-${name} -@@ -1022,7 +1022,7 @@ function(process_llvm_pass_plugins) +@@ -1036,7 +1036,7 @@ function(process_llvm_pass_plugins) "set(LLVM_STATIC_EXTENSIONS ${LLVM_STATIC_EXTENSIONS})") install(FILES ${llvm_cmake_builddir}/LLVMConfigExtensions.cmake @@ -97,7 +97,7 @@ index 97c9980c7de3..409e8b615f75 100644 COMPONENT cmake-exports) set(ExtensionDef "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def") -@@ -1242,7 +1242,7 @@ macro(add_llvm_example name) +@@ -1250,7 +1250,7 @@ macro(add_llvm_example name) endif() add_llvm_executable(${name} ${ARGN}) if( LLVM_BUILD_EXAMPLES ) @@ -106,7 +106,7 @@ index 97c9980c7de3..409e8b615f75 100644 endif() set_target_properties(${name} PROPERTIES FOLDER "Examples") endmacro(add_llvm_example name) -@@ -1854,7 +1854,7 @@ function(llvm_install_library_symlink name dest type) +@@ -1868,7 +1868,7 @@ function(llvm_install_library_symlink name dest type) set(full_name ${CMAKE_${type}_LIBRARY_PREFIX}${name}${CMAKE_${type}_LIBRARY_SUFFIX}) set(full_dest ${CMAKE_${type}_LIBRARY_PREFIX}${dest}${CMAKE_${type}_LIBRARY_SUFFIX}) @@ -115,8 +115,8 @@ index 97c9980c7de3..409e8b615f75 100644 if(WIN32 AND "${type}" STREQUAL "SHARED") set(output_dir bin) endif() -@@ -1871,7 +1871,7 @@ function(llvm_install_library_symlink name dest type) - endif() +@@ -1879,7 +1879,7 @@ function(llvm_install_library_symlink name dest type) + endfunction() -function(llvm_install_symlink name dest) @@ -124,7 +124,7 @@ index 97c9980c7de3..409e8b615f75 100644 cmake_parse_arguments(ARG "ALWAYS_GENERATE" "COMPONENT" "" ${ARGN}) foreach(path ${CMAKE_MODULE_PATH}) if(EXISTS ${path}/LLVMInstallSymlink.cmake) -@@ -1894,7 +1894,7 @@ function(llvm_install_symlink name dest) +@@ -1902,7 +1902,7 @@ function(llvm_install_symlink name dest) set(full_dest ${dest}${CMAKE_EXECUTABLE_SUFFIX}) install(SCRIPT ${INSTALL_SYMLINK} @@ -133,7 +133,7 @@ index 97c9980c7de3..409e8b615f75 100644 COMPONENT ${component}) if (NOT LLVM_ENABLE_IDE AND NOT ARG_ALWAYS_GENERATE) -@@ -1977,7 +1977,8 @@ function(add_llvm_tool_symlink link_name target) +@@ -1985,7 +1985,8 @@ function(add_llvm_tool_symlink link_name target) endif() if ((TOOL_IS_TOOLCHAIN OR NOT LLVM_INSTALL_TOOLCHAIN_ONLY) AND LLVM_BUILD_TOOLS) @@ -143,12 +143,12 @@ index 97c9980c7de3..409e8b615f75 100644 endif() endif() endfunction() -@@ -2100,9 +2101,9 @@ function(llvm_setup_rpath name) - - if (APPLE) - set(_install_name_dir INSTALL_NAME_DIR "@rpath") -- set(_install_rpath "@loader_path/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) -+ set(_install_rpath "@loader_path/../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) +@@ -2114,9 +2115,9 @@ function(llvm_setup_rpath name) + # Since BUILD_SHARED_LIBS is only recommended for use by developers, + # hardcode the rpath to build/install lib dir first in this mode. + # FIXME: update this when there is better solution. +- set(_install_rpath "${LLVM_LIBRARY_OUTPUT_INTDIR}" "${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) ++ set(_install_rpath "${LLVM_LIBRARY_OUTPUT_INTDIR}" "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) elseif(UNIX) - set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) + set(_install_rpath "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) @@ -185,16 +185,18 @@ index e80c3b5c1cac..482f6d715ef5 100644 # '/.' indicates: copy the contents of the directory directly into diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt -index 505dc9a29d70..36e6c63af3f4 100644 +index 51b6a4fdc284..4adc2acfc074 100644 --- a/cmake/modules/CMakeLists.txt +++ b/cmake/modules/CMakeLists.txt -@@ -1,4 +1,4 @@ +@@ -1,6 +1,6 @@ + include(LLVMDistributionSupport) + -set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm) +set(LLVM_INSTALL_PACKAGE_DIR ${LLVM_INSTALL_CMAKE_DIR} CACHE STRING "Path for CMake subdirectory (defaults to 'cmake/llvm')") set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") # First for users who use an installed LLVM, create the LLVMExports.cmake file. -@@ -107,13 +107,13 @@ foreach(p ${_count}) +@@ -109,13 +109,13 @@ foreach(p ${_count}) set(LLVM_CONFIG_CODE "${LLVM_CONFIG_CODE} get_filename_component(LLVM_INSTALL_PREFIX \"\${LLVM_INSTALL_PREFIX}\" PATH)") endforeach(p) @@ -212,32 +214,32 @@ index 505dc9a29d70..36e6c63af3f4 100644 # Generate a default location for lit if (LLVM_INSTALL_UTILS AND LLVM_BUILD_UTILS) diff --git a/cmake/modules/LLVMInstallSymlink.cmake b/cmake/modules/LLVMInstallSymlink.cmake -index 09fed8085c23..aa79f192abf0 100644 +index 3e6a2c9a2648..52e14d955c60 100644 --- a/cmake/modules/LLVMInstallSymlink.cmake +++ b/cmake/modules/LLVMInstallSymlink.cmake -@@ -10,7 +10,7 @@ function(install_symlink name target outdir) - set(LINK_OR_COPY copy) - endif() +@@ -4,7 +4,7 @@ + function(install_symlink name target outdir) + set(DESTDIR $ENV{DESTDIR}) - set(bindir "${DESTDIR}${CMAKE_INSTALL_PREFIX}/${outdir}/") + set(bindir "${DESTDIR}${outdir}/") message(STATUS "Creating ${name}") diff --git a/docs/CMake.rst b/docs/CMake.rst -index bb821b417ad9..6a528f7c2ad3 100644 +index f1ac2c7d4934..c6e1469b5e13 100644 --- a/docs/CMake.rst +++ b/docs/CMake.rst -@@ -196,7 +196,7 @@ CMake manual, or execute ``cmake --help-variable VARIABLE_NAME``. +@@ -202,7 +202,7 @@ CMake manual, or execute ``cmake --help-variable VARIABLE_NAME``. **LLVM_LIBDIR_SUFFIX**:STRING Extra suffix to append to the directory where libraries are to be installed. On a 64-bit architecture, one could use ``-DLLVM_LIBDIR_SUFFIX=64`` - to install libraries to ``/usr/lib64``. + to install libraries to ``/usr/lib64``. See also ``CMAKE_INSTALL_LIBDIR``. - **CMAKE_C_FLAGS**:STRING - Extra flags to use when compiling C source files. -@@ -550,8 +550,8 @@ LLVM-specific variables + Rarely-used CMake variables + --------------------------- +@@ -551,8 +551,8 @@ LLVM-specific variables **LLVM_INSTALL_DOXYGEN_HTML_DIR**:STRING The path to install Doxygen-generated HTML documentation to. This path can @@ -246,47 +248,9 @@ index bb821b417ad9..6a528f7c2ad3 100644 + either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to + `${CMAKE_INSTALL_DOCDIR}/${project}/doxygen-html`. - **LLVM_ENABLE_SPHINX**:BOOL - If specified, CMake will search for the ``sphinx-build`` executable and will make -@@ -582,13 +582,33 @@ LLVM-specific variables - - **LLVM_INSTALL_SPHINX_HTML_DIR**:STRING - The path to install Sphinx-generated HTML documentation to. This path can -- either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to -- `share/doc/llvm/html`. -+ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to -+ `${CMAKE_INSTALL_DOCDIR}/${project}/html`. - - **LLVM_INSTALL_OCAMLDOC_HTML_DIR**:STRING - The path to install OCamldoc-generated HTML documentation to. This path can -- either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to -- `share/doc/llvm/ocaml-html`. -+ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to -+ `${CMAKE_INSTALL_DOCDIR}/${project}/ocaml-html`. -+ -+**CMAKE_INSTALL_BINDIR**:STRING -+ The path to install binary tools, relative to the ``CMAKE_INSTALL_PREFIX``. -+ Defaults to `bin`. -+ -+**CMAKE_INSTALL_LIBDIR**:STRING -+ The path to install libraries, relative to the ``CMAKE_INSTALL_PREFIX``. -+ Defaults to `lib`. -+ -+**CMAKE_INSTALL_INCLUDEDIR**:STRING -+ The path to install header files, relative to the ``CMAKE_INSTALL_PREFIX``. -+ Defaults to `include`. -+ -+**CMAKE_INSTALL_DOCDIR**:STRING -+ The path to install documentation, relative to the ``CMAKE_INSTALL_PREFIX``. -+ Defaults to `share/doc`. -+ -+**CMAKE_INSTALL_MANDIR**:STRING -+ The path to install manpage files, relative to the ``CMAKE_INSTALL_PREFIX``. -+ Defaults to `share/man`. - - **LLVM_CREATE_XCODE_TOOLCHAIN**:BOOL - macOS Only: If enabled CMake will generate a target named -@@ -786,9 +806,11 @@ the ``cmake`` command or by setting it directly in ``ccmake`` or ``cmake-gui``). + **LLVM_LINK_LLVM_DYLIB**:BOOL + If enabled, tools will be linked with the libLLVM shared library. Defaults +@@ -792,9 +792,11 @@ the ``cmake`` command or by setting it directly in ``ccmake`` or ``cmake-gui``). This file is available in two different locations. @@ -377,11 +341,11 @@ index 1a2f04552d13..44fa7d3eec6b 100644 } diff --git a/tools/lto/CMakeLists.txt b/tools/lto/CMakeLists.txt -index 2963f97cad88..69d66c9c9ca1 100644 +index 0af29ad762c5..37b99b83e35c 100644 --- a/tools/lto/CMakeLists.txt +++ b/tools/lto/CMakeLists.txt -@@ -25,7 +25,7 @@ add_llvm_library(LTO SHARED INSTALL_WITH_TOOLCHAIN ${SOURCES} DEPENDS - intrinsics_gen) +@@ -33,7 +33,7 @@ add_llvm_library(${LTO_LIBRARY_NAME} ${LTO_LIBRARY_TYPE} INSTALL_WITH_TOOLCHAIN + ${SOURCES} DEPENDS intrinsics_gen) install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/lto.h - DESTINATION include/llvm-c diff --git a/nixpkgs/pkgs/development/compilers/llvm/git/openmp/default.nix b/nixpkgs/pkgs/development/compilers/llvm/git/openmp/default.nix index 07488c1c33f4..c5a33df97560 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/git/openmp/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/git/openmp/default.nix @@ -18,6 +18,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake perl ]; buildInputs = [ llvm ]; + cmakeFlags = [ + "-DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF" # Building the AMDGCN device RTL currently fails + ]; + meta = llvm_meta // { homepage = "https://openmp.llvm.org/"; description = "Support for the OpenMP language"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/update-git.py b/nixpkgs/pkgs/development/compilers/llvm/update-git.py index ec1a30c6b0ff..880cad1c72b1 100755 --- a/nixpkgs/pkgs/development/compilers/llvm/update-git.py +++ b/nixpkgs/pkgs/development/compilers/llvm/update-git.py @@ -7,12 +7,16 @@ import json import os import re import subprocess +import sys from codecs import iterdecode from datetime import datetime from urllib.request import urlopen, Request +DEFAULT_NIX = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'git/default.nix') + + def get_latest_chromium_build(): HISTORY_URL = 'https://omahaproxy.appspot.com/history?os=linux' print(f'GET {HISTORY_URL}') @@ -39,6 +43,16 @@ def get_commit(ref): return json.loads(http_response.read().decode()) +def get_current_revision(): + """Get the current revision of llvmPackages_git.""" + with open(DEFAULT_NIX) as f: + for line in f: + rev = re.search(r'^ rev = "(.*)";', line) + if rev: + return rev.group(1) + sys.exit(1) + + def nix_prefetch_url(url, algo='sha256'): """Prefetches the content of the given URL.""" print(f'nix-prefetch-url {url}') @@ -55,16 +69,18 @@ clang_revision = re.search(r"^CLANG_REVISION = '(.+)'$", clang_update_script, re clang_commit_short = re.search(r"llvmorg-[0-9]+-init-[0-9]+-g([0-9a-f]{8})", clang_revision).group(1) release_version = re.search(r"^RELEASE_VERSION = '(.+)'$", clang_update_script, re.MULTILINE).group(1) commit = get_commit(clang_commit_short) +if get_current_revision() == commit["sha"]: + print('No new update available.') + sys.exit(0) date = datetime.fromisoformat(commit['commit']['committer']['date'].rstrip('Z')).date().isoformat() version = f'unstable-{date}' print('Prefetching source tarball...') hash = nix_prefetch_url(f'https://github.com/llvm/llvm-project/archive/{commit["sha"]}.tar.gz') print('Updating default.nix...') -default_nix = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'git/default.nix') -with fileinput.FileInput(default_nix, inplace=True) as f: +with fileinput.FileInput(DEFAULT_NIX, inplace=True) as f: for line in f: result = re.sub(r'^ release_version = ".+";', f' release_version = "{release_version}";', line) - result = re.sub(r'^ version = ".+";', f' version = "{version}";', result) result = re.sub(r'^ rev = ".*";', f' rev = "{commit["sha"]}";', result) + result = re.sub(r'^ rev-version = ".+";', f' rev-version = "{version}";', result) result = re.sub(r'^ sha256 = ".+";', f' sha256 = "{hash}";', result) print(result, end='') diff --git a/nixpkgs/pkgs/development/compilers/mosml/default.nix b/nixpkgs/pkgs/development/compilers/mosml/default.nix index f6d2053f315c..e7dc9ceae6d9 100644 --- a/nixpkgs/pkgs/development/compilers/mosml/default.nix +++ b/nixpkgs/pkgs/development/compilers/mosml/default.nix @@ -15,6 +15,10 @@ stdenv.mkDerivation rec { setSourceRoot = ''export sourceRoot="$(echo */src)"''; + # MosML needs a specific RPATH entry pointing to $(out)/lib (added + # by the build system), which patchelf will remove. + dontPatchELF = true; + meta = with lib; { description = "A light-weight implementation of Standard ML"; longDescription = '' diff --git a/nixpkgs/pkgs/development/compilers/nim/default.nix b/nixpkgs/pkgs/development/compilers/nim/default.nix index 21d1017a6753..25b1c4873572 100644 --- a/nixpkgs/pkgs/development/compilers/nim/default.nix +++ b/nixpkgs/pkgs/development/compilers/nim/default.nix @@ -95,12 +95,12 @@ in { nim-unwrapped = stdenv.mkDerivation rec { pname = "nim-unwrapped"; - version = "1.4.6"; + version = "1.4.8"; strictDeps = true; src = fetchurl { url = "https://nim-lang.org/download/nim-${version}.tar.xz"; - hash = "sha256-D7wPkoLP/oXembxHv6h2Ulud3aKi6uVcGFoIgEuY070="; + hash = "sha256-t5jFd0EdfZW4YxJh27Nnbp0a/Z42dA0ESWagVVtBRBo="; }; buildInputs = [ boehmgc openssl pcre readline sqlite ]; @@ -290,6 +290,8 @@ in { makeWrapper \ ${nim'}/nim/bin/nim $out/bin/${targetPlatform.config}-nim \ + --set-default CC $(command -v $CC) \ + --set-default CXX $(command -v $CXX) \ $wrapperArgs ln -s $out/bin/${targetPlatform.config}-nim $out/bin/nim diff --git a/nixpkgs/pkgs/development/compilers/ocaml/4.13.nix b/nixpkgs/pkgs/development/compilers/ocaml/4.13.nix new file mode 100644 index 000000000000..dc805f7e61cc --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/ocaml/4.13.nix @@ -0,0 +1,9 @@ +import ./generic.nix { + major_version = "4"; + minor_version = "13"; + patch_version = "0-alpha1"; + src = fetchTarball { + url = "https://caml.inria.fr/pub/distrib/ocaml-4.13/ocaml-4.13.0~alpha1.tar.xz"; + sha256 = "071k12q8m2w9bcwvfclyc46pwd9r49v6av36fhjdlqq29niyq915"; + }; +} diff --git a/nixpkgs/pkgs/development/compilers/openjdk/11.nix b/nixpkgs/pkgs/development/compilers/openjdk/11.nix index ef593422ff26..d7aaf2dcb55e 100644 --- a/nixpkgs/pkgs/development/compilers/openjdk/11.nix +++ b/nixpkgs/pkgs/development/compilers/openjdk/11.nix @@ -39,6 +39,7 @@ let ./read-truststore-from-env-jdk10.patch ./currency-date-range-jdk10.patch ./increase-javadoc-heap.patch + ./fix-library-path-jdk11.patch ] ++ lib.optionals (!headless && enableGnome2) [ ./swing-use-gtk-jdk10.patch ]; @@ -136,14 +137,7 @@ let disallowedReferences = [ openjdk11-bootstrap ]; - meta = with lib; { - homepage = "http://openjdk.java.net/"; - license = licenses.gpl2; - description = "The open-source Java Development Kit"; - maintainers = with maintainers; [ edwtjo asbachb ]; - platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; - mainProgram = "java"; - }; + meta = import ./meta.nix lib; passthru = { architecture = ""; diff --git a/nixpkgs/pkgs/development/compilers/openjdk/12.nix b/nixpkgs/pkgs/development/compilers/openjdk/12.nix index 66aeff306e38..3bbe12477388 100644 --- a/nixpkgs/pkgs/development/compilers/openjdk/12.nix +++ b/nixpkgs/pkgs/development/compilers/openjdk/12.nix @@ -145,14 +145,7 @@ let disallowedReferences = [ openjdk11 ]; - meta = with 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" ]; - mainProgram = "java"; - }; + meta = import ./meta.nix lib; passthru = { architecture = ""; diff --git a/nixpkgs/pkgs/development/compilers/openjdk/13.nix b/nixpkgs/pkgs/development/compilers/openjdk/13.nix index 96a567895d6a..ed79ceafc55e 100644 --- a/nixpkgs/pkgs/development/compilers/openjdk/13.nix +++ b/nixpkgs/pkgs/development/compilers/openjdk/13.nix @@ -145,14 +145,7 @@ let disallowedReferences = [ openjdk13-bootstrap ]; - meta = with 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" ]; - mainProgram = "java"; - }; + meta = import ./meta.nix lib; passthru = { architecture = ""; diff --git a/nixpkgs/pkgs/development/compilers/openjdk/14.nix b/nixpkgs/pkgs/development/compilers/openjdk/14.nix index fae27b8ca754..247cf941f002 100644 --- a/nixpkgs/pkgs/development/compilers/openjdk/14.nix +++ b/nixpkgs/pkgs/development/compilers/openjdk/14.nix @@ -141,14 +141,7 @@ let disallowedReferences = [ openjdk14-bootstrap ]; - meta = with lib; { - homepage = "https://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" ]; - mainProgram = "java"; - }; + meta = import ./meta.nix lib; passthru = { architecture = ""; diff --git a/nixpkgs/pkgs/development/compilers/openjdk/15.nix b/nixpkgs/pkgs/development/compilers/openjdk/15.nix index 11333b1ef66a..d41a245c5448 100644 --- a/nixpkgs/pkgs/development/compilers/openjdk/15.nix +++ b/nixpkgs/pkgs/development/compilers/openjdk/15.nix @@ -141,14 +141,7 @@ let disallowedReferences = [ openjdk15-bootstrap ]; - meta = with lib; { - homepage = "https://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" ]; - mainProgram = "java"; - }; + meta = import ./meta.nix lib; passthru = { architecture = ""; diff --git a/nixpkgs/pkgs/development/compilers/openjdk/16.nix b/nixpkgs/pkgs/development/compilers/openjdk/16.nix index 99033e8738c5..df8a3a68f487 100644 --- a/nixpkgs/pkgs/development/compilers/openjdk/16.nix +++ b/nixpkgs/pkgs/development/compilers/openjdk/16.nix @@ -147,14 +147,7 @@ let disallowedReferences = [ openjdk16-bootstrap ]; - meta = with lib; { - homepage = "https://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" ]; - mainProgram = "java"; - }; + meta = import ./meta.nix lib; passthru = { architecture = ""; diff --git a/nixpkgs/pkgs/development/compilers/openjdk/darwin/11.nix b/nixpkgs/pkgs/development/compilers/openjdk/darwin/11.nix index 5dd979e5521a..ae045ddfdba0 100644 --- a/nixpkgs/pkgs/development/compilers/openjdk/darwin/11.nix +++ b/nixpkgs/pkgs/development/compilers/openjdk/darwin/11.nix @@ -69,10 +69,6 @@ let home = jdk; }; - meta = with lib; { - license = licenses.gpl2; - platforms = platforms.darwin; - }; - + meta = import ./meta.nix lib; }; in jdk diff --git a/nixpkgs/pkgs/development/compilers/openjdk/darwin/8.nix b/nixpkgs/pkgs/development/compilers/openjdk/darwin/8.nix index 0941aa728ead..c7367a5d642c 100644 --- a/nixpkgs/pkgs/development/compilers/openjdk/darwin/8.nix +++ b/nixpkgs/pkgs/development/compilers/openjdk/darwin/8.nix @@ -73,10 +73,6 @@ let home = jdk; }; - meta = with lib; { - license = licenses.gpl2; - platforms = platforms.darwin; - }; - + meta = import ./meta.nix lib; }; in jdk diff --git a/nixpkgs/pkgs/development/compilers/openjdk/darwin/default.nix b/nixpkgs/pkgs/development/compilers/openjdk/darwin/default.nix index 509d1ab55227..9478f83477c8 100644 --- a/nixpkgs/pkgs/development/compilers/openjdk/darwin/default.nix +++ b/nixpkgs/pkgs/development/compilers/openjdk/darwin/default.nix @@ -69,10 +69,6 @@ let home = jdk; }; - meta = with lib; { - license = licenses.gpl2; - platforms = platforms.darwin; - }; - + meta = import ./meta.nix lib; }; in jdk diff --git a/nixpkgs/pkgs/development/compilers/openjdk/darwin/meta.nix b/nixpkgs/pkgs/development/compilers/openjdk/darwin/meta.nix new file mode 100644 index 000000000000..abe469af6915 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/openjdk/darwin/meta.nix @@ -0,0 +1,4 @@ +lib: (removeAttrs (import ../meta.nix lib) [ "maintainers" ]) // { + platforms = lib.platforms.darwin; + homepage = "https://www.azul.com/"; +} diff --git a/nixpkgs/pkgs/development/compilers/openjdk/fix-library-path-jdk11.patch b/nixpkgs/pkgs/development/compilers/openjdk/fix-library-path-jdk11.patch new file mode 100644 index 000000000000..21263dd68926 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/openjdk/fix-library-path-jdk11.patch @@ -0,0 +1,37 @@ +diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp +index 0dbe03349e..847d56778d 100644 +--- a/src/hotspot/os/linux/os_linux.cpp ++++ b/src/hotspot/os/linux/os_linux.cpp +@@ -326,13 +326,13 @@ void os::init_system_properties_values() { + // ... + // 7: The default directories, normally /lib and /usr/lib. + #if defined(AMD64) || (defined(_LP64) && defined(SPARC)) || defined(PPC64) || defined(S390) +- #define DEFAULT_LIBPATH "/usr/lib64:/lib64:/lib:/usr/lib" ++ #define DEFAULT_LIBPATH "" + #else +- #define DEFAULT_LIBPATH "/lib:/usr/lib" ++ #define DEFAULT_LIBPATH "" + #endif + + // Base path of extensions installed on the system. +-#define SYS_EXT_DIR "/usr/java/packages" ++#define SYS_EXT_DIR "" + #define EXTENSIONS_DIR "/lib/ext" + + // Buffer that fits several sprintfs. +@@ -392,13 +392,13 @@ void os::init_system_properties_values() { + strlen(v) + 1 + + sizeof(SYS_EXT_DIR) + sizeof("/lib/") + sizeof(DEFAULT_LIBPATH) + 1, + mtInternal); +- sprintf(ld_library_path, "%s%s" SYS_EXT_DIR "/lib:" DEFAULT_LIBPATH, v, v_colon); ++ sprintf(ld_library_path, "%s", v); + Arguments::set_library_path(ld_library_path); + FREE_C_HEAP_ARRAY(char, ld_library_path); + } + + // Extensions directories. +- sprintf(buf, "%s" EXTENSIONS_DIR ":" SYS_EXT_DIR EXTENSIONS_DIR, Arguments::get_java_home()); ++ sprintf(buf, "%s" EXTENSIONS_DIR, Arguments::get_java_home()); + Arguments::set_ext_dirs(buf); + + FREE_C_HEAP_ARRAY(char, buf); diff --git a/nixpkgs/pkgs/development/compilers/openjdk/meta.nix b/nixpkgs/pkgs/development/compilers/openjdk/meta.nix new file mode 100644 index 000000000000..d635d5c01e6b --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/openjdk/meta.nix @@ -0,0 +1,8 @@ +lib: with lib; { + homepage = "https://openjdk.java.net/"; + license = licenses.gpl2Only; + description = "The open-source Java Development Kit"; + maintainers = with maintainers; [ edwtjo asbachb ]; + platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; + mainProgram = "java"; +} diff --git a/nixpkgs/pkgs/development/compilers/rust/1_52.nix b/nixpkgs/pkgs/development/compilers/rust/1_52.nix index bfd6fc47ad20..49176ad3fedd 100644 --- a/nixpkgs/pkgs/development/compilers/rust/1_52.nix +++ b/nixpkgs/pkgs/development/compilers/rust/1_52.nix @@ -15,21 +15,22 @@ , CoreFoundation, Security , pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost , makeRustPlatform -, llvmPackages_11, llvm_11 +, llvmPackages_11 +, llvmPackages_12, llvm_12 } @ args: import ./default.nix { rustcVersion = "1.52.1"; rustcSha256 = "sha256-Om8jom0Oj4erv78yxc19qgwLcdCYar78Vrml+/vQv5g="; - llvmSharedForBuild = pkgsBuildBuild.llvmPackages_11.libllvm.override { enableSharedLibraries = true; }; - llvmSharedForHost = pkgsBuildHost.llvmPackages_11.libllvm.override { enableSharedLibraries = true; }; - llvmSharedForTarget = pkgsBuildTarget.llvmPackages_11.libllvm.override { enableSharedLibraries = true; }; + llvmSharedForBuild = pkgsBuildBuild.llvmPackages_12.libllvm.override { enableSharedLibraries = true; }; + llvmSharedForHost = pkgsBuildHost.llvmPackages_12.libllvm.override { enableSharedLibraries = true; }; + llvmSharedForTarget = pkgsBuildTarget.llvmPackages_12.libllvm.override { enableSharedLibraries = true; }; llvmBootstrapForDarwin = llvmPackages_11; # For use at runtime - llvmShared = llvm_11.override { enableSharedLibraries = true; }; + llvmShared = llvm_12.override { enableSharedLibraries = true; }; # Note: the version MUST be one version prior to the version we're # building @@ -56,4 +57,4 @@ import ./default.nix { ]; } -(builtins.removeAttrs args [ "fetchpatch" "pkgsBuildHost" "llvmPackages_11" "llvm_11"]) +(builtins.removeAttrs args [ "fetchpatch" "pkgsBuildHost" "llvmPackages_11" "llvmPackages_12" "llvm_12"]) diff --git a/nixpkgs/pkgs/development/compilers/scryer-prolog/cargo.patch b/nixpkgs/pkgs/development/compilers/scryer-prolog/cargo.patch new file mode 100644 index 000000000000..61a36c9ad1c9 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/scryer-prolog/cargo.patch @@ -0,0 +1,101 @@ +diff --git a/Cargo.lock b/Cargo.lock +index ef25833..d9de212 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -41,9 +41,9 @@ checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" + + [[package]] + name = "az" +-version = "0.3.1" ++version = "1.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "41a6b78289a33e09b00818ca8c90ab17c5dabb6e74f4b29a6de679c0e0886ade" ++checksum = "e9bcd47d94aa4eb8c076b50fc61a75020789394ffb9bd74a180b3379130f6569" + + [[package]] + name = "base64" +@@ -384,9 +384,9 @@ dependencies = [ + + [[package]] + name = "gmp-mpfr-sys" +-version = "1.2.2" ++version = "1.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "63d7f805cf9df081683d463f62864bda8b8e3ce7162a8e11cd0c49f27b8ce89b" ++checksum = "ad4e8e85ec9fb902b4564deeb17b1a263d3ba1334bef56154418aa045b159508" + dependencies = [ + "libc", + "winapi 0.3.8", +@@ -766,15 +766,6 @@ version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" + +-[[package]] +-name = "openssl-src" +-version = "111.9.0+1.1.1g" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a2dbe10ddd1eb335aba3780eb2eaa13e1b7b441d2562fd962398740927f39ec4" +-dependencies = [ +- "cc", +-] +- + [[package]] + name = "openssl-sys" + version = "0.9.58" +@@ -784,7 +775,6 @@ dependencies = [ + "autocfg 1.0.0", + "cc", + "libc", +- "openssl-src", + "pkg-config", + "vcpkg", + ] +@@ -1159,9 +1149,9 @@ dependencies = [ + + [[package]] + name = "rug" +-version = "1.8.0" ++version = "1.11.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "72315b6d9cb7d886fb99724330c47ceb29e923df657c31da3849fe88c0ded710" ++checksum = "e538d00da450a8e48aac7e6322e67b2dc86ec71a1feeac0e3954c4f07f01bc45" + dependencies = [ + "az", + "gmp-mpfr-sys", +@@ -1232,7 +1222,7 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + + [[package]] + name = "scryer-prolog" +-version = "0.8.126" ++version = "0.8.127" + dependencies = [ + "base64 0.12.3", + "blake2", +@@ -1243,6 +1233,7 @@ dependencies = [ + "divrem", + "downcast", + "git-version", ++ "gmp-mpfr-sys", + "hostname", + "indexmap", + "lazy_static", +diff --git a/Cargo.toml b/Cargo.toml +index c359e1b..75c4325 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -41,10 +41,14 @@ ring = "0.16.13" + ripemd160 = "0.8.0" + sha3 = "0.8.2" + blake2 = "0.8.1" +-openssl = { version = "0.10.29", features = ["vendored"] } ++openssl = { version = "0.10.29" } + native-tls = "0.2.4" + chrono = "0.4.11" + select = "0.4.3" + roxmltree = "0.11.0" + base64 = "0.12.3" + sodiumoxide = "0.2.6" ++ ++[dependencies.gmp-mpfr-sys] ++version = "1.4" ++features = ["use-system-libs"] diff --git a/nixpkgs/pkgs/development/compilers/scryer-prolog/default.nix b/nixpkgs/pkgs/development/compilers/scryer-prolog/default.nix new file mode 100644 index 000000000000..534379bcacfc --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/scryer-prolog/default.nix @@ -0,0 +1,36 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, gmp +, libmpc +, mpfr +, openssl +, pkg-config +}: + +rustPlatform.buildRustPackage rec { + pname = "scryer-prolog"; + version = "0.8.127"; + + src = fetchFromGitHub { + owner = "mthom"; + repo = "scryer-prolog"; + rev = "v${version}"; + sha256 = "0307yclslkdx6f0h0101a3da47rhz6qizf4i8q8rjh4id8wpdsn8"; + }; + + # Use system openssl, gmp, mpc and mpfr. + cargoPatches = [ ./cargo.patch ]; + + cargoSha256 = "0gb0l2wwf8079jwggn9zxk8pz8pxg3b7pin1d7dsbd4ij52lzyi2"; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl gmp libmpc mpfr ]; + + meta = with lib; { + description = "A modern Prolog implementation written mostly in Rust."; + homepage = "https://github.com/mthom/scryer-prolog"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ malbarbo ]; + }; +} diff --git a/nixpkgs/pkgs/development/compilers/serpent/default.nix b/nixpkgs/pkgs/development/compilers/serpent/default.nix index fbcbf4485a47..227e8037eaee 100644 --- a/nixpkgs/pkgs/development/compilers/serpent/default.nix +++ b/nixpkgs/pkgs/development/compilers/serpent/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { ''; homepage = "https://github.com/ethereum/wiki/wiki/Serpent"; license = with licenses; [ wtfpl ]; - maintainers = with maintainers; [ chris-martin ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/compilers/shaderc/default.nix b/nixpkgs/pkgs/development/compilers/shaderc/default.nix index 678ab3adb06c..40c216d79c34 100644 --- a/nixpkgs/pkgs/development/compilers/shaderc/default.nix +++ b/nixpkgs/pkgs/development/compilers/shaderc/default.nix @@ -8,24 +8,24 @@ let glslang = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "3ee5f2f1d3316e228916788b300d786bb574d337"; - sha256 = "1l5h9d92mzd35pgs0wibqfg7vbl771lwnvdlcsyhf6999khn5dzv"; + rev = "18eef33bd7a4bf5ad8c69f99cb72022608cf6e73"; + sha256 = "sha256-tkWVvYmSpJPaZ8VJOkAWndDWhA0PiHAkR3feBAo+knM="; }; spirv-tools = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "b63f0e5ed3e818870968ebf6af73317127fd07b0"; - sha256 = "1chv30azfp76nha428ivg4ixrij6d8pxj5kn3jam87gmkmgc9zhm"; + rev = "c2d5375fa7cc87c93f692e7200d5d974283d4391"; + sha256 = "sha256-tMJRljrlH+qb+27rTn+3LuEyMOVpiU0zSCiGNfUTb6g="; }; spirv-headers = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "979924c8bc839e4cb1b69d03d48398551f369ce7"; - sha256 = "07vyjlblpm4zhfds612h86lnz0qvrj5qqw5z2zzfa3m9fax7cm85"; + rev = "0c28b6451d77774912e52949c1e57fa726edf113"; + sha256 = "sha256-KpCMceTV/BRaoJe1qeXhKYQNQqdGaM6Q9nklpJKzHFY="; }; in stdenv.mkDerivation rec { pname = "shaderc"; - version = "2020.2"; + version = "2021.0"; outputs = [ "out" "lib" "bin" "dev" "static" ]; @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { owner = "google"; repo = "shaderc"; rev = "v${version}"; - sha256 = "1sxz8872x3rdlrhmbn83r1vniq4j51jnk0ka3447fq68il4myf1w"; + sha256 = "sha256-RfSMzrGVtdXbr/mjSrHoN447e3vMQfJbesQMvLOARBs="; }; patchPhase = '' diff --git a/nixpkgs/pkgs/development/compilers/terra/default.nix b/nixpkgs/pkgs/development/compilers/terra/default.nix index bd50ea9caaaf..ac1851a683bf 100644 --- a/nixpkgs/pkgs/development/compilers/terra/default.nix +++ b/nixpkgs/pkgs/development/compilers/terra/default.nix @@ -1,27 +1,53 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub -, llvmPackages, ncurses, lua -}: +{ lib, stdenv, fetchFromGitHub, llvmPackages, ncurses, cmake, libxml2 +, symlinkJoin, breakpointHook, cudaPackages, enableCUDA ? false }: let - luajitArchive = "LuaJIT-2.0.5.tar.gz"; - luajitSrc = fetchurl { - url = "http://luajit.org/download/${luajitArchive}"; - sha256 = "0yg9q4q6v028bgh85317ykc9whgxgysp76qzaqgq55y6jy11yjw7"; + luajitRev = "9143e86498436892cb4316550be4d45b68a61224"; + luajitBase = "LuaJIT-${luajitRev}"; + luajitArchive = "${luajitBase}.tar.gz"; + luajitSrc = fetchFromGitHub { + owner = "LuaJIT"; + repo = "LuaJIT"; + rev = luajitRev; + sha256 = "1zw1yr0375d6jr5x20zvkvk76hkaqamjynbswpl604w6r6id070b"; }; -in -stdenv.mkDerivation rec { + + llvmMerged = symlinkJoin { + name = "llvmClangMerged"; + paths = with llvmPackages; [ + llvm.out + llvm.dev + llvm.lib + clang-unwrapped.out + clang-unwrapped.dev + clang-unwrapped.lib + ]; + }; + + cuda = cudaPackages.cudatoolkit_11; + + clangVersion = llvmPackages.clang-unwrapped.version; + +in stdenv.mkDerivation rec { pname = "terra"; - version = "1.0.0pre1175_${builtins.substring 0 7 src.rev}"; + version = "1.0.0-beta3_${builtins.substring 0 7 src.rev}"; src = fetchFromGitHub { - owner = "zdevito"; - repo = "terra"; - rev = "ef6a75ffee15a30f3c74f4e6943851cfbc0fec3d"; - sha256 = "0aky17vbv3d9zng34hp17p9zb00dbzwhvzsdjzrrqvk9lmyvix0s"; + owner = "terralang"; + repo = "terra"; + rev = "99ff93f8c60c89bbe2dc7c63eab9bfe2f4c4833e"; + sha256 = "0ww54xjvv6p8jwsh6hml3v527zgnv2gj58gpb818bbg4k1jwa5fl"; }; - nativeBuildInputs = [ lua ]; - buildInputs = with llvmPackages; [ llvm clang-unwrapped ncurses ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ llvmMerged ncurses libxml2 ] ++ lib.optional enableCUDA cuda; + + cmakeFlags = [ + "-DHAS_TERRA_VERSION=0" + "-DTERRA_VERSION=${version}" + "-DTERRA_LUA=luajit" + "-DCLANG_RESOURCE_DIR=${llvmMerged}/lib/clang/${clangVersion}" + ] ++ lib.optional enableCUDA "-DTERRA_ENABLE_CUDA=ON"; doCheck = true; enableParallelBuilding = true; @@ -29,40 +55,36 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "static" ]; patches = [ ./nix-cflags.patch ]; + postPatch = '' - substituteInPlace Makefile \ - --replace '-lcurses' '-lncurses' + sed -i '/file(DOWNLOAD "''${LUAJIT_URL}" "''${LUAJIT_TAR}")/d' \ + cmake/Modules/GetLuaJIT.cmake substituteInPlace src/terralib.lua \ --subst-var-by NIX_LIBC_INCLUDE ${lib.getDev stdenv.cc.libc}/include ''; - preBuild = '' - cat >Makefile.inc<<EOF - CLANG = ${lib.getBin llvmPackages.clang-unwrapped}/bin/clang - LLVM_CONFIG = ${lib.getBin llvmPackages.llvm}/bin/llvm-config - EOF - + preConfigure = '' mkdir -p build - cp ${luajitSrc} build/${luajitArchive} + ln -s ${luajitSrc} build/${luajitBase} + tar --mode="a+rwX" -chzf build/${luajitArchive} -C build ${luajitBase} + rm build/${luajitBase} ''; - checkPhase = "(cd tests && ../terra run)"; - installPhase = '' - install -Dm755 -t $bin/bin release/bin/terra - install -Dm755 -t $out/lib release/lib/terra${stdenv.hostPlatform.extensions.sharedLibrary} - install -Dm644 -t $static/lib release/lib/libterra.a + install -Dm755 -t $bin/bin bin/terra + install -Dm755 -t $out/lib lib/terra${stdenv.hostPlatform.extensions.sharedLibrary} + install -Dm644 -t $static/lib lib/libterra_s.a mkdir -pv $dev/include - cp -rv release/include/terra $dev/include + cp -rv include/terra $dev/include ''; meta = with lib; { description = "A low-level counterpart to Lua"; - homepage = "http://terralang.org/"; - platforms = platforms.x86_64; - maintainers = with maintainers; [ jb55 thoughtpolice ]; - license = licenses.mit; + homepage = "http://terralang.org/"; + platforms = platforms.x86_64; + maintainers = with maintainers; [ jb55 seylerius thoughtpolice ]; + license = licenses.mit; }; } diff --git a/nixpkgs/pkgs/development/compilers/terra/nix-cflags.patch b/nixpkgs/pkgs/development/compilers/terra/nix-cflags.patch index 339ae23cef65..90ba7e63f1d0 100644 --- a/nixpkgs/pkgs/development/compilers/terra/nix-cflags.patch +++ b/nixpkgs/pkgs/development/compilers/terra/nix-cflags.patch @@ -1,12 +1,11 @@ diff --git a/src/terralib.lua b/src/terralib.lua -index 351238d..e638c90 100644 +index 532ed18..2c265dc 100644 --- a/src/terralib.lua +++ b/src/terralib.lua -@@ -3395,6 +3395,17 @@ function terra.includecstring(code,cargs,target) +@@ -3426,6 +3426,16 @@ function terra.includecstring(code,cargs,target) args:insert("-internal-isystem") args:insert(path) end -+ + -- NOTE(aseipp): include relevant Nix header files + args:insert("-isystem") + args:insert("@NIX_LIBC_INCLUDE@") @@ -17,6 +16,6 @@ index 351238d..e638c90 100644 + args:insert(w) + end + end - - if cargs then - args:insertall(cargs) + -- Obey the SDKROOT variable on macOS to match Clang behavior. + local sdkroot = os.getenv("SDKROOT") + if sdkroot then diff --git a/nixpkgs/pkgs/development/compilers/unison/default.nix b/nixpkgs/pkgs/development/compilers/unison/default.nix index 433e07c68b07..d409ec8a276f 100644 --- a/nixpkgs/pkgs/development/compilers/unison/default.nix +++ b/nixpkgs/pkgs/development/compilers/unison/default.nix @@ -6,18 +6,18 @@ stdenv.mkDerivation rec { pname = "unison-code-manager"; - milestone_id = "M1m"; + milestone_id = "M2g"; version = "1.0.${milestone_id}-alpha"; src = if (stdenv.isDarwin) then fetchurl { - url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-osx.tar.gz"; - sha256 = "06pxvp753j8pr0pn02l7cswmmas5pk1vlkw83yd04h3f2rx1s61v"; + url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/ucm-macos.tar.gz"; + sha256 = "1ib9pdzrfpzbi35fpwm9ym621nlydplvzgbhnyd86dbwbv3i9sga"; } else fetchurl { - url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-linux64.tar.gz"; - sha256 = "1qspvfq805d34kz031pf9sqw8kzz7h637kc8lnbjlgvwixxkxc7c"; + url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/ucm-linux.tar.gz"; + sha256 = "004jx7q657mkcrvilk4lfkp8xcpl2bjflpn9m2p7jzlrlk97v9nj"; }; # The tarball is just the prebuilt binary, in the archive root. diff --git a/nixpkgs/pkgs/development/compilers/vala/default.nix b/nixpkgs/pkgs/development/compilers/vala/default.nix index 0c002227914a..0baf0505fa84 100644 --- a/nixpkgs/pkgs/development/compilers/vala/default.nix +++ b/nixpkgs/pkgs/development/compilers/vala/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, fetchpatch, pkg-config, flex, bison, libxslt, autoconf, autoreconfHook -, graphviz, glib, libiconv, libintl, libtool, expat, substituteAll +, gnome, graphviz, glib, libiconv, libintl, libtool, expat, substituteAll }: let @@ -88,13 +88,12 @@ let doCheck = false; # fails, requires dbus daemon - # Wait for PR #59372 - # passthru = { - # updateScript = gnome.updateScript { - # attrPath = "${pname}_${lib.versions.major version}_${lib.versions.minor version}"; - # packageName = pname; - # }; - # }; + passthru = { + updateScript = gnome.updateScript { + attrPath = "${pname}_${lib.versions.major version}_${lib.versions.minor version}"; + packageName = pname; + }; + }; meta = with lib; { description = "Compiler for GObject type system"; diff --git a/nixpkgs/pkgs/development/compilers/zig/default.nix b/nixpkgs/pkgs/development/compilers/zig/default.nix index a31a9e6ca43f..60ca574f1ccb 100644 --- a/nixpkgs/pkgs/development/compilers/zig/default.nix +++ b/nixpkgs/pkgs/development/compilers/zig/default.nix @@ -37,6 +37,13 @@ stdenv.mkDerivation rec { export HOME=$TMPDIR; ''; + doCheck = true; + checkPhase = '' + runHook preCheck + ./zig test --cache-dir "$TMPDIR" -I $src/test $src/test/behavior.zig + runHook postCheck + ''; + meta = with lib; { homepage = "https://ziglang.org/"; description = @@ -48,4 +55,4 @@ stdenv.mkDerivation rec { broken = stdenv.isDarwin; }; } -# TODO: checkPhase + diff --git a/nixpkgs/pkgs/development/coq-modules/VST/default.nix b/nixpkgs/pkgs/development/coq-modules/VST/default.nix index ad5caec94921..5ee1df774185 100644 --- a/nixpkgs/pkgs/development/coq-modules/VST/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/VST/default.nix @@ -8,11 +8,9 @@ with lib; mkCoqDerivation { repo = "VST"; inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = range "8.12" "8.13"; out = "2.7.1"; } - { case = "8.11"; out = "2.6"; } + { case = range "8.12" "8.13"; out = "2.8"; } ] null; - release."2.7.1".sha256 = "1674j7bkvihiv19vizm99dp6gj3lryb00zx6a87jz214f3ydcvnj"; - release."2.6".sha256 = "00bf9hl4pvmsqa08lzjs1mrxyfgfxq4k6778pnldmc8ichm90jgk"; + release."2.8".sha256 = "sha256-cyK88uzorRfjapNQ6XgQEmlbWnDsiyLve5po1VG52q0="; releaseRev = v: "v${v}"; propagatedBuildInputs = [ compcert ]; diff --git a/nixpkgs/pkgs/development/coq-modules/compcert/default.nix b/nixpkgs/pkgs/development/coq-modules/compcert/default.nix new file mode 100644 index 000000000000..3b94a8087d3f --- /dev/null +++ b/nixpkgs/pkgs/development/coq-modules/compcert/default.nix @@ -0,0 +1,110 @@ +{ lib, fetchzip, mkCoqDerivation, coq, flocq, compcert +, ocamlPackages, fetchpatch, makeWrapper, coq2html +, stdenv, tools ? stdenv.cc +, version ? null +}: + +with lib; + +let compcert = mkCoqDerivation rec { + + pname = "compcert"; + owner = "AbsInt"; + + inherit version; + releaseRev = v: "v${v}"; + + defaultVersion = with versions; switch coq.version [ + { case = range "8.8" "8.11"; out = "3.8"; } + { case = range "8.12" "8.13"; out = "3.9"; } + ] null; + + release = { + "3.8".sha256 = "1gzlyxvw64ca12qql3wnq3bidcx9ygsklv9grjma3ib4hvg7vnr7"; + "3.9".sha256 = "1srcz2dqrvmbvv5cl66r34zqkm0hsbryk7gd3i9xx4slahc9zvdb"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = with ocamlPackages; [ ocaml findlib menhir menhirLib ] ++ [ coq coq2html ]; + propagatedBuildInputs = [ flocq ]; + + enableParallelBuilding = true; + + postPatch = '' + substituteInPlace ./configure \ + --replace \$\{toolprefix\}ar 'ar' \ + --replace '{toolprefix}gcc' '{toolprefix}cc' + ''; + + configurePhase = '' + ./configure -clightgen \ + -prefix $out \ + -coqdevdir $lib/lib/coq/${coq.coq-version}/user-contrib/compcert/ \ + -toolprefix ${tools}/bin/ \ + -use-external-Flocq \ + ${if stdenv.isDarwin then "x86_64-macosx" else "x86_64-linux"} + ''; + + installTargets = "documentation install"; + postInstall = '' + # move man into place + mkdir -p $man/share + mv $out/share/man/ $man/share/ + + # move docs into place + mkdir -p $doc/share/doc/compcert + mv doc/html $doc/share/doc/compcert/ + + # wrap ccomp to undefine _FORTIFY_SOURCE; ccomp invokes cc1 which sets + # _FORTIFY_SOURCE=2 by default, but undefines __GNUC__ (as it should), + # which causes a warning in libc. this suppresses it. + for x in ccomp clightgen; do + wrapProgram $out/bin/$x --add-flags "-U_FORTIFY_SOURCE" + done + ''; + + outputs = [ "out" "lib" "doc" "man" ]; + + meta = with lib; { + description = "Formally verified C compiler"; + homepage = "https://compcert.org"; + license = licenses.inria-compcert; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + maintainers = with maintainers; [ thoughtpolice jwiegley vbgl ]; + }; +}; in +compcert.overrideAttrs (o: + { + patches = with versions; switch [ coq.version o.version ] [ + { cases = [ (range "8.12.2" "8.13.2") "3.8" ]; + out = [ + # Support for Coq 8.12.2 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/06956421b4307054af221c118c5f59593c0e67b9.patch"; + sha256 = "1f90q6j3xfvnf3z830bkd4d8526issvmdlrjlc95bfsqs78i1yrl"; + }) + # Support for Coq 8.13.0 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/0895388e7ebf9c9f3176d225107e21968919fb97.patch"; + sha256 = "0qhkzgb2xl5kxys81pldp3mr39gd30lvr2l2wmplij319vp3xavd"; + }) + # Support for Coq 8.13.1 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/6bf310dd678285dc193798e89fc2c441d8430892.patch"; + sha256 = "026ahhvpj5pksy90f8pnxgmhgwfqk4kwyvcf8x3dsanvz98d4pj5"; + }) + # Drop support for Coq < 8.9 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/7563a5df926a4c6fb1489a7a4c847641c8a35095.patch"; + sha256 = "05vkslzy399r3dm6dmjs722rrajnyfa30xsyy3djl52isvn4gyfb"; + }) + # Support for Coq 8.13.2 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/48bc183167c4ce01a5c9ea86e49d60530adf7290.patch"; + sha256 = "0j62lppfk26d1brdp3qwll2wi4gvpx1k70qivpvby5f7dpkrkax1"; + }) + ]; + } + ] []; + } +) diff --git a/nixpkgs/pkgs/development/gnuradio-modules/ais/default.nix b/nixpkgs/pkgs/development/gnuradio-modules/ais/default.nix index 5ff4ffd75653..638210f8412f 100644 --- a/nixpkgs/pkgs/development/gnuradio-modules/ais/default.nix +++ b/nixpkgs/pkgs/development/gnuradio-modules/ais/default.nix @@ -8,18 +8,22 @@ , cppunit , log4cpp , osmosdr +, gmp +, mpir +, fftwFloat +, icu }: mkDerivation rec { pname = "gr-ais"; - version = "2015-12-20"; + version = "2020-08-13"; src = fetchFromGitHub { owner = "bistromath"; repo = "gr-ais"; - rev = "cdc1f52745853f9c739c718251830eb69704b26e"; - sha256 = "1vl3kk8xr2mh5lf31zdld7yzmwywqffffah8iblxdzblgsdwxfl6"; + rev = "2162103226f3dae43c8c2ab23b79483b84346665"; + sha256 = "1vackka34722d8pcspfwj0j6gc9ic7dqq64sgkrpjm94sh3bmb0b"; }; - disabledForGRafter = "3.8"; + disabledForGRafter = "3.9"; nativeBuildInputs = [ cmake @@ -32,6 +36,10 @@ mkDerivation rec { osmosdr boost log4cpp + gmp + mpir + fftwFloat + icu ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/guile-modules/guile-gcrypt/default.nix b/nixpkgs/pkgs/development/guile-modules/guile-gcrypt/default.nix new file mode 100644 index 000000000000..73152fb9d2c3 --- /dev/null +++ b/nixpkgs/pkgs/development/guile-modules/guile-gcrypt/default.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, fetchFromGitea +, guile +, libgcrypt +, autoreconfHook +, pkg-config +, texinfo +}: + +stdenv.mkDerivation rec { + pname = "guile-gcrypt"; + version = "0.3.0"; + + src = fetchFromGitea { + domain = "notabug.org"; + owner = "cwebber"; + repo = "guile-gcrypt"; + rev = "v${version}"; + sha256 = "sha256-lAaiKBOdTFWEWsmwKgx0C67ACvtnEKUxti66dslzSVQ="; + }; + + postConfigure = '' + sed -i '/moddir\s*=/s%=.*%=''${out}/share/guile/site%' Makefile; + sed -i '/godir\s*=/s%=.*%=''${out}/share/guile/ccache%' Makefile; + ''; + + nativeBuildInputs = [ + autoreconfHook pkg-config texinfo + ]; + buildInputs = [ + guile + ]; + propagatedBuildInputs = [ + libgcrypt + ]; + + meta = with lib; { + description = "Bindings to Libgcrypt for GNU Guile"; + homepage = "https://notabug.org/cwebber/guile-gcrypt"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ ethancedwards8 ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/guile-modules/guile-git/default.nix b/nixpkgs/pkgs/development/guile-modules/guile-git/default.nix new file mode 100644 index 000000000000..254afae0cc4f --- /dev/null +++ b/nixpkgs/pkgs/development/guile-modules/guile-git/default.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, fetchFromGitLab +, guile +, libgit2 +, scheme-bytestructures +, autoreconfHook +, pkg-config +, texinfo +}: + +stdenv.mkDerivation rec { + pname = "guile-git"; + version = "0.5.1"; + + src = fetchFromGitLab { + owner = "guile-git"; + repo = pname; + rev = "v${version}"; + sha256 = "7Cnuyk9xAPTvz9R44O3lvKDrT6tUQui7YzxIoqhRfPQ="; + }; + + postConfigure = '' + sed -i '/moddir\s*=/s%=.*%=''${out}/share/guile/site%' Makefile; + sed -i '/godir\s*=/s%=.*%=''${out}/share/guile/ccache%' Makefile; + ''; + + nativeBuildInputs = [ + autoreconfHook pkg-config texinfo + ]; + buildInputs = [ + guile + ]; + propagatedBuildInputs = [ + libgit2 scheme-bytestructures + ]; + + enableParallelBuilding = true; + + meta = with lib; { + description = "Bindings to Libgit2 for GNU Guile"; + homepage = "https://gitlab.com/guile-git/guile-git"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ ethancedwards8 ]; + platforms = platforms.linux; + }; +} + diff --git a/nixpkgs/pkgs/development/guile-modules/guile-json/default.nix b/nixpkgs/pkgs/development/guile-modules/guile-json/default.nix new file mode 100644 index 000000000000..5433bbb1aa64 --- /dev/null +++ b/nixpkgs/pkgs/development/guile-modules/guile-json/default.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchurl +, guile +, texinfo +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "guile-json"; + version = "4.5.2"; + + src = fetchurl { + url = "mirror://savannah/guile-json/${pname}-${version}.tar.gz"; + sha256 = "GrBG7DaxxEwEGsJ1Vo2Bh4TXH6uaXZX5Eoz+iiUFGTM="; + }; + + postConfigure = '' + sed -i '/moddir\s*=/s%=.*%=''${out}/share/guile/site%' Makefile; + sed -i '/objdir\s*=/s%=.*%=''${out}/share/guile/ccache%' Makefile; + sed -i '/moddir\s*=/s%=.*%=''${out}/share/guile/site/json%' json/Makefile; + sed -i '/objdir\s*=/s%=.*%=''${out}/share/guile/ccache/json%' json/Makefile; + ''; + + nativeBuildInputs = [ + pkg-config texinfo + ]; + buildInputs = [ + guile + ]; + + meta = with lib; { + description = "JSON Bindings for GNU Guile"; + homepage = "https://savannah.nongnu.org/projects/guile-json"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ ethancedwards8 ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/haskell-modules/HACKING.md b/nixpkgs/pkgs/development/haskell-modules/HACKING.md index 7c46e1560fd3..1161bd828f2a 100644 --- a/nixpkgs/pkgs/development/haskell-modules/HACKING.md +++ b/nixpkgs/pkgs/development/haskell-modules/HACKING.md @@ -1,5 +1,5 @@ -## Maintainer Workflow +# Maintainer Workflow The goal of the [@NixOS/haskell](https://github.com/orgs/NixOS/teams/haskell) team is to keep the Haskell packages in Nixpkgs up-to-date, while making sure @@ -20,7 +20,7 @@ The workflow generally proceeds in three main steps: Each of these steps is described in a separate section. -### Initial `haskell-updates` PR +## Initial `haskell-updates` PR In this section we create the PR for merging `haskell-updates` into `master`. @@ -44,11 +44,13 @@ In this section we create the PR for merging `haskell-updates` into `master`. $ ./maintainers/scripts/haskell/regenerate-hackage-packages.sh --do-commit ``` -1. Push these commits to the Nixpkgs repository. +1. Push these commits to the `haskell-updates` branch of the NixOS/nixpkgs repository. 1. Open a PR on Nixpkgs merging `haskell-updates` into `master`. -Use the following message body: + + +Use the title `haskellPackages: update stackage and hackage` and the following message body: ```markdown ### This Merge @@ -68,8 +70,8 @@ The short version is this: * We regularly update the Stackage and Hackage pins on `haskell-updates` (normally at the beginning of a merge window). * The community fixes builds of Haskell packages on that branch. * We aim at at least one merge of `haskell-updates` into `master` every two weeks. -* We only do the merge if the `mergeable` job is succeeding on hydra. -* If a maintained package is still broken at the time of merge, we will only merge if the maintainer has been pinged 7 days in advance. (If you care about a Haskell package, become a maintainer!) +* We only do the merge if the [`mergeable`](https://hydra.nixos.org/job/nixpkgs/haskell-updates/mergeable) job is succeeding on hydra. +* If a [`maintained`](https://hydra.nixos.org/job/nixpkgs/haskell-updates/maintained) package is still broken at the time of merge, we will only merge if the maintainer has been pinged 7 days in advance. (If you care about a Haskell package, become a maintainer!) --- @@ -78,14 +80,14 @@ This is the follow-up to #TODO. Make sure to replace all TODO with the actual values. -### Notify Maintainers and Fix Broken Packages +## Notify Maintainers and Fix Broken Packages After you've done the previous steps, Hydra will start building the new and updated Haskell packages. You can see the progress Hydra is making at https://hydra.nixos.org/jobset/nixpkgs/haskell-updates. This Hydra jobset is defined in the file [release-haskell.nix](../../top-level/release-haskell.nix). -#### Notify Maintainers +### Notify Maintainers When Hydra finishes building all the updated packages for the `haskell-updates` jobset, you should generate a build report to notify maintainers of their @@ -112,10 +114,12 @@ Maintainers should be given at least 7 days to fix up their packages when they break. If maintainers don't fix up their packages with 7 days, then they may be marked broken before merging `haskell-updates` into `master`. -#### Fix Broken Packages +### Fix Broken Packages After getting the build report, you can see which packages and Hydra jobs are -failing to build. The most important jobs are the `maintained` and `mergeable` +failing to build. The most important jobs are the +[`maintained`](https://hydra.nixos.org/job/nixpkgs/haskell-updates/maintained) and +[`mergeable`](https://hydra.nixos.org/job/nixpkgs/haskell-updates/mergeable) jobs. These are both defined in [`release-haskell.nix`](../../top-level/release-haskell.nix). @@ -131,7 +135,7 @@ Steps to fix Haskell packages that are failing to build is out of scope for this document, but it usually requires fixing up dependencies that are now out-of-bounds. -#### Mark Broken Packages +### Mark Broken Packages Packages that do not get fixed can be marked broken with the following commands. First check which packages are broken: @@ -176,7 +180,7 @@ following will happen: - All updated files will be committed. -#### Merge `master` into `haskell-updates` +### Merge `master` into `haskell-updates` You should occasionally merge the `master` branch into the `haskell-updates` branch. @@ -194,7 +198,7 @@ This is especially important after `staging-next` is merged into `master`, since there is a high chance that this will cause all the Haskell packages to rebuild. -### Merge `haskell-updates` into `master` +## Merge `haskell-updates` into `master` Now it is time to merge the `haskell-updates` PR you opened above. @@ -213,15 +217,35 @@ Before doing this, make sure of the following: for Hydra to evaluate the new `haskell-updates` jobset. Make sure you only merge `haskell-updates` into `master` when there are no evaluation errors. +- Due to Hydra having only a small number of Darwin build machines, the + `haskell-updates` jobset on Hydra often has many queued Darwin jobs. + In order to not have these queued Darwin jobs prevent the `haskell-updates` + branch from being merged to `master` in a timely manner, we have special + rules for Darwin jobs. + + - It is alright to merge the `haskell-updates` branch to `master` if + there are remaining queued Darwin jobs on Hydra. + + - We would like to keep GHC and the `mergeable` job building on Darwin. + Do not merge the `haskell-updates` branch to `master` if GHC is failing + to build, or the `mergeable` job has failing Darwin constituent jobs. + + If GHC and the `mergeable` job are not failing, but merely queued, + it is alright to merge the `haskell-updates` branch to `master`. + + - We do not need to keep the `maintained` job building on Darwin. + If `maintained` packages are failing on Darwin, it is helpful to + mark them as broken on that platform. + When you've double-checked these points, go ahead and merge the `haskell-updates` PR. After merging, **make sure not to delete the `haskell-updates` branch**, since it causes all currently open Haskell-related pull-requests to be automatically closed on GitHub. -### Additional Info +## Additional Info Here are some additional tips that didn't fit in above. -- Hydra tries to evalute the `haskell-updates` branch (in the +- Hydra tries to evaluate the `haskell-updates` branch (in the [`nixpkgs:haskell-updates`](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates) jobset) every 4 hours. It is possible to force a new Hydra evaluation without waiting 4 hours by the following steps: @@ -263,8 +287,3 @@ Here are some additional tips that didn't fit in above. - The Haskell team members generally hang out in the Matrix room [#haskell:nixos.org](https://matrix.to/#/#haskell:nixos.org). - -## Contributor Workflow - -(TODO: this section is to describe the type of workflow for non-committers to -contribute to `haskell-updates`) diff --git a/nixpkgs/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/nixpkgs/pkgs/development/haskell-modules/cabal2nix-unstable.nix index 00bd9061f01a..8b058b2dc057 100644 --- a/nixpkgs/pkgs/development/haskell-modules/cabal2nix-unstable.nix +++ b/nixpkgs/pkgs/development/haskell-modules/cabal2nix-unstable.nix @@ -8,10 +8,10 @@ }: mkDerivation { pname = "cabal2nix"; - version = "unstable-2021-05-28"; + version = "unstable-2021-06-12"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/5fb325e094af91328e02cc2ecfd211feaeb135a7.tar.gz"; - sha256 = "1zbd336s99rgk24yjqlp012d0f66s5nf190sjmsl7mfhqx9j2y4l"; + url = "https://github.com/NixOS/cabal2nix/archive/01feffa0aeee835504e0c0ccf4bca2e33a698252.tar.gz"; + sha256 = "0clckh0qqvjcb8szy1d6qqlxj6sqp28jc2p3vhzhkf95cv491si9"; }; isLibrary = true; isExecutable = true; diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix index cc39fb4fd10f..0d9d65af01c1 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -698,6 +698,10 @@ self: super: { uuid-types = doJailbreak super.uuid-types; uuid = doJailbreak super.uuid; + # Bypass version check for random < 1.2 (1.2 works fine). + # https://github.com/yeyan/xmonad-wallpaper/issues/2 + xmonad-wallpaper = doJailbreak super.xmonad-wallpaper; + # The tests spuriously fail libmpd = dontCheck super.libmpd; @@ -1925,16 +1929,10 @@ EOT # https://github.com/haskell-hvr/missingh/issues/56 MissingH = doJailbreak super.MissingH; - # Too strict bound on containers - # https://github.com/batterseapower/parallel-io/issues/14#issuecomment-853441933 - parallel-io = doJailbreak super.parallel-io; - # Disable flaky tests # https://github.com/DavidEichmann/alpaca-netcode/issues/2 alpaca-netcode = overrideCabal super.alpaca-netcode { - # use testTarget to also pass some flags to the test suite. - # TODO: We should add proper support for this to the builder. - testTarget = "test --test-options='-p \"!/[NOCI]/\"'"; + testFlags = [ "--pattern" "!/[NOCI]/" ]; }; # Tests require to run a binary which isn't built @@ -1945,12 +1943,30 @@ EOT # this, run tests with only a single job. # https://github.com/vmchale/libarchive/issues/20 libarchive = overrideCabal super.libarchive { - # TODO: We should add proper support for this to the builder. - testTarget = "libarchive-test --test-options='-j1'"; + testFlags = [ "-j1" ]; }; # unrestrict bounds for hashable and semigroups # https://github.com/HeinrichApfelmus/reactive-banana/issues/215 reactive-banana = doJailbreak super.reactive-banana; + hackage-db_2_1_0 = doDistribute super.hackage-db_2_1_0; + + # Too strict bounds on QuickCheck + # https://github.com/muesli4/table-layout/issues/16 + table-layout = doJailbreak super.table-layout; + + # Bounds on profunctors are too strict + # https://github.com/ConferOpenSource/composite/issues/50 + composite-base = doJailbreak super.composite-base; + composite-aeson = doJailbreak super.composite-aeson; + + # Too strict bounds on profunctors + # https://github.com/google/proto-lens/issues/413 + proto-lens = doJailbreak super.proto-lens; + + # Too strict bounds on profunctors + # https://github.com/jcranch/tophat/issues/1 + tophat = doJailbreak super.tophat; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-darwin.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-darwin.nix index 7e02a6653c77..4a62ab5867d1 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-darwin.nix @@ -170,5 +170,6 @@ self: super: { # 2021-05-25: Tests fail and I have no way to debug them. hls-class-plugin = dontCheck super.hls-class-plugin; + hls-brittany-plugin = dontCheck super.hls-brittany-plugin; } diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 36fe13151f3c..454b7338d66d 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -87,4 +87,8 @@ self: super: { # Break out of "Cabal < 3.2" constraint. stylish-haskell = doJailbreak super.stylish-haskell; + # hackage-db 2.1.1 is incompatible with Cabal < 3.4 + # See https://github.com/NixOS/cabal2nix/issues/501 + hackage-db = self.hackage-db_2_1_0; + } diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index 99b53b9f14f3..42fa603d3313 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -106,4 +106,8 @@ self: super: { # https://github.com/haskellari/time-compat/issues/23 time-compat = dontCheck super.time-compat; + # hackage-db 2.1.1 is incompatible with Cabal < 3.4 + # See https://github.com/NixOS/cabal2nix/issues/501 + hackage-db = super.hackage-db_2_1_0; + } diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index aab26897cca4..7908066ebb59 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -135,4 +135,8 @@ self: super: { # vector 0.12.2 indroduced doctest checks that don‘t work on older compilers vector = dontCheck super.vector; + + # hackage-db 2.1.1 is incompatible with Cabal < 3.4 + # See https://github.com/NixOS/cabal2nix/issues/501 + hackage-db = super.hackage-db_2_1_0; } diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index 16c85d1fef76..cfef0f14ea81 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -95,10 +95,21 @@ self: super: { # The test suite seems pretty broken. base64-bytestring = dontCheck super.base64-bytestring; - # 5.6 introduced support for GHC 9.0.x, but hasn't landed in stackage yet - profunctors = super.profunctors_5_6_2; - # 5 introduced support for GHC 9.0.x, but hasn't landed in stackage yet lens = super.lens_5_0_1; + # 0.16.0 introduced support for GHC 9.0.x, stackage has 0.15.0 + memory = super.memory_0_16_0; + + # 0.29 introduced support for GHC 9.0.x, stackage has 0.28 + cryptonite = super.cryptonite_0_29; + + # GHC 9.0.x doesn't like `import Spec (main)` in Main.hs + # https://github.com/snoyberg/mono-traversable/issues/192 + mono-traversable = dontCheck super.mono-traversable; + + # Disable tests pending resolution of + # https://github.com/Soostone/retry/issues/71 + retry = dontCheck super.retry; + } diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index bc9881ee1fca..0f895e1f782e 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -118,6 +118,7 @@ broken-packages: - alto - alure - amazon-emailer + - amazonka-s3-streaming - amazon-products - amby - AMI @@ -370,6 +371,7 @@ broken-packages: - biohazard - bio-sequence - birds-of-paradise + - biscuit-haskell - bisect-binary - bishbosh - bitcoin-hs @@ -833,6 +835,7 @@ broken-packages: - criu-rpc-types - crjdt-haskell - crocodile + - cronus - cruncher-types - crunghc - crypto-cipher-benchmarks @@ -998,6 +1001,7 @@ broken-packages: - dhall-fly - dhall-text - dhall-to-cabal + - dhcp-lease-parser - dhrun - dia-base - diagrams-boolean @@ -1215,7 +1219,6 @@ broken-packages: - erlang - erlang-ffi - eros - - errata - error-context - error-continuations - error-list @@ -2202,6 +2205,7 @@ broken-packages: - hs-carbon-examples - hscd - hs-cdb + - hscdio - hsclock - hScraper - hscuid @@ -2362,6 +2366,7 @@ broken-packages: - hweblib - hwhile - hw-json-simd + - hw-mquery - hworker - hw-simd - hwsl2 @@ -2480,6 +2485,7 @@ broken-packages: - Irc - irc-dcc - irc-fun-types + - iri - iridium - iron-mq - irt @@ -2548,6 +2554,7 @@ broken-packages: - json-schema - jsonschema-gen - jsonsql + - json-syntax - json-tools - json-tracer - jsontsv @@ -2604,6 +2611,7 @@ broken-packages: - ktx - ktx-codec - kuifje + - kure - kure-your-boilerplate - KyotoCabinet - labeled-graph @@ -2760,6 +2768,7 @@ broken-packages: - list-remote-forwards - ListT - list-t-http-client + - list-tries - list-t-text - list-zip-def - list-zipper @@ -2982,6 +2991,7 @@ broken-packages: - mmtf - mmtl - Mobile-Legends-Hack-Cheats + - mock-time - modelicaparser - modular-prelude - module-management @@ -3059,6 +3069,7 @@ broken-packages: - movie-monad - mpppc - mpris + - mptcp-pm - mpvguihs - mqtt - mqtt-hs @@ -3299,6 +3310,7 @@ broken-packages: - open-adt - OpenAFP - openai-hs + - openai-servant - openapi3-code-generator - openapi-petstore - openapi-typed @@ -3390,6 +3402,7 @@ broken-packages: - pandoc-utils - pang-a-lambda - pangraph + - pan-os-syslog - panpipe - pansite - pantry-tmp @@ -3428,6 +3441,7 @@ broken-packages: - parsers-megaparsec - parsimony - parsley + - parsley-core - parsnip - partage - partial-records @@ -3724,7 +3738,6 @@ broken-packages: - proxy-mapping - pseudo-trie - PTQ - - ptr-poker - publicsuffixlistcreate - publish - pubnub @@ -4012,9 +4025,6 @@ broken-packages: - SableCC2Hs - safe-buffer-monad - safe-coerce - - safe-coloured-text-gen - - safe-coloured-text-layout - - safe-coloured-text-terminfo - safecopy-migrate - safecopy-store - safe-freeze @@ -4209,6 +4219,7 @@ broken-packages: - shorten-strings - show-prettyprint - Shpadoinkle-backend-snabbdom + - Shpadoinkle-isreal - Shpadoinkle-streaming - shwifty - sifflet @@ -4282,6 +4293,7 @@ broken-packages: - slug - slugify - smallarray + - small-bytearray-builder - smallcheck-kind-generics - smallcheck-laws - smallcheck-lens @@ -4569,7 +4581,6 @@ broken-packages: - t3-server - table - tableaux - - table-layout - tables - Tables - tablestorage @@ -4612,6 +4623,7 @@ broken-packages: - teeth - telegram - telegram-api + - telegram-bot-simple - teleport - teleshell - tellbot @@ -4681,6 +4693,7 @@ broken-packages: - thank-you-stars - th-build - th-dict-discovery + - themoviedb - thentos-cookie-session - Theora - theoremquest @@ -4919,6 +4932,7 @@ broken-packages: - unordered-intmap - unpacked-either - unpacked-maybe + - unpacked-maybe-numeric - unpack-funcs - unroll-ghc-plugin - unsafely @@ -5119,7 +5133,6 @@ broken-packages: - whiskers - whois - why3 - - wide-word - WikimediaParser - windns - winerror @@ -5198,7 +5211,6 @@ broken-packages: - xmonad-dbus - xmonad-eval - xmonad-vanessa - - xmonad-wallpaper - xmonad-windownames - xor - Xorshift128Plus diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 6f3808103063..56bd4ac4ab8e 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -93,6 +93,9 @@ default-package-overrides: - futhark < 0.19.5 # 2021-06-05: remove once pandoc 2.14 is in stackage - pandoc-crossref < 0.3.11.0 + # 2021-06-14: hnix still needs old versions https://github.com/haskell-nix/hnix/issues/952 + - hnix-store-core < 0.5 + - hnix-store-remote < 0.5 extra-packages: - base16-bytestring < 1 # required for cabal-install etc. @@ -102,6 +105,7 @@ extra-packages: - dependent-map == 0.2.4.0 # required by Hasura 1.3.1, 2020-08-20 - dependent-sum == 0.4 # required by Hasura 1.3.1, 2020-08-20 - dhall == 1.29.0 # required for ats-pkg + - dhall == 1.38.1 # required for spago - Diff < 0.4 # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729 - ghc-tcplugins-extra ==0.3.2 # required for polysemy-plugin 0.2.5.0 - haddock == 2.23.* # required on GHC < 8.10.x @@ -122,6 +126,7 @@ extra-packages: - gi-gtk < 4.0 # 2021-05-07: For haskell-gi 0.25 without gtk4 - gi-gdkx11 == 3.0.11 # 2021-05-07: For haskell-gi 0.25 without gtk4 - ShellCheck == 0.7.1 # 2021-05-09: haskell-ci 0.12.1 pins this version + - hackage-db < 2.1.1 # 2021-06-10: Need older hackage-db as long as Cabal < 3.4, see https://github.com/NixOS/cabal2nix/issues/501 package-maintainers: abbradar: @@ -393,6 +398,7 @@ unsupported-platforms: mpi-hs-cereal: [ aarch64-linux, x86_64-darwin ] mpi-hs-store: [ aarch64-linux, x86_64-darwin ] mplayer-spot: [ aarch64-linux ] + mptcp-pm: [ x86_64-darwin ] netlink: [ x86_64-darwin ] oculus: [ x86_64-darwin ] pam: [ x86_64-darwin ] diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index bfe0b93b3e41..2ebd11bd006c 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage Nightly 2021-06-01 +# Stackage Nightly 2021-06-10 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -11,8 +11,8 @@ default-package-overrides: - ad ==4.4.1 - adjunctions ==4.4 - adler32 ==0.1.2.0 - - aern2-mp ==0.2.6.0 - - aern2-real ==0.2.6.0 + - aern2-mp ==0.2.7.0 + - aern2-real ==0.2.7.0 - aeson ==1.5.6.0 - aeson-attoparsec ==0.0.0 - aeson-better-errors ==0.9.1.0 @@ -34,7 +34,7 @@ default-package-overrides: - aeson-yak ==0.1.1.3 - aeson-yaml ==1.1.0.0 - Agda ==2.6.1.3 - - agda2lagda ==0.2020.11.1 + - agda2lagda ==0.2021.6.1 - al ==0.1.4.2 - alarmclock ==0.7.0.5 - alerts ==0.1.2.0 @@ -159,7 +159,7 @@ default-package-overrides: - approximate-equality ==1.1.0.2 - app-settings ==0.2.0.12 - arbor-lru-cache ==0.1.1.1 - - arithmoi ==0.11.0.1 + - arithmoi ==0.12.0.0 - array-memoize ==0.6.0 - arrow-extras ==0.1.0.1 - arrows ==0.4.4.2 @@ -202,7 +202,7 @@ default-package-overrides: - auto-update ==0.1.6 - avers ==0.0.17.1 - avro ==0.5.2.0 - - aws-cloudfront-signed-cookies ==0.2.0.6 + - aws-cloudfront-signed-cookies ==0.2.0.8 - aws-xray-client ==0.1.0.0 - aws-xray-client-wai ==0.1.0.0 - backprop ==0.2.6.4 @@ -336,7 +336,7 @@ default-package-overrides: - cabal-file ==0.1.1 - cabal-flatpak ==0.1.0.2 - cabal-plan ==0.7.2.0 - - cabal-rpm ==2.0.8 + - cabal-rpm ==2.0.9 - cache ==0.1.3.0 - cacophony ==0.10.1 - calendar-recycling ==0.0.0.1 @@ -360,7 +360,7 @@ default-package-overrides: - cayley-client ==0.4.15 - cborg ==0.2.5.0 - cborg-json ==0.2.2.0 - - cdar-mBound ==0.1.0.2 + - cdar-mBound ==0.1.0.4 - c-enum ==0.1.0.1 - cereal ==0.5.8.1 - cereal-conduit ==0.8.0 @@ -418,7 +418,7 @@ default-package-overrides: - collect-errors ==0.1.5.0 - co-log-concurrent ==0.5.0.0 - co-log-core ==0.2.1.1 - - Color ==0.3.1 + - Color ==0.3.2 - colorful-monoids ==0.2.1.3 - colorize-haskell ==1.0.1 - colour ==2.3.5 @@ -437,16 +437,6 @@ default-package-overrides: - compiler-warnings ==0.1.0 - composable-associations ==0.1.0.0 - composable-associations-aeson ==0.1.0.1 - - composite-aeson ==0.7.5.0 - - composite-aeson-path ==0.7.5.0 - - composite-aeson-refined ==0.7.5.0 - - composite-aeson-throw ==0.1.0.0 - - composite-base ==0.7.5.0 - - composite-binary ==0.7.5.0 - - composite-ekg ==0.7.5.0 - - composite-hashable ==0.7.5.0 - - composite-tuple ==0.1.2.0 - - composite-xstep ==0.1.0.0 - composition ==1.0.2.2 - composition-extra ==2.0.0 - concise ==0.1.0.1 @@ -599,14 +589,14 @@ default-package-overrides: - deque ==0.4.3 - deriveJsonNoPrefix ==0.1.0.1 - derive-topdown ==0.0.2.2 - - deriving-aeson ==0.2.6.1 + - deriving-aeson ==0.2.7 - deriving-compat ==0.5.10 - derulo ==1.0.10 - - dhall ==1.38.1 - - dhall-bash ==1.0.36 - - dhall-json ==1.7.6 - - dhall-lsp-server ==1.0.14 - - dhall-yaml ==1.2.6 + - dhall ==1.39.0 + - dhall-bash ==1.0.37 + - dhall-json ==1.7.7 + - dhall-lsp-server ==1.0.15 + - dhall-yaml ==1.2.7 - diagrams-solve ==0.1.3 - dialogflow-fulfillment ==0.1.1.4 - di-core ==1.0.4 @@ -625,7 +615,7 @@ default-package-overrides: - distribution-opensuse ==1.1.1 - distributive ==0.6.2.1 - dl-fedora ==0.9 - - dlist ==0.8.0.8 + - dlist ==1.0 - dlist-instances ==0.1.1.1 - dlist-nonempty ==0.1.1 - dns ==4.0.1 @@ -740,7 +730,7 @@ default-package-overrides: - expiring-cache-map ==0.0.6.1 - explicit-exception ==0.1.10 - exp-pairs ==0.2.1.0 - - express ==0.1.12 + - express ==0.1.14 - extended-reals ==0.2.4.0 - extensible-effects ==5.0.0.1 - extensible-exceptions ==0.1.1.4 @@ -781,7 +771,7 @@ default-package-overrides: - finite-typelits ==0.1.4.2 - first-class-families ==0.8.0.1 - first-class-patterns ==0.3.2.5 - - fitspec ==0.4.8 + - fitspec ==0.4.10 - fixed ==0.3 - fixed-length ==0.2.2.1 - fixed-vector ==1.2.0.0 @@ -817,7 +807,7 @@ default-package-overrides: - formatting ==6.3.7 - foundation ==0.0.26.1 - fourmolu ==0.3.0.0 - - free ==5.1.5 + - free ==5.1.7 - free-categories ==0.2.0.2 - freenect ==1.2.1 - freer-simple ==1.2.1.1 @@ -834,7 +824,7 @@ default-package-overrides: - function-builder ==0.3.0.1 - functor-classes-compat ==1.0.1 - functor-combinators ==0.3.6.0 - - fusion-plugin ==0.2.2 + - fusion-plugin ==0.2.3 - fusion-plugin-types ==0.1.0 - fuzzcheck ==0.1.1 - fuzzy ==0.1.0.0 @@ -901,9 +891,9 @@ default-package-overrides: - ghcid ==0.8.7 - ghci-hexcalc ==0.1.1.0 - ghcjs-codemirror ==0.0.0.2 - - ghc-lib ==8.10.4.20210206 - - ghc-lib-parser ==8.10.4.20210206 - - ghc-lib-parser-ex ==8.10.0.19 + - ghc-lib ==8.10.5.20210606 + - ghc-lib-parser ==8.10.5.20210606 + - ghc-lib-parser-ex ==8.10.0.21 - ghc-parser ==0.2.3.0 - ghc-paths ==0.1.0.12 - ghc-prof ==1.4.1.8 @@ -935,7 +925,7 @@ default-package-overrides: - ginger ==0.10.1.0 - gingersnap ==0.3.1.0 - gi-pango ==1.0.23 - - githash ==0.1.5.0 + - githash ==0.1.6.0 - github-release ==1.3.7 - github-rest ==1.0.3 - github-types ==0.2.1 @@ -986,7 +976,7 @@ default-package-overrides: - hall-symbols ==0.1.0.6 - hamtsolo ==1.0.3 - HandsomeSoup ==0.4.2 - - hapistrano ==0.4.1.3 + - hapistrano ==0.4.1.4 - happstack-server ==7.7.1 - happy ==1.20.0 - happy-meta ==0.2.0.11 @@ -1147,7 +1137,7 @@ default-package-overrides: - html-entities ==1.1.4.5 - html-entity-map ==0.1.0.0 - htoml ==1.0.0.3 - - http2 ==3.0.1 + - http2 ==3.0.2 - HTTP ==4000.3.16 - http-api-data ==0.4.2 - http-client ==0.6.4.1 @@ -1187,12 +1177,10 @@ default-package-overrides: - hw-hspec-hedgehog ==0.1.1.0 - hw-int ==0.0.2.0 - hw-ip ==2.4.2.0 - - hw-json ==1.3.2.2 - hw-json-simd ==0.1.1.0 - hw-json-simple-cursor ==0.1.1.0 - hw-json-standard-cursor ==0.2.3.1 - hw-kafka-client ==4.0.3 - - hw-mquery ==0.2.1.0 - hw-packed-vector ==0.2.1.0 - hw-parser ==0.1.1.0 - hw-prim ==0.6.3.0 @@ -1305,12 +1293,13 @@ default-package-overrides: - js-flot ==0.8.3 - js-jquery ==3.3.1 - json-feed ==1.0.13 + - jsonifier ==0.1.1 - jsonpath ==0.2.0.0 - json-rpc ==1.0.3 - json-rpc-generic ==0.2.1.5 - JuicyPixels ==3.3.5 - JuicyPixels-blurhash ==0.1.0.3 - - JuicyPixels-extra ==0.5.0 + - JuicyPixels-extra ==0.5.1 - JuicyPixels-scale-dct ==0.1.2 - junit-xml ==0.1.0.2 - justified-containers ==0.3.0.0 @@ -1363,7 +1352,7 @@ default-package-overrides: - lazyio ==0.1.0.4 - lazysmallcheck ==0.6 - lca ==0.4 - - leancheck ==0.9.6 + - leancheck ==0.9.10 - leancheck-instances ==0.0.4 - leapseconds-announced ==2017.1.0.1 - learn-physics ==0.6.5 @@ -1410,7 +1399,7 @@ default-package-overrides: - list-t ==1.0.4 - list-transformer ==1.0.7 - ListTree ==0.2.3 - - literatex ==0.1.0.0 + - literatex ==0.1.0.2 - little-rio ==0.2.2 - llvm-hs ==9.0.1 - llvm-hs-pure ==9.0.0 @@ -1452,7 +1441,7 @@ default-package-overrides: - markdown ==0.1.17.4 - markdown-unlit ==0.5.1 - markov-chain ==0.0.3.4 - - massiv ==0.6.0.0 + - massiv ==0.6.1.0 - massiv-io ==0.4.1.0 - massiv-persist ==0.1.0.0 - massiv-serialise ==0.1.0.0 @@ -1510,7 +1499,7 @@ default-package-overrides: - min-max-pqueue ==0.1.0.2 - mintty ==0.1.2 - missing-foreign ==0.1.1 - - mixed-types-num ==0.5.7.0 + - mixed-types-num ==0.5.8.0 - mltool ==0.2.0.1 - mmap ==0.5.9 - mmark ==0.0.7.2 @@ -1648,14 +1637,15 @@ default-package-overrides: - nqe ==0.6.3 - nri-env-parser ==0.1.0.7 - nri-observability ==0.1.0.2 - - nri-prelude ==0.6.0.0 + - nri-prelude ==0.6.0.1 - nsis ==0.3.3 - numbers ==3000.2.0.2 - numeric-extras ==0.1 + - numeric-limits ==0.1.0.0 - numeric-prelude ==0.4.3.3 - numhask ==0.7.1.0 - NumInstances ==1.4 - - numtype-dk ==0.5.0.2 + - numtype-dk ==0.5.0.3 - nuxeo ==0.3.2 - nvim-hs ==2.1.0.4 - nvim-hs-contrib ==2.0.0.0 @@ -1683,10 +1673,10 @@ default-package-overrides: - openpgp-asciiarmor ==0.1.2 - opensource ==0.1.1.0 - openssl-streams ==1.2.3.0 - - opentelemetry ==0.6.1 - - opentelemetry-extra ==0.6.1 - - opentelemetry-lightstep ==0.6.1 - - opentelemetry-wai ==0.6.1 + - opentelemetry ==0.7.0 + - opentelemetry-extra ==0.7.0 + - opentelemetry-lightstep ==0.7.0 + - opentelemetry-wai ==0.7.0 - operational ==0.2.3.5 - operational-class ==0.3.0.0 - optics ==0.3 @@ -1710,10 +1700,10 @@ default-package-overrides: - pagure-cli ==0.2 - pandoc ==2.13 - pandoc-dhall-decoder ==0.1.0.1 - - pandoc-plot ==1.2.2 + - pandoc-plot ==1.2.3 - pandoc-throw ==0.1.0.0 - pandoc-types ==1.22 - - pantry ==0.5.2.1 + - pantry ==0.5.2.2 - parallel ==3.2.2.0 - parameterized ==0.5.0.0 - paripari ==0.7.0.0 @@ -1735,10 +1725,10 @@ default-package-overrides: - path-binary-instance ==0.1.0.1 - path-extensions ==0.1.1.0 - path-extra ==0.2.0 - - path-io ==1.6.2 + - path-io ==1.6.3 - path-like ==0.2.0.2 - path-pieces ==0.2.1 - - path-text-utf8 ==0.0.1.6 + - path-text-utf8 ==0.0.1.8 - pathtype ==0.8.1.1 - pathwalk ==0.3.1.2 - pattern-arrows ==0.0.2 @@ -1759,10 +1749,10 @@ default-package-overrides: - persistable-record ==0.6.0.5 - persistable-types-HDBC-pg ==0.0.3.5 - persistent ==2.13.0.2 - - persistent-mtl ==0.2.1.0 + - persistent-mtl ==0.2.2.0 - persistent-mysql ==2.13.0.1 - persistent-pagination ==0.1.1.2 - - persistent-postgresql ==2.13.0.1 + - persistent-postgresql ==2.13.0.2 - persistent-qq ==2.12.0.1 - persistent-sqlite ==2.13.0.3 - persistent-template ==2.12.0.0 @@ -1855,11 +1845,12 @@ default-package-overrides: - product-isomorphic ==0.0.3.3 - product-profunctors ==0.11.0.2 - profiterole ==0.1 - - profunctors ==5.5.2 + - profunctors ==5.6.2 - projectroot ==0.2.0.1 - project-template ==0.2.1.0 - prometheus ==2.2.2 - prometheus-client ==1.0.1 + - prometheus-metrics-ghc ==1.0.1.1 - prometheus-wai-middleware ==1.0.1.0 - promises ==0.3 - prompt ==0.1.1.2 @@ -1871,14 +1862,10 @@ default-package-overrides: - protocol-buffers-descriptor ==2.4.17 - protocol-radius ==0.0.1.1 - protocol-radius-test ==0.1.0.1 - - proto-lens ==0.7.0.0 - - proto-lens-protobuf-types ==0.7.0.0 - - proto-lens-protoc ==0.7.0.0 - - proto-lens-runtime ==0.7.0.0 - - proto-lens-setup ==0.4.0.4 - protolude ==0.3.0 - proxied ==0.3.1 - psqueues ==0.2.7.2 + - ptr-poker ==0.1.1.4 - publicsuffix ==0.20200526 - pulse-simple ==0.1.14 - pureMD5 ==2.1.3 @@ -1945,7 +1932,7 @@ default-package-overrides: - readable ==0.3.1 - read-editor ==0.1.0.2 - read-env-var ==1.0.0.0 - - rebase ==1.6.1 + - rebase ==1.13.0.1 - record-dot-preprocessor ==0.2.11 - record-hasfield ==1.0 - records-sop ==0.1.1.0 @@ -1971,7 +1958,7 @@ default-package-overrides: - regex-pcre ==0.95.0.0 - regex-pcre-builtin ==0.95.2.3.8.43 - regex-posix ==0.96.0.0 - - regex-tdfa ==1.3.1.0 + - regex-tdfa ==1.3.1.1 - regex-with-pcre ==1.1.0.0 - registry ==0.2.0.3 - reinterpret-cast ==0.1.0 @@ -1988,7 +1975,7 @@ default-package-overrides: - repline ==0.4.0.0 - req ==3.9.0 - req-conduit ==1.0.0 - - rerebase ==1.6.1 + - rerebase ==1.13.0.1 - rescue ==0.4.2.1 - resistor-cube ==0.0.1.2 - resolv ==0.1.2.0 @@ -2016,14 +2003,15 @@ default-package-overrides: - rosezipper ==0.2 - rot13 ==0.2.0.1 - rpmbuild-order ==0.4.5 - - rp-tree ==0.3.6 + - rp-tree ==0.4 - RSA ==2.4.1 - runmemo ==1.0.0.1 - rvar ==0.2.0.6 - safe ==0.3.19 - - safe-coloured-text ==0.0.0.0 + - safe-coloured-text ==0.1.0.0 + - safe-coloured-text-terminfo ==0.0.0.0 - safecopy ==0.10.4.2 - - safe-decimal ==0.2.0.0 + - safe-decimal ==0.2.1.0 - safe-exceptions ==0.1.7.1 - safe-foldable ==0.1.0.0 - safeio ==0.0.5.0 @@ -2031,17 +2019,15 @@ default-package-overrides: - safe-money ==0.9 - SafeSemaphore ==0.10.1 - safe-tensor ==0.2.1.1 - - salak ==0.3.6 - - salak-yaml ==0.3.5.3 - saltine ==0.1.1.1 - salve ==1.0.11 - sample-frame ==0.0.3 - sample-frame-np ==0.0.4.1 - sampling ==0.3.5 - - sandwich ==0.1.0.6 + - sandwich ==0.1.0.7 - sandwich-quickcheck ==0.1.0.5 - sandwich-slack ==0.1.0.4 - - sandwich-webdriver ==0.1.0.4 + - sandwich-webdriver ==0.1.0.5 - say ==0.1.0.1 - sbp ==2.6.3 - sbv ==8.15 @@ -2104,7 +2090,8 @@ default-package-overrides: - servant-foreign ==0.15.3 - servant-http-streams ==0.18.2 - servant-machines ==0.15.1 - - servant-multipart ==0.12 + - servant-multipart ==0.12.1 + - servant-multipart-api ==0.12.1 - servant-openapi3 ==2.0.1.2 - servant-pipes ==0.15.2 - servant-rawm ==1.0.0.0 @@ -2195,7 +2182,7 @@ default-package-overrides: - sparse-tensor ==0.2.1.5 - spatial-math ==0.5.0.1 - special-values ==0.1.0.0 - - speculate ==0.4.6 + - speculate ==0.4.8 - speedy-slice ==0.3.2 - Spintax ==0.3.6 - splice ==0.6.1.1 @@ -2264,7 +2251,7 @@ default-package-overrides: - string-random ==0.1.4.1 - stringsearch ==0.3.6.6 - string-transform ==1.1.1 - - stripe-concepts ==1.0.2.6 + - stripe-concepts ==1.0.2.8 - stripe-core ==2.6.2 - stripe-haskell ==2.6.2 - stripe-http-client ==2.6.2 @@ -2282,12 +2269,12 @@ default-package-overrides: - sweet-egison ==0.1.1.3 - swish ==0.10.0.4 - syb ==0.7.2.1 - - sydtest ==0.1.0.0 + - sydtest ==0.2.0.0 - sydtest-discover ==0.0.0.0 - - sydtest-persistent-sqlite ==0.0.0.0 - - sydtest-servant ==0.0.0.0 - - sydtest-wai ==0.0.0.0 - - sydtest-yesod ==0.0.0.0 + - sydtest-persistent-sqlite ==0.1.0.0 + - sydtest-servant ==0.1.0.0 + - sydtest-wai ==0.1.0.0 + - sydtest-yesod ==0.1.0.0 - symbol ==0.2.4 - symengine ==0.1.2.0 - symmetry-operations-symbols ==0.0.2.1 @@ -2451,7 +2438,7 @@ default-package-overrides: - triplesec ==0.2.2.1 - trivial-constraint ==0.7.0.0 - tsv2csv ==0.1.0.2 - - ttc ==0.4.0.0 + - ttc ==1.1.0.0 - ttl-hashtables ==1.4.1.0 - ttrie ==0.1.2.1 - tuple ==0.3.0.2 @@ -2517,7 +2504,7 @@ default-package-overrides: - unix-bytestring ==0.3.7.3 - unix-compat ==0.5.3 - unix-time ==0.4.7 - - unliftio ==0.2.17 + - unliftio ==0.2.18 - unliftio-core ==0.2.0.1 - unliftio-pool ==0.2.1.1 - unliftio-streams ==0.1.1.1 @@ -2592,6 +2579,7 @@ default-package-overrides: - wai-middleware-auth ==0.2.4.1 - wai-middleware-caching ==0.1.0.2 - wai-middleware-clacks ==0.1.0.1 + - wai-middleware-prometheus ==1.0.0 - wai-middleware-static ==0.9.0 - wai-rate-limit ==0.1.0.0 - wai-rate-limit-redis ==0.1.0.0 @@ -2619,7 +2607,7 @@ default-package-overrides: - wide-word ==0.1.1.2 - wikicfp-scraper ==0.1.0.12 - wild-bind ==0.1.2.7 - - wild-bind-x11 ==0.2.0.12 + - wild-bind-x11 ==0.2.0.13 - Win32 ==2.6.1.0 - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 @@ -2678,7 +2666,7 @@ default-package-overrides: - xss-sanitize ==0.3.6 - xxhash-ffi ==0.2.0.0 - yaml ==0.11.5.0 - - yamlparse-applicative ==0.1.0.4 + - yamlparse-applicative ==0.2.0.0 - yesod ==1.6.1.1 - yesod-auth ==1.6.10.3 - yesod-auth-hashdb ==1.7.1.7 @@ -2710,7 +2698,7 @@ default-package-overrides: - zeromq4-patterns ==0.3.1.0 - zim-parser ==0.2.1.0 - zio ==0.1.0.2 - - zip ==1.7.0 + - zip ==1.7.1 - zip-archive ==0.4.1 - zipper-extra ==0.1.3.2 - zippers ==0.3.1 diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index e813a2a83475..59c2630a962c 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -20,7 +20,6 @@ dont-distribute-packages: - activehs - actor - AC-Vector-Fancy - - addy - adhoc-network - adict - ADPfusionForest @@ -29,7 +28,6 @@ dont-distribute-packages: - Advgame - Advise-me - aern2-real - - aern2-real_0_2_7_0 - AERN-Net - AERN-Real - AERN-Real-Double @@ -117,13 +115,12 @@ dont-distribute-packages: - atp - AttoJson - attoparsec-enumerator - - attoparsec-ip - attoparsec-iteratee - attoparsec-text-enumerator - - attoparsec-uri - atuin - audiovisual - aura + - aura_3_2_5 - authoring - AutoForms - autonix-deps-kf5 @@ -168,7 +165,6 @@ dont-distribute-packages: - Barracuda - base16-lens - base32-bytestring - - base62 - base64-bytes - baserock-schema - BASIC @@ -309,10 +305,8 @@ dont-distribute-packages: - buster-network - butterflies - bv-sized-lens - - bytebuild - bytehash - bytelog - - bytesmith - bytestring-read - c0check - cabal2arch @@ -622,7 +616,6 @@ dont-distribute-packages: - dewdrop - dfinity-radix-tree - dhall-docs - - dhcp-lease-parser - dia-functions - diagrams-haddock - diagrams-html5 @@ -1112,6 +1105,7 @@ dont-distribute-packages: - happstack-jmacro - happstack-plugins - happstack-state + - happstack-static-routing - happstack-yui - happs-tutorial - happybara-webkit @@ -1565,7 +1559,6 @@ dont-distribute-packages: - invertible-hlist - ion - IORefCAS - - ip - ipatch - ipc - ipld-cid @@ -1575,7 +1568,6 @@ dont-distribute-packages: - irc-fun-client - irc-fun-color - irc-fun-messages - - iri - ironforge - isevaluated - ismtp @@ -1627,11 +1619,9 @@ dont-distribute-packages: - JSON-Combinator-Examples - json-enumerator - JsonGrammar - - jsonifier - json-incremental-decoder - json-query - jsons-to-schema - - json-syntax - json-togo - json-tokens - jspath @@ -1886,7 +1876,6 @@ dont-distribute-packages: - markdown2svg - markdown-pap - markov-processes - - markup - marmalade-upload - marquise - marvin @@ -1903,6 +1892,7 @@ dont-distribute-packages: - MaybeT-transformers - MC-Fold-DP - mcmc + - mcmc_0_5_0_0 - mcmc-samplers - mDNSResponder-client - mealy @@ -1986,7 +1976,6 @@ dont-distribute-packages: - mpretty - mprover - mps - - mptcp-pm - msgpack-aeson - msgpack-idl - msgpack-rpc @@ -2092,7 +2081,6 @@ dont-distribute-packages: - NoSlow - notmuch-haskell - notmuch-web - - nri-prelude_0_6_0_1 - numerical - numeric-ode - numhask-hedgehog @@ -2146,7 +2134,6 @@ dont-distribute-packages: - pairing - panda - pandoc-japanese-filters - - pan-os-syslog - papa - papa-base - papa-base-implement @@ -2162,6 +2149,7 @@ dont-distribute-packages: - parquet-hs - parse-help - parsestar + - parsley-garnish - partial-lens - passman-cli - patch-image @@ -2525,8 +2513,6 @@ dont-distribute-packages: - ruler-core - runtime-arbitrary - S3 - - safe-coloured-text-layout-gen - - safe-numeric - safer-file-handles - safer-file-handles-bytestring - safer-file-handles-text @@ -2565,7 +2551,6 @@ dont-distribute-packages: - scholdoc - scholdoc-citeproc - scholdoc-texmath - - scientific-notation - SciFlow - SciFlow-drmaa - scion @@ -2628,7 +2613,6 @@ dont-distribute-packages: - servant-zeppelin-swagger - serv-wai - sessiontypes-distributed - - setdown - s-expression - SFML-control - SFont @@ -2688,11 +2672,9 @@ dont-distribute-packages: - skylark-client - slidemews - slip32 - - small-bytearray-builder - smallstring - smartword - smcdel - - smith - smith-cli - smith-client - Smooth @@ -2842,6 +2824,7 @@ dont-distribute-packages: - swearjure - sweet-egison - switch + - sydtest-persistent-postgresql - sylvia - symantic-atom - symantic-lib @@ -3035,7 +3018,6 @@ dont-distribute-packages: - universe-th - unix-fcntl - unix-simple - - unpacked-maybe-numeric - unpacked-these - unpacked-validation - unparse-attoparsec @@ -3048,9 +3030,7 @@ dont-distribute-packages: - urembed - uri-enumerator - uri-enumerator-file - - url-bytes - UrlDisp - - urlpath - URLT - usb - usb-enumerator @@ -3063,7 +3043,6 @@ dont-distribute-packages: - uu-cco-examples - uu-cco-hut-parsing - uu-cco-uu-parsinglib - - uuid-bytes - uuid-crypto - uvector-algorithms - v4l2 @@ -3090,6 +3069,7 @@ dont-distribute-packages: - vfr-waypoints - ViennaRNA-extras - vigilance + - vimeta - vinyl-operational - vision - visual-graphrewrite @@ -3110,7 +3090,6 @@ dont-distribute-packages: - wai-middleware-cache - wai-middleware-cache-redis - wai-middleware-consul - - wai-middleware-content-type - wai-middleware-rollbar - wai-middleware-route - wai-session-tokyocabinet @@ -3144,7 +3123,6 @@ dont-distribute-packages: - wheb-redis - wheb-strapped - whitespace - - wide-word-instances - wikipedia4epub - windowslive - winio @@ -3163,7 +3141,6 @@ dont-distribute-packages: - wrecker-ui - wright - writer-cps-full - - ws - wss-client - wtk-gtk - wumpus-basic @@ -3235,7 +3212,6 @@ dont-distribute-packages: - yesod-colonnade - yesod-continuations - yesod-examples - - yesod-ip - yesod-mangopay - yesod-paypal-rest - yesod-platform diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix index 538d5381a96a..161712d594b8 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix @@ -53,7 +53,7 @@ self: super: builtins.intersectAttrs super { # Use the default version of mysql to build this package (which is actually mariadb). # test phase requires networking - mysql = dontCheck (super.mysql.override { mysql = pkgs.libmysqlclient; }); + mysql = dontCheck super.mysql; # CUDA needs help finding the SDK headers and libraries. cuda = overrideCabal super.cuda (drv: { @@ -577,7 +577,12 @@ self: super: builtins.intersectAttrs super { sha256 = "1hjdprm990vyxz86fgq14ajn0lkams7i00h8k2i2g1a0hjdwppq6"; }; - spagoDocs = overrideCabal super.spago (drv: { + spagoWithOverrides = super.spago.override { + # spago has not yet been updated for the latest dhall. + dhall = self.dhall_1_38_1; + }; + + spagoDocs = overrideCabal spagoWithOverrides (drv: { postUnpack = (drv.postUnpack or "") + '' # Spago includes the following two files directly into the binary # with Template Haskell. They are fetched at build-time from the @@ -821,8 +826,21 @@ self: super: builtins.intersectAttrs super { random = dontCheck super.random; # Since this package is primarily used by nixpkgs maintainers and is probably - # not used to link against by anyone, we can make it’s closure smaller. - cabal2nix-unstable = justStaticExecutables super.cabal2nix-unstable; + # not used to link against by anyone, we can make it’s closure smaller and + # add its runtime dependencies in `haskellPackages` (as opposed to cabal2nix). + cabal2nix-unstable = overrideCabal + (justStaticExecutables super.cabal2nix-unstable) + (drv: { + buildTools = (drv.buildTools or []) ++ [ + pkgs.makeWrapper + ]; + postInstall = '' + wrapProgram $out/bin/cabal2nix \ + --prefix PATH ":" "${ + pkgs.lib.makeBinPath [ pkgs.nix pkgs.nix-prefetch-scripts ] + }" + ''; + }); # test suite needs local redis daemon nri-redis = dontCheck super.nri-redis; @@ -833,4 +851,16 @@ self: super: builtins.intersectAttrs super { sed -i 's|"tophat"|"./dist/build/tophat/tophat"|' app-test-bin/*.hs '' + (drv.postPatch or ""); }); + + # Runtime dependencies and CLI completion + nvfetcher = generateOptparseApplicativeCompletion "nvfetcher" (overrideCabal + super.nvfetcher (drv: { + buildTools = drv.buildTools or [ ] ++ [ pkgs.makeWrapper ]; + postInstall = drv.postInstall or "" + '' + wrapProgram "$out/bin/nvfetcher" --prefix 'PATH' ':' "${ + pkgs.lib.makeBinPath [ pkgs.nvchecker pkgs.nix-prefetch-git ] + }" + ''; + })); + } diff --git a/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix b/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix index a9c8f11223f7..2b2f23e20eaf 100644 --- a/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix +++ b/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix @@ -58,7 +58,7 @@ in , pkg-configDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? [], benchmarkPkgconfigDepends ? [] , testDepends ? [], testHaskellDepends ? [], testSystemDepends ? [], testFrameworkDepends ? [] , benchmarkDepends ? [], benchmarkHaskellDepends ? [], benchmarkSystemDepends ? [], benchmarkFrameworkDepends ? [] -, testTarget ? "" +, testTarget ? "", testFlags ? [] , broken ? false , preCompileBuildDriver ? null, postCompileBuildDriver ? null , preUnpack ? null, postUnpack ? null @@ -454,9 +454,13 @@ stdenv.mkDerivation ({ inherit doCheck; + # Run test suite(s) and pass `checkFlags` as well as `checkFlagsArray`. + # `testFlags` are added to `checkFlagsArray` each prefixed with + # `--test-option`, so Cabal passes it to the underlying test suite binary. checkPhase = '' runHook preCheck - ${setupCommand} test ${testTarget} + checkFlagsArray+=(${lib.escapeShellArgs (builtins.map (opt: "--test-option=${opt}") testFlags)}) + ${setupCommand} test ${testTarget} $checkFlags ''${checkFlagsArray:+"''${checkFlagsArray[@]}"} runHook postCheck ''; @@ -481,7 +485,7 @@ stdenv.mkDerivation ({ # ^^ if the project is not a library, and we have a build target, then use "copy" to install # just the target specified; "install" will error here, since not all targets have been built. else '' - ${setupCommand} copy + ${setupCommand} copy ${buildTarget} local packageConfDir="$out/lib/${ghc.name}/package.conf.d" local packageConfFile="$packageConfDir/${pname}-${version}.conf" mkdir -p "$packageConfDir" diff --git a/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix index 2d65d3355cc7..e0d8cde491ce 100644 --- a/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -1551,8 +1551,8 @@ self: { }: mkDerivation { pname = "BiobaseBlast"; - version = "0.3.1.0"; - sha256 = "153bxf221jga58ibxgd660465klbqj49qr3rk6ni77v7sb4qgrg0"; + version = "0.3.3.0"; + sha256 = "11xxm3s6pyy68as6pd3iwfq2dmbgvj2w238jg969fza8vj22xcdb"; libraryHaskellDepends = [ aeson attoparsec base binary BiobaseENA BiobaseTypes BiobaseXNA bytestring cereal containers deepseq directory file-embed lens @@ -1587,8 +1587,8 @@ self: { }: mkDerivation { pname = "BiobaseENA"; - version = "0.0.0.1"; - sha256 = "0wkfaxrv4s34amjjl02q0si5nvs18f74z9dxp5r024fd42g3fdka"; + version = "0.0.0.2"; + sha256 = "0v999rs3bj4mkbrxsgz0nnqh1pzf7pgxm94519hqjfph5r6yw7nd"; libraryHaskellDepends = [ base BiobaseTypes bytestring containers directory file-embed lens megaparsec mtl text vector vector-th-unbox @@ -1639,18 +1639,24 @@ self: { "BiobaseFasta" = callPackage ({ mkDerivation, base, BiobaseTypes, bytestring, DPutils, filepath - , lens, QuickCheck, resourcet, streaming, streaming-bytestring - , string-conversions, tasty, tasty-golden, tasty-hunit - , tasty-quickcheck, tasty-silver, tasty-th, text + , lens, optparse-applicative, QuickCheck, resourcet, streaming + , streaming-bytestring, string-conversions, tasty, tasty-golden + , tasty-hunit, tasty-quickcheck, tasty-silver, tasty-th, text }: mkDerivation { pname = "BiobaseFasta"; - version = "0.3.0.1"; - sha256 = "11vwvqln5jv4k97miyjgqs3yckm8fhyclclhfxq473i4g22amjyh"; + version = "0.4.0.1"; + sha256 = "1l5185nsq59jgnpx1r0j5r07a5fqz8f5q2xyxvhwbqan51w51ph6"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base BiobaseTypes bytestring DPutils lens resourcet streaming streaming-bytestring string-conversions ]; + executableHaskellDepends = [ + base BiobaseTypes bytestring DPutils lens optparse-applicative + resourcet streaming streaming-bytestring string-conversions + ]; testHaskellDepends = [ base BiobaseTypes bytestring DPutils filepath lens QuickCheck resourcet streaming streaming-bytestring string-conversions tasty @@ -1822,30 +1828,31 @@ self: { "BiobaseTypes" = callPackage ({ mkDerivation, aeson, attoparsec, base, bimaps, binary , bytestring, cereal, cereal-text, cereal-vector, containers - , data-default, deepseq, ForestStructures, hashable, intern, lens - , mtl, primitive, PrimitiveArray, QuickCheck, SciBaseTypes - , streaming, string-conversions, tasty, tasty-quickcheck, tasty-th - , text, text-binary, utf8-string, vector, vector-binary-instances - , vector-th-unbox + , data-default, deepseq, DPutils, ForestStructures, hashable + , intern, lens, mtl, primitive, PrimitiveArray, QuickCheck + , SciBaseTypes, streaming, string-conversions, tasty, tasty-hunit + , tasty-quickcheck, tasty-th, text, text-binary, utf8-string + , vector, vector-binary-instances, vector-th-unbox }: mkDerivation { pname = "BiobaseTypes"; - version = "0.2.0.1"; - sha256 = "1ygyq169dcz1bswppljkskvqamvvs61n8fwyyplyf4348i1v938i"; + version = "0.2.1.0"; + sha256 = "0gm5nlh8xbww614386vhm2lz118w9c6lcj3pbx5k256mzm7j5yba"; libraryHaskellDepends = [ aeson attoparsec base bimaps binary bytestring cereal cereal-text - cereal-vector containers data-default deepseq ForestStructures - hashable intern lens mtl primitive PrimitiveArray QuickCheck - SciBaseTypes streaming string-conversions text text-binary - utf8-string vector vector-binary-instances vector-th-unbox + cereal-vector containers data-default deepseq DPutils + ForestStructures hashable intern lens mtl primitive PrimitiveArray + QuickCheck SciBaseTypes streaming string-conversions text + text-binary utf8-string vector vector-binary-instances + vector-th-unbox ]; testHaskellDepends = [ aeson attoparsec base bimaps binary bytestring cereal cereal-text - cereal-vector containers data-default deepseq ForestStructures - hashable intern lens mtl primitive PrimitiveArray QuickCheck - SciBaseTypes streaming string-conversions tasty tasty-quickcheck - tasty-th text text-binary utf8-string vector - vector-binary-instances vector-th-unbox + cereal-vector containers data-default deepseq DPutils + ForestStructures hashable intern lens mtl primitive PrimitiveArray + QuickCheck SciBaseTypes streaming string-conversions tasty + tasty-hunit tasty-quickcheck tasty-th text text-binary utf8-string + vector vector-binary-instances vector-th-unbox ]; description = "Collection of types for bioinformatics"; license = lib.licenses.bsd3; @@ -1872,36 +1879,36 @@ self: { ({ mkDerivation, aeson, attoparsec, base, bimaps, binary , BiobaseENA, BiobaseTypes, bytes, bytestring, cereal , cereal-vector, cmdargs, containers, csv, data-default, deepseq - , file-embed, ForestStructures, hashable, lens, mtl, primitive - , PrimitiveArray, QuickCheck, split, tasty, tasty-quickcheck - , tasty-th, text, tuple, vector, vector-binary-instances - , vector-th-unbox + , DPutils, file-embed, ForestStructures, hashable, lens, mtl + , primitive, PrimitiveArray, QuickCheck, split, tasty + , tasty-quickcheck, tasty-th, text, tuple, vector + , vector-binary-instances, vector-th-unbox }: mkDerivation { pname = "BiobaseXNA"; - version = "0.11.0.0"; - sha256 = "1yrq14mv5bbw6drlpk2cf6incdg2wqw3i0zgdd0vpfmxbwr3wjl4"; + version = "0.11.1.1"; + sha256 = "0ws9x3z5ljgm7hnz290yhzm3ijksd6dr4m0drj1lxhchdfmwfy1m"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson attoparsec base bimaps binary BiobaseENA BiobaseTypes bytes bytestring cereal cereal-vector containers csv data-default deepseq - file-embed ForestStructures hashable lens mtl primitive + DPutils file-embed ForestStructures hashable lens mtl primitive PrimitiveArray QuickCheck split text tuple vector vector-binary-instances vector-th-unbox ]; executableHaskellDepends = [ aeson attoparsec base bimaps binary BiobaseENA BiobaseTypes bytes bytestring cereal cereal-vector cmdargs containers csv data-default - deepseq file-embed ForestStructures hashable lens mtl primitive - PrimitiveArray QuickCheck split text tuple vector + deepseq DPutils file-embed ForestStructures hashable lens mtl + primitive PrimitiveArray QuickCheck split text tuple vector vector-binary-instances vector-th-unbox ]; testHaskellDepends = [ aeson attoparsec base bimaps binary BiobaseENA BiobaseTypes bytes bytestring cereal cereal-vector containers csv data-default deepseq - file-embed ForestStructures hashable lens mtl primitive + DPutils file-embed ForestStructures hashable lens mtl primitive PrimitiveArray QuickCheck split tasty tasty-quickcheck tasty-th text tuple vector vector-binary-instances vector-th-unbox ]; @@ -1977,8 +1984,8 @@ self: { }: mkDerivation { pname = "BlastHTTP"; - version = "1.4.1"; - sha256 = "1h7bj9a6qfzwlclr39dvbcz4r8l8s7n53z6ir8wff5ssq2wvq4qd"; + version = "1.4.2"; + sha256 = "1ndg24w4qcs7f6ak8qcgfp04mippz2vxpcxwpnsaghyxvpbxqbw6"; libraryHaskellDepends = [ base BiobaseBlast BiobaseFasta bytestring conduit either-unwrap HTTP http-conduit hxt mtl network transformers zip-archive @@ -3315,8 +3322,8 @@ self: { }: mkDerivation { pname = "Color"; - version = "0.3.1"; - sha256 = "1gg15kb6za69w0b3x8pzrqbrh9b8g7g0zwj2a9ajf0wgp8kylp5b"; + version = "0.3.2"; + sha256 = "1v5x32jas70sfqy90brjqlfsy816ar9mcbr3i1lviqivzq7agshk"; libraryHaskellDepends = [ base data-default-class deepseq vector ]; testHaskellDepends = [ base colour doctest hspec HUnit JuicyPixels massiv massiv-test @@ -4066,28 +4073,25 @@ self: { }: mkDerivation { pname = "DPutils"; - version = "0.1.0.0"; - sha256 = "153g1rr13jjwqkvfj85nwjhaa0zq8khn24n3dib80nyk0scd4w62"; + version = "0.1.1.0"; + sha256 = "1kvj6zkj8r7qp1zvqz68fflxcal3w4qi1y8a70bm6qq5d83ivnd4"; libraryHaskellDepends = [ - attoparsec base bytestring containers criterion kan-extensions lens - mtl parallel pipes pipes-bytestring pipes-parse primitive - QuickCheck smallcheck streaming streaming-bytestring stringsearch - tasty tasty-quickcheck tasty-smallcheck tasty-th transformers + attoparsec base bytestring containers kan-extensions lens mtl + parallel pipes pipes-bytestring pipes-parse primitive QuickCheck + smallcheck streaming streaming-bytestring stringsearch transformers vector ]; testHaskellDepends = [ - attoparsec base bytestring containers criterion kan-extensions lens - mtl parallel pipes pipes-bytestring pipes-parse primitive - QuickCheck smallcheck streaming streaming-bytestring stringsearch - tasty tasty-quickcheck tasty-smallcheck tasty-th transformers - vector + attoparsec base bytestring containers kan-extensions lens mtl + parallel pipes pipes-bytestring pipes-parse primitive QuickCheck + smallcheck streaming streaming-bytestring stringsearch tasty + tasty-quickcheck tasty-smallcheck tasty-th transformers vector ]; benchmarkHaskellDepends = [ attoparsec base bytestring containers criterion kan-extensions lens mtl parallel pipes pipes-bytestring pipes-parse primitive QuickCheck smallcheck streaming streaming-bytestring stringsearch - tasty tasty-quickcheck tasty-smallcheck tasty-th timeit - transformers vector + timeit transformers vector ]; description = "utilities for DP"; license = lib.licenses.bsd3; @@ -11650,8 +11654,8 @@ self: { }: mkDerivation { pname = "JuicyPixels-extra"; - version = "0.5.0"; - sha256 = "1r6rpasakl4s7x53y6wz34rkg4xxjhh8zfm9aqdjnxc7b8ir0nbb"; + version = "0.5.1"; + sha256 = "1kgb2l6ymhjr7wq93jpdhxy3k4i7jz0rz256phz10ycdpyvdbjpq"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base JuicyPixels ]; testHaskellDepends = [ base hspec JuicyPixels ]; @@ -14103,8 +14107,8 @@ self: { }: mkDerivation { pname = "NanoID"; - version = "1.2.0"; - sha256 = "1fwbzdj7cn96fbq4vsp4582p317qw3piy237vxf79d0wmdp006zn"; + version = "2.1.0"; + sha256 = "0ila2yrdva18y20wm533hkqmmb2mrh1j212jp2ck6p6yiwam687j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring extra mwc-random ]; @@ -15960,8 +15964,8 @@ self: { }: mkDerivation { pname = "PrimitiveArray"; - version = "0.10.1.0"; - sha256 = "1qjld82q0fdaav6y9ky0bkmqjxvv48502zd3s9i1b72wn436zhib"; + version = "0.10.1.1"; + sha256 = "114d41g28i8iah5gpb1377rzfmbcsfay9gr9dhhyyj4dqrpdn1df"; libraryHaskellDepends = [ aeson base binary bits cereal cereal-vector containers deepseq DPutils hashable hashtables lens log-domain mtl OrderedBits @@ -17826,28 +17830,26 @@ self: { }) {}; "SciBaseTypes" = callPackage - ({ mkDerivation, aeson, base, binary, cereal, deepseq, hashable - , lens, log-domain, mtl, QuickCheck, semirings, tasty + ({ mkDerivation, aeson, base, binary, cereal, deepseq, DPutils + , hashable, lens, log-domain, mtl, QuickCheck, semirings, tasty , tasty-quickcheck, tasty-th, vector, vector-th-unbox }: mkDerivation { pname = "SciBaseTypes"; - version = "0.1.0.0"; - sha256 = "1c0cgzxhamgswn1zhrarbx5vrmzl160nk8dadzi6mphwd2rv6lfr"; - revision = "1"; - editedCabalFile = "025v2s4097mzqyf5bzzz2xnxcc4nckcvaz72pnrxs3d8bbszd26i"; + version = "0.1.1.0"; + sha256 = "12k2arn3qbgfa8bc344vv02smqj3yd6rqhnpfib3yi43nkbaazqa"; libraryHaskellDepends = [ - aeson base binary cereal deepseq hashable lens log-domain mtl - semirings vector vector-th-unbox + aeson base binary cereal deepseq DPutils hashable lens log-domain + mtl semirings vector vector-th-unbox ]; testHaskellDepends = [ - aeson base binary cereal deepseq hashable lens log-domain mtl - QuickCheck semirings tasty tasty-quickcheck tasty-th vector + aeson base binary cereal deepseq DPutils hashable lens log-domain + mtl QuickCheck semirings tasty tasty-quickcheck tasty-th vector vector-th-unbox ]; benchmarkHaskellDepends = [ - aeson base binary cereal deepseq hashable lens log-domain mtl - semirings vector vector-th-unbox + aeson base binary cereal deepseq DPutils hashable lens log-domain + mtl semirings vector vector-th-unbox ]; description = "Base types and classes for statistics, sciences and humanities"; license = lib.licenses.bsd3; @@ -18224,16 +18226,16 @@ self: { }) {}; "Shpadoinkle" = callPackage - ({ mkDerivation, base, category, containers, ghcjs-dom, jsaddle - , jsaddle-warp, text, transformers, unliftio, wai, wai-app-static - , warp + ({ mkDerivation, base, containers, deepseq, ghcjs-dom, jsaddle + , jsaddle-warp, mtl, text, transformers, unliftio, wai + , wai-app-static, warp }: mkDerivation { pname = "Shpadoinkle"; - version = "0.3.0.0"; - sha256 = "083ly6xpdcf7wgrb3shcw26zk0d8rm8issyvki1rwvd29rwj0k41"; + version = "0.3.2.0"; + sha256 = "1an13ybgayp532vx040bhjccg3kb429zrcrhc38bkvbs6475y3bz"; libraryHaskellDepends = [ - base category containers ghcjs-dom jsaddle jsaddle-warp text + base containers deepseq ghcjs-dom jsaddle jsaddle-warp mtl text transformers unliftio wai wai-app-static warp ]; description = "A programming model for declarative, high performance user interface"; @@ -18242,17 +18244,17 @@ self: { "Shpadoinkle-backend-pardiff" = callPackage ({ mkDerivation, base, compactable, containers, exceptions - , file-embed, ghcjs-dom, jsaddle, lens, monad-control, mtl, random - , semialign, Shpadoinkle, text, these, transformers-base, unliftio + , file-embed, ghcjs-dom, jsaddle, monad-control, mtl, random + , Shpadoinkle, text, transformers-base, unliftio }: mkDerivation { pname = "Shpadoinkle-backend-pardiff"; - version = "0.3.0.0"; - sha256 = "1m12m4qbivh0srdzwzcqr8s6s1hi1blk3x15ljv5c9viriznfy6z"; + version = "0.3.0.1"; + sha256 = "1ghj2464pq36paf3z56hc7q0p2nkfgwqjvfa3yymwfr2xdachqwd"; libraryHaskellDepends = [ base compactable containers exceptions file-embed ghcjs-dom jsaddle - lens monad-control mtl random semialign Shpadoinkle text these - transformers-base unliftio + monad-control mtl random Shpadoinkle text transformers-base + unliftio ]; description = "A Virtual Dom in pure Haskell, based on Html as an Alignable Functor"; license = lib.licenses.bsd3; @@ -18260,17 +18262,17 @@ self: { }) {}; "Shpadoinkle-backend-snabbdom" = callPackage - ({ mkDerivation, base, exceptions, file-embed, ghcjs-dom, jsaddle - , monad-control, mtl, Shpadoinkle, text, transformers-base - , unliftio + ({ mkDerivation, base, containers, exceptions, file-embed + , ghcjs-dom, jsaddle, monad-control, mtl, Shpadoinkle, text + , transformers-base, unliftio }: mkDerivation { pname = "Shpadoinkle-backend-snabbdom"; - version = "0.3.0.1"; - sha256 = "0452znn1q558n1dy52j493y7f9lml57cnqbmdmqv28zq12sxpypm"; + version = "0.3.0.2"; + sha256 = "1hqbfsjlvrkfjf16r5f1jr7fxbki559mbxksqviba80b94wn34ld"; libraryHaskellDepends = [ - base exceptions file-embed ghcjs-dom jsaddle monad-control mtl - Shpadoinkle text transformers-base unliftio + base containers exceptions file-embed ghcjs-dom jsaddle + monad-control mtl Shpadoinkle text transformers-base unliftio ]; description = "Use the high-performance Snabbdom virtual dom library written in JavaScript"; license = lib.licenses.bsd3; @@ -18282,8 +18284,8 @@ self: { ({ mkDerivation, base, compactable, Shpadoinkle, text }: mkDerivation { pname = "Shpadoinkle-backend-static"; - version = "0.2.0.0"; - sha256 = "0kxfsm4g6mwwcrpq8bm83v32jpp97bsvl6ay0ynnmss0yf70ymmi"; + version = "0.2.0.1"; + sha256 = "1lcly4kb6im7m1y25209s7wxdvisc0nyfa33a3fjf078ambqpai1"; libraryHaskellDepends = [ base compactable Shpadoinkle text ]; description = "A backend for rendering Shpadoinkle as Text"; license = lib.licenses.bsd3; @@ -18294,8 +18296,8 @@ self: { ({ mkDerivation, aeson, base, jsaddle, lens, text, unliftio }: mkDerivation { pname = "Shpadoinkle-console"; - version = "0.0.1.3"; - sha256 = "0zkiv0h37a3x3569xfvfzdy0dywxhcfx12jddqf9bpfyqsxmf42a"; + version = "0.0.1.4"; + sha256 = "1agvyr8785y9dmhdcm36mhvg3lq2ksqly38asb7pb8xynhlvllbk"; libraryHaskellDepends = [ aeson base jsaddle lens text unliftio ]; description = "Support for the native browser console"; license = lib.licenses.bsd3; @@ -18319,8 +18321,8 @@ self: { }: mkDerivation { pname = "Shpadoinkle-developer-tools"; - version = "0.0.0.1"; - sha256 = "14lcmxkaxsa42dcyn13cb83lfw48n7139gvppsngzrbn1w9lwrl0"; + version = "0.0.0.2"; + sha256 = "1lcz9xlqxzzv8gq31jcd1lw5l8dw14ixkcg14kq73p0418lwm06z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -18343,8 +18345,8 @@ self: { }: mkDerivation { pname = "Shpadoinkle-disembodied"; - version = "0.0.0.1"; - sha256 = "0hiwiv4l1k1al0d9fjk48fay6c33shf213yc9blwm15mfj5kh77c"; + version = "0.0.0.2"; + sha256 = "1r96j6lx5k28m0wc4x0pdf81zzml6ppdaw5ywdlv85yxcmv1wxsd"; libraryHaskellDepends = [ base directory filepath servant Shpadoinkle Shpadoinkle-backend-static Shpadoinkle-html Shpadoinkle-router text @@ -18389,29 +18391,55 @@ self: { "Shpadoinkle-html" = callPackage ({ mkDerivation, base, bytestring, compactable, containers - , ghcjs-dom, jsaddle, lens, raw-strings-qq, regex-pcre, Shpadoinkle - , stm, template-haskell, text, time, transformers, unliftio + , directory, ghcjs-dom, jsaddle, lens, process, raw-strings-qq + , regex-pcre, Shpadoinkle, stm, template-haskell, text, time + , transformers, unliftio }: mkDerivation { pname = "Shpadoinkle-html"; - version = "0.3.0.0"; - sha256 = "17n675m9gqfhi2rd8c60bcbljd4nknfrwb02zlw9jwgj1kv7l06k"; + version = "0.3.0.2"; + sha256 = "1wi1b4vnag530iz8xzqih1phwgpr96yv3brizmn6yj9j8d0bf5qz"; libraryHaskellDepends = [ - base bytestring compactable containers ghcjs-dom jsaddle lens - raw-strings-qq regex-pcre Shpadoinkle stm template-haskell text - time transformers unliftio + base bytestring compactable containers directory ghcjs-dom jsaddle + lens process raw-strings-qq regex-pcre Shpadoinkle stm + template-haskell text time transformers unliftio ]; description = "A typed, template generated Html DSL, and helpers"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; }) {}; + "Shpadoinkle-isreal" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, deepseq + , directory, filepath, process, random, servant, servant-server + , text, time, warp + }: + mkDerivation { + pname = "Shpadoinkle-isreal"; + version = "0.0.0.2"; + sha256 = "1mvc5q5rvsgvgind9pv7389908ikb80qa704vwrzqb2wg2ir5g78"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers deepseq random servant + servant-server text time + ]; + executableHaskellDepends = [ + aeson base bytestring containers deepseq directory filepath process + random servant servant-server text time warp + ]; + description = "Isreal Swan will make a snowman for you!"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "Shpadoinkle-lens" = callPackage ({ mkDerivation, base, lens, Shpadoinkle, text }: mkDerivation { pname = "Shpadoinkle-lens"; - version = "0.0.0.3"; - sha256 = "1310ipmw2z8gdnvaqx1bydvc4p1iyhc7xv31vwbx2aszhmi873kq"; + version = "0.0.0.4"; + sha256 = "16lkkyjlxczdcdb8wwj4jvkhi9wsr9d9h5ih6kjdxd9r2qn4zi84"; libraryHaskellDepends = [ base lens Shpadoinkle text ]; description = "Lens combinators for Shpadoinkle applications"; license = lib.licenses.bsd3; @@ -18427,8 +18455,8 @@ self: { }: mkDerivation { pname = "Shpadoinkle-router"; - version = "0.3.0.0"; - sha256 = "1wdr71khi7nmyz4ksf7hy6ya470687wmv4x7bvv7qq2z2dsy5ns2"; + version = "0.3.0.1"; + sha256 = "0xy09nklsjypaw2dmzl4dzdkrhdlzip2jw41mj1vm7xdvas7i7f1"; libraryHaskellDepends = [ aeson base bytestring compactable exceptions ghcjs-dom http-api-data http-media http-types jsaddle jsaddle-warp lens @@ -18445,8 +18473,8 @@ self: { ({ mkDerivation, base, lens, Shpadoinkle, streaming, text }: mkDerivation { pname = "Shpadoinkle-streaming"; - version = "0.0.0.1"; - sha256 = "1bvrkyj9l8asczfamw26x1hwj8bcxr7812zjm1m91jg4xzipayv2"; + version = "0.0.0.2"; + sha256 = "1i86299ss25xd1swxd4rz9k5mvxqzhnafiylaawan2fbp2xwqkq2"; libraryHaskellDepends = [ base lens Shpadoinkle streaming text ]; description = "Integration of the streaming library with Shpadoinkle continuations"; license = lib.licenses.bsd3; @@ -18455,20 +18483,21 @@ self: { }) {}; "Shpadoinkle-template" = callPackage - ({ mkDerivation, base, file-embed, html-parse, Shpadoinkle - , Shpadoinkle-backend-static, template-haskell, text + ({ mkDerivation, base, directory, file-embed, html-entities + , html-parse, process, Shpadoinkle, Shpadoinkle-backend-static + , template-haskell, text }: mkDerivation { pname = "Shpadoinkle-template"; - version = "0.0.0.1"; - sha256 = "1iyxb0hnyfcb4fipwrvzr03g3rai5lc5k7sysrd691l0dsh2jill"; + version = "0.0.0.2"; + sha256 = "1alhlc4w9xcyzan0sbsanip3q0yw9pjg094linwwavb211wbcdkj"; libraryHaskellDepends = [ - base html-parse Shpadoinkle Shpadoinkle-backend-static - template-haskell text + base directory html-entities html-parse process Shpadoinkle + Shpadoinkle-backend-static template-haskell text ]; testHaskellDepends = [ - base file-embed html-parse Shpadoinkle Shpadoinkle-backend-static - template-haskell text + base directory file-embed html-entities html-parse process + Shpadoinkle Shpadoinkle-backend-static template-haskell text ]; description = "Read standard file formats into Shpadoinkle with Template Haskell"; license = lib.licenses.bsd3; @@ -18476,19 +18505,20 @@ self: { }) {}; "Shpadoinkle-widgets" = callPackage - ({ mkDerivation, aeson, base, compactable, containers - , edit-distance, email-validate, hspec, jsaddle, mtl, QuickCheck - , quickcheck-classes, quickcheck-classes-base, Shpadoinkle - , Shpadoinkle-html, stm, template-haskell, text, unliftio + ({ mkDerivation, aeson, attoparsec, base, bytestring, compactable + , containers, edit-distance, either, email-validate, hspec, jsaddle + , mtl, QuickCheck, quickcheck-classes, quickcheck-classes-base + , servant, Shpadoinkle, Shpadoinkle-html, stm, template-haskell + , text, transformers, unliftio }: mkDerivation { pname = "Shpadoinkle-widgets"; - version = "0.2.0.0"; - sha256 = "0q82m3gffcw89xyl0h9ayp2v4k9l1zwpnlpq7kvirl1ahhp2iypy"; + version = "0.2.0.1"; + sha256 = "11ncdip5f01d8ng1rgpprl0adrgca19mww86hybckg8v9lxvyfgc"; libraryHaskellDepends = [ - aeson base compactable containers edit-distance email-validate - jsaddle mtl Shpadoinkle Shpadoinkle-html stm template-haskell text - unliftio + aeson attoparsec base bytestring compactable containers + edit-distance either email-validate jsaddle mtl servant Shpadoinkle + Shpadoinkle-html stm template-haskell text transformers unliftio ]; testHaskellDepends = [ base containers hspec QuickCheck quickcheck-classes @@ -20665,8 +20695,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "VulkanMemoryAllocator"; - version = "0.5"; - sha256 = "1gar1xb7hbc452ck8351wikvryradna9bpphzd9kqwk0kx76nl3n"; + version = "0.5.1"; + sha256 = "13savwlcdpvskir5v8yb019cxszrsjrkyisws0w8ddc94a3c9x2c"; libraryHaskellDepends = [ base bytestring transformers vector vulkan ]; @@ -21818,17 +21848,17 @@ self: { "Z-Botan" = callPackage ({ mkDerivation, base, Cabal, directory, filepath, ghc-prim, hspec - , hspec-discover, HUnit, integer-gmp, QuickCheck + , hspec-discover, HUnit, integer-gmp, primitive, QuickCheck , quickcheck-instances, scientific, stm, time, Z-Data, Z-IO }: mkDerivation { pname = "Z-Botan"; - version = "0.3.1.0"; - sha256 = "0920pzs9q105h32d7yp83bblhq0id5vzzw3d2pysg4dd127933xc"; + version = "0.4.0.0"; + sha256 = "0jlw9wk8yhgsqjn3grzkq2a1p90dil1ayx30cvg85c2y96j5x8jn"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ - base ghc-prim integer-gmp scientific stm time Z-Data Z-IO + base ghc-prim integer-gmp primitive scientific stm time Z-Data Z-IO ]; libraryToolDepends = [ hspec-discover ]; testHaskellDepends = [ @@ -21843,17 +21873,18 @@ self: { ({ mkDerivation, base, bytestring, Cabal, case-insensitive , containers, deepseq, ghc-prim, hashable, hspec, hspec-discover , HUnit, integer-gmp, primitive, QuickCheck, quickcheck-instances - , scientific, tagged, template-haskell, time, unordered-containers + , scientific, tagged, template-haskell, time, unicode-collation + , unordered-containers }: mkDerivation { pname = "Z-Data"; - version = "0.8.3.0"; - sha256 = "1y8vgz3jps2vsg5ay9s792knfyk5cvc6549q5li51jaqibsrw99m"; + version = "0.8.7.0"; + sha256 = "0a68ymcgmack4z4zz9vb20g2jgs41ga00fc4612rq9qjywn26yxd"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq ghc-prim hashable integer-gmp primitive QuickCheck scientific tagged - template-haskell time unordered-containers + template-haskell time unicode-collation unordered-containers ]; testHaskellDepends = [ base containers hashable hspec HUnit integer-gmp primitive @@ -21875,8 +21906,8 @@ self: { }: mkDerivation { pname = "Z-IO"; - version = "0.8.1.0"; - sha256 = "08nw9jxg2n8yls5p1dhyy976qbcj5kwv468fq1dijn91f7ylhfix"; + version = "0.8.1.1"; + sha256 = "05d4dbvzdr2sall0sj9yh8hv09lh1af4bqfhnbss2jlj1jc1y1dr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -23964,7 +23995,6 @@ self: { ]; description = "A full-featured library for parsing, validating, and rendering email addresses"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "adhoc-network" = callPackage @@ -24197,29 +24227,6 @@ self: { }: mkDerivation { pname = "aern2-mp"; - version = "0.2.6.0"; - sha256 = "0vfjgcf2pnspaixgxg8av7k0cqv5cqmy161zkgjr822n118an1ch"; - libraryHaskellDepends = [ - base cdar-mBound collect-errors deepseq hspec integer-logarithms - mixed-types-num QuickCheck reflection regex-tdfa template-haskell - ]; - testHaskellDepends = [ - base cdar-mBound collect-errors deepseq hspec integer-logarithms - mixed-types-num QuickCheck reflection regex-tdfa template-haskell - ]; - description = "Multi-precision ball (interval) arithmetic"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "aern2-mp_0_2_7_0" = callPackage - ({ mkDerivation, base, cdar-mBound, collect-errors, deepseq, hspec - , integer-logarithms, mixed-types-num, QuickCheck, reflection - , regex-tdfa, template-haskell - }: - mkDerivation { - pname = "aern2-mp"; version = "0.2.7.0"; sha256 = "1gsqaggg6mpcpl9s3z566gmbynj4l6n1fhni5b0p8pf5hj8n93gg"; libraryHaskellDepends = [ @@ -24242,27 +24249,6 @@ self: { }: mkDerivation { pname = "aern2-real"; - version = "0.2.6.0"; - sha256 = "182vjrbdzjcpbbhmpsmv6i685jrnw94vda37646d1gph5v3hvfw6"; - libraryHaskellDepends = [ - aern2-mp base collect-errors hspec integer-logarithms - mixed-types-num QuickCheck - ]; - testHaskellDepends = [ - aern2-mp base collect-errors hspec integer-logarithms - mixed-types-num QuickCheck - ]; - description = "Real numbers as sequences of MPBalls"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - - "aern2-real_0_2_7_0" = callPackage - ({ mkDerivation, aern2-mp, base, collect-errors, hspec - , integer-logarithms, mixed-types-num, QuickCheck - }: - mkDerivation { - pname = "aern2-real"; version = "0.2.7.0"; sha256 = "0dsph1775rifr9vvx4w7v55bryqmh04fhk6nyk7d91yhn1sf6wc9"; libraryHaskellDepends = [ @@ -25497,21 +25483,6 @@ self: { }) {}; "agda2lagda" = callPackage - ({ mkDerivation, base, directory, filepath, optparse-applicative }: - mkDerivation { - pname = "agda2lagda"; - version = "0.2020.11.1"; - sha256 = "0yl44jdczy9306b5ifd8iwchr8izna8sd5v2h2qm9ns909wcs1l8"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base directory filepath optparse-applicative - ]; - description = "Translate .agda files into .lagda.tex files."; - license = lib.licenses.publicDomain; - }) {}; - - "agda2lagda_0_2021_6_1" = callPackage ({ mkDerivation, base, directory, filepath, goldplate , optparse-applicative, process }: @@ -25528,7 +25499,6 @@ self: { testToolDepends = [ goldplate ]; description = "Translate .agda files into .lagda.tex files."; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; }) {}; "agentx" = callPackage @@ -29067,6 +29037,8 @@ self: { ]; description = "Provides conduits to upload data to S3 using the Multipart API"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "amazonka-sagemaker" = callPackage @@ -32676,8 +32648,8 @@ self: { }: mkDerivation { pname = "arion-compose"; - version = "0.1.2.0"; - sha256 = "1vginzc90xl8fs1pr9qvw7fjj207vjb1k3rxa341hq7q5pri2y3d"; + version = "0.1.3.0"; + sha256 = "1pw0vqx1y3zgq303gdgd3vkz95mqrv8hl0pfkw6kyc49hj7l864y"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -32795,15 +32767,15 @@ self: { "arithmoi" = callPackage ({ mkDerivation, array, base, chimera, constraints, containers - , deepseq, exact-pi, gauge, integer-gmp, integer-logarithms - , integer-roots, mod, QuickCheck, quickcheck-classes, random - , semirings, smallcheck, tasty, tasty-hunit, tasty-quickcheck - , tasty-rerun, tasty-smallcheck, transformers, vector + , deepseq, exact-pi, integer-gmp, integer-logarithms, integer-roots + , mod, QuickCheck, quickcheck-classes, random, semirings + , smallcheck, tasty, tasty-bench, tasty-hunit, tasty-quickcheck + , tasty-rerun, tasty-smallcheck, transformers, vector, vector-sized }: mkDerivation { pname = "arithmoi"; - version = "0.11.0.1"; - sha256 = "1dz6gpwnyw02lff8xh5vmf1vsknnvnd3vh3iix0r6f1hkf03xi8y"; + version = "0.12.0.0"; + sha256 = "1lghgr4z2vhafj8d8971pdghih6r5qq5xlc0b87jmazyhzz95w3f"; configureFlags = [ "-f-llvm" ]; libraryHaskellDepends = [ array base chimera constraints containers deepseq exact-pi @@ -32812,12 +32784,13 @@ self: { ]; testHaskellDepends = [ base containers exact-pi integer-gmp integer-roots mod QuickCheck - quickcheck-classes semirings smallcheck tasty tasty-hunit + quickcheck-classes random semirings smallcheck tasty tasty-hunit tasty-quickcheck tasty-rerun tasty-smallcheck transformers vector + vector-sized ]; benchmarkHaskellDepends = [ - array base constraints containers deepseq gauge integer-logarithms - mod random semirings vector + array base constraints containers deepseq integer-logarithms mod + random semirings tasty-bench vector ]; description = "Efficient basic number-theoretic functions"; license = lib.licenses.mit; @@ -35118,7 +35091,6 @@ self: { ]; description = "Parse IP data types with attoparsec"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "attoparsec-iso8601" = callPackage @@ -35259,7 +35231,6 @@ self: { ]; description = "URI parser / printer using attoparsec"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "attoparsec-varword" = callPackage @@ -35465,6 +35436,41 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "aura_3_2_5" = callPackage + ({ mkDerivation, aeson, algebraic-graphs, aur, base, bytestring + , containers, filepath, hashable, http-client, http-client-tls + , http-types, language-bash, megaparsec, network-uri + , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal + , rio, scheduler, stm, tasty, tasty-hunit, text, time, transformers + , typed-process, versions + }: + mkDerivation { + pname = "aura"; + version = "3.2.5"; + sha256 = "1zrsjcvmhh3y0pahnz2fr944j2xz8sv4dcd9xz08vci4x1lm87hr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson algebraic-graphs aur base bytestring containers filepath + hashable http-client http-types language-bash megaparsec + network-uri prettyprinter prettyprinter-ansi-terminal rio scheduler + stm text time transformers typed-process versions + ]; + executableHaskellDepends = [ + aeson aur base bytestring containers http-client http-client-tls + megaparsec optparse-applicative prettyprinter + prettyprinter-ansi-terminal rio scheduler text transformers + typed-process versions + ]; + testHaskellDepends = [ + base bytestring containers megaparsec rio tasty tasty-hunit text + versions + ]; + description = "A secure package manager for Arch Linux and the AUR"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "authenticate" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring , case-insensitive, conduit, containers, html-conduit, http-conduit @@ -36212,8 +36218,8 @@ self: { }: mkDerivation { pname = "aws-cloudfront-signed-cookies"; - version = "0.2.0.6"; - sha256 = "19kzrmjw3vfv3v1s35fqdvixlxha43sdb29d60fwjkzvg7al9scv"; + version = "0.2.0.8"; + sha256 = "07640asv46gvqqzv8d050x19b2j6wjasm98gpy6047aqg1a6f3ac"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38280,7 +38286,6 @@ self: { ]; description = "Base62 encoding and decoding"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "base64" = callPackage @@ -42191,6 +42196,43 @@ self: { license = lib.licenses.gpl3Only; }) {inherit (pkgs) snappy;}; + "biscuit-haskell" = callPackage + ({ mkDerivation, async, attoparsec, base, base16-bytestring, base64 + , bytestring, cereal, containers, libsodium, mtl + , parser-combinators, primitive, protobuf, random, regex-tdfa + , tasty, tasty-hunit, template-haskell, text, th-lift-instances + , time, validation-selective + }: + mkDerivation { + pname = "biscuit-haskell"; + version = "0.1.0.0"; + sha256 = "0h37sl493ribsvqw98xy4g9vii3xc3ap6vvjffn7xg29b62s0lrx"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async attoparsec base base16-bytestring base64 bytestring cereal + containers libsodium mtl parser-combinators primitive protobuf + random regex-tdfa template-haskell text th-lift-instances time + validation-selective + ]; + executableHaskellDepends = [ + async attoparsec base base16-bytestring base64 bytestring cereal + containers libsodium mtl parser-combinators primitive protobuf + random template-haskell text th-lift-instances time + validation-selective + ]; + testHaskellDepends = [ + async attoparsec base base16-bytestring base64 bytestring cereal + containers libsodium mtl parser-combinators primitive protobuf + random tasty tasty-hunit template-haskell text th-lift-instances + time validation-selective + ]; + description = "Library support for the Biscuit security token"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "bisect-binary" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, hashable , haskeline, integer-logarithms, optparse-applicative, process @@ -44117,8 +44159,8 @@ self: { }: mkDerivation { pname = "blucontrol"; - version = "0.3.1.0"; - sha256 = "035lrn1j6hrvl5vs5k0q1hb3zwbqh5bvxmfxvjvv9lncv8iy2nd9"; + version = "0.5.0.0"; + sha256 = "1xqwhzxgjn7fza46whp8rdpvsglly577hxjxlaqb67174rq29zgi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -47097,8 +47139,8 @@ self: { }: mkDerivation { pname = "byline"; - version = "1.1.0.1"; - sha256 = "1vj17x2czfks5bdns8181iw7rbfghk9pgx5f75xwzn9p6xycg9hy"; + version = "1.1.1"; + sha256 = "0yy9hd8yhpi175fgnp8cd4h0bifx2zvy82jmbkd28kpbgw6b49vi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -47206,7 +47248,6 @@ self: { ]; description = "Serialize to a small byte arrays"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "bytedump" = callPackage @@ -47352,7 +47393,6 @@ self: { ]; description = "Nonresumable byte parser"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "bytestring_0_11_1_0" = callPackage @@ -49037,8 +49077,8 @@ self: { }: mkDerivation { pname = "cabal-rpm"; - version = "2.0.8"; - sha256 = "18ryg2qv1ppxkylgniw4iava9gh410pp6ibm1362ij52128z6rhz"; + version = "2.0.9"; + sha256 = "1r6a0dki4wsrmq5xfjb9bkj0dl7cnhwdf46427k71ay90hmc6ncq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -52232,24 +52272,21 @@ self: { "cdar-mBound" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, integer-gmp - , parallel, QuickCheck, smallcheck, tasty, tasty-hunit - , tasty-quickcheck, tasty-smallcheck + , smallcheck, tasty, tasty-hunit, tasty-quickcheck + , tasty-smallcheck }: mkDerivation { pname = "cdar-mBound"; - version = "0.1.0.2"; - sha256 = "1qzpb9kwswln7vbj0v0qm6fsi6v3v9xx701hyfg12y3f9hz096zf"; + version = "0.1.0.4"; + sha256 = "1p7ri7vfvj3ym0038aq12szs6jgdkq8a4730i67appv9lmxgycfn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers deepseq integer-gmp ]; - executableHaskellDepends = [ base containers deepseq integer-gmp ]; + executableHaskellDepends = [ base ]; testHaskellDepends = [ - base containers deepseq integer-gmp QuickCheck smallcheck tasty - tasty-hunit tasty-quickcheck tasty-smallcheck - ]; - benchmarkHaskellDepends = [ - base containers criterion deepseq integer-gmp parallel + base smallcheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck ]; + benchmarkHaskellDepends = [ base criterion ]; description = "Exact real arithmetic using Centred Dyadic Approximations"; license = lib.licenses.bsd3; }) {}; @@ -54816,6 +54853,25 @@ self: { broken = true; }) {}; + "circular_0_4_0_0" = callPackage + ({ mkDerivation, aeson, base, criterion, hspec, primitive + , QuickCheck, quickcheck-instances, vector + }: + mkDerivation { + pname = "circular"; + version = "0.4.0.0"; + sha256 = "1542z19mf0ck3x8n62slw88rbmqy8dgwjlsz145a0i8lb8f79kn1"; + libraryHaskellDepends = [ aeson base primitive vector ]; + testHaskellDepends = [ + aeson base hspec primitive QuickCheck quickcheck-instances vector + ]; + benchmarkHaskellDepends = [ base criterion vector ]; + description = "Circular fixed-sized mutable vectors"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "cirru-parser" = callPackage ({ mkDerivation, aeson, base, text, vector }: mkDerivation { @@ -54905,7 +54961,7 @@ self: { license = lib.licenses.bsd2; }) {}; - "citeproc_0_4" = callPackage + "citeproc_0_4_0_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , case-insensitive, containers, data-default, Diff, directory , file-embed, filepath, mtl, pandoc-types, pretty, safe, scientific @@ -54914,8 +54970,8 @@ self: { }: mkDerivation { pname = "citeproc"; - version = "0.4"; - sha256 = "0ca6xyv0pa0w10pzn7zmpvg6583xjs8ffj16ykkrw9gjd4nlginh"; + version = "0.4.0.1"; + sha256 = "13hgbcbr7jbyfbxp8fsc43c2wq4fhlbxzqwh1plfkdi5n9bif1lv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -57531,8 +57587,8 @@ self: { }: mkDerivation { pname = "cobot-io"; - version = "0.1.3.19"; - sha256 = "1gs4q04iyzzfwij58bbmhz2app3gf4xj0dnd4x4bhkgwj7gmvf4m"; + version = "0.1.3.20"; + sha256 = "075s6rhzyldm5c9g27ljwhs8xyxghk8cpm2742l3h69j9y7v3xnc"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-msgpack deepseq http-conduit hyraxAbif lens linear mtl split text vector @@ -59258,6 +59314,8 @@ self: { pname = "compact"; version = "0.2.0.0"; sha256 = "0xv24vd2h76928355rr8gzdbkyn2j17yf6wjyghnzw7qyhsbb9h3"; + revision = "1"; + editedCabalFile = "1013dkawaw3c6hvlfn9x584pq8z65fvbnp79dl6ll6r0a75rivvm"; libraryHaskellDepends = [ base binary bytestring ghc-compact ]; testHaskellDepends = [ base directory ]; description = "Non-GC'd, contiguous storage for immutable data structures"; @@ -62658,8 +62716,8 @@ self: { }: mkDerivation { pname = "consumers"; - version = "2.2.0.3"; - sha256 = "0jvh3mf7jmrv3zjplc5cjmpyj7h15573l6dlyzn3c2jhj61zjwkk"; + version = "2.2.0.4"; + sha256 = "0rssm2ygr395djjzkrzcq3vylc83k58flwcpqb4cb3w1id55ph5r"; libraryHaskellDepends = [ base containers exceptions extra hpqtypes lifted-base lifted-threads log-base monad-control monad-time mtl stm time @@ -62772,12 +62830,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "containers-good-graph" = callPackage + ({ mkDerivation, array, base, containers, deepseq }: + mkDerivation { + pname = "containers-good-graph"; + version = "0.6.4.1"; + sha256 = "1bv4v8q9gi1fa46c3pqj0kyl28kbyn55i038d0fxqbi225pdhhan"; + libraryHaskellDepends = [ array base containers deepseq ]; + testHaskellDepends = [ array base containers deepseq ]; + description = "Data.Graph, but it doesn't suck!"; + license = lib.licenses.bsd3; + }) {}; + "containers-unicode-symbols" = callPackage ({ mkDerivation, base, base-unicode-symbols, containers }: mkDerivation { pname = "containers-unicode-symbols"; - version = "0.3.1.2"; - sha256 = "006znsrwz3sssvg53mail2xd98hq6y4l83140sd2fzyg4df25js7"; + version = "0.3.1.3"; + sha256 = "1qz404fjcc00c2zxphzrm1r8i9q3hd8h9lndhd9ddxy3cx3jw8r6"; libraryHaskellDepends = [ base base-unicode-symbols containers ]; description = "Unicode alternatives for common functions and operators"; license = lib.licenses.bsd3; @@ -64516,8 +64586,8 @@ self: { ({ mkDerivation, base, containers, directory, parallel }: mkDerivation { pname = "cpsa"; - version = "3.6.6"; - sha256 = "1mg85yjx4fjsnzfmbz0gh78agis44nqqmnc8rwdqkrp6vka1v9ks"; + version = "3.6.7"; + sha256 = "113w03i4a5xxxr9qc9zd2b00sp0m8lbf1mpgwf5zam3jjxzcq4x0"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -65603,6 +65673,8 @@ self: { ]; description = "Another bloated standard library"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "cruncher-types" = callPackage @@ -65797,8 +65869,8 @@ self: { pname = "crypto-enigma"; version = "0.1.1.6"; sha256 = "07qxrpwg9r2w2l0d2nrvn703vzsfhchznly93bnr2pfpbwj4iv2z"; - revision = "4"; - editedCabalFile = "0436kl0gsy0hj7dfrqmwz95q3k31af731q484yx2gj9zcma1h1vp"; + revision = "6"; + editedCabalFile = "1zp6mx1d0dbffc046770mzl1zmwvz4h54xznmmqzbijmnmsc0y3c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers split text ]; @@ -72997,8 +73069,8 @@ self: { ({ mkDerivation, aeson, base, bytestring }: mkDerivation { pname = "deriving-aeson"; - version = "0.2.6.1"; - sha256 = "014f3jsaiwqkz2l0jap8shwq3rdn1hq14ahmq0hm3l4c98vznjra"; + version = "0.2.7"; + sha256 = "02mx8z1cgqn9wgwcp94am2g655hhn7sn12sikmm8jhbldnyv3ziz"; libraryHaskellDepends = [ aeson base ]; testHaskellDepends = [ aeson base bytestring ]; description = "Type driven generic aeson instance customisation"; @@ -73533,7 +73605,7 @@ self: { maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; - "dhall" = callPackage + "dhall_1_38_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write , base, bytestring, case-insensitive, cborg, cborg-json, containers , contravariant, cryptonite, data-fix, deepseq, Diff, directory @@ -73587,6 +73659,62 @@ self: { doCheck = false; description = "A configuration language guaranteed to terminate"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ Gabriel439 ]; + }) {}; + + "dhall" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write + , base, bytestring, case-insensitive, cborg, cborg-json, containers + , contravariant, cryptonite, data-fix, deepseq, Diff, directory + , doctest, dotgen, either, exceptions, filepath, foldl, gauge + , generic-random, half, hashable, haskeline, http-client + , http-client-tls, http-types, lens-family-core, megaparsec, memory + , mmorph, mockery, mtl, network-uri, optparse-applicative + , parser-combinators, parsers, pretty-simple, prettyprinter + , prettyprinter-ansi-terminal, profunctors, QuickCheck + , quickcheck-instances, repline, scientific, serialise + , special-values, spoon, tasty, tasty-expected-failure, tasty-hunit + , tasty-quickcheck, tasty-silver, template-haskell, text + , text-manipulate, th-lift-instances, transformers + , transformers-compat, turtle, unordered-containers, uri-encode + , vector + }: + mkDerivation { + pname = "dhall"; + version = "1.39.0"; + sha256 = "1by2d84fbckspczddl4npfsf89q6nprmbg0i5g8yr1psp0fpl4ab"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal atomic-write base bytestring + case-insensitive cborg cborg-json containers contravariant + cryptonite data-fix deepseq Diff directory dotgen either exceptions + filepath half hashable haskeline http-client http-client-tls + http-types lens-family-core megaparsec memory mmorph mtl + network-uri optparse-applicative parser-combinators parsers + pretty-simple prettyprinter prettyprinter-ansi-terminal profunctors + repline scientific serialise template-haskell text text-manipulate + th-lift-instances transformers transformers-compat + unordered-containers uri-encode vector + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring cborg containers data-fix deepseq directory doctest + either filepath foldl generic-random http-client http-client-tls + lens-family-core megaparsec mockery prettyprinter QuickCheck + quickcheck-instances scientific serialise special-values spoon + tasty tasty-expected-failure tasty-hunit tasty-quickcheck + tasty-silver template-haskell text transformers turtle + unordered-containers vector + ]; + benchmarkHaskellDepends = [ + base bytestring containers directory gauge text + ]; + doCheck = false; + description = "A configuration language guaranteed to terminate"; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; @@ -73596,10 +73724,8 @@ self: { }: mkDerivation { pname = "dhall-bash"; - version = "1.0.36"; - sha256 = "0hg45xjl1pcla9xbds40qrxcx2h6b4ysw8kbx8hpnaqaazr2jrw0"; - revision = "1"; - editedCabalFile = "1jc74gydr3yx01xp1a69a3g9mbfqyzsmv1053xm51bcxxv6p6z9d"; + version = "1.0.37"; + sha256 = "0gm6zamh8kgrc2d00cjf2ijb49ic3z6rlk0ngmig8hckmsy63w1d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73635,17 +73761,15 @@ self: { "dhall-docs" = callPackage ({ mkDerivation, base, bytestring, containers, cryptonite, dhall - , directory, doctest, file-embed, filepath, foldl, lens-family-core - , lucid, megaparsec, memory, mmark, mtl, optparse-applicative, path - , path-io, pretty, prettyprinter, tasty, tasty-hunit, tasty-silver - , text, transformers, turtle + , directory, doctest, file-embed, filepath, foldl, hashable + , lens-family-core, lucid, megaparsec, memory, mmark, mtl + , optparse-applicative, path, path-io, pretty, prettyprinter, tasty + , tasty-hunit, tasty-silver, text, transformers, turtle }: mkDerivation { pname = "dhall-docs"; - version = "1.0.5"; - sha256 = "00s1vhwilnr6hvv56w98kc1md08lw6v80v8a7yhwrmg9qggwdc12"; - revision = "1"; - editedCabalFile = "0y8a02jxz5cap0q4b2106ck4av7haxqlv5vjhm0nmrsq10cl4nss"; + version = "1.0.6"; + sha256 = "004n8kh8riw67aqwp6z9199jwv2c9r1dbkg92s71vd9zc04wxljv"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -73657,7 +73781,8 @@ self: { executableHaskellDepends = [ base dhall ]; testHaskellDepends = [ base bytestring containers dhall directory doctest filepath foldl - path path-io pretty tasty tasty-hunit tasty-silver text turtle + hashable path path-io pretty tasty tasty-hunit tasty-silver text + turtle ]; description = "Generate HTML docs from a dhall package"; license = lib.licenses.bsd3; @@ -73708,8 +73833,8 @@ self: { }: mkDerivation { pname = "dhall-json"; - version = "1.7.6"; - sha256 = "1fl5ngp1qh77qr27ax5009siy20cas6fm55776zhs82zb96sli0n"; + version = "1.7.7"; + sha256 = "163600cr04a5c9gjqg0846wwjp4wl61yhfg80zvsadkaq5zfzlll"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73751,17 +73876,15 @@ self: { "dhall-lsp-server" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , data-default, dhall, dhall-json, directory, doctest, filepath - , haskell-lsp, haskell-lsp-types, hslogger, lens, lsp-test + , haskell-lsp, haskell-lsp-types, hslogger, hspec, lens, lsp-test , megaparsec, mtl, network-uri, optparse-applicative, prettyprinter , QuickCheck, rope-utf16-splay, tasty, tasty-hspec, text , transformers, unordered-containers, uri-encode }: mkDerivation { pname = "dhall-lsp-server"; - version = "1.0.14"; - sha256 = "1jy80w3lr6c0hvn0525h5kn6fh9rj6ir942hdkilrzd9farg6qj9"; - revision = "1"; - editedCabalFile = "10947mmbwy5fg52s63cs7lqa6hydrg3w8ka7rfkpdiqn2q9f146r"; + version = "1.0.15"; + sha256 = "0bq6k92g22vdym9zyj95gx052yyzvgr1jv7yszlcj8p5angbxdqy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73772,7 +73895,7 @@ self: { ]; executableHaskellDepends = [ base optparse-applicative ]; testHaskellDepends = [ - base directory doctest filepath haskell-lsp-types lsp-test + base directory doctest filepath haskell-lsp-types hspec lsp-test QuickCheck tasty tasty-hspec text ]; description = "Language Server Protocol (LSP) server for Dhall"; @@ -73786,10 +73909,8 @@ self: { }: mkDerivation { pname = "dhall-nix"; - version = "1.1.20"; - sha256 = "14d9icvgmrphnbjjwlskh88p7vgphgb0xqd91p217bf2xhl9k2xd"; - revision = "2"; - editedCabalFile = "1w90jrkzmbv5nasafkkv0kyfmnqkngldx2lr891113h2mqbbr3wx"; + version = "1.1.21"; + sha256 = "0yqqjq8yqswcaiqrrgx37rlwvxgciwhvird34hsaq4fr3kbjgv4h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73812,10 +73933,8 @@ self: { }: mkDerivation { pname = "dhall-nixpkgs"; - version = "1.0.4"; - sha256 = "0yr7z17dvmr1zipk29fmzm46myxxsz514587n6a7h00c56dyvnc3"; - revision = "1"; - editedCabalFile = "1y08jxg51sbxx0i7ra45ii2v81plzf4hssmwlrw35l8n5gib1vcg"; + version = "1.0.5"; + sha256 = "10gvkw2rdmz7pgr9675xqnhkgi8pwjid77mwsriid81d703z2b6j"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -73835,8 +73954,8 @@ self: { }: mkDerivation { pname = "dhall-openapi"; - version = "1.0.0"; - sha256 = "1dg1hj8yfm08bzzirzg6cq26vkxv6i86rrf96a73pb1hpz3jjq7j"; + version = "1.0.1"; + sha256 = "1n34amb97dqpvz0s3mhqb46gjq1ix1gicsq700z6v6y7xssrgbz2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73855,19 +73974,16 @@ self: { "dhall-recursive-adt" = callPackage ({ mkDerivation, base, data-fix, dhall, either, hedgehog - , neat-interpolation, recursion-schemes, tasty, tasty-hedgehog - , tasty-hunit + , recursion-schemes, tasty, tasty-hedgehog, tasty-hunit, yasi }: mkDerivation { pname = "dhall-recursive-adt"; - version = "0.1.0.0"; - sha256 = "01wk6xsakbhsx14s59f0rj32mlccgxgc29a3n5d3b923yd5w64zm"; - revision = "1"; - editedCabalFile = "0gj4dsl70wjn4bpi62dqcqc9y9wwj2c9w6rai620ps4ykg36pygb"; + version = "0.1.0.1"; + sha256 = "09s3m86vflj5im2walab8d0wpvihsvxc5mzy55m10pfzr3gxsd11"; libraryHaskellDepends = [ base data-fix dhall recursion-schemes ]; testHaskellDepends = [ - base dhall either hedgehog neat-interpolation recursion-schemes - tasty tasty-hedgehog tasty-hunit + base dhall either hedgehog recursion-schemes tasty tasty-hedgehog + tasty-hunit yasi ]; description = "Convert recursive ADTs from and to Dhall"; license = lib.licenses.cc0; @@ -73931,8 +74047,8 @@ self: { }: mkDerivation { pname = "dhall-yaml"; - version = "1.2.6"; - sha256 = "0v6f513hxn382h4l8hyj9gxara3xdfcrldzri0i3yjvir62bkicm"; + version = "1.2.7"; + sha256 = "17fpxjlhmjnra92l8iv4k40bxbx1plmhkijf6axxkjyhfh0ax303"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73969,6 +74085,7 @@ self: { description = "Parse a DHCP lease file"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "dhrun" = callPackage @@ -74475,6 +74592,8 @@ self: { pname = "diagrams-lib"; version = "1.4.4"; sha256 = "09np7kj8si8kcb854f95a0cq392mgbxif8lnazbpfsa1k87d9vzy"; + revision = "1"; + editedCabalFile = "1c7kpnbvxwdcmk5znqyig3l6s986ppj168ck5v72dfbp8cjvwa8i"; libraryHaskellDepends = [ active adjunctions array base bytestring cereal colour containers data-default-class diagrams-core diagrams-solve directory @@ -74604,6 +74723,8 @@ self: { pname = "diagrams-rasterific"; version = "1.4.2.1"; sha256 = "09a1jnpc4kplg1yhv5kxhi0ph22m5xyr0vmnjv2c5wlz72c72z2z"; + revision = "1"; + editedCabalFile = "1nc12hm4qbj2lmbpk3a77cd46n5bcf20vwd075qj2vglbca2yl9b"; libraryHaskellDepends = [ base bytestring containers data-default-class diagrams-core diagrams-lib file-embed filepath FontyFruity hashable JuicyPixels @@ -74673,8 +74794,8 @@ self: { pname = "diagrams-svg"; version = "1.4.3"; sha256 = "1ysv6cz0fngrndl4wjmw4hrdj2rik5fxa1dkxzwnlgf1xwpvxgk8"; - revision = "2"; - editedCabalFile = "07149rnzc8787mwh0aac5hfg9f41dxgs5wc9yv60fmgk9h5qnw1n"; + revision = "3"; + editedCabalFile = "19n3g9wvp2fj4dlz3ssyjqx1b6ihskg5s595x9z2c99bpbzyykkv"; libraryHaskellDepends = [ base base64-bytestring bytestring colour containers diagrams-core diagrams-lib filepath hashable JuicyPixels lens monoid-extras mtl @@ -76077,8 +76198,8 @@ self: { }: mkDerivation { pname = "discord-haskell"; - version = "1.8.7"; - sha256 = "0nby3267nhdgc8692k5c28yy0a2bzvl84dn54sg25j6nchzs991g"; + version = "1.8.8"; + sha256 = "0fvj9m59gsdicl061xlkqq8hrwsksyrysjdh5ijbv8gaql99k17v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -77311,18 +77432,6 @@ self: { }) {}; "dlist" = callPackage - ({ mkDerivation, base, Cabal, deepseq, QuickCheck }: - mkDerivation { - pname = "dlist"; - version = "0.8.0.8"; - sha256 = "0va9xk8g2iag24x042q3w6z77xdqd91112kh0piq8cwd0qccyabi"; - libraryHaskellDepends = [ base deepseq ]; - testHaskellDepends = [ base Cabal QuickCheck ]; - description = "Difference lists"; - license = lib.licenses.bsd3; - }) {}; - - "dlist_1_0" = callPackage ({ mkDerivation, base, deepseq, QuickCheck }: mkDerivation { pname = "dlist"; @@ -77332,7 +77441,6 @@ self: { testHaskellDepends = [ base QuickCheck ]; description = "Difference lists"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "dlist-instances" = callPackage @@ -78483,8 +78591,8 @@ self: { }: mkDerivation { pname = "domain"; - version = "0.1.1"; - sha256 = "0ykf1bxd0xmgdhkvd8rp14p4zccpwp5ywj2yiyh6mpp4sp03qwiw"; + version = "0.1.1.1"; + sha256 = "1vy789dv1lpha2bxvr0x1vk2vvgb9z43abkqi1rbj2vvirqsbr1n"; libraryHaskellDepends = [ attoparsec base bytestring domain-core foldl hashable parser-combinators template-haskell template-haskell-compat-v0208 @@ -78541,8 +78649,8 @@ self: { }: mkDerivation { pname = "domain-optics"; - version = "0.1"; - sha256 = "0nivzn3nw30n1wb0i2j9qzxfmqcyknc187z3rkfyz5a5y7iq7x4m"; + version = "0.1.0.1"; + sha256 = "1ypsnwy9rv9yldyc2v5w6q2az87dmj9dyalsmg7nnymaip4jm1dm"; libraryHaskellDepends = [ base domain-core optics-core template-haskell template-haskell-compat-v0208 text th-lego unordered-containers @@ -81965,8 +82073,8 @@ self: { ({ mkDerivation, base, containers, doctest }: mkDerivation { pname = "either-list-functions"; - version = "0.0.4.4"; - sha256 = "1kh10iykk6gqzl78smrwv1zl8dcy0ns2raisx5qchcvrdgshzdiy"; + version = "0.0.4.5"; + sha256 = "1q77nq24sxig4xangcxzyg3dzm9yphj5w5l143q84am098hp0vkn"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base doctest ]; description = "Functions involving lists of Either"; @@ -83001,6 +83109,24 @@ self: { license = lib.licenses.gpl3Plus; }) {}; + "elynx_0_5_1_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, elynx-tools + , optparse-applicative, slynx, tlynx + }: + mkDerivation { + pname = "elynx"; + version = "0.5.1.0"; + sha256 = "05i3g1c7kdnji46y17215nv9vk21w3zi26z1ngqa8dnfswfx1d0i"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base bytestring elynx-tools optparse-applicative slynx tlynx + ]; + description = "Validate and (optionally) redo ELynx analyses"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "elynx-markov" = callPackage ({ mkDerivation, async, attoparsec, base, bytestring, containers , elynx-seq, elynx-tools, hmatrix, hspec, integration @@ -83022,6 +83148,28 @@ self: { license = lib.licenses.gpl3Plus; }) {}; + "elynx-markov_0_5_1_0" = callPackage + ({ mkDerivation, async, attoparsec, base, bytestring, containers + , elynx-seq, elynx-tools, hmatrix, hspec, integration + , math-functions, mwc-random, primitive, statistics, vector + }: + mkDerivation { + pname = "elynx-markov"; + version = "0.5.1.0"; + sha256 = "1wpq62in9zlap01an6swdf9n1x2pall1vfh4hw5r7zpn7vik1mfx"; + libraryHaskellDepends = [ + async attoparsec base bytestring containers elynx-seq hmatrix + integration math-functions mwc-random primitive statistics vector + ]; + testHaskellDepends = [ + base containers elynx-tools hmatrix hspec mwc-random vector + ]; + benchmarkHaskellDepends = [ base ]; + description = "Simulate molecular sequences along trees"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "elynx-nexus" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hspec }: mkDerivation { @@ -83034,6 +83182,19 @@ self: { license = lib.licenses.gpl3Plus; }) {}; + "elynx-nexus_0_5_1_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, hspec }: + mkDerivation { + pname = "elynx-nexus"; + version = "0.5.1.0"; + sha256 = "0inl9bw7793zbji42gasj4vckigzmr1l4yqf66f9ss958pmgh5n9"; + libraryHaskellDepends = [ attoparsec base bytestring ]; + testHaskellDepends = [ base hspec ]; + description = "Import and export Nexus files"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "elynx-seq" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , elynx-tools, hspec, matrices, mwc-random, parallel, primitive @@ -83054,6 +83215,27 @@ self: { license = lib.licenses.gpl3Plus; }) {}; + "elynx-seq_0_5_1_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, containers + , elynx-tools, hspec, matrices, mwc-random, parallel, primitive + , vector, vector-th-unbox, word8 + }: + mkDerivation { + pname = "elynx-seq"; + version = "0.5.1.0"; + sha256 = "069fj6ap0yj5bn2r3d5bk85dy02r3fr8prd5hvky6l5gxvpvzcm0"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring containers matrices mwc-random + parallel primitive vector vector-th-unbox word8 + ]; + testHaskellDepends = [ + base bytestring elynx-tools hspec matrices vector + ]; + description = "Handle molecular sequences"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "elynx-tools" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , bytestring, cryptohash-sha256, deepseq, directory, fast-logger @@ -83076,6 +83258,29 @@ self: { license = lib.licenses.gpl3Plus; }) {}; + "elynx-tools_0_5_1_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base16-bytestring + , bytestring, cryptohash-sha256, deepseq, directory, hmatrix + , monad-control, monad-logger, mwc-random, optparse-applicative + , primitive, template-haskell, text, time, transformers + , transformers-base, vector, zlib + }: + mkDerivation { + pname = "elynx-tools"; + version = "0.5.1.0"; + sha256 = "0djfxqxc5aivvljzi7c8xabi7k23y7gnk5wqmdvw4riqpsc7by0y"; + libraryHaskellDepends = [ + aeson attoparsec base base16-bytestring bytestring + cryptohash-sha256 deepseq directory hmatrix monad-control + monad-logger mwc-random optparse-applicative primitive + template-haskell text time transformers transformers-base vector + zlib + ]; + description = "Tools for ELynx"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "elynx-tree" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, comonad , containers, criterion, deepseq, double-conversion, elynx-nexus @@ -83101,6 +83306,32 @@ self: { license = lib.licenses.gpl3Plus; }) {}; + "elynx-tree_0_5_1_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, comonad + , containers, criterion, deepseq, double-conversion, elynx-nexus + , elynx-tools, hspec, math-functions, microlens, mwc-random + , parallel, primitive, QuickCheck, statistics + }: + mkDerivation { + pname = "elynx-tree"; + version = "0.5.1.0"; + sha256 = "117my1fv16yw51qf0aa7mi6311d98jfmpvpsivwxyayhwi55g2q6"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring comonad containers deepseq + double-conversion elynx-nexus math-functions mwc-random parallel + primitive statistics + ]; + testHaskellDepends = [ + attoparsec base bytestring containers elynx-tools hspec QuickCheck + ]; + benchmarkHaskellDepends = [ + base criterion elynx-tools microlens mwc-random parallel + ]; + description = "Handle phylogenetic trees"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "ema" = callPackage ({ mkDerivation, aeson, async, base, blaze-html, blaze-markup , commonmark, commonmark-extensions, commonmark-pandoc, containers @@ -83766,6 +83997,8 @@ self: { pname = "entropy"; version = "0.4.1.6"; sha256 = "0qmzz0zgad13zl0kjrxz6cxg8ckn2w8saas2a2j72vbafpzmkixd"; + revision = "1"; + editedCabalFile = "0jyyyn1cfi1cjisbgym90nw2vx2082ghvwg54ibnjzbii9aj7fj9"; setupHaskellDepends = [ base Cabal directory filepath process ]; libraryHaskellDepends = [ base bytestring unix ]; description = "A platform independent entropy source"; @@ -84453,8 +84686,8 @@ self: { pname = "equational-reasoning"; version = "0.7.0.0"; sha256 = "0l6gyq43byh6cy2pblb9a4qjy7w5k9maa97c076dxlsf53myj01h"; - revision = "1"; - editedCabalFile = "1a8dw9givg0przqrm33kkmff9r0fdv1ih6ik3dqa99ww71cc8q66"; + revision = "2"; + editedCabalFile = "0zlcd62kapcybli65w47mb1kg5fnyzgdnf7kr8y8qgslg0lidzpp"; libraryHaskellDepends = [ base containers template-haskell th-desugar void ]; @@ -84673,8 +84906,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Source code error pretty printing"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "errno" = callPackage @@ -87152,6 +87383,8 @@ self: { pname = "exp-extended"; version = "0.2"; sha256 = "14bz6wfzd8b51s09d2psg5hv5zq4f8lplgx0yvd3n0z704x3mcy6"; + revision = "1"; + editedCabalFile = "1kzrlr1j6xfm8r9j1iz9vp2c7x72gmmqzmki1ypxaawdzibyfysl"; libraryHaskellDepends = [ base ]; description = "floating point with extended exponent range"; license = lib.licenses.bsd3; @@ -87459,8 +87692,8 @@ self: { ({ mkDerivation, base, leancheck, template-haskell }: mkDerivation { pname = "express"; - version = "0.1.12"; - sha256 = "1055qj5ymlzshva94i1gfr6sfmjgv1rhxpx5h76fdq5ia6hkd68z"; + version = "0.1.14"; + sha256 = "19sjh12sjpxhk7wg2b3abga7bpk6ckry19zi58imqmy8xbh6ds39"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base leancheck ]; benchmarkHaskellDepends = [ base leancheck ]; @@ -88423,6 +88656,34 @@ self: { broken = true; }) {}; + "faktory_1_0_3_1" = callPackage + ({ mkDerivation, aeson, aeson-casing, async, base, bytestring + , connection, cryptonite, errors, hspec, markdown-unlit, megaparsec + , memory, mtl, network, random, safe-exceptions, scanner + , semigroups, text, time, unix, unordered-containers + }: + mkDerivation { + pname = "faktory"; + version = "1.0.3.1"; + sha256 = "0af9wsx3fl701an3bsp7daxa4hxv7pdj16y7cypj3cvdwav5wdsg"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-casing base bytestring connection cryptonite errors + megaparsec memory mtl network random safe-exceptions scanner + semigroups text time unix unordered-containers + ]; + executableHaskellDepends = [ aeson base safe-exceptions ]; + testHaskellDepends = [ + aeson async base hspec markdown-unlit time + ]; + testToolDepends = [ markdown-unlit ]; + description = "Faktory Worker for Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "fallible" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -89552,6 +89813,8 @@ self: { pname = "feed"; version = "1.3.2.0"; sha256 = "0kv3vx3njqlhwvkmf12m1gmwl8jj97kfa60da2362vwdavhcf4dk"; + revision = "1"; + editedCabalFile = "0lg9yphl07hbknzx0nvdxvcw05bpxc5ac9sqb26lv4d9nkb72blg"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base base-compat bytestring old-locale old-time safe text time @@ -91488,22 +91751,6 @@ self: { }: mkDerivation { pname = "fitspec"; - version = "0.4.8"; - sha256 = "01xfchs98xy5436kchzysnvwgm00s2srsn5xyxx3r04pzzb5cbd9"; - libraryHaskellDepends = [ - base cmdargs leancheck template-haskell - ]; - testHaskellDepends = [ base leancheck ]; - benchmarkHaskellDepends = [ base pretty ]; - description = "refining property sets for testing Haskell programs"; - license = lib.licenses.bsd3; - }) {}; - - "fitspec_0_4_10" = callPackage - ({ mkDerivation, base, cmdargs, leancheck, pretty, template-haskell - }: - mkDerivation { - pname = "fitspec"; version = "0.4.10"; sha256 = "1jq4brkwq59hj8fpyfq60hywj9hx82qp0yjvyl0bmwy8jpc6j91k"; libraryHaskellDepends = [ @@ -91513,7 +91760,6 @@ self: { benchmarkHaskellDepends = [ base pretty ]; description = "refining property sets for testing Haskell programs"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "fix-imports" = callPackage @@ -94790,26 +95036,6 @@ self: { }: mkDerivation { pname = "free"; - version = "5.1.5"; - sha256 = "0rpnimi3iyr6n9q2ny365mp1l5rjjys15aggcikgnrfn0d656nw6"; - revision = "1"; - editedCabalFile = "1ac4f5n3spmxy9ajlikn9ffswg9l59s7kzwpgcpz8vkc2qf959g1"; - libraryHaskellDepends = [ - base comonad containers distributive exceptions indexed-traversable - mtl profunctors semigroupoids template-haskell th-abstraction - transformers transformers-base - ]; - description = "Monads for free"; - license = lib.licenses.bsd3; - }) {}; - - "free_5_1_7" = callPackage - ({ mkDerivation, base, comonad, containers, distributive - , exceptions, indexed-traversable, mtl, profunctors, semigroupoids - , template-haskell, th-abstraction, transformers, transformers-base - }: - mkDerivation { - pname = "free"; version = "5.1.7"; sha256 = "121b81wxjk30nc27ivwzxjxi1dcwc30y0gy8l6wac3dxwvkx2c5j"; libraryHaskellDepends = [ @@ -94819,7 +95045,6 @@ self: { ]; description = "Monads for free"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "free-algebras" = callPackage @@ -96821,8 +97046,8 @@ self: { }: mkDerivation { pname = "fused-effects-exceptions"; - version = "1.1.0.0"; - sha256 = "0r5xfv5cknxz21viqcpa8xjd57sbadp2vf7nk7z9j1sd5faprmji"; + version = "1.1.0.1"; + sha256 = "1b1qflz64xgw1bd3z794vyvb9906g3x9v72w89z27142a6igy4hr"; libraryHaskellDepends = [ base fused-effects transformers ]; testHaskellDepends = [ base fused-effects tasty tasty-hunit transformers @@ -96975,8 +97200,8 @@ self: { }: mkDerivation { pname = "fusion-plugin"; - version = "0.2.2"; - sha256 = "1d7avmbrqgvp9c4jyrlw344hml29f3vy5m5fgyrsd1z3g4fymakb"; + version = "0.2.3"; + sha256 = "1lklrd3afvm8fwd14yiavx5h8zxjkn2k2vqnxbqwcakcnljxrfyq"; libraryHaskellDepends = [ base containers directory filepath fusion-plugin-types ghc syb time transformers @@ -97077,6 +97302,27 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "futhark-data" = callPackage + ({ mkDerivation, base, binary, bytestring, bytestring-to-vector + , containers, megaparsec, mtl, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, text, vector, vector-binary-instances + }: + mkDerivation { + pname = "futhark-data"; + version = "1.0.0.1"; + sha256 = "126b7igrk0aldj4kjwkyvvsy3v64g9iv6w9ladbbfnd4qw7svswm"; + libraryHaskellDepends = [ + base binary bytestring bytestring-to-vector containers megaparsec + mtl text vector vector-binary-instances + ]; + testHaskellDepends = [ + base binary bytestring megaparsec QuickCheck tasty tasty-hunit + tasty-quickcheck text vector + ]; + description = "An implementation of the Futhark data format"; + license = lib.licenses.isc; + }) {}; + "futhask" = callPackage ({ mkDerivation, base, directory, raw-strings-qq, split }: mkDerivation { @@ -100943,16 +101189,17 @@ self: { "ghc-lib" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, filepath, ghc-lib-parser, ghc-prim, happy - , hpc, pretty, process, time, transformers, unix + , hpc, pretty, process, rts, time, transformers, unix }: mkDerivation { pname = "ghc-lib"; - version = "8.10.4.20210206"; - sha256 = "1zzglnpbnj9ijna6g3rmykqir3iqcg2afmjg9q0ng3imbv40slhs"; + version = "8.10.5.20210606"; + sha256 = "0bl2jp44s3pd1a1sg0kslkhi97f4z2423kdkizg65m6cvmk25ijs"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath - ghc-lib-parser ghc-prim hpc pretty process time transformers unix + ghc-lib-parser ghc-prim hpc pretty process rts time transformers + unix ]; libraryToolDepends = [ alex happy ]; description = "The GHC API, decoupled from GHC versions"; @@ -100987,8 +101234,8 @@ self: { }: mkDerivation { pname = "ghc-lib-parser"; - version = "8.10.4.20210206"; - sha256 = "07j3j67hxz43l1kkdfanghd935wiccvmw7sgk47fjymw6fdx92p2"; + version = "8.10.5.20210606"; + sha256 = "0pqsq49kvqwgbi6jw0dycbdzyldi0sannyqkfzavhqjf4mwjzn4a"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -101027,8 +101274,8 @@ self: { }: mkDerivation { pname = "ghc-lib-parser-ex"; - version = "8.10.0.19"; - sha256 = "0qdkqv7ss9b2mnf39gpbq7i50ypccnl3wdmxiq148zrxbglzfqw9"; + version = "8.10.0.21"; + sha256 = "0ynrn7qdmim35fs9qdlbajqwyz559x1l9cqmjhb54vbrs2xnk6vp"; libraryHaskellDepends = [ base bytestring containers ghc ghc-boot ghc-boot-th uniplate ]; @@ -104839,8 +105086,8 @@ self: { }: mkDerivation { pname = "githash"; - version = "0.1.5.0"; - sha256 = "1m2dhmddn9k75j5wyjilbh40n7fkgi7cyic9l0k2s7g9z93yyvql"; + version = "0.1.6.0"; + sha256 = "1mcfzgvqiirlz8vc02wlvvfyf6742f3901ks8rphhabl4b4v1djl"; libraryHaskellDepends = [ base bytestring directory filepath process template-haskell ]; @@ -109362,8 +109609,8 @@ self: { }: mkDerivation { pname = "google-static-maps"; - version = "0.6.0.1"; - sha256 = "0hvkxdwfbn352q642v4n8wj4ikfp97sll87cwkgr3vb23qwmlbyy"; + version = "0.7.0.0"; + sha256 = "09ir6y13n3sk34g3nnbhv6rz6kibw1gph6fap8f9dlna1g1s1vrb"; libraryHaskellDepends = [ aeson base base64-bytestring bytedump bytestring cryptonite double-conversion http-client JuicyPixels memory network-uri @@ -113750,6 +113997,28 @@ self: { broken = true; }) {}; + "hackage-db_2_1_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, Cabal, containers + , directory, exceptions, filepath, tar, time, utf8-string + }: + mkDerivation { + pname = "hackage-db"; + version = "2.1.0"; + sha256 = "1vsc0lrbrb525frycqq0c5z846whymgcjl888gnlqd16nknbsn3l"; + revision = "1"; + editedCabalFile = "1h3x5a8xmqkkcd3h1m7z0il1vbsh2c77685y68zmyp21zb1y88hy"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring Cabal containers directory exceptions + filepath tar time utf8-string + ]; + description = "Access cabal-install's Hackage database via Data.Map"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ peti ]; + }) {}; + "hackage-db" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , directory, exceptions, filepath, tar, time, utf8-string @@ -114947,7 +115216,7 @@ self: { , parsec, process, QuickCheck, random, regex-tdfa, resourcet , scientific, tagsoup, tasty, tasty-golden, tasty-hunit , tasty-quickcheck, template-haskell, text, time - , time-locale-compat, unordered-containers, utillinux, vector, wai + , time-locale-compat, unordered-containers, util-linux, vector, wai , wai-app-static, warp, yaml }: mkDerivation { @@ -114971,11 +115240,11 @@ self: { base bytestring containers filepath QuickCheck tasty tasty-golden tasty-hunit tasty-quickcheck text unordered-containers yaml ]; - testToolDepends = [ utillinux ]; + testToolDepends = [ util-linux ]; description = "A static website compiler library"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ erictapen ]; - }) {inherit (pkgs) utillinux;}; + }) {inherit (pkgs) util-linux;}; "hakyll-R" = callPackage ({ mkDerivation, base, directory, filepath, hakyll, pandoc, process @@ -116169,8 +116438,8 @@ self: { }: mkDerivation { pname = "hapistrano"; - version = "0.4.1.3"; - sha256 = "1sk5z0kf9ybhk17y36zf90ljn51j82pyf8rja0cv64ah9bg5zbgq"; + version = "0.4.1.4"; + sha256 = "1ci2q3vkjw51k5hbswmcajk7gl1zpmwx3npbkf3kng3j1kcv0bzw"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -116193,7 +116462,7 @@ self: { broken = true; }) {}; - "hapistrano_0_4_1_4" = callPackage + "hapistrano_0_4_2_0" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, base, directory , filepath, formatting, gitrev, hspec, hspec-discover, mtl , optparse-applicative, path, path-io, process, QuickCheck @@ -116201,8 +116470,8 @@ self: { }: mkDerivation { pname = "hapistrano"; - version = "0.4.1.4"; - sha256 = "1ci2q3vkjw51k5hbswmcajk7gl1zpmwx3npbkf3kng3j1kcv0bzw"; + version = "0.4.2.0"; + sha256 = "1f23a0n2pjhacqm275k8njkln3an2x0w48kjgxlrna39mf3fdkwh"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -116881,6 +117150,7 @@ self: { ]; description = "Support for static URL routing with overlap detection for Happstack"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "happstack-util" = callPackage @@ -120993,19 +121263,20 @@ self: { "hasklepias" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, flow, hspec - , interval-algebra, QuickCheck, safe, text, time + , interval-algebra, lens, lens-aeson, QuickCheck, safe, text, time , unordered-containers, vector, witherable }: mkDerivation { pname = "hasklepias"; - version = "0.7.1"; - sha256 = "1w6gs3n1g12sw2w72l04l27na3kgmyqsip8d53wpmslqwccr6blc"; + version = "0.8.3"; + sha256 = "01lq7q9gq7b5zi2bwlc6wpj914l660cl5wlvbznimhfnkr1aqrgm"; libraryHaskellDepends = [ - aeson base bytestring containers flow interval-algebra QuickCheck - safe text time unordered-containers vector witherable + aeson base bytestring containers flow interval-algebra lens + lens-aeson QuickCheck safe text time unordered-containers vector + witherable ]; testHaskellDepends = [ - aeson base bytestring containers flow hspec interval-algebra + aeson base bytestring containers flow hspec interval-algebra lens QuickCheck text time unordered-containers vector ]; description = "Define features from events"; @@ -121087,8 +121358,8 @@ self: { }: mkDerivation { pname = "haskoin-core"; - version = "0.20.3"; - sha256 = "0g5d6w6vwkbxf4iqx998q2c5cnhq1bav0ikksdbj98w8b7ga6v0z"; + version = "0.20.4"; + sha256 = "0mbq4ixnnjln0qjippmv57qz5p4qx3s0fyr2xj43q5gmis89m4cg"; libraryHaskellDepends = [ aeson array base base16 binary bytes bytestring cereal conduit containers cryptonite deepseq entropy hashable hspec memory mtl @@ -121225,8 +121496,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.53.2"; - sha256 = "04wm92b7687qivwjia69gahd9y2dasirmyxcbv8liqfp5xfmjbmz"; + version = "0.53.4"; + sha256 = "04q5a2hf198949z3dlswjq384ymlasq0my1a7n1v3kfr47hr1cjx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121271,8 +121542,8 @@ self: { }: mkDerivation { pname = "haskoin-store-data"; - version = "0.53.2"; - sha256 = "1i949izj89g797zp07qxjx16sd2591gsxbpq94v52vzgd6rl9h7n"; + version = "0.53.4"; + sha256 = "034yb730i2f2dklqk6fcygg7c1h1l0zpm0xh6zkp4a7wjb77f4jp"; libraryHaskellDepends = [ aeson base binary bytes bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl @@ -121419,6 +121690,8 @@ self: { pname = "haskore"; version = "0.2.0.8"; sha256 = "0aflqgvkabgscpkii7aiqfffb15nc90chp4q8xrl3bp8c3i4bb5l"; + revision = "2"; + editedCabalFile = "00rbyw9401m82innh9gjrdqvzn20vy564hicqnjprs1p1j8jn97g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122520,8 +122793,8 @@ self: { }: mkDerivation { pname = "hasqlator-mysql"; - version = "0.0.3"; - sha256 = "1b1nw3l96gvf2laxw7w72w8ya8aazdhv4w7c5ly47n09hx9q77zp"; + version = "0.0.8"; + sha256 = "1ns8ckpvib53s4gvdd3pa5c0ypqw2qw2fwvxakkkd1h66xx8as08"; libraryHaskellDepends = [ aeson base binary bytestring containers dlist io-streams megaparsec mtl mysql-haskell pretty-simple prettyprinter scientific @@ -127053,19 +127326,20 @@ self: { , nonempty-vector, optparse-applicative, primitive, QuickCheck , quickcheck-instances, random, reflection, semigroupoids , semigroups, tasty-bench, template-haskell, text, vector - , vector-algorithms, vector-builder, vector-circular, vinyl, yaml + , vector-algorithms, vector-builder, vector-circular, vinyl + , witherable, yaml }: mkDerivation { pname = "hgeometry"; - version = "0.12.0.2"; - sha256 = "0l14qvsh1aas414zmwwliq7d7cbpjnrs33mfkfpna6svxw5d0phi"; + version = "0.12.0.4"; + sha256 = "1by6x3525hzfk2yr2rkwz4c0vq95x32f5c3bc0sr8kl6yrbabghw"; libraryHaskellDepends = [ aeson base bifunctors bytestring containers data-clist deepseq dlist fingertree fixed-vector hashable hgeometry-combinatorial hspec lens linear MonadRandom mtl nonempty-vector primitive QuickCheck quickcheck-instances random reflection semigroupoids semigroups template-haskell text vector vector-algorithms - vector-builder vector-circular vinyl yaml + vector-builder vector-circular vinyl witherable yaml ]; testHaskellDepends = [ base doctest doctest-discover QuickCheck quickcheck-instances @@ -127088,12 +127362,12 @@ self: { , MonadRandom, mtl, nonempty-vector, primitive, QuickCheck , quickcheck-instances, random, reflection, semigroupoids , semigroups, template-haskell, text, unordered-containers, vector - , vector-builder, vector-circular, vinyl, yaml + , vector-builder, vector-circular, vinyl, witherable, yaml }: mkDerivation { pname = "hgeometry-combinatorial"; - version = "0.12.0.2"; - sha256 = "1ha9v1imwr7584mzxaba8mplsnb0d02j7bhs2knl03q72aaan4jq"; + version = "0.12.0.3"; + sha256 = "0sfng68pirghrnqflxnvysg8x3pnpbwrbc70xsj87gc257adfla9"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson array base bifunctors bytestring containers contravariant @@ -127101,7 +127375,7 @@ self: { math-functions MonadRandom mtl nonempty-vector primitive QuickCheck quickcheck-instances random reflection semigroupoids semigroups template-haskell text unordered-containers vector vector-builder - vector-circular vinyl yaml + vector-circular vinyl witherable yaml ]; testHaskellDepends = [ approximate-equality base bytestring containers data-clist deepseq @@ -127124,8 +127398,8 @@ self: { }: mkDerivation { pname = "hgeometry-ipe"; - version = "0.11.0.0"; - sha256 = "0h78rsxc281wxmg27zxzzak0k15mv61i146gzafihrdg9hpbw1lk"; + version = "0.12.0.0"; + sha256 = "0hljjl2812i9nicajc0xb53wfkq7q3hsicdqdj5z8kr8zrf09lbh"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bifunctors bytestring colour containers data-clist @@ -128280,6 +128554,26 @@ self: { broken = true; }) {}; + "hindley-milner-type-check" = callPackage + ({ mkDerivation, base, containers, data-fix, deepseq + , deriving-compat, dlist, mtl, prettyprinter, tasty, tasty-hunit + , text + }: + mkDerivation { + pname = "hindley-milner-type-check"; + version = "0.1.1.0"; + sha256 = "1xikcxhv59skwx9gjki5zhbcqgjp0lhn2jmf99sls8fwcznbvqj9"; + libraryHaskellDepends = [ + base containers data-fix deepseq deriving-compat dlist mtl + prettyprinter text + ]; + testHaskellDepends = [ + base containers data-fix prettyprinter tasty tasty-hunit text + ]; + description = "Type inference for Hindley-Milner based languages"; + license = lib.licenses.mit; + }) {}; + "hinduce-associations-apriori" = callPackage ({ mkDerivation, base, containers, deepseq, hinduce-missingh , parallel, vector @@ -131318,6 +131612,39 @@ self: { license = lib.licenses.asl20; }) {}; + "hnix-store-core_0_5_0_0" = callPackage + ({ mkDerivation, algebraic-graphs, attoparsec, base + , base16-bytestring, base64-bytestring, binary, bytestring, cereal + , containers, cryptonite, directory, filepath, hashable, hspec + , lifted-base, memory, monad-control, mtl, nix-derivation, process + , saltine, tasty, tasty-discover, tasty-golden, tasty-hspec + , tasty-hunit, tasty-quickcheck, temporary, text, time, unix + , unordered-containers, vector + }: + mkDerivation { + pname = "hnix-store-core"; + version = "0.5.0.0"; + sha256 = "1w5qmk7qhasv2qydrhg3g5x9s2pjf5602w084lj1zbman44phzv5"; + revision = "1"; + editedCabalFile = "05jm5fv7fzp6gpjaw0f40fw58740k0g4cvfacq1bwcr39qnziavg"; + libraryHaskellDepends = [ + algebraic-graphs attoparsec base base16-bytestring + base64-bytestring bytestring cereal containers cryptonite directory + filepath hashable lifted-base memory monad-control mtl + nix-derivation saltine text time unix unordered-containers vector + ]; + testHaskellDepends = [ + attoparsec base base16-bytestring base64-bytestring binary + bytestring containers cryptonite directory filepath hspec process + tasty tasty-golden tasty-hspec tasty-hunit tasty-quickcheck + temporary text unix + ]; + testToolDepends = [ tasty-discover ]; + description = "Core effects for interacting with the Nix store"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "hnix-store-remote" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, containers , hnix-store-core, mtl, network, nix-derivation, text, time @@ -131335,6 +131662,25 @@ self: { license = lib.licenses.asl20; }) {}; + "hnix-store-remote_0_5_0_0" = callPackage + ({ mkDerivation, attoparsec, base, binary, bytestring, containers + , cryptonite, hnix-store-core, mtl, network, nix-derivation, text + , time, unordered-containers + }: + mkDerivation { + pname = "hnix-store-remote"; + version = "0.5.0.0"; + sha256 = "0xvqi1l84ic249qf566vz3pxv75qwgc5d2cf3grh3rcxchp12kf9"; + libraryHaskellDepends = [ + attoparsec base binary bytestring containers cryptonite + hnix-store-core mtl network nix-derivation text time + unordered-containers + ]; + description = "Remote hnix store"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "hnn" = callPackage ({ mkDerivation, base, binary, bytestring, hmatrix, mwc-random , random, vector, vector-binary-instances, zlib @@ -134280,8 +134626,8 @@ self: { }: mkDerivation { pname = "hs-aws-lambda"; - version = "0.1.0.2"; - sha256 = "078qkvxbjdsqgjmfq4fcpndb8c8cyz4g8s1q0ankpy359dvgxkv8"; + version = "0.1.0.4"; + sha256 = "1brykgglhslvgh3jrklr4m3mjcrzp0yq90xxyqh3h0prmswnx9y7"; libraryHaskellDepends = [ aeson base bytestring case-insensitive containers deepseq http-client http-types safe-exceptions text unliftio @@ -135969,6 +136315,32 @@ self: { broken = true; }) {}; + "hscdio" = callPackage + ({ mkDerivation, base, base-compat, bitwise, bytestring, c2hs, cdio + , containers, directory, hedgehog, hedgehog-classes, HUnit, mtl + , text, vector + }: + mkDerivation { + pname = "hscdio"; + version = "0.1.0.0"; + sha256 = "0lwyy8x5zrdl0mg7siclagic7xg2iywapwkdk8kcz3ksdsir7xpd"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bitwise bytestring containers mtl text vector + ]; + librarySystemDepends = [ cdio ]; + libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ + base base-compat bytestring directory hedgehog hedgehog-classes + HUnit text + ]; + description = "Haskell bindings to the libcdio disc-reading library"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {cdio = null;}; + "hscharm" = callPackage ({ mkDerivation, base, random, random-shuffle }: mkDerivation { @@ -140965,8 +141337,8 @@ self: { }: mkDerivation { pname = "http2"; - version = "3.0.1"; - sha256 = "1c1vhb2x23rlw7ciayz0rx6lpifjwrvpg88nspwa9w5nbjij2258"; + version = "3.0.2"; + sha256 = "13c2z35gdimncgpyg5dn5cpjvd83rbrigc8b40crg36678m0k0d1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -142697,6 +143069,8 @@ self: { testToolDepends = [ doctest-discover hspec-discover ]; description = "Monadic query DSL"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hw-packed-vector" = callPackage @@ -146502,6 +146876,20 @@ self: { broken = true; }) {}; + "include-env" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "include-env"; + version = "0.1.1.0"; + sha256 = "0c65dn8r0rizmz71jv9vjf6l3cny31vi0d69jh9i72xwx14nlr77"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base template-haskell ]; + executableHaskellDepends = [ base ]; + description = "Include the value of an environment variable at compile time"; + license = lib.licenses.bsd3; + }) {}; + "include-file" = callPackage ({ mkDerivation, base, bytestring, Cabal, criterion, random , template-haskell @@ -149172,7 +149560,6 @@ self: { ]; description = "Library for IP and MAC addresses"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ip-quoter" = callPackage @@ -149790,6 +150177,7 @@ self: { description = "RFC-based resource identifier library"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "iridium" = callPackage @@ -152966,6 +153354,7 @@ self: { description = "High-performance JSON parser and encoder"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "json-to-haskell" = callPackage @@ -153215,7 +153604,6 @@ self: { ]; description = "Fast and simple JSON encoding toolkit"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "jsonnet" = callPackage @@ -156413,6 +156801,8 @@ self: { libraryHaskellDepends = [ base dlist transformers ]; description = "Combinators for Strategic Programming"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "kure-your-boilerplate" = callPackage @@ -159951,8 +160341,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "leancheck"; - version = "0.9.6"; - sha256 = "0nw7hm9aawv6xljii3cjy9qbdbb5p05k5rmc9qv4dkajjjyhyna9"; + version = "0.9.10"; + sha256 = "0d35w3y309fw3bkaj6fxyl67k4cp32mp003l44m3m2z2fvq08cdn"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base ]; description = "Enumerative property-based testing"; @@ -160949,8 +161339,8 @@ self: { }: mkDerivation { pname = "lentil"; - version = "1.5.1.0"; - sha256 = "03h7fk37rrxpnxfpckpfi5k3v7ch4v5vn601m9lj9shbs26h1cdx"; + version = "1.5.2.0"; + sha256 = "0mkr8ng7i4cli8wscqy2l8112nr7wdg8dh32li354fvahmv6i4si"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -161379,24 +161769,24 @@ self: { "libarchive" = callPackage ({ mkDerivation, base, bytestring, c2hs, Cabal, chs-cabal , composition-prelude, cpphs, criterion, deepseq, dir-traverse - , directory, dlist, filepath, hspec, libarchive, mtl + , directory, dlist, filepath, hspec, hspec-core, libarchive, mtl , pathological-bytestrings, tar, tar-conduit, temporary , unix-compat }: mkDerivation { pname = "libarchive"; - version = "3.0.2.1"; - sha256 = "16h5pw49g9nc4aq7g8hwj1bq1raf1jas09xcsk99sylssvf2yf43"; + version = "3.0.2.2"; + sha256 = "1i3zrby1pmlm7dwv1xra9xmlv4a30cgmbwz5zygdyw1mwy4y9wnh"; setupHaskellDepends = [ base Cabal chs-cabal ]; libraryHaskellDepends = [ base bytestring composition-prelude deepseq dlist filepath mtl unix-compat ]; libraryPkgconfigDepends = [ libarchive ]; - libraryToolDepends = [ c2hs ]; + libraryToolDepends = [ c2hs cpphs ]; testHaskellDepends = [ base bytestring composition-prelude dir-traverse directory filepath - hspec mtl pathological-bytestrings temporary + hspec hspec-core mtl pathological-bytestrings temporary ]; testToolDepends = [ cpphs ]; benchmarkHaskellDepends = [ @@ -162678,6 +163068,22 @@ self: { broken = true; }) {}; + "lifx-lan" = callPackage + ({ mkDerivation, base, binary, bytestring, composition, containers + , extra, monad-loops, mtl, network, random, safe, text, time + }: + mkDerivation { + pname = "lifx-lan"; + version = "0.1.0.2"; + sha256 = "0kk89h1jxz7djxcxz4scwk33r9y1raq8mskypcyx93hzs0f1b4y1"; + libraryHaskellDepends = [ + base binary bytestring composition containers extra monad-loops mtl + network random safe text time + ]; + description = "LIFX LAN API"; + license = lib.licenses.bsd3; + }) {}; + "ligature" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -164509,6 +164915,8 @@ self: { ]; description = "Tries and Patricia tries: finite sets and maps for list keys"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "list-tuple" = callPackage @@ -164728,8 +165136,8 @@ self: { }: mkDerivation { pname = "literatex"; - version = "0.1.0.0"; - sha256 = "0nfmvblm3a370a59hyd28wv8xnq1wlxcm5xz4n6b3n5cprj4h99z"; + version = "0.1.0.2"; + sha256 = "1axj5a10vj9fkpc89yzb8i7aq23bmygnf3mwvbp63vcvwmfyx49h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -164758,19 +165166,19 @@ self: { }) {}; "little-logger" = callPackage - ({ mkDerivation, base, co-log, co-log-core, microlens, mtl, tasty - , tasty-hunit, text, unliftio-core + ({ mkDerivation, base, co-log, co-log-core, directory, microlens + , mtl, tasty, tasty-hunit, temporary, text, unliftio-core }: mkDerivation { pname = "little-logger"; - version = "0.3.1"; - sha256 = "0iqnidlv7r2kw6764aq3dlvxbmvm1c7qk8jkgbhbpm5g07k97c68"; + version = "0.3.2"; + sha256 = "0pwywpxdladsaprdzw856njcn42js7l73f361m0w3gd86xprwm8y"; libraryHaskellDepends = [ base co-log co-log-core microlens mtl text unliftio-core ]; testHaskellDepends = [ - base co-log co-log-core microlens mtl tasty tasty-hunit text - unliftio-core + base co-log co-log-core directory microlens mtl tasty tasty-hunit + temporary text unliftio-core ]; description = "Basic logging based on co-log"; license = lib.licenses.bsd3; @@ -165790,18 +166198,17 @@ self: { "log-base" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, deepseq - , exceptions, mmorph, monad-control, monad-time, mtl, semigroups - , stm, text, time, transformers-base, unliftio-core - , unordered-containers + , exceptions, mmorph, monad-control, mtl, semigroups, stm, text + , time, transformers-base, unliftio-core, unordered-containers }: mkDerivation { pname = "log-base"; - version = "0.9.1.1"; - sha256 = "0b69q4vhayqg0n8kzqb4lma289av39zm5qbinnam4hh9inqhayfk"; + version = "0.10.0.0"; + sha256 = "1rbp34p7a89w960rpwmqwfqrj6nvqybbc5aqiji60zldxigvy3si"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring deepseq exceptions mmorph - monad-control monad-time mtl semigroups stm text time - transformers-base unliftio-core unordered-containers + monad-control mtl semigroups stm text time transformers-base + unliftio-core unordered-containers ]; description = "Structured logging solution (base package)"; license = lib.licenses.bsd3; @@ -165869,8 +166276,8 @@ self: { }: mkDerivation { pname = "log-elasticsearch"; - version = "0.11.0.0"; - sha256 = "1l64mxk3zmlfsqwlhsq62jp8rawj3jbw9izihg7555q51pbqlg5w"; + version = "0.12.0.0"; + sha256 = "05cvk93s61k42bmsmj4997hdij4xk74a6jrd1qvdbkq13w20260m"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bytestring deepseq http-client http-client-tls http-types log-base network-uri @@ -165889,8 +166296,8 @@ self: { }: mkDerivation { pname = "log-postgres"; - version = "0.7.1.5"; - sha256 = "0g89403ijgp2xznd497xhvifh2jlgph4raz4l5fh5ajxvcf33hvn"; + version = "0.8.0.0"; + sha256 = "0vc3n53rpn3qwysp8y5i19ajaag386izsrf9h9k7c2g907k1skw6"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bytestring deepseq hpqtypes http-client lifted-base log-base mtl semigroups split text @@ -166040,6 +166447,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "logfmt" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, fast-logger + , profunctors, time + }: + mkDerivation { + pname = "logfmt"; + version = "0.0.1"; + sha256 = "1phnyhh7pmv8mvh7lxbkswdr2j3vid8rb3n8iy34qn301bprnlb4"; + libraryHaskellDepends = [ + ansi-terminal base bytestring fast-logger profunctors time + ]; + description = "Formatting"; + license = lib.licenses.bsd3; + }) {}; + "logger" = callPackage ({ mkDerivation, ansi-wl-pprint, base, containers, lens, mtl , template-haskell, time, time-locale-compat, transformers @@ -166637,6 +167059,8 @@ self: { pname = "long-double"; version = "0.1.1"; sha256 = "0byrpngsh1a8w9n5nbw9lfmj4nmh33avzfh883zw9ya10pfa7x3g"; + revision = "1"; + editedCabalFile = "0831x773ypp0lv14cgh6vr7rzbyvrjsvw99c40z41fr8bhdw2x4j"; libraryHaskellDepends = [ base integer-gmp ]; description = "FFI bindings for C long double"; license = lib.licenses.bsd3; @@ -168129,8 +168553,8 @@ self: { }: mkDerivation { pname = "lzma-static"; - version = "5.2.5.2"; - sha256 = "12na1ycwrd7p50g19kgnb6kdgswnkwgzynaf0lyrv30qicpd8a5z"; + version = "5.2.5.4"; + sha256 = "0ql96kb7hg50d1flk36999p5p05bqs7rp7a59ys4q02423mq1z7b"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck @@ -170106,7 +170530,6 @@ self: { ]; description = "Abstraction for HTML-embedded content"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "markup-preview" = callPackage @@ -170346,8 +170769,8 @@ self: { }: mkDerivation { pname = "massiv"; - version = "0.6.0.0"; - sha256 = "12p3gcrz3nwry99xhxfrz51aiswm5ira2hyxl4q1g3jfi8vwgcd0"; + version = "0.6.1.0"; + sha256 = "0j3br93kxxyb1q5mdf440f8l8d2lc0gi9vhc3h3ri94ls4ix099v"; libraryHaskellDepends = [ base bytestring deepseq exceptions primitive scheduler unliftio-core vector @@ -171073,8 +171496,8 @@ self: { }: mkDerivation { pname = "matterhorn"; - version = "50200.12.0"; - sha256 = "0rsxgc4igcjhddfil01la1sbnglvr08mf7gfi9fr6pf7sb9w6qbq"; + version = "50200.13.0"; + sha256 = "1wyhqj7jvk94px3npid3lncyccv2xsc3rmfcw616xrf4xsqwisx2"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -171109,8 +171532,8 @@ self: { }: mkDerivation { pname = "mattermost-api"; - version = "50200.10.0"; - sha256 = "0pbp4f0gwhap8d9chn6c2zf22ic3r32302zir4a5r6cmgg4vscgd"; + version = "50200.11.0"; + sha256 = "0knrc00377wx8j4ly8d2nxqswybp3782j7qig6mrzlww6nbd68j7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -171134,8 +171557,8 @@ self: { }: mkDerivation { pname = "mattermost-api-qc"; - version = "50200.10.0"; - sha256 = "0cv7l5g63ar7ii704j8q3y5hsvbmljm8cmgdw6p2shqigv8slzci"; + version = "50200.11.0"; + sha256 = "0crz0nc8qbsjyq3fllbj50d01axgwfas76bmr6xnz83sic2s1yw1"; libraryHaskellDepends = [ base containers mattermost-api QuickCheck text time ]; @@ -171497,6 +171920,34 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "mcmc_0_5_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, circular, containers + , criterion, data-default, deepseq, directory, dirichlet + , double-conversion, hspec, log-domain, microlens, monad-parallel + , mwc-random, pretty-show, primitive, statistics, time + , transformers, vector, zlib + }: + mkDerivation { + pname = "mcmc"; + version = "0.5.0.0"; + sha256 = "0vfbbzk7rwgan0lf1qxr03mbxlxgq1jccbsvffw4hy1k2s65wysi"; + libraryHaskellDepends = [ + aeson base bytestring circular containers data-default deepseq + directory dirichlet double-conversion log-domain microlens + monad-parallel mwc-random pretty-show primitive statistics time + transformers vector zlib + ]; + testHaskellDepends = [ + base hspec log-domain mwc-random statistics + ]; + benchmarkHaskellDepends = [ + base criterion log-domain microlens mwc-random + ]; + description = "Sample from a posterior using Markov chain Monte Carlo"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "mcmc-samplers" = callPackage ({ mkDerivation, base, containers, hakaru, hmatrix, mwc-random , primitive, statistics @@ -175095,25 +175546,6 @@ self: { }: mkDerivation { pname = "mixed-types-num"; - version = "0.5.7.0"; - sha256 = "0fnf165ff6c4vbc2hlfrydb7w8csk1hjxd86lvnh4y9w6sc9g6hp"; - libraryHaskellDepends = [ - base collect-errors hspec hspec-smallcheck mtl QuickCheck - smallcheck template-haskell - ]; - testHaskellDepends = [ - base collect-errors hspec hspec-smallcheck QuickCheck smallcheck - ]; - description = "Alternative Prelude with numeric and logic expressions typed bottom-up"; - license = lib.licenses.bsd3; - }) {}; - - "mixed-types-num_0_5_8_0" = callPackage - ({ mkDerivation, base, collect-errors, hspec, hspec-smallcheck, mtl - , QuickCheck, smallcheck, template-haskell - }: - mkDerivation { - pname = "mixed-types-num"; version = "0.5.8.0"; sha256 = "1i40g6kf4my91i7xg54wfi6n2s8ivmx5k08ccqz3iycn6gha8pr7"; libraryHaskellDepends = [ @@ -175125,7 +175557,6 @@ self: { ]; description = "Alternative Prelude with numeric and logic expressions typed bottom-up"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "mixpanel-client" = callPackage @@ -175730,6 +176161,8 @@ self: { ]; description = "Mock time in tests"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "mockazo" = callPackage @@ -179066,8 +179499,8 @@ self: { }: mkDerivation { pname = "mp"; - version = "1.1.0"; - sha256 = "1msy52c1702q16pmbzc69iyj7bj9xdh4c72d15sigblh9hwvipmm"; + version = "1.3.0"; + sha256 = "1491q33yc7if2j9akwxidn1xn3c9idxnjhq3n5izbbijbdg5qnmd"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -179352,7 +179785,11 @@ self: { testHaskellDepends = [ base HUnit ip text ]; description = "A Multipath TCP path manager"; license = lib.licenses.gpl3Only; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "mpvguihs" = callPackage @@ -180434,12 +180871,12 @@ self: { }) {}; "multi-except" = callPackage - ({ mkDerivation, base, dlist, hspec, semigroupoids }: + ({ mkDerivation, base, dlist-nonempty, hspec, semigroupoids }: mkDerivation { pname = "multi-except"; - version = "0.2.1.0"; - sha256 = "0ai19lk32wbpsmwxig5wzc7iqi81h0mxpykrmfw05vv4zwjqiqfz"; - libraryHaskellDepends = [ base dlist semigroupoids ]; + version = "0.3.0.0"; + sha256 = "1zk8cihmv5dimdhld0h0h622zsvn71rdbhslj4b8dh3dv4qdfji0"; + libraryHaskellDepends = [ base dlist-nonempty semigroupoids ]; testHaskellDepends = [ base hspec semigroupoids ]; description = "Multiple Exceptions"; license = lib.licenses.mit; @@ -181444,8 +181881,8 @@ self: { }: mkDerivation { pname = "musicScroll"; - version = "0.3.2.1"; - sha256 = "0q6hglv26qpy1prx4is0jbhgb9xsxkpxbknyah9mcfn7c52cx0c0"; + version = "0.3.3"; + sha256 = "07c9yxazl8frl06s7jslg28716xi97azyx7i9pc06zmnag9p2k2z"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -182169,7 +182606,8 @@ self: { }) {}; "mysql" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, hspec, mysql + ({ mkDerivation, base, bytestring, Cabal, containers, hspec + , libmysqlclient }: mkDerivation { pname = "mysql"; @@ -182177,11 +182615,11 @@ self: { sha256 = "16m8hv9yy2nf4jwgqg6n9z53n2pzskbc3gwbp2i3kgff8wsmf8sd"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring containers ]; - librarySystemDepends = [ mysql ]; + librarySystemDepends = [ libmysqlclient ]; testHaskellDepends = [ base bytestring hspec ]; description = "A low-level MySQL client library"; license = lib.licenses.bsd3; - }) {inherit (pkgs) mysql;}; + }) {inherit (pkgs) libmysqlclient;}; "mysql-effect" = callPackage ({ mkDerivation, base, bytestring, extensible-effects, mysql @@ -187937,32 +188375,6 @@ self: { ({ mkDerivation, aeson, aeson-pretty, async, auto-update, base , bytestring, containers, directory, exceptions, filepath, ghc , hedgehog, junit-xml, pretty-diff, pretty-show, safe-coloured-text - , safe-exceptions, terminal-size, text, time, vector - }: - mkDerivation { - pname = "nri-prelude"; - version = "0.6.0.0"; - sha256 = "02v83n08zxz8521skijgrn407a0mlkjc3fjn5q04gn932wf29g5s"; - libraryHaskellDepends = [ - aeson aeson-pretty async auto-update base bytestring containers - directory exceptions filepath ghc hedgehog junit-xml pretty-diff - pretty-show safe-coloured-text safe-exceptions terminal-size text - time vector - ]; - testHaskellDepends = [ - aeson aeson-pretty async auto-update base bytestring containers - directory exceptions filepath ghc hedgehog junit-xml pretty-diff - pretty-show safe-coloured-text safe-exceptions terminal-size text - time vector - ]; - description = "A Prelude inspired by the Elm programming language"; - license = lib.licenses.bsd3; - }) {}; - - "nri-prelude_0_6_0_1" = callPackage - ({ mkDerivation, aeson, aeson-pretty, async, auto-update, base - , bytestring, containers, directory, exceptions, filepath, ghc - , hedgehog, junit-xml, pretty-diff, pretty-show, safe-coloured-text , safe-coloured-text-terminfo, safe-exceptions, terminal-size, text , time, vector }: @@ -187984,7 +188396,6 @@ self: { ]; description = "A Prelude inspired by the Elm programming language"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "nri-redis" = callPackage @@ -188724,10 +189135,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "numtype-dk"; - version = "0.5.0.2"; - sha256 = "0avkdbhxijcja9i9g3cqh699mys8nhsxgrrpkknycmqpvp07sy4q"; - revision = "1"; - editedCabalFile = "0892xm8vyyvl1glg4vniz8r5ydg1nz3zmbpgk5mxdih6wi6nmpy4"; + version = "0.5.0.3"; + sha256 = "17mxqw82l3p0n18bjyyxbbnjvwqny4s3fkyj8vgj0ygw9ma534zl"; libraryHaskellDepends = [ base ]; description = "Type-level integers, using TypeNats, Data Kinds, and Closed Type Families"; license = lib.licenses.bsd3; @@ -188784,25 +189193,28 @@ self: { }) {}; "nvfetcher" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, containers, extra - , free, microlens, microlens-th, neat-interpolation - , optparse-simple, shake, text, tomland, transformers - , validation-selective + ({ mkDerivation, aeson, base, binary, binary-instances, bytestring + , containers, data-default, extra, free, microlens, microlens-th + , neat-interpolation, optparse-simple, parsec, shake, text, tomland + , transformers, unordered-containers, validation-selective }: mkDerivation { pname = "nvfetcher"; - version = "0.2.0.0"; - sha256 = "04gslnmamy79i563ma7kj2b36mqr2c1wlcivqs70akr7s4my3g7z"; + version = "0.3.0.0"; + sha256 = "1b6kb7qlnrg74ymhj74ikqs80hmg013vv4rc7sdkb0pfs3l6f6mh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base binary bytestring containers extra free microlens - microlens-th neat-interpolation shake text transformers + aeson base binary binary-instances bytestring containers + data-default extra free microlens microlens-th neat-interpolation + optparse-simple parsec shake text tomland transformers + unordered-containers ]; executableHaskellDepends = [ - aeson base binary bytestring containers extra free microlens - microlens-th neat-interpolation optparse-simple shake text tomland - transformers validation-selective + aeson base binary binary-instances bytestring containers + data-default extra free microlens microlens-th neat-interpolation + optparse-simple parsec shake text tomland transformers + unordered-containers validation-selective ]; description = "Generate nix sources expr for the latest version of packages"; license = lib.licenses.mit; @@ -190600,6 +191012,8 @@ self: { ]; description = "Unofficial OpenAI servant types"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "openapi-petstore" = callPackage @@ -191207,8 +191621,8 @@ self: { }: mkDerivation { pname = "opentelemetry"; - version = "0.6.1"; - sha256 = "0i88ciig40gil4gaj95qw28c2racdr2jb6rcpnsf60fzkqc8b3fk"; + version = "0.7.0"; + sha256 = "10k9if33ydjc099mgjvgglp6fcmrz0zxpv6khwkhra6lcz35mylv"; libraryHaskellDepends = [ base bytestring exceptions ghc-trace-events hashable ]; @@ -191216,24 +191630,24 @@ self: { }) {}; "opentelemetry-extra" = callPackage - ({ mkDerivation, aeson, async, base, binary, bytestring, clock - , containers, directory, exceptions, filepath, gauge - , generic-arbitrary, ghc-events, hashable, hashtables, http-client - , http-client-tls, http-types, hvega, opentelemetry, process - , QuickCheck, quickcheck-instances, random, scientific, splitmix - , stm, tasty, tasty-discover, tasty-hunit, tasty-quickcheck, text + ({ mkDerivation, async, base, binary, bytestring, clock, containers + , directory, exceptions, filepath, generic-arbitrary, ghc-events + , hashable, hashtables, http-client, http-client-tls, http-types + , hvega, jsonifier, opentelemetry, process, QuickCheck + , quickcheck-instances, random, scientific, splitmix, stm, tasty + , tasty-bench, tasty-discover, tasty-hunit, tasty-quickcheck, text , text-show, typed-process, unordered-containers }: mkDerivation { pname = "opentelemetry-extra"; - version = "0.6.1"; - sha256 = "0ggxkhcrjj8sg6zf9jnp1j05wwlsay6k95c79j9j3dvw8qy2yjbx"; + version = "0.7.0"; + sha256 = "11lwhm3rpajmch7kjb4qwngram5ka8fbd3c0mxszlf4a9dlqag32"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson async base binary bytestring clock containers directory - exceptions filepath ghc-events hashable http-client http-client-tls - http-types opentelemetry random scientific splitmix stm text + async base binary bytestring clock containers directory exceptions + filepath ghc-events hashable http-client http-client-tls http-types + jsonifier opentelemetry random scientific splitmix stm text text-show unordered-containers ]; executableHaskellDepends = [ @@ -191247,7 +191661,7 @@ self: { tasty-hunit tasty-quickcheck text text-show unordered-containers ]; testToolDepends = [ tasty-discover ]; - benchmarkHaskellDepends = [ base gauge opentelemetry ]; + benchmarkHaskellDepends = [ base opentelemetry tasty-bench ]; license = lib.licenses.asl20; }) {}; @@ -191267,7 +191681,7 @@ self: { }) {}; "opentelemetry-lightstep" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, clock, containers + ({ mkDerivation, async, base, bytestring, clock, containers , exceptions, filepath, ghc-events, http-client, http-client-tls , http-types, network, opentelemetry, opentelemetry-extra , scientific, splitmix, stm, text, typed-process @@ -191275,12 +191689,12 @@ self: { }: mkDerivation { pname = "opentelemetry-lightstep"; - version = "0.6.1"; - sha256 = "1a7rrm5aahqh63j0rr7nvd4y3q64m8qr7is0r0a17fwkkpppmyln"; + version = "0.7.0"; + sha256 = "1yd6gzhwwmjjh41ipz2kifzpn7hha9nli3war2rqdjvhj349lrw8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson async base bytestring exceptions http-client http-client-tls + async base bytestring exceptions http-client http-client-tls http-types network opentelemetry opentelemetry-extra scientific stm text unordered-containers ]; @@ -191298,8 +191712,8 @@ self: { }: mkDerivation { pname = "opentelemetry-wai"; - version = "0.6.1"; - sha256 = "0g1a044sphd35z9crc8wbxsk4hfh1gpfi4g8rr1k4f842hznj7nf"; + version = "0.7.0"; + sha256 = "09mh8kfh49vx2gascwwmzs4s649sm5i90nsifp76kjvg1nvqhd1m"; libraryHaskellDepends = [ base bytestring http-types opentelemetry text wai ]; @@ -191549,8 +191963,8 @@ self: { }: mkDerivation { pname = "opentracing"; - version = "0.1.0.0"; - sha256 = "0j791hv525mcskqmji3f9n8v803pailm8jrl336pxzdh3iacqvsl"; + version = "0.2.0"; + sha256 = "1yl3hhg32npj4ncqc9j5gl2jikzvczkpnrwp124nk45mzi13aszq"; libraryHaskellDepends = [ aeson async base base64-bytestring bytestring case-insensitive clock containers http-types iproute lens mtl mwc-random network @@ -191565,8 +191979,8 @@ self: { ({ mkDerivation, base, http-client, lens, mtl, opentracing, text }: mkDerivation { pname = "opentracing-http-client"; - version = "0.1.0.0"; - sha256 = "1jzdnlk2cacmymjkcfx4n569n6gqy6kwzh9dxrgjnagwh3jqk7q3"; + version = "0.2.0"; + sha256 = "19mwl69ggyd7zf1dvx5yjzsq5mlw5l94h989hgwc4ryvp8zqwv4n"; libraryHaskellDepends = [ base http-client lens mtl opentracing text ]; @@ -191576,18 +191990,18 @@ self: { "opentracing-jaeger" = callPackage ({ mkDerivation, base, bytestring, exceptions, hashable - , http-client, http-types, lens, mtl, network, opentracing - , QuickCheck, safe-exceptions, text, thrift, unordered-containers - , vector + , http-client, http-types, lens, mtl, network, opentracing, pinch + , QuickCheck, safe-exceptions, text, unordered-containers, vector + , vector-instances }: mkDerivation { pname = "opentracing-jaeger"; - version = "0.1.0.0"; - sha256 = "1yr9vhbpqq12hj9blv3v1wc26n9qsp0g7pjngxh0k1zcv759s1k0"; + version = "0.2.0"; + sha256 = "0ffcbmg8qzvyhm7vzk2zkk5czli4ndrp18cc328i7600gzv1gr81"; libraryHaskellDepends = [ base bytestring exceptions hashable http-client http-types lens mtl - network opentracing QuickCheck safe-exceptions text thrift - unordered-containers vector + network opentracing pinch QuickCheck safe-exceptions text + unordered-containers vector vector-instances ]; description = "Jaeger backend for OpenTracing"; license = lib.licenses.asl20; @@ -191598,8 +192012,8 @@ self: { ({ mkDerivation, base, lens, opentracing, text, wai }: mkDerivation { pname = "opentracing-wai"; - version = "0.1.0.0"; - sha256 = "1m68l4gxpyl81yhkd209kdgzydzyg632x8gl2jh3l4k83ysdg545"; + version = "0.2.0"; + sha256 = "178xxgg0rw94gld5jlvix6czsvg66q60h06nj2b1x7rnd0pjryc6"; libraryHaskellDepends = [ base lens opentracing text wai ]; description = "Middleware adding OpenTracing tracing for WAI applications"; license = lib.licenses.asl20; @@ -191609,8 +192023,8 @@ self: { ({ mkDerivation, aeson, base, opentracing, text }: mkDerivation { pname = "opentracing-zipkin-common"; - version = "0.1.0.0"; - sha256 = "00pg2k0v685gc4fmrcb464fapvpz8lw0249n6gmi2zkhpw8frnm0"; + version = "0.2.0"; + sha256 = "0yngiz8135v844wcx28izwhx18iz06di3dl8bm5xqh47ir43wdw6"; libraryHaskellDepends = [ aeson base opentracing text ]; description = "Zipkin OpenTracing Backend Commons"; license = lib.licenses.asl20; @@ -191619,17 +192033,17 @@ self: { "opentracing-zipkin-v1" = callPackage ({ mkDerivation, base, bytestring, exceptions, hashable , http-client, http-types, iproute, lens, opentracing - , opentracing-zipkin-common, QuickCheck, text, thrift - , unordered-containers, vector + , opentracing-zipkin-common, pinch, QuickCheck, text + , unordered-containers, vector, vector-instances }: mkDerivation { pname = "opentracing-zipkin-v1"; - version = "0.1.0.0"; - sha256 = "0mw6x9jqh42ymn1a3maq47mw1mbzki5lv1axapqkhkx0w13824pp"; + version = "0.2.0"; + sha256 = "15n9m7affy81fr80zw7l54lch7gr6bvhcqpga797x7rvdxqqjv9j"; libraryHaskellDepends = [ base bytestring exceptions hashable http-client http-types iproute - lens opentracing opentracing-zipkin-common QuickCheck text thrift - unordered-containers vector + lens opentracing opentracing-zipkin-common pinch QuickCheck text + unordered-containers vector vector-instances ]; description = "Zipkin V1 backend for OpenTracing"; license = lib.licenses.asl20; @@ -191643,8 +192057,8 @@ self: { }: mkDerivation { pname = "opentracing-zipkin-v2"; - version = "0.1.0.0"; - sha256 = "0rmrlx2g228p4ys95d4zqc0l56a62avsawq320g4n9i2g0hrl5n4"; + version = "0.2.0"; + sha256 = "1ykssjhknfyiw02abjpz38zmlw8l03zb8c3y3ic5njmsg23nxfzb"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring exceptions http-client http-types lens opentracing opentracing-zipkin-common text @@ -192571,8 +192985,8 @@ self: { }: mkDerivation { pname = "ordinal"; - version = "0.4.0.5"; - sha256 = "0m073n6yln9rfdzlkwd10fl04b725h3hpybz01r0wiyw4bfv2n3b"; + version = "0.4.0.6"; + sha256 = "0zpqhyn8f2iphgz2746fxsjk817ly8q6s4dz6129jrrd25v3kdc7"; libraryHaskellDepends = [ base containers data-default QuickCheck regex template-haskell text time vector @@ -192619,17 +193033,19 @@ self: { "org-mode" = callPackage ({ mkDerivation, base, containers, filepath, hashable, megaparsec - , parser-combinators, tasty, tasty-hunit, text + , parser-combinators, tasty, tasty-hunit, text, time }: mkDerivation { pname = "org-mode"; - version = "1.1.1"; - sha256 = "0kbfgafv3xkgczz27ap7xyqfvvn8a6sizc9h3ylklc8qrw38n149"; + version = "2.0.0"; + sha256 = "17yn9si0mxyydjgv40q6rc5nw579kswlx69ycyinhdx0q34ds7rl"; libraryHaskellDepends = [ base containers filepath hashable megaparsec parser-combinators - text + text time + ]; + testHaskellDepends = [ + base megaparsec tasty tasty-hunit text time ]; - testHaskellDepends = [ base megaparsec tasty tasty-hunit text ]; description = "Parser for Emacs org-mode files"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -192641,8 +193057,8 @@ self: { }: mkDerivation { pname = "org-mode-lucid"; - version = "1.6.0"; - sha256 = "0qkar6cwmz67zm2jlah1yi004vap8d136167qwvm485cpd3vwxz7"; + version = "1.6.1"; + sha256 = "0fkwwwrmfq22g1yak9srmlbq5yixf4kdwfapq0dyr8f3pqaglf1v"; libraryHaskellDepends = [ base containers hashable lucid org-mode text ]; @@ -193872,6 +194288,7 @@ self: { description = "Parse syslog traffic from PAN-OS"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "panda" = callPackage @@ -194436,8 +194853,8 @@ self: { }: mkDerivation { pname = "pandoc-plot"; - version = "1.2.2"; - sha256 = "0lj4a1nn78zsv7rms3irk0fy390k2yfd6ck687x9h1xqmsdhd3kd"; + version = "1.2.3"; + sha256 = "0r7xymgkk2c3fmdfk4vljdwbl2k3jrk40aa7f7y277fp5nxnqgp8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -194613,8 +195030,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "pandora"; - version = "0.4.1"; - sha256 = "0gn47zw0rzvdj1d1gwqy49di6f8lpvy53wfcs2g163nz9vil8xka"; + version = "0.4.2"; + sha256 = "1gn3bl9nls9rqn2mdxdiaik740l2g8ji7djn6626j4jnmvwkcwks"; description = "A box of patterns and paradigms"; license = lib.licenses.mit; }) {}; @@ -194779,8 +195196,8 @@ self: { }: mkDerivation { pname = "pantry"; - version = "0.5.2.1"; - sha256 = "0g1v78mgxa6mn0vm6yii3nzfdwpn4hgrlcld1h3mbwaxn6c8116k"; + version = "0.5.2.2"; + sha256 = "05ykb6jn19jiakrn6mdcz3gyc6v6hkg3r8drwxncf04syz0l60mm"; libraryHaskellDepends = [ aeson ansi-terminal base bytestring Cabal casa-client casa-types conduit conduit-extra containers cryptonite cryptonite-conduit @@ -195384,8 +195801,8 @@ self: { ({ mkDerivation, base, containers, extensible-exceptions, random }: mkDerivation { pname = "parallel-io"; - version = "0.3.4"; - sha256 = "10bglxm685pljh0i896zrgs6g3iz0n7gl1qslvfn63pjxgvz5v2a"; + version = "0.3.5"; + sha256 = "0b67rjz80n58grz7hcb1lvk15lmww41967kv7f85vlpacfykng49"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -195418,6 +195835,8 @@ self: { pname = "parallel-tree-search"; version = "0.4.2"; sha256 = "08r8xl3x5zvsy3d3ss9m9l7kb0dyp7hjrwxlnz7g2jl7p5x8rjbd"; + revision = "1"; + editedCabalFile = "1d1wm16ydyyd1izm5mvrrxlqix8k98zvmfl418dsj446mfa2ih76"; libraryHaskellDepends = [ base parallel tree-monad ]; description = "Parallel Tree Search"; license = lib.licenses.publicDomain; @@ -196247,16 +196666,29 @@ self: { }) {}; "parsley" = callPackage + ({ mkDerivation, base, parsley-core, template-haskell, text }: + mkDerivation { + pname = "parsley"; + version = "1.0.0.0"; + sha256 = "08g89wgynvr58xypcpvd552v7h16cb1rbfggiyr8dj49bmgm0hwx"; + libraryHaskellDepends = [ + base parsley-core template-haskell text + ]; + description = "A fast parser combinator library backed by Typed Template Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "parsley-core" = callPackage ({ mkDerivation, array, base, bytestring, containers, cpphs , dependent-map, dependent-sum, ghc-prim, hashable, mtl , pretty-terminal, template-haskell, text, unordered-containers }: mkDerivation { - pname = "parsley"; - version = "0.1.0.1"; - sha256 = "01rslkkisbrgdn2d8hzrag2z6hh9gjilp2bg0j87n8awzm1i2n19"; - revision = "1"; - editedCabalFile = "16rpf1l3ph3yil2jnyp9z0j46afb38bii52bwkl4blk2f781k97z"; + pname = "parsley-core"; + version = "1.0.0.0"; + sha256 = "0vcvxnmnml5jsjicx6rhskkb30ggz95wjlfcj1fzxc9si9vlkh4j"; libraryHaskellDepends = [ array base bytestring containers dependent-map dependent-sum ghc-prim hashable mtl pretty-terminal template-haskell text @@ -196269,6 +196701,22 @@ self: { broken = true; }) {}; + "parsley-garnish" = callPackage + ({ mkDerivation, base, ghc, ghc-tcplugins-extra, parsley-core, syb + , template-haskell + }: + mkDerivation { + pname = "parsley-garnish"; + version = "1.0.0.0"; + sha256 = "1vxl3ibxa923q4vxhvgxhf41p6c9ynmr18mmr7yrjrnc7arn615f"; + libraryHaskellDepends = [ + base ghc ghc-tcplugins-extra parsley-core syb template-haskell + ]; + description = "A collection of GHC plugins to work with parsley"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "parsnip" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , data-default, ghc-prim, primitive @@ -196899,8 +197347,8 @@ self: { }: mkDerivation { pname = "path-io"; - version = "1.6.2"; - sha256 = "11mrs0awd343far3rmcphdli65g737haxg7fwx3pl04fgdxfbpdq"; + version = "1.6.3"; + sha256 = "1dnc48hf8x83p0jy05qi8j8gmfmsy50swnql9ssdv74lsryp615n"; libraryHaskellDepends = [ base containers directory dlist exceptions filepath path temporary time transformers unix-compat @@ -196943,8 +197391,8 @@ self: { ({ mkDerivation, base, bytestring, path, safe-exceptions, text }: mkDerivation { pname = "path-text-utf8"; - version = "0.0.1.6"; - sha256 = "0zlmmfjzjgnhscy8852gi67hq8xl9j05c53faf599cqa6c71ry11"; + version = "0.0.1.8"; + sha256 = "1xi60cw75qzhb03z2a66xfxgr17xz39bdk7wmjc7yprqy0v016jj"; libraryHaskellDepends = [ base bytestring path safe-exceptions text ]; @@ -199102,8 +199550,8 @@ self: { }: mkDerivation { pname = "persistent-mtl"; - version = "0.2.1.0"; - sha256 = "1lwzkxb55bb4ldcwxkkfjfly39bnjjdg01yihl6znx8y3c461yrx"; + version = "0.2.2.0"; + sha256 = "0z78xs1gi45i3a9q28yr7jpsdsbzfqjahch3m27gygkja9dgm438"; libraryHaskellDepends = [ base conduit containers mtl persistent resource-pool resourcet text transformers unliftio unliftio-core unliftio-pool @@ -199245,39 +199693,6 @@ self: { }: mkDerivation { pname = "persistent-postgresql"; - version = "2.13.0.1"; - sha256 = "186anbb0sgml094pw1nb529pddi4q1af0mcv3xa8bshr1xywpnd8"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base blaze-builder bytestring conduit containers - monad-logger mtl persistent postgresql-libpq postgresql-simple - resource-pool resourcet string-conversions text time transformers - unliftio-core - ]; - testHaskellDepends = [ - aeson base bytestring containers fast-logger hspec - hspec-expectations hspec-expectations-lifted http-api-data HUnit - monad-logger path-pieces persistent persistent-qq persistent-test - QuickCheck quickcheck-instances resourcet text time transformers - unliftio unliftio-core unordered-containers vector - ]; - description = "Backend for the persistent library using postgresql"; - license = lib.licenses.mit; - }) {}; - - "persistent-postgresql_2_13_0_2" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring - , conduit, containers, fast-logger, hspec, hspec-expectations - , hspec-expectations-lifted, http-api-data, HUnit, monad-logger - , mtl, path-pieces, persistent, persistent-qq, persistent-test - , postgresql-libpq, postgresql-simple, QuickCheck - , quickcheck-instances, resource-pool, resourcet - , string-conversions, text, time, transformers, unliftio - , unliftio-core, unordered-containers, vector - }: - mkDerivation { - pname = "persistent-postgresql"; version = "2.13.0.2"; sha256 = "1cbrwzk2s3xrdxpas64slk1habn38xspdg09xj2yazszkmr31hrh"; isLibrary = true; @@ -199297,7 +199712,6 @@ self: { ]; description = "Backend for the persistent library using postgresql"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "persistent-protobuf" = callPackage @@ -200294,8 +200708,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-phonetics-basics"; - version = "0.6.3.0"; - sha256 = "1hc1wmq2syvi0xsbkrm52hd5k8j2kk80n45695zd85fqwbayhj2c"; + version = "0.7.0.0"; + sha256 = "16a8b5xpdrayfh03czs0nb1xz6kn95rr4k4dim5viqjxpc9f0zbn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -200461,8 +200875,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-examples-array"; - version = "0.2.1.0"; - sha256 = "0bz5lyl75i143crva3piz4005k81ia26rj455cgbgz3yknj3qpaf"; + version = "0.3.0.0"; + sha256 = "15k2nij8rpf1yvm5kjgkrvx1y4zlfskxfdxjbjirmaidamr2ha6d"; libraryHaskellDepends = [ base heaps mmsyn2-array parallel phonetic-languages-constraints-array @@ -200483,8 +200897,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-examples-common"; - version = "0.1.2.0"; - sha256 = "1k65ynaz2mh35nqsf3izqq0lxqbkyj24i1g3r3gbfpbkajdhqz0v"; + version = "0.2.0.0"; + sha256 = "15ngw29ffsyp7j71rpyllfyifvqybgpb5mh2cfgi1vscl8c6zydl"; libraryHaskellDepends = [ base heaps phonetic-languages-phonetics-basics subG ]; @@ -200499,13 +200913,13 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-properties-array"; - version = "0.1.2.0"; - sha256 = "1vlzgcq8pv22m9pxwx0p1xss9zzlvwap11gn88pdgn0zgkhcsm0b"; + version = "0.2.0.0"; + sha256 = "1k1id4dz0siz3qqax738k4k2dfj68slph4yy8ad6f4r9fink9jqr"; libraryHaskellDepends = [ base phonetic-languages-phonetics-basics phonetic-languages-rhythmicity phonetic-languages-simplified-base ]; - description = "Generalization of the functionality of the phonetic-languages-simplified-properties-array"; + description = "Some 'properties' of the phonetic languages approach text"; license = lib.licenses.mit; }) {}; @@ -204353,8 +204767,8 @@ self: { }: mkDerivation { pname = "polysemy-RandomFu"; - version = "0.4.2.0"; - sha256 = "0rsmdp7p0asmaf13wf5ky0ngrmnqdfbi67y4a0vcwqvknqmlys2y"; + version = "0.4.2.1"; + sha256 = "16r167cx87y9l36psa3ffrcfjyhm4ngzbbsmm9c5dh3gvq53vw58"; libraryHaskellDepends = [ base polysemy polysemy-plugin polysemy-zoo random-fu random-source ]; @@ -206149,19 +206563,19 @@ self: { , quickcheck-assertions, quickcheck-instances, resource-pool , semigroups, tasty, tasty-hunit, tasty-quickcheck, tasty-th , template-haskell, text, th-lift, th-lift-instances, time - , transformers, transformers-base, transformers-compat, type-fun + , transformers, transformers-base, transformers-compat }: mkDerivation { pname = "postgresql-query"; - version = "3.8.1"; - sha256 = "09lld8fibwn0brszpz040pr8q7b5wrpc9fzdw8pwf7gfsb02wvx1"; + version = "3.8.2"; + sha256 = "1vcfs5yg9ab0axdm661kjpsfxii7h3s8rrq38kgc68vhr280m110"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder bytestring containers data-default exceptions file-embed haskell-src-meta hreader hset inflections monad-control monad-logger mtl postgresql-simple resource-pool semigroups template-haskell text th-lift th-lift-instances time transformers transformers-base - transformers-compat type-fun + transformers-compat ]; testHaskellDepends = [ attoparsec base generic-arbitrary postgresql-simple QuickCheck @@ -209027,8 +209441,8 @@ self: { pname = "process"; version = "1.6.11.0"; sha256 = "0nv8c2hnx1l6xls6b61l8sm7j250qfbj1fjj5n6m15ppk9f0d9jd"; - revision = "1"; - editedCabalFile = "136mp45m1jh27yayb0gx4giybp6imh7hbr774fsb2m9vj2l52b27"; + revision = "2"; + editedCabalFile = "1yz98g78syad217c816q5rrdb7w93lpsp3pcc4djsy050w9ji56n"; libraryHaskellDepends = [ base deepseq directory filepath unix ]; testHaskellDepends = [ base bytestring directory ]; description = "Process libraries"; @@ -209553,24 +209967,6 @@ self: { }: mkDerivation { pname = "profunctors"; - version = "5.5.2"; - sha256 = "0z5gk2ip4x2z0jad9lnsnq1q1i8bbgchw3bwgiy3gbmgp2m7j5az"; - revision = "1"; - editedCabalFile = "0b73nqyl3yc3q4r0asrciqx7q19y6ygfszb79kn37pndnzj4m0hd"; - libraryHaskellDepends = [ - base base-orphans bifunctors comonad contravariant distributive - tagged transformers - ]; - description = "Profunctors"; - license = lib.licenses.bsd3; - }) {}; - - "profunctors_5_6_2" = callPackage - ({ mkDerivation, base, base-orphans, bifunctors, comonad - , contravariant, distributive, tagged, transformers - }: - mkDerivation { - pname = "profunctors"; version = "5.6.2"; sha256 = "0an9v003ivxmjid0s51qznbjhd5fsa1dkcfsrhxllnjja1xmv5b5"; libraryHaskellDepends = [ @@ -209579,7 +209975,6 @@ self: { ]; description = "Profunctors"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "progress" = callPackage @@ -210606,6 +211001,8 @@ self: { pname = "proto3-suite"; version = "0.4.2"; sha256 = "015cg6brf6v0h2h2d36hqqr9i69vr30bhc35av55v0d65ya0sczz"; + revision = "1"; + editedCabalFile = "1s9mr6y31kbm0f316i7q0w4qgmi0mas23dhbam6i9pshfa0bav0x"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -211247,8 +211644,6 @@ self: { benchmarkHaskellDepends = [ gauge rerebase ]; description = "Pointer poking action construction and composition toolkit"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ptrdiff" = callPackage @@ -211825,18 +212220,17 @@ self: { , http-types, HUnit, language-javascript, lifted-async, lifted-base , memory, microlens, microlens-platform, monad-control , monad-logger, mtl, network, optparse-applicative, parallel - , parsec, pattern-arrows, process, protolude, purescript-ast - , purescript-cst, regex-base, regex-tdfa, safe, scientific - , semialign, semigroups, serialise, sourcemap, split, stm - , stringsearch, syb, tasty, tasty-golden, tasty-hspec - , tasty-quickcheck, text, these, time, transformers - , transformers-base, transformers-compat, unordered-containers - , utf8-string, vector, wai, wai-websockets, warp, websockets + , parsec, pattern-arrows, process, protolude, purescript-cst + , QuickCheck, regex-base, regex-tdfa, safe, scientific, semialign + , semigroups, serialise, sourcemap, split, stm, stringsearch, syb + , text, these, time, transformers, transformers-base + , transformers-compat, unordered-containers, utf8-string, vector + , wai, wai-websockets, warp, websockets }: mkDerivation { pname = "purescript"; - version = "0.14.1"; - sha256 = "0cqrasq0my2nsslpvy1mfhc2nqj2bfcilv8acd600bn9f6qgn4yv"; + version = "0.14.2"; + sha256 = "12gk4c311v39gh0kp5s97gia2xrglzzkpnhisbpxc4h7nd9dqf5m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -211846,11 +212240,11 @@ self: { directory dlist edit-distance file-embed filepath fsnotify Glob haskeline language-javascript lifted-async lifted-base memory microlens microlens-platform monad-control monad-logger mtl - parallel parsec pattern-arrows process protolude purescript-ast - purescript-cst regex-tdfa safe scientific semialign semigroups - serialise sourcemap split stm stringsearch syb text these time - transformers transformers-base transformers-compat - unordered-containers utf8-string vector + parallel parsec pattern-arrows process protolude purescript-cst + regex-tdfa safe scientific semialign semigroups serialise sourcemap + split stm stringsearch syb text these time transformers + transformers-base transformers-compat unordered-containers + utf8-string vector ]; libraryToolDepends = [ happy ]; executableHaskellDepends = [ @@ -211861,12 +212255,11 @@ self: { fsnotify gitrev Glob haskeline http-types language-javascript lifted-async lifted-base memory microlens microlens-platform monad-control monad-logger mtl network optparse-applicative - parallel parsec pattern-arrows process protolude purescript-ast - purescript-cst regex-tdfa safe scientific semialign semigroups - serialise sourcemap split stm stringsearch syb text these time - transformers transformers-base transformers-compat - unordered-containers utf8-string vector wai wai-websockets warp - websockets + parallel parsec pattern-arrows process protolude purescript-cst + regex-tdfa safe scientific semialign semigroups serialise sourcemap + split stm stringsearch syb text these time transformers + transformers-base transformers-compat unordered-containers + utf8-string vector wai wai-websockets warp websockets ]; executableToolDepends = [ happy ]; testHaskellDepends = [ @@ -211876,11 +212269,10 @@ self: { directory dlist edit-distance file-embed filepath fsnotify Glob haskeline hspec HUnit language-javascript lifted-async lifted-base memory microlens microlens-platform monad-control monad-logger mtl - parallel parsec pattern-arrows process protolude purescript-ast - purescript-cst regex-base regex-tdfa safe scientific semialign - semigroups serialise sourcemap split stm stringsearch syb tasty - tasty-golden tasty-hspec tasty-quickcheck text these time - transformers transformers-base transformers-compat + parallel parsec pattern-arrows process protolude purescript-cst + QuickCheck regex-base regex-tdfa safe scientific semialign + semigroups serialise sourcemap split stm stringsearch syb text + these time transformers transformers-base transformers-compat unordered-containers utf8-string vector ]; testToolDepends = [ happy hspec-discover ]; @@ -211945,25 +212337,20 @@ self: { }) {}; "purescript-cst" = callPackage - ({ mkDerivation, array, base, base-compat, bytestring, containers - , dlist, filepath, happy, purescript-ast, scientific, semigroups - , tasty, tasty-golden, tasty-quickcheck, text + ({ mkDerivation, aeson, array, base, base-compat, bytestring + , containers, deepseq, dlist, filepath, happy, microlens, mtl + , protolude, scientific, semigroups, serialise, text, vector }: mkDerivation { pname = "purescript-cst"; - version = "0.1.1.0"; - sha256 = "05jqf9c0pakbjvr2zvybaxg9rfi87dadsx4srjlrw294r2sz969r"; + version = "0.2.0.0"; + sha256 = "0spsl9aq7hg2pkqawwjirgdr8ypzpb9amf2pznxmn6wm9ppaq73s"; libraryHaskellDepends = [ - array base containers dlist purescript-ast scientific semigroups - text + aeson array base base-compat bytestring containers deepseq dlist + filepath microlens mtl protolude scientific semigroups serialise + text vector ]; libraryToolDepends = [ happy ]; - testHaskellDepends = [ - array base base-compat bytestring containers dlist filepath - purescript-ast scientific semigroups tasty tasty-golden - tasty-quickcheck text - ]; - testToolDepends = [ happy ]; description = "PureScript Programming Language Concrete Syntax Tree"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -217317,45 +217704,23 @@ self: { "rebase" = callPackage ({ mkDerivation, base, bifunctors, bytestring, comonad, containers - , contravariant, contravariant-extras, deepseq, dlist, either - , hashable, mtl, profunctors, scientific, selective, semigroupoids - , semigroups, stm, text, time, transformers, unordered-containers - , uuid, vector, void - }: - mkDerivation { - pname = "rebase"; - version = "1.6.1"; - sha256 = "020aw7wlgx8nqbq6ara13szgxw2q0n0hx3vrsn2lfp53b2jdsvax"; - libraryHaskellDepends = [ - base bifunctors bytestring comonad containers contravariant - contravariant-extras deepseq dlist either hashable mtl profunctors - scientific selective semigroupoids semigroups stm text time - transformers unordered-containers uuid vector void - ]; - description = "A more progressive alternative to the \"base\" package"; - license = lib.licenses.mit; - }) {}; - - "rebase_1_13" = callPackage - ({ mkDerivation, base, bifunctors, bytestring, comonad, containers , contravariant, deepseq, dlist, either, hashable, hashable-time , mtl, profunctors, scientific, selective, semigroupoids, stm, text - , time, transformers, unordered-containers, uuid, vector + , time, transformers, unordered-containers, uuid-types, vector , vector-instances, void }: mkDerivation { pname = "rebase"; - version = "1.13"; - sha256 = "0cqpp2cn3yi9d825qzavs52ky77b628fm8p7w51zy9qjx1p7650v"; + version = "1.13.0.1"; + sha256 = "0sh1vha10n28c4jb97p99xglghqph8ppydqzbnb2h25a34057927"; libraryHaskellDepends = [ base bifunctors bytestring comonad containers contravariant deepseq dlist either hashable hashable-time mtl profunctors scientific selective semigroupoids stm text time transformers - unordered-containers uuid vector vector-instances void + unordered-containers uuid-types vector vector-instances void ]; description = "A more progressive alternative to the \"base\" package"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "rebindable" = callPackage @@ -219616,10 +219981,8 @@ self: { }: mkDerivation { pname = "regex-tdfa"; - version = "1.3.1.0"; - sha256 = "1h1fliv2zjxwmddl9wnn7ckxxpgy1049hdfg6fcknyrr7mw7dhqm"; - revision = "2"; - editedCabalFile = "1hvcqdywwlcpia7qss7ikr9bq0lvkk8z0mjgaylaqpzlgh00z3gb"; + version = "1.3.1.1"; + sha256 = "1msrq31k4jmn2lmrdzn87jqarqhw265ca69rfg5jpa5adrzm3gmi"; libraryHaskellDepends = [ array base bytestring containers mtl parsec regex-base text ]; @@ -221472,6 +221835,39 @@ self: { maintainers = with lib.maintainers; [ maralorn ]; }) {}; + "req_3_9_1" = callPackage + ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder + , bytestring, case-insensitive, connection, exceptions, hspec + , hspec-core, hspec-discover, http-api-data, http-client + , http-client-tls, http-types, modern-uri, monad-control, mtl + , QuickCheck, retry, template-haskell, text, time, transformers + , transformers-base, unliftio-core, unordered-containers + }: + mkDerivation { + pname = "req"; + version = "3.9.1"; + sha256 = "0468ah4142jrqp5l3pw4izrw6f6kznisan888b30jhif4c6xncr0"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson authenticate-oauth base blaze-builder bytestring + case-insensitive connection exceptions http-api-data http-client + http-client-tls http-types modern-uri monad-control mtl retry + template-haskell text time transformers transformers-base + unliftio-core + ]; + testHaskellDepends = [ + aeson base blaze-builder bytestring case-insensitive hspec + hspec-core http-client http-types modern-uri monad-control mtl + QuickCheck retry template-haskell text time unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + doCheck = false; + description = "HTTP client library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ maralorn ]; + }) {}; + "req-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-extra, hspec , http-client, req, resourcet, temporary, transformers, weigh @@ -221654,23 +222050,11 @@ self: { ({ mkDerivation, rebase }: mkDerivation { pname = "rerebase"; - version = "1.6.1"; - sha256 = "0lyi925jk6jbi3qc5xmv61ag07ff9d3xxmf9hfjlblqw2y9fsy93"; - libraryHaskellDepends = [ rebase ]; - description = "Reexports from \"base\" with a bunch of other standard libraries"; - license = lib.licenses.mit; - }) {}; - - "rerebase_1_13" = callPackage - ({ mkDerivation, rebase }: - mkDerivation { - pname = "rerebase"; - version = "1.13"; - sha256 = "1ng16dnlrxcy76mpw21mwf2sk70q4i0kmqhxikjhc2h06zdpkqfr"; + version = "1.13.0.1"; + sha256 = "0j50l96whwi65ir35nfhn24h6103zy1ilfjsqiax63ajzw169fkv"; libraryHaskellDepends = [ rebase ]; description = "Reexports from \"base\" with a bunch of other standard libraries"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "reroute" = callPackage @@ -224756,6 +225140,8 @@ self: { pname = "rounded"; version = "1.1"; sha256 = "0hja4ak3qd80zg996jwyi1kndj2vfsp10vwr4wyrcvppzl4gj4a0"; + revision = "1"; + editedCabalFile = "02zrazan3ljalfy1cnr3d0cdw7n426k5wg5xkifk87vb8ds2wx1j"; libraryHaskellDepends = [ base ghc-prim hgmp long-double reflection ]; @@ -224982,18 +225368,52 @@ self: { "rp-tree" = callPackage ({ mkDerivation, base, benchpress, boxes, bytestring, conduit - , containers, deepseq, hspec, QuickCheck, serialise, splitmix - , splitmix-distributions, transformers, vector, vector-algorithms + , containers, deepseq, hspec, microlens, microlens-th, mtl + , psqueues, QuickCheck, serialise, splitmix, splitmix-distributions + , text, transformers, vector, vector-algorithms }: mkDerivation { pname = "rp-tree"; - version = "0.3.6"; - sha256 = "0dz2xkgmk3lfr0pnc7xzfz756bzdkbmb2m96zdpw7vgyz59h9i64"; + version = "0.4"; + sha256 = "1pni4pmvk2cb3x98lma0isbn8vh651pyql0dmjmg4nvr8i471iqf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base boxes bytestring conduit containers deepseq microlens + microlens-th mtl psqueues serialise splitmix splitmix-distributions + text transformers vector vector-algorithms + ]; + executableHaskellDepends = [ + base conduit containers splitmix splitmix-distributions + transformers vector + ]; + testHaskellDepends = [ + base conduit hspec QuickCheck splitmix-distributions + ]; + benchmarkHaskellDepends = [ + base benchpress conduit deepseq splitmix splitmix-distributions + transformers vector + ]; + description = "Random projection trees"; + license = lib.licenses.bsd3; + }) {}; + + "rp-tree_0_6" = callPackage + ({ mkDerivation, base, benchpress, boxes, bytestring, conduit + , containers, deepseq, heaps, hspec, mtl, QuickCheck, serialise + , splitmix, splitmix-distributions, text, transformers, vector + , vector-algorithms + }: + mkDerivation { + pname = "rp-tree"; + version = "0.6"; + sha256 = "0ww3ckf1bq24p4d52mip6mxxk0z65p3pq7d4a1xy8yalsjhyyl0h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base boxes bytestring conduit containers deepseq serialise splitmix - splitmix-distributions transformers vector vector-algorithms + base boxes bytestring conduit containers deepseq heaps mtl + serialise splitmix splitmix-distributions text transformers vector + vector-algorithms ]; executableHaskellDepends = [ base conduit containers splitmix splitmix-distributions @@ -225008,6 +225428,7 @@ self: { ]; description = "Random projection trees"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "rpc" = callPackage @@ -225082,6 +225503,18 @@ self: { broken = true; }) {}; + "rpm-nvr" = callPackage + ({ mkDerivation, base, extra, hspec }: + mkDerivation { + pname = "rpm-nvr"; + version = "0.1.0"; + sha256 = "11w40vw18wbxhd0lbjh75a1bc4sqwh9xqv2iaa6kd8cd6c7ij26x"; + libraryHaskellDepends = [ base extra ]; + testHaskellDepends = [ base hspec ]; + description = "RPM package name-version-release datatypes"; + license = lib.licenses.gpl2Only; + }) {}; + "rpmbuild-order" = callPackage ({ mkDerivation, base, case-insensitive, containers, directory , extra, fgl, filepath, graphviz, hspec, optparse-applicative @@ -225212,8 +225645,8 @@ self: { pname = "rss"; version = "3000.2.0.7"; sha256 = "0z48xb610k1h29rg03q19y08fp78agxp2gr48innw5y3rz00s6ym"; - revision = "1"; - editedCabalFile = "0ql1ffjw0g1sdyz9icin4cq86i5b9ljzhvpivfbbyaipg2nc9z0s"; + revision = "3"; + editedCabalFile = "02jbnl7y76ahjdj2bciyjwgcglfs7sy60733z5c8610rk34f99dy"; libraryHaskellDepends = [ base HaXml network network-uri time ]; description = "A library for generating RSS 2.0 feeds."; license = lib.licenses.publicDomain; @@ -225875,17 +226308,6 @@ self: { }) {}; "safe-coloured-text" = callPackage - ({ mkDerivation, base, bytestring, terminfo, text }: - mkDerivation { - pname = "safe-coloured-text"; - version = "0.0.0.0"; - sha256 = "0c07527g35gpxif8ia07x766pmzcf4m1cgjz9lkac973n12iwllx"; - libraryHaskellDepends = [ base bytestring terminfo text ]; - description = "Safely output coloured text"; - license = lib.licenses.mit; - }) {}; - - "safe-coloured-text_0_1_0_0" = callPackage ({ mkDerivation, base, bytestring, text, validity , validity-bytestring, validity-text }: @@ -225898,7 +226320,6 @@ self: { ]; description = "Safely output coloured text"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "safe-coloured-text-gen" = callPackage @@ -225919,8 +226340,6 @@ self: { ]; testToolDepends = [ sydtest-discover ]; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "safe-coloured-text-layout" = callPackage @@ -225938,8 +226357,6 @@ self: { testToolDepends = [ sydtest-discover ]; description = "Safely layout output coloured text"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "safe-coloured-text-layout-gen" = callPackage @@ -225960,7 +226377,6 @@ self: { ]; testToolDepends = [ sydtest-discover ]; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "safe-coloured-text-terminfo" = callPackage @@ -225972,23 +226388,19 @@ self: { libraryHaskellDepends = [ base safe-coloured-text terminfo ]; description = "Safely output coloured text"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "safe-decimal" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, deepseq, doctest - , exceptions, hspec, hspec-discover, QuickCheck, scientific - , template-haskell + ({ mkDerivation, base, deepseq, doctest, exceptions, hspec + , hspec-discover, QuickCheck, scientific }: mkDerivation { pname = "safe-decimal"; - version = "0.2.0.0"; - sha256 = "03id56ib8m7gja2g5a8d6b26cz3h3zf3f3gq2ss7paxvwvn6wfib"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; + version = "0.2.1.0"; + sha256 = "1q7l8rj5hhkxxhmmibcm0by7psvkw9lj82zd48slyfikmsdm9bdw"; libraryHaskellDepends = [ base deepseq exceptions scientific ]; testHaskellDepends = [ - base deepseq doctest hspec QuickCheck scientific template-haskell + base deepseq doctest hspec QuickCheck scientific ]; testToolDepends = [ hspec-discover ]; description = "Safe and very efficient arithmetic operations on fixed decimal point numbers"; @@ -226263,7 +226675,6 @@ self: { testHaskellDepends = [ base containers doctest ]; description = "Safe arithmetic operations"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "safe-plugins" = callPackage @@ -226608,8 +227019,8 @@ self: { pname = "salak"; version = "0.3.6"; sha256 = "00qyd09az0ldfidfgcki8z3r9gcpxmss3iyr99as5bky29rlz9n3"; - revision = "4"; - editedCabalFile = "07q9a24ry6h6r3m1av0dxz39dzmyjhlcrw1ww5jprqcf3xxjxhdz"; + revision = "5"; + editedCabalFile = "1dqanr95rrmjxfw882fa6as7n999883gfsy2765f3rprl7wlmigl"; libraryHaskellDepends = [ base bytestring containers data-default directory dlist exceptions filepath hashable heaps megaparsec mtl scientific text time @@ -227041,49 +227452,6 @@ self: { }: mkDerivation { pname = "sandwich"; - version = "0.1.0.6"; - sha256 = "18fl6zdz7q5cm9ypnlgxyk5gh9r0yq481k04q0z740j2h1m5vgj8"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal async base brick bytestring colour containers - directory exceptions filepath free haskell-src-exts lens - lifted-async microlens microlens-th monad-control monad-logger mtl - optparse-applicative pretty-show process safe safe-exceptions stm - string-interpolate template-haskell text time transformers - transformers-base unix unliftio-core vector vty - ]; - executableHaskellDepends = [ - aeson ansi-terminal async base brick bytestring colour containers - directory exceptions filepath free haskell-src-exts lens - lifted-async microlens microlens-th monad-control monad-logger mtl - optparse-applicative pretty-show process safe safe-exceptions stm - string-interpolate template-haskell text time transformers - transformers-base unix unliftio-core vector vty - ]; - testHaskellDepends = [ - aeson ansi-terminal async base brick bytestring colour containers - directory exceptions filepath free haskell-src-exts lens - lifted-async microlens microlens-th monad-control monad-logger mtl - optparse-applicative pretty-show process safe safe-exceptions stm - string-interpolate template-haskell text time transformers - transformers-base unix unliftio-core vector vty - ]; - description = "Yet another test framework for Haskell"; - license = lib.licenses.bsd3; - }) {}; - - "sandwich_0_1_0_7" = callPackage - ({ mkDerivation, aeson, ansi-terminal, async, base, brick - , bytestring, colour, containers, directory, exceptions, filepath - , free, haskell-src-exts, lens, lifted-async, microlens - , microlens-th, monad-control, monad-logger, mtl - , optparse-applicative, pretty-show, process, safe, safe-exceptions - , stm, string-interpolate, template-haskell, text, time - , transformers, transformers-base, unix, unliftio-core, vector, vty - }: - mkDerivation { - pname = "sandwich"; version = "0.1.0.7"; sha256 = "1ndw054vp2ygxd86whqbsdvrbv49khh1a6ia9zlqzx3gjbhqpxxi"; isLibrary = true; @@ -227114,7 +227482,6 @@ self: { ]; description = "Yet another test framework for Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "sandwich-quickcheck" = callPackage @@ -227178,49 +227545,6 @@ self: { }: mkDerivation { pname = "sandwich-webdriver"; - version = "0.1.0.4"; - sha256 = "0vmqm2f78vd8kk0adg7ldd6rlb5rw5hks9q705gws9dj6s4nyz9r"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base containers convertible data-default directory exceptions - filepath http-client http-client-tls http-conduit lifted-base - microlens microlens-aeson monad-control monad-logger mtl network - process random retry safe safe-exceptions sandwich - string-interpolate temporary text time transformers unix - unordered-containers vector webdriver X11 - ]; - executableHaskellDepends = [ - aeson base containers convertible data-default directory exceptions - filepath http-client http-client-tls http-conduit lifted-base - microlens microlens-aeson monad-control monad-logger mtl network - process random retry safe safe-exceptions sandwich - string-interpolate temporary text time transformers unix - unordered-containers vector webdriver X11 - ]; - testHaskellDepends = [ - aeson base containers convertible data-default directory exceptions - filepath http-client http-client-tls http-conduit lifted-base - microlens microlens-aeson monad-control monad-logger mtl network - process random retry safe safe-exceptions sandwich - string-interpolate temporary text time transformers unix - unordered-containers vector webdriver X11 - ]; - description = "Sandwich integration with Selenium WebDriver"; - license = lib.licenses.bsd3; - }) {}; - - "sandwich-webdriver_0_1_0_5" = callPackage - ({ mkDerivation, aeson, base, containers, convertible, data-default - , directory, exceptions, filepath, http-client, http-client-tls - , http-conduit, lifted-base, microlens, microlens-aeson - , monad-control, monad-logger, mtl, network, process, random, retry - , safe, safe-exceptions, sandwich, string-interpolate, temporary - , text, time, transformers, unix, unordered-containers, vector - , webdriver, X11 - }: - mkDerivation { - pname = "sandwich-webdriver"; version = "0.1.0.5"; sha256 = "113as1i4f3hghbwrf4ii8lnxxb8nih177ffjbx3shsddnhx0fa8y"; isLibrary = true; @@ -227251,7 +227575,6 @@ self: { ]; description = "Sandwich integration with Selenium WebDriver"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "sarasvati" = callPackage @@ -228472,7 +228795,6 @@ self: { ]; description = "Scientific notation intended for tokenization"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "scion" = callPackage @@ -231409,8 +231731,8 @@ self: { }: mkDerivation { pname = "servant-JuicyPixels"; - version = "0.3.0.5"; - sha256 = "1lhxb6z8xypx48k8hwzqpp92qww8wxbp3a1ggik4dfrcxkcklmlx"; + version = "0.3.0.6"; + sha256 = "16bdlgrz71h03lr2xcd2isclfzgr9h2xdl5lbnbs0v1czaxx7m6h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -231460,6 +231782,8 @@ self: { pname = "servant-auth"; version = "0.4.0.0"; sha256 = "0v2g80kakjwpws92bk3anzy4k8vgxq99y7g3ib4amc5x6kxcmjh1"; + revision = "2"; + editedCabalFile = "0mbx44l1jnvfvppv6diiixqx5rdkb68djxl36m5sd12qz6rqmcx0"; libraryHaskellDepends = [ aeson base jose lens servant text unordered-containers ]; @@ -231534,8 +231858,8 @@ self: { pname = "servant-auth-docs"; version = "0.2.10.0"; sha256 = "0j1ynnrb6plrhpb2vzs2p7a9jb41llp0j1jwgap7hjhkwhyc7wxd"; - revision = "5"; - editedCabalFile = "1113d9hczzksy5bqf8pfriz9x158xr4a3p5na8p83vl46ddad82y"; + revision = "7"; + editedCabalFile = "10178ahxq36l9mik7dcn1c1f97fpp8b4r7xiqwiv21llp95s7cqp"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base lens servant servant-auth servant-docs text @@ -231598,6 +231922,8 @@ self: { pname = "servant-auth-server"; version = "0.4.6.0"; sha256 = "0isl9pzzhfbs8pgh3qr2vbgfp0bh741dfa59sq7n3cmbkc6ndpkk"; + revision = "2"; + editedCabalFile = "1vf0mnbq0wmwha3aa2fn593dwibaw00l4agspgvchx7574jyr5wp"; libraryHaskellDepends = [ aeson base base64-bytestring blaze-builder bytestring case-insensitive cookie data-default-class entropy http-types jose @@ -231622,6 +231948,8 @@ self: { pname = "servant-auth-swagger"; version = "0.2.10.1"; sha256 = "029nvb4wxwl98ah26bgcq1b7izrnvssxwn1682liimvsh4a8bady"; + revision = "2"; + editedCabalFile = "0b8fawx2wv9zshn9i4abnwy4lgf3fkhbhm8bhfpgm9d867dx21y4"; libraryHaskellDepends = [ base lens servant servant-auth servant-swagger swagger2 text ]; @@ -232131,6 +232459,8 @@ self: { pname = "servant-docs"; version = "0.11.8"; sha256 = "0zbsv75zyfg44l4822qnmvw2naxcxwgnpzc55jnvz766l2dydjrb"; + revision = "1"; + editedCabalFile = "0bfhypzm02aqwckjrvjmhvf602di0pmp4r0rjbfcraxzvkrzm6qv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -232380,8 +232710,8 @@ self: { pname = "servant-foreign"; version = "0.15.3"; sha256 = "1bz2ry5pd8cx5pmsvg7q29r9gd5kqjjv9nd97f7abwjqi8as2413"; - revision = "1"; - editedCabalFile = "0d9h941g7ja73g10az13pad9rjlp126b662f71q7c8yd6kh4jl9r"; + revision = "2"; + editedCabalFile = "1fdbxyyp2h5gcighjrww2mbg8z6givmhx2in8293kw58w7y2im0i"; libraryHaskellDepends = [ base base-compat http-types lens servant text ]; @@ -232635,6 +232965,8 @@ self: { pname = "servant-js"; version = "0.9.4.2"; sha256 = "15n5s3i491cxjxj70wa8yhpipaz47q46s04l4ysc64wgijlnm8xy"; + revision = "1"; + editedCabalFile = "0lka70i2qjjj9x8i1ilsfgqq5hwdlrcyd2cj1qcpyhj85c9anxl3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -232819,32 +233151,61 @@ self: { }) {}; "servant-multipart" = callPackage - ({ mkDerivation, array, base, bytestring, directory, http-client - , http-media, http-types, lens, network, random, resourcet, servant - , servant-client, servant-client-core, servant-docs - , servant-foreign, servant-server, string-conversions, tasty - , tasty-wai, text, transformers, wai, wai-extra, warp + ({ mkDerivation, base, bytestring, directory, http-types, lens + , resourcet, servant, servant-docs, servant-foreign + , servant-multipart-api, servant-server, string-conversions, tasty + , tasty-wai, text, wai, wai-extra }: mkDerivation { pname = "servant-multipart"; - version = "0.12"; - sha256 = "1hs1h66zjhknfnz1bdi5c0d2sfb20fc7x9adbc87gq168k8riqvl"; - revision = "2"; - editedCabalFile = "019zk4vlm9gv8n85qv6819i6qn0ddiz56birlmabz2n95l715m7y"; + version = "0.12.1"; + sha256 = "1p55kb3zhq25ncp7wimhggssn68abfgsnlldk13rk1iajaj6y8y5"; + libraryHaskellDepends = [ + base bytestring directory lens resourcet servant servant-docs + servant-foreign servant-multipart-api servant-server + string-conversions text wai wai-extra + ]; + testHaskellDepends = [ + base bytestring http-types servant-server string-conversions tasty + tasty-wai text + ]; + description = "multipart/form-data (e.g file upload) support for servant"; + license = lib.licenses.bsd3; + }) {}; + + "servant-multipart-api" = callPackage + ({ mkDerivation, base, bytestring, servant, text, transformers }: + mkDerivation { + pname = "servant-multipart-api"; + version = "0.12.1"; + sha256 = "1gifa9g7ggs0plzffrd9a8j24dmqvgbkkdkfzyy7mpmwrjqw7mcj"; + libraryHaskellDepends = [ + base bytestring servant text transformers + ]; + description = "multipart/form-data (e.g file upload) support for servant"; + license = lib.licenses.bsd3; + }) {}; + + "servant-multipart-client" = callPackage + ({ mkDerivation, array, base, bytestring, http-client, http-media + , network, random, servant, servant-client, servant-client-core + , servant-multipart, servant-multipart-api, servant-server, text + , warp + }: + mkDerivation { + pname = "servant-multipart-client"; + version = "0.12.1"; + sha256 = "07haaf9nq96lfv2dhqf4319vl321f53v0mypbbg3swzb6rrfkw9h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base bytestring directory http-media lens random resourcet - servant servant-client-core servant-docs servant-foreign - servant-server string-conversions text transformers wai wai-extra + array base bytestring http-media random servant servant-client-core + servant-multipart-api text ]; executableHaskellDepends = [ base bytestring http-client network servant servant-client - servant-client-core servant-server text transformers wai warp - ]; - testHaskellDepends = [ - base bytestring http-types servant-server string-conversions tasty - tasty-wai text + servant-client-core servant-multipart servant-multipart-api + servant-server warp ]; description = "multipart/form-data (e.g file upload) support for servant"; license = lib.licenses.bsd3; @@ -234491,7 +234852,6 @@ self: { executableToolDepends = [ alex happy ]; description = "Treating files as sets to perform rapid set manipulation"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "setenv" = callPackage @@ -237507,8 +237867,8 @@ self: { }: mkDerivation { pname = "simple-parser"; - version = "0.3.0"; - sha256 = "05a4aakq93nqmm632mijd64vjq07dlpcb1m2a57z6k1mhqinwxc5"; + version = "0.5.0"; + sha256 = "0qkgk7gxk69ns4067viz59wbp5hz05j1d26hv0wmbkhixsxa56s3"; libraryHaskellDepends = [ base containers list-t mmorph mtl nonempty-containers scientific text text-builder @@ -237794,8 +238154,8 @@ self: { }: mkDerivation { pname = "simple-ui"; - version = "0.1.2"; - sha256 = "106fcxl97gnkpv2bc50bg5zv8j7f1cdyxbl1l99p3rsq6wr6mr0m"; + version = "0.3.0"; + sha256 = "1dn9ma1kvn3gcgdcc09s38nlmcmcfifr7gcdn59ghp7pxxb8dxds"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base data-default-class exceptions lens mtl stm template-haskell @@ -239571,6 +239931,29 @@ self: { license = lib.licenses.gpl3Plus; }) {}; + "slynx_0_5_1_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers + , elynx-markov, elynx-seq, elynx-tools, elynx-tree, hmatrix + , monad-logger, mwc-random, optparse-applicative, statistics, text + , transformers, vector + }: + mkDerivation { + pname = "slynx"; + version = "0.5.1.0"; + sha256 = "14wg6ws065wz0h8nid3w0bpspanyfarc2c3gs93225ismmbjk1ng"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base bytestring containers elynx-markov elynx-seq + elynx-tools elynx-tree hmatrix monad-logger mwc-random + optparse-applicative statistics text transformers vector + ]; + executableHaskellDepends = [ base ]; + description = "Handle molecular sequences"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "small-bytearray-builder" = callPackage ({ mkDerivation, base, bytebuild, byteslice }: mkDerivation { @@ -239582,6 +239965,7 @@ self: { description = "Serialize to bytes"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "smallarray" = callPackage @@ -240031,7 +240415,6 @@ self: { libraryHaskellDepends = [ base bytesmith primitive ]; description = "Parse arrays of tokens"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "smith-cli" = callPackage @@ -242690,22 +243073,22 @@ self: { }) {}; "sound-collage" = callPackage - ({ mkDerivation, array, base, Cabal, carray, containers, fft - , filepath, numeric-prelude, optparse-applicative, pathtype - , sample-frame, soxlib, storablevector, storablevector-carray + ({ mkDerivation, array, base, carray, containers, fft, filepath + , numeric-prelude, optparse-applicative, pathtype, sample-frame + , shell-utility, soxlib, storablevector, storablevector-carray , synthesizer-core, temporary, transformers, utility-ht }: mkDerivation { pname = "sound-collage"; - version = "0.2.0.1"; - sha256 = "0ywsy3q8f6y6k0vg4g21v6cm3n7662ngbzvfx502makdkf47i75a"; + version = "0.2.0.2"; + sha256 = "11rirlg25iawv4shwhvc4bcnzk4axvgk5n7yj05nnbpyx4s6r0pp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - array base Cabal carray containers fft filepath numeric-prelude - optparse-applicative pathtype sample-frame soxlib storablevector - storablevector-carray synthesizer-core temporary transformers - utility-ht + array base carray containers fft filepath numeric-prelude + optparse-applicative pathtype sample-frame shell-utility soxlib + storablevector storablevector-carray synthesizer-core temporary + transformers utility-ht ]; description = "Approximate a song from other pieces of sound"; license = lib.licenses.bsd3; @@ -243485,23 +243868,6 @@ self: { ({ mkDerivation, base, cmdargs, containers, express, leancheck }: mkDerivation { pname = "speculate"; - version = "0.4.6"; - sha256 = "0vpc2vxfpziyz0hzapni4j31g1i12m2gnsrq72zf42qbhjwif57g"; - libraryHaskellDepends = [ - base cmdargs containers express leancheck - ]; - testHaskellDepends = [ base express leancheck ]; - benchmarkHaskellDepends = [ base express leancheck ]; - description = "discovery of properties about Haskell functions"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "speculate_0_4_8" = callPackage - ({ mkDerivation, base, cmdargs, containers, express, leancheck }: - mkDerivation { - pname = "speculate"; version = "0.4.8"; sha256 = "1xrrd1r4sbhvahdd3k9xnh8w9mmk4zh738q9blrjnvnd560wybp4"; libraryHaskellDepends = [ @@ -245161,8 +245527,8 @@ self: { }: mkDerivation { pname = "stack-all"; - version = "0.2.1"; - sha256 = "07azc2phnljxwxskxlipmx52vjyavxn54q87k1bakapla469fdr4"; + version = "0.2.2"; + sha256 = "0bk22ryqvyc4r058yj3ngq33wv24m7r1alnbvg4c0h08fmwxi4m0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -249553,8 +249919,8 @@ self: { ({ mkDerivation, base, bytestring, text }: mkDerivation { pname = "stripe-concepts"; - version = "1.0.2.6"; - sha256 = "0vz8kiwg9q27jhr6gfvhqy9gykrl3zgy3m2ldk1np4v7y4fg7906"; + version = "1.0.2.8"; + sha256 = "03sqgmbbjqi18wjb96sc3lvc6p3bqk5sgsgbcf9z8k9rbdspribm"; libraryHaskellDepends = [ base bytestring text ]; description = "Types for the Stripe API"; license = lib.licenses.mit; @@ -249663,8 +250029,8 @@ self: { }: mkDerivation { pname = "stripe-scotty"; - version = "1.0.0.8"; - sha256 = "1r91lf3yjivfcxdnqy1ayfzs2ckszyx8x6f6fn8rjiz0gfv1v6hn"; + version = "1.1"; + sha256 = "15l3b01wf55k3cnwspkqvphs822cmdbnxyfcka8bi0vaj8xl84x9"; libraryHaskellDepends = [ aeson base bytestring http-types scotty stripe-concepts stripe-signature text unordered-containers @@ -249696,8 +250062,8 @@ self: { }: mkDerivation { pname = "stripe-signature"; - version = "1.0.0.8"; - sha256 = "0cybjsvzknsldqhf7fjd4ar2qjyym43x2ymmgw01f9a1ixyaxgmn"; + version = "1.0.0.10"; + sha256 = "04b5z6hnm000fii4qiczm4xpr41v55fgcj07yh35iwh4gwgc7c4h"; libraryHaskellDepends = [ base base16-bytestring bytestring cryptonite memory stripe-concepts text @@ -249734,8 +250100,8 @@ self: { }: mkDerivation { pname = "stripe-wreq"; - version = "1.0.1.8"; - sha256 = "1km0h94d1clgba0yy520yx54axdkf4xl5p5hnmn8ghg40r0pax73"; + version = "1.0.1.10"; + sha256 = "0pxaffbmnibivg8pdkvmyjkw8hz0grq3x84apd94mkji7vjg9xgh"; libraryHaskellDepends = [ aeson base bytestring lens stripe-concepts text unordered-containers wreq @@ -251626,6 +251992,32 @@ self: { license = lib.licenses.lgpl21Only; }) {}; + "swish_0_10_0_5" = callPackage + ({ mkDerivation, base, containers, directory, filepath, hashable + , HUnit, intern, mtl, network-uri, old-locale, polyparse + , semigroups, test-framework, test-framework-hunit, text, time + }: + mkDerivation { + pname = "swish"; + version = "0.10.0.5"; + sha256 = "0cf3aba585hnlaamwfxy9mfp8mjanza0zgp27gi2y66f79hcpq2q"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base containers directory filepath hashable intern mtl network-uri + old-locale polyparse text time + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base containers hashable HUnit network-uri old-locale semigroups + test-framework test-framework-hunit text time + ]; + description = "A semantic web toolkit"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "swiss-ephemeris" = callPackage ({ mkDerivation, base, directory, hspec, hspec-discover, QuickCheck }: @@ -251778,23 +252170,24 @@ self: { "sydtest" = callPackage ({ mkDerivation, async, base, bytestring, containers, Diff, dlist - , envparse, MonadRandom, mtl, optparse-applicative, path, path-io - , pretty-show, QuickCheck, quickcheck-io, random-shuffle, safe - , safe-coloured-text, split, stm, sydtest-discover, text, yaml - , yamlparse-applicative + , envparse, filepath, MonadRandom, mtl, optparse-applicative, path + , path-io, pretty-show, QuickCheck, quickcheck-io, random-shuffle + , safe, safe-coloured-text, safe-coloured-text-terminfo, split, stm + , sydtest-discover, text, yaml, yamlparse-applicative }: mkDerivation { pname = "sydtest"; - version = "0.1.0.0"; - sha256 = "1r5p9vai0krzcnwxyicw9b00vzdqdm8zpj70y8snn4mdxxvhvyvq"; + version = "0.2.0.0"; + sha256 = "1k0jpnvfizvgscwpgd827w7x4nczlv7krwj10y35byj79wb5xy2m"; libraryHaskellDepends = [ - async base bytestring containers Diff dlist envparse MonadRandom - mtl optparse-applicative path path-io pretty-show QuickCheck - quickcheck-io random-shuffle safe safe-coloured-text split text - yaml yamlparse-applicative + async base bytestring containers Diff dlist envparse filepath + MonadRandom mtl optparse-applicative path path-io pretty-show + QuickCheck quickcheck-io random-shuffle safe safe-coloured-text + safe-coloured-text-terminfo split text yaml yamlparse-applicative ]; testHaskellDepends = [ - base bytestring path path-io QuickCheck safe-coloured-text stm text + base bytestring path path-io QuickCheck safe-coloured-text + safe-coloured-text-terminfo stm text ]; testToolDepends = [ sydtest-discover ]; description = "A modern testing framework for Haskell with good defaults and advanced testing features"; @@ -251802,6 +252195,46 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "sydtest-aeson" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, path + , path-io, sydtest, sydtest-discover, text + }: + mkDerivation { + pname = "sydtest-aeson"; + version = "0.0.0.0"; + sha256 = "0x4n27v60m6h44xwpf60j11j1r9r1zzixlszq21skrf2r6lla2gn"; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring path path-io sydtest text + ]; + testHaskellDepends = [ aeson base sydtest text ]; + testToolDepends = [ sydtest-discover ]; + description = "An aeson companion library for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + + "sydtest-amqp" = callPackage + ({ mkDerivation, aeson, amqp, async, base, bytestring, network + , path, path-io, port-utils, process, stm, sydtest + , sydtest-discover, sydtest-rabbitmq, sydtest-typed-process, text + , typed-process + }: + mkDerivation { + pname = "sydtest-amqp"; + version = "0.1.0.0"; + sha256 = "122n2nf0z2s925yjg6zlp3bvl70yprip57v6775vqglhbr959v8m"; + libraryHaskellDepends = [ + aeson amqp async base bytestring network path path-io port-utils + process stm sydtest sydtest-rabbitmq sydtest-typed-process text + typed-process + ]; + testHaskellDepends = [ amqp base sydtest ]; + testToolDepends = [ sydtest-discover ]; + description = "An amqp companion library for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + "sydtest-discover" = callPackage ({ mkDerivation, base, filepath, optparse-applicative, path , path-io @@ -251821,14 +252254,92 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "sydtest-hedis" = callPackage + ({ mkDerivation, base, bytestring, hedis, network, path, path-io + , port-utils, sydtest, sydtest-discover, sydtest-typed-process + , text, typed-process + }: + mkDerivation { + pname = "sydtest-hedis"; + version = "0.0.0.0"; + sha256 = "0y31aqn4ra92arq054amhkcxxng0wsngv59ngwn05gc5jv6whi9j"; + libraryHaskellDepends = [ + base bytestring hedis network path path-io port-utils sydtest + sydtest-typed-process text typed-process + ]; + testHaskellDepends = [ base hedis sydtest ]; + testToolDepends = [ sydtest-discover ]; + description = "An hedis companion library for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + + "sydtest-hspec" = callPackage + ({ mkDerivation, base, hspec, hspec-core, mtl, sydtest + , sydtest-discover + }: + mkDerivation { + pname = "sydtest-hspec"; + version = "0.0.0.0"; + sha256 = "1fjj6v1f6rilzjcjgg0yqmhhmj067g45sw7q2xr8q9p7qiqnpkh1"; + libraryHaskellDepends = [ base hspec-core mtl sydtest ]; + testHaskellDepends = [ base hspec sydtest ]; + testToolDepends = [ sydtest-discover ]; + description = "An Hspec companion library for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + + "sydtest-mongo" = callPackage + ({ mkDerivation, base, binary, bson, bytestring, mongoDB, network + , path, path-io, port-utils, process, sydtest, sydtest-discover + , sydtest-process, text, yaml + }: + mkDerivation { + pname = "sydtest-mongo"; + version = "0.0.0.0"; + sha256 = "0jm2c05dxri0w83ii3pyphb2rrla72fih5g26w0indb51i0wlnq1"; + libraryHaskellDepends = [ + base binary bson bytestring mongoDB network path path-io port-utils + process sydtest sydtest-process text yaml + ]; + testHaskellDepends = [ base mongoDB sydtest text ]; + testToolDepends = [ sydtest-discover ]; + description = "An mongoDB companion library for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + + "sydtest-persistent-postgresql" = callPackage + ({ mkDerivation, base, monad-logger, mtl, persistent + , persistent-postgresql, persistent-template, sydtest + , sydtest-discover, tmp-postgres + }: + mkDerivation { + pname = "sydtest-persistent-postgresql"; + version = "0.1.0.0"; + sha256 = "1g669w4rcjd7pnf6hrcc5lb6li30m9fdkrchm00bmg1350kxmnmp"; + libraryHaskellDepends = [ + base monad-logger mtl persistent persistent-postgresql sydtest + tmp-postgres + ]; + testHaskellDepends = [ + base persistent persistent-postgresql persistent-template sydtest + ]; + testToolDepends = [ sydtest-discover ]; + description = "An persistent-postgresql companion library for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + "sydtest-persistent-sqlite" = callPackage ({ mkDerivation, base, monad-logger, mtl, persistent , persistent-sqlite, persistent-template, sydtest, sydtest-discover }: mkDerivation { pname = "sydtest-persistent-sqlite"; - version = "0.0.0.0"; - sha256 = "0p9xy2pdjnzd61dadvrzrnnxxz04xm0ypn2h1ssmrilfglic80iz"; + version = "0.1.0.0"; + sha256 = "1al80sym9r2h769szky5kpkllbs7gm4lc8gn9nlavj0in663x0ly"; libraryHaskellDepends = [ base monad-logger mtl persistent persistent-sqlite persistent-template sydtest @@ -251842,14 +252353,50 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "sydtest-process" = callPackage + ({ mkDerivation, base, bytestring, process, sydtest + , sydtest-discover + }: + mkDerivation { + pname = "sydtest-process"; + version = "0.0.0.0"; + sha256 = "1afjwxq7bq4q0g5qznffxfn20ikxxmr7yywiksfyfnyh4n0a1zsf"; + libraryHaskellDepends = [ base process sydtest ]; + testHaskellDepends = [ base bytestring process sydtest ]; + testToolDepends = [ sydtest-discover ]; + description = "A typed-process companion library for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + + "sydtest-rabbitmq" = callPackage + ({ mkDerivation, aeson, amqp, async, base, bytestring, network + , path, path-io, port-utils, process, stm, sydtest + , sydtest-discover, sydtest-typed-process, text, typed-process + }: + mkDerivation { + pname = "sydtest-rabbitmq"; + version = "0.1.0.0"; + sha256 = "0ra32y2w7hirjmaz67myq26waccznkl7gqmdnwdd93n6n1h1gb9p"; + libraryHaskellDepends = [ + aeson amqp async base bytestring network path path-io port-utils + process stm sydtest sydtest-typed-process text typed-process + ]; + testHaskellDepends = [ amqp base sydtest ]; + testToolDepends = [ sydtest-discover ]; + description = "An rabbitmq companion library for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + "sydtest-servant" = callPackage ({ mkDerivation, base, http-client, servant, servant-client , servant-server, stm, sydtest, sydtest-discover, sydtest-wai }: mkDerivation { pname = "sydtest-servant"; - version = "0.0.0.0"; - sha256 = "147v5s10qvpp67aq7c240rsc4f356hvznc5gb538slh03d5vas4j"; + version = "0.1.0.0"; + sha256 = "0mn7fys01qakapnrcrlpji1kwc3cgywblid4wpipmh2kdpy61ndk"; libraryHaskellDepends = [ base http-client servant servant-client servant-server sydtest sydtest-wai @@ -251863,15 +252410,35 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "sydtest-typed-process" = callPackage + ({ mkDerivation, base, bytestring, sydtest, sydtest-discover + , typed-process + }: + mkDerivation { + pname = "sydtest-typed-process"; + version = "0.0.0.0"; + sha256 = "0j5x2liimaxnd1p7bhkd1ic9vccxdph431rq3dmzl3f440qb3rws"; + libraryHaskellDepends = [ base sydtest typed-process ]; + testHaskellDepends = [ base bytestring sydtest typed-process ]; + testToolDepends = [ sydtest-discover ]; + description = "A typed-process companion library for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + "sydtest-wai" = callPackage - ({ mkDerivation, base, http-client, http-types, stm, sydtest - , sydtest-discover, wai, warp + ({ mkDerivation, base, bytestring, case-insensitive, http-client + , http-types, mtl, network, pretty-show, stm, sydtest + , sydtest-discover, text, time, wai, warp }: mkDerivation { pname = "sydtest-wai"; - version = "0.0.0.0"; - sha256 = "01fqys32zj1rg9ciq04l7d4av3i1ynw3yinkgc84c3ia330i98ws"; - libraryHaskellDepends = [ base http-client sydtest wai warp ]; + version = "0.1.0.0"; + sha256 = "0fk1b7205h8ib35bp4pma37vk7cy7dwg0kkcv63k60sq1laj48rl"; + libraryHaskellDepends = [ + base bytestring case-insensitive http-client http-types mtl network + pretty-show sydtest text time wai warp + ]; testHaskellDepends = [ base http-client http-types stm sydtest wai ]; @@ -251884,18 +252451,18 @@ self: { "sydtest-yesod" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive , conduit, containers, cookie, exceptions, http-client, http-types - , monad-logger, mtl, persistent, persistent-sqlite + , monad-logger, mtl, network, persistent, persistent-sqlite , persistent-template, pretty-show, QuickCheck, resourcet, sydtest , sydtest-discover, sydtest-persistent-sqlite, sydtest-wai, text , time, wai, xml-conduit, yesod, yesod-core, yesod-form, yesod-test }: mkDerivation { pname = "sydtest-yesod"; - version = "0.0.0.0"; - sha256 = "0mknn114q495f1bh829fi6c9gag58048c0m06yw0bkl0ikz32k67"; + version = "0.1.0.0"; + sha256 = "0kdylnhfvg9x314bydic811i21r1r5zs9cm1zpw6d7frsl99g24k"; libraryHaskellDepends = [ base blaze-builder bytestring case-insensitive containers cookie - exceptions http-client http-types mtl pretty-show sydtest + exceptions http-client http-types mtl network pretty-show sydtest sydtest-wai text time wai xml-conduit yesod-core yesod-test ]; testHaskellDepends = [ @@ -253486,8 +254053,6 @@ self: { ]; description = "Format tabular data as grid or table"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "table-tennis" = callPackage @@ -254260,22 +254825,22 @@ self: { "talash" = callPackage ({ mkDerivation, alfred-margaret, base, brick, bytestring - , colorful-monoids, containers, directory, ghc-compact, intro - , microlens, microlens-th, text, unix, unordered-containers, vector + , colorful-monoids, directory, ghc-compact, intro, microlens + , microlens-th, text, unix, unordered-containers, vector , vector-algorithms, vector-sized, vty }: mkDerivation { pname = "talash"; - version = "0.1.0.1"; - sha256 = "1j28i5aipldjknfx22dil0xi1gwlv89frl1fn606yl1g84q1kr5n"; + version = "0.1.1.1"; + sha256 = "0sa4ay2dc4srh5wbk72iznjwr5bjjhggafhf27zyyxjhnjvfgsq1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - alfred-margaret base brick bytestring colorful-monoids containers - directory ghc-compact intro microlens microlens-th text unix + alfred-margaret base brick bytestring colorful-monoids directory + ghc-compact intro microlens microlens-th text unix unordered-containers vector vector-algorithms vector-sized vty ]; - executableHaskellDepends = [ base ]; + executableHaskellDepends = [ base intro ]; description = "Line oriented fast enough text search"; license = lib.licenses.gpl3Only; }) {}; @@ -256163,6 +256728,8 @@ self: { ]; description = "Easy to use library for building Telegram bots"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "telegram-raw-api" = callPackage @@ -259791,8 +260358,8 @@ self: { pname = "th-test-utils"; version = "1.1.0"; sha256 = "12a8yp9wfl40afa3ps8jg3axcaah018pangjm0fzzga2awr1wzwk"; - revision = "1"; - editedCabalFile = "0q3x2gl9n22ww1wzlhgvgj8didnwjyk6frv92cs9i7zirrcfgvcw"; + revision = "2"; + editedCabalFile = "1jwx31jqglfcy6ylj4520kqfp918lnv6m13flx2qvhfwbd88xwcv"; libraryHaskellDepends = [ base template-haskell th-orphans transformers ]; @@ -259926,8 +260493,8 @@ self: { }: mkDerivation { pname = "themoviedb"; - version = "1.2.0.1"; - sha256 = "1n6raffsjn9iq427nyh7hnnx1jvgvilisfy6dz72hl4ry5198sdq"; + version = "1.2.1"; + sha256 = "0dd1f0lhq0sdl2i3cz7maf49vif89jlv6ny64pw4ywnwycblq3if"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -259944,6 +260511,8 @@ self: { ]; description = "Haskell API bindings for http://themoviedb.org"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "themplate" = callPackage @@ -260788,6 +261357,29 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "tidal_1_7_5" = callPackage + ({ mkDerivation, base, bifunctors, bytestring, clock, colour + , containers, criterion, deepseq, hosc, microspec, network, parsec + , primitive, random, text, transformers, weigh + }: + mkDerivation { + pname = "tidal"; + version = "1.7.5"; + sha256 = "0mcq1sll148qfwkyad6y9k64zrlbkflzba9wqcgqydgfm0jyr7z7"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bifunctors bytestring clock colour containers deepseq hosc + network parsec primitive random text transformers + ]; + testHaskellDepends = [ + base containers deepseq hosc microspec parsec + ]; + benchmarkHaskellDepends = [ base criterion weigh ]; + description = "Pattern language for improvised music"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "tidal-midi" = callPackage ({ mkDerivation, base, containers, PortMidi, tidal, time , transformers @@ -262476,6 +263068,29 @@ self: { license = lib.licenses.gpl3Plus; }) {}; + "tlynx_0_5_1_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, comonad + , containers, elynx-tools, elynx-tree, gnuplot, lifted-async + , monad-logger, mwc-random, optparse-applicative, parallel + , statistics, text, transformers, vector + }: + mkDerivation { + pname = "tlynx"; + version = "0.5.1.0"; + sha256 = "005382x1xsv6bsjfmjxirvcmh3nfyhigkkc08y2wz16b7dpwvk6k"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring comonad containers elynx-tools + elynx-tree gnuplot lifted-async monad-logger mwc-random + optparse-applicative parallel statistics text transformers vector + ]; + executableHaskellDepends = [ base ]; + description = "Handle phylogenetic trees"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "tmapchan" = callPackage ({ mkDerivation, base, containers, hashable, stm , unordered-containers @@ -264861,6 +265476,8 @@ self: { pname = "tree-monad"; version = "0.3.1"; sha256 = "0ny57rygkgwn8i733gz2zb12i5niq5q7lrqvzfwsnjd0b40yighf"; + revision = "1"; + editedCabalFile = "0pw6mzr6x3s5w01bv6b5pcrqkx2zbjf4bk4cgrzww9gs81p3v790"; libraryHaskellDepends = [ base ]; description = "Non-Determinism Monad for Tree Search"; license = lib.licenses.bsd3; @@ -265883,8 +266500,8 @@ self: { }: mkDerivation { pname = "ttc"; - version = "0.4.0.0"; - sha256 = "07b5vw7wxgxcsr04h4nx28bmv9a10hkdzhhssvka050hxhiyjmgv"; + version = "1.1.0.0"; + sha256 = "02b55f0dwgxvpr8x2727ryb6zhvz73l6l001szm4i821q0p4h00g"; libraryHaskellDepends = [ base bytestring template-haskell text ]; testHaskellDepends = [ base bytestring tasty tasty-hunit template-haskell text @@ -267285,8 +267902,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "type-fun"; - version = "0.1.2"; - sha256 = "1qb9h6x1npq1pc8h7n6ism5a6jccysn76czqym1f69x0qh1jjlay"; + version = "0.1.3"; + sha256 = "0br31kghd0hm2qaz14pm6lxbl2z1ci3c0758qfpiq1dmm9mmc4ir"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Collection of widely reimplemented type families"; @@ -268279,17 +268896,18 @@ self: { "typesafe-precure" = callPackage ({ mkDerivation, aeson, aeson-pretty, autoexporter, base , bytestring, dlist, hspec, monad-skeleton, template-haskell, text - , th-data-compat, th-strict-compat, th-utilities + , th-data-compat, th-strict-compat }: mkDerivation { pname = "typesafe-precure"; - version = "0.7.11.1"; - sha256 = "1kbxj35dr41rg1s38f9dv2bg2d0rrwj1g2154ggfpx6kwy758jg6"; + version = "0.8.0.1"; + sha256 = "05rsyiksmw3gilr944hr1q12alinsy842qwzvc444iwyvc4f0i17"; libraryHaskellDepends = [ aeson aeson-pretty autoexporter base bytestring dlist monad-skeleton template-haskell text th-data-compat - th-strict-compat th-utilities + th-strict-compat ]; + libraryToolDepends = [ autoexporter ]; testHaskellDepends = [ base hspec ]; description = "Type-safe transformations and purifications of PreCures (Japanese Battle Heroine)"; license = lib.licenses.bsd3; @@ -269936,6 +270554,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "union-angle" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "union-angle"; + version = "0.1.0.1"; + sha256 = "0scvzln05l2y4pb96cy7908aw433v8ln4nc17fp5x2vlz579w9cl"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Union type that include radian angle and degree angle"; + license = lib.licenses.bsd3; + }) {}; + "union-find" = callPackage ({ mkDerivation, base, containers, transformers }: mkDerivation { @@ -270865,31 +271495,6 @@ self: { }: mkDerivation { pname = "unliftio"; - version = "0.2.17"; - sha256 = "1z37bqnrzhqhg7dfmsqz31lq8ng3qnkknc9d4pxbjbbmf1g21hfv"; - libraryHaskellDepends = [ - async base bytestring deepseq directory filepath process stm time - transformers unix unliftio-core - ]; - testHaskellDepends = [ - async base bytestring containers deepseq directory filepath hspec - process QuickCheck stm time transformers unix unliftio-core - ]; - benchmarkHaskellDepends = [ - async base bytestring deepseq directory filepath gauge process stm - time transformers unix unliftio-core - ]; - description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; - license = lib.licenses.mit; - }) {}; - - "unliftio_0_2_18" = callPackage - ({ mkDerivation, async, base, bytestring, containers, deepseq - , directory, filepath, gauge, hspec, process, QuickCheck, stm, time - , transformers, unix, unliftio-core - }: - mkDerivation { - pname = "unliftio"; version = "0.2.18"; sha256 = "0yg5x2v3p4pdw7892l1mkihmdbak14qvmni1vk2a0y2gdmxfvx1y"; libraryHaskellDepends = [ @@ -270906,7 +271511,6 @@ self: { ]; description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "unliftio-core" = callPackage @@ -271192,6 +271796,7 @@ self: { description = "maybes of numeric values with fewer indirections"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "unpacked-maybe-text" = callPackage @@ -271920,7 +272525,6 @@ self: { ]; description = "Memory efficient url type and parser"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "url-decoders" = callPackage @@ -272043,7 +272647,6 @@ self: { ]; description = "Painfully simple URL deployment"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "urn" = callPackage @@ -272820,7 +273423,6 @@ self: { ]; description = "UUID parsing using byteverse packages"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "uuid-crypto" = callPackage @@ -272914,22 +273516,16 @@ self: { }) {}; "uusi" = callPackage - ({ mkDerivation, base, Cabal, directory, filepath, HUnit, microlens - , microlens-th, text - }: + ({ mkDerivation, base, Cabal, directory, filepath, HUnit, text }: mkDerivation { pname = "uusi"; - version = "0.4.0.0"; - sha256 = "03spazp0lpd2impvg9i6fdd32v3fzycgqr95ry2jwvaxijqhfic9"; + version = "0.4.1.0"; + sha256 = "14g56ygqx8n24hvbb9bzi7yy5wjfsvw3m89lad0xy8knf6gnh6y3"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base Cabal microlens microlens-th text ]; - executableHaskellDepends = [ - base Cabal directory filepath microlens microlens-th text - ]; - testHaskellDepends = [ - base Cabal HUnit microlens microlens-th text - ]; + libraryHaskellDepends = [ base Cabal text ]; + executableHaskellDepends = [ base Cabal directory filepath text ]; + testHaskellDepends = [ base Cabal HUnit text ]; description = "Tweak .cabal files"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ berberman ]; @@ -275158,8 +275754,8 @@ self: { }: mkDerivation { pname = "vimeta"; - version = "0.3.0.1"; - sha256 = "0i834y50b4820109asrzp61bqprxs9rfgr9b8310zhsisrlbxgl3"; + version = "0.3.1"; + sha256 = "1q40cny80lf0yb38ahmpz42k0w6646mscajlny8zxb6rwylvscv9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -275174,6 +275770,7 @@ self: { ]; description = "Frontend for video metadata tagging tools"; license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; }) {}; "vimus" = callPackage @@ -276022,8 +276619,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "vulkan"; - version = "3.10.1"; - sha256 = "0lk4l65qvq1b3dz9fkz981zgm2m9nx38ylccnsxcgxns2s2zx9b3"; + version = "3.10.3"; + sha256 = "1ksx4klcj9g4s4mrxmcr47ydw3xzglb8vd0zmg7i5xa7hz0ksjw0"; libraryHaskellDepends = [ base bytestring transformers vector ]; libraryPkgconfigDepends = [ vulkan ]; description = "Bindings to the Vulkan graphics API"; @@ -276051,8 +276648,8 @@ self: { }: mkDerivation { pname = "vulkan-utils"; - version = "0.5.0"; - sha256 = "11pcxa7pjhdrfcxl058dn909ar6sv9kn34g73w8jqa60d2savj6q"; + version = "0.5.0.1"; + sha256 = "0h904kz61ym7d0qaa59d52a4kw09iaz92q5qdlnmnyn2bdmqp3bl"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytestring containers dependent-map dependent-sum extra @@ -277124,7 +277721,6 @@ self: { ]; description = "Route to different middlewares based on the incoming Accept header"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "wai-middleware-crowd" = callPackage @@ -279556,8 +280152,8 @@ self: { ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk }: mkDerivation { pname = "webkit2gtk3-javascriptcore"; - version = "0.14.4.1"; - sha256 = "0bi42gpw0cf5ymnwlffnfdq68jfvk0j4qcnqv8lvwz2vp1ngs23j"; + version = "0.14.4.2"; + sha256 = "1l77qh9iyrcvsf0kha9vcm1v6fayk5i71qprdzbvfp5sihbcnz3r"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base ]; libraryPkgconfigDepends = [ webkitgtk ]; @@ -280289,8 +280885,8 @@ self: { pname = "wide-word"; version = "0.1.1.2"; sha256 = "10sj7nca2sba74bkiicnp95xrfq2j1al93ggw3z24982nm9x3j8r"; - revision = "1"; - editedCabalFile = "1gqw8d8j3wml0431lq1ygl5a3n36ymp1i77m7qaw0mz3ss982gl2"; + revision = "2"; + editedCabalFile = "09nr9ni9vs38ldzrx3vmlm6dr2avmwx6p9wlaml0nhr6sh4lbjsr"; libraryHaskellDepends = [ base deepseq primitive ]; testHaskellDepends = [ base bytestring ghc-prim hedgehog primitive QuickCheck @@ -280298,8 +280894,6 @@ self: { ]; description = "Data types for large but fixed width signed and unsigned integers"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "wide-word-instances" = callPackage @@ -280311,7 +280905,6 @@ self: { libraryHaskellDepends = [ base binary serialise wide-word ]; description = "Instances for wide-word"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "wigner-symbols" = callPackage @@ -280441,8 +281034,8 @@ self: { }: mkDerivation { pname = "wild-bind-x11"; - version = "0.2.0.12"; - sha256 = "1zpb448pj586xvh0l9qp08hvbjw1lphxwzi4srnghmsbnfnkvhh6"; + version = "0.2.0.13"; + sha256 = "0fs8k2kfzm6qq9xy35278xprgq7vf0v4qz7q0gz8qv480hffccc5"; libraryHaskellDepends = [ base containers fold-debounce mtl semigroups stm text transformers wild-bind X11 @@ -282109,7 +282702,6 @@ self: { ]; description = "A simple CLI utility for interacting with a websocket"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ws-chans" = callPackage @@ -283847,12 +284439,12 @@ self: { }) {}; "xml-query" = callPackage - ({ mkDerivation, base-prelude, free, text }: + ({ mkDerivation, base, free, text }: mkDerivation { pname = "xml-query"; - version = "0.9.1"; - sha256 = "16wszpvz8cp8nx18rmgyjy6mqk9awd3yf9w0is5rw77r73w88nwq"; - libraryHaskellDepends = [ base-prelude free text ]; + version = "0.9.1.1"; + sha256 = "1rrzba94098rw7gmripz62awc5cscrx4lqavzd946h6vpy4ps4ba"; + libraryHaskellDepends = [ base free text ]; description = "A parser-agnostic declarative API for querying XML-documents"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -284520,8 +285112,6 @@ self: { libraryHaskellDepends = [ base magic mtl random unix xmonad ]; description = "xmonad wallpaper extension"; license = lib.licenses.lgpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "xmonad-windownames" = callPackage @@ -285663,8 +286253,8 @@ self: { }: mkDerivation { pname = "yamlparse-applicative"; - version = "0.1.0.4"; - sha256 = "19z6bg8pvhaccc4pc89a2hc1f1g9x66ma179gfx36pjgqdkp0fg1"; + version = "0.2.0.0"; + sha256 = "1c287mc7rl6xhwsb3gw51m6sx29dz88a9b6qa0b324hgcmf086sk"; libraryHaskellDepends = [ aeson base bytestring containers optparse-applicative path path-io prettyprinter safe-coloured-text scientific text @@ -287448,7 +288038,6 @@ self: { ]; description = "Code for using the ip package with yesod"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "yesod-job-queue" = callPackage @@ -290112,8 +290701,8 @@ self: { }: mkDerivation { pname = "zip"; - version = "1.7.0"; - sha256 = "11vdxpyxnh7hbsrpk8g90fd9abbk27dxi9g0mhxc1lxc6syjkzgl"; + version = "1.7.1"; + sha256 = "0impiv9xsirbvnpnv1lh6lhnl8a4fqylpjif7niyjjbcvyxh4zqd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ diff --git a/nixpkgs/pkgs/development/haskell-modules/hoogle.nix b/nixpkgs/pkgs/development/haskell-modules/hoogle.nix index cfa06b045de2..d55f37f980d8 100644 --- a/nixpkgs/pkgs/development/haskell-modules/hoogle.nix +++ b/nixpkgs/pkgs/development/haskell-modules/hoogle.nix @@ -63,10 +63,13 @@ buildPackages.stdenv.mkDerivation { passAsFile = ["buildCommand"]; buildCommand = '' - ${lib.optionalString (packages != [] -> docPackages == []) + ${let # Filter out nulls here to work around https://github.com/NixOS/nixpkgs/issues/82245 + # If we don't then grabbing `p.name` here will fail. + packages' = lib.filter (p: p != null) packages; + in lib.optionalString (packages' != [] -> docPackages == []) ("echo WARNING: localHoogle package list empty, even though" + " the following were specified: " - + lib.concatMapStringsSep ", " (p: p.name) packages)} + + lib.concatMapStringsSep ", " (p: p.name) packages')} mkdir -p $out/share/doc/hoogle echo importing builtin packages diff --git a/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix b/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix index 1882d68f2343..6bbcabbf5a5e 100644 --- a/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix +++ b/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix @@ -22,6 +22,8 @@ self: super: { # https://github.com/spacchetti/spago/issues/512 spago = self.callPackage ../tools/purescript/spago/spago.nix { }; + nix-linter = self.callPackage ../../development/tools/analysis/nix-linter { }; + nix-output-monitor = self.callPackage ../../tools/nix/nix-output-monitor { }; # cabal2nix --revision <rev> https://github.com/hasura/ci-info-hs.git diff --git a/nixpkgs/pkgs/development/interpreters/chibi/default.nix b/nixpkgs/pkgs/development/interpreters/chibi/default.nix index 92531eacd20d..c0ee8988c094 100644 --- a/nixpkgs/pkgs/development/interpreters/chibi/default.nix +++ b/nixpkgs/pkgs/development/interpreters/chibi/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, makeWrapper }: let - version = "0.9.1"; + version = "0.10"; name = "chibi-scheme-${version}"; in stdenv.mkDerivation { @@ -18,7 +18,7 @@ stdenv.mkDerivation { owner = "ashinn"; repo = "chibi-scheme"; rev = version; - sha256 = "0nd63i924ifh39cba1hd4sbi6vh1cb73v97nrn4bf8rrjh3k8pdi"; + sha256 = "sha256-7vDxcnXhq1wJSLFHGxtwh+H+KWxh6B0JXSMPzSmQFXo="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix b/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix index e52d6c20b970..58ed4c689b14 100644 --- a/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix +++ b/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "babashka"; - version = "0.4.3"; + version = "0.4.5"; reflectionJson = fetchurl { name = "reflection.json"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-teZKAwSv9wliVFKdT76yQjMC5g7SGPAqcq/jZ07sYjQ="; + sha256 = "sha256-SnKs30c6VTp1yzW2Glooi6ghSUIZgF6nsob1hDljTA8="; }; dontUnpack = true; diff --git a/nixpkgs/pkgs/development/interpreters/dart/default.nix b/nixpkgs/pkgs/development/interpreters/dart/default.nix index 685d58f11027..1d6abb59504e 100644 --- a/nixpkgs/pkgs/development/interpreters/dart/default.nix +++ b/nixpkgs/pkgs/development/interpreters/dart/default.nix @@ -2,33 +2,32 @@ , lib , fetchurl , unzip -, version ? "2.12.2" -, sources ? - let +, version ? "2.13.1" +, sources ? let base = "https://storage.googleapis.com/dart-archive/channels"; x86_64 = "x64"; i686 = "ia32"; aarch64 = "arm64"; # Make sure that if the user overrides version parameter they're # also need to override sources, to avoid mistakes - version = "2.12.2"; + version = "2.13.1"; in { "${version}-x86_64-darwin" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip"; - sha256 = "0h6mpy0kfc842vhg053fyxbjnd8lw1d1shdcsj800048260lxhyd"; + sha256 = "0kb6r2rmp5d0shvgyy37fmykbgww8qaj4f8k79rmqfv5lwa3izya"; }; "${version}-x86_64-linux" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip"; - sha256 = "1gg210gf4yif3bl9k19znkndc4c1cd529xwxpi20ykaw3zfxxz2z"; + sha256 = "0zq8wngyrw01wjc5s6w1vz2jndms09ifiymjjixxby9k41mr6jrq"; }; "${version}-i686-linux" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${i686}-release.zip"; - sha256 = "1wngxba71j20gq9vy7n8q0m9rnqs047xm5b03bxk3hhaq6dyzkwn"; + sha256 = "0zv4q8xv2i08a6izpyhhnil75qhs40m5mgyvjqjsswqkwqdf7lkj"; }; "${version}-aarch64-linux" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip"; - sha256 = "0rqsmzl5g5kgk54qb03kamjm5n5g5pqfl79np37xdzwqbv0zx22b"; + sha256 = "0bb9jdmg5p608jmmiqibp13ydiw9avgysxlmljvgsl7wl93j6rgc"; }; } }: @@ -40,9 +39,7 @@ stdenv.mkDerivation { pname = "dart"; inherit version; - nativeBuildInputs = [ - unzip - ]; + nativeBuildInputs = [ unzip ]; src = sources."${version}-${stdenv.hostPlatform.system}" or (throw "unsupported version/system: ${version}/${stdenv.hostPlatform.system}"); diff --git a/nixpkgs/pkgs/development/interpreters/duktape/default.nix b/nixpkgs/pkgs/development/interpreters/duktape/default.nix index 360666d898af..ba533a172761 100644 --- a/nixpkgs/pkgs/development/interpreters/duktape/default.nix +++ b/nixpkgs/pkgs/development/interpreters/duktape/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, validatePkgConfig }: stdenv.mkDerivation rec { pname = "duktape"; @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "19szwxzvl2g65fw95ggvb8h0ma5bd9vvnnccn59hwnc4dida1x4n"; }; + nativeBuildInputs = [ validatePkgConfig ]; + postPatch = '' substituteInPlace Makefile.sharedlibrary \ --replace 'gcc' '${stdenv.cc.targetPrefix}cc' \ @@ -23,9 +25,10 @@ stdenv.mkDerivation rec { installPhase = '' install -d $out/bin install -m755 duk $out/bin/ - install -d $out/lib + install -d $out/lib/pkgconfig install -d $out/include make -f Makefile.sharedlibrary install INSTALL_PREFIX=$out + substituteAll ${./duktape.pc.in} $out/lib/pkgconfig/duktape.pc ''; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/interpreters/duktape/duktape.pc.in b/nixpkgs/pkgs/development/interpreters/duktape/duktape.pc.in new file mode 100644 index 000000000000..d34edb320e2e --- /dev/null +++ b/nixpkgs/pkgs/development/interpreters/duktape/duktape.pc.in @@ -0,0 +1,10 @@ +prefix=@out@ +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: duktape +Description: An embeddable Javascript engine, with a focus on portability and compact footprint +Version: @version@ +Libs: -L${libdir} -lduktape +Cflags: -I${includedir} diff --git a/nixpkgs/pkgs/development/interpreters/erlang/R22.nix b/nixpkgs/pkgs/development/interpreters/erlang/R22.nix index c69c26d4cb01..9236ea428948 100644 --- a/nixpkgs/pkgs/development/interpreters/erlang/R22.nix +++ b/nixpkgs/pkgs/development/interpreters/erlang/R22.nix @@ -3,6 +3,6 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz mkDerivation { - version = "22.3.4.19"; - sha256 = "sha256-U3ks7pDIqS8HVJ+yBobhEbKvnd9svEcQd9BsJQwajDs="; + version = "22.3.4.20"; + sha256 = "sha256-EUErOCW16eUb/p5dLpFV7sQ3mXlCF/OgOvGAAyYEvLo="; } diff --git a/nixpkgs/pkgs/development/interpreters/erlang/R23.nix b/nixpkgs/pkgs/development/interpreters/erlang/R23.nix index ee788560dcf4..9e344adc15a3 100644 --- a/nixpkgs/pkgs/development/interpreters/erlang/R23.nix +++ b/nixpkgs/pkgs/development/interpreters/erlang/R23.nix @@ -3,6 +3,6 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz mkDerivation { - version = "23.3.4.2"; - sha256 = "QAIkiYBhYnUzyRg70SQ4BwjjYqclDA4uruqRNTgB2Sk="; + version = "23.3.4.4"; + sha256 = "dnoSGfBUZrgcnNQNAoqmVOxK/NQlt1DC187sxg7mPq8="; } diff --git a/nixpkgs/pkgs/development/interpreters/gnu-apl/default.nix b/nixpkgs/pkgs/development/interpreters/gnu-apl/default.nix index abfa74bb67d3..108da08b80d7 100644 --- a/nixpkgs/pkgs/development/interpreters/gnu-apl/default.nix +++ b/nixpkgs/pkgs/development/interpreters/gnu-apl/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.kovirobi ]; platforms = with platforms; linux ++ darwin; inherit version; + mainProgram = "apl"; longDescription = '' GNU APL is a free interpreter for the programming language APL, with an diff --git a/nixpkgs/pkgs/development/interpreters/janet/default.nix b/nixpkgs/pkgs/development/interpreters/janet/default.nix index 4c836264017b..c0438d1e0076 100644 --- a/nixpkgs/pkgs/development/interpreters/janet/default.nix +++ b/nixpkgs/pkgs/development/interpreters/janet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "janet"; - version = "1.16.0"; + version = "1.16.1"; src = fetchFromGitHub { owner = "janet-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Wrr2zie251oB+uhsLMmkPBV0b3MwTmcPTgNJOsgCems="; + sha256 = "sha256-TzJbHmHIySlf3asQ02HOdehMR+s0KkPifBiaQ4FvFCg="; }; nativeBuildInputs = [ meson ninja ]; diff --git a/nixpkgs/pkgs/development/interpreters/jruby/default.nix b/nixpkgs/pkgs/development/interpreters/jruby/default.nix index 4e540dc8aacb..f5368e405387 100644 --- a/nixpkgs/pkgs/development/interpreters/jruby/default.nix +++ b/nixpkgs/pkgs/development/interpreters/jruby/default.nix @@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "5" "7" ""; jruby = stdenv.mkDerivation rec { pname = "jruby"; - version = "9.2.17.0"; + version = "9.2.18.0"; src = fetchurl { url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz"; - sha256 = "sha256-dwHTU3s6YG0nZaxtXEDmdd2qAdPOutJqIaZuOq3VwgI="; + sha256 = "sha256-QlpclwptkYrlMSdYUGNNEhaeNVd1SyuBf7+3mHoywac="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/interpreters/micropython/default.nix b/nixpkgs/pkgs/development/interpreters/micropython/default.nix index 0441e48685ea..2e0b587acfde 100644 --- a/nixpkgs/pkgs/development/interpreters/micropython/default.nix +++ b/nixpkgs/pkgs/development/interpreters/micropython/default.nix @@ -1,43 +1,82 @@ -{ stdenv, lib, fetchFromGitHub, pkg-config, libffi, python3, readline }: +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, pkg-config +, libffi +, python3 +, readline +}: stdenv.mkDerivation rec { pname = "micropython"; - version = "1.13"; + version = "1.15"; src = fetchFromGitHub { owner = "micropython"; repo = "micropython"; rev = "v${version}"; - sha256 = "0m9g6isys4pnlnkdmrw7lxaxdrjn02j481wz5x5cdrmrbi4zi17z"; + sha256 = "11bf1lq4kgfs1nzg5cnshh2dqxyk5w2k816i04innri6fj0g7y6p"; fetchSubmodules = true; }; + # drop the following patches when upgrading to 1.16 + patches = [ + # fix build with modern clang https://github.com/micropython/micropython/pull/7254 + (fetchpatch { + url = "https://github.com/micropython/micropython/commit/126b1c727118352923703719a2a3d45b9fad3c97.patch"; + sha256 = "13a2bmz24syhd1qsqbx39dcjkjdhf05ln7lanh816m94lkfib21j"; + }) + # fix build with modern clang https://github.com/micropython/micropython/pull/7254 + (fetchpatch { + url = "https://github.com/micropython/micropython/commit/7ceccad4e2f1e9d073f5781c32e5b377e8391a25.patch"; + sha256 = "04mbxmb5yr6pbhhf9villq8km4wy579r46v9p4n0ysivrxij7i6f"; + }) + # fix build on aarch64-darwin https://github.com/micropython/micropython/pull/7393 + (fetchpatch { + url = "https://github.com/micropython/micropython/commit/95048129b1d93854c25f501c02801929aeeb23f0.patch"; + sha256 = "1cngcwq4jviyhdnfcrrkdadfikhffzbj0d634j0344cp247jb41n"; + }) + ]; + nativeBuildInputs = [ pkg-config python3 ]; buildInputs = [ libffi readline ]; - doCheck = true; - buildPhase = '' + runHook preBuild make -C mpy-cross make -C ports/unix + runHook postBuild ''; + doCheck = true; + + skippedTests = "" + + lib.optionalString (stdenv.isDarwin) " -e uasyncio_basic -e uasyncio_wait_task" + + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) " -e ffi_callback" + + lib.optionalString (stdenv.isLinux && stdenv.isAarch64) " -e float_parse" + ; + checkPhase = '' + runHook preCheck pushd tests - MICROPY_MICROPYTHON=../ports/unix/micropython ${python3.interpreter} ./run-tests + ${python3.interpreter} ./run-tests.py ${skippedTests} popd + runHook postCheck ''; installPhase = '' + runHook preInstall mkdir -p $out/bin - install -Dm755 ports/unix/micropython $out/bin/micropython + install -Dm755 ports/unix/micropython -t $out/bin + runHook postInstall ''; meta = with lib; { description = "A lean and efficient Python implementation for microcontrollers and constrained systems"; homepage = "https://micropython.org"; - platforms = [ "x86_64-linux" ]; + platforms = platforms.unix; license = licenses.mit; maintainers = with maintainers; [ sgo ]; }; diff --git a/nixpkgs/pkgs/development/interpreters/php/generic.nix b/nixpkgs/pkgs/development/interpreters/php/generic.nix index 558fa45a1fd9..d86ea48afe1a 100644 --- a/nixpkgs/pkgs/development/interpreters/php/generic.nix +++ b/nixpkgs/pkgs/development/interpreters/php/generic.nix @@ -124,15 +124,15 @@ let ln -s ${extraInit} $out/lib/php.ini if test -e $out/bin/php; then - wrapProgram $out/bin/php --set PHP_INI_SCAN_DIR $out/lib + wrapProgram $out/bin/php --prefix PHP_INI_SCAN_DIR : $out/lib fi if test -e $out/bin/php-fpm; then - wrapProgram $out/bin/php-fpm --set PHP_INI_SCAN_DIR $out/lib + wrapProgram $out/bin/php-fpm --prefix PHP_INI_SCAN_DIR : $out/lib fi if test -e $out/bin/phpdbg; then - wrapProgram $out/bin/phpdbg --set PHP_INI_SCAN_DIR $out/lib + wrapProgram $out/bin/phpdbg --prefix PHP_INI_SCAN_DIR : $out/lib fi ''; }; diff --git a/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix index 38ee086a88fe..b8132cea4fc7 100644 --- a/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix +++ b/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix @@ -208,7 +208,7 @@ in with passthru; stdenv.mkDerivation { # * https://bugs.python.org/issue35523 # * https://github.com/python/cpython/commit/e6b247c8e524 ./3.7/no-win64-workaround.patch - ] ++ optionals (isPy37 || isPy38 || isPy39) [ + ] ++ optionals (pythonAtLeast "3.7") [ # Fix darwin build https://bugs.python.org/issue34027 ./3.7/darwin-libutil.patch ] ++ optionals (pythonOlder "3.8") [ @@ -227,7 +227,7 @@ in with passthru; stdenv.mkDerivation { ( if isPy35 then ./3.5/python-3.x-distutils-C++.patch - else if isPy37 || isPy38 || isPy39 then + else if pythonAtLeast "3.7" then ./3.7/python-3.x-distutils-C++.patch else fetchpatch { diff --git a/nixpkgs/pkgs/development/interpreters/python/hooks/pip-build-hook.sh b/nixpkgs/pkgs/development/interpreters/python/hooks/pip-build-hook.sh index 6dd384b4847f..745f02e8c9bc 100644 --- a/nixpkgs/pkgs/development/interpreters/python/hooks/pip-build-hook.sh +++ b/nixpkgs/pkgs/development/interpreters/python/hooks/pip-build-hook.sh @@ -7,7 +7,7 @@ pipBuildPhase() { mkdir -p dist echo "Creating a wheel..." - @pythonInterpreter@ -m pip wheel --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist . + @pythonInterpreter@ -m pip wheel --verbose --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist . echo "Finished creating a wheel..." runHook postBuild diff --git a/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix b/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix index 4917b167046e..963073df6200 100644 --- a/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -176,6 +176,8 @@ let # default to python's platforms platforms = python.meta.platforms; isBuildPythonPackage = python.meta.platforms; + } // lib.optionalAttrs (attrs?pname) { + mainProgram = attrs.pname; } // meta; } // lib.optionalAttrs (attrs?checkPhase) { # If given use the specified checkPhase, otherwise use the setup hook. diff --git a/nixpkgs/pkgs/development/interpreters/racket/default.nix b/nixpkgs/pkgs/development/interpreters/racket/default.nix index 48be64aa0b8d..0b5084d43584 100644 --- a/nixpkgs/pkgs/development/interpreters/racket/default.nix +++ b/nixpkgs/pkgs/development/interpreters/racket/default.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { pname = "racket"; - version = "8.0"; # always change at once with ./minimal.nix + version = "8.1"; # always change at once with ./minimal.nix src = (lib.makeOverridable ({ name, sha256 }: fetchurl { @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { } )) { name = "${pname}-${version}"; - sha256 = "0lqqpa88v0br93qw7450a4blyi3pwn7sq2k04h0ikbsqrdnfj7lj"; + sha256 = "0wlgp9dlibhv1d181arz309fszz31l5gb5gl94bqzfcav014g3k8"; }; FONTCONFIG_FILE = fontsConf; diff --git a/nixpkgs/pkgs/development/interpreters/racket/minimal.nix b/nixpkgs/pkgs/development/interpreters/racket/minimal.nix index c954b4f05ea4..4cfb178d42de 100644 --- a/nixpkgs/pkgs/development/interpreters/racket/minimal.nix +++ b/nixpkgs/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 = "0qvfi6rg9cwzh716q5j7m30rqq9xysi6zsalqlpdqrzhnx8y54k0"; + sha256 = "1q54n16s0hmnry8q381wd7zfpyjndfjswn97vsbd4isngwz3w12k"; }; meta = oldAttrs.meta // { diff --git a/nixpkgs/pkgs/development/interpreters/rakudo/default.nix b/nixpkgs/pkgs/development/interpreters/rakudo/default.nix index 358b8663196b..fdb3a78a1b7e 100644 --- a/nixpkgs/pkgs/development/interpreters/rakudo/default.nix +++ b/nixpkgs/pkgs/development/interpreters/rakudo/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchurl, perl, icu, zlib, gmp, lib, nqp }: +{ stdenv, fetchurl, perl, icu, zlib, gmp, lib, nqp, removeReferencesTo }: stdenv.mkDerivation rec { pname = "rakudo"; - version = "2021.02.1"; + version = "2021.06"; src = fetchurl { - url = "https://www.rakudo.org/dl/rakudo/rakudo-${version}.tar.gz"; - sha256 = "1xwqx4357bw7h5pdmwxm5wxh8wjvrcdk4rvr3wyrhg1wzy5qvsn8"; + url = "https://rakudo.org/dl/rakudo/rakudo-${version}.tar.gz"; + sha256 = "11ixlqmvbb37abksdysg5r4lkbwzr486lkc0ssl3wca4iiy3mhgf"; }; + nativeBuildInputs = [ removeReferencesTo ]; + buildInputs = [ icu zlib gmp perl ]; configureScript = "perl ./Configure.pl"; configureFlags = [ @@ -16,15 +18,14 @@ stdenv.mkDerivation rec { "--with-nqp=${nqp}/bin/nqp" ]; - # Remove test of profiler, fails since 2020.09 - preCheck = "rm t/09-moar/01-profilers.t"; - - # Some tests fail on Darwin - doCheck = !stdenv.isDarwin; + disallowedReferences = [ stdenv.cc.cc ]; + postFixup = '' + remove-references-to -t ${stdenv.cc.cc} "$(readlink -f $out/share/perl6/runtime/dynext/libperl6_ops_moar.so)" + ''; meta = with lib; { description = "Raku implementation on top of Moar virtual machine"; - homepage = "https://www.rakudo.org"; + homepage = "https://rakudo.org"; license = licenses.artistic2; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice vrthra sgo ]; diff --git a/nixpkgs/pkgs/development/interpreters/rakudo/moarvm.nix b/nixpkgs/pkgs/development/interpreters/rakudo/moarvm.nix index e5baacf5c295..60a5e071545e 100644 --- a/nixpkgs/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/nixpkgs/pkgs/development/interpreters/rakudo/moarvm.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "moarvm"; - version = "2021.02"; + version = "2021.06"; src = fetchurl { - url = "https://www.moarvm.org/releases/MoarVM-${version}.tar.gz"; - sha256 = "08ri9mvbk97qfxcy6lj4cb7j3a789ck052m2vqfhis3vkrkw780r"; + url = "https://moarvm.org/releases/MoarVM-${version}.tar.gz"; + sha256 = "19vjcyb9fg9msjw1ih00c2qby480gl4highw24zx7j84slhsj013"; }; buildInputs = [ perl ] ++ lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "VM with adaptive optimization and JIT compilation, built for Rakudo"; - homepage = "https://www.moarvm.org/"; + homepage = "https://moarvm.org"; license = licenses.artistic2; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice vrthra sgo ]; diff --git a/nixpkgs/pkgs/development/interpreters/rakudo/nqp.nix b/nixpkgs/pkgs/development/interpreters/rakudo/nqp.nix index cd60bb3b7900..4b456d819f6d 100644 --- a/nixpkgs/pkgs/development/interpreters/rakudo/nqp.nix +++ b/nixpkgs/pkgs/development/interpreters/rakudo/nqp.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nqp"; - version = "2021.02"; + version = "2021.06"; src = fetchurl { url = "https://github.com/raku/nqp/releases/download/${version}/nqp-${version}.tar.gz"; - sha256 = "1vyl6x811f8mbdnp34yj6kfmfpxp2yfrr8cqf1w47rzmr741sjyj"; + sha256 = "1d00lajjdd2k510fb0cb6c8bpklvlnncykf6jz8j8djfp0b2i696"; }; buildInputs = [ perl ]; diff --git a/nixpkgs/pkgs/development/interpreters/ruby/default.nix b/nixpkgs/pkgs/development/interpreters/ruby/default.nix index 8563eb60210d..454539c93ec8 100644 --- a/nixpkgs/pkgs/development/interpreters/ruby/default.nix +++ b/nixpkgs/pkgs/development/interpreters/ruby/default.nix @@ -11,7 +11,7 @@ let opString = lib.optionalString; patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; }; config = import ./config.nix { inherit fetchFromSavannah; }; - rubygems = import ./rubygems { inherit stdenv lib fetchurl; }; + rubygems = import ./rubygems { inherit stdenv lib fetchurl fetchpatch; }; # Contains the ruby version heuristics rubyVersion = import ./ruby-version.nix { inherit lib; }; diff --git a/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix b/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix index db508caae310..cf2ca1b766ea 100644 --- a/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix +++ b/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl }: +{ stdenv, lib, fetchurl, fetchpatch }: stdenv.mkDerivation rec { name = "rubygems"; @@ -13,6 +13,12 @@ stdenv.mkDerivation rec { ./0001-add-post-extract-hook.patch ./0002-binaries-with-env-shebang.patch ./0003-gem-install-default-to-user.patch + # Ensure tmp directory are not left behind + # https://github.com/rubygems/rubygems/pull/4610 + (fetchpatch { + url = "https://github.com/rubygems/rubygems/commit/2c2ffde6e4a9f7f571d38af687034fb8507a833d.patch"; + sha256 = "sha256-bs2dXALKiJvMgk7lKjMx0NzGqlEqDYBBO35UrzNifms="; + }) ]; installPhase = '' diff --git a/nixpkgs/pkgs/development/interpreters/tcl/generic.nix b/nixpkgs/pkgs/development/interpreters/tcl/generic.nix index e665e8cfb1ea..beb95d51d2c1 100644 --- a/nixpkgs/pkgs/development/interpreters/tcl/generic.nix +++ b/nixpkgs/pkgs/development/interpreters/tcl/generic.nix @@ -1,55 +1,67 @@ -{ lib, stdenv +{ lib, stdenv, callPackage, makeSetupHook, makeWrapper # Version specific stuff , release, version, src , ... }: -stdenv.mkDerivation { - pname = "tcl"; - inherit version; - - inherit src; - - outputs = [ "out" "man" ]; - - setOutputFlags = false; - - preConfigure = '' - cd unix - ''; - - configureFlags = [ - "--enable-threads" - # Note: using $out instead of $man to prevent a runtime dependency on $man. - "--mandir=${placeholder "out"}/share/man" - "--enable-man-symlinks" - # Don't install tzdata because NixOS already has a more up-to-date copy. - "--with-tzdata=no" - "tcl_cv_strtod_unbroken=ok" - ] ++ lib.optional stdenv.is64bit "--enable-64bit"; - - enableParallelBuilding = true; - - postInstall = let - dllExtension = stdenv.hostPlatform.extensions.sharedLibrary; - in '' - make install-private-headers - ln -s $out/bin/tclsh${release} $out/bin/tclsh - ln -s $out/lib/libtcl${release}${dllExtension} $out/lib/libtcl${dllExtension} - ''; - - meta = with lib; { - description = "The Tcl scripting language"; - homepage = "https://www.tcl.tk/"; - license = licenses.tcltk; - platforms = platforms.all; - maintainers = with maintainers; [ vrthra ]; - }; - - passthru = rec { - inherit release version; - libPrefix = "tcl${release}"; - libdir = "lib/${libPrefix}"; - }; -} +let + baseInterp = + stdenv.mkDerivation { + pname = "tcl"; + inherit version src; + + outputs = [ "out" "man" ]; + + setOutputFlags = false; + + preConfigure = '' + cd unix + ''; + + configureFlags = [ + "--enable-threads" + # Note: using $out instead of $man to prevent a runtime dependency on $man. + "--mandir=${placeholder "out"}/share/man" + "--enable-man-symlinks" + # Don't install tzdata because NixOS already has a more up-to-date copy. + "--with-tzdata=no" + "tcl_cv_strtod_unbroken=ok" + ] ++ lib.optional stdenv.is64bit "--enable-64bit"; + + enableParallelBuilding = true; + + postInstall = let + dllExtension = stdenv.hostPlatform.extensions.sharedLibrary; + in '' + make install-private-headers + ln -s $out/bin/tclsh${release} $out/bin/tclsh + ln -s $out/lib/libtcl${release}${dllExtension} $out/lib/libtcl${dllExtension} + ''; + + meta = with lib; { + description = "The Tcl scripting language"; + homepage = "https://www.tcl.tk/"; + license = licenses.tcltk; + platforms = platforms.all; + maintainers = with maintainers; [ agbrooks ]; + }; + + passthru = rec { + inherit release version; + libPrefix = "tcl${release}"; + libdir = "lib/${libPrefix}"; + tclPackageHook = callPackage ({}: makeSetupHook { + name = "tcl-package-hook"; + deps = [ makeWrapper ]; + } ./tcl-package-hook.sh) {}; + }; + }; + + mkTclDerivation = callPackage ./mk-tcl-derivation.nix { tcl = baseInterp; }; + +in baseInterp.overrideAttrs (self: { + passthru = self.passthru // { + inherit mkTclDerivation; + }; +}) diff --git a/nixpkgs/pkgs/development/interpreters/tcl/mk-tcl-derivation.nix b/nixpkgs/pkgs/development/interpreters/tcl/mk-tcl-derivation.nix new file mode 100644 index 000000000000..4f3ffe6f995f --- /dev/null +++ b/nixpkgs/pkgs/development/interpreters/tcl/mk-tcl-derivation.nix @@ -0,0 +1,69 @@ +# Generic builder for tcl packages/applications, generally based on mk-python-derivation.nix +{ tcl +, lib +, makeWrapper +, runCommand +, writeScript +}: + +{ buildInputs ? [] +, nativeBuildInputs ? [] +, propagatedBuildInputs ? [] +, checkInputs ? [] + +# true if we should skip the configuration phase altogether +, dontConfigure ? false + +# Extra flags passed to configure step +, configureFlags ? [] + +# Whether or not we should add common Tcl-related configure flags +, addTclConfigureFlags ? true + +, meta ? {} +, passthru ? {} +, doCheck ? true +, ... } @ attrs: + +let + inherit (tcl) stdenv; + inherit (lib) getBin optionalAttrs optionals; + + defaultTclPkgConfigureFlags = [ + "--with-tcl=${tcl}/lib" + "--with-tclinclude=${tcl}/include" + "--exec-prefix=\${out}" + ]; + + self = (stdenv.mkDerivation ((builtins.removeAttrs attrs [ + "addTclConfigureFlags" "checkPhase" "checkInputs" "doCheck" + ]) // { + + buildInputs = buildInputs ++ [ makeWrapper tcl.tclPackageHook ]; + nativeBuildInputs = nativeBuildInputs ++ [ tcl ]; + propagatedBuildInputs = propagatedBuildInputs ++ [ tcl ]; + + TCLSH = "${getBin tcl}/bin/tclsh"; + + # Run tests after install, at which point we've done all TCLLIBPATH setup + doCheck = false; + doInstallCheck = attrs.doCheck or ((attrs ? doInstallCheck) && attrs.doInstallCheck); + installCheckInputs = checkInputs ++ (optionals (attrs ? installCheckInputs) attrs.installCheckInputs); + + # Add typical values expected by TEA for configureFlags + configureFlags = + if (!dontConfigure && addTclConfigureFlags) + then (configureFlags ++ defaultTclPkgConfigureFlags) + else configureFlags; + + meta = { + platforms = tcl.meta.platforms; + } // meta; + + + } // optionalAttrs (attrs?checkPhase) { + installCheckPhase = attrs.checkPhase; + } + )); + +in lib.extendDerivation true passthru self diff --git a/nixpkgs/pkgs/development/interpreters/tcl/tcl-package-hook.sh b/nixpkgs/pkgs/development/interpreters/tcl/tcl-package-hook.sh new file mode 100644 index 000000000000..747783cb1c27 --- /dev/null +++ b/nixpkgs/pkgs/development/interpreters/tcl/tcl-package-hook.sh @@ -0,0 +1,74 @@ +# This hook ensures that we do the following in post-fixup: +# * wrap any installed executables with a wrapper that configures TCLLIBPATH +# * write a setup hook that extends the TCLLIBPATH of any anti-dependencies + +# Add a directory to TCLLIBPATH, provided that it exists +_addToTclLibPath() { + local tclPkg="$1" + if [[ -z "$tclPkg" ]]; then + return + fi + + if [[ ! -d "$tclPkg" ]]; then + >&2 echo "can't add $tclPkg to TCLLIBPATH; that directory doesn't exist" + exit 1 + fi + + if [[ "$tclPkg" == *" "* ]]; then + tclPkg="{$tclPkg}" + fi + + if [[ -z "${TCLLIBPATH-}" ]]; then + export TCLLIBPATH="$tclPkg" + else + if [[ "$TCLLIBPATH" != *"$tclPkg "* && "$TCLLIBPATH" != *"$tclPkg" ]]; then + export TCLLIBPATH="${TCLLIBPATH} $tclPkg" + fi + fi +} + +# Locate any directory containing an installed pkgIndex file +findInstalledTclPkgs() { + local -r newLibDir="${!outputLib}/lib" + if [[ ! -d "$newLibDir" ]]; then + >&2 echo "Assuming no loadable tcl packages installed ($newLibDir does not exist)" + return + fi + echo "$(find "$newLibDir" -name pkgIndex.tcl -exec dirname {} \;)" +} + +# Wrap any freshly-installed binaries and set up their TCLLIBPATH +wrapTclBins() { + if [[ -z "${TCLLIBPATH-}" ]]; then + echo "skipping automatic Tcl binary wrapping (nothing to do)" + return + fi + + local -r tclBinsDir="${!outputBin}/bin" + if [[ ! -d "$tclBinsDir" ]]; then + echo "No outputBin found, not using any TCLLIBPATH wrapper" + return + fi + + find "$tclBinsDir" -type f -executable -print | + while read -r someBin; do + echo "Adding TCLLIBPATH wrapper for $someBin" + wrapProgram "$someBin" --prefix TCLLIBPATH ' ' "$TCLLIBPATH" + done +} + +# Generate hook to adjust TCLLIBPATH in anti-dependencies +writeTclLibPathHook() { + local -r hookPath="${!outputLib}/nix-support/setup-hook" + mkdir -p "$(dirname "$hookPath")" + + typeset -f _addToTclLibPath >> "$hookPath" + local -r tclPkgs=$(findInstalledTclPkgs) + while IFS= read -r tclPkg; do + echo "_addToTclLibPath \"$tclPkg\"" >> "$hookPath" + _addToTclLibPath "$tclPkg" true + done <<< "$tclPkgs" +} + +postFixupHooks+=(writeTclLibPathHook) +postFixupHooks+=(wrapTclBins) diff --git a/nixpkgs/pkgs/development/interpreters/tclreadline/default.nix b/nixpkgs/pkgs/development/interpreters/tclreadline/default.nix index 44d2745dac8b..de671bab5739 100644 --- a/nixpkgs/pkgs/development/interpreters/tclreadline/default.nix +++ b/nixpkgs/pkgs/development/interpreters/tclreadline/default.nix @@ -8,7 +8,7 @@ , tk }: -stdenv.mkDerivation rec { +tcl.mkTclDerivation rec { pname = "tclreadline"; version = "2.3.8"; @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ readline - tcl tk ]; @@ -35,7 +34,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-tclshrl" "--enable-wishrl" - "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--with-readline-includes=${readline.dev}/include/readline" "--with-libtool=${libtool}" diff --git a/nixpkgs/pkgs/development/interpreters/trealla/default.nix b/nixpkgs/pkgs/development/interpreters/trealla/default.nix index 165251c8c5c3..4321130044cc 100644 --- a/nixpkgs/pkgs/development/interpreters/trealla/default.nix +++ b/nixpkgs/pkgs/development/interpreters/trealla/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "trealla"; - version = "1.7.65"; + version = "1.8.74"; src = fetchFromGitHub { owner = "infradig"; repo = "trealla"; rev = "v${version}"; - sha256 = "sha256-uCDACBwdiCeAwF6IZHz7s5pD83JXTP7jAQDjGld8tt0="; + sha256 = "sha256-pg9SfEFUTuyAnhP+Q1vR/QImZuLuRb8NpaOiCEcTFj8="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/CGAL/default.nix b/nixpkgs/pkgs/development/libraries/CGAL/default.nix index bd8edc14a8bb..3ca359b3da5d 100644 --- a/nixpkgs/pkgs/development/libraries/CGAL/default.nix +++ b/nixpkgs/pkgs/development/libraries/CGAL/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "cgal"; - version = "5.2.1"; + version = "5.2.2"; src = fetchFromGitHub { owner = "CGAL"; repo = "releases"; rev = "CGAL-${version}"; - sha256 = "sha256-sJyeehgt84rLX8ZBYIbFgHLG2aJDDHEj5GeVnQhjiOQ="; + sha256 = "sha256-DeTJAAY3OEu+pVazt5es1v3l1nGAfjvE0wQmYISRYoo="; }; # note: optional component libCGAL_ImageIO would need zlib and opengl; diff --git a/nixpkgs/pkgs/development/libraries/a52dec/default.nix b/nixpkgs/pkgs/development/libraries/a52dec/default.nix index faa819ec5615..74122f7ed24e 100644 --- a/nixpkgs/pkgs/development/libraries/a52dec/default.nix +++ b/nixpkgs/pkgs/development/libraries/a52dec/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.7.4"; src = fetchurl { - url = "${meta.homepage}/files/${pname}-${version}.tar.gz"; + url = "https://liba52.sourceforge.net/files/${pname}-${version}.tar.gz"; sha256 = "oh1ySrOzkzMwGUNTaH34LEdbXfuZdRPu9MJd5shl7DM="; }; @@ -13,6 +13,10 @@ stdenv.mkDerivation rec { "--enable-shared" ]; + makeFlags = [ + "AR=${stdenv.cc.targetPrefix}ar" + ]; + # fails 1 out of 1 tests with "BAD GLOBAL SYMBOLS" on i686 # which can also be fixed with # hardeningDisable = lib.optional stdenv.isi686 "pic"; diff --git a/nixpkgs/pkgs/development/libraries/alembic/default.nix b/nixpkgs/pkgs/development/libraries/alembic/default.nix index 333dbb053f52..0ed9aa204706 100644 --- a/nixpkgs/pkgs/development/libraries/alembic/default.nix +++ b/nixpkgs/pkgs/development/libraries/alembic/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "alembic"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "alembic"; repo = "alembic"; rev = version; - sha256 = "sha256-ObjpWreabeVzKYVgC62JaoGUf1BZCxP0STjox3akDvo="; + sha256 = "sha256-e87pnWIV8fbjEQa5iXRPXA9MkJN9NwY9PW/QI+cVSKo="; }; outputs = [ "bin" "dev" "out" "lib" ]; diff --git a/nixpkgs/pkgs/development/libraries/amdvlk/default.nix b/nixpkgs/pkgs/development/libraries/amdvlk/default.nix index e3bc04a6d226..5d5277afcd3e 100644 --- a/nixpkgs/pkgs/development/libraries/amdvlk/default.nix +++ b/nixpkgs/pkgs/development/libraries/amdvlk/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2021.Q2.4"; + version = "2021.Q2.5"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "KPWkwbD55BoztF6DPmvau9i1AMhR+5ad5VrrD8I2YyI="; + sha256 = "0NJoGk++SHt4dtoUj3UQeW4zFtwa7osczUr+vxi8DG8="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/armadillo/default.nix b/nixpkgs/pkgs/development/libraries/armadillo/default.nix index 9e81ce0c6c8f..9fdccfb3faa0 100644 --- a/nixpkgs/pkgs/development/libraries/armadillo/default.nix +++ b/nixpkgs/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "10.5.1"; + version = "10.5.2"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "sha256-lq1uHLzyjz0cH/ly3ixA2t3b12gyVrrVAtPEY9L2TN8="; + sha256 = "sha256-Y/I87cVIpelASBblDPj4/MSSqxqtxsDO8wv8Kvzq2V8="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/atk/default.nix b/nixpkgs/pkgs/development/libraries/atk/default.nix index 7961211dc63e..38c557316982 100644 --- a/nixpkgs/pkgs/development/libraries/atk/default.nix +++ b/nixpkgs/pkgs/development/libraries/atk/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchurl, meson, ninja, gettext, pkg-config, glib , fixDarwinDylibNames, gobject-introspection, gnome +, withIntrospection ? stdenv.buildPlatform == stdenv.hostPlatform }: let @@ -17,8 +18,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ meson ninja pkg-config gettext gobject-introspection glib ] - ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ meson ninja pkg-config gettext glib ] + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames + ++ lib.optional withIntrospection gobject-introspection; propagatedBuildInputs = [ # Required by atk.pc @@ -31,6 +33,10 @@ stdenv.mkDerivation rec { ./fix_pc.patch ]; + mesonFlags = [ + "-Dintrospection=${lib.boolToString withIntrospection}" + ]; + doCheck = true; passthru = { diff --git a/nixpkgs/pkgs/development/libraries/attr/default.nix b/nixpkgs/pkgs/development/libraries/attr/default.nix index b81afc24ee98..b7c9287b68bc 100644 --- a/nixpkgs/pkgs/development/libraries/attr/default.nix +++ b/nixpkgs/pkgs/development/libraries/attr/default.nix @@ -31,15 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://savannah.nongnu.org/projects/attr/"; description = "Library and tools for manipulating extended attributes"; - platforms = platforms.unix; + platforms = platforms.linux; license = licenses.gpl2Plus; - - # The build failure on Darwin will likely be solved after upgrading the - # macOS SDK in nixpkgs. Check the current SDK version in - # ../../../../os-specific/darwin/apple-sdk/default.nix to see if it has - # been updated to 10.13 or later. Once the requirements are met, building - # it should be straightforward as Homebrew was able to build it without - # patching. - broken = stdenv.isDarwin; }; } diff --git a/nixpkgs/pkgs/development/libraries/audio/libbass/default.nix b/nixpkgs/pkgs/development/libraries/audio/libbass/default.nix index 2e10dbd88150..49a3a5478cff 100644 --- a/nixpkgs/pkgs/development/libraries/audio/libbass/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/libbass/default.nix @@ -15,7 +15,7 @@ let x86_64-linux = "x64/libbass.so"; }; urlpath = "bass24-linux.zip"; - sha256 = "1z01im0l2ydi608vc0n0c1cfyp1vrh6681zn2zkhg98vvs20y805"; + sha256 = "1ycvpfa7yyi1qxgflpfzcw1q32f0isd14m9cf351pk8zwndkmp4q"; }; bass_fx = { diff --git a/nixpkgs/pkgs/development/libraries/box2d/default.nix b/nixpkgs/pkgs/development/libraries/box2d/default.nix index 1b6ede9b3101..64349b1e3cf3 100644 --- a/nixpkgs/pkgs/development/libraries/box2d/default.nix +++ b/nixpkgs/pkgs/development/libraries/box2d/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "2D physics engine"; homepage = "https://box2d.org/"; maintainers = [ maintainers.raskin ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.zlib; }; } diff --git a/nixpkgs/pkgs/development/libraries/bwidget/default.nix b/nixpkgs/pkgs/development/libraries/bwidget/default.nix index f3f09497a660..34f0e8b5b495 100644 --- a/nixpkgs/pkgs/development/libraries/bwidget/default.nix +++ b/nixpkgs/pkgs/development/libraries/bwidget/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchurl, tcl }: +{ lib, fetchurl, tcl, tk }: -stdenv.mkDerivation rec { +tcl.mkTclDerivation rec { pname = "bwidget"; version = "1.9.14"; @@ -10,21 +10,17 @@ stdenv.mkDerivation rec { }; dontBuild = true; + propagatedBuildInputs = [ tk ]; installPhase = '' - mkdir -p "$out/lib/${passthru.libPrefix}" - cp -R *.tcl lang images "$out/lib/${passthru.libPrefix}" + mkdir -p "$out/lib/bwidget${version}" + cp -R *.tcl lang images "$out/lib/bwidget${version}" ''; - passthru = { - libPrefix = "bwidget${version}"; - }; - - buildInputs = [ tcl ]; - meta = { homepage = "https://sourceforge.net/projects/tcllib"; description = "High-level widget set for Tcl/Tk"; + maintainers = with lib.maintainers; [ agbrooks ]; license = lib.licenses.tcltk; platforms = lib.platforms.linux; }; diff --git a/nixpkgs/pkgs/development/libraries/cglm/default.nix b/nixpkgs/pkgs/development/libraries/cglm/default.nix new file mode 100644 index 000000000000..a1c90f6b463b --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/cglm/default.nix @@ -0,0 +1,27 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "cglm"; + version = "0.8.3"; + + src = fetchFromGitHub { + owner = "recp"; + repo = "cglm"; + rev = "v${version}"; + sha256 = "0crzkxan3kivyah225md5c65zglg5c1cgrsmwhvp51hmrpmxss5v"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + homepage = "https://github.com/recp/cglm"; + description = "Highly Optimized Graphics Math (glm) for C"; + license = licenses.mit; + maintainers = [ maintainers.ivar ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/dav1d/default.nix b/nixpkgs/pkgs/development/libraries/dav1d/default.nix index 51df5a9254a5..fe6926fe809a 100644 --- a/nixpkgs/pkgs/development/libraries/dav1d/default.nix +++ b/nixpkgs/pkgs/development/libraries/dav1d/default.nix @@ -10,14 +10,14 @@ assert useVulkan -> withExamples; stdenv.mkDerivation rec { pname = "dav1d"; - version = "0.8.2"; + version = "0.9.0"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = pname; rev = version; - sha256 = "0plmnxpz66yv3nqv1kgbyyfnwfqi9dqs0zbsdj488i6464a1m6si"; + sha256 = "0ki3wlyaqr80gl1srbbd18dd5bs1sl9icxym8ar62abpvgzxl5yk"; }; nativeBuildInputs = [ meson ninja nasm pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/dbus-glib/default.nix b/nixpkgs/pkgs/development/libraries/dbus-glib/default.nix index f56a1eaac245..0bab4eb1949e 100644 --- a/nixpkgs/pkgs/development/libraries/dbus-glib/default.nix +++ b/nixpkgs/pkgs/development/libraries/dbus-glib/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "dbus-glib-0.110"; + name = "dbus-glib-0.112"; src = fetchurl { url = "${meta.homepage}/releases/dbus-glib/${name}.tar.gz"; - sha256 = "09g8swvc95bk1z6j8sw463p2v0dqmgm2zjfndf7i8sbcyq67dr3w"; + sha256 = "sha256-fVUNzN/NKG4ziVUBgp7Zce62XGFOc6rbSgiu73GbFDo="; }; outputs = [ "out" "dev" "devdoc" ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://dbus.freedesktop.org"; - license = with lib.licenses; [ afl21 gpl2 ]; + license = with lib.licenses; [ afl21 gpl2Plus ]; description = "Obsolete glib bindings for D-Bus lightweight IPC mechanism"; maintainers = [ ]; platforms = lib.platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/drogon/default.nix b/nixpkgs/pkgs/development/libraries/drogon/default.nix new file mode 100644 index 000000000000..ebb989c94035 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/drogon/default.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchFromGitHub, cmake, jsoncpp, libossp_uuid, zlib, openssl, lib }: + +stdenv.mkDerivation rec { + pname = "drogon"; + version = "1.7.0"; + + src = fetchFromGitHub { + owner = "an-tao"; + repo = "drogon"; + rev = "v${version}"; + sha256 = "18wn9ashv3h3pal6x5za6y7byfcrd49zy3wfx4hx0ygxzplmss0r"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + "-DBUILD_TESTING=${if doInstallCheck then "ON" else "OFF"}" + "-DBUILD_EXAMPLES=OFF" + ]; + + propagatedBuildInputs = [ + jsoncpp + libossp_uuid + zlib + openssl + ]; + + patches = [ + # this part of the test would normally fail because it attempts to configure a CMake project that uses find_package on itself + # this patch makes drogon and trantor visible to the test + ./fix_find_package.patch + ]; + + # modifying PATH here makes drogon_ctl visible to the test + installCheckPhase = '' + cd .. + patchShebangs test.sh + PATH=$PATH:$out/bin ./test.sh + ''; + + doInstallCheck = true; + + meta = with lib; { + homepage = "https://github.com/an-tao/drogon"; + description = "C++14/17 based HTTP web application framework"; + license = licenses.mit; + maintainers = [ maintainers.urlordjames ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/drogon/fix_find_package.patch b/nixpkgs/pkgs/development/libraries/drogon/fix_find_package.patch new file mode 100644 index 000000000000..b76dbfe48830 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/drogon/fix_find_package.patch @@ -0,0 +1,13 @@ +diff --git a/test.sh b/test.sh +index f017b9a..027031e 100755 +--- a/test.sh ++++ b/test.sh +@@ -135,7 +135,7 @@ if [ $os = "windows" ]; then + conan install $src_dir -s compiler="Visual Studio" -s compiler.version=16 -sbuild_type=Debug -g cmake_paths + cmake_gen="$cmake_gen -DCMAKE_TOOLCHAIN_FILE=conan_paths.cmake -DCMAKE_INSTALL_PREFIX=$src_dir/install" + fi +-cmake .. $cmake_gen ++cmake .. $cmake_gen -DDrogon_DIR=$out/lib/cmake/Drogon -DTrantor_DIR=$out/lib/cmake/Trantor + + if [ $? -ne 0 ]; then + echo "Failed to run CMake for example project" diff --git a/nixpkgs/pkgs/development/libraries/exiv2/default.nix b/nixpkgs/pkgs/development/libraries/exiv2/default.nix index 9d29afd69279..2a394f8279b5 100644 --- a/nixpkgs/pkgs/development/libraries/exiv2/default.nix +++ b/nixpkgs/pkgs/development/libraries/exiv2/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , zlib , expat , cmake @@ -15,7 +14,7 @@ stdenv.mkDerivation rec { pname = "exiv2"; - version = "0.27.3"; + version = "0.27.4"; outputs = [ "out" "dev" "doc" "man" ]; @@ -23,30 +22,9 @@ stdenv.mkDerivation rec { owner = "exiv2"; repo = "exiv2"; rev = "v${version}"; - sha256 = "0d294yhcdw8ziybyd4rp5hzwknzik2sm0cz60ff7fljacv75bjpy"; + sha256 = "0m1x79q6i5fw3gr9k0dw0bbl7ym27g9vbmxiamks6yw028xqwc5a"; }; - patches = [ - # Fix aarch64 build https://github.com/Exiv2/exiv2/pull/1271 - (fetchpatch { - name = "cmake-fix-aarch64.patch"; - url = "https://github.com/Exiv2/exiv2/commit/bbe0b70840cf28b7dd8c0b7e9bb1b741aeda2efd.patch"; - sha256 = "13zw1mn0ag0jrz73hqjhdsh1img7jvj5yddip2k2sb5phy04rzfx"; - }) - - # Use correct paths with multiple outputs - # https://github.com/Exiv2/exiv2/pull/1275 - (fetchpatch { - url = "https://github.com/Exiv2/exiv2/commit/48f2c9dbbacc0ef84c8ebf4cb1a603327f0b8750.patch"; - sha256 = "vjB3+Ld4c/2LT7nq6uatYwfHTh+HeU5QFPFXuNLpIPA="; - }) - # https://github.com/Exiv2/exiv2/pull/1294 - (fetchpatch { - url = "https://github.com/Exiv2/exiv2/commit/306c8a6fd4ddd70e76043ab255734720829a57e8.patch"; - sha256 = "0D/omxYxBPGUu3uSErlf48dc6Ukwc2cEN9/J3e7a9eU="; - }) - ]; - nativeBuildInputs = [ cmake doxygen diff --git a/nixpkgs/pkgs/development/libraries/gensio/default.nix b/nixpkgs/pkgs/development/libraries/gensio/default.nix index a0c4f5a3e216..3978c05f2c71 100644 --- a/nixpkgs/pkgs/development/libraries/gensio/default.nix +++ b/nixpkgs/pkgs/development/libraries/gensio/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "gensio"; - version = "2.2.5"; + version = "2.2.7"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QC07NGgZa++qHyGZY3fjosjJVuRFfc7HYmdGxQHAz4s="; + sha256 = "sha256-2wxsPHrQ9GgyUE4p6zYuR1mPU2OyjtgiPnMApEscR2g="; }; passthru = { diff --git a/nixpkgs/pkgs/development/libraries/gnutls/default.nix b/nixpkgs/pkgs/development/libraries/gnutls/default.nix index bec366b8e168..2d9d280ba75f 100644 --- a/nixpkgs/pkgs/development/libraries/gnutls/default.nix +++ b/nixpkgs/pkgs/development/libraries/gnutls/default.nix @@ -112,7 +112,7 @@ stdenv.mkDerivation { tampering, or message forgery." ''; - homepage = "https://www.gnu.org/software/gnutls/"; + homepage = "https://gnutls.org/"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ eelco fpletz ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/goffice/default.nix b/nixpkgs/pkgs/development/libraries/goffice/default.nix index 3a48fa524842..85c9b77c6bdc 100644 --- a/nixpkgs/pkgs/development/libraries/goffice/default.nix +++ b/nixpkgs/pkgs/development/libraries/goffice/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "goffice"; - version = "0.10.49"; + version = "0.10.50"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "X/wY27OF7fuFtsYlS55bTLPS/6MEK5Ms286ON/SzB+k="; + sha256 = "LFw93HsIs0UkCMgbEhxfASpzSYHXXkRN68yxxY5cv9w="; }; nativeBuildInputs = [ pkg-config intltool ]; diff --git a/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix b/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix index f1bcd4ad00c0..596326b36df4 100644 --- a/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix @@ -5,10 +5,11 @@ let mkDict = - { name, readmeFile, dictFileName, ... }@args: + { pname, readmeFile, dictFileName, ... }@args: stdenv.mkDerivation ({ - inherit name; + inherit pname; installPhase = '' + runHook preInstall # hunspell dicts install -dm755 "$out/share/hunspell" install -m644 ${dictFileName}.dic "$out/share/hunspell/" @@ -19,7 +20,7 @@ let ln -sv "$out/share/hunspell/${dictFileName}.aff" "$out/share/myspell/dicts/" # docs install -dm755 "$out/share/doc" - install -m644 ${readmeFile} $out/share/doc/${name}.txt + install -m644 ${readmeFile} $out/share/doc/${pname}.txt runHook postInstall ''; } // args); @@ -29,7 +30,7 @@ let mkDict rec { inherit dictFileName; version = "2.2"; - name = "hunspell-dict-${shortName}-rla-${version}"; + pname = "hunspell-dict-${shortName}-rla"; readmeFile = "README.txt"; src = fetchFromGitHub { owner = "sbosio"; @@ -70,7 +71,7 @@ let version = "2.40"; # Should really use a string function or something _version = "2-40"; - name = "hunspell-dict-${shortName}-dsso-${version}"; + pname = "hunspell-dict-${shortName}-dsso"; _name = "ooo_swedish_dict_${_version}"; readmeFile = "LICENSE_en_US.txt"; src = fetchurl { @@ -104,7 +105,7 @@ let ln -sv "$out/share/hunspell/${dictFileName}.aff" "$out/share/myspell/dicts/" # docs install -dm755 "$out/share/doc" - install -m644 ${readmeFile} $out/share/doc/${name}.txt + install -m644 ${readmeFile} $out/share/doc/${pname}.txt ''; }; @@ -113,7 +114,7 @@ let mkDict rec { inherit dictFileName; version = "5.3"; - name = "hunspell-dict-${shortName}-dicollecte-${version}"; + pname = "hunspell-dict-${shortName}-dicollecte"; readmeFile = "README_dict_fr.txt"; src = fetchurl { url = "http://www.dicollecte.org/download/fr/hunspell-french-dictionaries-v${version}.zip"; @@ -146,7 +147,7 @@ let mkDict rec { inherit src srcFileName dictFileName; version = "2018.04.16"; - name = "hunspell-dict-${shortName}-wordlist-${version}"; + pname = "hunspell-dict-${shortName}-wordlist"; srcReadmeFile = "README_" + srcFileName + ".txt"; readmeFile = "README_" + dictFileName + ".txt"; meta = with lib; { @@ -174,7 +175,7 @@ let mkDict rec { inherit src dictFileName; version = "2.4"; - name = "hunspell-dict-${shortName}-linguistico-${version}"; + pname = "hunspell-dict-${shortName}-linguistico"; readmeFile = dictFileName + "_README.txt"; meta = with lib; { description = "Hunspell dictionary for ${shortDescription}"; @@ -198,7 +199,7 @@ let mkDictFromXuxen = { shortName, srcs, shortDescription, longDescription, dictFileName }: stdenv.mkDerivation rec { - name = "hunspell-dict-${shortName}-xuxen-${version}"; + pname = "hunspell-dict-${shortName}-xuxen"; version = "5-2015.11.10"; inherit srcs; @@ -231,7 +232,7 @@ let mkDictFromJ3e = { shortName, shortDescription, dictFileName }: stdenv.mkDerivation rec { - name = "hunspell-dict-${shortName}-j3e-${version}"; + pname = "hunspell-dict-${shortName}-j3e"; version = "20161207"; src = fetchurl { @@ -272,7 +273,7 @@ let , readmeFile ? "README_${dictFileName}.txt" , sourceRoot ? dictFileName }: mkDict rec { - name = "hunspell-dict-${shortName}-libreoffice-${version}"; + pname = "hunspell-dict-${shortName}-libreoffice"; version = "6.3.0.4"; inherit dictFileName readmeFile; src = fetchFromGitHub { @@ -699,7 +700,7 @@ in rec { uk_UA = uk-ua; uk-ua = mkDict rec { - name = "hunspell-dict-uk-ua-${version}"; + pname = "hunspell-dict-uk-ua"; version = "4.6.3"; _version = "4-6.3"; @@ -760,7 +761,7 @@ in rec { da_DK = da-dk; da-dk = mkDict rec { - name = "hunspell-dict-da-dk-${version}"; + pname = "hunspell-dict-da-dk"; version = "2.5.189"; src = fetchurl { @@ -784,4 +785,45 @@ in rec { maintainers = with maintainers; [ louisdk1 ]; }; }; + + /* DUTCH */ + + nl_NL = nl_nl; + nl_nl = mkDict rec { + pname = "hunspell-dict-nl-nl"; + version = "2.20.19"; + + src = fetchFromGitHub { + owner = "OpenTaal"; + repo = "opentaal-hunspell"; + rev = version; + sha256 = "0jma8mmrncyzd77kxliyngs4z6z4769g3nh0a7xn2pd4s5y2xdpy"; + }; + + preInstall = '' + mv nl.aff nl_NL.aff + mv nl.dic nl_NL.dic + ''; + + dictFileName = "nl_NL"; + readmeFile = "README.md"; + + meta = with lib; { + description = "Hunspell dictionary for Dutch (Netherlands) from OpenTaal"; + homepage = "https://www.opentaal.org/"; + license = with licenses; [ bsd3 cc-by-nc-30 ]; + maintainers = with maintainers; [ artturin ]; + }; + }; + + /* HEBREW */ + + he_IL = he-il; + he-il = mkDictFromLibreOffice { + shortName = "he-il"; + dictFileName = "he_IL"; + shortDescription = "Hebrew (Israel)"; + readmeFile = "README_he_IL.txt"; + license = with lib.licenses; [ agpl3Plus ]; + }; } diff --git a/nixpkgs/pkgs/development/libraries/hwloc/default.nix b/nixpkgs/pkgs/development/libraries/hwloc/default.nix index a6fb316d659f..9692ac531517 100644 --- a/nixpkgs/pkgs/development/libraries/hwloc/default.nix +++ b/nixpkgs/pkgs/development/libraries/hwloc/default.nix @@ -6,17 +6,13 @@ assert x11Support -> libX11 != null && cairo != null; with lib; -let - version = "2.4.1"; - versmm = versions.major version + "." + versions.minor version; - name = "hwloc-${version}"; - -in stdenv.mkDerivation { - inherit name; +stdenv.mkDerivation rec { + pname = "hwloc"; + version = "2.5.0"; src = fetchurl { - url = "https://www.open-mpi.org/software/hwloc/v${versmm}/downloads/${name}.tar.bz2"; - sha256 = "sha256-OSQh5p8mEgyKuV0VH+mJ8rS2nas8dzV0HE4KbX3l3mM="; + url = "https://www.open-mpi.org/software/hwloc/v${versions.majorMinor version}/downloads/hwloc-${version}.tar.bz2"; + sha256 = "1j2j9wn39a8v91r23xncm1rzls6rjkgkvdvqghbdsnq8ps491kx9"; }; configureFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/incrtcl/default.nix b/nixpkgs/pkgs/development/libraries/incrtcl/default.nix index 67ae5623db12..dae01961a10c 100644 --- a/nixpkgs/pkgs/development/libraries/incrtcl/default.nix +++ b/nixpkgs/pkgs/development/libraries/incrtcl/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, writeText, tcl }: -stdenv.mkDerivation rec { +tcl.mkTclDerivation rec { pname = "incrtcl"; version = "4.2.0"; @@ -9,18 +9,12 @@ stdenv.mkDerivation rec { sha256 = "0w28v0zaraxcq1s9pa6cihqqwqvvwfgz275lks7w4gl7hxjxmasw"; }; - buildInputs = [ tcl ]; - configureFlags = [ "--with-tcl=${tcl}/lib" ]; enableParallelBuilding = true; patchPhase = '' substituteInPlace configure --replace "\''${TCL_SRC_DIR}/generic" "${tcl}/include" ''; - preConfigure = '' - configureFlags="--exec_prefix=$prefix $configureFlags" - ''; - postInstall = '' rmdir $out/bin mv $out/lib/itcl${version}/* $out/lib diff --git a/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix b/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix index 78e2ebae96ac..47a3ca4f9f99 100644 --- a/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "intel-media-sdk"; - version = "21.2.0"; + version = "21.2.2"; src = fetchFromGitHub { owner = "Intel-Media-SDK"; repo = "MediaSDK"; rev = "intel-mediasdk-${version}"; - sha256 = "sha256-LusgmvlWOMEQjy47IpA9IYcl/cUTSMmvxSwvV/ihs2g="; + sha256 = "sha256-iSrr9g6C8YRcmu92sTyDCh76Cdu8wbDL3COwiVxox4Q="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/itktcl/default.nix b/nixpkgs/pkgs/development/libraries/itktcl/default.nix index 570190a43c1e..66039c61b4d5 100644 --- a/nixpkgs/pkgs/development/libraries/itktcl/default.nix +++ b/nixpkgs/pkgs/development/libraries/itktcl/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, tcl, tk, incrtcl }: -stdenv.mkDerivation rec { +tcl.mkTclDerivation rec { pname = "itk-tcl"; version = "4.1.0"; @@ -9,11 +9,10 @@ stdenv.mkDerivation rec { sha256 = "1iy964jfgsfnc1agk1w6bbm44x18ily8d4wmr7cc9z9f4acn2r6s"; }; - buildInputs = [ tcl tk incrtcl ]; + buildInputs = [ tk incrtcl ]; enableParallelBuilding = true; configureFlags = [ - "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--with-itcl=${incrtcl}/lib" "--with-tkinclude=${tk.dev}/include" diff --git a/nixpkgs/pkgs/development/libraries/kyotocabinet/default.nix b/nixpkgs/pkgs/development/libraries/kyotocabinet/default.nix index 4e8aa57d9568..153892304e9c 100644 --- a/nixpkgs/pkgs/development/libraries/kyotocabinet/default.nix +++ b/nixpkgs/pkgs/development/libraries/kyotocabinet/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - name = "kyotocabinet-1.2.76"; + pname = "kyotocabinet"; + version = "1.2.79"; src = fetchurl { - url = "http://fallabs.com/kyotocabinet/pkg/${name}.tar.gz"; - sha256 = "0g6js20x7vnpq4p8ghbw3mh9wpqksya9vwhzdx6dnlf354zjsal1"; + url = "https://dbmx.net/kyotocabinet/pkg/kyotocabinet-${version}.tar.gz"; + sha256 = "079ymsahlrijswgwfr2la9yw5h57l752cprhp5dz31iamsj1vyv7"; }; prePatch = lib.optionalString stdenv.isDarwin '' @@ -24,18 +25,12 @@ stdenv.mkDerivation rec { --replace stdc++ c++ ''; - patches = [(fetchurl { - name = "gcc6.patch"; - url = "https://src.fedoraproject.org/rpms/kyotocabinet/raw/master/f/kyotocabinet-1.2.76-gcc6.patch"; - sha256 = "1h5k38mkiq7lz8nd2gbn7yvimcz49g3z7phn1cr560bzjih8rz23"; - })]; - buildInputs = [ zlib ]; meta = with lib; { - homepage = "http://fallabs.com/kyotocabinet"; + homepage = "https://dbmx.net/kyotocabinet"; description = "A library of routines for managing a database"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/leatherman/default.nix b/nixpkgs/pkgs/development/libraries/leatherman/default.nix index 61d87211e0a5..2d439db5934e 100644 --- a/nixpkgs/pkgs/development/libraries/leatherman/default.nix +++ b/nixpkgs/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "leatherman"; - version = "1.12.4"; + version = "1.12.5"; src = fetchFromGitHub { - sha256 = "sha256-7e9D9Q3CAm+2+0vl81djSZwKrQRXc5UxcbJVMt91/vU="; + sha256 = "sha256-1romJiOIQDlglo/nAJjn1l06dSwDRwG1b49H6js9MB4="; rev = version; repo = "leatherman"; owner = "puppetlabs"; diff --git a/nixpkgs/pkgs/development/libraries/libadwaita/default.nix b/nixpkgs/pkgs/development/libraries/libadwaita/default.nix index f3b9cad0720b..d6cffcab7fed 100644 --- a/nixpkgs/pkgs/development/libraries/libadwaita/default.nix +++ b/nixpkgs/pkgs/development/libraries/libadwaita/default.nix @@ -2,35 +2,40 @@ , stdenv , fetchFromGitLab , docbook-xsl-nons +, gi-docgen , gtk-doc +, libxml2 , meson , ninja , pkg-config , sassc , vala , gobject-introspection +, fribidi , gtk4 , xvfb-run }: stdenv.mkDerivation rec { pname = "libadwaita"; - version = "unstable-2021-05-01"; + version = "1.0.0-alpha.1"; outputs = [ "out" "dev" "devdoc" ]; - outputBin = "dev"; + outputBin = "devdoc"; # demo app src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "libadwaita"; - rev = "8d66b987a19979d9d7b85dacc6bad5ce0c8743fe"; - sha256 = "0i3wav6jsyi4w4i2r1rad769m5y5s9djj4zqb7dfyh0bad24ba3q"; + rev = version; + sha256 = "1v52md62kaqykv8b6kxxbxwnbdzlda4ir7n5wh2iizadcailyw7p"; }; nativeBuildInputs = [ docbook-xsl-nons + gi-docgen gtk-doc + libxml2 # for xmllint meson ninja pkg-config @@ -43,6 +48,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + fribidi gobject-introspection gtk4 ]; @@ -57,6 +63,10 @@ stdenv.mkDerivation rec { xvfb-run meson test ''; + postInstall = '' + mv $out/share/{doc,gtk-doc} + ''; + meta = with lib; { description = "Library to help with developing UI for mobile devices using GTK/GNOME"; homepage = "https://gitlab.gnome.org/GNOME/libadwaita"; diff --git a/nixpkgs/pkgs/development/libraries/libbencodetools/default.nix b/nixpkgs/pkgs/development/libraries/libbencodetools/default.nix new file mode 100644 index 000000000000..b8150a90f683 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libbencodetools/default.nix @@ -0,0 +1,30 @@ +{ stdenv, lib, fetchFromGitLab +}: + +stdenv.mkDerivation rec { + pname = "libbencodetools"; + version = "unstable-2021-04-15"; + + src = fetchFromGitLab { + owner = "heikkiorsila"; + repo = "bencodetools"; + rev = "1ab11f6509a348975e8aec829d7abbf2f8e9b7d1"; + sha256 = "1i2dgvxxwj844yn45hnfx3785ljbvbkri0nv0jx51z4i08w7cz0h"; + }; + + postPatch = '' + patchShebangs . + ''; + + configureFlags = [ + "--without-python" + ]; + + meta = with lib; { + description = "Collection of tools for manipulating bencoded data"; + homepage = "https://gitlab.com/heikkiorsila/bencodetools"; + license = licenses.bsd2; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libcef/default.nix b/nixpkgs/pkgs/development/libraries/libcef/default.nix index 8f01958a9bcf..c3d6516a3dfd 100644 --- a/nixpkgs/pkgs/development/libraries/libcef/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcef/default.nix @@ -1,26 +1,66 @@ -{ lib, stdenv, fetchurl, cmake, alsa-lib, atk, cairo, cups, dbus, expat, fontconfig -, GConf, gdk-pixbuf, glib, gtk2, libX11, libxcb, libXcomposite, libXcursor -, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXScrnSaver -, libXtst, nspr, nss, pango, libpulseaudio, systemd, at-spi2-atk, at-spi2-core +{ lib, stdenv, fetchurl, cmake +, glib +, nss +, nspr +, atk +, at-spi2-atk +, libdrm +, expat +, libxcb +, libxkbcommon +, libX11 +, libXcomposite +, libXdamage +, libXext +, libXfixes +, libXrandr +, mesa +, gtk3 +, pango +, cairo +, alsa-lib +, dbus +, at-spi2-core +, cups +, libxshmfence }: let - libPath = - lib.makeLibraryPath [ - alsa-lib atk cairo cups dbus expat fontconfig GConf gdk-pixbuf glib gtk2 - libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes libXi - libXrandr libXrender libXScrnSaver libXtst nspr nss pango libpulseaudio - systemd at-spi2-core at-spi2-atk - ]; -in -stdenv.mkDerivation rec { + rpath = lib.makeLibraryPath [ + glib + nss + nspr + atk + at-spi2-atk + libdrm + expat + libxcb + libxkbcommon + libX11 + libXcomposite + libXdamage + libXext + libXfixes + libXrandr + mesa + gtk3 + pango + cairo + alsa-lib + dbus + at-spi2-core + cups + libxshmfence + ]; +in stdenv.mkDerivation rec { pname = "cef-binary"; - version = "75.1.14-gc81164e"; + version = "90.6.7"; + gitRevision = "19ba721"; + chromiumVersion = "90.0.4430.212"; src = fetchurl { - name = "cef_binary_75.1.14+gc81164e+chromium-75.0.3770.100_linux64_minimal.tar.bz2"; - url = "http://opensource.spotify.com/cefbuilds/cef_binary_75.1.14%2Bgc81164e%2Bchromium-75.0.3770.100_linux64_minimal.tar.bz2"; - sha256 = "0985b2bx505j0q693hifjgidzb597wqf5idql5aqxs8lfxhc2pgg"; + url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_linux64_minimal.tar.bz2"; + sha256 = "1ja711x9fdlf21qw1k9xn3lvjc5zsfgnjga1w1r8sysam73jk7xj"; }; nativeBuildInputs = [ cmake ]; @@ -32,7 +72,7 @@ stdenv.mkDerivation rec { mkdir -p $out/lib/ $out/share/cef/ cp libcef_dll_wrapper/libcef_dll_wrapper.a $out/lib/ cp ../Release/libcef.so $out/lib/ - patchelf --set-rpath "${libPath}" $out/lib/libcef.so + patchelf --set-rpath "${rpath}" $out/lib/libcef.so cp ../Release/*.bin $out/share/cef/ cp -r ../Resources/* $out/share/cef/ cp -r ../include $out/ @@ -40,7 +80,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple framework for embedding Chromium-based browsers in other applications"; - homepage = "http://opensource.spotify.com/cefbuilds/index.html"; + homepage = "https://cef-builds.spotifycdn.com/index.html"; maintainers = with maintainers; [ puffnfresh ]; license = licenses.bsd3; platforms = with platforms; linux; diff --git a/nixpkgs/pkgs/development/libraries/libcouchbase/0001-Fix-timeouts-in-libcouchbase-testsuite.patch b/nixpkgs/pkgs/development/libraries/libcouchbase/0001-Fix-timeouts-in-libcouchbase-testsuite.patch deleted file mode 100644 index 1c57757f855c..000000000000 --- a/nixpkgs/pkgs/development/libraries/libcouchbase/0001-Fix-timeouts-in-libcouchbase-testsuite.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 58237e64fa77ec5cdec658b3295f71ec899175fa Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch <maximilian@mbosch.me> -Date: Sat, 5 Oct 2019 13:47:59 +0200 -Subject: [PATCH] Fix timeouts in libcouchbase testsuite - -Nix-specific patch. Basically -https://github.com/couchbase/libcouchbase/commit/b272f6ab88be523bbcf9d5c4252d07fccb023fe5, but -rebased onto 2.10.4. ---- - src/ssl/ssl_e.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/ssl/ssl_e.c b/src/ssl/ssl_e.c -index f4506cf..734a3e6 100644 ---- a/src/ssl/ssl_e.c -+++ b/src/ssl/ssl_e.c -@@ -210,10 +210,16 @@ flush_ssl_data(lcbio_ESSL *es) - * calls. While we could have done this inline with the send() call this - * would make future optimization more difficult. */ - GT_WRITE_DONE: -+#if !LCB_CAN_OPTIMIZE_SSL_BIO -+ BIO_get_mem_ptr(es->wbio, &wmb); -+#endif - while (wmb->length > (size_t)tmp_len) { - char dummy[4096]; - unsigned to_read = MINIMUM(wmb->length-tmp_len, sizeof dummy); - BIO_read(es->wbio, dummy, to_read); -+#if !LCB_CAN_OPTIMIZE_SSL_BIO -+ BIO_get_mem_ptr(es->wbio, &wmb); -+#endif - } - BIO_clear_retry_flags(es->wbio); - return 0; --- -2.23.0 - diff --git a/nixpkgs/pkgs/development/libraries/libcouchbase/default.nix b/nixpkgs/pkgs/development/libraries/libcouchbase/default.nix index 9f75eafdf247..9cb83c5bf654 100644 --- a/nixpkgs/pkgs/development/libraries/libcouchbase/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcouchbase/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcouchbase"; - version = "2.10.4"; + version = "3.1.3"; src = fetchFromGitHub { owner = "couchbase"; repo = "libcouchbase"; rev = version; - sha256 = "1yfmcx65aqd5l87scha6kmm2s38n85ci3gg0h6qfs16s3jfi6bw7"; + sha256 = "16mafxkdbns33yjyc2p3j2iajjpyq0zp66wpjir2qj1w3kgggcw8"; }; cmakeFlags = [ "-DLCB_NO_MOCK=ON" ]; @@ -19,8 +19,6 @@ stdenv.mkDerivation rec { # Running tests in parallel does not work enableParallelChecking = false; - patches = [ ./0001-Fix-timeouts-in-libcouchbase-testsuite.patch ]; - doCheck = !stdenv.isDarwin; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix b/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix index a5c0752b9ae1..77315776aca2 100644 --- a/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix @@ -11,19 +11,19 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.55.0"; + version = "1.56.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - sha256 = "sha256-D30usAVpyiqXQMrTvmdaGFig7jhyb3rMTBQL/E2UL50="; + sha256 = "sha256-ZyVEI6q+GzHLEFH01TxS7NqwT7zqVgg0vduyf/fibB8="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "1hf7lrqbv0ba9c0kmnjn5x1fispyyjip1gmllq77z6nsjpn0f9w8"; + sha256 = "0pb1rcv45xa95ziqap94yy52fy02vh401iqsgi18nm1j6iyyngc8"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libdrm/default.nix b/nixpkgs/pkgs/development/libraries/libdrm/default.nix index b7fd94f9f123..ca90750b8c24 100644 --- a/nixpkgs/pkgs/development/libraries/libdrm/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdrm/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "libdrm"; - version = "2.4.105"; + version = "2.4.106"; src = fetchurl { url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0iiamypwdfiz250ki120nh598r48yyacmnndb4mkximdgi5h478x"; + sha256 = "1m3vwpabjg3az84vmyxi96jyd7rrqm6qkhk1gq41w5wv89aarn4j"; }; outputs = [ "out" "dev" "bin" ]; diff --git a/nixpkgs/pkgs/development/libraries/libfprint-2-tod1-vfs0090/0001-vfs0090-add-missing-explicit-dependencies-in-meson.b.patch b/nixpkgs/pkgs/development/libraries/libfprint-2-tod1-vfs0090/0001-vfs0090-add-missing-explicit-dependencies-in-meson.b.patch new file mode 100644 index 000000000000..ac06e83ab938 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libfprint-2-tod1-vfs0090/0001-vfs0090-add-missing-explicit-dependencies-in-meson.b.patch @@ -0,0 +1,28 @@ +From c02f2e040dd1e7664777c5a705272e4eb7bfb569 Mon Sep 17 00:00:00 2001 +From: Vincent Breitmoser <look@my.amazin.horse> +Date: Thu, 10 Jun 2021 14:09:19 +0200 +Subject: [PATCH] vfs0090: add missing explicit dependencies in meson.build + +Make all dependencies explicit, so they can be found when building with Nix. + +--- + meson.build | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/meson.build b/meson.build +index 54a7ca4..88f8793 100644 +--- a/meson.build ++++ b/meson.build +@@ -17,6 +17,9 @@ udev_dep = dependency('udev') + vfs009x_deps += libfprint_tod_dep + vfs009x_deps += dependency('nss') + vfs009x_deps += dependency('openssl') ++vfs009x_deps += dependency('gusb') ++vfs009x_deps += dependency('libfprint-2') ++vfs009x_deps += dependency('glib-2.0') + + vfs0090_deps += dependency('pixman-1') + +-- +2.31.1 + diff --git a/nixpkgs/pkgs/development/libraries/libfprint-2-tod1-vfs0090/0002-vfs0090-add-missing-linux-limits.h-include.patch b/nixpkgs/pkgs/development/libraries/libfprint-2-tod1-vfs0090/0002-vfs0090-add-missing-linux-limits.h-include.patch new file mode 100644 index 000000000000..6111cf0ad294 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libfprint-2-tod1-vfs0090/0002-vfs0090-add-missing-linux-limits.h-include.patch @@ -0,0 +1,26 @@ +From 5405e02c629e689449e852424aed8cca217ed309 Mon Sep 17 00:00:00 2001 +From: Vincent Breitmoser <look@my.amazin.horse> +Date: Thu, 10 Jun 2021 14:10:52 +0200 +Subject: [PATCH] vfs0090: add missing <linux/limits.h> include + +This header is needed for the NAME_MAX constant used in this file. + +--- + vfs0090.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/vfs0090.c b/vfs0090.c +index 8034faf..6070df7 100644 +--- a/vfs0090.c ++++ b/vfs0090.c +@@ -24,6 +24,7 @@ + + #include <errno.h> + #include <ctype.h> ++#include <linux/limits.h> + #include <nss.h> + #include <pk11pub.h> + #include <sechash.h> +-- +2.31.1 + diff --git a/nixpkgs/pkgs/development/libraries/libfprint-2-tod1-vfs0090/default.nix b/nixpkgs/pkgs/development/libraries/libfprint-2-tod1-vfs0090/default.nix new file mode 100644 index 000000000000..840f8e227153 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libfprint-2-tod1-vfs0090/default.nix @@ -0,0 +1,42 @@ +{ stdenv, lib, fetchFromGitLab, pkg-config, libfprint, libfprint-tod, gusb, udev, nss, openssl, meson, pixman, ninja, glib }: +stdenv.mkDerivation { + pname = "libfprint-2-tod1-vfs0090"; + version = "0.8.5"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "3v1n0"; + repo = "libfprint-tod-vfs0090"; + rev = "6084a1545589beec0c741200b18b0902cca225ba"; + sha256 = "sha256-tSML/8USd/LuHF/YGLvNgykixF6VYtfE4SXzeV47840="; + }; + + patches = [ + # TODO remove once https://gitlab.freedesktop.org/3v1n0/libfprint-tod-vfs0090/-/merge_requests/1 is merged + ./0001-vfs0090-add-missing-explicit-dependencies-in-meson.b.patch + # TODO remove once https://gitlab.freedesktop.org/3v1n0/libfprint-tod-vfs0090/-/merge_requests/2 is merged + ./0002-vfs0090-add-missing-linux-limits.h-include.patch + ]; + + nativeBuildInputs = [ pkg-config meson ninja ]; + buildInputs = [ libfprint libfprint-tod glib gusb udev nss openssl pixman ]; + + installPhase = '' + runHook preInstall + + install -D -t "$out/lib/libfprint-2/tod-1/" libfprint-tod-vfs009x.so + install -D -t "$out/lib/udev/rules.d/" $src/60-libfprint-2-tod-vfs0090.rules + + runHook postInstall + ''; + + passthru.driverPath = "/lib/libfprint-2/tod-1"; + + meta = with lib; { + description = "A libfprint-2-tod Touch OEM Driver for 2016 ThinkPad's fingerprint readers"; + homepage = "https://gitlab.freedesktop.org/3v1n0/libfprint-tod-vfs0090"; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ valodim ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix b/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix index 6b761d2170c3..506b1a5b25fb 100644 --- a/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix @@ -4,11 +4,11 @@ assert enableCapabilities -> stdenv.isLinux; stdenv.mkDerivation rec { pname = "libgcrypt"; - version = "1.9.2"; + version = "1.9.3"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${pname}-${version}.tar.bz2"; - sha256 = "sha256-ssENCRUTsnHkcXcnRgex/7o9lbGIu/qHl/lIrskFPFo="; + sha256 = "sha256-l+vk+U4vfjW3UhlM4VoPPGYyTg/2ryZlm7+1/y7DKP0="; }; outputs = [ "out" "dev" "info" ]; @@ -58,6 +58,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.gnu.org/software/libgcrypt/"; + changelog = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=blob;f=NEWS;hb=refs/tags/${pname}-${version}"; description = "General-purpose cryptographic library"; license = licenses.lgpl2Plus; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/libgmpris/default.nix b/nixpkgs/pkgs/development/libraries/libgmpris/default.nix new file mode 100644 index 000000000000..a7826fabd134 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libgmpris/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, lib +, fetchurl +, pkg-config +, glib +, gobject-introspection +}: + +stdenv.mkDerivation rec { + pname = "libgmpris"; + version = "2.2.1-8"; + + src = fetchurl { + url = "https://www.sonarnerd.net/src/focal/src/${pname}_${version}.tar.gz"; + sha256 = "sha256-iyKNmg6sf+mxlY/4vt5lKdrKfJzkoCYU2j1O8uwk8K4="; + }; + + nativeBuildInputs = [ pkg-config gobject-introspection ]; + + buildInputs = [ glib ]; + + postInstall = '' + mkdir -p $out/share/doc/${pname} + cp ./AUTHORS $out/share/doc/${pname} + cp ./README $out/share/doc/${pname} + ''; + + meta = with lib; { + homepage = "https://www.sonarnerd.net/src/"; + description = "GMPRIS GDBus bindings GDBus bindings generated from the GMPRIS XML spec files"; + license = licenses.lgpl21; + maintainers = with maintainers; [ lovesegfault ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix b/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix index da53a9916d05..1f6fd4835afa 100644 --- a/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix @@ -34,16 +34,6 @@ in stdenv.mkDerivation (rec { '' + lib.optionalString (stdenv.hostPlatform.isAarch32 && stdenv.hostPlatform.isMusl) '' ln -s src/syscfg/lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.arm-unknown-linux-musleabihf.h ln -s src/syscfg/lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-musleabihf.h - '' - # This file was accidentally excluded from the sdist until - # 013720333c6ec1d38791689bc49ba039d98e16b3, post release. - # TODO make unconditional next mass rebuild - + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' - cp ${fetchurl { - url = "https://raw.githubusercontent.com/gpg/libgpg-error/50e62b36ea01ed25d12c443088b85d4f41a2b3e1/src/gen-lock-obj.sh"; - sha256 = "10cslipa6npalj869asaamj0w941dhmx0yjafpyyh69ypsg2m2c3"; - }} ./src/gen-lock-obj.sh - chmod +x ./src/gen-lock-obj.sh ''; outputs = [ "out" "dev" "info" ]; diff --git a/nixpkgs/pkgs/development/libraries/libharu/default.nix b/nixpkgs/pkgs/development/libraries/libharu/default.nix index 53c14027ff36..7b8a5ac02c89 100644 --- a/nixpkgs/pkgs/development/libraries/libharu/default.nix +++ b/nixpkgs/pkgs/development/libraries/libharu/default.nix @@ -1,10 +1,13 @@ -{ lib, stdenv, fetchzip, cmake, zlib, libpng }: +{ lib, stdenv, fetchFromGitHub, cmake, zlib, libpng }: -stdenv.mkDerivation { - name = "libharu-2.3.0"; +stdenv.mkDerivation rec { + pname = "libharu"; + version = "2.3.0"; - src = fetchzip { - url = "https://github.com/libharu/libharu/archive/RELEASE_2_3_0.tar.gz"; + src = fetchFromGitHub { + owner = "libharu"; + repo = pname; + rev = "RELEASE_${lib.replaceStrings ["."] ["_"] version}"; sha256 = "15s9hswnl3qqi7yh29jyrg0hma2n99haxznvcywmsp8kjqlyg75q"; }; diff --git a/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix b/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix index 964a007cc80b..3d7df2bba9cb 100644 --- a/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -16,13 +16,13 @@ assert !(enableJpeg7 && enableJpeg8); # pick only one or none, not both stdenv.mkDerivation rec { pname = "libjpeg-turbo"; - version = "2.0.6"; + version = "2.1.0"; src = fetchFromGitHub { owner = "libjpeg-turbo"; repo = "libjpeg-turbo"; rev = version; - sha256 = "0njdxfmyk8smj8bbd6fs3lxjaq3lybivwgg16gpnbiyl984dpi9b"; + sha256 = "sha256-Ma3Q/zMJPjsQmoaYJtVbHJOx65AfGLWJYi2iRFm3l5s="; }; # This is needed by freeimage diff --git a/nixpkgs/pkgs/development/libraries/libksba/default.nix b/nixpkgs/pkgs/development/libraries/libksba/default.nix index e623aa0d1119..c8998446c7da 100644 --- a/nixpkgs/pkgs/development/libraries/libksba/default.nix +++ b/nixpkgs/pkgs/development/libraries/libksba/default.nix @@ -1,11 +1,11 @@ { buildPackages, lib, stdenv, fetchurl, gettext, libgpgerror }: stdenv.mkDerivation rec { - name = "libksba-1.5.0"; + name = "libksba-1.5.1"; src = fetchurl { url = "mirror://gnupg/libksba/${name}.tar.bz2"; - sha256 = "1fm0mf3wq9fmyi1rmc1vk2fafn6liiw2mgxml3g7ybbb44lz2jmf"; + sha256 = "sha256-sPTGXk5EfZojSfa4wOd6KL6VMeRUi6AsVF0fRtx7+SE="; }; outputs = [ "out" "dev" "info" ]; diff --git a/nixpkgs/pkgs/development/libraries/liblangtag/default.nix b/nixpkgs/pkgs/development/libraries/liblangtag/default.nix index 5c31197ebff2..5ba2ecc5d6bc 100644 --- a/nixpkgs/pkgs/development/libraries/liblangtag/default.nix +++ b/nixpkgs/pkgs/development/libraries/liblangtag/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromBitbucket, autoreconfHook, gtk-doc, gettext +{ lib, stdenv, fetchurl, autoreconfHook, gtk-doc, gettext , pkg-config, glib, libxml2, gobject-introspection, gnome-common, unzip }: @@ -6,11 +6,10 @@ stdenv.mkDerivation rec { pname = "liblangtag"; version = "0.6.3"; - src = fetchFromBitbucket { - owner = "tagoh"; - repo = pname; - rev = version; - sha256 = "10rycs8xrxzf9frzalv3qx8cs1jcildhrr4imzxdmr9f4l585z96"; + # Artifact tarball contains lt-localealias.h needed for darwin + src = fetchurl { + url = "https://bitbucket.org/tagoh/liblangtag/downloads/${pname}-${version}.tar.bz2"; + sha256 = "sha256-HxKiCgLsOo0i5U3tuLaDpDycFgvaG6M3vxBgYHrnM70="; }; core_zip = fetchurl { @@ -31,19 +30,19 @@ stdenv.mkDerivation rec { cp "${language_subtag_registry}" data/language-subtag-registry ''; - configureFlags = [ - "--with-locale-alias=${stdenv.cc.libc}/share/locale/locale.alias" - ]; + configureFlags = + lib.optional + (stdenv.hostPlatform.libc == "glibc") + "--with-locale-alias=${stdenv.cc.libc}/share/locale/locale.alias"; buildInputs = [ gettext glib libxml2 gobject-introspection gnome-common ]; nativeBuildInputs = [ autoreconfHook gtk-doc gettext pkg-config unzip ]; - meta = { - inherit version; + meta = with lib; { description = "An interface library to access tags for identifying languages"; - license = lib.licenses.mpl20; - maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.linux; + license = licenses.mpl20; + maintainers = [ maintainers.raskin ]; + platforms = platforms.unix; # There are links to a homepage that are broken by a BitBucket change homepage = "https://bitbucket.org/tagoh/liblangtag/overview"; }; diff --git a/nixpkgs/pkgs/development/libraries/libmbim/default.nix b/nixpkgs/pkgs/development/libraries/libmbim/default.nix index 9695b221cb97..ef13fdc9de12 100644 --- a/nixpkgs/pkgs/development/libraries/libmbim/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmbim/default.nix @@ -1,11 +1,12 @@ { lib, stdenv , fetchurl , pkg-config -, gobject-introspection , glib , python3 , systemd , libgudev +, withIntrospection ? stdenv.hostPlatform == stdenv.buildPlatform +, gobject-introspection }: stdenv.mkDerivation rec { @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-udev-base-dir=${placeholder "out"}/lib/udev" - "--enable-introspection" + (lib.enableFeature withIntrospection "introspection") ]; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libndctl/default.nix b/nixpkgs/pkgs/development/libraries/libndctl/default.nix index 91a2c378c03c..6e82191e7558 100644 --- a/nixpkgs/pkgs/development/libraries/libndctl/default.nix +++ b/nixpkgs/pkgs/development/libraries/libndctl/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook -, asciidoctor, pkg-config, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt +, asciidoc, pkg-config, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt , json_c, kmod, which, util-linux, udev, keyutils }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "man" "dev" ]; nativeBuildInputs = - [ autoreconfHook asciidoctor pkg-config xmlto docbook_xml_dtd_45 docbook_xsl libxslt + [ autoreconfHook asciidoc pkg-config xmlto docbook_xml_dtd_45 docbook_xsl libxslt which ]; @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--without-bash" "--without-systemd" + "--disable-asciidoctor" # depends on ruby 2.7, use asciidoc instead ]; patchPhase = '' diff --git a/nixpkgs/pkgs/development/libraries/libpqxx/default.nix b/nixpkgs/pkgs/development/libraries/libpqxx/default.nix index feb9c7e65147..a1d99117515d 100644 --- a/nixpkgs/pkgs/development/libraries/libpqxx/default.nix +++ b/nixpkgs/pkgs/development/libraries/libpqxx/default.nix @@ -1,24 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, postgresql, doxygen, xmlto, python2, gnused }: +{ lib, stdenv, fetchFromGitHub, postgresql, python3, gnused }: stdenv.mkDerivation rec { pname = "libpqxx"; - version = "6.4.5"; + version = "7.5.2"; src = fetchFromGitHub { owner = "jtv"; repo = pname; rev = version; - sha256 = "0djmjr2b5x5nd2a4idv5j8s6w0kdmvil910iv1kyc7x94dirbrni"; + sha256 = "15ifd28v6xbbx931icydy8xmkd8030b20xzqjja6vwwvzss2w9fa"; }; - nativeBuildInputs = [ gnused python2 ]; - buildInputs = [ postgresql doxygen xmlto ]; + nativeBuildInputs = [ gnused python3 ]; + buildInputs = [ postgresql ]; preConfigure = '' - patchShebangs . + patchShebangs ./tools/splitconfig ''; - configureFlags = [ "--enable-shared" ]; + configureFlags = [ "--enable-shared --disable-documentation" ]; meta = { description = "A C++ library to access PostgreSQL databases"; diff --git a/nixpkgs/pkgs/development/libraries/libqmi/default.nix b/nixpkgs/pkgs/development/libraries/libqmi/default.nix index 8a3179b03427..a812a2d78489 100644 --- a/nixpkgs/pkgs/development/libraries/libqmi/default.nix +++ b/nixpkgs/pkgs/development/libraries/libqmi/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "libqmi"; - version = "1.28.2"; + version = "1.28.4"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; - sha256 = "jIw+5xmHTSUpvOmzWwKP5DWzbwA5eaNg060JOESdt4M="; + sha256 = "sha256-OxTNKrUiGnrbs5/tFu9pdTjqHHkwiCGtLRm1BeHarqA="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libquotient/default.nix b/nixpkgs/pkgs/development/libraries/libquotient/default.nix index f4fe894eaf4d..7c89e98576af 100644 --- a/nixpkgs/pkgs/development/libraries/libquotient/default.nix +++ b/nixpkgs/pkgs/development/libraries/libquotient/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "libquotient"; - version = "0.6.6"; + version = "0.6.7"; src = fetchFromGitHub { owner = "quotient-im"; repo = "libQuotient"; rev = version; - sha256 = "sha256-QSpkcQEDTMsFbQBa7dTuL/5HraVChUHqUuJdNMty/4s="; + sha256 = "sha256-fAzYv9OsanXqocEvbSB3OA9OVicwcZ0xT9uYbrFPEHc="; }; buildInputs = [ qtbase qtmultimedia ]; diff --git a/nixpkgs/pkgs/development/libraries/librealsense/default.nix b/nixpkgs/pkgs/development/libraries/librealsense/default.nix index 4015ab02a3a8..0011dc2f6e11 100644 --- a/nixpkgs/pkgs/development/libraries/librealsense/default.nix +++ b/nixpkgs/pkgs/development/libraries/librealsense/default.nix @@ -1,6 +1,16 @@ -{ stdenv, config, lib, fetchFromGitHub, cmake, libusb1, ninja, pkg-config, gcc +{ stdenv +, config +, lib +, fetchFromGitHub +, fetchpatch +, cmake +, libusb1 +, ninja +, pkg-config +, gcc , cudaSupport ? config.cudaSupport or false, cudatoolkit -, enablePython ? false, pythonPackages ? null }: +, enablePython ? false, pythonPackages ? null +}: assert cudaSupport -> cudatoolkit != null; assert enablePython -> pythonPackages != null; @@ -24,7 +34,13 @@ stdenv.mkDerivation rec { ] ++ lib.optional cudaSupport cudatoolkit ++ lib.optionals enablePython (with pythonPackages; [python pybind11 ]); - patches = lib.optionals enablePython [ + patches = [ + # fix build on aarch64-darwin + # https://github.com/IntelRealSense/librealsense/pull/9253 + (fetchpatch { + url = "https://github.com/IntelRealSense/librealsense/commit/beb4c44debc8336de991c983274cad841eb5c323.patch"; + sha256 = "05mxsd2pz3xrvywdqyxkwdvxx8hjfxzcgl51897avz4v2j89pyq8"; + }) ./py_sitepackage_dir.patch ./py_pybind11_no_external_download.patch ]; @@ -57,6 +73,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/IntelRealSense/librealsense"; license = licenses.asl20; maintainers = with maintainers; [ brian-dawn ]; - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/librime/default.nix b/nixpkgs/pkgs/development/libraries/librime/default.nix index eb9c514d59d2..3a2ca1e18c15 100644 --- a/nixpkgs/pkgs/development/libraries/librime/default.nix +++ b/nixpkgs/pkgs/development/libraries/librime/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "librime"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "rime"; repo = pname; rev = version; - sha256 = "023c7bpfnyf8wlrssn89ziwsjccflyanrxlaqmwcbx8a5dvipk01"; + sha256 = "sha256-GzNMwyJR9PgJN0eGYbnBW6LS3vo4SUVLdyNG9kcEE18="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/libsass/default.nix b/nixpkgs/pkgs/development/libraries/libsass/default.nix index f4caa22b3229..9b61ce65d453 100644 --- a/nixpkgs/pkgs/development/libraries/libsass/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsass/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libsass"; - version = "3.6.4"; + version = "3.6.5"; src = fetchFromGitHub { owner = "sass"; repo = pname; rev = version; - sha256 = "074kvacdan85h4qrvsk97575ys9xgkc044gplz3m6vn4a8pcl2rn"; + sha256 = "1cxj6r85d5f3qxdwzxrmkx8z875hig4cr8zsi30w6vj23cyds3l2"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' diff --git a/nixpkgs/pkgs/development/libraries/libserdes/default.nix b/nixpkgs/pkgs/development/libraries/libserdes/default.nix new file mode 100644 index 000000000000..7b48f150c9a1 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libserdes/default.nix @@ -0,0 +1,61 @@ +{ stdenv +, lib +, fetchFromGitHub +, perl +, boost +, rdkafka +, jansson +, curl +, avro-c +, avro-cpp }: + +stdenv.mkDerivation rec { + pname = "libserdes"; + version = "6.2.0"; + + src = fetchFromGitHub { + owner = "confluentinc"; + repo = pname; + rev = "v${version}"; + sha256 = "194ras18xw5fcnjgg1isnb24ydx9040ndciniwcbdb7w7wd901gc"; + }; + + outputs = [ "dev" "out" ]; + + nativeBuildInputs = [ perl ]; + + buildInputs = [ boost rdkafka jansson curl avro-c avro-cpp ]; + + makeFlags = [ "GEN_PKG_CONFIG=y" ]; + + postPatch = '' + patchShebangs configure lds-gen.pl + ''; + + # Has a configure script but it’s not Autoconf so steal some bits from multiple-outputs.sh: + setOutputFlags = false; + + preConfigure = '' + configureFlagsArray+=( + "--libdir=''${!outputLib}/lib" + "--includedir=''${!outputInclude}/include" + ) + ''; + + preInstall = '' + installFlagsArray+=("pkgconfigdir=''${!outputDev}/lib/pkgconfig") + ''; + + # Header files get installed with executable bit for some reason; get rid of it. + postInstall = '' + chmod -x ''${!outputInclude}/include/libserdes/*.h + ''; + + meta = with lib; { + description = "A schema-based serializer/deserializer C/C++ library with support for Avro and the Confluent Platform Schema Registry"; + homepage = "https://github.com/confluentinc/libserdes"; + license = licenses.asl20; + maintainers = with maintainers; [ liff ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix b/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix index 97991a0cffbf..fe02a96a565c 100644 --- a/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix @@ -1,7 +1,7 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch +, nix-update-script , autoreconfHook , pkg-config , perl @@ -16,29 +16,16 @@ stdenv.mkDerivation rec { pname = "libsidplayfp"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "libsidplayfp"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "0487gap2b0ypikyra74lk1qwqwr0vncldamk5xb1db2x97v504fd"; + sha256 = "sha256-lDM4nJozZF8Rt+XWnM41hBAYatZVsmvvQajgHLI9uy0="; }; - # https://github.com/libsidplayfp/libsidplayfp/issues/13 - # Remove on next version bump - patches = [ - (fetchpatch { - url = "https://github.com/libsidplayfp/libsidplayfp/commit/84f5498f5653261ed84328e1b5676c31e3ba9e6e.patch"; - sha256 = "1vysbl4fkdzm11k40msng2ag6i6mb6z9jsw32vyj9calcfha5957"; - }) - (fetchpatch { - url = "https://github.com/libsidplayfp/libsidplayfp/commit/c1a1b732cc2e791d910522d58f47c6d094493c6d.patch"; - sha256 = "1d3sgdly0q9dysgkx5afxbwfas6p0m8n3lw1hmj4n6wm3j9sdz4g"; - }) - ]; - postPatch = '' patchShebangs . ''; @@ -72,6 +59,12 @@ stdenv.mkDerivation rec { mv docs/html $doc/share/doc/libsidplayfp/ ''; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + meta = with lib; { description = "A library to play Commodore 64 music derived from libsidplay2"; longDescription = '' diff --git a/nixpkgs/pkgs/development/libraries/libslirp/default.nix b/nixpkgs/pkgs/development/libraries/libslirp/default.nix index 5da6cf6bbbcb..f4eaa9c31993 100644 --- a/nixpkgs/pkgs/development/libraries/libslirp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libslirp/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "libslirp"; - version = "4.5.0"; + version = "4.6.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "slirp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UdKBED7xR0gDf3aj3+6I62CnAwGP7XxskaFzWeUUkkk="; + sha256 = "sha256-AM6NxO4hjFiUAzRYbXV3fe18xwCBmzdM63n93UOxjKw="; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/libusbmuxd/default.nix b/nixpkgs/pkgs/development/libraries/libusbmuxd/default.nix index 66198a6ec33f..7bba6e8b4040 100644 --- a/nixpkgs/pkgs/development/libraries/libusbmuxd/default.nix +++ b/nixpkgs/pkgs/development/libraries/libusbmuxd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libusbmuxd"; - version = "2.0.2"; + version = "unstable-2021-02-06"; src = fetchFromGitHub { owner = "libimobiledevice"; repo = pname; - rev = version; - sha256 = "139pzsnixkck6ly1q6p0diqr0hgd0mx0pr4xx1jamm3f3656kpf9"; + rev = "3eb50a07bad4c2222e76df93b23a0161922150d1"; + sha256 = "sha256-pBPBgE6s8JYKJYEV8CcumNki+6jD5r7HzQ0nZ8yQLdM="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/libvori/default.nix b/nixpkgs/pkgs/development/libraries/libvori/default.nix new file mode 100644 index 000000000000..2eb7bffbdf12 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libvori/default.nix @@ -0,0 +1,21 @@ +{ stdenv, lib, fetchurl, cmake }: + +stdenv.mkDerivation rec { + pname = "libvori"; + version = "210412"; + + src = fetchurl { + url = "https://brehm-research.de/files/${pname}-${version}.tar.gz"; + sha256 = "1b4hpwibf3k7gl6n984l3wdi0zyl2fmpz84m9g2di4yhm6p8c61k"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "Library for Voronoi intergration of electron densities"; + homepage = "https://brehm-research.de/libvori.php"; + license = with licenses; [ lgpl3Only ]; + platforms = platforms.unix; + maintainers = [ maintainers.sheepforce ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libwacom/default.nix b/nixpkgs/pkgs/development/libraries/libwacom/default.nix index c17b8be592aa..5bb6445ac38f 100644 --- a/nixpkgs/pkgs/development/libraries/libwacom/default.nix +++ b/nixpkgs/pkgs/development/libraries/libwacom/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, glib, pkg-config, udev, libgudev, doxygen }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, glib, pkg-config, udev, libgudev, doxygen, python3 }: stdenv.mkDerivation rec { pname = "libwacom"; - version = "1.9"; + version = "1.10"; outputs = [ "out" "dev" ]; @@ -10,10 +10,10 @@ stdenv.mkDerivation rec { owner = "linuxwacom"; repo = "libwacom"; rev = "libwacom-${version}"; - sha256 = "sha256-o1xCSrWKPzz1GePEVB1jgx2cGzRtw0I6c4wful08Vx4="; + sha256 = "sha256-Q7b54AMAxdIzN7TUuhIdlrXaVtj2szV4n3y9bAE0LsU="; }; - nativeBuildInputs = [ pkg-config meson ninja doxygen ]; + nativeBuildInputs = [ pkg-config meson ninja doxygen python3 ]; mesonFlags = [ "-Dtests=disabled" ]; diff --git a/nixpkgs/pkgs/development/libraries/libwpe/default.nix b/nixpkgs/pkgs/development/libraries/libwpe/default.nix index 9e7886eb68d1..1fcb91a7fb39 100644 --- a/nixpkgs/pkgs/development/libraries/libwpe/default.nix +++ b/nixpkgs/pkgs/development/libraries/libwpe/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "libwpe"; - version = "1.10.0"; + version = "1.10.1"; src = fetchurl { url = "https://wpewebkit.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-JBXicNReNZXtQFK8EF9zN0TcLTZ34S/0qDHlAphBCE0="; + sha256 = "sha256-oyez/88jVtvoFIwdtLvcU1nX5xY9F39nVRqDk7FErfA="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libxc/default.nix b/nixpkgs/pkgs/development/libraries/libxc/default.nix index 48c5a4f9b475..95ce2406223c 100644 --- a/nixpkgs/pkgs/development/libraries/libxc/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxc/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitLab, cmake, gfortran, perl }: let - version = "5.1.4"; + version = "5.1.5"; in stdenv.mkDerivation { pname = "libxc"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation { owner = "libxc"; repo = "libxc"; rev = version; - sha256 = "0rs6v72zz3jr22r29zxxdk8wdsfv6wid6cx2661974z09dbvbr1f"; + sha256 = "0cy3x2zn1bldc5i0rzislfbc8h4nqgds445jkfqjv0d1shvdy0zn"; }; buildInputs = [ gfortran ]; diff --git a/nixpkgs/pkgs/development/libraries/libxml2/default.nix b/nixpkgs/pkgs/development/libraries/libxml2/default.nix index ca3cbc4a1884..1b58b4539e46 100644 --- a/nixpkgs/pkgs/development/libraries/libxml2/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxml2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl +{ stdenv, lib, fetchurl, fetchpatch , zlib, xz, libintl, python, gettext, ncurses, findXMLCatalogs , pythonSupport ? enableShared && stdenv.buildPlatform == stdenv.hostPlatform , icuSupport ? false, icu ? null @@ -27,6 +27,13 @@ stdenv.mkDerivation rec { # https://github.com/NixOS/nixpkgs/pull/63174 # https://github.com/NixOS/nixpkgs/pull/72342 ./utf8-xmlErrorFuncHandler.patch + + # Work around lxml API misuse. + # https://gitlab.gnome.org/GNOME/libxml2/issues/255 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libxml2/commit/85b1792e37b131e7a51af98a37f92472e8de5f3f.patch"; + sha256 = "epqlNs2S0Zczox3KyCB6R2aJKh87lXydlZ0x6tLHweE="; + }) ]; outputs = [ "bin" "dev" "out" "man" "doc" ] diff --git a/nixpkgs/pkgs/development/libraries/mesa/default.nix b/nixpkgs/pkgs/development/libraries/mesa/default.nix index 2b94f9c3bb50..3c7ea16b26ae 100644 --- a/nixpkgs/pkgs/development/libraries/mesa/default.nix +++ b/nixpkgs/pkgs/development/libraries/mesa/default.nix @@ -4,8 +4,7 @@ , expat, libdrm, xorg, wayland, wayland-protocols, openssl , llvmPackages, libffi, libomxil-bellagio, libva-minimal , libelf, libvdpau -, libglvnd -, enableRadv ? true +, libglvnd, libunwind , galliumDrivers ? ["auto"] , driDrivers ? ["auto"] , vulkanDrivers ? ["auto"] @@ -32,7 +31,7 @@ with lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "21.0.1"; + version = "21.1.2"; branch = versions.major version; self = stdenv.mkDerivation { @@ -46,7 +45,7 @@ self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "1fqj2xhhd1ary0pfg31jq6fqcnd6qgyrw1445nmz554k8n2ck7rp"; + sha256 = "0pw2wba4q66rhdx0hpimvxmrl7k2vv315gmmk17kl7snc0vvdd13"; }; prePatch = "patchShebangs ."; @@ -128,6 +127,7 @@ self = stdenv.mkDerivation { libpthreadstubs openssl /*or another sha1 provider*/ ] ++ lib.optionals (elem "wayland" eglPlatforms) [ wayland wayland-protocols ] ++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal ] + ++ lib.optionals stdenv.isDarwin [ libunwind ] ++ lib.optional withValgrind valgrind-light; depsBuildBuild = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/mesa/missing-includes.patch b/nixpkgs/pkgs/development/libraries/mesa/missing-includes.patch index 72488893c6b6..c17d54908553 100644 --- a/nixpkgs/pkgs/development/libraries/mesa/missing-includes.patch +++ b/nixpkgs/pkgs/development/libraries/mesa/missing-includes.patch @@ -9,14 +9,14 @@ #include "pipe/p_compiler.h" #include "pipe/p_state.h" ---- ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h -+++ ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h +--- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h ++++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h @@ -28,6 +28,8 @@ #ifndef RADV_AMDGPU_WINSYS_H #define RADV_AMDGPU_WINSYS_H - + +#include <sys/types.h> + - #include "radv_radeon_winsys.h" - #include "ac_gpu_info.h" - #include "addrlib/addrinterface.h"<Paste> + #include <amdgpu.h> + #include <pthread.h> + #include "util/list.h" diff --git a/nixpkgs/pkgs/development/libraries/mlt/default.nix b/nixpkgs/pkgs/development/libraries/mlt/default.nix index 021dc1c3d95f..8bd2bc80362c 100644 --- a/nixpkgs/pkgs/development/libraries/mlt/default.nix +++ b/nixpkgs/pkgs/development/libraries/mlt/default.nix @@ -2,6 +2,8 @@ , SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate, libexif , libvorbis, libxml2, movit, pkg-config, sox, fftw, opencv4, SDL2 , gtk2, genericUpdater, common-updater-scripts, libebur128 +, jack2, ladspa-sdk, swig, which, ncurses +, enablePython ? false, python }: stdenv.mkDerivation rec { @@ -16,18 +18,22 @@ stdenv.mkDerivation rec { }; buildInputs = [ - SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2 - makeWrapper movit pkg-config sox libexif gtk2 fftw libebur128 - opencv4 SDL2 - ]; + SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2.dev + movit sox libexif gtk2 fftw libebur128 opencv4 SDL2 jack2 + ladspa-sdk + ] ++ lib.optional enablePython ncurses; + + nativeBuildInputs = [ pkg-config makeWrapper which ] + ++ lib.optionals enablePython [ python swig ]; # Mostly taken from: # http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine configureFlags = [ "--avformat-swscale" "--enable-gpl" "--enable-gpl3" "--enable-opengl" - ]; + ] ++ lib.optional enablePython "--swig-languages=python"; enableParallelBuilding = true; + outPythonPath = lib.optionalString enablePython "$(toPythonPath $out)"; postInstall = '' wrapProgram $out/bin/melt --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 @@ -36,6 +42,11 @@ stdenv.mkDerivation rec { s=${movit.dev}/include t=$(for ((i = 0; i < ''${#s}; i++)); do echo -n X; done) sed -i $out/lib/mlt/libmltopengl.so -e "s|$s|$t|g" + '' + lib.optionalString enablePython '' + mkdir -p ${outPythonPath}/mlt + cp -a src/swig/python/_mlt.so ${outPythonPath}/mlt/ + cp -a src/swig/python/mlt.py ${outPythonPath}/mlt/__init__.py + sed -i ${outPythonPath}/mlt/__init__.py -e "s|return importlib.import_module('_mlt')|return importlib.import_module('mlt._mlt')|g" ''; passthru.updateScript = genericUpdater { @@ -47,7 +58,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Open source multimedia framework, designed for television broadcasting"; homepage = "https://www.mltframework.org"; - license = licenses.gpl3; + license = with licenses; [ gpl3Only gpl2Only lgpl21Only ]; maintainers = with maintainers; [ tohl peti ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/development/libraries/nco/default.nix b/nixpkgs/pkgs/development/libraries/nco/default.nix index 958be905f835..b7df32633b4a 100644 --- a/nixpkgs/pkgs/development/libraries/nco/default.nix +++ b/nixpkgs/pkgs/development/libraries/nco/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr, which, curl, flex, coreutils }: +{ lib, stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr2, which, curl, flex, coreutils }: stdenv.mkDerivation rec { version = "4.9.8"; pname = "nco"; - nativeBuildInputs = [ flex which antlr ]; + nativeBuildInputs = [ flex which antlr2 ]; buildInputs = [ netcdf netcdfcxx4 gsl udunits curl coreutils ]; src = fetchzip { diff --git a/nixpkgs/pkgs/development/libraries/ncurses/default.nix b/nixpkgs/pkgs/development/libraries/ncurses/default.nix index 742de6cf92e7..dd1eea632e18 100644 --- a/nixpkgs/pkgs/development/libraries/ncurses/default.nix +++ b/nixpkgs/pkgs/development/libraries/ncurses/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional unicode "--enable-widec" ++ lib.optional (!withCxx) "--without-cxx" ++ lib.optional (abiVersion == "5") "--with-abi-version=5" + ++ lib.optional stdenv.hostPlatform.isNetBSD "--enable-rpath" ++ lib.optionals stdenv.hostPlatform.isWindows [ "--enable-sp-funcs" "--enable-term-driver" diff --git a/nixpkgs/pkgs/development/libraries/nsss/default.nix b/nixpkgs/pkgs/development/libraries/nsss/default.nix index 4e71c4d65e6e..527e7d4898e1 100644 --- a/nixpkgs/pkgs/development/libraries/nsss/default.nix +++ b/nixpkgs/pkgs/development/libraries/nsss/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "nsss"; - version = "0.1.0.0"; - sha256 = "15rxbwf16wm1la079yr2xn4bccjgd7m8dh6r7bpr6s57cj93i2mq"; + version = "0.1.0.1"; + sha256 = "1nair10m7fddp50mpqnwj0qiggnh5qmnffmyzxis5l1ixcav1ir0"; description = "An implementation of a subset of the pwd.h, group.h and shadow.h family of functions."; diff --git a/nixpkgs/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix b/nixpkgs/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix index f9c2547d4246..a82fa9068c66 100644 --- a/nixpkgs/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix +++ b/nixpkgs/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "nvidia-optical-flow-sdk"; - version = "1.0"; + version = "2.0"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "NVIDIAOpticalFlowSDK"; - rev = "79c6cee80a2df9a196f20afd6b598a9810964c32"; - sha256 = "1y6igwv75v1ynqm7j6la3ky0f15mgnj1jyyak82yvhcsx1aax0a1"; + rev = "edb50da3cf849840d680249aa6dbef248ebce2ca"; + sha256 = "0hv0m0k9wl2wjhhl886j7ymngnf2xz7851nfh57s1gy5bv9lgdgz"; }; # # We only need the header files. The library files are @@ -25,4 +25,3 @@ stdenv.mkDerivation { platforms = platforms.all; }; } - diff --git a/nixpkgs/pkgs/development/libraries/olm/default.nix b/nixpkgs/pkgs/development/libraries/olm/default.nix index ca3a081aee00..e7642e16c955 100644 --- a/nixpkgs/pkgs/development/libraries/olm/default.nix +++ b/nixpkgs/pkgs/development/libraries/olm/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "olm"; - version = "3.2.2"; + version = "3.2.4"; src = fetchFromGitLab { domain = "gitlab.matrix.org"; owner = "matrix-org"; repo = pname; rev = version; - sha256 = "0qji25wiwmkxyfpraxj96c54hyayqmjkvwh0gsy5gb5pz5bp4mcy"; + sha256 = "1rl7j26li1irb1lqnnkzan7jrj38kvmdn69rlwbbp390v3z15lvh"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/opencv/4.x.nix b/nixpkgs/pkgs/development/libraries/opencv/4.x.nix index 58609a9186d6..a33eff4faa53 100644 --- a/nixpkgs/pkgs/development/libraries/opencv/4.x.nix +++ b/nixpkgs/pkgs/development/libraries/opencv/4.x.nix @@ -301,7 +301,7 @@ stdenv.mkDerivation { "-DCUDA_FAST_MATH=ON" "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" "-DCUDA_NVCC_FLAGS=--expt-relaxed-constexpr" - "-DNVIDIA_OPTICAL_FLOW_1_0_HEADERS_PATH=${nvidia-optical-flow-sdk}" + "-DNVIDIA_OPTICAL_FLOW_2_0_HEADERS_PATH=${nvidia-optical-flow-sdk}" ] ++ lib.optionals stdenv.isDarwin [ "-DWITH_OPENCL=OFF" "-DWITH_LAPACK=OFF" diff --git a/nixpkgs/pkgs/development/libraries/opencv/cuda_opt_flow.patch b/nixpkgs/pkgs/development/libraries/opencv/cuda_opt_flow.patch index cb96721fb530..2f97abd51bbf 100644 --- a/nixpkgs/pkgs/development/libraries/opencv/cuda_opt_flow.patch +++ b/nixpkgs/pkgs/development/libraries/opencv/cuda_opt_flow.patch @@ -1,26 +1,27 @@ -diff --git a/opencv_contrib/cudaoptflow/CMakeLists.txt b/opencv_contrib/cudaoptflow/CMakeLists.txt -index e5b823ab4a..a728060d0b 100644 ---- a/opencv_contrib/cudaoptflow/CMakeLists.txt -+++ b/opencv_contrib/cudaoptflow/CMakeLists.txt -@@ -11,18 +11,6 @@ ocv_define_module(cudaoptflow opencv_video opencv_optflow opencv_cudaarithm open - set(NVIDIA_OPTICAL_FLOW_1_0_HEADERS_COMMIT "79c6cee80a2df9a196f20afd6b598a9810964c32") - set(NVIDIA_OPTICAL_FLOW_1_0_HEADERS_MD5 "ca5acedee6cb45d0ec610a6732de5c15") - set(NVIDIA_OPTICAL_FLOW_1_0_HEADERS_PATH "${OpenCV_BINARY_DIR}/3rdparty/NVIDIAOpticalFlowSDK_1_0_Headers") --ocv_download(FILENAME "${NVIDIA_OPTICAL_FLOW_1_0_HEADERS_COMMIT}.zip" -- HASH ${NVIDIA_OPTICAL_FLOW_1_0_HEADERS_MD5} -- URL -- "https://github.com/NVIDIA/NVIDIAOpticalFlowSDK/archive/" -- DESTINATION_DIR "${NVIDIA_OPTICAL_FLOW_1_0_HEADERS_PATH}" -- STATUS NVIDIA_OPTICAL_FLOW_1_0_HEADERS_DOWNLOAD_SUCCESS -- ID "NVIDIA_OPTICAL_FLOW" -- UNPACK RELATIVE_URL) - --if(NOT NVIDIA_OPTICAL_FLOW_1_0_HEADERS_DOWNLOAD_SUCCESS) -- message(STATUS "Failed to download NVIDIA_Optical_Flow_1_0 Headers") --else() -- add_definitions(-DHAVE_NVIDIA_OPTFLOW=1) -- ocv_include_directories(SYSTEM "${NVIDIA_OPTICAL_FLOW_1_0_HEADERS_PATH}/NVIDIAOpticalFlowSDK-${NVIDIA_OPTICAL_FLOW_1_0_HEADERS_COMMIT}") +diff --unified --recursive --text a/opencv_contrib/cudaoptflow/CMakeLists.txt b/opencv_contrib/cudaoptflow/CMakeLists.txt +--- a/opencv_contrib/cudaoptflow/CMakeLists.txt 2021-06-12 01:35:47.536395972 +0300 ++++ b/opencv_contrib/cudaoptflow/CMakeLists.txt 2021-06-12 01:36:02.029498597 +0300 +@@ -12,19 +12,6 @@ + set(NVIDIA_OPTICAL_FLOW_2_0_HEADERS_COMMIT "edb50da3cf849840d680249aa6dbef248ebce2ca") + set(NVIDIA_OPTICAL_FLOW_2_0_HEADERS_MD5 "a73cd48b18dcc0cc8933b30796074191") + set(NVIDIA_OPTICAL_FLOW_2_0_HEADERS_PATH "${OpenCV_BINARY_DIR}/3rdparty/NVIDIAOpticalFlowSDK_2_0_Headers") +- ocv_download(FILENAME "${NVIDIA_OPTICAL_FLOW_2_0_HEADERS_COMMIT}.zip" +- HASH ${NVIDIA_OPTICAL_FLOW_2_0_HEADERS_MD5} +- URL "https://github.com/NVIDIA/NVIDIAOpticalFlowSDK/archive/" +- DESTINATION_DIR "${NVIDIA_OPTICAL_FLOW_2_0_HEADERS_PATH}" +- STATUS NVIDIA_OPTICAL_FLOW_2_0_HEADERS_DOWNLOAD_SUCCESS +- ID "NVIDIA_OPTICAL_FLOW" +- UNPACK RELATIVE_URL) +- +- if(NOT NVIDIA_OPTICAL_FLOW_2_0_HEADERS_DOWNLOAD_SUCCESS) +- message(STATUS "Failed to download NVIDIA_Optical_Flow_2_0 Headers") +- else() +- message(STATUS "Building with NVIDIA Optical Flow API 2.0") +- add_definitions(-DHAVE_NVIDIA_OPTFLOW=2) +- ocv_include_directories(SYSTEM "${NVIDIA_OPTICAL_FLOW_2_0_HEADERS_PATH}/NVIDIAOpticalFlowSDK-${NVIDIA_OPTICAL_FLOW_2_0_HEADERS_COMMIT}") +- endif() -endif() \ No newline at end of file -+add_definitions(-DHAVE_NVIDIA_OPTFLOW=1) -+ocv_include_directories(SYSTEM "${NVIDIA_OPTICAL_FLOW_1_0_HEADERS_PATH}") ++ add_definitions(-DHAVE_NVIDIA_OPTFLOW=2) ++ ocv_include_directories(SYSTEM "${NVIDIA_OPTICAL_FLOW_2_0_HEADERS_PATH}") ++endif() diff --git a/nixpkgs/pkgs/development/libraries/openssl/default.nix b/nixpkgs/pkgs/development/libraries/openssl/default.nix index 2a586f9e9efc..77a6b513ee6e 100644 --- a/nixpkgs/pkgs/development/libraries/openssl/default.nix +++ b/nixpkgs/pkgs/development/libraries/openssl/default.nix @@ -54,7 +54,10 @@ let outputs = [ "bin" "dev" "out" "man" ] ++ optional withDocs "doc"; setOutputFlags = false; - separateDebugInfo = !(stdenv.hostPlatform.useLLVM or false) && stdenv.cc.isGNU; + separateDebugInfo = + !stdenv.hostPlatform.isDarwin && + !(stdenv.hostPlatform.useLLVM or false) && + stdenv.cc.isGNU; nativeBuildInputs = [ perl ]; buildInputs = lib.optional withCryptodev cryptodev diff --git a/nixpkgs/pkgs/development/libraries/orocos-kdl/default.nix b/nixpkgs/pkgs/development/libraries/orocos-kdl/default.nix index 094ee544649d..032b67e683dc 100644 --- a/nixpkgs/pkgs/development/libraries/orocos-kdl/default.nix +++ b/nixpkgs/pkgs/development/libraries/orocos-kdl/default.nix @@ -2,13 +2,15 @@ stdenv.mkDerivation rec { pname = "orocos-kdl"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "orocos"; repo = "orocos_kinematics_dynamics"; rev = "v${version}"; - sha256 = "0qj56j231h0rnjbglakammxn2lwmhy5f2qa37v1f6pcn81dn13vv"; + sha256 = "181w2q6lsrfcvrgqwi6m0xrydjlblj1b654apf2d7zjc7qqgd6ca"; + # Needed to build Python bindings + fetchSubmodules = true; }; sourceRoot = "source/orocos_kdl"; diff --git a/nixpkgs/pkgs/development/libraries/pipewire/0080-pipewire-config-dir.patch b/nixpkgs/pkgs/development/libraries/pipewire/0080-pipewire-config-dir.patch index b92e2818ea07..b8d8fcb0f905 100644 --- a/nixpkgs/pkgs/development/libraries/pipewire/0080-pipewire-config-dir.patch +++ b/nixpkgs/pkgs/development/libraries/pipewire/0080-pipewire-config-dir.patch @@ -1,30 +1,30 @@ diff --git a/meson.build b/meson.build -index a27569bd..fcf18344 100644 +index b6b4553b..f21c29d8 100644 --- a/meson.build +++ b/meson.build -@@ -36,7 +36,10 @@ pipewire_libexecdir = prefix / get_option('libexecdir') - pipewire_localedir = prefix / get_option('localedir') +@@ -37,7 +37,10 @@ pipewire_localedir = prefix / get_option('localedir') pipewire_sysconfdir = prefix / get_option('sysconfdir') --pipewire_configdir = pipewire_sysconfdir / 'pipewire' -+pipewire_configdir = get_option('pipewire_config_dir') -+if pipewire_configdir == '' -+ pipewire_configdir = pipewire_sysconfdir / 'pipewire' + pipewire_configdir = pipewire_sysconfdir / 'pipewire' +-pipewire_confdatadir = pipewire_datadir / 'pipewire' ++pipewire_confdatadir = get_option('pipewire_confdata_dir') ++if pipewire_confdatadir == '' ++ pipewire_confdatadir = pipewire_datadir / 'pipewire' +endif modules_install_dir = pipewire_libdir / pipewire_name if host_machine.system() == 'linux' diff --git a/meson_options.txt b/meson_options.txt -index 85beb86a..372e8faa 100644 +index 9bc33fcd..e4bd2dc1 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -67,6 +67,9 @@ option('jack-devel', +@@ -61,6 +61,9 @@ option('jack-devel', option('libjack-path', description: 'Where to install the libjack.so library', type: 'string') -+option('pipewire_config_dir', -+ type : 'string', -+ description : 'Directory for pipewire configuration (defaults to /etc/pipewire)') ++option('pipewire_confdata_dir', ++ type: 'string', ++ description: 'Directory for pipewire default configuration (defaults to /usr/share/pipewire)') option('spa-plugins', description: 'Enable spa plugins integration', type: 'feature', diff --git a/nixpkgs/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch b/nixpkgs/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch new file mode 100644 index 000000000000..966cb9579777 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch @@ -0,0 +1,28 @@ +diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in +index bbafa134..227d3e06 100644 +--- a/src/daemon/pipewire.conf.in ++++ b/src/daemon/pipewire.conf.in +@@ -116,7 +116,7 @@ context.modules = [ + # access.allowed to list an array of paths of allowed + # apps. + #access.allowed = [ +- # @media_session_path@ ++ # <media_session_path> + #] + + # An array of rejected paths. +@@ -220,12 +220,12 @@ context.exec = [ + # but it is better to start it as a systemd service. + # Run the session manager with -h for options. + # +- @comment@{ path = "@media_session_path@" args = "" } ++ @comment@{ path = "<media_session_path>" args = "" } + # + # You can optionally start the pulseaudio-server here as well + # but it is better to start it as a systemd service. + # It can be interesting to start another daemon here that listens + # on another address with the -a option (eg. -a tcp:4713). + # +- @comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" } ++ @comment@{ path = "<pipewire_path>" args = "-c pipewire-pulse.conf" } + ] diff --git a/nixpkgs/pkgs/development/libraries/pipewire/default.nix b/nixpkgs/pkgs/development/libraries/pipewire/default.nix index 40f4e328c317..8504d2669849 100644 --- a/nixpkgs/pkgs/development/libraries/pipewire/default.nix +++ b/nixpkgs/pkgs/development/libraries/pipewire/default.nix @@ -2,6 +2,7 @@ , lib , fetchFromGitLab , removeReferencesTo +, python3 , meson , ninja , systemd @@ -19,6 +20,7 @@ , SDL2 , vulkan-headers , vulkan-loader +, webrtc-audio-processing , ncurses , makeFontsConf , callPackage @@ -31,6 +33,8 @@ , nativeHfpSupport ? true , ofonoSupport ? true , hsphfpdSupport ? true +, pulseTunnelSupport ? true, libpulseaudio ? null +, zeroconfSupport ? true, avahi ? null }: let @@ -42,7 +46,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.27"; + version = "0.3.30"; outputs = [ "out" @@ -60,7 +64,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-GfcMODQWtcahBvXnZ98/PKIm4pkqLaz09oOy7zQR4IA="; + sha256 = "sha256-DnaPvZoDaegjtJNKBmCJEAZe5FQBnSER79FPnxiWQUE="; }; patches = [ @@ -72,8 +76,10 @@ let ./0055-pipewire-media-session-path.patch # Move installed tests into their own output. ./0070-installed-tests-path.patch - # Add flag to specify configuration directory (different from the installation directory). + # Add option for changing the config install directory ./0080-pipewire-config-dir.patch + # Remove output paths from the comments in the config templates to break dependency cycles + ./0090-pipewire-config-template-paths.patch ]; nativeBuildInputs = [ @@ -82,6 +88,7 @@ let meson ninja pkg-config + python3 ]; buildInputs = [ @@ -94,12 +101,15 @@ let udev vulkan-headers vulkan-loader + webrtc-audio-processing valgrind SDL2 systemd ] ++ lib.optionals gstreamerSupport [ gst_all_1.gst-plugins-base gst_all_1.gstreamer ] ++ lib.optional ffmpegSupport ffmpeg - ++ lib.optionals bluezSupport [ bluez libopenaptx ldacbt sbc fdk_aac ]; + ++ lib.optionals bluezSupport [ bluez libopenaptx ldacbt sbc fdk_aac ] + ++ lib.optional pulseTunnelSupport libpulseaudio + ++ lib.optional zeroconfSupport avahi; mesonFlags = [ "-Ddocs=enabled" @@ -112,6 +122,8 @@ let "-Dmedia-session-prefix=${placeholder "mediaSession"}" "-Dlibjack-path=${placeholder "jack"}/lib" "-Dlibcamera=disabled" + "-Dlibpulse=${mesonEnable pulseTunnelSupport}" + "-Davahi=${mesonEnable zeroconfSupport}" "-Dgstreamer=${mesonEnable gstreamerSupport}" "-Dffmpeg=${mesonEnable ffmpegSupport}" "-Dbluez5=${mesonEnable bluezSupport}" @@ -119,24 +131,35 @@ let "-Dbluez5-backend-hfp-native=${mesonEnable nativeHfpSupport}" "-Dbluez5-backend-ofono=${mesonEnable ofonoSupport}" "-Dbluez5-backend-hsphfpd=${mesonEnable hsphfpdSupport}" - "-Dpipewire_config_dir=/etc/pipewire" + "-Dsysconfdir=/etc" + "-Dpipewire_confdata_dir=${placeholder "lib"}/share/pipewire" ]; FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file doCheck = true; + postUnpack = '' + patchShebangs source/doc/strip-static.sh + patchShebangs source/spa/tests/gen-cpp-test.py + ''; + postInstall = '' - pushd . - cd $out + pushd $lib/share mkdir -p $out/nix-support/etc/pipewire - for f in etc/pipewire/*.conf; do bin/spa-json-dump "$f" > "$out/nix-support/$f.json"; done + for f in pipewire/*.conf; do + echo "Generating JSON from $f" + $out/bin/spa-json-dump "$f" > "$out/nix-support/etc/$f.json" + done mkdir -p $mediaSession/nix-support/etc/pipewire/media-session.d - for f in etc/pipewire/media-session.d/*.conf; do bin/spa-json-dump "$f" > "$mediaSession/nix-support/$f.json"; done + for f in pipewire/media-session.d/*.conf; do + echo "Generating JSON from $f" + $out/bin/spa-json-dump "$f" > "$mediaSession/nix-support/etc/$f.json" + done popd - moveToOutput "etc/pipewire/media-session.d/*.conf" "$mediaSession" + moveToOutput "share/pipewire/media-session.d/*.conf" "$mediaSession" moveToOutput "share/systemd/user/pipewire-media-session.*" "$mediaSession" moveToOutput "lib/systemd/user/pipewire-media-session.*" "$mediaSession" moveToOutput "bin/pipewire-media-session" "$mediaSession" @@ -155,6 +178,7 @@ let test-paths = callPackage ./test-paths.nix { paths-out = [ "share/alsa/alsa.conf.d/50-pipewire.conf" + "nix-support/etc/pipewire/client-rt.conf.json" "nix-support/etc/pipewire/client.conf.json" "nix-support/etc/pipewire/jack.conf.json" "nix-support/etc/pipewire/pipewire.conf.json" diff --git a/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index c2fa32b6d05a..80998e6ef19f 100644 --- a/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum"; - version = "0.11.2"; + version = "0.20.0"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - sha256 = "1jcfv96ws6sm3kc2q8zriwqhry24qbq3zbp8gkqw75wssbv82rmc"; + sha256 = "133m5ifs8ylhdh78m99n0y76q0nix68xsqfwcsrak4yr1n5pj9qp"; }; nativeBuildInputs = [ @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/tsujan/Kvantum"; license = licenses.gpl3; platforms = platforms.linux; + broken = lib.versionOlder qtbase.version "5.14"; maintainers = [ maintainers.bugworm ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/qxmpp/default.nix b/nixpkgs/pkgs/development/libraries/qxmpp/default.nix new file mode 100644 index 000000000000..4867c67277d8 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qxmpp/default.nix @@ -0,0 +1,46 @@ +{ mkDerivation +, lib +, fetchFromGitHub +, cmake +, pkg-config +, withGstreamer ? true +, gst_all_1 +}: + +mkDerivation rec { + pname = "qxmpp"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "qxmpp-project"; + repo = pname; + rev = "v${version}"; + sha256 = "1knpq1jkwk0lxdwczbmzf7qrjvlxba9yr40nbq9s5nqkcx6q1c3i"; + }; + + nativeBuildInputs = [ + cmake + ] ++ lib.optionals withGstreamer [ + pkg-config + ]; + buildInputs = lib.optionals withGstreamer (with gst_all_1; [ + gstreamer + gst-plugins-bad + gst-plugins-base + gst-plugins-good + ]); + cmakeFlags = [ + "-DBUILD_EXAMPLES=false" + "-DBUILD_TESTS=false" + ] ++ lib.optionals withGstreamer [ + "-DWITH_GSTREAMER=ON" + ]; + + meta = with lib; { + description = "Cross-platform C++ XMPP client and server library"; + homepage = "https://github.com/qxmpp-project/qxmpp"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ astro ]; + platforms = with platforms; linux; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/retro-gtk/default.nix b/nixpkgs/pkgs/development/libraries/retro-gtk/default.nix new file mode 100644 index 000000000000..3ab3ffcda0d3 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/retro-gtk/default.nix @@ -0,0 +1,70 @@ +{ lib +, stdenv +, fetchurl +, cmake +, meson +, ninja +, pkg-config +, epoxy +, glib +, gtk3 +, libpulseaudio +, libsamplerate +, gobject-introspection +, vala +, gtk-doc +}: + +stdenv.mkDerivation rec { + pname = "retro-gtk"; + version = "1.0.2"; + + src = fetchurl { + url = "mirror://gnome/sources/retro-gtk/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1lnb7dwcj3lrrvdzd85dxwrlid28xf4qdbrgfjyg1wn1z6sv063i"; + }; + + patches = [ + # https://gitlab.gnome.org/GNOME/retro-gtk/-/merge_requests/150 + ./gio-unix.patch + ]; + + nativeBuildInputs = [ + gobject-introspection + gtk-doc + meson + ninja + pkg-config + vala + ]; + + buildInputs = [ + epoxy + glib + gtk3 + libpulseaudio + libsamplerate + ]; + + meta = with lib; { + description = "The GTK Libretro frontend framework"; + longDescription = '' + Libretro is a plugin format design to implement video game + console emulators, video games and similar multimedia + software. Such plugins are called Libretro cores. + + RetroGTK is a framework easing the use of Libretro cores in + conjunction with GTK. + + It encourages the cores to be installed in a well defined + centralized place — namely the libretro subdirectory of your lib + directory — and it recommends them to come with Libretro core + descriptors. + ''; + homepage = "https://gitlab.gnome.org/GNOME/retro-gtk"; + changelog = "https://gitlab.gnome.org/GNOME/retro-gtk/-/blob/master/NEWS"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.DamienCassou ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/retro-gtk/gio-unix.patch b/nixpkgs/pkgs/development/libraries/retro-gtk/gio-unix.patch new file mode 100644 index 000000000000..91f561c6504f --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/retro-gtk/gio-unix.patch @@ -0,0 +1,11 @@ +--- a/retro-gtk/meson.build 2021-03-21 20:25:51.000000000 +0100 ++++ b/retro-gtk/meson.build 2021-05-23 17:36:46.793693816 +0200 +@@ -103,6 +103,7 @@ + retro_gtk_deps = [ + epoxy, + gio, ++ gio_unix, + glib, + gmodule, + gobject, + diff --git a/nixpkgs/pkgs/development/libraries/science/chemistry/xcfun/default.nix b/nixpkgs/pkgs/development/libraries/science/chemistry/xcfun/default.nix new file mode 100644 index 000000000000..7f8ef3dc47d7 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/science/chemistry/xcfun/default.nix @@ -0,0 +1,30 @@ +{ stdenv, lib, fetchFromGitHub, cmake, gfortran, python3 } : + +stdenv.mkDerivation rec { + pname = "xcfun"; + version = "2.1.1"; + + src = fetchFromGitHub { + owner = "dftlibs"; + repo = pname; + rev = "v${version}"; + sha256= "1bj70cnhbh6ziy02x988wwl7cbwaq17ld7qwhswqkgnnx8rpgxid"; + }; + + nativeBuildInputs = [ + cmake + gfortran + ]; + + propagatedBuildInputs = [ (python3.withPackages (p: with p; [ pybind11 ])) ]; + + cmakeFlags = [ "-DXCFUN_MAX_ORDER=3" ]; + + meta = with lib; { + description = "A library of exchange-correlation functionals with arbitrary-order derivatives"; + homepage = "https://github.com/dftlibs/xcfun"; + license = licenses.mpl20; + platforms = platforms.linux; + maintainers = [ maintainers.sheepforce ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix b/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix index 87b5835aa9ef..efbd071ecd79 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix @@ -18,7 +18,7 @@ let # this derivation. However, we should ensure on version bumps # that the CUDA toolkit for `passthru.tests` is still # up-to-date. - version = "1.8.1"; + version = "1.9.0"; device = if cudaSupport then "cuda" else "cpu"; srcs = import ./binary-hashes.nix version; unavailable = throw "libtorch is not available for this platform"; diff --git a/nixpkgs/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix b/nixpkgs/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix index ec4522a75592..6ded62fb87c3 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix @@ -1,14 +1,14 @@ version: { x86_64-darwin-cpu = { url = "https://download.pytorch.org/libtorch/cpu/libtorch-macos-${version}.zip"; - hash = "sha256-FYgnd5zlycjCYnP5bZcjpMdGYXrRERwhFFBYo/SJgzs="; + hash = "sha256-TOJ+iQpqazta46y4IzIbfEGMjz/fz+pRDV8fKqriB6Q="; }; x86_64-linux-cpu = { url = "https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-${version}%2Bcpu.zip"; - hash = "sha256-xneCcVrY25Whgbs/kPbwdS1Lc0e6RxsDRpA5lHTZigc="; + hash = "sha256-gZMNLCzW3j+eplBqWo6lVvuHS5iRqtMD8NL3MoszsVg="; }; x86_64-linux-cuda = { url = "https://download.pytorch.org/libtorch/cu111/libtorch-cxx11-abi-shared-with-deps-${version}%2Bcu111.zip"; - hash = "sha256-VW+TW00nD49GBztCyxHE4dTyy81aN/kfYE3hKQOIm50="; + hash = "sha256-dRu4F8k2SAbtghwrPJNyX0u3tsODCbXfi9EqUdf4xYc="; }; } diff --git a/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix b/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix index f464a755f6e4..ccb37d295bff 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, perl, which +{ lib, stdenv, fetchFromGitHub, perl, which # Most packages depending on openblas expect integer width to match # pointer width, but some expect to use 32-bit integers always # (for compatibility with reference BLAS). @@ -116,7 +116,7 @@ let in stdenv.mkDerivation rec { pname = "openblas"; - version = "0.3.13"; + version = "0.3.15"; outputs = [ "out" "dev" ]; @@ -124,19 +124,9 @@ stdenv.mkDerivation rec { owner = "xianyi"; repo = "OpenBLAS"; rev = "v${version}"; - sha256 = "14jxh0v3jfbw4mfjx4mcz4dd51lyq7pqvh9k8dg94539ypzjr2lj"; + sha256 = "1qjr02cqncv20abdp1yzr55n7smhx6h9chqvb0xbp18byynvj87w"; }; - # apply https://github.com/xianyi/OpenBLAS/pull/3060 to fix a crash on arm - # remove this when updating to 0.3.14 or newer - patches = [ - (fetchpatch { - name = "label-get_cpu_ftr-as-volatile.patch"; - url = "https://github.com/xianyi/OpenBLAS/commit/6fe0f1fab9d6a7f46d71d37ebb210fbf56924fbc.diff"; - sha256 = "06gwh73k4sas1ap2fi3jvpifbjkys2vhmnbj4mzrsvj279ljsfdk"; - }) - ]; - inherit blas64; # Some hardening features are disabled due to sporadic failures in diff --git a/nixpkgs/pkgs/development/libraries/science/math/tensorflow-lite/default.nix b/nixpkgs/pkgs/development/libraries/science/math/tensorflow-lite/default.nix new file mode 100644 index 000000000000..cf2346bad271 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/science/math/tensorflow-lite/default.nix @@ -0,0 +1,181 @@ +{ stdenv +, bash +, abseil-cpp +, fetchFromGitHub +, fetchFromGitLab +, fetchpatch +, fetchurl +, flatbuffers +, hostPlatform +, lib +, zlib +}: +let + tflite-eigen = fetchFromGitLab { + owner = "libeigen"; + repo = "eigen"; + rev = "3d9051ea84a5089b277c88dac456b3b1576bfa7f"; + sha256 = "1y3f2jvimb5i904f4n37h23cv2pkdlbz8656s0kga1y7c0p50wif"; + }; + + gemmlowp-src = fetchFromGitHub { + owner = "google"; + repo = "gemmlowp"; + rev = "fda83bdc38b118cc6b56753bd540caa49e570745"; + sha256 = "1sbp8kmr2azwlvfbzryy1frxi99jhsh1nc93bdbxdf8zdgpv0kxl"; + }; + + neon-2-sse-src = fetchFromGitHub { + owner = "intel"; + repo = "ARM_NEON_2_x86_SSE"; + rev = "1200fe90bb174a6224a525ee60148671a786a71f"; + sha256 = "0fhxch711ck809dpq1myxz63jiiwfcnxvj45ww0kg8s0pqpn5kv6"; + }; + + farmhash-src = fetchFromGitHub { + owner = "google"; + repo = "farmhash"; + rev = "816a4ae622e964763ca0862d9dbd19324a1eaf45"; + sha256 = "1mqxsljq476n1hb8ilkrpb39yz3ip2hnc7rhzszz4sri8ma7qzp6"; + }; + + fft2d-src = fetchurl { + url = "http://www.kurims.kyoto-u.ac.jp/~ooura/fft2d.tgz"; + sha256 = "ada7e99087c4ed477bfdf11413f2ba8db8a840ba9bbf8ac94f4f3972e2a7cec9"; + }; + + fp16-src = fetchFromGitHub { + owner = "Maratyszcza"; + repo = "FP16"; + rev = "4dfe081cf6bcd15db339cf2680b9281b8451eeb3"; + sha256 = "06a8dfl3a29r93nxpp6hpywsajz5d555n3sqd3i6krybb6swnvh7"; + }; + + ruy-src = fetchFromGitHub { + owner = "google"; + repo = "ruy"; + rev = "23633b37099b614a2f836ef012cafc8087fdb98c"; + sha256 = "14k9hz6ss8qy8nsajk6lrq25f6qxrldxky31ijw0dpqnfnnswrx4"; + }; + + cpuinfo-src = fetchFromGitHub { + owner = "pytorch"; + repo = "cpuinfo"; + rev = "5916273f79a21551890fd3d56fc5375a78d1598d"; + sha256 = "0q6760xdxsg18acdv8vq3yrq7ksr7wsm8zbyan01zf2khnb6fw4x"; + }; +in +stdenv.mkDerivation rec { + pname = "tensorflow-lite"; + version = "2.5.0"; + + src = fetchFromGitHub { + owner = "tensorflow"; + repo = "tensorflow"; + rev = "v${version}"; + sha256 = "1jdw2i1rq06zqd6aabh7bbm0avsg4pygnfmd7gviv0blhih9054l"; + }; + + patches = [ + # TODO: remove on the next version bump + (fetchpatch { + name = "include-schema-conversion-utils-source.patch"; + url = "https://github.com/tensorflow/tensorflow/commit/f3c4f4733692150fd6174f2cd16438cfaba2e5ab.patch"; + sha256 = "0zx4hbz679kn79f30159rl1mq74dg45cvaawii0cyv48z472yy4k"; + }) + # TODO: remove on the next version bump + (fetchpatch { + name = "cxxstandard-var.patch"; + url = "https://github.com/tensorflow/tensorflow/commit/9b128ae4200e10b4752f903492d1e7d11957ed5c.patch"; + sha256 = "1q0izdwdji5fbyqll6k4dmkzfykyvvz5cvc6hysdj285nkn2wy6h"; + }) + ]; + + buildInputs = [ zlib flatbuffers ]; + + dontConfigure = true; + + postPatch = '' + substituteInPlace ./tensorflow/lite/tools/make/Makefile \ + --replace /bin/bash ${bash}/bin/bash \ + --replace /bin/sh ${bash}/bin/sh + ''; + + makefile = "tensorflow/lite/tools/make/Makefile"; + + preBuild = + let + includes = + lib.concatMapStringsSep + " " + (subdir: "-I $PWD/tensorflow/lite/tools/make/downloads/${subdir}") + [ + "neon_2_sse" + "gemmlowp" + "absl" + "fp16/include" + "farmhash/src" + "ruy" + "cpuinfo" + "cpuinfo/src" + "cpuinfo/include" + "cpuinfo/deps/clog/include" + "eigen" + ]; + in + '' + # enter the vendoring lair of doom + + prefix="$PWD/tensorflow/lite/tools/make/downloads" + + mkdir -p "$prefix" + + tar xzf ${fft2d-src} -C "$prefix" + + ln -s ${ruy-src} "$prefix/ruy" + ln -s ${gemmlowp-src} "$prefix/gemmlowp" + ln -s ${neon-2-sse-src} "$prefix/neon_2_sse" + ln -s ${farmhash-src} "$prefix/farmhash" + ln -s ${cpuinfo-src} "$prefix/cpuinfo" + ln -s ${fp16-src} "$prefix/fp16" + ln -s ${tflite-eigen} "$prefix/eigen" + + # tensorflow lite is using the *source* of flatbuffers + ln -s ${flatbuffers.src} "$prefix/flatbuffers" + + # tensorflow lite expects to compile abseil into `libtensorflow-lite.a` + ln -s ${abseil-cpp.src} "$prefix/absl" + + # set CXXSTANDARD=c++17 here because abseil-cpp in nixpkgs is set as + # such and would be used in dependents like libedgetpu + buildFlagsArray+=( + INCLUDES="-I $PWD ${includes}" + CXXSTANDARD="-std=c++17" + TARGET_TOOLCHAIN_PREFIX="" + -j$NIX_BUILD_CORES + all) + ''; + + installPhase = '' + mkdir "$out" + + # copy the static lib and binaries into the output dir + cp -r ./tensorflow/lite/tools/make/gen/linux_${hostPlatform.uname.processor}/{bin,lib} "$out" + + find ./tensorflow/lite -type f -name '*.h' | while read f; do + path="$out/include/''${f/.\//}" + install -D "$f" "$path" + + # remove executable bit from headers + chmod -x "$path" + done + ''; + + meta = with lib; { + description = "An open source deep learning framework for on-device inference."; + homepage = "https://www.tensorflow.org/lite"; + license = licenses.asl20; + maintainers = with maintainers; [ cpcloud ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/science/math/tensorflow-lite/eigen_include_dir.patch b/nixpkgs/pkgs/development/libraries/science/math/tensorflow-lite/eigen_include_dir.patch new file mode 100644 index 000000000000..6fa3c703efa9 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/science/math/tensorflow-lite/eigen_include_dir.patch @@ -0,0 +1,45 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 28103856e..a36909c0e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -449,13 +449,6 @@ install(FILES + DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel + ) + +-if(EIGEN_BUILD_PKGCONFIG) +- configure_file(eigen3.pc.in eigen3.pc @ONLY) +- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/eigen3.pc +- DESTINATION ${PKGCONFIG_INSTALL_DIR} +- ) +-endif() +- + install(DIRECTORY Eigen DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel) + + add_subdirectory(doc EXCLUDE_FROM_ALL) +@@ -570,8 +563,15 @@ set ( EIGEN_VERSION_MAJOR ${EIGEN_WORLD_VERSION} ) + set ( EIGEN_VERSION_MINOR ${EIGEN_MAJOR_VERSION} ) + set ( EIGEN_VERSION_PATCH ${EIGEN_MINOR_VERSION} ) + set ( EIGEN_DEFINITIONS "") +-set ( EIGEN_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}" ) + set ( EIGEN_ROOT_DIR ${CMAKE_INSTALL_PREFIX} ) ++GNUInstallDirs_get_absolute_install_dir(EIGEN_INCLUDE_DIR INCLUDE_INSTALL_DIR) ++ ++if(EIGEN_BUILD_PKGCONFIG) ++ configure_file(eigen3.pc.in eigen3.pc @ONLY) ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/eigen3.pc ++ DESTINATION ${PKGCONFIG_INSTALL_DIR} ++ ) ++endif() + + # Interface libraries require at least CMake 3.0 + if (NOT CMAKE_VERSION VERSION_LESS 3.0) +diff --git a/eigen3.pc.in b/eigen3.pc.in +index 3368a3aa1..d6778bf06 100644 +--- a/eigen3.pc.in ++++ b/eigen3.pc.in +@@ -6,4 +6,4 @@ Description: A C++ template library for linear algebra: vectors, matrices, and r + Requires: + Version: @EIGEN_VERSION_NUMBER@ + Libs: +-Cflags: -I${prefix}/@INCLUDE_INSTALL_DIR@ ++Cflags: -I@EIGEN_INCLUDE_DIR@ diff --git a/nixpkgs/pkgs/development/libraries/skalibs/default.nix b/nixpkgs/pkgs/development/libraries/skalibs/default.nix index 3d90a8ebb21c..09530db0532c 100644 --- a/nixpkgs/pkgs/development/libraries/skalibs/default.nix +++ b/nixpkgs/pkgs/development/libraries/skalibs/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "skalibs"; - version = "2.10.0.2"; - sha256 = "03qyi77wgcw3nzy7i932wd98d6j7nnzxc8ddl973vf5sa1v3vflb"; + version = "2.10.0.3"; + sha256 = "0ka6n5rnxd5sn5lycarf596d5wlak5s535zqqlz0rnhdcnpb105p"; description = "A set of general-purpose C programming libraries"; diff --git a/nixpkgs/pkgs/development/libraries/sope/default.nix b/nixpkgs/pkgs/development/libraries/sope/default.nix index b956967ee88e..25c65d82632d 100644 --- a/nixpkgs/pkgs/development/libraries/sope/default.nix +++ b/nixpkgs/pkgs/development/libraries/sope/default.nix @@ -4,13 +4,13 @@ with lib; gnustep.stdenv.mkDerivation rec { pname = "sope"; - version = "5.0.1"; + version = "5.1.1"; src = fetchFromGitHub { owner = "inverse-inc"; repo = pname; rev = "SOPE-${version}"; - sha256 = "031m8ydr4jhh29332mfbsw0i5d0cjfqfyfs55jm832dlmv4447gb"; + sha256 = "0pap7c38kgadyp1a6qkmf9xhk69ybpmhfd4kc2n5nafhdbvks985"; }; hardeningDisable = [ "format" ]; diff --git a/nixpkgs/pkgs/development/libraries/spice/correct-meson.patch b/nixpkgs/pkgs/development/libraries/spice/correct-meson.patch deleted file mode 100644 index d3422cb915b3..000000000000 --- a/nixpkgs/pkgs/development/libraries/spice/correct-meson.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/meson.build b/meson.build -index 8b8ae8bb..e58c436c 100644 ---- a/meson.build -+++ b/meson.build -@@ -2,7 +2,7 @@ - # project definition - # - project('spice', 'c', -- version : run_command('build-aux/git-version-gen', '${MESON_SOURCE_ROOT}/.tarball-version', check : true).stdout().strip(), -+ version : run_command('build-aux/git-version-gen', meson.source_root() + '/.tarball-version', check : true).stdout().strip(), - license : 'LGPLv2.1', - meson_version : '>= 0.48') - -diff --git a/server/meson.build b/server/meson.build -index 34d8eef1..988ccab2 100644 ---- a/server/meson.build -+++ b/server/meson.build -@@ -7,7 +7,7 @@ version_info = meson.project_version().split('.') - major = '@0@'.format(version_info[0]) - minor = '@0@'.format(version_info[1]) - micro = version_info[2].to_int() --if not version_info[3].contains('git') -+if not version_info.contains('git') - micro += 1 - endif - micro = '@0@'.format(micro) diff --git a/nixpkgs/pkgs/development/libraries/spice/default.nix b/nixpkgs/pkgs/development/libraries/spice/default.nix index ff1f5eb8041a..33677303ddcb 100644 --- a/nixpkgs/pkgs/development/libraries/spice/default.nix +++ b/nixpkgs/pkgs/development/libraries/spice/default.nix @@ -26,18 +26,13 @@ stdenv.mkDerivation rec { pname = "spice"; - version = "0.14.2"; + version = "0.15.0"; src = fetchurl { - url = "https://www.spice-space.org/download/releases/${pname}-${version}.tar.bz2"; - sha256 = "19r999py9v9c7md2bb8ysj809ag1hh6djl1ik8jcgx065s4b60xj"; + url = "https://www.spice-space.org/download/releases/spice-server/${pname}-${version}.tar.bz2"; + sha256 = "1xd0xffw0g5vvwbq4ksmm3jjfq45f9dw20xpmi82g1fj9f7wy85k"; }; - patches = [ - # submitted https://gitlab.freedesktop.org/spice/spice/merge_requests/4 - ./correct-meson.patch - ]; - postPatch = '' patchShebangs build-aux ''; diff --git a/nixpkgs/pkgs/development/libraries/tcllib/default.nix b/nixpkgs/pkgs/development/libraries/tcllib/default.nix index 4cab15ca5c22..90c4528a6454 100644 --- a/nixpkgs/pkgs/development/libraries/tcllib/default.nix +++ b/nixpkgs/pkgs/development/libraries/tcllib/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchurl, tcl }: +{ lib, fetchurl, tcl }: -stdenv.mkDerivation rec { +tcl.mkTclDerivation rec { pname = "tcllib"; version = "1.20"; @@ -9,12 +9,6 @@ stdenv.mkDerivation rec { sha256 = "0wax281h6ksz974a5qpfgf9y34lmlpd8i87lkm1w94ybbd3rgc73"; }; - passthru = { - libPrefix = "tcllib${version}"; - }; - - buildInputs = [ tcl ]; - meta = { homepage = "https://sourceforge.net/projects/tcllib/"; description = "Tcl-only library of standard routines for Tcl"; diff --git a/nixpkgs/pkgs/development/libraries/tcltls/default.nix b/nixpkgs/pkgs/development/libraries/tcltls/default.nix index e88358bbce0a..8883ad5dd440 100644 --- a/nixpkgs/pkgs/development/libraries/tcltls/default.nix +++ b/nixpkgs/pkgs/development/libraries/tcltls/default.nix @@ -1,33 +1,24 @@ -{ lib, stdenv, fetchurl, tcl, openssl }: +{ lib, fetchurl, tcl, openssl }: -stdenv.mkDerivation rec { +tcl.mkTclDerivation rec { pname = "tcltls"; - version = "1.6.7"; + version = "1.7.21"; src = fetchurl { - url = "mirror://sourceforge/tls/tls${version}-src.tar.gz"; - sha256 = "1f53sfcnrridjl5ayrq1xrqkahs8khf8c3d0m2brndbhahzdw6ai"; + url = "https://core.tcl-lang.org/tcltls/uv/tcltls-${version}.tar.gz"; + sha256 = "0xf1rfsnn4k9j1bd2a1p8ir0xr4a3phgr9lcgbazh4084l2y8sl0"; }; - buildInputs = [ tcl openssl ]; + buildInputs = [ openssl ]; configureFlags = [ - "--with-tcl=${tcl}/lib" - "--with-tclinclude=${tcl}/include" "--with-ssl-dir=${openssl.dev}" ]; - preConfigure = '' - configureFlags="--exec_prefix=$prefix $configureFlags" - ''; - - passthru = { - libPrefix = "tls${version}"; - }; - meta = { - homepage = "http://tls.sourceforge.net/"; + homepage = "https://core.tcl-lang.org/tcltls/index"; description = "An OpenSSL / RSA-bsafe Tcl extension"; + maintainers = [ lib.maintainers.agbrooks ]; license = lib.licenses.tcltk; platforms = lib.platforms.unix; }; diff --git a/nixpkgs/pkgs/development/libraries/tclx/default.nix b/nixpkgs/pkgs/development/libraries/tclx/default.nix index 85eae730575f..a8cf2a44fab6 100644 --- a/nixpkgs/pkgs/development/libraries/tclx/default.nix +++ b/nixpkgs/pkgs/development/libraries/tclx/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchurl, tcl }: +{ lib, fetchurl, tcl }: -stdenv.mkDerivation rec { +tcl.mkTclDerivation rec { name = "tclx-${version}.${patch}"; version = "8.4"; patch = "1"; @@ -10,13 +10,10 @@ stdenv.mkDerivation rec { sha256 = "1v2qwzzidz0is58fd1p7wfdbscxm3ip2wlbqkj5jdhf6drh1zd59"; }; - passthru = { - libPrefix = ""; # Using tclx${version} did not work - }; - - buildInputs = [ tcl ]; - - configureFlags = [ "--with-tcl=${tcl}/lib" "--exec-prefix=\${prefix}" ]; + # required in order for tclx to properly detect tclx.tcl at runtime + postInstall = '' + ln -s $prefix/lib/tclx${version} $prefix/lib/tclx${version}/tclx${version} + ''; meta = { homepage = "http://tclx.sourceforge.net/"; diff --git a/nixpkgs/pkgs/development/libraries/tix/default.nix b/nixpkgs/pkgs/development/libraries/tix/default.nix index e0f91330efca..c42847ef5335 100644 --- a/nixpkgs/pkgs/development/libraries/tix/default.nix +++ b/nixpkgs/pkgs/development/libraries/tix/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, tcl, tk, fetchpatch } : -stdenv.mkDerivation { +tcl.mkTclDerivation { version = "8.4.3"; pname = "tix"; src = fetchurl { @@ -20,7 +20,7 @@ stdenv.mkDerivation { sha256 = "1jaz0l22xj7x1k4rb9ia6i1psnbwk4pblgq4gfvya7gg7fbb7r36"; }) ; - buildInputs = [ tcl tk ]; + buildInputs = [ tk ]; # the configure script expects to find the location of the sources of # tcl and tk in {tcl,tk}Config.sh # In fact, it only needs some private headers. We copy them in @@ -34,8 +34,8 @@ stdenv.mkDerivation { ln -s $i private_headers/generic; done; ''; + addTclConfigureFlags = false; configureFlags = [ - "--with-tclinclude=${tcl}/include" "--with-tclconfig=." "--with-tkinclude=${tk.dev}/include" "--with-tkconfig=." @@ -52,4 +52,3 @@ stdenv.mkDerivation { ]; }; } - diff --git a/nixpkgs/pkgs/development/libraries/tk/generic.nix b/nixpkgs/pkgs/development/libraries/tk/generic.nix index ecb3840b2de3..b829d846be56 100644 --- a/nixpkgs/pkgs/development/libraries/tk/generic.nix +++ b/nixpkgs/pkgs/development/libraries/tk/generic.nix @@ -2,7 +2,7 @@ , enableAqua ? stdenv.isDarwin, darwin , ... }: -stdenv.mkDerivation { +tcl.mkTclDerivation { name = "tk-${tcl.version}"; inherit src patches; @@ -33,14 +33,13 @@ stdenv.mkDerivation { configureFlags = [ "--enable-threads" - "--with-tcl=${tcl}/lib" ] ++ lib.optional stdenv.is64bit "--enable-64bit" ++ lib.optional enableAqua "--enable-aqua"; nativeBuildInputs = [ pkg-config ]; buildInputs = lib.optional enableAqua (with darwin.apple_sdk.frameworks; [ Cocoa ]); - propagatedBuildInputs = [ tcl libXft ]; + propagatedBuildInputs = [ libXft ]; doCheck = false; # fails. can't find itself diff --git a/nixpkgs/pkgs/development/libraries/utmps/default.nix b/nixpkgs/pkgs/development/libraries/utmps/default.nix index 107c23dcb59b..be74748cb369 100644 --- a/nixpkgs/pkgs/development/libraries/utmps/default.nix +++ b/nixpkgs/pkgs/development/libraries/utmps/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "utmps"; - version = "0.1.0.0"; - sha256 = "09p0k2sgxr7jlsbrn66fzvzf9zxvpjp85y79xk10hxjglypszyml"; + version = "0.1.0.2"; + sha256 = "1vjza7m65ziq54q0sv46kb3lss9cmxkkv0n9h3i8505x0h2hlvlb"; description = "A secure utmpx and wtmp implementation"; diff --git a/nixpkgs/pkgs/development/libraries/wayland/protocols.nix b/nixpkgs/pkgs/development/libraries/wayland/protocols.nix index 8a2b05aa4dff..7f3ec5f3d597 100644 --- a/nixpkgs/pkgs/development/libraries/wayland/protocols.nix +++ b/nixpkgs/pkgs/development/libraries/wayland/protocols.nix @@ -1,15 +1,29 @@ -{ lib, stdenv, fetchurl, wayland-scanner }: +{ lib, stdenv, fetchurl +, pkg-config +, meson, ninja, wayland-scanner +, python3, wayland +}: stdenv.mkDerivation rec { pname = "wayland-protocols"; version = "1.21"; + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + src = fetchurl { url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; sha256 = "1rfdlkzz67qsb955zqb8jbw3m22pl6ppvrvfq8bqiqcb5n24b6dr"; }; - nativeBuildInputs = [ wayland-scanner ]; + postPatch = lib.optionalString doCheck '' + patchShebangs tests/ + ''; + + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ meson ninja wayland-scanner ]; + checkInputs = [ python3 wayland ]; + + mesonFlags = [ "-Dtests=${lib.boolToString doCheck}" ]; meta = { description = "Wayland protocol extensions"; diff --git a/nixpkgs/pkgs/development/libraries/zimlib/default.nix b/nixpkgs/pkgs/development/libraries/zimlib/default.nix index 76d54ed62563..9f8e357d3ab0 100644 --- a/nixpkgs/pkgs/development/libraries/zimlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/zimlib/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "zimlib"; - version = "6.3.0"; + version = "6.3.2"; src = fetchFromGitHub { owner = "openzim"; repo = "libzim"; rev = version; - sha256 = "0iy0f1clhihq277x218ccx3mszgpr3h9l0by48b9ykr115nffw3s"; + sha256 = "sha256-xlYu74akK9WFy86hcQe7zp11TImwl8llgDIZBRgmbAI="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/misc/newlib/default.nix b/nixpkgs/pkgs/development/misc/newlib/default.nix index 193ec53d5add..870aa068afe8 100644 --- a/nixpkgs/pkgs/development/misc/newlib/default.nix +++ b/nixpkgs/pkgs/development/misc/newlib/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, buildPackages }: -let version = "3.3.0"; -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "newlib"; - inherit version; + version = "4.1.0"; + src = fetchurl { url = "ftp://sourceware.org/pub/newlib/newlib-${version}.tar.gz"; - sha256 = "0ricyx792ig2cb2x31b653yb7w7f7mf2111dv5h96lfzmqz9xpaq"; + sha256 = "0m01sjjyj0ib7bwlcrvmk1qkkgd66zf1dhbw716j490kymrf75pj"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/nixpkgs/pkgs/development/mobile/androidenv/examples/shell.nix b/nixpkgs/pkgs/development/mobile/androidenv/examples/shell.nix index 45cccf22c7df..074dfc001e68 100644 --- a/nixpkgs/pkgs/development/mobile/androidenv/examples/shell.nix +++ b/nixpkgs/pkgs/development/mobile/androidenv/examples/shell.nix @@ -3,7 +3,7 @@ # This example pins nixpkgs: https://nix.dev/tutorials/towards-reproducibility-pinning-nixpkgs.html /*nixpkgsSource ? (builtins.fetchTarball { name = "nixpkgs-20.09"; - url = https://github.com/NixOS/nixpkgs/archive/20.09.tar.gz; + url = "https://github.com/NixOS/nixpkgs/archive/20.09.tar.gz"; sha256 = "1wg61h4gndm3vcprdcg7rc4s1v3jkm5xd7lw8r2f67w502y94gcy"; }), pkgs ? import nixpkgsSource {}, @@ -41,7 +41,7 @@ let # If you copy this example out of nixpkgs, something like this will work: /*androidEnvNixpkgs = fetchTarball { name = "androidenv"; - url = https://github.com/NixOS/nixpkgs/archive/<fill me in from Git>.tar.gz; + url = "https://github.com/NixOS/nixpkgs/archive/<fill me in from Git>.tar.gz"; sha256 = "<fill me in with nix-prefetch-url --unpack>"; }; diff --git a/nixpkgs/pkgs/development/node-packages/node-packages.json b/nixpkgs/pkgs/development/node-packages/node-packages.json index 27d13e4adeb3..ae932a8aca4b 100644 --- a/nixpkgs/pkgs/development/node-packages/node-packages.json +++ b/nixpkgs/pkgs/development/node-packages/node-packages.json @@ -126,7 +126,7 @@ , "indium" , "insect" , "ionic" -, {"iosevka": "https://github.com/be5invis/Iosevka/archive/v5.0.2.tar.gz"} +, {"iosevka": "https://github.com/be5invis/Iosevka/archive/v7.0.4.tar.gz"} , "jake" , "javascript-typescript-langserver" , "joplin" diff --git a/nixpkgs/pkgs/development/node-packages/node-packages.nix b/nixpkgs/pkgs/development/node-packages/node-packages.nix index d5381c9c288d..aac508080869 100644 --- a/nixpkgs/pkgs/development/node-packages/node-packages.nix +++ b/nixpkgs/pkgs/development/node-packages/node-packages.nix @@ -49,13 +49,13 @@ let sha512 = "o/xdK8b4P0t/xpCARgWXAeaiWeh9jeua6bP1jrcbfN39+Z4zC4x2jg4NysHNhz6spRG8dJFH3kJIUoIbs0Ckww=="; }; }; - "@angular-devkit/architect-0.1200.2" = { + "@angular-devkit/architect-0.1200.4" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1200.2"; + version = "0.1200.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1200.2.tgz"; - sha512 = "Vy/dE1iwEiV63cxcU+SC+Lf5SUnY64vg9J3YA3jxFlJnELbxxN+T7xDfjMEMPoLzTY02K9XNb8ZGLStZxVmZLg=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1200.4.tgz"; + sha512 = "/BKaVlpbZYb65elZ+xHoKB2J2DuTstMU++dqE9T/7E0CevuMoOdkLQFQm71Kjl3eFI4i6T5d8mlLVPNE/ZWm7w=="; }; }; "@angular-devkit/core-11.2.4" = { @@ -76,13 +76,13 @@ let sha512 = "3dA0Z6sIIxCDjZS/DucgmIKti7EZ/LgHoHgCO72Q50H5ZXbUSNBz5wGl5hVq2+gzrnFgU/0u40MIs6eptk30ZA=="; }; }; - "@angular-devkit/core-12.0.2" = { + "@angular-devkit/core-12.0.4" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "12.0.2"; + version = "12.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-12.0.2.tgz"; - sha512 = "n7BmZAW0nx4pEigdAsibvtIm4Vjk1IwY3Bbc8fqD+AQpdYCo+Ake1Eu6fL2XoW8Yco7U4JYYdn/uodWEgBdroQ=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-12.0.4.tgz"; + sha512 = "gtQkLXuQK7NPkurw49//MFZWoRa9aVCIbxE2uxbDAzzQengx9nLUoezS2xVdM7m/SqVK72YL+ZFfSTXzfiSdnA=="; }; }; "@angular-devkit/schematics-11.2.4" = { @@ -103,13 +103,13 @@ let sha512 = "bhi2+5xtVAjtr3bsXKT8pnoBamQrArd/Y20ueA4Od7cd38YT97nzTA1wyHBFG0vWd0HMyg42ZS0aycNBuOebaA=="; }; }; - "@angular-devkit/schematics-12.0.2" = { + "@angular-devkit/schematics-12.0.4" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "12.0.2"; + version = "12.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.0.2.tgz"; - sha512 = "PS+SrRhAc/lyRfuBsi6Rt2yV7IA34B7T6J0K8/Av0GABZ83x+0vLiZC39eSPS1X8qcM/U09pCfDT8Q6ZQPCICA=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.0.4.tgz"; + sha512 = "MEAAcOh1Y4R6O7HWo7mMXgRK9BSbCZ3rlx+aHmtWpNXohw0TRhNY5WmRnQTRvMA3qjR9nh0Uo7BkRpgwRfqmBw=="; }; }; "@angular-devkit/schematics-cli-0.1102.6" = { @@ -229,13 +229,13 @@ let sha512 = "eorTmZW7zc6ZHgGLt3Vrq7mzPuobPeJnyfli50/m/DIQ91slkqjPKUYGcq4paPEz6IWoa7LT2ZwtwA5KzMyTPg=="; }; }; - "@apidevtools/json-schema-ref-parser-9.0.7" = { + "@apidevtools/json-schema-ref-parser-9.0.9" = { name = "_at_apidevtools_slash_json-schema-ref-parser"; packageName = "@apidevtools/json-schema-ref-parser"; - version = "9.0.7"; + version = "9.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-9.0.7.tgz"; - sha512 = "QdwOGF1+eeyFh+17v2Tz626WX0nucd1iKOm6JUTUvCZdbolblCOOQCxGrQPY0f7jEhn36PiAWqZnsC2r5vmUWg=="; + url = "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-9.0.9.tgz"; + sha512 = "GBD2Le9w2+lVFoc4vswGI/TjkNIZSVp7+9xPf+X3uidBfWnAeUWmquteSyt0+VCrhNMWj/FTABISQrD3Z/YA+w=="; }; }; "@apollo/protobufjs-1.2.2" = { @@ -310,13 +310,13 @@ let sha1 = "e70187f8a862e191b1bce6c0268f13acd3a56b20"; }; }; - "@babel/cli-7.14.3" = { + "@babel/cli-7.14.5" = { name = "_at_babel_slash_cli"; packageName = "@babel/cli"; - version = "7.14.3"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/cli/-/cli-7.14.3.tgz"; - sha512 = "zU4JLvwk32ay1lhhyGfqiRUSPoltVDjhYkA3aQq8+Yby9z30s/EsFw1EPOHxWG9YZo2pAGfgdRNeHZQAYU5m9A=="; + url = "https://registry.npmjs.org/@babel/cli/-/cli-7.14.5.tgz"; + sha512 = "poegjhRvXHWO0EAsnYajwYZuqcz7gyfxwfaecUESxDujrqOivf3zrjFbub8IJkrqEaz3fvJWh001EzxBub54fg=="; }; }; "@babel/code-frame-7.10.4" = { @@ -337,22 +337,22 @@ let sha512 = "Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw=="; }; }; - "@babel/code-frame-7.12.13" = { + "@babel/code-frame-7.14.5" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz"; - sha512 = "HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g=="; + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz"; + sha512 = "9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw=="; }; }; - "@babel/compat-data-7.14.4" = { + "@babel/compat-data-7.14.5" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.14.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.4.tgz"; - sha512 = "i2wXrWQNkH6JplJQGn3Rd2I4Pij8GdHkXwHMxm+zV5YG/Jci+bCNrWZEWC4o+umiDkRrRs4dVzH3X4GP7vyjQQ=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.5.tgz"; + sha512 = "kixrYn4JwfAVPa0f2yfzc2AWti6WRRyO3XjWW5PJAvtE11qhSayrrcrEnee05KAtNaPC+EwehE8Qt1UedEVB8w=="; }; }; "@babel/core-7.10.5" = { @@ -364,13 +364,13 @@ let sha512 = "O34LQooYVDXPl7QWCdW9p4NR+QlzOr7xShPPJz8GsuCU3/8ua/wqTr7gmnxXv+WBESiGU/G5s16i6tUvHkNb+w=="; }; }; - "@babel/core-7.14.3" = { + "@babel/core-7.14.5" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.14.3"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.14.3.tgz"; - sha512 = "jB5AmTKOCSJIZ72sd78ECEhuPiDMKlQdDI/4QRI6lzYATx5SSogS1oQA2AoPecRCknm30gHi2l+QVvNUu3wZAg=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.14.5.tgz"; + sha512 = "RN/AwP2DJmQTZSfiDaD+JQQ/J99KsIpOCfBE5pL+5jJSt7nI3nYGoAXZu+ffYSQ029NLs2DstZb+eR81uuARgg=="; }; }; "@babel/core-7.9.0" = { @@ -382,58 +382,58 @@ let sha512 = "kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w=="; }; }; - "@babel/generator-7.14.3" = { + "@babel/generator-7.14.5" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.14.3"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.14.3.tgz"; - sha512 = "bn0S6flG/j0xtQdz3hsjJ624h3W0r3llttBMfyHX3YrZ/KtLYr15bjA0FXkgW7FpvrDuTuElXeVjiKlYRpnOFA=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.14.5.tgz"; + sha512 = "y3rlP+/G25OIX3mYKKIOlQRcqj7YgrvHxOLbVmyLJ9bPmi5ttvUmpydVjcFjZphOktWuA7ovbx91ECloWTfjIA=="; }; }; - "@babel/helper-annotate-as-pure-7.12.13" = { + "@babel/helper-annotate-as-pure-7.14.5" = { name = "_at_babel_slash_helper-annotate-as-pure"; packageName = "@babel/helper-annotate-as-pure"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz"; - sha512 = "7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw=="; + url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.14.5.tgz"; + sha512 = "EivH9EgBIb+G8ij1B2jAwSH36WnGvkQSEC6CkX/6v6ZFlw5fVOHvsgGF4uiEHO2GzMvunZb6tDLQEQSdrdocrA=="; }; }; - "@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" = { + "@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" = { name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor"; packageName = "@babel/helper-builder-binary-assignment-operator-visitor"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz"; - sha512 = "CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA=="; + url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.14.5.tgz"; + sha512 = "YTA/Twn0vBXDVGJuAX6PwW7x5zQei1luDDo2Pl6q1qZ7hVNl0RZrhHCQG/ArGpR29Vl7ETiB8eJyrvpuRp300w=="; }; }; - "@babel/helper-compilation-targets-7.14.4" = { + "@babel/helper-compilation-targets-7.14.5" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.14.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.4.tgz"; - sha512 = "JgdzOYZ/qGaKTVkn5qEDV/SXAh8KcyUVkCoSWGN8T3bwrgd6m+/dJa2kVGi6RJYJgEYPBdZ84BZp9dUjNWkBaA=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz"; + sha512 = "v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw=="; }; }; - "@babel/helper-create-class-features-plugin-7.14.4" = { + "@babel/helper-create-class-features-plugin-7.14.5" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.14.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.4.tgz"; - sha512 = "idr3pthFlDCpV+p/rMgGLGYIVtazeatrSOQk8YzO2pAepIjQhCN3myeihVg58ax2bbbGK9PUE1reFi7axOYIOw=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.5.tgz"; + sha512 = "Uq9z2e7ZtcnDMirRqAGLRaLwJn+Lrh388v5ETrR3pALJnElVh2zqQmdbz4W2RUJYohAPh2mtyPUgyMHMzXMncQ=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.14.3" = { + "@babel/helper-create-regexp-features-plugin-7.14.5" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.14.3"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.3.tgz"; - sha512 = "JIB2+XJrb7v3zceV2XzDhGIB902CmKGSpSl4q2C6agU9SNLG/2V1RtFRGPG1Ajh9STj3+q6zJMOC+N/pp2P9DA=="; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.5.tgz"; + sha512 = "TLawwqpOErY2HhWbGJ2nZT5wSkR192QpN+nBg1THfBfftrlvOh+WbhrxXCH4q4xJ9Gl16BGPR/48JA+Ryiho/A=="; }; }; "@babel/helper-define-polyfill-provider-0.2.3" = { @@ -445,76 +445,76 @@ let sha512 = "RH3QDAfRMzj7+0Nqu5oqgO5q9mFtQEVvCRsi8qCEfzLR9p2BHfn5FzhSB2oj1fF7I2+DcTORkYaQ6aTR9Cofew=="; }; }; - "@babel/helper-explode-assignable-expression-7.13.0" = { + "@babel/helper-explode-assignable-expression-7.14.5" = { name = "_at_babel_slash_helper-explode-assignable-expression"; packageName = "@babel/helper-explode-assignable-expression"; - version = "7.13.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.13.0.tgz"; - sha512 = "qS0peLTDP8kOisG1blKbaoBg/o9OSa1qoumMjTK5pM+KDTtpxpsiubnCGP34vK8BXGcb2M9eigwgvoJryrzwWA=="; + url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.14.5.tgz"; + sha512 = "Htb24gnGJdIGT4vnRKMdoXiOIlqOLmdiUYpAQ0mYfgVT/GDm8GOYhgi4GL+hMKrkiPRohO4ts34ELFsGAPQLDQ=="; }; }; - "@babel/helper-function-name-7.14.2" = { + "@babel/helper-function-name-7.14.5" = { name = "_at_babel_slash_helper-function-name"; packageName = "@babel/helper-function-name"; - version = "7.14.2"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.2.tgz"; - sha512 = "NYZlkZRydxw+YT56IlhIcS8PAhb+FEUiOzuhFTfqDyPmzAhRge6ua0dQYT/Uh0t/EDHq05/i+e5M2d4XvjgarQ=="; + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz"; + sha512 = "Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ=="; }; }; - "@babel/helper-get-function-arity-7.12.13" = { + "@babel/helper-get-function-arity-7.14.5" = { name = "_at_babel_slash_helper-get-function-arity"; packageName = "@babel/helper-get-function-arity"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz"; - sha512 = "DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg=="; + url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz"; + sha512 = "I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg=="; }; }; - "@babel/helper-hoist-variables-7.13.16" = { + "@babel/helper-hoist-variables-7.14.5" = { name = "_at_babel_slash_helper-hoist-variables"; packageName = "@babel/helper-hoist-variables"; - version = "7.13.16"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.16.tgz"; - sha512 = "1eMtTrXtrwscjcAeO4BVK+vvkxaLJSPFz1w1KLawz6HLNi9bPFGBNwwDyVfiu1Tv/vRRFYfoGaKhmAQPGPn5Wg=="; + url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz"; + sha512 = "R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ=="; }; }; - "@babel/helper-member-expression-to-functions-7.13.12" = { + "@babel/helper-member-expression-to-functions-7.14.5" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.13.12"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz"; - sha512 = "48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.5.tgz"; + sha512 = "UxUeEYPrqH1Q/k0yRku1JE7dyfyehNwT6SVkMHvYvPDv4+uu627VXBckVj891BO8ruKBkiDoGnZf4qPDD8abDQ=="; }; }; - "@babel/helper-module-imports-7.13.12" = { + "@babel/helper-module-imports-7.14.5" = { name = "_at_babel_slash_helper-module-imports"; packageName = "@babel/helper-module-imports"; - version = "7.13.12"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz"; - sha512 = "4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA=="; + url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz"; + sha512 = "SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ=="; }; }; - "@babel/helper-module-transforms-7.14.2" = { + "@babel/helper-module-transforms-7.14.5" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.14.2"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.2.tgz"; - sha512 = "OznJUda/soKXv0XhpvzGWDnml4Qnwp16GN+D/kZIdLsWoHj05kyu8Rm5kXmMef+rVJZ0+4pSGLkeixdqNUATDA=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.5.tgz"; + sha512 = "iXpX4KW8LVODuAieD7MzhNjmM6dzYY5tfRqT+R9HDXWl0jPn/djKmA+G9s/2C2T9zggw5tK1QNqZ70USfedOwA=="; }; }; - "@babel/helper-optimise-call-expression-7.12.13" = { + "@babel/helper-optimise-call-expression-7.14.5" = { name = "_at_babel_slash_helper-optimise-call-expression"; packageName = "@babel/helper-optimise-call-expression"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz"; - sha512 = "BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA=="; + url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz"; + sha512 = "IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA=="; }; }; "@babel/helper-plugin-utils-7.10.4" = { @@ -526,121 +526,121 @@ let sha512 = "O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg=="; }; }; - "@babel/helper-plugin-utils-7.13.0" = { + "@babel/helper-plugin-utils-7.14.5" = { name = "_at_babel_slash_helper-plugin-utils"; packageName = "@babel/helper-plugin-utils"; - version = "7.13.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz"; - sha512 = "ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ=="; + url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz"; + sha512 = "/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ=="; }; }; - "@babel/helper-remap-async-to-generator-7.13.0" = { + "@babel/helper-remap-async-to-generator-7.14.5" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; - version = "7.13.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz"; - sha512 = "pUQpFBE9JvC9lrQbpX0TmeNIy5s7GnZjna2lhhcHC7DzgBs6fWn722Y5cfwgrtrqc7NAJwMvOa0mKhq6XaE4jg=="; + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.14.5.tgz"; + sha512 = "rLQKdQU+HYlxBwQIj8dk4/0ENOUEhA/Z0l4hN8BexpvmSMN9oA9EagjnhnDpNsRdWCfjwa4mn/HyBXO9yhQP6A=="; }; }; - "@babel/helper-replace-supers-7.14.4" = { + "@babel/helper-replace-supers-7.14.5" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.14.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.4.tgz"; - sha512 = "zZ7uHCWlxfEAAOVDYQpEf/uyi1dmeC7fX4nCf2iz9drnCwi1zvwXL3HwWWNXUQEJ1k23yVn3VbddiI9iJEXaTQ=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz"; + sha512 = "3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow=="; }; }; - "@babel/helper-simple-access-7.13.12" = { + "@babel/helper-simple-access-7.14.5" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.13.12"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz"; - sha512 = "7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.14.5.tgz"; + sha512 = "nfBN9xvmCt6nrMZjfhkl7i0oTV3yxR4/FztsbOASyTvVcoYd0TRHh7eMLdlEcCqobydC0LAF3LtC92Iwxo0wyw=="; }; }; - "@babel/helper-skip-transparent-expression-wrappers-7.12.1" = { + "@babel/helper-skip-transparent-expression-wrappers-7.14.5" = { name = "_at_babel_slash_helper-skip-transparent-expression-wrappers"; packageName = "@babel/helper-skip-transparent-expression-wrappers"; - version = "7.12.1"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz"; - sha512 = "Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA=="; + url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.14.5.tgz"; + sha512 = "dmqZB7mrb94PZSAOYtr+ZN5qt5owZIAgqtoTuqiFbHFtxgEcmQlRJVI+bO++fciBunXtB6MK7HrzrfcAzIz2NQ=="; }; }; - "@babel/helper-split-export-declaration-7.12.13" = { + "@babel/helper-split-export-declaration-7.14.5" = { name = "_at_babel_slash_helper-split-export-declaration"; packageName = "@babel/helper-split-export-declaration"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz"; - sha512 = "tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg=="; + url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz"; + sha512 = "hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA=="; }; }; - "@babel/helper-validator-identifier-7.14.0" = { + "@babel/helper-validator-identifier-7.14.5" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.14.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz"; - sha512 = "V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A=="; + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz"; + sha512 = "5lsetuxCLilmVGyiLEfoHBRX8UCFD+1m2x3Rj97WrW3V7H3u4RWRXA4evMjImCsin2J2YT0QaVDGf+z8ondbAg=="; }; }; - "@babel/helper-validator-option-7.12.17" = { + "@babel/helper-validator-option-7.14.5" = { name = "_at_babel_slash_helper-validator-option"; packageName = "@babel/helper-validator-option"; - version = "7.12.17"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz"; - sha512 = "TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw=="; + url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz"; + sha512 = "OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow=="; }; }; - "@babel/helper-wrap-function-7.13.0" = { + "@babel/helper-wrap-function-7.14.5" = { name = "_at_babel_slash_helper-wrap-function"; packageName = "@babel/helper-wrap-function"; - version = "7.13.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz"; - sha512 = "1UX9F7K3BS42fI6qd2A4BjKzgGjToscyZTdp1DjknHLCIvpgne6918io+aL5LXFcER/8QWiwpoY902pVEqgTXA=="; + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.14.5.tgz"; + sha512 = "YEdjTCq+LNuNS1WfxsDCNpgXkJaIyqco6DAelTUjT4f2KIWC1nBcaCaSdHTBqQVLnTBexBcVcFhLSU1KnYuePQ=="; }; }; - "@babel/helpers-7.14.0" = { + "@babel/helpers-7.14.5" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.14.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.0.tgz"; - sha512 = "+ufuXprtQ1D1iZTO/K9+EBRn+qPWMJjZSw/S0KlFrxCw4tkrzv9grgpDHkY9MeQTjTY8i2sp7Jep8DfU6tN9Mg=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.5.tgz"; + sha512 = "xtcWOuN9VL6nApgVHtq3PPcQv5qFBJzoSZzJ/2c0QK/IP/gxVcoWSNQwFEGvmbQsuS9rhYqjILDGGXcTkA705Q=="; }; }; - "@babel/highlight-7.14.0" = { + "@babel/highlight-7.14.5" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.14.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.0.tgz"; - sha512 = "YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz"; + sha512 = "qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg=="; }; }; - "@babel/parser-7.14.4" = { + "@babel/parser-7.14.5" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.14.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.14.4.tgz"; - sha512 = "ArliyUsWDUqEGfWcmzpGUzNfLxTdTp6WU4IuP6QFSp9gGfWS6boxFCkJSJ/L4+RG8z/FnIU3WxCk6hPL9SSWeA=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.14.5.tgz"; + sha512 = "TM8C+xtH/9n1qzX+JNHi7AN2zHMTiPUtspO0ZdHflW8KaskkALhMmuMHb4bCmNdv9VAPzJX3/bXqkVLnAvsPfg=="; }; }; - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12" = { + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" = { name = "_at_babel_slash_plugin-bugfix-v8-spread-parameters-in-optional-chaining"; packageName = "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining"; - version = "7.13.12"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12.tgz"; - sha512 = "d0u3zWKcoZf379fOeJdr1a5WPDny4aOFZ6hlfKivgK0LY7ZxNfoaHL2fWwdGtHyVvra38FC+HVYkO+byfSA8AQ=="; + url = "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5.tgz"; + sha512 = "ZoJS2XCKPBfTmL122iP6NM9dOg+d4lc9fFk3zxc8iDjvt8Pk4+TlsHSKhIPf6X+L5ORCdBzqMZDjL/WHj7WknQ=="; }; }; "@babel/plugin-external-helpers-7.8.3" = { @@ -652,13 +652,13 @@ let sha512 = "mx0WXDDiIl5DwzMtzWGRSPugXi9BxROS05GQrhLNbEamhBiicgn994ibwkyiBH+6png7bm/yA7AUsvHyCXi4Vw=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.14.2" = { + "@babel/plugin-proposal-async-generator-functions-7.14.5" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.14.2"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.2.tgz"; - sha512 = "b1AM4F6fwck4N8ItZ/AtC4FP/cqZqmKRQ4FaTDutwSYyjuhtvsGEMLK4N/ztV/ImP40BjIDyMgBQAeAMsQYVFQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.5.tgz"; + sha512 = "tbD/CG3l43FIXxmu4a7RBe4zH7MLJ+S/lFowPFO7HetS2hyOZ/0nnnznegDuzFzfkyQYTxqdTH/hKmuBngaDAA=="; }; }; "@babel/plugin-proposal-class-properties-7.12.13" = { @@ -670,85 +670,85 @@ let sha512 = "8SCJ0Ddrpwv4T7Gwb33EmW1V9PY5lggTO+A8WjyIwxrSHDUyBw4MtF96ifn1n8H806YlxbVCoKXbbmzD6RD+cA=="; }; }; - "@babel/plugin-proposal-class-properties-7.13.0" = { + "@babel/plugin-proposal-class-properties-7.14.5" = { name = "_at_babel_slash_plugin-proposal-class-properties"; packageName = "@babel/plugin-proposal-class-properties"; - version = "7.13.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.13.0.tgz"; - sha512 = "KnTDjFNC1g+45ka0myZNvSBFLhNCLN+GeGYLDEA8Oq7MZ6yMgfLoIRh86GRT0FjtJhZw8JyUskP9uvj5pHM9Zg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.14.5.tgz"; + sha512 = "q/PLpv5Ko4dVc1LYMpCY7RVAAO4uk55qPwrIuJ5QJ8c6cVuAmhu7I/49JOppXL6gXf7ZHzpRVEUZdYoPLM04Gg=="; }; }; - "@babel/plugin-proposal-class-static-block-7.14.3" = { + "@babel/plugin-proposal-class-static-block-7.14.5" = { name = "_at_babel_slash_plugin-proposal-class-static-block"; packageName = "@babel/plugin-proposal-class-static-block"; - version = "7.14.3"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.14.3.tgz"; - sha512 = "HEjzp5q+lWSjAgJtSluFDrGGosmwTgKwCXdDQZvhKsRlwv3YdkUEqxNrrjesJd+B9E9zvr1PVPVBvhYZ9msjvQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.14.5.tgz"; + sha512 = "KBAH5ksEnYHCegqseI5N9skTdxgJdmDoAOc0uXa+4QMYKeZD0w5IARh4FMlTNtaHhbB8v+KzMdTgxMMzsIy6Yg=="; }; }; - "@babel/plugin-proposal-dynamic-import-7.14.2" = { + "@babel/plugin-proposal-dynamic-import-7.14.5" = { name = "_at_babel_slash_plugin-proposal-dynamic-import"; packageName = "@babel/plugin-proposal-dynamic-import"; - version = "7.14.2"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.2.tgz"; - sha512 = "oxVQZIWFh91vuNEMKltqNsKLFWkOIyJc95k2Gv9lWVyDfPUQGSSlbDEgWuJUU1afGE9WwlzpucMZ3yDRHIItkA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.5.tgz"; + sha512 = "ExjiNYc3HDN5PXJx+bwC50GIx/KKanX2HiggnIUAYedbARdImiCU4RhhHfdf0Kd7JNXGpsBBBCOm+bBVy3Gb0g=="; }; }; - "@babel/plugin-proposal-export-default-from-7.12.13" = { + "@babel/plugin-proposal-export-default-from-7.14.5" = { name = "_at_babel_slash_plugin-proposal-export-default-from"; packageName = "@babel/plugin-proposal-export-default-from"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.12.13.tgz"; - sha512 = "idIsBT+DGXdOHL82U+8bwX4goHm/z10g8sGGrQroh+HCRcm7mDv/luaGdWJQMTuCX2FsdXS7X0Nyyzp4znAPJA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.14.5.tgz"; + sha512 = "T8KZ5abXvKMjF6JcoXjgac3ElmXf0AWzJwi2O/42Jk+HmCky3D9+i1B7NPP1FblyceqTevKeV/9szeikFoaMDg=="; }; }; - "@babel/plugin-proposal-export-namespace-from-7.14.2" = { + "@babel/plugin-proposal-export-namespace-from-7.14.5" = { name = "_at_babel_slash_plugin-proposal-export-namespace-from"; packageName = "@babel/plugin-proposal-export-namespace-from"; - version = "7.14.2"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.2.tgz"; - sha512 = "sRxW3z3Zp3pFfLAgVEvzTFutTXax837oOatUIvSG9o5gRj9mKwm3br1Se5f4QalTQs9x4AzlA/HrCWbQIHASUQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.5.tgz"; + sha512 = "g5POA32bXPMmSBu5Dx/iZGLGnKmKPc5AiY7qfZgurzrCYgIztDlHFbznSNCoQuv57YQLnQfaDi7dxCtLDIdXdA=="; }; }; - "@babel/plugin-proposal-json-strings-7.14.2" = { + "@babel/plugin-proposal-json-strings-7.14.5" = { name = "_at_babel_slash_plugin-proposal-json-strings"; packageName = "@babel/plugin-proposal-json-strings"; - version = "7.14.2"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.2.tgz"; - sha512 = "w2DtsfXBBJddJacXMBhElGEYqCZQqN99Se1qeYn8DVLB33owlrlLftIbMzn5nz1OITfDVknXF433tBrLEAOEjA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.5.tgz"; + sha512 = "NSq2fczJYKVRIsUJyNxrVUMhB27zb7N7pOFGQOhBKJrChbGcgEAqyZrmZswkPk18VMurEeJAaICbfm57vUeTbQ=="; }; }; - "@babel/plugin-proposal-logical-assignment-operators-7.14.2" = { + "@babel/plugin-proposal-logical-assignment-operators-7.14.5" = { name = "_at_babel_slash_plugin-proposal-logical-assignment-operators"; packageName = "@babel/plugin-proposal-logical-assignment-operators"; - version = "7.14.2"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.2.tgz"; - sha512 = "1JAZtUrqYyGsS7IDmFeaem+/LJqujfLZ2weLR9ugB0ufUPjzf8cguyVT1g5im7f7RXxuLq1xUxEzvm68uYRtGg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.5.tgz"; + sha512 = "YGn2AvZAo9TwyhlLvCCWxD90Xq8xJ4aSgaX3G5D/8DW94L8aaT+dS5cSP+Z06+rCJERGSr9GxMBZ601xoc2taw=="; }; }; - "@babel/plugin-proposal-nullish-coalescing-operator-7.14.2" = { + "@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" = { name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator"; packageName = "@babel/plugin-proposal-nullish-coalescing-operator"; - version = "7.14.2"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.2.tgz"; - sha512 = "ebR0zU9OvI2N4qiAC38KIAK75KItpIPTpAtd2r4OZmMFeKbKJpUFLYP2EuDut82+BmYi8sz42B+TfTptJ9iG5Q=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.5.tgz"; + sha512 = "gun/SOnMqjSb98Nkaq2rTKMwervfdAoz6NphdY0vTfuzMfryj+tDGb2n6UkDKwez+Y8PZDhE3D143v6Gepp4Hg=="; }; }; - "@babel/plugin-proposal-numeric-separator-7.14.2" = { + "@babel/plugin-proposal-numeric-separator-7.14.5" = { name = "_at_babel_slash_plugin-proposal-numeric-separator"; packageName = "@babel/plugin-proposal-numeric-separator"; - version = "7.14.2"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.2.tgz"; - sha512 = "DcTQY9syxu9BpU3Uo94fjCB3LN9/hgPS8oUL7KrSW3bA2ePrKZZPJcc5y0hoJAM9dft3pGfErtEUvxXQcfLxUg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.5.tgz"; + sha512 = "yiclALKe0vyZRZE0pS6RXgjUOt87GWv6FYa5zqj15PvhOGFO69R5DusPlgK/1K5dVnCtegTiWu9UaBSrLLJJBg=="; }; }; "@babel/plugin-proposal-object-rest-spread-7.10.4" = { @@ -760,58 +760,58 @@ let sha512 = "6vh4SqRuLLarjgeOf4EaROJAHjvu9Gl+/346PbDH9yWbJyfnJ/ah3jmYKYtswEyCoWZiidvVHjHshd4WgjB9BA=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.14.4" = { + "@babel/plugin-proposal-object-rest-spread-7.14.5" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.14.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.4.tgz"; - sha512 = "AYosOWBlyyXEagrPRfLJ1enStufsr7D1+ddpj8OLi9k7B6+NdZ0t/9V7Fh+wJ4g2Jol8z2JkgczYqtWrZd4vbA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.5.tgz"; + sha512 = "VzMyY6PWNPPT3pxc5hi9LloKNr4SSrVCg7Yr6aZpW4Ym07r7KqSU/QXYwjXLVxqwSv0t/XSXkFoKBPUkZ8vb2A=="; }; }; - "@babel/plugin-proposal-optional-catch-binding-7.14.2" = { + "@babel/plugin-proposal-optional-catch-binding-7.14.5" = { name = "_at_babel_slash_plugin-proposal-optional-catch-binding"; packageName = "@babel/plugin-proposal-optional-catch-binding"; - version = "7.14.2"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.2.tgz"; - sha512 = "XtkJsmJtBaUbOxZsNk0Fvrv8eiqgneug0A6aqLFZ4TSkar2L5dSXWcnUKHgmjJt49pyB/6ZHvkr3dPgl9MOWRQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.5.tgz"; + sha512 = "3Oyiixm0ur7bzO5ybNcZFlmVsygSIQgdOa7cTfOYCMY+wEPAYhZAJxi3mixKFCTCKUhQXuCTtQ1MzrpL3WT8ZQ=="; }; }; - "@babel/plugin-proposal-optional-chaining-7.14.2" = { + "@babel/plugin-proposal-optional-chaining-7.14.5" = { name = "_at_babel_slash_plugin-proposal-optional-chaining"; packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.14.2"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.2.tgz"; - sha512 = "qQByMRPwMZJainfig10BoaDldx/+VDtNcrA7qdNaEOAj6VXud+gfrkA8j4CRAU5HjnWREXqIpSpH30qZX1xivA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.5.tgz"; + sha512 = "ycz+VOzo2UbWNI1rQXxIuMOzrDdHGrI23fRiz/Si2R4kv2XZQ1BK8ccdHwehMKBlcH/joGW/tzrUmo67gbJHlQ=="; }; }; - "@babel/plugin-proposal-private-methods-7.13.0" = { + "@babel/plugin-proposal-private-methods-7.14.5" = { name = "_at_babel_slash_plugin-proposal-private-methods"; packageName = "@babel/plugin-proposal-private-methods"; - version = "7.13.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.13.0.tgz"; - sha512 = "MXyyKQd9inhx1kDYPkFRVOBXQ20ES8Pto3T7UZ92xj2mY0EVD8oAVzeyYuVfy/mxAdTSIayOvg+aVzcHV2bn6Q=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.14.5.tgz"; + sha512 = "838DkdUA1u+QTCplatfq4B7+1lnDa/+QMI89x5WZHBcnNv+47N8QEj2k9I2MUU9xIv8XJ4XvPCviM/Dj7Uwt9g=="; }; }; - "@babel/plugin-proposal-private-property-in-object-7.14.0" = { + "@babel/plugin-proposal-private-property-in-object-7.14.5" = { name = "_at_babel_slash_plugin-proposal-private-property-in-object"; packageName = "@babel/plugin-proposal-private-property-in-object"; - version = "7.14.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.14.0.tgz"; - sha512 = "59ANdmEwwRUkLjB7CRtwJxxwtjESw+X2IePItA+RGQh+oy5RmpCh/EvVVvh5XQc3yxsm5gtv0+i9oBZhaDNVTg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.14.5.tgz"; + sha512 = "62EyfyA3WA0mZiF2e2IV9mc9Ghwxcg8YTu8BS4Wss4Y3PY725OmS9M0qLORbJwLqFtGh+jiE4wAmocK2CTUK2Q=="; }; }; - "@babel/plugin-proposal-unicode-property-regex-7.12.13" = { + "@babel/plugin-proposal-unicode-property-regex-7.14.5" = { name = "_at_babel_slash_plugin-proposal-unicode-property-regex"; packageName = "@babel/plugin-proposal-unicode-property-regex"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz"; - sha512 = "XyJmZidNfofEkqFV5VC/bLabGmO5QzenPO/YOfGuEbgU+2sSwMmio3YLb4WtBgcmmdwZHyVyv8on77IUjQ5Gvg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.14.5.tgz"; + sha512 = "6axIeOU5LnY471KenAB9vI8I5j7NQ2d652hIYwVyRfgaZT5UpiqFKCuVXCDMSrU+3VFafnu2c5m3lrWIlr6A5Q=="; }; }; "@babel/plugin-syntax-async-generators-7.8.4" = { @@ -841,13 +841,13 @@ let sha512 = "fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA=="; }; }; - "@babel/plugin-syntax-class-static-block-7.12.13" = { + "@babel/plugin-syntax-class-static-block-7.14.5" = { name = "_at_babel_slash_plugin-syntax-class-static-block"; packageName = "@babel/plugin-syntax-class-static-block"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.12.13.tgz"; - sha512 = "ZmKQ0ZXR0nYpHZIIuj9zE7oIqCx2hw9TKi+lIo73NNrMPAZGHfS92/VRV0ZmPj6H2ffBgyFHXvJ5NYsNeEaP2A=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz"; + sha512 = "b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw=="; }; }; "@babel/plugin-syntax-dynamic-import-7.8.3" = { @@ -859,13 +859,13 @@ let sha512 = "5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ=="; }; }; - "@babel/plugin-syntax-export-default-from-7.12.13" = { + "@babel/plugin-syntax-export-default-from-7.14.5" = { name = "_at_babel_slash_plugin-syntax-export-default-from"; packageName = "@babel/plugin-syntax-export-default-from"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.12.13.tgz"; - sha512 = "gVry0zqoums0hA+EniCYK3gABhjYSLX1dVuwYpPw9DrLNA4/GovXySHVg4FGRsZht09ON/5C2NVx3keq+qqVGQ=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.14.5.tgz"; + sha512 = "snWDxjuaPEobRBnhpqEfZ8RMxDbHt8+87fiEioGuE+Uc0xAKgSD8QiuL3lF93hPVQfZFAcYwrrf+H5qUhike3Q=="; }; }; "@babel/plugin-syntax-export-namespace-from-7.8.3" = { @@ -877,13 +877,13 @@ let sha512 = "MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q=="; }; }; - "@babel/plugin-syntax-flow-7.12.13" = { + "@babel/plugin-syntax-flow-7.14.5" = { name = "_at_babel_slash_plugin-syntax-flow"; packageName = "@babel/plugin-syntax-flow"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.12.13.tgz"; - sha512 = "J/RYxnlSLXZLVR7wTRsozxKT8qbsx1mNKJzXEEjQ0Kjx1ZACcyHgbanNWNCFtc36IzuWhYWPpvJFFoexoOWFmA=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.14.5.tgz"; + sha512 = "9WK5ZwKCdWHxVuU13XNT6X73FGmutAXeor5lGFq6qhOFtMFUF4jkbijuyUdZZlpYq6E2hZeZf/u3959X9wsv0Q=="; }; }; "@babel/plugin-syntax-import-meta-7.10.4" = { @@ -913,13 +913,13 @@ let sha512 = "KCg9mio9jwiARCB7WAcQ7Y1q+qicILjoK8LP/VkPkEKaf5dkaZZK1EcTe91a3JJlZ3qy6L5s9X52boEYi8DM9g=="; }; }; - "@babel/plugin-syntax-jsx-7.12.13" = { + "@babel/plugin-syntax-jsx-7.14.5" = { name = "_at_babel_slash_plugin-syntax-jsx"; packageName = "@babel/plugin-syntax-jsx"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.13.tgz"; - sha512 = "d4HM23Q1K7oq/SLNmG6mRt85l2csmQ0cHRaxRXjKW0YFdEXqlZ5kzFQKH5Uc3rDJECgu+yCRgPkG04Mm98R/1g=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.14.5.tgz"; + sha512 = "ohuFIsOMXJnbOMRfX7/w7LocdR6R7whhuRD4ax8IipLcLPlZGJKkBxgHp++U4N/vKyU16/YDQr2f5seajD3jIw=="; }; }; "@babel/plugin-syntax-logical-assignment-operators-7.10.4" = { @@ -976,409 +976,409 @@ let sha512 = "KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg=="; }; }; - "@babel/plugin-syntax-private-property-in-object-7.14.0" = { + "@babel/plugin-syntax-private-property-in-object-7.14.5" = { name = "_at_babel_slash_plugin-syntax-private-property-in-object"; packageName = "@babel/plugin-syntax-private-property-in-object"; - version = "7.14.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.0.tgz"; - sha512 = "bda3xF8wGl5/5btF794utNOL0Jw+9jE5C1sLZcoK7c4uonE/y3iQiyG+KbkF3WBV/paX58VCpjhxLPkdj5Fe4w=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz"; + sha512 = "0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg=="; }; }; - "@babel/plugin-syntax-top-level-await-7.12.13" = { + "@babel/plugin-syntax-top-level-await-7.14.5" = { name = "_at_babel_slash_plugin-syntax-top-level-await"; packageName = "@babel/plugin-syntax-top-level-await"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz"; - sha512 = "A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz"; + sha512 = "hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw=="; }; }; - "@babel/plugin-syntax-typescript-7.12.13" = { + "@babel/plugin-syntax-typescript-7.14.5" = { name = "_at_babel_slash_plugin-syntax-typescript"; packageName = "@babel/plugin-syntax-typescript"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.13.tgz"; - sha512 = "cHP3u1JiUiG2LFDKbXnwVad81GvfyIOmCD6HIEId6ojrY0Drfy2q1jw7BwN7dE84+kTnBjLkXoL3IEy/3JPu2w=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.14.5.tgz"; + sha512 = "u6OXzDaIXjEstBRRoBCQ/uKQKlbuaeE5in0RvWdA4pN6AhqxTIwUsnHPU1CFZA/amYObMsuWhYfRl3Ch90HD0Q=="; }; }; - "@babel/plugin-transform-arrow-functions-7.13.0" = { + "@babel/plugin-transform-arrow-functions-7.14.5" = { name = "_at_babel_slash_plugin-transform-arrow-functions"; packageName = "@babel/plugin-transform-arrow-functions"; - version = "7.13.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz"; - sha512 = "96lgJagobeVmazXFaDrbmCLQxBysKu7U6Do3mLsx27gf5Dk85ezysrs2BZUpXD703U/Su1xTBDxxar2oa4jAGg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.14.5.tgz"; + sha512 = "KOnO0l4+tD5IfOdi4x8C1XmEIRWUjNRV8wc6K2vz/3e8yAOoZZvsRXRRIF/yo/MAOFb4QjtAw9xSxMXbSMRy8A=="; }; }; - "@babel/plugin-transform-async-to-generator-7.13.0" = { + "@babel/plugin-transform-async-to-generator-7.14.5" = { name = "_at_babel_slash_plugin-transform-async-to-generator"; packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.13.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.13.0.tgz"; - sha512 = "3j6E004Dx0K3eGmhxVJxwwI89CTJrce7lg3UrtFuDAVQ/2+SJ/h/aSFOeE6/n0WB1GsOffsJp6MnPQNQ8nmwhg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.14.5.tgz"; + sha512 = "szkbzQ0mNk0rpu76fzDdqSyPu0MuvpXgC+6rz5rpMb5OIRxdmHfQxrktL8CYolL2d8luMCZTR0DpIMIdL27IjA=="; }; }; - "@babel/plugin-transform-block-scoped-functions-7.12.13" = { + "@babel/plugin-transform-block-scoped-functions-7.14.5" = { name = "_at_babel_slash_plugin-transform-block-scoped-functions"; packageName = "@babel/plugin-transform-block-scoped-functions"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz"; - sha512 = "zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.14.5.tgz"; + sha512 = "dtqWqdWZ5NqBX3KzsVCWfQI3A53Ft5pWFCT2eCVUftWZgjc5DpDponbIF1+c+7cSGk2wN0YK7HGL/ezfRbpKBQ=="; }; }; - "@babel/plugin-transform-block-scoping-7.14.4" = { + "@babel/plugin-transform-block-scoping-7.14.5" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.14.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.4.tgz"; - sha512 = "5KdpkGxsZlTk+fPleDtGKsA+pon28+ptYmMO8GBSa5fHERCJWAzj50uAfCKBqq42HO+Zot6JF1x37CRprwmN4g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.5.tgz"; + sha512 = "LBYm4ZocNgoCqyxMLoOnwpsmQ18HWTQvql64t3GvMUzLQrNoV1BDG0lNftC8QKYERkZgCCT/7J5xWGObGAyHDw=="; }; }; - "@babel/plugin-transform-classes-7.14.4" = { + "@babel/plugin-transform-classes-7.14.5" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.14.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.4.tgz"; - sha512 = "p73t31SIj6y94RDVX57rafVjttNr8MvKEgs5YFatNB/xC68zM3pyosuOEcQmYsYlyQaGY9R7rAULVRcat5FKJQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.5.tgz"; + sha512 = "J4VxKAMykM06K/64z9rwiL6xnBHgB1+FVspqvlgCdwD1KUbQNfszeKVVOMh59w3sztHYIZDgnhOC4WbdEfHFDA=="; }; }; - "@babel/plugin-transform-computed-properties-7.13.0" = { + "@babel/plugin-transform-computed-properties-7.14.5" = { name = "_at_babel_slash_plugin-transform-computed-properties"; packageName = "@babel/plugin-transform-computed-properties"; - version = "7.13.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.13.0.tgz"; - sha512 = "RRqTYTeZkZAz8WbieLTvKUEUxZlUTdmL5KGMyZj7FnMfLNKV4+r5549aORG/mgojRmFlQMJDUupwAMiF2Q7OUg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.14.5.tgz"; + sha512 = "pWM+E4283UxaVzLb8UBXv4EIxMovU4zxT1OPnpHJcmnvyY9QbPPTKZfEj31EUvG3/EQRbYAGaYEUZ4yWOBC2xg=="; }; }; - "@babel/plugin-transform-destructuring-7.14.4" = { + "@babel/plugin-transform-destructuring-7.14.5" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.14.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.4.tgz"; - sha512 = "JyywKreTCGTUsL1OKu1A3ms/R1sTP0WxbpXlALeGzF53eB3bxtNkYdMj9SDgK7g6ImPy76J5oYYKoTtQImlhQA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.5.tgz"; + sha512 = "wU9tYisEbRMxqDezKUqC9GleLycCRoUsai9ddlsq54r8QRLaeEhc+d+9DqCG+kV9W2GgQjTZESPTpn5bAFMDww=="; }; }; - "@babel/plugin-transform-dotall-regex-7.12.13" = { + "@babel/plugin-transform-dotall-regex-7.14.5" = { name = "_at_babel_slash_plugin-transform-dotall-regex"; packageName = "@babel/plugin-transform-dotall-regex"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz"; - sha512 = "foDrozE65ZFdUC2OfgeOCrEPTxdB3yjqxpXh8CH+ipd9CHd4s/iq81kcUpyH8ACGNEPdFqbtzfgzbT/ZGlbDeQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.14.5.tgz"; + sha512 = "loGlnBdj02MDsFaHhAIJzh7euK89lBrGIdM9EAtHFo6xKygCUGuuWe07o1oZVk287amtW1n0808sQM99aZt3gw=="; }; }; - "@babel/plugin-transform-duplicate-keys-7.12.13" = { + "@babel/plugin-transform-duplicate-keys-7.14.5" = { name = "_at_babel_slash_plugin-transform-duplicate-keys"; packageName = "@babel/plugin-transform-duplicate-keys"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz"; - sha512 = "NfADJiiHdhLBW3pulJlJI2NB0t4cci4WTZ8FtdIuNc2+8pslXdPtRRAEWqUY+m9kNOk2eRYbTAOipAxlrOcwwQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.14.5.tgz"; + sha512 = "iJjbI53huKbPDAsJ8EmVmvCKeeq21bAze4fu9GBQtSLqfvzj2oRuHVx4ZkDwEhg1htQ+5OBZh/Ab0XDf5iBZ7A=="; }; }; - "@babel/plugin-transform-exponentiation-operator-7.12.13" = { + "@babel/plugin-transform-exponentiation-operator-7.14.5" = { name = "_at_babel_slash_plugin-transform-exponentiation-operator"; packageName = "@babel/plugin-transform-exponentiation-operator"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz"; - sha512 = "fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.14.5.tgz"; + sha512 = "jFazJhMBc9D27o9jDnIE5ZErI0R0m7PbKXVq77FFvqFbzvTMuv8jaAwLZ5PviOLSFttqKIW0/wxNSDbjLk0tYA=="; }; }; - "@babel/plugin-transform-flow-strip-types-7.13.0" = { + "@babel/plugin-transform-flow-strip-types-7.14.5" = { name = "_at_babel_slash_plugin-transform-flow-strip-types"; packageName = "@babel/plugin-transform-flow-strip-types"; - version = "7.13.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.13.0.tgz"; - sha512 = "EXAGFMJgSX8gxWD7PZtW/P6M+z74jpx3wm/+9pn+c2dOawPpBkUX7BrfyPvo6ZpXbgRIEuwgwDb/MGlKvu2pOg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.14.5.tgz"; + sha512 = "KhcolBKfXbvjwI3TV7r7TkYm8oNXHNBqGOy6JDVwtecFaRoKYsUUqJdS10q0YDKW1c6aZQgO+Ys3LfGkox8pXA=="; }; }; - "@babel/plugin-transform-for-of-7.13.0" = { + "@babel/plugin-transform-for-of-7.14.5" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.13.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.13.0.tgz"; - sha512 = "IHKT00mwUVYE0zzbkDgNRP6SRzvfGCYsOxIRz8KsiaaHCcT9BWIkO+H9QRJseHBLOGBZkHUdHiqj6r0POsdytg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.14.5.tgz"; + sha512 = "CfmqxSUZzBl0rSjpoQSFoR9UEj3HzbGuGNL21/iFTmjb5gFggJp3ph0xR1YBhexmLoKRHzgxuFvty2xdSt6gTA=="; }; }; - "@babel/plugin-transform-function-name-7.12.13" = { + "@babel/plugin-transform-function-name-7.14.5" = { name = "_at_babel_slash_plugin-transform-function-name"; packageName = "@babel/plugin-transform-function-name"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz"; - sha512 = "6K7gZycG0cmIwwF7uMK/ZqeCikCGVBdyP2J5SKNCXO5EOHcqi+z7Jwf8AmyDNcBgxET8DrEtCt/mPKPyAzXyqQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.14.5.tgz"; + sha512 = "vbO6kv0fIzZ1GpmGQuvbwwm+O4Cbm2NrPzwlup9+/3fdkuzo1YqOZcXw26+YUJB84Ja7j9yURWposEHLYwxUfQ=="; }; }; - "@babel/plugin-transform-literals-7.12.13" = { + "@babel/plugin-transform-literals-7.14.5" = { name = "_at_babel_slash_plugin-transform-literals"; packageName = "@babel/plugin-transform-literals"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz"; - sha512 = "FW+WPjSR7hiUxMcKqyNjP05tQ2kmBCdpEpZHY1ARm96tGQCCBvXKnpjILtDplUnJ/eHZ0lALLM+d2lMFSpYJrQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.14.5.tgz"; + sha512 = "ql33+epql2F49bi8aHXxvLURHkxJbSmMKl9J5yHqg4PLtdE6Uc48CH1GS6TQvZ86eoB/ApZXwm7jlA+B3kra7A=="; }; }; - "@babel/plugin-transform-member-expression-literals-7.12.13" = { + "@babel/plugin-transform-member-expression-literals-7.14.5" = { name = "_at_babel_slash_plugin-transform-member-expression-literals"; packageName = "@babel/plugin-transform-member-expression-literals"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz"; - sha512 = "kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.14.5.tgz"; + sha512 = "WkNXxH1VXVTKarWFqmso83xl+2V3Eo28YY5utIkbsmXoItO8Q3aZxN4BTS2k0hz9dGUloHK26mJMyQEYfkn/+Q=="; }; }; - "@babel/plugin-transform-modules-amd-7.14.2" = { + "@babel/plugin-transform-modules-amd-7.14.5" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.14.2"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.2.tgz"; - sha512 = "hPC6XBswt8P3G2D1tSV2HzdKvkqOpmbyoy+g73JG0qlF/qx2y3KaMmXb1fLrpmWGLZYA0ojCvaHdzFWjlmV+Pw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.5.tgz"; + sha512 = "3lpOU8Vxmp3roC4vzFpSdEpGUWSMsHFreTWOMMLzel2gNGfHE5UWIh/LN6ghHs2xurUp4jRFYMUIZhuFbody1g=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.14.0" = { + "@babel/plugin-transform-modules-commonjs-7.14.5" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.14.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.0.tgz"; - sha512 = "EX4QePlsTaRZQmw9BsoPeyh5OCtRGIhwfLquhxGp5e32w+dyL8htOcDwamlitmNFK6xBZYlygjdye9dbd9rUlQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.5.tgz"; + sha512 = "en8GfBtgnydoao2PS+87mKyw62k02k7kJ9ltbKe0fXTHrQmG6QZZflYuGI1VVG7sVpx4E1n7KBpNlPb8m78J+A=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.13.8" = { + "@babel/plugin-transform-modules-systemjs-7.14.5" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.13.8"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.13.8.tgz"; - sha512 = "hwqctPYjhM6cWvVIlOIe27jCIBgHCsdH2xCJVAYQm7V5yTMoilbVMi9f6wKg0rpQAOn6ZG4AOyvCqFF/hUh6+A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.14.5.tgz"; + sha512 = "mNMQdvBEE5DcMQaL5LbzXFMANrQjd2W7FPzg34Y4yEz7dBgdaC+9B84dSO+/1Wba98zoDbInctCDo4JGxz1VYA=="; }; }; - "@babel/plugin-transform-modules-umd-7.14.0" = { + "@babel/plugin-transform-modules-umd-7.14.5" = { name = "_at_babel_slash_plugin-transform-modules-umd"; packageName = "@babel/plugin-transform-modules-umd"; - version = "7.14.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.0.tgz"; - sha512 = "nPZdnWtXXeY7I87UZr9VlsWme3Y0cfFFE41Wbxz4bbaexAjNMInXPFUpRRUJ8NoMm0Cw+zxbqjdPmLhcjfazMw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.5.tgz"; + sha512 = "RfPGoagSngC06LsGUYyM9QWSXZ8MysEjDJTAea1lqRjNECE3y0qIJF/qbvJxc4oA4s99HumIMdXOrd+TdKaAAA=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.12.13" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.14.5" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz"; - sha512 = "Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.5.tgz"; + sha512 = "+Xe5+6MWFo311U8SchgeX5c1+lJM+eZDBZgD+tvXu9VVQPXwwVzeManMMjYX6xw2HczngfOSZjoFYKwdeB/Jvw=="; }; }; - "@babel/plugin-transform-new-target-7.12.13" = { + "@babel/plugin-transform-new-target-7.14.5" = { name = "_at_babel_slash_plugin-transform-new-target"; packageName = "@babel/plugin-transform-new-target"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz"; - sha512 = "/KY2hbLxrG5GTQ9zzZSc3xWiOy379pIETEhbtzwZcw9rvuaVV4Fqy7BYGYOWZnaoXIQYbbJ0ziXLa/sKcGCYEQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.14.5.tgz"; + sha512 = "Nx054zovz6IIRWEB49RDRuXGI4Gy0GMgqG0cII9L3MxqgXz/+rgII+RU58qpo4g7tNEx1jG7rRVH4ihZoP4esQ=="; }; }; - "@babel/plugin-transform-object-assign-7.12.13" = { + "@babel/plugin-transform-object-assign-7.14.5" = { name = "_at_babel_slash_plugin-transform-object-assign"; packageName = "@babel/plugin-transform-object-assign"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.12.13.tgz"; - sha512 = "4QxDMc0lAOkIBSfCrnSGbAJ+4epDBF2XXwcLXuBcG1xl9u7LrktNVD4+LwhL47XuKVPQ7R25e/WdcV+h97HyZA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.14.5.tgz"; + sha512 = "lvhjk4UN9xJJYB1mI5KC0/o1D5EcJXdbhVe+4fSk08D6ZN+iuAIs7LJC+71h8av9Ew4+uRq9452v9R93SFmQlQ=="; }; }; - "@babel/plugin-transform-object-super-7.12.13" = { + "@babel/plugin-transform-object-super-7.14.5" = { name = "_at_babel_slash_plugin-transform-object-super"; packageName = "@babel/plugin-transform-object-super"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz"; - sha512 = "JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.14.5.tgz"; + sha512 = "MKfOBWzK0pZIrav9z/hkRqIk/2bTv9qvxHzPQc12RcVkMOzpIKnFCNYJip00ssKWYkd8Sf5g0Wr7pqJ+cmtuFg=="; }; }; - "@babel/plugin-transform-parameters-7.14.2" = { + "@babel/plugin-transform-parameters-7.14.5" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.14.2"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.2.tgz"; - sha512 = "NxoVmA3APNCC1JdMXkdYXuQS+EMdqy0vIwyDHeKHiJKRxmp1qGSdb0JLEIoPRhkx6H/8Qi3RJ3uqOCYw8giy9A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.5.tgz"; + sha512 = "Tl7LWdr6HUxTmzQtzuU14SqbgrSKmaR77M0OKyq4njZLQTPfOvzblNKyNkGwOfEFCEx7KeYHQHDI0P3F02IVkA=="; }; }; - "@babel/plugin-transform-property-literals-7.12.13" = { + "@babel/plugin-transform-property-literals-7.14.5" = { name = "_at_babel_slash_plugin-transform-property-literals"; packageName = "@babel/plugin-transform-property-literals"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz"; - sha512 = "nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.14.5.tgz"; + sha512 = "r1uilDthkgXW8Z1vJz2dKYLV1tuw2xsbrp3MrZmD99Wh9vsfKoob+JTgri5VUb/JqyKRXotlOtwgu4stIYCmnw=="; }; }; - "@babel/plugin-transform-react-display-name-7.14.2" = { + "@babel/plugin-transform-react-display-name-7.14.5" = { name = "_at_babel_slash_plugin-transform-react-display-name"; packageName = "@babel/plugin-transform-react-display-name"; - version = "7.14.2"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.14.2.tgz"; - sha512 = "zCubvP+jjahpnFJvPaHPiGVfuVUjXHhFvJKQdNnsmSsiU9kR/rCZ41jHc++tERD2zV+p7Hr6is+t5b6iWTCqSw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.14.5.tgz"; + sha512 = "07aqY1ChoPgIxsuDviptRpVkWCSbXWmzQqcgy65C6YSFOfPFvb/DX3bBRHh7pCd/PMEEYHYWUTSVkCbkVainYQ=="; }; }; - "@babel/plugin-transform-react-jsx-7.14.3" = { + "@babel/plugin-transform-react-jsx-7.14.5" = { name = "_at_babel_slash_plugin-transform-react-jsx"; packageName = "@babel/plugin-transform-react-jsx"; - version = "7.14.3"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.14.3.tgz"; - sha512 = "uuxuoUNVhdgYzERiHHFkE4dWoJx+UFVyuAl0aqN8P2/AKFHwqgUC5w2+4/PjpKXJsFgBlYAFXlUmDQ3k3DUkXw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.14.5.tgz"; + sha512 = "7RylxNeDnxc1OleDm0F5Q/BSL+whYRbOAR+bwgCxIr0L32v7UFh/pz1DLMZideAUxKT6eMoS2zQH6fyODLEi8Q=="; }; }; - "@babel/plugin-transform-react-jsx-development-7.12.17" = { + "@babel/plugin-transform-react-jsx-development-7.14.5" = { name = "_at_babel_slash_plugin-transform-react-jsx-development"; packageName = "@babel/plugin-transform-react-jsx-development"; - version = "7.12.17"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.17.tgz"; - sha512 = "BPjYV86SVuOaudFhsJR1zjgxxOhJDt6JHNoD48DxWEIxUCAMjV1ys6DYw4SDYZh0b1QsS2vfIA9t/ZsQGsDOUQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.14.5.tgz"; + sha512 = "rdwG/9jC6QybWxVe2UVOa7q6cnTpw8JRRHOxntG/h6g/guAOe6AhtQHJuJh5FwmnXIT1bdm5vC2/5huV8ZOorQ=="; }; }; - "@babel/plugin-transform-react-jsx-self-7.12.13" = { + "@babel/plugin-transform-react-jsx-self-7.14.5" = { name = "_at_babel_slash_plugin-transform-react-jsx-self"; packageName = "@babel/plugin-transform-react-jsx-self"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.12.13.tgz"; - sha512 = "FXYw98TTJ125GVCCkFLZXlZ1qGcsYqNQhVBQcZjyrwf8FEUtVfKIoidnO8S0q+KBQpDYNTmiGo1gn67Vti04lQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.14.5.tgz"; + sha512 = "M/fmDX6n0cfHK/NLTcPmrfVAORKDhK8tyjDhyxlUjYyPYYO8FRWwuxBA3WBx8kWN/uBUuwGa3s/0+hQ9JIN3Tg=="; }; }; - "@babel/plugin-transform-react-jsx-source-7.14.2" = { + "@babel/plugin-transform-react-jsx-source-7.14.5" = { name = "_at_babel_slash_plugin-transform-react-jsx-source"; packageName = "@babel/plugin-transform-react-jsx-source"; - version = "7.14.2"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.14.2.tgz"; - sha512 = "OMorspVyjxghAjzgeAWc6O7W7vHbJhV69NeTGdl9Mxgz6PaweAuo7ffB9T5A1OQ9dGcw0As4SYMUhyNC4u7mVg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.14.5.tgz"; + sha512 = "1TpSDnD9XR/rQ2tzunBVPThF5poaYT9GqP+of8fAtguYuI/dm2RkrMBDemsxtY0XBzvW7nXjYM0hRyKX9QYj7Q=="; }; }; - "@babel/plugin-transform-react-pure-annotations-7.12.1" = { + "@babel/plugin-transform-react-pure-annotations-7.14.5" = { name = "_at_babel_slash_plugin-transform-react-pure-annotations"; packageName = "@babel/plugin-transform-react-pure-annotations"; - version = "7.12.1"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.12.1.tgz"; - sha512 = "RqeaHiwZtphSIUZ5I85PEH19LOSzxfuEazoY7/pWASCAIBuATQzpSVD+eT6MebeeZT2F4eSL0u4vw6n4Nm0Mjg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.14.5.tgz"; + sha512 = "3X4HpBJimNxW4rhUy/SONPyNQHp5YRr0HhJdT2OH1BRp0of7u3Dkirc7x9FRJMKMqTBI079VZ1hzv7Ouuz///g=="; }; }; - "@babel/plugin-transform-regenerator-7.13.15" = { + "@babel/plugin-transform-regenerator-7.14.5" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.13.15"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.13.15.tgz"; - sha512 = "Bk9cOLSz8DiurcMETZ8E2YtIVJbFCPGW28DJWUakmyVWtQSm6Wsf0p4B4BfEr/eL2Nkhe/CICiUiMOCi1TPhuQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.14.5.tgz"; + sha512 = "NVIY1W3ITDP5xQl50NgTKlZ0GrotKtLna08/uGY6ErQt6VEQZXla86x/CTddm5gZdcr+5GSsvMeTmWA5Ii6pkg=="; }; }; - "@babel/plugin-transform-reserved-words-7.12.13" = { + "@babel/plugin-transform-reserved-words-7.14.5" = { name = "_at_babel_slash_plugin-transform-reserved-words"; packageName = "@babel/plugin-transform-reserved-words"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz"; - sha512 = "xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.14.5.tgz"; + sha512 = "cv4F2rv1nD4qdexOGsRQXJrOcyb5CrgjUH9PKrrtyhSDBNWGxd0UIitjyJiWagS+EbUGjG++22mGH1Pub8D6Vg=="; }; }; - "@babel/plugin-transform-runtime-7.14.3" = { + "@babel/plugin-transform-runtime-7.14.5" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.14.3"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.14.3.tgz"; - sha512 = "t960xbi8wpTFE623ef7sd+UpEC5T6EEguQlTBJDEO05+XwnIWVfuqLw/vdLWY6IdFmtZE+65CZAfByT39zRpkg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.14.5.tgz"; + sha512 = "fPMBhh1AV8ZyneiCIA+wYYUH1arzlXR1UMcApjvchDhfKxhy2r2lReJv8uHEyihi4IFIGlr1Pdx7S5fkESDQsg=="; }; }; - "@babel/plugin-transform-shorthand-properties-7.12.13" = { + "@babel/plugin-transform-shorthand-properties-7.14.5" = { name = "_at_babel_slash_plugin-transform-shorthand-properties"; packageName = "@babel/plugin-transform-shorthand-properties"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz"; - sha512 = "xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.14.5.tgz"; + sha512 = "xLucks6T1VmGsTB+GWK5Pl9Jl5+nRXD1uoFdA5TSO6xtiNjtXTjKkmPdFXVLGlK5A2/or/wQMKfmQ2Y0XJfn5g=="; }; }; - "@babel/plugin-transform-spread-7.13.0" = { + "@babel/plugin-transform-spread-7.14.5" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.13.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz"; - sha512 = "V6vkiXijjzYeFmQTr3dBxPtZYLPcUfY34DebOU27jIl2M/Y8Egm52Hw82CSjjPqd54GTlJs5x+CR7HeNr24ckg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.14.5.tgz"; + sha512 = "/3iqoQdiWergnShZYl0xACb4ADeYCJ7X/RgmwtXshn6cIvautRPAFzhd58frQlokLO6Jb4/3JXvmm6WNTPtiTw=="; }; }; - "@babel/plugin-transform-sticky-regex-7.12.13" = { + "@babel/plugin-transform-sticky-regex-7.14.5" = { name = "_at_babel_slash_plugin-transform-sticky-regex"; packageName = "@babel/plugin-transform-sticky-regex"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz"; - sha512 = "Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.14.5.tgz"; + sha512 = "Z7F7GyvEMzIIbwnziAZmnSNpdijdr4dWt+FJNBnBLz5mwDFkqIXU9wmBcWWad3QeJF5hMTkRe4dAq2sUZiG+8A=="; }; }; - "@babel/plugin-transform-template-literals-7.13.0" = { + "@babel/plugin-transform-template-literals-7.14.5" = { name = "_at_babel_slash_plugin-transform-template-literals"; packageName = "@babel/plugin-transform-template-literals"; - version = "7.13.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.13.0.tgz"; - sha512 = "d67umW6nlfmr1iehCcBv69eSUSySk1EsIS8aTDX4Xo9qajAh6mYtcl4kJrBkGXuxZPEgVr7RVfAvNW6YQkd4Mw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.14.5.tgz"; + sha512 = "22btZeURqiepOfuy/VkFr+zStqlujWaarpMErvay7goJS6BWwdd6BY9zQyDLDa4x2S3VugxFb162IZ4m/S/+Gg=="; }; }; - "@babel/plugin-transform-typeof-symbol-7.12.13" = { + "@babel/plugin-transform-typeof-symbol-7.14.5" = { name = "_at_babel_slash_plugin-transform-typeof-symbol"; packageName = "@babel/plugin-transform-typeof-symbol"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz"; - sha512 = "eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.14.5.tgz"; + sha512 = "lXzLD30ffCWseTbMQzrvDWqljvZlHkXU+CnseMhkMNqU1sASnCsz3tSzAaH3vCUXb9PHeUb90ZT1BdFTm1xxJw=="; }; }; - "@babel/plugin-transform-typescript-7.14.4" = { + "@babel/plugin-transform-typescript-7.14.5" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.14.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.14.4.tgz"; - sha512 = "WYdcGNEO7mCCZ2XzRlxwGj3PgeAr50ifkofOUC/+IN/GzKLB+biDPVBUAQN2C/dVZTvEXCp80kfQ1FFZPrwykQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.14.5.tgz"; + sha512 = "cFD5PKp4b8/KkwQ7h71FdPXFvz1RgwTFF9akRZwFldb9G0AHf7CgoPx96c4Q/ZVjh6V81tqQwW5YiHws16OzPg=="; }; }; - "@babel/plugin-transform-unicode-escapes-7.12.13" = { + "@babel/plugin-transform-unicode-escapes-7.14.5" = { name = "_at_babel_slash_plugin-transform-unicode-escapes"; packageName = "@babel/plugin-transform-unicode-escapes"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz"; - sha512 = "0bHEkdwJ/sN/ikBHfSmOXPypN/beiGqjo+o4/5K+vxEFNPRPdImhviPakMKG4x96l85emoa0Z6cDflsdBusZbw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.14.5.tgz"; + sha512 = "crTo4jATEOjxj7bt9lbYXcBAM3LZaUrbP2uUdxb6WIorLmjNKSpHfIybgY4B8SRpbf8tEVIWH3Vtm7ayCrKocA=="; }; }; - "@babel/plugin-transform-unicode-regex-7.12.13" = { + "@babel/plugin-transform-unicode-regex-7.14.5" = { name = "_at_babel_slash_plugin-transform-unicode-regex"; packageName = "@babel/plugin-transform-unicode-regex"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz"; - sha512 = "mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.14.5.tgz"; + sha512 = "UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw=="; }; }; "@babel/preset-env-7.12.17" = { @@ -1390,22 +1390,22 @@ let sha512 = "9PMijx8zFbCwTHrd2P4PJR5nWGH3zWebx2OcpTjqQrHhCiL2ssSR2Sc9ko2BsI2VmVBfoaQmPrlMTCui4LmXQg=="; }; }; - "@babel/preset-env-7.14.4" = { + "@babel/preset-env-7.14.5" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.14.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.14.4.tgz"; - sha512 = "GwMMsuAnDtULyOtuxHhzzuSRxFeP0aR/LNzrHRzP8y6AgDNgqnrfCCBm/1cRdTU75tRs28Eh76poHLcg9VF0LA=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.14.5.tgz"; + sha512 = "ci6TsS0bjrdPpWGnQ+m4f+JSSzDKlckqKIJJt9UZ/+g7Zz9k0N8lYU8IeLg/01o2h8LyNZDMLGgRLDTxpudLsA=="; }; }; - "@babel/preset-flow-7.13.13" = { + "@babel/preset-flow-7.14.5" = { name = "_at_babel_slash_preset-flow"; packageName = "@babel/preset-flow"; - version = "7.13.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.13.13.tgz"; - sha512 = "MDtwtamMifqq3R2mC7l3A3uFalUb3NH5TIBQWjN/epEPlZktcLq4se3J+ivckKrLMGsR7H9LW8+pYuIUN9tsKg=="; + url = "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.14.5.tgz"; + sha512 = "pP5QEb4qRUSVGzzKx9xqRuHUrM/jEzMqdrZpdMA+oUCRgd5zM1qGr5y5+ZgAL/1tVv1H0dyk5t4SKJntqyiVtg=="; }; }; "@babel/preset-modules-0.1.4" = { @@ -1417,13 +1417,13 @@ let sha512 = "J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg=="; }; }; - "@babel/preset-react-7.13.13" = { + "@babel/preset-react-7.14.5" = { name = "_at_babel_slash_preset-react"; packageName = "@babel/preset-react"; - version = "7.13.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.13.13.tgz"; - sha512 = "gx+tDLIE06sRjKJkVtpZ/t3mzCDOnPG+ggHZG9lffUbX8+wC739x20YQc9V35Do6ZAxaUc/HhVHIiOzz5MvDmA=="; + url = "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.14.5.tgz"; + sha512 = "XFxBkjyObLvBaAvkx1Ie95Iaq4S/GUEIrejyrntQ/VCMKUYvKLoyKxOBzJ2kjA3b6rC9/KL6KXfDC2GqvLiNqQ=="; }; }; "@babel/preset-stage-0-7.8.3" = { @@ -1453,22 +1453,22 @@ let sha512 = "T513uT4VSThRcmWeqcLkITKJ1oGQho9wfWuhQm10paClQkp1qyd0Wf8mvC8Se7UYssMyRSj4tZYpVTkCmAK/mA=="; }; }; - "@babel/preset-typescript-7.13.0" = { + "@babel/preset-typescript-7.14.5" = { name = "_at_babel_slash_preset-typescript"; packageName = "@babel/preset-typescript"; - version = "7.13.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.13.0.tgz"; - sha512 = "LXJwxrHy0N3f6gIJlYbLta1D9BDtHpQeqwzM0LIfjDlr6UE/D5Mc7W4iDiQzaE+ks0sTjT26ArcHWnJVt0QiHw=="; + url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.14.5.tgz"; + sha512 = "u4zO6CdbRKbS9TypMqrlGH7sd2TAJppZwn3c/ZRLeO/wGsbddxgbPDUZVNrie3JWYLQ9vpineKlsrWFvO6Pwkw=="; }; }; - "@babel/register-7.13.16" = { + "@babel/register-7.14.5" = { name = "_at_babel_slash_register"; packageName = "@babel/register"; - version = "7.13.16"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/register/-/register-7.13.16.tgz"; - sha512 = "dh2t11ysujTwByQjXNgJ48QZ2zcXKQVdV8s0TbeMI0flmtGWCdTwK9tJiACHXPLmncm5+ktNn/diojA45JE4jg=="; + url = "https://registry.npmjs.org/@babel/register/-/register-7.14.5.tgz"; + sha512 = "TjJpGz/aDjFGWsItRBQMOFTrmTI9tr79CHOK+KIvLeCkbxuOAk2M5QHjvruIMGoo9OuccMh5euplPzc5FjAKGg=="; }; }; "@babel/runtime-7.13.9" = { @@ -1480,13 +1480,13 @@ let sha512 = "aY2kU+xgJ3dJ1eU6FMB9EH8dIe8dmusF1xEku52joLvw6eAFN0AI+WxCLDnpev2LEejWBAy2sBvBOBAjI3zmvA=="; }; }; - "@babel/runtime-7.14.0" = { + "@babel/runtime-7.14.5" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.14.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.0.tgz"; - sha512 = "JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.5.tgz"; + sha512 = "121rumjddw9c3NCQ55KGkyE1h/nzWhU/owjhw0l4mQrkzz4x9SGS1X8gFLraHwX7td3Yo4QTL+qj0NcIzN87BA=="; }; }; "@babel/runtime-7.9.0" = { @@ -1498,49 +1498,49 @@ let sha512 = "cTIudHnzuWLS56ik4DnRnqqNf8MkdUzV4iFFI1h7Jo9xvrpQROYaAnaSd2mHLQAzzZAPfATynX5ord6YlNYNMA=="; }; }; - "@babel/runtime-corejs3-7.14.0" = { + "@babel/runtime-corejs3-7.14.5" = { name = "_at_babel_slash_runtime-corejs3"; packageName = "@babel/runtime-corejs3"; - version = "7.14.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.0.tgz"; - sha512 = "0R0HTZWHLk6G8jIk0FtoX+AatCtKnswS98VhXwGImFc759PJRp4Tru0PQYZofyijTFUr+gT8Mu7sgXVJLQ0ceg=="; + url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.5.tgz"; + sha512 = "cBbwXj3F2xjnQJ0ERaFRLjxhUSBYsQPXJ7CERz/ecx6q6hzQ99eTflAPFC3ks4q/IG4CWupNVdflc4jlFBJVsg=="; }; }; - "@babel/standalone-7.14.4" = { + "@babel/standalone-7.14.5" = { name = "_at_babel_slash_standalone"; packageName = "@babel/standalone"; - version = "7.14.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/standalone/-/standalone-7.14.4.tgz"; - sha512 = "oBvBtSdACtNeH2YAg2kyZhfbqfKQK7lgudfHo8IC03JiBrfuvvMlfkBaSrqxrpf9DmUCZJnDZH3uLNVN5QoXog=="; + url = "https://registry.npmjs.org/@babel/standalone/-/standalone-7.14.5.tgz"; + sha512 = "cildg3/P3jk0j+dB+9fJ8Gthrvc9TxhlqvEQXHOn48VpHxGiKZBgBKMJWV5rPJZK5KASSaDYbvdNJOeqYaKf/A=="; }; }; - "@babel/template-7.12.13" = { + "@babel/template-7.14.5" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz"; - sha512 = "/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA=="; + url = "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz"; + sha512 = "6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g=="; }; }; - "@babel/traverse-7.14.2" = { + "@babel/traverse-7.14.5" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.14.2"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.2.tgz"; - sha512 = "TsdRgvBFHMyHOOzcP9S6QU0QQtjxlRpEYOy3mcCO5RgmC305ki42aSAmfZEMSSYBla2oZ9BMqYlncBaKmD/7iA=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.5.tgz"; + sha512 = "G3BiS15vevepdmFqmUc9X+64y0viZYygubAMO8SvBmKARuF6CPSZtH4Ng9vi/lrWlZFGe3FWdXNy835akH8Glg=="; }; }; - "@babel/types-7.14.4" = { + "@babel/types-7.14.5" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.14.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.14.4.tgz"; - sha512 = "lCj4aIs0xUefJFQnwwQv2Bxg7Omd6bgquZ6LGC+gGMh6/s5qDVfjuCMlDmYQ15SLsWHd9n+X3E75lKIhl5Lkiw=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.14.5.tgz"; + sha512 = "M/NzBpEL95I5Hh4dwhin5JlE7EzO5PHMAuzjxss3tiOBD46KfQvVedN/3jEPZvdRvtsK2222XfdHogNIttFgcg=="; }; }; "@braintree/sanitize-url-3.1.0" = { @@ -1606,13 +1606,13 @@ let sha512 = "htzFO1Zc57S8kgdRK9mLcPVTW1BY2ijfH7Dk2CeZmspTWKdKqSo1iwmqrq2WtRjFlo8aRZYgLX0wFrDXF/9DLA=="; }; }; - "@cdktf/hcl2json-0.4.0" = { + "@cdktf/hcl2json-0.4.1" = { name = "_at_cdktf_slash_hcl2json"; packageName = "@cdktf/hcl2json"; - version = "0.4.0"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.4.0.tgz"; - sha512 = "etFW1+DoAwQ7ENtdvpuKxmosJDDJ2rnQUDkJPZnNIqLUAXcGG3MdU6PWTnLQX/xwDMQq7xfCZlDK/hrV7g2rhA=="; + url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.4.1.tgz"; + sha512 = "yabxBeKkCJvj3gFQmHfsS/P6JaQMBqbyEZ1G67gTCtfkbOSEGib8KWsl3ZA+u5Fs2z5q9M4emLcCBHHPrmSG3g=="; }; }; "@chemzqm/neovim-5.2.13" = { @@ -2011,13 +2011,13 @@ let sha512 = "OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="; }; }; - "@eslint/eslintrc-0.4.1" = { + "@eslint/eslintrc-0.4.2" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; - version = "0.4.1"; + version = "0.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.1.tgz"; - sha512 = "5v7TDE9plVhvxQeWLXDTvFvJBdH6pEsdnl2g/dAptmuFEPedQ4Erq5rsDsX+mvAM610IhNaO2W5V1dOOnDKxkQ=="; + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.2.tgz"; + sha512 = "8nmGq/4ycLpIwzvhI4tNDmQztZ8sp+hI7cyG8i1nQDhkAbRzHpXPidRAHlNvCZQpJTKw5ItIpMw9RSToGF00mg=="; }; }; "@exodus/schemasafe-1.0.0-rc.3" = { @@ -2218,13 +2218,13 @@ let sha512 = "8Q4sH+KBgM9jsH7Dp0A5lEmGiKvBXNcax2H6k8i54vfptaUh8gBZqohGuLshzeTJYT43I3LDulheOGr83yNB3g=="; }; }; - "@expo/xcpretty-2.0.1" = { + "@expo/xcpretty-2.0.2" = { name = "_at_expo_slash_xcpretty"; packageName = "@expo/xcpretty"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/xcpretty/-/xcpretty-2.0.1.tgz"; - sha512 = "fyQbzvZpLiKpx68QDzeLlL1AtFhhEW35dqxIqb4QQ6e3iofu57NdWBQTmIAQzDOPcNNXUR9SFncu3M4iyWwQ7Q=="; + url = "https://registry.npmjs.org/@expo/xcpretty/-/xcpretty-2.0.2.tgz"; + sha512 = "c5e+tj8XG7xHE4ohQhgVx3b6cq0ePTOfbZ5a2bLrF4QGLeCJ92bBBZ+LkcHFHbwngQBe20w9pqMqJGD/C5ZAEg=="; }; }; "@fast-csv/format-4.3.5" = { @@ -2272,13 +2272,13 @@ let sha512 = "iT1bU56rKrKEOfODoW6fScY11qj3iaYrZ+z11T6fo5+TDm84UGkkXjLXJTE57ZJzg0/gbccHQWYv+chY7bJN8Q=="; }; }; - "@fluentui/react-7.170.1" = { + "@fluentui/react-7.170.3" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.170.1"; + version = "7.170.3"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.170.1.tgz"; - sha512 = "v43+TQ+zcjzW3vPOebIIUQpj4j1p4McDVwrVGplUmIVgxXPg9wBvXGB0CcBvpaFRZq6tKG95uUdanRsEStBMxQ=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.170.3.tgz"; + sha512 = "PTXyeYuBCLhdT8SzlBKNOeejuJST5G7IxNgAXgdHayipJRa3gNYoE8kbWbGr64sQatQPDDYastVl8iSLe6B9Hw=="; }; }; "@fluentui/react-focus-7.17.6" = { @@ -2326,13 +2326,13 @@ let sha512 = "+SDJ3ZvGkF7hzo6BGa8ZqeK3F6Z4+S+KviC9oOK+XCs3tfMyJCh/4j93XIWINgMMDIh9BgEvlw4306VxlXIlYA=="; }; }; - "@google-cloud/projectify-2.0.1" = { + "@google-cloud/projectify-2.1.0" = { name = "_at_google-cloud_slash_projectify"; packageName = "@google-cloud/projectify"; - version = "2.0.1"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-2.0.1.tgz"; - sha512 = "ZDG38U/Yy6Zr21LaR3BTiiLtpJl6RkPS/JwoRT453G+6Q1DhlV0waNf8Lfu+YVYGIIxgKnLayJRfYlFJfiI8iQ=="; + url = "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-2.1.0.tgz"; + sha512 = "qbpidP/fOvQNz3nyabaVnZqcED1NNzf7qfeOlgtAZd9knTwY+KtsGRkYpiQzcATABy4gnGP2lousM3S0nuWVzA=="; }; }; "@google-cloud/promisify-2.0.3" = { @@ -2344,13 +2344,13 @@ let sha512 = "d4VSA86eL/AFTe5xtyZX+ePUjE8dIFu2T8zmdeNBSa5/kNgXPCx/o/wbFNHAGLJdGnk1vddRuMESD9HbOC8irw=="; }; }; - "@google-cloud/pubsub-2.12.0" = { + "@google-cloud/pubsub-2.13.0" = { name = "_at_google-cloud_slash_pubsub"; packageName = "@google-cloud/pubsub"; - version = "2.12.0"; + version = "2.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.12.0.tgz"; - sha512 = "SF+y7sKX9Jo2ZoVqzwEuSReUyb6O4mwxzxP1B+dP3j0ArUk0XXSC/tFLQhYM7lC2ViLxGWoIbEZbRIw8SrIQnw=="; + url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.13.0.tgz"; + sha512 = "DXR/mYbGDUxCoLOT9FhOUrnYcsEEL2am6GMc5GWQf6nqCEH25OxTZJccZ/7xg5UMkDhSWmDcbmtDyAjcPwEN1g=="; }; }; "@graphql-cli/common-4.1.0" = { @@ -2488,24 +2488,6 @@ let sha512 = "DZqx3nHBm2OGY7NKq4sppDEfx4nBAsQH/d/H/yxo/+BwpVLWLGs+OorpwQ+Fqd6EgpDEoi4MhqndjGUeLl/5GA=="; }; }; - "@grpc/grpc-js-1.2.12" = { - name = "_at_grpc_slash_grpc-js"; - packageName = "@grpc/grpc-js"; - version = "1.2.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.2.12.tgz"; - sha512 = "+gPCklP1eqIgrNPyzddYQdt9+GvZqPlLpIjIo+TveE+gbtp74VV1A2ju8ExeO8ma8f7MbpaGZx/KJPYVWL9eDw=="; - }; - }; - "@grpc/grpc-js-1.3.1" = { - name = "_at_grpc_slash_grpc-js"; - packageName = "@grpc/grpc-js"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.3.1.tgz"; - sha512 = "zyFq9eW0U4vGyhJS/oeW3mIeKTzB13we9rBclcisfRHxGQbC9FCOKQ5BBA2129yZwRVMt4hQia1igGzECeuY9g=="; - }; - }; "@grpc/grpc-js-1.3.2" = { name = "_at_grpc_slash_grpc-js"; packageName = "@grpc/grpc-js"; @@ -2524,24 +2506,6 @@ let sha512 = "DT14xgw3PSzPxwS13auTEwxhMMOoz33DPUKNtmYK/QYbBSpLXJy78FGGs5yVoxVobEqPm4iW9MOIoz0A3bLTRQ=="; }; }; - "@grpc/proto-loader-0.6.0" = { - name = "_at_grpc_slash_proto-loader"; - packageName = "@grpc/proto-loader"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.0.tgz"; - sha512 = "JwWZwGuN1nQuPdeL1d94hNGtnRtiOuy+SkdVUU8IwwQzksvdWvgKHyGDCesvAD0tndQTm1YUZHJw+JDTIDALyQ=="; - }; - }; - "@grpc/proto-loader-0.6.1" = { - name = "_at_grpc_slash_proto-loader"; - packageName = "@grpc/proto-loader"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.1.tgz"; - sha512 = "4DIvEOZhw5nGj3RQngIoiMXRsre3InEH136krZTcirs/G2em3WMXdtx4Lqlnb4E2ertbWGs5gPeVDKU5BHffXw=="; - }; - }; "@grpc/proto-loader-0.6.2" = { name = "_at_grpc_slash_proto-loader"; packageName = "@grpc/proto-loader"; @@ -3820,13 +3784,13 @@ let sha512 = "W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA=="; }; }; - "@microsoft/load-themed-styles-1.10.174" = { + "@microsoft/load-themed-styles-1.10.181" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.174"; + version = "1.10.181"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.174.tgz"; - sha512 = "O0ERVgeTrpzCzCLHOTZZDSg0K3FKdWRdBpFjs+X5wS21Jg21QqrA4T9FhCheilEcrF4Qmf41gBtgZ/16JNSWIA=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.181.tgz"; + sha512 = "HkABSVIAL+ulsDMy7s28rwhvl0ODq4QF/KvFwRngZJRPBKNjpcf1uFLCluBcEngnl4LSArCCuM7ozND7t8CMDA=="; }; }; "@mitmaro/errors-1.0.0" = { @@ -3874,6 +3838,15 @@ let sha512 = "Vwhc3ObxmDZmA5hY8mfsau2rJ4vGPvzbj20QSZ2/E1GDPF61QVyjLfNHak9xmel6pW4heRt3v1fHa6np9Ehfeg=="; }; }; + "@msgpack/msgpack-2.7.0" = { + name = "_at_msgpack_slash_msgpack"; + packageName = "@msgpack/msgpack"; + version = "2.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@msgpack/msgpack/-/msgpack-2.7.0.tgz"; + sha512 = "mlRYq9FSsOd4m+3wZWatemn3hGFZPWNJ4JQOdrir4rrMK2PyIk26idKBoUWrqF3HJJHl+5GpRU+M0wEruJwecg=="; + }; + }; "@nestjs/schematics-7.3.1" = { name = "_at_nestjs_slash_schematics"; packageName = "@nestjs/schematics"; @@ -3892,13 +3865,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-11.29.2" = { + "@netlify/build-12.1.0" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "11.29.2"; + version = "12.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-11.29.2.tgz"; - sha512 = "fxVBpKjsTdcRkfj9RdMBVxy/TABQJhkf5/vFwzNZqnnBwes/Em6YFutNpML6zm5Ub9hpvE0HaceyOU4HkvjSFg=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-12.1.0.tgz"; + sha512 = "DvKkNgfwzrQc3lFHJjHfoX7/l2qNd5F6i8urIEthYCH98SLMKrwuCcw3MSkgcmVKI4e+YE0H2PF2MiWWgQ+WLw=="; }; }; "@netlify/cache-utils-1.0.7" = { @@ -3910,31 +3883,40 @@ let sha512 = "yrdrnQkzg/qMovoFYwQ24UVt/OyHtP+t0KpQFd7eBl6gnuuGGgxFocaFFv6eKpMVwzHTsOwx/y9B/FcC3/6cfA=="; }; }; - "@netlify/config-6.7.1" = { + "@netlify/config-7.2.0" = { name = "_at_netlify_slash_config"; packageName = "@netlify/config"; - version = "6.7.1"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/config/-/config-7.2.0.tgz"; + sha512 = "bxjAO6EvROkDtHZtaJg6phiZnR+cXYDTrlsrws9uOV5fuwT2hN0+82ICxUw5dSv+PHnz36nKqJCaC2F2J459Vw=="; + }; + }; + "@netlify/esbuild-0.13.5" = { + name = "_at_netlify_slash_esbuild"; + packageName = "@netlify/esbuild"; + version = "0.13.5"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-6.7.1.tgz"; - sha512 = "4DyiSauSFaorJ46l4tBu+nbvPKY9i1gOQvw9L4yql7gd7qqJsHJi2zivdJ50+MPedQn0cgcs5lk303UBEfFsBQ=="; + url = "https://registry.npmjs.org/@netlify/esbuild/-/esbuild-0.13.5.tgz"; + sha512 = "412V+fUhQagmQ6gw/SqvFU1Gi06n+7M9Rug6+Fr4Qzpiq7To2iMS0myYOyyFs1UfmVM6a3erXKfhPQsBzo4CQQ=="; }; }; - "@netlify/framework-info-5.1.2" = { + "@netlify/framework-info-5.1.4" = { name = "_at_netlify_slash_framework-info"; packageName = "@netlify/framework-info"; - version = "5.1.2"; + version = "5.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-5.1.2.tgz"; - sha512 = "v3Fs9REofVNMgye8j1c0NBfVRA+P+2cS50Y1RRwrlVz344UUwZd7b0LKhZl0EkQadsdyxG2a3XgjxF5Zb3jJ0Q=="; + url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-5.1.4.tgz"; + sha512 = "u995zzabQ+L6MKSNw4oVsN4wXiPfgN2Cb20yxC+7lmsRJWXdaEVHh9CASc7UmTrXELGXIAROS16+vlHv63fZ7A=="; }; }; - "@netlify/functions-utils-1.3.37" = { + "@netlify/functions-utils-1.3.40" = { name = "_at_netlify_slash_functions-utils"; packageName = "@netlify/functions-utils"; - version = "1.3.37"; + version = "1.3.40"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.3.37.tgz"; - sha512 = "Lq1Aj3N2vWB3nNFRbEHgVjB+MpwCsZz+rUOCki3h5PwEUwnGFyFi2VcdHQ2FJtzF7vrcm5NoMfg4pG8iY91YGA=="; + url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.3.40.tgz"; + sha512 = "H7+rB6VJOzzFSniUSv98ZSSydd5SfZlbEcxNPbVpXrl8WAcK7GlmIBfXCpyVzVjbflecxSdVhZC2i6isHDN4zA=="; }; }; "@netlify/git-utils-1.0.11" = { @@ -3946,31 +3928,40 @@ let sha512 = "bvlvFAB9VU3wTYYEEUinsOeRFxZ/MmetffzHehSMEyP00kXakvrySq4XbC6G8u3wCDln34eOjKDt8uPYoqfuNQ=="; }; }; - "@netlify/open-api-2.4.0" = { + "@netlify/open-api-2.5.0" = { name = "_at_netlify_slash_open-api"; packageName = "@netlify/open-api"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/open-api/-/open-api-2.4.0.tgz"; - sha512 = "ffNpGiJulY4is1pWkrs1dn3/ytNoqJxyAD/N70cnkIVNpOWMnPGSPKGBk/TBpaZhispgSBBQ+JZXEMJAGMDZ6Q=="; + url = "https://registry.npmjs.org/@netlify/open-api/-/open-api-2.5.0.tgz"; + sha512 = "KiXfYPO/X24p7EYQjcjBTizoyfY3U8zPv68Rte0EtayW2ZSqIslLLpNNd2gteqdh0Q83mzSiESdhlQHd0Ckjjg=="; }; }; - "@netlify/plugin-edge-handlers-1.11.13" = { + "@netlify/plugin-edge-handlers-1.11.16" = { name = "_at_netlify_slash_plugin-edge-handlers"; packageName = "@netlify/plugin-edge-handlers"; - version = "1.11.13"; + version = "1.11.16"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.11.13.tgz"; - sha512 = "GPSg5bYlU2hgmt1MGx22+ZoXbPdnEiqkdj40hWxJjHuDIGqfvFa3nGup7BvHBNfd1uI+OVSlLXzabWl6aVjQIg=="; + url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.11.16.tgz"; + sha512 = "f9a2G4z9PY5nh2UClLuY8+j+kNa38CuDFPDdf63vEfy1Dt/ICrWpbfTOhwknd6BrPgZ3lu477joRankm19dPMQ=="; }; }; - "@netlify/plugins-list-2.14.2" = { + "@netlify/plugins-list-2.15.0" = { name = "_at_netlify_slash_plugins-list"; packageName = "@netlify/plugins-list"; - version = "2.14.2"; + version = "2.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-2.15.0.tgz"; + sha512 = "UOkQGvLjy5XDQsVpaaur/QOTPCXS6xCIbMWRYgboEH/BtMNh7ATv7fkF1kQgrJ1+hdguWzRYhww8/4A+G/kcxw=="; + }; + }; + "@netlify/routing-local-proxy-0.30.0" = { + name = "_at_netlify_slash_routing-local-proxy"; + packageName = "@netlify/routing-local-proxy"; + version = "0.30.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-2.14.2.tgz"; - sha512 = "WbLQ0X1cnryXzWeV03dA3BHw0CEPDTrj3IvjbeOB45A5/dxvTgQVjAeFbmqgRj6A8GPHgSLoNN0kteoXBojHhw=="; + url = "https://registry.npmjs.org/@netlify/routing-local-proxy/-/routing-local-proxy-0.30.0.tgz"; + sha512 = "603JAYirKZOse+wzAdHwudvWUCGe7nqu5pOVVIa562AV3YhNgZU4sPPKFUcRSXn3QFgyhUSxnNHOabs62IWhrg=="; }; }; "@netlify/run-utils-1.0.7" = { @@ -3982,49 +3973,22 @@ let sha512 = "YFi1Sf+ktQICS3tAKu7/uiGzLXgi8RNVwH9naUkziXwXQNH2oxDhKgy0/Zv5Nw0zMDJyKWrJ3xObWEC57mJ/KA=="; }; }; - "@netlify/traffic-mesh-agent-0.27.10" = { - name = "_at_netlify_slash_traffic-mesh-agent"; - packageName = "@netlify/traffic-mesh-agent"; - version = "0.27.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent/-/traffic-mesh-agent-0.27.10.tgz"; - sha512 = "HZXEdIXzg8CpysYRDVXkBpmjOj/C8Zb8Q/qkkt9x+npJ56HeX6sXAE4vK4SMCRLkkbQ2VyYTaDKg++GefeB2Gg=="; - }; - }; - "@netlify/traffic-mesh-agent-darwin-x64-0.27.10" = { - name = "_at_netlify_slash_traffic-mesh-agent-darwin-x64"; - packageName = "@netlify/traffic-mesh-agent-darwin-x64"; - version = "0.27.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-darwin-x64/-/traffic-mesh-agent-darwin-x64-0.27.10.tgz"; - sha512 = "j2blCh3TKNV35VPF9Zf/LM3v6pH/gz/Y7uu/78RLbgNvCW0vGN7b1GgFnXQKwrvbL6tRGumJS2P5PWUfEsKOBA=="; - }; - }; - "@netlify/traffic-mesh-agent-linux-x64-0.27.10" = { - name = "_at_netlify_slash_traffic-mesh-agent-linux-x64"; - packageName = "@netlify/traffic-mesh-agent-linux-x64"; - version = "0.27.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-linux-x64/-/traffic-mesh-agent-linux-x64-0.27.10.tgz"; - sha512 = "JdeGT356TtqbxY6IjsS+wik68V0iNGdRsGV4cYOx/aAfclAyZ9DL29A4nzobyq5J+s5binrbKpix26/WKi+sqA=="; - }; - }; - "@netlify/traffic-mesh-agent-win32-x64-0.27.10" = { - name = "_at_netlify_slash_traffic-mesh-agent-win32-x64"; - packageName = "@netlify/traffic-mesh-agent-win32-x64"; - version = "0.27.10"; + "@netlify/zip-it-and-ship-it-4.2.7" = { + name = "_at_netlify_slash_zip-it-and-ship-it"; + packageName = "@netlify/zip-it-and-ship-it"; + version = "4.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-win32-x64/-/traffic-mesh-agent-win32-x64-0.27.10.tgz"; - sha512 = "ea6S9ik5X0TlA2e+jXk5D7lfvArPZjyQoIBEo7G1Tjw/vUU5Fx6KLfXv1iy7eJy+ENTLoyidscAjJ2wXlHI47g=="; + url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.2.7.tgz"; + sha512 = "7RDPHByyberzRWpQ5PTQZOWWXGH4mqggPDCgj58vDsgIffF+GeG+pZBPv4ZOGCPPb2INZbG0iTiJFvAHictKew=="; }; }; - "@netlify/zip-it-and-ship-it-4.2.5" = { + "@netlify/zip-it-and-ship-it-4.3.0" = { name = "_at_netlify_slash_zip-it-and-ship-it"; packageName = "@netlify/zip-it-and-ship-it"; - version = "4.2.5"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.2.5.tgz"; - sha512 = "2ncCQEs49I8Ir30w2T3E1yogJp9cw+X8vfvL9a8i1AA0VE51F2rfhNsLbceWrEWn2T3TgogOMQP/0Qsxw2v0Tg=="; + url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.3.0.tgz"; + sha512 = "SrI3AFL57IhhQiBgllCj2PMgRlY/b7iA1h0mym9EItduV98+3wmmyXDKTxJtxu2dE0QNUG2J8uiXmCncVAqv6g=="; }; }; "@node-red/editor-api-1.3.5" = { @@ -4081,13 +4045,13 @@ let sha512 = "1TTvTwvGMSe9SQMEKN5zGdyGMv8Kth49eiUcdPnUWigtafk1BE9iP7gVSyLVYgijzCwh40GUkSYey0TUaSbRBw=="; }; }; - "@nodelib/fs.scandir-2.1.4" = { + "@nodelib/fs.scandir-2.1.5" = { name = "_at_nodelib_slash_fs.scandir"; packageName = "@nodelib/fs.scandir"; - version = "2.1.4"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz"; - sha512 = "33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA=="; + url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"; + sha512 = "vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g=="; }; }; "@nodelib/fs.stat-1.1.3" = { @@ -4099,31 +4063,31 @@ let sha512 = "shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="; }; }; - "@nodelib/fs.stat-2.0.4" = { + "@nodelib/fs.stat-2.0.5" = { name = "_at_nodelib_slash_fs.stat"; packageName = "@nodelib/fs.stat"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz"; - sha512 = "IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q=="; + url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"; + sha512 = "RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="; }; }; - "@nodelib/fs.walk-1.2.6" = { + "@nodelib/fs.walk-1.2.7" = { name = "_at_nodelib_slash_fs.walk"; packageName = "@nodelib/fs.walk"; - version = "1.2.6"; + version = "1.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz"; - sha512 = "8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow=="; + url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.7.tgz"; + sha512 = "BTIhocbPBSrRmHxOAJFtR18oLhxTtAFDAvL8hY1S3iU8k+E60W/YFs4jrixGzQjMpF4qPXxIQHcjVD9dz1C2QA=="; }; }; - "@npmcli/arborist-2.6.1" = { + "@npmcli/arborist-2.6.2" = { name = "_at_npmcli_slash_arborist"; packageName = "@npmcli/arborist"; - version = "2.6.1"; + version = "2.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/arborist/-/arborist-2.6.1.tgz"; - sha512 = "OOlntFIOAo7RplEQaYXlA5U5NXE+EwZtnTCsit4Wtme5+llGiea6GBytuV8dOzdPMPlNx3fQQjBUE9E8k76yjQ=="; + url = "https://registry.npmjs.org/@npmcli/arborist/-/arborist-2.6.2.tgz"; + sha512 = "CAo0HSziRdlpGUUheERmOrADnKHfBYpLAl/HmWGwGCtWKB3BCxfgb0rJ7MsFg38wy7YF3+fDs7R9dMVCH89K/A=="; }; }; "@npmcli/ci-detect-1.3.0" = { @@ -4342,40 +4306,40 @@ let sha512 = "BpGYsPgJt05M7/L/5FoE1PiAbdxXFZkX/3kDYcsvd1v6UhlnE5e96dTDr0ezX/EFwciQxf3cNV0loipsURU+WA=="; }; }; - "@octokit/core-3.4.0" = { + "@octokit/core-3.5.0" = { name = "_at_octokit_slash_core"; packageName = "@octokit/core"; - version = "3.4.0"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/core/-/core-3.4.0.tgz"; - sha512 = "6/vlKPP8NF17cgYXqucdshWqmMZGXkuvtcrWCgU5NOI0Pl2GjlmZyWgBMrU8zJ3v2MJlM6++CiB45VKYmhiWWg=="; + url = "https://registry.npmjs.org/@octokit/core/-/core-3.5.0.tgz"; + sha512 = "IKcyllVQe6KPwPPFIaKdbhNNQhmmHIj69PXOseBF6/NglXoKHVe79syEfZj0bz7sP87MOl5jLZadV3slgdZ1vQ=="; }; }; - "@octokit/endpoint-6.0.11" = { + "@octokit/endpoint-6.0.12" = { name = "_at_octokit_slash_endpoint"; packageName = "@octokit/endpoint"; - version = "6.0.11"; + version = "6.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.11.tgz"; - sha512 = "fUIPpx+pZyoLW4GCs3yMnlj2LfoXTWDUVPTC4V3MUEKZm48W+XYpeWSZCv+vYF1ZABUm2CqnDVf1sFtIYrj7KQ=="; + url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.12.tgz"; + sha512 = "lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA=="; }; }; - "@octokit/graphql-4.6.2" = { + "@octokit/graphql-4.6.4" = { name = "_at_octokit_slash_graphql"; packageName = "@octokit/graphql"; - version = "4.6.2"; + version = "4.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.6.2.tgz"; - sha512 = "WmsIR1OzOr/3IqfG9JIczI8gMJUMzzyx5j0XXQ4YihHtKlQc+u35VpVoOXhlKAlaBntvry1WpAzPl/a+s3n89Q=="; + url = "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.6.4.tgz"; + sha512 = "SWTdXsVheRmlotWNjKzPOb6Js6tjSqA2a8z9+glDJng0Aqjzti8MEWOtuT8ZSu6wHnci7LZNuarE87+WJBG4vg=="; }; }; - "@octokit/openapi-types-7.2.3" = { + "@octokit/openapi-types-7.3.2" = { name = "_at_octokit_slash_openapi-types"; packageName = "@octokit/openapi-types"; - version = "7.2.3"; + version = "7.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-7.2.3.tgz"; - sha512 = "V1ycxkR19jqbIl3evf2RQiMRBvTNRi+Iy9h20G5OP5dPfEF6GJ1DPlUeiZRxo2HJxRr+UA4i0H1nn4btBDPFrw=="; + url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-7.3.2.tgz"; + sha512 = "oJhK/yhl9Gt430OrZOzAl2wJqR0No9445vmZ9Ey8GjUZUpwuu/vmEFP0TDhDXdpGDoxD6/EIFHJEcY8nHXpDTA=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -4387,22 +4351,22 @@ let sha512 = "93uGjlhUD+iNg1iWhUENAtJata6w5nE+V4urXOAlIXdco6xNZtUSfYY8dzp3Udy74aqO/B5UZL80x/YMa5PKRw=="; }; }; - "@octokit/plugin-paginate-rest-2.13.3" = { + "@octokit/plugin-paginate-rest-2.13.5" = { name = "_at_octokit_slash_plugin-paginate-rest"; packageName = "@octokit/plugin-paginate-rest"; - version = "2.13.3"; + version = "2.13.5"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.13.3.tgz"; - sha512 = "46lptzM9lTeSmIBt/sVP/FLSTPGx6DCzAdSX3PfeJ3mTf4h9sGC26WpaQzMEq/Z44cOcmx8VsOhO+uEgE3cjYg=="; + url = "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.13.5.tgz"; + sha512 = "3WSAKBLa1RaR/7GG+LQR/tAZ9fp9H9waE9aPXallidyci9oZsfgsLn5M836d3LuDC6Fcym+2idRTBpssHZePVg=="; }; }; - "@octokit/plugin-request-log-1.0.3" = { + "@octokit/plugin-request-log-1.0.4" = { name = "_at_octokit_slash_plugin-request-log"; packageName = "@octokit/plugin-request-log"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.3.tgz"; - sha512 = "4RFU4li238jMJAzLgAwkBAw+4Loile5haQMQr+uhFq27BmyJXcXSKvoQKqh0agsZEiUlW6iSv3FAgvmGkur7OQ=="; + url = "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz"; + sha512 = "mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA=="; }; }; "@octokit/plugin-rest-endpoint-methods-5.3.1" = { @@ -4414,40 +4378,40 @@ let sha512 = "3B2iguGmkh6bQQaVOtCsS0gixrz8Lg0v4JuXPqBcFqLKuJtxAUf3K88RxMEf/naDOI73spD+goJ/o7Ie7Cvdjg=="; }; }; - "@octokit/request-5.4.15" = { + "@octokit/request-5.6.0" = { name = "_at_octokit_slash_request"; packageName = "@octokit/request"; - version = "5.4.15"; + version = "5.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request/-/request-5.4.15.tgz"; - sha512 = "6UnZfZzLwNhdLRreOtTkT9n57ZwulCve8q3IT/Z477vThu6snfdkBuhxnChpOKNGxcQ71ow561Qoa6uqLdPtag=="; + url = "https://registry.npmjs.org/@octokit/request/-/request-5.6.0.tgz"; + sha512 = "4cPp/N+NqmaGQwbh3vUsYqokQIzt7VjsgTYVXiwpUP2pxd5YiZB2XuTedbb0SPtv9XS7nzAKjAuQxmY8/aZkiA=="; }; }; - "@octokit/request-error-2.0.5" = { + "@octokit/request-error-2.1.0" = { name = "_at_octokit_slash_request-error"; packageName = "@octokit/request-error"; - version = "2.0.5"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.5.tgz"; - sha512 = "T/2wcCFyM7SkXzNoyVNWjyVlUwBvW3igM3Btr/eKYiPmucXTtkxt2RBsf6gn3LTzaLSLTQtNmvg+dGsOxQrjZg=="; + url = "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.1.0.tgz"; + sha512 = "1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg=="; }; }; - "@octokit/rest-18.5.5" = { + "@octokit/rest-18.6.0" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; - version = "18.5.5"; + version = "18.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.5.5.tgz"; - sha512 = "Py9sWvxBGeAwNY8UnhxP6jnq7aflvQ0uQ6gmZObyJLR9hmd5NEz9piu/A77cxV6+0l9UNACJVXX6FOnl5LIcPw=="; + url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.6.0.tgz"; + sha512 = "MdHuXHDJM7e5sUBe3K9tt7th0cs4csKU5Bb52LRi2oHAeIMrMZ4XqaTrEv660HoUPoM1iDlnj27Ab/Nh3MtwlA=="; }; }; - "@octokit/types-6.16.2" = { + "@octokit/types-6.16.4" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "6.16.2"; + version = "6.16.4"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-6.16.2.tgz"; - sha512 = "wWPSynU4oLy3i4KGyk+J1BLwRKyoeW2TwRHgwbDz17WtVFzSK2GOErGliruIx8c+MaYtHSYTx36DSmLNoNbtgA=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-6.16.4.tgz"; + sha512 = "UxhWCdSzloULfUyamfOg4dJxV9B+XjgrIZscI0VCbp4eNrjmorGEw+4qdwcpTsu6DIrm9tQsFQS2pK5QkqQ04A=="; }; }; "@open-policy-agent/opa-wasm-1.2.0" = { @@ -4504,310 +4468,310 @@ let sha512 = "+0P+PrP9qSFVaayNdek4P1OAGE+PEl2SsufuHDRmUpOY25Wzjo7Atyar56Trjc32jkNy4lID6ZFT6BahsR9P9A=="; }; }; - "@ot-builder/bin-composite-types-1.0.8" = { + "@ot-builder/bin-composite-types-1.0.9" = { name = "_at_ot-builder_slash_bin-composite-types"; packageName = "@ot-builder/bin-composite-types"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.0.8.tgz"; - sha512 = "YVSC2OhhBYx4nTELZrS/DKbdseDhCIlyMiey4Zgc6VKQgC33ZXaGB9gUnAT/CHuGJINQJoKtsgyRA3nkd+2QJw=="; + url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.0.9.tgz"; + sha512 = "ErKiMoPa3CdguITg/k/k5rm/Or+O1MwzadX3knibqu4QGbOmPco1/uS4BOShKriC9frJnnN9AYOT9w9quvKZQg=="; }; }; - "@ot-builder/bin-util-1.0.8" = { + "@ot-builder/bin-util-1.0.9" = { name = "_at_ot-builder_slash_bin-util"; packageName = "@ot-builder/bin-util"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.0.8.tgz"; - sha512 = "GkyOMuUD3AQGCguvyaAgraEc7DMsKAHoujFPSUN76h6C9LUYGmayCDsbHjZoInkb90+m2OXcZ9hqSCIThZ6dcA=="; + url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.0.9.tgz"; + sha512 = "NAf0soBY4KkejHFuq5Q9R5cebzbD5e22cPlZGS+gXF1a5zRfuLdXbmMv6XXlca8z7zHF8jfaCbZtqqP1xrWLZg=="; }; }; - "@ot-builder/cli-help-shower-1.0.8" = { + "@ot-builder/cli-help-shower-1.0.9" = { name = "_at_ot-builder_slash_cli-help-shower"; packageName = "@ot-builder/cli-help-shower"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.0.8.tgz"; - sha512 = "MXbzoFtpSbU9eQozzynlEPRjUBDbtDq187SylpYIeV7FARfkaKd7f8M6FDH+gqeNMeAUcivnMYifAC+nz8bWOA=="; + url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.0.9.tgz"; + sha512 = "NoYTfWa1OhhRn2qluLbh/3IbWXuXqclBrXBp5lbkp5Wz4yf25m8KHJgqMwIm2wnhKP2v4xj8lzKCp/Jn1+QL5A=="; }; }; - "@ot-builder/cli-proc-1.0.8" = { + "@ot-builder/cli-proc-1.0.9" = { name = "_at_ot-builder_slash_cli-proc"; packageName = "@ot-builder/cli-proc"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.0.8.tgz"; - sha512 = "kOGCHlc7cSI8J24gCRHXNbl4IvsjdorRUX9L3HtDDH9pVpHqVrlb3X2opcNVtPo0kYbKidANEGf76c/WRi0ERQ=="; + url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.0.9.tgz"; + sha512 = "g8xX/y6Z0LtvLvLAx5rZY8P3dfmhSm/EiWlKOnf2Cz36IqGgYwaihicPc0ONSNki81bseRgC6j/uXTd0+UxZTw=="; }; }; - "@ot-builder/cli-shared-1.0.8" = { + "@ot-builder/cli-shared-1.0.9" = { name = "_at_ot-builder_slash_cli-shared"; packageName = "@ot-builder/cli-shared"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.0.8.tgz"; - sha512 = "B5c0RqrRkB8gb7h0+mX+JQAP6I8TtnLD8JiYRGMo+JszI2anh7ecD3XbVgMF0oJi8e5r5+p0xq8sDrJi4qy9SQ=="; + url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.0.9.tgz"; + sha512 = "rf9ebY8WJqyafdOKjmdWOBfSofiDl9PxhahlgJk+k+IK37sjd/QXOSqB6UEGlx2dJhlVnoJAg5lmRxS/5ent0w=="; }; }; - "@ot-builder/common-impl-1.0.8" = { + "@ot-builder/common-impl-1.0.9" = { name = "_at_ot-builder_slash_common-impl"; packageName = "@ot-builder/common-impl"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.0.8.tgz"; - sha512 = "ho7WtOf+MiMq6jjF6LbepqTTnyzEv6OeNTT1erkdWb52QETZnINYtbMks/HVPYHnGMZqy62dmN8f1PSe74yD0A=="; + url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.0.9.tgz"; + sha512 = "QuR3zXvgxLbNqoQuyX1rBqG3bcSsAVfV2JuXwKyuLY5MlNELq8luUJPjZRtLdmtAuWUU7waVrAUUlSjyf7A+lg=="; }; }; - "@ot-builder/errors-1.0.8" = { + "@ot-builder/errors-1.0.9" = { name = "_at_ot-builder_slash_errors"; packageName = "@ot-builder/errors"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.0.8.tgz"; - sha512 = "I8XzcO4tg8rWKFTS3nHKvPOE27uGH8fZLy9HsqU4yw8rGMYUo1EDxabReQ8v53DhrIlpbObW3/nSrGF4LT6m8Q=="; + url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.0.9.tgz"; + sha512 = "r9e+NfOipls5xztugHKtLEq/lsrBtKp+xWa9+7T3foP2u4mjn+/PubghbH7AxOVQH66Dj08MaGUqyKEH2N2KwQ=="; }; }; - "@ot-builder/io-bin-cff-1.0.8" = { + "@ot-builder/io-bin-cff-1.0.9" = { name = "_at_ot-builder_slash_io-bin-cff"; packageName = "@ot-builder/io-bin-cff"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.0.8.tgz"; - sha512 = "rHp9PFGeoblPwuCZd/i5l/CgNGv9hWEDQHZP11uQcO45H83iZugVxaT65ChBHoKDFp5x/+oxLSxp6kMu/7diZg=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.0.9.tgz"; + sha512 = "Y3cWdNk/wX1SMdn+BaNsayrGN/DopufEdgGCPZACEdpZLhiNlDliPA41mqO5+SemOdH59QbNtvAQgNXZqDHo2Q=="; }; }; - "@ot-builder/io-bin-encoding-1.0.8" = { + "@ot-builder/io-bin-encoding-1.0.9" = { name = "_at_ot-builder_slash_io-bin-encoding"; packageName = "@ot-builder/io-bin-encoding"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.0.8.tgz"; - sha512 = "bP7U7cr3fkdM3jYtW6fSgBfqjIcVKJu3iZfAOtcP0o+aID6FbETWGpxYrfGcJuvjcQLDPhc0pda1Ag/ypeTnvg=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.0.9.tgz"; + sha512 = "GtL4q9cR39b2ngkSy/2HGpge6Q1om2BOuXTtdrJT0KpCbESjuZ09Sr1/NnqBIQ0QjKGXnR/o5kUg62q71CVbmQ=="; }; }; - "@ot-builder/io-bin-ext-private-1.0.8" = { + "@ot-builder/io-bin-ext-private-1.0.9" = { name = "_at_ot-builder_slash_io-bin-ext-private"; packageName = "@ot-builder/io-bin-ext-private"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.0.8.tgz"; - sha512 = "RTCaiGvbO340gLHh2omj62v0ysOE+rEdcVuISiIb08fo0azLsi+MvzQdwprCOc1+8s5wY/peDCQ38HN/gYC7dA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.0.9.tgz"; + sha512 = "AU2HvH9okIkLX6OLt6kOlpjDR3z2lW2LxQ05+pQSxGwcVuLCeene6f8tWQ+/FWmhevJQgoDKeEy/KfFyoAlxIg=="; }; }; - "@ot-builder/io-bin-font-1.0.8" = { + "@ot-builder/io-bin-font-1.0.9" = { name = "_at_ot-builder_slash_io-bin-font"; packageName = "@ot-builder/io-bin-font"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.0.8.tgz"; - sha512 = "6cL1cn7Qmzu1bsx4hr2aqKCMVu1+Si2xA8uGEVOryD94odjX76HJMta4bjH9P///PcQdIeJDczpk1s21LPg6Cw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.0.9.tgz"; + sha512 = "iem4LxkEVQ/HvhuRNrv2ORDnvsPNZPCuJSmGtK3S4D258GPdcDj0Kohn5bpyrFPiL5QybGQUAzo4qYkbMEvInQ=="; }; }; - "@ot-builder/io-bin-glyph-store-1.0.8" = { + "@ot-builder/io-bin-glyph-store-1.0.9" = { name = "_at_ot-builder_slash_io-bin-glyph-store"; packageName = "@ot-builder/io-bin-glyph-store"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.0.8.tgz"; - sha512 = "vqr4pyK1oa3ADPUydKQgWZHKk1WAjO7hmMYARbqKzUCPHrqrr2dXJHMW8RNg+JhQykhG0ibHf6NdjHklBzTWIQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.0.9.tgz"; + sha512 = "QHlF2vcOHGmgTnpBWVP3wKCfVemXE9NeUpAcLLkolQMKpR0lXyrundJll/ujPSPImFp4AknPL6UCa6eKrHBwoQ=="; }; }; - "@ot-builder/io-bin-layout-1.0.8" = { + "@ot-builder/io-bin-layout-1.0.9" = { name = "_at_ot-builder_slash_io-bin-layout"; packageName = "@ot-builder/io-bin-layout"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.0.8.tgz"; - sha512 = "0xrUl6WPQLpRwsVQXh1aBF28f7gJ0OR7N9xK5CZLsEku6R/uEGPSR0K9xlw8L+74J/ZWCX/WkbNgvvNUfyQLcw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.0.9.tgz"; + sha512 = "ePDm9bKLiS6mhkYxlCv29bYXAlqmQsDR09KKXcFqSj1GSdKFUB/zvfca7PS7xyuLq/XKA9jwdHHLIAfSqdeAxg=="; }; }; - "@ot-builder/io-bin-metadata-1.0.8" = { + "@ot-builder/io-bin-metadata-1.0.9" = { name = "_at_ot-builder_slash_io-bin-metadata"; packageName = "@ot-builder/io-bin-metadata"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.0.8.tgz"; - sha512 = "hgkeZy8JI5pgr3B0ayLDHxOxuIDRSnK/PRxZBydOCsArcW61N8cEPv/DzMKS3iNY0hpTUghZ7INLWC5+0KL63g=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.0.9.tgz"; + sha512 = "qjB11/bumujZI1MewgCqTZe5a3PA219t62Im4ZOgTiOIJ+A55Mryy7W711GrRdcdSOpV0WgSVP1BdwORHvz6wg=="; }; }; - "@ot-builder/io-bin-metric-1.0.8" = { + "@ot-builder/io-bin-metric-1.0.9" = { name = "_at_ot-builder_slash_io-bin-metric"; packageName = "@ot-builder/io-bin-metric"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.0.8.tgz"; - sha512 = "dKtTJ8AB1VWj/WYv9i+qhm6uKcwdC++MqQiaTLA7/eCnG9O2QjfTbOptYr6KI3+BKwe6/tbyzrqj7G5ZaVmtKA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.0.9.tgz"; + sha512 = "f1ALFM5iiVLqQyFZKRYV92fy3/epePMZD2PWYzedHLMzgymm/K2oY0VaRyt010TrVugtaBI4FGN9EpKJFYM9Tw=="; }; }; - "@ot-builder/io-bin-name-1.0.8" = { + "@ot-builder/io-bin-name-1.0.9" = { name = "_at_ot-builder_slash_io-bin-name"; packageName = "@ot-builder/io-bin-name"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.0.8.tgz"; - sha512 = "p93QSIEoBXtRyBEWI4KLuTTh3EtJTsoSeM7Ifopga7sCPDWFky5GeRqTq+Mvlk0cPiJtV24qdPdaIem5r5PBmg=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.0.9.tgz"; + sha512 = "tf6X+VursEmLEPDJTfNynkf8O3a3X4670KVnx2RVigyWdXmwj/U52zTU7Vs3NN+xQfUNbhUMgnd7rEHgilvJcA=="; }; }; - "@ot-builder/io-bin-sfnt-1.0.8" = { + "@ot-builder/io-bin-sfnt-1.0.9" = { name = "_at_ot-builder_slash_io-bin-sfnt"; packageName = "@ot-builder/io-bin-sfnt"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.0.8.tgz"; - sha512 = "2yogXf3cdd6dI022HPU6lnzL10KU4DOOALkeg84qQCmse0WZdhZAKhdn08sqHIJ+EDjkfpRjHld0F96sKH8e0g=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.0.9.tgz"; + sha512 = "yg7qKhmN2zFXfBSi64SXFzji3axvXLfJLGTx0rSWGtVQRX3gQBfwQ98vzrX1Z5O4rSGaCkALXy9wIELeAqy//g=="; }; }; - "@ot-builder/io-bin-ttf-1.0.8" = { + "@ot-builder/io-bin-ttf-1.0.9" = { name = "_at_ot-builder_slash_io-bin-ttf"; packageName = "@ot-builder/io-bin-ttf"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.0.8.tgz"; - sha512 = "TaX7s9UFyoyajgig7944DgWFmEzzcGjVGz3qz3olgAZcHhrgLoqIlmaxt1jEHgb7LZx3wG4G9WwcSl6arqMdAQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.0.9.tgz"; + sha512 = "McbFe5dx314NhxkTZOzGdTTanJrJvQy6OGuM1+ACrYfCr2CnVONUiuOtN/1nUyIm/N5yiFXLyIcI/pAjOgbl2w=="; }; }; - "@ot-builder/ot-1.0.8" = { + "@ot-builder/ot-1.0.9" = { name = "_at_ot-builder_slash_ot"; packageName = "@ot-builder/ot"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.0.8.tgz"; - sha512 = "X2/4GcLGA1dTaR2+iHdhGn64cCLQJ9gZdoAVS3DZjMJIyyScFDVLAGhYHPLYk97EDQ5Pm7RnQNoY11U5igm28g=="; + url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.0.9.tgz"; + sha512 = "sJCDeFoAc9PlbOAJDXI32VXcaSV4swBMiFyy1VcNxo9SWT624hwHAe/ZfOrevrSNLzSO93QB3j5l/OjHMGLE9Q=="; }; }; - "@ot-builder/ot-encoding-1.0.8" = { + "@ot-builder/ot-encoding-1.0.9" = { name = "_at_ot-builder_slash_ot-encoding"; packageName = "@ot-builder/ot-encoding"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.0.8.tgz"; - sha512 = "dRmxL8WUfjZAjd8RcSmd3wI442Gzy9i4X7Ock2rj0ZwVxlfQB7F3dx71IVgvSRbrkz2Ny+7htW3eq+V0be+cmw=="; + url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.0.9.tgz"; + sha512 = "3unI4fHkV45e1p92Z3yifHrtQPMmkBz7B5nFkVrTMSNvSCZKvk6bRcdyvlFEkvQW2zgllQf2GfggV5u/PnikjA=="; }; }; - "@ot-builder/ot-ext-private-1.0.8" = { + "@ot-builder/ot-ext-private-1.0.9" = { name = "_at_ot-builder_slash_ot-ext-private"; packageName = "@ot-builder/ot-ext-private"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.0.8.tgz"; - sha512 = "uloryF2vSRkIGHPqLN6FkAb1oZ6xkTR2w407PCgVYO9Pkq/j5d8ZHGM80VOYukfHFUdqskFyYcmojF/0WUA06A=="; + url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.0.9.tgz"; + sha512 = "KUnMgeNSWTm7NupsM+WNA8+JM6dGdEsxKRMq7s5O67jfan/SKO+ICf5xpcFeWqFHbto5wKkzERmnCMZLTV3aDA=="; }; }; - "@ot-builder/ot-glyphs-1.0.8" = { + "@ot-builder/ot-glyphs-1.0.9" = { name = "_at_ot-builder_slash_ot-glyphs"; packageName = "@ot-builder/ot-glyphs"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.0.8.tgz"; - sha512 = "XP7pRUJPq/2dbDqzEAHWIFvwIdVK+BkZ/xPV75hGECEIquh7MpFKAXtLjRyFpVU+RRD0Xplmj/1P4W0047A4JQ=="; + url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.0.9.tgz"; + sha512 = "vDoCjthLji9fGyXRTabU8ltEn+qhYSH+IaAbGu3JuL9EKElw5r9w6DpzzjBmFjoVCh/o8MVxMW7VwNKgOkXT5g=="; }; }; - "@ot-builder/ot-layout-1.0.8" = { + "@ot-builder/ot-layout-1.0.9" = { name = "_at_ot-builder_slash_ot-layout"; packageName = "@ot-builder/ot-layout"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.0.8.tgz"; - sha512 = "fRazZF4bTzyeYjFivbWim6/+dsWeGI6ZW6mCES5GmgidHzcFw2OrvDO1VYIKg5KSafjEZxe4QcMrF86bFkSDTg=="; + url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.0.9.tgz"; + sha512 = "Od/olVg7QWFSaxHRcA7uzM0jNEoM3nqy5vge1eghapwkRFN0k/PKINYNi0h95S/1A5sDmT9FZ3PRZ8v6kT6BqQ=="; }; }; - "@ot-builder/ot-metadata-1.0.8" = { + "@ot-builder/ot-metadata-1.0.9" = { name = "_at_ot-builder_slash_ot-metadata"; packageName = "@ot-builder/ot-metadata"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.0.8.tgz"; - sha512 = "p0z1ywytkvDVUivKV9m8dE7jFztnBFvn/WIqXgpxaqhzXcDIc5mDl1hca/1DJU1ZAwdR03fifEsniCz+3Vaynw=="; + url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.0.9.tgz"; + sha512 = "4tyYUnm2tBVSBned3FHBClyWilA4AXAgR0P+Fw8Nd4NWcYCkIsHezlR+8Sl54YX8LnxO5XVTHpZvFob+QdyCSQ=="; }; }; - "@ot-builder/ot-name-1.0.8" = { + "@ot-builder/ot-name-1.0.9" = { name = "_at_ot-builder_slash_ot-name"; packageName = "@ot-builder/ot-name"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.0.8.tgz"; - sha512 = "P9X7Fwg7s27n4eTXJqh68Cfrg2K5x28JaIINdgIo4wnRNVfmc/JjH/Z5Rz5U3ahytUdY6+pS+YJAW9BYJ2DJOw=="; + url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.0.9.tgz"; + sha512 = "zl7qxyS5VjhB67//jJCwcjdT16ds98Zz4mnU4jcLwDkv0RHQFCFDiHqlefHwegIeMR2S54F27pxHsXDSG5MKLQ=="; }; }; - "@ot-builder/ot-sfnt-1.0.8" = { + "@ot-builder/ot-sfnt-1.0.9" = { name = "_at_ot-builder_slash_ot-sfnt"; packageName = "@ot-builder/ot-sfnt"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.0.8.tgz"; - sha512 = "tfKv7EuSVKWgKFKOcdCMqWA6tCTf+bye3kWyYYJaG149w1YpzFqMMYk1uB95rL6cjJWvkphZdN2BSbEaUcD+sg=="; + url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.0.9.tgz"; + sha512 = "o6o3IyKbAHUla37PxRxwAq5EqNgF7AfjtSzvhDnWQC+qofFDebpnRiGksEOah7LMAeSAsMi04KhK6cQJ/b1cYw=="; }; }; - "@ot-builder/ot-standard-glyph-namer-1.0.8" = { + "@ot-builder/ot-standard-glyph-namer-1.0.9" = { name = "_at_ot-builder_slash_ot-standard-glyph-namer"; packageName = "@ot-builder/ot-standard-glyph-namer"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.0.8.tgz"; - sha512 = "sNEu9Ye5IdISzSaLnyNl/0ZwQY8DLUfvGuQs45JPT84WTpkB7c1BpndlSfcCDZaqdtTXN/tNS2fAN7TJm1g9Ig=="; + url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.0.9.tgz"; + sha512 = "4TuinXcXE36b0UyezCveHzf/GC57sfDM6FB8Oavy/6TiRjyurLJ/03INkTqlgaPihiH1aU7NF2jFkJqym/W5Xw=="; }; }; - "@ot-builder/prelude-1.0.8" = { + "@ot-builder/prelude-1.0.9" = { name = "_at_ot-builder_slash_prelude"; packageName = "@ot-builder/prelude"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.0.8.tgz"; - sha512 = "wknxzHrwwcN4m32P1FmYScTD03Vtj5mQWCx21NCzcsUyEfGasUvTzoPhOw5qUdklN3azFSjByfjpMUAjCRfnJg=="; + url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.0.9.tgz"; + sha512 = "9nCcbwXQaLnwDkayFadEUiEd5CiHhSHsvFw2EXkZuEWUceu4qN0TACVy0EjiCWGD3FE9LM3NljejUmIxc4Hf8A=="; }; }; - "@ot-builder/primitive-1.0.8" = { + "@ot-builder/primitive-1.0.9" = { name = "_at_ot-builder_slash_primitive"; packageName = "@ot-builder/primitive"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.0.8.tgz"; - sha512 = "jJydJoA67wop43AVcH+E+5Q2DU7epll1J6krs6Oz3Rrs7x2RB5fc79nWJMm8bHpKPB0xnA3zsLiJjERB7Ud9dw=="; + url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.0.9.tgz"; + sha512 = "ut0tqNGB7wtk6AQ5QZEt+A6XyIHeizxYkx9L6YluBaoq4E8PUk2gk4Vmvf8mf5nQkpmoTJFAqgMrp9KrSAjzFA=="; }; }; - "@ot-builder/rectify-1.0.8" = { + "@ot-builder/rectify-1.0.9" = { name = "_at_ot-builder_slash_rectify"; packageName = "@ot-builder/rectify"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.0.8.tgz"; - sha512 = "RFD/oA3kTviuj7WHRynyMT4zBFNB8tSifrMjQxyY28BEWckieX27RM9+QynfuHg07s1pZ/mZC5g3wLwjdeE5+w=="; + url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.0.9.tgz"; + sha512 = "Ku1nPOiK+Ex2JaV5IvXKHDxWflKOhzgpDFqvh+GNrcRgfi0Ybkuhi1/hlMpQ2ZD2z7wTjIeVYa3vaCIdy7rheA=="; }; }; - "@ot-builder/stat-glyphs-1.0.8" = { + "@ot-builder/stat-glyphs-1.0.9" = { name = "_at_ot-builder_slash_stat-glyphs"; packageName = "@ot-builder/stat-glyphs"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.0.8.tgz"; - sha512 = "rSQPs0laN2H+jBTKFA/q9+rcOJO9bJVHvCxHu74hfwjvlpysWbaN/+9PwMb5mFIP/GzToYfYhgZ6e7qBNRSM+g=="; + url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.0.9.tgz"; + sha512 = "Y2EcyqdanTtRCBfADGEvYgKP5d+WK+UyYMIY5ILcQEGW2L1osVe8QROUfpo7kWqrKjxV2Tzrz5/SvlP5BzYTfg=="; }; }; - "@ot-builder/trace-1.0.8" = { + "@ot-builder/trace-1.0.9" = { name = "_at_ot-builder_slash_trace"; packageName = "@ot-builder/trace"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.0.8.tgz"; - sha512 = "VGPt+1UT+yDzouUDugMW2z7tFED+sHJKT5mOwl6N2t/+Er6gaxrRlfYKvdHqdgFKIg8oKytoZS3wOauWiVF02w=="; + url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.0.9.tgz"; + sha512 = "c8002SN64oldhDz4NN9VdoyJOdPHAU4UkB7EQFsPRZX/a8pVx20SMWXcNokrTGTHhEpaXBY0i/zshUp0kLbjVQ=="; }; }; - "@ot-builder/var-store-1.0.8" = { + "@ot-builder/var-store-1.0.9" = { name = "_at_ot-builder_slash_var-store"; packageName = "@ot-builder/var-store"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.0.8.tgz"; - sha512 = "Wo3xfMDzmlqSNEn5YOO8hxW7X9YTw6fCUmfUmfaOAmNYRWsVHnLwTSnu92M6p0shMqVHzgqhCHDxG7KZAuSNwQ=="; + url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.0.9.tgz"; + sha512 = "gaNm+kdi1vQgEiul2flVn6OC/FDHmV1Nb+nuQWO7uwQCkxnb22qv/d5o/QAM5KeLQ/xvnPjjlF8ZAA34NylA4A=="; }; }; - "@ot-builder/variance-1.0.8" = { + "@ot-builder/variance-1.0.9" = { name = "_at_ot-builder_slash_variance"; packageName = "@ot-builder/variance"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.0.8.tgz"; - sha512 = "GaWs/PMrzkAJJmf5Wm0qr09AHYP9ydNk6J9KEs7GXH7gBm6X5pl/V6D105u+6Tx+QSGotRvc8einQm/vazug7A=="; + url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.0.9.tgz"; + sha512 = "dYmtxdHBlkwJRU6Fu6vl/kaaF1DdJiWUuDBLJrGY865J/yGrtIKFAE18UD1XtNaYRQ3Je87Suheb85HHvcXzZA=="; }; }; "@parcel/fs-1.11.0" = { @@ -4855,13 +4819,13 @@ let sha512 = "USSjRAAQYsZFlv43FUPdD+jEGML5/8oLF0rUzPQTtK4q9kvaXr49F5ZplyLz5lox78cLZ0TxN2bIDQ1xhOkulQ=="; }; }; - "@pm2/agent-1.0.8" = { + "@pm2/agent-2.0.0" = { name = "_at_pm2_slash_agent"; packageName = "@pm2/agent"; - version = "1.0.8"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@pm2/agent/-/agent-1.0.8.tgz"; - sha512 = "r8mud8BhBz+a2yjlgtk+PBXUR5EQ9UKSJCs232OxfCmuBr1MZw0Mo+Kfog6WJ8OmVk99r1so9yTUK4IyrgGcMQ=="; + url = "https://registry.npmjs.org/@pm2/agent/-/agent-2.0.0.tgz"; + sha512 = "W1LvdyF1tGaVU5f/hV8DjpI5joI7MEgXiQMLZnTwZlFwDVP00O9s86571Q8xSiweTcFZFyye0F4wORN/PjSgGA=="; }; }; "@pm2/io-5.0.0" = { @@ -5053,22 +5017,22 @@ let sha512 = "RB6vWO78v6c+SW/3bZh+XZMr4nGdJKAiPGsBALuUZnLuCiQ7aXCT1AuFHqnfS2gyXbEUEj+kw8p4ux8KdAfs3A=="; }; }; - "@redocly/openapi-core-1.0.0-beta.49" = { + "@redocly/openapi-core-1.0.0-beta.50" = { name = "_at_redocly_slash_openapi-core"; packageName = "@redocly/openapi-core"; - version = "1.0.0-beta.49"; + version = "1.0.0-beta.50"; src = fetchurl { - url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.49.tgz"; - sha512 = "SwCtQeyovcV7cS6YQoe5GWX3hWXAZrnrZQtQv0YW91CtrZMBdk5qA5eQ9Mkkbk6YOKKCWkc8yD+KdkRATlyPNw=="; + url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.50.tgz"; + sha512 = "GuXn4IETxpbRd8dlAQDQPtvqOpbMvPMeC/e5mv5MOXkLIznNk4vjiQVe6QSCbZbCHzzpb2+89B6S7asebPm4Rg=="; }; }; - "@redocly/react-dropdown-aria-2.0.11" = { + "@redocly/react-dropdown-aria-2.0.12" = { name = "_at_redocly_slash_react-dropdown-aria"; packageName = "@redocly/react-dropdown-aria"; - version = "2.0.11"; + version = "2.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@redocly/react-dropdown-aria/-/react-dropdown-aria-2.0.11.tgz"; - sha512 = "rmuSC2JFFl4DkPDdGVrmffT9KcbG2AB5jvhxPIrOc1dO9mHRMUUftQY35KZlvWqqSSqVn+AM+J9dhiTo1ZqR8A=="; + url = "https://registry.npmjs.org/@redocly/react-dropdown-aria/-/react-dropdown-aria-2.0.12.tgz"; + sha512 = "feQEZlyBvQsbT/fvpJ4jJ5OLGaUPpnskHYDsY8DGpPymN+HUeDQrqkBEbbKRwMKidFTI2cxk2kJNNTnvdS9jyw=="; }; }; "@rollup/plugin-babel-5.3.0" = { @@ -5161,13 +5125,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-12.0.2" = { + "@schematics/angular-12.0.4" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "12.0.2"; + version = "12.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-12.0.2.tgz"; - sha512 = "DMUfp7226QY2FkJeBm1xAUUKRX9umVCRhqEcku4Zaig6PylVd9LZFLjZvGKA4Vq2DkYRtClll3z5FIhAOSY3SQ=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-12.0.4.tgz"; + sha512 = "rC4/+c6p3S/ezDeJzAstrwzdpYgcYzHumtzVSDDM+3Kx0QBUTq/Nj6sk1e2C/fgtV5Jb2INEkTvrih+HP7I0wA=="; }; }; "@schematics/schematics-0.1102.6" = { @@ -5206,13 +5170,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-3.10.1" = { + "@serverless/components-3.12.0" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "3.10.1"; + version = "3.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-3.10.1.tgz"; - sha512 = "Kgs9sBcsgxW4l0j8H5Bh8ROV4MmeFEiEwcj8OjFI4MyGj/nNw8dQA5ArpF2COJCgVDLwYVqnRGOCR+tEF0TlnA=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-3.12.0.tgz"; + sha512 = "USK6QCREd/SjsDDhumrsORkyQYew9WvXGjSbh5GvoGNKbqZlMiNWnua/DXmpz1uf2qaXzJO0LZEtpsiDBPX59w=="; }; }; "@serverless/core-1.1.2" = { @@ -5224,13 +5188,13 @@ let sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ=="; }; }; - "@serverless/dashboard-plugin-5.1.4" = { + "@serverless/dashboard-plugin-5.3.0" = { name = "_at_serverless_slash_dashboard-plugin"; packageName = "@serverless/dashboard-plugin"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/dashboard-plugin/-/dashboard-plugin-5.1.4.tgz"; - sha512 = "f6uSdUSfZmUhVxLjqwYMNUYi3EShakPQwzipCpVEChcB0AKZG6mhu2NBfTFeSBASvR2l1Mq8tqVgHoTXp9yq4Q=="; + url = "https://registry.npmjs.org/@serverless/dashboard-plugin/-/dashboard-plugin-5.3.0.tgz"; + sha512 = "JOtFIVLHyeTAtdoK2gFEAAMNsGemszQr6rwhTOg0bV6pgeLmfufL4nz9rAtSj5m2oZnVnH46+P1aVZlwUXNThQ=="; }; }; "@serverless/event-mocks-1.1.1" = { @@ -5242,22 +5206,22 @@ let sha512 = "YAV5V/y+XIOfd+HEVeXfPWZb8C6QLruFk9tBivoX2roQLWVq145s4uxf8D0QioCueuRzkukHUS4JIj+KVoS34A=="; }; }; - "@serverless/platform-client-4.2.2" = { + "@serverless/platform-client-4.2.3" = { name = "_at_serverless_slash_platform-client"; packageName = "@serverless/platform-client"; - version = "4.2.2"; + version = "4.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-4.2.2.tgz"; - sha512 = "8jP72e0POFGEW7HKtDzK0qt1amYtvlB7bYSal8JUCXbeY2qk3xRJZuLWCZBBKRGz4ha4eBNjlz7iniACb9biLg=="; + url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-4.2.3.tgz"; + sha512 = "dyELLbrf/9+O+sjuIL7ymlH8zwCOsG+tf2TjeEjXooVSvNqUoZ4ZadENjxInUV841l0ddwkihwzH/54Yw+/qkg=="; }; }; - "@serverless/platform-client-china-2.1.13" = { + "@serverless/platform-client-china-2.1.14" = { name = "_at_serverless_slash_platform-client-china"; packageName = "@serverless/platform-client-china"; - version = "2.1.13"; + version = "2.1.14"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.1.13.tgz"; - sha512 = "kQuWjHiBeslZ1SkIFzXRoEi+CCunUEBOyJRU7Zeg5l4vV4U63G8Ax1waMXxoBILgYK5cDG0F/y+UoSAvEhJmZw=="; + url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.1.14.tgz"; + sha512 = "ciXVcYcdLlSB9ph94sX/8jmDuY85Yq0fJvwKGzndKPngjVkXs6Gw2tqj91act9nqW541Ycqb/HFh1BhgcDWP7Q=="; }; }; "@serverless/template-1.1.4" = { @@ -5296,13 +5260,13 @@ let sha512 = "QXBZO0W2da0AtROpg8H1c4YWMSl56+nef0Kukd+40Q4jEaY3a0dtpVzvGps3aLFDXer3kWZ3LtlhS5HGXLficw=="; }; }; - "@serverless/utils-china-1.1.0" = { + "@serverless/utils-china-1.1.1" = { name = "_at_serverless_slash_utils-china"; packageName = "@serverless/utils-china"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-1.1.0.tgz"; - sha512 = "4iul4BaS6wi8c4fhRahkxt8IDSGB9swVyK3SpVqP4LJNGJ5UtKvStxa6pMC4OMVWs0LDCaLGlfFqOgBUo3VxRQ=="; + url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-1.1.1.tgz"; + sha512 = "iGICjLlhU8lrMuknd4i63bYgZi3PZ1EZlf6fW7YsP3l8TY2xtqGcvVzfsj75SAuShBYA3GpKnil6foxCeKok6w=="; }; }; "@sideway/address-4.1.2" = { @@ -5467,13 +5431,13 @@ let sha512 = "ca2JKOnSRzYHJkhOB9gYmdRZHmd02b/uBd/S0D5W+L9nIMS7sUBV5jfhKwVgrYPIpVNIc0XCI9rxK4TfkQRpiA=="; }; }; - "@snyk/code-client-3.7.0" = { + "@snyk/code-client-3.8.1" = { name = "_at_snyk_slash_code-client"; packageName = "@snyk/code-client"; - version = "3.7.0"; + version = "3.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/code-client/-/code-client-3.7.0.tgz"; - sha512 = "a1uGkSpO4Pr9UucZUVfUR5PVcl1fEA4sXbdZPyzs1AABE7JhMY6FnBYKgQFz2qIkPAPy4M0m18bnGpHq5ZdWNg=="; + url = "https://registry.npmjs.org/@snyk/code-client/-/code-client-3.8.1.tgz"; + sha512 = "7HrkscxEXC5eVehZ6nip2uIFDbuvCuux0lrj78twaAnVn9uUx/4G7AKZl8JcrESQEN6py80tJzjvPlBybHJ1+g=="; }; }; "@snyk/composer-lockfile-parser-1.4.1" = { @@ -5494,13 +5458,13 @@ let sha512 = "Oup9nAvb558jdNvbZah/vaBtOtCcizkdeS+OBQeBIqIffyer4mc4juSn4b1SFjCpu7AG7piio8Lj8k1B9ps6Tg=="; }; }; - "@snyk/docker-registry-v2-client-2.1.3" = { + "@snyk/docker-registry-v2-client-2.2.1" = { name = "_at_snyk_slash_docker-registry-v2-client"; packageName = "@snyk/docker-registry-v2-client"; - version = "2.1.3"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/docker-registry-v2-client/-/docker-registry-v2-client-2.1.3.tgz"; - sha512 = "nbWgOhHFc2GXQsweDxhulhYtLptsBxoXMSI3Py7BOt8ITgXK0HUors2+mzGbwpbvnwMAYjwhv8PLOVVVsa8PXQ=="; + url = "https://registry.npmjs.org/@snyk/docker-registry-v2-client/-/docker-registry-v2-client-2.2.1.tgz"; + sha512 = "3pn0UBs0JskTTmZdBRSblxta3xNAnoFaUmh2s6v3LtpqA/RwXFvlHVUDc72cbJSeKiQJzfESFv9OxfgZ3NmL/Q=="; }; }; "@snyk/fast-glob-3.2.6-patch" = { @@ -5512,22 +5476,22 @@ let sha512 = "E/Pfdze/WFfxwyuTFcfhQN1SwyUsc43yuCoW63RVBCaxTD6OzhVD2Pvc/Sy7BjiWUfmelzyKkIBpoow8zZX7Zg=="; }; }; - "@snyk/fix-1.601.0" = { + "@snyk/fix-1.620.0" = { name = "_at_snyk_slash_fix"; packageName = "@snyk/fix"; - version = "1.601.0"; + version = "1.620.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/fix/-/fix-1.601.0.tgz"; - sha512 = "0Fz0nC547Qkg0FGpmvzDIPrrXvisQN6c07JM0RReM8Xb47p1o51O/MPsWdHIFJasIT5HkshyOaV5rjGQmfwHtQ=="; + url = "https://registry.npmjs.org/@snyk/fix/-/fix-1.620.0.tgz"; + sha512 = "o0dISy2mjmZ63/O/Y+yivBtqT6BR88JAa8QbMQ29/TzwysOoKjTaQXbfgT338Q1vm3J91iEptVn3Ut0UsC5LEQ=="; }; }; - "@snyk/fix-pipenv-pipfile-0.3.5" = { + "@snyk/fix-pipenv-pipfile-0.4.3" = { name = "_at_snyk_slash_fix-pipenv-pipfile"; packageName = "@snyk/fix-pipenv-pipfile"; - version = "0.3.5"; + version = "0.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/fix-pipenv-pipfile/-/fix-pipenv-pipfile-0.3.5.tgz"; - sha512 = "Kqe9wqUrSSGB0+QFrJjCy5ub7bNg10F5I/avJK95RY/2g9cXpQnkdkTexRmVdOl+IF5z3JBXRjBnIQb6buvp6w=="; + url = "https://registry.npmjs.org/@snyk/fix-pipenv-pipfile/-/fix-pipenv-pipfile-0.4.3.tgz"; + sha512 = "dBQaoPmmvc8Dzq/D1z5HKJRI6BgjS5SBSBJs4+NoCpOVTqeoDwP8hG3fC++480kbqlugEaEnHZu4uvA3H9oF7A=="; }; }; "@snyk/gemfile-1.2.0" = { @@ -6268,13 +6232,13 @@ let sha512 = "DLVpLEGTEZGBXOYoYoagHSxXkDHONc0fZouF2ayw7Q18aRu1Afwci+1CFKvPpouCUOVWP+dmCaAWpQjswe7kpg=="; }; }; - "@types/eslint-7.2.12" = { + "@types/eslint-7.2.13" = { name = "_at_types_slash_eslint"; packageName = "@types/eslint"; - version = "7.2.12"; + version = "7.2.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.12.tgz"; - sha512 = "HjikV/jX6e0Pg4DcB+rtOBKSrG6w5IaxWpmi3efL/eLxMz5lZTK+W1DKERrX5a+mNzL78axfsDNXu7JHFP4uLg=="; + url = "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.13.tgz"; + sha512 = "LKmQCWAlnVHvvXq4oasNUMTJJb2GwSyTY8+1C7OH5ILR8mPLaljv1jxL1bXW3xB3jFbQxTKxJAvI8PyjB09aBg=="; }; }; "@types/eslint-scope-3.7.0" = { @@ -6322,6 +6286,15 @@ let sha512 = "c5ciR06jK8u9BstrmJyO97m+klJrrhCf9u3rLu3DEAJBirxRqSCvDQoYKmxuYwQI5SZChAWu+tq9oVlGRuzPAg=="; }; }; + "@types/estree-0.0.48" = { + name = "_at_types_slash_estree"; + packageName = "@types/estree"; + version = "0.0.48"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.48.tgz"; + sha512 = "LfZwXoGUDo0C3me81HXgkBg5CTQYb6xzEl+fNmbO4JdRiSKQ8A0GD1OBBvKAIsbCUgoyAty7m99GqqMQe784ew=="; + }; + }; "@types/expect-1.20.4" = { name = "_at_types_slash_expect"; packageName = "@types/expect"; @@ -6340,6 +6313,15 @@ let sha512 = "no+R6rW60JEc59977wIxreQVsIEOAYwgCqldrA/vkpCnbD7MqTefO97lmoBe4WE0F156bC4uLSP1XHDOySnChg=="; }; }; + "@types/express-4.17.12" = { + name = "_at_types_slash_express"; + packageName = "@types/express"; + version = "4.17.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/express/-/express-4.17.12.tgz"; + sha512 = "pTYas6FrP15B1Oa0bkN5tQMNqOcVXa9j4FTFtO8DWI9kppKib+6NJtfTOOLcwxuuYvcX2+dVG6et1SxW/Kc17Q=="; + }; + }; "@types/express-4.17.8" = { name = "_at_types_slash_express"; packageName = "@types/express"; @@ -6358,13 +6340,13 @@ let sha512 = "DJOSHzX7pCiSElWaGR8kCprwibCB/3yW6vcT8VG3P0SJjnv19gnWG/AZMfM60Xj/YJIp/YCaDHyvzsFVeniARA=="; }; }; - "@types/express-serve-static-core-4.17.20" = { + "@types/express-serve-static-core-4.17.21" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.20"; + version = "4.17.21"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.20.tgz"; - sha512 = "8qqFN4W53IEWa9bdmuVrUcVkFemQWnt5DKPQ/oa8xKDYgtjCr2OO6NX5TIK49NLFr3mPYU2cLh92DQquC3oWWQ=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.21.tgz"; + sha512 = "gwCiEZqW6f7EoR8TTEfalyEhb1zA5jQJnRngr97+3pzMaO1RKoI1w2bw07TK72renMUVWcWS5mLI6rk1NqN0nA=="; }; }; "@types/fancy-log-1.3.0" = { @@ -6601,15 +6583,6 @@ let sha1 = "ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"; }; }; - "@types/json5-0.0.30" = { - name = "_at_types_slash_json5"; - packageName = "@types/json5"; - version = "0.0.30"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/json5/-/json5-0.0.30.tgz"; - sha512 = "sqm9g7mHlPY/43fcSNrCYfOeX9zkTTK+euO5E6+CVijSMm5tTjkVdwdqRkY3ljjIAf8679vps5jKUoJBCLsMDA=="; - }; - }; "@types/keygrip-1.0.2" = { name = "_at_types_slash_keygrip"; packageName = "@types/keygrip"; @@ -6808,15 +6781,6 @@ let sha512 = "wdfkiKBBEMTODNbuF3J+qDDSqJxt50yB9pgDiTcFew7f97Gcc7/sM4HR66ofGgpJPOALWOqKAch4gPyqEXSkeQ=="; }; }; - "@types/multimatch-4.0.0" = { - name = "_at_types_slash_multimatch"; - packageName = "@types/multimatch"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/multimatch/-/multimatch-4.0.0.tgz"; - sha512 = "xS26gtqY5QASmfU/6jb5vj7F0D0SctgRGtwXsKSNng1knk/OewjISlkMwGonkMCbZCqSoW3s6nL0sAtTlzbL/g=="; - }; - }; "@types/mysql-2.15.15" = { name = "_at_types_slash_mysql"; packageName = "@types/mysql"; @@ -6880,31 +6844,22 @@ let sha512 = "Lt+wj8NVPx0zUmUwumiVXapmaLUcAk3yPuHCFVXras9k5VT9TdhJqKqGVUQCD60OTMCl0qxJ57OiTL0Mic3Iag=="; }; }; - "@types/node-14.14.37" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "14.14.37"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.14.37.tgz"; - sha512 = "XYmBiy+ohOR4Lh5jE379fV2IU+6Jn4g5qASinhitfyO71b/sCo6MKsMLF5tc7Zf2CE8hViVQyYSobJNke8OvUw=="; - }; - }; - "@types/node-14.17.1" = { + "@types/node-14.17.3" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.17.1"; + version = "14.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.17.1.tgz"; - sha512 = "/tpUyFD7meeooTRwl3sYlihx2BrJE7q9XF71EguPFIySj9B7qgnRtHsHTho+0AUm4m1SvWGm6uSncrR94q6Vtw=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.17.3.tgz"; + sha512 = "e6ZowgGJmTuXa3GyaPbTGxX17tnThl2aSSizrFthQ7m9uLGZBXiGhgE55cjRZTF5kjZvYn9EOPOMljdjwbflxw=="; }; }; - "@types/node-15.0.3" = { + "@types/node-15.12.2" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "15.0.3"; + version = "15.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-15.0.3.tgz"; - sha512 = "/WbxFeBU+0F79z9RdEOXH4CsDga+ibi5M8uEYr91u3CkT/pdWcV8MCook+4wDPnZBexRdwWS+PiVZ2xJviAzcQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-15.12.2.tgz"; + sha512 = "zjQ69G564OCIWIOHSXyQEEDpdpGl+G348RAKY0XXy9Z5kU9Vzv1GMNnkar/ZJ8dzXB3COzD9Mo9NtRZ4xfgUww=="; }; }; "@types/node-15.6.1" = { @@ -7312,13 +7267,13 @@ let sha512 = "2o6a2ixaVI2EbwBPg1QYLGQoHK56p/8X/sGfKbFC8N6sY9lfjsMf/GprtkQkSya0D4uRiutRZ2BWj7k3JvLsAQ=="; }; }; - "@types/vscode-1.56.0" = { + "@types/vscode-1.57.0" = { name = "_at_types_slash_vscode"; packageName = "@types/vscode"; - version = "1.56.0"; + version = "1.57.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.56.0.tgz"; - sha512 = "Q5VmQxOx+L1Y6lIJiGcJzwcyV3pQo/eiW8P+7sNLhFI16tJCwtua2DLjHRcpjbCLNVYpQM73kzfFo1Z0HyP9eQ=="; + url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.57.0.tgz"; + sha512 = "FeznBFtIDCWRluojTsi9c3LLcCHOXP5etQfBK42+ixo1CoEAchkw39tuui9zomjZuKfUVL33KZUDIwHZ/xvOkQ=="; }; }; "@types/webpack-4.41.29" = { @@ -7357,15 +7312,6 @@ let sha512 = "Y29uQ3Uy+58bZrFLhX36hcI3Np37nqWE7ky5tjiDoy1GDZnIwVxS0CgF+s+1bXMzjKBFy+fqaRfb708iNzdinw=="; }; }; - "@types/ws-7.4.1" = { - name = "_at_types_slash_ws"; - packageName = "@types/ws"; - version = "7.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/ws/-/ws-7.4.1.tgz"; - sha512 = "ISCK1iFnR+jYv7+jLNX0wDqesZ/5RAeY3wUx6QaphmocphU61h+b+PHjS18TF4WIPTu/MMzxIq2PHr32o2TS5Q=="; - }; - }; "@types/ws-7.4.4" = { name = "_at_types_slash_ws"; packageName = "@types/ws"; @@ -7420,13 +7366,13 @@ let sha512 = "S9q47ByT2pPvD65IvrWp7qppVMpk9WGMbVq9wbWZOHg6tnXSD4vyhao6nOSBwwfDdV2p3Kx9evA9vI+XWTfDvw=="; }; }; - "@typescript-eslint/eslint-plugin-4.26.0" = { + "@typescript-eslint/eslint-plugin-4.26.1" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "4.26.0"; + version = "4.26.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.26.0.tgz"; - sha512 = "yA7IWp+5Qqf+TLbd8b35ySFOFzUfL7i+4If50EqvjT6w35X8Lv0eBHb6rATeWmucks37w+zV+tWnOXI9JlG6Eg=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.26.1.tgz"; + sha512 = "aoIusj/8CR+xDWmZxARivZjbMBQTT9dImUtdZ8tVCVRXgBUuuZyM5Of5A9D9arQPxbi/0rlJLcuArclz/rCMJw=="; }; }; "@typescript-eslint/experimental-utils-3.10.1" = { @@ -7438,13 +7384,13 @@ let sha512 = "DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw=="; }; }; - "@typescript-eslint/experimental-utils-4.26.0" = { + "@typescript-eslint/experimental-utils-4.26.1" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "4.26.0"; + version = "4.26.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.26.0.tgz"; - sha512 = "TH2FO2rdDm7AWfAVRB5RSlbUhWxGVuxPNzGT7W65zVfl8H/WeXTk1e69IrcEVsBslrQSTDKQSaJD89hwKrhdkw=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.26.1.tgz"; + sha512 = "sQHBugRhrXzRCs9PaGg6rowie4i8s/iD/DpTB+EXte8OMDfdCG5TvO73XlO9Wc/zi0uyN4qOmX9hIjQEyhnbmQ=="; }; }; "@typescript-eslint/parser-3.10.1" = { @@ -7456,22 +7402,22 @@ let sha512 = "Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw=="; }; }; - "@typescript-eslint/parser-4.26.0" = { + "@typescript-eslint/parser-4.26.1" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "4.26.0"; + version = "4.26.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.26.0.tgz"; - sha512 = "b4jekVJG9FfmjUfmM4VoOItQhPlnt6MPOBUL0AQbiTmm+SSpSdhHYlwayOm4IW9KLI/4/cRKtQCmDl1oE2OlPg=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.26.1.tgz"; + sha512 = "q7F3zSo/nU6YJpPJvQveVlIIzx9/wu75lr6oDbDzoeIRWxpoc/HQ43G4rmMoCc5my/3uSj2VEpg/D83LYZF5HQ=="; }; }; - "@typescript-eslint/scope-manager-4.26.0" = { + "@typescript-eslint/scope-manager-4.26.1" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "4.26.0"; + version = "4.26.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.26.0.tgz"; - sha512 = "G6xB6mMo4xVxwMt5lEsNTz3x4qGDt0NSGmTBNBPJxNsrTXJSm21c6raeYroS2OwQsOyIXqKZv266L/Gln1BWqg=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.26.1.tgz"; + sha512 = "TW1X2p62FQ8Rlne+WEShyd7ac2LA6o27S9i131W4NwDSfyeVlQWhw8ylldNNS8JG6oJB9Ha9Xyc+IUcqipvheQ=="; }; }; "@typescript-eslint/types-3.10.1" = { @@ -7483,13 +7429,13 @@ let sha512 = "+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ=="; }; }; - "@typescript-eslint/types-4.26.0" = { + "@typescript-eslint/types-4.26.1" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "4.26.0"; + version = "4.26.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.26.0.tgz"; - sha512 = "rADNgXl1kS/EKnDr3G+m7fB9yeJNnR9kF7xMiXL6mSIWpr3Wg5MhxyfEXy/IlYthsqwBqHOr22boFbf/u6O88A=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.26.1.tgz"; + sha512 = "STyMPxR3cS+LaNvS8yK15rb8Y0iL0tFXq0uyl6gY45glyI7w0CsyqyEXl/Fa0JlQy+pVANeK3sbwPneCbWE7yg=="; }; }; "@typescript-eslint/typescript-estree-3.10.1" = { @@ -7501,13 +7447,13 @@ let sha512 = "QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w=="; }; }; - "@typescript-eslint/typescript-estree-4.26.0" = { + "@typescript-eslint/typescript-estree-4.26.1" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "4.26.0"; + version = "4.26.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.26.0.tgz"; - sha512 = "GHUgahPcm9GfBuy3TzdsizCcPjKOAauG9xkz9TR8kOdssz2Iz9jRCSQm6+aVFa23d5NcSpo1GdHGSQKe0tlcbg=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.26.1.tgz"; + sha512 = "l3ZXob+h0NQzz80lBGaykdScYaiEbFqznEs99uwzm8fPHhDjwaBFfQkjUC/slw6Sm7npFL8qrGEAMxcfBsBJUg=="; }; }; "@typescript-eslint/visitor-keys-3.10.1" = { @@ -7519,13 +7465,13 @@ let sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ=="; }; }; - "@typescript-eslint/visitor-keys-4.26.0" = { + "@typescript-eslint/visitor-keys-4.26.1" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "4.26.0"; + version = "4.26.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.26.0.tgz"; - sha512 = "cw4j8lH38V1ycGBbF+aFiLUls9Z0Bw8QschP3mkth50BbWzgFS33ISIgBzUMuQ2IdahoEv/rXstr8Zhlz4B1Zg=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.26.1.tgz"; + sha512 = "IGouNSSd+6x/fHtYRyLOM6/C+QxMDzWlDtN41ea+flWuSF9g02iqcIlX8wM53JkfljoIjP0U+yp7SiTS1onEkw=="; }; }; "@uifabric/foundation-7.9.26" = { @@ -7663,31 +7609,31 @@ let sha512 = "B6PedV/H2kcGEAgnqncwjHe3E8fqUNXCLv1BsrNwkHHWQJXkDN7dFeuEB4oaucBOVbjhH7KGLJ6JAiXPE3S7xA=="; }; }; - "@vue/compiler-core-3.0.11" = { + "@vue/compiler-core-3.1.1" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.0.11"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.0.11.tgz"; - sha512 = "6sFj6TBac1y2cWCvYCA8YzHJEbsVkX7zdRs/3yK/n1ilvRqcn983XvpBbnN3v4mZ1UiQycTvOiajJmOgN9EVgw=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.1.1.tgz"; + sha512 = "Z1RO3T6AEtAUFf2EqqovFm3ohAeTvFzRtB0qUENW2nEerJfdlk13/LS1a0EgsqlzxmYfR/S/S/gW9PLbFZZxkA=="; }; }; - "@vue/compiler-dom-3.0.11" = { + "@vue/compiler-dom-3.1.1" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.0.11"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.0.11.tgz"; - sha512 = "+3xB50uGeY5Fv9eMKVJs2WSRULfgwaTJsy23OIltKgMrynnIj8hTYY2UL97HCoz78aDw1VDXdrBQ4qepWjnQcw=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.1.1.tgz"; + sha512 = "nobRIo0t5ibzg+q8nC31m+aJhbq8FbWUoKvk6h3Vs1EqTDJaj6lBTcVTq5or8AYht7FbSpdAJ81isbJ1rWNX7A=="; }; }; - "@vue/shared-3.0.11" = { + "@vue/shared-3.1.1" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.0.11"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.0.11.tgz"; - sha512 = "b+zB8A2so8eCE0JsxjL24J7vdGl8rzPQ09hZNhystm+KqSbKcAej1A+Hbva1rCMmTTqA+hFnUSDc5kouEo0JzA=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.1.1.tgz"; + sha512 = "g+4pzAw7PYSjARtLBoDq6DmcblX8i9KJHSCnyM5VDDFFifUaUT9iHbFpOF/KOizQ9f7QAqU2JH3Y6aXjzUMhVA=="; }; }; "@webassemblyjs/ast-1.11.0" = { @@ -8185,31 +8131,31 @@ let sha512 = "2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA=="; }; }; - "@webpack-cli/configtest-1.0.3" = { + "@webpack-cli/configtest-1.0.4" = { name = "_at_webpack-cli_slash_configtest"; packageName = "@webpack-cli/configtest"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.3.tgz"; - sha512 = "WQs0ep98FXX2XBAfQpRbY0Ma6ADw8JR6xoIkaIiJIzClGOMqVRvPCWqndTxf28DgFopWan0EKtHtg/5W1h0Zkw=="; + url = "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.4.tgz"; + sha512 = "cs3XLy+UcxiP6bj0A6u7MLLuwdXJ1c3Dtc0RkKg+wiI1g/Ti1om8+/2hc2A2B60NbBNAbMgyBMHvyymWm/j4wQ=="; }; }; - "@webpack-cli/info-1.2.4" = { + "@webpack-cli/info-1.3.0" = { name = "_at_webpack-cli_slash_info"; packageName = "@webpack-cli/info"; - version = "1.2.4"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/info/-/info-1.2.4.tgz"; - sha512 = "ogE2T4+pLhTTPS/8MM3IjHn0IYplKM4HbVNMCWA9N4NrdPzunwenpCsqKEXyejMfRu6K8mhauIPYf8ZxWG5O6g=="; + url = "https://registry.npmjs.org/@webpack-cli/info/-/info-1.3.0.tgz"; + sha512 = "ASiVB3t9LOKHs5DyVUcxpraBXDOKubYu/ihHhU+t1UPpxsivg6Od2E2qU4gJCekfEddzRBzHhzA/Acyw/mlK/w=="; }; }; - "@webpack-cli/serve-1.4.0" = { + "@webpack-cli/serve-1.5.1" = { name = "_at_webpack-cli_slash_serve"; packageName = "@webpack-cli/serve"; - version = "1.4.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.4.0.tgz"; - sha512 = "xgT/HqJ+uLWGX+Mzufusl3cgjAcnqYYskaB7o0vRcwOEfuu6hMzSILQpnIzFMGsTaeaX4Nnekl+6fadLbl1/Vg=="; + url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.5.1.tgz"; + sha512 = "4vSVUiOPJLmr45S8rMGy7WDvpWxfFxfP/Qx/cxZFCfvoypTYpPPL1X8VIZMe0WTA+Jr7blUxwUSEZNkjoMTgSw=="; }; }; "@wry/equality-0.1.11" = { @@ -8545,13 +8491,13 @@ let sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; }; }; - "acorn-8.3.0" = { + "acorn-8.4.0" = { name = "acorn"; packageName = "acorn"; - version = "8.3.0"; + version = "8.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.3.0.tgz"; - sha512 = "tqPKHZ5CaBJw0Xmy0ZZvLs1qTV+BNFSyvn77ASXkpBNfIRk8ev26fKrD9iLGwGA9zedPao52GSHzq8lyZG0NUw=="; + url = "https://registry.npmjs.org/acorn/-/acorn-8.4.0.tgz"; + sha512 = "ULr0LDaEqQrMFGyQ3bhJkLsbtrQ8QibAseGZeaSUiT/6zb9IvIkomWHJIvgvwad+hinRAgsI51JcWk2yvwyL+w=="; }; }; "acorn-globals-1.0.9" = { @@ -8743,15 +8689,6 @@ let sha512 = "IWwXKnCbirdbyXSfUDvCCrmYrOHANRZcc8NcRrvTlIApdl7PwE9oGcsYvNeJPAVY1M+70b4PxXGKIf8AEuiQ6w=="; }; }; - "adverb-where-0.0.9" = { - name = "adverb-where"; - packageName = "adverb-where"; - version = "0.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/adverb-where/-/adverb-where-0.0.9.tgz"; - sha1 = "09c5cddd8d503b9fe5f76e0b8dc5c70a8f193e34"; - }; - }; "adverb-where-0.2.5" = { name = "adverb-where"; packageName = "adverb-where"; @@ -8914,13 +8851,13 @@ let sha512 = "WSNGFuyWd//XO8n/m/EaOlNLtO0yL8EXT/74LqT4khdhpZjP7lkj/kT5uwRmGitKEVp/Oj7ZUHeGfPtgHhQ5CA=="; }; }; - "ajv-8.5.0" = { + "ajv-8.6.0" = { name = "ajv"; packageName = "ajv"; - version = "8.5.0"; + version = "8.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-8.5.0.tgz"; - sha512 = "Y2l399Tt1AguU3BPRP9Fn4eN+Or+StUGWCUpbnFyXSo8NZ9S4uj+AG2pjs5apK+ZMOwYOz1+a+VKvKH7CudXgQ=="; + url = "https://registry.npmjs.org/ajv/-/ajv-8.6.0.tgz"; + sha512 = "cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ=="; }; }; "ajv-errors-1.0.1" = { @@ -9112,15 +9049,6 @@ let sha512 = "SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA=="; }; }; - "ansi-colors-3.2.3" = { - name = "ansi-colors"; - packageName = "ansi-colors"; - version = "3.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz"; - sha512 = "LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw=="; - }; - }; "ansi-colors-3.2.4" = { name = "ansi-colors"; packageName = "ansi-colors"; @@ -9526,13 +9454,13 @@ let sha512 = "MsVCuf/2FxuTFVhGLK13B+TZH9tBd2qkyoXKKILIiGcZ5CDUEBO14vIV63aNkMkS1xxvK2U4wBcuuNj/VH2Mkw=="; }; }; - "apollo-server-core-2.25.0" = { + "apollo-server-core-2.25.1" = { name = "apollo-server-core"; packageName = "apollo-server-core"; - version = "2.25.0"; + version = "2.25.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.25.0.tgz"; - sha512 = "LqDmY+R5dcb6zj/RgM7P8NnURV2XdQFIF4rY7g80hD9mc2WSCKHF6eH+lHG0sFPW7f8iBr+lJ4LyETuWEVF0hg=="; + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.25.1.tgz"; + sha512 = "10gVjvGv3uPfy7gUFQhgNhb66RorD1qX6yF4bTawm4S6JstkGrWYFJN5/48o7Mte+tATpXzAGiWu0l4wsYA/mA=="; }; }; "apollo-server-env-3.1.0" = { @@ -9553,13 +9481,13 @@ let sha512 = "lO5oTjgiC3vlVg2RKr3RiXIIQ5pGXBFxYGGUkKDhTud3jMIhs+gel8L8zsEjKaKxkjHhCQAA/bcEfYiKkGQIvA=="; }; }; - "apollo-server-express-2.25.0" = { + "apollo-server-express-2.25.1" = { name = "apollo-server-express"; packageName = "apollo-server-express"; - version = "2.25.0"; + version = "2.25.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.25.0.tgz"; - sha512 = "FCTisD+VB1LCcTjjhKvQZ/dkly83KVlioFMgcPjW1X/kzCznRT3aQoVn9bQHlzQr7NnpwFseb4Rhd2KKD4wKEA=="; + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.25.1.tgz"; + sha512 = "9idHkV3umcIDdq/NIQEC2D6zZ0QtaMRVCbeRcDgm9uWWiX3ulK5ICdHbNBu5UHXkDmKjfZiGaCWBZti0MsRQAg=="; }; }; "apollo-server-plugin-base-0.13.0" = { @@ -10714,13 +10642,13 @@ let sha512 = "hIsyIeDv5LPDh+/Yv9+NDcV0z+WtHo7937abePpW9ikx9WNB75BRn/AuP2jkk3YpfxIp4mGaY6zgUm014VU7Hw=="; }; }; - "asyncjs-util-1.2.5" = { + "asyncjs-util-1.2.6" = { name = "asyncjs-util"; packageName = "asyncjs-util"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/asyncjs-util/-/asyncjs-util-1.2.5.tgz"; - sha512 = "P0BY77ZZvaF+rka9mx12r9ys+U+DDz9yhIz6vbSSNhyKzFJce+jrYSRufvg7RLOH/M8XnhIDOBpagbRtRJiuGA=="; + url = "https://registry.npmjs.org/asyncjs-util/-/asyncjs-util-1.2.6.tgz"; + sha512 = "PxQ2drzeOUe20HsjIXOlfw76Ci8RQkF2B95arcQap02jJ3lByNKkC3MtVFhIWF+FYl738tD/tZHOlUuYfamFvw=="; }; }; "asynckit-0.4.0" = { @@ -10894,22 +10822,22 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.784.0" = { + "aws-sdk-2.920.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.784.0"; + version = "2.920.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.784.0.tgz"; - sha512 = "+KBkqH7t/XE91Fqn8eyJeNIWsnhSWL8bSUqFD7TfE3FN07MTlC0nprGYp+2WfcYNz5i8Bus1vY2DHNVhtTImnw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.920.0.tgz"; + sha512 = "tbMZ/Y2rRo6R6TTBODJXTiil+MXaoT6Qzotws3yvI1IWGpYxKo7N/3L06XB8ul8tCG0TigxIOY70SMICM70Ppg=="; }; }; - "aws-sdk-2.918.0" = { + "aws-sdk-2.927.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.918.0"; + version = "2.927.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.918.0.tgz"; - sha512 = "ZjWanOA1Zo664EyWLCnbUlkwCjoRPmSIMx529W4gk1418qo3oCEcvUy1HeibGGIClYnZZ7J4FMQvVDm2+JtHLQ=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.927.0.tgz"; + sha512 = "S1dbpq26bQNYBQPHAsZBt0/L/e0FAWFdjjQoU3zdaVIXa08eA9d/oRI3kEs568ErJgBjwWU1CUUlr1byBxKjUQ=="; }; }; "aws-sign2-0.6.0" = { @@ -11947,13 +11875,13 @@ let sha1 = "e6d5ea8c5dad001304a70b22638447f69cb2f809"; }; }; - "before-after-hook-2.2.1" = { + "before-after-hook-2.2.2" = { name = "before-after-hook"; packageName = "before-after-hook"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.1.tgz"; - sha512 = "/6FKxSTWoJdbsLDF8tdIjaRiFXiE6UHsEHE3OPI/cwPURCVi1ukP0gmLn7XWEiFk5TcwQjjY5PWsU+j+tgXgmw=="; + url = "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.2.tgz"; + sha512 = "3pZEU3NT5BFUo/AD5ERPWOgQOCZITni6iavr5AUw5AUwQjMlI0kzu5btnyD39AF0gUEsDPwJT+oY1ORBJijPjQ=="; }; }; "bencode-0.7.0" = { @@ -12010,15 +11938,6 @@ let sha512 = "Al3nHGQGqDYqqinXhQzmwmcRToe/3WyBv4N8aZc5Pef8xw2neZlR9VPi84Sa23JtgWcucu18HxVZrnI0fn2etw=="; }; }; - "better-ajv-errors-0.6.7" = { - name = "better-ajv-errors"; - packageName = "better-ajv-errors"; - version = "0.6.7"; - src = fetchurl { - url = "https://registry.npmjs.org/better-ajv-errors/-/better-ajv-errors-0.6.7.tgz"; - sha512 = "PYgt/sCzR4aGpyNy5+ViSQ77ognMnWq7745zM+/flYO4/Yisdtp9wDQW2IKCyVYPUxQt3E/b5GBSwfhd1LPdlg=="; - }; - }; "better-assert-1.0.2" = { name = "better-assert"; packageName = "better-assert"; @@ -12361,13 +12280,13 @@ let sha512 = "SrLwMzrpETJDiH9z12EMcqtApgcQo9XsPi+S9Aodezu53ALcGjBBQ7+C+IWbsSCBlSvNEec8sqfh3itO/j/QUw=="; }; }; - "bit-field-1.3.6" = { + "bit-field-1.4.0" = { name = "bit-field"; packageName = "bit-field"; - version = "1.3.6"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/bit-field/-/bit-field-1.3.6.tgz"; - sha512 = "gu+wXJ+saekzja7tSRygoR+M+C88U0IoVTdp0SmZj5tyDwSkWmZNhSUkBmHx2NNZcSAB0gu9g8yBd1Kn7ECVmw=="; + url = "https://registry.npmjs.org/bit-field/-/bit-field-1.4.0.tgz"; + sha512 = "HmJvg3BWUuZKw6Q/WV30FprzHtDcZaZHIW03T4kWVlZ0vVR2jVn2h3gFCL5R/8/43pCrNzW+IKQ7KDCI8SsFYw=="; }; }; "bitcoin-core-2.3.0" = { @@ -12829,22 +12748,22 @@ let sha512 = "dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw=="; }; }; - "bolt01-1.2.1" = { + "bolt01-1.2.2" = { name = "bolt01"; packageName = "bolt01"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/bolt01/-/bolt01-1.2.1.tgz"; - sha512 = "Mpk1QZofLqrJ1Sjm1vA1HKov6+ffOhCUTP5ae8UTK+U7IwbGSQTfQWu1m6waoSmUN7esQDAS2gBE6PiVaHK0ww=="; + url = "https://registry.npmjs.org/bolt01/-/bolt01-1.2.2.tgz"; + sha512 = "IH3j1UF+XewQ8ngHW4HVPF9E1GS8R0fGtnvfCVkTTcLYBQOQrP9kvSxS8Wz4HFfjCR34Ep0fIibF69LVnHbbxQ=="; }; }; - "bolt03-1.2.9" = { + "bolt03-1.2.10" = { name = "bolt03"; packageName = "bolt03"; - version = "1.2.9"; + version = "1.2.10"; src = fetchurl { - url = "https://registry.npmjs.org/bolt03/-/bolt03-1.2.9.tgz"; - sha512 = "2WVVcn+pQXIbDkVixZ6c6Hu0E+LiCyUnj14xQs6qEgU3Sq4NFEguAzDwuvr2B9IxwVGD+5/rH5H9RbY0+d5KlQ=="; + url = "https://registry.npmjs.org/bolt03/-/bolt03-1.2.10.tgz"; + sha512 = "1t2jGC59hIiiSudf3OK6Z2E1wdnfSXBuEfbawpS33y3XHgkPFwt+IzEI8Xvqk/MqgXNRBVPhG8A5+SdYoeLT7A=="; }; }; "bolt07-1.7.1" = { @@ -12856,13 +12775,13 @@ let sha512 = "vZCX56PB0274YW8BuCE91xWgqCPkfndBkknYYZFajX6Zr/KByMDXKQ2t1KKSYVkzzTL0rqeLWyQKdL6gJU1zHA=="; }; }; - "bolt07-1.7.2" = { + "bolt07-1.7.3" = { name = "bolt07"; packageName = "bolt07"; - version = "1.7.2"; + version = "1.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/bolt07/-/bolt07-1.7.2.tgz"; - sha512 = "b1ZmcU1ucTjRL/FvYUDbLqCmc1I0PRLWB+yvlI6w8l9be5JJgzaf1AmU6+yoa1eL3cqX8leWzyaVjWTjRKGfMg=="; + url = "https://registry.npmjs.org/bolt07/-/bolt07-1.7.3.tgz"; + sha512 = "zXhf60qEpFXwRTeoaJ+0SyPw/jzBtIHZLCJBvaa0rFGiiQKdWXdaiIWeyIkxl74p/UGUv4BQsbkAgB0Em/1QOQ=="; }; }; "bolt09-0.1.3" = { @@ -12874,13 +12793,13 @@ let sha512 = "xFfW/ix6qSzBVGGt3jgpG/SX1LgVvGUYxA/0yC6uaPAjgqbdqmbDZzNEqMRps7Z8Vp1H3yfO5JXQuX54n/GzZg=="; }; }; - "bolt09-0.1.4" = { + "bolt09-0.1.5" = { name = "bolt09"; packageName = "bolt09"; - version = "0.1.4"; + version = "0.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/bolt09/-/bolt09-0.1.4.tgz"; - sha512 = "I8GZoVvQDF7w/93XNbUD29hBoN+kiPomPb8X/D6510pjRI5/KgZ0nITH4BAymS89GTGPjI5ZavkFw3vxxRhjQQ=="; + url = "https://registry.npmjs.org/bolt09/-/bolt09-0.1.5.tgz"; + sha512 = "oT1+erg21vat55oXNd7nNEkCO0FQnmaraFZuyXFyeVk7dZCm/3vgic0qK1VuUSV+ksYXJfRKYC4AqfYrtHNPZg=="; }; }; "bonjour-3.5.0" = { @@ -12901,13 +12820,13 @@ let sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"; }; }; - "boolean-3.1.0" = { + "boolean-3.1.2" = { name = "boolean"; packageName = "boolean"; - version = "3.1.0"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/boolean/-/boolean-3.1.0.tgz"; - sha512 = "K6r5tvO1ykeYerI7jIyTvSFw2l6D6DzqkljGj2E2uyYAAdDo2SV4qGJIV75cHIQpTFyb6BB0BEHiDdDrFsNI+g=="; + url = "https://registry.npmjs.org/boolean/-/boolean-3.1.2.tgz"; + sha512 = "YN6UmV0FfLlBVvRvNPx3pz5W/mUoYB24J4WSXOKP/OOJpi+Oq6WYqPaNTHzjI0QzwWtnvEd5CGYyQPgp1jFxnw=="; }; }; "boom-2.10.1" = { @@ -14062,13 +13981,13 @@ let sha512 = "Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg=="; }; }; - "cacheable-request-7.0.1" = { + "cacheable-request-7.0.2" = { name = "cacheable-request"; packageName = "cacheable-request"; - version = "7.0.1"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.1.tgz"; - sha512 = "lt0mJ6YAnsrBErpTMWeu5kl/tg9xMAWjavYTN6VQXM1A/teBITuNcccXsCxF0tDQQJf9DfAaX5O4e0zp0KlfZw=="; + url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.2.tgz"; + sha512 = "pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew=="; }; }; "cached-path-relative-1.0.2" = { @@ -14314,13 +14233,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001232" = { + "caniuse-lite-1.0.30001237" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001232"; + version = "1.0.30001237"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001232.tgz"; - sha512 = "e4Gyp7P8vqC2qV2iHA+cJNf/yqUKOShXQOJHQt81OHxlIZl/j/j3soEA0adAQi8CPUQgvOdDENyQ5kd6a6mNSg=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001237.tgz"; + sha512 = "pDHgRndit6p1NR2GhzMbQ6CkRrp4VKuSsqbcLeOQppYPKOYkKT/6ZvZDvKJUqcmtyWIAHuZq3SVS2vc1egCZzw=="; }; }; "canvas-2.8.0" = { @@ -14485,13 +14404,22 @@ let sha512 = "NU5mZbOE3RgRX7a9zHf4AgiNcI/clqQ9vw/YixSgVe2AOiAsUXuSH2BCc3eFAZSlPSQYLxWG6mSCGY/06cy5Hw=="; }; }; - "cdktf-0.4.0" = { + "cdk8s-plus-17-1.0.0-beta.18" = { + name = "cdk8s-plus-17"; + packageName = "cdk8s-plus-17"; + version = "1.0.0-beta.18"; + src = fetchurl { + url = "https://registry.npmjs.org/cdk8s-plus-17/-/cdk8s-plus-17-1.0.0-beta.18.tgz"; + sha512 = "7TIYXo9fIdj8kawpiIaGNlhxewE2KbundrZDMMLSchsb9QtJBYQEj8a00kUBonPMpftwZCQY36RANEThq16BRQ=="; + }; + }; + "cdktf-0.4.1" = { name = "cdktf"; packageName = "cdktf"; - version = "0.4.0"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf/-/cdktf-0.4.0.tgz"; - sha512 = "P6KRqGokkAVRZdT2+fXfEdQszpOXrJa/EuNZr0WPcIrfTVfjL6HNrHyuP1HWUvJRzlcbG5ZZ3+8Uk4oFS9IXvA=="; + url = "https://registry.npmjs.org/cdktf/-/cdktf-0.4.1.tgz"; + sha512 = "U5aap+QH+w/0ibeFRYm8T/JtaA8AkjCkQ6c60eL/5hY0K0qi8rjEBpQcEho9KljqZvWap6mD2yD+JqunbLzRGA=="; }; }; "center-align-0.1.3" = { @@ -14827,6 +14755,15 @@ let sha1 = "a9baa860a3f9b595a6b81b1a86873121ed3a269e"; }; }; + "cheerio-1.0.0-rc.10" = { + name = "cheerio"; + packageName = "cheerio"; + version = "1.0.0-rc.10"; + src = fetchurl { + url = "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.10.tgz"; + sha512 = "g0J0q/O6mW8z5zxQ3A8E8J1hUgp4SMOvEoW/x84OwyHKe/Zccz83PVT4y5Crcr530FV6NgmKI1qvGTKVl9XXVw=="; + }; + }; "cheerio-1.0.0-rc.3" = { name = "cheerio"; packageName = "cheerio"; @@ -14854,22 +14791,13 @@ let sha512 = "hjx1XE1M/D5pAtMgvWwE21QClmAEeGHOIDfycgmndisdNgI6PE1cGRQkMGBcsbUbmEQyWu5PJLUcAOjtQS8DWw=="; }; }; - "cheerio-1.0.0-rc.9" = { - name = "cheerio"; - packageName = "cheerio"; - version = "1.0.0-rc.9"; - src = fetchurl { - url = "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.9.tgz"; - sha512 = "QF6XVdrLONO6DXRF5iaolY+odmhj2CLj+xzNod7INPWMi/x9X4SOylH0S/vaPpX+AUU6t04s34SQNh7DbkuCng=="; - }; - }; - "cheerio-select-1.4.0" = { + "cheerio-select-1.5.0" = { name = "cheerio-select"; packageName = "cheerio-select"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/cheerio-select/-/cheerio-select-1.4.0.tgz"; - sha512 = "sobR3Yqz27L553Qa7cK6rtJlMDbiKPdNywtR95Sj/YgfpLfy0u6CGJuaBKe5YE/vTc23SCRKxWSdlon/w6I/Ew=="; + url = "https://registry.npmjs.org/cheerio-select/-/cheerio-select-1.5.0.tgz"; + sha512 = "qocaHPv5ypefh6YNxvnbABM07KMxExbtbfuJoIie3iZXX1ERwYmJcIiRrr9H05ucQP1k28dav8rpdDgjQd8drg=="; }; }; "cheerio-select-tmp-0.1.1" = { @@ -14899,15 +14827,6 @@ let sha512 = "0UQ55f51JBkOFa+fvR76ywRzxiPwQS3Xe8oe5bZRphpv+dIMeerW5Zn5e4cUy4COJwVtJyU0R79RMnw+aCqmGA=="; }; }; - "child_process-1.0.2" = { - name = "child_process"; - packageName = "child_process"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/child_process/-/child_process-1.0.2.tgz"; - sha1 = "b1f7e7fc73d25e7fd1d455adc94e143830182b5a"; - }; - }; "chloride-2.4.1" = { name = "chloride"; packageName = "chloride"; @@ -14953,15 +14872,6 @@ let sha512 = "c4PR2egjNjI1um6bamCQ6bUNPDiyofNQruHvKgHQ4gDUP/ITSVSzNsiI5OWtHOsX323i5ha/kk4YmOZ1Ktg7KA=="; }; }; - "chokidar-3.3.0" = { - name = "chokidar"; - packageName = "chokidar"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz"; - sha512 = "dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A=="; - }; - }; "chokidar-3.5.1" = { name = "chokidar"; packageName = "chokidar"; @@ -15223,13 +15133,13 @@ let sha512 = "OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA=="; }; }; - "cldr-5.8.0" = { + "cldr-6.1.1" = { name = "cldr"; packageName = "cldr"; - version = "5.8.0"; + version = "6.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/cldr/-/cldr-5.8.0.tgz"; - sha512 = "w0L5FX4X3txDX5G/YSbDAQuneVSFPSKjOXB2ehWh/J6BN7RJ+IUEVNG9hIGjuJoyYJcVGE2AoL0W0VSjirQPIg=="; + url = "https://registry.npmjs.org/cldr/-/cldr-6.1.1.tgz"; + sha512 = "Efm9g4BcBHWdy7jMcuXtWk7PI1gIx4nO1BhJyaFTeRktytW0tR4rDmm+PG7mSMLrnNUFcr3ww8JwJAgkNRMv5Q=="; }; }; "clean-css-3.4.28" = { @@ -15943,15 +15853,6 @@ let sha512 = "tge3BeOtehBouqo8sdrjRuQxsAWuwUxWJN1pTttZ8HpV+fe2fxmBE9lqrzzOlRIysBvgsZr7D0FdNfrwRwpK8A=="; }; }; - "code-error-fragment-0.0.230" = { - name = "code-error-fragment"; - packageName = "code-error-fragment"; - version = "0.0.230"; - src = fetchurl { - url = "https://registry.npmjs.org/code-error-fragment/-/code-error-fragment-0.0.230.tgz"; - sha512 = "cadkfKp6932H8UkhzE/gcUqhRMNf8jHzkAN7+5Myabswaghu4xABTgPHDCjW+dBAJxj/SpkTYokpzDqY4pCzQw=="; - }; - }; "code-excerpt-3.0.0" = { name = "code-excerpt"; packageName = "code-excerpt"; @@ -16555,13 +16456,13 @@ let sha512 = "L3sHRo1pXXEqX8VU28kfgUY+YGsk09hPqZiZmLacNib6XNTCM8ubYeT7ryXQw8asB1sKgcU5lkB7ONug08aB8w=="; }; }; - "common-path-prefix-2.0.0" = { + "common-path-prefix-3.0.0" = { name = "common-path-prefix"; packageName = "common-path-prefix"; - version = "2.0.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-2.0.0.tgz"; - sha512 = "Lb9qbwwyQdRDmyib0qur7BC9/GHIbviTaQebayFsGC/n77AwFhZINCcJkQx2qVv9LJsA8F5ex65F2qrOfWGUyw=="; + url = "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz"; + sha512 = "QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w=="; }; }; "common-tags-1.8.0" = { @@ -16843,13 +16744,13 @@ let sha512 = "Ep/l9Rd1J9IPueztJfpbOqVzuKHQh4ZODMNt9xqTYdBBNRXbV4oTu34kCkkfdRVcDq0ohtpaeXGgb+c0LQxFRA=="; }; }; - "config-chain-1.1.12" = { + "config-chain-1.1.13" = { name = "config-chain"; packageName = "config-chain"; - version = "1.1.12"; + version = "1.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz"; - sha512 = "a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA=="; + url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz"; + sha512 = "qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ=="; }; }; "configstore-1.4.0" = { @@ -17041,13 +16942,13 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "constructs-3.3.75" = { + "constructs-3.3.77" = { name = "constructs"; packageName = "constructs"; - version = "3.3.75"; + version = "3.3.77"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.75.tgz"; - sha512 = "q10foASSSfDWmS99OQLfnWDXCzqLvoORISAVWPFg0AmIGlBv2ZdDOtXxLqrJARPxVlOldmW2JzWzdRI+4+0/ZA=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.77.tgz"; + sha512 = "A9xWepIkiED0baaEWxokUvRnPrxcAwoCsyIPDAJ3VqQ90juiIHQ0gkW9GX0nG6c+Go5l1dL5FZIFZBeayx+xIg=="; }; }; "consume-http-header-1.0.0" = { @@ -17123,13 +17024,13 @@ let sha1 = "0e790b3abfef90f6ecb77ae8585db9099caf7578"; }; }; - "contentful-management-7.22.4" = { + "contentful-management-7.24.0" = { name = "contentful-management"; packageName = "contentful-management"; - version = "7.22.4"; + version = "7.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/contentful-management/-/contentful-management-7.22.4.tgz"; - sha512 = "nwFWfaaIQGveN9bAEZ6IpQjWeZlDgse1SXvgdR/D3mxTUYqDlyQv1sIqst+tcgd09zF4TuEKgF0e6Xmc0X1XhQ=="; + url = "https://registry.npmjs.org/contentful-management/-/contentful-management-7.24.0.tgz"; + sha512 = "Uo6SZ2q5PqrOSwFWX609/Dy1xfpwTJ0uOw4GuohIeo+MgJJqEwJcZ+K4H7/ie3QievZ1V7dm/f5AyyCalTCtgA=="; }; }; "contentful-sdk-core-6.8.0" = { @@ -17546,13 +17447,13 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-3.13.1" = { + "core-js-3.14.0" = { name = "core-js"; packageName = "core-js"; - version = "3.13.1"; + version = "3.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.13.1.tgz"; - sha512 = "JqveUc4igkqwStL2RTRn/EPFGBOfEZHxJl/8ej1mXJR75V3go2mFF4bmUYkEIT1rveHKnkUlcJX/c+f1TyIovQ=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.14.0.tgz"; + sha512 = "3s+ed8er9ahK+zJpp9ZtuVcDoFzHNiZsPbNAAE4KXgrRHbjSqqNN6xGSXq6bq7TZIbKj4NLrLb6bJ5i+vSVjHA=="; }; }; "core-js-3.8.3" = { @@ -17564,22 +17465,22 @@ let sha512 = "KPYXeVZYemC2TkNEkX/01I+7yd+nX3KddKwZ1Ww7SKWdI2wQprSgLmrTddT8nw92AjEklTsPBoSdQBhbI1bQ6Q=="; }; }; - "core-js-compat-3.13.1" = { + "core-js-compat-3.14.0" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.13.1"; + version = "3.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.13.1.tgz"; - sha512 = "mdrcxc0WznfRd8ZicEZh1qVeJ2mu6bwQFh8YVUK48friy/FOwFV5EJj9/dlh+nMQ74YusdVfBFDuomKgUspxWQ=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.14.0.tgz"; + sha512 = "R4NS2eupxtiJU+VwgkF9WTpnSfZW4pogwKHd8bclWU2sp93Pr5S1uYJI84cMOubJRou7bcfL0vmwtLslWN5p3A=="; }; }; - "core-js-pure-3.13.1" = { + "core-js-pure-3.14.0" = { name = "core-js-pure"; packageName = "core-js-pure"; - version = "3.13.1"; + version = "3.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.13.1.tgz"; - sha512 = "wVlh0IAi2t1iOEh16y4u1TRk6ubd4KvLE8dlMi+3QUI6SfKphQUh7tAwihGGSQ8affxEXpVIPpOdf9kjR4v4Pw=="; + url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.14.0.tgz"; + sha512 = "YVh+LN2FgNU0odThzm61BsdkwrbrchumFq3oztnE9vTKC4KS2fvnPmcx8t6jnqAyOTCTF4ZSiuK8Qhh7SNcL4g=="; }; }; "core-util-is-1.0.2" = { @@ -17807,13 +17708,13 @@ let sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; }; }; - "create-gatsby-1.6.0" = { + "create-gatsby-1.7.1" = { name = "create-gatsby"; packageName = "create-gatsby"; - version = "1.6.0"; + version = "1.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-1.6.0.tgz"; - sha512 = "mNPBiTZ9aH24I2YInaiBoXDjPgibsystLsXXWpM5miIJpA6rZrJSRtHVGfXUxZXsKHLc/at2vNrFQbsVue3Nyg=="; + url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-1.7.1.tgz"; + sha512 = "X330+JLFhnYDVTEs7nd5nQiaqWc9aq/gAY6V/jXo2ZwySZRW2XMAaL1ROLpkd5MwywTfykW0oJWRhLBwC17a7A=="; }; }; "create-graphback-1.0.1" = { @@ -18194,13 +18095,13 @@ let sha512 = "qmss1EihSuBNWNNhHjxzxSfJoFBM/lERB/Q4EnsJQQC62R2evJDW481091oAdOr9uh46/0n4nrg0It5cAnj1RA=="; }; }; - "css-select-4.1.2" = { + "css-select-4.1.3" = { name = "css-select"; packageName = "css-select"; - version = "4.1.2"; + version = "4.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/css-select/-/css-select-4.1.2.tgz"; - sha512 = "nu5ye2Hg/4ISq4XqdLY2bEatAcLIdt3OYGFc9Tm9n7VSlFBcfRv0gBNksHRgSdUDQGtN3XrZ94ztW+NfzkFSUw=="; + url = "https://registry.npmjs.org/css-select/-/css-select-4.1.3.tgz"; + sha512 = "gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA=="; }; }; "css-select-base-adapter-0.1.1" = { @@ -18473,13 +18374,13 @@ let sha1 = "d1cfd8743c2f849a0abb2fd544db56695d19a490"; }; }; - "csv-parse-4.15.4" = { + "csv-parse-4.16.0" = { name = "csv-parse"; packageName = "csv-parse"; - version = "4.15.4"; + version = "4.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/csv-parse/-/csv-parse-4.15.4.tgz"; - sha512 = "OdBbFc0yZhOm17lSxqkirrHlFFVpKRT0wp4DAGoJelsP3LbGzV9LNr7XmM/lrr0uGkCtaqac9UhP8PDHXOAbMg=="; + url = "https://registry.npmjs.org/csv-parse/-/csv-parse-4.16.0.tgz"; + sha512 = "Zb4tGPANH4SW0LgC9+s9Mnequs9aqn7N3/pCqNbVjs2XhEF6yWNU2Vm4OGl1v2Go9nw8rXt87Cm2QN/o6Vpqgg=="; }; }; "csv-parser-1.12.1" = { @@ -18824,13 +18725,13 @@ let sha512 = "XG4d1c/UJSEX9NfU02KwBL6BYPj8YKHxgBEw5om2ZnTRSbIcego6dhHwcxuSR3clxh0EpE38os1DVPOmnYtTPg=="; }; }; - "d3-geo-2.0.1" = { + "d3-geo-2.0.2" = { name = "d3-geo"; packageName = "d3-geo"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/d3-geo/-/d3-geo-2.0.1.tgz"; - sha512 = "M6yzGbFRfxzNrVhxDJXzJqSLQ90q1cCyb3EWFZ1LF4eWOBYxFypw7I/NFVBNXKNqxv1bqLathhYvdJ6DC+th3A=="; + url = "https://registry.npmjs.org/d3-geo/-/d3-geo-2.0.2.tgz"; + sha512 = "8pM1WGMLGFuhq9S+FpPURxic+gKzjluCD/CHTuUF3mXMeiCo0i6R0tO1s4+GArRFde96SLcW/kOFRjoAosPsFA=="; }; }; "d3-geo-projection-3.0.0" = { @@ -20480,13 +20381,13 @@ let sha512 = "xd4D8kHQtB0KtWW0c9xBZD5LVtm9chkMOfs/3Yn01RhT/sFIsVtzTtypfKoFfWBaL+7xCYLxjOLkhwPXaX/Kcg=="; }; }; - "devtools-protocol-0.0.869402" = { + "devtools-protocol-0.0.883894" = { name = "devtools-protocol"; packageName = "devtools-protocol"; - version = "0.0.869402"; + version = "0.0.883894"; src = fetchurl { - url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.869402.tgz"; - sha512 = "VvlVYY+VDJe639yHs5PHISzdWTLL3Aw8rO4cvUtwvoxFd6FHbE4OpHHcde52M6096uYYazAmd4l0o5VuFRO2WA=="; + url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.883894.tgz"; + sha512 = "33idhm54QJzf3Q7QofMgCvIVSd2o9H3kQPWaKT/fhoZh+digc+WSiMhbkeG3iN79WY4Hwr9G05NpbhEVrsOYAg=="; }; }; "dezalgo-1.0.3" = { @@ -20597,13 +20498,13 @@ let sha512 = "Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg=="; }; }; - "diff2html-3.4.4" = { + "diff2html-3.4.5" = { name = "diff2html"; packageName = "diff2html"; - version = "3.4.4"; + version = "3.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/diff2html/-/diff2html-3.4.4.tgz"; - sha512 = "yAvhx2GbzzWCAWTepQJrdIPyrjL/29A5UepSAPwnHvwVB41N9oAMshonZmulrFFAFkDN8u9OHKKf/p3R06xuvQ=="; + url = "https://registry.npmjs.org/diff2html/-/diff2html-3.4.5.tgz"; + sha512 = "EvLFeEq4ZAG3URzajoNr2T1C2oQSRYpG+wlPj6d7xKua1+GY6XjZglTobERZUkMm4LyETTmzqHf19kpQljAcgA=="; }; }; "diff3-0.0.3" = { @@ -21191,13 +21092,13 @@ let sha512 = "Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg=="; }; }; - "domutils-2.6.0" = { + "domutils-2.7.0" = { name = "domutils"; packageName = "domutils"; - version = "2.6.0"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/domutils/-/domutils-2.6.0.tgz"; - sha512 = "y0BezHuy4MDYxh6OvolXYsH+1EMGmFbwv5FKW7ovwMG6zTPWqNPq3WF9ayZssFq+UlKdffGLbOEaghNdaOm1WA=="; + url = "https://registry.npmjs.org/domutils/-/domutils-2.7.0.tgz"; + sha512 = "8eaHa17IwJUPAiB+SoTYBo5mCdeMgdcAoXJ59m6DT1vw+5iLS3gNoqYaRowaBKtGVrOF1Jz4yDTgYKLK2kvfJg=="; }; }; "dot-case-3.0.4" = { @@ -21281,15 +21182,6 @@ let sha512 = "IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g=="; }; }; - "dotenv-9.0.2" = { - name = "dotenv"; - packageName = "dotenv"; - version = "9.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/dotenv/-/dotenv-9.0.2.tgz"; - sha512 = "I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg=="; - }; - }; "dotenv-expand-5.1.0" = { name = "dotenv-expand"; packageName = "dotenv-expand"; @@ -21677,13 +21569,13 @@ let sha512 = "1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ=="; }; }; - "electron-to-chromium-1.3.743" = { + "electron-to-chromium-1.3.752" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.743"; + version = "1.3.752"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.743.tgz"; - sha512 = "K2wXfo9iZQzNJNx67+Pld0DRF+9bYinj62gXCdgPhcu1vidwVuLPHQPPFnCdO55njWigXXpfBiT90jGUPbw8Zg=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.752.tgz"; + sha512 = "2Tg+7jSl3oPxgsBsWKh5H83QazTkmWG/cnNwJplmyZc7KcN61+I10oUgaXSVk/NwfvN3BdkKDR4FYuRBQQ2v0A=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -22723,13 +22615,13 @@ let sha512 = "k9gaHeHiFmGCDQ2rEfvULlSLruz6tgfA8DEn+rY9/oYPFFTlz55mM/Q/Rij1b2Y42jwZiK3lXvNTw6w6TXzcKQ=="; }; }; - "eslint-7.27.0" = { + "eslint-7.28.0" = { name = "eslint"; packageName = "eslint"; - version = "7.27.0"; + version = "7.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.27.0.tgz"; - sha512 = "JZuR6La2ZF0UD384lcbnd0Cgg6QJjiCwhMD6eU4h/VGPcVGwawNNzKU41tgokGXnfjOOyI6QIffthhJTPzzuRA=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.28.0.tgz"; + sha512 = "UMfH0VSjP0G4p3EWirscJEQ/cHqnT/iuH6oNZOB94nBjWbMnhGEPxsZm1eyIW0C/9jLI0Fow4W5DXLjEI7mn1g=="; }; }; "eslint-config-prettier-8.3.0" = { @@ -22768,13 +22660,13 @@ let sha512 = "Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ=="; }; }; - "eslint-plugin-vue-7.10.0" = { + "eslint-plugin-vue-7.11.0" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; - version = "7.10.0"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.10.0.tgz"; - sha512 = "xdr6e4t/L2moRAeEQ9HKgge/hFq+w9v5Dj+BA54nTAzSFdUyKLiSOdZaRQjCHMY0Pk2WaQBFH9QiWG60xiC+6A=="; + url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.11.0.tgz"; + sha512 = "Qwo8wilqnOXnG9B5auEiTstyaHefyhHd5lEhhxemwXoWsAxIW2yppzuVudowC5n+qn1nMLNV9TANkTthBK7Waw=="; }; }; "eslint-scope-3.7.3" = { @@ -23263,15 +23155,6 @@ let sha1 = "6197a095d5fb6b57e8942f6fd7eaad63a09c9452"; }; }; - "eventemitter2-6.4.3" = { - name = "eventemitter2"; - packageName = "eventemitter2"; - version = "6.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.3.tgz"; - sha512 = "t0A2msp6BzOf+QAcI6z9XMktLj52OjGQg+8SJH6v5+3uxNpWYRR3wQmfA+6xtMU9kOC59qk9licus5dYcrYkMQ=="; - }; - }; "eventemitter2-6.4.4" = { name = "eventemitter2"; packageName = "eventemitter2"; @@ -23506,13 +23389,13 @@ let sha512 = "j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA=="; }; }; - "execa-5.0.1" = { + "execa-5.1.1" = { name = "execa"; packageName = "execa"; - version = "5.0.1"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-5.0.1.tgz"; - sha512 = "4hFTjFbFzQa3aCLobpbPJR/U+VoL1wdV5ozOWjeet0AWDeYr9UFGM1eUFWHX+VtOWFq4p0xXUXfW1YxUaP4fpw=="; + url = "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz"; + sha512 = "8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg=="; }; }; "execall-1.0.0" = { @@ -24226,6 +24109,15 @@ let sha512 = "4j5uBaTnsYAV5ebkidvxiLUYOwjQ+JSFljeqfTxCrH9bDmlCQaOJFS84oDJ2rAXZq2yskmk3ORfoP9DCwqFNig=="; }; }; + "fast-json-patch-3.0.0-1" = { + name = "fast-json-patch"; + packageName = "fast-json-patch"; + version = "3.0.0-1"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-3.0.0-1.tgz"; + sha512 = "6pdFb07cknxvPzCeLsFHStEy+MysPJPgZQ9LbQ/2O67unQF93SNqfdSqnPPl71YMHX+AD8gbl7iuoGFzHEdDuw=="; + }; + }; "fast-json-stable-stringify-2.1.0" = { name = "fast-json-stable-stringify"; packageName = "fast-json-stable-stringify"; @@ -24262,6 +24154,15 @@ let sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; }; }; + "fast-printf-1.6.5" = { + name = "fast-printf"; + packageName = "fast-printf"; + version = "1.6.5"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-printf/-/fast-printf-1.6.5.tgz"; + sha512 = "0+bBTCT4SOmHg3NFsPO39s+EwUdQiKig4MMye7fM0ea24YprUW35AZuWVQdE0SMBRI/GIQldj8ydQGuVRE95UQ=="; + }; + }; "fast-redact-3.0.1" = { name = "fast-redact"; packageName = "fast-redact"; @@ -25072,15 +24973,6 @@ let sha512 = "lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q=="; }; }; - "flat-4.1.1" = { - name = "flat"; - packageName = "flat"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/flat/-/flat-4.1.1.tgz"; - sha512 = "FmTtBsHskrU6FJ2VxCnsDb84wu9zhmO3cUX2kGFb5tuwhfXxGciiT0oRY+cck35QmG+NmGh5eLz6lLCpWTqwpA=="; - }; - }; "flat-5.0.2" = { name = "flat"; packageName = "flat"; @@ -26035,15 +25927,6 @@ let sha512 = "oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw=="; }; }; - "fsevents-2.1.3" = { - name = "fsevents"; - packageName = "fsevents"; - version = "2.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz"; - sha512 = "Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ=="; - }; - }; "fsevents-2.3.2" = { name = "fsevents"; packageName = "fsevents"; @@ -26179,31 +26062,31 @@ let sha1 = "cbed2d20a40c1f5679a35908e2b9415733e78db9"; }; }; - "gatsby-core-utils-2.6.0" = { + "gatsby-core-utils-2.7.1" = { name = "gatsby-core-utils"; packageName = "gatsby-core-utils"; - version = "2.6.0"; + version = "2.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-2.6.0.tgz"; - sha512 = "d8a/iblc3wIrLEOWTUcoK5uYE2DrvlQmeulx6DK3NY49KD8jet8ozB6T5GA1CftsvowWeO6aaDnoWDbTxIxTRA=="; + url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-2.7.1.tgz"; + sha512 = "ofiAzLMeLjkS9huo0JQRbNzOfwCCxzPg7mSXeEhZhHGfbXoqZ9ZufmlTTgSYLc5v6agoM4yi4rHqdMOXu4qXAw=="; }; }; - "gatsby-recipes-0.17.0" = { + "gatsby-recipes-0.18.1" = { name = "gatsby-recipes"; packageName = "gatsby-recipes"; - version = "0.17.0"; + version = "0.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.17.0.tgz"; - sha512 = "tC2xUa05zrUp77DTyQE11ILhFiqv9JYxBHhh47b7tJGiLAU1XhjxZH0uFZ109r9wEeZjxTYOYkyoiTu+0Ps4pw=="; + url = "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.18.1.tgz"; + sha512 = "gjtCDu1qMtQkjmA5mrHw4orFxkoUPW9VnyVcLc8kcGAjJLR3MTKeECQL6p0SrKHgsbJTkOJ2BTvzU3R5jENBbg=="; }; }; - "gatsby-telemetry-2.6.0" = { + "gatsby-telemetry-2.7.1" = { name = "gatsby-telemetry"; packageName = "gatsby-telemetry"; - version = "2.6.0"; + version = "2.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-2.6.0.tgz"; - sha512 = "ENrhT4tkETj9Gq48d+ziiyNTX8Q8/5EyqqWvDUTCSefeHV5xpBclJ+CEnxZkmkEa/QSoBCpjws2VbxnTmRwjWA=="; + url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-2.7.1.tgz"; + sha512 = "nZgM5SYkS7AWE4NJ/HGrQkUBn7B1k8d6KuRVgv1HanHQxnKUBaWL/6ej/ZBYcvfRBWMCi2mX0QJYlSKVx45XOw=="; }; }; "gauge-1.2.7" = { @@ -26251,13 +26134,13 @@ let sha512 = "4FcCj9e8j8rCjvLkqRpGZBLgTC/xr9XEf5By3x77cDucWWB3pJK6FEwXZCTCbb4z8xdaOoi4owBNrvn3ciDdxA=="; }; }; - "gcp-metadata-4.2.1" = { + "gcp-metadata-4.3.0" = { name = "gcp-metadata"; packageName = "gcp-metadata"; - version = "4.2.1"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-4.2.1.tgz"; - sha512 = "tSk+REe5iq/N+K+SK1XjZJUrFPuDqGZVzCy2vocIHIGmPlTGsa8owXMJwGkrXr73NO0AzhPW4MF2DEHz7P2AVw=="; + url = "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-4.3.0.tgz"; + sha512 = "L9XQUpvKJCM76YRSmcxrR4mFPzPGsgZUH+GgHMxAET8qc6+BhRJq63RLhWakgEO2KKVgeSDVfyiNjkGSADwNTA=="; }; }; "gelf-stream-1.1.1" = { @@ -26854,15 +26737,6 @@ let sha512 = "MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ=="; }; }; - "glob-7.1.3" = { - name = "glob"; - packageName = "glob"; - version = "7.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz"; - sha512 = "vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ=="; - }; - }; "glob-7.1.6" = { name = "glob"; packageName = "glob"; @@ -27134,15 +27008,6 @@ let sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; }; }; - "globals-12.4.0" = { - name = "globals"; - packageName = "globals"; - version = "12.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz"; - sha512 = "BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg=="; - }; - }; "globals-13.9.0" = { name = "globals"; packageName = "globals"; @@ -27296,22 +27161,22 @@ let sha1 = "2edeeb958084d0f8ea7988e5d995b1c7dfc14777"; }; }; - "goldengate-10.0.3" = { + "goldengate-10.0.6" = { name = "goldengate"; packageName = "goldengate"; - version = "10.0.3"; + version = "10.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/goldengate/-/goldengate-10.0.3.tgz"; - sha512 = "zNvkjnJQWbFWtK7or4CtX0WMy2n5AfMVnob5ipf+AznwLxKX8KyqY9W4bzYpVh6Xjm9N21ZUbubsPheV3mA4qQ=="; + url = "https://registry.npmjs.org/goldengate/-/goldengate-10.0.6.tgz"; + sha512 = "6nwFndjr71Od5XL53oVtlwf3gk8EI/zkKrcjeRAS/G6XLFzPsrOe4npeuom+mgkfgE0rRJFtoOY0wrYgDGuYSg=="; }; }; - "goldengate-10.0.4" = { + "goldengate-10.1.0" = { name = "goldengate"; packageName = "goldengate"; - version = "10.0.4"; + version = "10.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/goldengate/-/goldengate-10.0.4.tgz"; - sha512 = "WuLSD4trXP8fN8jCpWlNMpobrf1DBYCEy/0+SVrzen6znQepM4rRCByuna1Iy1G/XsbbdFiwYBd9iSxJiwqjDQ=="; + url = "https://registry.npmjs.org/goldengate/-/goldengate-10.1.0.tgz"; + sha512 = "xeMOmvY6a7MBUjU1YPmREgDr7qiM5wZWXzdAZsnJxd0/fd5T0gYNi4saJ2eGvDGSmI+TehDn1bYF1Tvlo2GiBQ=="; }; }; "gonzales-pe-4.3.0" = { @@ -27341,13 +27206,13 @@ let sha512 = "Q+ZjUEvLQj/lrVHF/IQwRo6p3s8Nc44Zk/DALsN+ac3T4HY/g/3rrufkgtl+nZ1TW7DNAw5cTChdVp4apUXVgQ=="; }; }; - "google-auth-library-7.1.0" = { + "google-auth-library-7.1.2" = { name = "google-auth-library"; packageName = "google-auth-library"; - version = "7.1.0"; + version = "7.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.1.0.tgz"; - sha512 = "X+gbkGjnLN3HUZP2W3KBREuA603BXd80ITvL0PeS0QpyDNYz/u0pIZ7aRuGnrSuUc0grk/qxEgtVTFt1ogbP+A=="; + url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.1.2.tgz"; + sha512 = "FMipHgfe2u1LzWsf2n9zEB9KsJ8M3n8OYTHbHtlkzPCyo7IknXQR5X99nfvwUHGuX+iEpihUZxDuPm7+qBYeXg=="; }; }; "google-closure-compiler-js-20170910.0.1" = { @@ -27359,22 +27224,22 @@ let sha512 = "Vric7QFWxzHFxITZ10bmlG1H/5rhODb7hJuWyKWMD8GflpQzRmbMVqkFp3fKvN+U9tPwZItGVhkiOR+84PX3ew=="; }; }; - "google-gax-2.14.1" = { + "google-gax-2.15.0" = { name = "google-gax"; packageName = "google-gax"; - version = "2.14.1"; + version = "2.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/google-gax/-/google-gax-2.14.1.tgz"; - sha512 = "I5RDEN7MEptrCxeHX3ht7nKFGfyjgYX4hQKI9eVMBohMzVbFSwWUndo0CcKXu8es7NhB4gt2XYLm1AHkXhtHpA=="; + url = "https://registry.npmjs.org/google-gax/-/google-gax-2.15.0.tgz"; + sha512 = "jfShUgX1DVu+DiOeAcsT5JbWlLdUnb2FsdWRb+Q/pNz6kNAUbmq8sFLB2uaWjlTxoSGHZLfrt3vJ9lpArzzQPA=="; }; }; - "google-p12-pem-3.0.3" = { + "google-p12-pem-3.1.0" = { name = "google-p12-pem"; packageName = "google-p12-pem"; - version = "3.0.3"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.0.3.tgz"; - sha512 = "wS0ek4ZtFx/ACKYF3JhyGe5kzH7pgiQ7J5otlumqR9psmWMYc+U9cErKlCYVYHoUaidXHdZ2xbo34kB+S+24hA=="; + url = "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.1.0.tgz"; + sha512 = "JUtEHXL4DY/N+xhlm7TC3qL797RPAtk0ZGXNs3/gWyiDHYoA/8Rjes0pztkda+sZv4ej1EoO2KhWgW5V9KTrSQ=="; }; }; "goosig-0.10.0" = { @@ -27665,13 +27530,13 @@ let sha512 = "J+vjof74oMlCWXSvt0DOf2APEdZOCdubEvGDUAlqH//VBYcOYsGgRW7Xzorr44LvkjiuvecWc8fChxuZZbChtg=="; }; }; - "graphql-ws-4.7.0" = { + "graphql-ws-4.9.0" = { name = "graphql-ws"; packageName = "graphql-ws"; - version = "4.7.0"; + version = "4.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-4.7.0.tgz"; - sha512 = "Md8SsmC9ZlsogFPd3Ot8HbIAAqsHh8Xoq7j4AmcIat1Bh6k91tjVyQvA0Au1/BolXSYq+RDvib6rATU2Hcf1Xw=="; + url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-4.9.0.tgz"; + sha512 = "sHkK9+lUm20/BGawNEWNtVAeJzhZeBg21VmvmLoT5NdGVeZWv5PdIhkcayQIAgjSyyQ17WMKmbDijIPG2On+Ag=="; }; }; "gray-matter-2.1.1" = { @@ -27737,13 +27602,13 @@ let sha512 = "GD7cTz0I4SAede1/+pAbmJRG44zFLPipVtdL9o3vqx9IEyb7b4/Y3s7r6ofI3CchR5GvYJ+8buCSioDv5dQLiA=="; }; }; - "gtoken-5.2.1" = { + "gtoken-5.3.0" = { name = "gtoken"; packageName = "gtoken"; - version = "5.2.1"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/gtoken/-/gtoken-5.2.1.tgz"; - sha512 = "OY0BfPKe3QnMsY9MzTHTSKn+Vl2l1CcLe6BwDEQj00mbbkl5nyQ/7EUREstg4fQNZ8iYE7br4JJ7TdKeDOPWmw=="; + url = "https://registry.npmjs.org/gtoken/-/gtoken-5.3.0.tgz"; + sha512 = "mCcISYiaRZrJpfqOs0QWa6lfEM/C1V9ASkzFmuz43XBb5s1Vynh+CZy1ECeeJXVGx2PRByjYzb4Y4/zr1byr0w=="; }; }; "gud-1.0.0" = { @@ -28556,13 +28421,13 @@ let sha512 = "om8L9O5XwqeSdwl5NtHgrzK3wcF4fT9T4gb/NktoH8EyoZipas/tvUZLV48xT7fQfMYr9qvb0WEutqdf0LWSqA=="; }; }; - "highlight.js-10.7.2" = { + "highlight.js-10.7.3" = { name = "highlight.js"; packageName = "highlight.js"; - version = "10.7.2"; + version = "10.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.2.tgz"; - sha512 = "oFLl873u4usRM9K63j4ME9u3etNF0PLiJhSQ8rdfuL51Wn3zkD6drf9ZW0dOzjnZI22YYG24z30JcmfCZjMgYg=="; + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz"; + sha512 = "tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A=="; }; }; "highlight.js-8.2.0" = { @@ -30429,22 +30294,13 @@ let sha512 = "/rNd9R/qcq+4QakROCQGnOJbiQ9BKwtOVF+OWu+3pYVYgPydnAMA++VCcKxZYFCGDC70Ee+9oUvIlXI8UQoiqQ=="; }; }; - "invoices-1.1.7" = { + "invoices-1.2.1" = { name = "invoices"; packageName = "invoices"; - version = "1.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/invoices/-/invoices-1.1.7.tgz"; - sha512 = "AMCHpf/7sJOjeRbTgCLLvhH41ZnUv0D809ZFJRhR2dGOfp8GxJHzfnNqtgYGxQiW0+dVK2ooBVyR+dqoEQs6mw=="; - }; - }; - "invoices-1.2.0" = { - name = "invoices"; - packageName = "invoices"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/invoices/-/invoices-1.2.0.tgz"; - sha512 = "x9jMmN/afPZkeL7qwMj15r+RSV7ztPsfxKgByD3bXR/WhmjrlfU+zwfliohScW/UV1b0FUSq6A7DgTME4tdMSQ=="; + url = "https://registry.npmjs.org/invoices/-/invoices-1.2.1.tgz"; + sha512 = "b1yeWevW04/jMmkzJ3Fk91d8cAd+pYYg/w0S7XCGAI4yo8jSnAD+S4oAWjfFkwNa+GV8WwCOTDuotWcI5md87A=="; }; }; "iota-array-1.0.0" = { @@ -30537,13 +30393,13 @@ let sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="; }; }; - "ipaddr.js-2.0.0" = { + "ipaddr.js-2.0.1" = { name = "ipaddr.js"; packageName = "ipaddr.js"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.0.tgz"; - sha512 = "S54H9mIj0rbxRIyrDMEuuER86LdlgUg9FSeZ8duQb6CUG2iRrA36MYVQBSprTF/ZeAwvyQ5mDGuNvIPM0BIl3w=="; + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz"; + sha512 = "1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng=="; }; }; "irc-framework-4.9.0" = { @@ -31842,13 +31698,13 @@ let sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72"; }; }; - "is-valid-domain-0.0.19" = { + "is-valid-domain-0.0.20" = { name = "is-valid-domain"; packageName = "is-valid-domain"; - version = "0.0.19"; + version = "0.0.20"; src = fetchurl { - url = "https://registry.npmjs.org/is-valid-domain/-/is-valid-domain-0.0.19.tgz"; - sha512 = "NxuZbJABXdGlFNEVphG9bT0YOQE0B75Bv+emGsEjmRnAs9aMUVbdKUafj//yTxApThjqQqRKBd9MJDlnqx8Pmg=="; + url = "https://registry.npmjs.org/is-valid-domain/-/is-valid-domain-0.0.20.tgz"; + sha512 = "Yd9oD7sgCycVvH8CHy5U4fLXibPwxVw2+diudYbT8ZfAiQDtW1H9WvPRR4+rtN9qOll+r+KAfO4SjO28OPpitA=="; }; }; "is-valid-glob-1.0.0" = { @@ -32643,15 +32499,6 @@ let sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; }; }; - "js-yaml-3.13.1" = { - name = "js-yaml"; - packageName = "js-yaml"; - version = "3.13.1"; - src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz"; - sha512 = "YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw=="; - }; - }; "js-yaml-3.14.0" = { name = "js-yaml"; packageName = "js-yaml"; @@ -32868,13 +32715,13 @@ let sha512 = "ChFg5qhvxCaM2bspCqizs48yMtsm5YLHjBoNZLCkbXyc3yMM5l8pnn787B5ww5TI3+tKxKYWkbiKf356kQ1OgQ=="; }; }; - "jsii-srcmak-0.1.273" = { + "jsii-srcmak-0.1.280" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.273"; + version = "0.1.280"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.273.tgz"; - sha512 = "koWwHIq+LdKPoclPjRvZp2cNwk8Tck/wW1iUqgRDpjIO6+Puq26ovr/XF7etf9sXZEpCRHOT7/qTOVMJo0F+vg=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.280.tgz"; + sha512 = "FKU0HcL+OceiXRpUbdR5XX/7ivUnCpGOVtgRvPJeXjQDdz3Px09sYHKSHGmAgipcoBPtKQ8Vrv+5rGckuQZ+mQ=="; }; }; "json-bigint-0.2.3" = { @@ -33165,15 +33012,6 @@ let sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; }; }; - "json-to-ast-2.1.0" = { - name = "json-to-ast"; - packageName = "json-to-ast"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/json-to-ast/-/json-to-ast-2.1.0.tgz"; - sha512 = "W9Lq347r8tA1DfMvAGn9QNcgYm4Wm7Yc+k8e6vezpMnRT+NHbtlxgNBXRVjXe9YM6eTn6+p/MKOlV/aABJcSnQ=="; - }; - }; "json2csv-5.0.6" = { name = "json2csv"; packageName = "json2csv"; @@ -33183,13 +33021,13 @@ let sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A=="; }; }; - "json2jsii-0.1.236" = { + "json2jsii-0.1.248" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.1.236"; + version = "0.1.248"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.236.tgz"; - sha512 = "f2UN6Fum7vNQmeonz3HvP7GJxlathMSFYNzYCHdLjFKDpX3KDD9+xi7Qrk0JOMqrGMG6Ev1ye4rXlnUBlWKLvA=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.248.tgz"; + sha512 = "aMpcyCpezSOElnI+9fSychrq4wYDCpb3MJOizYkVEVkEeNYiV0ND2qFzYOG+k+cIEzzsQh2EAisCftI5q6vsrQ=="; }; }; "json3-3.2.6" = { @@ -34435,13 +34273,13 @@ let sha512 = "IR5ASkAU4NHTN1JFeP9bYvhARhaBg8VD8yUcmvNIvFWg6L3dsM2yK1A9EM6MpPvWYKH9SEiljB59ZUa5s2pYnA=="; }; }; - "libnpmaccess-4.0.2" = { + "libnpmaccess-4.0.3" = { name = "libnpmaccess"; packageName = "libnpmaccess"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/libnpmaccess/-/libnpmaccess-4.0.2.tgz"; - sha512 = "avXtJibZuGap0/qADDYqb9zdpgzVu/yG5+tl2sTRa7MCkDNv2ZlGwCYI0r6/+tmqXPj0iB9fKexHz426vB326w=="; + url = "https://registry.npmjs.org/libnpmaccess/-/libnpmaccess-4.0.3.tgz"; + sha512 = "sPeTSNImksm8O2b6/pf3ikv4N567ERYEpeKRPSmqlNt1dTZbvgpJIzg5vAhXHpw2ISBsELFRelk0jEahj1c6nQ=="; }; }; "libnpmconfig-1.2.1" = { @@ -34453,13 +34291,13 @@ let sha512 = "9esX8rTQAHqarx6qeZqmGQKBNZR5OIbl/Ayr0qQDy3oXja2iFVQQI81R6GZ2a02bSNZ9p3YOGX1O6HHCb1X7kA=="; }; }; - "libnpmpublish-4.0.1" = { + "libnpmpublish-4.0.2" = { name = "libnpmpublish"; packageName = "libnpmpublish"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/libnpmpublish/-/libnpmpublish-4.0.1.tgz"; - sha512 = "hZCrZ8v4G9YH3DxpIyBdob25ijD5v5LNzRbwsej4pPDopjdcLLj1Widl+BUeFa7D0ble1JYL4F3owjLJqiA8yA=="; + url = "https://registry.npmjs.org/libnpmpublish/-/libnpmpublish-4.0.2.tgz"; + sha512 = "+AD7A2zbVeGRCFI2aO//oUmapCwy7GHqPXFJh3qpToSRNU+tXKJ2YFUgjt04LPPAf2dlEH95s6EhIHM1J7bmOw=="; }; }; "libsodium-0.7.9" = { @@ -34534,22 +34372,13 @@ let sha512 = "lzj7oODpX7XS/4qHGBG/VAMirBDK/rbWS8S9pTCSUV9ZknuXg2loCkDyPQuB3vC2MMt1QOsXn4oQUtxpPtSa1g=="; }; }; - "lightning-3.3.4" = { - name = "lightning"; - packageName = "lightning"; - version = "3.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-3.3.4.tgz"; - sha512 = "VpkNbaWlsmTgaWWJPGyYb2dm2v5b+wPQWmfZBJ7V5znL17Q+ef7Csj8PTTgnIccAWE429QL9/OyOzn/JVnZ/PA=="; - }; - }; - "lightning-3.3.7" = { + "lightning-3.3.9" = { name = "lightning"; packageName = "lightning"; - version = "3.3.7"; + version = "3.3.9"; src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-3.3.7.tgz"; - sha512 = "fjzFCwXafGUeCwUSiEKToS/A8GO4oxDiDG+XNuL984mgYyJdXLHoTEMdaYZD48yowtfjYCdLks0iypIdg6kn1Q=="; + url = "https://registry.npmjs.org/lightning/-/lightning-3.3.9.tgz"; + sha512 = "z/bfkDEAKyN0HtN7rkiyVlDA3J5L/jxXsE4YuGfQPa8TyPWovyLdo6/aHP0mMy8n+G4tq0g2oKZ/1Z5ONJAVqA=="; }; }; "limit-spawn-0.0.3" = { @@ -34678,40 +34507,22 @@ let sha512 = "04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw=="; }; }; - "ln-accounting-4.2.7" = { + "ln-accounting-4.3.0" = { name = "ln-accounting"; packageName = "ln-accounting"; - version = "4.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-accounting/-/ln-accounting-4.2.7.tgz"; - sha512 = "joCN96uuTS53sfJQ5XBFUsKetXk6GOc7NsXqmPmjn/78swpqkxWLar30BvbweGTIveSvDb9xfCT7v1PfSxgiJg=="; - }; - }; - "ln-service-51.5.0" = { - name = "ln-service"; - packageName = "ln-service"; - version = "51.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-51.5.0.tgz"; - sha512 = "Q22CcKJ+52mExGNvOmeEVBza82LGdbLkFVzfMjC9oPlP5DikS+sdlK5GZM/Dc5HFN5pwK7y9Ke7gRue/UxHwbw=="; - }; - }; - "ln-service-51.7.0" = { - name = "ln-service"; - packageName = "ln-service"; - version = "51.7.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-51.7.0.tgz"; - sha512 = "n0Ib9fjVL8x3ymdOax6gjmR0Nq59vIhQ89en1XpgxIWbowWhiJUXPolTEgiA8vpeoG72CZN3nYaPXgil9uNVLg=="; + url = "https://registry.npmjs.org/ln-accounting/-/ln-accounting-4.3.0.tgz"; + sha512 = "JfnHWP6hNmA5DCx0OHq7WKwiwPKyD1lb7GPmRqg0NFr8jj9p/PNnxayfjRD2PsmA5C3OxXO53wCy1XymG4I8+Q=="; }; }; - "ln-service-51.8.1" = { + "ln-service-51.8.2" = { name = "ln-service"; packageName = "ln-service"; - version = "51.8.1"; + version = "51.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-51.8.1.tgz"; - sha512 = "YjRsNwAez1RfA63YDoLf5Ojg3Ma+aLmvfMqasqU3r+/pDR+mgGFyjVODsw6qujerIEM2FaxegddJeOz7R7/Ijw=="; + url = "https://registry.npmjs.org/ln-service/-/ln-service-51.8.2.tgz"; + sha512 = "X+AFuuw54NEr8UqbkJlEtqkmlpIpmji7BX+bYmYrEOZOtJca7PbaqspVWq+YB9qWw/OiuI76ly67KGTYM0QbCw=="; }; }; "ln-sync-0.4.5" = { @@ -34723,13 +34534,13 @@ let sha512 = "ETaASkbv5v2gcrob/xonsjy0deKSxIHfKOTfOXQicxhZed02plQ2oAUx/K3yxIhRnm7YS45Z/gYQLxUqHkI4ow=="; }; }; - "ln-telegram-3.2.3" = { + "ln-telegram-3.2.5" = { name = "ln-telegram"; packageName = "ln-telegram"; - version = "3.2.3"; + version = "3.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-3.2.3.tgz"; - sha512 = "pNYz/xz/VCn8EApERCR+2nB0hmBM25dAmKUs0FZnMlQGozNaSqb26ttN0XLA/Q/JVOeovacjlAOJ0tl6zqcS8w=="; + url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-3.2.5.tgz"; + sha512 = "odHaSJDF1asxW74D4JaoLIGkVqX5KMBDk310sPoM0LJ5Fqljjc2K/Mo+zW+NQtIyaEcFrQTH207jZy2sb4niUQ=="; }; }; "load-bmfont-1.4.1" = { @@ -35047,13 +34858,13 @@ let sha512 = "mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="; }; }; - "lodash-id-0.14.0" = { + "lodash-id-0.14.1" = { name = "lodash-id"; packageName = "lodash-id"; - version = "0.14.0"; + version = "0.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/lodash-id/-/lodash-id-0.14.0.tgz"; - sha1 = "baf48934e543a1b5d6346f8c84698b1a8c803896"; + url = "https://registry.npmjs.org/lodash-id/-/lodash-id-0.14.1.tgz"; + sha512 = "ikQPBTiq/d5m6dfKQlFdIXFzvThPi2Be9/AHxktOnDSfSxE1j9ICbBT5Elk1ke7HSTgM38LHTpmJovo9/klnLg=="; }; }; "lodash._arrayeach-3.0.0" = { @@ -36325,15 +36136,6 @@ let sha512 = "VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg=="; }; }; - "log-symbols-3.0.0" = { - name = "log-symbols"; - packageName = "log-symbols"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz"; - sha512 = "dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ=="; - }; - }; "log-symbols-4.0.0" = { name = "log-symbols"; packageName = "log-symbols"; @@ -36766,13 +36568,13 @@ let sha512 = "rlAEsgU9Bnavca2w1WJ6+6cdeHMXNyadcersyk3ZpuhgWb5HBNj8l4WwJz9PjksAhYDlpQffCVXPctOn+wCIVA=="; }; }; - "lunr-2.3.8" = { + "lunr-2.3.9" = { name = "lunr"; packageName = "lunr"; - version = "2.3.8"; + version = "2.3.9"; src = fetchurl { - url = "https://registry.npmjs.org/lunr/-/lunr-2.3.8.tgz"; - sha512 = "oxMeX/Y35PNFuZoHp+jUj5OSEmLCaIH4KTFJh7a93cHBoFmpw2IoPs22VIz7vyO2YUnx2Tn9dzIwO2P/4quIRg=="; + url = "https://registry.npmjs.org/lunr/-/lunr-2.3.9.tgz"; + sha512 = "zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow=="; }; }; "lzma-native-6.0.1" = { @@ -36829,13 +36631,13 @@ let sha1 = "d25e32e97c3c2cb89568ba8c98d229d5c305e391"; }; }; - "macos-release-2.4.1" = { + "macos-release-2.5.0" = { name = "macos-release"; packageName = "macos-release"; - version = "2.4.1"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/macos-release/-/macos-release-2.4.1.tgz"; - sha512 = "H/QHeBIN1fIGJX517pvK8IEK53yQOW7YcEI55oYtgjDdoCQQz7eJS94qt5kNrscReEyuD/JcdFCm2XBEcGOITg=="; + url = "https://registry.npmjs.org/macos-release/-/macos-release-2.5.0.tgz"; + sha512 = "EIgv+QZ9r+814gjJj0Bt5vSLJLzswGmSUbUpbi9AIr/fsN2IWFBl2NucV9PAiek+U1STK468tEkxmVYUtuAN3g=="; }; }; "magic-string-0.22.5" = { @@ -36946,6 +36748,15 @@ let sha512 = "EsS89h6l4vbfJEtBZnENTOFk8mCRpY5ru36Xe5bcX1KYIli2mkSHqoFsp5O1wMDvTJJzxe/4THpCTtygjeeGWQ=="; }; }; + "make-fetch-happen-9.0.2" = { + name = "make-fetch-happen"; + packageName = "make-fetch-happen"; + version = "9.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.0.2.tgz"; + sha512 = "UkAWAuXPXSSlVviTjH2We20mtj1NnZW2Qq/oTY2dyMbRQ5CR3Xed3akCDMnM7j6axrMY80lhgM7loNE132PfAw=="; + }; + }; "make-iterator-1.0.1" = { name = "make-iterator"; packageName = "make-iterator"; @@ -37351,13 +37162,13 @@ let sha512 = "c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg=="; }; }; - "marked-2.0.6" = { + "marked-2.0.7" = { name = "marked"; packageName = "marked"; - version = "2.0.6"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-2.0.6.tgz"; - sha512 = "S2mYj0FzTQa0dLddssqwRVW4EOJOVJ355Xm2Vcbm+LU7GQRGWvwbO5K87OaPSOux2AwTSgtPPaXmc8sDPrhn2A=="; + url = "https://registry.npmjs.org/marked/-/marked-2.0.7.tgz"; + sha512 = "BJXxkuIfJchcXOJWTT2DOL+yFWifFv2yGYOUzvXg8Qz610QKw+sHCvTMYwA+qWGhlA2uivBezChZ/pBy1tWdkQ=="; }; }; "marked-terminal-3.3.0" = { @@ -37918,15 +37729,6 @@ let sha512 = "RE0CwmIM3CEvpcdK3rZ19BC4E6hv9kADkMN5rPduRak58cNArWLi/9jFLsa4rhsjfVxMP3v0jO7FHXq7SvFY5Q=="; }; }; - "memoize-one-5.1.1" = { - name = "memoize-one"; - packageName = "memoize-one"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/memoize-one/-/memoize-one-5.1.1.tgz"; - sha512 = "HKeeBpWvqiVJD57ZUAsJNm71eHTykffzcLZVYWiVfQeI1rJtuEaS7hQiEpWfVVk18donPwJEcFKIkCmPJNOhHA=="; - }; - }; "memoize-one-5.2.1" = { name = "memoize-one"; packageName = "memoize-one"; @@ -38179,13 +37981,13 @@ let sha1 = "f8a064760d37e7978ad5f9f6d3c119a494f57081"; }; }; - "mermaid-8.10.1" = { + "mermaid-8.10.2" = { name = "mermaid"; packageName = "mermaid"; - version = "8.10.1"; + version = "8.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/mermaid/-/mermaid-8.10.1.tgz"; - sha512 = "KxwKEJDKy303TQdz5TQMFb/4u+gUL21CefUMGOfuigDh9powcYaNmuJ5BkHmO0jB3Y1z2zlsuKvHZ2CusWH5+A=="; + url = "https://registry.npmjs.org/mermaid/-/mermaid-8.10.2.tgz"; + sha512 = "Za5MrbAOMbEsyY4ONgGjfYz06sbwF1iNGRzp1sQqpOtvXxjxGu/J1jRJ8QyE9kD/D9zj1/KlRrYegWEvA7eZ5Q=="; }; }; "meros-1.1.4" = { @@ -38647,15 +38449,6 @@ let sha512 = "/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="; }; }; - "mime-db-1.47.0" = { - name = "mime-db"; - packageName = "mime-db"; - version = "1.47.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.47.0.tgz"; - sha512 = "QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw=="; - }; - }; "mime-db-1.48.0" = { name = "mime-db"; packageName = "mime-db"; @@ -38692,13 +38485,13 @@ let sha512 = "JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w=="; }; }; - "mime-types-2.1.30" = { + "mime-types-2.1.31" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.30"; + version = "2.1.31"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.30.tgz"; - sha512 = "crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.31.tgz"; + sha512 = "XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg=="; }; }; "mimic-fn-1.2.0" = { @@ -39205,15 +38998,6 @@ let sha1 = "161be5bdeb496771eb9b35745050b622b5aefc58"; }; }; - "mocha-7.2.0" = { - name = "mocha"; - packageName = "mocha"; - version = "7.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-7.2.0.tgz"; - sha512 = "O9CIypScywTVpNaRrCAgoUnJgozpIofjKUYmJhiCIJMiuYnLI6otcb1/kpW9/n/tJODHGZ7i8aLQoDVsMtOKQQ=="; - }; - }; "mocha-8.4.0" = { name = "mocha"; packageName = "mocha"; @@ -40439,22 +40223,22 @@ let sha512 = "AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug=="; }; }; - "netlify-7.0.0" = { + "netlify-7.0.1" = { name = "netlify"; packageName = "netlify"; - version = "7.0.0"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/netlify/-/netlify-7.0.0.tgz"; - sha512 = "s454O7JRqrIo90c6rX+um1Xp7B0dGZBAYaIXYtA3em8DXJ0uWoglDeQSul8qGT1goAAF/9oMPo0T9KTM/XrjqA=="; + url = "https://registry.npmjs.org/netlify/-/netlify-7.0.1.tgz"; + sha512 = "Gd1aexpJ3RrOzkssdE8ipS67PuppOAkJNhRqQPp2in2XnJKPm5kvYonYMNVadasSFlNdmVCk9nELV3TnbAfklw=="; }; }; - "netlify-redirect-parser-3.0.29" = { + "netlify-redirect-parser-5.1.1" = { name = "netlify-redirect-parser"; packageName = "netlify-redirect-parser"; - version = "3.0.29"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-3.0.29.tgz"; - sha512 = "+lP4IG30CEpjlUaJM7hs/AW84gxkP0svvE80WJOcgB20lilPDkS6K3qeLlybjH/YznzomHZ0EF5Ydr/9d5I99A=="; + url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-5.1.1.tgz"; + sha512 = "TDJShXyaMwQaVtzWjK6U1UAWzWHnFzTVULAduaGroVlQha5Hi6WaRCZLg64FvQx4MUMOH8qOgSyByCqIMXqZWA=="; }; }; "netlify-redirector-0.2.1" = { @@ -40565,13 +40349,13 @@ let sha512 = "CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ=="; }; }; - "nextgen-events-1.4.0" = { + "nextgen-events-1.5.2" = { name = "nextgen-events"; packageName = "nextgen-events"; - version = "1.4.0"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/nextgen-events/-/nextgen-events-1.4.0.tgz"; - sha512 = "bwSpShfuLg/lcRFokZvtUcrn5kumy6uRI6Jc+QWzH+bW6ZRdog7LfwAwhqeTzVfsprZgDGrctr6rO5aJhcdAfg=="; + url = "https://registry.npmjs.org/nextgen-events/-/nextgen-events-1.5.2.tgz"; + sha512 = "0ZEIRQywH5Oxt2IYYufRltQg/KjXhKM7f7MHve+ZIRaKnIR1PPYEXAl2WBmej5Sf0Qh2GgE/21sMRZVuOyxLzw=="; }; }; "nice-try-1.0.5" = { @@ -40646,15 +40430,6 @@ let sha512 = "fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg=="; }; }; - "no-cliches-0.1.1" = { - name = "no-cliches"; - packageName = "no-cliches"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/no-cliches/-/no-cliches-0.1.1.tgz"; - sha512 = "mYihjs47X5+N71CN3P+QBrEIBuclIfMMpgWEpkmLqFPvrOXdzokvDlhbLfjdBNZOqYgniaeZC6J1ZCgxFdyvXw=="; - }; - }; "no-cliches-0.3.4" = { name = "no-cliches"; packageName = "no-cliches"; @@ -40791,15 +40566,6 @@ let sha256 = "224950cc405150c37dbd3c4aa65dc0cfb799b1a57f674e9bb76f993268106406"; }; }; - "node-environment-flags-1.0.6" = { - name = "node-environment-flags"; - packageName = "node-environment-flags"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz"; - sha512 = "5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw=="; - }; - }; "node-eta-0.9.0" = { name = "node-eta"; packageName = "node-eta"; @@ -41124,13 +40890,13 @@ let sha512 = "d/CbPGJMSNekJHOQu4WMNwjXRFnZ4c2+D3nlSdRH6wdUVVc++4nat8TuhcXKUe9W9+nqMrmVhReGnf8UwKsfBw=="; }; }; - "node-releases-1.1.72" = { + "node-releases-1.1.73" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.72"; + version = "1.1.73"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.72.tgz"; - sha512 = "LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz"; + sha512 = "uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg=="; }; }; "node-source-walk-4.2.0" = { @@ -41457,6 +41223,15 @@ let sha512 = "9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA=="; }; }; + "normalize-url-6.0.1" = { + name = "normalize-url"; + packageName = "normalize-url"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-url/-/normalize-url-6.0.1.tgz"; + sha512 = "VU4pzAuh7Kip71XEmO9aNREYAdMHFGTVj/i+CaTImS8x0i1d3jUZkXhqluy/PRgjPLMgsLQulYY3PJ/aSbSjpQ=="; + }; + }; "now-and-later-2.0.1" = { name = "now-and-later"; packageName = "now-and-later"; @@ -41574,6 +41349,15 @@ let sha512 = "6Eem455JsSMJY6Kpd3EyWE+n5hC+g9bSyHr9K9U2zqZb7+02+hObQ2c0+8iDk/mNF+8r1MhY44WypKJAkySIYA=="; }; }; + "npm-package-arg-8.1.4" = { + name = "npm-package-arg"; + packageName = "npm-package-arg"; + version = "8.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.4.tgz"; + sha512 = "xLokoCFqj/rPdr3LvcdDL6Kj6ipXGEDHD/QGpzwU6/pibYUOXmp5DBmg76yukFyx4ZDbrXNOTn+BPyd8TD4Jlw=="; + }; + }; "npm-packlist-1.4.8" = { name = "npm-packlist"; packageName = "npm-packlist"; @@ -41637,6 +41421,15 @@ let sha512 = "KsM/TdPmntqgBFlfsbkOLkkE9ovZo7VpVcd+/eTdYszCrgy5zFl5JzWm+OxavFaEWlbkirpkou+ZYI00RmOBFA=="; }; }; + "npm-registry-fetch-11.0.0" = { + name = "npm-registry-fetch"; + packageName = "npm-registry-fetch"; + version = "11.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-11.0.0.tgz"; + sha512 = "jmlgSxoDNuhAtxUIG6pVwwtz840i994dL14FoNVZisrmZW5kWd63IUTNv1m/hyRSGSqWjCUp/YZlS1BJyNp9XA=="; + }; + }; "npm-registry-fetch-9.0.0" = { name = "npm-registry-fetch"; packageName = "npm-registry-fetch"; @@ -41880,15 +41673,6 @@ let sha512 = "2yucenq1a9YPmeNExoUa9Qwrt9RFkjqaMAA1X+U7sbb0AqBeTIdMHky9SQQ6iN94bO5NW0W4TRYXerG+BdAvAQ=="; }; }; - "oas-validator-4.0.8" = { - name = "oas-validator"; - packageName = "oas-validator"; - version = "4.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/oas-validator/-/oas-validator-4.0.8.tgz"; - sha512 = "bIt8erTyclF7bkaySTtQ9sppqyVc+mAlPi7vPzCLVHJsL9nrivQjc/jHLX/o+eGbxHd6a6YBwuY/Vxa6wGsiuw=="; - }; - }; "oas-validator-5.0.6" = { name = "oas-validator"; packageName = "oas-validator"; @@ -42115,15 +41899,6 @@ let sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb"; }; }; - "object.assign-4.1.0" = { - name = "object.assign"; - packageName = "object.assign"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz"; - sha512 = "exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w=="; - }; - }; "object.assign-4.1.2" = { name = "object.assign"; packageName = "object.assign"; @@ -42277,13 +42052,13 @@ let sha512 = "0HGaSR/E/seIhSzFxLkh0QqckuNSre4iGqSElZRUv1hVHH2YgrZ7xtQL9McwL8o1fh6HqkzykjUx0Iy2haVIUg=="; }; }; - "office-ui-fabric-react-7.170.1" = { + "office-ui-fabric-react-7.170.3" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.170.1"; + version = "7.170.3"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.170.1.tgz"; - sha512 = "NZULXfe9I9W1THYUOFOPr7vLStRbdYNJi3+sJSRrNQHSeeGlUaFbAIOiT8g8h+3Seypk4Ybtm7vZXc6mUHx+Gw=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.170.3.tgz"; + sha512 = "jpgvc2OQAf8vB35v0LeO0m23HDHBUkd5uQP03YAULXEyb8usBjyPN0R8O+PEEBsmtn/UIcPlB14xUof9S0MsuQ=="; }; }; "omggif-1.0.10" = { @@ -42448,15 +42223,6 @@ let sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="; }; }; - "onml-1.3.0" = { - name = "onml"; - packageName = "onml"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/onml/-/onml-1.3.0.tgz"; - sha512 = "RhGUsC6Im2A5vAdIvxE3auRKTqrqUZQl/AYLn8+9lM3SO4da5bwhcI5TcM+hfQxNCSLLOVErsl9p0ZPjKKmz+g=="; - }; - }; "onml-2.1.0" = { name = "onml"; packageName = "onml"; @@ -43024,6 +42790,15 @@ let sha512 = "1StwyXQGoU6gdjYkyVcqOLnVlbKj+6yPNNOxJVgpt9t4eksKjiriiHuxktLYkgllwk+D6MbC4ihH84L1udRXPg=="; }; }; + "ora-5.4.1" = { + name = "ora"; + packageName = "ora"; + version = "5.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz"; + sha512 = "5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ=="; + }; + }; "ordered-read-streams-1.0.1" = { name = "ordered-read-streams"; packageName = "ordered-read-streams"; @@ -43150,22 +42925,22 @@ let sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; }; }; - "ot-builder-1.0.8" = { + "ot-builder-1.0.9" = { name = "ot-builder"; packageName = "ot-builder"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.0.8.tgz"; - sha512 = "e9PkE4wr4mskFMNuV5IvCujBVp9Nc+yl5ltu7qad/BNcHIFh4nn9iWFE+Klva6h8prDefgE2FOuG+sYLU0IOrQ=="; + url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.0.9.tgz"; + sha512 = "y3TBkZdnqoLtHsyPDni+NA43nlN3hGeEfw+5FvrtNplnwMqFtYTTZ0aUa9TCmjyih5dtMOGay8HhOSFGZ5ONhw=="; }; }; - "otb-ttc-bundle-1.0.8" = { + "otb-ttc-bundle-1.0.9" = { name = "otb-ttc-bundle"; packageName = "otb-ttc-bundle"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.0.8.tgz"; - sha512 = "VqlzOefegjHk0OTM7XIay7M+v0PSKYznKTmBPCds6X+NfaumDInoBrF7OTrhq5IN1LXlu4TwW29u0wzDCgc2+A=="; + url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.0.9.tgz"; + sha512 = "q1PtQMsMMcZluIkNh5Nk469vzM0j8yNzIqab5/xhM0dstnIC/+8ax0yR1uf6MvcKuZSv6Pict/knFs6n/k065w=="; }; }; "ow-0.21.0" = { @@ -43690,13 +43465,13 @@ let sha512 = "lMO7V9aMhyE5gfaSFxKfW3OTdXuFBNQJfuNuet3NPzWWhOYIW90t85vHcHLDjdhgmfAdAHyh9q1HAap96ea0XA=="; }; }; - "pacote-11.3.3" = { + "pacote-11.3.4" = { name = "pacote"; packageName = "pacote"; - version = "11.3.3"; + version = "11.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-11.3.3.tgz"; - sha512 = "GQxBX+UcVZrrJRYMK2HoG+gPeSUX/rQhnbPkkGrCYa4n2F/bgClFPaMm0nsdnYrxnmUy85uMHoFXZ0jTD0drew=="; + url = "https://registry.npmjs.org/pacote/-/pacote-11.3.4.tgz"; + sha512 = "RfahPCunM9GI7ryJV/zY0bWQiokZyLqaSNHXtbNSoLb7bwTvBbJBEyCJ01KWs4j1Gj7GmX8crYXQ1sNX6P2VKA=="; }; }; "pad-0.0.5" = { @@ -43717,6 +43492,15 @@ let sha1 = "ad1f22ce1bf0fdc0d6ddd908af17f351a404b8ac"; }; }; + "paid-services-1.1.0" = { + name = "paid-services"; + packageName = "paid-services"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/paid-services/-/paid-services-1.1.0.tgz"; + sha512 = "+fpRfH9z0kzUzj+Gt4F/avFxyUMH486HZRlVHal48wJRbQO5yQoc8ABGkg9PFxeRFTgsSCJfN7kFwP9TQSsfXw=="; + }; + }; "pako-0.2.9" = { name = "pako"; packageName = "pako"; @@ -44104,13 +43888,13 @@ let sha1 = "32d4b6afde631420e5f415919a222b774b575707"; }; }; - "parse-url-5.0.2" = { + "parse-url-5.0.3" = { name = "parse-url"; packageName = "parse-url"; - version = "5.0.2"; + version = "5.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/parse-url/-/parse-url-5.0.2.tgz"; - sha512 = "Czj+GIit4cdWtxo3ISZCvLiUjErSo0iI3wJ+q9Oi3QuMYTI6OZu+7cewMWZ+C1YAnKhYTk6/TLuhIgCypLthPA=="; + url = "https://registry.npmjs.org/parse-url/-/parse-url-5.0.3.tgz"; + sha512 = "nrLCVMJpqo12X8uUJT4GJPd5AFaTOrGx/QpJy3HNcVtq0AZSstVIsnxS5fqNPuoqMUs3MyfBoOP6Zvu2Arok5A=="; }; }; "parse5-1.5.1" = { @@ -45292,6 +45076,15 @@ let sha1 = "1a1e55153d41a05534cea23cfe860abaa0eb4ace"; }; }; + "pm2-sysmonit-1.2.8" = { + name = "pm2-sysmonit"; + packageName = "pm2-sysmonit"; + version = "1.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/pm2-sysmonit/-/pm2-sysmonit-1.2.8.tgz"; + sha512 = "ACOhlONEXdCTVwKieBIQLSi2tQZ8eKinhcr9JpZSUAL8Qy0ajIgRtsLxG/lwPOW3JEKqPyw/UaHmTWhUzpP4kA=="; + }; + }; "pn-1.1.0" = { name = "pn"; packageName = "pn"; @@ -45337,13 +45130,13 @@ let sha512 = "7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg=="; }; }; - "polished-3.7.2" = { + "polished-4.1.3" = { name = "polished"; packageName = "polished"; - version = "3.7.2"; + version = "4.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/polished/-/polished-3.7.2.tgz"; - sha512 = "pQKtpZGmsZrW8UUpQMAnR7s3ppHeMQVNyMDKtUyKwuvDmklzcEyM5Kllb3JyE/sE/x7arDmyd35i+4vp99H6sQ=="; + url = "https://registry.npmjs.org/polished/-/polished-4.1.3.tgz"; + sha512 = "ocPAcVBUOryJEKe0z2KLd1l9EBa1r5mSwlKpExmrLzsnIzJo4axsoU9O2BjOTkDGDT4mZ0WFE5XKTlR3nLnZOA=="; }; }; "polyraf-1.1.0" = { @@ -45428,13 +45221,13 @@ let sha512 = "03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw=="; }; }; - "postcss-7.0.35" = { + "postcss-7.0.36" = { name = "postcss"; packageName = "postcss"; - version = "7.0.35"; + version = "7.0.36"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz"; - sha512 = "3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg=="; + url = "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz"; + sha512 = "BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw=="; }; }; "postcss-8.2.10" = { @@ -45446,13 +45239,13 @@ let sha512 = "b/h7CPV7QEdrqIxtAf2j31U5ef05uBDuvoXv6L51Q4rcS1jdlXAVKJv+atCFdUXYl9dyTHGyoMzIepwowRJjFw=="; }; }; - "postcss-8.3.0" = { + "postcss-8.3.2" = { name = "postcss"; packageName = "postcss"; - version = "8.3.0"; + version = "8.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.3.0.tgz"; - sha512 = "+ogXpdAjWGa+fdYY5BQ96V/6tAo+TdSSIMP5huJBIygdWwKtVoB5JWZ7yUd4xZ8r+8Kvvx4nyg/PQ071H4UtcQ=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.3.2.tgz"; + sha512 = "y1FK/AWdZlBF5lusS5j5l4/vF67+vQZt1SXPVJ32y1kRGDQyrs1zk32hG1cInRTu14P0V+orPz+ifwW/7rR4bg=="; }; }; "postcss-calc-7.0.5" = { @@ -46112,13 +45905,13 @@ let sha512 = "s8Aai8++QQGi4sSbs/M1Qku62PFK49Jm1CbgXklGz4nmHveDq0wzJkg7Na5QbnO1uNH8K7iqx2EQ/mV0MZEmOg=="; }; }; - "prebuild-install-6.1.2" = { + "prebuild-install-6.1.3" = { name = "prebuild-install"; packageName = "prebuild-install"; - version = "6.1.2"; + version = "6.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.1.2.tgz"; - sha512 = "PzYWIKZeP+967WuKYXlTOhYBgGOvTRSfaKI89XnfJ0ansRAH7hDU45X+K+FZeI1Wb/7p/NnuctPH3g0IqKUuSQ=="; + url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.1.3.tgz"; + sha512 = "iqqSR84tNYQUQHRXalSKdIaM8Ov1QxOVuBNWI7+BzZWv6Ih9k75wOnH1rGQ9WWTaaLkTpxWKIciOF0KyfM74+Q=="; }; }; "precinct-8.1.0" = { @@ -46229,6 +46022,15 @@ let sha512 = "kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w=="; }; }; + "prettier-2.3.1" = { + name = "prettier"; + packageName = "prettier"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier/-/prettier-2.3.1.tgz"; + sha512 = "p+vNbgpLjif/+D+DwAZAbndtRrR0md0MwfmOVN9N+2RgyACMT+7tfaRnT+WDPkqnuVwleyuBIG2XBxKDme3hPA=="; + }; + }; "prettier-bytes-1.0.4" = { name = "prettier-bytes"; packageName = "prettier-bytes"; @@ -46499,13 +46301,13 @@ let sha512 = "99PZ5+RU4gqiTfK5ZDMDkZtn6eL4WlKfFyVJV7lFQvH3iGmQ85DqMTOdxorERO26LHkevR2qsxnHp0x/2UDJPA=="; }; }; - "probing-1.3.5" = { + "probing-1.3.6" = { name = "probing"; packageName = "probing"; - version = "1.3.5"; + version = "1.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/probing/-/probing-1.3.5.tgz"; - sha512 = "Pn7gjrWqgsCyTIlSgTvhni17I3BsLXXL/QLDcDhEPI84xsyUWpSqiUw7Vr15kKvtPABrwtFb6k81v4kWGLo1ZQ=="; + url = "https://registry.npmjs.org/probing/-/probing-1.3.6.tgz"; + sha512 = "BO8oZu/KY6Z3ZquoEOJSvsUWFTNbGb5K8M+oZCMqT2VFaqceJ33TZJLF+qEAHIFIALagd4jHaKMg2V043ltotQ=="; }; }; "process-0.10.1" = { @@ -46580,6 +46382,15 @@ let sha1 = "e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"; }; }; + "progress-2.0.1" = { + name = "progress"; + packageName = "progress"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/progress/-/progress-2.0.1.tgz"; + sha512 = "OE+a6vzqazc+K6LxJrX5UPyKFvGnL5CYmq2jFGNIBWHpc4QyE49/YOumcrpQFJpfejmvRtbJzgO1zPmMCqlbBg=="; + }; + }; "progress-2.0.3" = { name = "progress"; packageName = "progress"; @@ -47021,22 +46832,22 @@ let sha512 = "0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA=="; }; }; - "psbt-1.1.8" = { + "psbt-1.1.10" = { name = "psbt"; packageName = "psbt"; - version = "1.1.8"; + version = "1.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/psbt/-/psbt-1.1.8.tgz"; - sha512 = "gnGq1ikGhvcsJij9BU2DZWBfXp09yRi/72+790hNwPaMPobgWrdlQ6sg6rNyDNYf+lwzYV8WIyHOLk2zH/7fGg=="; + url = "https://registry.npmjs.org/psbt/-/psbt-1.1.10.tgz"; + sha512 = "LLyJcNVKRK8AUXKcpCrZA21+mlrjzlzTLQZp/Yu279hqqQrakAu9IusT7zEddhhkQrzm6UQ9cER3nhrIZqh0hw=="; }; }; - "psbt-1.1.9" = { + "psbt-1.1.8" = { name = "psbt"; packageName = "psbt"; - version = "1.1.9"; + version = "1.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/psbt/-/psbt-1.1.9.tgz"; - sha512 = "lL4unvP9nZFCWlqpKvWUEfTKVpkVyGKeBsYH/f76NNlgn1PF87Glw7opoAJQ5m0xfUTeUqy8J6ukIt4tFCqi1Q=="; + url = "https://registry.npmjs.org/psbt/-/psbt-1.1.8.tgz"; + sha512 = "gnGq1ikGhvcsJij9BU2DZWBfXp09yRi/72+790hNwPaMPobgWrdlQ6sg6rNyDNYf+lwzYV8WIyHOLk2zH/7fGg=="; }; }; "pseudomap-1.0.2" = { @@ -47930,22 +47741,22 @@ let sha512 = "l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A=="; }; }; - "puppeteer-8.0.0" = { + "puppeteer-10.0.0" = { name = "puppeteer"; packageName = "puppeteer"; - version = "8.0.0"; + version = "10.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/puppeteer/-/puppeteer-8.0.0.tgz"; - sha512 = "D0RzSWlepeWkxPPdK3xhTcefj8rjah1791GE82Pdjsri49sy11ci/JQsAO8K2NRukqvwEtcI+ImP5F4ZiMvtIQ=="; + url = "https://registry.npmjs.org/puppeteer/-/puppeteer-10.0.0.tgz"; + sha512 = "AxHvCb9IWmmP3gMW+epxdj92Gglii+6Z4sb+W+zc2hTTu10HF0yg6hGXot5O74uYkVqG3lfDRLfnRpi6WOwi5A=="; }; }; - "puppeteer-9.1.1" = { + "puppeteer-8.0.0" = { name = "puppeteer"; packageName = "puppeteer"; - version = "9.1.1"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/puppeteer/-/puppeteer-9.1.1.tgz"; - sha512 = "W+nOulP2tYd/ZG99WuZC/I5ljjQQ7EUw/jQGcIb9eu8mDlZxNY2SgcJXTLG9h5gRvqA3uJOe4hZXYsd3EqioMw=="; + url = "https://registry.npmjs.org/puppeteer/-/puppeteer-8.0.0.tgz"; + sha512 = "D0RzSWlepeWkxPPdK3xhTcefj8rjah1791GE82Pdjsri49sy11ci/JQsAO8K2NRukqvwEtcI+ImP5F4ZiMvtIQ=="; }; }; "purgecss-2.3.0" = { @@ -47993,13 +47804,13 @@ let sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7"; }; }; - "pyright-1.1.145" = { + "pyright-1.1.148" = { name = "pyright"; packageName = "pyright"; - version = "1.1.145"; + version = "1.1.148"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.145.tgz"; - sha512 = "eyrK9Ilut2shvqi/TFmpfUrm7U6DrkskMa8UPofkGJZCO1PJzVwzKaGWrR57zlbcAxs5PVvK9JGSIO9DJUVNyA=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.148.tgz"; + sha512 = "cM1Bs/5XSqqfaTfl+zSvXvrq1YMUYOmo2QGBqZ4Cczq0hDo4oJAihzszJONO9H5riTgmEduid5aU3Rpkx+Y/xw=="; }; }; "q-0.9.7" = { @@ -48506,15 +48317,6 @@ let sha1 = "4f68a1dc0ae58bd3fb95848c30324db75d64360b"; }; }; - "random-item-3.1.0" = { - name = "random-item"; - packageName = "random-item"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/random-item/-/random-item-3.1.0.tgz"; - sha512 = "0DyAT8LYBNQKSkqcPjia/HNoWCZ5JWBdAQWjBQVh5DMVv3Fv7V90I8/AuUf8NW4zdFn27i9qj8Kp6wI5JsiiOA=="; - }; - }; "random-iterate-1.0.1" = { name = "random-iterate"; packageName = "random-iterate"; @@ -48740,6 +48542,15 @@ let sha512 = "0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g=="; }; }; + "react-17.0.2" = { + name = "react"; + packageName = "react"; + version = "17.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/react/-/react-17.0.2.tgz"; + sha512 = "gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA=="; + }; + }; "react-dev-utils-11.0.4" = { name = "react-dev-utils"; packageName = "react-dev-utils"; @@ -48767,6 +48578,15 @@ let sha512 = "1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw=="; }; }; + "react-dom-17.0.2" = { + name = "react-dom"; + packageName = "react-dom"; + version = "17.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/react-dom/-/react-dom-17.0.2.tgz"; + sha512 = "s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA=="; + }; + }; "react-error-overlay-6.0.9" = { name = "react-error-overlay"; packageName = "react-error-overlay"; @@ -49190,15 +49010,6 @@ let sha512 = "1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ=="; }; }; - "readdirp-3.2.0" = { - name = "readdirp"; - packageName = "readdirp"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz"; - sha512 = "crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ=="; - }; - }; "readdirp-3.5.0" = { name = "readdirp"; packageName = "readdirp"; @@ -49415,13 +49226,13 @@ let sha1 = "b66d828cdcafe6b4b8a428a7def4c6bcac31c8b4"; }; }; - "redoc-2.0.0-rc.53" = { + "redoc-2.0.0-rc.54" = { name = "redoc"; packageName = "redoc"; - version = "2.0.0-rc.53"; + version = "2.0.0-rc.54"; src = fetchurl { - url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.53.tgz"; - sha512 = "nyHIEIVo+kxsMfAy7nkYSlU7qjXZAARcj0INaRwCoy/DG9BMMi3xLcpo0CmarL9XeI891+VN2tpyTJ8jhZUtPw=="; + url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.54.tgz"; + sha512 = "xwukaWdoktkDAoQuhajekdC54+/lSLwIUqJCNSTVEjeYEuZPq2tFUj9H5SBt8/YSq5UF/zOmDQrXPWMgildQpQ=="; }; }; "reduce-component-1.0.1" = { @@ -49982,13 +49793,13 @@ let sha512 = "F5BMWDmgATEoyPCtKjmGNTGN1ghoZlfRQ3MJh8dS/MrvIUIxupiof/Y9uahChipXcqQ57twVbgMmyQmuO1vokw=="; }; }; - "renderkid-2.0.5" = { + "renderkid-2.0.7" = { name = "renderkid"; packageName = "renderkid"; - version = "2.0.5"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/renderkid/-/renderkid-2.0.5.tgz"; - sha512 = "ccqoLg+HLOHq1vdfYNm4TBeaCDIi1FLt3wGojTDSvdewUv65oTmI3cnT2E4hRjl1gzKZIPK+KZrXzlUYKnR+vQ=="; + url = "https://registry.npmjs.org/renderkid/-/renderkid-2.0.7.tgz"; + sha512 = "oCcFyxaMrKsKcTY59qnCAtmDVSLfPbrv6A3tVbPdFMMrv5jaK10V6m40cKsoPNhAqN6rmHW9sswW4o3ruSrwUQ=="; }; }; "repeat-element-1.1.4" = { @@ -50837,13 +50648,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.50.5" = { + "rollup-2.51.2" = { name = "rollup"; packageName = "rollup"; - version = "2.50.5"; + version = "2.51.2"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.50.5.tgz"; - sha512 = "Ztz4NurU2LbS3Jn5rlhnYv35z6pkjBUmYKr94fOBIKINKRO6kug9NTFHArT7jqwMP2kqEZ39jJuEtkk91NBltQ=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.51.2.tgz"; + sha512 = "ReV2eGEadA7hmXSzjxdDKs10neqH2QURf2RxJ6ayAlq93ugy6qIvXMmbc5cWMGCDh1h5T4thuWO1e2VNbMq8FA=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -51080,13 +50891,13 @@ let sha512 = "Arc4hUN896vjkqCYrUXquBFtRZdv1PfLbTYP71efP6butxyQ0kWpiNJyAgsxscmQg1cqvHY32/UCBzXedTpU2g=="; }; }; - "rusha-0.8.13" = { + "rusha-0.8.14" = { name = "rusha"; packageName = "rusha"; - version = "0.8.13"; + version = "0.8.14"; src = fetchurl { - url = "https://registry.npmjs.org/rusha/-/rusha-0.8.13.tgz"; - sha1 = "9a084e7b860b17bff3015b92c67a6a336191513a"; + url = "https://registry.npmjs.org/rusha/-/rusha-0.8.14.tgz"; + sha512 = "cLgakCUf6PedEu15t8kbsjnwIFFR2D4RfL+W3iWFJ4iac7z4B0ZI8fxy4R3J956kAI68HclCFGL8MPoUVC3qVA=="; }; }; "rw-1.3.3" = { @@ -51332,13 +51143,13 @@ let sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg=="; }; }; - "sass-1.34.0" = { + "sass-1.34.1" = { name = "sass"; packageName = "sass"; - version = "1.34.0"; + version = "1.34.1"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.34.0.tgz"; - sha512 = "rHEN0BscqjUYuomUEaqq3BMgsXqQfkcMVR7UhscsAVub0/spUrZGBMxQXFS2kfiDsPLZw5yuU9iJEFNC2x38Qw=="; + url = "https://registry.npmjs.org/sass/-/sass-1.34.1.tgz"; + sha512 = "scLA7EIZM+MmYlej6sdVr0HRbZX5caX5ofDT9asWnUJj21oqgsC+1LuNfm0eg+vM0fCTZHhwImTiCU0sx9h9CQ=="; }; }; "sax-0.5.8" = { @@ -51413,6 +51224,15 @@ let sha512 = "n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA=="; }; }; + "scheduler-0.20.2" = { + name = "scheduler"; + packageName = "scheduler"; + version = "0.20.2"; + src = fetchurl { + url = "https://registry.npmjs.org/scheduler/-/scheduler-0.20.2.tgz"; + sha512 = "2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ=="; + }; + }; "schema-utils-0.4.7" = { name = "schema-utils"; packageName = "schema-utils"; @@ -52430,13 +52250,13 @@ let sha512 = "rohCHmEjD/ESXFLxF4bVeqgdb4Awc65ZyyuCKl3f7BvgMbZOBa/Ye3HN/GFnvruiUOAWWNupxhz3Rz5/3vJLTg=="; }; }; - "simple-git-2.39.0" = { + "simple-git-2.39.1" = { name = "simple-git"; packageName = "simple-git"; - version = "2.39.0"; + version = "2.39.1"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-2.39.0.tgz"; - sha512 = "VOsrmc3fpp1lGVIpo+1SKNqJzrdVJeSGZCeenPKnJPNo5UouAlSkWFc037pfm9wRYtfxBdwp2deVJGCG8J6C8A=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-2.39.1.tgz"; + sha512 = "+kEAkyQHsWejYxQNCzTrjvCxJOcijpB49RSs7HV+TK9B9prUq7YBNpFstQvjfGBn4Hecywp4tm+breGGGHlHwA=="; }; }; "simple-markdown-0.4.4" = { @@ -52718,6 +52538,15 @@ let sha1 = "e09f00899c09f5a7058edc36dd49f046fd50a82a"; }; }; + "slugify-1.4.7" = { + name = "slugify"; + packageName = "slugify"; + version = "1.4.7"; + src = fetchurl { + url = "https://registry.npmjs.org/slugify/-/slugify-1.4.7.tgz"; + sha512 = "tf+h5W1IrjNm/9rKKj0JU2MDMruiopx0jjVA5zCdBtcGjfp0+c5rHw/zADLC3IeKlGHtVbHtpfzvYA0OYT+HKg=="; + }; + }; "slugify-1.5.3" = { name = "slugify"; packageName = "slugify"; @@ -52907,13 +52736,13 @@ let sha512 = "HHuOYEAACpUpkFgU8HT57mmxmonaJ4O3YADoSkVhnhkmJ+AowqZyJOau703dYHNrq2DvQ7qYw81H7yyxS1Nfjw=="; }; }; - "snyk-mvn-plugin-2.26.0" = { + "snyk-mvn-plugin-2.26.1" = { name = "snyk-mvn-plugin"; packageName = "snyk-mvn-plugin"; - version = "2.26.0"; + version = "2.26.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.26.0.tgz"; - sha512 = "LxYNWXPJxcwbkCK+vE7t437RttEDcbsS2KJJYzFtrr6u7g26c51u9aMHYPCDAEmwjI1A28zSrh7Wp45JW4YOqg=="; + url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.26.1.tgz"; + sha512 = "DCs53aRT/uK2e1jXzeVG2d+Ll0bmY/YHL+jEYaWJko8XwGoVwqCrVOkRyzXd2KOZUk3gpD6MaxIrBWsc8RJzRA=="; }; }; "snyk-nodejs-lockfile-parser-1.34.0" = { @@ -53771,13 +53600,13 @@ let sha512 = "0rfBDPVLzvDbMUKrFWvF6kvtXxllXGZRkFL0aCWJ5y8uXlEfZDo6IEPACZwJbKt/fGqFjJLJRHnG62vJmLLpRA=="; }; }; - "spiro-2.0.0" = { + "spiro-3.0.0" = { name = "spiro"; packageName = "spiro"; - version = "2.0.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/spiro/-/spiro-2.0.0.tgz"; - sha512 = "KPWXN+OmQdjZPCMGRkE2hsbcY4Y4UJxjn+qTw4rsJ49n8VN6EqPk0UOOkNihXEl3JEqPQxcrDQebu9YPn9Ad4w=="; + url = "https://registry.npmjs.org/spiro/-/spiro-3.0.0.tgz"; + sha512 = "UEhtLWA8fDQuExOKpT3FLa7Rk238G5Bm3wGAxbvnah3H2X6yEL4blIkAsc38wNwMXBwQFRYE6l0Q9X0t1izOxA=="; }; }; "split-0.2.10" = { @@ -54068,13 +53897,13 @@ let sha512 = "ifPgPNmDE8EKuuoqtXibwgYNtDZNry7sJL1epSUb3XgQr62bUV31N9R5LHKDsI2kx96OgWRwWY2PfZ7vf/hU8Q=="; }; }; - "ssb-friends-4.4.5" = { + "ssb-friends-4.4.7" = { name = "ssb-friends"; packageName = "ssb-friends"; - version = "4.4.5"; + version = "4.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-friends/-/ssb-friends-4.4.5.tgz"; - sha512 = "XTGmXoqSm/U+A4WxNTTr3+yLdQk2sZUtvqdAFUPqzIVHmF3loji7IgyFRdEAk7wC2pY4N29YsYE2/qpRvu576Q=="; + url = "https://registry.npmjs.org/ssb-friends/-/ssb-friends-4.4.7.tgz"; + sha512 = "WPdHEWsAl9zMjbqQoFP++7UBi/lCKxiR0c8Qe2HHHoWIw58iVLSpepbNlZFwiZP4mPK5v2XaoYLOj7s3/UKj2w=="; }; }; "ssb-git-0.5.0" = { @@ -54590,13 +54419,13 @@ let sha512 = "/Kz55rgUIv2KP2MKphwYT/NCuSfAlbbMRv2ZWw7wyXayu230zdtzhxxuXXcvsc6EmmhS8bSJl3uS1wmMHFumbA=="; }; }; - "statsd-client-0.4.6" = { + "statsd-client-0.4.7" = { name = "statsd-client"; packageName = "statsd-client"; - version = "0.4.6"; + version = "0.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/statsd-client/-/statsd-client-0.4.6.tgz"; - sha512 = "OL3PAf0LhlFP8ZpxFm3Ue7dL3cV5o7PAsWDsQnx/iKXGVr8huYF/ui+OZEORerEDVRps7BCPAq5bWppMj1oMoA=="; + url = "https://registry.npmjs.org/statsd-client/-/statsd-client-0.4.7.tgz"; + sha512 = "+sGCE6FednJ/vI7vywErOg/mhVqmf6Zlktz7cdGRnF/cQWXD9ifMgtqU1CIIXmhSwm11SCk4zDN+bwNCvIR/Kg=="; }; }; "statuses-1.4.0" = { @@ -55724,13 +55553,13 @@ let sha512 = "cm7TQq9I8dA5LKUr+r8W7RzQlLsmTdCr6wXmjYueOoh/bQu55ODEw7GFhT42pUyoaLtO2rgmx1+8cSIjY9lR9g=="; }; }; - "subscriptions-transport-ws-0.9.18" = { + "subscriptions-transport-ws-0.9.19" = { name = "subscriptions-transport-ws"; packageName = "subscriptions-transport-ws"; - version = "0.9.18"; + version = "0.9.19"; src = fetchurl { - url = "https://registry.npmjs.org/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.18.tgz"; - sha512 = "tztzcBTNoEbuErsVQpTN2xUNN/efAZXyCyL5m3x4t6SKrEiTL2N8SaKWBFWM4u56pL79ULif3zjyeq+oV+nOaA=="; + url = "https://registry.npmjs.org/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.19.tgz"; + sha512 = "dxdemxFFB0ppCLg10FTtRqH/31FNRL1y1BQv8209MK5I4CwALb7iihQg+7p65lFcIl8MHatINWBLOqpgU4Kyyw=="; }; }; "subscriptions-transport-ws-0.9.8" = { @@ -55904,15 +55733,6 @@ let sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; }; }; - "supports-color-6.0.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz"; - sha512 = "on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg=="; - }; - }; "supports-color-6.1.0" = { name = "supports-color"; packageName = "supports-color"; @@ -55976,13 +55796,13 @@ let sha512 = "Zx1/xLeGOIBlZMGPRCaXtlMe4ZA0faato5Dc3CosEqwu75MIEPuOstdkH6cy+RYTUYynoxzNaDxkPX4DbrPwRA=="; }; }; - "svelte2tsx-0.2.0" = { + "svelte2tsx-0.2.1" = { name = "svelte2tsx"; packageName = "svelte2tsx"; - version = "0.2.0"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.2.0.tgz"; - sha512 = "gag/5eqXOMfeHkPWbioEz2kk01KJpG2ZVxYMV35EWMGpxR4m6jzgNPkl7bYp5fEOuHQ99muyVQFIedu4wjgmZw=="; + url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.2.1.tgz"; + sha512 = "3JNUm+rRz0BYwO53NDEqpswW3wU2uvKtpIBjrFbizso8HJpjHM1NCFyXvVfdeM9vG7xH6oh3n0G0tE9noAomKA=="; }; }; "sver-compat-1.5.0" = { @@ -56012,13 +55832,13 @@ let sha1 = "58f71cee3bd519b59d4b2a843b6c7de64ac04764"; }; }; - "svg2img-0.9.2" = { + "svg2img-0.9.3" = { name = "svg2img"; packageName = "svg2img"; - version = "0.9.2"; + version = "0.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/svg2img/-/svg2img-0.9.2.tgz"; - sha512 = "sjyUgQhfEPJpBRTGxqI9bRzE+3k41Nzc7OtcHSSko96i/EQJZAisdxyhk12Ho/mDVCsb1QsVHLbevbxrFC6onQ=="; + url = "https://registry.npmjs.org/svg2img/-/svg2img-0.9.3.tgz"; + sha512 = "xuBToDg/iFg0T8dhMTpu8CGfnsinswF2zgBa22HbcK6fSAKkl/bsX84qbic50kA4McKTLK5QZ+fzavy8quEIVA=="; }; }; "svgo-0.6.6" = { @@ -56129,22 +55949,13 @@ let sha512 = "xk5CMbwoQVI53rTq9o/iMojAqXP5NT4/+TMeTP4uXWDIH18pB9AXgO5Olqt0RXuf3jH032DA4DS4qzem6XdXAw=="; }; }; - "swagger-ui-dist-3.49.0" = { + "swagger-ui-dist-3.50.0" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "3.49.0"; - src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.49.0.tgz"; - sha512 = "R1+eT16XNP1bBLfacISifZAkFJlpwvWsS2vVurF5pbIFZnmCasD/hj+9r/q7urYdQyb0B6v11mDnuYU7rUpfQg=="; - }; - }; - "swagger2openapi-6.2.3" = { - name = "swagger2openapi"; - packageName = "swagger2openapi"; - version = "6.2.3"; + version = "3.50.0"; src = fetchurl { - url = "https://registry.npmjs.org/swagger2openapi/-/swagger2openapi-6.2.3.tgz"; - sha512 = "cUUktzLpK69UwpMbcTzjMw2ns9RZChfxh56AHv6+hTx3StPOX2foZjPgds3HlJcINbxosYYBn/D3cG8nwcCWwQ=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.50.0.tgz"; + sha512 = "BklniOBPlvZ6M9oGkhUwOf5HvxhkHBIycXN3ndju8WlLmi1xfMSdOA2AR6pNswlwURzsZUe1rh80aUyjnpD+Zw=="; }; }; "swagger2openapi-7.0.6" = { @@ -56282,6 +56093,15 @@ let sha512 = "33+lQwlLxXoxy0o9WLOgw8OjbXeS3Jv+pSl+nxKc2AOClBI28HsdRPpH0u9Xa9OVjHLT9vonnOMw1ug7YXI0dA=="; }; }; + "systeminformation-5.7.6" = { + name = "systeminformation"; + packageName = "systeminformation"; + version = "5.7.6"; + src = fetchurl { + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.7.6.tgz"; + sha512 = "sT7GeHq32DHaYBsQFogiLuHx51u+DO5flOlhIcmckTP0T9hQhAvvrbOR8jglNMaZgCvp5jACxeepERKGl7Bn/g=="; + }; + }; "table-3.8.3" = { name = "table"; packageName = "table"; @@ -56318,15 +56138,6 @@ let sha512 = "wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug=="; }; }; - "table-6.7.0" = { - name = "table"; - packageName = "table"; - version = "6.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-6.7.0.tgz"; - sha512 = "SAM+5p6V99gYiiy2gT5ArdzgM1dLDed0nkrWmG6Fry/bUS/m9x83BwpJUOf1Qj/x2qJd+thL6IkIx7qPGRxqBw=="; - }; - }; "table-6.7.1" = { name = "table"; packageName = "table"; @@ -56526,6 +56337,15 @@ let sha512 = "NvCeXpYx7OsmOh8zIOP/ebG55zZmxLE0etfWRbWok+q2Qo8x/vOR/IJT1taADXPe+jsiu9axDb3X4B+iIgNlKw=="; }; }; + "tar-fs-2.0.0" = { + name = "tar-fs"; + packageName = "tar-fs"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tar-fs/-/tar-fs-2.0.0.tgz"; + sha512 = "vaY0obB6Om/fso8a8vakQBzwholQ7v5+uy+tF3Ozvxv1KNezmVQAiWtcNmMHFSFPqL3dJA8ha6gdtFbfX9mcxA=="; + }; + }; "tar-fs-2.1.1" = { name = "tar-fs"; packageName = "tar-fs"; @@ -56706,15 +56526,6 @@ let sha512 = "HIeWmj77uOOHb0QX7siN3OtwV3CTntquin6TNVg6SHOqCP3hYKmox90eeFOGaY1MqJ9WYDDjkyZrW6qS5AWpbw=="; }; }; - "tempfile-2.0.0" = { - name = "tempfile"; - packageName = "tempfile"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tempfile/-/tempfile-2.0.0.tgz"; - sha1 = "6b0446856a9b1114d1856ffcbe509cccb0977265"; - }; - }; "tempy-0.2.1" = { name = "tempy"; packageName = "tempy"; @@ -57732,15 +57543,6 @@ let sha512 = "RqtHvVffaf+ORMlpFjEWh3czDy6Q5wFfdGq9JXVBXu2L8/ssjDTnong8f1+I2xWGlKslXUkHU7m1HBj6MyoLqw=="; }; }; - "too-wordy-0.1.6" = { - name = "too-wordy"; - packageName = "too-wordy"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/too-wordy/-/too-wordy-0.1.6.tgz"; - sha512 = "MV5F74YF9+UYsvwXGXTh+5YP3EqH/ivwWfyFE2/YHWQQxm9jDPmkIC23nkN133Ye4nO3HTXmiMcfGqJ5xRPfOA=="; - }; - }; "too-wordy-0.3.4" = { name = "too-wordy"; packageName = "too-wordy"; @@ -58164,22 +57966,22 @@ let sha512 = "uEtWkFM/sdZvRNNDL3Ehu4WVpwaulhwQszV8mrtcdeE8nN00BV9mAmQ88RkrBhFgl9gMgvjJLAQcZbnPXI9mlA=="; }; }; - "ts-loader-6.2.2" = { + "ts-loader-8.0.4" = { name = "ts-loader"; packageName = "ts-loader"; - version = "6.2.2"; + version = "8.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/ts-loader/-/ts-loader-6.2.2.tgz"; - sha512 = "HDo5kXZCBml3EUPcc7RlZOV/JGlLHwppTLEHb3SHnr5V7NXD4klMEkrhJe5wgRbaWsSXi+Y1SIBN/K9B6zWGWQ=="; + url = "https://registry.npmjs.org/ts-loader/-/ts-loader-8.0.4.tgz"; + sha512 = "5u8KF1SW8eCUb/Ff7At81e3wznPmT/27fvaGRO9CziVy+6NlPVRvrzSox4OwU0/e6OflOUB32Err4VquysCSAQ=="; }; }; - "ts-loader-8.0.4" = { + "ts-loader-8.3.0" = { name = "ts-loader"; packageName = "ts-loader"; - version = "8.0.4"; + version = "8.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/ts-loader/-/ts-loader-8.0.4.tgz"; - sha512 = "5u8KF1SW8eCUb/Ff7At81e3wznPmT/27fvaGRO9CziVy+6NlPVRvrzSox4OwU0/e6OflOUB32Err4VquysCSAQ=="; + url = "https://registry.npmjs.org/ts-loader/-/ts-loader-8.3.0.tgz"; + sha512 = "MgGly4I6cStsJy27ViE32UoqxPTN9Xly4anxxVyaIWR+9BGxboV4EyJBGfR3RePV7Ksjj3rHmPZJeIt+7o4Vag=="; }; }; "ts-log-2.2.3" = { @@ -58281,6 +58083,15 @@ let sha512 = "gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w=="; }; }; + "tslib-2.3.0" = { + name = "tslib"; + packageName = "tslib"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz"; + sha512 = "N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="; + }; + }; "tslint-5.20.1" = { name = "tslint"; packageName = "tslint"; @@ -58488,6 +58299,15 @@ let sha1 = "0762378f1dc1c050e48f666aca904e24b1a962f4"; }; }; + "tx2-1.0.4" = { + name = "tx2"; + packageName = "tx2"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/tx2/-/tx2-1.0.4.tgz"; + sha512 = "rU+y30nUY3PyIi+znvv74HzxlpULKwMPAyRK+YiCjvGkk3rY3fic3D6Z+avLpun3V5A6HFwPQ9JrBTMNEV/dxg=="; + }; + }; "txt-to-ast-3.0.3" = { name = "txt-to-ast"; packageName = "txt-to-ast"; @@ -58857,13 +58677,13 @@ let sha1 = "5c080e5d661cbbe38259d2e70a3c7253e873881d"; }; }; - "typo-geom-0.11.2" = { + "typo-geom-0.12.1" = { name = "typo-geom"; packageName = "typo-geom"; - version = "0.11.2"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/typo-geom/-/typo-geom-0.11.2.tgz"; - sha512 = "ouK6sY+LNGDDQra+MEZb2ZYDaEkCUeutr6x8BZAGGGB0fCsR0wt6YIuz9DJoc8idQS8mnqY8npGmXcMsTZAXPA=="; + url = "https://registry.npmjs.org/typo-geom/-/typo-geom-0.12.1.tgz"; + sha512 = "W20RYp2OCEGMhEYayR0cAP67AUWiGRUufMs6Clul7MAmu5SpLuOG/RWk7+LkL65wsugcfhPQlFEJ231C2xHNQg=="; }; }; "ua-parser-js-0.7.21" = { @@ -58911,13 +58731,13 @@ let sha512 = "otIc7O9LyxpUcQoXzj2hL4LPWKklO6LJWoJUzNa8A17Xgi4fOeDC8FBDOLHnC/Slo1CQgsZMcM6as0M76BZaig=="; }; }; - "uglify-js-3.13.8" = { + "uglify-js-3.13.9" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.13.8"; + version = "3.13.9"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.8.tgz"; - sha512 = "PvFLMFIQHfIjFFlvAch69U2IvIxK9TNzNWt1SxZGp9JZ/v70yvqIQuiJeVPPtUMOzoNt+aNRDk4wgxb34wvEqA=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.9.tgz"; + sha512 = "wZbyTQ1w6Y7fHdt8sJnHfSIuWeDgk6B5rCb4E/AM6QNNPbOMIZph21PW5dRB3h7Df0GszN+t7RuUH6sWK5bF0g=="; }; }; "uglify-js-3.4.10" = { @@ -59064,6 +58884,15 @@ let sha512 = "tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw=="; }; }; + "unbzip2-stream-1.3.3" = { + name = "unbzip2-stream"; + packageName = "unbzip2-stream"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz"; + sha512 = "fUlAF7U9Ah1Q6EieQ4x4zLNejrRvDWUYmxXUpN3uziFYCHapjWFaCAnreY9bGgxzaMCFAPPpYNng57CypwJVhg=="; + }; + }; "unbzip2-stream-1.4.3" = { name = "unbzip2-stream"; packageName = "unbzip2-stream"; @@ -61360,13 +61189,13 @@ let sha512 = "gQpnTgkubC6hQgdIcRdYGDSDc+SaujOdyesZQMv6JlfQee/9Mp0Qhnys6WxDWvQnL5WZdT7o2Ul187aSt0Rq+w=="; }; }; - "vls-0.7.2" = { + "vls-0.7.4" = { name = "vls"; packageName = "vls"; - version = "0.7.2"; + version = "0.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/vls/-/vls-0.7.2.tgz"; - sha512 = "9nKgSPtNxQlc32K5GgZV++MdsCpNuac/SfxnEmVI0DCF4E0Uekj+RUo7Zk6NnA4veiNMN+AEjAIlbXYWPHgX6Q=="; + url = "https://registry.npmjs.org/vls/-/vls-0.7.4.tgz"; + sha512 = "uU5HCIK5vX096eMA5fBwyR7tv36m1Ssy910w5ILT5OvCUTXgBR58gZRJWrL2HxCyG8oYXC+oFWjhJc7+ExBUgQ=="; }; }; "vm-browserify-1.1.2" = { @@ -61405,13 +61234,22 @@ let sha1 = "614f7fbf8d801f0bb5f0661f5b2f5785750e4f09"; }; }; - "vsce-1.91.0" = { + "vsce-1.88.0" = { name = "vsce"; packageName = "vsce"; - version = "1.91.0"; + version = "1.88.0"; src = fetchurl { - url = "https://registry.npmjs.org/vsce/-/vsce-1.91.0.tgz"; - sha512 = "y75QryWKzAw5KIR4NFEXc6XAy/Er1BHXdNwAESgKKFw8Yc8cA/+dP4Gj7VYhNPOJlV0v5j1in/cPkLFZAqC7cQ=="; + url = "https://registry.npmjs.org/vsce/-/vsce-1.88.0.tgz"; + sha512 = "FS5ou3G+WRnPPr/tWVs8b/jVzeDacgZHy/y7/QQW7maSPFEAmRt2bFGUJtJVEUDLBqtDm/3VGMJ7D31cF2U1tw=="; + }; + }; + "vsce-1.93.0" = { + name = "vsce"; + packageName = "vsce"; + version = "1.93.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vsce/-/vsce-1.93.0.tgz"; + sha512 = "RgmxwybXenP6tTF0PLh97b/RRLp1RkzjAHNya3QAfv1EZVg+lfoBiAaXogpmOGjYr8OskkqP5tIa3D/Q6X9lrw=="; }; }; "vscode-css-languageservice-3.0.13" = { @@ -61918,13 +61756,13 @@ let sha1 = "13587190f34e72ba7a07ebbaa7e70ac147b1fb7d"; }; }; - "vue-2.6.12" = { + "vue-2.6.14" = { name = "vue"; packageName = "vue"; - version = "2.6.12"; + version = "2.6.14"; src = fetchurl { - url = "https://registry.npmjs.org/vue/-/vue-2.6.12.tgz"; - sha512 = "uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg=="; + url = "https://registry.npmjs.org/vue/-/vue-2.6.14.tgz"; + sha512 = "x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ=="; }; }; "vue-codemod-0.0.5" = { @@ -62125,22 +61963,22 @@ let sha1 = "79331f666366b3b1c6ab02ceb04bad8dd2eebb0c"; }; }; - "wavedrom-2.6.9" = { + "wavedrom-2.7.0" = { name = "wavedrom"; packageName = "wavedrom"; - version = "2.6.9"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/wavedrom/-/wavedrom-2.6.9.tgz"; - sha512 = "EXBubejy7GrzibGLJ6OXH5HAP7KbA62gXMm8FvqJH0W5S05D6pgqdnRG20KP1w/WSY+zqdVIkiHNxwgquPbs2w=="; + url = "https://registry.npmjs.org/wavedrom/-/wavedrom-2.7.0.tgz"; + sha512 = "ae13n2/yEpmJt9VabwawsK7eHva7Mk+ghI+TQXCUbC1YEW8ChdrYgI/4TJyaYblzDlADZ0iCSaifZKNbjpR4Tw=="; }; }; - "wawoff2-1.0.2" = { + "wawoff2-2.0.0" = { name = "wawoff2"; packageName = "wawoff2"; - version = "1.0.2"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/wawoff2/-/wawoff2-1.0.2.tgz"; - sha512 = "qxuTwf5tAP/XojrRc6cmR0hGvqgD3XUxv2fzfzURKPDfE7AeHmtRuankVxdJ4DRdSKXaE5QlyJT49yBis2vb6Q=="; + url = "https://registry.npmjs.org/wawoff2/-/wawoff2-2.0.0.tgz"; + sha512 = "5gjFj+fyQO9cMrg5vYaVM7+T37xSHpqUWM/S6UCEiBx8wRmfpvuhYjPM3toB2UujpmWQt1hSPKRo/jIRE/j9Eg=="; }; }; "wbuf-1.7.3" = { @@ -62287,6 +62125,15 @@ let sha512 = "1xllYVmA4dIvRjHzwELgW4KjIU1fW4PEuEnjsylz7k7H5HgPOctIq7W1jrt3sKH9yG5d72//XWzsHhfoWvsQVg=="; }; }; + "webpack-5.38.1" = { + name = "webpack"; + packageName = "webpack"; + version = "5.38.1"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack/-/webpack-5.38.1.tgz"; + sha512 = "OqRmYD1OJbHZph6RUMD93GcCZy4Z4wC0ele4FXyYF0J6AxO1vOSuIlU1hkS/lDlR9CDYBz64MZRmdbdnFFoT2g=="; + }; + }; "webpack-bundle-analyzer-3.9.0" = { name = "webpack-bundle-analyzer"; packageName = "webpack-bundle-analyzer"; @@ -62305,6 +62152,15 @@ let sha512 = "NVWBaz9k839ZH/sinurM+HcDvJOTXwSjYp1ku+5XKeOC03z8v5QitnK/x+lAxGXFyhdayoIf/GOpv85z3/xPag=="; }; }; + "webpack-cli-4.7.2" = { + name = "webpack-cli"; + packageName = "webpack-cli"; + version = "4.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.7.2.tgz"; + sha512 = "mEoLmnmOIZQNiRl0ebnjzQ74Hk0iKS5SiEEnpq3dRezoyR3yPaeQZCMCe+db4524pj1Pd5ghZXjT41KLzIhSLw=="; + }; + }; "webpack-core-0.6.9" = { name = "webpack-core"; packageName = "webpack-core"; @@ -62377,13 +62233,13 @@ let sha512 = "9S6YyKKKh/Oz/eryM1RyLVDVmy3NSPV0JXMRhZ18fJsq+AwGxUY34X54VNwkzYcEmEkDwNxuEOboCZEebJXBAQ=="; }; }; - "webpack-merge-5.7.3" = { + "webpack-merge-5.8.0" = { name = "webpack-merge"; packageName = "webpack-merge"; - version = "5.7.3"; + version = "5.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.7.3.tgz"; - sha512 = "6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA=="; + url = "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz"; + sha512 = "/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q=="; }; }; "webpack-node-externals-1.7.2" = { @@ -62530,13 +62386,13 @@ let sha512 = "WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg=="; }; }; - "whatwg-url-8.5.0" = { + "whatwg-url-8.6.0" = { name = "whatwg-url"; packageName = "whatwg-url"; - version = "8.5.0"; + version = "8.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.5.0.tgz"; - sha512 = "fy+R77xWv0AiqfLl4nuGUlQ3/6b5uNfQ4WAbGQVMYshCTCCPK9psC1nWh3XHuxGVCtlcDDQPQW1csmmIQo+fwg=="; + url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.6.0.tgz"; + sha512 = "os0KkeeqUOl7ccdDT1qqUcS4KH4tcBTSKK5Nl5WKb2lyxInIZ/CpjkqKa1Ss12mjfdcRX9mHmPPs7/SxG1Hbdw=="; }; }; "whatwg-url-compat-0.6.5" = { @@ -63160,6 +63016,15 @@ let sha512 = "toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg=="; }; }; + "workerpool-6.1.4" = { + name = "workerpool"; + packageName = "workerpool"; + version = "6.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/workerpool/-/workerpool-6.1.4.tgz"; + sha512 = "jGWPzsUqzkow8HoAvqaPWTUPCrlPJaJ5tY8Iz7n1uCz3tTp6s3CDG0FF1NsX42WNlkRSW6Mr+CDZGnNoSsKa7g=="; + }; + }; "wrap-ansi-2.1.0" = { name = "wrap-ansi"; packageName = "wrap-ansi"; @@ -63277,13 +63142,13 @@ let sha512 = "AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q=="; }; }; - "write-good-0.11.3" = { + "write-good-1.0.8" = { name = "write-good"; packageName = "write-good"; - version = "0.11.3"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/write-good/-/write-good-0.11.3.tgz"; - sha512 = "fDKIHO5wCzTLCOGNJl1rzzJrZlTIzfZl8msOoJQZzRhYo0X/tFTm4+2B1zTibFYK01Nnd1kLZBjj4xjcFLePNQ=="; + url = "https://registry.npmjs.org/write-good/-/write-good-1.0.8.tgz"; + sha512 = "P1Ct7+DNrOcr2JAxDZ3Q5i5sx2LSveu7iLaoUL0A+YiG0GKf0l5+9j3rwMeyh6JeTL1+HfQV1rnwEvzhNIvpFw=="; }; }; "write-json-file-3.2.0" = { @@ -63349,13 +63214,13 @@ let sha512 = "nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA=="; }; }; - "ws-5.2.2" = { + "ws-5.2.3" = { name = "ws"; packageName = "ws"; - version = "5.2.2"; + version = "5.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz"; - sha512 = "jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA=="; + url = "https://registry.npmjs.org/ws/-/ws-5.2.3.tgz"; + sha512 = "jZArVERrMsKUatIdnLzqvcfydI85dvd/Fp1u/VOpfdDWQ4c9qWXe+VIeAbQ5FrDwciAkr+lzofXLz3Kuf26AOA=="; }; }; "ws-6.1.4" = { @@ -63376,13 +63241,13 @@ let sha512 = "GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA=="; }; }; - "ws-7.2.5" = { + "ws-6.2.2" = { name = "ws"; packageName = "ws"; - version = "7.2.5"; + version = "6.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.2.5.tgz"; - sha512 = "C34cIU4+DB2vMyAbmEKossWq2ZQDr6QEyuuCzWrM9zfw1sGc0mYiJ0UnG9zzNykt49C2Fi34hvr2vssFQRS6EA=="; + url = "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz"; + sha512 = "zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw=="; }; }; "ws-7.4.3" = { @@ -63394,15 +63259,6 @@ let sha512 = "hr6vCR76GsossIRsr8OLR9acVVm1jyfEWvhbNjtgPOrfvAlKzvyeg/P6r8RuDjRyrcQoPQT7K0DGEPc7Ae6jzA=="; }; }; - "ws-7.4.4" = { - name = "ws"; - packageName = "ws"; - version = "7.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.4.4.tgz"; - sha512 = "Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw=="; - }; - }; "ws-7.4.5" = { name = "ws"; packageName = "ws"; @@ -63781,15 +63637,6 @@ let sha512 = "z9s6k3wxE+aZHgXYxSTpGDo7BYOUfJsIRyoZiX6HTjwpwfS2wpQBQKa2fD+ShLyPkqDYo5ud7KitmLZ2Cd6r0g=="; }; }; - "xmldom-0.4.0" = { - name = "xmldom"; - packageName = "xmldom"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/xmldom/-/xmldom-0.4.0.tgz"; - sha512 = "2E93k08T30Ugs+34HBSTQLVtpi6mCddaY8uO+pMNk1pqSjV5vElzn4mmh6KLxN3hki8rNcHSYzILoh3TEWORvA=="; - }; - }; "xmldom-0.5.0" = { name = "xmldom"; packageName = "xmldom"; @@ -64331,15 +64178,6 @@ let sha1 = "9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"; }; }; - "yargs-unparser-1.6.0" = { - name = "yargs-unparser"; - packageName = "yargs-unparser"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz"; - sha512 = "W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw=="; - }; - }; "yargs-unparser-2.0.0" = { name = "yargs-unparser"; packageName = "yargs-unparser"; @@ -64589,22 +64427,22 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "12.0.2"; + version = "12.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-12.0.2.tgz"; - sha512 = "hXxnOxPl6+v/O+OnkJxPPupCeQJNmI08EdtnER5z/UCSpmlJibbTAqLF9rFaOi/7dPLS0RCNWmCRA6grgTlP9g=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-12.0.4.tgz"; + sha512 = "kZaJ55udB/AjQ+q8CrQfk6JGWdnJpH3c2VtbvSuR/ihiG6zMSxwpXqt1rImQN0RfffG3bsHD2SpM+T7/LKPemw=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1200.2" - sources."@angular-devkit/core-12.0.2" - sources."@angular-devkit/schematics-12.0.2" + sources."@angular-devkit/architect-0.1200.4" + sources."@angular-devkit/core-12.0.4" + sources."@angular-devkit/schematics-12.0.4" sources."@npmcli/git-2.0.9" sources."@npmcli/installed-package-contents-1.0.7" sources."@npmcli/move-file-1.1.2" sources."@npmcli/node-gyp-1.0.2" sources."@npmcli/promise-spawn-1.3.2" sources."@npmcli/run-script-1.8.5" - sources."@schematics/angular-12.0.2" + sources."@schematics/angular-12.0.4" sources."@tootallnate/once-1.1.2" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" @@ -64744,8 +64582,8 @@ in sources."lru-cache-6.0.0" sources."magic-string-0.25.7" sources."make-fetch-happen-8.0.14" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minipass-3.1.3" @@ -65083,8 +64921,8 @@ in sources."map-obj-4.2.1" sources."marky-1.2.2" sources."matcher-2.1.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-response-2.1.0" sources."minimatch-3.0.4" sources."minimatch-all-1.1.0" @@ -65173,7 +65011,7 @@ in ]; }) sources."to-utf8-0.0.1" - sources."uglify-js-3.13.8" + sources."uglify-js-3.13.9" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."universalify-0.1.2" @@ -65299,8 +65137,8 @@ in sources."lodash.sortby-4.7.0" sources."lowdb-1.0.0" sources."lunr-2.3.3" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-1.2.0" sources."ms-2.1.2" sources."mute-stream-0.0.7" @@ -65362,7 +65200,7 @@ in sources."whatwg-mimetype-2.3.0" sources."whatwg-url-7.1.0" sources."word-wrap-1.2.3" - sources."ws-6.2.1" + sources."ws-6.2.2" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."zxcvbn-4.4.2" @@ -65394,9 +65232,9 @@ in ]; }) sources."@angular-devkit/schematics-cli-0.1102.6" - sources."@babel/code-frame-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - (sources."@babel/highlight-7.14.0" // { + sources."@babel/code-frame-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -65415,12 +65253,12 @@ in ]; }) sources."@schematics/schematics-0.1102.6" - sources."@types/eslint-7.2.12" + sources."@types/eslint-7.2.13" sources."@types/eslint-scope-3.7.0" sources."@types/estree-0.0.46" sources."@types/json-schema-7.0.7" sources."@types/json5-0.0.29" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."@types/parse-json-4.0.0" sources."@webassemblyjs/ast-1.11.0" sources."@webassemblyjs/floating-point-hex-parser-1.11.0" @@ -65439,7 +65277,7 @@ in sources."@webassemblyjs/wast-printer-1.11.0" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.3.0" + sources."acorn-8.4.0" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" sources."ansi-colors-4.1.1" @@ -65458,7 +65296,7 @@ in sources."buffer-5.7.1" sources."buffer-from-1.1.1" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001232" + sources."caniuse-lite-1.0.30001237" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.1" @@ -65478,7 +65316,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.743" + sources."electron-to-chromium-1.3.752" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-5.8.2" // { @@ -65568,19 +65406,19 @@ in ]; }) sources."lru-cache-6.0.0" - sources."macos-release-2.4.1" + sources."macos-release-2.5.0" sources."magic-string-0.25.7" sources."memfs-3.2.2" sources."merge-stream-2.0.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mute-stream-0.0.8" sources."neo-async-2.6.2" sources."node-emoji-1.10.0" - sources."node-releases-1.1.72" + sources."node-releases-1.1.73" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" sources."object-assign-4.1.1" @@ -65720,58 +65558,58 @@ in sources."@apollographql/apollo-tools-0.5.1" sources."@apollographql/graphql-playground-html-1.6.27" sources."@apollographql/graphql-upload-8-fork-8.1.3" - sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.14.4" - sources."@babel/core-7.14.3" - sources."@babel/generator-7.14.3" - sources."@babel/helper-annotate-as-pure-7.12.13" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" - sources."@babel/helper-compilation-targets-7.14.4" - sources."@babel/helper-create-class-features-plugin-7.14.4" - sources."@babel/helper-create-regexp-features-plugin-7.14.3" + sources."@babel/code-frame-7.14.5" + sources."@babel/compat-data-7.14.5" + sources."@babel/core-7.14.5" + sources."@babel/generator-7.14.5" + sources."@babel/helper-annotate-as-pure-7.14.5" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" + sources."@babel/helper-compilation-targets-7.14.5" + sources."@babel/helper-create-class-features-plugin-7.14.5" + sources."@babel/helper-create-regexp-features-plugin-7.14.5" sources."@babel/helper-define-polyfill-provider-0.2.3" - sources."@babel/helper-explode-assignable-expression-7.13.0" - sources."@babel/helper-function-name-7.14.2" - sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-hoist-variables-7.13.16" - sources."@babel/helper-member-expression-to-functions-7.13.12" - sources."@babel/helper-module-imports-7.13.12" - sources."@babel/helper-module-transforms-7.14.2" - sources."@babel/helper-optimise-call-expression-7.12.13" - sources."@babel/helper-plugin-utils-7.13.0" - sources."@babel/helper-remap-async-to-generator-7.13.0" - sources."@babel/helper-replace-supers-7.14.4" - sources."@babel/helper-simple-access-7.13.12" - sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" - sources."@babel/helper-split-export-declaration-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - sources."@babel/helper-validator-option-7.12.17" - sources."@babel/helper-wrap-function-7.13.0" - sources."@babel/helpers-7.14.0" - sources."@babel/highlight-7.14.0" - sources."@babel/parser-7.14.4" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12" - sources."@babel/plugin-proposal-async-generator-functions-7.14.2" - sources."@babel/plugin-proposal-class-properties-7.13.0" - sources."@babel/plugin-proposal-class-static-block-7.14.3" - sources."@babel/plugin-proposal-dynamic-import-7.14.2" - sources."@babel/plugin-proposal-export-namespace-from-7.14.2" - sources."@babel/plugin-proposal-json-strings-7.14.2" - sources."@babel/plugin-proposal-logical-assignment-operators-7.14.2" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.2" - sources."@babel/plugin-proposal-numeric-separator-7.14.2" - sources."@babel/plugin-proposal-object-rest-spread-7.14.4" - sources."@babel/plugin-proposal-optional-catch-binding-7.14.2" - sources."@babel/plugin-proposal-optional-chaining-7.14.2" - sources."@babel/plugin-proposal-private-methods-7.13.0" - sources."@babel/plugin-proposal-private-property-in-object-7.14.0" - sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" + sources."@babel/helper-explode-assignable-expression-7.14.5" + sources."@babel/helper-function-name-7.14.5" + sources."@babel/helper-get-function-arity-7.14.5" + sources."@babel/helper-hoist-variables-7.14.5" + sources."@babel/helper-member-expression-to-functions-7.14.5" + sources."@babel/helper-module-imports-7.14.5" + sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-optimise-call-expression-7.14.5" + sources."@babel/helper-plugin-utils-7.14.5" + sources."@babel/helper-remap-async-to-generator-7.14.5" + sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" + sources."@babel/helper-split-export-declaration-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-option-7.14.5" + sources."@babel/helper-wrap-function-7.14.5" + sources."@babel/helpers-7.14.5" + sources."@babel/highlight-7.14.5" + sources."@babel/parser-7.14.5" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" + sources."@babel/plugin-proposal-async-generator-functions-7.14.5" + sources."@babel/plugin-proposal-class-properties-7.14.5" + sources."@babel/plugin-proposal-class-static-block-7.14.5" + sources."@babel/plugin-proposal-dynamic-import-7.14.5" + sources."@babel/plugin-proposal-export-namespace-from-7.14.5" + sources."@babel/plugin-proposal-json-strings-7.14.5" + sources."@babel/plugin-proposal-logical-assignment-operators-7.14.5" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" + sources."@babel/plugin-proposal-numeric-separator-7.14.5" + sources."@babel/plugin-proposal-object-rest-spread-7.14.5" + sources."@babel/plugin-proposal-optional-catch-binding-7.14.5" + sources."@babel/plugin-proposal-optional-chaining-7.14.5" + sources."@babel/plugin-proposal-private-methods-7.14.5" + sources."@babel/plugin-proposal-private-property-in-object-7.14.5" + sources."@babel/plugin-proposal-unicode-property-regex-7.14.5" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-class-properties-7.12.13" - sources."@babel/plugin-syntax-class-static-block-7.12.13" + sources."@babel/plugin-syntax-class-static-block-7.14.5" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-syntax-flow-7.12.13" + sources."@babel/plugin-syntax-flow-7.14.5" sources."@babel/plugin-syntax-json-strings-7.8.3" sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" @@ -65779,58 +65617,58 @@ in sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-private-property-in-object-7.14.0" - sources."@babel/plugin-syntax-top-level-await-7.12.13" - sources."@babel/plugin-syntax-typescript-7.12.13" - sources."@babel/plugin-transform-arrow-functions-7.13.0" - sources."@babel/plugin-transform-async-to-generator-7.13.0" - sources."@babel/plugin-transform-block-scoped-functions-7.12.13" - sources."@babel/plugin-transform-block-scoping-7.14.4" - sources."@babel/plugin-transform-classes-7.14.4" - sources."@babel/plugin-transform-computed-properties-7.13.0" - sources."@babel/plugin-transform-destructuring-7.14.4" - sources."@babel/plugin-transform-dotall-regex-7.12.13" - sources."@babel/plugin-transform-duplicate-keys-7.12.13" - sources."@babel/plugin-transform-exponentiation-operator-7.12.13" - sources."@babel/plugin-transform-flow-strip-types-7.13.0" - sources."@babel/plugin-transform-for-of-7.13.0" - sources."@babel/plugin-transform-function-name-7.12.13" - sources."@babel/plugin-transform-literals-7.12.13" - sources."@babel/plugin-transform-member-expression-literals-7.12.13" - sources."@babel/plugin-transform-modules-amd-7.14.2" - sources."@babel/plugin-transform-modules-commonjs-7.14.0" - sources."@babel/plugin-transform-modules-systemjs-7.13.8" - sources."@babel/plugin-transform-modules-umd-7.14.0" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.13" - sources."@babel/plugin-transform-new-target-7.12.13" - sources."@babel/plugin-transform-object-super-7.12.13" - sources."@babel/plugin-transform-parameters-7.14.2" - sources."@babel/plugin-transform-property-literals-7.12.13" - sources."@babel/plugin-transform-regenerator-7.13.15" - sources."@babel/plugin-transform-reserved-words-7.12.13" - sources."@babel/plugin-transform-shorthand-properties-7.12.13" - sources."@babel/plugin-transform-spread-7.13.0" - sources."@babel/plugin-transform-sticky-regex-7.12.13" - sources."@babel/plugin-transform-template-literals-7.13.0" - sources."@babel/plugin-transform-typeof-symbol-7.12.13" - sources."@babel/plugin-transform-typescript-7.14.4" - sources."@babel/plugin-transform-unicode-escapes-7.12.13" - sources."@babel/plugin-transform-unicode-regex-7.12.13" - sources."@babel/preset-env-7.14.4" - sources."@babel/preset-flow-7.13.13" + sources."@babel/plugin-syntax-private-property-in-object-7.14.5" + sources."@babel/plugin-syntax-top-level-await-7.14.5" + sources."@babel/plugin-syntax-typescript-7.14.5" + sources."@babel/plugin-transform-arrow-functions-7.14.5" + sources."@babel/plugin-transform-async-to-generator-7.14.5" + sources."@babel/plugin-transform-block-scoped-functions-7.14.5" + sources."@babel/plugin-transform-block-scoping-7.14.5" + sources."@babel/plugin-transform-classes-7.14.5" + sources."@babel/plugin-transform-computed-properties-7.14.5" + sources."@babel/plugin-transform-destructuring-7.14.5" + sources."@babel/plugin-transform-dotall-regex-7.14.5" + sources."@babel/plugin-transform-duplicate-keys-7.14.5" + sources."@babel/plugin-transform-exponentiation-operator-7.14.5" + sources."@babel/plugin-transform-flow-strip-types-7.14.5" + sources."@babel/plugin-transform-for-of-7.14.5" + sources."@babel/plugin-transform-function-name-7.14.5" + sources."@babel/plugin-transform-literals-7.14.5" + sources."@babel/plugin-transform-member-expression-literals-7.14.5" + sources."@babel/plugin-transform-modules-amd-7.14.5" + sources."@babel/plugin-transform-modules-commonjs-7.14.5" + sources."@babel/plugin-transform-modules-systemjs-7.14.5" + sources."@babel/plugin-transform-modules-umd-7.14.5" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.5" + sources."@babel/plugin-transform-new-target-7.14.5" + sources."@babel/plugin-transform-object-super-7.14.5" + sources."@babel/plugin-transform-parameters-7.14.5" + sources."@babel/plugin-transform-property-literals-7.14.5" + sources."@babel/plugin-transform-regenerator-7.14.5" + sources."@babel/plugin-transform-reserved-words-7.14.5" + sources."@babel/plugin-transform-shorthand-properties-7.14.5" + sources."@babel/plugin-transform-spread-7.14.5" + sources."@babel/plugin-transform-sticky-regex-7.14.5" + sources."@babel/plugin-transform-template-literals-7.14.5" + sources."@babel/plugin-transform-typeof-symbol-7.14.5" + sources."@babel/plugin-transform-typescript-7.14.5" + sources."@babel/plugin-transform-unicode-escapes-7.14.5" + sources."@babel/plugin-transform-unicode-regex-7.14.5" + sources."@babel/preset-env-7.14.5" + sources."@babel/preset-flow-7.14.5" sources."@babel/preset-modules-0.1.4" - sources."@babel/preset-typescript-7.13.0" - (sources."@babel/register-7.13.16" // { + sources."@babel/preset-typescript-7.14.5" + (sources."@babel/register-7.14.5" // { dependencies = [ sources."make-dir-2.1.0" sources."pify-4.0.1" sources."semver-5.7.1" ]; }) - sources."@babel/runtime-7.14.0" - sources."@babel/template-7.12.13" - sources."@babel/traverse-7.14.2" - sources."@babel/types-7.14.4" + sources."@babel/runtime-7.14.5" + sources."@babel/template-7.14.5" + sources."@babel/traverse-7.14.5" + sources."@babel/types-7.14.5" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" sources."@hapi/hoek-8.5.1" @@ -65838,13 +65676,13 @@ in sources."@hapi/topo-3.1.6" sources."@josephg/resolvable-1.0.1" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@nodelib/fs.scandir-2.1.4" // { + (sources."@nodelib/fs.scandir-2.1.5" // { dependencies = [ - sources."@nodelib/fs.stat-2.0.4" + sources."@nodelib/fs.stat-2.0.5" ]; }) sources."@nodelib/fs.stat-1.1.3" - sources."@nodelib/fs.walk-1.2.6" + sources."@nodelib/fs.walk-1.2.7" sources."@protobufjs/aspromise-1.1.2" sources."@protobufjs/base64-1.1.2" sources."@protobufjs/codegen-2.0.4" @@ -65883,7 +65721,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-1.3.2" sources."@types/minimatch-3.0.4" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."@types/normalize-package-data-2.4.0" sources."@types/qs-6.9.6" sources."@types/range-parser-1.2.3" @@ -65898,13 +65736,13 @@ in }) sources."@vue/cli-ui-addon-webpack-4.5.13" sources."@vue/cli-ui-addon-widgets-4.5.13" - (sources."@vue/compiler-core-3.0.11" // { + (sources."@vue/compiler-core-3.1.1" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-dom-3.0.11" - sources."@vue/shared-3.0.11" + sources."@vue/compiler-dom-3.1.1" + sources."@vue/shared-3.1.1" sources."@wry/equality-0.1.11" sources."accepts-1.3.7" sources."aggregate-error-3.1.0" @@ -65932,7 +65770,7 @@ in sources."lru-cache-6.0.0" ]; }) - (sources."apollo-server-core-2.25.0" // { + (sources."apollo-server-core-2.25.1" // { dependencies = [ sources."lru-cache-6.0.0" sources."uuid-8.3.2" @@ -65940,7 +65778,7 @@ in }) sources."apollo-server-env-3.1.0" sources."apollo-server-errors-2.5.0" - sources."apollo-server-express-2.25.0" + sources."apollo-server-express-2.25.1" sources."apollo-server-plugin-base-0.13.0" sources."apollo-server-types-0.9.0" sources."apollo-tracing-0.15.0" @@ -65964,7 +65802,6 @@ in sources."assign-symbols-1.0.0" sources."ast-types-0.13.3" sources."async-2.6.3" - sources."async-limiter-1.0.1" sources."async-retry-1.3.1" sources."asynckit-0.4.0" sources."atob-2.1.2" @@ -66027,7 +65864,7 @@ in sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001232" + sources."caniuse-lite-1.0.30001237" sources."caseless-0.12.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -66070,7 +65907,7 @@ in sources."commondir-1.0.1" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" - sources."config-chain-1.1.12" + sources."config-chain-1.1.13" (sources."content-disposition-0.5.3" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -66085,12 +65922,12 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - (sources."core-js-compat-3.13.1" // { + (sources."core-js-compat-3.14.0" // { dependencies = [ sources."semver-7.0.0" ]; }) - sources."core-js-pure-3.13.1" + sources."core-js-pure-3.14.0" sources."core-util-is-1.0.2" sources."cors-2.8.5" (sources."cross-spawn-6.0.5" // { @@ -66157,7 +65994,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.743" + sources."electron-to-chromium-1.3.752" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -66295,7 +66132,7 @@ in sources."graphql-subscriptions-1.2.1" (sources."graphql-tag-2.12.4" // { dependencies = [ - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) sources."graphql-tools-4.0.8" @@ -66400,7 +66237,7 @@ in sources."ast-types-0.14.2" sources."recast-0.20.4" sources."source-map-0.6.1" - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) sources."jsesc-2.5.2" @@ -66449,8 +66286,8 @@ in ]; }) sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -66492,7 +66329,7 @@ in sources."which-2.0.2" ]; }) - sources."node-releases-1.1.72" + sources."node-releases-1.1.73" (sources."normalize-package-data-2.5.0" // { dependencies = [ sources."semver-5.7.1" @@ -66774,11 +66611,7 @@ in sources."strip-eof-1.0.0" sources."strip-final-newline-2.0.0" sources."strip-outer-1.0.1" - (sources."subscriptions-transport-ws-0.9.18" // { - dependencies = [ - sources."ws-5.2.2" - ]; - }) + sources."subscriptions-transport-ws-0.9.19" sources."supports-color-5.5.0" sources."symbol-observable-1.2.0" sources."tar-stream-1.6.2" @@ -66870,10 +66703,10 @@ in sources."validate-npm-package-name-3.0.0" sources."vary-1.1.2" sources."verror-1.10.0" - sources."vue-2.6.12" + sources."vue-2.6.14" (sources."vue-codemod-0.0.5" // { dependencies = [ - sources."@nodelib/fs.stat-2.0.4" + sources."@nodelib/fs.stat-2.0.5" sources."array-union-2.1.0" sources."braces-3.0.2" sources."dir-glob-3.0.1" @@ -66904,7 +66737,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" - sources."ws-6.2.1" + sources."ws-7.4.6" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."xss-1.0.9" @@ -67056,13 +66889,13 @@ in sha512 = "Q1OfB3hpa4TtM6x5a2gJmZncpQYx0hFt4ohdgv4Ms67kcAVwL29QQ2NDbNqfKr15IzlNAhLGueCzxG6dMjdnbQ=="; }; dependencies = [ - sources."@babel/code-frame-7.12.13" - sources."@babel/generator-7.14.3" - sources."@babel/helper-validator-identifier-7.14.0" - sources."@babel/highlight-7.14.0" - sources."@babel/parser-7.14.4" - sources."@babel/template-7.12.13" - sources."@babel/types-7.14.4" + sources."@babel/code-frame-7.14.5" + sources."@babel/generator-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/highlight-7.14.5" + sources."@babel/parser-7.14.5" + sources."@babel/template-7.14.5" + sources."@babel/types-7.14.5" sources."@webassemblyjs/ast-1.11.0" sources."@webassemblyjs/floating-point-hex-parser-1.11.0" sources."@webassemblyjs/helper-api-error-1.11.0" @@ -67130,42 +66963,43 @@ in alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.16.0"; + version = "1.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.16.0.tgz"; - sha512 = "TR3y3sHEmRSAt7ikc9rWtWrpJ/2MpvgM5knMhbDJWxvqcvyTPagASAA5gktPJRhxnS2+RScVFEd0I6G/XGTuoQ=="; + url = "https://registry.npmjs.org/alloy/-/alloy-1.16.1.tgz"; + sha512 = "y43IQKivEMsR/ZiQ2GCmzx3ZWoFy+1vDjHuWOJcrCzkZClS8HFkI8/kZE+29g2n25DDzQJIeILEjGXretny6vQ=="; }; dependencies = [ - sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.14.4" - (sources."@babel/core-7.14.3" // { + sources."@babel/code-frame-7.14.5" + sources."@babel/compat-data-7.14.5" + (sources."@babel/core-7.14.5" // { dependencies = [ sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.14.3" // { + (sources."@babel/generator-7.14.5" // { dependencies = [ sources."source-map-0.5.7" ]; }) - sources."@babel/helper-compilation-targets-7.14.4" - sources."@babel/helper-function-name-7.14.2" - sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-member-expression-to-functions-7.13.12" - sources."@babel/helper-module-imports-7.13.12" - sources."@babel/helper-module-transforms-7.14.2" - sources."@babel/helper-optimise-call-expression-7.12.13" - sources."@babel/helper-replace-supers-7.14.4" - sources."@babel/helper-simple-access-7.13.12" - sources."@babel/helper-split-export-declaration-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - sources."@babel/helper-validator-option-7.12.17" - sources."@babel/helpers-7.14.0" - sources."@babel/highlight-7.14.0" - sources."@babel/parser-7.14.4" - sources."@babel/template-7.12.13" - sources."@babel/traverse-7.14.2" - sources."@babel/types-7.14.4" + sources."@babel/helper-compilation-targets-7.14.5" + sources."@babel/helper-function-name-7.14.5" + sources."@babel/helper-get-function-arity-7.14.5" + sources."@babel/helper-hoist-variables-7.14.5" + sources."@babel/helper-member-expression-to-functions-7.14.5" + sources."@babel/helper-module-imports-7.14.5" + sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-optimise-call-expression-7.14.5" + sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-split-export-declaration-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-option-7.14.5" + sources."@babel/helpers-7.14.5" + sources."@babel/highlight-7.14.5" + sources."@babel/parser-7.14.5" + sources."@babel/template-7.14.5" + sources."@babel/traverse-7.14.5" + sources."@babel/types-7.14.5" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" sources."array-unique-0.3.2" @@ -67173,18 +67007,18 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."browserslist-4.16.6" - sources."caniuse-lite-1.0.30001232" + sources."caniuse-lite-1.0.30001237" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."colorette-1.2.2" sources."colors-1.4.0" - sources."commander-2.20.3" + sources."commander-7.2.0" sources."concat-map-0.0.1" sources."convert-source-map-1.7.0" sources."debug-4.3.2" sources."ejs-3.1.6" - sources."electron-to-chromium-1.3.743" + sources."electron-to-chromium-1.3.752" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -67230,7 +67064,7 @@ in sources."minimist-1.2.5" sources."moment-2.29.1" sources."ms-2.1.2" - sources."node-releases-1.1.72" + sources."node-releases-1.1.73" sources."node.extend-2.0.2" (sources."nomnom-1.8.1" // { dependencies = [ @@ -67255,7 +67089,7 @@ in sources."which-1.3.1" sources."xml2js-0.2.8" sources."xml2tss-0.0.5" - sources."xmldom-0.4.0" + sources."xmldom-0.5.0" ]; buildInputs = globalBuildInputs; meta = { @@ -67278,7 +67112,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.4" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -67313,7 +67147,7 @@ in }; dependencies = [ sources."@tootallnate/once-1.1.2" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."@types/yauzl-2.9.1" sources."agent-base-6.0.2" sources."ansi-escapes-4.3.2" @@ -67321,10 +67155,10 @@ in sources."ansi-styles-4.3.0" (sources."ast-types-0.13.4" // { dependencies = [ - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) - (sources."aws-sdk-2.918.0" // { + (sources."aws-sdk-2.927.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -67367,7 +67201,7 @@ in sources."dom-serializer-1.2.0" sources."domelementtype-2.2.0" sources."domhandler-4.2.0" - sources."domutils-2.6.0" + sources."domutils-2.7.0" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-2.1.0" @@ -67513,10 +67347,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "8.0.14"; + version = "9.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-8.0.14.tgz"; - sha512 = "z9/oACcuCHyWSg2c5J1G/HNcTAknUc4YS2SIqsbjw27YmAL2x6T9Uo1OSSemWnOqGtlHfS6xf7X3DJNsfIYPfQ=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-9.4.1.tgz"; + sha512 = "bvs2ySATrJXq9DOIYBGY41DIaE0AqSOEp5DlpXB9Kgf9rtbf3moiRwBGNtWpc1ZchSezDUBBRG8gmciT2q+S4w=="; }; dependencies = [ sources."@alexbosworth/html2unicode-1.1.5" @@ -67527,12 +67361,12 @@ in }) sources."@alexbosworth/saxophone-0.6.2" sources."@cto.af/textdecoder-0.0.0" - (sources."@grpc/grpc-js-1.2.12" // { + (sources."@grpc/grpc-js-1.3.2" // { dependencies = [ - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" ]; }) - sources."@grpc/proto-loader-0.6.1" + sources."@grpc/proto-loader-0.6.2" sources."@handsontable/formulajs-2.0.2" sources."@mitmaro/errors-1.0.0" sources."@mitmaro/http-authorization-header-1.0.0" @@ -67551,8 +67385,8 @@ in sources."@types/body-parser-1.19.0" sources."@types/caseless-0.12.2" sources."@types/connect-3.4.34" - sources."@types/express-4.17.11" - sources."@types/express-serve-static-core-4.17.20" + sources."@types/express-4.17.12" + sources."@types/express-serve-static-core-4.17.21" sources."@types/long-4.0.1" sources."@types/mime-1.3.2" sources."@types/node-10.12.18" @@ -67565,7 +67399,7 @@ in }) sources."@types/serve-static-1.13.9" sources."@types/tough-cookie-4.0.0" - sources."@types/ws-7.4.1" + sources."@types/ws-7.4.4" sources."abort-controller-3.0.0" sources."accepts-1.3.7" (sources."agent-base-6.0.2" // { @@ -67601,7 +67435,7 @@ in sources."assert-plus-1.0.0" sources."astral-regex-2.0.0" sources."async-3.2.0" - sources."asyncjs-util-1.2.5" + sources."asyncjs-util-1.2.6" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.9.1" @@ -67624,6 +67458,7 @@ in sources."bip68-1.0.4" sources."bitcoin-ops-1.4.1" sources."bitcoinjs-lib-5.2.0" + sources."bl-4.1.0" sources."bluebird-3.7.2" sources."bn.js-4.12.0" (sources."body-parser-1.19.0" // { @@ -67631,18 +67466,18 @@ in sources."qs-6.7.0" ]; }) - (sources."bolt01-1.2.1" // { + (sources."bolt01-1.2.2" // { dependencies = [ sources."bn.js-5.2.0" ]; }) - sources."bolt03-1.2.9" - (sources."bolt07-1.7.2" // { + sources."bolt03-1.2.10" + (sources."bolt07-1.7.3" // { dependencies = [ sources."bn.js-5.2.0" ]; }) - sources."bolt09-0.1.4" + sources."bolt09-0.1.5" (sources."boxen-5.0.1" // { dependencies = [ sources."ansi-regex-5.0.0" @@ -67658,6 +67493,7 @@ in sources."brorand-1.1.0" sources."bs58-4.0.1" sources."bs58check-2.1.2" + sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-equal-constant-time-1.0.1" @@ -67686,6 +67522,7 @@ in sources."cipher-base-1.0.4" sources."cli-boxes-2.2.1" sources."cli-cursor-1.0.2" + sources."cli-spinners-2.6.0" sources."cli-table3-0.5.1" sources."cli-width-2.2.1" (sources."cliui-7.0.4" // { @@ -67696,6 +67533,7 @@ in sources."strip-ansi-6.0.0" ]; }) + sources."clone-1.0.4" sources."clone-response-1.0.2" sources."code-point-at-1.1.0" sources."color-convert-2.0.1" @@ -67726,12 +67564,13 @@ in sources."create-hmac-1.1.7" sources."crypto-js-4.0.0" sources."crypto-random-string-2.0.0" - sources."csv-parse-4.15.4" + sources."csv-parse-4.16.0" sources."cycle-1.0.3" sources."dashdash-1.14.1" sources."debug-2.6.9" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" + sources."defaults-1.0.3" sources."defer-to-connect-1.1.3" sources."define-property-1.0.0" sources."delayed-stream-1.0.0" @@ -67777,24 +67616,21 @@ in sources."fresh-0.5.2" sources."gauge-1.2.7" sources."gaxios-4.3.0" - sources."gcp-metadata-4.2.1" + sources."gcp-metadata-4.3.0" sources."get-caller-file-2.0.5" sources."get-stream-4.1.0" sources."getpass-0.1.7" sources."global-dirs-3.0.0" - (sources."goldengate-10.0.4" // { + (sources."goldengate-10.1.0" // { dependencies = [ - sources."bech32-2.0.0" sources."bn.js-5.2.0" - sources."invoices-1.1.7" - sources."ln-service-51.7.0" ]; }) sources."google-auth-library-6.1.6" - sources."google-p12-pem-3.0.3" + sources."google-p12-pem-3.1.0" sources."got-9.6.0" sources."graceful-fs-4.2.6" - sources."gtoken-5.2.1" + sources."gtoken-5.3.0" sources."har-schema-2.0.0" sources."har-validator-5.1.3" (sources."has-ansi-2.0.0" // { @@ -67823,11 +67659,12 @@ in ]; }) sources."iconv-lite-0.4.24" + sources."ieee754-1.2.1" sources."import-lazy-4.0.0" sources."imurmurhash-0.1.4" sources."inherits-2.0.4" sources."ini-2.0.0" - (sources."inquirer-8.0.0" // { + (sources."inquirer-8.1.0" // { dependencies = [ sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.0" @@ -67847,7 +67684,7 @@ in sources."tmp-0.0.33" ]; }) - (sources."invoices-1.2.0" // { + (sources."invoices-1.2.1" // { dependencies = [ sources."bech32-2.0.0" sources."bn.js-5.2.0" @@ -67862,6 +67699,7 @@ in sources."is-descriptor-1.0.2" sources."is-fullwidth-code-point-2.0.0" sources."is-installed-globally-0.4.0" + sources."is-interactive-1.0.0" sources."is-npm-5.0.0" (sources."is-number-3.0.0" // { dependencies = [ @@ -67872,6 +67710,7 @@ in sources."is-path-inside-3.0.3" sources."is-stream-2.0.0" sources."is-typedarray-1.0.0" + sources."is-unicode-supported-0.1.0" sources."is-yarn-global-0.3.0" sources."isarray-1.0.0" sources."isnumber-1.0.0" @@ -67891,53 +67730,24 @@ in sources."keyv-3.1.0" sources."kind-of-6.0.3" sources."latest-version-5.1.0" - (sources."lightning-3.3.4" // { + (sources."lightning-3.3.9" // { dependencies = [ - sources."@grpc/proto-loader-0.6.0" - sources."@types/node-14.14.37" - sources."bech32-2.0.0" - sources."bn.js-5.2.0" - sources."invoices-1.1.7" - ]; - }) - (sources."ln-accounting-4.2.7" // { - dependencies = [ - sources."@grpc/grpc-js-1.2.11" - sources."@grpc/proto-loader-0.5.6" - sources."@types/node-14.14.35" - sources."@types/ws-7.4.0" - sources."asyncjs-util-1.2.4" - sources."bech32-2.0.0" + sources."@types/node-15.6.1" sources."bn.js-5.2.0" - sources."bolt07-1.7.1" - sources."bolt09-0.1.3" - sources."cbor-7.0.4" - sources."goldengate-10.0.3" - sources."invoices-1.1.6" - (sources."lightning-3.3.1" // { - dependencies = [ - sources."asyncjs-util-1.2.3" - ]; - }) - sources."ln-service-51.5.0" - sources."psbt-1.1.8" ]; }) - (sources."ln-service-51.8.1" // { + (sources."ln-accounting-4.3.0" // { dependencies = [ - sources."@grpc/grpc-js-1.3.1" - sources."@grpc/proto-loader-0.6.2" - sources."@types/node-15.0.3" - sources."@types/ws-7.4.4" sources."bn.js-5.2.0" - sources."lightning-3.3.7" - sources."ws-7.4.5" + sources."goldengate-10.0.6" ]; }) + sources."ln-service-51.8.2" (sources."ln-sync-0.4.5" // { dependencies = [ sources."@grpc/grpc-js-1.2.11" sources."@grpc/proto-loader-0.5.6" + sources."@types/express-4.17.11" sources."@types/node-14.14.35" sources."@types/ws-7.4.0" sources."asyncjs-util-1.2.4" @@ -67955,22 +67765,10 @@ in sources."psbt-1.1.8" ]; }) - (sources."ln-telegram-3.2.3" // { + (sources."ln-telegram-3.2.5" // { dependencies = [ - sources."ajv-8.5.0" - sources."ansi-regex-5.0.0" - sources."bech32-2.0.0" sources."bn.js-5.2.0" - sources."is-fullwidth-code-point-3.0.0" - sources."json-schema-traverse-1.0.0" - (sources."ln-service-51.7.0" // { - dependencies = [ - sources."invoices-1.1.7" - ]; - }) - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" - sources."table-6.7.0" + sources."goldengate-10.0.6" ]; }) sources."lodash-4.17.21" @@ -67983,6 +67781,13 @@ in sources."lodash.padstart-4.6.1" sources."lodash.truncate-4.4.2" sources."lodash.uniq-4.5.0" + (sources."log-symbols-4.1.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.1" + sources."supports-color-7.2.0" + ]; + }) sources."long-4.0.0" sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" @@ -68032,11 +67837,24 @@ in sources."on-headers-1.0.2" sources."once-1.4.0" sources."onetime-1.1.0" + (sources."ora-5.4.1" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.3.0" + sources."chalk-4.1.1" + sources."cli-cursor-3.1.0" + sources."onetime-5.1.2" + sources."restore-cursor-3.1.0" + sources."strip-ansi-6.0.0" + sources."supports-color-7.2.0" + ]; + }) sources."os-shim-0.1.3" sources."os-tmpdir-1.0.2" sources."p-cancelable-1.1.0" sources."p-timeout-4.1.0" sources."package-json-6.5.0" + sources."paid-services-1.1.0" sources."parseurl-1.3.3" sources."path-to-regexp-0.1.7" sources."performance-now-2.1.0" @@ -68044,42 +67862,15 @@ in sources."pinkie-promise-2.0.1" sources."prepend-http-2.0.0" sources."prettyjson-1.2.1" - (sources."probing-1.3.5" // { - dependencies = [ - sources."@grpc/grpc-js-1.2.11" - sources."@grpc/proto-loader-0.5.6" - sources."@types/node-14.14.35" - sources."@types/ws-7.4.0" - sources."asyncjs-util-1.2.4" - sources."bech32-2.0.0" - sources."bn.js-5.2.0" - sources."bolt09-0.1.3" - sources."cbor-7.0.4" - sources."invoices-1.1.7" - (sources."lightning-3.3.1" // { - dependencies = [ - sources."asyncjs-util-1.2.3" - sources."bolt07-1.7.1" - sources."invoices-1.1.6" - ]; - }) - (sources."ln-service-51.5.0" // { - dependencies = [ - sources."bolt07-1.7.1" - sources."invoices-1.1.6" - ]; - }) - sources."psbt-1.1.8" - ]; - }) + sources."probing-1.3.6" sources."process-nextick-args-2.0.1" (sources."protobufjs-6.11.2" // { dependencies = [ - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" ]; }) sources."proxy-addr-2.0.7" - (sources."psbt-1.1.9" // { + (sources."psbt-1.1.10" // { dependencies = [ sources."bn.js-5.2.0" ]; @@ -68146,7 +67937,7 @@ in sources."supports-color-2.0.0" (sources."table-6.7.1" // { dependencies = [ - sources."ajv-8.5.0" + sources."ajv-8.6.0" sources."ansi-regex-5.0.0" sources."is-fullwidth-code-point-3.0.0" sources."json-schema-traverse-1.0.0" @@ -68207,6 +67998,7 @@ in sources."varuint-bitcoin-1.1.2" sources."vary-1.1.2" sources."verror-1.10.0" + sources."wcwidth-1.0.1" (sources."widest-line-3.1.0" // { dependencies = [ sources."ansi-regex-5.0.0" @@ -68234,7 +68026,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-7.4.4" + sources."ws-7.4.6" sources."xdg-basedir-4.0.0" sources."y18n-5.0.8" sources."yallist-4.0.0" @@ -68337,8 +68129,8 @@ in sources."levn-0.3.0" sources."lodash-4.17.21" sources."lodash.sortby-4.7.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."minimatch-3.0.4" sources."nwsapi-2.2.0" sources."oauth-sign-0.9.0" @@ -68385,7 +68177,7 @@ in sources."whatwg-url-6.5.0" sources."word-wrap-1.2.3" sources."wrappy-1.0.2" - sources."ws-5.2.2" + sources."ws-5.2.3" sources."xml-name-validator-3.0.0" ]; buildInputs = globalBuildInputs; @@ -68788,11 +68580,11 @@ in sha512 = "QHoiW1H2P6Sx7L5IEvbZnnQsfy7eaibY/KS2UAX9VINXNdGS9RxqEdLOe9yTdcy5pzIFpQKIBspOnHcBOjVa8A=="; }; dependencies = [ - sources."@babel/code-frame-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - sources."@babel/highlight-7.14.0" - sources."@babel/parser-7.14.4" - sources."@babel/types-7.14.4" + sources."@babel/code-frame-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/highlight-7.14.5" + sources."@babel/parser-7.14.5" + sources."@babel/types-7.14.5" sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" sources."@types/minimist-1.2.1" @@ -69039,8 +68831,8 @@ in sources."merkle-lib-2.0.10" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."min-indent-1.0.1" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" @@ -69161,7 +68953,7 @@ in sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" sources."sha.js-2.4.11" - sources."simple-git-2.39.0" + sources."simple-git-2.39.1" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" @@ -69251,7 +69043,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -69391,7 +69183,7 @@ in sources."internal-ip-1.2.0" sources."ip-1.1.5" sources."ip-set-1.0.2" - sources."ipaddr.js-2.0.0" + sources."ipaddr.js-2.0.1" sources."is-arrayish-0.2.1" sources."is-core-module-2.4.0" sources."is-finite-1.1.0" @@ -69432,8 +69224,8 @@ in ]; }) sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -69542,7 +69334,7 @@ in sources."router-0.6.2" sources."run-parallel-1.2.0" sources."run-series-1.1.9" - sources."rusha-0.8.13" + sources."rusha-0.8.14" sources."rx-2.5.3" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" @@ -69657,10 +69449,10 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "1.0.0-beta.18"; + version = "1.0.0-beta.22"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.18.tgz"; - sha512 = "eT0Z2u8yB8gMAIOMJ76TjeCQZ8nzxSbN/Y87cbzhT9I6vyLjgCw/w+48XXudOfW63kY2/TugWtZE+mwQlu3QXw=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.22.tgz"; + sha512 = "hQrssZlC0Cy/PruMVi9N9oU0UuEUCEc0a99l4CgBa63RnVFxU/nEUTStKVKKjpTUl+NOO87cdiHkw6Q81gBIrg=="; }; dependencies = [ sources."@jsii/spec-1.30.0" @@ -69673,6 +69465,7 @@ in sources."camelcase-6.2.0" sources."case-1.6.3" sources."cdk8s-1.0.0-beta.14" + sources."cdk8s-plus-17-1.0.0-beta.18" sources."cliui-7.0.4" sources."clone-2.1.2" (sources."codemaker-1.30.0" // { @@ -69684,7 +69477,7 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.29.3" - sources."constructs-3.3.75" + sources."constructs-3.3.77" sources."date-format-3.0.0" sources."debug-4.3.2" sources."decamelize-5.0.0" @@ -69757,13 +69550,13 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.273" // { + (sources."jsii-srcmak-0.1.280" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.3.0" - sources."json2jsii-0.1.236" + sources."json2jsii-0.1.248" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" @@ -69810,7 +69603,7 @@ in sources."string.prototype.trimend-1.0.4" sources."string.prototype.trimstart-1.0.4" sources."strip-ansi-6.0.0" - sources."tslib-2.2.0" + sources."tslib-2.3.0" sources."typescript-3.9.9" sources."unbox-primitive-1.0.1" sources."universalify-2.0.0" @@ -69848,17 +69641,17 @@ in cdktf-cli = nodeEnv.buildNodePackage { name = "cdktf-cli"; packageName = "cdktf-cli"; - version = "0.4.0"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.4.0.tgz"; - sha512 = "2mJA2Kq8mCcTzfHbNnogPWj/OVtPFEtzgL00hxPyLIKaQz7gX0Sagej18qp7kPh0pVA5Qenm5jVST3GdkjoX6A=="; + url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.4.1.tgz"; + sha512 = "bDK7F4MQFFgzkZBoxMimSu297IJ4duhG1ZpOGG/YcQ9MF/IuIKqlxV6WhWUEfPupnSuZuDQMNCRf/PhKsWcy9Q=="; }; dependencies = [ - sources."@cdktf/hcl2json-0.4.0" + sources."@cdktf/hcl2json-0.4.1" sources."@jsii/spec-1.30.0" sources."@skorfmann/ink-confirm-input-3.0.0" sources."@skorfmann/terraform-cloud-1.10.1" - sources."@types/node-14.17.1" + sources."@types/node-14.17.3" sources."@types/node-fetch-2.5.10" sources."@types/yauzl-2.9.1" sources."@types/yoga-layout-1.9.2" @@ -69892,7 +69685,7 @@ in sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" sources."case-1.6.3" - sources."cdktf-0.4.0" + sources."cdktf-0.4.1" sources."chalk-4.1.1" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -69914,7 +69707,7 @@ in sources."commonmark-0.29.3" sources."compress-commons-4.1.1" sources."concat-map-0.0.1" - sources."constructs-3.3.75" + sources."constructs-3.3.77" sources."convert-to-spaces-1.0.2" sources."core-util-is-1.0.2" sources."crc-32-1.2.0" @@ -70033,7 +69826,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.273" // { + (sources."jsii-srcmak-0.1.280" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -70059,8 +69852,8 @@ in sources."lru-cache-6.0.0" sources."map-obj-4.2.1" sources."mdurl-1.0.1" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -70305,10 +70098,10 @@ in coc-clangd = nodeEnv.buildNodePackage { name = "coc-clangd"; packageName = "coc-clangd"; - version = "0.9.0"; + version = "0.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-clangd/-/coc-clangd-0.9.0.tgz"; - sha512 = "QmYLkObs561ld4vqvivzgVpGGpjsx+d0+x2slqKPvB80juKfaZbfcBxttkcAa6giB6qKFU4njhyz4pP54JebZg=="; + url = "https://registry.npmjs.org/coc-clangd/-/coc-clangd-0.11.0.tgz"; + sha512 = "RxYUkfb1HO+ZI62tB0JhqmxYgTrtlS8f3a6+gbFDkEkOCdoCG3GiQBlbV6JjQwdoK7LwNWPxeocJjqoA53ZLnQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -70417,10 +70210,10 @@ in coc-explorer = nodeEnv.buildNodePackage { name = "coc-explorer"; packageName = "coc-explorer"; - version = "0.17.5"; + version = "0.18.3"; src = fetchurl { - url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.17.5.tgz"; - sha512 = "a5GHhsPEFcby7CkhnpkWyLei/SCcon3Z/Li1Jvxr/h6bewDHFNXA5DZSDJWvhLnktGcwZNBOWGBBZhPWFGYAaA=="; + url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.18.3.tgz"; + sha512 = "0bYcyZiiH+XlWjtBXGPUNAizDmdz8LFGvazTlOiurij06s1KKzE5gw9waUlbPdnlVwbNpoUkdTZ1mIEPn0bgLg=="; }; dependencies = [ sources."@sindresorhus/df-3.1.1" @@ -70534,7 +70327,7 @@ in dependencies = [ sources."isexe-2.0.0" sources."node-fetch-2.6.1" - sources."tslib-2.2.0" + sources."tslib-2.3.0" sources."vscode-languageserver-textdocument-1.0.1" sources."vscode-uri-3.0.2" sources."which-2.0.2" @@ -70642,10 +70435,10 @@ in coc-json = nodeEnv.buildNodePackage { name = "coc-json"; packageName = "coc-json"; - version = "1.3.4"; + version = "1.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/coc-json/-/coc-json-1.3.4.tgz"; - sha512 = "IK3JYMiJALMMhUlFgl4HxW2dvJdmUr86Hve+ngVATLpT2vWHG5V3sXjuHq7c7RlE7+oWS2CNoxIPf8oiuZesPQ=="; + url = "https://registry.npmjs.org/coc-json/-/coc-json-1.3.5.tgz"; + sha512 = "Rydv3YbCs2zGNzHfng47QVrnmWSgDdfWS1j1ropjW2R7HZndHIc/ArFv920MXIstDW5TO1LGBy+zhD8hhBYTGg=="; }; buildInputs = globalBuildInputs; meta = { @@ -70851,7 +70644,7 @@ in sources."strip-json-comments-2.0.1" sources."tar-6.1.0" sources."traverse-0.3.9" - sources."tslib-2.2.0" + sources."tslib-2.3.0" sources."unbox-primitive-1.0.1" sources."universalify-0.1.2" sources."unzipper-0.10.11" @@ -70908,18 +70701,14 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.0" - (sources."@babel/highlight-7.14.0" // { + sources."@babel/helper-validator-identifier-7.14.5" + (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" sources."escape-string-regexp-1.0.5" ]; }) - (sources."@eslint/eslintrc-0.4.1" // { - dependencies = [ - sources."globals-12.4.0" - ]; - }) + sources."@eslint/eslintrc-0.4.2" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/eslint-visitor-keys-1.0.0" @@ -70989,7 +70778,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001232" + sources."caniuse-lite-1.0.30001237" sources."capture-stack-trace-1.0.1" sources."ccount-1.1.0" (sources."chalk-4.1.1" // { @@ -71051,7 +70840,7 @@ in ]; }) sources."copy-descriptor-0.1.1" - sources."core-js-3.13.1" + sources."core-js-3.14.0" sources."cosmiconfig-3.1.0" sources."create-error-class-3.0.2" sources."cross-spawn-7.0.3" @@ -71087,14 +70876,14 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.743" + sources."electron-to-chromium-1.3.752" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" sources."entities-1.1.2" sources."error-ex-1.3.2" sources."escape-string-regexp-4.0.0" - (sources."eslint-7.27.0" // { + (sources."eslint-7.28.0" // { dependencies = [ sources."eslint-visitor-keys-2.1.0" ]; @@ -71228,11 +71017,7 @@ in sources."glob-parent-5.1.2" sources."glob-to-regexp-0.3.0" sources."global-dirs-0.1.1" - (sources."globals-13.9.0" // { - dependencies = [ - sources."type-fest-0.20.2" - ]; - }) + sources."globals-13.9.0" (sources."globby-6.1.0" // { dependencies = [ sources."pify-2.3.0" @@ -71547,7 +71332,7 @@ in sources."prelude-ls-1.2.1" sources."prepend-http-1.0.4" sources."preserve-0.2.0" - sources."prettier-2.3.0" + sources."prettier-2.3.1" sources."prettier-eslint-12.0.0" (sources."prettier-stylelint-0.4.2" // { dependencies = [ @@ -71758,7 +71543,7 @@ in sources."svg-tags-1.0.0" (sources."table-6.7.1" // { dependencies = [ - sources."ajv-8.5.0" + sources."ajv-8.6.0" sources."json-schema-traverse-1.0.0" ]; }) @@ -71790,7 +71575,7 @@ in }) sources."tsutils-3.21.0" sources."type-check-0.4.0" - sources."type-fest-0.8.1" + sources."type-fest-0.20.2" sources."typescript-3.9.9" sources."unherit-1.1.3" sources."unified-6.2.0" @@ -71890,13 +71675,13 @@ in coc-pyright = nodeEnv.buildNodePackage { name = "coc-pyright"; packageName = "coc-pyright"; - version = "1.1.144"; + version = "1.1.148"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.144.tgz"; - sha512 = "bUb/GuY0QjlDAws60UNDL8ZiRzp6sLmSqRkMyAAUEb9arsSphvok80P3i/NEsJhG2lgx2LaEz1mKUCnR+UjTlA=="; + url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.148.tgz"; + sha512 = "AudslTXxhUIiBsitc6bQcUUS+P7J1q1fU2XYDFp3CxBN+MJLDjT0LdARklN4N01W9mvT9hCW9cwfJKuk4dsCNg=="; }; dependencies = [ - sources."pyright-1.1.145" + sources."pyright-1.1.148" ]; buildInputs = globalBuildInputs; meta = { @@ -71970,10 +71755,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.46.0"; + version = "0.46.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.46.0.tgz"; - sha512 = "KwkFaDNBwZtqdahUPKYKoCb0nvLZ1wu5L2/8kpK94IMDgNPy3TUTxujtwDjLwjYo/z+W5reRfwIYNJZ3FZ2Onw=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.46.1.tgz"; + sha512 = "FnHbToRGz0isjp4C/Fp5K+gX5vuuYmT8jlUdExWlhhTh7X+4pTz2xYlgaBX2/UTZQqOgn/wM4lxKlZtOpKVVCA=="; }; buildInputs = globalBuildInputs; meta = { @@ -72046,35 +71831,36 @@ in sha512 = "+GYR6KTvHQnqu0j1kXT30hRZMuCwG/G52wG/19LSPE+p9Q0i8XFH6582T0btTu39xz2TPsDOGjT1VgyRw2urug=="; }; dependencies = [ - sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.14.4" - sources."@babel/core-7.14.3" - sources."@babel/generator-7.14.3" - sources."@babel/helper-compilation-targets-7.14.4" - sources."@babel/helper-function-name-7.14.2" - sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-member-expression-to-functions-7.13.12" - sources."@babel/helper-module-imports-7.13.12" - sources."@babel/helper-module-transforms-7.14.2" - sources."@babel/helper-optimise-call-expression-7.12.13" - sources."@babel/helper-replace-supers-7.14.4" - sources."@babel/helper-simple-access-7.13.12" - sources."@babel/helper-split-export-declaration-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - sources."@babel/helper-validator-option-7.12.17" - sources."@babel/helpers-7.14.0" - (sources."@babel/highlight-7.14.0" // { + sources."@babel/code-frame-7.14.5" + sources."@babel/compat-data-7.14.5" + sources."@babel/core-7.14.5" + sources."@babel/generator-7.14.5" + sources."@babel/helper-compilation-targets-7.14.5" + sources."@babel/helper-function-name-7.14.5" + sources."@babel/helper-get-function-arity-7.14.5" + sources."@babel/helper-hoist-variables-7.14.5" + sources."@babel/helper-member-expression-to-functions-7.14.5" + sources."@babel/helper-module-imports-7.14.5" + sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-optimise-call-expression-7.14.5" + sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-split-export-declaration-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-option-7.14.5" + sources."@babel/helpers-7.14.5" + (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.4" - sources."@babel/template-7.12.13" - sources."@babel/traverse-7.14.2" - sources."@babel/types-7.14.4" - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" + sources."@babel/parser-7.14.5" + sources."@babel/template-7.14.5" + sources."@babel/traverse-7.14.5" + sources."@babel/types-7.14.5" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.7" sources."@stylelint/postcss-css-in-js-0.37.2" sources."@stylelint/postcss-markdown-0.36.2" sources."@types/mdast-3.0.3" @@ -72082,7 +71868,7 @@ in sources."@types/normalize-package-data-2.4.0" sources."@types/parse-json-4.0.0" sources."@types/unist-2.0.3" - sources."ajv-8.5.0" + sources."ajv-8.6.0" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."array-union-2.1.0" @@ -72101,7 +71887,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001232" + sources."caniuse-lite-1.0.30001237" (sources."chalk-4.1.1" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -72139,7 +71925,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.743" + sources."electron-to-chromium-1.3.752" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -72236,7 +72022,7 @@ in ]; }) sources."ms-2.1.2" - sources."node-releases-1.1.72" + sources."node-releases-1.1.73" (sources."normalize-package-data-3.0.2" // { dependencies = [ sources."semver-7.3.5" @@ -72258,7 +72044,7 @@ in sources."path-parse-1.0.7" sources."path-type-4.0.0" sources."picomatch-2.3.0" - (sources."postcss-7.0.35" // { + (sources."postcss-7.0.36" // { dependencies = [ (sources."chalk-2.4.2" // { dependencies = [ @@ -72401,10 +72187,10 @@ in coc-texlab = nodeEnv.buildNodePackage { name = "coc-texlab"; packageName = "coc-texlab"; - version = "3.0.2"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-texlab/-/coc-texlab-3.0.2.tgz"; - sha512 = "YiPB0gasof89HqAGz55BICHtt9gDyTjsNY1mwdKkJP0ZmgSxub5q+hOYYbay56X4+348Raxx0fp75JI8ax1nAw=="; + url = "https://registry.npmjs.org/coc-texlab/-/coc-texlab-3.1.0.tgz"; + sha512 = "wO2krr6/HKQuEONvSg6t+qwDrF68OvYpPjAz/AHcynXNpYX3M+LZaenzavultjsxQ/K0TU1ZiRI3VnI4YeTP/g=="; }; buildInputs = globalBuildInputs; meta = { @@ -72425,9 +72211,9 @@ in sha512 = "5Zxv2Adtb6Mlpv2YdKErhf8ntxiBl1UyrbEqo7gR9nFIAfi3o0Ue6TJTpZfOhQViFQxLjJAS65IQVRaNlbhkxw=="; }; dependencies = [ - sources."@babel/code-frame-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - sources."@babel/highlight-7.14.0" + sources."@babel/code-frame-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/highlight-7.14.5" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" sources."balanced-match-1.0.2" @@ -72513,10 +72299,10 @@ in coc-tsserver = nodeEnv.buildNodePackage { name = "coc-tsserver"; packageName = "coc-tsserver"; - version = "1.7.0"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.7.0.tgz"; - sha512 = "Kye0Bn4ifhNhKFcenXg0z8iNzkBGOCXCb552sY/L55+4+08WU02impRnuYkEwFo2QAjDrRQNYjUfUabRR4LC+A=="; + url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.8.1.tgz"; + sha512 = "qkVsa46XLmOCmohpQhhz1SG9vUQN/54b/zZsDI5fnuBM49GX9f+Aya8m9ZidAzuwFKV+ostgvdWaB+GeQPPNPQ=="; }; dependencies = [ sources."typescript-4.3.2" @@ -72534,25 +72320,21 @@ in coc-vetur = nodeEnv.buildNodePackage { name = "coc-vetur"; packageName = "coc-vetur"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/coc-vetur/-/coc-vetur-1.2.4.tgz"; - sha512 = "9ZEPHykSx2J/OwLFocXSK1Bg4p35AegacFb0ZaWV9s0IEtdNSkYi25Y9CscqV6fQheMfyEl0f4rlI4yh6DbcPg=="; + url = "https://registry.npmjs.org/coc-vetur/-/coc-vetur-1.2.5.tgz"; + sha512 = "pBh7Jrn+L4hj6E6JxAwGdjVB/9v2TuJEMYUhDFR41s/zBJG2cXxzgUVmGz8RWYd70HdEz2ula1FcRA4rjkjPXg=="; }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.0" - (sources."@babel/highlight-7.14.0" // { + sources."@babel/helper-validator-identifier-7.14.5" + (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" sources."escape-string-regexp-1.0.5" ]; }) - (sources."@eslint/eslintrc-0.4.1" // { - dependencies = [ - sources."globals-12.4.0" - ]; - }) + sources."@eslint/eslintrc-0.4.2" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" sources."ajv-6.12.6" @@ -72586,8 +72368,8 @@ in sources."emoji-regex-8.0.0" sources."enquirer-2.3.6" sources."escape-string-regexp-4.0.0" - sources."eslint-7.27.0" - sources."eslint-plugin-vue-7.10.0" + sources."eslint-7.28.0" + sources."eslint-plugin-vue-7.11.0" sources."eslint-scope-5.1.1" (sources."eslint-utils-2.1.0" // { dependencies = [ @@ -72624,11 +72406,7 @@ in sources."functional-red-black-tree-1.0.1" sources."glob-7.1.7" sources."glob-parent-5.1.2" - (sources."globals-13.9.0" // { - dependencies = [ - sources."type-fest-0.20.2" - ]; - }) + sources."globals-13.9.0" sources."has-1.0.3" sources."has-flag-3.0.0" sources."ignore-4.0.6" @@ -72663,7 +72441,7 @@ in sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."prelude-ls-1.2.1" - sources."prettier-2.3.0" + sources."prettier-2.3.1" sources."progress-2.0.3" sources."punycode-2.1.1" sources."regexpp-3.1.0" @@ -72688,7 +72466,7 @@ in sources."supports-color-5.5.0" (sources."table-6.7.1" // { dependencies = [ - sources."ajv-8.5.0" + sources."ajv-8.6.0" sources."json-schema-traverse-1.0.0" ]; }) @@ -72703,11 +72481,11 @@ in }) sources."tsutils-2.29.0" sources."type-check-0.4.0" - sources."type-fest-0.8.1" + sources."type-fest-0.20.2" sources."typescript-4.3.2" sources."uri-js-4.4.1" sources."v8-compile-cache-2.3.0" - sources."vls-0.7.2" + sources."vls-0.7.4" (sources."vue-eslint-parser-7.6.0" // { dependencies = [ sources."eslint-visitor-keys-1.3.0" @@ -72996,9 +72774,9 @@ in }; dependencies = [ sources."@netflix/nerror-1.1.3" - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.7" sources."@npmcli/git-2.0.9" sources."@npmcli/installed-package-contents-1.0.7" sources."@npmcli/move-file-1.1.2" @@ -73329,13 +73107,13 @@ in sources."loud-rejection-2.2.0" sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" - sources."macos-release-2.4.1" + sources."macos-release-2.5.0" (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."make-fetch-happen-8.0.14" + sources."make-fetch-happen-9.0.2" sources."md5-file-5.0.0" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" @@ -73344,8 +73122,8 @@ in sources."methods-1.1.2" sources."micromatch-4.0.4" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -73379,10 +73157,10 @@ in sources."npm-bundled-1.1.2" sources."npm-install-checks-4.0.0" sources."npm-normalize-package-bin-1.0.1" - sources."npm-package-arg-8.1.2" + sources."npm-package-arg-8.1.4" sources."npm-packlist-2.2.2" sources."npm-pick-manifest-6.1.1" - sources."npm-registry-fetch-10.1.2" + sources."npm-registry-fetch-11.0.0" sources."npm-run-path-4.0.1" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" @@ -73413,7 +73191,7 @@ in sources."semver-6.3.0" ]; }) - sources."pacote-11.3.3" + sources."pacote-11.3.4" sources."parent-module-1.0.1" sources."parseurl-1.3.3" sources."path-exists-3.0.0" @@ -73601,15 +73379,15 @@ in sha512 = "HCpNdBkQy3rw+uARLuIf0YurqsMXYzBa9ihhSAuxYJcNIrqrSq3BstPfr0cQN38AdMrQiO9Dp4hYy7GtGJsLPg=="; }; dependencies = [ - sources."@babel/code-frame-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - sources."@babel/highlight-7.14.0" + sources."@babel/code-frame-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/highlight-7.14.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.4" sources."@types/minimist-1.2.1" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."@types/normalize-package-data-2.4.0" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -73980,7 +73758,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -74061,8 +73839,8 @@ in sources."lru-cache-4.1.5" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-1.2.0" sources."minimist-1.2.5" sources."ms-2.1.3" @@ -74615,8 +74393,8 @@ in sources."merkle-tree-stream-3.0.3" sources."micromatch-3.1.10" sources."mime-2.5.2" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-response-2.1.0" sources."min-document-2.19.0" sources."minimatch-3.0.4" @@ -74728,7 +74506,7 @@ in sources."revalidator-0.1.8" sources."rimraf-2.7.1" sources."run-series-1.1.9" - sources."rusha-0.8.13" + sources."rusha-0.8.14" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -74961,9 +74739,9 @@ in sha512 = "4kjsgc/rV+qtH3dTqEnR/ug36yKNjyo5z674ySkD6k08DwlLs10fsP/I+d8BAsbtjpL36bqZxLa9iNgTDqioXQ=="; }; dependencies = [ - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.7" sources."aggregate-error-3.1.0" sources."array-union-2.1.0" sources."balanced-match-1.0.2" @@ -75090,22 +74868,22 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.71.0"; + version = "6.72.0"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.71.0.tgz"; - sha512 = "bx902tD9qzZFnM7YbL9KOqdcE8iW1KKEyxdvE5rEJVdzny7FMHpLRF/YpP+bjKdXvnCcZMNsePqNum+i2qp8Ng=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.72.0.tgz"; + sha512 = "sOsFzBwwUkJkP6EZ8cOwz1eFva5sTf6ojhOgl2gplRs7+PkuqGyng/4TnKL3KIFqwE5lFsA66sIh8UQU4Dkecw=="; }; dependencies = [ sources."@fast-csv/format-4.3.5" sources."@fast-csv/parse-4.3.6" - sources."@types/node-14.17.1" + sources."@types/node-14.17.3" sources."JSONStream-1.3.5" sources."ajv-6.12.6" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.784.0" + sources."aws-sdk-2.920.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."base64-js-1.5.1" @@ -75165,8 +74943,8 @@ in sources."lodash.uniq-4.5.0" sources."lossless-json-1.0.4" sources."method-missing-1.2.4" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."minimist-1.2.5" sources."oauth-sign-0.9.0" sources."p-finally-1.0.0" @@ -75279,6 +75057,7 @@ in sources."jsonfile-4.0.0" sources."keyv-3.1.0" sources."lowercase-keys-1.0.1" + sources."normalize-url-4.5.1" sources."p-cancelable-1.1.0" sources."responselike-1.0.2" sources."semver-6.3.0" @@ -75293,7 +75072,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimatch-3.0.4" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.9.1" sources."abbrev-1.1.1" @@ -75331,7 +75110,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."bl-4.1.0" sources."bluebird-3.7.2" - sources."boolean-3.1.0" + sources."boolean-3.1.2" sources."brace-expansion-1.1.11" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" @@ -75340,7 +75119,7 @@ in sources."buffer-fill-1.0.0" sources."buffer-from-1.1.1" sources."cacheable-lookup-5.0.4" - sources."cacheable-request-7.0.1" + sources."cacheable-request-7.0.2" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" sources."caseless-0.12.0" @@ -75367,9 +75146,9 @@ in sources."commander-4.1.1" sources."compare-version-0.1.2" sources."concat-map-0.0.1" - sources."config-chain-1.1.12" + sources."config-chain-1.1.13" sources."console-control-strings-1.1.0" - sources."core-js-3.13.1" + sources."core-js-3.14.0" sources."core-util-is-1.0.2" sources."cross-spawn-7.0.3" sources."currently-unhandled-0.4.1" @@ -75594,8 +75373,8 @@ in sources."strip-bom-2.0.0" ]; }) - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -75637,7 +75416,7 @@ in sources."semver-5.7.1" ]; }) - sources."normalize-url-4.5.1" + sources."normalize-url-6.0.1" sources."npm-bundled-1.1.2" (sources."npm-conf-1.1.3" // { dependencies = [ @@ -75664,7 +75443,7 @@ in sources."once-1.4.0" sources."onetime-5.1.2" sources."open-8.2.0" - sources."ora-5.4.0" + sources."ora-5.4.1" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" @@ -75880,51 +75659,52 @@ in sha512 = "ohjlUXM2v39rDqGIrlyxdcn9ql+4b+X1u90CXNWjYw5wX6C3wTHRfqFfeV8jajYD6Xc+ufn2X1QeZZWhRBXTlA=="; }; dependencies = [ - sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.14.4" - (sources."@babel/core-7.14.3" // { + sources."@babel/code-frame-7.14.5" + sources."@babel/compat-data-7.14.5" + (sources."@babel/core-7.14.5" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.14.3" - sources."@babel/helper-annotate-as-pure-7.12.13" - (sources."@babel/helper-compilation-targets-7.14.4" // { + sources."@babel/generator-7.14.5" + sources."@babel/helper-annotate-as-pure-7.14.5" + (sources."@babel/helper-compilation-targets-7.14.5" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-function-name-7.14.2" - sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-member-expression-to-functions-7.13.12" - sources."@babel/helper-module-imports-7.13.12" - sources."@babel/helper-module-transforms-7.14.2" - sources."@babel/helper-optimise-call-expression-7.12.13" - sources."@babel/helper-plugin-utils-7.13.0" - sources."@babel/helper-replace-supers-7.14.4" - sources."@babel/helper-simple-access-7.13.12" - sources."@babel/helper-split-export-declaration-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - sources."@babel/helper-validator-option-7.12.17" - sources."@babel/helpers-7.14.0" - sources."@babel/highlight-7.14.0" - sources."@babel/parser-7.14.4" - sources."@babel/plugin-proposal-object-rest-spread-7.14.4" - sources."@babel/plugin-syntax-jsx-7.12.13" + sources."@babel/helper-function-name-7.14.5" + sources."@babel/helper-get-function-arity-7.14.5" + sources."@babel/helper-hoist-variables-7.14.5" + sources."@babel/helper-member-expression-to-functions-7.14.5" + sources."@babel/helper-module-imports-7.14.5" + sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-optimise-call-expression-7.14.5" + sources."@babel/helper-plugin-utils-7.14.5" + sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-split-export-declaration-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-option-7.14.5" + sources."@babel/helpers-7.14.5" + sources."@babel/highlight-7.14.5" + sources."@babel/parser-7.14.5" + sources."@babel/plugin-proposal-object-rest-spread-7.14.5" + sources."@babel/plugin-syntax-jsx-7.14.5" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" - sources."@babel/plugin-transform-destructuring-7.14.4" - sources."@babel/plugin-transform-parameters-7.14.2" - sources."@babel/plugin-transform-react-jsx-7.14.3" - sources."@babel/template-7.12.13" - sources."@babel/traverse-7.14.2" - sources."@babel/types-7.14.4" + sources."@babel/plugin-transform-destructuring-7.14.5" + sources."@babel/plugin-transform-parameters-7.14.5" + sources."@babel/plugin-transform-react-jsx-7.14.5" + sources."@babel/template-7.14.5" + sources."@babel/traverse-7.14.5" + sources."@babel/types-7.14.5" sources."@sindresorhus/is-4.0.1" sources."@szmarczak/http-timer-4.0.5" sources."@types/cacheable-request-6.0.1" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.1" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."@types/normalize-package-data-2.4.0" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -75945,7 +75725,7 @@ in sources."brace-expansion-1.1.11" sources."browserslist-4.16.6" sources."cacheable-lookup-5.0.4" - (sources."cacheable-request-7.0.1" // { + (sources."cacheable-request-7.0.2" // { dependencies = [ sources."get-stream-5.2.0" ]; @@ -75959,7 +75739,7 @@ in sources."quick-lru-4.0.1" ]; }) - sources."caniuse-lite-1.0.30001232" + sources."caniuse-lite-1.0.30001237" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -75996,7 +75776,7 @@ in }) sources."defer-to-connect-2.0.1" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.743" + sources."electron-to-chromium-1.3.752" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -76093,9 +75873,9 @@ in sources."minimist-options-4.1.0" sources."ms-2.1.2" sources."nice-try-1.0.5" - sources."node-releases-1.1.72" + sources."node-releases-1.1.73" sources."normalize-package-data-2.5.0" - sources."normalize-url-4.5.1" + sources."normalize-url-6.0.1" sources."npm-run-path-2.0.2" sources."object-assign-4.1.1" sources."once-1.4.0" @@ -76245,9 +76025,9 @@ in version = "1.7.5"; src = ../../applications/video/epgstation; dependencies = [ - sources."@babel/code-frame-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - (sources."@babel/highlight-7.14.0" // { + sources."@babel/code-frame-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -76257,7 +76037,7 @@ in sources."@fluentui/date-time-utilities-7.9.1" sources."@fluentui/dom-utilities-1.1.2" sources."@fluentui/keyboard-key-0.2.17" - sources."@fluentui/react-7.170.1" + sources."@fluentui/react-7.170.3" sources."@fluentui/react-focus-7.17.6" sources."@fluentui/react-window-provider-1.0.2" sources."@fluentui/theme-1.7.4" @@ -76271,10 +76051,10 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.174" - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" + sources."@microsoft/load-themed-styles-1.10.181" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.7" (sources."@npmcli/move-file-1.1.2" // { dependencies = [ sources."rimraf-3.0.2" @@ -76289,7 +76069,7 @@ in sources."@types/connect-3.4.34" sources."@types/engine.io-3.1.5" sources."@types/express-4.17.8" - sources."@types/express-serve-static-core-4.17.20" + sources."@types/express-serve-static-core-4.17.21" sources."@types/fancy-log-1.3.0" sources."@types/glob-7.1.3" sources."@types/hls.js-0.13.1" @@ -77132,8 +76912,8 @@ in ]; }) sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" @@ -77298,7 +77078,7 @@ in sources."object.map-1.0.1" sources."object.pick-1.3.0" sources."object.reduce-1.0.1" - sources."office-ui-fabric-react-7.170.1" + sources."office-ui-fabric-react-7.170.3" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -77525,7 +77305,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - (sources."sass-1.34.0" // { + (sources."sass-1.34.1" // { dependencies = [ sources."anymatch-3.1.2" sources."binary-extensions-2.2.0" @@ -77941,25 +77721,21 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "7.27.0"; + version = "7.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.27.0.tgz"; - sha512 = "JZuR6La2ZF0UD384lcbnd0Cgg6QJjiCwhMD6eU4h/VGPcVGwawNNzKU41tgokGXnfjOOyI6QIffthhJTPzzuRA=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.28.0.tgz"; + sha512 = "UMfH0VSjP0G4p3EWirscJEQ/cHqnT/iuH6oNZOB94nBjWbMnhGEPxsZm1eyIW0C/9jLI0Fow4W5DXLjEI7mn1g=="; }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.0" - (sources."@babel/highlight-7.14.0" // { + sources."@babel/helper-validator-identifier-7.14.5" + (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" sources."escape-string-regexp-1.0.5" ]; }) - (sources."@eslint/eslintrc-0.4.1" // { - dependencies = [ - sources."globals-12.4.0" - ]; - }) + sources."@eslint/eslintrc-0.4.2" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" sources."ajv-6.12.6" @@ -78025,11 +77801,7 @@ in sources."functional-red-black-tree-1.0.1" sources."glob-7.1.7" sources."glob-parent-5.1.2" - (sources."globals-13.9.0" // { - dependencies = [ - sources."type-fest-0.20.2" - ]; - }) + sources."globals-13.9.0" sources."has-flag-3.0.0" sources."ignore-4.0.6" sources."import-fresh-3.3.0" @@ -78081,13 +77853,13 @@ in sources."supports-color-5.5.0" (sources."table-6.7.1" // { dependencies = [ - sources."ajv-8.5.0" + sources."ajv-8.6.0" sources."json-schema-traverse-1.0.0" ]; }) sources."text-table-0.2.0" sources."type-check-0.4.0" - sources."type-fest-0.8.1" + sources."type-fest-0.20.2" sources."uri-js-4.4.1" sources."v8-compile-cache-2.3.0" sources."which-2.0.2" @@ -78115,8 +77887,8 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.0" - (sources."@babel/highlight-7.14.0" // { + sources."@babel/helper-validator-identifier-7.14.5" + (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" sources."escape-string-regexp-1.0.5" @@ -78124,11 +77896,7 @@ in sources."supports-color-5.5.0" ]; }) - (sources."@eslint/eslintrc-0.4.1" // { - dependencies = [ - sources."globals-12.4.0" - ]; - }) + sources."@eslint/eslintrc-0.4.2" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" sources."ajv-6.12.6" @@ -78159,7 +77927,7 @@ in sources."emoji-regex-8.0.0" sources."enquirer-2.3.6" sources."escape-string-regexp-4.0.0" - sources."eslint-7.27.0" + sources."eslint-7.28.0" sources."eslint-scope-5.1.1" (sources."eslint-utils-2.1.0" // { dependencies = [ @@ -78195,11 +77963,7 @@ in sources."functional-red-black-tree-1.0.1" sources."glob-7.1.7" sources."glob-parent-5.1.2" - (sources."globals-13.9.0" // { - dependencies = [ - sources."type-fest-0.20.2" - ]; - }) + sources."globals-13.9.0" sources."has-flag-4.0.0" sources."ignore-4.0.6" sources."import-fresh-3.3.0" @@ -78252,13 +78016,13 @@ in sources."supports-color-8.1.1" (sources."table-6.7.1" // { dependencies = [ - sources."ajv-8.5.0" + sources."ajv-8.6.0" sources."json-schema-traverse-1.0.0" ]; }) sources."text-table-0.2.0" sources."type-check-0.4.0" - sources."type-fest-0.8.1" + sources."type-fest-0.20.2" sources."uri-js-4.4.1" sources."v8-compile-cache-2.3.0" sources."which-2.0.2" @@ -78302,126 +78066,126 @@ in sha512 = "r6SeIMk2ZP1/rSKGcXquiQp/A7MGAmJvG0otmJhlO5ypdYXfAJ1fhEJIqt7ufSngc5RRJ0cjnKZ1WBSyJlJTNA=="; }; dependencies = [ - sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.14.4" + sources."@babel/code-frame-7.14.5" + sources."@babel/compat-data-7.14.5" (sources."@babel/core-7.9.0" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."@babel/generator-7.14.3" - sources."@babel/helper-annotate-as-pure-7.12.13" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" - (sources."@babel/helper-compilation-targets-7.14.4" // { + sources."@babel/generator-7.14.5" + sources."@babel/helper-annotate-as-pure-7.14.5" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" + (sources."@babel/helper-compilation-targets-7.14.5" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.14.4" - sources."@babel/helper-create-regexp-features-plugin-7.14.3" + sources."@babel/helper-create-class-features-plugin-7.14.5" + sources."@babel/helper-create-regexp-features-plugin-7.14.5" (sources."@babel/helper-define-polyfill-provider-0.2.3" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-explode-assignable-expression-7.13.0" - sources."@babel/helper-function-name-7.14.2" - sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-hoist-variables-7.13.16" - sources."@babel/helper-member-expression-to-functions-7.13.12" - sources."@babel/helper-module-imports-7.13.12" - sources."@babel/helper-module-transforms-7.14.2" - sources."@babel/helper-optimise-call-expression-7.12.13" - sources."@babel/helper-plugin-utils-7.13.0" - sources."@babel/helper-remap-async-to-generator-7.13.0" - sources."@babel/helper-replace-supers-7.14.4" - sources."@babel/helper-simple-access-7.13.12" - sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" - sources."@babel/helper-split-export-declaration-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - sources."@babel/helper-validator-option-7.12.17" - sources."@babel/helper-wrap-function-7.13.0" - sources."@babel/helpers-7.14.0" - (sources."@babel/highlight-7.14.0" // { + sources."@babel/helper-explode-assignable-expression-7.14.5" + sources."@babel/helper-function-name-7.14.5" + sources."@babel/helper-get-function-arity-7.14.5" + sources."@babel/helper-hoist-variables-7.14.5" + sources."@babel/helper-member-expression-to-functions-7.14.5" + sources."@babel/helper-module-imports-7.14.5" + sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-optimise-call-expression-7.14.5" + sources."@babel/helper-plugin-utils-7.14.5" + sources."@babel/helper-remap-async-to-generator-7.14.5" + sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" + sources."@babel/helper-split-export-declaration-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-option-7.14.5" + sources."@babel/helper-wrap-function-7.14.5" + sources."@babel/helpers-7.14.5" + (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.4" - sources."@babel/plugin-proposal-async-generator-functions-7.14.2" + sources."@babel/parser-7.14.5" + sources."@babel/plugin-proposal-async-generator-functions-7.14.5" sources."@babel/plugin-proposal-class-properties-7.12.13" - sources."@babel/plugin-proposal-dynamic-import-7.14.2" - sources."@babel/plugin-proposal-export-default-from-7.12.13" - sources."@babel/plugin-proposal-export-namespace-from-7.14.2" - sources."@babel/plugin-proposal-json-strings-7.14.2" - sources."@babel/plugin-proposal-logical-assignment-operators-7.14.2" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.2" - sources."@babel/plugin-proposal-numeric-separator-7.14.2" - sources."@babel/plugin-proposal-object-rest-spread-7.14.4" - sources."@babel/plugin-proposal-optional-catch-binding-7.14.2" - sources."@babel/plugin-proposal-optional-chaining-7.14.2" - sources."@babel/plugin-proposal-private-methods-7.13.0" - sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" + sources."@babel/plugin-proposal-dynamic-import-7.14.5" + sources."@babel/plugin-proposal-export-default-from-7.14.5" + sources."@babel/plugin-proposal-export-namespace-from-7.14.5" + sources."@babel/plugin-proposal-json-strings-7.14.5" + sources."@babel/plugin-proposal-logical-assignment-operators-7.14.5" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" + sources."@babel/plugin-proposal-numeric-separator-7.14.5" + sources."@babel/plugin-proposal-object-rest-spread-7.14.5" + sources."@babel/plugin-proposal-optional-catch-binding-7.14.5" + sources."@babel/plugin-proposal-optional-chaining-7.14.5" + sources."@babel/plugin-proposal-private-methods-7.14.5" + sources."@babel/plugin-proposal-unicode-property-regex-7.14.5" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-class-properties-7.12.13" sources."@babel/plugin-syntax-dynamic-import-7.8.3" - sources."@babel/plugin-syntax-export-default-from-7.12.13" + sources."@babel/plugin-syntax-export-default-from-7.14.5" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-syntax-flow-7.12.13" + sources."@babel/plugin-syntax-flow-7.14.5" sources."@babel/plugin-syntax-json-strings-7.8.3" - sources."@babel/plugin-syntax-jsx-7.12.13" + sources."@babel/plugin-syntax-jsx-7.14.5" sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" sources."@babel/plugin-syntax-numeric-separator-7.10.4" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-top-level-await-7.12.13" - sources."@babel/plugin-syntax-typescript-7.12.13" - sources."@babel/plugin-transform-arrow-functions-7.13.0" - sources."@babel/plugin-transform-async-to-generator-7.13.0" - sources."@babel/plugin-transform-block-scoped-functions-7.12.13" - sources."@babel/plugin-transform-block-scoping-7.14.4" - sources."@babel/plugin-transform-classes-7.14.4" - sources."@babel/plugin-transform-computed-properties-7.13.0" - sources."@babel/plugin-transform-destructuring-7.14.4" - sources."@babel/plugin-transform-dotall-regex-7.12.13" - sources."@babel/plugin-transform-duplicate-keys-7.12.13" - sources."@babel/plugin-transform-exponentiation-operator-7.12.13" - sources."@babel/plugin-transform-flow-strip-types-7.13.0" - sources."@babel/plugin-transform-for-of-7.13.0" - sources."@babel/plugin-transform-function-name-7.12.13" - sources."@babel/plugin-transform-literals-7.12.13" - sources."@babel/plugin-transform-member-expression-literals-7.12.13" - sources."@babel/plugin-transform-modules-amd-7.14.2" - sources."@babel/plugin-transform-modules-commonjs-7.14.0" - sources."@babel/plugin-transform-modules-systemjs-7.13.8" - sources."@babel/plugin-transform-modules-umd-7.14.0" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.13" - sources."@babel/plugin-transform-new-target-7.12.13" - sources."@babel/plugin-transform-object-assign-7.12.13" - sources."@babel/plugin-transform-object-super-7.12.13" - sources."@babel/plugin-transform-parameters-7.14.2" - sources."@babel/plugin-transform-property-literals-7.12.13" - sources."@babel/plugin-transform-react-display-name-7.14.2" - sources."@babel/plugin-transform-react-jsx-7.14.3" - sources."@babel/plugin-transform-react-jsx-self-7.12.13" - sources."@babel/plugin-transform-react-jsx-source-7.14.2" - sources."@babel/plugin-transform-regenerator-7.13.15" - sources."@babel/plugin-transform-reserved-words-7.12.13" - (sources."@babel/plugin-transform-runtime-7.14.3" // { + sources."@babel/plugin-syntax-top-level-await-7.14.5" + sources."@babel/plugin-syntax-typescript-7.14.5" + sources."@babel/plugin-transform-arrow-functions-7.14.5" + sources."@babel/plugin-transform-async-to-generator-7.14.5" + sources."@babel/plugin-transform-block-scoped-functions-7.14.5" + sources."@babel/plugin-transform-block-scoping-7.14.5" + sources."@babel/plugin-transform-classes-7.14.5" + sources."@babel/plugin-transform-computed-properties-7.14.5" + sources."@babel/plugin-transform-destructuring-7.14.5" + sources."@babel/plugin-transform-dotall-regex-7.14.5" + sources."@babel/plugin-transform-duplicate-keys-7.14.5" + sources."@babel/plugin-transform-exponentiation-operator-7.14.5" + sources."@babel/plugin-transform-flow-strip-types-7.14.5" + sources."@babel/plugin-transform-for-of-7.14.5" + sources."@babel/plugin-transform-function-name-7.14.5" + sources."@babel/plugin-transform-literals-7.14.5" + sources."@babel/plugin-transform-member-expression-literals-7.14.5" + sources."@babel/plugin-transform-modules-amd-7.14.5" + sources."@babel/plugin-transform-modules-commonjs-7.14.5" + sources."@babel/plugin-transform-modules-systemjs-7.14.5" + sources."@babel/plugin-transform-modules-umd-7.14.5" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.5" + sources."@babel/plugin-transform-new-target-7.14.5" + sources."@babel/plugin-transform-object-assign-7.14.5" + sources."@babel/plugin-transform-object-super-7.14.5" + sources."@babel/plugin-transform-parameters-7.14.5" + sources."@babel/plugin-transform-property-literals-7.14.5" + sources."@babel/plugin-transform-react-display-name-7.14.5" + sources."@babel/plugin-transform-react-jsx-7.14.5" + sources."@babel/plugin-transform-react-jsx-self-7.14.5" + sources."@babel/plugin-transform-react-jsx-source-7.14.5" + sources."@babel/plugin-transform-regenerator-7.14.5" + sources."@babel/plugin-transform-reserved-words-7.14.5" + (sources."@babel/plugin-transform-runtime-7.14.5" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/plugin-transform-shorthand-properties-7.12.13" - sources."@babel/plugin-transform-spread-7.13.0" - sources."@babel/plugin-transform-sticky-regex-7.12.13" - sources."@babel/plugin-transform-template-literals-7.13.0" - sources."@babel/plugin-transform-typeof-symbol-7.12.13" - sources."@babel/plugin-transform-typescript-7.14.4" - sources."@babel/plugin-transform-unicode-escapes-7.12.13" - sources."@babel/plugin-transform-unicode-regex-7.12.13" + sources."@babel/plugin-transform-shorthand-properties-7.14.5" + sources."@babel/plugin-transform-spread-7.14.5" + sources."@babel/plugin-transform-sticky-regex-7.14.5" + sources."@babel/plugin-transform-template-literals-7.14.5" + sources."@babel/plugin-transform-typeof-symbol-7.14.5" + sources."@babel/plugin-transform-typescript-7.14.5" + sources."@babel/plugin-transform-unicode-escapes-7.14.5" + sources."@babel/plugin-transform-unicode-regex-7.14.5" (sources."@babel/preset-env-7.12.17" // { dependencies = [ sources."semver-5.7.1" @@ -78429,10 +78193,10 @@ in }) sources."@babel/preset-modules-0.1.4" sources."@babel/preset-typescript-7.12.17" - sources."@babel/runtime-7.14.0" - sources."@babel/template-7.12.13" - sources."@babel/traverse-7.14.2" - sources."@babel/types-7.14.4" + sources."@babel/runtime-7.14.5" + sources."@babel/template-7.14.5" + sources."@babel/traverse-7.14.5" + sources."@babel/types-7.14.5" sources."@expo/apple-utils-0.0.0-alpha.20" sources."@expo/bunyan-4.0.0" sources."@expo/config-4.0.2" @@ -78512,7 +78276,7 @@ in sources."react-refresh-0.8.3" ]; }) - (sources."@expo/xcpretty-2.0.1" // { + (sources."@expo/xcpretty-2.0.2" // { dependencies = [ sources."@babel/code-frame-7.10.4" ]; @@ -78564,9 +78328,9 @@ in sources."@jimp/tiff-0.12.1" sources."@jimp/types-0.12.1" sources."@jimp/utils-0.12.1" - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.7" (sources."@npmcli/git-2.0.9" // { dependencies = [ sources."mkdirp-1.0.4" @@ -78836,7 +78600,7 @@ in }) sources."cache-base-1.0.1" sources."cacheable-lookup-5.0.4" - sources."cacheable-request-7.0.1" + sources."cacheable-request-7.0.2" sources."call-bind-1.0.2" sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" @@ -78844,12 +78608,12 @@ in sources."callsites-2.0.0" (sources."camel-case-4.1.2" // { dependencies = [ - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001232" + sources."caniuse-lite-1.0.30001237" sources."caseless-0.12.0" (sources."chalk-4.1.1" // { dependencies = [ @@ -78983,7 +78747,7 @@ in ]; }) sources."core-js-2.6.12" - (sources."core-js-compat-3.13.1" // { + (sources."core-js-compat-3.14.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -79014,15 +78778,9 @@ in sources."semver-6.3.0" ]; }) - (sources."css-select-2.1.0" // { + (sources."css-select-4.1.3" // { dependencies = [ - (sources."dom-serializer-0.2.2" // { - dependencies = [ - sources."domelementtype-2.2.0" - ]; - }) - sources."domelementtype-1.3.1" - sources."domutils-1.7.0" + sources."domhandler-4.2.0" ]; }) sources."css-select-base-adapter-0.1.1" @@ -79031,7 +78789,7 @@ in sources."source-map-0.6.1" ]; }) - sources."css-what-3.4.2" + sources."css-what-5.0.1" sources."cssesc-3.0.0" sources."cssnano-4.1.11" sources."cssnano-preset-default-4.0.8" @@ -79107,14 +78865,14 @@ in sources."domelementtype-2.2.0" sources."domhandler-3.3.0" sources."domino-2.1.6" - (sources."domutils-2.6.0" // { + (sources."domutils-2.7.0" // { dependencies = [ sources."domhandler-4.2.0" ]; }) (sources."dot-case-3.0.4" // { dependencies = [ - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) sources."dot-prop-5.3.0" @@ -79123,7 +78881,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.743" + sources."electron-to-chromium-1.3.752" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -79487,6 +79245,7 @@ in sources."json-buffer-3.0.0" sources."keyv-3.1.0" sources."lowercase-keys-1.0.1" + sources."normalize-url-4.5.1" sources."p-cancelable-1.1.0" sources."p-timeout-3.2.0" sources."responselike-1.0.2" @@ -79578,7 +79337,7 @@ in sources."loose-envify-1.4.0" (sources."lower-case-2.0.2" // { dependencies = [ - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) sources."lowercase-keys-2.0.0" @@ -79588,7 +79347,7 @@ in sources."semver-5.7.1" ]; }) - (sources."make-fetch-happen-8.0.14" // { + (sources."make-fetch-happen-9.0.2" // { dependencies = [ sources."minipass-3.1.3" ]; @@ -79620,8 +79379,8 @@ in ]; }) sources."mime-1.4.1" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."min-document-2.19.0" @@ -79708,7 +79467,7 @@ in sources."nice-try-1.0.5" (sources."no-case-3.0.4" // { dependencies = [ - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) sources."node-fetch-2.6.1" @@ -79726,10 +79485,10 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.72" + sources."node-releases-1.1.73" sources."nopt-5.0.0" sources."normalize-path-3.0.0" - sources."normalize-url-4.5.1" + sources."normalize-url-6.0.1" sources."npm-bundled-1.1.2" sources."npm-install-checks-4.0.0" sources."npm-normalize-package-bin-1.0.1" @@ -79743,21 +79502,21 @@ in (sources."npm-pick-manifest-6.1.1" // { dependencies = [ sources."hosted-git-info-4.0.2" - sources."npm-package-arg-8.1.2" + sources."npm-package-arg-8.1.4" sources."semver-7.3.5" ]; }) - (sources."npm-registry-fetch-10.1.2" // { + (sources."npm-registry-fetch-11.0.0" // { dependencies = [ sources."hosted-git-info-4.0.2" sources."minipass-3.1.3" - sources."npm-package-arg-8.1.2" + sources."npm-package-arg-8.1.4" sources."semver-7.3.5" ]; }) sources."npm-run-path-2.0.2" sources."npmlog-4.1.2" - sources."nth-check-1.0.2" + sources."nth-check-2.0.0" sources."nullthrows-1.1.1" sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" @@ -79838,6 +79597,7 @@ in sources."json-buffer-3.0.0" sources."keyv-3.1.0" sources."lowercase-keys-1.0.1" + sources."normalize-url-4.5.1" sources."p-cancelable-1.1.0" sources."registry-auth-token-3.4.0" sources."registry-url-5.1.0" @@ -79845,12 +79605,12 @@ in sources."semver-6.3.0" ]; }) - (sources."pacote-11.3.3" // { + (sources."pacote-11.3.4" // { dependencies = [ sources."hosted-git-info-4.0.2" sources."minipass-3.1.3" sources."mkdirp-1.0.4" - sources."npm-package-arg-8.1.2" + sources."npm-package-arg-8.1.4" sources."rimraf-3.0.2" sources."semver-7.3.5" ]; @@ -79859,7 +79619,7 @@ in sources."parallel-transform-1.2.0" (sources."param-case-3.0.4" // { dependencies = [ - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) sources."parse-asn1-5.1.6" @@ -79873,7 +79633,7 @@ in sources."parseurl-1.3.3" (sources."pascal-case-3.1.2" // { dependencies = [ - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) sources."pascalcase-0.1.1" @@ -79927,7 +79687,7 @@ in ]; }) sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.35" // { + (sources."postcss-7.0.36" // { dependencies = [ (sources."chalk-2.4.2" // { dependencies = [ @@ -80149,21 +79909,11 @@ in sources."relateurl-0.2.7" sources."remove-trailing-separator-1.1.0" sources."remove-trailing-slash-0.1.1" - (sources."renderkid-2.0.5" // { + (sources."renderkid-2.0.7" // { dependencies = [ sources."ansi-regex-2.1.1" - (sources."dom-serializer-0.2.2" // { - dependencies = [ - sources."domelementtype-2.2.0" - sources."entities-2.2.0" - ]; - }) - sources."domelementtype-1.3.1" - sources."domhandler-2.4.2" - sources."domutils-1.7.0" - sources."entities-1.1.2" - sources."htmlparser2-3.10.1" - sources."readable-stream-3.6.0" + sources."domhandler-4.2.0" + sources."htmlparser2-6.1.0" sources."strip-ansi-3.0.1" ]; }) @@ -80393,6 +80143,16 @@ in (sources."svgo-1.3.2" // { dependencies = [ sources."chalk-2.4.2" + sources."css-select-2.1.0" + sources."css-what-3.4.2" + (sources."dom-serializer-0.2.2" // { + dependencies = [ + sources."domelementtype-2.2.0" + ]; + }) + sources."domelementtype-1.3.1" + sources."domutils-1.7.0" + sources."nth-check-1.0.2" ]; }) sources."symbol-observable-1.2.0" @@ -80662,7 +80422,7 @@ in sources."strip-ansi-3.0.1" sources."supports-color-6.1.0" sources."to-regex-range-2.1.1" - sources."ws-6.2.1" + sources."ws-6.2.2" ]; }) (sources."webpack-log-2.0.0" // { @@ -80900,8 +80660,8 @@ in sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" sources."meow-3.7.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-1.2.0" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -80997,17 +80757,18 @@ in sha512 = "KqaoGSmcIBLY6Vr1wWRMu0acuLUpxpKEtjekdwYs+JxMk74vRa8Mwxd96SmEoBat28cPCoLAPfvDyEtzUzkjEg=="; }; dependencies = [ - sources."@babel/code-frame-7.12.13" - sources."@babel/generator-7.14.3" - sources."@babel/helper-function-name-7.14.2" - sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-split-export-declaration-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - sources."@babel/highlight-7.14.0" - sources."@babel/parser-7.14.4" - sources."@babel/template-7.12.13" - sources."@babel/traverse-7.14.2" - sources."@babel/types-7.14.4" + sources."@babel/code-frame-7.14.5" + sources."@babel/generator-7.14.5" + sources."@babel/helper-function-name-7.14.5" + sources."@babel/helper-get-function-arity-7.14.5" + sources."@babel/helper-hoist-variables-7.14.5" + sources."@babel/helper-split-export-declaration-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/highlight-7.14.5" + sources."@babel/parser-7.14.5" + sources."@babel/template-7.14.5" + sources."@babel/traverse-7.14.5" + sources."@babel/types-7.14.5" (sources."@heroku-cli/color-1.1.14" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -81018,9 +80779,9 @@ in ]; }) sources."@mrmlnc/readdir-enhanced-2.2.1" - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.7" (sources."@oclif/command-1.8.0" // { dependencies = [ sources."@oclif/plugin-help-3.2.2" @@ -81040,7 +80801,7 @@ in (sources."@oclif/config-1.17.0" // { dependencies = [ sources."globby-11.0.3" - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) sources."@oclif/errors-1.3.4" @@ -81387,8 +81148,8 @@ in sources."map-visit-1.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.4" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" (sources."mixin-deep-1.3.2" // { @@ -81445,7 +81206,7 @@ in sources."posix-character-classes-0.1.1" sources."prelude-ls-1.1.2" sources."prepend-http-2.0.0" - sources."prettier-2.3.0" + sources."prettier-2.3.1" sources."prettier-linter-helpers-1.0.0" sources."process-nextick-args-2.0.1" sources."psl-1.8.0" @@ -81609,21 +81370,25 @@ in firebase-tools = nodeEnv.buildNodePackage { name = "firebase-tools"; packageName = "firebase-tools"; - version = "9.12.0"; + version = "9.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-9.12.0.tgz"; - sha512 = "rPk4JyzPaSHyHQDGCh0/U63MW2nXgnZ4h0IRE2EjFHRz+KyNl/hakGX7EQKVej5HpMKFhWRjGOvDHn1PXooQgw=="; + url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-9.12.1.tgz"; + sha512 = "izgpgUiG36UwIV12oBu3X8ndACGsxh2cuREnGgTAoTs6P5OC2nEV3riwAak9eQpkuqHfZ6vEuw5ogSbMNqRIgA=="; }; dependencies = [ - sources."@apidevtools/json-schema-ref-parser-9.0.7" + (sources."@apidevtools/json-schema-ref-parser-9.0.9" // { + dependencies = [ + sources."js-yaml-4.1.0" + ]; + }) sources."@dabh/diagnostics-2.0.2" sources."@google-cloud/paginator-3.0.5" sources."@google-cloud/precise-date-2.0.3" - sources."@google-cloud/projectify-2.0.1" + sources."@google-cloud/projectify-2.1.0" sources."@google-cloud/promisify-2.0.3" - (sources."@google-cloud/pubsub-2.12.0" // { + (sources."@google-cloud/pubsub-2.13.0" // { dependencies = [ - sources."google-auth-library-7.1.0" + sources."google-auth-library-7.1.2" ]; }) sources."@grpc/grpc-js-1.3.2" @@ -81652,9 +81417,10 @@ in sources."@types/archiver-5.1.0" sources."@types/duplexify-3.6.0" sources."@types/glob-7.1.3" + sources."@types/json-schema-7.0.7" sources."@types/long-4.0.1" sources."@types/minimatch-3.0.4" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -81697,7 +81463,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."argparse-1.0.10" + sources."argparse-2.0.1" sources."array-flatten-1.1.1" sources."arrify-2.0.1" sources."as-array-2.0.0" @@ -81991,7 +81757,7 @@ in ]; }) sources."gaxios-4.3.0" - sources."gcp-metadata-4.2.1" + sources."gcp-metadata-4.3.0" sources."get-caller-file-2.0.5" sources."get-stream-4.1.0" (sources."get-uri-3.0.2" // { @@ -82006,15 +81772,15 @@ in sources."glob-slasher-1.0.1" sources."global-dirs-2.1.0" sources."google-auth-library-6.1.6" - (sources."google-gax-2.14.1" // { + (sources."google-gax-2.15.0" // { dependencies = [ - sources."google-auth-library-7.1.0" + sources."google-auth-library-7.1.2" ]; }) - sources."google-p12-pem-3.0.3" + sources."google-p12-pem-3.1.0" sources."got-9.6.0" sources."graceful-fs-4.2.6" - sources."gtoken-5.2.1" + sources."gtoken-5.3.0" sources."har-schema-2.0.0" sources."har-validator-5.1.5" (sources."has-ansi-2.0.0" // { @@ -82090,7 +81856,11 @@ in sources."isstream-0.1.2" sources."jju-1.4.0" sources."join-path-1.1.1" - sources."js-yaml-3.14.1" + (sources."js-yaml-3.14.1" // { + dependencies = [ + sources."argparse-1.0.10" + ]; + }) sources."jsbn-0.1.1" sources."json-bigint-1.0.0" sources."json-buffer-3.0.0" @@ -82172,8 +81942,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-2.5.2" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -82426,7 +82196,7 @@ in sources."toxic-1.0.1" sources."traverse-0.3.9" sources."triple-beam-1.3.0" - sources."tslib-2.2.0" + sources."tslib-2.3.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" (sources."tweetsodium-0.0.5" // { @@ -82578,9 +82348,9 @@ in sha512 = "untVuHgEQjwTXQGiWcwMTi0Uks6ht9R5hb1mDT4AEQitZ/z8UrhvseQsGEC3kVEjfxQ6bdmCMaA/hKTZ5aQDrA=="; }; dependencies = [ - sources."@babel/code-frame-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - (sources."@babel/highlight-7.14.0" // { + sources."@babel/code-frame-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -82620,7 +82390,7 @@ in sources."error-ex-1.3.2" sources."esc-exit-2.0.2" sources."escape-string-regexp-1.0.5" - sources."execa-5.0.1" + sources."execa-5.1.1" sources."external-editor-3.1.0" sources."figures-3.2.0" sources."find-up-4.1.0" @@ -82759,7 +82529,7 @@ in dependencies = [ sources."@types/atob-2.1.2" sources."@types/inquirer-6.5.0" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."@types/through-0.0.30" sources."ajv-6.12.6" sources."ansi-escapes-4.3.2" @@ -82857,8 +82627,8 @@ in sources."localforage-1.9.0" sources."locate-path-5.0.0" sources."lodash-4.17.21" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."min-document-2.19.0" @@ -82979,10 +82749,10 @@ in forever = nodeEnv.buildNodePackage { name = "forever"; packageName = "forever"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/forever/-/forever-4.0.0.tgz"; - sha512 = "8cFfO0lvIs4c0P5LvKbdvZvtOK/z79AF/vC9DQLH+niyOCPxqq1+12CyYrzHC+5hBILjPU9ClWLVrXvrK+2ZVw=="; + url = "https://registry.npmjs.org/forever/-/forever-4.0.1.tgz"; + sha512 = "NRY5hvmjqfsWXpdGZONsfQg0GpzTHOP3xWTnOc1U3bY92m6TJr2mWDsXzv+3bMk2LftSne72keaMcX891JL2pQ=="; }; dependencies = [ (sources."anymatch-2.0.0" // { @@ -83071,7 +82841,7 @@ in sources."es-get-iterator-1.1.2" sources."es-to-primitive-1.2.1" sources."event-stream-3.3.4" - sources."eventemitter2-6.4.3" + sources."eventemitter2-6.4.4" (sources."expand-brackets-2.1.4" // { dependencies = [ sources."define-property-0.2.5" @@ -83446,10 +83216,10 @@ in gatsby-cli = nodeEnv.buildNodePackage { name = "gatsby-cli"; packageName = "gatsby-cli"; - version = "3.6.0"; + version = "3.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-3.6.0.tgz"; - sha512 = "GJ0BviJw3qnONdoNpCvqgRA8jxYk7rpqi+7MrvT0U+YMcT2HGhZbhY0RxlZqYRL8qOCJTtLB/N4Z7cCUwi8g1w=="; + url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-3.7.1.tgz"; + sha512 = "IWs7eU3tOad4qiglvokrZEL2yJPQsXjuzKW5slfXbhuj5pIc+o65f389HeOq20wHPh7ACHfZPMftvhtaPsO91g=="; }; dependencies = [ (sources."@ardatan/aggregate-error-0.0.6" // { @@ -83457,57 +83227,58 @@ in sources."tslib-2.0.3" ]; }) - sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.14.4" - (sources."@babel/core-7.14.3" // { + sources."@babel/code-frame-7.14.5" + sources."@babel/compat-data-7.14.5" + (sources."@babel/core-7.14.5" // { dependencies = [ sources."semver-6.3.0" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.14.3" // { + (sources."@babel/generator-7.14.5" // { dependencies = [ sources."source-map-0.5.7" ]; }) - sources."@babel/helper-annotate-as-pure-7.12.13" - (sources."@babel/helper-compilation-targets-7.14.4" // { + sources."@babel/helper-annotate-as-pure-7.14.5" + (sources."@babel/helper-compilation-targets-7.14.5" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-function-name-7.14.2" - sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-member-expression-to-functions-7.13.12" - sources."@babel/helper-module-imports-7.13.12" - sources."@babel/helper-module-transforms-7.14.2" - sources."@babel/helper-optimise-call-expression-7.12.13" - sources."@babel/helper-plugin-utils-7.13.0" - sources."@babel/helper-replace-supers-7.14.4" - sources."@babel/helper-simple-access-7.13.12" - sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" - sources."@babel/helper-split-export-declaration-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - sources."@babel/helper-validator-option-7.12.17" - sources."@babel/helpers-7.14.0" - (sources."@babel/highlight-7.14.0" // { + sources."@babel/helper-function-name-7.14.5" + sources."@babel/helper-get-function-arity-7.14.5" + sources."@babel/helper-hoist-variables-7.14.5" + sources."@babel/helper-member-expression-to-functions-7.14.5" + sources."@babel/helper-module-imports-7.14.5" + sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-optimise-call-expression-7.14.5" + sources."@babel/helper-plugin-utils-7.14.5" + sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" + sources."@babel/helper-split-export-declaration-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-option-7.14.5" + sources."@babel/helpers-7.14.5" + (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.4" + sources."@babel/parser-7.14.5" sources."@babel/plugin-proposal-object-rest-spread-7.10.4" - sources."@babel/plugin-proposal-optional-chaining-7.14.2" - sources."@babel/plugin-syntax-jsx-7.12.13" + sources."@babel/plugin-proposal-optional-chaining-7.14.5" + sources."@babel/plugin-syntax-jsx-7.14.5" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-transform-parameters-7.14.2" - sources."@babel/plugin-transform-react-jsx-7.14.3" - sources."@babel/runtime-7.14.0" - sources."@babel/standalone-7.14.4" - sources."@babel/template-7.12.13" - sources."@babel/traverse-7.14.2" - sources."@babel/types-7.14.4" + sources."@babel/plugin-transform-parameters-7.14.5" + sources."@babel/plugin-transform-react-jsx-7.14.5" + sources."@babel/runtime-7.14.5" + sources."@babel/standalone-7.14.5" + sources."@babel/template-7.14.5" + sources."@babel/traverse-7.14.5" + sources."@babel/types-7.14.5" sources."@graphql-tools/schema-7.1.5" sources."@graphql-tools/utils-7.10.0" sources."@hapi/address-2.1.4" @@ -83544,7 +83315,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-patch-0.0.30" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."@types/node-fetch-2.5.10" sources."@types/readable-stream-2.3.10" sources."@types/unist-2.0.3" @@ -83552,7 +83323,7 @@ in sources."@types/yargs-parser-20.2.0" sources."@types/yoga-layout-1.9.2" sources."accepts-1.3.7" - sources."acorn-8.3.0" + sources."acorn-8.4.0" sources."acorn-jsx-5.3.1" sources."address-1.1.2" (sources."ansi-align-3.0.0" // { @@ -83612,7 +83383,7 @@ in sources."call-bind-1.0.2" sources."camel-case-4.1.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001232" + sources."caniuse-lite-1.0.30001237" sources."ccount-1.1.0" (sources."chalk-4.1.1" // { dependencies = [ @@ -83662,7 +83433,7 @@ in ]; }) sources."content-type-1.0.4" - sources."contentful-management-7.22.4" + sources."contentful-management-7.24.0" sources."contentful-sdk-core-6.8.0" sources."convert-hrtime-3.0.0" (sources."convert-source-map-1.7.0" // { @@ -83673,15 +83444,15 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."cors-2.8.5" - sources."create-gatsby-1.6.0" + sources."create-gatsby-1.7.1" (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" ]; }) sources."crypto-random-string-2.0.0" - sources."css-select-2.1.0" - sources."css-what-3.4.2" + sources."css-select-4.1.3" + sources."css-what-5.0.1" sources."debug-4.3.2" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" @@ -83700,19 +83471,15 @@ in }) sources."diff-sequences-25.2.6" sources."dom-converter-0.2.0" - (sources."dom-serializer-0.2.2" // { - dependencies = [ - sources."domelementtype-2.2.0" - ]; - }) - sources."domelementtype-1.3.1" - sources."domhandler-2.4.2" - sources."domutils-1.7.0" + sources."dom-serializer-1.3.2" + sources."domelementtype-2.2.0" + sources."domhandler-4.2.0" + sources."domutils-2.7.0" sources."dot-prop-5.3.0" sources."dotenv-8.6.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.743" + sources."electron-to-chromium-1.3.752" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -83784,8 +83551,8 @@ in sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" - sources."gatsby-core-utils-2.6.0" - (sources."gatsby-recipes-0.17.0" // { + sources."gatsby-core-utils-2.7.1" + (sources."gatsby-recipes-0.18.1" // { dependencies = [ sources."cross-spawn-7.0.3" sources."execa-4.1.0" @@ -83799,7 +83566,7 @@ in sources."which-2.0.2" ]; }) - sources."gatsby-telemetry-2.6.0" + sources."gatsby-telemetry-2.7.1" sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" @@ -83821,13 +83588,9 @@ in sources."has-symbols-1.0.2" sources."has-yarn-2.1.0" sources."hicat-0.8.0" - sources."highlight.js-10.7.2" + sources."highlight.js-10.7.3" sources."hosted-git-info-3.0.8" - (sources."htmlparser2-3.10.1" // { - dependencies = [ - sources."entities-1.1.2" - ]; - }) + sources."htmlparser2-6.1.0" sources."http-cache-semantics-4.1.0" (sources."http-errors-1.7.2" // { dependencies = [ @@ -83946,8 +83709,8 @@ in sources."micromark-extension-mdxjs-0.3.0" sources."micromark-extension-mdxjs-esm-0.3.1" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."min-indent-1.0.1" @@ -83963,11 +83726,11 @@ in sources."node-eta-0.9.0" sources."node-fetch-2.6.1" sources."node-object-hash-2.3.3" - sources."node-releases-1.1.72" + sources."node-releases-1.1.73" sources."normalize-path-3.0.0" - sources."normalize-url-3.3.0" + sources."normalize-url-6.0.1" sources."npm-run-path-2.0.2" - sources."nth-check-1.0.2" + sources."nth-check-2.0.0" sources."object-assign-4.1.1" sources."object-inspect-1.10.3" sources."object-path-0.11.5" @@ -83989,7 +83752,7 @@ in }) sources."parse-entities-2.0.0" sources."parse-path-4.0.3" - sources."parse-url-5.0.2" + sources."parse-url-5.0.3" sources."parseurl-1.3.3" sources."pascal-case-3.1.2" sources."path-exists-4.0.0" @@ -84001,7 +83764,7 @@ in sources."picomatch-2.3.0" sources."pkg-dir-4.2.0" sources."prepend-http-2.0.0" - sources."prettier-2.3.0" + sources."prettier-2.3.1" sources."pretty-error-2.1.2" (sources."pretty-format-25.5.0" // { dependencies = [ @@ -84054,7 +83817,7 @@ in ]; }) sources."remark-stringify-8.1.1" - (sources."renderkid-2.0.5" // { + (sources."renderkid-2.0.7" // { dependencies = [ sources."ansi-regex-2.1.1" sources."strip-ansi-3.0.1" @@ -84315,7 +84078,7 @@ in sources."is-my-ip-valid-1.0.0" sources."is-my-json-valid-2.20.5" sources."is-property-1.0.2" - sources."is-valid-domain-0.0.19" + sources."is-valid-domain-0.0.20" sources."json-buffer-2.0.11" sources."jsonpointer-4.1.0" sources."kvgraph-0.1.0" @@ -84325,8 +84088,8 @@ in sources."lodash.get-4.4.2" sources."looper-4.0.0" sources."lrucache-1.0.3" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."moment-2.29.1" @@ -84491,9 +84254,9 @@ in sha512 = "xf6lKP7Ptas6bIdn/KvOn7UqkPS9/BBKcGCDVrsak/e0dWYeDZIOCMNwWxLp/zEjwBMSiPZtJdOdsIdmWap3bQ=="; }; dependencies = [ - sources."@babel/code-frame-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - (sources."@babel/highlight-7.14.0" // { + sources."@babel/code-frame-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -84509,7 +84272,7 @@ in sources."@types/minimist-1.2.1" sources."@types/normalize-package-data-2.4.0" sources."agent-base-6.0.2" - sources."ajv-8.5.0" + sources."ajv-8.6.0" sources."ajv-formats-2.1.0" (sources."ansi-align-3.0.0" // { dependencies = [ @@ -84526,7 +84289,7 @@ in sources."arrify-1.0.1" (sources."ast-types-0.13.4" // { dependencies = [ - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) sources."atomically-1.7.0" @@ -84596,7 +84359,7 @@ in sources."esprima-4.0.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" - sources."execa-5.0.1" + sources."execa-5.1.1" sources."external-editor-3.1.0" sources."fast-deep-equal-3.1.3" sources."fast-levenshtein-2.0.6" @@ -84708,7 +84471,7 @@ in ]; }) sources."optionator-0.8.3" - sources."ora-5.4.0" + sources."ora-5.4.1" sources."os-tmpdir-1.0.2" sources."p-cancelable-1.1.0" sources."p-limit-2.3.0" @@ -84848,9 +84611,9 @@ in }; dependencies = [ sources."@ardatan/aggregate-error-0.0.6" - sources."@babel/code-frame-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - (sources."@babel/highlight-7.14.0" // { + sources."@babel/code-frame-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -84938,12 +84701,12 @@ in sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" sources."@microsoft/fetch-event-source-2.0.1" - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.7" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -84960,7 +84723,6 @@ in sources."array-union-2.1.0" sources."asn1-0.2.4" sources."assert-plus-1.0.0" - sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."available-typed-arrays-1.0.4" @@ -84984,7 +84746,7 @@ in sources."callsites-3.1.0" (sources."camel-case-4.1.2" // { dependencies = [ - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) sources."caseless-0.12.0" @@ -85095,7 +84857,7 @@ in }) sources."graphql-subscriptions-1.2.1" sources."graphql-type-json-0.3.2" - sources."graphql-ws-4.7.0" + sources."graphql-ws-4.9.0" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" @@ -85193,7 +84955,7 @@ in }) (sources."lower-case-2.0.2" // { dependencies = [ - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) sources."lowercase-keys-1.0.1" @@ -85206,8 +84968,8 @@ in sources."merge2-1.4.1" sources."meros-1.1.4" sources."micromatch-4.0.4" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -85220,7 +84982,7 @@ in sources."nice-try-1.0.5" (sources."no-case-3.0.4" // { dependencies = [ - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) sources."node-emoji-1.10.0" @@ -85278,7 +85040,7 @@ in sources."parse-json-5.2.0" (sources."pascal-case-3.1.2" // { dependencies = [ - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) sources."passwd-user-3.0.0" @@ -85343,11 +85105,7 @@ in sources."strip-ansi-5.2.0" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - (sources."subscriptions-transport-ws-0.9.18" // { - dependencies = [ - sources."ws-5.2.2" - ]; - }) + sources."subscriptions-transport-ws-0.9.19" sources."supports-color-7.2.0" (sources."swagger2openapi-7.0.6" // { dependencies = [ @@ -85536,8 +85294,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."minimist-1.2.5" sources."ms-2.0.0" sources."negotiator-0.6.2" @@ -86589,7 +86347,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.13.8" + sources."uglify-js-3.13.9" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; @@ -86605,10 +86363,10 @@ in htmlhint = nodeEnv.buildNodePackage { name = "htmlhint"; packageName = "htmlhint"; - version = "0.14.2"; + version = "0.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/htmlhint/-/htmlhint-0.14.2.tgz"; - sha512 = "lUCgGVZ/oyCkpgDkIa5IfClwX8Ppy11Dk7XdeVboAGSmKjIuOKx6yy86WS0W08KFtCRuxftzNy+KdQjM4UjqCA=="; + url = "https://registry.npmjs.org/htmlhint/-/htmlhint-0.15.1.tgz"; + sha512 = "uNbgqqBiD2ko4QQOYAHTPwDMluc9X81NwzlrJN7yExCoM6dHNgRFjVI+4TEdRrF/EqUzl1dpMUn7GYbu/qCKmA=="; }; dependencies = [ sources."ajv-6.12.6" @@ -86660,8 +86418,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.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."minimatch-3.0.4" sources."oauth-sign-0.9.0" sources."once-1.4.0" @@ -87065,8 +86823,8 @@ in sources."longest-1.0.1" sources."lowercase-keys-1.0.1" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."ms-2.0.0" @@ -87228,7 +86986,7 @@ in sources."node-fetch-2.6.1" sources."semver-5.7.1" sources."source-map-0.7.3" - sources."ws-6.2.1" + sources."ws-6.2.2" ]; buildInputs = globalBuildInputs; meta = { @@ -87342,7 +87100,7 @@ in sources."ansi-styles-3.2.1" (sources."ast-types-0.13.4" // { dependencies = [ - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) sources."astral-regex-2.0.0" @@ -87483,11 +87241,11 @@ in ]; }) sources."lru-cache-5.1.1" - sources."macos-release-2.4.1" + sources."macos-release-2.5.0" sources."methods-1.1.2" sources."mime-2.5.2" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -87624,20 +87382,21 @@ in bypassCache = true; reconstructLock = true; }; - "iosevka-https://github.com/be5invis/Iosevka/archive/v5.0.2.tar.gz" = nodeEnv.buildNodePackage { + "iosevka-https://github.com/be5invis/Iosevka/archive/v7.0.4.tar.gz" = nodeEnv.buildNodePackage { name = "iosevka"; packageName = "iosevka"; - version = "5.0.2"; + version = "7.0.4"; src = fetchurl { - name = "iosevka-5.0.2.tar.gz"; - url = "https://codeload.github.com/be5invis/Iosevka/tar.gz/v5.0.2"; - sha256 = "93aada519e3014b472b3ae1e33a139bcc588618239393735ff88d9d0822d7ced"; + name = "iosevka-7.0.4.tar.gz"; + url = "https://codeload.github.com/be5invis/Iosevka/tar.gz/v7.0.4"; + sha256 = "e0de45dde08463fbd02bced41893746235068167fd91051727dc048d66b91aeb"; }; dependencies = [ sources."@iarna/toml-2.2.5" - sources."@ot-builder/bin-composite-types-1.0.8" - sources."@ot-builder/bin-util-1.0.8" - (sources."@ot-builder/cli-help-shower-1.0.8" // { + sources."@msgpack/msgpack-2.7.0" + sources."@ot-builder/bin-composite-types-1.0.9" + sources."@ot-builder/bin-util-1.0.9" + (sources."@ot-builder/cli-help-shower-1.0.9" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.1" @@ -87647,7 +87406,7 @@ in sources."supports-color-7.2.0" ]; }) - (sources."@ot-builder/cli-proc-1.0.8" // { + (sources."@ot-builder/cli-proc-1.0.9" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.1" @@ -87657,7 +87416,7 @@ in sources."supports-color-7.2.0" ]; }) - (sources."@ot-builder/cli-shared-1.0.8" // { + (sources."@ot-builder/cli-shared-1.0.9" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.1" @@ -87667,41 +87426,41 @@ in sources."supports-color-7.2.0" ]; }) - sources."@ot-builder/common-impl-1.0.8" - sources."@ot-builder/errors-1.0.8" - sources."@ot-builder/io-bin-cff-1.0.8" - sources."@ot-builder/io-bin-encoding-1.0.8" - sources."@ot-builder/io-bin-ext-private-1.0.8" - sources."@ot-builder/io-bin-font-1.0.8" - sources."@ot-builder/io-bin-glyph-store-1.0.8" - sources."@ot-builder/io-bin-layout-1.0.8" - sources."@ot-builder/io-bin-metadata-1.0.8" - sources."@ot-builder/io-bin-metric-1.0.8" - sources."@ot-builder/io-bin-name-1.0.8" - sources."@ot-builder/io-bin-sfnt-1.0.8" - sources."@ot-builder/io-bin-ttf-1.0.8" - sources."@ot-builder/ot-1.0.8" - sources."@ot-builder/ot-encoding-1.0.8" - sources."@ot-builder/ot-ext-private-1.0.8" - sources."@ot-builder/ot-glyphs-1.0.8" - sources."@ot-builder/ot-layout-1.0.8" - sources."@ot-builder/ot-metadata-1.0.8" - sources."@ot-builder/ot-name-1.0.8" - sources."@ot-builder/ot-sfnt-1.0.8" - sources."@ot-builder/ot-standard-glyph-namer-1.0.8" - sources."@ot-builder/prelude-1.0.8" - sources."@ot-builder/primitive-1.0.8" - sources."@ot-builder/rectify-1.0.8" - sources."@ot-builder/stat-glyphs-1.0.8" - sources."@ot-builder/trace-1.0.8" - sources."@ot-builder/var-store-1.0.8" - sources."@ot-builder/variance-1.0.8" + sources."@ot-builder/common-impl-1.0.9" + sources."@ot-builder/errors-1.0.9" + sources."@ot-builder/io-bin-cff-1.0.9" + sources."@ot-builder/io-bin-encoding-1.0.9" + sources."@ot-builder/io-bin-ext-private-1.0.9" + sources."@ot-builder/io-bin-font-1.0.9" + sources."@ot-builder/io-bin-glyph-store-1.0.9" + sources."@ot-builder/io-bin-layout-1.0.9" + sources."@ot-builder/io-bin-metadata-1.0.9" + sources."@ot-builder/io-bin-metric-1.0.9" + sources."@ot-builder/io-bin-name-1.0.9" + sources."@ot-builder/io-bin-sfnt-1.0.9" + sources."@ot-builder/io-bin-ttf-1.0.9" + sources."@ot-builder/ot-1.0.9" + sources."@ot-builder/ot-encoding-1.0.9" + sources."@ot-builder/ot-ext-private-1.0.9" + sources."@ot-builder/ot-glyphs-1.0.9" + sources."@ot-builder/ot-layout-1.0.9" + sources."@ot-builder/ot-metadata-1.0.9" + sources."@ot-builder/ot-name-1.0.9" + sources."@ot-builder/ot-sfnt-1.0.9" + sources."@ot-builder/ot-standard-glyph-namer-1.0.9" + sources."@ot-builder/prelude-1.0.9" + sources."@ot-builder/primitive-1.0.9" + sources."@ot-builder/rectify-1.0.9" + sources."@ot-builder/stat-glyphs-1.0.9" + sources."@ot-builder/trace-1.0.9" + sources."@ot-builder/var-store-1.0.9" + sources."@ot-builder/variance-1.0.9" sources."@unicode/unicode-13.0.0-1.0.6" sources."aglfn-1.0.2" sources."amdefine-1.0.1" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" - sources."argparse-1.0.10" + sources."argparse-2.0.1" sources."async-0.9.2" sources."at-least-node-1.0.0" sources."atob-2.1.2" @@ -87710,7 +87469,7 @@ in sources."camelcase-5.3.1" sources."chainsaw-0.0.9" sources."chalk-2.4.2" - sources."cldr-5.8.0" + sources."cldr-6.1.1" sources."cli-cursor-3.1.0" sources."clipper-lib-6.4.2" sources."cliui-7.0.4" @@ -87757,7 +87516,7 @@ in sources."fast-levenshtein-2.0.6" sources."filelist-1.0.2" sources."find-up-4.1.0" - sources."fs-extra-9.1.0" + sources."fs-extra-10.0.0" sources."fs.realpath-1.0.0" sources."get-caller-file-2.0.5" sources."glob-7.1.7" @@ -87782,8 +87541,8 @@ in sources."once-1.4.0" sources."onetime-5.1.2" sources."optionator-0.8.3" - sources."ot-builder-1.0.8" - (sources."otb-ttc-bundle-1.0.8" // { + sources."ot-builder-1.0.9" + (sources."otb-ttc-bundle-1.0.9" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.1" @@ -87823,12 +87582,7 @@ in sources."source-map-0.6.1" sources."source-map-resolve-0.5.3" sources."source-map-url-0.4.1" - (sources."spiro-2.0.0" // { - dependencies = [ - sources."tslib-1.14.1" - ]; - }) - sources."sprintf-js-1.0.3" + sources."spiro-3.0.0" sources."string-width-4.2.2" sources."strip-ansi-6.0.0" (sources."stylus-0.54.8" // { @@ -87841,9 +87595,9 @@ in sources."through-2.3.8" sources."toposort-2.0.2" sources."traverse-0.3.9" - sources."tslib-2.2.0" + sources."tslib-2.3.0" sources."type-check-0.3.2" - sources."typo-geom-0.11.2" + sources."typo-geom-0.12.1" sources."unicoderegexp-0.4.1" sources."universalify-2.0.0" sources."urix-0.1.0" @@ -87854,6 +87608,7 @@ in sources."cliui-6.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" + sources."fs-extra-9.1.0" sources."has-flag-4.0.0" sources."supports-color-7.2.0" sources."wrap-ansi-6.2.0" @@ -87862,7 +87617,7 @@ in sources."yargs-parser-18.1.3" ]; }) - sources."wawoff2-1.0.2" + sources."wawoff2-2.0.0" sources."which-2.0.2" sources."which-module-2.0.0" sources."word-wrap-1.2.3" @@ -87875,7 +87630,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."xmldom-0.4.0" + sources."xmldom-0.6.0" sources."xpath-0.0.32" sources."y18n-5.0.8" sources."yallist-4.0.0" @@ -88074,7 +87829,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.918.0" // { + (sources."aws-sdk-2.927.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -88198,7 +87953,7 @@ in sources."domelementtype-2.2.0" sources."domexception-1.0.1" sources."domhandler-3.3.0" - (sources."domutils-2.6.0" // { + (sources."domutils-2.7.0" // { dependencies = [ sources."domhandler-4.2.0" ]; @@ -88276,7 +88031,7 @@ in sources."has-flag-4.0.0" sources."has-unicode-2.0.1" sources."he-1.2.0" - sources."highlight.js-10.7.2" + sources."highlight.js-10.7.3" sources."html-encoding-sniffer-1.0.2" sources."html-entities-1.4.0" sources."html-minifier-3.5.21" @@ -88426,9 +88181,9 @@ in sources."md5-2.3.0" sources."md5-file-4.0.0" sources."mdurl-1.0.1" - sources."mermaid-8.10.1" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mermaid-8.10.2" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-response-2.1.0" (sources."minify-4.1.3" // { dependencies = [ @@ -88436,7 +88191,7 @@ in sources."debug-4.3.2" sources."html-minifier-4.0.0" sources."ms-2.1.2" - sources."uglify-js-3.13.8" + sources."uglify-js-3.13.9" ]; }) sources."minimatch-3.0.4" @@ -88459,7 +88214,7 @@ in sources."ndarray-1.0.19" sources."ndarray-pack-1.2.1" sources."needle-2.6.0" - sources."nextgen-events-1.4.0" + sources."nextgen-events-1.5.2" sources."no-case-2.3.2" (sources."node-abi-2.30.0" // { dependencies = [ @@ -88489,7 +88244,6 @@ in sources."semver-5.7.1" ]; }) - sources."noop-logger-0.1.1" sources."nopt-4.0.3" sources."normalize-path-3.0.0" sources."npm-bundled-1.1.2" @@ -88527,7 +88281,7 @@ in sources."pipe-functions-1.3.0" sources."pn-1.1.0" sources."pngjs-5.0.0" - sources."prebuild-install-6.1.2" + sources."prebuild-install-6.1.3" sources."prelude-ls-1.1.2" sources."process-nextick-args-2.0.1" sources."promise-7.3.1" @@ -88763,7 +88517,7 @@ in sources."brace-expansion-1.1.11" sources."commander-2.20.3" sources."concat-map-0.0.1" - sources."config-chain-1.1.12" + sources."config-chain-1.1.13" sources."editorconfig-0.15.3" sources."fs.realpath-1.0.0" sources."glob-7.1.7" @@ -88823,7 +88577,7 @@ in sha512 = "sxKt7h0vzCd+3Y81Ey2qinupL6DpRSZJclS04ugHDNmRUXGzqicMJ6iwayhSA0S0DwwX30c5ozyUthr1QKF6uw=="; }; dependencies = [ - sources."@babel/parser-7.14.4" + sources."@babel/parser-7.14.5" sources."argparse-1.0.10" sources."bluebird-3.7.2" sources."catharsis-0.9.0" @@ -88836,7 +88590,7 @@ in sources."lodash-4.17.21" sources."markdown-it-10.0.0" sources."markdown-it-anchor-5.3.0" - sources."marked-2.0.6" + sources."marked-2.0.7" sources."mdurl-1.0.1" sources."mkdirp-1.0.4" sources."requizzle-0.2.3" @@ -88986,8 +88740,8 @@ in sources."lodash-4.17.21" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."ms-2.1.3" sources."native-promise-only-0.8.1" sources."object-inspect-1.10.3" @@ -89129,7 +88883,7 @@ in sources."keyv-3.1.0" sources."latest-version-5.1.0" sources."lodash-4.17.21" - sources."lodash-id-0.14.0" + sources."lodash-id-0.14.1" sources."lowdb-1.0.0" sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" @@ -89147,8 +88901,8 @@ in }) sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-response-1.0.1" sources."minimist-1.2.5" (sources."morgan-1.10.0" // { @@ -89293,13 +89047,13 @@ in sha512 = "JbF3PiO1wNawJnOQlb4nJZ2rvDfDWnD7ROCdzqgFXhqi3XTNXBqjpoC7PT3ylfNR6BGibjchndH27VieqyMA0A=="; }; dependencies = [ - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.7" sources."@oclif/command-1.8.0" (sources."@oclif/config-1.17.0" // { dependencies = [ - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) sources."@oclif/errors-1.3.4" @@ -89356,7 +89110,7 @@ in dependencies = [ sources."has-flag-4.0.0" sources."supports-color-7.2.0" - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) sources."cli-width-3.0.0" @@ -89456,8 +89210,8 @@ in }) sources."merge2-1.4.1" sources."micromatch-4.0.4" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-2.1.0" sources."moment-2.29.1" sources."ms-2.1.2" @@ -89559,16 +89313,16 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "6.3.2"; + version = "6.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-6.3.2.tgz"; - sha512 = "fo4Wt0S99/8vylZMxNj4cBFyOBBnC1bewZ0QOlePij/2SZVWxqbyLeIddY13q6URa2EpLRW8ixvFRUMjkmo1bw=="; + url = "https://registry.npmjs.org/karma/-/karma-6.3.3.tgz"; + sha512 = "JRAujkKWaOtO2LmyPH7K2XXRhrxuFAn9loIL9+iiah6vjz+ZLkqdKsySV9clRITGhj10t9baIfbCl6CJ5hu9gQ=="; }; dependencies = [ sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.0" sources."@types/cors-2.8.10" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -89645,8 +89399,8 @@ in }) sources."media-typer-0.3.0" sources."mime-2.5.2" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."minimatch-3.0.4" sources."ms-2.0.0" sources."negotiator-0.6.2" @@ -89712,7 +89466,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Spectacular Test Runner for JavaScript."; - homepage = "http://karma-runner.github.io/"; + homepage = "https://karma-runner.github.io/"; license = "MIT"; }; production = true; @@ -89933,8 +89687,8 @@ in sources."mimic-fn-2.1.0" ]; }) - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -90179,8 +89933,8 @@ in sources."locate-path-5.0.0" sources."lodash-4.17.21" sources."log-symbols-2.2.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -90319,9 +90073,9 @@ in sha512 = "DD/i1znurfOmNJb0OBw66NmNqiM8kF6uIrzrJ0wGE3VNdzeOhz9ziWLYiRaZDGGwgbcjOo6eIfcx9O5Qynz+kg=="; }; dependencies = [ - sources."@babel/code-frame-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - (sources."@babel/highlight-7.14.0" // { + sources."@babel/code-frame-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -90378,6 +90132,7 @@ in }) (sources."@lerna/npm-dist-tag-4.0.0" // { dependencies = [ + sources."make-fetch-happen-8.0.14" sources."npm-registry-fetch-9.0.0" ]; }) @@ -90401,6 +90156,7 @@ in sources."@lerna/prompt-4.0.0" (sources."@lerna/publish-4.0.0" // { dependencies = [ + sources."make-fetch-happen-8.0.14" sources."npm-registry-fetch-9.0.0" ]; }) @@ -90421,9 +90177,9 @@ in sources."write-file-atomic-3.0.3" ]; }) - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.7" sources."@npmcli/ci-detect-1.3.0" sources."@npmcli/git-2.0.9" sources."@npmcli/installed-package-contents-1.0.7" @@ -90432,26 +90188,26 @@ in sources."@npmcli/promise-spawn-1.3.2" sources."@npmcli/run-script-1.8.5" sources."@octokit/auth-token-2.4.5" - sources."@octokit/core-3.4.0" - (sources."@octokit/endpoint-6.0.11" // { + sources."@octokit/core-3.5.0" + (sources."@octokit/endpoint-6.0.12" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) - sources."@octokit/graphql-4.6.2" - sources."@octokit/openapi-types-7.2.3" + sources."@octokit/graphql-4.6.4" + sources."@octokit/openapi-types-7.3.2" sources."@octokit/plugin-enterprise-rest-6.0.1" - sources."@octokit/plugin-paginate-rest-2.13.3" - sources."@octokit/plugin-request-log-1.0.3" + sources."@octokit/plugin-paginate-rest-2.13.5" + sources."@octokit/plugin-request-log-1.0.4" sources."@octokit/plugin-rest-endpoint-methods-5.3.1" - (sources."@octokit/request-5.4.15" // { + (sources."@octokit/request-5.6.0" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) - sources."@octokit/request-error-2.0.5" - sources."@octokit/rest-18.5.5" - sources."@octokit/types-6.16.2" + sources."@octokit/request-error-2.1.0" + sources."@octokit/rest-18.6.0" + sources."@octokit/types-6.16.4" sources."@tootallnate/once-1.1.2" sources."@types/minimatch-3.0.4" sources."@types/minimist-1.2.1" @@ -90493,7 +90249,7 @@ in sources."aws4-1.11.0" sources."balanced-match-1.0.2" sources."bcrypt-pbkdf-1.0.2" - sources."before-after-hook-2.2.1" + sources."before-after-hook-2.2.2" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."buffer-from-1.1.1" @@ -90534,7 +90290,7 @@ in }) sources."concat-map-0.0.1" sources."concat-stream-2.0.0" - sources."config-chain-1.1.12" + sources."config-chain-1.1.13" sources."console-control-strings-1.1.0" sources."conventional-changelog-angular-5.0.12" (sources."conventional-changelog-core-4.2.2" // { @@ -90591,7 +90347,7 @@ in sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" sources."eventemitter3-4.0.7" - sources."execa-5.0.1" + sources."execa-5.1.1" sources."extend-3.0.2" (sources."external-editor-3.1.0" // { dependencies = [ @@ -90756,8 +90512,8 @@ in sources."jsonparse-1.3.1" sources."jsprim-1.4.1" sources."kind-of-6.0.3" - sources."libnpmaccess-4.0.2" - (sources."libnpmpublish-4.0.1" // { + sources."libnpmaccess-4.0.3" + (sources."libnpmpublish-4.0.2" // { dependencies = [ sources."normalize-package-data-3.0.2" ]; @@ -90781,7 +90537,7 @@ in sources."semver-5.7.1" ]; }) - sources."make-fetch-happen-8.0.14" + sources."make-fetch-happen-9.0.2" sources."map-obj-4.2.1" (sources."meow-8.1.2" // { dependencies = [ @@ -90805,8 +90561,8 @@ in sources."merge-stream-2.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.4" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-2.1.0" sources."min-indent-1.0.1" sources."minimatch-3.0.4" @@ -90830,6 +90586,7 @@ in sources."ms-2.1.2" sources."multimatch-5.0.0" sources."mute-stream-0.0.8" + sources."negotiator-0.6.2" sources."neo-async-2.6.2" sources."node-fetch-2.6.1" sources."node-gyp-7.1.2" @@ -90840,7 +90597,7 @@ in sources."semver-5.7.1" ]; }) - sources."normalize-url-3.3.0" + sources."normalize-url-6.0.1" sources."npm-bundled-1.1.2" sources."npm-install-checks-4.0.0" (sources."npm-lifecycle-3.1.5" // { @@ -90861,10 +90618,10 @@ in ]; }) sources."npm-normalize-package-bin-1.0.1" - sources."npm-package-arg-8.1.2" + sources."npm-package-arg-8.1.4" sources."npm-packlist-2.2.2" sources."npm-pick-manifest-6.1.1" - sources."npm-registry-fetch-10.1.2" + sources."npm-registry-fetch-11.0.0" sources."npm-run-path-4.0.1" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" @@ -90890,7 +90647,7 @@ in sources."p-timeout-3.2.0" sources."p-try-2.2.0" sources."p-waterfall-2.1.1" - sources."pacote-11.3.3" + sources."pacote-11.3.4" sources."parent-module-1.0.1" sources."parse-github-repo-url-1.4.1" sources."parse-json-5.2.0" @@ -90899,7 +90656,7 @@ in sources."qs-6.10.1" ]; }) - sources."parse-url-5.0.2" + sources."parse-url-5.0.3" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" @@ -91030,7 +90787,7 @@ in sources."type-fest-0.4.1" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" - sources."uglify-js-3.13.8" + sources."uglify-js-3.13.9" sources."uid-number-0.0.6" sources."umask-1.1.0" sources."unbox-primitive-1.0.1" @@ -91048,7 +90805,7 @@ in sources."verror-1.10.0" sources."wcwidth-1.0.1" sources."webidl-conversions-6.1.0" - sources."whatwg-url-8.5.0" + sources."whatwg-url-8.6.0" sources."which-2.0.2" sources."which-boxed-primitive-1.0.2" (sources."wide-align-1.1.3" // { @@ -91326,8 +91083,8 @@ in sources."map-visit-1.0.0" sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mixin-deep-1.3.2" sources."morgan-1.10.0" sources."ms-2.0.0" @@ -91723,8 +91480,8 @@ in sources."methods-1.1.2" sources."micromatch-2.3.11" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."minimist-1.2.5" (sources."mixin-deep-1.3.2" // { dependencies = [ @@ -91997,61 +91754,61 @@ in version = "1.10.1"; src = ../interpreters/clojurescript/lumo; dependencies = [ - sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.14.4" - sources."@babel/core-7.14.3" - sources."@babel/generator-7.14.3" - sources."@babel/helper-annotate-as-pure-7.12.13" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" - sources."@babel/helper-compilation-targets-7.14.4" - sources."@babel/helper-create-class-features-plugin-7.14.4" - sources."@babel/helper-create-regexp-features-plugin-7.14.3" + sources."@babel/code-frame-7.14.5" + sources."@babel/compat-data-7.14.5" + sources."@babel/core-7.14.5" + sources."@babel/generator-7.14.5" + sources."@babel/helper-annotate-as-pure-7.14.5" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" + sources."@babel/helper-compilation-targets-7.14.5" + sources."@babel/helper-create-class-features-plugin-7.14.5" + sources."@babel/helper-create-regexp-features-plugin-7.14.5" sources."@babel/helper-define-polyfill-provider-0.2.3" - sources."@babel/helper-explode-assignable-expression-7.13.0" - sources."@babel/helper-function-name-7.14.2" - sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-hoist-variables-7.13.16" - sources."@babel/helper-member-expression-to-functions-7.13.12" - sources."@babel/helper-module-imports-7.13.12" - sources."@babel/helper-module-transforms-7.14.2" - sources."@babel/helper-optimise-call-expression-7.12.13" - sources."@babel/helper-plugin-utils-7.13.0" - sources."@babel/helper-remap-async-to-generator-7.13.0" - sources."@babel/helper-replace-supers-7.14.4" - sources."@babel/helper-simple-access-7.13.12" - sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" - sources."@babel/helper-split-export-declaration-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - sources."@babel/helper-validator-option-7.12.17" - sources."@babel/helper-wrap-function-7.13.0" - sources."@babel/helpers-7.14.0" - (sources."@babel/highlight-7.14.0" // { + sources."@babel/helper-explode-assignable-expression-7.14.5" + sources."@babel/helper-function-name-7.14.5" + sources."@babel/helper-get-function-arity-7.14.5" + sources."@babel/helper-hoist-variables-7.14.5" + sources."@babel/helper-member-expression-to-functions-7.14.5" + sources."@babel/helper-module-imports-7.14.5" + sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-optimise-call-expression-7.14.5" + sources."@babel/helper-plugin-utils-7.14.5" + sources."@babel/helper-remap-async-to-generator-7.14.5" + sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" + sources."@babel/helper-split-export-declaration-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-option-7.14.5" + sources."@babel/helper-wrap-function-7.14.5" + sources."@babel/helpers-7.14.5" + (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.4" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12" + sources."@babel/parser-7.14.5" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" sources."@babel/plugin-external-helpers-7.8.3" - sources."@babel/plugin-proposal-async-generator-functions-7.14.2" - sources."@babel/plugin-proposal-class-properties-7.13.0" - sources."@babel/plugin-proposal-class-static-block-7.14.3" - sources."@babel/plugin-proposal-dynamic-import-7.14.2" - sources."@babel/plugin-proposal-export-namespace-from-7.14.2" - sources."@babel/plugin-proposal-json-strings-7.14.2" - sources."@babel/plugin-proposal-logical-assignment-operators-7.14.2" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.2" - sources."@babel/plugin-proposal-numeric-separator-7.14.2" - sources."@babel/plugin-proposal-object-rest-spread-7.14.4" - sources."@babel/plugin-proposal-optional-catch-binding-7.14.2" - sources."@babel/plugin-proposal-optional-chaining-7.14.2" - sources."@babel/plugin-proposal-private-methods-7.13.0" - sources."@babel/plugin-proposal-private-property-in-object-7.14.0" - sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" + sources."@babel/plugin-proposal-async-generator-functions-7.14.5" + sources."@babel/plugin-proposal-class-properties-7.14.5" + sources."@babel/plugin-proposal-class-static-block-7.14.5" + sources."@babel/plugin-proposal-dynamic-import-7.14.5" + sources."@babel/plugin-proposal-export-namespace-from-7.14.5" + sources."@babel/plugin-proposal-json-strings-7.14.5" + sources."@babel/plugin-proposal-logical-assignment-operators-7.14.5" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" + sources."@babel/plugin-proposal-numeric-separator-7.14.5" + sources."@babel/plugin-proposal-object-rest-spread-7.14.5" + sources."@babel/plugin-proposal-optional-catch-binding-7.14.5" + sources."@babel/plugin-proposal-optional-chaining-7.14.5" + sources."@babel/plugin-proposal-private-methods-7.14.5" + sources."@babel/plugin-proposal-private-property-in-object-7.14.5" + sources."@babel/plugin-proposal-unicode-property-regex-7.14.5" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-bigint-7.8.3" sources."@babel/plugin-syntax-class-properties-7.12.13" - sources."@babel/plugin-syntax-class-static-block-7.12.13" + sources."@babel/plugin-syntax-class-static-block-7.14.5" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" sources."@babel/plugin-syntax-import-meta-7.10.4" @@ -92062,48 +91819,48 @@ in sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-private-property-in-object-7.14.0" - sources."@babel/plugin-syntax-top-level-await-7.12.13" - sources."@babel/plugin-transform-arrow-functions-7.13.0" - sources."@babel/plugin-transform-async-to-generator-7.13.0" - sources."@babel/plugin-transform-block-scoped-functions-7.12.13" - sources."@babel/plugin-transform-block-scoping-7.14.4" - sources."@babel/plugin-transform-classes-7.14.4" - sources."@babel/plugin-transform-computed-properties-7.13.0" - sources."@babel/plugin-transform-destructuring-7.14.4" - sources."@babel/plugin-transform-dotall-regex-7.12.13" - sources."@babel/plugin-transform-duplicate-keys-7.12.13" - sources."@babel/plugin-transform-exponentiation-operator-7.12.13" - sources."@babel/plugin-transform-for-of-7.13.0" - sources."@babel/plugin-transform-function-name-7.12.13" - sources."@babel/plugin-transform-literals-7.12.13" - sources."@babel/plugin-transform-member-expression-literals-7.12.13" - sources."@babel/plugin-transform-modules-amd-7.14.2" - sources."@babel/plugin-transform-modules-commonjs-7.14.0" - sources."@babel/plugin-transform-modules-systemjs-7.13.8" - sources."@babel/plugin-transform-modules-umd-7.14.0" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.13" - sources."@babel/plugin-transform-new-target-7.12.13" - sources."@babel/plugin-transform-object-super-7.12.13" - sources."@babel/plugin-transform-parameters-7.14.2" - sources."@babel/plugin-transform-property-literals-7.12.13" - sources."@babel/plugin-transform-regenerator-7.13.15" - sources."@babel/plugin-transform-reserved-words-7.12.13" - sources."@babel/plugin-transform-runtime-7.14.3" - sources."@babel/plugin-transform-shorthand-properties-7.12.13" - sources."@babel/plugin-transform-spread-7.13.0" - sources."@babel/plugin-transform-sticky-regex-7.12.13" - sources."@babel/plugin-transform-template-literals-7.13.0" - sources."@babel/plugin-transform-typeof-symbol-7.12.13" - sources."@babel/plugin-transform-unicode-escapes-7.12.13" - sources."@babel/plugin-transform-unicode-regex-7.12.13" - sources."@babel/preset-env-7.14.4" + sources."@babel/plugin-syntax-private-property-in-object-7.14.5" + sources."@babel/plugin-syntax-top-level-await-7.14.5" + sources."@babel/plugin-transform-arrow-functions-7.14.5" + sources."@babel/plugin-transform-async-to-generator-7.14.5" + sources."@babel/plugin-transform-block-scoped-functions-7.14.5" + sources."@babel/plugin-transform-block-scoping-7.14.5" + sources."@babel/plugin-transform-classes-7.14.5" + sources."@babel/plugin-transform-computed-properties-7.14.5" + sources."@babel/plugin-transform-destructuring-7.14.5" + sources."@babel/plugin-transform-dotall-regex-7.14.5" + sources."@babel/plugin-transform-duplicate-keys-7.14.5" + sources."@babel/plugin-transform-exponentiation-operator-7.14.5" + sources."@babel/plugin-transform-for-of-7.14.5" + sources."@babel/plugin-transform-function-name-7.14.5" + sources."@babel/plugin-transform-literals-7.14.5" + sources."@babel/plugin-transform-member-expression-literals-7.14.5" + sources."@babel/plugin-transform-modules-amd-7.14.5" + sources."@babel/plugin-transform-modules-commonjs-7.14.5" + sources."@babel/plugin-transform-modules-systemjs-7.14.5" + sources."@babel/plugin-transform-modules-umd-7.14.5" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.5" + sources."@babel/plugin-transform-new-target-7.14.5" + sources."@babel/plugin-transform-object-super-7.14.5" + sources."@babel/plugin-transform-parameters-7.14.5" + sources."@babel/plugin-transform-property-literals-7.14.5" + sources."@babel/plugin-transform-regenerator-7.14.5" + sources."@babel/plugin-transform-reserved-words-7.14.5" + sources."@babel/plugin-transform-runtime-7.14.5" + sources."@babel/plugin-transform-shorthand-properties-7.14.5" + sources."@babel/plugin-transform-spread-7.14.5" + sources."@babel/plugin-transform-sticky-regex-7.14.5" + sources."@babel/plugin-transform-template-literals-7.14.5" + sources."@babel/plugin-transform-typeof-symbol-7.14.5" + sources."@babel/plugin-transform-unicode-escapes-7.14.5" + sources."@babel/plugin-transform-unicode-regex-7.14.5" + sources."@babel/preset-env-7.14.5" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-stage-2-7.8.3" - sources."@babel/runtime-7.14.0" - sources."@babel/template-7.12.13" - sources."@babel/traverse-7.14.2" - sources."@babel/types-7.14.4" + sources."@babel/runtime-7.14.5" + sources."@babel/template-7.14.5" + sources."@babel/traverse-7.14.5" + sources."@babel/types-7.14.5" sources."@cnakazawa/watch-1.0.4" sources."@comandeer/babel-plugin-banner-5.0.0" sources."@istanbuljs/load-nyc-config-1.1.0" @@ -92118,13 +91875,13 @@ in sources."@types/babel__generator-7.6.2" sources."@types/babel__template-7.4.0" sources."@types/babel__traverse-7.11.1" - sources."@types/estree-0.0.47" + sources."@types/estree-0.0.48" sources."@types/graceful-fs-4.1.5" sources."@types/istanbul-lib-coverage-2.0.3" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.7" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.13" @@ -92297,7 +92054,7 @@ in sources."cached-path-relative-1.0.2" sources."call-bind-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001232" + sources."caniuse-lite-1.0.30001237" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -92369,7 +92126,7 @@ in }) sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.13.1" // { + (sources."core-js-compat-3.14.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -92421,7 +92178,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.743" + sources."electron-to-chromium-1.3.752" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -92683,8 +92440,8 @@ in sources."bn.js-4.12.0" ]; }) - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" @@ -92724,7 +92481,7 @@ in ]; }) sources."node-modules-regexp-1.0.0" - sources."node-releases-1.1.72" + sources."node-releases-1.1.73" (sources."normalize-package-data-2.5.0" // { dependencies = [ sources."semver-5.7.1" @@ -93276,9 +93033,9 @@ in sources."link-check-4.5.4" sources."lodash-4.17.21" sources."markdown-link-extractor-1.3.0" - sources."marked-2.0.6" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."marked-2.0.7" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."ms-2.1.3" sources."oauth-sign-0.9.0" sources."performance-now-2.1.0" @@ -93497,8 +93254,8 @@ in sources."lodash.templatesettings-3.1.1" sources."mastodon-api-1.3.0" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -93661,14 +93418,14 @@ in "@mermaid-js/mermaid-cli" = nodeEnv.buildNodePackage { name = "_at_mermaid-js_slash_mermaid-cli"; packageName = "@mermaid-js/mermaid-cli"; - version = "8.10.1"; + version = "8.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-8.10.1.tgz"; - sha512 = "X2wIJwN22Hwh5zkpGteKg31K+wYCO8W5NUsQYlnSWyv8RpHoZfK7+kDVRzvHvVqnizTM3D+KgSnONvh+Z0EB6g=="; + url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-8.10.2.tgz"; + sha512 = "aoGVAZC/goUc6iWYef5aRjCwITojjWvlEj+qPHCEbAGisR4md3fi3+3iDD3ra+zhagfXJZ1Qyo5+3lVkJPaC6Q=="; }; dependencies = [ sources."@braintree/sanitize-url-3.1.0" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."@types/yauzl-2.9.1" sources."agent-base-6.0.2" sources."ansi-styles-4.3.0" @@ -93685,7 +93442,7 @@ in sources."clean-css-4.2.3" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."commander-6.2.1" + sources."commander-7.2.0" sources."concat-map-0.0.1" sources."css-b64-images-0.2.5" sources."d3-5.16.0" @@ -93726,8 +93483,8 @@ in sources."d3-zoom-1.8.3" sources."dagre-0.8.5" sources."dagre-d3-0.6.4" - sources."debug-4.3.2" - sources."devtools-protocol-0.0.869402" + sources."debug-4.3.1" + sources."devtools-protocol-0.0.883894" sources."end-of-stream-1.4.4" sources."entity-decode-2.0.2" sources."extract-zip-2.0.1" @@ -93754,10 +93511,11 @@ in sources."locate-path-5.0.0" sources."lodash-4.17.21" sources."lower-case-1.1.4" - sources."mermaid-8.10.1" + sources."mermaid-8.10.2" sources."minify-4.1.3" sources."minimatch-3.0.4" - sources."mkdirp-classic-0.5.3" + sources."minimist-1.2.5" + sources."mkdirp-0.5.5" sources."moment-mini-2.24.0" sources."ms-2.1.2" sources."no-case-2.3.2" @@ -93771,10 +93529,10 @@ in sources."path-is-absolute-1.0.1" sources."pend-1.2.0" sources."pkg-dir-4.2.0" - sources."progress-2.0.3" + sources."progress-2.0.1" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - sources."puppeteer-9.1.1" + sources."puppeteer-10.0.0" sources."readable-stream-3.6.0" sources."relateurl-0.2.7" sources."rimraf-3.0.2" @@ -93786,7 +93544,7 @@ in sources."string_decoder-1.3.0" sources."stylis-3.5.4" sources."supports-color-7.2.0" - sources."tar-fs-2.1.1" + sources."tar-fs-2.0.0" sources."tar-stream-2.2.0" (sources."terser-4.8.0" // { dependencies = [ @@ -93796,8 +93554,8 @@ in sources."through-2.3.8" sources."try-catch-2.0.1" sources."try-to-catch-1.1.1" - sources."uglify-js-3.13.8" - sources."unbzip2-stream-1.4.3" + sources."uglify-js-3.13.9" + sources."unbzip2-stream-1.3.3" sources."upper-case-1.1.3" sources."util-deprecate-1.0.2" sources."wrappy-1.0.2" @@ -93826,11 +93584,11 @@ in sources."@fluentui/date-time-utilities-7.9.1" sources."@fluentui/dom-utilities-1.1.2" sources."@fluentui/keyboard-key-0.2.17" - sources."@fluentui/react-7.170.1" + sources."@fluentui/react-7.170.3" sources."@fluentui/react-focus-7.17.6" sources."@fluentui/react-window-provider-1.0.2" sources."@fluentui/theme-1.7.4" - sources."@microsoft/load-themed-styles-1.10.174" + sources."@microsoft/load-themed-styles-1.10.181" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@uifabric/foundation-7.9.26" @@ -93948,8 +93706,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -93966,7 +93724,7 @@ in sources."node-fetch-1.6.3" sources."normalize-url-4.5.1" sources."object-assign-4.1.1" - sources."office-ui-fabric-react-7.170.1" + sources."office-ui-fabric-react-7.170.3" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -94057,7 +93815,7 @@ in sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" sources."swagger-schema-official-2.0.0-bab6bed" - sources."swagger-ui-dist-3.49.0" + sources."swagger-ui-dist-3.50.0" sources."tail-2.2.2" sources."through-2.3.8" sources."tmp-0.0.33" @@ -94089,10 +93847,10 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "8.4.0"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-8.4.0.tgz"; - sha512 = "hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ=="; + url = "https://registry.npmjs.org/mocha/-/mocha-9.0.0.tgz"; + sha512 = "GRGG/q9bIaUkHJB9NL+KZNjDhMBHB30zW3bZW9qOiYr+QChyLjPzswaxFWkI1q6lGlSL28EQYzAi2vKWNkPx+g=="; }; dependencies = [ sources."@ungap/promise-all-settled-1.1.2" @@ -94140,7 +93898,7 @@ in sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."get-caller-file-2.0.5" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."glob-parent-5.1.2" sources."growl-1.10.5" sources."has-flag-4.0.0" @@ -94153,13 +93911,14 @@ in sources."is-glob-4.0.1" sources."is-number-7.0.0" sources."is-plain-obj-2.1.0" + sources."is-unicode-supported-0.1.0" sources."isexe-2.0.0" - sources."js-yaml-4.0.0" + sources."js-yaml-4.1.0" sources."locate-path-6.0.0" - sources."log-symbols-4.0.0" + sources."log-symbols-4.1.0" sources."minimatch-3.0.4" sources."ms-2.1.3" - sources."nanoid-3.1.20" + sources."nanoid-3.1.23" sources."normalize-path-3.0.0" sources."once-1.4.0" sources."p-limit-3.1.0" @@ -94179,7 +93938,7 @@ in sources."to-regex-range-5.0.1" sources."which-2.0.2" sources."wide-align-1.1.3" - sources."workerpool-6.1.0" + sources."workerpool-6.1.4" (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."ansi-regex-5.0.0" @@ -94251,8 +94010,8 @@ in sources."lodash-4.17.21" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."ms-2.1.3" sources."native-promise-only-0.8.1" sources."object-inspect-1.10.3" @@ -94342,53 +94101,53 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "3.32.6"; + version = "3.37.16"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-3.32.6.tgz"; - sha512 = "VG2b3SJHbAIVErZvaeD0cU496GnuHpBqUYJiMrtEJ3eaPSQGc6HHZz9/P0Zbl7S67jaOk/wANOfcSxtbmPEORQ=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-3.37.16.tgz"; + sha512 = "xbLV6yOhclcDmpf09mGo0jR4LOtRcOc4j+3mwk9wUYT3cav4VFIDVvKo1EuNxcINvN3CBQ+8d1Ui1+alS9nMrg=="; }; dependencies = [ - sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.14.4" - (sources."@babel/core-7.14.3" // { + sources."@babel/code-frame-7.14.5" + sources."@babel/compat-data-7.14.5" + (sources."@babel/core-7.14.5" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.14.3" - sources."@babel/helper-annotate-as-pure-7.12.13" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" - (sources."@babel/helper-compilation-targets-7.14.4" // { + sources."@babel/generator-7.14.5" + sources."@babel/helper-annotate-as-pure-7.14.5" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" + (sources."@babel/helper-compilation-targets-7.14.5" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.14.4" - sources."@babel/helper-create-regexp-features-plugin-7.14.3" + sources."@babel/helper-create-class-features-plugin-7.14.5" + sources."@babel/helper-create-regexp-features-plugin-7.14.5" (sources."@babel/helper-define-polyfill-provider-0.2.3" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-explode-assignable-expression-7.13.0" - sources."@babel/helper-function-name-7.14.2" - sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-hoist-variables-7.13.16" - sources."@babel/helper-member-expression-to-functions-7.13.12" - sources."@babel/helper-module-imports-7.13.12" - sources."@babel/helper-module-transforms-7.14.2" - sources."@babel/helper-optimise-call-expression-7.12.13" - sources."@babel/helper-plugin-utils-7.13.0" - sources."@babel/helper-remap-async-to-generator-7.13.0" - sources."@babel/helper-replace-supers-7.14.4" - sources."@babel/helper-simple-access-7.13.12" - sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" - sources."@babel/helper-split-export-declaration-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - sources."@babel/helper-validator-option-7.12.17" - sources."@babel/helper-wrap-function-7.13.0" - sources."@babel/helpers-7.14.0" - (sources."@babel/highlight-7.14.0" // { + sources."@babel/helper-explode-assignable-expression-7.14.5" + sources."@babel/helper-function-name-7.14.5" + sources."@babel/helper-get-function-arity-7.14.5" + sources."@babel/helper-hoist-variables-7.14.5" + sources."@babel/helper-member-expression-to-functions-7.14.5" + sources."@babel/helper-module-imports-7.14.5" + sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-optimise-call-expression-7.14.5" + sources."@babel/helper-plugin-utils-7.14.5" + sources."@babel/helper-remap-async-to-generator-7.14.5" + sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" + sources."@babel/helper-split-export-declaration-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-option-7.14.5" + sources."@babel/helper-wrap-function-7.14.5" + sources."@babel/helpers-7.14.5" + (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -94397,26 +94156,26 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/parser-7.14.4" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12" - sources."@babel/plugin-proposal-async-generator-functions-7.14.2" - sources."@babel/plugin-proposal-class-properties-7.13.0" - sources."@babel/plugin-proposal-class-static-block-7.14.3" - sources."@babel/plugin-proposal-dynamic-import-7.14.2" - sources."@babel/plugin-proposal-export-namespace-from-7.14.2" - sources."@babel/plugin-proposal-json-strings-7.14.2" - sources."@babel/plugin-proposal-logical-assignment-operators-7.14.2" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.2" - sources."@babel/plugin-proposal-numeric-separator-7.14.2" - sources."@babel/plugin-proposal-object-rest-spread-7.14.4" - sources."@babel/plugin-proposal-optional-catch-binding-7.14.2" - sources."@babel/plugin-proposal-optional-chaining-7.14.2" - sources."@babel/plugin-proposal-private-methods-7.13.0" - sources."@babel/plugin-proposal-private-property-in-object-7.14.0" - sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" + sources."@babel/parser-7.14.5" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" + sources."@babel/plugin-proposal-async-generator-functions-7.14.5" + sources."@babel/plugin-proposal-class-properties-7.14.5" + sources."@babel/plugin-proposal-class-static-block-7.14.5" + sources."@babel/plugin-proposal-dynamic-import-7.14.5" + sources."@babel/plugin-proposal-export-namespace-from-7.14.5" + sources."@babel/plugin-proposal-json-strings-7.14.5" + sources."@babel/plugin-proposal-logical-assignment-operators-7.14.5" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" + sources."@babel/plugin-proposal-numeric-separator-7.14.5" + sources."@babel/plugin-proposal-object-rest-spread-7.14.5" + sources."@babel/plugin-proposal-optional-catch-binding-7.14.5" + sources."@babel/plugin-proposal-optional-chaining-7.14.5" + sources."@babel/plugin-proposal-private-methods-7.14.5" + sources."@babel/plugin-proposal-private-property-in-object-7.14.5" + sources."@babel/plugin-proposal-unicode-property-regex-7.14.5" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-class-properties-7.12.13" - sources."@babel/plugin-syntax-class-static-block-7.12.13" + sources."@babel/plugin-syntax-class-static-block-7.14.5" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" sources."@babel/plugin-syntax-json-strings-7.8.3" @@ -94426,50 +94185,50 @@ in sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-private-property-in-object-7.14.0" - sources."@babel/plugin-syntax-top-level-await-7.12.13" - sources."@babel/plugin-transform-arrow-functions-7.13.0" - sources."@babel/plugin-transform-async-to-generator-7.13.0" - sources."@babel/plugin-transform-block-scoped-functions-7.12.13" - sources."@babel/plugin-transform-block-scoping-7.14.4" - sources."@babel/plugin-transform-classes-7.14.4" - sources."@babel/plugin-transform-computed-properties-7.13.0" - sources."@babel/plugin-transform-destructuring-7.14.4" - sources."@babel/plugin-transform-dotall-regex-7.12.13" - sources."@babel/plugin-transform-duplicate-keys-7.12.13" - sources."@babel/plugin-transform-exponentiation-operator-7.12.13" - sources."@babel/plugin-transform-for-of-7.13.0" - sources."@babel/plugin-transform-function-name-7.12.13" - sources."@babel/plugin-transform-literals-7.12.13" - sources."@babel/plugin-transform-member-expression-literals-7.12.13" - sources."@babel/plugin-transform-modules-amd-7.14.2" - sources."@babel/plugin-transform-modules-commonjs-7.14.0" - sources."@babel/plugin-transform-modules-systemjs-7.13.8" - sources."@babel/plugin-transform-modules-umd-7.14.0" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.13" - sources."@babel/plugin-transform-new-target-7.12.13" - sources."@babel/plugin-transform-object-super-7.12.13" - sources."@babel/plugin-transform-parameters-7.14.2" - sources."@babel/plugin-transform-property-literals-7.12.13" - sources."@babel/plugin-transform-regenerator-7.13.15" - sources."@babel/plugin-transform-reserved-words-7.12.13" - sources."@babel/plugin-transform-shorthand-properties-7.12.13" - sources."@babel/plugin-transform-spread-7.13.0" - sources."@babel/plugin-transform-sticky-regex-7.12.13" - sources."@babel/plugin-transform-template-literals-7.13.0" - sources."@babel/plugin-transform-typeof-symbol-7.12.13" - sources."@babel/plugin-transform-unicode-escapes-7.12.13" - sources."@babel/plugin-transform-unicode-regex-7.12.13" - (sources."@babel/preset-env-7.14.4" // { + sources."@babel/plugin-syntax-private-property-in-object-7.14.5" + sources."@babel/plugin-syntax-top-level-await-7.14.5" + sources."@babel/plugin-transform-arrow-functions-7.14.5" + sources."@babel/plugin-transform-async-to-generator-7.14.5" + sources."@babel/plugin-transform-block-scoped-functions-7.14.5" + sources."@babel/plugin-transform-block-scoping-7.14.5" + sources."@babel/plugin-transform-classes-7.14.5" + sources."@babel/plugin-transform-computed-properties-7.14.5" + sources."@babel/plugin-transform-destructuring-7.14.5" + sources."@babel/plugin-transform-dotall-regex-7.14.5" + sources."@babel/plugin-transform-duplicate-keys-7.14.5" + sources."@babel/plugin-transform-exponentiation-operator-7.14.5" + sources."@babel/plugin-transform-for-of-7.14.5" + sources."@babel/plugin-transform-function-name-7.14.5" + sources."@babel/plugin-transform-literals-7.14.5" + sources."@babel/plugin-transform-member-expression-literals-7.14.5" + sources."@babel/plugin-transform-modules-amd-7.14.5" + sources."@babel/plugin-transform-modules-commonjs-7.14.5" + sources."@babel/plugin-transform-modules-systemjs-7.14.5" + sources."@babel/plugin-transform-modules-umd-7.14.5" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.5" + sources."@babel/plugin-transform-new-target-7.14.5" + sources."@babel/plugin-transform-object-super-7.14.5" + sources."@babel/plugin-transform-parameters-7.14.5" + sources."@babel/plugin-transform-property-literals-7.14.5" + sources."@babel/plugin-transform-regenerator-7.14.5" + sources."@babel/plugin-transform-reserved-words-7.14.5" + sources."@babel/plugin-transform-shorthand-properties-7.14.5" + sources."@babel/plugin-transform-spread-7.14.5" + sources."@babel/plugin-transform-sticky-regex-7.14.5" + sources."@babel/plugin-transform-template-literals-7.14.5" + sources."@babel/plugin-transform-typeof-symbol-7.14.5" + sources."@babel/plugin-transform-unicode-escapes-7.14.5" + sources."@babel/plugin-transform-unicode-regex-7.14.5" + (sources."@babel/preset-env-7.14.5" // { dependencies = [ sources."semver-6.3.0" ]; }) sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.14.0" - sources."@babel/template-7.12.13" - sources."@babel/traverse-7.14.2" - sources."@babel/types-7.14.4" + sources."@babel/runtime-7.14.5" + sources."@babel/template-7.14.5" + sources."@babel/traverse-7.14.5" + sources."@babel/types-7.14.5" sources."@bugsnag/browser-7.10.1" sources."@bugsnag/core-7.10.0" sources."@bugsnag/cuid-3.0.0" @@ -94479,7 +94238,7 @@ in sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-11.29.2" // { + (sources."@netlify/build-12.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-3.0.0" @@ -94493,10 +94252,13 @@ in }) (sources."@netlify/cache-utils-1.0.7" // { dependencies = [ + sources."del-5.1.0" sources."locate-path-5.0.0" + sources."p-map-3.0.0" + sources."slash-3.0.0" ]; }) - (sources."@netlify/config-6.7.1" // { + (sources."@netlify/config-7.2.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-3.0.0" @@ -94506,13 +94268,22 @@ in sources."locate-path-5.0.0" ]; }) - (sources."@netlify/framework-info-5.1.2" // { + sources."@netlify/esbuild-0.13.5" + (sources."@netlify/framework-info-5.1.4" // { dependencies = [ sources."p-limit-3.1.0" sources."p-locate-5.0.0" ]; }) - sources."@netlify/functions-utils-1.3.37" + (sources."@netlify/functions-utils-1.3.40" // { + dependencies = [ + sources."@netlify/zip-it-and-ship-it-4.3.0" + sources."cp-file-9.0.0" + sources."pkg-dir-5.0.0" + sources."resolve-2.0.0-next.3" + sources."yargs-16.2.0" + ]; + }) (sources."@netlify/git-utils-1.0.11" // { dependencies = [ sources."braces-3.0.2" @@ -94523,68 +94294,35 @@ in sources."to-regex-range-5.0.1" ]; }) - sources."@netlify/open-api-2.4.0" - (sources."@netlify/plugin-edge-handlers-1.11.13" // { + sources."@netlify/open-api-2.5.0" + (sources."@netlify/plugin-edge-handlers-1.11.16" // { dependencies = [ - sources."@nodelib/fs.stat-2.0.4" - sources."@types/node-14.17.1" - sources."array-union-2.1.0" - sources."braces-3.0.2" - sources."del-6.0.0" - sources."dir-glob-3.0.1" - sources."fast-glob-3.2.5" - sources."fill-range-7.0.1" - sources."glob-parent-5.1.2" - sources."globby-11.0.3" - sources."ignore-5.1.8" - sources."is-number-7.0.0" - sources."micromatch-4.0.4" - sources."slash-3.0.0" - sources."to-regex-range-5.0.1" + sources."@types/node-14.17.3" + sources."typescript-4.3.2" ]; }) - sources."@netlify/plugins-list-2.14.2" + sources."@netlify/plugins-list-2.15.0" + sources."@netlify/routing-local-proxy-0.30.0" (sources."@netlify/run-utils-1.0.7" // { dependencies = [ sources."execa-3.4.0" ]; }) - sources."@netlify/traffic-mesh-agent-0.27.10" - sources."@netlify/traffic-mesh-agent-darwin-x64-0.27.10" - sources."@netlify/traffic-mesh-agent-linux-x64-0.27.10" - sources."@netlify/traffic-mesh-agent-win32-x64-0.27.10" - (sources."@netlify/zip-it-and-ship-it-4.2.5" // { + (sources."@netlify/zip-it-and-ship-it-4.2.7" // { dependencies = [ - sources."@nodelib/fs.stat-2.0.4" - sources."array-union-2.1.0" - sources."braces-3.0.2" - sources."cliui-7.0.4" sources."cp-file-9.0.0" - sources."del-6.0.0" - sources."dir-glob-3.0.1" - sources."fast-glob-3.2.5" - sources."fill-range-7.0.1" - sources."glob-parent-5.1.2" - sources."globby-11.0.3" - sources."ignore-5.1.8" - sources."is-number-7.0.0" - sources."micromatch-4.0.4" sources."pkg-dir-5.0.0" sources."resolve-2.0.0-next.3" - sources."slash-3.0.0" - sources."to-regex-range-5.0.1" - sources."y18n-5.0.8" sources."yargs-16.2.0" - sources."yargs-parser-20.2.7" ]; }) - (sources."@nodelib/fs.scandir-2.1.4" // { + (sources."@nodelib/fs.scandir-2.1.5" // { dependencies = [ - sources."@nodelib/fs.stat-2.0.4" + sources."@nodelib/fs.stat-2.0.5" ]; }) sources."@nodelib/fs.stat-1.1.3" - sources."@nodelib/fs.walk-1.2.6" + sources."@nodelib/fs.walk-1.2.7" (sources."@oclif/color-0.1.2" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -94610,7 +94348,7 @@ in sources."@oclif/command-1.8.0" (sources."@oclif/config-1.17.0" // { dependencies = [ - sources."@nodelib/fs.stat-2.0.4" + sources."@nodelib/fs.stat-2.0.5" sources."array-union-2.1.0" sources."braces-3.0.2" sources."dir-glob-3.0.1" @@ -94623,7 +94361,7 @@ in sources."micromatch-4.0.4" sources."slash-3.0.0" sources."to-regex-range-5.0.1" - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) (sources."@oclif/errors-1.3.4" // { @@ -94677,31 +94415,31 @@ in dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" - sources."tslib-2.2.0" + sources."tslib-2.3.0" sources."universalify-2.0.0" ]; }) sources."@oclif/screen-1.0.4" sources."@octokit/auth-token-2.4.5" - sources."@octokit/core-3.4.0" - (sources."@octokit/endpoint-6.0.11" // { + sources."@octokit/core-3.5.0" + (sources."@octokit/endpoint-6.0.12" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) - sources."@octokit/graphql-4.6.2" - sources."@octokit/openapi-types-7.2.3" - sources."@octokit/plugin-paginate-rest-2.13.3" - sources."@octokit/plugin-request-log-1.0.3" + sources."@octokit/graphql-4.6.4" + sources."@octokit/openapi-types-7.3.2" + sources."@octokit/plugin-paginate-rest-2.13.5" + sources."@octokit/plugin-request-log-1.0.4" sources."@octokit/plugin-rest-endpoint-methods-5.3.1" - (sources."@octokit/request-5.4.15" // { + (sources."@octokit/request-5.6.0" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) - sources."@octokit/request-error-2.0.5" - sources."@octokit/rest-18.5.5" - sources."@octokit/types-6.16.2" + sources."@octokit/request-error-2.1.0" + sources."@octokit/rest-18.6.0" + sources."@octokit/types-6.16.4" sources."@rollup/plugin-babel-5.3.0" (sources."@rollup/plugin-commonjs-18.1.0" // { dependencies = [ @@ -94739,7 +94477,7 @@ in sources."@types/keyv-3.1.1" sources."@types/minimatch-3.0.4" sources."@types/mkdirp-0.5.2" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."@types/node-fetch-2.5.10" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-1.17.1" @@ -94747,10 +94485,10 @@ in sources."@types/semver-5.5.0" sources."@types/yargs-13.0.11" sources."@types/yargs-parser-20.2.0" - sources."@typescript-eslint/types-4.26.0" - (sources."@typescript-eslint/typescript-estree-4.26.0" // { + sources."@typescript-eslint/types-4.26.1" + (sources."@typescript-eslint/typescript-estree-4.26.1" // { dependencies = [ - sources."@nodelib/fs.stat-2.0.4" + sources."@nodelib/fs.stat-2.0.5" sources."array-union-2.1.0" sources."braces-3.0.2" sources."dir-glob-3.0.1" @@ -94765,12 +94503,12 @@ in sources."to-regex-range-5.0.1" ]; }) - sources."@typescript-eslint/visitor-keys-4.26.0" + sources."@typescript-eslint/visitor-keys-4.26.1" sources."@ungap/from-entries-0.2.1" sources."accepts-1.3.7" sources."agent-base-6.0.2" sources."aggregate-error-3.1.0" - sources."ajv-8.5.0" + sources."ajv-8.6.0" (sources."all-node-versions-8.0.0" // { dependencies = [ sources."@jest/types-25.5.0" @@ -94827,7 +94565,7 @@ in sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."atob-2.1.2" - (sources."aws-sdk-2.918.0" // { + (sources."aws-sdk-2.927.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -94850,7 +94588,7 @@ in ]; }) sources."base64-js-1.5.1" - sources."before-after-hook-2.2.1" + sources."before-after-hook-2.2.2" sources."better-opn-2.1.1" sources."binary-extensions-2.2.0" sources."bl-4.1.0" @@ -94902,7 +94640,7 @@ in sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001232" + sources."caniuse-lite-1.0.30001237" sources."cardinal-2.1.1" sources."caw-2.0.1" (sources."chalk-4.1.1" // { @@ -94963,16 +94701,11 @@ in sources."has-flag-4.0.0" sources."js-yaml-3.14.1" sources."supports-hyperlinks-2.2.0" - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) sources."cli-width-2.2.1" - (sources."cliui-6.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."wrap-ansi-6.2.0" - ]; - }) + sources."cliui-7.0.4" sources."clone-1.0.4" sources."clone-response-1.0.2" sources."code-point-at-1.1.0" @@ -94991,13 +94724,13 @@ in sources."colorspace-1.1.2" sources."combined-stream-1.0.8" sources."commander-2.20.3" - sources."common-path-prefix-2.0.0" + sources."common-path-prefix-3.0.0" sources."commondir-1.0.1" sources."component-emitter-1.3.0" sources."compress-commons-4.1.1" sources."concat-map-0.0.1" sources."concordance-5.0.4" - sources."config-chain-1.1.12" + sources."config-chain-1.1.13" sources."configstore-5.0.1" (sources."content-disposition-0.5.3" // { dependencies = [ @@ -95021,7 +94754,7 @@ in sources."safe-buffer-5.1.2" ]; }) - (sources."core-js-compat-3.13.1" // { + (sources."core-js-compat-3.14.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -95095,10 +94828,21 @@ in sources."defer-to-connect-1.1.3" sources."define-properties-1.1.3" sources."define-property-2.0.2" - (sources."del-5.1.0" // { + (sources."del-6.0.0" // { dependencies = [ - sources."p-map-3.0.0" + sources."@nodelib/fs.stat-2.0.5" + sources."array-union-2.1.0" + sources."braces-3.0.2" + sources."dir-glob-3.0.1" + sources."fast-glob-3.2.5" + sources."fill-range-7.0.1" + sources."glob-parent-5.1.2" + sources."globby-11.0.3" + sources."ignore-5.1.8" + sources."is-number-7.0.0" + sources."micromatch-4.0.4" sources."slash-3.0.0" + sources."to-regex-range-5.0.1" ]; }) sources."delayed-stream-1.0.0" @@ -95113,11 +94857,7 @@ in sources."detective-sass-3.0.1" sources."detective-scss-2.0.1" sources."detective-stylus-1.0.0" - (sources."detective-typescript-7.0.0" // { - dependencies = [ - sources."typescript-3.9.9" - ]; - }) + sources."detective-typescript-7.0.0" (sources."dir-glob-2.2.2" // { dependencies = [ sources."path-type-3.0.0" @@ -95146,7 +94886,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.743" + sources."electron-to-chromium-1.3.752" sources."elegant-spinner-1.0.1" sources."elf-cam-0.1.1" sources."emoji-regex-8.0.0" @@ -95175,7 +94915,7 @@ in sources."etag-1.8.1" sources."eventemitter3-4.0.7" sources."events-1.1.1" - (sources."execa-5.0.1" // { + (sources."execa-5.1.1" // { dependencies = [ sources."get-stream-6.0.1" sources."human-signals-2.1.0" @@ -95250,7 +94990,7 @@ in sources."@types/yargs-15.0.13" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" - sources."cacheable-request-7.0.1" + sources."cacheable-request-7.0.2" sources."decompress-response-5.0.0" sources."defer-to-connect-2.0.1" sources."got-10.7.0" @@ -95264,6 +95004,7 @@ in sources."keyv-4.0.3" sources."lowercase-keys-2.0.0" sources."mimic-response-2.1.0" + sources."normalize-url-6.0.1" sources."p-cancelable-2.1.1" sources."pretty-format-25.5.0" sources."responselike-2.0.0" @@ -95337,7 +95078,7 @@ in sources."globals-11.12.0" (sources."globby-10.0.2" // { dependencies = [ - sources."@nodelib/fs.stat-2.0.4" + sources."@nodelib/fs.stat-2.0.5" sources."array-union-2.1.0" sources."braces-3.0.2" sources."dir-glob-3.0.1" @@ -95631,7 +95372,7 @@ in }) sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" - sources."macos-release-2.4.1" + sources."macos-release-2.5.0" sources."magic-string-0.25.7" (sources."make-dir-3.1.0" // { dependencies = [ @@ -95663,8 +95404,8 @@ in sources."micro-memoize-4.0.9" sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -95701,16 +95442,20 @@ in sources."natural-orderby-2.0.3" sources."negotiator-0.6.2" sources."nested-error-stacks-2.1.0" - (sources."netlify-7.0.0" // { + (sources."netlify-7.0.1" // { dependencies = [ sources."qs-6.10.1" ]; }) - sources."netlify-redirect-parser-3.0.29" + (sources."netlify-redirect-parser-5.1.1" // { + dependencies = [ + sources."is-plain-obj-2.1.0" + ]; + }) sources."netlify-redirector-0.2.1" sources."nice-try-1.0.5" sources."node-fetch-2.6.1" - sources."node-releases-1.1.72" + sources."node-releases-1.1.73" sources."node-source-walk-4.2.0" (sources."node-version-alias-1.0.1" // { dependencies = [ @@ -95774,7 +95519,7 @@ in sources."object.pick-1.3.0" (sources."oclif-plugin-completion-0.6.0" // { dependencies = [ - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) sources."omit.js-2.0.2" @@ -95790,7 +95535,7 @@ in ]; }) sources."optionator-0.8.3" - (sources."ora-5.4.0" // { + (sources."ora-5.4.1" // { dependencies = [ sources."cli-cursor-3.1.0" sources."restore-cursor-3.1.0" @@ -95885,7 +95630,7 @@ in ]; }) sources."posix-character-classes-0.1.1" - sources."postcss-8.3.0" + sources."postcss-8.3.2" sources."postcss-values-parser-2.0.1" sources."precinct-8.1.0" sources."precond-0.2.3" @@ -95914,7 +95659,6 @@ in sources."querystring-0.2.0" sources."queue-microtask-1.2.3" sources."random-bytes-1.0.0" - sources."random-item-3.1.0" sources."randombytes-2.1.0" sources."range-parser-1.2.1" (sources."raw-body-2.4.1" // { @@ -95975,7 +95719,7 @@ in sources."ret-0.1.15" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."rollup-2.50.5" + sources."rollup-2.51.2" (sources."rollup-plugin-inject-3.0.2" // { dependencies = [ sources."estree-walker-0.6.1" @@ -96116,7 +95860,7 @@ in sources."supports-color-0.2.0" ]; }) - sources."statsd-client-0.4.6" + sources."statsd-client-0.4.7" sources."statuses-1.5.0" sources."strict-uri-encode-1.1.0" sources."string-width-4.2.2" @@ -96157,20 +95901,6 @@ in sources."temp-dir-2.0.0" (sources."tempy-1.0.1" // { dependencies = [ - sources."@nodelib/fs.stat-2.0.4" - sources."array-union-2.1.0" - sources."braces-3.0.2" - sources."del-6.0.0" - sources."dir-glob-3.0.1" - sources."fast-glob-3.2.5" - sources."fill-range-7.0.1" - sources."glob-parent-5.1.2" - sources."globby-11.0.3" - sources."ignore-5.1.8" - sources."is-number-7.0.0" - sources."micromatch-4.0.4" - sources."slash-3.0.0" - sources."to-regex-range-5.0.1" sources."type-fest-0.16.0" ]; }) @@ -96217,7 +95947,7 @@ in sources."type-fest-0.21.3" sources."type-is-1.6.18" sources."typedarray-to-buffer-3.1.5" - sources."typescript-4.3.2" + sources."typescript-3.9.9" sources."uid-safe-2.1.5" sources."unbzip2-stream-1.4.3" sources."unicode-canonical-property-names-ecmascript-1.0.4" @@ -96321,15 +96051,20 @@ in sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" sources."xtend-4.0.2" - sources."y18n-4.0.3" + sources."y18n-5.0.8" sources."yallist-4.0.0" (sources."yargs-15.4.1" // { dependencies = [ + sources."ansi-styles-4.3.0" + sources."cliui-6.0.0" sources."find-up-4.1.0" sources."locate-path-5.0.0" + sources."wrap-ansi-6.2.0" + sources."y18n-4.0.3" + sources."yargs-parser-18.1.3" ]; }) - sources."yargs-parser-18.1.3" + sources."yargs-parser-20.2.7" sources."yarn-1.22.10" sources."yauzl-2.10.0" sources."yocto-queue-0.1.0" @@ -96635,8 +96370,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -96887,7 +96622,7 @@ in sha512 = "P/EmWwzuY/0mQFlrklSUrVANdv9xQsbrpKrpfA8tuhhxu1OEiSgzYdo87Zj13Hi38K4f1rNPQj4rw2vEBcYS/g=="; }; dependencies = [ - sources."@babel/runtime-7.14.0" + sources."@babel/runtime-7.14.5" sources."@node-red/editor-api-1.3.5" sources."@node-red/editor-client-1.3.5" (sources."@node-red/nodes-1.3.5" // { @@ -97149,8 +96884,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-2.5.2" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."minimatch-3.0.4" sources."minimist-1.2.5" (sources."minipass-3.1.3" // { @@ -97327,7 +97062,7 @@ in sources."punycode-1.4.1" ]; }) - sources."tslib-2.2.0" + sources."tslib-2.3.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" @@ -97394,7 +97129,7 @@ in sources."combined-stream-1.0.8" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" - sources."config-chain-1.1.12" + sources."config-chain-1.1.13" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" @@ -97448,8 +97183,8 @@ in sources."jsonfile-1.0.1" sources."jsprim-1.4.1" sources."lru-cache-6.0.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."minipass-3.1.3" @@ -97729,9 +97464,9 @@ in sha512 = "CdpgqtO6JpDKJjQ2gueY0jnbz6APWA9wFXSwPv5bXg4seSBibHqQ8JyWxYlS8YRfVbpeDtj582wcAWTlfy5qNA=="; }; dependencies = [ - sources."@babel/code-frame-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - (sources."@babel/highlight-7.14.0" // { + sources."@babel/code-frame-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -97742,9 +97477,9 @@ in sources."supports-color-5.5.0" ]; }) - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.7" (sources."@samverschueren/stream-to-observable-0.3.1" // { dependencies = [ sources."any-observable-0.3.0" @@ -97756,7 +97491,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.1" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."@types/normalize-package-data-2.4.0" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -97789,7 +97524,7 @@ in sources."braces-3.0.2" sources."builtins-1.0.3" sources."cacheable-lookup-2.0.1" - (sources."cacheable-request-7.0.1" // { + (sources."cacheable-request-7.0.2" // { dependencies = [ sources."get-stream-5.2.0" ]; @@ -97849,7 +97584,7 @@ in sources."error-ex-1.3.2" sources."escape-goat-3.0.0" sources."escape-string-regexp-4.0.0" - sources."execa-5.0.1" + sources."execa-5.1.1" sources."external-editor-3.1.0" sources."fast-glob-3.2.5" sources."fastq-1.11.0" @@ -98059,7 +97794,7 @@ in sources."hosted-git-info-4.0.2" ]; }) - sources."normalize-url-4.5.1" + sources."normalize-url-6.0.1" (sources."npm-name-6.0.1" // { dependencies = [ sources."p-map-3.0.0" @@ -98119,6 +97854,7 @@ in sources."keyv-3.1.0" sources."lowercase-keys-1.0.1" sources."mimic-response-1.0.1" + sources."normalize-url-4.5.1" sources."p-cancelable-1.1.0" sources."responselike-1.0.2" sources."semver-6.3.0" @@ -98259,10 +97995,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "7.15.1"; + version = "7.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-7.15.1.tgz"; - sha512 = "sPk+GrqawshbG3T81r2QvvSxSQXBFWyn5NGLacf87l+/odi2ZRHkWdLrg304Lw0DrwwIIaGxUjp0FJXaMtIErQ=="; + url = "https://registry.npmjs.org/npm/-/npm-7.17.0.tgz"; + sha512 = "yNzj4vQellvUGiBM/SzhfT89EV0vb7iILjTehSydTY/IgK2Vjk7/7J8WNJ2ysqcgfLY21ptI/j7uknt15IbbKQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -98283,9 +98019,9 @@ in sha512 = "/l4S7Gh+8+Rg5itWsqFya5RRSHtPzw5neyAlbWNJfBfEeRX6lYVxKgs85QFBOKrZj3eL5MGBaUW8228TmjMhrw=="; }; dependencies = [ - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.7" sources."@npmcli/git-2.0.9" sources."@npmcli/installed-package-contents-1.0.7" sources."@npmcli/move-file-1.1.2" @@ -98478,13 +98214,13 @@ in sources."semver-6.3.0" ]; }) - sources."make-fetch-happen-8.0.14" + sources."make-fetch-happen-9.0.2" sources."map-age-cleaner-0.1.3" sources."mem-8.1.1" sources."merge2-1.4.1" sources."micromatch-4.0.4" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-3.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -98499,16 +98235,17 @@ in sources."minizlib-2.1.2" sources."mkdirp-1.0.4" sources."ms-2.1.2" + sources."negotiator-0.6.2" sources."node-gyp-7.1.2" sources."nopt-5.0.0" sources."normalize-url-4.5.1" sources."npm-bundled-1.1.2" sources."npm-install-checks-4.0.0" sources."npm-normalize-package-bin-1.0.1" - sources."npm-package-arg-8.1.2" + sources."npm-package-arg-8.1.4" sources."npm-packlist-2.2.2" sources."npm-pick-manifest-6.1.1" - sources."npm-registry-fetch-10.1.2" + sources."npm-registry-fetch-11.0.0" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" @@ -98525,7 +98262,7 @@ in sources."semver-6.3.0" ]; }) - sources."pacote-11.3.3" + sources."pacote-11.3.4" sources."parse-github-url-1.0.2" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" @@ -98667,7 +98404,7 @@ in sources."coffee-script-1.12.7" sources."combined-stream-1.0.8" sources."concat-map-0.0.1" - (sources."config-chain-1.1.12" // { + (sources."config-chain-1.1.13" // { dependencies = [ sources."ini-1.3.8" ]; @@ -98721,8 +98458,8 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-1.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.3.5" @@ -98860,130 +98597,130 @@ in sha512 = "hpku8mW67U6PXQIenW6NBbphBOMb8XzW6B9r093DUhYj5GN2FUB/CXCiz5hKoPYUsusZ35BpProH8AUF9bh5IQ=="; }; dependencies = [ - sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.14.4" - (sources."@babel/core-7.14.3" // { + sources."@babel/code-frame-7.14.5" + sources."@babel/compat-data-7.14.5" + (sources."@babel/core-7.14.5" // { dependencies = [ sources."json5-2.2.0" sources."semver-6.3.0" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.14.3" // { + (sources."@babel/generator-7.14.5" // { dependencies = [ sources."source-map-0.5.7" ]; }) - sources."@babel/helper-annotate-as-pure-7.12.13" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" - (sources."@babel/helper-compilation-targets-7.14.4" // { + sources."@babel/helper-annotate-as-pure-7.14.5" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" + (sources."@babel/helper-compilation-targets-7.14.5" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.14.4" - sources."@babel/helper-create-regexp-features-plugin-7.14.3" + sources."@babel/helper-create-class-features-plugin-7.14.5" + sources."@babel/helper-create-regexp-features-plugin-7.14.5" (sources."@babel/helper-define-polyfill-provider-0.2.3" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-explode-assignable-expression-7.13.0" - sources."@babel/helper-function-name-7.14.2" - sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-hoist-variables-7.13.16" - sources."@babel/helper-member-expression-to-functions-7.13.12" - sources."@babel/helper-module-imports-7.13.12" - sources."@babel/helper-module-transforms-7.14.2" - sources."@babel/helper-optimise-call-expression-7.12.13" - sources."@babel/helper-plugin-utils-7.13.0" - sources."@babel/helper-remap-async-to-generator-7.13.0" - sources."@babel/helper-replace-supers-7.14.4" - sources."@babel/helper-simple-access-7.13.12" - sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" - sources."@babel/helper-split-export-declaration-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - sources."@babel/helper-validator-option-7.12.17" - sources."@babel/helper-wrap-function-7.13.0" - sources."@babel/helpers-7.14.0" - sources."@babel/highlight-7.14.0" - sources."@babel/parser-7.14.4" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12" - sources."@babel/plugin-proposal-async-generator-functions-7.14.2" - sources."@babel/plugin-proposal-class-properties-7.13.0" - sources."@babel/plugin-proposal-class-static-block-7.14.3" - sources."@babel/plugin-proposal-dynamic-import-7.14.2" - sources."@babel/plugin-proposal-export-namespace-from-7.14.2" - sources."@babel/plugin-proposal-json-strings-7.14.2" - sources."@babel/plugin-proposal-logical-assignment-operators-7.14.2" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.2" - sources."@babel/plugin-proposal-numeric-separator-7.14.2" - sources."@babel/plugin-proposal-object-rest-spread-7.14.4" - sources."@babel/plugin-proposal-optional-catch-binding-7.14.2" - sources."@babel/plugin-proposal-optional-chaining-7.14.2" - sources."@babel/plugin-proposal-private-methods-7.13.0" - sources."@babel/plugin-proposal-private-property-in-object-7.14.0" - sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" + sources."@babel/helper-explode-assignable-expression-7.14.5" + sources."@babel/helper-function-name-7.14.5" + sources."@babel/helper-get-function-arity-7.14.5" + sources."@babel/helper-hoist-variables-7.14.5" + sources."@babel/helper-member-expression-to-functions-7.14.5" + sources."@babel/helper-module-imports-7.14.5" + sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-optimise-call-expression-7.14.5" + sources."@babel/helper-plugin-utils-7.14.5" + sources."@babel/helper-remap-async-to-generator-7.14.5" + sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" + sources."@babel/helper-split-export-declaration-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-option-7.14.5" + sources."@babel/helper-wrap-function-7.14.5" + sources."@babel/helpers-7.14.5" + sources."@babel/highlight-7.14.5" + sources."@babel/parser-7.14.5" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" + sources."@babel/plugin-proposal-async-generator-functions-7.14.5" + sources."@babel/plugin-proposal-class-properties-7.14.5" + sources."@babel/plugin-proposal-class-static-block-7.14.5" + sources."@babel/plugin-proposal-dynamic-import-7.14.5" + sources."@babel/plugin-proposal-export-namespace-from-7.14.5" + sources."@babel/plugin-proposal-json-strings-7.14.5" + sources."@babel/plugin-proposal-logical-assignment-operators-7.14.5" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" + sources."@babel/plugin-proposal-numeric-separator-7.14.5" + sources."@babel/plugin-proposal-object-rest-spread-7.14.5" + sources."@babel/plugin-proposal-optional-catch-binding-7.14.5" + sources."@babel/plugin-proposal-optional-chaining-7.14.5" + sources."@babel/plugin-proposal-private-methods-7.14.5" + sources."@babel/plugin-proposal-private-property-in-object-7.14.5" + sources."@babel/plugin-proposal-unicode-property-regex-7.14.5" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-class-properties-7.12.13" - sources."@babel/plugin-syntax-class-static-block-7.12.13" + sources."@babel/plugin-syntax-class-static-block-7.14.5" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-syntax-flow-7.12.13" + sources."@babel/plugin-syntax-flow-7.14.5" sources."@babel/plugin-syntax-json-strings-7.8.3" - sources."@babel/plugin-syntax-jsx-7.12.13" + sources."@babel/plugin-syntax-jsx-7.14.5" sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" sources."@babel/plugin-syntax-numeric-separator-7.10.4" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-private-property-in-object-7.14.0" - sources."@babel/plugin-syntax-top-level-await-7.12.13" - sources."@babel/plugin-transform-arrow-functions-7.13.0" - sources."@babel/plugin-transform-async-to-generator-7.13.0" - sources."@babel/plugin-transform-block-scoped-functions-7.12.13" - sources."@babel/plugin-transform-block-scoping-7.14.4" - sources."@babel/plugin-transform-classes-7.14.4" - sources."@babel/plugin-transform-computed-properties-7.13.0" - sources."@babel/plugin-transform-destructuring-7.14.4" - sources."@babel/plugin-transform-dotall-regex-7.12.13" - sources."@babel/plugin-transform-duplicate-keys-7.12.13" - sources."@babel/plugin-transform-exponentiation-operator-7.12.13" - sources."@babel/plugin-transform-flow-strip-types-7.13.0" - sources."@babel/plugin-transform-for-of-7.13.0" - sources."@babel/plugin-transform-function-name-7.12.13" - sources."@babel/plugin-transform-literals-7.12.13" - sources."@babel/plugin-transform-member-expression-literals-7.12.13" - sources."@babel/plugin-transform-modules-amd-7.14.2" - sources."@babel/plugin-transform-modules-commonjs-7.14.0" - sources."@babel/plugin-transform-modules-systemjs-7.13.8" - sources."@babel/plugin-transform-modules-umd-7.14.0" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.13" - sources."@babel/plugin-transform-new-target-7.12.13" - sources."@babel/plugin-transform-object-super-7.12.13" - sources."@babel/plugin-transform-parameters-7.14.2" - sources."@babel/plugin-transform-property-literals-7.12.13" - sources."@babel/plugin-transform-react-jsx-7.14.3" - sources."@babel/plugin-transform-regenerator-7.13.15" - sources."@babel/plugin-transform-reserved-words-7.12.13" - sources."@babel/plugin-transform-shorthand-properties-7.12.13" - sources."@babel/plugin-transform-spread-7.13.0" - sources."@babel/plugin-transform-sticky-regex-7.12.13" - sources."@babel/plugin-transform-template-literals-7.13.0" - sources."@babel/plugin-transform-typeof-symbol-7.12.13" - sources."@babel/plugin-transform-unicode-escapes-7.12.13" - sources."@babel/plugin-transform-unicode-regex-7.12.13" - (sources."@babel/preset-env-7.14.4" // { + sources."@babel/plugin-syntax-private-property-in-object-7.14.5" + sources."@babel/plugin-syntax-top-level-await-7.14.5" + sources."@babel/plugin-transform-arrow-functions-7.14.5" + sources."@babel/plugin-transform-async-to-generator-7.14.5" + sources."@babel/plugin-transform-block-scoped-functions-7.14.5" + sources."@babel/plugin-transform-block-scoping-7.14.5" + sources."@babel/plugin-transform-classes-7.14.5" + sources."@babel/plugin-transform-computed-properties-7.14.5" + sources."@babel/plugin-transform-destructuring-7.14.5" + sources."@babel/plugin-transform-dotall-regex-7.14.5" + sources."@babel/plugin-transform-duplicate-keys-7.14.5" + sources."@babel/plugin-transform-exponentiation-operator-7.14.5" + sources."@babel/plugin-transform-flow-strip-types-7.14.5" + sources."@babel/plugin-transform-for-of-7.14.5" + sources."@babel/plugin-transform-function-name-7.14.5" + sources."@babel/plugin-transform-literals-7.14.5" + sources."@babel/plugin-transform-member-expression-literals-7.14.5" + sources."@babel/plugin-transform-modules-amd-7.14.5" + sources."@babel/plugin-transform-modules-commonjs-7.14.5" + sources."@babel/plugin-transform-modules-systemjs-7.14.5" + sources."@babel/plugin-transform-modules-umd-7.14.5" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.5" + sources."@babel/plugin-transform-new-target-7.14.5" + sources."@babel/plugin-transform-object-super-7.14.5" + sources."@babel/plugin-transform-parameters-7.14.5" + sources."@babel/plugin-transform-property-literals-7.14.5" + sources."@babel/plugin-transform-react-jsx-7.14.5" + sources."@babel/plugin-transform-regenerator-7.14.5" + sources."@babel/plugin-transform-reserved-words-7.14.5" + sources."@babel/plugin-transform-shorthand-properties-7.14.5" + sources."@babel/plugin-transform-spread-7.14.5" + sources."@babel/plugin-transform-sticky-regex-7.14.5" + sources."@babel/plugin-transform-template-literals-7.14.5" + sources."@babel/plugin-transform-typeof-symbol-7.14.5" + sources."@babel/plugin-transform-unicode-escapes-7.14.5" + sources."@babel/plugin-transform-unicode-regex-7.14.5" + (sources."@babel/preset-env-7.14.5" // { dependencies = [ sources."semver-6.3.0" ]; }) sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.14.0" - sources."@babel/template-7.12.13" - sources."@babel/traverse-7.14.2" - sources."@babel/types-7.14.4" + sources."@babel/runtime-7.14.5" + sources."@babel/template-7.14.5" + sources."@babel/traverse-7.14.5" + sources."@babel/types-7.14.5" sources."@iarna/toml-2.2.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -99105,7 +98842,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001232" + sources."caniuse-lite-1.0.30001237" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -99132,7 +98869,7 @@ in sources."convert-source-map-1.7.0" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.13.1" // { + (sources."core-js-compat-3.14.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -99243,7 +98980,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.743" + sources."electron-to-chromium-1.3.752" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -99358,7 +99095,7 @@ in dependencies = [ sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" - sources."domutils-2.6.0" + sources."domutils-2.7.0" ]; }) sources."http-errors-1.7.3" @@ -99430,7 +99167,7 @@ in sources."acorn-6.4.2" sources."escodegen-1.14.3" sources."esprima-4.0.1" - sources."ws-6.2.1" + sources."ws-6.2.2" ]; }) sources."jsesc-2.5.2" @@ -99474,8 +99211,8 @@ in ]; }) sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-1.2.0" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" @@ -99505,7 +99242,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.72" + sources."node-releases-1.1.73" sources."normalize-path-3.0.0" sources."normalize-url-3.3.0" sources."nth-check-1.0.2" @@ -99543,7 +99280,7 @@ in sources."physical-cpu-count-2.0.0" sources."pn-1.1.0" sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.35" // { + (sources."postcss-7.0.36" // { dependencies = [ sources."supports-color-6.1.0" ]; @@ -99849,7 +99586,7 @@ in sources."which-boxed-primitive-1.0.2" sources."word-wrap-1.2.3" sources."wrappy-1.0.2" - sources."ws-5.2.2" + sources."ws-5.2.3" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."xtend-4.0.2" @@ -100019,8 +99756,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -100114,7 +99851,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."uglify-js-3.13.8" + sources."uglify-js-3.13.9" sources."unix-dgram-2.0.4" sources."unpipe-1.0.0" sources."uri-js-4.4.1" @@ -100348,7 +100085,7 @@ in sources."internal-ip-1.2.0" sources."ip-1.1.5" sources."ip-set-1.0.2" - sources."ipaddr.js-2.0.0" + sources."ipaddr.js-2.0.1" sources."is-arguments-1.1.0" sources."is-arrayish-0.2.1" sources."is-core-module-2.4.0" @@ -100453,7 +100190,7 @@ in sources."run-async-2.4.1" sources."run-parallel-1.2.0" sources."run-series-1.1.9" - sources."rusha-0.8.13" + sources."rusha-0.8.14" sources."rxjs-5.5.12" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -100727,8 +100464,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -100800,7 +100537,7 @@ in sources."rimraf-2.7.1" sources."run-parallel-1.2.0" sources."run-series-1.1.9" - sources."rusha-0.8.13" + sources."rusha-0.8.14" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" (sources."send-0.17.1" // { @@ -100902,10 +100639,10 @@ in pm2 = nodeEnv.buildNodePackage { name = "pm2"; packageName = "pm2"; - version = "4.5.6"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/pm2/-/pm2-4.5.6.tgz"; - sha512 = "4J5q704Xl6VmpmQhXFGMJL4kXyyQw3AZM1FE9vRxhS3LiDI/+WVBtOM6pqJ4g/RKW+AUjEkc23i/DCC4BVenDA=="; + url = "https://registry.npmjs.org/pm2/-/pm2-5.1.0.tgz"; + sha512 = "reJ35NOxM4+g7H0enW47HJsp32CszKkseCojAuUMUkffyXsGDKBMnDqhxAZMZKtHUUjl0cWFEqKehqB0ODH8Kw=="; }; dependencies = [ (sources."@opencensus/core-0.0.9" // { @@ -100919,7 +100656,7 @@ in sources."semver-5.7.1" ]; }) - (sources."@pm2/agent-1.0.8" // { + (sources."@pm2/agent-2.0.0" // { dependencies = [ sources."semver-7.2.3" ]; @@ -100946,11 +100683,7 @@ in sources."ansi-colors-4.1.1" sources."ansi-styles-4.3.0" sources."anymatch-3.1.2" - (sources."argparse-1.0.10" // { - dependencies = [ - sources."sprintf-js-1.0.3" - ]; - }) + sources."argparse-1.0.10" sources."ast-types-0.13.4" sources."async-3.2.0" (sources."async-listener-0.6.10" // { @@ -100963,6 +100696,7 @@ in sources."binary-extensions-2.2.0" sources."blessed-0.1.81" sources."bodec-0.1.0" + sources."boolean-3.1.2" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."buffer-from-1.1.1" @@ -100993,7 +100727,9 @@ in sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."eventemitter2-5.0.1" + sources."fast-json-patch-3.0.0-1" sources."fast-levenshtein-2.0.6" + sources."fast-printf-1.6.5" sources."fclone-1.0.11" sources."file-uri-to-path-2.0.0" sources."fill-range-7.0.1" @@ -101026,6 +100762,7 @@ in sources."is-number-7.0.0" sources."isarray-0.0.1" sources."js-git-0.7.8" + sources."json-stringify-safe-5.0.1" sources."jsonfile-4.0.0" sources."lazy-1.0.11" sources."levn-0.3.0" @@ -101064,11 +100801,11 @@ in sources."pm2-axon-rpc-0.7.1" sources."pm2-deploy-1.0.2" sources."pm2-multimeter-0.1.2" + sources."pm2-sysmonit-1.2.8" sources."prelude-ls-1.1.2" sources."promptly-2.2.0" sources."proxy-agent-4.0.1" sources."proxy-from-env-1.1.0" - sources."ps-list-6.3.0" sources."raw-body-2.4.1" sources."read-1.0.7" sources."readable-stream-1.1.14" @@ -101093,14 +100830,16 @@ in sources."socks-proxy-agent-5.0.0" sources."source-map-0.6.1" sources."source-map-support-0.5.19" - sources."sprintf-js-1.1.2" + sources."sprintf-js-1.0.3" sources."statuses-1.5.0" sources."string_decoder-0.10.31" sources."supports-color-7.2.0" + sources."systeminformation-5.7.6" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" - sources."tslib-2.2.0" + sources."tslib-2.3.0" sources."tv4-1.3.0" + sources."tx2-1.0.4" sources."type-check-0.3.2" sources."universalify-0.1.2" sources."unpipe-1.0.0" @@ -101112,7 +100851,7 @@ in }) sources."word-wrap-1.2.3" sources."wrappy-1.0.2" - sources."ws-7.2.5" + sources."ws-7.4.6" sources."xregexp-2.0.0" sources."yallist-3.1.1" sources."yamljs-0.3.0" @@ -101130,10 +100869,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "6.6.2"; + version = "6.7.6"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-6.6.2.tgz"; - sha512 = "w1YEyx+xiTbrxVt5OP6JG0LqwkK/hq2OkCYj7RZhK9oyv7cCEkgkX5Z5MPVC1wTCv2kQDJRoXzBeedPiIhzN8Q=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-6.7.6.tgz"; + sha512 = "VhO6zVIuhVkKXP3kWMZs9W5b3rhcztq524WoAc9OEwjmj7SiKyp0UNltaaLR0VRjFGJPuQOcqDbNkWwzao6dUw=="; }; buildInputs = globalBuildInputs; meta = { @@ -101182,9 +100921,9 @@ in sha512 = "leHXsQRq89S3JC9zw/tKyiVV2jAhnfQe0J8VI4eQQbUjwIe0XxVqLrR+7UsahF1s9wi4GlqP6SJ8ydf44cgF2Q=="; }; dependencies = [ - sources."@babel/code-frame-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - (sources."@babel/highlight-7.14.0" // { + sources."@babel/code-frame-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -101194,9 +100933,9 @@ in sources."supports-color-5.5.0" ]; }) - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.7" sources."@types/parse-json-4.0.0" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -101296,10 +101035,10 @@ in prettier = nodeEnv.buildNodePackage { name = "prettier"; packageName = "prettier"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-2.3.0.tgz"; - sha512 = "kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w=="; + url = "https://registry.npmjs.org/prettier/-/prettier-2.3.1.tgz"; + sha512 = "p+vNbgpLjif/+D+DwAZAbndtRrR0md0MwfmOVN9N+2RgyACMT+7tfaRnT+WDPkqnuVwleyuBIG2XBxKDme3hPA=="; }; buildInputs = globalBuildInputs; meta = { @@ -101682,10 +101421,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.145"; + version = "1.1.148"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.145.tgz"; - sha512 = "eyrK9Ilut2shvqi/TFmpfUrm7U6DrkskMa8UPofkGJZCO1PJzVwzKaGWrR57zlbcAxs5PVvK9JGSIO9DJUVNyA=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.148.tgz"; + sha512 = "cM1Bs/5XSqqfaTfl+zSvXvrq1YMUYOmo2QGBqZ4Cczq0hDo4oJAihzszJONO9H5riTgmEduid5aU3Rpkx+Y/xw=="; }; buildInputs = globalBuildInputs; meta = { @@ -102033,142 +101772,142 @@ in sha512 = "coA9MuNPfN+8TyFj7aOycw2e5W9t+sSgFOUyK30oDrh2MWWWHLjY0I4V1puyCconC2arggfDE2GYXvqOTCGv9Q=="; }; dependencies = [ - sources."@babel/cli-7.14.3" - sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.14.4" - (sources."@babel/core-7.14.3" // { + sources."@babel/cli-7.14.5" + sources."@babel/code-frame-7.14.5" + sources."@babel/compat-data-7.14.5" + (sources."@babel/core-7.14.5" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.14.3" - sources."@babel/helper-annotate-as-pure-7.12.13" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" - (sources."@babel/helper-compilation-targets-7.14.4" // { + sources."@babel/generator-7.14.5" + sources."@babel/helper-annotate-as-pure-7.14.5" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" + (sources."@babel/helper-compilation-targets-7.14.5" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.14.4" - sources."@babel/helper-create-regexp-features-plugin-7.14.3" + sources."@babel/helper-create-class-features-plugin-7.14.5" + sources."@babel/helper-create-regexp-features-plugin-7.14.5" (sources."@babel/helper-define-polyfill-provider-0.2.3" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-explode-assignable-expression-7.13.0" - sources."@babel/helper-function-name-7.14.2" - sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-hoist-variables-7.13.16" - sources."@babel/helper-member-expression-to-functions-7.13.12" - sources."@babel/helper-module-imports-7.13.12" - sources."@babel/helper-module-transforms-7.14.2" - sources."@babel/helper-optimise-call-expression-7.12.13" - sources."@babel/helper-plugin-utils-7.13.0" - sources."@babel/helper-remap-async-to-generator-7.13.0" - sources."@babel/helper-replace-supers-7.14.4" - sources."@babel/helper-simple-access-7.13.12" - sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" - sources."@babel/helper-split-export-declaration-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - sources."@babel/helper-validator-option-7.12.17" - sources."@babel/helper-wrap-function-7.13.0" - sources."@babel/helpers-7.14.0" - sources."@babel/highlight-7.14.0" - sources."@babel/parser-7.14.4" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12" - sources."@babel/plugin-proposal-async-generator-functions-7.14.2" - sources."@babel/plugin-proposal-class-properties-7.13.0" - sources."@babel/plugin-proposal-class-static-block-7.14.3" - sources."@babel/plugin-proposal-dynamic-import-7.14.2" - sources."@babel/plugin-proposal-export-default-from-7.12.13" - sources."@babel/plugin-proposal-export-namespace-from-7.14.2" - sources."@babel/plugin-proposal-json-strings-7.14.2" - sources."@babel/plugin-proposal-logical-assignment-operators-7.14.2" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.2" - sources."@babel/plugin-proposal-numeric-separator-7.14.2" - sources."@babel/plugin-proposal-object-rest-spread-7.14.4" - sources."@babel/plugin-proposal-optional-catch-binding-7.14.2" - sources."@babel/plugin-proposal-optional-chaining-7.14.2" - sources."@babel/plugin-proposal-private-methods-7.13.0" - sources."@babel/plugin-proposal-private-property-in-object-7.14.0" - sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" + sources."@babel/helper-explode-assignable-expression-7.14.5" + sources."@babel/helper-function-name-7.14.5" + sources."@babel/helper-get-function-arity-7.14.5" + sources."@babel/helper-hoist-variables-7.14.5" + sources."@babel/helper-member-expression-to-functions-7.14.5" + sources."@babel/helper-module-imports-7.14.5" + sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-optimise-call-expression-7.14.5" + sources."@babel/helper-plugin-utils-7.14.5" + sources."@babel/helper-remap-async-to-generator-7.14.5" + sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" + sources."@babel/helper-split-export-declaration-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-option-7.14.5" + sources."@babel/helper-wrap-function-7.14.5" + sources."@babel/helpers-7.14.5" + sources."@babel/highlight-7.14.5" + sources."@babel/parser-7.14.5" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" + sources."@babel/plugin-proposal-async-generator-functions-7.14.5" + sources."@babel/plugin-proposal-class-properties-7.14.5" + sources."@babel/plugin-proposal-class-static-block-7.14.5" + sources."@babel/plugin-proposal-dynamic-import-7.14.5" + sources."@babel/plugin-proposal-export-default-from-7.14.5" + sources."@babel/plugin-proposal-export-namespace-from-7.14.5" + sources."@babel/plugin-proposal-json-strings-7.14.5" + sources."@babel/plugin-proposal-logical-assignment-operators-7.14.5" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" + sources."@babel/plugin-proposal-numeric-separator-7.14.5" + sources."@babel/plugin-proposal-object-rest-spread-7.14.5" + sources."@babel/plugin-proposal-optional-catch-binding-7.14.5" + sources."@babel/plugin-proposal-optional-chaining-7.14.5" + sources."@babel/plugin-proposal-private-methods-7.14.5" + sources."@babel/plugin-proposal-private-property-in-object-7.14.5" + sources."@babel/plugin-proposal-unicode-property-regex-7.14.5" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-class-properties-7.12.13" - sources."@babel/plugin-syntax-class-static-block-7.12.13" + sources."@babel/plugin-syntax-class-static-block-7.14.5" sources."@babel/plugin-syntax-dynamic-import-7.8.3" - sources."@babel/plugin-syntax-export-default-from-7.12.13" + sources."@babel/plugin-syntax-export-default-from-7.14.5" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" sources."@babel/plugin-syntax-json-strings-7.8.3" - sources."@babel/plugin-syntax-jsx-7.12.13" + sources."@babel/plugin-syntax-jsx-7.14.5" sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" sources."@babel/plugin-syntax-numeric-separator-7.10.4" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-private-property-in-object-7.14.0" - sources."@babel/plugin-syntax-top-level-await-7.12.13" - sources."@babel/plugin-transform-arrow-functions-7.13.0" - sources."@babel/plugin-transform-async-to-generator-7.13.0" - sources."@babel/plugin-transform-block-scoped-functions-7.12.13" - sources."@babel/plugin-transform-block-scoping-7.14.4" - sources."@babel/plugin-transform-classes-7.14.4" - sources."@babel/plugin-transform-computed-properties-7.13.0" - sources."@babel/plugin-transform-destructuring-7.14.4" - sources."@babel/plugin-transform-dotall-regex-7.12.13" - sources."@babel/plugin-transform-duplicate-keys-7.12.13" - sources."@babel/plugin-transform-exponentiation-operator-7.12.13" - sources."@babel/plugin-transform-for-of-7.13.0" - sources."@babel/plugin-transform-function-name-7.12.13" - sources."@babel/plugin-transform-literals-7.12.13" - sources."@babel/plugin-transform-member-expression-literals-7.12.13" - sources."@babel/plugin-transform-modules-amd-7.14.2" - sources."@babel/plugin-transform-modules-commonjs-7.14.0" - sources."@babel/plugin-transform-modules-systemjs-7.13.8" - sources."@babel/plugin-transform-modules-umd-7.14.0" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.13" - sources."@babel/plugin-transform-new-target-7.12.13" - sources."@babel/plugin-transform-object-super-7.12.13" - sources."@babel/plugin-transform-parameters-7.14.2" - sources."@babel/plugin-transform-property-literals-7.12.13" - sources."@babel/plugin-transform-react-display-name-7.14.2" - sources."@babel/plugin-transform-react-jsx-7.14.3" - sources."@babel/plugin-transform-react-jsx-development-7.12.17" - sources."@babel/plugin-transform-react-pure-annotations-7.12.1" - sources."@babel/plugin-transform-regenerator-7.13.15" - sources."@babel/plugin-transform-reserved-words-7.12.13" - (sources."@babel/plugin-transform-runtime-7.14.3" // { + sources."@babel/plugin-syntax-private-property-in-object-7.14.5" + sources."@babel/plugin-syntax-top-level-await-7.14.5" + sources."@babel/plugin-transform-arrow-functions-7.14.5" + sources."@babel/plugin-transform-async-to-generator-7.14.5" + sources."@babel/plugin-transform-block-scoped-functions-7.14.5" + sources."@babel/plugin-transform-block-scoping-7.14.5" + sources."@babel/plugin-transform-classes-7.14.5" + sources."@babel/plugin-transform-computed-properties-7.14.5" + sources."@babel/plugin-transform-destructuring-7.14.5" + sources."@babel/plugin-transform-dotall-regex-7.14.5" + sources."@babel/plugin-transform-duplicate-keys-7.14.5" + sources."@babel/plugin-transform-exponentiation-operator-7.14.5" + sources."@babel/plugin-transform-for-of-7.14.5" + sources."@babel/plugin-transform-function-name-7.14.5" + sources."@babel/plugin-transform-literals-7.14.5" + sources."@babel/plugin-transform-member-expression-literals-7.14.5" + sources."@babel/plugin-transform-modules-amd-7.14.5" + sources."@babel/plugin-transform-modules-commonjs-7.14.5" + sources."@babel/plugin-transform-modules-systemjs-7.14.5" + sources."@babel/plugin-transform-modules-umd-7.14.5" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.5" + sources."@babel/plugin-transform-new-target-7.14.5" + sources."@babel/plugin-transform-object-super-7.14.5" + sources."@babel/plugin-transform-parameters-7.14.5" + sources."@babel/plugin-transform-property-literals-7.14.5" + sources."@babel/plugin-transform-react-display-name-7.14.5" + sources."@babel/plugin-transform-react-jsx-7.14.5" + sources."@babel/plugin-transform-react-jsx-development-7.14.5" + sources."@babel/plugin-transform-react-pure-annotations-7.14.5" + sources."@babel/plugin-transform-regenerator-7.14.5" + sources."@babel/plugin-transform-reserved-words-7.14.5" + (sources."@babel/plugin-transform-runtime-7.14.5" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/plugin-transform-shorthand-properties-7.12.13" - sources."@babel/plugin-transform-spread-7.13.0" - sources."@babel/plugin-transform-sticky-regex-7.12.13" - sources."@babel/plugin-transform-template-literals-7.13.0" - sources."@babel/plugin-transform-typeof-symbol-7.12.13" - sources."@babel/plugin-transform-unicode-escapes-7.12.13" - sources."@babel/plugin-transform-unicode-regex-7.12.13" - (sources."@babel/preset-env-7.14.4" // { + sources."@babel/plugin-transform-shorthand-properties-7.14.5" + sources."@babel/plugin-transform-spread-7.14.5" + sources."@babel/plugin-transform-sticky-regex-7.14.5" + sources."@babel/plugin-transform-template-literals-7.14.5" + sources."@babel/plugin-transform-typeof-symbol-7.14.5" + sources."@babel/plugin-transform-unicode-escapes-7.14.5" + sources."@babel/plugin-transform-unicode-regex-7.14.5" + (sources."@babel/preset-env-7.14.5" // { dependencies = [ sources."semver-6.3.0" ]; }) sources."@babel/preset-modules-0.1.4" - sources."@babel/preset-react-7.13.13" + sources."@babel/preset-react-7.14.5" sources."@babel/preset-stage-0-7.8.3" - sources."@babel/register-7.13.16" - sources."@babel/runtime-7.14.0" - sources."@babel/template-7.12.13" - sources."@babel/traverse-7.14.2" - sources."@babel/types-7.14.4" + sources."@babel/register-7.14.5" + sources."@babel/runtime-7.14.5" + sources."@babel/template-7.14.5" + sources."@babel/traverse-7.14.5" + sources."@babel/types-7.14.5" sources."@reach/router-1.3.4" sources."@sindresorhus/is-0.7.0" sources."@types/glob-7.1.3" sources."@types/json-schema-7.0.7" sources."@types/minimatch-3.0.4" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.4" sources."@webassemblyjs/ast-1.9.0" @@ -102356,7 +102095,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001232" + sources."caniuse-lite-1.0.30001237" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caw-2.0.1" (sources."chalk-2.4.2" // { @@ -102429,7 +102168,7 @@ in }) sources."concat-map-0.0.1" sources."concat-stream-1.6.2" - sources."config-chain-1.1.12" + sources."config-chain-1.1.13" sources."connect-history-api-fallback-1.6.0" sources."console-browserify-1.2.0" sources."constants-browserify-1.0.0" @@ -102441,7 +102180,7 @@ in sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.13.1" // { + (sources."core-js-compat-3.14.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -102566,7 +102305,11 @@ in }) sources."domain-browser-1.2.0" sources."domelementtype-1.3.1" - sources."domhandler-2.4.2" + (sources."domhandler-4.2.0" // { + dependencies = [ + sources."domelementtype-2.2.0" + ]; + }) sources."domutils-1.7.0" sources."dot-prop-5.3.0" (sources."download-7.1.0" // { @@ -102581,7 +102324,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.743" + sources."electron-to-chromium-1.3.752" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -102806,10 +102549,11 @@ in sources."loader-utils-0.2.17" ]; }) - (sources."htmlparser2-3.10.1" // { + (sources."htmlparser2-6.1.0" // { dependencies = [ - sources."entities-1.1.2" - sources."readable-stream-3.6.0" + sources."dom-serializer-1.3.2" + sources."domelementtype-2.2.0" + sources."domutils-2.7.0" ]; }) sources."http-cache-semantics-3.8.1" @@ -102979,11 +102723,7 @@ in }) sources."mime-2.5.2" sources."mime-db-1.48.0" - (sources."mime-types-2.1.30" // { - dependencies = [ - sources."mime-db-1.47.0" - ]; - }) + sources."mime-types-2.1.31" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" @@ -103024,7 +102764,7 @@ in ]; }) sources."node-modules-regexp-1.0.0" - sources."node-releases-1.1.72" + sources."node-releases-1.1.73" sources."normalize-path-3.0.0" sources."normalize-range-0.1.2" (sources."normalize-url-2.0.1" // { @@ -103118,7 +102858,7 @@ in ]; }) sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.35" // { + (sources."postcss-7.0.36" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -103312,9 +103052,15 @@ in }) sources."relateurl-0.2.7" sources."remove-trailing-separator-1.1.0" - (sources."renderkid-2.0.5" // { + (sources."renderkid-2.0.7" // { dependencies = [ sources."ansi-regex-2.1.1" + sources."css-select-4.1.3" + sources."css-what-5.0.1" + sources."dom-serializer-1.3.2" + sources."domelementtype-2.2.0" + sources."domutils-2.7.0" + sources."nth-check-2.0.0" sources."strip-ansi-3.0.1" ]; }) @@ -103684,7 +103430,7 @@ in dependencies = [ sources."acorn-7.4.1" sources."commander-2.20.3" - sources."ws-6.2.1" + sources."ws-6.2.2" ]; }) (sources."webpack-dev-middleware-3.7.3" // { @@ -103720,7 +103466,7 @@ in sources."semver-6.3.0" sources."strip-ansi-3.0.1" sources."to-regex-range-2.1.1" - sources."ws-6.2.1" + sources."ws-6.2.2" ]; }) sources."webpack-flush-chunks-2.0.3" @@ -103835,7 +103581,7 @@ in sources."@mozilla/readability-0.4.1" sources."@tootallnate/once-1.1.2" sources."abab-2.0.5" - sources."acorn-8.3.0" + sources."acorn-8.4.0" (sources."acorn-globals-6.0.0" // { dependencies = [ sources."acorn-7.4.1" @@ -103886,8 +103632,8 @@ in sources."jsdom-16.6.0" sources."levn-0.3.0" sources."lodash-4.17.21" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."ms-2.1.2" sources."nwsapi-2.2.0" sources."optionator-0.8.3" @@ -103911,7 +103657,7 @@ in sources."webidl-conversions-6.1.0" sources."whatwg-encoding-1.0.5" sources."whatwg-mimetype-2.3.0" - sources."whatwg-url-8.5.0" + sources."whatwg-url-8.6.0" sources."word-wrap-1.2.3" sources."wrap-ansi-7.0.0" sources."ws-7.4.6" @@ -103934,50 +103680,45 @@ in redoc-cli = nodeEnv.buildNodePackage { name = "redoc-cli"; packageName = "redoc-cli"; - version = "0.11.4"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.11.4.tgz"; - sha512 = "Ke/Lvy9fwLuZGpeILZfJOyBtwGhgOFLQdptAf0LdGt9l44DfwGVw7ppaqXoJEr1rXyu2eO0UtH2UnG5/CCigVw=="; + url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.12.1.tgz"; + sha512 = "Ew8ByEayRBZgG9iLv2ZO+h3ZMz55naz1jA1CPt6Vm0xcSbVNYb7ubnbHhSvUGshc2bGu8Je74k1veFZZqXjBeQ=="; }; dependencies = [ - sources."@babel/code-frame-7.12.13" - (sources."@babel/generator-7.14.3" // { + sources."@babel/code-frame-7.14.5" + (sources."@babel/generator-7.14.5" // { dependencies = [ sources."source-map-0.5.7" ]; }) - sources."@babel/helper-annotate-as-pure-7.12.13" - sources."@babel/helper-function-name-7.14.2" - sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-module-imports-7.13.12" - sources."@babel/helper-split-export-declaration-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - sources."@babel/highlight-7.14.0" - sources."@babel/parser-7.14.4" - sources."@babel/runtime-7.14.0" - sources."@babel/template-7.12.13" - sources."@babel/traverse-7.14.2" - sources."@babel/types-7.14.4" + sources."@babel/helper-annotate-as-pure-7.14.5" + sources."@babel/helper-function-name-7.14.5" + sources."@babel/helper-get-function-arity-7.14.5" + sources."@babel/helper-hoist-variables-7.14.5" + sources."@babel/helper-module-imports-7.14.5" + sources."@babel/helper-split-export-declaration-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/highlight-7.14.5" + sources."@babel/parser-7.14.5" + sources."@babel/runtime-7.14.5" + sources."@babel/template-7.14.5" + sources."@babel/traverse-7.14.5" + sources."@babel/types-7.14.5" sources."@emotion/is-prop-valid-0.8.8" sources."@emotion/memoize-0.7.4" sources."@emotion/stylis-0.8.5" sources."@emotion/unitless-0.7.5" sources."@exodus/schemasafe-1.0.0-rc.3" sources."@redocly/ajv-6.12.4" - (sources."@redocly/openapi-core-1.0.0-beta.49" // { + (sources."@redocly/openapi-core-1.0.0-beta.50" // { dependencies = [ - sources."@types/node-14.17.1" + sources."@types/node-14.17.3" ]; }) - sources."@redocly/react-dropdown-aria-2.0.11" + sources."@redocly/react-dropdown-aria-2.0.12" sources."@types/json-schema-7.0.7" - sources."@types/node-13.13.52" - (sources."ajv-5.5.2" // { - dependencies = [ - sources."fast-deep-equal-1.1.0" - sources."json-schema-traverse-0.3.1" - ]; - }) + sources."@types/node-15.12.2" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.2" @@ -103996,7 +103737,6 @@ in sources."babel-plugin-syntax-jsx-6.18.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" - sources."better-ajv-errors-0.6.7" sources."binary-extensions-2.2.0" sources."bn.js-5.2.0" sources."brace-expansion-1.1.11" @@ -104021,7 +103761,6 @@ in sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" sources."call-me-maybe-1.0.1" - sources."camelcase-5.3.1" sources."camelize-1.0.0" sources."chalk-2.4.2" sources."chokidar-3.5.1" @@ -104030,15 +103769,12 @@ in sources."clipboard-2.0.8" sources."cliui-7.0.4" sources."clsx-1.1.1" - sources."co-4.6.0" - sources."code-error-fragment-0.0.230" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."colorette-1.2.2" sources."concat-map-0.0.1" sources."console-browserify-1.2.0" sources."constants-browserify-1.0.0" - sources."core-js-3.13.1" sources."core-util-is-1.0.2" (sources."create-ecdh-4.0.4" // { dependencies = [ @@ -104051,7 +103787,6 @@ in sources."css-color-keywords-1.0.0" sources."css-to-react-native-3.0.0" sources."debug-4.3.2" - sources."decamelize-1.2.0" sources."decko-1.2.0" sources."delegate-3.2.0" sources."des.js-1.0.1" @@ -104080,14 +103815,12 @@ in sources."fast-json-stable-stringify-2.1.0" sources."fast-safe-stringify-2.0.7" sources."fill-range-7.0.1" - sources."find-up-4.1.0" sources."foreach-2.0.5" sources."fsevents-2.3.2" sources."get-caller-file-2.0.5" sources."glob-parent-5.1.2" sources."globals-11.12.0" sources."good-listener-1.2.2" - sources."grapheme-splitter-1.0.4" sources."handlebars-4.7.7" sources."has-flag-3.0.0" (sources."hash-base-3.1.0" // { @@ -104119,18 +103852,14 @@ in sources."jsesc-2.5.2" sources."json-pointer-0.6.1" sources."json-schema-traverse-0.4.1" - sources."json-to-ast-2.1.0" - sources."jsonpointer-4.1.0" - sources."leven-3.1.0" - sources."locate-path-5.0.0" sources."lodash-4.17.21" sources."lodash.isequal-4.5.0" sources."loose-envify-1.4.0" - sources."lunr-2.3.8" + sources."lunr-2.3.9" sources."mark.js-8.11.1" sources."marked-0.7.0" sources."md5.js-1.3.5" - sources."memoize-one-5.1.1" + sources."memoize-one-5.2.1" (sources."miller-rabin-4.0.1" // { dependencies = [ sources."bn.js-4.12.0" @@ -104153,27 +103882,19 @@ in sources."normalize-path-3.0.0" sources."oas-kit-common-1.0.8" sources."oas-linter-3.2.2" - (sources."oas-resolver-2.5.5" // { - dependencies = [ - sources."yargs-17.0.1" - ]; - }) + sources."oas-resolver-2.5.5" sources."oas-schema-walker-1.1.5" - sources."oas-validator-4.0.8" + sources."oas-validator-5.0.6" sources."object-assign-4.1.1" sources."openapi-sampler-1.0.1" sources."os-browserify-0.3.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-try-2.2.0" sources."pako-1.0.11" sources."parse-asn1-5.1.6" sources."path-browserify-0.0.1" - sources."path-exists-4.0.0" sources."pbkdf2-3.1.2" sources."perfect-scrollbar-1.5.1" sources."picomatch-2.3.0" - sources."polished-3.7.2" + sources."polished-4.1.3" sources."postcss-value-parser-4.1.0" sources."prismjs-1.23.0" sources."process-0.11.10" @@ -104189,8 +103910,8 @@ in sources."querystring-es3-0.2.1" sources."randombytes-2.1.0" sources."randomfill-1.0.4" - sources."react-16.14.0" - sources."react-dom-16.14.0" + sources."react-17.0.2" + sources."react-dom-17.0.2" sources."react-is-16.13.1" sources."react-tabs-3.2.2" (sources."readable-stream-2.3.7" // { @@ -104202,17 +103923,19 @@ in ]; }) sources."readdirp-3.5.0" - sources."redoc-2.0.0-rc.53" + (sources."redoc-2.0.0-rc.54" // { + dependencies = [ + sources."path-browserify-1.0.1" + ]; + }) sources."reftools-1.1.8" sources."regenerator-runtime-0.13.8" sources."require-directory-2.1.1" - sources."require-main-filename-2.0.0" sources."ripemd160-2.0.2" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."scheduler-0.19.1" + sources."scheduler-0.20.2" sources."select-1.1.2" - sources."set-blocking-2.0.0" sources."setimmediate-1.0.5" sources."sha.js-2.4.11" sources."shallowequal-1.1.0" @@ -104222,7 +103945,7 @@ in sources."should-type-1.4.0" sources."should-type-adaptors-1.1.0" sources."should-util-1.0.1" - sources."slugify-1.5.3" + sources."slugify-1.4.7" sources."source-map-0.6.1" sources."sprintf-js-1.0.3" sources."stickyfill-1.1.1" @@ -104233,15 +103956,14 @@ in sources."strip-ansi-6.0.0" sources."styled-components-5.3.0" sources."supports-color-5.5.0" - sources."swagger2openapi-6.2.3" + sources."swagger2openapi-7.0.6" sources."timers-browserify-2.0.12" sources."tiny-emitter-2.1.0" sources."to-arraybuffer-1.0.1" sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" - sources."tslib-2.2.0" sources."tty-browserify-0.0.0" - sources."uglify-js-3.13.8" + sources."uglify-js-3.13.9" (sources."uri-js-4.4.1" // { dependencies = [ sources."punycode-2.1.1" @@ -104260,7 +103982,6 @@ in }) sources."util-deprecate-1.0.2" sources."vm-browserify-1.1.2" - sources."which-module-2.0.0" sources."wordwrap-1.0.0" (sources."wrap-ansi-7.0.0" // { dependencies = [ @@ -104273,17 +103994,7 @@ in sources."y18n-5.0.8" sources."yaml-1.10.2" sources."yaml-ast-parser-0.0.43" - (sources."yargs-15.4.1" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."cliui-6.0.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."wrap-ansi-6.2.0" - sources."y18n-4.0.3" - sources."yargs-parser-18.1.3" - ]; - }) + sources."yargs-17.0.1" sources."yargs-parser-20.2.7" ]; buildInputs = globalBuildInputs; @@ -104439,10 +104150,10 @@ in "reveal.js" = nodeEnv.buildNodePackage { name = "reveal.js"; packageName = "reveal.js"; - version = "4.1.1"; + version = "4.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/reveal.js/-/reveal.js-4.1.1.tgz"; - sha512 = "Ol+/3LF4sZKQQOaG7/Jsa7t5Kix1I+dx9UEYL8mOOn2sWROtLcbI3AGHZbNQPWeuvnQ/y1R3MJ0vN9ZI5nBPUg=="; + url = "https://registry.npmjs.org/reveal.js/-/reveal.js-4.1.3.tgz"; + sha512 = "5VbL4nVDUedVKnOIIM3UQAIUlp+CvR/SrUkrN5GDoVfcWJAxH2oIh7PWyShy7+pE7tgkH2q+3e5EikGRpgE+oA=="; }; buildInputs = globalBuildInputs; meta = { @@ -104488,10 +104199,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.50.5"; + version = "2.51.2"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.50.5.tgz"; - sha512 = "Ztz4NurU2LbS3Jn5rlhnYv35z6pkjBUmYKr94fOBIKINKRO6kug9NTFHArT7jqwMP2kqEZ39jJuEtkk91NBltQ=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.51.2.tgz"; + sha512 = "ReV2eGEadA7hmXSzjxdDKs10neqH2QURf2RxJ6ayAlq93ugy6qIvXMmbc5cWMGCDh1h5T4thuWO1e2VNbMq8FA=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -104513,22 +104224,21 @@ in src = ../../misc/vscode-extensions/rust-analyzer/build-deps; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.0" - (sources."@babel/highlight-7.14.0" // { + sources."@babel/helper-validator-identifier-7.14.5" + (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" sources."escape-string-regexp-1.0.5" ]; }) - (sources."@eslint/eslintrc-0.4.1" // { + (sources."@eslint/eslintrc-0.4.2" // { dependencies = [ - sources."globals-12.4.0" sources."ignore-4.0.6" ]; }) - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.7" sources."@rollup/plugin-commonjs-17.1.0" sources."@rollup/plugin-node-resolve-11.2.1" (sources."@rollup/pluginutils-3.1.0" // { @@ -104545,14 +104255,14 @@ in sources."@types/node-12.12.70" sources."@types/node-fetch-2.5.10" sources."@types/resolve-1.17.1" - sources."@types/vscode-1.56.0" - sources."@typescript-eslint/eslint-plugin-4.26.0" - sources."@typescript-eslint/experimental-utils-4.26.0" - sources."@typescript-eslint/parser-4.26.0" - sources."@typescript-eslint/scope-manager-4.26.0" - sources."@typescript-eslint/types-4.26.0" - sources."@typescript-eslint/typescript-estree-4.26.0" - sources."@typescript-eslint/visitor-keys-4.26.0" + sources."@types/vscode-1.57.0" + sources."@typescript-eslint/eslint-plugin-4.26.1" + sources."@typescript-eslint/experimental-utils-4.26.1" + sources."@typescript-eslint/parser-4.26.1" + sources."@typescript-eslint/scope-manager-4.26.1" + sources."@typescript-eslint/types-4.26.1" + sources."@typescript-eslint/typescript-estree-4.26.1" + sources."@typescript-eslint/visitor-keys-4.26.1" sources."@ungap/promise-all-settled-1.1.2" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" @@ -104593,8 +104303,8 @@ in sources."supports-color-7.2.0" ]; }) - sources."cheerio-1.0.0-rc.9" - sources."cheerio-select-1.4.0" + sources."cheerio-1.0.0-rc.10" + sources."cheerio-select-1.5.0" sources."chokidar-3.5.1" sources."cliui-7.0.4" sources."color-convert-1.9.3" @@ -104606,7 +104316,7 @@ in sources."concat-map-0.0.1" sources."core-util-is-1.0.2" sources."cross-spawn-7.0.3" - sources."css-select-4.1.2" + sources."css-select-4.1.3" sources."css-what-5.0.1" sources."debug-4.3.2" sources."decamelize-4.0.0" @@ -104620,7 +104330,7 @@ in sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" sources."domhandler-4.2.0" - sources."domutils-2.6.0" + sources."domutils-2.7.0" sources."duplexer2-0.1.4" (sources."editorconfig-0.15.3" // { dependencies = [ @@ -104634,7 +104344,7 @@ in sources."entities-2.2.0" sources."escalade-3.1.1" sources."escape-string-regexp-4.0.0" - (sources."eslint-7.27.0" // { + (sources."eslint-7.28.0" // { dependencies = [ (sources."eslint-utils-2.1.0" // { dependencies = [ @@ -104692,11 +104402,7 @@ in sources."get-intrinsic-1.1.1" sources."glob-7.1.7" sources."glob-parent-5.1.2" - (sources."globals-13.9.0" // { - dependencies = [ - sources."type-fest-0.20.2" - ]; - }) + sources."globals-13.9.0" sources."globby-11.0.3" sources."graceful-fs-4.2.6" sources."growl-1.10.5" @@ -104748,8 +104454,8 @@ in sources."merge2-1.4.1" sources."micromatch-4.0.4" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -104820,7 +104526,7 @@ in sources."resolve-from-4.0.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."rollup-2.50.5" + sources."rollup-2.51.2" sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."semver-7.3.5" @@ -104851,15 +104557,15 @@ in sources."supports-color-5.5.0" (sources."table-6.7.1" // { dependencies = [ - sources."ajv-8.5.0" + sources."ajv-8.6.0" sources."json-schema-traverse-1.0.0" ]; }) sources."text-table-0.2.0" - sources."tmp-0.0.29" + sources."tmp-0.2.1" sources."to-regex-range-5.0.1" sources."traverse-0.3.9" - sources."tslib-2.2.0" + sources."tslib-2.3.0" (sources."tsutils-3.21.0" // { dependencies = [ sources."tslib-1.14.1" @@ -104867,7 +104573,7 @@ in }) sources."tunnel-0.0.6" sources."type-check-0.4.0" - sources."type-fest-0.8.1" + sources."type-fest-0.20.2" sources."typed-rest-client-1.8.4" sources."typescript-4.3.2" sources."typescript-formatter-7.2.2" @@ -104878,7 +104584,7 @@ in sources."url-join-1.1.0" sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.3.0" - (sources."vsce-1.91.0" // { + (sources."vsce-1.93.0" // { dependencies = [ sources."chalk-2.4.2" sources."commander-6.2.1" @@ -105006,8 +104712,8 @@ in sources."keypress-0.1.0" sources."methods-0.1.0" sources."mime-1.2.11" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mkdirp-0.3.5" sources."ms-2.1.2" sources."multiparty-2.2.0" @@ -105061,10 +104767,10 @@ in sass = nodeEnv.buildNodePackage { name = "sass"; packageName = "sass"; - version = "1.34.0"; + version = "1.34.1"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.34.0.tgz"; - sha512 = "rHEN0BscqjUYuomUEaqq3BMgsXqQfkcMVR7UhscsAVub0/spUrZGBMxQXFS2kfiDsPLZw5yuU9iJEFNC2x38Qw=="; + url = "https://registry.npmjs.org/sass/-/sass-1.34.1.tgz"; + sha512 = "scLA7EIZM+MmYlej6sdVr0HRbZX5caX5ofDT9asWnUJj21oqgsC+1LuNfm0eg+vM0fCTZHhwImTiCU0sx9h9CQ=="; }; dependencies = [ sources."anymatch-3.1.2" @@ -105118,15 +104824,15 @@ in serve = nodeEnv.buildNodePackage { name = "serve"; packageName = "serve"; - version = "11.3.2"; + version = "12.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/serve/-/serve-11.3.2.tgz"; - sha512 = "yKWQfI3xbj/f7X1lTBg91fXBP0FqjJ4TEi+ilES5yzH0iKJpN5LjNb1YzIfQg9Rqn4ECUS2SOf2+Kmepogoa5w=="; + url = "https://registry.npmjs.org/serve/-/serve-12.0.0.tgz"; + sha512 = "BkTsETQYynAZ7rXX414kg4X6EvuZQS3UVs1NY0VQYdRHSTYWPYcH38nnDh48D0x6ONuislgjag8uKlU2gTBImA=="; }; dependencies = [ sources."@zeit/schemas-2.6.0" sources."accepts-1.3.7" - sources."ajv-6.5.3" + sources."ajv-6.12.6" sources."ansi-align-2.0.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" @@ -105139,9 +104845,11 @@ in sources."camelcase-4.1.0" sources."chalk-2.4.1" sources."cli-boxes-1.0.0" - (sources."clipboardy-1.2.3" // { + (sources."clipboardy-2.3.0" // { dependencies = [ - sources."execa-0.8.0" + sources."cross-spawn-6.0.5" + sources."execa-1.0.0" + sources."get-stream-4.1.0" ]; }) sources."color-convert-1.9.3" @@ -105153,9 +104861,10 @@ in sources."cross-spawn-5.1.0" sources."debug-2.6.9" sources."deep-extend-0.6.0" + sources."end-of-stream-1.4.4" sources."escape-string-regexp-1.0.5" sources."execa-0.7.0" - sources."fast-deep-equal-2.0.1" + sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" (sources."fast-url-parser-1.1.3" // { dependencies = [ @@ -105165,30 +104874,36 @@ in sources."get-stream-3.0.0" sources."has-flag-3.0.0" sources."ini-1.3.8" + sources."is-docker-2.2.1" sources."is-fullwidth-code-point-2.0.0" sources."is-stream-1.1.0" + sources."is-wsl-2.2.0" sources."isexe-2.0.0" sources."json-schema-traverse-0.4.1" sources."lru-cache-4.1.5" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."ms-2.0.0" sources."negotiator-0.6.2" + sources."nice-try-1.0.5" sources."npm-run-path-2.0.2" sources."on-headers-1.0.2" + sources."once-1.4.0" sources."p-finally-1.0.0" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" sources."path-to-regexp-2.2.1" sources."pseudomap-1.0.2" + sources."pump-3.0.0" sources."punycode-2.1.1" sources."range-parser-1.2.0" sources."rc-1.2.8" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."safe-buffer-5.1.2" + sources."semver-5.7.1" (sources."serve-handler-6.1.3" // { dependencies = [ sources."mime-db-1.33.0" @@ -105209,12 +104924,13 @@ in sources."vary-1.1.2" sources."which-1.3.1" sources."widest-line-2.0.1" + sources."wrappy-1.0.2" sources."yallist-2.1.2" ]; buildInputs = globalBuildInputs; meta = { description = "Static file serving and directory listing"; - homepage = "https://github.com/zeit/serve#readme"; + homepage = "https://github.com/vercel/serve#readme"; license = "MIT"; }; production = true; @@ -105224,10 +104940,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "2.43.1"; + version = "2.46.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-2.43.1.tgz"; - sha512 = "KasMG0u78+QBMecuT1Cit3PdHA1Wl6xyjrWgFEdtJnI5mBcMA9FZVMvdqRk1VjaQtnvNJfpbzfJa6Aj2rrqXWQ=="; + url = "https://registry.npmjs.org/serverless/-/serverless-2.46.0.tgz"; + sha512 = "InHN7TTMezGrxejFKCtTKaUGbpbWoXVltLITgXoKdCkqUg66DkAwvf3kkTTy8/wKnTxYIdBbqNS5n1NHvzo4wg=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -105238,9 +104954,9 @@ in ]; }) sources."@kwsites/promise-deferred-1.1.1" - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.7" sources."@protobufjs/aspromise-1.1.2" sources."@protobufjs/base64-1.1.2" sources."@protobufjs/codegen-2.0.4" @@ -105260,7 +104976,7 @@ in ]; }) sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-3.10.1" // { + (sources."@serverless/components-3.12.0" // { dependencies = [ (sources."@serverless/utils-4.1.0" // { dependencies = [ @@ -105288,15 +105004,15 @@ in sources."semver-6.3.0" ]; }) - sources."@serverless/dashboard-plugin-5.1.4" + sources."@serverless/dashboard-plugin-5.3.0" sources."@serverless/event-mocks-1.1.1" - (sources."@serverless/platform-client-4.2.2" // { + (sources."@serverless/platform-client-4.2.3" // { dependencies = [ sources."adm-zip-0.4.16" sources."js-yaml-3.14.1" ]; }) - (sources."@serverless/platform-client-china-2.1.13" // { + (sources."@serverless/platform-client-china-2.1.14" // { dependencies = [ sources."dotenv-8.6.0" sources."js-yaml-3.14.1" @@ -105310,7 +105026,7 @@ in sources."write-file-atomic-3.0.3" ]; }) - sources."@serverless/utils-china-1.1.0" + sources."@serverless/utils-china-1.1.1" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@tencent-sdk/capi-1.1.8" @@ -105329,7 +105045,7 @@ in sources."@types/keyv-3.1.1" sources."@types/lodash-4.14.170" sources."@types/long-4.0.1" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."@types/readable-stream-2.3.10" sources."@types/request-2.48.5" sources."@types/request-promise-native-1.0.17" @@ -105391,7 +105107,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.918.0" // { + (sources."aws-sdk-2.927.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -105563,7 +105279,7 @@ in sources."dijkstrajs-1.0.2" sources."dir-glob-3.0.1" sources."dot-qs-0.2.0" - sources."dotenv-9.0.2" + sources."dotenv-10.0.0" sources."duplexer3-0.1.4" sources."duplexify-4.1.1" sources."duration-0.2.2" @@ -105651,7 +105367,7 @@ in dependencies = [ sources."@sindresorhus/is-4.0.1" sources."@szmarczak/http-timer-4.0.5" - sources."cacheable-request-7.0.1" + sources."cacheable-request-7.0.2" sources."decompress-response-6.0.0" sources."defer-to-connect-2.0.1" sources."get-stream-5.2.0" @@ -105659,6 +105375,7 @@ in sources."keyv-4.0.3" sources."lowercase-keys-2.0.0" sources."mimic-response-3.1.0" + sources."normalize-url-6.0.1" sources."p-cancelable-2.1.1" sources."responselike-2.0.0" ]; @@ -105797,8 +105514,8 @@ in sources."methods-1.1.2" sources."micromatch-4.0.4" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -105925,7 +105642,7 @@ in sources."signal-exit-3.0.3" sources."simple-concat-1.0.1" sources."simple-get-2.8.1" - (sources."simple-git-2.39.0" // { + (sources."simple-git-2.39.1" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -106233,8 +105950,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."moment-2.7.0" @@ -106735,43 +106452,39 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.619.0"; + version = "1.630.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.619.0.tgz"; - sha512 = "ZQFDU+WniTjD6Z1vqKQcBq50jJ9DWSBBCg0PNW54MZbK5oO+L2rHtbpaD3NI3lQI+AFCe64kdzkWMgsEemkFHQ=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.630.0.tgz"; + sha512 = "66JBqGFciNAE7ZcxAhvsKCCYDYgkATlH2u9Ro34cGYsj2ak7rawylYyzowdT8cBe390kK7H4eyxHwwYAKXHpqQ=="; }; dependencies = [ sources."@arcanis/slice-ansi-1.0.2" sources."@deepcode/dcignore-1.0.2" - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.7" sources."@octetstream/promisify-2.0.2" sources."@open-policy-agent/opa-wasm-1.2.0" sources."@sindresorhus/is-4.0.1" sources."@snyk/cli-interface-2.11.0" sources."@snyk/cloud-config-parser-1.9.2" sources."@snyk/cocoapods-lockfile-parser-3.6.2" - (sources."@snyk/code-client-3.7.0" // { - dependencies = [ - sources."uuid-8.3.2" - ]; - }) + sources."@snyk/code-client-3.8.1" sources."@snyk/composer-lockfile-parser-1.4.1" (sources."@snyk/dep-graph-1.28.0" // { dependencies = [ sources."semver-7.3.5" ]; }) - sources."@snyk/docker-registry-v2-client-2.1.3" + sources."@snyk/docker-registry-v2-client-2.2.1" sources."@snyk/fast-glob-3.2.6-patch" - (sources."@snyk/fix-1.601.0" // { + (sources."@snyk/fix-1.620.0" // { dependencies = [ sources."chalk-4.1.0" sources."strip-ansi-6.0.0" ]; }) - (sources."@snyk/fix-pipenv-pipfile-0.3.5" // { + (sources."@snyk/fix-pipenv-pipfile-0.4.3" // { dependencies = [ sources."debug-4.3.1" ]; @@ -106794,13 +106507,13 @@ in }) (sources."@snyk/mix-parser-1.3.2" // { dependencies = [ - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) sources."@snyk/rpm-parser-2.2.1" (sources."@snyk/snyk-cocoapods-plugin-2.5.2" // { dependencies = [ - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) (sources."@snyk/snyk-docker-pull-3.2.5" // { @@ -106810,7 +106523,7 @@ in }) (sources."@snyk/snyk-hex-plugin-1.1.4" // { dependencies = [ - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) sources."@szmarczak/http-timer-4.0.5" @@ -106827,7 +106540,6 @@ in sources."@types/lodash.omit-4.5.6" sources."@types/lodash.union-4.6.6" sources."@types/minimatch-3.0.4" - sources."@types/multimatch-4.0.0" sources."@types/node-13.13.52" sources."@types/responselike-1.0.0" sources."@types/sarif-2.1.3" @@ -106893,7 +106605,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."binjumper-0.1.4" sources."bl-4.1.0" - sources."boolean-3.1.0" + sources."boolean-3.1.2" sources."bottleneck-2.19.5" (sources."boxen-5.0.1" // { dependencies = [ @@ -106910,7 +106622,7 @@ in sources."buffer-5.7.1" sources."buffer-from-1.1.1" sources."cacheable-lookup-5.0.4" - (sources."cacheable-request-7.0.1" // { + (sources."cacheable-request-7.0.2" // { dependencies = [ sources."get-stream-5.2.0" ]; @@ -106928,7 +106640,6 @@ in }) sources."chardet-0.7.0" sources."child-process-1.0.2" - sources."child_process-1.0.2" sources."chownr-2.0.0" sources."ci-info-2.0.0" sources."clean-stack-2.2.0" @@ -106944,7 +106655,7 @@ in sources."color-name-1.1.4" sources."concat-map-0.0.1" sources."configstore-5.0.1" - sources."core-js-3.13.1" + sources."core-js-3.14.0" sources."core-util-is-1.0.2" (sources."cross-spawn-6.0.5" // { dependencies = [ @@ -106962,6 +106673,11 @@ in sources."defaults-1.0.3" sources."defer-to-connect-2.0.1" sources."define-properties-1.1.3" + (sources."del-6.0.0" // { + dependencies = [ + sources."rimraf-3.0.2" + ]; + }) sources."detect-node-2.1.0" sources."diff-4.0.2" sources."dir-glob-3.0.1" @@ -106988,7 +106704,7 @@ in sources."esprima-4.0.1" (sources."event-loop-spinner-2.1.0" // { dependencies = [ - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) sources."execa-1.0.0" @@ -107049,6 +106765,7 @@ in sources."is-npm-5.0.0" sources."is-number-7.0.0" sources."is-obj-2.0.0" + sources."is-path-cwd-2.2.0" sources."is-path-inside-3.0.3" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" @@ -107126,7 +106843,7 @@ in }) sources."lowercase-keys-2.0.0" sources."lru-cache-6.0.0" - sources."macos-release-2.4.1" + sources."macos-release-2.5.0" sources."make-dir-3.1.0" (sources."matcher-3.0.0" // { dependencies = [ @@ -107152,7 +106869,7 @@ in }) sources."nice-try-1.0.5" sources."node.extend-2.0.2" - sources."normalize-url-4.5.1" + sources."normalize-url-6.0.1" sources."npm-run-path-2.0.2" sources."object-hash-2.2.0" sources."object-keys-1.1.1" @@ -107189,6 +106906,7 @@ in sources."json-buffer-3.0.0" sources."keyv-3.1.0" sources."lowercase-keys-1.0.1" + sources."normalize-url-4.5.1" sources."p-cancelable-1.1.0" sources."responselike-1.0.2" ]; @@ -107202,6 +106920,7 @@ in sources."picomatch-2.3.0" sources."pluralize-7.0.0" sources."prepend-http-2.0.0" + sources."prettier-2.3.1" sources."pretty-bytes-5.6.0" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" @@ -107259,7 +106978,7 @@ in (sources."snyk-cpp-plugin-2.2.1" // { dependencies = [ sources."chalk-4.1.1" - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) (sources."snyk-docker-plugin-4.20.8" // { @@ -107269,7 +106988,6 @@ in sources."semver-7.3.5" sources."snyk-nodejs-lockfile-parser-1.34.0" sources."tmp-0.2.1" - sources."uuid-8.3.2" ]; }) sources."snyk-go-parser-1.4.1" @@ -107284,11 +107002,11 @@ in sources."chalk-3.0.0" sources."rimraf-3.0.2" sources."tmp-0.2.1" - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) sources."snyk-module-3.1.0" - (sources."snyk-mvn-plugin-2.26.0" // { + (sources."snyk-mvn-plugin-2.26.1" // { dependencies = [ (sources."@snyk/java-call-graph-builder-1.21.0" // { dependencies = [ @@ -107309,7 +107027,6 @@ in sources."argparse-2.0.1" sources."js-yaml-4.1.0" sources."p-map-2.1.0" - sources."uuid-8.3.2" ]; }) (sources."snyk-nuget-plugin-1.21.1" // { @@ -107329,7 +107046,7 @@ in }) (sources."snyk-poetry-lockfile-parser-1.1.6" // { dependencies = [ - sources."tslib-2.2.0" + sources."tslib-2.3.0" ]; }) (sources."snyk-policy-1.19.0" // { @@ -107394,9 +107111,10 @@ in sources."tar-6.1.0" sources."tar-stream-2.2.0" sources."temp-dir-2.0.0" - (sources."tempfile-2.0.0" // { + (sources."tempy-1.0.1" // { dependencies = [ - sources."temp-dir-1.0.0" + sources."is-stream-2.0.0" + sources."type-fest-0.16.0" ]; }) sources."then-fs-2.0.0" @@ -107430,7 +107148,7 @@ in sources."url-parse-lax-3.0.0" sources."utf8-3.0.0" sources."util-deprecate-1.0.2" - sources."uuid-3.4.0" + sources."uuid-8.3.2" sources."vscode-languageserver-types-3.16.0" sources."wcwidth-1.0.1" sources."which-1.3.1" @@ -107479,7 +107197,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.0" sources."@types/cors-2.8.10" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."accepts-1.3.7" sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" @@ -107489,8 +107207,8 @@ in sources."debug-4.3.2" sources."engine.io-5.1.1" sources."engine.io-parser-4.0.2" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."ms-2.1.2" sources."negotiator-0.6.2" sources."object-assign-4.1.1" @@ -108034,7 +107752,7 @@ in sources."is-symbol-1.0.4" sources."is-typed-array-1.1.5" sources."is-typedarray-1.0.0" - sources."is-valid-domain-0.0.19" + sources."is-valid-domain-0.0.20" sources."is-weakmap-2.0.1" sources."is-weakset-2.0.1" sources."is-windows-1.0.2" @@ -108216,7 +107934,7 @@ in sources."polyraf-1.1.0" sources."posix-character-classes-0.1.1" sources."preserve-0.2.0" - sources."prettier-2.3.0" + sources."prettier-2.3.1" (sources."pretty-quick-3.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -108501,7 +108219,7 @@ in ]; }) sources."ssb-ebt-5.6.7" - (sources."ssb-friends-4.4.5" // { + (sources."ssb-friends-4.4.7" // { dependencies = [ sources."flumecodec-0.0.1" sources."level-codec-6.2.0" @@ -108745,7 +108463,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.918.0" // { + (sources."aws-sdk-2.927.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -109101,8 +108819,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-2.1.0" sources."minicap-prebuilt-2.3.0" sources."minimatch-3.0.4" @@ -109522,35 +109240,36 @@ in sha512 = "Mv+BQr5XTUrKqAXmpqm6Ddli6Ief+AiPZkRsIrAoUKFuq/ElkUh9ZMYxXD0iQNZ5ADghZKLOWz1h7hTClB7zgQ=="; }; dependencies = [ - sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.14.4" - sources."@babel/core-7.14.3" - sources."@babel/generator-7.14.3" - sources."@babel/helper-compilation-targets-7.14.4" - sources."@babel/helper-function-name-7.14.2" - sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-member-expression-to-functions-7.13.12" - sources."@babel/helper-module-imports-7.13.12" - sources."@babel/helper-module-transforms-7.14.2" - sources."@babel/helper-optimise-call-expression-7.12.13" - sources."@babel/helper-replace-supers-7.14.4" - sources."@babel/helper-simple-access-7.13.12" - sources."@babel/helper-split-export-declaration-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - sources."@babel/helper-validator-option-7.12.17" - sources."@babel/helpers-7.14.0" - (sources."@babel/highlight-7.14.0" // { + sources."@babel/code-frame-7.14.5" + sources."@babel/compat-data-7.14.5" + sources."@babel/core-7.14.5" + sources."@babel/generator-7.14.5" + sources."@babel/helper-compilation-targets-7.14.5" + sources."@babel/helper-function-name-7.14.5" + sources."@babel/helper-get-function-arity-7.14.5" + sources."@babel/helper-hoist-variables-7.14.5" + sources."@babel/helper-member-expression-to-functions-7.14.5" + sources."@babel/helper-module-imports-7.14.5" + sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-optimise-call-expression-7.14.5" + sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-split-export-declaration-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-option-7.14.5" + sources."@babel/helpers-7.14.5" + (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.4" - sources."@babel/template-7.12.13" - sources."@babel/traverse-7.14.2" - sources."@babel/types-7.14.4" - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" + sources."@babel/parser-7.14.5" + sources."@babel/template-7.14.5" + sources."@babel/traverse-7.14.5" + sources."@babel/types-7.14.5" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.7" sources."@stylelint/postcss-css-in-js-0.37.2" sources."@stylelint/postcss-markdown-0.36.2" sources."@types/mdast-3.0.3" @@ -109558,7 +109277,7 @@ in sources."@types/normalize-package-data-2.4.0" sources."@types/parse-json-4.0.0" sources."@types/unist-2.0.3" - sources."ajv-8.5.0" + sources."ajv-8.6.0" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."array-union-2.1.0" @@ -109577,7 +109296,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001232" + sources."caniuse-lite-1.0.30001237" (sources."chalk-4.1.1" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -109615,7 +109334,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.743" + sources."electron-to-chromium-1.3.752" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -109711,7 +109430,7 @@ in ]; }) sources."ms-2.1.2" - sources."node-releases-1.1.72" + sources."node-releases-1.1.73" (sources."normalize-package-data-3.0.2" // { dependencies = [ sources."semver-7.3.5" @@ -109732,7 +109451,7 @@ in sources."path-parse-1.0.7" sources."path-type-4.0.0" sources."picomatch-2.3.0" - (sources."postcss-7.0.35" // { + (sources."postcss-7.0.36" // { dependencies = [ (sources."chalk-2.4.2" // { dependencies = [ @@ -109848,16 +109567,16 @@ in svelte-language-server = nodeEnv.buildNodePackage { name = "svelte-language-server"; packageName = "svelte-language-server"; - version = "0.14.0"; + version = "0.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.14.0.tgz"; - sha512 = "P9QsonwMBUvwQxJbnNKggvJf1K24xaUhRrzoqkJabHtUT37JyYrt9anMIZ7WmjuKUEI/Ejf+Gu/8A0VvyUBaUQ=="; + url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.14.1.tgz"; + sha512 = "E9gpfM+G6dC+hq5gIytJ3phvdir/k1TcG3XYW0Bixs4xZNhf/z9trtZR/Rxs6BwVGAS64lCprSO4a+yUZKHQ/Q=="; }; dependencies = [ sources."@emmetio/abbreviation-2.2.2" sources."@emmetio/css-abbreviation-2.1.4" sources."@emmetio/scanner-1.0.0" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."@types/pug-2.0.4" sources."@types/sass-1.16.0" sources."anymatch-3.1.2" @@ -109900,9 +109619,9 @@ in sources."strip-indent-3.0.0" sources."svelte-3.38.2" sources."svelte-preprocess-4.7.3" - sources."svelte2tsx-0.2.0" + sources."svelte2tsx-0.2.1" sources."to-regex-range-5.0.1" - sources."tslib-2.2.0" + sources."tslib-2.3.0" sources."typescript-4.3.2" sources."vscode-css-languageservice-5.0.0" sources."vscode-emmet-helper-2.1.2" @@ -109953,7 +109672,7 @@ in sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" sources."domhandler-4.2.0" - sources."domutils-2.6.0" + sources."domutils-2.7.0" sources."entities-2.2.0" sources."has-flag-4.0.0" sources."mdn-data-2.0.14" @@ -110305,8 +110024,8 @@ in sources."methods-1.1.2" sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mixin-deep-1.3.2" @@ -110551,7 +110270,7 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.13.8" + sources."uglify-js-3.13.9" sources."undefsafe-2.0.3" (sources."union-value-1.0.1" // { dependencies = [ @@ -110672,8 +110391,8 @@ in sources."locate-path-3.0.0" sources."long-4.0.0" sources."mime-2.5.2" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."minimist-1.2.5" sources."module-alias-2.2.2" sources."moment-2.29.1" @@ -110717,7 +110436,7 @@ in sources."verror-1.10.0" sources."which-module-2.0.0" sources."wrap-ansi-5.1.0" - sources."ws-6.2.1" + sources."ws-6.2.2" sources."y18n-4.0.3" sources."yargs-13.3.2" sources."yargs-parser-13.1.2" @@ -111169,9 +110888,9 @@ in sha512 = "z/Xo1WHxAn7eueUbRLXoMNew+R3dzGENPG/yiCt/KT2WgAfRuQ7GeF855kLcnCCqdTnl6W7sYq8TKy+/DLpiqQ=="; }; dependencies = [ - sources."@babel/code-frame-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - sources."@babel/highlight-7.14.0" + sources."@babel/code-frame-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/highlight-7.14.5" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@textlint/ast-node-types-4.4.3" @@ -111181,7 +110900,7 @@ in sources."@types/normalize-package-data-2.4.0" sources."@types/parse5-5.0.3" sources."@types/unist-2.0.3" - sources."acorn-8.3.0" + sources."acorn-8.4.0" sources."acorn-jsx-5.3.1" sources."alex-9.1.0" (sources."ansi-align-3.0.0" // { @@ -111932,35 +111651,28 @@ in textlint-rule-write-good = nodeEnv.buildNodePackage { name = "textlint-rule-write-good"; packageName = "textlint-rule-write-good"; - version = "1.6.2"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-write-good/-/textlint-rule-write-good-1.6.2.tgz"; - sha1 = "3c79b04091319d4e8be5fb442c596bf500e8493e"; + url = "https://registry.npmjs.org/textlint-rule-write-good/-/textlint-rule-write-good-2.0.0.tgz"; + sha512 = "yvOJavJD+PgyUzvsoLDDzDtgCVBva/HNhEvsFnYVugrWz0qy2hr+/4B4wkzjro4wfPbwz20GQe5h13N4DeUEeA=="; }; dependencies = [ sources."@textlint/ast-node-types-4.4.3" sources."@textlint/types-1.5.5" - sources."adverb-where-0.0.9" + sources."adverb-where-0.2.5" sources."boundary-1.0.1" - sources."call-bind-1.0.2" - sources."define-properties-1.1.3" + sources."commander-2.20.3" sources."e-prime-0.10.4" - sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.1" - sources."has-1.0.3" - sources."has-symbols-1.0.2" - sources."no-cliches-0.1.1" - sources."object-keys-1.1.1" - sources."object.assign-4.1.2" + sources."no-cliches-0.3.4" sources."passive-voice-0.1.0" sources."structured-source-3.0.2" sources."textlint-rule-helper-2.2.0" - sources."too-wordy-0.1.6" + sources."too-wordy-0.3.4" sources."unist-util-is-3.0.0" sources."unist-util-visit-1.4.1" sources."unist-util-visit-parents-2.1.2" sources."weasel-words-0.1.1" - sources."write-good-0.11.3" + sources."write-good-1.0.8" ]; buildInputs = globalBuildInputs; meta = { @@ -111988,7 +111700,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-15.6.1" + sources."@types/node-15.12.2" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -112039,7 +111751,7 @@ in sources."busboy-0.3.1" sources."bytes-3.1.0" sources."cacheable-lookup-5.0.4" - sources."cacheable-request-7.0.1" + sources."cacheable-request-7.0.2" sources."callsite-1.0.0" sources."caseless-0.12.0" sources."chalk-4.1.0" @@ -112064,7 +111776,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.13.1" + sources."core-js-3.14.0" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -112241,7 +111953,7 @@ in ]; }) sources."nopt-4.0.3" - sources."normalize-url-4.5.1" + sources."normalize-url-6.0.1" sources."npm-bundled-1.1.2" sources."npm-normalize-package-bin-1.0.1" sources."npm-packlist-1.4.8" @@ -112276,6 +111988,7 @@ in sources."json-buffer-3.0.0" sources."keyv-3.1.0" sources."lowercase-keys-1.0.1" + sources."normalize-url-4.5.1" sources."p-cancelable-1.1.0" sources."responselike-1.0.2" sources."semver-6.3.0" @@ -112523,8 +112236,8 @@ in sources."jsprim-1.4.1" sources."keypress-0.2.1" sources."lru-cache-6.0.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -112906,10 +112619,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.13.8"; + version = "3.13.9"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.8.tgz"; - sha512 = "PvFLMFIQHfIjFFlvAch69U2IvIxK9TNzNWt1SxZGp9JZ/v70yvqIQuiJeVPPtUMOzoNt+aNRDk4wgxb34wvEqA=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.9.tgz"; + sha512 = "wZbyTQ1w6Y7fHdt8sJnHfSIuWeDgk6B5rCb4E/AM6QNNPbOMIZph21PW5dRB3h7Df0GszN+t7RuUH6sWK5bF0g=="; }; buildInputs = globalBuildInputs; meta = { @@ -112955,7 +112668,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.0" sources."@types/cors-2.8.10" - sources."@types/node-14.17.1" + sources."@types/node-14.17.3" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" @@ -113008,7 +112721,7 @@ in sources."depd-1.1.2" sources."destroy-1.0.4" sources."diff-5.0.0" - sources."diff2html-3.4.4" + sources."diff2html-3.4.5" sources."dnd-page-scroll-0.0.4" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" @@ -113095,8 +112808,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -113269,7 +112982,7 @@ in sources."d3-dsv-2.0.0" sources."d3-force-2.1.1" sources."d3-format-2.0.0" - sources."d3-geo-2.0.1" + sources."d3-geo-2.0.2" sources."d3-geo-projection-3.0.0" sources."d3-hierarchy-2.0.0" sources."d3-interpolate-2.0.1" @@ -113473,25 +113186,21 @@ in vls = nodeEnv.buildNodePackage { name = "vls"; packageName = "vls"; - version = "0.7.2"; + version = "0.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/vls/-/vls-0.7.2.tgz"; - sha512 = "9nKgSPtNxQlc32K5GgZV++MdsCpNuac/SfxnEmVI0DCF4E0Uekj+RUo7Zk6NnA4veiNMN+AEjAIlbXYWPHgX6Q=="; + url = "https://registry.npmjs.org/vls/-/vls-0.7.4.tgz"; + sha512 = "uU5HCIK5vX096eMA5fBwyR7tv36m1Ssy910w5ILT5OvCUTXgBR58gZRJWrL2HxCyG8oYXC+oFWjhJc7+ExBUgQ=="; }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.0" - (sources."@babel/highlight-7.14.0" // { + sources."@babel/helper-validator-identifier-7.14.5" + (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" sources."escape-string-regexp-1.0.5" ]; }) - (sources."@eslint/eslintrc-0.4.1" // { - dependencies = [ - sources."globals-12.4.0" - ]; - }) + sources."@eslint/eslintrc-0.4.2" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" sources."ajv-6.12.6" @@ -113525,8 +113234,8 @@ in sources."emoji-regex-8.0.0" sources."enquirer-2.3.6" sources."escape-string-regexp-4.0.0" - sources."eslint-7.27.0" - sources."eslint-plugin-vue-7.10.0" + sources."eslint-7.28.0" + sources."eslint-plugin-vue-7.11.0" sources."eslint-scope-5.1.1" (sources."eslint-utils-2.1.0" // { dependencies = [ @@ -113563,11 +113272,7 @@ in sources."functional-red-black-tree-1.0.1" sources."glob-7.1.7" sources."glob-parent-5.1.2" - (sources."globals-13.9.0" // { - dependencies = [ - sources."type-fest-0.20.2" - ]; - }) + sources."globals-13.9.0" sources."has-1.0.3" sources."has-flag-3.0.0" sources."ignore-4.0.6" @@ -113602,7 +113307,7 @@ in sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."prelude-ls-1.2.1" - sources."prettier-2.3.0" + sources."prettier-2.3.1" sources."progress-2.0.3" sources."punycode-2.1.1" sources."regexpp-3.1.0" @@ -113627,7 +113332,7 @@ in sources."supports-color-5.5.0" (sources."table-6.7.1" // { dependencies = [ - sources."ajv-8.5.0" + sources."ajv-8.6.0" sources."json-schema-traverse-1.0.0" ]; }) @@ -113642,7 +113347,7 @@ in }) sources."tsutils-2.29.0" sources."type-check-0.4.0" - sources."type-fest-0.8.1" + sources."type-fest-0.20.2" sources."typescript-4.3.2" sources."uri-js-4.4.1" sources."v8-compile-cache-2.3.0" @@ -113831,229 +113536,111 @@ in "vscode-lldb-build-deps-../../misc/vscode-extensions/vscode-lldb/build-deps" = nodeEnv.buildNodePackage { name = "vscode-lldb"; packageName = "vscode-lldb"; - version = "1.6.1"; + version = "1.6.4"; src = ../../misc/vscode-extensions/vscode-lldb/build-deps; dependencies = [ - sources."@types/json5-0.0.30" + sources."@discoveryjs/json-ext-0.5.3" + sources."@types/eslint-7.2.13" + sources."@types/eslint-scope-3.7.0" + sources."@types/estree-0.0.47" + sources."@types/json-schema-7.0.7" sources."@types/mocha-7.0.2" sources."@types/node-8.10.66" - sources."@types/vscode-1.56.0" + sources."@types/vscode-1.57.0" sources."@types/yauzl-2.9.1" - sources."@webassemblyjs/ast-1.9.0" - sources."@webassemblyjs/floating-point-hex-parser-1.9.0" - sources."@webassemblyjs/helper-api-error-1.9.0" - sources."@webassemblyjs/helper-buffer-1.9.0" - sources."@webassemblyjs/helper-code-frame-1.9.0" - sources."@webassemblyjs/helper-fsm-1.9.0" - sources."@webassemblyjs/helper-module-context-1.9.0" - sources."@webassemblyjs/helper-wasm-bytecode-1.9.0" - sources."@webassemblyjs/helper-wasm-section-1.9.0" - sources."@webassemblyjs/ieee754-1.9.0" - sources."@webassemblyjs/leb128-1.9.0" - sources."@webassemblyjs/utf8-1.9.0" - sources."@webassemblyjs/wasm-edit-1.9.0" - sources."@webassemblyjs/wasm-gen-1.9.0" - sources."@webassemblyjs/wasm-opt-1.9.0" - sources."@webassemblyjs/wasm-parser-1.9.0" - sources."@webassemblyjs/wast-parser-1.9.0" - sources."@webassemblyjs/wast-printer-1.9.0" + sources."@ungap/promise-all-settled-1.1.2" + sources."@webassemblyjs/ast-1.11.0" + sources."@webassemblyjs/floating-point-hex-parser-1.11.0" + sources."@webassemblyjs/helper-api-error-1.11.0" + sources."@webassemblyjs/helper-buffer-1.11.0" + sources."@webassemblyjs/helper-numbers-1.11.0" + sources."@webassemblyjs/helper-wasm-bytecode-1.11.0" + sources."@webassemblyjs/helper-wasm-section-1.11.0" + sources."@webassemblyjs/ieee754-1.11.0" + sources."@webassemblyjs/leb128-1.11.0" + sources."@webassemblyjs/utf8-1.11.0" + sources."@webassemblyjs/wasm-edit-1.11.0" + sources."@webassemblyjs/wasm-gen-1.11.0" + sources."@webassemblyjs/wasm-opt-1.11.0" + sources."@webassemblyjs/wasm-parser-1.11.0" + sources."@webassemblyjs/wast-printer-1.11.0" + sources."@webpack-cli/configtest-1.0.4" + sources."@webpack-cli/info-1.3.0" + sources."@webpack-cli/serve-1.5.1" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-6.4.2" + sources."acorn-8.4.0" sources."ajv-6.12.6" - sources."ajv-errors-1.0.1" sources."ajv-keywords-3.5.2" - sources."ansi-colors-3.2.3" + sources."ansi-colors-4.1.1" sources."ansi-regex-3.0.0" - sources."ansi-styles-3.2.1" + sources."ansi-styles-4.3.0" sources."anymatch-3.1.2" - sources."aproba-1.2.0" - sources."argparse-1.0.10" - sources."arr-diff-4.0.0" - sources."arr-flatten-1.1.0" - sources."arr-union-3.1.0" - sources."array-unique-0.3.2" - (sources."asn1.js-5.4.1" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - (sources."assert-1.5.0" // { - dependencies = [ - sources."inherits-2.0.1" - sources."util-0.10.3" - ]; - }) - sources."assign-symbols-1.0.0" - sources."async-each-1.0.3" - sources."atob-2.1.2" + sources."argparse-2.0.1" sources."azure-devops-node-api-10.2.2" sources."balanced-match-1.0.2" - (sources."base-0.11.2" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - sources."base64-js-1.5.1" sources."big.js-5.2.2" sources."binary-extensions-2.2.0" - sources."bindings-1.5.0" - sources."bluebird-3.7.2" - sources."bn.js-5.2.0" sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."brorand-1.1.0" sources."browser-stdout-1.3.1" - sources."browserify-aes-1.2.0" - sources."browserify-cipher-1.0.1" - sources."browserify-des-1.0.2" - sources."browserify-rsa-4.1.0" - (sources."browserify-sign-4.2.1" // { - dependencies = [ - sources."readable-stream-3.6.0" - sources."safe-buffer-5.2.1" - sources."string_decoder-1.3.0" - ]; - }) - sources."browserify-zlib-0.2.0" - (sources."buffer-4.9.2" // { - dependencies = [ - sources."isarray-1.0.0" - ]; - }) + sources."browserslist-4.16.6" sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.1" - sources."buffer-xor-1.0.3" - sources."builtin-status-codes-3.0.0" - (sources."cacache-12.0.4" // { - dependencies = [ - sources."glob-7.1.7" - ]; - }) - sources."cache-base-1.0.1" sources."call-bind-1.0.2" - sources."camelcase-5.3.1" - (sources."chalk-2.4.2" // { + sources."camelcase-6.2.0" + sources."caniuse-lite-1.0.30001237" + (sources."chalk-4.1.1" // { dependencies = [ - sources."supports-color-5.5.0" + sources."supports-color-7.2.0" ]; }) - sources."cheerio-1.0.0-rc.9" - sources."cheerio-select-1.4.0" - sources."chokidar-3.3.0" - sources."chownr-1.1.4" + sources."cheerio-1.0.0-rc.10" + sources."cheerio-select-1.5.0" + sources."chokidar-3.5.1" sources."chrome-trace-event-1.0.3" - sources."cipher-base-1.0.4" - (sources."class-utils-0.3.6" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-buffer-1.1.6" - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - (sources."cliui-5.0.0" // { + (sources."cliui-7.0.4" // { dependencies = [ - sources."ansi-regex-4.1.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" + sources."ansi-regex-5.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.2" + sources."strip-ansi-6.0.0" ]; }) - sources."collection-visit-1.0.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" + sources."clone-deep-4.0.1" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."colorette-1.2.2" sources."commander-6.2.1" - sources."commondir-1.0.1" - sources."component-emitter-1.3.0" sources."concat-map-0.0.1" - (sources."concat-stream-1.6.2" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) - sources."console-browserify-1.2.0" - sources."constants-browserify-1.0.0" - sources."copy-concurrently-1.0.5" - sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" - (sources."create-ecdh-4.0.4" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - sources."create-hash-1.2.0" - sources."create-hmac-1.1.7" - sources."cross-spawn-6.0.5" - sources."crypto-browserify-3.12.0" - sources."css-select-4.1.2" + sources."cross-spawn-7.0.3" + sources."css-select-4.1.3" sources."css-what-5.0.1" - sources."cyclist-1.0.1" - sources."debug-3.2.6" - sources."decamelize-1.2.0" - sources."decode-uri-component-0.2.0" - sources."define-properties-1.1.3" - sources."define-property-2.0.2" - sources."denodeify-1.2.1" - sources."des.js-1.0.1" - sources."detect-file-1.0.0" - sources."diff-3.5.0" - (sources."diffie-hellman-5.0.3" // { + (sources."debug-4.3.1" // { dependencies = [ - sources."bn.js-4.12.0" + sources."ms-2.1.2" ]; }) + sources."decamelize-4.0.0" + sources."denodeify-1.2.1" + sources."diff-5.0.0" sources."dom-serializer-1.3.2" - sources."domain-browser-1.2.0" sources."domelementtype-2.2.0" sources."domhandler-4.2.0" - sources."domutils-2.6.0" - (sources."duplexify-3.7.1" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) - (sources."elliptic-6.5.4" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - sources."emoji-regex-7.0.3" + sources."domutils-2.7.0" + sources."electron-to-chromium-1.3.752" + sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" - sources."end-of-stream-1.4.4" - (sources."enhanced-resolve-4.5.0" // { - dependencies = [ - sources."isarray-1.0.0" - sources."memory-fs-0.5.0" - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) + sources."enhanced-resolve-5.8.2" sources."entities-2.2.0" + sources."envinfo-7.8.1" sources."errno-0.1.8" - (sources."es-abstract-1.18.3" // { - dependencies = [ - sources."object.assign-4.1.2" - ]; - }) - sources."es-to-primitive-1.2.1" - sources."escape-string-regexp-1.0.5" - sources."eslint-scope-4.0.3" - sources."esprima-4.0.1" + sources."es-module-lexer-0.4.1" + sources."escalade-3.1.1" + sources."escape-string-regexp-4.0.0" + sources."eslint-scope-5.1.1" (sources."esrecurse-4.3.0" // { dependencies = [ sources."estraverse-5.2.0" @@ -114061,575 +113648,231 @@ in }) sources."estraverse-4.3.0" sources."events-3.3.0" - sources."evp_bytestokey-1.0.3" - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."debug-2.6.9" - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-buffer-1.1.6" - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - sources."ms-2.0.0" - ]; - }) - sources."expand-tilde-2.0.2" - (sources."extend-shallow-3.0.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - (sources."extglob-2.0.4" // { - dependencies = [ - sources."define-property-1.0.0" - sources."extend-shallow-2.0.1" - ]; - }) + sources."execa-5.1.1" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" + sources."fastest-levenshtein-1.0.12" sources."fd-slicer-1.1.0" - sources."figgy-pudding-3.5.2" - sources."file-uri-to-path-1.0.0" sources."fill-range-7.0.1" - sources."find-cache-dir-2.1.0" - sources."find-up-3.0.0" - sources."findup-sync-3.0.0" - sources."flat-4.1.1" - (sources."flush-write-stream-1.1.1" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) - sources."for-in-1.0.2" - sources."fragment-cache-0.2.1" - (sources."from2-2.3.0" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) - sources."fs-write-stream-atomic-1.0.10" + sources."find-up-5.0.0" + sources."flat-5.0.2" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.3" + sources."fsevents-2.3.2" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" - sources."get-value-2.0.6" - sources."glob-7.1.3" + sources."get-stream-6.0.1" + sources."glob-7.1.6" sources."glob-parent-5.1.2" - (sources."global-modules-2.0.0" // { - dependencies = [ - sources."global-prefix-3.0.0" - ]; - }) - sources."global-prefix-1.0.2" + sources."glob-to-regexp-0.4.1" sources."graceful-fs-4.2.6" sources."growl-1.10.5" sources."has-1.0.3" - sources."has-bigints-1.0.1" - sources."has-flag-3.0.0" + sources."has-flag-4.0.0" sources."has-symbols-1.0.2" - sources."has-value-1.0.0" - (sources."has-values-1.0.0" // { - dependencies = [ - sources."is-buffer-1.1.6" - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."kind-of-4.0.0" - ]; - }) - (sources."hash-base-3.1.0" // { - dependencies = [ - sources."readable-stream-3.6.0" - sources."safe-buffer-5.2.1" - sources."string_decoder-1.3.0" - ]; - }) - sources."hash.js-1.1.7" sources."he-1.2.0" - sources."hmac-drbg-1.0.1" - sources."homedir-polyfill-1.0.3" sources."htmlparser2-6.1.0" - sources."https-browserify-1.0.0" - sources."ieee754-1.2.1" - sources."iferr-0.1.5" - sources."import-local-2.0.0" - sources."imurmurhash-0.1.4" - sources."infer-owner-1.0.4" + sources."human-signals-2.1.0" + sources."import-local-3.0.2" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.8" - sources."interpret-1.4.0" - sources."is-accessor-descriptor-1.0.0" - sources."is-bigint-1.0.2" + sources."interpret-2.2.0" sources."is-binary-path-2.1.0" - sources."is-boolean-object-1.1.1" - sources."is-buffer-2.0.5" - sources."is-callable-1.2.3" - sources."is-data-descriptor-1.0.0" - sources."is-date-object-1.0.4" - sources."is-descriptor-1.0.2" - sources."is-extendable-0.1.1" + sources."is-core-module-2.4.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" - sources."is-negative-zero-2.0.1" sources."is-number-7.0.0" - sources."is-number-object-1.0.5" + sources."is-plain-obj-2.1.0" sources."is-plain-object-2.0.4" - sources."is-regex-1.1.3" - sources."is-string-1.0.6" - sources."is-symbol-1.0.4" - sources."is-windows-1.0.2" - sources."is-wsl-1.1.0" + sources."is-stream-2.0.0" sources."isarray-0.0.1" sources."isexe-2.0.0" sources."isobject-3.0.1" - sources."js-yaml-3.13.1" + sources."jest-worker-27.0.2" + sources."js-yaml-4.0.0" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" - sources."json5-1.0.1" + sources."json5-2.2.0" sources."kind-of-6.0.3" sources."leven-3.1.0" sources."linkify-it-2.2.0" - sources."loader-runner-2.4.0" - sources."loader-utils-1.4.0" - sources."locate-path-3.0.0" + sources."loader-runner-4.2.0" + sources."loader-utils-2.0.0" + sources."locate-path-6.0.0" sources."lodash-4.17.21" - sources."log-symbols-3.0.0" - sources."lru-cache-5.1.1" - sources."make-dir-2.1.0" - sources."map-cache-0.2.2" - sources."map-visit-1.0.0" + sources."log-symbols-4.0.0" + sources."lru-cache-6.0.0" (sources."markdown-it-10.0.0" // { dependencies = [ + sources."argparse-1.0.10" sources."entities-2.0.3" ]; }) - sources."md5.js-1.3.5" sources."mdurl-1.0.1" - (sources."memory-fs-0.4.1" // { + (sources."memory-fs-0.5.0" // { dependencies = [ sources."isarray-1.0.0" sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) sources."memory-streams-0.1.3" - (sources."micromatch-3.1.10" // { - dependencies = [ - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."is-buffer-1.1.6" - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."to-regex-range-2.1.1" - ]; - }) - (sources."miller-rabin-4.0.1" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) + sources."merge-stream-2.0.0" + sources."micromatch-4.0.4" sources."mime-1.6.0" - sources."minimalistic-assert-1.0.1" - sources."minimalistic-crypto-utils-1.0.1" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" + sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."mississippi-3.0.0" - (sources."mixin-deep-1.3.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - sources."mkdirp-0.5.5" - sources."mocha-7.2.0" - sources."move-concurrently-1.0.1" - sources."ms-2.1.1" + sources."mocha-8.4.0" + sources."ms-2.1.3" sources."mute-stream-0.0.8" - sources."nan-2.14.2" - sources."nanomatch-1.2.13" + sources."nanoid-3.1.20" sources."neo-async-2.6.2" - sources."nice-try-1.0.5" - sources."node-environment-flags-1.0.6" - (sources."node-libs-browser-2.2.1" // { - dependencies = [ - sources."isarray-1.0.0" - sources."punycode-1.4.1" - (sources."readable-stream-2.3.7" // { - dependencies = [ - sources."string_decoder-1.1.1" - ]; - }) - sources."safe-buffer-5.2.1" - sources."string_decoder-1.3.0" - ]; - }) + sources."node-releases-1.1.73" sources."normalize-path-3.0.0" + sources."npm-run-path-4.0.1" sources."nth-check-2.0.0" - sources."object-assign-4.1.1" - (sources."object-copy-0.1.0" // { - dependencies = [ - sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-buffer-1.1.6" - sources."is-data-descriptor-0.1.4" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) - sources."kind-of-3.2.2" - ]; - }) sources."object-inspect-1.10.3" - sources."object-keys-1.1.1" - sources."object-visit-1.0.1" - sources."object.assign-4.1.0" - sources."object.getownpropertydescriptors-2.1.2" - sources."object.pick-1.3.0" sources."once-1.4.0" - sources."os-browserify-0.3.0" + sources."onetime-5.1.2" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" sources."p-try-2.2.0" - sources."pako-1.0.11" - (sources."parallel-transform-1.2.0" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) - sources."parse-asn1-5.1.6" - sources."parse-passwd-1.0.0" sources."parse-semver-1.1.1" sources."parse5-6.0.1" sources."parse5-htmlparser2-tree-adapter-6.0.1" - sources."pascalcase-0.1.1" - sources."path-browserify-0.0.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-key-2.0.1" - sources."pbkdf2-3.1.2" + sources."path-key-3.1.1" + sources."path-parse-1.0.7" sources."pend-1.2.0" sources."picomatch-2.3.0" - sources."pify-4.0.1" - sources."pkg-dir-3.0.0" - sources."posix-character-classes-0.1.1" - sources."process-0.11.10" - sources."process-nextick-args-2.0.1" - sources."promise-inflight-1.0.1" - sources."prr-1.0.1" - (sources."public-encrypt-4.0.3" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - sources."pump-3.0.0" - (sources."pumpify-1.5.1" // { + (sources."pkg-dir-4.2.0" // { dependencies = [ - sources."pump-2.0.1" + sources."find-up-4.1.0" + sources."locate-path-5.0.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" ]; }) + sources."process-nextick-args-2.0.1" + sources."prr-1.0.1" sources."punycode-2.1.1" sources."qs-6.10.1" - sources."querystring-0.2.0" - sources."querystring-es3-0.2.1" sources."randombytes-2.1.0" - sources."randomfill-1.0.4" sources."read-1.0.7" sources."readable-stream-1.0.34" - sources."readdirp-3.2.0" - sources."regex-not-1.0.2" - sources."remove-trailing-separator-1.1.0" - sources."repeat-element-1.1.4" - sources."repeat-string-1.6.1" + sources."readdirp-3.5.0" + sources."rechoir-0.7.0" sources."require-directory-2.1.1" - sources."require-main-filename-2.0.0" - sources."resolve-cwd-2.0.0" - (sources."resolve-dir-1.0.1" // { - dependencies = [ - sources."global-modules-1.0.0" - ]; - }) - sources."resolve-from-3.0.0" - sources."resolve-url-0.2.1" - sources."ret-0.1.15" - sources."rimraf-2.7.1" - sources."ripemd160-2.0.2" - sources."run-queue-1.0.3" - sources."safe-buffer-5.1.2" - sources."safe-regex-1.1.0" - sources."safer-buffer-2.1.2" - sources."schema-utils-1.0.0" + sources."resolve-1.20.0" + sources."resolve-cwd-3.0.0" + sources."resolve-from-5.0.0" + sources."safe-buffer-5.2.1" + sources."schema-utils-3.0.0" sources."semver-5.7.1" - sources."serialize-javascript-4.0.0" - sources."set-blocking-2.0.0" - (sources."set-value-2.0.1" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."setimmediate-1.0.5" - sources."sha.js-2.4.11" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" + sources."serialize-javascript-5.0.1" + sources."shallow-clone-3.0.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."side-channel-1.0.4" - (sources."snapdragon-0.8.2" // { - dependencies = [ - sources."debug-2.6.9" - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-buffer-1.1.6" - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - sources."ms-2.0.0" - sources."source-map-0.5.7" - ]; - }) - (sources."snapdragon-node-2.1.1" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - (sources."snapdragon-util-3.0.1" // { - dependencies = [ - sources."is-buffer-1.1.6" - sources."kind-of-3.2.2" - ]; - }) + sources."signal-exit-3.0.3" sources."source-list-map-2.0.1" sources."source-map-0.6.1" - sources."source-map-resolve-0.5.3" sources."source-map-support-0.5.19" - sources."source-map-url-0.4.1" - sources."split-string-3.1.0" sources."sprintf-js-1.0.3" - sources."ssri-6.0.2" - (sources."static-extend-0.1.2" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-buffer-1.1.6" - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - (sources."stream-browserify-2.0.2" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) - sources."stream-each-1.2.3" - (sources."stream-http-2.8.3" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) - sources."stream-shift-1.0.1" sources."string-argv-0.3.1" sources."string-width-2.1.1" - sources."string.prototype.trimend-1.0.4" - sources."string.prototype.trimstart-1.0.4" sources."string_decoder-0.10.31" sources."strip-ansi-4.0.0" - sources."strip-json-comments-2.0.1" - sources."supports-color-6.0.0" - sources."tapable-1.1.3" - (sources."terser-4.8.0" // { + sources."strip-final-newline-2.0.0" + sources."strip-json-comments-3.1.1" + sources."supports-color-8.1.1" + sources."tapable-2.2.0" + (sources."terser-5.7.0" // { dependencies = [ sources."commander-2.20.3" + sources."source-map-0.7.3" ]; }) - sources."terser-webpack-plugin-1.4.5" - (sources."through2-2.0.5" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) - sources."timers-browserify-2.0.12" + sources."terser-webpack-plugin-5.1.3" sources."tmp-0.0.29" - sources."to-arraybuffer-1.0.1" - (sources."to-object-path-0.3.0" // { - dependencies = [ - sources."is-buffer-1.1.6" - sources."kind-of-3.2.2" - ]; - }) - sources."to-regex-3.0.2" sources."to-regex-range-5.0.1" - (sources."ts-loader-6.2.2" // { + (sources."ts-loader-8.3.0" // { dependencies = [ - sources."micromatch-4.0.4" - sources."semver-6.3.0" + sources."enhanced-resolve-4.5.0" + sources."semver-7.3.5" + sources."tapable-1.1.3" ]; }) - sources."tslib-2.2.0" - sources."tty-browserify-0.0.0" + sources."tslib-2.3.0" sources."tunnel-0.0.6" sources."typed-rest-client-1.8.4" - sources."typedarray-0.0.6" - sources."typescript-3.9.9" + sources."typescript-4.3.2" sources."uc.micro-1.0.6" - sources."unbox-primitive-1.0.1" sources."underscore-1.13.1" - sources."union-value-1.0.1" - sources."unique-filename-1.1.1" - sources."unique-slug-2.0.2" - (sources."unset-value-1.0.0" // { - dependencies = [ - (sources."has-value-0.3.1" // { - dependencies = [ - sources."isobject-2.1.0" - ]; - }) - sources."has-values-0.1.4" - sources."isarray-1.0.0" - ]; - }) - sources."upath-1.2.0" sources."uri-js-4.4.1" - sources."urix-0.1.0" - (sources."url-0.11.0" // { - dependencies = [ - sources."punycode-1.3.2" - ]; - }) sources."url-join-1.1.0" - sources."use-3.1.1" - (sources."util-0.11.1" // { - dependencies = [ - sources."inherits-2.0.3" - ]; - }) sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.3.0" - sources."vm-browserify-1.1.2" - sources."vsce-1.91.0" - sources."vscode-debugadapter-testsupport-1.47.0" - sources."vscode-debugprotocol-1.47.0" - (sources."watchpack-1.7.5" // { - dependencies = [ - sources."chokidar-3.5.1" - sources."fsevents-2.3.2" - sources."readdirp-3.5.0" - ]; - }) - (sources."watchpack-chokidar2-2.0.1" // { + (sources."vsce-1.88.0" // { dependencies = [ - sources."anymatch-2.0.0" - sources."binary-extensions-1.13.1" - sources."braces-2.3.2" - sources."chokidar-2.1.8" - sources."extend-shallow-2.0.1" - sources."fill-range-4.0.0" - sources."fsevents-1.2.13" - sources."glob-parent-3.1.0" - sources."is-binary-path-1.0.1" - sources."is-buffer-1.1.6" - sources."is-glob-3.1.0" - sources."is-number-3.0.0" - sources."isarray-1.0.0" - sources."kind-of-3.2.2" - sources."normalize-path-2.1.1" - sources."readable-stream-2.3.7" - sources."readdirp-2.2.1" - sources."string_decoder-1.1.1" - sources."to-regex-range-2.1.1" + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."escape-string-regexp-1.0.5" + sources."has-flag-3.0.0" + sources."supports-color-5.5.0" ]; }) - sources."webpack-4.46.0" - (sources."webpack-cli-3.3.12" // { + sources."vscode-debugadapter-testsupport-1.47.0" + sources."vscode-debugprotocol-1.47.0" + sources."watchpack-2.2.0" + sources."webpack-5.38.1" + (sources."webpack-cli-4.7.2" // { dependencies = [ - sources."supports-color-6.1.0" + sources."commander-7.2.0" ]; }) - sources."webpack-sources-1.4.3" - sources."which-1.3.1" - sources."which-boxed-primitive-1.0.2" - sources."which-module-2.0.0" + sources."webpack-merge-5.8.0" + sources."webpack-sources-2.3.0" + sources."which-2.0.2" sources."wide-align-1.1.3" - sources."worker-farm-1.7.0" - (sources."wrap-ansi-5.1.0" // { + sources."wildcard-2.0.0" + sources."workerpool-6.1.0" + (sources."wrap-ansi-7.0.0" // { dependencies = [ - sources."ansi-regex-4.1.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" + sources."ansi-regex-5.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.2" + sources."strip-ansi-6.0.0" ]; }) sources."wrappy-1.0.2" - sources."xtend-4.0.2" - sources."y18n-4.0.3" - sources."yallist-3.1.1" + sources."y18n-5.0.8" + sources."yallist-4.0.0" sources."yaml-1.10.2" - (sources."yargs-13.3.2" // { + (sources."yargs-16.2.0" // { dependencies = [ - sources."ansi-regex-4.1.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" + sources."ansi-regex-5.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.2" + sources."strip-ansi-6.0.0" ]; }) - sources."yargs-parser-13.1.2" - sources."yargs-unparser-1.6.0" + sources."yargs-parser-20.2.4" + sources."yargs-unparser-2.0.0" sources."yauzl-2.10.0" sources."yazl-2.5.1" + sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -114696,7 +113939,7 @@ in sources."combined-stream-1.0.8" sources."commander-2.20.3" sources."concat-map-0.0.1" - sources."config-chain-1.1.12" + sources."config-chain-1.1.13" sources."consolidate-0.14.5" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" @@ -114805,8 +114048,8 @@ in sources."supports-color-2.0.0" ]; }) - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -114891,7 +114134,7 @@ in sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.13.8" + sources."uglify-js-3.13.9" sources."uid-0.0.2" sources."unbzip2-stream-1.4.3" sources."unyield-0.0.1" @@ -114932,9 +114175,9 @@ in sha512 = "/dd2bJLxOmX8Ie0EPTlmU+F8cxAekn/1m8K9OAFoijm4fc8SdHznFUUEKuz2RMMhsaL5+rccj8xLFAJELYNbaA=="; }; dependencies = [ - sources."@babel/code-frame-7.12.13" - sources."@babel/helper-validator-identifier-7.14.0" - sources."@babel/highlight-7.14.0" + sources."@babel/code-frame-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/highlight-7.14.5" sources."@emmetio/extract-abbreviation-0.1.6" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -114950,7 +114193,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-15.6.1" + sources."@types/node-15.12.2" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -115095,7 +114338,7 @@ in sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" - sources."config-chain-1.1.12" + sources."config-chain-1.1.13" sources."configstore-4.0.0" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" @@ -115873,13 +115116,13 @@ in sha512 = "uhSNGU27KDT2e2v51l/NqMc59O7X0DG7CHonZOwsnvMHLvyudCLZgXCU8Rw4T8gpqg2asn50vfPHq7l3DGlN5w=="; }; dependencies = [ - sources."@babel/runtime-corejs3-7.14.0" + sources."@babel/runtime-corejs3-7.14.5" sources."@mapbox/node-pre-gyp-1.0.5" sources."@tootallnate/once-1.1.2" sources."@types/raf-3.4.0" sources."abab-2.0.5" sources."abbrev-1.1.1" - sources."acorn-8.3.0" + sources."acorn-8.4.0" (sources."acorn-globals-6.0.0" // { dependencies = [ sources."acorn-7.4.1" @@ -115895,27 +115138,23 @@ in sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."balanced-match-1.0.2" - (sources."bit-field-1.3.6" // { + (sources."bit-field-1.4.0" // { dependencies = [ sources."ansi-regex-5.0.0" - sources."fs-extra-8.1.0" + sources."fs-extra-10.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."jsonfile-4.0.0" - sources."onml-1.3.0" sources."string-width-4.2.2" sources."strip-ansi-6.0.0" - sources."universalify-0.1.2" - sources."yargs-15.4.1" + sources."yargs-17.0.1" ]; }) sources."brace-expansion-1.1.11" sources."browser-process-hrtime-1.0.0" sources."btoa-1.2.1" - sources."camelcase-5.3.1" sources."canvas-2.8.0" sources."canvg-3.0.7" sources."chownr-2.0.0" - (sources."cliui-6.0.0" // { + (sources."cliui-7.0.4" // { dependencies = [ sources."ansi-regex-5.0.0" sources."is-fullwidth-code-point-3.0.0" @@ -115929,7 +115168,7 @@ in sources."combined-stream-1.0.8" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" - sources."core-js-pure-3.13.1" + sources."core-js-pure-3.14.0" sources."core-util-is-1.0.2" sources."cssom-0.4.4" (sources."cssstyle-2.3.0" // { @@ -115939,7 +115178,6 @@ in }) sources."data-urls-2.0.0" sources."debug-4.3.2" - sources."decamelize-1.2.0" sources."decimal.js-10.2.1" sources."decompress-response-4.2.1" sources."deep-is-0.1.3" @@ -115958,7 +115196,6 @@ in sources."estraverse-5.2.0" sources."esutils-2.0.3" sources."fast-levenshtein-2.0.6" - sources."find-up-4.1.0" sources."form-data-3.0.1" sources."fs-extra-9.1.0" sources."fs-minipass-2.1.0" @@ -115981,7 +115218,6 @@ in sources."json5-2.2.0" sources."jsonfile-6.1.0" sources."levn-0.3.0" - sources."locate-path-5.0.0" sources."lodash-4.17.21" sources."logidrom-0.3.1" sources."lru-cache-6.0.0" @@ -115990,8 +115226,8 @@ in sources."semver-6.3.0" ]; }) - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-response-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -116009,11 +115245,7 @@ in sources."once-1.4.0" sources."onml-2.1.0" sources."optionator-0.8.3" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-try-2.2.0" sources."parse5-6.0.1" - sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."performance-now-2.1.0" sources."prelude-ls-1.1.2" @@ -116024,7 +115256,6 @@ in sources."readable-stream-2.3.7" sources."regenerator-runtime-0.13.8" sources."require-directory-2.1.1" - sources."require-main-filename-2.0.0" sources."rgbcolor-1.0.1" sources."rimraf-3.0.2" sources."safe-buffer-5.1.2" @@ -116042,7 +115273,7 @@ in sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."svg-pathdata-5.0.5" - sources."svg2img-0.9.2" + sources."svg2img-0.9.3" sources."symbol-tree-3.2.4" sources."tar-6.1.0" (sources."tough-cookie-4.0.0" // { @@ -116057,15 +115288,14 @@ in sources."util-deprecate-1.0.2" sources."w3c-hr-time-1.0.2" sources."w3c-xmlserializer-2.0.0" - sources."wavedrom-2.6.9" + sources."wavedrom-2.7.0" sources."webidl-conversions-6.1.0" sources."whatwg-encoding-1.0.5" sources."whatwg-mimetype-2.3.0" - sources."whatwg-url-8.5.0" - sources."which-module-2.0.0" + sources."whatwg-url-8.6.0" sources."wide-align-1.1.3" sources."word-wrap-1.2.3" - (sources."wrap-ansi-6.2.0" // { + (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."ansi-regex-5.0.0" sources."is-fullwidth-code-point-3.0.0" @@ -116077,21 +115307,17 @@ in sources."ws-7.4.6" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" - sources."y18n-4.0.3" + sources."y18n-5.0.8" sources."yallist-4.0.0" (sources."yargs-16.2.0" // { dependencies = [ sources."ansi-regex-5.0.0" - sources."cliui-7.0.4" sources."is-fullwidth-code-point-3.0.0" sources."string-width-4.2.2" sources."strip-ansi-6.0.0" - sources."wrap-ansi-7.0.0" - sources."y18n-5.0.8" - sources."yargs-parser-20.2.7" ]; }) - sources."yargs-parser-18.1.3" + sources."yargs-parser-20.2.7" ]; buildInputs = globalBuildInputs; meta = { @@ -116113,8 +115339,8 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.0" - (sources."@babel/highlight-7.14.0" // { + sources."@babel/helper-validator-identifier-7.14.5" + (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -116128,10 +115354,9 @@ in sources."@devicefarmer/adbkit-2.11.3" sources."@devicefarmer/adbkit-logcat-1.1.0" sources."@devicefarmer/adbkit-monkey-1.0.1" - (sources."@eslint/eslintrc-0.4.1" // { + (sources."@eslint/eslintrc-0.4.2" // { dependencies = [ sources."debug-4.3.2" - sources."globals-12.4.0" sources."ms-2.1.2" ]; }) @@ -116139,7 +115364,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.4" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."@types/yauzl-2.9.1" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" @@ -116181,11 +115406,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."bluebird-2.9.34" sources."boolbase-1.0.0" - (sources."boxen-5.0.1" // { - dependencies = [ - sources."type-fest-0.20.2" - ]; - }) + sources."boxen-5.0.1" sources."brace-expansion-1.1.11" sources."buffer-crc32-0.2.13" sources."buffer-equal-constant-time-1.0.1" @@ -116202,7 +115423,7 @@ in sources."caseless-0.12.0" sources."chalk-4.1.0" sources."cheerio-1.0.0-rc.6" - sources."cheerio-select-1.4.0" + sources."cheerio-select-1.5.0" (sources."chrome-launcher-0.13.4" // { dependencies = [ sources."mkdirp-0.5.5" @@ -116232,7 +115453,7 @@ in sources."core-util-is-1.0.2" sources."cross-spawn-7.0.3" sources."crypto-random-string-2.0.0" - sources."css-select-4.1.2" + sources."css-select-4.1.3" sources."css-what-5.0.1" sources."dashdash-1.14.1" sources."debounce-1.2.0" @@ -116257,7 +115478,7 @@ in sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" sources."domhandler-4.2.0" - sources."domutils-2.6.0" + sources."domutils-2.7.0" sources."dot-prop-5.3.0" sources."dtrace-provider-0.8.8" sources."duplexer3-0.1.4" @@ -116358,11 +115579,7 @@ in sources."glob-parent-5.1.2" sources."glob-to-regexp-0.4.1" sources."global-dirs-3.0.0" - (sources."globals-13.9.0" // { - dependencies = [ - sources."type-fest-0.20.2" - ]; - }) + sources."globals-13.9.0" (sources."got-9.6.0" // { dependencies = [ sources."get-stream-4.1.0" @@ -116470,8 +115687,8 @@ in sources."marky-1.2.2" sources."mem-5.1.1" sources."merge-stream-2.0.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -116623,7 +115840,7 @@ in sources."supports-color-7.2.0" (sources."table-6.7.1" // { dependencies = [ - sources."ajv-8.5.0" + sources."ajv-8.6.0" sources."ansi-regex-5.0.0" sources."json-schema-traverse-1.0.0" sources."strip-ansi-6.0.0" @@ -116641,7 +115858,7 @@ in sources."tweetnacl-0.14.5" sources."type-check-0.4.0" sources."type-detect-4.0.8" - sources."type-fest-0.8.1" + sources."type-fest-0.20.2" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" sources."unique-string-2.0.0" @@ -116703,11 +115920,11 @@ in sha512 = "OqRmYD1OJbHZph6RUMD93GcCZy4Z4wC0ele4FXyYF0J6AxO1vOSuIlU1hkS/lDlR9CDYBz64MZRmdbdnFFoT2g=="; }; dependencies = [ - sources."@types/eslint-7.2.12" + sources."@types/eslint-7.2.13" sources."@types/eslint-scope-3.7.0" sources."@types/estree-0.0.47" sources."@types/json-schema-7.0.7" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."@webassemblyjs/ast-1.11.0" sources."@webassemblyjs/floating-point-hex-parser-1.11.0" sources."@webassemblyjs/helper-api-error-1.11.0" @@ -116725,16 +115942,16 @@ in sources."@webassemblyjs/wast-printer-1.11.0" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.3.0" + sources."acorn-8.4.0" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" sources."browserslist-4.16.6" sources."buffer-from-1.1.1" - sources."caniuse-lite-1.0.30001232" + sources."caniuse-lite-1.0.30001237" sources."chrome-trace-event-1.0.3" sources."colorette-1.2.2" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.743" + sources."electron-to-chromium-1.3.752" sources."enhanced-resolve-5.8.2" sources."es-module-lexer-0.4.1" sources."escalade-3.1.1" @@ -116756,10 +115973,10 @@ in sources."json-schema-traverse-0.4.1" sources."loader-runner-4.2.0" sources."merge-stream-2.0.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."neo-async-2.6.2" - sources."node-releases-1.1.72" + sources."node-releases-1.1.73" sources."p-limit-3.1.0" sources."punycode-2.1.1" sources."randombytes-2.1.0" @@ -116795,22 +116012,22 @@ in webpack-cli = nodeEnv.buildNodePackage { name = "webpack-cli"; packageName = "webpack-cli"; - version = "4.7.0"; + version = "4.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.7.0.tgz"; - sha512 = "7bKr9182/sGfjFm+xdZSwgQuFjgEcy0iCTIBxRUeteJ2Kr8/Wz0qNJX+jw60LU36jApt4nmMkep6+W5AKhok6g=="; + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.7.2.tgz"; + sha512 = "mEoLmnmOIZQNiRl0ebnjzQ74Hk0iKS5SiEEnpq3dRezoyR3yPaeQZCMCe+db4524pj1Pd5ghZXjT41KLzIhSLw=="; }; dependencies = [ sources."@discoveryjs/json-ext-0.5.3" - sources."@webpack-cli/configtest-1.0.3" - sources."@webpack-cli/info-1.2.4" - sources."@webpack-cli/serve-1.4.0" + sources."@webpack-cli/configtest-1.0.4" + sources."@webpack-cli/info-1.3.0" + sources."@webpack-cli/serve-1.5.1" sources."clone-deep-4.0.1" sources."colorette-1.2.2" sources."commander-7.2.0" sources."cross-spawn-7.0.3" sources."envinfo-7.8.1" - sources."execa-5.0.1" + sources."execa-5.1.1" sources."fastest-levenshtein-1.0.12" sources."find-up-4.1.0" sources."function-bind-1.1.1" @@ -116847,7 +116064,7 @@ in sources."signal-exit-3.0.3" sources."strip-final-newline-2.0.0" sources."v8-compile-cache-2.3.0" - sources."webpack-merge-5.7.3" + sources."webpack-merge-5.8.0" sources."which-2.0.2" sources."wildcard-2.0.0" ]; @@ -116872,7 +116089,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.4" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ajv-errors-1.0.1" @@ -117153,8 +116370,8 @@ in sources."methods-1.1.2" sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."minimalistic-assert-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -117427,7 +116644,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-6.2.1" + sources."ws-6.2.2" sources."y18n-4.0.3" sources."yargs-13.3.2" sources."yargs-parser-13.1.2" @@ -117451,9 +116668,9 @@ in sha512 = "k8UB2jLIb1Jip2nZbCz83T/XfhfjX6mB1yLJNYKrpYi7FQimfOoFv/0//iT6HV1K8FwUB5yUbCcnpLebJXJTug=="; }; dependencies = [ - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.7" sources."@types/json-schema-7.0.7" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" @@ -117508,10 +116725,10 @@ in webtorrent-cli = nodeEnv.buildNodePackage { name = "webtorrent-cli"; packageName = "webtorrent-cli"; - version = "3.2.4"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-3.2.4.tgz"; - sha512 = "fobRASGOskIqf/ciwZ3TF14RhqWga6dR8kUD6a2E0L2YAY5n1PIJv1dVPXEwvfKHBFWDo5VwIH2OAzt/Tw2poQ=="; + url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-3.3.0.tgz"; + sha512 = "E0gb1fXb8xNScgewQmvAmNLrnEto6MOaKlfzITVzR+bbU80LeV/YdrLw536ffcwiUv0arKQyfR/WIweBFrKWbg=="; }; dependencies = [ sources."@protobufjs/aspromise-1.1.2" @@ -117525,7 +116742,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."balanced-match-1.0.2" @@ -117642,7 +116859,7 @@ in sources."inherits-2.0.4" sources."ip-1.1.5" sources."ip-set-2.1.0" - sources."ipaddr.js-2.0.0" + sources."ipaddr.js-2.0.1" sources."is-ascii-1.0.0" sources."is-docker-2.2.1" sources."is-file-1.0.0" @@ -117739,7 +116956,7 @@ in sources."run-parallel-1.2.0" sources."run-parallel-limit-1.1.0" sources."run-series-1.1.9" - sources."rusha-0.8.13" + sources."rusha-0.8.14" sources."safe-buffer-5.2.1" sources."sax-1.1.4" sources."semver-5.1.1" @@ -117948,11 +117165,11 @@ in sha512 = "dbHkO8dp4/KDsU5V7akSWVdWB+yyfadR0q3vGxRKXxg1umiYlFUrPuiu66Iy4IpRRr2Qrqx495kInkZJIJtqmA=="; }; dependencies = [ - sources."@babel/runtime-7.14.0" - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" - (sources."@npmcli/arborist-2.6.1" // { + sources."@babel/runtime-7.14.5" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.7" + (sources."@npmcli/arborist-2.6.2" // { dependencies = [ sources."semver-7.3.5" ]; @@ -117984,7 +117201,7 @@ in sources."@tootallnate/once-1.1.2" sources."@types/expect-1.20.4" sources."@types/minimatch-3.0.4" - sources."@types/node-15.6.1" + sources."@types/node-15.12.2" sources."@types/vinyl-2.0.4" sources."abbrev-1.1.1" (sources."agent-base-6.0.2" // { @@ -118047,7 +117264,7 @@ in sources."readable-stream-3.6.0" ]; }) - sources."boolean-3.1.0" + sources."boolean-3.1.2" (sources."boxen-1.3.0" // { dependencies = [ sources."camelcase-4.1.0" @@ -118102,10 +117319,10 @@ in sources."concat-map-0.0.1" sources."concat-stream-1.6.2" sources."conf-1.4.0" - sources."config-chain-1.1.12" + sources."config-chain-1.1.13" sources."configstore-3.1.5" sources."console-control-strings-1.1.0" - sources."core-js-3.13.1" + sources."core-js-3.14.0" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" sources."cross-spawn-6.0.5" @@ -118338,9 +117555,9 @@ in sources."loud-rejection-1.6.0" sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" - sources."macos-release-2.4.1" + sources."macos-release-2.5.0" sources."make-dir-1.3.0" - (sources."make-fetch-happen-8.0.14" // { + (sources."make-fetch-happen-9.0.2" // { dependencies = [ sources."http-cache-semantics-4.1.0" ]; @@ -118365,8 +117582,8 @@ in sources."merge-stream-2.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.4" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -118388,6 +117605,7 @@ in sources."ms-2.0.0" sources."multimatch-5.0.0" sources."mute-stream-0.0.7" + sources."negotiator-0.6.2" sources."nice-try-1.0.5" (sources."node-gyp-7.1.2" // { dependencies = [ @@ -118424,7 +117642,7 @@ in ]; }) sources."npm-normalize-package-bin-1.0.1" - (sources."npm-package-arg-8.1.2" // { + (sources."npm-package-arg-8.1.4" // { dependencies = [ sources."hosted-git-info-4.0.2" sources."semver-7.3.5" @@ -118436,7 +117654,7 @@ in sources."semver-7.3.5" ]; }) - sources."npm-registry-fetch-10.1.2" + sources."npm-registry-fetch-11.0.0" sources."npm-run-path-2.0.2" sources."npmlog-2.0.4" sources."number-is-nan-1.0.1" @@ -118450,7 +117668,7 @@ in ]; }) sources."open-6.4.0" - (sources."ora-5.4.0" // { + (sources."ora-5.4.1" // { dependencies = [ sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -118487,7 +117705,7 @@ in sources."p-timeout-2.0.1" sources."p-try-1.0.0" sources."package-json-5.0.0" - (sources."pacote-11.3.3" // { + (sources."pacote-11.3.4" // { dependencies = [ sources."mkdirp-1.0.4" ]; @@ -118800,7 +118018,7 @@ in sources."cross-spawn-7.0.3" sources."debug-4.3.2" sources."escape-string-regexp-4.0.0" - sources."execa-5.0.1" + sources."execa-5.1.1" (sources."figures-3.2.0" // { dependencies = [ sources."escape-string-regexp-1.0.5" diff --git a/nixpkgs/pkgs/development/ocaml-modules/arp/default.nix b/nixpkgs/pkgs/development/ocaml-modules/arp/default.nix index 518f1c9f4245..d900f2b772e9 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/arp/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/arp/default.nix @@ -8,50 +8,48 @@ buildDunePackage rec { pname = "arp"; - version = "2.3.1"; - - minimumOCamlVersion = "4.06"; - - useDune2 = true; + version = "2.3.2"; src = fetchurl { url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; - sha256 = "1nzm3fbkvz702g8f60fs49736lpffwchy64i1l1raxm9b4lmdk3p"; + sha256 = "1s09ibj9v6pp2ckn96wxmn3mjifcj97asls5xc4zg75pflk0grgz"; }; + minimumOCamlVersion = "4.06"; + useDune2 = true; + nativeBuildInputs = [ bisect_ppx ]; propagatedBuildInputs = [ cstruct + duration ipaddr - macaddr logs - mirage-time - mirage-protocols lwt - duration + macaddr mirage-profile + mirage-protocols + mirage-time ]; doCheck = true; checkInputs = [ alcotest + ethernet + mirage-clock-unix mirage-profile mirage-random mirage-random-test - mirage-vnetif - mirage-clock-unix - mirage-random mirage-time-unix - ethernet + mirage-vnetif ]; meta = with lib; { description = "Address Resolution Protocol purely in OCaml"; - license = licenses.isc; homepage = "https://github.com/mirage/arp"; - maintainers = [ maintainers.sternenseemann ]; + license = licenses.isc; + maintainers = with maintainers; [ sternenseemann ]; }; } diff --git a/nixpkgs/pkgs/development/ocaml-modules/bz2/default.nix b/nixpkgs/pkgs/development/ocaml-modules/bz2/default.nix new file mode 100644 index 000000000000..52a92d3a8d40 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/bz2/default.nix @@ -0,0 +1,41 @@ +{ lib, stdenv, fetchFromGitLab, ocaml, findlib, bzip2, autoreconfHook }: + +if !lib.versionAtLeast ocaml.version "4.02" +then throw "bz2 is not available for OCaml ${ocaml.version}" +else + +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-bz2"; + version = "0.7.0"; + + src = fetchFromGitLab { + owner = "irill"; + repo = "camlbz2"; + rev = version; + sha256 = "sha256-jBFEkLN2fbC3LxTu7C0iuhvNg64duuckBHWZoBxrV/U="; + }; + + autoreconfFlags = "-I ."; + + nativeBuildInputs = [ + autoreconfHook + ]; + + buildInputs = [ + ocaml + findlib + ]; + + propagatedBuildInputs = [ + bzip2 + ]; + + preInstall = "mkdir -p $OCAMLFIND_DESTDIR/stublibs"; + + meta = with lib; { + description = "OCaml bindings for the libbz2 (AKA, bzip2) (de)compression library"; + downloadPage = "https://gitlab.com/irill/camlbz2"; + license = licenses.lgpl21; + maintainers = with maintainers; [ superherointj ]; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/cstruct/1.9.0.nix b/nixpkgs/pkgs/development/ocaml-modules/cstruct/1.9.0.nix deleted file mode 100644 index 750a153c1c48..000000000000 --- a/nixpkgs/pkgs/development/ocaml-modules/cstruct/1.9.0.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, ocaml, ocamlbuild, ocplib-endian, sexplib, findlib, ppx_tools -, async ? null, lwt ? null -}: - -assert lib.versionAtLeast ocaml.version "4.01"; - -let version = "1.9.0"; in - -let opt = b: "--${if b != null then "en" else "dis"}able"; in - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-cstruct-${version}"; - - src = fetchFromGitHub { - owner = "mirage"; - repo = "ocaml-cstruct"; - rev = "v${version}"; - sha256 = "1c1j21zgmxi9spq23imy7byn50qr7hlds1cfpzxlsx9dp309jngy"; - }; - - configureFlags = [ "${opt lwt}-lwt" "${opt async}-async" "${opt ppx_tools}-ppx" ]; - - buildInputs = [ ocaml findlib ocamlbuild ppx_tools lwt async ]; - propagatedBuildInputs = [ ocplib-endian sexplib ]; - - createFindlibDestdir = true; - dontStrip = true; - - meta = with lib; { - homepage = "https://github.com/mirage/ocaml-cstruct"; - description = "Map OCaml arrays onto C-like structs"; - license = lib.licenses.isc; - maintainers = [ maintainers.vbgl maintainers.ericbmerritt ]; - platforms = ocaml.meta.platforms or []; - }; -} diff --git a/nixpkgs/pkgs/development/ocaml-modules/cstruct/async.nix b/nixpkgs/pkgs/development/ocaml-modules/cstruct/async.nix new file mode 100644 index 000000000000..579f12776c08 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/cstruct/async.nix @@ -0,0 +1,11 @@ +{ lib, buildDunePackage, cstruct, async_unix }: + +buildDunePackage rec { + pname = "cstruct-async"; + inherit (cstruct) src version meta useDune2; + + propagatedBuildInputs = [ + async_unix + cstruct + ]; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/cudf/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cudf/default.nix new file mode 100644 index 000000000000..5bd768e64510 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/cudf/default.nix @@ -0,0 +1,52 @@ +{ lib, fetchurl, stdenv, ocaml, ocamlbuild, findlib, ocaml_extlib, glib, perl, pkg-config, stdlib-shims, ounit }: + +stdenv.mkDerivation { + pname = "ocaml${ocaml.version}-cudf"; + version = "0.9"; + + src = fetchurl { + url = "https://gforge.inria.fr/frs/download.php/36602/cudf-0.9.tar.gz"; + sha256 = "sha256-mTLk2V3OI1sUNIYv84nM3reiirf0AuozG5ZzLCmn4Rw="; + }; + + buildFlags = [ + "all" + "opt" + ]; + nativeBuildInputs = [ + findlib + ocaml + ocamlbuild + pkg-config + ]; + buildInputs = [ + glib + perl + stdlib-shims + ]; + propagatedBuildInputs = [ + ocaml_extlib + ]; + + checkTarget = [ + "all" + "test" + ]; + checkInputs = [ + ounit + ]; + doCheck = true; + + preInstall = "mkdir -p $OCAMLFIND_DESTDIR"; + installFlags = "BINDIR=$(out)/bin"; + + # passthru.tests = { inherit dose3; }; # To-Do: To be enabled when Dose3 PR is accepted. + + meta = with lib; { + description = "A library for CUDF format"; + homepage = "http://www.mancoosi.org/cudf/"; + downloadPage = "https://gforge.inria.fr/projects/cudf/"; + license = licenses.lgpl3; + maintainers = with maintainers; [ superherointj ]; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/fileutils/default.nix b/nixpkgs/pkgs/development/ocaml-modules/fileutils/default.nix index 39c41e8eba04..819298ac8cf1 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/fileutils/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/fileutils/default.nix @@ -1,28 +1,30 @@ -{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, ounit }: +{ lib, fetchurl, buildDunePackage, stdlib-shims, ounit }: -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-fileutils-0.5.3"; +buildDunePackage rec { + pname = "fileutils"; + version = "0.6.3"; src = fetchurl { - url = "https://forge.ocamlcore.org/frs/download.php/1728/ocaml-fileutils-0.5.3.tar.gz"; - sha256 = "1rc4cqlvdhbs55i85zfbfhz938fsy4fj6kwlkfm3ra7bpwn8bmpd"; + url = "https://github.com/gildor478/ocaml-fileutils/releases/download/v${version}/fileutils-v${version}.tbz"; + sha256 = "0qhlhc7fzcq0yfg1wyszsi0gyc4w9hyzmfv84aq9wc79i3283xgg"; }; - buildInputs = [ ocaml findlib ocamlbuild ounit ]; + minimumOCamlVersion = "4.03"; + useDune2 = true; - configureFlags = [ "--enable-tests" ]; - doCheck = true; - checkTarget = "test"; - - createFindlibDestdir = true; + propagatedBuildInputs = [ + stdlib-shims + ]; - preInstall = "make doc"; + checkInputs = [ + ounit + ]; + doCheck = true; - meta = { - homepage = "https://forge.ocamlcore.org/projects/ocaml-fileutils/"; - platforms = ocaml.meta.platforms or []; - description = "Library to provide pure OCaml functions to manipulate real file (POSIX like) and filename"; - license = lib.licenses.lgpl21Plus; - maintainers = with lib.maintainers; [ vbgl ]; + meta = with lib; { + description = "OCaml API to manipulate real files (POSIX like) and filenames"; + homepage = "https://github.com/gildor478/ocaml-fileutils"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ vbgl ]; }; } diff --git a/nixpkgs/pkgs/development/ocaml-modules/index/default.nix b/nixpkgs/pkgs/development/ocaml-modules/index/default.nix index a24d72a34458..61ecb65510cc 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/index/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/index/default.nix @@ -6,29 +6,41 @@ buildDunePackage rec { pname = "index"; - version = "1.3.0"; - - minimumOCamlVersion = "4.08"; - - useDune2 = true; + version = "1.3.1"; src = fetchurl { url = "https://github.com/mirage/index/releases/download/${version}/index-${version}.tbz"; - sha256 = "00qwhwg79scs5bgp8nbppv06qs9yhicf686q7lh64ngh0642iz6n"; + sha256 = "sha256-ycZi/TFLoGRloSpjYqH5FCHWP3eyiTCIDLESEn5inuI="; }; - buildInputs = [ stdlib-shims ]; + minimumOCamlVersion = "4.08"; + useDune2 = true; + + buildInputs = [ + stdlib-shims + ]; propagatedBuildInputs = [ - fmt logs mtime repr ppx_repr cmdliner progress semaphore-compat + cmdliner + fmt + logs + mtime + ppx_repr + progress + repr + semaphore-compat ]; + checkInputs = [ + alcotest + crowbar + re + ]; doCheck = true; - checkInputs = [ alcotest crowbar re ]; - meta = { - homepage = "https://github.com/mirage/index"; + meta = with lib; { description = "A platform-agnostic multi-level index"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.vbgl ]; + homepage = "https://github.com/mirage/index"; + license = licenses.mit; + maintainers = with maintainers; [ vbgl ]; }; } diff --git a/nixpkgs/pkgs/development/ocaml-modules/magic-mime/default.nix b/nixpkgs/pkgs/development/ocaml-modules/magic-mime/default.nix index 2a5ff08c018e..15628bcf26c1 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/magic-mime/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/magic-mime/default.nix @@ -1,27 +1,21 @@ -{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild }: +{ lib, fetchurl, buildDunePackage }: -let version = "1.0.0"; in +buildDunePackage rec { + pname = "magic-mime"; + version = "1.1.3"; -stdenv.mkDerivation { - pname = "ocaml-magic-mime"; - inherit version; - - src = fetchzip { - url = "https://github.com/mirage/ocaml-magic-mime/archive/v${version}.tar.gz"; - sha256 = "058d83hmxd5mjccxdm3ydchmhk2lca5jdg82jg0klsigmf4ida6v"; + src = fetchurl { + url = "https://github.com/mirage/ocaml-magic-mime/releases/download/v${version}/magic-mime-v${version}.tbz"; + sha256 = "1xqjs8bba567yzrzgnr88j5ck97d36zw68zr9v29liya37k6rcvz"; }; - nativeBuildInputs = [ ocaml findlib ocamlbuild ]; - buildInputs = [ findlib ]; - configurePlatforms = []; - - createFindlibDestdir = true; + minimalOCamlVersion = "4.03"; + useDune2 = true; - meta = { - homepage = "https://github.com/mirage/ocaml-magic-mime"; + meta = with lib; { description = "Convert file extensions to MIME types"; - platforms = ocaml.meta.platforms or []; - license = lib.licenses.isc; - maintainers = with lib.maintainers; [ vbgl ]; + homepage = "https://github.com/mirage/ocaml-magic-mime"; + license = licenses.isc; + maintainers = with maintainers; [ vbgl ]; }; } diff --git a/nixpkgs/pkgs/development/ocaml-modules/mccs/default.nix b/nixpkgs/pkgs/development/ocaml-modules/mccs/default.nix new file mode 100644 index 000000000000..3b396215e575 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/mccs/default.nix @@ -0,0 +1,29 @@ +{ lib, fetchFromGitHub, buildDunePackage, cudf }: + +buildDunePackage rec { + pname = "mccs"; + version = "1.1+13"; + + src = fetchFromGitHub { + owner = "AltGr"; + repo = "ocaml-mccs"; + rev = version; + sha256 = "sha256-K249E9qkWNK4BC+ynaR3bVEyu9Tk8iCE7GptKk/aVJc="; + }; + + useDune2 = true; + + buildInputs = [ + cudf + ]; + + doCheck = true; + + meta = with lib; { + description = "A library providing a multi criteria CUDF solver, part of MANCOOSI project."; + downloadPage = "https://github.com/AltGr/ocaml-mccs"; + homepage = "https://www.i3s.unice.fr/~cpjm/misc/"; + license = with licenses; [ lgpl21 gpl3 ]; + maintainers = with maintainers; [ superherointj ]; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/opam-file-format/default.nix b/nixpkgs/pkgs/development/ocaml-modules/opam-file-format/default.nix index dd16a369881c..d0ec77c4556f 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/opam-file-format/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/opam-file-format/default.nix @@ -1,22 +1,22 @@ -{ lib, buildDunePackage, fetchFromGitHub }: +{ lib, fetchFromGitHub, buildDunePackage }: buildDunePackage rec { - version = "2.1.2"; pname = "opam-file-format"; - - useDune2 = true; + version = "2.1.3"; src = fetchFromGitHub { owner = "ocaml"; repo = pname; rev = version; - sha256 = "19xppn2s3yjid8jc1wh8gdf5mgmlpzby2cf2slmnbyrgln3vj6i2"; + sha256 = "1fxhppdmrysr2nb5z3c448h17np48f3ga9jih33acj78r4rdblcs"; }; - meta = { + useDune2 = true; + + meta = with lib; { description = "Parser and printer for the opam file syntax"; - license = lib.licenses.lgpl21; - maintainers = [ lib.maintainers.vbgl ]; - inherit (src.meta) homepage; + license = licenses.lgpl21; + maintainers = with maintainers; [ vbgl ]; + homepage = "https://github.com/ocaml/opam-file-format/"; }; } diff --git a/nixpkgs/pkgs/development/ocaml-modules/parmap/default.nix b/nixpkgs/pkgs/development/ocaml-modules/parmap/default.nix index 7adc8482b232..d79999087dd8 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/parmap/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/parmap/default.nix @@ -1,24 +1,28 @@ -{ lib, buildDunePackage, fetchurl, dune-configurator }: +{ lib, fetchurl, buildDunePackage, dune-configurator }: buildDunePackage rec { pname = "parmap"; - version = "1.2"; - - useDune2 = true; + version = "1.2.3"; src = fetchurl { url = "https://github.com/rdicosmo/${pname}/releases/download/${version}/${pname}-${version}.tbz"; - sha256 = "sha256-XUXptzD0eytaypaBQ+EBp4iVFRE6/Y0inS93t/YZrM8="; + sha256 = "1wg81slp453jci0gi0rzvdjx74110mlf1n5qpsmxic6fqsyz9d2v"; }; - buildInputs = [ dune-configurator ]; + minimalOCamlVersion = "4.03"; + useDune2 = true; + + buildInputs = [ + dune-configurator + ]; doCheck = true; meta = with lib; { description = "Library for multicore parallel programming"; + downloadPage = "https://github.com/rdicosmo/parmap"; homepage = "https://rdicosmo.github.io/parmap"; - maintainers = [ maintainers.bcdarwin ]; license = licenses.lgpl2; + maintainers = with maintainers; [ bcdarwin ]; }; } diff --git a/nixpkgs/pkgs/development/ocaml-modules/reason-native/cli.nix b/nixpkgs/pkgs/development/ocaml-modules/reason-native/cli.nix new file mode 100644 index 000000000000..1a4c020dc352 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/reason-native/cli.nix @@ -0,0 +1,11 @@ +{ re, reason, pastel, ... }: + +{ + pname = "cli"; + + buildInputs = [ + re + reason + pastel + ]; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/reason-native/console.nix b/nixpkgs/pkgs/development/ocaml-modules/reason-native/console.nix new file mode 100644 index 000000000000..c11c12b46730 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/reason-native/console.nix @@ -0,0 +1,21 @@ +{ buildDunePackage, callPackage, reason, console, ... }: + +{ + pname = "console"; + + buildInputs = [ + reason + ]; + + passthru.tests = { + console = callPackage ./tests/console { + inherit buildDunePackage reason console; + }; + }; + + meta = { + description = "A library providing a web-influenced polymorphic console API for native Console.log(anything) with runtime printing"; + downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/console"; + homepage = "https://reason-native.com/docs/console/"; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/reason-native/default.nix b/nixpkgs/pkgs/development/ocaml-modules/reason-native/default.nix new file mode 100644 index 000000000000..f65aa5159b9d --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/reason-native/default.nix @@ -0,0 +1,43 @@ +{ newScope, lib, fetchFromGitHub, callPackage, buildDunePackage, atdgen, junit, qcheck-core, re, reason, reason-native }: + +let + generic = (somePath: + let + prepkg = import somePath { + inherit callPackage cli buildDunePackage atdgen junit qcheck-core re reason; + inherit (reason-native) console file-context-printer fp pastel rely; + }; + in + buildDunePackage + ({ + version = "2021-16-16-aec0ac6"; + src = fetchFromGitHub { + owner = "reasonml"; + repo = "reason-native"; + rev = "aec0ac681be7211b4d092262281689c46deb63e1"; + sha256 = "sha256-QoyI50MBY3RJBmM1y90n7oXrLmHe0CQxKojv+7YbegE="; + }; + useDune2 = true; + meta = with lib; { + description = "Libraries for building and testing native Reason programs"; + downloadPage = "https://github.com/reasonml/reason-native"; + homepage = "https://reason-native.com/"; + license = licenses.mit; + maintainers = with maintainers; [ superherointj ]; + } // (prepkg.meta or {}); + } // prepkg) + ); + cli = generic ./cli.nix; # Used only by Rely. +in + lib.makeScope newScope (self: with self; { + console = generic ./console.nix; + dir = generic ./dir.nix; + file-context-printer = generic ./file-context-printer.nix; + fp = generic ./fp.nix; + pastel = generic ./pastel.nix; + pastel-console = generic ./pastel-console.nix; + qcheck-rely = generic ./qcheck-rely.nix; + refmterr = generic ./refmterr.nix; + rely = generic ./rely.nix; + rely-junit-reporter = generic ./rely-junit-reporter.nix; + }) diff --git a/nixpkgs/pkgs/development/ocaml-modules/reason-native/dir.nix b/nixpkgs/pkgs/development/ocaml-modules/reason-native/dir.nix new file mode 100644 index 000000000000..e6eb9c0c403f --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/reason-native/dir.nix @@ -0,0 +1,18 @@ +{ reason, fp, ... }: + +{ + pname = "dir"; + + buildInputs = [ + reason + ]; + + propagatedBuildInputs = [ + fp + ]; + + meta = { + description = "A library that provides a consistent API for common system, user and application directories consistently on all platforms"; + downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/dir"; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/reason-native/file-context-printer.nix b/nixpkgs/pkgs/development/ocaml-modules/reason-native/file-context-printer.nix new file mode 100644 index 000000000000..749e727feeca --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/reason-native/file-context-printer.nix @@ -0,0 +1,20 @@ +{ reason, re, pastel, ... }: + +{ + pname = "file-context-printer"; + + buildInputs = [ + reason + ]; + + propagatedBuildInputs = [ + re + pastel + ]; + + meta = { + description = "Utility for displaying snippets of files on the command line"; + downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/file-context-printer"; + homepage = "https://reason-native.com/docs/file-context-printer/"; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/reason-native/fp.nix b/nixpkgs/pkgs/development/ocaml-modules/reason-native/fp.nix new file mode 100644 index 000000000000..ae6ae50705d5 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/reason-native/fp.nix @@ -0,0 +1,14 @@ +{ reason, ... }: + +{ + pname = "fp"; + + buildInputs = [ + reason + ]; + + meta = { + description = "A library for creating and operating on file paths consistently on multiple platforms"; + downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/fp"; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/reason-native/pastel-console.nix b/nixpkgs/pkgs/development/ocaml-modules/reason-native/pastel-console.nix new file mode 100644 index 000000000000..f1d2c7cc7264 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/reason-native/pastel-console.nix @@ -0,0 +1,20 @@ +{ reason, console, pastel, ... }: + +{ + pname = "pastel-console"; + + buildInputs = [ + reason + ]; + + propagatedBuildInputs = [ + console + pastel + ]; + + meta = { + description = "Small library for pretty coloring to Console output"; + downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/pastel-console"; + homepage = "https://reason-native.com/docs/pastel/console"; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/reason-native/pastel.nix b/nixpkgs/pkgs/development/ocaml-modules/reason-native/pastel.nix new file mode 100644 index 000000000000..a5abc4e219c5 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/reason-native/pastel.nix @@ -0,0 +1,20 @@ +{ reason, re, ... }: + +{ + pname = "pastel"; + + minimalOCamlVersion = "4.05"; + + buildInputs = [ + reason + ]; + propagatedBuildInputs = [ + re + ]; + + meta = { + description = "A text formatting library that harnesses Reason JSX to provide intuitive terminal output. Like React but for CLI"; + downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/pastel"; + homepage = "https://reason-native.com/docs/pastel/"; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix b/nixpkgs/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix new file mode 100644 index 000000000000..a3d297b4f5a5 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix @@ -0,0 +1,20 @@ +{ qcheck-core, reason, console, rely, ... }: + +{ + pname = "qcheck-rely"; + + buildInputs = [ + reason + ]; + + propagatedBuildInputs = [ + qcheck-core + console + rely + ]; + + meta = { + description = "A library containing custom Rely matchers allowing for easily using QCheck with Rely. QCheck is a 'QuickCheck inspired property-based testing for OCaml, and combinators to generate random values to run tests on'"; + downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/qcheck-rely"; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/reason-native/refmterr.nix b/nixpkgs/pkgs/development/ocaml-modules/reason-native/refmterr.nix new file mode 100644 index 000000000000..9b14d4a8ba31 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/reason-native/refmterr.nix @@ -0,0 +1,21 @@ +{ atdgen, re, reason, pastel, ... }: + +{ + pname = "refmterr"; + + buildInputs = [ + reason + ]; + + propagatedBuildInputs = [ + atdgen + re + pastel + ]; + + meta = { + description = "An error formatter tool for Reason and OCaml. Takes raw error output from compiler and converts to pretty output"; + downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/refmterr"; + homepage = "https://reason-native.com/docs/refmterr/"; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/reason-native/rely-junit-reporter.nix b/nixpkgs/pkgs/development/ocaml-modules/reason-native/rely-junit-reporter.nix new file mode 100644 index 000000000000..6e8b41bbd1c4 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/reason-native/rely-junit-reporter.nix @@ -0,0 +1,23 @@ +{ atdgen, junit, re, reason, pastel, rely, ... }: + +{ + pname = "rely-junit-reporter"; + + buildInputs = [ + atdgen + reason + ]; + + propagatedBuildInputs = [ + junit + re + pastel + rely + ]; + + meta = { + description = "A tool providing JUnit Reporter for Rely Testing Framework"; + downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/rely-junit-reporter"; + homepage = "https://reason-native.com/docs/rely/"; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/reason-native/rely.nix b/nixpkgs/pkgs/development/ocaml-modules/reason-native/rely.nix new file mode 100644 index 000000000000..a2230426bec1 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/reason-native/rely.nix @@ -0,0 +1,22 @@ +{ re, reason, cli, file-context-printer, pastel, ... }: + +{ + pname = "rely"; + + buildInputs = [ + reason + ]; + + propagatedBuildInputs = [ + re + cli + file-context-printer + pastel + ]; + + meta = { + description = "A Jest-inspired testing framework for native OCaml/Reason"; + downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/rely"; + homepage = "https://reason-native.com/docs/rely/"; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/reason-native/tests/console/console-test.opam b/nixpkgs/pkgs/development/ocaml-modules/reason-native/tests/console/console-test.opam new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/reason-native/tests/console/console-test.opam diff --git a/nixpkgs/pkgs/development/ocaml-modules/reason-native/tests/console/console-test.re b/nixpkgs/pkgs/development/ocaml-modules/reason-native/tests/console/console-test.re new file mode 100644 index 000000000000..15685205e1bc --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/reason-native/tests/console/console-test.re @@ -0,0 +1 @@ +Console.log(Some("Hello fellow Nixer!")); /* {"Hello fellow Nixer!"} */ diff --git a/nixpkgs/pkgs/development/ocaml-modules/reason-native/tests/console/default.nix b/nixpkgs/pkgs/development/ocaml-modules/reason-native/tests/console/default.nix new file mode 100644 index 000000000000..e1a995d33c5c --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/reason-native/tests/console/default.nix @@ -0,0 +1,20 @@ +{ lib, buildDunePackage, reason, console }: + +buildDunePackage rec { + pname = "console-test"; + version = "1"; + + src = ./.; + + useDune2 = true; + + buildInputs = [ + reason + console + ]; + + doInstallCheck = true; + postInstallCheck = '' + $out/bin/console-test | grep -q "{\"Hello fellow Nixer!\"}" > /dev/null + ''; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/reason-native/tests/console/dune b/nixpkgs/pkgs/development/ocaml-modules/reason-native/tests/console/dune new file mode 100644 index 000000000000..49f2121385e2 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/reason-native/tests/console/dune @@ -0,0 +1,4 @@ +(executable + (name console-test) + (public_name console-test) + (libraries reason console.lib)) diff --git a/nixpkgs/pkgs/development/ocaml-modules/sha/default.nix b/nixpkgs/pkgs/development/ocaml-modules/sha/default.nix index a506e6795fd1..80a5205a2301 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/sha/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/sha/default.nix @@ -1,28 +1,29 @@ -{ lib -, fetchurl -, buildDunePackage -, ounit -}: +{ lib, fetchurl, buildDunePackage, stdlib-shims, ounit }: buildDunePackage rec { pname = "sha"; - version = "1.13"; - - useDune2 = true; + version = "1.14"; src = fetchurl { url = "https://github.com/djs55/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; - sha256 = "00z2s4fsv9i1h09rj5dy3nd9hhcn79b75sn2ljj5wihlf4y4g304"; + sha256 = "114vydrfdp7fayigvgk3ckiby0kh4n49c1j53v8k40gk6nzm3l19"; }; + useDune2 = true; + + propagatedBuildInputs = [ + stdlib-shims + ]; + doCheck = true; - checkInputs = [ ounit ]; + checkInputs = [ + ounit + ]; meta = with lib; { description = "Binding for SHA interface code in OCaml"; - maintainers = [ maintainers.arthurteisseire ]; - homepage = "https://github.com/djs55/ocaml-${pname}"; + homepage = "https://github.com/djs55/ocaml-sha/"; license = licenses.isc; + maintainers = with maintainers; [ arthurteisseire ]; }; - } diff --git a/nixpkgs/pkgs/development/ocaml-modules/tls/async.nix b/nixpkgs/pkgs/development/ocaml-modules/tls/async.nix new file mode 100644 index 000000000000..ceac7a7c0749 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/tls/async.nix @@ -0,0 +1,21 @@ +{ lib, buildDunePackage, tls, async, cstruct-async, core, cstruct, mirage-crypto-rng-async }: + +buildDunePackage rec { + pname = "tls-async"; + + inherit (tls) src meta version; + + minimumOCamlVersion = "4.08"; + useDune2 = true; + + doCheck = true; + + propagatedBuildInputs = [ + async + core + cstruct + cstruct-async + mirage-crypto-rng-async + tls + ]; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix b/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix index dadeb5a98eaf..5a5479c9fe85 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix @@ -1,28 +1,47 @@ -{ lib, fetchurl, buildDunePackage, ppx_sexp_conv, ppx_cstruct, cstruct -, cstruct-sexp, sexplib, mirage-crypto, mirage-crypto-pk, mirage-crypto-rng -, x509, domain-name, fmt, cstruct-unix, ounit2, ocaml_lwt, ptime, rresult -, mirage-crypto-ec, hkdf, logs, alcotest }: +{ lib, fetchurl, buildDunePackage +, cstruct, cstruct-sexp, domain-name, fmt, ppx_cstruct, ppx_sexp_conv, logs, hkdf, mirage-crypto, mirage-crypto-ec, mirage-crypto-pk, mirage-crypto-rng, ocaml_lwt, ptime, rresult, sexplib, x509 +, alcotest, cstruct-unix, ounit2, randomconv +}: buildDunePackage rec { - minimumOCamlVersion = "4.08"; - - version = "0.13.1"; pname = "tls"; + version = "0.13.2"; src = fetchurl { url = "https://github.com/mirleft/ocaml-tls/releases/download/v${version}/tls-v${version}.tbz"; - sha256 = "ca95fa59a82f7d38b0b495fc0cd1ff54e7728492a292895d0067c1ba9de81b7b"; + sha256 = "sha256-IE6Fuvem8A3lZ/M8GLNYNwCG+v7BbPQ4QdYS+fKT50c="; }; + minimumOCamlVersion = "4.08"; useDune2 = true; - doCheck = true; - checkInputs = [ cstruct-unix ounit2 alcotest ]; + propagatedBuildInputs = [ + cstruct + cstruct-sexp + domain-name + fmt + ppx_cstruct + ppx_sexp_conv + logs + hkdf + mirage-crypto + mirage-crypto-ec + mirage-crypto-pk + mirage-crypto-rng + ocaml_lwt + ptime + rresult + sexplib + x509 + ]; - propagatedBuildInputs = [ ppx_sexp_conv ppx_cstruct cstruct cstruct-sexp - sexplib mirage-crypto mirage-crypto-pk mirage-crypto-rng - x509 domain-name fmt ocaml_lwt ptime mirage-crypto-ec - hkdf logs rresult ]; + doCheck = true; + checkInputs = [ + alcotest + cstruct-unix + ounit2 + randomconv + ]; meta = with lib; { homepage = "https://github.com/mirleft/ocaml-tls"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/tls/mirage.nix b/nixpkgs/pkgs/development/ocaml-modules/tls/mirage.nix index 18d0f08357d4..a0428536b813 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/tls/mirage.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/tls/mirage.nix @@ -1,25 +1,23 @@ { buildDunePackage, tls -, x509, lwt, fmt, mirage-flow, mirage-kv, mirage-clock, ptime -, mirage-crypto, mirage-crypto-pk, mirage-crypto-ec +, fmt, lwt, mirage-clock, mirage-crypto, mirage-crypto-ec, mirage-crypto-pk, mirage-flow, mirage-kv, ptime, x509 }: buildDunePackage { pname = "tls-mirage"; - - inherit (tls) version src useDune2 minimumOCamlVersion; + inherit (tls) src version minimumOCamlVersion useDune2; propagatedBuildInputs = [ - tls - x509 - lwt fmt - mirage-flow - mirage-kv + lwt mirage-clock - ptime mirage-crypto - mirage-crypto-pk mirage-crypto-ec + mirage-crypto-pk + mirage-flow + mirage-kv + ptime + tls + x509 ]; meta = tls.meta // { diff --git a/nixpkgs/pkgs/development/php-packages/ast/default.nix b/nixpkgs/pkgs/development/php-packages/ast/default.nix index 03cd439867a6..65e734e9254d 100644 --- a/nixpkgs/pkgs/development/php-packages/ast/default.nix +++ b/nixpkgs/pkgs/development/php-packages/ast/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "ast"; - version = "1.0.10"; - sha256 = "13s5r1szd80g1mqickghdd38mvjkwss221322mmbrykcfgp4fs30"; + version = "1.0.12"; + sha256 = "1mcfx989yrakixlsx2d8v6kyxawfwhig4mra9ccpjasfhad0d31x"; meta = with lib; { description = "Exposes the abstract syntax tree generated by PHP"; diff --git a/nixpkgs/pkgs/development/php-packages/couchbase/default.nix b/nixpkgs/pkgs/development/php-packages/couchbase/default.nix index 0b34ffe780a8..7e72af65a305 100644 --- a/nixpkgs/pkgs/development/php-packages/couchbase/default.nix +++ b/nixpkgs/pkgs/development/php-packages/couchbase/default.nix @@ -1,7 +1,7 @@ -{ lib, buildPecl, fetchFromGitHub, writeText, libcouchbase, zlib, php }: +{ lib, buildPecl, fetchFromGitHub, writeText, libcouchbase, zlib, php, substituteAll }: let pname = "couchbase"; - version = "2.6.2"; + version = "3.1.2"; in buildPecl { inherit pname version; @@ -10,38 +10,19 @@ buildPecl { owner = "couchbase"; repo = "php-couchbase"; rev = "v${version}"; - sha256 = "0ymrymnz91qg9b2ns044qg46wc65dffhxx402wpx1b5cj2vr4ma3"; + sha256 = "0zm2jm5lzjjqlhkiivm4v5gr4286pwqaf5nar1ga816hhwnyhj42"; }; configureFlags = [ "--with-couchbase" ]; buildInputs = [ libcouchbase zlib ]; internalDeps = lib.optionals (lib.versionOlder php.version "8.0") [ php.extensions.json ]; - peclDeps = [ php.extensions.igbinary ]; patches = [ - (writeText "php-couchbase.patch" '' - --- a/config.m4 - +++ b/config.m4 - @@ -9,7 +9,7 @@ if test "$PHP_COUCHBASE" != "no"; then - LIBCOUCHBASE_DIR=$PHP_COUCHBASE - else - AC_MSG_CHECKING(for libcouchbase in default path) - - for i in /usr/local /usr; do - + for i in ${libcouchbase}; do - if test -r $i/include/libcouchbase/couchbase.h; then - LIBCOUCHBASE_DIR=$i - AC_MSG_RESULT(found in $i) - @@ -154,6 +154,8 @@ COUCHBASE_FILES=" \ - igbinary_inc_path="$phpincludedir" - elif test -f "$phpincludedir/ext/igbinary/igbinary.h"; then - igbinary_inc_path="$phpincludedir" - + elif test -f "${php.extensions.igbinary.dev}/include/ext/igbinary/igbinary.h"; then - + igbinary_inc_path="${php.extensions.igbinary.dev}/include" - fi - if test "$igbinary_inc_path" = ""; then - AC_MSG_WARN([Cannot find igbinary.h]) - '') + (substituteAll { + src = ./libcouchbase.patch; + inherit libcouchbase; + }) ]; meta = with lib; { @@ -49,6 +30,5 @@ buildPecl { license = licenses.asl20; homepage = "https://docs.couchbase.com/php-sdk/current/project-docs/sdk-release-notes.html"; maintainers = teams.php.members; - broken = versionAtLeast php.version "8.0"; }; } diff --git a/nixpkgs/pkgs/development/php-packages/couchbase/libcouchbase.patch b/nixpkgs/pkgs/development/php-packages/couchbase/libcouchbase.patch new file mode 100644 index 000000000000..cd08da781a26 --- /dev/null +++ b/nixpkgs/pkgs/development/php-packages/couchbase/libcouchbase.patch @@ -0,0 +1,11 @@ +--- a/config.m4 ++++ b/config.m4 +@@ -28,7 +28,7 @@ if test "$PHP_COUCHBASE" != "no"; then + + dnl fallback on standard directory + else +- for i in /usr/local /usr; do ++ for i in @libcouchbase@; do + if test -r $i/include/libcouchbase/couchbase.h; then + LIBCOUCHBASE_DIR=$i + AC_MSG_RESULT(found in $i) diff --git a/nixpkgs/pkgs/development/php-packages/event/default.nix b/nixpkgs/pkgs/development/php-packages/event/default.nix index 420f2385e544..727543e6ee63 100644 --- a/nixpkgs/pkgs/development/php-packages/event/default.nix +++ b/nixpkgs/pkgs/development/php-packages/event/default.nix @@ -2,8 +2,8 @@ buildPecl { pname = "event"; - version = "3.0.2"; - sha256 = "1ws4l014z52vb23xbsfj6viwkf7fmh462af639xgbp0n6syf77dq"; + version = "3.0.4"; + sha256 = "13yb3zvlx43cncawymiwbqyz8gzpq1g03vd0xjlw9vz75b4mwn1x"; configureFlags = [ "--with-event-libevent-dir=${libevent.dev}" diff --git a/nixpkgs/pkgs/development/php-packages/igbinary/default.nix b/nixpkgs/pkgs/development/php-packages/igbinary/default.nix index 9e710f3c3d1e..caedac9acdfd 100644 --- a/nixpkgs/pkgs/development/php-packages/igbinary/default.nix +++ b/nixpkgs/pkgs/development/php-packages/igbinary/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "igbinary"; - version = "3.2.1"; - sha256 = "sha256-YBYgz/07PlWWIAmcBWm4xCR/Ap7BitwCBr8m+ONXU9s="; + version = "3.2.2"; + sha256 = "0321pb0298fa67qwj5nhhabkjiaxna5mag15ljyrqzpivimvny92"; configureFlags = [ "--enable-igbinary" ]; makeFlags = [ "phpincludedir=$(dev)/include" ]; diff --git a/nixpkgs/pkgs/development/php-packages/maxminddb/default.nix b/nixpkgs/pkgs/development/php-packages/maxminddb/default.nix index ae7ef3d0602f..eae232b6c017 100644 --- a/nixpkgs/pkgs/development/php-packages/maxminddb/default.nix +++ b/nixpkgs/pkgs/development/php-packages/maxminddb/default.nix @@ -1,7 +1,7 @@ { buildPecl, lib, fetchFromGitHub, libmaxminddb }: let pname = "maxminddb"; - version = "1.10.0"; + version = "1.10.1"; in buildPecl { inherit pname version; @@ -10,7 +10,7 @@ buildPecl { owner = "maxmind"; repo = "MaxMind-DB-Reader-php"; rev = "v${version}"; - sha256 = "sha256-2SnajDdO5uAYcuVpEbOuFlZzMxwo/EqFtUSr9XxT0KQ="; + sha256 = "1m5y733x4ykldi1pym54mdahfwfnwy2r1n6fnndwi8jz9px9pa5k"; }; buildInputs = [ libmaxminddb ]; diff --git a/nixpkgs/pkgs/development/php-packages/mongodb/default.nix b/nixpkgs/pkgs/development/php-packages/mongodb/default.nix index f8cd990d2670..bec701a7fc59 100644 --- a/nixpkgs/pkgs/development/php-packages/mongodb/default.nix +++ b/nixpkgs/pkgs/development/php-packages/mongodb/default.nix @@ -4,8 +4,8 @@ buildPecl { pname = "mongodb"; - version = "1.9.0"; - sha256 = "16mbw3p80qxsj86nmjbfch8wv6jaq8wbz4rlpmixvhj9nwbp37hs"; + version = "1.9.1"; + sha256 = "1mzyssy2a89grw7rwmh0x22lql377nmnqlcv9piam1c32qiwxlg9"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/nixpkgs/pkgs/development/php-packages/pcov/default.nix b/nixpkgs/pkgs/development/php-packages/pcov/default.nix index 8511ccbebc54..f0e3e75c71c3 100644 --- a/nixpkgs/pkgs/development/php-packages/pcov/default.nix +++ b/nixpkgs/pkgs/development/php-packages/pcov/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "pcov"; - version = "1.0.8"; - sha256 = "sha256-6rbniyxLIHPW/e+eWZN1qS8F1rOB7ld1N8JKUS1geRQ="; + version = "1.0.9"; + sha256 = "0q2ig5lxzpwz3qgr05wcyh5jzhfxlygkv6nj6jagkhiialng2710"; buildInputs = [ pcre2 ]; diff --git a/nixpkgs/pkgs/development/php-packages/pinba/default.nix b/nixpkgs/pkgs/development/php-packages/pinba/default.nix index 0373e74d9fca..1649da7c6545 100644 --- a/nixpkgs/pkgs/development/php-packages/pinba/default.nix +++ b/nixpkgs/pkgs/development/php-packages/pinba/default.nix @@ -1,14 +1,14 @@ -{ buildPecl, lib, fetchFromGitHub, php }: +{ buildPecl, lib, fetchFromGitHub }: buildPecl { pname = "pinba"; - version = "1.1.2-dev"; + version = "1.1.2"; src = fetchFromGitHub { owner = "tony2001"; repo = "pinba_extension"; - rev = "edbc313f1b4fb8407bf7d5acf63fbb0359c7fb2e"; - sha256 = "02sljqm6griw8ccqavl23f7w1hp2zflcv24lpf00k6pyrn9cwx80"; + rev = "RELEASE_1_1_2"; + sha256 = "0wqcqq6sb51wiawa37hbd1h9dbvmyyndzdvz87xqji7lpr9vn8jy"; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/php-packages/protobuf/default.nix b/nixpkgs/pkgs/development/php-packages/protobuf/default.nix index 2112e84cffff..11db92e92e02 100644 --- a/nixpkgs/pkgs/development/php-packages/protobuf/default.nix +++ b/nixpkgs/pkgs/development/php-packages/protobuf/default.nix @@ -1,30 +1,13 @@ -{ buildPecl, lib, pcre2, fetchpatch }: +{ buildPecl, lib, pcre2 }: buildPecl { pname = "protobuf"; - version = "3.14.0"; - sha256 = "1ldc4s28hq61cfg8l4c06pgicj0ng7k37f28a0dnnbs7xkr7cibd"; + version = "3.17.2"; + sha256 = "0i4npj4sl8ihkzxc6m3vv3nlqk952z9bfwnrk90a9yakw5gfhlz5"; buildInputs = [ pcre2 ]; - patches = [ - # TODO: remove with next update - (fetchpatch { - url = "https://github.com/protocolbuffers/protobuf/commit/823f351448f7c432bed40b89ee3309e0a94c1855.patch"; - sha256 = "sha256-ozHtO8s9zvmh/+wBEge3Yn3n0pbpR3dAojJcuAg/G3s="; - stripLen = 4; - includes = [ - "array.c" - "def.c" - "map.c" - "message.c" - "protobuf.h" - "wkt.inc" - ]; - }) - ]; - meta = with lib; { description = '' Google's language-neutral, platform-neutral, extensible mechanism for serializing structured data. diff --git a/nixpkgs/pkgs/development/php-packages/redis/default.nix b/nixpkgs/pkgs/development/php-packages/redis/default.nix index 35e9a909b377..56e8a0a1fae5 100644 --- a/nixpkgs/pkgs/development/php-packages/redis/default.nix +++ b/nixpkgs/pkgs/development/php-packages/redis/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "redis"; - version = "5.3.3"; - sha256 = "sha256-N3iRYeFkzVIjmjDJojjaYf7FyDlc2sOFtu2PDFD9kvA="; + version = "5.3.4"; + sha256 = "1k5l7xxb06rlwq9jbmbbr03pc74d75vgv7h5bqjkbwan6dphafab"; internalDeps = with php.extensions; [ session diff --git a/nixpkgs/pkgs/development/php-packages/swoole/default.nix b/nixpkgs/pkgs/development/php-packages/swoole/default.nix index ef228c2ddc3e..c9ec1b3938f0 100644 --- a/nixpkgs/pkgs/development/php-packages/swoole/default.nix +++ b/nixpkgs/pkgs/development/php-packages/swoole/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "swoole"; - version = "4.6.4"; - sha256 = "0hgndnn27q7fbsb0nw6bfdg0kyy5di9vrmf7g53jc6lsnf73ha31"; + version = "4.6.7"; + sha256 = "107wp403z8skkqrcm240vyyy6wqx5a4v2bqhlshlknyi14r2v165"; buildInputs = [ valgrind pcre2 ]; internalDeps = lib.optionals (lib.versionOlder php.version "7.4") [ php.extensions.hash ]; diff --git a/nixpkgs/pkgs/development/php-packages/xdebug/default.nix b/nixpkgs/pkgs/development/php-packages/xdebug/default.nix index eaadb4b1f544..43387380ddac 100644 --- a/nixpkgs/pkgs/development/php-packages/xdebug/default.nix +++ b/nixpkgs/pkgs/development/php-packages/xdebug/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "xdebug"; - version = "3.0.3"; - sha256 = "sha256-5yZagVGOOX+XLcki50bRpIRTcXf/SJVDUWfRCeKTJDI="; + version = "3.0.4"; + sha256 = "1bvjmnx9bcfq4ikp02kiqg0f7ccgx4mkmz5d7g6v0d263x4r0wmj"; doCheck = true; checkTarget = "test"; diff --git a/nixpkgs/pkgs/development/python-modules/acoustics/default.nix b/nixpkgs/pkgs/development/python-modules/acoustics/default.nix index b652c28c6293..9047910a2138 100644 --- a/nixpkgs/pkgs/development/python-modules/acoustics/default.nix +++ b/nixpkgs/pkgs/development/python-modules/acoustics/default.nix @@ -14,6 +14,10 @@ buildPythonPackage rec { }; checkPhase = '' + export HOME=$TMPDIR + mkdir -p $HOME/.matplotlib + echo "backend: ps" > $HOME/.matplotlib/matplotlibrc + pushd tests py.test -Wignore::DeprecationWarning ./. popd diff --git a/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 64df2e02759c..adb72d0cd03b 100644 --- a/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.13.4"; + version = "3.14.0"; src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - sha256 = "sha256-e8hliPYLvHR3JjZ4AFgJWjPW1vK10BYuVqUYtF54J5c="; + sha256 = "1v33546cflsbm6k8mhmi1r5c8fqjlirvzmf62a604xns8wrxb88h"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/nixpkgs/pkgs/development/python-modules/aemet-opendata/default.nix b/nixpkgs/pkgs/development/python-modules/aemet-opendata/default.nix new file mode 100644 index 000000000000..9c344f720aec --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/aemet-opendata/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, geopy +, requests +, urllib3 +}: + +buildPythonPackage rec { + pname = "aemet-opendata"; + version = "0.2.1"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "Noltari"; + repo = "AEMET-OpenData"; + rev = version; + sha256 = "0jl1897m3qmr48n469mq7d66k1j0rn7hlbcahm0ylf5i3ma03aiw"; + }; + + propagatedBuildInputs = [ + geopy + requests + urllib3 + ]; + + # no tests implemented + doCheck = false; + + pythonImportsCheck = [ "aemet_opendata.interface" ]; + + meta = with lib; { + description = "Python client for AEMET OpenData Rest API"; + homepage = "https://github.com/Noltari/AEMET-OpenData"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/ailment/default.nix b/nixpkgs/pkgs/development/python-modules/ailment/default.nix index e555d69169b5..388880cda0b3 100644 --- a/nixpkgs/pkgs/development/python-modules/ailment/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ailment/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.0.7912"; + version = "9.0.8021"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-q1mi8ZNvjb3XM3le4ysy58bb978102OFKypTp9mSzxo="; + sha256 = "sha256-DeQvYuVRYOxyVPqHzTSNtEUUN4tHhSVMZoex6SUWik8="; }; propagatedBuildInputs = [ pyvex ]; diff --git a/nixpkgs/pkgs/development/python-modules/aio-geojson-client/default.nix b/nixpkgs/pkgs/development/python-modules/aio-geojson-client/default.nix new file mode 100644 index 000000000000..2c64230db266 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/aio-geojson-client/default.nix @@ -0,0 +1,45 @@ +{ lib +, aiohttp +, aresponses +, asynctest +, buildPythonPackage +, fetchFromGitHub +, geojson +, haversine +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "aio-geojson-client"; + version = "0.14"; + + src = fetchFromGitHub { + owner = "exxamalte"; + repo = "python-aio-geojson-client"; + rev = "v${version}"; + sha256 = "1nk0mas71n1bn4wc7pcv279i1b5mxy9phyc8ppxlb16kbjnjj0h8"; + }; + + propagatedBuildInputs = [ + aiohttp + geojson + haversine + ]; + + checkInputs = [ + aresponses + asynctest + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "aio_geojson_client" ]; + + meta = with lib; { + description = "Python module for accessing GeoJSON feeds"; + homepage = "https://github.com/exxamalte/python-aio-geojson-client"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix b/nixpkgs/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix new file mode 100644 index 000000000000..b42ba55bfa74 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix @@ -0,0 +1,43 @@ +{ lib +, aio-geojson-client +, aiohttp +, aresponses +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +, pytz +}: + +buildPythonPackage rec { + pname = "aio-geojson-geonetnz-quakes"; + version = "0.13"; + + src = fetchFromGitHub { + owner = "exxamalte"; + repo = "python-aio-geojson-geonetnz-quakes"; + rev = "v${version}"; + sha256 = "sha256-M1QleYVPqLFjxBmOlNJdydxDTk0JJf+GYVtOTC3YUTA="; + }; + + propagatedBuildInputs = [ + aio-geojson-client + aiohttp + pytz + ]; + + checkInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "aio_geojson_geonetnz_quakes" ]; + + meta = with lib; { + description = "Python module for accessing the GeoNet NZ Quakes GeoJSON feeds"; + homepage = "https://github.com/exxamalte/pythonaio-geojson-geonetnz-quakes"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix b/nixpkgs/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix new file mode 100644 index 000000000000..97adb2f8fe07 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix @@ -0,0 +1,45 @@ +{ lib +, aio-geojson-client +, aiohttp +, aresponses +, asynctest +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +, pytz +}: + +buildPythonPackage rec { + pname = "aio-geojson-geonetnz-volcano"; + version = "0.5"; + + src = fetchFromGitHub { + owner = "exxamalte"; + repo = "python-aio-geojson-geonetnz-volcano"; + rev = "v${version}"; + sha256 = "0x4i9gjwb2j788aw4j47bxin0d2ma3khssprq4ga3cjzx2qjwjvn"; + }; + + propagatedBuildInputs = [ + aio-geojson-client + aiohttp + pytz + ]; + + checkInputs = [ + aresponses + asynctest + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "aio_geojson_geonetnz_volcano" ]; + + meta = with lib; { + description = "Python module for accessing the GeoNet NZ Volcanic GeoJSON feeds"; + homepage = "https://github.com/exxamalte/pythonaio-geojson-geonetnz-volcano"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix b/nixpkgs/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix new file mode 100644 index 000000000000..792f91bc7f11 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix @@ -0,0 +1,45 @@ +{ lib +, aio-geojson-client +, aiohttp +, aresponses +, asynctest +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +, pytz +}: + +buildPythonPackage rec { + pname = "aio-geojson-nsw-rfs-incidents"; + version = "0.4"; + + src = fetchFromGitHub { + owner = "exxamalte"; + repo = "python-aio-geojson-nsw-rfs-incidents"; + rev = "v${version}"; + sha256 = "sha256-o9tuoJ7VZ6bg0rYeRWClKxdbxxj6wPgkSF7ZdOfmJew="; + }; + + propagatedBuildInputs = [ + aio-geojson-client + aiohttp + pytz + ]; + + checkInputs = [ + aresponses + asynctest + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "aio_geojson_nsw_rfs_incidents" ]; + + meta = with lib; { + description = "Python module for accessing the NSW Rural Fire Service incidents feeds"; + homepage = "https://github.com/exxamalte/python-aio-geojson-nsw-rfs-incidents"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/aioazuredevops/default.nix b/nixpkgs/pkgs/development/python-modules/aioazuredevops/default.nix new file mode 100644 index 000000000000..3568e98a59ec --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/aioazuredevops/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, isPy27 +, fetchPypi +, aiohttp +, click +}: + +buildPythonPackage rec { + pname = "aioazuredevops"; + version = "1.3.5"; + + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "4c98a995d0516f502ba191fa3ac973ee72b93425e7eab3cdf770516c6e93c780"; + }; + + propagatedBuildInputs = [ + aiohttp + click + ]; + + # no tests implemented + doCheck = false; + + pythonImportsCheck = [ + "aioazuredevops.builds" + "aioazuredevops.client" + "aioazuredevops.core" + ]; + + meta = with lib; { + description = "Get data from the Azure DevOps API"; + homepage = "https://github.com/timmo001/aioazuredevops"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/aioguardian/default.nix b/nixpkgs/pkgs/development/python-modules/aioguardian/default.nix index 388c856fc619..74ff8fb3fde6 100644 --- a/nixpkgs/pkgs/development/python-modules/aioguardian/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioguardian/default.nix @@ -16,7 +16,6 @@ buildPythonPackage rec { pname = "aioguardian"; version = "1.0.7"; - disabled = pythonAtLeast "3.9"; src = fetchFromGitHub { owner = "bachya"; diff --git a/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix b/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix index 2d76d033231d..a94cdf865b03 100644 --- a/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , cryptography , fetchFromGitHub -, poetry +, poetry-core , pytest-aiohttp , pytestCheckHook , pythonAtLeast @@ -11,18 +11,19 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "0.2.62"; + version = "0.2.67"; format = "pyproject"; - disabled = pythonAtLeast "3.9"; src = fetchFromGitHub { owner = "Jc2k"; repo = pname; rev = version; - sha256 = "sha256-01IzeR0iukPTkz8I7h93wZkgjz6flRAJN8unEX6d+cs="; + sha256 = "04421p0dq7xh7rhx8ip177g2b91lhlc2yziqxbs9yxd1qyzwiqj1"; }; - nativeBuildInputs = [ poetry ]; + nativeBuildInputs = [ + poetry-core + ]; propagatedBuildInputs = [ cryptography @@ -34,11 +35,9 @@ buildPythonPackage rec { pytestCheckHook ]; - # Some test requires network access - disabledTests = [ - "test_remove_pairing" - "test_pair" - "test_add_and_remove_pairings" + disabledTestPaths = [ + # Tests require network access + "tests/test_ip_pairing.py" ]; pythonImportsCheck = [ "aiohomekit" ]; diff --git a/nixpkgs/pkgs/development/python-modules/aiohue/default.nix b/nixpkgs/pkgs/development/python-modules/aiohue/default.nix index 65baaec37190..641dd4ffa4ff 100644 --- a/nixpkgs/pkgs/development/python-modules/aiohue/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiohue/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "aiohue"; - version = "2.3.1"; + version = "2.5.1"; src = fetchPypi { inherit pname version; - sha256 = "1qxvqqsflcn263yg7r8vvfc2c2fl3rh4dkzwzh926ijnbc2sk4nm"; + sha256 = "01ywyiwqa7nyd4kprqxcycv50xydsi95q3lzidpm2r3kn1byis1y"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiolyric/default.nix b/nixpkgs/pkgs/development/python-modules/aiolyric/default.nix index 0dc576fca49a..4c20e38d8cfe 100644 --- a/nixpkgs/pkgs/development/python-modules/aiolyric/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiolyric/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "aiolyric"; - version = "1.0.6"; + version = "1.0.7"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "timmo001"; repo = pname; rev = "v${version}"; - sha256 = "1lnzsdw6kvgk0762f3vyw4xfzn7qkvsff16q61gm0ryjqg9j8whx"; + sha256 = "sha256-3UyWUsamluJclwrQD+MuUPLhNJoNU4/8w1m92OLWyrg="; }; propagatedBuildInputs = [ aiohttp ]; diff --git a/nixpkgs/pkgs/development/python-modules/aiorecollect/default.nix b/nixpkgs/pkgs/development/python-modules/aiorecollect/default.nix index 1bce60ce6af9..0d3fe5bbaedb 100644 --- a/nixpkgs/pkgs/development/python-modules/aiorecollect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiorecollect/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "aiorecollect"; - version = "1.0.4"; + version = "1.0.5"; format = "pyproject"; src = fetchFromGitHub { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-A4qk7eo4maCRP4UmtWrRCPvG6YrLVSOiOcfN8pEj5Po="; + sha256 = "0h76l0pahnmls0radknzm8dw79qx9dv0xhxqnn6011j9fwyviyqm"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiosmb/default.nix b/nixpkgs/pkgs/development/python-modules/aiosmb/default.nix index b9c968d63f5b..5e8482eff7e4 100644 --- a/nixpkgs/pkgs/development/python-modules/aiosmb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiosmb/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "aiosmb"; - version = "0.2.44"; + version = "0.2.48"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-xNdrOO0BqV4sD6U39G2RXihDBBf516x8RLiqNLnZyWk="; + sha256 = "1b5bqpl8wbs0nm6025wlz4n5sns6ca1x6kgw9wx227flwf3qjlgm"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiosyncthing/default.nix b/nixpkgs/pkgs/development/python-modules/aiosyncthing/default.nix index 553876a48cfd..7bbf740c78e8 100644 --- a/nixpkgs/pkgs/development/python-modules/aiosyncthing/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiosyncthing/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "aiosyncthing"; - version = "0.5.1"; + version = "0.6.3"; src = fetchFromGitHub { owner = "zhulik"; repo = pname; rev = "v${version}"; - sha256 = "0704qbg3jy80vaw3bcvhy988s1qs3fahpfwkja71fy70bh0vc860"; + sha256 = "sha256-vn8S2/kRW5C2Hbes9oLM4LGm1jWWK0zeLdujR14y6EI="; }; propagatedBuildInputs = [ @@ -34,6 +34,11 @@ buildPythonPackage rec { pytest-mock ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=aiosyncthing --cov-report=html" "" + ''; + pythonImportsCheck = [ "aiosyncthing" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/aiotractive/default.nix b/nixpkgs/pkgs/development/python-modules/aiotractive/default.nix new file mode 100644 index 000000000000..78d9ef43501e --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/aiotractive/default.nix @@ -0,0 +1,37 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, yarl +}: + +buildPythonPackage rec { + pname = "aiotractive"; + version = "0.5.1"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "zhulik"; + repo = pname; + rev = "v${version}"; + sha256 = "09zbca84dn1sprwqpfanmxxnmaknbzjz98xa87agpgy8xb3wpw7j"; + }; + + propagatedBuildInputs = [ + aiohttp + yarl + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "aiotractive" ]; + + meta = with lib; { + description = "Python client for the Tractive REST API"; + homepage = "https://github.com/zhulik/aiotractive"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/aladdin-connect/default.nix b/nixpkgs/pkgs/development/python-modules/aladdin-connect/default.nix new file mode 100644 index 000000000000..d25cdadc89a6 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/aladdin-connect/default.nix @@ -0,0 +1,33 @@ +{ lib +, requests +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "aladdin-connect"; + version = "0.3"; + + src = fetchFromGitHub { + owner = "shoejosh"; + repo = pname; + rev = version; + sha256 = "0nimd1nw1haxn8s2207fcrmpjyfp6nx97n560l6hzqyqqmf2d1d1"; + }; + + propagatedBuildInputs = [ + requests + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "aladdin_connect" ]; + + meta = with lib; { + description = "Python library for interacting with Genie Aladdin Connect devices"; + homepage = "https://github.com/shoejosh/aladdin-connect"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/ambee/default.nix b/nixpkgs/pkgs/development/python-modules/ambee/default.nix new file mode 100644 index 000000000000..b6fe6851aead --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/ambee/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, aiohttp +, poetry-core +, yarl +, aresponses +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "ambee"; + version = "0.2.1"; + disabled = pythonOlder "3.8"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "frenck"; + repo = "python-ambee"; + rev = "v${version}"; + sha256 = "11liw2206lyrnx09giqapjpi25lr2qnbmigi6rgynr2a1i9vxy1s"; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + yarl + ]; + + checkInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; + + postPatch = '' + # Upstream doesn't set a version for the pyproject.toml + substituteInPlace pyproject.toml \ + --replace "0.0.0" "${version}" \ + --replace "--cov" "" + ''; + + pythonImportsCheck = [ "ambee" ]; + + meta = with lib; { + description = "Python client for Ambee API"; + homepage = "https://github.com/frenck/python-ambee"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/amqtt/default.nix b/nixpkgs/pkgs/development/python-modules/amqtt/default.nix index 8ab0e7a7c0cc..d0cc2bd5da56 100644 --- a/nixpkgs/pkgs/development/python-modules/amqtt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/amqtt/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "amqtt"; - version = "0.10.0-alpha.3"; + version = "0.10.0-alpha.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Yakifo"; repo = pname; rev = "v${version}"; - sha256 = "0wz85ykjgi2174qcdgpakmc4m0p96v62az7pvc9hyallq1v1k4n6"; + sha256 = "1v5hlcciyicnhwk1xslh3kxyjqaw526fb05pvhjpp3zqrmbxya4d"; }; nativeBuildInputs = [ poetry-core ]; diff --git a/nixpkgs/pkgs/development/python-modules/androidtv/default.nix b/nixpkgs/pkgs/development/python-modules/androidtv/default.nix index 02edcea42efd..e49f4ba53fe5 100644 --- a/nixpkgs/pkgs/development/python-modules/androidtv/default.nix +++ b/nixpkgs/pkgs/development/python-modules/androidtv/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "androidtv"; - version = "0.0.59"; + version = "0.0.60"; # pypi does not contain tests, using github sources instead src = fetchFromGitHub { owner = "JeffLIrion"; repo = "python-androidtv"; rev = "v${version}"; - sha256 = "sha256-QuKWOo+QMBpVJglwvaSMbKKYMN/MW31E7BgIMchESG8="; + sha256 = "sha256-GWCiRxZ6pHrcVkOKNGxSK8lUD0RohtED8czXIWUoVaM="; }; propagatedBuildInputs = [ adb-shell pure-python-adb ] diff --git a/nixpkgs/pkgs/development/python-modules/angr/default.nix b/nixpkgs/pkgs/development/python-modules/angr/default.nix index 0ea298e06e19..89cdc5c55f0b 100644 --- a/nixpkgs/pkgs/development/python-modules/angr/default.nix +++ b/nixpkgs/pkgs/development/python-modules/angr/default.nix @@ -42,14 +42,14 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.0.7912"; + version = "9.0.8021"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-261fk0JM37Hq+xsMF95VqLyidWE4ZUeygp8BP/DBXG4="; + sha256 = "sha256-brX/HdeZSPOnZKuD1v086GwyWSV8yA/FaMC3CbeI4Xk="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/angrop/default.nix b/nixpkgs/pkgs/development/python-modules/angrop/default.nix index cbe2ed9db2ad..09d1388c25ec 100644 --- a/nixpkgs/pkgs/development/python-modules/angrop/default.nix +++ b/nixpkgs/pkgs/development/python-modules/angrop/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.0.7912"; + version = "9.0.8021"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nbVvgbTk9LFA376alu4Cxqcu9b9CT9yutnfE5fVT8gY="; + sha256 = "sha256-wkCgVVHulu1hGdbUSEi38aMWy2UfR3g/7jj+o+NLI44="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/anyascii/default.nix b/nixpkgs/pkgs/development/python-modules/anyascii/default.nix new file mode 100644 index 000000000000..8e8b1c920733 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/anyascii/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "anyascii"; + version = "0.2.0"; + format = "setuptools"; + disabled = pythonOlder "3.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1b6jdd9nx15py0jqjdn154m6m491517sqlk57bbyj3x4xzywadkh"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Unicode to ASCII transliteration"; + homepage = "https://github.com/anyascii/anyascii"; + license = licenses.isc; + maintainers = teams.tts.members; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/anyio/default.nix b/nixpkgs/pkgs/development/python-modules/anyio/default.nix index e6cc3182487a..86fa3bafa2a8 100644 --- a/nixpkgs/pkgs/development/python-modules/anyio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/anyio/default.nix @@ -8,6 +8,8 @@ , typing-extensions , curio , hypothesis +, mock +, pytest-mock , pytestCheckHook , trio , trustme @@ -16,7 +18,7 @@ buildPythonPackage rec { pname = "anyio"; - version = "2.2.0"; + version = "3.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +26,7 @@ buildPythonPackage rec { owner = "agronholm"; repo = pname; rev = version; - sha256 = "0ram1niv2lg9qj53zssph104a4kxl8f94ilfn6mibn034m3ikcc8"; + sha256 = "sha256-zQiSAQN7cp1s+8hDTvYaMkHUXV1ccNwIsl2IOztH7J8="; }; propagatedBuildInputs = [ @@ -37,18 +39,21 @@ buildPythonPackage rec { checkInputs = [ curio hypothesis + pytest-mock pytestCheckHook trio trustme uvloop + ] ++ lib.optionals (pythonOlder "3.8") [ + mock ]; - pytestFlagsArray = [ - # lots of DNS lookups - "--ignore=tests/test_sockets.py" + disabledTestPaths = [ + # lots of DNS lookups + "tests/test_sockets.py" ] ++ lib.optionals stdenv.isDarwin [ # darwin sandboxing limitations - "--ignore=tests/streams/test_tls.py" + "tests/streams/test_tls.py" ]; pythonImportsCheck = [ "anyio" ]; diff --git a/nixpkgs/pkgs/development/python-modules/aprslib/default.nix b/nixpkgs/pkgs/development/python-modules/aprslib/default.nix new file mode 100644 index 000000000000..c5f4fa75a572 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/aprslib/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, mox3 +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "aprslib"; + version = "0.6.47"; + + src = fetchFromGitHub { + owner = "rossengeorgiev"; + repo = "aprs-python"; + rev = "v${version}"; + sha256 = "1569v74ym2r8vxx3dnjcs5fr7rdrfb0i9sycny5frw2zgms4ag6b"; + }; + + checkInputs = [ + mox3 + pytestCheckHook + ]; + + pythonImportsCheck = [ "aprslib" ]; + + meta = with lib; { + description = "Module for accessing APRS-IS and parsing APRS packets"; + homepage = "https://github.com/rossengeorgiev/aprs-python"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/arcam-fmj/default.nix b/nixpkgs/pkgs/development/python-modules/arcam-fmj/default.nix new file mode 100644 index 000000000000..4c3ff7d85a57 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/arcam-fmj/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, aiohttp +, attrs +, defusedxml +, pytest-aiohttp +, pytest-mock +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "arcam-fmj"; + version = "0.7.0"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "elupus"; + repo = "arcam_fmj"; + rev = version; + sha256 = "0y4wvvbcsizjd9qz6iw4gjhq5qf0qcqs27hpx1cd90vhy6rclxm0"; + }; + + propagatedBuildInputs = [ + aiohttp + attrs + defusedxml + ]; + + checkInputs = [ + pytest-aiohttp + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ + "arcam.fmj" + "arcam.fmj.client" + "arcam.fmj.state" + "arcam.fmj.utils" + ]; + + meta = with lib; { + description = "Python library for speaking to Arcam receivers"; + homepage = "https://github.com/elupus/arcam_fmj"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/archinfo/default.nix b/nixpkgs/pkgs/development/python-modules/archinfo/default.nix index 601dd954bc42..96cbf539fd18 100644 --- a/nixpkgs/pkgs/development/python-modules/archinfo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/archinfo/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.0.7912"; + version = "9.0.8021"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nHXF6Il6rHHrnGYEmv4FPQr6MsurzH1exkJS9UXThBs="; + sha256 = "sha256-j8sPrSaKam5gv1ZlTA3fF1u3UMei9jy843O0n8Hsibc="; }; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aria2p/default.nix b/nixpkgs/pkgs/development/python-modules/aria2p/default.nix index 2bb950beb282..9ea4fdf64b5b 100644 --- a/nixpkgs/pkgs/development/python-modules/aria2p/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aria2p/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder , aria2, poetry, pytest, pytestcov, pytest_xdist, responses -, asciimatics, loguru, requests, setuptools, websocket_client +, asciimatics, loguru, requests, setuptools, websocket-client }: buildPythonPackage rec { @@ -32,7 +32,7 @@ buildPythonPackage rec { pytest -nauto -k "not test_api and not test_cli and not test_interface" ''; - propagatedBuildInputs = [ asciimatics loguru requests setuptools websocket_client ]; + propagatedBuildInputs = [ asciimatics loguru requests setuptools websocket-client ]; meta = with lib; { homepage = "https://github.com/pawamoy/aria2p"; diff --git a/nixpkgs/pkgs/development/python-modules/async-lru/default.nix b/nixpkgs/pkgs/development/python-modules/async-lru/default.nix new file mode 100644 index 000000000000..8a5694ffde77 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/async-lru/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, pytestCheckHook +, pytest-asyncio +}: + +buildPythonPackage rec { + pname = "async-lru"; + version = "unstable-2020-10-24"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "aio-libs"; + repo = "async-lru"; + rev = "ae252508f9c5aecf9c02ddeb879d06c28dbffc42"; + sha256 = "1gk5qzdvhl2j1mw7xzchbw7bcgk9mzhvqa62nwwmvlbnx88pkwnc"; + }; + + postPatch = '' + sed -i '/^addopts/d' setup.cfg + ''; + + checkInputs = [ + pytestCheckHook + pytest-asyncio + ]; + + disabledTests = [ + # https://github.com/aio-libs/async-lru/issues/341 + "test_alru_cache_deco" + "test_alru_cache_fn_called" + "test_close" + ]; + + pythonImportsCheck = [ "async_lru" ]; + + meta = with lib; { + description = "Simple lru cache for asyncio"; + homepage = "https://github.com/wikibusiness/async_lru"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/authcaptureproxy/default.nix b/nixpkgs/pkgs/development/python-modules/authcaptureproxy/default.nix index 0f1f6d046463..a780ae59be70 100644 --- a/nixpkgs/pkgs/development/python-modules/authcaptureproxy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/authcaptureproxy/default.nix @@ -27,9 +27,10 @@ buildPythonPackage rec { postPatch = '' # https://github.com/alandtse/auth_capture_proxy/issues/14 - substituteInPlace pyproject.toml --replace \ - "poetry.masonry.api" \ - "poetry.core.masonry.api" + # https://github.com/alandtse/auth_capture_proxy/issues/15 + substituteInPlace pyproject.toml \ + --replace "poetry.masonry.api" "poetry.core.masonry.api" \ + --replace 'importlib-metadata = "^3.4.0"' 'importlib-metadata = "*"' ''; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix b/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix index 5eadd131d9ad..eed172868056 100644 --- a/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix +++ b/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "awesomeversion"; - version = "21.5.0"; + version = "21.6.0"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "sha256-0EOGWJZyvcRJyOqkcISvjL7o6lIaCwMKLftshsQCR6E="; + sha256 = "sha256-TODlLaj3bcNVHrly614oKe2OkhmowsJojpR7apUIojc="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/azure-eventhub/default.nix b/nixpkgs/pkgs/development/python-modules/azure-eventhub/default.nix new file mode 100644 index 000000000000..21b711c8ab0e --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/azure-eventhub/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, azure-core +, uamqp +}: + +buildPythonPackage rec { + pname = "azure-eventhub"; + version = "5.5.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "7b757b4910ac74902564b38089b9861c1bc51ff15bd49ff056888f939f7c4c49"; + }; + + propagatedBuildInputs = [ + azure-core + uamqp + ]; + + # too complicated to set up + doCheck = false; + + pythonImportsCheck = [ + "azure.eventhub" + "azure.eventhub.aio" + ]; + + meta = with lib; { + description = "Microsoft Azure Event Hubs Client Library for Python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/eventhub/azure-eventhub"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/backports-zoneinfo/default.nix b/nixpkgs/pkgs/development/python-modules/backports-zoneinfo/default.nix index a9bc0b55955b..0b4703e26516 100644 --- a/nixpkgs/pkgs/development/python-modules/backports-zoneinfo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/backports-zoneinfo/default.nix @@ -1,6 +1,9 @@ { lib, buildPythonPackage, fetchFromGitHub , pythonOlder +, python +, substituteAll , importlib-resources +, tzdata , hypothesis , pytestCheckHook }: @@ -16,7 +19,17 @@ buildPythonPackage rec { sha256 = "sha256-00xdDOVdDanfsjQTd3yjMN2RFGel4cWRrAA3CvSnl24="; }; - propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [ + patches = [ + (substituteAll { + name = "zoneinfo-path"; + src = ./zoneinfo.patch; + zoneinfo = "${tzdata}/lib/${python.libPrefix}/site-packages/tzdata/zoneinfo"; + }) + ]; + + propagatedBuildInputs = [ + tzdata + ] ++ lib.optionals (pythonOlder "3.7") [ importlib-resources ]; @@ -27,8 +40,14 @@ buildPythonPackage rec { pytestCheckHook ]; - # unfortunately /etc/zoneinfo doesn't exist in sandbox, and many tests fail - doCheck = false; + disabledTests = [ + # AssertionError: 'AEDT' != 'AEST' + "test_folds_and_gaps" + # AssertionError: 0 != 1 : (datetime.datetime(1917, 3, 25, 2, 0, 1, tzinfo=backports.zoneinfo.ZoneInfo(key='Australia/Sydney')), datetime.datetime(1917, 3, 24, 15, 0, tzinfo=datetime.timezone.utc)) + "test_folds_from_utc" + # backports.zoneinfo._common.ZoneInfoNotFoundError: 'No time zone found with key Eurasia/Badzone' + "test_bad_keys" + ]; meta = with lib; { description = "Backport of the standard library module zoneinfo"; diff --git a/nixpkgs/pkgs/development/python-modules/backports-zoneinfo/zoneinfo.patch b/nixpkgs/pkgs/development/python-modules/backports-zoneinfo/zoneinfo.patch new file mode 100644 index 000000000000..69dd75030ab2 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/backports-zoneinfo/zoneinfo.patch @@ -0,0 +1,17 @@ +diff --git a/src/backports/zoneinfo/_tzpath.py b/src/backports/zoneinfo/_tzpath.py +index 9baaf6b..3f842af 100644 +--- a/src/backports/zoneinfo/_tzpath.py ++++ b/src/backports/zoneinfo/_tzpath.py +@@ -24,10 +24,7 @@ def reset_tzpath(to=None): + base_tzpath = _parse_python_tzpath(env_var) + elif sys.platform != "win32": + base_tzpath = [ +- "/usr/share/zoneinfo", +- "/usr/lib/zoneinfo", +- "/usr/share/lib/zoneinfo", +- "/etc/zoneinfo", ++ "@zoneinfo@" + ] + + base_tzpath.sort(key=lambda x: not os.path.exists(x)) + diff --git a/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix b/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix new file mode 100644 index 000000000000..c7abe9cfd990 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, pbr +, requests +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "bimmer-connected"; + version = "0.7.15"; + + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "bimmerconnected"; + repo = "bimmer_connected"; + rev = version; + sha256 = "193m16rrq7mfvzjcq823icdr9fp3i8grqqn3ci8zhcsq6w3vnb90"; + }; + + nativeBuildInputs = [ + pbr + ]; + + PBR_VERSION = version; + + propagatedBuildInputs = [ + requests + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Library to read data from the BMW Connected Drive portal"; + homepage = "https://github.com/bimmerconnected/bimmer_connected"; + license = licenses.asl20; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/bitvavo-aio/default.nix b/nixpkgs/pkgs/development/python-modules/bitvavo-aio/default.nix new file mode 100644 index 000000000000..39094d74e5f5 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/bitvavo-aio/default.nix @@ -0,0 +1,35 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "bitvavo-aio"; + version = "1.0.3"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "cyberjunky"; + repo = pname; + rev = version; + sha256 = "1d9nbbvv7xnkixj03sfhs2da5j3i2m7p73r7j1yb7b39zas2rbig"; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "bitvavo" ]; + + meta = with lib; { + description = "Python client for Bitvavo crypto exchange API"; + homepage = "https://github.com/cyberjunky/bitvavo-aio"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/black/default.nix b/nixpkgs/pkgs/development/python-modules/black/default.nix index bf82df4afa34..6f4e05767bb7 100644 --- a/nixpkgs/pkgs/development/python-modules/black/default.nix +++ b/nixpkgs/pkgs/development/python-modules/black/default.nix @@ -5,6 +5,7 @@ , appdirs , attrs , click +, colorama , dataclasses , mypy-extensions , pathspec @@ -12,17 +13,20 @@ , regex , toml , typed-ast -, typing-extensions }: +, typing-extensions +, uvloop +}: + buildPythonPackage rec { pname = "black"; - version = "21.5b1"; + version = "21.6b0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1cdkrl5vw26iy7s23v2zpr39m6g5xsgxhfhagzzflgfbvdc56s93"; + sha256 = "016f6bhnnnbcrrh3cvmpk77ww0nykv5n1qvgf8b3044dm14264yw"; }; nativeBuildInputs = [ setuptools-scm ]; @@ -31,7 +35,7 @@ buildPythonPackage rec { # Black starts a local server and needs to bind a local address. __darwinAllowLocalNetworking = true; - checkInputs = [ pytestCheckHook parameterized ]; + checkInputs = [ pytestCheckHook parameterized ]; preCheck = '' export PATH="$PATH:$out/bin" @@ -39,6 +43,9 @@ buildPythonPackage rec { # The top directory /build matches black's DEFAULT_EXCLUDE regex. # Make /build the project root for black tests to avoid excluding files. touch ../.git + '' + lib.optionalString stdenv.isDarwin '' + # Work around https://github.com/psf/black/issues/2105 + export TMPDIR="/tmp" ''; disabledTests = [ @@ -55,19 +62,21 @@ buildPythonPackage rec { appdirs attrs click + colorama mypy-extensions pathspec regex toml - typed-ast - typing-extensions - ] ++ lib.optional (pythonOlder "3.7") dataclasses; + typed-ast # required for tests and python2 extra + uvloop + ] ++ lib.optional (pythonOlder "3.7") dataclasses + ++ lib.optional (pythonOlder "3.8") typing-extensions; meta = with lib; { description = "The uncompromising Python code formatter"; - homepage = "https://github.com/psf/black"; - changelog = "https://github.com/psf/black/blob/${version}/CHANGES.md"; - license = licenses.mit; + homepage = "https://github.com/psf/black"; + changelog = "https://github.com/psf/black/blob/${version}/CHANGES.md"; + license = licenses.mit; maintainers = with maintainers; [ sveitser ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/blebox-uniapi/default.nix b/nixpkgs/pkgs/development/python-modules/blebox-uniapi/default.nix new file mode 100644 index 000000000000..c3dbe3ccd321 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/blebox-uniapi/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, aiohttp +, semver +, asynctest +, deepmerge +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "blebox-uniapi"; + version = "1.3.3"; + + src = fetchFromGitHub { + owner = "blebox"; + repo = "blebox_uniapi"; + rev = "v${version}"; + sha256 = "0qvv2697yhqjmgvh37h8wgz3a77n61kqmxvsk4pf47wn43hks15c"; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest-runner" "" + ''; + + propagatedBuildInputs = [ + aiohttp + semver + ]; + + checkInputs = [ + asynctest + deepmerge + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "blebox_uniapi" ]; + + meta = with lib; { + description = "Python API for accessing BleBox smart home devices"; + homepage = "https://github.com/blebox/blebox_uniapi"; + license = licenses.asl20; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/blinkpy/default.nix b/nixpkgs/pkgs/development/python-modules/blinkpy/default.nix new file mode 100644 index 000000000000..a73514805249 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/blinkpy/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, python-dateutil +, python-slugify +, requests +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "blinkpy"; + version = "0.17.1"; + + src = fetchFromGitHub { + owner = "fronzbot"; + repo = "blinkpy"; + rev = "v${version}"; + sha256 = "11h4r2vkrlxwjig1lay1n5wpny5isfgz85f7lsn8ndnqa2wpsymp"; + }; + + propagatedBuildInputs = [ + python-dateutil + python-slugify + requests + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "blinkpy" + "blinkpy.api" + "blinkpy.auth" + "blinkpy.blinkpy" + "blinkpy.camera" + "blinkpy.helpers.util" + "blinkpy.sync_module" + ]; + + meta = with lib; { + description = "Python library for the Blink Camera system"; + homepage = "https://github.com/fronzbot/blinkpy"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/blurhash/default.nix b/nixpkgs/pkgs/development/python-modules/blurhash/default.nix new file mode 100644 index 000000000000..665f08f7987c --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/blurhash/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pillow +, numpy +}: + +buildPythonPackage rec { + pname = "blurhash"; + version = "1.1.4"; + + src = fetchFromGitHub { + owner = "halcy"; + repo = "blurhash-python"; + # There are no tags: https://github.com/halcy/blurhash-python/issues/4 + rev = "22e081ef1c24da1bb5c5eaa2c1d6649724deaef8"; + sha256 = "1qq6mhydlp7q3na4kmaq3871h43wh3pyfyxr4b79bia73wjdylxf"; + }; + + postPatch = '' + sed -i '/^addopts/d' setup.cfg + ''; + + checkInputs = [ + pytestCheckHook + pillow + numpy + ]; + + pythonImportsCheck = [ "blurhash" ]; + + meta = with lib; { + description = "Pure-Python implementation of the blurhash algorithm"; + homepage = "https://github.com/halcy/blurhash-python"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/bme680/default.nix b/nixpkgs/pkgs/development/python-modules/bme680/default.nix index cdae502e7e59..9797a7ab0d8f 100644 --- a/nixpkgs/pkgs/development/python-modules/bme680/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bme680/default.nix @@ -1,30 +1,39 @@ { lib , buildPythonPackage , fetchFromGitHub +, mock , smbus-cffi , pytestCheckHook }: buildPythonPackage rec { pname = "bme680"; - version = "1.0.5"; + version = "1.1.1"; src = fetchFromGitHub { owner = "pimoroni"; repo = "bme680-python"; rev = "v${version}"; - sha256 = "sha256-oIXh1JnGTI/Cj4MQFpWq+sWR2X+ioCsK0Q+T7wPITCQ="; + sha256 = "sha256-gmdRxMJ0DoCyNcb/bYp746PBi4HktHAAYOcSQJ0Uheg="; }; - propagatedBuildInputs = [ smbus-cffi ]; + propagatedBuildInputs = [ + smbus-cffi + ]; preBuild = '' cd library ''; - checkInputs = [ pytestCheckHook ]; - # next release will have tests, but not the current one - doCheck = false; + checkInputs = [ + mock + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace library/setup.cfg \ + --replace "smbus" "smbus-cffi" + ''; pythonImportsCheck = [ "bme680" ]; diff --git a/nixpkgs/pkgs/development/python-modules/bond-api/default.nix b/nixpkgs/pkgs/development/python-modules/bond-api/default.nix new file mode 100644 index 000000000000..39a6cc443334 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/bond-api/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, aiohttp +, aioresponses +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "bond-api"; + version = "0.1.12"; + + src = fetchFromGitHub { + owner = "prystupa"; + repo = "bond-api"; + rev = "v${version}"; + sha256 = "0zqaqqadr4x4vmq28nfk5x67gfwqqfy19z0cgrpxlbbvxamccym0"; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + checkInputs = [ + aioresponses + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "bond_api" ]; + + meta = with lib; { + description = "Asynchronous Python wrapper library over Bond Local API"; + homepage = "https://github.com/prystupa/bond-api"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/boost-histogram/default.nix b/nixpkgs/pkgs/development/python-modules/boost-histogram/default.nix new file mode 100644 index 000000000000..f644c8c9c20f --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/boost-histogram/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchPypi, buildPythonPackage, isPy3k, boost, numpy, pytestCheckHook, pytest-benchmark }: + +buildPythonPackage rec { + pname = "boost-histogram"; + version = "1.0.2"; + disabled = !isPy3k; + + src = fetchPypi { + pname = "boost_histogram"; + inherit version; + sha256 = "b79cb9a00c5b8e44ff24ffcbec0ce5d3048dd1570c8592066344b6d2f2369fa2"; + }; + + buildInputs = [ boost ]; + propagatedBuildInputs = [ numpy ]; + + checkInputs = [ pytestCheckHook pytest-benchmark ]; + + meta = with lib; { + description = "Python bindings for the C++14 Boost::Histogram library"; + homepage = "https://github.com/scikit-hep/boost-histogram"; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/boschshcpy/default.nix b/nixpkgs/pkgs/development/python-modules/boschshcpy/default.nix new file mode 100644 index 000000000000..4e480514bca9 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/boschshcpy/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, cryptography +, fetchFromGitHub +, getmac +, pythonOlder +, requests +, zeroconf +}: + +buildPythonPackage rec { + pname = "boschshcpy"; + version = "0.2.19"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "tschamm"; + repo = pname; + rev = version; + sha256 = "sha256-HxLy3tGMn2KDfD37yKLoImpfXGoaoGB6VEanNu/WMnk="; + }; + + propagatedBuildInputs = [ + cryptography + getmac + requests + zeroconf + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "boschshcpy" ]; + + meta = with lib; { + description = "Python module to work with the Bosch Smart Home Controller API"; + homepage = "https://github.com/tschamm/boschshcpy"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/boto3/default.nix b/nixpkgs/pkgs/development/python-modules/boto3/default.nix index afeefbdf55be..73cb44d08116 100644 --- a/nixpkgs/pkgs/development/python-modules/boto3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.17.52"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.17.88"; # N.B: if you change this, change botocore and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-7WQMF8l68om+RpN0DBy/laRW6cSV45c6Htb1GjloRtI="; + sha256 = "sha256-pxXKbERX1W6j4+/em9yL5BwpsvKpBPvRK+/bnLXiieQ="; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/nixpkgs/pkgs/development/python-modules/botocore/default.nix b/nixpkgs/pkgs/development/python-modules/botocore/default.nix index f34cc34334dc..a3c77e1fab71 100644 --- a/nixpkgs/pkgs/development/python-modules/botocore/default.nix +++ b/nixpkgs/pkgs/development/python-modules/botocore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.20.52"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.20.88"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-3V9YCOxIqZm5Y0s4etarehojuh+XEqh1Bm0jSAj4qmI="; + sha256 = "sha256-vJie2rUtR4iq3Y0a/5JfXGp8vGiQC/2443mWWurBcxc="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/bravia-tv/default.nix b/nixpkgs/pkgs/development/python-modules/bravia-tv/default.nix index 15f292953b67..849f7e0b0a73 100644 --- a/nixpkgs/pkgs/development/python-modules/bravia-tv/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bravia-tv/default.nix @@ -1,20 +1,25 @@ -{ lib, fetchFromGitHub, buildPythonPackage, isPy27, requests }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, requests +}: buildPythonPackage rec { pname = "bravia-tv"; - version = "1.0.8"; - disabled = isPy27; + version = "1.0.11"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "dcnielsen90"; repo = "python-bravia-tv"; rev = "v${version}"; - sha256 = "0djwy4z1y173q3mnbngp754yrwzmm6h3x0rshvrvd64b78x1bsmp"; + sha256 = "sha256-g47bDd5bZl0jad3o6T1jJLcnZj8nx944kz3Vxv8gD2U="; }; propagatedBuildInputs = [ requests ]; - # package does not include tests + # Package does not include tests doCheck = false; pythonImportsCheck = [ "bravia_tv" ]; diff --git a/nixpkgs/pkgs/development/python-modules/buienradar/default.nix b/nixpkgs/pkgs/development/python-modules/buienradar/default.nix new file mode 100644 index 000000000000..a366e0cdd3bc --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/buienradar/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, docopt +, pytz +, requests +, setuptools +, vincenty +, xmltodict +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "buienradar"; + version = "1.0.4"; + + disabled = pythonOlder "3.4"; + + src = fetchFromGitHub { + owner = "mjj4791"; + repo = "python-buienradar"; + rev = version; + sha256 = "1s0m5x7wdvzzsm797lh6531k614ybh7z0cikxjxqw377mivpz4wq"; + }; + + propagatedBuildInputs = [ + docopt + pytz + requests + setuptools + vincenty + xmltodict + ]; + + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # require network connection + "test_rain_data" + "test_json_data" + "test_xml_data" + ]; + + pythonImportsCheck = [ + "buienradar.buienradar" + "buienradar.constants" + ]; + + meta = with lib; { + description = "Library and CLI tools for interacting with buienradar"; + homepage = "https://github.com/mjj4791/python-buienradar"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/calmjs-parse/default.nix b/nixpkgs/pkgs/development/python-modules/calmjs-parse/default.nix new file mode 100644 index 000000000000..33cf052a4427 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/calmjs-parse/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, ply +, python +}: + +buildPythonPackage rec { + pname = "calmjs-parse"; + version = "1.2.5"; + + src = fetchFromGitHub { + owner = "calmjs"; + repo = "calmjs.parse"; + rev = version; + sha256 = "0ypfbas33k1706p6w1bf9gnrv38z8fa4qci1iaks80dp58g8sv4r"; + }; + + propagatedBuildInputs = [ + setuptools + ply + ]; + + checkPhase = '' + runHook preCheck + + ${python.interpreter} -m unittest calmjs.parse.tests.make_suite + + runHook postCheck + ''; + + pythonImportsCheck = [ + "calmjs.parse" + "calmjs.parse.asttypes" + "calmjs.parse.parsers" + "calmjs.parse.rules" + "calmjs.parse.sourcemap" + "calmjs.parse.unparsers.es5" + "calmjs.parse.walkers" + ]; + + meta = with lib; { + description = "Various parsers for ECMA standards"; + homepage = "https://github.com/calmjs/calmjs.parse"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/certifi/default.nix b/nixpkgs/pkgs/development/python-modules/certifi/default.nix index eac32816caca..a5b66f0d2e68 100644 --- a/nixpkgs/pkgs/development/python-modules/certifi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/certifi/default.nix @@ -1,12 +1,15 @@ { lib , fetchPypi , buildPythonPackage +, isPy27 }: buildPythonPackage rec { pname = "certifi"; version = "2020.12.5"; + disabled = isPy27; + src = fetchPypi { inherit pname version; sha256 = "177mdbw0livdjvp17sz6wsfrc32838m9y59v871gpgv2888raj8s"; diff --git a/nixpkgs/pkgs/development/python-modules/claripy/default.nix b/nixpkgs/pkgs/development/python-modules/claripy/default.nix index ad3c97b920d7..03be293a5674 100644 --- a/nixpkgs/pkgs/development/python-modules/claripy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/claripy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.0.7912"; + version = "9.0.8021"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-p9i3ajN/CpLdwcg8HLhtION0ghgs1fcnqjzUrxu1wDw="; + sha256 = "sha256-btV6J5r4ogb4yC0G3lyXXkCTnx55nfBkWFH1wgiWtjs="; }; # Use upstream z3 implementation diff --git a/nixpkgs/pkgs/development/python-modules/cle/default.nix b/nixpkgs/pkgs/development/python-modules/cle/default.nix index 45e619b25c6d..bb99365e33fa 100644 --- a/nixpkgs/pkgs/development/python-modules/cle/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.0.7912"; + version = "9.0.8021"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AHJk40uRhrlQbfzRmMJXremKxnxjpmxLLAAYxNV9vkc="; + sha256 = "sha256-pgOeNAzAq2x7MEnheV6txmXISFY/0sWw4cVzs51k4eM="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/click-threading/default.nix b/nixpkgs/pkgs/development/python-modules/click-threading/default.nix index 1579a6a6a893..529ee08e4f8e 100644 --- a/nixpkgs/pkgs/development/python-modules/click-threading/default.nix +++ b/nixpkgs/pkgs/development/python-modules/click-threading/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "click-threading"; - version = "0.4.4"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "b2b0fada5bf184b56afaccc99d0d2548d8ab07feb2e95e29e490f6b99c605de7"; + sha256 = "sha256-rc/mI8AqWVwQfDFAcvZ6Inj+TrQLcsDRoskDzHivNDk="; }; checkInputs = [ pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/codespell/default.nix b/nixpkgs/pkgs/development/python-modules/codespell/default.nix index 7427d391c615..d9b64cb83994 100644 --- a/nixpkgs/pkgs/development/python-modules/codespell/default.nix +++ b/nixpkgs/pkgs/development/python-modules/codespell/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "codespell"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "codespell-project"; repo = "codespell"; rev = "v${version}"; - sha256 = "187g26s3wzjmvdx9vjabbnajpbg0s9klixyv6baymmgz9lrcv4ln"; + sha256 = "sha256-BhYVztSr2MalILEcOcvMl07CObYa73o3kW8S/idqAO8="; }; checkInputs = [ aspell-python chardet pytestCheckHook pytest-cov pytest-dependency ]; diff --git a/nixpkgs/pkgs/development/python-modules/colorthief/default.nix b/nixpkgs/pkgs/development/python-modules/colorthief/default.nix new file mode 100644 index 000000000000..cdb37df3e392 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/colorthief/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pillow +}: + +buildPythonPackage rec { + pname = "colorthief"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "fengsp"; + repo = "color-thief-py"; + rev = version; + sha256 = "0lzpflal1iqbj4k7hayss5z024qf2sn8c3wxw03a0mgxg06ca2hm"; + }; + + propagatedBuildInputs = [ + pillow + ]; + + # no tests implemented + doCheck = false; + + pythonImportsCheck = [ "colorthief" ]; + + meta = with lib; { + description = "Python module for grabbing the color palette from an image"; + homepage = "https://github.com/fengsp/color-thief-py"; + license = licenses.bsd3; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/configargparse/default.nix b/nixpkgs/pkgs/development/python-modules/configargparse/default.nix index 5646bca04736..45ec7364a59a 100644 --- a/nixpkgs/pkgs/development/python-modules/configargparse/default.nix +++ b/nixpkgs/pkgs/development/python-modules/configargparse/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "configargparse"; - version = "1.4"; + version = "1.4.1"; src = fetchFromGitHub { owner = "bw2"; repo = "ConfigArgParse"; rev = "v${version}"; - sha256 = "0x6ar7d8qhr7gb1s8asbhqymg9jd635h7cyczqrbmvm8689zhj1d"; + sha256 = "sha256-hzhjrdrXxjksvbHlTnQVsT350g0yuG1F21fElv6bLSA="; }; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/coqpit/default.nix b/nixpkgs/pkgs/development/python-modules/coqpit/default.nix index c4df114e24df..96e18d76ba74 100644 --- a/nixpkgs/pkgs/development/python-modules/coqpit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/coqpit/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "coqpit"; - version = "0.0.6.6"; + version = "0.0.9"; format = "setuptools"; src = fetchFromGitHub { owner = "coqui-ai"; repo = pname; rev = "v${version}"; - sha256 = "0wb5wf84i5h4ycm732kn4316v7schhm91s2rrklfw9sny5dqmdnh"; + sha256 = "1dh3bp7m9fjfrfrahblibrx91sagndkdi0325ail63kyvlhzbkma"; }; checkInputs = [ @@ -32,6 +32,6 @@ buildPythonPackage rec { ''; homepage = "https://github.com/coqui-ai/coqpit"; license = licenses.mit; - maintainers = with maintainers; [ hexa mic92 ]; + maintainers = teams.tts.members; }; } diff --git a/nixpkgs/pkgs/development/python-modules/dataclasses-json/default.nix b/nixpkgs/pkgs/development/python-modules/dataclasses-json/default.nix index 36430a29ef0f..4a2a410c4ad5 100644 --- a/nixpkgs/pkgs/development/python-modules/dataclasses-json/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dataclasses-json/default.nix @@ -1,18 +1,23 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , stringcase , typing-inspect , marshmallow-enum +, hypothesis +, mypy +, pytestCheckHook }: buildPythonPackage rec { pname = "dataclasses-json"; version = "0.5.2"; - src = fetchPypi { - inherit pname version; - sha256 = "56ec931959ede74b5dedf65cf20772e6a79764d20c404794cce0111c88c085ff"; + src = fetchFromGitHub { + owner = "lidatong"; + repo = pname; + rev = "v${version}"; + sha256 = "1gcnm41rwg0jvq4vhr57vv9hyasws425zl8h4p05x2nzq86l0w1n"; }; propagatedBuildInputs = [ @@ -21,6 +26,19 @@ buildPythonPackage rec { marshmallow-enum ]; + checkInputs = [ + hypothesis + mypy + pytestCheckHook + ]; + + disabledTests = [ + # AssertionError: Type annotations check failed + "test_type_hints" + ]; + + pythonImportsCheck = [ "dataclasses_json" ]; + meta = with lib; { description = "Simple API for encoding and decoding dataclasses to and from JSON"; homepage = "https://github.com/lidatong/dataclasses-json"; diff --git a/nixpkgs/pkgs/development/python-modules/devolo-home-control-api/default.nix b/nixpkgs/pkgs/development/python-modules/devolo-home-control-api/default.nix index 90e34288154a..44a0165d6fd8 100644 --- a/nixpkgs/pkgs/development/python-modules/devolo-home-control-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/devolo-home-control-api/default.nix @@ -6,7 +6,7 @@ , pytestCheckHook , pythonOlder , requests -, websocket_client +, websocket-client , zeroconf }: @@ -25,7 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests zeroconf - websocket_client + websocket-client ]; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/directv/default.nix b/nixpkgs/pkgs/development/python-modules/directv/default.nix new file mode 100644 index 000000000000..5f8c40c075aa --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/directv/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, aiohttp +, yarl +, aresponses +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "directv"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "ctalkington"; + repo = "python-directv"; + rev = version; + sha256 = "19jckf6qvl8fwi8yff1qy8c44xdz3zpi1ip1md6zl2c503qc91mk"; + }; + + propagatedBuildInputs = [ + aiohttp + yarl + ]; + + checkInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "directv" ]; + + meta = with lib; { + description = "Asynchronous Python client for DirecTV (SHEF)"; + homepage = "https://github.com/ctalkington/python-directv"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/discordpy/default.nix b/nixpkgs/pkgs/development/python-modules/discordpy/default.nix index 3fb5e7ae55e4..6de2b9f81721 100644 --- a/nixpkgs/pkgs/development/python-modules/discordpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/discordpy/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "discord.py"; - version = "1.7.2"; + version = "1.7.3"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "Rapptz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NY1/RKp8w9gAqGYXnCNhNZqR/inGMvUvxjJ1MMs62B8="; + sha256 = "sha256-eKXCzGFSzxpdZed4/4G6uJ96s5yCm6ci8K8XYR1zQlE="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/docker-py/default.nix b/nixpkgs/pkgs/development/python-modules/docker-py/default.nix index f7982c4a1191..2d88f64d36a5 100644 --- a/nixpkgs/pkgs/development/python-modules/docker-py/default.nix +++ b/nixpkgs/pkgs/development/python-modules/docker-py/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, six, requests, websocket_client, docker_pycreds }: +{ lib, buildPythonPackage, fetchPypi, six, requests, websocket-client, docker_pycreds }: buildPythonPackage rec { version = "1.10.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six requests - websocket_client + websocket-client docker_pycreds ]; diff --git a/nixpkgs/pkgs/development/python-modules/docker/default.nix b/nixpkgs/pkgs/development/python-modules/docker/default.nix index ab7a7b664b0d..5e5071e93086 100644 --- a/nixpkgs/pkgs/development/python-modules/docker/default.nix +++ b/nixpkgs/pkgs/development/python-modules/docker/default.nix @@ -9,7 +9,7 @@ , pytestCheckHook , requests , six -, websocket_client +, websocket-client }: buildPythonPackage rec { @@ -27,7 +27,7 @@ buildPythonPackage rec { paramiko requests six - websocket_client + websocket-client ] ++ lib.optional isPy27 backports_ssl_match_hostname; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/doorbirdpy/default.nix b/nixpkgs/pkgs/development/python-modules/doorbirdpy/default.nix new file mode 100644 index 000000000000..1290aaf05757 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/doorbirdpy/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +}: + +buildPythonPackage rec { + pname = "doorbirdpy"; + version = "2.1.0"; + + src = fetchPypi { + pname = "DoorBirdPy"; + inherit version; + sha256 = "ed0e94953cdf96111c7f73c5fcf358f65dc0ff5e47f63fc057bf18ca7512e606"; + }; + + propagatedBuildInputs = [ + requests + ]; + + # no tests on PyPI, no tags on GitLab + doCheck = false; + + pythonImportsCheck = [ "doorbirdpy" ]; + + meta = with lib; { + description = "Python wrapper for the DoorBird LAN API"; + homepage = "https://gitlab.com/klikini/doorbirdpy"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/downloader-cli/default.nix b/nixpkgs/pkgs/development/python-modules/downloader-cli/default.nix new file mode 100644 index 000000000000..608286c8bcf6 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/downloader-cli/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchFromGitHub, urllib3, pytest }: + +buildPythonPackage rec { + pname = "downloader-cli"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "deepjyoti30"; + repo = pname; + rev = version; + sha256 = "0gbbjxb9vf5g890cls3mwzl8lmcn6jkpgm5cbrif740mn2b4q228"; + }; + + propagatedBuildInputs = [ urllib3 ]; + + # Disable checks due to networking (Errno 101) + doCheck = false; + + pythonImportsCheck = [ "downloader_cli" ]; + + meta = with lib; { + description = "A simple downloader written in Python with an awesome customizable progressbar. "; + homepage = "https://github.com/deepjyoti30/downloader-cli"; + license = licenses.mit; + maintainers = with maintainers; [ j0hax ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/ecoaliface/default.nix b/nixpkgs/pkgs/development/python-modules/ecoaliface/default.nix new file mode 100644 index 000000000000..e3001d7fa46c --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/ecoaliface/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +}: + +buildPythonPackage rec { + pname = "ecoaliface"; + version = "0.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1hzx0r3311f952jik3pgmrg74xp5m6w9c5v6snfrb8w2m19vs6qy"; + }; + + propagatedBuildInputs = [ + requests + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "ecoaliface" ]; + + meta = with lib; { + description = "Python library for interacting with eCoal water boiler controllers"; + homepage = "https://github.com/matkor/ecoaliface"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/eebrightbox/default.nix b/nixpkgs/pkgs/development/python-modules/eebrightbox/default.nix new file mode 100644 index 000000000000..d8050b9bf5e3 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/eebrightbox/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pbr +, calmjs-parse +, certifi +, chardet +, idna +, ply +, requests +, urllib3 +, httpretty +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "eebrightbox"; + version = "0.0.6"; + + src = fetchFromGitHub { + owner = "krygal"; + repo = "eebrightbox"; + rev = version; + sha256 = "1kms240g01871qbvyc5rzf86yxsrlnfvp323jh4k35fpf45z44rr"; + }; + + postPatch = '' + substituteInPlace requirements.txt --replace "==" ">=" + ''; + + nativeBuildInputs = [ + pbr + ]; + + PBR_VERSION = version; + + propagatedBuildInputs = [ + calmjs-parse + certifi + chardet + idna + ply + requests + urllib3 + ]; + + checkInputs = [ + httpretty + pytestCheckHook + ]; + + meta = with lib; { + description = "Connector for EE BrightBox routers"; + homepage = "https://github.com/krygal/eebrightbox"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/elgato/default.nix b/nixpkgs/pkgs/development/python-modules/elgato/default.nix new file mode 100644 index 000000000000..6ee0cd019128 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/elgato/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, aiohttp +, poetry-core +, yarl +, aresponses +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "elgato"; + version = "2.1.1"; + disabled = pythonOlder "3.8"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "frenck"; + repo = "python-elgato"; + rev = "v${version}"; + sha256 = "19z568jjyww7vi8s44anrb66qjz5l22nz4jqcz49ybhf22warmff"; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + yarl + ]; + + checkInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; + + postPatch = '' + # Upstream doesn't set a version for the pyproject.toml + substituteInPlace pyproject.toml \ + --replace "0.0.0" "${version}" \ + --replace "--cov" "" + ''; + + pythonImportsCheck = [ "elgato" ]; + + meta = with lib; { + description = "Python client for Elgato Key Lights"; + homepage = "https://github.com/frenck/python-elgato"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/emulated-roku/default.nix b/nixpkgs/pkgs/development/python-modules/emulated-roku/default.nix new file mode 100644 index 000000000000..3a9da2ba8e37 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/emulated-roku/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, aiohttp +}: + +buildPythonPackage rec { + pname = "emulated-roku"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "mindigmarton"; + repo = "emulated_roku"; + rev = version; + sha256 = "02cbg5wrph19p6x44jlw6cn3jli0kwbgfh6klb3c4k5jfrkhgghw"; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + # no tests implemented + doCheck = false; + + pythonImportsCheck = [ "emulated_roku" ]; + + meta = with lib; { + description = "Library to emulate a roku server to serve as a proxy for remotes such as Harmony"; + homepage = "https://github.com/mindigmarton/emulated_roku"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/enocean/default.nix b/nixpkgs/pkgs/development/python-modules/enocean/default.nix new file mode 100644 index 000000000000..365d6c94ef28 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/enocean/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, beautifulsoup4 +, enum-compat +, pyserial +, nose +}: + +buildPythonPackage rec { + pname = "enocean"; + version = "0.60.1"; + + src = fetchFromGitHub { + owner = "kipe"; + repo = "enocean"; + rev = version; + sha256 = "0cbcvvy3qaqv8925z608qmkc1l914crzw79krwrz2vpm2fyribab"; + }; + + propagatedBuildInputs = [ + beautifulsoup4 + enum-compat + pyserial + ]; + + checkInputs = [ + nose + ]; + + checkPhase = '' + runHook preCheck + + nosetests + + runHook postCheck + ''; + + pythonImportsCheck = [ + "enocean.communicators" + "enocean.protocol.packet" + "enocean.utils" + ]; + + meta = with lib; { + description = "EnOcean serial protocol implementation"; + homepage = "https://github.com/kipe/enocean"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/enturclient/default.nix b/nixpkgs/pkgs/development/python-modules/enturclient/default.nix new file mode 100644 index 000000000000..8ac474b6e5f8 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/enturclient/default.nix @@ -0,0 +1,37 @@ +{ lib +, aiohttp +, async-timeout +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "enturclient"; + version = "0.2.1"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "hfurubotten"; + repo = pname; + rev = "v${version}"; + sha256 = "158xzv9c2drjgrdhfqm0xzx2d34v45gr5rnjfsi94scffvprgwrg"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "enturclient" ]; + + meta = with lib; { + description = "Python library for interacting with the Entur.org API"; + homepage = "https://github.com/hfurubotten/enturclient"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/epson-projector/default.nix b/nixpkgs/pkgs/development/python-modules/epson-projector/default.nix new file mode 100644 index 000000000000..756472222d8e --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/epson-projector/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, aiohttp +, async-timeout +, pyserial-asyncio +}: + +buildPythonPackage rec { + pname = "epson-projector"; + version = "0.4.2"; + + src = fetchPypi { + pname = "epson_projector"; + inherit version; + sha256 = "4ade1c7a0f7008d23b08bd886c8790c44cf7d60453d1eb5a8077c92aaf790d30"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + pyserial-asyncio + ]; + + # tests need real device + doCheck = false; + + pythonImportsCheck = [ + "epson_projector" + "epson_projector.const" + "epson_projector.projector_http" + "epson_projector.projector_serial" + "epson_projector.projector_tcp" + ]; + + meta = with lib; { + description = "Epson projector support for Python"; + homepage = "https://github.com/pszafer/epson_projector"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/fastjsonschema/default.nix b/nixpkgs/pkgs/development/python-modules/fastjsonschema/default.nix index 34eb0a158d97..6a6cc6ea8046 100644 --- a/nixpkgs/pkgs/development/python-modules/fastjsonschema/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fastjsonschema/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "fastjsonschema"; - version = "2.14.5"; + version = "2.15.1"; disabled = pythonOlder "3.3"; @@ -17,19 +17,20 @@ buildPythonPackage rec { repo = "python-fastjsonschema"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "1hgzafswdw5zqrd8qhdxa43crzfy7lrlifdn90133a0h3psr7qs1"; + sha256 = "sha256-ltxFJ3V5/bckusspQ5o0F4reMoB4KpYWPHF8ZNXGqVQ="; }; checkInputs = [ pytestCheckHook ]; dontUseSetuptoolsCheck = true; disabledTests = [ "benchmark" - # these tests require network access "remote ref" "definitions" ]; + pythonImportsCheck = [ "fastjsonschema" ]; + meta = with lib; { description = "Fast JSON schema validator for Python."; homepage = "https://horejsek.github.io/python-fastjsonschema/"; diff --git a/nixpkgs/pkgs/development/python-modules/feedparser/default.nix b/nixpkgs/pkgs/development/python-modules/feedparser/default.nix index 38e9761952d6..bf921207fc5c 100644 --- a/nixpkgs/pkgs/development/python-modules/feedparser/default.nix +++ b/nixpkgs/pkgs/development/python-modules/feedparser/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "feedparser"; - version = "6.0.2"; + version = "6.0.6"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1b00a105425f492f3954fd346e5b524ca9cef3a4bbf95b8809470e9857aa1074"; + sha256 = "1syd15460a6m397rajdpbr9q0hgxm1j6xf9ba18z9pighxdjmxkq"; }; propagatedBuildInputs = [ sgmllib3k ]; diff --git a/nixpkgs/pkgs/development/python-modules/flask-httpauth/default.nix b/nixpkgs/pkgs/development/python-modules/flask-httpauth/default.nix index ba8e0d0f11e6..988ae52aa0e4 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-httpauth/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-httpauth/default.nix @@ -1,12 +1,14 @@ -{ lib, python, buildPythonPackage, fetchPypi, flask }: +{ lib, python, isPy3k, buildPythonPackage, fetchPypi, flask }: buildPythonPackage rec { pname = "Flask-HTTPAuth"; - version = "4.3.0"; + version = "4.4.0"; + + disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "05j1mckwhgicrlj4j7ni2rhcf9w4i7phll06jbjjyvs3rj1l4q1f"; + sha256 = "0fl1if91hg2c92b6sic7h2vhxxvb06ri7wflmwp0pfiwbaisgamw"; }; propagatedBuildInputs = [ flask ]; diff --git a/nixpkgs/pkgs/development/python-modules/foobot-async/default.nix b/nixpkgs/pkgs/development/python-modules/foobot-async/default.nix new file mode 100644 index 000000000000..cd5be4ab0c2a --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/foobot-async/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, aiohttp +, async-timeout +, aioresponses +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "foobot-async"; + version = "1.0.0"; + + disabled = pythonOlder "3.5"; + + src = fetchPypi { + pname = "foobot_async"; + inherit version; + sha256 = "fa557a22de925139cb4a21034ffdbcd01d28bf166c0e680eaf84a99206327f40"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + ]; + + checkInputs = [ + aioresponses + pytestCheckHook + ]; + + pythonImportsCheck = [ "foobot_async" ]; + + meta = with lib; { + description = "API Client for Foobot Air Quality Monitoring devices"; + homepage = "https://github.com/reefab/foobot_async"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/foxdot/default.nix b/nixpkgs/pkgs/development/python-modules/foxdot/default.nix index 072129e6ea5a..eff080fa2f8f 100644 --- a/nixpkgs/pkgs/development/python-modules/foxdot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/foxdot/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "FoxDot"; - version = "0.8.11"; + version = "0.8.12"; src = fetchPypi { inherit pname version; - sha256 = "00yqpkv7cxwk301cyiwjzr9yfq8hpnhqyspw3z874ydrl3cmssdb"; + sha256 = "528999da55ad630e540a39c0eaeacd19c58c36f49d65d24ea9704d0781e18c90"; }; propagatedBuildInputs = [ tkinter supercollider ]; diff --git a/nixpkgs/pkgs/development/python-modules/garages-amsterdam/default.nix b/nixpkgs/pkgs/development/python-modules/garages-amsterdam/default.nix index eeb68b9bbbd0..08a687d70601 100644 --- a/nixpkgs/pkgs/development/python-modules/garages-amsterdam/default.nix +++ b/nixpkgs/pkgs/development/python-modules/garages-amsterdam/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "garages-amsterdam"; - version = "2.1.0"; + version = "2.1.1"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "klaasnicolaas"; repo = "garages_amsterdam"; rev = version; - sha256 = "1lg66g0im6v0m294j82229n2b7bhs6kkrp0d9nh87k2rz7zgllil"; + sha256 = "1m0bc3bzb83apprk412s7k5r2g6p5br2hrak2a976lh9ifk1d8hj"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/garminconnect-aio/default.nix b/nixpkgs/pkgs/development/python-modules/garminconnect-aio/default.nix new file mode 100644 index 000000000000..bb754118e077 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/garminconnect-aio/default.nix @@ -0,0 +1,37 @@ +{ lib +, aiohttp +, brotlipy +, buildPythonPackage +, fetchFromGitHub +, yarl +}: + +buildPythonPackage rec { + pname = "garminconnect-aio"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "cyberjunky"; + repo = "python-garminconnect-aio"; + rev = version; + sha256 = "0s2gpy5hciv9akqqhxy0d2ywp6jp9mmdngx34q7fq3xn668kcrhr"; + }; + + propagatedBuildInputs = [ + aiohttp + brotlipy + yarl + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "garminconnect_aio" ]; + + meta = with lib; { + description = "Python module to interact with Garmin Connect"; + homepage = "https://github.com/cyberjunky/python-garminconnect-aio"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/garminconnect-ha/default.nix b/nixpkgs/pkgs/development/python-modules/garminconnect-ha/default.nix new file mode 100644 index 000000000000..e3d4cd5b48e9 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/garminconnect-ha/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +}: + +buildPythonPackage rec { + pname = "garminconnect-ha"; + version = "0.1.6"; + + src = fetchFromGitHub { + owner = "cyberjunky"; + repo = "python-garminconnect-ha"; + rev = version; + sha256 = "0ngas6zikhpja1cdkq64m9pjm4b0z3qaj9g3x88mggy60jsxm1d7"; + }; + + propagatedBuildInputs = [ + requests + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "garminconnect_ha" ]; + + meta = with lib; { + description = "Minimal Garmin Connect Python 3 API wrapper for Home Assistant"; + homepage = "https://github.com/cyberjunky/python-garminconnect-ha"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/georss-client/default.nix b/nixpkgs/pkgs/development/python-modules/georss-client/default.nix index e142942f9394..2e5fc5da9e83 100644 --- a/nixpkgs/pkgs/development/python-modules/georss-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/georss-client/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "georss-client"; - version = "0.13"; + version = "0.14"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-client"; rev = "v${version}"; - sha256 = "1pvx2qb8gs2f7bb8xxq689ydxirsl3bcgsbi5qv5klc4c051dj8i"; + sha256 = "sha256-rviXXNmDLEVNYOCkqvLT9EXSuVpI5wMlCXnlpUUl1P0="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/georss-generic-client/default.nix b/nixpkgs/pkgs/development/python-modules/georss-generic-client/default.nix index e01d7fa789f7..4f2e317c52ef 100644 --- a/nixpkgs/pkgs/development/python-modules/georss-generic-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/georss-generic-client/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "georss-generic-client"; - version = "0.4"; + version = "0.6"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-generic-client"; rev = "v${version}"; - sha256 = "0i4shx6fvwibx0hlfmd0dyq2n5lkrqwmlm0l476fdb9bw5lkaiy0"; + sha256 = "sha256-XVejBbVilq8zrmuyBUd0mNPZ4qysSg9lAe/lhbKT+qs="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix b/nixpkgs/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix index 4ce833668474..3fada45d0c8c 100644 --- a/nixpkgs/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "georss-ign-sismologia-client"; - version = "0.2"; + version = "0.3"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-ign-sismologia-client"; rev = "v${version}"; - sha256 = "1xylgvbdrpl3wxa6qqc8jma4c9520rld0pv28y3b6b0m07ab6ijl"; + sha256 = "sha256-7Jj6uWb4HyPAh3/XtVTy0N23bk33mlIiqlt9z/PW+4Y="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/gios/default.nix b/nixpkgs/pkgs/development/python-modules/gios/default.nix new file mode 100644 index 000000000000..71aae7b66ad9 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/gios/default.nix @@ -0,0 +1,55 @@ +{ lib +, aiohttp +, aioresponses +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytest-error-for-skips +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "gios"; + version = "1.0.1"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "bieniu"; + repo = pname; + rev = version; + sha256 = "031z5j1j961pcw8s4ajj5z2xn2jxb2hyfn3x3bxbaagwl9a5qkvn"; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + checkInputs = [ + aioresponses + pytest-asyncio + pytest-error-for-skips + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov --cov-report term-missing " "" + substituteInPlace setup.py \ + --replace "pytest-runner" "" + ''; + + disabledTests = [ + # Test requires network access + "test_invalid_station_id" + ]; + + pythonImportsCheck = [ "gios" ]; + + meta = with lib; { + description = "Python client for getting air quality data from GIOS"; + homepage = "https://github.com/bieniu/gios"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/github-to-sqlite/default.nix b/nixpkgs/pkgs/development/python-modules/github-to-sqlite/default.nix new file mode 100644 index 000000000000..7853854ccd81 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/github-to-sqlite/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy3k +, pytestCheckHook +, pyyaml +, requests +, requests-mock +, sqlite-utils +}: + +buildPythonPackage rec { + pname = "github-to-sqlite"; + version = "2.8.2"; + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "dogsheep"; + repo = pname; + rev = version; + sha256 = "16mw429ppnhgsa98qs3fhprqvdpqbr5q1biq3ql8rsf38difdbl8"; + }; + + propagatedBuildInputs = [ + sqlite-utils + pyyaml + requests + ]; + + checkInputs = [ + pytestCheckHook + requests-mock + ]; + + disabledTests = [ + "test_scrape_dependents" + ]; + + meta = with lib; { + description = "Save data from GitHub to a SQLite database"; + homepage = "https://github.com/dogsheep/github-to-sqlite"; + license = licenses.asl20; + maintainers = with maintainers; [ sarcasticadmin ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/goalzero/default.nix b/nixpkgs/pkgs/development/python-modules/goalzero/default.nix new file mode 100644 index 000000000000..e0e52b6702d9 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/goalzero/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, aiohttp +, ratelimit +}: + +buildPythonPackage rec { + pname = "goalzero"; + version = "0.1.7"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "1f6a2755a745ea14e65d6bf3e56bd090a508bf6f63ccb76b9b89ce3d844a2160"; + }; + + propagatedBuildInputs = [ + aiohttp + ratelimit + ]; + + # no tests implemented + doCheck = false; + + pythonImportsCheck = [ "goalzero" ]; + + meta = with lib; { + description = "Goal Zero Yeti REST Api Library"; + homepage = "https://github.com/tkdrob/goalzero"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix index 3f614258a8fb..dd1dd0e34d12 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-access-context-manager"; - version = "0.1.2"; + version = "0.1.3"; src = fetchPypi { inherit pname version; - sha256 = "1qy7wv1xn7g3x5z0vvv0pwmxhin4hw2m9fs9iklnghy00vg37v0b"; + sha256 = "sha256-VFPmTKiFwwL1THpjDeFeHgssXvIRB+ppvZb9aU1yPV4="; }; propagatedBuildInputs = [ google-api-core ]; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix new file mode 100644 index 000000000000..556bc09ed6e5 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, google-api-core +, grpc_google_iam_v1 +, mock +, proto-plus +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "google-cloud-appengine-logging"; + version = "0.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0rkayy2qzsc70b0rdvzd2bxwp5f07rfqb95cyj57dkphq71mrrhw"; + }; + + propagatedBuildInputs = [ + google-api-core + grpc_google_iam_v1 + proto-plus + ]; + + checkInputs = [ + mock + pytestCheckHook + pytest-asyncio + ]; + + pythonImportsCheck = [ + "google.cloud.appengine_logging" + "google.cloud.appengine_logging_v1" + ]; + + meta = with lib; { + description = "Appengine logging client library"; + homepage = "https://github.com/googleapis/python-appengine-logging"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix index bd8bdc0b8c31..61e69c5b29da 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace '"google-cloud-org-policy >= 0.1.2, < 0.2.0dev"' '"google-cloud-org-policy >= 0.1.2, < 0.2.1"' + --replace '"google-cloud-org-policy >= 0.1.2, < 0.2.0dev"' '"google-cloud-org-policy >= 0.1.2"' ''; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix index 94516e25a38d..899eef02c9a1 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -14,14 +14,18 @@ buildPythonPackage rec { pname = "google-cloud-automl"; - version = "2.2.0"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "874defad583e90e55a3e83aff27eb5fe108d9197d839cd45f3eacf2395881806"; + sha256 = "sha256-UjYzSWtP4cp0p7Is2qIGWBgEhjgTv0YeL0N9D7etIbY="; }; - propagatedBuildInputs = [ google-api-core libcst proto-plus ]; + propagatedBuildInputs = [ + google-api-core + libcst + proto-plus + ]; checkInputs = [ google-cloud-storage @@ -35,10 +39,13 @@ buildPythonPackage rec { preCheck = '' # do not shadow imports rm -r google - # requires credentials - rm tests/system/gapic/v1beta1/test_system_tables_client_v1.py ''; + disabledTestPaths = [ + # requires credentials + "tests/system/gapic/v1beta1/test_system_tables_client_v1.py" + ]; + disabledTests = [ # requires credentials "test_prediction_client_client_info" diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index 8aff49154721..c7df1160631b 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.1.0"; + version = "3.1.1"; src = fetchPypi { inherit pname version; - sha256 = "98065257189388b6cc797478c4b2bdf86e9e8cdcaca5d170ded027646444a586"; + sha256 = "sha256-msjNBqYL/cUE85+80IblGAyGhM/+/ndFqf9qY5xXVik="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix new file mode 100644 index 000000000000..566c566bbe48 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, google-api-core +, grpc_google_iam_v1 +, mock +, proto-plus +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "google-cloud-bigquery-logging"; + version = "0.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0s8vlw157z10yzzkrfyzfl31iad96wfl3ywk9g3gmmh0jfgy0gfj"; + }; + + propagatedBuildInputs = [ + google-api-core + grpc_google_iam_v1 + proto-plus + ]; + + checkInputs = [ + mock + pytestCheckHook + pytest-asyncio + ]; + + pythonImportsCheck = [ + "google.cloud.bigquery_logging" + "google.cloud.bigquery_logging_v1" + ]; + + meta = with lib; { + description = "Bigquery logging client library"; + homepage = "https://github.com/googleapis/python-bigquery-logging"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix index 0c62727ff8ac..f79916e51158 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "2.13.1"; + version = "2.18.0"; src = fetchPypi { inherit pname version; - sha256 = "915f93c61c03d1d6024d5b19355bb96af25da9f924d0b5bab5cde851e1bd48f4"; + sha256 = "sha256-0JLyWfQKN7kYnXW/DRJp3ZH+EesLv7/CXJPmxXYtb4M="; }; propagatedBuildInputs = [ @@ -51,6 +51,8 @@ buildPythonPackage rec { # requires credentials "test_bigquery_magic" "TestBigQuery" + # Mocking of _ensure_bqstorage_client fails + "test_to_arrow_ensure_bqstorage_client_wo_bqstorage" ]; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-bigtable/default.nix index 786250ce9e15..f7eb9a51a8a3 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -1,33 +1,55 @@ { lib , buildPythonPackage , fetchPypi -, grpc_google_iam_v1 , google-api-core , google-cloud-core -, pytest +, grpc_google_iam_v1 +, libcst , mock +, proto-plus +, pytestCheckHook }: buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "1.7.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "90bd53a19c33c34101b8567c82a6dc0386af4118d70e1ad69b49375358a21aa6"; + sha256 = "sha256-89fXmr3jHTtp8QOMFeueJwslHJ7Q6srQ/Kxsp0mLlKU="; }; - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core google-cloud-core ]; + propagatedBuildInputs = [ + google-api-core + google-cloud-core + grpc_google_iam_v1 + libcst + proto-plus + ]; + + checkInputs = [ + mock + pytestCheckHook + ]; checkPhase = '' + # Prevent google directory from shadowing google imports rm -r google - pytest tests/unit -k 'not policy' ''; + disabledTests = [ + "policy" + ]; + + pythonImportsCheck = [ + "google.cloud.bigtable_admin_v2" + "google.cloud.bigtable_v2" + "google.cloud.bigtable" + ]; + meta = with lib; { description = "Google Cloud Bigtable API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://github.com/googleapis/python-bigtable"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix index ce21a27209fd..d3fea60d33b3 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.4.0"; + version = "2.4.1"; src = fetchPypi { inherit pname version; - sha256 = "c62d15f58459fbe83ba5789f800ac27b4be9a1d7735f6c6b702cd6c3f8c6f0c9"; + sha256 = "sha256-59k8o5ndb7X9D5kZAkhTHJxYPRqF580snuSFSVRZ7ng="; }; propagatedBuildInputs = [ google-api-core grpc_google_iam_v1 libcst proto-plus ]; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix index 0115524d5467..c7dce6cba118 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "2.3.1"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-TADApBkE4DvEFkVFy56Flh2s6XR9uGxzGTf5aspohsA="; + sha256 = "sha256-blNz/r5CDisjddIlKychKfEaN/8biKdYcyKTEGO+jTg="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-datastore/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-datastore/default.nix index 4c8c79c7ddae..dae19022d06c 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-datastore/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-datastore/default.nix @@ -13,24 +13,37 @@ buildPythonPackage rec { pname = "google-cloud-datastore"; - version = "2.1.0"; + version = "2.1.3"; src = fetchPypi { inherit pname version; - sha256 = "1yyk9ix1jms5q4kk76cfxzy42wzzyl5qladdswjy5l0pg6iypr8i"; + sha256 = "sha256-56UQdZudVf9jyYPjxCy/XDX5tzEPTWEevjaX2mV2vLQ="; }; - propagatedBuildInputs = [ google-api-core google-cloud-core libcst proto-plus ]; + propagatedBuildInputs = [ + google-api-core + google-cloud-core + libcst + proto-plus + ]; - checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + google-cloud-testutils + mock + pytestCheckHook + pytest-asyncio + ]; preCheck = '' # directory shadows imports rm -r google - # requires credentials - rm tests/system/test_system.py ''; + disabledTestPaths = [ + # Requires credentials + "tests/system/test_system.py" + ]; + pythonImportsCheck = [ "google.cloud.datastore" "google.cloud.datastore_admin_v1" diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix index 47f0522e1a6c..4674c1ce1dd1 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.0.1"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "193c2c012639f0c063999e0b899f92d70763be605d5528f3d1da93d6734a1aa8"; + sha256 = "sha256-sPSPx5Y36MOjd81D8qDMpkWJ3YWQfRlEHqBn3N75NB4="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix index 8a481945efba..8aae0c072a0f 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix @@ -21,12 +21,21 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace 'google-cloud-logging>=1.14.0, <2.1' 'google-cloud-logging>=1.14.0' + --replace 'google-cloud-logging>=1.14.0, <2.4' 'google-cloud-logging>=1.14.0' ''; - propagatedBuildInputs = [ google-cloud-logging libcst proto-plus ]; + propagatedBuildInputs = [ + google-cloud-logging + libcst + proto-plus + ]; - checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + google-cloud-testutils + mock + pytestCheckHook + pytest-asyncio + ]; disabledTests = [ # require credentials @@ -34,8 +43,8 @@ buildPythonPackage rec { "test_report_exception" ]; - # prevent google directory from shadowing google imports preCheck = '' + # prevent google directory from shadowing google imports rm -r google ''; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix index f0aac21ee317..4ff4c920c8ad 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.1.0"; + version = "2.1.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-kG68fG9EqwvE72nzc89MXwEQ/YYEM9tYH6zK2iTCFJo="; + sha256 = "sha256-73sKlKHX7ThsdZJyT22wiqbema7o3aOIaWS8WYrri+w="; }; propagatedBuildInputs = [ @@ -39,10 +39,10 @@ buildPythonPackage rec { rm -r google ''; - pytestFlagsArray = [ - # tests are broken - "--ignore=tests/system/test_system.py" - "--ignore=tests/system/test_system_async.py" + disabledTestPaths = [ + # Tests are broken + "tests/system/test_system.py" + "tests/system/test_system_async.py" ]; disabledTests = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-iam-logging/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-iam-logging/default.nix new file mode 100644 index 000000000000..55d36ac2a7c7 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-iam-logging/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, google-api-core +, grpc_google_iam_v1 +, mock +, proto-plus +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "google-cloud-iam-logging"; + version = "0.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "19a8s634w2m1b16zq8f185cpaw7k6d0c7c61g1vzm19jl213rhiw"; + }; + + propagatedBuildInputs = [ + google-api-core + grpc_google_iam_v1 + proto-plus + ]; + + checkInputs = [ + mock + pytestCheckHook + pytest-asyncio + ]; + + pythonImportsCheck = [ + "google.cloud.iam_logging" + "google.cloud.iam_logging_v1" + ]; + + meta = with lib; { + description = "IAM Service Logging client library"; + homepage = "https://github.com/googleapis/python-iam-logging"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix index 243c2b86c1ee..ddcc20c66bc4 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-iam"; - version = "2.1.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "d34604508e3e87b9161ccd5ff29474867ac91ffb8d29e1a2fc9ff0e26d934b73"; + sha256 = "sha256-H2S3jIVMBinyCQMBHW3vKMmBzlaCpSIQMfauHKoKH+o="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-logging/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-logging/default.nix index 55efb8e2c2d4..458d5b720c02 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-logging/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-logging/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "google-cloud-logging"; - version = "2.3.1"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-yi3lG7tKi2BkU7vtMIEPsll1UX/JxrNj4G+DJaGQ/+k="; + sha256 = "sha256-BuAqNkK817Zz4dbI16ttoVnapR+8DDrp8RGDZtUej7s="; }; propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ]; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-org-policy/default.nix index 7ca698b66452..56932ec48598 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-org-policy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-org-policy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-org-policy"; - version = "0.2.0"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "b463704affab327c1d3fa4af280a858635b5f59a88456b2a08db62a336a352aa"; + sha256 = "sha256-7qVemc7siW/8mO4wUXEKJBt9M18kagRyu/+7DLLe9FM="; }; propagatedBuildInputs = [ google-api-core proto-plus ]; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix index 1a11fcfc731b..6bce8cc5a89b 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -13,24 +13,37 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.4.1"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-5gyqZ+JthC/Qja8ZCX79r4K+evuZY5jPZ73cA6hrgSA="; + sha256 = "sha256-hwZVe3FTLHauxIQJ3KwYnKrEfPLey4hQrnVpS/cDJrI="; }; - propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core libcst proto-plus ]; + propagatedBuildInputs = [ + grpc_google_iam_v1 + google-api-core + libcst + proto-plus + ]; - checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + google-cloud-testutils + mock + pytestCheckHook + pytest-asyncio + ]; preCheck = '' # prevent google directory from shadowing google imports rm -r google - # Tests in pubsub_v1 attempt to contact pubsub.googleapis.com - rm -r tests/unit/pubsub_v1 ''; + disabledTestPaths = [ + # Tests in pubsub_v1 attempt to contact pubsub.googleapis.com + "tests/unit/pubsub_v1" + ]; + pythonImportsCheck = [ "google.cloud.pubsub" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix index 8787eb6779a1..9070d2f083e5 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-redis"; - version = "2.1.0"; + version = "2.1.1"; src = fetchPypi { inherit pname version; - sha256 = "957f436986275dcc82483906b424dcabe8d1f8c08ae5c9677bf7547a314b0a59"; + sha256 = "sha256-2X/ek2ECarZ/U1V6j+nz2yYSGVmrWG/kU/QqQB1A+0w="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix index 0a3285566f19..588918ad62e9 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-runtimeconfig"; - version = "0.32.1"; + version = "0.32.2"; src = fetchPypi { inherit pname version; - sha256 = "1bd8hlp0ssi20ds4gknbxai8mih6xiz8b60ab7p0ngpdqp1kw52p"; + sha256 = "sha256-UoWu+Y/bmmkefFR4nnxJPFFnS253/myWcXKujq27oCY="; }; propagatedBuildInputs = [ google-api-core google-cloud-core ]; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index 184044594d52..ac630ba27c4d 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.1.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1lgz6qpsfv4b7p5ff4sdpjpaddxpbazdvlcrqr1i0c0qil2lkm2i"; + sha256 = "sha256-cyJ58BPB7mYWbmHFxPAxnf2JX0b8kqLJF4hdcppaNNI="; }; propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core libcst proto-plus ]; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix index 726e48ee192b..eae38f5dfc17 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -14,25 +14,42 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.3.0"; + version = "3.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-XnOCmxQ6YCO1C7RYHzcZY4ihrt2KommWTkTD9y+B5tg="; + sha256 = "sha256-8o7pr9msuMfIN7UMX+/gppmD3MWXt2hBqb7vcLUE22M="; }; - propagatedBuildInputs = [ google-cloud-core grpc_google_iam_v1 libcst proto-plus sqlparse ]; + propagatedBuildInputs = [ + google-cloud-core + grpc_google_iam_v1 + libcst + proto-plus + sqlparse + ]; - checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + google-cloud-testutils + mock + pytestCheckHook + pytest-asyncio + ]; preCheck = '' # prevent google directory from shadowing google imports rm -r google - # disable tests which require credentials - rm tests/system/test_{system,system_dbapi}.py - rm tests/unit/spanner_dbapi/test_{connect,connection,cursor}.py ''; + disabledTestPaths = [ + # Requires credentials + "tests/system/test_system.py" + "tests/system/test_system_dbapi.py" + "tests/unit/spanner_dbapi/test_connect.py" + "tests/unit/spanner_dbapi/test_connection.py" + "tests/unit/spanner_dbapi/test_cursor.py" + ]; + pythonImportsCheck = [ "google.cloud.spanner_admin_database_v1" "google.cloud.spanner_admin_instance_v1" diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix index 2261345f4205..bccc2ad8bac9 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.2.1"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-AviYDI68Z11M/rqHgQTQugYNemPTA5nW4aVQTiwMYxI="; + sha256 = "sha256-mR7gYBvJVhEOhzruGnREHWYiexDNWBGVV1Q1iEOE84s="; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix index 40d70176c5d6..e54a52479828 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "1.37.0"; + version = "1.38.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-IAPF7Uc/mzfQRfMMTIvn0w19Dripe80sWLOovFScTMw="; + sha256 = "sha256-FiAR1m9kuNxdeTZgml2vAGbMUhIxVGrqAsEmpVWURsQ="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix index c01c294ec334..d04c996acf91 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.2.0"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "6be2f2bca14b4eb1c1bdb0f4ba1dadf791e79a2a3e1fae762e5631a3d9fe094e"; + sha256 = "sha256-fMJNOJBzxAr0Hi/AkUF97G5YrwfbmxKVhT/D1UXIDP4="; }; propagatedBuildInputs = [ google-api-core grpc_google_iam_v1 libcst proto-plus ]; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index ab4415e3412b..f1cbf3f307ab 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "2.3.0"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zzssVnXA1xe3270yEOREJ9GdmyRPjV1F4EBelf9AQ/c="; + sha256 = "sha256-xQzCG134i2lmgNiqw6tshoIMDk0HHWpdzZtjSkVs9Z8="; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix index 486a71c7a97e..9f814c36c2b3 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-trace"; - version = "1.1.0"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "1lvcm4w1l7hiqg64kdscch3f3bq19q9ii49xj4lljn2a4xffxl8v"; + sha256 = "sha256-NoNHel10dFEzKjjWyM6mUrWZHbH25MOZB/o2eXCKwhg="; }; propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ]; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix index a884919c7e18..b1167433b4c0 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -14,16 +14,26 @@ buildPythonPackage rec { pname = "google-cloud-translate"; - version = "3.1.0"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zVRD2lWRaKtSlZn84Rqpj+a1OT7Wcak524TKsBctueE="; + sha256 = "sha256-jNlX9LKajHqYPgpCfCcSUzxBu3AHt2qMyI1sZQdcZ5o="; }; - propagatedBuildInputs = [ google-api-core google-cloud-core libcst proto-plus ]; + propagatedBuildInputs = [ + google-api-core + google-cloud-core + libcst + proto-plus + ]; - checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + google-cloud-testutils + mock + pytestCheckHook + pytest-asyncio + ]; preCheck = '' # prevent shadowing imports diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index f56b00af0a54..c68db2bfece9 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-videointelligence"; - version = "2.1.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-gn/KWf3A4SkTqt9rqwYcsaxvfKXPvb7DXJ+zryGjWIA="; + sha256 = "sha256-CBBt3uyQon9Lxwb3Jn7BxS8r/3Rbr9RxC8aJhGDI6aY="; }; propagatedBuildInputs = [ google-api-core proto-plus ]; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix index 5857de341d29..2a98edced7a9 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-vision"; - version = "2.3.0"; + version = "2.3.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-6XYHADzyk0/WSGk9wni9bOtVURJ+U2Eve8LAh0Eg7KI="; + sha256 = "sha256-Nnqm+f2OSKBRTOpuB7PQBvAaunCA8XoontDfkuh/f4Q="; }; propagatedBuildInputs = [ libcst google-api-core proto-plus]; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index 971f5cce90e7..5598a98cf839 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-websecurityscanner"; - version = "1.1.0"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-lrMnp9jVndz0C8VdreVudYdwh7zSdRniPHYm9BNdjak="; + sha256 = "sha256-Lg6yoqOu88lZHT/H9FPdgVgSDm7oLUaPm7T1UsXB8Fo="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/nixpkgs/pkgs/development/python-modules/google-re2/default.nix b/nixpkgs/pkgs/development/python-modules/google-re2/default.nix new file mode 100644 index 000000000000..a2dbf512b895 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/google-re2/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, pythonOlder, fetchPypi, pybind11, re2, six }: + +buildPythonPackage rec { + pname = "google-re2"; + version = "0.1.20210601"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "1f1ql95f97ss8i0rn1c37kgi0qrf1nq9b3q8xbq9x3gwg7xgzi71"; + }; + + propagatedBuildInputs = [ + pybind11 re2 six + ]; + + meta = with lib; { + description = "RE2 Python bindings"; + homepage = "https://github.com/google/re2"; + license = licenses.bsd3; + maintainers = with maintainers; [ alexbakker ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/gradient/default.nix b/nixpkgs/pkgs/development/python-modules/gradient/default.nix index 1965e0d3aded..9a2f89e8c419 100644 --- a/nixpkgs/pkgs/development/python-modules/gradient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gradient/default.nix @@ -17,7 +17,7 @@ , requests , requests_toolbelt , terminaltables -, websocket_client +, websocket-client }: buildPythonPackage rec { @@ -55,7 +55,7 @@ buildPythonPackage rec { requests requests_toolbelt terminaltables - websocket_client + websocket-client ]; # tries to use /homeless-shelter to mimic container usage, etc diff --git a/nixpkgs/pkgs/development/python-modules/graphql-subscription-manager/default.nix b/nixpkgs/pkgs/development/python-modules/graphql-subscription-manager/default.nix new file mode 100644 index 000000000000..1a3c32e04d44 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/graphql-subscription-manager/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, setuptools +, websockets +}: + +buildPythonPackage rec { + pname = "graphql-subscription-manager"; + version = "0.4.0"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Danielhiversen"; + repo = "PyGraphqlWebsocketManager"; + rev = version; + sha256 = "1176xzr9fa7gl5cm0pcv5lb45d2ms5awi601rjcr3a0a14a1i8fz"; + }; + + propagatedBuildInputs = [ + setuptools + websockets + ]; + + # no tests implemented + doCheck = false; + + pythonImportsCheck = [ "graphql_subscription_manager" ]; + + meta = with lib; { + description = "Python3 library for graphql subscription manager"; + homepage = "https://github.com/Danielhiversen/PyGraphqlWebsocketManager"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/greeclimate/default.nix b/nixpkgs/pkgs/development/python-modules/greeclimate/default.nix new file mode 100644 index 000000000000..5b2e86b5fb58 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/greeclimate/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, netifaces +, pycryptodome +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "greeclimate"; + version = "0.11.8"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "cmroche"; + repo = "greeclimate"; + rev = version; + sha256 = "1n46klbhl0gpd5x995mrcr1qfd77hrfm501qns1zhvv0zk8mdsf4"; + }; + + propagatedBuildInputs = [ + netifaces + pycryptodome + ]; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "greeclimate" + "greeclimate.device" + "greeclimate.discovery" + "greeclimate.exceptions" + "greeclimate.network" + ]; + + meta = with lib; { + description = "Discover, connect and control Gree based minisplit systems"; + homepage = "https://github.com/cmroche/greeclimate"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/growattserver/default.nix b/nixpkgs/pkgs/development/python-modules/growattserver/default.nix new file mode 100644 index 000000000000..64c6e7bf2b1b --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/growattserver/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "growattserver"; + version = "1.0.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "indykoning"; + repo = "PyPi_GrowattServer"; + rev = version; + sha256 = "1vgb92axlz1kkszmamjbsqgi74afnbr2mc1np3pmbn3bx5rmk1d9"; + }; + + propagatedBuildInputs = [ + requests + ]; + + postPatch = '' + # https://github.com/indykoning/PyPi_GrowattServer/issues/2 + substituteInPlace setup.py \ + --replace "tag = os.environ['LATEST_TAG']" "" \ + --replace "version=tag," 'version="${version}",' + ''; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "growattServer" ]; + + meta = with lib; { + description = "Python package to retrieve information from Growatt units"; + homepage = "https://github.com/indykoning/PyPi_GrowattServer"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/gurobipy/linux.nix b/nixpkgs/pkgs/development/python-modules/gurobipy/linux.nix index d572b10fd625..ebcdc0e73f25 100644 --- a/nixpkgs/pkgs/development/python-modules/gurobipy/linux.nix +++ b/nixpkgs/pkgs/development/python-modules/gurobipy/linux.nix @@ -1,21 +1,28 @@ -{ fetchurl, python }: -assert python.pkgs.isPy27; +{ lib, buildPythonPackage, python, gurobi }: -python.pkgs.buildPythonPackage - { pname = "gurobipy"; - version = "7.5.2"; - src = fetchurl - { url = "http://packages.gurobi.com/7.5/gurobi7.5.2_linux64.tar.gz"; - sha256 = "13i1dl22lnmg7z9mb48zl3hy1qnpwdpr0zl2aizda0qnb7my5rnj"; - }; - setSourceRoot = "sourceRoot=$(echo gurobi*/*64)"; - patches = [ ./no-clever-setup.patch ]; - postInstall = "mv lib/libaes*.so* lib/libgurobi*.so* $out/lib"; - postFixup = - '' - patchelf --set-rpath $out/lib \ - $out/lib/python2.7/site-packages/gurobipy/gurobipy.so - patchelf --add-needed libaes75.so \ - $out/lib/python2.7/site-packages/gurobipy/gurobipy.so - ''; - } +buildPythonPackage { + pname = "gurobipy"; + version = "9.1.2"; + + src = gurobi.src; + + setSourceRoot = "sourceRoot=$(echo gurobi*/*64)"; + + patches = [ ./no-clever-setup.patch ]; + + postInstall = '' + mv lib/libgurobi*.so* $out/lib + ''; + + postFixup = '' + patchelf --set-rpath $out/lib \ + $out/lib/${python.libPrefix}/site-packages/gurobipy/gurobipy.so + ''; + + meta = with lib; { + description = "The Gurobi Python interface"; + homepage = "https://www.gurobi.com"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/gurobipy/no-clever-setup.patch b/nixpkgs/pkgs/development/python-modules/gurobipy/no-clever-setup.patch index c71ac7d68632..bcb43a4707bf 100644 --- a/nixpkgs/pkgs/development/python-modules/gurobipy/no-clever-setup.patch +++ b/nixpkgs/pkgs/development/python-modules/gurobipy/no-clever-setup.patch @@ -1,7 +1,7 @@ diff -Naur a/setup.py b/setup.py ---- a/setup.py 2017-12-22 10:52:43.730264611 -0500 -+++ b/setup.py 2017-12-22 10:53:27.660104199 -0500 -@@ -15,30 +15,6 @@ +--- a/setup.py 2021-04-24 12:53:18.300255006 -0500 ++++ b/setup.py 2021-04-24 12:47:51.619052574 -0500 +@@ -15,29 +15,6 @@ from distutils.command.install import install import os,sys,shutil @@ -13,7 +13,6 @@ diff -Naur a/setup.py b/setup.py - def finalize_options(self): - self.cwd = os.path.dirname(os.path.realpath(__file__)) - def run(self): -- assert os.getcwd() == self.cwd, 'Must be run from setup.py directory: %s' % self.cwd - build_dir = os.path.join(os.getcwd(), "build") - if os.path.exists(build_dir): - print('removing %s' % build_dir) @@ -32,24 +31,11 @@ diff -Naur a/setup.py b/setup.py License = """ This software is covered by the Gurobi End User License Agreement. By completing the Gurobi installation process and using the software, -@@ -79,20 +55,4 @@ +@@ -78,7 +55,5 @@ packages = ['gurobipy'], package_dir={'gurobipy' : srcpath }, package_data = {'gurobipy' : [srcfile] }, - cmdclass={'install' : GurobiInstall, - 'clean' : GurobiClean } ) -- --if os.name == 'posix' and sys.platform == 'darwin': # update Mac paths -- verstr = sys.version[:3] -- default = '/Library/Frameworks/Python.framework/Versions/%s/Python' % verstr -- default = '/System'+default if verstr == '2.7' else default -- modified = sys.prefix + '/Python' -- if default != modified: -- import subprocess -- from distutils.sysconfig import get_python_lib -- sitelib = get_python_lib() + '/gurobipy/gurobipy.so' -- if not os.path.isfile(modified): # Anaconda -- libver = verstr if verstr == '2.7' else verstr+'m' -- modified = sys.prefix + '/lib/libpython%s.dylib' % libver # For Anaconda -- subprocess.call(('install_name_tool', '-change', default, modified, sitelib)) + diff --git a/nixpkgs/pkgs/development/python-modules/habitipy/default.nix b/nixpkgs/pkgs/development/python-modules/habitipy/default.nix new file mode 100644 index 000000000000..d20c89e82e79 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/habitipy/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, plumbum +, requests +, setuptools +, hypothesis +, nose +, responses +}: + +buildPythonPackage rec { + pname = "habitipy"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "ASMfreaK"; + repo = "habitipy"; + rev = "v${version}"; + sha256 = "1vf485z5m4h61p64zr3sgkcil2s3brq7dja4n7m49d1fvzcirylv"; + }; + + propagatedBuildInputs = [ + plumbum + requests + setuptools + ]; + + checkInputs = [ + hypothesis + nose + responses + ]; + + checkPhase = '' + HOME=$TMPDIR nosetests + ''; + + pythonImportsCheck = [ "habitipy" ]; + + meta = with lib; { + description = "Tools and library for Habitica restful API"; + homepage = "https://github.com/ASMfreaK/habitipy"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/hangups/default.nix b/nixpkgs/pkgs/development/python-modules/hangups/default.nix new file mode 100644 index 000000000000..9c32bc2dd951 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/hangups/default.nix @@ -0,0 +1,70 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, configargparse +, aiohttp +, async-timeout +, appdirs +, readlike +, requests +, reparser +, protobuf +, urwid +, mechanicalsoup +, httpretty +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "hangups"; + version = "0.4.14"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "tdryer"; + repo = "hangups"; + rev = "v${version}"; + sha256 = "14njagpdp13zlaqnwl2mh7fkpnsaqr6wkr4lwh608v06pkwwcwcm"; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "protobuf>=3.1.0,<3.16" "protobuf" \ + --replace "MechanicalSoup>=0.6.0,<0.13" "MechanicalSoup" + ''; + + propagatedBuildInputs = [ + configargparse + aiohttp + async-timeout + appdirs + readlike + requests + reparser + protobuf + urwid + mechanicalsoup + ]; + + checkInputs = [ + httpretty + pytestCheckHook + ]; + + pythonImportsCheck = [ + "hangups" + "hangups.client" + "hangups.event" + "hangups.parsers" + "hangups.user" + ]; + + meta = with lib; { + description = "The first third-party instant messaging client for Google Hangouts"; + homepage = "https://github.com/tdryer/hangups"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/HAP-python/default.nix b/nixpkgs/pkgs/development/python-modules/hap-python/default.nix index 8380832abd67..946f0039a0af 100644 --- a/nixpkgs/pkgs/development/python-modules/HAP-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hap-python/default.nix @@ -16,16 +16,16 @@ }: buildPythonPackage rec { - pname = "HAP-python"; - version = "3.4.1"; + pname = "hap-python"; + version = "3.5.0"; disabled = pythonOlder "3.5"; # pypi package does not include tests src = fetchFromGitHub { owner = "ikalchev"; - repo = pname; + repo = "HAP-python"; rev = "v${version}"; - sha256 = "sha256-tZ6Zwlx5J62Xqpxxmt8Phdd9ngtKYhP/p3uor1dRfK8="; + sha256 = "1vzlfx0gpidl0rzv4z94pziwm6rj4lrilly5pykgq984y708pcqf"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix b/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix index 1abd9648e952..f69f140017e0 100644 --- a/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -24,10 +24,6 @@ buildPythonPackage rec { sha256 = "sha256-eQdbAQRKqnJGxnSTkk3gld9TX9MpP3J8LFNYH6peVIY="; }; - postPatch = '' - sed -i 's/"acme.*"/"acme"/' setup.py - ''; - propagatedBuildInputs = [ acme aiohttp @@ -44,11 +40,17 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + sed -i 's/"acme.*"/"acme"/' setup.py + substituteInPlace setup.py \ + --replace "snitun==" "snitun>=" + ''; + pythonImportsCheck = [ "hass_nabucasa" ]; meta = with lib; { homepage = "https://github.com/NabuCasa/hass-nabucasa"; - description = "Home Assistant cloud integration by Nabu Casa, inc."; + description = "Python module for the Home Assistant cloud integration"; license = licenses.gpl3Only; maintainers = with maintainers; [ Scriptkiddi ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/herepy/default.nix b/nixpkgs/pkgs/development/python-modules/herepy/default.nix new file mode 100644 index 000000000000..6081f914c646 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/herepy/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, requests +, pytestCheckHook +, responses +}: + +buildPythonPackage rec { + pname = "herepy"; + version = "3.5.2"; + + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "abdullahselek"; + repo = "HerePy"; + rev = version; + sha256 = "0z1brgnrzdzfmnydipja4hhrhnz4fwdjy3xa05mz28bwi6z52bcj"; + }; + + propagatedBuildInputs = [ + requests + ]; + + checkInputs = [ + pytestCheckHook + responses + ]; + + pythonImportsCheck = [ "herepy" ]; + + meta = with lib; { + description = "Library that provides a Python interface to the HERE APIs"; + homepage = "https://github.com/abdullahselek/HerePy"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix b/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix index 46db97a9aedd..a0229d1e5012 100644 --- a/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix @@ -1,19 +1,54 @@ { lib , buildPythonPackage , fetchPypi -, isPy3k +, mercurial }: buildPythonPackage rec { pname = "hg-evolve"; - version = "10.3.1"; + version = "10.3.2"; src = fetchPypi { inherit pname version; - sha256 = "03xwnadpvgna70n6pfxb7xdrszppdqrx5qmkbr1v0jzbh5rnzi6b"; + sha256 = "ba819732409d39ddd4ff2fc507dc921408bf30535d2d78313637b29eeac98860"; }; - doCheck = false; + checkInputs = [ + mercurial + ]; + + checkPhase = '' + runHook preCheck + + export TESTTMP=$(mktemp -d) + export HOME=$TESTTMP + cat <<EOF >$HOME/.hgrc + [extensions] + evolve = + topic = + EOF + + # Shipped tests use the mercurial testing framework, and produce inconsistent results. + # Do a quick smoke-test to see if things do what we expect. + hg init $TESTTMP/repo + pushd $TESTTMP/repo + touch a + hg add a + hg commit -m "init a" + hg topic something + + touch b + hg add b + hg commit -m "init b" + + echo hi > b + hg amend + + hg obslog + popd + + runHook postCheck + ''; meta = with lib; { description = "Enables the “changeset evolution” feature of Mercurial core"; diff --git a/nixpkgs/pkgs/development/python-modules/homematicip/default.nix b/nixpkgs/pkgs/development/python-modules/homematicip/default.nix index b2d6da18fe74..c8cc21278b66 100644 --- a/nixpkgs/pkgs/development/python-modules/homematicip/default.nix +++ b/nixpkgs/pkgs/development/python-modules/homematicip/default.nix @@ -10,7 +10,7 @@ , pytest-aiohttp , pytest-asyncio , requests -, websocket_client +, websocket-client , websockets }: @@ -31,7 +31,7 @@ buildPythonPackage rec { aiohttp async-timeout requests - websocket_client + websocket-client websockets ]; diff --git a/nixpkgs/pkgs/development/python-modules/httpcore/default.nix b/nixpkgs/pkgs/development/python-modules/httpcore/default.nix index 079b5e71a10f..7781dbe8b319 100644 --- a/nixpkgs/pkgs/development/python-modules/httpcore/default.nix +++ b/nixpkgs/pkgs/development/python-modules/httpcore/default.nix @@ -2,31 +2,33 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, anyio , h11 , h2 , pproxy , pytest-asyncio -, pytest-trio , pytestCheckHook , pytestcov , sniffio +, trio , trustme , uvicorn }: buildPythonPackage rec { pname = "httpcore"; - version = "0.13.0"; + version = "0.13.6"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "sha256-KvqBVQUaF3p2oJz0tt3Bkn2JiKEHqrZ3b6I9f0JK5h8="; + sha256 = "sha256-7G7jchOQTgcFSGZfoMPFm0NY9ofg5MM5Xn5lV+W9w8k="; }; propagatedBuildInputs = [ + anyio h11 h2 sniffio @@ -35,16 +37,23 @@ buildPythonPackage rec { checkInputs = [ pproxy pytest-asyncio - pytest-trio pytestCheckHook pytestcov + trio trustme uvicorn ]; + postPatch = '' + # The anyio 3.1.0 release is not picked-up proberly + substituteInPlace setup.py --replace "anyio==3.*" "anyio" + ''; + + disabledTestPaths = [ # these tests fail during dns lookups: httpcore.ConnectError: [Errno -2] Name or service not known "tests/test_threadsafety.py" + "tests/async_tests/" "tests/sync_tests/test_interfaces.py" "tests/sync_tests/test_retries.py" ]; diff --git a/nixpkgs/pkgs/development/python-modules/ibm-watson/default.nix b/nixpkgs/pkgs/development/python-modules/ibm-watson/default.nix index fe8756fde03b..1c59878b4784 100644 --- a/nixpkgs/pkgs/development/python-modules/ibm-watson/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ibm-watson/default.nix @@ -8,7 +8,7 @@ , tox , requests , python-dateutil -, websocket_client +, websocket-client , ibm-cloud-sdk-core }: @@ -34,7 +34,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests python-dateutil - websocket_client + websocket-client ibm-cloud-sdk-core ]; diff --git a/nixpkgs/pkgs/development/python-modules/idasen/default.nix b/nixpkgs/pkgs/development/python-modules/idasen/default.nix new file mode 100644 index 000000000000..d1bacfbe826a --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/idasen/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, bleak +, pyyaml +, voluptuous +, pytestCheckHook +, pytest-asyncio +, poetry-core +}: + +buildPythonPackage rec { + pname = "idasen"; + version = "0.7.1"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "newAM"; + repo = "idasen"; + rev = "v${version}"; + sha256 = "1jdgdby33fd63mnxrfv04dz4fsrikkfmc0ybwwxi816mbkml7n34"; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + bleak + pyyaml + voluptuous + ]; + + checkInputs = [ + pytestCheckHook + pytest-asyncio + ]; + + pythonImportsCheck = [ "idasen" ]; + + meta = with lib; { + description = "Python API and CLI for the ikea IDÅSEN desk"; + homepage = "https://github.com/newAM/idasen"; + license = licenses.mit; + maintainers = with maintainers; [ newam ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/impacket/default.nix b/nixpkgs/pkgs/development/python-modules/impacket/default.nix index 15d148f168f1..43fdfb6a9cee 100644 --- a/nixpkgs/pkgs/development/python-modules/impacket/default.nix +++ b/nixpkgs/pkgs/development/python-modules/impacket/default.nix @@ -1,15 +1,15 @@ -{ lib, buildPythonPackage, fetchPypi, flask, ldapdomaindump, pycryptodomex, pyasn1, pyopenssl }: +{ lib, buildPythonPackage, fetchPypi, flask, ldapdomaindump, pycryptodomex, pyasn1, pyopenssl, chardet }: buildPythonPackage rec { pname = "impacket"; - version = "0.9.22"; + version = "0.9.23"; src = fetchPypi { inherit pname version; - sha256 = "4bf7e7b595356585599b4b2773b8a463d7b9765c97012dcd5a44eb6d547f6a1d"; + sha256 = "113isxb9rd2n761nnh3skg3vqa0v5dalz9kbavyczqyv1jjyh6qw"; }; - propagatedBuildInputs = [ flask ldapdomaindump pycryptodomex pyasn1 pyopenssl ]; + propagatedBuildInputs = [ flask ldapdomaindump pycryptodomex pyasn1 pyopenssl chardet ]; # fail with: # RecursionError: maximum recursion depth exceeded @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "Network protocols Constructors and Dissectors"; - homepage = "https://github.com/CoreSecurity/impacket"; + homepage = "https://github.com/SecureAuthCorp/impacket"; # Modified Apache Software License, Version 1.1 license = licenses.free; maintainers = with maintainers; [ SuperSandro2000 ]; diff --git a/nixpkgs/pkgs/development/python-modules/importlib-metadata/default.nix b/nixpkgs/pkgs/development/python-modules/importlib-metadata/default.nix index 4149de3f43ae..d430c4cf29c2 100644 --- a/nixpkgs/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/nixpkgs/pkgs/development/python-modules/importlib-metadata/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "importlib-metadata"; - version = "3.7.3"; + version = "4.0.1"; disabled = pythonOlder "3.6"; src = fetchPypi { pname = "importlib_metadata"; inherit version; - sha256 = "742add720a20d0467df2f444ae41704000f50e1234f46174b51f9c6031a1bd71"; + sha256 = "sha256-jFARluSfud9d9DgzvbHkMo9khHdj7IpQcDFItzeE1YE="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/nixpkgs/pkgs/development/python-modules/inflect/default.nix b/nixpkgs/pkgs/development/python-modules/inflect/default.nix index f81ceabd27e1..9081a30ac6be 100644 --- a/nixpkgs/pkgs/development/python-modules/inflect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/inflect/default.nix @@ -28,5 +28,6 @@ buildPythonPackage rec { homepage = "https://github.com/jaraco/inflect"; changelog = "https://github.com/jaraco/inflect/blob/v${version}/CHANGES.rst"; license = licenses.mit; + maintainers = teams.tts.members; }; } diff --git a/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix b/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix index 38f6f58910db..21e614d7d7c9 100644 --- a/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "influxdb-client"; - version = "1.17.0"; + version = "1.18.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "influxdata"; repo = "influxdb-client-python"; rev = "v${version}"; - sha256 = "1xxg8z9zambbhr7nmxhmvmiwkd4578zxr6rl2vhdh2w77idsw29z"; + sha256 = "0xgp1wxdfa4y316dfkpmj38chlh68mndr8kqphckpnw16qxsl3d9"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ismartgate/default.nix b/nixpkgs/pkgs/development/python-modules/ismartgate/default.nix new file mode 100644 index 000000000000..594764bae0f9 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/ismartgate/default.nix @@ -0,0 +1,60 @@ +{ lib +, asynctest +, buildPythonPackage +, click +, defusedxml +, dicttoxml +, fetchFromGitHub +, httpx +, pycryptodome +, pytest-asyncio +, pytest-raises +, pytestCheckHook +, pythonOlder +, respx +, typing-extensions +}: + +buildPythonPackage rec { + pname = "ismartgate"; + version = "4.0.1"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "bdraco"; + repo = pname; + rev = "v${version}"; + sha256 = "1kxlcjnppsk8m93gfcpy3asig1frhp1k5rfqx3rszhkcxmni95m2"; + }; + + propagatedBuildInputs = [ + click + defusedxml + dicttoxml + httpx + pycryptodome + typing-extensions + ]; + + checkInputs = [ + asynctest + pytest-asyncio + pytest-raises + pytestCheckHook + respx + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace '"pytest-runner>=5.2",' "" + ''; + + pythonImportsCheck = [ "ismartgate" ]; + + meta = with lib; { + description = "Python module to work with the ismartgate and gogogate2 API"; + homepage = "https://github.com/bdraco/ismartgate"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/itemloaders/default.nix b/nixpkgs/pkgs/development/python-modules/itemloaders/default.nix index 107585f0416c..e6098208033a 100644 --- a/nixpkgs/pkgs/development/python-modules/itemloaders/default.nix +++ b/nixpkgs/pkgs/development/python-modules/itemloaders/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, isPy27 +, pythonOlder , w3lib , parsel , jmespath @@ -12,8 +12,7 @@ buildPythonPackage rec { pname = "itemloaders"; version = "1.0.4"; - - disabled = isPy27; + disabled = pythonOlder "3.6"; # Tests not included in PyPI tarball src = fetchFromGitHub { @@ -27,6 +26,14 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; + disabledTests = [ + # Test are failing (AssertionError: Lists differ: ...) + "test_nested_css" + "test_nested_xpath" + ]; + + pythonImportsCheck = [ "itemloaders" ]; + meta = with lib; { description = "Base library for scrapy's ItemLoader"; homepage = "https://github.com/scrapy/itemloaders"; diff --git a/nixpkgs/pkgs/development/python-modules/itunespy/default.nix b/nixpkgs/pkgs/development/python-modules/itunespy/default.nix new file mode 100644 index 000000000000..4720101d8177 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/itunespy/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchFromGitHub, requests, pycountry, mypy }: + +buildPythonPackage rec { + pname = "itunespy"; + version = "1.6"; + + src = fetchFromGitHub { + owner = "sleepyfran"; + repo = pname; + rev = version; + sha256 = "0yc3az5531qs8nbcw4rhgrszwczgy4bikfwfar7xb2044360sslw"; + }; + + propagatedBuildInputs = [ requests pycountry mypy ]; + + # This module has no tests + doCheck = false; + + pythonImportsCheck = [ "itunespy" ]; + + meta = with lib; { + description = "A simple library to fetch data from the iTunes Store API"; + homepage = "https://github.com/sleepyfran/itunespy"; + license = licenses.mit; + maintainers = with maintainers; [ j0hax ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/jeepney/default.nix b/nixpkgs/pkgs/development/python-modules/jeepney/default.nix index 84096c6db4f9..cea428a9ffd0 100644 --- a/nixpkgs/pkgs/development/python-modules/jeepney/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jeepney/default.nix @@ -2,9 +2,11 @@ , buildPythonPackage , fetchPypi , pythonOlder +, dbus , pytest +, pytest-trio +, pytest-asyncio , testpath -, tornado , trio }: @@ -12,30 +14,44 @@ buildPythonPackage rec { pname = "jeepney"; version = "0.6.0"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; sha256 = "7d59b6622675ca9e993a6bd38de845051d315f8b0c72cca3aef733a20b648657"; }; - propagatedBuildInputs = [ - tornado - ]; - checkInputs = [ + dbus pytest + pytest-trio + pytest-asyncio testpath trio ]; checkPhase = '' - pytest + runHook preCheck + + dbus-run-session --config-file=${dbus}/share/dbus-1/session.conf -- pytest + + runHook postCheck ''; + pythonImportsCheck = [ + "jeepney" + "jeepney.auth" + "jeepney.io" + "jeepney.io.asyncio" + "jeepney.io.blocking" + "jeepney.io.threading" + "jeepney.io.trio" + ]; + meta = with lib; { homepage = "https://gitlab.com/takluyver/jeepney"; description = "Pure Python DBus interface"; license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix b/nixpkgs/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix index 84ea65a74773..ca96e63060da 100644 --- a/nixpkgs/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix @@ -1,5 +1,11 @@ -{ lib, buildPythonPackage, fetchPypi, requests -, websocket_client, pythonOlder }: +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, requests +, six +, websocket-client +}: buildPythonPackage rec { pname = "jellyfin-apiclient-python"; @@ -11,7 +17,11 @@ buildPythonPackage rec { sha256 = "sha256-nSLUa9/jAT6XrHo77kV5HYBxPO/lhcWKqPfpES7ul9A="; }; - propagatedBuildInputs = [ requests websocket_client ]; + propagatedBuildInputs = [ + requests + six + websocket-client + ]; doCheck = false; # no tests pythonImportsCheck = [ "jellyfin_apiclient_python" ]; diff --git a/nixpkgs/pkgs/development/python-modules/jieba/default.nix b/nixpkgs/pkgs/development/python-modules/jieba/default.nix index b515cd92b23b..8b7146ebef93 100644 --- a/nixpkgs/pkgs/development/python-modules/jieba/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jieba/default.nix @@ -29,5 +29,6 @@ buildPythonPackage rec { description = "Chinese Words Segementation Utilities"; homepage = "https://github.com/fxsjy/jieba"; license = licenses.mit; + maintainers = teams.tts.members; }; } diff --git a/nixpkgs/pkgs/development/python-modules/json-schema-for-humans/default.nix b/nixpkgs/pkgs/development/python-modules/json-schema-for-humans/default.nix index 4e762e456ceb..8df7d6f6e00f 100644 --- a/nixpkgs/pkgs/development/python-modules/json-schema-for-humans/default.nix +++ b/nixpkgs/pkgs/development/python-modules/json-schema-for-humans/default.nix @@ -1,35 +1,65 @@ -{ lib, buildPythonPackage, fetchFromGitHub -, pbr, click, dataclasses-json, htmlmin, jinja2, markdown2, pygments, pytz, pyyaml, requests, pytestCheckHook, beautifulsoup4, tox +{ lib +, beautifulsoup4 +, buildPythonPackage +, click +, dataclasses-json +, fetchFromGitHub +, htmlmin +, jinja2 +, markdown2 +, pbr +, pygments +, pytestCheckHook +, pytz +, pyyaml +, requests }: buildPythonPackage rec { pname = "json-schema-for-humans"; - version = "0.27.1"; + version = "0.31.0"; src = fetchFromGitHub { owner = "coveooss"; repo = pname; rev = "v${version}"; - sha256 = "0d2a4a2lcqssr5g9rmc76f86nkqc9grixh507vzc9fi1h3gbi765"; + sha256 = "1aj1w0qxdw8d6mf5vngk0xjgs7z8vzwc2aycahnkqg7q3cagq19n"; }; nativeBuildInputs = [ pbr ]; + propagatedBuildInputs = [ - click dataclasses-json htmlmin jinja2 markdown2 - pygments pytz pyyaml requests + click + dataclasses-json + htmlmin + jinja2 + markdown2 + pygments + pytz + pyyaml + requests ]; preBuild = '' export PBR_VERSION=0.0.1 ''; - checkInputs = [ pytestCheckHook beautifulsoup4 ]; - pytestFlagsArray = [ "--ignore tests/generate_test.py" ]; + checkInputs = [ + beautifulsoup4 + pytestCheckHook + ]; + + disabledTests = [ + # Tests require network access + "test_references_url" + ]; + + pythonImportsCheck = [ "json_schema_for_humans" ]; meta = with lib; { description = "Quickly generate HTML documentation from a JSON schema"; - homepage = "https://github.com/coveooss/json-schema-for-humans"; - license = licenses.asl20; + homepage = "https://github.com/coveooss/json-schema-for-humans"; + license = licenses.asl20; maintainers = with maintainers; [ astro ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix b/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix index f2cb598a6c9b..952527d5cab7 100644 --- a/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix +++ b/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, pythonAtLeast, - ipaddress, websocket_client, urllib3, pyyaml, requests_oauthlib, python-dateutil, google-auth, adal, + ipaddress, websocket-client, urllib3, pyyaml, requests_oauthlib, python-dateutil, google-auth, adal, isort, pytest, coverage, mock, sphinx, autopep8, pep8, codecov, recommonmark, nose }: buildPythonPackage rec { @@ -28,7 +28,7 @@ buildPythonPackage rec { }; checkInputs = [ isort coverage pytest mock sphinx autopep8 pep8 codecov recommonmark nose ]; - propagatedBuildInputs = [ ipaddress websocket_client urllib3 pyyaml requests_oauthlib python-dateutil google-auth adal ]; + propagatedBuildInputs = [ ipaddress websocket-client urllib3 pyyaml requests_oauthlib python-dateutil google-auth adal ]; meta = with lib; { description = "Kubernetes python client"; diff --git a/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix b/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix index a900c61d40b8..a70923de2bea 100644 --- a/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix @@ -1,6 +1,6 @@ { lib, fetchPypi, buildPythonPackage, hidapi , pycrypto, pillow, protobuf, future, ecpy, python-u2flib-host, pycryptodomex -, websocket_client +, websocket-client }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - hidapi pycrypto pillow protobuf future ecpy python-u2flib-host pycryptodomex websocket_client + hidapi pycrypto pillow protobuf future ecpy python-u2flib-host pycryptodomex websocket-client ]; # No tests diff --git a/nixpkgs/pkgs/development/python-modules/libcst/default.nix b/nixpkgs/pkgs/development/python-modules/libcst/default.nix index ed6e7755bf15..314bc82cd4fb 100644 --- a/nixpkgs/pkgs/development/python-modules/libcst/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libcst/default.nix @@ -1,21 +1,22 @@ { lib +, black , buildPythonPackage +, dataclasses , fetchFromGitHub -, pythonOlder , hypothesis -, dataclasses -, hypothesmith -, pytestCheckHook +, isort +, pytest +, python +, pythonOlder , pyyaml , typing-extensions , typing-inspect -, black -, isort }: buildPythonPackage rec { pname = "libcst"; version = "0.3.18"; + disabled = pythonOlder "3.6"; # Some files for tests missing from PyPi # https://github.com/Instagram/LibCST/issues/331 @@ -26,25 +27,37 @@ buildPythonPackage rec { sha256 = "sha256-19yGaKBLpGASSPv/aSX0kx9lh2JxKExHJDKKtuBbuqI="; }; - disabled = pythonOlder "3.6"; - - propagatedBuildInputs = [ hypothesis typing-extensions typing-inspect pyyaml ] - ++ lib.optional (pythonOlder "3.7") dataclasses; - - checkInputs = [ black hypothesmith isort pytestCheckHook ]; + propagatedBuildInputs = [ + hypothesis + typing-extensions + typing-inspect + pyyaml + ] ++ lib.optional (pythonOlder "3.7") [ + dataclasses + ]; - # can't run tests due to circular dependency on hypothesmith -> licst - doCheck = false; + checkInputs = [ + black + isort + pytest + ]; preCheck = '' - python -m libcst.codegen.generate visitors - python -m libcst.codegen.generate return_types + ${python.interpreter} -m libcst.codegen.generate visitors + ${python.interpreter} -m libcst.codegen.generate return_types + # Can't run all tests due to circular dependency on hypothesmith -> libcst + rm -r {libcst/tests,libcst/codegen/tests,libcst/m*/tests} ''; + disabledTests = [ + # No files are generated + "test_codemod_formatter_error_input" + ]; + pythonImportsCheck = [ "libcst" ]; meta = with lib; { - description = "A Concrete Syntax Tree (CST) parser and serializer library for Python."; + description = "Concrete Syntax Tree (CST) parser and serializer library for Python"; homepage = "https://github.com/Instagram/libcst"; license = with licenses; [ mit asl20 psfl ]; maintainers = with maintainers; [ ruuda SuperSandro2000 ]; diff --git a/nixpkgs/pkgs/development/python-modules/libpyfoscam/default.nix b/nixpkgs/pkgs/development/python-modules/libpyfoscam/default.nix new file mode 100644 index 000000000000..3f7eaad8ce81 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/libpyfoscam/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "libpyfoscam"; + version = "1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "c274cafd2c6493ab397fe9f0f8aae0b2c35c7c661fe76dde3bd2f1cd56b8fc32"; + }; + + # tests need access to a camera + doCheck = false; + + pythonImportsCheck = [ "libpyfoscam" ]; + + meta = with lib; { + description = "Python Library for Foscam IP Cameras"; + homepage = "https://github.com/viswa-swami/python-foscam"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/libsoundtouch/default.nix b/nixpkgs/pkgs/development/python-modules/libsoundtouch/default.nix index 77dcdcaef025..edee7a625366 100644 --- a/nixpkgs/pkgs/development/python-modules/libsoundtouch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libsoundtouch/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , enum-compat , requests -, websocket_client +, websocket-client , zeroconf , pytestCheckHook }: @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests enum-compat - websocket_client + websocket-client zeroconf ]; diff --git a/nixpkgs/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/nixpkgs/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix index ba10c89e1405..a5483245d663 100644 --- a/nixpkgs/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, pythonOlder , fetchPypi , marshmallow , sqlalchemy @@ -9,11 +10,12 @@ buildPythonPackage rec { pname = "marshmallow-sqlalchemy"; - version = "0.24.2"; + version = "0.25.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "ee3ead3b83de6608c6850ff60515691b0dc556ca226680f8a82b9f785cdb71b1"; + sha256 = "0i39ckrixh1w9fmkm0wl868gvza72j5la0x6dd0cij9shf1iyjgi"; }; propagatedBuildInputs = [ @@ -21,6 +23,10 @@ buildPythonPackage rec { sqlalchemy ]; + pythonImportsCheck = [ + "marshmallow_sqlalchemy" + ]; + checkInputs = [ pytest-lazy-fixture pytestCheckHook @@ -28,7 +34,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy"; - description = "SQLAlchemy integration with marshmallow "; + description = "SQLAlchemy integration with marshmallow"; license = licenses.mit; }; diff --git a/nixpkgs/pkgs/development/python-modules/marshmallow/default.nix b/nixpkgs/pkgs/development/python-modules/marshmallow/default.nix index a7ca14beb942..0deeb0e53866 100644 --- a/nixpkgs/pkgs/development/python-modules/marshmallow/default.nix +++ b/nixpkgs/pkgs/development/python-modules/marshmallow/default.nix @@ -1,27 +1,40 @@ -{ lib, buildPythonPackage, fetchPypi, - dateutil, simplejson, isPy27 +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, pytestCheckHook +, pytz +, simplejson }: buildPythonPackage rec { pname = "marshmallow"; - version = "3.10.0"; - disabled = isPy27; + version = "3.11.1"; + disabled = pythonOlder "3.5"; - meta = { - homepage = "https://github.com/marshmallow-code/marshmallow"; + src = fetchFromGitHub { + owner = "marshmallow-code"; + repo = pname; + rev = version; + sha256 = "1ypm142y3giaqydc7fkigm9r057yp2sd1ng5zr2x3w3wbbj5yfm6"; + }; + + pythonImportsCheck = [ + "marshmallow" + ]; + + checkInputs = [ + pytestCheckHook + pytz + simplejson + ]; + + meta = with lib; { description = '' A lightweight library for converting complex objects to and from simple Python datatypes. ''; - license = lib.licenses.mit; - }; - - src = fetchPypi { - inherit pname version; - sha256 = "4ab2fdb7f36eb61c3665da67a7ce281c8900db08d72ba6bf0e695828253581f7"; + homepage = "https://github.com/marshmallow-code/marshmallow"; + license = licenses.mit; }; - - propagatedBuildInputs = [ dateutil simplejson ]; - - doCheck = false; } diff --git a/nixpkgs/pkgs/development/python-modules/mastodon-py/default.nix b/nixpkgs/pkgs/development/python-modules/mastodon-py/default.nix new file mode 100644 index 000000000000..c1a7c8985b78 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/mastodon-py/default.nix @@ -0,0 +1,61 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, blurhash +, cryptography +, decorator +, http-ece +, python-dateutil +, python_magic +, pytz +, requests +, six +, pytestCheckHook +, pytest-mock +, pytest-vcr +, requests-mock +}: + +buildPythonPackage rec { + pname = "mastodon-py"; + version = "1.5.1"; + + src = fetchFromGitHub { + owner = "halcy"; + repo = "Mastodon.py"; + rev = version; + sha256 = "044iqydw69a6xpz2hdjv1fc6a9b7bqdpnh3b33xqbks9d2415ddm"; + }; + + postPatch = '' + sed -i '/^addopts/d' setup.cfg + ''; + + propagatedBuildInputs = [ + blurhash + cryptography + decorator + http-ece + python-dateutil + python_magic + pytz + requests + six + ]; + + checkInputs = [ + pytestCheckHook + pytest-mock + pytest-vcr + requests-mock + ]; + + pythonImportsCheck = [ "mastodon" ]; + + meta = with lib; { + description = "Python wrapper for the Mastodon API"; + homepage = "https://github.com/halcy/Mastodon.py"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix b/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix index 6a39ff347cd5..221410fa3eae 100644 --- a/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "mcstatus"; - version = "6.0.0"; + version = "6.1.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Dinnerbone"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YBtVWcOZDt2jQB9bHDrSCP9f2OC+IHzJKlBBGorLnZU="; + sha256 = "sha256-ncw8ILOD+i5aW78opv62VRcV58MQb5IG33MGTqNgDRk="; }; propagatedBuildInputs = [ @@ -36,10 +36,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace requirements.txt --replace "dnspython3" "dnspython" - ''; - pythonImportsCheck = [ "mcstatus" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/metakernel/default.nix b/nixpkgs/pkgs/development/python-modules/metakernel/default.nix new file mode 100644 index 000000000000..eec3da25e0f2 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/metakernel/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, ipykernel +, isPy27 +, mock +, pytest +}: + +buildPythonPackage rec { + pname = "metakernel"; + version = "0.27.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0aqq9zil6h7kxsg3v2008nr6lv47qvcsash8qzmi1xh6r4x606zy"; + }; + + propagatedBuildInputs = [ ipykernel ]; + + # Tests hang, so disable + doCheck = false; + + meta = with lib; { + description = "Jupyter/IPython Kernel Tools"; + homepage = "https://github.com/Calysto/metakernel"; + license = licenses.bsd3; + maintainers = with maintainers; [ thomasjm ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/meteoalertapi/default.nix b/nixpkgs/pkgs/development/python-modules/meteoalertapi/default.nix new file mode 100644 index 000000000000..555059f5683f --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/meteoalertapi/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, requests +, xmltodict +}: + +buildPythonPackage rec { + pname = "meteoalertapi"; + version = "0.2.0"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "rolfberkenbosch"; + repo = "meteoalert-api"; + rev = "v${version}"; + sha256 = "sha256-EdHqWEkE/uUtz/xjV4k4NvNvtPPU4sJjHGwUM7J+HWs="; + }; + + propagatedBuildInputs = [ + requests + xmltodict + ]; + + # Tests require network access + doCheck = false; + + pythonImportsCheck = [ "meteoalertapi" ]; + + meta = with lib; { + description = "Python wrapper for MeteoAlarm.org"; + homepage = "https://github.com/rolfberkenbosch/meteoalert-api"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/millheater/default.nix b/nixpkgs/pkgs/development/python-modules/millheater/default.nix new file mode 100644 index 000000000000..7639de14a670 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/millheater/default.nix @@ -0,0 +1,37 @@ +{ lib +, aiohttp +, async-timeout +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "millheater"; + version = "0.4.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "Danielhiversen"; + repo = "pymill"; + rev = version; + sha256 = "0dypv4xwdqcv45aibfkik2slm9r8y7pd2gwqa49kn96f40kdfwb0"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "mill" ]; + + meta = with lib; { + description = "Python library for Mill heater devices"; + homepage = "https://github.com/Danielhiversen/pymill"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/minidump/default.nix b/nixpkgs/pkgs/development/python-modules/minidump/default.nix index 864e58839f4c..6c00ad650bb5 100644 --- a/nixpkgs/pkgs/development/python-modules/minidump/default.nix +++ b/nixpkgs/pkgs/development/python-modules/minidump/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "minidump"; - version = "0.0.17"; + version = "0.0.18"; src = fetchPypi { inherit pname version; - sha256 = "sha256-nlPW83Tr3aec1tSYHgcZTwd+ydN12S6WNwK7gdwdatY="; + sha256 = "sha256-uf4KZc9C1gWRgHu4ttk1fpL2pG8oUb79uvCIlHItB/8="; }; # Upstream doesn't have tests diff --git a/nixpkgs/pkgs/development/python-modules/minio/default.nix b/nixpkgs/pkgs/development/python-modules/minio/default.nix index fdbcf09534b2..eb543a63133a 100644 --- a/nixpkgs/pkgs/development/python-modules/minio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/minio/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "minio"; - version = "7.0.3"; + version = "7.0.4"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "minio"; repo = "minio-py"; rev = version; - sha256 = "14symk7b3i9xzfc2wkcnqmfsvh9j3jx2ijz7dgy1xyrbjwb7yzhc"; + sha256 = "sha256-4O6WhBoMNpqv1OEewkbA5a8hYH56liF7GrfxkooQ6Fo="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/mocket/default.nix b/nixpkgs/pkgs/development/python-modules/mocket/default.nix index b05260930f10..73a3b07a64c3 100644 --- a/nixpkgs/pkgs/development/python-modules/mocket/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mocket/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "mocket"; - version = "3.9.41"; + version = "3.9.42"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "19zxqh0xk08gj0jf6im9vh53z22yf17ywzykk0fjs9g7m29x8i5j"; + sha256 = "1vvlbnbypd4z1pjlvhwhd89fn0mis5acfx4v25f1mfl04k63ffah"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ms-cv/default.nix b/nixpkgs/pkgs/development/python-modules/ms-cv/default.nix new file mode 100644 index 000000000000..aa8e361338dd --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/ms-cv/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, isPy27 +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "ms-cv"; + version = "0.1.1"; + + disabled = isPy27; + + src = fetchFromGitHub { + owner = "OpenXbox"; + repo = "ms_cv"; + rev = "v${version}"; + sha256 = "0pkna0kvmq1cp4rx3dnzxsvvlxxngryp77k42wkyw2phv19a2mjd"; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest-runner" "" + ''; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Correlation vector implementation in python"; + homepage = "https://github.com/OpenXbox/ms_cv"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix index 860646af9c65..0c871c90a3a5 100644 --- a/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "mypy-boto3-builder"; - version = "4.12.0"; + version = "4.14.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "vemel"; repo = "mypy_boto3_builder"; rev = version; - sha256 = "09kbmrpnph5kbxlqqavpxg3l85dmk3vzmwawa4s09y9gknxxkcv9"; + sha256 = "sha256-y55bPi70ldd528Olr2atXHm5JHiLNBZ396D9qwbBmkc="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix index af97c5e103f2..bbbcc5a14923 100644 --- a/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.17.71"; + version = "1.17.88"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0zgx3f41j80xy203jwms7j72svxy10ry5v9w3ql817ai4lcrspnn"; + sha256 = "sha256-ba7ohsScaag3tDnUbs1eWYO/YSWcgJlo9VpkdU40x5o="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/nixpkgs/pkgs/development/python-modules/nettigo-air-monitor/default.nix new file mode 100644 index 000000000000..9cf8618bb301 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -0,0 +1,50 @@ +{ lib +, aiohttp +, aioresponses +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytest-error-for-skips +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "nettigo-air-monitor"; + version = "0.2.6"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "bieniu"; + repo = pname; + rev = version; + sha256 = "0zs14g02m1ahyrhl2ihk74fp390g4672r1jjiaawmkxrvib07dvp"; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + checkInputs = [ + aioresponses + pytest-asyncio + pytest-error-for-skips + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest-runner" "" + substituteInPlace setup.cfg \ + --replace "--cov --cov-report term-missing " "" + ''; + + pythonImportsCheck = [ "nettigo_air_monitor" ]; + + meta = with lib; { + description = "Python module to get air quality data from Nettigo Air Monitor devices"; + homepage = "https://github.com/bieniu/nettigo-air-monitor"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/nexia/default.nix b/nixpkgs/pkgs/development/python-modules/nexia/default.nix index dbd1c798a3f7..14b888428aac 100644 --- a/nixpkgs/pkgs/development/python-modules/nexia/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nexia/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "nexia"; - version = "0.9.6"; + version = "0.9.7"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "bdraco"; repo = pname; rev = version; - sha256 = "1k8h1p2zqm8gghff03jh8q3zik7jw2l686cyyg36r3qrgz6zi19q"; + sha256 = "sha256-1oBrDr8QAUe6LLBliR/sNwDlLuisxOWPeI9sxuJtGxU="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/notify-py/darwin-paths.patch b/nixpkgs/pkgs/development/python-modules/notify-py/darwin-paths.patch new file mode 100644 index 000000000000..3088825b9b9b --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/notify-py/darwin-paths.patch @@ -0,0 +1,13 @@ +diff --git a/notifypy/os_notifiers/macos.py b/notifypy/os_notifiers/macos.py +index 68731fb..53fcee3 100644 +--- a/notifypy/os_notifiers/macos.py ++++ b/notifypy/os_notifiers/macos.py +@@ -75,7 +75,7 @@ class MacOSNotifier(BaseNotifier): + def _find_installed_afplay(): + """Function to find the path for afplay""" + try: +- run_which_for_aplay = subprocess.check_output(["which", "afplay"]) ++ run_which_for_aplay = subprocess.check_output(["@which@", "afplay"]) + return run_which_for_aplay.decode("utf-8") + except subprocess.CalledProcessError: + logger.exception("Unable to find aplay.") diff --git a/nixpkgs/pkgs/development/python-modules/notify-py/default.nix b/nixpkgs/pkgs/development/python-modules/notify-py/default.nix index ba4725c9aaa4..497b20d3df8f 100644 --- a/nixpkgs/pkgs/development/python-modules/notify-py/default.nix +++ b/nixpkgs/pkgs/development/python-modules/notify-py/default.nix @@ -1,5 +1,17 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, coreutils, alsa-utils -, libnotify, which, jeepney, loguru, pytestCheckHook }: +{ lib +, stdenv +, buildPythonPackage +, isPy3k +, fetchFromGitHub +, substituteAll +, alsa-utils +, libnotify +, which +, jeepney +, loguru +, pytestCheckHook +, coreutils +}: buildPythonPackage rec { pname = "notify-py"; @@ -14,15 +26,28 @@ buildPythonPackage rec { sha256 = "1n35adwsyhz304n4ifnsz6qzkymwhyqc8sg8d76qv5psv2xsnzlf"; }; - propagatedNativeBuildInputs = [ which ] - ++ lib.optionals stdenv.isLinux [ alsa-utils libnotify ]; + patches = lib.optionals stdenv.isLinux [ + # hardcode paths to aplay and notify-send + (substituteAll { + src = ./linux-paths.patch; + aplay = "${alsa-utils}/bin/aplay"; + notifysend = "${libnotify}/bin/notify-send"; + }) + ] ++ lib.optionals stdenv.isDarwin [ + # hardcode path to which + (substituteAll { + src = ./darwin-paths.patch; + which = "${which}/bin/which"; + }) + ]; + propagatedBuildInputs = [ loguru ] ++ lib.optionals stdenv.isLinux [ jeepney ]; - checkInputs = [ coreutils pytestCheckHook ]; + checkInputs = [ pytestCheckHook ]; # Tests search for "afplay" binary which is built in to MacOS and not available in nixpkgs - preCheck = '' + preCheck = lib.optionalString stdenv.isDarwin '' mkdir $TMP/bin ln -s ${coreutils}/bin/true $TMP/bin/afplay export PATH="$TMP/bin:$PATH" @@ -31,9 +56,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "notifypy" ]; meta = with lib; { - description = "Python Module for sending cross-platform desktop notifications on Windows, macOS, and Linux."; - homepage = "https://github.com/ms7m/notify-py/"; + description = "Cross-platform desktop notification library for Python"; + homepage = "https://github.com/ms7m/notify-py"; license = licenses.mit; - maintainers = with maintainers; [ austinbutler ]; + maintainers = with maintainers; [ austinbutler dotlambda ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/notify-py/linux-paths.patch b/nixpkgs/pkgs/development/python-modules/notify-py/linux-paths.patch new file mode 100644 index 000000000000..f043ec14a467 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/notify-py/linux-paths.patch @@ -0,0 +1,54 @@ +diff --git a/notifypy/os_notifiers/linux.py b/notifypy/os_notifiers/linux.py +index ee89216..5201574 100644 +--- a/notifypy/os_notifiers/linux.py ++++ b/notifypy/os_notifiers/linux.py +@@ -53,30 +53,12 @@ class LinuxNotifierLibNotify(BaseNotifier): + @staticmethod + def _find_installed_aplay(): + """Function to find the path for notify-send""" +- try: +- run_which_for_aplay = subprocess.check_output(["which", "aplay"]) +- return run_which_for_aplay.decode("utf-8") +- except subprocess.CalledProcessError: +- logger.exception("Unable to find aplay.") +- return False +- except Exception: +- logger.exception("Unhandled exception for finding aplay.") +- return False ++ return "@aplay@" + + @staticmethod + def _find_installed_notify_send(): + """Function to find the path for notify-send""" +- try: +- run_which_for_notify_send = subprocess.check_output( +- ["which", "notify-send"] +- ) +- return run_which_for_notify_send.decode("utf-8") +- except subprocess.CalledProcessError: +- logger.exception("Unable to find notify-send.") +- return False +- except Exception: +- logger.exception("Unhandled exception for finding notify-send.") +- return False ++ return "@notifysend@" + + def send_notification( + self, +@@ -159,15 +141,7 @@ class LinuxNotifier(BaseNotifier): + @staticmethod + def _find_installed_aplay(): + """Function to find the path for notify-send""" +- try: +- run_which_for_aplay = subprocess.check_output(["which", "aplay"]) +- return run_which_for_aplay.decode("utf-8") +- except subprocess.CalledProcessError: +- logger.exception("Unable to find aplay.") +- return False +- except Exception: +- logger.exception("Unhandled exception for finding aplay.") +- return False ++ return "@aplay@" + + def send_notification( + self, diff --git a/nixpkgs/pkgs/development/python-modules/nsapi/default.nix b/nixpkgs/pkgs/development/python-modules/nsapi/default.nix new file mode 100644 index 000000000000..453eeb2c9519 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/nsapi/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, future +, pythonOlder +, pytz +}: + +buildPythonPackage rec { + pname = "nsapi"; + version = "3.0.5"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "aquatix"; + repo = "ns-api"; + rev = "v${version}"; + sha256 = "0i1zkvi4mrhkh1gxzpa54mq8mb76s9nf3jxxhpqia56nkq8f8krb"; + }; + + propagatedBuildInputs = [ + future + pytz + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "ns_api" ]; + + meta = with lib; { + description = "Python module to query routes of the Dutch railways"; + homepage = "https://github.com/aquatix/ns-api/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/openhomedevice/default.nix b/nixpkgs/pkgs/development/python-modules/openhomedevice/default.nix index 625980b3b9db..57c0182abd78 100644 --- a/nixpkgs/pkgs/development/python-modules/openhomedevice/default.nix +++ b/nixpkgs/pkgs/development/python-modules/openhomedevice/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "openhomedevice"; - version = "1.0.0"; + version = "2.0.1"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "bazwilliams"; repo = pname; rev = version; - sha256 = "04qdlyzc8xsk7qxyn9l59pbwnlw49zknw0r5lqwx402va12g4ra0"; + sha256 = "sha256-BQgwXg15+xEGfPm0HJWpKXbNuCgc0VcAD5AuVSDXd8g="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/orvibo/default.nix b/nixpkgs/pkgs/development/python-modules/orvibo/default.nix index 6209baa144bb..17a3a7691112 100644 --- a/nixpkgs/pkgs/development/python-modules/orvibo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/orvibo/default.nix @@ -6,7 +6,7 @@ , pytest-runner , pytestCheckHook , requests -, websocket_client +, websocket-client }: buildPythonPackage rec { diff --git a/nixpkgs/pkgs/development/python-modules/parsel/default.nix b/nixpkgs/pkgs/development/python-modules/parsel/default.nix index 319f83f72755..423f4eb0293b 100644 --- a/nixpkgs/pkgs/development/python-modules/parsel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/parsel/default.nix @@ -1,14 +1,13 @@ { lib , buildPythonPackage +, cssselect , fetchPypi -, pytest -, pytestrunner , functools32 +, isPy27 +, lxml +, pytestCheckHook , six , w3lib -, lxml -, cssselect -, isPy27 }: buildPythonPackage rec { @@ -20,17 +19,47 @@ buildPythonPackage rec { sha256 = "0yawf9r3r863lwxj0n89i7h3n8xjbsl5b7n6xg76r68scl5yzvvh"; }; - checkInputs = [ pytest pytestrunner ]; - propagatedBuildInputs = [ six w3lib lxml cssselect ] ++ lib.optionals isPy27 [ functools32 ]; + propagatedBuildInputs = [ + cssselect + lxml + six + w3lib + ] ++ lib.optionals isPy27 [ + functools32 + ]; + + checkInputs = [ + pytestCheckHook + ]; - checkPhase = '' - py.test + postPatch = '' + substituteInPlace setup.py \ + --replace "'pytest-runner'," "" ''; + disabledTests = [ + # Test are out-dated and are failing (AssertionError: Lists differ: ...) + # https://github.com/scrapy/parsel/pull/174 + "test_differences_parsing_xml_vs_html" + "test_nested_selectors" + "test_re" + "test_replacement_null_char_from_body" + "test_select_on_text_nodes" + "test_selector_get_alias" + "test_selector_getall_alias" + "test_selector_over_text" + "test_selectorlist_get_alias" + "test_selectorlist_getall_alias" + "test_slicing" + "test_text_pseudo_element" + ]; + + pythonImportsCheck = [ "parsel" ]; + meta = with lib; { homepage = "https://github.com/scrapy/parsel"; - description = "Parsel is a library to extract data from HTML and XML using XPath and CSS selectors"; + description = "Python library to extract data from HTML and XML using XPath and CSS selectors"; license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; }; - } diff --git a/nixpkgs/pkgs/development/python-modules/pdunehd/default.nix b/nixpkgs/pkgs/development/python-modules/pdunehd/default.nix new file mode 100644 index 000000000000..63eca0dab825 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pdunehd/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, requests +}: + +buildPythonPackage rec { + pname = "pdunehd"; + version = "1.3.2"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "valentinalexeev"; + repo = "pdunehd"; + rev = version; + sha256 = "06p0k82nf89rsakr8d2hdb19dp1wqp9bsf54lwb0qma47iakljjh"; + }; + + propagatedBuildInputs = [ + requests + ]; + + # no tests implemented + doCheck = false; + + pythonImportsCheck = [ "pdunehd" ]; + + meta = with lib; { + description = "Python wrapper for Dune HD media player API"; + homepage = "https://github.com/valentinalexeev/pdunehd"; + license = licenses.asl20; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pecan/default.nix b/nixpkgs/pkgs/development/python-modules/pecan/default.nix index d19fc1011347..d610561b3e6f 100644 --- a/nixpkgs/pkgs/development/python-modules/pecan/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pecan/default.nix @@ -1,5 +1,6 @@ { lib , fetchPypi +, fetchpatch , buildPythonPackage , isPy27 # Python deps @@ -28,6 +29,14 @@ buildPythonPackage rec { sha256 = "4b2acd6802a04b59e306d0a6ccf37701d24376f4dc044bbbafba3afdf9d3389a"; }; + patches = [ + (fetchpatch { + name = "Support-SQLAlchemy-1.4x.patch"; + url = "https://github.com/pecan/pecan/commit/a520bd544c0b02a02dbf692b8d6e2f7a503ee6d4.patch"; + sha256 = "sha256-QCHRjwnpy8ndCvcuyE5Y65BybKYthJXDySUtmpJD8gY="; + }) + ]; + propagatedBuildInputs = [ logutils Mako @@ -51,8 +60,9 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Pecan"; - homepage = "http://www.pecanpy.org/"; + description = "WSGI object-dispatching web framework, designed to be lean and fast"; + homepage = "https://www.pecanpy.org/"; changelog = "https://pecan.readthedocs.io/en/latest/changes.html"; + maintainers = with maintainers; [ applePrincess ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/plexapi/default.nix b/nixpkgs/pkgs/development/python-modules/plexapi/default.nix index dc832809c28f..5c41c3308bed 100644 --- a/nixpkgs/pkgs/development/python-modules/plexapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/plexapi/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , requests , tqdm -, websocket_client +, websocket-client , isPy27 }: @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests tqdm - websocket_client + websocket-client ]; # Tests require a running Plex instance diff --git a/nixpkgs/pkgs/development/python-modules/plugwise/default.nix b/nixpkgs/pkgs/development/python-modules/plugwise/default.nix index d62c2e8bb72b..299e2af2f958 100644 --- a/nixpkgs/pkgs/development/python-modules/plugwise/default.nix +++ b/nixpkgs/pkgs/development/python-modules/plugwise/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.9.4"; + version = "0.10.0"; src = fetchFromGitHub { owner = pname; repo = "python-plugwise"; rev = version; - sha256 = "sha256-5r+Xe3EKLjuR7mPGEPOKzhE7G6OzNEClf847Px9VdWU="; + sha256 = "sha256-M0Zwao8I8PRxxF9xvtzFeCFK9+eMlXYcWJarfHSGAlw="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pmsensor/default.nix b/nixpkgs/pkgs/development/python-modules/pmsensor/default.nix new file mode 100644 index 000000000000..1d64852f281e --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pmsensor/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyserial +}: + +buildPythonPackage rec { + pname = "pmsensor"; + version = "0.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "7fc03aafb791ca70d847c9ab97cf181bc7d8f7345efb4b0c3f66c07b9c7dee69"; + }; + + propagatedBuildInputs = [ + pyserial + ]; + + # no tests implemented + doCheck = false; + + pythonImportsCheck = [ + "pmsensor.co2sensor" + "pmsensor.serial_pm" + ]; + + meta = with lib; { + description = "Library to read data from environment sensors"; + homepage = "https://github.com/open-homeautomation/pmsensor"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/praw/6.3.nix b/nixpkgs/pkgs/development/python-modules/praw/6.3.nix index 3fc485c00ec2..242300949ecb 100644 --- a/nixpkgs/pkgs/development/python-modules/praw/6.3.nix +++ b/nixpkgs/pkgs/development/python-modules/praw/6.3.nix @@ -9,7 +9,7 @@ , pytest , requests-toolbelt , update_checker -, websocket_client +, websocket-client }: buildPythonPackage rec { @@ -31,7 +31,7 @@ buildPythonPackage rec { mock prawcore update_checker - websocket_client + websocket-client ]; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/praw/default.nix b/nixpkgs/pkgs/development/python-modules/praw/default.nix index 5047c1e88b0d..e104dbff4f62 100644 --- a/nixpkgs/pkgs/development/python-modules/praw/default.nix +++ b/nixpkgs/pkgs/development/python-modules/praw/default.nix @@ -9,25 +9,25 @@ , pytestCheckHook , requests-toolbelt , update_checker -, websocket_client +, websocket-client }: buildPythonPackage rec { pname = "praw"; - version = "7.2.0"; + version = "7.3.0"; src = fetchFromGitHub { owner = "praw-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/GV5ZhrJxeChcYwmH/9FsLceAYRSeTCDe4lMEwdTa8Y="; + sha256 = "0pj987v04y5askczlma2ilwllwfsg7p5mwhv0h1lcl1lg0fbsvn9"; }; propagatedBuildInputs = [ mock prawcore update_checker - websocket_client + websocket-client ]; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/prawcore/default.nix b/nixpkgs/pkgs/development/python-modules/prawcore/default.nix index 1e38f401a43d..129275b2987f 100644 --- a/nixpkgs/pkgs/development/python-modules/prawcore/default.nix +++ b/nixpkgs/pkgs/development/python-modules/prawcore/default.nix @@ -1,17 +1,25 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 +{ lib +, buildPythonPackage +, fetchPypi , requests -, testfixtures, mock, requests_toolbelt -, betamax, betamax-serializers, betamax-matchers, pytest +, testfixtures +, mock +, requests_toolbelt +, betamax +, betamax-serializers +, betamax-matchers +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "prawcore"; - version = "2.0.0"; - disabled = isPy27; # see https://github.com/praw-dev/prawcore/pull/101 + version = "2.2.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-tJjZtvVJkQBecn1SNcj0nqW6DJpteT+3Q7QPoInNNtE="; + sha256 = "08wiij1r3flpnqzdx8bf536yf7lqyhg9461aybhcykcw8nnjzr5x"; }; propagatedBuildInputs = [ @@ -25,18 +33,16 @@ buildPythonPackage rec { betamax-serializers betamax-matchers requests_toolbelt - pytest + pytestCheckHook ]; - checkPhase = '' - pytest - ''; + pythonImportsCheck = [ "prawcore" ]; meta = with lib; { description = "Low-level communication layer for PRAW"; homepage = "https://praw.readthedocs.org/"; - license = licenses.gpl3; + license = licenses.bsd2; platforms = platforms.all; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ fab ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pre-commit/default.nix b/nixpkgs/pkgs/development/python-modules/pre-commit/default.nix index 1b5af02dca0d..0cb853abf2de 100644 --- a/nixpkgs/pkgs/development/python-modules/pre-commit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pre-commit/default.nix @@ -1,11 +1,13 @@ -{ lib, fetchPypi, buildPythonPackage, pythonOlder +{ lib +, fetchPypi +, buildPythonPackage +, pythonOlder , aspy-yaml , cached-property , cfgv , identify , importlib-metadata , importlib-resources -, isPy27 , nodeenv , python , six @@ -15,13 +17,13 @@ buildPythonPackage rec { pname = "pre-commit"; - version = "2.11.0"; - disabled = isPy27; + version = "2.13.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit version; pname = "pre_commit"; - sha256 = "15f1chxrbmfcajk1ngk3jvf6jjbigb5dg66wnn7phmlywaawpy06"; + sha256 = "sha256-dklyxgaT3GaLqOhuspZU7DFEUBMQ9xmHQqdnvsOFo3g="; }; patches = [ @@ -53,6 +55,8 @@ buildPythonPackage rec { --subst-var-by nodeenv ${nodeenv} ''; + pythonImportsCheck = [ "pre_commit" ]; + meta = with lib; { description = "A framework for managing and maintaining multi-language pre-commit hooks"; homepage = "https://pre-commit.com/"; diff --git a/nixpkgs/pkgs/development/python-modules/pushbullet/default.nix b/nixpkgs/pkgs/development/python-modules/pushbullet/default.nix index 43cab7db6756..92338d92531b 100644 --- a/nixpkgs/pkgs/development/python-modules/pushbullet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pushbullet/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , requests -, websocket_client +, websocket-client , python_magic , cryptography , pytestCheckHook @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "917883e1af4a0c979ce46076b391e0243eb8fe0a81c086544bcfa10f53e5ae64"; }; - propagatedBuildInputs = [ cryptography requests websocket_client python_magic ]; + propagatedBuildInputs = [ cryptography requests websocket-client python_magic ]; preCheck = '' export PUSHBULLET_API_KEY="" diff --git a/nixpkgs/pkgs/development/python-modules/pyads/default.nix b/nixpkgs/pkgs/development/python-modules/pyads/default.nix index 37d3b31a365c..5b710b0da156 100644 --- a/nixpkgs/pkgs/development/python-modules/pyads/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyads/default.nix @@ -1,25 +1,37 @@ -{ adslib, buildPythonPackage, fetchFromGitHub, lib, pytestCheckHook, pytest -, pytestcov, pythonOlder }: +{ lib +, adslib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "pyads"; - version = "3.2.2"; - + version = "3.3.7"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "stlehmann"; repo = pname; rev = version; - sha256 = "1jd727pw0z73y4xhrykqkfcz1acrpy3rks58lr1y4yilfv11p6jb"; + sha256 = "sha256-h3c6z+dmrOc1Q7E8YVJZJD2FsxoxqQX5J92SEweIpto="; }; - buildInputs = [ adslib ]; + buildInputs = [ + adslib + ]; + patchPhase = '' substituteInPlace pyads/pyads_ex.py \ --replace "ctypes.CDLL(adslib)" "ctypes.CDLL(\"${adslib}/lib/adslib.so\")" ''; - checkInputs = [ pytestCheckHook pytest pytestcov ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "pyads" ]; meta = with lib; { description = "Python wrapper for TwinCAT ADS library"; diff --git a/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix b/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix index 3a375b8d284b..989433b499d3 100644 --- a/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix @@ -57,8 +57,8 @@ buildPythonPackage rec { meta = with lib; { description = "A cross-language development platform for in-memory data"; homepage = "https://arrow.apache.org/"; - license = lib.licenses.asl20; + license = licenses.asl20; platforms = platforms.unix; - maintainers = with lib.maintainers; [ veprbl ]; + maintainers = with maintainers; [ veprbl ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pyatag/default.nix b/nixpkgs/pkgs/development/python-modules/pyatag/default.nix new file mode 100644 index 000000000000..d2ed7d6ff34a --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyatag/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, isPy27 +, fetchFromGitHub +, aiohttp +}: + +buildPythonPackage rec { + pname = "pyatag"; + version = "0.3.5.3"; + + disabled = isPy27; + + src = fetchFromGitHub { + owner = "MatsNl"; + repo = "pyatag"; + rev = version; + sha256 = "00ly4injmgrj34p0lyx7cz2crgnfcijmzc0540gf7hpwha0marf6"; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + # no tests implemented + doCheck = false; + + pythonImportsCheck = [ + "pyatag" + "pyatag.discovery" + ]; + + meta = with lib; { + description = "Python module to talk to Atag One"; + homepage = "https://github.com/MatsNl/pyatag"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyathena/default.nix b/nixpkgs/pkgs/development/python-modules/pyathena/default.nix new file mode 100644 index 000000000000..c7a8599a048a --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyathena/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, sqlalchemy +, boto3 +, botocore +, pandas +, tenacity +}: + +buildPythonPackage rec { + pname = "pyathena"; + version = "2.3.0"; + + src = fetchPypi { + pname = "PyAthena"; + inherit version; + sha256 = "08fl653yayvqi991zvcai5ifcxwy9ip6xh0cr3lbimggjnjgwsl5"; + }; + + # Nearly all tests depend on a working AWS Athena instance, + # therefore deactivating them. + # https://github.com/laughingman7743/PyAthena/#testing + doCheck = false; + + propagatedBuildInputs = [ + boto3 + botocore + pandas + tenacity + ]; + + meta = with lib; { + homepage = "https://github.com/laughingman7743/PyAthena/"; + license = licenses.mit; + description = "Python DB API 2.0 (PEP 249) client for Amazon Athena"; + maintainers = with maintainers; [ turion ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix b/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix index ea6e85221776..12449d4fa2ba 100644 --- a/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix @@ -2,24 +2,26 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, aiohttp , oauthlib , requests , requests_oauthlib , freezegun +, pytest-asyncio , pytestCheckHook , requests-mock }: buildPythonPackage rec { pname = "pyatmo"; - version = "4.2.3"; + version = "5.0.1"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jabesq"; repo = "pyatmo"; rev = "v${version}"; - sha256 = "sha256-hbs+1x/pwv00dhm+1Yj1effddJZHDjs2K3oeBmdCY+k="; + sha256 = "0can9v602iqfn0l01fd7gr63qzvcngfm0qka4s1x0pldh6avxmfh"; }; postPatch = '' @@ -29,6 +31,7 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ + aiohttp oauthlib requests requests_oauthlib @@ -36,6 +39,7 @@ buildPythonPackage rec { checkInputs = [ freezegun + pytest-asyncio pytestCheckHook requests-mock ]; diff --git a/nixpkgs/pkgs/development/python-modules/pybids/default.nix b/nixpkgs/pkgs/development/python-modules/pybids/default.nix index 143f578b08d5..3ed34b4e73d7 100644 --- a/nixpkgs/pkgs/development/python-modules/pybids/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pybids/default.nix @@ -14,12 +14,12 @@ }: buildPythonPackage rec { - version = "0.13"; + version = "0.13.1"; pname = "pybids"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zVFaGAKgTP9UiUdmO4+Tut8Qc64xuGyB26cQLRHOqYw="; + sha256 = "sha256-ySDhVX4drotnFiXXDK+9woQ3uigistudpMJYenYl47o="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pycontrol4/default.nix b/nixpkgs/pkgs/development/python-modules/pycontrol4/default.nix new file mode 100644 index 000000000000..93f7dcdc0a23 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pycontrol4/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, aiohttp +, xmltodict +}: + +buildPythonPackage rec { + pname = "pycontrol4"; + version = "0.1.0"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "lawtancool"; + repo = "pyControl4"; + rev = "v${version}"; + sha256 = "0idw9kv6yxrbp0r33vb1jlzgil20m2rjjfrxhcwxmbjjqv93zn6d"; + }; + + propagatedBuildInputs = [ + aiohttp + xmltodict + ]; + + # tests access network + doCheck = false; + + pythonImportsCheck = [ + "pyControl4.account" + "pyControl4.alarm" + "pyControl4.director" + "pyControl4.light" + ]; + + meta = with lib; { + description = "Python 3 asyncio package for interacting with Control4 systems"; + homepage = "https://github.com/lawtancool/pyControl4"; + license = licenses.asl20; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pycoolmasternet-async/default.nix b/nixpkgs/pkgs/development/python-modules/pycoolmasternet-async/default.nix new file mode 100644 index 000000000000..45b40ddeadb9 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pycoolmasternet-async/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "pycoolmasternet-async"; + version = "0.1.2"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "OnFreund"; + repo = "pycoolmasternet-async"; + rev = "v${version}"; + sha256 = "0qzdk18iqrvin8p8zrydf69d6pii3j47j11h7ymmsx08gh7c176g"; + }; + + # no tests implemented + doCheck = false; + + pythonImportsCheck = [ "pycoolmasternet_async" ]; + + meta = with lib; { + description = "Python library to control CoolMasterNet HVAC bridges over asyncio"; + homepage = "https://github.com/OnFreund/pycoolmasternet-async"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pydaikin/default.nix b/nixpkgs/pkgs/development/python-modules/pydaikin/default.nix index 209ef3dbc235..9b2eda85abe5 100644 --- a/nixpkgs/pkgs/development/python-modules/pydaikin/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pydaikin/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pydaikin"; - version = "2.4.1"; + version = "2.4.3"; disabled = pythonOlder "3.6"; src = fetchFromBitbucket { owner = "mustang51"; repo = pname; rev = "v${version}"; - sha256 = "1624adp4lqd1n9flnf0wqrcibml2nd19ga3fmxzjg4x5z6767bs3"; + sha256 = "0i013ma2fs6an3izak6zbs9lbr4l7b5x54d0xagw6gqf5n8dsclq"; }; propagatedBuildInputs = [ @@ -28,6 +28,10 @@ buildPythonPackage rec { urllib3 ]; + # while they have tests, they do not run them in their CI and they fail as of 2.4.3 + # AttributeError: 'DaikinBRP069' object has no attribute 'last_hour_cool_energy_consumption' + doCheck = false; + checkInputs = [ freezegun pytest-aiohttp diff --git a/nixpkgs/pkgs/development/python-modules/pydes/default.nix b/nixpkgs/pkgs/development/python-modules/pydes/default.nix new file mode 100644 index 000000000000..78f131d42437 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pydes/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchFromGitHub }: + +buildPythonPackage rec { + pname = "pydes"; + version = "unstable-2019-01-08"; + + src = fetchFromGitHub { + owner = "twhiteman"; + repo = "pyDes"; + rev = "e988a5ffc9abb8010fc75dba54904d1c5dbe83db"; + sha256 = "0sic8wbyk5azb4d4m6zbc96lfqcw8s2pzcv9nric5yqc751613ww"; + }; + + checkPhase = "python test_pydes.py"; + + pythonImportsCheck = [ "pyDes" ]; + + meta = with lib; { + description = "A pure python module which implements the DES and Triple-DES encryption algorithms"; + homepage = "https://github.com/twhiteman/pyDes"; + license = licenses.mit; + maintainers = with maintainers; [ j0hax ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pydroid-ipcam/default.nix b/nixpkgs/pkgs/development/python-modules/pydroid-ipcam/default.nix index ca171edde44d..3d9b4188172b 100644 --- a/nixpkgs/pkgs/development/python-modules/pydroid-ipcam/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pydroid-ipcam/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pydroid-ipcam"; - version = "unstable-2021-04-16"; + version = "unstable-2021-06-01"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = pname; - rev = "9f22682c6f9182aa5e42762f52223337b8b6909c"; - sha256 = "1lvppyzmwg0fp8zch11j51an4sb074yl9shzanakvjmbqpnif6s6"; + rev = "3ca14ff178f3506a6a91d8736deea8f06e9ad1c1"; + sha256 = "0w81pl5fya17hg5xgba2vgxnylfd8jc70il575wdz2pw6z6ihj3s"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyfireservicerota/default.nix b/nixpkgs/pkgs/development/python-modules/pyfireservicerota/default.nix new file mode 100644 index 000000000000..9d917a480168 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyfireservicerota/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytz +, oauthlib +, requests +, websocket-client +}: + +buildPythonPackage rec { + pname = "pyfireservicerota"; + version = "0.0.40"; + + src = fetchPypi { + inherit pname version; + sha256 = "8d8173f6682ef2a61367660a15559c8c7a7e00db3f98092e0fa52e771df356f4"; + }; + + propagatedBuildInputs = [ + pytz + oauthlib + requests + websocket-client + ]; + + # no tests implemented + doCheck = false; + + pythonImportsCheck = [ "pyfireservicerota" ]; + + meta = with lib; { + description = "Python 3 API wrapper for FireServiceRota/BrandweerRooster"; + homepage = "https://github.com/cyberjunky/python-fireservicerota"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyflic/default.nix b/nixpkgs/pkgs/development/python-modules/pyflic/default.nix new file mode 100644 index 000000000000..ead4b33929d8 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyflic/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pyflic"; + version = "2.0.3"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "soldag"; + repo = pname; + rev = version; + sha256 = "0adf4k191138jmbsfhkhhbgaxcq97d1hr5w48ryxr1fig64sjqy2"; + }; + + # Projec thas no tests + doCheck = false; + + pythonImportsCheck = [ "pyflic" ]; + + meta = with lib; { + description = "Python module to interact with Flic buttons"; + homepage = "https://github.com/soldag/pyflic"; + license = with licenses; [ cc0 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyflick/default.nix b/nixpkgs/pkgs/development/python-modules/pyflick/default.nix new file mode 100644 index 000000000000..b1f39353c142 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyflick/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, aiohttp +, dateutil +}: + +buildPythonPackage rec { + pname = "pyflick"; + version = "0.0.2"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + pname = "PyFlick"; + inherit version; + sha256 = "705c82d8caedfff19117c8859cc1b4f56e15ab8dbc0d64d63b79d8634007897f"; + }; + + propagatedBuildInputs = [ + aiohttp + dateutil + ]; + + # no tests implemented + doCheck = false; + + pythonImportsCheck = [ + "pyflick" + "pyflick.authentication" + ]; + + meta = with lib; { + description = "Python API For Flick Electric in New Zealand"; + homepage = "https://github.com/ZephireNZ/PyFlick"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyheos/default.nix b/nixpkgs/pkgs/development/python-modules/pyheos/default.nix new file mode 100644 index 000000000000..715c609875e6 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyheos/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pyheos"; + version = "0.7.2"; + + src = fetchFromGitHub { + owner = "andrewsayre"; + repo = "pyheos"; + rev = version; + sha256 = "0rgzg7lnqzzqrjp73c1hj1hq8p0j0msyih3yr4wa2rj81s8ihmby"; + }; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + disabledTests = [ + # accesses network + "test_connect_timeout" + ]; + + pythonImportsCheck = [ "pyheos" ]; + + meta = with lib; { + description = "Async python library for controlling HEOS devices through the HEOS CLI Protocol"; + homepage = "https://github.com/andrewsayre/pyheos"; + license = licenses.asl20; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyhiveapi/default.nix b/nixpkgs/pkgs/development/python-modules/pyhiveapi/default.nix new file mode 100644 index 000000000000..96b361d02718 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyhiveapi/default.nix @@ -0,0 +1,63 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, unasync +, boto3 +, botocore +, requests +, aiohttp +, pyquery +, loguru +}: + +buildPythonPackage rec { + pname = "pyhiveapi"; + version = "0.4.2"; + + format = "pyproject"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "Pyhass"; + repo = "Pyhiveapi"; + rev = "v${version}"; + sha256 = "0x9cfxfdpccz360azpyfhvn09xxkw7vxy42npgbqhpy2g6mh5sif"; + }; + + postPatch = '' + substituteInPlace requirements.txt \ + --replace "pre-commit" "" + ''; + + nativeBuildInputs = [ + unasync + ]; + + propagatedBuildInputs = [ + boto3 + botocore + requests + aiohttp + pyquery + loguru + ]; + + # tests are not functional yet + doCheck = false; + + postBuild = '' + # pyhiveapi accesses $HOME upon importing + export HOME=$TMPDIR + ''; + + pythonImportsCheck = [ "pyhiveapi" ]; + + meta = with lib; { + description = "Python library to interface with the Hive API"; + homepage = "https://github.com/Pyhass/Pyhiveapi"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyialarm/default.nix b/nixpkgs/pkgs/development/python-modules/pyialarm/default.nix index 9603964ca481..312ef8a99657 100644 --- a/nixpkgs/pkgs/development/python-modules/pyialarm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyialarm/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyialarm"; - version = "1.8.1"; + version = "1.9.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "RyuzakiKK"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Hig1BlgZX2FBh+wx7qz9lmkBIFn/IHActf9FXDU6Yz8="; + sha256 = "sha256-mvi8cd9uVFvG1Jc3OeuEwuLjbuMjPRrNRHFUVe3g/NM="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyipma/default.nix b/nixpkgs/pkgs/development/python-modules/pyipma/default.nix new file mode 100644 index 000000000000..b34c4838cb8d --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyipma/default.nix @@ -0,0 +1,36 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchPypi +, geopy +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pyipma"; + version = "2.1.5"; + disabled = pythonOlder "3.7"; + + # Request for GitHub releases, https://github.com/dgomes/pyipma/issues/10 + src = fetchPypi { + inherit pname version; + sha256 = "0hq5dasqpsn64x2sf6a28hdmysygmcdq4in6s08w97jfvwc6xmym"; + }; + + propagatedBuildInputs = [ + aiohttp + geopy + ]; + + # Project has no tests included in the PyPI releases + doCheck = false; + + pythonImportsCheck = [ "pyipma" ]; + + meta = with lib; { + description = "Python library to retrieve information from Instituto Português do Mar e Atmosfera"; + homepage = "https://github.com/dgomes/pyipma"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pykdl/default.nix b/nixpkgs/pkgs/development/python-modules/pykdl/default.nix index 9a0431b2b859..0d7e82be63f3 100644 --- a/nixpkgs/pkgs/development/python-modules/pykdl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pykdl/default.nix @@ -1,24 +1,20 @@ -{ lib, stdenv, toPythonModule, fetchpatch, cmake, orocos-kdl, python, sip_4 }: +{ lib, stdenv, toPythonModule, cmake, orocos-kdl, eigen, python }: toPythonModule (stdenv.mkDerivation { pname = "pykdl"; inherit (orocos-kdl) version src; - patches = [ - # Fix build with SIP 4.19.23+. Can be removed with version 1.5. - # https://github.com/orocos/orocos_kinematics_dynamics/pull/270 - (fetchpatch { - url = "https://github.com/orocos/orocos_kinematics_dynamics/commit/d8d087ad0e1c41f3489d1a255ebfa27b5695196b.patch"; - sha256 = "0qyskqxv4a982kidzzyh34xj2iiw791ipbbl29jg4qb4l21xwqlg"; - stripLen = 1; - }) - ]; - sourceRoot = "source/python_orocos_kdl"; + # Fix hardcoded installation path + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace dist-packages site-packages + ''; + nativeBuildInputs = [ cmake ]; - buildInputs = [ orocos-kdl ]; - propagatedBuildInputs = [ python sip_4 ]; + buildInputs = [ orocos-kdl eigen ]; + propagatedBuildInputs = [ python ]; meta = with lib; { description = "Kinematics and Dynamics Library (Python bindings)"; diff --git a/nixpkgs/pkgs/development/python-modules/pykulersky/default.nix b/nixpkgs/pkgs/development/python-modules/pykulersky/default.nix new file mode 100644 index 000000000000..1afa50c9be3f --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pykulersky/default.nix @@ -0,0 +1,43 @@ +{ lib +, bleak +, buildPythonPackage +, click +, fetchFromGitHub +, pytest-asyncio +, pytest-mock +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pykulersky"; + version = "0.5.2"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "emlove"; + repo = pname; + rev = version; + sha256 = "1fzfixnl28rny7c3wr6gcdpqhyrz7z2aqq6qfwkxnkq2kqdbpmmg"; + }; + + propagatedBuildInputs = [ + bleak + click + ]; + + checkInputs = [ + pytest-asyncio + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "pykulersky" ]; + + meta = with lib; { + description = "Python module to control Brightech Kuler Sky Bluetooth LED devices"; + homepage = "https://github.com/emlove/pykulersky"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pymeteoclimatic/default.nix b/nixpkgs/pkgs/development/python-modules/pymeteoclimatic/default.nix new file mode 100644 index 000000000000..db150342a2a3 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pymeteoclimatic/default.nix @@ -0,0 +1,39 @@ +{ lib +, beautifulsoup4 +, buildPythonPackage +, fetchFromGitHub +, lxml +, pythonOlder +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pymeteoclimatic"; + version = "0.0.6"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "adrianmo"; + repo = pname; + rev = version; + sha256 = "0ys0d6jy7416gbsd0pqgvm5ygzn36pjdaklqi4q56vsb13zn7y0h"; + }; + + propagatedBuildInputs = [ + beautifulsoup4 + lxml + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "meteoclimatic" ]; + + meta = with lib; { + description = "Python wrapper around the Meteoclimatic service"; + homepage = "https://github.com/adrianmo/pymeteoclimatic"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pymfy/default.nix b/nixpkgs/pkgs/development/python-modules/pymfy/default.nix index 2c17c0a085d9..ab5b21e8881d 100644 --- a/nixpkgs/pkgs/development/python-modules/pymfy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymfy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pymfy"; - version = "0.10.1"; + version = "0.11.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tetienne"; repo = "somfy-open-api"; rev = "v${version}"; - sha256 = "sha256-xX7vNBQaYPdnsukFcQyEa2G1XIvf9ehADNXbLUUCRoU="; + sha256 = "0wpjwjmywfyqgwvfa5kwcjpaljc32qa088kk88nl9nqdvc31mzhv"; }; nativeBuildInputs = [ poetry-core ]; diff --git a/nixpkgs/pkgs/development/python-modules/pypca/default.nix b/nixpkgs/pkgs/development/python-modules/pypca/default.nix new file mode 100644 index 000000000000..86adb4e3e14a --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pypca/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, colorlog +, fetchPypi +, pythonOlder +, pyserial +}: + +buildPythonPackage rec { + pname = "pypca"; + version = "0.0.13"; + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0y0p2rm22x21mykipiv42fjc79b0969qsbhk3cqkrdnqwh5psbdl"; + }; + + propagatedBuildInputs = [ + colorlog + pyserial + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "pypca" ]; + + meta = with lib; { + description = "Python library for interacting with the PCA 301 smart plugs"; + homepage = "https://github.com/majuss/pypca"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pypinyin/default.nix b/nixpkgs/pkgs/development/python-modules/pypinyin/default.nix index 9615e07d7c74..edefbf16ca2d 100644 --- a/nixpkgs/pkgs/development/python-modules/pypinyin/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pypinyin/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pypinyin"; - version = "0.41.0"; + version = "0.42.0"; src = fetchFromGitHub { owner = "mozillazg"; repo = "python-pinyin"; rev = "v${version}"; - sha256 = "1s01dd5n6cgjg24dmji0abxkyvr1yi18lx4rpm9z54v0q3wkccg9"; + sha256 = "0i0ggizkgd809ylz74j1v5lfpyifz3wypj6f8l8fr5ad7a7r9s09"; }; postPatch = '' @@ -33,6 +33,6 @@ buildPythonPackage rec { homepage = "https://github.com/mozillazg/python-pinyin"; changelog = "https://github.com/mozillazg/python-pinyin/blob/master/CHANGELOG.rst"; license = licenses.mit; - maintainers = with maintainers; [ hexa mic92 ]; + maintainers = teams.tts.members; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pyro4/default.nix b/nixpkgs/pkgs/development/python-modules/pyro4/default.nix index 626560d89b6d..3de7afd9668d 100644 --- a/nixpkgs/pkgs/development/python-modules/pyro4/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyro4/default.nix @@ -7,7 +7,6 @@ , cloudpickle , msgpack , isPy27 -, selectors34 , pytestCheckHook }: @@ -15,6 +14,8 @@ buildPythonPackage rec { pname = "Pyro4"; version = "4.80"; + disabled = isPy27; + src = fetchPypi { inherit pname version; sha256 = "46847ca703de3f483fbd0b2d22622f36eff03e6ef7ec7704d4ecaa3964cb2220"; @@ -22,7 +23,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ serpent - ] ++ lib.optionals isPy27 [ selectors34 ]; + ]; buildInputs = [ dill diff --git a/nixpkgs/pkgs/development/python-modules/pyrogram/default.nix b/nixpkgs/pkgs/development/python-modules/pyrogram/default.nix new file mode 100644 index 000000000000..6710d3d286e6 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyrogram/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, pyaes +, pysocks +, async-lru +, pytestCheckHook +, pytest-asyncio +}: + +buildPythonPackage rec { + pname = "pyrogram"; + version = "1.2.0"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "pyrogram"; + repo = "pyrogram"; + rev = "v${version}"; + sha256 = "0clbnhk1icr4vl29693r6r28f5by5n6pjxjqih21g3yd64q55q3q"; + }; + + propagatedBuildInputs = [ + pyaes + pysocks + async-lru + ]; + + checkInputs = [ + pytestCheckHook + pytest-asyncio + ]; + + pythonImportsCheck = [ + "pyrogram" + "pyrogram.errors" + "pyrogram.types" + ]; + + meta = with lib; { + description = "Telegram MTProto API Client Library and Framework for Python"; + homepage = "https://github.com/pyrogram/pyrogram"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pysbd/default.nix b/nixpkgs/pkgs/development/python-modules/pysbd/default.nix index e1e0578c83b8..f25283dbbbcc 100644 --- a/nixpkgs/pkgs/development/python-modules/pysbd/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysbd/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { description = "Pysbd (Python Sentence Boundary Disambiguation) is a rule-based sentence boundary detection that works out-of-the-box across many languages"; homepage = "https://github.com/nipunsadvilkar/pySBD"; license = licenses.mit; - maintainers = [ maintainers.mic92 ]; + maintainers = teams.tts.members; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pysc2/default.nix b/nixpkgs/pkgs/development/python-modules/pysc2/default.nix index d02c85fb4ffd..9d0bef8e19dc 100644 --- a/nixpkgs/pkgs/development/python-modules/pysc2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysc2/default.nix @@ -12,7 +12,7 @@ , pygame , s2clientprotocol , six -, websocket_client +, websocket-client , sc2-headless }: @@ -49,7 +49,7 @@ buildPythonPackage { pygame s2clientprotocol six - websocket_client + websocket-client sc2-headless ]; diff --git a/nixpkgs/pkgs/development/python-modules/pysml/default.nix b/nixpkgs/pkgs/development/python-modules/pysml/default.nix new file mode 100644 index 000000000000..1f08eb14180c --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pysml/default.nix @@ -0,0 +1,37 @@ +{ lib +, async-timeout +, bitstring +, buildPythonPackage +, fetchFromGitHub +, pyserial-asyncio +}: + +buildPythonPackage rec { + pname = "pysml"; + version = "0.0.5"; + + src = fetchFromGitHub { + owner = "mtdcr"; + repo = pname; + rev = version; + sha256 = "05zgrk49b2y5jflxnjww2kqg1flynl3j4ifm0jr28nk0li5wg2bs"; + }; + + propagatedBuildInputs = [ + async-timeout + bitstring + pyserial-asyncio + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "sml" ]; + + meta = with lib; { + description = "Python library for EDL21 smart meters using Smart Message Language (SML)"; + homepage = "https://github.com/mtdcr/pysml"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pysonos/default.nix b/nixpkgs/pkgs/development/python-modules/pysonos/default.nix index cdd5291af99d..63dbe7625351 100644 --- a/nixpkgs/pkgs/development/python-modules/pysonos/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysonos/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pysonos"; - version = "0.0.50"; + version = "0.0.51"; disabled = !isPy3k; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "amelchio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iyFdT+RH2dtMtD+jSLFuAVE1DIQn6k9ONLOXNFhpuHs="; + sha256 = "sha256-MjsbqrH4SWnnwGe9BVHaValoQEiaaZVhFdn6MDoEyZs="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pytenable/default.nix b/nixpkgs/pkgs/development/python-modules/pytenable/default.nix index 39d1116f0bb3..2482e4230961 100644 --- a/nixpkgs/pkgs/development/python-modules/pytenable/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytenable/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "pytenable"; - version = "1.2.8"; + version = "1.3.0"; src = fetchFromGitHub { owner = "tenable"; repo = "pyTenable"; rev = version; - sha256 = "12x0w1c4blm73ixv07w90jkydl7d8dx5l27ih9vc1yv9v2zzb53k"; + sha256 = "sha256-APwBC1fL5JtYL5E/pabQpwGD1OtFMNPeWi/b9+hbhBE="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pytest-sanic/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-sanic/default.nix index 81e189c22c57..3cea788643ca 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-sanic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-sanic/default.nix @@ -21,7 +21,9 @@ buildPythonPackage rec { sha256 = "sha256-OtyulpSHUWERtcIRT5j3YtHciIxFiIFYKqtlEd1NSFw="; }; - buildInputs = [ pytest ]; + buildInputs = [ + pytest + ]; propagatedBuildInputs = [ aiohttp @@ -36,6 +38,12 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + # https://github.com/yunstanford/pytest-sanic/issues/55 + substituteInPlace setup.py \ + --replace "websockets>=8.1,<9.0" "websockets>=9.1,<10.0" + ''; + disabledTests = [ # https://github.com/yunstanford/pytest-sanic/issues/51 "test_fixture_sanic_client_get" diff --git a/nixpkgs/pkgs/development/python-modules/pytest-subprocess/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-subprocess/default.nix index aeacd084eec1..83afef929244 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-subprocess/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-subprocess/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pytest-subprocess"; - version = "1.1.0"; + version = "1.1.1"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "aklajnert"; repo = "pytest-subprocess"; rev = version; - sha256 = "sha256-r6WNDdvZAHMG1kPtLJlCwvhbVG1gC1NEvRfta+Chxnk="; + sha256 = "sha256-o8wDZhNHGPV1BQ5Zi2kFNlWq5w0cqebaJUhUUwTK6So="; }; buildInputs = [ @@ -31,10 +31,6 @@ buildPythonPackage rec { pygments ]; - disabledTests = [ - "test_multiple_wait" # https://github.com/aklajnert/pytest-subprocess/issues/36 - ]; - meta = with lib; { description = "A plugin to fake subprocess for pytest"; homepage = "https://github.com/aklajnert/pytest-subprocess"; diff --git a/nixpkgs/pkgs/development/python-modules/python-ecobee-api/default.nix b/nixpkgs/pkgs/development/python-modules/python-ecobee-api/default.nix new file mode 100644 index 000000000000..dc35c0c022fb --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/python-ecobee-api/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +}: + +buildPythonPackage rec { + pname = "python-ecobee-api"; + version = "0.2.13"; + + src = fetchPypi { + inherit pname version; + sha256 = "7c39f5aac854a2fb8fb33f41b351769a92ff784bc6112e7a5c1b9e1949a0fefe"; + }; + + propagatedBuildInputs = [ + requests + ]; + + # no tests implemented + doCheck = false; + + pythonImportsCheck = [ "pyecobee" ]; + + meta = with lib; { + description = "Python API for talking to Ecobee thermostats"; + homepage = "https://github.com/nkgilley/python-ecobee-api"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/python-engineio/3.nix b/nixpkgs/pkgs/development/python-modules/python-engineio/3.nix index 5deeec0bb573..f113f47802b7 100644 --- a/nixpkgs/pkgs/development/python-modules/python-engineio/3.nix +++ b/nixpkgs/pkgs/development/python-modules/python-engineio/3.nix @@ -10,7 +10,7 @@ , requests , six , tornado -, websocket_client +, websocket-client , websockets , pytestCheckHook , pythonAtLeast @@ -37,7 +37,7 @@ buildPythonPackage rec { mock requests tornado - websocket_client + websocket-client websockets pytestCheckHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix b/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix index ed03d9663076..486484bca3ae 100644 --- a/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix @@ -9,7 +9,7 @@ , requests , six , tornado -, websocket_client +, websocket-client , websockets , pytestCheckHook }: @@ -31,7 +31,7 @@ buildPythonPackage rec { mock requests tornado - websocket_client + websocket-client websockets pytestCheckHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix b/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix index b3cb9aaff633..4d7f7a289cb5 100644 --- a/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "2.7.1"; + version = "2.8.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0z4amj5xhx5zc3h2m0zrkardm3z5ba9qpjx5n6dczyz77r527yg1"; + sha256 = "0081jgjgqi4mqpr436ivw2q571hxi3hv2pa8d0z0nfl13s6lldpk"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-igraph/default.nix b/nixpkgs/pkgs/development/python-modules/python-igraph/default.nix index d196cf6e7478..ce5073ed087e 100644 --- a/nixpkgs/pkgs/development/python-modules/python-igraph/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-igraph/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "python-igraph"; - version = "0.9.4"; + version = "0.9.6"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "igraph"; repo = "python-igraph"; rev = version; - sha256 = "sha256-0iqYzeqVJwBqDL7AllrNaI5c7fmtrVwWpinCnO+ACzo="; + sha256 = "sha256-x/BUlMmSgjY2v6bVKPxmz86OCz6xgRUcfSqI3vV9MPs="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-mpv-jsonipc/default.nix b/nixpkgs/pkgs/development/python-modules/python-mpv-jsonipc/default.nix index 82ee7e209241..8c43d7a4ca27 100644 --- a/nixpkgs/pkgs/development/python-modules/python-mpv-jsonipc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-mpv-jsonipc/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, requests -, tqdm, websocket_client, pythonOlder }: +, tqdm, websocket-client, pythonOlder }: buildPythonPackage rec { pname = "python-mpv-jsonipc"; @@ -16,7 +16,7 @@ buildPythonPackage rec { # 'mpv-jsonipc' does not have any tests doCheck = false; - propagatedBuildInputs = [ requests tqdm websocket_client ]; + propagatedBuildInputs = [ requests tqdm websocket-client ]; pythonImportsCheck = [ "python_mpv_jsonipc" ]; diff --git a/nixpkgs/pkgs/development/python-modules/python-redis-lock/default.nix b/nixpkgs/pkgs/development/python-modules/python-redis-lock/default.nix index 49113dfad5ef..bd8933be824c 100644 --- a/nixpkgs/pkgs/development/python-modules/python-redis-lock/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-redis-lock/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , redis @@ -30,6 +31,10 @@ buildPythonPackage rec { disabledTests = [ # https://github.com/ionelmc/python-redis-lock/issues/86 "test_no_overlap2" + ] ++ lib.optionals stdenv.isDarwin [ + # fail on Darwin because it defaults to multiprocessing `spawn` + "test_reset_signalizes" + "test_reset_all_signalizes" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/python-smarttub/default.nix b/nixpkgs/pkgs/development/python-modules/python-smarttub/default.nix index 380b1738964b..0d7a15aec918 100644 --- a/nixpkgs/pkgs/development/python-modules/python-smarttub/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-smarttub/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "python-smarttub"; - version = "0.0.24"; + version = "0.0.25"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "mdz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XWZbfPNZ1cPsDwtJRuOwIPTHmNBMzFSYHDDcbBrXjtk="; + sha256 = "13yf75vmn15g2hrbiv78mws96qbk40p5pz7vc6ljyp41y2lc9wpm"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pytibber/default.nix b/nixpkgs/pkgs/development/python-modules/pytibber/default.nix new file mode 100644 index 000000000000..a8814b1e783e --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pytibber/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, aiohttp +, async-timeout +, graphql-subscription-manager +, python-dateutil +, pytz +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pytibber"; + version = "0.17.1"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Danielhiversen"; + repo = "pyTibber"; + rev = version; + sha256 = "1zda9cvg6hy0n7sr2z71lkyl93n1gnzxrvf56lhz13pcsffshhdk"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + graphql-subscription-manager + python-dateutil + pytz + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ "test/test.py" ]; + + # tests access network + doCheck = false; + + pythonImportsCheck = [ "tibber" ]; + + meta = with lib; { + description = "A python3 library to communicate with Tibber"; + homepage = "https://github.com/Danielhiversen/pyTibber"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pytile/default.nix b/nixpkgs/pkgs/development/python-modules/pytile/default.nix index c1901a750864..0d269522e1a0 100644 --- a/nixpkgs/pkgs/development/python-modules/pytile/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytile/default.nix @@ -14,7 +14,6 @@ buildPythonPackage rec { pname = "pytile"; version = "5.2.1"; - disabled = pythonAtLeast "3.9"; src = fetchFromGitHub { owner = "bachya"; diff --git a/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix b/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix index 41af9502c0c9..288af6f7efca 100644 --- a/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix +++ b/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix @@ -18,7 +18,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "1.8.1"; + version = "1.9.0"; in buildPythonPackage { inherit version; diff --git a/nixpkgs/pkgs/development/python-modules/pytorch/binary-hashes.nix b/nixpkgs/pkgs/development/python-modules/pytorch/binary-hashes.nix index 4855d1357106..d6fbde19f0f3 100644 --- a/nixpkgs/pkgs/development/python-modules/pytorch/binary-hashes.nix +++ b/nixpkgs/pkgs/development/python-modules/pytorch/binary-hashes.nix @@ -2,16 +2,16 @@ version: { x86_64-linux-37 = { name = "torch-${version}-cp37-cp37m-linux_x86_64.whl"; url = "https://download.pytorch.org/whl/cu111/torch-${version}%2Bcu111-cp37-cp37m-linux_x86_64.whl"; - hash = "sha256-lxj066PiB+S88GqQnXKgd9RCiKkMk3mctx/eBieZjAk="; + hash = "sha256-GOTC4HpSxd+3V4LNPy3Ig1+IAhm3U+6s/gOkKxD4AJE="; }; x86_64-linux-38 = { name = "torch-${version}-cp38-cp38-linux_x86_64.whl"; url = "https://download.pytorch.org/whl/cu111/torch-${version}%2Bcu111-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-qvTQMLz4CQPgalzUyYwz6rm+ExyWlIzI+FSMQhxM4eM="; + hash = "sha256-29KiXQJWCRRn92+ZddBq3Q+zYIKavUxB5HL3HafO0gc="; }; x86_64-linux-39 = { name = "torch-${version}-cp39-cp39-linux_x86_64.whl"; url = "https://download.pytorch.org/whl/cu111/torch-${version}%2Bcu111-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-z0pzEiljU+E2x2SuOEAg86dmVY1iFZSDOCfoOAFhLQo="; + hash = "sha256-VCLRkELiF8KqlAMLFrP+TaW+m6jupG5+WdQKEQlVli0="; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pytorch/default.nix b/nixpkgs/pkgs/development/python-modules/pytorch/default.nix index 8fae54c84660..35eb79d8b2d3 100644 --- a/nixpkgs/pkgs/development/python-modules/pytorch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytorch/default.nix @@ -117,7 +117,7 @@ let in buildPythonPackage rec { pname = "pytorch"; # Don't forget to update pytorch-bin to the same version. - version = "1.8.1"; + version = "1.9.0"; disabled = !isPy3k; @@ -132,7 +132,7 @@ in buildPythonPackage rec { repo = "pytorch"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-HERbvmrfhWwH164GFHU/M0KbhVAuhI5sBZSxCZy8mRk="; + sha256 = "sha256-gZmEhV1zzfr/5T2uNfS+8knzyJIxnv2COWVyiAzU9jM="; }; patches = lib.optionals stdenv.isDarwin [ diff --git a/nixpkgs/pkgs/development/python-modules/pytube/default.nix b/nixpkgs/pkgs/development/python-modules/pytube/default.nix index 086c3a8671b1..6d7435d12cf6 100644 --- a/nixpkgs/pkgs/development/python-modules/pytube/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytube/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pytube"; - version = "10.8.3"; + version = "10.8.4"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "pytube"; repo = "pytube"; rev = "v${version}"; - sha256 = "sha256-U/TXA/0y5tsuj0q3kxacHk76wjYG6k8mPX5F3MpADmk="; + sha256 = "sha256-07roF/rHBvGv50XL5KBOsk2WFITAWDput+KNgfTtXlI="; }; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyvex/default.nix b/nixpkgs/pkgs/development/python-modules/pyvex/default.nix index cb0547dfe4ce..b2696b101b42 100644 --- a/nixpkgs/pkgs/development/python-modules/pyvex/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyvex/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.0.7912"; + version = "9.0.8021"; src = fetchPypi { inherit pname version; - sha256 = "sha256-KqTfu49Muicr5oJcXcoYpz3S7+0hk7dxbU7GMCDlJQA="; + sha256 = "sha256-Bx6A258LgmmRBbrwY2pgf0DXdMwh9QjaA4sVbxj+kBo="; }; postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/nixpkgs/pkgs/development/python-modules/pywemo/default.nix b/nixpkgs/pkgs/development/python-modules/pywemo/default.nix index 7448f1f7f2c7..ceb190fe753a 100644 --- a/nixpkgs/pkgs/development/python-modules/pywemo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pywemo/default.nix @@ -47,11 +47,6 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # https://github.com/NixOS/nixpkgs/issues/124165 - "test_bridge_getdevicestatus" - ]; - pythonImportsCheck = [ "pywemo" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/pyyaml-env-tag/default.nix b/nixpkgs/pkgs/development/python-modules/pyyaml-env-tag/default.nix new file mode 100644 index 000000000000..f81bbbd7acbf --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyyaml-env-tag/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, pyyaml +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pyyaml-env-tag"; + version = "0.1"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + pname = "pyyaml_env_tag"; + inherit version; + sha256 = "1nsva88jsmwn0cb9jnrfiz4dvs9xakkpgfii7g1xwkx1pmsjc2bh"; + }; + + propagatedBuildInputs = [ + pyyaml + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "yaml_env_tag" ]; + + meta = with lib; { + description = "Custom YAML tag for referencing environment variables"; + homepage = "https://github.com/waylan/pyyaml-env-tag"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/readlike/default.nix b/nixpkgs/pkgs/development/python-modules/readlike/default.nix new file mode 100644 index 000000000000..f2e3d11e7edd --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/readlike/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, python +}: + +buildPythonPackage rec { + pname = "readlike"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "jangler"; + repo = "readlike"; + rev = version; + sha256 = "1mw8j8ads8hqdbz42siwpffi4wi5s33z9g14a5c2i7vxp8m68qc1"; + }; + + checkPhase = '' + ${python.interpreter} -m unittest discover -s tests + ''; + + meta = with lib; { + description = "GNU Readline-like line editing module"; + homepage = "https://github.com/jangler/readlike"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/reparser/default.nix b/nixpkgs/pkgs/development/python-modules/reparser/default.nix new file mode 100644 index 000000000000..90d701a0e465 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/reparser/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, isPy27 +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "reparser"; + version = "1.4.3"; + + disabled = isPy27; + + src = fetchFromGitHub { + owner = "xmikos"; + repo = "reparser"; + rev = "v${version}"; + sha256 = "04v7h52wny0j2qj37501nk33j0s4amm134kagdicx2is49zylzq1"; + }; + + # no tests implemented + doCheck = false; + + pythonImportsCheck = [ "reparser" ]; + + meta = with lib; { + description = "Simple regex-based lexer/parser for inline markup"; + homepage = "https://github.com/xmikos/reparser"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/restfly/default.nix b/nixpkgs/pkgs/development/python-modules/restfly/default.nix index b572b0a385d1..126ff8f22880 100644 --- a/nixpkgs/pkgs/development/python-modules/restfly/default.nix +++ b/nixpkgs/pkgs/development/python-modules/restfly/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "restfly"; - version = "1.3.5"; + version = "1.4.0"; src = fetchFromGitHub { owner = "stevemcgrath"; repo = pname; rev = version; - sha256 = "0cq07wj6g3kg7i4qyjp3n3pv13k9p4p43rd6kn139wsn1mh8fr56"; + sha256 = "0cmx15i57cxqw7naz8nkpqjckd6lpd2vszrkl82hvnajdimcd9wy"; }; propagatedBuildInputs = [ @@ -32,6 +32,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # Test requires network access + "test_session_ssl_error" + ]; + pythonImportsCheck = [ "restfly" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/pyroon/default.nix b/nixpkgs/pkgs/development/python-modules/roonapi/default.nix index c27c70be5895..677483e8823b 100644 --- a/nixpkgs/pkgs/development/python-modules/pyroon/default.nix +++ b/nixpkgs/pkgs/development/python-modules/roonapi/default.nix @@ -7,18 +7,18 @@ , pythonOlder , requests , six -, websocket_client +, websocket-client }: buildPythonPackage rec { - pname = "pyroon"; + pname = "roonapi"; version = "0.0.37"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pavoni"; - repo = pname; + repo = "pyroon"; rev = version; sha256 = "1hxr473z9h3kb91m3ygina58pfwfyjsv1yb29spxmnbzvk34rzzz"; }; @@ -31,7 +31,7 @@ buildPythonPackage rec { ifaddr requests six - websocket_client + websocket-client ]; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/runway-python/default.nix b/nixpkgs/pkgs/development/python-modules/runway-python/default.nix index 9244a94d2357..c47054632c6f 100644 --- a/nixpkgs/pkgs/development/python-modules/runway-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/runway-python/default.nix @@ -21,7 +21,7 @@ , deepdiff , pytestCheckHook , pytestcov -, websocket_client +, websocket-client }: buildPythonPackage rec { @@ -62,7 +62,7 @@ buildPythonPackage rec { deepdiff pytestCheckHook pytestcov - websocket_client + websocket-client ]; disabledTests = [ diff --git a/nixpkgs/pkgs/development/python-modules/ruyaml/default.nix b/nixpkgs/pkgs/development/python-modules/ruyaml/default.nix new file mode 100644 index 000000000000..3b5a0d41283e --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/ruyaml/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, distro +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, setuptools-scm +, setuptools-scm-git-archive +}: + +buildPythonPackage rec { + pname = "ruyaml"; + version = "0.90.0.2"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "pycontribs"; + repo = pname; + rev = version; + sha256 = "0gxvwry7n1gczxkjzyfrr3fammllkvnnamja4yln8xrg3n1h89al"; + }; + + nativeBuildInputs = [ + setuptools-scm + setuptools-scm-git-archive + ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + propagatedBuildInputs = [ + distro + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "ruyaml" ]; + + meta = with lib; { + description = "YAML 1.2 loader/dumper package for Python"; + homepage = "https://ruyaml.readthedocs.io/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/s3transfer/default.nix b/nixpkgs/pkgs/development/python-modules/s3transfer/default.nix index 0ef7378fbf67..e41e4165b9cb 100644 --- a/nixpkgs/pkgs/development/python-modules/s3transfer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/s3transfer/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "s3transfer"; - version = "0.3.6"; + version = "0.4.2"; src = fetchPypi { inherit pname version; - sha256 = "c5dadf598762899d8cfaecf68eba649cd25b0ce93b6c954b156aaa3eed160547"; + sha256 = "sha256-ywIvSxZVHt67sxo3fT8JYA262nNj2MXbeXbn9Hcy4bI="; }; propagatedBuildInputs = diff --git a/nixpkgs/pkgs/development/python-modules/samsungctl/default.nix b/nixpkgs/pkgs/development/python-modules/samsungctl/default.nix index d29e89db8462..174af9023512 100644 --- a/nixpkgs/pkgs/development/python-modules/samsungctl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/samsungctl/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, websocket_client +, websocket-client }: buildPythonPackage rec { @@ -12,7 +12,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - websocket_client + websocket-client ]; # no tests diff --git a/nixpkgs/pkgs/development/python-modules/samsungtvws/default.nix b/nixpkgs/pkgs/development/python-modules/samsungtvws/default.nix index 3a12568c4d6d..31fa56a34726 100644 --- a/nixpkgs/pkgs/development/python-modules/samsungtvws/default.nix +++ b/nixpkgs/pkgs/development/python-modules/samsungtvws/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, isPy27 , requests -, websocket_client +, websocket-client }: buildPythonPackage rec { @@ -14,7 +14,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - websocket_client + websocket-client requests ]; diff --git a/nixpkgs/pkgs/development/python-modules/sanic-testing/default.nix b/nixpkgs/pkgs/development/python-modules/sanic-testing/default.nix index e5194e36bd23..71af4a0a1170 100644 --- a/nixpkgs/pkgs/development/python-modules/sanic-testing/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sanic-testing/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook -, httpcore , httpx , pytest-asyncio , sanic @@ -11,30 +10,38 @@ buildPythonPackage rec { pname = "sanic-testing"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "sanic-org"; repo = "sanic-testing"; rev = "v${version}"; - hash = "sha256-hBAq+/BKs0a01M89Nb8HaClqxB+W5PTfjVzef/m9SWs="; + sha256 = "0li984imqmqc001iw4m4b6cqik3d9nb4b3yvamvbwkb6hgd94sck"; }; + propagatedBuildInputs = [ + httpx + sanic + websockets + ]; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + postPatch = '' + # https://github.com/sanic-org/sanic-testing/issues/19 substituteInPlace setup.py \ - --replace 'httpx>=0.16, <0.18' 'httpx' \ - --replace 'httpcore==0.12.*' 'httpcore' + --replace '"websockets==8.1",' '"websockets>=9.1",' ''; - propagatedBuildInputs = [ httpx sanic websockets httpcore ]; - # `sanic` is explicitly set to null when building `sanic` itself # to prevent infinite recursion. In that case we skip running # the package at all. doCheck = sanic != null; dontUsePythonImportsCheck = sanic == null; - checkInputs = [ pytestCheckHook pytest-asyncio ]; pythonImportsCheck = [ "sanic_testing" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/sanic/default.nix b/nixpkgs/pkgs/development/python-modules/sanic/default.nix index 5f610f6feab0..cc7be4c93dc6 100644 --- a/nixpkgs/pkgs/development/python-modules/sanic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sanic/default.nix @@ -1,24 +1,52 @@ -{ lib, buildPythonPackage, fetchPypi, doCheck ? true -, aiofiles, httptools, multidict, sanic-routing, ujson, uvloop, websockets -, pytestCheckHook, beautifulsoup4, gunicorn, uvicorn, sanic-testing -, pytest-benchmark, pytest-sanic, pytest-sugar, pytestcov +{ lib +, aiofiles +, beautifulsoup4 +, buildPythonPackage +, doCheck ? true +, fetchFromGitHub +, fetchpatch +, gunicorn +, httptools +, multidict +, pytest-asyncio +, pytest-benchmark +, pytest-sanic +, pytest-sugar +, pytestCheckHook +, sanic-routing +, sanic-testing +, ujson +, uvicorn +, uvloop +, websockets }: buildPythonPackage rec { pname = "sanic"; version = "21.3.4"; - src = fetchPypi { - inherit pname version; - sha256 = "1cbd12b9138b3ca69656286b0be91fff02b826e8cb72dd76a2ca8c5eb1288d8e"; + src = fetchFromGitHub { + owner = "sanic-org"; + repo = pname; + rev = "v${version}"; + sha256 = "0vldlic8gqcf56fqb31igycqf11syd9csk66v34w6dim54lcny2b"; }; + patches = [ + # Allow later websockets release, https://github.com/sanic-org/sanic/pull/2154 + (fetchpatch { + name = "later-websockets.patch"; + url = "https://github.com/sanic-org/sanic/commit/5fb820b5c1ce395e86a1ee11996790c65ec7bc65.patch"; + sha256 = "1glvq23pf1sxqjnrz0w8rr7nsnyz82k1479b3rm8szfkjg9q5d1w"; + }) + ]; + postPatch = '' # Loosen dependency requirements. substituteInPlace setup.py \ --replace '"pytest==5.2.1"' '"pytest"' \ --replace '"gunicorn==20.0.4"' '"gunicorn"' \ - --replace '"pytest-sanic",' "" + --replace '"pytest-sanic",' "" \ # Patch a request headers test to allow brotli encoding # (we build httpx with brotli support, upstream doesn't). substituteInPlace tests/test_headers.py \ @@ -26,25 +54,36 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - sanic-routing httptools uvloop ujson aiofiles websockets multidict + aiofiles + httptools + multidict + sanic-routing + ujson + uvloop + websockets ]; checkInputs = [ - sanic-testing gunicorn pytestcov beautifulsoup4 pytest-sanic pytest-sugar - pytest-benchmark pytestCheckHook uvicorn + beautifulsoup4 + gunicorn + pytest-asyncio + pytest-benchmark + pytest-sanic + pytest-sugar + pytestCheckHook + sanic-testing + uvicorn ]; inherit doCheck; disabledTests = [ - # No "examples" directory in pypi distribution - "test_gunicorn" - "test_zero_downtime" - # flaky + # Tests are flaky "test_keep_alive_client_timeout" "test_check_timeouts_request_timeout" "test_check_timeouts_response_timeout" "test_reloader_live" + "test_zero_downtime" ]; __darwinAllowLocalNetworking = true; @@ -52,7 +91,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "sanic" ]; meta = with lib; { - description = "A microframework based on uvloop, httptools, and learnings of flask"; + description = "Web server and web framework"; homepage = "https://github.com/sanic-org/sanic/"; license = licenses.mit; maintainers = with maintainers; [ costrouc AluisioASG ]; diff --git a/nixpkgs/pkgs/development/python-modules/scrapy/default.nix b/nixpkgs/pkgs/development/python-modules/scrapy/default.nix index 08a3a5967329..4ca073106586 100644 --- a/nixpkgs/pkgs/development/python-modules/scrapy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scrapy/default.nix @@ -1,64 +1,89 @@ { lib , stdenv +, botocore , buildPythonPackage -, isPy27 -, fetchPypi +, cryptography +, cssselect +, fetchFromGitHub +, fetchpatch , glibcLocales +, installShellFiles +, itemadapter +, itemloaders +, jmespath +, lxml +, parsel +, pillow +, protego +, pydispatcher +, pyopenssl +, pytest-twisted , pytestCheckHook +, pythonOlder +, queuelib +, service-identity +, sybil , testfixtures -, pillow , twisted -, cryptography , w3lib -, lxml -, queuelib -, pyopenssl -, service-identity -, parsel -, pydispatcher -, cssselect , zope_interface -, protego -, jmespath -, sybil -, pytest-twisted -, botocore -, itemadapter -, itemloaders }: buildPythonPackage rec { - version = "2.4.1"; - pname = "Scrapy"; + pname = "scrapy"; + version = "2.5.0"; + disabled = pythonOlder "3.6"; - disabled = isPy27; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "09lxnjz1cw37i9bgk8sci2xxknj20gi2lq8l7i0b3xw7q8bxzp7h"; + }; - checkInputs = [ - glibcLocales - jmespath - pytestCheckHook - sybil - testfixtures - pillow - pytest-twisted - botocore + nativeBuildInputs = [ + installShellFiles ]; propagatedBuildInputs = [ - twisted cryptography cssselect + itemadapter + itemloaders lxml parsel + protego pydispatcher pyopenssl queuelib service-identity + twisted w3lib zope_interface - protego - itemadapter - itemloaders + ]; + + checkInputs = [ + botocore + glibcLocales + jmespath + pytestCheckHook + sybil + testfixtures + ]; + + patches = [ + # Require setuptools, https://github.com/scrapy/scrapy/pull/5122 + (fetchpatch { + name = "add-setuptools.patch"; + url = "https://github.com/scrapy/scrapy/commit/4f500342c8ad4674b191e1fab0d1b2ac944d7d3e.patch"; + sha256 = "14030sfv1cf7dy4yww02b49mg39cfcg4bv7ys1iwycfqag3xcjda"; + }) + # Make Twisted[http2] installation optional, https://github.com/scrapy/scrapy/pull/5113 + (fetchpatch { + name = "remove-h2.patch"; + url = "https://github.com/scrapy/scrapy/commit/c5b1ee810167266fcd259f263dbfc0fe0204761a.patch"; + sha256 = "1gw28wg8qcb0al59rz214hm17smspi6j5kg62nr1r850pykyrsqk"; + }) ]; LC_ALL = "en_US.UTF-8"; @@ -68,39 +93,48 @@ buildPythonPackage rec { substituteInPlace pytest.ini --replace "--doctest-modules" "" ''; - pytestFlagsArray = [ - "--ignore=tests/test_proxy_connect.py" - "--ignore=tests/test_utils_display.py" - "--ignore=tests/test_command_check.py" + disabledTestPaths = [ + "tests/test_proxy_connect.py" + "tests/test_utils_display.py" + "tests/test_command_check.py" + # Don't test the documentation + "docs" ]; disabledTests = [ + # It's unclear if the failures are related to libxml2, https://github.com/NixOS/nixpkgs/pull/123890 + "test_nested_css" + "test_nested_xpath" + "test_flavor_detection" + # Requires network access "FTPFeedStorageTest" - "test_noconnect" - "test_retry_dns_error" + "FeedExportTest" "test_custom_asyncio_loop_enabled_true" "test_custom_loop_asyncio" + "test_custom_loop_asyncio_deferred_signal" "FileFeedStoragePreFeedOptionsTest" # https://github.com/scrapy/scrapy/issues/5157 ] ++ lib.optionals stdenv.isDarwin [ "test_xmliter_encoding" "test_download" ]; - src = fetchPypi { - inherit pname version; - sha256 = "68c48f01a58636bdf0f6fcd5035a19ecf277b58af24bd70c36dc6e556df3e005"; - }; - postInstall = '' - install -m 644 -D extras/scrapy.1 $out/share/man/man1/scrapy.1 + installManPage extras/scrapy.1 install -m 644 -D extras/scrapy_bash_completion $out/share/bash-completion/completions/scrapy install -m 644 -D extras/scrapy_zsh_completion $out/share/zsh/site-functions/_scrapy ''; + pythonImportsCheck = [ "scrapy" ]; + __darwinAllowLocalNetworking = true; meta = with lib; { - description = "A fast high-level web crawling and web scraping framework, used to crawl websites and extract structured data from their pages"; + description = "High-level web crawling and web scraping framework"; + longDescription = '' + Scrapy is a fast high-level web crawling and web scraping framework, used to crawl + websites and extract structured data from their pages. It can be used for a wide + range of purposes, from data mining to monitoring and automated testing. + ''; homepage = "https://scrapy.org/"; license = licenses.bsd3; maintainers = with maintainers; [ drewkett marsam ]; diff --git a/nixpkgs/pkgs/development/python-modules/secp256k1/default.nix b/nixpkgs/pkgs/development/python-modules/secp256k1/default.nix index 78ddb269f3db..bb5cc138a749 100644 --- a/nixpkgs/pkgs/development/python-modules/secp256k1/default.nix +++ b/nixpkgs/pkgs/development/python-modules/secp256k1/default.nix @@ -44,6 +44,6 @@ buildPythonPackage rec { homepage = "https://github.com/ludbb/secp256k1-py"; description = "Python FFI bindings for secp256k1"; license = with lib.licenses; [ mit ]; - maintainers = with lib.maintainers; [ chris-martin ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/selectors34/default.nix b/nixpkgs/pkgs/development/python-modules/selectors34/default.nix deleted file mode 100644 index 2209ccf43d26..000000000000 --- a/nixpkgs/pkgs/development/python-modules/selectors34/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, python -, six -}: - -buildPythonPackage rec { - pname = "selectors34"; - version = "1.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "09f5066337f8a76fb5233f267873f89a27a17c10bf79575954894bb71686451c"; - }; - - propagatedBuildInputs = [ six ]; - - checkPhase = '' - ${python.interpreter} setup.py test - ''; - - meta = with lib; { - description = "A backport of the selectors module from Python 3.4"; - homepage = "https://github.com/berkerpeksag/selectors34"; - license = licenses.psfl; - maintainers = with maintainers; [ prusnak ]; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/sense-energy/default.nix b/nixpkgs/pkgs/development/python-modules/sense-energy/default.nix new file mode 100644 index 000000000000..a3cd63d485ea --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/sense-energy/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, aiohttp +, requests +, websocket-client +, websockets +}: + +buildPythonPackage rec { + pname = "sense-energy"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "scottbonline"; + repo = "sense"; + rev = version; + sha256 = "1lbarsa9wpm7hnhgf2g253w0gs80cn989dnj4aqmic57x5isikhz"; + }; + + propagatedBuildInputs = [ + aiohttp + requests + websocket-client + websockets + ]; + + # no tests implemented + doCheck = false; + + pythonImportsCheck = [ "sense_energy" ]; + + meta = with lib; { + description = "API for the Sense Energy Monitor"; + homepage = "https://github.com/scottbonline/sense"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/simber/default.nix b/nixpkgs/pkgs/development/python-modules/simber/default.nix new file mode 100644 index 000000000000..d1471286bb84 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/simber/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchFromGitHub, colorama, pytestCheckHook }: + +buildPythonPackage rec { + pname = "simber"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "deepjyoti30"; + repo = pname; + rev = version; + sha256 = "0ksc2m61j5ijj0sq6kkc0hhkmfy9f51h9z3cl2sf8g6wbr9vc47h"; + }; + + propagatedBuildInputs = [ colorama ]; + + checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "simber" ]; + + meta = with lib; { + description = "Simple, minimal and powerful logger for Python"; + homepage = "https://github.com/deepjyoti30/simber"; + license = licenses.mit; + maintainers = with maintainers; [ j0hax ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix b/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix index 9592d37fed0a..3e2a90b496b6 100644 --- a/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix @@ -6,45 +6,37 @@ , fetchFromGitHub , poetry-core , pytest-asyncio -, pytest-cov , pytestCheckHook -, python-engineio -, python-socketio , pythonOlder , pytz , voluptuous -, websockets }: buildPythonPackage rec { pname = "simplisafe-python"; - version = "9.6.10"; + version = "10.0.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "bachya"; repo = pname; rev = version; - sha256 = "0cc5kxxishxhkg1nqmgbh36yxs8yjfynmimzjnaqkqfrs9iq46mr"; + sha256 = "sha256-VF8R+dty54GuWvYs/OqWhfGtOVieuxtfndQUxHhu5lc="; }; nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ aiohttp - python-engineio - python-socketio pytz voluptuous - websockets ]; checkInputs = [ aresponses asynctest pytest-asyncio - pytest-cov pytestCheckHook ]; @@ -52,6 +44,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "simplipy" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Python library the SimpliSafe API"; homepage = "https://simplisafe-python.readthedocs.io/"; diff --git a/nixpkgs/pkgs/development/python-modules/skytemple-files/default.nix b/nixpkgs/pkgs/development/python-modules/skytemple-files/default.nix index cb03d73b4270..0df6419b526a 100644 --- a/nixpkgs/pkgs/development/python-modules/skytemple-files/default.nix +++ b/nixpkgs/pkgs/development/python-modules/skytemple-files/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, appdirs, explorerscript, ndspy, pillow, setuptools, skytemple-rust, tilequant }: +{ lib, buildPythonPackage, fetchFromGitHub, appdirs, explorerscript, ndspy, pillow, setuptools, skytemple-rust, tilequant, armips, fetchpatch }: buildPythonPackage rec { pname = "skytemple-files"; @@ -8,9 +8,26 @@ buildPythonPackage rec { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "1vklg4kcj3kb9ryrzrcmywn131b2bp3vy94cd4x4y4s7hkhgwg74"; + sha256 = "sha256-/S0otBujwO/IMiLKgA2o8wlD6xk1/DpwOAfemojV9NU="; + fetchSubmodules = true; }; + patches = [ + # fix patching https://github.com/SkyTemple/skytemple-files/pull/128 + # merged, remove for next update + (fetchpatch { + url = "http://github.com/SkyTemple/skytemple-files/commit/71dd71e6abb7435405e30225e8a37592b990d692.patch"; + sha256 = "sha256-CSBaT+LVP9J0C1FlUCduTJroq9z2EAJG6lruvlHlQLI="; + }) + ]; + + postPatch = '' + substituteInPlace skytemple_files/patch/arm_patcher.py \ + --replace "exec_name = os.getenv('SKYTEMPLE_ARMIPS_EXEC', f'{prefix}armips')" "exec_name = \"${armips}/bin/armips\"" + ''; + + buildInputs = [ armips ]; + propagatedBuildInputs = [ appdirs explorerscript ndspy pillow setuptools skytemple-rust tilequant ]; doCheck = false; # requires Pokémon Mystery Dungeon ROM @@ -20,6 +37,6 @@ buildPythonPackage rec { homepage = "https://github.com/SkyTemple/skytemple-files"; description = "Python library to edit the ROM of Pokémon Mystery Dungeon Explorers of Sky"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ xfix ]; + maintainers = with maintainers; [ xfix marius851000 ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix b/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix index 9044ce19b5d8..1d884959831c 100644 --- a/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix @@ -15,20 +15,20 @@ , pytestCheckHook , pytestrunner , sqlalchemy -, websocket_client +, websocket-client , websockets }: buildPythonPackage rec { pname = "slack-sdk"; - version = "3.5.0"; + version = "3.6.0"; disabled = !isPy3k; src = fetchFromGitHub { owner = "slackapi"; repo = "python-slack-sdk"; rev = "v${version}"; - sha256 = "sha256-5ZBaF/6p/eOWjAmo+IlF9zCb9xBr2bP6suPZblRogUg="; + sha256 = "sha256-OSRz8yH1yrWhN2a6ir4nxsPahwg8oHfVlJ020Swlb+Q="; }; propagatedBuildInputs = [ @@ -36,7 +36,7 @@ buildPythonPackage rec { aiohttp boto3 sqlalchemy - websocket_client + websocket-client websockets ]; diff --git a/nixpkgs/pkgs/development/python-modules/slackclient/default.nix b/nixpkgs/pkgs/development/python-modules/slackclient/default.nix index cf7b161261ed..e96161228a52 100644 --- a/nixpkgs/pkgs/development/python-modules/slackclient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/slackclient/default.nix @@ -14,7 +14,7 @@ , requests , responses , six -, websocket_client +, websocket-client }: buildPythonPackage rec { @@ -32,7 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp - websocket_client + websocket-client requests six ]; diff --git a/nixpkgs/pkgs/development/python-modules/snitun/default.nix b/nixpkgs/pkgs/development/python-modules/snitun/default.nix index f93445a02b00..f09876eadb16 100644 --- a/nixpkgs/pkgs/development/python-modules/snitun/default.nix +++ b/nixpkgs/pkgs/development/python-modules/snitun/default.nix @@ -1,21 +1,35 @@ -{ lib, stdenv, buildPythonPackage, python, fetchFromGitHub -, attrs, cryptography, async-timeout, pytest-aiohttp, pytestCheckHook +{ lib +, stdenv +, async-timeout +, attrs +, buildPythonPackage +, cryptography +, fetchFromGitHub +, pytest-aiohttp +, pytestCheckHook }: buildPythonPackage rec { pname = "snitun"; - version = "0.21.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "NabuCasa"; repo = pname; rev = version; - sha256 = "sha256-oZHi/H9HOqGTFuhqPSZXntMzVJ3ZT4zNejezo0cDtqg="; + sha256 = "sha256-vx9F+Nat69Yadd+YpsnBCstnxCEICFJI14TdG6PvstI="; }; - propagatedBuildInputs = [ attrs cryptography async-timeout ]; + propagatedBuildInputs = [ + async-timeout + attrs + cryptography + ]; - checkInputs = [ pytestCheckHook pytest-aiohttp ]; + checkInputs = [ + pytest-aiohttp + pytestCheckHook + ]; disabledTests = lib.optionals stdenv.isDarwin [ "test_multiplexer_data_channel_abort_full" # https://github.com/NabuCasa/snitun/issues/61 @@ -26,10 +40,13 @@ buildPythonPackage rec { "test_peer_listener_timeout" ]; + pythonImportsCheck = [ "snitun" ]; + meta = with lib; { homepage = "https://github.com/nabucasa/snitun"; description = "SNI proxy with TCP multiplexer"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ Scriptkiddi ]; + platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/python-modules/spiderpy/default.nix b/nixpkgs/pkgs/development/python-modules/spiderpy/default.nix new file mode 100644 index 000000000000..166f821fb3ee --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/spiderpy/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, isPy27 +, fetchFromGitHub +, requests +}: + +buildPythonPackage rec { + pname = "spiderpy"; + version = "1.5.0"; + + disabled = isPy27; + + src = fetchFromGitHub { + owner = "peternijssen"; + repo = "spiderpy"; + rev = version; + sha256 = "1nbfjqwiyyl7lhkb4rvickxiy9nwynr2sxr1hpyv0vm09h6q8hsc"; + }; + + propagatedBuildInputs = [ + requests + ]; + + # no unit tests implemented + doCheck = false; + + pythonImportsCheck = [ "spiderpy.spiderapi" ]; + + meta = with lib; { + description = "Unofficial Python wrapper for the Spider API"; + homepage = "https://www.github.com/peternijssen/spiderpy"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix b/nixpkgs/pkgs/development/python-modules/sqlalchemy/1.3.nix index 5964e382084f..f0c9ce2bf736 100644 --- a/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sqlalchemy/1.3.nix @@ -24,12 +24,9 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytest_xdist mock ] ++ lib.optional (!isPy3k) pysqlite; - pytestFlagsArray = [ "-n auto" ]; - postInstall = '' sed -e 's:--max-worker-restart=5::g' -i setup.cfg ''; diff --git a/nixpkgs/pkgs/development/python-modules/sqlalchemy/1.4.nix b/nixpkgs/pkgs/development/python-modules/sqlalchemy/1.4.nix new file mode 100644 index 000000000000..5eb1a19c8917 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/sqlalchemy/1.4.nix @@ -0,0 +1,52 @@ +{ stdenv +, lib +, fetchPypi +, buildPythonPackage +, isPy3k +, pythonOlder +, greenlet +, importlib-metadata +, mock +, pysqlite ? null +, pytestCheckHook +, pytest_xdist +}: + +buildPythonPackage rec { + pname = "SQLAlchemy"; + version = "1.4.16"; + + src = fetchPypi { + inherit pname version; + sha256 = "15yl9frbxsq90hq5b8znqy34fg5kqdw1jjw933kz709rbpxw4lzd"; + }; + + propagatedBuildInputs = [ + greenlet + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; + + checkInputs = [ + pytestCheckHook + mock + ] ++ lib.optional (!isPy3k) pysqlite; + + postInstall = '' + sed -e 's:--max-worker-restart=5::g' -i setup.cfg + ''; + + dontUseSetuptoolsCheck = true; + + # disable mem-usage tests on mac, has trouble serializing pickle files + disabledTests = lib.optionals stdenv.isDarwin [ + "MemUsageWBackendTest" + "MemUsageTest" + ]; + + meta = with lib; { + homepage = "http://www.sqlalchemy.org/"; + description = "A Python SQL toolkit and Object Relational Mapper"; + license = licenses.mit; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/staticjinja/default.nix b/nixpkgs/pkgs/development/python-modules/staticjinja/default.nix index 1f9a63927bb3..0681218cd0a5 100644 --- a/nixpkgs/pkgs/development/python-modules/staticjinja/default.nix +++ b/nixpkgs/pkgs/development/python-modules/staticjinja/default.nix @@ -2,18 +2,19 @@ , fetchFromGitHub , buildPythonPackage , poetry -, isPy27 , docopt , easywatch , jinja2 , pytestCheckHook , pytest-check , markdown +, testVersion +, staticjinja }: buildPythonPackage rec { pname = "staticjinja"; - version = "2.0.0"; + version = "2.1.0"; format = "pyproject"; # No tests in pypi @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "staticjinja"; repo = pname; rev = version; - sha256 = "0z5y4l4sv4c7zmp6pj1ws3psq7i87xqbcmk648bmsa1d6prr1hil"; + sha256 = "sha256-VKsDvWEurBdckWbPG5hQLK3dzdM7XVbrp23fR5wp1xk="; }; nativeBuildInputs = [ @@ -45,6 +46,10 @@ buildPythonPackage rec { export PATH="$PATH:$out/bin"; ''; + passthru.tests.version = testVersion { + package = staticjinja; + }; + meta = with lib; { description = "A library and cli tool that makes it easy to build static sites using Jinja2"; homepage = "https://staticjinja.readthedocs.io/en/latest/"; diff --git a/nixpkgs/pkgs/development/python-modules/strictyaml/default.nix b/nixpkgs/pkgs/development/python-modules/strictyaml/default.nix index ddc497a64ab6..30028a9599cf 100644 --- a/nixpkgs/pkgs/development/python-modules/strictyaml/default.nix +++ b/nixpkgs/pkgs/development/python-modules/strictyaml/default.nix @@ -7,15 +7,20 @@ }: buildPythonPackage rec { - version = "1.3.2"; + version = "1.4.2"; pname = "strictyaml"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "637399fd80dccc95f5287b2606b74098b23c08031b7ec33c5afb314ccbf10948"; + sha256 = "sha256-3bTk6AfdUQybx/xQ/I0Tae1pbtXMktSUtedSuoJ2paI="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "ruamel.yaml==0.17.4" "ruamel.yaml" + ''; + propagatedBuildInputs = [ ruamel_yaml python-dateutil ]; # Library tested with external tool diff --git a/nixpkgs/pkgs/development/python-modules/stringtemplate/default.nix b/nixpkgs/pkgs/development/python-modules/stringtemplate/default.nix index 8bdb69a3074e..336a371c0714 100644 --- a/nixpkgs/pkgs/development/python-modules/stringtemplate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/stringtemplate/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildPythonPackage, antlr, isPy3k }: +{ lib, fetchurl, buildPythonPackage, antlr2, isPy3k }: buildPythonPackage rec { pname = "PyStringTemplate"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0lbib0l8c1q7i1j610rwcdagymr1idahrql4dkgnm5rzyg2vk3ml"; }; - propagatedBuildInputs = [ antlr ]; + propagatedBuildInputs = [ antlr2 ]; disabled = isPy3k; diff --git a/nixpkgs/pkgs/development/python-modules/systembridge/default.nix b/nixpkgs/pkgs/development/python-modules/systembridge/default.nix index 94d41b7b673b..2c7328c50d6f 100644 --- a/nixpkgs/pkgs/development/python-modules/systembridge/default.nix +++ b/nixpkgs/pkgs/development/python-modules/systembridge/default.nix @@ -1,22 +1,24 @@ { lib , aiohttp +, websockets , buildPythonPackage , fetchFromGitHub }: buildPythonPackage rec { pname = "systembridge"; - version = "1.1.1"; + version = "1.2.4"; src = fetchFromGitHub { owner = "timmo001"; repo = "system-bridge-connector-py"; rev = "v${version}"; - sha256 = "0vyfi7nyzkzsgg84n5wh4hzwvx6fybgqdzbabnsmvszb9sm1vlb2"; + sha256 = "sha256-dZOtvJXBXMKC+VOyQRMyaWAXg8lHjLcM2Zz9P0/ILT8="; }; propagatedBuildInputs = [ aiohttp + websockets ]; # Project has no tests diff --git a/nixpkgs/pkgs/development/python-modules/tgcrypto/default.nix b/nixpkgs/pkgs/development/python-modules/tgcrypto/default.nix new file mode 100644 index 000000000000..7fd62d7bcbe3 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/tgcrypto/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "tgcrypto"; + version = "1.2.2"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "pyrogram"; + repo = "tgcrypto"; + rev = "v${version}"; + sha256 = "1vyjycjb2n790371kf47qc0mkvd4bxmhh65cfxjsrcjpiri7shjf"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "tgcrypto" ]; + + meta = with lib; { + description = "Fast and Portable Telegram Crypto Library for Python"; + homepage = "https://github.com/pyrogram/tgcrypto"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/tqdm/default.nix b/nixpkgs/pkgs/development/python-modules/tqdm/default.nix index b941727189ea..fe16fb6ddecc 100644 --- a/nixpkgs/pkgs/development/python-modules/tqdm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tqdm/default.nix @@ -34,8 +34,8 @@ buildPythonPackage rec { rich tkinter ] ++ - # pandas is not supported on i686 - lib.optional (!stdenv.isi686) pandas; + # pandas is not supported on i686 or risc-v + lib.optional (!stdenv.isi686 && !stdenv.hostPlatform.isRiscV) pandas; # Remove performance testing. # Too sensitive for on Hydra. diff --git a/nixpkgs/pkgs/development/python-modules/tuyaha/default.nix b/nixpkgs/pkgs/development/python-modules/tuyaha/default.nix index a53124783d18..749ac4e19827 100644 --- a/nixpkgs/pkgs/development/python-modules/tuyaha/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tuyaha/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "tuyaha"; - version = "0.0.10"; + version = "0.0.11"; src = fetchFromGitHub { owner = "PaulAnnekov"; repo = pname; rev = version; - sha256 = "0n08mqrz76zv1cyqky6ibs6im1fqcywkiyvfmfabml0vzvr43awf"; + sha256 = "sha256-PTIw/2NRHHiqV6E5oj2pMeGq1uApevKfT2n5zV8AQmM="; }; propagatedBuildInputs = [ requests ]; diff --git a/nixpkgs/pkgs/development/python-modules/typed-ast/default.nix b/nixpkgs/pkgs/development/python-modules/typed-ast/default.nix index 608ce8b65fea..d5c190e1c41f 100644 --- a/nixpkgs/pkgs/development/python-modules/typed-ast/default.nix +++ b/nixpkgs/pkgs/development/python-modules/typed-ast/default.nix @@ -1,20 +1,40 @@ -{ buildPythonPackage, fetchFromGitHub, lib, pythonOlder }: +{ buildPythonPackage, fetchFromGitHub, lib, pythonOlder, pytest }: buildPythonPackage rec { pname = "typed-ast"; - version = "1.4.1"; - src = fetchFromGitHub{ + version = "1.4.3"; + src = fetchFromGitHub { owner = "python"; repo = "typed_ast"; rev = version; - sha256 = "086r9qhls6mz1w72a6d1ld3m4fbkxklf6mgwbs8wpw0zlxjm7y40"; + sha256 = "16mn9snwik5n2ib65sw2xcaqdm02j8ps21zgjxf8kyy7qnx2mx4w"; }; # Only works with Python 3.3 and newer; disabled = pythonOlder "3.3"; - # No tests in archive - doCheck = false; + + pythonImportsCheck = [ + "typed_ast" + "typed_ast.ast27" + "typed_ast.ast3" + "typed_ast.conversions" + ]; + + checkInputs = [ + pytest + ]; + checkPhase = '' + runHook preCheck + + # We can't use pytestCheckHook because that invokes pytest with python -m pytest + # which adds the current directory to sys.path at the beginning. + # _That_ version of the typed_ast module doesn't have the C extensions we need. + pytest + + runHook postCheck + ''; + meta = { - homepage = "https://pypi.python.org/pypi/typed-ast"; - description = "a fork of Python 2 and 3 ast modules with type comment support"; + homepage = "https://github.com/python/typed_ast"; + description = "Python 2 and 3 ast modules with type comment support"; license = lib.licenses.asl20; }; } diff --git a/nixpkgs/pkgs/development/python-modules/typing-inspect/default.nix b/nixpkgs/pkgs/development/python-modules/typing-inspect/default.nix index 569096cb466c..4f09d6002d5c 100644 --- a/nixpkgs/pkgs/development/python-modules/typing-inspect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/typing-inspect/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "typing-inspect"; - version = "0.6.0"; + version = "0.7.1"; src = fetchPypi { inherit version; pname = "typing_inspect"; - sha256 = "1dzs9a1pr23dhbvmnvms2jv7l7jk26023g5ysf0zvnq8b791s6wg"; + sha256 = "1al2lyi3r189r5xgw90shbxvd88ic4si9w7n3d9lczxiv6bl0z84"; }; propagatedBuildInputs = [ @@ -26,6 +26,5 @@ buildPythonPackage rec { homepage = "https://github.com/ilevkivskyi/typing_inspect"; license = licenses.mit; maintainers = with maintainers; [ albakham ]; - broken = isPy39; # see https://github.com/ilevkivskyi/typing_inspect/issues/65 }; } diff --git a/nixpkgs/pkgs/development/python-modules/unasync/default.nix b/nixpkgs/pkgs/development/python-modules/unasync/default.nix new file mode 100644 index 000000000000..9b37edfb2841 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/unasync/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "unasync"; + version = "0.5.0"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "python-trio"; + repo = "unasync"; + rev = "v${version}"; + sha256 = "0h86i09v4909a8nk5lp36jlwz6rsln6vyg3d0i13ykxa6lrx1c2l"; + }; + + propagatedBuildInputs = [ + setuptools + ]; + + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # mess with $PYTHONPATH + "test_build_py_modules" + "test_build_py_packages" + "test_project_structure_after_build_py_packages" + "test_project_structure_after_customized_build_py_packages" + ]; + + pythonImportsCheck = [ "unasync" ]; + + meta = with lib; { + description = "Project that can transform your asynchronous code into synchronous code"; + homepage = "https://github.com/python-trio/unasync"; + license = with licenses; [ mit /* or */ asl20 ]; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/unidic-lite/default.nix b/nixpkgs/pkgs/development/python-modules/unidic-lite/default.nix new file mode 100644 index 000000000000..eec9c7022a0d --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/unidic-lite/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "unidic-lite"; + version = "1.0.8"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "0idj4yp0sl27ylr2wzkybbh0wj7c843lp7cljw5d1m7xv5r4b7fv"; + }; + + # no tests + doCheck = false; + + pythonImportsCheck = [ + "unidic_lite" + ]; + + meta = with lib; { + description = "A small version of UniDic"; + homepage = "https://github.com/polm/unidic-lite"; + license = licenses.mit; + maintainers = teams.tts.members; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/uvloop/default.nix b/nixpkgs/pkgs/development/python-modules/uvloop/default.nix index 125850a080f3..a762ec55ee36 100644 --- a/nixpkgs/pkgs/development/python-modules/uvloop/default.nix +++ b/nixpkgs/pkgs/development/python-modules/uvloop/default.nix @@ -48,6 +48,9 @@ buildPythonPackage rec { # test gets stuck in epoll_pwait on hydras aarch64 builders # https://github.com/MagicStack/uvloop/issues/412 "--deselect" "tests/test_tcp.py::Test_AIO_TCPSSL::test_remote_shutdown_receives_trailing_data" + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + # Flaky test: https://github.com/MagicStack/uvloop/issues/412 + "--deselect" "tests/test_tcp.py::Test_UV_TCPSSL::test_shutdown_timeout_handler_not_set" ]; disabledTestPaths = [ diff --git a/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix b/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix index eb720c7f2066..1dd80b52d19b 100644 --- a/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , fetchpatch -, isPy27 +, pythonOlder , click , click-log , click-threading @@ -18,21 +18,23 @@ }: buildPythonPackage rec { - version = "0.16.8"; + version = "0.18.0"; pname = "vdirsyncer"; - disabled = isPy27; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "bfdb422f52e1d4d60bd0635d203fb59fa7f613397d079661eb48e79464ba13c5"; + sha256 = "sha256-J7w+1R93STX7ujkpFcjI1M9jmuUaRLZ0aGtJoQJfwgE="; }; propagatedBuildInputs = [ - click click-log click-threading - requests_toolbelt + atomicwrites + click + click-log + click-threading requests requests_oauthlib # required for google oauth sync - atomicwrites + requests_toolbelt ]; nativeBuildInputs = [ @@ -46,16 +48,8 @@ buildPythonPackage rec { pytest-subtesthack ]; - patches = [ - (fetchpatch { - name = "update-usage-deprecated-method.patch"; - url = "https://github.com/pimutils/vdirsyncer/commit/7577fa21177442aacc2d86640ef28cebf1c4aaef.patch"; - sha256 = "0inkr1wfal20kssij8l5myhpjivxg8wlvhppqc3lvml9d1i75qbh"; - }) - ]; - postPatch = '' - substituteInPlace setup.py --replace "click>=5.0,<6.0" "click" + sed -i -e '/--cov/d' -e '/--no-cov/d' setup.cfg ''; preCheck = '' @@ -63,8 +57,9 @@ buildPythonPackage rec { ''; disabledTests = [ - "test_verbosity" "test_create_collections" # Flaky test exceeds deadline on hydra: https://github.com/pimutils/vdirsyncer/issues/837 + "test_request_ssl" + "test_verbosity" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/venstarcolortouch/default.nix b/nixpkgs/pkgs/development/python-modules/venstarcolortouch/default.nix index 713059ad9083..85634d168498 100644 --- a/nixpkgs/pkgs/development/python-modules/venstarcolortouch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/venstarcolortouch/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "venstarcolortouch"; - version = "0.13"; + version = "0.14"; src = fetchPypi { inherit pname version; - sha256 = "04y9gmxb0vsmc5c930x9ziis5v83b29kfzsgjlww3pssj69lmw1s"; + sha256 = "sha256-wrsu1SffD4/RvDiE6yABfZN/oSDH8Ao/RJK7yL2QKy8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/vincenty/default.nix b/nixpkgs/pkgs/development/python-modules/vincenty/default.nix new file mode 100644 index 000000000000..dbf174bd2a72 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/vincenty/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "vincenty"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "maurycyp"; + repo = "vincenty"; + rev = version; + sha256 = "1li8gv0zb1pdbxdybgaykm38lqbkb5dr7rph6zs1k4k3sh15ldw3"; + }; + + # no tests implemented + doCheck = false; + + pythonImportsCheck = [ "vincenty" ]; + + meta = with lib; { + description = "Calculate the geographical distance between 2 points with extreme accuracy"; + homepage = "https://github.com/maurycyp/vincenty"; + license = licenses.unlicense; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/wallbox/default.nix b/nixpkgs/pkgs/development/python-modules/wallbox/default.nix new file mode 100644 index 000000000000..c892ea3f88cd --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/wallbox/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, requests +, simplejson +}: + +buildPythonPackage rec { + pname = "wallbox"; + version = "0.4.5"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "cf1616d79cb0345849ceff1b89a7c80e26ae19b3c2d818def62d6975665838c1"; + }; + + propagatedBuildInputs = [ + requests + simplejson + ]; + + # no tests implemented + doCheck = false; + + pythonImportsCheck = [ "wallbox" ]; + + meta = with lib; { + description = "Module for interacting with Wallbox EV charger api"; + homepage = "https://github.com/cliviu74/wallbox"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/wasmer/default.nix b/nixpkgs/pkgs/development/python-modules/wasmer/default.nix index 373e7a0a2203..d3881032af13 100644 --- a/nixpkgs/pkgs/development/python-modules/wasmer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/wasmer/default.nix @@ -1,13 +1,14 @@ { lib +, stdenv , rustPlatform , fetchFromGitHub , buildPythonPackage +, libiconv }: -let + +buildPythonPackage rec { pname = "wasmer"; version = "1.0.0"; -in buildPythonPackage rec { - inherit pname version; src = fetchFromGitHub { owner = "wasmerio"; @@ -26,6 +27,8 @@ in buildPythonPackage rec { nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildAndTestSubdir = "packages/api"; doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/waterfurnace/default.nix b/nixpkgs/pkgs/development/python-modules/waterfurnace/default.nix index a07c1e6333e8..526066f1fa74 100644 --- a/nixpkgs/pkgs/development/python-modules/waterfurnace/default.nix +++ b/nixpkgs/pkgs/development/python-modules/waterfurnace/default.nix @@ -6,7 +6,7 @@ , pytest-runner , pytestCheckHook , requests -, websocket_client +, websocket-client }: buildPythonPackage rec { @@ -24,7 +24,7 @@ buildPythonPackage rec { click pytest-runner requests - websocket_client + websocket-client ]; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/websocket_client/default.nix b/nixpkgs/pkgs/development/python-modules/websocket-client/default.nix index 6ad0634631de..ee09ceb10504 100644 --- a/nixpkgs/pkgs/development/python-modules/websocket_client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/websocket-client/default.nix @@ -1,26 +1,22 @@ { lib -, backports_ssl_match_hostname , buildPythonPackage , fetchPypi -, isPy27 +, pythonOlder , pytestCheckHook -, six +, pysocks }: buildPythonPackage rec { - pname = "websocket_client"; - version = "0.58.0"; + pname = "websocket-client"; + version = "1.1.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Y1CbQdFYrlt/Z+tK0g/su07umUNOc+FANU3D/44JcW8="; + sha256 = "sha256-to5JWdcEdo+iDjXJ1QjI3Cu8BB/Y0mfA1zRc/+KCRWg="; }; - propagatedBuildInputs = [ - six - ] ++ lib.optional isPy27 backports_ssl_match_hostname; - - checkInputs = [ pytestCheckHook ]; + checkInputs = [ pytestCheckHook pysocks ]; pythonImportsCheck = [ "websocket" ]; @@ -29,5 +25,6 @@ buildPythonPackage rec { homepage = "https://github.com/websocket-client/websocket-client"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ fab ]; + changelog = "https://github.com/websocket-client/websocket-client/blob/v${version}/ChangeLog"; }; } diff --git a/nixpkgs/pkgs/development/python-modules/websockets/default.nix b/nixpkgs/pkgs/development/python-modules/websockets/default.nix index eeb12bd5b75b..51df6c70235d 100644 --- a/nixpkgs/pkgs/development/python-modules/websockets/default.nix +++ b/nixpkgs/pkgs/development/python-modules/websockets/default.nix @@ -1,37 +1,45 @@ { lib -, fetchFromGitHub , buildPythonPackage +, fetchFromGitHub +, python , pythonOlder -, pytest , stdenv }: buildPythonPackage rec { pname = "websockets"; - version = "8.1"; + version = "9.1"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "aaugustin"; repo = pname; rev = version; - sha256 = "05jbqcbjg50ydwl0fijhdlqcq7fl6v99kjva66kmmzzza7vwa872"; + sha256 = "sha256-7Y12IUG+ulD4+CTRlY+NE6qYZyI9gCPDydwpt+uyYZk="; }; - disabled = pythonOlder "3.3"; - # Tests fail on Darwin with `OSError: AF_UNIX path too long` doCheck = !stdenv.isDarwin; # Disable all tests that need to terminate within a predetermined amount of - # time. This is nondeterministic. + # time. This is nondeterministic. patchPhase = '' sed -i 's/with self.assertCompletesWithin.*:/if True:/' \ - tests/test_protocol.py + tests/legacy/test_protocol.py ''; + checkPhase = '' + runHook preCheck + ${python.interpreter} -m unittest discover + runHook postCheck + ''; + + pythonImportsCheck = [ "websockets" ]; + meta = with lib; { - description = "WebSocket implementation in Python 3"; - homepage = "https://github.com/aaugustin/websockets"; + description = "WebSocket implementation in Python"; + homepage = "https://websockets.readthedocs.io/"; license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/wled/default.nix b/nixpkgs/pkgs/development/python-modules/wled/default.nix index 92dbc210c6de..6f06c8dba90b 100644 --- a/nixpkgs/pkgs/development/python-modules/wled/default.nix +++ b/nixpkgs/pkgs/development/python-modules/wled/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , aiohttp , backoff +, poetry-core , packaging , yarl , aresponses @@ -13,16 +14,21 @@ buildPythonPackage rec { pname = "wled"; - version = "0.4.4"; - disabled = pythonOlder "3.7"; + version = "0.6.0"; + disabled = pythonOlder "3.8"; + format = "pyproject"; src = fetchFromGitHub { owner = "frenck"; repo = "python-wled"; rev = "v${version}"; - sha256 = "1adh23v4c9kia3ddqdq0brksd5rhgh4ff7l5hil8klx4dmkrjfz3"; + sha256 = "sha256-aFBcSGPCT49TbqzjUv/d8agdPOCC090rNxDnE9y91Pk="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ aiohttp backoff @@ -36,6 +42,13 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + # Upstream doesn't set a version for the pyproject.toml + substituteInPlace pyproject.toml \ + --replace "0.0.0" "${version}" \ + --replace "--cov" "" + ''; + pythonImportsCheck = [ "wled" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/xbox-webapi/default.nix b/nixpkgs/pkgs/development/python-modules/xbox-webapi/default.nix new file mode 100644 index 000000000000..b16a87e2fd64 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/xbox-webapi/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, aiohttp +, appdirs +, ecdsa +, ms-cv +, pydantic +, aresponses +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "xbox-webapi"; + version = "2.0.11"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "OpenXbox"; + repo = "xbox-webapi-python"; + rev = "v${version}"; + sha256 = "0li0bq914xizx9fj49s1iwfrv4bpzvl74bwsi5a34r9yizw02cvz"; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest-runner" "" + ''; + + propagatedBuildInputs = [ + aiohttp + appdirs + ecdsa + ms-cv + pydantic + ]; + + checkInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; + + meta = with lib; { + description = "Library to authenticate with Windows Live/Xbox Live and use their API"; + homepage = "https://github.com/OpenXbox/xbox-webapi-python"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/xknx/default.nix b/nixpkgs/pkgs/development/python-modules/xknx/default.nix index 2d565c0eac48..0a8da94e52eb 100644 --- a/nixpkgs/pkgs/development/python-modules/xknx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xknx/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "xknx"; - version = "0.18.3"; + version = "0.18.7"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "XKNX"; repo = pname; rev = version; - sha256 = "sha256-IXzmVAxxFOfU8ptixZLeyM64Fm1xSIlEDbR09f77JKM="; + sha256 = "17w6a4ci4w6ggxpa99197f84awd116ygzd3fa5cvn1a7221dvdj4"; }; propagatedBuildInputs = [ @@ -43,5 +43,6 @@ buildPythonPackage rec { homepage = "https://github.com/XKNX/xknx"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; + platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix b/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix index 7008814ba287..6c2118f391b4 100644 --- a/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix @@ -5,14 +5,14 @@ }: buildPythonPackage rec { - version = "1.6.2"; + version = "1.6.4"; pname = "xmlschema"; src = fetchFromGitHub { owner = "sissaschool"; repo = "xmlschema"; rev = "v${version}"; - sha256 = "sha256-GL2PlHxKDSEsZwHPBAy+tjBSbKyvlbXUWwXakKPmzSs="; + sha256 = "sha256-0KVGu163t3stCgx7aWW/Ggf6CUW2ZhOOnPU6FfGHfKA="; }; propagatedBuildInputs = [ elementpath ]; diff --git a/nixpkgs/pkgs/development/python-modules/xtensor-python/default.nix b/nixpkgs/pkgs/development/python-modules/xtensor-python/default.nix new file mode 100644 index 000000000000..7d973c0906e9 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/xtensor-python/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cmake +, gtest +, xtensor +, pybind11 +, numpy +}: + +buildPythonPackage rec { + pname = "xtensor-python"; + version = "0.25.1"; + + src = fetchFromGitHub { + owner = "xtensor-stack"; + repo = pname; + rev = version; + sha256 = "17la76hn4r1jv67dzz8x2pzl608r0mnvz854407mchlzj6rhsxza"; + }; + + nativeBuildInputs = [ cmake pybind11 ]; + + propagatedBuildInputs = [ xtensor numpy ]; + + dontUseSetuptoolsBuild = true; + dontUsePipInstall = true; + dontUseSetuptoolsCheck = true; + + checkInputs = [ + gtest + ]; + + meta = with lib; { + homepage = "https://github.com/xtensor-stack/xtensor-python"; + description = "Python bindings for the xtensor C++ multi-dimensional array library"; + license = licenses.bsd3; + maintainers = with maintainers; [ lsix ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/yamllint/default.nix b/nixpkgs/pkgs/development/python-modules/yamllint/default.nix index 2178e4d25791..832eb3f6b5b1 100644 --- a/nixpkgs/pkgs/development/python-modules/yamllint/default.nix +++ b/nixpkgs/pkgs/development/python-modules/yamllint/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "yamllint"; - version = "1.26.0"; + version = "1.26.1"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "11qhs1jk9pwvyk5k3q5blh9sq42dh1ywdf1f3i2zixf7hncwir5h"; + sha256 = "sha256-h9lGKz7X6d+hnKoXf3p3zZiIs9xARER9auCrIzvNEyQ="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/yangson/default.nix b/nixpkgs/pkgs/development/python-modules/yangson/default.nix index 44ac6cf9fe1e..1b63a94cb273 100644 --- a/nixpkgs/pkgs/development/python-modules/yangson/default.nix +++ b/nixpkgs/pkgs/development/python-modules/yangson/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "yangson"; - version = "1.4.8"; + version = "1.4.9"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "11w4aq0w2rnkz1axgmw003z2snd4kc49dil6kp1ajlqnfh1pcx8m"; + sha256 = "1qb8zssyj504yrj1jnkrzv65xlfv5bl14knan76pjzbpl0xpaq6z"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/youtube-search/default.nix b/nixpkgs/pkgs/development/python-modules/youtube-search/default.nix new file mode 100644 index 000000000000..41424aa56d2e --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/youtube-search/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchFromGitHub, requests }: + +buildPythonPackage rec { + pname = "youtube-search"; + version = "unstable-2021-02-27"; + + src = fetchFromGitHub { + owner = "joetats"; + repo = "youtube_search"; + rev = "886fe1b16c829215ee0984b6859f874b4a30d875"; + sha256 = "sha256-3ECJ6iHNzx5PLgpTFraFzAYbKnyMYRf/iJ0zajU+hlo="; + }; + + propagatedBuildInputs = [ requests ]; + + # Check disabled due to relative import with no known parent package + doCheck = false; + pythonImportsCheck = [ "youtube_search" ]; + + meta = with lib; { + description = "Tool for searching for youtube videos to avoid using their heavily rate-limited API"; + homepage = "https://github.com/joetats/youtube_search"; + license = licenses.mit; + maintainers = with maintainers; [ j0hax ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix b/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix index f11ff6bece47..2976c5e24bad 100644 --- a/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.25.0"; + version = "0.26.1"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = version; - sha256 = "sha256-frhmyla3neFVZILDy7HnKloMqNLRjm3gxS88xZdu29w="; + sha256 = "1rh6wim5hr9lygvgria7lr6x61sdyrv3drrrirgv9p9gl3rxcj6m"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/scheme-modules/scheme-bytestructures/default.nix b/nixpkgs/pkgs/development/scheme-modules/scheme-bytestructures/default.nix new file mode 100644 index 000000000000..67d9e39af62c --- /dev/null +++ b/nixpkgs/pkgs/development/scheme-modules/scheme-bytestructures/default.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitHub +, guile +, autoreconfHook +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "scheme-bytestructures"; + version = "1.0.10"; + + src = fetchFromGitHub { + owner = "TaylanUB"; + repo = pname; + rev = "v${version}"; + sha256 = "04oDvwvzTRzAVyywbcCm3Ug3p3xNbxjI7nOKYakEZZI="; + }; + + postConfigure = '' + sed -i '/moddir\s*=/s%=.*%=''${out}/share/guile/site%' Makefile; + sed -i '/godir\s*=/s%=.*%=''${out}/share/guile/ccache%' Makefile; + ''; + + nativeBuildInputs = [ + autoreconfHook pkg-config + ]; + buildInputs = [ + guile + ]; + + meta = with lib; { + description = "Structured access to bytevector contents"; + homepage = "https://github.com/TaylanUB/scheme-bytestructures"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ ethancedwards8 ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/tools/ammonite/default.nix b/nixpkgs/pkgs/development/tools/ammonite/default.nix index eb827882b752..680217acfbb8 100644 --- a/nixpkgs/pkgs/development/tools/ammonite/default.nix +++ b/nixpkgs/pkgs/development/tools/ammonite/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, jre, nixosTests, writeScript, common-updater-scripts, git -, nixfmt, nix, coreutils, gnused, disableRemoteLogging ? true }: +{ lib, stdenv, fetchurl, jre, nixosTests, writeScript, common-updater-scripts +, git, nixfmt, nix, coreutils, gnused, disableRemoteLogging ? true }: with lib; @@ -9,7 +9,7 @@ let common = { scalaVersion, sha256 }: stdenv.mkDerivation rec { pname = "ammonite"; - version = "2.3.8"; + version = "2.4.0"; src = fetchurl { url = @@ -75,10 +75,10 @@ let in { ammonite_2_12 = common { scalaVersion = "2.12"; - sha256 = "1kzk0437h2wd9jhwkvjkiaj6mscz4bh85iv266x9zz4zssb355hs"; + sha256 = "K8JII6SAmnBjMWQ9a3NqSLLuP1OLcbwobj3G+OCiLdA="; }; ammonite_2_13 = common { scalaVersion = "2.13"; - sha256 = "0js84m6yqjd7d77md38z6nk3qzlm1ms8brzczaw05zq2c90pdbz7"; + sha256 = "2F35qhWI6hNb+Eh9ZTDznqo116yN7MZIGVchaAIM36A="; }; } diff --git a/nixpkgs/pkgs/development/tools/analysis/brakeman/Gemfile b/nixpkgs/pkgs/development/tools/analysis/brakeman/Gemfile new file mode 100644 index 000000000000..1ff5490b0a77 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/analysis/brakeman/Gemfile @@ -0,0 +1,2 @@ +source "https://rubygems.org" +gem "brakeman" diff --git a/nixpkgs/pkgs/development/tools/analysis/brakeman/Gemfile.lock b/nixpkgs/pkgs/development/tools/analysis/brakeman/Gemfile.lock new file mode 100644 index 000000000000..13425cf9ee76 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/analysis/brakeman/Gemfile.lock @@ -0,0 +1,13 @@ +GEM + remote: https://rubygems.org/ + specs: + brakeman (5.0.4) + +PLATFORMS + ruby + +DEPENDENCIES + brakeman + +BUNDLED WITH + 2.1.4 diff --git a/nixpkgs/pkgs/development/tools/analysis/brakeman/default.nix b/nixpkgs/pkgs/development/tools/analysis/brakeman/default.nix index 3ac6b34f9488..72c4b1fbc3e3 100644 --- a/nixpkgs/pkgs/development/tools/analysis/brakeman/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/brakeman/default.nix @@ -1,11 +1,11 @@ -{ lib, ruby, buildRubyGem }: +{ lib, ruby, bundlerApp, bundlerUpdateScript }: -buildRubyGem rec { - inherit ruby; - name = "${gemName}-${version}"; - gemName = "brakeman"; - version = "5.0.0"; - source.sha256 = "0k1ynqsr9b0vnxqb7d5hbdk4q1i98zjzdnx4y1ylikz4rmkizf91"; +bundlerApp rec { + pname = "brakeman"; + exes = [ "brakeman" ]; + gemdir = ./.; + + passthru.updateScript = bundlerUpdateScript "brakeman"; meta = with lib; { description = "Static analysis security scanner for Ruby on Rails"; diff --git a/nixpkgs/pkgs/development/tools/analysis/brakeman/gemset.nix b/nixpkgs/pkgs/development/tools/analysis/brakeman/gemset.nix new file mode 100644 index 000000000000..f37158353e00 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/analysis/brakeman/gemset.nix @@ -0,0 +1,12 @@ +{ + brakeman = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1czqmrqbli2cnw4vv4pzz8bk78c7lpcnnyba74cj632swv1za6jd"; + type = "gem"; + }; + version = "5.0.4"; + }; +} diff --git a/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix b/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix index ae95157a8e5e..11c2178b6987 100644 --- a/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "8.42"; + version = "8.43"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "sha256-SYLr6qQp/kHzviwzCaXEnYTHHuH3j5ZzRLi8gs8xAao="; + sha256 = "sha256-jb864Kr5Hx/e2OIRYPLJGkRIsxT/cebLnOGGy1YtJY8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/analysis/dotenv-linter/default.nix b/nixpkgs/pkgs/development/tools/analysis/dotenv-linter/default.nix index f477da365d75..51e43555d5ea 100644 --- a/nixpkgs/pkgs/development/tools/analysis/dotenv-linter/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/dotenv-linter/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "dotenv-linter"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "dotenv-linter"; repo = "dotenv-linter"; rev = "v${version}"; - sha256 = "sha256-3Lj5GtWGyWDkZPhxYQu7UWzmh7TO5wk1UJ0lek1jTto="; + sha256 = "sha256-hhaMI2Z97aT/8FxxtWpn+o3BSo26iyBP+ucpO3x4AbQ="; }; - cargoSha256 = "sha256-FDkxJuZPzDrgLJgefkRUPS+0Ys3DaBOD3XAuS/Z6TtI="; + cargoSha256 = "sha256-F9Xyg8/qp0j0+jyd5EVe2idocubzu+Cj6yAwrHuabvM="; meta = with lib; { description = "Lightning-fast linter for .env files. Written in Rust"; diff --git a/nixpkgs/pkgs/development/tools/analysis/flow/default.nix b/nixpkgs/pkgs/development/tools/analysis/flow/default.nix index ea1aee669c54..df571a1ce433 100644 --- a/nixpkgs/pkgs/development/tools/analysis/flow/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.152.0"; + version = "0.153.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "1af9z6xah3rk99pv984nikkpq8jzl5r0fccb1gdhmi7y5a6y6g1m"; + sha256 = "sha256-KaDgrr1DY7DGxFvSOzbO04Y8Z3LkmvJcPwfFWa/UlMs="; }; installPhase = '' diff --git a/nixpkgs/pkgs/development/tools/analysis/nix-linter/default.nix b/nixpkgs/pkgs/development/tools/analysis/nix-linter/default.nix index 279a69327fa6..f01886c883bc 100644 --- a/nixpkgs/pkgs/development/tools/analysis/nix-linter/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/nix-linter/default.nix @@ -17,18 +17,17 @@ , containers , hnix , bytestring -, fetchpatch }: mkDerivation rec { pname = "nix-linter-unstable"; - version = "2020-09-25"; + version = "2021-06-16"; src = fetchFromGitHub { owner = "Synthetica9"; repo = "nix-linter"; - rev = "2516a8cda41f9bb553a1c3eca38e3dd94ebf53de"; - sha256 = "07mn2c9v67wsm57jlxv9pqac9hahw4618vngmj2sfbgihx8997kb"; + rev = "74707ed48dcc58dbfa27ae25ee0e044c072cc344"; + sha256 = "17scghkinpx3pzlw3hw023ybnd8cy7bqfy8b48vwaq8a7bnm2rs3"; }; isLibrary = false; @@ -37,14 +36,6 @@ mkDerivation rec { executableHaskellDepends = [ streamly mtl path pretty-terminal text base aeson cmdargs containers hnix bytestring path-io ]; testHaskellDepends = [ tasty tasty-hunit tasty-th ]; - patches = [ - # Fix compatibility with hnix≥0.13.0 https://github.com/Synthetica9/nix-linter/pull/51 - (fetchpatch { - url = "https://github.com/Synthetica9/nix-linter/commit/f73acacd8623dc25c9a35f8e04e4ff33cc596af8.patch"; - sha256 = "139fm21hdg3vcw8hv35kxj4awd52bjqbb76mpzx191hzi9plj8qc"; - }) - ]; - description = "Linter for Nix(pkgs), based on hnix"; homepage = "https://github.com/Synthetica9/nix-linter"; license = lib.licenses.bsd3; diff --git a/nixpkgs/pkgs/development/tools/analysis/qcachegrind/default.nix b/nixpkgs/pkgs/development/tools/analysis/qcachegrind/default.nix index 75729d1eea47..1f7c6641b1cc 100644 --- a/nixpkgs/pkgs/development/tools/analysis/qcachegrind/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/qcachegrind/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, qmake, qtbase, perl, python, php, kcachegrind }: +{ lib, stdenv, qmake, qtbase, perl, python, php, kcachegrind, wrapQtAppsHook }: let name = lib.replaceStrings ["kcachegrind"] ["qcachegrind"] kcachegrind.name; @@ -10,7 +10,7 @@ in stdenv.mkDerivation { buildInputs = [ qtbase perl python php ]; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ qmake wrapQtAppsHook ]; dontWrapQtApps = true; @@ -33,9 +33,13 @@ in stdenv.mkDerivation { install -Dm644 kcachegrind/48-apps-kcachegrind.png "$out/share/icons/hicolor/48x48/apps/kcachegrind.png" ''); + preFixup = '' + wrapQtApp "$out/bin/qcachegrind" + ''; + meta = with lib; { description = "A Qt GUI to visualize profiling data"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ periklis ]; }; diff --git a/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix b/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix index f51f0f9368d1..a8e7c10ce44f 100644 --- a/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "radare2"; - version = "5.3.0"; + version = "5.3.1"; src = fetchFromGitHub { owner = "radare"; repo = "radare2"; rev = version; - sha256 = "sha256-xndnRVlqTB/NH1ROo7xkftLP7DufsJu4CCA9MCOEeng="; + sha256 = "sha256-VS8eG5RXwKtJSLmyaSifopJU7WYGMUcznn+burPqEYE="; }; postInstall = '' diff --git a/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix b/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix index 137b3c2c1a1a..9666bf006d72 100644 --- a/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tflint"; - version = "0.29.0"; + version = "0.29.1"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "1ciwr2bwbxnw8366wvgl5ga3y2qj46i0h3yp3av1x9n2r8rddrlh"; + sha256 = "1pkz8y3da7i4a3nm79a0640xjj4wfkx3dz6614c4hynqn5svji82"; }; vendorSha256 = "0k8v49sr0jmljfl4fa5pnvzd5k3pg865h201114l6cs257sdkczk"; diff --git a/nixpkgs/pkgs/development/tools/azcopy/default.nix b/nixpkgs/pkgs/development/tools/azcopy/default.nix index 0be3f5c0b7ef..06bff61fcdd1 100644 --- a/nixpkgs/pkgs/development/tools/azcopy/default.nix +++ b/nixpkgs/pkgs/development/tools/azcopy/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "azure-storage-azcopy"; - version = "10.10.0"; + version = "10.11.0"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-azcopy"; rev = "v${version}"; - sha256 = "sha256-gWU219QlV+24RxnTHqQzQeGZHzVwmBXNKU+3QI6WvHI="; + sha256 = "sha256-mti93UDFgHQKJt3z1sjCkT71TZtwh2YnhTyUCi5tS5c="; }; subPackages = [ "." ]; - vendorSha256 = "sha256-d965Rt8W74bsIZAZPZLe3twuUpp4wrnNc0qwjsKikOE="; + vendorSha256 = "sha256-NEW1qXOxFPmDFUTciJkqwutZd3+sVkHgoZgQO8Gsdwk="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/buf/default.nix b/nixpkgs/pkgs/development/tools/buf/default.nix index 8d76b8925dc7..c1060744f449 100644 --- a/nixpkgs/pkgs/development/tools/buf/default.nix +++ b/nixpkgs/pkgs/development/tools/buf/default.nix @@ -2,30 +2,54 @@ , buildGoModule , fetchFromGitHub , protobuf +, git }: buildGoModule rec { pname = "buf"; - version = "0.41.0"; + version = "0.43.2"; src = fetchFromGitHub { owner = "bufbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-f1UcvsXWW+fMAgTRtHkEXmUN/DTrJ/Xd+9HbR2FjFog="; + sha256 = "sha256-Go0wLcJrxMgB67WlAI7TwX2UU2sQ/yfmC0h2igOkjc4="; + leaveDotGit = true; # Required by TestWorkspaceGit }; + vendorSha256 = "sha256-HT0dsGniBoQW2Y7MhahDeFvE0nCASoPdzHETju0JuRY="; patches = [ ./skip_test_requiring_network.patch ]; + nativeBuildInputs = [ protobuf ]; + checkInputs = [ git ]; + + ldflags = [ "-s" "-w" ]; + preCheck = '' export PATH=$PATH:$GOPATH/bin + # To skip TestCloneBranchAndRefToBucket + export CI=true ''; - nativeBuildInputs = [ protobuf ]; + installPhase = '' + runHook preInstall + + mkdir -p "$out/bin" + dir="$GOPATH/bin" + # Only install required binaries, don't install testing binaries + for file in \ + "buf" \ + "protoc-gen-buf-breaking" \ + "protoc-gen-buf-lint" \ + "protoc-gen-buf-check-breaking" \ + "protoc-gen-buf-check-lint"; do + cp "$dir/$file" "$out/bin/" + done - vendorSha256 = "sha256-XMGXVsSLEzuzujX5Fg3LLkgzyJY+nIBJEO9iI2t9eGc="; + runHook postInstall + ''; meta = with lib; { description = "Create consistent Protobuf APIs that preserve compatibility and comply with design best-practices"; diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix index 711b971c2d88..cbc2ceb21abc 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "bazel-remote"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "buchgr"; repo = pname; rev = "v${version}"; - sha256 = "193amcx4nk7mr51jcawym46gizqmfkvksjxm64pf7s3wraf00v01"; + sha256 = "sha256-GpbweI/grJNIRg/7lFd4tMhr9E2SPX+YUrzPJs0Gsik="; }; - vendorSha256 = "1sxv9mya8plkn3hpjgfpzgwlh4m3cbhpywqv86brj2h9i4ad0gl5"; + vendorSha256 = "sha256-dXBGWTgUaVJCwf2LB1QdmSPP3BlKqZ28HUnq1oervNg="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix index e7b0c1d105b4..a94ca34d0364 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "bear"; - version = "3.0.9"; + version = "3.0.12"; src = fetchFromGitHub { owner = "rizsotto"; repo = pname; rev = version; - sha256 = "xac8PYo3qYjtQbDy8piOz5BQQpcVlAvMCv1qHrVZmPQ="; + sha256 = "0nalvmkl9iwbs4wbsacryrwr46vk3x6jzqj9v5wfyf6aim3s1szs"; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/rizsotto/Bear"; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = [ maintainers.babariviere ]; + maintainers = with maintainers; [ babariviere qyliss ]; # ld: symbol(s) not found for architecture x86_64 broken = stdenv.isDarwin; }; diff --git a/nixpkgs/pkgs/development/tools/build-managers/bear/no-double-relative.patch b/nixpkgs/pkgs/development/tools/build-managers/bear/no-double-relative.patch index f4d247fa5760..257c7ffea38f 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bear/no-double-relative.patch +++ b/nixpkgs/pkgs/development/tools/build-managers/bear/no-double-relative.patch @@ -1,14 +1,22 @@ -diff --git a/source/config.h.in b/source/config.h.in -index 728c234..a3e76c6 100644 ---- a/source/config.h.in -+++ b/source/config.h.in -@@ -65,6 +65,6 @@ constexpr char VERSION[] = "@CMAKE_PROJECT_VERSION@"; - - constexpr char CITNAMES_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/citnames"; - constexpr char INTERCEPT_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/intercept"; --constexpr char LIBRARY_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; --constexpr char WRAPPER_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/wrapper"; --constexpr char WRAPPER_DIR_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/wrapper.d"; -+constexpr char LIBRARY_DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBEXECDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; -+constexpr char WRAPPER_DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBEXECDIR@/wrapper"; -+constexpr char WRAPPER_DIR_DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBEXECDIR@/wrapper.d"; +diff --git i/source/config.h.in w/source/config.h.in +index ffcce3a..0caba6d 100644 +--- i/source/config.h.in ++++ w/source/config.h.in +@@ -107,7 +107,7 @@ namespace cmd { + } + + namespace wrapper { +- constexpr char DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@PRIVATE_INSTALLDIR@/wrapper"; ++ constexpr char DEFAULT_PATH[] = "@PRIVATE_INSTALLDIR@/wrapper"; + constexpr char DEFAULT_DIR_PATH[] = "@ROOT_INSTALL_PREFIX@/@PRIVATE_INSTALLDIR@/wrapper.d"; + + constexpr char FLAG_VERBOSE[] = "--verbose"; +@@ -120,7 +120,7 @@ namespace cmd { + } + + namespace library { +- constexpr char DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@PRIVATE_INSTALLDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; ++ constexpr char DEFAULT_PATH[] = "@PRIVATE_INSTALLDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; + + constexpr char KEY_REPORTER[] = "INTERCEPT_REPORT_COMMAND"; + constexpr char KEY_DESTINATION[] = "INTERCEPT_REPORT_DESTINATION"; diff --git a/nixpkgs/pkgs/development/tools/build-managers/gup/default.nix b/nixpkgs/pkgs/development/tools/build-managers/gup/default.nix index dfa65736f99f..7fa8feb8e33f 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/gup/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/gup/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, nix-update-source, lib, python3 , which, runtimeShell, pychecker ? null }: stdenv.mkDerivation rec { - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "timbertson"; repo = "gup"; - rev = "version-0.7.0"; - sha256 = "1pwnmlq2pgkkln9sgz4wlb9dqlqw83bkf105qljnlvggc21zm3pv"; + rev = "version-${version}"; + sha256 = "1zjd76jyb5zc9w3l368723bjmxjl05s096g8ipwncfks1p9hdgf3"; }; pname = "gup"; nativeBuildInputs = [ python3 which pychecker ]; @@ -18,20 +18,23 @@ stdenv.mkDerivation rec { mkdir $out cp -r python/bin $out/bin ''; - passthru.updateScript = '' - #!${runtimeShell} - set -e - echo - cd ${toString ./.} - ${nix-update-source}/bin/nix-update-source \ - --prompt version \ - --replace-attr version \ - --set owner timbertson \ - --set repo gup \ - --set type fetchFromGitHub \ - --set rev 'version-{version}' \ - --modify-nix default.nix - ''; + passthru.updateScript = [ + runtimeShell + "-c" + '' + set -e + echo + cd ${toString ./.} + ${nix-update-source}/bin/nix-update-source \ + --prompt version \ + --replace-attr version \ + --set owner timbertson \ + --set repo gup \ + --set type fetchFromGitHub \ + --set rev 'version-{version}' \ + --modify-nix default.nix + '' + ]; meta = { inherit (src.meta) homepage; description = "A better make, inspired by djb's redo"; diff --git a/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix b/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix index 89628b81fbc2..677b31063ac5 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "sbt"; - version = "1.5.3"; + version = "1.5.4"; src = fetchurl { url = "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"; - sha256 = "10kIQNy+3V1SD4uEZs/BJ4E6bTCRV3wjBN8gw9jr9VQ="; + sha256 = "035jl4czx9ixl12z874bksq5wxdnajxr06cl1yvfj2v92yx3l5wf"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/tools/butane/default.nix b/nixpkgs/pkgs/development/tools/butane/default.nix index fc42f311af87..f417dc420350 100644 --- a/nixpkgs/pkgs/development/tools/butane/default.nix +++ b/nixpkgs/pkgs/development/tools/butane/default.nix @@ -4,13 +4,13 @@ with lib; buildGoModule rec { pname = "butane"; - version = "0.11.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "coreos"; repo = "butane"; rev = "v${version}"; - sha256 = "1s4rkq7mj1lyi8h47jyfy3qygfxhrmpihdy8rcnn55gcy04lm0qc"; + sha256 = "1bgh7h3hwrgjkw72233qzqpkshzbizhdapa0lalzj1xnclq3rqlp"; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/development/tools/clang-tools/wrapper b/nixpkgs/pkgs/development/tools/clang-tools/wrapper index eebc152d11b1..1008023fdc0d 100755 --- a/nixpkgs/pkgs/development/tools/clang-tools/wrapper +++ b/nixpkgs/pkgs/development/tools/clang-tools/wrapper @@ -19,9 +19,9 @@ buildcpath() { } export CPATH=${CPATH}${CPATH:+':'}$(buildcpath ${NIX_CFLAGS_COMPILE} \ - $(<@clang@/nix-support/libc-cflags)) + $(<@clang@/nix-support/libc-cflags)):@clang@/resource-root/include export CPLUS_INCLUDE_PATH=${CPLUS_INCLUDE_PATH}${CPLUS_INCLUDE_PATH:+':'}$(buildcpath ${NIX_CFLAGS_COMPILE} \ $(<@clang@/nix-support/libcxx-cxxflags) \ - $(<@clang@/nix-support/libc-cflags)) + $(<@clang@/nix-support/libc-cflags)):@clang@/resource-root/include exec -a "$0" @unwrapped@/bin/$(basename $0) "$@" diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix index a2bc47b6408b..c6d1e47389a6 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix @@ -3,9 +3,9 @@ buildGoModule rec { pname = "drone.io${lib.optionalString (!enableUnfree) "-oss"}"; - version = "1.10.0"; + version = "2.0.0"; - vendorSha256 = "sha256-cKHX/GnvGELQBfoo0/1UmDQ4Z66GGnnHG7+1CzjinL0="; + vendorSha256 = "sha256-cnbZSnHU+ORm7/dV+U9NfM18Zrzi24vf7qITPJsusU8="; doCheck = false; @@ -13,7 +13,7 @@ buildGoModule rec { owner = "drone"; repo = "drone"; rev = "v${version}"; - sha256 = "sha256-12Jac+mXWdUX8gWvmpdO9ROv7Bi0YzvyqnNDVNJOr34="; + sha256 = "sha256-BxwCJf3uY34rqegZJ6H/zb63orELhq41trOgzGXQe80="; }; preBuild = '' diff --git a/nixpkgs/pkgs/development/tools/database/litecli/default.nix b/nixpkgs/pkgs/development/tools/database/litecli/default.nix index ee18a72216dc..75e600ccb513 100644 --- a/nixpkgs/pkgs/development/tools/database/litecli/default.nix +++ b/nixpkgs/pkgs/development/tools/database/litecli/default.nix @@ -1,16 +1,15 @@ -{ lib, python3Packages }: +{ lib +, python3Packages +}: python3Packages.buildPythonApplication rec { pname = "litecli"; - version = "1.5.0"; - - # Python 2 won't have prompt_toolkit 2.x.x - # See: https://github.com/NixOS/nixpkgs/blob/f49e2ad3657dede09dc998a4a98fd5033fb52243/pkgs/top-level/python-packages.nix#L3408 - disabled = python3Packages.isPy27; + version = "1.6.0"; + disabled = python3Packages.pythonOlder "3.4"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "b09f0804d26b018360b240778612390810e8e00ea0f79d5412fd0d4775c0e3cd"; + sha256 = "sha256-TSdOFHW007syOEg4gwvEqDiJkrfLgRmqjP/H/6oBZ/k="; }; propagatedBuildInputs = with python3Packages; [ @@ -27,6 +26,8 @@ python3Packages.buildPythonApplication rec { mock ]; + pythonImportsCheck = [ "litecli" ]; + meta = with lib; { description = "Command-line interface for SQLite"; longDescription = '' diff --git a/nixpkgs/pkgs/development/tools/database/litestream/default.nix b/nixpkgs/pkgs/development/tools/database/litestream/default.nix new file mode 100644 index 000000000000..3f70f39da951 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/database/litestream/default.nix @@ -0,0 +1,30 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: +buildGoModule rec { + pname = "litestream"; + version = "0.3.5"; + + src = fetchFromGitHub { + owner = "benbjohnson"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-OQ8j0FOUWU5TfCl4AZpmX5tuhtHAbrhvzT6ve6AJNn0="; + }; + + ldflags = [ + "-s" + "-w" + "-X main.Version=${version}" + ]; + + vendorSha256 = "sha256-ScG8cukUuChOvN9r0HvVJsYnu1X9DSO7aD32iu55jIM="; + + meta = with lib; { + description = "Streaming replication for SQLite"; + license = licenses.asl20; + homepage = "https://litestream.io/"; + maintainers = with maintainers; [ fbrs ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix b/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix new file mode 100644 index 000000000000..01f4941c8e4f --- /dev/null +++ b/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix @@ -0,0 +1,65 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "sqlfluff"; + version = "0.6.0a2"; + disabled = python3.pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "13hzr0jialzi2nlvqwvff3w0h6jikqvcg0p2p4irwlisg4db8w7w"; + }; + + propagatedBuildInputs = with python3.pkgs; [ + appdirs + cached-property + click + colorama + configparser + diff_cover + jinja2 + oyaml + pathspec + pytest + tblib + toml + ] ++ lib.optionals (pythonOlder "3.7") [ + dataclasses + ] ++ lib.optionals (pythonOlder "3.9") [ + typing-extensions + ]; + + checkInputs = with python3.pkgs; [ + hypothesis + pytestCheckHook + ]; + + disabledTestPaths = [ + # dbt is not available yet + "test/core/templaters/dbt_test.py" + # Don't run the plugin related tests + "test/core/plugin_test.py" + "plugins/sqlfluff-plugin-example/test/rules/rule_test_cases_test.py" + ]; + + disabledTests = [ + # dbt is not available yet + "test__linter__skip_dbt_model_disabled" + "test_rules__test_helper_has_variable_introspection" + "test__rules__std_file_dbt" + ]; + + pythonImportsCheck = [ "sqlfluff" ]; + + meta = with lib; { + description = "SQL linter and auto-formatter"; + homepage = "https://www.sqlfluff.com/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/database/sqlitebrowser/default.nix b/nixpkgs/pkgs/development/tools/database/sqlitebrowser/default.nix index 40238d0effa4..45b5f185880d 100644 --- a/nixpkgs/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/nixpkgs/pkgs/development/tools/database/sqlitebrowser/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, antlr +{ mkDerivation, lib, fetchFromGitHub, cmake , qtbase, qttools, sqlite }: mkDerivation rec { @@ -16,7 +16,7 @@ mkDerivation rec { # but qscintilla is currently in a bit of a mess as some consumers expect a # -qt4 or -qt5 prefix while others do not. # We *really* should get that cleaned up. - buildInputs = [ antlr qtbase sqlite ]; + buildInputs = [ qtbase sqlite ]; nativeBuildInputs = [ cmake qttools ]; diff --git a/nixpkgs/pkgs/development/tools/dockle/default.nix b/nixpkgs/pkgs/development/tools/dockle/default.nix index 55869b022952..437f7f2da581 100644 --- a/nixpkgs/pkgs/development/tools/dockle/default.nix +++ b/nixpkgs/pkgs/development/tools/dockle/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dockle"; - version = "0.3.14"; + version = "0.3.15"; src = fetchFromGitHub { owner = "goodwithtech"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Xe5qgM0yPBVtH9S4OSiNnkKxcH0W89aABJF6PVRBEhQ="; + sha256 = "sha256-jxFlbGJ95cSv08HcqrVufpTE5KkvAC9zOTQ2+JZWe5A="; }; vendorSha256 = "sha256-h+2AcppNUJ7zjHeBzDy1iWoR3i7a2v0Pc7vOfoUqPOw="; diff --git a/nixpkgs/pkgs/development/tools/documentation/mkdocs/default.nix b/nixpkgs/pkgs/development/tools/documentation/mkdocs/default.nix index 64d834f1bb29..f7774cc7127e 100644 --- a/nixpkgs/pkgs/development/tools/documentation/mkdocs/default.nix +++ b/nixpkgs/pkgs/development/tools/documentation/mkdocs/default.nix @@ -1,40 +1,55 @@ -{ lib, python3, fetchFromGitHub }: +{ lib +, python3 +, fetchFromGitHub +}: with python3.pkgs; buildPythonApplication rec { pname = "mkdocs"; - version = "1.0.4"; + version = "1.2.1"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { - owner = "mkdocs"; - repo = "mkdocs"; + owner = pname; + repo = pname; rev = version; - sha256 = "1x35vgiskgz4wwrvi4m1mri5wlphf15p90fr3rxsy5bf19v3s9hs"; + sha256 = "sha256-JF3Zz1ObxeKsIF0pa8duJxqjLgMvmWsWMApHT43Z+EY="; }; - checkInputs = [ - nose nose-exclude mock + propagatedBuildInputs = [ + click + jinja2 + markdown + mergedeep + pyyaml + pyyaml-env-tag + ghp-import + importlib-metadata + watchdog + packaging ]; - NOSE_EXCLUDE_TESTS = lib.concatStringsSep ";" [ - "mkdocs.tests.gh_deploy_tests.TestGitHubDeploy" - "mkdocs.tests.config.config_tests.ConfigTests" - "mkdocs.tests.config.config_options_tests.DirTest" + checkInputs = [ + Babel + mock + pytestCheckHook ]; - checkPhase = "nosetests mkdocs"; + postPatch = '' + # Remove test due to missing requirement + rm mkdocs/tests/theme_tests.py + ''; - propagatedBuildInputs = [ - tornado - livereload - click - pyyaml - markdown - jinja2 - backports_tempfile + pytestFlagsArray = [ "mkdocs/tests/*.py" ]; + + disabledTests = [ + # Don't start a test server + "testing_server" ]; + pythonImportsCheck = [ "mkdocs" ]; + meta = with lib; { description = "Project documentation with Markdown / static website generator"; longDescription = '' @@ -42,11 +57,11 @@ buildPythonApplication rec { geared towards building project documentation. Documentation source files are written in Markdown, and configured with a single YAML configuration file. - MkDocs can also be used to generate general-purpose Websites. + MkDocs can also be used to generate general-purpose websites. ''; homepage = "http://mkdocs.org/"; - license = lib.licenses.bsd2; + license = licenses.bsd2; platforms = platforms.unix; - maintainers = [ maintainers.rkoe ]; + maintainers = with maintainers; [ rkoe ]; }; } diff --git a/nixpkgs/pkgs/development/tools/earthly/default.nix b/nixpkgs/pkgs/development/tools/earthly/default.nix index 82f59817b221..b46a97df20a3 100644 --- a/nixpkgs/pkgs/development/tools/earthly/default.nix +++ b/nixpkgs/pkgs/development/tools/earthly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "earthly"; - version = "0.5.15"; + version = "0.5.17"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - sha256 = "sha256-3hiiCcCgbWxSfG8XCcoKdNJsQoP2L2G4g4zFQkFtzQI="; + sha256 = "sha256-SuHHeO2KFjB3HbLv1ODBGaXzNaDi/FNPOGg/lX8JLJE="; }; - vendorSha256 = "sha256-q3dDV0eop2NxXHFrlppWsZrO2Hz1q5xhs1DnB6PvG9g="; + vendorSha256 = "sha256-D62fG+T3G1W7xteSGlTtEkXbQfGAmBTYJeATH2CVtwY="; buildFlagsArray = '' -ldflags= diff --git a/nixpkgs/pkgs/development/tools/electron/default.nix b/nixpkgs/pkgs/development/tools/electron/default.nix index 0b2cdbe9c045..8377e7c4431c 100644 --- a/nixpkgs/pkgs/development/tools/electron/default.nix +++ b/nixpkgs/pkgs/development/tools/electron/default.nix @@ -95,33 +95,33 @@ rec { headers = "01x6a0r2jawjpl09ixgzap3g0z6znj34hsnnhzanavkbds0ri4k6"; }; - electron_11 = mkElectron "11.4.7" { - x86_64-linux = "05005d351a1b08a550a8186efba6f4fdd96842355a634934d9a9d7d31c2cd539"; - x86_64-darwin = "e6445ad3d7e851fc3227785788d0706d58c9c8ea3821afa7f871c6254c463043"; - i686-linux = "5473f36eb2a9772da7e4f1a162a724b4a5335e8f78fb51d585bac3bd50ff12fc"; - armv7l-linux = "0de0d74b1206f7ffd9e4c75754bbf6fdf27c83a0ce6b4cd8a6b5af81d7a20ba7"; - aarch64-linux = "f2261dde71197c358aff85d7a320cbd2315a5adf228218fd9a2f5c8561589323"; - aarch64-darwin = "a2abc83c21402e30f4f42f4615cccc4369884faa2f2fa576d71f423834988622"; - headers = "1dqkx861vfq6xbzdlbgza6h4j7bib8p3xahllrnfc0s65y8gf0ry"; + electron_11 = mkElectron "11.4.8" { + x86_64-linux = "742cfa025fa64cfa02c4eb8584e9f2f15321b795688a5c1a6597b1e1da1e98e7"; + x86_64-darwin = "b251b02f70a9a0e63866836c0638200cca05392cdec1b5271ebbe0c016276364"; + i686-linux = "a7813cfa785e8e9a440db4cfb0d98dcd5ba52041fb018856d9c544a43ae55357"; + armv7l-linux = "a72e346a569f582fc40e9ebbfd6f6faf5c32dd6e83fdcd5335c46e332dbe5ee6"; + aarch64-linux = "acd4e32851cc0fdfe1a62df90a6c8b02139e510b7c3212bd4ac57f767e85dfe4"; + aarch64-darwin = "ee28b1d525ae5be60253430200692f3fe6b4d588921aedd246bfc851014127ea"; + headers = "0l8pc4grabj641wf1q37bc19w0y9913v4c9s8pbniz7py1a6rpmn"; }; - electron_12 = mkElectron "12.0.10" { - x86_64-linux = "b5383b5818062de42536a7966df875ae781433a7ee991da34643bc6fda4ad038"; - x86_64-darwin = "3d4111280bf50dbfb141b46551974b0e4e39eb0d1f8ef789d71f7d3295a8e24f"; - i686-linux = "6fd10db8d896ef82ac8f2a1d796942dc56f5b41e504c86121d83eababa0cccb8"; - armv7l-linux = "5820ac7e70488507417122aaa0381439f929da1819c2c710ba74569a609cc972"; - aarch64-linux = "022ff009969d9f270704e918fe2dda6cd395c3e9d9e9515e99eca628d996a503"; - aarch64-darwin = "d2af4870a79866621469043e44a2a0e995abc5530d4aaf1add567b00eb286b01"; - headers = "1vl3cnhf2j5g4xhk17rag0vzbxwba5fq54mhvv0hp3hqbiqhdds6"; + electron_12 = mkElectron "12.0.11" { + x86_64-linux = "e3bac4b81f0d99447f8ff7edf88f2e9941699d30cf1f41a41af7a93b199e805b"; + x86_64-darwin = "eeee59eb751e0d95538a40c74aa1563ee4485903eb028c462872004cc8dfdabb"; + i686-linux = "97fe1b7f7414a9cf1416d4a2d61139cc71f50765f48df02b6ccb4c1af62f0d97"; + armv7l-linux = "c43b28d5d15b303a7643e7d2320f03577e27d90a13f4fa1dc3e14f81630ab62e"; + aarch64-linux = "b5f17959b8cb55f0557f4a0a37cd99c1c6d1d48fad839402383d9087175b4f44"; + aarch64-darwin = "e5f88751bfb1344ea2f1345b56e95093ebfa850761b53752fbcf8c6d8de0f824"; + headers = "11801qplb7s7zs0yjmk4436yp3xg2szn7hzag75v3g026k2ay1xz"; }; - electron_13 = mkElectron "13.1.0" { - x86_64-linux = "6681078971d2e99e9f8b3c598de65869d3596356af901bbbabcc4860c0496bb4"; - x86_64-darwin = "d62a561e80fcbcb0f249e74c487313192451046f288478add65be997793831de"; - i686-linux = "e4d8cc19689b1f9c00894bb776083f8543abeba9203d3297268c1644f1300355"; - armv7l-linux = "ac5a19e31fd83db5775a2af57f742c7b3e5fc4528958329ec3c81f82e7bd611a"; - aarch64-linux = "0ed0cc3afae5cc7e1e6c6204866a1cecdf97e0ab658789e8951842bd0d28e1bb"; - aarch64-darwin = "6da46d2861011263af2953a3e0186735e54708c01c50967ff5f8ed71b73f7fea"; - headers = "1h4saavsy97kmbfaw6xcya5l0iybr37vyw7bv539c7a064kam07b"; + electron_13 = mkElectron "13.1.2" { + x86_64-linux = "1391bae19ff6446fb56f00ba5597bb92a509b6e808534087c153b9fcebddbeef"; + x86_64-darwin = "b8c5eca90864ce4a91e1fdb8a932598fad31922407b502eeb868a508fd26347f"; + i686-linux = "40d6c373b5e77b80285715fb66acb6562ea1d685f6644d463fb427f846f09fdc"; + armv7l-linux = "ce31a8d455663f6e85ed75fa9ac1007b55d6fd0b9445d9e51e2a103706e49e94"; + aarch64-linux = "06965ade2aaf4dce78b5d5b075fc09c225d7d83817297338fc26eb4d33ebb289"; + aarch64-darwin = "dde2b3fd2ac52097481ff5bfd54c358432f7f2402b0b20ae32681ae6e5a4d451"; + headers = "1qrw1cpj63757c582zzz0gchaq0w0xq1mm5702q34xyv06mh5h93"; }; } diff --git a/nixpkgs/pkgs/development/tools/esbuild/default.nix b/nixpkgs/pkgs/development/tools/esbuild/default.nix index 894168145aee..22a6a59cc1bc 100644 --- a/nixpkgs/pkgs/development/tools/esbuild/default.nix +++ b/nixpkgs/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.12.7"; + version = "0.12.9"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-LHM3dlVfwgA1HJPg/77Er/RWEDVmmQuuhrS5KzTAtV0="; + sha256 = "sha256-MqwgdhgWIfYE0wO7fWQuC72tEwCVgL7qUbJlJ3APf4E="; }; vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg="; diff --git a/nixpkgs/pkgs/development/tools/fission/default.nix b/nixpkgs/pkgs/development/tools/fission/default.nix index 133db2d9ff00..3045842d91f0 100644 --- a/nixpkgs/pkgs/development/tools/fission/default.nix +++ b/nixpkgs/pkgs/development/tools/fission/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fission"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "fission"; repo = "fission"; rev = version; - sha256 = "0izvkjd7ydcxhr6zmgrbfm3ybz2kf4p27099lr07gd4x7c6xxmqr"; + sha256 = "sha256-WCynU5+d789d584JH99jmTZSEbyco2ysuBXIC2pW1r4="; }; - vendorSha256 = "12clw0wy4lypf45imqnabj39yxqpi348csr4m5d0d1rksxgvwngq"; + vendorSha256 = "sha256-V3/IFCbW3wXfNiFzucLeyFDc6SA2nE+NwO0sNEBmIYg="; buildFlagsArray = "-ldflags=-s -w -X info.Version=${version}"; diff --git a/nixpkgs/pkgs/development/tools/flawfinder/default.nix b/nixpkgs/pkgs/development/tools/flawfinder/default.nix index 28805b4abe43..554ca92b8c0e 100644 --- a/nixpkgs/pkgs/development/tools/flawfinder/default.nix +++ b/nixpkgs/pkgs/development/tools/flawfinder/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { homepage = "https://dwheeler.com/flawfinder/"; license = with licenses; [ gpl2Only ]; maintainers = with maintainers; [ fab ]; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/frugal/default.nix b/nixpkgs/pkgs/development/tools/frugal/default.nix index c8339fe6d851..0b1e8d16b65a 100644 --- a/nixpkgs/pkgs/development/tools/frugal/default.nix +++ b/nixpkgs/pkgs/development/tools/frugal/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "frugal"; - version = "3.14.4"; + version = "3.14.5"; src = fetchFromGitHub { owner = "Workiva"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RFVn5aL5MqsB7heDPVUci3Eyq6F/qo3RmdEaZbsC+Ng="; + sha256 = "sha256-Er9V6mSe4Pt/RzFAPa3ci3J7FQh5GLbh9CjYHx/HnYM="; }; subPackages = [ "." ]; - vendorSha256 = "sha256-hyupBMRKuw77SJNIk3mEUixV0LV5mEmZx8M70qGmYJY="; + vendorSha256 = "sha256-9M6SSxMQ8JMJ7ZNl8cjQuid/B0xc28/BuPozxftthe0="; meta = with lib; { description = "Thrift improved"; diff --git a/nixpkgs/pkgs/development/tools/gamecube-tools/default.nix b/nixpkgs/pkgs/development/tools/gamecube-tools/default.nix index 2f7c088cd486..d7715d67acb4 100644 --- a/nixpkgs/pkgs/development/tools/gamecube-tools/default.nix +++ b/nixpkgs/pkgs/development/tools/gamecube-tools/default.nix @@ -2,7 +2,7 @@ , freeimage, libGL }: stdenv.mkDerivation rec { - version = "1.0.2"; + version = "1.0.4"; pname = "gamecube-tools"; nativeBuildInputs = [ autoreconfHook ]; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "devkitPro"; repo = "gamecube-tools"; rev = "v${version}"; - sha256 = "0zvpkzqvl8iv4ndzhkjkmrzpampyzgb91spv0h2x2arl8zy4z7ca"; + sha256 = "sha256-0iMY2LokfsYgHzIuFc8RlrVlJCURqVqprP54PG4oW0M="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/tools/go-toml/default.nix b/nixpkgs/pkgs/development/tools/go-toml/default.nix index fee8d94f754b..8a41e0a4d133 100644 --- a/nixpkgs/pkgs/development/tools/go-toml/default.nix +++ b/nixpkgs/pkgs/development/tools/go-toml/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "go-toml"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "pelletier"; repo = pname; rev = "v${version}"; - sha256 = "sha256-x740f6I+szhq4mEsed4bsXcC8PvzF6PKFJNJ9SKMGIE="; + sha256 = "sha256-Vu/PS01JeSeg1KHkpqL12rTjRJFoc9rla48H/ei2HDM="; }; goPackagePath = "github.com/pelletier/go-toml"; diff --git a/nixpkgs/pkgs/development/tools/golangci-lint/default.nix b/nixpkgs/pkgs/development/tools/golangci-lint/default.nix index 2019c7cb3e22..f4ff5dd2b946 100644 --- a/nixpkgs/pkgs/development/tools/golangci-lint/default.nix +++ b/nixpkgs/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.40.1"; + version = "1.41.0"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "sha256-5OtXfDPpdwVMnI5Pttr+XQPgJXI7YexPtBhIDeS1CXk="; + sha256 = "sha256-ogH3L2EG0xdGpCaEfMUYnCWyFTGgx/C/O54mMxcJSBA="; }; - vendorSha256 = "sha256-8SPUOQ88RkU0dkyNccf+POKitXHlCRaxrIugV91gDZQ="; + vendorSha256 = "sha256-gYulktNetcgXk43Ydk4+WEMZMFCrmx6p5VnsFIJdQhk="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/gosec/default.nix b/nixpkgs/pkgs/development/tools/gosec/default.nix index a24ec1050146..9264ac27fa2a 100644 --- a/nixpkgs/pkgs/development/tools/gosec/default.nix +++ b/nixpkgs/pkgs/development/tools/gosec/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "gosec"; - version = "2.8.0"; + version = "2.8.1"; subPackages = [ "cmd/gosec" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "securego"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AC3NHW7LYbpZGA+iaM9eXFLothhqZuvRJM1ehBByhpk="; + sha256 = "sha256-AlADSEekcUH/pCGggKlkBDiIYMe1zsoe9hh6fVUwQVA="; }; - vendorSha256 = "sha256-QfbElEjkYdmzYhQ8TOFIb2jfG2xzbW1UL2eLxROsBfw="; + vendorSha256 = "sha256-HBwIZfvkL9HSwkD1sZzBM7IJFAjLbCxyc95vqR5TFAg="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/irony-server/default.nix b/nixpkgs/pkgs/development/tools/irony-server/default.nix index 2a7a7b1a16a3..192a33ad7ca7 100644 --- a/nixpkgs/pkgs/development/tools/irony-server/default.nix +++ b/nixpkgs/pkgs/development/tools/irony-server/default.nix @@ -1,20 +1,16 @@ -{ lib, stdenv, cmake, llvmPackages, irony }: +{ lib, stdenv, cmake, llvmPackages, llvm, irony }: stdenv.mkDerivation { pname = "irony-server"; inherit (irony) src version; - nativeBuildInputs = [ cmake llvmPackages.llvm.dev ]; - buildInputs = [ llvmPackages.libclang llvmPackages.llvm ]; + nativeBuildInputs = [ cmake llvm ]; + buildInputs = [ llvmPackages.libclang ]; dontUseCmakeBuildDir = true; cmakeDir = "server"; - cmakeFlags = [ - "-DCMAKE_PREFIX_PATH=${llvmPackages.clang-unwrapped}" - ]; - meta = with lib; { description = "The server part of irony"; homepage = "https://melpa.org/#/irony"; diff --git a/nixpkgs/pkgs/development/tools/jbang/default.nix b/nixpkgs/pkgs/development/tools/jbang/default.nix index dfef3906602c..1220ec90d90f 100644 --- a/nixpkgs/pkgs/development/tools/jbang/default.nix +++ b/nixpkgs/pkgs/development/tools/jbang/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: stdenv.mkDerivation rec { - version = "0.70.0"; + version = "0.71.1"; pname = "jbang"; src = fetchzip { url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; - sha256 = "sha256-Fy7TvWJVRJI5fhfZzMuW+KBLaVLWKjk/I3Kx60Wazyo="; + sha256 = "sha256-+s2Wa+5Qznqpv84VEZCMmzy0bI1mN/BknPObYqJlaYs="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/just/default.nix b/nixpkgs/pkgs/development/tools/just/default.nix index dbd10772a626..e1ae8a5a0e7c 100644 --- a/nixpkgs/pkgs/development/tools/just/default.nix +++ b/nixpkgs/pkgs/development/tools/just/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "casey"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-C0W5oMnKlQ5hg/0YLKZKiQfLghJ7yAJYW6k0G6eOFQE="; + rev = version; + sha256 = "sha256-fDbnOfT2BTCLF2knUf3ccDnuA0mhM+gkbja7xgmWoaY="; }; - cargoSha256 = "sha256-TqvUunBFpKIog0pG85M/JLz8orncgbRqnQolseXYSo4="; + cargoSha256 = "sha256-mBrFw5d0LXTKj7Nm8XmT5hsq/d/x84U/Gp02+lay2OY="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/nixpkgs/pkgs/development/tools/kafkacat/default.nix b/nixpkgs/pkgs/development/tools/kafkacat/default.nix index e297de7a0db0..5493bf24428d 100644 --- a/nixpkgs/pkgs/development/tools/kafkacat/default.nix +++ b/nixpkgs/pkgs/development/tools/kafkacat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, zlib, rdkafka, yajl }: +{ lib, stdenv, fetchFromGitHub, pkg-config, zlib, rdkafka, yajl, avro-c, libserdes }: stdenv.mkDerivation rec { pname = "kafkacat"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ zlib rdkafka yajl ]; + buildInputs = [ zlib rdkafka yajl avro-c libserdes ]; preConfigure = '' patchShebangs ./configure diff --git a/nixpkgs/pkgs/development/tools/ktlint/default.nix b/nixpkgs/pkgs/development/tools/ktlint/default.nix index 4abe6b6d17fa..61b4a570b815 100644 --- a/nixpkgs/pkgs/development/tools/ktlint/default.nix +++ b/nixpkgs/pkgs/development/tools/ktlint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ktlint"; - version = "0.40.0"; + version = "0.41.0"; src = fetchurl { - url = "https://github.com/shyiko/ktlint/releases/download/${version}/ktlint"; - sha256 = "17n1xdalz38h9p4ylcpkbbqp22b1np5l8y5l3r58kaf9k8p6cfa7"; + url = "https://github.com/pinterest/ktlint/releases/download/${version}/ktlint"; + sha256 = "10z1010k25i40iv7v339csmbs83hmwjv1004jikckb78wncd12s3"; }; nativeBuildInputs = [ makeWrapper ]; @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { homepage = "https://ktlint.github.io/"; license = licenses.mit; platforms = jre_headless.meta.platforms; - maintainers = with maintainers; [ tadfisher ]; + maintainers = with maintainers; [ tadfisher SubhrajyotiSen ]; }; } diff --git a/nixpkgs/pkgs/development/tools/kustomize/kustomize-sops.nix b/nixpkgs/pkgs/development/tools/kustomize/kustomize-sops.nix index 7753556a4ea5..9c71af562137 100644 --- a/nixpkgs/pkgs/development/tools/kustomize/kustomize-sops.nix +++ b/nixpkgs/pkgs/development/tools/kustomize/kustomize-sops.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kustomize-sops"; - version = "2.5.5"; + version = "2.5.6"; src = fetchFromGitHub { owner = "viaduct-ai"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lNC8TwX462Lnt/uiKWt9hNa81g3tdenvvuNQJNkj7hM="; + sha256 = "sha256-UEtWEOuekFbMUJFWYdXfzbCWCz4I7vVdb9UBQbMXF/A="; }; - vendorSha256 = "sha256-uStmUhiZuUguxUx2L8ifSNnbMCs7Jk+6tq7qZdACjag="; + vendorSha256 = "sha256-kNJkSivSj8LMeXobKazLy9MCTtWzrBn99GmvaH+qIUU="; installPhase = '' mkdir -p $out/lib/viaduct.ai/v1/ksops-exec/ diff --git a/nixpkgs/pkgs/development/tools/misc/act/default.nix b/nixpkgs/pkgs/development/tools/misc/act/default.nix index 8c01aea284eb..38520b4b3e56 100644 --- a/nixpkgs/pkgs/development/tools/misc/act/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/act/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "act"; - version = "0.2.22"; + version = "0.2.23"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "v${version}"; - sha256 = "sha256-a+yw7QSLNX3hO2GnFCifYMbPWYwtleUZS1AqPsxw9t8="; + sha256 = "sha256-PBhlBWycAYuczfP0D+Gf1pDvrfI9gz3JyGe5FBq782Y="; }; - vendorSha256 = "sha256-6jD+gY/TmO/Ot507IlTLNdWv7G4BHYlk/E9rVoRD65A="; + vendorSha256 = "sha256-dLIsVWN/PjcH0CUYRmn4YaF8Pczf/gaWhD3lulqGiuA="; doCheck = false; @@ -22,6 +22,6 @@ buildGoModule rec { homepage = "https://github.com/nektos/act"; changelog = "https://github.com/nektos/act/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne ]; + maintainers = with maintainers; [ Br1ght0ne SuperSandro2000 ]; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/c2ffi/default.nix b/nixpkgs/pkgs/development/tools/misc/c2ffi/default.nix new file mode 100644 index 000000000000..b7a5b1dc7eb8 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/misc/c2ffi/default.nix @@ -0,0 +1,56 @@ +{ lib +, fetchFromGitHub +, cmake +, llvmPackages_11 +, unstableGitUpdater +}: + +let + c2ffiBranch = "llvm-11.0.0"; + llvmPackages = llvmPackages_11; +in + +llvmPackages.stdenv.mkDerivation { + pname = "c2ffi-${c2ffiBranch}"; + version = "unstable-2021-04-15"; + + src = fetchFromGitHub { + owner = "rpav"; + repo = "c2ffi"; + rev = "0255131f80b21334e565231331c2b451b6bba8c4"; + sha256 = "0ihysgqjyg5xwi098hxf15lpdi6g4nwpzczp495is912c48fy6b6"; + }; + + passthru.updateScript = unstableGitUpdater { + url = "https://github.com/rpav/c2ffi.git"; + branch = c2ffiBranch; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + llvmPackages.llvm + llvmPackages.clang + llvmPackages.libclang + ]; + + # This isn't much, but... + doInstallCheck = true; + installCheckPhase = '' + $out/bin/c2ffi --help 2>&1 >/dev/null + ''; + + # LLVM may be compiled with -fno-rtti, so let's just turn it off. + # A mismatch between lib{clang,LLVM}* and us can lead to the link time error: + # undefined reference to `typeinfo for clang::ASTConsumer' + CXXFLAGS="-fno-rtti"; + + meta = with lib; { + homepage = "https://github.com/rpav/c2ffi"; + description = "An LLVM based tool for extracting definitions from C, C++, and Objective C header files for use with foreign function call interfaces"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ attila-lendvai ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/misc/ccache/default.nix b/nixpkgs/pkgs/development/tools/misc/ccache/default.nix index 94fca742b6d3..909a160c7eea 100644 --- a/nixpkgs/pkgs/development/tools/misc/ccache/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/ccache/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , substituteAll , binutils , asciidoc @@ -34,6 +35,11 @@ let ccache = stdenv.mkDerivation rec { src = ./force-objdump-on-darwin.patch; objdump = "${binutils.bintools}/bin/objdump"; }) + # Fix clang C++ modules test (remove in next release) + (fetchpatch { + url = "https://github.com/ccache/ccache/commit/8b0c783ffc77d29a3e3520345b776a5c496fd892.patch"; + sha256 = "13qllx0qhfrdila6bdij9lk74fhkm3vdj01zgq1ri6ffrv9lqrla"; + }) ]; nativeBuildInputs = [ asciidoc cmake perl ]; diff --git a/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix b/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix index dc342e501e4c..3f51136c65c2 100644 --- a/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation rec { pname = "clojure-lsp"; - version = "2021.04.13-12.47.33"; + version = "2021.06.01-16.19.44"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1la0d28pvp1fqnxp3scb2vawcblilwyx42djxn379vag403p1i2d"; + sha256 = "sha256-dACvjm+uEVWotoeYhA4gCenKeprpF2dI0PGNRAVALao="; }; jar = fetchurl { url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp.jar"; - sha256 = "059gz7y2rzwdxpyqy80w4lghzgxi5lb4rxmks1721yq6k7ljjyqy"; + sha256 = "sha256-V12rSYv/Yu12ZpLSROd+4pyGiEGRfJ7lmRqCeikcQ5Q="; }; GRAALVM_HOME = graalvm11-ce; @@ -41,6 +41,8 @@ stdenv.mkDerivation rec { checkPhase = '' runHook preCheck + export HOME="$(mktemp -d)" + ./clojure-lsp --version | fgrep -q '${version}' ${babashka}/bin/bb integration-test/run-all.clj ./clojure-lsp runHook postCheck diff --git a/nixpkgs/pkgs/development/tools/misc/polylith/default.nix b/nixpkgs/pkgs/development/tools/misc/polylith/default.nix new file mode 100644 index 000000000000..b29b2521d170 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/misc/polylith/default.nix @@ -0,0 +1,49 @@ +{ lib, stdenv, fetchurl, jre, runtimeShell }: + +stdenv.mkDerivation rec { + pname = "polylith"; + version = "0.1.0-alpha9"; + + src = fetchurl { + url = "https://github.com/polyfy/polylith/releases/download/v${version}/poly-${version}.jar"; + sha256 = "0mjn0fibj7z8wihk5frhyd5ai2bmzm909701sphjs7j9lgg0gc4k"; + }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + + cat > "$out/bin/poly" <<EOF + #!${runtimeShell} + ARGS="" + while [ "\$1" != "" ] ; do + ARGS="\$ARGS \$1" + shift + done + exec "${jre}/bin/java" "-jar" "${src}" \$ARGS + EOF + chmod a+x $out/bin/poly + + runHook postInstall + ''; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + $out/bin/poly help | fgrep -q '${version}' + + runHook postInstallCheck + ''; + + meta = with lib; { + description = "A tool used to develop Polylith based architectures in Clojure"; + homepage = "https://github.com/polyfy/polylith"; + license = licenses.epl10; + maintainers = [ maintainers.ericdallo ]; + platforms = jre.meta.platforms; + }; +} diff --git a/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix b/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix index 0c52a89229da..e189c563e86e 100644 --- a/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix @@ -1,26 +1,46 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, stdenv }: buildGoModule rec { pname = "terraform-ls"; - version = "0.16.2"; + version = "0.18.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5+h1fyTCp1jUZeKRCeDhfqAA11SMyR5nw2Y2x6JyIwY="; + sha256 = "sha256-68Hs9kwv7GTGnYtoJh61ubaggPKbxFwz7qDwYaJ74c8="; }; - vendorSha256 = "sha256-m5ddUwuTX0mSihkoGIMQKidptwUL8Bao5HgHJBWX0os="; + vendorSha256 = "sha256-NgOpnCe0uGQVDVKYUIULqPTfvfkDtxIUQiCVwiE7nuc="; - # tests fail in sandbox mode because of trying to download stuff from releases.hashicorp.com - doCheck = false; + preBuild = '' + buildFlagsArray+=("-ldflags" "-s -w -X main.version=v${version} -X main.prerelease=") + ''; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + preCheck = '' + # Remove tests that requires networking + rm internal/terraform/exec/exec_test.go + '' + lib.optionalString stdenv.isAarch64 '' + # Not all test failures have tracking issues as HashiCorp do not have + # aarch64 testing infra easily available, see issue 549 below. + + # Remove file that contains `TestLangServer_workspaceExecuteCommand_modules_multiple` + # which fails on aarch64: https://github.com/hashicorp/terraform-ls/issues/549 + rm internal/langserver/handlers/execute_command_modules_test.go + + # `TestModuleManager_ModuleCandidatesByPath` variants fail + rm internal/terraform/module/module_manager_test.go + + # internal/terraform/module/module_ops_queue_test.go:17:15: undefined: testLogger + # internal/terraform/module/watcher_test.go:39:11: undefined: testLogger + # internal/terraform/module/watcher_test.go:79:14: undefined: testLogger + rm internal/terraform/module/{watcher_test,module_ops_queue_test}.go + ''; meta = with lib; { description = "Terraform Language Server (official)"; homepage = "https://github.com/hashicorp/terraform-ls"; + changelog = "https://github.com/hashicorp/terraform-ls/blob/v${version}/CHANGELOG.md"; license = licenses.mpl20; - maintainers = with maintainers; [ mbaillie ]; + maintainers = with maintainers; [ mbaillie jk ]; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/texlab/default.nix b/nixpkgs/pkgs/development/tools/misc/texlab/default.nix index 2fcda04cb434..42a30cce8eb9 100644 --- a/nixpkgs/pkgs/development/tools/misc/texlab/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/texlab/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "latex-lsp"; repo = pname; rev = "v${version}"; - hash = "sha256-h08RRcuQG1IjuCA6Xk71+MXKprZ/w5+H2edbG3rtVSY="; + hash = "sha256-iXsV7zt190GH0kTMpdmf8xHk4cqtCVwq6LDICmhe5qU="; }; - cargoHash = "sha256-78S9Bmq6TIMiAV3HpMC8jK9fH+0Y+jXAW9V1Druyfg8="; + cargoHash = "sha256-Yqn6VpAKw93QvkxuwNcYvrQm0C4TfisRDcmFy95/yw8="; outputs = [ "out" "man" ]; diff --git a/nixpkgs/pkgs/development/tools/misc/unused/default.nix b/nixpkgs/pkgs/development/tools/misc/unused/default.nix index 58e4ba0bc98e..ee89df5d8391 100644 --- a/nixpkgs/pkgs/development/tools/misc/unused/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/unused/default.nix @@ -1,18 +1,18 @@ { lib, fetchFromGitHub, rustPlatform, cmake }: rustPlatform.buildRustPackage rec { pname = "unused"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "unused-code"; repo = pname; rev = version; - sha256 = "06r6m7k570rdm9szghnp3g4r6ij0vp8apfanqzzxv2hd7gf8v62b"; + sha256 = "0igpf0y45rrdrwq8bznq0d5nnph0vijvn6fw96mqxhbffz0csbi9"; }; nativeBuildInputs = [ cmake ]; - cargoSha256 = "0y7vsba4r4v2lwf02i2dxwicnhknajbbzsdlnn5srvg6nvl3kspi"; + cargoSha256 = "1fngn9mmvx7jw8305w465z0nf9acc2cdl7314p77c2rz25z6rlin"; meta = with lib; { description = "A tool to identify potentially unused code"; diff --git a/nixpkgs/pkgs/development/tools/mpfshell/default.nix b/nixpkgs/pkgs/development/tools/mpfshell/default.nix index efe2b397f952..e8a2a9b89217 100644 --- a/nixpkgs/pkgs/development/tools/mpfshell/default.nix +++ b/nixpkgs/pkgs/development/tools/mpfshell/default.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonPackage rec { }; propagatedBuildInputs = with python3Packages; [ - pyserial colorama websocket_client + pyserial colorama websocket-client ]; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/packer/default.nix b/nixpkgs/pkgs/development/tools/packer/default.nix index 6c59eaa73838..c4b0546ec368 100644 --- a/nixpkgs/pkgs/development/tools/packer/default.nix +++ b/nixpkgs/pkgs/development/tools/packer/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "packer"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "sha256-Ey1gkld7WosJgoqnNp4Lz2x3PTI+w5p+A8Cwv4+uUZw="; + sha256 = "sha256-k5GCUFzjf0mipIQlnf7VCUS2j7cFwoGCeM7T6qgGnJA="; }; - vendorSha256 = null; + vendorSha256 = "sha256-5Wb7WAUGXJ7VMWiQyboH3PXJazsqitD9N0Acd+WItaY="; subPackages = [ "." ]; diff --git a/nixpkgs/pkgs/development/tools/parsing/byacc/default.nix b/nixpkgs/pkgs/development/tools/parsing/byacc/default.nix index 756d99c6e7f4..50e8101c17a5 100644 --- a/nixpkgs/pkgs/development/tools/parsing/byacc/default.nix +++ b/nixpkgs/pkgs/development/tools/parsing/byacc/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "byacc"; - version = "20210109"; + version = "20210520"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/byacc/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/byacc/${pname}-${version}.tgz" ]; - sha256 = "sha256-nn13aFhxQed4RJJhXf78cKjgBBAEO2OQHv7cG1DBm5c="; + sha256 = "sha256-19MdrnLLlzSC73+XVgmuQBzMEu4/sWi2emlSbGCv5D4="; }; configureFlags = [ diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json index 148004de4657..5ebc9c9a0f3c 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-c-sharp", - "rev": "5b6bfbdcdbdda7da4839d7163ce579ed98410282", - "date": "2021-05-21T15:22:56+02:00", - "path": "/nix/store/msyjbgxf3y3rj6m3w2apd65cvr9x523r-tree-sitter-c-sharp", - "sha256": "0ls2qic3jb20zv4m5pdrc3ikfb66afay3krvc6gsq1fi9hbxrmvv", + "rev": "aa429589525bb849189a0c5ddb52267ce578f988", + "date": "2021-06-07T18:47:38+02:00", + "path": "/nix/store/mclvpa5kfbl9g5ij3xjdhnqc6bqzqcj6-tree-sitter-c-sharp", + "sha256": "07alycp4bclr0ycn44dj2481xag0s10nwgyrdxar3j91hphd966s", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json index 13fd96817095..9ed735f1e3fa 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-c", - "rev": "f05e279aedde06a25801c3f2b2cc8ac17fac52ae", - "date": "2021-03-28T09:12:10-07:00", - "path": "/nix/store/4bcxsfrgrcpjy3f6dsmqli2xawjpyz44-tree-sitter-c", - "sha256": "1rismmgaqii1sdnri66h75sgw3mky4aha9hff6fan1qzll4f3hif", + "rev": "008008e30a81849fca0c79291e2b480855e0e02c", + "date": "2021-05-26T09:13:01-07:00", + "path": "/nix/store/vkps4991ip8dhgjqwfw7mamnmnizw31m-tree-sitter-c", + "sha256": "1mw4vma7kl504qn91f6janiqk9i05849rizqkqhyagb3glfbkrx2", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json index 3dc04b3b08ad..b8ca41abcf29 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-haskell", - "rev": "2e33ffa3313830faa325fe25ebc3769896b3a68b", - "date": "2021-04-19T23:45:03+02:00", - "path": "/nix/store/75mc2mfs4sm21c871s5lm9djnjk90r7n-tree-sitter-haskell", - "sha256": "0np7mzi1na1qscdxsjpyw314iwcmpzzrx1v7fk3yxc70qwzjcpp1", + "rev": "237f4eb4417c28f643a29d795ed227246afb66f9", + "date": "2021-06-05T13:41:42+02:00", + "path": "/nix/store/wwi86c3ix0zq8czwljxxypw5w2mxnz5h-tree-sitter-haskell", + "sha256": "0gx6mr6yg053i5mif8i8qwkk9h57laf9riw5r24av1y7cal7sszd", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json index c0411d15fb69..65066c66d539 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-javascript", - "rev": "6c8cfae935f67dd9e3a33982e5e06be0ece6399a", - "date": "2021-05-11T09:51:32-07:00", - "path": "/nix/store/dhh1gz45l3h3p31jfg5fgy1kns1lbw6d-tree-sitter-javascript", - "sha256": "1mw6miw4yp6s1i0b08hflamfvrjdim4fnnj6fy461n05jp1s1i78", + "rev": "45b9ce2a2588c0e6d616b0ee2a710b1fcb99c5b5", + "date": "2021-06-09T14:12:41-07:00", + "path": "/nix/store/j6r7z3m4wk6baz70qg2xn2mq3jlnyq6f-tree-sitter-javascript", + "sha256": "0rzpyxbh1j9l12jxyryc06f8jhbd5ci18lfb7bw2msc685b2ckcx", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json index 9996ac8d917e..ce1e4f1bb38d 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json @@ -1,9 +1,9 @@ { - "url": "https://github.com/Azganoth/tree-sitter-lua", - "rev": "a943944ec09c5e96f455bb166079de4ef3534457", - "date": "2020-12-27T00:15:24-03:00", - "path": "/nix/store/6glr8p3x58pva0nn586dk5jwb3bpgqrj-tree-sitter-lua", - "sha256": "0pm6wwb3kv73bfvvshdmvazcb1is5x1z6jwr31gz0niln18nqvpb", + "url": "https://github.com/nvim-treesitter/tree-sitter-lua", + "rev": "b6d4e9e10ccb7b3afb45018fbc391b4439306b23", + "date": "2021-03-05T14:55:53+01:00", + "path": "/nix/store/mlvnfmm5q67810qdim11qs4ivq54jrmr-tree-sitter-lua", + "sha256": "17kf1m2qpflqv7xng6ls4v1qxfgdlpgxs4qjwb6rcc8nbcdsj4ms", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json index 4ff38790b6f7..49b57f4d8a39 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-php", - "rev": "6a271f4075e11815e787df9055a950fb844ee63b", - "date": "2021-05-13T12:41:22+02:00", - "path": "/nix/store/n6hycd1scxa990xchk5h09ilxi7w18f5-tree-sitter-php", - "sha256": "1ijxc6brd0d35hr89ic8k5ispc6sj4mxln7bznd9n6zrgjvfdjqb", + "rev": "b065fc4ded84c30aff14c07ec6e7cf449e222b04", + "date": "2021-06-01T20:33:20+02:00", + "path": "/nix/store/czdqn2nz8pgrd64w74yskx6vl233phxn-tree-sitter-php", + "sha256": "1qr2byy344haqybd0zz2hazncay7zndkp4p3317ck50xrs05z086", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json index 37b0d1532408..41c63a2ce8c0 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-ql", - "rev": "965948cce9a94a710b1339851e0919471ad5ee2c", - "date": "2021-03-04T14:34:34-08:00", - "path": "/nix/store/4hi59c856ii2b79nv2wjib6qbp3hk24i-tree-sitter-ql", - "sha256": "01y1fzclwlaffx0rzg49h7kyvhhm25fba0w362n2y8hgjp3imgmg", + "rev": "8e7fd7e638d4a0ec7a792ee16b19dbc6407aa810", + "date": "2021-06-02T18:46:47+02:00", + "path": "/nix/store/yhyi9y09shv1fm87gka43vnv9clvyd92-tree-sitter-ql", + "sha256": "0x5f9989ymqvw3g8acckyk4j7zpmnc667qishbgly9icl9rkmv7w", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json index c8142974fd43..a96363af7139 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-ruby", - "rev": "fe6a2d634da0e16b11b5aa255cc3df568a4572fd", - "date": "2021-03-03T16:54:30-08:00", - "path": "/nix/store/ragrvqj7hm98r74v5b3fljvc47gd3nhj-tree-sitter-ruby", - "sha256": "0m3h4928rbs300wcb6776h9r88hi32rybbhcaf6rdympl5nzi83v", + "rev": "391269d74d20154bbd0ac9be20b35eced6920290", + "date": "2021-05-04T14:02:32-07:00", + "path": "/nix/store/hamsaml0yzi13qd61abypjwbv33rd824-tree-sitter-ruby", + "sha256": "0biyhydfzybz3g6hhdd0rk6yav7xsk61j8lnmpsi60vaxabdsaiv", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json index 41c4fcfe734d..b224fa54dafe 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json @@ -1,9 +1,9 @@ { "url": "https://github.com/Himujjal/tree-sitter-svelte", - "rev": "c696a13a587b0595baf7998f1fb9e95c42750263", - "date": "2021-03-20T16:45:11+05:30", - "path": "/nix/store/8krdxqwpi95ljrb5jgalwgygz3aljqr8-tree-sitter-svelte", - "sha256": "0ckmss5gmvffm6danlsvgh6gwvrlznxsqf6i6ipkn7k5lxg1awg3", + "rev": "10c113001acf9852817150acb3031a5e68d2b4cf", + "date": "2021-05-02T10:05:14+05:30", + "path": "/nix/store/mpfr56mfiizhwr4hq7h422glmdc4hg48-tree-sitter-svelte", + "sha256": "1n7addsnin6czm5hrbhaaqqgf0c3nz3mpcdysm2z4icgn7fjq281", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix index 168c9a0a403d..ad064c556ad7 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -75,7 +75,7 @@ let repo = "tree-sitter-nix"; }; "tree-sitter-lua" = { - orga = "Azganoth"; + orga = "nvim-treesitter"; repo = "tree-sitter-lua"; }; "tree-sitter-fennel" = { diff --git a/nixpkgs/pkgs/development/tools/protoc-gen-twirp/default.nix b/nixpkgs/pkgs/development/tools/protoc-gen-twirp/default.nix index 5db843e6f61f..363dfcaed612 100644 --- a/nixpkgs/pkgs/development/tools/protoc-gen-twirp/default.nix +++ b/nixpkgs/pkgs/development/tools/protoc-gen-twirp/default.nix @@ -2,20 +2,19 @@ buildGoPackage rec { pname = "protoc-gen-twirp"; - version = "8.0.0"; + version = "8.1.0"; src = fetchFromGitHub { owner = "twitchtv"; repo = "twirp"; rev = "v${version}"; - sha256 = "sha256-lwozRwH96nh4Zlf6ggOF+FuUEfxkN38wxygg5HXw/M0="; + sha256 = "sha256-ezSNrDfOE1nj4FlX7E7Z7/eGfQw1B7NP34aj8ml5pDk="; }; goPackagePath = "github.com/twitchtv/twirp"; subPackages = [ "protoc-gen-twirp" - "protoc-gen-twirp_python" ]; doCheck = true; diff --git a/nixpkgs/pkgs/development/tools/rnix-lsp/default.nix b/nixpkgs/pkgs/development/tools/rnix-lsp/default.nix index 98670e9e1845..27bad6b51d69 100644 --- a/nixpkgs/pkgs/development/tools/rnix-lsp/default.nix +++ b/nixpkgs/pkgs/development/tools/rnix-lsp/default.nix @@ -17,6 +17,6 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A work-in-progress language server for Nix, with syntax checking and basic completion"; license = licenses.mit; - maintainers = with maintainers; [ jD91mZM2 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix b/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix index 598d01a8af5f..267cc4fcfbab 100644 --- a/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform, clang, llvmPackages, rustfmt, writeScriptBin +{ lib, fetchFromGitHub, rustPlatform, clang, llvmPackages_latest, rustfmt, writeScriptBin , runtimeShell , bash }: @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0r60smhlx1992a1s1k5sxjpdqllb2xsqcimgx3ldp5fdkfphk3cw"; #for substituteAll - libclang = llvmPackages.libclang.lib; + libclang = llvmPackages_latest.libclang.lib; inherit bash; buildInputs = [ libclang ]; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix index 9458cb030a7c..71394c098907 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix @@ -5,7 +5,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-c"; - version = "0.8.0"; + version = "0.8.1"; src = stdenv.mkDerivation rec { name = "${pname}-source-${version}"; @@ -14,11 +14,11 @@ rustPlatform.buildRustPackage rec { owner = "lu-zero"; repo = pname; rev = "v${version}"; - sha256 = "1rvbikhbqsfa2sh79kapqg4yz19r1yhqfykl6cf4yjg6vawkwfw1"; + sha256 = "0fd0xql5cbqgmir2z3ah91iasaq9133wmi5bnhiy3dv7drcqv4rc"; }; cargoLock = fetchurl { url = "https://github.com/lu-zero/${pname}/releases/download/v${version}/Cargo.lock"; - sha256 = "17cdac8ym59jwjxs3k4isazknhrlr6lw0j0r76n5xf0dd7apfgcs"; + sha256 = "1xlh3h77rxhqyr1nkqyanb120lwdks6fklh202camqpmznd763g5"; }; installPhase = '' @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "0pxakfiidxfczh3harnjhb1zv340r812jxzwam8z2kyw3mkyhh8z"; + cargoSha256 = "0b952xkg0l31laqlhsv3cqdag7v15k9na6xr6q9y8xwy1fjh9gzv"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix index 092a0a10b1a0..12d9bd6bb036 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-cache"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "matthiaskrgr"; repo = pname; rev = version; - sha256 = "sha256-/xP6TQcLyY1XC8r5SCkwej/I6fMaV5PqNNuvK1WbmeM="; + sha256 = "sha256-y6rvdY9511XScxLWPrH9aUFgSmRYmGqKE56MPBTH9OM="; }; - cargoSha256 = "sha256-1ZNbqydRsXmMGLhqPrgNAE8bhpZCMAJO/YQbOvtiS/s="; + cargoSha256 = "sha256-H6MBAXrKu4hZwx3lGHN6YMuYzeb21Zq0tVlF/lsQmLI="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix index 2f20c66bbe25..d5fd7ee4a839 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix @@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.33.0"; + version = "0.34.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-OnCSWAGcxQsLq5aQmd/15lAQmdsCGPqLeRYWXQG0oG0="; + sha256 = "sha256-/9v9nedLoXwuFuqw3W4RjTwvNIlisbiPCcVF/0oH4fw="; }; nativeBuildInputs = [ pkg-config ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; - cargoSha256 = "sha256-BsE5+0bL9ctsdZ/PM1d6TfrXuzNMYHejoqA3bgH8140="; + cargoSha256 = "sha256-clav4lGDuWvwzq78Kw+vtz+boNcZnNH+NHH7ZaZYSC4="; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-msrv/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-msrv/default.nix index 74c2d9e680f0..216e83622158 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-msrv/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-msrv/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-msrv"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "foresterre"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DpgZrKy2rEKnI0/t4l3sDtNUhAwwFFSzq4CdRFqAkzY="; + sha256 = "sha256-yTUYMLVjzbuHqQxW68snxQ0CzoOwEBGXWFR/4yfDZ34="; }; - cargoSha256 = "sha256-ny8EA3dkirxEiFYiSFRxHnjf3mVO2LCWVR8fPHX87Ek="; + cargoSha256 = "sha256-WXvl+Xbu/oGTEFhbn6GuLoiNX+DxwhtT6cuucCOQsC4="; passthru = { updateScript = nix-update-script { diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix index 968a6ce457f1..0a76ae0202c4 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -1,22 +1,23 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, CoreServices, Security, libiconv }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, CoreServices, Security, libiconv, SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "cargo-udeps"; - version = "0.1.21"; + version = "0.1.22"; src = fetchFromGitHub { owner = "est31"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Voei7j3WRDu70NkcJvjqPJ4ikOUupOhvFNEHHRyF6/Q="; + sha256 = "sha256-z92q0uwL832Ph7sTpWpaa8e9Xrik9wnjQ7LBy/hY8KE="; }; - cargoSha256 = "sha256-zMya7bEehNKIfwQtJ252sflg06P4Ra8/lgBjn4UUqRg="; + cargoSha256 = "sha256-4HguNyPIjpFqa80dDVFgXDK7pHOuFJdpFNxLARXxT2g="; nativeBuildInputs = [ pkg-config ]; + # TODO figure out how to use provided curl instead of compiling curl from curl-sys buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ CoreServices Security libiconv ]; + ++ lib.optionals stdenv.isDarwin [ CoreServices Security libiconv SystemConfiguration ]; # Requires network access doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/rust/probe-run/default.nix b/nixpkgs/pkgs/development/tools/rust/probe-run/default.nix index 262d8c4945eb..336cbef9bae0 100644 --- a/nixpkgs/pkgs/development/tools/rust/probe-run/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/probe-run/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "probe-run"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "knurling-rs"; repo = pname; rev = "v${version}"; - sha256 = "avaGBIKldr+1Zwq+7NOHt2wldmY/6Lb6bi9uVHZFI5Q="; + sha256 = "0jvyqynhg2fva29bzj4wrg3f22xpvl1hdf9kqws2c3wdiz9lc8l4"; }; - cargoSha256 = "HmDKfb8F6sGnaX64FR3No2GbBYm4bVopbjs8d35WiZQ="; + cargoSha256 = "1jijpm4k3py09k9w9a2zj1795r02wsa53r4sxa4ws96d4gkv4x5b"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 ] diff --git a/nixpkgs/pkgs/development/tools/sentry-cli/default.nix b/nixpkgs/pkgs/development/tools/sentry-cli/default.nix new file mode 100644 index 000000000000..884c0edfb735 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/sentry-cli/default.nix @@ -0,0 +1,40 @@ +{ rustPlatform +, fetchFromGitHub +, lib +, openssl +, file +, rpm +, pkg-config +, stdenv +, curl +, Security +, runCommand +}: +rustPlatform.buildRustPackage rec { + pname = "sentry-cli"; + version = "1.66.0"; + + src = fetchFromGitHub { + owner = "getsentry"; + repo = "sentry-cli"; + rev = version; + sha256 = "sha256-ivQBn5GGb64Jq0gpywAg20309QQMpasg/Bu5sHKj02Y="; + }; + doCheck = false; + + # Needed to get openssl-sys to use pkgconfig. + OPENSSL_NO_VENDOR = 1; + + buildInputs = [ openssl file rpm ] ++ lib.optionals stdenv.isDarwin [ Security curl ]; + nativeBuildInputs = [ pkg-config ]; + + cargoSha256 = "sha256-xS88KZWYkg3v8TJZUVVgQhR++CrZGD0DQnLPktSUJQk="; + + meta = with lib; { + homepage = "https://docs.sentry.io/cli/"; + license = licenses.bsd3; + description = "A command line utility to work with Sentry."; + maintainers = with maintainers; [ rizary ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/tools/stylua/default.nix b/nixpkgs/pkgs/development/tools/stylua/default.nix new file mode 100644 index 000000000000..48250297e496 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/stylua/default.nix @@ -0,0 +1,35 @@ +{ fetchFromGitHub +, lib +, rustPlatform +, stdenvNoCC +, lua52Support ? true +, luauSupport ? false +}: + +rustPlatform.buildRustPackage rec { + pname = "stylua"; + version = "0.9.2"; + + src = fetchFromGitHub { + owner = "johnnymorganz"; + repo = pname; + rev = "v${version}"; + sha256 = "0idx4664p9ggv8p2pwgpch42li9ksiilszpwva19y4fa5xrmcyr2"; + }; + + cargoSha256 = "1hc7zvrfiiijk4wr6i5jk6k32nz0lf64gqin3n8b8x5pp9d8fcfk"; + + cargoBuildFlags = lib.optionals lua52Support [ "--features" "lua52" ] + ++ lib.optionals luauSupport [ "--features" "luau" ]; + + # test_standard fails on darwin + doCheck = !stdenvNoCC.isDarwin; + + meta = with lib; { + description = "An opinionated Lua code formatter"; + homepage = "https://github.com/johnnymorganz/stylua"; + changelog = "https://github.com/johnnymorganz/stylua/blob/v${version}/CHANGELOG.md"; + license = licenses.mpl20; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/symfony-cli/default.nix b/nixpkgs/pkgs/development/tools/symfony-cli/default.nix index eb12f9e1dcd7..6ff541b933c4 100644 --- a/nixpkgs/pkgs/development/tools/symfony-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/symfony-cli/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "symfony-cli"; - version = "4.25.2"; + version = "4.25.4"; src = fetchurl { url = "https://github.com/symfony/cli/releases/download/v${version}/symfony_linux_amd64.gz"; - sha256 = "8bfa53c1479883e9b48d2e4e5d3f6f7a511df73d65fe5c7b07a4890ee2c75c7e"; + sha256 = "94ade97d79e6949022ac45e4f8f9c025a9e3efa54a1a891a086a24eb9a9765a7"; }; dontBuild = true; diff --git a/nixpkgs/pkgs/development/tools/wiggle/default.nix b/nixpkgs/pkgs/development/tools/wiggle/default.nix index d360500e1fb2..6d1622c5b864 100644 --- a/nixpkgs/pkgs/development/tools/wiggle/default.nix +++ b/nixpkgs/pkgs/development/tools/wiggle/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, ncurses, groff }: +{ lib, stdenv, fetchFromGitHub, ncurses, groff }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { + name = "wiggle"; + version = "1.3"; - name = "wiggle-1.3"; - - src = fetchurl { - url = "https://github.com/neilbrown/wiggle/archive/v1.3.tar.gz"; - sha256 = "sha256-/5LPATPB9NzjNWPiY8sw59229KvfhtQnsewUkL7CWvo="; + src = fetchFromGitHub { + owner = "neilbrown"; + repo = "wiggle"; + rev = "v${version}"; + sha256 = "sha256-rlHhYzP81lfblZvtZ1lhiq4iQ6WRpBYukoGqpVP+NKI="; }; buildInputs = [ ncurses groff ]; @@ -21,24 +23,22 @@ stdenv.mkDerivation { patchShebangs . ''; - meta = { - homepage = "http://blog.neil.brown.name/category/wiggle/"; + meta = with lib; { + homepage = "https://blog.neil.brown.name/category/wiggle/"; description = "Tool for applying patches with conflicts"; - longDescription = '' - Wiggle applies patches to a file in a similar manner to the patch(1) - program. The distinctive difference is, however, that wiggle will - attempt to apply a patch even if the "before" part of the patch doesn't - match the target file perfectly. This is achieved by breaking the file - and patch into words and finding the best alignment of words in the file - with words in the patch. Once this alignment has been found, any - differences (word-wise) in the patch are applied to the file as best as - possible. Also, wiggle will (in some cases) detect changes that have - already been applied, and will ignore them. + Wiggle applies patches to a file in a similar manner to the patch(1) + program. The distinctive difference is, however, that wiggle will + attempt to apply a patch even if the "before" part of the patch doesn't + match the target file perfectly. This is achieved by breaking the file + and patch into words and finding the best alignment of words in the file + with words in the patch. Once this alignment has been found, any + differences (word-wise) in the patch are applied to the file as best as + possible. Also, wiggle will (in some cases) detect changes that have + already been applied, and will ignore them. ''; - - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.all; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = [ ]; }; - } diff --git a/nixpkgs/pkgs/development/web/deno/default.nix b/nixpkgs/pkgs/development/web/deno/default.nix index dee8ad0c9b84..1211440b6b43 100644 --- a/nixpkgs/pkgs/development/web/deno/default.nix +++ b/nixpkgs/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rsQ9MdMgYPqnLzMfW4rwDpx5QKVDm6TMCCHqJzvTpjw="; + sha256 = "sha256-+EXkWtqJihNx5wvEhRycVpPDs1QxfoqcbMW5aLrofI8="; }; - cargoSha256 = "sha256-nKbc73bEKb0XzuBZApu21E1OzkgU9sqbCaaWhUMiWdQ="; + cargoSha256 = "sha256-j/1NJlGRq1MuE+EU7VstwSMmRYfudBmv3nAe3bAyv+U="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/development/web/flyctl/default.nix b/nixpkgs/pkgs/development/web/flyctl/default.nix index e0412b0dd366..130ff9c9bcbf 100644 --- a/nixpkgs/pkgs/development/web/flyctl/default.nix +++ b/nixpkgs/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.222"; + version = "0.0.227"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-yFcsbk5CAOqnT1ljOe+lGfEj1sCBsaFNZnfcQOfezs4="; + sha256 = "sha256-nql0zK2H0FDQMsnSJSNzC7YmvUZfITHH5p1efFHsj58="; }; preBuild = '' diff --git a/nixpkgs/pkgs/development/web/nodejs/v14.nix b/nixpkgs/pkgs/development/web/nodejs/v14.nix index 7054e4c66b87..27b2a4f33191 100644 --- a/nixpkgs/pkgs/development/web/nodejs/v14.nix +++ b/nixpkgs/pkgs/development/web/nodejs/v14.nix @@ -1,14 +1,13 @@ -{ callPackage, icu68, python3, lib, stdenv, enableNpm ? true }: +{ callPackage, python3, lib, stdenv, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { - icu = icu68; python = python3; }; in buildNodejs { inherit enableNpm; - version = "14.17.0"; - sha256 = "1vf989canwcx0wdpngvkbz2x232yccp7fzs1vcbr60rijgzmpq2n"; + version = "14.17.1"; + sha256 = "0zr4b9gja8f9611rnmc9yacmh90bd76xv9ayikcyqdfzdpax5wfx"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/nixpkgs/pkgs/development/web/protege-distribution/default.nix b/nixpkgs/pkgs/development/web/protege-distribution/default.nix new file mode 100644 index 000000000000..49d28cb17ee8 --- /dev/null +++ b/nixpkgs/pkgs/development/web/protege-distribution/default.nix @@ -0,0 +1,73 @@ +{ lib, stdenv, fetchurl, unzip, jre8, copyDesktopItems, makeDesktopItem }: + +stdenv.mkDerivation rec { + pname = "protege-distribution"; + version = "5.5.0"; + + src = fetchurl { + url = "https://github.com/protegeproject/protege-distribution/releases/download/v${version}/Protege-${version}-platform-independent.zip"; + sha256 = "092x22wyisdnhccx817mqq15sxqdfc7iz4whr4mbvzrd9di6ipjq"; + }; + + nativeBuildInputs = [ unzip copyDesktopItems ]; + + postPatch = '' + # Delete all those commands meant to change directory to the source directory + sed -i -e '3,9d' run.sh + + # Change directory to where the application is stored to avoid heavy patching + # of searchpaths + sed -i -e "2a\ + cd $out/protege" run.sh + + # Set the correct Java executable (Protege is a JRE 8 application) + substituteInPlace run.sh \ + --replace "java -X" "exec ${jre8.outPath}/bin/java -X" \ + + # Silence console logs, since these are not shown in graphical environments + sed -i -e '4,8d;21d' conf/logback.xml + ''; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir $out + + # Delete non-Linux launch scripts + rm run.{bat,command} + + # Move launch script into /bin, giving it a recognizable name + install -D run.sh $out/bin/run-protege + + # Copy icon to where it can be found + install -D app/Protege.ico $out/share/icons/hicolor/128x128/apps/protege.ico + + # Move everything else under protege/ + mkdir $out/protege + mv {bin,bundles,conf,plugins} $out/protege + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "Protege"; + desktopName = "Protege Desktop"; + icon = "protege.ico"; + comment = "OWL2 ontology editor"; + exec = "run-protege"; + }) + ]; + + meta = with lib; { + description = "The OWL2 ontology editor from Stanford, with third-party plugins included"; + homepage = "https://protege.stanford.edu/"; + downloadPage = "https://protege.stanford.edu/products.php#desktop-protege"; + maintainers = with maintainers; [ nessdoor ]; + license = with licenses; [ asl20 bsd2 epl10 lgpl3 ]; + platforms = platforms.linux; + }; +} |