diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-03-15 10:36:38 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-03-16 11:37:19 +0000 |
| commit | d435710923ac6e6f9fc155534800745004f2ce93 (patch) | |
| tree | 386f9401476f96bdc6ec25173a090198942b5d5b /nixpkgs/pkgs/development | |
| parent | c725f0011e91ae49d351b981690eb66b862b6104 (diff) | |
| parent | 3239fd2b8f728106491154b44625662e10259af2 (diff) | |
| download | nixlib-d435710923ac6e6f9fc155534800745004f2ce93.tar nixlib-d435710923ac6e6f9fc155534800745004f2ce93.tar.gz nixlib-d435710923ac6e6f9fc155534800745004f2ce93.tar.bz2 nixlib-d435710923ac6e6f9fc155534800745004f2ce93.tar.lz nixlib-d435710923ac6e6f9fc155534800745004f2ce93.tar.xz nixlib-d435710923ac6e6f9fc155534800745004f2ce93.tar.zst nixlib-d435710923ac6e6f9fc155534800745004f2ce93.zip | |
Merge commit '3239fd2b8f728106491154b44625662e10259af2'
Conflicts: nixpkgs/pkgs/applications/window-managers/sway/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development')
1232 files changed, 20188 insertions, 9588 deletions
diff --git a/nixpkgs/pkgs/development/beam-modules/elvis-erlang/default.nix b/nixpkgs/pkgs/development/beam-modules/elvis-erlang/default.nix index e077040c69c6..810486e2bc45 100644 --- a/nixpkgs/pkgs/development/beam-modules/elvis-erlang/default.nix +++ b/nixpkgs/pkgs/development/beam-modules/elvis-erlang/default.nix @@ -24,7 +24,7 @@ in rebar3Relx rec { set -euo pipefail - latest=$(list-git-tags https://github.com/${owner}/${repo}.git | sort -V | tail -1) + latest=$(list-git-tags --url=https://github.com/${owner}/${repo}.git | sort -V | tail -1) if [ "$latest" != "${version}" ]; then nixpkgs="$(git rev-parse --show-toplevel)" nix_path="$nixpkgs/pkgs/development/beam-modules/elvis-erlang" diff --git a/nixpkgs/pkgs/development/beam-modules/erlang-ls/default.nix b/nixpkgs/pkgs/development/beam-modules/erlang-ls/default.nix index 08ebb6136fc5..be9c647437ec 100644 --- a/nixpkgs/pkgs/development/beam-modules/erlang-ls/default.nix +++ b/nixpkgs/pkgs/development/beam-modules/erlang-ls/default.nix @@ -51,7 +51,7 @@ rebar3Relx { #! nix-shell -i bash -p common-updater-scripts coreutils git gnused gnutar gzip "rebar3WithPlugins { globalPlugins = [ beamPackages.rebar3-nix ]; }" set -ox errexit - latest=$(list-git-tags https://github.com/${owner}/${repo}.git | sed -n '/[\d\.]\+/p' | sort -V | tail -1) + latest=$(list-git-tags --url=https://github.com/${owner}/${repo}.git | sed -n '/[\d\.]\+/p' | sort -V | tail -1) if [[ "$latest" != "${version}" ]]; then nixpkgs="$(git rev-parse --show-toplevel)" nix_path="$nixpkgs/pkgs/development/beam-modules/erlang-ls" diff --git a/nixpkgs/pkgs/development/compilers/bs-platform/ocaml.nix b/nixpkgs/pkgs/development/compilers/bs-platform/ocaml.nix index d650d767a8d8..05fb8b6b17ea 100644 --- a/nixpkgs/pkgs/development/compilers/bs-platform/ocaml.nix +++ b/nixpkgs/pkgs/development/compilers/bs-platform/ocaml.nix @@ -1,7 +1,7 @@ { lib, stdenv, src, version }: stdenv.mkDerivation rec { inherit src version; - name = "ocaml-${version}+bs"; + pname = "ocaml-bs"; configurePhase = '' ./configure -prefix $out ''; diff --git a/nixpkgs/pkgs/development/compilers/crystal/build-package.nix b/nixpkgs/pkgs/development/compilers/crystal/build-package.nix index 2328e76ad770..a44eaeb369b6 100644 --- a/nixpkgs/pkgs/development/compilers/crystal/build-package.nix +++ b/nixpkgs/pkgs/development/compilers/crystal/build-package.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation (mkDerivationArgs // { '') crystalBinaries) ++ lib.optional (format == "shards") - "shards build --local --production ${lib.concatStringsSep " " defaultOptions}" + "shards build --local --production ${lib.concatStringsSep " " (args.options or defaultOptions)}" ++ [ "runHook postBuild" ])); installPhase = args.installPhase or (lib.concatStringsSep "\n" ([ diff --git a/nixpkgs/pkgs/development/compilers/cudatoolkit/default.nix b/nixpkgs/pkgs/development/compilers/cudatoolkit/default.nix index 33a386cfb926..6e6b27c2cf7c 100644 --- a/nixpkgs/pkgs/development/compilers/cudatoolkit/default.nix +++ b/nixpkgs/pkgs/development/compilers/cudatoolkit/default.nix @@ -79,5 +79,12 @@ rec { gcc = gcc10; # can bump to 11 along with stdenv.cc }; + cudatoolkit_11_6 = common { + version = "11.6.1"; + url = "https://developer.download.nvidia.com/compute/cuda/11.6.1/local_installers/cuda_11.6.1_510.47.03_linux.run"; + sha256 = "sha256-qyGa/OALdCABEyaYZvv/derQN7z8I1UagzjCaEyYTX4="; + gcc = gcc10; # can bump to 11 along with stdenv.cc + }; + cudatoolkit_11 = cudatoolkit_11_4; } diff --git a/nixpkgs/pkgs/development/compilers/dictu/default.nix b/nixpkgs/pkgs/development/compilers/dictu/default.nix index 8ff6a5120f75..94871fd7d7ca 100644 --- a/nixpkgs/pkgs/development/compilers/dictu/default.nix +++ b/nixpkgs/pkgs/development/compilers/dictu/default.nix @@ -13,13 +13,13 @@ assert enableLTO -> stdenv.cc.isGNU; stdenv.mkDerivation rec { pname = "dictu"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "dictu-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-K/RbkRK8nCkmaNwWplWe2nWtULhn/GCNPXYStfMeUPg="; + sha256 = "sha256-EYoLEyK8jh4z3/9aMuUBt0pCwks7NIevsK2mOh8x6bQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/compilers/dotnet/build-dotnet.nix b/nixpkgs/pkgs/development/compilers/dotnet/build-dotnet.nix index 21cc6c8227cd..55deb594706f 100644 --- a/nixpkgs/pkgs/development/compilers/dotnet/build-dotnet.nix +++ b/nixpkgs/pkgs/development/compilers/dotnet/build-dotnet.nix @@ -4,9 +4,11 @@ }: assert builtins.elem type [ "aspnetcore" "runtime" "sdk"]; + { lib , stdenv , fetchurl +, writeText , libunwind , openssl , icu @@ -87,6 +89,13 @@ in stdenv.mkDerivation rec { $out/bin/dotnet --info ''; + setupHook = writeText "dotnet-setup-hook" '' + export HOME=$(mktemp -d) # Dotnet expects a writable home directory for its configuration files + export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 # Dont try to expand NuGetFallbackFolder to disk + export DOTNET_NOLOGO=1 # Disables the welcome message + export DOTNET_CLI_TELEMETRY_OPTOUT=1 + ''; + meta = with lib; { homepage = "https://dotnet.github.io/"; description = builtins.getAttr type descriptions; diff --git a/nixpkgs/pkgs/development/compilers/edk2/default.nix b/nixpkgs/pkgs/development/compilers/edk2/default.nix index e60d647f6d38..47ea90482b6d 100644 --- a/nixpkgs/pkgs/development/compilers/edk2/default.nix +++ b/nixpkgs/pkgs/development/compilers/edk2/default.nix @@ -33,7 +33,7 @@ buildType = if stdenv.isDarwin then edk2 = buildStdenv.mkDerivation { pname = "edk2"; - version = "202108"; + version = "202202"; # submodules src = fetchFromGitHub { @@ -41,21 +41,9 @@ edk2 = buildStdenv.mkDerivation { repo = "edk2"; rev = "edk2-stable${edk2.version}"; fetchSubmodules = true; - sha256 = "1ps244f7y43afxxw6z95xscy24f9mpp8g0mfn90rd4229f193ba2"; + sha256 = "0srmhi6c27n5vyl01nhh0fq8k4vngbwn79siyjvcacjbj2ivhh8d"; }; - patches = [ - # Pull upstream fix for gcc-11 build. - (fetchpatch { - name = "gcc-11-vla.patch"; - url = "https://github.com/google/brotli/commit/0a3944c8c99b8d10cc4325f721b7c273d2b41f7b.patch"; - sha256 = "10c6ibnxh4f8lrh9i498nywgva32jxy2c1zzvr9mcqgblf9d19pj"; - # Apply submodule patch to subdirectory: "a/" -> "BaseTools/Source/C/BrotliCompress/brotli/" - stripLen = 1; - extraPrefix = "BaseTools/Source/C/BrotliCompress/brotli/"; - }) - ]; - buildInputs = [ libuuid pythonEnv ]; makeFlags = [ "-C BaseTools" ] @@ -75,7 +63,7 @@ edk2 = buildStdenv.mkDerivation { meta = with lib; { description = "Intel EFI development kit"; - homepage = "https://sourceforge.net/projects/edk2/"; + homepage = "https://github.com/tianocore/tianocore.github.io/wiki/EDK-II/"; license = licenses.bsd2; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" ]; }; diff --git a/nixpkgs/pkgs/development/compilers/elm/default.nix b/nixpkgs/pkgs/development/compilers/elm/default.nix index 149d81150548..ab19ac42d24c 100644 --- a/nixpkgs/pkgs/development/compilers/elm/default.nix +++ b/nixpkgs/pkgs/development/compilers/elm/default.nix @@ -7,7 +7,7 @@ let fetchElmDeps = pkgs.callPackage ./fetchElmDeps.nix { }; - hsPkgs = self: pkgs.haskellPackages.override { + hsPkgs = self: pkgs.haskell.packages.ghc8107.override { overrides = self: super: with pkgs.haskell.lib.compose; with lib; let elmPkgs = rec { elm = overrideCabal (drv: { @@ -200,4 +200,3 @@ in lib.makeScope pkgs.newScope (self: with self; { inherit (nodePkgs) elm-doc-preview elm-live elm-upgrade elm-xref elm-analyse elm-git-install; }) ) - diff --git a/nixpkgs/pkgs/development/compilers/fasm/bin.nix b/nixpkgs/pkgs/development/compilers/fasm/bin.nix index 9f4263b08ed5..d9f809c0a0ae 100644 --- a/nixpkgs/pkgs/development/compilers/fasm/bin.nix +++ b/nixpkgs/pkgs/development/compilers/fasm/bin.nix @@ -3,11 +3,11 @@ stdenvNoCC.mkDerivation rec { pname = "fasm-bin"; - version = "1.73.29"; + version = "1.73.30"; src = fetchurl { url = "https://flatassembler.net/fasm-${version}.tgz"; - sha256 = "sha256-Yyj02DRo9wTkJ01ukOwElHr1ZyZFPOMTibwyAkqYISs="; + sha256 = "sha256-dRlQUaWIHbu+DwQBFh6Tf4o2u0LTRw/Ehp2hT9LC8QE="; }; installPhase = '' diff --git a/nixpkgs/pkgs/development/compilers/flutter/default.nix b/nixpkgs/pkgs/development/compilers/flutter/default.nix index 6f6130c36785..9eba67734485 100644 --- a/nixpkgs/pkgs/development/compilers/flutter/default.nix +++ b/nixpkgs/pkgs/development/compilers/flutter/default.nix @@ -4,20 +4,20 @@ let getPatches = dir: let files = builtins.attrNames (builtins.readDir dir); in map (f: dir + ("/" + f)) files; - version = "2.10.0"; + version = "2.10.1"; channel = "stable"; filename = "flutter_linux_${version}-${channel}.tar.xz"; # Decouples flutter derivation from dart derivation, # use specific dart version to not need to bump dart derivation when bumping flutter. - dartVersion = "2.16.0"; + dartVersion = "2.16.1"; dartSourceBase = "https://storage.googleapis.com/dart-archive/channels"; dartForFlutter = dart.override { version = dartVersion; sources = { "${dartVersion}-x86_64-linux" = fetchurl { url = "${dartSourceBase}/stable/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip"; - sha256 = "sha256-n+hr3iMt5S0iEeR/X9zBQ86TbjCajaG0RyE+Ij1/aNM="; + sha256 = "sha256-PMY6DCFQC8XrlnFzOEPcwgBAs5/cAvNd78969Z+I1Fk="; }; }; }; @@ -29,7 +29,7 @@ in { pname = "flutter"; src = fetchurl { url = "https://storage.googleapis.com/flutter_infra_release/releases/${channel}/linux/${filename}"; - sha256 = "sha256-4ZEpZPGVnisnK9QT1o4G2G6CiflYElh+e3+X8odnx1U="; + sha256 = "sha256-rSfwcglDV2rvJl10j7FByAWmghd2FYxrlkgYnvRO54Y="; }; patches = getPatches ./patches; }; diff --git a/nixpkgs/pkgs/development/compilers/fstar/default.nix b/nixpkgs/pkgs/development/compilers/fstar/default.nix index 25abd7949071..fc0f50d0797f 100644 --- a/nixpkgs/pkgs/development/compilers/fstar/default.nix +++ b/nixpkgs/pkgs/development/compilers/fstar/default.nix @@ -11,20 +11,26 @@ stdenv.mkDerivation rec { sha256 = "sha256-bK3McF/wTjT9q6luihPaEXjx7Lu6+ZbQ9G61Mc4KoB0="; }; - nativeBuildInputs = [ makeWrapper installShellFiles ]; + strictDeps = true; - buildInputs = [ - z3 + nativeBuildInputs = [ + makeWrapper + installShellFiles ] ++ (with ocamlPackages; [ ocaml findlib ocamlbuild + menhir + ]); + + buildInputs = [ + z3 + ] ++ (with ocamlPackages; [ batteries zarith stdint yojson fileutils - menhir menhirLib pprint sedlex_2 diff --git a/nixpkgs/pkgs/development/compilers/gleam/default.nix b/nixpkgs/pkgs/development/compilers/gleam/default.nix index 891751a6ad6b..3f704b525722 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.19.0"; + version = "0.20.1"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pJ4RSijuwdKAL24WzcDIQen1RGofN1tUlbAA18zUvBE="; + sha256 = "sha256-AK+eb0eJyI7ALn7sg0wz4GzHthxrJWd1PVT5bL9LKWA="; }; nativeBuildInputs = [ pkg-config ]; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; - cargoSha256 = "sha256-f/6LdvKRykpBX2GlRuyUcSD719f6XzhbMHzhrGNU0Cg="; + cargoSha256 = "sha256-kFTAPbP42sbhsvP069ua0ys1Dw7W+Gdsv2YaGrzorIk="; meta = with lib; { description = "A statically typed language for the Erlang VM"; diff --git a/nixpkgs/pkgs/development/compilers/go-jsonnet/default.nix b/nixpkgs/pkgs/development/compilers/go-jsonnet/default.nix index 2b7c6a2f0715..25bedd397b2f 100644 --- a/nixpkgs/pkgs/development/compilers/go-jsonnet/default.nix +++ b/nixpkgs/pkgs/development/compilers/go-jsonnet/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, testVersion }: -buildGoModule rec { +let self = buildGoModule rec { pname = "go-jsonnet"; version = "0.18.0"; @@ -15,12 +15,19 @@ buildGoModule rec { doCheck = false; - subPackages = [ "cmd/jsonnet" "cmd/jsonnetfmt" ]; + subPackages = [ "cmd/jsonnet*" ]; + + passthru.tests.version = testVersion { + package = self; + version = "v${version}"; + }; meta = with lib; { description = "An implementation of Jsonnet in pure Go"; homepage = "https://github.com/google/go-jsonnet"; license = licenses.asl20; - maintainers = with maintainers; [ nshalman ]; + maintainers = with maintainers; [ nshalman aaronjheng ]; + mainProgram = "jsonnet"; }; -} +}; +in self diff --git a/nixpkgs/pkgs/development/compilers/go/1.16.nix b/nixpkgs/pkgs/development/compilers/go/1.16.nix index 46591d2369dc..c30abc44fe20 100644 --- a/nixpkgs/pkgs/development/compilers/go/1.16.nix +++ b/nixpkgs/pkgs/development/compilers/go/1.16.nix @@ -54,11 +54,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.16.14"; + version = "1.16.15"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "sha256-RniYzTohbeVNy5AU9UHv536beacVTbwf0t13iwxj+1Y="; + sha256 = "sha256-kKCMaJJ54184ZbpRCZjDOmMlXDYImz7CBskS/AVow9M="; }; # perl is used for testing go vet diff --git a/nixpkgs/pkgs/development/compilers/haxe/default.nix b/nixpkgs/pkgs/development/compilers/haxe/default.nix index d5277899892e..4ac022be6a9f 100644 --- a/nixpkgs/pkgs/development/compilers/haxe/default.nix +++ b/nixpkgs/pkgs/development/compilers/haxe/default.nix @@ -3,7 +3,7 @@ let ocamlDependencies = version: if lib.versionAtLeast version "4.2" - then with ocaml-ng.ocamlPackages; [ + then with ocaml-ng.ocamlPackages_4_12; [ ocaml findlib sedlex_2 diff --git a/nixpkgs/pkgs/development/compilers/ios-cross-compile/9.2.nix b/nixpkgs/pkgs/development/compilers/ios-cross-compile/9.2.nix index 688ca15177a8..ea1af60993f9 100644 --- a/nixpkgs/pkgs/development/compilers/ios-cross-compile/9.2.nix +++ b/nixpkgs/pkgs/development/compilers/ios-cross-compile/9.2.nix @@ -4,7 +4,7 @@ automake, autoconf, libtool, clangStdenv } : clangStdenv.mkDerivation rec { - name = "ios-cross-compile-${version}"; + pname = "ios-cross-compile"; version = "9.2"; sdk = "iPhoneOS9.2.sdk"; cctools_port = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/compilers/llvm/14/bintools/default.nix b/nixpkgs/pkgs/development/compilers/llvm/14/bintools/default.nix new file mode 100644 index 000000000000..53f7941e3369 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/14/bintools/default.nix @@ -0,0 +1,29 @@ +{ runCommand, stdenv, llvm, lld, version }: + +let + prefix = + if stdenv.hostPlatform != stdenv.targetPlatform + then "${stdenv.targetPlatform.config}-" + else ""; +in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' + mkdir -p $out/bin + for prog in ${lld}/bin/*; do + ln -s $prog $out/bin/${prefix}$(basename $prog) + done + for prog in ${llvm}/bin/*; do + ln -sf $prog $out/bin/${prefix}$(basename $prog) + done + + ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}ar + ln -s ${llvm}/bin/llvm-as $out/bin/${prefix}as + ln -s ${llvm}/bin/llvm-dwp $out/bin/${prefix}dwp + ln -s ${llvm}/bin/llvm-nm $out/bin/${prefix}nm + ln -s ${llvm}/bin/llvm-objcopy $out/bin/${prefix}objcopy + ln -s ${llvm}/bin/llvm-objdump $out/bin/${prefix}objdump + ln -s ${llvm}/bin/llvm-ranlib $out/bin/${prefix}ranlib + ln -s ${llvm}/bin/llvm-readelf $out/bin/${prefix}readelf + ln -s ${llvm}/bin/llvm-size $out/bin/${prefix}size + ln -s ${llvm}/bin/llvm-strip $out/bin/${prefix}strip + + ln -s ${lld}/bin/lld $out/bin/${prefix}ld +'' diff --git a/nixpkgs/pkgs/development/compilers/llvm/14/clang/default.nix b/nixpkgs/pkgs/development/compilers/llvm/14/clang/default.nix new file mode 100644 index 000000000000..9544494b356e --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/14/clang/default.nix @@ -0,0 +1,131 @@ +{ lib, stdenv, llvm_meta +, monorepoSrc, runCommand +, substituteAll, cmake, libxml2, libllvm, version, python3 +, buildLlvmTools +, fixDarwinDylibNames +, enableManpages ? false +}: + +let + self = stdenv.mkDerivation (rec { + pname = "clang"; + inherit version; + + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + ''; + + sourceRoot = "${src.name}/${pname}"; + + nativeBuildInputs = [ cmake python3 ] + ++ lib.optional enableManpages python3.pkgs.sphinx + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + + buildInputs = [ libxml2 libllvm ]; + + cmakeFlags = [ + "-DCMAKE_CXX_FLAGS=-std=c++14" + "-DCLANGD_BUILD_XPC=OFF" + "-DLLVM_ENABLE_RTTI=ON" + ] ++ lib.optionals enableManpages [ + "-DCLANG_INCLUDE_DOCS=ON" + "-DLLVM_ENABLE_SPHINX=ON" + "-DSPHINX_OUTPUT_MAN=ON" + "-DSPHINX_OUTPUT_HTML=OFF" + "-DSPHINX_WARNINGS_AS_ERRORS=OFF" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" + "-DCLANG_TABLEGEN=${buildLlvmTools.libclang.dev}/bin/clang-tblgen" + ]; + + patches = [ + ./purity.patch + # https://reviews.llvm.org/D51899 + ./gnu-install-dirs.patch + (substituteAll { + src = ../../clang-11-12-LLVMgold-path.patch; + libllvmLibdir = "${libllvm.lib}/lib"; + }) + ]; + + postPatch = '' + (cd tools && ln -s ../../clang-tools-extra extra) + + sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \ + -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \ + lib/Driver/ToolChains/*.cpp + + # Patch for standalone doc building + sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt + '' + lib.optionalString stdenv.hostPlatform.isMusl '' + sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp + ''; + + outputs = [ "out" "lib" "dev" "python" ]; + + postInstall = '' + ln -sv $out/bin/clang $out/bin/cpp + + # Move libclang to 'lib' output + moveToOutput "lib/libclang.*" "$lib" + moveToOutput "lib/libclang-cpp.*" "$lib" + substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \ + --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." \ + --replace "\''${_IMPORT_PREFIX}/lib/libclang-cpp." "$lib/lib/libclang-cpp." + + mkdir -p $python/bin $python/share/clang/ + mv $out/bin/{git-clang-format,scan-view} $python/bin + if [ -e $out/bin/set-xcode-analyzer ]; then + mv $out/bin/set-xcode-analyzer $python/bin + fi + mv $out/share/clang/*.py $python/share/clang + rm $out/bin/c-index-test + + mkdir -p $dev/bin + cp bin/clang-tblgen $dev/bin + ''; + + passthru = { + isClang = true; + inherit libllvm; + }; + + meta = llvm_meta // { + homepage = "https://clang.llvm.org/"; + description = "A C language family frontend for LLVM"; + longDescription = '' + The Clang project provides a language front-end and tooling + infrastructure for languages in the C language family (C, C++, Objective + C/C++, OpenCL, CUDA, and RenderScript) for the LLVM project. + It aims to deliver amazingly fast compiles, extremely useful error and + warning messages and to provide a platform for building great source + level tools. The Clang Static Analyzer and clang-tidy are tools that + automatically find bugs in your code, and are great examples of the sort + of tools that can be built using the Clang frontend as a library to + parse C/C++ code. + ''; + }; + } // lib.optionalAttrs enableManpages { + pname = "clang-manpages"; + + buildPhase = '' + make docs-clang-man + ''; + + installPhase = '' + mkdir -p $out/share/man/man1 + # Manually install clang manpage + cp docs/man/*.1 $out/share/man/man1/ + ''; + + outputs = [ "out" ]; + + doCheck = false; + + meta = llvm_meta // { + description = "man page for Clang ${version}"; + }; + }); +in self diff --git a/nixpkgs/pkgs/development/compilers/llvm/14/clang/gnu-install-dirs.patch b/nixpkgs/pkgs/development/compilers/llvm/14/clang/gnu-install-dirs.patch new file mode 100644 index 000000000000..57c54e18c37b --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/14/clang/gnu-install-dirs.patch @@ -0,0 +1,50 @@ +diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake +index 9bbbfc032b7d..947bd0da865d 100644 +--- a/cmake/modules/AddClang.cmake ++++ b/cmake/modules/AddClang.cmake +@@ -119,8 +119,8 @@ macro(add_clang_library name) + install(TARGETS ${lib} + COMPONENT ${lib} + ${export_to_clangtargets} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") + + if (NOT LLVM_ENABLE_IDE) +@@ -175,7 +175,7 @@ endmacro() + macro(add_clang_symlink name dest) + add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE) + # Always generate install targets +- llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE) ++ llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE) + endmacro() + + function(clang_target_link_libraries target type) +diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt +index 078988980c52..14b58614b40a 100644 +--- a/lib/Headers/CMakeLists.txt ++++ b/lib/Headers/CMakeLists.txt +@@ -234,7 +234,7 @@ set_target_properties(clang-resource-headers PROPERTIES + FOLDER "Misc" + RUNTIME_OUTPUT_DIRECTORY "${output_dir}") + +-set(header_install_dir lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) ++set(header_install_dir ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) + + install( + FILES ${files} ${generated_files} +diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt +index 4e0647971ab4..68dd67fcc476 100644 +--- a/tools/libclang/CMakeLists.txt ++++ b/tools/libclang/CMakeLists.txt +@@ -216,7 +216,7 @@ foreach(PythonVersion ${CLANG_PYTHON_BINDINGS_VERSIONS}) + COMPONENT + libclang-python-bindings + DESTINATION +- "lib${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages") ++ "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages") + endforeach() + if(NOT LLVM_ENABLE_IDE) + add_custom_target(libclang-python-bindings) diff --git a/nixpkgs/pkgs/development/compilers/llvm/14/clang/purity.patch b/nixpkgs/pkgs/development/compilers/llvm/14/clang/purity.patch new file mode 100644 index 000000000000..deb230a36c5b --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/14/clang/purity.patch @@ -0,0 +1,28 @@ +From 4add81bba40dcec62c4ea4481be8e35ac53e89d8 Mon Sep 17 00:00:00 2001 +From: Will Dietz <w@wdtz.org> +Date: Thu, 18 May 2017 11:56:12 -0500 +Subject: [PATCH] "purity" patch for 5.0 + +--- + lib/Driver/ToolChains/Gnu.cpp | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp +index fe3c0191bb..c6a482bece 100644 +--- a/lib/Driver/ToolChains/Gnu.cpp ++++ b/lib/Driver/ToolChains/Gnu.cpp +@@ -487,12 +487,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA, + if (!IsStatic) { + if (Args.hasArg(options::OPT_rdynamic)) + CmdArgs.push_back("-export-dynamic"); +- +- if (!Args.hasArg(options::OPT_shared) && !IsStaticPIE) { +- CmdArgs.push_back("-dynamic-linker"); +- CmdArgs.push_back(Args.MakeArgString(Twine(D.DyldPrefix) + +- ToolChain.getDynamicLinker(Args))); +- } + } + + CmdArgs.push_back("-o"); +-- +2.11.0 diff --git a/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/X86-support-extension.patch b/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/X86-support-extension.patch new file mode 100644 index 000000000000..66742e5b1498 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/X86-support-extension.patch @@ -0,0 +1,21 @@ +diff --git a/lib/builtins/CMakeLists.txt b/lib/builtins/CMakeLists.txt +index 3a66dd9c3fb..7efc85d9f9f 100644 +--- a/lib/builtins/CMakeLists.txt ++++ b/lib/builtins/CMakeLists.txt +@@ -345,4 +345,8 @@ if (NOT MSVC) + ++ set(i486_SOURCES ${i386_SOURCES}) ++ set(i586_SOURCES ${i386_SOURCES}) ++ set(i686_SOURCES ${i386_SOURCES}) ++ + if (WIN32) + set(i386_SOURCES + ${i386_SOURCES} +@@ -608,6 +612,7 @@ else () + endif() + + foreach (arch ${BUILTIN_SUPPORTED_ARCH}) ++ message("arch: ${arch}") + if (CAN_TARGET_${arch}) + # For ARM archs, exclude any VFP builtins if VFP is not supported + if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") diff --git a/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/armv7l.patch b/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/armv7l.patch new file mode 100644 index 000000000000..120cfe6feb2a --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/armv7l.patch @@ -0,0 +1,32 @@ +diff -ur compiler-rt-10.0.0.src/cmake/builtin-config-ix.cmake compiler-rt-10.0.0.src-patched/cmake/builtin-config-ix.cmake +--- compiler-rt-10.0.0.src/cmake/builtin-config-ix.cmake 2020-03-24 00:01:02.000000000 +0900 ++++ compiler-rt-10.0.0.src-patched/cmake/builtin-config-ix.cmake 2020-05-10 03:42:00.883450706 +0900 +@@ -24,7 +24,7 @@ + + + set(ARM64 aarch64) +-set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k) ++set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv7l) + set(HEXAGON hexagon) + set(X86 i386) + set(X86_64 x86_64) +diff -ur compiler-rt-10.0.0.src/lib/builtins/CMakeLists.txt compiler-rt-10.0.0.src-patched/lib/builtins/CMakeLists.txt +--- compiler-rt-10.0.0.src/lib/builtins/CMakeLists.txt 2020-03-24 00:01:02.000000000 +0900 ++++ compiler-rt-10.0.0.src-patched/lib/builtins/CMakeLists.txt 2020-05-10 03:44:49.468579650 +0900 +@@ -474,6 +474,7 @@ + set(armv7_SOURCES ${arm_SOURCES}) + set(armv7s_SOURCES ${arm_SOURCES}) + set(armv7k_SOURCES ${arm_SOURCES}) ++set(armv7l_SOURCES ${arm_SOURCES}) + set(arm64_SOURCES ${aarch64_SOURCES}) + + # macho_embedded archs +@@ -595,7 +596,7 @@ + foreach (arch ${BUILTIN_SUPPORTED_ARCH}) + if (CAN_TARGET_${arch}) + # For ARM archs, exclude any VFP builtins if VFP is not supported +- if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") ++ if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em)$") + string(REPLACE ";" " " _TARGET_${arch}_CFLAGS "${TARGET_${arch}_CFLAGS}") + check_compile_definition(__VFP_FP__ "${CMAKE_C_FLAGS} ${_TARGET_${arch}_CFLAGS}" COMPILER_RT_HAS_${arch}_VFP) + if(NOT COMPILER_RT_HAS_${arch}_VFP) diff --git a/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/codesign.patch b/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/codesign.patch new file mode 100644 index 000000000000..065959d14d46 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/codesign.patch @@ -0,0 +1,33 @@ +From 3dec5f3475a26aeb4678627795c4b67c6b7b4785 Mon Sep 17 00:00:00 2001 +From: Will Dietz <w@wdtz.org> +Date: Tue, 19 Sep 2017 13:13:06 -0500 +Subject: [PATCH] remove codesign use on Apple, disable ios sim testing that + needs it + +--- + cmake/Modules/AddCompilerRT.cmake | 8 ------ + test/asan/CMakeLists.txt | 52 --------------------------------------- + test/tsan/CMakeLists.txt | 47 ----------------------------------- + 3 files changed, 107 deletions(-) + +diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake +index bc69ec95c419..9f100fdcec2f 100644 +--- a/cmake/Modules/AddCompilerRT.cmake ++++ b/cmake/Modules/AddCompilerRT.cmake +@@ -366,14 +366,6 @@ function(add_compiler_rt_runtime name type) + set_target_properties(${libname} PROPERTIES IMPORT_PREFIX "") + set_target_properties(${libname} PROPERTIES IMPORT_SUFFIX ".lib") + endif() +- if(APPLE) +- # Ad-hoc sign the dylibs +- add_custom_command(TARGET ${libname} +- POST_BUILD +- COMMAND codesign --sign - $<TARGET_FILE:${libname}> +- WORKING_DIRECTORY ${COMPILER_RT_OUTPUT_LIBRARY_DIR} +- ) +- endif() + endif() + + set(parent_target_arg) +2.14.1 + diff --git a/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/darwin-targetconditionals.patch b/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/darwin-targetconditionals.patch new file mode 100644 index 000000000000..425dc2af01e7 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/darwin-targetconditionals.patch @@ -0,0 +1,71 @@ +diff --git a/lib/sanitizer_common/sanitizer_mac.cpp b/lib/sanitizer_common/sanitizer_mac.cpp +--- a/lib/sanitizer_common/sanitizer_mac.cpp ++++ b/lib/sanitizer_common/sanitizer_mac.cpp +@@ -613,9 +613,15 @@ HandleSignalMode GetHandleSignalMode(int signum) { + // Offset example: + // XNU 17 -- macOS 10.13 -- iOS 11 -- tvOS 11 -- watchOS 4 + constexpr u16 GetOSMajorKernelOffset() { +- if (TARGET_OS_OSX) return 4; +- if (TARGET_OS_IOS || TARGET_OS_TV) return 6; +- if (TARGET_OS_WATCH) return 13; ++#if TARGET_OS_OSX ++ return 4; ++#endif ++#if TARGET_OS_IOS || TARGET_OS_TV ++ return 6; ++#endif ++#if TARGET_OS_WATCH ++ return 13; ++#endif + } + + using VersStr = char[64]; +@@ -627,13 +633,13 @@ static uptr ApproximateOSVersionViaKernelVersion(VersStr vers) { + u16 os_major = kernel_major - offset; + + const char *format = "%d.0"; +- if (TARGET_OS_OSX) { +- if (os_major >= 16) { // macOS 11+ +- os_major -= 5; +- } else { // macOS 10.15 and below +- format = "10.%d"; +- } ++#if TARGET_OS_OSX ++ if (os_major >= 16) { // macOS 11+ ++ os_major -= 5; ++ } else { // macOS 10.15 and below ++ format = "10.%d"; + } ++#endif + return internal_snprintf(vers, sizeof(VersStr), format, os_major); + } + +@@ -681,15 +687,14 @@ void ParseVersion(const char *vers, u16 *major, u16 *minor) { + // Aligned versions example: + // macOS 10.15 -- iOS 13 -- tvOS 13 -- watchOS 6 + static void MapToMacos(u16 *major, u16 *minor) { +- if (TARGET_OS_OSX) +- return; +- +- if (TARGET_OS_IOS || TARGET_OS_TV) ++#if !TARGET_OS_OSX ++#if TARGET_OS_IOS || TARGET_OS_TV + *major += 2; +- else if (TARGET_OS_WATCH) ++#elif TARGET_OS_WATCH + *major += 9; +- else ++#else + UNREACHABLE("unsupported platform"); ++#endif + + if (*major >= 16) { // macOS 11+ + *major -= 5; +@@ -697,6 +702,7 @@ static void MapToMacos(u16 *major, u16 *minor) { + *minor = *major; + *major = 10; + } ++#endif + } + + static MacosVersion GetMacosAlignedVersionInternal() { diff --git a/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/default.nix b/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/default.nix new file mode 100644 index 000000000000..59ca5348fed4 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/default.nix @@ -0,0 +1,126 @@ +{ lib, stdenv, llvm_meta, version +, monorepoSrc, runCommand +, cmake, python3, libllvm, libcxxabi +}: + +let + + useLLVM = stdenv.hostPlatform.useLLVM or false; + bareMetal = stdenv.hostPlatform.parsed.kernel.name == "none"; + haveLibc = stdenv.cc.libc != null; + inherit (stdenv.hostPlatform) isMusl; + + baseName = "compiler-rt"; + + src = runCommand "${baseName}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${baseName} "$out" + ''; +in + +stdenv.mkDerivation { + pname = baseName + lib.optionalString (haveLibc) "-libc"; + inherit version; + + inherit src; + sourceRoot = "${src.name}/${baseName}"; + + nativeBuildInputs = [ cmake python3 libllvm.dev ]; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; + + NIX_CFLAGS_COMPILE = [ + "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" + ]; + + cmakeFlags = [ + "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" + "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}" + "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}" + ] ++ lib.optionals (useLLVM || bareMetal || isMusl) [ + "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" + "-DCOMPILER_RT_BUILD_XRAY=OFF" + "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" + "-DCOMPILER_RT_BUILD_PROFILE=OFF" + "-DCOMPILER_RT_BUILD_MEMPROF=OFF" + "-DCOMPILER_RT_BUILD_ORC=OFF" # may be possible to build with musl if necessary + ] ++ lib.optionals ((useLLVM || bareMetal) && !haveLibc) [ + "-DCMAKE_C_COMPILER_WORKS=ON" + "-DCMAKE_CXX_COMPILER_WORKS=ON" + "-DCOMPILER_RT_BAREMETAL_BUILD=ON" + "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}" + ] ++ lib.optionals (useLLVM && !haveLibc) [ + "-DCMAKE_C_FLAGS=-nodefaultlibs" + ] ++ lib.optionals (useLLVM) [ + "-DCOMPILER_RT_BUILD_BUILTINS=ON" + #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program + "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY" + ] ++ lib.optionals (bareMetal) [ + "-DCOMPILER_RT_OS_DIR=baremetal" + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ + "-DDARWIN_macosx_OVERRIDE_SDK_VERSION=ON" + "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}" + "-DDARWIN_osx_BUILTIN_ARCHS=${stdenv.hostPlatform.darwinArch}" + ]; + + outputs = [ "out" "dev" ]; + + patches = [ + ./codesign.patch # Revert compiler-rt commit that makes codesign mandatory + ./X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config + ./gnu-install-dirs.patch + # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the + # extra `/`. + ./normalize-var.patch + ] # Prevent a compilation error on darwin + ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin-targetconditionals.patch + ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch; + + # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks + # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra + # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd + # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by + # a flag and turn the flag off during the stdenv build. + postPatch = lib.optionalString (!stdenv.isDarwin) '' + substituteInPlace cmake/builtin-config-ix.cmake \ + --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace cmake/builtin-config-ix.cmake \ + --replace 'set(ARM64 arm64 arm64e)' 'set(ARM64)' + substituteInPlace cmake/config-ix.cmake \ + --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' + '' + lib.optionalString (useLLVM) '' + substituteInPlace lib/builtins/int_util.c \ + --replace "#include <stdlib.h>" "" + substituteInPlace lib/builtins/clear_cache.c \ + --replace "#include <assert.h>" "" + substituteInPlace lib/builtins/cpu_model.c \ + --replace "#include <assert.h>" "" + ''; + + # Hack around weird upsream RPATH bug + postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) '' + ln -s "$out/lib"/*/* "$out/lib" + '' + lib.optionalString (useLLVM) '' + ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o + ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o + ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/crtbeginS.o + ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/crtendS.o + ''; + + meta = llvm_meta // { + homepage = "https://compiler-rt.llvm.org/"; + description = "Compiler runtime libraries"; + longDescription = '' + The compiler-rt project provides highly tuned implementations of the + low-level code generator support routines like "__fixunsdfdi" and other + calls generated when a target doesn't have a short sequence of native + instructions to implement a core IR operation. It also provides + implementations of run-time libraries for dynamic testing tools such as + AddressSanitizer, ThreadSanitizer, MemorySanitizer, and DataFlowSanitizer. + ''; + # "All of the code in the compiler-rt project is dual licensed under the MIT + # license and the UIUC License (a BSD-like license)": + license = with lib.licenses; [ mit ncsa ]; + }; +} diff --git a/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/gnu-install-dirs.patch b/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/gnu-install-dirs.patch new file mode 100644 index 000000000000..55837bd8e45b --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/gnu-install-dirs.patch @@ -0,0 +1,42 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3a41aa43e406..f000cee6eae0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5,6 +5,8 @@ + + cmake_minimum_required(VERSION 3.13.4) + ++include(GNUInstallDirs) ++ + # Check if compiler-rt is built as a standalone project. + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR COMPILER_RT_STANDALONE_BUILD) + project(CompilerRT C CXX ASM) +diff --git a/cmake/base-config-ix.cmake b/cmake/base-config-ix.cmake +index d7b0124f3546..3e111146df4d 100644 +--- a/cmake/base-config-ix.cmake ++++ b/cmake/base-config-ix.cmake +@@ -67,7 +67,7 @@ if (LLVM_TREE_AVAILABLE) + else() + # Take output dir and install path from the user. + set(COMPILER_RT_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH +- "Path where built compiler-rt libraries should be stored.") ++ "Path where built compiler-rt build artifacts should be stored.") + set(COMPILER_RT_EXEC_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/bin CACHE PATH + "Path where built compiler-rt executables should be stored.") + set(COMPILER_RT_INSTALL_PATH "" CACHE PATH +@@ -99,13 +99,13 @@ endif() + if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + set(COMPILER_RT_OUTPUT_LIBRARY_DIR + ${COMPILER_RT_OUTPUT_DIR}/lib) +- extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" lib) ++ extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_LIBDIR}") + set(COMPILER_RT_INSTALL_LIBRARY_DIR "${default_install_path}" CACHE PATH + "Path where built compiler-rt libraries should be installed.") + else(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + set(COMPILER_RT_OUTPUT_LIBRARY_DIR + ${COMPILER_RT_OUTPUT_DIR}/lib/${COMPILER_RT_OS_DIR}) +- extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "lib/${COMPILER_RT_OS_DIR}") ++ extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_LIBDIR}/${COMPILER_RT_OS_DIR}") + set(COMPILER_RT_INSTALL_LIBRARY_DIR "${default_install_path}" CACHE PATH + "Path where built compiler-rt libraries should be installed.") + endif() diff --git a/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/normalize-var.patch b/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/normalize-var.patch new file mode 100644 index 000000000000..135cf625ef78 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/normalize-var.patch @@ -0,0 +1,16 @@ +diff --git a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake +index f1f46fb9599c..6f19e69507ba 100644 +--- a/cmake/Modules/CompilerRTUtils.cmake ++++ b/cmake/Modules/CompilerRTUtils.cmake +@@ -302,8 +302,9 @@ macro(load_llvm_config) + # Get some LLVM variables from LLVMConfig. + include("${LLVM_CMAKE_PATH}/LLVMConfig.cmake") + +- set(LLVM_LIBRARY_OUTPUT_INTDIR +- ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) ++ get_filename_component(LLVM_LIBRARY_OUTPUT_INTDIR ++ ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX} ++ REALPATH) + endif() + endmacro() + diff --git a/nixpkgs/pkgs/development/compilers/llvm/14/default.nix b/nixpkgs/pkgs/development/compilers/llvm/14/default.nix new file mode 100644 index 000000000000..ce126f7b502f --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/14/default.nix @@ -0,0 +1,278 @@ +{ lowPrio, newScope, pkgs, lib, stdenv, cmake +, gccForLibs, preLibcCrossHeaders +, libxml2, python3, isl, fetchFromGitHub, overrideCC, wrapCCWith, wrapBintoolsWith +, buildLlvmTools # tools, but from the previous stage, for cross +, targetLlvmLibraries # libraries, but from the next stage, for cross +# This is the default binutils, but with *this* version of LLD rather +# than the default LLVM verion's, if LLD is the choice. We use these for +# the `useLLVM` bootstrapping below. +, bootBintoolsNoLibc ? + if stdenv.targetPlatform.linker == "lld" + then null + else pkgs.bintoolsNoLibc +, bootBintools ? + if stdenv.targetPlatform.linker == "lld" + then null + else pkgs.bintools +, darwin +}: + +let + release_version = "14.0.0"; + candidate = "rc4"; # empty or "rcN" + dash-candidate = lib.optionalString (candidate != "") "-${candidate}"; + rev = ""; # When using a Git commit + rev-version = ""; # When using a Git commit + version = if rev != "" then rev-version else "${release_version}${dash-candidate}"; + targetConfig = stdenv.targetPlatform.config; + + monorepoSrc = fetchFromGitHub { + owner = "llvm"; + repo = "llvm-project"; + rev = if rev != "" then rev else "llvmorg-${version}"; + sha256 = "0xm3hscg6xv48rjdi7sg9ky960af1qyg5k3jyavnaqimlaj9wxgp"; + }; + + llvm_meta = { + license = lib.licenses.ncsa; + maintainers = with lib.maintainers; [ lovek323 raskin dtzWill primeos ]; + platforms = lib.platforms.all; + }; + + tools = lib.makeExtensible (tools: let + callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version monorepoSrc buildLlvmTools; }); + mkExtraBuildCommands0 = cc: '' + rsrc="$out/resource-root" + mkdir "$rsrc" + ln -s "${cc.lib}/lib/clang/${release_version}/include" "$rsrc" + echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags + ''; + mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + '' + ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" + ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share" + ''; + + bintoolsNoLibc' = + if bootBintoolsNoLibc == null + then tools.bintoolsNoLibc + else bootBintoolsNoLibc; + bintools' = + if bootBintools == null + then tools.bintools + else bootBintools; + + in { + + libllvm = callPackage ./llvm { + inherit llvm_meta; + }; + + # `llvm` historically had the binaries. When choosing an output explicitly, + # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get* + llvm = tools.libllvm.out // { outputSpecified = false; }; + + libclang = callPackage ./clang { + inherit llvm_meta; + }; + + clang-unwrapped = tools.libclang.out // { outputSpecified = false; }; + + llvm-manpages = lowPrio (tools.libllvm.override { + enableManpages = true; + python3 = pkgs.python3; # don't use python-boot + }); + + clang-manpages = lowPrio (tools.libclang.override { + enableManpages = true; + python3 = pkgs.python3; # don't use python-boot + }); + + # TODO: lldb/docs/index.rst:155:toctree contains reference to nonexisting document 'design/structureddataplugins' + # lldb-manpages = lowPrio (tools.lldb.override { + # enableManpages = true; + # python3 = pkgs.python3; # don't use python-boot + # }); + + # pick clang appropriate for package set we are targeting + clang = + /**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM + else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang + else tools.libcxxClang; + + libstdcxxClang = wrapCCWith rec { + cc = tools.clang-unwrapped; + # libstdcxx is taken from gcc in an ad-hoc way in cc-wrapper. + libcxx = null; + extraPackages = [ + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = mkExtraBuildCommands cc; + }; + + libcxxClang = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = targetLlvmLibraries.libcxx; + extraPackages = [ + targetLlvmLibraries.libcxxabi + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = mkExtraBuildCommands cc; + }; + + lld = callPackage ./lld { + inherit llvm_meta; + }; + + lldb = callPackage ./lldb { + inherit llvm_meta; + inherit (darwin) libobjc bootstrap_cmds; + inherit (darwin.apple_sdk.libs) xpc; + inherit (darwin.apple_sdk.frameworks) Foundation Carbon Cocoa; + }; + + # Below, is the LLVM bootstrapping logic. It handles building a + # fully LLVM toolchain from scratch. No GCC toolchain should be + # pulled in. As a consequence, it is very quick to build different + # targets provided by LLVM and we can also build for what GCC + # doesn’t support like LLVM. Probably we should move to some other + # file. + + bintools-unwrapped = callPackage ./bintools {}; + + bintoolsNoLibc = wrapBintoolsWith { + bintools = tools.bintools-unwrapped; + libc = preLibcCrossHeaders; + }; + + bintools = wrapBintoolsWith { + bintools = tools.bintools-unwrapped; + }; + + clangUseLLVM = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = targetLlvmLibraries.libcxx; + bintools = bintools'; + extraPackages = [ + targetLlvmLibraries.libcxxabi + targetLlvmLibraries.compiler-rt + ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [ + targetLlvmLibraries.libunwind + ]; + extraBuildCommands = '' + echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags + echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags + '' + lib.optionalString (!stdenv.targetPlatform.isWasm) '' + echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags + '' + lib.optionalString (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) '' + echo "-lunwind" >> $out/nix-support/cc-ldflags + '' + lib.optionalString stdenv.targetPlatform.isWasm '' + echo "-fno-exceptions" >> $out/nix-support/cc-cflags + '' + mkExtraBuildCommands cc; + }; + + clangNoLibcxx = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = bintools'; + extraPackages = [ + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = '' + echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags + echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags + echo "-nostdlib++" >> $out/nix-support/cc-cflags + '' + mkExtraBuildCommands cc; + }; + + clangNoLibc = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = bintoolsNoLibc'; + extraPackages = [ + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = '' + echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags + echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags + '' + mkExtraBuildCommands cc; + }; + + clangNoCompilerRt = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = bintoolsNoLibc'; + extraPackages = [ ]; + extraBuildCommands = '' + echo "-nostartfiles" >> $out/nix-support/cc-cflags + '' + mkExtraBuildCommands0 cc; + }; + + clangNoCompilerRtWithLibc = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = bintools'; + extraPackages = [ ]; + extraBuildCommands = mkExtraBuildCommands0 cc; + }; + + }); + + libraries = lib.makeExtensible (libraries: let + callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version monorepoSrc; }); + in { + + compiler-rt-libc = callPackage ./compiler-rt { + inherit llvm_meta; + stdenv = if stdenv.hostPlatform.useLLVM or false + then overrideCC stdenv buildLlvmTools.clangNoCompilerRtWithLibc + else stdenv; + }; + + compiler-rt-no-libc = callPackage ./compiler-rt { + inherit llvm_meta; + stdenv = if stdenv.hostPlatform.useLLVM or false + then overrideCC stdenv buildLlvmTools.clangNoCompilerRt + else stdenv; + }; + + # N.B. condition is safe because without useLLVM both are the same. + compiler-rt = if stdenv.hostPlatform.isAndroid + then libraries.compiler-rt-libc + else libraries.compiler-rt-no-libc; + + stdenv = overrideCC stdenv buildLlvmTools.clang; + + libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; + + libcxx = callPackage ./libcxx { + inherit llvm_meta; + stdenv = if stdenv.hostPlatform.useLLVM or false + then overrideCC stdenv buildLlvmTools.clangNoLibcxx + else stdenv; + }; + + libcxxabi = let + stdenv_ = if stdenv.hostPlatform.useLLVM or false + then overrideCC stdenv buildLlvmTools.clangNoLibcxx + else stdenv; + cxx-headers = callPackage ./libcxx { + inherit llvm_meta; + stdenv = stdenv_; + headersOnly = true; + }; + in callPackage ./libcxxabi { + stdenv = stdenv_; + inherit llvm_meta cxx-headers; + }; + + libunwind = callPackage ./libunwind { + inherit llvm_meta; + stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; + }; + + openmp = callPackage ./openmp { + inherit llvm_meta; + }; + }); + +in { inherit tools libraries release_version; } // libraries // tools diff --git a/nixpkgs/pkgs/development/compilers/llvm/14/libcxx/default.nix b/nixpkgs/pkgs/development/compilers/llvm/14/libcxx/default.nix new file mode 100644 index 000000000000..8891a69937ab --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/14/libcxx/default.nix @@ -0,0 +1,89 @@ +{ lib, stdenv, llvm_meta +, monorepoSrc, runCommand +, cmake, python3, fixDarwinDylibNames, version +, libcxxabi +, enableShared ? !stdenv.hostPlatform.isStatic + +# If headersOnly is true, the resulting package would only include the headers. +# Use this to break the circular dependency between libcxx and libcxxabi. +# +# Some context: +# https://reviews.llvm.org/rG1687f2bbe2e2aaa092f942d4a97d41fad43eedfb +, headersOnly ? false +}: + +let + basename = "libcxx"; +in + +stdenv.mkDerivation rec { + pname = basename + lib.optionalString headersOnly "-headers"; + inherit version; + + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${basename} "$out" + mkdir -p "$out/libcxxabi" + cp -r ${monorepoSrc}/libcxxabi/include "$out/libcxxabi" + mkdir -p "$out/llvm" + cp -r ${monorepoSrc}/llvm/cmake "$out/llvm" + cp -r ${monorepoSrc}/llvm/utils "$out/llvm" + ''; + + sourceRoot = "${src.name}/${basename}"; + + outputs = [ "out" ] ++ lib.optional (!headersOnly) "dev"; + + patches = [ + ./gnu-install-dirs.patch + ] ++ lib.optionals stdenv.hostPlatform.isMusl [ + ../../libcxx-0001-musl-hacks.patch + ]; + + preConfigure = lib.optionalString stdenv.hostPlatform.isMusl '' + patchShebangs utils/cat_files.py + ''; + + nativeBuildInputs = [ cmake python3 ] + ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + + buildInputs = lib.optionals (!headersOnly) [ 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.optionals stdenv.hostPlatform.isWasm [ + "-DLIBCXX_ENABLE_THREADS=OFF" + "-DLIBCXX_ENABLE_FILESYSTEM=OFF" + "-DLIBCXX_ENABLE_EXCEPTIONS=OFF" + ] ++ lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF"; + + buildFlags = lib.optional headersOnly "generate-cxx-headers"; + installTargets = lib.optional headersOnly "install-cxx-headers"; + + # At this point, cxxabi headers would be installed in the dev output, which + # prevents moveToOutput from doing its job later in the build process. + postInstall = lib.optionalString (!headersOnly) '' + mv "$dev/include/c++/v1/"* "$out/include/c++/v1/" + pushd "$dev" + rmdir -p include/c++/v1 + popd + ''; + + passthru = { + isLLVM = true; + }; + + meta = llvm_meta // { + homepage = "https://libcxx.llvm.org/"; + description = "C++ standard library"; + longDescription = '' + libc++ is an implementation of the C++ standard library, targeting C++11, + C++14 and above. + ''; + # "All of the code in libc++ is dual licensed under the MIT license and the + # UIUC License (a BSD-like license)": + license = with lib.licenses; [ mit ncsa ]; + }; +} diff --git a/nixpkgs/pkgs/development/compilers/llvm/14/libcxx/gnu-install-dirs.patch b/nixpkgs/pkgs/development/compilers/llvm/14/libcxx/gnu-install-dirs.patch new file mode 100644 index 000000000000..0f1d5c411ab8 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/14/libcxx/gnu-install-dirs.patch @@ -0,0 +1,85 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b0569a4a54ca..7d665f5a3258 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -10,6 +10,8 @@ endif() + #=============================================================================== + cmake_minimum_required(VERSION 3.13.4) + ++include(GNUInstallDirs) ++ + set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") + + # Add path for custom modules +@@ -415,13 +417,13 @@ 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} CACHE PATH ++ set(LIBCXX_INSTALL_LIBRARY_DIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}" CACHE PATH + "Path where built libc++ libraries should be installed.") +- set(LIBCXX_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBCXX_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH + "Path where built libc++ runtime libraries should be installed.") +- set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1" CACHE PATH ++ set(LIBCXX_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/c++/v1" CACHE PATH + "Path where target-agnostic libc++ headers should be installed.") +- set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "include/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1" CACHE PATH ++ set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${CMAKE_INSTALL_INCLUDEDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1" CACHE PATH + "Path where target-specific libc++ headers should be installed.") + if(LIBCXX_LIBDIR_SUBDIR) + string(APPEND LIBCXX_LIBRARY_DIR /${LIBCXX_LIBDIR_SUBDIR}) +@@ -431,11 +433,11 @@ elseif(LLVM_LIBRARY_OUTPUT_INTDIR) + set(LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) + 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} CACHE PATH ++ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} CACHE PATH + "Path where built libc++ libraries should be installed.") +- set(LIBCXX_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBCXX_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}/c++/v1" CACHE PATH + "Path where built libc++ runtime libraries should be installed.") +- set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1" CACHE PATH ++ set(LIBCXX_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/c++/v1" CACHE PATH + "Path where target-agnostic libc++ headers should be installed.") + set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${LIBCXX_INSTALL_INCLUDE_DIR}" CACHE PATH + "Path where target-specific libc++ headers should be installed.") +@@ -443,11 +445,11 @@ else() + set(LIBCXX_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXX_LIBDIR_SUFFIX}) + 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} CACHE PATH ++ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} CACHE PATH + "Path where built libc++ libraries should be installed.") +- set(LIBCXX_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBCXX_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH + "Path where built libc++ runtime libraries should be installed.") +- set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1" CACHE PATH ++ set(LIBCXX_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/c++/v1" CACHE PATH + "Path where target-agnostic libc++ headers should be installed.") + set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${LIBCXX_INSTALL_INCLUDE_DIR}" CACHE PATH + "Path where target-specific libc++ headers should be installed.") +diff --git a/cmake/Modules/HandleLibCXXABI.cmake b/cmake/Modules/HandleLibCXXABI.cmake +index 5a8a4a270a1a..d69405ddeeac 100644 +--- a/cmake/Modules/HandleLibCXXABI.cmake ++++ b/cmake/Modules/HandleLibCXXABI.cmake +@@ -1,8 +1,9 @@ +- + #=============================================================================== + # Add an ABI library if appropriate + #=============================================================================== + ++include(GNUInstallDirs) ++ + # + # _setup_abi: Set up the build to use an ABI library + # +@@ -63,7 +64,7 @@ macro(setup_abi_lib abidefines abishared abistatic abifiles abidirs) + + if (LIBCXX_INSTALL_HEADERS) + install(FILES "${LIBCXX_BINARY_INCLUDE_DIR}/${fpath}" +- 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/nixpkgs/pkgs/development/compilers/llvm/14/libcxxabi/default.nix b/nixpkgs/pkgs/development/compilers/llvm/14/libcxxabi/default.nix new file mode 100644 index 000000000000..07aaa2737cea --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/14/libcxxabi/default.nix @@ -0,0 +1,87 @@ +{ lib, stdenv, llvm_meta, cmake, python3 +, monorepoSrc, runCommand +, cxx-headers, libunwind, version +, enableShared ? !stdenv.hostPlatform.isStatic +}: + +stdenv.mkDerivation rec { + pname = "libcxxabi"; + inherit version; + + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + mkdir -p "$out/libcxx/src" + cp -r ${monorepoSrc}/libcxx/cmake "$out/libcxx" + cp -r ${monorepoSrc}/libcxx/include "$out/libcxx" + cp -r ${monorepoSrc}/libcxx/src/include "$out/libcxx/src" + mkdir -p "$out/llvm" + cp -r ${monorepoSrc}/llvm/cmake "$out/llvm" + ''; + + sourceRoot = "${src.name}/${pname}"; + + outputs = [ "out" "dev" ]; + + postUnpack = lib.optionalString stdenv.isDarwin '' + export TRIPLE=x86_64-apple-darwin + '' + lib.optionalString stdenv.hostPlatform.isWasm '' + patch -p1 -d llvm -i ${./wasm.patch} + ''; + + patches = [ + ./gnu-install-dirs.patch + ]; + + nativeBuildInputs = [ cmake python3 ]; + buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind; + + cmakeFlags = [ + "-DLIBCXXABI_LIBCXX_INCLUDES=${cxx-headers}/include/c++/v1" + ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ + "-DLLVM_ENABLE_LIBCXX=ON" + "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" + ] ++ lib.optionals stdenv.hostPlatform.isWasm [ + "-DLIBCXXABI_ENABLE_THREADS=OFF" + "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF" + ] ++ lib.optionals (!enableShared) [ + "-DLIBCXXABI_ENABLE_SHARED=OFF" + ]; + + installPhase = if stdenv.isDarwin + then '' + for file in lib/*.dylib; do + # this should be done in CMake, but having trouble figuring out + # the magic combination of necessary CMake variables + # if you fancy a try, take a look at + # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling + install_name_tool -id $out/$file $file + done + make install + install -d 755 $out/include + install -m 644 ../include/*.h $out/include + '' + else '' + install -d -m 755 $out/include $out/lib + install -m 644 lib/libc++abi.a $out/lib + install -m 644 ../include/cxxabi.h $out/include + '' + lib.optionalString enableShared '' + install -m 644 lib/libc++abi.so.1.0 $out/lib + ln -s libc++abi.so.1.0 $out/lib/libc++abi.so + ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1 + ''; + + meta = llvm_meta // { + homepage = "https://libcxxabi.llvm.org/"; + description = "Provides C++ standard library support"; + longDescription = '' + libc++abi is a new implementation of low level support for a standard C++ library. + ''; + # "All of the code in libc++abi is dual licensed under the MIT license and + # the UIUC License (a BSD-like license)": + license = with lib.licenses; [ mit ncsa ]; + maintainers = llvm_meta.maintainers ++ [ lib.maintainers.vlstill ]; + broken = true; # TODO: gnu-install-dirs.patch fails to apply + }; +} diff --git a/nixpkgs/pkgs/development/compilers/llvm/14/libcxxabi/gnu-install-dirs.patch b/nixpkgs/pkgs/development/compilers/llvm/14/libcxxabi/gnu-install-dirs.patch new file mode 100644 index 000000000000..a93348ded0c1 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/14/libcxxabi/gnu-install-dirs.patch @@ -0,0 +1,46 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 858f5d5cfd7f..16c67d7062be 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -10,6 +10,8 @@ endif() + + cmake_minimum_required(VERSION 3.13.4) + ++include(GNUInstallDirs) ++ + set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") + + # Add path for custom modules +@@ -213,9 +215,9 @@ set(CMAKE_MODULE_PATH + if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + 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} CACHE PATH ++ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH + "Path where built libc++abi libraries should be installed.") +- set(LIBCXXABI_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBCXXABI_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH + "Path where built libc++abi runtime libraries should be installed.") + if(LIBCXX_LIBDIR_SUBDIR) + string(APPEND LIBCXXABI_LIBRARY_DIR /${LIBCXXABI_LIBDIR_SUBDIR}) +@@ -224,16 +226,16 @@ 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} CACHE PATH ++ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH + "Path where built libc++abi libraries should be installed.") +- set(LIBCXXABI_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBCXXABI_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH + "Path where built libc++abi runtime libraries should be installed.") + 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} CACHE PATH ++ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH + "Path where built libc++abi libraries should be installed.") +- set(LIBCXXABI_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBCXXABI_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH + "Path where built libc++abi runtime libraries should be installed.") + endif() + diff --git a/nixpkgs/pkgs/development/compilers/llvm/14/libcxxabi/wasm.patch b/nixpkgs/pkgs/development/compilers/llvm/14/libcxxabi/wasm.patch new file mode 100644 index 000000000000..4ebfe46aa813 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/14/libcxxabi/wasm.patch @@ -0,0 +1,16 @@ +diff --git a/cmake/modules/HandleLLVMOptions.cmake b/cmake/modules/HandleLLVMOptions.cmake +index 15497d405e0..33f7f18193a 100644 +--- a/cmake/modules/HandleLLVMOptions.cmake ++++ b/cmake/modules/HandleLLVMOptions.cmake +@@ -127,7 +127,10 @@ else(WIN32) + set(LLVM_HAVE_LINK_VERSION_SCRIPT 1) + endif() + else(FUCHSIA OR UNIX) +- MESSAGE(SEND_ERROR "Unable to determine platform") ++ if(${CMAKE_SYSTEM_NAME} MATCHES "Wasi") ++ else() ++ MESSAGE(SEND_ERROR "Unable to determine platform") ++ endif() + endif(FUCHSIA OR UNIX) + endif(WIN32) + diff --git a/nixpkgs/pkgs/development/compilers/llvm/14/libunwind/default.nix b/nixpkgs/pkgs/development/compilers/llvm/14/libunwind/default.nix new file mode 100644 index 000000000000..109b92f1e027 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/14/libunwind/default.nix @@ -0,0 +1,48 @@ +{ lib, stdenv, llvm_meta, version +, monorepoSrc, runCommand +, cmake +, enableShared ? !stdenv.hostPlatform.isStatic +}: + +stdenv.mkDerivation rec { + pname = "libunwind"; + inherit version; + + # I am not so comfortable giving libc++ and friends the whole monorepo as + # requested, so I filter it to what is needed. + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + mkdir -p "$out/libcxx" + cp -r ${monorepoSrc}/libcxx/cmake "$out/libcxx" + cp -r ${monorepoSrc}/libcxx/utils "$out/libcxx" + mkdir -p "$out/llvm" + cp -r ${monorepoSrc}/llvm/cmake "$out/llvm" + ''; + + sourceRoot = "${src.name}/${pname}"; + + patches = [ + ./gnu-install-dirs.patch + ]; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF"; + + meta = llvm_meta // { + # Details: https://github.com/llvm/llvm-project/blob/main/libunwind/docs/index.rst + homepage = "https://clang.llvm.org/docs/Toolchain.html#unwind-library"; + description = "LLVM's unwinder library"; + longDescription = '' + The unwind library provides a family of _Unwind_* functions implementing + the language-neutral stack unwinding portion of the Itanium C++ ABI (Level + I). It is a dependency of the C++ ABI library, and sometimes is a + dependency of other runtimes. + ''; + broken = true; # TODO: gnu-install-dirs.patch fails to apply + }; +} diff --git a/nixpkgs/pkgs/development/compilers/llvm/14/libunwind/gnu-install-dirs.patch b/nixpkgs/pkgs/development/compilers/llvm/14/libunwind/gnu-install-dirs.patch new file mode 100644 index 000000000000..3f05d2a87269 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/14/libunwind/gnu-install-dirs.patch @@ -0,0 +1,65 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e3cc66dd2226..1299b596ce0d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,6 +8,8 @@ endif() + + cmake_minimum_required(VERSION 3.13.4) + ++include(GNUInstallDirs) ++ + set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") + + # Add path for custom modules +@@ -139,25 +141,27 @@ 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}) +- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH ++ set(LIBUNWIND_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}" CACHE PATH ++ "Path where built libunwind headers should be installed.") ++ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH + "Path where built libunwind libraries should be installed.") +- set(LIBUNWIND_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBUNWIND_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH + "Path where built libunwind runtime libraries should be installed.") + if(LIBCXX_LIBDIR_SUBDIR) + string(APPEND LIBUNWIND_LIBRARY_DIR /${LIBUNWIND_LIBDIR_SUBDIR}) + string(APPEND LIBUNWIND_INSTALL_LIBRARY_DIR /${LIBUNWIND_LIBDIR_SUBDIR}) + endif() +-elseif(LLVM_LIBRARY_OUTPUT_INTDIR) +- set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) +- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH +- "Path where built libunwind libraries should be installed.") +- set(LIBUNWIND_INSTALL_RUNTIME_DIR bin CACHE PATH +- "Path where built libunwind runtime libraries should be installed.") + else() +- set(LIBUNWIND_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBUNWIND_LIBDIR_SUFFIX}) +- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH ++ if(LLVM_LIBRARY_OUTPUT_INTDIR) ++ set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) ++ else() ++ set(LIBUNWIND_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBUNWIND_LIBDIR_SUFFIX}) ++ endif() ++ set(LIBUNWIND_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}" CACHE PATH ++ "Path where built libunwind headers should be installed.") ++ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH + "Path where built libunwind libraries should be installed.") +- set(LIBUNWIND_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBUNWIND_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH + "Path where built libunwind runtime libraries should be installed.") + endif() + +diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt +index c3bb1dd0f69f..adf1766c44cb 100644 +--- a/include/CMakeLists.txt ++++ b/include/CMakeLists.txt +@@ -14,7 +14,7 @@ if(LIBUNWIND_INSTALL_HEADERS) + foreach(file ${files}) + get_filename_component(dir ${file} DIRECTORY) + install(FILES ${file} +- DESTINATION "include/${dir}" ++ DESTINATION "${LIBUNWIND_INSTALL_INCLUDE_DIR}/${dir}" + COMPONENT unwind-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ + ) diff --git a/nixpkgs/pkgs/development/compilers/llvm/14/lld/default.nix b/nixpkgs/pkgs/development/compilers/llvm/14/lld/default.nix new file mode 100644 index 000000000000..fe655c761129 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/14/lld/default.nix @@ -0,0 +1,55 @@ +{ lib, stdenv, llvm_meta +, buildLlvmTools +, monorepoSrc, runCommand +, cmake +, libxml2 +, libllvm +, version +}: + +stdenv.mkDerivation rec { + pname = "lld"; + inherit version; + + # Blank llvm dir just so relative path works + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + mkdir -p "$out/libunwind" + cp -r ${monorepoSrc}/libunwind/include "$out/libunwind" + mkdir -p "$out/llvm" + ''; + + sourceRoot = "${src.name}/${pname}"; + + patches = [ + ./gnu-install-dirs.patch + # On Darwin the llvm-config is perhaps not working fine as the + # LLVM_MAIN_SRC_DIR is not getting set correctly, and the build fails as + # the include path is not correct. + ./fix-root-src-dir.patch + ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libllvm libxml2 ]; + + cmakeFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" + ]; + + outputs = [ "out" "lib" "dev" ]; + + meta = llvm_meta // { + homepage = "https://lld.llvm.org/"; + description = "The LLVM linker"; + longDescription = '' + LLD is a linker from the LLVM project that is a drop-in replacement for + system linkers and runs much faster than them. It also provides features + that are useful for toolchain developers. + The linker supports ELF (Unix), PE/COFF (Windows), Mach-O (macOS), and + WebAssembly in descending order of completeness. Internally, LLD consists + of several different linkers. + ''; + }; +} diff --git a/nixpkgs/pkgs/development/compilers/llvm/14/lld/fix-root-src-dir.patch b/nixpkgs/pkgs/development/compilers/llvm/14/lld/fix-root-src-dir.patch new file mode 100644 index 000000000000..38fb965b472a --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/14/lld/fix-root-src-dir.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9bcc135665d0..d38679ed41e9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -74,7 +74,7 @@ if(LLD_BUILT_STANDALONE) + + set(LLVM_MAIN_INCLUDE_DIR "${MAIN_INCLUDE_DIR}" CACHE PATH "Path to llvm/include") + set(LLVM_BINARY_DIR "${LLVM_OBJ_ROOT}" CACHE PATH "Path to LLVM build tree") +- set(LLVM_MAIN_SRC_DIR "${MAIN_SRC_DIR}" CACHE PATH "Path to LLVM source tree") ++ set(LLVM_MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm" CACHE PATH "Path to LLVM source tree") + + find_program(LLVM_TABLEGEN_EXE "llvm-tblgen" ${LLVM_TOOLS_BINARY_DIR} + NO_DEFAULT_PATH) diff --git a/nixpkgs/pkgs/development/compilers/llvm/14/lld/gnu-install-dirs.patch b/nixpkgs/pkgs/development/compilers/llvm/14/lld/gnu-install-dirs.patch new file mode 100644 index 000000000000..89a5822df49c --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/14/lld/gnu-install-dirs.patch @@ -0,0 +1,22 @@ +diff --git a/cmake/modules/AddLLD.cmake b/cmake/modules/AddLLD.cmake +index dd2898ce6236..ebbea040ff54 100644 +--- a/cmake/modules/AddLLD.cmake ++++ b/cmake/modules/AddLLD.cmake +@@ -18,8 +18,8 @@ macro(add_lld_library name) + install(TARGETS ${name} + COMPONENT ${name} + ${export_to_lldtargets} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} ++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") + + if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES) +@@ -62,5 +62,5 @@ endmacro() + macro(add_lld_symlink name dest) + add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE) + # Always generate install targets +- llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE) ++ llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE) + endmacro() diff --git a/nixpkgs/pkgs/development/compilers/llvm/14/lldb/default.nix b/nixpkgs/pkgs/development/compilers/llvm/14/lldb/default.nix new file mode 100644 index 000000000000..fdfb550c2802 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/14/lldb/default.nix @@ -0,0 +1,145 @@ +{ lib, stdenv, llvm_meta +, runCommand +, monorepoSrc +, cmake +, zlib +, ncurses +, swig +, which +, libedit +, libxml2 +, libllvm +, libclang +, python3 +, version +, libobjc +, xpc +, Foundation +, bootstrap_cmds +, Carbon +, Cocoa +, lit +, makeWrapper +, enableManpages ? false +}: + +stdenv.mkDerivation (rec { + pname = "lldb"; + inherit version; + + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + ''; + + sourceRoot = "${src.name}/${pname}"; + + patches = [ + ./procfs.patch + (runCommand "resource-dir.patch" { + clangLibDir = "${libclang.lib}/lib"; + } '' + substitute '${./resource-dir.patch}' "$out" --subst-var clangLibDir + '') + ./gnu-install-dirs.patch + ]; + + outputs = [ "out" "lib" "dev" ]; + + nativeBuildInputs = [ + cmake python3 which swig lit makeWrapper + ] ++ lib.optionals enableManpages [ + python3.pkgs.sphinx python3.pkgs.recommonmark + ]; + + buildInputs = [ + ncurses + zlib + libedit + libxml2 + libllvm + ] ++ lib.optionals stdenv.isDarwin [ + libobjc + xpc + Foundation + bootstrap_cmds + Carbon + Cocoa + ]; + + hardeningDisable = [ "format" ]; + + cmakeFlags = [ + "-DLLDB_INCLUDE_TESTS=${if doCheck then "YES" else "NO"}" + "-DLLVM_ENABLE_RTTI=OFF" + "-DClang_DIR=${libclang.dev}/lib/cmake" + "-DLLVM_EXTERNAL_LIT=${lit}/bin/lit" + ] ++ lib.optionals stdenv.isDarwin [ + "-DLLDB_USE_SYSTEM_DEBUGSERVER=ON" + ] ++ lib.optionals (!stdenv.isDarwin) [ + "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic + ] ++ lib.optionals enableManpages [ + "-DLLVM_ENABLE_SPHINX=ON" + "-DSPHINX_OUTPUT_MAN=ON" + "-DSPHINX_OUTPUT_HTML=OFF" + ] ++ lib.optionals doCheck [ + "-DLLDB_TEST_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" + "-DLLDB_TEST_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++" + ]; + + 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 + mkdir -p $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin + ln -s $out/bin/lldb-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin + ''; + + meta = llvm_meta // { + homepage = "https://lldb.llvm.org/"; + description = "A next-generation high-performance debugger"; + longDescription = '' + LLDB is a next generation, high-performance debugger. It is built as a set + of reusable components which highly leverage existing libraries in the + larger LLVM Project, such as the Clang expression parser and LLVM + disassembler. + ''; + broken = stdenv.isDarwin; # error: use of undeclared identifier 'CPU_SUBTYPE_ARM64E' + }; +} // lib.optionalAttrs enableManpages { + pname = "lldb-manpages"; + + buildPhase = '' + make docs-lldb-man + ''; + + propagatedBuildInputs = []; + + # manually install lldb man page + installPhase = '' + mkdir -p $out/share/man/man1 + install docs/man/lldb.1 -t $out/share/man/man1/ + ''; + + postPatch = null; + postInstall = null; + + outputs = [ "out" ]; + + doCheck = false; + + meta = llvm_meta // { + description = "man pages for LLDB ${version}"; + }; +}) diff --git a/nixpkgs/pkgs/development/compilers/llvm/14/lldb/gnu-install-dirs.patch b/nixpkgs/pkgs/development/compilers/llvm/14/lldb/gnu-install-dirs.patch new file mode 100644 index 000000000000..f69ed9e162fb --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/14/lldb/gnu-install-dirs.patch @@ -0,0 +1,36 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 79d451965ed4..78188978d6de 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -12,6 +12,8 @@ set(CMAKE_MODULE_PATH + # If we are not building as part of LLVM, build LLDB as a standalone project, + # using LLVM as an external library. + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) ++ include(GNUInstallDirs) ++ + project(lldb) + include(LLDBStandalone) + +diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake +index 3291a7c808e1..b27d27ce6a87 100644 +--- a/cmake/modules/AddLLDB.cmake ++++ b/cmake/modules/AddLLDB.cmake +@@ -109,7 +109,7 @@ function(add_lldb_library name) + endif() + + if(PARAM_SHARED) +- set(install_dest lib${LLVM_LIBDIR_SUFFIX}) ++ set(install_dest ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + if(PARAM_INSTALL_PREFIX) + set(install_dest ${PARAM_INSTALL_PREFIX}) + endif() +diff --git a/tools/intel-features/CMakeLists.txt b/tools/intel-features/CMakeLists.txt +index 7d48491ec89a..c04543585588 100644 +--- a/tools/intel-features/CMakeLists.txt ++++ b/tools/intel-features/CMakeLists.txt +@@ -30,4 +30,4 @@ add_lldb_library(lldbIntelFeatures SHARED + ) + + install(TARGETS lldbIntelFeatures +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) diff --git a/nixpkgs/pkgs/development/compilers/llvm/14/lldb/procfs.patch b/nixpkgs/pkgs/development/compilers/llvm/14/lldb/procfs.patch new file mode 100644 index 000000000000..b075dbaeee0a --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/14/lldb/procfs.patch @@ -0,0 +1,31 @@ +--- a/source/Plugins/Process/Linux/Procfs.h ++++ b/source/Plugins/Process/Linux/Procfs.h +@@ -11,21 +11,12 @@ + // sys/procfs.h on Android/Linux for all supported architectures. + + #include <sys/ptrace.h> ++#include <asm/ptrace.h> + +-#ifdef __ANDROID__ +-#if defined(__arm64__) || defined(__aarch64__) +-typedef unsigned long elf_greg_t; +-typedef elf_greg_t +- elf_gregset_t[(sizeof(struct user_pt_regs) / sizeof(elf_greg_t))]; +-typedef struct user_fpsimd_state elf_fpregset_t; +-#ifndef NT_FPREGSET +-#define NT_FPREGSET NT_PRFPREG +-#endif // NT_FPREGSET +-#elif defined(__mips__) +-#ifndef NT_FPREGSET +-#define NT_FPREGSET NT_PRFPREG +-#endif // NT_FPREGSET +-#endif +-#else // __ANDROID__ ++#if !defined(__GLIBC__) && defined(__powerpc__) ++#define pt_regs musl_pt_regs ++#include <sys/procfs.h> ++#undef pt_regs ++#else + #include <sys/procfs.h> +-#endif // __ANDROID__ ++#endif diff --git a/nixpkgs/pkgs/development/compilers/llvm/14/lldb/resource-dir.patch b/nixpkgs/pkgs/development/compilers/llvm/14/lldb/resource-dir.patch new file mode 100644 index 000000000000..e0db80afeb9f --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/14/lldb/resource-dir.patch @@ -0,0 +1,13 @@ +diff --git a/lldb/cmake/modules/LLDBConfig.cmake b/lldb/cmake/modules/LLDBConfig.cmake +index 37364341ff8b..7f74c1a3e257 100644 +--- a/cmake/modules/LLDBConfig.cmake ++++ b/cmake/modules/LLDBConfig.cmake +@@ -257,7 +257,7 @@ if (NOT TARGET clang-resource-headers) + # Iterate over the possible places where the external resource directory + # could be and pick the first that exists. + foreach(CANDIDATE "${Clang_DIR}/../.." "${LLVM_DIR}" "${LLVM_LIBRARY_DIRS}" +- "${LLVM_BUILD_LIBRARY_DIR}" ++ "${LLVM_BUILD_LIBRARY_DIR}" "@clangLibDir@" + "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}") + # Build the resource directory path by appending 'clang/<version number>'. + set(CANDIDATE_RESOURCE_DIR "${CANDIDATE}/clang/${LLDB_CLANG_RESOURCE_DIR_NAME}") diff --git a/nixpkgs/pkgs/development/compilers/llvm/14/llvm/default.nix b/nixpkgs/pkgs/development/compilers/llvm/14/llvm/default.nix new file mode 100644 index 000000000000..05aac728b452 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/14/llvm/default.nix @@ -0,0 +1,257 @@ +{ lib, stdenv, llvm_meta +, pkgsBuildBuild +, monorepoSrc +, runCommand +, fetchpatch +, cmake +, python3 +, libffi +, libbfd +, libpfm +, libxml2 +, ncurses +, version +, release_version +, zlib +, which +, buildLlvmTools +, debugVersion ? false +, enableManpages ? false +, enableSharedLibraries ? !stdenv.hostPlatform.isStatic +, enablePFM ? !(stdenv.isDarwin + || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 + || stdenv.isAarch32 # broken for the armv7l builder +) +, enablePolly ? false +} @args: + +let + inherit (lib) optional optionals optionalString; + + # Used when creating a version-suffixed symlink of libLLVM.dylib + shortVersion = with lib; + concatStringsSep "." (take 1 (splitString "." release_version)); + +in stdenv.mkDerivation (rec { + pname = "llvm"; + inherit version; + + src = runCommand "${pname}-src-${version}" {} ('' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + cp -r ${monorepoSrc}/third-party "$out" + '' + lib.optionalString enablePolly '' + cp -r ${monorepoSrc}/polly "$out/llvm/tools" + ''); + + sourceRoot = "${src.name}/${pname}"; + + outputs = [ "out" "lib" "dev" "python" ]; + + nativeBuildInputs = [ cmake python3 ] + ++ optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ]; + + buildInputs = [ libxml2 libffi ] + ++ optional enablePFM libpfm; # exegesis + + propagatedBuildInputs = [ ncurses zlib ]; + + checkInputs = [ which ]; + + patches = [ + ./gnu-install-dirs.patch + ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; + + postPatch = optionalString stdenv.isDarwin '' + substituteInPlace cmake/modules/AddLLVM.cmake \ + --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ + --replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' "" + '' + '' + # FileSystem permissions tests fail with various special bits + substituteInPlace unittests/Support/CMakeLists.txt \ + --replace "Path.cpp" "" + rm unittests/Support/Path.cpp + 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 \ + --replace "add_subdirectory(DynamicLibrary)" "" + rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp + # valgrind unhappy with musl or glibc, but fails w/musl only + rm test/CodeGen/AArch64/wineh4.mir + '' + optionalString stdenv.hostPlatform.isAarch32 '' + # skip failing X86 test cases on 32-bit ARM + rm test/DebugInfo/X86/convert-debugloc.ll + rm test/DebugInfo/X86/convert-inlined.ll + rm test/DebugInfo/X86/convert-linked.ll + rm test/tools/dsymutil/X86/op-convert.test + '' + optionalString (stdenv.hostPlatform.system == "armv6l-linux") '' + # Seems to require certain floating point hardware (NEON?) + rm test/ExecutionEngine/frem.ll + '' + '' + patchShebangs test/BugPoint/compile-custom.ll.py + ''; + + # hacky fix: created binaries need to be run before installation + preBuild = '' + mkdir -p $out/ + ln -sv $PWD/lib $out + ''; + + # E.g. mesa.drivers use the build-id as a cache key (see #93946): + LDFLAGS = optionalString (enableSharedLibraries && !stdenv.isDarwin) "-Wl,--build-id=sha1"; + + cmakeFlags = with stdenv; let + # These flags influence llvm-config's BuildVariables.inc in addition to the + # general build. We need to make sure these are also passed via + # CROSS_TOOLCHAIN_FLAGS_NATIVE when cross-compiling or llvm-config-native + # will return different results from the cross llvm-config. + # + # Some flags don't need to be repassed because LLVM already does so (like + # CMAKE_BUILD_TYPE), others are irrelevant to the result. + flagsForLlvmConfig = [ + "-DLLVM_INSTALL_CMAKE_DIR=${placeholder "dev"}/lib/cmake/llvm/" + "-DLLVM_ENABLE_RTTI=ON" + ] ++ optionals enableSharedLibraries [ + "-DLLVM_LINK_LLVM_DYLIB=ON" + ]; + in flagsForLlvmConfig ++ [ + "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" + "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc + "-DLLVM_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" + "-DLLVM_ENABLE_FFI=ON" + "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_ENABLE_DUMP=ON" + ] ++ optionals stdenv.hostPlatform.isStatic [ + # Disables building of shared libs, -fPIC is still injected by cc-wrapper + "-DLLVM_ENABLE_PIC=OFF" + "-DLLVM_BUILD_STATIC=ON" + # libxml2 needs to be disabled because the LLVM build system ignores its .la + # file and doesn't link zlib as well. + # https://github.com/ClangBuiltLinux/tc-build/issues/150#issuecomment-845418812 + "-DLLVM_ENABLE_LIBXML2=OFF" + ] ++ optionals enableManpages [ + "-DLLVM_BUILD_DOCS=ON" + "-DLLVM_ENABLE_SPHINX=ON" + "-DSPHINX_OUTPUT_MAN=ON" + "-DSPHINX_OUTPUT_HTML=OFF" + "-DSPHINX_WARNINGS_AS_ERRORS=OFF" + ] ++ optionals (!isDarwin) [ + "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" + ] ++ optionals isDarwin [ + "-DLLVM_ENABLE_LIBCXX=ON" + "-DCAN_TARGET_i386=false" + ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DCMAKE_CROSSCOMPILING=True" + "-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen" + ( + let + nativeCC = pkgsBuildBuild.targetPackages.stdenv.cc; + nativeBintools = nativeCC.bintools.bintools; + nativeToolchainFlags = [ + "-DCMAKE_C_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}cc" + "-DCMAKE_CXX_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}c++" + "-DCMAKE_AR=${nativeBintools}/bin/${nativeBintools.targetPrefix}ar" + "-DCMAKE_STRIP=${nativeBintools}/bin/${nativeBintools.targetPrefix}strip" + "-DCMAKE_RANLIB=${nativeBintools}/bin/${nativeBintools.targetPrefix}ranlib" + ]; + # We need to repass the custom GNUInstallDirs values, otherwise CMake + # will choose them for us, leading to wrong results in llvm-config-native + nativeInstallFlags = [ + "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" + "-DCMAKE_INSTALL_BINDIR=${placeholder "out"}/bin" + "-DCMAKE_INSTALL_INCLUDEDIR=${placeholder "dev"}/include" + "-DCMAKE_INSTALL_LIBDIR=${placeholder "lib"}/lib" + "-DCMAKE_INSTALL_LIBEXECDIR=${placeholder "lib"}/libexec" + ]; + in "-DCROSS_TOOLCHAIN_FLAGS_NATIVE:list=" + + lib.concatStringsSep ";" (lib.concatLists [ + flagsForLlvmConfig + nativeToolchainFlags + nativeInstallFlags + ]) + ) + ]; + + postBuild = '' + rm -fR $out + ''; + + preCheck = '' + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib + ''; + + postInstall = '' + mkdir -p $python/share + mv $out/share/opt-viewer $python/share/opt-viewer + moveToOutput "bin/llvm-config*" "$dev" + substituteInPlace "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ + --replace "\''${_IMPORT_PREFIX}/lib/lib" "$lib/lib/lib" \ + --replace "$out/bin/llvm-config" "$dev/bin/llvm-config" + substituteInPlace "$dev/lib/cmake/llvm/LLVMConfig.cmake" \ + --replace 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}'"$lib"'")' + '' + + optionalString (stdenv.isDarwin && enableSharedLibraries) '' + ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib + ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib + '' + + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native + ''; + + doCheck = stdenv.isLinux && (!stdenv.isx86_32) && (!stdenv.hostPlatform.isMusl) + && (stdenv.hostPlatform == stdenv.buildPlatform); + + checkTarget = "check-all"; + + # For the update script: + passthru.monorepoSrc = monorepoSrc; + + requiredSystemFeatures = [ "big-parallel" ]; + meta = llvm_meta // { + homepage = "https://llvm.org/"; + description = "A collection of modular and reusable compiler and toolchain technologies"; + longDescription = '' + The LLVM Project is a collection of modular and reusable compiler and + toolchain technologies. Despite its name, LLVM has little to do with + traditional virtual machines. The name "LLVM" itself is not an acronym; it + is the full name of the project. + LLVM began as a research project at the University of Illinois, with the + goal of providing a modern, SSA-based compilation strategy capable of + supporting both static and dynamic compilation of arbitrary programming + languages. Since then, LLVM has grown to be an umbrella project consisting + of a number of subprojects, many of which are being used in production by + a wide variety of commercial and open source projects as well as being + widely used in academic research. Code in the LLVM project is licensed + under the "Apache 2.0 License with LLVM exceptions". + ''; + }; +} // lib.optionalAttrs enableManpages { + pname = "llvm-manpages"; + + buildPhase = '' + make docs-llvm-man + ''; + + propagatedBuildInputs = []; + + installPhase = '' + make -C docs install + ''; + + postPatch = null; + postInstall = null; + + outputs = [ "out" ]; + + doCheck = false; + + meta = llvm_meta // { + description = "man pages for LLVM ${version}"; + }; +}) diff --git a/nixpkgs/pkgs/development/compilers/llvm/14/llvm/gnu-install-dirs-polly.patch b/nixpkgs/pkgs/development/compilers/llvm/14/llvm/gnu-install-dirs-polly.patch new file mode 100644 index 000000000000..98e998e65a96 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/14/llvm/gnu-install-dirs-polly.patch @@ -0,0 +1,102 @@ +diff --git a/tools/polly/CMakeLists.txt b/tools/polly/CMakeLists.txt +index ca7c04c565bb..6a6155806ffa 100644 +--- a/tools/polly/CMakeLists.txt ++++ b/tools/polly/CMakeLists.txt +@@ -3,6 +3,8 @@ if (NOT DEFINED LLVM_MAIN_SRC_DIR) + project(Polly) + cmake_minimum_required(VERSION 3.13.4) + ++ include(GNUInstallDirs) ++ + # Where is LLVM installed? + find_package(LLVM CONFIG REQUIRED) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${LLVM_CMAKE_DIR}) +@@ -122,13 +124,13 @@ include_directories( + + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/ +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + ) + + install(DIRECTORY ${POLLY_BINARY_DIR}/include/ +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN "CMakeFiles" EXCLUDE +diff --git a/tools/polly/cmake/CMakeLists.txt b/tools/polly/cmake/CMakeLists.txt +index 7cc129ba2e90..137be25e4b80 100644 +--- a/tools/polly/cmake/CMakeLists.txt ++++ b/tools/polly/cmake/CMakeLists.txt +@@ -79,18 +79,18 @@ file(GENERATE + + # Generate PollyConfig.cmake for the install tree. + unset(POLLY_EXPORTS) +-set(POLLY_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") ++set(POLLY_INSTALL_PREFIX "") + set(POLLY_CONFIG_LLVM_CMAKE_DIR "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") +-set(POLLY_CONFIG_CMAKE_DIR "${POLLY_INSTALL_PREFIX}/${POLLY_INSTALL_PACKAGE_DIR}") +-set(POLLY_CONFIG_LIBRARY_DIRS "${POLLY_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}") ++set(POLLY_CONFIG_CMAKE_DIR "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_PREFIX}/${POLLY_INSTALL_PACKAGE_DIR}") ++set(POLLY_CONFIG_LIBRARY_DIRS "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + if (POLLY_BUNDLED_ISL) + set(POLLY_CONFIG_INCLUDE_DIRS +- "${POLLY_INSTALL_PREFIX}/include" +- "${POLLY_INSTALL_PREFIX}/include/polly" ++ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}" ++ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}/polly" + ) + else() + set(POLLY_CONFIG_INCLUDE_DIRS +- "${POLLY_INSTALL_PREFIX}/include" ++ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_INCLUDEDIR}" + ${ISL_INCLUDE_DIRS} + ) + endif() +@@ -100,12 +100,12 @@ endif() + foreach(tgt IN LISTS POLLY_CONFIG_EXPORTED_TARGETS) + get_target_property(tgt_type ${tgt} TYPE) + if (tgt_type STREQUAL "EXECUTABLE") +- set(tgt_prefix "bin/") ++ set(tgt_prefix "${CMAKE_INSTALL_BINDIR}/") + else() +- set(tgt_prefix "lib/") ++ set(tgt_prefix "${CMAKE_INSTALL_LIBDIR}/") + endif() + +- set(tgt_path "${CMAKE_INSTALL_PREFIX}/${tgt_prefix}$<TARGET_FILE_NAME:${tgt}>") ++ set(tgt_path "${tgt_prefix}$<TARGET_FILE_NAME:${tgt}>") + file(RELATIVE_PATH tgt_path ${POLLY_CONFIG_CMAKE_DIR} ${tgt_path}) + + if (NOT tgt_type STREQUAL "INTERFACE_LIBRARY") +diff --git a/tools/polly/cmake/polly_macros.cmake b/tools/polly/cmake/polly_macros.cmake +index 518a09b45a42..bd9d6f5542ad 100644 +--- a/tools/polly/cmake/polly_macros.cmake ++++ b/tools/polly/cmake/polly_macros.cmake +@@ -44,8 +44,8 @@ macro(add_polly_library name) + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "LLVMPolly") + install(TARGETS ${name} + EXPORT LLVMExports +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + endif() + set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name}) + endmacro(add_polly_library) +diff --git a/tools/polly/lib/External/CMakeLists.txt b/tools/polly/lib/External/CMakeLists.txt +index e3a5683fccdc..293b482eb28a 100644 +--- a/tools/polly/lib/External/CMakeLists.txt ++++ b/tools/polly/lib/External/CMakeLists.txt +@@ -290,7 +290,7 @@ if (POLLY_BUNDLED_ISL) + install(DIRECTORY + ${ISL_SOURCE_DIR}/include/ + ${ISL_BINARY_DIR}/include/ +- DESTINATION include/polly ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/polly + FILES_MATCHING + PATTERN "*.h" + PATTERN "CMakeFiles" EXCLUDE diff --git a/nixpkgs/pkgs/development/compilers/llvm/14/llvm/gnu-install-dirs.patch b/nixpkgs/pkgs/development/compilers/llvm/14/llvm/gnu-install-dirs.patch new file mode 100644 index 000000000000..55862ab39304 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/14/llvm/gnu-install-dirs.patch @@ -0,0 +1,220 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fec956091cd5..5a766f5c5d7c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -303,6 +303,9 @@ set(LLVM_EXAMPLES_INSTALL_DIR "examples" CACHE STRING + "Path for examples subdirectory (enabled by LLVM_BUILD_EXAMPLES=ON) (defaults to 'examples')") + mark_as_advanced(LLVM_EXAMPLES_INSTALL_DIR) + ++set(LLVM_INSTALL_CMAKE_DIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/cmake/llvm" CACHE STRING ++ "Path for CMake subdirectory (defaults to lib/cmake/llvm)" ) ++ + # 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}) +diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake +index fed1fec7d72e..4baed19b9e98 100644 +--- a/cmake/modules/AddLLVM.cmake ++++ b/cmake/modules/AddLLVM.cmake +@@ -838,8 +838,8 @@ 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} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} ++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" COMPONENT ${name} ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" COMPONENT ${name} + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT ${name}) + + if (NOT LLVM_ENABLE_IDE) +@@ -1056,7 +1056,7 @@ function(process_llvm_pass_plugins) + "set(LLVM_STATIC_EXTENSIONS ${LLVM_STATIC_EXTENSIONS})") + install(FILES + ${llvm_cmake_builddir}/LLVMConfigExtensions.cmake +- DESTINATION ${LLVM_INSTALL_PACKAGE_DIR} ++ DESTINATION ${LLVM_INSTALL_CMAKE_DIR} + COMPONENT cmake-exports) + + set(ExtensionDef "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def") +@@ -1902,7 +1902,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}) + +- set(output_dir lib${LLVM_LIBDIR_SUFFIX}) ++ set(output_dir ${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + if(WIN32 AND "${type}" STREQUAL "SHARED") + set(output_dir bin) + endif() +@@ -1913,7 +1913,7 @@ function(llvm_install_library_symlink name dest type) + + endfunction() + +-function(llvm_install_symlink name dest) ++function(llvm_install_symlink name dest output_dir) + cmake_parse_arguments(ARG "ALWAYS_GENERATE" "COMPONENT" "" ${ARGN}) + foreach(path ${CMAKE_MODULE_PATH}) + if(EXISTS ${path}/LLVMInstallSymlink.cmake) +@@ -1936,7 +1936,7 @@ function(llvm_install_symlink name dest) + set(full_dest ${dest}${CMAKE_EXECUTABLE_SUFFIX}) + + install(SCRIPT ${INSTALL_SYMLINK} +- CODE "install_symlink(${full_name} ${full_dest} ${LLVM_TOOLS_INSTALL_DIR})" ++ CODE "install_symlink(${full_name} ${full_dest} ${output_dir})" + COMPONENT ${component}) + + if (NOT LLVM_ENABLE_IDE AND NOT ARG_ALWAYS_GENERATE) +@@ -2019,7 +2019,8 @@ function(add_llvm_tool_symlink link_name target) + endif() + + if ((TOOL_IS_TOOLCHAIN OR NOT LLVM_INSTALL_TOOLCHAIN_ONLY) AND LLVM_BUILD_TOOLS) +- llvm_install_symlink(${link_name} ${target}) ++ GNUInstallDirs_get_absolute_install_dir(output_dir LLVM_TOOLS_INSTALL_DIR) ++ llvm_install_symlink(${link_name} ${target} ${output_dir}) + endif() + endif() + endfunction() +@@ -2148,9 +2149,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}) + if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)") + set_property(TARGET ${name} APPEND_STRING PROPERTY + LINK_FLAGS " -Wl,-z,origin ") +diff --git a/cmake/modules/AddOCaml.cmake b/cmake/modules/AddOCaml.cmake +index 891c9e6d618c..8d963f3b0069 100644 +--- a/cmake/modules/AddOCaml.cmake ++++ b/cmake/modules/AddOCaml.cmake +@@ -147,9 +147,9 @@ function(add_ocaml_library name) + endforeach() + + if( APPLE ) +- set(ocaml_rpath "@executable_path/../../../lib${LLVM_LIBDIR_SUFFIX}") ++ set(ocaml_rpath "@executable_path/../../../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + elseif( UNIX ) +- set(ocaml_rpath "\\$ORIGIN/../../../lib${LLVM_LIBDIR_SUFFIX}") ++ set(ocaml_rpath "\\$ORIGIN/../../../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + endif() + list(APPEND ocaml_flags "-ldopt" "-Wl,-rpath,${ocaml_rpath}") + +diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt +index cea0c1df0a14..eedcd9450312 100644 +--- a/cmake/modules/CMakeLists.txt ++++ b/cmake/modules/CMakeLists.txt +@@ -2,7 +2,7 @@ include(ExtendPath) + include(LLVMDistributionSupport) + include(FindPrefixFromConfig) + +-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. +@@ -122,7 +122,7 @@ set(LLVM_CONFIG_INCLUDE_DIRS + ) + list(REMOVE_DUPLICATES LLVM_CONFIG_INCLUDE_DIRS) + +-extend_path(LLVM_CONFIG_LIBRARY_DIR "\${LLVM_INSTALL_PREFIX}" "lib\${LLVM_LIBDIR_SUFFIX}") ++extend_path(LLVM_CONFIG_LIBRARY_DIR "\${LLVM_INSTALL_PREFIX}" "${CMAKE_INSTALL_LIBDIR}\${LLVM_LIBDIR_SUFFIX}") + set(LLVM_CONFIG_LIBRARY_DIRS + "${LLVM_CONFIG_LIBRARY_DIR}" + # FIXME: Should there be other entries here? +diff --git a/cmake/modules/LLVMInstallSymlink.cmake b/cmake/modules/LLVMInstallSymlink.cmake +index b5c35f706cb7..9261ab797de6 100644 +--- a/cmake/modules/LLVMInstallSymlink.cmake ++++ b/cmake/modules/LLVMInstallSymlink.cmake +@@ -6,7 +6,7 @@ include(GNUInstallDirs) + + 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 044ec8a4d39d..504d0eac3ade 100644 +--- a/docs/CMake.rst ++++ b/docs/CMake.rst +@@ -224,7 +224,7 @@ description is in `LLVM-related variables`_ below. + **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``. + + **LLVM_PARALLEL_{COMPILE,LINK}_JOBS**:STRING + Building the llvm toolchain can use a lot of resources, particularly +@@ -910,9 +910,11 @@ the ``cmake`` command or by setting it directly in ``ccmake`` or ``cmake-gui``). + + This file is available in two different locations. + +-* ``<INSTALL_PREFIX>/lib/cmake/llvm/LLVMConfig.cmake`` where +- ``<INSTALL_PREFIX>`` is the install prefix of an installed version of LLVM. +- On Linux typically this is ``/usr/lib/cmake/llvm/LLVMConfig.cmake``. ++* ``<LLVM_INSTALL_PACKAGE_DIR>LLVMConfig.cmake`` where ++ ``<LLVM_INSTALL_PACKAGE_DIR>`` is the location where LLVM CMake modules are ++ installed as part of an installed version of LLVM. This is typically ++ ``cmake/llvm/`` within the lib directory. On Linux, this is typically ++ ``/usr/lib/cmake/llvm/LLVMConfig.cmake``. + + * ``<LLVM_BUILD_ROOT>/lib/cmake/llvm/LLVMConfig.cmake`` where + ``<LLVM_BUILD_ROOT>`` is the root of the LLVM build tree. **Note: this is only +diff --git a/include/llvm/CMakeLists.txt b/include/llvm/CMakeLists.txt +index b46319f24fc8..2feabd1954e4 100644 +--- a/include/llvm/CMakeLists.txt ++++ b/include/llvm/CMakeLists.txt +@@ -5,5 +5,5 @@ add_subdirectory(Frontend) + # If we're doing an out-of-tree build, copy a module map for generated + # header files into the build area. + if (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") +- configure_file(module.modulemap.build module.modulemap COPYONLY) ++ configure_file(module.modulemap.build ${LLVM_INCLUDE_DIR}/module.modulemap COPYONLY) + endif (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") +diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in +index abbb8a450da6..70c497be12f5 100644 +--- a/tools/llvm-config/BuildVariables.inc.in ++++ b/tools/llvm-config/BuildVariables.inc.in +@@ -23,7 +23,10 @@ + #define LLVM_CXXFLAGS "@LLVM_CXXFLAGS@" + #define LLVM_BUILDMODE "@LLVM_BUILDMODE@" + #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@" ++#define LLVM_INSTALL_BINDIR "@CMAKE_INSTALL_BINDIR@" ++#define LLVM_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@" + #define LLVM_INSTALL_INCLUDEDIR "@CMAKE_INSTALL_INCLUDEDIR@" ++#define LLVM_INSTALL_CMAKEDIR "@LLVM_INSTALL_CMAKE_DIR@" + #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@" + #define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@" + #define LLVM_BUILD_SYSTEM "@LLVM_BUILD_SYSTEM@" +diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp +index 8ed88f33ead4..5e7184bab90d 100644 +--- a/tools/llvm-config/llvm-config.cpp ++++ b/tools/llvm-config/llvm-config.cpp +@@ -363,12 +363,20 @@ int main(int argc, char **argv) { + ActiveIncludeDir = std::string(Path.str()); + } + { +- SmallString<256> Path(LLVM_TOOLS_INSTALL_DIR); ++ SmallString<256> Path(LLVM_INSTALL_BINDIR); + sys::fs::make_absolute(ActivePrefix, Path); + ActiveBinDir = std::string(Path.str()); + } +- ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX; +- ActiveCMakeDir = ActiveLibDir + "/cmake/llvm"; ++ { ++ SmallString<256> Path(LLVM_INSTALL_LIBDIR LLVM_LIBDIR_SUFFIX); ++ sys::fs::make_absolute(ActivePrefix, Path); ++ ActiveLibDir = std::string(Path.str()); ++ } ++ { ++ SmallString<256> Path(LLVM_INSTALL_CMAKEDIR); ++ sys::fs::make_absolute(ActivePrefix, Path); ++ ActiveCMakeDir = std::string(Path.str()); ++ } + ActiveIncludeOption = "-I" + ActiveIncludeDir; + } + diff --git a/nixpkgs/pkgs/development/compilers/llvm/14/openmp/default.nix b/nixpkgs/pkgs/development/compilers/llvm/14/openmp/default.nix new file mode 100644 index 000000000000..2b580a9c169c --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/14/openmp/default.nix @@ -0,0 +1,55 @@ +{ lib +, stdenv +, llvm_meta +, monorepoSrc +, runCommand +, cmake +, llvm +, clang-unwrapped +, perl +, pkg-config +, version +}: + +stdenv.mkDerivation rec { + pname = "openmp"; + inherit version; + + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + ''; + + sourceRoot = "${src.name}/${pname}"; + + patches = [ + ./gnu-install-dirs.patch + ./fix-find-tool.patch + ]; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ cmake perl pkg-config clang-unwrapped ]; + 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"; + longDescription = '' + The OpenMP subproject of LLVM contains the components required to build an + executable OpenMP program that are outside the compiler itself. + Contains the code for the runtime library against which code compiled by + "clang -fopenmp" must be linked before it can run and the library that + supports offload to target devices. + ''; + # "All of the code is dual licensed under the MIT license and the UIUC + # License (a BSD-like license)": + license = with lib.licenses; [ mit ncsa ]; + broken = true; # TODO: gnu-install-dirs.patch fails to apply + }; +} diff --git a/nixpkgs/pkgs/development/compilers/llvm/14/openmp/fix-find-tool.patch b/nixpkgs/pkgs/development/compilers/llvm/14/openmp/fix-find-tool.patch new file mode 100644 index 000000000000..b5d0e7b41775 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/14/openmp/fix-find-tool.patch @@ -0,0 +1,54 @@ +diff --git a/libomptarget/DeviceRTL/CMakeLists.txt b/libomptarget/DeviceRTL/CMakeLists.txt +index 242df638f80d..a4654e96371f 100644 +--- a/libomptarget/DeviceRTL/CMakeLists.txt ++++ b/libomptarget/DeviceRTL/CMakeLists.txt +@@ -25,16 +25,16 @@ endif() + + if (LLVM_DIR) + # Builds that use pre-installed LLVM have LLVM_DIR set. +- find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) ++ find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR} REQUIRED) + find_program(LINK_TOOL llvm-link PATHS ${LLVM_TOOLS_BINARY_DIR} +- NO_DEFAULT_PATH) +- find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) ++ REQUIRED) ++ find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR} REQUIRED) + libomptarget_say("Building DeviceRTL. Using clang: ${CLANG_TOOL}") + elseif (LLVM_TOOL_CLANG_BUILD AND NOT CMAKE_CROSSCOMPILING AND NOT OPENMP_STANDALONE_BUILD) + # LLVM in-tree builds may use CMake target names to discover the tools. +- set(CLANG_TOOL $<TARGET_FILE:clang>) +- set(LINK_TOOL $<TARGET_FILE:llvm-link>) +- set(OPT_TOOL $<TARGET_FILE:opt>) ++ set(CLANG_TOOL $<TARGET_FILE:clang> REQUIRED) ++ set(LINK_TOOL $<TARGET_FILE:llvm-link> REQUIRED) ++ set(OPT_TOOL $<TARGET_FILE:opt> REQUIRED) + libomptarget_say("Building DeviceRTL. Using clang from in-tree build") + else() + libomptarget_say("Not building DeviceRTL. No appropriate clang found") +diff --git a/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt b/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt +index 3f4c02671aeb..be9f4677d7b5 100644 +--- a/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt ++++ b/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt +@@ -38,16 +38,16 @@ endif() + + if (LLVM_DIR) + # Builds that use pre-installed LLVM have LLVM_DIR set. +- find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) ++ find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR} REQUIRED) + find_program(LINK_TOOL llvm-link PATHS ${LLVM_TOOLS_BINARY_DIR} +- NO_DEFAULT_PATH) +- find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) ++ REQUIRED) ++ find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR} REQUIRED) + libomptarget_say("Building AMDGCN device RTL. Using clang: ${CLANG_TOOL}") + elseif (LLVM_TOOL_CLANG_BUILD AND NOT CMAKE_CROSSCOMPILING AND NOT OPENMP_STANDALONE_BUILD) + # LLVM in-tree builds may use CMake target names to discover the tools. +- set(CLANG_TOOL $<TARGET_FILE:clang>) +- set(LINK_TOOL $<TARGET_FILE:llvm-link>) +- set(OPT_TOOL $<TARGET_FILE:opt>) ++ set(CLANG_TOOL $<TARGET_FILE:clang> REQUIRED) ++ set(LINK_TOOL $<TARGET_FILE:llvm-link> REQUIRED) ++ set(OPT_TOOL $<TARGET_FILE:opt> REQUIRED) + libomptarget_say("Building AMDGCN device RTL. Using clang from in-tree build") + else() + libomptarget_say("Not building AMDGCN device RTL. No appropriate clang found") diff --git a/nixpkgs/pkgs/development/compilers/llvm/14/openmp/gnu-install-dirs.patch b/nixpkgs/pkgs/development/compilers/llvm/14/openmp/gnu-install-dirs.patch new file mode 100644 index 000000000000..352a46923115 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/14/openmp/gnu-install-dirs.patch @@ -0,0 +1,89 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7f11a05f5622..fb90f8f6a49b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,6 +8,8 @@ if (OPENMP_STANDALONE_BUILD OR "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_S + set(OPENMP_STANDALONE_BUILD TRUE) + project(openmp C CXX) + ++ include(GNUInstallDirs) ++ + # CMAKE_BUILD_TYPE was not set, default to Release. + if (NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE Release) +@@ -19,7 +21,7 @@ if (OPENMP_STANDALONE_BUILD OR "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_S + set(OPENMP_LIBDIR_SUFFIX "" CACHE STRING + "Suffix of lib installation directory, e.g. 64 => lib64") + # Do not use OPENMP_LIBDIR_SUFFIX directly, use OPENMP_INSTALL_LIBDIR. +- set(OPENMP_INSTALL_LIBDIR "lib${OPENMP_LIBDIR_SUFFIX}") ++ set(OPENMP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}${OPENMP_LIBDIR_SUFFIX}") + + # Group test settings. + set(OPENMP_TEST_C_COMPILER ${CMAKE_C_COMPILER} CACHE STRING +@@ -30,7 +32,7 @@ if (OPENMP_STANDALONE_BUILD OR "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_S + else() + set(OPENMP_ENABLE_WERROR ${LLVM_ENABLE_WERROR}) + # If building in tree, we honor the same install suffix LLVM uses. +- set(OPENMP_INSTALL_LIBDIR "lib${LLVM_LIBDIR_SUFFIX}") ++ set(OPENMP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + + if (NOT MSVC) + set(OPENMP_TEST_C_COMPILER ${LLVM_RUNTIME_OUTPUT_INTDIR}/clang) +index 0e1ce2afd154..8b3810f83713 100644 +--- a/libomptarget/plugins/amdgpu/CMakeLists.txt ++++ b/libomptarget/plugins/amdgpu/CMakeLists.txt +@@ -80,7 +80,7 @@ add_library(omptarget.rtl.amdgpu SHARED + + # Install plugin under the lib destination folder. + # When we build for debug, OPENMP_LIBDIR_SUFFIX get set to -debug +-install(TARGETS omptarget.rtl.amdgpu LIBRARY DESTINATION "lib${OPENMP_LIBDIR_SUFFIX}") ++install(TARGETS omptarget.rtl.amdgpu LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${OPENMP_LIBDIR_SUFFIX}") + set_property(TARGET omptarget.rtl.amdgpu PROPERTY INSTALL_RPATH_USE_LINK_PATH ON) + + if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") +diff --git a/libomptarget/plugins/ve/CMakeLists.txt b/libomptarget/plugins/ve/CMakeLists.txt +index 16ce0891ca23..db30ee9c769f 100644 +--- a/libomptarget/plugins/ve/CMakeLists.txt ++++ b/libomptarget/plugins/ve/CMakeLists.txt +@@ -32,7 +32,7 @@ if(${LIBOMPTARGET_DEP_VEO_FOUND}) + + # Install plugin under the lib destination folder. + install(TARGETS "omptarget.rtl.${tmachine_libname}" +- LIBRARY DESTINATION lib${OPENMP_LIBDIR_SUFFIX}) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${OPENMP_LIBDIR_SUFFIX}) + + target_link_libraries( + "omptarget.rtl.${tmachine_libname}" +diff --git a/runtime/src/CMakeLists.txt b/runtime/src/CMakeLists.txt +index e4f4e6e1e73f..1164b3b22b0e 100644 +--- a/runtime/src/CMakeLists.txt ++++ b/runtime/src/CMakeLists.txt +@@ -346,13 +346,13 @@ add_dependencies(libomp-micro-tests libomp-test-deps) + # We want to install libomp in DESTDIR/CMAKE_INSTALL_PREFIX/lib + # We want to install headers in DESTDIR/CMAKE_INSTALL_PREFIX/include + if(${OPENMP_STANDALONE_BUILD}) +- set(LIBOMP_HEADERS_INSTALL_PATH include) ++ set(LIBOMP_HEADERS_INSTALL_PATH "${CMAKE_INSTALL_INCLUDEDIR}") + else() + string(REGEX MATCH "[0-9]+\\.[0-9]+(\\.[0-9]+)?" CLANG_VERSION ${PACKAGE_VERSION}) + set(LIBOMP_HEADERS_INSTALL_PATH "${OPENMP_INSTALL_LIBDIR}/clang/${CLANG_VERSION}/include") + endif() + if(WIN32) +- install(TARGETS omp RUNTIME DESTINATION bin) ++ install(TARGETS omp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + install(TARGETS ${LIBOMP_IMP_LIB_TARGET} ARCHIVE DESTINATION "${OPENMP_INSTALL_LIBDIR}") + # Create aliases (regular copies) of the library for backwards compatibility + set(LIBOMP_ALIASES "libiomp5md") +diff --git a/tools/multiplex/CMakeLists.txt b/tools/multiplex/CMakeLists.txt +index 64317c112176..4002784da736 100644 +--- a/tools/multiplex/CMakeLists.txt ++++ b/tools/multiplex/CMakeLists.txt +@@ -4,7 +4,7 @@ if(LIBOMP_OMPT_SUPPORT) + add_library(ompt-multiplex INTERFACE) + target_include_directories(ompt-multiplex INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) + +- install(FILES ompt-multiplex.h DESTINATION include) ++ install(FILES ompt-multiplex.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + + add_subdirectory(tests) + endif() diff --git a/nixpkgs/pkgs/development/compilers/llvm/git/clang/default.nix b/nixpkgs/pkgs/development/compilers/llvm/git/clang/default.nix index 3873bda2b6d5..9544494b356e 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/git/clang/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/git/clang/default.nix @@ -1,16 +1,23 @@ -{ lib, stdenv, llvm_meta, src, substituteAll, cmake, libxml2, libllvm, version, python3 +{ lib, stdenv, llvm_meta +, monorepoSrc, runCommand +, substituteAll, cmake, libxml2, libllvm, version, python3 , buildLlvmTools , fixDarwinDylibNames , enableManpages ? false }: let - self = stdenv.mkDerivation ({ + self = stdenv.mkDerivation (rec { pname = "clang"; inherit version; - inherit src; - sourceRoot = "source/clang"; + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + ''; + + sourceRoot = "${src.name}/${pname}"; nativeBuildInputs = [ cmake python3 ] ++ lib.optional enableManpages python3.pkgs.sphinx diff --git a/nixpkgs/pkgs/development/compilers/llvm/git/clang/gnu-install-dirs.patch b/nixpkgs/pkgs/development/compilers/llvm/git/clang/gnu-install-dirs.patch index b834d386b4eb..a8825f08850e 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/git/clang/gnu-install-dirs.patch +++ b/nixpkgs/pkgs/development/compilers/llvm/git/clang/gnu-install-dirs.patch @@ -1,9 +1,9 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9e74014134a0..976e6a1757fd 100644 +index 7ea37850ad60..ac0f2d4f60b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,6 +5,8 @@ cmake_minimum_required(VERSION 3.13.4) - if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR ) + if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) project(Clang) + include(GNUInstallDirs) @@ -11,7 +11,7 @@ index 9e74014134a0..976e6a1757fd 100644 set(CMAKE_CXX_STANDARD 14 CACHE STRING "C++ standard to conform to") set(CMAKE_CXX_STANDARD_REQUIRED YES) set(CMAKE_CXX_EXTENSIONS NO) -@@ -416,7 +418,7 @@ include_directories(BEFORE +@@ -424,7 +426,7 @@ include_directories(BEFORE if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) install(DIRECTORY include/clang include/clang-c @@ -20,7 +20,7 @@ index 9e74014134a0..976e6a1757fd 100644 COMPONENT clang-headers FILES_MATCHING PATTERN "*.def" -@@ -425,7 +427,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) +@@ -433,7 +435,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) ) install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/clang @@ -29,7 +29,7 @@ index 9e74014134a0..976e6a1757fd 100644 COMPONENT clang-headers FILES_MATCHING PATTERN "CMakeFiles" EXCLUDE -@@ -445,7 +447,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) +@@ -453,7 +455,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) add_custom_target(bash-autocomplete DEPENDS utils/bash-autocomplete.sh) install(PROGRAMS utils/bash-autocomplete.sh @@ -39,10 +39,10 @@ index 9e74014134a0..976e6a1757fd 100644 if(NOT LLVM_ENABLE_IDE) add_llvm_install_targets(install-bash-autocomplete diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake -index 704278a0e93b..d25c8d325c71 100644 +index 5752f4277444..5bf08dbf5e83 100644 --- a/cmake/modules/AddClang.cmake +++ b/cmake/modules/AddClang.cmake -@@ -123,9 +123,9 @@ macro(add_clang_library name) +@@ -118,9 +118,9 @@ macro(add_clang_library name) install(TARGETS ${lib} COMPONENT ${lib} ${export_to_clangtargets} @@ -55,8 +55,8 @@ index 704278a0e93b..d25c8d325c71 100644 if (NOT LLVM_ENABLE_IDE) add_llvm_install_targets(install-${lib} -@@ -170,7 +170,7 @@ macro(add_clang_tool name) - +@@ -159,7 +159,7 @@ macro(add_clang_tool name) + get_target_export_arg(${name} Clang export_to_clangtargets) install(TARGETS ${name} ${export_to_clangtargets} - RUNTIME DESTINATION bin @@ -64,7 +64,7 @@ index 704278a0e93b..d25c8d325c71 100644 COMPONENT ${name}) if(NOT LLVM_ENABLE_IDE) -@@ -185,7 +185,7 @@ endmacro() +@@ -174,7 +174,7 @@ endmacro() macro(add_clang_symlink name dest) add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE) # Always generate install targets @@ -74,10 +74,10 @@ index 704278a0e93b..d25c8d325c71 100644 function(clang_target_link_libraries target type) diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt -index b2c0ce8dd4a0..19e5443d8c25 100644 +index 078988980c52..14b58614b40a 100644 --- a/lib/Headers/CMakeLists.txt +++ b/lib/Headers/CMakeLists.txt -@@ -215,7 +215,7 @@ set_target_properties(clang-resource-headers PROPERTIES +@@ -234,7 +234,7 @@ set_target_properties(clang-resource-headers PROPERTIES FOLDER "Misc" RUNTIME_OUTPUT_DIRECTORY "${output_dir}") @@ -87,10 +87,10 @@ index b2c0ce8dd4a0..19e5443d8c25 100644 install( FILES ${files} ${generated_files} diff --git a/tools/c-index-test/CMakeLists.txt b/tools/c-index-test/CMakeLists.txt -index ceef4b08637c..8efad5520ca4 100644 +index 99c6081db2d6..0887102febb3 100644 --- a/tools/c-index-test/CMakeLists.txt +++ b/tools/c-index-test/CMakeLists.txt -@@ -54,7 +54,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) +@@ -49,7 +49,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) set_property(TARGET c-index-test APPEND PROPERTY INSTALL_RPATH "@executable_path/../../lib") else() @@ -146,10 +146,10 @@ index cda8e29ec5b1..0134d8ccd70b 100644 + DESTINATION ${CMAKE_INSTALL_DATADIR}/clang COMPONENT clang-rename) diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt -index 51ff2e7e1565..1ed5f8a079a1 100644 +index bf88dca0a34b..7a10181e7738 100644 --- a/tools/libclang/CMakeLists.txt +++ b/tools/libclang/CMakeLists.txt -@@ -166,7 +166,7 @@ endif() +@@ -186,7 +186,7 @@ endif() if(INTERNAL_INSTALL_PREFIX) set(LIBCLANG_HEADERS_INSTALL_DESTINATION "${INTERNAL_INSTALL_PREFIX}/include") else() @@ -158,7 +158,7 @@ index 51ff2e7e1565..1ed5f8a079a1 100644 endif() install(DIRECTORY ../../include/clang-c -@@ -196,7 +196,7 @@ foreach(PythonVersion ${CLANG_PYTHON_BINDINGS_VERSIONS}) +@@ -216,7 +216,7 @@ foreach(PythonVersion ${CLANG_PYTHON_BINDINGS_VERSIONS}) COMPONENT libclang-python-bindings DESTINATION @@ -168,7 +168,7 @@ index 51ff2e7e1565..1ed5f8a079a1 100644 if(NOT LLVM_ENABLE_IDE) add_custom_target(libclang-python-bindings) diff --git a/tools/scan-build/CMakeLists.txt b/tools/scan-build/CMakeLists.txt -index ec0702d76f18..d25d982f51da 100644 +index 74334e53c9b1..ebaae33e4324 100644 --- a/tools/scan-build/CMakeLists.txt +++ b/tools/scan-build/CMakeLists.txt @@ -47,7 +47,7 @@ if(CLANG_INSTALL_SCANBUILD) @@ -199,10 +199,10 @@ index ec0702d76f18..d25d982f51da 100644 endforeach() diff --git a/tools/scan-view/CMakeLists.txt b/tools/scan-view/CMakeLists.txt -index dd3d33439299..fea19c12ce70 100644 +index eccc6b83195b..ff72d9cf0666 100644 --- a/tools/scan-view/CMakeLists.txt +++ b/tools/scan-view/CMakeLists.txt -@@ -19,7 +19,7 @@ if(CLANG_INSTALL_SCANVIEW) +@@ -20,7 +20,7 @@ if(CLANG_INSTALL_SCANVIEW) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) install(PROGRAMS bin/${BinFile} @@ -211,7 +211,7 @@ index dd3d33439299..fea19c12ce70 100644 COMPONENT scan-view) endforeach() -@@ -33,7 +33,7 @@ if(CLANG_INSTALL_SCANVIEW) +@@ -34,7 +34,7 @@ if(CLANG_INSTALL_SCANVIEW) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/${ShareFile}) list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-view/${ShareFile}) install(FILES share/${ShareFile} diff --git a/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/default.nix b/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/default.nix index 019148039d17..59ca5348fed4 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/default.nix @@ -1,4 +1,7 @@ -{ lib, stdenv, llvm_meta, version, src, cmake, python3, libllvm, libcxxabi }: +{ lib, stdenv, llvm_meta, version +, monorepoSrc, runCommand +, cmake, python3, libllvm, libcxxabi +}: let @@ -7,14 +10,21 @@ let haveLibc = stdenv.cc.libc != null; inherit (stdenv.hostPlatform) isMusl; + baseName = "compiler-rt"; + + src = runCommand "${baseName}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${baseName} "$out" + ''; in stdenv.mkDerivation { - pname = "compiler-rt" + lib.optionalString (haveLibc) "-libc"; + pname = baseName + lib.optionalString (haveLibc) "-libc"; inherit version; inherit src; - sourceRoot = "source/compiler-rt"; + sourceRoot = "${src.name}/${baseName}"; nativeBuildInputs = [ cmake python3 libllvm.dev ]; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; @@ -58,6 +68,7 @@ stdenv.mkDerivation { patches = [ ./codesign.patch # Revert compiler-rt commit that makes codesign mandatory ./X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config + ./gnu-install-dirs.patch # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the # extra `/`. ./normalize-var.patch diff --git a/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/gnu-install-dirs.patch b/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/gnu-install-dirs.patch new file mode 100644 index 000000000000..909b5193ffd8 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/gnu-install-dirs.patch @@ -0,0 +1,55 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c5003b5efa1d..4fffb9721284 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5,6 +5,8 @@ + + cmake_minimum_required(VERSION 3.13.4) + ++include(GNUInstallDirs) ++ + # Check if compiler-rt is built as a standalone project. + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR COMPILER_RT_STANDALONE_BUILD) + project(CompilerRT C CXX ASM) +diff --git a/cmake/base-config-ix.cmake b/cmake/base-config-ix.cmake +index 1ada0ab30ba0..b4be6c4a3c73 100644 +--- a/cmake/base-config-ix.cmake ++++ b/cmake/base-config-ix.cmake +@@ -66,7 +66,7 @@ if (LLVM_TREE_AVAILABLE) + else() + # Take output dir and install path from the user. + set(COMPILER_RT_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH +- "Path where built compiler-rt libraries should be stored.") ++ "Path where built compiler-rt build artifacts should be stored.") + set(COMPILER_RT_EXEC_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/bin CACHE PATH + "Path where built compiler-rt executables should be stored.") + set(COMPILER_RT_INSTALL_PATH "" CACHE PATH +@@ -98,23 +98,23 @@ endif() + if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + set(COMPILER_RT_OUTPUT_LIBRARY_DIR + ${COMPILER_RT_OUTPUT_DIR}/lib) +- extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" lib) ++ extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_LIBDIR}") + set(COMPILER_RT_INSTALL_LIBRARY_DIR "${default_install_path}" CACHE PATH + "Path where built compiler-rt libraries should be installed.") + else(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + set(COMPILER_RT_OUTPUT_LIBRARY_DIR + ${COMPILER_RT_OUTPUT_DIR}/lib/${COMPILER_RT_OS_DIR}) +- extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "lib/${COMPILER_RT_OS_DIR}") ++ extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_LIBDIR}/${COMPILER_RT_OS_DIR}") + set(COMPILER_RT_INSTALL_LIBRARY_DIR "${default_install_path}" CACHE PATH + "Path where built compiler-rt libraries should be installed.") + endif() +-extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" bin) ++extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_BINDIR}") + set(COMPILER_RT_INSTALL_BINARY_DIR "${default_install_path}" CACHE PATH + "Path where built compiler-rt executables should be installed.") +-extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" include) ++extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_INCLUDEDIR}") + set(COMPILER_RT_INSTALL_INCLUDE_DIR "${default_install_path}" CACHE PATH + "Path where compiler-rt headers should be installed.") +-extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" share) ++extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_DATADIR}") + set(COMPILER_RT_INSTALL_DATA_DIR "${default_install_path}" CACHE PATH + "Path where compiler-rt data files should be installed.") + diff --git a/nixpkgs/pkgs/development/compilers/llvm/git/default.nix b/nixpkgs/pkgs/development/compilers/llvm/git/default.nix index 890270c851db..0f45acffb279 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/git/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/git/default.nix @@ -21,16 +21,16 @@ let release_version = "14.0.0"; candidate = ""; # empty or "rcN" dash-candidate = lib.optionalString (candidate != "") "-${candidate}"; - rev = "ee65938357d5fffe9e586fa155b37268b5a358ac"; # When using a Git commit - rev-version = "unstable-2021-08-13"; # When using a Git commit + rev = "fb1582f6c54422995c6fb61ba4c55126b357f64e"; # When using a Git commit + rev-version = "unstable-2022-01-07"; # When using a Git commit version = if rev != "" then rev-version else "${release_version}${dash-candidate}"; targetConfig = stdenv.targetPlatform.config; - src = fetchFromGitHub { + monorepoSrc = fetchFromGitHub { owner = "llvm"; repo = "llvm-project"; rev = if rev != "" then rev else "llvmorg-${version}"; - sha256 = "10ahc108wbg2rsp50j3mc8h018a453ykg1rivjkhizng80pyllm1"; + sha256 = "1pkgdsscvf59i22ix763lp2z3sg0v2z2ywh0n07k3ki7q1qpqbhk"; }; llvm_meta = { @@ -40,7 +40,7 @@ let }; tools = lib.makeExtensible (tools: let - callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version src buildLlvmTools; }); + callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version monorepoSrc buildLlvmTools; }); mkExtraBuildCommands0 = cc: '' rsrc="$out/resource-root" mkdir "$rsrc" @@ -218,7 +218,7 @@ let }); libraries = lib.makeExtensible (libraries: let - callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version src; }); + callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version monorepoSrc; }); in { compiler-rt-libc = callPackage ./compiler-rt { diff --git a/nixpkgs/pkgs/development/compilers/llvm/git/libcxx/default.nix b/nixpkgs/pkgs/development/compilers/llvm/git/libcxx/default.nix index 0ddf28909b8e..8891a69937ab 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/git/libcxx/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/git/libcxx/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, llvm_meta, src, cmake, python3, fixDarwinDylibNames, version +{ lib, stdenv, llvm_meta +, monorepoSrc, runCommand +, cmake, python3, fixDarwinDylibNames, version , libcxxabi , enableShared ? !stdenv.hostPlatform.isStatic @@ -10,12 +12,26 @@ , headersOnly ? false }: +let + basename = "libcxx"; +in + stdenv.mkDerivation rec { - pname = if headersOnly then "cxx-headers" else "libcxx"; + pname = basename + lib.optionalString headersOnly "-headers"; inherit version; - inherit src; - sourceRoot = "source/libcxx"; + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${basename} "$out" + mkdir -p "$out/libcxxabi" + cp -r ${monorepoSrc}/libcxxabi/include "$out/libcxxabi" + mkdir -p "$out/llvm" + cp -r ${monorepoSrc}/llvm/cmake "$out/llvm" + cp -r ${monorepoSrc}/llvm/utils "$out/llvm" + ''; + + sourceRoot = "${src.name}/${basename}"; outputs = [ "out" ] ++ lib.optional (!headersOnly) "dev"; 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 744967a6ee0b..0f1d5c411ab8 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,82 +1,85 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index b1e25358d41a..7fe1f4d85401 100644 +index b0569a4a54ca..7d665f5a3258 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -26,6 +26,8 @@ set(LIBCXX_BINARY_INCLUDE_DIR "${LIBCXX_BINARY_DIR}/include/c++build") - if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBCXX_STANDALONE_BUILD) - project(libcxx CXX C) +@@ -10,6 +10,8 @@ endif() + #=============================================================================== + cmake_minimum_required(VERSION 3.13.4) -+ include(GNUInstallDirs) ++include(GNUInstallDirs) + - set(PACKAGE_NAME libcxx) - set(PACKAGE_VERSION 13.0.0git) - set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") -@@ -412,7 +414,7 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") + + # Add path for custom modules +@@ -415,13 +417,13 @@ 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} CACHE PATH -+ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH ++ set(LIBCXX_INSTALL_LIBRARY_DIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}" CACHE PATH "Path where built libc++ libraries should be installed.") - set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1" CACHE PATH +- set(LIBCXX_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBCXX_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH + "Path where built libc++ runtime libraries should be installed.") +- set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1" CACHE PATH ++ set(LIBCXX_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/c++/v1" CACHE PATH "Path where target-agnostic libc++ headers should be installed.") -@@ -426,7 +428,7 @@ elseif(LLVM_LIBRARY_OUTPUT_INTDIR) +- set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "include/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1" CACHE PATH ++ set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${CMAKE_INSTALL_INCLUDEDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1" CACHE PATH + "Path where target-specific libc++ headers should be installed.") + if(LIBCXX_LIBDIR_SUBDIR) + string(APPEND LIBCXX_LIBRARY_DIR /${LIBCXX_LIBDIR_SUBDIR}) +@@ -431,11 +433,11 @@ elseif(LLVM_LIBRARY_OUTPUT_INTDIR) set(LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) 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} CACHE PATH + set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} CACHE PATH "Path where built libc++ libraries should be installed.") - set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1" CACHE PATH +- set(LIBCXX_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBCXX_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}/c++/v1" CACHE PATH + "Path where built libc++ runtime libraries should be installed.") +- set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1" CACHE PATH ++ set(LIBCXX_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/c++/v1" CACHE PATH "Path where target-agnostic libc++ headers should be installed.") -@@ -436,7 +438,7 @@ else() + set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${LIBCXX_INSTALL_INCLUDE_DIR}" CACHE PATH + "Path where target-specific libc++ headers should be installed.") +@@ -443,11 +445,11 @@ else() set(LIBCXX_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXX_LIBDIR_SUFFIX}) 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} CACHE PATH + set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} CACHE PATH "Path where built libc++ libraries should be installed.") - set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1" CACHE PATH +- set(LIBCXX_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBCXX_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH + "Path where built libc++ runtime libraries should be installed.") +- set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1" CACHE PATH ++ set(LIBCXX_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/c++/v1" CACHE PATH "Path where target-agnostic libc++ headers should be installed.") + set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${LIBCXX_INSTALL_INCLUDE_DIR}" CACHE PATH + "Path where target-specific libc++ headers should be installed.") diff --git a/cmake/Modules/HandleLibCXXABI.cmake b/cmake/Modules/HandleLibCXXABI.cmake -index 5a8a4a270a1a..c06bae0001aa 100644 +index 5a8a4a270a1a..d69405ddeeac 100644 --- a/cmake/Modules/HandleLibCXXABI.cmake +++ b/cmake/Modules/HandleLibCXXABI.cmake -@@ -63,7 +63,7 @@ macro(setup_abi_lib abidefines abishared abistatic abifiles abidirs) +@@ -1,8 +1,9 @@ +- + #=============================================================================== + # Add an ABI library if appropriate + #=============================================================================== + ++include(GNUInstallDirs) ++ + # + # _setup_abi: Set up the build to use an ABI library + # +@@ -63,7 +64,7 @@ macro(setup_abi_lib abidefines abishared abistatic abifiles abidirs) if (LIBCXX_INSTALL_HEADERS) install(FILES "${LIBCXX_BINARY_INCLUDE_DIR}/${fpath}" - DESTINATION include/c++/v1/${dstdir} -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/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/src/CMakeLists.txt b/src/CMakeLists.txt -index 496429f3841e..1a0c9c0a3159 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -376,21 +376,21 @@ if (LIBCXX_INSTALL_SHARED_LIBRARY) - install(TARGETS cxx_shared - 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_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_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 9f14f87a7a02..d64708ab040a 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/git/libcxxabi/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/git/libcxxabi/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, llvm_meta, cmake, python3, src, cxx-headers, libunwind, version +{ lib, stdenv, llvm_meta, cmake, python3 +, monorepoSrc, runCommand +, cxx-headers, libunwind, version , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -6,8 +8,19 @@ stdenv.mkDerivation rec { pname = "libcxxabi"; inherit version; - inherit src; - sourceRoot = "source/${pname}"; + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + mkdir -p "$out/libcxx/src" + cp -r ${monorepoSrc}/libcxx/cmake "$out/libcxx" + cp -r ${monorepoSrc}/libcxx/include "$out/libcxx" + cp -r ${monorepoSrc}/libcxx/src/include "$out/libcxx/src" + mkdir -p "$out/llvm" + cp -r ${monorepoSrc}/llvm/cmake "$out/llvm" + ''; + + sourceRoot = "${src.name}/${pname}"; outputs = [ "out" "dev" ]; 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 5d562dd59a99..a93348ded0c1 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,37 +1,46 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9fb35860d483..5739d9e8af62 100644 +index 858f5d5cfd7f..16c67d7062be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -27,6 +27,8 @@ set(LIBCXXABI_LIBCXX_PATH "${CMAKE_CURRENT_LIST_DIR}/../libcxx" CACHE PATH - if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBCXXABI_STANDALONE_BUILD) - project(libcxxabi CXX C) +@@ -10,6 +10,8 @@ endif() -+ include(GNUInstallDirs) + cmake_minimum_required(VERSION 3.13.4) + ++include(GNUInstallDirs) + - set(PACKAGE_NAME libcxxabi) - set(PACKAGE_VERSION 11.0.0git) - set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") -@@ -195,7 +197,7 @@ set(CMAKE_MODULE_PATH + set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") + + # Add path for custom modules +@@ -213,9 +215,9 @@ set(CMAKE_MODULE_PATH if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) 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} CACHE PATH + set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH "Path where built libc++abi libraries should be installed.") +- set(LIBCXXABI_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBCXXABI_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH + "Path where built libc++abi runtime libraries should be installed.") if(LIBCXX_LIBDIR_SUBDIR) string(APPEND LIBCXXABI_LIBRARY_DIR /${LIBCXXABI_LIBDIR_SUBDIR}) -@@ -204,12 +206,12 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) +@@ -224,16 +226,16 @@ 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} CACHE PATH + set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH "Path where built libc++abi libraries should be installed.") +- set(LIBCXXABI_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBCXXABI_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH + "Path where built libc++abi runtime libraries should be installed.") 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} CACHE PATH + set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH "Path where built libc++abi libraries should be installed.") +- set(LIBCXXABI_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBCXXABI_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH + "Path where built libc++abi runtime libraries should be installed.") endif() diff --git a/nixpkgs/pkgs/development/compilers/llvm/git/libunwind/default.nix b/nixpkgs/pkgs/development/compilers/llvm/git/libunwind/default.nix index b6017e741728..c6d9eda5e474 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/git/libunwind/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/git/libunwind/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, llvm_meta, version, src, cmake +{ lib, stdenv, llvm_meta, version +, monorepoSrc, runCommand +, cmake , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -6,8 +8,20 @@ stdenv.mkDerivation rec { pname = "libunwind"; inherit version; - inherit src; - sourceRoot = "source/${pname}"; + # I am not so comfortable giving libc++ and friends the whole monorepo as + # requested, so I filter it to what is needed. + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + mkdir -p "$out/libcxx" + cp -r ${monorepoSrc}/libcxx/cmake "$out/libcxx" + cp -r ${monorepoSrc}/libcxx/utils "$out/libcxx" + mkdir -p "$out/llvm" + cp -r ${monorepoSrc}/llvm/cmake "$out/llvm" + ''; + + sourceRoot = "${src.name}/${pname}"; patches = [ ./gnu-install-dirs.patch 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 8cd25c56f8cc..3f05d2a87269 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,36 +1,65 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 81eddbc24879..e2afb2002150 100644 +index e3cc66dd2226..1299b596ce0d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -23,6 +23,8 @@ set(LIBUNWIND_LIBCXX_PATH "${CMAKE_CURRENT_LIST_DIR}/../libcxx" CACHE PATH - if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBUNWIND_STANDALONE_BUILD) - project(libunwind LANGUAGES C CXX ASM) +@@ -8,6 +8,8 @@ endif() -+ include(GNUInstallDirs) + cmake_minimum_required(VERSION 3.13.4) + ++include(GNUInstallDirs) + - set(PACKAGE_NAME libunwind) - set(PACKAGE_VERSION 13.0.0git) - set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") -@@ -116,7 +118,7 @@ set(CMAKE_MODULE_PATH + set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") + + # Add path for custom modules +@@ -139,25 +141,27 @@ 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}) - set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH ++ set(LIBUNWIND_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}" CACHE PATH ++ "Path where built libunwind headers should be installed.") + set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH "Path where built libunwind libraries should be installed.") +- set(LIBUNWIND_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBUNWIND_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH + "Path where built libunwind runtime libraries should be installed.") if(LIBCXX_LIBDIR_SUBDIR) string(APPEND LIBUNWIND_LIBRARY_DIR /${LIBUNWIND_LIBDIR_SUBDIR}) -@@ -124,11 +126,11 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + string(APPEND LIBUNWIND_INSTALL_LIBRARY_DIR /${LIBUNWIND_LIBDIR_SUBDIR}) endif() - elseif(LLVM_LIBRARY_OUTPUT_INTDIR) - set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) +-elseif(LLVM_LIBRARY_OUTPUT_INTDIR) +- set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) - set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH -+ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} CACHE PATH - "Path where built libunwind libraries should be installed.") +- "Path where built libunwind libraries should be installed.") +- set(LIBUNWIND_INSTALL_RUNTIME_DIR bin CACHE PATH +- "Path where built libunwind runtime libraries should be installed.") else() - set(LIBUNWIND_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBUNWIND_LIBDIR_SUFFIX}) +- set(LIBUNWIND_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBUNWIND_LIBDIR_SUFFIX}) - set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH -+ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} CACHE PATH ++ if(LLVM_LIBRARY_OUTPUT_INTDIR) ++ set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) ++ else() ++ set(LIBUNWIND_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBUNWIND_LIBDIR_SUFFIX}) ++ endif() ++ set(LIBUNWIND_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}" CACHE PATH ++ "Path where built libunwind headers should be installed.") ++ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH "Path where built libunwind libraries should be installed.") +- set(LIBUNWIND_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBUNWIND_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH + "Path where built libunwind runtime libraries should be installed.") endif() +diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt +index c3bb1dd0f69f..adf1766c44cb 100644 +--- a/include/CMakeLists.txt ++++ b/include/CMakeLists.txt +@@ -14,7 +14,7 @@ if(LIBUNWIND_INSTALL_HEADERS) + foreach(file ${files}) + get_filename_component(dir ${file} DIRECTORY) + install(FILES ${file} +- DESTINATION "include/${dir}" ++ DESTINATION "${LIBUNWIND_INSTALL_INCLUDE_DIR}/${dir}" + COMPONENT unwind-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ + ) diff --git a/nixpkgs/pkgs/development/compilers/llvm/git/lld/default.nix b/nixpkgs/pkgs/development/compilers/llvm/git/lld/default.nix index 34ac265f4bfd..fe655c761129 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/git/lld/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/git/lld/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, llvm_meta , buildLlvmTools -, src +, monorepoSrc, runCommand , cmake , libxml2 , libllvm @@ -11,19 +11,30 @@ stdenv.mkDerivation rec { pname = "lld"; inherit version; - inherit src; - sourceRoot = "source/${pname}"; + # Blank llvm dir just so relative path works + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + mkdir -p "$out/libunwind" + cp -r ${monorepoSrc}/libunwind/include "$out/libunwind" + mkdir -p "$out/llvm" + ''; + + sourceRoot = "${src.name}/${pname}"; patches = [ ./gnu-install-dirs.patch + # On Darwin the llvm-config is perhaps not working fine as the + # LLVM_MAIN_SRC_DIR is not getting set correctly, and the build fails as + # the include path is not correct. + ./fix-root-src-dir.patch ]; nativeBuildInputs = [ cmake ]; buildInputs = [ libllvm libxml2 ]; - cmakeFlags = [ - "-DLLVM_CONFIG_PATH=${libllvm.dev}/bin/llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}" - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + cmakeFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" ]; diff --git a/nixpkgs/pkgs/development/compilers/llvm/git/lld/fix-root-src-dir.patch b/nixpkgs/pkgs/development/compilers/llvm/git/lld/fix-root-src-dir.patch new file mode 100644 index 000000000000..26ecef256495 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/git/lld/fix-root-src-dir.patch @@ -0,0 +1,13 @@ +diff --git a/lld/CMakeLists.txt b/lld/CMakeLists.txt +index e1a29b884d17..9d542f8fbfc1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -64,7 +64,7 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) + + set(LLVM_MAIN_INCLUDE_DIR ${MAIN_INCLUDE_DIR} CACHE PATH "Path to llvm/include") + set(LLVM_BINARY_DIR ${LLVM_OBJ_ROOT} CACHE PATH "Path to LLVM build tree") +- set(LLVM_MAIN_SRC_DIR ${MAIN_SRC_DIR} CACHE PATH "Path to LLVM source tree") ++ set(LLVM_MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm" CACHE PATH "Path to LLVM source tree") + + find_program(LLVM_TABLEGEN_EXE "llvm-tblgen" ${LLVM_TOOLS_BINARY_DIR} + NO_DEFAULT_PATH) diff --git a/nixpkgs/pkgs/development/compilers/llvm/git/lld/gnu-install-dirs.patch b/nixpkgs/pkgs/development/compilers/llvm/git/lld/gnu-install-dirs.patch index 61e2f0e48653..89a5822df49c 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/git/lld/gnu-install-dirs.patch +++ b/nixpkgs/pkgs/development/compilers/llvm/git/lld/gnu-install-dirs.patch @@ -1,68 +1,22 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d4e561b50d8f..cfa5bdd79c2a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -6,6 +6,8 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(LLD_BUILT_STANDALONE TRUE) - -+ include(GNUInstallDirs) -+ - find_program(LLVM_CONFIG_PATH "llvm-config" DOC "Path to llvm-config binary") - if(NOT LLVM_CONFIG_PATH) - message(FATAL_ERROR "llvm-config not found: specify LLVM_CONFIG_PATH") -@@ -179,7 +181,7 @@ include_directories(BEFORE - - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - install(DIRECTORY include/ -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "*.h" - ) diff --git a/cmake/modules/AddLLD.cmake b/cmake/modules/AddLLD.cmake -index 23df41312403..d62372c88de7 100644 +index dd2898ce6236..ebbea040ff54 100644 --- a/cmake/modules/AddLLD.cmake +++ b/cmake/modules/AddLLD.cmake -@@ -20,9 +20,9 @@ macro(add_lld_library name) +@@ -18,8 +18,8 @@ macro(add_lld_library name) install(TARGETS ${name} COMPONENT ${name} ${export_to_lldtargets} - LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} - ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- RUNTIME DESTINATION bin) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) ++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES) - add_llvm_install_targets(install-${name} -@@ -54,7 +54,7 @@ macro(add_lld_tool name) - - install(TARGETS ${name} - ${export_to_lldtargets} -- RUNTIME DESTINATION bin -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - COMPONENT ${name}) - - if(NOT CMAKE_CONFIGURATION_TYPES) -@@ -69,5 +69,5 @@ endmacro() +@@ -62,5 +62,5 @@ endmacro() macro(add_lld_symlink name dest) add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE) # Always generate install targets - llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE) + llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE) endmacro() -diff --git a/tools/lld/CMakeLists.txt b/tools/lld/CMakeLists.txt -index 5cff736ff57f..64e775c771b9 100644 ---- a/tools/lld/CMakeLists.txt -+++ b/tools/lld/CMakeLists.txt -@@ -21,7 +21,7 @@ target_link_libraries(lld - ) - - install(TARGETS lld -- RUNTIME DESTINATION bin) -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - - if(NOT LLD_SYMLINKS_TO_CREATE) - set(LLD_SYMLINKS_TO_CREATE diff --git a/nixpkgs/pkgs/development/compilers/llvm/git/lldb/default.nix b/nixpkgs/pkgs/development/compilers/llvm/git/lldb/default.nix index 96d8b19ee419..a2c68b224775 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/git/lldb/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/git/lldb/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, llvm_meta , runCommand -, src +, monorepoSrc , cmake , zlib , ncurses @@ -27,8 +27,13 @@ stdenv.mkDerivation (rec { pname = "lldb"; inherit version; - inherit src; - sourceRoot = "source/${pname}"; + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + ''; + + sourceRoot = "${src.name}/${pname}"; patches = [ ./procfs.patch diff --git a/nixpkgs/pkgs/development/compilers/llvm/git/lldb/gnu-install-dirs.patch b/nixpkgs/pkgs/development/compilers/llvm/git/lldb/gnu-install-dirs.patch index afc945ce2614..f69ed9e162fb 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/git/lldb/gnu-install-dirs.patch +++ b/nixpkgs/pkgs/development/compilers/llvm/git/lldb/gnu-install-dirs.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index b5633e21c56a..f2f1035e9238 100644 +index 79d451965ed4..78188978d6de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -10,6 +10,8 @@ set(CMAKE_MODULE_PATH +@@ -12,6 +12,8 @@ set(CMAKE_MODULE_PATH # If we are not building as part of LLVM, build LLDB as a standalone project, # using LLVM as an external library. if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) @@ -12,10 +12,10 @@ index b5633e21c56a..f2f1035e9238 100644 include(LLDBStandalone) diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake -index 4ed5c647c5d2..89f96e710d55 100644 +index 3291a7c808e1..b27d27ce6a87 100644 --- a/cmake/modules/AddLLDB.cmake +++ b/cmake/modules/AddLLDB.cmake -@@ -107,13 +107,13 @@ function(add_lldb_library name) +@@ -109,7 +109,7 @@ function(add_lldb_library name) endif() if(PARAM_SHARED) @@ -24,68 +24,13 @@ index 4ed5c647c5d2..89f96e710d55 100644 if(PARAM_INSTALL_PREFIX) set(install_dest ${PARAM_INSTALL_PREFIX}) endif() - # RUNTIME is relevant for DLL platforms, FRAMEWORK for macOS - install(TARGETS ${name} COMPONENT ${name} -- RUNTIME DESTINATION bin -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${install_dest} - ARCHIVE DESTINATION ${install_dest} - FRAMEWORK DESTINATION ${install_dest}) -diff --git a/cmake/modules/LLDBConfig.cmake b/cmake/modules/LLDBConfig.cmake -index 2fdf1502d055..37364341ff8b 100644 ---- a/cmake/modules/LLDBConfig.cmake -+++ b/cmake/modules/LLDBConfig.cmake -@@ -225,7 +225,7 @@ include_directories(BEFORE - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - install(DIRECTORY include/ - COMPONENT lldb-headers -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "*.h" - PATTERN ".cmake" EXCLUDE -@@ -233,7 +233,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - - install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/ - COMPONENT lldb-headers -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "*.h" - PATTERN ".cmake" EXCLUDE diff --git a/tools/intel-features/CMakeLists.txt b/tools/intel-features/CMakeLists.txt -index 734167e51bc5..f95761b5df58 100644 +index 7d48491ec89a..c04543585588 100644 --- a/tools/intel-features/CMakeLists.txt +++ b/tools/intel-features/CMakeLists.txt -@@ -65,4 +65,4 @@ if (LLDB_ENABLE_PYTHON AND LLDB_BUILD_INTEL_PT) - endif() +@@ -30,4 +30,4 @@ add_lldb_library(lldbIntelFeatures SHARED + ) 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/git/llvm/default.nix b/nixpkgs/pkgs/development/compilers/llvm/git/llvm/default.nix index fc7030810c5b..d2059cc66ba2 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/git/llvm/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/git/llvm/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, llvm_meta , pkgsBuildBuild -, src +, monorepoSrc +, runCommand , fetchpatch , cmake , python3 @@ -22,7 +23,7 @@ || stdenv.isAarch32 # broken for the armv7l builder ) , enablePolly ? false -}: +} @args: let inherit (lib) optional optionals optionalString; @@ -35,8 +36,16 @@ in stdenv.mkDerivation (rec { pname = "llvm"; inherit version; - inherit src; - sourceRoot = "source/${pname}"; + src = runCommand "${pname}-src-${version}" {} ('' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + cp -r ${monorepoSrc}/third-party "$out" + '' + lib.optionalString enablePolly '' + cp -r ${monorepoSrc}/polly "$out/llvm/tools" + ''); + + sourceRoot = "${src.name}/${pname}"; outputs = [ "out" "lib" "dev" "python" ]; @@ -51,12 +60,6 @@ in stdenv.mkDerivation (rec { checkInputs = [ which ]; patches = [ - # When cross-compiling we configure llvm-config-native with an approximation - # of the flags used for the normal LLVM build. To avoid the need for building - # a native libLLVM.so (which would fail) we force llvm-config to be linked - # statically against the necessary LLVM components always. - ../../llvm-config-link-static.patch - ./gnu-install-dirs.patch ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; diff --git a/nixpkgs/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs-polly.patch b/nixpkgs/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs-polly.patch index 68f3c45396f6..98e998e65a96 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs-polly.patch +++ b/nixpkgs/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs-polly.patch @@ -1,20 +1,17 @@ diff --git a/tools/polly/CMakeLists.txt b/tools/polly/CMakeLists.txt -index ca7c04c565bb..6ed5db5dd4f8 100644 +index ca7c04c565bb..6a6155806ffa 100644 --- a/tools/polly/CMakeLists.txt +++ b/tools/polly/CMakeLists.txt -@@ -2,7 +2,11 @@ - if (NOT DEFINED LLVM_MAIN_SRC_DIR) +@@ -3,6 +3,8 @@ if (NOT DEFINED LLVM_MAIN_SRC_DIR) project(Polly) cmake_minimum_required(VERSION 3.13.4) -+endif() -+ -+include(GNUInstallDirs) -+if (NOT DEFINED LLVM_MAIN_SRC_DIR) ++ include(GNUInstallDirs) ++ # Where is LLVM installed? find_package(LLVM CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${LLVM_CMAKE_DIR}) -@@ -122,13 +126,13 @@ include_directories( +@@ -122,13 +124,13 @@ include_directories( if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) install(DIRECTORY include/ @@ -91,10 +88,10 @@ index 518a09b45a42..bd9d6f5542ad 100644 set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name}) endmacro(add_polly_library) diff --git a/tools/polly/lib/External/CMakeLists.txt b/tools/polly/lib/External/CMakeLists.txt -index 8991094d92c7..178d8ad606bb 100644 +index e3a5683fccdc..293b482eb28a 100644 --- a/tools/polly/lib/External/CMakeLists.txt +++ b/tools/polly/lib/External/CMakeLists.txt -@@ -275,7 +275,7 @@ if (POLLY_BUNDLED_ISL) +@@ -290,7 +290,7 @@ if (POLLY_BUNDLED_ISL) install(DIRECTORY ${ISL_SOURCE_DIR}/include/ ${ISL_BINARY_DIR}/include/ 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 18fa5fc6d89c..55862ab39304 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,23 +1,10 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 135036f509d2..265c36f8211b 100644 +index fec956091cd5..5a766f5c5d7c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -270,15 +270,21 @@ if (CMAKE_BUILD_TYPE AND - message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") - endif() - -+include(GNUInstallDirs) -+ - set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" ) - --set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')") -+set(LLVM_TOOLS_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}" CACHE STRING -+ "Path for binary subdirectory (defaults to 'bin')") - mark_as_advanced(LLVM_TOOLS_INSTALL_DIR) - - set(LLVM_UTILS_INSTALL_DIR "${LLVM_TOOLS_INSTALL_DIR}" CACHE STRING - "Path to install LLVM utilities (enabled by LLVM_INSTALL_UTILS=ON) (defaults to LLVM_TOOLS_INSTALL_DIR)") - mark_as_advanced(LLVM_UTILS_INSTALL_DIR) +@@ -303,6 +303,9 @@ set(LLVM_EXAMPLES_INSTALL_DIR "examples" CACHE STRING + "Path for examples subdirectory (enabled by LLVM_BUILD_EXAMPLES=ON) (defaults to 'examples')") + mark_as_advanced(LLVM_EXAMPLES_INSTALL_DIR) +set(LLVM_INSTALL_CMAKE_DIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/cmake/llvm" CACHE STRING + "Path for CMake subdirectory (defaults to lib/cmake/llvm)" ) @@ -25,70 +12,22 @@ index 135036f509d2..265c36f8211b 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}) -@@ -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) - --set(LLVM_INSTALL_DOXYGEN_HTML_DIR "share/doc/llvm/doxygen-html" -+set(LLVM_INSTALL_DOXYGEN_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/doxygen-html" - CACHE STRING "Doxygen-generated HTML documentation install directory") --set(LLVM_INSTALL_OCAMLDOC_HTML_DIR "share/doc/llvm/ocaml-html" -+set(LLVM_INSTALL_OCAMLDOC_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/ocaml-html" - CACHE STRING "OCamldoc-generated HTML documentation install directory") - - option (LLVM_BUILD_EXTERNAL_COMPILER_RT -@@ -1048,7 +1054,7 @@ endif() - - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - install(DIRECTORY include/llvm include/llvm-c -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - COMPONENT llvm-headers - FILES_MATCHING - PATTERN "*.def" -@@ -1059,7 +1065,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - ) - - install(DIRECTORY ${LLVM_INCLUDE_DIR}/llvm ${LLVM_INCLUDE_DIR}/llvm-c -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - COMPONENT llvm-headers - FILES_MATCHING - PATTERN "*.def" -@@ -1073,13 +1079,13 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - - if (LLVM_INSTALL_MODULEMAPS) - install(DIRECTORY include/llvm include/llvm-c -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - COMPONENT llvm-headers - FILES_MATCHING - PATTERN "module.modulemap" - ) - install(FILES include/llvm/module.install.modulemap -- DESTINATION include/llvm -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/llvm - COMPONENT llvm-headers - RENAME "module.extern.modulemap" - ) diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake -index 9c2b85374307..5531ceeb2eeb 100644 +index fed1fec7d72e..4baed19b9e98 100644 --- a/cmake/modules/AddLLVM.cmake +++ b/cmake/modules/AddLLVM.cmake -@@ -818,9 +818,9 @@ macro(add_llvm_library name) +@@ -838,8 +838,8 @@ 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} - ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} -- RUNTIME DESTINATION bin COMPONENT ${name}) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT ${name}) ++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" COMPONENT ${name} ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" COMPONENT ${name} + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT ${name}) if (NOT LLVM_ENABLE_IDE) - add_llvm_install_targets(install-${name} -@@ -1036,7 +1036,7 @@ function(process_llvm_pass_plugins) +@@ -1056,7 +1056,7 @@ function(process_llvm_pass_plugins) "set(LLVM_STATIC_EXTENSIONS ${LLVM_STATIC_EXTENSIONS})") install(FILES ${llvm_cmake_builddir}/LLVMConfigExtensions.cmake @@ -97,16 +36,7 @@ index 9c2b85374307..5531ceeb2eeb 100644 COMPONENT cmake-exports) set(ExtensionDef "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def") -@@ -1250,7 +1250,7 @@ macro(add_llvm_example name) - endif() - add_llvm_executable(${name} ${ARGN}) - if( LLVM_BUILD_EXAMPLES ) -- install(TARGETS ${name} RUNTIME DESTINATION examples) -+ install(TARGETS ${name} RUNTIME DESTINATION ${CMAKE_INSTALL_DOCDIR}/examples) - endif() - set_target_properties(${name} PROPERTIES FOLDER "Examples") - endmacro(add_llvm_example name) -@@ -1868,7 +1868,7 @@ function(llvm_install_library_symlink name dest type) +@@ -1902,7 +1902,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,7 +45,7 @@ index 9c2b85374307..5531ceeb2eeb 100644 if(WIN32 AND "${type}" STREQUAL "SHARED") set(output_dir bin) endif() -@@ -1879,7 +1879,7 @@ function(llvm_install_library_symlink name dest type) +@@ -1913,7 +1913,7 @@ function(llvm_install_library_symlink name dest type) endfunction() @@ -124,7 +54,7 @@ index 9c2b85374307..5531ceeb2eeb 100644 cmake_parse_arguments(ARG "ALWAYS_GENERATE" "COMPONENT" "" ${ARGN}) foreach(path ${CMAKE_MODULE_PATH}) if(EXISTS ${path}/LLVMInstallSymlink.cmake) -@@ -1902,7 +1902,7 @@ function(llvm_install_symlink name dest) +@@ -1936,7 +1936,7 @@ function(llvm_install_symlink name dest) set(full_dest ${dest}${CMAKE_EXECUTABLE_SUFFIX}) install(SCRIPT ${INSTALL_SYMLINK} @@ -133,7 +63,7 @@ index 9c2b85374307..5531ceeb2eeb 100644 COMPONENT ${component}) if (NOT LLVM_ENABLE_IDE AND NOT ARG_ALWAYS_GENERATE) -@@ -1985,7 +1985,8 @@ function(add_llvm_tool_symlink link_name target) +@@ -2019,7 +2019,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,7 +73,7 @@ index 9c2b85374307..5531ceeb2eeb 100644 endif() endif() endfunction() -@@ -2114,9 +2115,9 @@ function(llvm_setup_rpath name) +@@ -2148,9 +2149,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. @@ -156,10 +86,10 @@ index 9c2b85374307..5531ceeb2eeb 100644 set_property(TARGET ${name} APPEND_STRING PROPERTY LINK_FLAGS " -Wl,-z,origin ") diff --git a/cmake/modules/AddOCaml.cmake b/cmake/modules/AddOCaml.cmake -index 554046b20edf..4d1ad980641e 100644 +index 891c9e6d618c..8d963f3b0069 100644 --- a/cmake/modules/AddOCaml.cmake +++ b/cmake/modules/AddOCaml.cmake -@@ -144,9 +144,9 @@ function(add_ocaml_library name) +@@ -147,9 +147,9 @@ function(add_ocaml_library name) endforeach() if( APPLE ) @@ -171,86 +101,55 @@ index 554046b20edf..4d1ad980641e 100644 endif() list(APPEND ocaml_flags "-ldopt" "-Wl,-rpath,${ocaml_rpath}") -diff --git a/cmake/modules/AddSphinxTarget.cmake b/cmake/modules/AddSphinxTarget.cmake -index e80c3b5c1cac..482f6d715ef5 100644 ---- a/cmake/modules/AddSphinxTarget.cmake -+++ b/cmake/modules/AddSphinxTarget.cmake -@@ -90,7 +90,7 @@ function (add_sphinx_target builder project) - endif() - elseif (builder STREQUAL html) - string(TOUPPER "${project}" project_upper) -- set(${project_upper}_INSTALL_SPHINX_HTML_DIR "share/doc/${project}/html" -+ set(${project_upper}_INSTALL_SPHINX_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/html" - CACHE STRING "HTML documentation install directory for ${project}") - - # '/.' indicates: copy the contents of the directory directly into diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt -index 51b6a4fdc284..4adc2acfc074 100644 +index cea0c1df0a14..eedcd9450312 100644 --- a/cmake/modules/CMakeLists.txt +++ b/cmake/modules/CMakeLists.txt -@@ -1,6 +1,6 @@ +@@ -2,7 +2,7 @@ include(ExtendPath) include(LLVMDistributionSupport) + include(FindPrefixFromConfig) -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. -@@ -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) --set(LLVM_CONFIG_INCLUDE_DIRS "\${LLVM_INSTALL_PREFIX}/include") -+set(LLVM_CONFIG_INCLUDE_DIRS "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}") - set(LLVM_CONFIG_INCLUDE_DIR "${LLVM_CONFIG_INCLUDE_DIRS}") - set(LLVM_CONFIG_MAIN_INCLUDE_DIR "${LLVM_CONFIG_INCLUDE_DIRS}") --set(LLVM_CONFIG_LIBRARY_DIRS "\${LLVM_INSTALL_PREFIX}/lib\${LLVM_LIBDIR_SUFFIX}") -+set(LLVM_CONFIG_LIBRARY_DIRS "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}\${LLVM_LIBDIR_SUFFIX}") - set(LLVM_CONFIG_CMAKE_DIR "\${LLVM_INSTALL_PREFIX}/${LLVM_INSTALL_PACKAGE_DIR}") - set(LLVM_CONFIG_BINARY_DIR "\${LLVM_INSTALL_PREFIX}") --set(LLVM_CONFIG_TOOLS_BINARY_DIR "\${LLVM_INSTALL_PREFIX}/bin") -+set(LLVM_CONFIG_TOOLS_BINARY_DIR "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}") - - # Generate a default location for lit - if (LLVM_INSTALL_UTILS AND LLVM_BUILD_UTILS) +@@ -122,7 +122,7 @@ set(LLVM_CONFIG_INCLUDE_DIRS + ) + list(REMOVE_DUPLICATES LLVM_CONFIG_INCLUDE_DIRS) + +-extend_path(LLVM_CONFIG_LIBRARY_DIR "\${LLVM_INSTALL_PREFIX}" "lib\${LLVM_LIBDIR_SUFFIX}") ++extend_path(LLVM_CONFIG_LIBRARY_DIR "\${LLVM_INSTALL_PREFIX}" "${CMAKE_INSTALL_LIBDIR}\${LLVM_LIBDIR_SUFFIX}") + set(LLVM_CONFIG_LIBRARY_DIRS + "${LLVM_CONFIG_LIBRARY_DIR}" + # FIXME: Should there be other entries here? diff --git a/cmake/modules/LLVMInstallSymlink.cmake b/cmake/modules/LLVMInstallSymlink.cmake -index 3e6a2c9a2648..52e14d955c60 100644 +index b5c35f706cb7..9261ab797de6 100644 --- a/cmake/modules/LLVMInstallSymlink.cmake +++ b/cmake/modules/LLVMInstallSymlink.cmake -@@ -4,7 +4,7 @@ +@@ -6,7 +6,7 @@ include(GNUInstallDirs) function(install_symlink name target outdir) set(DESTDIR $ENV{DESTDIR}) -- set(bindir "${DESTDIR}${CMAKE_INSTALL_PREFIX}/${outdir}/") +- 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 f1ac2c7d4934..c6e1469b5e13 100644 +index 044ec8a4d39d..504d0eac3ade 100644 --- a/docs/CMake.rst +++ b/docs/CMake.rst -@@ -202,7 +202,7 @@ CMake manual, or execute ``cmake --help-variable VARIABLE_NAME``. +@@ -224,7 +224,7 @@ description is in `LLVM-related variables`_ below. **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``. - 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 -- either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to -- `share/doc/llvm/doxygen-html`. -+ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to -+ `${CMAKE_INSTALL_DOCDIR}/${project}/doxygen-html`. - - **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``). + **LLVM_PARALLEL_{COMPILE,LINK}_JOBS**:STRING + Building the llvm toolchain can use a lot of resources, particularly +@@ -910,9 +910,11 @@ the ``cmake`` command or by setting it directly in ``ccmake`` or ``cmake-gui``). This file is available in two different locations. @@ -265,18 +164,6 @@ index f1ac2c7d4934..c6e1469b5e13 100644 * ``<LLVM_BUILD_ROOT>/lib/cmake/llvm/LLVMConfig.cmake`` where ``<LLVM_BUILD_ROOT>`` is the root of the LLVM build tree. **Note: this is only -diff --git a/examples/Bye/CMakeLists.txt b/examples/Bye/CMakeLists.txt -index bb96edb4b4bf..678c22fb43c8 100644 ---- a/examples/Bye/CMakeLists.txt -+++ b/examples/Bye/CMakeLists.txt -@@ -14,6 +14,6 @@ if (NOT WIN32) - BUILDTREE_ONLY - ) - -- install(TARGETS ${name} RUNTIME DESTINATION examples) -+ install(TARGETS ${name} RUNTIME DESTINATION ${CMAKE_INSTALL_DOCDIR}/examples) - set_target_properties(${name} PROPERTIES FOLDER "Examples") - endif() diff --git a/include/llvm/CMakeLists.txt b/include/llvm/CMakeLists.txt index b46319f24fc8..2feabd1954e4 100644 --- a/include/llvm/CMakeLists.txt @@ -289,93 +176,45 @@ index b46319f24fc8..2feabd1954e4 100644 + configure_file(module.modulemap.build ${LLVM_INCLUDE_DIR}/module.modulemap COPYONLY) endif (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in -index ebe5b73a5c65..70c497be12f5 100644 +index abbb8a450da6..70c497be12f5 100644 --- a/tools/llvm-config/BuildVariables.inc.in +++ b/tools/llvm-config/BuildVariables.inc.in -@@ -23,6 +23,10 @@ +@@ -23,7 +23,10 @@ #define LLVM_CXXFLAGS "@LLVM_CXXFLAGS@" #define LLVM_BUILDMODE "@LLVM_BUILDMODE@" #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@" +#define LLVM_INSTALL_BINDIR "@CMAKE_INSTALL_BINDIR@" +#define LLVM_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@" -+#define LLVM_INSTALL_INCLUDEDIR "@CMAKE_INSTALL_INCLUDEDIR@" + #define LLVM_INSTALL_INCLUDEDIR "@CMAKE_INSTALL_INCLUDEDIR@" +#define LLVM_INSTALL_CMAKEDIR "@LLVM_INSTALL_CMAKE_DIR@" #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@" #define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@" #define LLVM_BUILD_SYSTEM "@LLVM_BUILD_SYSTEM@" diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp -index 1a2f04552d13..44fa7d3eec6b 100644 +index 8ed88f33ead4..5e7184bab90d 100644 --- a/tools/llvm-config/llvm-config.cpp +++ b/tools/llvm-config/llvm-config.cpp -@@ -357,12 +357,26 @@ int main(int argc, char **argv) { - ("-I" + ActiveIncludeDir + " " + "-I" + ActiveObjRoot + "/include"); - } else { - ActivePrefix = CurrentExecPrefix; -- ActiveIncludeDir = ActivePrefix + "/include"; -- SmallString<256> path(StringRef(LLVM_TOOLS_INSTALL_DIR)); -- sys::fs::make_absolute(ActivePrefix, path); -- ActiveBinDir = std::string(path.str()); +@@ -363,12 +363,20 @@ int main(int argc, char **argv) { + ActiveIncludeDir = std::string(Path.str()); + } + { +- SmallString<256> Path(LLVM_TOOLS_INSTALL_DIR); ++ SmallString<256> Path(LLVM_INSTALL_BINDIR); + sys::fs::make_absolute(ActivePrefix, Path); + ActiveBinDir = std::string(Path.str()); + } - ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX; - ActiveCMakeDir = ActiveLibDir + "/cmake/llvm"; + { -+ SmallString<256> path(StringRef(LLVM_INSTALL_INCLUDEDIR)); -+ sys::fs::make_absolute(ActivePrefix, path); -+ ActiveIncludeDir = std::string(path.str()); -+ } -+ { -+ SmallString<256> path(StringRef(LLVM_INSTALL_BINDIR)); -+ sys::fs::make_absolute(ActivePrefix, path); -+ ActiveBinDir = std::string(path.str()); -+ } -+ { -+ SmallString<256> path(StringRef(LLVM_INSTALL_LIBDIR LLVM_LIBDIR_SUFFIX)); -+ sys::fs::make_absolute(ActivePrefix, path); -+ ActiveLibDir = std::string(path.str()); ++ SmallString<256> Path(LLVM_INSTALL_LIBDIR LLVM_LIBDIR_SUFFIX); ++ sys::fs::make_absolute(ActivePrefix, Path); ++ ActiveLibDir = std::string(Path.str()); + } + { -+ SmallString<256> path(StringRef(LLVM_INSTALL_CMAKEDIR)); -+ sys::fs::make_absolute(ActivePrefix, path); -+ ActiveCMakeDir = std::string(path.str()); ++ SmallString<256> Path(LLVM_INSTALL_CMAKEDIR); ++ sys::fs::make_absolute(ActivePrefix, Path); ++ ActiveCMakeDir = std::string(Path.str()); + } ActiveIncludeOption = "-I" + ActiveIncludeDir; } -diff --git a/tools/lto/CMakeLists.txt b/tools/lto/CMakeLists.txt -index 0af29ad762c5..37b99b83e35c 100644 ---- a/tools/lto/CMakeLists.txt -+++ b/tools/lto/CMakeLists.txt -@@ -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 -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/llvm-c - COMPONENT LTO) - - if (APPLE) -diff --git a/tools/opt-viewer/CMakeLists.txt b/tools/opt-viewer/CMakeLists.txt -index ead73ec13a8f..250362021f17 100644 ---- a/tools/opt-viewer/CMakeLists.txt -+++ b/tools/opt-viewer/CMakeLists.txt -@@ -8,7 +8,7 @@ set (files - - foreach (file ${files}) - install(PROGRAMS ${file} -- DESTINATION share/opt-viewer -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/opt-viewer - COMPONENT opt-viewer) - endforeach (file) - -diff --git a/tools/remarks-shlib/CMakeLists.txt b/tools/remarks-shlib/CMakeLists.txt -index 865436247270..ce1daa62f6ab 100644 ---- a/tools/remarks-shlib/CMakeLists.txt -+++ b/tools/remarks-shlib/CMakeLists.txt -@@ -19,7 +19,7 @@ if(LLVM_ENABLE_PIC) - endif() - - install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/Remarks.h -- DESTINATION include/llvm-c -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/llvm-c - COMPONENT Remarks) - - if (APPLE) diff --git a/nixpkgs/pkgs/development/compilers/llvm/git/openmp/default.nix b/nixpkgs/pkgs/development/compilers/llvm/git/openmp/default.nix index c5a33df97560..7add0c7ed465 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/git/openmp/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/git/openmp/default.nix @@ -1,10 +1,13 @@ { lib , stdenv , llvm_meta -, src +, monorepoSrc +, runCommand , cmake , llvm +, clang-unwrapped , perl +, pkg-config , version }: @@ -12,10 +15,22 @@ stdenv.mkDerivation rec { pname = "openmp"; inherit version; - inherit src; - sourceRoot = "source/${pname}"; + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + ''; - nativeBuildInputs = [ cmake perl ]; + sourceRoot = "${src.name}/${pname}"; + + patches = [ + ./gnu-install-dirs.patch + ./fix-find-tool.patch + ]; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ cmake perl pkg-config clang-unwrapped ]; buildInputs = [ llvm ]; cmakeFlags = [ diff --git a/nixpkgs/pkgs/development/compilers/llvm/git/openmp/fix-find-tool.patch b/nixpkgs/pkgs/development/compilers/llvm/git/openmp/fix-find-tool.patch new file mode 100644 index 000000000000..b5d0e7b41775 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/git/openmp/fix-find-tool.patch @@ -0,0 +1,54 @@ +diff --git a/libomptarget/DeviceRTL/CMakeLists.txt b/libomptarget/DeviceRTL/CMakeLists.txt +index 242df638f80d..a4654e96371f 100644 +--- a/libomptarget/DeviceRTL/CMakeLists.txt ++++ b/libomptarget/DeviceRTL/CMakeLists.txt +@@ -25,16 +25,16 @@ endif() + + if (LLVM_DIR) + # Builds that use pre-installed LLVM have LLVM_DIR set. +- find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) ++ find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR} REQUIRED) + find_program(LINK_TOOL llvm-link PATHS ${LLVM_TOOLS_BINARY_DIR} +- NO_DEFAULT_PATH) +- find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) ++ REQUIRED) ++ find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR} REQUIRED) + libomptarget_say("Building DeviceRTL. Using clang: ${CLANG_TOOL}") + elseif (LLVM_TOOL_CLANG_BUILD AND NOT CMAKE_CROSSCOMPILING AND NOT OPENMP_STANDALONE_BUILD) + # LLVM in-tree builds may use CMake target names to discover the tools. +- set(CLANG_TOOL $<TARGET_FILE:clang>) +- set(LINK_TOOL $<TARGET_FILE:llvm-link>) +- set(OPT_TOOL $<TARGET_FILE:opt>) ++ set(CLANG_TOOL $<TARGET_FILE:clang> REQUIRED) ++ set(LINK_TOOL $<TARGET_FILE:llvm-link> REQUIRED) ++ set(OPT_TOOL $<TARGET_FILE:opt> REQUIRED) + libomptarget_say("Building DeviceRTL. Using clang from in-tree build") + else() + libomptarget_say("Not building DeviceRTL. No appropriate clang found") +diff --git a/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt b/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt +index 3f4c02671aeb..be9f4677d7b5 100644 +--- a/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt ++++ b/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt +@@ -38,16 +38,16 @@ endif() + + if (LLVM_DIR) + # Builds that use pre-installed LLVM have LLVM_DIR set. +- find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) ++ find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR} REQUIRED) + find_program(LINK_TOOL llvm-link PATHS ${LLVM_TOOLS_BINARY_DIR} +- NO_DEFAULT_PATH) +- find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) ++ REQUIRED) ++ find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR} REQUIRED) + libomptarget_say("Building AMDGCN device RTL. Using clang: ${CLANG_TOOL}") + elseif (LLVM_TOOL_CLANG_BUILD AND NOT CMAKE_CROSSCOMPILING AND NOT OPENMP_STANDALONE_BUILD) + # LLVM in-tree builds may use CMake target names to discover the tools. +- set(CLANG_TOOL $<TARGET_FILE:clang>) +- set(LINK_TOOL $<TARGET_FILE:llvm-link>) +- set(OPT_TOOL $<TARGET_FILE:opt>) ++ set(CLANG_TOOL $<TARGET_FILE:clang> REQUIRED) ++ set(LINK_TOOL $<TARGET_FILE:llvm-link> REQUIRED) ++ set(OPT_TOOL $<TARGET_FILE:opt> REQUIRED) + libomptarget_say("Building AMDGCN device RTL. Using clang from in-tree build") + else() + libomptarget_say("Not building AMDGCN device RTL. No appropriate clang found") diff --git a/nixpkgs/pkgs/development/compilers/llvm/git/openmp/gnu-install-dirs.patch b/nixpkgs/pkgs/development/compilers/llvm/git/openmp/gnu-install-dirs.patch new file mode 100644 index 000000000000..352a46923115 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/git/openmp/gnu-install-dirs.patch @@ -0,0 +1,89 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7f11a05f5622..fb90f8f6a49b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,6 +8,8 @@ if (OPENMP_STANDALONE_BUILD OR "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_S + set(OPENMP_STANDALONE_BUILD TRUE) + project(openmp C CXX) + ++ include(GNUInstallDirs) ++ + # CMAKE_BUILD_TYPE was not set, default to Release. + if (NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE Release) +@@ -19,7 +21,7 @@ if (OPENMP_STANDALONE_BUILD OR "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_S + set(OPENMP_LIBDIR_SUFFIX "" CACHE STRING + "Suffix of lib installation directory, e.g. 64 => lib64") + # Do not use OPENMP_LIBDIR_SUFFIX directly, use OPENMP_INSTALL_LIBDIR. +- set(OPENMP_INSTALL_LIBDIR "lib${OPENMP_LIBDIR_SUFFIX}") ++ set(OPENMP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}${OPENMP_LIBDIR_SUFFIX}") + + # Group test settings. + set(OPENMP_TEST_C_COMPILER ${CMAKE_C_COMPILER} CACHE STRING +@@ -30,7 +32,7 @@ if (OPENMP_STANDALONE_BUILD OR "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_S + else() + set(OPENMP_ENABLE_WERROR ${LLVM_ENABLE_WERROR}) + # If building in tree, we honor the same install suffix LLVM uses. +- set(OPENMP_INSTALL_LIBDIR "lib${LLVM_LIBDIR_SUFFIX}") ++ set(OPENMP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + + if (NOT MSVC) + set(OPENMP_TEST_C_COMPILER ${LLVM_RUNTIME_OUTPUT_INTDIR}/clang) +index 0e1ce2afd154..8b3810f83713 100644 +--- a/libomptarget/plugins/amdgpu/CMakeLists.txt ++++ b/libomptarget/plugins/amdgpu/CMakeLists.txt +@@ -80,7 +80,7 @@ add_library(omptarget.rtl.amdgpu SHARED + + # Install plugin under the lib destination folder. + # When we build for debug, OPENMP_LIBDIR_SUFFIX get set to -debug +-install(TARGETS omptarget.rtl.amdgpu LIBRARY DESTINATION "lib${OPENMP_LIBDIR_SUFFIX}") ++install(TARGETS omptarget.rtl.amdgpu LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${OPENMP_LIBDIR_SUFFIX}") + set_property(TARGET omptarget.rtl.amdgpu PROPERTY INSTALL_RPATH_USE_LINK_PATH ON) + + if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") +diff --git a/libomptarget/plugins/ve/CMakeLists.txt b/libomptarget/plugins/ve/CMakeLists.txt +index 16ce0891ca23..db30ee9c769f 100644 +--- a/libomptarget/plugins/ve/CMakeLists.txt ++++ b/libomptarget/plugins/ve/CMakeLists.txt +@@ -32,7 +32,7 @@ if(${LIBOMPTARGET_DEP_VEO_FOUND}) + + # Install plugin under the lib destination folder. + install(TARGETS "omptarget.rtl.${tmachine_libname}" +- LIBRARY DESTINATION lib${OPENMP_LIBDIR_SUFFIX}) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${OPENMP_LIBDIR_SUFFIX}) + + target_link_libraries( + "omptarget.rtl.${tmachine_libname}" +diff --git a/runtime/src/CMakeLists.txt b/runtime/src/CMakeLists.txt +index e4f4e6e1e73f..1164b3b22b0e 100644 +--- a/runtime/src/CMakeLists.txt ++++ b/runtime/src/CMakeLists.txt +@@ -346,13 +346,13 @@ add_dependencies(libomp-micro-tests libomp-test-deps) + # We want to install libomp in DESTDIR/CMAKE_INSTALL_PREFIX/lib + # We want to install headers in DESTDIR/CMAKE_INSTALL_PREFIX/include + if(${OPENMP_STANDALONE_BUILD}) +- set(LIBOMP_HEADERS_INSTALL_PATH include) ++ set(LIBOMP_HEADERS_INSTALL_PATH "${CMAKE_INSTALL_INCLUDEDIR}") + else() + string(REGEX MATCH "[0-9]+\\.[0-9]+(\\.[0-9]+)?" CLANG_VERSION ${PACKAGE_VERSION}) + set(LIBOMP_HEADERS_INSTALL_PATH "${OPENMP_INSTALL_LIBDIR}/clang/${CLANG_VERSION}/include") + endif() + if(WIN32) +- install(TARGETS omp RUNTIME DESTINATION bin) ++ install(TARGETS omp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + install(TARGETS ${LIBOMP_IMP_LIB_TARGET} ARCHIVE DESTINATION "${OPENMP_INSTALL_LIBDIR}") + # Create aliases (regular copies) of the library for backwards compatibility + set(LIBOMP_ALIASES "libiomp5md") +diff --git a/tools/multiplex/CMakeLists.txt b/tools/multiplex/CMakeLists.txt +index 64317c112176..4002784da736 100644 +--- a/tools/multiplex/CMakeLists.txt ++++ b/tools/multiplex/CMakeLists.txt +@@ -4,7 +4,7 @@ if(LIBOMP_OMPT_SUPPORT) + add_library(ompt-multiplex INTERFACE) + target_include_directories(ompt-multiplex INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) + +- install(FILES ompt-multiplex.h DESTINATION include) ++ install(FILES ompt-multiplex.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + + add_subdirectory(tests) + endif() diff --git a/nixpkgs/pkgs/development/compilers/llvm/update.sh b/nixpkgs/pkgs/development/compilers/llvm/update.sh index 603c603f275b..95ad356dbd9a 100755 --- a/nixpkgs/pkgs/development/compilers/llvm/update.sh +++ b/nixpkgs/pkgs/development/compilers/llvm/update.sh @@ -20,7 +20,11 @@ sed -Ei \ readonly ATTRSET="llvmPackages_$VERSION_MAJOR" -if [ "$VERSION_MAJOR" -ge "13" ]; then +if [ "$VERSION_MAJOR" -ge "14" ]; then + readonly SOURCES=( + "llvm.monorepoSrc" + ) +elif [ "$VERSION_MAJOR" -eq "13" ]; then readonly SOURCES=( "llvm.src" ) @@ -43,7 +47,7 @@ fi for SOURCE in "${SOURCES[@]}"; do echo "Updating the hash of $SOURCE:" declare ATTR="$ATTRSET.$SOURCE" - declare OLD_HASH="$(nix eval -f . $ATTR.outputHash)" + declare OLD_HASH="$(nix --extra-experimental-features nix-command eval -f . $ATTR.outputHash)" declare NEW_HASH="\"$(nix-prefetch-url -A $ATTR)\"" find "$DIR" -type f -exec sed -i "s/$OLD_HASH/$NEW_HASH/" {} + done diff --git a/nixpkgs/pkgs/development/compilers/mit-scheme/default.nix b/nixpkgs/pkgs/development/compilers/mit-scheme/default.nix index c67f8d2f72ff..75b3d1128e45 100644 --- a/nixpkgs/pkgs/development/compilers/mit-scheme/default.nix +++ b/nixpkgs/pkgs/development/compilers/mit-scheme/default.nix @@ -12,7 +12,8 @@ let "-x86-64"; in stdenv.mkDerivation { - name = if enableX11 then "mit-scheme-x11-${version}" else "mit-scheme-${version}"; + pname = "mit-scheme" + lib.optionalString enableX11 "-x11"; + inherit version; # MIT/GNU Scheme is not bootstrappable, so it's recommended to compile from # the platform-specific tarballs, which contain pre-built binaries. It diff --git a/nixpkgs/pkgs/development/compilers/nim/default.nix b/nixpkgs/pkgs/development/compilers/nim/default.nix index 06b19b547b67..4f3b200477f0 100644 --- a/nixpkgs/pkgs/development/compilers/nim/default.nix +++ b/nixpkgs/pkgs/development/compilers/nim/default.nix @@ -98,12 +98,12 @@ in { nim-unwrapped = stdenv.mkDerivation rec { pname = "nim-unwrapped"; - version = "1.6.2"; + version = "1.6.4"; strictDeps = true; src = fetchurl { url = "https://nim-lang.org/download/nim-${version}.tar.xz"; - hash = "sha256-msRxT6bDFdaR2n9diUHBsZDU1Dc5fZdC4yfC1RiT43M="; + hash = "sha256-f8MJKFW1wiAM2f7tEz0EYFgj8lDXO01KxQEwA3DgoMI="; }; buildInputs = [ boehmgc openssl pcre readline sqlite ]; diff --git a/nixpkgs/pkgs/development/compilers/ocaml/4.12.nix b/nixpkgs/pkgs/development/compilers/ocaml/4.12.nix index 0662e66e0b6a..4be2bcf5f9d0 100644 --- a/nixpkgs/pkgs/development/compilers/ocaml/4.12.nix +++ b/nixpkgs/pkgs/development/compilers/ocaml/4.12.nix @@ -1,6 +1,6 @@ import ./generic.nix { major_version = "4"; minor_version = "12"; - patch_version = "0"; - sha256 = "1hxy349jfa2vkfgmxf6pvd9w4z5bmcgsg0fxfdabcghyvjw9vvir"; + patch_version = "1"; + sha256 = "1jbjjnmqq6ymsy81x188i256bz4z5jrz1pws8g1qf59c32ganjkf"; } diff --git a/nixpkgs/pkgs/development/compilers/ocaml/4.14.nix b/nixpkgs/pkgs/development/compilers/ocaml/4.14.nix new file mode 100644 index 000000000000..96e1c13d285b --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/ocaml/4.14.nix @@ -0,0 +1,9 @@ +import ./generic.nix { + major_version = "4"; + minor_version = "14"; + patch_version = "0-beta1"; + src = fetchTarball { + url = "https://caml.inria.fr/pub/distrib/ocaml-4.14/ocaml-4.14.0~beta1.tar.xz"; + sha256 = "0jiz20hb58jbbk8j38agx11ra4hg0v3prmzc5a9j70lm09mnzfcd"; + }; +} diff --git a/nixpkgs/pkgs/development/compilers/open-watcom/v2.nix b/nixpkgs/pkgs/development/compilers/open-watcom/v2.nix index de2dae156ee6..b521aaef106b 100644 --- a/nixpkgs/pkgs/development/compilers/open-watcom/v2.nix +++ b/nixpkgs/pkgs/development/compilers/open-watcom/v2.nix @@ -2,24 +2,24 @@ , lib , fetchFromGitHub , unstableGitUpdater +, dosbox # Docs cause an immense increase in build time, up to 2 additional hours , withDocs ? false -, dosbox , ghostscript , withGUI ? false }: stdenv.mkDerivation rec { pname = "open-watcom-v2"; - version = "unstable-2022-01-18"; + version = "unstable-2022-02-22"; name = "${pname}-unwrapped-${version}"; src = fetchFromGitHub { owner = "open-watcom"; repo = "open-watcom-v2"; - rev = "f09e0c969c45679c048180f2dc6b3dbbe69e42a0"; - sha256 = "dEjG4L/VVufSAerKcXPUqZ7esz4m8/210ZshVz4SNAA="; + rev = "9e25b3d6b8066f09b4f7131a31de1cf2af691e9a"; + sha256 = "1w336070kmhc6cmn2aqr8vm0fmw3yza2n0w4asvs2kqxjgmbn6i2"; }; postPatch = '' @@ -41,8 +41,7 @@ stdenv.mkDerivation rec { --replace '-static' "" ''; - nativeBuildInputs = [ ] - ++ lib.optional (withDocs || withGUI) dosbox + nativeBuildInputs = [ dosbox ] ++ lib.optional withDocs ghostscript; configurePhase = '' @@ -55,7 +54,7 @@ stdenv.mkDerivation rec { export OWGUINOBUILD=${if withGUI then "0" else "1"} export OWNOBUILD= export OWDISTRBUILD=0 - export OWDOSBOX=${lib.optionalString (withDocs || withGUI) "${dosbox}/bin/dosbox"} + export OWDOSBOX=${dosbox}/bin/dosbox export OWVERBOSE=0 export OWRELROOT=$out diff --git a/nixpkgs/pkgs/development/compilers/openjdk/jre.nix b/nixpkgs/pkgs/development/compilers/openjdk/jre.nix index 78dec7885d93..02f6da928cdd 100644 --- a/nixpkgs/pkgs/development/compilers/openjdk/jre.nix +++ b/nixpkgs/pkgs/development/compilers/openjdk/jre.nix @@ -7,7 +7,7 @@ let jre = stdenv.mkDerivation { - name = "${jdk.name}-minimal-jre"; + pname = "${jdk.pname}-minimal-jre"; version = jdk.version; buildInputs = [ jdk ]; diff --git a/nixpkgs/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/nixpkgs/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 713b32a349b4..40681faae8ae 100644 --- a/nixpkgs/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/nixpkgs/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -66,7 +66,7 @@ let in let result = stdenv.mkDerivation rec { - pname = if installjdk then "oraclejdk" else "oraclejre"; + pname = if installjdk then "oraclejdk" else "oraclejre" + lib.optionalString pluginSupport "-with-plugin"; version = "${productVersion}u${patchVersion}"; src = diff --git a/nixpkgs/pkgs/development/compilers/osl/default.nix b/nixpkgs/pkgs/development/compilers/osl/default.nix index 736a9d3c34c6..53b05c16d9ab 100644 --- a/nixpkgs/pkgs/development/compilers/osl/default.nix +++ b/nixpkgs/pkgs/development/compilers/osl/default.nix @@ -7,7 +7,7 @@ let boost_static = boost165.override { enableStatic = true; }; in clangStdenv.mkDerivation rec { # In theory this could use GCC + Clang rather than just Clang, # but https://github.com/NixOS/nixpkgs/issues/29877 stops this - name = "openshadinglanguage-${version}"; + pname = "openshadinglanguage"; version = "1.10.9"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix b/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix index daa8a542b76d..cbf36516465b 100644 --- a/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix +++ b/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix @@ -18,7 +18,7 @@ let in stdenv.mkDerivation rec { pname = "purescript"; - version = "0.14.5"; + version = "0.14.7"; # These hashes can be updated automatically by running the ./update.sh script. src = @@ -26,12 +26,12 @@ in stdenv.mkDerivation rec { then fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz"; - sha256 = "1brvbpzr3cwls809fl0sjrm9cbh8v7maf5d7ic2mha0xapabgfpv"; + sha256 = "0pc07xv5h7jgiy04rcrnsjb97nk5zs7jrvcsqggn0izlnrcyi8rc"; } else fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz"; - sha256 = "1mvxvn30iyrq0ck6g08f925gxnnhbfgl29b2gjjsmm3m9mpll7ws"; + sha256 = "0vcjxb1v76wg4hmisnw0pp6wl0pwp4fa19cw08zdhgy62w06mqfa"; }; diff --git a/nixpkgs/pkgs/development/compilers/reason/default.nix b/nixpkgs/pkgs/development/compilers/reason/default.nix index 0937ff8bd840..cc99aa078f9a 100644 --- a/nixpkgs/pkgs/development/compilers/reason/default.nix +++ b/nixpkgs/pkgs/development/compilers/reason/default.nix @@ -1,16 +1,14 @@ -{ lib, callPackage, stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, dune_2 +{ lib, callPackage, stdenv, makeWrapper, fetchurl, ocaml, findlib, dune_2 , fix, menhir, menhirLib, menhirSdk, merlin-extend, ppxlib, utop, cppo, ppx_derivers }: stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-reason"; - version = "3.7.0"; + version = "3.8.0"; - src = fetchFromGitHub { - owner = "facebook"; - repo = "reason"; - rev = "daa11255cb4716ce1c370925251021bd6e3bd974"; - sha256 = "0m6ldrci1a4j0qv1cbwh770zni3al8qxsphl353rv19f6rblplhs"; + src = fetchurl { + url = "https://github.com/reasonml/reason/releases/download/${version}/reason-${version}.tbz"; + sha256 = "sha256:0yc94m3ddk599crg33yxvkphxpy54kmdsl599c320wvn055p4y4l"; }; nativeBuildInputs = [ @@ -39,11 +37,13 @@ stdenv.mkDerivation rec { buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed installPhase = '' + runHook preInstall dune install --prefix=$out --libdir=$OCAMLFIND_DESTDIR wrapProgram $out/bin/rtop \ --prefix PATH : "${utop}/bin" \ --prefix CAML_LD_LIBRARY_PATH : "$CAML_LD_LIBRARY_PATH" \ --prefix OCAMLPATH : "$OCAMLPATH:$OCAMLFIND_DESTDIR" + runHook postInstall ''; passthru.tests = { diff --git a/nixpkgs/pkgs/development/compilers/roslyn/create-deps.sh b/nixpkgs/pkgs/development/compilers/roslyn/create-deps.sh index 5bdc37956b52..f5da4acd8bff 100755 --- a/nixpkgs/pkgs/development/compilers/roslyn/create-deps.sh +++ b/nixpkgs/pkgs/development/compilers/roslyn/create-deps.sh @@ -48,7 +48,7 @@ do sha256=$(nix-prefetch-url "$url" 2>/dev/null) cat << EOL { - name = "$package"; + pname = "$package"; version = "$version"; src = fetchurl { url = "$url"; diff --git a/nixpkgs/pkgs/development/compilers/roslyn/default.nix b/nixpkgs/pkgs/development/compilers/roslyn/default.nix index df07eea54e2d..69cca6b13d9b 100644 --- a/nixpkgs/pkgs/development/compilers/roslyn/default.nix +++ b/nixpkgs/pkgs/development/compilers/roslyn/default.nix @@ -13,8 +13,7 @@ let deps = map (package: stdenv.mkDerivation (with package; { - pname = name; - inherit version src; + inherit pname version src; buildInputs = [ unzip ]; unpackPhase = '' @@ -40,7 +39,7 @@ let installPhase = '' runHook preInstall - package=$out/lib/dotnet/${name}/${version} + package=$out/lib/dotnet/${pname}/${version} mkdir -p $package cp -r . $package echo "{}" > $package/.nupkg.metadata diff --git a/nixpkgs/pkgs/development/compilers/roslyn/deps.nix b/nixpkgs/pkgs/development/compilers/roslyn/deps.nix index b08bd0740a42..61835f74e766 100644 --- a/nixpkgs/pkgs/development/compilers/roslyn/deps.nix +++ b/nixpkgs/pkgs/development/compilers/roslyn/deps.nix @@ -1,6 +1,6 @@ { fetchurl }: [ { - name = "microsoft.aspnetcore.app.ref"; + pname = "microsoft.aspnetcore.app.ref"; version = "3.1.10"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.ref/3.1.10/microsoft.aspnetcore.app.ref.3.1.10.nupkg"; @@ -8,7 +8,7 @@ }; } { - name = "microsoft.build.framework"; + pname = "microsoft.build.framework"; version = "15.3.409"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.framework/15.3.409/microsoft.build.framework.15.3.409.nupkg"; @@ -16,7 +16,7 @@ }; } { - name = "microsoft.build.tasks.core"; + pname = "microsoft.build.tasks.core"; version = "15.3.409"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.tasks.core/15.3.409/microsoft.build.tasks.core.15.3.409.nupkg"; @@ -24,7 +24,7 @@ }; } { - name = "microsoft.build.tasks.git"; + pname = "microsoft.build.tasks.git"; version = "1.1.0-beta-20206-02"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.build.tasks.git/1.1.0-beta-20206-02/microsoft.build.tasks.git.1.1.0-beta-20206-02.nupkg"; @@ -32,7 +32,7 @@ }; } { - name = "microsoft.build.utilities.core"; + pname = "microsoft.build.utilities.core"; version = "15.3.409"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.utilities.core/15.3.409/microsoft.build.utilities.core.15.3.409.nupkg"; @@ -40,7 +40,7 @@ }; } { - name = "microsoft.codeanalysis.analyzers"; + pname = "microsoft.codeanalysis.analyzers"; version = "3.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.analyzers/3.0.0/microsoft.codeanalysis.analyzers.3.0.0.nupkg"; @@ -48,7 +48,7 @@ }; } { - name = "microsoft.codeanalysis.bannedapianalyzers"; + pname = "microsoft.codeanalysis.bannedapianalyzers"; version = "3.3.2-beta1.20562.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/825db618-e3eb-4426-ba54-b1d6e6c944d8/nuget/v3/flat2/microsoft.codeanalysis.bannedapianalyzers/3.3.2-beta1.20562.1/microsoft.codeanalysis.bannedapianalyzers.3.3.2-beta1.20562.1.nupkg"; @@ -56,7 +56,7 @@ }; } { - name = "microsoft.codeanalysis.common"; + pname = "microsoft.codeanalysis.common"; version = "3.8.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.common/3.8.0/microsoft.codeanalysis.common.3.8.0.nupkg"; @@ -64,7 +64,7 @@ }; } { - name = "microsoft.codeanalysis.csharp.codestyle"; + pname = "microsoft.codeanalysis.csharp.codestyle"; version = "3.8.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.csharp.codestyle/3.8.0/microsoft.codeanalysis.csharp.codestyle.3.8.0.nupkg"; @@ -72,7 +72,7 @@ }; } { - name = "microsoft.codeanalysis.netanalyzers"; + pname = "microsoft.codeanalysis.netanalyzers"; version = "6.0.0-preview1.21054.10"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/825db618-e3eb-4426-ba54-b1d6e6c944d8/nuget/v3/flat2/microsoft.codeanalysis.netanalyzers/6.0.0-preview1.21054.10/microsoft.codeanalysis.netanalyzers.6.0.0-preview1.21054.10.nupkg"; @@ -80,7 +80,7 @@ }; } { - name = "microsoft.codeanalysis.performancesensitiveanalyzers"; + pname = "microsoft.codeanalysis.performancesensitiveanalyzers"; version = "3.3.2-beta1.20562.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/825db618-e3eb-4426-ba54-b1d6e6c944d8/nuget/v3/flat2/microsoft.codeanalysis.performancesensitiveanalyzers/3.3.2-beta1.20562.1/microsoft.codeanalysis.performancesensitiveanalyzers.3.3.2-beta1.20562.1.nupkg"; @@ -88,7 +88,7 @@ }; } { - name = "microsoft.codeanalysis.publicapianalyzers"; + pname = "microsoft.codeanalysis.publicapianalyzers"; version = "3.3.2-beta1.20562.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/825db618-e3eb-4426-ba54-b1d6e6c944d8/nuget/v3/flat2/microsoft.codeanalysis.publicapianalyzers/3.3.2-beta1.20562.1/microsoft.codeanalysis.publicapianalyzers.3.3.2-beta1.20562.1.nupkg"; @@ -96,7 +96,7 @@ }; } { - name = "microsoft.codeanalysis.visualbasic.codestyle"; + pname = "microsoft.codeanalysis.visualbasic.codestyle"; version = "3.8.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.visualbasic.codestyle/3.8.0/microsoft.codeanalysis.visualbasic.codestyle.3.8.0.nupkg"; @@ -104,7 +104,7 @@ }; } { - name = "microsoft.csharp"; + pname = "microsoft.csharp"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.csharp/4.3.0/microsoft.csharp.4.3.0.nupkg"; @@ -112,7 +112,7 @@ }; } { - name = "microsoft.diasymreader.native"; + pname = "microsoft.diasymreader.native"; version = "16.9.0-beta1.21055.5"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.diasymreader.native/16.9.0-beta1.21055.5/microsoft.diasymreader.native.16.9.0-beta1.21055.5.nupkg"; @@ -120,7 +120,7 @@ }; } { - name = "microsoft.dotnet.arcade.sdk"; + pname = "microsoft.dotnet.arcade.sdk"; version = "1.0.0-beta.21072.7"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/1.0.0-beta.21072.7/microsoft.dotnet.arcade.sdk.1.0.0-beta.21072.7.nupkg"; @@ -128,7 +128,7 @@ }; } { - name = "microsoft.net.compilers.toolset"; + pname = "microsoft.net.compilers.toolset"; version = "3.10.0-1.21101.2"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.net.compilers.toolset/3.10.0-1.21101.2/microsoft.net.compilers.toolset.3.10.0-1.21101.2.nupkg"; @@ -136,7 +136,7 @@ }; } { - name = "microsoft.netcore.app.host.linux-x64"; + pname = "microsoft.netcore.app.host.linux-x64"; version = "3.1.21"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-x64/3.1.21/microsoft.netcore.app.host.linux-x64.3.1.21.nupkg"; @@ -144,7 +144,7 @@ }; } { - name = "microsoft.netcore.app.host.linux-arm64"; + pname = "microsoft.netcore.app.host.linux-arm64"; version = "3.1.21"; src = fetchurl { url = "https://globalcdn.nuget.org/packages/microsoft.netcore.app.host.linux-arm64.3.1.21.nupkg"; @@ -152,7 +152,7 @@ }; } { - name = "microsoft.netcore.app.ref"; + pname = "microsoft.netcore.app.ref"; version = "3.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.ref/3.1.0/microsoft.netcore.app.ref.3.1.0.nupkg"; @@ -160,7 +160,7 @@ }; } { - name = "microsoft.netcore.platforms"; + pname = "microsoft.netcore.platforms"; version = "1.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.platforms/1.0.1/microsoft.netcore.platforms.1.0.1.nupkg"; @@ -168,7 +168,7 @@ }; } { - name = "microsoft.netcore.platforms"; + pname = "microsoft.netcore.platforms"; version = "1.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.platforms/1.1.0/microsoft.netcore.platforms.1.1.0.nupkg"; @@ -176,7 +176,7 @@ }; } { - name = "microsoft.netcore.platforms"; + pname = "microsoft.netcore.platforms"; version = "2.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.platforms/2.1.0/microsoft.netcore.platforms.2.1.0.nupkg"; @@ -184,7 +184,7 @@ }; } { - name = "microsoft.netcore.platforms"; + pname = "microsoft.netcore.platforms"; version = "2.1.2"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.platforms/2.1.2/microsoft.netcore.platforms.2.1.2.nupkg"; @@ -192,7 +192,7 @@ }; } { - name = "microsoft.netcore.targets"; + pname = "microsoft.netcore.targets"; version = "1.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.targets/1.0.1/microsoft.netcore.targets.1.0.1.nupkg"; @@ -200,7 +200,7 @@ }; } { - name = "microsoft.netcore.targets"; + pname = "microsoft.netcore.targets"; version = "1.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.targets/1.1.0/microsoft.netcore.targets.1.1.0.nupkg"; @@ -208,7 +208,7 @@ }; } { - name = "microsoft.netframework.referenceassemblies"; + pname = "microsoft.netframework.referenceassemblies"; version = "1.0.0-preview.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netframework.referenceassemblies/1.0.0-preview.1/microsoft.netframework.referenceassemblies.1.0.0-preview.1.nupkg"; @@ -216,7 +216,7 @@ }; } { - name = "microsoft.netframework.referenceassemblies.net472"; + pname = "microsoft.netframework.referenceassemblies.net472"; version = "1.0.0-preview.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netframework.referenceassemblies.net472/1.0.0-preview.1/microsoft.netframework.referenceassemblies.net472.1.0.0-preview.1.nupkg"; @@ -224,7 +224,7 @@ }; } { - name = "microsoft.sourcelink.azurerepos.git"; + pname = "microsoft.sourcelink.azurerepos.git"; version = "1.1.0-beta-20206-02"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.sourcelink.azurerepos.git/1.1.0-beta-20206-02/microsoft.sourcelink.azurerepos.git.1.1.0-beta-20206-02.nupkg"; @@ -232,7 +232,7 @@ }; } { - name = "microsoft.sourcelink.common"; + pname = "microsoft.sourcelink.common"; version = "1.1.0-beta-20206-02"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.sourcelink.common/1.1.0-beta-20206-02/microsoft.sourcelink.common.1.1.0-beta-20206-02.nupkg"; @@ -240,7 +240,7 @@ }; } { - name = "microsoft.sourcelink.github"; + pname = "microsoft.sourcelink.github"; version = "1.1.0-beta-20206-02"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.sourcelink.github/1.1.0-beta-20206-02/microsoft.sourcelink.github.1.1.0-beta-20206-02.nupkg"; @@ -248,7 +248,7 @@ }; } { - name = "microsoft.visualstudio.threading.analyzers"; + pname = "microsoft.visualstudio.threading.analyzers"; version = "16.8.55"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.threading.analyzers/16.8.55/microsoft.visualstudio.threading.analyzers.16.8.55.nupkg"; @@ -256,7 +256,7 @@ }; } { - name = "microsoft.win32.primitives"; + pname = "microsoft.win32.primitives"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.win32.primitives/4.0.1/microsoft.win32.primitives.4.0.1.nupkg"; @@ -264,7 +264,7 @@ }; } { - name = "microsoft.win32.registry"; + pname = "microsoft.win32.registry"; version = "4.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.win32.registry/4.0.0/microsoft.win32.registry.4.0.0.nupkg"; @@ -272,7 +272,7 @@ }; } { - name = "netstandard.library"; + pname = "netstandard.library"; version = "2.0.3"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/netstandard.library/2.0.3/netstandard.library.2.0.3.nupkg"; @@ -280,7 +280,7 @@ }; } { - name = "richcodenav.envvardump"; + pname = "richcodenav.envvardump"; version = "0.1.1643-alpha"; src = fetchurl { url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/58ca65bb-e6c1-4210-88ac-fa55c1cd7877/nuget/v3/flat2/richcodenav.envvardump/0.1.1643-alpha/richcodenav.envvardump.0.1.1643-alpha.nupkg"; @@ -288,7 +288,7 @@ }; } { - name = "roslyn.diagnostics.analyzers"; + pname = "roslyn.diagnostics.analyzers"; version = "3.3.2-beta1.20562.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/825db618-e3eb-4426-ba54-b1d6e6c944d8/nuget/v3/flat2/roslyn.diagnostics.analyzers/3.3.2-beta1.20562.1/roslyn.diagnostics.analyzers.3.3.2-beta1.20562.1.nupkg"; @@ -296,7 +296,7 @@ }; } { - name = "runtime.native.system"; + pname = "runtime.native.system"; version = "4.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system/4.0.0/runtime.native.system.4.0.0.nupkg"; @@ -304,7 +304,7 @@ }; } { - name = "runtime.native.system.net.http"; + pname = "runtime.native.system.net.http"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system.net.http/4.0.1/runtime.native.system.net.http.4.0.1.nupkg"; @@ -312,7 +312,7 @@ }; } { - name = "runtime.native.system.security.cryptography"; + pname = "runtime.native.system.security.cryptography"; version = "4.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system.security.cryptography/4.0.0/runtime.native.system.security.cryptography.4.0.0.nupkg"; @@ -320,7 +320,7 @@ }; } { - name = "system.appcontext"; + pname = "system.appcontext"; version = "4.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.appcontext/4.1.0/system.appcontext.4.1.0.nupkg"; @@ -328,7 +328,7 @@ }; } { - name = "system.buffers"; + pname = "system.buffers"; version = "4.5.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.buffers/4.5.1/system.buffers.4.5.1.nupkg"; @@ -336,7 +336,7 @@ }; } { - name = "system.collections"; + pname = "system.collections"; version = "4.0.11"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections/4.0.11/system.collections.4.0.11.nupkg"; @@ -344,7 +344,7 @@ }; } { - name = "system.collections"; + pname = "system.collections"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections/4.3.0/system.collections.4.3.0.nupkg"; @@ -352,7 +352,7 @@ }; } { - name = "system.collections.concurrent"; + pname = "system.collections.concurrent"; version = "4.0.12"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.concurrent/4.0.12/system.collections.concurrent.4.0.12.nupkg"; @@ -360,7 +360,7 @@ }; } { - name = "system.collections.immutable"; + pname = "system.collections.immutable"; version = "1.2.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.immutable/1.2.0/system.collections.immutable.1.2.0.nupkg"; @@ -368,7 +368,7 @@ }; } { - name = "system.collections.immutable"; + pname = "system.collections.immutable"; version = "1.3.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.immutable/1.3.1/system.collections.immutable.1.3.1.nupkg"; @@ -376,7 +376,7 @@ }; } { - name = "system.collections.immutable"; + pname = "system.collections.immutable"; version = "5.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.immutable/5.0.0/system.collections.immutable.5.0.0.nupkg"; @@ -384,7 +384,7 @@ }; } { - name = "system.collections.nongeneric"; + pname = "system.collections.nongeneric"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.nongeneric/4.0.1/system.collections.nongeneric.4.0.1.nupkg"; @@ -392,7 +392,7 @@ }; } { - name = "system.console"; + pname = "system.console"; version = "4.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.console/4.0.0/system.console.4.0.0.nupkg"; @@ -400,7 +400,7 @@ }; } { - name = "system.diagnostics.debug"; + pname = "system.diagnostics.debug"; version = "4.0.11"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.debug/4.0.11/system.diagnostics.debug.4.0.11.nupkg"; @@ -408,7 +408,7 @@ }; } { - name = "system.diagnostics.debug"; + pname = "system.diagnostics.debug"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.debug/4.3.0/system.diagnostics.debug.4.3.0.nupkg"; @@ -416,7 +416,7 @@ }; } { - name = "system.diagnostics.process"; + pname = "system.diagnostics.process"; version = "4.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.process/4.1.0/system.diagnostics.process.4.1.0.nupkg"; @@ -424,7 +424,7 @@ }; } { - name = "system.diagnostics.tools"; + pname = "system.diagnostics.tools"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.tools/4.0.1/system.diagnostics.tools.4.0.1.nupkg"; @@ -432,7 +432,7 @@ }; } { - name = "system.diagnostics.tracesource"; + pname = "system.diagnostics.tracesource"; version = "4.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.tracesource/4.0.0/system.diagnostics.tracesource.4.0.0.nupkg"; @@ -440,7 +440,7 @@ }; } { - name = "system.diagnostics.tracing"; + pname = "system.diagnostics.tracing"; version = "4.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.tracing/4.1.0/system.diagnostics.tracing.4.1.0.nupkg"; @@ -448,7 +448,7 @@ }; } { - name = "system.dynamic.runtime"; + pname = "system.dynamic.runtime"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.dynamic.runtime/4.3.0/system.dynamic.runtime.4.3.0.nupkg"; @@ -456,7 +456,7 @@ }; } { - name = "system.globalization"; + pname = "system.globalization"; version = "4.0.11"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.globalization/4.0.11/system.globalization.4.0.11.nupkg"; @@ -464,7 +464,7 @@ }; } { - name = "system.globalization"; + pname = "system.globalization"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.globalization/4.3.0/system.globalization.4.3.0.nupkg"; @@ -472,7 +472,7 @@ }; } { - name = "system.globalization.calendars"; + pname = "system.globalization.calendars"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.globalization.calendars/4.0.1/system.globalization.calendars.4.0.1.nupkg"; @@ -480,7 +480,7 @@ }; } { - name = "system.io"; + pname = "system.io"; version = "4.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io/4.1.0/system.io.4.1.0.nupkg"; @@ -488,7 +488,7 @@ }; } { - name = "system.io"; + pname = "system.io"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io/4.3.0/system.io.4.3.0.nupkg"; @@ -496,7 +496,7 @@ }; } { - name = "system.io.filesystem"; + pname = "system.io.filesystem"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.filesystem/4.0.1/system.io.filesystem.4.0.1.nupkg"; @@ -504,7 +504,7 @@ }; } { - name = "system.io.filesystem.primitives"; + pname = "system.io.filesystem.primitives"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.filesystem.primitives/4.0.1/system.io.filesystem.primitives.4.0.1.nupkg"; @@ -512,7 +512,7 @@ }; } { - name = "system.io.pipes.accesscontrol"; + pname = "system.io.pipes.accesscontrol"; version = "4.5.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.pipes.accesscontrol/4.5.1/system.io.pipes.accesscontrol.4.5.1.nupkg"; @@ -520,7 +520,7 @@ }; } { - name = "system.linq"; + pname = "system.linq"; version = "4.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.linq/4.1.0/system.linq.4.1.0.nupkg"; @@ -528,7 +528,7 @@ }; } { - name = "system.linq"; + pname = "system.linq"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.linq/4.3.0/system.linq.4.3.0.nupkg"; @@ -536,7 +536,7 @@ }; } { - name = "system.linq.expressions"; + pname = "system.linq.expressions"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.linq.expressions/4.3.0/system.linq.expressions.4.3.0.nupkg"; @@ -544,7 +544,7 @@ }; } { - name = "system.linq.parallel"; + pname = "system.linq.parallel"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.linq.parallel/4.0.1/system.linq.parallel.4.0.1.nupkg"; @@ -552,7 +552,7 @@ }; } { - name = "system.memory"; + pname = "system.memory"; version = "4.5.4"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.memory/4.5.4/system.memory.4.5.4.nupkg"; @@ -560,7 +560,7 @@ }; } { - name = "system.numerics.vectors"; + pname = "system.numerics.vectors"; version = "4.4.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.numerics.vectors/4.4.0/system.numerics.vectors.4.4.0.nupkg"; @@ -568,7 +568,7 @@ }; } { - name = "system.numerics.vectors"; + pname = "system.numerics.vectors"; version = "4.5.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.numerics.vectors/4.5.0/system.numerics.vectors.4.5.0.nupkg"; @@ -576,7 +576,7 @@ }; } { - name = "system.objectmodel"; + pname = "system.objectmodel"; version = "4.0.12"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.objectmodel/4.0.12/system.objectmodel.4.0.12.nupkg"; @@ -584,7 +584,7 @@ }; } { - name = "system.objectmodel"; + pname = "system.objectmodel"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.objectmodel/4.3.0/system.objectmodel.4.3.0.nupkg"; @@ -592,7 +592,7 @@ }; } { - name = "system.private.datacontractserialization"; + pname = "system.private.datacontractserialization"; version = "4.1.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.private.datacontractserialization/4.1.1/system.private.datacontractserialization.4.1.1.nupkg"; @@ -600,7 +600,7 @@ }; } { - name = "system.reflection"; + pname = "system.reflection"; version = "4.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection/4.1.0/system.reflection.4.1.0.nupkg"; @@ -608,7 +608,7 @@ }; } { - name = "system.reflection"; + pname = "system.reflection"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection/4.3.0/system.reflection.4.3.0.nupkg"; @@ -616,7 +616,7 @@ }; } { - name = "system.reflection.emit"; + pname = "system.reflection.emit"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit/4.0.1/system.reflection.emit.4.0.1.nupkg"; @@ -624,7 +624,7 @@ }; } { - name = "system.reflection.emit"; + pname = "system.reflection.emit"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit/4.3.0/system.reflection.emit.4.3.0.nupkg"; @@ -632,7 +632,7 @@ }; } { - name = "system.reflection.emit.ilgeneration"; + pname = "system.reflection.emit.ilgeneration"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit.ilgeneration/4.0.1/system.reflection.emit.ilgeneration.4.0.1.nupkg"; @@ -640,7 +640,7 @@ }; } { - name = "system.reflection.emit.ilgeneration"; + pname = "system.reflection.emit.ilgeneration"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit.ilgeneration/4.3.0/system.reflection.emit.ilgeneration.4.3.0.nupkg"; @@ -648,7 +648,7 @@ }; } { - name = "system.reflection.emit.lightweight"; + pname = "system.reflection.emit.lightweight"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit.lightweight/4.0.1/system.reflection.emit.lightweight.4.0.1.nupkg"; @@ -656,7 +656,7 @@ }; } { - name = "system.reflection.emit.lightweight"; + pname = "system.reflection.emit.lightweight"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit.lightweight/4.3.0/system.reflection.emit.lightweight.4.3.0.nupkg"; @@ -664,7 +664,7 @@ }; } { - name = "system.reflection.extensions"; + pname = "system.reflection.extensions"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.extensions/4.0.1/system.reflection.extensions.4.0.1.nupkg"; @@ -672,7 +672,7 @@ }; } { - name = "system.reflection.extensions"; + pname = "system.reflection.extensions"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.extensions/4.3.0/system.reflection.extensions.4.3.0.nupkg"; @@ -680,7 +680,7 @@ }; } { - name = "system.reflection.metadata"; + pname = "system.reflection.metadata"; version = "1.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadata/1.3.0/system.reflection.metadata.1.3.0.nupkg"; @@ -688,7 +688,7 @@ }; } { - name = "system.reflection.metadata"; + pname = "system.reflection.metadata"; version = "5.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadata/5.0.0/system.reflection.metadata.5.0.0.nupkg"; @@ -696,7 +696,7 @@ }; } { - name = "system.reflection.primitives"; + pname = "system.reflection.primitives"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.primitives/4.0.1/system.reflection.primitives.4.0.1.nupkg"; @@ -704,7 +704,7 @@ }; } { - name = "system.reflection.primitives"; + pname = "system.reflection.primitives"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.primitives/4.3.0/system.reflection.primitives.4.3.0.nupkg"; @@ -712,7 +712,7 @@ }; } { - name = "system.reflection.typeextensions"; + pname = "system.reflection.typeextensions"; version = "4.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.typeextensions/4.1.0/system.reflection.typeextensions.4.1.0.nupkg"; @@ -720,7 +720,7 @@ }; } { - name = "system.reflection.typeextensions"; + pname = "system.reflection.typeextensions"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.typeextensions/4.3.0/system.reflection.typeextensions.4.3.0.nupkg"; @@ -728,7 +728,7 @@ }; } { - name = "system.resources.reader"; + pname = "system.resources.reader"; version = "4.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.reader/4.0.0/system.resources.reader.4.0.0.nupkg"; @@ -736,7 +736,7 @@ }; } { - name = "system.resources.resourcemanager"; + pname = "system.resources.resourcemanager"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.resourcemanager/4.0.1/system.resources.resourcemanager.4.0.1.nupkg"; @@ -744,7 +744,7 @@ }; } { - name = "system.resources.resourcemanager"; + pname = "system.resources.resourcemanager"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.resourcemanager/4.3.0/system.resources.resourcemanager.4.3.0.nupkg"; @@ -752,7 +752,7 @@ }; } { - name = "system.resources.writer"; + pname = "system.resources.writer"; version = "4.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.writer/4.0.0/system.resources.writer.4.0.0.nupkg"; @@ -760,7 +760,7 @@ }; } { - name = "system.runtime"; + pname = "system.runtime"; version = "4.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime/4.1.0/system.runtime.4.1.0.nupkg"; @@ -768,7 +768,7 @@ }; } { - name = "system.runtime"; + pname = "system.runtime"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime/4.3.0/system.runtime.4.3.0.nupkg"; @@ -776,7 +776,7 @@ }; } { - name = "system.runtime.compilerservices.unsafe"; + pname = "system.runtime.compilerservices.unsafe"; version = "4.7.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.compilerservices.unsafe/4.7.1/system.runtime.compilerservices.unsafe.4.7.1.nupkg"; @@ -784,7 +784,7 @@ }; } { - name = "system.runtime.compilerservices.unsafe"; + pname = "system.runtime.compilerservices.unsafe"; version = "5.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.compilerservices.unsafe/5.0.0/system.runtime.compilerservices.unsafe.5.0.0.nupkg"; @@ -792,7 +792,7 @@ }; } { - name = "system.runtime.extensions"; + pname = "system.runtime.extensions"; version = "4.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.extensions/4.1.0/system.runtime.extensions.4.1.0.nupkg"; @@ -800,7 +800,7 @@ }; } { - name = "system.runtime.extensions"; + pname = "system.runtime.extensions"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.extensions/4.3.0/system.runtime.extensions.4.3.0.nupkg"; @@ -808,7 +808,7 @@ }; } { - name = "system.runtime.handles"; + pname = "system.runtime.handles"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.handles/4.0.1/system.runtime.handles.4.0.1.nupkg"; @@ -816,7 +816,7 @@ }; } { - name = "system.runtime.handles"; + pname = "system.runtime.handles"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.handles/4.3.0/system.runtime.handles.4.3.0.nupkg"; @@ -824,7 +824,7 @@ }; } { - name = "system.runtime.interopservices"; + pname = "system.runtime.interopservices"; version = "4.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.interopservices/4.1.0/system.runtime.interopservices.4.1.0.nupkg"; @@ -832,7 +832,7 @@ }; } { - name = "system.runtime.interopservices"; + pname = "system.runtime.interopservices"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.interopservices/4.3.0/system.runtime.interopservices.4.3.0.nupkg"; @@ -840,7 +840,7 @@ }; } { - name = "system.runtime.interopservices.runtimeinformation"; + pname = "system.runtime.interopservices.runtimeinformation"; version = "4.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.interopservices.runtimeinformation/4.0.0/system.runtime.interopservices.runtimeinformation.4.0.0.nupkg"; @@ -848,7 +848,7 @@ }; } { - name = "system.runtime.interopservices.runtimeinformation"; + pname = "system.runtime.interopservices.runtimeinformation"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.interopservices.runtimeinformation/4.3.0/system.runtime.interopservices.runtimeinformation.4.3.0.nupkg"; @@ -856,7 +856,7 @@ }; } { - name = "system.runtime.loader"; + pname = "system.runtime.loader"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.loader/4.3.0/system.runtime.loader.4.3.0.nupkg"; @@ -864,7 +864,7 @@ }; } { - name = "system.runtime.numerics"; + pname = "system.runtime.numerics"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.numerics/4.0.1/system.runtime.numerics.4.0.1.nupkg"; @@ -872,7 +872,7 @@ }; } { - name = "system.runtime.serialization.primitives"; + pname = "system.runtime.serialization.primitives"; version = "4.1.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.serialization.primitives/4.1.1/system.runtime.serialization.primitives.4.1.1.nupkg"; @@ -880,7 +880,7 @@ }; } { - name = "system.runtime.serialization.xml"; + pname = "system.runtime.serialization.xml"; version = "4.1.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.serialization.xml/4.1.1/system.runtime.serialization.xml.4.1.1.nupkg"; @@ -888,7 +888,7 @@ }; } { - name = "system.security.accesscontrol"; + pname = "system.security.accesscontrol"; version = "4.5.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.accesscontrol/4.5.0/system.security.accesscontrol.4.5.0.nupkg"; @@ -896,7 +896,7 @@ }; } { - name = "system.security.cryptography.algorithms"; + pname = "system.security.cryptography.algorithms"; version = "4.2.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.algorithms/4.2.0/system.security.cryptography.algorithms.4.2.0.nupkg"; @@ -904,7 +904,7 @@ }; } { - name = "system.security.cryptography.cng"; + pname = "system.security.cryptography.cng"; version = "4.2.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.cng/4.2.0/system.security.cryptography.cng.4.2.0.nupkg"; @@ -912,7 +912,7 @@ }; } { - name = "system.security.cryptography.csp"; + pname = "system.security.cryptography.csp"; version = "4.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.csp/4.0.0/system.security.cryptography.csp.4.0.0.nupkg"; @@ -920,7 +920,7 @@ }; } { - name = "system.security.cryptography.encoding"; + pname = "system.security.cryptography.encoding"; version = "4.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.encoding/4.0.0/system.security.cryptography.encoding.4.0.0.nupkg"; @@ -928,7 +928,7 @@ }; } { - name = "system.security.cryptography.openssl"; + pname = "system.security.cryptography.openssl"; version = "4.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.openssl/4.0.0/system.security.cryptography.openssl.4.0.0.nupkg"; @@ -936,7 +936,7 @@ }; } { - name = "system.security.cryptography.primitives"; + pname = "system.security.cryptography.primitives"; version = "4.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.primitives/4.0.0/system.security.cryptography.primitives.4.0.0.nupkg"; @@ -944,7 +944,7 @@ }; } { - name = "system.security.cryptography.x509certificates"; + pname = "system.security.cryptography.x509certificates"; version = "4.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.x509certificates/4.1.0/system.security.cryptography.x509certificates.4.1.0.nupkg"; @@ -952,7 +952,7 @@ }; } { - name = "system.security.principal.windows"; + pname = "system.security.principal.windows"; version = "4.5.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.principal.windows/4.5.0/system.security.principal.windows.4.5.0.nupkg"; @@ -960,7 +960,7 @@ }; } { - name = "system.text.encoding"; + pname = "system.text.encoding"; version = "4.0.11"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding/4.0.11/system.text.encoding.4.0.11.nupkg"; @@ -968,7 +968,7 @@ }; } { - name = "system.text.encoding"; + pname = "system.text.encoding"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding/4.3.0/system.text.encoding.4.3.0.nupkg"; @@ -976,7 +976,7 @@ }; } { - name = "system.text.encoding.codepages"; + pname = "system.text.encoding.codepages"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.codepages/4.0.1/system.text.encoding.codepages.4.0.1.nupkg"; @@ -984,7 +984,7 @@ }; } { - name = "system.text.encoding.codepages"; + pname = "system.text.encoding.codepages"; version = "4.5.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.codepages/4.5.1/system.text.encoding.codepages.4.5.1.nupkg"; @@ -992,7 +992,7 @@ }; } { - name = "system.text.encoding.extensions"; + pname = "system.text.encoding.extensions"; version = "4.0.11"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.extensions/4.0.11/system.text.encoding.extensions.4.0.11.nupkg"; @@ -1000,7 +1000,7 @@ }; } { - name = "system.text.regularexpressions"; + pname = "system.text.regularexpressions"; version = "4.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.regularexpressions/4.1.0/system.text.regularexpressions.4.1.0.nupkg"; @@ -1008,7 +1008,7 @@ }; } { - name = "system.threading"; + pname = "system.threading"; version = "4.0.11"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading/4.0.11/system.threading.4.0.11.nupkg"; @@ -1016,7 +1016,7 @@ }; } { - name = "system.threading"; + pname = "system.threading"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading/4.3.0/system.threading.4.3.0.nupkg"; @@ -1024,7 +1024,7 @@ }; } { - name = "system.threading.tasks"; + pname = "system.threading.tasks"; version = "4.0.11"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks/4.0.11/system.threading.tasks.4.0.11.nupkg"; @@ -1032,7 +1032,7 @@ }; } { - name = "system.threading.tasks"; + pname = "system.threading.tasks"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks/4.3.0/system.threading.tasks.4.3.0.nupkg"; @@ -1040,7 +1040,7 @@ }; } { - name = "system.threading.tasks.extensions"; + pname = "system.threading.tasks.extensions"; version = "4.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.extensions/4.0.0/system.threading.tasks.extensions.4.0.0.nupkg"; @@ -1048,7 +1048,7 @@ }; } { - name = "system.threading.tasks.extensions"; + pname = "system.threading.tasks.extensions"; version = "4.5.4"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.extensions/4.5.4/system.threading.tasks.extensions.4.5.4.nupkg"; @@ -1056,7 +1056,7 @@ }; } { - name = "system.threading.thread"; + pname = "system.threading.thread"; version = "4.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.thread/4.0.0/system.threading.thread.4.0.0.nupkg"; @@ -1064,7 +1064,7 @@ }; } { - name = "system.threading.threadpool"; + pname = "system.threading.threadpool"; version = "4.0.10"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.threadpool/4.0.10/system.threading.threadpool.4.0.10.nupkg"; @@ -1072,7 +1072,7 @@ }; } { - name = "system.threading.timer"; + pname = "system.threading.timer"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.timer/4.0.1/system.threading.timer.4.0.1.nupkg"; @@ -1080,7 +1080,7 @@ }; } { - name = "system.xml.readerwriter"; + pname = "system.xml.readerwriter"; version = "4.0.11"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.readerwriter/4.0.11/system.xml.readerwriter.4.0.11.nupkg"; @@ -1088,7 +1088,7 @@ }; } { - name = "system.xml.xdocument"; + pname = "system.xml.xdocument"; version = "4.0.11"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.xdocument/4.0.11/system.xml.xdocument.4.0.11.nupkg"; @@ -1096,7 +1096,7 @@ }; } { - name = "system.xml.xmldocument"; + pname = "system.xml.xmldocument"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.xmldocument/4.0.1/system.xml.xmldocument.4.0.1.nupkg"; @@ -1104,7 +1104,7 @@ }; } { - name = "system.xml.xmlserializer"; + pname = "system.xml.xmlserializer"; version = "4.0.11"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.xmlserializer/4.0.11/system.xml.xmlserializer.4.0.11.nupkg"; @@ -1112,7 +1112,7 @@ }; } { - name = "system.xml.xpath"; + pname = "system.xml.xpath"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.xpath/4.0.1/system.xml.xpath.4.0.1.nupkg"; @@ -1120,7 +1120,7 @@ }; } { - name = "system.xml.xpath.xmldocument"; + pname = "system.xml.xpath.xmldocument"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.xpath.xmldocument/4.0.1/system.xml.xpath.xmldocument.4.0.1.nupkg"; @@ -1128,7 +1128,7 @@ }; } { - name = "xlifftasks"; + pname = "xlifftasks"; version = "1.0.0-beta.20206.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/xlifftasks/1.0.0-beta.20206.1/xlifftasks.1.0.0-beta.20206.1.nupkg"; diff --git a/nixpkgs/pkgs/development/compilers/rust/clippy.nix b/nixpkgs/pkgs/development/compilers/rust/clippy.nix index a3597e9febf7..23b8e7effe12 100644 --- a/nixpkgs/pkgs/development/compilers/rust/clippy.nix +++ b/nixpkgs/pkgs/development/compilers/rust/clippy.nix @@ -1,6 +1,6 @@ { stdenv, lib, rustPlatform, rustc, Security, patchelf }: rustPlatform.buildRustPackage { - name = "clippy-${rustc.version}"; + pname = "clippy"; inherit (rustc) version src; # the rust source tarball already has all the dependencies vendored, no need to fetch them again diff --git a/nixpkgs/pkgs/development/compilers/rust/make-rust-platform.nix b/nixpkgs/pkgs/development/compilers/rust/make-rust-platform.nix index f479b052019e..b859d01dc085 100644 --- a/nixpkgs/pkgs/development/compilers/rust/make-rust-platform.nix +++ b/nixpkgs/pkgs/development/compilers/rust/make-rust-platform.nix @@ -1,4 +1,4 @@ -{ buildPackages, callPackage, stdenv }@prev: +{ buildPackages, callPackage, stdenv, runCommand }@prev: { rustc, cargo, stdenv ? prev.stdenv, ... }: @@ -21,15 +21,15 @@ rec { importCargoLock = buildPackages.callPackage ../../../build-support/rust/import-cargo-lock.nix {}; rustcSrc = callPackage ./rust-src.nix { - inherit stdenv rustc; + inherit runCommand rustc; }; rustLibSrc = callPackage ./rust-lib-src.nix { - inherit stdenv rustc; + inherit runCommand rustc; }; # Hooks inherit (callPackage ../../../build-support/rust/hooks { inherit stdenv cargo rustc; - }) cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook maturinBuildHook; + }) cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook maturinBuildHook bindgenHook; } diff --git a/nixpkgs/pkgs/development/compilers/rust/rust-lib-src.nix b/nixpkgs/pkgs/development/compilers/rust/rust-lib-src.nix index 67a7fa3641ad..aa914338639d 100644 --- a/nixpkgs/pkgs/development/compilers/rust/rust-lib-src.nix +++ b/nixpkgs/pkgs/development/compilers/rust/rust-lib-src.nix @@ -1,11 +1,6 @@ -{ stdenv, rustc }: +{ runCommand, rustc }: -stdenv.mkDerivation { - name = "rust-lib-src"; - src = rustc.src; - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' - mv library $out - ''; -} +runCommand "rust-lib-src" { } '' + tar --strip-components=1 -xzf ${rustc.src} + mv library $out +'' diff --git a/nixpkgs/pkgs/development/compilers/rust/rust-src.nix b/nixpkgs/pkgs/development/compilers/rust/rust-src.nix index 4239e92b0363..69bdb37ac2fd 100644 --- a/nixpkgs/pkgs/development/compilers/rust/rust-src.nix +++ b/nixpkgs/pkgs/development/compilers/rust/rust-src.nix @@ -1,25 +1,21 @@ -{ lib, stdenv, rustc, minimalContent ? true }: +{ lib, runCommand, rustc, minimalContent ? true }: -stdenv.mkDerivation { - name = "rust-src"; - src = rustc.src; - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' - mv src $out - rm -rf $out/{${lib.concatStringsSep "," ([ - "ci" - "doc" - "etc" - "grammar" - "llvm-project" - "llvm-emscripten" - "rtstartup" - "rustllvm" - "test" - "vendor" - ] ++ lib.optionals minimalContent [ - "tools" - "stdarch" - ])}} - ''; -} +runCommand "rust-src" { } '' + tar -xzf ${rustc.src} + mv rustc-${rustc.version}-src $out + rm -rf $out/{${lib.concatStringsSep "," ([ + "ci" + "doc" + "etc" + "grammar" + "llvm-project" + "llvm-emscripten" + "rtstartup" + "rustllvm" + "test" + "vendor" + ] ++ lib.optionals minimalContent [ + "tools" + "stdarch" + ])}} +'' diff --git a/nixpkgs/pkgs/development/compilers/scala/dotty.nix b/nixpkgs/pkgs/development/compilers/scala/dotty.nix index c99ed24c2149..1cd187f2e540 100644 --- a/nixpkgs/pkgs/development/compilers/scala/dotty.nix +++ b/nixpkgs/pkgs/development/compilers/scala/dotty.nix @@ -7,7 +7,8 @@ let in stdenv.mkDerivation { - name = "dotty-${dotty-bare.version}"; + pname = "dotty"; + inherit (dotty-bare) version; dontUnpack = true; diff --git a/nixpkgs/pkgs/development/compilers/swift/default.nix b/nixpkgs/pkgs/development/compilers/swift/default.nix index e3a9aa2b486c..f47d4cd818f3 100644 --- a/nixpkgs/pkgs/development/compilers/swift/default.nix +++ b/nixpkgs/pkgs/development/compilers/swift/default.nix @@ -182,7 +182,8 @@ let in stdenv.mkDerivation { - name = "swift-${versions.swift}"; + pname = "swift"; + version = versions.swift; nativeBuildInputs = [ autoconf diff --git a/nixpkgs/pkgs/development/compilers/urn/default.nix b/nixpkgs/pkgs/development/compilers/urn/default.nix index 7381e7c89fec..66f1bda6d5f9 100644 --- a/nixpkgs/pkgs/development/compilers/urn/default.nix +++ b/nixpkgs/pkgs/development/compilers/urn/default.nix @@ -21,7 +21,8 @@ let in stdenv.mkDerivation { - name = "urn-${optionalString (extraLibraries != []) "with-libraries-"}${version}"; + pname = "urn${optionalString (extraLibraries != []) "-with-libraries"}"; + inherit version; src = fetchFromGitLab { owner = "urn"; diff --git a/nixpkgs/pkgs/development/compilers/vala/default.nix b/nixpkgs/pkgs/development/compilers/vala/default.nix index 17ba5b14214c..1dc910c62227 100644 --- a/nixpkgs/pkgs/development/compilers/vala/default.nix +++ b/nixpkgs/pkgs/development/compilers/vala/default.nix @@ -18,8 +18,6 @@ let { "0.48" = ./disable-graphviz-0.46.1.patch; - "0.52" = ./disable-graphviz-0.46.1.patch; - "0.54" = ./disable-graphviz-0.46.1.patch; }.${lib.versions.majorMinor version} or (throw "no graphviz patch for this version of vala"); @@ -87,13 +85,8 @@ let in rec { vala_0_48 = generic { - version = "0.48.22"; - sha256 = "sha256-27NHjEvjZvCTFkrGHNOu29zz5EQE2eNkFK4VEk525os="; - }; - - vala_0_52 = generic { - version = "0.52.10"; - sha256 = "sha256-nCAb+BLZh04hveU/jZwU9lF0ixqBRB/1ySkSJESQEAg="; + version = "0.48.23"; + sha256 = "sha256-3jzIWNmV4HR0IZ4lo+Hw7ZmAcNLiBtOjE9Q3ml93oGo="; }; vala_0_54 = generic { diff --git a/nixpkgs/pkgs/development/compilers/yosys/default.nix b/nixpkgs/pkgs/development/compilers/yosys/default.nix index 30b9b8393987..ecdebdda849a 100644 --- a/nixpkgs/pkgs/development/compilers/yosys/default.nix +++ b/nixpkgs/pkgs/development/compilers/yosys/default.nix @@ -72,13 +72,13 @@ let in stdenv.mkDerivation rec { pname = "yosys"; - version = "0.12+54"; + version = "0.15"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; - rev = "59a71503448401d2476cf0872808e0a99c3a4d81"; - hash = "sha256-cz4PQymaA9UW91lN+6iniFhbcPRpFNIAeC8ZkwYeg0U="; + rev = "${pname}-${version}"; + hash = "sha256-1NCcsq0otVKTTSSmnX2kCvvngF1yzqYWlRVzu+XY65w="; }; enableParallelBuilding = true; @@ -143,7 +143,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Open RTL synthesis framework and tools"; - homepage = "http://www.clifford.at/yosys/"; + homepage = "https://yosyshq.net/yosys/"; license = licenses.isc; platforms = platforms.all; maintainers = with maintainers; [ shell thoughtpolice emily ]; diff --git a/nixpkgs/pkgs/development/coq-modules/QuickChick/default.nix b/nixpkgs/pkgs/development/coq-modules/QuickChick/default.nix index fcaaaac615e7..56ce94ecc6f3 100644 --- a/nixpkgs/pkgs/development/coq-modules/QuickChick/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/QuickChick/default.nix @@ -34,10 +34,10 @@ mkCoqDerivation { "substituteInPlace Makefile --replace quickChickTool.byte quickChickTool.native"; mlPlugin = true; + extraNativeBuildInputs = lib.optional recent coq.ocamlPackages.ocamlbuild; extraBuildInputs = lib.optional recent coq.ocamlPackages.num; propagatedBuildInputs = [ ssreflect ] - ++ lib.optionals recent [ coq-ext-lib simple-io ] - ++ lib.optional recent coq.ocamlPackages.ocamlbuild; + ++ lib.optionals recent [ coq-ext-lib simple-io ]; extraInstallFlags = [ "-f Makefile.coq" ]; enableParallelBuilding = false; diff --git a/nixpkgs/pkgs/development/coq-modules/addition-chains/default.nix b/nixpkgs/pkgs/development/coq-modules/addition-chains/default.nix index c6b6f79bf017..8a0248c952cb 100644 --- a/nixpkgs/pkgs/development/coq-modules/addition-chains/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/addition-chains/default.nix @@ -1,4 +1,4 @@ -{ lib, mkCoqDerivation, coq, mathcomp-ssreflect, mathcomp-algebra, paramcoq +{ lib, mkCoqDerivation, coq, mathcomp-ssreflect, mathcomp-algebra, mathcomp-fingroup, paramcoq , version ? null }: with lib; @@ -17,7 +17,7 @@ mkCoqDerivation { { case = range "8.11" "8.12"; out = "0.4"; } ] null; - propagatedBuildInputs = [ mathcomp-ssreflect mathcomp-algebra paramcoq ]; + propagatedBuildInputs = [ mathcomp-ssreflect mathcomp-algebra mathcomp-fingroup paramcoq ]; useDune2 = true; diff --git a/nixpkgs/pkgs/development/coq-modules/coq-bits/default.nix b/nixpkgs/pkgs/development/coq-modules/coq-bits/default.nix index 1da0a0d17ea9..6cb6bb3c813e 100644 --- a/nixpkgs/pkgs/development/coq-modules/coq-bits/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/coq-bits/default.nix @@ -22,6 +22,7 @@ with lib; mkCoqDerivation { }; }; + extraBuildInputs = [ mathcomp.ssreflect mathcomp.fingroup ]; propagatedBuildInputs = [ mathcomp.algebra ]; installPhase = '' diff --git a/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix b/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix index c4055648c5a9..55423047caa7 100644 --- a/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix @@ -48,9 +48,8 @@ in mkCoqDerivation { release."1.6.0".sha256 = "0kf99i43mlf750fr7fric764mm495a53mg5kahnbp6zcjcxxrm0b"; releaseRev = v: "v${v}"; - nativeBuildInputs = [ which ]; + extraNativeBuildInputs = [ which elpi ]; mlPlugin = true; - extraBuildInputs = [ elpi ]; meta = { description = "Coq plugin embedding ELPI."; diff --git a/nixpkgs/pkgs/development/coq-modules/coqhammer/default.nix b/nixpkgs/pkgs/development/coq-modules/coqhammer/default.nix index 7cb859b202a2..66a3dd222dd5 100644 --- a/nixpkgs/pkgs/development/coq-modules/coqhammer/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/coqhammer/default.nix @@ -5,6 +5,7 @@ with lib; mkCoqDerivation { pname = "coqhammer"; owner = "lukaszcz"; defaultVersion = with versions; switch coq.coq-version [ + { case = "8.15"; out = "1.3.2-coq8.15"; } { case = "8.14"; out = "1.3.2-coq8.14"; } { case = "8.13"; out = "1.3.2-coq8.13"; } { case = "8.12"; out = "1.3.2-coq8.12"; } @@ -13,6 +14,8 @@ with lib; mkCoqDerivation { { case = "8.9"; out = "1.1.1-coq8.9"; } { case = "8.8"; out = "1.1-coq8.8"; } ] null; + release."1.3.2-coq8.15".sha256 = "sha256:0n0y9wda8bx88r17ls9541ibxw013ghp73zshgb65bi7ibznbhha"; + release."1.3.2-coq8.15".rev = "9a3e689036f12c09800ca3bac05054af0cc49233"; release."1.3.2-coq8.14".sha256 = "sha256:1pvs4p95lr31jb86f33p2q9v8zq3xbci1fk6s6a2g2snfxng1574"; release."1.3.2-coq8.13".sha256 = "sha256:0krsm8qj9lgfbggxv2jhkbk3vy2cz63qypnarnl31fdmpykchi4b"; release."1.3.2-coq8.12".sha256 = "sha256:08mnr13lrdnpims6kf8pk6axf4s8qqs0a71hzg3frkx21d6nawhh"; diff --git a/nixpkgs/pkgs/development/coq-modules/coqtail-math/default.nix b/nixpkgs/pkgs/development/coq-modules/coqtail-math/default.nix index 891d1fae62c0..c9c3915414c3 100644 --- a/nixpkgs/pkgs/development/coq-modules/coqtail-math/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/coqtail-math/default.nix @@ -10,7 +10,7 @@ mkCoqDerivation { release."20201124".rev = "5c22c3d7dcd8cf4c47cf84a281780f5915488e9e"; release."20201124".sha256 = "sha256-wd+Lh7dpAD4zfpyKuztDmSFEZo5ZiFrR8ti2jUCVvoQ="; - buildInputs = with coq.ocamlPackages; [ ocaml findlib ]; + extraNativeBuildInputs = with coq.ocamlPackages; [ ocaml findlib ]; meta = { license = licenses.lgpl3Only; diff --git a/nixpkgs/pkgs/development/coq-modules/coquelicot/default.nix b/nixpkgs/pkgs/development/coq-modules/coquelicot/default.nix index b7f5802b9d40..1a6dba9b0c08 100644 --- a/nixpkgs/pkgs/development/coq-modules/coquelicot/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/coquelicot/default.nix @@ -16,7 +16,7 @@ with lib; mkCoqDerivation { release."3.0.2".sha256 = "1rqfbbskgz7b1bcpva8wh3v3456sq2364y804f94sc8y5sij23nl"; releaseRev = v: "coquelicot-${v}"; - nativeBuildInputs = [ which autoconf ]; + extraNativeBuildInputs = [ which autoconf ]; propagatedBuildInputs = [ ssreflect ]; useMelquiondRemake.logpath = "Coquelicot"; diff --git a/nixpkgs/pkgs/development/coq-modules/dpdgraph/default.nix b/nixpkgs/pkgs/development/coq-modules/dpdgraph/default.nix index 82fb6c536d38..7cf6132bf6a9 100644 --- a/nixpkgs/pkgs/development/coq-modules/dpdgraph/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/dpdgraph/default.nix @@ -39,7 +39,7 @@ mkCoqDerivation { release."0.6".sha256 = "0qvar8gfbrcs9fmvkph5asqz4l5fi63caykx3bsn8zf0xllkwv0n"; releaseRev = v: "v${v}"; - nativeBuildInputs = [ autoreconfHook ]; + extraNativeBuildInputs = [ autoreconfHook ]; mlPlugin = true; extraBuildInputs = [ coq.ocamlPackages.ocamlgraph ]; diff --git a/nixpkgs/pkgs/development/coq-modules/fourcolor/default.nix b/nixpkgs/pkgs/development/coq-modules/fourcolor/default.nix index 19d35b4c97ef..a9c5d021077b 100644 --- a/nixpkgs/pkgs/development/coq-modules/fourcolor/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/fourcolor/default.nix @@ -16,7 +16,7 @@ mkCoqDerivation { { cases = [ (isLe "8.13") (pred.inter (isGe "1.11.0") (isLt "1.13")) ]; out = "1.2.3"; } ] null; - propagatedBuildInputs = [ mathcomp.algebra ]; + propagatedBuildInputs = [ mathcomp.algebra mathcomp.ssreflect mathcomp.fingroup ]; meta = { description = "Formal proof of the Four Color Theorem "; diff --git a/nixpkgs/pkgs/development/coq-modules/gaia/default.nix b/nixpkgs/pkgs/development/coq-modules/gaia/default.nix index c7c64c9d257c..53c317db87ca 100644 --- a/nixpkgs/pkgs/development/coq-modules/gaia/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/gaia/default.nix @@ -15,7 +15,7 @@ with lib; mkCoqDerivation { ] null; propagatedBuildInputs = - [ mathcomp.ssreflect mathcomp.algebra ]; + [ mathcomp.ssreflect mathcomp.algebra mathcomp.fingroup ]; meta = { description = "Implementation of books from Bourbaki's Elements of Mathematics in Coq"; diff --git a/nixpkgs/pkgs/development/coq-modules/gappalib/default.nix b/nixpkgs/pkgs/development/coq-modules/gappalib/default.nix index 440c9395a37f..02905dcffed5 100644 --- a/nixpkgs/pkgs/development/coq-modules/gappalib/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/gappalib/default.nix @@ -12,7 +12,7 @@ with lib; mkCoqDerivation { release."1.4.4".sha256 = "114q2hgw64j6kqa9mg3qcp1nlf0ia46z2xadq81fnkxqm856ml7l"; releaseRev = v: "gappalib-coq-${v}"; - nativeBuildInputs = [ which autoconf ]; + extraNativeBuildInputs = [ which autoconf ]; mlPlugin = true; propagatedBuildInputs = [ flocq ]; useMelquiondRemake.logpath = "Gappa"; diff --git a/nixpkgs/pkgs/development/coq-modules/graph-theory/default.nix b/nixpkgs/pkgs/development/coq-modules/graph-theory/default.nix index 6374ede7970b..eedbe6fb5d88 100644 --- a/nixpkgs/pkgs/development/coq-modules/graph-theory/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/graph-theory/default.nix @@ -1,4 +1,4 @@ -{ lib, mkCoqDerivation, coq, mathcomp-algebra, mathcomp-finmap +{ lib, mkCoqDerivation, coq, mathcomp-algebra, mathcomp-finmap, mathcomp-fingroup , hierarchy-builder, version ? null }: with lib; @@ -15,7 +15,7 @@ mkCoqDerivation { { case = range "8.13" "8.14"; out = "0.9"; } ] null; - propagatedBuildInputs = [ mathcomp-algebra mathcomp-finmap hierarchy-builder ]; + propagatedBuildInputs = [ mathcomp-algebra mathcomp-finmap mathcomp-fingroup hierarchy-builder ]; meta = { description = "Library of formalized graph theory results in Coq"; diff --git a/nixpkgs/pkgs/development/coq-modules/hierarchy-builder/default.nix b/nixpkgs/pkgs/development/coq-modules/hierarchy-builder/default.nix index 1f5a616bb549..c0fa2d7c8e00 100644 --- a/nixpkgs/pkgs/development/coq-modules/hierarchy-builder/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/hierarchy-builder/default.nix @@ -17,7 +17,7 @@ with lib; let hb = mkCoqDerivation { release."0.10.0".sha256 = "1a3vry9nzavrlrdlq3cys3f8kpq3bz447q8c4c7lh2qal61wb32h"; releaseRev = v: "v${v}"; - nativeBuildInputs = [ which ]; + extraNativeBuildInputs = [ which ]; propagatedBuildInputs = [ coq-elpi ]; diff --git a/nixpkgs/pkgs/development/coq-modules/interval/default.nix b/nixpkgs/pkgs/development/coq-modules/interval/default.nix index b608f3d02050..b9257d415e57 100644 --- a/nixpkgs/pkgs/development/coq-modules/interval/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/interval/default.nix @@ -1,4 +1,4 @@ -{ lib, mkCoqDerivation, which, autoconf, coq, coquelicot, flocq, bignums ? null, gnuplot_qt, version ? null }: +{ lib, mkCoqDerivation, which, autoconf, coq, coquelicot, flocq, mathcomp-ssreflect, mathcomp-fingroup, bignums ? null, gnuplot_qt, version ? null }: mkCoqDerivation rec { pname = "interval"; @@ -20,8 +20,8 @@ mkCoqDerivation rec { release."3.3.0".sha256 = "0lz2hgggzn4cvklvm8rpaxvwaryf37i8mzqajqgdxdbd8f12acsz"; releaseRev = v: "interval-${v}"; - nativeBuildInputs = [ which autoconf ]; - propagatedBuildInputs = [ bignums coquelicot flocq ] + extraNativeBuildInputs = [ which autoconf ]; + propagatedBuildInputs = [ bignums coquelicot flocq mathcomp-ssreflect mathcomp-fingroup ] ++ lib.optionals (lib.versions.isGe "4.2.0" defaultVersion) [ gnuplot_qt ]; useMelquiondRemake.logpath = "Interval"; mlPlugin = true; diff --git a/nixpkgs/pkgs/development/coq-modules/iris/default.nix b/nixpkgs/pkgs/development/coq-modules/iris/default.nix index 4fceb7a2fd94..7839c42067b5 100644 --- a/nixpkgs/pkgs/development/coq-modules/iris/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/iris/default.nix @@ -6,10 +6,12 @@ with lib; mkCoqDerivation rec { owner = "iris"; inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = isEq "8.14"; out = "3.5.0"; } + { case = range "8.13" "8.15"; out = "3.6.0"; } + { case = range "8.12" "8.14"; out = "3.5.0"; } { case = range "8.11" "8.13"; out = "3.4.0"; } { case = range "8.9" "8.10"; out = "3.3.0"; } ] null; + release."3.6.0".sha256 = "sha256:02vbq597fjxd5znzxdb54wfp36412wz2d4yash4q8yddgl1kakmj"; release."3.5.0".sha256 = "0hh14m0anfcv65rxm982ps2vp95vk9fwrpv4br8bxd9vz0091d70"; release."3.4.0".sha256 = "0vdc2mdqn5jjd6yz028c0c6blzrvpl0c7apx6xas7ll60136slrb"; release."3.3.0".sha256 = "0az4gkp5m8sq0p73dlh0r7ckkzhk7zkg5bndw01bdsy5ywj0vilp"; diff --git a/nixpkgs/pkgs/development/coq-modules/itauto/default.nix b/nixpkgs/pkgs/development/coq-modules/itauto/default.nix index 843a99de4be6..af535993362a 100644 --- a/nixpkgs/pkgs/development/coq-modules/itauto/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/itauto/default.nix @@ -13,7 +13,7 @@ mkCoqDerivation rec { ] null; mlPlugin = true; - extraBuildInputs = (with coq.ocamlPackages; [ ocamlbuild ]); + extraNativeBuildInputs = (with coq.ocamlPackages; [ ocamlbuild ]); enableParallelBuilding = false; meta = { diff --git a/nixpkgs/pkgs/development/coq-modules/mathcomp-real-closed/default.nix b/nixpkgs/pkgs/development/coq-modules/mathcomp-real-closed/default.nix index 0f0937d1e458..0364ad09578e 100644 --- a/nixpkgs/pkgs/development/coq-modules/mathcomp-real-closed/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/mathcomp-real-closed/default.nix @@ -24,7 +24,14 @@ with lib; mkCoqDerivation { { cases = [ (isGe "8.7") "1.7.0" ]; out = "1.0.1"; } ] null; - propagatedBuildInputs = [ mathcomp.ssreflect mathcomp.field mathcomp-bigenough ]; + propagatedBuildInputs = [ + mathcomp.ssreflect + mathcomp.algebra + mathcomp.field + mathcomp.fingroup + mathcomp.solvable + mathcomp-bigenough + ]; meta = { description = "Mathematical Components Library on real closed fields"; diff --git a/nixpkgs/pkgs/development/coq-modules/mathcomp-word/default.nix b/nixpkgs/pkgs/development/coq-modules/mathcomp-word/default.nix index 67f4c4ef786d..9c74edd54712 100644 --- a/nixpkgs/pkgs/development/coq-modules/mathcomp-word/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/mathcomp-word/default.nix @@ -17,7 +17,7 @@ mkCoqDerivation { { cases = [ (range "8.12" "8.14") (isGe "1.12") ]; out = "1.0"; } ] null; - propagatedBuildInputs = [ mathcomp.algebra ]; + propagatedBuildInputs = [ mathcomp.algebra mathcomp.ssreflect mathcomp.fingroup ]; meta = { description = "Yet Another Coq Library on Machine Words"; diff --git a/nixpkgs/pkgs/development/coq-modules/mathcomp-zify/default.nix b/nixpkgs/pkgs/development/coq-modules/mathcomp-zify/default.nix index ce2bd98f3d01..2e2593669f32 100644 --- a/nixpkgs/pkgs/development/coq-modules/mathcomp-zify/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/mathcomp-zify/default.nix @@ -1,4 +1,4 @@ -{ lib, mkCoqDerivation, coq, mathcomp-algebra, version ? null }: +{ lib, mkCoqDerivation, coq, mathcomp-algebra, mathcomp-ssreflect, mathcomp-fingroup, version ? null }: with lib; mkCoqDerivation rec { namePrefix = [ "coq" "mathcomp" ]; @@ -15,7 +15,7 @@ with lib; mkCoqDerivation rec { release."1.0.0+1.12+8.13".sha256 = "1j533vx6lacr89bj1bf15l1a0s7rvrx4l00wyjv99aczkfbz6h6k"; release."1.1.0+1.12+8.13".sha256 = "1plf4v6q5j7wvmd5gsqlpiy0vwlw6hy5daq2x42gqny23w9mi2pr"; - propagatedBuildInputs = [ mathcomp-algebra ]; + propagatedBuildInputs = [ mathcomp-algebra mathcomp-ssreflect mathcomp-fingroup ]; meta = { description = "Micromega tactics for Mathematical Components"; diff --git a/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix b/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix index 5b41d62d775a..0f562fec287c 100644 --- a/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix @@ -59,10 +59,9 @@ let derivation = mkCoqDerivation ({ inherit version pname defaultVersion release releaseRev repo owner; - nativeBuildInputs = optionals withDoc [ graphviz lua ]; mlPlugin = versions.isLe "8.6" coq.coq-version; - extraBuildInputs = [ ncurses which ]; - propagatedBuildInputs = mathcomp-deps; + extraNativeBuildInputs = [ which ] ++ optionals withDoc [ graphviz lua ]; + extraBuildInputs = [ ncurses ] ++ mathcomp-deps; buildFlags = optional withDoc "doc"; diff --git a/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix b/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix index a74ee17f1c60..8144d87b9fbf 100644 --- a/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix @@ -38,7 +38,7 @@ with lib; mkCoqDerivation { ''; propagatedBuildInputs = - [ mathcomp.ssreflect mathcomp.algebra mathcomp-finmap mathcomp-bigenough ]; + [ mathcomp.ssreflect mathcomp.algebra mathcomp-finmap mathcomp.fingroup mathcomp-bigenough ]; meta = { description = "A Coq/SSReflect Library for Monoidal Rings and Multinomials"; diff --git a/nixpkgs/pkgs/development/coq-modules/odd-order/default.nix b/nixpkgs/pkgs/development/coq-modules/odd-order/default.nix index 200903406336..0d2005326c54 100644 --- a/nixpkgs/pkgs/development/coq-modules/odd-order/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/odd-order/default.nix @@ -16,7 +16,15 @@ mkCoqDerivation { { case = (range "1.10.0" "1.12.0"); out = "1.12.0"; } ] null; - propagatedBuildInputs = [ mathcomp.character ]; + propagatedBuildInputs = [ + mathcomp.character + mathcomp.ssreflect + mathcomp.fingroup + mathcomp.algebra + mathcomp.solvable + mathcomp.field + mathcomp.all + ]; meta = { description = "Formal proof of the Odd Order Theorem"; diff --git a/nixpkgs/pkgs/development/coq-modules/semantics/default.nix b/nixpkgs/pkgs/development/coq-modules/semantics/default.nix index 9b8bb10a5f26..89567d401b22 100644 --- a/nixpkgs/pkgs/development/coq-modules/semantics/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/semantics/default.nix @@ -24,7 +24,8 @@ mkCoqDerivation rec { ] null; mlPlugin = true; - extraBuildInputs = (with coq.ocamlPackages; [ num ocamlbuild ]); + extraNativeBuildInputs = (with coq.ocamlPackages; [ ocamlbuild ]); + extraBuildInputs = (with coq.ocamlPackages; [ num ]); postPatch = '' for p in Make Makefile.coq.local diff --git a/nixpkgs/pkgs/development/coq-modules/simple-io/default.nix b/nixpkgs/pkgs/development/coq-modules/simple-io/default.nix index 3631bdd54bf4..693ff2b01d6f 100644 --- a/nixpkgs/pkgs/development/coq-modules/simple-io/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/simple-io/default.nix @@ -7,7 +7,7 @@ with lib; mkCoqDerivation { inherit version; defaultVersion = if versions.range "8.7" "8.13" coq.coq-version then "1.3.0" else null; release."1.3.0".sha256 = "1yp7ca36jyl9kz35ghxig45x6cd0bny2bpmy058359p94wc617ax"; - extraBuildInputs = (with coq.ocamlPackages; [ ocaml ocamlbuild ]); + extraNativeBuildInputs = (with coq.ocamlPackages; [ ocaml ocamlbuild ]); propagatedBuildInputs = [ coq-ext-lib ]; doCheck = true; diff --git a/nixpkgs/pkgs/development/coq-modules/stdpp/default.nix b/nixpkgs/pkgs/development/coq-modules/stdpp/default.nix index 097293d58161..3f6e20c5d7dd 100644 --- a/nixpkgs/pkgs/development/coq-modules/stdpp/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/stdpp/default.nix @@ -6,10 +6,12 @@ with lib; mkCoqDerivation rec { domain = "gitlab.mpi-sws.org"; owner = "iris"; defaultVersion = with versions; switch coq.coq-version [ - { case = isEq "8.14"; out = "1.6.0"; } + { case = range "8.13" "8.15"; out = "1.7.0"; } + { case = range "8.12" "8.14"; out = "1.6.0"; } { case = range "8.11" "8.13"; out = "1.5.0"; } { case = range "8.8" "8.10"; out = "1.4.0"; } ] null; + release."1.7.0".sha256 = "sha256:0447wbzm23f9rl8byqf6vglasfn6c1wy6cxrrwagqjwsh3i5lx8y"; release."1.6.0".sha256 = "1l1w6srzydjg0h3f4krrfgvz455h56shyy2lbcnwdbzjkahibl7v"; release."1.5.0".sha256 = "1ym0fy620imah89p8b6rii8clx2vmnwcrbwxl3630h24k42092nf"; release."1.4.0".sha256 = "1m6c7ibwc99jd4cv14v3r327spnfvdf3x2mnq51f9rz99rffk68r"; diff --git a/nixpkgs/pkgs/development/embedded/platformio/core.nix b/nixpkgs/pkgs/development/embedded/platformio/core.nix index 31255aaca534..f19458fa84fb 100644 --- a/nixpkgs/pkgs/development/embedded/platformio/core.nix +++ b/nixpkgs/pkgs/development/embedded/platformio/core.nix @@ -9,54 +9,32 @@ let python = python3.override { packageOverrides = self: super: { - aiofiles = super.aiofiles.overridePythonAttrs (oldAttrs: rec { - version = "0.8.0"; - src = fetchFromGitHub { - owner = "Tinche"; - repo = "aiofiles"; - rev = "v${version}"; - sha256 = "0mr9pzji4vqyf2yzh8yxz5q7fm8mgmkimx1xh49wh625m72pxcap"; - }; - }); - - asgiref = super.asgiref.overridePythonAttrs (oldAttrs: rec { - version = "3.4.1"; - src = fetchFromGitHub { - owner = "django"; - repo = "asgiref"; - rev = version; - sha256 = "0440321alpqb1cdsmfzmiiy8rpq0ic0wvraalzk39cgrl7mghw39"; - }; - }); - - click = super.click.overridePythonAttrs (oldAttrs: rec { - version = "8.0.3"; - src = fetchFromGitHub { - owner = "pallets"; - repo = "click"; - rev = version; - sha256 = "0pxvxgfhqjgsjbgfnilqjki1l24r0rdfd98cl77i71yqdd2f497g"; + semantic-version = super.semantic-version.overridePythonAttrs (oldAttrs: rec { + version = "2.9.0"; + src = fetchPypi { + pname = "semantic_version"; + version = version; + sha256 = "1chjd8019wnwb5mnd4x4jw9f8nhzg0xnapsdznk0fpiyamrlixdb"; }; }); starlette = super.starlette.overridePythonAttrs (oldAttrs: rec { - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "encode"; repo = "starlette"; rev = version; - sha256 = "1g76qpvqzivmwll5ir4bf45jx5kilnkadvy6b7qjisvr402i3qmw"; + sha256 = "1dpj33cggjjvpd3qdf6hv04z5ckcn9f5dfn98p5a8hx262kgsr9p"; }; - disabledTestPaths = []; }); uvicorn = super.uvicorn.overridePythonAttrs (oldAttrs: rec { - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "encode"; repo = "uvicorn"; rev = version; - sha256 = "14jih6j4q2qp5c9rgl798i5p51b4y6zkkj434q2l1naw0csphk4s"; + sha256 = "142x8skb1yfys6gndfaay2r240j56dkr006p49pw4y9i0v85kynp"; }; }); }; @@ -80,6 +58,7 @@ with python.pkgs; buildPythonApplication rec { pyserial requests semantic-version + spdx-license-list-data.json starlette tabulate uvicorn @@ -171,7 +150,7 @@ with python.pkgs; buildPythonApplication rec { postPatch = '' substitute platformio/package/manifest/schema.py platformio/package/manifest/schema.py \ - --subst-var-by SPDX_LICENSE_LIST_DATA '${spdx-license-list-data}' + --subst-var-by SPDX_LICENSE_LIST_DATA '${spdx-license-list-data.json}' substituteInPlace setup.py \ --replace "zeroconf==0.37.*" "zeroconf" @@ -180,7 +159,7 @@ with python.pkgs; buildPythonApplication rec { meta = with lib; { broken = stdenv.isAarch64; description = "An open source ecosystem for IoT development"; - homepage = "http://platformio.org"; + homepage = "https://platformio.org"; license = licenses.asl20; maintainers = with maintainers; [ mog makefu ]; }; diff --git a/nixpkgs/pkgs/development/embedded/platformio/default.nix b/nixpkgs/pkgs/development/embedded/platformio/default.nix index 5bbc54916369..31b7b8d49518 100644 --- a/nixpkgs/pkgs/development/embedded/platformio/default.nix +++ b/nixpkgs/pkgs/development/embedded/platformio/default.nix @@ -4,14 +4,14 @@ let callPackage = newScope self; - version = "5.2.4"; + version = "5.2.5"; # pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964 src = fetchFromGitHub { owner = "platformio"; repo = "platformio-core"; rev = "v${version}"; - sha256 = "1dhyxrdxrca669qm6alxxn2jmvcwlpqrx9kfwh4iqy9za5717ag9"; + sha256 = "1x1jqprwzpb09ca953rqbh2jvizh7bz8yj30krphb6007bnjilwy"; }; self = { diff --git a/nixpkgs/pkgs/development/embedded/platformio/fix-searchpath.patch b/nixpkgs/pkgs/development/embedded/platformio/fix-searchpath.patch index 46e84d15a82f..fe7f9f127a7a 100644 --- a/nixpkgs/pkgs/development/embedded/platformio/fix-searchpath.patch +++ b/nixpkgs/pkgs/development/embedded/platformio/fix-searchpath.patch @@ -2,7 +2,7 @@ diff --git a/platformio/proc.py b/platformio/proc.py index 80e50201..15cee5a5 100644 --- a/platformio/proc.py +++ b/platformio/proc.py -@@ -167,7 +167,7 @@ def copy_pythonpath_to_osenv(): +@@ -181,7 +181,7 @@ def copy_pythonpath_to_osenv(): conditions.append(isdir(join(p, "click")) or isdir(join(p, "platformio"))) if all(conditions): _PYTHONPATH.append(p) diff --git a/nixpkgs/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch b/nixpkgs/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch index b56018902858..342fb120a0f7 100644 --- a/nixpkgs/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch +++ b/nixpkgs/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch @@ -6,7 +6,7 @@ index 416dccfd..896c3649 100644 @staticmethod @memoized(expire="1h") def load_spdx_licenses(): -- version = "3.15" +- version = "3.16" - spdx_data_url = ( - "https://raw.githubusercontent.com/spdx/license-list-data/" - "v%s/json/licenses.json" % version diff --git a/nixpkgs/pkgs/development/embedded/stm32/stm32cubemx/default.nix b/nixpkgs/pkgs/development/embedded/stm32/stm32cubemx/default.nix index 9652a95ee27f..7c0b1802bacd 100644 --- a/nixpkgs/pkgs/development/embedded/stm32/stm32cubemx/default.nix +++ b/nixpkgs/pkgs/development/embedded/stm32/stm32cubemx/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { name = "stm32CubeMX"; exec = "stm32cubemx"; desktopName = "STM32CubeMX"; - categories = "Development;"; + categories = [ "Development" ]; comment = "STM32Cube initialization code generator"; icon = "stm32cubemx"; }) diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 6d217a6d1385..b3cac2e3973e 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -5199,7 +5199,6 @@ broken-packages: - unfix-binders - unfoldable - unicode-prelude - - unicode-show - unicode-symbols - unicode-tricks - uniform-fileio diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix index 032b2577c515..c8893a751fd1 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix @@ -700,11 +700,6 @@ self: super: builtins.intersectAttrs super { testToolDepends = [ pkgs.git pkgs.mercurial ] ++ drv.testToolDepends or []; }) super.retrie_1_2_0_0; - nix-output-monitor = overrideCabal { - # Can't ran the golden-tests with nix, because they call nix - testTarget = "unit-tests"; - } super.nix-output-monitor; - haskell-language-server = overrideCabal (drv: { # starting with 1.6.1.1 haskell-language-server wants to be linked dynamically # by default. Unless we reflect this in the generic builder, GHC is going to diff --git a/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix index f6db635805b5..2e08662a9de5 100644 --- a/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -286292,8 +286292,6 @@ self: { testHaskellDepends = [ base hspec QuickCheck ]; description = "print and show in unicode"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "unicode-symbols" = callPackage diff --git a/nixpkgs/pkgs/development/haskell-modules/make-package-set.nix b/nixpkgs/pkgs/development/haskell-modules/make-package-set.nix index e9ce4f127051..86f29e731133 100644 --- a/nixpkgs/pkgs/development/haskell-modules/make-package-set.nix +++ b/nixpkgs/pkgs/development/haskell-modules/make-package-set.nix @@ -124,20 +124,17 @@ let haskellSrc2nix = { name, src, sha256 ? null, extraCabal2nixOptions ? "" }: let sha256Arg = if sha256 == null then "--sha256=" else ''--sha256="${sha256}"''; - in buildPackages.stdenv.mkDerivation { - name = "cabal2nix-${name}"; + in buildPackages.runCommand "cabal2nix-${name}" { nativeBuildInputs = [ buildPackages.cabal2nix-unwrapped ]; preferLocalBuild = true; allowSubstitutes = false; - phases = ["installPhase"]; LANG = "en_US.UTF-8"; LOCALE_ARCHIVE = pkgs.lib.optionalString (buildPlatform.libc == "glibc") "${buildPackages.glibcLocales}/lib/locale/locale-archive"; - installPhase = '' - export HOME="$TMP" - mkdir -p "$out" - cabal2nix --compiler=${self.ghc.haskellCompilerName} --system=${hostPlatform.config} ${sha256Arg} "${src}" ${extraCabal2nixOptions} > "$out/default.nix" - ''; - }; + } '' + export HOME="$TMP" + mkdir -p "$out" + cabal2nix --compiler=${self.ghc.haskellCompilerName} --system=${hostPlatform.config} ${sha256Arg} "${src}" ${extraCabal2nixOptions} > "$out/default.nix" + ''; all-cabal-hashes-component = name: version: buildPackages.runCommand "all-cabal-hashes-component-${name}-${version}" {} '' tar --wildcards -xzvf ${all-cabal-hashes} \*/${name}/${version}/${name}.{json,cabal} diff --git a/nixpkgs/pkgs/development/idris-modules/array.nix b/nixpkgs/pkgs/development/idris-modules/array.nix index faed6443c48c..ef8159e9a873 100644 --- a/nixpkgs/pkgs/development/idris-modules/array.nix +++ b/nixpkgs/pkgs/development/idris-modules/array.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "array"; + pname = "array"; version = "2016-10-14"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/idris-modules/bi.nix b/nixpkgs/pkgs/development/idris-modules/bi.nix index 51f6497e1821..ec1f9a13bcdd 100644 --- a/nixpkgs/pkgs/development/idris-modules/bi.nix +++ b/nixpkgs/pkgs/development/idris-modules/bi.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "bi"; + pname = "bi"; version = "2018-06-25"; ipkgName = "Bi"; diff --git a/nixpkgs/pkgs/development/idris-modules/bifunctors.nix b/nixpkgs/pkgs/development/idris-modules/bifunctors.nix index 15c7a6dd013f..3461bb37fddb 100644 --- a/nixpkgs/pkgs/development/idris-modules/bifunctors.nix +++ b/nixpkgs/pkgs/development/idris-modules/bifunctors.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "bifunctors"; + pname = "bifunctors"; version = "2017-02-07"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/idris-modules/build-builtin-package.nix b/nixpkgs/pkgs/development/idris-modules/build-builtin-package.nix index ff19e52135c8..fe23728e0848 100644 --- a/nixpkgs/pkgs/development/idris-modules/build-builtin-package.nix +++ b/nixpkgs/pkgs/development/idris-modules/build-builtin-package.nix @@ -1,13 +1,13 @@ # Build one of the packages that comes with idris -# name: The name of the package +# pname: The pname of the package # deps: The dependencies of the package -{ idris, build-idris-package }: name: deps: +{ idris, build-idris-package }: pname: deps: let inherit (builtins.parseDrvName idris.name) version; in build-idris-package { - inherit name version; + inherit pname version; inherit (idris) src; noPrelude = true; @@ -16,10 +16,10 @@ build-idris-package { idrisDeps = deps; postUnpack = '' - sourceRoot=$sourceRoot/libs/${name} + sourceRoot=$sourceRoot/libs/${pname} ''; meta = idris.meta // { - description = "${name} builtin Idris library"; + description = "${pname} builtin Idris library"; }; } diff --git a/nixpkgs/pkgs/development/idris-modules/build-idris-package.nix b/nixpkgs/pkgs/development/idris-modules/build-idris-package.nix index 7869c2706999..b21826eac384 100644 --- a/nixpkgs/pkgs/development/idris-modules/build-idris-package.nix +++ b/nixpkgs/pkgs/development/idris-modules/build-idris-package.nix @@ -3,9 +3,9 @@ { idrisDeps ? [] , noPrelude ? false , noBase ? false - , name + , pname , version - , ipkgName ? name + , ipkgName ? pname , extraBuildInputs ? [] , idrisBuildOptions ? [] , idrisTestOptions ? [] @@ -20,7 +20,7 @@ let idris-with-packages = with-packages allIdrisDeps; newAttrs = builtins.removeAttrs attrs [ "idrisDeps" "noPrelude" "noBase" - "name" "version" "ipkgName" "extraBuildInputs" + "pname" "version" "ipkgName" "extraBuildInputs" ] // { meta = attrs.meta // { platforms = attrs.meta.platforms or idris.meta.platforms; @@ -28,7 +28,8 @@ let }; in stdenv.mkDerivation ({ - name = "idris-${name}-${version}"; + pname = "idris-${pname}"; + inherit version; buildInputs = [ idris-with-packages gmp ] ++ extraBuildInputs; propagatedBuildInputs = allIdrisDeps; diff --git a/nixpkgs/pkgs/development/idris-modules/bytes.nix b/nixpkgs/pkgs/development/idris-modules/bytes.nix index eaff512d5d39..0fd9b05f88d4 100644 --- a/nixpkgs/pkgs/development/idris-modules/bytes.nix +++ b/nixpkgs/pkgs/development/idris-modules/bytes.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "bytes"; + pname = "bytes"; version = "2018-02-10"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/idris-modules/canvas.nix b/nixpkgs/pkgs/development/idris-modules/canvas.nix index 77851c87179b..3c74879eab6c 100644 --- a/nixpkgs/pkgs/development/idris-modules/canvas.nix +++ b/nixpkgs/pkgs/development/idris-modules/canvas.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "canvas"; + pname = "canvas"; version = "2017-11-09"; ipkgName = "idriscanvas"; diff --git a/nixpkgs/pkgs/development/idris-modules/categories.nix b/nixpkgs/pkgs/development/idris-modules/categories.nix index adbe6d4f8ad4..0c64218bcd82 100644 --- a/nixpkgs/pkgs/development/idris-modules/categories.nix +++ b/nixpkgs/pkgs/development/idris-modules/categories.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "categories"; + pname = "categories"; version = "2018-07-02"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/idris-modules/coda.nix b/nixpkgs/pkgs/development/idris-modules/coda.nix index ecd7af443689..d1529ceb994e 100644 --- a/nixpkgs/pkgs/development/idris-modules/coda.nix +++ b/nixpkgs/pkgs/development/idris-modules/coda.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "coda"; + pname = "coda"; version = "2018-01-25"; ipkgName = "Coda"; diff --git a/nixpkgs/pkgs/development/idris-modules/comonad.nix b/nixpkgs/pkgs/development/idris-modules/comonad.nix index 31fd8dbc9aa8..d7bf499ea22d 100644 --- a/nixpkgs/pkgs/development/idris-modules/comonad.nix +++ b/nixpkgs/pkgs/development/idris-modules/comonad.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "comonad"; + pname = "comonad"; version = "2018-02-26"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/idris-modules/composition.nix b/nixpkgs/pkgs/development/idris-modules/composition.nix index 5d6d2f891a63..831a1f32655c 100644 --- a/nixpkgs/pkgs/development/idris-modules/composition.nix +++ b/nixpkgs/pkgs/development/idris-modules/composition.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "composition"; + pname = "composition"; version = "2017-11-12"; idrisDeps = [ hezarfen ]; diff --git a/nixpkgs/pkgs/development/idris-modules/config.nix b/nixpkgs/pkgs/development/idris-modules/config.nix index 3771313d1784..49c6efdd737e 100644 --- a/nixpkgs/pkgs/development/idris-modules/config.nix +++ b/nixpkgs/pkgs/development/idris-modules/config.nix @@ -7,7 +7,7 @@ , lib }: build-idris-package { - name = "config"; + pname = "config"; version = "2017-11-06"; idrisDeps = [ effects containers lightyear test ]; diff --git a/nixpkgs/pkgs/development/idris-modules/console.nix b/nixpkgs/pkgs/development/idris-modules/console.nix index e60ac20f4d40..30cefa45810d 100644 --- a/nixpkgs/pkgs/development/idris-modules/console.nix +++ b/nixpkgs/pkgs/development/idris-modules/console.nix @@ -6,7 +6,7 @@ , lib }: build-idris-package { - name = "console"; + pname = "console"; version = "2017-04-20"; idrisDeps = [ idrisscript hrtime webgl ]; diff --git a/nixpkgs/pkgs/development/idris-modules/containers.nix b/nixpkgs/pkgs/development/idris-modules/containers.nix index e98285ca9306..dfe85aa7b8af 100644 --- a/nixpkgs/pkgs/development/idris-modules/containers.nix +++ b/nixpkgs/pkgs/development/idris-modules/containers.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "containers"; + pname = "containers"; version = "2017-09-10"; idrisDeps = [ effects test ]; diff --git a/nixpkgs/pkgs/development/idris-modules/cube.nix b/nixpkgs/pkgs/development/idris-modules/cube.nix index 8a0f66829d85..eac71fb8797c 100644 --- a/nixpkgs/pkgs/development/idris-modules/cube.nix +++ b/nixpkgs/pkgs/development/idris-modules/cube.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "cube"; + pname = "cube"; version = "2017-07-05"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/idris-modules/derive.nix b/nixpkgs/pkgs/development/idris-modules/derive.nix index 7ab87d71d063..1ceca662e8a3 100644 --- a/nixpkgs/pkgs/development/idris-modules/derive.nix +++ b/nixpkgs/pkgs/development/idris-modules/derive.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "derive"; + pname = "derive"; version = "2018-07-02"; idrisDeps = [ contrib pruviloj ]; diff --git a/nixpkgs/pkgs/development/idris-modules/descncrunch.nix b/nixpkgs/pkgs/development/idris-modules/descncrunch.nix index 95f49a524bc0..3c82e23ec7ec 100644 --- a/nixpkgs/pkgs/development/idris-modules/descncrunch.nix +++ b/nixpkgs/pkgs/development/idris-modules/descncrunch.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "descncrunch"; + pname = "descncrunch"; version = "2017-11-15"; idrisDeps = [ pruviloj ]; diff --git a/nixpkgs/pkgs/development/idris-modules/dict.nix b/nixpkgs/pkgs/development/idris-modules/dict.nix index 24cc7c0359d1..3aa15287bd8d 100644 --- a/nixpkgs/pkgs/development/idris-modules/dict.nix +++ b/nixpkgs/pkgs/development/idris-modules/dict.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "dict"; + pname = "dict"; version = "2016-12-26"; idrisDeps = [ contrib ]; diff --git a/nixpkgs/pkgs/development/idris-modules/dom.nix b/nixpkgs/pkgs/development/idris-modules/dom.nix index f88827fb2654..2698cbab4847 100644 --- a/nixpkgs/pkgs/development/idris-modules/dom.nix +++ b/nixpkgs/pkgs/development/idris-modules/dom.nix @@ -6,7 +6,7 @@ , lib }: build-idris-package { - name = "dom"; + pname = "dom"; version = "2017-04-22"; idrisDeps = [ idrisscript html xhr ]; diff --git a/nixpkgs/pkgs/development/idris-modules/electron.nix b/nixpkgs/pkgs/development/idris-modules/electron.nix index 172f1980a90b..769b0b3fe8c0 100644 --- a/nixpkgs/pkgs/development/idris-modules/electron.nix +++ b/nixpkgs/pkgs/development/idris-modules/electron.nix @@ -6,7 +6,7 @@ , lib }: build-idris-package { - name = "electron"; + pname = "electron"; version = "2016-03-07"; idrisDeps = [ contrib jheiling-extras jheiling-js ]; diff --git a/nixpkgs/pkgs/development/idris-modules/eternal.nix b/nixpkgs/pkgs/development/idris-modules/eternal.nix index 673df485a380..9ca38907fe74 100644 --- a/nixpkgs/pkgs/development/idris-modules/eternal.nix +++ b/nixpkgs/pkgs/development/idris-modules/eternal.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "eternal"; + pname = "eternal"; version = "2018-07-02"; idrisDeps = [ effects ]; diff --git a/nixpkgs/pkgs/development/idris-modules/farrp.nix b/nixpkgs/pkgs/development/idris-modules/farrp.nix index 88f852ba20c0..4326aeeadb6a 100644 --- a/nixpkgs/pkgs/development/idris-modules/farrp.nix +++ b/nixpkgs/pkgs/development/idris-modules/farrp.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "farrp"; + pname = "farrp"; version = "2018-02-13"; idrisDeps = [ effects ]; diff --git a/nixpkgs/pkgs/development/idris-modules/free.nix b/nixpkgs/pkgs/development/idris-modules/free.nix index 6f7a5f56d4f9..557dc30ff96a 100644 --- a/nixpkgs/pkgs/development/idris-modules/free.nix +++ b/nixpkgs/pkgs/development/idris-modules/free.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "free"; + pname = "free"; version = "2017-07-03"; ipkgName = "idris-free"; diff --git a/nixpkgs/pkgs/development/idris-modules/fsm.nix b/nixpkgs/pkgs/development/idris-modules/fsm.nix index 5da5f01da348..1342e90f29bb 100644 --- a/nixpkgs/pkgs/development/idris-modules/fsm.nix +++ b/nixpkgs/pkgs/development/idris-modules/fsm.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "fsm"; + pname = "fsm"; version = "2017-04-16"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/idris-modules/glfw.nix b/nixpkgs/pkgs/development/idris-modules/glfw.nix index c63cf8acb0f3..f67b65bb71f7 100644 --- a/nixpkgs/pkgs/development/idris-modules/glfw.nix +++ b/nixpkgs/pkgs/development/idris-modules/glfw.nix @@ -5,7 +5,7 @@ , pkgs }: build-idris-package { - name = "glfw"; + pname = "glfw"; version = "2016-12-05"; idrisDeps = [ effects ]; diff --git a/nixpkgs/pkgs/development/idris-modules/graphviz.nix b/nixpkgs/pkgs/development/idris-modules/graphviz.nix index 650f0e0b99bc..28ab24a2ada6 100644 --- a/nixpkgs/pkgs/development/idris-modules/graphviz.nix +++ b/nixpkgs/pkgs/development/idris-modules/graphviz.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "graphviz"; + pname = "graphviz"; version = "2017-01-16"; idrisDeps = [ lightyear ]; diff --git a/nixpkgs/pkgs/development/idris-modules/hamt.nix b/nixpkgs/pkgs/development/idris-modules/hamt.nix index 3c6868fcc592..97a72e8c9059 100644 --- a/nixpkgs/pkgs/development/idris-modules/hamt.nix +++ b/nixpkgs/pkgs/development/idris-modules/hamt.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "hamt"; + pname = "hamt"; version = "2016-11-15"; idrisDeps = [ contrib effects ]; diff --git a/nixpkgs/pkgs/development/idris-modules/hezarfen.nix b/nixpkgs/pkgs/development/idris-modules/hezarfen.nix index acbc2770ea52..881b65b2b8b4 100644 --- a/nixpkgs/pkgs/development/idris-modules/hezarfen.nix +++ b/nixpkgs/pkgs/development/idris-modules/hezarfen.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "hezarfen"; + pname = "hezarfen"; version = "2018-02-03"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/idris-modules/hrtime.nix b/nixpkgs/pkgs/development/idris-modules/hrtime.nix index 7f4d0769cc41..3d1c0f4abf91 100644 --- a/nixpkgs/pkgs/development/idris-modules/hrtime.nix +++ b/nixpkgs/pkgs/development/idris-modules/hrtime.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "hrtime"; + pname = "hrtime"; version = "2017-04-16"; ipkgName = "hrTime"; diff --git a/nixpkgs/pkgs/development/idris-modules/html.nix b/nixpkgs/pkgs/development/idris-modules/html.nix index 2ab7534936aa..8eb2f7f12d75 100644 --- a/nixpkgs/pkgs/development/idris-modules/html.nix +++ b/nixpkgs/pkgs/development/idris-modules/html.nix @@ -6,7 +6,7 @@ , lib }: build-idris-package { - name = "html"; + pname = "html"; version = "2017-04-23"; idrisDeps = [ idrisscript hrtime webgl ]; diff --git a/nixpkgs/pkgs/development/idris-modules/http.nix b/nixpkgs/pkgs/development/idris-modules/http.nix index 45e505be056b..d952dca54a3d 100644 --- a/nixpkgs/pkgs/development/idris-modules/http.nix +++ b/nixpkgs/pkgs/development/idris-modules/http.nix @@ -6,7 +6,7 @@ , lib }: build-idris-package { - name = "http"; + pname = "http"; version = "2018-02-25"; idrisDeps = [ contrib lightyear bytes ]; diff --git a/nixpkgs/pkgs/development/idris-modules/http4idris.nix b/nixpkgs/pkgs/development/idris-modules/http4idris.nix index 11e9d62c051e..6959e33f48a8 100644 --- a/nixpkgs/pkgs/development/idris-modules/http4idris.nix +++ b/nixpkgs/pkgs/development/idris-modules/http4idris.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "http4idris"; + pname = "http4idris"; version = "2018-01-16"; idrisDeps = [ contrib ]; diff --git a/nixpkgs/pkgs/development/idris-modules/iaia.nix b/nixpkgs/pkgs/development/idris-modules/iaia.nix index 865d533750f9..1c631280eac9 100644 --- a/nixpkgs/pkgs/development/idris-modules/iaia.nix +++ b/nixpkgs/pkgs/development/idris-modules/iaia.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "iaia"; + pname = "iaia"; version = "2017-11-10"; idrisDeps = [ contrib ]; diff --git a/nixpkgs/pkgs/development/idris-modules/idrishighlighter.nix b/nixpkgs/pkgs/development/idris-modules/idrishighlighter.nix index 6b1ae30ad403..759ea354747f 100644 --- a/nixpkgs/pkgs/development/idris-modules/idrishighlighter.nix +++ b/nixpkgs/pkgs/development/idris-modules/idrishighlighter.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "idrishighlighter"; + pname = "idrishighlighter"; version = "2018-02-22"; ipkgName = "idris-code-highlighter"; diff --git a/nixpkgs/pkgs/development/idris-modules/idrisscript.nix b/nixpkgs/pkgs/development/idris-modules/idrisscript.nix index 805facda84c6..2a2693c623e0 100644 --- a/nixpkgs/pkgs/development/idris-modules/idrisscript.nix +++ b/nixpkgs/pkgs/development/idris-modules/idrisscript.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "idrisscript"; + pname = "idrisscript"; version = "2017-07-01"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/idris-modules/ipkgparser.nix b/nixpkgs/pkgs/development/idris-modules/ipkgparser.nix index 6bdcd9e9f557..4cd966d8b851 100644 --- a/nixpkgs/pkgs/development/idris-modules/ipkgparser.nix +++ b/nixpkgs/pkgs/development/idris-modules/ipkgparser.nix @@ -6,7 +6,7 @@ , lib }: build-idris-package { - name = "ipkgparser"; + pname = "ipkgparser"; version = "2017-11-14"; idrisDeps = [ contrib effects lightyear ]; diff --git a/nixpkgs/pkgs/development/idris-modules/jheiling-extras.nix b/nixpkgs/pkgs/development/idris-modules/jheiling-extras.nix index ae933b264ae4..da84ea268009 100644 --- a/nixpkgs/pkgs/development/idris-modules/jheiling-extras.nix +++ b/nixpkgs/pkgs/development/idris-modules/jheiling-extras.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "extras"; + pname = "extras"; version = "2018-03-06"; idrisDeps = [ contrib ]; diff --git a/nixpkgs/pkgs/development/idris-modules/jheiling-js.nix b/nixpkgs/pkgs/development/idris-modules/jheiling-js.nix index b192e8ff1c0b..425acceb4e6c 100644 --- a/nixpkgs/pkgs/development/idris-modules/jheiling-js.nix +++ b/nixpkgs/pkgs/development/idris-modules/jheiling-js.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "jheiling-js"; + pname = "jheiling-js"; version = "2016-03-09"; ipkgName = "js"; diff --git a/nixpkgs/pkgs/development/idris-modules/js.nix b/nixpkgs/pkgs/development/idris-modules/js.nix index 61ce415e6056..4b96ca1a4862 100644 --- a/nixpkgs/pkgs/development/idris-modules/js.nix +++ b/nixpkgs/pkgs/development/idris-modules/js.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "js"; + pname = "js"; version = "2018-11-27"; idrisDeps = [ contrib pruviloj ]; diff --git a/nixpkgs/pkgs/development/idris-modules/lens.nix b/nixpkgs/pkgs/development/idris-modules/lens.nix index e829309fbc01..c9a8c2aa257d 100644 --- a/nixpkgs/pkgs/development/idris-modules/lens.nix +++ b/nixpkgs/pkgs/development/idris-modules/lens.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "lens"; + pname = "lens"; version = "2017-09-25"; idrisDeps = [ bifunctors ]; diff --git a/nixpkgs/pkgs/development/idris-modules/lightyear.nix b/nixpkgs/pkgs/development/idris-modules/lightyear.nix index 34c19eea4ac4..e8f94a82d2f1 100644 --- a/nixpkgs/pkgs/development/idris-modules/lightyear.nix +++ b/nixpkgs/pkgs/development/idris-modules/lightyear.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "lightyear"; + pname = "lightyear"; version = "2017-09-10"; idrisDeps = [ effects ]; diff --git a/nixpkgs/pkgs/development/idris-modules/logic.nix b/nixpkgs/pkgs/development/idris-modules/logic.nix index 35670462dcf3..f20d16e9a190 100644 --- a/nixpkgs/pkgs/development/idris-modules/logic.nix +++ b/nixpkgs/pkgs/development/idris-modules/logic.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "logic"; + pname = "logic"; version = "2016-12-02"; idrisDeps = [ bifunctors ]; diff --git a/nixpkgs/pkgs/development/idris-modules/mapping.nix b/nixpkgs/pkgs/development/idris-modules/mapping.nix index 6f978fccd5e0..fbfb34ddbf9d 100644 --- a/nixpkgs/pkgs/development/idris-modules/mapping.nix +++ b/nixpkgs/pkgs/development/idris-modules/mapping.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "mapping"; + pname = "mapping"; version = "2018-02-27"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/idris-modules/mhd.nix b/nixpkgs/pkgs/development/idris-modules/mhd.nix index 1ef304bbf1c8..dc3a05f2b5a1 100644 --- a/nixpkgs/pkgs/development/idris-modules/mhd.nix +++ b/nixpkgs/pkgs/development/idris-modules/mhd.nix @@ -6,7 +6,7 @@ , lib }: build-idris-package { - name = "mhd"; + pname = "mhd"; version = "2016-04-22"; ipkgName = "MHD"; diff --git a/nixpkgs/pkgs/development/idris-modules/pacman.nix b/nixpkgs/pkgs/development/idris-modules/pacman.nix index cda3662dce27..dbc3c9ced72d 100644 --- a/nixpkgs/pkgs/development/idris-modules/pacman.nix +++ b/nixpkgs/pkgs/development/idris-modules/pacman.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "pacman"; + pname = "pacman"; version = "2017-11-10"; idrisDeps = [ contrib sdl2 ]; diff --git a/nixpkgs/pkgs/development/idris-modules/patricia.nix b/nixpkgs/pkgs/development/idris-modules/patricia.nix index 586c33837d65..a5cb0c6af00e 100644 --- a/nixpkgs/pkgs/development/idris-modules/patricia.nix +++ b/nixpkgs/pkgs/development/idris-modules/patricia.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "patricia"; + pname = "patricia"; version = "2017-10-27"; idrisDeps = [ specdris ]; diff --git a/nixpkgs/pkgs/development/idris-modules/permutations.nix b/nixpkgs/pkgs/development/idris-modules/permutations.nix index b11bce39e1ee..6f4e299d223b 100644 --- a/nixpkgs/pkgs/development/idris-modules/permutations.nix +++ b/nixpkgs/pkgs/development/idris-modules/permutations.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "permutations"; + pname = "permutations"; version = "2018-01-19"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/idris-modules/pfds.nix b/nixpkgs/pkgs/development/idris-modules/pfds.nix index d82ec4901856..db3004a72be0 100644 --- a/nixpkgs/pkgs/development/idris-modules/pfds.nix +++ b/nixpkgs/pkgs/development/idris-modules/pfds.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "pfds"; + pname = "pfds"; version = "2017-09-25"; idrisDeps = [ contrib ]; diff --git a/nixpkgs/pkgs/development/idris-modules/pipes.nix b/nixpkgs/pkgs/development/idris-modules/pipes.nix index 69b8d721705a..1402a2facee1 100644 --- a/nixpkgs/pkgs/development/idris-modules/pipes.nix +++ b/nixpkgs/pkgs/development/idris-modules/pipes.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "pipes"; + pname = "pipes"; version = "2017-12-02"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/idris-modules/posix.nix b/nixpkgs/pkgs/development/idris-modules/posix.nix index 30bff9eb7e7a..13588155989a 100644 --- a/nixpkgs/pkgs/development/idris-modules/posix.nix +++ b/nixpkgs/pkgs/development/idris-modules/posix.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "posix"; + pname = "posix"; version = "2017-11-18"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/idris-modules/quantities.nix b/nixpkgs/pkgs/development/idris-modules/quantities.nix index 8141465d751b..76242c5d2299 100644 --- a/nixpkgs/pkgs/development/idris-modules/quantities.nix +++ b/nixpkgs/pkgs/development/idris-modules/quantities.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "quantities"; + pname = "quantities"; version = "2018-04-17"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/idris-modules/rationals.nix b/nixpkgs/pkgs/development/idris-modules/rationals.nix index 91aa294d1c55..9513b79e1aa7 100644 --- a/nixpkgs/pkgs/development/idris-modules/rationals.nix +++ b/nixpkgs/pkgs/development/idris-modules/rationals.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "rationals"; + pname = "rationals"; version = "2017-04-29"; idrisDeps = [ contrib ]; diff --git a/nixpkgs/pkgs/development/idris-modules/recursion_schemes.nix b/nixpkgs/pkgs/development/idris-modules/recursion_schemes.nix index b326113c6351..3e9510563eee 100644 --- a/nixpkgs/pkgs/development/idris-modules/recursion_schemes.nix +++ b/nixpkgs/pkgs/development/idris-modules/recursion_schemes.nix @@ -8,7 +8,7 @@ , lib }: build-idris-package { - name = "recursion_schemes"; + pname = "recursion_schemes"; version = "2018-01-19"; idrisDeps = [ free composition comonad bifunctors hezarfen ]; diff --git a/nixpkgs/pkgs/development/idris-modules/refined.nix b/nixpkgs/pkgs/development/idris-modules/refined.nix index 11fd6b782818..c841f633b41f 100644 --- a/nixpkgs/pkgs/development/idris-modules/refined.nix +++ b/nixpkgs/pkgs/development/idris-modules/refined.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "refined"; + pname = "refined"; version = "2017-12-28"; ipkgName = "idris-refined"; diff --git a/nixpkgs/pkgs/development/idris-modules/sdl.nix b/nixpkgs/pkgs/development/idris-modules/sdl.nix index 105cfdce65b7..59e3ac916e4f 100644 --- a/nixpkgs/pkgs/development/idris-modules/sdl.nix +++ b/nixpkgs/pkgs/development/idris-modules/sdl.nix @@ -6,7 +6,7 @@ , SDL_gfx }: build-idris-package { - name = "sdl"; + pname = "sdl"; version = "2017-03-24"; idrisDeps = [ effects ]; diff --git a/nixpkgs/pkgs/development/idris-modules/sdl2.nix b/nixpkgs/pkgs/development/idris-modules/sdl2.nix index 2e06b0368255..36eb7395dde1 100644 --- a/nixpkgs/pkgs/development/idris-modules/sdl2.nix +++ b/nixpkgs/pkgs/development/idris-modules/sdl2.nix @@ -7,7 +7,7 @@ , SDL2_gfx }: build-idris-package rec { - name = "sdl2"; + pname = "sdl2"; version = "0.1.1"; idrisDeps = [ effects ]; diff --git a/nixpkgs/pkgs/development/idris-modules/semidirect.nix b/nixpkgs/pkgs/development/idris-modules/semidirect.nix index 30cc144003ee..e3ca18fd2a26 100644 --- a/nixpkgs/pkgs/development/idris-modules/semidirect.nix +++ b/nixpkgs/pkgs/development/idris-modules/semidirect.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "semidirect"; + pname = "semidirect"; version = "2018-07-02"; idrisDeps = [ contrib patricia ]; diff --git a/nixpkgs/pkgs/development/idris-modules/setoids.nix b/nixpkgs/pkgs/development/idris-modules/setoids.nix index aa66d8475959..49e7bc5e8a0e 100644 --- a/nixpkgs/pkgs/development/idris-modules/setoids.nix +++ b/nixpkgs/pkgs/development/idris-modules/setoids.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "setoids"; + pname = "setoids"; version = "2018-06-18"; idrisDeps = [ contrib ]; diff --git a/nixpkgs/pkgs/development/idris-modules/smproc.nix b/nixpkgs/pkgs/development/idris-modules/smproc.nix index 4917f7628555..b3780c9af3b8 100644 --- a/nixpkgs/pkgs/development/idris-modules/smproc.nix +++ b/nixpkgs/pkgs/development/idris-modules/smproc.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "smproc"; + pname = "smproc"; version = "2018-02-08"; idrisDeps = [ contrib ]; diff --git a/nixpkgs/pkgs/development/idris-modules/snippets.nix b/nixpkgs/pkgs/development/idris-modules/snippets.nix index 2d5473545c54..fa4f3226dcca 100644 --- a/nixpkgs/pkgs/development/idris-modules/snippets.nix +++ b/nixpkgs/pkgs/development/idris-modules/snippets.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "snippets"; + pname = "snippets"; version = "2018-03-17"; ipkgName = "idris-snippets"; diff --git a/nixpkgs/pkgs/development/idris-modules/software_foundations.nix b/nixpkgs/pkgs/development/idris-modules/software_foundations.nix index 0f45da3ed67b..cbbf959576f3 100644 --- a/nixpkgs/pkgs/development/idris-modules/software_foundations.nix +++ b/nixpkgs/pkgs/development/idris-modules/software_foundations.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "software_foundations"; + pname = "software_foundations"; version = "2017-11-04"; idrisDeps = [ pruviloj ]; diff --git a/nixpkgs/pkgs/development/idris-modules/specdris.nix b/nixpkgs/pkgs/development/idris-modules/specdris.nix index b20902d74328..172a46b65a55 100644 --- a/nixpkgs/pkgs/development/idris-modules/specdris.nix +++ b/nixpkgs/pkgs/development/idris-modules/specdris.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "specdris"; + pname = "specdris"; version = "2018-01-23"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/idris-modules/tap.nix b/nixpkgs/pkgs/development/idris-modules/tap.nix index 9edbbaea359c..8db71b9cb0ab 100644 --- a/nixpkgs/pkgs/development/idris-modules/tap.nix +++ b/nixpkgs/pkgs/development/idris-modules/tap.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "tap"; + pname = "tap"; version = "2017-04-08"; ipkgName = "TAP"; diff --git a/nixpkgs/pkgs/development/idris-modules/test.nix b/nixpkgs/pkgs/development/idris-modules/test.nix index 073b4e20b850..9c14422cc8d2 100644 --- a/nixpkgs/pkgs/development/idris-modules/test.nix +++ b/nixpkgs/pkgs/development/idris-modules/test.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "test"; + pname = "test"; version = "2017-03-30"; idrisDeps = [ effects ]; diff --git a/nixpkgs/pkgs/development/idris-modules/tfrandom.nix b/nixpkgs/pkgs/development/idris-modules/tfrandom.nix index 8249259075c0..b07f5253005e 100644 --- a/nixpkgs/pkgs/development/idris-modules/tfrandom.nix +++ b/nixpkgs/pkgs/development/idris-modules/tfrandom.nix @@ -4,7 +4,7 @@ }: build-idris-package { - name = "tf-random"; + pname = "tf-random"; version = "2020-01-15"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/idris-modules/tlhydra.nix b/nixpkgs/pkgs/development/idris-modules/tlhydra.nix index e2c07ac5fb71..3b33367c8890 100644 --- a/nixpkgs/pkgs/development/idris-modules/tlhydra.nix +++ b/nixpkgs/pkgs/development/idris-modules/tlhydra.nix @@ -6,7 +6,7 @@ , lib }: build-idris-package { - name = "tlhydra"; + pname = "tlhydra"; version = "2017-13-26"; idrisDeps = [ effects contrib lightyear ]; diff --git a/nixpkgs/pkgs/development/idris-modules/tomladris.nix b/nixpkgs/pkgs/development/idris-modules/tomladris.nix index 64728ab305ec..8a0e7847f507 100644 --- a/nixpkgs/pkgs/development/idris-modules/tomladris.nix +++ b/nixpkgs/pkgs/development/idris-modules/tomladris.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "tomladris"; + pname = "tomladris"; version = "2017-11-14"; idrisDeps = [ lightyear contrib ]; diff --git a/nixpkgs/pkgs/development/idris-modules/tp.nix b/nixpkgs/pkgs/development/idris-modules/tp.nix index 0cfdc78f6673..0aedc3f48596 100644 --- a/nixpkgs/pkgs/development/idris-modules/tp.nix +++ b/nixpkgs/pkgs/development/idris-modules/tp.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "tp"; + pname = "tp"; version = "2017-08-15"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/idris-modules/tparsec.nix b/nixpkgs/pkgs/development/idris-modules/tparsec.nix index ce040bebe355..ddf24f7c9d9f 100644 --- a/nixpkgs/pkgs/development/idris-modules/tparsec.nix +++ b/nixpkgs/pkgs/development/idris-modules/tparsec.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "tparsec"; + pname = "tparsec"; version = "2020-02-11"; ipkgName = "TParsec"; diff --git a/nixpkgs/pkgs/development/idris-modules/transducers.nix b/nixpkgs/pkgs/development/idris-modules/transducers.nix index 39a4cdf0cc7b..455e5c72a644 100644 --- a/nixpkgs/pkgs/development/idris-modules/transducers.nix +++ b/nixpkgs/pkgs/development/idris-modules/transducers.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "transducers"; + pname = "transducers"; version = "2017-07-28"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/idris-modules/trees.nix b/nixpkgs/pkgs/development/idris-modules/trees.nix index 8fda8d138ad1..5c6e69471c78 100644 --- a/nixpkgs/pkgs/development/idris-modules/trees.nix +++ b/nixpkgs/pkgs/development/idris-modules/trees.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "trees"; + pname = "trees"; version = "2018-03-19"; idrisDeps = [ contrib bi ]; diff --git a/nixpkgs/pkgs/development/idris-modules/union_type.nix b/nixpkgs/pkgs/development/idris-modules/union_type.nix index 2ad8f280fce5..99f160a72d86 100644 --- a/nixpkgs/pkgs/development/idris-modules/union_type.nix +++ b/nixpkgs/pkgs/development/idris-modules/union_type.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "union_type"; + pname = "union_type"; version = "2018-01-30"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/idris-modules/vdom.nix b/nixpkgs/pkgs/development/idris-modules/vdom.nix index 3ece0056a3f1..9e3f151ee891 100644 --- a/nixpkgs/pkgs/development/idris-modules/vdom.nix +++ b/nixpkgs/pkgs/development/idris-modules/vdom.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "vdom"; + pname = "vdom"; version = "0.6.0"; ipkgName = "idris-vdom"; diff --git a/nixpkgs/pkgs/development/idris-modules/vecspace.nix b/nixpkgs/pkgs/development/idris-modules/vecspace.nix index 2336291338b3..dea3c9b18dd0 100644 --- a/nixpkgs/pkgs/development/idris-modules/vecspace.nix +++ b/nixpkgs/pkgs/development/idris-modules/vecspace.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "vecspace"; + pname = "vecspace"; version = "2018-01-12"; idrisDeps = [ contrib ]; diff --git a/nixpkgs/pkgs/development/idris-modules/webgl.nix b/nixpkgs/pkgs/development/idris-modules/webgl.nix index 271501aa5298..849cad2590c1 100644 --- a/nixpkgs/pkgs/development/idris-modules/webgl.nix +++ b/nixpkgs/pkgs/development/idris-modules/webgl.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "webgl"; + pname = "webgl"; version = "2017-05-08"; idrisDeps = [ idrisscript ]; diff --git a/nixpkgs/pkgs/development/idris-modules/wl-pprint.nix b/nixpkgs/pkgs/development/idris-modules/wl-pprint.nix index a368e0582d82..a6c7b78f5527 100644 --- a/nixpkgs/pkgs/development/idris-modules/wl-pprint.nix +++ b/nixpkgs/pkgs/development/idris-modules/wl-pprint.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "wl-pprint"; + pname = "wl-pprint"; version = "2017-03-13"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/idris-modules/wyvern.nix b/nixpkgs/pkgs/development/idris-modules/wyvern.nix index 750b5dd2fd07..3a8742d9fe5d 100644 --- a/nixpkgs/pkgs/development/idris-modules/wyvern.nix +++ b/nixpkgs/pkgs/development/idris-modules/wyvern.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "wyvern"; + pname = "wyvern"; version = "2017-06-26"; idrisDeps = [ contrib effects ]; diff --git a/nixpkgs/pkgs/development/idris-modules/xhr.nix b/nixpkgs/pkgs/development/idris-modules/xhr.nix index 9c198e289389..e8dc37d43989 100644 --- a/nixpkgs/pkgs/development/idris-modules/xhr.nix +++ b/nixpkgs/pkgs/development/idris-modules/xhr.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "xhr"; + pname = "xhr"; version = "2017-04-22"; idrisDeps = [ idrisscript ]; diff --git a/nixpkgs/pkgs/development/idris-modules/yaml.nix b/nixpkgs/pkgs/development/idris-modules/yaml.nix index b7fffd3953d6..2c8b8087576e 100644 --- a/nixpkgs/pkgs/development/idris-modules/yaml.nix +++ b/nixpkgs/pkgs/development/idris-modules/yaml.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "yaml"; + pname = "yaml"; version = "2018-01-25"; ipkgName = "Yaml"; diff --git a/nixpkgs/pkgs/development/idris-modules/yampa.nix b/nixpkgs/pkgs/development/idris-modules/yampa.nix index 33ebacc6d55b..ae790aa4bdaa 100644 --- a/nixpkgs/pkgs/development/idris-modules/yampa.nix +++ b/nixpkgs/pkgs/development/idris-modules/yampa.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "yampa"; + pname = "yampa"; version = "2016-07-05"; ipkgName = "idris-yampa"; diff --git a/nixpkgs/pkgs/development/interpreters/bats/default.nix b/nixpkgs/pkgs/development/interpreters/bats/default.nix index 9cdde90c41d3..3379d1370af1 100644 --- a/nixpkgs/pkgs/development/interpreters/bats/default.nix +++ b/nixpkgs/pkgs/development/interpreters/bats/default.nix @@ -1,22 +1,24 @@ { resholvePackage , lib +, stdenv , fetchFromGitHub , bash , coreutils , gnugrep , ncurses +, lsof , doInstallCheck ? true }: resholvePackage rec { pname = "bats"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "bats-core"; repo = "bats-core"; rev = "v${version}"; - sha256 = "sha256-MEkMi2w8G9FZhE3JvzzbqObcErQ9WFXy5mtKwQOoxbk="; + sha256 = "sha256-s+SAqX70WeTz6s5ObXYFBVPVUEqvD1d7AX2sGHkjVQ4="; }; patchPhase = '' @@ -45,7 +47,7 @@ resholvePackage rec { }; inherit doInstallCheck; - installCheckInputs = [ ncurses ]; + installCheckInputs = [ ncurses ] ++ lib.optionals stdenv.isDarwin [ lsof ]; installCheckPhase = '' # TODO: cut if https://github.com/bats-core/bats-core/issues/418 allows sed -i '/test works even if PATH is reset/a skip' test/bats.bats diff --git a/nixpkgs/pkgs/development/interpreters/chibi/default.nix b/nixpkgs/pkgs/development/interpreters/chibi/default.nix index c0ee8988c094..4a8b639071ab 100644 --- a/nixpkgs/pkgs/development/interpreters/chibi/default.nix +++ b/nixpkgs/pkgs/development/interpreters/chibi/default.nix @@ -1,18 +1,8 @@ { lib, stdenv, fetchFromGitHub, makeWrapper }: -let - version = "0.10"; - name = "chibi-scheme-${version}"; -in -stdenv.mkDerivation { - inherit name; - meta = { - homepage = "https://github.com/ashinn/chibi-scheme"; - description = "Small Footprint Scheme for use as a C Extension Language"; - platforms = lib.platforms.all; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.DerGuteMoritz ]; - }; +stdenv.mkDerivation rec { + version = "0.10"; + pname = "chibi-scheme"; src = fetchFromGitHub { owner = "ashinn"; @@ -36,4 +26,12 @@ stdenv.mkDerivation { --replace "/usr/bin/env chibi-scheme" "$out/bin/chibi-scheme" done ''; + + meta = { + homepage = "https://github.com/ashinn/chibi-scheme"; + description = "Small Footprint Scheme for use as a C Extension Language"; + platforms = lib.platforms.all; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.DerGuteMoritz ]; + }; } diff --git a/nixpkgs/pkgs/development/interpreters/clisp/default.nix b/nixpkgs/pkgs/development/interpreters/clisp/default.nix index 2a387d34f470..926308f0d30c 100644 --- a/nixpkgs/pkgs/development/interpreters/clisp/default.nix +++ b/nixpkgs/pkgs/development/interpreters/clisp/default.nix @@ -24,11 +24,11 @@ assert x11Support -> (libX11 != null && libXau != null && libXt != null && libXpm != null && xorgproto != null && libXext != null); stdenv.mkDerivation rec { - v = "2.49"; - name = "clisp-${v}"; + version = "2.49"; + pname = "clisp"; src = fetchurl { - url = "mirror://gnu/clisp/release/${v}/${name}.tar.bz2"; + url = "mirror://gnu/clisp/release/${version}/clisp-${version}.tar.bz2"; sha256 = "8132ff353afaa70e6b19367a25ae3d5a43627279c25647c220641fed00f8e890"; }; diff --git a/nixpkgs/pkgs/development/interpreters/clisp/hg.nix b/nixpkgs/pkgs/development/interpreters/clisp/hg.nix index 7ab4134facb9..7b10d2cad0e5 100644 --- a/nixpkgs/pkgs/development/interpreters/clisp/hg.nix +++ b/nixpkgs/pkgs/development/interpreters/clisp/hg.nix @@ -23,8 +23,8 @@ assert x11Support -> (libX11 != null && libXau != null && libXt != null && libXpm != null && xorgproto != null && libXext != null); stdenv.mkDerivation rec { - v = "2.50pre20171114"; - name = "clisp-${v}"; + version = "2.50pre20171114"; + pname = "clisp"; src = fetchhg { url = "http://hg.code.sf.net/p/clisp/clisp"; diff --git a/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix b/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix index ca2391ebd25d..c3dcd0a0f71f 100644 --- a/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix +++ b/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "babashka"; - version = "0.7.5"; + version = "0.7.8"; src = fetchurl { url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-ap6YCRUqtIgh36eTIk5BSjUildvYhqkC48Y4dxNMU8c="; + sha256 = "sha256-VbDivl92YYWzIbkbOgDijzf9bZ5ZyodcapPPG4EiGXc="; }; executable = "bb"; diff --git a/nixpkgs/pkgs/development/interpreters/clojure/default.nix b/nixpkgs/pkgs/development/interpreters/clojure/default.nix index a66f0422b6db..09774f7fb6d5 100644 --- a/nixpkgs/pkgs/development/interpreters/clojure/default.nix +++ b/nixpkgs/pkgs/development/interpreters/clojure/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "clojure"; - version = "1.10.3.1082"; + version = "1.10.3.1087"; src = fetchurl { # https://clojure.org/releases/tools url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "sha256-8hW8zgP+D72MtXYFPXx9FfkThQuCBo1Y6CU5w7xPE7c="; + sha256 = "sha256-prOzVHrcbabKXP4Q4Dfx/eiKePlINyu1mO9NCFnaPpQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/interpreters/dhall/build-dhall-directory-package.nix b/nixpkgs/pkgs/development/interpreters/dhall/build-dhall-directory-package.nix index 7fe1b46e3a55..f7c730c92772 100644 --- a/nixpkgs/pkgs/development/interpreters/dhall/build-dhall-directory-package.nix +++ b/nixpkgs/pkgs/development/interpreters/dhall/build-dhall-directory-package.nix @@ -24,7 +24,6 @@ lib.makePackageOverridable code = "${src}/${file}"; } - // lib.optionalAttrs document { documentationRoot = src; } + // lib.optionalAttrs document { documentationRoot = "${src}"; } ) ) - diff --git a/nixpkgs/pkgs/development/interpreters/elixir/generic-builder.nix b/nixpkgs/pkgs/development/interpreters/elixir/generic-builder.nix index 646fd70ff8f9..5f08386c9f51 100644 --- a/nixpkgs/pkgs/development/interpreters/elixir/generic-builder.nix +++ b/nixpkgs/pkgs/development/interpreters/elixir/generic-builder.nix @@ -25,7 +25,7 @@ in assert versionAtLeast (getVersion erlang) minimumOTPVersion; stdenv.mkDerivation ({ - name = "${baseName}-${version}"; + pname = "${baseName}"; inherit src version debugInfo; diff --git a/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix b/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix index f4f7d6483545..667fb749d330 100644 --- a/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix @@ -154,7 +154,7 @@ stdenv.mkDerivation ({ #!${stdenv.shell} set -ox errexit PATH=${lib.makeBinPath [ common-updater-scripts coreutils git gnused ]} - latest=$(list-git-tags https://github.com/erlang/otp.git | sed -n 's/^OTP-${major}/${major}/p' | sort -V | tail -1) + latest=$(list-git-tags --url=https://github.com/erlang/otp.git | sed -n 's/^OTP-${major}/${major}/p' | sort -V | tail -1) if [ "$latest" != "${version}" ]; then nixpkgs="$(git rev-parse --show-toplevel)" nix_file="$nixpkgs/pkgs/development/interpreters/erlang/R${major}.nix" diff --git a/nixpkgs/pkgs/development/interpreters/guile/2.2.nix b/nixpkgs/pkgs/development/interpreters/guile/2.2.nix index 19ef0e608485..04c60e80e8fc 100644 --- a/nixpkgs/pkgs/development/interpreters/guile/2.2.nix +++ b/nixpkgs/pkgs/development/interpreters/guile/2.2.nix @@ -83,9 +83,9 @@ builder rec { # Explicitly link against libgcc_s, to work around the infamous # "libgcc_s.so.1 must be installed for pthread_cancel to work". - # don't have "libgcc_s.so.1" on darwin + # don't have "libgcc_s.so.1" on clang LDFLAGS = lib.optionalString - (!stdenv.isDarwin && !stdenv.hostPlatform.isStatic) "-lgcc_s"; + (stdenv.cc.isGNU && !stdenv.hostPlatform.isStatic) "-lgcc_s"; configureFlags = [ "--with-libreadline-prefix=${lib.getDev readline}" diff --git a/nixpkgs/pkgs/development/interpreters/guile/3.0.nix b/nixpkgs/pkgs/development/interpreters/guile/3.0.nix index 76aa0c4404fc..99f3f84829c7 100644 --- a/nixpkgs/pkgs/development/interpreters/guile/3.0.nix +++ b/nixpkgs/pkgs/development/interpreters/guile/3.0.nix @@ -14,6 +14,7 @@ , pkg-config , pkgsBuildBuild , readline +, writeScript }: let @@ -24,11 +25,11 @@ let in builder rec { pname = "guile"; - version = "3.0.7"; + version = "3.0.8"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-9X2GxwYgJxv863qb4MgXRKAz8IrcfOuoMsmRerPmkbc="; + sha256 = "sha256-2qcGClbygE6bdMjX5/6L7tErQ6qyeJo4WFGD/MF7ihM="; }; outputs = [ "out" "dev" "info" ]; @@ -81,9 +82,9 @@ builder rec { # Explicitly link against libgcc_s, to work around the infamous # "libgcc_s.so.1 must be installed for pthread_cancel to work". - # don't have "libgcc_s.so.1" on darwin + # don't have "libgcc_s.so.1" on clang LDFLAGS = lib.optionalString - (!stdenv.isDarwin && !stdenv.hostPlatform.isStatic) "-lgcc_s"; + (stdenv.cc.isGNU && !stdenv.hostPlatform.isStatic) "-lgcc_s"; configureFlags = [ "--with-libreadline-prefix=${lib.getDev readline}" @@ -102,7 +103,10 @@ builder rec { ] # Disable JIT on Apple Silicon, as it is not yet supported # https://debbugs.gnu.org/cgi/bugreport.cgi?bug=44505"; - ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) "--enable-jit=no"; + ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) "--enable-jit=no" + # At least on x86_64-darwin '-flto' autodetection is not correct: + # https://github.com/NixOS/nixpkgs/pull/160051#issuecomment-1046193028 + ++ lib.optional (stdenv.isDarwin) "--disable-lto"; postInstall = '' wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin" @@ -126,6 +130,20 @@ builder rec { setupHook = ./setup-hook-3.0.sh; + passthru = { + updateScript = writeScript "update-guile-3" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl pcre common-updater-scripts + + set -eu -o pipefail + + # Expect the text in format of '"https://ftp.gnu.org/gnu/guile/guile-3.0.8.tar.gz"' + new_version="$(curl -s https://www.gnu.org/software/guile/download/ | + pcregrep -o1 '"https://ftp.gnu.org/gnu/guile/guile-(3[.0-9]+).tar.gz"')" + update-source-version ${pname} "$new_version" + ''; + }; + meta = with lib; { homepage = "https://www.gnu.org/software/guile/"; description = "Embeddable Scheme implementation"; diff --git a/nixpkgs/pkgs/development/interpreters/racket/minimal.nix b/nixpkgs/pkgs/development/interpreters/racket/minimal.nix index e56945ed651d..b73cdaff5d3e 100644 --- a/nixpkgs/pkgs/development/interpreters/racket/minimal.nix +++ b/nixpkgs/pkgs/development/interpreters/racket/minimal.nix @@ -2,9 +2,10 @@ }: racket.overrideAttrs (oldAttrs: rec { - name = "racket-minimal-${oldAttrs.version}"; + pname = "racket-minimal"; + version = oldAttrs.version; src = oldAttrs.src.override { - inherit name; + name = "${pname}-${version}"; sha256 = "sha256-FZlUWvjtioe4S8gPetj7vdneVX6jEFguJo4j2wJsKAw="; }; diff --git a/nixpkgs/pkgs/development/interpreters/ruby/default.nix b/nixpkgs/pkgs/development/interpreters/ruby/default.nix index 33462c3cd973..4011ff61be70 100644 --- a/nixpkgs/pkgs/development/interpreters/ruby/default.nix +++ b/nixpkgs/pkgs/development/interpreters/ruby/default.nix @@ -344,10 +344,10 @@ in { }; ruby_3_1 = generic { - version = rubyVersion "3" "1" "0" ""; + version = rubyVersion "3" "1" "1" ""; sha256 = { - src = "sha256-UKBQTG7ctNYc5rjP292qlXBxlfqw7Ne16SZUsqlBKFQ="; - git = "sha256-TcsoWY+zVZeue1/ypV1L0WERp1UVK35WtVtYPYiJh4c="; + src = "sha256-/m5Hgt6XRDl43bqLpL440iKqJNw+PwKmqOdwHA7rYZ0="; + git = "sha256-76t/tGyK5nz7nvcRdHJTjjckU+Kv+/kbTMiNWJ93jU8="; }; }; } diff --git a/nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix b/nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix index b964a0c7bf47..2114faf74257 100644 --- a/nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix +++ b/nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix @@ -85,6 +85,6 @@ "${patchSet}/patches/ruby/3.0/head/railsexpress/01-improve-gc-stats.patch" "${patchSet}/patches/ruby/3.0/head/railsexpress/02-malloc-trim.patch" ]; - "3.1.0" = ops useRailsExpress [ # no patches yet (2021-12-25) + "3.1.1" = ops useRailsExpress [ # no patches yet (2021-12-25) ]; } diff --git a/nixpkgs/pkgs/development/interpreters/spidermonkey/91.nix b/nixpkgs/pkgs/development/interpreters/spidermonkey/91.nix index 6be61a1210b6..811a0247a57d 100644 --- a/nixpkgs/pkgs/development/interpreters/spidermonkey/91.nix +++ b/nixpkgs/pkgs/development/interpreters/spidermonkey/91.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "spidermonkey"; - version = "91.6.0"; + version = "91.7.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; - sha512 = "3dd1929f93cdd087a93fc3597f32d9005c986b59832954e01a8c2472b179c92ad611eaa73d3fc000a08b838a0b70da73ff5ba82d6009160655ba6894cf04520e"; + sha512 = "925811989d8a91d826ba356bd46ac54be8153288ec0319c28d2bfbe89191e62e107691159dd7ca247253e2a4952eb59a5b9613e3feea3f5351238d4822e26301"; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/java-modules/m2install.nix b/nixpkgs/pkgs/development/java-modules/m2install.nix index d0a13f62520f..f223e205220d 100644 --- a/nixpkgs/pkgs/development/java-modules/m2install.nix +++ b/nixpkgs/pkgs/development/java-modules/m2install.nix @@ -2,15 +2,15 @@ { version, artifactId, groupId, sha512, type ? "jar", suffix ? "" }: let - name = "${artifactId}-${version}"; m2Path = "${builtins.replaceStrings ["."] ["/"] groupId}/${artifactId}/${version}"; - m2File = "${name}${suffix}.${type}"; + m2File = "${artifactId}-${version}${suffix}.${type}"; src = fetchurl { inherit sha512; url = "mirror://maven/${m2Path}/${m2File}"; }; in stdenv.mkDerivation { - inherit name m2Path m2File src; + inherit version m2Path m2File src; + pname = artifactId; dontUnpack = true; diff --git a/nixpkgs/pkgs/development/libraries/CGAL/4.nix b/nixpkgs/pkgs/development/libraries/CGAL/4.nix index a1d3c183b8e2..7380a85248fe 100644 --- a/nixpkgs/pkgs/development/libraries/CGAL/4.nix +++ b/nixpkgs/pkgs/development/libraries/CGAL/4.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "4.14.2"; - name = "cgal-" + version; + pname = "cgal"; src = fetchFromGitHub { owner = "CGAL"; diff --git a/nixpkgs/pkgs/development/libraries/accountsservice/default.nix b/nixpkgs/pkgs/development/libraries/accountsservice/default.nix index bd6f2545b3b0..efe9640af6fd 100644 --- a/nixpkgs/pkgs/development/libraries/accountsservice/default.nix +++ b/nixpkgs/pkgs/development/libraries/accountsservice/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , substituteAll , pkg-config , glib @@ -14,20 +13,39 @@ , dbus , ninja , python3 +, vala , gettext }: stdenv.mkDerivation rec { pname = "accountsservice"; - version = "0.6.55"; + version = "22.08.8"; outputs = [ "out" "dev" ]; src = fetchurl { - url = "https://www.freedesktop.org/software/${pname}/${pname}-${version}.tar.xz"; - sha256 = "16wwd633jak9ajyr1f1h047rmd09fhf3kzjz6g5xjsz0lwcj8azz"; + url = "https://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz"; + sha256 = "kJmXp2kZ/n3BOKmgHOpwvWItWpMtvJ+xMBARMCOno5E="; }; + patches = [ + # Hardcode dependency paths. + (substituteAll { + src = ./fix-paths.patch; + inherit shadow coreutils; + }) + + # Do not try to create directories in /var, that will not work in Nix sandbox. + ./no-create-dirs.patch + + # Disable mutating D-Bus methods with immutable /etc. + ./Disable-methods-that-change-files-in-etc.patch + + # Do not ignore third-party (e.g Pantheon) extensions not matching FHS path scheme. + # Fixes https://github.com/NixOS/nixpkgs/issues/72396 + ./drop-prefix-check-extensions.patch + ]; + nativeBuildInputs = [ dbus gettext @@ -36,6 +54,7 @@ stdenv.mkDerivation rec { ninja pkg-config python3 + vala ]; buildInputs = [ @@ -48,7 +67,6 @@ stdenv.mkDerivation rec { "-Dadmin_group=wheel" "-Dlocalstatedir=/var" "-Dsystemdsystemunitdir=${placeholder "out"}/etc/systemd/system" - "-Dsystemd=true" ]; postPatch = '' @@ -56,42 +74,11 @@ stdenv.mkDerivation rec { patchShebangs meson_post_install.py ''; - patches = [ - # https://gitlab.freedesktop.org/accountsservice/accountsservice/-/issues/55 - (fetchpatch { - url = "https://gitlab.freedesktop.org/accountsservice/accountsservice/-/merge_requests/58.patch"; - sha256 = "1pnwq4ycnryb2kkgvnz44qzm71240ybqj6507wynlkdsw8180fdw"; - }) - (substituteAll { - src = ./fix-paths.patch; - inherit shadow coreutils; - }) - ./no-create-dirs.patch - ./Disable-methods-that-change-files-in-etc.patch - # Fixes https://github.com/NixOS/nixpkgs/issues/72396 - ./drop-prefix-check-extensions.patch - # Systemd unit improvements. Notably using StateDirectory eliminating the - # need of an ad-hoc script. - (fetchpatch { - url = "https://gitlab.freedesktop.org/accountsservice/accountsservice/commit/152b845bbd3ca2a64516691493a160825f1a2046.patch"; - sha256 = "114wrf5mwj5bgc5v1g05md4ridcnwdrwppr3bjz96sknwh5hk8s5"; - }) - (fetchpatch { - url = "https://gitlab.freedesktop.org/accountsservice/accountsservice/commit/0e712e935abd26499ff5995ab363e5bfd9ee7c4c.patch"; - sha256 = "1y60a5fmgfqjzprwpizilrazqn3mggdlgc5sgcpsprsp62fv78rl"; - }) - # Don't use etc/dbus-1/system.d - (fetchpatch { - url = "https://gitlab.freedesktop.org/accountsservice/accountsservice/commit/ced73d0fcbd2a54085a660d260482fc70d79bd5c.patch"; - sha256 = "0s7fknfgxl8hnf6givmhfg4586fjb2n64i9arh1w7xnq7x9x8d4c"; - }) - ]; - meta = with lib; { description = "D-Bus interface for user account query and manipulation"; homepage = "https://www.freedesktop.org/wiki/Software/AccountsService"; - license = licenses.gpl3; - maintainers = with maintainers; [ pSub ]; + license = licenses.gpl3Plus; + maintainers = teams.freedesktop.members ++ (with maintainers; [ pSub ]); platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/libraries/accountsservice/fix-paths.patch b/nixpkgs/pkgs/development/libraries/accountsservice/fix-paths.patch index 78d7a8081bfd..0ed8e04579f4 100644 --- a/nixpkgs/pkgs/development/libraries/accountsservice/fix-paths.patch +++ b/nixpkgs/pkgs/development/libraries/accountsservice/fix-paths.patch @@ -1,8 +1,8 @@ diff --git a/src/daemon.c b/src/daemon.c -index c52bda3..75d214e 100644 +index c8b6320..2b74949 100644 --- a/src/daemon.c +++ b/src/daemon.c -@@ -1106,7 +1106,7 @@ daemon_create_user_authorized_cb (Daemon *daemon, +@@ -1102,7 +1102,7 @@ daemon_create_user_authorized_cb (Daemon *daemon, sys_log (context, "create user '%s'", cd->user_name); @@ -11,9 +11,9 @@ index c52bda3..75d214e 100644 argv[1] = "-m"; argv[2] = "-c"; argv[3] = cd->real_name; -@@ -1318,7 +1318,7 @@ daemon_delete_user_authorized_cb (Daemon *daemon, - - user_set_saved (user, FALSE); +@@ -1335,7 +1335,7 @@ daemon_delete_user_authorized_cb (Daemon *daemon, + } + free (resolved_homedir); - argv[0] = "/usr/sbin/userdel"; + argv[0] = "@shadow@/bin/userdel"; @@ -21,19 +21,19 @@ index c52bda3..75d214e 100644 argv[1] = "-f"; argv[2] = "-r"; diff --git a/src/user.c b/src/user.c -index 9f57af5..e65289d 100644 +index 189b2c5..5358c02 100644 --- a/src/user.c +++ b/src/user.c -@@ -844,7 +844,7 @@ user_change_real_name_authorized_cb (Daemon *daemon, - accounts_user_get_uid (ACCOUNTS_USER (user)), - name); +@@ -1145,7 +1145,7 @@ user_change_real_name_authorized_cb (Daemon *daemon, + new_gecos = g_strdup (name); + } - argv[0] = "/usr/sbin/usermod"; + argv[0] = "@shadow@/bin/usermod"; argv[1] = "-c"; - argv[2] = name; + argv[2] = new_gecos; argv[3] = "--"; -@@ -913,7 +913,7 @@ user_change_user_name_authorized_cb (Daemon *daemon, +@@ -1218,7 +1218,7 @@ user_change_user_name_authorized_cb (Daemon *daemon, accounts_user_get_uid (ACCOUNTS_USER (user)), name); @@ -42,7 +42,7 @@ index 9f57af5..e65289d 100644 argv[1] = "-l"; argv[2] = name; argv[3] = "--"; -@@ -1321,7 +1321,7 @@ user_change_home_dir_authorized_cb (Daemon *daemon, +@@ -1627,7 +1627,7 @@ user_change_home_dir_authorized_cb (Daemon *daemon, accounts_user_get_uid (ACCOUNTS_USER (user)), home_dir); @@ -51,7 +51,7 @@ index 9f57af5..e65289d 100644 argv[1] = "-m"; argv[2] = "-d"; argv[3] = home_dir; -@@ -1378,7 +1378,7 @@ user_change_shell_authorized_cb (Daemon *daemon, +@@ -1683,7 +1683,7 @@ user_change_shell_authorized_cb (Daemon *daemon, accounts_user_get_uid (ACCOUNTS_USER (user)), shell); @@ -60,7 +60,7 @@ index 9f57af5..e65289d 100644 argv[1] = "-s"; argv[2] = shell; argv[3] = "--"; -@@ -1520,7 +1520,7 @@ user_change_icon_file_authorized_cb (Daemon *daemon, +@@ -1824,7 +1824,7 @@ user_change_icon_file_authorized_cb (Daemon *daemon, return; } @@ -69,7 +69,7 @@ index 9f57af5..e65289d 100644 argv[1] = filename; argv[2] = NULL; -@@ -1601,7 +1601,7 @@ user_change_locked_authorized_cb (Daemon *daemon, +@@ -1904,7 +1904,7 @@ user_change_locked_authorized_cb (Daemon *daemon, locked ? "locking" : "unlocking", accounts_user_get_user_name (ACCOUNTS_USER (user)), accounts_user_get_uid (ACCOUNTS_USER (user))); @@ -78,7 +78,7 @@ index 9f57af5..e65289d 100644 argv[1] = locked ? "-L" : "-U"; argv[2] = "--"; argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user)); -@@ -1726,7 +1726,7 @@ user_change_account_type_authorized_cb (Daemon *daemon, +@@ -2026,7 +2026,7 @@ user_change_account_type_authorized_cb (Daemon *daemon, g_free (groups); @@ -87,7 +87,7 @@ index 9f57af5..e65289d 100644 argv[1] = "-G"; argv[2] = str->str; argv[3] = "--"; -@@ -1794,7 +1794,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon, +@@ -2093,7 +2093,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon, if (mode == PASSWORD_MODE_SET_AT_LOGIN || mode == PASSWORD_MODE_NONE) { @@ -96,7 +96,7 @@ index 9f57af5..e65289d 100644 argv[1] = "-d"; argv[2] = "--"; argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user)); -@@ -1806,7 +1806,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon, +@@ -2105,7 +2105,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon, } if (mode == PASSWORD_MODE_SET_AT_LOGIN) { @@ -105,7 +105,7 @@ index 9f57af5..e65289d 100644 argv[1] = "-d"; argv[2] = "0"; argv[3] = "--"; -@@ -1827,7 +1827,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon, +@@ -2126,7 +2126,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon, accounts_user_set_locked (ACCOUNTS_USER (user), FALSE); } else if (accounts_user_get_locked (ACCOUNTS_USER (user))) { @@ -114,7 +114,7 @@ index 9f57af5..e65289d 100644 argv[1] = "-U"; argv[2] = "--"; argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user)); -@@ -1905,7 +1905,7 @@ user_change_password_authorized_cb (Daemon *daemon, +@@ -2203,7 +2203,7 @@ user_change_password_authorized_cb (Daemon *daemon, g_object_freeze_notify (G_OBJECT (user)); diff --git a/nixpkgs/pkgs/development/libraries/accountsservice/no-create-dirs.patch b/nixpkgs/pkgs/development/libraries/accountsservice/no-create-dirs.patch index 0333f925d267..5d137eb52a11 100644 --- a/nixpkgs/pkgs/development/libraries/accountsservice/no-create-dirs.patch +++ b/nixpkgs/pkgs/development/libraries/accountsservice/no-create-dirs.patch @@ -1,15 +1,17 @@ diff --git a/meson_post_install.py b/meson_post_install.py -index 5cc2dc4..dd27ad5 100644 +index d8c3dd1..620f714 100644 --- a/meson_post_install.py +++ b/meson_post_install.py -@@ -9,8 +9,8 @@ localstatedir = os.path.normpath(destdir + os.sep + sys.argv[1]) +@@ -9,9 +9,9 @@ localstatedir = os.path.normpath(destdir + os.sep + sys.argv[1]) # FIXME: meson will not track the creation of these directories # https://github.com/mesonbuild/meson/blob/master/mesonbuild/scripts/uninstall.py#L39 dst_dirs = [ +- (os.path.join(localstatedir, 'lib'), 0o755), - (os.path.join(localstatedir, 'lib', 'AccountsService', 'icons'), 0o775), - (os.path.join(localstatedir, 'lib', 'AccountsService', 'users'), 0o700), -+# (os.path.join(localstatedir, 'lib', 'AccountsService', 'icons'), 0o775), -+# (os.path.join(localstatedir, 'lib', 'AccountsService', 'users'), 0o700), ++ # (os.path.join(localstatedir, 'lib'), 0o755), ++ # (os.path.join(localstatedir, 'lib', 'AccountsService', 'icons'), 0o775), ++ # (os.path.join(localstatedir, 'lib', 'AccountsService', 'users'), 0o700), ] for (dst_dir, dst_dir_mode) in dst_dirs: diff --git a/nixpkgs/pkgs/development/libraries/alglib/default.nix b/nixpkgs/pkgs/development/libraries/alglib/default.nix new file mode 100644 index 000000000000..1ff34a8d1f16 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/alglib/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, fetchurl, cmake, clang }: + +stdenv.mkDerivation rec { + pname = "alglib3"; + version = "3.18.0"; + + src = fetchurl { + url = "https://www.alglib.net/translator/re/alglib-${version}.cpp.gpl.tgz"; + sha256 = "0ag8dvcxzzp9riqvk4lhcbwhvh0lq54lbdnsbyr107rjfi2p1vlq"; + }; + + nativeBuildInputs = [ + cmake + clang + ]; + + patches = [ + ./patch-alglib-CMakeLists.patch + ]; + + meta = with lib; { + description = "Numerical analysis and data processing library"; + homepage = "https://www.alglib.net/"; + license = lib.licenses.gpl2Plus; + maintainers = [ maintainers.paperdigits ]; + longDescription = '' + ALGLIB is a cross-platform numerical analysis and data processing library. It supports several programming languages (C++, C#, Delphi) and several operating systems (Windows and POSIX, including Linux). ALGLIB features include: + + * Data analysis (classification/regression, statistics) + * Optimization and nonlinear solvers + * Interpolation and linear/nonlinear least-squares fitting + * Linear algebra (direct algorithms, EVD/SVD), direct and iterative linear solvers + * Fast Fourier Transform and many other algorithms + ''; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/alglib/patch-alglib-CMakeLists.patch b/nixpkgs/pkgs/development/libraries/alglib/patch-alglib-CMakeLists.patch new file mode 100644 index 000000000000..b91a0c0aefd6 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/alglib/patch-alglib-CMakeLists.patch @@ -0,0 +1,23 @@ +--- /dev/null ++++ b/CMakeLists.txt +@@ -0,0 +1,20 @@ ++cmake_minimum_required(VERSION 2.8) ++ ++project(alglib3 CXX) ++ ++file(GLOB_RECURSE sources src/*.cpp) ++file(GLOB_RECURSE headers src/*.h) ++ ++add_library(${PROJECT_NAME} STATIC ${sources} ${headers}) ++ ++install( ++ TARGETS ${PROJECT_NAME} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++) ++ ++install( ++ FILES ${headers} ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/alglib ++) diff --git a/nixpkgs/pkgs/development/libraries/amdvlk/default.nix b/nixpkgs/pkgs/development/libraries/amdvlk/default.nix index 16fb32cf011f..1001dc62673a 100644 --- a/nixpkgs/pkgs/development/libraries/amdvlk/default.nix +++ b/nixpkgs/pkgs/development/libraries/amdvlk/default.nix @@ -22,13 +22,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2022.Q1.1"; + version = "2022.Q1.3"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "jdAFIC2JYPqCADx/73KM6E3rLFWF4SlEdY9lCK1NOhU="; + sha256 = "UBvHWgC/s00XPn87DAmQ65NszFMoZSXwbrVG064HFng="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/appstream/default.nix b/nixpkgs/pkgs/development/libraries/appstream/default.nix index c39ea78a7757..9b07697a6a9a 100644 --- a/nixpkgs/pkgs/development/libraries/appstream/default.nix +++ b/nixpkgs/pkgs/development/libraries/appstream/default.nix @@ -14,27 +14,31 @@ , glib , xapian , libxml2 +, libxmlb , libyaml , gobject-introspection , pcre , itstool , gperf , vala -, lmdb , curl +, nixosTests }: stdenv.mkDerivation rec { pname = "appstream"; - version = "0.14.4"; + version = "0.15.2"; + # When bumping this package, please also check whether + # fix-build-for-qt-olderthan-514.patch still applies by + # building libsForQt512.appstream-qt. - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "installedTests" ]; src = fetchFromGitHub { owner = "ximion"; repo = "appstream"; rev = "v${version}"; - sha256 = "sha256-DJXCw50f+8c58bJw6xx0ECfkc9/KcWaeA+ne2zmTyhg="; + sha256 = "sha256-/JZ49wjtcInbGUOVVjevVSrLCHcA60FMT165rhfb78Q="; }; patches = [ @@ -43,6 +47,9 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; libstemmer_includedir = "${lib.getDev libstemmer}/include"; }) + + # Allow installing installed tests to a separate output. + ./installed-tests-path.patch ]; nativeBuildInputs = [ @@ -65,9 +72,9 @@ stdenv.mkDerivation rec { glib xapian libxml2 + libxmlb libyaml gperf - lmdb curl ]; @@ -75,8 +82,15 @@ stdenv.mkDerivation rec { "-Dapidocs=false" "-Ddocs=false" "-Dvapi=true" + "-Dinstalled_test_prefix=${placeholder "installedTests"}" ]; + passthru = { + tests = { + installed-tests = nixosTests.installed-tests.appstream; + }; + }; + meta = with lib; { description = "Software metadata handling library"; homepage = "https://www.freedesktop.org/wiki/Distributions/AppStream/"; @@ -88,5 +102,5 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl21Plus; platforms = platforms.unix; - }; + }; } diff --git a/nixpkgs/pkgs/development/libraries/appstream/fix-build-for-qt-olderthan-514.patch b/nixpkgs/pkgs/development/libraries/appstream/fix-build-for-qt-olderthan-514.patch new file mode 100644 index 000000000000..35db2bec914e --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/appstream/fix-build-for-qt-olderthan-514.patch @@ -0,0 +1,43 @@ +diff --git a/qt/component.h b/qt/component.h +index 47abd1f3..74de943c 100644 +--- a/qt/component.h ++++ b/qt/component.h +@@ -90,7 +90,7 @@ class APPSTREAMQT_EXPORT Component { + UrlKindContact, + + // deprecated +- UrlTranslate [[deprecated]] = UrlKindTranslate, ++ UrlTranslate = UrlKindTranslate, + }; + Q_ENUM(UrlKind) + +diff --git a/qt/pool.h b/qt/pool.h +index b59829b7..5237f613 100644 +--- a/qt/pool.h ++++ b/qt/pool.h +@@ -70,9 +70,9 @@ public: + FlagMonitor = 1 << 7, + + // deprecated +- FlagReadCollection [[deprecated]] = FlagLoadOsCollection, +- FlagReadMetainfo [[deprecated]] = FlagLoadOsMetainfo, +- FlagReadDesktopFiles [[deprecated]] = FlagLoadOsDesktopFiles, ++ FlagReadCollection = FlagLoadOsCollection, ++ FlagReadMetainfo = FlagLoadOsMetainfo, ++ FlagReadDesktopFiles = FlagLoadOsDesktopFiles, + }; + + /** +@@ -84,9 +84,9 @@ public: + * Flags on how caching should be used. + **/ + enum CacheFlags { +- CacheFlagNone [[deprecated]] = 0, +- CacheFlagUseUser [[deprecated]] = 1 << 0, +- CacheFlagUseSystem [[deprecated]] = 1 << 1, ++ CacheFlagNone = 0, ++ CacheFlagUseUser = 1 << 0, ++ CacheFlagUseSystem = 1 << 1, + }; + + /** diff --git a/nixpkgs/pkgs/development/libraries/appstream/fix-paths.patch b/nixpkgs/pkgs/development/libraries/appstream/fix-paths.patch index 0da72a78cbcf..2f1249daef41 100644 --- a/nixpkgs/pkgs/development/libraries/appstream/fix-paths.patch +++ b/nixpkgs/pkgs/development/libraries/appstream/fix-paths.patch @@ -1,18 +1,21 @@ diff --git a/data/meson.build b/data/meson.build -index 1eb3dfb0..623b66ec 100644 +index 53f31cb4..90f40e77 100644 --- a/data/meson.build +++ b/data/meson.build -@@ -26,4 +26,4 @@ i18n.merge_file ( +@@ -68,7 +68,7 @@ test('as-validate_metainfo.cli', ) - install_data ('appstream.conf', -- install_dir: get_option('sysconfdir')) -+ install_dir: get_option('prefix') / 'etc') + install_data('appstream.conf', +- install_dir: get_option('sysconfdir')) ++ install_dir: get_option('prefix') / 'etc') + + if get_option('compose') + ascompose_metainfo = 'org.freedesktop.appstream.compose.metainfo.xml' diff --git a/meson.build b/meson.build -index dc1fb1a5..5ee03b73 100644 +index 2efe86b7..9dc79e28 100644 --- a/meson.build +++ b/meson.build -@@ -108,12 +108,12 @@ if get_option ('gir') +@@ -107,12 +107,12 @@ if get_option ('gir') dependency('gobject-introspection-1.0', version: '>=1.56') endif diff --git a/nixpkgs/pkgs/development/libraries/appstream/installed-tests-path.patch b/nixpkgs/pkgs/development/libraries/appstream/installed-tests-path.patch new file mode 100644 index 000000000000..188c1e525890 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/appstream/installed-tests-path.patch @@ -0,0 +1,27 @@ +diff --git a/meson_options.txt b/meson_options.txt +index 8dd8e0c7..e2a30b06 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -44,6 +44,11 @@ option('install-docs', + value : true, + description : 'Install documentation for API and specification' + ) ++option('installed_test_prefix', ++ type : 'string', ++ value : '', ++ description : 'Prefix for installed tests' ++) + + # + # For development +diff --git a/tests/installed-tests/meson.build b/tests/installed-tests/meson.build +index 405820ce..f592a753 100644 +--- a/tests/installed-tests/meson.build ++++ b/tests/installed-tests/meson.build +@@ -10,5 +10,5 @@ configure_file( + output : 'metainfo-validate.test', + configuration : itconf, + install: true, +- install_dir: join_paths('share', 'installed-tests', 'appstream'), ++ install_dir: join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', 'appstream'), + ) diff --git a/nixpkgs/pkgs/development/libraries/appstream/qt.nix b/nixpkgs/pkgs/development/libraries/appstream/qt.nix index 0bcb4741ff12..3704332119e2 100644 --- a/nixpkgs/pkgs/development/libraries/appstream/qt.nix +++ b/nixpkgs/pkgs/development/libraries/appstream/qt.nix @@ -1,12 +1,12 @@ -{ mkDerivation, appstream, qtbase, qttools }: +{ lib, mkDerivation, appstream, qtbase, qttools, nixosTests }: # TODO: look into using the libraries from the regular appstream derivation as we keep duplicates here mkDerivation { pname = "appstream-qt"; - inherit (appstream) version src patches; + inherit (appstream) version src; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "installedTests" ]; buildInputs = appstream.buildInputs ++ [ appstream qtbase ]; @@ -14,11 +14,26 @@ mkDerivation { mesonFlags = appstream.mesonFlags ++ [ "-Dqt=true" ]; + patches = (appstream.patches or []) ++ lib.optionals (lib.versionOlder qtbase.version "5.14") [ + # Fix darwin build for libsForQt5.appstream-qt + # Old Qt moc doesn't know about fancy C++14 features + # ../qt/component.h:93: Parse error at "UrlTranslate" + # Remove both this patch and related comment in default.nix + # once Qt 5.14 or later becomes default on darwin + ./fix-build-for-qt-olderthan-514.patch + ]; + postFixup = '' sed -i "$dev/lib/cmake/AppStreamQt/AppStreamQtConfig.cmake" \ -e "/INTERFACE_INCLUDE_DIRECTORIES/ s@\''${PACKAGE_PREFIX_DIR}@$dev@" ''; + passthru = appstream.passthru // { + tests = { + installed-tests = nixosTests.installed-tests.appstream-qt; + }; + }; + meta = appstream.meta // { description = "Software metadata handling library - Qt"; }; diff --git a/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix b/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix index 274a35c6ccfb..806df81a7080 100644 --- a/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix @@ -19,7 +19,6 @@ , grpc , gtest , jemalloc -, libnsl , lz4 , minio , ninja @@ -39,7 +38,7 @@ , zlib , zstd , enableShared ? !stdenv.hostPlatform.isStatic -, enableFlight ? !stdenv.isDarwin # libnsl is not supported on darwin +, enableFlight ? true , enableJemalloc ? !(stdenv.isAarch64 && stdenv.isDarwin) # boost/process is broken in 1.69 on darwin, but fixed in 1.70 and # non-existent in older versions @@ -129,7 +128,6 @@ stdenv.mkDerivation rec { python3.pkgs.numpy ] ++ lib.optionals enableFlight [ grpc - libnsl openssl protobuf ] ++ lib.optionals enableS3 [ aws-sdk-cpp openssl ] diff --git a/nixpkgs/pkgs/development/libraries/aubio/default.nix b/nixpkgs/pkgs/development/libraries/aubio/default.nix index 22cac39dbe10..2e8bdc50ca63 100644 --- a/nixpkgs/pkgs/development/libraries/aubio/default.nix +++ b/nixpkgs/pkgs/development/libraries/aubio/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { buildInputs = [ alsa-lib fftw libjack2 libsamplerate libsndfile ]; strictDeps = true; + dontAddWafCrossFlags = true; + wafFlags = lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--disable-tests"; meta = with lib; { description = "Library for audio labelling"; diff --git a/nixpkgs/pkgs/development/libraries/aws-c-auth/default.nix b/nixpkgs/pkgs/development/libraries/aws-c-auth/default.nix index ad1f3483cff0..b6fcb11c3158 100644 --- a/nixpkgs/pkgs/development/libraries/aws-c-auth/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-c-auth/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "aws-c-auth"; - version = "0.6.8"; + version = "0.6.11"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-auth"; rev = "v${version}"; - sha256 = "sha256-cZyWe3kX5JiB6th1VkkBFKa2MEilRtU+tHvu7c9e+Yw="; + sha256 = "sha256-3pFOnXDvB4CUUG992i5ErKMe3lAiyYoMTSvm6eKyLjs="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/aws-c-cal/default.nix b/nixpkgs/pkgs/development/libraries/aws-c-cal/default.nix index 87d66e15355d..e7f0c0854dbb 100644 --- a/nixpkgs/pkgs/development/libraries/aws-c-cal/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-c-cal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-cal"; - version = "0.5.12"; + version = "0.5.14"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KzuaT9c1l9Uhyj6IEy8JfDYzEYI2OcUkq+KRDoJx+Cc="; + sha256 = "sha256-+hWiDlL0GVVmMajoC+hfyvT4rm16RoAWhUr04B8JZts="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix b/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix index 4af6d9b0ac42..ab52fa5aa746 100644 --- a/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "aws-c-common"; - version = "0.6.18"; + version = "0.6.19"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5Y+cfiVtZGmExPuE3s5m8hnd0HrPwSiKptj0DM1mtUY="; + sha256 = "sha256-oB5kAzIRyr8kfl4sILuIw343ghDZDXSEH97qkUeTqXI="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix b/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix index 2cfba1bd2046..f19a69fc4573 100644 --- a/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-io"; - version = "0.10.13"; + version = "0.10.19"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wdsSxEY9FwJoqdi0S8TNoyq8oxoZORKWeorsSpn+1IY="; + sha256 = "sha256-dPstIWB+wuMJi+EfecPKw0WD1c3IvHS+L1XU72xrAoc="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/aws-c-mqtt/default.nix b/nixpkgs/pkgs/development/libraries/aws-c-mqtt/default.nix index f75b744c3a91..11ba67fe6f5a 100644 --- a/nixpkgs/pkgs/development/libraries/aws-c-mqtt/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-c-mqtt/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "aws-c-mqtt"; - version = "0.7.9"; + version = "0.7.10"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-mqtt"; rev = "v${version}"; - sha256 = "sha256-YMAqK4DOFA5TkMNwLHRk1m14V8lN6X5SDAwrTYWdGMc="; + sha256 = "sha256-efkRr36FbLyS9tgE/ZF3tcmhQ4f5C5ySTlgzThbqv2I="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/aws-c-s3/default.nix b/nixpkgs/pkgs/development/libraries/aws-c-s3/default.nix index bd8ac2365a41..2868e6b80b86 100644 --- a/nixpkgs/pkgs/development/libraries/aws-c-s3/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-c-s3/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "aws-c-s3"; - version = "0.1.30"; + version = "0.1.33"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-s3"; rev = "v${version}"; - sha256 = "sha256-vsKQJPYdaBveb9kpZitmXFTqEeWWA4h0BkqxRzdOu28="; + sha256 = "sha256-lP5Luh/jFmlbb11rE5qYev+DMXjyMNwni0LcNvQGY4o="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/aws-crt-cpp/default.nix b/nixpkgs/pkgs/development/libraries/aws-crt-cpp/default.nix index 9f70be5eb8d0..391ecc26fb86 100644 --- a/nixpkgs/pkgs/development/libraries/aws-crt-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-crt-cpp/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "aws-crt-cpp"; - version = "0.17.8"; + version = "0.17.16"; outputs = [ "out" "dev" ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "awslabs"; repo = "aws-crt-cpp"; rev = "v${version}"; - sha256 = "sha256-eHABIg3v5ycpQzacW/8C74PT6yDOXGmJqDa9P1hN7Mo="; + sha256 = "sha256-RNcx/Enm1bd/NZOcNosNnYsT9Ot7AMQU7wsg+moT16c="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/babl/default.nix b/nixpkgs/pkgs/development/libraries/babl/default.nix index c0765922de5f..7a3c8bc727be 100644 --- a/nixpkgs/pkgs/development/libraries/babl/default.nix +++ b/nixpkgs/pkgs/development/libraries/babl/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl +, fetchpatch , meson , ninja , pkg-config @@ -10,13 +12,21 @@ stdenv.mkDerivation rec { pname = "babl"; - version = "0.1.88"; + version = "0.1.90"; outputs = [ "out" "dev" ]; + patches = [ + # Fix darwin build + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/babl/-/commit/33b18e74c9589fd4d5507ab88bd1fb19c15965dd.patch"; + sha256 = "bEjjOjHGTF55o1z31G9GNDqERxn/7vUuWZQYHosSEBQ="; + }) + ]; + src = fetchurl { url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Tw1/SqoLsucl80mt97NRqVfZ+ybVVdmJWnr4FrQWcDk="; + sha256 = "sha256-bi67Y283WBWI49AkmbPS9p+axz40omL0KRHX9ZBqkkM="; }; nativeBuildInputs = [ @@ -34,6 +44,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Image pixel format conversion library"; homepage = "https://gegl.org/babl/"; + changelog = "https://gitlab.gnome.org/GNOME/babl/-/blob/BABL_${lib.replaceStrings [ "." ] [ "_" ] version}/NEWS"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/bamf/default.nix b/nixpkgs/pkgs/development/libraries/bamf/default.nix index 406ff81fe8ee..96b677b27b5b 100644 --- a/nixpkgs/pkgs/development/libraries/bamf/default.nix +++ b/nixpkgs/pkgs/development/libraries/bamf/default.nix @@ -1,8 +1,7 @@ -{ lib, stdenv -, pantheon -, autoconf -, automake -, libtool +{ stdenv +, lib +, autoreconfHook +, gitUpdater , gnome , which , fetchgit @@ -23,26 +22,24 @@ stdenv.mkDerivation rec { pname = "bamf"; - version = "0.5.5"; + version = "0.5.6"; outputs = [ "out" "dev" "devdoc" ]; src = fetchgit { url = "https://git.launchpad.net/~unity-team/bamf"; - rev = "${version}+21.10.20210710-0ubuntu1"; - sha256 = "0iwz5z5cz9r56pmfjvjd2kcjlk416dw6g38svs33ynssjgsqbdm0"; + rev = version; + sha256 = "7U+2GcuDjPU8quZjkd8bLADGlG++tl6wSo0mUQkjAXQ="; }; nativeBuildInputs = [ (python3.withPackages (ps: with ps; [ lxml ])) # Tests - autoconf - automake + autoreconfHook dbus docbook_xsl gnome.gnome-common gobject-introspection gtk-doc - libtool pkg-config vala which @@ -69,22 +66,23 @@ stdenv.mkDerivation rec { "--enable-headless-tests" ]; - # fix paths + # Fix paths makeFlags = [ "INTROSPECTION_GIRDIR=${placeholder "dev"}/share/gir-1.0/" "INTROSPECTION_TYPELIBDIR=${placeholder "out"}/lib/girepository-1.0" ]; - preConfigure = '' - ./autogen.sh - ''; - # TODO: Requires /etc/machine-id doCheck = false; - # glib-2.62 deprecations + # Ignore deprecation errors NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; + passthru.updateScript = gitUpdater { + inherit pname version; + ignoredVersions = ".ubuntu.*"; + }; + meta = with lib; { description = "Application matching framework"; longDescription = '' diff --git a/nixpkgs/pkgs/development/libraries/cimg/default.nix b/nixpkgs/pkgs/development/libraries/cimg/default.nix index 47e9ffa925ab..4a482c9da454 100644 --- a/nixpkgs/pkgs/development/libraries/cimg/default.nix +++ b/nixpkgs/pkgs/development/libraries/cimg/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "cimg"; - version = "3.0.0"; + version = "3.0.2"; src = fetchFromGitHub { owner = "dtschump"; repo = "CImg"; rev = "v.${version}"; - hash = "sha256-dC4VuWTz0uyFxLjBQ+2ggndHaCErcoI7tJMfkqbWmeg="; + hash = "sha256-OWpztnyVXCg+uoAb6e/2eUK2ebBalDlz6Qcjf17IeMk="; }; outputs = [ "out" "doc" ]; diff --git a/nixpkgs/pkgs/development/libraries/cmark-gfm/default.nix b/nixpkgs/pkgs/development/libraries/cmark-gfm/default.nix index b25688acfa15..599ac2b2e7b0 100644 --- a/nixpkgs/pkgs/development/libraries/cmark-gfm/default.nix +++ b/nixpkgs/pkgs/development/libraries/cmark-gfm/default.nix @@ -1,19 +1,25 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "cmark-gfm"; - version = "0.29.0.gfm.2"; + version = "0.29.0.gfm.3"; src = fetchFromGitHub { owner = "github"; repo = "cmark-gfm"; rev = version; - sha256 = "sha256-8PjG87hR66ozKx+PSuKi0vHIoKICHSLdl2cKUYf+5m8="; + sha256 = "sha256-V3XegSjqKLCMpfnoYHr9/r5fSC2CC7A2jXkAcHUt7eA="; }; nativeBuildInputs = [ cmake ]; # tests load the library dynamically which for unknown reason failed doCheck = false; + # remove when https://github.com/github/cmark-gfm/pull/248 merged and released + postInstall = '' + substituteInPlace $out/include/cmark-gfm-core-extensions.h \ + --replace '#include "config.h"' '#include <stdbool.h>' + ''; + meta = with lib; { description = "GitHub's fork of cmark, a CommonMark parsing and rendering library and program in C"; homepage = "https://github.com/github/cmark-gfm"; diff --git a/nixpkgs/pkgs/development/libraries/coeurl/default.nix b/nixpkgs/pkgs/development/libraries/coeurl/default.nix index 44e534757ce9..bfa8aef2dd16 100644 --- a/nixpkgs/pkgs/development/libraries/coeurl/default.nix +++ b/nixpkgs/pkgs/development/libraries/coeurl/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "coeurl"; - version = "0.1.1"; + version = "0.2.0"; src = fetchFromGitLab { domain = "nheko.im"; owner = "nheko-reborn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-F4kHE9r2pR8hI+CrZQ9ElPjtp0McgwfSxoD5p56KDGs="; + sha256 = "sha256-IIIl+/5Omv0lYTNAjeA63ofJlBmNe3+yTOxDsvL+ak0="; }; nativeBuildInputs = [ ninja pkg-config meson ]; diff --git a/nixpkgs/pkgs/development/libraries/drogon/default.nix b/nixpkgs/pkgs/development/libraries/drogon/default.nix index 7258cb767e3f..432e7626156b 100644 --- a/nixpkgs/pkgs/development/libraries/drogon/default.nix +++ b/nixpkgs/pkgs/development/libraries/drogon/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "drogon"; - version = "1.7.4"; + version = "1.7.5"; src = fetchFromGitHub { owner = "drogonframework"; repo = "drogon"; rev = "v${version}"; - sha256 = "02igryrv8782rwqb4w49frymlw9n7hv8fskqsw43rqly650vzakb"; + sha256 = "sha256-DrpaXUaoO35DgmX8cYb3kbXfd6PlqI6pjEKnroiRxvg="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/development/libraries/drumstick/default.nix b/nixpkgs/pkgs/development/libraries/drumstick/default.nix index 7cbeffd5b7ec..69b330f5a48e 100644 --- a/nixpkgs/pkgs/development/libraries/drumstick/default.nix +++ b/nixpkgs/pkgs/development/libraries/drumstick/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "drumstick"; - version = "2.4.1"; + version = "2.5.1"; src = fetchurl { url = "mirror://sourceforge/drumstick/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-nmqgS08ZBQ2vBEDtoriNbYLaNQA1DWeDhbRo70rBOP0="; + hash = "sha256-V57YnyeOVBXL5qjuCO1j1Ozy9CeaXxadw6ed1suUUIU="; }; patches = [ @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { maintainers = []; description = "MIDI libraries for Qt5/C++"; - homepage = "http://drumstick.sourceforge.net/"; + homepage = "https://drumstick.sourceforge.io/"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/development/libraries/elpa/default.nix b/nixpkgs/pkgs/development/libraries/elpa/default.nix index 76152996a1d0..2a71b82af3cb 100644 --- a/nixpkgs/pkgs/development/libraries/elpa/default.nix +++ b/nixpkgs/pkgs/development/libraries/elpa/default.nix @@ -18,13 +18,13 @@ assert blas.isILP64 == scalapack.isILP64; stdenv.mkDerivation rec { pname = "elpa"; - version = "2021.11.001"; + version = "2021.11.002"; passthru = { inherit (blas) isILP64; }; src = fetchurl { url = "https://elpa.mpcdf.mpg.de/software/tarball-archive/Releases/${version}/elpa-${version}.tar.gz"; - sha256 = "0bw0nwzwvjfmijfwznmrghypd3q237a3h5g5fcdncilrqnk1sdpv"; + sha256 = "sha256-V28cru14g7gTlmQP2g9QQYOGbPbL1Lxx0Tg7oiCPH5c="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/exiv2/default.nix b/nixpkgs/pkgs/development/libraries/exiv2/default.nix index d970f376d099..f352714d237c 100644 --- a/nixpkgs/pkgs/development/libraries/exiv2/default.nix +++ b/nixpkgs/pkgs/development/libraries/exiv2/default.nix @@ -103,6 +103,15 @@ stdenv.mkDerivation rec { remove-references-to -t ${stdenv.cc.cc} $lib/lib/*.so.*.*.* $out/bin/exiv2 $static/lib/*.a ''; + postFixup = '' + substituteInPlace "$dev"/lib/cmake/exiv2/exiv2Config.cmake --replace \ + "set(_IMPORT_PREFIX \"$out\")" \ + "set(_IMPORT_PREFIX \"$static\")" + substituteInPlace "$dev"/lib/cmake/exiv2/exiv2Config-*.cmake --replace \ + "$lib/lib/libexiv2-xmp.a" \ + "$static/lib/libexiv2-xmp.a" + ''; + disallowedReferences = [ stdenv.cc.cc ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/expat/default.nix b/nixpkgs/pkgs/development/libraries/expat/default.nix index 322c6ecebbf6..9e913fdf52b4 100644 --- a/nixpkgs/pkgs/development/libraries/expat/default.nix +++ b/nixpkgs/pkgs/development/libraries/expat/default.nix @@ -1,4 +1,13 @@ -{ stdenv, fetchurl, lib }: +{ lib +, stdenv +, fetchurl +# for passthru.tests +, python3 +, perlPackages +, haskellPackages +, luaPackages +, ocamlPackages +}: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -34,6 +43,14 @@ stdenv.mkDerivation rec { --replace "$"'{_IMPORT_PREFIX}' $out ''; + passthru.tests = { + inherit python3; + inherit (haskellPackages) hexpat; + inherit (perlPackages) XMLSAXExpat XMLParser; + inherit (luaPackages) luaexpat; + inherit (ocamlPackages) ocaml_expat; + }; + meta = with lib; { homepage = "https://libexpat.github.io/"; description = "A stream-oriented XML parser library written in C"; diff --git a/nixpkgs/pkgs/development/libraries/febio/default.nix b/nixpkgs/pkgs/development/libraries/febio/default.nix new file mode 100644 index 000000000000..4d01bf52bf73 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/febio/default.nix @@ -0,0 +1,55 @@ +{ lib, stdenv, fetchFromGitHub, cmake, boost, eigen, libxml2, mpi, python3 +, mklSupport ? true, mkl +}: + +stdenv.mkDerivation rec { + pname = "FEBio"; + version = "3.6"; + + src = fetchFromGitHub { + owner = "febiosoftware"; + repo = pname; + rev = "v${version}"; + sha256 = "187s4lyzr806xla3smq3lsvj3f6wxlhfkban89w0fnyfmfb8w9am"; + }; + + patches = [ + ./fix-cmake.patch # cannot find mkl libraries without this + ]; + + cmakeFlags = lib.optional mklSupport "-DUSE_MKL=On" + ++ lib.optional mklSupport "-DMKLROOT=${mkl}" + ; + + installPhase = '' + runHook preInstall + + mkdir -p $out/include + cp -R lib bin $out/ + cp -R ../FECore \ + ../FEBioFluid \ + ../FEBioLib \ + ../FEBioMech \ + ../FEBioMix \ + ../FEBioOpt \ + ../FEBioPlot \ + ../FEBioXML \ + ../NumCore \ + $out/include + + runHook postInstall + ''; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost eigen libxml2 mpi python3 python3.pkgs.numpy ] + ++ lib.optional mklSupport mkl + ; + + meta = { + description = "FEBio Suite Solver"; + license = with lib.licenses; [ mit ]; + homepage = "https://febio.org/"; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ Scriptkiddi ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/febio/fix-cmake.patch b/nixpkgs/pkgs/development/libraries/febio/fix-cmake.patch new file mode 100644 index 000000000000..5af10a0b3962 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/febio/fix-cmake.patch @@ -0,0 +1,26 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -47,7 +47,7 @@ function(findLib libName libDir libOut) + find_library(TEMP NAMES ${libName}.lib ${ARGV3}.lib ${ARGV4}.lib ${ARGV5}.lib ${ARGV6}.lib + PATHS ${${libDir}} NO_DEFAULT_PATH) + else() +- find_library(TEMP NAMES lib${libName}.a lib${ARGV3}.a lib${ARGV4}.a lib${ARGV5}.a lib${ARGV6}.a ++ find_library(TEMP NAMES lib${libName}.a lib${ARGV3}.a lib${ARGV4}.a lib${ARGV5}.a lib${ARGV6}.a lib${libName}.so lib${ARGV3}.so lib${ARGV4}.so lib${ARGV5}.so lib${ARGV6}.so + PATHS ${${libDir}} NO_DEFAULT_PATH) + endif() + +diff --git a/FindDependencies.cmake b/FindDependencies.cmake +index 2d644005f..7261ba923 100644 +--- a/FindDependencies.cmake ++++ b/FindDependencies.cmake +@@ -46,8 +46,8 @@ if(MKLROOT) + NO_DEFAULT_PATH) + + find_library(MKL_OMP_LIB +- NAMES iomp5 iomp5md libiomp5md.lib +- PATHS ${MKLROOT}/../lib ${MKLROOT}/../compiler/lib ++ NAMES libiomp5.so libiomp5 iomp5 iomp5md libiomp5md.lib ++ PATHS ${MKLROOT}/lib ${MKLROOT}/../lib ${MKLROOT}/../compiler/lib + PATH_SUFFIXES "intel64" "intel32" + NO_DEFAULT_PATH + DOC "MKL OMP Library") diff --git a/nixpkgs/pkgs/development/libraries/flatpak/default.nix b/nixpkgs/pkgs/development/libraries/flatpak/default.nix index c97f1effd67c..88188f8d0ca4 100644 --- a/nixpkgs/pkgs/development/libraries/flatpak/default.nix +++ b/nixpkgs/pkgs/development/libraries/flatpak/default.nix @@ -53,14 +53,14 @@ stdenv.mkDerivation rec { pname = "flatpak"; - version = "1.12.4"; + version = "1.12.6"; # TODO: split out lib once we figure out what to do with triggerdir outputs = [ "out" "dev" "man" "doc" "devdoc" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "792e6265f7f6d71b2a087028472a048287bed2587e43d2eec2c31d360c16211c"; # Taken from https://github.com/flatpak/flatpak/releases/ + sha256 = "7wLLUFuRzOUXMJm1SFdo7vGJnrzznt+CfEJUFjqBFic="; # Taken from https://github.com/flatpak/flatpak/releases/ }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/flatpak/unset-env-vars.patch b/nixpkgs/pkgs/development/libraries/flatpak/unset-env-vars.patch index 63ce0d12fe07..6b8017684d45 100644 --- a/nixpkgs/pkgs/development/libraries/flatpak/unset-env-vars.patch +++ b/nixpkgs/pkgs/development/libraries/flatpak/unset-env-vars.patch @@ -1,11 +1,11 @@ diff --git a/common/flatpak-run.c b/common/flatpak-run.c -index 8d52d3a5..81700183 100644 +index 146c4f87..bcdad2bc 100644 --- a/common/flatpak-run.c +++ b/common/flatpak-run.c -@@ -1232,6 +1232,7 @@ static const ExportData default_exports[] = { - {"PERLLIB", NULL}, - {"PERL5LIB", NULL}, - {"XCURSOR_PATH", NULL}, +@@ -1710,6 +1710,7 @@ static const ExportData default_exports[] = { + {"GST_PTP_HELPER", NULL}, + {"GST_PTP_HELPER_1_0", NULL}, + {"GST_INSTALL_PLUGINS_HELPER", NULL}, + {"GDK_PIXBUF_MODULE_FILE", NULL}, }; diff --git a/nixpkgs/pkgs/development/libraries/flite/default.nix b/nixpkgs/pkgs/development/libraries/flite/default.nix index cd8eb538462b..f4eac39919f2 100644 --- a/nixpkgs/pkgs/development/libraries/flite/default.nix +++ b/nixpkgs/pkgs/development/libraries/flite/default.nix @@ -27,7 +27,9 @@ stdenv.mkDerivation rec { "--enable-shared" ] ++ lib.optionals stdenv.isLinux [ "--with-audio=alsa" ]; - enableParallelBuilding = true; + # main/Makefile creates and removes 'flite_voice_list.c' from multiple targets: + # make[1]: *** No rule to make target 'flite_voice_list.c', needed by 'all'. Stop + enableParallelBuilding = false; meta = with lib; { description = "A small, fast run-time speech synthesis engine"; diff --git a/nixpkgs/pkgs/development/libraries/folly/default.nix b/nixpkgs/pkgs/development/libraries/folly/default.nix index f6dfa9695281..dfc194f1d4cd 100644 --- a/nixpkgs/pkgs/development/libraries/folly/default.nix +++ b/nixpkgs/pkgs/development/libraries/folly/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "folly"; - version = "2022.02.14.00"; + version = "2022.02.28.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "sha256-tJuHzEi4nrj5jb6tmJeG21ggl4F+wvQyssEPNp/t6Ww="; + sha256 = "sha256-9h2NsfQMQ7ps9Rt0HhTD+YKwk/soGchCC9GyEJGcm4g="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/freetds/default.nix b/nixpkgs/pkgs/development/libraries/freetds/default.nix index e5797d332ae2..1fd088684cf8 100644 --- a/nixpkgs/pkgs/development/libraries/freetds/default.nix +++ b/nixpkgs/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.3.8"; + version = "1.3.9"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - sha256 = "sha256-18p+ZaJgwCvjUchel4aaOjIr5jeVPKRNNhW1WljSezM="; + sha256 = "sha256-qByKmGp6LwuUWZ69eheF1yAX3qbXlqf0S2rGge53wuc="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/ftxui/default.nix b/nixpkgs/pkgs/development/libraries/ftxui/default.nix index df664a309a7c..27a21ceca665 100644 --- a/nixpkgs/pkgs/development/libraries/ftxui/default.nix +++ b/nixpkgs/pkgs/development/libraries/ftxui/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "ftxui"; - version = "unstable-2021-08-13"; + version = "2.0.0"; src = fetchFromGitHub { owner = "ArthurSonzogni"; repo = pname; - rev = "69b0c9e53e523ac43a303964fc9c5bc0da7d5d61"; - sha256 = "0cbljksgy1ckw34h0mq70s8sma0p16sznn4z9r4hwv76y530m0ww"; + rev = "v${version}"; + sha256 = "sha256-BfNUk2DbBpKMBEu1tQWl85tgjB/4NAh86VVSS9zAjKo="; }; nativeBuildInputs = [ @@ -23,9 +23,13 @@ stdenv.mkDerivation rec { graphviz ]; + # gtest and gbenchmark don't seem to generate any binaries + doCheck = false; + meta = with lib; { homepage = "https://github.com/ArthurSonzogni/FTXUI"; - description = "Functional Terminal User Interface for C++"; + changelog = "https://github.com/ArthurSonzogni/FTXUI/blob/v${version}/CHANGELOG.md"; + description = "Functional Terminal User Interface library for C++"; license = licenses.mit; maintainers = [ maintainers.ivar ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/gegl/default.nix b/nixpkgs/pkgs/development/libraries/gegl/default.nix index 6acb93c82bed..df1b86fd1b78 100644 --- a/nixpkgs/pkgs/development/libraries/gegl/default.nix +++ b/nixpkgs/pkgs/development/libraries/gegl/default.nix @@ -36,14 +36,14 @@ stdenv.mkDerivation rec { pname = "gegl"; - version = "0.4.34"; + version = "0.4.36"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-72PwvKW0McYRmt3YNMp/u1B8kAxIYcV7Nme29Mz8qqo="; + sha256 = "sha256-b9WKDNzHcCJYra7/tXOjiSKK6PDv9HV479ojCbYbLKY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/gensio/default.nix b/nixpkgs/pkgs/development/libraries/gensio/default.nix index c4d961f4b76f..90fe46582672 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.9"; + version = "2.3.6"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SN8zMMBX02kIS9q1/7DO+t826DpmbZBO37TDZtvRT1A="; + sha256 = "sha256-aPTwN5DuUFPqLDwq73KvmBR8tEN5bIX6/JOZMfOAoow="; }; passthru = { diff --git a/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix b/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix index 870e919357e0..8758daf9c3ab 100644 --- a/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix @@ -11,6 +11,7 @@ , gtest , ninja , nlohmann_json +, openssl , pkg-config , protobuf # default list of APIs: https://github.com/googleapis/google-cloud-cpp/blob/v1.32.1/CMakeLists.txt#L173 @@ -18,29 +19,29 @@ , staticOnly ? stdenv.hostPlatform.isStatic }: let - googleapisRev = "ed739492993c4a99629b6430affdd6c0fb59d435"; + googleapisRev = "d4f3468ef85278428005ed555b3a85db91551ee6"; googleapis = fetchFromGitHub { owner = "googleapis"; repo = "googleapis"; rev = googleapisRev; - hash = "sha256:1xrnh77vb8hxmf1ywqsifzd39kylhbdyah0b0b9bm7nw0mnahssl"; + hash = "sha256-sIQVFQhE3Ae6ia45apzdgtwzglMM4hFZ8efNAhMO5ZY="; }; excludedTests = builtins.fromTOML (builtins.readFile ./skipped_tests.toml); in stdenv.mkDerivation rec { pname = "google-cloud-cpp"; - version = "1.32.1"; + version = "1.38.0"; src = fetchFromGitHub { owner = "googleapis"; repo = "google-cloud-cpp"; rev = "v${version}"; - sha256 = "0g720sni70nlncv4spm4rlfykdkpjnv81axfz2jd1arpdajm0mg9"; + sha256 = "sha256-kobOkohWIDTQaaihhoh/25tZUNv+CjKFwj2xQqO52bA="; }; postPatch = '' substituteInPlace external/googleapis/CMakeLists.txt \ - --replace "https://github.com/googleapis/googleapis/archive/${googleapisRev}.tar.gz" "file://${googleapis}" + --replace "https://github.com/googleapis/googleapis/archive/\''${GOOGLE_CLOUD_CPP_GOOGLEAPIS_COMMIT_SHA}.tar.gz" "file://${googleapis}" ''; nativeBuildInputs = [ @@ -48,7 +49,7 @@ stdenv.mkDerivation rec { ninja pkg-config ] ++ lib.optionals (!doInstallCheck) [ - # enable these dependencies when doInstallCheck failse because we're + # enable these dependencies when doInstallCheck is false because we're # unconditionally building tests and benchmarks # # when doInstallCheck is true, these deps are added to installCheckInputs @@ -63,6 +64,7 @@ stdenv.mkDerivation rec { curl grpc nlohmann_json + openssl protobuf ]; diff --git a/nixpkgs/pkgs/development/libraries/google-cloud-cpp/skipped_tests.toml b/nixpkgs/pkgs/development/libraries/google-cloud-cpp/skipped_tests.toml index c2fb2a24483a..8cbe766862b2 100644 --- a/nixpkgs/pkgs/development/libraries/google-cloud-cpp/skipped_tests.toml +++ b/nixpkgs/pkgs/development/libraries/google-cloud-cpp/skipped_tests.toml @@ -1,6 +1,6 @@ whole = [ "bigquery_bigquery_read_integration_test", - "bigtable_admin_backup_integration_test", + "bigtable_admin_admin_iam_policy_integration_test", "bigtable_admin_iam_policy_integration_test", "bigtable_admin_integration_test", "bigtable_apply_read_latency_benchmark", @@ -15,12 +15,15 @@ whole = [ "bigtable_table_sample_rows_integration_test", "iam_iam_credentials_integration_test", "iam_iam_integration_test", + "logging_quickstart", "pubsub_endurance", "pubsub_schema_admin_integration_test", "pubsub_subscriber_integration_test", "pubsub_subscription_admin_integration_test", "pubsub_throughput", "pubsub_topic_admin_integration_test", + "rest_internal_internal_curl_rest_client_integration_test", + "rest_internal_internal_unified_rest_credentials_integration_test", "spanner_admin_backup_extra_integration_test", "spanner_admin_database_admin_integration_test", "spanner_admin_instance_admin_integration_test", diff --git a/nixpkgs/pkgs/development/libraries/gsettings-qt/default.nix b/nixpkgs/pkgs/development/libraries/gsettings-qt/default.nix index 21b63875db6c..ed979c02c868 100644 --- a/nixpkgs/pkgs/development/libraries/gsettings-qt/default.nix +++ b/nixpkgs/pkgs/development/libraries/gsettings-qt/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitLab, pkg-config , qmake, qtbase, qtdeclarative, wrapQtAppsHook , glib, gobject-introspection -, genericUpdater, common-updater-scripts +, gitUpdater }: stdenv.mkDerivation rec { @@ -55,10 +55,9 @@ stdenv.mkDerivation rec { done ''; - passthru.updateScript = genericUpdater { + passthru.updateScript = gitUpdater { inherit pname version; rev-prefix = "v"; - versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/gtk-frdp/default.nix b/nixpkgs/pkgs/development/libraries/gtk-frdp/default.nix index b7c2d5d3aa9c..ffb4e5bbbf90 100644 --- a/nixpkgs/pkgs/development/libraries/gtk-frdp/default.nix +++ b/nixpkgs/pkgs/development/libraries/gtk-frdp/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation rec { pname = "gtk-frdp"; - version = "unstable-2021-10-01"; + version = "unstable-2021-10-28"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = pname; - rev = "9c15c1202ed66fe20334e33d798cc5ebd39917f0"; - sha256 = "2YOLpyd26qWQKvneH4ww2DS8h/ZNYDmfbYIjQDvDMko="; + rev = "a44d84ec687f41ad37e43697b28a018f65780780"; + sha256 = "7J4jf3gDiorsc4zs6zwC+j/Zg0oZWKAFAz9vvJJ2CYM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/gvfs/default.nix b/nixpkgs/pkgs/development/libraries/gvfs/default.nix index 547c35e66eca..c79f849d22f1 100644 --- a/nixpkgs/pkgs/development/libraries/gvfs/default.nix +++ b/nixpkgs/pkgs/development/libraries/gvfs/default.nix @@ -108,6 +108,8 @@ stdenv.mkDerivation rec { "-Dkeyring=false" "-Dhttp=false" "-Dgoogle=false" + ] ++ lib.optionals (avahi == null) [ + "-Ddnssd=false" ] ++ lib.optionals (samba == null) [ # Xfce don't want samba "-Dsmb=false" diff --git a/nixpkgs/pkgs/development/libraries/gvm-libs/default.nix b/nixpkgs/pkgs/development/libraries/gvm-libs/default.nix index 63692ca7de0e..a141d36e3300 100644 --- a/nixpkgs/pkgs/development/libraries/gvm-libs/default.nix +++ b/nixpkgs/pkgs/development/libraries/gvm-libs/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "gvm-libs"; - version = "21.4.3"; + version = "21.4.4"; src = fetchFromGitHub { owner = "greenbone"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1NVLGyUDUnOy3GYDtVyhGTvWOYoWp95EbkgTlFWuxE8="; + sha256 = "sha256-Ps8J9JuLKcrowl9wgZ3Wm7JTXyiejQPDr4OV/IvDy+I="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/highfive/default.nix b/nixpkgs/pkgs/development/libraries/highfive/default.nix index 1a8ea5c1ae56..5eb6ceb204e7 100644 --- a/nixpkgs/pkgs/development/libraries/highfive/default.nix +++ b/nixpkgs/pkgs/development/libraries/highfive/default.nix @@ -11,7 +11,7 @@ assert mpiSupport -> mpi != null; stdenv.mkDerivation rec { - pname = "highfive"; + pname = "highfive${lib.optionalString mpiSupport "-mpi"}"; version = "2.3.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix b/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix index 8581ab729a63..d9ac5e4da3fc 100644 --- a/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "22.0.2"; + version = "22.0.3"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "intel-gmmlib-${version}"; - sha256 = "001kkm1l4s9i7ikaqpf78l5h0a5dy1m9w5r5g0yrlqpi54h6ph28"; + sha256 = "sha256-cXolz4hKLSTs8K9tCxaKnC2Pr0lQ0M+pPeF2w6bOAR8="; }; nativeBuildInputs = [ cmake ]; @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { OpenCL(TM) and the Intel(R) Media Driver for VAAPI. ''; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = with maintainers; [ primeos SuperSandro2000 ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix b/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix index 08ce42354985..380f0c1f7e25 100644 --- a/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix +++ b/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "22.1.1"; + version = "22.2.2"; outputs = [ "out" "dev" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "1gv89k48s03hwvlcg484li0dznqg93z82xv9lpv3gkncvwfvh9c8"; + sha256 = "sha256-ksh8xx46x9OgXBrhJr3FnBI9g4PHXUDhLPbgpvccffM="; }; patches = [ @@ -63,6 +63,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/intel/media-driver/releases/tag/intel-media-${version}"; license = with licenses; [ bsd3 mit ]; platforms = platforms.linux; - maintainers = with maintainers; [ primeos jfrankenau SuperSandro2000 ]; + maintainers = with maintainers; [ jfrankenau SuperSandro2000 ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix b/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix index d383a3093f21..71a4437397a5 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 = "22.1.0"; + version = "22.2.0"; src = fetchFromGitHub { owner = "Intel-Media-SDK"; repo = "MediaSDK"; rev = "intel-mediasdk-${version}"; - sha256 = "sha256-iISG947MUWVVAxykFwB5UK5Z4uQnEWJ6AFr/ZlHx4Nw="; + sha256 = "sha256-Hcm48KTuBQbnVHd/T5XqQKbVS/XgJ4TYNbSCc8O53XQ="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/kquickimageedit/default.nix b/nixpkgs/pkgs/development/libraries/kquickimageedit/default.nix index ca0afe103b71..1089c3ddf1f1 100644 --- a/nixpkgs/pkgs/development/libraries/kquickimageedit/default.nix +++ b/nixpkgs/pkgs/development/libraries/kquickimageedit/default.nix @@ -1,19 +1,28 @@ -{ mkDerivation +{ lib +, mkDerivation , fetchFromGitLab , extra-cmake-modules }: mkDerivation rec { pname = "kquickimageeditor"; - version = "0.1.3"; + version = "0.2.0"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "libraries"; repo = pname; rev = "v${version}"; - sha256 = "sha256-p2uOssS5MQSkmppNKOjTxp866Qx1rIB6ZPhcmVvfBxs="; + sha256 = "sha256-g7+BAWjpQBJPbrwnIwSudjBFtwaj4JKemV+BLfPzl4I="; }; nativeBuildInputs = [ extra-cmake-modules ]; + + meta = with lib; { + description = "Set of QtQuick components providing basic image editing capabilities"; + homepage = "https://invent.kde.org/libraries/kquickimageeditor"; + license = licenses.lgpl21Plus; + platforms = platforms.unix; + badPlatforms = platforms.darwin; + }; } diff --git a/nixpkgs/pkgs/development/libraries/libaacs/default.nix b/nixpkgs/pkgs/development/libraries/libaacs/default.nix index 3d28d6ef5a99..a270051f48ab 100644 --- a/nixpkgs/pkgs/development/libraries/libaacs/default.nix +++ b/nixpkgs/pkgs/development/libraries/libaacs/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "libaacs"; - version = "0.11.0"; + version = "0.11.1"; src = fetchurl { url = "http://get.videolan.org/libaacs/${version}/${pname}-${version}.tar.bz2"; - sha256 = "11skjqjlldmbjkyxdcz4fmcn6y4p95r1xagbcnjy4ndnzf0l723d"; + sha256 = "sha256-qIqg6+TJinf3rv/ZKrPvZKxUjGuCLoJIqLkmclvqCjk="; }; buildInputs = [ libgcrypt libgpg-error ]; diff --git a/nixpkgs/pkgs/development/libraries/libbap/default.nix b/nixpkgs/pkgs/development/libraries/libbap/default.nix index c15de88f6a76..0b378c583ad1 100644 --- a/nixpkgs/pkgs/development/libraries/libbap/default.nix +++ b/nixpkgs/pkgs/development/libraries/libbap/default.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation { --replace "-linkpkg" "-thread -linkpkg" ''; - nativeBuildInputs = [ autoreconfHook which ]; - buildInputs = [ ocaml bap findlib ctypes ]; + nativeBuildInputs = [ autoreconfHook which ocaml findlib ]; + buildInputs = [ bap ctypes ]; preInstall = '' mkdir -p $out/lib diff --git a/nixpkgs/pkgs/development/libraries/libbladeRF/default.nix b/nixpkgs/pkgs/development/libraries/libbladeRF/default.nix index e8b550e06c2a..08cba497fc9d 100644 --- a/nixpkgs/pkgs/development/libraries/libbladeRF/default.nix +++ b/nixpkgs/pkgs/development/libraries/libbladeRF/default.nix @@ -10,24 +10,15 @@ let }; in stdenv.mkDerivation rec { pname = "libbladeRF"; - version = "2.2.1"; + version = "2.4.1"; src = fetchFromGitHub { owner = "Nuand"; repo = "bladeRF"; rev = "libbladeRF_v${version}"; - sha256 = "0g89al4kwfbx1l3zjddgb9ay4mhr7zk0ndchca3sm1vq2j47nf4l"; + sha256 = "05axh51lrzxpz2qfswnjwxpfk3mlsv2wc88dd12gfr1karn5jwz9"; }; - # This patch is required for version 2.2.1. As the patch is already part of - # upstream master, it will be incorporated into the next release. The patch - # fixes a (well-justified) compiler warning which breaks the build because - # we compile with -Werror. - patches = [ (fetchpatch { - url = "https://github.com/Nuand/bladeRF/commit/163425d48a3b7d8c100d7295220d3648c050d0dd.patch"; - sha256 = "1swsymlyxm3yk2k8l71z1fv0a5k2rmab02f0c7xkrvk683mq6yxw"; - }) ]; - nativeBuildInputs = [ cmake pkg-config git doxygen help2man ]; # ncurses used due to https://github.com/Nuand/bladeRF/blob/ab4fc672c8bab4f8be34e8917d3f241b1d52d0b8/host/utilities/bladeRF-cli/CMakeLists.txt#L208 buildInputs = [ tecla libusb1 ] diff --git a/nixpkgs/pkgs/development/libraries/libcouchbase/default.nix b/nixpkgs/pkgs/development/libraries/libcouchbase/default.nix index 0c9cd1a75304..574d0b9d94cb 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 = "3.2.4"; + version = "3.2.5"; src = fetchFromGitHub { owner = "couchbase"; repo = "libcouchbase"; rev = version; - sha256 = "sha256-7gHqnhNog0CN92YyvypbHWWUnCDuvGP4oiJjtP9GkIY="; + sha256 = "sha256-ffeSrWcvxvMY4mmA/+VoMitoCVUUP91t1lIOcuzNrJY="; }; cmakeFlags = [ "-DLCB_NO_MOCK=ON" ]; diff --git a/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix b/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix index 8d506efef89d..5b969284995c 100644 --- a/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.75.0"; + version = "1.76.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - hash = "sha256-3oYQwV1Srnq8VfS+M+BwIznXRxQFXr78SwXO3Xu08ws="; + hash = "sha256-aeYOszOFyLaC1xKswYZLzqoWSFFWOOeOkc+WrtqU0jo="; }; patches = [ @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-jti1aY8a9YB8x6fz7UqTY4uDj6gkMnG1hTN/Mgc+mHs="; + hash = "sha256-sBFXcLXpAkX+HzRKrLKaHhi5ieS8Yc/Uf30WcXyWrok="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libfprint/default.nix b/nixpkgs/pkgs/development/libraries/libfprint/default.nix index 809635c1774a..d2766c4d29ab 100644 --- a/nixpkgs/pkgs/development/libraries/libfprint/default.nix +++ b/nixpkgs/pkgs/development/libraries/libfprint/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "libfprint"; - version = "1.94.2"; + version = "1.94.3"; outputs = [ "out" "devdoc" ]; src = fetchFromGitLab { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "libfprint"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FQwjJOgANSmJu9ev1K2oovNGovsbxnWMxNveTmH5fHg="; + sha256 = "sha256-uOFWF+CDyK4+fY+NhiDnRKaptAN/vfH32Vzj+LAxWqg="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libgda/6.x.nix b/nixpkgs/pkgs/development/libraries/libgda/6.x.nix index 28235d65d98a..c02c6116e648 100644 --- a/nixpkgs/pkgs/development/libraries/libgda/6.x.nix +++ b/nixpkgs/pkgs/development/libraries/libgda/6.x.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , pkg-config , intltool , meson @@ -37,6 +38,20 @@ stdenv.mkDerivation rec { sha256 = "0w564z7krgjk19r39mi5qn4kggpdg9ggbyn9pb4aavb61r14npwr"; }; + patches = [ + # Fix undefined behavior + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libgda/-/commit/657b2f8497da907559a6769c5b1d2d7b5bd40688.patch"; + sha256 = "Qx4S9KQsTAr4M0QJi0Xr5kKuHSp4NwZJHoRPYyxIyTk="; + }) + + # Fix building vapi + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libgda/-/commit/57f618a3b2a3758ee3dcbf9bbdc566122dd8566d.patch"; + sha256 = "pyfymUd61m1kHaGyMbUQMma+szB8mlqGWwcFBBQawf8="; + }) + ]; + nativeBuildInputs = [ pkg-config intltool diff --git a/nixpkgs/pkgs/development/libraries/libgdata/default.nix b/nixpkgs/pkgs/development/libraries/libgdata/default.nix index f85dbea54d9d..e0d3a7318a85 100644 --- a/nixpkgs/pkgs/development/libraries/libgdata/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgdata/default.nix @@ -45,15 +45,15 @@ stdenv.mkDerivation rec { buildInputs = [ gcr - glib - libsoup - libxml2 openssl p11-kit uhttpmock ]; propagatedBuildInputs = [ + glib + libsoup + libxml2 gnome-online-accounts json-glib ]; diff --git a/nixpkgs/pkgs/development/libraries/libgnome-games-support/default.nix b/nixpkgs/pkgs/development/libraries/libgnome-games-support/default.nix new file mode 100644 index 000000000000..80c76ea980f9 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libgnome-games-support/default.nix @@ -0,0 +1,57 @@ +{ lib, stdenv +, fetchurl +, pkg-config +, glib +, gtk3 +, libgee +, gettext +, vala +, gnome +, libintl +, meson +, ninja +}: + +stdenv.mkDerivation rec { + pname = "libgnome-games-support"; + version = "1.8.2"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "KENGBKewOHMawCMXMTiP8QT1ZbsjMMwk54zaBM/T730="; + }; + + nativeBuildInputs = [ + gettext + meson + ninja + pkg-config + vala + ]; + + buildInputs = [ + libintl + ]; + + propagatedBuildInputs = [ + # Required by libgnome-games-support-1.pc + glib + gtk3 + libgee + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + versionPolicy = "odd-unstable"; + }; + }; + + meta = with lib; { + description = "Small library intended for internal use by GNOME Games, but it may be used by others"; + homepage = "https://wiki.gnome.org/Apps/Games"; + license = licenses.lgpl3; + maintainers = teams.gnome.members; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libhdhomerun/default.nix b/nixpkgs/pkgs/development/libraries/libhdhomerun/default.nix index 187382e1f3e9..0c84cb7e0b18 100644 --- a/nixpkgs/pkgs/development/libraries/libhdhomerun/default.nix +++ b/nixpkgs/pkgs/development/libraries/libhdhomerun/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "libhdhomerun"; - version = "20210624"; + version = "20220303"; src = fetchurl { url = "https://download.silicondust.com/hdhomerun/libhdhomerun_${version}.tgz"; - sha256 = "sha256-3q9GO7zD7vpy+XGZ77YhP3sOLI6R8bPSy/UgVqhxXRU="; + sha256 = "sha256-HlT/78LUiTkRUB2jHmYrnQY+bBiv4stcZlMyUnelSpc="; }; patchPhase = lib.optionalString stdenv.isDarwin '' diff --git a/nixpkgs/pkgs/development/libraries/libktorrent/default.nix b/nixpkgs/pkgs/development/libraries/libktorrent/default.nix deleted file mode 100644 index 825fe87fe2fe..000000000000 --- a/nixpkgs/pkgs/development/libraries/libktorrent/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, extra-cmake-modules -, karchive, kcrash, ki18n, kio, solid -, boost, gmp, qca-qt5, libgcrypt -}: - -let - mainVersion = "5.1.2"; - -in stdenv.mkDerivation rec { - pname = "libktorrent"; - version = "2.1.1"; - - src = fetchurl { - url = "mirror://kde/stable/ktorrent/${mainVersion}/${pname}-${version}.tar.xz"; - sha256 = "0051zh8bb4p9wmcfn5ql987brhsaiw9880xdck7b5dm1a05mri2w"; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ cmake extra-cmake-modules ]; - - buildInputs = [ karchive kcrash ki18n kio solid qca-qt5 libgcrypt ]; - - propagatedBuildInputs = [ gmp boost ]; - - passthru = { - inherit mainVersion; - }; - - dontWrapQtApps = true; - - meta = with lib; { - description = "A BitTorrent library used by KTorrent"; - homepage = "https://www.kde.org/applications/internet/ktorrent/"; - maintainers = with maintainers; [ eelco ]; - platforms = platforms.linux; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/liblouis/default.nix b/nixpkgs/pkgs/development/libraries/liblouis/default.nix index f61fb775fbda..893704ddb18c 100644 --- a/nixpkgs/pkgs/development/libraries/liblouis/default.nix +++ b/nixpkgs/pkgs/development/libraries/liblouis/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "liblouis"; - version = "3.20.0"; + version = "3.21.0"; src = fetchFromGitHub { owner = "liblouis"; repo = "liblouis"; rev = "v${version}"; - sha256 = "sha256-DuMVs9cC0VnZg3E9GtZB8LYkp3Ybfzlv8vd4d1Muwyc="; + sha256 = "sha256-Hfn0dfXihtUfO3R+qJaetrPwupcIwblvi1DQdHCF1s8="; }; outputs = [ "out" "dev" "man" "info" "doc" ]; diff --git a/nixpkgs/pkgs/development/libraries/libmodulemd/default.nix b/nixpkgs/pkgs/development/libraries/libmodulemd/default.nix index 8f59975a5967..4ec392be304d 100644 --- a/nixpkgs/pkgs/development/libraries/libmodulemd/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmodulemd/default.nix @@ -11,14 +11,13 @@ , file , gtk-doc , docbook-xsl-nons -, help2man , docbook_xml_dtd_412 , glib }: stdenv.mkDerivation rec { pname = "libmodulemd"; - version = "2.13.0"; + version = "2.14.0"; outputs = [ "bin" "out" "dev" "devdoc" "man" "py" ]; @@ -26,7 +25,7 @@ stdenv.mkDerivation rec { owner = "fedora-modularity"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-hg/it3pHUnEYsmKcLzQKcZNthHZZwdXBjzTlOS1Losk="; + sha256 = "sha256-ccLk8O0UJwy7WZYr5Bq2XqaSFNe4i7HQehmVoB5C2Yg="; }; patches = [ @@ -43,7 +42,6 @@ stdenv.mkDerivation rec { ninja gtk-doc docbook-xsl-nons - help2man docbook_xml_dtd_412 gobject-introspection ]; diff --git a/nixpkgs/pkgs/development/libraries/libosinfo/default.nix b/nixpkgs/pkgs/development/libraries/libosinfo/default.nix index c3852f25741f..a1dd23357dec 100644 --- a/nixpkgs/pkgs/development/libraries/libosinfo/default.nix +++ b/nixpkgs/pkgs/development/libraries/libosinfo/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "libosinfo"; - version = "1.9.0"; + version = "1.10.0"; src = fetchurl { url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-tPNBgVTvP0PZQggnKUkWrqGCcCGvwG4WRPxWlRgwo1k="; + sha256 = "sha256-olLgD8WA3rIdoNqMCqA7jDHoRAuESMi5gUP6tHfTIwU="; }; outputs = [ "out" "dev" "devdoc" ]; @@ -77,6 +77,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GObject based library API for managing information about operating systems, hypervisors and the (virtual) hardware devices they can support"; homepage = "https://libosinfo.org/"; + changelog = "https://gitlab.com/libosinfo/libosinfo/-/blob/v${version}/NEWS"; license = licenses.lgpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/nixpkgs/pkgs/development/libraries/libpulsar/default.nix b/nixpkgs/pkgs/development/libraries/libpulsar/default.nix new file mode 100644 index 000000000000..9abe32241207 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libpulsar/default.nix @@ -0,0 +1,102 @@ +{ lib +, clang-tools +, llvmPackages +, boost17x +, protobuf +, python3Support ? false +, python3 +, log4cxxSupport ? false +, log4cxx +, snappySupport ? false +, snappy +, zlibSupport ? true +, zlib +, zstdSupport ? true +, zstd +, gtest +, gtestSupport ? false +, cmake +, curl +, fetchurl +, jsoncpp +, openssl +, pkg-config +, stdenv +}: + +let + /* + Check if null or false + Example: + let result = enableFeature null + => "OFF" + let result = enableFeature false + => "OFF" + let result = enableFeature «derivation» + => "ON" + */ + enableCmakeFeature = p: if (p == null || p == false) then "OFF" else "ON"; + + # Not really sure why I need to do this.. If I call clang-tools without the override it defaults to a different version and fails + clangTools = clang-tools.override { inherit stdenv llvmPackages; }; + # If boost has python enabled, then boost-python package will be installed which is used by libpulsars python wrapper + boost = if python3Support then boost17x.override { inherit stdenv; enablePython = python3Support; python = python3; } else boost17x; + defaultOptionals = [ boost protobuf ] + ++ lib.optional python3Support python3 + ++ lib.optional snappySupport snappy.dev + ++ lib.optional zlibSupport zlib + ++ lib.optional zstdSupport zstd + ++ lib.optional log4cxxSupport log4cxx; + +in +stdenv.mkDerivation rec { + pname = "libpulsar"; + version = "2.9.1"; + + src = fetchurl { + hash = "sha512-NKHiL7D/Lmnn6ICpQyUmmQYQETz4nZPJU9/4LMRDUQ3Pck6qDh+t6CRk+b9UQ2Vb0jvPIGTjEsSp2nC7TJk3ug=="; + url = "mirror://apache/pulsar/pulsar-${version}/apache-pulsar-${version}-src.tar.gz"; + }; + + sourceRoot = "apache-pulsar-${version}-src/pulsar-client-cpp"; + + # clang-tools needed for clang-format + nativeBuildInputs = [ cmake pkg-config clangTools ] + ++ defaultOptionals + ++ lib.optional gtestSupport gtest.dev; + + buildInputs = [ jsoncpp openssl curl ] + ++ defaultOptionals; + + # Needed for GCC on Linux + NIX_CFLAGS_COMPILE = [ "-Wno-error=return-type" ]; + + cmakeFlags = [ + "-DBUILD_TESTS=${enableCmakeFeature gtestSupport}" + "-DBUILD_PYTHON_WRAPPER=${enableCmakeFeature python3Support}" + "-DUSE_LOG4CXX=${enableCmakeFeature log4cxxSupport}" + "-DClangTools_PATH=${clangTools}/bin" + ]; + + enableParallelBuilding = true; + doInstallCheck = true; + installCheckPhase = '' + echo ${lib.escapeShellArg '' + #include <pulsar/Client.h> + int main (int argc, char **argv) { + pulsar::Client client("pulsar://localhost:6650"); + return 0; + } + ''} > test.cc + $CXX test.cc -L $out/lib -I $out/include -lpulsar -o test + ''; + + meta = with lib; { + homepage = "https://pulsar.apache.org/docs/en/client-libraries-cpp"; + description = "Apache Pulsar C++ library"; + + platforms = platforms.all; + license = licenses.asl20; + maintainers = [ maintainers.corbanr ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libraspberrypi/default.nix b/nixpkgs/pkgs/development/libraries/libraspberrypi/default.nix index a0b959d178f1..2a5b75a7b906 100644 --- a/nixpkgs/pkgs/development/libraries/libraspberrypi/default.nix +++ b/nixpkgs/pkgs/development/libraries/libraspberrypi/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "libraspberrypi"; - version = "unstable-2021-06-23"; + version = "unstable-2021-10-25"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "userland"; - rev = "97bc8180ad682b004ea224d1db7b8e108eda4397"; - sha256 = "0cnjc7w8ynayj90vlpl13xzm9izd8m5b4cvrq52si9vc6wlm4in5"; + rev = "0093675e4aa6e152a3ffc318b51a124e96eb287b"; + sha256 = "qpooQy9k2UZ94KaqlFwurV+tt0GrBSRffGdlvMcn1XU="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/librsb/default.nix b/nixpkgs/pkgs/development/libraries/librsb/default.nix index 0acca9ae24fc..691975b1af4e 100644 --- a/nixpkgs/pkgs/development/libraries/librsb/default.nix +++ b/nixpkgs/pkgs/development/libraries/librsb/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "librsb"; - version = "1.2.0.9"; + version = "1.2.0.10"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1ynrsgnvv1jfm8dv3jwjrip9x9icxv7w3qrk149025j6fbaza8gl"; + sha256 = "sha256-7Enz94p8Q/yeEJdlk9EAqkmxhjMJ7Y+jzLt6rVLS97g="; }; # The default configure flags are still present when building diff --git a/nixpkgs/pkgs/development/libraries/libschrift/default.nix b/nixpkgs/pkgs/development/libraries/libschrift/default.nix index 96b8c7ac2e57..d8093a58deec 100644 --- a/nixpkgs/pkgs/development/libraries/libschrift/default.nix +++ b/nixpkgs/pkgs/development/libraries/libschrift/default.nix @@ -2,23 +2,15 @@ stdenv.mkDerivation rec { pname = "libschrift"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "tomolt"; repo = pname; - rev = "c207585486b3e78ec5506f55f5d56178f421a53c"; - sha256 = "13qrplsi2a53s84giwnzqmn0zbslyaagvjn89wsn9fd90m2v2bs1"; + rev = "v" + version; + sha256 = "0fvji0z6z2al68p07w58l4hc29ds68v71h7z84vxiqhxnsgc0hlv"; }; - # fix a compilation failure related to darwin integers, remove at next release - patches = [ - (fetchpatch { - url = "https://github.com/tomolt/libschrift/commit/1b1292f2cf4b582d66b2f6c87105997391f9fa08.patch"; - sha256 = "076l3n28famgi74nr5bz47yn192bm76p8c8558fm5zj5c21pcfsv"; - }) - ]; - postPatch = '' substituteInPlace config.mk \ --replace "PREFIX = /usr/local" "PREFIX = $out" diff --git a/nixpkgs/pkgs/development/libraries/libsciter/default.nix b/nixpkgs/pkgs/development/libraries/libsciter/default.nix new file mode 100644 index 000000000000..6f3016ce47a4 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libsciter/default.nix @@ -0,0 +1,45 @@ +{ lib +, glib +, cairo +, libuuid +, pango +, gdk-pixbuf +, gtk3 +, stdenv +, fetchurl +, autoPatchelfHook +}: + +stdenv.mkDerivation rec { + pname = "libsciter"; + version = "4.4.8.23-bis"; # Version specified in GitHub commit title + + src = fetchurl { + url = "https://github.com/c-smile/sciter-sdk/raw/9f1724a45f5a53c4d513b02ed01cdbdab08fa0e5/bin.lnx/x64/libsciter-gtk.so"; + sha256 = "a1682fbf55e004f1862d6ace31b5220121d20906bdbf308d0a9237b451e4db86"; + }; + + nativeBuildInputs = [ + autoPatchelfHook + ]; + + buildInputs = [ glib cairo libuuid pango gtk3 ]; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + install -m755 -D $src $out/lib/libsciter-gtk.so + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://sciter.com"; + description = "Embeddable HTML/CSS/JavaScript engine for modern UI development"; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ leixb ]; + license = licenses.unfree; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libsigcxx/3.0.nix b/nixpkgs/pkgs/development/libraries/libsigcxx/3.0.nix index 92229811207f..f6a796f2561d 100644 --- a/nixpkgs/pkgs/development/libraries/libsigcxx/3.0.nix +++ b/nixpkgs/pkgs/development/libraries/libsigcxx/3.0.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "libsigc++"; - version = "3.0.7"; + version = "3.2.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "v76RwNCU6mu8bL05CbfZjGVh7qi22cDCWt2Qam6D1zM="; + sha256 = "jNy5huPwp8W0R0qjyDPWduYkaVCfSJkRDd8RjwQIJlE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libsigcxx/default.nix b/nixpkgs/pkgs/development/libraries/libsigcxx/default.nix index d4583c74df0f..c9f6e11d4118 100644 --- a/nixpkgs/pkgs/development/libraries/libsigcxx/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsigcxx/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libsigc++"; - version = "2.10.7"; + version = "2.10.8"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-0IKiznLHUPZrGkFavj6FLfLq4eivUwEPSsLqJhpHiDI="; + sha256 = "sha256-I1pAvsc0bHuCtqjKrgRWNT3AbnHxS8QUvMhYrxg4cZo="; }; nativeBuildInputs = [ pkg-config meson ninja ]; diff --git a/nixpkgs/pkgs/development/libraries/libsmartcols/default.nix b/nixpkgs/pkgs/development/libraries/libsmartcols/default.nix index bcd1573e2038..077055cbb9a4 100644 --- a/nixpkgs/pkgs/development/libraries/libsmartcols/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsmartcols/default.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python3, gtk-doc}: stdenv.mkDerivation rec { - name = "libsmartcols"; - version = "v2.36.1"; + pname = "libsmartcols"; + version = "2.36.1"; nativeBuildInputs = [ autoreconfHook pkg-config python3 gtk-doc ]; src = fetchFromGitHub { owner = "karelzak"; repo = "util-linux"; - rev = version; + rev = "v${version}"; sha256 = "0z7nv054pqhlihqiw0vk3h40j0cxk1yxf8zzh0ddmvk6834cnyxs"; }; diff --git a/nixpkgs/pkgs/development/libraries/libsnark/default.nix b/nixpkgs/pkgs/development/libraries/libsnark/default.nix index c3e6d0e049e4..37352bf5e3c4 100644 --- a/nixpkgs/pkgs/development/libraries/libsnark/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsnark/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, openssl, boost, gmp, procps }: -let - rev = "9e6b19ff15bc19fba5da1707ba18e7f160e5ed07"; -in stdenv.mkDerivation rec { - name = "libsnark-pre${version}"; - version = lib.substring 0 8 rev; +stdenv.mkDerivation rec { + pname = "libsnark"; + version = "unstable-2018-01-15"; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ openssl boost gmp ] ++ lib.optional stdenv.hostPlatform.isLinux procps; @@ -12,7 +10,7 @@ in stdenv.mkDerivation rec { cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DWITH_PROCPS=OFF" "-DWITH_SUPERCOP=OFF" ]; src = fetchFromGitHub { - inherit rev; + rev = "9e6b19ff15bc19fba5da1707ba18e7f160e5ed07"; owner = "scipr-lab"; repo = "libsnark"; sha256 = "13f02qp2fmfhvxlp4xi69m0l8r5nq913l2f0zwdk7hl46lprfdca"; diff --git a/nixpkgs/pkgs/development/libraries/libtsm/default.nix b/nixpkgs/pkgs/development/libraries/libtsm/default.nix index 9c8e418fba4f..25214242b531 100644 --- a/nixpkgs/pkgs/development/libraries/libtsm/default.nix +++ b/nixpkgs/pkgs/development/libraries/libtsm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libtsm"; - version = "4.0.1"; + version = "4.0.2"; src = fetchFromGitHub { owner = "Aetf"; repo = "libtsm"; rev = "v${version}"; - sha256 = "0mwn91i5h5d518i1s05y7hzv6bc13vzcvxszpfh77473iwg4wprx"; + sha256 = "sha256-BYMRPjGRVSnYzkdbxypkuE0YkeVLPJ32iGZ1b0R6wto="; }; buildInputs = [ libxkbcommon ]; diff --git a/nixpkgs/pkgs/development/libraries/libui/default.nix b/nixpkgs/pkgs/development/libraries/libui/default.nix index 7002f75cc45e..14fb004187d8 100644 --- a/nixpkgs/pkgs/development/libraries/libui/default.nix +++ b/nixpkgs/pkgs/development/libraries/libui/default.nix @@ -1,13 +1,12 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, gtk3, Cocoa }: let - shortName = "libui"; - version = "4.1a"; backend = if stdenv.isDarwin then "darwin" else "unix"; in -stdenv.mkDerivation { - name = "${shortName}-${version}"; +stdenv.mkDerivation rec { + pname = "libui"; + version = "4.1a"; src = fetchFromGitHub { owner = "andlabs"; repo = "libui"; @@ -27,22 +26,22 @@ stdenv.mkDerivation { mkdir -p $out/{include,lib} mkdir -p $out/lib/pkgconfig '' + lib.optionalString stdenv.isLinux '' - mv ./out/${shortName}.so.0 $out/lib/ - ln -s $out/lib/${shortName}.so.0 $out/lib/${shortName}.so + mv ./out/libui.so.0 $out/lib/ + ln -s $out/lib/libui.so.0 $out/lib/libui.so '' + lib.optionalString stdenv.isDarwin '' - mv ./out/${shortName}.A.dylib $out/lib/ - ln -s $out/lib/${shortName}.A.dylib $out/lib/${shortName}.dylib + mv ./out/libui.A.dylib $out/lib/ + ln -s $out/lib/lubui.A.dylib $out/lib/libui.dylib '' + '' cp $src/ui.h $out/include cp $src/ui_${backend}.h $out/include - cp ${./libui.pc} $out/lib/pkgconfig/${shortName}.pc - substituteInPlace $out/lib/pkgconfig/${shortName}.pc \ + cp ${./libui.pc} $out/lib/pkgconfig/libui.pc + substituteInPlace $out/lib/pkgconfig/libui.pc \ --subst-var-by out $out \ --subst-var-by version "${version}" ''; postInstall = lib.optionalString stdenv.isDarwin '' - install_name_tool -id $out/lib/${shortName}.A.dylib $out/lib/${shortName}.A.dylib + install_name_tool -id $out/lib/libui.A.dylib $out/lib/libui.A.dylib ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch b/nixpkgs/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch index 86dd461ea07d..0945f21211dc 100644 --- a/nixpkgs/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch +++ b/nixpkgs/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch @@ -1,4 +1,4 @@ -From a896b0be849455edb83a9305dfec9b41447ef3e4 Mon Sep 17 00:00:00 2001 +From ad42041cfedcf25716429d2aad16641e0e2a012f Mon Sep 17 00:00:00 2001 From: Euan Kemp <euank@euank.com> Date: Thu, 14 Jan 2021 00:32:00 -0800 Subject: [PATCH] meson: patch in an install prefix for building on nix @@ -6,22 +6,28 @@ Subject: [PATCH] meson: patch in an install prefix for building on nix Used in the nixpkgs version of libvirt so that we can install things in the nix store, but read them from the root filesystem. --- - meson.build | 9 +++++++++ + meson.build | 9 ++++++++ meson_options.txt | 2 ++ - src/libxl/meson.build | 6 +++--- - src/locking/meson.build | 8 ++++---- - src/lxc/meson.build | 6 +++--- - src/meson.build | 18 +++++++++--------- - src/network/meson.build | 12 ++++++------ + src/ch/meson.build | 6 ++--- + src/interface/meson.build | 2 +- + src/libxl/meson.build | 18 +++++++-------- + src/locking/meson.build | 8 +++---- + src/lxc/meson.build | 10 ++++---- + src/meson.build | 18 +++++++-------- + src/network/meson.build | 14 ++++++------ + src/node_device/meson.build | 2 +- + src/nwfilter/meson.build | 6 ++--- src/nwfilter/xml/meson.build | 2 +- - src/qemu/meson.build | 14 +++++++------- - src/remote/meson.build | 6 +++--- - src/security/apparmor/meson.build | 8 ++++---- - tools/meson.build | 4 ++-- - 12 files changed, 53 insertions(+), 42 deletions(-) + src/qemu/meson.build | 38 +++++++++++++++---------------- + src/remote/meson.build | 10 ++++---- + src/secret/meson.build | 4 ++-- + src/security/apparmor/meson.build | 8 +++---- + src/storage/meson.build | 6 ++--- + tools/meson.build | 2 +- + 18 files changed, 88 insertions(+), 77 deletions(-) diff --git a/meson.build b/meson.build -index b5164f6..33719f1 100644 +index 9016c0458a..b26e690194 100644 --- a/meson.build +++ b/meson.build @@ -39,6 +39,8 @@ if host_machine.system() == 'windows' @@ -48,7 +54,7 @@ index b5164f6..33719f1 100644 # sysconfdir as this makes a lot of things break in testing situations if prefix == '/usr' diff --git a/meson_options.txt b/meson_options.txt -index e5d79c2..081cd32 100644 +index 5b43cdbd6b..e9dff18441 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,5 @@ @@ -57,27 +63,67 @@ index e5d79c2..081cd32 100644 option('no_git', type: 'boolean', value: false, description: 'Disable git submodule update') option('packager', type: 'string', value: '', description: 'Extra packager name') option('packager_version', type: 'string', value: '', description: 'Extra packager version') +diff --git a/src/ch/meson.build b/src/ch/meson.build +index 66b77907b0..6aa9bbc548 100644 +--- a/src/ch/meson.build ++++ b/src/ch/meson.build +@@ -64,8 +64,8 @@ if conf.has('WITH_CH') + } + + virt_install_dirs += [ +- localstatedir / 'lib' / 'libvirt' / 'ch', +- localstatedir / 'log' / 'libvirt' / 'ch', +- runstatedir / 'libvirt' / 'ch', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'ch', ++ install_prefix + localstatedir / 'log' / 'libvirt' / 'ch', ++ install_prefix + runstatedir / 'libvirt' / 'ch', + ] + endif +diff --git a/src/interface/meson.build b/src/interface/meson.build +index 828f274422..2a6b1f8c5e 100644 +--- a/src/interface/meson.build ++++ b/src/interface/meson.build +@@ -56,6 +56,6 @@ if conf.has('WITH_INTERFACE') + } + + virt_install_dirs += [ +- runstatedir / 'libvirt' / 'interface', ++ install_prefix + runstatedir / 'libvirt' / 'interface', + ] + endif diff --git a/src/libxl/meson.build b/src/libxl/meson.build -index 3bb6cc5..78d7be0 100644 +index 0cc277db82..48d8c5b962 100644 --- a/src/libxl/meson.build +++ b/src/libxl/meson.build -@@ -84,8 +84,8 @@ if conf.has('WITH_LIBXL') +@@ -79,14 +79,14 @@ if conf.has('WITH_LIBXL') } virt_install_dirs += [ +- confdir / 'libxl', +- confdir / 'libxl' / 'autostart', - localstatedir / 'lib' / 'libvirt' / 'libxl', -- runstatedir / 'libvirt' / 'libxl', +- localstatedir / 'lib' / 'libvirt' / 'libxl' / 'channel', +- localstatedir / 'lib' / 'libvirt' / 'libxl' / 'channel' / 'target', +- localstatedir / 'lib' / 'libvirt' / 'libxl' / 'dump', +- localstatedir / 'lib' / 'libvirt' / 'libxl' / 'save', - localstatedir / 'log' / 'libvirt' / 'libxl', +- runstatedir / 'libvirt' / 'libxl', ++ install_prefix + confdir / 'libxl', ++ install_prefix + confdir / 'libxl' / 'autostart', + install_prefix + localstatedir / 'lib' / 'libvirt' / 'libxl', -+ install_prefix + runstatedir / 'libvirt' / 'libxl', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'libxl' / 'channel', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'libxl' / 'channel' / 'target', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'libxl' / 'dump', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'libxl' / 'save', + install_prefix + localstatedir / 'log' / 'libvirt' / 'libxl', ++ install_prefix + runstatedir / 'libvirt' / 'libxl', ] endif diff --git a/src/locking/meson.build b/src/locking/meson.build -index 8a28310..9da81cc 100644 +index 72f7780438..abe70d20d5 100644 --- a/src/locking/meson.build +++ b/src/locking/meson.build -@@ -243,14 +243,14 @@ if conf.has('WITH_LIBVIRTD') +@@ -238,14 +238,14 @@ if conf.has('WITH_LIBVIRTD') } virt_install_dirs += [ @@ -97,26 +143,39 @@ index 8a28310..9da81cc 100644 endif endif diff --git a/src/lxc/meson.build b/src/lxc/meson.build -index f8e2a88..96d6687 100644 +index 99d4a34213..aae477c1ee 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build -@@ -182,8 +182,8 @@ if conf.has('WITH_LXC') +@@ -176,10 +176,10 @@ if conf.has('WITH_LXC') } virt_install_dirs += [ +- confdir / 'lxc', +- confdir / 'lxc' / 'autostart', - localstatedir / 'lib' / 'libvirt' / 'lxc', -- runstatedir / 'libvirt' / 'lxc', - localstatedir / 'log' / 'libvirt' / 'lxc', +- runstatedir / 'libvirt' / 'lxc', ++ install_prefix + confdir / 'lxc', ++ install_prefix + confdir / 'lxc' / 'autostart', + install_prefix + localstatedir / 'lib' / 'libvirt' / 'lxc', -+ install_prefix + runstatedir / 'libvirt' / 'lxc', + install_prefix + localstatedir / 'log' / 'libvirt' / 'lxc', ++ install_prefix + runstatedir / 'libvirt' / 'lxc', ] endif diff --git a/src/meson.build b/src/meson.build -index 7c47821..d33d16a 100644 +index b2d951d36c..305716010f 100644 --- a/src/meson.build +++ b/src/meson.build -@@ -669,7 +669,7 @@ endforeach +@@ -210,7 +210,7 @@ openrc_init_files = [] + + # virt_install_dirs: + # list of directories to create during installation +-virt_install_dirs = [ confdir ] ++virt_install_dirs = [ install_prefix + confdir ] + + # driver_source_files: + # driver source files to check +@@ -663,7 +663,7 @@ endforeach virt_conf_files += 'libvirt.conf' @@ -125,7 +184,7 @@ index 7c47821..d33d16a 100644 install_data(virt_aug_files, install_dir: virt_aug_dir) # augeas_test_data: -@@ -729,7 +729,7 @@ foreach data : virt_daemon_confs +@@ -723,7 +723,7 @@ foreach data : virt_daemon_confs output: '@0@.conf'.format(data['name']), configuration: daemon_conf, install: true, @@ -134,15 +193,16 @@ index 7c47821..d33d16a 100644 ) if data.get('with_ip', false) -@@ -853,14 +853,14 @@ if conf.has('WITH_LIBVIRTD') +@@ -847,7 +847,7 @@ if conf.has('WITH_LIBVIRTD') install_data( init_file, - install_dir: sysconfdir / 'init.d', + install_dir: install_prefix + sysconfdir / 'init.d', + install_mode: 'rwxr-xr-x', rename: [ init['name'] ], ) - +@@ -855,7 +855,7 @@ if conf.has('WITH_LIBVIRTD') if init.has_key('confd') install_data( init['confd'], @@ -151,16 +211,7 @@ index 7c47821..d33d16a 100644 rename: [ init['name'] ], ) endif -@@ -872,7 +872,7 @@ if init_script != 'none' - foreach sysconf : sysconf_files - install_data( - sysconf['file'], -- install_dir: sysconfdir / 'sysconfig', -+ install_dir: install_prefix + sysconfdir / 'sysconfig', - rename: [ sysconf['name'] ], - ) - endforeach -@@ -897,10 +897,10 @@ endif +@@ -882,10 +882,10 @@ endif # Install empty directories virt_install_dirs += [ @@ -176,23 +227,27 @@ index 7c47821..d33d16a 100644 meson.add_install_script( diff --git a/src/network/meson.build b/src/network/meson.build -index 3ec598c..b02040b 100644 +index b5eff0c3ab..a0f26d624e 100644 --- a/src/network/meson.build +++ b/src/network/meson.build -@@ -79,9 +79,9 @@ if conf.has('WITH_NETWORK') +@@ -73,11 +73,11 @@ if conf.has('WITH_NETWORK') } virt_install_dirs += [ +- confdir / 'qemu' / 'networks', +- confdir / 'qemu' / 'networks' / 'autostart', - localstatedir / 'lib' / 'libvirt' / 'network', - localstatedir / 'lib' / 'libvirt' / 'dnsmasq', - runstatedir / 'libvirt' / 'network', ++ install_prefix + confdir / 'qemu' / 'networks', ++ install_prefix + confdir / 'qemu' / 'networks' / 'autostart', + install_prefix + localstatedir / 'lib' / 'libvirt' / 'network', + install_prefix + localstatedir / 'lib' / 'libvirt' / 'dnsmasq', + install_prefix + runstatedir / 'libvirt' / 'network', ] configure_file( -@@ -89,12 +89,12 @@ if conf.has('WITH_NETWORK') +@@ -85,12 +85,12 @@ if conf.has('WITH_NETWORK') output: '@BASENAME@', copy: true, install: true, @@ -207,8 +262,37 @@ index 3ec598c..b02040b 100644 '../default.xml', 'default.xml', ) +diff --git a/src/node_device/meson.build b/src/node_device/meson.build +index 1c95975c37..a7831242db 100644 +--- a/src/node_device/meson.build ++++ b/src/node_device/meson.build +@@ -64,6 +64,6 @@ if conf.has('WITH_NODE_DEVICES') + } + + virt_install_dirs += [ +- runstatedir / 'libvirt' / 'nodedev', ++ install_prefix + runstatedir / 'libvirt' / 'nodedev', + ] + endif +diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build +index 55cf8fcce4..d331086f2e 100644 +--- a/src/nwfilter/meson.build ++++ b/src/nwfilter/meson.build +@@ -62,9 +62,9 @@ if conf.has('WITH_NWFILTER') + } + + virt_install_dirs += [ +- confdir / 'nwfilter', +- runstatedir / 'libvirt' / 'nwfilter-binding', +- runstatedir / 'libvirt' / 'nwfilter', ++ install_prefix + confdir / 'nwfilter', ++ install_prefix + runstatedir / 'libvirt' / 'nwfilter-binding', ++ install_prefix + runstatedir / 'libvirt' / 'nwfilter', + ] + + subdir('xml') diff --git a/src/nwfilter/xml/meson.build b/src/nwfilter/xml/meson.build -index 0d96c54..66c92a1 100644 +index 0d96c54ebe..66c92a1016 100644 --- a/src/nwfilter/xml/meson.build +++ b/src/nwfilter/xml/meson.build @@ -25,4 +25,4 @@ nwfilter_xml_files = [ @@ -218,43 +302,71 @@ index 0d96c54..66c92a1 100644 -install_data(nwfilter_xml_files, install_dir: sysconfdir / 'libvirt' / 'nwfilter') +install_data(nwfilter_xml_files, install_dir: install_prefix + sysconfdir / 'libvirt' / 'nwfilter') diff --git a/src/qemu/meson.build b/src/qemu/meson.build -index 90640b0..8802cec 100644 +index 39f0f615cc..5f6f30f82b 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build -@@ -171,12 +171,12 @@ if conf.has('WITH_QEMU') - } +@@ -175,24 +175,24 @@ if conf.has('WITH_QEMU') + endif virt_install_dirs += [ -- localstatedir / 'lib' / 'libvirt' / 'qemu', -- runstatedir / 'libvirt' / 'qemu', +- confdir / 'qemu', +- confdir / 'qemu' / 'autostart', - localstatedir / 'cache' / 'libvirt' / 'qemu', -- localstatedir / 'log' / 'libvirt' / 'qemu', +- localstatedir / 'lib' / 'libvirt' / 'qemu', +- localstatedir / 'lib' / 'libvirt' / 'qemu' / 'channel', +- localstatedir / 'lib' / 'libvirt' / 'qemu' / 'channel' / 'target', +- localstatedir / 'lib' / 'libvirt' / 'qemu' / 'checkpoint', +- localstatedir / 'lib' / 'libvirt' / 'qemu' / 'dump', +- localstatedir / 'lib' / 'libvirt' / 'qemu' / 'nvram', +- localstatedir / 'lib' / 'libvirt' / 'qemu' / 'ram', +- localstatedir / 'lib' / 'libvirt' / 'qemu' / 'save', +- localstatedir / 'lib' / 'libvirt' / 'qemu' / 'snapshot', - localstatedir / 'lib' / 'libvirt' / 'swtpm', -- runstatedir / 'libvirt' / 'qemu' / 'swtpm', +- localstatedir / 'log' / 'libvirt' / 'qemu', - localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu', -+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu', -+ install_prefix + runstatedir / 'libvirt' / 'qemu', +- runstatedir / 'libvirt' / 'qemu', +- runstatedir / 'libvirt' / 'qemu' / 'dbus', +- runstatedir / 'libvirt' / 'qemu' / 'slirp', +- runstatedir / 'libvirt' / 'qemu' / 'swtpm', ++ install_prefix + confdir / 'qemu', ++ install_prefix + confdir / 'qemu' / 'autostart', + install_prefix + localstatedir / 'cache' / 'libvirt' / 'qemu', -+ install_prefix + localstatedir / 'log' / 'libvirt' / 'qemu', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'channel', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'channel' / 'target', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'checkpoint', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'dump', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'nvram', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'ram', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'save', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'snapshot', + install_prefix + localstatedir / 'lib' / 'libvirt' / 'swtpm', -+ install_prefix + runstatedir / 'libvirt' / 'qemu' / 'swtpm', ++ install_prefix + localstatedir / 'log' / 'libvirt' / 'qemu', + install_prefix + localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu', ++ install_prefix + runstatedir / 'libvirt' / 'qemu', ++ install_prefix + runstatedir / 'libvirt' / 'qemu' / 'dbus', ++ install_prefix + runstatedir / 'libvirt' / 'qemu' / 'slirp', ++ install_prefix + runstatedir / 'libvirt' / 'qemu' / 'swtpm', ] endif diff --git a/src/remote/meson.build b/src/remote/meson.build -index 9ad2f6a..429a15b 100644 +index b2aafe6320..6972d254ca 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build -@@ -245,7 +245,7 @@ if conf.has('WITH_REMOTE') +@@ -235,9 +235,9 @@ if conf.has('WITH_REMOTE') } virt_install_dirs += [ - localstatedir / 'log' / 'libvirt', +- runstatedir / 'libvirt', +- runstatedir / 'libvirt' / 'common', + install_prefix + localstatedir / 'log' / 'libvirt', ++ install_prefix + runstatedir / 'libvirt', ++ install_prefix + runstatedir / 'libvirt' / 'common', ] logrotate_conf = configuration_data() -@@ -259,7 +259,7 @@ if conf.has('WITH_REMOTE') +@@ -251,7 +251,7 @@ if conf.has('WITH_REMOTE') ) install_data( log_file, @@ -263,7 +375,7 @@ index 9ad2f6a..429a15b 100644 rename: [ name ], ) endforeach -@@ -309,7 +309,7 @@ endif +@@ -301,7 +301,7 @@ endif if conf.has('WITH_SASL') install_data( 'libvirtd.sasl', @@ -272,11 +384,25 @@ index 9ad2f6a..429a15b 100644 rename: [ 'libvirt.conf' ], ) endif +diff --git a/src/secret/meson.build b/src/secret/meson.build +index 1bda59849b..392bc2cb2e 100644 +--- a/src/secret/meson.build ++++ b/src/secret/meson.build +@@ -45,7 +45,7 @@ if conf.has('WITH_SECRETS') + } + + virt_install_dirs += [ +- confdir / 'secrets', +- runstatedir / 'libvirt' / 'secrets', ++ install_prefix + confdir / 'secrets', ++ install_prefix + runstatedir / 'libvirt' / 'secrets', + ] + endif diff --git a/src/security/apparmor/meson.build b/src/security/apparmor/meson.build -index af43780..e2d6c81 100644 +index 990f00b4f3..e5a7a14e1d 100644 --- a/src/security/apparmor/meson.build +++ b/src/security/apparmor/meson.build -@@ -17,22 +17,22 @@ foreach name : apparmor_gen_profiles +@@ -19,22 +19,22 @@ foreach name : apparmor_gen_profiles output: name, configuration: apparmor_gen_profiles_conf, install: true, @@ -303,11 +429,28 @@ index af43780..e2d6c81 100644 + install_dir: install_prefix + apparmor_dir / 'local', rename: 'usr.lib.libvirt.virt-aa-helper', ) +diff --git a/src/storage/meson.build b/src/storage/meson.build +index 26e7ff1a1a..ad5c6eddc3 100644 +--- a/src/storage/meson.build ++++ b/src/storage/meson.build +@@ -127,9 +127,9 @@ if conf.has('WITH_STORAGE') + } + + virt_install_dirs += [ +- confdir / 'storage', +- confdir / 'storage' / 'autostart', +- runstatedir / 'libvirt' / 'storage', ++ install_prefix + confdir / 'storage', ++ install_prefix + confdir / 'storage' / 'autostart', ++ install_prefix + runstatedir / 'libvirt' / 'storage', + ] + endif + diff --git a/tools/meson.build b/tools/meson.build -index b8c6802..dacd0ff 100644 +index f4b4a16c29..059c73a955 100644 --- a/tools/meson.build +++ b/tools/meson.build -@@ -115,7 +115,7 @@ if conf.has('WITH_LOGIN_SHELL') +@@ -120,7 +120,7 @@ if conf.has('WITH_LOGIN_SHELL') install_rpath: libvirt_rpath, ) @@ -316,11 +459,6 @@ index b8c6802..dacd0ff 100644 endif if host_machine.system() == 'windows' -@@ -274,7 +274,7 @@ configure_file( - if init_script == 'systemd' - install_data( - 'libvirt-guests.sysconf', -- install_dir: sysconfdir / 'sysconfig', -+ install_dir: install_prefix + sysconfdir / 'sysconfig', - rename: 'libvirt-guests', - ) +-- +2.35.1 + diff --git a/nixpkgs/pkgs/development/libraries/libvirt/0002-meson-patch-ch-install-prefix.patch b/nixpkgs/pkgs/development/libraries/libvirt/0002-meson-patch-ch-install-prefix.patch deleted file mode 100644 index ae97c6455c6b..000000000000 --- a/nixpkgs/pkgs/development/libraries/libvirt/0002-meson-patch-ch-install-prefix.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/ch/meson.build b/src/ch/meson.build -index e34974d56c..4767763c2c 100644 ---- a/src/ch/meson.build -+++ b/src/ch/meson.build -@@ -68,7 +68,7 @@ if conf.has('WITH_CH') - } - - virt_install_dirs += [ -- localstatedir / 'lib' / 'libvirt' / 'ch', -- runstatedir / 'libvirt' / 'ch', -+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'ch', -+ install_prefix + runstatedir / 'libvirt' / 'ch', - ] - endif diff --git a/nixpkgs/pkgs/development/libraries/libvirt/default.nix b/nixpkgs/pkgs/development/libraries/libvirt/default.nix index 03d0e17cb4c3..14e0e478790c 100644 --- a/nixpkgs/pkgs/development/libraries/libvirt/default.nix +++ b/nixpkgs/pkgs/development/libraries/libvirt/default.nix @@ -1,85 +1,122 @@ { lib -, stdenv -, fetchurl -, fetchFromGitLab -, makeWrapper , autoreconfHook -, fetchpatch +, bash-completion +, bridge-utils +, cmake , coreutils -, libxml2 -, gnutls -, perl -, python3 -, attr -, glib +, curl +, darwin +, dbus +, dnsmasq , docutils -, iproute2 -, readline -, lvm2 -, util-linux -, systemd -, libpciaccess +, fetchFromGitLab +, fetchurl , gettext -, libtasn1 +, glib +, gnutls +, iproute2 , iptables , libgcrypt -, yajl -, pmutils -, libcap_ng -, libapparmor -, dnsmasq -, libnl , libpcap +, libtasn1 +, libxml2 , libxslt -, xhtml1 -, numad -, numactl -, perlPackages -, curl -, libiconv -, gmp -, zfs -, parted -, bridge-utils -, dmidecode -, dbus -, libtirpc -, rpcsvc-proto -, darwin +, makeWrapper , meson , ninja -, audit -, cmake -, bash-completion +, perl +, perlPackages , pkg-config -, enableXen ? false -, xen ? null -, enableIscsi ? false -, openiscsi +, pmutils +, python3 +, readline +, rpcsvc-proto +, stdenv +, xhtml1 +, yajl + + # Linux +, acl ? null +, attr ? null +, audit ? null +, dmidecode ? null +, fuse ? null +, kmod ? null +, libapparmor ? null +, libcap_ng ? null +, libnl ? null +, libpciaccess ? null +, libtirpc ? null +, lvm2 ? null +, numactl ? null +, numad ? null +, parted ? null +, systemd ? null +, util-linux ? null + + # Darwin +, gmp ? null +, libiconv ? null +, Carbon ? null +, AppKit ? null + + # Options , enableCeph ? false -, ceph +, ceph ? null , enableGlusterfs ? false -, glusterfs -, Carbon -, AppKit +, glusterfs ? null +, enableIscsi ? false +, openiscsi ? null +, libiscsi ? null +, enableXen ? false +, xen ? null +, enableZfs ? stdenv.isLinux +, zfs ? null }: with lib; -# if you update, also bump <nixpkgs/pkgs/development/python-modules/libvirt/default.nix> and SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix> let - buildFromTarball = stdenv.isDarwin; + inherit (stdenv) isDarwin isLinux isx86_64; + binPath = makeBinPath ([ + dnsmasq + ] ++ optionals isLinux [ + bridge-utils + dmidecode + dnsmasq + iproute2 + iptables + kmod + lvm2 + numactl + numad + pmutils + systemd + ] ++ optionals enableIscsi [ + libiscsi + openiscsi + ]); in + +assert enableXen -> isLinux && isx86_64; +assert enableCeph -> isLinux; +assert enableGlusterfs -> isLinux; +assert enableZfs -> isLinux; + +# if you update, also bump <nixpkgs/pkgs/development/python-modules/libvirt/default.nix> and SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix> stdenv.mkDerivation rec { pname = "libvirt"; - version = "7.10.0"; + # NOTE: You must also bump: + # <nixpkgs/pkgs/development/python-modules/libvirt/default.nix> + # SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix> + version = "8.1.0"; src = - if buildFromTarball then + if isDarwin then fetchurl { url = "https://libvirt.org/sources/${pname}-${version}.tar.xz"; - sha256 = "sha256-yzGAFK8JcyeSjG49cpIuO+AqPmQBJHsqpS2auOC0gPk="; + sha256 = "sha256-PGxDvs/+s0o/OXxhYgaqaaiT/4v16CCDk8hOjnU1KTQ="; } else fetchFromGitLab @@ -87,76 +124,84 @@ stdenv.mkDerivation rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-bB8LsjZFeJbMmmC0YRPyMag2MBhwagUFC7aB1KhZEkA="; + sha256 = "sha256-nk8pBlss+g4EMy+RnAOyz6YlGGvlBvl5aBpcytsK1wY="; fetchSubmodules = true; }; patches = [ ./0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch - ./0002-meson-patch-ch-install-prefix.patch ]; + # remove some broken tests + postPatch = '' + sed -i '/commandtest/d' tests/meson.build + sed -i '/virnetsockettest/d' tests/meson.build + # delete only the first occurrence of this + sed -i '0,/qemuxml2argvtest/{/qemuxml2argvtest/d;}' tests/meson.build + '' + optionalString isDarwin '' + sed -i '/qemucapabilitiestest/d' tests/meson.build + ''; + + nativeBuildInputs = [ - ninja meson + cmake + docutils makeWrapper + ninja pkg-config - docutils - ] ++ optional (!stdenv.isDarwin) [ - rpcsvc-proto - ] ++ optionals stdenv.isDarwin [ - darwin.developer_cmds # needed for rpcgen - ]; + ] + ++ optional (!isDarwin) rpcsvc-proto + # NOTE: needed for rpcgen + ++ optional isDarwin darwin.developer_cmds; buildInputs = [ bash-completion - pkg-config - libxml2 + curl + dbus + gettext + glib gnutls + libgcrypt + libpcap + libtasn1 + libxml2 + libxslt perl + perlPackages.XMLXPath + pkg-config python3 readline - gettext - libtasn1 - libgcrypt - yajl - libxslt xhtml1 - perlPackages.XMLXPath - curl - libpcap - glib - dbus - ] ++ optionals stdenv.isLinux [ + yajl + ] ++ optionals isLinux [ + acl + attr audit - libpciaccess - lvm2 - util-linux - systemd - libnl - numad - zfs + fuse libapparmor libcap_ng + libnl + libpciaccess + libtirpc + lvm2 numactl - attr + numad parted - libtirpc - ] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [ - xen - ] ++ optionals enableIscsi [ - openiscsi - ] ++ optionals enableCeph [ - ceph - ] ++ optionals enableGlusterfs [ - glusterfs - ] ++ optionals stdenv.isDarwin [ - libiconv - gmp - Carbon + systemd + util-linux + ] ++ optionals isDarwin [ AppKit - ]; + Carbon + gmp + libiconv + ] + ++ optionals enableCeph [ ceph ] + ++ optionals enableGlusterfs [ glusterfs ] + ++ optionals enableIscsi [ libiscsi openiscsi ] + ++ optionals enableXen [ xen ] + ++ optionals enableZfs [ zfs ]; preConfigure = let @@ -164,80 +209,124 @@ stdenv.mkDerivation rec { QEMU_BRIDGE_HELPER = "/run/wrappers/bin/qemu-bridge-helper"; QEMU_PR_HELPER = "/run/libvirt/nix-helpers/qemu-pr-helper"; }; + patchBuilder = var: value: '' sed -i meson.build -e "s|conf.set_quoted('${var}',.*|conf.set_quoted('${var}','${value}')|" ''; in '' - PATH=${lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute2 iptables lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH + PATH="${binPath}:$PATH" # the path to qemu-kvm will be stored in VM's .xml and .save files # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations substituteInPlace src/lxc/lxc_conf.c \ --replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",' + substituteInPlace build-aux/meson.build \ --replace "gsed" "sed" \ --replace "gmake" "make" \ --replace "ggrep" "grep" + patchShebangs . '' + (lib.concatStringsSep "\n" (lib.mapAttrsToList patchBuilder overrides)); - mesonAutoFeatures = "auto"; + mesonAutoFeatures = "disabled"; mesonFlags = let - opt = option: enable: "-D${option}=${if enable then "enabled" else "disabled"}"; + cfg = option: val: "-D${option}=${val}"; + feat = option: enable: cfg option (if enable then "enabled" else "disabled"); + driver = name: feat "driver_${name}"; + storage = name: feat "storage_${name}"; in [ "--sysconfdir=/var/lib" - "-Dinstall_prefix=${placeholder "out"}" - "-Dlocalstatedir=/var" - "-Drunstatedir=/run" - "-Dlibpcap=enabled" - "-Ddriver_qemu=enabled" - "-Ddriver_vmware=enabled" - "-Ddriver_vbox=enabled" - "-Ddriver_test=enabled" - "-Ddriver_esx=enabled" - "-Ddriver_remote=enabled" - "-Dpolkit=enabled" - (opt "storage_iscsi" enableIscsi) - ] ++ optionals stdenv.isLinux [ - (opt "storage_zfs" (zfs != null)) - "-Dattr=enabled" - "-Dapparmor=enabled" - "-Dsecdriver_apparmor=enabled" - "-Dnumad=enabled" - "-Dstorage_disk=enabled" - (opt "glusterfs" enableGlusterfs) - (opt "storage_rbd" enableCeph) - ] ++ optionals stdenv.isDarwin [ - "-Dinit_script=none" + (cfg "install_prefix" (placeholder "out")) + (cfg "localstatedir" "/var") + (cfg "runstatedir" "/run") + + (cfg "init_script" (if isDarwin then "none" else "systemd")) + + (feat "apparmor" isLinux) + (feat "attr" isLinux) + (feat "audit" isLinux) + (feat "bash_completion" true) + (feat "blkid" isLinux) + (feat "capng" isLinux) + (feat "curl" true) + (feat "docs" true) + (feat "expensive_tests" true) + (feat "firewalld" isLinux) + (feat "firewalld_zone" isLinux) + (feat "fuse" isLinux) + (feat "glusterfs" enableGlusterfs) + (feat "host_validate" true) + (feat "libiscsi" enableIscsi) + (feat "libnl" isLinux) + (feat "libpcap" true) + (feat "libssh2" true) + (feat "login_shell" isLinux) + (feat "nss" isLinux) + (feat "numactl" isLinux) + (feat "numad" isLinux) + (feat "pciaccess" isLinux) + (feat "polkit" true) + (feat "readline" true) + (feat "secdriver_apparmor" isLinux) + (feat "tests" true) + (feat "udev" isLinux) + (feat "yajl" true) + + (driver "ch" isLinux) + (driver "esx" true) + (driver "interface" isLinux) + (driver "libvirtd" true) + (driver "libxl" enableXen) + (driver "lxc" isLinux) + (driver "network" true) + (driver "openvz" isLinux) + (driver "qemu" true) + (driver "remote" true) + (driver "secrets" true) + (driver "test" true) + (driver "vbox" true) + (driver "vmware" true) + + (storage "dir" true) + (storage "disk" isLinux) + (storage "fs" isLinux) + (storage "gluster" enableGlusterfs) + (storage "iscsi" enableIscsi) + (storage "iscsi_direct" enableIscsi) + (storage "lvm" isLinux) + (storage "mpath" isLinux) + (storage "rbd" enableCeph) + (storage "scsi" true) + (storage "vstorage" isLinux) + (storage "zfs" enableZfs) ]; - postInstall = - let - binPath = [ iptables iproute2 pmutils numad numactl bridge-utils dmidecode dnsmasq ] ++ optionals enableIscsi [ openiscsi ]; - in - '' - substituteInPlace $out/bin/virt-xml-validate \ - --replace xmllint ${libxml2}/bin/xmllint - - substituteInPlace $out/libexec/libvirt-guests.sh \ - --replace 'ON_BOOT="start"' 'ON_BOOT=''${ON_BOOT:-start}' \ - --replace 'ON_SHUTDOWN="suspend"' 'ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}' \ - --replace "$out/bin" '${gettext}/bin' \ - --replace 'lock/subsys' 'lock' \ - --replace 'gettext.sh' 'gettext.sh - # Added in nixpkgs: - gettext() { "${gettext}/bin/gettext" "$@"; } - ' - '' + optionalString stdenv.isLinux '' - substituteInPlace $out/lib/systemd/system/libvirtd.service --replace /bin/kill ${coreutils}/bin/kill - rm $out/lib/systemd/system/{virtlockd,virtlogd}.* - wrapProgram $out/sbin/libvirtd \ - --prefix PATH : /run/libvirt/nix-emulators:${makeBinPath binPath} - ''; + doCheck = true; + + postInstall = '' + substituteInPlace $out/bin/virt-xml-validate \ + --replace xmllint ${libxml2}/bin/xmllint + + substituteInPlace $out/libexec/libvirt-guests.sh \ + --replace 'ON_BOOT="start"' 'ON_BOOT=''${ON_BOOT:-start}' \ + --replace 'ON_SHUTDOWN="suspend"' 'ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}' \ + --replace "$out/bin" '${gettext}/bin' \ + --replace 'lock/subsys' 'lock' \ + --replace 'gettext.sh' 'gettext.sh + # Added in nixpkgs: + gettext() { "${gettext}/bin/gettext" "$@"; } + ' + '' + optionalString isLinux '' + substituteInPlace $out/lib/systemd/system/libvirtd.service --replace /bin/kill ${coreutils}/bin/kill + rm $out/lib/systemd/system/{virtlockd,virtlogd}.* + wrapProgram $out/sbin/libvirtd \ + --prefix PATH : /run/libvirt/nix-emulators:${binPath} + ''; meta = { homepage = "https://libvirt.org/"; @@ -248,6 +337,6 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ fpletz globin ]; + maintainers = with maintainers; [ fpletz globin lovesegfault ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/libwbxml/default.nix b/nixpkgs/pkgs/development/libraries/libwbxml/default.nix new file mode 100644 index 000000000000..b5dc8c18208a --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libwbxml/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, lib, cmake, expat }: + +stdenv.mkDerivation rec { + pname = "libwbxml"; + version = "0.11.8"; + + src = fetchFromGitHub { + owner = "libwbxml"; + repo = "libwbxml"; + rev = "${pname}-${version}"; + sha256 = "sha256-WCVKfIk6R2rVaz1SbJL9eLqNC0f4VzL74Sw2IKdDE9I="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ expat ]; + + postPatch = '' + sed -i 's/^SET.*$//' cmake/CMakeLists.txt + ''; + + meta = with lib; { + homepage = "https://github.com/libwbxml/libwbxml"; + description = "The WBXML Library (aka libwbxml) contains a library and its associated tools to Parse, Encode and Handle WBXML documents"; + maintainers = with maintainers; [ mh ]; + platforms = platforms.linux; + license = licenses.lgpl21Plus; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libwnck/default.nix b/nixpkgs/pkgs/development/libraries/libwnck/default.nix index c78cc192a7cf..9f92ed5fd459 100644 --- a/nixpkgs/pkgs/development/libraries/libwnck/default.nix +++ b/nixpkgs/pkgs/development/libraries/libwnck/default.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { pname = "libwnck"; - version = "40.0"; + version = "40.1"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "MMt5qDn5DNZvPiAvP5jLUWb6DNm5LrVxrZxHCkMCHYM="; + sha256 = "AxNPoRTvP740B1qoNnj1iqLevp/O9OojwHeeKGAdZhE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libxmlb/default.nix b/nixpkgs/pkgs/development/libraries/libxmlb/default.nix index b476edaf5e60..80d6129f18a8 100644 --- a/nixpkgs/pkgs/development/libraries/libxmlb/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxmlb/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitHub +, fetchpatch , docbook_xml_dtd_43 , docbook_xsl , glib @@ -11,11 +13,12 @@ , python3 , shared-mime-info , nixosTests +, xz }: stdenv.mkDerivation rec { pname = "libxmlb"; - version = "0.3.1"; + version = "0.3.7"; outputs = [ "out" "lib" "dev" "devdoc" "installedTests" ]; @@ -23,11 +26,18 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libxmlb"; rev = version; - sha256 = "sha256-4gJBmSbo5uGj12Y2Ov4gmS8nJshQxuBM9BAevY/lwjg="; + sha256 = "sha256-ZzA1YJYxTR91X79NU9dWd11Ze+PX2wuZeumuEuNdC48="; }; patches = [ ./installed-tests-path.patch + # Fix darwin build, can be removed on next release + # `--version-script` isn't supported by the macOS linker + # https://github.com/hughsie/libxmlb/pull/119 + (fetchpatch { + url = "https://github.com/hughsie/libxmlb/commit/d83aac5bd78cfbbfa2ecd428ff54b811071dfe4d.patch"; + sha256 = "sha256-UNRMbyNzdxfTZ8xV6J8a622hPnr3mowooP1q8Dg19yw="; + }) ]; nativeBuildInputs = [ @@ -38,12 +48,13 @@ stdenv.mkDerivation rec { meson ninja pkg-config - (python3.withPackages (pkgs: with pkgs; [ setuptools ])) + python3 shared-mime-info ]; buildInputs = [ glib + xz ]; mesonFlags = [ @@ -69,6 +80,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/hughsie/libxmlb"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/libxmlb/installed-tests-path.patch b/nixpkgs/pkgs/development/libraries/libxmlb/installed-tests-path.patch index 4207e9a91d74..0e74d131b2e8 100644 --- a/nixpkgs/pkgs/development/libraries/libxmlb/installed-tests-path.patch +++ b/nixpkgs/pkgs/development/libraries/libxmlb/installed-tests-path.patch @@ -1,8 +1,8 @@ diff --git a/meson.build b/meson.build -index 38486c9..c567613 100644 +index c98e1a7..025d9c8 100644 --- a/meson.build +++ b/meson.build -@@ -110,8 +110,8 @@ +@@ -110,8 +110,8 @@ else prefix = get_option('prefix') datadir = join_paths(prefix, get_option('datadir')) libexecdir = join_paths(prefix, get_option('libexecdir')) @@ -14,11 +14,11 @@ index 38486c9..c567613 100644 gio = dependency('gio-2.0', version : '>= 2.45.8') diff --git a/meson_options.txt b/meson_options.txt -index 27e8cb6..74548ae 100644 +index 54ab698..8a7122a 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -2,3 +2,4 @@ - option('introspection', type : 'boolean', value : true, description : 'generate GObject Introspection data') +@@ -3,3 +3,4 @@ option('introspection', type : 'boolean', value : true, description : 'generate option('tests', type : 'boolean', value : true, description : 'enable tests') option('stemmer', type : 'boolean', value : false, description : 'enable stemmer support') + option('cli', type : 'boolean', value : true, description : 'build and install the xb-tool CLI') +option('installed_test_prefix', type: 'string', value: '', description: 'Prefix for installed tests') diff --git a/nixpkgs/pkgs/development/libraries/libyang/default.nix b/nixpkgs/pkgs/development/libraries/libyang/default.nix index 6a07371261ae..d6efe0543db7 100644 --- a/nixpkgs/pkgs/development/libraries/libyang/default.nix +++ b/nixpkgs/pkgs/development/libraries/libyang/default.nix @@ -10,8 +10,7 @@ , pcre2 # update script -, genericUpdater -, common-updater-scripts +, gitUpdater }: stdenv.mkDerivation rec { @@ -40,9 +39,8 @@ stdenv.mkDerivation rec { "-DCMAKE_BUILD_TYPE:String=Release" ]; - passthru.updateScript = genericUpdater { + passthru.updateScript = gitUpdater { inherit pname version; - versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; rev-prefix = "v"; }; diff --git a/nixpkgs/pkgs/development/libraries/libyuv/default.nix b/nixpkgs/pkgs/development/libraries/libyuv/default.nix new file mode 100644 index 000000000000..ac69ab8dacc0 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libyuv/default.nix @@ -0,0 +1,34 @@ +{ lib +, stdenv +, fetchgit +, cmake +, libjpeg +}: + +stdenv.mkDerivation rec { + pname = "libyuv"; + version = "1787"; # Defined in: include/libyuv/version.h + + src = fetchgit { + url = "https://chromium.googlesource.com/libyuv/libyuv.git"; + rev = "eb6e7bb63738e29efd82ea3cf2a115238a89fa51"; # refs/heads/stable + sha256 = "sha256-DtRYoaAXb9ZD2OLiKbzKzH5vzuu+Lzu4eHaDgPB9hjU="; + }; + + nativeBuildInputs = [ + cmake + ]; + + # NEON does not work on aarch64, we disable it + cmakeFlags = lib.optionals stdenv.isAarch64 ["-DCMAKE_CXX_FLAGS=-DLIBYUV_DISABLE_NEON"]; + + buildInputs = [ libjpeg ]; + + meta = with lib; { + homepage = "https://chromium.googlesource.com/libyuv/libyuv"; + description = "Open source project that includes YUV scaling and conversion functionality"; + platforms = platforms.linux; + maintainers = with maintainers; [ leixb ]; + license = licenses.bsd3; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/live555/default.nix b/nixpkgs/pkgs/development/libraries/live555/default.nix index 2e5ec92cf4c4..1c1b57f39cb1 100644 --- a/nixpkgs/pkgs/development/libraries/live555/default.nix +++ b/nixpkgs/pkgs/development/libraries/live555/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "live555"; - version = "2022.01.21"; + version = "2022.02.07"; src = fetchurl { urls = [ @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "https://download.videolan.org/contrib/live555/live.${version}.tar.gz" "mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz" ]; - sha256 = "sha256-diV5wULbOrqMRDCyI9NjVaR6JUbYl9KWHUlvA/jjqQ4="; + sha256 = "sha256-bwwfinHOtQa8v5abArSww2l7ThXa623LqYcsh0XOksY="; }; nativeBuildInputs = lib.optional stdenv.isDarwin darwin.cctools; diff --git a/nixpkgs/pkgs/development/libraries/mesa/default.nix b/nixpkgs/pkgs/development/libraries/mesa/default.nix index b91e140345de..1fb573931b6d 100644 --- a/nixpkgs/pkgs/development/libraries/mesa/default.nix +++ b/nixpkgs/pkgs/development/libraries/mesa/default.nix @@ -252,12 +252,14 @@ self = stdenv.mkDerivation { inherit (libglvnd) driverLink; inherit llvmPackages; - tests.devDoesNotDependOnLLVM = stdenv.mkDerivation { - name = "mesa-dev-does-not-depend-on-llvm"; - buildCommand = '' - echo ${self.dev} >>$out - ''; - disallowedRequisites = [ llvmPackages.llvm self.drivers ]; + tests = lib.optionalAttrs stdenv.isLinux { + devDoesNotDependOnLLVM = stdenv.mkDerivation { + name = "mesa-dev-does-not-depend-on-llvm"; + buildCommand = '' + echo ${self.dev} >>$out + ''; + disallowedRequisites = [ llvmPackages.llvm self.drivers ]; + }; }; }; diff --git a/nixpkgs/pkgs/development/libraries/mimalloc/default.nix b/nixpkgs/pkgs/development/libraries/mimalloc/default.nix index 1e9e44e09973..22d4567c562d 100644 --- a/nixpkgs/pkgs/development/libraries/mimalloc/default.nix +++ b/nixpkgs/pkgs/development/libraries/mimalloc/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, ninja +, fetchpatch , secureBuild ? false }: @@ -7,14 +8,28 @@ let in stdenv.mkDerivation rec { pname = "mimalloc"; - version = "2.0.2"; + version = "2.0.5"; src = fetchFromGitHub { owner = "microsoft"; repo = pname; rev = "v${version}"; - sha256 = "sha256-n4FGld3bq6ZOSLTzXcVlucCGbQ5/eSFbijU0dfBD/T0="; + sha256 = "sha256-q3W/w1Ofqt6EbKF/Jf9wcC+7jAxh59B3cOGxudWQXlA="; }; + patches = [ + (fetchpatch { + name = "older-macos-fixes.patch"; + url = "https://github.com/microsoft/mimalloc/commit/40e0507a5959ee218f308d33aec212c3ebeef3bb.patch"; + sha256 = "15qx2a3axhhwbfzxdis98b8j14y9cfgca0i484aj2pjpqnm0pb8c"; + }) + ]; + + doCheck = true; + preCheck = let + ldLibraryPathEnv = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + in '' + export ${ldLibraryPathEnv}="$(pwd)/build:''${${ldLibraryPathEnv}}" + ''; nativeBuildInputs = [ cmake ninja ]; cmakeFlags = [ "-DMI_INSTALL_TOPLEVEL=ON" ] ++ lib.optional secureBuild [ "-DMI_SECURE=ON" ]; @@ -25,10 +40,9 @@ stdenv.mkDerivation rec { in '' # first, move headers and cmake files, that's easy mkdir -p $dev/lib - mv $out/include $dev/include - mv $out/cmake $dev/lib/ + mv $out/lib/cmake $dev/lib/ - find $out/lib + find $dev $out -type f '' + (lib.optionalString secureBuild '' # pretend we're normal mimalloc ln -sfv $out/lib/libmimalloc-secure${suffix} $out/lib/libmimalloc${suffix} @@ -44,6 +58,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/microsoft/mimalloc"; license = licenses.bsd2; platforms = platforms.unix; - maintainers = with maintainers; [ thoughtpolice ]; + maintainers = with maintainers; [ kamadorueda thoughtpolice ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/minixml/default.nix b/nixpkgs/pkgs/development/libraries/minixml/default.nix index 9bf5235db824..075f096486b4 100644 --- a/nixpkgs/pkgs/development/libraries/minixml/default.nix +++ b/nixpkgs/pkgs/development/libraries/minixml/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mxml"; - version = "3.2"; + version = "3.3"; src = fetchFromGitHub { owner = "michaelrsweet"; repo = "mxml"; rev = "v${version}"; - sha256 = "0zvib87rgsib0w9xp6bks5slq5ma1qbgyyyvr23cv7zkbgw3xgil"; + sha256 = "sha256-YN8g8KDk7xnDVK1io0zSLO7erxEp4VQ9heA7Lu/cUUg="; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/mlt/default.nix b/nixpkgs/pkgs/development/libraries/mlt/default.nix index b73289ca82ff..d3bcaa2658ba 100644 --- a/nixpkgs/pkgs/development/libraries/mlt/default.nix +++ b/nixpkgs/pkgs/development/libraries/mlt/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, makeWrapper , SDL, ffmpeg_4, frei0r, libjack2, libdv, libsamplerate, libexif , libvorbis, libxml2, movit, pkg-config, sox, fftw, opencv4, SDL2 -, gtk2, genericUpdater, common-updater-scripts, libebur128 +, gtk2, gitUpdater, libebur128 , jack2, ladspa-sdk, swig, which, ncurses , enablePython ? false, python3 }: @@ -51,9 +51,8 @@ stdenv.mkDerivation rec { sed -i ${outPythonPath}/mlt/__init__.py -e "s|return importlib.import_module('_mlt')|return importlib.import_module('mlt._mlt')|g" ''; - passthru.updateScript = genericUpdater { + passthru.updateScript = gitUpdater { inherit pname version; - versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; rev-prefix = "v"; }; diff --git a/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix b/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix index 948de303cefa..5c58aa4f8aec 100644 --- a/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix +++ b/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix @@ -18,8 +18,7 @@ , vid-stab , opencv3 , ladspa-sdk -, genericUpdater -, common-updater-scripts +, gitUpdater , ladspaPlugins , mkDerivation , which @@ -70,9 +69,8 @@ mkDerivation rec { inherit ffmpeg; }; - passthru.updateScript = genericUpdater { + passthru.updateScript = gitUpdater { inherit pname version; - versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; rev-prefix = "v"; }; diff --git a/nixpkgs/pkgs/development/libraries/mpich/default.nix b/nixpkgs/pkgs/development/libraries/mpich/default.nix index 570a123f8609..bff44d8aaf56 100644 --- a/nixpkgs/pkgs/development/libraries/mpich/default.nix +++ b/nixpkgs/pkgs/development/libraries/mpich/default.nix @@ -11,11 +11,11 @@ assert (ch4backend.pname == "ucx" || ch4backend.pname == "libfabric"); stdenv.mkDerivation rec { pname = "mpich"; - version = "4.0"; + version = "4.0.1"; src = fetchurl { url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz"; - sha256 = "0r7zzcj8b9dbf5lp2d81wcvffi38c1zchkgzyxckk51adv4ijx6z"; + sha256 = "11rnljqwz6mr88ybj726mk710h7gvz20hy7labmz4jkkaa0gx8b6"; }; configureFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/mtxclient/default.nix b/nixpkgs/pkgs/development/libraries/mtxclient/default.nix index 4e5eed1e4391..619ed721dff2 100644 --- a/nixpkgs/pkgs/development/libraries/mtxclient/default.nix +++ b/nixpkgs/pkgs/development/libraries/mtxclient/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "mtxclient"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "mtxclient"; rev = "v${version}"; - sha256 = "sha256-hTB0a5KXcQb0MCEX9YonDJOGlTmRkrOIP9UFlwuJc6g="; + sha256 = "sha256-iGw+qdw7heL5q7G0dwtl4PX2UA0Kka0FUmH610dM/00="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/nanodbc/default.nix b/nixpkgs/pkgs/development/libraries/nanodbc/default.nix new file mode 100644 index 000000000000..64f362e35202 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/nanodbc/default.nix @@ -0,0 +1,39 @@ +{ lib, stdenv, fetchFromGitHub, cmake, unixODBC }: + +stdenv.mkDerivation rec { + pname = "nanodbc"; + version = "2.13.0"; + + src = fetchFromGitHub { + owner = "nanodbc"; + repo = "nanodbc"; + rev = "v${version}"; + sha256 = "1q80p7yv9mcl4hyvnvcjdr70y8nc940ypf368lp97vpqn5yckkgm"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ unixODBC ]; + + cmakeFlags = if (stdenv.hostPlatform.isStatic) then + [ "-DBUILD_STATIC_LIBS=ON" ] + else + [ "-DBUILD_SHARED_LIBS=ON" ]; + + # fix compilation on macOS + # https://github.com/nanodbc/nanodbc/issues/274 + # remove after the next version update + postUnpack = if stdenv.isDarwin then '' + mv $sourceRoot/VERSION $sourceRoot/VERSION.txt + substituteInPlace $sourceRoot/CMakeLists.txt \ + --replace 'file(STRINGS VERSION' 'file(STRINGS VERSION.txt' + '' else ""; + + meta = with lib; { + homepage = "https://github.com/nanodbc/nanodbc"; + changelog = "https://github.com/nanodbc/nanodbc/raw/v${version}/CHANGELOG.md"; + description = "Small C++ wrapper for the native C ODBC API"; + license = licenses.mit; + maintainers = [ maintainers.bzizou ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/ncnn/default.nix b/nixpkgs/pkgs/development/libraries/ncnn/default.nix index d53e0d9b42ea..8c0f213b8298 100644 --- a/nixpkgs/pkgs/development/libraries/ncnn/default.nix +++ b/nixpkgs/pkgs/development/libraries/ncnn/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "ncnn"; - version = "20211208"; + version = "20220216"; src = fetchFromGitHub { owner = "Tencent"; repo = pname; rev = version; - sha256 = "1c9axrnafksnks7v5fmi6nzs0qim9n6j5kh5d0vfl3b4r22irhqr"; + sha256 = "sha256-QHLD5NQZA7WR4mRQ0NIaXuAu59IV4SjXHOOlar5aOew="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/netcdf/default.nix b/nixpkgs/pkgs/development/libraries/netcdf/default.nix index 711097757220..27af3be4f2df 100644 --- a/nixpkgs/pkgs/development/libraries/netcdf/default.nix +++ b/nixpkgs/pkgs/development/libraries/netcdf/default.nix @@ -10,11 +10,11 @@ let inherit (hdf5) mpiSupport mpi; in stdenv.mkDerivation rec { - pname = "netcdf"; + pname = "netcdf" + lib.optionalString mpiSupport "-mpi"; version = "4.8.0"; # Remove patch mentioned below on upgrade src = fetchurl { - url = "https://www.unidata.ucar.edu/downloads/netcdf/ftp/${pname}-c-${version}.tar.gz"; + url = "https://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-c-${version}.tar.gz"; sha256 = "1mfn8qi4k0b8pyar3wa8v0npj69c7rhgfdlppdwmq5jqk88kb5k7"; }; diff --git a/nixpkgs/pkgs/development/libraries/nghttp2/default.nix b/nixpkgs/pkgs/development/libraries/nghttp2/default.nix index 86edacc6166b..bd639ec3041a 100644 --- a/nixpkgs/pkgs/development/libraries/nghttp2/default.nix +++ b/nixpkgs/pkgs/development/libraries/nghttp2/default.nix @@ -10,6 +10,10 @@ , enableJemalloc ? false, jemalloc ? null , enableApp ? with stdenv.hostPlatform; !isWindows && !isStatic , enablePython ? false, python ? null, cython ? null, ncurses ? null, setuptools ? null + +# downstream dependencies, for testing +, curl +, libsoup }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -73,6 +77,10 @@ stdenv.mkDerivation rec { #doCheck = true; # requires CUnit ; currently failing at test_util_localtime_date in util_test.cc + passthru.tests = { + inherit curl libsoup; + }; + meta = with lib; { homepage = "https://nghttp2.org/"; description = "A C implementation of HTTP/2"; diff --git a/nixpkgs/pkgs/development/libraries/ngt/default.nix b/nixpkgs/pkgs/development/libraries/ngt/default.nix index 385f2d84f8a6..e42ee750cc09 100644 --- a/nixpkgs/pkgs/development/libraries/ngt/default.nix +++ b/nixpkgs/pkgs/development/libraries/ngt/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "NGT"; - version = "v1.12.3-alpha"; + version = "1.12.3-alpha"; src = fetchFromGitHub { owner = "yahoojapan"; diff --git a/nixpkgs/pkgs/development/libraries/nlopt/default.nix b/nixpkgs/pkgs/development/libraries/nlopt/default.nix index ea216335b7af..279c8a0fd054 100644 --- a/nixpkgs/pkgs/development/libraries/nlopt/default.nix +++ b/nixpkgs/pkgs/development/libraries/nlopt/default.nix @@ -27,6 +27,11 @@ stdenv.mkDerivation rec { "OCT_INSTALL_DIR=$(out)/${octave.sitePath}/oct" ]; + postFixup = '' + substituteInPlace $out/lib/cmake/nlopt/NLoptLibraryDepends.cmake --replace \ + 'INTERFACE_INCLUDE_DIRECTORIES "''${_IMPORT_PREFIX}/' 'INTERFACE_INCLUDE_DIRECTORIES "' + ''; + meta = { homepage = "https://nlopt.readthedocs.io/en/latest/"; description = "Free open-source library for nonlinear optimization"; diff --git a/nixpkgs/pkgs/development/libraries/notcurses/default.nix b/nixpkgs/pkgs/development/libraries/notcurses/default.nix index f4a9b67e94d6..d23401c0fb49 100644 --- a/nixpkgs/pkgs/development/libraries/notcurses/default.nix +++ b/nixpkgs/pkgs/development/libraries/notcurses/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "notcurses"; - version = "3.0.6"; + version = "3.0.7"; src = fetchFromGitHub { owner = "dankamongmen"; repo = "notcurses"; rev = "v${version}"; - sha256 = "sha256-DGAE3XomAoRhAkKUCxmr8R0dhNXeusSgETzmsbV1RhQ="; + sha256 = "sha256-tFdxQEYmSFr3GlJMud2ICToR+IB5sGnQkARUd/LtJXg="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/okapi/default.nix b/nixpkgs/pkgs/development/libraries/okapi/default.nix index e9b0b95d1af8..c8981c54c114 100644 --- a/nixpkgs/pkgs/development/libraries/okapi/default.nix +++ b/nixpkgs/pkgs/development/libraries/okapi/default.nix @@ -2,11 +2,11 @@ rustPlatform.buildRustPackage rec { pname = "okapi"; - version = "1.2.0"; + version = "1.4.0"; src = fetchurl { url = "https://github.com/trinsic-id/okapi/releases/download/v${version}/okapi-vendor-${version}.tar.gz"; - sha256 = "sha256-1aADcwEEWMhoJjwc8wkEcmBYXz+5josOfI/KLaton2k="; + sha256 = "sha256-wNruDPjYHDJtpzQIly4da9rQg1ftdCVxRNNLkFsbKXs="; }; cargoVendorDir = "vendor"; diff --git a/nixpkgs/pkgs/development/libraries/olm/default.nix b/nixpkgs/pkgs/development/libraries/olm/default.nix index baae8ae81b72..6392383c983f 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.9"; + version = "3.2.10"; src = fetchFromGitLab { domain = "gitlab.matrix.org"; owner = "matrix-org"; repo = pname; rev = version; - sha256 = "1vcxxnhsskvnkmk5ial31mvbhs1jwriw8ngyhfslbd30fr9ylw08"; + sha256 = "0v0w98m11r2rqvlrxssnzhqkaxmpbi5s3rkk3csfzhhkpgiv46km"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/openimagedenoise/default.nix b/nixpkgs/pkgs/development/libraries/openimagedenoise/default.nix index f1bbb01653f2..8d02b976c91f 100644 --- a/nixpkgs/pkgs/development/libraries/openimagedenoise/default.nix +++ b/nixpkgs/pkgs/development/libraries/openimagedenoise/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "openimagedenoise"; - version = "1.4.2"; + version = "1.4.3"; # The release tarballs include pretrained weights, which would otherwise need to be fetched with git-lfs src = fetchzip { url = "https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"; - sha256 = "sha256-+7o7b64ORCLn8z0KbnUKhlgPs9mlyDCUiNKJEbusGxw="; + sha256 = "sha256-i73w/Vkr5TPLB1ulPbPU4OVGwdNlky1brfarueD7akE="; }; nativeBuildInputs = [ cmake python3 ispc ]; diff --git a/nixpkgs/pkgs/development/libraries/pagmo2/default.nix b/nixpkgs/pkgs/development/libraries/pagmo2/default.nix index abef3d6cd1dd..dfb70ab624e1 100644 --- a/nixpkgs/pkgs/development/libraries/pagmo2/default.nix +++ b/nixpkgs/pkgs/development/libraries/pagmo2/default.nix @@ -5,21 +5,22 @@ , nlopt , ipopt , boost +, tbb }: stdenv.mkDerivation rec { pname = "pagmo2"; - version = "2.9"; + version = "2.18.0"; src = fetchFromGitHub { owner = "esa"; repo = "pagmo2"; rev = "v${version}"; - sha256 = "0al2i59m5qr83wz5n5408zvys0b3mc40rszf0l5b9a0gp1axj400"; + sha256 = "0rd8scs4hj6qd8ylmn5hafncml2vr4fvcgm3agz3jrvmnc7hadrj"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ eigen nlopt ipopt boost ]; + buildInputs = [ eigen nlopt ipopt boost tbb ]; cmakeFlags = [ "-DPAGMO_BUILD_TESTS=no" diff --git a/nixpkgs/pkgs/development/libraries/pdf2xml/default.nix b/nixpkgs/pkgs/development/libraries/pdf2xml/default.nix index 2dfd35466858..c45a8e03fd16 100644 --- a/nixpkgs/pkgs/development/libraries/pdf2xml/default.nix +++ b/nixpkgs/pkgs/development/libraries/pdf2xml/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation { meta = with lib; { description = "PDF to XML converter"; + homepage = "https://sourceforge.net/projects/pdf2xml/"; platforms = platforms.unix; license = licenses.gpl2; }; diff --git a/nixpkgs/pkgs/development/libraries/phonon/backends/vlc.nix b/nixpkgs/pkgs/development/libraries/phonon/backends/vlc.nix index 8ff0f3bb4917..42923d4f026b 100644 --- a/nixpkgs/pkgs/development/libraries/phonon/backends/vlc.nix +++ b/nixpkgs/pkgs/development/libraries/phonon/backends/vlc.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "phonon-backend-vlc"; - version = "0.11.2"; + version = "0.11.3"; src = fetchurl { url = "mirror://kde/stable/phonon/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-xsM7/GjRN/DlegKeS3mMu5D1Svb3Ma9JZ3hXeRzNU6U="; + sha256 = "sha256-Xmn97MsGDH5rWSTO8uZb7loIrOQScAW5U0TtMHfcY5c="; }; buildInputs = [ @@ -33,9 +33,10 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://phonon.kde.org/"; + homepage = "https://community.kde.org/Phonon"; + # Dev repo is at https://invent.kde.org/libraries/phonon-vlc description = "GStreamer backend for Phonon"; platforms = platforms.linux; - license = with licenses; [ bsd3 lgpl2Plus ]; + license = with licenses; [ bsd3 lgpl21Plus ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/physics/fastjet-contrib/default.nix b/nixpkgs/pkgs/development/libraries/physics/fastjet-contrib/default.nix index d87c9d68b715..9f1b396e4759 100644 --- a/nixpkgs/pkgs/development/libraries/physics/fastjet-contrib/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/fastjet-contrib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fastjet-contrib"; - version = "1.046"; + version = "1.048"; src = fetchurl { - url = "http://fastjet.hepforge.org/contrib/downloads/fjcontrib-${version}.tar.gz"; - sha256 = "sha256-cgavrH/rIHXZn7sDa7NRPTKy2sOvMDQQJjmGNUeT7s8="; + url = "https://fastjet.hepforge.org/contrib/downloads/fjcontrib-${version}.tar.gz"; + sha256 = "sha256-+ZidO2rrIoSLz5EJXDBgfwJ9PvJ3pPD3BKjw/C52aYE="; }; buildInputs = [ fastjet ]; @@ -33,7 +33,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Third party extensions for FastJet"; homepage = "http://fastjet.fr/"; - license = licenses.gpl2; + changelog = "https://phab.hepforge.org/source/fastjetsvn/browse/contrib/tags/${version}/NEWS?as=source&blame=off"; + license = licenses.gpl2Plus; maintainers = with maintainers; [ veprbl ]; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/development/libraries/physics/geant4/datasets.nix b/nixpkgs/pkgs/development/libraries/physics/geant4/datasets.nix index e9b7f54e2a48..18809654c467 100644 --- a/nixpkgs/pkgs/development/libraries/physics/geant4/datasets.nix +++ b/nixpkgs/pkgs/development/libraries/physics/geant4/datasets.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchurl, geant_version }: let - mkDataset = { name, version, sha256, envvar }: + mkDataset = { pname, version, sha256, envvar }: stdenv.mkDerivation { - inherit name version; + inherit pname version; inherit geant_version; src = fetchurl { - url = "https://cern.ch/geant4-data/datasets/${name}.${version}.tar.gz"; + url = "https://cern.ch/geant4-data/datasets/${pname}.${version}.tar.gz"; inherit sha256; }; @@ -15,7 +15,7 @@ let dontBuild = true; dontConfigure = true; - datadir = "${placeholder "out"}/share/Geant4-${geant_version}/data/${name}${version}"; + datadir = "${placeholder "out"}/share/Geant4-${geant_version}/data/${pname}${version}"; installPhase = '' mkdir -p $datadir mv ./* $datadir @@ -32,86 +32,86 @@ let }; }; in - builtins.listToAttrs (map (a: { inherit (a) name; value = mkDataset a; }) [ + builtins.listToAttrs (map (a: { name = a.pname; value = mkDataset a; }) [ { - name = "G4NDL"; + pname = "G4NDL"; version = "4.6"; sha256 = "sha256-nSh88q4PuIeirc6AHudPub4hsNFm2rSby+6UCKUUVAg="; envvar = "NEUTRONHP"; } { - name = "G4EMLOW"; + pname = "G4EMLOW"; version = "8.0"; sha256 = "sha256-2Rmo5YOGiCV7kkimE5EOsqdjMFngMMi1DAosKtn9Kzs="; envvar = "LE"; } { - name = "G4PhotonEvaporation"; + pname = "G4PhotonEvaporation"; version = "5.7"; sha256 = "sha256-dh5C5W/93j2YOfn52BAmB8a0wDKRUe5Rggb07p535+U="; envvar = "LEVELGAMMA"; } { - name = "G4RadioactiveDecay"; + pname = "G4RadioactiveDecay"; version = "5.6"; sha256 = "sha256-OIYHfJyOWph4PmcY4cMlZ4me6y27M+QC1Edrwv5PDfE="; envvar = "RADIOACTIVE"; } { - name = "G4SAIDDATA"; + pname = "G4SAIDDATA"; version = "2.0"; sha256 = "sha256-HSao55uqceRNV1m59Vpn6Lft4xdRMWqekDfYAJDHLpE="; envvar = "SAIDXS"; } { - name = "G4PARTICLEXS"; + pname = "G4PARTICLEXS"; version = "4.0"; sha256 = "sha256-k4EDlwPD8rD9NqtJmTYqLItP+QgMMi+QtOMZKBEzypU="; envvar = "PARTICLEXS"; } { - name = "G4ABLA"; + pname = "G4ABLA"; version = "3.1"; sha256 = "sha256-dpiwUrWL8bmIa+rNvWr2B63B4Jn8cwq2shz38JDAJ+0="; envvar = "ABLA"; } { - name = "G4INCL"; + pname = "G4INCL"; version = "1.0"; sha256 = "sha256-cWFhghrp89BWX788LPNPTgLj5RnrQZqCI27vIsLENn0="; envvar = "INCL"; } { - name = "G4PII"; + pname = "G4PII"; version = "1.3"; sha256 = "sha256-YiWtkCZ19DgcmMa6JfxaBs6HVJqpeWNNPQNJHWYW6SY="; envvar = "PII"; } { - name = "G4ENSDFSTATE"; + pname = "G4ENSDFSTATE"; version = "2.3"; sha256 = "sha256-lETF4IIHkavTzKrOEFsOR3kPrc4obhEUmDTnnEqOkgM="; envvar = "ENSDFSTATE"; } { - name = "G4RealSurface"; + pname = "G4RealSurface"; version = "2.2"; sha256 = "sha256-mVTe4AEvUzEmf3g2kOkS5y21v1Lqm6vs0S6iIoIXaCA="; envvar = "REALSURFACE"; } { - name = "G4TENDL"; + pname = "G4TENDL"; version = "1.4"; sha256 = "sha256-S3J0AgzItO1Wm4ku8YwuCI7c22tm850lWFzO4l2XIeA="; envvar = "PARTICLEHP"; diff --git a/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix b/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix index 629066d23a4e..c3171c589ee4 100644 --- a/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix @@ -9,11 +9,11 @@ in stdenv.mkDerivation rec { pname = "hepmc3"; - version = "3.2.4"; + version = "3.2.5"; src = fetchurl { url = "http://hepmc.web.cern.ch/hepmc/releases/HepMC3-${version}.tar.gz"; - sha256 = "sha256-4Ij8z9GmwvjhCJ9FcQG+4eXHqXd+nVHGQZyKKIpJ4bs="; + sha256 = "sha256-zQ91yA91VJxZzCqCns52Acd96Xyypat1eQysjh1YUDI="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/physics/pythia/default.nix b/nixpkgs/pkgs/development/libraries/physics/pythia/default.nix index 03b298908bb0..d33beb665998 100644 --- a/nixpkgs/pkgs/development/libraries/physics/pythia/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/pythia/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pythia"; - version = "8.306"; + version = "8.307"; src = fetchurl { url = "https://pythia.org/download/pythia83/pythia${builtins.replaceStrings ["."] [""] version}.tgz"; - sha256 = "sha256-c0gDtyKxwbU8jPLw08MHR8gPwt3l4LoUG8k5fa03qPY="; + sha256 = "sha256-5bFNRKpZQzMuMt1d2poY/dGgCFxxmOKNhA4EFn+mAT0="; }; nativeBuildInputs = [ rsync ]; diff --git a/nixpkgs/pkgs/development/libraries/pipewire/0.2.nix b/nixpkgs/pkgs/development/libraries/pipewire/0.2.nix index d21ceafbcf9d..16c8d5d25128 100644 --- a/nixpkgs/pkgs/development/libraries/pipewire/0.2.nix +++ b/nixpkgs/pkgs/development/libraries/pipewire/0.2.nix @@ -28,6 +28,11 @@ in stdenv.mkDerivation rec { alsa-lib ffmpeg_4 libjack2 udev libva xorg.libX11 sbc SDL2 ]; + # Workaround build on gcc-10+ and clang11+: + # spa/plugins/bluez5/libspa-bluez5.so.p/bluez5-monitor.c.o:(.bss+0x0): + # multiple definition of `spa_a2dp_sink_factory' + NIX_CFLAGS_COMPILE = [ "-fcommon" ]; + mesonFlags = [ "-Ddocs=true" "-Dgstreamer=enabled" diff --git a/nixpkgs/pkgs/development/libraries/pipewire/0070-installed-tests-path.patch b/nixpkgs/pkgs/development/libraries/pipewire/0070-installed-tests-path.patch index 926de3062546..b2bcb421befb 100644 --- a/nixpkgs/pkgs/development/libraries/pipewire/0070-installed-tests-path.patch +++ b/nixpkgs/pkgs/development/libraries/pipewire/0070-installed-tests-path.patch @@ -1,23 +1,23 @@ diff --git a/meson.build b/meson.build -index d4a4cda7..a27569bd 100644 +index 2107c19ec..20ccdfd9f 100644 --- a/meson.build +++ b/meson.build -@@ -353,8 +353,8 @@ libinotify_dep = (build_machine.system() == 'freebsd' - - alsa_dep = dependency('alsa', version : '>=1.1.7', required: get_option('pipewire-alsa')) +@@ -380,8 +380,8 @@ lilv_lib = dependency('lilv-0', required: get_option('lv2')) + summary({'lilv (for lv2 plugins)': lilv_lib.found()}, bool_yn: true) + cdata.set('HAVE_LILV', lilv_lib.found()) -installed_tests_metadir = pipewire_datadir / 'installed-tests' / pipewire_name -installed_tests_execdir = pipewire_libexecdir / 'installed-tests' / pipewire_name +installed_tests_metadir = get_option('installed_test_prefix') / 'share' / 'installed-tests' / pipewire_name +installed_tests_execdir = get_option('installed_test_prefix') / 'libexec' / 'installed-tests' / pipewire_name - installed_tests_enabled = not get_option('installed_tests').disabled() + installed_tests_enabled = get_option('installed_tests').allowed() installed_tests_template = files('template.test.in') diff --git a/meson_options.txt b/meson_options.txt -index 1b915ac3..85beb86a 100644 +index 961ae2a76..a36e9e45f 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -29,6 +29,9 @@ option('installed_tests', +@@ -22,6 +22,9 @@ option('installed_tests', description: 'Install manual and automated test executables', type: 'feature', value: 'disabled') diff --git a/nixpkgs/pkgs/development/libraries/pipewire/default.nix b/nixpkgs/pkgs/development/libraries/pipewire/default.nix index 79682d7ace81..d4dc43021396 100644 --- a/nixpkgs/pkgs/development/libraries/pipewire/default.nix +++ b/nixpkgs/pkgs/development/libraries/pipewire/default.nix @@ -69,7 +69,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.45"; + version = "0.3.48"; outputs = [ "out" @@ -87,7 +87,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-OnQd98qfOekAsVXLbciZLNPrM84KBX6fOx/f8y2BYI0="; + sha256 = "sha256-+gk/MJ9YimHBwN2I42DRP+I2OqBFFtZ81Fd/l89HcSk="; }; patches = [ @@ -139,7 +139,7 @@ let ++ lib.optional zeroconfSupport avahi ++ lib.optional raopSupport openssl ++ lib.optional rocSupport roc-toolkit - ++ lib.optionals x11Support [ libcanberra xorg.libxcb ]; + ++ lib.optionals x11Support [ libcanberra xorg.libX11 xorg.libXfixes ]; # Valgrind binary is required for running one optional test. checkInputs = lib.optional withValgrind valgrind; @@ -214,6 +214,7 @@ let "nix-support/client-rt.conf.json" "nix-support/client.conf.json" "nix-support/jack.conf.json" + "nix-support/minimal.conf.json" "nix-support/pipewire.conf.json" "nix-support/pipewire-pulse.conf.json" ]; diff --git a/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix b/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix index 9ab197278d0a..8983f09f2d37 100644 --- a/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix +++ b/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix @@ -39,6 +39,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-xwfggrjKHh5mZdvH6dKqQo6o1ltxuYdjoGYaWl31C/Y="; }; + patches = [ + # backport a patch to fix hangs in some applications + # ref: https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/213 + # FIXME: drop this in 0.4.9 + (fetchpatch { + url = "https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/afbc0ce57aac7aee8dc1651de4620f15c73dbace.patch"; + sha256 = "sha256-8ycFnrzDq7QHgjwJ/772OTMsSsN3m7gjbdvTmlMJ+mU="; + }) + ]; + nativeBuildInputs = [ meson pkg-config @@ -67,6 +77,9 @@ stdenv.mkDerivation rec { "-Delogind=disabled" "-Ddoc=${mesonEnableFeature enableDocs}" "-Dintrospection=${mesonEnableFeature enableGI}" + "-Dsystemd-system-service=true" + "-Dsystemd-system-unit-dir=${placeholder "out"}/lib/systemd/system" + "-Dsysconfdir=/etc" ]; passthru.updateScript = nix-update-script { diff --git a/nixpkgs/pkgs/development/libraries/portmidi/default.nix b/nixpkgs/pkgs/development/libraries/portmidi/default.nix index 43699291d362..f661ac0e40bc 100644 --- a/nixpkgs/pkgs/development/libraries/portmidi/default.nix +++ b/nixpkgs/pkgs/development/libraries/portmidi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "portmidi"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "zOmzJ2MLGhGXiN0XjcmnnUrk/uqxP9IaZbqCG5XchC4="; + sha256 = "sha256-bLGqi3b9FHBA43baNDT8jkPBQSXAUDfurQSJHLcy3AE="; }; cmakeFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/prison/default.nix b/nixpkgs/pkgs/development/libraries/prison/default.nix index 4275622c24f4..71f8596c646b 100644 --- a/nixpkgs/pkgs/development/libraries/prison/default.nix +++ b/nixpkgs/pkgs/development/libraries/prison/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, cmake, qrencode, qt4, libdmtx }: -let v = "1.0"; in - stdenv.mkDerivation rec { - name = "prison-${v}"; + pname = "prison"; + version = "1.0"; src = fetchurl { - url = "mirror://kde/stable/prison/${v}/src/${name}.tar.gz"; + url = "mirror://kde/stable/prison/${version}/src/prison-${version}.tar.gz"; sha256 = "08hkzzda36jpdywjqlyzcvli7cx17h4l9yffzsdnhdd788n28krr"; }; diff --git a/nixpkgs/pkgs/development/libraries/proj-datumgrid/default.nix b/nixpkgs/pkgs/development/libraries/proj-datumgrid/default.nix index 93e415f62699..8251a17a83c6 100644 --- a/nixpkgs/pkgs/development/libraries/proj-datumgrid/default.nix +++ b/nixpkgs/pkgs/development/libraries/proj-datumgrid/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "proj-datumgrid"; + pname = "proj-datumgrid"; version = "world-1.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/pugixml/default.nix b/nixpkgs/pkgs/development/libraries/pugixml/default.nix index 6a8baae5c9a2..c976db882257 100644 --- a/nixpkgs/pkgs/development/libraries/pugixml/default.nix +++ b/nixpkgs/pkgs/development/libraries/pugixml/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pugixml"; - version = "1.12"; + version = "1.12.1"; src = fetchFromGitHub { owner = "zeux"; repo = "pugixml"; rev = "v${version}"; - sha256 = "sha256-FLemG9T17n6l7vgb01OmO22BK59jv5uozVHeUnILEEQ="; + sha256 = "sha256-Udjx84mhLPJ1bU5WYDo73PAeeufS+vBLXZP0YbBvqLE="; }; outputs = if shared then [ "out" "dev" ] else [ "out" ]; diff --git a/nixpkgs/pkgs/development/libraries/qimageblitz/default.nix b/nixpkgs/pkgs/development/libraries/qimageblitz/default.nix index 709a3fb1533d..e838eb07201f 100644 --- a/nixpkgs/pkgs/development/libraries/qimageblitz/default.nix +++ b/nixpkgs/pkgs/development/libraries/qimageblitz/default.nix @@ -1,15 +1,11 @@ {lib, stdenv, fetchurl, cmake, qt4}: -let - pn = "qimageblitz"; - v = "0.0.4"; -in - -stdenv.mkDerivation { - name = "${pn}-${v}"; +stdenv.mkDerivation rec { + pname = "qimageblitz"; + version = "0.0.4"; src = fetchurl { - url = "mirror://sourceforge/${pn}/${pn}-${v}.tar.bz2"; + url = "mirror://sourceforge/qimageblitz/qimageblitz-${version}.tar.bz2"; sha256 = "0pnaf3qi7rgkxzs2mssmslb3f9ya4cyx09wzwlis3ppyvf72j0p9"; }; @@ -21,7 +17,7 @@ stdenv.mkDerivation { meta = { description = "Graphical effect and filter library for KDE4"; license = lib.licenses.bsd2; - homepage = "http://${pn}.sourceforge.net"; + homepage = "http://qimageblitz.sourceforge.net"; platforms = lib.platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix index 96d2abe5a6ea..e581bdf5f88e 100644 --- a/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -15,22 +15,17 @@ , libobjc, ApplicationServices, OpenGL, Cocoa, AGL, libcxx }: -let - v_maj = "4.8"; - v_min = "7"; - vers = "${v_maj}.${v_min}"; -in - # TODO: # * move some plugins (e.g., SQL plugins) to dedicated derivations to avoid # false build-time dependencies stdenv.mkDerivation rec { - name = "qt-${vers}"; + pname = "qt" + lib.optionalString ( docs && demos && examples && developerBuild ) "-full"; + version = "4.8.7"; src = fetchurl { url = "http://download.qt-project.org/official_releases/qt/" - + "${v_maj}/${vers}/qt-everywhere-opensource-src-${vers}.tar.gz"; + + "${lib.versions.majorMinor version}/${version}/qt-everywhere-opensource-src-${version}.tar.gz"; sha256 = "183fca7n7439nlhxyg1z7aky0izgbyll3iwakw4gwivy16aj5272"; }; @@ -40,8 +35,6 @@ stdenv.mkDerivation rec { setOutputFlags = false; - # The version property must be kept because it will be included into the QtSDK package name - version = vers; prePatch = '' substituteInPlace configure --replace /bin/pwd pwd @@ -131,13 +124,13 @@ stdenv.mkDerivation rec { preConfigure = '' export LD_LIBRARY_PATH="`pwd`/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" configureFlags+=" - -docdir $out/share/doc/${name} + -docdir $out/share/doc/qt-${version} -plugindir $out/lib/qt4/plugins -importdir $out/lib/qt4/imports - -examplesdir $TMPDIR/share/doc/${name}/examples - -demosdir $TMPDIR/share/doc/${name}/demos - -datadir $out/share/${name} - -translationdir $out/share/${name}/translations + -examplesdir $TMPDIR/share/doc/qt-${version}/examples + -demosdir $TMPDIR/share/doc/qt-${version}/demos + -datadir $out/share/qt-${version} + -translationdir $out/share/qt-${version}/translations --jobs=$NIX_BUILD_CORES " unset LD # Makefile uses gcc for linking; setting LD interferes diff --git a/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix b/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix index 72413b372f00..f2ea86160fb6 100644 --- a/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix +++ b/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix @@ -2,36 +2,40 @@ stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum-qt4"; - version = "0.20.2"; + version = "1.0.1"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - sha256 = "sha256-aIhLrGKb8iPl8N483+EOaCrTua96Qvl2lc2UXRiqvJA="; + hash = "sha256-Faex1NF5bJa0GdC+Sz4p6kHaGUtAkqZlNGi0TSc5ckw="; }; nativeBuildInputs = [ qmake4Hook ]; buildInputs = [ qt4 libX11 libXext ]; - postUnpack = "sourceRoot=\${sourceRoot}/Kvantum"; + sourceRoot = "source/Kvantum"; buildPhase = '' + runHook preBuild qmake kvantum.pro make + runHook postBuild ''; installPhase = '' + runHook preInstall mkdir $TMP/kvantum make INSTALL_ROOT="$TMP/kvantum" install mv $TMP/kvantum/usr/ $out mv $TMP/kvantum/${qt4}/lib $out + runHook postInstall ''; meta = with lib; { description = "SVG-based Qt4 theme engine"; homepage = "https://github.com/tsujan/Kvantum"; - license = licenses.gpl2; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.bugworm ]; }; diff --git a/nixpkgs/pkgs/development/libraries/rang/default.nix b/nixpkgs/pkgs/development/libraries/rang/default.nix index 79ab52fc8351..050beef5ea30 100644 --- a/nixpkgs/pkgs/development/libraries/rang/default.nix +++ b/nixpkgs/pkgs/development/libraries/rang/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "rang"; - version = "v3.1.0"; + version = "3.1.0"; src = fetchFromGitHub { - "owner" = "agauniyal"; + owner = "agauniyal"; repo = "rang"; - "rev" = "cabe04d6d6b05356fa8f9741704924788f0dd762"; - "sha256" = "0v2pz0l2smagr3j4abjccshg4agaccfz79m5ayvrvqq5d4rlds0s"; + rev = "cabe04d6d6b05356fa8f9741704924788f0dd762"; + sha256 = "0v2pz0l2smagr3j4abjccshg4agaccfz79m5ayvrvqq5d4rlds0s"; }; nativeBuildInputs = [ cmake ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/re2/default.nix b/nixpkgs/pkgs/development/libraries/re2/default.nix index 22d803c17be6..2cdad981fbd9 100644 --- a/nixpkgs/pkgs/development/libraries/re2/default.nix +++ b/nixpkgs/pkgs/development/libraries/re2/default.nix @@ -1,25 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, nix-update-script }: +{ lib, stdenv, fetchFromGitHub, nix-update-script }: stdenv.mkDerivation rec { pname = "re2"; - version = "2021-11-01"; + version = "2022-02-01"; src = fetchFromGitHub { owner = "google"; repo = "re2"; rev = version; - sha256 = "sha256-q8u7xNp6n17F6twPoVkix8iCKPWUN+qg6rhSR4Dv+bI="; + sha256 = "sha256-3RspCfJD2jV7GYuzeBUcxkZsdHyL14kaz8lSoIrH7b8="; }; - patches = [ - # Pull upstreal fix for parallel testing. - (fetchpatch { - name = "parallel-tests.patch"; - url = "https://github.com/google/re2/commit/9262284a7edc1b83e7172f4ec2d7967d695e7420.patch"; - sha256 = "1knhfx9cs4841r09jw4ha6mdx9qwpvlcxvd04i8vr84kd0lilqms"; - }) - ]; - preConfigure = '' substituteInPlace Makefile --replace "/usr/local" "$out" # we're using gnu sed, even on darwin @@ -29,6 +20,11 @@ stdenv.mkDerivation rec { buildFlags = lib.optionals stdenv.hostPlatform.isStatic [ "static" ]; enableParallelBuilding = true; + # Broken when shared/static are tested in parallel: + # cp: cannot create regular file 'obj/testinstall.cc': File exists + # make: *** [Makefile:334: static-testinstall] Error 1 + # Will be fixed by https://code-review.googlesource.com/c/re2/+/59830 + enableParallelChecking = false; preCheck = "patchShebangs runtests"; doCheck = true; diff --git a/nixpkgs/pkgs/development/libraries/retro-gtk/default.nix b/nixpkgs/pkgs/development/libraries/retro-gtk/default.nix index 113143311edf..7711dde497f0 100644 --- a/nixpkgs/pkgs/development/libraries/retro-gtk/default.nix +++ b/nixpkgs/pkgs/development/libraries/retro-gtk/default.nix @@ -72,5 +72,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = [ maintainers.DamienCassou ]; platforms = platforms.all; + broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/retro-gtk.x86_64-darwin }; } diff --git a/nixpkgs/pkgs/development/libraries/rocclr/default.nix b/nixpkgs/pkgs/development/libraries/rocclr/default.nix index 4d78209f1411..b55c2ef81527 100644 --- a/nixpkgs/pkgs/development/libraries/rocclr/default.nix +++ b/nixpkgs/pkgs/development/libraries/rocclr/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "rocclr"; - version = "4.5.2"; + version = "5.0.2"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "ROCclr"; rev = "rocm-${version}"; - hash = "sha256-fsQANBND/oDeC/+wmCH/aLlDTxPIi7Z/oN1HnNHHnm0="; + hash = "sha256-x6XwYxgiCoy6Q7gIevSTEWgUQ0aEjPFhKSqMqQahHig="; }; prePatch = '' diff --git a/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix b/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix index e2ed679d2128..773f98ee54a9 100644 --- a/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix +++ b/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "rocm-device-libs"; - version = "4.5.2"; + version = "5.0.2"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-Device-Libs"; rev = "rocm-${version}"; - hash = "sha256-UeunsDRLhmsDOzesiEgYIzYotwecehB6VswshzdRwjw="; + hash = "sha256-eZdy9+BfuUVzPO6huvqcwCog96qMVTYoY3l6J0YMUZQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix index f69165c5811e..9c19638d3f40 100644 --- a/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix +++ b/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "rocm-opencl-runtime"; - version = "4.5.2"; + version = "5.0.2"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-OpenCL-Runtime"; rev = "rocm-${version}"; - hash = "sha256-0OGYF4urlscr8tMkQwo2yATXwN0DjB092KQ+CBEhfIA="; + hash = "sha256-ovYwElZGRKySH1mWFIISxuNNxCjaqoe9oCvqYZGdfq0="; }; nativeBuildInputs = [ cmake rocm-cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix b/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix index 54ecd4f59b8d..aff0475c4a53 100644 --- a/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix +++ b/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "rocm-runtime"; - version = "4.5.2"; + version = "5.0.1"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCR-Runtime"; rev = "rocm-${version}"; - hash = "sha256-DJDlEHnXhegcenO8BIY/8GnZdHldVs0GFLrQy4Z6heY="; + hash = "sha256-KOzVZNHtpwEOn7lZ36c4BGrImrq8dkUWRiHqGm+UTDk="; }; sourceRoot = "source/src"; diff --git a/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix b/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix index e76b7c1993ae..9ceb1360cda0 100644 --- a/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix +++ b/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "rocm-thunk"; - version = "4.5.2"; + version = "5.0.2"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCT-Thunk-Interface"; rev = "rocm-${version}"; - hash = "sha256-s/N1wkAgpxYCK6rIiWH8cGQU5YFGj0q4Dxj9j3yIys8="; + hash = "sha256-hhDLy92jS/akp1Ozun45OEjVbVcjufkRIfC8bqqFjp4="; }; preConfigure = '' diff --git a/nixpkgs/pkgs/development/libraries/rubberband/default.nix b/nixpkgs/pkgs/development/libraries/rubberband/default.nix index 7fc8fe98db29..1e70d6e0dbed 100644 --- a/nixpkgs/pkgs/development/libraries/rubberband/default.nix +++ b/nixpkgs/pkgs/development/libraries/rubberband/default.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsamplerate libsndfile fftw vamp-plugin-sdk ladspaH ]; + makeFlags = [ "AR:=$(AR)" ]; meta = with lib; { description = "High quality software library for audio time-stretching and pitch-shifting"; diff --git a/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix b/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix index 395e5d0c75d6..c22ff6c37309 100644 --- a/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix +++ b/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.3.4"; + version = "1.3.6"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - hash = "sha256-/kZI/NOZO8T5jlG9Qtfr14aCJDKrP7wEQLgJ6qe9VzY="; + hash = "sha256-i1RbyHw+Fr1QABra6fskRpIbYxEfhOVToeesyax4NtU="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix index 8a9df7601d28..d93b4fb2a5a7 100644 --- a/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "htslib"; - version = "1.14"; + version = "1.15"; src = fetchurl { url = "https://github.com/samtools/htslib/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-7SIbj1L0gS+BDuvgzFbNg1WlydIcYtFCrAWtDaFHk18="; + sha256 = "sha256-Gp9JkRUDoi9WgXzILqm4f7fnRntf+YnKWqYcEufVMtk="; }; # perl is only used during the check phase. diff --git a/nixpkgs/pkgs/development/libraries/science/math/bonmin/default.nix b/nixpkgs/pkgs/development/libraries/science/math/bonmin/default.nix new file mode 100644 index 000000000000..9526a6250184 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/science/math/bonmin/default.nix @@ -0,0 +1,51 @@ +{ lib +, stdenv +, fetchFromGitHub +, gfortran +, pkg-config +, blas +, bzip2 +, cbc +, clp +, ipopt +, lapack +, libamplsolver +, zlib +}: + +assert (!blas.isILP64) && (!lapack.isILP64); + +stdenv.mkDerivation rec { + pname = "bonmin"; + version = "1.8.8"; + + src = fetchFromGitHub { + owner = "coin-or"; + repo = "Bonmin"; + rev = "releases/${version}"; + sha256 = "sha256-HU25WjvG01oL3U1wG6ivTcYaN51MMxgLdKZ3AkDNe2Y="; + }; + + nativeBuildInputs = [ + gfortran + pkg-config + ]; + buildInputs = [ + blas + bzip2 + cbc + clp + ipopt + lapack + libamplsolver + zlib + ]; + + meta = with lib; { + description = "An open-source code for solving general MINLP (Mixed Integer NonLinear Programming) problems"; + homepage = "https://github.com/coin-or/Bonmin"; + license = licenses.epl10; + platforms = platforms.unix; + maintainers = with maintainers; [ aanderse ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/science/math/clmagma/default.nix b/nixpkgs/pkgs/development/libraries/science/math/clmagma/default.nix index 3905e70d3401..fe9fc540902d 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/clmagma/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/clmagma/default.nix @@ -3,7 +3,6 @@ with lib; let - version = "1.3.0"; incfile = builtins.toFile "make.inc.custom" '' CC = g++ FORT = gfortran @@ -32,10 +31,11 @@ let INC = -I$(clBLAS)/include #-I$(AMDAPP)/include ''; -in stdenv.mkDerivation { - name = "clmagma-${version}"; +in stdenv.mkDerivation rec { + pname = "clmagma"; + version = "1.3.0"; src = fetchurl { - url = "http://icl.cs.utk.edu/projectsfiles/magma/cl/clmagma-${version}.tar.gz"; + url = "https://icl.cs.utk.edu/projectsfiles/magma/cl/clmagma-${version}.tar.gz"; sha256 = "1n27ny0xhwirw2ydn46pfcwy53gzia9zbam4irx44fd4d7f9ydv7"; name = "clmagma-${version}.tar.gz"; }; @@ -68,7 +68,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "Matrix Algebra on GPU and Multicore Architectures, OpenCL port"; license = licenses.bsd3; - homepage = "http://icl.cs.utk.edu/magma/index.html"; + homepage = "https://icl.cs.utk.edu/magma/index.html"; platforms = platforms.linux; maintainers = with maintainers; [ volhovm ]; }; diff --git a/nixpkgs/pkgs/development/libraries/science/math/ipopt/default.nix b/nixpkgs/pkgs/development/libraries/science/math/ipopt/default.nix index e0dfef0b7eec..325a6b82a6f9 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/ipopt/default.nix @@ -1,26 +1,35 @@ -{ lib, stdenv, fetchurl, unzip, blas, lapack, gfortran }: +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, blas +, lapack +, gfortran +, enableAMPL ? stdenv.isLinux, libamplsolver +}: assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "ipopt"; - version = "3.12.13"; + version = "3.14.5"; - src = fetchurl { - url = "https://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip"; - sha256 = "0kzf05aypx8q5mr3sciclk926ans0yi2d2chjdxxgpi3sza609dx"; + src = fetchFromGitHub { + owner = "coin-or"; + repo = "Ipopt"; + rev = "releases/${version}"; + sha256 = "sha256-eqOacZGuuGAjWMs2H6RntQ+WJmGTi+EqydHUQXEpY54="; }; CXXDEFS = [ "-DHAVE_RAND" "-DHAVE_CSTRING" "-DHAVE_CSTDIO" ]; configureFlags = [ - "--with-blas-lib=-lblas" - "--with-lapack-lib=-llapack" + "--with-asl-cflags=-I${libamplsolver}/include" + "--with-asl-lflags=-lamplsolver" ]; - nativeBuildInputs = [ unzip gfortran ]; - - buildInputs = [ blas lapack ]; + nativeBuildInputs = [ pkg-config gfortran ]; + buildInputs = [ blas lapack ] ++ lib.optionals enableAMPL [ libamplsolver ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/science/math/libamplsolver/default.nix b/nixpkgs/pkgs/development/libraries/science/math/libamplsolver/default.nix new file mode 100644 index 000000000000..bcbde5f61359 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/science/math/libamplsolver/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, fetchurl, fetchpatch }: + +stdenv.mkDerivation rec { + pname = "libamplsolver"; + version = "20211109"; + + src = fetchurl { + url = "https://ampl.com/netlib/ampl/solvers.tgz"; + sha256 = "sha256-LVmScuIvxmZzywPSBl9T9YcUBJP7UFAa3eWs9r4q3JM="; + }; + + patches = [ + # Debian provides a patch to build a shared library + (fetchpatch { + url = "https://sources.debian.org/data/main/liba/libamplsolver/0~20190702-2/debian/patches/fix-makefile-shared-lib.patch"; + sha256 = "sha256-96qwj3fLugzbsfxguKMce13cUo7XGC4VUE7xKcJs42Y="; + }) + ]; + + installPhase = '' + runHook preInstall + pushd sys.`uname -m`.`uname -s` + install -D -m 0644 *.h -t $out/include + install -D -m 0644 *.so* -t $out/lib + install -D -m 0644 *.a -t $out/lib + popd + runHook postInstall + ''; + + meta = with lib; { + description = "A library of routines that help solvers work with AMPL"; + homepage = "https://ampl.com/netlib/ampl/"; + license = [ licenses.mit ]; + platforms = platforms.linux; + maintainers = with maintainers; [ aanderse ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix b/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix index ca3e4a243691..20978e31cff1 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix @@ -77,7 +77,8 @@ stdenv.mkDerivation rec { (cd temp_python/ortools; PYTHONPATH="$python/${python.sitePackages}:$PYTHONPATH" python setup.py install '--prefix=$python') ''; - enableParallelBuilding = true; + # protobuf generation is not thread safe + enableParallelBuilding = false; nativeBuildInputs = [ cmake diff --git a/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix b/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix index 4a4208e1cbe4..a06df2b1950d 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix @@ -18,11 +18,11 @@ assert petsc-withp4est -> p4est.mpiSupport; stdenv.mkDerivation rec { pname = "petsc"; - version = "3.16.4"; + version = "3.16.5"; src = fetchurl { url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz"; - sha256 = "sha256-IpzOIr3P7bH+gn0wbtGvypc3eGzcPwVit0oZZsEkPK8="; + sha256 = "sha256-fehXDuuUBidS2CqDII/Cuvx3s/UVAjpMFNj/lEDmbKw="; }; mpiSupport = !withp4est || p4est.mpiSupport; @@ -67,6 +67,11 @@ stdenv.mkDerivation rec { configureScript = "python ./configure"; + # disable stackprotector on aarch64-darwin for now + # https://github.com/NixOS/nixpkgs/issues/158730 + # see https://github.com/NixOS/nixpkgs/issues/127608 for a similar issue + hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; + enableParallelBuilding = true; doCheck = stdenv.hostPlatform == stdenv.buildPlatform; diff --git a/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix b/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix index 9a7374f4f49c..bafb52be7ffb 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix @@ -6,13 +6,13 @@ assert blas.isILP64 == lapack.isILP64; stdenv.mkDerivation rec { pname = "scalapack"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "Reference-ScaLAPACK"; repo = pname; rev = "v${version}"; - sha256 = "0hiap5i9ik6xpvl721n2slanlqygagc1pg2bcjb27ans6balhsfh"; + sha256 = "sha256-GNVGWrIWdfyTfbz7c31Vjt9eDlVzCd/aLHoWq2DMyX4="; }; passthru = { inherit (blas) isILP64; }; diff --git a/nixpkgs/pkgs/development/libraries/science/math/scs/default.nix b/nixpkgs/pkgs/development/libraries/science/math/scs/default.nix index a945e99ec9cb..6ccbfb11f51f 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/scs/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/scs/default.nix @@ -4,13 +4,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "scs"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "cvxgrp"; repo = "scs"; rev = version; - sha256 = "sha256-yoh25DmvY7fohAvABCiSLkvr7TskGd0ED2K3rIa/IeM="; + sha256 = "sha256-ewn7AGNqTXY3bp5itHTfAQ2Es2ZAIbuRFM5U600Px50="; }; # Actually link and add libgfortran to the rpath diff --git a/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix b/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix index 4c0059184ee3..bf5251d1aed6 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "suitesparse-graphblas"; - version = "6.1.4"; + version = "6.2.2"; outputs = [ "out" "dev" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "DrTimothyAldenDavis"; repo = "GraphBLAS"; rev = "v${version}"; - sha256 = "sha256-pjb4Q9b+5hcI0ZYoez46V/ve4+1GJORu2ZGweceaWDY="; + sha256 = "sha256-uSPE7uFiG4xbsAeo/UmOP5Ns+3yZ7kKL2bNxzd8mzP8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/science/math/suitesparse/4.4.nix b/nixpkgs/pkgs/development/libraries/science/math/suitesparse/4.4.nix index 1ebac6ac445d..e734ed8ff35a 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/suitesparse/4.4.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/suitesparse/4.4.nix @@ -3,14 +3,12 @@ }: let - version = "4.4.4"; - name = "suitesparse-${version}"; - int_t = if blas.isILP64 then "int64_t" else "int32_t"; SHLIB_EXT = stdenv.hostPlatform.extensions.sharedLibrary; in -stdenv.mkDerivation { - inherit name; +stdenv.mkDerivation rec { + version = "4.4.4"; + pname = "suitesparse"; src = fetchurl { url = "http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-${version}.tar.gz"; @@ -71,7 +69,7 @@ stdenv.mkDerivation { done # Install documentation - outdoc=$out/share/doc/${name} + outdoc=$out/share/doc/suitesparse-${version} mkdir -p $outdoc cp -r AMD/Doc $outdoc/amd cp -r BTF/Doc $outdoc/bft diff --git a/nixpkgs/pkgs/development/libraries/science/math/trilinos/default.nix b/nixpkgs/pkgs/development/libraries/science/math/trilinos/default.nix index 19d2119622e9..1939b0a5307b 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/trilinos/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/trilinos/default.nix @@ -59,7 +59,9 @@ let in stdenv.mkDerivation rec { pname = "trilinos"; - version = "12.12.1"; # Xyce 7.4 requires version 12.12.1 + # Xyce 7.4 requires version 12.12.1 + # nixpkgs-update: no auto update + version = "12.12.1"; src = fetchFromGitHub { owner = "trilinos"; diff --git a/nixpkgs/pkgs/development/libraries/shine/default.nix b/nixpkgs/pkgs/development/libraries/shine/default.nix new file mode 100644 index 000000000000..8e5d02e632d2 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/shine/default.nix @@ -0,0 +1,22 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: + +stdenv.mkDerivation rec { + pname = "shine"; + version = "3.1.1"; + + src = fetchFromGitHub { + owner = "toots"; + repo = "shine"; + rev = version; + sha256 = "06nwylqqji0i1isdprm2m5qsdj4qiywcgnp69c5b55pnw43f07qg"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = with lib; { + description = "Fast fixed-point mp3 encoding library"; + homepage = "https://github.com/toots/shine"; + license = licenses.lgpl2Only; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/soil/default.nix b/nixpkgs/pkgs/development/libraries/soil/default.nix index dcec1c897b3b..39a64c84ddcd 100644 --- a/nixpkgs/pkgs/development/libraries/soil/default.nix +++ b/nixpkgs/pkgs/development/libraries/soil/default.nix @@ -6,7 +6,8 @@ }: stdenv.mkDerivation { - name = "soil"; + pname = "soil"; + version = "unstable-2020-01-04"; src = fetchzip { url = "https://web.archive.org/web/20200104042737id_/http://www.lonesock.net/files/soil.zip"; diff --git a/nixpkgs/pkgs/development/libraries/soprano/default.nix b/nixpkgs/pkgs/development/libraries/soprano/default.nix deleted file mode 100644 index 46520714c510..000000000000 --- a/nixpkgs/pkgs/development/libraries/soprano/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, qt4, clucene_core, librdf_redland, libiodbc -, pkg-config }: - -stdenv.mkDerivation rec { - pname = "soprano"; - version = "2.9.4"; - - src = fetchurl { - url = "mirror://sourceforge/soprano/${pname}-${version}.tar.bz2"; - sha256 = "1rg0x7yg0a1cbnxz7kqk52580wla8jbnj4d4r3j7l7g7ajyny1k4"; - }; - - patches = [ ./find-virtuoso.patch ]; - - # We disable the Java backend, since we do not need them and they make the closure size much bigger - buildInputs = [ qt4 clucene_core librdf_redland libiodbc ]; - - nativeBuildInputs = [ cmake pkg-config ]; - - meta = { - homepage = "http://soprano.sourceforge.net/"; - description = "An object-oriented C++/Qt4 framework for RDF data"; - license = "LGPL"; - maintainers = with lib.maintainers; [ sander ]; - inherit (qt4.meta) platforms; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/soprano/find-virtuoso.patch b/nixpkgs/pkgs/development/libraries/soprano/find-virtuoso.patch deleted file mode 100644 index 95a2c7e96565..000000000000 --- a/nixpkgs/pkgs/development/libraries/soprano/find-virtuoso.patch +++ /dev/null @@ -1,86 +0,0 @@ -From: Yury G. Kudryashov <urkud.urkud@gmail.com> -Subject: [PATCH] Find virtuoso if virtuoso-t is in PATH - ---- - backends/virtuoso/virtuosobackend.cpp | 31 ++++++++++++++++++++++--------- - backends/virtuoso/virtuosobackend.h | 2 +- - 2 files changed, 23 insertions(+), 10 deletions(-) - -diff --git a/backends/virtuoso/virtuosobackend.cpp b/backends/virtuoso/virtuosobackend.cpp -index c245101..249958a 100644 ---- a/backends/virtuoso/virtuosobackend.cpp -+++ b/backends/virtuoso/virtuosobackend.cpp -@@ -28,6 +28,7 @@ - #include "odbcconnectionpool.h" - - #include "sopranodirs.h" -+#include "soprano-config.h" - - #include <QtCore/QDebug> - #include <QtCore/QtPlugin> -@@ -210,19 +211,19 @@ Soprano::BackendFeatures Soprano::Virtuoso::BackendPlugin::supportedFeatures() c - - bool Soprano::Virtuoso::BackendPlugin::isAvailable() const - { --#ifndef Q_OS_WIN -- if ( findVirtuosoDriver().isEmpty() ) { -- qDebug() << Q_FUNC_INFO << "could not find Virtuoso ODBC driver"; -- return false; -- } --#endif -- - QString virtuosoBin = locateVirtuosoBinary(); - if ( virtuosoBin.isEmpty() ) { - qDebug() << Q_FUNC_INFO << "could not find virtuoso-t binary"; - return false; - } - -+#ifndef Q_OS_WIN -+ if ( findVirtuosoDriver( virtuosoBin ).isEmpty() ) { -+ qDebug() << Q_FUNC_INFO << "could not find Virtuoso ODBC driver"; -+ return false; -+ } -+#endif -+ - QString vs = determineVirtuosoVersion( virtuosoBin ); - if ( vs.isEmpty() ) { - qDebug() << Q_FUNC_INFO << "Failed to determine version of the Virtuoso server at" << virtuosoBin; -@@ -267,9 +268,21 @@ QString Soprano::Virtuoso::BackendPlugin::locateVirtuosoBinary() - - #ifndef Q_OS_WIN - // static --QString Soprano::Virtuoso::BackendPlugin::findVirtuosoDriver() -+QString Soprano::Virtuoso::BackendPlugin::findVirtuosoDriver( const QString &virtuosoBinHint ) - { -- return Soprano::findLibraryPath( "virtodbc_r", QStringList(), QStringList() << QLatin1String( "virtuoso/plugins/" ) << QLatin1String( "odbc/" ) ); -+ QString virtuosoBin; -+ if (virtuosoBinHint.isEmpty()) -+ virtuosoBin = locateVirtuosoBinary(); -+ else -+ virtuosoBin = virtuosoBinHint; -+ -+ QDir virtuosoBinDir = QFileInfo(virtuosoBin).absoluteDir(); -+ return Soprano::findLibraryPath( "virtodbc_r", -+ QStringList() -+ << virtuosoBinDir.absoluteFilePath("../lib"SOPRANO_LIB_SUFFIX) -+ << virtuosoBinDir.absoluteFilePath("../lib"), -+ QStringList() << QLatin1String( "virtuoso/plugins/" ) << -+ QLatin1String( "odbc/" ) ); - } - #endif - -diff --git a/backends/virtuoso/virtuosobackend.h b/backends/virtuoso/virtuosobackend.h -index 646b9f8..535fbb9 100644 ---- a/backends/virtuoso/virtuosobackend.h -+++ b/backends/virtuoso/virtuosobackend.h -@@ -52,7 +52,7 @@ namespace Soprano { - - #ifndef Q_OS_WIN - private: -- static QString findVirtuosoDriver(); -+ static QString findVirtuosoDriver(const QString &virtuosoBinHint = QString()); - #endif - }; - } --- -tg: (2321148..) t/find-virtuoso (depends on: master) diff --git a/nixpkgs/pkgs/development/libraries/speech-tools/default.nix b/nixpkgs/pkgs/development/libraries/speech-tools/default.nix index 8706b8789227..c69345193c77 100644 --- a/nixpkgs/pkgs/development/libraries/speech-tools/default.nix +++ b/nixpkgs/pkgs/development/libraries/speech-tools/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, alsa-lib, ncurses }: stdenv.mkDerivation rec { - name = "speech_tools-${version}.0"; - version = "2.5"; + pname = "speech_tools"; + version = "2.5.0"; src = fetchurl { - url = "http://www.festvox.org/packed/festival/${version}/${name}-release.tar.gz"; + url = "http://www.festvox.org/packed/festival/${lib.versions.majorMinor version}/speech_tools-${version}-release.tar.gz"; sha256 = "1k2xh13miyv48gh06rgsq2vj25xwj7z6vwq9ilsn8i7ig3nrgzg4"; }; diff --git a/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix b/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix index 16cf654914d1..db5db61c6e99 100644 --- a/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix +++ b/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix @@ -124,6 +124,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dusb-acl-helper-dir=${placeholder "out"}/bin" "-Dusb-ids-path=${hwdata}/share/hwdata/usb.ids" + ] ++ lib.optionals (!withPolkit) [ + "-Dpolkit=disabled" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix b/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix index 353347215663..13714b4825cf 100644 --- a/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix +++ b/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sqlcipher"; - version = "4.5.0"; + version = "4.5.1"; src = fetchFromGitHub { owner = "sqlcipher"; repo = "sqlcipher"; rev = "v${version}"; - sha256 = "sha256-MFuFyKvOOrDrq9cDPQlNK6/YHSkaRX4qbw/44m5CRh4="; + sha256 = "sha256-cvbR3tav6DjIdJB/x2q5Oq7ju9q63z75b6q1uHYY9bE="; }; nativeBuildInputs = [ installShellFiles tcl ]; diff --git a/nixpkgs/pkgs/development/libraries/sqlite/default.nix b/nixpkgs/pkgs/development/libraries/sqlite/default.nix index 6704d894f5a2..5fdf6c11d77b 100644 --- a/nixpkgs/pkgs/development/libraries/sqlite/default.nix +++ b/nixpkgs/pkgs/development/libraries/sqlite/default.nix @@ -10,7 +10,7 @@ let in stdenv.mkDerivation rec { - pname = "sqlite"; + pname = "sqlite${optionalString interactive "-interactive"}"; version = "3.37.2"; # nixpkgs-update: no auto update diff --git a/nixpkgs/pkgs/development/libraries/t1lib/default.nix b/nixpkgs/pkgs/development/libraries/t1lib/default.nix index 69940c18aafc..66c9863c38a4 100644 --- a/nixpkgs/pkgs/development/libraries/t1lib/default.nix +++ b/nixpkgs/pkgs/development/libraries/t1lib/default.nix @@ -21,19 +21,22 @@ stdenv.mkDerivation rec { version = "5.1.2"; src = fetchurl { - url = "mirror://metalab/libs/graphics/t1lib-${version}.tar.gz"; - sha256 = "0nbvjpnmcznib1nlgg8xckrmsw3haa154byds2h90y2g0nsjh4w2"; + url = "mirror://ibiblioPubLinux/libs/graphics/${pname}-${version}.tar.gz"; + hash = "sha256-ghMotQVPeJCg0M0vUoJScHBd82QdvUdtWNF+Vu2Ve1k="; }; inherit patches; buildInputs = [ libX11 libXaw ]; buildFlags = [ "without_doc" ]; - postInstall = lib.optionalString (!stdenv.isDarwin) "chmod +x $out/lib/*.so.*"; # ?? + postInstall = lib.optionalString (!stdenv.isDarwin) '' + # ?? + chmod +x $out/lib/*.so.* + ''; meta = with lib; { - description = "A type 1 font rasterizer library for UNIX/X11"; homepage = "http://www.t1lib.org/"; + description = "A type 1 font rasterizer library for UNIX/X11"; license = with licenses; [ gpl2 lgpl2 ]; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/development/libraries/tachyon/default.nix b/nixpkgs/pkgs/development/libraries/tachyon/default.nix index fa6ca0141815..e2f611ed9d11 100644 --- a/nixpkgs/pkgs/development/libraries/tachyon/default.nix +++ b/nixpkgs/pkgs/development/libraries/tachyon/default.nix @@ -13,10 +13,10 @@ assert stdenv.isDarwin -> Carbon != null; stdenv.mkDerivation rec { pname = "tachyon"; - version = "0.99b6"; + version = "0.99.3"; src = fetchurl { url = "http://jedi.ks.uiuc.edu/~johns/tachyon/files/${version}/${pname}-${version}.tar.gz"; - sha256 = "15wv2748ngk2iid798a774sjxhhijq7kjm32yl897x54fsfazp7l"; + sha256 = "sha256-rsxxm1NK2IPRl/5O2Ng2sC1VH84Zj1uJ6mN+HZHyN+E="; }; buildInputs = lib.optionals stdenv.isDarwin [ Carbon diff --git a/nixpkgs/pkgs/development/libraries/tclx/default.nix b/nixpkgs/pkgs/development/libraries/tclx/default.nix index a8cf2a44fab6..3c814e17207c 100644 --- a/nixpkgs/pkgs/development/libraries/tclx/default.nix +++ b/nixpkgs/pkgs/development/libraries/tclx/default.nix @@ -1,18 +1,19 @@ { lib, fetchurl, tcl }: tcl.mkTclDerivation rec { - name = "tclx-${version}.${patch}"; - version = "8.4"; - patch = "1"; + pname = "tclx"; + version = "8.4.1"; src = fetchurl { - url = "mirror://sourceforge/tclx/tclx${version}.${patch}.tar.bz2"; + url = "mirror://sourceforge/tclx/tclx${version}.tar.bz2"; sha256 = "1v2qwzzidz0is58fd1p7wfdbscxm3ip2wlbqkj5jdhf6drh1zd59"; }; # 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} + postInstall = let + majorMinorVersion = lib.versions.majorMinor version; + in '' + ln -s $prefix/lib/tclx${majorMinorVersion} $prefix/lib/tclx${majorMinorVersion}/tclx${majorMinorVersion} ''; meta = { diff --git a/nixpkgs/pkgs/development/libraries/thrift/default.nix b/nixpkgs/pkgs/development/libraries/thrift/default.nix index c5795df55c01..f85e56578bbe 100644 --- a/nixpkgs/pkgs/development/libraries/thrift/default.nix +++ b/nixpkgs/pkgs/development/libraries/thrift/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "thrift"; - version = "0.15.0"; + version = "0.16.0"; src = fetchurl { url = "https://archive.apache.org/dist/thrift/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-1Yg1ZtFh+Pbd1OIfOp4+a4JyeZ0FSCDxwlsR6GcY+Gs="; + sha256 = "sha256-9GC1wcow2JGP+V6j62KRs5Uc9RhVNWYIjz8r6JgfYgk="; }; # Workaround to make the python wrapper not drop this package: diff --git a/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix b/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix index 10307c35f0c5..4df448d08f46 100644 --- a/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix +++ b/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix @@ -47,11 +47,11 @@ stdenv.mkDerivation rec { pname = "tracker-miners"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "RDafU+Lt70FDdAbb7s1Hepf4qa/dkTSDLqRdG6KqLEc="; + sha256 = "/YTHHmIbwrgcrLX5CJMkNiRtG4pPw6Y1PiuNuuvAI2w="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/umockdev/default.nix b/nixpkgs/pkgs/development/libraries/umockdev/default.nix index b00177960d3b..286f5ccc3fcf 100644 --- a/nixpkgs/pkgs/development/libraries/umockdev/default.nix +++ b/nixpkgs/pkgs/development/libraries/umockdev/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "umockdev"; - version = "0.17.6"; + version = "0.17.7"; outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "https://github.com/martinpitt/umockdev/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-X60zN3orHU8lOfRVCfbHTdrleKxB7ILCIGvXSZLdoSk="; + sha256 = "sha256-BdZCoW3QHM4Oue4bpuSFsuwIU1vsZ5pjqVv9TfGNC7U="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/uri/default.nix b/nixpkgs/pkgs/development/libraries/uri/default.nix index 48a80aacdf59..980d073f1281 100644 --- a/nixpkgs/pkgs/development/libraries/uri/default.nix +++ b/nixpkgs/pkgs/development/libraries/uri/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake, doxygen }: stdenv.mkDerivation rec { - name = "uri-${version}"; + pname = "uri"; version = "1.1.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/vaapi-intel/default.nix b/nixpkgs/pkgs/development/libraries/vaapi-intel/default.nix index f21a947a533f..2a9f0cf74032 100644 --- a/nixpkgs/pkgs/development/libraries/vaapi-intel/default.nix +++ b/nixpkgs/pkgs/development/libraries/vaapi-intel/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { backends for each supported hardware vendor. ''; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/vte/2.90.nix b/nixpkgs/pkgs/development/libraries/vte/2.90.nix index 55ef86c88a0e..dfb76069c3b2 100644 --- a/nixpkgs/pkgs/development/libraries/vte/2.90.nix +++ b/nixpkgs/pkgs/development/libraries/vte/2.90.nix @@ -1,14 +1,11 @@ { lib, stdenv, fetchurl, intltool, pkg-config, glib, gtk3, ncurses, gobject-introspection }: stdenv.mkDerivation rec { - versionMajor = "0.36"; - versionMinor = "3"; - moduleName = "vte"; - - name = "${moduleName}-${versionMajor}.${versionMinor}"; + pname = "vte"; + version = "0.36.3"; src = fetchurl { - url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; + url = "mirror://gnome/sources/vte/${lib.versions.majorMinor version}/vte-${version}.tar.xz"; sha256 = "54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c"; }; diff --git a/nixpkgs/pkgs/development/libraries/vte/default.nix b/nixpkgs/pkgs/development/libraries/vte/default.nix index 0411086c78c3..eae934a4ebb1 100644 --- a/nixpkgs/pkgs/development/libraries/vte/default.nix +++ b/nixpkgs/pkgs/development/libraries/vte/default.nix @@ -21,6 +21,7 @@ , zlib , icu , systemd +, systemdSupport ? stdenv.hostPlatform.isLinux }: stdenv.mkDerivation rec { @@ -63,6 +64,7 @@ stdenv.mkDerivation rec { pcre2 zlib icu + ] ++ lib.optionals systemdSupport [ systemd ]; @@ -73,6 +75,10 @@ stdenv.mkDerivation rec { pango ]; + mesonFlags = lib.optionals (!systemdSupport) [ + "-D_systemd=false" + ]; + postPatch = '' patchShebangs perf/* patchShebangs src/box_drawing_generate.sh diff --git a/nixpkgs/pkgs/development/libraries/vtk/generic.nix b/nixpkgs/pkgs/development/libraries/vtk/generic.nix index c180b05e9521..d770bd54d04c 100644 --- a/nixpkgs/pkgs/development/libraries/vtk/generic.nix +++ b/nixpkgs/pkgs/development/libraries/vtk/generic.nix @@ -90,6 +90,16 @@ in stdenv.mkDerivation rec { sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/g' ./ThirdParty/libxml2/vtklibxml2/xpath.c ''; + preFixup = '' + for lib in $out/lib/libvtk*.so; do + ln -s $lib $out/lib/"$(basename "$lib" | sed -e 's/-[[:digit:]]*.[[:digit:]]*//g')" + done + + mv $out/include/vtk-${majorVersion}/* $out/include + rmdir $out/include/vtk-${majorVersion} + ln -s $out/include $out/include/vtk-${majorVersion} + ''; + meta = with lib; { description = "Open source libraries for 3D computer graphics, image processing and visualization"; homepage = "https://www.vtk.org/"; diff --git a/nixpkgs/pkgs/development/libraries/wasilibc/default.nix b/nixpkgs/pkgs/development/libraries/wasilibc/default.nix index 56ed7367b2b2..e8436f9e9565 100644 --- a/nixpkgs/pkgs/development/libraries/wasilibc/default.nix +++ b/nixpkgs/pkgs/development/libraries/wasilibc/default.nix @@ -1,14 +1,27 @@ -{ stdenv, fetchFromGitHub, lib }: +{ stdenv, buildPackages, fetchFromGitHub, lib }: stdenv.mkDerivation { pname = "wasilibc"; - version = "20190712"; - src = fetchFromGitHub { - owner = "CraneStation"; + version = "unstable-2021-09-23"; + + src = buildPackages.fetchFromGitHub { + owner = "WebAssembly"; repo = "wasi-libc"; - rev = "8df0d4cd6a559b58d4a34b738a5a766b567448cf"; - sha256 = "1n4gvgzacpagar2mx8g9950q0brnhwz7jg2q44sa5mnjmlnkiqhh"; + rev = "ad5133410f66b93a2381db5b542aad5e0964db96"; + hash = "sha256-RiIClVXrb18jF9qCt+5iALHPCZKYcnad7JsILHBV0pA="; + fetchSubmodules = true; }; + + # clang-13: error: argument unused during compilation: '-rtlib=compiler-rt' [-Werror,-Wunused-command-line-argument] + postPatch = '' + substituteInPlace Makefile \ + --replace "-Werror" "" + ''; + + preBuild = '' + export NIX_CFLAGS_COMPILE="-I$(pwd)/sysroot/include $NIX_CFLAGS_COMPILE" + ''; + makeFlags = [ "WASM_CC=${stdenv.cc.targetPrefix}cc" "WASM_NM=${stdenv.cc.targetPrefix}nm" @@ -16,6 +29,8 @@ stdenv.mkDerivation { "INSTALL_DIR=${placeholder "out"}" ]; + enableParallelBuilding = true; + postInstall = '' mv $out/lib/*/* $out/lib ln -s $out/share/wasm32-wasi/undefined-symbols.txt $out/lib/wasi.imports @@ -23,9 +38,9 @@ stdenv.mkDerivation { meta = with lib; { description = "WASI libc implementation for WebAssembly"; - homepage = "https://wasi.dev"; - platforms = platforms.wasi; - maintainers = [ maintainers.matthewbauer ]; + homepage = "https://wasi.dev"; + platforms = platforms.wasi; + maintainers = with maintainers; [ matthewbauer ]; license = with licenses; [ asl20 mit llvm-exception ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix b/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix index b5a16df21add..afa8c63490a6 100644 --- a/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix +++ b/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , runCommand , fetchurl , perl @@ -44,7 +45,6 @@ , lcms2 , libmanette , openjpeg -, enableGeoLocation ? true , geoclue2 , sqlite , enableGLES ? true @@ -58,10 +58,11 @@ , substituteAll , glib , addOpenGLRunpath +, enableGeoLocation ? true +, withLibsecret ? true +, systemdSupport ? stdenv.isLinux }: -assert enableGeoLocation -> geoclue2 != null; - stdenv.mkDerivation rec { pname = "webkitgtk"; version = "2.34.6"; @@ -125,12 +126,8 @@ stdenv.mkDerivation rec { libidn libintl lcms2 - ] ++ lib.optionals stdenv.isLinux [ - libmanette - ] ++ [ libnotify libpthreadstubs - libsecret libtasn1 libwebp libxkbcommon @@ -155,28 +152,37 @@ stdenv.mkDerivation rec { # (We pick just that one because using the other headers from `sdk` is not # compatible with our C++ standard library. This header is already in # the standard library on aarch64) - runCommand "${pname}_headers" {} '' + runCommand "${pname}_headers" { } '' install -Dm444 "${lib.getDev apple_sdk.sdk}"/include/libproc.h "$out"/include/libproc.h '' ) ++ lib.optionals stdenv.isLinux [ bubblewrap libseccomp - systemd + libmanette wayland xdg-dbus-proxy - ] ++ lib.optional enableGeoLocation geoclue2; + ] ++ lib.optionals systemdSupport [ + systemd + ] ++ lib.optionals enableGeoLocation [ + geoclue2 + ] ++ lib.optionals withLibsecret [ + libsecret + ]; propagatedBuildInputs = [ gtk3 libsoup ]; - cmakeFlags = [ + cmakeFlags = let + cmakeBool = x: if x then "ON" else "OFF"; + in [ "-DENABLE_INTROSPECTION=ON" "-DPORT=GTK" "-DUSE_LIBHYPHEN=OFF" "-DUSE_WPE_RENDERER=OFF" - "-DUSE_SOUP2=${if lib.versions.major libsoup.version == "2" then "ON" else "OFF"}" + "-DUSE_SOUP2=${cmakeBool (lib.versions.major libsoup.version == "2")}" + "-DUSE_LIBSECRET=${cmakeBool withLibsecret}" ] ++ lib.optionals stdenv.isDarwin [ "-DENABLE_GAMEPAD=OFF" "-DENABLE_GTKDOC=OFF" @@ -189,9 +195,11 @@ stdenv.mkDerivation rec { "-DUSE_APPLE_ICU=OFF" "-DUSE_OPENGL_OR_ES=OFF" "-DUSE_SYSTEM_MALLOC=ON" - ] ++ lib.optionals (!stdenv.isLinux) [ + ] ++ lib.optionals (!systemdSupport) [ "-DUSE_SYSTEMD=OFF" - ] ++ lib.optional (stdenv.isLinux && enableGLES) "-DENABLE_GLES2=ON"; + ] ++ lib.optionals (stdenv.isLinux && enableGLES) [ + "-DENABLE_GLES2=ON" + ]; postPatch = '' patchShebangs . diff --git a/nixpkgs/pkgs/development/libraries/wolfssl/default.nix b/nixpkgs/pkgs/development/libraries/wolfssl/default.nix index 4cfd2548b538..2fc57b87ab3b 100644 --- a/nixpkgs/pkgs/development/libraries/wolfssl/default.nix +++ b/nixpkgs/pkgs/development/libraries/wolfssl/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "wolfssl"; - version = "5.1.1"; + version = "5.2.0"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; rev = "v${version}-stable"; - sha256 = "sha256-/noS5cn8lllWoGyZ9QyjRmdiR6LXzfT4lYGEt+0+Bdw="; + sha256 = "1xdhbhn31q7waw7w158hz9n0vj76zlfn5njq7hncf73ks38drj6k"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/wxwidgets/2.8/default.nix b/nixpkgs/pkgs/development/libraries/wxwidgets/2.8/default.nix index bc8fc6f5b047..19a57d68e15b 100644 --- a/nixpkgs/pkgs/development/libraries/wxwidgets/2.8/default.nix +++ b/nixpkgs/pkgs/development/libraries/wxwidgets/2.8/default.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { database support, HTML viewing and printing, and much more. ''; license = licenses.wxWindows; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/development/libraries/wxwidgets/2.9/default.nix b/nixpkgs/pkgs/development/libraries/wxwidgets/2.9/default.nix index 46ef04dcb7a1..34d76e53ff67 100644 --- a/nixpkgs/pkgs/development/libraries/wxwidgets/2.9/default.nix +++ b/nixpkgs/pkgs/development/libraries/wxwidgets/2.9/default.nix @@ -14,14 +14,15 @@ , compat26 ? true , unicode ? true , withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms -, darwin +, AGL +, Carbon +, Cocoa +, Kernel +, QuickTime +, setfile }: assert withMesa -> libGLU != null && libGL != null; -let - inherit (darwin.stubs) setfile; - inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime; -in stdenv.mkDerivation rec { pname = "wxGTK"; version = "2.9.5"; @@ -35,7 +36,7 @@ stdenv.mkDerivation rec { patches = [ # https://github.com/wxWidgets/wxWidgets/issues/17942 - ../0001-fix-assertion-using-hide-in-destroy.patch + ../patches/0001-fix-assertion-using-hide-in-destroy.patch ]; nativeBuildInputs = [ @@ -115,7 +116,7 @@ stdenv.mkDerivation rec { database support, HTML viewing and printing, and much more. ''; license = licenses.wxWindows; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.darwin ++ platforms.linux; badPlatforms = [ "x86_64-darwin" ]; }; diff --git a/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/default.nix b/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/default.nix index 0469ccbd0dfb..628d8bd02377 100644 --- a/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -17,14 +17,17 @@ , unicode ? true , withGtk2 ? true , withWebKit ? false, webkitgtk -, darwin +, AGL +, Carbon +, Cocoa +, Kernel +, QTKit +, setfile }: assert withGtk2 -> (!withWebKit); let - inherit (darwin.stubs) setfile; - inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; inherit (gst_all_1) gstreamer gst-plugins-base; gtk = if withGtk2 then gtk2 else gtk3; in @@ -66,7 +69,7 @@ stdenv.mkDerivation rec { patches = [ # https://github.com/wxWidgets/wxWidgets/issues/17942 - ../0001-fix-assertion-using-hide-in-destroy.patch + ../patches/0001-fix-assertion-using-hide-in-destroy.patch ]; configureFlags = [ @@ -126,7 +129,7 @@ stdenv.mkDerivation rec { database support, HTML viewing and printing, and much more. ''; license = licenses.wxWindows; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux ++ platforms.darwin; badPlatforms = [ "x86_64-darwin" ]; }; diff --git a/nixpkgs/pkgs/development/libraries/wxwidgets/0001-fix-assertion-using-hide-in-destroy.patch b/nixpkgs/pkgs/development/libraries/wxwidgets/patches/0001-fix-assertion-using-hide-in-destroy.patch index ca9eb8bf612a..ca9eb8bf612a 100644 --- a/nixpkgs/pkgs/development/libraries/wxwidgets/0001-fix-assertion-using-hide-in-destroy.patch +++ b/nixpkgs/pkgs/development/libraries/wxwidgets/patches/0001-fix-assertion-using-hide-in-destroy.patch diff --git a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix index 08d695c15e53..c54cdeca6c35 100644 --- a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , autoreconfHook , pkg-config , libxml2 @@ -16,28 +15,15 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-gtk"; - version = "1.10.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "flatpak"; repo = pname; rev = version; - sha256 = "7w+evZLtmTmDHVVsw25bJz99xtlSCE8qTFSxez9tlZk="; + sha256 = "I1ZoDqZQPfPwPr4Ybk+syz+YEkrK2ReflZaJJWD4Nsk="; }; - patches = [ - # Fix broken translation. - # https://github.com/flatpak/xdg-desktop-portal-gtk/issues/353 - (fetchpatch { - url = "https://github.com/flatpak/xdg-desktop-portal-gtk/commit/e34f49ca8365801a7fcacccb46ab1e62aec17435.patch"; - sha256 = "umMsSP0fuSQgxlHLaZlg25ln1aAL1mssWzPMIWAOUt4="; - }) - (fetchpatch { - url = "https://github.com/flatpak/xdg-desktop-portal-gtk/commit/19c5385b9f5fe0f8dac8ae7cc4493bb08f802de6.patch"; - sha256 = "nbmOb5er20zBOO4K2geYITafqBaNHbDpq1OOvIVD6hY="; - }) - ]; - nativeBuildInputs = [ autoreconfHook libxml2 @@ -54,13 +40,18 @@ stdenv.mkDerivation rec { gnome.gnome-settings-daemon # schemas needed for settings api (mostly useless now that fonts were moved to g-d-s) ]; - configureFlags = lib.optionals buildPortalsInGnome [ + configureFlags = if buildPortalsInGnome then [ "--enable-wallpaper" "--enable-screenshot" "--enable-screencast" "--enable-background" "--enable-settings" "--enable-appchooser" + ] else [ + # These are now enabled by default, even though we do not need them for GNOME. + # https://github.com/flatpak/xdg-desktop-portal-gtk/issues/355 + "--disable-settings" + "--disable-appchooser" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix index bb8950ca1ec9..19a671e7e0b0 100644 --- a/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -1,28 +1,29 @@ -{ stdenv -, lib +{ lib +, acl +, autoreconfHook +, dbus , fetchFromGitHub , fetchpatch -, nixosTests -, substituteAll -, autoreconfHook -, pkg-config -, libxml2 -, glib -, pipewire , flatpak -, gsettings-desktop-schemas -, acl -, dbus , fuse -, libportal , geoclue2 +, glib +, gsettings-desktop-schemas , json-glib +, libportal +, libxml2 +, nixosTests +, pipewire +, pkg-config +, stdenv +, substituteAll , wrapGAppsHook +, enableGeoLocation ? true }: stdenv.mkDerivation rec { pname = "xdg-desktop-portal"; - version = "1.10.1"; + version = "1.12.1"; outputs = [ "out" "installedTests" ]; @@ -30,7 +31,7 @@ stdenv.mkDerivation rec { owner = "flatpak"; repo = pname; rev = version; - sha256 = "Q1ZP/ljdIxJHg+3JaTL/LIZV+3cK2+dognsTC95udVA="; + sha256 = "1fc3LXN6wp/zQw4HQ0Q99HUvBhynHrQi2p3s/08izuE="; }; patches = [ @@ -39,36 +40,33 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; inherit flatpak; }) - # Fixes the issue in https://github.com/flatpak/xdg-desktop-portal/issues/636 - # Remove it when the next stable release arrives - (fetchpatch { - url = "https://github.com/flatpak/xdg-desktop-portal/commit/d7622e15ff8fef114a6759dde564826d04215a9f.patch"; - sha256 = "sha256-vmfxK4ddG6Xon//rpiz6OiBsDLtT0VG5XyBJG3E4PPs="; - }) ]; nativeBuildInputs = [ autoreconfHook - pkg-config libxml2 + pkg-config wrapGAppsHook ]; buildInputs = [ - glib - pipewire - flatpak acl dbus - geoclue2 + flatpak fuse - libportal + glib gsettings-desktop-schemas json-glib + libportal + pipewire + ] ++ lib.optionals enableGeoLocation [ + geoclue2 ]; configureFlags = [ "--enable-installed-tests" + ] ++ lib.optionals (!enableGeoLocation) [ + "--disable-geoclue" ]; makeFlags = [ @@ -84,7 +82,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Desktop integration portals for sandboxed apps"; - license = licenses.lgpl21; + license = licenses.lgpl2Plus; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/development/libraries/zchunk/default.nix b/nixpkgs/pkgs/development/libraries/zchunk/default.nix index c2ddda7a6c5f..c639eb7b30e9 100644 --- a/nixpkgs/pkgs/development/libraries/zchunk/default.nix +++ b/nixpkgs/pkgs/development/libraries/zchunk/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "zchunk"; - version = "1.1.16"; + version = "1.2.0"; src = fetchFromGitHub { owner = "zchunk"; repo = pname; rev = version; - hash = "sha256-+8FkivLTZXdu0+1wu+7T98y6rQzIHbG9l15Abrbln1o="; + hash = "sha256-7H1WF5VkpA65xCdEa0Sw4r4jj+kGhDVCMr5AeE+3Ii4="; }; nativeBuildInputs = [ @@ -47,5 +47,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; + broken = stdenv.isDarwin; # does not find argp-standalone }; } diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/flow.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/flow.nix new file mode 100644 index 000000000000..1adac0993d28 --- /dev/null +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/flow.nix @@ -0,0 +1,29 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "flow"; + version = "20200610-git"; + + description = "A flowchart and generalised graph library."; + + deps = [ args."closer-mop" args."documentation-utils" args."trivial-indent" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/flow/2020-06-10/flow-20200610-git.tgz"; + sha256 = "1z1krk1iiz7n1mvpnmqnrgfhicpppb45i0jgkqnrds749xjnx194"; + }; + + packageName = "flow"; + + asdFilesToKeep = ["flow.asd"]; + overrides = x: x; +} +/* (SYSTEM flow DESCRIPTION A flowchart and generalised graph library. SHA256 + 1z1krk1iiz7n1mvpnmqnrgfhicpppb45i0jgkqnrds749xjnx194 URL + http://beta.quicklisp.org/archive/flow/2020-06-10/flow-20200610-git.tgz MD5 + f0767467d5e9bfda6fe5777a26719811 NAME flow FILENAME flow DEPS + ((NAME closer-mop FILENAME closer-mop) + (NAME documentation-utils FILENAME documentation-utils) + (NAME trivial-indent FILENAME trivial-indent)) + DEPENDENCIES (closer-mop documentation-utils trivial-indent) VERSION + 20200610-git SIBLINGS (flow-visualizer) PARASITES NIL) */ diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lambda-fiddle.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lambda-fiddle.nix new file mode 100644 index 000000000000..62adaf2bca44 --- /dev/null +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lambda-fiddle.nix @@ -0,0 +1,27 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "lambda-fiddle"; + version = "20190710-git"; + + description = "A collection of functions to process lambda-lists."; + + deps = [ ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/lambda-fiddle/2019-07-10/lambda-fiddle-20190710-git.tgz"; + sha256 = "0v4qjpp9fq9rlxhr5f6mjs5f076xrjk19rl6qgp1ap1ykcrx8k4j"; + }; + + packageName = "lambda-fiddle"; + + asdFilesToKeep = ["lambda-fiddle.asd"]; + overrides = x: x; +} +/* (SYSTEM lambda-fiddle DESCRIPTION + A collection of functions to process lambda-lists. SHA256 + 0v4qjpp9fq9rlxhr5f6mjs5f076xrjk19rl6qgp1ap1ykcrx8k4j URL + http://beta.quicklisp.org/archive/lambda-fiddle/2019-07-10/lambda-fiddle-20190710-git.tgz + MD5 78f68f144ace9cb8f634ac14b3414e5e NAME lambda-fiddle FILENAME + lambda-fiddle DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS NIL + PARASITES NIL) */ diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/legit.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/legit.nix new file mode 100644 index 000000000000..c98640931990 --- /dev/null +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/legit.nix @@ -0,0 +1,35 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "legit"; + version = "20190710-git"; + + description = "CL interface to the GIT binary."; + + deps = [ args."alexandria" args."bordeaux-threads" args."cl-ppcre" args."documentation-utils" args."lambda-fiddle" args."simple-inferiors" args."trivial-indent" args."uiop" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/legit/2019-07-10/legit-20190710-git.tgz"; + sha256 = "0g7cn50qvivsn0w9yszqw2qh22jsj60067pmg5pvwsjm03xdl9s9"; + }; + + packageName = "legit"; + + asdFilesToKeep = ["legit.asd"]; + overrides = x: x; +} +/* (SYSTEM legit DESCRIPTION CL interface to the GIT binary. SHA256 + 0g7cn50qvivsn0w9yszqw2qh22jsj60067pmg5pvwsjm03xdl9s9 URL + http://beta.quicklisp.org/archive/legit/2019-07-10/legit-20190710-git.tgz + MD5 9b380fc23d4bab086df8a0e4a598457a NAME legit FILENAME legit DEPS + ((NAME alexandria FILENAME alexandria) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME cl-ppcre FILENAME cl-ppcre) + (NAME documentation-utils FILENAME documentation-utils) + (NAME lambda-fiddle FILENAME lambda-fiddle) + (NAME simple-inferiors FILENAME simple-inferiors) + (NAME trivial-indent FILENAME trivial-indent) (NAME uiop FILENAME uiop)) + DEPENDENCIES + (alexandria bordeaux-threads cl-ppcre documentation-utils lambda-fiddle + simple-inferiors trivial-indent uiop) + VERSION 20190710-git SIBLINGS NIL PARASITES NIL) */ diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mmap.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mmap.nix new file mode 100644 index 000000000000..f5425cf549ff --- /dev/null +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mmap.nix @@ -0,0 +1,33 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "mmap"; + version = "20201220-git"; + + description = "Portable mmap (file memory mapping) utility library."; + + deps = [ args."alexandria" args."babel" args."cffi" args."documentation-utils" args."trivial-features" args."trivial-indent" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/mmap/2020-12-20/mmap-20201220-git.tgz"; + sha256 = "147xw351xh90k3yvc1fn7k418afmgngd56i8a6d7p41fzs54g6ij"; + }; + + packageName = "mmap"; + + asdFilesToKeep = ["mmap.asd"]; + overrides = x: x; +} +/* (SYSTEM mmap DESCRIPTION + Portable mmap (file memory mapping) utility library. SHA256 + 147xw351xh90k3yvc1fn7k418afmgngd56i8a6d7p41fzs54g6ij URL + http://beta.quicklisp.org/archive/mmap/2020-12-20/mmap-20201220-git.tgz MD5 + e2dbeb48b59735bd2ed54ea7f9cdfe0f NAME mmap FILENAME mmap DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME cffi FILENAME cffi) + (NAME documentation-utils FILENAME documentation-utils) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-indent FILENAME trivial-indent)) + DEPENDENCIES + (alexandria babel cffi documentation-utils trivial-features trivial-indent) + VERSION 20201220-git SIBLINGS (mmap-test) PARASITES NIL) */ diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/nbd.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/nbd.nix new file mode 100644 index 000000000000..6387a8345dc2 --- /dev/null +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/nbd.nix @@ -0,0 +1,33 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "nbd"; + version = "20200925-git"; + + parasites = [ "nbd/simple-in-memory" ]; + + description = "Network Block Device server library."; + + deps = [ args."bordeaux-threads" args."flexi-streams" args."lisp-binary" args."wild-package-inferred-system" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/nbd/2020-09-25/nbd-20200925-git.tgz"; + sha256 = "1npq9a8l3mn67n22ywqm8wh6kr9xv9djla2yj2m535gkysrlvnky"; + }; + + packageName = "nbd"; + + asdFilesToKeep = ["nbd.asd"]; + overrides = x: x; +} +/* (SYSTEM nbd DESCRIPTION Network Block Device server library. SHA256 + 1npq9a8l3mn67n22ywqm8wh6kr9xv9djla2yj2m535gkysrlvnky URL + http://beta.quicklisp.org/archive/nbd/2020-09-25/nbd-20200925-git.tgz MD5 + f32b7a508ac87c1e179c259b171dc837 NAME nbd FILENAME nbd DEPS + ((NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME flexi-streams FILENAME flexi-streams) + (NAME lisp-binary FILENAME lisp-binary) + (NAME wild-package-inferred-system FILENAME wild-package-inferred-system)) + DEPENDENCIES + (bordeaux-threads flexi-streams lisp-binary wild-package-inferred-system) + VERSION 20200925-git SIBLINGS NIL PARASITES (nbd/simple-in-memory)) */ diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-inferiors.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-inferiors.nix new file mode 100644 index 000000000000..a8dcd973eb9c --- /dev/null +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-inferiors.nix @@ -0,0 +1,33 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "simple-inferiors"; + version = "20200325-git"; + + description = "A very simple library to use inferior processes."; + + deps = [ args."alexandria" args."bordeaux-threads" args."documentation-utils" args."trivial-indent" args."uiop" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/simple-inferiors/2020-03-25/simple-inferiors-20200325-git.tgz"; + sha256 = "15gjizqrazr0ahdda2l6bkv7ii5ax1wckn9mnj5haiv17jba8pn5"; + }; + + packageName = "simple-inferiors"; + + asdFilesToKeep = ["simple-inferiors.asd"]; + overrides = x: x; +} +/* (SYSTEM simple-inferiors DESCRIPTION + A very simple library to use inferior processes. SHA256 + 15gjizqrazr0ahdda2l6bkv7ii5ax1wckn9mnj5haiv17jba8pn5 URL + http://beta.quicklisp.org/archive/simple-inferiors/2020-03-25/simple-inferiors-20200325-git.tgz + MD5 f90ae807c10d5b3c4b9eef1134a537c8 NAME simple-inferiors FILENAME + simple-inferiors DEPS + ((NAME alexandria FILENAME alexandria) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME documentation-utils FILENAME documentation-utils) + (NAME trivial-indent FILENAME trivial-indent) (NAME uiop FILENAME uiop)) + DEPENDENCIES + (alexandria bordeaux-threads documentation-utils trivial-indent uiop) + VERSION 20200325-git SIBLINGS NIL PARASITES NIL) */ diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/slynk.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/slynk.nix new file mode 100644 index 000000000000..02b641043eca --- /dev/null +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/slynk.nix @@ -0,0 +1,30 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "slynk"; + version = "sly-20210411-git"; + + parasites = [ "slynk/arglists" "slynk/fancy-inspector" "slynk/indentation" "slynk/mrepl" "slynk/package-fu" "slynk/profiler" "slynk/retro" "slynk/stickers" "slynk/trace-dialog" ]; + + description = "System lacks description"; + + deps = [ ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/sly/2021-04-11/sly-20210411-git.tgz"; + sha256 = "1a96aapsz3fhnnnb8njn8v2ddrh6kwisppd90cc7v8knh043xgks"; + }; + + packageName = "slynk"; + + asdFilesToKeep = ["slynk.asd"]; + overrides = x: x; +} +/* (SYSTEM slynk DESCRIPTION System lacks description SHA256 + 1a96aapsz3fhnnnb8njn8v2ddrh6kwisppd90cc7v8knh043xgks URL + http://beta.quicklisp.org/archive/sly/2021-04-11/sly-20210411-git.tgz MD5 + 7f0ff6b8a07d23599c77cd33c6d59ea6 NAME slynk FILENAME slynk DEPS NIL + DEPENDENCIES NIL VERSION sly-20210411-git SIBLINGS NIL PARASITES + (slynk/arglists slynk/fancy-inspector slynk/indentation slynk/mrepl + slynk/package-fu slynk/profiler slynk/retro slynk/stickers + slynk/trace-dialog)) */ diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/wild-package-inferred-system.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/wild-package-inferred-system.nix new file mode 100644 index 000000000000..989c94b26548 --- /dev/null +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/wild-package-inferred-system.nix @@ -0,0 +1,30 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "wild-package-inferred-system"; + version = "20200325-git"; + + parasites = [ "wild-package-inferred-system/test" ]; + + description = "Introduces the wildcards `*' and `**' into package-inferred-system"; + + deps = [ args."fiveam" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/wild-package-inferred-system/2020-03-25/wild-package-inferred-system-20200325-git.tgz"; + sha256 = "1ypnpzy9z4zkna29sgl4afc386ksa61302bm5kznxb3zz2v1sjas"; + }; + + packageName = "wild-package-inferred-system"; + + asdFilesToKeep = ["wild-package-inferred-system.asd"]; + overrides = x: x; +} +/* (SYSTEM wild-package-inferred-system DESCRIPTION + Introduces the wildcards `*' and `**' into package-inferred-system SHA256 + 1ypnpzy9z4zkna29sgl4afc386ksa61302bm5kznxb3zz2v1sjas URL + http://beta.quicklisp.org/archive/wild-package-inferred-system/2020-03-25/wild-package-inferred-system-20200325-git.tgz + MD5 4dfd9f90d780b1e67640543dd4acbf21 NAME wild-package-inferred-system + FILENAME wild-package-inferred-system DEPS ((NAME fiveam FILENAME fiveam)) + DEPENDENCIES (fiveam) VERSION 20200325-git SIBLINGS (foo-wild) PARASITES + (wild-package-inferred-system/test)) */ diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt index 4eb9be0b972e..93c38c989d6c 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt @@ -138,6 +138,7 @@ file-attributes fiveam flexi-streams float-features +flow form-fiddle fset generic-cl @@ -157,6 +158,7 @@ iterate jonathan jsown lack +legit let-plus lev lfarm-client @@ -178,10 +180,12 @@ mgl-pax minheap misc-extensions mk-string-metrics +mmap moptilities more-conditions mt19937 named-readtables +nbd net-telent-date nibbles optima @@ -207,6 +211,7 @@ salza2 serapeum simple-date simple-date-time +slynk smart-buffer smug spinneret diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix.nix index 60338d0ea091..08c152ddf725 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -297,6 +297,15 @@ let quicklisp-to-nix-packages = rec { })); + "wild-package-inferred-system" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."wild-package-inferred-system" or (x: {})) + (import ./quicklisp-to-nix-output/wild-package-inferred-system.nix { + inherit fetchurl; + "fiveam" = quicklisp-to-nix-packages."fiveam"; + })); + + "parseq" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."parseq" or (x: {})) @@ -369,6 +378,43 @@ let quicklisp-to-nix-packages = rec { "usocket" = quicklisp-to-nix-packages."usocket"; })); + "simple-inferiors" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."simple-inferiors" or (x: {})) + (import ./quicklisp-to-nix-output/simple-inferiors.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "documentation-utils" = quicklisp-to-nix-packages."documentation-utils"; + "trivial-indent" = quicklisp-to-nix-packages."trivial-indent"; + "uiop" = quicklisp-to-nix-packages."uiop"; + })); + + + "lambda-fiddle" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."lambda-fiddle" or (x: {})) + (import ./quicklisp-to-nix-output/lambda-fiddle.nix { + inherit fetchurl; + })); + + + "iolib_dot_grovel" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."iolib_dot_grovel" or (x: {})) + (import ./quicklisp-to-nix-output/iolib_dot_grovel.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "iolib_dot_asdf" = quicklisp-to-nix-packages."iolib_dot_asdf"; + "iolib_dot_base" = quicklisp-to-nix-packages."iolib_dot_base"; + "iolib_dot_common-lisp" = quicklisp-to-nix-packages."iolib_dot_common-lisp"; + "iolib_dot_conf" = quicklisp-to-nix-packages."iolib_dot_conf"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "uiop" = quicklisp-to-nix-packages."uiop"; + })); "trivia_dot_quasiquote" = buildLispPackage ((f: x: (x // (f x))) @@ -2338,6 +2384,14 @@ let quicklisp-to-nix-packages = rec { })); + "slynk" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."slynk" or (x: {})) + (import ./quicklisp-to-nix-output/slynk.nix { + inherit fetchurl; + })); + + "simple-date-time" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."simple-date-time" or (x: {})) @@ -2665,6 +2719,18 @@ let quicklisp-to-nix-packages = rec { })); + "nbd" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."nbd" or (x: {})) + (import ./quicklisp-to-nix-output/nbd.nix { + inherit fetchurl; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "lisp-binary" = quicklisp-to-nix-packages."lisp-binary"; + "wild-package-inferred-system" = quicklisp-to-nix-packages."wild-package-inferred-system"; + })); + + "named-readtables" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."named-readtables" or (x: {})) @@ -2702,6 +2768,20 @@ let quicklisp-to-nix-packages = rec { })); + "mmap" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."mmap" or (x: {})) + (import ./quicklisp-to-nix-output/mmap.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "documentation-utils" = quicklisp-to-nix-packages."documentation-utils"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-indent" = quicklisp-to-nix-packages."trivial-indent"; + })); + + "mk-string-metrics" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."mk-string-metrics" or (x: {})) @@ -2949,6 +3029,22 @@ let quicklisp-to-nix-packages = rec { })); + "legit" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."legit" or (x: {})) + (import ./quicklisp-to-nix-output/legit.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "documentation-utils" = quicklisp-to-nix-packages."documentation-utils"; + "lambda-fiddle" = quicklisp-to-nix-packages."lambda-fiddle"; + "simple-inferiors" = quicklisp-to-nix-packages."simple-inferiors"; + "trivial-indent" = quicklisp-to-nix-packages."trivial-indent"; + "uiop" = quicklisp-to-nix-packages."uiop"; + })); + + "lack" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."lack" or (x: {})) @@ -3285,6 +3381,17 @@ let quicklisp-to-nix-packages = rec { })); + "flow" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."flow" or (x: {})) + (import ./quicklisp-to-nix-output/flow.nix { + inherit fetchurl; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "documentation-utils" = quicklisp-to-nix-packages."documentation-utils"; + "trivial-indent" = quicklisp-to-nix-packages."trivial-indent"; + })); + + "float-features" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."float-features" or (x: {})) diff --git a/nixpkgs/pkgs/development/lua-modules/generated-packages.nix b/nixpkgs/pkgs/development/lua-modules/generated-packages.nix index c4442f1fd795..71d85a776bb2 100644 --- a/nixpkgs/pkgs/development/lua-modules/generated-packages.nix +++ b/nixpkgs/pkgs/development/lua-modules/generated-packages.nix @@ -2033,14 +2033,14 @@ luv = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast }: buildLuarocksPackage { pname = "luv"; - version = "1.42.0-0"; + version = "1.43.0-0"; knownRockspec = (fetchurl { - url = "https://luarocks.org/luv-1.42.0-0.rockspec"; - sha256 = "0pr2gjjnm60w0csb0dacrjalan7ifsfw4lki4ykxx1f4m5snam09"; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luv-1.43.0-0.rockspec"; + sha256 = "0z5a7yp20xbb3f9w73skm9fj89gxxqv72nrxjq3kycsc6c2v3m8f"; }).outPath; src = fetchurl { - url = "https://github.com/luvit/luv/releases/download/1.42.0-0/luv-1.42.0-0.tar.gz"; - sha256 = "0dkzjkkm0h516ag6sfz5iji761y9slrcfw325f39zkda1sfql8mm"; + url = "https://github.com/luvit/luv/releases/download/1.43.0-0/luv-1.43.0-0.tar.gz"; + sha256 = "1qlx1r79sfn8r20yx19bhdr0v58ykpwgwzy5vma9p2ngrlynyyjn"; }; disabled = with lua; (luaOlder "5.1"); diff --git a/nixpkgs/pkgs/development/node-packages/default.nix b/nixpkgs/pkgs/development/node-packages/default.nix index 4fd07245e16a..9d6004e859fd 100644 --- a/nixpkgs/pkgs/development/node-packages/default.nix +++ b/nixpkgs/pkgs/development/node-packages/default.nix @@ -136,7 +136,15 @@ let # ../../applications/video/epgstation epgstation = super."epgstation-../../applications/video/epgstation".override (drv: { meta = drv.meta // { - broken = true; # not really broken, see the comment above + platforms = pkgs.lib.platforms.none; + }; + }); + + # NOTE: this is a stub package to fetch npm dependencies for + # ../../applications/video/epgstation/client + epgstation-client = super."epgstation-client-../../applications/video/epgstation/client".override (drv: { + meta = drv.meta // { + platforms = pkgs.lib.platforms.none; }; }); @@ -237,7 +245,7 @@ let near-cli = super.near-cli.override { nativeBuildInputs = with pkgs; [ - libusb + libusb1 nodePackages.prebuild-install nodePackages.node-gyp-build pkg-config @@ -279,6 +287,14 @@ let url = "https://github.com/svanderburg/node2nix/commit/e4c951971df6c9f9584c7252971c13b55c369916.patch"; sha256 = "0w8fcyr12g2340rn06isv40jkmz2khmak81c95zpkjgipzx7hp7w"; }) + # handle package alias in dependencies + # https://github.com/svanderburg/node2nix/pull/240 + # + # TODO: remove after node2nix 1.10.0 + (fetchpatch { + url = "https://github.com/svanderburg/node2nix/commit/644e90c0304038a446ed53efc97e9eb1e2831e71.patch"; + sha256 = "sha256-sQgVf80H1ouUjzHq+2d9RO4a+o++kh+l+FOTNXfPBH0="; + }) ]; }; postInstall = '' @@ -323,6 +339,13 @@ let ''; }; + parcel = super.parcel.override { + buildInputs = [ self.node-gyp-build ]; + preRebuild = '' + sed -i -e "s|#!/usr/bin/env node|#! ${pkgs.nodejs}/bin/node|" node_modules/node-gyp-build/bin.js + ''; + }; + postcss-cli = super.postcss-cli.override { nativeBuildInputs = [ pkgs.makeWrapper ]; postInstall = '' @@ -345,7 +368,7 @@ let src = fetchurl { url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz"; - sha512 = "sha512-xLmVyO/L6C4ZdHzHqiJVq3ZfDWSym29x75JcwJx746ps61UcNEg4ozSwN9ud7UjXLntdXe1xDLNOUO1lc7LN5g=="; + sha512 = "sha512-dAld12vtwdz9Rz01nOjmnXe+vHana5PSog8t0XGgLemKsUVsaupYpr74AHaS3s78SaTS5s2HOghnJF+jn91ZrA=="; }; postInstall = with pkgs; '' wrapProgram "$out/bin/prisma" \ diff --git a/nixpkgs/pkgs/development/node-packages/node-packages.json b/nixpkgs/pkgs/development/node-packages/node-packages.json index dba80f28422a..3efdef6cbe6d 100644 --- a/nixpkgs/pkgs/development/node-packages/node-packages.json +++ b/nixpkgs/pkgs/development/node-packages/node-packages.json @@ -114,6 +114,7 @@ , "emoj" , "emojione" , {"epgstation": "../../applications/video/epgstation"} +, {"epgstation-client": "../../applications/video/epgstation/client"} , "escape-string-regexp" , "eslint" , "eslint_d" @@ -198,7 +199,7 @@ , "markdownlint-cli" , "markdownlint-cli2" , "markdown-link-check" -, {"markdown-preview-nvim": "../../misc/vim-plugins/markdown-preview-nvim"} +, {"markdown-preview-nvim": "../../applications/editors/vim/plugins/markdown-preview-nvim"} , "mastodon-bot" , "mathjax" , "meat" @@ -224,6 +225,7 @@ , "nrm" , "ocaml-language-server" , "parcel-bundler" +, "parcel" , "parsoid" , "patch-package" , "peerflix" @@ -236,6 +238,7 @@ , "postcss-cli" , "prebuild-install" , "prettier" +, "prettier_d_slim" , "prettier-plugin-toml" , "prisma" , "@prisma/language-server" @@ -257,7 +260,7 @@ , "reveal-md" , "rimraf" , "rollup" -, { "rust-analyzer-build-deps": "../../misc/vscode-extensions/rust-analyzer/build-deps" } +, { "rust-analyzer-build-deps": "../../applications/editors/vscode/extensions/rust-analyzer/build-deps" } , "rtlcss" , "s3http" , "sass" @@ -361,7 +364,7 @@ , "vscode-json-languageserver" , "vscode-json-languageserver-bin" , "vscode-langservers-extracted" -, { "vscode-lldb-build-deps": "../../misc/vscode-extensions/vscode-lldb/build-deps" } +, { "vscode-lldb-build-deps": "../../applications/editors/vscode/extensions/vscode-lldb/build-deps" } , "vue-cli" , "vue-language-server" , "wavedrom-cli" diff --git a/nixpkgs/pkgs/development/node-packages/node-packages.nix b/nixpkgs/pkgs/development/node-packages/node-packages.nix index 17004d2de714..d1f1908ca7a7 100644 --- a/nixpkgs/pkgs/development/node-packages/node-packages.nix +++ b/nixpkgs/pkgs/development/node-packages/node-packages.nix @@ -94,76 +94,58 @@ let sha512 = "hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg=="; }; }; - "@angular-devkit/architect-0.1302.4" = { + "@angular-devkit/architect-0.1302.6" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1302.4"; + version = "0.1302.6"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1302.4.tgz"; - sha512 = "9dS0Gvs4ER1DPSnKorJ4uk27A/rWwyvNy5CheOZu4ZTUnggGA7SFtMG7CKPD11Ae01lIMfxKfDqJYE8j2VpQaw=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1302.6.tgz"; + sha512 = "NztzorUMfwJeRaT7SY00Y8WSqc2lQYuF11yNoyEm7Dae3V7VZ28rW2Z9RwibP27rYQL0RjSMaz2wKITHX2vOAw=="; }; }; - "@angular-devkit/core-13.2.2" = { + "@angular-devkit/core-13.2.5" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "13.2.2"; + version = "13.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-13.2.2.tgz"; - sha512 = "qH0Vu8qwGD5uhmE8PtePA1lm7xL3JtbBCcrQICmLqD6njLDVb2N5pbdDXeiXDlWGUoIRHUhu6Uw4AsY8zXP/FA=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-13.2.5.tgz"; + sha512 = "WuWp/1R0FtCHPBcJLF13lTLHETtDGFUX0ULfGPRaYB5OVCSQcovVp5UbZTTy/Ss3ub3EOEmJlU8kMJfBrWuq+A=="; }; }; - "@angular-devkit/core-13.2.3" = { + "@angular-devkit/core-13.2.6" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "13.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-13.2.3.tgz"; - sha512 = "/47RA8qmWzeS60xSdaprIn1MiSv0Iw83t0M9/ENH7irFS5vMAq62NCcwiWXH59pZmvvLbF+7xy/RgYUZLr4nHQ=="; - }; - }; - "@angular-devkit/core-13.2.4" = { - name = "_at_angular-devkit_slash_core"; - packageName = "@angular-devkit/core"; - version = "13.2.4"; + version = "13.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-13.2.4.tgz"; - sha512 = "hSw1JWA/6dDAF/xleQRXGtzHphfU49TMUhvAoAmsmmz3NAn03xLy1dtqdIXIf+TkFXVvZDaAB2mW8KfRV67GFg=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-13.2.6.tgz"; + sha512 = "8h2mWdBTN/dYwZuzKMg2IODlOWMdbJcpQG4XVrkk9ejCPP+3aX5Aa3glCe/voN6eBNiRfs8YDM0jxmpN2aWVtg=="; }; }; - "@angular-devkit/schematics-13.2.2" = { + "@angular-devkit/schematics-13.2.5" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "13.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-13.2.2.tgz"; - sha512 = "kXPLTkSzRCeBX+SYUkC6MIrWCkH90Y8hVegR9R5n2YqhCJyE+dZlcx4d/8d3VHtZlzAs0LL8BU+liC3wMIagjA=="; - }; - }; - "@angular-devkit/schematics-13.2.3" = { - name = "_at_angular-devkit_slash_schematics"; - packageName = "@angular-devkit/schematics"; - version = "13.2.3"; + version = "13.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-13.2.3.tgz"; - sha512 = "+dyC4iKV0huvpjiuz4uyjLNK3FsCIp/Ghv5lXvhG6yok/dCAubsJItJOxi6G16aVCzG/E9zbsDfm9fNMyVOkgQ=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-13.2.5.tgz"; + sha512 = "kAye6VYiF9JQAoeO+BYhy8eT2QOmhB+WLziRjXoFCBxh5+yXTygTVfs9fD5jmIpHmeu4hd2ErSh69yT5xWcD9g=="; }; }; - "@angular-devkit/schematics-13.2.4" = { + "@angular-devkit/schematics-13.2.6" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "13.2.4"; + version = "13.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-13.2.4.tgz"; - sha512 = "VMhYa4cDu5yE31OvHncAd15Rmlchih/Sr6sxFsIwkg4xzRNIIZCtwqxVXgf0TiTN9zrvlvzK7nhPqTGNqqYb2A=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-13.2.6.tgz"; + sha512 = "mPgSqdnZRuPSMeUA+T+mwVCrq2yhXpcYm1/Rjbhy09CyHs4wSrFv21WHCrE6shlvXpcmwr0n+I0DIeagAPmjUA=="; }; }; - "@angular-devkit/schematics-cli-13.2.3" = { + "@angular-devkit/schematics-cli-13.2.5" = { name = "_at_angular-devkit_slash_schematics-cli"; packageName = "@angular-devkit/schematics-cli"; - version = "13.2.3"; + version = "13.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-13.2.3.tgz"; - sha512 = "huCAno7u2K3Td3oiB41ax5AtoMyij6NmJsUxhpYQkZxnNsio9CKeSJnOuzml8SAILExc7sHFNW5A+9BeLluE4A=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-13.2.5.tgz"; + sha512 = "/3Q1+wtE+l5XXoXX/7157yh4Wpi+FNEryx5gDcfPJchgtovxj28nzquD0vXnvpyr3Wd8OaMwg6vW4EfL82jRKg=="; }; }; "@antora/asciidoc-loader-3.0.1" = { @@ -373,6 +355,15 @@ let sha512 = "TmB2K5UfpDpSbCNBBntXzKHcAk2EA3/P68jmWvmJvglVUdkO9V6kTAuXVe12+h6C4GK0ndwuCrHHtEVcL5t6pQ=="; }; }; + "@astrojs/svelte-language-integration-0.1.1" = { + name = "_at_astrojs_slash_svelte-language-integration"; + packageName = "@astrojs/svelte-language-integration"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@astrojs/svelte-language-integration/-/svelte-language-integration-0.1.1.tgz"; + sha512 = "npUDO0bitzUC9oTDqVuup0yZObOF45GQ0IkaMf5wxe6XW30SIeyl1j8mdyjOv90vlJeothCKqnQ91qMudpq3Vg=="; + }; + }; "@aws-crypto/crc32-2.0.0" = { name = "_at_aws-crypto_slash_crc32"; packageName = "@aws-crypto/crc32"; @@ -382,6 +373,15 @@ let sha512 = "TvE1r2CUueyXOuHdEigYjIZVesInd9KN+K/TFFNfkkxRThiNxO6i4ZqqAVMoEjAamZZ1AA8WXJkjCz7YShHPQA=="; }; }; + "@aws-crypto/crc32c-2.0.0" = { + name = "_at_aws-crypto_slash_crc32c"; + packageName = "@aws-crypto/crc32c"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-crypto/crc32c/-/crc32c-2.0.0.tgz"; + sha512 = "vF0eMdMHx3O3MoOXUfBZry8Y4ZDtcuskjjKgJz8YfIDjLStxTZrYXk+kZqtl6A0uCmmiN/Eb/JbC/CndTV1MHg=="; + }; + }; "@aws-crypto/ie11-detection-2.0.0" = { name = "_at_aws-crypto_slash_ie11-detection"; packageName = "@aws-crypto/ie11-detection"; @@ -391,6 +391,15 @@ let sha512 = "pkVXf/dq6PITJ0jzYZ69VhL8VFOFoPZLZqtU/12SGnzYuJOOGNfF41q9GxdI1yqC8R13Rq3jOLKDFpUJFT5eTA=="; }; }; + "@aws-crypto/sha1-browser-2.0.0" = { + name = "_at_aws-crypto_slash_sha1-browser"; + packageName = "@aws-crypto/sha1-browser"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-crypto/sha1-browser/-/sha1-browser-2.0.0.tgz"; + sha512 = "3fIVRjPFY8EG5HWXR+ZJZMdWNRpwbxGzJ9IH9q93FpbgCH8u8GHRi46mZXp3cYD7gealmyqpm3ThZwLKJjWJhA=="; + }; + }; "@aws-crypto/sha256-browser-2.0.0" = { name = "_at_aws-crypto_slash_sha256-browser"; packageName = "@aws-crypto/sha256-browser"; @@ -427,13 +436,13 @@ let sha512 = "JJmFFwvbm08lULw4Nm5QOLg8+lAQeC8aCXK5xrtxntYzYXCGfHwUJ4Is3770Q7HmICsXthGQ+ZsDL7C2uH3yBQ=="; }; }; - "@aws-sdk/abort-controller-3.52.0" = { + "@aws-sdk/abort-controller-3.54.0" = { name = "_at_aws-sdk_slash_abort-controller"; packageName = "@aws-sdk/abort-controller"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/abort-controller/-/abort-controller-3.52.0.tgz"; - sha512 = "Z+4uVtgwbKSChruh6R/WIrGb5uvvXi/d6EQ7zC6hyghtn9EGQc+WJ3BVB4bIUshwMunlgjA3nDiPb5V3t5zv8Q=="; + url = "https://registry.npmjs.org/@aws-sdk/abort-controller/-/abort-controller-3.54.0.tgz"; + sha512 = "6N7numECrGwal2NEbJwYXOGjwWsFafz8VuUvCBK5G9SgSL5XAbq1S3lL/4gbme5jhgh9CWh7s+bAY7EpOEH2Xg=="; }; }; "@aws-sdk/chunked-blob-reader-3.52.0" = { @@ -454,193 +463,193 @@ let sha512 = "/hVzC0Q12/mWRMBBQD3v82xsLSxZ4RwG6N44XP7MuJoHy4ui4T7D9RSuvBpzzr/4fqF0w9M7XYv6aM4BD2pFIQ=="; }; }; - "@aws-sdk/client-s3-3.52.0" = { + "@aws-sdk/client-s3-3.54.0" = { name = "_at_aws-sdk_slash_client-s3"; packageName = "@aws-sdk/client-s3"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.52.0.tgz"; - sha512 = "QTY12zuKqWbtLG1H2RV13JG+NFNDeDAR2Ffka/qNHU6NMUqyQnyf/1h2UCVIekTmSaR6L6bYGgHl//kxMSUwCw=="; + url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.54.0.tgz"; + sha512 = "9JdhkTqRCYA3esnjFR7xaFysXMfX5TatKE9H8Sds78eoMQrfgB2Yl6ZcEl8Oy0vpMVpOzqRYmcSmFfaBOhuI/g=="; }; }; - "@aws-sdk/client-sso-3.52.0" = { + "@aws-sdk/client-sso-3.54.0" = { name = "_at_aws-sdk_slash_client-sso"; packageName = "@aws-sdk/client-sso"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.52.0.tgz"; - sha512 = "IvtZlZopWlWg6xnKSXAodWQaPcRySNBJLj68K6HJ8OVvBCgcXr53nNREArgPi0+KDzLsXqAZTRxvU5do/99PrA=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.54.0.tgz"; + sha512 = "5ZYYhoMqeaYhOU4kOEM7daKb8D5QhJ+IpwhHHMPhoHqQEwbbhBTFDXRs3ObUP/QYdBUMWS71+pnDoUdyHqPQ0Q=="; }; }; - "@aws-sdk/client-sts-3.52.0" = { + "@aws-sdk/client-sts-3.54.0" = { name = "_at_aws-sdk_slash_client-sts"; packageName = "@aws-sdk/client-sts"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.52.0.tgz"; - sha512 = "tPLHYY9RdWehBQlyrwOaw4B31PqW1HmNNKJ3+Hc6KnEaiOwMAwQd8L7BFbSVG8ajQBDAEBUTDAkSaZ8jTYdfQQ=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.54.0.tgz"; + sha512 = "UY8fyi1zaWBJm+ZtDZRvSOv1rjHlvJjtJF3MfGQWDwUM10Amwzfh4Hc2JEzyeMJPkoSSvm6CVjSDyqXo8yLGZA=="; }; }; - "@aws-sdk/config-resolver-3.52.0" = { + "@aws-sdk/config-resolver-3.54.0" = { name = "_at_aws-sdk_slash_config-resolver"; packageName = "@aws-sdk/config-resolver"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/config-resolver/-/config-resolver-3.52.0.tgz"; - sha512 = "XKUCpPLMwdlqPtwutdMfAHWqGEPTDd14Dp01WyNhVtmTmsHkpFfLPpELLO1BczDS+jyoMUj+UDj9jHm4YLvXXg=="; + url = "https://registry.npmjs.org/@aws-sdk/config-resolver/-/config-resolver-3.54.0.tgz"; + sha512 = "VaNuvJLMaz3znmBD9BNkoEqNUs5teILU66SnFqBwVqabmOVeOh7M6/f43CcDarkwGklzZB/bn/rx9NOWUtdunA=="; }; }; - "@aws-sdk/credential-provider-env-3.52.0" = { + "@aws-sdk/credential-provider-env-3.54.0" = { name = "_at_aws-sdk_slash_credential-provider-env"; packageName = "@aws-sdk/credential-provider-env"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.52.0.tgz"; - sha512 = "9R8kTMQ3udNz7fyY/0rkU6Yhu0ALYQJZQ0lFCrxtNo2Nlo9taQtZgxhtRcv+EeqbTcJs91voNNz70HLbedtBUw=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.54.0.tgz"; + sha512 = "XWfzoUyFVsT4J7iTnXO38FKNdGFyE6ZNBtW9+Yx9EiiLtUlzH09PRv+54KIRQ4uqU+fEdtRh0gOdFajTrnRi3g=="; }; }; - "@aws-sdk/credential-provider-imds-3.52.0" = { + "@aws-sdk/credential-provider-imds-3.54.0" = { name = "_at_aws-sdk_slash_credential-provider-imds"; packageName = "@aws-sdk/credential-provider-imds"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.52.0.tgz"; - sha512 = "939kfHSkMLsOfQtO2nBqC/zAE1ecTOCAs72pKvVxrluGzDry4UtwlyQ4YGC04pYBRQeRIqvIOoVbADYJy4XjmQ=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.54.0.tgz"; + sha512 = "Chygp8jswdjtCPmNxEMXigX4clgqh5GDaFGopR/gFaaG960hjF88Fx1/CPYD7exvM1FRO67nyfBOS0QKjSqTXg=="; }; }; - "@aws-sdk/credential-provider-ini-3.52.0" = { + "@aws-sdk/credential-provider-ini-3.54.0" = { name = "_at_aws-sdk_slash_credential-provider-ini"; packageName = "@aws-sdk/credential-provider-ini"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.52.0.tgz"; - sha512 = "MCzWWPYoZjZ3C/X8UXXf9eRqgGJc3Y1QyFXIuQzNrVhffrFkYOkOUQsG4s5TuDr1MmGfxe83XtHQgATJ0fe3zw=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.54.0.tgz"; + sha512 = "EobK9bJwsUdMKx7vB+tL5eaNaj/NoOPaFJlv0JRL3+5px7d2vF0i9yklj4uT7F3vDlOup6R3b1Gg9GtqxfYt9w=="; }; }; - "@aws-sdk/credential-provider-node-3.52.0" = { + "@aws-sdk/credential-provider-node-3.54.0" = { name = "_at_aws-sdk_slash_credential-provider-node"; packageName = "@aws-sdk/credential-provider-node"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.52.0.tgz"; - sha512 = "SUl+t2S7xKHxAkIfuyvucKQ/JemJ/bCsuCk2qtjTSiVjrLx65Rnfw14j+44JU8U5mP+xodpKNCpgIF5PHu1kKQ=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.54.0.tgz"; + sha512 = "KsXJG0K7yJg2MCzNW52fSDbCIR5mRobbNnXTMpDRkghlQyHP1gdHsyRedVciMkJhdDILop2lScLw70iQBayP/Q=="; }; }; - "@aws-sdk/credential-provider-process-3.52.0" = { + "@aws-sdk/credential-provider-process-3.54.0" = { name = "_at_aws-sdk_slash_credential-provider-process"; packageName = "@aws-sdk/credential-provider-process"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.52.0.tgz"; - sha512 = "DGaSprlcEGgFuCiXNH9moksa6/1vBmX/G/tt/ulpgFEJmKljoazIEgUse/6oPJT7t5jazydAqMRVp1HK3Jp/0A=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.54.0.tgz"; + sha512 = "hjUQ6FRG3Ihsm77Rgrf1dSfRUVZAFEyAHCuwURePXpYjzMpFYjl12wL6Pwa7MLCqVMyLKQ8HYamznkgBlLQqxw=="; }; }; - "@aws-sdk/credential-provider-sso-3.52.0" = { + "@aws-sdk/credential-provider-sso-3.54.0" = { name = "_at_aws-sdk_slash_credential-provider-sso"; packageName = "@aws-sdk/credential-provider-sso"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.52.0.tgz"; - sha512 = "8Q0X4wro+sPMYkbZE/ZW+CBpjxGq/x/vv4yQh7zdHpNfANhqjTSR8tUCApemVcfPtwNhQNPpW8KrlWUIMguHdg=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.54.0.tgz"; + sha512 = "8HfBTdOw+9gbWsXRTr5y+QYq8gK+YYDx7tKbNv7ZWjMfw49SDef0j0W4ZBZH+FYEPepOEAKjBgtjvlUeFxrOaA=="; }; }; - "@aws-sdk/credential-provider-web-identity-3.52.0" = { + "@aws-sdk/credential-provider-web-identity-3.54.0" = { name = "_at_aws-sdk_slash_credential-provider-web-identity"; packageName = "@aws-sdk/credential-provider-web-identity"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.52.0.tgz"; - sha512 = "+4qz0PZn9u6HRRNBO9YfIixdItukixPOtLP8tNlgriCh66BC6M1mAXXP/uq2x7kIaMRZtTo3Eey4T/tA0QMkOg=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.54.0.tgz"; + sha512 = "Mi87IzpgIi6P3WntumgMJ6rNY8Ay/HtsLFYm4bZ1ZGJH/3QVT4YLm1n8A4xoC+ouhL0i24jmN3X1aNu6amBfEg=="; }; }; - "@aws-sdk/eventstream-marshaller-3.52.0" = { + "@aws-sdk/eventstream-marshaller-3.54.0" = { name = "_at_aws-sdk_slash_eventstream-marshaller"; packageName = "@aws-sdk/eventstream-marshaller"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-marshaller/-/eventstream-marshaller-3.52.0.tgz"; - sha512 = "RK5uWIOwae3Yzog8og3+e+k8kpRnjrg9hhOLmq2xG4m5seo7v7S5jfmb0uLX/Uqgd1vWMK5wKFJsdGhnAqykcQ=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-marshaller/-/eventstream-marshaller-3.54.0.tgz"; + sha512 = "blOxssrHCnugxdcudYB3Vmlp7ziG0to9RfnPq+InI98mIDm3G+rt7vW6GtlkgyWu0EYduj6N+aOI7ssRUCOyDQ=="; }; }; - "@aws-sdk/eventstream-serde-browser-3.52.0" = { + "@aws-sdk/eventstream-serde-browser-3.54.0" = { name = "_at_aws-sdk_slash_eventstream-serde-browser"; packageName = "@aws-sdk/eventstream-serde-browser"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-browser/-/eventstream-serde-browser-3.52.0.tgz"; - sha512 = "Lo1RzjOCvOGDoyq1hdxO7YWsdyc5ZMo0+jf/SDm64ZM8jE4eRUh1iGj0kCOKIIr/tCbzhbvP4SoNDfehJ2rqfA=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-browser/-/eventstream-serde-browser-3.54.0.tgz"; + sha512 = "XU9+nA7WlO+Rj0hV+C/2ZlB0zfI4eoit/CIlfGaonfx6EFezH3l4ngMZq8lgd8fSuPy1dN25DWQsW/F3AFSRdg=="; }; }; - "@aws-sdk/eventstream-serde-config-resolver-3.52.0" = { + "@aws-sdk/eventstream-serde-config-resolver-3.54.0" = { name = "_at_aws-sdk_slash_eventstream-serde-config-resolver"; packageName = "@aws-sdk/eventstream-serde-config-resolver"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.52.0.tgz"; - sha512 = "yCfYf2MepHPpRTsbGNNLVDbN22woSmNDM2bEeK5gDbyV23MGlnLxjekLKdBbH5M6FUqfMbpsM60gDgJgas3ovA=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.54.0.tgz"; + sha512 = "fnbwtjaSd05K2+rcEZ3TQfM6YBY6obWqqt/x0qTTt7277wdqvE3+i0dWcvrQLldGD7xY3+oitEmClAeCE0raiA=="; }; }; - "@aws-sdk/eventstream-serde-node-3.52.0" = { + "@aws-sdk/eventstream-serde-node-3.54.0" = { name = "_at_aws-sdk_slash_eventstream-serde-node"; packageName = "@aws-sdk/eventstream-serde-node"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-node/-/eventstream-serde-node-3.52.0.tgz"; - sha512 = "hL067bWZ875oL+l+Q1Wrhkq/V9727fHeJ1J4Kr/o84hGRnIkN7OiNDLIMyUTrGdc0I4diGUbc8FVJiRtZRmphw=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-node/-/eventstream-serde-node-3.54.0.tgz"; + sha512 = "b/EXk+Yb6lspfdEvClDkutif1z7Ggbeg/s2z9ug8Zh32i4/8gc4kcoWHy4ez8GUqsrRuOfD1MScqxkSAmIlPlg=="; }; }; - "@aws-sdk/eventstream-serde-universal-3.52.0" = { + "@aws-sdk/eventstream-serde-universal-3.54.0" = { name = "_at_aws-sdk_slash_eventstream-serde-universal"; packageName = "@aws-sdk/eventstream-serde-universal"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-universal/-/eventstream-serde-universal-3.52.0.tgz"; - sha512 = "CDMcBJDNDJfGWz2Vk2p1Ef6JbZDVZVZDG8F7Gdhn7RsiMsFf7QiF4vcNEJwQIX25ZSerRqEitBT8nEZEDxEYGw=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-universal/-/eventstream-serde-universal-3.54.0.tgz"; + sha512 = "HdFYrLvKHWATev0BCp0I8xH40MhP9cNhxK0h+srdCC9o/Djs3QrI0Nn5rzWdg/hQDyRg8jPSvaGG8P/ekyTn2w=="; }; }; - "@aws-sdk/fetch-http-handler-3.52.0" = { + "@aws-sdk/fetch-http-handler-3.54.0" = { name = "_at_aws-sdk_slash_fetch-http-handler"; packageName = "@aws-sdk/fetch-http-handler"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.52.0.tgz"; - sha512 = "pFXkCeEIcrgH8esRyUab1nnIo1cjUjrheqwb/MK3gJ363/kenT6IqYXOq0UO4mF7bn6IOz/yxODlhQIU6i1Vww=="; + url = "https://registry.npmjs.org/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.54.0.tgz"; + sha512 = "TIn2ocem/gpMQ12KoiOu3uTHO86OOrmFITulV9D8xTzvFqHe34JKjHQPqII6lDbTCnU9N5CMv3N1CXxolIhiOQ=="; }; }; - "@aws-sdk/hash-blob-browser-3.52.0" = { + "@aws-sdk/hash-blob-browser-3.54.0" = { name = "_at_aws-sdk_slash_hash-blob-browser"; packageName = "@aws-sdk/hash-blob-browser"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/hash-blob-browser/-/hash-blob-browser-3.52.0.tgz"; - sha512 = "EhEXgO/cb67EHXl/F1D3vtdv695n1nIrAQLdiTOcNvdMRWLpjb2MkR3GI9tppkTabF4o3allgZVebKVeqINSMQ=="; + url = "https://registry.npmjs.org/@aws-sdk/hash-blob-browser/-/hash-blob-browser-3.54.0.tgz"; + sha512 = "KIflBj2efxy5/z1ffg1HL3CRxqM7hNqel+dtVCYaCfTJ/MQhcfcR5GsodhJYl99pitryorJeB4chhgNv4bbPUA=="; }; }; - "@aws-sdk/hash-node-3.52.0" = { + "@aws-sdk/hash-node-3.54.0" = { name = "_at_aws-sdk_slash_hash-node"; packageName = "@aws-sdk/hash-node"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/hash-node/-/hash-node-3.52.0.tgz"; - sha512 = "pN2dSSyyy0emFFtK6jgmzYXcJHITbfdPqR7UTQ1fj1wFvbURPN19C1f4uYbVDjuiUQX01hLclJDLnPy1BIzTGQ=="; + url = "https://registry.npmjs.org/@aws-sdk/hash-node/-/hash-node-3.54.0.tgz"; + sha512 = "o2XRftfj3Tj2jsZsdvnEY4OtmkT/9OADCWkINQCTcfy+nMuvs1IAS/qruunfaMJ58GntOoI4CVIbRa2lhhJr5w=="; }; }; - "@aws-sdk/hash-stream-node-3.52.0" = { + "@aws-sdk/hash-stream-node-3.54.0" = { name = "_at_aws-sdk_slash_hash-stream-node"; packageName = "@aws-sdk/hash-stream-node"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/hash-stream-node/-/hash-stream-node-3.52.0.tgz"; - sha512 = "Khgy6DM2Kpcqbom8dYQtH7GmxnprdQVHsKvhmkReqfksxvrwNwo+S2RCDlceGTVIkELuvyfnVd19JLQO7BnqTw=="; + url = "https://registry.npmjs.org/@aws-sdk/hash-stream-node/-/hash-stream-node-3.54.0.tgz"; + sha512 = "j936gz9O1ist0Bu2IXCf2DUrYfB9DkwKUMRAN14mTrKB+3PAMRhBazUVDJjIxPbcC9MQJnwIa2tiZWn8QC48UA=="; }; }; - "@aws-sdk/invalid-dependency-3.52.0" = { + "@aws-sdk/invalid-dependency-3.54.0" = { name = "_at_aws-sdk_slash_invalid-dependency"; packageName = "@aws-sdk/invalid-dependency"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/invalid-dependency/-/invalid-dependency-3.52.0.tgz"; - sha512 = "TjRzfFFiY4i/a9ry5llCQMiIwpyhIyriM2QuPgAdRaRPM076I01FohUzlAc7zgwwhCa5rpI4zRZ+auGPrU44Gw=="; + url = "https://registry.npmjs.org/@aws-sdk/invalid-dependency/-/invalid-dependency-3.54.0.tgz"; + sha512 = "eeefTPtkb0FQFMBKmwhvmdPqCgGvTcWEiNH8pznAH0hqxLvOLNdNRoKnX5a1WlYoq3eTm0YN9Zh+N1Sj4mbkcg=="; }; }; "@aws-sdk/is-array-buffer-3.52.0" = { @@ -652,229 +661,229 @@ let sha512 = "5Pe9QKrOeSZb9Z8gtlx9CDMfxH8EiNdClBfXBbc6CiUM7y6l7UintYHkm133zM5XTqtMRYY1jaD8svVAoRPApA=="; }; }; - "@aws-sdk/md5-js-3.52.0" = { + "@aws-sdk/md5-js-3.54.0" = { name = "_at_aws-sdk_slash_md5-js"; packageName = "@aws-sdk/md5-js"; - version = "3.52.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/md5-js/-/md5-js-3.52.0.tgz"; - sha512 = "M0oHeBDvXCapQvvGzzlMrkW1vRfExngB/Gn93Vmdpt97+ieHkfHgo9fU/erQKb+HwnlZbhVJW3vEgfHPLvql6A=="; - }; - }; - "@aws-sdk/middleware-apply-body-checksum-3.52.0" = { - name = "_at_aws-sdk_slash_middleware-apply-body-checksum"; - packageName = "@aws-sdk/middleware-apply-body-checksum"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-apply-body-checksum/-/middleware-apply-body-checksum-3.52.0.tgz"; - sha512 = "f5ynflavshbkmV4ZpcwW2WoYAP69bOpv8bUPNsiKEzL07q6ZperkIaYre9BajNMxGN+UNSoE5CQIvRGcwC6UxA=="; + url = "https://registry.npmjs.org/@aws-sdk/md5-js/-/md5-js-3.54.0.tgz"; + sha512 = "pMprZD8JBw9WU4Risfd0Clm9SrUpsUS3QriSDeuFnGfRcKHkpw1sDj6HsNsIQ1OCeWuhYqW55Wtzc0pH8U80Mg=="; }; }; - "@aws-sdk/middleware-bucket-endpoint-3.52.0" = { + "@aws-sdk/middleware-bucket-endpoint-3.54.0" = { name = "_at_aws-sdk_slash_middleware-bucket-endpoint"; packageName = "@aws-sdk/middleware-bucket-endpoint"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.52.0.tgz"; - sha512 = "KOq8kTzhWYiwits89pnCduL7ojijthfFR5PRvLW6IwQbPxIg/AjdO5gYbMUTLaVAO1b7LoI3ztk+lmLQ2yvjOA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.54.0.tgz"; + sha512 = "4VC6zxDaveCnQD3eUJezSQ3Ikeq+MxRnvfcNhZytB20tYRy1PnR4jLoqjYkw5U1zstVRABbZdzlsWzZMe308ew=="; }; }; - "@aws-sdk/middleware-content-length-3.52.0" = { + "@aws-sdk/middleware-content-length-3.54.0" = { name = "_at_aws-sdk_slash_middleware-content-length"; packageName = "@aws-sdk/middleware-content-length"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-content-length/-/middleware-content-length-3.52.0.tgz"; - sha512 = "U+aa8UswtEvEdt4vvX+C4b+vetSpG6PZVeGN/hZ2J0j3jQxODQtjKHU3VIO+Fvp8m9rSCtcfAPly5CcejHLeKw=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-content-length/-/middleware-content-length-3.54.0.tgz"; + sha512 = "DTlZo00stFwFHyR+GTXxhYePzNbXm+aX5yYQUsrsY2J2HuSbADVgDDekJXbtOH36QBa0OJf7JKbWP8PZDxk1zg=="; }; }; - "@aws-sdk/middleware-expect-continue-3.52.0" = { + "@aws-sdk/middleware-expect-continue-3.54.0" = { name = "_at_aws-sdk_slash_middleware-expect-continue"; packageName = "@aws-sdk/middleware-expect-continue"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.52.0.tgz"; - sha512 = "1rpD1I/HwDdVAW9wBtLv34gxrfkfLEyTEj2Y/1Qh/62rMX7KbBT0CmbbO33upOqyrsJDW961Mu/d5cVZW1N3XQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.54.0.tgz"; + sha512 = "6k4hoD7XqGDA8yq10AzF+iafgc+RyrPxr4kqzv50+hI5CZkPcl/vOAgS7iD+Y33dLITYuh+jzlpn7zlLwdOoqw=="; }; }; - "@aws-sdk/middleware-header-default-3.52.0" = { + "@aws-sdk/middleware-flexible-checksums-3.54.0" = { + name = "_at_aws-sdk_slash_middleware-flexible-checksums"; + packageName = "@aws-sdk/middleware-flexible-checksums"; + version = "3.54.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.54.0.tgz"; + sha512 = "4+bUwQyYHtTbaJDaj2F7j2K/JUcYdKg169pKmpefZiXZVdfR2/WWwj7Wx7EI40rpPYHaMpSal9tIxz054LPYnw=="; + }; + }; + "@aws-sdk/middleware-header-default-3.54.0" = { name = "_at_aws-sdk_slash_middleware-header-default"; packageName = "@aws-sdk/middleware-header-default"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-header-default/-/middleware-header-default-3.52.0.tgz"; - sha512 = "ts5kuAnLjC9HW9W/vkCrlMa4a5DG45BkOjhYhD4YZCDBt9+E/N5Pt/14jmTdTO5LQ26zVC6Z3ByBXXayDKEIow=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-header-default/-/middleware-header-default-3.54.0.tgz"; + sha512 = "DvkdMJRAYrVsu6S92Z/fhSnj7ZFCNE3ertmIiGsukfMuGmzkuVKxqlUfo89xS3sOF3VY2nNOdNTCnVY4VZLSQQ=="; }; }; - "@aws-sdk/middleware-host-header-3.52.0" = { + "@aws-sdk/middleware-host-header-3.54.0" = { name = "_at_aws-sdk_slash_middleware-host-header"; packageName = "@aws-sdk/middleware-host-header"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.52.0.tgz"; - sha512 = "t7y0gtJyFNrS6bwluR7N2LtppA7B0SDk+uNlvOJOYnJRms89fXltyMJWl8wrv8IHHvrhRLwNEP22vvOhn3hriA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.54.0.tgz"; + sha512 = "X+lvYc2ij1+9tfpvdGGb+/APvH7g/M9RYzIEkI/LvNjVCOA3f3rgzFftZZhD/zccRtrygsvXfeZhoDrHxFKl9g=="; }; }; - "@aws-sdk/middleware-location-constraint-3.52.0" = { + "@aws-sdk/middleware-location-constraint-3.54.0" = { name = "_at_aws-sdk_slash_middleware-location-constraint"; packageName = "@aws-sdk/middleware-location-constraint"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.52.0.tgz"; - sha512 = "P+RfKVXL6X+vu7e54vu73TNje15y+Jo1VEbBpFGz5wYsLlBO58e6utDYLOYLwj+WzLqShSzZX9ejZzxrOSYQdQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.54.0.tgz"; + sha512 = "qwZR+GWlRoIFvvCt5ywmX3kV15KxrFbUxyAADCEJ4Q86ebEI3ux9mAHB6niOArRwtA5/wyvjRrOiYo/fTq7eLQ=="; }; }; - "@aws-sdk/middleware-logger-3.52.0" = { + "@aws-sdk/middleware-logger-3.54.0" = { name = "_at_aws-sdk_slash_middleware-logger"; packageName = "@aws-sdk/middleware-logger"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.52.0.tgz"; - sha512 = "YbFuJAsOPvbYe64gpqmS6XmEQXwyAGwH3Y4iOp3CnrGAz/zXbwWwzb653Uby+h4PVkTZ1+RviCO/A6si9bUkhw=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.54.0.tgz"; + sha512 = "bDCQj8IBq1vrXRRrpqD+suJ8hKc4oxUXpRkWdsAD+HnWWRqHjsy0hdq5F8Rj1Abq7CsFtZ+rUXddl+KlmgZ3+A=="; }; }; - "@aws-sdk/middleware-retry-3.52.0" = { + "@aws-sdk/middleware-retry-3.54.0" = { name = "_at_aws-sdk_slash_middleware-retry"; packageName = "@aws-sdk/middleware-retry"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-retry/-/middleware-retry-3.52.0.tgz"; - sha512 = "O+4mfn7OPv1POYagKwOgdlc16AQFWa4bY05g6Y94KZ2400ywNpK+Y2cwdskyNU3OTGOlluVGR21W5eO1b+XhNg=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-retry/-/middleware-retry-3.54.0.tgz"; + sha512 = "8kVzwxe0HQajeZWXzAp2XCkbiK8E8AZESfXvLyM34Xy2e8L8gdi1j90QLzpFk6WX6rz7hXBQG7utrCJkwXQxLA=="; }; }; - "@aws-sdk/middleware-sdk-s3-3.52.0" = { + "@aws-sdk/middleware-sdk-s3-3.54.0" = { name = "_at_aws-sdk_slash_middleware-sdk-s3"; packageName = "@aws-sdk/middleware-sdk-s3"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.52.0.tgz"; - sha512 = "M9ivvdTEPFoFUgfGLdFeRxFGRh/Edq6tevSnWjdOoLTgbzq8tnuKkj9v3gKsIN+a1QWP6Ef0ThH/jyuFDcBEnQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.54.0.tgz"; + sha512 = "xESksyOVCuDkMPC8mEqrInnuBeJHLSVOfwIl/pGwzevc+Q5spO9FDUlNfhaEVOEoLqK21TUdZo4z/ElNN94m4w=="; }; }; - "@aws-sdk/middleware-sdk-sts-3.52.0" = { + "@aws-sdk/middleware-sdk-sts-3.54.0" = { name = "_at_aws-sdk_slash_middleware-sdk-sts"; packageName = "@aws-sdk/middleware-sdk-sts"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.52.0.tgz"; - sha512 = "NB1wHvOp+I6DXi5fPutyl9dAWvJYqzRqdi8lMeu02ub/d6nybrAjoB56za1LvGblcoEiYClf1A6dTKtmydgzFQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.54.0.tgz"; + sha512 = "4vOlG96fKgqmLMsguoKFdBkk2Fq8JttpgPts9d5Ox73+yQsa0VKrpLiD5OUPqgjGZcX2bilMKCAOBc2v3ESAHw=="; }; }; - "@aws-sdk/middleware-serde-3.52.0" = { + "@aws-sdk/middleware-serde-3.54.0" = { name = "_at_aws-sdk_slash_middleware-serde"; packageName = "@aws-sdk/middleware-serde"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-serde/-/middleware-serde-3.52.0.tgz"; - sha512 = "4ZooINTdOI4+T6pEiu8xte5EEhOqbE/wqOwBzvOASk3JKElZ93u6xKP2u7UKVD6asBBYK2mDrYSy1PsU4fNl4A=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-serde/-/middleware-serde-3.54.0.tgz"; + sha512 = "O89/5aOiNegBP6Mv+gPr22Zawz2zF2v1o8kwFv2s4PWDzpmvrdF2by6e2Uh9sKzfpcwEW7Wr8kDTwajampVjgA=="; }; }; - "@aws-sdk/middleware-signing-3.52.0" = { + "@aws-sdk/middleware-signing-3.54.0" = { name = "_at_aws-sdk_slash_middleware-signing"; packageName = "@aws-sdk/middleware-signing"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.52.0.tgz"; - sha512 = "7FUqmZQ5DzaDJYCJ3YmOHRFEyFeohtsDQ1akWD2qekcjp16ftBtk05Fi9am5/L7pO8svVzobji/wg00Tlq183A=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.54.0.tgz"; + sha512 = "KYxmRDh7D6ysAezlsDf3cN2h6OjH66x3NUdgUmW+78nkN9tRvvJEjhmu6IOkPd4E1V9P3JOLbq6zVjDVU12WDQ=="; }; }; - "@aws-sdk/middleware-ssec-3.52.0" = { + "@aws-sdk/middleware-ssec-3.54.0" = { name = "_at_aws-sdk_slash_middleware-ssec"; packageName = "@aws-sdk/middleware-ssec"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.52.0.tgz"; - sha512 = "lEswW+Hf5tvkPs6aNRbPF5/Iizh62lq4NK6bZjvQF6kqyUoIGhOehQOZMmTm6jw0058KVhrzNIKipBpi7LuF6w=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.54.0.tgz"; + sha512 = "wNQR5pRoN4wJq2IcFOXhRxvars4uWgdUnBQcJ5UDSJhUPwVDA4m+M83Q/54GWRHT+SVsobuNTmTeFnCbgsIq3A=="; }; }; - "@aws-sdk/middleware-stack-3.52.0" = { + "@aws-sdk/middleware-stack-3.54.0" = { name = "_at_aws-sdk_slash_middleware-stack"; packageName = "@aws-sdk/middleware-stack"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-stack/-/middleware-stack-3.52.0.tgz"; - sha512 = "4OTbQ+tWc6Le7es3kSnXBzCyddcUw6Sk2GupR/1+PD9v4/qvtKXXK+uD4bMDDMfi6dTNV+2riOGBniOtBVsayw=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-stack/-/middleware-stack-3.54.0.tgz"; + sha512 = "38iit8VJ7jhFlMdwdDESEJOwbi8wIjF7Q1FOFIoCvURLGkTDQdabGXKwcFVfRuceLO+LJxWP3l0z0c10uZa6gQ=="; }; }; - "@aws-sdk/middleware-user-agent-3.52.0" = { + "@aws-sdk/middleware-user-agent-3.54.0" = { name = "_at_aws-sdk_slash_middleware-user-agent"; packageName = "@aws-sdk/middleware-user-agent"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.52.0.tgz"; - sha512 = "sfdJvAp/f4PHmQvSklFAuCpD7gqloG502gSmBAMrXKqYykvQ5SAGyr6sCZPWf8CZxKtn5n4ftg8CLKywwrKwmg=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.54.0.tgz"; + sha512 = "831GP5EBJdDxyq93dpgBZUwBWnZAID2aFvE/VN8c5X8U00ZT7GRt9cy5EL2b6AQN3Z4uWL1ZVDVkYmRAHs33Lg=="; }; }; - "@aws-sdk/node-config-provider-3.52.0" = { + "@aws-sdk/node-config-provider-3.54.0" = { name = "_at_aws-sdk_slash_node-config-provider"; packageName = "@aws-sdk/node-config-provider"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/node-config-provider/-/node-config-provider-3.52.0.tgz"; - sha512 = "vfeTzkfVtGaNQrnhCRMObqid0shxFtNFEnnU1Nnx7HsgBfag2/T6fnsDzdVGaliQ6nmfg+RMrhzw2VECyBTHQQ=="; + url = "https://registry.npmjs.org/@aws-sdk/node-config-provider/-/node-config-provider-3.54.0.tgz"; + sha512 = "Q2a1vyoZa2UX/dItP3cqNdLUoTGdIY4hD5nA+mTg5mKlOWci35v8Rypr40tQz4ZwiDF6QQmK0tvD3bBUULm0wA=="; }; }; - "@aws-sdk/node-http-handler-3.52.0" = { + "@aws-sdk/node-http-handler-3.54.0" = { name = "_at_aws-sdk_slash_node-http-handler"; packageName = "@aws-sdk/node-http-handler"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/node-http-handler/-/node-http-handler-3.52.0.tgz"; - sha512 = "MjLkndwLuWye1kavyFnDw5BvK8Rg4YpMULTne++OL/uEsxWO786K+QQMyLWkirPe+ELMEYu/3eOrQTly2tqHsA=="; + url = "https://registry.npmjs.org/@aws-sdk/node-http-handler/-/node-http-handler-3.54.0.tgz"; + sha512 = "g6+IXe4FCMrx4vrY73yvFNAUsBJ1vhjDshUCihBv5tEXsd45/MqmON/VWYoaQZts0m2wx2fKsdoDKSIZZY7AiQ=="; }; }; - "@aws-sdk/property-provider-3.52.0" = { + "@aws-sdk/property-provider-3.54.0" = { name = "_at_aws-sdk_slash_property-provider"; packageName = "@aws-sdk/property-provider"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.52.0.tgz"; - sha512 = "Ooam7CvGefHKhMwQ413MiEtDTFw70xbCduJCF7Bg1F0WKrf700M/Yte+q3E0ljlXWJ28rwJNgwW3ptZaSXMGPg=="; + url = "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.54.0.tgz"; + sha512 = "8e+KXskwOhXF0MIdIcZLFsOTfMVGp41Y6kywgewQaHkZoMzZ6euRziyWNgnshUE794tjxxol9resudSUehPjIw=="; }; }; - "@aws-sdk/protocol-http-3.52.0" = { + "@aws-sdk/protocol-http-3.54.0" = { name = "_at_aws-sdk_slash_protocol-http"; packageName = "@aws-sdk/protocol-http"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/protocol-http/-/protocol-http-3.52.0.tgz"; - sha512 = "L6ITU9NG0L6nyYfzhSLa0EsgDlyL1vHNz+Om9o7TayUUF7O0f3UiZToWf2hdETQ04Os8625aZt0VH92ZnYyeEw=="; + url = "https://registry.npmjs.org/@aws-sdk/protocol-http/-/protocol-http-3.54.0.tgz"; + sha512 = "v4CgQ2mBzEwNubM1duWP3Unu98EPNF2BuKWe4wT1HNG2MTkODS56fsgVT6sGGXS9nB/reEzB+3bXO5FS8+3SUg=="; }; }; - "@aws-sdk/querystring-builder-3.52.0" = { + "@aws-sdk/querystring-builder-3.54.0" = { name = "_at_aws-sdk_slash_querystring-builder"; packageName = "@aws-sdk/querystring-builder"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/querystring-builder/-/querystring-builder-3.52.0.tgz"; - sha512 = "RfNXqKeR6mdg2n2LO5Vs2Bz+f47/KN5k36HWk04bSwIbhnBtslXBp0F1KgSPkeP56KEgmmUWldRD7g8BvDkgAw=="; + url = "https://registry.npmjs.org/@aws-sdk/querystring-builder/-/querystring-builder-3.54.0.tgz"; + sha512 = "7rs2gGPpiIHntbYGPFkxkXQkSK7uVBqlWRl0m6fNngUEz2n8jRxytB6LlALMHbXeXh28+zzq0VxbAwqAAUQ4oQ=="; }; }; - "@aws-sdk/querystring-parser-3.52.0" = { + "@aws-sdk/querystring-parser-3.54.0" = { name = "_at_aws-sdk_slash_querystring-parser"; packageName = "@aws-sdk/querystring-parser"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/querystring-parser/-/querystring-parser-3.52.0.tgz"; - sha512 = "/A6PauieStZajbkxX3sZSBBDacGDc3I/Sk7rjJulmg1GnizeVcUgx1OUdDh1JasdqA1h9E3ks/Y2Lu3xUMctLw=="; + url = "https://registry.npmjs.org/@aws-sdk/querystring-parser/-/querystring-parser-3.54.0.tgz"; + sha512 = "OZ4mRJ9rXgBskPBSoXBw8tV4kfNK0f/pP55qE1eZIcQ1z7EvVz4NjldgqMfscT20Cx5VzUbus3q9EPcV+HbR1w=="; }; }; - "@aws-sdk/s3-request-presigner-3.52.0" = { + "@aws-sdk/s3-request-presigner-3.54.0" = { name = "_at_aws-sdk_slash_s3-request-presigner"; packageName = "@aws-sdk/s3-request-presigner"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.52.0.tgz"; - sha512 = "6TGPTP5L3+nfOR5K+AQNS1NDp1aYxozQ5vW4KGI+P1XVnLZZ36Ey3VoCdrmI2b6b8qy9pT3c3bXfPwEN4gSIOQ=="; + url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.54.0.tgz"; + sha512 = "xPIahWW1brKu3Cnphx/pYAB3nRAyAZH4Zh7n1zm9XUsqqsBc4ZkIKqC5tDvJ/lBOLrqks8oSh2wpckfCwO9EpA=="; }; }; - "@aws-sdk/service-error-classification-3.52.0" = { + "@aws-sdk/service-error-classification-3.54.0" = { name = "_at_aws-sdk_slash_service-error-classification"; packageName = "@aws-sdk/service-error-classification"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/service-error-classification/-/service-error-classification-3.52.0.tgz"; - sha512 = "2bpSIZCx5VGp2CBTeXK6PxlBYWrn2wiqxBVYstDRExZ8P7edcwPRgWi8qaKgPM2wvstZwJieF774niiuLddIpg=="; + url = "https://registry.npmjs.org/@aws-sdk/service-error-classification/-/service-error-classification-3.54.0.tgz"; + sha512 = "XWANvjJJZNqsYhGmccSSuhsvINIUX1KckfDmvYtUR6cKM6nM6QWOg/QJeTFageTEpruJ5TqzW9vY414bIE883w=="; }; }; "@aws-sdk/shared-ini-file-loader-3.52.0" = { @@ -886,40 +895,40 @@ let sha512 = "tALb8u8IVcI4pT7yFZpl4O6kgeY5EAXyphZoRPgQSCDhmEyFUIi/sXbCN8HQiHjnHdWfXdaNE1YsZcW3GpcuoQ=="; }; }; - "@aws-sdk/signature-v4-3.52.0" = { + "@aws-sdk/signature-v4-3.54.0" = { name = "_at_aws-sdk_slash_signature-v4"; packageName = "@aws-sdk/signature-v4"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.52.0.tgz"; - sha512 = "lSlDASXGLup5v12kclzT2ZLoUnnVLknSRcMXrTVjnX7spmHMbs6s7LOcN0RXZzFIACs7vW+930KUzhBxt8UiFQ=="; + url = "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.54.0.tgz"; + sha512 = "22Bf8uQ0Q/I7WpLFU88G7WVpRw6tWUX9Ggr0Z++81uZF5YCPbWDNtFDHitoERaRc/M4vUMxNuTsX/JWOR3fFPg=="; }; }; - "@aws-sdk/smithy-client-3.52.0" = { + "@aws-sdk/smithy-client-3.54.0" = { name = "_at_aws-sdk_slash_smithy-client"; packageName = "@aws-sdk/smithy-client"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/smithy-client/-/smithy-client-3.52.0.tgz"; - sha512 = "GuOJuoA1kky/v2p7byOZGq7YOiu2Ov8DA3d58gM6L/q7XavBjnzwNB/BYU7SPU3Ly6S7qGxBJFeadufic4bCYg=="; + url = "https://registry.npmjs.org/@aws-sdk/smithy-client/-/smithy-client-3.54.0.tgz"; + sha512 = "zdYN5pwhJU7x8qZKWTZPsFD5YQkDt6kyCNRsNjSWJ0ON4R3wUlFIwT3YzeQ5nMOTD86cVIm1n2RaSTYHwelFXg=="; }; }; - "@aws-sdk/types-3.52.0" = { + "@aws-sdk/types-3.54.0" = { name = "_at_aws-sdk_slash_types"; packageName = "@aws-sdk/types"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.52.0.tgz"; - sha512 = "5deI1v6Fr7/a+TT9hPuiy6I/L/7uJTda3q3DEvUd0CsGbBB/fcDXJg8jlnMHcmw7mkfP9vE553ZJQS3Cb0v4vg=="; + url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.54.0.tgz"; + sha512 = "Jp2MHXnrM0pk0RIoSl5AHFm7TBk+7b8HTIcQ2X/6kGwwwnWw9qlg9ZFziegJTNTLJ4iVgZjz/yMlEvgrp7z9CA=="; }; }; - "@aws-sdk/url-parser-3.52.0" = { + "@aws-sdk/url-parser-3.54.0" = { name = "_at_aws-sdk_slash_url-parser"; packageName = "@aws-sdk/url-parser"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/url-parser/-/url-parser-3.52.0.tgz"; - sha512 = "/9OJwol/384jsISiAs5JX7fkgd9mv7hJsHFCVXnByim5qTZu1V9fMcJYJ1L3iRmfCRy0w75UDJljIx2RZnwAYw=="; + url = "https://registry.npmjs.org/@aws-sdk/url-parser/-/url-parser-3.54.0.tgz"; + sha512 = "DJWdlkXq3rsOydxwR9htPUW4QXhmo75Hybg96D3F2uPUvPCm8gJFngXp/9hW1OYcgfNu13HXqUy+t6V23cC7Iw=="; }; }; "@aws-sdk/util-arn-parser-3.52.0" = { @@ -949,22 +958,22 @@ let sha512 = "V96YIXBuIiVu7Zk72Y9dly7Io9cYOT30Hjf77KAkBeizlFgT5gWklWYGcytPY8FxLuEy4dPLeHRmgwQnlDwgPA=="; }; }; - "@aws-sdk/util-body-length-browser-3.52.0" = { + "@aws-sdk/util-body-length-browser-3.54.0" = { name = "_at_aws-sdk_slash_util-body-length-browser"; packageName = "@aws-sdk/util-body-length-browser"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-body-length-browser/-/util-body-length-browser-3.52.0.tgz"; - sha512 = "8omOgIGmopUtwg3XaeyvqacxrIrCsDKUVQp5n+8iLmyYt5mQM70vXbUC273GJzKDtibGDfxiN4FqSLBlo9F/oQ=="; + url = "https://registry.npmjs.org/@aws-sdk/util-body-length-browser/-/util-body-length-browser-3.54.0.tgz"; + sha512 = "hnY9cXbKWJ2Fjb4bK35sFdD4vK+sFe59JtxxI336yYzANulc462LU/J1RgONXYBW60d9iwJ7U+S+9oTJrEH6WQ=="; }; }; - "@aws-sdk/util-body-length-node-3.52.0" = { + "@aws-sdk/util-body-length-node-3.54.0" = { name = "_at_aws-sdk_slash_util-body-length-node"; packageName = "@aws-sdk/util-body-length-node"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-body-length-node/-/util-body-length-node-3.52.0.tgz"; - sha512 = "1WWsGh0hip4y1uvOLFV2v3Nvq3W35dmW5YniCi0gQDBLc5JHES8Zka7yoCDYOfaYFUodVH5mC/jFBjGRQ3TpDw=="; + url = "https://registry.npmjs.org/@aws-sdk/util-body-length-node/-/util-body-length-node-3.54.0.tgz"; + sha512 = "BBQB3kqHqHQp2GAINJGuse9JBM7hfU0tMp9rfw0nym4C/VRooiJVrIb28tKseLtd7nihXvsZXPvEc2jQBe1Thg=="; }; }; "@aws-sdk/util-buffer-from-3.52.0" = { @@ -985,49 +994,49 @@ let sha512 = "1wonBNkOOLJpMZnz2Kn69ToFgSoTTyGzJInir8WC5sME3zpkb5j41kTuEVbImNJhVv9MKjmGYrMeZbBVniLRPw=="; }; }; - "@aws-sdk/util-create-request-3.52.0" = { + "@aws-sdk/util-create-request-3.54.0" = { name = "_at_aws-sdk_slash_util-create-request"; packageName = "@aws-sdk/util-create-request"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-create-request/-/util-create-request-3.52.0.tgz"; - sha512 = "j2KJf4SsAuMNZw92T+ti8VoJ1wILlZl81+3ZvIWho4k3hvjf05eXH/l4P0tZ7aCRfljx+NoaJbuKAT7XcpDQ5Q=="; + url = "https://registry.npmjs.org/@aws-sdk/util-create-request/-/util-create-request-3.54.0.tgz"; + sha512 = "Sa+t75YQnMXXcCruLBvKZ6B1DzyGAod1PZT+iDHwDDobDsUVG3Cjov9gJepYAH2EEmvZa9f0IT+W6lvGv3uL4w=="; }; }; - "@aws-sdk/util-credentials-3.52.0" = { + "@aws-sdk/util-credentials-3.53.0" = { name = "_at_aws-sdk_slash_util-credentials"; packageName = "@aws-sdk/util-credentials"; - version = "3.52.0"; + version = "3.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-credentials/-/util-credentials-3.52.0.tgz"; - sha512 = "fNcm2cNzDHWt5Pr6xD2FXA40jkcgClsbumuI0VBhLEyNLfoetwPImKTpqbxo1XfWVxhqIbT/ELnrbS2OYBRIXg=="; + url = "https://registry.npmjs.org/@aws-sdk/util-credentials/-/util-credentials-3.53.0.tgz"; + sha512 = "XP/3mYOmSn5KpWv+PnBTP2UExXb+hx1ugbH4Gkveshdq9KBlVnpV5eVgIwSAnKBsplScfsNMJ5EOtHjz5Cvu5A=="; }; }; - "@aws-sdk/util-defaults-mode-browser-3.52.0" = { + "@aws-sdk/util-defaults-mode-browser-3.54.0" = { name = "_at_aws-sdk_slash_util-defaults-mode-browser"; packageName = "@aws-sdk/util-defaults-mode-browser"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.52.0.tgz"; - sha512 = "N2/DHJ/OfiQ5zP97k9cJ8jSGiWDjtR7oFqXR+wbKZzKOww6vencMPYlndU6v1uZOKEjoj+NBr5N0jPEjCz+6+g=="; + url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.54.0.tgz"; + sha512 = "9QnRbTsD2MuEr59vaPAbC95ba7druMFRSZjpwc3L7U9zpsJruNDaL5aAmV0gCAIPZg7eSaJmipyWr0AvwwgroQ=="; }; }; - "@aws-sdk/util-defaults-mode-node-3.52.0" = { + "@aws-sdk/util-defaults-mode-node-3.54.0" = { name = "_at_aws-sdk_slash_util-defaults-mode-node"; packageName = "@aws-sdk/util-defaults-mode-node"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.52.0.tgz"; - sha512 = "vmbvirg5edfNKBin8Mup2noxgqIYzYPnvk+BgIx3jFPvwT57WGRs/ahOMNqHgv/6xAdVaUjz8g7gw9Yy3mwP3A=="; + url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.54.0.tgz"; + sha512 = "kHFgEyAWCaR5uSmRwyVbWQnjiNib3EJSAG9y7bwMIHSOK/6TVOXGlb1KIoO6ZtLE1FZFlS55FIRFeOPmIFFZbA=="; }; }; - "@aws-sdk/util-format-url-3.52.0" = { + "@aws-sdk/util-format-url-3.54.0" = { name = "_at_aws-sdk_slash_util-format-url"; packageName = "@aws-sdk/util-format-url"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.52.0.tgz"; - sha512 = "Rkfz6dz4sPh0poMmaQIf7e0q2XrQic4D0Wx99N3+OtT/WHQCR8UAjyijxC5jDQwhyNkqNNdIYQd7Xz5o6X9eRQ=="; + url = "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.54.0.tgz"; + sha512 = "nnrXT0dQc+eRWJPgkqDK91NEluTFU9Tqs/LhIlIq+6Z8BELTN24lCi9feUKtw1s3a5ucUSs2unYyfHnl35PeeQ=="; }; }; "@aws-sdk/util-hex-encoding-3.52.0" = { @@ -1048,6 +1057,24 @@ let sha512 = "l10U2cLko6070A9DYLJG4NMtwYH8JBG2J/E+RH8uY3lad2o6fGEIkJU0jQbWbUeHYLG3IWuCxT47V4gxYrFj7g=="; }; }; + "@aws-sdk/util-stream-browser-3.54.0" = { + name = "_at_aws-sdk_slash_util-stream-browser"; + packageName = "@aws-sdk/util-stream-browser"; + version = "3.54.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/util-stream-browser/-/util-stream-browser-3.54.0.tgz"; + sha512 = "KVBRQcTie9Q231pdbO4gzGxHG8wNomGic3bHDnwfVdE+tq1Pbi8xNgUelmmd/uZvgMf8awuNN8OHzkex06HAHQ=="; + }; + }; + "@aws-sdk/util-stream-node-3.54.0" = { + name = "_at_aws-sdk_slash_util-stream-node"; + packageName = "@aws-sdk/util-stream-node"; + version = "3.54.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/util-stream-node/-/util-stream-node-3.54.0.tgz"; + sha512 = "h3kpLMYzGgPkCIq0sLlE70zAt75C6wcbZm4gPh5iN8KRmmhpktqKpBami9J5fY6cBPC5ZlEmv5iDdZrI90Imrw=="; + }; + }; "@aws-sdk/util-uri-escape-3.52.0" = { name = "_at_aws-sdk_slash_util-uri-escape"; packageName = "@aws-sdk/util-uri-escape"; @@ -1057,22 +1084,22 @@ let sha512 = "W9zw5tE8syjg17jiCYtyF99F0FgDIekQdLg+tQGobw9EtCxlUdg48UYhifPfnjvVyADRX2ntclHF9NmhusOQaQ=="; }; }; - "@aws-sdk/util-user-agent-browser-3.52.0" = { + "@aws-sdk/util-user-agent-browser-3.54.0" = { name = "_at_aws-sdk_slash_util-user-agent-browser"; packageName = "@aws-sdk/util-user-agent-browser"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.52.0.tgz"; - sha512 = "zmw9pJ91QAr1oF3uqLKuo/3++NrSEagLwz3xnuID5wN8WLAgbC6MkvM7FG+r11CHSoUX3IeB6YDqoBMQW8en8w=="; + url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.54.0.tgz"; + sha512 = "pU5KL1Nnlc1igeED2R44k9GEIxlLBhwmUGIw8/Emfm8xAlGOX4NsVSfHK9EpJQth0z5ZJ4Lni6S5+nW4V16yLw=="; }; }; - "@aws-sdk/util-user-agent-node-3.52.0" = { + "@aws-sdk/util-user-agent-node-3.54.0" = { name = "_at_aws-sdk_slash_util-user-agent-node"; packageName = "@aws-sdk/util-user-agent-node"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.52.0.tgz"; - sha512 = "jqbyb6R4goWOTIESizmNPy1i3Xa25Q3QG0xt6Pct0DwLQUSVpnPHw07NmfRhql+eYBoD4uxpXDX9lWsuLUBi0w=="; + url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.54.0.tgz"; + sha512 = "euKoYk1TfyV9XlJyAlGWdYqhQ5B4COwBxsV9OpwiAINUFm91NSv6uavFC/ZZQBXRks6j9pHDAXeXu7bHVolvlA=="; }; }; "@aws-sdk/util-utf8-browser-3.52.0" = { @@ -1093,13 +1120,13 @@ let sha512 = "fujr7zeobZ2y5nnOnQZrCPPc+lCAhtNF/LEVslsQfd+AQ0bYWiosrKNetodQVWlfh10E2+i6/5g+1SBJ5kjsLw=="; }; }; - "@aws-sdk/util-waiter-3.52.0" = { + "@aws-sdk/util-waiter-3.54.0" = { name = "_at_aws-sdk_slash_util-waiter"; packageName = "@aws-sdk/util-waiter"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-waiter/-/util-waiter-3.52.0.tgz"; - sha512 = "8Gx0NunIg1RFpnKSA3nwzDl5j8mJ42kWjy5sHgd4wfUyiXRSvTl69sV6O8qhleI9OMDV0iS4xHZBCLK11HdIoA=="; + url = "https://registry.npmjs.org/@aws-sdk/util-waiter/-/util-waiter-3.54.0.tgz"; + sha512 = "+Gz5R14jWKsQtMCWbzWJe2Ac/CdMV/h5/R8uEZmwM3f6MHICPOftMQd0uDLdGezSBV9PuU3PCwiBZBTFzNSYBg=="; }; }; "@aws-sdk/xml-builder-3.52.0" = { @@ -1129,13 +1156,13 @@ let sha1 = "e70187f8a862e191b1bce6c0268f13acd3a56b20"; }; }; - "@babel/cli-7.17.3" = { + "@babel/cli-7.17.6" = { name = "_at_babel_slash_cli"; packageName = "@babel/cli"; - version = "7.17.3"; + version = "7.17.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/cli/-/cli-7.17.3.tgz"; - sha512 = "1+WRlh1IqLocOp122CLx4if345RSHMspwIZNJTlqG/GA46HVZC6p49N1kolfdd2/GOdr+tu4nScbAR3ACJ2ZiA=="; + url = "https://registry.npmjs.org/@babel/cli/-/cli-7.17.6.tgz"; + sha512 = "l4w608nsDNlxZhiJ5tE3DbNmr61fIKMZ6fTBo171VEFuFMIYuJ3mHRhTLEkKKyvx2Mizkkv/0a8OJOnZqkKYNA=="; }; }; "@babel/code-frame-7.10.4" = { @@ -1228,13 +1255,13 @@ let sha512 = "mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA=="; }; }; - "@babel/helper-create-class-features-plugin-7.17.1" = { + "@babel/helper-create-class-features-plugin-7.17.6" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.17.1"; + version = "7.17.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.1.tgz"; - sha512 = "JBdSr/LtyYIno/pNnJ75lBcqc3Z1XXujzPanHqjvvrhOA+DTceTFuJi8XjmWTZh4r3fsdfqaCMN0iZemdkxZHQ=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.6.tgz"; + sha512 = "SogLLSxXm2OkBbSsHZMM4tUi8fUzjs63AT/d0YQIzr6GSd8Hxsbk2KYDX0k0DweAzGMj/YWeiCsorIdtdcW8Eg=="; }; }; "@babel/helper-create-regexp-features-plugin-7.17.0" = { @@ -1318,13 +1345,13 @@ let sha512 = "LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg=="; }; }; - "@babel/helper-module-transforms-7.16.7" = { + "@babel/helper-module-transforms-7.17.6" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.16.7"; + version = "7.17.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz"; - sha512 = "gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.6.tgz"; + sha512 = "2ULmRdqoOMpdvkbT8jONrZML/XALfzxlb052bldftkicAUy8AxSCkD5trDPQcwHNmolcl7wP6ehNqMlyUw6AaA=="; }; }; "@babel/helper-optimise-call-expression-7.16.7" = { @@ -1507,13 +1534,13 @@ let sha512 = "IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww=="; }; }; - "@babel/plugin-proposal-class-static-block-7.16.7" = { + "@babel/plugin-proposal-class-static-block-7.17.6" = { name = "_at_babel_slash_plugin-proposal-class-static-block"; packageName = "@babel/plugin-proposal-class-static-block"; - version = "7.16.7"; + version = "7.17.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.7.tgz"; - sha512 = "dgqJJrcZoG/4CkMopzhPJjGxsIe9A8RlkQLnL/Vhhx8AA9ZuaRwGSlscSh42hazc7WSrya/IK7mTeoF0DP9tEw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.17.6.tgz"; + sha512 = "X/tididvL2zbs7jZCeeRJ8167U/+Ac135AM6jCAx6gYXDUviZV5Ku9UDvWS2NCuWlFjIRXklYhwo6HhAC7ETnA=="; }; }; "@babel/plugin-proposal-dynamic-import-7.16.7" = { @@ -2308,13 +2335,13 @@ let sha512 = "TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw=="; }; }; - "@blueprintjs/colors-4.0.0-beta.3" = { + "@blueprintjs/colors-4.0.0-rc.0" = { name = "_at_blueprintjs_slash_colors"; packageName = "@blueprintjs/colors"; - version = "4.0.0-beta.3"; + version = "4.0.0-rc.0"; src = fetchurl { - url = "https://registry.npmjs.org/@blueprintjs/colors/-/colors-4.0.0-beta.3.tgz"; - sha512 = "42i7qeyFZT/qJFj8iagVECB91HmqxiCY7rw+EaOHSKCwbasbJF0BmAMViZCrOhvw++ZQ2WXmu+CxH6jkvSeDtg=="; + url = "https://registry.npmjs.org/@blueprintjs/colors/-/colors-4.0.0-rc.0.tgz"; + sha512 = "+Iw5LUa9MtbEGtm09eAtGyalVS7n8wM1/nUmFl0CCq176wqRzS0/VyCo0qdweZqzypEtHnXaFNmr+Cgt4Ge1kQ=="; }; }; "@blueprintjs/core-3.53.0" = { @@ -2389,40 +2416,49 @@ let sha512 = "GcIY79elgB+azP74j8vqkiXz8xLFfIzbQJdlwOPisgbKT00tviJQuEghOXSMVxJ00HoYJbGswr4kcllUc4xCcg=="; }; }; - "@cdktf/hcl2cdk-0.9.1" = { + "@cdktf/hcl2cdk-0.9.4" = { name = "_at_cdktf_slash_hcl2cdk"; packageName = "@cdktf/hcl2cdk"; - version = "0.9.1"; + version = "0.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/hcl2cdk/-/hcl2cdk-0.9.1.tgz"; - sha512 = "0AOiSGa8qd0lcGwwayrl3N/mAeTFkNrKndILCDMuh9gLFfXLTxVEq2oqp5LbO5YX2i/cFMCjZ/vscXXQuCVjCQ=="; + url = "https://registry.npmjs.org/@cdktf/hcl2cdk/-/hcl2cdk-0.9.4.tgz"; + sha512 = "sUg9GsmaFpqqfoGcqibMEDHozMQhaDOxBT3Dz3ioNc0SSWhBpDRwrlctK3rNNKvWUetEeUr28L7SJR/I0TSd+Q=="; }; }; - "@cdktf/hcl2json-0.9.1" = { + "@cdktf/hcl2json-0.9.4" = { name = "_at_cdktf_slash_hcl2json"; packageName = "@cdktf/hcl2json"; - version = "0.9.1"; + version = "0.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.9.1.tgz"; - sha512 = "pM6cLkPl4hMTj9XhjKz7MEowUHnzq8hY8uk8ro32OQsZVZpsl9CDG83ox0VwgI1YSvXU7GyzP4iPOPn63U7PgQ=="; + url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.9.4.tgz"; + sha512 = "dZZUi94C7TFs0E8IubNYu38mBncVlQVUeGp6nA3tYxs/ue1igKqx7+mWfZP7NYVOSlggMGRNaTts6ZA0UAtOYQ=="; }; }; - "@cdktf/provider-generator-0.9.1" = { + "@cdktf/provider-generator-0.9.4" = { name = "_at_cdktf_slash_provider-generator"; packageName = "@cdktf/provider-generator"; - version = "0.9.1"; + version = "0.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/provider-generator/-/provider-generator-0.9.1.tgz"; - sha512 = "BF4Z7eiSFHKx0NrIiB2fHCq0G8Mx2q8bLbij9KBxAD80BwX1lNKEzut6JUhe6qOrC0yOkAV4PWElbK9g66pJgg=="; + url = "https://registry.npmjs.org/@cdktf/provider-generator/-/provider-generator-0.9.4.tgz"; + sha512 = "06sfpBTn3+PqiU/XP3RQ6FO6M+GxzmHo6yIJk9r5x1QmIlitDE9tdogXqmAVVHB4nGRL/v7SXefcrOHrOkl1YQ=="; }; }; - "@chemzqm/neovim-5.7.4" = { + "@chemzqm/neovim-5.7.5" = { name = "_at_chemzqm_slash_neovim"; packageName = "@chemzqm/neovim"; - version = "5.7.4"; + version = "5.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/@chemzqm/neovim/-/neovim-5.7.4.tgz"; - sha512 = "ajh2G+EhzqAHkAMsXsiNUG2cpGROO3RiAJbFQ0Px1cf9zE2YqWVZ8h7dFd7aj/zit+la9uTA1OPQkn4FZrHrjw=="; + url = "https://registry.npmjs.org/@chemzqm/neovim/-/neovim-5.7.5.tgz"; + sha512 = "BlwPjCDjeSdwIk7vP3wU6kFI+ZJBji8j5QWy631r+aQM1t74AclUOWNQZT8/GX3y2hqmC9LZnFT/bTQtVxw24g=="; + }; + }; + "@chinachu/aribts-1.3.5-mirakurun.17" = { + name = "_at_chinachu_slash_aribts"; + packageName = "@chinachu/aribts"; + version = "1.3.5-mirakurun.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@chinachu/aribts/-/aribts-1.3.5-mirakurun.17.tgz"; + sha512 = "1rgl8GNttf8+Ru/lOhWmH36zYQwUBaKIChHXe66KdJXDF+lRUaFhD1cR5NBCOFR983xzrvTJtGp0GWoYbILd1Q=="; }; }; "@cnakazawa/watch-1.0.4" = { @@ -2731,13 +2767,13 @@ let sha512 = "WOHfjwMuLbo76khDsDa1lJvP/dXcwXVwonWwfUFRt82BL/GtyMalh1HEtCWwKDuK/9f8PCEt/EZMkHT3D5ZV3w=="; }; }; - "@cspell/dict-elixir-2.0.0" = { + "@cspell/dict-elixir-2.0.1" = { name = "_at_cspell_slash_dict-elixir"; packageName = "@cspell/dict-elixir"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-elixir/-/dict-elixir-2.0.0.tgz"; - sha512 = "NeDObcqiYuqWRrzMAQLZDSrZlChTEZwTA2zHdI2nPtpeDl4FQcTz2BHP8zVt6Lj6G2QHJmNGmQtSmDguX86NYA=="; + url = "https://registry.npmjs.org/@cspell/dict-elixir/-/dict-elixir-2.0.1.tgz"; + sha512 = "eTTTxZt1FqGkM780yFDxsGHvTbWqvlK8YISSccK8FyrB6ULW+uflQlNS5AnWg3uWKC48b7pQott+odYCsPJ+Ow=="; }; }; "@cspell/dict-en-gb-1.1.33" = { @@ -2920,13 +2956,13 @@ let sha512 = "Rp3d4sgD6izW9TW5yVI3D//3HTl9oOGBuzTvXRdoHksVPRvzIu2liVhj8MnQ3XIRe5Kc6IhLBAm6izuV2BpGwQ=="; }; }; - "@cspell/dict-ruby-2.0.0" = { + "@cspell/dict-ruby-2.0.1" = { name = "_at_cspell_slash_dict-ruby"; packageName = "@cspell/dict-ruby"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-ruby/-/dict-ruby-2.0.0.tgz"; - sha512 = "ux73GEIZrApxIG/BDnpdxWE7r9TY3n+3HFAEp+LDJjSjpwpn2VXopd7GsjwsvmlAv5F3Jch8tzgzujFZkvqdoA=="; + url = "https://registry.npmjs.org/@cspell/dict-ruby/-/dict-ruby-2.0.1.tgz"; + sha512 = "qGqhYfFeoBOashv/l0Kj5o4ilyvfq0s+t+r32juPOkOnbHz+hzxnJo2tMMg/L/UdjVV7Y8ovg4LDBC/seVrMYQ=="; }; }; "@cspell/dict-rust-2.0.0" = { @@ -2947,13 +2983,13 @@ let sha512 = "MUwA2YKpqaQOSR4V1/CVGRNk8Ii5kf6I8Ch+4/BhRZRQXuwWbi21rDRYWPqdQWps7VNzAbbMA+PQDWsD5YY38g=="; }; }; - "@cspell/dict-software-terms-2.1.1" = { + "@cspell/dict-software-terms-2.1.3" = { name = "_at_cspell_slash_dict-software-terms"; packageName = "@cspell/dict-software-terms"; - version = "2.1.1"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-2.1.1.tgz"; - sha512 = "PmmqysKSvNwksjEfXrzD1wEVvctR6qppxDhwNc4IQQjwpjmtN8e+8HiXxIbCsBcll1rO0vOmnhpXUdl+d9apXQ=="; + url = "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-2.1.3.tgz"; + sha512 = "JmMfRa9Xl0MCD/z5gYUnY05BNxSMnx25Ky6kO/Cs0gBYZZdYzHZNqrbfnqBMsB9PpOzn2uqrYUmAEusoI1WyMQ=="; }; }; "@cspell/dict-swift-1.0.2" = { @@ -3100,13 +3136,13 @@ let sha512 = "HilPrVrCosYWqSyjfpDtaaN1kJwdlBpS+IAflP3z+e7nsEgk3JGJf1Vg0NgHJooTf5HDfXSyZqMVg+5jvXCK0g=="; }; }; - "@discoveryjs/json-ext-0.5.6" = { + "@discoveryjs/json-ext-0.5.7" = { name = "_at_discoveryjs_slash_json-ext"; packageName = "@discoveryjs/json-ext"; - version = "0.5.6"; + version = "0.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.6.tgz"; - sha512 = "ws57AidsDvREKrZKYffXddNkyaF14iHNHm8VQnZH6t99E8gczjNN0GpvcGny0imC80yQ0tHz1xVUKk/KFQSUyA=="; + url = "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz"; + sha512 = "dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw=="; }; }; "@electron-forge/async-ora-6.0.0-beta.63" = { @@ -3370,13 +3406,22 @@ let sha512 = "J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw=="; }; }; - "@eslint/eslintrc-1.1.0" = { + "@eslint/eslintrc-1.2.0" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; - version = "1.1.0"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.0.tgz"; + sha512 = "igm9SjJHNEJRiUnecP/1R5T3wKLEJ7pL6e2P+GUSfCd0dGjPYYZve08uzw8L2J8foVHFz+NGu12JxRcU2gGo6w=="; + }; + }; + "@eslint/eslintrc-1.2.1" = { + name = "_at_eslint_slash_eslintrc"; + packageName = "@eslint/eslintrc"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.1.0.tgz"; - sha512 = "C1DfL7XX4nPqGd6jcP01W9pVM1HYCuUkFk1432D7F0v3JSlUIeOYn9oCoi3eoLZ+iwBSb29BMFxxny0YrrEZqg=="; + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.1.tgz"; + sha512 = "bxvbYnBPN1Gibwyp6NrpnFzA3YtRL3BBAyEAFVIpNTm2Rn4Vy87GA5M4aSn3InRrlsbX5N0GW7XIx+U4SAEKdQ=="; }; }; "@exodus/schemasafe-1.0.0-rc.6" = { @@ -3406,22 +3451,22 @@ let sha512 = "Ydf4LidRB/EBI+YrB+cVLqIseiRfjUI/AeHBgjGMtq3GroraDu81OV7zqophRgupngoL3iS3JUMDMnxO7g39qA=="; }; }; - "@expo/config-6.0.18" = { + "@expo/config-6.0.19" = { name = "_at_expo_slash_config"; packageName = "@expo/config"; - version = "6.0.18"; + version = "6.0.19"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config/-/config-6.0.18.tgz"; - sha512 = "60z0YICI9eJWlvajl/Wgq8+lKm0jfkZOMdATDQtWz6GvWshUxd+A8EYhtgjJ9eWMGqOYkwrCpRNLHz5TZtCKWA=="; + url = "https://registry.npmjs.org/@expo/config/-/config-6.0.19.tgz"; + sha512 = "UkLnnKnt4zP382K7s0UDnUNY646Gdw8PoDWnxaIGAL515R9IX8oWef7+7hX/dZMi27d/WLJPmWNRYsEL8Q/3rw=="; }; }; - "@expo/config-plugins-4.0.18" = { + "@expo/config-plugins-4.1.0" = { name = "_at_expo_slash_config-plugins"; packageName = "@expo/config-plugins"; - version = "4.0.18"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-4.0.18.tgz"; - sha512 = "tW4bnrnKhn+PPHF8wf1KAoubICAVUHW8CcagvyFqaRIzeh6yavMIOsQShxOVTbgx7LzSyymZ1nEs45yCGAiMfA=="; + url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-4.1.0.tgz"; + sha512 = "+Uq7kzi1StUZZZivnnqNV6+v8b+SMF6MDgH+cEZxCoM9uwLXOK0rTAURzBGtl+C6EEbKnoZmnKGuzABBGPRP7A=="; }; }; "@expo/config-types-44.0.0" = { @@ -3433,22 +3478,22 @@ let sha512 = "d+gpdKOAhqaD5RmcMzGgKzNtvE1w+GCqpFQNSXLliYlXjj+Tv0eL8EPeAdPtvke0vowpPFwd5McXLA90dgY6Jg=="; }; }; - "@expo/dev-server-0.1.105" = { + "@expo/dev-server-0.1.106" = { name = "_at_expo_slash_dev-server"; packageName = "@expo/dev-server"; - version = "0.1.105"; + version = "0.1.106"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.105.tgz"; - sha512 = "Glw+826+4eS3zCXAEg5ruQVK3fCk+aT5BG+AiOYW5Dzb6EmRVYcbkK93ZdXloiqarflum9bQY+rogItB0hjjrw=="; + url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.106.tgz"; + sha512 = "MEB5YuOkew2O4K3GTDLHS1PT/Ca7B/tGx4J+eH74QK6051PlmrikPA5/buuZd23ww/cmOAAKBw509agcbrpajg=="; }; }; - "@expo/dev-tools-0.13.145" = { + "@expo/dev-tools-0.13.146" = { name = "_at_expo_slash_dev-tools"; packageName = "@expo/dev-tools"; - version = "0.13.145"; + version = "0.13.146"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.145.tgz"; - sha512 = "GtqnA9rmmSqCrv893MWbzbAoDZnYaSXe4kKQ57tCWYeSTOKav74ofvZlUZalosPuPjE9yuMA47rH9XJY0YgC1g=="; + url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.146.tgz"; + sha512 = "3bZe8He2uLha2SY1vOp2YnwtuXDHXodQwdkYdN/IL6XBveIKaBR9HDhBg/kBvI+/aNcut6ymwSSo9IOEmvUk5g=="; }; }; "@expo/devcert-1.0.0" = { @@ -3478,13 +3523,13 @@ let sha512 = "ZxtBodAZGxdLtgKzmsC+8ViUxt1mhFW642Clu2OuG3f6PAyAFsU/SqEGag9wKFaD3x3Wt8VhL+3y5fMJmUFgPw=="; }; }; - "@expo/metro-config-0.3.11" = { + "@expo/metro-config-0.3.12" = { name = "_at_expo_slash_metro-config"; packageName = "@expo/metro-config"; - version = "0.3.11"; + version = "0.3.12"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.3.11.tgz"; - sha512 = "F0Oe3JbRjbPA7LvZW969/6PTn7EXvXaudJq4fL8Fs4xfLgNHFv+t+NvlnoTj+y8IyY3z2jOfJkwpq64rzhx+6g=="; + url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.3.12.tgz"; + sha512 = "8cvsMMe68BfZqNYIXeYDVtf6ijEHmJ27llhFKFwS8XZwKaqcfSLRANK8I8xxTc00tzXaWyE1BKJIY6DMq/gbJA=="; }; }; "@expo/osascript-2.0.31" = { @@ -3514,13 +3559,13 @@ let sha512 = "5Ul3d/YOYE6mfum0jCE25XUnkKHZ5vGlU/X2275ZmCtGrpRn1Fl8Nq+jQKSaks3NqTfxdyXROi/TgH8Zxeg2wg=="; }; }; - "@expo/prebuild-config-3.0.18" = { + "@expo/prebuild-config-3.1.0" = { name = "_at_expo_slash_prebuild-config"; packageName = "@expo/prebuild-config"; - version = "3.0.18"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-3.0.18.tgz"; - sha512 = "Eyb+HJCsxYba2sWlDi3rqXWQ3jDjN41rSiYmvApY121Zqdrrj/384ntHZh6cbz0LWPeHXjPZBM3SDbK0ri9FTw=="; + url = "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-3.1.0.tgz"; + sha512 = "Vwz2L3brsrvLVDBXj2gcB2QfeyAPKxa7rCOSFnPhyHf2qpxtmncv9IVrSdkHyWlPW7KmFVfiRsT3/nHXoataqQ=="; }; }; "@expo/rudder-sdk-node-1.1.1" = { @@ -3559,13 +3604,13 @@ let sha512 = "LB7jWkqrHo+5fJHNrLAFdimuSXQ2MQ4lA7SQW5bf/HbsXuV2VrT/jN/M8f/KoWt0uJMGN4k/j7Opx4AvOOxSew=="; }; }; - "@expo/webpack-config-0.16.18" = { + "@expo/webpack-config-0.16.19" = { name = "_at_expo_slash_webpack-config"; packageName = "@expo/webpack-config"; - version = "0.16.18"; + version = "0.16.19"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.16.18.tgz"; - sha512 = "zANXNW68EzQ5Q8FyEmfZz1z7050yOaqJOpByWOLJ3NE1TRzflyzjt55OXsggPxBz2wpmikq/NjlZuF92e18UGw=="; + url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.16.19.tgz"; + sha512 = "VB8QNJ4Kvt46cy/y+AbBrJViOH2QY+AEfELNZRDifokZg0wPauxQCz/3Dk7qQnjLYsVOszoH7AtgfOdy/5NSjg=="; }; }; "@expo/xcpretty-4.1.0" = { @@ -3595,67 +3640,130 @@ let sha512 = "uRsLYksqpbDmWaSmzvJcuApSEe38+6NQZBUsuAyMZKqHxH0g1wcJgsKUvN3WC8tewaqFjBMMGrkHmC+T7k8LvA=="; }; }; - "@fluentui/date-time-utilities-7.9.1" = { + "@fluentui/date-time-utilities-8.4.0" = { name = "_at_fluentui_slash_date-time-utilities"; packageName = "@fluentui/date-time-utilities"; - version = "7.9.1"; + version = "8.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-7.9.1.tgz"; - sha512 = "o8iU1VIY+QsqVRWARKiky29fh4KR1xaKSgMClXIi65qkt8EDDhjmlzL0KVDEoDA2GWukwb/1PpaVCWDg4v3cUQ=="; + url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-8.4.0.tgz"; + sha512 = "fEc8JMG0Y21De6kjD5xfP/ix7y3u0zbFTKgNWNASGpIYsZKXbJqeu8/DEqnc4x9Lf5pxiV+WhNcoMLbtjKTpmg=="; }; }; - "@fluentui/dom-utilities-1.1.2" = { + "@fluentui/dom-utilities-2.2.0" = { name = "_at_fluentui_slash_dom-utilities"; packageName = "@fluentui/dom-utilities"; - version = "1.1.2"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/dom-utilities/-/dom-utilities-1.1.2.tgz"; - sha512 = "XqPS7l3YoMwxdNlaYF6S2Mp0K3FmVIOIy2K3YkMc+eRxu9wFK6emr2Q/3rBhtG5u/On37NExRT7/5CTLnoi9gw=="; + url = "https://registry.npmjs.org/@fluentui/dom-utilities/-/dom-utilities-2.2.0.tgz"; + sha512 = "M4SmXu428wwQLu1iw6ST07iACjdKY5HiU+xpcgD3IQMMQazgN616GDzc6KZ1ebuBsF7B4TyQS7KZh9mfxnnldg=="; }; }; - "@fluentui/keyboard-key-0.2.17" = { + "@fluentui/font-icons-mdl2-8.2.4" = { + name = "_at_fluentui_slash_font-icons-mdl2"; + packageName = "@fluentui/font-icons-mdl2"; + version = "8.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.2.4.tgz"; + sha512 = "Qep23/wpAwONuX0NSQa0D6RbGbEJQBjGMLdV4Qp6h4NKIGELsKJ1xEIa5ZCD68LzQHJsVtXDtOnSWi57Ug/P1A=="; + }; + }; + "@fluentui/foundation-legacy-8.2.4" = { + name = "_at_fluentui_slash_foundation-legacy"; + packageName = "@fluentui/foundation-legacy"; + version = "8.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.2.4.tgz"; + sha512 = "3pBUhKxkfJiRmTcTkkv/QvvF4it4hng7xx5GqcOD7WDzCVXUBTdWCbK/41kCOrTV8kfpu7hzJReCwZeBLlymuQ=="; + }; + }; + "@fluentui/keyboard-key-0.4.0" = { name = "_at_fluentui_slash_keyboard-key"; packageName = "@fluentui/keyboard-key"; - version = "0.2.17"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/keyboard-key/-/keyboard-key-0.4.0.tgz"; + sha512 = "2jcD23FzOPaSXqWtfOSCzopkKtxTXUFuHZyVt4aqVRDEjPbkQ/7p37O1WL95xweWTR/9fEPO/gPtv9kOnXrJcA=="; + }; + }; + "@fluentui/merge-styles-8.5.0" = { + name = "_at_fluentui_slash_merge-styles"; + packageName = "@fluentui/merge-styles"; + version = "8.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/keyboard-key/-/keyboard-key-0.2.17.tgz"; - sha512 = "iT1bU56rKrKEOfODoW6fScY11qj3iaYrZ+z11T6fo5+TDm84UGkkXjLXJTE57ZJzg0/gbccHQWYv+chY7bJN8Q=="; + url = "https://registry.npmjs.org/@fluentui/merge-styles/-/merge-styles-8.5.0.tgz"; + sha512 = "+WoaAaoYx/wfkrz1Ag40JqHvDUFfQcg+dQ3jaEOoau16y7EZGIe7oN8WYIXNMgWuMxH7r1QlanFbQZ+ziKjHmw=="; }; }; - "@fluentui/react-7.183.1" = { + "@fluentui/react-8.60.3" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.183.1"; + version = "8.60.3"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.183.1.tgz"; - sha512 = "skyvnVfsy/pJWJf1Tksa2lf+gNHFQFVOwM95Z+or+auGPfdpxKUN0nHbCnqyMLYoKdmKEUyciUzrQ2LxMOcU0A=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-8.60.3.tgz"; + sha512 = "KLxnvgz1+BvP4csqhShrdAxg7I9GXNcrhESgbEUoR5ILeK6O62/q8ElWWQzKqR9WQ6PKeSp9f2S3Ucdfpc6WiA=="; }; }; - "@fluentui/react-focus-7.18.2" = { + "@fluentui/react-focus-8.5.4" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; - version = "7.18.2"; + version = "8.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.5.4.tgz"; + sha512 = "SjCz1IJn1T6a6o6xcaEPd5Hou9B3QbpheHNxKWOJSQHG6wazwnHJRhNyTcgiX5+D1KEbnO757EoyOoxIVsnENQ=="; + }; + }; + "@fluentui/react-hooks-8.5.2" = { + name = "_at_fluentui_slash_react-hooks"; + packageName = "@fluentui/react-hooks"; + version = "8.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.18.2.tgz"; - sha512 = "Pwk5TVIfannsSZI540ytvQxJCFi5Qgp54QqKbouv9+jUTtgiNRh5VcEkkhT+NKmtlAKhwPi77bU8WQRGRPV61w=="; + url = "https://registry.npmjs.org/@fluentui/react-hooks/-/react-hooks-8.5.2.tgz"; + sha512 = "YqyLDa/1SbQSrfGQ+nBUvQYJo2wOWGDAhQbdWTwQGjG7jEmRfmScqMY+KJGjM/Gisn6v8CG5d1duSZLmbm0syA=="; }; }; - "@fluentui/react-window-provider-1.0.2" = { + "@fluentui/react-window-provider-2.2.0" = { name = "_at_fluentui_slash_react-window-provider"; packageName = "@fluentui/react-window-provider"; - version = "1.0.2"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-2.2.0.tgz"; + sha512 = "1iZzfVQHZQn6IJSJD1pxnXi5H8T3vrZYi9aqKyVIPZ12DCTVE2gw8W3mnOjsfVuXMGdv1sA7dgd6v4xi9erBow=="; + }; + }; + "@fluentui/set-version-8.2.0" = { + name = "_at_fluentui_slash_set-version"; + packageName = "@fluentui/set-version"; + version = "8.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/set-version/-/set-version-8.2.0.tgz"; + sha512 = "bqjpfhqaIkBy16vdYzdc7tER9Td7BTcmC+kCXuqkHOQVuG9LJfqVGRV0DA857KLhOxiy0GXwKMeDbNV5jJf6qQ=="; + }; + }; + "@fluentui/style-utilities-8.6.4" = { + name = "_at_fluentui_slash_style-utilities"; + packageName = "@fluentui/style-utilities"; + version = "8.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-1.0.2.tgz"; - sha512 = "fGSgL3Vp/+6t1Ysfz21FWZmqsU+iFVxOigvHnm5uKVyyRPwtaabv/F6kQ2y5isLMI2YmJaUd2i0cDJKu8ggrvw=="; + url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.6.4.tgz"; + sha512 = "jWG5zq7nc37Q6O1LzaoU2U8Ki4Xo5ySm3d5uzefDsEIQpK9E22c1mpUI3hDWwWKILxF3S3dYkHNqbsGH72JYaw=="; }; }; - "@fluentui/theme-1.7.4" = { + "@fluentui/theme-2.6.3" = { name = "_at_fluentui_slash_theme"; packageName = "@fluentui/theme"; - version = "1.7.4"; + version = "2.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/theme/-/theme-1.7.4.tgz"; - sha512 = "o4eo7lstLxxXl1g2RR9yz18Yt8yjQO/LbQuZjsiAfv/4Bf0CRnb+3j1F7gxIdBWAchKj9gzaMpIFijfI98pvYQ=="; + url = "https://registry.npmjs.org/@fluentui/theme/-/theme-2.6.3.tgz"; + sha512 = "fqqRDnbbPjSbY8PdbsSJMYidhFdjdSoYuDab5n8yiePEHyWQ5OcQFkf1j6V7dg+2fZvW3XTWWSQEboQl+kTdNQ=="; + }; + }; + "@fluentui/utilities-8.8.0" = { + name = "_at_fluentui_slash_utilities"; + packageName = "@fluentui/utilities"; + version = "8.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/utilities/-/utilities-8.8.0.tgz"; + sha512 = "IwKN9ZkYMJApzcvJUlJd4ZURJCMwZG8FNsep05GAcDzynZygvH2Y1ECpIFn9VTSsrKxMKYFIQ61Rwg+AW/eBcw=="; }; }; "@gar/promisify-1.1.3" = { @@ -3775,13 +3883,13 @@ let sha512 = "IuR2SB2MnC2ztA/XeTMTfWcA0Wy7ZH5u+nDkDNLAdX+AaSyDnsQS35sCmHqG0VOGTl7rzoyBWLCKGwSJplgtwg=="; }; }; - "@graphql-tools/batch-execute-8.3.1" = { + "@graphql-tools/batch-execute-8.3.2" = { name = "_at_graphql-tools_slash_batch-execute"; packageName = "@graphql-tools/batch-execute"; - version = "8.3.1"; + version = "8.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/batch-execute/-/batch-execute-8.3.1.tgz"; - sha512 = "63kHY8ZdoO5FoeDXYHnAak1R3ysMViMPwWC2XUblFckuVLMUPmB2ONje8rjr2CvzWBHAW8c1Zsex+U3xhKtGIA=="; + url = "https://registry.npmjs.org/@graphql-tools/batch-execute/-/batch-execute-8.3.2.tgz"; + sha512 = "ICWqM+MvEkIPHm18Q0cmkvm134zeQMomBKmTRxyxMNhL/ouz6Nqld52/brSlaHnzA3fczupeRJzZ0YatruGBcQ=="; }; }; "@graphql-tools/delegate-7.1.5" = { @@ -3793,13 +3901,13 @@ let sha512 = "bQu+hDd37e+FZ0CQGEEczmRSfQRnnXeUxI/0miDV+NV/zCbEdIJj5tYFNrKT03W6wgdqx8U06d8L23LxvGri/g=="; }; }; - "@graphql-tools/delegate-8.5.0" = { + "@graphql-tools/delegate-8.5.2" = { name = "_at_graphql-tools_slash_delegate"; packageName = "@graphql-tools/delegate"; - version = "8.5.0"; + version = "8.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-8.5.0.tgz"; - sha512 = "P2LLahWpv8eFrqXQi9v/NDLxLBKAugd3rmB8lxeTnCqma19ZM/VaSpvGAgGyjjHKQe097mAeBEkM/7uYbG/NFg=="; + url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-8.5.2.tgz"; + sha512 = "M7d1jY4orPUC7MBoSKZEP21HTVqVGX+mS0AL6UGxg1L7GCRtaYQeopyKXmnnEmBi5FNZ9KduJgHRtxkS4Hc6uA=="; }; }; "@graphql-tools/graphql-file-loader-6.2.7" = { @@ -3811,22 +3919,22 @@ let sha512 = "5k2SNz0W87tDcymhEMZMkd6/vs6QawDyjQXWtqkuLTBF3vxjxPD1I4dwHoxgWPIjjANhXybvulD7E+St/7s9TQ=="; }; }; - "@graphql-tools/graphql-file-loader-7.3.3" = { + "@graphql-tools/graphql-file-loader-7.3.4" = { name = "_at_graphql-tools_slash_graphql-file-loader"; packageName = "@graphql-tools/graphql-file-loader"; - version = "7.3.3"; + version = "7.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-7.3.3.tgz"; - sha512 = "6kUJZiNpYKVhum9E5wfl5PyLLupEDYdH7c8l6oMrk6c7EPEVs6iSUyB7yQoWrtJccJLULBW2CRQ5IHp5JYK0mA=="; + url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-7.3.4.tgz"; + sha512 = "Q0/YtDq0APR6syRclsQMNguWKRlchd8nFTOpLhfc7Xeiy21VhEEi4Ik+quRySfb7ubDfJGhiUq4MQW43FhWJvg=="; }; }; - "@graphql-tools/import-6.6.5" = { + "@graphql-tools/import-6.6.6" = { name = "_at_graphql-tools_slash_import"; packageName = "@graphql-tools/import"; - version = "6.6.5"; + version = "6.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.6.5.tgz"; - sha512 = "w0/cYuhrr2apn+iGoTToCqt65x2NN2iHQyqRNk/Zw1NJ+e8/C3eKVw0jmW4pYQvSocuPxL4UCSI56SdKO7m3+Q=="; + url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.6.6.tgz"; + sha512 = "a0aVajxqu1MsL8EwavA44Osw20lBOIhq8IM2ZIHFPP62cPAcOB26P+Sq57DHMsSyX5YQ0ab9XPM2o4e1dQhs0w=="; }; }; "@graphql-tools/json-file-loader-6.2.6" = { @@ -3838,13 +3946,13 @@ let sha512 = "CnfwBSY5926zyb6fkDBHnlTblHnHI4hoBALFYXnrg0Ev4yWU8B04DZl/pBRUc459VNgO2x8/mxGIZj2hPJG1EA=="; }; }; - "@graphql-tools/json-file-loader-7.3.3" = { + "@graphql-tools/json-file-loader-7.3.4" = { name = "_at_graphql-tools_slash_json-file-loader"; packageName = "@graphql-tools/json-file-loader"; - version = "7.3.3"; + version = "7.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-7.3.3.tgz"; - sha512 = "CN2Qk9rt+Gepa3rb3X/mpxYA5MIYLwZBPj2Njw6lbZ6AaxG+O1ArDCL5ACoiWiBimn1FCOM778uhRM9znd0b3Q=="; + url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-7.3.4.tgz"; + sha512 = "1AROMFh8Lyorf2gTWXgVaUbU3ic84gzAgpRmJCsCla/Nnvn6JiCs4aWHsalk4ZWVXCaK04c8gk8Px1uNQUj02Q=="; }; }; "@graphql-tools/load-6.2.4" = { @@ -3856,13 +3964,13 @@ let sha512 = "FlQC50VELwRxoWUbJMMMs5gG0Dl8BaQYMrXUHTsxwqR7UmksUYnysC21rdousvs6jVZ7pf4unZfZFtBjz+8Edg=="; }; }; - "@graphql-tools/load-7.5.1" = { + "@graphql-tools/load-7.5.2" = { name = "_at_graphql-tools_slash_load"; packageName = "@graphql-tools/load"; - version = "7.5.1"; + version = "7.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/load/-/load-7.5.1.tgz"; - sha512 = "j9XcLYZPZdl/TzzqA83qveJmwcCxgGizt5L1+C1/Z68brTEmQHLdQCOR3Ma3ewESJt6DU05kSTu2raKaunkjRg=="; + url = "https://registry.npmjs.org/@graphql-tools/load/-/load-7.5.2.tgz"; + sha512 = "URPqVP77mYxdZxT895DzrWf2C23S3yC/oAmXD4D4YlxR5eVVH/fxu0aZR78WcEKF331fWSiFwWy9j7BZWvkj7g=="; }; }; "@graphql-tools/merge-6.2.17" = { @@ -3874,13 +3982,13 @@ let sha512 = "G5YrOew39fZf16VIrc49q3c8dBqQDD0ax5LYPiNja00xsXDi0T9zsEWVt06ApjtSdSF6HDddlu5S12QjeN8Tow=="; }; }; - "@graphql-tools/merge-8.2.2" = { + "@graphql-tools/merge-8.2.3" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "8.2.2"; + version = "8.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.2.2.tgz"; - sha512 = "2DyqhIOMUMKbCPqo8p6xSdll2OBcBxGdOrxlJJlFQvinsSaYqp/ct3dhAxNtzaIcvSVgXvttQqfD7O2ziFtE7Q=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.2.3.tgz"; + sha512 = "XCSmL6/Xg8259OTWNp69B57CPWiVL69kB7pposFrufG/zaAlI9BS68dgzrxmmSqZV5ZHU4r/6Tbf6fwnEJGiSw=="; }; }; "@graphql-tools/schema-7.1.5" = { @@ -3892,13 +4000,13 @@ let sha512 = "uyn3HSNSckf4mvQSq0Q07CPaVZMNFCYEVxroApOaw802m9DcZPgf9XVPy/gda5GWj9AhbijfRYVTZQgHnJ4CXA=="; }; }; - "@graphql-tools/schema-8.3.1" = { + "@graphql-tools/schema-8.3.2" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; - version = "8.3.1"; + version = "8.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.3.1.tgz"; - sha512 = "3R0AJFe715p4GwF067G5i0KCr/XIdvSfDLvTLEiTDQ8V/hwbOHEKHKWlEBHGRQwkG5lwFQlW1aOn7VnlPERnWQ=="; + url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.3.2.tgz"; + sha512 = "77feSmIuHdoxMXRbRyxE8rEziKesd/AcqKV6fmxe7Zt+PgIQITxNDew2XJJg7qFTMNM43W77Ia6njUSBxNOkwg=="; }; }; "@graphql-tools/url-loader-6.10.1" = { @@ -3910,13 +4018,13 @@ let sha512 = "DSDrbhQIv7fheQ60pfDpGD256ixUQIR6Hhf9Z5bRjVkXOCvO5XrkwoWLiU7iHL81GB1r0Ba31bf+sl+D4nyyfw=="; }; }; - "@graphql-tools/url-loader-7.7.1" = { + "@graphql-tools/url-loader-7.9.1" = { name = "_at_graphql-tools_slash_url-loader"; packageName = "@graphql-tools/url-loader"; - version = "7.7.1"; + version = "7.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-7.7.1.tgz"; - sha512 = "K/5amdeHtKYI976HVd/AXdSNvLL7vx5QVjMlwN0OHeYyxSgC+UOH+KkS7cshYgL13SekGu0Mxbg9ABfgQ34ECA=="; + url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-7.9.1.tgz"; + sha512 = "UYKc0f8jw+MODDb79XKOG8wyvRCG/7KBYtRUfUKed4LBjftjZfF5VovAbF3axiTuzt2FSyPRu8YMEQ7kypkc8g=="; }; }; "@graphql-tools/utils-6.2.4" = { @@ -3946,13 +4054,13 @@ let sha512 = "gzkavMOgbhnwkHJYg32Adv6f+LxjbQmmbdD5Hty0+CWxvaiuJq+nU6tzb/7VSU4cwhbNLx/lGu2jbCPEW1McZQ=="; }; }; - "@graphql-tools/utils-8.6.1" = { + "@graphql-tools/utils-8.6.2" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "8.6.1"; + version = "8.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.6.1.tgz"; - sha512 = "uxcfHCocp4ENoIiovPxUWZEHOnbXqj3ekWc0rm7fUhW93a1xheARNHcNKhwMTR+UKXVJbTFQdGI1Rl5XdyvDBg=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.6.2.tgz"; + sha512 = "x1DG0cJgpJtImUlNE780B/dfp8pxvVxOD6UeykFH5rHes26S4kGokbgU8F1IgrJ1vAPm/OVBHtd2kicTsPfwdA=="; }; }; "@graphql-tools/wrap-7.0.8" = { @@ -3964,13 +4072,13 @@ let sha512 = "1NDUymworsOlb53Qfh7fonDi2STvqCtbeE68ntKY9K/Ju/be2ZNxrFSbrBHwnxWcN9PjISNnLcAyJ1L5tCUyhg=="; }; }; - "@graphql-tools/wrap-8.4.0" = { + "@graphql-tools/wrap-8.4.3" = { name = "_at_graphql-tools_slash_wrap"; packageName = "@graphql-tools/wrap"; - version = "8.4.0"; + version = "8.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-8.4.0.tgz"; - sha512 = "fPB3+UnxLIPWDfMvAfBQnGmm8rrejeQjmCy7h9avWHBbkEELcvtrSWnKAvoKowe+WR9PVDM15XQ/PQvcddV0kQ=="; + url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-8.4.3.tgz"; + sha512 = "2bd3GtlqV72idEphLTM8SRiSxEDrMPGE556faW8N5Q2qK7qlCEu9AQK0HNKWKdtEPTHqahndZtIPcdpNN6xGig=="; }; }; "@grpc/grpc-js-1.4.4" = { @@ -3982,24 +4090,6 @@ let sha512 = "a6222b7Dl6fIlMgzVl7e+NiRoLiZFbpcwvBH2Oli56Bn7W4/3Ld+86hK4ffPn5rx2DlDidmIcvIJiOQXyhv9gA=="; }; }; - "@grpc/grpc-js-1.5.1" = { - name = "_at_grpc_slash_grpc-js"; - packageName = "@grpc/grpc-js"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.5.1.tgz"; - sha512 = "ItOqQ4ff7JrR9W6KDQm+LdsVjuZtV7Qq64Oy3Hjx8ZPBDDwBx7rD8hOL0Vnde0RbnsqLG86WOgF+tQDzf/nSzQ=="; - }; - }; - "@grpc/grpc-js-1.5.3" = { - name = "_at_grpc_slash_grpc-js"; - packageName = "@grpc/grpc-js"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.5.3.tgz"; - sha512 = "q0xgaZ3ymUM+ZOhe1hdocVSdKHCnJ6llLSXcP+MqMXMyYPUZ3mzQOCxZ3Zkg+QZ7sZ950sn7hvueQrIJZumPZg=="; - }; - }; "@grpc/grpc-js-1.5.4" = { name = "_at_grpc_slash_grpc-js"; packageName = "@grpc/grpc-js"; @@ -4018,6 +4108,15 @@ let sha512 = "FTd27ItHlsSG/7hp62xgI9YnqSwRbHRSVmDVR8DwOoC+6t8JhHRXe2JL0U8N9GLc0jS0HrtEbO/KP5+G0ebjLQ=="; }; }; + "@grpc/grpc-js-1.5.7" = { + name = "_at_grpc_slash_grpc-js"; + packageName = "@grpc/grpc-js"; + version = "1.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.5.7.tgz"; + sha512 = "RAlSbZ9LXo0wNoHKeUlwP9dtGgVBDUbnBKFpfAv5iSqMG4qWz9um2yLH215+Wow1I48etIa1QMS+WAGmsE/7HQ=="; + }; + }; "@grpc/proto-loader-0.6.6" = { name = "_at_grpc_slash_proto-loader"; packageName = "@grpc/proto-loader"; @@ -4036,13 +4135,13 @@ let sha512 = "UlcCS8VbsU9d3XTXGiEVFonN7hXk+oMXZtoHHG2oSA1/GcDP1q6OUgs20PzHDGizzyi8ufGSUDlk3O2NyY7leg=="; }; }; - "@gulp-sourcemaps/identity-map-1.0.2" = { + "@gulp-sourcemaps/identity-map-2.0.1" = { name = "_at_gulp-sourcemaps_slash_identity-map"; packageName = "@gulp-sourcemaps/identity-map"; - version = "1.0.2"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-1.0.2.tgz"; - sha512 = "ciiioYMLdo16ShmfHBXJBOFm3xPC4AuwO4xeRpFeHz7WK9PYsWCmigagG2XyzZpubK4a3qNKoUBDhbzHfa50LQ=="; + url = "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-2.0.1.tgz"; + sha512 = "Tb+nSISZku+eQ4X1lAkevcQa+jknn/OVUgZ3XCxEKIsLsqYuPoJwJOPQeaOk75X3WPftb29GWY1eqE7GLsXb1Q=="; }; }; "@gulp-sourcemaps/map-sources-1.0.0" = { @@ -4063,6 +4162,33 @@ let sha512 = "maIyMJtYjA5e/R9nyA22Qd7Yw73MBSxClJvle0a8XWAS/5l6shc/OFpQqrmwMy4IXUCmywJ9ER0gOGz/YA720w=="; }; }; + "@hapi/address-2.1.4" = { + name = "_at_hapi_slash_address"; + packageName = "@hapi/address"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@hapi/address/-/address-2.1.4.tgz"; + sha512 = "QD1PhQk+s31P1ixsX0H0Suoupp3VMXzIVMSwobR3F3MSUO2YCV0B7xqLcUw/Bh8yuvd3LhpyqLQWTNcRmp6IdQ=="; + }; + }; + "@hapi/bourne-1.3.2" = { + name = "_at_hapi_slash_bourne"; + packageName = "@hapi/bourne"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@hapi/bourne/-/bourne-1.3.2.tgz"; + sha512 = "1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA=="; + }; + }; + "@hapi/hoek-8.5.1" = { + name = "_at_hapi_slash_hoek"; + packageName = "@hapi/hoek"; + version = "8.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.1.tgz"; + sha512 = "yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow=="; + }; + }; "@hapi/hoek-9.2.1" = { name = "_at_hapi_slash_hoek"; packageName = "@hapi/hoek"; @@ -4072,6 +4198,24 @@ let sha512 = "gfta+H8aziZsm8pZa0vj04KO6biEiisppNgA1kbJvFrrWu9Vm7eaUEy76DIxsuTaWvti5fkJVhllWc6ZTE+Mdw=="; }; }; + "@hapi/joi-15.1.1" = { + name = "_at_hapi_slash_joi"; + packageName = "@hapi/joi"; + version = "15.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@hapi/joi/-/joi-15.1.1.tgz"; + sha512 = "entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ=="; + }; + }; + "@hapi/topo-3.1.6" = { + name = "_at_hapi_slash_topo"; + packageName = "@hapi/topo"; + version = "3.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.6.tgz"; + sha512 = "tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ=="; + }; + }; "@hapi/topo-5.1.0" = { name = "_at_hapi_slash_topo"; packageName = "@hapi/topo"; @@ -4108,13 +4252,13 @@ let sha512 = "FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg=="; }; }; - "@humanwhocodes/config-array-0.9.3" = { + "@humanwhocodes/config-array-0.9.5" = { name = "_at_humanwhocodes_slash_config-array"; packageName = "@humanwhocodes/config-array"; - version = "0.9.3"; + version = "0.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.3.tgz"; - sha512 = "3xSMlXHh03hCcCmFc0rbKp3Ivt2PFEJnQUJDDMTJQ2wkECZWdq4GePs2ctc5H8zV+cHPaq8k2vU8mrQjA6iHdQ=="; + url = "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz"; + sha512 = "ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw=="; }; }; "@humanwhocodes/object-schema-1.2.1" = { @@ -4216,6 +4360,15 @@ let sha512 = "trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg=="; }; }; + "@intervolga/optimize-cssnano-plugin-1.0.6" = { + name = "_at_intervolga_slash_optimize-cssnano-plugin"; + packageName = "@intervolga/optimize-cssnano-plugin"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@intervolga/optimize-cssnano-plugin/-/optimize-cssnano-plugin-1.0.6.tgz"; + sha512 = "zN69TnSr0viRSU6cEDIcuPcP67QcpQ6uHACg58FiN9PDrU6SLyGW3MR4tiISbYxy1kDWAVPwD+XwQTWE5cigAA=="; + }; + }; "@ionic/cli-framework-3.0.6" = { name = "_at_ionic_slash_cli-framework"; packageName = "@ionic/cli-framework"; @@ -4513,22 +4666,22 @@ let sha512 = "4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg=="; }; }; - "@jsii/check-node-1.54.0" = { + "@jsii/check-node-1.55.0" = { name = "_at_jsii_slash_check-node"; packageName = "@jsii/check-node"; - version = "1.54.0"; + version = "1.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.54.0.tgz"; - sha512 = "pogNR1vgiXgBK2DQF+RsCnJQ9QPe+y7lyoRlsTtUplIFB6ryWnSsmCyzkInSVoKAKCo5CHkuDy190MbYL4Ns4Q=="; + url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.55.0.tgz"; + sha512 = "vfBW/3ptY3emiBVrwk7ySwGyzOvwLxb66FMNTzyslYegH9RvIwE+UY8kC87zscuZSDOCwINwgD0KdqrrfnR5yg=="; }; }; - "@jsii/spec-1.54.0" = { + "@jsii/spec-1.55.0" = { name = "_at_jsii_slash_spec"; packageName = "@jsii/spec"; - version = "1.54.0"; + version = "1.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.54.0.tgz"; - sha512 = "IOspxWPC26+Re6DNJvaxCEkG1BYByiGSPlRxQpIpts+Hx2EZgAvuG+8rQoryNt7JqaAKpcJ6W3OdRmSw3x5Yrg=="; + url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.55.0.tgz"; + sha512 = "MsmAmi9+2s8p5jSypYFDTufkO2iAUWK7Ngq+btGDM6bMyQgqInMKNQcPcZAgWuwUCOU0ne/oYMVIbCR2njjAGA=="; }; }; "@kwsites/file-exists-1.1.1" = { @@ -5386,6 +5539,15 @@ let sha512 = "7AQsO0hMmpqDledV7AhBuSYqYPFsKP9PaltMecX9nlnsyFxqtsqUg9/pvB2L/jxvskrDrNkdKYz2KTbQznCtng=="; }; }; + "@mdi/font-6.5.95" = { + name = "_at_mdi_slash_font"; + packageName = "@mdi/font"; + version = "6.5.95"; + src = fetchurl { + url = "https://registry.npmjs.org/@mdi/font/-/font-6.5.95.tgz"; + sha512 = "ES5rj6J39FUkHe/b3C9SJs8bqIungYhuU7rBINTBaHOv/Ce4RCb3Gw08CZVl32W33UEkgRkzyWaIedV4at+QHg=="; + }; + }; "@mdn/browser-compat-data-4.1.6" = { name = "_at_mdn_slash_browser-compat-data"; packageName = "@mdn/browser-compat-data"; @@ -5602,13 +5764,13 @@ let sha512 = "BTpWy1e+FxN82RnLz4x1+JcEewVdfmUhV1C6/XYD5AjS7PQp9QFF7K8bCD6gzPTr2l+prvqOyVueQhFJxB1vfg=="; }; }; - "@nestjs/schematics-8.0.6" = { + "@nestjs/schematics-8.0.8" = { name = "_at_nestjs_slash_schematics"; packageName = "@nestjs/schematics"; - version = "8.0.6"; + version = "8.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-8.0.6.tgz"; - sha512 = "IgWuplXg3I+2lzQqy5jR45C+EpBiOuPQwh8zWCjlQDYU9/X/2a8B8byJXw3nuguZS/huuuXx3ZhfHJKQYk6uIA=="; + url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-8.0.8.tgz"; + sha512 = "xIIb5YnMQN/OJQ68+MCapy2bXvTxSWgINoqQbyZWkLL/yTIuROvZCdtV850NPGyr7f7l93VBP0ZPitbFIexy3Q=="; }; }; "@netflix/nerror-1.1.3" = { @@ -5674,6 +5836,132 @@ let sha512 = "tUGLGj3fTgOjWwhp9uK6M+LUb3rxIrU61DbA0fVpANCEeqk5UNJpje4vOag9dWmJS7hn/ONcDK7dslHLyOQUIQ=="; }; }; + "@node-rs/crc32-1.5.0" = { + name = "_at_node-rs_slash_crc32"; + packageName = "@node-rs/crc32"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32/-/crc32-1.5.0.tgz"; + sha512 = "TLVm7FR1QAjXlXkss3HSx3BG/CvVwl4NVEL/qLAgossq4FQsybkvt0RCISrkI3j5fI30gPaGI/qwHn8xkLctow=="; + }; + }; + "@node-rs/crc32-android-arm-eabi-1.5.0" = { + name = "_at_node-rs_slash_crc32-android-arm-eabi"; + packageName = "@node-rs/crc32-android-arm-eabi"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-android-arm-eabi/-/crc32-android-arm-eabi-1.5.0.tgz"; + sha512 = "Si3YKPAkT9IW2ZJfmFQg+9KJWDNgykk1vgybYljR3TJg9WzlrJQvPmJFsZ/Ci+79Htsb8a4auavBbmIkj+JpVQ=="; + }; + }; + "@node-rs/crc32-android-arm64-1.5.0" = { + name = "_at_node-rs_slash_crc32-android-arm64"; + packageName = "@node-rs/crc32-android-arm64"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-android-arm64/-/crc32-android-arm64-1.5.0.tgz"; + sha512 = "2uJD7muLg6wXjPhcuuS+HZBgXGX8HsxJzDjVoe51uAoGx+Az0hyH2I6p/ObOIYzcW4xFML0rzlYM9XkMglJhfw=="; + }; + }; + "@node-rs/crc32-darwin-arm64-1.5.0" = { + name = "_at_node-rs_slash_crc32-darwin-arm64"; + packageName = "@node-rs/crc32-darwin-arm64"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-darwin-arm64/-/crc32-darwin-arm64-1.5.0.tgz"; + sha512 = "E3dWA/fKu7FeDGBYB20/YEz28Fw/8sj4iuXgE4n1aoh8994AdbXdsJlmNip6/AkcEynC8Q9RdPS4HdfM7kBPiw=="; + }; + }; + "@node-rs/crc32-darwin-x64-1.5.0" = { + name = "_at_node-rs_slash_crc32-darwin-x64"; + packageName = "@node-rs/crc32-darwin-x64"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-darwin-x64/-/crc32-darwin-x64-1.5.0.tgz"; + sha512 = "YjQ6y/3L1D2kOrNguB42sPf6HdEkqXcL2jxJ41QOfuIRV18lp7/5sM9OWRdjmLpQUUvmpqSSWxZFQ/2P/35EXw=="; + }; + }; + "@node-rs/crc32-freebsd-x64-1.5.0" = { + name = "_at_node-rs_slash_crc32-freebsd-x64"; + packageName = "@node-rs/crc32-freebsd-x64"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-freebsd-x64/-/crc32-freebsd-x64-1.5.0.tgz"; + sha512 = "K+HfvordJrw0xkht9wElxIHGDm5qodOVzNa95I7ZW8BktHWC2QmPkcYRotrDnZLaOs8NfA0xWGiqp/ncAJ3XOw=="; + }; + }; + "@node-rs/crc32-linux-arm-gnueabihf-1.5.0" = { + name = "_at_node-rs_slash_crc32-linux-arm-gnueabihf"; + packageName = "@node-rs/crc32-linux-arm-gnueabihf"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-linux-arm-gnueabihf/-/crc32-linux-arm-gnueabihf-1.5.0.tgz"; + sha512 = "MFwJlcIAmgtnWAluthAY2gyTbKIu5/+6PUSlOZ4xlSZIddb3ra3M/AQ0BkDSvEoDeQQ5ZdkcnVWzpqoCdUOe4Q=="; + }; + }; + "@node-rs/crc32-linux-arm64-gnu-1.5.0" = { + name = "_at_node-rs_slash_crc32-linux-arm64-gnu"; + packageName = "@node-rs/crc32-linux-arm64-gnu"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-linux-arm64-gnu/-/crc32-linux-arm64-gnu-1.5.0.tgz"; + sha512 = "7JYsJXRUE6yrK/mt7uLX91ARLS3HOCggTSGD3Kw52lhJRPXTyJVVIhuLj8/neW8ENTgH3zgpQdeId0sKQtKrDg=="; + }; + }; + "@node-rs/crc32-linux-arm64-musl-1.5.0" = { + name = "_at_node-rs_slash_crc32-linux-arm64-musl"; + packageName = "@node-rs/crc32-linux-arm64-musl"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-linux-arm64-musl/-/crc32-linux-arm64-musl-1.5.0.tgz"; + sha512 = "irOtNHrizI8toVCX92o/3FIIfz4O+Z5qiSlIwH3PxsOoak0mz6uEInYwPVnDDKfAYzCUA0oxcGV2QIR1uYpCKQ=="; + }; + }; + "@node-rs/crc32-linux-x64-gnu-1.5.0" = { + name = "_at_node-rs_slash_crc32-linux-x64-gnu"; + packageName = "@node-rs/crc32-linux-x64-gnu"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-linux-x64-gnu/-/crc32-linux-x64-gnu-1.5.0.tgz"; + sha512 = "KOevSXLbgs2htznP8jlsN6tZ4kmpGloBj00lo4X4H4Lm6eKeWyG9txbCGD0yK4ZX/XhrL6Qs4VIMCaVFpxFIsw=="; + }; + }; + "@node-rs/crc32-linux-x64-musl-1.5.0" = { + name = "_at_node-rs_slash_crc32-linux-x64-musl"; + packageName = "@node-rs/crc32-linux-x64-musl"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-linux-x64-musl/-/crc32-linux-x64-musl-1.5.0.tgz"; + sha512 = "e6ivD6MWVMp/FP6VVq3EBjiBXKN/qBsTn8bOsHtIf+Et6dEkITbEk26m5+w9TFHIHKJGvwytH7+RigK7N7o5VQ=="; + }; + }; + "@node-rs/crc32-win32-arm64-msvc-1.5.0" = { + name = "_at_node-rs_slash_crc32-win32-arm64-msvc"; + packageName = "@node-rs/crc32-win32-arm64-msvc"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-win32-arm64-msvc/-/crc32-win32-arm64-msvc-1.5.0.tgz"; + sha512 = "PTvfUb08MAdQ0hab5OxXBauPocP09SG2rShRjwtmyRnze+Nd5JHJcsj5O0WhX/DCu8acK1sS0Q0Np3b1lIbwkg=="; + }; + }; + "@node-rs/crc32-win32-ia32-msvc-1.5.0" = { + name = "_at_node-rs_slash_crc32-win32-ia32-msvc"; + packageName = "@node-rs/crc32-win32-ia32-msvc"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-win32-ia32-msvc/-/crc32-win32-ia32-msvc-1.5.0.tgz"; + sha512 = "+fUiXIUddPgoxPcBA4lpG7fQQgJGEkinnS1ne3+pySu1Z2Ej4vJFS5aJyKc56+1IV9ztrXo2H+b3r0IdnLvy7w=="; + }; + }; + "@node-rs/crc32-win32-x64-msvc-1.5.0" = { + name = "_at_node-rs_slash_crc32-win32-x64-msvc"; + packageName = "@node-rs/crc32-win32-x64-msvc"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-win32-x64-msvc/-/crc32-win32-x64-msvc-1.5.0.tgz"; + sha512 = "FvgItAuN6eRHZDAPVlBZbzQjiRO0DFFFLgy2KFUjx+vLx20Auf5Hi0/D+dFLmH9jdESaoZqwZC5FpB7nfit1lQ=="; + }; + }; "@nodelib/fs.scandir-2.1.5" = { name = "_at_nodelib_slash_fs.scandir"; packageName = "@nodelib/fs.scandir"; @@ -5764,13 +6052,13 @@ let sha512 = "9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw=="; }; }; - "@npmcli/map-workspaces-2.0.1" = { + "@npmcli/map-workspaces-2.0.2" = { name = "_at_npmcli_slash_map-workspaces"; packageName = "@npmcli/map-workspaces"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/map-workspaces/-/map-workspaces-2.0.1.tgz"; - sha512 = "awwkB/tSWWaCD8F0IbawBdmoPFlbXMaEPN9LyTuJcyJz404/QhB4B/vhQntpk6uxOAkM+bxR7qWMJghYg0tcYQ=="; + url = "https://registry.npmjs.org/@npmcli/map-workspaces/-/map-workspaces-2.0.2.tgz"; + sha512 = "ED54EslGsHFWBPN5x8JAOszuWywuoXYSi9E3HQRsgVkWnqsdTBJDSM4IFMRwmmBUbCHAxmP3wGLu1WMm4fhrOw=="; }; }; "@npmcli/metavuln-calculator-2.0.0" = { @@ -5845,6 +6133,15 @@ let sha512 = "fSan/Pu11xS/TdaTpTB0MRn9guwGU8dye+x56mEVgBEd/QsybBbYcAL0phPXi8SGWFEChkQd6M9qL4y6VOpFig=="; }; }; + "@npmcli/run-script-3.0.1" = { + name = "_at_npmcli_slash_run-script"; + packageName = "@npmcli/run-script"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-3.0.1.tgz"; + sha512 = "o2fkld5hYwu9sKYzoXTpqEocMnDLaigobaPzLaGB63k/ExmLBTaB+KpfKlpcIePPnuP8RFR+0GDI4KopJCM6Xg=="; + }; + }; "@oclif/command-1.8.0" = { name = "_at_oclif_slash_command"; packageName = "@oclif/command"; @@ -5926,13 +6223,13 @@ let sha512 = "Ups2dShK52xXa8w6iBWLgcjPJWjais6KPJQq3gQ/88AY6BXoTX+MIGFPrWQO1KLMiQfoTpcLnUwloN4brrVUHw=="; }; }; - "@oclif/parser-3.8.6" = { + "@oclif/parser-3.8.7" = { name = "_at_oclif_slash_parser"; packageName = "@oclif/parser"; - version = "3.8.6"; + version = "3.8.7"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.6.tgz"; - sha512 = "tXb0NKgSgNxmf6baN6naK+CCwOueaFk93FG9u202U7mTBHUKsioOUlw1SG/iPi9aJM3WE4pHLXmty59pci0OEw=="; + url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.7.tgz"; + sha512 = "b11xBmIUK+LuuwVGJpFs4LwQN2xj2cBWj2c4z1FtiXGrJ85h9xV6q+k136Hw0tGg1jQoRXuvuBnqQ7es7vO9/Q=="; }; }; "@oclif/plugin-autocomplete-0.1.5" = { @@ -6070,13 +6367,13 @@ let sha512 = "r+fArdP5+TG6l1Rv/C9hVoty6tldw6cE2pRHNGmFPdyfrc696R6JjrQ3d7HdVqGwuzfyrcaLAKD7K8TX8aehUQ=="; }; }; - "@octokit/plugin-throttling-3.5.2" = { + "@octokit/plugin-throttling-3.6.1" = { name = "_at_octokit_slash_plugin-throttling"; packageName = "@octokit/plugin-throttling"; - version = "3.5.2"; + version = "3.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-throttling/-/plugin-throttling-3.5.2.tgz"; - sha512 = "Eu7kfJxU8vmHqWGNszWpg+GVp2tnAfax3XQV5CkYPEE69C+KvInJXW9WajgSeW+cxYe0UVdouzCtcreGNuJo7A=="; + url = "https://registry.npmjs.org/@octokit/plugin-throttling/-/plugin-throttling-3.6.1.tgz"; + sha512 = "T5DOcDQP0K/Ng5pnOEqCHDFojsftYL5o91MNbbR3nj1yAOACoGj3wDYCx0+5yJkbvRjYUdU0GsUt5/wYBba1cA=="; }; }; "@octokit/request-5.6.3" = { @@ -6160,328 +6457,400 @@ let sha512 = "7XU1sfQ8uCVcXLxtAHA8r3qaLJ2oq7sKtEwzZhzuEXqYmjW+n+J4yM3kNo0HQo3Xp1eUe47UM6Wy6yuAvIyllg=="; }; }; - "@ot-builder/bin-composite-types-1.3.3" = { + "@ot-builder/bin-composite-types-1.4.0" = { name = "_at_ot-builder_slash_bin-composite-types"; packageName = "@ot-builder/bin-composite-types"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.3.3.tgz"; - sha512 = "E0l5ixtUowsGzGDP++wMQz64rm8IVCvcIz5NKHtOhs1RIzWT58O5EybSxGBvVBstP2jprMsiGCxjZJ9rhHmrqg=="; + url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.4.0.tgz"; + sha512 = "OzEsssOyEKy1setspPKun8E6tlDpFguLQwCAN1iK9HsrJwgK1lqcwA+PDUxwEIcKj6zaSDI9fb53v6WnsSSf5w=="; }; }; - "@ot-builder/bin-util-1.3.3" = { + "@ot-builder/bin-util-1.4.0" = { name = "_at_ot-builder_slash_bin-util"; packageName = "@ot-builder/bin-util"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.3.3.tgz"; - sha512 = "76pe9Wz431PyOek445P+j/CwcRJaIZqItLL+oe/HAsWNLeAudh/GF1NdK6jKrjJsGa1sGbJUWuGfklpvY9IoBA=="; + url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.4.0.tgz"; + sha512 = "5OMGopgGimoKoHjag2YtPeAyGp3JzMaclzoh4Npelj1hNLebWfdmcKdE3zcixk5eMK2KTr1aKZMCvbbIPhUHFw=="; }; }; - "@ot-builder/cli-help-shower-1.3.3" = { + "@ot-builder/cli-help-shower-1.4.0" = { name = "_at_ot-builder_slash_cli-help-shower"; packageName = "@ot-builder/cli-help-shower"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.3.3.tgz"; - sha512 = "Judhkaz9m8dsjz/xESy3WJY7xmcnjD40A51Mg8H+EcA+Zyl2PsRguGjeYK5GP0YZpCDq73cPvt9IqXbU74HDKA=="; + url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.4.0.tgz"; + sha512 = "1tPeg1TGW1EvJhseA0J12tfQhz1R+YocU0/9HpdUiw2Ny9f8KnY/Z4jM+6KrNXPBlqJf3U7h5D/Mqaa+8I6ROw=="; }; }; - "@ot-builder/cli-proc-1.3.3" = { + "@ot-builder/cli-proc-1.4.0" = { name = "_at_ot-builder_slash_cli-proc"; packageName = "@ot-builder/cli-proc"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.3.3.tgz"; - sha512 = "Afd6KU7iarOt8OJYJGWMU9tR2Hm4TCcvRHTq2kJns7rn7leJnJFvteRPLZwBFGIc0qlkeJ/w7uF0YBnnlSLWqw=="; + url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.4.0.tgz"; + sha512 = "IiUQNzhV4qWix6cG2gUjyJ0DEiphgOp4sFCNssMy5so1J1635qTYmkodTWgynVKQ31qCiamtS5+WMtNIwjlodg=="; }; }; - "@ot-builder/cli-shared-1.3.3" = { + "@ot-builder/cli-shared-1.4.0" = { name = "_at_ot-builder_slash_cli-shared"; packageName = "@ot-builder/cli-shared"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.3.3.tgz"; - sha512 = "9isYiHmyRNDBhU+Zg55DcHFn/9uzD8O46r3+6BPO8X8YWXp6cOpEKzhgf3yfzCcJxplGrOKoUTR2PWj3TIaO1A=="; + url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.4.0.tgz"; + sha512 = "PhYzNdTC5rTpwkT0PFmiWHVkJZBHZN82HPAtsEHyL3nPKK3ygxReNo1FYVQ5DfO9PJE1NxYKv9AqrMAjL1IhNQ=="; }; }; - "@ot-builder/common-impl-1.3.3" = { + "@ot-builder/common-impl-1.4.0" = { name = "_at_ot-builder_slash_common-impl"; packageName = "@ot-builder/common-impl"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.3.3.tgz"; - sha512 = "+ijxOzqDER1qC1uC9JwIo5xyoHPB4vdY1YMvqZD+6JLO7AkiUjqqJlihnp1Xq7s0+WpySru45P+2S+ZI6J4X8g=="; + url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.4.0.tgz"; + sha512 = "tK6UV2dEkWi4cj7v0miMVhGuHOhcAOoqNkzWoyNgbqevzvftvX+FR2TxDrRgDJ00928yaSpxs5Luk+nLZetDwA=="; }; }; - "@ot-builder/errors-1.3.3" = { + "@ot-builder/errors-1.4.0" = { name = "_at_ot-builder_slash_errors"; packageName = "@ot-builder/errors"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.3.3.tgz"; - sha512 = "i+i1/NFGysYbDeFSwikmbq/HLfpgJ7vXTviJMnZn1/JIYXscfrw01lqYpCnAmKrUXSbYqOc6pKWycS0IIzYEsA=="; + url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.4.0.tgz"; + sha512 = "DriKgSnAXxXFynOZHABycRdd42xLc7O45TGusTIo5r9HE8oF24IadBch1MWxQVuJtfakIcjy3lgIYmAjTkxzfw=="; }; }; - "@ot-builder/io-bin-cff-1.3.3" = { + "@ot-builder/io-bin-cff-1.4.0" = { name = "_at_ot-builder_slash_io-bin-cff"; packageName = "@ot-builder/io-bin-cff"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.3.3.tgz"; - sha512 = "qcqWuo2WtR+MCFsTS1a0ieLH8+0KUaqpkXbhVha5y1eeKRIYsPaLS5Uj5IAApuLX6F6eZgaKiZkR7CqeBMwIGw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.4.0.tgz"; + sha512 = "4qbs6oCwxdUFJYfnHgoyGRbRmH0if8XfIIbcpqfxaXOdNCI2tE+t49svUNmwwzx/tr3TvGH5Q98fvJghbkBtpg=="; }; }; - "@ot-builder/io-bin-encoding-1.3.3" = { + "@ot-builder/io-bin-encoding-1.4.0" = { name = "_at_ot-builder_slash_io-bin-encoding"; packageName = "@ot-builder/io-bin-encoding"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.3.3.tgz"; - sha512 = "fE+RI5fc1FqXr8q96Ne6x12UStz2m/RjS0PbKO9X5/lxg0JaTKHdtJ65M6RX1kxLUO783P1NlibLliiuXWTg4A=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.4.0.tgz"; + sha512 = "7RWM4N5/TjIflBJ5i/Gvbis2A9yAnVPdS/MGJTbgfLQkRKaZPajpf3JlIiV7OSnixm89i3wmspHVeadueqDpMQ=="; }; }; - "@ot-builder/io-bin-ext-private-1.3.3" = { + "@ot-builder/io-bin-ext-private-1.4.0" = { name = "_at_ot-builder_slash_io-bin-ext-private"; packageName = "@ot-builder/io-bin-ext-private"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.3.3.tgz"; - sha512 = "CyLwG038inIozQtn4bWclc13EWynWALO4LGPcgLMRmD1UsS4LbMRuoGJ02p70+uxsKLaHgA2RjC63g02IbIjmw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.4.0.tgz"; + sha512 = "amQJaRUMhgun9MzhJQkfkwH+P3RidMePeeBcMCexgMweouCcKMuAvju6rZsysybad3V/BdCwEap3wjiqkPQuWQ=="; }; }; - "@ot-builder/io-bin-font-1.3.3" = { + "@ot-builder/io-bin-font-1.4.0" = { name = "_at_ot-builder_slash_io-bin-font"; packageName = "@ot-builder/io-bin-font"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.3.3.tgz"; - sha512 = "b3aHYfGAwJShZe9mmZAJXFXpklZspUBjf69FuujkbA5teQl7w6GdwXOiwhavtsNwHuNC2We7Oh9wp1vnLSceXA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.4.0.tgz"; + sha512 = "sJ+rMKLH63H6spdsaSdTgYmFBDDoMy22YCINtOEQRmQgbV9nuiElsJr8LSA6LlXN5joQU3y12D2oA2m044y0Uw=="; }; }; - "@ot-builder/io-bin-glyph-store-1.3.3" = { + "@ot-builder/io-bin-glyph-store-1.4.0" = { name = "_at_ot-builder_slash_io-bin-glyph-store"; packageName = "@ot-builder/io-bin-glyph-store"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.3.3.tgz"; - sha512 = "yJPth9RyOLvyO/wGm+axfBSOPUqkgiVUeOSMSpLHM+ujhrZXW0OW9Xbxij+9QLsZrxI9mpEWkdWygWWBUceD/Q=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.4.0.tgz"; + sha512 = "NiQOkjDBQ8SLdX9vVu/9/7/IOowDGEBT/dkM3rzAOGJEj/DxRcWc5uR1z3nE2m/DaGWkTfigV4yk+HO+DQnoog=="; }; }; - "@ot-builder/io-bin-layout-1.3.3" = { + "@ot-builder/io-bin-layout-1.4.0" = { name = "_at_ot-builder_slash_io-bin-layout"; packageName = "@ot-builder/io-bin-layout"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.3.3.tgz"; - sha512 = "8fnXYL73O7GsvrQNqDtzbzChGVbyzH6J1a04I+M0H+BUW6u0XY0FJkUtfF68xzju4eyrkOZc/ElDbXouADKWug=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.4.0.tgz"; + sha512 = "rMpXHBYc7rft8HohcZw7OEs1FLphxbQ3UCgltB5PGvBZH7R2nfaYwdzXfXdStHJM0oiI3nx+C7VEl26hAqM6DA=="; }; }; - "@ot-builder/io-bin-metadata-1.3.3" = { + "@ot-builder/io-bin-metadata-1.4.0" = { name = "_at_ot-builder_slash_io-bin-metadata"; packageName = "@ot-builder/io-bin-metadata"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.3.3.tgz"; - sha512 = "onYKN6OrUBclDaZiyhXZhTcSf+KfvqW9lwsEaKyYTh0ZOZ/ButSvwxNtrMjzekGFzK0izIQft3oWhXkUyapnzg=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.4.0.tgz"; + sha512 = "2ygSsCMTvjN5+sd//d+lnqmSwTA04yDYCSnYMQy8k37nJk2xo7VsKnKynUBJPmZ2Km70eT+XaYZyxqqQQw4Mew=="; }; }; - "@ot-builder/io-bin-metric-1.3.3" = { + "@ot-builder/io-bin-metric-1.4.0" = { name = "_at_ot-builder_slash_io-bin-metric"; packageName = "@ot-builder/io-bin-metric"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.3.3.tgz"; - sha512 = "fngm7u0BSyet87WijLs/TOXF4y/NkadxZK8NWvyRiEC6hU/d20Tfen6eqit+UB3RBBicbZdCjeJvUqTzq2BRhA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.4.0.tgz"; + sha512 = "ysgatN4dr16nYBFv4mAPbcs6DhbuW/roZtJyVFfil0JtmSa1AJfDbkAxLIA0Uuxay1j7d6ynhK4ojRd4C+rcOA=="; }; }; - "@ot-builder/io-bin-name-1.3.3" = { + "@ot-builder/io-bin-name-1.4.0" = { name = "_at_ot-builder_slash_io-bin-name"; packageName = "@ot-builder/io-bin-name"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.3.3.tgz"; - sha512 = "hWuqZyIdUjfxiVTZ9pa4KZe1srH+88lXkoIGupfz1cibMIM98sgwNkcjT0tjFiyH18SBMQBIxhwmfMRWBj4kKw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.4.0.tgz"; + sha512 = "gNLWNlUeIBDybRjT9lwVavbWrswGQ4ixy/SFuAC2D9qIbJeGxrMF9Bb7yid7+g9Z5CV4cPeoxc9s4GRW0viBOw=="; }; }; - "@ot-builder/io-bin-sfnt-1.3.3" = { + "@ot-builder/io-bin-sfnt-1.4.0" = { name = "_at_ot-builder_slash_io-bin-sfnt"; packageName = "@ot-builder/io-bin-sfnt"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.3.3.tgz"; - sha512 = "CkXXxwwvxgxHZwYx0Tv7cxcvT8yXCF8MusSV51n9On2h/YB3m/uCevna7/E6Jf5MpzHkyICiWYwe6tV+fv5xXA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.4.0.tgz"; + sha512 = "JsjkrKdMxo93LsNKCaB+ind7tr3kwQz3K/yvLktfteSPKwNkyB1Tl+knwsa3btk/M8v8t3mBazssQz5R2S6+lg=="; }; }; - "@ot-builder/io-bin-ttf-1.3.3" = { + "@ot-builder/io-bin-ttf-1.4.0" = { name = "_at_ot-builder_slash_io-bin-ttf"; packageName = "@ot-builder/io-bin-ttf"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.3.3.tgz"; - sha512 = "8stTcg6ulB5N/I3wXsM2Tq71Xnf13JehvXruwNfroYiNLtiWc8NRGlo/PDRB5xbLURv8QeyP0SxUy0ZV9VGXhQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.4.0.tgz"; + sha512 = "L57uAa6PkuZ5basqRHgV2YIam6oDM3UaelnTrskeiIdWBHuqutK3a8wFvG71fd3zcqITrrKghHIV6GrfgLWYPA=="; }; }; - "@ot-builder/io-bin-vtt-private-1.3.3" = { + "@ot-builder/io-bin-vtt-private-1.4.0" = { name = "_at_ot-builder_slash_io-bin-vtt-private"; packageName = "@ot-builder/io-bin-vtt-private"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-vtt-private/-/io-bin-vtt-private-1.3.3.tgz"; - sha512 = "hPAibMtIX1WynkNDME+pWph/lU166XXJPrEkKLZ5kEl9XPbAzk+JS6TKnX38AEqGx5lWlc5Fx26slYyqksR48g=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-vtt-private/-/io-bin-vtt-private-1.4.0.tgz"; + sha512 = "lx37kO2n6pP3na+zwnSiqJ1XecI1sfF7nklclg8uoCROE87WbEmDbBzsgkqXBxHYZ3pVj1ZDydih6NaLXJ9w8w=="; }; }; - "@ot-builder/ot-1.3.3" = { + "@ot-builder/ot-1.4.0" = { name = "_at_ot-builder_slash_ot"; packageName = "@ot-builder/ot"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.3.3.tgz"; - sha512 = "e0apRiFxboGKw24eg8uTp0NxkI3KPtNIoztOmJWQTaSXMS78QbzWDAXX8yy94qnL6mu+aN7u1H8f67zNtMH1DA=="; + url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.4.0.tgz"; + sha512 = "LCJOmacVoVJfeEPb+it3XtYkoz8Q/RBUBgmnHRmovaI0lGLSqK0hOfauaIRap9USS00hT17s7QDPeST+lvlAQA=="; }; }; - "@ot-builder/ot-encoding-1.3.3" = { + "@ot-builder/ot-encoding-1.4.0" = { name = "_at_ot-builder_slash_ot-encoding"; packageName = "@ot-builder/ot-encoding"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.3.3.tgz"; - sha512 = "syxPDRoAezIQA/Z/DDPSF2AQ3N9vWaypTvbUPmdLEqriOZFDAx4fR455B8gqZKIeg3FFAjXLMCtaDR1sftp74g=="; + url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.4.0.tgz"; + sha512 = "qs8+zx1Ebj2sQyYJjv1BgTKYECNqvA7HZYdVjs2reHm27YwI5uoamQAJ0rQ6+H2xp1pxCI9qRNMAucKkF5Hx3Q=="; }; }; - "@ot-builder/ot-ext-private-1.3.3" = { + "@ot-builder/ot-ext-private-1.4.0" = { name = "_at_ot-builder_slash_ot-ext-private"; packageName = "@ot-builder/ot-ext-private"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.3.3.tgz"; - sha512 = "s5Se3iuiRyznjdO4Qlm1yimNI8NkPl/RRkbc8tC4hoq45KO78CCjU3tKllioTs5DGHtP2kpinseNbyL1zofykA=="; + url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.4.0.tgz"; + sha512 = "L4HihtweRtlBfBOdjBGjUxhqTG/fEGbNgMcsbvrIJIpwglpziAoYosdXxtY5pMYi0TM8ZcWhDtIB2KXTYsy0+g=="; }; }; - "@ot-builder/ot-glyphs-1.3.3" = { + "@ot-builder/ot-glyphs-1.4.0" = { name = "_at_ot-builder_slash_ot-glyphs"; packageName = "@ot-builder/ot-glyphs"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.3.3.tgz"; - sha512 = "vqPrWqlfugwsnutphMz2od5VJRvsdnGjBU48rye4tKxRDkOQ+jv9XnrMiEhms0wfBR3G/z0LjNsQAayWIggpDA=="; + url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.4.0.tgz"; + sha512 = "4ryJxvvX6v3A1g+aQXgpRlbuVQBSCjukxYMfhnWeLadVPM5Q6VKP0Q1VfZcbJFve/A82ltlGRwhresHy/hXiOw=="; }; }; - "@ot-builder/ot-layout-1.3.3" = { + "@ot-builder/ot-layout-1.4.0" = { name = "_at_ot-builder_slash_ot-layout"; packageName = "@ot-builder/ot-layout"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.3.3.tgz"; - sha512 = "h0JqUVYvSh77xoGI+PHaXnXOlYKrQCu7EXXDC8uUr2xrnQR4+LJzvt+NPpFwtlG1upc/muCFpDxp6ooQ8crErw=="; + url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.4.0.tgz"; + sha512 = "DxLQ8jC/dn29pbCy5vKjHhmsLZ4uOJZjiFkSSoi7N4Di+DILiZfIcRJigbJsnqBF3XRUNpgUQs5HvJl65dMjcA=="; }; }; - "@ot-builder/ot-metadata-1.3.3" = { + "@ot-builder/ot-metadata-1.4.0" = { name = "_at_ot-builder_slash_ot-metadata"; packageName = "@ot-builder/ot-metadata"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.3.3.tgz"; - sha512 = "t/D9+MHsSd21laRKtC+M48mCKVODVjcMW8VIZLwA5Vsg9xtAkSSYU/ZXZjmUwahnaJRLAJCovD7B7WkIc8NX7A=="; + url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.4.0.tgz"; + sha512 = "g64WKXevoJmlN8QyKL+Ew6DwEPNpdoC2Pn/GCBLoyW8KfEzUg/wUCykZu333X+vKSxqiqssLH/aoUOg6uf8BFA=="; }; }; - "@ot-builder/ot-name-1.3.3" = { + "@ot-builder/ot-name-1.4.0" = { name = "_at_ot-builder_slash_ot-name"; packageName = "@ot-builder/ot-name"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.3.3.tgz"; - sha512 = "g+flff2TZNeN6U4cq9T/JtOTi82NoTjVQrtxsdDTgL7UbfbpyBxloutnFVTdslEUAH2NgSJAeKLdUIuH7LwVjw=="; + url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.4.0.tgz"; + sha512 = "CGTy3J9P2M03DFcEmR6y4nb3aK6sEaPgXcCR6rXa6gTIxfkVzhpijZzcKUcmzUwh6LYOX3w4RG6Vd9UVOmm+4g=="; }; }; - "@ot-builder/ot-sfnt-1.3.3" = { + "@ot-builder/ot-sfnt-1.4.0" = { name = "_at_ot-builder_slash_ot-sfnt"; packageName = "@ot-builder/ot-sfnt"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.3.3.tgz"; - sha512 = "reA2LMD5BI/1dsenrgfSmydY18jvu5Lq4p3DmQc/uMaEc5ReW4Vlu0AUoRPoqdhtE00pzwcyc9nuOBXivFl4qg=="; + url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.4.0.tgz"; + sha512 = "smgt8TMtB+eMpA4mTzB2NwORcv1/+HhFmys2gr8cYorEvqIgRP15kiC7tVC2in2mKYxIq4+e3Z+MciCCdxTXfQ=="; }; }; - "@ot-builder/ot-standard-glyph-namer-1.3.3" = { + "@ot-builder/ot-standard-glyph-namer-1.4.0" = { name = "_at_ot-builder_slash_ot-standard-glyph-namer"; packageName = "@ot-builder/ot-standard-glyph-namer"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.3.3.tgz"; - sha512 = "6Ku8YiCVQxT2OwNBnWSrEJO76OtV8LtUCNS+1tdrDJpTzWeZqys0ypnXBLka/aBKUZUkJeXWflaxUNo1r4Tx+A=="; + url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.4.0.tgz"; + sha512 = "dFGkdynJ4sMyPSQkWYJpuNFqAGMXDV4tu0mPevSwrJFudefBmuLIVlOc+rJq19CG+tYq787JJe0CTXIvoq+sNw=="; }; }; - "@ot-builder/ot-vtt-private-1.3.3" = { + "@ot-builder/ot-vtt-private-1.4.0" = { name = "_at_ot-builder_slash_ot-vtt-private"; packageName = "@ot-builder/ot-vtt-private"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-vtt-private/-/ot-vtt-private-1.3.3.tgz"; - sha512 = "T1sdeXE83/IdRz7eRa182bAVYANmnoGiLlO3y/6e0sJSxgMzwr9eSjbf441edvjEMJPbCmBr6gqiJoQMzcIiCg=="; + url = "https://registry.npmjs.org/@ot-builder/ot-vtt-private/-/ot-vtt-private-1.4.0.tgz"; + sha512 = "nVg1Y/y3OzqpVz48oM9Ic6YzUJ8UrrT/5iVZMcQ99m5Zon9hcpp/RrYldOF58XuPO0MtgjLME2g4uFUJWSss7Q=="; }; }; - "@ot-builder/prelude-1.3.3" = { + "@ot-builder/prelude-1.4.0" = { name = "_at_ot-builder_slash_prelude"; packageName = "@ot-builder/prelude"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.3.3.tgz"; - sha512 = "GJSZOF13jqvVV4+LREhSo7ZRmikYVGPZl+Z1D4jHUFF7nDqX53KbGMt/tl3rhNMhub0/NTdV8tzdd2LTb/AJDQ=="; + url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.4.0.tgz"; + sha512 = "Q5kqu1DYOeRAcHS15gX1IpoyhR1rffrfKDUcex6nd+GizBPJBdbOtIWpuz7uaOR1zYBCOWuLsyW+h3vKqK0wEw=="; }; }; - "@ot-builder/primitive-1.3.3" = { + "@ot-builder/primitive-1.4.0" = { name = "_at_ot-builder_slash_primitive"; packageName = "@ot-builder/primitive"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.3.3.tgz"; - sha512 = "aEwB2TlorsArhqVQKL9cDyYiszl0wdvhFFgNHp3bmxw7D1w86pFdjAfUO7IyIF7k5JBPswHAzMfmotXcA51lUw=="; + url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.4.0.tgz"; + sha512 = "Op+KrrhVUkFa7FXqTLbtdTYJbIZA4dHFRB7pE7YqEqfjtYv1tcMKGjQIneXi9kO3yG1T6SDdY9V5UTpIs/rfUQ=="; }; }; - "@ot-builder/rectify-1.3.3" = { + "@ot-builder/rectify-1.4.0" = { name = "_at_ot-builder_slash_rectify"; packageName = "@ot-builder/rectify"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.3.3.tgz"; - sha512 = "Ij9dpqhw0lOos2Z9mr7Z4Li+zQQ1xN9LSUIgfqtHFGVDnC66udYyHahOLMhjhODJVPtA25otADrM4LT/T4jGXQ=="; + url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.4.0.tgz"; + sha512 = "UMhDyFi00B/6Ols0/WJ8aYdNnHadnSTtc3tN97tjnEs0ZS6Tym6SaL044+ehINJA16kazqHqFJMbwLjA/KrFow=="; }; }; - "@ot-builder/stat-glyphs-1.3.3" = { + "@ot-builder/stat-glyphs-1.4.0" = { name = "_at_ot-builder_slash_stat-glyphs"; packageName = "@ot-builder/stat-glyphs"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.3.3.tgz"; - sha512 = "8vHTL/fhorFp1l2jFSGNT9R9tu0Rr8yQH/vslaOIvY8bBgJDQCqKExmF4lxiGMWMr05mKZhNrwV2vYMHWUP2mA=="; + url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.4.0.tgz"; + sha512 = "YgMHUivVuXLd+b2TXLHEQDiCjBnmDwDGTfFiGGbaM/XrCdYMzdHNjbpHWhNx4GODcAplkIQm3j3kwFdM4L1wwA=="; }; }; - "@ot-builder/trace-1.3.3" = { + "@ot-builder/trace-1.4.0" = { name = "_at_ot-builder_slash_trace"; packageName = "@ot-builder/trace"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.3.3.tgz"; - sha512 = "d4KsjCUgY4tlpfSY74Q2l/k1Fl82ROlt+IQhzl8weSeb/KVGVALltzEIyEmT3Kb5Yh3Clej9nlzzwKWX74dgZw=="; + url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.4.0.tgz"; + sha512 = "fNt9Nf03I7VuLbeziVA5c1pMx9gr8K92Z7UOUnx387eIjeeOLFY98oVSO+XGXFOd+z5lapR9LWhhhaVlIw+YzA=="; }; }; - "@ot-builder/var-store-1.3.3" = { + "@ot-builder/var-store-1.4.0" = { name = "_at_ot-builder_slash_var-store"; packageName = "@ot-builder/var-store"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.3.3.tgz"; - sha512 = "5LKBIWxB0Oe4QUeRHA3mGaHqlrgA9byeOQNMQxjGDF0fRVDyG40VW1g4xlUQYWzTitM2ML3dP0HlEoVvsTgwwg=="; + url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.4.0.tgz"; + sha512 = "IGCQqOeLezgGiohkQdsNJGIkyfV7iZVns83K3i+0tBgSaFOZyNLCjy02eHP6u6Z3a5z0NXjT0yalKNaRLLkGnA=="; }; }; - "@ot-builder/variance-1.3.3" = { + "@ot-builder/variance-1.4.0" = { name = "_at_ot-builder_slash_variance"; packageName = "@ot-builder/variance"; - version = "1.3.3"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.4.0.tgz"; + sha512 = "TwlAMp8proF7/y3cWP8Vzxq4cbUUB0TzcS9s2vc4L/IGNdFtuIU7RiSO2A4cHoaBMdJSzCDm5CZ1DQopz/607A=="; + }; + }; + "@parcel/bundler-default-2.3.2" = { + name = "_at_parcel_slash_bundler-default"; + packageName = "@parcel/bundler-default"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/bundler-default/-/bundler-default-2.3.2.tgz"; + sha512 = "JUrto4mjSD0ic9dEqRp0loL5o3HVYHja1ZIYSq+rBl2UWRV6/9cGTb07lXOCqqm0BWE+hQ4krUxB76qWaF0Lqw=="; + }; + }; + "@parcel/cache-2.3.2" = { + name = "_at_parcel_slash_cache"; + packageName = "@parcel/cache"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/cache/-/cache-2.3.2.tgz"; + sha512 = "Xxq+ekgcFEme6Fn1v7rEOBkyMOUOUu7eNqQw0l6HQS+INZ2Q7YzzfdW7pI8rEOAAICVg5BWKpmBQZpgJlT+HxQ=="; + }; + }; + "@parcel/codeframe-2.3.2" = { + name = "_at_parcel_slash_codeframe"; + packageName = "@parcel/codeframe"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.3.3.tgz"; - sha512 = "kCd+aqpuF/Go+yHRc0WJ3GP9p1069WQBdG9b5GomQJhYfccGmNOl2P1BUtISAu467DVngc9bBx5ZJbDWn1luXg=="; + url = "https://registry.npmjs.org/@parcel/codeframe/-/codeframe-2.3.2.tgz"; + sha512 = "ireQALcxxrTdIEpzTOoMo/GpfbFm1qlyezeGl3Hce3PMvHLg3a5S6u/Vcy7SAjdld5GfhHEqVY+blME6Z4CyXQ=="; + }; + }; + "@parcel/compressor-raw-2.3.2" = { + name = "_at_parcel_slash_compressor-raw"; + packageName = "@parcel/compressor-raw"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/compressor-raw/-/compressor-raw-2.3.2.tgz"; + sha512 = "8dIoFwinYK6bOTpnZOAwwIv0v73y0ezsctPmfMnIqVQPn7wJwfhw/gbKVcmK5AkgQMkyid98hlLZoaZtGF1Mdg=="; + }; + }; + "@parcel/config-default-2.3.2" = { + name = "_at_parcel_slash_config-default"; + packageName = "@parcel/config-default"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/config-default/-/config-default-2.3.2.tgz"; + sha512 = "E7/iA7fGCYvXU3u6zF9nxjeDVsgjCN6MVvDjymjaxYMoDWTIsPV245SBEXqzgtmzbMAV+VAl4rVWLMB4pzMt9g=="; + }; + }; + "@parcel/core-2.3.2" = { + name = "_at_parcel_slash_core"; + packageName = "@parcel/core"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/core/-/core-2.3.2.tgz"; + sha512 = "gdJzpsgeUhv9H8T0UKVmyuptiXdduEfKIUx0ci+/PGhq8cCoiFnlnuhW6H7oLr79OUc+YJStabDJuG4U2A6ysw=="; + }; + }; + "@parcel/diagnostic-2.3.2" = { + name = "_at_parcel_slash_diagnostic"; + packageName = "@parcel/diagnostic"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/diagnostic/-/diagnostic-2.3.2.tgz"; + sha512 = "/xW93Az4AOiifuYW/c4CDbUcu3lx5FcUDAj9AGiR9NSTsF/ROC/RqnxvQ3AGtqa14R7vido4MXEpY3JEp6FsqA=="; + }; + }; + "@parcel/events-2.3.2" = { + name = "_at_parcel_slash_events"; + packageName = "@parcel/events"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/events/-/events-2.3.2.tgz"; + sha512 = "WiYIwXMo4Vd+pi58vRoHkul8TPE5VEfMY+3FYwVCKPl/LYqSD+vz6wMx9uG18mEbB1d/ofefv5ZFQNtPGKO4tQ=="; }; }; "@parcel/fs-1.11.0" = { @@ -6493,6 +6862,42 @@ let sha512 = "86RyEqULbbVoeo8OLcv+LQ1Vq2PKBAvWTU9fCgALxuCTbbs5Ppcvll4Vr+Ko1AnmMzja/k++SzNAwJfeQXVlpA=="; }; }; + "@parcel/fs-2.3.2" = { + name = "_at_parcel_slash_fs"; + packageName = "@parcel/fs"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/fs/-/fs-2.3.2.tgz"; + sha512 = "XV+OsnRpN01QKU37lBN0TFKvv7uPKfQGbqFqYOrMbXH++Ae8rBU0Ykz+Yu4tv2h7shMlde+AMKgRnRTAJZpWEQ=="; + }; + }; + "@parcel/fs-search-2.3.2" = { + name = "_at_parcel_slash_fs-search"; + packageName = "@parcel/fs-search"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/fs-search/-/fs-search-2.3.2.tgz"; + sha512 = "u3DTEFnPtKuZvEtgGzfVjQUytegSSn3POi7WfwMwPIaeDPfYcyyhfl+c96z7VL9Gk/pqQ99/cGyAwFdFsnxxXA=="; + }; + }; + "@parcel/graph-2.3.2" = { + name = "_at_parcel_slash_graph"; + packageName = "@parcel/graph"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/graph/-/graph-2.3.2.tgz"; + sha512 = "ltTBM3IEqumgmy4ABBFETT8NtAwSsjD9mY3WCyJ5P8rUshfVCg093rvBPbpuJYMaH/TV1AHVaWfZqaZ4JQDIQQ=="; + }; + }; + "@parcel/hash-2.3.2" = { + name = "_at_parcel_slash_hash"; + packageName = "@parcel/hash"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/hash/-/hash-2.3.2.tgz"; + sha512 = "SMtYTsHihws/wqdVnOr0QAGyGYsW9rJSJkkoRujUxo8l2ctnBN1ztv89eOUrdtgHsmcnj/oz1yw6sN38X+BUng=="; + }; + }; "@parcel/logger-1.11.1" = { name = "_at_parcel_slash_logger"; packageName = "@parcel/logger"; @@ -6502,6 +6907,330 @@ let sha512 = "9NF3M6UVeP2udOBDILuoEHd8VrF4vQqoWHEafymO1pfSoOMfxrSJZw1MfyAAIUN/IFp9qjcpDCUbDZB+ioVevA=="; }; }; + "@parcel/logger-2.3.2" = { + name = "_at_parcel_slash_logger"; + packageName = "@parcel/logger"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/logger/-/logger-2.3.2.tgz"; + sha512 = "jIWd8TXDQf+EnNWSa7Q10lSQ6C1LSH8OZkTlaINrfVIw7s+3tVxO3I4pjp7/ARw7RX2gdNPlw6fH4Gn/HvvYbw=="; + }; + }; + "@parcel/markdown-ansi-2.3.2" = { + name = "_at_parcel_slash_markdown-ansi"; + packageName = "@parcel/markdown-ansi"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/markdown-ansi/-/markdown-ansi-2.3.2.tgz"; + sha512 = "l01ggmag5QScCk9mYA0xHh5TWSffR84uPFP2KvaAMQQ9NLNufcFiU0mn/Mtr3pCb5L5dSzmJ+Oo9s7P1Kh/Fmg=="; + }; + }; + "@parcel/namer-default-2.3.2" = { + name = "_at_parcel_slash_namer-default"; + packageName = "@parcel/namer-default"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/namer-default/-/namer-default-2.3.2.tgz"; + sha512 = "3QUMC0+5+3KMKfoAxYAbpZtuRqTgyZKsGDWzOpuqwemqp6P8ahAvNPwSCi6QSkGcTmvtYwBu9/NHPSONxIFOfg=="; + }; + }; + "@parcel/node-resolver-core-2.3.2" = { + name = "_at_parcel_slash_node-resolver-core"; + packageName = "@parcel/node-resolver-core"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/node-resolver-core/-/node-resolver-core-2.3.2.tgz"; + sha512 = "wmrnMNzJN4GuHw2Ftho+BWgSWR6UCkW3XoMdphqcxpw/ieAdS2a+xYSosYkZgQZ6lGutSvLyJ1CkVvP6RLIdQQ=="; + }; + }; + "@parcel/optimizer-cssnano-2.3.2" = { + name = "_at_parcel_slash_optimizer-cssnano"; + packageName = "@parcel/optimizer-cssnano"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/optimizer-cssnano/-/optimizer-cssnano-2.3.2.tgz"; + sha512 = "wTBOxMiBI38NAB9XIlQZRCjS59+EWjWR9M04D3TWyxl+dL5gYMc1cl4GNynUnmcPdz+3s1UbOdo5/8V90wjiiw=="; + }; + }; + "@parcel/optimizer-htmlnano-2.3.2" = { + name = "_at_parcel_slash_optimizer-htmlnano"; + packageName = "@parcel/optimizer-htmlnano"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/optimizer-htmlnano/-/optimizer-htmlnano-2.3.2.tgz"; + sha512 = "U8C0TDSxsx8HmHaLW0Zc7ha1fXQynzhvBjCRMGYnOiLiw0MOfLQxzQ2WKVSeCotmdlF63ayCwxWsd6BuqStiKQ=="; + }; + }; + "@parcel/optimizer-image-2.3.2" = { + name = "_at_parcel_slash_optimizer-image"; + packageName = "@parcel/optimizer-image"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/optimizer-image/-/optimizer-image-2.3.2.tgz"; + sha512 = "HOk3r5qdvY/PmI7Q3i2qEgFH3kP2QWG4Wq3wmC4suaF1+c2gpiQc+HKHWp4QvfbH3jhT00c5NxQyqPhbXeNI9Q=="; + }; + }; + "@parcel/optimizer-svgo-2.3.2" = { + name = "_at_parcel_slash_optimizer-svgo"; + packageName = "@parcel/optimizer-svgo"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/optimizer-svgo/-/optimizer-svgo-2.3.2.tgz"; + sha512 = "l7WvZ5+e7D1mVmLUxMVaSb29cviXzuvSY2OpQs0ukdPACDqag+C65hWMzwTiOSSRGPMIu96kQKpeVru2YjibhA=="; + }; + }; + "@parcel/optimizer-terser-2.3.2" = { + name = "_at_parcel_slash_optimizer-terser"; + packageName = "@parcel/optimizer-terser"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/optimizer-terser/-/optimizer-terser-2.3.2.tgz"; + sha512 = "dOapHhfy0xiNZa2IoEyHGkhhla07xsja79NPem14e5jCqY6Oi40jKNV4ab5uu5u1elWUjJuw69tiYbkDZWbKQw=="; + }; + }; + "@parcel/package-manager-2.3.2" = { + name = "_at_parcel_slash_package-manager"; + packageName = "@parcel/package-manager"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/package-manager/-/package-manager-2.3.2.tgz"; + sha512 = "pAQfywKVORY8Ee+NHAyKzzQrKbnz8otWRejps7urwhDaTVLfAd5C/1ZV64ATZ9ALYP9jyoQ8bTaxVd4opcSuwg=="; + }; + }; + "@parcel/packager-css-2.3.2" = { + name = "_at_parcel_slash_packager-css"; + packageName = "@parcel/packager-css"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/packager-css/-/packager-css-2.3.2.tgz"; + sha512 = "ByuF9xDnQnpVL1Hdu9aY6SpxOuZowd3TH7joh1qdRPLeMHTEvUywHBXoiAyNdrhnLGum8uPEdY8Ra5Xuo1U7kg=="; + }; + }; + "@parcel/packager-html-2.3.2" = { + name = "_at_parcel_slash_packager-html"; + packageName = "@parcel/packager-html"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/packager-html/-/packager-html-2.3.2.tgz"; + sha512 = "YqAptdU+uqfgwSii76mRGcA/3TpuC6yHr8xG+11brqj/tEFLsurmX0naombzd7FgmrTE9w+kb0HUIMl2vRBn0A=="; + }; + }; + "@parcel/packager-js-2.3.2" = { + name = "_at_parcel_slash_packager-js"; + packageName = "@parcel/packager-js"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/packager-js/-/packager-js-2.3.2.tgz"; + sha512 = "3OP0Ro9M1J+PIKZK4Ec2N5hjIPiqk++B2kMFeiUqvaNZjJgKrPPEICBhjS52rma4IE/NgmIMB3aI5pWqE/KwNA=="; + }; + }; + "@parcel/packager-raw-2.3.2" = { + name = "_at_parcel_slash_packager-raw"; + packageName = "@parcel/packager-raw"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/packager-raw/-/packager-raw-2.3.2.tgz"; + sha512 = "RnoZ7WgNAFWkEPrEefvyDqus7xfv9XGprHyTbfLittPaVAZpl+4eAv43nXyMfzk77Cgds6KcNpkosj3acEpNIQ=="; + }; + }; + "@parcel/packager-svg-2.3.2" = { + name = "_at_parcel_slash_packager-svg"; + packageName = "@parcel/packager-svg"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/packager-svg/-/packager-svg-2.3.2.tgz"; + sha512 = "iIC0VeczOXynS7M5jCi3naMBRyAznBVJ3iMg92/GaI9duxPlUMGAlHzLAKNtoXkc00HMXDH7rrmMb04VX6FYSg=="; + }; + }; + "@parcel/plugin-2.3.2" = { + name = "_at_parcel_slash_plugin"; + packageName = "@parcel/plugin"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/plugin/-/plugin-2.3.2.tgz"; + sha512 = "SaLZAJX4KH+mrAmqmcy9KJN+V7L+6YNTlgyqYmfKlNiHu7aIjLL+3prX8QRcgGtjAYziCxvPj0cl1CCJssaiGg=="; + }; + }; + "@parcel/reporter-cli-2.3.2" = { + name = "_at_parcel_slash_reporter-cli"; + packageName = "@parcel/reporter-cli"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/reporter-cli/-/reporter-cli-2.3.2.tgz"; + sha512 = "VYetmTXqW83npsvVvqlQZTbF3yVL3k/FCCl3kSWvOr9LZA0lmyqJWPjMHq37yIIOszQN/p5guLtgCjsP0UQw1Q=="; + }; + }; + "@parcel/reporter-dev-server-2.3.2" = { + name = "_at_parcel_slash_reporter-dev-server"; + packageName = "@parcel/reporter-dev-server"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/reporter-dev-server/-/reporter-dev-server-2.3.2.tgz"; + sha512 = "E7LtnjAX4iiWMw2qKUyFBi3+bDz0UGjqgHoPQylUYYLi6opXjJz/oC+cCcCy4e3RZlkrl187XonvagS59YjDxA=="; + }; + }; + "@parcel/resolver-default-2.3.2" = { + name = "_at_parcel_slash_resolver-default"; + packageName = "@parcel/resolver-default"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/resolver-default/-/resolver-default-2.3.2.tgz"; + sha512 = "y3r+xOwWsATrNGUWuZ6soA7q24f8E5tY1AZ9lHCufnkK2cdKZJ5O1cyd7ohkAiKZx2/pMd+FgmVZ/J3oxetXkA=="; + }; + }; + "@parcel/runtime-browser-hmr-2.3.2" = { + name = "_at_parcel_slash_runtime-browser-hmr"; + packageName = "@parcel/runtime-browser-hmr"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/runtime-browser-hmr/-/runtime-browser-hmr-2.3.2.tgz"; + sha512 = "nRD6uOyF1+HGylP9GASbYmvUDOsDaNwvaxuGTSh8+5M0mmCgib+hVBiPEKbwdmKjGbUPt9wRFPyMa/JpeQZsIQ=="; + }; + }; + "@parcel/runtime-js-2.3.2" = { + name = "_at_parcel_slash_runtime-js"; + packageName = "@parcel/runtime-js"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/runtime-js/-/runtime-js-2.3.2.tgz"; + sha512 = "SJepcHvYO/7CEe/Q85sngk+smcJ6TypuPh4D2R8kN+cAJPi5WvbQEe7+x5BEgbN+5Jumi/Uo3FfOOE5mYh+F6g=="; + }; + }; + "@parcel/runtime-react-refresh-2.3.2" = { + name = "_at_parcel_slash_runtime-react-refresh"; + packageName = "@parcel/runtime-react-refresh"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/runtime-react-refresh/-/runtime-react-refresh-2.3.2.tgz"; + sha512 = "P+GRPO2XVDSBQ4HmRSj2xfbHSQvL9+ahTE/AB74IJExLTITv5l4SHAV3VsiKohuHYUAYHW3A/Oe7tEFCAb6Cug=="; + }; + }; + "@parcel/runtime-service-worker-2.3.2" = { + name = "_at_parcel_slash_runtime-service-worker"; + packageName = "@parcel/runtime-service-worker"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/runtime-service-worker/-/runtime-service-worker-2.3.2.tgz"; + sha512 = "iREHj/eapphC4uS/zGUkiTJvG57q+CVbTrfE42kB8ECtf/RYNo5YC9htdvPZjRSXDPrEPc5NCoKp4X09ENNikw=="; + }; + }; + "@parcel/source-map-2.0.2" = { + name = "_at_parcel_slash_source-map"; + packageName = "@parcel/source-map"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/source-map/-/source-map-2.0.2.tgz"; + sha512 = "NnUrPYLpYB6qyx2v6bcRPn/gVigmGG6M6xL8wIg/i0dP1GLkuY1nf+Hqdf63FzPTqqT7K3k6eE5yHPQVMO5jcA=="; + }; + }; + "@parcel/transformer-babel-2.3.2" = { + name = "_at_parcel_slash_transformer-babel"; + packageName = "@parcel/transformer-babel"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/transformer-babel/-/transformer-babel-2.3.2.tgz"; + sha512 = "QpWfH2V6jJ+kcUBIMM/uBBG8dGFvNaOGS+8jD6b+eTP+1owzm83RoWgqhRV2D/hhv2qMXEQzIljoc/wg2y+X4g=="; + }; + }; + "@parcel/transformer-css-2.3.2" = { + name = "_at_parcel_slash_transformer-css"; + packageName = "@parcel/transformer-css"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/transformer-css/-/transformer-css-2.3.2.tgz"; + sha512 = "8lzvDny+78DIAqhcXam2Bf9FyaUoqzHdUQdNFn+PuXTHroG/QGPvln1kvqngJjn4/cpJS9vYmAPVXe+nai3P8g=="; + }; + }; + "@parcel/transformer-html-2.3.2" = { + name = "_at_parcel_slash_transformer-html"; + packageName = "@parcel/transformer-html"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/transformer-html/-/transformer-html-2.3.2.tgz"; + sha512 = "idT1I/8WM65IFYBqzRwpwT7sf0xGur4EDQDHhuPX1w+pIVZnh0lkLMAnEqs6ar1SPRMys4chzkuDNnqh0d76hg=="; + }; + }; + "@parcel/transformer-image-2.3.2" = { + name = "_at_parcel_slash_transformer-image"; + packageName = "@parcel/transformer-image"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/transformer-image/-/transformer-image-2.3.2.tgz"; + sha512 = "0K7cJHXysli6hZsUz/zVGO7WCoaaIeVdzAxKpLA1Yl3LKw/ODiMyXKt08LiV/ljQ2xT5qb9EsXUWDRvcZ0b96A=="; + }; + }; + "@parcel/transformer-js-2.3.2" = { + name = "_at_parcel_slash_transformer-js"; + packageName = "@parcel/transformer-js"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/transformer-js/-/transformer-js-2.3.2.tgz"; + sha512 = "U1fbIoAoqR5P49S+DMhH8BUd9IHRPwrTTv6ARYGsYnhuNsjTFhNYE0kkfRYboe/e0z7vEbeJICZXjnZ7eQDw5A=="; + }; + }; + "@parcel/transformer-json-2.3.2" = { + name = "_at_parcel_slash_transformer-json"; + packageName = "@parcel/transformer-json"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/transformer-json/-/transformer-json-2.3.2.tgz"; + sha512 = "Pv2iPaxKINtFwOk5fDbHjQlSm2Vza/NLimQY896FLxiXPNAJxWGvMwdutgOPEBKksxRx9LZPyIOHiRVZ0KcA3w=="; + }; + }; + "@parcel/transformer-postcss-2.3.2" = { + name = "_at_parcel_slash_transformer-postcss"; + packageName = "@parcel/transformer-postcss"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/transformer-postcss/-/transformer-postcss-2.3.2.tgz"; + sha512 = "Rpdxc1rt2aJFCh/y/ccaBc9J1crDjNY5o44xYoOemBoUNDMREsmg5sR5iO81qKKO5GxfoosGb2zh59aeTmywcg=="; + }; + }; + "@parcel/transformer-posthtml-2.3.2" = { + name = "_at_parcel_slash_transformer-posthtml"; + packageName = "@parcel/transformer-posthtml"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/transformer-posthtml/-/transformer-posthtml-2.3.2.tgz"; + sha512 = "tMdVExfdM+1G8A9KSHDsjg+S9xEGbhH5mApF2NslPnNZ4ciLKRNuHU2sSV/v8i0a6kacKvDTrwQXYBQJGOodBw=="; + }; + }; + "@parcel/transformer-raw-2.3.2" = { + name = "_at_parcel_slash_transformer-raw"; + packageName = "@parcel/transformer-raw"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/transformer-raw/-/transformer-raw-2.3.2.tgz"; + sha512 = "lY7eOCaALZ90+GH+4PZRmAPGQRXoZ66NakSdhEtH6JSSAYOmZKDvNLGTMRo/vK1oELzWMuAHGdqvbcPDtNLLVw=="; + }; + }; + "@parcel/transformer-react-refresh-wrap-2.3.2" = { + name = "_at_parcel_slash_transformer-react-refresh-wrap"; + packageName = "@parcel/transformer-react-refresh-wrap"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/transformer-react-refresh-wrap/-/transformer-react-refresh-wrap-2.3.2.tgz"; + sha512 = "FZaderyCExn0SBZ6D+zHPWc8JSn9YDcbfibv0wkCl+D7sYfeWZ22i7MRp5NwCe/TZ21WuxDWySCggEp/Waz2xg=="; + }; + }; + "@parcel/transformer-svg-2.3.2" = { + name = "_at_parcel_slash_transformer-svg"; + packageName = "@parcel/transformer-svg"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/transformer-svg/-/transformer-svg-2.3.2.tgz"; + sha512 = "k9My6bePsaGgUh+tidDjFbbVgKPTzwCAQfoloZRMt7y396KgUbvCfqDruk04k6k+cJn7Jl1o/5lUpTEruBze7g=="; + }; + }; + "@parcel/types-2.3.2" = { + name = "_at_parcel_slash_types"; + packageName = "@parcel/types"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/types/-/types-2.3.2.tgz"; + sha512 = "C77Ct1xNM7LWjPTfe/dQ/9rq1efdsX5VJu2o8/TVi6qoFh64Wp/c5/vCHwKInOTBZUTchVO6z4PGJNIZoUVJuA=="; + }; + }; "@parcel/utils-1.11.0" = { name = "_at_parcel_slash_utils"; packageName = "@parcel/utils"; @@ -6511,6 +7240,15 @@ let sha512 = "cA3p4jTlaMeOtAKR/6AadanOPvKeg8VwgnHhOyfi0yClD0TZS/hi9xu12w4EzA/8NtHu0g6o4RDfcNjqN8l1AQ=="; }; }; + "@parcel/utils-2.3.2" = { + name = "_at_parcel_slash_utils"; + packageName = "@parcel/utils"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/utils/-/utils-2.3.2.tgz"; + sha512 = "xzZ+0vWhrXlLzGoz7WlANaO5IPtyWGeCZruGtepUL3yheRWb1UU4zFN9xz7Z+j++Dmf1Fgkc3qdk/t4O8u9HLQ=="; + }; + }; "@parcel/watcher-1.12.1" = { name = "_at_parcel_slash_watcher"; packageName = "@parcel/watcher"; @@ -6520,6 +7258,15 @@ let sha512 = "od+uCtCxC/KoNQAIE1vWx1YTyKYY+7CTrxBJPRh3cDWw/C0tCtlBMVlrbplscGoEpt6B27KhJDCv82PBxOERNA=="; }; }; + "@parcel/watcher-2.0.5" = { + name = "_at_parcel_slash_watcher"; + packageName = "@parcel/watcher"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.0.5.tgz"; + sha512 = "x0hUbjv891omnkcHD7ZOhiyyUqUUR6MNjq89JhEI3BxppeKWAm6NPQsqqRrAkCJBogdT/o/My21sXtTI9rJIsw=="; + }; + }; "@parcel/workers-1.11.0" = { name = "_at_parcel_slash_workers"; packageName = "@parcel/workers"; @@ -6529,6 +7276,15 @@ let sha512 = "USSjRAAQYsZFlv43FUPdD+jEGML5/8oLF0rUzPQTtK4q9kvaXr49F5ZplyLz5lox78cLZ0TxN2bIDQ1xhOkulQ=="; }; }; + "@parcel/workers-2.3.2" = { + name = "_at_parcel_slash_workers"; + packageName = "@parcel/workers"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/workers/-/workers-2.3.2.tgz"; + sha512 = "JbOm+Ceuyymd1SuKGgodC2EXAiPuFRpaNUSJpz3NAsS3lVIt2TDAPMOWBivS7sML/KltspUfl/Q9YwO0TPUFNw=="; + }; + }; "@pm2/agent-2.0.1" = { name = "_at_pm2_slash_agent"; packageName = "@pm2/agent"; @@ -6574,22 +7330,22 @@ let sha512 = "J3IlK0Ok88RQZVB//af7Lnl1Vw2buyyr5G3oEvK1wRSYTJi/E/HBm5JZUihmDAtm/unr85FC534DwA5e+4LR2w=="; }; }; - "@prisma/engines-3.9.0-58.bcc2ff906db47790ee902e7bbc76d7ffb1893009" = { + "@prisma/engines-3.10.0-50.73e60b76d394f8d37d8ebd1f8918c79029f0db86" = { name = "_at_prisma_slash_engines"; packageName = "@prisma/engines"; - version = "3.9.0-58.bcc2ff906db47790ee902e7bbc76d7ffb1893009"; + version = "3.10.0-50.73e60b76d394f8d37d8ebd1f8918c79029f0db86"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/engines/-/engines-3.9.0-58.bcc2ff906db47790ee902e7bbc76d7ffb1893009.tgz"; - sha512 = "qM+uJbkelB21bnK44gYE049YTHIjHysOuj0mj5U2gDGyNLfmiazlggzFPCgEjgme4U5YB2tYs6Z5Hq08Kl8pjA=="; + url = "https://registry.npmjs.org/@prisma/engines/-/engines-3.10.0-50.73e60b76d394f8d37d8ebd1f8918c79029f0db86.tgz"; + sha512 = "LjRssaWu9w2SrXitofnutRIyURI7l0veQYIALz7uY4shygM9nMcK3omXcObRm7TAcw3Z+9ytfK1B+ySOsOesxQ=="; }; }; - "@prisma/prisma-fmt-wasm-3.9.0-58.bcc2ff906db47790ee902e7bbc76d7ffb1893009" = { + "@prisma/prisma-fmt-wasm-3.10.0-50.73e60b76d394f8d37d8ebd1f8918c79029f0db86" = { name = "_at_prisma_slash_prisma-fmt-wasm"; packageName = "@prisma/prisma-fmt-wasm"; - version = "3.9.0-58.bcc2ff906db47790ee902e7bbc76d7ffb1893009"; + version = "3.10.0-50.73e60b76d394f8d37d8ebd1f8918c79029f0db86"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/prisma-fmt-wasm/-/prisma-fmt-wasm-3.9.0-58.bcc2ff906db47790ee902e7bbc76d7ffb1893009.tgz"; - sha512 = "D+1BlYjBpj3mUGrB/druJ1St43jmldcTqSZ1RIOOnB15r+ZtteMJk0PrhVGEVPHCK2Qmbz2PG0/gNooTJHwSAQ=="; + url = "https://registry.npmjs.org/@prisma/prisma-fmt-wasm/-/prisma-fmt-wasm-3.10.0-50.73e60b76d394f8d37d8ebd1f8918c79029f0db86.tgz"; + sha512 = "f0Srf2EasvBRKBlTUrqkW5hp889+SRrRkqu0MgcuTXlgHxVMj7DIo1JNylPb1y/HDwtjLWf6AL+sk+2R891SWA=="; }; }; "@protobufjs/aspromise-1.1.2" = { @@ -6700,13 +7456,13 @@ let sha512 = "1ekKViRit0jo1IzDLSRSziU/OpX9ckoj8uWvSWzHLASyTqhKZL9Pdq628guq7yT3qFcJeeaeaA5T97a4w7fpqA=="; }; }; - "@putdotio/api-client-8.27.3" = { + "@putdotio/api-client-8.30.0" = { name = "_at_putdotio_slash_api-client"; packageName = "@putdotio/api-client"; - version = "8.27.3"; + version = "8.30.0"; src = fetchurl { - url = "https://registry.npmjs.org/@putdotio/api-client/-/api-client-8.27.3.tgz"; - sha512 = "i50+y+OTfqKdgE5QwrXDqzfQZKtpLqPYf6pr2u/xTTRS8/w8/nrWmE7N1Hh6WpTBa68XidgUBzqSjit7PYOyfA=="; + url = "https://registry.npmjs.org/@putdotio/api-client/-/api-client-8.30.0.tgz"; + sha512 = "J0OzprAIheo1/62NlhPkPVEyrLSewPaCQHZlidrkY1Ip60OtIwy/RojORR3Xm28I68wTUDMm3X1Ciz45aAUYww=="; }; }; "@reach/router-1.3.4" = { @@ -6763,13 +7519,13 @@ let sha512 = "y9qNj0//tZtWB2jfXNK3BX18BSBp9zNR7KE7lMysVHwbZtY392OJCjm6Rb/h4UHH2r1AqjNEHFD6bRn+DqU9Mw=="; }; }; - "@redocly/openapi-core-1.0.0-beta.82" = { + "@redocly/openapi-core-1.0.0-beta.87" = { name = "_at_redocly_slash_openapi-core"; packageName = "@redocly/openapi-core"; - version = "1.0.0-beta.82"; + version = "1.0.0-beta.87"; src = fetchurl { - url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.82.tgz"; - sha512 = "bJ0WclpgkFv4aa5QWU83ARCv3VQJy9U94reb1chOTg9s2bsTHbYuUwRv6G370a7lFXX86AyB3dT5IzS6GytLlA=="; + url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.87.tgz"; + sha512 = "bGvINYT8jpcYEbibhd4AO0M5WPE1IQLNLS4LCNZbD7jkoSQB1EHWBZJDhfPd1kxKPPcQ7UJNUCJwtIIrRs5gTQ=="; }; }; "@redocly/react-dropdown-aria-2.0.12" = { @@ -6826,13 +7582,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-13.2.4" = { + "@schematics/angular-13.2.6" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "13.2.4"; + version = "13.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-13.2.4.tgz"; - sha512 = "pAVuPmFklWVpNJkARs4aGYM5Mo4iez0eW0dDY+ugxZlt1KOLJQDmMK2Go60iEAQLlOw2pKO/jcmTttOP8PN0UQ=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-13.2.6.tgz"; + sha512 = "8NzHMX9+FSgaB0lJYxlTJv9OcBuolwZJqo9M/yX3RPSqSHghA33jWwgVbV551hBJOpbVEePerG1DQkIC99DXKA=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -6853,13 +7609,22 @@ let sha512 = "J3jpy002TyBjd4N/p6s+s90eX42H2eRhK3SbsZuvTDv977/E8p2U3zikdiehyJja66do7FlxLomZLPlvl2/xaA=="; }; }; - "@serverless/dashboard-plugin-6.1.0" = { + "@serverless/aws-lambda-otel-extension-dist-0.1.10" = { + name = "_at_serverless_slash_aws-lambda-otel-extension-dist"; + packageName = "@serverless/aws-lambda-otel-extension-dist"; + version = "0.1.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@serverless/aws-lambda-otel-extension-dist/-/aws-lambda-otel-extension-dist-0.1.10.tgz"; + sha512 = "SPMmou6Bom/TcX69WcKXDiHPVQycfbocUW8vrXLU9oBxFY49Z0l70Yk7lOvtc1H/lc5taIfkcW0Eo12cOp9cvA=="; + }; + }; + "@serverless/dashboard-plugin-6.1.5" = { name = "_at_serverless_slash_dashboard-plugin"; packageName = "@serverless/dashboard-plugin"; - version = "6.1.0"; + version = "6.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/dashboard-plugin/-/dashboard-plugin-6.1.0.tgz"; - sha512 = "rbIWKRoqTIMl0ZOt6f0VIaEj+6slV18iEkW7tIBOKq6eQTkX2tHvBgVXrTh3ZKFNnMePGn4rtfbwB5G9oZ0Wig=="; + url = "https://registry.npmjs.org/@serverless/dashboard-plugin/-/dashboard-plugin-6.1.5.tgz"; + sha512 = "RpZysQyCKzrtY4rJpK1qiQdambt2NrRYqlV9IEsGf5LaQu6f7G35VZrPoS6A2jD8Rt3nMK7t+0LOO5zfVmBMLA=="; }; }; "@serverless/event-mocks-1.1.1" = { @@ -6871,22 +7636,22 @@ let sha512 = "YAV5V/y+XIOfd+HEVeXfPWZb8C6QLruFk9tBivoX2roQLWVq145s4uxf8D0QioCueuRzkukHUS4JIj+KVoS34A=="; }; }; - "@serverless/platform-client-4.3.1" = { + "@serverless/platform-client-4.3.2" = { name = "_at_serverless_slash_platform-client"; packageName = "@serverless/platform-client"; - version = "4.3.1"; + version = "4.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-4.3.1.tgz"; - sha512 = "VPXeTTgXmWZtZmbzm9eh5FJcOoFgHkcwgfNA59FV3TE2Vcm5JZiXKtXl5AANu9LYcyOtJK7iBJXs8OUSwNbJZw=="; + url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-4.3.2.tgz"; + sha512 = "DAa5Z0JAZc6UfrTZLYwqoZxgAponZpFwaqd7WzzMA+loMCkYWyJNwxrAmV6cr2UUJpkko4toPZuJ3vM9Ie+NDA=="; }; }; - "@serverless/utils-6.0.2" = { + "@serverless/utils-6.0.3" = { name = "_at_serverless_slash_utils"; packageName = "@serverless/utils"; - version = "6.0.2"; + version = "6.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils/-/utils-6.0.2.tgz"; - sha512 = "4vNv6nt4/w8wX79DN7OujR/Ih1wlJ9ZJnY28BtF69ehFwlGqnxlF2CXVGo3W7Xh4maK3hWnoc+L4akQX6nH+3g=="; + url = "https://registry.npmjs.org/@serverless/utils/-/utils-6.0.3.tgz"; + sha512 = "6oKLqAkK6CG2zjAs2rfuHEOLoK11K/oep5bwGTEb5JmFP/92JQtvyb+FxP4DknL4jYpiYj1Dd5sCt5auHhOASg=="; }; }; "@sideway/address-4.1.3" = { @@ -6970,13 +7735,13 @@ let sha512 = "JiX9vxoKMmu8Y3Zr2RVathBL1Cdu4Nt4MuNWemt1Nc06A0RAin9c5FArkhGsyMBWfCu4zj+9b+GxtjAnE4qqLQ=="; }; }; - "@sindresorhus/is-4.4.0" = { + "@sindresorhus/is-4.6.0" = { name = "_at_sindresorhus_slash_is"; packageName = "@sindresorhus/is"; - version = "4.4.0"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sindresorhus/is/-/is-4.4.0.tgz"; - sha512 = "QppPM/8l3Mawvh4rn9CNEYIU9bxpXUCRMaX9yUpvBk1nMKusLKpfXGDEKExKaPhLzcn3lzil7pR6rnJ11HgeRQ=="; + url = "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz"; + sha512 = "t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw=="; }; }; "@sindresorhus/jimp-0.3.0" = { @@ -7024,6 +7789,42 @@ let sha512 = "dOlCBKnDw4iShaIsH/bxujKTM18+2TOAsYz+KSc11Am38H4q5Xw8Bbz97ZYdrVNM+um3p7w86Bvvmcn9q+5+eQ=="; }; }; + "@socket.io/component-emitter-3.0.0" = { + name = "_at_socket.io_slash_component-emitter"; + packageName = "@socket.io/component-emitter"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.0.0.tgz"; + sha512 = "2pTGuibAXJswAPJjaKisthqS/NOK5ypG4LYT6tEAV0S/mxW0zOIvYvGK0V8w8+SHxAm6vRMSjqSalFXeBAqs+Q=="; + }; + }; + "@soda/friendly-errors-webpack-plugin-1.8.1" = { + name = "_at_soda_slash_friendly-errors-webpack-plugin"; + packageName = "@soda/friendly-errors-webpack-plugin"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.8.1.tgz"; + sha512 = "h2ooWqP8XuFqTXT+NyAFbrArzfQA7R6HTezADrvD9Re8fxMLTPPniLdqVTdDaO0eIoLaAwKT+d6w+5GeTk7Vbg=="; + }; + }; + "@soda/get-current-script-1.0.2" = { + name = "_at_soda_slash_get-current-script"; + packageName = "@soda/get-current-script"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@soda/get-current-script/-/get-current-script-1.0.2.tgz"; + sha512 = "T7VNNlYVM1SgQ+VsMYhnDkcGmWhQdL0bDyGm5TlQ3GBXnJscEClUUOKduWTmm2zCnvNLC1hc3JpuXjs/nFOc5w=="; + }; + }; + "@sqltools/formatter-1.2.3" = { + name = "_at_sqltools_slash_formatter"; + packageName = "@sqltools/formatter"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@sqltools/formatter/-/formatter-1.2.3.tgz"; + sha512 = "O3uyB/JbkAEMZaP3YqyHH7TMnex7tWyCbCI4EfJdOCoN6HIhqdJBWTM6aCCiWQ/5f5wxjgU735QAIpJbjDvmzg=="; + }; + }; "@squoosh/lib-0.4.1" = { name = "_at_squoosh_slash_lib"; packageName = "@squoosh/lib"; @@ -7150,6 +7951,15 @@ let sha512 = "2kGbqUVJUGE8dM+bMzXG/PYUWKkjLIkRLWNh39OaADkiabDRdw8ATFCgbMz5xdIcvwspPAluSL7uY+ZiTWdWmQ=="; }; }; + "@swc/helpers-0.2.14" = { + name = "_at_swc_slash_helpers"; + packageName = "@swc/helpers"; + version = "0.2.14"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/helpers/-/helpers-0.2.14.tgz"; + sha512 = "wpCQMhf5p5GhNg2MmGKXzUNwxe7zRiCsmqYsamez2beP7mKPCSiu+BjZcdN95yYSzO857kr0VfQewmGpS77nqA=="; + }; + }; "@szmarczak/http-timer-1.1.2" = { name = "_at_szmarczak_slash_http-timer"; packageName = "@szmarczak/http-timer"; @@ -7168,13 +7978,13 @@ let sha512 = "4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w=="; }; }; - "@textlint/ast-node-types-12.1.0" = { + "@textlint/ast-node-types-12.1.1" = { name = "_at_textlint_slash_ast-node-types"; packageName = "@textlint/ast-node-types"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-12.1.0.tgz"; - sha512 = "UlxqemrV/EnGTCl26OU7JhtFJpH7NZdgXvnsuII604orcIkvywUA1GGlg51grfbfqi+ar4zRsOb6fVbcbMZnKA=="; + url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-12.1.1.tgz"; + sha512 = "5/XK9S1177UYetOY6407o1RDuNVndaYfuzsZwhmo52V367s4ZuUD2064WhbmCd6TPyKD4dVr2zoWjfNDfzUZQg=="; }; }; "@textlint/ast-node-types-4.4.3" = { @@ -7186,67 +7996,67 @@ let sha512 = "qi2jjgO6Tn3KNPGnm6B7p6QTEPvY95NFsIAaJuwbulur8iJUEenp1OnoUfiDaC/g2WPPEFkcfXpmnu8XEMFo2A=="; }; }; - "@textlint/ast-tester-12.1.0" = { + "@textlint/ast-tester-12.1.1" = { name = "_at_textlint_slash_ast-tester"; packageName = "@textlint/ast-tester"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-12.1.0.tgz"; - sha512 = "s3VHRDaULFYhxjJ3vP9LUIt2aHLnUB4XFUSRhUVnW4/GDOb1EXCGWFd+wtYy6jTtBg/5TR5ApdC6sNu/SLcb5w=="; + url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-12.1.1.tgz"; + sha512 = "lPbpp9qZ/Me852OzWWOSwqbYa9clziRRRfX6qeRqJOuuc8qNOzvP2vC7quvQPSNcGpnDse2bNwePgxtWhWb5fQ=="; }; }; - "@textlint/ast-traverse-12.1.0" = { + "@textlint/ast-traverse-12.1.1" = { name = "_at_textlint_slash_ast-traverse"; packageName = "@textlint/ast-traverse"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-12.1.0.tgz"; - sha512 = "NJCCMS7lxZ6Ed15zsosbe/5i/SyynqQsxOYxhsMHuyU/adx27WzNWLoFbgTdz6Wmn3Ok1PSFf0442MpoS6SP7g=="; + url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-12.1.1.tgz"; + sha512 = "/hiESq9fwR+4X4U7VfkjhUtuIRuJwnJZpgA+WiSpIwK4Ps60WhB1VBxecyxgNmj3s3EsJn95nCCJntgpa3qQcA=="; }; }; - "@textlint/feature-flag-12.1.0" = { + "@textlint/feature-flag-12.1.1" = { name = "_at_textlint_slash_feature-flag"; packageName = "@textlint/feature-flag"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-12.1.0.tgz"; - sha512 = "pQfA2bUXimBQjxT5hVmGGuFf1Cwwx26kbrcwkGHsgxgXlXkg1zboby5UCMOjWda/TbJjynzqDO0JaU24Ms9fZg=="; + url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-12.1.1.tgz"; + sha512 = "NykyIJ7UCs3R1tjThAS6upScmZdia0N/prOT7j1HpMbn1QK61Kqz7M3KZb0T/nhko6jwfN0d3aNP3oMCb4Vyxg=="; }; }; - "@textlint/fixer-formatter-12.1.0" = { + "@textlint/fixer-formatter-12.1.1" = { name = "_at_textlint_slash_fixer-formatter"; packageName = "@textlint/fixer-formatter"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-12.1.0.tgz"; - sha512 = "ELG9ehkid+J0sRd0mVRbZ+2UOnLqowycrYsaHxDE+xf2s33OcogZa9i3Uact7y2oSCadX00oNLEhsQcwkAqvpw=="; + url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-12.1.1.tgz"; + sha512 = "9+f3WG1raKqY+ynS1JS/ESLNgUaKK1gIgK9ENESvrJA0zfg5I774LjjJ65catrorTdv+HHDG40aiD67Pmxdk9A=="; }; }; - "@textlint/kernel-12.1.0" = { + "@textlint/kernel-12.1.1" = { name = "_at_textlint_slash_kernel"; packageName = "@textlint/kernel"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-12.1.0.tgz"; - sha512 = "6crFn0Ng4Y8PnUvD8HdGMZUlxURx3YgbDv/Grp+7kg8qLlNAkvbyJ1cE8ZYJTF+PfJ1dK1FZmmlZsvrieI4KBQ=="; + url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-12.1.1.tgz"; + sha512 = "5f/miUMLBLUhBy0sJeLVs+34O3GaYyG7hAuTQG9p0ERUnXdJIGtoYU5O0Sfm+xWXPUOeQadK6E7IR+7fsX4Hhw=="; }; }; - "@textlint/linter-formatter-12.1.0" = { + "@textlint/linter-formatter-12.1.1" = { name = "_at_textlint_slash_linter-formatter"; packageName = "@textlint/linter-formatter"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-12.1.0.tgz"; - sha512 = "OoDvn7wD+pAV+W2loCKgxO9V11rYo14GVKkp8UktsqzeOzxxRY5iZUOALMOOde19fOklb2mEvs8AJ4lDaRDJVQ=="; + url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-12.1.1.tgz"; + sha512 = "yE4g+OA+jVqEpF5NayuFoH4l3vvXPT3+gGD9TYhkjBUGmIZ0n4sMzOtmb9R+McujvENwk+7jTZ0pfHtZtpVSHQ=="; }; }; - "@textlint/markdown-to-ast-12.1.0" = { + "@textlint/markdown-to-ast-12.1.1" = { name = "_at_textlint_slash_markdown-to-ast"; packageName = "@textlint/markdown-to-ast"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-12.1.0.tgz"; - sha512 = "22FRiXRxTrNVe1gbE18V8TxAtrWb9rKUb1+2mt5vXdgByZ+rHUJuEc4UonAiye/8+0eTrJ4brjPNXgYsJGeMKg=="; + url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-12.1.1.tgz"; + sha512 = "TmqFyNqi68YpkqKabrkMlPzeSJMfY/+Wsv1/r43uDFgSYyM9GiD0eIpP12uKyL8xLW+rgfbqXxeFwSo26Conqw=="; }; }; "@textlint/markdown-to-ast-6.1.7" = { @@ -7258,67 +8068,67 @@ let sha512 = "B0QtokeQR4a9+4q0NQr8T9l7A1fFihTN5Ze57tVgqW+3ymzXEouh8DvPHeNQ4T6jEkAThvdjk95mxAMpGRJ79w=="; }; }; - "@textlint/module-interop-12.1.0" = { + "@textlint/module-interop-12.1.1" = { name = "_at_textlint_slash_module-interop"; packageName = "@textlint/module-interop"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-12.1.0.tgz"; - sha512 = "J1VhFZ7lK1V3Ue7DCvZlGIFEuaongBCkir1XFL+f1yfhfQlgfM5TCp3OBBB6NhKPff8T6sPA9niBzMYr+NyKyA=="; + url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-12.1.1.tgz"; + sha512 = "SiF2NVMFny7OdZ3I+qclJXkuPLOylJVd+v3mPGF8Ri5yuDgOKrbqNyHFzz/Sn2AS0ZsIf04/pGNBQhB+fJOBRQ=="; }; }; - "@textlint/source-code-fixer-12.1.0" = { + "@textlint/source-code-fixer-12.1.1" = { name = "_at_textlint_slash_source-code-fixer"; packageName = "@textlint/source-code-fixer"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/source-code-fixer/-/source-code-fixer-12.1.0.tgz"; - sha512 = "3HEWCu8XlRpxK0UmUxGEzc4u0deaO0GtisqaEsCVHzlQFq6tzE+5VTdZ4ffon64UN8UV57EAC2ralEV/VgxkBQ=="; + url = "https://registry.npmjs.org/@textlint/source-code-fixer/-/source-code-fixer-12.1.1.tgz"; + sha512 = "+p7NE5W2Ie+a5dSXGG0onDrqQM9Quj9t9zQruqxN3Qm7F8JD3qBTx9XNZkzQKlnGtrN4x6FUp5wwH/X4BhHh1A=="; }; }; - "@textlint/text-to-ast-12.1.0" = { + "@textlint/text-to-ast-12.1.1" = { name = "_at_textlint_slash_text-to-ast"; packageName = "@textlint/text-to-ast"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-12.1.0.tgz"; - sha512 = "s45+d0E9+gMKz+LC9+sJamU7SVrPyGYsXVLDRM5oxqjdb0MeIfjIFj7xl52MUpAHnywbPSgakB6HHiryiEAmqQ=="; + url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-12.1.1.tgz"; + sha512 = "L+Wf6omQ9u/A+H8kr8Dv1bKQ7j5TeBJX7ShdZz+z0T3oOPDrpCHID6N/NbzuM+a1Q9s9UAG5gkqiROHNjXqUug=="; }; }; - "@textlint/textlint-plugin-markdown-12.1.0" = { + "@textlint/textlint-plugin-markdown-12.1.1" = { name = "_at_textlint_slash_textlint-plugin-markdown"; packageName = "@textlint/textlint-plugin-markdown"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-12.1.0.tgz"; - sha512 = "bS67fq4Ea2JdKO4mJM4sGSATVI1bw9++IfOIsx2rc01NfZlTxwz4kM8lrhvNFHGY4URaN1kCULSgupeI/u/Seg=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-12.1.1.tgz"; + sha512 = "gzQ205ClqECTblIdkpFkWL6M4nxr5oMON/jU6xbRdZ/Shy+OHLY7fP3R2L2RmAmMSE7C6ZWK5Lk7k9XaaUpgVA=="; }; }; - "@textlint/textlint-plugin-text-12.1.0" = { + "@textlint/textlint-plugin-text-12.1.1" = { name = "_at_textlint_slash_textlint-plugin-text"; packageName = "@textlint/textlint-plugin-text"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-12.1.0.tgz"; - sha512 = "ItqpVEYLDYQkEk0ixeD4wElqkgkDErAGGDN/QK4cmIvtBeVd/GSIQFS1pwC1/Abmd4dTK3j/9z/dov1gVFZB1Q=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-12.1.1.tgz"; + sha512 = "U3WFM2fPy0ifC9lVW0GXjF5h1Dquit3rLO6UisC9UF75Ic6JjelcypjHwpp1trx0/t5FXp+94R5uJEpM360A0g=="; }; }; - "@textlint/types-12.1.0" = { + "@textlint/types-12.1.1" = { name = "_at_textlint_slash_types"; packageName = "@textlint/types"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/types/-/types-12.1.0.tgz"; - sha512 = "O8RQUiGnBvBrwV/fLHp2vU+y3w223G+qKUzvW/k2eFwAdbtmCfordoKESXAIGuqAUZjgiM2+Mt3We1pY+tMR3g=="; + url = "https://registry.npmjs.org/@textlint/types/-/types-12.1.1.tgz"; + sha512 = "s0TjnEwEwp3fa8yEhEH8w/lFpih15wtQy2CYaKx0eMScl1bSh+0e8WhiGZaTiiJXAGwNCw6erxB0reBScdU/hA=="; }; }; - "@textlint/utils-12.1.0" = { + "@textlint/utils-12.1.1" = { name = "_at_textlint_slash_utils"; packageName = "@textlint/utils"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/utils/-/utils-12.1.0.tgz"; - sha512 = "WE0bxQ/q+PgSslqEBuDi4Z8ZskBA0ZEehmKqcsd0hpDWU4VRU/R9o/WVXwia0APbQxgXPYWaHf1Rb7FAKUcVcg=="; + url = "https://registry.npmjs.org/@textlint/utils/-/utils-12.1.1.tgz"; + sha512 = "ENAm6ro+OAh6XZZSeZIJQCrY07IHWB7DGM6SwtKEfxcA9joF1uS/sLPqKmcW9fyvLvMnloVUsfVlaoNsLJXDKA=="; }; }; "@tokenizer/token-0.1.1" = { @@ -7528,15 +8338,6 @@ let sha512 = "G4yqdVlhr6YhzLXFKy5F7HtRBU8Y23+iWy7UKthMq/OSQnL1hbsoeXESQ2LY8zEDlknipDG3nRGhUC9tkwvy/w=="; }; }; - "@types/basic-auth-1.1.3" = { - name = "_at_types_slash_basic-auth"; - packageName = "@types/basic-auth"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/basic-auth/-/basic-auth-1.1.3.tgz"; - sha512 = "W3rv6J0IGlxqgE2eQ2pTb0gBjaGtejQpJ6uaCjz3UQ65+TFTPC5/lAE+POfx1YLdjtxvejJzsIAfd3MxWiVmfg=="; - }; - }; "@types/bn.js-5.1.0" = { name = "_at_types_slash_bn.js"; packageName = "@types/bn.js"; @@ -7555,6 +8356,15 @@ let sha512 = "W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ=="; }; }; + "@types/body-parser-1.19.1" = { + name = "_at_types_slash_body-parser"; + packageName = "@types/body-parser"; + version = "1.19.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.1.tgz"; + sha512 = "a6bTJ21vFOGIkwM0kzh9Yr89ziVxq4vYH2fQ6N8AeipEzai/cFK6aGMArIkUeIdRIgpwQa+2bXiLuUJCpSf2Cg=="; + }; + }; "@types/body-parser-1.19.2" = { name = "_at_types_slash_body-parser"; packageName = "@types/body-parser"; @@ -7591,15 +8401,6 @@ let sha512 = "6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w=="; }; }; - "@types/chart.js-2.9.24" = { - name = "_at_types_slash_chart.js"; - packageName = "@types/chart.js"; - version = "2.9.24"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/chart.js/-/chart.js-2.9.24.tgz"; - sha512 = "AQI7X+ow3SaONl44JrHoL/5B+lCsJyG31UHZ5RP98Uh15hI/zjEkDsAb4EIm4P9TGfNhZLXw/nMc5w0u10+/fQ=="; - }; - }; "@types/clone-2.1.1" = { name = "_at_types_slash_clone"; packageName = "@types/clone"; @@ -7780,15 +8581,6 @@ let sha512 = "qdBo/2Y8MXaJ/2spKjDZocuq79GpnOhkwMHnK2GnVFa8WYFgfA+ei6sil3aeWQPCreOKIx9ogPpR5+7MaOqYAA=="; }; }; - "@types/engine.io-3.1.7" = { - name = "_at_types_slash_engine.io"; - packageName = "@types/engine.io"; - version = "3.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/engine.io/-/engine.io-3.1.7.tgz"; - sha512 = "qNjVXcrp+1sS8YpRUa714r0pgzOwESdW5UjHL7D/2ZFdBX0BXUXtg1LUrp+ylvqbvMcMWUy73YpRoxPN2VoKAQ=="; - }; - }; "@types/eslint-7.29.0" = { name = "_at_types_slash_eslint"; packageName = "@types/eslint"; @@ -7861,15 +8653,6 @@ let sha512 = "6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA=="; }; }; - "@types/express-4.17.8" = { - name = "_at_types_slash_express"; - packageName = "@types/express"; - version = "4.17.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.8.tgz"; - sha512 = "wLhcKh3PMlyA2cNAB9sjM1BntnhPMiM0JOBwPBqttjHev2428MLEB4AYVN+d8s2iyCVZac+o41Pflm/ZH5vLXQ=="; - }; - }; "@types/express-serve-static-core-4.17.28" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; @@ -7879,13 +8662,13 @@ let sha512 = "P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig=="; }; }; - "@types/fancy-log-1.3.0" = { - name = "_at_types_slash_fancy-log"; - packageName = "@types/fancy-log"; - version = "1.3.0"; + "@types/file-type-10.9.1" = { + name = "_at_types_slash_file-type"; + packageName = "@types/file-type"; + version = "10.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/fancy-log/-/fancy-log-1.3.0.tgz"; - sha512 = "mQjDxyOM1Cpocd+vm1kZBP7smwKZ4TNokFeds9LV7OZibmPJFEzY3+xZMrKfUdNT71lv8GoCPD6upKwHxubClw=="; + url = "https://registry.npmjs.org/@types/file-type/-/file-type-10.9.1.tgz"; + sha512 = "oq0fy8Jqj19HofanFsZ56o5anMDUQtFO9B3wfLqM9o42RyCe1WT+wRbSvRbL2l8ARZXNaJturHk0b442+0yi+g=="; }; }; "@types/fs-capacitor-2.0.0" = { @@ -7951,13 +8734,13 @@ let sha512 = "wLEm0QvaoawEDoTRwzTXp4b4jpwiJDvR5KMnFnVodm3scufTlBOWRD6N1OBf9TZMhjlNsSfcO5V+7AF4+Vy+9g=="; }; }; - "@types/hls.js-0.13.1" = { + "@types/hls.js-0.13.3" = { name = "_at_types_slash_hls.js"; packageName = "@types/hls.js"; - version = "0.13.1"; + version = "0.13.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/hls.js/-/hls.js-0.13.1.tgz"; - sha512 = "5sr71YcHBVHJY8DhM+L6O9WjAGS3jrie2hpBldVpd8sqvRvNTgIikTE6RxKya1ZvJCvUkZR2ewQarZaC4TRZLg=="; + url = "https://registry.npmjs.org/@types/hls.js/-/hls.js-0.13.3.tgz"; + sha512 = "Po8ZPCsAcPPuf5OODPEkb6cdWJ/w4BdX1veP7IIOc2WG0x1SW4GEQ1+FHKN1AMG2AePJfNUceJbh5PKtP92yRQ=="; }; }; "@types/html-minifier-terser-5.1.2" = { @@ -8068,13 +8851,13 @@ let sha512 = "c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw=="; }; }; - "@types/jquery-3.5.13" = { + "@types/jquery-3.5.14" = { name = "_at_types_slash_jquery"; packageName = "@types/jquery"; - version = "3.5.13"; + version = "3.5.14"; src = fetchurl { - url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.13.tgz"; - sha512 = "ZxJrup8nz/ZxcU0vantG+TPdboMhB24jad2uSap50zE7Q9rUeYlCF25kFMSmHR33qoeOgqcdHEp3roaookC0Sg=="; + url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.14.tgz"; + sha512 = "X1gtMRMbziVQkErhTQmSe2jFwwENA/Zr+PprCkF63vFq+Yt5PZ4AlKqgmeNlwgn7dhsXEK888eIW2520EpC+xg=="; }; }; "@types/js-levenshtein-1.1.1" = { @@ -8086,22 +8869,22 @@ let sha512 = "qC4bCqYGy1y/NP7dDVr7KJarn+PbX1nSpwA7JXdu0HxT3QYjO8MJ+cntENtHFVy2dRAyBV23OZ6MxsW1AM1L8g=="; }; }; - "@types/js-yaml-3.12.5" = { + "@types/js-yaml-3.12.7" = { name = "_at_types_slash_js-yaml"; packageName = "@types/js-yaml"; - version = "3.12.5"; + version = "3.12.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-3.12.5.tgz"; - sha512 = "JCcp6J0GV66Y4ZMDAQCXot4xprYB+Zfd3meK9+INSJeVZwJmHAW30BBEEkPzXswMXuiyReUGOP3GxrADc9wPww=="; + url = "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-3.12.7.tgz"; + sha512 = "S6+8JAYTE1qdsc9HMVsfY7+SgSuUU/Tp6TYTmITW0PZxiyIMvol3Gy//y69Wkhs0ti4py5qgR3uZH6uz/DNzJQ=="; }; }; - "@types/js-yaml-3.12.7" = { + "@types/js-yaml-4.0.4" = { name = "_at_types_slash_js-yaml"; packageName = "@types/js-yaml"; - version = "3.12.7"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-3.12.7.tgz"; - sha512 = "S6+8JAYTE1qdsc9HMVsfY7+SgSuUU/Tp6TYTmITW0PZxiyIMvol3Gy//y69Wkhs0ti4py5qgR3uZH6uz/DNzJQ=="; + url = "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-4.0.4.tgz"; + sha512 = "AuHubXUmg0AzkXH0Mx6sIxeY/1C110mm/EkE/gB1sTRz3h2dao2W/63q42SlVST+lICxz5Oki2hzYA6+KnnieQ=="; }; }; "@types/js-yaml-4.0.5" = { @@ -8131,6 +8914,15 @@ let sha512 = "qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ=="; }; }; + "@types/json-stable-stringify-1.0.33" = { + name = "_at_types_slash_json-stable-stringify"; + packageName = "@types/json-stable-stringify"; + version = "1.0.33"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/json-stable-stringify/-/json-stable-stringify-1.0.33.tgz"; + sha512 = "qEWiQff6q2tA5gcJGWwzplQcXdJtm+0oy6IHGHzlOf3eFAkGE/FIPXZK9ofWgNSHVp8AFFI33PJJshS0ei3Gvw=="; + }; + }; "@types/json5-0.0.29" = { name = "_at_types_slash_json5"; packageName = "@types/json5"; @@ -8185,13 +8977,13 @@ let sha512 = "HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA=="; }; }; - "@types/lodash-4.14.161" = { + "@types/lodash-4.14.176" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.161"; + version = "4.14.176"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.161.tgz"; - sha512 = "EP6O3Jkr7bXvZZSZYlsgt5DIjiGr0dXP1/jVEwVLTFgg0d+3lWVQkRavYVQszV7dYUwvg0B8R0MBDpcmXg7XIA=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.176.tgz"; + sha512 = "xZmuPTa3rlZoIbtDUyJKZQimJV3bxCmzMIO2c9Pz9afyDro6kr7R79GwcB6mRhuoPmV2p1Vb66WOJH7F886WKQ=="; }; }; "@types/lodash-4.14.178" = { @@ -8203,6 +8995,15 @@ let sha512 = "0d5Wd09ItQWH1qFbEyQ7oTQ3GZrMfth5JkbN3EvTKLXcHLRDSXeLnlvlOn0wvxVIwK5o2M8JzP/OWz7T3NRsbw=="; }; }; + "@types/lodash-4.14.179" = { + name = "_at_types_slash_lodash"; + packageName = "@types/lodash"; + version = "4.14.179"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.179.tgz"; + sha512 = "uwc1x90yCKqGcIOAT6DwOSuxnrAbpkdPsUOZtwrXb4D/6wZs+6qG7QnIawDuZWg0sWpxl+ltIKCaLoMlna678w=="; + }; + }; "@types/long-4.0.1" = { name = "_at_types_slash_long"; packageName = "@types/long"; @@ -8230,15 +9031,6 @@ let sha512 = "GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ=="; }; }; - "@types/material-design-lite-1.1.16" = { - name = "_at_types_slash_material-design-lite"; - packageName = "@types/material-design-lite"; - version = "1.1.16"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/material-design-lite/-/material-design-lite-1.1.16.tgz"; - sha512 = "559S2XW9YMwHznROJ4WFhZJOerJPuxLfqOX+LIKukyLo2NbVgpULwXUsrBlCwhZ4+ACHgVAE23CC3RS52lFxwA=="; - }; - }; "@types/mdast-3.0.10" = { name = "_at_types_slash_mdast"; packageName = "@types/mdast"; @@ -8284,15 +9076,6 @@ let sha512 = "Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ=="; }; }; - "@types/minimist-1.2.0" = { - name = "_at_types_slash_minimist"; - packageName = "@types/minimist"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.0.tgz"; - sha1 = "69a23a3ad29caf0097f06eda59b361ee2f0639f6"; - }; - }; "@types/minimist-1.2.2" = { name = "_at_types_slash_minimist"; packageName = "@types/minimist"; @@ -8302,22 +9085,13 @@ let sha512 = "jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ=="; }; }; - "@types/mithril-2.0.3" = { - name = "_at_types_slash_mithril"; - packageName = "@types/mithril"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/mithril/-/mithril-2.0.3.tgz"; - sha512 = "cZHOdO2IiXYeyjeDYdbOisSdfaJRzfmRo3zVzgu33IWTMA0KEQObp9fdvqcuYdPz93iJ1yCl19GcEjo/9yv+yA=="; - }; - }; - "@types/mkdirp-1.0.1" = { + "@types/mkdirp-1.0.2" = { name = "_at_types_slash_mkdirp"; packageName = "@types/mkdirp"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mkdirp/-/mkdirp-1.0.1.tgz"; - sha512 = "HkGSK7CGAXncr8Qn/0VqNtExEE+PHMWb+qlR1faHMao7ng6P3tAaoWWBMdva0gL5h4zprjIO89GJOLXsMcDm1Q=="; + url = "https://registry.npmjs.org/@types/mkdirp/-/mkdirp-1.0.2.tgz"; + sha512 = "o0K1tSO0Dx5X6xlU5F1D6625FawhC3dU3iqr25lluNv/+/QIVH8RLNEiVokgIZo+mz+87w/3Mkg/VvQS+J51fQ=="; }; }; "@types/mocha-7.0.2" = { @@ -8338,6 +9112,15 @@ let sha512 = "ekGvFhFgrc2zYQoX4JeZPmVzZxw6Dtllga7iGHzfbYIYkAMUx/sAFP2GdFpLff+vdHXu5fl7WX9AT+TtqYcsyw=="; }; }; + "@types/mongodb-4.0.6" = { + name = "_at_types_slash_mongodb"; + packageName = "@types/mongodb"; + version = "4.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/mongodb/-/mongodb-4.0.6.tgz"; + sha512 = "XTbn1Z1j7fHzC1Vkd9LYO48lO2C581r+oRCi/KNzcTHIri7hEaya8r9vxoHJiKr+oeUWVK69+9xr84Mp+aReaw=="; + }; + }; "@types/ms-0.7.31" = { name = "_at_types_slash_ms"; packageName = "@types/ms"; @@ -8347,22 +9130,13 @@ let sha512 = "iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA=="; }; }; - "@types/multer-1.4.4" = { + "@types/multer-1.4.7" = { name = "_at_types_slash_multer"; packageName = "@types/multer"; - version = "1.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/multer/-/multer-1.4.4.tgz"; - sha512 = "wdfkiKBBEMTODNbuF3J+qDDSqJxt50yB9pgDiTcFew7f97Gcc7/sM4HR66ofGgpJPOALWOqKAch4gPyqEXSkeQ=="; - }; - }; - "@types/mysql-2.15.15" = { - name = "_at_types_slash_mysql"; - packageName = "@types/mysql"; - version = "2.15.15"; + version = "1.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mysql/-/mysql-2.15.15.tgz"; - sha512 = "1GJnq7RwuFPRicMHdT53vza5v39nep9OKIbozxNUpFXP04CydcdWrqpZQ+MlVdlLFCisWnnt09xughajjWpFsw=="; + url = "https://registry.npmjs.org/@types/multer/-/multer-1.4.7.tgz"; + sha512 = "/SNsDidUFCvqqcWDwxv2feww/yqhNeTRL5CVoL3jU4Goc4kKEL10T7Eye65ZqPNi4HRx8sAEX59pV1aEH7drNA=="; }; }; "@types/nlcst-1.0.0" = { @@ -8401,13 +9175,13 @@ let sha512 = "Exw4yUWMBXM3X+8oqzJNRqZSwUAaS4+7NdvHqQuFi/d+synz++xmX3QIf+BFqneW8N31R8Ky+sikfZUXq07ggQ=="; }; }; - "@types/node-12.20.46" = { + "@types/node-12.20.47" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "12.20.46"; + version = "12.20.47"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.20.46.tgz"; - sha512 = "cPjLXj8d6anFPzFvOPxS3fvly3Shm5nTfl6g8X5smexixbuGUf7hfr21J5tX9JW+UPStp/5P5R8qrKL5IyVJ+A=="; + url = "https://registry.npmjs.org/@types/node/-/node-12.20.47.tgz"; + sha512 = "BzcaRsnFuznzOItW1WpQrDHM7plAa7GIDMZ6b5pnMbkqEtM/6WCOhvZar39oeMQP79gwvFUWjjptE7/KGcNqFg=="; }; }; "@types/node-13.13.52" = { @@ -8419,15 +9193,6 @@ let sha512 = "s3nugnZumCC//n4moGGe6tkNMyYEdaDBitVjwPxXmR5lnMG5dHePinH2EdxkG3Rh1ghFHHixAG4NJhpJW1rthQ=="; }; }; - "@types/node-14.11.1" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "14.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.11.1.tgz"; - sha512 = "oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw=="; - }; - }; "@types/node-14.17.34" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -8455,31 +9220,31 @@ let sha512 = "qjd88DrCxupx/kJD5yQgZdcYKZKSIGBVDIBE1/LTGcNm3d2Np/jxojkdePDdfnBHJc5W7vSMpbJ1aB7p/Py69A=="; }; }; - "@types/node-16.11.25" = { + "@types/node-16.11.26" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.11.25"; + version = "16.11.26"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.11.25.tgz"; - sha512 = "NrTwfD7L1RTc2qrHQD4RTTy4p0CO2LatKBEKEds3CaVuhoM/+DJzmWZl5f+ikR8cm8F5mfJxK+9rQq07gRiSjQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.11.26.tgz"; + sha512 = "GZ7bu5A6+4DtG7q9GsoHXy3ALcgeIHP4NnL0Vv2wu0uUB/yQex26v0tf6/na1mm0+bS9Uw+0DFex7aaKr2qawQ=="; }; }; - "@types/node-16.11.7" = { + "@types/node-16.11.6" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.11.7"; + version = "16.11.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.11.7.tgz"; - sha512 = "QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.11.6.tgz"; + sha512 = "ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w=="; }; }; - "@types/node-17.0.10" = { + "@types/node-16.11.7" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "17.0.10"; + version = "16.11.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-17.0.10.tgz"; - sha512 = "S/3xB4KzyFxYGCppyDt68yzBU9ysL88lSdIah4D6cptdcltc4NCPCAMc0+PCpg/lLIyC7IPvj2Z52OJWeIUkog=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.11.7.tgz"; + sha512 = "QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw=="; }; }; "@types/node-17.0.14" = { @@ -8500,15 +9265,6 @@ let sha512 = "zWt4SDDv1S9WRBNxLFxFRHxdD9tvH8f5/kg5/IaLFdnSNXsDY4eL3Q3XXN+VxUnWIhyVFDwcsmAprvwXoM/ClA=="; }; }; - "@types/node-17.0.16" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "17.0.16"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-17.0.16.tgz"; - sha512 = "ydLaGVfQOQ6hI1xK2A5nVh8bl0OGoIfYMxPWHqqYe9bTkWCfqiVvZoh2I/QF2sNSkZzZyROBoTefIEI+PB6iIA=="; - }; - }; "@types/node-17.0.17" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -8527,22 +9283,13 @@ let sha512 = "eKj4f/BsN/qcculZiRSujogjvp5O/k4lOW5m35NopjZM/QwLOR075a8pJW5hD+Rtdm2DaCVPENS6KtSQnUD6BA=="; }; }; - "@types/node-17.0.19" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "17.0.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-17.0.19.tgz"; - sha512 = "PfeQhvcMR4cPFVuYfBN4ifG7p9c+Dlh3yUZR6k+5yQK7wX3gDgVxBly4/WkBRs9x4dmcy1TVl08SY67wwtEvmA=="; - }; - }; - "@types/node-17.0.8" = { + "@types/node-17.0.21" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "17.0.8"; + version = "17.0.21"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-17.0.8.tgz"; - sha512 = "YofkM6fGv4gDJq78g4j0mMuGMkZVxZDgtU0JRdx6FgiJDG+0fY0GKVolOV8WqVmEhLCXkQRjwDdKyPxJp/uucg=="; + url = "https://registry.npmjs.org/@types/node/-/node-17.0.21.tgz"; + sha512 = "DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ=="; }; }; "@types/node-6.14.13" = { @@ -8626,24 +9373,6 @@ let sha512 = "Cf63Rv7jCQ0LaL8tNXmEyqTHuIJxRdlS5vMh1mj5voN4+QFhVZnlZruezqpWYDiJ8UTzhP0VmeLXCmBk66YrMQ=="; }; }; - "@types/pg-7.14.5" = { - name = "_at_types_slash_pg"; - packageName = "@types/pg"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/pg/-/pg-7.14.5.tgz"; - sha512 = "wqTKZmqkqXd1YiVRBT2poRrMIojwEi2bKTAAjUX6nEbzr98jc3cfR/7o7ZtubhH5xT7YJ6LRdRr1GZOgs8OUjg=="; - }; - }; - "@types/pg-types-2.2.0" = { - name = "_at_types_slash_pg-types"; - packageName = "@types/pg-types"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/pg-types/-/pg-types-2.2.0.tgz"; - sha512 = "a+fLdul8OczRvPWPf8eTb6wPhxzyWQwRGhNN0ugtOtk6yFOG53i2LwXaA0d2D6bsJlWxi6eCuGZLGoCcdOlWZA=="; - }; - }; "@types/prop-types-15.7.4" = { name = "_at_types_slash_prop-types"; packageName = "@types/prop-types"; @@ -8698,22 +9427,22 @@ let sha512 = "EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="; }; }; - "@types/rc-1.2.0" = { + "@types/rc-1.2.1" = { name = "_at_types_slash_rc"; packageName = "@types/rc"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/rc/-/rc-1.2.0.tgz"; - sha512 = "eEQ6Hq0K0VShe00iDzG1DKxA5liTsk7jgcR5eDZ5d5cnivLjPqqcDgqurS5NlQJNfgTNg51dp7zFGWHomr5NJQ=="; + url = "https://registry.npmjs.org/@types/rc/-/rc-1.2.1.tgz"; + sha512 = "+TRLFmHLnpoV0uw4O/PzqMbPT6bhQM0q2KO0l+R7M3sHYRndPpNL6kv8p7Ee9ZxgQ6noYB18/t+heQi7eijOHA=="; }; }; - "@types/react-16.14.23" = { + "@types/react-16.14.24" = { name = "_at_types_slash_react"; packageName = "@types/react"; - version = "16.14.23"; + version = "16.14.24"; src = fetchurl { - url = "https://registry.npmjs.org/@types/react/-/react-16.14.23.tgz"; - sha512 = "WngBZLuSkP4IAgPi0HOsGCHo6dn3CcuLQnCfC17VbA7YBgipZiZoTOhObwl/93DsFW0Y2a/ZXeonpW4DxirEJg=="; + url = "https://registry.npmjs.org/@types/react/-/react-16.14.24.tgz"; + sha512 = "e7U2WC8XQP/xfR7bwhOhNFZKPTfW1ph+MiqtudKb8tSV8RyCsovQx2sNVtKoOryjxFKpHPPC/yNiGfdeVM5Gyw=="; }; }; "@types/react-dom-16.9.14" = { @@ -8743,15 +9472,6 @@ let sha512 = "V8g8sBDLVeJJAfEENJS7VXZK+DRJ+jzPNtk8jpj2G+obhf+iqGNUDGwNWCbBhLiD+KpHhf3kWQlKBRi0tAeU4Q=="; }; }; - "@types/request-2.48.5" = { - name = "_at_types_slash_request"; - packageName = "@types/request"; - version = "2.48.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/request/-/request-2.48.5.tgz"; - sha512 = "/LO7xRVnL3DxJ1WkPGDQrp4VTV1reX9RkC85mJ+Qzykj2Bdw+mG15aAfDahc76HtknjzE16SX/Yddn6MxVbmGQ=="; - }; - }; "@types/request-2.48.7" = { name = "_at_types_slash_request"; packageName = "@types/request"; @@ -8851,22 +9571,31 @@ let sha512 = "JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ=="; }; }; - "@types/socket.io-2.1.11" = { + "@types/smoothscroll-polyfill-0.3.1" = { + name = "_at_types_slash_smoothscroll-polyfill"; + packageName = "@types/smoothscroll-polyfill"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/smoothscroll-polyfill/-/smoothscroll-polyfill-0.3.1.tgz"; + sha512 = "+KkHw4y+EyeCtVXET7woHUhIbfWFCflc0E0mZnSV+ZdjPQeHt/9KPEuT7gSW/kFQ8O3EG30PLO++YhChDt8+Ag=="; + }; + }; + "@types/socket.io-3.0.1" = { name = "_at_types_slash_socket.io"; packageName = "@types/socket.io"; - version = "2.1.11"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/socket.io/-/socket.io-2.1.11.tgz"; - sha512 = "bVprmqPhJMLb9ZCm8g0Xy8kwBFRbnanOWSxzWkDkkIwxTvud5tKMfAJymXX6LQbizUKCS1yima7JM4BeLqjNqA=="; + url = "https://registry.npmjs.org/@types/socket.io/-/socket.io-3.0.1.tgz"; + sha512 = "XSma2FhVD78ymvoxYV4xGXrIH/0EKQ93rR+YR0Y+Kw1xbPzLDCip/UWSejZ08FpxYeYNci/PZPQS9anrvJRqMA=="; }; }; - "@types/socket.io-client-1.4.33" = { + "@types/socket.io-client-1.4.36" = { name = "_at_types_slash_socket.io-client"; packageName = "@types/socket.io-client"; - version = "1.4.33"; + version = "1.4.36"; src = fetchurl { - url = "https://registry.npmjs.org/@types/socket.io-client/-/socket.io-client-1.4.33.tgz"; - sha512 = "m4LnxkljsI9fMsjwpW5QhRpMixo2BeeLpFmg0AE+sS4H1pzAd/cs/ftTiL60FLZgfFa8PFRPx5KsHu8O0bADKQ=="; + url = "https://registry.npmjs.org/@types/socket.io-client/-/socket.io-client-1.4.36.tgz"; + sha512 = "ZJWjtFBeBy1kRSYpVbeGYTElf6BqPQUkXDlHHD4k/42byCN5Rh027f4yARHCink9sKAkbtGZXEAmR0ZCnc2/Ag=="; }; }; "@types/sockjs-0.3.33" = { @@ -8887,13 +9616,22 @@ let sha512 = "K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA=="; }; }; - "@types/sqlite3-3.1.6" = { + "@types/source-map-support-0.5.4" = { + name = "_at_types_slash_source-map-support"; + packageName = "@types/source-map-support"; + version = "0.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/source-map-support/-/source-map-support-0.5.4.tgz"; + sha512 = "9zGujX1sOPg32XLyfgEB/0G9ZnrjthL/Iv1ZfuAjj8LEilHZEpQSQs1scpRXPhHzGYgWiLz9ldF1cI8JhL+yMw=="; + }; + }; + "@types/sqlite3-3.1.7" = { name = "_at_types_slash_sqlite3"; packageName = "@types/sqlite3"; - version = "3.1.6"; + version = "3.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/sqlite3/-/sqlite3-3.1.6.tgz"; - sha512 = "OBsK0KIGUICExQ/ZvnPY4cKx5Kz4NcrVyGTIvOL5y4ajXu7r++RfBajfpGfGDmDVCKcoCDX1dO84/oeyeITnxA=="; + url = "https://registry.npmjs.org/@types/sqlite3/-/sqlite3-3.1.7.tgz"; + sha512 = "8FHV/8Uzd7IwdHm5mvmF2Aif4aC/gjrt4axWD9SmfaxITnOjtOhCbOSTuqv/VbH1uq0QrwlaTj9aTz3gmR6u4w=="; }; }; "@types/stack-utils-2.0.1" = { @@ -8986,13 +9724,13 @@ let sha512 = "PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ=="; }; }; - "@types/url-join-4.0.0" = { + "@types/url-join-4.0.1" = { name = "_at_types_slash_url-join"; packageName = "@types/url-join"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/url-join/-/url-join-4.0.0.tgz"; - sha512 = "awrJu8yML4E/xTwr2EMatC+HBnHGoDxc2+ImA9QyeUELI1S7dOCIZcyjki1rkwoA8P2D2NVgLAJLjnclkdLtAw=="; + url = "https://registry.npmjs.org/@types/url-join/-/url-join-4.0.1.tgz"; + sha512 = "wDXw9LEEUHyV+7UWy7U315nrJGJ7p1BzaCxDpEoLr789Dk1WDVMMlf3iBfbG2F8NdWnYyFbtTxUn2ZNbm1Q4LQ=="; }; }; "@types/url-parse-1.4.8" = { @@ -9004,6 +9742,15 @@ let sha512 = "zqqcGKyNWgTLFBxmaexGUKQyWqeG7HjXj20EuQJSJWwXe54BjX0ihIo5cJB9yAQzH8dNugJ9GvkBYMjPXs/PJw=="; }; }; + "@types/uuid-3.4.10" = { + name = "_at_types_slash_uuid"; + packageName = "@types/uuid"; + version = "3.4.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.10.tgz"; + sha512 = "BgeaZuElf7DEYZhWYDTc/XcLZXdVgFkVSTa13BqKvbnmUrxr3TJFKofUxCtDO9UQOdhnV+HPOESdHiHKZOJV1A=="; + }; + }; "@types/vfile-3.0.2" = { name = "_at_types_slash_vfile"; packageName = "@types/vfile"; @@ -9031,13 +9778,22 @@ let sha512 = "ayJ0iOCDNHnKpKTgBG6Q6JOnHTj9zFta+3j2b8Ejza0e4cvRyMn0ZoLEmbPrTHe5YYRlDYPvPWVdV4cTaRyH7g=="; }; }; - "@types/vscode-1.64.0" = { + "@types/vscode-1.65.0" = { name = "_at_types_slash_vscode"; packageName = "@types/vscode"; - version = "1.64.0"; + version = "1.65.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.65.0.tgz"; + sha512 = "wQhExnh2nEzpjDMSKhUvnNmz3ucpd3E+R7wJkOhBNK3No6fG3VUdmVmMOKD0A8NDZDDDiQcLNxe3oGmX5SjJ5w=="; + }; + }; + "@types/webidl-conversions-6.1.1" = { + name = "_at_types_slash_webidl-conversions"; + packageName = "@types/webidl-conversions"; + version = "6.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.64.0.tgz"; - sha512 = "bSlAWz5WtcSL3cO9tAT/KpEH9rv5OBnm93OIIFwdCshaAiqr2bp1AUyEwW9MWeCvZBHEXc3V0fTYVdVyzDNwHA=="; + url = "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-6.1.1.tgz"; + sha512 = "XAahCdThVuCFDQLT7R7Pk/vqeObFNL3YqRyFZg+AqAP/W1/w3xHaIxuW7WszQqTbIBOPRcItYJIou3i/mppu3Q=="; }; }; "@types/webpack-4.41.32" = { @@ -9049,6 +9805,24 @@ let sha512 = "cb+0ioil/7oz5//7tZUSwbrSAN/NWHrQylz5cW8G0dWTcF/g+/dSdMlKVZspBYuMAN1+WnwHrkxiRrLcwd0Heg=="; }; }; + "@types/webpack-dev-server-3.11.6" = { + name = "_at_types_slash_webpack-dev-server"; + packageName = "@types/webpack-dev-server"; + version = "3.11.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/webpack-dev-server/-/webpack-dev-server-3.11.6.tgz"; + sha512 = "XCph0RiiqFGetukCTC3KVnY1jwLcZ84illFRMbyFzCcWl90B/76ew0tSqF46oBhnLC4obNDG7dMO0JfTN0MgMQ=="; + }; + }; + "@types/webpack-env-1.16.3" = { + name = "_at_types_slash_webpack-env"; + packageName = "@types/webpack-env"; + version = "1.16.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.16.3.tgz"; + sha512 = "9gtOPPkfyNoEqCQgx4qJKkuNm/x0R2hKR7fdl7zvTJyHnIisuE/LfvXOsYWL0o3qq6uiBnKZNNNzi3l0y/X+xw=="; + }; + }; "@types/webpack-sources-3.2.0" = { name = "_at_types_slash_webpack-sources"; packageName = "@types/webpack-sources"; @@ -9076,6 +9850,24 @@ let sha512 = "NbsqiNX9CnEfC1Z0Vf4mE1SgAJ07JnRYcNex7AJ9zAVzmiGHmjKFEk7O4TJIsgv2B1sLEb6owKFZrACwdYngsQ=="; }; }; + "@types/whatwg-url-8.2.1" = { + name = "_at_types_slash_whatwg-url"; + packageName = "@types/whatwg-url"; + version = "8.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-8.2.1.tgz"; + sha512 = "2YubE1sjj5ifxievI5Ge1sckb9k/Er66HyR2c+3+I6VDUUg1TLPdYYTEbQ+DjRkS4nTxMJhgWfSfMRD2sl2EYQ=="; + }; + }; + "@types/ws-6.0.4" = { + name = "_at_types_slash_ws"; + packageName = "@types/ws"; + version = "6.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/ws/-/ws-6.0.4.tgz"; + sha512 = "PpPrX7SZW9re6+Ha8ojZG4Se8AZXgf0GK6zmfqEuCsY49LFDNXO3SByp44X3dFEqtB73lkCDAdUazhAjVPiNwg=="; + }; + }; "@types/ws-7.4.7" = { name = "_at_types_slash_ws"; packageName = "@types/ws"; @@ -9103,13 +9895,13 @@ let sha512 = "NOn5eIcgWLOo6qW8AcuLZ7G8PycXu0xTxxkS6Q18VWFxgPUSOwV0pBj2a/4viNZVu25i7RIB7GttdkAIUUXOOg=="; }; }; - "@types/ws-8.2.3" = { + "@types/ws-8.5.2" = { name = "_at_types_slash_ws"; packageName = "@types/ws"; - version = "8.2.3"; + version = "8.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/ws/-/ws-8.2.3.tgz"; - sha512 = "ahRJZquUYCdOZf/rCsWg88S0/+cb9wazUBHv6HZEe3XdYaBe2zr/slM8J28X07Hn88Pnm4ezo7N8/ofnOgrPVQ=="; + url = "https://registry.npmjs.org/@types/ws/-/ws-8.5.2.tgz"; + sha512 = "VXI82ykONr5tacHEojnErTQk+KQSoYbW1NB6iz6wUwrNd+BqfkfggQNoNdCqhJSzbNumShPERbM+Pc5zpfhlbw=="; }; }; "@types/yargs-15.0.14" = { @@ -9130,13 +9922,13 @@ let sha512 = "T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw=="; }; }; - "@types/yargs-parser-20.2.1" = { + "@types/yargs-parser-21.0.0" = { name = "_at_types_slash_yargs-parser"; packageName = "@types/yargs-parser"; - version = "20.2.1"; + version = "21.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.1.tgz"; - sha512 = "7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw=="; + url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz"; + sha512 = "iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="; }; }; "@types/yauzl-2.9.2" = { @@ -9220,69 +10012,6 @@ let sha512 = "uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg=="; }; }; - "@uifabric/foundation-7.10.1" = { - name = "_at_uifabric_slash_foundation"; - packageName = "@uifabric/foundation"; - version = "7.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.10.1.tgz"; - sha512 = "Op05qHLBFEieT4+fG8OgpzqDHTQyei1dgVXDd6M4VS6CFJ5ZIPtC7Lwi+ZlkPkwUwccQ9mijuQumzpNKdv035A=="; - }; - }; - "@uifabric/icons-7.6.2" = { - name = "_at_uifabric_slash_icons"; - packageName = "@uifabric/icons"; - version = "7.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.6.2.tgz"; - sha512 = "q7jEIwB5Tt2Egw9fqdgNPlBqBQ6hNNMQ3qs5y4S4YETRluB+AQTdKbrbYMsXo3Pm0FsJnRfiDojMzxusGX+MWA=="; - }; - }; - "@uifabric/merge-styles-7.19.2" = { - name = "_at_uifabric_slash_merge-styles"; - packageName = "@uifabric/merge-styles"; - version = "7.19.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/merge-styles/-/merge-styles-7.19.2.tgz"; - sha512 = "kTlhwglDqwVgIaJq+0yXgzi65plGhmFcPrfme/rXUGMJZoU+qlGT5jXj5d3kuI59p6VB8jWEg9DAxHozhYeu0g=="; - }; - }; - "@uifabric/react-hooks-7.14.0" = { - name = "_at_uifabric_slash_react-hooks"; - packageName = "@uifabric/react-hooks"; - version = "7.14.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/react-hooks/-/react-hooks-7.14.0.tgz"; - sha512 = "Ndu/DEKHF4gFXEZa2AGgSkdWaj+njVrsSyXbkWRh2UZReFWnH1LMko9p/ZCwk1i9kAd5CUmyIfURUzIEya9YCg=="; - }; - }; - "@uifabric/set-version-7.0.24" = { - name = "_at_uifabric_slash_set-version"; - packageName = "@uifabric/set-version"; - version = "7.0.24"; - src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/set-version/-/set-version-7.0.24.tgz"; - sha512 = "t0Pt21dRqdC707/ConVJC0WvcQ/KF7tKLU8AZY7YdjgJpMHi1c0C427DB4jfUY19I92f60LOQyhJ4efH+KpFEg=="; - }; - }; - "@uifabric/styling-7.20.0" = { - name = "_at_uifabric_slash_styling"; - packageName = "@uifabric/styling"; - version = "7.20.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.20.0.tgz"; - sha512 = "SoaK5J4cwn8D9DWejRlWo+TmKZaHIiVlkIH+B2zLXE8Uc4ZYcotwYGxaSc1gCA16viLvGQkQU+ieWFq91RxdRw=="; - }; - }; - "@uifabric/utilities-7.33.5" = { - name = "_at_uifabric_slash_utilities"; - packageName = "@uifabric/utilities"; - version = "7.33.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/utilities/-/utilities-7.33.5.tgz"; - sha512 = "I+Oi0deD/xltSluFY8l2EVd/J4mvOaMljxKO2knSD9/KoGDlo/o5GN4gbnVo8nIt76HWHLAk3KtlJKJm6BhbIQ=="; - }; - }; "@ungap/promise-all-settled-1.1.2" = { name = "_at_ungap_slash_promise-all-settled"; packageName = "@ungap/promise-all-settled"; @@ -9355,6 +10084,78 @@ let sha512 = "98PTOukChScYXekWbDxPQEUCoX66W4188yx4Q4qiLTJgYRHsvQ5oWtNL5N0sz80mmYCk6aJglwnPE1d7tvgAmQ=="; }; }; + "@vscode/emmet-helper-2.8.4" = { + name = "_at_vscode_slash_emmet-helper"; + packageName = "@vscode/emmet-helper"; + version = "2.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@vscode/emmet-helper/-/emmet-helper-2.8.4.tgz"; + sha512 = "lUki5QLS47bz/U8IlG9VQ+1lfxMtxMZENmU5nu4Z71eOD5j9FK0SmYGL5NiVJg9WBWeAU0VxRADMY2Qpq7BfVg=="; + }; + }; + "@vue/cli-overlay-4.5.15" = { + name = "_at_vue_slash_cli-overlay"; + packageName = "@vue/cli-overlay"; + version = "4.5.15"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/cli-overlay/-/cli-overlay-4.5.15.tgz"; + sha512 = "0zI0kANAVmjFO2LWGUIzdGPMeE3+9k+KeRDXsUqB30YfRF7abjfiiRPq5BU9pOzlJbVdpRkisschBrvdJqDuDg=="; + }; + }; + "@vue/cli-plugin-eslint-4.5.12" = { + name = "_at_vue_slash_cli-plugin-eslint"; + packageName = "@vue/cli-plugin-eslint"; + version = "4.5.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/cli-plugin-eslint/-/cli-plugin-eslint-4.5.12.tgz"; + sha512 = "nbjGJkWxo/xdD32DwvnEAUwkWYsObpqNk9NuU7T62ehdzHPzz58o3j03YZ7a7T7Le8bYyOWMYsdNfz63F+XiZQ=="; + }; + }; + "@vue/cli-plugin-router-4.5.15" = { + name = "_at_vue_slash_cli-plugin-router"; + packageName = "@vue/cli-plugin-router"; + version = "4.5.15"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/cli-plugin-router/-/cli-plugin-router-4.5.15.tgz"; + sha512 = "q7Y6kP9b3k55Ca2j59xJ7XPA6x+iSRB+N4ac0ZbcL1TbInVQ4j5wCzyE+uqid40hLy4fUdlpl4X9fHJEwuVxPA=="; + }; + }; + "@vue/cli-plugin-typescript-4.5.13" = { + name = "_at_vue_slash_cli-plugin-typescript"; + packageName = "@vue/cli-plugin-typescript"; + version = "4.5.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/cli-plugin-typescript/-/cli-plugin-typescript-4.5.13.tgz"; + sha512 = "CpLlIdFNV1gn9uC4Yh6QgWI42uk2x5Z3cb2ScxNSwWsR1vgSdr0/1DdNzoBm68aP8RUtnHHO/HZfPnvXiq42xA=="; + }; + }; + "@vue/cli-plugin-vuex-4.5.13" = { + name = "_at_vue_slash_cli-plugin-vuex"; + packageName = "@vue/cli-plugin-vuex"; + version = "4.5.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/cli-plugin-vuex/-/cli-plugin-vuex-4.5.13.tgz"; + sha512 = "I1S9wZC7iI0Wn8kw8Zh+A2Qkf6s1M6vTGBkx8boXjuzfwEEyEHRxadsVCecZc8Mkpydo0nykj+MyYF96TKFuVA=="; + }; + }; + "@vue/cli-service-4.5.13" = { + name = "_at_vue_slash_cli-service"; + packageName = "@vue/cli-service"; + version = "4.5.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/cli-service/-/cli-service-4.5.13.tgz"; + sha512 = "CKAZN4iokMMsaUyJRU22oUAz3oS/X9sVBSKAF2/shFBV5xh3jqAlKl8OXZYz4cXGFLA6djNuYrniuLAo7Ku97A=="; + }; + }; + "@vue/cli-shared-utils-4.5.15" = { + name = "_at_vue_slash_cli-shared-utils"; + packageName = "@vue/cli-shared-utils"; + version = "4.5.15"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.5.15.tgz"; + sha512 = "SKaej9hHzzjKSOw1NlFmc6BSE0vcqUQMQiv1cxQ2DhVyy4QxZXBmzmiLBUBe+hYZZs1neXW7n//udeN9bCAY+Q=="; + }; + }; "@vue/cli-shared-utils-5.0.1" = { name = "_at_vue_slash_cli-shared-utils"; packageName = "@vue/cli-shared-utils"; @@ -9409,6 +10210,42 @@ let sha512 = "60zIlFfzIDf3u91cqfqy9KhCKIJgPeqxgveH2L+87RcGU/alT6BRrk5JtUso0OibH3O7NXuNOQ0cDc9beT0wrg=="; }; }; + "@vue/component-compiler-utils-3.3.0" = { + name = "_at_vue_slash_component-compiler-utils"; + packageName = "@vue/component-compiler-utils"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.3.0.tgz"; + sha512 = "97sfH2mYNU+2PzGrmK2haqffDpVASuib9/w2/noxiFi31Z54hW+q3izKQXXQZSNhtiUpAI36uSuYepeBe4wpHQ=="; + }; + }; + "@vue/eslint-config-prettier-6.0.0" = { + name = "_at_vue_slash_eslint-config-prettier"; + packageName = "@vue/eslint-config-prettier"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/eslint-config-prettier/-/eslint-config-prettier-6.0.0.tgz"; + sha512 = "wFQmv45c3ige5EA+ngijq40YpVcIkAy0Lihupnsnd1Dao5CBbPyfCzqtejFLZX1EwH/kCJdpz3t6s+5wd3+KxQ=="; + }; + }; + "@vue/eslint-config-typescript-7.0.0" = { + name = "_at_vue_slash_eslint-config-typescript"; + packageName = "@vue/eslint-config-typescript"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/eslint-config-typescript/-/eslint-config-typescript-7.0.0.tgz"; + sha512 = "UxUlvpSrFOoF8aQ+zX1leYiEBEm7CZmXYn/ZEM1zwSadUzpamx56RB4+Htdjisv1mX2tOjBegNUqH3kz2OL+Aw=="; + }; + }; + "@vue/preload-webpack-plugin-1.1.2" = { + name = "_at_vue_slash_preload-webpack-plugin"; + packageName = "@vue/preload-webpack-plugin"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/preload-webpack-plugin/-/preload-webpack-plugin-1.1.2.tgz"; + sha512 = "LIZMuJk38pk9U9Ur4YzHjlIyMuxPlACdBIHH9/nGYVTsaGKOSnSuELiE8vS9wa+dJpIYspYUOqk+L1Q4pgHQHQ=="; + }; + }; "@vue/shared-3.2.31" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; @@ -9418,6 +10255,15 @@ let sha512 = "ymN2pj6zEjiKJZbrf98UM2pfDd6F2H7ksKw7NDt/ZZ1fh5Ei39X5tABugtT03ZRlWd9imccoK0hE8hpjpU7irQ=="; }; }; + "@vue/web-component-wrapper-1.3.0" = { + name = "_at_vue_slash_web-component-wrapper"; + packageName = "@vue/web-component-wrapper"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz"; + sha512 = "Iu8Tbg3f+emIIMmI2ycSI8QcEuAUgPTgHwesDU1eKMLE4YC/c/sFbGc70QgMq31ijRftV0R7vCm9co6rldCeOA=="; + }; + }; "@webassemblyjs/ast-1.11.1" = { name = "_at_webassemblyjs_slash_ast"; packageName = "@webassemblyjs/ast"; @@ -10219,13 +11065,13 @@ let sha512 = "3SIr/jmyHDMkCzOtcH03YG9qTAJeE7auPg/V7e9tJrhiW329hNMhg8+VAO72Tp1AOi5bMhma09ACRS2Y9bMOKA=="; }; }; - "@xstate/fsm-1.6.4" = { + "@xstate/fsm-1.6.5" = { name = "_at_xstate_slash_fsm"; packageName = "@xstate/fsm"; - version = "1.6.4"; + version = "1.6.5"; src = fetchurl { - url = "https://registry.npmjs.org/@xstate/fsm/-/fsm-1.6.4.tgz"; - sha512 = "JvoozDB1ndz+byxXsQYW150gAJQIAKZt8MfU2a4dqGhhxfvHBKNj5e1rqb+adVCLtB+F/McyUBe4jRauFhTCTQ=="; + url = "https://registry.npmjs.org/@xstate/fsm/-/fsm-1.6.5.tgz"; + sha512 = "b5o1I6aLNeYlU/3CPlj/Z91ybk1gUsKT+5NAJI+2W4UjvS5KLG28K9v5UvNoFVjHV8PajVZ00RH3vnjyQO7ZAw=="; }; }; "@xtuc/ieee754-1.2.0" = { @@ -10363,6 +11209,15 @@ let sha512 = "h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg=="; }; }; + "abortcontroller-polyfill-1.7.3" = { + name = "abortcontroller-polyfill"; + packageName = "abortcontroller-polyfill"; + version = "1.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/abortcontroller-polyfill/-/abortcontroller-polyfill-1.7.3.tgz"; + sha512 = "zetDJxd89y3X99Kvo4qFx8GKlt6GsvN3UcRZHwU6iFA/0KiOmhkTVhe8oRoTBiTVPZu09x3vCra47+w8Yz1+2Q=="; + }; + }; "abstract-extension-3.1.1" = { name = "abstract-extension"; packageName = "abstract-extension"; @@ -10777,13 +11632,13 @@ let sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="; }; }; - "agentkeepalive-4.2.0" = { + "agentkeepalive-4.2.1" = { name = "agentkeepalive"; packageName = "agentkeepalive"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.0.tgz"; - sha512 = "0PhAp58jZNw13UJv7NVdTGb0ZcghHUb3DrZ046JiiJY/BOaTTpbwdHq2VObPCBV8M2GPh7sgrJ3AQ8Ey468LJw=="; + url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.1.tgz"; + sha512 = "Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA=="; }; }; "aggregate-error-3.1.0" = { @@ -11623,6 +12478,15 @@ let sha1 = "2af5c2b544a40e15fc1ac55548314397460845d0"; }; }; + "app-root-path-3.0.0" = { + name = "app-root-path"; + packageName = "app-root-path"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/app-root-path/-/app-root-path-3.0.0.tgz"; + sha512 = "qMcx+Gy2UZynHjOHOIXPNvpf+9cjvk3cWrBBK7zg4gH9+clobJRb9NGzcT7mQTcV/6Gm/1WelUtqxVXnNlrwcw=="; + }; + }; "appdata-path-1.0.0" = { name = "appdata-path"; packageName = "appdata-path"; @@ -11902,13 +12766,31 @@ let sha1 = "6e7207b4ecdb39b0af88303fa5ae22bda8df61cb"; }; }; - "aribts-1.3.5" = { - name = "aribts"; - packageName = "aribts"; - version = "1.3.5"; + "arib-mpeg2ts-parser-3.0.13" = { + name = "arib-mpeg2ts-parser"; + packageName = "arib-mpeg2ts-parser"; + version = "3.0.13"; + src = fetchurl { + url = "https://registry.npmjs.org/arib-mpeg2ts-parser/-/arib-mpeg2ts-parser-3.0.13.tgz"; + sha512 = "QgNZghj9R4dafXeBJbKZ0Ff5f7YENqQP/CDLAhWEWXdPoOOPUcQCu5zs3KHqeTKxg3/ip6i8a+aIu+J6QYICOg=="; + }; + }; + "arib-subtitle-timedmetadater-4.0.9" = { + name = "arib-subtitle-timedmetadater"; + packageName = "arib-subtitle-timedmetadater"; + version = "4.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/arib-subtitle-timedmetadater/-/arib-subtitle-timedmetadater-4.0.9.tgz"; + sha512 = "bfLMCjJlon8+GdOMP7gMIzTHaoxWBFTypREYsaTMlqgFw4O5WnYtU8xrDbeafp792zylvw2xHMIayXtgbRoj7Q=="; + }; + }; + "aribb24.js-1.8.8" = { + name = "aribb24.js"; + packageName = "aribb24.js"; + version = "1.8.8"; src = fetchurl { - url = "https://registry.npmjs.org/aribts/-/aribts-1.3.5.tgz"; - sha512 = "fvDR4iYpZkbMqMbTfKynPGfpXDhFTxzZWSS7C3c70xQ8ElmFkjwVrg/NLcEA+R3s4Jz6mVrz/1vOLEAI+ycrSQ=="; + url = "https://registry.npmjs.org/aribb24.js/-/aribb24.js-1.8.8.tgz"; + sha512 = "7tCEIOzDoDxvr5UuGTVDpszRYNcJFLRqAXf/lIbJi6DmeeDnfbYQdfr0DiRokG/MUSPx5rqyxRSyVSoWDanGNw=="; }; }; "aribts-2.1.12" = { @@ -13072,22 +13954,31 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.1077.0" = { + "aws-sdk-2.1085.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1077.0"; + version = "2.1085.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1077.0.tgz"; - sha512 = "orJvJROs8hJaQRfHsX7Zl5PxEgrD/uTXyqXz9Yu9Io5VVxzvnOty9oHmvEMSlgTIf1qd01gnev/vpvP1HgzKtw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1085.0.tgz"; + sha512 = "zL20v5QXoSsb2S6RKAhDmfnZYUIRldR93ihJ6mCYrw6Zl+Dir2SVmALy++U/zduDbKB4NaU72mscumx2RWc7Hg=="; }; }; - "aws-sdk-2.920.0" = { + "aws-sdk-2.1091.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.920.0"; + version = "2.1091.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.920.0.tgz"; - sha512 = "tbMZ/Y2rRo6R6TTBODJXTiil+MXaoT6Qzotws3yvI1IWGpYxKo7N/3L06XB8ul8tCG0TigxIOY70SMICM70Ppg=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1091.0.tgz"; + sha512 = "DSidFjHdZZopF2kBt6I5wlkxeV5xhXWWXtLtZVQw9g9RQxFnmm+B3iBf1mQtw9fPspfyKyQwnBUNnvMtPku3Yw=="; + }; + }; + "aws-sdk-2.1092.0" = { + name = "aws-sdk"; + packageName = "aws-sdk"; + version = "2.1092.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1092.0.tgz"; + sha512 = "8PH2rOgZazGT3VfGPkKcvzz2K9ylVfDniJH4WfJXHEBGxu0+XEMDbjuYpe8k/L1C7w0UTP6CuChjqCxgJznrxg=="; }; }; "aws-sign2-0.6.0" = { @@ -13189,15 +14080,6 @@ let sha512 = "XDG91XzLZ15reP12s3jFkKS8oiagSICjnLwxEYieme4+4h3ZveFOFRA4iYIG40RyHXsiI0mefFYYMFIJbMpWcg=="; }; }; - "b24.js-1.0.3" = { - name = "b24.js"; - packageName = "b24.js"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/b24.js/-/b24.js-1.0.3.tgz"; - sha512 = "j2hHu0asf6HxacVmGJKFSsrfoG8nC0JEjujIpsmRVkr74nC6o5gs6YF6AQD3e7YyJ8PaKuA7k2uSL9A2mAG9Og=="; - }; - }; "b4a-1.3.1" = { name = "b4a"; packageName = "b4a"; @@ -13495,13 +14377,13 @@ let sha512 = "Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A=="; }; }; - "babel-plugin-styled-components-2.0.3" = { + "babel-plugin-styled-components-2.0.6" = { name = "babel-plugin-styled-components"; packageName = "babel-plugin-styled-components"; - version = "2.0.3"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-2.0.3.tgz"; - sha512 = "lMrl3GdPrTl9daQJ70eRCPM9fHlvQx6YJNM7RqojKGbRnvG2AL7qvURlZ3L0GzRGnGr19SjvBKWcnlZZkgQ8/Q=="; + url = "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-2.0.6.tgz"; + sha512 = "Sk+7o/oa2HfHv3Eh8sxoz75/fFvEdHsXV4grdeHufX0nauCmymlnN0rGhIvfpMQSJMvGutJ85gvCGea4iqmDpg=="; }; }; "babel-plugin-syntax-flow-6.18.0" = { @@ -13648,15 +14530,6 @@ let sha512 = "VTtHsmvwRBkX3yLK4e+pFwk88BC6iNFqS2J8CCx2ddQc7RjXoRhuXXIgYCng21DYNty9IicCwDdTDjdr+TM7eg=="; }; }; - "babel-polyfill-6.23.0" = { - name = "babel-polyfill"; - packageName = "babel-polyfill"; - version = "6.23.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.23.0.tgz"; - sha1 = "8364ca62df8eafb830499f699177466c3b03499d"; - }; - }; "babel-preset-current-node-syntax-0.1.4" = { name = "babel-preset-current-node-syntax"; packageName = "babel-preset-current-node-syntax"; @@ -14674,13 +15547,13 @@ let sha1 = "ffd2eabc141d36ed5c1817df7e992f91fd7fc65c"; }; }; - "bittorrent-tracker-9.18.3" = { + "bittorrent-tracker-9.18.4" = { name = "bittorrent-tracker"; packageName = "bittorrent-tracker"; - version = "9.18.3"; + version = "9.18.4"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.18.3.tgz"; - sha512 = "IhLKp8wUgA7WXTfJggw/HB8qxhwlLNDWRraUFxXRHTgOQXcMiKITGcErzvC7B7mMOcUnk0wiUsZdaaQ8lzz3LQ=="; + url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.18.4.tgz"; + sha512 = "QpGYWMUab4CykgyJX/XcLdfQRp/Dg4qtGZqQTQlDtIXYHj9wnsO6dCH1jHWdGTyFfeofnuEjahUpaxquPZlyBQ=="; }; }; "bitwise-xor-0.0.0" = { @@ -15628,13 +16501,13 @@ let sha512 = "HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw=="; }; }; - "browserslist-4.19.3" = { + "browserslist-4.20.0" = { name = "browserslist"; packageName = "browserslist"; - version = "4.19.3"; + version = "4.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.19.3.tgz"; - sha512 = "XK3X4xtKJ+Txj8G5c30B4gsm71s69lqXlkYui4s6EkKxuv49qjYlY6oVd+IFJ73d4YymtM3+djvvt/R/iJwwDg=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.20.0.tgz"; + sha512 = "bnpOoa+DownbciXj0jVGENf8VYQnE2LNWomhYuCsMmmx9Jd9lwq0WXODuwpSsp8AVdKM2/HorrzxAfbKvWTByQ=="; }; }; "brq-0.1.8" = { @@ -15727,6 +16600,15 @@ let sha512 = "66UkjoB9f7lhT+WKgYq8MQa6nkr96mlX64JYMlIsXe/X4VeqNwvsx7UOE3ZqD6lkwg8GvBhapRTWj0qWO3Pw8w=="; }; }; + "bson-4.6.1" = { + name = "bson"; + packageName = "bson"; + version = "4.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bson/-/bson-4.6.1.tgz"; + sha512 = "I1LQ7Hz5zgwR4QquilLNZwbhPw0Apx7i7X9kGMBTsqPdml/03Q9NBtD9nt/19ahjlphktQImrnderxqpzeVDjw=="; + }; + }; "btc-rpc-client-git://github.com/btc21/btc-rpc-client" = { name = "bitcoin-core"; packageName = "bitcoin-core"; @@ -16016,15 +16898,6 @@ let sha1 = "3d253fe2f0ab70e851d728712e8cd6f914a8c002"; }; }; - "buffer-writer-2.0.0" = { - name = "buffer-writer"; - packageName = "buffer-writer"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-writer/-/buffer-writer-2.0.0.tgz"; - sha512 = "a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw=="; - }; - }; "buffer-xor-1.0.3" = { name = "buffer-xor"; packageName = "buffer-xor"; @@ -16412,6 +17285,15 @@ let sha512 = "7YKEapH+2Uikde8hySyfobXBqPKULDyHNl/lhKm7cKf/GJFdG/tU/WpLrOg2y9aUrQrWUilYqawFIiGJPS6gDA=="; }; }; + "cache-loader-4.1.0" = { + name = "cache-loader"; + packageName = "cache-loader"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cache-loader/-/cache-loader-4.1.0.tgz"; + sha512 = "ftOayxve0PwKzBF/GLsZNC9fJBXl8lkZE3TOsjkboHfVHVkL39iUEs1FO07A33mizmci5Dudt38UZrrYXDtbhw=="; + }; + }; "cacheable-lookup-2.0.1" = { name = "cacheable-lookup"; packageName = "cacheable-lookup"; @@ -16511,13 +17393,13 @@ let sha1 = "26d208ea89e37b5cbde60250a15f031c16a4d66b"; }; }; - "caller-0.0.1" = { + "caller-1.0.1" = { name = "caller"; packageName = "caller"; - version = "0.0.1"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/caller/-/caller-0.0.1.tgz"; - sha1 = "f37a1d6ea10e829d94721ae29a90bb4fb52ab767"; + url = "https://registry.npmjs.org/caller/-/caller-1.0.1.tgz"; + sha1 = "b851860f70e195db3d277395aa1a7e23ea30ecf5"; }; }; "caller-callsite-2.0.0" = { @@ -16763,13 +17645,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001312" = { + "caniuse-lite-1.0.30001314" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001312"; + version = "1.0.30001314"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001312.tgz"; - sha512 = "Wiz1Psk2MEK0pX3rUzWaunLTZzqS2JYZFzNKqAiJGiuxIjRPLgV6+VDPOg6lQOUxmDwhTlh198JsTTi8Hzw6aQ=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001314.tgz"; + sha512 = "0zaSO+TnCHtHJIbpLroX7nsD+vYuOVjl3uzFbJO1wMVbuveJA0RK2WcQA9ZUIOiO0/ArMiMgHJLxfEZhQiC0kw=="; }; }; "canvas-2.9.0" = { @@ -16925,31 +17807,31 @@ let sha512 = "eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg=="; }; }; - "cdk8s-1.5.22" = { + "cdk8s-1.5.39" = { name = "cdk8s"; packageName = "cdk8s"; - version = "1.5.22"; + version = "1.5.39"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.5.22.tgz"; - sha512 = "MVvvrRQPhQYK6EJ2RiyGZvGNihuqf//K03ga7R+otyTl8jDwEEoaOOfIXeemhXXqLixfqKOSUO1VJIALAt6/iQ=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.5.39.tgz"; + sha512 = "xwb0PxV5u3/Bubc1vda1Rz2hQcDiC2kiNBie/vgCyYt+Z70KGi5i5Cz9X3ZEHGb7yuAU4jk0LyVBQdPfUu3qIw=="; }; }; - "cdk8s-plus-22-1.0.0-beta.123" = { + "cdk8s-plus-22-1.0.0-beta.142" = { name = "cdk8s-plus-22"; packageName = "cdk8s-plus-22"; - version = "1.0.0-beta.123"; + version = "1.0.0-beta.142"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.123.tgz"; - sha512 = "ZEtP1rIhgdHONpR3JyANQwoKT5TfcaFIo41C4SF/Cbd/TbRMQLPc2BT+/+oc+/i/6J1IYuqTiY6H7HLFci84IA=="; + url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.142.tgz"; + sha512 = "Ted9JMqKBdKdXZp2kLaeWfYOU1/a7Fy8FnqGraxkzXYS7Gd6Cx/3PHT3SVl0sAnV9a0uhy/DLRVKWA+J6Dc+5w=="; }; }; - "cdktf-0.9.1" = { + "cdktf-0.9.4" = { name = "cdktf"; packageName = "cdktf"; - version = "0.9.1"; + version = "0.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf/-/cdktf-0.9.1.tgz"; - sha512 = "GOt29nXb2eM7DoqnErp98m1j4crPcplhK+kjb5ACF2hHXSgK4VWNNIxoYLDZBB/FtPJRXDLWwuI7mugBi0vncQ=="; + url = "https://registry.npmjs.org/cdktf/-/cdktf-0.9.4.tgz"; + sha512 = "CuTCNVV3Goptnq3daPVfs9boODEoIrjy09XAj9nkApcozgidPkNIkDcaJCo/7q3rxnoblsK9u2nj6CDUB8cTIg=="; }; }; "center-align-0.1.3" = { @@ -17087,13 +17969,13 @@ let sha512 = "oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="; }; }; - "chalk-5.0.0" = { + "chalk-5.0.1" = { name = "chalk"; packageName = "chalk"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-5.0.0.tgz"; - sha512 = "/duVOqst+luxCQRKEo4bNxinsOQtMP80ZYm7mMqzuh5PociNL0PvmHFvREJ9ueYL2TxlHjBcmLCdmocx9Vg+IQ=="; + url = "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz"; + sha512 = "Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w=="; }; }; "chance-1.0.18" = { @@ -17240,15 +18122,6 @@ let sha512 = "6dVyOOYjpfFcL1Y4qChrAoQLRHvj2ziyhcm0QJlhOcAhykL/k1kTUPbeo+87MNRTRdk2OIIsIXbuF3x2wi5EXg=="; }; }; - "chart.js-2.9.3" = { - name = "chart.js"; - packageName = "chart.js"; - version = "2.9.3"; - src = fetchurl { - url = "https://registry.npmjs.org/chart.js/-/chart.js-2.9.3.tgz"; - sha512 = "+2jlOobSk52c1VU6fzkh3UwqHMdSlgH1xFv9FKMqHiNCpXsGPQa/+81AFa+i3jZ253Mq9aAycPwDjnn1XbRNNw=="; - }; - }; "chart.js-3.7.1" = { name = "chart.js"; packageName = "chart.js"; @@ -17258,24 +18131,6 @@ let sha512 = "8knRegQLFnPQAheZV8MjxIXc5gQEfDFD897BJgv/klO/vtIyFFmgMXrNfgrXpbTr/XbTturxRgxIXx/Y+ASJBA=="; }; }; - "chartjs-color-2.4.1" = { - name = "chartjs-color"; - packageName = "chartjs-color"; - version = "2.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/chartjs-color/-/chartjs-color-2.4.1.tgz"; - sha512 = "haqOg1+Yebys/Ts/9bLo/BqUcONQOdr/hoEr2LLTRl6C5LXctUdHxsCYfvQVg5JIxITrfCNUDr4ntqmQk9+/0w=="; - }; - }; - "chartjs-color-string-0.6.0" = { - name = "chartjs-color-string"; - packageName = "chartjs-color-string"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz"; - sha512 = "TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A=="; - }; - }; "charwise-3.0.1" = { name = "charwise"; packageName = "charwise"; @@ -17690,6 +18545,15 @@ let sha512 = "4CoL/A3hf90V3VIEjeuhSvlGFEHKzOz+Wfc2IVZc+FaUgU0ZQafJTP49fvnULipOPcAfqhyI2duwQyns6xqjYA=="; }; }; + "clarify-error-1.0.0" = { + name = "clarify-error"; + packageName = "clarify-error"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clarify-error/-/clarify-error-1.0.0.tgz"; + sha512 = "f96oT3/Cdwz1eB+7RaH/XRR42lwGqVPnDl9NAm9ugT+BwAFoUS/pVnkgXUo/5UaUmwMMs6/GNFP8A8gCgmgvog=="; + }; + }; "clarinet-0.11.0" = { name = "clarinet"; packageName = "clarinet"; @@ -17735,15 +18599,6 @@ let sha1 = "bf1945e82fc808f55695e6ddeaec01400efd03ff"; }; }; - "clean-css-4.2.3" = { - name = "clean-css"; - packageName = "clean-css"; - version = "4.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz"; - sha512 = "VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA=="; - }; - }; "clean-css-4.2.4" = { name = "clean-css"; packageName = "clean-css"; @@ -17897,6 +18752,15 @@ let sha512 = "VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg=="; }; }; + "cli-highlight-2.1.11" = { + name = "cli-highlight"; + packageName = "cli-highlight"; + version = "2.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-highlight/-/cli-highlight-2.1.11.tgz"; + sha512 = "9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg=="; + }; + }; "cli-list-0.2.0" = { name = "cli-list"; packageName = "cli-list"; @@ -18536,13 +19400,13 @@ let sha512 = "3WQV/Fpa77nvzjUlc+0u53uIroJyyMB2Qwl++aXpAiDIsrsiAQq4uCURwdRBRX+eLkOTIAmT0L4qna3T7+2pUg=="; }; }; - "codemaker-1.54.0" = { + "codemaker-1.55.0" = { name = "codemaker"; packageName = "codemaker"; - version = "1.54.0"; + version = "1.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/codemaker/-/codemaker-1.54.0.tgz"; - sha512 = "83iPWGyIa089xWAomeTOmBVqgTa0p3k5KGav4kIVZzTLXqh5JiPCjpJr89kuts4O9vLSuvkCBCl8n0MVYP6nlQ=="; + url = "https://registry.npmjs.org/codemaker/-/codemaker-1.55.0.tgz"; + sha512 = "oVCJ3PUqkMf65pS8TtstLSn5AAGmuDTfrjlZjG8qOcOMHvG/w12iJ4ZlJt/wULaAqlYh9bTemXaGIzT5YbX43A=="; }; }; "codepage-1.4.0" = { @@ -19319,15 +20183,6 @@ let sha512 = "MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A=="; }; }; - "concat-with-sourcemaps-1.1.0" = { - name = "concat-with-sourcemaps"; - packageName = "concat-with-sourcemaps"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz"; - sha512 = "4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg=="; - }; - }; "conf-1.4.0" = { name = "conf"; packageName = "conf"; @@ -19553,6 +20408,15 @@ let sha1 = "5a25047bc76f73072667c8cb52c989888f494c63"; }; }; + "consolidate-0.15.1" = { + name = "consolidate"; + packageName = "consolidate"; + version = "0.15.1"; + src = fetchurl { + url = "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz"; + sha512 = "DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw=="; + }; + }; "constantinople-3.1.2" = { name = "constantinople"; packageName = "constantinople"; @@ -19580,22 +20444,22 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "constructs-10.0.68" = { + "constructs-10.0.84" = { name = "constructs"; packageName = "constructs"; - version = "10.0.68"; + version = "10.0.84"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-10.0.68.tgz"; - sha512 = "UoHYvlQDEXpSKHDJ5n5e2kcJwojswF0ASvuSyQDesziZN0QjSZBViylRknK1AJuWCelC9sad/ghk4E4a+D8axw=="; + url = "https://registry.npmjs.org/constructs/-/constructs-10.0.84.tgz"; + sha512 = "7Id7kN3oIlsr0IQ2ghC1I4xLWOUMorC9P0he007/TvrnA+2nmUjODRNYq536m/1tRV668H78dvZ4VQ6+ExOHIw=="; }; }; - "constructs-3.3.223" = { + "constructs-3.3.239" = { name = "constructs"; packageName = "constructs"; - version = "3.3.223"; + version = "3.3.239"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.223.tgz"; - sha512 = "WCCR/my4MohLT/OQWioU+0fOzXnMZMD5PHsxT4tnB3iKluGVJynDFCuQ7uNAfLs3rwSx09BIeJHc5B7ZUTVbbQ=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.239.tgz"; + sha512 = "Is6qgAkws98ZtOBro4E9Mjp6p4mkElvdURXNWx0ho40RbSBAOe/hYklP7nn1+k6hA1H/fcFkVZedgQrs2igj/A=="; }; }; "consume-http-header-1.0.0" = { @@ -20094,6 +20958,15 @@ let sha512 = "XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw=="; }; }; + "copy-webpack-plugin-5.1.2" = { + name = "copy-webpack-plugin"; + packageName = "copy-webpack-plugin"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-5.1.2.tgz"; + sha512 = "Uh7crJAco3AjBvgAy9Z75CjK8IG+gxaErro71THQ+vv/bl4HaQcpkexAY8KVW/T6D2W2IRr+couF/knIRkZMIQ=="; + }; + }; "copy-webpack-plugin-6.0.4" = { name = "copy-webpack-plugin"; packageName = "copy-webpack-plugin"; @@ -20310,13 +21183,13 @@ let sha512 = "H/2gurFWVi7xXvCyvsWRLCMekl4tITJcX0QEsDMpzxtuxDyM59xLatYNg4s/k9AA/HdtCYfj2su8mgA0GSDLDA=="; }; }; - "cosmiconfig-typescript-loader-1.0.5" = { + "cosmiconfig-typescript-loader-1.0.6" = { name = "cosmiconfig-typescript-loader"; packageName = "cosmiconfig-typescript-loader"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-1.0.5.tgz"; - sha512 = "FL/YR1nb8hyN0bAcP3MBaIoZravfZtVsN/RuPnoo6UVjqIrDxSNIpXHCGgJe0ZWy5yImpyD6jq5wCJ5f1nUv8g=="; + url = "https://registry.npmjs.org/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-1.0.6.tgz"; + sha512 = "2nEotziYJWtNtoTjKbchj9QrdTT6DBxCvqjNKoDKARw+e2yZmTQCa07uRrykLIZuvSgp69YXLH89UHc0WhdMfQ=="; }; }; "couch-login-0.1.20" = { @@ -20337,13 +21210,13 @@ let sha1 = "aba6c5833be410d45b1eca3e6d583844ce682c77"; }; }; - "cp-file-7.0.0" = { + "cp-file-9.1.0" = { name = "cp-file"; packageName = "cp-file"; - version = "7.0.0"; + version = "9.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cp-file/-/cp-file-7.0.0.tgz"; - sha512 = "0Cbj7gyvFVApzpK/uhCtQ/9kE9UnYpxMzaq5nQQC/Dh4iaj5fxp7iEFIullrYwzj8nf0qnsI1Qsx34hAeAebvw=="; + url = "https://registry.npmjs.org/cp-file/-/cp-file-9.1.0.tgz"; + sha512 = "3scnzFj/94eb7y4wyXRWwvzLFaQp87yyfTnChIjlfYrVqp5lVO3E2hIJMeQIltUT0K2ZAB3An1qXcBmwGyvuwA=="; }; }; "cpu-percentage-1.0.3" = { @@ -20364,13 +21237,13 @@ let sha512 = "PXHBvGLuL69u55IkLa5e5838fLhIMHxmkV4ge42a8alGyn7BtawYgI0hQ849EedvtHIOLNNH3i6eQU1BiE9SUA=="; }; }; - "cpy-8.1.2" = { + "cpy-9.0.1" = { name = "cpy"; packageName = "cpy"; - version = "8.1.2"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/cpy/-/cpy-8.1.2.tgz"; - sha512 = "dmC4mUesv0OYH2kNFEidtf/skUwv4zePmGeepjyyJ0qTo5+8KhA1o99oIAwVVLzQMAeDJml74d6wPPKb6EZUTg=="; + url = "https://registry.npmjs.org/cpy/-/cpy-9.0.1.tgz"; + sha512 = "D9U0DR5FjTCN3oMTcFGktanHnAG5l020yvOCR1zKILmAyPP7I/9pl6NFgRbDcmSENtbK1sQLBz1p9HIOlroiNg=="; }; }; "crc-0.2.0" = { @@ -20445,13 +21318,13 @@ let sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; }; }; - "create-gatsby-2.7.0" = { + "create-gatsby-2.9.0" = { name = "create-gatsby"; packageName = "create-gatsby"; - version = "2.7.0"; + version = "2.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-2.7.0.tgz"; - sha512 = "Le7r71ycNiPLq6RrOKXeONsotC57viwuajFuVfhAzXAgUmJSraHSeHT8S4Ydoa3nML1SyJiZaPB4CLC+Ju3gPQ=="; + url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-2.9.0.tgz"; + sha512 = "xl4bMKm4Buz4btVcU8FenspTJQdegv/4G2z7REKsTempdUWAU6wh8nyKlMWGNUJV2K8oQ6oGLXSJbL4a0LTglQ=="; }; }; "create-graphback-1.0.1" = { @@ -20499,13 +21372,13 @@ let sha512 = "dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ=="; }; }; - "create-torrent-5.0.1" = { + "create-torrent-5.0.2" = { name = "create-torrent"; packageName = "create-torrent"; - version = "5.0.1"; + version = "5.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/create-torrent/-/create-torrent-5.0.1.tgz"; - sha512 = "fVvg1YYSogo3TlU1WFeTt937nhGQlf5KtB6M2HyDa/U02dbeMBE2AY9PcPlMufXNQoM/UCO28y26EmuApM7ZmA=="; + url = "https://registry.npmjs.org/create-torrent/-/create-torrent-5.0.2.tgz"; + sha512 = "tNelixVeEkjiyeAuCW7uWFl1ARA+YapyZvdSWw6U3AXe/VXpxR4ihFNfjOzmvc5TBqK5EkGdsoKXAEKfQ8xlmQ=="; }; }; "cron-parser-2.18.0" = { @@ -20634,13 +21507,13 @@ let sha512 = "mkLtJJcYbDCxEG7Js6eUnUNndWjyUZwJ3H7bErmmtOYU/Zb99DyUkpamuIZE0b3bhmJyZ7D90uS6f+CGxRRjOw=="; }; }; - "cross-undici-fetch-0.1.24" = { + "cross-undici-fetch-0.1.25" = { name = "cross-undici-fetch"; packageName = "cross-undici-fetch"; - version = "0.1.24"; + version = "0.1.25"; src = fetchurl { - url = "https://registry.npmjs.org/cross-undici-fetch/-/cross-undici-fetch-0.1.24.tgz"; - sha512 = "83KDV6+8pYCn51zSM2cFAwqQ5UQtDaPm89RkUwHxEMDq/cdqYgqo1q+2eM/Xhmd8HeAsGTtecsC4crrQkCn0zg=="; + url = "https://registry.npmjs.org/cross-undici-fetch/-/cross-undici-fetch-0.1.25.tgz"; + sha512 = "KS6hm/VuRO+3jIrg4uidz3mQ8NWvCbiTTOg3yoH30zuGVUvjqZlnXw66h0kuzyfP21hDkrdIbufXCW6BAQdSNw=="; }; }; "crossroads-0.12.2" = { @@ -20823,6 +21696,15 @@ let sha512 = "BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA=="; }; }; + "css-declaration-sorter-6.1.4" = { + name = "css-declaration-sorter"; + packageName = "css-declaration-sorter"; + version = "6.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.1.4.tgz"; + sha512 = "lpfkqS0fctcmZotJGhnxkIyJWvBXgpyi2wsFd4J8VB7wzyrT6Ch/3Q+FMNJpjK4gu1+GN5khOnpU2ZVKrLbhCw=="; + }; + }; "css-functions-list-3.0.1" = { name = "css-functions-list"; packageName = "css-functions-list"; @@ -20868,15 +21750,6 @@ let sha1 = "a468ee667c16d81ccf05c58c38d2a97c780dbfd4"; }; }; - "css-ripple-effect-1.0.5" = { - name = "css-ripple-effect"; - packageName = "css-ripple-effect"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/css-ripple-effect/-/css-ripple-effect-1.0.5.tgz"; - sha1 = "6963b752aaf59babbd3fea3ec0da5d44e9122efb"; - }; - }; "css-select-1.0.0" = { name = "css-select"; packageName = "css-select"; @@ -21039,6 +21912,15 @@ let sha512 = "6gZm2htn7xIPJOHY824ERgj8cNPgPxyCSnkXc4v7YvNW+TdVfzgngHcEhy/8D11kUWRUMbke+tC+AUcUsnMz2g=="; }; }; + "cssnano-5.1.3" = { + name = "cssnano"; + packageName = "cssnano"; + version = "5.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cssnano/-/cssnano-5.1.3.tgz"; + sha512 = "bdf+sY2w4XV+F5LOCEd7fWnSeMeKBO4lKgoAKVWZOSTR7CmWEk1UW/s9ibTMMnsTsinBmIdgZs755sAGa1eoXQ=="; + }; + }; "cssnano-preset-default-4.0.8" = { name = "cssnano-preset-default"; packageName = "cssnano-preset-default"; @@ -21048,6 +21930,15 @@ let sha512 = "LdAyHuq+VRyeVREFmuxUZR1TXjQm8QQU/ktoo/x7bz+SdOge1YKc5eMN6pRW7YWBmyq59CqYba1dJ5cUukEjLQ=="; }; }; + "cssnano-preset-default-5.2.3" = { + name = "cssnano-preset-default"; + packageName = "cssnano-preset-default"; + version = "5.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.3.tgz"; + sha512 = "e4pzD/FnsvRywKO3i2Ti4jgAcJO5MhQPudrex92HXAJoMyQfS8lZHIzzC1yZ1t+d2zdkLXFY1sHdsZaT7lKoCQ=="; + }; + }; "cssnano-util-get-arguments-4.0.0" = { name = "cssnano-util-get-arguments"; packageName = "cssnano-util-get-arguments"; @@ -21084,6 +21975,15 @@ let sha512 = "WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q=="; }; }; + "cssnano-utils-3.1.0" = { + name = "cssnano-utils"; + packageName = "cssnano-utils"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz"; + sha512 = "JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA=="; + }; + }; "csso-2.0.0" = { name = "csso"; packageName = "csso"; @@ -21156,13 +22056,13 @@ let sha512 = "AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A=="; }; }; - "csstype-3.0.10" = { + "csstype-3.0.11" = { name = "csstype"; packageName = "csstype"; - version = "3.0.10"; + version = "3.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/csstype/-/csstype-3.0.10.tgz"; - sha512 = "2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA=="; + url = "https://registry.npmjs.org/csstype/-/csstype-3.0.11.tgz"; + sha512 = "sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw=="; }; }; "csurf-1.11.0" = { @@ -22407,13 +23307,13 @@ let sha512 = "eyTcpKOcamdhWJXj56DpQMo1ylSQpcGtGKXcU0Tb97+K56/CF5amAqqqNj0+KvA0iw2ynxtHWFsPDSClCxe48w=="; }; }; - "date-format-4.0.3" = { + "date-format-4.0.4" = { name = "date-format"; packageName = "date-format"; - version = "4.0.3"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/date-format/-/date-format-4.0.3.tgz"; - sha512 = "7P3FyqDcfeznLZp2b+OMitV9Sz2lUnsT87WaTat9nVwqsBkTzPG3lPLNwW3en6F4pHUiWzr6vb8CLhjdK9bcxQ=="; + url = "https://registry.npmjs.org/date-format/-/date-format-4.0.4.tgz"; + sha512 = "/jyf4rhB17ge328HJuJjAcmRtCsGd+NDeAtahRBTaK6vSPR6MO5HlrAit3Nn7dVjaa6sowW0WXt8yQtLyZQFRg=="; }; }; "date-now-0.1.4" = { @@ -22452,13 +23352,13 @@ let sha512 = "2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA=="; }; }; - "dayjs-1.10.7" = { + "dayjs-1.10.8" = { name = "dayjs"; packageName = "dayjs"; - version = "1.10.7"; + version = "1.10.8"; src = fetchurl { - url = "https://registry.npmjs.org/dayjs/-/dayjs-1.10.7.tgz"; - sha512 = "P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig=="; + url = "https://registry.npmjs.org/dayjs/-/dayjs-1.10.8.tgz"; + sha512 = "wbNwDfBHHur9UOzNUjeKUOJ0fCb0a52Wx0xInmQ7Y8FstyajiV1NmK1e00cxsr9YrE9r7yAChE0VvpuY5Rnlow=="; }; }; "dayjs-1.8.36" = { @@ -22470,6 +23370,15 @@ let sha512 = "3VmRXEtw7RZKAf+4Tv1Ym9AGeo8r8+CjDi26x+7SYQil1UqtqdaokhzoEJohqlzt0m5kacJSDhJQkG/LWhpRBw=="; }; }; + "de-indent-1.0.2" = { + name = "de-indent"; + packageName = "de-indent"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz"; + sha1 = "b2038e846dc33baa5796128d0804b455b8c1e21d"; + }; + }; "deasync-0.1.20" = { name = "deasync"; packageName = "deasync"; @@ -22686,6 +23595,15 @@ let sha1 = "6f6df6b85d7e7c4410a932ffc26489b78e9acd13"; }; }; + "decache-4.6.1" = { + name = "decache"; + packageName = "decache"; + version = "4.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/decache/-/decache-4.6.1.tgz"; + sha512 = "ohApBM8u9ygepJCjgBrEZSSxPjc0T/PJkD+uNyxXPkqudyUpdXpwJYp0VISm2WrPVzASU6DZyIi6BWdyw7uJ2Q=="; + }; + }; "decamelize-1.2.0" = { name = "decamelize"; packageName = "decamelize"; @@ -22893,15 +23811,6 @@ let sha512 = "+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw=="; }; }; - "deep-equal-0.1.2" = { - name = "deep-equal"; - packageName = "deep-equal"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/deep-equal/-/deep-equal-0.1.2.tgz"; - sha1 = "b246c2b80a570a47c11be1d9bd1070ec878b87ce"; - }; - }; "deep-equal-0.2.2" = { name = "deep-equal"; packageName = "deep-equal"; @@ -23010,6 +23919,15 @@ let sha512 = "8cZeTb1ZKC3bdSCP6XOM1IsTczIO73fdqtwa2B0N15eAz7gmyhQo+mc5gnFuulsgN3vIQYmTgbmQVKalH1dKvQ=="; }; }; + "deepmerge-1.5.2" = { + name = "deepmerge"; + packageName = "deepmerge"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz"; + sha512 = "95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ=="; + }; + }; "deepmerge-2.1.0" = { name = "deepmerge"; packageName = "deepmerge"; @@ -23073,6 +23991,15 @@ let sha512 = "h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA=="; }; }; + "default-gateway-5.0.5" = { + name = "default-gateway"; + packageName = "default-gateway"; + version = "5.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/default-gateway/-/default-gateway-5.0.5.tgz"; + sha512 = "z2RnruVmj8hVMmAnEJMTIJNijhKCDiGjbLP+BHJFOT7ld3Bo5qcIBpVYDniqhbMIIf+jZDlkP2MkPXiQy/DBLA=="; + }; + }; "default-gateway-6.0.3" = { name = "default-gateway"; packageName = "default-gateway"; @@ -23244,15 +24171,6 @@ let sha512 = "QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ=="; }; }; - "del-5.1.0" = { - name = "del"; - packageName = "del"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/del/-/del-5.1.0.tgz"; - sha512 = "wH9xOVHnczo9jN2IW68BabcecVPxacIA3g/7z6vhSU/4stOKQzeCRK0yD0A24WiAAUJmmVpWqrERcTxnLo3AnA=="; - }; - }; "del-6.0.0" = { name = "del"; packageName = "del"; @@ -23280,15 +24198,6 @@ let sha512 = "AyLvtyJdbv/U1GkiS6gUUzclRoAY4Gs75qkMygJJhU75LW4DNuSF2RMzpxs9jw9Oz1BobHjTdkG3zdP55VxAqw=="; }; }; - "delay-4.4.1" = { - name = "delay"; - packageName = "delay"; - version = "4.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/delay/-/delay-4.4.1.tgz"; - sha512 = "aL3AhqtfhOlT/3ai6sWXeqwnw63ATNpnUiN4HL7x9q+My5QtHlO3OIkasmug9LKzpheLdmUKGRKnYXYAS7FQkQ=="; - }; - }; "delay-5.0.0" = { name = "delay"; packageName = "delay"; @@ -23487,13 +24396,13 @@ let sha1 = "978857442c44749e4206613e37946205826abd80"; }; }; - "destroy-1.1.0" = { + "destroy-1.1.1" = { name = "destroy"; packageName = "destroy"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/destroy/-/destroy-1.1.0.tgz"; - sha512 = "R5QZrOXxSs0JDUIU/VANvRJlQVMts9C0L76HToQdPdlftfZCE7W6dyH0G4GZ5UW9fRqUOhAoCE2aGekuu+3HjQ=="; + url = "https://registry.npmjs.org/destroy/-/destroy-1.1.1.tgz"; + sha512 = "jxwFW+yrVOLdwqIWvowFOM8UPdhZnvOF6mhXQQLXMxBDLtv2JVJlVJPEwkDv9prqscEtGtmnxuuI6pQKStK1vA=="; }; }; "detab-1.0.2" = { @@ -23622,13 +24531,13 @@ let sha512 = "4INMPwNm9XRpBukhNbF7OB6fNTTCaI8pzy/fXg0xQzAy5h3zL1P8xT3QazgKqBrb/hAYwIBizqDBZ7GtJE74QQ=="; }; }; - "devtools-protocol-0.0.960912" = { + "devtools-protocol-0.0.969999" = { name = "devtools-protocol"; packageName = "devtools-protocol"; - version = "0.0.960912"; + version = "0.0.969999"; src = fetchurl { - url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.960912.tgz"; - sha512 = "I3hWmV9rWHbdnUdmMKHF2NuYutIM2kXz2mdXW8ha7TbRlGTVs+PF+PsB5QWvpCek4Fy9B+msiispCfwlhG5Sqg=="; + url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.969999.tgz"; + sha512 = "6GfzuDWU0OFAuOvBokXpXPLxjOJ5DZ157Ue3sGQQM3LgAamb8m0R0ruSfN0DDu+XG5XJgT50i6zZ/0o8RglreQ=="; }; }; "dezalgo-1.0.3" = { @@ -23883,13 +24792,13 @@ let sha512 = "cK6rH1PuGjSjpmEQbnpuTxq1Yv8B89SotyKUFcr4RhnsiZnfBfDOev7DD7v5vhtEyyj51NuMWFoRJzgy/m08Uw=="; }; }; - "diskusage-1.1.3" = { - name = "diskusage"; - packageName = "diskusage"; - version = "1.1.3"; + "diskusage-ng-1.0.2" = { + name = "diskusage-ng"; + packageName = "diskusage-ng"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/diskusage/-/diskusage-1.1.3.tgz"; - sha512 = "EAyaxl8hy4Ph07kzlzGTfpbZMNAAAHXSZtNEMwdlnSd1noHzvA6HsgKt4fEMSvaEXQYLSphe5rPMxN4WOj0hcQ=="; + url = "https://registry.npmjs.org/diskusage-ng/-/diskusage-ng-1.0.2.tgz"; + sha512 = "IO+Dbvxf5kXGuOEAHFCSf/aW9z/E96OwUH1Szstf2Rjzy+AP6sr/Y5yQh70fdX8SEFKdkTMpVG+b5jR7Uw3Q1Q=="; }; }; "diveSync-0.3.0" = { @@ -24387,6 +25296,15 @@ let sha512 = "HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w=="; }; }; + "dotenv-7.0.0" = { + name = "dotenv"; + packageName = "dotenv"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dotenv/-/dotenv-7.0.0.tgz"; + sha512 = "M3NhsLbV1i6HuGzBUH8vXrtxOk+tWmzWKDMbAVSUp3Zsjm7ywFeuwrUXhmhQyRK1q5B5GGy7hcXPbj3bnfZg2g=="; + }; + }; "dotenv-8.6.0" = { name = "dotenv"; packageName = "dotenv"; @@ -24855,13 +25773,22 @@ let sha512 = "WvaW1EgRinDQ61khHFZfx30rkPQG5ItaOT0wrI7iJv9A3SbghriQGfZQfHZs25fWLBe6/vkv05LOqg6aDw6Wzw=="; }; }; - "electron-to-chromium-1.4.71" = { + "electron-to-chromium-1.4.81" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.71"; + version = "1.4.81"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.71.tgz"; - sha512 = "Hk61vXXKRb2cd3znPE9F+2pLWdIOmP7GjiTj45y6L3W/lO+hSnUSUhq+6lEaERWBdZOHbk2s3YV5c9xVl3boVw=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.81.tgz"; + sha512 = "Gs7xVpIZ7tYYSDA+WgpzwpPvfGwUk3KSIjJ0akuj5XQHFdyQnsUoM76EA4CIHXNLPiVwTwOFay9RMb0ChG3OBw=="; + }; + }; + "electron-to-chromium-1.4.82" = { + name = "electron-to-chromium"; + packageName = "electron-to-chromium"; + version = "1.4.82"; + src = fetchurl { + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.82.tgz"; + sha512 = "Ks+ANzLoIrFDUOJdjxYMH6CMKB8UQo5modAwvSZTxgF+vEs/U7G5IbWFUp6dS4klPkTDVdxbORuk8xAXXhMsWw=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -25208,13 +26135,22 @@ let sha512 = "t5z6zjXuVLhXDMiFJPYsPOWEER8B0tIsD3ETgw19S1yg9zryvUfY3Vhtk3Gf4sihw/bQGIqQ//gjvVlu+Ca0bQ=="; }; }; - "engine.io-6.1.2" = { + "engine.io-6.0.1" = { name = "engine.io"; packageName = "engine.io"; - version = "6.1.2"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-6.1.2.tgz"; - sha512 = "v/7eGHxPvO2AWsksyx2PUsQvBafuvqs0jJJQ0FdmJG1b9qIvgSbqDRGwNhfk2XHaTTbTXiC4quRE8Q9nRjsrQQ=="; + url = "https://registry.npmjs.org/engine.io/-/engine.io-6.0.1.tgz"; + sha512 = "Y53UaciUh2Rmx5MiogtMxOQcfh7pnemday+Bb4QDg0Wjmnvo/VTvuEyNGQgYmh8L7VOe8Je1QuiqjLNDelMqLA=="; + }; + }; + "engine.io-6.1.3" = { + name = "engine.io"; + packageName = "engine.io"; + version = "6.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io/-/engine.io-6.1.3.tgz"; + sha512 = "rqs60YwkvWTLLnfazqgZqLa/aKo+9cueVfEi/dZ8PyGyaf8TLOxj++4QMIgeG3Gn0AhrWiFXvghsoY9L9h25GA=="; }; }; "engine.io-client-1.3.1" = { @@ -25253,6 +26189,15 @@ let sha512 = "QEqIp+gJ/kMHeUun7f5Vv3bteRHppHH/FMBQX/esFj/fuYfjyUKWGMo3VCvIP/V8bE9KcjHmRZrhIz2Z9oNsDA=="; }; }; + "engine.io-client-6.0.3" = { + name = "engine.io-client"; + packageName = "engine.io-client"; + version = "6.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.0.3.tgz"; + sha512 = "IH8ZhDIwiLv0d/wXVzmjfV9Y82hbJIDhCGSVUV8o1kcpDe2I6Y3bZA3ZbJy4Ls7k7IVmcy/qn4k9RKWFhUGf5w=="; + }; + }; "engine.io-parser-1.0.6" = { name = "engine.io-parser"; packageName = "engine.io-parser"; @@ -25316,13 +26261,13 @@ let sha512 = "Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg=="; }; }; - "enhanced-resolve-5.9.0" = { + "enhanced-resolve-5.9.2" = { name = "enhanced-resolve"; packageName = "enhanced-resolve"; - version = "5.9.0"; + version = "5.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.0.tgz"; - sha512 = "weDYmzbBygL7HzGGS26M3hGQx68vehdEg6VUmqSOaFzXExFqlnKuSvsEJCVGQHScS8CQMbrAqftT+AzzHNt/YA=="; + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.2.tgz"; + sha512 = "GIm3fQfwLJ8YZx2smuHpBKkXC1yOk+OBEmKckVyL0i/ea8mqDEykK3ld5dgH1QYPNyT/lIllxV2LULnxCHaHkA=="; }; }; "enquirer-2.3.6" = { @@ -25397,6 +26342,15 @@ let sha512 = "p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="; }; }; + "entities-3.0.1" = { + name = "entities"; + packageName = "entities"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz"; + sha512 = "WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q=="; + }; + }; "env-editor-0.4.2" = { name = "env-editor"; packageName = "env-editor"; @@ -25523,6 +26477,15 @@ let sha512 = "d51brTeqC+BHlwF0BhPtcYgF5nlzf9ZZ0ZIUQNZpc9ZB9qw5IJ2diTrBY9jlCJkTLITYPjmiX6OWCwH+fuyNgQ=="; }; }; + "error-stack-parser-2.0.7" = { + name = "error-stack-parser"; + packageName = "error-stack-parser"; + version = "2.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.0.7.tgz"; + sha512 = "chLOW0ZGRf4s8raLrDxa5sdkvPec5YdvwbFnqJme4rk0rFajP8mPtrDL1+I+CwrQDCjswDA5sREX7jYQDQs9vA=="; + }; + }; "errorhandler-1.5.1" = { name = "errorhandler"; packageName = "errorhandler"; @@ -25577,13 +26540,13 @@ let sha1 = "5dae3e650e5be3684b88066513d528d092629862"; }; }; - "es5-ext-0.10.53" = { + "es5-ext-0.10.58" = { name = "es5-ext"; packageName = "es5-ext"; - version = "0.10.53"; + version = "0.10.58"; src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz"; - sha512 = "Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q=="; + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.58.tgz"; + sha512 = "LHO+KBBaHGwjy32ibSaMY+ZzjpC4K4I5bPoijICMBL7gXEXfrEUrzssmNP+KigbQEp1dRUnGkry/vUnxOqptLQ=="; }; }; "es6-error-4.1.1" = { @@ -25892,6 +26855,15 @@ let sha512 = "S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg=="; }; }; + "eslint-6.8.0" = { + name = "eslint"; + packageName = "eslint"; + version = "6.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint/-/eslint-6.8.0.tgz"; + sha512 = "K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig=="; + }; + }; "eslint-7.32.0" = { name = "eslint"; packageName = "eslint"; @@ -25910,6 +26882,24 @@ let sha512 = "H3KXAzQGBH1plhYS3okDix2ZthuYJlQQEGE5k0IKuEqUSiyu4AmxxlJ2MtTYeJ3xB4jDhcYCwGOg2TXYdnDXlQ=="; }; }; + "eslint-config-prettier-6.15.0" = { + name = "eslint-config-prettier"; + packageName = "eslint-config-prettier"; + version = "6.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.15.0.tgz"; + sha512 = "a1+kOYLR8wMGustcgAjdydMsQ2A/2ipRPwRKUmfYaSxc9ZPcrku080Ctl6zrZzZNs/U82MjSv+qKREkoq3bJaw=="; + }; + }; + "eslint-config-prettier-8.3.0" = { + name = "eslint-config-prettier"; + packageName = "eslint-config-prettier"; + version = "8.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz"; + sha512 = "BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew=="; + }; + }; "eslint-formatter-pretty-4.1.0" = { name = "eslint-formatter-pretty"; packageName = "eslint-formatter-pretty"; @@ -25919,6 +26909,15 @@ let sha512 = "IsUTtGxF1hrH6lMWiSl1WbGaiP01eT6kzywdY1U+zLc0MP+nwEnUiS9UI8IaOTUhTeQJLlCEWIbXINBH4YJbBQ=="; }; }; + "eslint-loader-2.2.1" = { + name = "eslint-loader"; + packageName = "eslint-loader"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-loader/-/eslint-loader-2.2.1.tgz"; + sha512 = "RLgV9hoCVsMLvOxCuNjdqOrUqIj9oJg8hF44vzJaYqsAHuY9G2YAeN3joQ9nxP0p5Th9iFSIpKo+SD8KISxXRg=="; + }; + }; "eslint-plugin-no-unsanitized-4.0.1" = { name = "eslint-plugin-no-unsanitized"; packageName = "eslint-plugin-no-unsanitized"; @@ -25928,6 +26927,15 @@ let sha512 = "y/lAMWnPPC7RYuUdxlEL/XiCL8FehN9h9s3Kjqbp/Kv0i9NZs+IXSC2kS546Fa4Bumwy31HlVS/OdWX0Kxb5Xg=="; }; }; + "eslint-plugin-prettier-3.4.1" = { + name = "eslint-plugin-prettier"; + packageName = "eslint-plugin-prettier"; + version = "3.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.1.tgz"; + sha512 = "htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g=="; + }; + }; "eslint-plugin-vue-6.2.2" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; @@ -26549,15 +27557,6 @@ let sha1 = "b5e1079b59fb5e1ba2771c0a993be060a58c99ba"; }; }; - "eventemitter3-3.1.0" = { - name = "eventemitter3"; - packageName = "eventemitter3"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz"; - sha512 = "ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA=="; - }; - }; "eventemitter3-3.1.2" = { name = "eventemitter3"; packageName = "eventemitter3"; @@ -26891,13 +27890,13 @@ let sha512 = "bILEG0Fg+ZhIhdEaShHzsEN1WC0hUmXJ5Kcd4cd+8rVk1Ead9vRZxA/yLx1cNBDCOwMe0GAMrhF7TKT+A1P+YA=="; }; }; - "expo-pwa-0.0.113" = { + "expo-pwa-0.0.114" = { name = "expo-pwa"; packageName = "expo-pwa"; - version = "0.0.113"; + version = "0.0.114"; src = fetchurl { - url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.113.tgz"; - sha512 = "uKmNgSMrZs/dUy1yIqXBFELmjuVtvSJzNoscTMN1ehdBa8QJqz/d3QGdu/IVlYNWxqCvAaqHXY/x6WseA3X3dg=="; + url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.114.tgz"; + sha512 = "vJCpKROPULPrTnLTCytZuxBkm23yS9CBXBald2BDeizgKsJV19vOc2+lmTk4fL5hh+TgHQybwtt6UwEy3ORjgg=="; }; }; "express-2.5.11" = { @@ -27008,22 +28007,22 @@ let sha1 = "dbe1e8139aecb234fb6adb5c0059c75db9733d2a"; }; }; - "express-openapi-6.0.0" = { + "express-openapi-8.0.0" = { name = "express-openapi"; packageName = "express-openapi"; - version = "6.0.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/express-openapi/-/express-openapi-6.0.0.tgz"; - sha512 = "WQGmghzn+loQsIQUEnLZ0HVKCLhIBVcURvrAhyt6mOqsFsG2tBYhaNKX728EOz2aMXRhEQhkQ+RXQsIFpbS6IA=="; + url = "https://registry.npmjs.org/express-openapi/-/express-openapi-8.0.0.tgz"; + sha512 = "MUntG3qQKdU5eRG51WLglaUfIXrVagQHNmStwl44lzu6XKiMj4TBDm/cIbubO49HAMCqNkX5BaiKCOK6pvP5Wg=="; }; }; - "express-openapi-7.0.1" = { + "express-openapi-9.3.0" = { name = "express-openapi"; packageName = "express-openapi"; - version = "7.0.1"; + version = "9.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/express-openapi/-/express-openapi-7.0.1.tgz"; - sha512 = "64YwTWpxgVGnwoLi4zvKaQ5RWIV0dkxVE4GGkBF7D89RI0/I6gTRUDL25Il4AK3cUqyLtxnX2X5BZ2YRvRx5uQ=="; + url = "https://registry.npmjs.org/express-openapi/-/express-openapi-9.3.0.tgz"; + sha512 = "92H8nuvO1vVMutapDqQXESOxFnaC4/tZAXSi7kJMD+xWXZwNwmuinCxbfQc7JyUY6Y3+vjFXqJ7xeTCpsUhSiA=="; }; }; "express-prom-bundle-6.3.0" = { @@ -27566,13 +28565,13 @@ let sha1 = "a45aff345196006d406ca6cdcd05f69051ef35b8"; }; }; - "fast-redact-3.1.0" = { + "fast-redact-3.1.1" = { name = "fast-redact"; packageName = "fast-redact"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/fast-redact/-/fast-redact-3.1.0.tgz"; - sha512 = "dir8LOnvialLxiXDPESMDHGp82CHi6ZEYTVkcvdn5d7psdv9ZkkButXrOeXST4aqreIRR+N7CYlsrwFuorurVg=="; + url = "https://registry.npmjs.org/fast-redact/-/fast-redact-3.1.1.tgz"; + sha512 = "odVmjC8x8jNeMZ3C+rPMESzXVSEU8tSWSHv9HFxP2mm89G/1WwqhrerJDQm9Zus8X6aoRgQDThKqptdNA6bt+A=="; }; }; "fast-safe-stringify-1.2.3" = { @@ -27836,6 +28835,15 @@ let sha512 = "ZQJM4aifMpz6H19AW1VqvZ7l4pOE9p7i/3LyxgO2kp+PO/VcDYNqIHEMtkccqIhTXMKci4kjueJr/iCQEaT/Ww=="; }; }; + "figlet-1.5.2" = { + name = "figlet"; + packageName = "figlet"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/figlet/-/figlet-1.5.2.tgz"; + sha512 = "WOn21V8AhyE1QqVfPIVxe3tupJacq1xGkPTB4iagT6o+P2cAgEOOwIxMftr4+ZCTI6d551ij9j61DFr0nsP2uQ=="; + }; + }; "figures-1.7.0" = { name = "figures"; packageName = "figures"; @@ -27917,6 +28925,15 @@ let sha512 = "4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw=="; }; }; + "file-loader-4.3.0" = { + name = "file-loader"; + packageName = "file-loader"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-loader/-/file-loader-4.3.0.tgz"; + sha512 = "aKrYPYjF1yG3oX0kWRrqrSMfgftm7oJW5M+m4owoldH5C51C0RkIwB++JbRvEW3IU6/ZG5n8UvEcdgwOt2UOWA=="; + }; + }; "file-loader-6.0.0" = { name = "file-loader"; packageName = "file-loader"; @@ -27926,6 +28943,15 @@ let sha512 = "/aMOAYEFXDdjG0wytpTL5YQLfZnnTmLNjn+AIrJ/6HVnTfDqLsVKUUwkDf4I4kgex36BvjuXEn/TX9B/1ESyqQ=="; }; }; + "file-loader-6.2.0" = { + name = "file-loader"; + packageName = "file-loader"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz"; + sha512 = "qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw=="; + }; + }; "file-or-stdin-1.0.2" = { name = "file-or-stdin"; packageName = "file-or-stdin"; @@ -28241,6 +29267,15 @@ let sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; }; }; + "find-cache-dir-0.1.1" = { + name = "find-cache-dir"; + packageName = "find-cache-dir"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-0.1.1.tgz"; + sha1 = "c8defae57c8a52a8a784f9e31c57c742e993a0b9"; + }; + }; "find-cache-dir-2.1.0" = { name = "find-cache-dir"; packageName = "find-cache-dir"; @@ -28565,13 +29600,13 @@ let sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg=="; }; }; - "flow-parser-0.172.0" = { + "flow-parser-0.173.0" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.172.0"; + version = "0.173.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.172.0.tgz"; - sha512 = "WWqgvuJgD9Y1n2su9D73m0g5kQ4XVl8Dwk6DeW5V6bjt4XMtVLzSHg35s3iiZOvShY+7w7l8FzlK81PGXRcIYQ=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.173.0.tgz"; + sha512 = "gikomjo+jzdehhOCHP2Ca5y1HGK3jkODhUdTxk4a3SdyLAMBsEwb7KJETHzB4KQs7HhHcqhyT7mGmd9iT8B5Hg=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -28835,6 +29870,15 @@ let sha512 = "7YGDo0UlbMy++6G3lzncWISDaT5CVp+yPVAkZ7FDFF0ec+0HKgBOWOhPGKpMF0hjcm3Ps/HbtrETrQLYREZ7YQ=="; }; }; + "fork-ts-checker-webpack-plugin-3.1.1" = { + name = "fork-ts-checker-webpack-plugin"; + packageName = "fork-ts-checker-webpack-plugin"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-3.1.1.tgz"; + sha512 = "DuVkPNrM12jR41KM2e+N+styka0EgLkTnXmNcXdgOM37vtGeY+oCBK/Jx0hzSeEU6memFCtWb4htrHPMDfwwUQ=="; + }; + }; "fork-ts-checker-webpack-plugin-4.1.6" = { name = "fork-ts-checker-webpack-plugin"; packageName = "fork-ts-checker-webpack-plugin"; @@ -28844,13 +29888,22 @@ let sha512 = "DUxuQaKoqfNne8iikd14SAkh5uw4+8vNifp6gmA73yYNS6ywLIWSLD/n/mBzHQRpW3J7rbATEakmiA8JvkTyZw=="; }; }; - "fork-ts-checker-webpack-plugin-6.5.0" = { + "fork-ts-checker-webpack-plugin-7.2.1" = { name = "fork-ts-checker-webpack-plugin"; packageName = "fork-ts-checker-webpack-plugin"; - version = "6.5.0"; + version = "7.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-7.2.1.tgz"; + sha512 = "uOfQdg/iQ8iokQ64qcbu8iZb114rOmaKLQFu7hU14/eJaKgsP91cQ7ts7v2iiDld6TzDe84Meksha8/MkWiCyw=="; + }; + }; + "fork-ts-checker-webpack-plugin-v5-5.2.1" = { + name = "fork-ts-checker-webpack-plugin-v5"; + packageName = "fork-ts-checker-webpack-plugin-v5"; + version = "5.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.0.tgz"; - sha512 = "cS178Y+xxtIjEUorcHddKS7yCMlrDPV31mt47blKKRfMd70Kxu5xruAFE2o9sDY6wVC5deuob/u/alD04YYHnw=="; + url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.2.1.tgz"; + sha512 = "SVi+ZAQOGbtAsUWrZvGzz38ga2YqjWvca1pXQFUArIVXqli0lLoDQ8uS0wg0kSpcwpZmaW5jVCZXQebkyUQSsw=="; }; }; "form-data-1.0.0-rc3" = { @@ -29015,13 +30068,13 @@ let sha512 = "WQT6rP6Jt3TxMdQB3IKzvfZKLuldumntgumLhIUhvPrukTHdWNI4JgEHY04Bd0LIOR9IQRpB+7RuxgUU0Vhmcg=="; }; }; - "fraction.js-4.1.3" = { + "fraction.js-4.2.0" = { name = "fraction.js"; packageName = "fraction.js"; - version = "4.1.3"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/fraction.js/-/fraction.js-4.1.3.tgz"; - sha512 = "pUHWWt6vHzZZiQJcM6S/0PXfS+g6FM4BF5rj9wZyreivhQPdsh5PpE25VtSNxq80wHS5RfY51Ii+8Z0Zl/pmzg=="; + url = "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz"; + sha512 = "MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA=="; }; }; "fragment-cache-0.2.1" = { @@ -29186,6 +30239,15 @@ let sha512 = "C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ=="; }; }; + "fs-extra-10.0.1" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "10.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.1.tgz"; + sha512 = "NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag=="; + }; + }; "fs-extra-3.0.1" = { name = "fs-extra"; packageName = "fs-extra"; @@ -29312,22 +30374,22 @@ let sha512 = "GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA=="; }; }; - "fs-routes-2.0.0" = { + "fs-routes-8.0.0" = { name = "fs-routes"; packageName = "fs-routes"; - version = "2.0.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/fs-routes/-/fs-routes-2.0.0.tgz"; - sha512 = "oITW9GoYFZwYWR2aMDdUvr6W9O5mtzSizIVEUdeCQaFD6+BylwPSEP2+ZFWv1UYpE9kiPS3Hb0knh2PmFJcj6A=="; + url = "https://registry.npmjs.org/fs-routes/-/fs-routes-8.0.0.tgz"; + sha512 = "EezW71GPu+VK2ZOnX0Aljaref63+mvhkkz55DqUp5xryV/mJraA2t/XFmBxNMwgRq6tFUOYuQOlr+RQh4nq5kQ=="; }; }; - "fs-routes-7.0.1" = { + "fs-routes-9.0.3" = { name = "fs-routes"; packageName = "fs-routes"; - version = "7.0.1"; + version = "9.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/fs-routes/-/fs-routes-7.0.1.tgz"; - sha512 = "kSAfx/P8oLSi5+tblecTETcJJ/Q+qL+xzGx4hns/+gHXMkTOZEzG73/2dBDW1FFy5+ZW080XoMaBAN2kCN55aQ=="; + url = "https://registry.npmjs.org/fs-routes/-/fs-routes-9.0.3.tgz"; + sha512 = "Y5tkylY9fQ1jm11FdJoptzqIG3OyzqrOF16W5odNlIdqFqb2355IbNB3jQkE+C268mSShLmIur8ynYCgL/Yg/g=="; }; }; "fs-write-stream-atomic-1.0.10" = { @@ -29528,22 +30590,22 @@ let sha1 = "cbed2d20a40c1f5679a35908e2b9415733e78db9"; }; }; - "gatsby-core-utils-3.7.0" = { + "gatsby-core-utils-3.9.1" = { name = "gatsby-core-utils"; packageName = "gatsby-core-utils"; - version = "3.7.0"; + version = "3.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-3.7.0.tgz"; - sha512 = "CboIzpEFbaD4+WrozKl3fMpxUetcaDq0aWPfrfzAtc8l0JMlD3GS2Q/uW7HpcvTAlSGv2ZomTzd2ySLV/AgpTQ=="; + url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-3.9.1.tgz"; + sha512 = "DNf7NhhH0WrFuoBvyURjsw4w+eKbp1GlRA0cchYHJwVTaDPvLvX1o7zxN76xIBx+m0kttpnO3KuJ9LDOSli3ag=="; }; }; - "gatsby-telemetry-3.7.0" = { + "gatsby-telemetry-3.9.1" = { name = "gatsby-telemetry"; packageName = "gatsby-telemetry"; - version = "3.7.0"; + version = "3.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-3.7.0.tgz"; - sha512 = "jhtUGZynyHM3r9a7po/rKffj5AjacmU0rqqarsee9dxlDqsamqRtyFPTjn7JubRrc958M6qzNW+z/Zi0hoeFHg=="; + url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-3.9.1.tgz"; + sha512 = "ChXTshfvo5njd/u6kSZErDUvc/uSmtOEuo7wrt/68Xjz2JVG6nsLlRxaZpx0DxnDAInouItMVX0VF40RAU7qKg=="; }; }; "gauge-1.2.7" = { @@ -29573,13 +30635,13 @@ let sha512 = "+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q=="; }; }; - "gauge-4.0.1" = { + "gauge-4.0.3" = { name = "gauge"; packageName = "gauge"; - version = "4.0.1"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/gauge/-/gauge-4.0.1.tgz"; - sha512 = "zJ4jePUHR8cceduZ53b6temRalyGpkC2Kc2r3ecNphmL+uWNoJ3YcOcUjpbG6WwoE/Ef6/+aEZz63neI2WIa1Q=="; + url = "https://registry.npmjs.org/gauge/-/gauge-4.0.3.tgz"; + sha512 = "ICw1DhAwMtb22rYFwEHgJcx1JCwJGv3x6G0OQUq56Nge+H4Q8JEwr8iveS0XFlsUNSI67F5ffMGK25bK4Pmskw=="; }; }; "gaxios-2.3.4" = { @@ -29798,6 +30860,15 @@ let sha1 = "dd7ce7de187c06c8bf353796ac71e099f0980ebc"; }; }; + "get-port-4.2.0" = { + name = "get-port"; + packageName = "get-port"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-port/-/get-port-4.2.0.tgz"; + sha512 = "/b3jarXkH8KJoOMQc3uVGHASwGLPq3gSFJ7tgJm2diza+bydJPTGOibin2steecKeOylE8oY2JERlVWkAJO6yw=="; + }; + }; "get-port-5.1.1" = { name = "get-port"; packageName = "get-port"; @@ -30537,6 +31608,15 @@ 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.12.1" = { name = "globals"; packageName = "globals"; @@ -30726,13 +31806,13 @@ let sha512 = "otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ=="; }; }; - "google-auth-library-7.13.0" = { + "google-auth-library-7.14.0" = { name = "google-auth-library"; packageName = "google-auth-library"; - version = "7.13.0"; + version = "7.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.13.0.tgz"; - sha512 = "6Q2/ZijxVKt9I6TgljUa4oMiRvQcul0lm3g6faEvWHZ9ql9gOmlAJPAmV/BKQ/GiMFtD2llF6codS350d0GjlQ=="; + url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.14.0.tgz"; + sha512 = "or8r7qUqGVI3W8lVSdPh0ZpeFyQHeE73g5c0p+bLNTTUFXJ+GSeDQmZRZ2p4H8cF/RJYa4PNvi/A1ar1uVNLFA=="; }; }; "google-closure-compiler-js-20170910.0.1" = { @@ -30771,13 +31851,13 @@ let sha512 = "l/TFSW7IRFcb7wF641BlmuP8Ox1ncuzJk5Fcs2947otlGBm5ktDxFhPkmrcNDaG+LWPQsuDwP1ojL0xV39cpmw=="; }; }; - "googleapis-common-5.0.5" = { + "googleapis-common-5.1.0" = { name = "googleapis-common"; packageName = "googleapis-common"; - version = "5.0.5"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/googleapis-common/-/googleapis-common-5.0.5.tgz"; - sha512 = "o2dgoW4x4fLIAN+IVAOccz3mEH8Lj1LP9c9BSSvkNJEn+U7UZh0WSr4fdH08x5VH7+sstIpd1lOYFZD0g7j4pw=="; + url = "https://registry.npmjs.org/googleapis-common/-/googleapis-common-5.1.0.tgz"; + sha512 = "RXrif+Gzhq1QAzfjxulbGvAY3FPj8zq/CYcvgjzDbaBNCD6bUl+86I7mUs4DKWHGruuK26ijjR/eDpWIDgNROA=="; }; }; "goosig-0.10.0" = { @@ -30987,13 +32067,13 @@ let sha512 = "jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A=="; }; }; - "graphology-0.23.2" = { + "graphology-0.24.1" = { name = "graphology"; packageName = "graphology"; - version = "0.23.2"; + version = "0.24.1"; src = fetchurl { - url = "https://registry.npmjs.org/graphology/-/graphology-0.23.2.tgz"; - sha512 = "RHcLpAP4M+KPShLQEvgkT1Y4vxl+FFbmmy3D0mupO+VXIuYC8zdmMcHs40D9m3mmN067zGS+lUaHjDq06Td7PQ=="; + url = "https://registry.npmjs.org/graphology/-/graphology-0.24.1.tgz"; + sha512 = "6lNz1PNTAe9Q6ioHKrXu0Lp047sgvOoHa4qmP/8mnJWCGv2iIZPQkuHPUb2/OWDWCqHpw2hKgJLJ55X/66xmHg=="; }; }; "graphology-types-0.21.2" = { @@ -31140,13 +32220,13 @@ let sha512 = "Wci5MbrQj+6d7rfvbORrA9uDlfMysBWYaG49ST5TKylNaXYFf3ixFOa74iM1KtM9eidosUbI3E1JlWi0JaidJA=="; }; }; - "graphql-sse-1.0.6" = { + "graphql-sse-1.1.0" = { name = "graphql-sse"; packageName = "graphql-sse"; - version = "1.0.6"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-sse/-/graphql-sse-1.0.6.tgz"; - sha512 = "y2mVBN2KwNrzxX2KBncQ6kzc6JWvecxuBernrl0j65hsr6MAS3+Yn8PTFSOgRmtolxugepxveyZVQEuaNEbw3w=="; + url = "https://registry.npmjs.org/graphql-sse/-/graphql-sse-1.1.0.tgz"; + sha512 = "xE8AGPJa5X+g7iFmRQw/8H+7lXIDJvSkW6lou/XSSq17opPQl+dbKOMiqraHMx52VrDgS061ZVx90OSuqS6ykA=="; }; }; "graphql-subscriptions-1.2.1" = { @@ -31203,13 +32283,13 @@ let sha512 = "sHkK9+lUm20/BGawNEWNtVAeJzhZeBg21VmvmLoT5NdGVeZWv5PdIhkcayQIAgjSyyQ17WMKmbDijIPG2On+Ag=="; }; }; - "graphql-ws-5.6.0" = { + "graphql-ws-5.6.2" = { name = "graphql-ws"; packageName = "graphql-ws"; - version = "5.6.0"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-5.6.0.tgz"; - sha512 = "Kz/4z1u9yGKWMtzlvia9wW8AJGjx68OyCCV40dabYq1OeyUxgU9t8Ll43vLAje7TYiLwZSwGbvtHviHaPyGYxw=="; + url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-5.6.2.tgz"; + sha512 = "TsjovINNEGfv52uKWYSVCOLX9LFe6wAhf9n7hIsV3zjflky1dv/mAP+kjXAXsnzV1jH5Sx0S73CtBFNvxus+SQ=="; }; }; "gray-matter-4.0.3" = { @@ -31320,15 +32400,6 @@ let sha512 = "dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA=="; }; }; - "gulp-clean-css-4.3.0" = { - name = "gulp-clean-css"; - packageName = "gulp-clean-css"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/gulp-clean-css/-/gulp-clean-css-4.3.0.tgz"; - sha512 = "mGyeT3qqFXTy61j0zOIciS4MkYziF2U594t2Vs9rUnpkEHqfu6aDITMp8xOvZcvdX61Uz3y1mVERRYmjzQF5fg=="; - }; - }; "gulp-cli-2.3.0" = { name = "gulp-cli"; packageName = "gulp-cli"; @@ -31338,24 +32409,6 @@ let sha512 = "zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A=="; }; }; - "gulp-concat-2.6.1" = { - name = "gulp-concat"; - packageName = "gulp-concat"; - version = "2.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.6.1.tgz"; - sha1 = "633d16c95d88504628ad02665663cee5a4793353"; - }; - }; - "gulp-dart-sass-1.0.2" = { - name = "gulp-dart-sass"; - packageName = "gulp-dart-sass"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/gulp-dart-sass/-/gulp-dart-sass-1.0.2.tgz"; - sha512 = "8fLttA824mbuc0jRVlGs00zWYZXBckat6INawx5kp66Eqsz5srNWTA51t0mbfB4C8a/a/GZ9muYLwXGklgAHlw=="; - }; - }; "gulp-eslint-3.0.1" = { name = "gulp-eslint"; packageName = "gulp-eslint"; @@ -31365,6 +32418,15 @@ let sha1 = "04e57e3e18c6974267c12cf6855dc717d4a313bd"; }; }; + "gulp-eslint-6.0.0" = { + name = "gulp-eslint"; + packageName = "gulp-eslint"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/gulp-eslint/-/gulp-eslint-6.0.0.tgz"; + sha512 = "dCVPSh1sA+UVhn7JSQt7KEb4An2sQNbOdB3PA8UCfxsoPlAKjJHxYHGXdXC7eb+V1FAnilSFFqslPrq037l1ig=="; + }; + }; "gulp-plumber-1.2.1" = { name = "gulp-plumber"; packageName = "gulp-plumber"; @@ -31374,22 +32436,13 @@ let sha512 = "mctAi9msEAG7XzW5ytDVZ9PxWMzzi1pS2rBH7lA095DhMa6KEXjm+St0GOCc567pJKJ/oCvosVAZEpAey0q2eQ=="; }; }; - "gulp-sourcemaps-2.6.5" = { + "gulp-sourcemaps-3.0.0" = { name = "gulp-sourcemaps"; packageName = "gulp-sourcemaps"; - version = "2.6.5"; - src = fetchurl { - url = "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-2.6.5.tgz"; - sha512 = "SYLBRzPTew8T5Suh2U8jCSDKY+4NARua4aqjj8HOysBh2tSgT9u4jc1FYirAdPx1akUxxDeK++fqw6Jg0LkQRg=="; - }; - }; - "gulp-tslint-8.1.4" = { - name = "gulp-tslint"; - packageName = "gulp-tslint"; - version = "8.1.4"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/gulp-tslint/-/gulp-tslint-8.1.4.tgz"; - sha512 = "wBoZIEMJRz9urHwolsvQpngA9l931p6g/Liwz1b/KrsVP6jEBFZv/o0NS1TFCQZi/l8mXxz8+v3twhf4HOXxPQ=="; + url = "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-3.0.0.tgz"; + sha512 = "RqvUckJkuYqy4VaIH60RMal4ZtG0IbQ6PXMNkNsshEGJ9cldUPRb/YCgboYae+CLAs1HQNb4ADTKCx65HInquQ=="; }; }; "gulp-typescript-5.0.1" = { @@ -31644,15 +32697,6 @@ let sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; }; }; - "has-glob-1.0.0" = { - name = "has-glob"; - packageName = "has-glob"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-glob/-/has-glob-1.0.0.tgz"; - sha1 = "9aaa9eedbffb1ba3990a7b0010fb678ee0081207"; - }; - }; "has-gulplog-0.1.0" = { name = "has-gulplog"; packageName = "has-gulplog"; @@ -31689,13 +32733,13 @@ let sha512 = "3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw=="; }; }; - "has-symbols-1.0.2" = { + "has-symbols-1.0.3" = { name = "has-symbols"; packageName = "has-symbols"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz"; - sha512 = "chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="; + url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz"; + sha512 = "l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="; }; }; "has-to-string-tag-x-1.4.1" = { @@ -31788,6 +32832,15 @@ let sha512 = "1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA=="; }; }; + "hash-sum-1.0.2" = { + name = "hash-sum"; + packageName = "hash-sum"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz"; + sha1 = "33b40777754c6432573c120cc3808bbd10d47f04"; + }; + }; "hash-sum-2.0.0" = { name = "hash-sum"; packageName = "hash-sum"; @@ -32193,6 +33246,15 @@ let sha512 = "oFLl873u4usRM9K63j4ME9u3etNF0PLiJhSQ8rdfuL51Wn3zkD6drf9ZW0dOzjnZI22YYG24z30JcmfCZjMgYg=="; }; }; + "highlight.js-10.7.3" = { + name = "highlight.js"; + packageName = "highlight.js"; + version = "10.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz"; + sha512 = "tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A=="; + }; + }; "highlight.js-11.4.0" = { name = "highlight.js"; packageName = "highlight.js"; @@ -32247,13 +33309,13 @@ let sha1 = "6f36e770769275113a57ae1a6007001af771cff6"; }; }; - "hls-b24.js-0.12.3" = { - name = "hls-b24.js"; - packageName = "hls-b24.js"; - version = "0.12.3"; + "hls.js-1.1.2" = { + name = "hls.js"; + packageName = "hls.js"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/hls-b24.js/-/hls-b24.js-0.12.3.tgz"; - sha512 = "C8nwzS33zKvR7grYIoHvp8wPxBvk9sEJ6dsh3Bx+T/4jNNhDksqLS73NIWqHvInjRiOsrXgEY4+h/NjNbzzh0g=="; + url = "https://registry.npmjs.org/hls.js/-/hls.js-1.1.2.tgz"; + sha512 = "ujditC4vvBmZd00RRNfNPLgFVlqEeUX4sAFv5lGhBHuql8iAZodOdlZTD3em/1zo7vyjQp12up/lCVqQk8dvxA=="; }; }; "hmac-blake2b-2.0.0" = { @@ -32607,6 +33669,15 @@ let sha512 = "jWTtP3dCd7R8x/tt9DK3pvpcQd7HDMcRPUqPxr/i9989q2k5RHIhmlRDFeyQ/LSd8IKrteG8Ce5g0Ig4eGIipg=="; }; }; + "htmlnano-2.0.0" = { + name = "htmlnano"; + packageName = "htmlnano"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlnano/-/htmlnano-2.0.0.tgz"; + sha512 = "thKQfhcp2xgtsWNE27A2bliEeqVL5xjAgGn0wajyttvFFsvFWWah1ntV9aEX61gz0T6MBQ5xK/1lXuEumhJTcg=="; + }; + }; "htmlparser2-3.10.1" = { name = "htmlparser2"; packageName = "htmlparser2"; @@ -32652,6 +33723,15 @@ let sha512 = "gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A=="; }; }; + "htmlparser2-7.2.0" = { + name = "htmlparser2"; + packageName = "htmlparser2"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.2.0.tgz"; + sha512 = "H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog=="; + }; + }; "http-assert-1.5.0" = { name = "http-assert"; packageName = "http-assert"; @@ -32751,6 +33831,15 @@ let sha512 = "Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g=="; }; }; + "http-errors-2.0.0" = { + name = "http-errors"; + packageName = "http-errors"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz"; + sha512 = "FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ=="; + }; + }; "http-headers-3.0.2" = { name = "http-headers"; packageName = "http-headers"; @@ -32778,13 +33867,13 @@ let sha1 = "3bd6d6fde6e3172c9334c3b33b6c193d80fe1137"; }; }; - "http-parser-js-0.5.5" = { + "http-parser-js-0.5.6" = { name = "http-parser-js"; packageName = "http-parser-js"; - version = "0.5.5"; + version = "0.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.5.tgz"; - sha512 = "x+JVEkO2PoM8qqpbPbOL3cqHPwerep7OwzK7Ay+sMQjKzaKCqWvjoXm5tqMP9tXWWTnTzAjIhXg+J99XYuPhPA=="; + url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.6.tgz"; + sha512 = "vDlkRPDJn93swjcjqMSaGSPABbIarsr1TLAui/gLDXzV5VsJNdXNzMYDyNBLQkjWQCJ1uizu8T2oDMhmGt0PRA=="; }; }; "http-proxy-1.18.1" = { @@ -32832,6 +33921,15 @@ let sha512 = "yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q=="; }; }; + "http-proxy-middleware-1.3.1" = { + name = "http-proxy-middleware"; + packageName = "http-proxy-middleware"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-1.3.1.tgz"; + sha512 = "13eVVDYS4z79w7f1+NPllJtOQFx/FdUW4btIvVRMaRlUY9VGstAbo5MOhLEuUgZFRHn3x50ufn25zkj/boZnEg=="; + }; + }; "http-proxy-middleware-2.0.3" = { name = "http-proxy-middleware"; packageName = "http-proxy-middleware"; @@ -33237,13 +34335,13 @@ let sha512 = "bESly7s6X7cLMWCn4dsAVE/ttNbbB13o6jku2B7fV2wIV/g7NVC/yF7S3NiknGlftKn/uLU3fhMmbOfdBvQ5IA=="; }; }; - "hypertrie-5.1.2" = { + "hypertrie-5.1.3" = { name = "hypertrie"; packageName = "hypertrie"; - version = "5.1.2"; + version = "5.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/hypertrie/-/hypertrie-5.1.2.tgz"; - sha512 = "kdzigFUWrCX5NTFvi28q5o3P7faP3QliAQpMfKRSrP5jtitqPfhTgXwstcxS+Vj7mP93R+unZlPYiwu6N9whzA=="; + url = "https://registry.npmjs.org/hypertrie/-/hypertrie-5.1.3.tgz"; + sha512 = "UllKwlFn6Vh268Y0LCD5isvDeCeaaNm9mJC4OFCcb5imv6nyBf/aHirJwUTOm9u01v6GZCXmCI9kKZnpNkm6nA=="; }; }; "i-0.3.7" = { @@ -33606,6 +34704,15 @@ let sha512 = "CiuXOFFSzkU5x/CR0+z7T91Iht4CXgfCxVOFRhh2Zyhg5wOpWvvDLQUsWl+gcN+QscYBjez8hDCt85O7RLDttQ=="; }; }; + "import-from-4.0.0" = { + name = "import-from"; + packageName = "import-from"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-from/-/import-from-4.0.0.tgz"; + sha512 = "P9J71vT5nLlDeV8FHs5nNxaLbrpfAV5cF5srvbZfpwpcJoM/xZR3hiv+q+SAnuSmuGbXMWud063iIMx/V/EWZQ=="; + }; + }; "import-global-0.1.0" = { name = "import-global"; packageName = "import-global"; @@ -33975,15 +35082,6 @@ let sha1 = "4dec6f32f37ef7bb0b2ed3f1d1a5c3f545074918"; }; }; - "inquirer-3.0.6" = { - name = "inquirer"; - packageName = "inquirer"; - version = "3.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-3.0.6.tgz"; - sha1 = "e04aaa9d05b7a3cb9b0f407d04375f0447190347"; - }; - }; "inquirer-3.3.0" = { name = "inquirer"; packageName = "inquirer"; @@ -34038,6 +35136,15 @@ let sha512 = "0crLweprevJ02tTuA6ThpoAERAGyVILC4sS74uib58Xf/zSr1/ZWtmm7D5CI+bSQEaA04f0K7idaHpQbSWgiVQ=="; }; }; + "inquirer-8.2.1" = { + name = "inquirer"; + packageName = "inquirer"; + version = "8.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-8.2.1.tgz"; + sha512 = "pxhBaw9cyTFMjwKtkjePWDhvwzvrNGAw7En4hottzlPvz80GZaMZthdDU35aA6/f5FRZf3uhE057q8w1DE3V2g=="; + }; + }; "inquirer-autocomplete-prompt-1.4.0" = { name = "inquirer-autocomplete-prompt"; packageName = "inquirer-autocomplete-prompt"; @@ -34326,6 +35433,15 @@ let sha512 = "j8grHGDzv1v+8T1sAQ+3boTCntFPfvxLCkNcxB1J8qA0lUN+fAlSyYd+RXKvaPRL4AGyPxViutBEJHNXOyUdFQ=="; }; }; + "inversify-6.0.1" = { + name = "inversify"; + packageName = "inversify"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/inversify/-/inversify-6.0.1.tgz"; + sha512 = "B3ex30927698TJENHR++8FfEaJGqoWOgI6ZY5Ht/nLUsFCwHn6akbwtnUAPCgUepAnTpe2qHxhDNjoKLyz6rgQ=="; + }; + }; "invert-kv-1.0.0" = { name = "invert-kv"; packageName = "invert-kv"; @@ -34416,6 +35532,15 @@ let sha512 = "u9YYtb1p2fWSbzpKmZ/b3QXWA+diRYPxc2c4y5lFB/MMk5WZ7wNZv8S3CFcIGVJ5XtlaCAl/FQy/D3eQ2XtdOA=="; }; }; + "ip-num-1.3.4" = { + name = "ip-num"; + packageName = "ip-num"; + version = "1.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ip-num/-/ip-num-1.3.4.tgz"; + sha512 = "ZlO1YqjR87dsMFTxUJGj1iZR+UV+0QHWeOAMZfTBpGocBsKGc7fJdlFoa7F5xpK/guKW7dkfT6UAVDwvWjLK1Q=="; + }; + }; "ip-regex-2.1.0" = { name = "ip-regex"; packageName = "ip-regex"; @@ -35262,6 +36387,15 @@ let sha1 = "307a855b3cf1a938b44ea70d2c61106053714f34"; }; }; + "is-json-2.0.1" = { + name = "is-json"; + packageName = "is-json"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-json/-/is-json-2.0.1.tgz"; + sha1 = "6be166d144828a131d686891b983df62c39491ff"; + }; + }; "is-lambda-1.0.1" = { name = "is-lambda"; packageName = "is-lambda"; @@ -35298,13 +36432,13 @@ let sha1 = "3258fb69f78c14d5b815d664336b4cffb6441591"; }; }; - "is-my-ip-valid-1.0.0" = { + "is-my-ip-valid-1.0.1" = { name = "is-my-ip-valid"; packageName = "is-my-ip-valid"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz"; - sha512 = "gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ=="; + url = "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.1.tgz"; + sha512 = "jxc8cBcOWbNK2i2aTkCZP6i7wkHF1bqKFrwEHuN5Jtg5BSaZHUZQ/JTOJwoV41YvHnOaRyWWh72T/KvfNz9DJg=="; }; }; "is-my-json-valid-2.20.6" = { @@ -36000,13 +37134,13 @@ let sha512 = "Yd9oD7sgCycVvH8CHy5U4fLXibPwxVw2+diudYbT8ZfAiQDtW1H9WvPRR4+rtN9qOll+r+KAfO4SjO28OPpitA=="; }; }; - "is-valid-domain-0.1.5" = { + "is-valid-domain-0.1.6" = { name = "is-valid-domain"; packageName = "is-valid-domain"; - version = "0.1.5"; + version = "0.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/is-valid-domain/-/is-valid-domain-0.1.5.tgz"; - sha512 = "ilzfGo1kXzoVpSLplJWOexoiuAc6mRK+vPlNAeEPVJ29RagETpCz0izg6CZfY72DCuA+PCrEAEJeaecRLMNq5Q=="; + url = "https://registry.npmjs.org/is-valid-domain/-/is-valid-domain-0.1.6.tgz"; + sha512 = "ZKtq737eFkZr71At8NxOFcP9O1K89gW3DkdrGMpp1upr/ueWjj+Weh4l9AI4rN0Gt8W2M1w7jrG2b/Yv83Ljpg=="; }; }; "is-valid-glob-1.0.0" = { @@ -36585,15 +37719,6 @@ let sha1 = "a3abe2718af241a2b2904f84a625970f389ae32a"; }; }; - "jmespath-0.15.0" = { - name = "jmespath"; - packageName = "jmespath"; - version = "0.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz"; - sha1 = "a3f222a9aae9f966f5d27c796510e28091764217"; - }; - }; "jmespath-0.16.0" = { name = "jmespath"; packageName = "jmespath"; @@ -36721,13 +37846,13 @@ let sha512 = "2VlU59N5P4HaumDK1Z3XEVjSvegFbEOQRgpHUBaB2Ak98Axl3hFhJ6RFcNQNuk9SfL6WxIbuLst8dW/U56NSiA=="; }; }; - "jquery.terminal-2.31.1" = { + "jquery.terminal-2.32.1" = { name = "jquery.terminal"; packageName = "jquery.terminal"; - version = "2.31.1"; + version = "2.32.1"; src = fetchurl { - url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.31.1.tgz"; - sha512 = "JVCL3mOmE+NQ1SvwHyRtJ18ICEylHoLqh0mmi0HResjeE7v/85rREfoLDtYfJxDxCNpTrznGl3HEoUCfjHnycA=="; + url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.32.1.tgz"; + sha512 = "AbaZfSuNPQSBpUEP2jqNix5H7wS3fqUQGe+k6D8umBAOA3XxIVJpXTcGitfs1df7AZ52DruOQnV+p5+s+E3QqQ=="; }; }; "js-base64-2.6.3" = { @@ -37054,49 +38179,49 @@ let sha512 = "xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g=="; }; }; - "jsii-1.54.0" = { + "jsii-1.55.0" = { name = "jsii"; packageName = "jsii"; - version = "1.54.0"; + version = "1.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-1.54.0.tgz"; - sha512 = "XuqGpmGIxFcX2GvX3zjcHBzBeZ7+tJ7hr5tu/7qV6wQ/thXuZFdAoj2znSgBkpGOt6mjtRuqv01HIRl25Nys5g=="; + url = "https://registry.npmjs.org/jsii/-/jsii-1.55.0.tgz"; + sha512 = "OpY67STJMTqF/pQRYMXx8xaA1lCnKoQCnraB043tkx6F3reyUNzlIzSIkQIgTEFoBa/OEYANHdtHJCfw6Y3nzA=="; }; }; - "jsii-pacmak-1.54.0" = { + "jsii-pacmak-1.55.0" = { name = "jsii-pacmak"; packageName = "jsii-pacmak"; - version = "1.54.0"; + version = "1.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.54.0.tgz"; - sha512 = "1uvHzdrUiTL7Z6QLaoY5F4iK+JbVh8BL4dJrZRikd+ntVWW8sh0CIxAAtlwYgAMER8HihZ1AZUzngdZ/zO2AFw=="; + url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.55.0.tgz"; + sha512 = "2i1VQVGQIC0JUSryw9gV2VqcMNbR/KLQOwsfNb7gTs6qKccR5Pmf4eXuIC+HxpyIiecu1UeEbToz5q8fMdVcig=="; }; }; - "jsii-reflect-1.54.0" = { + "jsii-reflect-1.55.0" = { name = "jsii-reflect"; packageName = "jsii-reflect"; - version = "1.54.0"; + version = "1.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.54.0.tgz"; - sha512 = "wB4hxHTAN4LEBVg/Y5sr3Sbh3Xe2+jrYIftnhT+2mmhMexHj3U0RhjPW/MFXxRTbiSgDad1fbw5VkJYDWnpGXw=="; + url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.55.0.tgz"; + sha512 = "PLrRTqkE0FJ9locNabIOnmXh/fX+JaKhWD9ktPmYmZzPyPL7pfHGUUnFJhtk+0yXZ9vwg/Bp5qr/l3HH2Bq+uA=="; }; }; - "jsii-rosetta-1.54.0" = { + "jsii-rosetta-1.55.0" = { name = "jsii-rosetta"; packageName = "jsii-rosetta"; - version = "1.54.0"; + version = "1.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.54.0.tgz"; - sha512 = "fxgx9L5eWzyMC1IEkDitxgcraHUuZbQQVQztJtZHw/QlZ9n0DUjfbKrefJQ2HpobtI9ZV2fDEYjuwZDBAVBdsA=="; + url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.55.0.tgz"; + sha512 = "LOw8i5ypoJ8A2D24Za3fIWeiNbPa6q0wuLuu0LAr+VWvu4f2A5A9SJfzsB39CXwDVKjrAVVvCy83Fgdv3/2VFw=="; }; }; - "jsii-srcmak-0.1.482" = { + "jsii-srcmak-0.1.499" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.482"; + version = "0.1.499"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.482.tgz"; - sha512 = "Dr7eCmWXtYSPMODMxJxbzf6m5+iFH9WcKtmwWDFwcUke5bxTndovEKkK/GKHKD1sNZcF6FHX2Nak5Lib0bPUTw=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.499.tgz"; + sha512 = "FJ8ovnFkrWL2BgseeGDkpCsx5+AfWYp0vyihtiKWvb3x/uQhB0N5q90oOhJn1uRLpwv4+UOTG3d41t4ZtCQzKg=="; }; }; "json-bigint-1.0.0" = { @@ -37324,6 +38449,15 @@ let sha1 = "28e4ffd51c8d893295280eb4064d9703594de5a2"; }; }; + "json-source-map-0.6.1" = { + name = "json-source-map"; + packageName = "json-source-map"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-source-map/-/json-source-map-0.6.1.tgz"; + sha512 = "1QoztHPsMQqhDq0hlXY5ZqcEdUzxQEIxgFkKl4WUp2pgShObl+9ovi4kRh2TfvAfxAoHOJ9vIMEqk3k4iex7tg=="; + }; + }; "json-stable-stringify-0.0.1" = { name = "json-stable-stringify"; packageName = "json-stable-stringify"; @@ -37387,13 +38521,13 @@ let sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A=="; }; }; - "json2jsii-0.2.142" = { + "json2jsii-0.2.159" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.2.142"; + version = "0.2.159"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.142.tgz"; - sha512 = "voi+j4VtuhgI7aKq9WbGv8g4OiQd33JyCDyGHc+M/v+pp8mvzXja9sWvBa4F3zKRazwSERXvP1yS61CTztW8Xg=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.159.tgz"; + sha512 = "zbMiuYG79Azg3zXzVA/hP20XtDJO1obIiAbYvYzB+eXIP3YPNn/BIITiLRi6g55oCW8TaLlSRgBJDBNaTt5/tg=="; }; }; "json3-3.2.6" = { @@ -37612,6 +38746,15 @@ let sha512 = "PNYZIdMjVIvVgDSYKTT63Y+KZ6IZvGRNNWcxwD+GNnUz1MKPfv30J8ueCjdwcN0nDx2SlshgyB7Oy0epAzVRRg=="; }; }; + "jsonrpc2-ws-1.0.0-beta9" = { + name = "jsonrpc2-ws"; + packageName = "jsonrpc2-ws"; + version = "1.0.0-beta9"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonrpc2-ws/-/jsonrpc2-ws-1.0.0-beta9.tgz"; + sha512 = "0KA+ufhSy7gN2/jGXagXLz4V5m+vymmNTI5IpNBIUiunday45P6dspdaOO0wwt2JJyrACC/BKMH154OqsuB80w=="; + }; + }; "jsonschema-1.4.0" = { name = "jsonschema"; packageName = "jsonschema"; @@ -37756,6 +38899,15 @@ let sha512 = "pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ=="; }; }; + "junk-4.0.0" = { + name = "junk"; + packageName = "junk"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/junk/-/junk-4.0.0.tgz"; + sha512 = "ojtSU++zLJ3jQG9bAYjg94w+/DOJtRyD7nPaerMFrBhmdVmiV5/exYH5t4uHga4G/95nT6hr1OJoKIFbYbrW5w=="; + }; + }; "just-debounce-1.1.0" = { name = "just-debounce"; packageName = "just-debounce"; @@ -38404,6 +39556,15 @@ let sha512 = "3QrsCXejlWYHjBPFXTyGNhPj4rrQdB+5+r5r3wArpLH201aR+nWUgw/zKKkTmilCfY/sv6u8qo98pNvtg8LUTA=="; }; }; + "launch-editor-middleware-2.3.0" = { + name = "launch-editor-middleware"; + packageName = "launch-editor-middleware"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/launch-editor-middleware/-/launch-editor-middleware-2.3.0.tgz"; + sha512 = "GJR64trLdFFwCoL9DMn/d1SZX0OzTDPixu4mcfWTShQ4tIqCHCGvlg9fOEYQXyBlrSMQwylsJfUWncheShfV2w=="; + }; + }; "layered-graph-1.1.3" = { name = "layered-graph"; packageName = "layered-graph"; @@ -38764,13 +39925,13 @@ let sha1 = "22c59bcaefaa9a8ef359cf759784e4bf106aea1b"; }; }; - "libnested-1.5.1" = { + "libnested-1.5.2" = { name = "libnested"; packageName = "libnested"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/libnested/-/libnested-1.5.1.tgz"; - sha512 = "mA68lhvC5NypD/21rBNziTmqWaukivdbbDkWnXrry8iCV0/PuD8GSxa8W+ZtJwAOzvu/AdOx/YEb9NbqPq6s5Q=="; + url = "https://registry.npmjs.org/libnested/-/libnested-1.5.2.tgz"; + sha512 = "DbiwHL8454goYRp5Xn9vUA5XU6x8rNh8BmZ7ywSTUhVBIiDS7ev/FT6+AwU2/ZKW2jEOC7WKhpkJfExaQwosRA=="; }; }; "libnpmaccess-4.0.3" = { @@ -38881,24 +40042,6 @@ let sha512 = "5i0XgY+PSaGmMQTuVdtnzDg0LiTp1krfH4seefFLJNFb6Hunxic00D/roybGgd9hlbqeGmGYXZ+YQpATKQtblA=="; }; }; - "lightning-5.3.3" = { - name = "lightning"; - packageName = "lightning"; - version = "5.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-5.3.3.tgz"; - sha512 = "/piN0cPoXe3wfKJxIwlclOEC3es0VhqFFKpPw5Z1AahpDs1UA/0+czaDiwUrwWPYnlM/6gh92Tu4iXDYNWipng=="; - }; - }; - "lightning-5.3.4" = { - name = "lightning"; - packageName = "lightning"; - version = "5.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-5.3.4.tgz"; - sha512 = "zUHlFFSS+KJhndoZkjkXPWpvlXAgYGWS2SxzXpiiwnXZKCNmT+IkQFQmp2oIpbF7K93oqlpxgafZMZDeReX5pQ=="; - }; - }; "lightning-5.6.1" = { name = "lightning"; packageName = "lightning"; @@ -38917,15 +40060,6 @@ let sha512 = "1Bfrq+FK4/yuBStMzmiFnAG//YewN9Fznm2qn86z87/u6UcWqdpWvBCRS5njtq5bG6eWgxM4DOfaw9LptyXSog=="; }; }; - "lightning-5.6.3" = { - name = "lightning"; - packageName = "lightning"; - version = "5.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-5.6.3.tgz"; - sha512 = "esDBNfA2FoLiQrrOmAYrrjMfO7qz624m3X81aLODgqV4pNAIxEmXYD1fiDg3EBdAD1h07xoGna+xKT2oYDAuUw=="; - }; - }; "lightning-5.7.1" = { name = "lightning"; packageName = "lightning"; @@ -38944,6 +40078,15 @@ let sha512 = "j3m+M50fY9bZ+OSRKzJLon7dkxL+guAOp8ppDd3CLlvrba5ldbs8QbkXuYMXlwLi3Aw4ztSyEUyh69aaSfEXyg=="; }; }; + "lightning-5.8.2" = { + name = "lightning"; + packageName = "lightning"; + version = "5.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lightning/-/lightning-5.8.2.tgz"; + sha512 = "ryJlD9qhbUSq4ZS6Q0WXnTgmj3IMqN1iBfUJoGAMzSbSGZAS8E8eejci88naBbbDA0N34hALpSsa5Ok7JayAdQ=="; + }; + }; "lilconfig-2.0.4" = { name = "lilconfig"; packageName = "lilconfig"; @@ -39124,6 +40267,15 @@ let sha512 = "a7Jipme3XIBIryJluWP5LQrEAvhobDPyScBe+q+MYwxBiMT2Ck7msy4tAdF8TAa33FMdJqX4guP81Yhiu6BkmQ=="; }; }; + "lmdb-2.2.4" = { + name = "lmdb"; + packageName = "lmdb"; + version = "2.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lmdb/-/lmdb-2.2.4.tgz"; + sha512 = "gto+BB2uEob8qRiTlOq+R3uX0YNHsX9mjxj9Sbdue/LIKqu6IlZjrsjKeGyOMquc/474GEqFyX2pdytpydp0rQ=="; + }; + }; "ln-accounting-5.0.5" = { name = "ln-accounting"; packageName = "ln-accounting"; @@ -39142,24 +40294,6 @@ let sha512 = "20ZIPPyGI4odh/Jxq6Lawtc+Zx7MkPuxnn34TuhZpM6ppwVbSGJSuJPctLrhZvWdaYYeboz3BITiqI/o4KvChQ=="; }; }; - "ln-service-53.5.0" = { - name = "ln-service"; - packageName = "ln-service"; - version = "53.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-53.5.0.tgz"; - sha512 = "W6x/uM0K1hHEMadW4YvXcucUc2hjIm+jMIxs0ujNaeRH6uVFEtlfPmEwnYV9EzU3Ns+NOp/juuN/fvF0DqeXhQ=="; - }; - }; - "ln-service-53.5.1" = { - name = "ln-service"; - packageName = "ln-service"; - version = "53.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-53.5.1.tgz"; - sha512 = "EXLhYeu1qvhk+yzuH6qBZyGvqBPWT71FnmsbOxKjWofW6SGQBbJuNru6Ub2NIMhJnXqD7qvMvswZ54ho/oPvGQ=="; - }; - }; "ln-service-53.7.2" = { name = "ln-service"; packageName = "ln-service"; @@ -39178,15 +40312,6 @@ let sha512 = "iA+G0yn3j74BcGdKxhHRCDphMSgGg4NWzFNy9r484WPBjq6KQgCRcxE0I8A0Rgi73kqMckKZmYEKrJMUuJyNYw=="; }; }; - "ln-service-53.8.0" = { - name = "ln-service"; - packageName = "ln-service"; - version = "53.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-53.8.0.tgz"; - sha512 = "W7HReWocdZLSiQaVHvbzFvzEVyftnBuqcm8joEpxLnSpTU6qhJCuIVwEyLYKqhgDKWx2rn5rOnrZ0xKua8j6TQ=="; - }; - }; "ln-service-53.8.1" = { name = "ln-service"; packageName = "ln-service"; @@ -39196,22 +40321,22 @@ let sha512 = "yEKEsDRsPQyBNzS7kpEaYCIhsxSsQzpf+ABov44RvbDKJONf4qMZOiy+IkqhqLP5IwlHFuLdnz/aHCLMSYtuqA=="; }; }; - "ln-service-53.9.1" = { + "ln-service-53.9.2" = { name = "ln-service"; packageName = "ln-service"; - version = "53.9.1"; + version = "53.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-53.9.1.tgz"; - sha512 = "0s0auOxItb5xFKA5yzAU+0eXKFLyWCbv9BrFnqxRrAIXY7wJYT8jFSL609BuFqwmUYkSdsIwe8EYr9WgPohWgQ=="; + url = "https://registry.npmjs.org/ln-service/-/ln-service-53.9.2.tgz"; + sha512 = "ISbIBxbRIBKDPDFuWj3pINZXFRAmHTTeEWdeq7pXJxeFH8JlnrwS8ETSJ1AfgHeeUIHK1D4xo3TNAnkSrRpH/A=="; }; }; - "ln-sync-3.10.0" = { - name = "ln-sync"; - packageName = "ln-sync"; - version = "3.10.0"; + "ln-service-53.9.3" = { + name = "ln-service"; + packageName = "ln-service"; + version = "53.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/ln-sync/-/ln-sync-3.10.0.tgz"; - sha512 = "iRYFVwHF6gyBKO8/WJfR+6jlsjPSsevFz/cbOQbOwBzMVaCmXIyWw95SGHEJLcZR2jNadEfP3k10oYa+hWou3A=="; + url = "https://registry.npmjs.org/ln-service/-/ln-service-53.9.3.tgz"; + sha512 = "vB7pnTJveZSMHbyO6qyGbxNqo+rNTYexb3PONon2+Ow4fBUQW5eeBTj+LguuQdN7AgpXX/PHZUQM0TPFeHlVWw=="; }; }; "ln-sync-3.10.1" = { @@ -39223,22 +40348,22 @@ let sha512 = "mib9y2c36Gz6oQ7sUzAmLV3a8wt52Rm1zKo7ldxBN49Tnh0gGQXbM69jOhLsy7DbB2TCjUJEh1d8OGMsbGuBqg=="; }; }; - "ln-sync-3.7.0" = { + "ln-sync-3.11.0" = { name = "ln-sync"; packageName = "ln-sync"; - version = "3.7.0"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/ln-sync/-/ln-sync-3.7.0.tgz"; - sha512 = "1aTlSSLiIULG4AOhOLdMd/VQYhUBEvTdA+8Bp2xe1YolOralVW/x/50fzIxzkKolCwXQ6elecUuH4nw1z0tqkg=="; + url = "https://registry.npmjs.org/ln-sync/-/ln-sync-3.11.0.tgz"; + sha512 = "YqtS0v6zsDvv7rA51bSbXnB7Il4HQida+FpPD9KTAXdEiJW1L/NiyV4B+oosaygdUbT2oYgM3xw++L7XVBkPvA=="; }; }; - "ln-telegram-3.17.3" = { + "ln-telegram-3.19.1" = { name = "ln-telegram"; packageName = "ln-telegram"; - version = "3.17.3"; + version = "3.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-3.17.3.tgz"; - sha512 = "zGapeGsiRaK308l1gSyz0Cq9xU/S4jf0leFwxI5jwlAjgNGYzRpakk3f8mJETw6uxw+Cgn1kdl4dcnCC8SjyUg=="; + url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-3.19.1.tgz"; + sha512 = "PvSVXwMK5XCL5DpXlAGRvhUJxn1seLsteLEpL/+iS9N3XdpB288kSOH0dBUWznoVbzJgQbykf1p3Rskx7acctg=="; }; }; "load-bmfont-1.4.1" = { @@ -39331,6 +40456,15 @@ let sha512 = "OfCBkGEw4nN6JLtgRidPX6QxjBQGQf72q3si2uvqyFEMbycSFFHwAZeXx6cJgFM9wmLrf9zBwCP3Ivqa+LLZPw=="; }; }; + "loader-fs-cache-1.0.3" = { + name = "loader-fs-cache"; + packageName = "loader-fs-cache"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/loader-fs-cache/-/loader-fs-cache-1.0.3.tgz"; + sha512 = "ldcgZpjNJj71n+2Mf6yetz+c9bM4xpKtNds4LbqXzU/PTdeAX0g3ytnU1AJMEcTk2Lex4Smpe3Q/eCTsvUBxbA=="; + }; + }; "loader-runner-2.4.0" = { name = "loader-runner"; packageName = "loader-runner"; @@ -40024,6 +41158,15 @@ let sha1 = "d09178716ffea4dde9e5fb7b37f6f0802274580c"; }; }; + "lodash.defaultsdeep-4.6.1" = { + name = "lodash.defaultsdeep"; + packageName = "lodash.defaultsdeep"; + version = "4.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz"; + sha512 = "3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA=="; + }; + }; "lodash.difference-4.5.0" = { name = "lodash.difference"; packageName = "lodash.difference"; @@ -40357,6 +41500,15 @@ let sha1 = "771ec7839e3473d9c4cde28b19394c3562f4f6d3"; }; }; + "lodash.mapvalues-4.6.0" = { + name = "lodash.mapvalues"; + packageName = "lodash.mapvalues"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz"; + sha1 = "1bafa5005de9dd6f4f26668c30ca37230cc9689c"; + }; + }; "lodash.memoize-3.0.4" = { name = "lodash.memoize"; packageName = "lodash.memoize"; @@ -40573,6 +41725,15 @@ let sha1 = "24c4bfcd6b2fba38bfd0594db1179d8e9b656561"; }; }; + "lodash.transform-4.6.0" = { + name = "lodash.transform"; + packageName = "lodash.transform"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.transform/-/lodash.transform-4.6.0.tgz"; + sha1 = "12306422f63324aed8483d3f38332b5f670547a0"; + }; + }; "lodash.truncate-4.4.2" = { name = "lodash.truncate"; packageName = "lodash.truncate"; @@ -40762,13 +41923,13 @@ let sha512 = "Mc8jNuSFImQUIateBFwdOQcmC6Q5maU0VVvdC2R6XMb66/VnT+7WS4D/0EeNMZu1YODmJe5NIn2XftCzEocUgw=="; }; }; - "log4js-6.4.1" = { + "log4js-6.4.2" = { name = "log4js"; packageName = "log4js"; - version = "6.4.1"; + version = "6.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/log4js/-/log4js-6.4.1.tgz"; - sha512 = "iUiYnXqAmNKiIZ1XSAitQ4TmNs8CdZYTAWINARF3LjnsLN8tY5m0vRwd6uuWj/yNY0YHxeZodnbmxKFUOM2rMg=="; + url = "https://registry.npmjs.org/log4js/-/log4js-6.4.2.tgz"; + sha512 = "k80cggS2sZQLBwllpT1p06GtfvzMmSdUCkW96f0Hj83rKGJDAu2vZjt9B9ag2vx8Zz1IXzxoLgqvRJCdMKybGg=="; }; }; "logform-2.4.0" = { @@ -41122,13 +42283,13 @@ let sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; }; }; - "lru-cache-7.3.1" = { + "lru-cache-7.4.4" = { name = "lru-cache"; packageName = "lru-cache"; - version = "7.3.1"; + version = "7.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-7.3.1.tgz"; - sha512 = "nX1x4qUrKqwbIAhv4s9et4FIUVzNOpeY07bsjGUy8gwJrXH/wScImSQqXErmo/b2jZY2r0mohbLA9zVj7u1cNw=="; + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-7.4.4.tgz"; + sha512 = "2XbUJmlpIbmc9JvNNmtLzHlF31srxoDxuiQiwBHic7RZyHyltbTdzoO6maRqpdEhOOG5GD80EXvzAU0wR15ccg=="; }; }; "lru-queue-0.1.0" = { @@ -41204,13 +42365,13 @@ let sha512 = "zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow=="; }; }; - "luxon-2.3.0" = { + "luxon-2.3.1" = { name = "luxon"; packageName = "luxon"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/luxon/-/luxon-2.3.0.tgz"; - sha512 = "gv6jZCV+gGIrVKhO90yrsn8qXPKD8HYZJtrUDSfEbow8Tkw84T9OnCyJhWvnJIaIF/tBuiAjZuQHUt1LddX2mg=="; + url = "https://registry.npmjs.org/luxon/-/luxon-2.3.1.tgz"; + sha512 = "I8vnjOmhXsMSlNMZlMkSOvgrxKJl0uOsEzdGgGNZuZPaS9KlefpE9KV95QFftlJSC+1UyCC9/I69R02cz/zcCA=="; }; }; "lzma-native-8.0.6" = { @@ -41294,6 +42455,15 @@ let sha512 = "4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA=="; }; }; + "magic-string-0.25.9" = { + name = "magic-string"; + packageName = "magic-string"; + version = "0.25.9"; + src = fetchurl { + url = "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz"; + sha512 = "RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ=="; + }; + }; "magicli-0.0.5" = { name = "magicli"; packageName = "magicli"; @@ -41384,13 +42554,13 @@ let sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="; }; }; - "make-fetch-happen-10.0.3" = { + "make-fetch-happen-10.0.5" = { name = "make-fetch-happen"; packageName = "make-fetch-happen"; - version = "10.0.3"; + version = "10.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.0.3.tgz"; - sha512 = "CzarPHynPpHjhF5in/YapnO44rSZeYX5VCMfdXa99+gLwpbfFLh20CWa6dP/taV9Net9PWJwXNKtp/4ZTCQnag=="; + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.0.5.tgz"; + sha512 = "0JQ0daMRDFEv14DelmcFlprdhSDNG7WEgInTjBeWYWZ78W0jfDqygZdPLhcrQ4s/G8skNhBrS4fiF6xA+YlFjQ=="; }; }; "make-fetch-happen-8.0.14" = { @@ -41915,22 +43085,13 @@ let sha512 = "YQ/teqaOIIfUHedRam08PB3NK7Mjct6BvzRnJmpGDm8uFXpNr1sbY4yuflI5JcEs6COpYA0FpRQhSDBf1tT95g=="; }; }; - "material-design-icons-3.0.1" = { - name = "material-design-icons"; - packageName = "material-design-icons"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/material-design-icons/-/material-design-icons-3.0.1.tgz"; - sha1 = "9a71c48747218ebca51e51a66da682038cdcb7bf"; - }; - }; - "material-design-lite-1.3.0" = { - name = "material-design-lite"; - packageName = "material-design-lite"; - version = "1.3.0"; + "material-design-icons-iconfont-6.1.1" = { + name = "material-design-icons-iconfont"; + packageName = "material-design-icons-iconfont"; + version = "6.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/material-design-lite/-/material-design-lite-1.3.0.tgz"; - sha1 = "d004ce3fee99a1eeb74a78b8a325134a5f1171d3"; + url = "https://registry.npmjs.org/material-design-icons-iconfont/-/material-design-icons-iconfont-6.1.1.tgz"; + sha512 = "nkoXybeXoofanNagj4tbM6+/LALWpWxYX5ee861to5VQrKgb0/TskTw28Svwn0OGDKajuqK7ShFOsIBxIygGKA=="; }; }; "math-random-1.0.4" = { @@ -42608,15 +43769,6 @@ let sha512 = "CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig=="; }; }; - "meow-6.1.1" = { - name = "meow"; - packageName = "meow"; - version = "6.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/meow/-/meow-6.1.1.tgz"; - sha512 = "3YffViIt2QWgTy6Pale5QpopX/IvU3LPL03jOTqp6pGj3VjesdO/U8CuHMKpnQr4shCNCM5fd5XFFvIIl6JBHg=="; - }; - }; "meow-7.1.1" = { name = "meow"; packageName = "meow"; @@ -42671,6 +43823,15 @@ let sha1 = "a5de46538dae84d4114cc5ea02b4772a6346701f"; }; }; + "merge-source-map-1.1.0" = { + name = "merge-source-map"; + packageName = "merge-source-map"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz"; + sha512 = "Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw=="; + }; + }; "merge-stream-2.0.0" = { name = "merge-stream"; packageName = "merge-stream"; @@ -42734,6 +43895,15 @@ let sha512 = "E9ZXfK9iQfG9s73ars9qvvvbSIkJZF5yOo9j4tcwM5tN8mUKfj/EKN5PzOr3ZH0y5wL7dLAHw3RVEfpQV9Q7VQ=="; }; }; + "meros-1.2.0" = { + name = "meros"; + packageName = "meros"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/meros/-/meros-1.2.0.tgz"; + sha512 = "3QRZIS707pZQnijHdhbttXRWwrHhZJ/gzolneoxKVz9N/xmsvY/7Ls8lpnI9gxbgxjcHsAVEW3mgwiZCo6kkJQ=="; + }; + }; "metals-languageclient-0.4.2" = { name = "metals-languageclient"; packageName = "metals-languageclient"; @@ -43409,6 +44579,15 @@ let sha512 = "5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="; }; }; + "mime-db-1.52.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.52.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz"; + sha512 = "sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="; + }; + }; "mime-types-2.1.18" = { name = "mime-types"; packageName = "mime-types"; @@ -43553,13 +44732,22 @@ let sha512 = "IuaLjruM0vMKhUUT51fQdQzBYTX49dLj8w68ALEAe2A4iYNpIC4eMac67mt3NzycvjOlf07/kYxJDc0RTl1Wqw=="; }; }; - "mini-svg-data-uri-1.4.3" = { + "mini-css-extract-plugin-0.9.0" = { + name = "mini-css-extract-plugin"; + packageName = "mini-css-extract-plugin"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz"; + sha512 = "lp3GeY7ygcgAmVIcRPBVhIkf8Us7FZjA+ILpal44qLdSu11wmjKQ3d9k15lfD7pO4esu9eUIAW7qiYIBppv40A=="; + }; + }; + "mini-svg-data-uri-1.4.4" = { name = "mini-svg-data-uri"; packageName = "mini-svg-data-uri"; - version = "1.4.3"; + version = "1.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/mini-svg-data-uri/-/mini-svg-data-uri-1.4.3.tgz"; - sha512 = "gSfqpMRC8IxghvMcxzzmMnWpXAChSA+vy4cia33RgerMS8Fex95akUyQZPbxJJmeBGiGmK7n/1OpUX8ksRjIdA=="; + url = "https://registry.npmjs.org/mini-svg-data-uri/-/mini-svg-data-uri-1.4.4.tgz"; + sha512 = "r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg=="; }; }; "minicap-prebuilt-2.3.0" = { @@ -43634,13 +44822,22 @@ let sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="; }; }; - "minimatch-5.0.0" = { + "minimatch-4.2.1" = { name = "minimatch"; packageName = "minimatch"; - version = "5.0.0"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-4.2.1.tgz"; + sha512 = "9Uq1ChtSZO+Mxa/CL1eGizn2vRn3MlLgzhT0Iz8zaY8NdvxvB0d5QdPFmCKf7JKA9Lerx5vRrnwO03jsSfGG9g=="; + }; + }; + "minimatch-5.0.1" = { + name = "minimatch"; + packageName = "minimatch"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-5.0.0.tgz"; - sha512 = "EU+GCVjXD00yOUf1TwAHVP7v3fBD3A8RkkPYsWWKGWesxM/572sL53wJQnHxquHlRhYUV36wHkqrN8cdikKc2g=="; + url = "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz"; + sha512 = "nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g=="; }; }; "minimist-0.0.10" = { @@ -43661,15 +44858,6 @@ let sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; }; }; - "minimist-1.2.0" = { - name = "minimist"; - packageName = "minimist"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; - sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; - }; - }; "minimist-1.2.3" = { name = "minimist"; packageName = "minimist"; @@ -43760,6 +44948,15 @@ let sha512 = "CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw=="; }; }; + "minipass-fetch-2.0.3" = { + name = "minipass-fetch"; + packageName = "minipass-fetch"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.0.3.tgz"; + sha512 = "VA+eiiUtaIvpQJXISwE3OiMvQwAWrgKb97F0aXlCS1Ahikr8fEQq8m3Hf7Kv9KT3nokuHigJKsDMB6atU04olQ=="; + }; + }; "minipass-flush-1.0.5" = { name = "minipass-flush"; packageName = "minipass-flush"; @@ -43823,13 +45020,13 @@ let sha512 = "bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg=="; }; }; - "mirakurun-3.3.1" = { + "mirakurun-3.9.0-beta.26" = { name = "mirakurun"; packageName = "mirakurun"; - version = "3.3.1"; + version = "3.9.0-beta.26"; src = fetchurl { - url = "https://registry.npmjs.org/mirakurun/-/mirakurun-3.3.1.tgz"; - sha512 = "uCsn3t7bV3jmy8mcgl19wowBq69Xz/Z/WUkazOC9PXvzzb9j5wvfr+qrwB5GtHkLBFIaBVI59HIX+JJ637jVmA=="; + url = "https://registry.npmjs.org/mirakurun/-/mirakurun-3.9.0-beta.26.tgz"; + sha512 = "w1yetqCebn8G4RRBnPEWLiVeLCOL1r/6t6E/81REOjF27yasxOo8duydpzd2aYWHsMDNr/+yc0xqlRdA64X6Tw=="; }; }; "mired-0.0.0" = { @@ -43868,15 +45065,6 @@ let sha1 = "53d500266cbd09cda9d94c4cf392e60589b5b324"; }; }; - "mithril-2.0.4" = { - name = "mithril"; - packageName = "mithril"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/mithril/-/mithril-2.0.4.tgz"; - sha512 = "mgw+DMZlhMS4PpprF6dl7ZoeZq5GGcAuWnrg5e12MvaGauc4jzWsDZtVGRCktsiQczOEUr2K5teKbE5k44RlOg=="; - }; - }; "mitt-1.2.0" = { name = "mitt"; packageName = "mitt"; @@ -43967,13 +45155,13 @@ let sha512 = "sdqtiFt3lkOaYvTXSRIUjkIdPTcxgv5+fgqYE/5qgwdw12cOrAuzzgzvVExIkH/ul1oeHN3bCLOWSG3XOqbKKw=="; }; }; - "mobx-6.4.1" = { + "mobx-6.4.2" = { name = "mobx"; packageName = "mobx"; - version = "6.4.1"; + version = "6.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/mobx/-/mobx-6.4.1.tgz"; - sha512 = "NFXx0uMbGBgsa0uxhH099L8cMuoRQWh01q6Sf0ZX/3hFU7svJ7yfTD+1LnLMa5wzY/b7gImAeMsR1p0wordDnA=="; + url = "https://registry.npmjs.org/mobx/-/mobx-6.4.2.tgz"; + sha512 = "b4xQJYiH8sb0sEbfq/Ws3N77DEJtSihUFD1moeiz2jNoJ5B+mqJutt54ouO9iEfkp7Wk4jQDsVUOh7DPEW3wEw=="; }; }; "mobx-react-7.3.0" = { @@ -44012,13 +45200,13 @@ let sha512 = "hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ=="; }; }; - "mocha-9.2.1" = { + "mocha-9.2.2" = { name = "mocha"; packageName = "mocha"; - version = "9.2.1"; + version = "9.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-9.2.1.tgz"; - sha512 = "T7uscqjJVS46Pq1XDXyo9Uvey9gd3huT/DD9cYBb4K2Xc/vbKRPUWK067bxDQRK0yIz6Jxk73IrnimvASzBNAQ=="; + url = "https://registry.npmjs.org/mocha/-/mocha-9.2.2.tgz"; + sha512 = "L6XC3EdwT6YrIk0yXpavvLkn8h+EU+Y5UcCHKECyMbdUIxyMuZj4bX4U9e1nvnvUUvQVsV2VHQr5zLdcUkhW/g=="; }; }; "mock-require-3.0.3" = { @@ -44120,6 +45308,24 @@ let sha512 = "3zAEHh2hKUs3EXLESx/wsgw6IQdusOT8Bxm3D9UrHPQR7zlMmzwybC8zHEM1tQ4LJwP7fcxrWr8tuBg05fFCbg=="; }; }; + "mongodb-4.4.1" = { + name = "mongodb"; + packageName = "mongodb"; + version = "4.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mongodb/-/mongodb-4.4.1.tgz"; + sha512 = "IAD3nFtCR4s22vi5qjqkCBnuyDDrOW8WVSSmgHquOvGaP1iTD+XpC5tr8wAUbZ2EeZkaswwBKQFHDvl4qYcKqQ=="; + }; + }; + "mongodb-connection-string-url-2.5.2" = { + name = "mongodb-connection-string-url"; + packageName = "mongodb-connection-string-url"; + version = "2.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-2.5.2.tgz"; + sha512 = "tWDyIG8cQlI5k3skB6ywaEA5F9f5OntrKKsT/Lteub2zgwSUlhqEN2inGgBTm8bpYJf8QYBdA/5naz65XDpczA=="; + }; + }; "moniker-0.1.2" = { name = "moniker"; packageName = "moniker"; @@ -44237,6 +45443,15 @@ let sha512 = "NOeCoW6AYc3hLi30npe7uzbD9b4FQZKH40YKABUCCvaKKL5agj6YzvHoNx8jQpDMNPgIa5bvSZQbQpWBAVD0Kw=="; }; }; + "mpegts.js-1.6.10" = { + name = "mpegts.js"; + packageName = "mpegts.js"; + version = "1.6.10"; + src = fetchurl { + url = "https://registry.npmjs.org/mpegts.js/-/mpegts.js-1.6.10.tgz"; + sha512 = "ZgX4b93cWk+EazOFRV4lekLqmc4rV7P+WMisG8N0F2M4/EiluPMNNWjuaurQfitak++AIc/ZVQ3IgM3cBcH7WA=="; + }; + }; "mqtt-4.3.5" = { name = "mqtt"; packageName = "mqtt"; @@ -44354,13 +45569,31 @@ let sha512 = "VoY2AaoowHZLLKyEb5FRzuhdSzXn5quGjcMKJOJHJPxp9baYZx5t6jiHUhp5aNRlqqlt+5GXQGovMLNKsrm1hg=="; }; }; - "multer-1.4.2" = { + "msgpackr-1.5.4" = { + name = "msgpackr"; + packageName = "msgpackr"; + version = "1.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.5.4.tgz"; + sha512 = "Z7w5Jg+2Q9z9gJxeM68d7tSuWZZGnFIRhZnyqcZCa/1dKkhOCNvR1TUV3zzJ3+vj78vlwKRzUgVDlW4jiSOeDA=="; + }; + }; + "msgpackr-extract-1.0.16" = { + name = "msgpackr-extract"; + packageName = "msgpackr-extract"; + version = "1.0.16"; + src = fetchurl { + url = "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-1.0.16.tgz"; + sha512 = "fxdRfQUxPrL/TizyfYfMn09dK58e+d65bRD/fcaVH4052vj30QOzzqxcQIS7B0NsqlypEQ/6Du3QmP2DhWFfCA=="; + }; + }; + "multer-1.4.3" = { name = "multer"; packageName = "multer"; - version = "1.4.2"; + version = "1.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/multer/-/multer-1.4.2.tgz"; - sha512 = "xY8pX7V+ybyUpbYMxtjM9KAiD9ixtg5/JkeKUTD6xilfDv0vzzOFcCp4Ljb1UU3tSOM3VTZtKo63OmzOrGi3Cg=="; + url = "https://registry.npmjs.org/multer/-/multer-1.4.3.tgz"; + sha512 = "np0YLKncuZoTzufbkM6wEKp68EhWJXcU6fq6QqrSwkckd2LlMgd1UqhUJLj6NS/5sZ8dE8LYDWslsltJznnXlg=="; }; }; "multer-1.4.4" = { @@ -44390,22 +45623,22 @@ let sha1 = "6462f1b204109ccc644601650110a828443d66e2"; }; }; - "multiblob-1.13.7" = { + "multiblob-1.13.8" = { name = "multiblob"; packageName = "multiblob"; - version = "1.13.7"; + version = "1.13.8"; src = fetchurl { - url = "https://registry.npmjs.org/multiblob/-/multiblob-1.13.7.tgz"; - sha512 = "+vZLrxhuAJFOl9EFUkFviYpz8nIOdoM3Hzq8Mzx0uJkaRWd61QxIp68wglTM8ZtABXYgE0YowD98XqthCRxSow=="; + url = "https://registry.npmjs.org/multiblob/-/multiblob-1.13.8.tgz"; + sha512 = "YXNUflHc7I7iUiLctHMTvwDQOjMbCv+Pdbf+1lScFOsjP/CSZgwblRknPntcD+KEPGFudXPBtJR10TIrun3zmQ=="; }; }; - "multiblob-http-1.2.0" = { + "multiblob-http-1.2.1" = { name = "multiblob-http"; packageName = "multiblob-http"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/multiblob-http/-/multiblob-http-1.2.0.tgz"; - sha512 = "bTW9D4NcgvWO/vFXakTUV5JN7p2fTG0o4Flg2zZFF44fDBUnq4FkZKbFNnkci+zkdfYAo9HqZPxvnMwS58mtjQ=="; + url = "https://registry.npmjs.org/multiblob-http/-/multiblob-http-1.2.1.tgz"; + sha512 = "ZNgfHZkC1A1xec7aUE7Tq6ArIXE7pygzbf3jNX1wlK15STqenGGURrqM79puk3j2cscC9Keu/ULQM3dET3xLCQ=="; }; }; "multicast-dns-4.0.1" = { @@ -44534,15 +45767,6 @@ let sha512 = "J1XDiAmmNpRCBfIWJv+n0ymC4ABcf/Pl+5YvC5B/D2f/2+8PtHvCNxMPKiQcZyi922Hq69J2YOpb1pTywfifyw=="; }; }; - "munin-plugin-0.0.9" = { - name = "munin-plugin"; - packageName = "munin-plugin"; - version = "0.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/munin-plugin/-/munin-plugin-0.0.9.tgz"; - sha1 = "ca17e1eafb3b9155b5e4c21062210e348a9dbe91"; - }; - }; "murmurhash-js-1.0.0" = { name = "murmurhash-js"; packageName = "murmurhash-js"; @@ -44651,13 +45875,13 @@ let sha512 = "pbYSsOrSB/AKN5h/WzzLRMFgZhClWccf2XIB4RSMC8JbquiB0e0/SH5AIfdQMdyHmYtv4seU7yV/TvAwPLJ1Yg=="; }; }; - "muxrpc-6.7.0" = { + "muxrpc-6.7.2" = { name = "muxrpc"; packageName = "muxrpc"; - version = "6.7.0"; + version = "6.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/muxrpc/-/muxrpc-6.7.0.tgz"; - sha512 = "1jdziESUd2ajBUJ/tvLRdm9TJQiN+JuN0NHtvubposhVUi8T5PF6ODfit6lg30l4iDxK4/z52wvbnHbsfvzT/w=="; + url = "https://registry.npmjs.org/muxrpc/-/muxrpc-6.7.2.tgz"; + sha512 = "tmaQl2h6OB4ofvOex/DQpKOiMOktnRAe9bvBmYCd9BnE3QmwOSpZey2n7P5gWlKDTRgjunJZiISlGOKIOXbHZg=="; }; }; "muxrpc-usage-2.1.0" = { @@ -44849,15 +46073,6 @@ let sha512 = "a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw=="; }; }; - "nanoid-3.2.0" = { - name = "nanoid"; - packageName = "nanoid"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz"; - sha512 = "fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA=="; - }; - }; "nanoid-3.3.1" = { name = "nanoid"; packageName = "nanoid"; @@ -45101,13 +46316,13 @@ let sha512 = "SIrthcL5Wc0sps+2e1xGj3zceEa68TgNZDLuCx0daxmfTP7sFTB3/mtE2pYhlFsCxWoMn+JfID5E1NlzvvbRJg=="; }; }; - "near-ledger-js-0.2.0" = { + "near-ledger-js-0.2.1" = { name = "near-ledger-js"; packageName = "near-ledger-js"; - version = "0.2.0"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/near-ledger-js/-/near-ledger-js-0.2.0.tgz"; - sha512 = "6YcK7o+GcsUoGevjVqDotVZE3hvCcr9cRxFx/+PyR7JrDbzbVhavXQInqJxdZnqYC7K/dh/YZKhwhtXHXEF1iQ=="; + url = "https://registry.npmjs.org/near-ledger-js/-/near-ledger-js-0.2.1.tgz"; + sha512 = "8anZb6e96gJNBOKUR/HReLN/x8BmBhCpyPq+XxFbx8jxmsRz+M1Hxq085+ROYaMI2EDJqatrjjLAdArk13BOhA=="; }; }; "near-seed-phrase-0.2.0" = { @@ -45237,13 +46452,13 @@ let sha256 = "243e90fbf6616ef39f3c71bbcd027799e35cbf2ef3f25203676f65b20f7f7394"; }; }; - "nel-1.2.0" = { + "nel-1.3.0" = { name = "nel"; packageName = "nel"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/nel/-/nel-1.2.0.tgz"; - sha512 = "yt96hdYomrZC5ZvYHMCsRF5KIaZ8Aue5Gff4sH+6GmPDMJft097x5JG1DicLnfgSYE56CLP6ztZEfb+3St91Yw=="; + url = "https://registry.npmjs.org/nel/-/nel-1.3.0.tgz"; + sha512 = "LvnlJC5lg6MRazqzfRtIMvLmtOhCm9z/dkdVaHuCxQHLmD7NzLsExnqv7VMuRfL4tC0mXcLlnFsh9SF0PdIjSw=="; }; }; "neo-async-2.6.2" = { @@ -45381,15 +46596,6 @@ let sha1 = "fcae57853052b6a9bae8208e40dd7d3c2d304603"; }; }; - "next-tick-1.0.0" = { - name = "next-tick"; - packageName = "next-tick"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz"; - sha1 = "ca86d1fe8828169b0120208e3dc8424b9db8342c"; - }; - }; "next-tick-1.1.0" = { name = "next-tick"; packageName = "next-tick"; @@ -45714,15 +46920,6 @@ let sha512 = "5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw=="; }; }; - "node-fetch-1.6.3" = { - name = "node-fetch"; - packageName = "node-fetch"; - version = "1.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-1.6.3.tgz"; - sha1 = "dc234edd6489982d58e8f0db4f695029abcd8c04"; - }; - }; "node-fetch-1.7.3" = { name = "node-fetch"; packageName = "node-fetch"; @@ -45759,13 +46956,13 @@ let sha512 = "ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ=="; }; }; - "node-fetch-3.2.0" = { + "node-fetch-3.2.3" = { name = "node-fetch"; packageName = "node-fetch"; - version = "3.2.0"; + version = "3.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-3.2.0.tgz"; - sha512 = "8xeimMwMItMw8hRrOl3C9/xzU49HV/yE6ORew/l+dxWimO5A4Ra8ld2rerlJvc/O7et5Z1zrWsPX43v1QBjCxw=="; + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-3.2.3.tgz"; + sha512 = "AXP18u4pidSZ1xYXRDPY/8jdv3RAozIt/WLNR/MBGZAz+xjtlr90RvCnsvHQRiXyWliZF/CpytExp32UU67/SA=="; }; }; "node-fetch-h2-2.3.0" = { @@ -45858,6 +47055,15 @@ let sha512 = "olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w=="; }; }; + "node-gyp-9.0.0" = { + name = "node-gyp"; + packageName = "node-gyp"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-9.0.0.tgz"; + sha512 = "Ma6p4s+XCTPxCuAMrOA/IJRmVy16R8Sdhtwl4PrCr7IBlj4cPawF0vg/l7nOT1jPbuNS7lIRJpBSvVsXwEZuzw=="; + }; + }; "node-gyp-build-4.1.1" = { name = "node-gyp-build"; packageName = "node-gyp-build"; @@ -46353,6 +47559,15 @@ let sha512 = "p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA=="; }; }; + "normalize-path-1.0.0" = { + name = "normalize-path"; + packageName = "normalize-path"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-path/-/normalize-path-1.0.0.tgz"; + sha1 = "32d0e472f91ff345701c15a8311018d3b0a90379"; + }; + }; "normalize-path-2.1.1" = { name = "normalize-path"; packageName = "normalize-path"; @@ -46686,13 +47901,13 @@ let sha512 = "Df5QT3RaJnXYuOwtXBXS9BWs+tHH2olvkCLh6jcR/b/u3DvPMlp3J0TvvYwplPKxHMOwfg287PYih9QqaVFoKA=="; }; }; - "npm-registry-fetch-13.0.0" = { + "npm-registry-fetch-13.0.1" = { name = "npm-registry-fetch"; packageName = "npm-registry-fetch"; - version = "13.0.0"; + version = "13.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-13.0.0.tgz"; - sha512 = "MmiMuV9DU5gRuAU0jia952Qq+E4h7ZoUaeltCXivhClcqfOVKqNLZEQsRUOb6a8WQY+um8x97JcUuaWFoPoBBw=="; + url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-13.0.1.tgz"; + sha512 = "Ak+LXVtSrCLOdscFW/apUw67OPNph8waHsPKM9UOJosL7i59EF5XoSWQMEsXEOeifM9Bb4/2+WrQC4t/pd8DGg=="; }; }; "npm-registry-fetch-9.0.0" = { @@ -46839,6 +48054,15 @@ let sha512 = "A8A8+PtlH937KWXJnfct6ubGPfgHOe3lwFkkmrT5xW8+aRBnDWqSiW5NRuiVuh/k/auLGsZdu+WrIU2epL/FHg=="; }; }; + "null-loader-4.0.1" = { + name = "null-loader"; + packageName = "null-loader"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/null-loader/-/null-loader-4.0.1.tgz"; + sha512 = "pxqVbi4U6N26lq+LmgIbB5XATP0VdZKOG25DhHi8btMmJJefGArFyDg1yc4U3hWCJbMqSrw0qyrz1UQX+qYXqg=="; + }; + }; "nullthrows-1.1.1" = { name = "nullthrows"; packageName = "nullthrows"; @@ -46866,13 +48090,13 @@ let sha1 = "6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"; }; }; - "number-allocator-1.0.9" = { + "number-allocator-1.0.10" = { name = "number-allocator"; packageName = "number-allocator"; - version = "1.0.9"; + version = "1.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/number-allocator/-/number-allocator-1.0.9.tgz"; - sha512 = "sIIF0dZKMs3roPUD7rLreH8H3x47QKV9dHZ+PeSnH24gL0CxKxz/823woGZC0hLBSb2Ar/rOOeHiNbnPBum/Mw=="; + url = "https://registry.npmjs.org/number-allocator/-/number-allocator-1.0.10.tgz"; + sha512 = "K4AvNGKo9lP6HqsZyfSr9KDaqnwFzW203inhQEOwFrmFaYevpdX4VNwdOLk197aHujzbT//z6pCBrCOUYSM5iw=="; }; }; "number-is-nan-1.0.1" = { @@ -47362,15 +48586,6 @@ let sha512 = "rH3U4eLHsV+OgkOS29ULiC9JLspwMCyCIH/+BglLPXDxQs13IK8AGD+nVmkGXqGN5JefZu85YhfIi05CsOKWPw=="; }; }; - "office-ui-fabric-react-7.183.1" = { - name = "office-ui-fabric-react"; - packageName = "office-ui-fabric-react"; - version = "7.183.1"; - src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.183.1.tgz"; - sha512 = "2C0fmVPYi7kuMa0e+0Cw37C5SxOb4I//e5zwoBgOPagODYO/yhxZAxOt6VTOkn1Nr3zTZeYAfN7mjUNrjfyvFA=="; - }; - }; "omggif-1.0.10" = { name = "omggif"; packageName = "omggif"; @@ -47416,6 +48631,15 @@ let sha1 = "20f1336481b083cd75337992a16971aa2d906947"; }; }; + "on-finished-2.4.1" = { + name = "on-finished"; + packageName = "on-finished"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz"; + sha512 = "oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg=="; + }; + }; "on-headers-1.0.2" = { name = "on-headers"; packageName = "on-headers"; @@ -47542,13 +48766,13 @@ let sha512 = "fvaSZRzprpwLFge/mcwE0CItfniNisVNamDdMK1FQUjh4ArQZ8ZWSkDaJbZc3XaANKZHq0xIa8NJpZ2HSe3oXA=="; }; }; - "oo-ascii-tree-1.54.0" = { + "oo-ascii-tree-1.55.0" = { name = "oo-ascii-tree"; packageName = "oo-ascii-tree"; - version = "1.54.0"; + version = "1.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.54.0.tgz"; - sha512 = "EAk5I5GHidk2lvqwcfR1bl/EeK1Pns8BMzzFKle6clapov3LX54l3k70VGHQDLsHo42dy9UJe23mJPVpg9iTcg=="; + url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.55.0.tgz"; + sha512 = "oC+v1W4giMwOU19ZZmT89culEvqRlpGxoKAPirk4URHdOEWROSJy+xbuemiKRxrQwbmLMqgZw0Uq2PkiaBmtDw=="; }; }; "open-0.0.2" = { @@ -47614,157 +48838,157 @@ let sha512 = "XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q=="; }; }; - "openapi-default-setter-2.1.0" = { + "openapi-default-setter-8.0.0" = { name = "openapi-default-setter"; packageName = "openapi-default-setter"; - version = "2.1.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-default-setter/-/openapi-default-setter-2.1.0.tgz"; - sha512 = "2ZNlX1B/J9Q/bsM/vZKh8alC0Pn04KtDGbMN30qLRu3GkaOJH3dDMKxqJzCpYj8BOAa8G3BEsQq6kqWzkEsM7A=="; + url = "https://registry.npmjs.org/openapi-default-setter/-/openapi-default-setter-8.0.0.tgz"; + sha512 = "Ro0hg8w+lTPe18r5noVUjHgYMXZ3mPe5evW6fA0hdahqLns444wR/Cuvcykb/FHteqaq0WooQrsoKObO4lIHWA=="; }; }; - "openapi-default-setter-7.2.3" = { + "openapi-default-setter-9.3.1" = { name = "openapi-default-setter"; packageName = "openapi-default-setter"; - version = "7.2.3"; + version = "9.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-default-setter/-/openapi-default-setter-7.2.3.tgz"; - sha512 = "wRqgsLfZB3LXx8l3RfKo8icdDPDucnrRD2EkygTMiUv5W1/OdZJmo1ChgD6FjQUZH/7U67IxEjnXPEWfnu+dRw=="; + url = "https://registry.npmjs.org/openapi-default-setter/-/openapi-default-setter-9.3.1.tgz"; + sha512 = "Tc/qpL7H2urJAilmb1wLqHJ8BjjJYudodRFl3RbTkWPSzwalZwPEo4VRP6WnEGvaRgkzLFaT62XgTHRGT8G9lw=="; }; }; - "openapi-framework-0.26.0" = { + "openapi-framework-8.0.0" = { name = "openapi-framework"; packageName = "openapi-framework"; - version = "0.26.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-framework/-/openapi-framework-0.26.0.tgz"; - sha512 = "TbgwwOnlatb+xSYh/XALQjrVO3dirVNXuONR6CLQHVI/i1e+nq/ubW8I5i6rlGpnFLZNZKXZ0gF7RMvjLBk8ow=="; + url = "https://registry.npmjs.org/openapi-framework/-/openapi-framework-8.0.0.tgz"; + sha512 = "T9rP8onTa5xU+7+FCiiBO/p0DLjbHlcfhu+8yUEWFlmlCyihqjbsH0YiH7cCQYNOLgKZUCQZOaxJDiYBlVIaQQ=="; }; }; - "openapi-framework-7.5.0" = { + "openapi-framework-9.3.1" = { name = "openapi-framework"; packageName = "openapi-framework"; - version = "7.5.0"; + version = "9.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-framework/-/openapi-framework-7.5.0.tgz"; - sha512 = "t+sGVNMs2apX6d/rf5oq/3S6tCyBTgCjgFY0EDEIKKWepO4v3wM+kjy/Ve9iU92Ui5GeWbGR6ceFKY6VP/OKfQ=="; + url = "https://registry.npmjs.org/openapi-framework/-/openapi-framework-9.3.1.tgz"; + sha512 = "cnDQQSHNhwS4jn5IE1gTO4mMTolbPbMf3EzVCMNmEcN09IKGQYmtiVSxxL+uGFiHHlpPfOTSsWrvTCiwbhRtyA=="; }; }; - "openapi-jsonschema-parameters-1.2.0" = { + "openapi-jsonschema-parameters-8.0.0" = { name = "openapi-jsonschema-parameters"; packageName = "openapi-jsonschema-parameters"; - version = "1.2.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-jsonschema-parameters/-/openapi-jsonschema-parameters-1.2.0.tgz"; - sha512 = "i2vBBFiRbOwYSvt5OG9hayJ7WUe/nl9Y151Ki1QtHb8M0zdYs2wkDhywVJnapq4/gPlrD1vmSVsYDrAjcBRJTQ=="; + url = "https://registry.npmjs.org/openapi-jsonschema-parameters/-/openapi-jsonschema-parameters-8.0.0.tgz"; + sha512 = "yBBShgxPyo1M33q6RHNAvhTH6AydMDyDl7e89YUA/VkAf1wrU2HO/7Nok65R0vGbZFF43yml4i8sIak3GGnqVA=="; }; }; - "openapi-jsonschema-parameters-7.2.3" = { + "openapi-jsonschema-parameters-9.3.1" = { name = "openapi-jsonschema-parameters"; packageName = "openapi-jsonschema-parameters"; - version = "7.2.3"; + version = "9.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-jsonschema-parameters/-/openapi-jsonschema-parameters-7.2.3.tgz"; - sha512 = "hnhuSbyB0gwA2KrDmMve0A+XC3rqhiQwlvOpZ+kGDz9nWqgLgFJA582LpA4V1W+nI3WruS0nEkAvfG8EHKD+qQ=="; + url = "https://registry.npmjs.org/openapi-jsonschema-parameters/-/openapi-jsonschema-parameters-9.3.1.tgz"; + sha512 = "WeP/7nh4VAZFhtf5+FbA2HQQPD/a13+xf8uCd3QqpynSzBmcdkstb/kg8Uk4Hmqh5WlNkTGpxnjMxqSw6sHcWw=="; }; }; - "openapi-request-coercer-2.4.0" = { + "openapi-request-coercer-8.0.0" = { name = "openapi-request-coercer"; packageName = "openapi-request-coercer"; - version = "2.4.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-request-coercer/-/openapi-request-coercer-2.4.0.tgz"; - sha512 = "UFRzW7C7Q31FUOFHEMYNeSuEmETH7KGlsMgMJanv0RxXkACyzKpKANPfM3oiMubQENPya3Ie9ZIq5HLvZEy/eQ=="; + url = "https://registry.npmjs.org/openapi-request-coercer/-/openapi-request-coercer-8.0.0.tgz"; + sha512 = "CTWZJT6rAPiLO7kvBpN9CJ7TXbCTlZzE7Z/Id/gegK/5FlxYIoB+ybx4tYC4IwJEjfm/lxY7Xv2CRp6RLJfKPw=="; }; }; - "openapi-request-coercer-7.5.0" = { + "openapi-request-coercer-9.3.1" = { name = "openapi-request-coercer"; packageName = "openapi-request-coercer"; - version = "7.5.0"; + version = "9.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-request-coercer/-/openapi-request-coercer-7.5.0.tgz"; - sha512 = "wvrh3xSEpmgKaHiAnVhPxL6Yp9IXW+NEI192z6X5RiU6xe+jszn6A3v8vJcceyNsvDBA4tkm4I3mFndDlhc6Zw=="; + url = "https://registry.npmjs.org/openapi-request-coercer/-/openapi-request-coercer-9.3.1.tgz"; + sha512 = "4rIT/3H5k/zVSXSbxnLQvmHw4BXyCv4ocPjweybDxlVN6ryk+eIaMWiJzFoOf7RI86w++742HOECyzaLoBHftQ=="; }; }; - "openapi-request-validator-4.2.0" = { + "openapi-request-validator-8.0.0" = { name = "openapi-request-validator"; packageName = "openapi-request-validator"; - version = "4.2.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-request-validator/-/openapi-request-validator-4.2.0.tgz"; - sha512 = "ukdX4T8heEI2GudiqDkk8hwfZhZP7zAz8zwngTyHtI0ZRUuU76+Zix8LVfrvSTZ2RpsPClKmYU2kDU4YZqdRHg=="; + url = "https://registry.npmjs.org/openapi-request-validator/-/openapi-request-validator-8.0.0.tgz"; + sha512 = "7gqNp4MvYu+pbdbq8Pw0qMsKqlhWQeYdKCHiu1OeOgBG8YkjlNGGeTuX028TsBEB/jGw7PgMCggaHuMl/W3bmQ=="; }; }; - "openapi-request-validator-7.4.0" = { + "openapi-request-validator-9.3.1" = { name = "openapi-request-validator"; packageName = "openapi-request-validator"; - version = "7.4.0"; + version = "9.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-request-validator/-/openapi-request-validator-7.4.0.tgz"; - sha512 = "0rnslY82Btw5nM6rUEuXkvupav4ujvP+e9WziZvcMrE+VZ6IxRGDP8F7w0XmtPBwMS2nJGgt/J7BnRXAFTx5tw=="; + url = "https://registry.npmjs.org/openapi-request-validator/-/openapi-request-validator-9.3.1.tgz"; + sha512 = "YhX942jTNWH3V/C+ysYcgchyjulT5ZJ1l0c9++isSnF0SKyEiIA+uUiSyAE+pKTc+Oel3ad8mXiy6rFFHoIKaQ=="; }; }; - "openapi-response-validator-4.0.0" = { + "openapi-response-validator-8.0.0" = { name = "openapi-response-validator"; packageName = "openapi-response-validator"; - version = "4.0.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-response-validator/-/openapi-response-validator-4.0.0.tgz"; - sha512 = "bIG8bpHT/vE+Dtz4aVyfQnweXtUdvxvJf5/D6Uu98UGf3T42Ez940ctwnlmDCQxTPqdu0yLFbMoiNf/A3jYCIg=="; + url = "https://registry.npmjs.org/openapi-response-validator/-/openapi-response-validator-8.0.0.tgz"; + sha512 = "h41hcEIgT7ldowLafcWlaE2m3+ss9IgRRrBfEzTtdBab2SyefYeXBV5keicL/muC1msmhT2p2rftjQnvfQN2jA=="; }; }; - "openapi-response-validator-7.4.0" = { + "openapi-response-validator-9.3.1" = { name = "openapi-response-validator"; packageName = "openapi-response-validator"; - version = "7.4.0"; + version = "9.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-response-validator/-/openapi-response-validator-7.4.0.tgz"; - sha512 = "Su8jA45PhegUgJnEAT15DYt2spPJgvjyTtXqg+Lw5AtGePfcQskV6ACEzsL0XPoAXIFf09Vx6sBor9pek+tl+Q=="; + url = "https://registry.npmjs.org/openapi-response-validator/-/openapi-response-validator-9.3.1.tgz"; + sha512 = "2AOzHAbrwdj5DNL3u+BadhfmL3mlc3mmCv6cSAsEjoMncpOOVd95JyMf0j0XUyJigJ8/ILxnhETfg35vt1pGSQ=="; }; }; - "openapi-sampler-1.2.0" = { + "openapi-sampler-1.2.1" = { name = "openapi-sampler"; packageName = "openapi-sampler"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.2.0.tgz"; - sha512 = "Y0tFg2iH7NWnNHYnesxhMfkXc7wWXyJXYMUTTxkGkfpl0U9u/ZOf6BxrdEXBD4sgs9uMlVWsbWLDLesVmSUU7Q=="; + url = "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.2.1.tgz"; + sha512 = "mHrYmyvcLD0qrfqPkPRBAL2z16hGT2rW0d0B7nklfoTcc3pmkJLkSZlKSeFgerUM41E5c7jlxf0Y19xrM7mWQQ=="; }; }; - "openapi-schema-validator-3.0.3" = { + "openapi-schema-validator-8.0.0" = { name = "openapi-schema-validator"; packageName = "openapi-schema-validator"; - version = "3.0.3"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-schema-validator/-/openapi-schema-validator-3.0.3.tgz"; - sha512 = "KKpeNEvAmpy6B2JCfyrM4yWjL6vggDCVbBoR8Yfkj0Jltc6PCW+dBbcg+1yrTCuDv80qBQJ6w0ejA71DlOFegA=="; + url = "https://registry.npmjs.org/openapi-schema-validator/-/openapi-schema-validator-8.0.0.tgz"; + sha512 = "cxacCVE/pIhlfzDPjhMREEVgWsFFUxU/+bKU258LKDmgXcdbbajtWtRT63VarXPnQ0sS4Bhl3V4ZKWxdJMiOXA=="; }; }; - "openapi-schema-validator-7.2.3" = { + "openapi-schema-validator-9.3.1" = { name = "openapi-schema-validator"; packageName = "openapi-schema-validator"; - version = "7.2.3"; + version = "9.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-schema-validator/-/openapi-schema-validator-7.2.3.tgz"; - sha512 = "XT8NM5e/zBBa/cydTS1IeYkCPzJp9oixvt9Y1lEx+2gsCTOooNxw9x/KEivtWMSokne7X1aR+VtsYHQtNNOSyA=="; + url = "https://registry.npmjs.org/openapi-schema-validator/-/openapi-schema-validator-9.3.1.tgz"; + sha512 = "5wpFKMoEbUcjiqo16jIen3Cb2+oApSnYZpWn8WQdRO2q/dNQZZl8Pz6ESwCriiyU5AK4i5ZI6+7O3bHQr6+6+g=="; }; }; - "openapi-security-handler-2.0.4" = { + "openapi-security-handler-8.0.0" = { name = "openapi-security-handler"; packageName = "openapi-security-handler"; - version = "2.0.4"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-security-handler/-/openapi-security-handler-2.0.4.tgz"; - sha512 = "blz/UftEqYQLAByuEVITePUI9hV5Rd91CEK8yrsKDUaf3zk6cmIMafJ2qvagHqjXRRtL7fOqvsSKIeFrai+HfQ=="; + url = "https://registry.npmjs.org/openapi-security-handler/-/openapi-security-handler-8.0.0.tgz"; + sha512 = "XWD15AQSZA3OQFS1gqupC9KoxOuUacyG8PUEna91sihPvZdO5lVcAfqHkJ1tqOKcn5k8Y8EsSoCwlr0d5njCaw=="; }; }; - "openapi-security-handler-7.2.3" = { + "openapi-security-handler-9.3.1" = { name = "openapi-security-handler"; packageName = "openapi-security-handler"; - version = "7.2.3"; + version = "9.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-security-handler/-/openapi-security-handler-7.2.3.tgz"; - sha512 = "6wC2MXUv/FOy6uK6kkvPx1Pmh4WI3rpj7fsA1jwKCIPMwVcaJQA7/4Cfw3VWMNF0mVz7Nlxt9/aiziXHSOfiLg=="; + url = "https://registry.npmjs.org/openapi-security-handler/-/openapi-security-handler-9.3.1.tgz"; + sha512 = "q9rzMCwo3hia/56eBVkCUURQXZBlP/2DzplVd9Gvi3fgCXrgjnp+eY0W9EcmTJU5unb8rOuMExKsEI2cdEziVg=="; }; }; "openapi-to-graphql-2.2.5" = { @@ -47776,40 +49000,40 @@ let sha512 = "HlCCs/D7wMtraNZVYR8fgqv2Fr4afWgWKVf38uwwMEdhTuVHadn+1ILYfmZV6AdejFw7ViQpjNGVRcdrN2wzFg=="; }; }; - "openapi-types-1.3.4" = { + "openapi-types-7.2.3" = { name = "openapi-types"; packageName = "openapi-types"; - version = "1.3.4"; + version = "7.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-types/-/openapi-types-1.3.4.tgz"; - sha512 = "h8rADpW3k/wepLdERKF0VKMAPdoFYNQCLGPmc/f8sgQ2dxUy+7sY4WAX2XDUDjhKTjbJVbxxofLkzy7f1/tE4g=="; + url = "https://registry.npmjs.org/openapi-types/-/openapi-types-7.2.3.tgz"; + sha512 = "olbaNxz12R27+mTyJ/ZAFEfUruauHH27AkeQHDHRq5AF0LdNkK1SSV7EourXQDK+4aX7dv2HtyirAGK06WMAsA=="; }; }; - "openapi-types-1.3.5" = { + "openapi-types-8.0.0" = { name = "openapi-types"; packageName = "openapi-types"; - version = "1.3.5"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-types/-/openapi-types-1.3.5.tgz"; - sha512 = "11oi4zYorsgvg5yBarZplAqbpev5HkuVNPlZaPTknPDzAynq+lnJdXAmruGWP0s+dNYZS7bjM+xrTpJw7184Fg=="; + url = "https://registry.npmjs.org/openapi-types/-/openapi-types-8.0.0.tgz"; + sha512 = "dcHYyCDOAy4QQTrur5Sn1L3lPVspB7rd04Rw/Q7AsMvfV797IiWgmKziFCbq8VhnBoREU/SPPSBDxtK9Biwa1g=="; }; }; - "openapi-types-7.0.1" = { + "openapi-types-9.3.0" = { name = "openapi-types"; packageName = "openapi-types"; - version = "7.0.1"; + version = "9.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-types/-/openapi-types-7.0.1.tgz"; - sha512 = "6pi4/Fw+JIW1HHda2Ij7LRJ5QJ8f6YzaXnsRA6m44BJz8nLq/j5gVFzPBKJo+uOFhAeHqZC/3uzhTpYPga3Q/A=="; + url = "https://registry.npmjs.org/openapi-types/-/openapi-types-9.3.0.tgz"; + sha512 = "sR23YjmuwDSMsQVZDHbV9mPgi0RyniQlqR0AQxTC2/F3cpSjRFMH3CFPjoWvNqhC4OxPkDYNb2l8Mc1Me6D/KQ=="; }; }; - "openapi-types-7.2.3" = { + "openapi-types-9.3.1" = { name = "openapi-types"; packageName = "openapi-types"; - version = "7.2.3"; + version = "9.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-types/-/openapi-types-7.2.3.tgz"; - sha512 = "olbaNxz12R27+mTyJ/ZAFEfUruauHH27AkeQHDHRq5AF0LdNkK1SSV7EourXQDK+4aX7dv2HtyirAGK06WMAsA=="; + url = "https://registry.npmjs.org/openapi-types/-/openapi-types-9.3.1.tgz"; + sha512 = "/Yvsd2D7miYB4HLJ3hOOS0+vnowQpaT75FsHzr/y5M9P4q9bwa7RcbW2YdH6KZBn8ceLbKGnHxMZ1CHliGHUFw=="; }; }; "openapi3-ts-2.0.2" = { @@ -47821,15 +49045,6 @@ let sha512 = "TxhYBMoqx9frXyOgnRHufjQfPXomTIHYKhSKJ6jHfj13kS8OEIhvmE8CTuQyKtjjWttAjX5DPxM1vmalEpo8Qw=="; }; }; - "opencollective-1.0.3" = { - name = "opencollective"; - packageName = "opencollective"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/opencollective/-/opencollective-1.0.3.tgz"; - sha1 = "aee6372bc28144583690c3ca8daecfc120dd0ef1"; - }; - }; "opencollective-postinstall-2.0.3" = { name = "opencollective-postinstall"; packageName = "opencollective-postinstall"; @@ -47893,15 +49108,6 @@ let sha1 = "b6d99e7399f78d65c3baaffef1fb288e9b85243a"; }; }; - "opn-4.0.2" = { - name = "opn"; - packageName = "opn"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/opn/-/opn-4.0.2.tgz"; - sha1 = "7abc22e644dff63b0a96d5ab7f2790c0f01abc95"; - }; - }; "opn-5.3.0" = { name = "opn"; packageName = "opn"; @@ -48100,6 +49306,15 @@ let sha512 = "CxEP6845hLK+NHFWZ+LplGO4zfw4QSfxTlqMfvlJ988GoiUeZDMzCvqsZkFHv69sPICmJH1MDxZoQFOKXerAVw=="; }; }; + "ordered-binary-1.2.4" = { + name = "ordered-binary"; + packageName = "ordered-binary"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ordered-binary/-/ordered-binary-1.2.4.tgz"; + sha512 = "A/csN0d3n+igxBPfUrjbV5GC69LWj2pjZzAAeeHXLukQ4+fytfP4T1Lg0ju7MSPSwq7KtHkGaiwO8URZN5IpLg=="; + }; + }; "ordered-read-streams-1.0.1" = { name = "ordered-read-streams"; packageName = "ordered-read-streams"; @@ -48226,22 +49441,22 @@ let sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; }; }; - "ot-builder-1.3.3" = { + "ot-builder-1.4.0" = { name = "ot-builder"; packageName = "ot-builder"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.3.3.tgz"; - sha512 = "MRagUwE9VN5++ptJXPd5RqK6YbDUe6i+I7RWRpsgo2aD2ZbvktfoJ1FJGzLbaRucsWw4X3d6xKf8xIQ5SnjMJA=="; + url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.4.0.tgz"; + sha512 = "aNXKQr0+ztCBcb0VF7RtNJ2rcUq7jaJWr7PHs47gWVME5O+e+H/pBPh54LFBi9nm17LZGBo/gH+ETiDuMcZj8Q=="; }; }; - "otb-ttc-bundle-1.3.3" = { + "otb-ttc-bundle-1.4.0" = { name = "otb-ttc-bundle"; packageName = "otb-ttc-bundle"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.3.3.tgz"; - sha512 = "Aezn4zk5RFET7R7KONsKRvspOBpdJvVqTg6t2NZ6/sIpCeiwSIe3nUtOpn+PGvM11zMq7x3ulhWFrWdNRO9A/g=="; + url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.4.0.tgz"; + sha512 = "gZ/8LxA+YTovx/ZcU/iz9vpzpV1PSClDaWLd5ELn2amCLASMy0Icp2CNPateIwl1Z2O2pW9TTCC0Uu/0OsnKgA=="; }; }; "ow-0.21.0" = { @@ -48253,15 +49468,6 @@ let sha512 = "dlsoDe39g7mhdsdrC1R/YwjT7yjVqE3svWwOlMGvN690waBkgEZBmKBdkmKvSt5/wZ6E0Jn/nIesPqMZOpPKqw=="; }; }; - "p-all-2.1.0" = { - name = "p-all"; - packageName = "p-all"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-all/-/p-all-2.1.0.tgz"; - sha512 = "HbZxz5FONzz/z2gJfk6bFca0BCiSRF8jU3yCsWOen/vR6lZjfPOu/e7L3uFzTW1i0H8TlC3vqQstEJPQL4/uLA=="; - }; - }; "p-any-2.1.0" = { name = "p-any"; packageName = "p-any"; @@ -48361,13 +49567,13 @@ let sha512 = "KXatOjCRXXkSePPb1Nbi0p0m+gQAwdlbhi4wQKJPI1HsMQS9g+Sqp2o+QHziPr7eYJyOZet836KoHEVM1mwOrQ=="; }; }; - "p-filter-2.1.0" = { + "p-filter-3.0.0" = { name = "p-filter"; packageName = "p-filter"; - version = "2.1.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-filter/-/p-filter-2.1.0.tgz"; - sha512 = "ZBxxZ5sL2HghephhpGAQdoskxplTwr7ICaehZwLIlfL6acuVgZPm8yBNuRAFBGEqtD/hmUeq9eqLg2ys9Xr/yw=="; + url = "https://registry.npmjs.org/p-filter/-/p-filter-3.0.0.tgz"; + sha512 = "QtoWLjXAW++uTX67HZQz1dbTpqBfiidsB6VtQUC9iR85S120+s0T5sO6s+B5MLzFcZkrEd/DGMmCjR+f2Qpxwg=="; }; }; "p-finally-1.0.0" = { @@ -48838,15 +50044,6 @@ let sha1 = "5860587a944873a6b7e6d26e8e51ffb22315bf17"; }; }; - "packet-reader-1.0.0" = { - name = "packet-reader"; - packageName = "packet-reader"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/packet-reader/-/packet-reader-1.0.0.tgz"; - sha512 = "HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ=="; - }; - }; "packet-stream-2.0.6" = { name = "packet-stream"; packageName = "packet-stream"; @@ -48883,13 +50080,13 @@ let sha512 = "CdYEl03JDrRO3x18uHjBYA9TyoW8gy+ThVcypcDkxPtKlw76e4ejhYB6i9lJ+/cebbjpqPW/CijjqxwDTts8Ow=="; }; }; - "pacote-13.0.2" = { + "pacote-13.0.3" = { name = "pacote"; packageName = "pacote"; - version = "13.0.2"; + version = "13.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-13.0.2.tgz"; - sha512 = "3LyfvDk2BSJNFQZIcDqnLNa7IsYb6KwX3H9uZPwaHJFIX6Gv5N9QHU+s7mEs/RbN4/ta6KUT39LAi2l6EkBi5A=="; + url = "https://registry.npmjs.org/pacote/-/pacote-13.0.3.tgz"; + sha512 = "8thQ06YoO01O1k5rvSpHS/XPJZucw2DPiiT1jI+ys8QaTN6ifAyxfyoABHBa8nIt/4wPdzly4GEPqshctHFoYA=="; }; }; "pad-0.0.5" = { @@ -48910,22 +50107,22 @@ let sha1 = "ad1f22ce1bf0fdc0d6ddd908af17f351a404b8ac"; }; }; - "paid-services-3.11.0" = { + "paid-services-3.12.1" = { name = "paid-services"; packageName = "paid-services"; - version = "3.11.0"; + version = "3.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/paid-services/-/paid-services-3.11.0.tgz"; - sha512 = "G0Enb7xcOpZlOmoK7h7Anym0nFG+t7JPMoTie5HoeUfwfm/mtNfUXyJvtom930Dg9l/g/rVk5CbivwzSS8ccUw=="; + url = "https://registry.npmjs.org/paid-services/-/paid-services-3.12.1.tgz"; + sha512 = "byws4+Ap+z8n/lLoZ8miW0WqaYkH/3DMmggdPmfrbYLLmSGkJEBYDnUMICX6941h1/j5KN6EC7l/MTSKaWg7/g=="; }; }; - "paid-services-3.11.4" = { + "paid-services-3.12.2" = { name = "paid-services"; packageName = "paid-services"; - version = "3.11.4"; + version = "3.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/paid-services/-/paid-services-3.11.4.tgz"; - sha512 = "f31e2RMh6LiLs+P+k1r/ZsN9SDTD4U3KmEtk2IMMAsUADjb9U9KkFA9fHmMBmVZyjsLDVa4CDKWY93OiNJ1n1A=="; + url = "https://registry.npmjs.org/paid-services/-/paid-services-3.12.2.tgz"; + sha512 = "1Eg1uF7Jil8w2S8Fx1vFnqhDrN4DznNunZMah3LKynsaQGDmYmBX4ryyQZshoXv8gAQ8YaqFSTdw+wipsym3lQ=="; }; }; "pako-0.2.9" = { @@ -49009,6 +50206,15 @@ let sha512 = "uo0Z9JJeWzv8BG+tRcapBKNJ0dro9cLyczGzulS6EfeyAdeC9sbojtW6XwvYxJkEne9En+J2XEl4zyglVeIwFg=="; }; }; + "parent-require-1.0.0" = { + name = "parent-require"; + packageName = "parent-require"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parent-require/-/parent-require-1.0.0.tgz"; + sha1 = "746a167638083a860b0eef6732cb27ed46c32977"; + }; + }; "parents-1.0.1" = { name = "parents"; packageName = "parents"; @@ -50035,69 +51241,6 @@ let sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; }; }; - "pg-8.3.3" = { - name = "pg"; - packageName = "pg"; - version = "8.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/pg/-/pg-8.3.3.tgz"; - sha512 = "wmUyoQM/Xzmo62wgOdQAn5tl7u+IA1ZYK7qbuppi+3E+Gj4hlUxVHjInulieWrd0SfHi/ADriTb5ILJ/lsJrSg=="; - }; - }; - "pg-connection-string-2.5.0" = { - name = "pg-connection-string"; - packageName = "pg-connection-string"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.5.0.tgz"; - sha512 = "r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ=="; - }; - }; - "pg-int8-1.0.1" = { - name = "pg-int8"; - packageName = "pg-int8"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz"; - sha512 = "WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw=="; - }; - }; - "pg-pool-3.5.1" = { - name = "pg-pool"; - packageName = "pg-pool"; - version = "3.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.5.1.tgz"; - sha512 = "6iCR0wVrro6OOHFsyavV+i6KYL4lVNyYAB9RD18w66xSzN+d8b66HiwuP30Gp1SH5O9T82fckkzsRjlrhD0ioQ=="; - }; - }; - "pg-protocol-1.5.0" = { - name = "pg-protocol"; - packageName = "pg-protocol"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.5.0.tgz"; - sha512 = "muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ=="; - }; - }; - "pg-types-2.2.0" = { - name = "pg-types"; - packageName = "pg-types"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz"; - sha512 = "qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA=="; - }; - }; - "pgpass-1.0.5" = { - name = "pgpass"; - packageName = "pgpass"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/pgpass/-/pgpass-1.0.5.tgz"; - sha512 = "FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug=="; - }; - }; "phin-2.9.3" = { name = "phin"; packageName = "phin"; @@ -50359,6 +51502,15 @@ let sha1 = "378e56d6fd13e88bfb6f4a25df7a83faabddba5b"; }; }; + "pkg-dir-1.0.0" = { + name = "pkg-dir"; + packageName = "pkg-dir"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz"; + sha1 = "7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4"; + }; + }; "pkg-dir-3.0.0" = { name = "pkg-dir"; packageName = "pkg-dir"; @@ -50801,6 +51953,15 @@ let sha512 = "OovjwIzs9Te46vlEx7+uXB0PLijpwjXGKXjVGGPIGubGpq7uh5Xgf6D6FiJ/SzJMBosHDp6a2hiXOS97iBXcaA=="; }; }; + "postcss-8.4.8" = { + name = "postcss"; + packageName = "postcss"; + version = "8.4.8"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.8.tgz"; + sha512 = "2tXEqGxrjvAO6U+CJzDL2Fk2kPHTv1jQsYkSoMeOis2SsYaXRO2COxTdQp99cYvif9JTXaAk9lYGc3VhJt7JPQ=="; + }; + }; "postcss-calc-7.0.5" = { name = "postcss-calc"; packageName = "postcss-calc"; @@ -50810,6 +51971,15 @@ let sha512 = "1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg=="; }; }; + "postcss-calc-8.2.4" = { + name = "postcss-calc"; + packageName = "postcss-calc"; + version = "8.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz"; + sha512 = "SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q=="; + }; + }; "postcss-colormin-4.0.3" = { name = "postcss-colormin"; packageName = "postcss-colormin"; @@ -50819,6 +51989,15 @@ let sha512 = "WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw=="; }; }; + "postcss-colormin-5.3.0" = { + name = "postcss-colormin"; + packageName = "postcss-colormin"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.0.tgz"; + sha512 = "WdDO4gOFG2Z8n4P8TWBpshnL3JpmNmJwdnfP2gbk2qBA8PWwOYcmjmI/t3CmMeL72a7Hkd+x/Mg9O2/0rD54Pg=="; + }; + }; "postcss-convert-values-4.0.1" = { name = "postcss-convert-values"; packageName = "postcss-convert-values"; @@ -50828,6 +52007,15 @@ let sha512 = "Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ=="; }; }; + "postcss-convert-values-5.1.0" = { + name = "postcss-convert-values"; + packageName = "postcss-convert-values"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.0.tgz"; + sha512 = "GkyPbZEYJiWtQB0KZ0X6qusqFHUepguBCNFi9t5JJc7I2OTXG7C0twbTLvCfaKOLl3rSXmpAwV7W5txd91V84g=="; + }; + }; "postcss-discard-comments-4.0.2" = { name = "postcss-discard-comments"; packageName = "postcss-discard-comments"; @@ -50837,6 +52025,15 @@ let sha512 = "RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg=="; }; }; + "postcss-discard-comments-5.1.1" = { + name = "postcss-discard-comments"; + packageName = "postcss-discard-comments"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.1.tgz"; + sha512 = "5JscyFmvkUxz/5/+TB3QTTT9Gi9jHkcn8dcmmuN68JQcv3aQg4y88yEHHhwFB52l/NkaJ43O0dbksGMAo49nfQ=="; + }; + }; "postcss-discard-duplicates-4.0.2" = { name = "postcss-discard-duplicates"; packageName = "postcss-discard-duplicates"; @@ -50846,6 +52043,15 @@ let sha512 = "ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ=="; }; }; + "postcss-discard-duplicates-5.1.0" = { + name = "postcss-discard-duplicates"; + packageName = "postcss-discard-duplicates"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz"; + sha512 = "zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw=="; + }; + }; "postcss-discard-empty-4.0.1" = { name = "postcss-discard-empty"; packageName = "postcss-discard-empty"; @@ -50855,6 +52061,15 @@ let sha512 = "B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w=="; }; }; + "postcss-discard-empty-5.1.1" = { + name = "postcss-discard-empty"; + packageName = "postcss-discard-empty"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz"; + sha512 = "zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A=="; + }; + }; "postcss-discard-overridden-4.0.1" = { name = "postcss-discard-overridden"; packageName = "postcss-discard-overridden"; @@ -50864,6 +52079,15 @@ let sha512 = "IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg=="; }; }; + "postcss-discard-overridden-5.1.0" = { + name = "postcss-discard-overridden"; + packageName = "postcss-discard-overridden"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz"; + sha512 = "21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw=="; + }; + }; "postcss-flexbugs-fixes-4.2.1" = { name = "postcss-flexbugs-fixes"; packageName = "postcss-flexbugs-fixes"; @@ -50945,6 +52169,15 @@ let sha512 = "alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw=="; }; }; + "postcss-merge-longhand-5.1.1" = { + name = "postcss-merge-longhand"; + packageName = "postcss-merge-longhand"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.1.tgz"; + sha512 = "JLtqAY1LvxiD2aej6hcAk/TkXvEPM+Gs1aOkOIZub2MDEiB5NMtpMe/Ir2seIMMM245bsuHggzIhQBv6qFBm4A=="; + }; + }; "postcss-merge-rules-4.0.3" = { name = "postcss-merge-rules"; packageName = "postcss-merge-rules"; @@ -50954,6 +52187,15 @@ let sha512 = "U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ=="; }; }; + "postcss-merge-rules-5.1.0" = { + name = "postcss-merge-rules"; + packageName = "postcss-merge-rules"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.0.tgz"; + sha512 = "NecukEJovQ0mG7h7xV8wbYAkXGTO3MPKnXvuiXzOKcxoOodfTTKYjeo8TMhAswlSkjcPIBlnKbSFcTuVSDaPyQ=="; + }; + }; "postcss-minify-font-values-4.0.2" = { name = "postcss-minify-font-values"; packageName = "postcss-minify-font-values"; @@ -50963,6 +52205,15 @@ let sha512 = "j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg=="; }; }; + "postcss-minify-font-values-5.1.0" = { + name = "postcss-minify-font-values"; + packageName = "postcss-minify-font-values"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz"; + sha512 = "el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA=="; + }; + }; "postcss-minify-gradients-4.0.2" = { name = "postcss-minify-gradients"; packageName = "postcss-minify-gradients"; @@ -50972,6 +52223,15 @@ let sha512 = "qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q=="; }; }; + "postcss-minify-gradients-5.1.0" = { + name = "postcss-minify-gradients"; + packageName = "postcss-minify-gradients"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.0.tgz"; + sha512 = "J/TMLklkONn3LuL8wCwfwU8zKC1hpS6VcxFkNUNjmVt53uKqrrykR3ov11mdUYyqVMEx67slMce0tE14cE4DTg=="; + }; + }; "postcss-minify-params-4.0.2" = { name = "postcss-minify-params"; packageName = "postcss-minify-params"; @@ -50981,6 +52241,15 @@ let sha512 = "G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg=="; }; }; + "postcss-minify-params-5.1.1" = { + name = "postcss-minify-params"; + packageName = "postcss-minify-params"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.1.tgz"; + sha512 = "WCpr+J9Uz8XzMpAfg3UL8z5rde6MifBbh5L8bn8S2F5hq/YDJJzASYCnCHvAB4Fqb94ys8v95ULQkW2EhCFvNg=="; + }; + }; "postcss-minify-selectors-4.0.2" = { name = "postcss-minify-selectors"; packageName = "postcss-minify-selectors"; @@ -50990,6 +52259,15 @@ let sha512 = "D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g=="; }; }; + "postcss-minify-selectors-5.2.0" = { + name = "postcss-minify-selectors"; + packageName = "postcss-minify-selectors"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.0.tgz"; + sha512 = "vYxvHkW+iULstA+ctVNx0VoRAR4THQQRkG77o0oa4/mBS0OzGvvzLIvHDv/nNEM0crzN2WIyFU5X7wZhaUK3RA=="; + }; + }; "postcss-modules-extract-imports-1.1.0" = { name = "postcss-modules-extract-imports"; packageName = "postcss-modules-extract-imports"; @@ -51098,6 +52376,15 @@ let sha512 = "gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g=="; }; }; + "postcss-normalize-charset-5.1.0" = { + name = "postcss-normalize-charset"; + packageName = "postcss-normalize-charset"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz"; + sha512 = "mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg=="; + }; + }; "postcss-normalize-display-values-4.0.2" = { name = "postcss-normalize-display-values"; packageName = "postcss-normalize-display-values"; @@ -51107,6 +52394,15 @@ let sha512 = "3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ=="; }; }; + "postcss-normalize-display-values-5.1.0" = { + name = "postcss-normalize-display-values"; + packageName = "postcss-normalize-display-values"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz"; + sha512 = "WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA=="; + }; + }; "postcss-normalize-positions-4.0.2" = { name = "postcss-normalize-positions"; packageName = "postcss-normalize-positions"; @@ -51116,6 +52412,15 @@ let sha512 = "Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA=="; }; }; + "postcss-normalize-positions-5.1.0" = { + name = "postcss-normalize-positions"; + packageName = "postcss-normalize-positions"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.0.tgz"; + sha512 = "8gmItgA4H5xiUxgN/3TVvXRoJxkAWLW6f/KKhdsH03atg0cB8ilXnrB5PpSshwVu/dD2ZsRFQcR1OEmSBDAgcQ=="; + }; + }; "postcss-normalize-repeat-style-4.0.2" = { name = "postcss-normalize-repeat-style"; packageName = "postcss-normalize-repeat-style"; @@ -51125,6 +52430,15 @@ let sha512 = "qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q=="; }; }; + "postcss-normalize-repeat-style-5.1.0" = { + name = "postcss-normalize-repeat-style"; + packageName = "postcss-normalize-repeat-style"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.0.tgz"; + sha512 = "IR3uBjc+7mcWGL6CtniKNQ4Rr5fTxwkaDHwMBDGGs1x9IVRkYIT/M4NelZWkAOBdV6v3Z9S46zqaKGlyzHSchw=="; + }; + }; "postcss-normalize-string-4.0.2" = { name = "postcss-normalize-string"; packageName = "postcss-normalize-string"; @@ -51134,6 +52448,15 @@ let sha512 = "RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA=="; }; }; + "postcss-normalize-string-5.1.0" = { + name = "postcss-normalize-string"; + packageName = "postcss-normalize-string"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz"; + sha512 = "oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w=="; + }; + }; "postcss-normalize-timing-functions-4.0.2" = { name = "postcss-normalize-timing-functions"; packageName = "postcss-normalize-timing-functions"; @@ -51143,6 +52466,15 @@ let sha512 = "acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A=="; }; }; + "postcss-normalize-timing-functions-5.1.0" = { + name = "postcss-normalize-timing-functions"; + packageName = "postcss-normalize-timing-functions"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz"; + sha512 = "DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg=="; + }; + }; "postcss-normalize-unicode-4.0.1" = { name = "postcss-normalize-unicode"; packageName = "postcss-normalize-unicode"; @@ -51152,6 +52484,15 @@ let sha512 = "od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg=="; }; }; + "postcss-normalize-unicode-5.1.0" = { + name = "postcss-normalize-unicode"; + packageName = "postcss-normalize-unicode"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.0.tgz"; + sha512 = "J6M3MizAAZ2dOdSjy2caayJLQT8E8K9XjLce8AUQMwOrCvjCHv24aLC/Lps1R1ylOfol5VIDMaM/Lo9NGlk1SQ=="; + }; + }; "postcss-normalize-url-4.0.1" = { name = "postcss-normalize-url"; packageName = "postcss-normalize-url"; @@ -51161,6 +52502,15 @@ let sha512 = "p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA=="; }; }; + "postcss-normalize-url-5.1.0" = { + name = "postcss-normalize-url"; + packageName = "postcss-normalize-url"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz"; + sha512 = "5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew=="; + }; + }; "postcss-normalize-whitespace-4.0.2" = { name = "postcss-normalize-whitespace"; packageName = "postcss-normalize-whitespace"; @@ -51170,6 +52520,15 @@ let sha512 = "tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA=="; }; }; + "postcss-normalize-whitespace-5.1.1" = { + name = "postcss-normalize-whitespace"; + packageName = "postcss-normalize-whitespace"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz"; + sha512 = "83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA=="; + }; + }; "postcss-ordered-values-4.1.2" = { name = "postcss-ordered-values"; packageName = "postcss-ordered-values"; @@ -51179,6 +52538,15 @@ let sha512 = "2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw=="; }; }; + "postcss-ordered-values-5.1.0" = { + name = "postcss-ordered-values"; + packageName = "postcss-ordered-values"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.0.tgz"; + sha512 = "wU4Z4D4uOIH+BUKkYid36gGDJNQtkVJT7Twv8qH6UyfttbbJWyw4/xIPuVEkkCtQLAJ0EdsNSh8dlvqkXb49TA=="; + }; + }; "postcss-reduce-initial-4.0.3" = { name = "postcss-reduce-initial"; packageName = "postcss-reduce-initial"; @@ -51188,6 +52556,15 @@ let sha512 = "gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA=="; }; }; + "postcss-reduce-initial-5.1.0" = { + name = "postcss-reduce-initial"; + packageName = "postcss-reduce-initial"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.0.tgz"; + sha512 = "5OgTUviz0aeH6MtBjHfbr57tml13PuedK/Ecg8szzd4XRMbYxH4572JFG067z+FqBIf6Zp/d+0581glkvvWMFw=="; + }; + }; "postcss-reduce-transforms-4.0.2" = { name = "postcss-reduce-transforms"; packageName = "postcss-reduce-transforms"; @@ -51197,6 +52574,15 @@ let sha512 = "EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg=="; }; }; + "postcss-reduce-transforms-5.1.0" = { + name = "postcss-reduce-transforms"; + packageName = "postcss-reduce-transforms"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz"; + sha512 = "2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ=="; + }; + }; "postcss-reporter-7.0.5" = { name = "postcss-reporter"; packageName = "postcss-reporter"; @@ -51287,6 +52673,15 @@ let sha512 = "NoRbrcMWTtUghzuKSoIm6XV+sJdvZ7GZSc3wdBN0W19FTtp2ko8NqLsgoh/m9CzNhU3KLPvQmjIwtaNFkaFTvw=="; }; }; + "postcss-svgo-5.1.0" = { + name = "postcss-svgo"; + packageName = "postcss-svgo"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz"; + sha512 = "D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA=="; + }; + }; "postcss-syntax-0.36.2" = { name = "postcss-syntax"; packageName = "postcss-syntax"; @@ -51305,6 +52700,15 @@ let sha512 = "+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg=="; }; }; + "postcss-unique-selectors-5.1.1" = { + name = "postcss-unique-selectors"; + packageName = "postcss-unique-selectors"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz"; + sha512 = "5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA=="; + }; + }; "postcss-value-parser-3.3.1" = { name = "postcss-value-parser"; packageName = "postcss-value-parser"; @@ -51323,42 +52727,6 @@ let sha512 = "1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="; }; }; - "postgres-array-2.0.0" = { - name = "postgres-array"; - packageName = "postgres-array"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz"; - sha512 = "VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA=="; - }; - }; - "postgres-bytea-1.0.0" = { - name = "postgres-bytea"; - packageName = "postgres-bytea"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz"; - sha1 = "027b533c0aa890e26d172d47cf9ccecc521acd35"; - }; - }; - "postgres-date-1.0.7" = { - name = "postgres-date"; - packageName = "postgres-date"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz"; - sha512 = "suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q=="; - }; - }; - "postgres-interval-1.2.0" = { - name = "postgres-interval"; - packageName = "postgres-interval"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz"; - sha512 = "9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ=="; - }; - }; "posthtml-0.11.6" = { name = "posthtml"; packageName = "posthtml"; @@ -51377,6 +52745,33 @@ let sha512 = "YugEJ5ze/0DLRIVBjCpDwANWL4pPj1kHJ/2llY8xuInr0nbkon3qTiMPe5LQa+cCwNjxS7nAZZTp+1M+6mT4Zg=="; }; }; + "posthtml-0.16.6" = { + name = "posthtml"; + packageName = "posthtml"; + version = "0.16.6"; + src = fetchurl { + url = "https://registry.npmjs.org/posthtml/-/posthtml-0.16.6.tgz"; + sha512 = "JcEmHlyLK/o0uGAlj65vgg+7LIms0xKXe60lcDOTU7oVX/3LuEuLwrQpW3VJ7de5TaFKiW4kWkaIpJL42FEgxQ=="; + }; + }; + "posthtml-parser-0.10.2" = { + name = "posthtml-parser"; + packageName = "posthtml-parser"; + version = "0.10.2"; + src = fetchurl { + url = "https://registry.npmjs.org/posthtml-parser/-/posthtml-parser-0.10.2.tgz"; + sha512 = "PId6zZ/2lyJi9LiKfe+i2xv57oEjJgWbsHGGANwos5AvdQp98i6AtamAl8gzSVFGfQ43Glb5D614cvZf012VKg=="; + }; + }; + "posthtml-parser-0.11.0" = { + name = "posthtml-parser"; + packageName = "posthtml-parser"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/posthtml-parser/-/posthtml-parser-0.11.0.tgz"; + sha512 = "QecJtfLekJbWVo/dMAA+OSwY79wpRmbqS5TeXvXSX+f0c6pW4/SE6inzZ2qkU7oAMCPqIDkZDvd/bQsSFUnKyw=="; + }; + }; "posthtml-parser-0.4.2" = { name = "posthtml-parser"; packageName = "posthtml-parser"; @@ -51404,6 +52799,15 @@ let sha512 = "W1779iVHGfq0Fvh2PROhCe2QhB8mEErgqzo1wpIt36tCgChafP+hbXIhLDOM8ePJrZcFs0vkNEtdibEWVqChqw=="; }; }; + "posthtml-render-3.0.0" = { + name = "posthtml-render"; + packageName = "posthtml-render"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/posthtml-render/-/posthtml-render-3.0.0.tgz"; + sha512 = "z+16RoxK3fUPgwaIgH9NGnK1HKY9XIDpydky5eQGgAFVXTCSezalv9U2jQuNV+Z9qV1fDWNzldcw4eK0SSbqKA=="; + }; + }; "potpack-1.0.2" = { name = "potpack"; packageName = "potpack"; @@ -51791,6 +53195,15 @@ let sha512 = "7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg=="; }; }; + "prettier-2.4.1" = { + name = "prettier"; + packageName = "prettier"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier/-/prettier-2.4.1.tgz"; + sha512 = "9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA=="; + }; + }; "prettier-2.5.1" = { name = "prettier"; packageName = "prettier"; @@ -51818,6 +53231,15 @@ let sha512 = "2UzApPuxi2yRoyMlXMazgR6UcH9DKJhNgCviIwY3ixZ9THWSSrUww5vkiZ3C48WvpFl1M1y/oU63deSy1puWEA=="; }; }; + "prettier-linter-helpers-1.0.0" = { + name = "prettier-linter-helpers"; + packageName = "prettier-linter-helpers"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz"; + sha512 = "GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w=="; + }; + }; "prettier-plugin-svelte-2.6.0" = { name = "prettier-plugin-svelte"; packageName = "prettier-plugin-svelte"; @@ -52880,13 +54302,13 @@ let sha512 = "yYELe9Q5q9IQhuvqsZNwA5hfPkMJ8u92bQLIMcsMxf/VADjNtEYptU+inlufAFYcWdHlwNfZOEnOOQrZrcyJCQ=="; }; }; - "pull-abortable-4.0.0" = { + "pull-abortable-4.1.1" = { name = "pull-abortable"; packageName = "pull-abortable"; - version = "4.0.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/pull-abortable/-/pull-abortable-4.0.0.tgz"; - sha1 = "7017a984c3b834de77bac38c10b776f22dfc1843"; + url = "https://registry.npmjs.org/pull-abortable/-/pull-abortable-4.1.1.tgz"; + sha1 = "b3ad5aefb4116b25916d26db89393ac98d0dcea1"; }; }; "pull-async-1.0.0" = { @@ -53096,13 +54518,13 @@ let sha1 = "eef915dde644bddbea8dd2e0106d544aacbcd5c2"; }; }; - "pull-goodbye-0.0.2" = { + "pull-goodbye-0.0.3" = { name = "pull-goodbye"; packageName = "pull-goodbye"; - version = "0.0.2"; + version = "0.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/pull-goodbye/-/pull-goodbye-0.0.2.tgz"; - sha1 = "8d8357db55e22a710dfff0f16a8c90b45efe4171"; + url = "https://registry.npmjs.org/pull-goodbye/-/pull-goodbye-0.0.3.tgz"; + sha512 = "fl3RcIHKsxFaygdU3dcwSznLr73HYGOEU9IshpiatYSV+PW3TOUEjtfdu1L8uIsUoDajJz3HM/+mG0mFD4+v5A=="; }; }; "pull-handshake-1.1.4" = { @@ -53141,13 +54563,13 @@ let sha1 = "5f99af15e8846d48ecf625edc248ec2cf57f6b0d"; }; }; - "pull-inactivity-2.1.3" = { + "pull-inactivity-2.1.4" = { name = "pull-inactivity"; packageName = "pull-inactivity"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/pull-inactivity/-/pull-inactivity-2.1.3.tgz"; - sha512 = "swJ/jwkIN/O1bQCE3iY7Xy9r3gYuJ50MXaxZilw/HIduAy4tJu+vcz2/If0L+xNK7Ku/FfjtVbTpRTe7sf3hmA=="; + url = "https://registry.npmjs.org/pull-inactivity/-/pull-inactivity-2.1.4.tgz"; + sha512 = "W2Q+6Jk0oRMICYXBXom3/ipz2U5YPUSQUfLvVgUqL/daHop7QQB3Jz5XpnnxsekCPoM61lGvXc7kFDZt0uWzMg=="; }; }; "pull-kvdiff-0.0.0" = { @@ -53330,15 +54752,6 @@ let sha1 = "7ea97413c1619c20bc3bdf9e10e91347b03253e4"; }; }; - "pull-stream-3.5.0" = { - name = "pull-stream"; - packageName = "pull-stream"; - version = "3.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.5.0.tgz"; - sha1 = "1ee5b6f76fd3b3a49a5afb6ded5c0320acb3cfc7"; - }; - }; "pull-stream-3.6.14" = { name = "pull-stream"; packageName = "pull-stream"; @@ -53546,13 +54959,13 @@ let sha512 = "2cP8mBoqnu5gzAVpbZ0fRaobBWZM8GEUF4I1F6WbgHrKV/rz7SX8PG2wMymZgD0wo0UBlg2FBPNxlF/xlqW6+w=="; }; }; - "puppeteer-13.3.2" = { + "puppeteer-13.5.1" = { name = "puppeteer"; packageName = "puppeteer"; - version = "13.3.2"; + version = "13.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/puppeteer/-/puppeteer-13.3.2.tgz"; - sha512 = "TIt8/R0eaUwY1c0/O0sCJpSglvGEWVoWFfGZ2dNtxX3eHuBo1ln9abaWfxTjZfsrkYATLSs8oqEdRZpMNnCsvg=="; + url = "https://registry.npmjs.org/puppeteer/-/puppeteer-13.5.1.tgz"; + sha512 = "wWxO//vMiqxlvuzHMAJ0pRJeDHvDtM7DQpW1GKdStz2nZo2G42kOXBDgkmQ+zqjwMCFofKGesBeeKxIkX9BO+w=="; }; }; "purest-3.1.0" = { @@ -53609,13 +55022,13 @@ let sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7"; }; }; - "pyright-1.1.223" = { + "pyright-1.1.228" = { name = "pyright"; packageName = "pyright"; - version = "1.1.223"; + version = "1.1.228"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.223.tgz"; - sha512 = "EGLKMQRmSkKNe/eDy6MEkqq5lF91C5MCMYxvmCgKGUjZHIa+HByJIiRY2cOTm7g2CAv0eE7Ift701VxLM5Q0iQ=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.228.tgz"; + sha512 = "Q/LnDoZK6bxc7u60kFjFwi9X3s79kLaGd/g23T0c6T1CUdrRxDyRTvNRLjLPSLaX8EuPIdcXuPXAzXgSjBz/Mw=="; }; }; "q-0.9.7" = { @@ -54347,6 +55760,15 @@ let sha512 = "UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g=="; }; }; + "raw-body-2.5.1" = { + name = "raw-body"; + packageName = "raw-body"; + version = "2.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz"; + sha512 = "qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig=="; + }; + }; "raw-loader-3.1.0" = { name = "raw-loader"; packageName = "raw-loader"; @@ -54428,13 +55850,13 @@ let sha512 = "wuygyq8TXUlSdVXv2kigXxQNOgdb9m7LbIjwfTNGSpaY1riLd5e+VeQjlQMyUtrk0oiyhi1AqIVynworl3qxHA=="; }; }; - "re2-1.17.3" = { + "re2-1.17.4" = { name = "re2"; packageName = "re2"; - version = "1.17.3"; + version = "1.17.4"; src = fetchurl { - url = "https://registry.npmjs.org/re2/-/re2-1.17.3.tgz"; - sha512 = "Dp5iWVR8W3C7Nm9DziMY4BleMPRb/pe6kvfbzLv80dVYaXRc9jRnwwNqU0oE/taRm0qYR1+Qrtzk9rPjS9ecaQ=="; + url = "https://registry.npmjs.org/re2/-/re2-1.17.4.tgz"; + sha512 = "xyZ4h5PqE8I9tAxTh3G0UttcK5ufrcUxReFjGzfX61vtanNbS1XZHjnwRSyPcLgChI4KLxVgOT/ioZXnUAdoTA=="; }; }; "reachdown-1.1.0" = { @@ -54473,22 +55895,13 @@ let sha512 = "dx0LvIGHcOPtKbeiSUM4jqpBl3TcY7CDjZdfOIcKeznE7BWr9dg0iPG90G5yfVQ+p/rGNMXdbfStvzQZEVEi4A=="; }; }; - "react-devtools-core-4.23.0" = { + "react-devtools-core-4.24.0" = { name = "react-devtools-core"; packageName = "react-devtools-core"; - version = "4.23.0"; + version = "4.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.23.0.tgz"; - sha512 = "KkzneT1LczFtebbTJlvRphIRvzuHLhI9ghfrseVv9ktBs+l2cXy8Svw5U16lzQnwU9okVEcURmGPgH79WWrlaw=="; - }; - }; - "react-dom-16.14.0" = { - name = "react-dom"; - packageName = "react-dom"; - version = "16.14.0"; - src = fetchurl { - url = "https://registry.npmjs.org/react-dom/-/react-dom-16.14.0.tgz"; - sha512 = "1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw=="; + url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.24.0.tgz"; + sha512 = "Rw7FzYOOzcfyUPaAm9P3g0tFdGqGq2LLiAI+wjYcp6CsF3DeeMrRS3HZAho4s273C29G/DJhx0e8BpRE/QZNGg=="; }; }; "react-dom-17.0.2" = { @@ -54599,6 +56012,15 @@ let sha512 = "nK6kgY28HwrMNwDnMui3dvm3rCFjZrcGiuwLc5COUipBK5hWHLOxMJhSnSomirqWwjPBJKV1QcbkI0VJr7Gl1Q=="; }; }; + "react-refresh-0.9.0" = { + name = "react-refresh"; + packageName = "react-refresh"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/react-refresh/-/react-refresh-0.9.0.tgz"; + sha512 = "Gvzk7OZpiqKSkxsQvO/mbTN1poglhmAV7gR/DdIrRrSMXraRQQlfikRJOr3Nb9GTMPC5kof948Zy6jJZIFtDvQ=="; + }; + }; "react-side-effect-2.1.1" = { name = "react-side-effect"; packageName = "react-side-effect"; @@ -54779,13 +56201,13 @@ let sha512 = "aLcPqxovhJTVJcsnROuuzQvv6oziQx4zd3JvG0vGCL5MjTONUc4uJ90zCBC6R7W7oUKBNoR/F8pkyfVwlbxqng=="; }; }; - "read-package-json-4.1.1" = { + "read-package-json-4.1.2" = { name = "read-package-json"; packageName = "read-package-json"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/read-package-json/-/read-package-json-4.1.1.tgz"; - sha512 = "P82sbZJ3ldDrWCOSKxJT0r/CXMWR0OR3KRh55SgKo3p91GSIEEC32v3lSHAvO/UcH3/IoL7uqhOFBduAnwdldw=="; + url = "https://registry.npmjs.org/read-package-json/-/read-package-json-4.1.2.tgz"; + sha512 = "Dqer4pqzamDE2O4M55xp1qZMuLPqi4ldk2ya648FOMHRjwMzFhuxVrG04wd0c38IsvkVdr3vgHI6z+QTPdAjrQ=="; }; }; "read-package-json-fast-2.0.3" = { @@ -55301,13 +56723,13 @@ let sha1 = "b66d828cdcafe6b4b8a428a7def4c6bcac31c8b4"; }; }; - "redoc-2.0.0-rc.63" = { + "redoc-2.0.0-rc.64" = { name = "redoc"; packageName = "redoc"; - version = "2.0.0-rc.63"; + version = "2.0.0-rc.64"; src = fetchurl { - url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.63.tgz"; - sha512 = "PsoPqRyNqHi7+jKUyFBwJhHrzjMl4N5vieTeBloRGbhWuY3PPH2DJ3ihgrLfdEV0glzq/LMTaqfarm8WLqCc4Q=="; + url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.64.tgz"; + sha512 = "zrM/vcONpbmyDUOpk7Ai7R/yZrT7W1+8ANJUB3b5kzaLQUx4VbrDoT4D6HHHquOnKx+5We4nOPPAi8fi/cqa8g=="; }; }; "reduce-component-1.0.1" = { @@ -55391,15 +56813,6 @@ let sha512 = "vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw=="; }; }; - "regenerator-runtime-0.10.5" = { - name = "regenerator-runtime"; - packageName = "regenerator-runtime"; - version = "0.10.5"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz"; - sha1 = "336c3efc1220adcedda2c9fab67b5a7955a33658"; - }; - }; "regenerator-runtime-0.11.1" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; @@ -56597,13 +58010,13 @@ let sha512 = "wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g=="; }; }; - "requestretry-4.1.2" = { + "requestretry-7.0.2" = { name = "requestretry"; packageName = "requestretry"; - version = "4.1.2"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/requestretry/-/requestretry-4.1.2.tgz"; - sha512 = "N1WAp+8eOy8NfsVBChcSxNCKvPY1azOpliQ4Sby4WDe0HFEhdKywlNZeROMBQ+BI3Jpc0eNOT1KVFGREawtahA=="; + url = "https://registry.npmjs.org/requestretry/-/requestretry-7.0.2.tgz"; + sha512 = "Zz8z7G2OuVs4F0wR0shKMEMm7lNvPNHM0UIHNns9qfyuBDKSExoTsZGtSjKst6nPEwlMrbA9G+m/yC0AbGj+8w=="; }; }; "require-directory-2.1.1" = { @@ -57362,6 +58775,15 @@ let sha512 = "CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A=="; }; }; + "roboto-fontface-0.10.0" = { + name = "roboto-fontface"; + packageName = "roboto-fontface"; + version = "0.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/roboto-fontface/-/roboto-fontface-0.10.0.tgz"; + sha512 = "OlwfYEgA2RdboZohpldlvJ1xngOins5d7ejqnIBWr9KaMxsnBqotpptRXTyfNRLnFpqzX6sTDt+X+a+6udnU8g=="; + }; + }; "robust-predicates-3.0.1" = { name = "robust-predicates"; packageName = "robust-predicates"; @@ -57704,13 +59126,13 @@ let sha512 = "hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ=="; }; }; - "rxjs-7.5.4" = { + "rxjs-7.5.5" = { name = "rxjs"; packageName = "rxjs"; - version = "7.5.4"; + version = "7.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-7.5.4.tgz"; - sha512 = "h5M3Hk78r6wAheJF0a5YahB1yRQKCsZ4MsGdZ5O9ETbVtjPcScGfrMmoOq7EBsCRzd4BDkvDJ7ogP8Sz5tTFiQ=="; + url = "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz"; + sha512 = "sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw=="; }; }; "s3-stream-upload-2.0.2" = { @@ -57902,13 +59324,40 @@ let sha1 = "478be1429500fcfaa780be88b3343ced7d2a9182"; }; }; - "sass-1.49.8" = { + "saslprep-1.0.3" = { + name = "saslprep"; + packageName = "saslprep"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/saslprep/-/saslprep-1.0.3.tgz"; + sha512 = "/MY/PEMbk2SuY5sScONwhUDsV2p77Znkb/q3nSVstq/yQzYJOH/Azh29p9oJLsl3LnQwSvZDKagDGBsBwSooag=="; + }; + }; + "sass-1.32.12" = { name = "sass"; packageName = "sass"; - version = "1.49.8"; + version = "1.32.12"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.49.8.tgz"; - sha512 = "NoGOjvDDOU9og9oAxhRnap71QaTjjlzrvLnKecUJ3GxhaQBrV6e7gPuSPF28u1OcVAArVojPAe4ZhOXwwC4tGw=="; + url = "https://registry.npmjs.org/sass/-/sass-1.32.12.tgz"; + sha512 = "zmXn03k3hN0KaiVTjohgkg98C3UowhL1/VSGdj4/VAAiMKGQOE80PFPxFP2Kyq0OUskPKcY5lImkhBKEHlypJA=="; + }; + }; + "sass-1.49.9" = { + name = "sass"; + packageName = "sass"; + version = "1.49.9"; + src = fetchurl { + url = "https://registry.npmjs.org/sass/-/sass-1.49.9.tgz"; + sha512 = "YlYWkkHP9fbwaFRZQRXgDi3mXZShslVmmo+FVK3kHLUELHHEYrCmL1x6IUjC7wLS6VuJSAFXRQS/DxdsC4xL1A=="; + }; + }; + "sass-loader-10.2.0" = { + name = "sass-loader"; + packageName = "sass-loader"; + version = "10.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sass-loader/-/sass-loader-10.2.0.tgz"; + sha512 = "kUceLzC1gIHz0zNJPpqRsJyisWatGYNFRmv2CKZK2/ngMJgLqxTbXwe/hJ85luyvZkgqU3VlJ33UVF2T/0g6mw=="; }; }; "sax-0.5.8" = { @@ -57974,15 +59423,6 @@ let sha512 = "agTSHR1Nbfi6ulI0kYNK0203joW2Y5W4po4l+v03tOoiJKpTBbxpNhWDvqc/4IcOw+KLmSiQLTasZ4cab2/UWQ=="; }; }; - "scheduler-0.19.1" = { - name = "scheduler"; - packageName = "scheduler"; - version = "0.19.1"; - src = fetchurl { - url = "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz"; - sha512 = "n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA=="; - }; - }; "scheduler-0.20.2" = { name = "scheduler"; packageName = "scheduler"; @@ -58082,22 +59522,22 @@ let sha512 = "NLZVf+ROMxwtEj3Xa562qgv2BK5e2WNmXPiOdVIPLgs6lyTzMvBq0aWTYMI5XCP9jZMVKOcqZLw/Wc4vDkuxhA=="; }; }; - "secret-handshake-1.1.20" = { + "secret-handshake-1.1.21" = { name = "secret-handshake"; packageName = "secret-handshake"; - version = "1.1.20"; + version = "1.1.21"; src = fetchurl { - url = "https://registry.npmjs.org/secret-handshake/-/secret-handshake-1.1.20.tgz"; - sha512 = "sDtmZDpibGH2ixj3FOmsC3Z/b08eaB2/KAvy2oSp4qvcGdhatBSfb1RdVpwjQl5c3J83WbBo1HSZ7DBtMu43lA=="; + url = "https://registry.npmjs.org/secret-handshake/-/secret-handshake-1.1.21.tgz"; + sha512 = "e02+IddZv40tNJmaRZNZ6aYje95h9MvmpmbOg2PVjLKRA5p9QnrQypJlVE2dU516TyYc9jikBjqhXV1IlkwNUw=="; }; }; - "secret-stack-6.4.0" = { + "secret-stack-6.4.1" = { name = "secret-stack"; packageName = "secret-stack"; - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/secret-stack/-/secret-stack-6.4.0.tgz"; - sha512 = "Vnc2bItbjMw5WUtQtxLL4Atl17KaUHdLdxIb3a89CQTAo/1G1YjmiNe2GAAgZHSBi6UYRoB/oRmuJz8HLZmnmA=="; + url = "https://registry.npmjs.org/secret-stack/-/secret-stack-6.4.1.tgz"; + sha512 = "7rRcTEj7t0H3ShMKQvv7QGYAUFjVRmDqNNgrvpdedVlVnEIyfkZu0RaFPpes6yUSiE9Iwi0lHi03+6HsltLCMA=="; }; }; "secretstream-stream-2.0.0" = { @@ -58217,15 +59657,6 @@ let sha1 = "b9848f25d6cf36333073ec9ef8856d42f1233e52"; }; }; - "semver-4.3.2" = { - name = "semver"; - packageName = "semver"; - version = "4.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-4.3.2.tgz"; - sha1 = "c7a07158a80bedd052355b770d82d6640f803be7"; - }; - }; "semver-4.3.6" = { name = "semver"; packageName = "semver"; @@ -59045,13 +60476,13 @@ let sha512 = "xhdh7fHyMsr0m/w2kDfRJuBFRS96b9l8ZPNWGaQ+PMvnUnZ/Eh+gJJ9NsHBd7P9k0399WYlCLzsy18EaMfyadA=="; }; }; - "shush-1.0.0" = { + "shush-1.0.1" = { name = "shush"; packageName = "shush"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/shush/-/shush-1.0.0.tgz"; - sha1 = "c27415a9e458f2fed39b27cf8eb37c003782b431"; + url = "https://registry.npmjs.org/shush/-/shush-1.0.1.tgz"; + sha512 = "baDDBPaPcFwVeQNfj1lYkE/NkqQr1WkXUlOePHnA5I8hw9Fz0Tu72ZC0XENeV4tM9tesaGA/Wi2mW07EOeKRuQ=="; }; }; "side-channel-1.0.4" = { @@ -59549,6 +60980,15 @@ let sha512 = "hLdVp5vqzrEEJSAQKSmURvBVImQj9oVbp7zBP6JLEmSenUGhc6kl9nrSXUj14JHiQcnKF80eRAWPsdUcV6YXFw=="; }; }; + "smoothscroll-polyfill-0.4.4" = { + name = "smoothscroll-polyfill"; + packageName = "smoothscroll-polyfill"; + version = "0.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/smoothscroll-polyfill/-/smoothscroll-polyfill-0.4.4.tgz"; + sha512 = "TK5ZA9U5RqCwMpfoMq/l1mrH0JAR7y7KRvOBx0n2869aLxch+gT9GhN3yUfjiw+d/DiF1mKo14+hd62JyMmoBg=="; + }; + }; "snabbdom-0.7.0" = { name = "snabbdom"; packageName = "snabbdom"; @@ -59684,6 +61124,15 @@ let sha512 = "JubKZnTQ4Z8G4IZWtaAZSiRP3I/inpy8c/Bsx2jrwGrTbKeVU5xd6qkKMHpChYeM3dWZSO0QACiGK+obhBNwYw=="; }; }; + "socket.io-4.3.1" = { + name = "socket.io"; + packageName = "socket.io"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io/-/socket.io-4.3.1.tgz"; + sha512 = "HC5w5Olv2XZ0XJ4gOLGzzHEuOCfj3G0SmoW3jLHYYh34EVsIr3EkW9h6kgfW+K3TFEcmYy8JcPWe//KUkBp5jA=="; + }; + }; "socket.io-4.4.1" = { name = "socket.io"; packageName = "socket.io"; @@ -59765,6 +61214,15 @@ let sha512 = "M6xhnKQHuuZd4Ba9vltCLT9oa+YvTsP8j9NcEiLElfIg8KeYPyhWOes6x4t+LTAC8enQbE/995AdTem2uNyKKQ=="; }; }; + "socket.io-client-4.3.2" = { + name = "socket.io-client"; + packageName = "socket.io-client"; + version = "4.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.3.2.tgz"; + sha512 = "2B9LqSunN60yV8F7S84CCEEcgbYNfrn7ejIInZtLZ7ppWtiX8rGZAjvdCvbnC8bqo/9RlCNOUsORLyskxSFP1g=="; + }; + }; "socket.io-parser-2.1.2" = { name = "socket.io-parser"; packageName = "socket.io-parser"; @@ -59819,6 +61277,15 @@ let sha512 = "t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g=="; }; }; + "socket.io-parser-4.1.2" = { + name = "socket.io-parser"; + packageName = "socket.io-parser"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.1.2.tgz"; + sha512 = "j3kk71QLJuyQ/hh5F/L2t1goqzdTL0gvDzuhTuNSwihfuFUrcSji0qFZmJJPtG6Rmug153eOPsUizeirf1IIog=="; + }; + }; "sockjs-0.3.20" = { name = "sockjs"; packageName = "sockjs"; @@ -59846,13 +61313,13 @@ let sha512 = "5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g=="; }; }; - "sockjs-client-1.5.2" = { + "sockjs-client-1.6.0" = { name = "sockjs-client"; packageName = "sockjs-client"; - version = "1.5.2"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.5.2.tgz"; - sha512 = "ZzRxPBISQE7RpzlH4tKJMQbHM9pabHluk0WBaxAQ+wm/UieeBVBou0p4wVnSQGN9QmpAZygQ0cDIypWuqOFmFQ=="; + url = "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.6.0.tgz"; + sha512 = "qVHJlyfdHFht3eBFZdKEXKTlb7I4IV41xnVNo8yUKA1UHcPJwgW2SvTq9LhnjjCywSkSK7c/e4nghU0GOoMCRQ=="; }; }; "socks-2.6.2" = { @@ -60314,6 +61781,15 @@ let sha512 = "0tF3AGSD1ppQeuffsLDIOWlKUd3lS92tFxcsrh5Pe3ZphhnoK+oXIBTzOAThZCiuINZLvpiLH/1VS1/ANEJVig=="; }; }; + "spark-md5-3.0.2" = { + name = "spark-md5"; + packageName = "spark-md5"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/spark-md5/-/spark-md5-3.0.2.tgz"; + sha512 = "wcFzz9cDfbuqe0FZzfi2or1sgyIrsDwmPwfZC4hiNidPdPINjeUwNfv5kldczoEAcjl9Y1L3SM7Uz2PUEQzxQw=="; + }; + }; "sparkles-1.0.1" = { name = "sparkles"; packageName = "sparkles"; @@ -60755,31 +62231,31 @@ let sha1 = "06cd70795ee58d1462d100a45c660df3179d3b39"; }; }; - "ssb-bendy-butt-0.12.4" = { + "ssb-bendy-butt-0.12.5" = { name = "ssb-bendy-butt"; packageName = "ssb-bendy-butt"; - version = "0.12.4"; + version = "0.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-bendy-butt/-/ssb-bendy-butt-0.12.4.tgz"; - sha512 = "zyVPwizCuW6T3Q2j8XerTPpdhNYY9tLlIVieg/FFQb5wlda3Ce360mYjGngx7586HXgysBi010JpM9emMQhhtA=="; + url = "https://registry.npmjs.org/ssb-bendy-butt/-/ssb-bendy-butt-0.12.5.tgz"; + sha512 = "8K3qi9fIr6PYQCWWPDTijDThZ89tYRkIKO7xpS/kM8dDuDfx4FsBoMsBkgl8VOV3TB24UnAF0IbcxRBNL5Pf4w=="; }; }; - "ssb-bfe-3.1.1" = { + "ssb-bfe-3.1.3" = { name = "ssb-bfe"; packageName = "ssb-bfe"; - version = "3.1.1"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-bfe/-/ssb-bfe-3.1.1.tgz"; - sha512 = "0Z1xxYG618sccFJGNIN9om5sokRFJRv/QlIhlnFwiafNLYFdyLP/KGZ8YDZSUP/pyMWZuL8+o++v3Ro6EkIJNA=="; + url = "https://registry.npmjs.org/ssb-bfe/-/ssb-bfe-3.1.3.tgz"; + sha512 = "peX4B+Exp5OokaOnxP8atPd0jhig1AaCQyLY+MykxXIzTEim7yWAavzSDHaZ+7PNHS9fbM7E2s+h3h/R3oSfTA=="; }; }; - "ssb-bfe-spec-0.3.0" = { + "ssb-bfe-spec-0.4.0" = { name = "ssb-bfe-spec"; packageName = "ssb-bfe-spec"; - version = "0.3.0"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-bfe-spec/-/ssb-bfe-spec-0.3.0.tgz"; - sha512 = "gmsjEKrcKfR7d/926Oq7ijrd4l0CkjtFampk7rqsE+Gzr1ZpzGmHl1YxXn6GdBYy55M1i0V+w+fYAqsgxl5o4Q=="; + url = "https://registry.npmjs.org/ssb-bfe-spec/-/ssb-bfe-spec-0.4.0.tgz"; + sha512 = "KhUl8MZ14JQ00rmsrddSTDIfy5ez4O9nZOrJ8A+Kg5VdG9ENOpLCqc+CzsZpSdhDeUfFUicSMH1mUhJNlRyIAQ=="; }; }; "ssb-blobs-1.2.2" = { @@ -60836,13 +62312,13 @@ let sha512 = "pJAFizB6OcuJLX4RJJuU9HWyPwM2CqLi/vs08lhVIR3TGxacxpavvK5LzbxT+Y3iWkBchOTKS5hHCigA5aaung=="; }; }; - "ssb-db2-2.8.9" = { + "ssb-db2-2.8.11" = { name = "ssb-db2"; packageName = "ssb-db2"; - version = "2.8.9"; + version = "2.8.11"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-2.8.9.tgz"; - sha512 = "0v6EIq+MrQbe5wO+0JGeNUY9fs8dA2/vcgGOQSqYKl2dkxKB4uu8g6z6GRtlcSP7iGxW+Zv7jk/09b3p1ahE4g=="; + url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-2.8.11.tgz"; + sha512 = "XrKVxgWa2kumephDdUMCFY/chdELeUumJyR6S5NVagtVv/aEdHV8cOJXkt5IP3AxNNJB6i/Kk2P4adsdVWGBeg=="; }; }; "ssb-ebt-5.6.7" = { @@ -61097,13 +62573,13 @@ let sha512 = "Z4jBj917W+dKAiDglwxCpWm8vINOMtkpHQIgk50NQTb5jHqHI5Rcyiy7EO0uRcWwRWqXi1ZwOTEFVyLyyuittA=="; }; }; - "ssb-uri2-1.7.0" = { + "ssb-uri2-1.7.2" = { name = "ssb-uri2"; packageName = "ssb-uri2"; - version = "1.7.0"; + version = "1.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-uri2/-/ssb-uri2-1.7.0.tgz"; - sha512 = "mdQEo4AT9cusd5+eXpS/rh8UjVVt0A9kLXfs/JMIVcMHEsOciK4ThIzQCqK8hVrxHRGpb09+t/DluVvXuN8/JQ=="; + url = "https://registry.npmjs.org/ssb-uri2/-/ssb-uri2-1.7.2.tgz"; + sha512 = "bw6nkLkpOqiVxYXqYm/7XMnIgTIbIs4crRutCkworysMr08gjFNhkIgOeEm1uG4y1Rm0FIigWaBQnOLqPmXAPQ=="; }; }; "ssb-validate-4.1.4" = { @@ -61142,13 +62618,13 @@ let sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA=="; }; }; - "sscaff-1.2.208" = { + "sscaff-1.2.225" = { name = "sscaff"; packageName = "sscaff"; - version = "1.2.208"; + version = "1.2.225"; src = fetchurl { - url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.208.tgz"; - sha512 = "zZbWds7b7zh2x+TATQ4SM1Grqw9INsf4jB0pZ9CWtgGAFLM4aWGhSGscUMLqigCu2+MxCIAIwG2CRDOTVD4G+w=="; + url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.225.tgz"; + sha512 = "hpbhRLb5pC9zsEpQgfaAKI+a6/JUIKvEIQ1B2THIMDZZbfUyXZIW5Sn/u1/nhqPbvo2j+aslar8ewqRwI2eWbw=="; }; }; "ssh-config-1.1.6" = { @@ -61421,6 +62897,15 @@ let sha1 = "161c7dac177659fd9811f43771fa99381478628c"; }; }; + "statuses-2.0.1" = { + name = "statuses"; + packageName = "statuses"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz"; + sha512 = "RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="; + }; + }; "stealthy-require-1.1.1" = { name = "stealthy-require"; packageName = "stealthy-require"; @@ -61790,13 +63275,13 @@ let sha512 = "OG79qm3AujAM9ImoqgWEY1xG4HX+Lw+yY6qZj9R1K2mhF5bEmQ849wvrb+4vt4jLMLzwXttJlQbOdPOQVRv7DQ=="; }; }; - "streamroller-3.0.2" = { + "streamroller-3.0.4" = { name = "streamroller"; packageName = "streamroller"; - version = "3.0.2"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/streamroller/-/streamroller-3.0.2.tgz"; - sha512 = "ur6y5S5dopOaRXBuRIZ1u6GC5bcEXHRZKgfBjfCglMhmIf+roVCECjvkEYzNQOXIN2/JPnkMPW/8B3CZoKaEPA=="; + url = "https://registry.npmjs.org/streamroller/-/streamroller-3.0.4.tgz"; + sha512 = "GI9NzeD+D88UFuIlJkKNDH/IsuR+qIN7Qh8EsmhoRZr9bQoehTraRgwtLUkZbpcAw+hLPfHOypmppz8YyGK68w=="; }; }; "streamsearch-0.1.2" = { @@ -61817,13 +63302,13 @@ let sha512 = "Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg=="; }; }; - "streamx-2.12.2" = { + "streamx-2.12.4" = { name = "streamx"; packageName = "streamx"; - version = "2.12.2"; + version = "2.12.4"; src = fetchurl { - url = "https://registry.npmjs.org/streamx/-/streamx-2.12.2.tgz"; - sha512 = "NjGPzm2tnLOOPvbE/yxFoAgdYzvgjZkb9i4LgJokAfhLinMv2M7jevpIja+aP/ridUIfge9DGbB223kVzdrEzA=="; + url = "https://registry.npmjs.org/streamx/-/streamx-2.12.4.tgz"; + sha512 = "K3xdIp8YSkvbdI0PrCcP0JkniN8cPCyeKlcZgRFSl1o1xKINCYM93FryvTSOY57x73pz5/AjO5B8b9BYf21wWw=="; }; }; "strftime-0.10.1" = { @@ -62006,13 +63491,13 @@ let sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; }; }; - "string-width-5.1.0" = { + "string-width-5.1.2" = { name = "string-width"; packageName = "string-width"; - version = "5.1.0"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-5.1.0.tgz"; - sha512 = "7x54QnN21P+XL/v8SuNKvfgsUre6PXpN7mc77N3HlZv+f1SBRGmjxtOud2Z6FZ8DmdkD/IdjCaf9XXbnqmTZGQ=="; + url = "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz"; + sha512 = "HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA=="; }; }; "string.prototype.repeat-0.2.0" = { @@ -62555,6 +64040,15 @@ let sha512 = "7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g=="; }; }; + "stylehacks-5.1.0" = { + name = "stylehacks"; + packageName = "stylehacks"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.0.tgz"; + sha512 = "SzLmvHQTrIWfSgljkQCw2++C9+Ne91d/6Sp92I8c5uHTcy/PgeHamwITIbBW9wnFTY/3ZfSXR9HIL6Ikqmcu6Q=="; + }; + }; "stylelint-13.13.1" = { name = "stylelint"; packageName = "stylelint"; @@ -62924,13 +64418,13 @@ let sha512 = "qKJzw6DpA33CIa+C/rGp4AUdSfii0DOTCzj/2YpSKKayw5WGSS624Et9L1nU1k2OVRS9vaENQXp2CVZNU+xvIg=="; }; }; - "svelte-preprocess-4.10.3" = { + "svelte-preprocess-4.10.4" = { name = "svelte-preprocess"; packageName = "svelte-preprocess"; - version = "4.10.3"; + version = "4.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-4.10.3.tgz"; - sha512 = "ttw17lJfb/dx2ZJT9sesaXT5l7mPQ9Apx1H496Kli3Hkk7orIRGpOw6rCPkRNzr6ueVPqb4vzodS5x7sBFhKHw=="; + url = "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-4.10.4.tgz"; + sha512 = "fuwol0N4UoHsNQolLFbMqWivqcJ9N0vfWO9IuPAiX/5okfoGXURyJ6nECbuEIv0nU3M8Xe2I1ONNje2buk7l6A=="; }; }; "svelte2tsx-0.5.5" = { @@ -62996,6 +64490,15 @@ let sha512 = "yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw=="; }; }; + "svgo-2.8.0" = { + name = "svgo"; + packageName = "svgo"; + version = "2.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz"; + sha512 = "+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg=="; + }; + }; "swagger-converter-0.1.7" = { name = "swagger-converter"; packageName = "swagger-converter"; @@ -63077,13 +64580,22 @@ let sha1 = "e39fae3d581d713682491e1926cd87bf2c209bfb"; }; }; - "swagger-ui-dist-3.34.0" = { + "swagger-ui-dist-3.52.5" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "3.34.0"; + version = "3.52.5"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.34.0.tgz"; - sha512 = "xk5CMbwoQVI53rTq9o/iMojAqXP5NT4/+TMeTP4uXWDIH18pB9AXgO5Olqt0RXuf3jH032DA4DS4qzem6XdXAw=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.52.5.tgz"; + sha512 = "8z18eX8G/jbTXYzyNIaobrnD7PSN7yU/YkSasMmajrXtw0FGS64XjrKn5v37d36qmU3o1xLeuYnktshRr7uIFw=="; + }; + }; + "swagger-ui-dist-4.6.2" = { + name = "swagger-ui-dist"; + packageName = "swagger-ui-dist"; + version = "4.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.6.2.tgz"; + sha512 = "BSt+ukOGkGZ2uHV4jyyCAzt60ysyQpGZAAhtIh7AMHT4MH1xXGkoXm2tfr1oRqO1N4IEY6qqNAlmcfMo/dAYuw=="; }; }; "swagger2openapi-7.0.8" = { @@ -63221,13 +64733,22 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-5.11.4" = { + "systeminformation-5.11.7" = { name = "systeminformation"; packageName = "systeminformation"; - version = "5.11.4"; + version = "5.11.7"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.11.4.tgz"; - sha512 = "rh7bjpjP5whUaTknim5CiGdAiKZcgWhmbmxjzBRXDWqUc/k67bz2OP+03DdcX6/SN/CDSAi/NeUwM5o2gjHJoA=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.11.7.tgz"; + sha512 = "MI6HtSoBF2e1pTpRGQC8b5X5QDln8mazQTD3KyFFlLGkk7291kQv+mjeriz30TDVTcWEnEfKPxZwHnZBFYnr6w=="; + }; + }; + "systeminformation-5.11.8" = { + name = "systeminformation"; + packageName = "systeminformation"; + version = "5.11.8"; + src = fetchurl { + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.11.8.tgz"; + sha512 = "u30rM0KwGKiJof44Ak25WeSh9661NU2GshXpHPpv/zGXvvSGI5eALjpVJ3EYnIroceToWzy9+xkuMfjHIx6OiQ=="; }; }; "sywac-1.3.0" = { @@ -63375,15 +64896,6 @@ let sha512 = "GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ=="; }; }; - "tape-2.3.3" = { - name = "tape"; - packageName = "tape"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/tape/-/tape-2.3.3.tgz"; - sha1 = "2e7ce0a31df09f8d6851664a71842e0ca5057af7"; - }; - }; "tape-4.15.0" = { name = "tape"; packageName = "tape"; @@ -63762,13 +65274,13 @@ let sha512 = "EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw=="; }; }; - "terser-5.10.0" = { + "terser-5.12.0" = { name = "terser"; packageName = "terser"; - version = "5.10.0"; + version = "5.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.10.0.tgz"; - sha512 = "AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA=="; + url = "https://registry.npmjs.org/terser/-/terser-5.12.0.tgz"; + sha512 = "R3AUhNBGWiFc77HXag+1fXpAxTAFRQTJemlJKjAgD9r8xXTpjNKqIXwHM/o7Rh+O0kUJtS3WQVdBeMKFk5sw9A=="; }; }; "terser-webpack-plugin-1.4.5" = { @@ -63789,15 +65301,6 @@ let sha512 = "cjdZte66fYkZ65rQ2oJfrdCAkkhJA7YLYk5eGOcGCSGlq0ieZupRdjedSQXYknMPo2IveQL+tPdrxUkERENCFA=="; }; }; - "terser-webpack-plugin-4.2.2" = { - name = "terser-webpack-plugin"; - packageName = "terser-webpack-plugin"; - version = "4.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-4.2.2.tgz"; - sha512 = "3qAQpykRTD5DReLu5/cwpsg7EZFzP3Q0Hp2XUWJUw2mpq2jfgOKTZr8IZKKnNieRVVo1UauROTdhbQJZveGKtQ=="; - }; - }; "terser-webpack-plugin-5.3.1" = { name = "terser-webpack-plugin"; packageName = "terser-webpack-plugin"; @@ -63996,13 +65499,22 @@ let sha1 = "4ca2fffc02a51290d2744b9e3f557693ca6b627a"; }; }; - "thread-stream-0.13.1" = { + "thread-loader-2.1.3" = { + name = "thread-loader"; + packageName = "thread-loader"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/thread-loader/-/thread-loader-2.1.3.tgz"; + sha512 = "wNrVKH2Lcf8ZrWxDF/khdlLlsTMczdcwPA9VEK4c2exlEPynYWxi9op3nPTo5lAnDIkE0rQEB3VBP+4Zncc9Hg=="; + }; + }; + "thread-stream-0.13.2" = { name = "thread-stream"; packageName = "thread-stream"; - version = "0.13.1"; + version = "0.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/thread-stream/-/thread-stream-0.13.1.tgz"; - sha512 = "+KNCqNxOSwYfXLtCIRDKQq29x9jvqnOFjYCPdB38sf4pT3QanPSNc8vRqMj+Q3z4tYIctb5opNZrMK/GwmgsAQ=="; + url = "https://registry.npmjs.org/thread-stream/-/thread-stream-0.13.2.tgz"; + sha512 = "woZFt0cLFkPdhsa+IGpRo1jiSouaHxMIljzTgt30CMjBWoUYbbcHqnunW5Yv+BXko9H05MVIcxMipI3Jblallw=="; }; }; "thriftrw-3.12.0" = { @@ -64113,15 +65625,6 @@ let sha512 = "/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ=="; }; }; - "through2-3.0.1" = { - name = "through2"; - packageName = "through2"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz"; - sha512 = "M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww=="; - }; - }; "through2-3.0.2" = { name = "through2"; packageName = "through2"; @@ -64347,6 +65850,15 @@ let sha512 = "2hPuUGCroLrxh6xxwoe+1RgPpOOK1w2uTnhgiHBpvoutBR+krNuT4hOXQyOaaYnZgoXBB6hBYkuAJHxyeBOPzQ=="; }; }; + "tiny-secp256k1-2.2.1" = { + name = "tiny-secp256k1"; + packageName = "tiny-secp256k1"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tiny-secp256k1/-/tiny-secp256k1-2.2.1.tgz"; + sha512 = "/U4xfVqnVxJXN4YVsru0E6t5wVncu2uunB8+RVR40fYUxkKYUPS10f+ePQZgFBoE/Jbf9H1NBveupF2VmB58Ng=="; + }; + }; "tinycolor-0.0.1" = { name = "tinycolor"; packageName = "tinycolor"; @@ -64716,13 +66228,13 @@ let sha512 = "wnQcqlreS6VjthyHO3Y/kpK/emflxDBNhlNUPfh7wE39KnuDdOituXomIbyI79vBtF0Ninpkh72mcuRHo+RG3Q=="; }; }; - "token-types-4.1.1" = { + "token-types-4.2.0" = { name = "token-types"; packageName = "token-types"; - version = "4.1.1"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/token-types/-/token-types-4.1.1.tgz"; - sha512 = "hD+QyuUAyI2spzsI0B7gf/jJ2ggR4RjkAo37j3StuePhApJUwcWDjnHDOFdIWYSwNR28H14hpwm4EI+V1Ted1w=="; + url = "https://registry.npmjs.org/token-types/-/token-types-4.2.0.tgz"; + sha512 = "P0rrp4wUpefLncNamWIef62J0v0kQR/GfDVji9WKY7GDCWy5YbVSrKUTam07iWPZQGy0zWNOfstYTykMmPNR7w=="; }; }; "too-hot-1.0.0" = { @@ -64779,13 +66291,13 @@ let sha1 = "2d17d82cf669ada7f9dfe75db4b31f7034b71e29"; }; }; - "torrent-discovery-9.4.7" = { + "torrent-discovery-9.4.9" = { name = "torrent-discovery"; packageName = "torrent-discovery"; - version = "9.4.7"; + version = "9.4.9"; src = fetchurl { - url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-9.4.7.tgz"; - sha512 = "7Zw474LJE5r3Momi4ykBYkjgcFhENbUxcAFs5cBllUkv9ErJPzPEGmpEuqX7V8TkLS+Clmt/l5CjV5IFHg/A/A=="; + url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-9.4.9.tgz"; + sha512 = "xU5zLDdX6QMm4zJ+wceunk9nhs3Q/2Lewj/yCLx15lnfugf3Ir4bo/axM3IEwDl+lkH7zWYe/iy2+r/2yyILgQ=="; }; }; "torrent-piece-1.1.2" = { @@ -65121,15 +66633,6 @@ let sha512 = "rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA=="; }; }; - "trough-2.0.2" = { - name = "trough"; - packageName = "trough"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/trough/-/trough-2.0.2.tgz"; - sha512 = "FnHq5sTMxC0sk957wHDzRnemFnNBvt/gSY99HzK8F7UP5WAbvP70yX5bd7CjEQkN+TjdxwI7g7lJ6podqrG2/w=="; - }; - }; "trough-2.1.0" = { name = "trough"; packageName = "trough"; @@ -65202,13 +66705,13 @@ let sha512 = "uEtWkFM/sdZvRNNDL3Ehu4WVpwaulhwQszV8mrtcdeE8nN00BV9mAmQ88RkrBhFgl9gMgvjJLAQcZbnPXI9mlA=="; }; }; - "ts-loader-8.0.4" = { + "ts-loader-6.2.2" = { name = "ts-loader"; packageName = "ts-loader"; - version = "8.0.4"; + version = "6.2.2"; 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-6.2.2.tgz"; + sha512 = "HDo5kXZCBml3EUPcc7RlZOV/JGlLHwppTLEHb3SHnr5V7NXD4klMEkrhJe5wgRbaWsSXi+Y1SIBN/K9B6zWGWQ=="; }; }; "ts-loader-8.3.0" = { @@ -65220,6 +66723,15 @@ let sha512 = "MgGly4I6cStsJy27ViE32UoqxPTN9Xly4anxxVyaIWR+9BGxboV4EyJBGfR3RePV7Ksjj3rHmPZJeIt+7o4Vag=="; }; }; + "ts-loader-9.2.6" = { + name = "ts-loader"; + packageName = "ts-loader"; + version = "9.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/ts-loader/-/ts-loader-9.2.6.tgz"; + sha512 = "QMTC4UFzHmu9wU2VHZEmWWE9cUajjfcdcws+Gh7FhiO+Dy0RnR1bNz0YCHqhI0yRowCE9arVnNxYHqELOy9Hjw=="; + }; + }; "ts-log-2.2.4" = { name = "ts-log"; packageName = "ts-log"; @@ -65238,13 +66750,22 @@ let sha512 = "WHXLtFDcIRwoqaiu0elAoZ/AmI+SwwDafnPKjgJmdwJ2gRVO0jMKBt88rV2liT/c6MTsXyuWbGFiHe9MRddWJw=="; }; }; - "ts-node-10.5.0" = { + "ts-node-10.4.0" = { name = "ts-node"; packageName = "ts-node"; - version = "10.5.0"; + version = "10.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/ts-node/-/ts-node-10.5.0.tgz"; - sha512 = "6kEJKwVxAJ35W4akuiysfKwKmjkbYxwQMTBaAxo9KKAx/Yd26mPUyhGz3ji+EsJoAgrLqVsYHNuuYwQe22lbtw=="; + url = "https://registry.npmjs.org/ts-node/-/ts-node-10.4.0.tgz"; + sha512 = "g0FlPvvCXSIO1JDF6S232P5jPYqBkRL9qly81ZgAOSU7rwI0stphCgd2kLiCrU9DjQCrJMWEqcNSjQL02s6d8A=="; + }; + }; + "ts-node-10.7.0" = { + name = "ts-node"; + packageName = "ts-node"; + version = "10.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ts-node/-/ts-node-10.7.0.tgz"; + sha512 = "TbIGS4xgJoX2i3do417KSaep1uRAW/Lu+WAL2doDHC0D6ummjirVOXU5/7aiZotbQ5p1Zp9tP7U6cYhA0O7M8A=="; }; }; "ts-node-8.9.1" = { @@ -65769,15 +67290,6 @@ let sha512 = "yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA=="; }; }; - "type-fest-2.10.0" = { - name = "type-fest"; - packageName = "type-fest"; - version = "2.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-2.10.0.tgz"; - sha512 = "u2yreDMllFI3VCpWt0rKrGs/E2LO0YHBwiiOIj+ilQh9+ALMaa4lNBSdoDvuHN3cbKcYk9L1BXP49x9RT+o/SA=="; - }; - }; "type-fest-2.11.1" = { name = "type-fest"; packageName = "type-fest"; @@ -65805,15 +67317,6 @@ let sha512 = "Qe5GRT+n/4GoqCNGGVp5Snapg1Omq3V7irBJB3EaKsp7HWDo5Gv2d/67gfNyV+d5EXD+x/RF5l1h4yJ7qNkcGA=="; }; }; - "type-fest-2.9.0" = { - name = "type-fest"; - packageName = "type-fest"; - version = "2.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-2.9.0.tgz"; - sha512 = "uC0hJKi7eAGXUJ/YKk53RhnKxMwzHWgzf4t92oz8Qez28EBgVTfpDTB59y9hMYLzc/Wl85cD7Tv1hLZZoEJtrg=="; - }; - }; "type-is-1.6.18" = { name = "type-is"; packageName = "type-is"; @@ -65877,6 +67380,15 @@ let sha512 = "B2B+wo5gC7VRAqcFEiUCjS6CJ1vmeYZ7uzY3Jsu6UNStHiF+W0vkhZAmQaj5m9sC2KVrpyHGRzGuhz3M6+n/8A=="; }; }; + "typeface-roboto-1.1.13" = { + name = "typeface-roboto"; + packageName = "typeface-roboto"; + version = "1.1.13"; + src = fetchurl { + url = "https://registry.npmjs.org/typeface-roboto/-/typeface-roboto-1.1.13.tgz"; + sha512 = "YXvbd3a1QTREoD+FJoEkl0VQNJoEjewR2H11IjVv4bp6ahuIcw0yyw/3udC4vJkHw3T3cUh85FTg8eWef3pSaw=="; + }; + }; "typeforce-1.18.0" = { name = "typeforce"; packageName = "typeforce"; @@ -65895,6 +67407,15 @@ let sha512 = "MdlbWu0HfmgFJf4+xj6eqGYuanV2LJxBYTzLrD0kTV+woQ5dxDD2k8UVVjYnbBGkAagAyxzQevPiFZRWLFHSBw=="; }; }; + "typeorm-0.2.38" = { + name = "typeorm"; + packageName = "typeorm"; + version = "0.2.38"; + src = fetchurl { + url = "https://registry.npmjs.org/typeorm/-/typeorm-0.2.38.tgz"; + sha512 = "M6Y3KQcAREQcphOVJciywf4mv6+A0I/SeR+lWNjKsjnQ+a3XcMwGYMGL0Jonsx3H0Cqlf/3yYqVki1jIXSK/xg=="; + }; + }; "typescript-2.9.2" = { name = "typescript"; packageName = "typescript"; @@ -65931,22 +67452,22 @@ let sha512 = "w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q=="; }; }; - "typescript-4.0.3" = { + "typescript-4.3.4" = { name = "typescript"; packageName = "typescript"; - version = "4.0.3"; + version = "4.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.0.3.tgz"; - sha512 = "tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.3.4.tgz"; + sha512 = "uauPG7XZn9F/mo+7MrsRjyvbxFpzemRjKEZXS4AK83oP2KKOJPvb+9cO/gmnv8arWZvhnjVOXz7B49m1l0e9Ew=="; }; }; - "typescript-4.3.4" = { + "typescript-4.4.4" = { name = "typescript"; packageName = "typescript"; - version = "4.3.4"; + version = "4.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.3.4.tgz"; - sha512 = "uauPG7XZn9F/mo+7MrsRjyvbxFpzemRjKEZXS4AK83oP2KKOJPvb+9cO/gmnv8arWZvhnjVOXz7B49m1l0e9Ew=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz"; + sha512 = "DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA=="; }; }; "typescript-4.5.5" = { @@ -65958,6 +67479,15 @@ let sha512 = "TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA=="; }; }; + "typescript-4.6.2" = { + name = "typescript"; + packageName = "typescript"; + version = "4.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript/-/typescript-4.6.2.tgz"; + sha512 = "HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg=="; + }; + }; "typescript-eslint-parser-16.0.1" = { name = "typescript-eslint-parser"; packageName = "typescript-eslint-parser"; @@ -66102,6 +67632,15 @@ let sha512 = "FAGKF12fWdkpvNJZENacOH0e/83eG6JyVQyanIJaBXCN1J11TUQv1T1/z8S+Z0CG0ZPk1nPcreF/c7lrTd0TEQ=="; }; }; + "uglify-js-3.15.3" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "3.15.3"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.3.tgz"; + sha512 = "6iCVm2omGJbsu3JWac+p6kUiOpg3wFO2f8lIXjfEb8RrmLjzog1wTPMmwKB7swfzzqxj9YM+sGUM++u1qN4qJg=="; + }; + }; "uglify-js-3.4.10" = { name = "uglify-js"; packageName = "uglify-js"; @@ -66219,6 +67758,15 @@ let sha512 = "aIvEHNRX1AlOYAr6qSUjQBn4mCduxx6MtC967aRDTb2UUBPj0Ix2ZFQDcmXUUO/UxRPHcw1f5a5nVbCSKDSOqA=="; }; }; + "uint8array-tools-0.0.7" = { + name = "uint8array-tools"; + packageName = "uint8array-tools"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/uint8array-tools/-/uint8array-tools-0.0.7.tgz"; + sha512 = "vrrNZJiusLWoFWBqz5Y5KMCgP9W9hnjZHzZiZRT8oNAkq3d5Z5Oe76jAvVVSRh4U8GGR90N2X1dWtrhvx6L8UQ=="; + }; + }; "ultron-1.0.2" = { name = "ultron"; packageName = "ultron"; @@ -66426,13 +67974,13 @@ let sha1 = "5e4bda308e4a8a2ae584f9b9a4359a499825cc50"; }; }; - "undici-4.14.1" = { + "undici-4.15.1" = { name = "undici"; packageName = "undici"; - version = "4.14.1"; + version = "4.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/undici/-/undici-4.14.1.tgz"; - sha512 = "WJ+g+XqiZcATcBaUeluCajqy4pEDcQfK1vy+Fo+bC4/mqXI9IIQD/XWHLS70fkGUT6P52Drm7IFslO651OdLPQ=="; + url = "https://registry.npmjs.org/undici/-/undici-4.15.1.tgz"; + sha512 = "h8LJybhMKD09IyQZoQadNtIR/GmugVhTOVREunJrpV6RStriKBFdSVoFzEzTihwXi/27DIBO+Z0OGF+Mzfi0lA=="; }; }; "unherit-1.1.3" = { @@ -66525,13 +68073,13 @@ let sha1 = "afb10e4ef1eeddc711417bbb652bc885da9d4171"; }; }; - "unified-10.1.1" = { + "unified-10.1.2" = { name = "unified"; packageName = "unified"; - version = "10.1.1"; + version = "10.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/unified/-/unified-10.1.1.tgz"; - sha512 = "v4ky1+6BN9X3pQrOdkFIPWAaeDsHPE1svRDxq7YpTc2plkIqFMwukfqM+l0ewpP9EfwARlt9pPFAeWYhHm8X9w=="; + url = "https://registry.npmjs.org/unified/-/unified-10.1.2.tgz"; + sha512 = "pUSWAi/RAnVy1Pif2kAoeWNBa3JVrx0MId2LASj8G+7AiHWoKZNTomq6LG326T68U7/e263X6fTdcXIy7XnF7Q=="; }; }; "unified-2.1.4" = { @@ -66957,13 +68505,13 @@ let sha512 = "3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g=="; }; }; - "unist-util-stringify-position-3.0.0" = { + "unist-util-stringify-position-3.0.2" = { name = "unist-util-stringify-position"; packageName = "unist-util-stringify-position"; - version = "3.0.0"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.0.tgz"; - sha512 = "SdfAl8fsDclywZpfMDTVDxA2V7LjtRDTOFd44wUJamgl6OlVngsqWjxvermMYf60elWHbxhuRCZml7AnuXCaSA=="; + url = "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.2.tgz"; + sha512 = "7A6eiDCs9UtjcwZOcCpM4aPII3bAAGv13E96IkawkOAW0OhH+yRxtY0lzo8KiHpzEMfH7Q+FizUmwp8Iqy5EWg=="; }; }; "unist-util-to-list-of-char-0.1.3" = { @@ -67434,13 +68982,13 @@ let sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="; }; }; - "urijs-1.19.8" = { + "urijs-1.19.10" = { name = "urijs"; packageName = "urijs"; - version = "1.19.8"; + version = "1.19.10"; src = fetchurl { - url = "https://registry.npmjs.org/urijs/-/urijs-1.19.8.tgz"; - sha512 = "iIXHrjomQ0ZCuDRy44wRbyTZVnfVNLVo3Ksz1yxNyE5wV1IDZW2S5Jszy45DTlw/UdsnRT7DyDhIz7Gy+vJumw=="; + url = "https://registry.npmjs.org/urijs/-/urijs-1.19.10.tgz"; + sha512 = "EzauQlgKuJgsXOqoMrCiePBf4At5jVqRhXykF3Wfb8ZsOBMxPcfiVBcsHXug4Aepb/ICm2PIgqAUGMelgdrWEg=="; }; }; "urix-0.1.0" = { @@ -67533,13 +69081,13 @@ let sha512 = "3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA=="; }; }; - "url-parse-1.5.9" = { + "url-parse-1.5.10" = { name = "url-parse"; packageName = "url-parse"; - version = "1.5.9"; + version = "1.5.10"; src = fetchurl { - url = "https://registry.npmjs.org/url-parse/-/url-parse-1.5.9.tgz"; - sha512 = "HpOvhKBvre8wYez+QhHcYiVvVmeF6DVnuSOOPhe3cTum3BnqHhvKaZm8FU5yTiOu/Jut2ZpB2rA/SbBA1JIGlQ=="; + url = "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz"; + sha512 = "WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ=="; }; }; "url-parse-as-address-1.0.0" = { @@ -67587,15 +69135,6 @@ let sha1 = "1505a03a289a48cbd7a434efbaeec5055f5633a9"; }; }; - "url-toolkit-2.2.5" = { - name = "url-toolkit"; - packageName = "url-toolkit"; - version = "2.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/url-toolkit/-/url-toolkit-2.2.5.tgz"; - sha512 = "mtN6xk+Nac+oyJ/PrI7tzfmomRVNFIWKUbG8jdYFt52hxbiReFAXIjYskvu64/dvuW71IcB7lV8l0HvZMac6Jg=="; - }; - }; "url-value-parser-2.1.0" = { name = "url-value-parser"; packageName = "url-value-parser"; @@ -67705,13 +69244,13 @@ let sha1 = "8bb871a4741e085c70487ca7acdbd7d6d36029eb"; }; }; - "utf-8-validate-5.0.8" = { + "utf-8-validate-5.0.9" = { name = "utf-8-validate"; packageName = "utf-8-validate"; - version = "5.0.8"; + version = "5.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.8.tgz"; - sha512 = "k4dW/Qja1BYDl2qD4tOMB9PFVha/UJtxTc1cXYOe3WwA/2m0Yn4qB7wLMpJyLJ/7DR0XnTut3HsCSzDT4ZvKgA=="; + url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.9.tgz"; + sha512 = "Yek7dAy0v3Kl0orwMlvi7TPtiCNrdfHNd7Gcc/pLq4BLXqfAmd0J7OWMizUQnTTJsyjKn02mU7anqwfmUP4J8Q=="; }; }; "utf7-1.0.2" = { @@ -67885,6 +69424,15 @@ let sha1 = "1352c340eb820e4d8ddba039a4fbfaa32ed4ef3a"; }; }; + "utility-types-3.10.0" = { + name = "utility-types"; + packageName = "utility-types"; + version = "3.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/utility-types/-/utility-types-3.10.0.tgz"; + sha512 = "O11mqxmi7wMKCo6HKFt5AhO4BwY3VV68YU07tgxfz8zJTIxr4BpsezN49Ffwy9j3ZpwwJp4fkRwjRzq3uWE6Rg=="; + }; + }; "utils-merge-1.0.1" = { name = "utils-merge"; packageName = "utils-merge"; @@ -68002,6 +69550,15 @@ let sha512 = "brFwqA3FXzilmtnIyJ+CxdkInkY/i4ErvP7uV0DnUVxQcQ55reuHphorpF+tZoVHK2MniZ/VJzI7zJQoc9T9Yw=="; }; }; + "uws-9.148.0" = { + name = "uws"; + packageName = "uws"; + version = "9.148.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uws/-/uws-9.148.0.tgz"; + sha512 = "vWt+e8dOdwLM4neb1xIeZuQ7ZUN3l7n0qTKrOUtU1EZrV4BpmrSnsEL30d062/ocqRMGtLpwzVFsLKFgXomA9g=="; + }; + }; "v8-compile-cache-2.3.0" = { name = "v8-compile-cache"; packageName = "v8-compile-cache"; @@ -68641,13 +70198,13 @@ let sha512 = "O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA=="; }; }; - "vfile-5.3.0" = { + "vfile-5.3.2" = { name = "vfile"; packageName = "vfile"; - version = "5.3.0"; + version = "5.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/vfile/-/vfile-5.3.0.tgz"; - sha512 = "Tj44nY/48OQvarrE4FAjUfrv7GZOYzPbl5OD65HxVKwLJKMPU7zmfV8cCgCnzKWnSfYG2f3pxu+ALqs7j22xQQ=="; + url = "https://registry.npmjs.org/vfile/-/vfile-5.3.2.tgz"; + sha512 = "w0PLIugRY3Crkgw89TeMvHCzqCs/zpreR31hl4D92y6SOE07+bfJe+dK5Q2akwS+i/c801kzjoOr9gMcTe6IAA=="; }; }; "vfile-find-down-1.0.0" = { @@ -68731,13 +70288,13 @@ let sha512 = "DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ=="; }; }; - "vfile-message-3.1.0" = { + "vfile-message-3.1.2" = { name = "vfile-message"; packageName = "vfile-message"; - version = "3.1.0"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.0.tgz"; - sha512 = "4QJbBk+DkPEhBXq3f260xSaWtjE4gPKOfulzfMFF8ZNwaPZieWsg3iVlcmF04+eebzpcpeXOOFMfrYzJHVYg+g=="; + url = "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.2.tgz"; + sha512 = "QjSNP6Yxzyycd4SVOtmKKyTsSvClqBPJcd00Z0zuPj3hOIjg0rUPG6DbFGPvUKRgYyaIWLPKpuEclcuvb3H8qA=="; }; }; "vfile-reporter-1.5.0" = { @@ -68902,15 +70459,6 @@ let sha1 = "92a800593a38703a8cdb11d8b300ad4be63b3e16"; }; }; - "vinyl-sourcemaps-apply-0.2.1" = { - name = "vinyl-sourcemaps-apply"; - packageName = "vinyl-sourcemaps-apply"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz"; - sha1 = "ab6549d61d172c2b1b87be5c508d239c8ef87705"; - }; - }; "vizion-2.2.1" = { name = "vizion"; packageName = "vizion"; @@ -68956,13 +70504,13 @@ let sha512 = "2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="; }; }; - "vm2-3.9.8" = { + "vm2-3.9.9" = { name = "vm2"; packageName = "vm2"; - version = "3.9.8"; + version = "3.9.9"; src = fetchurl { - url = "https://registry.npmjs.org/vm2/-/vm2-3.9.8.tgz"; - sha512 = "/1PYg/BwdKzMPo8maOZ0heT7DLI0DAFTm7YQaz/Lim9oIaFZsJs3EdtalvXuBfZwczNwsYhju75NW4d6E+4q+w=="; + url = "https://registry.npmjs.org/vm2/-/vm2-3.9.9.tgz"; + sha512 = "xwTm7NLh/uOjARRBs8/95H0e8fT3Ukw5D/JJWhxMbhKzNh1Nu981jQKvkep9iKYNxzlVrdzD0mlBGkDKZWprlw=="; }; }; "voc-1.2.0" = { @@ -69064,15 +70612,6 @@ let sha512 = "X4pzcrJ8dE7M3ArFuySF5fgipKDd/EauXkiJwtjBIVRWpVNq0tF9+lNCyuC7iDUwP3Oq7ow/TGssD3GdG96Jow=="; }; }; - "vscode-emmet-helper-2.1.2" = { - name = "vscode-emmet-helper"; - packageName = "vscode-emmet-helper"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-emmet-helper/-/vscode-emmet-helper-2.1.2.tgz"; - sha512 = "Fy6UNawSgxE3Kuqi54vSXohf03iOIrp1A74ReAgzvGP9Yt7fUAvkqF6No2WAc34/w0oWAHAeqoBNqmKKWh6U5w=="; - }; - }; "vscode-emmet-helper-2.6.4" = { name = "vscode-emmet-helper"; packageName = "vscode-emmet-helper"; @@ -69109,13 +70648,13 @@ let sha512 = "rrDyCiOgMwOPgchpPGAeLzjYVVEW/Ror2/a1BWUEI3S9+NQhA9vj4SQkzmH6g2Bq9S9SV0OQeadD+xphOf1N3w=="; }; }; - "vscode-html-languageservice-4.2.1" = { + "vscode-html-languageservice-4.2.2" = { name = "vscode-html-languageservice"; packageName = "vscode-html-languageservice"; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-4.2.1.tgz"; - sha512 = "PgaToZVXJ44nFWEBuSINdDgVV6EnpC3MnXBsysR3O5TKcAfywbYeRGRy+Y4dVR7YeUgDvtb+JkJoSkaYC0mxXQ=="; + url = "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-4.2.2.tgz"; + sha512 = "4ICwlpplGbiNQq6D/LZr4qLbPZuMmnSQeX/57UAYP7jD1LOvKeru4lVI+f6d6Eyd7uS46nLJ5DUY4AAlq35C0g=="; }; }; "vscode-json-languageservice-3.11.0" = { @@ -69217,13 +70756,13 @@ let sha512 = "gxUyTBAjmwGkiHW/UaRScre2s4i98P8M7gnc3VB4DrVQUm3vQ0idi2cN9nbkfcjATx+uEt8C22j+MLN/8UzsJA=="; }; }; - "vscode-jsonrpc-8.0.0-next.6" = { + "vscode-jsonrpc-8.0.0-next.7" = { name = "vscode-jsonrpc"; packageName = "vscode-jsonrpc"; - version = "8.0.0-next.6"; + version = "8.0.0-next.7"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.0-next.6.tgz"; - sha512 = "6Ld3RYjygn5Ih7CkAtcAwiDQC+rakj2O+PnASfNyYv3sLmm44eJpEKzuPUN30Iy2UB09AZg8T6LBKWTJTEJDVw=="; + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.0-next.7.tgz"; + sha512 = "JX/F31LEsims0dAlOTKFE4E+AJMiJvdRSRViifFJSqSN7EzeYyWlfuDchF7g91oRNPZOIWfibTkDf3/UMsQGzQ=="; }; }; "vscode-languageclient-4.0.1" = { @@ -69325,13 +70864,13 @@ let sha512 = "/65lxR/CuLJoOdzTjOTYUPWS7k5qzaWese4PObnWc6jwLryUrSa7DslYfaRXigh5/xr1nlaUZCcJwkpgM0wFvw=="; }; }; - "vscode-languageserver-8.0.0-next.8" = { + "vscode-languageserver-8.0.0-next.9" = { name = "vscode-languageserver"; packageName = "vscode-languageserver"; - version = "8.0.0-next.8"; + version = "8.0.0-next.9"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-8.0.0-next.8.tgz"; - sha512 = "Gq0uqKbOgw7YNwPxMoNCeh7mHKMhG5j6EuoSh+w5pnKd7Eu9a74cagqf9aZDVFWW6GRpqR/Z+1o6EXqDK+g2Tg=="; + url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-8.0.0-next.9.tgz"; + sha512 = "PO+ijJdI9NGXklkZlvEHLpVloBd0iBiOi2EXuh2QfT4bOlx2qvsWu+nBISuw0X8ZfXA4grtaPPGcrXudmlezLg=="; }; }; "vscode-languageserver-protocol-3.14.1" = { @@ -69370,13 +70909,13 @@ let sha512 = "atmkGT/W6tF0cx4SaWFYtFs2UeSeC28RPiap9myv2YZTaTCFvTBEPNWrU5QRKfkyM0tbgtGo6T3UCQ8tkDpjzA=="; }; }; - "vscode-languageserver-protocol-3.17.0-next.14" = { + "vscode-languageserver-protocol-3.17.0-next.15" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; - version = "3.17.0-next.14"; + version = "3.17.0-next.15"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.0-next.14.tgz"; - sha512 = "iangobY8dL6sFZkOx4OhRPJM9gN0I1caUsOVR+MnPozsqQUtwMXmbIcfaIf0Akp0pd3KhJDPf/tdwRX68QGeeA=="; + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.0-next.15.tgz"; + sha512 = "73LffxyP/0TRyk3J7bCYt0BuFBzk4Qvo5TqZndOsP+uBDbRV4IT7ebu4M/XoPDSCyZ+jDIxW7if/JbhBznmwBg=="; }; }; "vscode-languageserver-protocol-3.17.0-next.5" = { @@ -69496,13 +71035,13 @@ let sha512 = "VQcXnhKYxUW6OiRMhG++SzmZYMJwusXknJGd+FfdOnS1yHAo734OHyR0e2eEHDlv0/oWc8RZPgx/VKSKyondVg=="; }; }; - "vscode-languageserver-types-3.17.0-next.7" = { + "vscode-languageserver-types-3.17.0-next.8" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; - version = "3.17.0-next.7"; + version = "3.17.0-next.8"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.0-next.7.tgz"; - sha512 = "KH4zdG1qBXxoso61ChgpeoZYyHGJo8bV7Jv4I+fwQ1Ryy59JAxoZ9GAbhR5TeeafHctLcg6RFvY3m8Jqfu17cg=="; + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.0-next.8.tgz"; + sha512 = "Mwj+FemiEk4QUUms1GGvXwDC+laJGVFuA4glbMVJTxfXdfOFZaEuyVlLobjccBo+NzD+5oEzzejTX7nWGNajjQ=="; }; }; "vscode-languageserver-types-3.5.0" = { @@ -69631,6 +71170,24 @@ let sha512 = "x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ=="; }; }; + "vue-class-component-7.2.6" = { + name = "vue-class-component"; + packageName = "vue-class-component"; + version = "7.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-class-component/-/vue-class-component-7.2.6.tgz"; + sha512 = "+eaQXVrAm/LldalI272PpDe3+i4mPis0ORiMYxF6Ae4hyuCh15W8Idet7wPUEs4N4YptgFHGys4UrgNQOMyO6w=="; + }; + }; + "vue-cli-plugin-vuetify-2.4.3" = { + name = "vue-cli-plugin-vuetify"; + packageName = "vue-cli-plugin-vuetify"; + version = "2.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-cli-plugin-vuetify/-/vue-cli-plugin-vuetify-2.4.3.tgz"; + sha512 = "dT9KpH1rXT6UWzBDFLMB69sgrNCoWFcxWiIyDDZ4vikv85JDweMHh2dT5n6QaAt7qsGlvL4IMOopjcyUTiPW9g=="; + }; + }; "vue-codemod-0.0.5" = { name = "vue-codemod"; packageName = "vue-codemod"; @@ -69667,6 +71224,33 @@ let sha512 = "qh3VhDLeh773wjgNTl7ss0VejY9bMMa0GoDG2fQVyDzRFdiU3L7fw74tWZDHNQXdZqxO3EveQroa9ct39D2nqg=="; }; }; + "vue-hot-reload-api-2.3.4" = { + name = "vue-hot-reload-api"; + packageName = "vue-hot-reload-api"; + version = "2.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz"; + sha512 = "BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog=="; + }; + }; + "vue-loader-15.9.8" = { + name = "vue-loader"; + packageName = "vue-loader"; + version = "15.9.8"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-loader/-/vue-loader-15.9.8.tgz"; + sha512 = "GwSkxPrihfLR69/dSV3+5CdMQ0D+jXg8Ma1S4nQXKJAznYFX14vHdc/NetQc34Dw+rBbIJyP7JOuVb9Fhprvog=="; + }; + }; + "vue-loader-v16-16.8.3" = { + name = "vue-loader-v16"; + packageName = "vue-loader-v16"; + version = "16.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz"; + sha512 = "7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA=="; + }; + }; "vue-onsenui-helper-json-1.0.2" = { name = "vue-onsenui-helper-json"; packageName = "vue-onsenui-helper-json"; @@ -69676,6 +71260,78 @@ let sha512 = "ikg8ruE17tIXF9mrVvKoOR3oyM9nk0TcmUHyeBWod5ILEH9DRN0+seX4gwsSbjdxMYlIIvmnCFPQeMdlcJqPJQ=="; }; }; + "vue-property-decorator-9.1.2" = { + name = "vue-property-decorator"; + packageName = "vue-property-decorator"; + version = "9.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-property-decorator/-/vue-property-decorator-9.1.2.tgz"; + sha512 = "xYA8MkZynPBGd/w5QFJ2d/NM0z/YeegMqYTphy7NJQXbZcuU6FC6AOdUAcy4SXP+YnkerC6AfH+ldg7PDk9ESQ=="; + }; + }; + "vue-router-3.5.3" = { + name = "vue-router"; + packageName = "vue-router"; + version = "3.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-router/-/vue-router-3.5.3.tgz"; + sha512 = "FUlILrW3DGitS2h+Xaw8aRNvGTwtuaxrRkNSHWTizOfLUie7wuYwezeZ50iflRn8YPV5kxmU2LQuu3nM/b3Zsg=="; + }; + }; + "vue-style-loader-4.1.3" = { + name = "vue-style-loader"; + packageName = "vue-style-loader"; + version = "4.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.3.tgz"; + sha512 = "sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg=="; + }; + }; + "vue-template-compiler-2.6.14" = { + name = "vue-template-compiler"; + packageName = "vue-template-compiler"; + version = "2.6.14"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.14.tgz"; + sha512 = "ODQS1SyMbjKoO1JBJZojSw6FE4qnh9rIpUZn2EUT86FKizx9uH5z6uXiIrm4/Nb/gwxTi/o17ZDEGWAXHvtC7g=="; + }; + }; + "vue-template-es2015-compiler-1.9.1" = { + name = "vue-template-es2015-compiler"; + packageName = "vue-template-es2015-compiler"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz"; + sha512 = "4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw=="; + }; + }; + "vuetify-2.5.10" = { + name = "vuetify"; + packageName = "vuetify"; + version = "2.5.10"; + src = fetchurl { + url = "https://registry.npmjs.org/vuetify/-/vuetify-2.5.10.tgz"; + sha512 = "UODZQrib36l7i1WGg0MUvurczLspYTe0nKAmfbwyMs6dC2lG1Q1VV9caqPbCAB9zgG6QIJaOmRQKSKduw9eZTw=="; + }; + }; + "vuetify-datetime-picker-2.1.1" = { + name = "vuetify-datetime-picker"; + packageName = "vuetify-datetime-picker"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vuetify-datetime-picker/-/vuetify-datetime-picker-2.1.1.tgz"; + sha512 = "xY3YCVNxoe/5Chbm7G2BXrkg12CWLWwnDJZdhNPVKe1p8S72H8NomYOB6SSBzMMEHisRGIRzAQTDwDfDU06x/Q=="; + }; + }; + "vuetify-loader-1.7.3" = { + name = "vuetify-loader"; + packageName = "vuetify-loader"; + version = "1.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vuetify-loader/-/vuetify-loader-1.7.3.tgz"; + sha512 = "1Kt6Rfvuw3i9BBlxC9WTMnU3WEU7IBWQmDX+fYGAVGpzWCX7oHythUIwPCZGShHSYcPMKSDbXTPP8UvT5RNw8Q=="; + }; + }; "vuvuzela-1.0.3" = { name = "vuvuzela"; packageName = "vuvuzela"; @@ -69865,6 +71521,15 @@ let sha1 = "f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"; }; }; + "weak-lru-cache-1.2.2" = { + name = "weak-lru-cache"; + packageName = "weak-lru-cache"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/weak-lru-cache/-/weak-lru-cache-1.2.2.tgz"; + sha512 = "DEAoo25RfSYMuTGc9vPJzZcZullwIqRDSI9LOy+fkCJPi6hykCnfKaXTuPBDuXAUcqHXyOgFtHNp/kB2FjYHbw=="; + }; + }; "weasel-words-0.1.1" = { name = "weasel-words"; packageName = "weasel-words"; @@ -69955,13 +71620,13 @@ let sha512 = "8G0xBj05hqZybCqBtW7RPZ/hWEtP3DiLTauQzGJZuZYfVRgw7qj7iaZ+8djNqJ4VPrdOO+pS2dR1JsTbsLxdYg=="; }; }; - "web3-utils-1.7.0" = { + "web3-utils-1.7.1" = { name = "web3-utils"; packageName = "web3-utils"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.7.0.tgz"; - sha512 = "O8Tl4Ky40Sp6pe89Olk2FsaUkgHyb5QAXuaKo38ms3CxZZ4d3rPGfjP9DNKGm5+IUgAZBNpF1VmlSmNCqfDI1w=="; + url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.7.1.tgz"; + sha512 = "fef0EsqMGJUgiHPdX+KN9okVWshbIumyJPmR+btnD1HgvoXijKEkuKBv0OmUqjbeqmLKP2/N9EiXKJel5+E1Dw=="; }; }; "webassemblyjs-1.11.1" = { @@ -70045,15 +71710,6 @@ let sha512 = "GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g=="; }; }; - "webpack-4.44.2" = { - name = "webpack"; - packageName = "webpack"; - version = "4.44.2"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.44.2.tgz"; - sha512 = "6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q=="; - }; - }; "webpack-4.46.0" = { name = "webpack"; packageName = "webpack"; @@ -70072,13 +71728,13 @@ let sha512 = "NJNtGT7IKpGzdW7Iwpn/09OXz9inIkeIQ/ibY6B+MdV1x6+uReqz/5z1L89ezWnpPDWpXF0TY5PCYKQdWVn8Vg=="; }; }; - "webpack-5.69.1" = { + "webpack-5.70.0" = { name = "webpack"; packageName = "webpack"; - version = "5.69.1"; + version = "5.70.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.69.1.tgz"; - sha512 = "+VyvOSJXZMT2V5vLzOnDuMz5GxEqLk7hKWQ56YxPW/PQRUuKimPqmEIJOx8jHYeyo65pKbapbW464mvsKbaj4A=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.70.0.tgz"; + sha512 = "ZMWWy8CeuTTjCxbeaQI21xSswseF2oNOwc70QSKNePvmxE7XW36i7vpBMYZFAUHPwQiEbNGCEYIOOlyRbdGmxw=="; }; }; "webpack-bundle-analyzer-3.9.0" = { @@ -70090,6 +71746,15 @@ let sha512 = "Ob8amZfCm3rMB1ScjQVlbYYUEJyEjdEtQ92jqiFUYt5VkEeO2v5UMbv49P/gnmCZm3A6yaFQzCBvpZqN4MUsdA=="; }; }; + "webpack-chain-6.5.1" = { + name = "webpack-chain"; + packageName = "webpack-chain"; + version = "6.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-chain/-/webpack-chain-6.5.1.tgz"; + sha512 = "7doO/SRtLu8q5WM0s7vPKPWX580qhi0/yBHkOxNkv50f6qB76Zy9o2wRTrrPULqYTvQlVHuvbA8v+G5ayuUDsA=="; + }; + }; "webpack-cli-3.3.12" = { name = "webpack-cli"; packageName = "webpack-cli"; @@ -70180,6 +71845,15 @@ let sha512 = "9S6YyKKKh/Oz/eryM1RyLVDVmy3NSPV0JXMRhZ18fJsq+AwGxUY34X54VNwkzYcEmEkDwNxuEOboCZEebJXBAQ=="; }; }; + "webpack-merge-4.2.2" = { + name = "webpack-merge"; + packageName = "webpack-merge"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz"; + sha512 = "TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g=="; + }; + }; "webpack-merge-5.8.0" = { name = "webpack-merge"; packageName = "webpack-merge"; @@ -70225,15 +71899,6 @@ let sha512 = "/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w=="; }; }; - "webpack-stream-6.1.0" = { - name = "webpack-stream"; - packageName = "webpack-stream"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack-stream/-/webpack-stream-6.1.0.tgz"; - sha512 = "kFMnDzFTzyvVmn4ajaj0xEJavvYizd3I/KmQ6C5aUstcAkNwZUidxkk/uEaEPSydaAn66v8ZcP1+bhKSshNJUQ=="; - }; - }; "webrtc-adapter-7.7.1" = { name = "webrtc-adapter"; packageName = "webrtc-adapter"; @@ -70279,13 +71944,22 @@ let sha512 = "7iZ+u28Ljw5hCnMiq0BCOeSYf0vCFQe/ORY0HgscTiKjQed8WqugpBUggJ2NTnB9fahn1kEnPRX2jf8Px5PhJw=="; }; }; - "webtorrent-1.8.2" = { + "webtorrent-1.8.6" = { name = "webtorrent"; packageName = "webtorrent"; - version = "1.8.2"; + version = "1.8.6"; + src = fetchurl { + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.8.6.tgz"; + sha512 = "yx/y2O+IeTtkvkkjqTh5tyBjk+C/u8IqE6evOKllLs1kerVzMcbbHQMU7vgU05tThb1vRjbq3FAuU20g+HoEUg=="; + }; + }; + "webworkify-webpack-2.1.5" = { + name = "webworkify-webpack"; + packageName = "webworkify-webpack"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.8.2.tgz"; - sha512 = "rQfrYF/2pq81c8whgTEQtqMlp0HosA4yB7R4EUq+6Q0087bO2GbDxiBKTIZuBcMUgK+2jq/+TgTdXnZ9cBabcw=="; + url = "https://registry.npmjs.org/webworkify-webpack/-/webworkify-webpack-2.1.5.tgz"; + sha512 = "2akF8FIyUvbiBBdD+RoHpoTbHMQF2HwjcxfDvgztAX5YwbZNyrtfUMgvfgFVsgDhDPVTlkbb5vyasqDHfIDPQw=="; }; }; "whatwg-encoding-1.0.5" = { @@ -70342,6 +72016,15 @@ let sha512 = "CLxxCmdUby142H5FZzn4D8ikO1cmypvXVQktsgosNy4a4BHrDHeciBBGZhb0bNoR5/MltoCatso+vFjjGx8t0w=="; }; }; + "whatwg-url-11.0.0" = { + name = "whatwg-url"; + packageName = "whatwg-url"; + version = "11.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz"; + sha512 = "RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ=="; + }; + }; "whatwg-url-5.0.0" = { name = "whatwg-url"; packageName = "whatwg-url"; @@ -70396,15 +72079,6 @@ let sha1 = "aba03fc3bb736d6c88b091d013d8a8e590d84718"; }; }; - "when-3.7.8" = { - name = "when"; - packageName = "when"; - version = "3.7.8"; - src = fetchurl { - url = "https://registry.npmjs.org/when/-/when-3.7.8.tgz"; - sha1 = "c7130b6a7ea04693e842cdc9e7a1f2aa39a39f82"; - }; - }; "whet.extend-0.9.9" = { name = "whet.extend"; packageName = "whet.extend"; @@ -71305,13 +72979,13 @@ let sha512 = "N1XQngeqMBoj9wM4ZFadVV2MymImeiFfYD+fJrNlcVcOHsJFFQe7n3b+aBoTPwARuq2HQxukfzVpQmAk1gN4sQ=="; }; }; - "xdl-59.2.29" = { + "xdl-59.2.30" = { name = "xdl"; packageName = "xdl"; - version = "59.2.29"; + version = "59.2.30"; src = fetchurl { - url = "https://registry.npmjs.org/xdl/-/xdl-59.2.29.tgz"; - sha512 = "qwLdMdv7AR3Tz9rud/Dro2TQFlhZHLN9GIN4+TKKcz9M9mkeoqZAFbDEt+7MyDUKQ644iBpSvShjMdyRA7M+aQ=="; + url = "https://registry.npmjs.org/xdl/-/xdl-59.2.30.tgz"; + sha512 = "Id4b3prDMPlW9OuycaeQwXeD/3tAgTmJY0N1blRL5Xr3KXhybXkyCsnvOaFyvQ+luqnmsOUdJQkfzL0JuyIauw=="; }; }; "xenvar-0.5.1" = { @@ -71603,6 +73277,15 @@ let sha512 = "3XfeQE/wNkvrIktn2Kf0869fC0BN6UpydVasGIeSm2B1Llihf7/0UfZM+eCkOw3P7bP4+qPgqhm7ZoxuJtFU0Q=="; }; }; + "xmlhttprequest-ssl-2.0.0" = { + name = "xmlhttprequest-ssl"; + packageName = "xmlhttprequest-ssl"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz"; + sha512 = "QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A=="; + }; + }; "xor-distance-2.0.0" = { name = "xor-distance"; packageName = "xor-distance"; @@ -71693,13 +73376,13 @@ let sha1 = "f164263325ae671f53836fb210c7ddbcfda46598"; }; }; - "xss-1.0.10" = { + "xss-1.0.11" = { name = "xss"; packageName = "xss"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/xss/-/xss-1.0.10.tgz"; - sha512 = "qmoqrRksmzqSKvgqzN0055UFWY7OKx1/9JWeRswwEVX9fCG5jcYRxa/A2DHcmZX6VJvjzHRQ2STeeVcQkrmLSw=="; + url = "https://registry.npmjs.org/xss/-/xss-1.0.11.tgz"; + sha512 = "EimjrjThZeK2MO7WKR9mN5ZC1CSqivSl55wvUK5EtU6acf0rzEE1pN+9ZDrFXJ82BRp3JL38pPE6S4o/rpp1zQ=="; }; }; "xstream-11.14.0" = { @@ -71729,6 +73412,15 @@ let sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; }; }; + "xxhash-wasm-0.4.2" = { + name = "xxhash-wasm"; + packageName = "xxhash-wasm"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/xxhash-wasm/-/xxhash-wasm-0.4.2.tgz"; + sha512 = "/eyHVRJQCirEkSZ1agRSCwriMhwlyUcFkXD5TPVSLP+IPzjsqMVzZwdoczLp1SoQU0R3dxz1RpIK+4YNQbCVOA=="; + }; + }; "y18n-3.2.2" = { name = "y18n"; packageName = "y18n"; @@ -71846,6 +73538,15 @@ let sha512 = "C/FsVVhht4iPQYXOInoxUM/1ELSf9EsgKH34FofQOp6hwCPrW4vG4w5++TED3xRUo8gD7l0P1J1dLlDYzODsTQ=="; }; }; + "yargonaut-1.1.4" = { + name = "yargonaut"; + packageName = "yargonaut"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/yargonaut/-/yargonaut-1.1.4.tgz"; + sha512 = "rHgFmbgXAAzl+1nngqOcwEljqHGG9uUZoPjsdZEs1w5JW9RXYzrSvH/u70C1JE5qFi0qjsdhnUX/dJRpWqitSA=="; + }; + }; "yargs-1.3.3" = { name = "yargs"; packageName = "yargs"; @@ -72080,13 +73781,13 @@ let sha512 = "y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="; }; }; - "yargs-parser-21.0.0" = { + "yargs-parser-21.0.1" = { name = "yargs-parser"; packageName = "yargs-parser"; - version = "21.0.0"; + version = "21.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.0.tgz"; - sha512 = "z9kApYUOCwoeZ78rfRYYWdiU/iNL6mwwYlkkZfJoyMR1xps+NEBX5X7XmRpxkZHhXJ6+Ey00IwKxBBSW9FIjyA=="; + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz"; + sha512 = "9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg=="; }; }; "yargs-parser-4.2.1" = { @@ -72296,6 +73997,15 @@ let sha512 = "YnOmtSbv4MTf7RGJMK0FvZ+KD8OEe/J5BNnR0GHhD8J/XcG/Qvxgszm0Un6FTHWW4uHlTgP0IztiXQnGyIR45g=="; }; }; + "yorkie-2.0.0" = { + name = "yorkie"; + packageName = "yorkie"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yorkie/-/yorkie-2.0.0.tgz"; + sha512 = "jcKpkthap6x63MB4TxwCyuIGkV0oYP/YRyuQU5UO0Yz/E/ZAu+653/uov+phdmO54n6BcvFRyyt0RRrWdN2mpw=="; + }; + }; "yosay-2.0.2" = { name = "yosay"; packageName = "yosay"; @@ -72341,6 +74051,15 @@ let sha512 = "Yj3yXweRc8LdRMrCC8nIc4kkjWecPAUVh0TI0OUrWXx6aX790vLcDlWca6I4vsyCGH3LpWxq0dJRcMOFoVqmeg=="; }; }; + "zen-observable-ts-1.2.3" = { + name = "zen-observable-ts"; + packageName = "zen-observable-ts"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-1.2.3.tgz"; + sha512 = "hc/TGiPkAWpByykMwDcem3SdUgA4We+0Qb36bItSuJC9xD0XVBZoFHYoadAomDSNf64CG8Ydj0Qb8Od8BUWz5g=="; + }; + }; "zeromq-5.2.8" = { name = "zeromq"; packageName = "zeromq"; @@ -72437,15 +74156,15 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "13.2.4"; + version = "13.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-13.2.4.tgz"; - sha512 = "Llk0RzrpzCsAIgX4wk8QIB7xZInyLT07r6gF9dc9b0latHsJyRpeZXdPcFmT2wny0cin+1Y9q6HsBe4Srs19SA=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-13.2.6.tgz"; + sha512 = "xIjEaQI5sWemXXc7GXLm4u9UL5sjtrQL/y1PJvvk/Jsa8+kIT+MutOfZfC7zcdAh9fqHd8mokH3guFV8BJdFxA=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1302.4" - sources."@angular-devkit/core-13.2.4" - sources."@angular-devkit/schematics-13.2.4" + sources."@angular-devkit/architect-0.1302.6" + sources."@angular-devkit/core-13.2.6" + sources."@angular-devkit/schematics-13.2.6" sources."@gar/promisify-1.1.3" sources."@npmcli/fs-1.1.1" sources."@npmcli/git-2.1.0" @@ -72454,12 +74173,12 @@ in sources."@npmcli/node-gyp-1.0.3" sources."@npmcli/promise-spawn-1.3.2" sources."@npmcli/run-script-2.0.0" - sources."@schematics/angular-13.2.4" + sources."@schematics/angular-13.2.6" sources."@tootallnate/once-1.1.2" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" sources."agent-base-6.0.2" - sources."agentkeepalive-4.2.0" + sources."agentkeepalive-4.2.1" sources."aggregate-error-3.1.0" sources."ajv-8.9.0" sources."ajv-formats-2.1.1" @@ -72510,7 +74229,7 @@ in sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."gauge-4.0.1" + sources."gauge-4.0.3" sources."glob-7.2.0" sources."graceful-fs-4.2.9" sources."has-1.0.3" @@ -72532,7 +74251,7 @@ in sources."ini-2.0.0" (sources."inquirer-8.2.0" // { dependencies = [ - sources."rxjs-7.5.4" + sources."rxjs-7.5.5" sources."tslib-2.3.1" ]; }) @@ -72580,8 +74299,12 @@ in dependencies = [ sources."@tootallnate/once-2.0.0" sources."http-proxy-agent-5.0.0" - sources."lru-cache-7.3.1" - sources."make-fetch-happen-10.0.3" + sources."lru-cache-7.4.4" + (sources."make-fetch-happen-10.0.5" // { + dependencies = [ + sources."minipass-fetch-2.0.3" + ]; + }) ]; }) sources."npmlog-6.0.1" @@ -72653,10 +74376,10 @@ in "@antfu/ni" = nodeEnv.buildNodePackage { name = "_at_antfu_slash_ni"; packageName = "@antfu/ni"; - version = "0.13.1"; + version = "0.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/@antfu/ni/-/ni-0.13.1.tgz"; - sha512 = "n9frAWnm14iweBtISggohUVuU0bmE0i2wUgGWS1qUqqCNV9lUwYnhxU04OymrMeWpVTtKpk3MR6E+iQIi1i12w=="; + url = "https://registry.npmjs.org/@antfu/ni/-/ni-0.13.2.tgz"; + sha512 = "iKhPlNUE6fs0g7iRdTJzWFB8XoQb4AbCT46V0mrMsdF1RzyvwnOuzxSjISHQdYzpfirihVG9XpAUy/X540qavg=="; }; buildInputs = globalBuildInputs; meta = { @@ -72702,7 +74425,7 @@ in sources."duplexify-4.1.2" sources."end-of-stream-1.4.4" sources."escape-string-regexp-1.0.5" - sources."fast-redact-3.1.0" + sources."fast-redact-3.1.1" sources."fast-safe-stringify-2.1.1" sources."has-flag-3.0.0" sources."inherits-2.0.4" @@ -72736,7 +74459,7 @@ in sources."string_decoder-1.3.0" sources."strip-json-comments-3.1.1" sources."supports-color-5.5.0" - sources."thread-stream-0.13.1" + sources."thread-stream-0.13.2" sources."type-fest-1.4.0" sources."util-deprecate-1.0.2" sources."wrappy-1.0.2" @@ -72826,7 +74549,7 @@ in sources."escape-string-regexp-1.0.5" sources."exit-on-epipe-1.0.1" sources."extend-3.0.2" - sources."fast-redact-3.1.0" + sources."fast-redact-3.1.1" sources."fast-safe-stringify-2.1.1" sources."fd-slicer-1.1.0" sources."fill-range-7.0.1" @@ -72851,7 +74574,7 @@ in sources."handlebars-4.7.7" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."hpagent-0.1.2" sources."ignore-5.2.0" sources."inflight-1.0.6" @@ -72953,7 +74676,7 @@ in sources."string_decoder-1.1.1" sources."strip-json-comments-3.1.1" sources."supports-color-5.5.0" - sources."thread-stream-0.13.1" + sources."thread-stream-0.13.2" sources."through-2.3.8" (sources."through2-2.0.5" // { dependencies = [ @@ -72965,7 +74688,7 @@ in sources."to-regex-range-5.0.1" sources."to-through-2.0.0" sources."type-fest-1.4.0" - sources."uglify-js-3.15.1" + sources."uglify-js-3.15.3" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."unxhr-1.0.1" @@ -73005,12 +74728,13 @@ in "@astrojs/language-server" = nodeEnv.buildNodePackage { name = "_at_astrojs_slash_language-server"; packageName = "@astrojs/language-server"; - version = "0.8.8"; + version = "0.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@astrojs/language-server/-/language-server-0.8.8.tgz"; - sha512 = "XgBSVpqXEqGTdst+CnM03/nXYw9PYNAfTl27BaJuUhEtqA/iDlyM7wLnQMsJzwWVmoLqp0bCumHkb62NtfeDNA=="; + url = "https://registry.npmjs.org/@astrojs/language-server/-/language-server-0.11.0.tgz"; + sha512 = "rDpbvfhjM1BF2r1U64A2TLxUTrvdT9yKunjzhDDDoR4b5OBgyclhCvbdbWuq7wR3RCOl+P6bI+TGdYDwYnNd1g=="; }; dependencies = [ + sources."@astrojs/svelte-language-integration-0.1.1" sources."@emmetio/abbreviation-2.2.3" sources."@emmetio/css-abbreviation-2.1.4" sources."@emmetio/scanner-1.0.0" @@ -73018,11 +74742,17 @@ in sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@ts-morph/common-0.11.1" + (sources."@vscode/emmet-helper-2.8.4" // { + dependencies = [ + sources."vscode-uri-2.1.2" + ]; + }) sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."code-block-writer-10.1.1" sources."concat-map-0.0.1" + sources."dedent-js-1.0.1" sources."emmet-2.3.6" sources."fast-glob-3.2.11" sources."fastq-1.13.0" @@ -73033,25 +74763,26 @@ in sources."is-number-7.0.0" sources."jsonc-parser-2.3.1" sources."lodash-4.17.21" + sources."lower-case-2.0.2" sources."merge2-1.4.1" sources."micromatch-4.0.4" sources."minimatch-3.1.2" sources."mkdirp-1.0.4" + sources."no-case-3.0.4" + sources."pascal-case-3.1.2" sources."path-browserify-1.0.1" sources."picomatch-2.3.1" sources."queue-microtask-1.2.3" sources."reusify-1.0.4" sources."run-parallel-1.2.0" sources."source-map-0.7.3" + sources."svelte-3.46.4" + sources."svelte2tsx-0.5.5" sources."to-regex-range-5.0.1" sources."ts-morph-12.2.0" - sources."typescript-4.5.5" + sources."tslib-2.3.1" + sources."typescript-4.6.2" sources."vscode-css-languageservice-5.1.13" - (sources."vscode-emmet-helper-2.1.2" // { - dependencies = [ - sources."vscode-uri-2.1.2" - ]; - }) (sources."vscode-html-languageservice-3.2.0" // { dependencies = [ sources."vscode-languageserver-types-3.16.0-next.2" @@ -73068,6 +74799,7 @@ in ]; buildInputs = globalBuildInputs; meta = { + description = "The Astro language server, implement the [language server protocol](https://microsoft.github.io/language-server-protocol/)"; license = "MIT"; }; production = true; @@ -73366,7 +75098,7 @@ in sources."@tsconfig/node14-1.0.1" sources."@tsconfig/node16-1.0.2" sources."@types/minimist-1.2.2" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."JSONStream-1.3.5" @@ -73389,7 +75121,7 @@ in sources."conventional-changelog-angular-5.0.13" sources."conventional-commits-parser-3.2.4" sources."cosmiconfig-7.0.1" - sources."cosmiconfig-typescript-loader-1.0.5" + sources."cosmiconfig-typescript-loader-1.0.6" sources."create-require-1.1.1" sources."cross-spawn-7.0.3" sources."dargs-7.0.0" @@ -73409,7 +75141,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."find-up-4.1.0" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" sources."get-stream-6.0.1" @@ -73509,9 +75241,9 @@ in sources."through-2.3.8" sources."through2-4.0.2" sources."trim-newlines-3.0.1" - sources."ts-node-10.5.0" + sources."ts-node-10.7.0" sources."type-fest-0.18.1" - sources."typescript-4.5.5" + sources."typescript-4.6.2" sources."universalify-2.0.0" sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" @@ -73524,7 +75256,7 @@ in sources."yaml-1.10.2" (sources."yargs-17.3.1" // { dependencies = [ - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" ]; }) sources."yargs-parser-20.2.9" @@ -73589,13 +75321,13 @@ in sources."supports-color-5.5.0" ]; }) - sources."@sindresorhus/is-4.4.0" + sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/normalize-package-data-2.4.1" sources."@types/responselike-1.0.0" sources."abort-controller-3.0.0" @@ -73660,7 +75392,7 @@ in sources."figures-3.2.0" sources."fill-range-7.0.1" sources."find-up-5.0.0" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."fsevents-2.3.2" sources."function-bind-1.1.1" sources."fuzzy-0.1.3" @@ -73669,16 +75401,16 @@ in sources."get-intrinsic-1.1.1" sources."get-stream-5.2.0" sources."glob-parent-5.1.2" - sources."google-auth-library-7.13.0" + sources."google-auth-library-7.14.0" sources."google-p12-pem-3.1.3" sources."googleapis-76.0.0" - sources."googleapis-common-5.0.5" + sources."googleapis-common-5.1.0" sources."got-11.8.3" sources."graceful-fs-4.2.9" sources."gtoken-5.3.2" sources."has-1.0.3" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."hosted-git-info-4.1.0" sources."http-cache-semantics-4.1.0" sources."http2-wrapper-1.0.3" @@ -73687,7 +75419,7 @@ in sources."ieee754-1.2.1" sources."indent-string-4.0.0" sources."inherits-2.0.4" - sources."inquirer-8.2.0" + sources."inquirer-8.2.1" (sources."inquirer-autocomplete-prompt-ipt-2.0.0" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -73727,7 +75459,7 @@ in sources."lodash-4.17.21" (sources."log-symbols-5.1.0" // { dependencies = [ - sources."chalk-5.0.0" + sources."chalk-5.0.1" ]; }) sources."loud-rejection-2.2.0" @@ -73808,7 +75540,7 @@ in sources."restore-cursor-3.1.0" sources."router-ips-1.0.0" sources."run-async-2.4.1" - sources."rxjs-7.5.4" + sources."rxjs-7.5.5" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-6.3.0" @@ -73837,9 +75569,9 @@ in }) sources."tslib-2.3.1" sources."type-fest-0.21.3" - sources."typescript-4.5.5" + sources."typescript-4.6.2" sources."universalify-2.0.0" - sources."url-parse-1.5.9" + sources."url-parse-1.5.10" sources."url-template-2.0.8" sources."util-deprecate-1.0.2" sources."uuid-8.3.2" @@ -73880,7 +75612,7 @@ in sources."@hyperswarm/hypersign-2.1.1" sources."@hyperswarm/network-2.1.0" sources."@leichtgewicht/ip-codec-2.0.3" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."abstract-extension-3.1.1" sources."abstract-leveldown-6.2.3" sources."acorn-8.7.0" @@ -74025,7 +75757,7 @@ in ]; }) sources."hyperswarm-2.15.3" - sources."hypertrie-5.1.2" + sources."hypertrie-5.1.3" sources."identify-filetype-1.0.0" sources."ieee754-1.2.1" sources."immediate-3.3.0" @@ -74151,7 +75883,7 @@ in sources."stream-collector-1.0.1" sources."stream-equal-1.1.1" sources."stream-shift-1.0.1" - sources."streamx-2.12.2" + sources."streamx-2.12.4" (sources."string-width-4.2.3" // { dependencies = [ sources."ansi-regex-5.0.1" @@ -74205,7 +75937,7 @@ in ]; }) sources."varint-5.0.0" - sources."vm2-3.9.8" + sources."vm2-3.9.9" sources."which-1.3.1" (sources."wrap-ansi-7.0.0" // { dependencies = [ @@ -74274,7 +76006,7 @@ in sources."@types/markdown-it-12.2.3" sources."@types/mdurl-1.0.2" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/tough-cookie-2.3.8" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -75075,7 +76807,7 @@ in sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."uc.micro-1.0.6" - sources."uglify-js-3.15.1" + sources."uglify-js-3.15.3" sources."underscore-1.13.2" sources."union-value-1.0.1" (sources."universal-url-2.0.0" // { @@ -75171,7 +76903,7 @@ in sources."@octokit/plugin-request-log-1.0.4" sources."@octokit/plugin-rest-endpoint-methods-5.13.0" sources."@octokit/plugin-retry-3.0.9" - sources."@octokit/plugin-throttling-3.5.2" + sources."@octokit/plugin-throttling-3.6.1" sources."@octokit/request-5.6.3" sources."@octokit/request-error-2.1.0" sources."@octokit/rest-18.12.0" @@ -75262,19 +76994,19 @@ in "@nestjs/cli" = nodeEnv.buildNodePackage { name = "_at_nestjs_slash_cli"; packageName = "@nestjs/cli"; - version = "8.2.1"; + version = "8.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@nestjs/cli/-/cli-8.2.1.tgz"; - sha512 = "GnwpORSIkGl6N6yWPONq1wwZ8+zltr3vF1M/2qzupDnXOAvSSCh1otDQRAmeOf3uIIeCiCsJEEx79kRnT7Zdrw=="; + url = "https://registry.npmjs.org/@nestjs/cli/-/cli-8.2.2.tgz"; + sha512 = "ZonmNLCHfTVrZGgYf4mrpivnKGaRzVRAcux+WDbzhQDNIz70s7mdOPShXW1Vpq+7uRJDxlgO1vOMhmg4uEUIDg=="; }; dependencies = [ - sources."@angular-devkit/core-13.2.3" - sources."@angular-devkit/schematics-13.2.3" - (sources."@angular-devkit/schematics-cli-13.2.3" // { + sources."@angular-devkit/core-13.2.5" + sources."@angular-devkit/schematics-13.2.5" + (sources."@angular-devkit/schematics-cli-13.2.5" // { dependencies = [ sources."chalk-4.1.2" sources."inquirer-8.2.0" - sources."rxjs-7.5.4" + sources."rxjs-7.5.5" sources."tslib-2.3.1" ]; }) @@ -75290,18 +77022,13 @@ in sources."supports-color-5.5.0" ]; }) - (sources."@nestjs/schematics-8.0.6" // { - dependencies = [ - sources."@angular-devkit/core-13.2.2" - sources."@angular-devkit/schematics-13.2.2" - ]; - }) + sources."@nestjs/schematics-8.0.8" sources."@types/eslint-8.4.1" sources."@types/eslint-scope-3.7.3" sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.9" sources."@types/json5-0.0.29" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/parse-json-4.0.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" @@ -75324,24 +77051,23 @@ in sources."acorn-import-assertions-1.8.0" sources."ajv-8.9.0" sources."ajv-formats-2.1.1" - sources."ajv-keywords-3.5.2" + sources."ajv-keywords-5.1.0" sources."ansi-colors-4.1.1" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."anymatch-3.1.2" - sources."at-least-node-1.0.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."binary-extensions-2.2.0" sources."bl-4.1.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.19.3" + sources."browserslist-4.20.0" sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001312" + sources."caniuse-lite-1.0.30001314" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.3" @@ -75356,18 +77082,14 @@ in sources."colors-1.4.0" sources."commander-4.1.1" sources."concat-map-0.0.1" - sources."cosmiconfig-6.0.0" + sources."cosmiconfig-7.0.1" sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.4.71" + sources."electron-to-chromium-1.4.81" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" - (sources."enhanced-resolve-5.9.0" // { - dependencies = [ - sources."tapable-2.2.1" - ]; - }) + sources."enhanced-resolve-5.9.2" sources."error-ex-1.3.2" sources."es-module-lexer-0.9.3" sources."escalade-3.1.1" @@ -75386,13 +77108,12 @@ in sources."fast-json-stable-stringify-2.1.0" sources."figures-3.2.0" sources."fill-range-7.0.1" - (sources."fork-ts-checker-webpack-plugin-6.5.0" // { + (sources."fork-ts-checker-webpack-plugin-7.2.1" // { dependencies = [ sources."chalk-4.1.2" - sources."fs-extra-9.1.0" ]; }) - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."fs-monkey-1.0.3" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" @@ -75496,12 +77217,7 @@ in sources."rxjs-6.6.7" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - (sources."schema-utils-2.7.0" // { - dependencies = [ - sources."ajv-6.12.6" - sources."json-schema-traverse-0.4.1" - ]; - }) + sources."schema-utils-4.0.0" sources."semver-7.3.5" sources."serialize-javascript-6.0.0" sources."shebang-command-2.0.0" @@ -75523,8 +77239,8 @@ in sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" sources."symbol-observable-4.0.0" - sources."tapable-1.1.3" - (sources."terser-5.10.0" // { + sources."tapable-2.2.1" + (sources."terser-5.12.0" // { dependencies = [ sources."commander-2.20.3" ]; @@ -75532,6 +77248,7 @@ in (sources."terser-webpack-plugin-5.3.1" // { dependencies = [ sources."ajv-6.12.6" + sources."ajv-keywords-3.5.2" sources."json-schema-traverse-0.4.1" sources."schema-utils-3.1.1" sources."source-map-0.6.1" @@ -75549,7 +77266,7 @@ in }) sources."tslib-1.14.1" sources."type-fest-0.21.3" - sources."typescript-4.5.5" + sources."typescript-4.6.2" sources."universalify-2.0.0" sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" @@ -75558,9 +77275,9 @@ in (sources."webpack-5.66.0" // { dependencies = [ sources."ajv-6.12.6" + sources."ajv-keywords-3.5.2" sources."json-schema-traverse-0.4.1" sources."schema-utils-3.1.1" - sources."tapable-2.2.1" ]; }) sources."webpack-node-externals-3.0.0" @@ -75659,13 +77376,13 @@ in "@tailwindcss/forms" = nodeEnv.buildNodePackage { name = "_at_tailwindcss_slash_forms"; packageName = "@tailwindcss/forms"; - version = "0.4.0"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.4.0.tgz"; - sha512 = "DeaQBx6EgEeuZPQACvC+mKneJsD8am1uiJugjgQK1+/Vt+Ai0GpFBC2T2fqnUad71WgOxyrZPE6BG1VaI6YqfQ=="; + url = "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.0.tgz"; + sha512 = "KzWugryEBFkmoaYcBE18rs6gthWCFHHO7cAZm2/hv3hwD67AzwP7udSCa22E7R1+CEJL/FfhYsJWrc0b1aeSzw=="; }; dependencies = [ - sources."mini-svg-data-uri-1.4.3" + sources."mini-svg-data-uri-1.4.4" ]; buildInputs = globalBuildInputs; meta = { @@ -75738,10 +77455,10 @@ in "@uppy/companion" = nodeEnv.buildNodePackage { name = "_at_uppy_slash_companion"; packageName = "@uppy/companion"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@uppy/companion/-/companion-3.3.0.tgz"; - sha512 = "/TF95YAYNcuuyfxuYDm+82ployEafonT8MDP5oVZr1zdqRGjyrAiOfAWiCjONPWVKVa/mp6Jj8WPgnzLzuA13Q=="; + url = "https://registry.npmjs.org/@uppy/companion/-/companion-3.3.1.tgz"; + sha512 = "ke+qyGzYpUWsOgqSbwM6Ok3f6nqXmh4WdfFa3LGKgaNs8mHv4ss/06a3NwAYEGrUSaCNOCNa3+snwUE4rMQ5OA=="; }; dependencies = [ sources."@purest/config-1.0.1" @@ -75761,7 +77478,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.1077.0" // { + (sources."aws-sdk-2.1091.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -75862,7 +77579,7 @@ in sources."har-validator-5.1.5" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."helmet-4.6.0" sources."http-errors-1.7.2" sources."http-signature-1.2.0" @@ -76017,7 +77734,7 @@ in ]; }) sources."url-0.10.3" - sources."url-parse-1.5.9" + sources."url-parse-1.5.10" sources."url-value-parser-2.1.0" sources."utils-merge-1.0.1" sources."uuid-8.1.0" @@ -76076,7 +77793,7 @@ in sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.17.1" + sources."@babel/helper-create-class-features-plugin-7.17.6" sources."@babel/helper-create-regexp-features-plugin-7.17.0" (sources."@babel/helper-define-polyfill-provider-0.3.1" // { dependencies = [ @@ -76090,7 +77807,7 @@ in sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-member-expression-to-functions-7.16.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-module-transforms-7.17.6" sources."@babel/helper-optimise-call-expression-7.16.7" sources."@babel/helper-plugin-utils-7.16.7" sources."@babel/helper-remap-async-to-generator-7.16.8" @@ -76117,7 +77834,7 @@ in sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7" sources."@babel/plugin-proposal-async-generator-functions-7.16.8" sources."@babel/plugin-proposal-class-properties-7.16.7" - sources."@babel/plugin-proposal-class-static-block-7.16.7" + sources."@babel/plugin-proposal-class-static-block-7.17.6" sources."@babel/plugin-proposal-dynamic-import-7.16.7" sources."@babel/plugin-proposal-export-namespace-from-7.16.7" sources."@babel/plugin-proposal-json-strings-7.16.7" @@ -76246,7 +77963,7 @@ in sources."@types/koa-compose-3.2.5" sources."@types/long-4.0.1" sources."@types/mime-1.3.2" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/normalize-package-data-2.4.1" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" @@ -76350,7 +78067,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.19.3" + sources."browserslist-4.20.0" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -76369,7 +78086,7 @@ in }) sources."call-bind-1.0.2" sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001312" + sources."caniuse-lite-1.0.30001314" sources."caw-2.0.1" sources."chalk-4.1.2" sources."chardet-0.7.0" @@ -76490,7 +78207,7 @@ in sources."easy-stack-1.0.1" sources."ee-first-1.1.1" sources."ejs-3.1.6" - sources."electron-to-chromium-1.4.71" + sources."electron-to-chromium-1.4.81" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -76590,7 +78307,7 @@ in sources."which-2.0.2" ]; }) - sources."flow-parser-0.172.0" + sources."flow-parser-0.173.0" sources."for-each-0.3.3" sources."for-in-1.0.2" sources."forwarded-0.2.0" @@ -76648,7 +78365,7 @@ in sources."has-bigints-1.0.1" sources."has-flag-4.0.0" sources."has-symbol-support-x-1.4.2" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-to-string-tag-x-1.4.1" sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" @@ -76675,7 +78392,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-2.0.0" - sources."inquirer-8.2.0" + sources."inquirer-8.2.1" sources."internal-slot-1.0.3" sources."into-stream-3.1.0" sources."ipaddr.js-1.9.1" @@ -76950,7 +78667,7 @@ in sources."rss-parser-3.12.0" sources."run-async-2.4.1" sources."run-parallel-1.2.0" - sources."rxjs-7.5.4" + sources."rxjs-7.5.5" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -77167,7 +78884,7 @@ in sources."ws-7.5.7" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" - (sources."xss-1.0.10" // { + (sources."xss-1.0.11" // { dependencies = [ sources."commander-2.20.3" ]; @@ -77424,7 +79141,7 @@ in sources."@types/minimist-1.2.2" sources."@types/ms-0.7.31" sources."@types/nlcst-1.0.0" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/normalize-package-data-2.4.1" sources."@types/parse5-6.0.3" sources."@types/supports-color-8.1.1" @@ -77791,12 +79508,12 @@ in sources."to-readable-stream-1.0.0" sources."to-vfile-7.2.3" sources."trim-newlines-4.0.2" - sources."trough-2.0.2" + sources."trough-2.1.0" sources."type-fest-1.4.0" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" sources."unherit-3.0.0" - (sources."unified-10.1.1" // { + (sources."unified-10.1.2" // { dependencies = [ sources."is-plain-obj-4.0.0" ]; @@ -77821,7 +79538,7 @@ in sources."unist-util-position-4.0.1" sources."unist-util-position-from-estree-1.1.1" sources."unist-util-remove-position-4.0.1" - sources."unist-util-stringify-position-3.0.0" + sources."unist-util-stringify-position-3.0.2" (sources."unist-util-visit-4.1.0" // { dependencies = [ sources."unist-util-visit-parents-5.1.0" @@ -77843,15 +79560,15 @@ in sources."util-deprecate-1.0.2" sources."uvu-0.5.3" sources."validate-npm-package-license-3.0.4" - sources."vfile-5.3.0" + sources."vfile-5.3.2" sources."vfile-find-up-6.0.0" sources."vfile-location-4.0.1" - sources."vfile-message-3.1.0" + sources."vfile-message-3.1.2" (sources."vfile-reporter-7.0.3" // { dependencies = [ sources."ansi-regex-6.0.1" sources."emoji-regex-9.2.2" - sources."string-width-5.1.0" + sources."string-width-5.1.2" sources."strip-ansi-7.0.1" sources."supports-color-9.2.1" ]; @@ -77910,7 +79627,7 @@ in sources."@babel/helper-get-function-arity-7.16.7" sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-module-transforms-7.17.6" sources."@babel/helper-simple-access-7.16.7" sources."@babel/helper-split-export-declaration-7.16.7" sources."@babel/helper-validator-identifier-7.16.7" @@ -77931,8 +79648,8 @@ in sources."async-3.2.3" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.19.3" - sources."caniuse-lite-1.0.30001312" + sources."browserslist-4.20.0" + sources."caniuse-lite-1.0.30001314" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -77942,7 +79659,7 @@ in sources."convert-source-map-1.8.0" sources."debug-4.3.3" sources."ejs-3.1.6" - sources."electron-to-chromium-1.4.71" + sources."electron-to-chromium-1.4.82" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -78068,7 +79785,7 @@ in sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-2.0.0" - sources."destroy-1.1.0" + sources."destroy-1.1.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."emoji-regex-8.0.0" @@ -78089,7 +79806,7 @@ in sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."http-assert-1.5.0" (sources."http-errors-1.8.1" // { @@ -78150,7 +79867,7 @@ in }) sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" - sources."on-finished-2.3.0" + sources."on-finished-2.4.1" sources."only-0.0.2" sources."parseurl-1.3.3" sources."passthrough-counter-1.0.0" @@ -78191,7 +79908,7 @@ in sources."tweetnacl-0.14.5" sources."type-is-1.6.18" sources."uri-js-4.4.1" - sources."urijs-1.19.8" + sources."urijs-1.19.10" sources."uuid-3.4.0" sources."vary-1.1.2" sources."verror-1.10.0" @@ -78204,7 +79921,7 @@ in }) sources."y18n-5.0.8" sources."yargs-17.3.1" - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" sources."ylru-1.2.1" ]; buildInputs = globalBuildInputs; @@ -78228,7 +79945,7 @@ in dependencies = [ sources."@types/glob-7.2.0" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -78312,11 +80029,11 @@ in sha512 = "9fOPpHKuDW1w/0EKfRmVnxTDt8166MAnLI3mgZ1JCnhNtYWxcJ6Ud5CO/AVOZi/AvFa8DY9RTy3h3+tFBlrrdQ=="; }; dependencies = [ - sources."browserslist-4.19.3" - sources."caniuse-lite-1.0.30001312" - sources."electron-to-chromium-1.4.71" + sources."browserslist-4.20.0" + sources."caniuse-lite-1.0.30001314" + sources."electron-to-chromium-1.4.82" sources."escalade-3.1.1" - sources."fraction.js-4.1.3" + sources."fraction.js-4.2.0" sources."node-releases-2.0.2" sources."normalize-range-0.1.2" sources."picocolors-1.0.0" @@ -78342,14 +80059,14 @@ in }; dependencies = [ sources."@tootallnate/once-1.1.2" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" - (sources."aws-sdk-2.1077.0" // { + (sources."aws-sdk-2.1091.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -78388,7 +80105,7 @@ in sources."deep-is-0.1.4" sources."defaults-1.0.3" sources."degenerator-2.2.0" - sources."depd-1.1.2" + sources."depd-2.0.0" sources."devtools-protocol-0.0.901419" sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" @@ -78426,7 +80143,7 @@ in sources."graceful-fs-4.2.9" sources."has-flag-4.0.0" sources."htmlparser2-6.1.0" - sources."http-errors-1.8.1" + sources."http-errors-2.0.0" sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.0" sources."iconv-lite-0.4.24" @@ -78434,7 +80151,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-2.0.0" - sources."inquirer-8.2.0" + sources."inquirer-8.2.1" sources."ip-1.1.5" sources."is-fullwidth-code-point-3.0.0" sources."is-interactive-1.0.0" @@ -78484,12 +80201,12 @@ in ]; }) sources."querystring-0.2.0" - sources."raw-body-2.4.3" + sources."raw-body-2.5.1" sources."readable-stream-3.6.0" sources."restore-cursor-3.1.0" sources."rimraf-3.0.2" sources."run-async-2.4.1" - sources."rxjs-7.5.4" + sources."rxjs-7.5.5" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."sax-1.2.1" @@ -78499,7 +80216,7 @@ in sources."socks-2.6.2" sources."socks-proxy-agent-5.0.1" sources."source-map-0.6.1" - sources."statuses-1.5.0" + sources."statuses-2.0.1" sources."string-width-4.2.3" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" @@ -78967,10 +80684,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "11.53.7"; + version = "11.57.1"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-11.53.7.tgz"; - sha512 = "ZvKd1pri9FOVt59imBWNLoY8GfP4Mld1Ci9SHFZF6VesRnkxYDvmnj+bNfCw9KDj/7EvkwlDM4PluN6YoDc67w=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-11.57.1.tgz"; + sha512 = "4VZ0wtEhVxobxcQuXnnWMKWp+lFCaYNwy24gLx38Jm634/ry3vQ1V5T2Y2OIrA0ea6h6CanL7mryjZRmaLwiqw=="; }; dependencies = [ (sources."@alexbosworth/caporal-1.4.0" // { @@ -79019,7 +80736,7 @@ in sources."@types/express-serve-static-core-4.17.28" sources."@types/long-4.0.1" sources."@types/mime-1.3.2" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" sources."@types/request-2.48.8" @@ -79230,7 +80947,7 @@ in sources."imurmurhash-0.1.4" sources."inherits-2.0.4" sources."ini-2.0.0" - (sources."inquirer-8.2.0" // { + (sources."inquirer-8.2.1" // { dependencies = [ sources."ansi-escapes-4.3.2" sources."ansi-styles-4.3.0" @@ -79363,70 +81080,75 @@ in sources."ws-8.2.3" ]; }) - (sources."ln-service-53.9.1" // { + (sources."ln-service-53.9.3" // { dependencies = [ - sources."@grpc/grpc-js-1.5.5" + sources."@grpc/grpc-js-1.5.7" + sources."@types/ws-8.5.2" sources."body-parser-1.19.2" sources."bolt09-0.2.2" sources."bytes-3.1.2" - sources."lightning-5.8.1" + sources."cookie-0.4.2" + sources."express-4.17.3" + sources."lightning-5.8.2" sources."qs-6.9.7" sources."raw-body-2.4.3" - sources."type-fest-2.11.2" + sources."safe-buffer-5.2.1" + sources."tiny-secp256k1-2.2.1" + sources."type-fest-2.12.0" + sources."uint8array-tools-0.0.7" sources."ws-8.5.0" ]; }) - (sources."ln-sync-3.10.1" // { + (sources."ln-sync-3.11.0" // { dependencies = [ - sources."@grpc/grpc-js-1.5.5" - sources."@types/node-17.0.17" - sources."lightning-5.7.1" - sources."ln-service-53.8.1" - sources."type-fest-2.11.2" - sources."ws-8.5.0" + sources."tiny-secp256k1-2.2.1" + sources."uint8array-tools-0.0.7" ]; }) - (sources."ln-telegram-3.17.3" // { + (sources."ln-telegram-3.19.1" // { dependencies = [ - sources."@grpc/grpc-js-1.5.3" - sources."@types/node-17.0.16" - sources."bech32-1.1.4" - sources."bitcoinjs-lib-5.2.0" - sources."bn.js-4.12.0" - sources."invoices-2.0.3" - sources."lightning-5.6.3" - sources."ln-service-53.8.0" - (sources."ln-sync-3.10.0" // { - dependencies = [ - sources."@types/node-17.0.15" - sources."lightning-5.6.2" - sources."ln-service-53.7.3" - sources."ws-8.4.2" - ]; - }) - (sources."paid-services-3.11.0" // { + sources."@grpc/grpc-js-1.5.5" + sources."@types/node-17.0.18" + sources."body-parser-1.19.2" + sources."bolt09-0.2.2" + sources."bytes-3.1.2" + sources."cookie-0.4.2" + sources."express-4.17.3" + (sources."lightning-5.8.1" // { dependencies = [ - sources."@types/node-17.0.10" - sources."bech32-2.0.0" - sources."bitcoinjs-lib-6.0.1" - sources."bn.js-5.2.0" - sources."lightning-5.3.4" - sources."ln-service-53.5.1" - (sources."ln-sync-3.7.0" // { + sources."bytes-3.1.1" + sources."cookie-0.4.1" + (sources."express-4.17.2" // { dependencies = [ - sources."@grpc/grpc-js-1.5.1" - sources."@types/node-17.0.8" - sources."lightning-5.3.3" - sources."ln-service-53.5.0" - sources."type-fest-2.9.0" + sources."body-parser-1.19.1" ]; }) - sources."ws-8.4.2" + sources."qs-6.9.6" + sources."raw-body-2.4.2" ]; }) - sources."psbt-1.1.10" - sources."tiny-secp256k1-1.1.6" - sources."type-fest-2.10.0" + sources."ln-service-53.9.2" + (sources."ln-sync-3.10.1" // { + dependencies = [ + sources."@types/node-17.0.17" + sources."body-parser-1.19.1" + sources."bolt09-0.2.1" + sources."bytes-3.1.1" + sources."cookie-0.4.1" + sources."express-4.17.2" + sources."lightning-5.7.1" + sources."ln-service-53.8.1" + sources."qs-6.9.6" + sources."raw-body-2.4.2" + ]; + }) + sources."paid-services-3.12.1" + sources."qs-6.9.7" + sources."raw-body-2.4.3" + sources."safe-buffer-5.2.1" + sources."tiny-secp256k1-2.2.1" + sources."type-fest-2.11.2" + sources."uint8array-tools-0.0.7" sources."ws-8.5.0" ]; }) @@ -79449,7 +81171,7 @@ in sources."long-4.0.0" sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" - sources."luxon-2.3.0" + sources."luxon-2.3.1" sources."macaroon-3.0.4" (sources."make-dir-3.1.0" // { dependencies = [ @@ -79511,7 +81233,12 @@ in sources."semver-6.3.0" ]; }) - sources."paid-services-3.11.4" + (sources."paid-services-3.12.2" // { + dependencies = [ + sources."tiny-secp256k1-2.2.1" + sources."uint8array-tools-0.0.7" + ]; + }) sources."parseurl-1.3.3" sources."path-to-regexp-0.1.7" sources."pinkie-2.0.4" @@ -79553,7 +81280,7 @@ in sources."ripemd160-2.0.2" sources."run-async-2.4.1" sources."rx-4.1.0" - sources."rxjs-7.5.4" + sources."rxjs-7.5.5" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sanitize-filename-1.6.3" @@ -79786,7 +81513,7 @@ in sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."uri-js-4.4.1" - sources."urijs-1.19.8" + sources."urijs-1.19.10" sources."uuid-3.4.0" sources."verror-1.10.0" sources."vscode-jsonrpc-6.0.0" @@ -80065,7 +81792,7 @@ in sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" sources."meow-3.7.0" - sources."mime-db-1.51.0" + sources."mime-db-1.52.0" sources."minimatch-3.1.2" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -80226,7 +81953,7 @@ in sources."glob-7.2.0" sources."has-1.0.3" sources."has-bigints-1.0.1" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" (sources."hash-base-3.1.0" // { dependencies = [ @@ -80424,7 +82151,7 @@ in sources."cookie-0.4.2" sources."debug-3.1.0" sources."decamelize-1.2.0" - sources."depd-1.1.2" + sources."depd-2.0.0" sources."destroy-1.0.4" sources."dev-ip-1.0.1" sources."dlv-1.1.3" @@ -80463,9 +82190,9 @@ in sources."has-ansi-2.0.0" sources."has-binary2-1.0.3" sources."has-cors-1.1.0" - (sources."http-errors-1.8.1" // { + (sources."http-errors-2.0.0" // { dependencies = [ - sources."statuses-1.5.0" + sources."statuses-2.0.1" ]; }) sources."http-proxy-1.18.1" @@ -80516,7 +82243,7 @@ in sources."portscanner-2.1.1" sources."qs-6.2.3" sources."range-parser-1.2.1" - sources."raw-body-2.4.3" + sources."raw-body-2.5.1" sources."readdirp-3.6.0" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" @@ -80532,6 +82259,7 @@ in (sources."send-0.16.2" // { dependencies = [ sources."debug-2.6.9" + sources."depd-1.1.2" sources."http-errors-1.6.3" sources."inherits-2.0.3" sources."setprototypeof-1.1.0" @@ -80541,6 +82269,7 @@ in (sources."serve-index-1.9.1" // { dependencies = [ sources."debug-2.6.9" + sources."depd-1.1.2" sources."http-errors-1.6.3" sources."inherits-2.0.3" sources."setprototypeof-1.1.0" @@ -80810,7 +82539,7 @@ in sources."hard-rejection-2.1.0" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" (sources."hash-base-3.1.0" // { dependencies = [ @@ -81090,7 +82819,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -81631,7 +83360,7 @@ in }) ]; }) - sources."depd-1.1.2" + sources."depd-2.0.0" sources."dir-glob-2.0.0" sources."dom-walk-0.1.2" sources."dot-prop-4.2.1" @@ -81720,7 +83449,7 @@ in ]; }) sources."hosted-git-info-2.8.9" - sources."http-errors-1.8.1" + sources."http-errors-2.0.0" (sources."https-proxy-agent-2.2.4" // { dependencies = [ sources."debug-3.2.7" @@ -81909,7 +83638,7 @@ in }) sources."query-string-6.14.1" sources."quick-lru-1.1.0" - sources."raw-body-2.4.3" + sources."raw-body-2.5.1" sources."rc-1.2.8" sources."read-pkg-3.0.0" sources."read-pkg-up-3.0.0" @@ -81998,7 +83727,7 @@ in sources."kind-of-5.1.0" ]; }) - sources."statuses-1.5.0" + sources."statuses-2.0.1" sources."strict-uri-encode-2.0.0" (sources."string-width-2.1.1" // { dependencies = [ @@ -82097,18 +83826,18 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "1.0.104"; + version = "1.0.120"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.104.tgz"; - sha512 = "/JiR7ynoMTH8G3efHuzvdpWI2VX+3W2XRRWOILoSLquV97o4g2P9QD1ElpgLRysOarcxHHfb3hvbYSUAI6OYug=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.120.tgz"; + sha512 = "2Ik+JGf5Pt+6V4tBDSFicqxRb0mRv5u+x7lOiegoeRku467VH4I6Vk4Di+MDLr9lt2OEmJftAxXpvAMv0DBCfQ=="; }; dependencies = [ - sources."@jsii/check-node-1.54.0" - sources."@jsii/spec-1.54.0" + sources."@jsii/check-node-1.55.0" + sources."@jsii/spec-1.55.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@types/node-12.20.46" + sources."@types/node-12.20.47" sources."@xmldom/xmldom-0.8.1" sources."ajv-8.10.0" sources."ansi-regex-5.0.1" @@ -82119,12 +83848,12 @@ in sources."call-bind-1.0.2" sources."camelcase-6.3.0" sources."case-1.6.3" - sources."cdk8s-1.5.22" - sources."cdk8s-plus-22-1.0.0-beta.123" + sources."cdk8s-1.5.39" + sources."cdk8s-plus-22-1.0.0-beta.142" sources."chalk-4.1.2" sources."cliui-7.0.4" sources."clone-2.1.2" - (sources."codemaker-1.54.0" // { + (sources."codemaker-1.55.0" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -82133,8 +83862,8 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.30.0" - sources."constructs-3.3.223" - sources."date-format-4.0.3" + sources."constructs-3.3.239" + sources."date-format-4.0.4" sources."debug-4.3.3" sources."decamelize-5.0.1" sources."deep-equal-2.0.5" @@ -82171,7 +83900,7 @@ in sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."internal-slot-1.0.3" sources."is-arguments-1.1.1" @@ -82196,42 +83925,42 @@ in sources."is-weakref-1.0.2" sources."is-weakset-2.0.2" sources."isarray-2.0.5" - (sources."jsii-1.54.0" // { + (sources."jsii-1.55.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.54.0" // { + (sources."jsii-pacmak-1.55.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.54.0" // { + (sources."jsii-reflect-1.55.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.54.0" // { + (sources."jsii-rosetta-1.55.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.482" // { + (sources."jsii-srcmak-0.1.499" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.4.0" sources."json-schema-traverse-1.0.0" - sources."json2jsii-0.2.142" + sources."json2jsii-0.2.159" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" - sources."log4js-6.4.1" + sources."log4js-6.4.2" sources."lower-case-2.0.2" sources."lru-cache-6.0.0" sources."mdurl-1.0.1" @@ -82245,7 +83974,7 @@ in sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object.assign-4.1.2" - sources."oo-ascii-tree-1.54.0" + sources."oo-ascii-tree-1.55.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" @@ -82271,10 +84000,10 @@ in sources."snake-case-3.0.4" sources."sort-json-2.0.1" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.208" - (sources."streamroller-3.0.2" // { + sources."sscaff-1.2.225" + (sources."streamroller-3.0.4" // { dependencies = [ - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" ]; }) sources."string-width-4.2.3" @@ -82323,10 +84052,10 @@ in cdktf-cli = nodeEnv.buildNodePackage { name = "cdktf-cli"; packageName = "cdktf-cli"; - version = "0.9.1"; + version = "0.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.9.1.tgz"; - sha512 = "Qa542vXUXn8tzqGkcAvLWGSpFbhOXalOystXu8sSZn82eCpCTo2CxEpoHOFeUgNkymUOFwWawl5+CIMYr7V1+Q=="; + url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.9.4.tgz"; + sha512 = "C7nL+AVA2ltmRhFdAb6yinXzjumRIAyaNi1p5QyZpythrg6+GThxZS/We+s8GIA000uIrPMvesuHCE+dGxkssw=="; }; dependencies = [ sources."@babel/code-frame-7.16.7" @@ -82336,10 +84065,10 @@ in sources."@babel/parser-7.17.3" sources."@babel/template-7.16.7" sources."@babel/types-7.17.0" - sources."@cdktf/hcl2cdk-0.9.1" - sources."@cdktf/hcl2json-0.9.1" - sources."@cdktf/provider-generator-0.9.1" - (sources."@jsii/check-node-1.54.0" // { + sources."@cdktf/hcl2cdk-0.9.4" + sources."@cdktf/hcl2json-0.9.4" + sources."@cdktf/provider-generator-0.9.4" + (sources."@jsii/check-node-1.55.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -82349,11 +84078,11 @@ in sources."supports-color-7.2.0" ]; }) - sources."@jsii/spec-1.54.0" + sources."@jsii/spec-1.55.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/node-fetch-2.6.1" sources."@xmldom/xmldom-0.8.1" sources."ansi-regex-5.0.1" @@ -82367,7 +84096,7 @@ in sources."call-bind-1.0.2" sources."camelcase-6.3.0" sources."case-1.6.3" - sources."cdktf-0.9.1" + sources."cdktf-0.9.4" sources."chalk-2.4.2" sources."cliui-6.0.0" sources."clone-2.1.2" @@ -82381,8 +84110,8 @@ in sources."combined-stream-1.0.8" sources."commonmark-0.30.0" sources."concat-map-0.0.1" - sources."constructs-10.0.68" - sources."date-format-4.0.3" + sources."constructs-10.0.84" + sources."date-format-4.0.4" sources."debug-4.3.3" sources."decamelize-1.2.0" sources."deep-equal-2.0.5" @@ -82414,12 +84143,12 @@ in sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."graceful-fs-4.2.9" - sources."graphology-0.23.2" + sources."graphology-0.24.1" sources."graphology-types-0.21.2" sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -82442,14 +84171,14 @@ in sources."is-string-1.0.7" sources."is-symbol-1.0.4" sources."is-typed-array-1.1.8" - sources."is-valid-domain-0.1.5" + sources."is-valid-domain-0.1.6" sources."is-weakmap-2.0.1" sources."is-weakref-1.0.2" sources."is-weakset-2.0.2" sources."isarray-2.0.5" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" - (sources."jsii-1.54.0" // { + (sources."jsii-1.55.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -82467,11 +84196,11 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-pacmak-1.54.0" // { + (sources."jsii-pacmak-1.55.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."cliui-7.0.4" - sources."codemaker-1.54.0" + sources."codemaker-1.55.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."decamelize-5.0.1" @@ -82485,7 +84214,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-reflect-1.54.0" // { + (sources."jsii-reflect-1.55.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -82503,7 +84232,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-rosetta-1.54.0" // { + (sources."jsii-rosetta-1.55.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."cliui-7.0.4" @@ -82518,7 +84247,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-srcmak-0.1.482" // { + (sources."jsii-srcmak-0.1.499" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -82529,7 +84258,7 @@ in sources."jsonfile-4.0.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" - sources."log4js-6.4.1" + sources."log4js-6.4.2" sources."lru-cache-6.0.0" sources."mdurl-1.0.1" sources."merge2-1.4.1" @@ -82547,7 +84276,7 @@ in sources."object.assign-4.1.2" sources."obliterator-2.0.2" sources."once-1.4.0" - sources."oo-ascii-tree-1.54.0" + sources."oo-ascii-tree-1.55.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" @@ -82575,9 +84304,9 @@ in sources."sort-json-2.0.1" sources."source-map-0.5.7" sources."spdx-license-list-6.4.0" - (sources."streamroller-3.0.2" // { + (sources."streamroller-3.0.4" // { dependencies = [ - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."jsonfile-6.1.0" sources."universalify-2.0.0" ]; @@ -82620,7 +84349,7 @@ in sources."color-name-1.1.4" sources."wrap-ansi-7.0.0" sources."y18n-5.0.8" - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" ]; }) (sources."yargs-parser-18.1.3" // { @@ -82957,10 +84686,10 @@ in coc-eslint = nodeEnv.buildNodePackage { name = "coc-eslint"; packageName = "coc-eslint"; - version = "1.5.6"; + version = "1.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/coc-eslint/-/coc-eslint-1.5.6.tgz"; - sha512 = "FXi6gZE0NpiPeFoc3BW4BBv33KA2Vl8JFltWb2i9TXS3zXWXfIilRFh7iQiFclIAYaQxO/i6qbaSqatd6+BksA=="; + url = "https://registry.npmjs.org/coc-eslint/-/coc-eslint-1.5.7.tgz"; + sha512 = "QA6ZdSnW9ZHmQcaDF0+KZj9FnoJJFksk6t76VpXtBZUhzlRPoEWkpNPoVaN4uXwefMN6br4eLBxhVWW8gp8w4w=="; }; buildInputs = globalBuildInputs; meta = { @@ -83057,10 +84786,10 @@ in coc-git = nodeEnv.buildNodePackage { name = "coc-git"; packageName = "coc-git"; - version = "2.4.7"; + version = "2.4.9"; src = fetchurl { - url = "https://registry.npmjs.org/coc-git/-/coc-git-2.4.7.tgz"; - sha512 = "rtt2W7g8oTfg1ZAIu+Y3gDqI305j68edgJJjWpdTSQHZXq2i9T0keaWHZAIdgV819wxTcBoaghCLNjDf1rPHJA=="; + url = "https://registry.npmjs.org/coc-git/-/coc-git-2.4.9.tgz"; + sha512 = "erTk5v3v8MRPCvgkBJ8K4YtUOiVU31oZz8HN+ioNG9PdcIwJzGMRyMgj8qYPsiNk2nhg63kyyl5x762q2FgjyQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -83126,7 +84855,7 @@ in sha512 = "HtFYiBx2ZIFairTsfDwLsMUTGwlH498VzAipWZeCOIGf7ZXetEbv0t+wr7IAy2KMIwhlmzoMsi5aHSlUupxGHA=="; }; dependencies = [ - sources."typescript-4.5.5" + sources."typescript-4.6.2" ]; buildInputs = globalBuildInputs; meta = { @@ -83247,13 +84976,13 @@ in coc-metals = nodeEnv.buildNodePackage { name = "coc-metals"; packageName = "coc-metals"; - version = "1.0.12"; + version = "1.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/coc-metals/-/coc-metals-1.0.12.tgz"; - sha512 = "mRjStj+wjmqp9Lb3cDYegz+cavykWNYQf1ecdwrF2HEtbKVIcc+k62NS5wM6QVB5Y6FD2OxjPNWcoQmIFM1cfQ=="; + url = "https://registry.npmjs.org/coc-metals/-/coc-metals-1.0.14.tgz"; + sha512 = "zFExh1wGAZl4LXSp76NAjWORO9Tyhfw8WtALnhDv741p4tjWjVSEl6GmXTQN0U0tXz8UZ8ln2rL2OaxOdgMCTA=="; }; dependencies = [ - sources."@chemzqm/neovim-5.7.4" + sources."@chemzqm/neovim-5.7.5" sources."@tootallnate/once-1.1.2" sources."agent-base-6.0.2" sources."arch-2.2.0" @@ -83282,7 +85011,7 @@ in sources."which-1.3.1" ]; }) - sources."date-format-4.0.3" + sources."date-format-4.0.4" sources."debounce-1.2.1" sources."debug-4.3.3" sources."deep-extend-0.6.0" @@ -83298,7 +85027,7 @@ in sources."flatted-3.2.5" sources."follow-redirects-1.14.9" sources."fp-ts-2.11.8" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" (sources."fstream-1.0.12" // { @@ -83315,7 +85044,7 @@ in sources."graceful-fs-4.2.9" sources."has-1.0.3" sources."has-bigints-1.0.1" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.0" @@ -83351,7 +85080,7 @@ in ]; }) sources."lodash-4.17.21" - sources."log4js-6.4.1" + sources."log4js-6.4.2" sources."lru-cache-6.0.0" sources."metals-languageclient-0.4.2" sources."minimatch-3.1.2" @@ -83401,7 +85130,7 @@ in sources."shell-quote-1.7.3" sources."side-channel-1.0.4" sources."signal-exit-3.0.7" - sources."streamroller-3.0.2" + sources."streamroller-3.0.4" sources."string.prototype.trimend-1.0.4" sources."string.prototype.trimstart-1.0.4" (sources."string_decoder-1.1.1" // { @@ -83466,10 +85195,10 @@ in coc-prettier = nodeEnv.buildNodePackage { name = "coc-prettier"; packageName = "coc-prettier"; - version = "9.2.2"; + version = "9.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/coc-prettier/-/coc-prettier-9.2.2.tgz"; - sha512 = "0GjqQhdKO/5auaoZVnnUbgf1eyxfBcTmHJ7jj0eApzVCYwMLcXk52HVMfDSUpeB1ySEzhwQrxBbGZZyStdISjQ=="; + url = "https://registry.npmjs.org/coc-prettier/-/coc-prettier-9.2.3.tgz"; + sha512 = "LkwQTBlD/chH0BTl7zFMw+M1CKbVIy8W49nVLuB+wmgS3dqnKZo58PRTYkcX2X25/FIWOh/oMSjWoZ8cTck8zQ=="; }; dependencies = [ sources."prettier-2.5.1" @@ -83487,13 +85216,13 @@ in coc-pyright = nodeEnv.buildNodePackage { name = "coc-pyright"; packageName = "coc-pyright"; - version = "1.1.220"; + version = "1.1.228"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.220.tgz"; - sha512 = "M0GVuo8jgQxI/YqkExByeAkjwEvu8uqGicYD4zRctxU/THd1CQUvIWWFDKB1a7co8sCntZlMnhqqxAF4CLyYQw=="; + url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.228.tgz"; + sha512 = "msCM17jXDDyaTW+wmSRq9DSgkIwj6foeOdQwn37Ny7B2+7iKCsWv0/GmLYj7fZe+is9hXjeGety9dF6tQq+4Wg=="; }; dependencies = [ - sources."pyright-1.1.223" + sources."pyright-1.1.228" ]; buildInputs = globalBuildInputs; meta = { @@ -83567,10 +85296,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.60.0"; + version = "0.60.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.60.0.tgz"; - sha512 = "GbRP3O/ZmnjiAnPDtqoQ+jJIzgCwinENp8lxlQdSPkXjW2vwgd4DTkYLU2p3/0BMoHn9zNCzM5iBO+OLei5upA=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.60.1.tgz"; + sha512 = "wEVUE817neA7EpWGZwCYhzUbcJTHyFBihyfljCPIqTTxWF/zcctuhKhzsPzyhrKk18sbX0pBFO+/aubgwBQrow=="; }; buildInputs = globalBuildInputs; meta = { @@ -83603,10 +85332,10 @@ in coc-snippets = nodeEnv.buildNodePackage { name = "coc-snippets"; packageName = "coc-snippets"; - version = "2.4.8"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.4.8.tgz"; - sha512 = "Ku7Hf2MYJwYGuGMz6Qt9k46NQd+9+VcF0MeKuVTpIPtVIaKqRtKg6alDL+less7r6U2twIKWQTdYeqRCZBLnag=="; + url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-3.0.2.tgz"; + sha512 = "AQslAPlptSdPE0kTlM146EFnpeS491MqJmYa/O/vmlhd30aQidJmC79wBgrmpGj8T5ergsetb59uFnE3iuW+GQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -83654,7 +85383,7 @@ in sources."@babel/helper-get-function-arity-7.16.7" sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-module-transforms-7.17.6" sources."@babel/helper-simple-access-7.16.7" sources."@babel/helper-split-export-declaration-7.16.7" sources."@babel/helper-validator-identifier-7.16.7" @@ -83701,11 +85430,11 @@ in ]; }) sources."braces-3.0.2" - sources."browserslist-4.19.3" + sources."browserslist-4.20.0" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001312" + sources."caniuse-lite-1.0.30001314" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -83742,7 +85471,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.4.71" + sources."electron-to-chromium-1.4.82" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -83983,10 +85712,10 @@ in coc-tabnine = nodeEnv.buildNodePackage { name = "coc-tabnine"; packageName = "coc-tabnine"; - version = "1.3.6"; + version = "1.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tabnine/-/coc-tabnine-1.3.6.tgz"; - sha512 = "6yKBny54MoGpm2bWwx2SX8O8cYjFgcQtfxg8klZoh1Nhxjamo2eNALjyvtOc/N9o7Mh+w/hn4nApXiwoJZqy0g=="; + url = "https://registry.npmjs.org/coc-tabnine/-/coc-tabnine-1.3.7.tgz"; + sha512 = "aLh9A6/r1/1QZT/1lJnaLdShGHRrCCb3HA57UYeFR0cD1xjRY3YupfmsOwVSbpqv6AufEXeOdbA2enoVhRFY8g=="; }; buildInputs = globalBuildInputs; meta = { @@ -84113,13 +85842,13 @@ in coc-tsserver = nodeEnv.buildNodePackage { name = "coc-tsserver"; packageName = "coc-tsserver"; - version = "1.9.12"; + version = "1.9.14"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.9.12.tgz"; - sha512 = "6eLxc/n1kfGPZz6hQNr4rT2b8CYHOsYSdrylJ3bxhdjA9sUmzF5Rjutjyz/4WKY7saVu30wmvfjdtPZDTyQUFw=="; + url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.9.14.tgz"; + sha512 = "MiyV1Tq5Jpj6P0t3PVb3IFyrfOm93E29Oz90nCfSdMBW+yY0U4H4uE5V9AKO3zhVFhzHRwalYfaFxf/6VCmkgA=="; }; dependencies = [ - sources."typescript-4.5.5" + sources."typescript-4.6.2" ]; buildInputs = globalBuildInputs; meta = { @@ -84250,7 +85979,7 @@ in sources."globals-13.12.1" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."ignore-4.0.6" sources."import-fresh-3.3.0" @@ -84330,7 +86059,7 @@ in sources."tsutils-2.29.0" sources."type-check-0.4.0" sources."type-fest-0.20.2" - sources."typescript-4.5.5" + sources."typescript-4.6.2" sources."uri-js-4.4.1" sources."v8-compile-cache-2.3.0" sources."vls-0.7.6" @@ -84376,10 +86105,10 @@ in coc-vimtex = nodeEnv.buildNodePackage { name = "coc-vimtex"; packageName = "coc-vimtex"; - version = "1.1.1"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/coc-vimtex/-/coc-vimtex-1.1.1.tgz"; - sha512 = "mSnoYlb0J41LG6uTgGlLOj/jM4wEYKv1IhP0p7LUo+eZSzdlWuuP2r+zmNbd+MeN/k5ftcgahVSLaUv5QVtpsA=="; + url = "https://registry.npmjs.org/coc-vimtex/-/coc-vimtex-1.1.4.tgz"; + sha512 = "w3bJrPoNkx5uiydRRPQ5Xqx01voizi0CxTh7/V7MJsuTP+2KNHRselm3cZcit79OyzO9rF1R0PGlDwLgPf54gg=="; }; buildInputs = globalBuildInputs; meta = { @@ -84455,7 +86184,7 @@ in sha512 = "uPhR9IKtN1z6gt9mpRH5OAdYjJQgQq7CCQpm5VmCpLe2QdGDzi4xfB3ybXGaBRX+UN4whtz3pZvgZssJvBwcqQ=="; }; dependencies = [ - sources."@xstate/fsm-1.6.4" + sources."@xstate/fsm-1.6.5" sources."ansi-styles-3.2.1" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" @@ -84984,7 +86713,7 @@ in sources."through2-4.0.2" sources."trim-newlines-3.0.1" sources."type-fest-0.18.1" - sources."uglify-js-3.15.1" + sources."uglify-js-3.15.3" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."validate-npm-package-license-3.0.4" @@ -85033,7 +86762,7 @@ in sources."abbrev-1.1.1" sources."accepts-1.3.8" sources."agent-base-6.0.2" - sources."agentkeepalive-4.2.0" + sources."agentkeepalive-4.2.1" sources."aggregate-error-3.1.0" sources."ajv-6.12.6" (sources."ajv-formats-2.1.1" // { @@ -85240,7 +86969,7 @@ in sources."form-data-2.3.3" sources."forwarded-0.2.0" sources."fresh-0.5.2" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" @@ -85468,7 +87197,7 @@ in }) sources."read-1.0.7" sources."read-chunk-3.2.0" - sources."read-package-json-4.1.1" + sources."read-package-json-4.1.2" sources."read-package-json-fast-2.0.3" sources."readable-stream-2.3.7" sources."registry-auth-token-4.2.1" @@ -85535,7 +87264,7 @@ in sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."systeminformation-5.11.4" + sources."systeminformation-5.11.7" sources."tar-6.1.11" sources."through-2.3.8" sources."tmp-0.2.1" @@ -85618,362 +87347,123 @@ in cpy-cli = nodeEnv.buildNodePackage { name = "cpy-cli"; packageName = "cpy-cli"; - version = "3.1.1"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cpy-cli/-/cpy-cli-3.1.1.tgz"; - sha512 = "HCpNdBkQy3rw+uARLuIf0YurqsMXYzBa9ihhSAuxYJcNIrqrSq3BstPfr0cQN38AdMrQiO9Dp4hYy7GtGJsLPg=="; + url = "https://registry.npmjs.org/cpy-cli/-/cpy-cli-4.1.0.tgz"; + sha512 = "JA6bth6/mxPCa19SrWkIuPEBrea8vO9g1v0qhmCLnAKOfTcsNk5/X3W1o9aZuOHgugRcxdyR67rO4Gw/DA+4Qg=="; }; dependencies = [ sources."@babel/code-frame-7.16.7" sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/highlight-7.16.10" - sources."@mrmlnc/readdir-enhanced-2.2.1" - sources."@nodelib/fs.stat-1.1.3" - sources."@types/glob-7.2.0" - sources."@types/minimatch-3.0.5" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.8" sources."@types/minimist-1.2.2" - sources."@types/node-17.0.18" sources."@types/normalize-package-data-2.4.1" - sources."aggregate-error-3.1.0" + sources."aggregate-error-4.0.0" sources."ansi-styles-3.2.1" - sources."arr-diff-4.0.0" - sources."arr-flatten-1.1.0" - sources."arr-union-3.1.0" - sources."array-union-1.0.2" - sources."array-uniq-1.0.3" - sources."array-unique-0.3.2" - sources."arrify-2.0.1" - sources."assign-symbols-1.0.0" - sources."atob-2.1.2" - sources."balanced-match-1.0.2" - (sources."base-0.11.2" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - sources."brace-expansion-1.1.11" - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."cache-base-1.0.1" - sources."call-me-maybe-1.0.1" - sources."camelcase-5.3.1" - sources."camelcase-keys-6.2.2" - sources."chalk-2.4.2" - (sources."class-utils-0.3.6" // { + sources."arrify-3.0.0" + sources."braces-3.0.2" + sources."camelcase-6.3.0" + sources."camelcase-keys-7.0.2" + (sources."chalk-2.4.2" // { dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."escape-string-regexp-1.0.5" ]; }) - sources."clean-stack-2.2.0" - sources."collection-visit-1.0.0" + sources."clean-stack-4.1.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."component-emitter-1.3.0" - sources."concat-map-0.0.1" - sources."copy-descriptor-0.1.1" - sources."cp-file-7.0.0" - sources."cpy-8.1.2" - sources."debug-2.6.9" - sources."decamelize-1.2.0" + sources."cp-file-9.1.0" + sources."cpy-9.0.1" + sources."decamelize-5.0.1" (sources."decamelize-keys-1.1.0" // { dependencies = [ + sources."decamelize-1.2.0" sources."map-obj-1.0.1" ]; }) - sources."decode-uri-component-0.2.0" - sources."define-property-2.0.2" - sources."dir-glob-2.2.2" + sources."dir-glob-3.0.1" sources."error-ex-1.3.2" - sources."escape-string-regexp-1.0.5" - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - (sources."extend-shallow-3.0.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - (sources."extglob-2.0.4" // { - dependencies = [ - sources."define-property-1.0.0" - sources."extend-shallow-2.0.1" - ]; - }) - sources."fast-glob-2.2.7" - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."find-up-4.1.0" - sources."for-in-1.0.2" - sources."fragment-cache-0.2.1" - sources."fs.realpath-1.0.0" + sources."escape-string-regexp-5.0.0" + sources."fast-glob-3.2.11" + sources."fastq-1.13.0" + sources."fill-range-7.0.1" + sources."find-up-5.0.0" sources."function-bind-1.1.1" - sources."get-value-2.0.6" - sources."glob-7.2.0" - (sources."glob-parent-3.1.0" // { - dependencies = [ - sources."is-glob-3.1.0" - ]; - }) - sources."glob-to-regexp-0.3.0" - sources."globby-9.2.0" + sources."glob-parent-5.1.2" + sources."globby-13.1.1" sources."graceful-fs-4.2.9" sources."hard-rejection-2.1.0" sources."has-1.0.3" sources."has-flag-3.0.0" - (sources."has-glob-1.0.0" // { - dependencies = [ - sources."is-glob-3.1.0" - ]; - }) - sources."has-value-1.0.0" - (sources."has-values-1.0.0" // { - dependencies = [ - sources."kind-of-4.0.0" - ]; - }) - sources."hosted-git-info-2.8.9" - sources."ignore-4.0.6" - sources."indent-string-4.0.0" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."is-accessor-descriptor-1.0.0" + sources."hosted-git-info-4.1.0" + sources."ignore-5.2.0" + sources."indent-string-5.0.0" sources."is-arrayish-0.2.1" - sources."is-buffer-1.1.6" sources."is-core-module-2.8.1" - sources."is-data-descriptor-1.0.0" - sources."is-descriptor-1.0.2" - sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) + sources."is-number-7.0.0" sources."is-plain-obj-1.1.0" - sources."is-plain-object-2.0.4" - sources."is-windows-1.0.2" - sources."isarray-1.0.0" - sources."isobject-3.0.1" sources."js-tokens-4.0.0" sources."json-parse-even-better-errors-2.3.1" - sources."junk-3.1.0" + sources."junk-4.0.0" sources."kind-of-6.0.3" sources."lines-and-columns-1.2.4" - sources."locate-path-5.0.0" + sources."locate-path-6.0.0" + sources."lru-cache-6.0.0" sources."make-dir-3.1.0" - sources."map-cache-0.2.2" sources."map-obj-4.3.0" - sources."map-visit-1.0.0" - sources."meow-6.1.1" + sources."meow-10.1.2" sources."merge2-1.4.1" - sources."micromatch-3.1.10" + sources."micromatch-4.0.4" sources."min-indent-1.0.1" - sources."minimatch-3.1.2" (sources."minimist-options-4.1.0" // { dependencies = [ sources."arrify-1.0.1" ]; }) - (sources."mixin-deep-1.3.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - sources."ms-2.0.0" - sources."nanomatch-1.2.13" sources."nested-error-stacks-2.1.0" - (sources."normalize-package-data-2.5.0" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) - (sources."object-copy-0.1.0" // { - dependencies = [ - sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) - sources."kind-of-3.2.2" - ]; - }) - sources."object-visit-1.0.1" - sources."object.pick-1.3.0" - sources."once-1.4.0" - (sources."p-all-2.1.0" // { + (sources."normalize-package-data-3.0.3" // { dependencies = [ - sources."p-map-2.1.0" + sources."semver-7.3.5" ]; }) sources."p-event-4.2.0" - (sources."p-filter-2.1.0" // { - dependencies = [ - sources."p-map-2.1.0" - ]; - }) + sources."p-filter-3.0.0" sources."p-finally-1.0.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-map-3.0.0" + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" + sources."p-map-5.3.0" sources."p-timeout-3.2.0" - sources."p-try-2.2.0" sources."parse-json-5.2.0" - sources."pascalcase-0.1.1" - sources."path-dirname-1.0.2" sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.7" - (sources."path-type-3.0.0" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) - sources."pify-4.0.1" - sources."posix-character-classes-0.1.1" - sources."quick-lru-4.0.1" - (sources."read-pkg-5.2.0" // { - dependencies = [ - sources."type-fest-0.6.0" - ]; - }) - (sources."read-pkg-up-7.0.1" // { - dependencies = [ - sources."type-fest-0.8.1" - ]; - }) - sources."redent-3.0.0" - sources."regex-not-1.0.2" - sources."repeat-element-1.1.4" - sources."repeat-string-1.6.1" - sources."resolve-1.22.0" - sources."resolve-url-0.2.1" - sources."ret-0.1.15" - sources."safe-regex-1.1.0" + sources."path-type-4.0.0" + sources."picomatch-2.3.1" + sources."queue-microtask-1.2.3" + sources."quick-lru-5.1.1" + sources."read-pkg-6.0.0" + sources."read-pkg-up-8.0.0" + sources."redent-4.0.0" + sources."reusify-1.0.4" + sources."run-parallel-1.2.0" sources."semver-6.3.0" - (sources."set-value-2.0.1" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."slash-2.0.0" - (sources."snapdragon-0.8.2" // { - dependencies = [ - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - (sources."snapdragon-node-2.1.1" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - (sources."snapdragon-util-3.0.1" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."source-map-0.5.7" - sources."source-map-resolve-0.5.3" - sources."source-map-url-0.4.1" + sources."slash-4.0.0" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.11" - sources."split-string-3.1.0" - (sources."static-extend-0.1.2" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - sources."strip-indent-3.0.0" + sources."strip-indent-4.0.0" sources."supports-color-5.5.0" - sources."supports-preserve-symlinks-flag-1.0.0" - (sources."to-object-path-0.3.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."to-regex-3.0.2" - sources."to-regex-range-2.1.1" - sources."trim-newlines-3.0.1" - sources."type-fest-0.13.1" - sources."union-value-1.0.1" - (sources."unset-value-1.0.0" // { - dependencies = [ - (sources."has-value-0.3.1" // { - dependencies = [ - sources."isobject-2.1.0" - ]; - }) - sources."has-values-0.1.4" - ]; - }) - sources."urix-0.1.0" - sources."use-3.1.1" + sources."to-regex-range-5.0.1" + sources."trim-newlines-4.0.2" + sources."type-fest-1.4.0" sources."validate-npm-package-license-3.0.4" - sources."wrappy-1.0.2" - sources."yargs-parser-18.1.3" + sources."yallist-4.0.0" + sources."yargs-parser-20.2.9" + sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -86004,7 +87494,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -86035,7 +87525,7 @@ in sources."debug-3.2.7" sources."define-properties-1.1.3" sources."delayed-stream-1.0.0" - sources."es5-ext-0.10.53" + sources."es5-ext-0.10.58" sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" (sources."es6-set-0.1.5" // { @@ -86062,7 +87552,7 @@ in sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."iconv-lite-0.4.24" sources."inherits-2.0.4" (sources."inquirer-3.3.0" // { @@ -86091,7 +87581,7 @@ in sources."minimist-1.2.5" sources."ms-2.1.3" sources."mute-stream-0.0.7" - sources."next-tick-1.0.0" + sources."next-tick-1.1.0" sources."object-assign-4.1.1" sources."object-inspect-1.12.0" sources."object-keys-1.1.1" @@ -86177,7 +87667,7 @@ in sources."debug-2.6.9" sources."duplexer2-0.0.2" sources."envinfo-7.8.1" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."fs.realpath-1.0.0" sources."fstream-1.0.12" sources."fstream-ignore-1.0.5" @@ -86300,7 +87790,7 @@ in sources."@cspell/dict-dart-1.1.0" sources."@cspell/dict-django-2.0.0" sources."@cspell/dict-dotnet-2.0.0" - sources."@cspell/dict-elixir-2.0.0" + sources."@cspell/dict-elixir-2.0.1" sources."@cspell/dict-en-gb-1.1.33" sources."@cspell/dict-en_us-2.1.7" sources."@cspell/dict-filetypes-2.0.1" @@ -86321,10 +87811,10 @@ in sources."@cspell/dict-public-licenses-1.0.4" sources."@cspell/dict-python-2.0.6" sources."@cspell/dict-r-1.0.2" - sources."@cspell/dict-ruby-2.0.0" + sources."@cspell/dict-ruby-2.0.1" sources."@cspell/dict-rust-2.0.0" sources."@cspell/dict-scala-2.0.0" - sources."@cspell/dict-software-terms-2.1.1" + sources."@cspell/dict-software-terms-2.1.3" sources."@cspell/dict-swift-1.0.2" sources."@cspell/dict-typescript-2.0.0" sources."@cspell/dict-vue-2.0.2" @@ -86363,7 +87853,7 @@ in sources."find-up-5.0.0" sources."flat-cache-3.0.4" sources."flatted-3.2.5" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."fs.realpath-1.0.0" sources."gensequence-3.1.1" sources."get-stdin-8.0.0" @@ -86704,7 +88194,7 @@ in sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -87121,7 +88611,7 @@ in sources."@babel/helper-annotate-as-pure-7.16.7" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.7" sources."@babel/helper-compilation-targets-7.16.7" - sources."@babel/helper-create-class-features-plugin-7.17.1" + sources."@babel/helper-create-class-features-plugin-7.17.6" sources."@babel/helper-create-regexp-features-plugin-7.17.0" sources."@babel/helper-define-polyfill-provider-0.3.1" sources."@babel/helper-environment-visitor-7.16.7" @@ -87131,7 +88621,7 @@ in sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-member-expression-to-functions-7.16.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-module-transforms-7.17.6" sources."@babel/helper-optimise-call-expression-7.16.7" sources."@babel/helper-plugin-utils-7.16.7" sources."@babel/helper-remap-async-to-generator-7.16.8" @@ -87149,7 +88639,7 @@ in sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7" sources."@babel/plugin-proposal-async-generator-functions-7.16.8" sources."@babel/plugin-proposal-class-properties-7.16.7" - sources."@babel/plugin-proposal-class-static-block-7.16.7" + sources."@babel/plugin-proposal-class-static-block-7.17.6" sources."@babel/plugin-proposal-dynamic-import-7.16.7" sources."@babel/plugin-proposal-export-namespace-from-7.16.7" sources."@babel/plugin-proposal-json-strings-7.16.7" @@ -87220,7 +88710,7 @@ in sources."@babel/template-7.16.7" sources."@babel/traverse-7.17.3" sources."@babel/types-7.17.0" - sources."@blueprintjs/colors-4.0.0-beta.3" + sources."@blueprintjs/colors-4.0.0-rc.0" sources."@blueprintjs/core-3.53.0" sources."@blueprintjs/icons-3.32.0" sources."@deltachat/message_parser_wasm-0.1.0" @@ -87250,11 +88740,12 @@ in sources."@types/geojson-7946.0.8" sources."@types/mapbox-gl-0.54.5" sources."@types/mime-types-2.1.1" + sources."@types/minimist-1.2.2" sources."@types/node-14.18.12" sources."@types/node-fetch-2.6.1" sources."@types/prop-types-15.7.4" - sources."@types/rc-1.2.0" - sources."@types/react-16.14.23" + sources."@types/rc-1.2.1" + sources."@types/react-16.14.24" sources."@types/react-dom-16.9.14" sources."@types/react-window-1.8.5" sources."@types/react-window-infinite-loader-1.0.6" @@ -87296,7 +88787,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."browserslist-4.19.3" + sources."browserslist-4.20.0" sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.2" sources."cache-base-1.0.1" @@ -87307,7 +88798,7 @@ in ]; }) sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001312" + sources."caniuse-lite-1.0.30001314" sources."chalk-2.4.2" sources."chokidar-2.1.8" (sources."class-utils-0.3.6" // { @@ -87356,7 +88847,7 @@ in sources."core-util-is-1.0.3" sources."crypto-random-string-1.0.0" sources."csscolorparser-1.0.3" - sources."csstype-3.0.10" + sources."csstype-3.0.11" sources."debounce-1.2.1" sources."debug-4.3.3" sources."decode-uri-component-0.2.0" @@ -87374,7 +88865,7 @@ in sources."duplexer3-0.1.4" sources."earcut-2.2.3" sources."electron-13.6.9" - sources."electron-to-chromium-1.4.71" + sources."electron-to-chromium-1.4.82" sources."emoji-js-clean-4.0.0" sources."emoji-mart-3.0.1" sources."emoji-regex-9.2.2" @@ -87471,7 +88962,7 @@ in sources."gud-1.0.0" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -87654,7 +89145,7 @@ in sources."rw-0.1.4" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" - (sources."sass-1.49.8" // { + (sources."sass-1.49.9" // { dependencies = [ sources."anymatch-3.1.2" sources."binary-extensions-2.2.0" @@ -87767,7 +89258,7 @@ in sources."type-fest-0.3.1" sources."typed-styles-0.0.7" sources."typedarray-0.0.6" - sources."typescript-4.5.5" + sources."typescript-4.6.2" sources."unicode-canonical-property-names-ecmascript-2.0.0" sources."unicode-match-property-ecmascript-2.0.0" sources."unicode-match-property-value-ecmascript-2.0.0" @@ -87787,7 +89278,7 @@ in }) sources."upath-1.2.0" sources."urix-0.1.0" - sources."url-parse-1.5.9" + sources."url-parse-1.5.10" sources."url-parse-lax-3.0.0" sources."use-3.1.1" sources."use-debounce-3.4.3" @@ -87928,11 +89419,11 @@ in sources."dockerfile-ast-0.4.2" sources."dockerfile-language-service-0.8.1" sources."dockerfile-utils-0.9.4" - sources."vscode-jsonrpc-8.0.0-next.6" - sources."vscode-languageserver-8.0.0-next.8" - (sources."vscode-languageserver-protocol-3.17.0-next.14" // { + sources."vscode-jsonrpc-8.0.0-next.7" + sources."vscode-languageserver-8.0.0-next.9" + (sources."vscode-languageserver-protocol-3.17.0-next.15" // { dependencies = [ - sources."vscode-languageserver-types-3.17.0-next.7" + sources."vscode-languageserver-types-3.17.0-next.8" ]; }) sources."vscode-languageserver-textdocument-1.0.4" @@ -87951,10 +89442,10 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.80.1"; + version = "6.81.0"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.80.1.tgz"; - sha512 = "s3E6aSo3DLkdrjuB4WhMDTzezvj/aLd+SBBQZMoZAX87u/2s/DnGjl9JLBJzhc+9zrhKAezYwu6d2p5lLF8WDQ=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.81.0.tgz"; + sha512 = "1arvWQ1t2RILTEa90GW3LAMkAEO5Vjw7i8+pFHs7tbFu16XclvTfEFoD2a9/YiB7CwZQPSGQKZy1XUEYqI21tg=="; }; dependencies = [ sources."@fast-csv/format-4.3.5" @@ -87966,7 +89457,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.920.0" + sources."aws-sdk-2.1085.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."base64-js-1.5.1" @@ -87979,7 +89470,7 @@ in sources."combined-stream-1.0.8" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" - sources."delay-4.4.1" + sources."delay-5.0.0" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" sources."eventemitter3-4.0.7" @@ -88008,7 +89499,7 @@ in sources."is-typedarray-1.0.0" sources."isarray-1.0.0" sources."isstream-0.1.2" - sources."jmespath-0.15.0" + sources."jmespath-0.16.0" sources."jsbn-0.1.1" sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" @@ -88045,7 +89536,7 @@ in ]; }) sources."request-2.88.2" - sources."requestretry-4.1.2" + sources."requestretry-7.0.2" sources."s3-stream-upload-2.0.2" sources."s3signed-0.1.0" sources."s3urls-1.5.2" @@ -88080,7 +89571,6 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.3.2" sources."verror-1.10.0" - sources."when-3.7.8" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" ]; @@ -88154,7 +89644,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@npmcli/fs-1.1.1" sources."@npmcli/move-file-1.1.2" - sources."@sindresorhus/is-4.4.0" + sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@tootallnate/once-1.1.2" sources."@types/cacheable-request-6.0.2" @@ -88162,12 +89652,12 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.9.2" sources."abbrev-1.1.1" sources."agent-base-6.0.2" - sources."agentkeepalive-4.2.0" + sources."agentkeepalive-4.2.1" sources."aggregate-error-3.1.0" sources."ajv-6.12.6" (sources."ansi-escapes-4.3.2" // { @@ -88335,7 +89825,7 @@ in }) sources."forever-agent-0.6.1" sources."form-data-2.3.3" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" @@ -88348,7 +89838,7 @@ in sources."universalify-0.1.2" ]; }) - sources."gauge-4.0.1" + sources."gauge-4.0.3" sources."get-caller-file-2.0.5" sources."get-installed-path-2.1.1" (sources."get-package-info-1.0.0" // { @@ -88392,7 +89882,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" - sources."inquirer-8.2.0" + sources."inquirer-8.2.1" sources."ip-1.1.5" sources."is-arrayish-0.2.1" sources."is-core-module-2.8.1" @@ -88562,7 +90052,7 @@ in sources."roarr-2.15.4" sources."run-async-2.4.1" sources."run-parallel-1.2.0" - sources."rxjs-7.5.4" + sources."rxjs-7.5.5" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-7.3.5" @@ -88650,7 +90140,7 @@ in sources."yallist-4.0.0" (sources."yargs-17.3.1" // { dependencies = [ - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" ]; }) sources."yargs-parser-20.2.9" @@ -88724,7 +90214,7 @@ in sources."@babel/helper-get-function-arity-7.16.7" sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-module-transforms-7.17.6" sources."@babel/helper-plugin-utils-7.16.7" sources."@babel/helper-simple-access-7.16.7" sources."@babel/helper-split-export-declaration-7.16.7" @@ -88763,13 +90253,13 @@ in sources."auto-bind-4.0.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.19.3" + sources."browserslist-4.20.0" sources."caller-callsite-4.1.0" sources."caller-path-3.0.1" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001312" + sources."caniuse-lite-1.0.30001314" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -88798,7 +90288,7 @@ in ]; }) sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.4.71" + sources."electron-to-chromium-1.4.82" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -88924,7 +90414,7 @@ in sources."punycode-2.1.1" sources."quick-lru-4.0.1" sources."react-16.14.0" - sources."react-devtools-core-4.23.0" + sources."react-devtools-core-4.24.0" sources."react-is-16.13.1" sources."react-reconciler-0.26.2" (sources."read-pkg-5.2.0" // { @@ -89026,31 +90516,60 @@ in reconstructLock = true; }; "epgstation-../../applications/video/epgstation" = nodeEnv.buildNodePackage { - name = "EPGStation"; - packageName = "EPGStation"; - version = "1.7.5"; + name = "epgstation"; + packageName = "epgstation"; + version = "2.6.20"; src = ../../applications/video/epgstation; dependencies = [ - sources."@babel/code-frame-7.16.7" + sources."@babel/code-frame-7.12.11" sources."@babel/helper-validator-identifier-7.16.7" (sources."@babel/highlight-7.16.10" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."has-flag-3.0.0" sources."supports-color-5.5.0" ]; }) - 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.183.1" - sources."@fluentui/react-focus-7.18.2" - sources."@fluentui/react-window-provider-1.0.2" - sources."@fluentui/theme-1.7.4" - sources."@gar/promisify-1.1.3" - (sources."@gulp-sourcemaps/identity-map-1.0.2" // { + (sources."@chinachu/aribts-1.3.5-mirakurun.17" // { dependencies = [ - sources."normalize-path-2.1.1" + sources."iconv-lite-0.6.3" + ]; + }) + sources."@cspotcode/source-map-consumer-0.8.0" + sources."@cspotcode/source-map-support-0.7.0" + (sources."@eslint/eslintrc-0.4.3" // { + dependencies = [ + sources."ajv-6.12.6" + sources."debug-4.3.3" + sources."ignore-4.0.6" + sources."js-yaml-3.14.1" + sources."json-schema-traverse-0.4.1" + sources."ms-2.1.2" + sources."strip-json-comments-3.1.1" + ]; + }) + sources."@fluentui/date-time-utilities-8.4.0" + sources."@fluentui/dom-utilities-2.2.0" + sources."@fluentui/font-icons-mdl2-8.2.4" + sources."@fluentui/foundation-legacy-8.2.4" + sources."@fluentui/keyboard-key-0.4.0" + sources."@fluentui/merge-styles-8.5.0" + sources."@fluentui/react-8.60.3" + sources."@fluentui/react-focus-8.5.4" + sources."@fluentui/react-hooks-8.5.2" + sources."@fluentui/react-window-provider-2.2.0" + sources."@fluentui/set-version-8.2.0" + sources."@fluentui/style-utilities-8.6.4" + sources."@fluentui/theme-2.6.3" + sources."@fluentui/utilities-8.8.0" + (sources."@gulp-sourcemaps/identity-map-2.0.1" // { + dependencies = [ + sources."acorn-6.4.2" + sources."inherits-2.0.4" + sources."through2-3.0.2" ]; }) (sources."@gulp-sourcemaps/map-sources-1.0.0" // { @@ -89058,99 +90577,111 @@ in sources."normalize-path-2.1.1" ]; }) + (sources."@humanwhocodes/config-array-0.5.0" // { + dependencies = [ + sources."debug-4.3.3" + sources."ms-2.1.2" + ]; + }) + sources."@humanwhocodes/object-schema-1.2.1" sources."@microsoft/load-themed-styles-1.10.247" + sources."@node-rs/crc32-1.5.0" + sources."@node-rs/crc32-android-arm-eabi-1.5.0" + sources."@node-rs/crc32-android-arm64-1.5.0" + sources."@node-rs/crc32-darwin-arm64-1.5.0" + sources."@node-rs/crc32-darwin-x64-1.5.0" + sources."@node-rs/crc32-freebsd-x64-1.5.0" + sources."@node-rs/crc32-linux-arm-gnueabihf-1.5.0" + sources."@node-rs/crc32-linux-arm64-gnu-1.5.0" + sources."@node-rs/crc32-linux-arm64-musl-1.5.0" + sources."@node-rs/crc32-linux-x64-gnu-1.5.0" + sources."@node-rs/crc32-linux-x64-musl-1.5.0" + sources."@node-rs/crc32-win32-arm64-msvc-1.5.0" + sources."@node-rs/crc32-win32-ia32-msvc-1.5.0" + sources."@node-rs/crc32-win32-x64-msvc-1.5.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@npmcli/fs-1.1.1" - (sources."@npmcli/move-file-1.1.2" // { - dependencies = [ - sources."rimraf-3.0.2" - ]; - }) sources."@sindresorhus/is-0.14.0" + sources."@socket.io/base64-arraybuffer-1.0.2" + sources."@sqltools/formatter-1.2.3" sources."@szmarczak/http-timer-1.1.2" - sources."@types/basic-auth-1.1.3" - sources."@types/body-parser-1.19.0" - sources."@types/caseless-0.12.2" - sources."@types/chart.js-2.9.24" + sources."@tokenizer/token-0.3.0" + sources."@tsconfig/node10-1.0.8" + sources."@tsconfig/node12-1.0.9" + sources."@tsconfig/node14-1.0.1" + sources."@tsconfig/node16-1.0.2" + sources."@types/body-parser-1.19.1" + sources."@types/component-emitter-1.2.11" sources."@types/connect-3.4.35" - sources."@types/engine.io-3.1.7" - sources."@types/express-4.17.8" + sources."@types/cookie-0.4.1" + sources."@types/cors-2.8.12" + sources."@types/express-4.17.13" sources."@types/express-serve-static-core-4.17.28" - sources."@types/fancy-log-1.3.0" - sources."@types/glob-7.2.0" - sources."@types/hls.js-0.13.1" - sources."@types/js-yaml-3.12.5" + sources."@types/file-type-10.9.1" + sources."@types/js-yaml-4.0.4" sources."@types/json-schema-7.0.9" - sources."@types/lodash-4.14.161" - sources."@types/material-design-lite-1.1.16" + sources."@types/lodash-4.14.176" sources."@types/mime-1.3.2" - sources."@types/minimatch-3.0.5" - sources."@types/minimist-1.2.0" - sources."@types/mithril-2.0.3" - sources."@types/mkdirp-1.0.1" - sources."@types/multer-1.4.4" - sources."@types/mysql-2.15.15" - sources."@types/node-14.11.1" - sources."@types/pg-7.14.5" - sources."@types/pg-types-2.2.0" + sources."@types/minimist-1.2.2" + sources."@types/mkdirp-1.0.2" + sources."@types/mongodb-4.0.6" + sources."@types/multer-1.4.7" + sources."@types/node-16.11.6" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" - (sources."@types/request-2.48.5" // { + sources."@types/serve-static-1.13.10" + sources."@types/socket.io-3.0.1" + sources."@types/source-map-support-0.5.4" + sources."@types/sqlite3-3.1.7" + sources."@types/url-join-4.0.1" + sources."@types/uuid-3.4.10" + sources."@types/webidl-conversions-6.1.1" + sources."@types/whatwg-url-8.2.1" + sources."@types/ws-6.0.4" + (sources."@typescript-eslint/eslint-plugin-4.33.0" // { dependencies = [ - sources."form-data-2.5.1" + sources."debug-4.3.3" + sources."ms-2.1.2" ]; }) - sources."@types/serve-static-1.13.10" - sources."@types/socket.io-2.1.11" - sources."@types/socket.io-client-1.4.33" - sources."@types/sqlite3-3.1.6" - sources."@types/tough-cookie-4.0.1" - sources."@types/url-join-4.0.0" - sources."@uifabric/foundation-7.10.1" - sources."@uifabric/icons-7.6.2" - sources."@uifabric/merge-styles-7.19.2" - sources."@uifabric/react-hooks-7.14.0" - sources."@uifabric/set-version-7.0.24" - sources."@uifabric/styling-7.20.0" - sources."@uifabric/utilities-7.33.5" - 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."@xtuc/ieee754-1.2.0" - sources."@xtuc/long-4.2.2" + sources."@typescript-eslint/experimental-utils-4.33.0" + (sources."@typescript-eslint/parser-4.33.0" // { + dependencies = [ + sources."debug-4.3.3" + sources."ms-2.1.2" + ]; + }) + sources."@typescript-eslint/scope-manager-4.33.0" + sources."@typescript-eslint/types-4.33.0" + (sources."@typescript-eslint/typescript-estree-4.33.0" // { + dependencies = [ + sources."debug-4.3.3" + sources."ms-2.1.2" + ]; + }) + sources."@typescript-eslint/visitor-keys-4.33.0" sources."abbrev-1.1.1" sources."accepts-1.3.8" - sources."acorn-5.7.4" - sources."after-0.8.2" + sources."acorn-7.4.1" + sources."acorn-jsx-5.3.2" + sources."acorn-walk-8.2.0" sources."aggregate-error-3.1.0" - sources."ajv-6.12.6" - sources."ajv-errors-1.0.1" - sources."ajv-keywords-3.5.2" - sources."ansi-colors-1.1.0" + sources."ajv-8.10.0" + sources."ajv-formats-2.1.1" + sources."ansi-colors-4.1.1" sources."ansi-cyan-0.1.1" - sources."ansi-escapes-1.4.0" + (sources."ansi-escapes-4.3.2" // { + dependencies = [ + sources."type-fest-0.21.3" + ]; + }) sources."ansi-gray-0.1.1" sources."ansi-red-0.1.1" sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" + sources."ansi-styles-4.3.0" sources."ansi-wrap-0.1.0" + sources."any-promise-1.3.0" (sources."anymatch-2.0.0" // { dependencies = [ (sources."braces-2.3.2" // { @@ -89173,6 +90704,7 @@ in sources."to-regex-range-2.1.1" ]; }) + sources."app-root-path-3.0.0" sources."append-buffer-1.0.2" sources."append-field-1.0.0" sources."aproba-1.2.0" @@ -89184,7 +90716,10 @@ in sources."string_decoder-1.1.1" ]; }) + sources."arg-4.1.3" sources."argparse-1.0.10" + sources."arib-mpeg2ts-parser-3.0.13" + sources."arib-subtitle-timedmetadater-4.0.9" sources."aribts-2.1.12" sources."arr-diff-4.0.0" sources."arr-filter-1.1.2" @@ -89211,37 +90746,19 @@ in }) sources."array-union-2.1.0" sources."array-unique-0.3.2" - sources."arraybuffer.slice-0.0.7" sources."asn1-0.2.6" - (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."assert-plus-1.0.0" sources."assign-symbols-1.0.0" + sources."astral-regex-2.0.0" sources."async-done-1.3.2" sources."async-each-1.0.3" sources."async-limiter-1.0.1" sources."async-settle-1.0.0" sources."asynckit-0.4.0" - sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" - sources."b24.js-1.0.3" - sources."babel-polyfill-6.23.0" - (sources."babel-runtime-6.26.0" // { - dependencies = [ - sources."regenerator-runtime-0.11.1" - ]; - }) + sources."axios-0.24.0" sources."bach-1.2.0" sources."backo2-1.0.2" sources."balanced-match-1.0.2" @@ -89250,42 +90767,23 @@ in sources."define-property-1.0.0" ]; }) - sources."base64-arraybuffer-0.1.4" sources."base64-js-1.5.1" sources."base64id-2.0.0" sources."basic-auth-2.0.1" sources."bcrypt-pbkdf-1.0.2" - sources."better-assert-1.0.2" - sources."big.js-5.2.2" + sources."big-integer-1.6.51" sources."bignumber.js-9.0.0" sources."binary-extensions-1.13.1" sources."bindings-1.5.0" - sources."blob-0.0.5" sources."block-stream-0.0.9" - sources."bluebird-3.7.2" - sources."bn.js-5.2.0" sources."body-parser-1.19.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."brorand-1.1.0" - 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."inherits-2.0.4" - sources."safe-buffer-5.2.1" - ]; - }) - sources."browserify-zlib-0.2.0" + sources."bson-4.6.1" sources."buffer-5.7.1" sources."buffer-equal-1.0.0" sources."buffer-from-1.1.2" - sources."buffer-writer-2.0.0" - sources."buffer-xor-1.0.3" - sources."builtin-modules-1.1.1" - sources."builtin-status-codes-3.0.0" + sources."bufferutil-4.0.6" (sources."busboy-0.2.14" // { dependencies = [ sources."readable-stream-1.1.14" @@ -89293,17 +90791,6 @@ in ]; }) sources."bytes-3.1.0" - (sources."cacache-15.3.0" // { - dependencies = [ - sources."chownr-2.0.0" - sources."fs-minipass-2.1.0" - sources."minipass-3.1.6" - sources."minizlib-2.1.2" - sources."p-map-4.0.0" - sources."rimraf-3.0.2" - sources."tar-6.1.11" - ]; - }) sources."cache-base-1.0.1" (sources."cacheable-request-6.1.0" // { dependencies = [ @@ -89312,14 +90799,11 @@ in ]; }) sources."call-bind-1.0.2" - sources."callsite-1.0.0" + sources."callsites-3.1.0" sources."camelcase-3.0.0" sources."caseless-0.12.0" - sources."chalk-1.1.3" - sources."chardet-0.4.2" - sources."chart.js-2.9.3" - sources."chartjs-color-2.4.1" - sources."chartjs-color-string-0.6.0" + sources."chalk-4.1.2" + sources."chardet-0.7.0" (sources."chokidar-2.1.8" // { dependencies = [ sources."braces-2.3.2" @@ -89336,8 +90820,6 @@ in ]; }) sources."chownr-1.1.4" - 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" @@ -89355,14 +90837,24 @@ in sources."kind-of-5.1.0" ]; }) - sources."clean-css-4.2.3" sources."clean-stack-2.2.0" - sources."cli-cursor-2.1.0" - sources."cli-width-2.2.1" - (sources."cliui-3.2.0" // { + sources."cli-cursor-3.1.0" + (sources."cli-highlight-2.1.11" // { dependencies = [ - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" + sources."ansi-regex-5.0.1" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + sources."yargs-16.2.0" + ]; + }) + sources."cli-width-3.0.0" + (sources."cliui-7.0.4" // { + dependencies = [ + sources."ansi-regex-5.0.1" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."clone-2.1.2" @@ -89379,16 +90871,12 @@ in sources."code-point-at-1.1.0" sources."collection-map-1.0.0" sources."collection-visit-1.0.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."color-support-1.1.3" - sources."colors-1.4.0" sources."combined-stream-1.0.8" - sources."commander-2.20.3" - sources."commondir-1.0.1" - sources."component-bind-1.0.0" - sources."component-emitter-1.2.1" - sources."component-inherit-0.0.3" + sources."commander-7.2.0" + sources."component-emitter-1.3.0" sources."concat-map-0.0.1" (sources."concat-stream-1.6.2" // { dependencies = [ @@ -89397,40 +90885,33 @@ in sources."string_decoder-1.1.1" ]; }) - sources."concat-with-sourcemaps-1.1.0" - sources."console-browserify-1.2.0" sources."console-control-strings-1.1.0" - sources."constants-browserify-1.0.0" sources."content-disposition-0.5.3" sources."content-type-1.0.4" sources."convert-source-map-1.8.0" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - (sources."copy-concurrently-1.0.5" // { - dependencies = [ - sources."mkdirp-0.5.5" - ]; - }) sources."copy-descriptor-0.1.1" (sources."copy-props-2.0.5" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) - sources."core-js-2.6.12" sources."core-util-is-1.0.3" + sources."cors-2.8.5" sources."crc-3.8.0" - (sources."create-ecdh-4.0.4" // { + sources."create-require-1.1.1" + (sources."cross-spawn-7.0.3" // { dependencies = [ - sources."bn.js-4.12.0" + sources."which-2.0.2" + ]; + }) + (sources."css-3.0.0" // { + dependencies = [ + sources."inherits-2.0.4" + sources."source-map-resolve-0.6.0" ]; }) - sources."create-hash-1.2.0" - sources."create-hmac-1.1.7" - sources."crypto-browserify-3.12.0" - sources."css-2.2.4" - sources."css-ripple-effect-1.0.5" - sources."cyclist-1.0.1" sources."d-1.0.1" sources."dashdash-1.14.1" sources."date-format-3.0.0" @@ -89445,6 +90926,7 @@ in sources."decode-uri-component-0.2.0" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" + sources."deep-is-0.1.4" (sources."default-compare-1.0.0" // { dependencies = [ sources."kind-of-5.1.0" @@ -89454,15 +90936,15 @@ 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."rimraf-3.0.2" ]; }) sources."delayed-stream-1.0.0" sources."delegates-1.0.0" + sources."denque-2.0.1" sources."depd-1.1.2" - sources."des.js-1.0.1" sources."destroy-1.0.4" sources."detect-file-1.0.0" sources."detect-libc-1.0.3" @@ -89474,15 +90956,10 @@ in ]; }) sources."diff-4.0.2" - (sources."diffie-hellman-5.0.3" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) sources."difunc-0.0.4" sources."dir-glob-3.0.1" - sources."diskusage-1.1.3" - sources."domain-browser-1.2.0" + sources."diskusage-ng-1.0.2" + sources."doctrine-3.0.0" sources."dotenv-8.6.0" sources."duplexer3-0.1.4" (sources."duplexify-3.7.1" // { @@ -89495,60 +90972,73 @@ in sources."each-props-1.3.2" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - (sources."elliptic-6.5.4" // { - dependencies = [ - sources."bn.js-4.12.0" - sources."inherits-2.0.4" - ]; - }) - sources."emojis-list-3.0.0" + sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" - (sources."encoding-0.1.13" // { - dependencies = [ - sources."iconv-lite-0.6.3" - ]; - }) sources."end-of-stream-1.4.4" - (sources."engine.io-3.4.2" // { - dependencies = [ - sources."cookie-0.3.1" - sources."debug-4.1.1" - sources."ms-2.1.3" - ]; - }) - (sources."engine.io-client-3.4.4" // { + (sources."engine.io-6.0.1" // { dependencies = [ - sources."component-emitter-1.3.0" - sources."debug-3.1.0" - sources."parseqs-0.0.6" - sources."parseuri-0.0.6" - sources."ws-6.1.4" + sources."cookie-0.4.2" + sources."debug-4.3.3" + sources."ms-2.1.2" + sources."ws-8.2.3" ]; }) - sources."engine.io-parser-2.2.1" - sources."enhanced-resolve-4.5.0" - sources."errno-0.1.8" + sources."engine.io-parser-5.0.3" + sources."enhanced-resolve-5.9.2" + sources."enquirer-2.3.6" sources."error-ex-1.3.2" - sources."es5-ext-0.10.53" + sources."es5-ext-0.10.58" sources."es6-iterator-2.0.3" - sources."es6-promise-4.2.8" sources."es6-symbol-3.1.3" sources."es6-weak-map-2.0.3" + sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - sources."eslint-scope-4.0.3" + (sources."eslint-7.32.0" // { + dependencies = [ + sources."ajv-6.12.6" + sources."ansi-regex-5.0.1" + sources."debug-4.3.3" + sources."escape-string-regexp-4.0.0" + (sources."eslint-utils-2.1.0" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) + sources."ignore-4.0.6" + sources."js-yaml-3.14.1" + sources."json-schema-traverse-0.4.1" + sources."ms-2.1.2" + sources."strip-ansi-6.0.1" + sources."strip-json-comments-3.1.1" + ]; + }) + sources."eslint-config-prettier-8.3.0" + sources."eslint-plugin-prettier-3.4.1" + sources."eslint-scope-5.1.1" + sources."eslint-utils-3.0.0" + sources."eslint-visitor-keys-2.1.0" + (sources."espree-7.3.1" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) sources."esprima-4.0.1" + (sources."esquery-1.4.0" // { + dependencies = [ + sources."estraverse-5.3.0" + ]; + }) (sources."esrecurse-4.3.0" // { dependencies = [ sources."estraverse-5.3.0" ]; }) sources."estraverse-4.3.0" + sources."esutils-2.0.3" sources."etag-1.8.1" sources."event-emitter-0.3.5" sources."eventemitter3-2.0.3" - sources."events-3.3.0" - sources."evp_bytestokey-1.0.3" (sources."expand-brackets-2.1.4" // { dependencies = [ sources."define-property-0.2.5" @@ -89570,7 +91060,7 @@ in sources."expand-tilde-2.0.2" sources."express-4.17.1" sources."express-normalize-query-params-middleware-0.5.1" - sources."express-openapi-7.0.1" + sources."express-openapi-9.3.0" (sources."ext-1.6.0" // { dependencies = [ sources."type-2.6.0" @@ -89582,7 +91072,7 @@ in sources."is-extendable-1.0.1" ]; }) - sources."external-editor-2.2.0" + sources."external-editor-3.1.0" (sources."extglob-2.0.4" // { dependencies = [ sources."define-property-1.0.0" @@ -89592,16 +91082,18 @@ in sources."extsprintf-1.3.0" sources."fancy-log-1.3.3" sources."fast-deep-equal-3.1.3" + sources."fast-diff-1.2.0" sources."fast-glob-3.2.11" sources."fast-json-stable-stringify-2.1.0" - sources."fast-levenshtein-1.1.4" + sources."fast-levenshtein-2.0.6" sources."fastq-1.13.0" - sources."figgy-pudding-3.5.2" - sources."figures-2.0.0" + sources."figlet-1.5.2" + sources."figures-3.2.0" + sources."file-entry-cache-6.0.1" + sources."file-type-16.5.3" sources."file-uri-to-path-1.0.0" sources."fill-range-7.0.1" sources."finalhandler-1.1.2" - sources."find-cache-dir-3.3.2" sources."find-up-1.1.2" (sources."findup-sync-3.0.0" // { dependencies = [ @@ -89616,6 +91108,12 @@ in }) sources."fined-1.2.0" sources."flagged-respawn-1.0.1" + (sources."flat-cache-3.0.4" // { + dependencies = [ + sources."flatted-3.2.5" + sources."rimraf-3.0.2" + ]; + }) sources."flatted-2.0.2" (sources."flush-write-stream-1.1.1" // { dependencies = [ @@ -89624,6 +91122,7 @@ in sources."string_decoder-1.1.1" ]; }) + sources."follow-redirects-1.14.9" sources."for-in-1.0.2" sources."for-own-1.0.0" sources."forever-agent-0.6.1" @@ -89631,24 +91130,10 @@ in sources."forwarded-0.2.0" sources."fragment-cache-0.2.1" sources."fresh-0.5.2" - (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-extra-9.0.1" + sources."fs-extra-8.1.0" sources."fs-minipass-1.2.7" sources."fs-mkdirp-stream-1.0.0" - sources."fs-routes-7.0.1" - (sources."fs-write-stream-atomic-1.0.10" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) + sources."fs-routes-9.0.3" sources."fs.realpath-1.0.0" sources."fsevents-1.2.13" (sources."fstream-1.0.12" // { @@ -89657,13 +91142,9 @@ in ]; }) sources."function-bind-1.1.1" - (sources."gauge-2.7.4" // { - dependencies = [ - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" - ]; - }) - sources."get-caller-file-1.0.3" + sources."functional-red-black-tree-1.0.1" + sources."gauge-2.7.4" + sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" sources."get-stream-4.1.0" sources."get-value-2.0.6" @@ -89682,39 +91163,90 @@ in sources."glob-watcher-5.0.5" sources."global-modules-1.0.0" sources."global-prefix-1.0.2" - sources."globby-10.0.2" + sources."globals-13.12.1" + sources."globby-11.1.0" sources."glogg-1.0.2" sources."got-9.6.0" sources."graceful-fs-4.2.9" sources."gulp-4.0.2" - (sources."gulp-clean-css-4.3.0" // { + (sources."gulp-cli-2.3.0" // { dependencies = [ - sources."through2-3.0.1" + sources."ansi-colors-1.1.0" + sources."cliui-3.2.0" + sources."get-caller-file-1.0.3" + sources."wrap-ansi-2.1.0" + sources."y18n-3.2.2" + sources."yargs-7.1.2" + sources."yargs-parser-5.0.1" ]; }) - sources."gulp-cli-2.3.0" - sources."gulp-concat-2.6.1" - (sources."gulp-dart-sass-1.0.2" // { + (sources."gulp-eslint-6.0.0" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ajv-6.12.6" + sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" + sources."astral-regex-1.0.0" sources."chalk-2.4.2" - sources."strip-ansi-4.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + (sources."cross-spawn-6.0.5" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."debug-4.3.3" + sources."emoji-regex-7.0.3" + sources."eslint-6.8.0" + sources."eslint-utils-1.4.3" + sources."eslint-visitor-keys-1.3.0" + sources."espree-6.2.1" + sources."file-entry-cache-5.0.1" + sources."flat-cache-2.0.1" + sources."globals-12.4.0" + sources."has-flag-3.0.0" + sources."ignore-4.0.6" + sources."is-fullwidth-code-point-2.0.0" + sources."js-yaml-3.14.1" + sources."json-schema-traverse-0.4.1" + sources."levn-0.3.0" + sources."mkdirp-0.5.5" + sources."ms-2.1.2" + sources."optionator-0.8.3" + sources."path-key-2.0.1" + sources."prelude-ls-1.1.2" + sources."regexpp-2.0.1" + sources."rimraf-2.6.3" + sources."semver-6.3.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."slice-ansi-2.1.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + sources."strip-json-comments-3.1.1" sources."supports-color-5.5.0" + sources."table-5.4.6" + sources."type-check-0.3.2" + sources."type-fest-0.8.1" ]; }) (sources."gulp-plumber-1.2.1" // { dependencies = [ + sources."ansi-styles-2.2.1" sources."arr-diff-1.1.0" sources."arr-union-2.1.0" sources."array-slice-0.2.3" + sources."chalk-1.1.3" sources."extend-shallow-1.1.4" sources."kind-of-1.1.0" sources."plugin-error-0.1.2" + sources."supports-color-2.0.0" + ]; + }) + (sources."gulp-sourcemaps-3.0.0" // { + dependencies = [ + sources."acorn-6.4.2" ]; }) - sources."gulp-sourcemaps-2.6.5" - sources."gulp-tslint-8.1.4" (sources."gulp-typescript-5.0.1" // { dependencies = [ sources."ansi-colors-3.2.4" @@ -89725,17 +91257,16 @@ in }) sources."gulplog-1.0.0" sources."har-schema-2.0.0" - sources."har-validator-5.1.5" - sources."has-1.0.3" - sources."has-ansi-2.0.0" - (sources."has-binary2-1.0.3" // { + (sources."har-validator-5.1.5" // { dependencies = [ - sources."isarray-2.0.1" + sources."ajv-6.12.6" + sources."json-schema-traverse-0.4.1" ]; }) - sources."has-cors-1.1.0" - sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-1.0.3" + sources."has-ansi-2.0.0" + sources."has-flag-4.0.0" + sources."has-symbols-1.0.3" sources."has-unicode-2.0.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -89748,42 +91279,35 @@ in sources."kind-of-4.0.0" ]; }) - (sources."hash-base-3.1.0" // { - dependencies = [ - sources."inherits-2.0.4" - sources."safe-buffer-5.2.1" - ]; - }) - sources."hash.js-1.1.7" - (sources."hls-b24.js-0.12.3" // { - dependencies = [ - sources."eventemitter3-3.1.0" - ]; - }) - sources."hmac-drbg-1.0.1" + sources."highlight.js-10.7.3" sources."homedir-polyfill-1.0.3" sources."hosted-git-info-2.8.9" sources."http-cache-semantics-4.1.0" sources."http-errors-1.7.2" sources."http-signature-1.2.0" - sources."https-browserify-1.0.0" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" - sources."iferr-0.1.5" sources."ignore-5.2.0" sources."ignore-walk-3.0.4" - sources."immutable-4.0.0" + sources."import-fresh-3.3.0" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" - sources."indexof-0.0.1" - sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.8" - sources."inquirer-3.0.6" + (sources."inquirer-7.3.3" // { + dependencies = [ + sources."ansi-regex-5.0.1" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + ]; + }) sources."interpret-1.4.0" + sources."inversify-5.1.1" sources."invert-kv-1.0.0" sources."ip-1.1.5" + sources."ip-num-1.3.4" sources."ipaddr.js-1.9.1" sources."is-absolute-1.0.0" sources."is-accessor-descriptor-1.0.0" @@ -89796,7 +91320,7 @@ in sources."is-dir-1.0.0" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-2.0.0" + sources."is-fullwidth-code-point-1.0.0" sources."is-glob-4.0.3" sources."is-negated-glob-1.0.0" sources."is-number-7.0.0" @@ -89805,36 +91329,32 @@ in sources."is-plain-object-2.0.4" sources."is-promise-2.2.2" sources."is-relative-1.0.0" - sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" sources."is-unc-path-1.0.0" sources."is-utf8-0.2.1" sources."is-valid-glob-1.0.0" sources."is-windows-1.0.2" - sources."is-wsl-1.1.0" sources."isarray-0.0.1" sources."isexe-2.0.0" sources."isobject-3.0.1" + sources."isomorphic-ws-4.0.1" sources."isstream-0.1.2" - (sources."jest-worker-26.6.2" // { + sources."js-tokens-4.0.0" + (sources."js-yaml-4.1.0" // { dependencies = [ - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" + sources."argparse-2.0.1" ]; }) - sources."js-tokens-4.0.0" - sources."js-yaml-3.14.0" sources."jsbn-0.1.1" sources."json-buffer-3.0.0" - sources."json-parse-better-errors-1.0.2" sources."json-schema-0.4.0" - sources."json-schema-traverse-0.4.1" + sources."json-schema-traverse-1.0.0" sources."json-stable-stringify-without-jsonify-1.0.1" sources."json-stringify-safe-5.0.1" - sources."json5-1.0.1" - (sources."jsonfile-6.1.0" // { + sources."jsonfile-4.0.0" + (sources."jsonrpc2-ws-1.0.0-beta9" // { dependencies = [ - sources."universalify-2.0.0" + sources."eventemitter3-3.1.2" ]; }) sources."jsprim-1.4.2" @@ -89852,16 +91372,12 @@ in }) sources."lcid-1.0.0" sources."lead-1.0.0" + sources."levn-0.4.1" sources."liftoff-3.1.0" sources."load-json-file-1.1.0" - sources."loader-runner-2.4.0" - sources."loader-utils-1.4.0" - sources."locate-path-5.0.0" - sources."lodash-4.17.20" - sources."lodash.clone-4.5.0" - sources."lodash.clonedeep-4.5.0" + sources."lodash-4.17.21" sources."lodash.merge-4.6.2" - sources."lodash.some-4.6.0" + sources."lodash.truncate-4.4.2" (sources."log4js-6.3.0" // { dependencies = [ sources."debug-4.3.3" @@ -89872,14 +91388,9 @@ in sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" sources."lru-queue-0.1.0" - (sources."make-dir-3.1.0" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) + sources."make-error-1.3.6" sources."make-iterator-1.0.1" sources."map-cache-0.2.2" - sources."map-stream-0.0.7" sources."map-visit-1.0.0" (sources."matchdep-2.0.0" // { dependencies = [ @@ -89894,39 +91405,18 @@ in sources."to-regex-range-2.1.1" ]; }) - sources."material-design-icons-3.0.1" - sources."material-design-lite-1.3.0" - sources."md5.js-1.3.5" sources."media-typer-0.3.0" - (sources."memoizee-0.4.15" // { - dependencies = [ - sources."next-tick-1.1.0" - ]; - }) - (sources."memory-fs-0.5.0" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) + sources."memoizee-0.4.15" + sources."memory-pager-1.5.0" sources."merge-descriptors-1.0.1" - sources."merge-stream-2.0.0" sources."merge2-1.4.1" sources."methods-1.1.2" sources."micromatch-4.0.4" - (sources."miller-rabin-4.0.1" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) sources."mime-1.6.0" sources."mime-db-1.51.0" sources."mime-types-2.1.34" - sources."mimic-fn-1.2.0" + sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" - sources."minimalistic-assert-1.0.1" - sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.5" (sources."minipass-2.9.0" // { @@ -89934,75 +91424,84 @@ in sources."yallist-3.1.1" ]; }) - (sources."minipass-collect-1.0.2" // { - dependencies = [ - sources."minipass-3.1.6" - ]; - }) - (sources."minipass-flush-1.0.5" // { - dependencies = [ - sources."minipass-3.1.6" - ]; - }) - (sources."minipass-pipeline-1.2.4" // { - dependencies = [ - sources."minipass-3.1.6" - ]; - }) sources."minizlib-1.3.3" - (sources."mirakurun-3.3.1" // { + (sources."mirakurun-3.9.0-beta.26" // { dependencies = [ - sources."aribts-1.3.5" + sources."ajv-6.12.6" sources."eventemitter3-4.0.7" - sources."express-openapi-6.0.0" - sources."fs-routes-2.0.0" - sources."openapi-default-setter-2.1.0" - sources."openapi-framework-0.26.0" - sources."openapi-jsonschema-parameters-1.2.0" - sources."openapi-request-coercer-2.4.0" - sources."openapi-request-validator-4.2.0" - sources."openapi-response-validator-4.0.0" - (sources."openapi-schema-validator-3.0.3" // { + (sources."express-openapi-8.0.0" // { dependencies = [ - sources."openapi-types-1.3.4" + sources."openapi-types-8.0.0" ]; }) - (sources."openapi-security-handler-2.0.4" // { + sources."fs-routes-8.0.0" + sources."json-schema-traverse-0.4.1" + (sources."openapi-default-setter-8.0.0" // { dependencies = [ - sources."openapi-types-1.3.4" + sources."openapi-types-8.0.0" ]; }) - sources."openapi-types-1.3.5" + (sources."openapi-framework-8.0.0" // { + dependencies = [ + sources."js-yaml-3.14.1" + sources."openapi-types-8.0.0" + ]; + }) + (sources."openapi-jsonschema-parameters-8.0.0" // { + dependencies = [ + sources."openapi-types-8.0.0" + ]; + }) + (sources."openapi-request-coercer-8.0.0" // { + dependencies = [ + sources."openapi-types-8.0.0" + ]; + }) + (sources."openapi-request-validator-8.0.0" // { + dependencies = [ + sources."openapi-types-8.0.0" + ]; + }) + (sources."openapi-response-validator-8.0.0" // { + dependencies = [ + sources."openapi-types-8.0.0" + ]; + }) + (sources."openapi-schema-validator-8.0.0" // { + dependencies = [ + sources."openapi-types-8.0.0" + ]; + }) + (sources."openapi-security-handler-8.0.0" // { + dependencies = [ + sources."openapi-types-8.0.0" + ]; + }) + sources."openapi-types-7.2.3" + sources."swagger-ui-dist-4.6.2" ]; }) - sources."mississippi-3.0.0" - sources."mithril-2.0.4" (sources."mixin-deep-1.3.2" // { dependencies = [ sources."is-extendable-1.0.1" ]; }) sources."mkdirp-1.0.4" - sources."moment-2.29.1" + sources."mongodb-4.4.1" + sources."mongodb-connection-string-url-2.5.2" (sources."morgan-1.10.0" // { dependencies = [ sources."depd-2.0.0" ]; }) - (sources."move-concurrently-1.0.1" // { - dependencies = [ - sources."mkdirp-0.5.5" - ]; - }) sources."ms-2.0.0" - (sources."multer-1.4.2" // { + (sources."multer-1.4.3" // { dependencies = [ sources."mkdirp-0.5.5" ]; }) - sources."munin-plugin-0.0.9" sources."mute-stdout-1.0.1" - sources."mute-stream-0.0.7" + sources."mute-stream-0.0.8" (sources."mysql-2.18.1" // { dependencies = [ sources."isarray-1.0.0" @@ -90010,8 +91509,10 @@ in sources."string_decoder-1.1.1" ]; }) + sources."mz-2.7.0" sources."nan-2.15.0" sources."nanomatch-1.2.13" + sources."natural-compare-1.4.0" (sources."needle-2.9.1" // { dependencies = [ sources."debug-3.2.7" @@ -90019,10 +91520,9 @@ in ]; }) sources."negotiator-0.6.3" - sources."neo-async-2.6.2" - sources."next-tick-1.0.0" - sources."node-addon-api-2.0.0" - sources."node-fetch-1.6.3" + sources."next-tick-1.1.0" + sources."nice-try-1.0.5" + sources."node-addon-api-3.2.1" (sources."node-gyp-3.8.0" // { dependencies = [ sources."mkdirp-0.5.5" @@ -90031,19 +91531,7 @@ in sources."tar-2.2.2" ]; }) - (sources."node-libs-browser-2.2.1" // { - dependencies = [ - sources."buffer-4.9.2" - sources."isarray-1.0.0" - sources."punycode-1.4.1" - (sources."readable-stream-2.3.7" // { - dependencies = [ - sources."string_decoder-1.1.1" - ]; - }) - sources."stream-http-2.8.3" - ]; - }) + sources."node-gyp-build-4.3.0" (sources."node-pre-gyp-0.11.0" // { dependencies = [ sources."mkdirp-0.5.5" @@ -90066,7 +91554,6 @@ in sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" - sources."object-component-0.0.3" (sources."object-copy-0.1.0" // { dependencies = [ sources."define-property-0.2.5" @@ -90087,59 +91574,53 @@ 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.183.1" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" - sources."onetime-2.0.1" - (sources."openapi-default-setter-7.2.3" // { + sources."onetime-5.1.2" + (sources."openapi-default-setter-9.3.1" // { dependencies = [ - sources."openapi-types-7.2.3" + sources."openapi-types-9.3.1" ]; }) - (sources."openapi-framework-7.5.0" // { + (sources."openapi-framework-9.3.1" // { dependencies = [ - sources."openapi-types-7.2.3" - ]; - }) - (sources."openapi-jsonschema-parameters-7.2.3" // { - dependencies = [ - sources."openapi-types-7.2.3" + sources."js-yaml-3.14.1" + sources."openapi-types-9.3.1" ]; }) - (sources."openapi-request-coercer-7.5.0" // { + (sources."openapi-jsonschema-parameters-9.3.1" // { dependencies = [ - sources."openapi-types-7.2.3" + sources."openapi-types-9.3.1" ]; }) - (sources."openapi-request-validator-7.4.0" // { + (sources."openapi-request-coercer-9.3.1" // { dependencies = [ - sources."openapi-types-7.2.3" + sources."openapi-types-9.3.1" ]; }) - (sources."openapi-response-validator-7.4.0" // { + (sources."openapi-request-validator-9.3.1" // { dependencies = [ - sources."openapi-types-7.2.3" + sources."openapi-types-9.3.1" ]; }) - (sources."openapi-schema-validator-7.2.3" // { + (sources."openapi-response-validator-9.3.1" // { dependencies = [ - sources."openapi-types-7.2.3" + sources."openapi-types-9.3.1" ]; }) - (sources."openapi-security-handler-7.2.3" // { + (sources."openapi-schema-validator-9.3.1" // { dependencies = [ - sources."openapi-types-7.2.3" + sources."openapi-types-9.3.1" ]; }) - sources."openapi-types-7.0.1" - (sources."opencollective-1.0.3" // { + (sources."openapi-security-handler-9.3.1" // { dependencies = [ - sources."minimist-1.2.0" + sources."openapi-types-9.3.1" ]; }) - sources."opencollective-postinstall-2.0.3" - sources."opn-4.0.2" + sources."openapi-types-9.3.0" + sources."optionator-0.9.1" (sources."ordered-read-streams-1.0.1" // { dependencies = [ sources."isarray-1.0.0" @@ -90147,96 +91628,64 @@ in sources."string_decoder-1.1.1" ]; }) - sources."os-browserify-0.3.0" sources."os-homedir-1.0.2" sources."os-locale-1.4.0" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" sources."p-cancelable-1.1.0" - sources."p-limit-3.1.0" - (sources."p-locate-4.1.0" // { - dependencies = [ - sources."p-limit-2.3.0" - ]; - }) - sources."p-map-3.0.0" - sources."p-try-2.2.0" + sources."p-map-4.0.0" (sources."package-json-6.5.0" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."packet-reader-1.0.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."parent-module-1.0.1" + sources."parent-require-1.0.0" sources."parse-filepath-1.0.2" sources."parse-json-2.2.0" sources."parse-node-version-1.0.1" sources."parse-passwd-1.0.0" - sources."parseqs-0.0.5" - sources."parseuri-0.0.5" + sources."parse5-5.1.1" + (sources."parse5-htmlparser2-tree-adapter-6.0.1" // { + dependencies = [ + sources."parse5-6.0.1" + ]; + }) sources."parseurl-1.3.3" sources."pascalcase-0.1.1" - sources."path-browserify-0.0.1" sources."path-dirname-1.0.2" sources."path-exists-2.1.0" sources."path-is-absolute-1.0.1" + sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."path-root-0.1.1" sources."path-root-regex-0.1.2" sources."path-to-regexp-0.1.7" sources."path-type-4.0.0" - sources."pbkdf2-3.1.2" + sources."peek-readable-4.1.0" sources."performance-now-2.1.0" - (sources."pg-8.3.3" // { - dependencies = [ - sources."semver-4.3.2" - ]; - }) - sources."pg-connection-string-2.5.0" - sources."pg-int8-1.0.1" - sources."pg-pool-3.5.1" - sources."pg-protocol-1.5.0" - sources."pg-types-2.2.0" - sources."pgpass-1.0.5" + sources."picocolors-0.2.1" sources."picomatch-2.3.1" sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - (sources."pkg-dir-4.2.0" // { + (sources."plugin-error-1.0.1" // { dependencies = [ - sources."find-up-4.1.0" - sources."path-exists-4.0.0" + sources."ansi-colors-1.1.0" ]; }) - sources."plugin-error-1.0.1" sources."posix-character-classes-0.1.1" - sources."postgres-array-2.0.0" - sources."postgres-bytea-1.0.0" - sources."postgres-date-1.0.7" - sources."postgres-interval-1.2.0" + sources."postcss-7.0.39" + sources."prelude-ls-1.2.1" sources."prepend-http-2.0.0" + sources."prettier-2.4.1" + sources."prettier-linter-helpers-1.0.0" sources."pretty-hrtime-1.0.3" - sources."process-0.11.10" sources."process-nextick-args-2.0.1" - sources."promise-inflight-1.0.1" + sources."progress-2.0.3" sources."promise-queue-2.2.5" - sources."prop-types-15.8.1" sources."proxy-addr-2.0.7" - sources."prr-1.0.1" sources."psl-1.8.0" - (sources."public-encrypt-4.0.3" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) sources."pump-3.0.0" (sources."pumpify-1.5.1" // { dependencies = [ @@ -90245,17 +91694,12 @@ in }) sources."punycode-2.1.1" sources."qs-6.7.0" - sources."querystring-0.2.0" - sources."querystring-es3-0.2.1" sources."queue-microtask-1.2.3" - sources."randombytes-2.1.0" - sources."randomfill-1.0.4" sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."rc-1.2.8" - sources."react-16.14.0" - sources."react-dom-16.14.0" - sources."react-is-16.13.1" + sources."react-17.0.2" + sources."react-dom-17.0.2" (sources."read-pkg-1.1.0" // { dependencies = [ sources."path-type-1.1.0" @@ -90263,6 +91707,7 @@ in }) sources."read-pkg-up-1.0.1" sources."readable-stream-3.6.0" + sources."readable-web-to-node-stream-3.0.2" (sources."readdirp-2.2.1" // { dependencies = [ sources."braces-2.3.2" @@ -90278,8 +91723,9 @@ in ]; }) sources."rechoir-0.6.2" - sources."regenerator-runtime-0.10.5" + sources."reflect-metadata-0.1.13" sources."regex-not-1.0.2" + sources."regexpp-3.2.0" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" sources."remove-bom-buffer-3.0.0" @@ -90295,38 +91741,32 @@ in ]; }) sources."require-directory-2.1.1" + sources."require-from-string-2.0.2" sources."require-main-filename-1.0.1" sources."resolve-1.22.0" sources."resolve-dir-1.0.1" + sources."resolve-from-4.0.0" sources."resolve-options-1.1.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" - sources."restore-cursor-2.0.0" + sources."restore-cursor-3.1.0" sources."ret-0.1.15" sources."reusify-1.0.4" sources."rfdc-1.3.0" sources."rimraf-2.7.1" - sources."ripemd160-2.0.2" sources."run-async-2.4.1" sources."run-parallel-1.2.0" - sources."run-queue-1.0.3" - sources."rx-4.1.0" - sources."safe-buffer-5.1.2" - sources."safe-regex-1.1.0" - sources."safer-buffer-2.1.2" - (sources."sass-1.49.8" // { + (sources."rxjs-6.6.7" // { dependencies = [ - sources."anymatch-3.1.2" - sources."binary-extensions-2.2.0" - sources."chokidar-3.5.3" - sources."fsevents-2.3.2" - sources."is-binary-path-2.1.0" - sources."readdirp-3.6.0" + sources."tslib-1.14.1" ]; }) + sources."safe-buffer-5.1.2" + sources."safe-regex-1.1.0" + sources."safer-buffer-2.1.2" + sources."saslprep-1.0.3" sources."sax-1.2.4" - sources."scheduler-0.19.1" - sources."schema-utils-2.7.1" + sources."scheduler-0.20.2" sources."semver-7.3.5" sources."semver-greatest-satisfied-range-1.1.0" (sources."send-0.17.1" // { @@ -90334,7 +91774,6 @@ in sources."ms-2.1.1" ]; }) - sources."serialize-javascript-5.0.1" sources."serve-static-1.14.1" sources."set-blocking-2.0.0" (sources."set-value-2.0.1" // { @@ -90342,12 +91781,19 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."setimmediate-1.0.5" sources."setprototypeof-1.1.1" sources."sha.js-2.4.11" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."sift-7.0.1" sources."signal-exit-3.0.7" sources."slash-3.0.0" + (sources."slice-ansi-4.0.0" // { + dependencies = [ + sources."is-fullwidth-code-point-3.0.0" + ]; + }) + sources."smart-buffer-4.2.0" (sources."snapdragon-0.8.2" // { dependencies = [ sources."define-property-0.2.5" @@ -90377,57 +91823,35 @@ in sources."kind-of-3.2.2" ]; }) - (sources."socket.io-2.3.0" // { - dependencies = [ - sources."debug-4.1.1" - sources."ms-2.1.3" - ]; - }) - sources."socket.io-adapter-1.1.2" - (sources."socket.io-client-2.3.0" // { + (sources."socket.io-4.3.1" // { dependencies = [ - sources."base64-arraybuffer-0.1.5" - sources."debug-4.1.1" - sources."isarray-2.0.1" - sources."ms-2.1.3" - (sources."socket.io-parser-3.3.2" // { - dependencies = [ - sources."component-emitter-1.3.0" - sources."debug-3.1.0" - sources."ms-2.0.0" - ]; - }) + sources."debug-4.3.3" + sources."ms-2.1.2" ]; }) - (sources."socket.io-parser-3.4.1" // { + sources."socket.io-adapter-2.3.3" + (sources."socket.io-parser-4.0.4" // { dependencies = [ - sources."debug-4.1.1" - sources."isarray-2.0.1" - sources."ms-2.1.3" + sources."debug-4.3.3" + sources."ms-2.1.2" ]; }) - sources."source-list-map-2.0.1" + sources."socks-2.6.2" sources."source-map-0.6.1" - sources."source-map-js-1.0.2" sources."source-map-resolve-0.5.3" - sources."source-map-support-0.5.21" + sources."source-map-support-0.5.20" sources."source-map-url-0.4.1" sources."sparkles-1.0.1" + sources."sparse-bitfield-3.0.3" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.11" sources."split-string-3.1.0" - sources."split2-4.1.0" sources."sprintf-js-1.0.3" - sources."sqlite3-5.0.0" + sources."sqlite3-5.0.2" sources."sqlstring-2.3.1" sources."sshpk-1.17.0" - (sources."ssri-8.0.1" // { - dependencies = [ - sources."minipass-3.1.6" - ]; - }) sources."stack-trace-0.0.10" (sources."static-extend-0.1.2" // { dependencies = [ @@ -90447,38 +91871,17 @@ in ]; }) sources."statuses-1.5.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-exhaust-1.0.2" - (sources."stream-http-3.2.0" // { - dependencies = [ - sources."inherits-2.0.4" - ]; - }) sources."stream-shift-1.0.1" (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" sources."debug-4.3.3" - sources."fs-extra-8.1.0" - sources."jsonfile-4.0.0" sources."ms-2.1.2" - sources."universalify-0.1.2" ]; }) sources."streamsearch-0.1.2" - (sources."string-width-2.1.1" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."strip-ansi-4.0.0" - ]; - }) + sources."string-width-1.0.2" (sources."string_decoder-1.3.0" // { dependencies = [ sources."safe-buffer-5.2.1" @@ -90488,13 +91891,22 @@ in sources."strip-bom-2.0.0" sources."strip-bom-string-1.0.0" sources."strip-json-comments-2.0.1" - sources."supports-color-2.0.0" + sources."strtok3-6.3.0" + sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" sources."sver-compat-1.5.0" sources."swagger-schema-official-2.0.0-bab6bed" - sources."swagger-ui-dist-3.34.0" + sources."swagger-ui-dist-3.52.5" + (sources."table-6.8.0" // { + dependencies = [ + sources."ansi-regex-5.0.1" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + ]; + }) sources."tail-2.2.4" - sources."tapable-1.1.3" + sources."tapable-2.2.1" (sources."tar-4.4.19" // { dependencies = [ sources."mkdirp-0.5.5" @@ -90502,12 +91914,9 @@ in sources."yallist-3.1.1" ]; }) - (sources."terser-5.10.0" // { - dependencies = [ - sources."source-map-0.7.3" - ]; - }) - sources."terser-webpack-plugin-4.2.2" + sources."text-table-0.2.0" + sources."thenify-3.3.1" + sources."thenify-all-1.6.0" sources."through-2.3.8" (sources."through2-2.0.5" // { dependencies = [ @@ -90518,12 +91927,9 @@ in }) sources."through2-filter-3.0.0" sources."time-stamp-1.1.0" - sources."timers-browserify-2.0.12" sources."timers-ext-0.1.7" sources."tmp-0.0.33" sources."to-absolute-glob-2.0.2" - sources."to-array-0.1.4" - sources."to-arraybuffer-1.0.1" (sources."to-object-path-0.3.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -90534,42 +91940,47 @@ in sources."to-regex-range-5.0.1" sources."to-through-2.0.0" sources."toidentifier-1.0.0" + sources."token-types-4.2.0" sources."tough-cookie-2.5.0" - (sources."ts-loader-8.0.4" // { + sources."tr46-3.0.0" + sources."ts-loader-9.2.6" + sources."ts-log-2.2.4" + (sources."ts-node-10.4.0" // { dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."semver-6.3.0" - sources."supports-color-5.5.0" + sources."acorn-8.7.0" ]; }) - sources."ts-log-2.2.4" - sources."tslib-1.14.1" - (sources."tslint-6.1.3" // { + sources."tslib-2.3.1" + (sources."tsutils-3.21.0" // { dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."mkdirp-0.5.5" - sources."semver-5.7.1" - sources."supports-color-5.5.0" + sources."tslib-1.14.1" ]; }) - sources."tsutils-2.29.0" - sources."tty-browserify-0.0.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-1.2.0" + sources."type-check-0.4.0" + sources."type-fest-0.20.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."typescript-4.0.3" + (sources."typeorm-0.2.38" // { + dependencies = [ + sources."buffer-6.0.3" + sources."debug-4.3.3" + sources."ms-2.1.2" + ]; + }) + sources."typescript-4.4.4" sources."unc-path-regex-0.1.2" - sources."undertaker-1.3.0" + (sources."undertaker-1.3.0" // { + dependencies = [ + sources."fast-levenshtein-1.1.4" + ]; + }) sources."undertaker-registry-1.0.1" sources."union-value-1.0.1" - sources."unique-filename-1.1.1" - sources."unique-slug-2.0.2" sources."unique-stream-2.3.1" - sources."universalify-1.0.0" + sources."universalify-0.1.2" sources."unpipe-1.0.0" (sources."unset-value-1.0.0" // { dependencies = [ @@ -90585,19 +91996,15 @@ in 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-4.0.1" sources."url-parse-lax-3.0.0" - sources."url-toolkit-2.2.5" sources."use-3.1.1" - sources."util-0.11.1" + sources."utf-8-validate-5.0.9" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-3.4.0" + sources."uws-9.148.0" + sources."v8-compile-cache-2.3.0" sources."v8flags-3.2.0" sources."validate-npm-package-license-3.0.4" sources."value-or-function-3.0.0" @@ -90620,97 +92027,2015 @@ in sources."normalize-path-2.1.1" ]; }) - (sources."vinyl-sourcemaps-apply-0.2.1" // { + sources."webidl-conversions-7.0.0" + sources."whatwg-url-11.0.0" + sources."which-1.3.1" + sources."which-module-1.0.0" + sources."wide-align-1.1.5" + sources."word-wrap-1.2.3" + (sources."wrap-ansi-7.0.0" // { dependencies = [ - sources."source-map-0.5.7" + sources."ansi-regex-5.0.1" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) - sources."vm-browserify-1.1.2" - (sources."watchpack-1.7.5" // { + sources."wrappy-1.0.2" + (sources."write-1.0.3" // { dependencies = [ - sources."anymatch-3.1.2" - sources."binary-extensions-2.2.0" - sources."chokidar-3.5.3" - sources."fsevents-2.3.2" - sources."is-binary-path-2.1.0" - sources."readdirp-3.6.0" + sources."mkdirp-0.5.5" + ]; + }) + sources."ws-6.2.2" + sources."xml2js-0.4.23" + sources."xmlbuilder-11.0.1" + sources."xtend-4.0.2" + sources."y18n-5.0.8" + sources."yallist-4.0.0" + (sources."yargonaut-1.1.4" // { + dependencies = [ + sources."ansi-styles-2.2.1" + sources."chalk-1.1.3" + sources."supports-color-2.0.0" ]; }) - sources."watchpack-chokidar2-2.0.1" - (sources."webpack-4.44.2" // { + (sources."yargs-17.3.1" // { dependencies = [ - sources."acorn-6.4.2" + sources."ansi-regex-5.0.1" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + sources."yargs-parser-21.0.1" + ]; + }) + sources."yargs-parser-20.2.9" + sources."yn-3.1.1" + sources."zen-observable-0.8.15" + sources."zen-observable-ts-1.2.3" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "DTV Software in Japan."; + homepage = "https://github.com/l3tnun/EPGStation-V2#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + "epgstation-client-../../applications/video/epgstation/client" = nodeEnv.buildNodePackage { + name = "epgstation-client"; + packageName = "epgstation-client"; + version = "2.6.20"; + src = ../../applications/video/epgstation/client; + dependencies = [ + sources."@babel/code-frame-7.16.7" + sources."@babel/helper-validator-identifier-7.16.7" + sources."@babel/highlight-7.16.10" + (sources."@eslint/eslintrc-0.4.3" // { + dependencies = [ + sources."acorn-7.4.1" + sources."eslint-visitor-keys-1.3.0" + sources."espree-7.3.1" + sources."ignore-4.0.6" + ]; + }) + sources."@hapi/address-2.1.4" + sources."@hapi/bourne-1.3.2" + sources."@hapi/hoek-8.5.1" + sources."@hapi/joi-15.1.1" + sources."@hapi/topo-3.1.6" + sources."@humanwhocodes/config-array-0.5.0" + sources."@humanwhocodes/object-schema-1.2.1" + sources."@intervolga/optimize-cssnano-plugin-1.0.6" + sources."@mdi/font-6.5.95" + sources."@mrmlnc/readdir-enhanced-2.2.1" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.8" + sources."@socket.io/base64-arraybuffer-1.0.2" + sources."@socket.io/component-emitter-3.0.0" + (sources."@soda/friendly-errors-webpack-plugin-1.8.1" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-3.0.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + sources."@soda/get-current-script-1.0.2" + sources."@types/body-parser-1.19.2" + sources."@types/connect-3.4.35" + sources."@types/connect-history-api-fallback-1.3.5" + sources."@types/express-4.17.13" + sources."@types/express-serve-static-core-4.17.28" + sources."@types/glob-7.2.0" + sources."@types/hls.js-0.13.3" + sources."@types/http-proxy-1.17.8" + sources."@types/json-schema-7.0.9" + sources."@types/json-stable-stringify-1.0.33" + sources."@types/lodash-4.14.178" + sources."@types/mime-1.3.2" + sources."@types/minimatch-3.0.5" + sources."@types/minimist-1.2.2" + sources."@types/node-17.0.21" + sources."@types/normalize-package-data-2.4.1" + sources."@types/parse-json-4.0.0" + sources."@types/q-1.5.5" + sources."@types/qs-6.9.7" + sources."@types/range-parser-1.2.4" + sources."@types/serve-static-1.13.10" + sources."@types/smoothscroll-polyfill-0.3.1" + sources."@types/socket.io-client-1.4.36" + sources."@types/source-list-map-0.1.2" + sources."@types/tapable-1.0.8" + (sources."@types/uglify-js-3.13.1" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + (sources."@types/webpack-4.41.32" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."@types/webpack-dev-server-3.11.6" + sources."@types/webpack-env-1.16.3" + (sources."@types/webpack-sources-3.2.0" // { + dependencies = [ + sources."source-map-0.7.3" + ]; + }) + sources."@typescript-eslint/eslint-plugin-4.33.0" + sources."@typescript-eslint/experimental-utils-4.33.0" + sources."@typescript-eslint/parser-4.33.0" + sources."@typescript-eslint/scope-manager-4.33.0" + sources."@typescript-eslint/types-4.33.0" + sources."@typescript-eslint/typescript-estree-4.33.0" + sources."@typescript-eslint/visitor-keys-4.33.0" + sources."@vue/cli-overlay-4.5.15" + (sources."@vue/cli-plugin-eslint-4.5.12" // { + dependencies = [ + sources."@nodelib/fs.stat-1.1.3" + sources."array-union-1.0.2" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."dir-glob-2.2.2" + sources."fast-glob-2.2.7" + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."glob-parent-3.1.0" + sources."globby-9.2.0" + sources."ignore-4.0.6" + sources."is-glob-3.1.0" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."micromatch-3.1.10" + (sources."path-type-3.0.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + sources."slash-2.0.0" + sources."to-regex-range-2.1.1" + ]; + }) + sources."@vue/cli-plugin-router-4.5.15" + (sources."@vue/cli-plugin-typescript-4.5.13" // { + dependencies = [ + sources."@nodelib/fs.stat-1.1.3" + sources."array-union-1.0.2" sources."braces-2.3.2" - sources."cacache-12.0.4" + sources."dir-glob-2.2.2" sources."extend-shallow-2.0.1" + sources."fast-glob-2.2.7" sources."fill-range-4.0.0" + sources."glob-parent-3.1.0" + sources."globby-9.2.0" + sources."ignore-4.0.6" + sources."is-glob-3.1.0" + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."micromatch-3.1.10" + sources."path-type-3.0.0" + sources."pify-3.0.0" + sources."slash-2.0.0" + sources."to-regex-range-2.1.1" + ]; + }) + sources."@vue/cli-plugin-vuex-4.5.13" + (sources."@vue/cli-service-4.5.13" // { + dependencies = [ + sources."@nodelib/fs.stat-1.1.3" + sources."acorn-7.4.1" + sources."array-union-1.0.2" + sources."braces-2.3.2" + sources."dir-glob-2.2.2" + sources."extend-shallow-2.0.1" + sources."fast-glob-2.2.7" + sources."fill-range-4.0.0" + sources."fs-extra-7.0.1" + sources."glob-parent-3.1.0" + sources."globby-9.2.0" + sources."ignore-4.0.6" + sources."is-glob-3.1.0" + sources."is-number-3.0.0" + sources."jsonfile-4.0.0" + sources."kind-of-3.2.2" + sources."micromatch-3.1.10" + sources."path-type-3.0.0" + sources."pify-3.0.0" + sources."slash-2.0.0" + sources."ssri-8.0.1" + sources."to-regex-range-2.1.1" + sources."universalify-0.1.2" + ]; + }) + (sources."@vue/cli-shared-utils-4.5.15" // { + dependencies = [ + sources."lru-cache-5.1.1" + sources."semver-6.3.0" + sources."yallist-3.1.1" + ]; + }) + (sources."@vue/component-compiler-utils-3.3.0" // { + dependencies = [ + sources."hash-sum-1.0.2" + sources."lru-cache-4.1.5" + sources."source-map-0.6.1" + sources."yallist-2.1.2" + ]; + }) + sources."@vue/eslint-config-prettier-6.0.0" + sources."@vue/eslint-config-typescript-7.0.0" + sources."@vue/preload-webpack-plugin-1.1.2" + sources."@vue/web-component-wrapper-1.3.0" + 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."@xtuc/ieee754-1.2.0" + sources."@xtuc/long-4.2.2" + sources."accepts-1.3.8" + sources."acorn-6.4.2" + sources."acorn-jsx-5.3.2" + sources."acorn-walk-7.2.0" + sources."address-1.1.2" + sources."ajv-6.12.6" + sources."ajv-errors-1.0.1" + sources."ajv-keywords-3.5.2" + sources."alphanum-sort-1.0.2" + sources."ansi-colors-3.2.4" + (sources."ansi-escapes-4.3.2" // { + dependencies = [ + sources."type-fest-0.21.3" + ]; + }) + sources."ansi-html-community-0.0.8" + sources."ansi-regex-4.1.0" + sources."ansi-styles-3.2.1" + sources."any-promise-1.3.0" + sources."anymatch-3.1.2" + sources."aproba-1.2.0" + sources."arch-2.2.0" + sources."argparse-1.0.10" + sources."aribb24.js-1.8.8" + sources."arr-diff-4.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-flatten-1.1.1" + sources."array-union-2.1.0" + sources."array-uniq-1.0.3" + sources."array-unique-0.3.2" + sources."asn1-0.2.6" + (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."assert-plus-1.0.0" + sources."assign-symbols-1.0.0" + sources."astral-regex-2.0.0" + sources."async-2.6.3" + sources."async-each-1.0.3" + sources."async-limiter-1.0.1" + sources."asynckit-0.4.0" + sources."at-least-node-1.0.0" + sources."atob-2.1.2" + (sources."autoprefixer-9.8.8" // { + dependencies = [ + sources."picocolors-0.2.1" + ]; + }) + sources."aws-sign2-0.7.0" + sources."aws4-1.11.0" + sources."axios-0.24.0" + (sources."babel-code-frame-6.26.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."chalk-1.1.3" + sources."js-tokens-3.0.2" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + ]; + }) + sources."backo2-1.0.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."batch-0.6.1" + sources."bcrypt-pbkdf-1.0.2" + sources."bfj-6.1.2" + 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."body-parser-1.19.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + sources."qs-6.9.7" + ]; + }) + (sources."bonjour-3.5.0" // { + dependencies = [ + sources."array-flatten-2.1.2" + ]; + }) + sources."boolbase-1.0.0" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."brorand-1.1.0" + 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."browserify-zlib-0.2.0" + sources."browserslist-4.20.0" + sources."buffer-4.9.2" + sources."buffer-from-1.1.2" + sources."buffer-indexof-1.1.1" + sources."buffer-json-2.0.0" + sources."buffer-xor-1.0.3" + sources."builtin-modules-1.1.1" + sources."builtin-status-codes-3.0.0" + sources."bytes-3.1.2" + (sources."cacache-12.0.4" // { + dependencies = [ + sources."lru-cache-5.1.1" + sources."yallist-3.1.1" + ]; + }) + sources."cache-base-1.0.1" + (sources."cache-loader-4.1.0" // { + dependencies = [ + sources."find-cache-dir-3.3.2" + sources."find-up-4.1.0" + sources."locate-path-5.0.0" + sources."make-dir-3.1.0" + sources."p-locate-4.1.0" + sources."path-exists-4.0.0" + sources."pkg-dir-4.2.0" + sources."schema-utils-2.7.1" + sources."semver-6.3.0" + ]; + }) + sources."call-bind-1.0.2" + sources."call-me-maybe-1.0.1" + (sources."caller-callsite-2.0.0" // { + dependencies = [ + sources."callsites-2.0.0" + ]; + }) + sources."caller-path-2.0.0" + sources."callsite-1.0.0" + sources."callsites-3.1.0" + sources."camel-case-3.0.0" + sources."camelcase-5.3.1" + sources."caniuse-api-3.0.0" + sources."caniuse-lite-1.0.30001314" + sources."case-sensitive-paths-webpack-plugin-2.4.0" + sources."caseless-0.12.0" + sources."chalk-2.4.2" + sources."chardet-0.7.0" + sources."check-types-8.0.3" + sources."chokidar-3.5.3" + sources."chownr-1.1.4" + sources."chrome-trace-event-1.0.3" + sources."ci-info-1.6.0" + 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-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."clean-css-4.2.4" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."cli-cursor-2.1.0" + (sources."cli-highlight-2.1.11" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + sources."cli-spinners-2.6.1" + sources."cli-width-3.0.0" + (sources."clipboardy-2.3.0" // { + dependencies = [ + sources."is-wsl-2.2.0" + ]; + }) + (sources."cliui-6.0.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."wrap-ansi-6.2.0" + ]; + }) + sources."clone-1.0.4" + sources."coa-2.0.2" + sources."collection-visit-1.0.0" + sources."color-3.2.1" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."color-string-1.9.0" + sources."combined-stream-1.0.8" + sources."commander-2.20.3" + sources."commondir-1.0.1" + sources."component-emitter-1.3.0" + sources."compressible-2.0.18" + (sources."compression-1.7.4" // { + dependencies = [ + sources."bytes-3.0.0" + sources."debug-2.6.9" + sources."ms-2.0.0" + sources."safe-buffer-5.1.2" + ]; + }) + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."connect-history-api-fallback-1.6.0" + sources."console-browserify-1.2.0" + sources."consolidate-0.15.1" + sources."constants-browserify-1.0.0" + sources."content-disposition-0.5.4" + sources."content-type-1.0.4" + sources."cookie-0.4.2" + sources."cookie-signature-1.0.6" + sources."copy-concurrently-1.0.5" + sources."copy-descriptor-0.1.1" + (sources."copy-webpack-plugin-5.1.2" // { + dependencies = [ + sources."array-union-1.0.2" + sources."dir-glob-2.2.2" sources."find-cache-dir-2.1.0" sources."find-up-3.0.0" + (sources."glob-parent-3.1.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) + sources."globby-7.1.1" + sources."ignore-3.3.10" + sources."path-type-3.0.0" + sources."pify-3.0.0" + sources."pkg-dir-3.0.0" + sources."slash-1.0.0" + ]; + }) + sources."core-util-is-1.0.2" + sources."cosmiconfig-6.0.0" + (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" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."crypto-browserify-3.12.0" + sources."css-color-names-0.0.4" + sources."css-declaration-sorter-4.0.1" + (sources."css-loader-3.6.0" // { + dependencies = [ + sources."schema-utils-2.7.1" + sources."semver-6.3.0" + ]; + }) + sources."css-select-2.1.0" + sources."css-select-base-adapter-0.1.1" + (sources."css-tree-1.0.0-alpha.37" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."css-what-3.4.2" + sources."cssesc-3.0.0" + (sources."cssnano-4.1.11" // { + dependencies = [ + sources."cosmiconfig-5.2.1" + sources."import-fresh-2.0.0" + sources."parse-json-4.0.0" + sources."resolve-from-3.0.0" + ]; + }) + sources."cssnano-preset-default-4.0.8" + sources."cssnano-util-get-arguments-4.0.0" + sources."cssnano-util-get-match-4.0.0" + sources."cssnano-util-raw-cache-4.0.1" + sources."cssnano-util-same-parent-4.0.1" + (sources."csso-4.2.0" // { + dependencies = [ + sources."css-tree-1.1.3" + sources."mdn-data-2.0.14" + sources."source-map-0.6.1" + ]; + }) + sources."cyclist-1.0.1" + sources."dashdash-1.14.1" + sources."date-fns-2.28.0" + sources."de-indent-1.0.2" + sources."debug-4.3.3" + sources."decache-4.6.1" + sources."decamelize-1.2.0" + sources."decode-uri-component-0.2.0" + sources."deep-equal-1.1.1" + sources."deep-is-0.1.4" + sources."deepmerge-4.2.2" + (sources."default-gateway-5.0.5" // { + dependencies = [ + sources."cross-spawn-7.0.3" + sources."execa-3.4.0" + sources."get-stream-5.2.0" + sources."is-stream-2.0.1" + sources."mimic-fn-2.1.0" + sources."npm-run-path-4.0.1" + sources."onetime-5.1.2" + sources."p-finally-2.0.1" + sources."path-key-3.1.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."which-2.0.2" + ]; + }) + sources."defaults-1.0.3" + sources."define-properties-1.1.3" + sources."define-property-2.0.2" + (sources."del-4.1.1" // { + dependencies = [ + sources."array-union-1.0.2" + (sources."globby-6.1.0" // { + dependencies = [ + sources."pify-2.3.0" + ]; + }) + ]; + }) + sources."delayed-stream-1.0.0" + sources."depd-1.1.2" + sources."des.js-1.0.1" + sources."destroy-1.0.4" + sources."detect-node-2.1.0" + sources."diff-4.0.2" + (sources."diffie-hellman-5.0.3" // { + dependencies = [ + sources."bn.js-4.12.0" + ]; + }) + sources."dir-glob-3.0.1" + sources."dns-equal-1.0.0" + sources."dns-packet-1.3.4" + sources."dns-txt-2.0.2" + sources."doctrine-3.0.0" + sources."dom-converter-0.2.0" + (sources."dom-serializer-0.2.2" // { + dependencies = [ + sources."domelementtype-2.2.0" + ]; + }) + sources."domain-browser-1.2.0" + sources."domelementtype-1.3.1" + (sources."domhandler-4.3.0" // { + dependencies = [ + sources."domelementtype-2.2.0" + ]; + }) + sources."domutils-1.7.0" + sources."dot-prop-5.3.0" + sources."dotenv-8.6.0" + sources."dotenv-expand-5.1.0" + sources."duplexer-0.1.2" + sources."duplexify-3.7.1" + sources."easy-stack-1.0.1" + sources."ecc-jsbn-0.1.2" + sources."ee-first-1.1.1" + sources."ejs-2.7.4" + sources."electron-to-chromium-1.4.82" + (sources."elliptic-6.5.4" // { + dependencies = [ + sources."bn.js-4.12.0" + ]; + }) + sources."emoji-regex-8.0.0" + sources."emojis-list-3.0.0" + sources."encodeurl-1.0.2" + sources."end-of-stream-1.4.4" + sources."engine.io-client-6.0.3" + sources."engine.io-parser-5.0.3" + (sources."enhanced-resolve-4.5.0" // { + dependencies = [ + sources."memory-fs-0.5.0" + ]; + }) + (sources."enquirer-2.3.6" // { + dependencies = [ + sources."ansi-colors-4.1.1" + ]; + }) + sources."entities-2.2.0" + sources."errno-0.1.8" + sources."error-ex-1.3.2" + sources."error-stack-parser-2.0.7" + sources."es-abstract-1.19.1" + sources."es-to-primitive-1.2.1" + sources."es6-promise-4.2.8" + sources."escalade-3.1.1" + sources."escape-html-1.0.3" + sources."escape-string-regexp-1.0.5" + (sources."eslint-7.32.0" // { + dependencies = [ + sources."@babel/code-frame-7.12.11" + sources."acorn-7.4.1" + sources."ansi-styles-4.3.0" + sources."chalk-4.1.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."cross-spawn-7.0.3" + sources."escape-string-regexp-4.0.0" + (sources."eslint-utils-2.1.0" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) + (sources."espree-7.3.1" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) + sources."has-flag-4.0.0" + sources."ignore-4.0.6" + sources."path-key-3.1.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."supports-color-7.2.0" + sources."which-2.0.2" + ]; + }) + sources."eslint-config-prettier-6.15.0" + sources."eslint-loader-2.2.1" + sources."eslint-plugin-prettier-3.4.1" + (sources."eslint-plugin-vue-7.20.0" // { + dependencies = [ + sources."eslint-utils-2.1.0" + sources."eslint-visitor-keys-1.3.0" + sources."semver-6.3.0" + ]; + }) + sources."eslint-scope-5.1.1" + sources."eslint-utils-3.0.0" + sources."eslint-visitor-keys-2.1.0" + (sources."espree-6.2.1" // { + dependencies = [ + sources."acorn-7.4.1" + sources."eslint-visitor-keys-1.3.0" + ]; + }) + sources."esprima-4.0.1" + (sources."esquery-1.4.0" // { + dependencies = [ + sources."estraverse-5.3.0" + ]; + }) + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.3.0" + ]; + }) + sources."estraverse-4.3.0" + sources."esutils-2.0.3" + sources."etag-1.8.1" + sources."event-pubsub-4.3.0" + sources."eventemitter2-6.4.5" + sources."eventemitter3-4.0.7" + sources."events-3.3.0" + sources."eventsource-1.1.0" + sources."evp_bytestokey-1.0.3" + sources."execa-1.0.0" + (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-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."express-4.17.3" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + sources."qs-6.9.7" + ]; + }) + sources."extend-3.0.2" + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."external-editor-3.1.0" + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) + sources."extsprintf-1.3.0" + sources."fast-deep-equal-3.1.3" + sources."fast-diff-1.2.0" + sources."fast-glob-3.2.11" + sources."fast-json-stable-stringify-2.1.0" + sources."fast-levenshtein-2.0.6" + sources."fastq-1.13.0" + sources."faye-websocket-0.11.4" + sources."figgy-pudding-3.5.2" + sources."figures-3.2.0" + sources."file-entry-cache-6.0.1" + (sources."file-loader-4.3.0" // { + dependencies = [ + sources."schema-utils-2.7.1" + ]; + }) + sources."file-uri-to-path-1.0.0" + sources."filesize-3.6.1" + sources."fill-range-7.0.1" + (sources."finalhandler-1.1.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + sources."find-cache-dir-0.1.1" + sources."find-up-1.1.2" + (sources."flat-cache-3.0.4" // { + dependencies = [ + sources."rimraf-3.0.2" + ]; + }) + sources."flatted-3.2.5" + sources."flush-write-stream-1.1.1" + sources."follow-redirects-1.14.9" + sources."for-in-1.0.2" + sources."forever-agent-0.6.1" + (sources."fork-ts-checker-webpack-plugin-3.1.1" // { + dependencies = [ + sources."braces-2.3.2" + sources."extend-shallow-2.0.1" + sources."fill-range-4.0.0" sources."is-number-3.0.0" - sources."isarray-1.0.0" sources."kind-of-3.2.2" - sources."locate-path-3.0.0" - sources."lru-cache-5.1.1" - sources."make-dir-2.1.0" - sources."memory-fs-0.4.1" sources."micromatch-3.1.10" - sources."mkdirp-0.5.5" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" + sources."semver-5.7.1" + sources."to-regex-range-2.1.1" + ]; + }) + (sources."fork-ts-checker-webpack-plugin-v5-5.2.1" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."schema-utils-2.7.0" + sources."supports-color-7.2.0" + ]; + }) + sources."form-data-2.3.3" + sources."forwarded-0.2.0" + sources."fragment-cache-0.2.1" + sources."fresh-0.5.2" + sources."from2-2.3.0" + sources."fs-extra-9.1.0" + sources."fs-monkey-1.0.3" + sources."fs-write-stream-atomic-1.0.10" + sources."fs.realpath-1.0.0" + sources."fsevents-2.3.2" + sources."function-bind-1.1.1" + sources."functional-red-black-tree-1.0.1" + sources."get-caller-file-2.0.5" + sources."get-intrinsic-1.1.1" + sources."get-stdin-6.0.0" + sources."get-stream-4.1.0" + sources."get-symbol-description-1.0.0" + sources."get-value-2.0.6" + sources."getpass-0.1.7" + sources."glob-7.2.0" + sources."glob-parent-5.1.2" + sources."glob-to-regexp-0.3.0" + (sources."globals-13.12.1" // { + dependencies = [ + sources."type-fest-0.20.2" + ]; + }) + sources."globby-11.1.0" + sources."graceful-fs-4.2.9" + sources."gzip-size-5.1.1" + sources."handle-thing-2.0.1" + sources."har-schema-2.0.0" + sources."har-validator-5.1.5" + sources."has-1.0.3" + (sources."has-ansi-2.0.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + sources."has-bigints-1.0.1" + sources."has-cors-1.1.0" + sources."has-flag-3.0.0" + sources."has-symbols-1.0.3" + sources."has-tostringtag-1.0.0" + sources."has-value-1.0.0" + (sources."has-values-1.0.0" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-4.0.0" + ]; + }) + (sources."hash-base-3.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."hash-sum-2.0.0" + sources."hash.js-1.1.7" + sources."he-1.2.0" + sources."hex-color-regex-1.1.0" + sources."highlight.js-10.7.3" + sources."hls.js-1.1.2" + sources."hmac-drbg-1.0.1" + sources."hoopy-0.1.4" + sources."hosted-git-info-2.8.9" + sources."hpack.js-2.1.6" + sources."hsl-regex-1.0.0" + sources."hsla-regex-1.0.0" + sources."html-entities-1.4.0" + (sources."html-minifier-3.5.21" // { + dependencies = [ + sources."commander-2.17.1" + ]; + }) + (sources."html-webpack-plugin-3.2.0" // { + dependencies = [ + sources."big.js-3.2.0" + sources."emojis-list-2.1.0" + sources."json5-0.5.1" + sources."loader-utils-0.2.17" + sources."util.promisify-1.0.0" + ]; + }) + (sources."htmlparser2-6.1.0" // { + dependencies = [ + sources."dom-serializer-1.3.2" + sources."domelementtype-2.2.0" + sources."domutils-2.8.0" + ]; + }) + sources."http-deceiver-1.2.7" + sources."http-errors-1.8.1" + sources."http-parser-js-0.5.6" + sources."http-proxy-1.18.1" + sources."http-proxy-middleware-1.3.1" + sources."http-signature-1.2.0" + sources."https-browserify-1.0.0" + sources."human-signals-1.1.1" + sources."iconv-lite-0.4.24" + sources."icss-utils-4.1.1" + sources."ieee754-1.2.1" + sources."iferr-0.1.5" + sources."ignore-5.2.0" + sources."import-cwd-2.1.0" + sources."import-fresh-3.3.0" + (sources."import-from-2.1.0" // { + dependencies = [ + sources."resolve-from-3.0.0" + ]; + }) + (sources."import-local-2.0.0" // { + dependencies = [ + sources."find-up-3.0.0" + sources."pkg-dir-3.0.0" + ]; + }) + sources."imurmurhash-0.1.4" + sources."indexes-of-1.0.1" + sources."infer-owner-1.0.4" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + (sources."inquirer-7.3.3" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.2" + sources."cli-cursor-3.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."mimic-fn-2.1.0" + sources."onetime-5.1.2" + sources."restore-cursor-3.1.0" + sources."supports-color-7.2.0" + ]; + }) + (sources."internal-ip-4.3.0" // { + dependencies = [ + sources."default-gateway-4.2.0" + ]; + }) + sources."internal-slot-1.0.3" + sources."interpret-1.4.0" + sources."inversify-6.0.1" + sources."ip-1.1.5" + sources."ip-regex-2.1.0" + sources."ipaddr.js-1.9.1" + sources."is-absolute-url-2.1.0" + sources."is-accessor-descriptor-1.0.0" + sources."is-arguments-1.1.1" + sources."is-arrayish-0.2.1" + sources."is-bigint-1.0.4" + sources."is-binary-path-2.1.0" + sources."is-boolean-object-1.1.2" + sources."is-buffer-1.1.6" + sources."is-callable-1.2.4" + sources."is-ci-1.2.1" + sources."is-color-stop-1.1.0" + sources."is-core-module-2.8.1" + sources."is-data-descriptor-1.0.0" + sources."is-date-object-1.0.5" + sources."is-descriptor-1.0.2" + sources."is-directory-0.3.1" + sources."is-docker-2.2.1" + sources."is-extendable-0.1.1" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-3.0.0" + sources."is-glob-4.0.3" + sources."is-negative-zero-2.0.2" + sources."is-number-7.0.0" + sources."is-number-object-1.0.6" + sources."is-obj-2.0.0" + sources."is-path-cwd-2.2.0" + sources."is-path-in-cwd-2.1.0" + sources."is-path-inside-2.1.0" + sources."is-plain-obj-3.0.0" + sources."is-plain-object-2.0.4" + sources."is-regex-1.1.4" + sources."is-resolvable-1.1.0" + sources."is-shared-array-buffer-1.0.1" + sources."is-stream-1.1.0" + sources."is-string-1.0.7" + sources."is-symbol-1.0.4" + sources."is-typedarray-1.0.0" + sources."is-weakref-1.0.2" + sources."is-windows-1.0.2" + sources."is-wsl-1.1.0" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."isstream-0.1.2" + sources."javascript-stringify-2.1.0" + sources."js-message-1.0.7" + sources."js-queue-2.0.2" + sources."js-tokens-4.0.0" + sources."js-yaml-3.14.1" + sources."jsbn-0.1.1" + sources."json-parse-better-errors-1.0.2" + sources."json-parse-even-better-errors-2.3.1" + sources."json-schema-0.4.0" + sources."json-schema-traverse-0.4.1" + sources."json-stable-stringify-1.0.1" + sources."json-stable-stringify-without-jsonify-1.0.1" + sources."json-stringify-safe-5.0.1" + sources."json5-1.0.1" + sources."jsonfile-6.1.0" + sources."jsonify-0.0.0" + sources."jsprim-1.4.2" + sources."killable-1.0.1" + sources."kind-of-6.0.3" + sources."klona-2.0.5" + sources."launch-editor-2.3.0" + sources."launch-editor-middleware-2.3.0" + sources."levn-0.4.1" + sources."lines-and-columns-1.2.4" + sources."loader-fs-cache-1.0.3" + sources."loader-runner-2.4.0" + sources."loader-utils-1.4.0" + (sources."locate-path-3.0.0" // { + dependencies = [ sources."path-exists-3.0.0" - sources."pify-4.0.1" + ]; + }) + sources."lodash-4.17.21" + sources."lodash.defaultsdeep-4.6.1" + sources."lodash.mapvalues-4.6.0" + sources."lodash.memoize-4.1.2" + sources."lodash.merge-4.6.2" + sources."lodash.transform-4.6.0" + sources."lodash.truncate-4.4.2" + sources."lodash.uniq-4.5.0" + sources."log-symbols-2.2.0" + sources."loglevel-1.8.0" + sources."lower-case-1.1.4" + sources."lru-cache-6.0.0" + (sources."make-dir-2.1.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" + sources."material-design-icons-iconfont-6.1.1" + sources."md5.js-1.3.5" + sources."mdn-data-2.0.4" + sources."media-typer-0.3.0" + sources."memfs-3.4.1" + sources."memory-fs-0.4.1" + sources."merge-descriptors-1.0.1" + (sources."merge-source-map-1.1.0" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."merge-stream-2.0.0" + sources."merge2-1.4.1" + sources."methods-1.1.2" + sources."microevent.ts-0.1.1" + sources."micromatch-4.0.4" + (sources."miller-rabin-4.0.1" // { + dependencies = [ + sources."bn.js-4.12.0" + ]; + }) + sources."mime-2.6.0" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" + sources."mimic-fn-1.2.0" + (sources."mini-css-extract-plugin-0.9.0" // { + dependencies = [ + sources."normalize-url-1.9.1" + ]; + }) + sources."minimalistic-assert-1.0.1" + sources."minimalistic-crypto-utils-1.0.1" + sources."minimatch-3.1.2" + sources."minimist-1.2.5" + sources."minipass-3.1.6" + sources."mississippi-3.0.0" + (sources."mixin-deep-1.3.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."mkdirp-0.5.5" + sources."move-concurrently-1.0.1" + sources."mpegts.js-1.6.10" + sources."ms-2.1.2" + sources."multicast-dns-6.2.3" + sources."multicast-dns-service-types-1.1.0" + sources."mute-stream-0.0.8" + sources."mz-2.7.0" + sources."nan-2.15.0" + sources."nanomatch-1.2.13" + sources."natural-compare-1.4.0" + sources."negotiator-0.6.3" + sources."neo-async-2.6.2" + sources."nice-try-1.0.5" + sources."no-case-2.3.2" + sources."node-forge-0.10.0" + sources."node-ipc-9.2.1" + (sources."node-libs-browser-2.2.1" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) + sources."node-releases-2.0.2" + (sources."normalize-package-data-2.5.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."normalize-path-3.0.0" + sources."normalize-range-0.1.2" + sources."normalize-url-3.3.0" + sources."npm-run-path-2.0.2" + sources."nth-check-1.0.2" + (sources."null-loader-4.0.1" // { + dependencies = [ + sources."json5-2.2.0" + sources."loader-utils-2.0.2" + sources."schema-utils-3.1.1" + ]; + }) + sources."num2fraction-1.2.2" + sources."oauth-sign-0.9.0" + sources."object-assign-4.1.1" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."kind-of-3.2.2" + ]; + }) + sources."object-hash-1.3.1" + sources."object-inspect-1.12.0" + sources."object-is-1.1.5" + sources."object-keys-1.1.1" + sources."object-visit-1.0.1" + sources."object.assign-4.1.2" + sources."object.getownpropertydescriptors-2.1.3" + sources."object.pick-1.3.0" + sources."object.values-1.1.5" + sources."obuf-1.1.2" + sources."on-finished-2.3.0" + sources."on-headers-1.0.2" + sources."once-1.4.0" + sources."onetime-2.0.1" + sources."open-6.4.0" + sources."opener-1.5.2" + sources."opn-5.5.0" + sources."optionator-0.9.1" + (sources."ora-3.4.0" // { + dependencies = [ + sources."strip-ansi-5.2.0" + ]; + }) + sources."original-1.0.2" + sources."os-browserify-0.3.0" + sources."os-tmpdir-1.0.2" + sources."p-finally-1.0.0" + sources."p-limit-2.3.0" + sources."p-locate-3.0.0" + sources."p-map-2.1.0" + sources."p-retry-3.0.1" + sources."p-try-2.2.0" + sources."pako-1.0.11" + sources."parallel-transform-1.2.0" + sources."param-case-2.1.1" + sources."parent-module-1.0.1" + sources."parse-asn1-5.1.6" + sources."parse-json-5.2.0" + sources."parse5-5.1.1" + (sources."parse5-htmlparser2-tree-adapter-6.0.1" // { + dependencies = [ + sources."parse5-6.0.1" + ]; + }) + sources."parseqs-0.0.6" + sources."parseuri-0.0.6" + sources."parseurl-1.3.3" + sources."pascalcase-0.1.1" + sources."path-browserify-0.0.1" + sources."path-dirname-1.0.2" + sources."path-exists-2.1.0" + sources."path-is-absolute-1.0.1" + sources."path-is-inside-1.0.2" + sources."path-key-2.0.1" + sources."path-parse-1.0.7" + sources."path-to-regexp-0.1.7" + sources."path-type-4.0.0" + sources."pbkdf2-3.1.2" + sources."performance-now-2.1.0" + sources."picocolors-1.0.0" + sources."picomatch-2.3.1" + sources."pify-4.0.1" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."pkg-dir-1.0.0" + sources."pnp-webpack-plugin-1.7.0" + (sources."portfinder-1.0.28" // { + dependencies = [ + sources."debug-3.2.7" + ]; + }) + sources."posix-character-classes-0.1.1" + (sources."postcss-7.0.39" // { + dependencies = [ + sources."picocolors-0.2.1" + sources."source-map-0.6.1" + ]; + }) + sources."postcss-calc-7.0.5" + (sources."postcss-colormin-4.0.3" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-convert-values-4.0.1" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + sources."postcss-discard-comments-4.0.2" + sources."postcss-discard-duplicates-4.0.2" + sources."postcss-discard-empty-4.0.1" + sources."postcss-discard-overridden-4.0.1" + (sources."postcss-load-config-2.1.2" // { + dependencies = [ + sources."cosmiconfig-5.2.1" + sources."import-fresh-2.0.0" + sources."parse-json-4.0.0" + sources."resolve-from-3.0.0" + ]; + }) + sources."postcss-loader-3.0.0" + (sources."postcss-merge-longhand-4.0.11" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-merge-rules-4.0.3" // { + dependencies = [ + sources."postcss-selector-parser-3.1.2" + ]; + }) + (sources."postcss-minify-font-values-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-minify-gradients-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-minify-params-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-minify-selectors-4.0.2" // { + dependencies = [ + sources."postcss-selector-parser-3.1.2" + ]; + }) + sources."postcss-modules-extract-imports-2.0.0" + sources."postcss-modules-local-by-default-3.0.3" + sources."postcss-modules-scope-2.2.0" + sources."postcss-modules-values-3.0.0" + sources."postcss-normalize-charset-4.0.1" + (sources."postcss-normalize-display-values-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-normalize-positions-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-normalize-repeat-style-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-normalize-string-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-normalize-timing-functions-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-normalize-unicode-4.0.1" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-normalize-url-4.0.1" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-normalize-whitespace-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-ordered-values-4.1.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + sources."postcss-reduce-initial-4.0.3" + (sources."postcss-reduce-transforms-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + sources."postcss-selector-parser-6.0.9" + (sources."postcss-svgo-4.0.3" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + sources."postcss-unique-selectors-4.0.1" + sources."postcss-value-parser-4.2.0" + sources."prelude-ls-1.2.1" + sources."prepend-http-1.0.4" + sources."prettier-2.4.1" + sources."prettier-linter-helpers-1.0.0" + sources."pretty-error-2.1.2" + sources."process-0.11.10" + sources."process-nextick-args-2.0.1" + sources."progress-2.0.3" + sources."promise-inflight-1.0.1" + sources."proxy-addr-2.0.7" + sources."prr-1.0.1" + sources."pseudomap-1.0.2" + sources."psl-1.8.0" + (sources."public-encrypt-4.0.3" // { + dependencies = [ + sources."bn.js-4.12.0" + ]; + }) + sources."pump-3.0.0" + (sources."pumpify-1.5.1" // { + dependencies = [ + sources."pump-2.0.1" + ]; + }) + sources."punycode-2.1.1" + sources."q-1.5.1" + sources."qs-6.5.3" + sources."query-string-4.3.4" + sources."querystring-0.2.0" + sources."querystring-es3-0.2.1" + sources."querystringify-2.2.0" + sources."queue-microtask-1.2.3" + sources."randombytes-2.1.0" + sources."randomfill-1.0.4" + sources."range-parser-1.2.1" + sources."raw-body-2.4.3" + sources."read-pkg-5.2.0" + (sources."readable-stream-2.3.7" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + sources."readdirp-3.6.0" + sources."rechoir-0.6.2" + sources."reflect-metadata-0.1.13" + sources."regex-not-1.0.2" + sources."regexp.prototype.flags-1.4.1" + sources."regexpp-3.2.0" + sources."relateurl-0.2.7" + sources."remove-trailing-separator-1.1.0" + (sources."renderkid-2.0.7" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."css-select-4.2.1" + sources."css-what-5.1.0" + sources."dom-serializer-1.3.2" + sources."domelementtype-2.2.0" + sources."domutils-2.8.0" + sources."nth-check-2.0.1" + sources."strip-ansi-3.0.1" + ]; + }) + sources."repeat-element-1.1.4" + sources."repeat-string-1.6.1" + sources."request-2.88.2" + sources."require-directory-2.1.1" + sources."require-from-string-2.0.2" + sources."require-main-filename-2.0.0" + sources."requires-port-1.0.0" + sources."resize-observer-polyfill-1.5.1" + sources."resolve-1.22.0" + (sources."resolve-cwd-2.0.0" // { + dependencies = [ + sources."resolve-from-3.0.0" + ]; + }) + sources."resolve-from-4.0.0" + sources."resolve-url-0.2.1" + sources."restore-cursor-2.0.0" + sources."ret-0.1.15" + sources."retry-0.12.0" + sources."reusify-1.0.4" + sources."rgb-regex-1.0.1" + sources."rgba-regex-1.0.0" + sources."rimraf-2.7.1" + sources."ripemd160-2.0.2" + sources."roboto-fontface-0.10.0" + sources."run-async-2.4.1" + sources."run-parallel-1.2.0" + sources."run-queue-1.0.3" + sources."rxjs-6.6.7" + sources."safe-buffer-5.2.1" + sources."safe-regex-1.1.0" + sources."safer-buffer-2.1.2" + sources."sass-1.32.12" + (sources."sass-loader-10.2.0" // { + dependencies = [ + sources."json5-2.2.0" + sources."loader-utils-2.0.2" + sources."schema-utils-3.1.1" + ]; + }) + sources."sax-1.2.4" + sources."schema-utils-1.0.0" + sources."select-hose-2.0.0" + sources."selfsigned-1.10.14" + sources."semver-7.3.5" + (sources."send-0.17.2" // { + dependencies = [ + (sources."debug-2.6.9" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) + sources."mime-1.6.0" + sources."ms-2.1.3" + ]; + }) + sources."serialize-javascript-4.0.0" + (sources."serve-index-1.9.1" // { + dependencies = [ + sources."debug-2.6.9" + sources."http-errors-1.6.3" + sources."inherits-2.0.3" + sources."ms-2.0.0" + sources."setprototypeof-1.1.0" + ]; + }) + sources."serve-static-1.14.2" + 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."setprototypeof-1.2.0" + sources."sha.js-2.4.11" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."shell-quote-1.7.3" + sources."shelljs-0.8.5" + sources."side-channel-1.0.4" + sources."signal-exit-3.0.7" + (sources."simple-swizzle-0.2.2" // { + dependencies = [ + sources."is-arrayish-0.3.2" + ]; + }) + sources."slash-3.0.0" + (sources."slice-ansi-4.0.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + ]; + }) + sources."smoothscroll-polyfill-0.4.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-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."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + (sources."snapdragon-util-3.0.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."socket.io-client-4.3.2" + sources."socket.io-parser-4.1.2" + (sources."sockjs-0.3.24" // { + dependencies = [ + sources."uuid-8.3.2" + ]; + }) + (sources."sockjs-client-1.6.0" // { + dependencies = [ + sources."debug-3.2.7" + ]; + }) + (sources."sort-keys-1.1.2" // { + dependencies = [ + sources."is-plain-obj-1.1.0" + ]; + }) + sources."source-list-map-2.0.1" + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.3" + (sources."source-map-support-0.5.21" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."source-map-url-0.4.1" + sources."spark-md5-3.0.2" + sources."spdx-correct-3.1.1" + sources."spdx-exceptions-2.3.0" + sources."spdx-expression-parse-3.0.1" + sources."spdx-license-ids-3.0.11" + sources."spdy-4.0.2" + (sources."spdy-transport-3.0.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."split-string-3.1.0" + sources."sprintf-js-1.0.3" + sources."sshpk-1.17.0" + sources."ssri-6.0.2" + sources."stable-0.1.8" + sources."stackframe-1.2.1" + (sources."static-extend-0.1.2" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."statuses-1.5.0" + sources."stream-browserify-2.0.2" + sources."stream-each-1.2.3" + sources."stream-http-2.8.3" + sources."stream-shift-1.0.1" + sources."strict-uri-encode-1.1.0" + sources."string-width-4.2.3" + sources."string.prototype.trimend-1.0.4" + sources."string.prototype.trimstart-1.0.4" + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + (sources."strip-ansi-6.0.1" // { + dependencies = [ + sources."ansi-regex-5.0.1" + ]; + }) + sources."strip-eof-1.0.0" + sources."strip-final-newline-2.0.0" + sources."strip-indent-2.0.0" + sources."strip-json-comments-3.1.1" + (sources."stylehacks-4.0.3" // { + dependencies = [ + sources."postcss-selector-parser-3.1.2" + ]; + }) + sources."supports-color-5.5.0" + sources."supports-preserve-symlinks-flag-1.0.0" + sources."svgo-1.3.2" + (sources."table-6.8.0" // { + dependencies = [ + sources."ajv-8.10.0" + sources."json-schema-traverse-1.0.0" + ]; + }) + sources."tapable-1.1.3" + (sources."terser-4.8.0" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + (sources."terser-webpack-plugin-1.4.5" // { + dependencies = [ + sources."find-cache-dir-2.1.0" + sources."find-up-3.0.0" sources."pkg-dir-3.0.0" - sources."readable-stream-2.3.7" - sources."schema-utils-1.0.0" + sources."source-map-0.6.1" + ]; + }) + sources."text-table-0.2.0" + sources."thenify-3.3.1" + sources."thenify-all-1.6.0" + sources."thread-loader-2.1.3" + sources."through-2.3.8" + sources."through2-2.0.5" + sources."thunky-1.1.0" + sources."timers-browserify-2.0.12" + sources."timsort-0.3.0" + sources."tmp-0.0.33" + sources."to-arraybuffer-1.0.1" + (sources."to-object-path-0.3.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."to-regex-3.0.2" + sources."to-regex-range-5.0.1" + sources."toidentifier-1.0.1" + sources."toposort-1.0.7" + sources."tough-cookie-2.5.0" + sources."tryer-1.0.1" + (sources."ts-loader-6.2.2" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."ts-pnp-1.2.0" + sources."tslib-1.14.1" + (sources."tslint-5.20.1" // { + dependencies = [ sources."semver-5.7.1" - sources."serialize-javascript-4.0.0" - sources."ssri-6.0.2" - sources."string_decoder-1.1.1" - sources."terser-4.8.0" - sources."terser-webpack-plugin-1.4.5" - sources."to-regex-range-2.1.1" - sources."y18n-4.0.3" - sources."yallist-3.1.1" + sources."tsutils-2.29.0" + ]; + }) + sources."tsutils-3.21.0" + sources."tty-browserify-0.0.0" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-check-0.4.0" + sources."type-fest-0.6.0" + sources."type-is-1.6.18" + sources."typedarray-0.0.6" + sources."typeface-roboto-1.1.13" + sources."typescript-4.4.4" + (sources."uglify-js-3.4.10" // { + dependencies = [ + sources."commander-2.19.0" + sources."source-map-0.6.1" + ]; + }) + sources."unbox-primitive-1.0.1" + sources."union-value-1.0.1" + sources."uniq-1.0.1" + sources."uniqs-2.0.0" + sources."unique-filename-1.1.1" + sources."unique-slug-2.0.2" + sources."universalify-2.0.0" + sources."unpipe-1.0.0" + sources."unquote-1.1.1" + (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."upath-1.2.0" + sources."upper-case-1.1.3" + sources."uri-js-4.4.1" + sources."urix-0.1.0" + (sources."url-0.11.0" // { + dependencies = [ + sources."punycode-1.3.2" + ]; + }) + (sources."url-loader-2.3.0" // { + dependencies = [ + sources."schema-utils-2.7.1" + ]; + }) + sources."url-parse-1.5.10" + sources."use-3.1.1" + (sources."util-0.11.1" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) + sources."util-deprecate-1.0.2" + sources."util.promisify-1.0.1" + sources."utila-0.4.0" + sources."utils-merge-1.0.1" + sources."uuid-3.4.0" + sources."v8-compile-cache-2.3.0" + sources."validate-npm-package-license-3.0.4" + sources."vary-1.1.2" + sources."vendors-1.0.4" + sources."verror-1.10.0" + sources."vm-browserify-1.1.2" + sources."vue-2.6.14" + sources."vue-class-component-7.2.6" + sources."vue-cli-plugin-vuetify-2.4.3" + (sources."vue-eslint-parser-7.11.0" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + sources."semver-6.3.0" ]; }) - sources."webpack-sources-1.4.3" - (sources."webpack-stream-6.1.0" // { + sources."vue-hot-reload-api-2.3.4" + (sources."vue-loader-15.9.8" // { dependencies = [ + sources."hash-sum-1.0.2" + ]; + }) + (sources."vue-loader-v16-16.8.3" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."has-flag-4.0.0" + sources."json5-2.2.0" + sources."loader-utils-2.0.2" sources."supports-color-7.2.0" ]; }) + sources."vue-property-decorator-9.1.2" + sources."vue-router-3.5.3" + (sources."vue-style-loader-4.1.3" // { + dependencies = [ + sources."hash-sum-1.0.2" + ]; + }) + sources."vue-template-compiler-2.6.14" + sources."vue-template-es2015-compiler-1.9.1" + sources."vuetify-2.5.10" + sources."vuetify-datetime-picker-2.1.1" + (sources."vuetify-loader-1.7.3" // { + dependencies = [ + sources."file-loader-6.2.0" + sources."json5-2.2.0" + sources."loader-utils-2.0.2" + sources."schema-utils-3.1.1" + ]; + }) + sources."watchpack-1.7.5" + (sources."watchpack-chokidar2-2.0.1" // { + 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-glob-3.1.0" + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."micromatch-3.1.10" + sources."normalize-path-2.1.1" + sources."readdirp-2.2.1" + sources."to-regex-range-2.1.1" + ]; + }) + sources."wbuf-1.7.3" + sources."wcwidth-1.0.1" + (sources."webpack-4.46.0" // { + dependencies = [ + sources."braces-2.3.2" + sources."eslint-scope-4.0.3" + sources."extend-shallow-2.0.1" + sources."fill-range-4.0.0" + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."micromatch-3.1.10" + sources."to-regex-range-2.1.1" + ]; + }) + (sources."webpack-bundle-analyzer-3.9.0" // { + dependencies = [ + sources."acorn-7.4.1" + sources."ws-6.2.2" + ]; + }) + (sources."webpack-chain-6.5.1" // { + dependencies = [ + sources."deepmerge-1.5.2" + ]; + }) + sources."webpack-dev-middleware-3.7.3" + (sources."webpack-dev-server-3.11.3" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."anymatch-2.0.0" + sources."binary-extensions-1.13.1" + sources."braces-2.3.2" + sources."chokidar-2.1.8" + (sources."cliui-5.0.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."strip-ansi-5.2.0" + ]; + }) + sources."emoji-regex-7.0.3" + sources."extend-shallow-2.0.1" + sources."fill-range-4.0.0" + sources."find-up-3.0.0" + sources."fsevents-1.2.13" + sources."glob-parent-3.1.0" + (sources."http-proxy-middleware-0.19.1" // { + dependencies = [ + sources."is-glob-4.0.3" + ]; + }) + sources."is-absolute-url-3.0.3" + sources."is-binary-path-1.0.1" + sources."is-fullwidth-code-point-2.0.0" + sources."is-glob-3.1.0" + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."micromatch-3.1.10" + sources."normalize-path-2.1.1" + sources."readdirp-2.2.1" + sources."semver-6.3.0" + (sources."string-width-3.1.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."strip-ansi-5.2.0" + ]; + }) + sources."strip-ansi-3.0.1" + sources."supports-color-6.1.0" + sources."to-regex-range-2.1.1" + (sources."wrap-ansi-5.1.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."strip-ansi-5.2.0" + ]; + }) + sources."ws-6.2.2" + sources."yargs-13.3.2" + sources."yargs-parser-13.1.2" + ]; + }) + sources."webpack-log-2.0.0" + sources."webpack-merge-4.2.2" + (sources."webpack-sources-1.4.3" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."websocket-driver-0.7.4" + sources."websocket-extensions-0.1.4" + sources."webworkify-webpack-2.1.5" sources."which-1.3.1" - sources."which-module-1.0.0" - sources."wide-align-1.1.5" + sources."which-boxed-primitive-1.0.2" + sources."which-module-2.0.0" + sources."word-wrap-1.2.3" sources."worker-farm-1.7.0" - (sources."wrap-ansi-2.1.0" // { + sources."worker-rpc-0.1.1" + (sources."wrap-ansi-7.0.0" // { dependencies = [ - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" ]; }) sources."wrappy-1.0.2" - sources."ws-7.5.7" - sources."xmlhttprequest-ssl-1.5.5" + sources."ws-8.2.3" + sources."xmlhttprequest-ssl-2.0.0" sources."xtend-4.0.2" - sources."y18n-3.2.2" + sources."y18n-4.0.3" sources."yallist-4.0.0" - (sources."yargs-7.1.2" // { + sources."yaml-1.10.2" + (sources."yargs-16.2.0" // { dependencies = [ - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" + sources."cliui-7.0.4" + sources."y18n-5.0.8" ]; }) - sources."yargs-parser-5.0.1" + sources."yargs-parser-20.2.9" sources."yeast-0.1.2" - sources."yocto-queue-0.1.0" + (sources."yorkie-2.0.0" // { + dependencies = [ + sources."cross-spawn-5.1.0" + sources."execa-0.8.0" + sources."get-stream-3.0.0" + sources."lru-cache-4.1.5" + sources."normalize-path-1.0.0" + sources."yallist-2.1.2" + ]; + }) ]; buildInputs = globalBuildInputs; meta = { - description = "DTV Software in Japan."; - homepage = "https://github.com/l3tnun/EPGStation#readme"; - license = "MIT"; }; production = true; bypassCache = true; @@ -90737,18 +94062,18 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "8.9.0"; + version = "8.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.9.0.tgz"; - sha512 = "PB09IGwv4F4b0/atrbcMFboF/giawbBLVC7fyDamk5Wtey4Jh2K+rYaBhCAbUyEI4QzB1ly09Uglc9iCtFaG2Q=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.10.0.tgz"; + sha512 = "tcI1D9lfVec+R4LE1mNDnzoJ/f71Kl/9Cv4nG47jOueCMBrCCKYXr4AUVS7go6mWYGFD4+EoN6+eXSrEbRzXVw=="; }; dependencies = [ - (sources."@eslint/eslintrc-1.1.0" // { + (sources."@eslint/eslintrc-1.2.0" // { dependencies = [ sources."ignore-4.0.6" ]; }) - sources."@humanwhocodes/config-array-0.9.3" + sources."@humanwhocodes/config-array-0.9.5" sources."@humanwhocodes/object-schema-1.2.1" sources."acorn-8.7.0" sources."acorn-jsx-5.3.2" @@ -91026,10 +94351,10 @@ in expo-cli = nodeEnv.buildNodePackage { name = "expo-cli"; packageName = "expo-cli"; - version = "5.2.0"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/expo-cli/-/expo-cli-5.2.0.tgz"; - sha512 = "0zyZwv7mBmeeEMZ7ur5xHt/klu1CNiuMuTbsrbDOvQPqDxyLOKlQtvsJOn9VHCUt8sAlyN21Jmu7KI6lH7fSgQ=="; + url = "https://registry.npmjs.org/expo-cli/-/expo-cli-5.3.0.tgz"; + sha512 = "Oi5E+C3AtAHOwqBbL3GL1eQErfDnZGmIqbMjlDGp8WtELN0f+fdfWA4ZldCOSjnqsYg7hYQFgrZXjIXbjYsC9Q=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -91045,7 +94370,7 @@ in sources."@babel/helper-get-function-arity-7.16.7" sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-module-transforms-7.17.6" sources."@babel/helper-simple-access-7.16.7" sources."@babel/helper-split-export-declaration-7.16.7" sources."@babel/helper-validator-identifier-7.16.7" @@ -91070,15 +94395,15 @@ in sources."@babel/types-7.17.0" sources."@expo/apple-utils-0.0.0-alpha.26" sources."@expo/bunyan-4.0.0" - sources."@expo/config-6.0.18" - (sources."@expo/config-plugins-4.0.18" // { + sources."@expo/config-6.0.19" + (sources."@expo/config-plugins-4.1.0" // { dependencies = [ sources."semver-7.3.5" ]; }) sources."@expo/config-types-44.0.0" - sources."@expo/dev-server-0.1.105" - sources."@expo/dev-tools-0.13.145" + sources."@expo/dev-server-0.1.106" + sources."@expo/dev-tools-0.13.146" (sources."@expo/devcert-1.0.0" // { dependencies = [ sources."debug-3.2.7" @@ -91094,7 +94419,7 @@ in ]; }) sources."@expo/json-file-8.2.34" - sources."@expo/metro-config-0.3.11" + sources."@expo/metro-config-0.3.12" sources."@expo/osascript-2.0.31" (sources."@expo/package-manager-0.0.50" // { dependencies = [ @@ -91108,12 +94433,12 @@ in sources."xmlbuilder-14.0.0" ]; }) - sources."@expo/prebuild-config-3.0.18" + sources."@expo/prebuild-config-3.1.0" sources."@expo/rudder-sdk-node-1.1.1" sources."@expo/schemer-1.3.33" sources."@expo/sdk-runtime-versions-1.0.0" sources."@expo/spawn-async-1.5.0" - (sources."@expo/webpack-config-0.16.18" // { + (sources."@expo/webpack-config-0.16.19" // { dependencies = [ sources."is-wsl-2.2.0" ]; @@ -91159,7 +94484,7 @@ in sources."@sideway/address-4.1.3" sources."@sideway/formula-3.0.0" sources."@sideway/pinpoint-2.0.0" - sources."@sindresorhus/is-4.4.0" + sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" sources."@types/glob-7.2.0" @@ -91171,7 +94496,7 @@ in sources."@types/json-schema-7.0.9" sources."@types/keyv-3.1.3" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" sources."@types/q-1.5.5" sources."@types/responselike-1.0.0" sources."@types/retry-0.12.1" @@ -91193,7 +94518,7 @@ in ]; }) sources."@types/yargs-15.0.14" - sources."@types/yargs-parser-20.2.1" + sources."@types/yargs-parser-21.0.0" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" sources."@webassemblyjs/helper-api-error-1.9.0" @@ -91339,7 +94664,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - (sources."browserslist-4.19.3" // { + (sources."browserslist-4.20.0" // { dependencies = [ sources."picocolors-1.0.0" ]; @@ -91373,7 +94698,7 @@ in }) sources."camelcase-6.3.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001312" + sources."caniuse-lite-1.0.30001314" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -91631,7 +94956,7 @@ in sources."duplexer3-0.1.4" sources."duplexify-3.7.1" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.71" + sources."electron-to-chromium-1.4.82" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -91648,7 +94973,6 @@ in }) sources."entities-2.2.0" sources."env-editor-0.4.2" - sources."envinfo-7.8.1" sources."eol-0.9.1" sources."errno-0.1.8" sources."error-ex-1.3.2" @@ -91704,7 +95028,7 @@ in sources."fs-extra-9.1.0" ]; }) - (sources."expo-pwa-0.0.113" // { + (sources."expo-pwa-0.0.114" // { dependencies = [ sources."commander-2.20.0" ]; @@ -91838,7 +95162,7 @@ in sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -92930,7 +96254,7 @@ in }) sources."url-join-4.0.0" sources."url-loader-4.1.1" - sources."url-parse-1.5.9" + sources."url-parse-1.5.10" (sources."url-parse-lax-3.0.0" // { dependencies = [ sources."prepend-http-2.0.0" @@ -93097,7 +96421,7 @@ in sources."uuid-7.0.3" ]; }) - (sources."xdl-59.2.29" // { + (sources."xdl-59.2.30" // { dependencies = [ sources."bplist-parser-0.3.1" sources."chownr-1.1.4" @@ -93173,7 +96497,7 @@ in sources."@babel/helper-get-function-arity-7.16.7" sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-module-transforms-7.17.6" sources."@babel/helper-plugin-utils-7.16.7" sources."@babel/helper-simple-access-7.16.7" sources."@babel/helper-split-export-declaration-7.16.7" @@ -93195,7 +96519,7 @@ in sources."@jridgewell/sourcemap-codec-1.4.11" sources."@jridgewell/trace-mapping-0.3.4" sources."@types/minimist-1.2.2" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@types/normalize-package-data-2.4.1" sources."@types/yauzl-2.9.2" sources."@types/yoga-layout-1.9.2" @@ -93214,7 +96538,7 @@ in sources."base64-js-1.5.1" sources."bl-4.1.0" sources."brace-expansion-1.1.11" - sources."browserslist-4.19.3" + sources."browserslist-4.20.0" sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" sources."caller-callsite-4.1.0" @@ -93222,7 +96546,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001312" + sources."caniuse-lite-1.0.30001314" sources."chalk-2.4.2" sources."chownr-1.1.4" sources."ci-info-2.0.0" @@ -93246,8 +96570,8 @@ in ]; }) sources."delay-5.0.0" - sources."devtools-protocol-0.0.960912" - sources."electron-to-chromium-1.4.71" + sources."devtools-protocol-0.0.969999" + sources."electron-to-chromium-1.4.82" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -93338,14 +96662,14 @@ in sources."progress-2.0.3" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - (sources."puppeteer-13.3.2" // { + (sources."puppeteer-13.5.1" // { dependencies = [ sources."ws-8.5.0" ]; }) sources."quick-lru-4.0.1" sources."react-17.0.2" - sources."react-devtools-core-4.23.0" + sources."react-devtools-core-4.24.0" sources."react-reconciler-0.26.2" (sources."read-pkg-5.2.0" // { dependencies = [ @@ -93470,7 +96794,7 @@ in ]; }) sources."@oclif/linewrap-1.0.0" - sources."@oclif/parser-3.8.6" + sources."@oclif/parser-3.8.7" (sources."@oclif/plugin-autocomplete-0.1.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -93649,7 +96973,7 @@ in sources."indent-string-4.0.0" sources."inherits-2.0.4" sources."ini-1.3.8" - (sources."inquirer-8.2.0" // { + (sources."inquirer-8.2.1" // { dependencies = [ sources."ansi-escapes-4.3.2" sources."type-fest-0.21.3" @@ -93749,7 +97073,7 @@ in sources."reusify-1.0.4" sources."run-async-2.4.1" sources."run-parallel-1.2.0" - sources."rxjs-7.5.4" + sources."rxjs-7.5.5" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-7.3.5" @@ -93823,10 +97147,10 @@ in firebase-tools = nodeEnv.buildNodePackage { name = "firebase-tools"; packageName = "firebase-tools"; - version = "10.2.1"; + version = "10.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-10.2.1.tgz"; - sha512 = "MBAN5fMMiP8eUfh3pNXREOPzsjp6VpOLAWxD/h2+qLGqzmS3A1S/PQA+VCx46+ebkeo8oilNaVbNLAN/+yAbLw=="; + url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-10.2.2.tgz"; + sha512 = "KJ7C0HeZr01/uKSuU/pJ2ZUAm0OQvujkmdpKurkV4x/JQHh5MeZvCsPC+Zwn4uqTCaSpY1XZt3167c+jscgv7w=="; }; dependencies = [ (sources."@apidevtools/json-schema-ref-parser-9.0.9" // { @@ -93842,7 +97166,7 @@ in sources."@google-cloud/projectify-2.1.1" sources."@google-cloud/promisify-2.0.4" sources."@google-cloud/pubsub-2.19.0" - sources."@grpc/grpc-js-1.5.5" + sources."@grpc/grpc-js-1.5.7" sources."@grpc/proto-loader-0.6.9" sources."@jsdevtools/ono-7.1.3" (sources."@npmcli/fs-1.1.1" // { @@ -93873,14 +97197,14 @@ in sources."@types/duplexify-3.6.1" sources."@types/json-schema-7.0.9" sources."@types/long-4.0.1" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" sources."accepts-1.3.8" sources."acorn-8.7.0" sources."acorn-walk-8.2.0" sources."agent-base-6.0.2" - sources."agentkeepalive-4.2.0" + sources."agentkeepalive-4.2.1" sources."aggregate-error-3.1.0" sources."ajv-6.12.6" (sources."ajv-formats-2.1.1" // { @@ -94085,7 +97409,7 @@ in sources."end-of-stream-1.4.4" sources."env-paths-2.2.1" sources."err-code-2.0.3" - sources."es5-ext-0.10.53" + sources."es5-ext-0.10.58" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.3" sources."es6-weak-map-2.0.3" @@ -94178,7 +97502,7 @@ in sources."string_decoder-0.10.31" ]; }) - sources."gauge-4.0.1" + sources."gauge-4.0.3" sources."gaxios-4.3.2" sources."gcp-metadata-4.3.1" sources."get-caller-file-2.0.5" @@ -94194,7 +97518,7 @@ in sources."glob-slash-1.0.0" sources."glob-slasher-1.0.1" sources."global-dirs-2.1.0" - sources."google-auth-library-7.13.0" + sources."google-auth-library-7.14.0" sources."google-gax-2.29.6" sources."google-p12-pem-3.1.3" sources."got-9.6.0" @@ -94226,7 +97550,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.7" - sources."inquirer-8.2.0" + sources."inquirer-8.2.1" sources."install-artifact-from-github-1.3.0" sources."ip-1.1.5" sources."ip-regex-4.3.0" @@ -94344,11 +97668,7 @@ in ]; }) sources."media-typer-0.3.0" - (sources."memoizee-0.4.15" // { - dependencies = [ - sources."next-tick-1.1.0" - ]; - }) + sources."memoizee-0.4.15" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-2.6.0" @@ -94383,7 +97703,7 @@ in }) sources."negotiator-0.6.3" sources."netmask-2.0.2" - sources."next-tick-1.0.0" + sources."next-tick-1.1.0" sources."nice-try-1.0.5" sources."node-emoji-1.11.0" sources."node-fetch-2.6.7" @@ -94463,7 +97783,7 @@ in sources."range-parser-1.2.1" sources."raw-body-2.4.3" sources."rc-1.2.8" - sources."re2-1.17.3" + sources."re2-1.17.4" sources."readable-stream-3.6.0" sources."readdir-glob-1.1.1" sources."readdirp-3.6.0" @@ -94492,7 +97812,7 @@ in }) sources."rsvp-4.8.5" sources."run-async-2.4.1" - sources."rxjs-7.5.4" + sources."rxjs-7.5.5" sources."safe-buffer-5.2.1" sources."safe-stable-stringify-2.3.1" sources."safer-buffer-2.1.2" @@ -94648,7 +97968,7 @@ in sources."core-util-is-1.0.2" ]; }) - sources."vm2-3.9.8" + sources."vm2-3.9.9" sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" @@ -94813,7 +98133,7 @@ in sources."ieee754-1.2.1" sources."indent-string-5.0.0" sources."inherits-2.0.4" - (sources."inquirer-8.2.0" // { + (sources."inquirer-8.2.1" // { dependencies = [ sources."ansi-regex-5.0.1" sources."emoji-regex-8.0.0" @@ -94897,7 +98217,7 @@ in sources."redent-4.0.0" sources."restore-cursor-3.1.0" sources."run-async-2.4.1" - sources."rxjs-7.5.4" + sources."rxjs-7.5.5" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-7.3.5" @@ -94913,7 +98233,7 @@ in sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.11" - sources."string-width-5.1.0" + sources."string-width-5.1.2" sources."string_decoder-1.3.0" sources."strip-ansi-7.0.1" sources."strip-final-newline-2.0.0" @@ -94955,7 +98275,7 @@ in sources."@types/atob-2.1.2" sources."@types/bn.js-5.1.0" sources."@types/inquirer-6.5.0" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@types/pbkdf2-3.1.0" sources."@types/secp256k1-4.0.3" sources."@types/through-0.0.30" @@ -95147,7 +98467,7 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."verror-1.10.0" - sources."web3-utils-1.7.0" + sources."web3-utils-1.7.1" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-module-2.0.0" @@ -95234,7 +98554,7 @@ in }) sources."cache-base-1.0.1" sources."call-bind-1.0.2" - sources."caller-0.0.1" + sources."caller-1.0.1" sources."chokidar-2.1.8" (sources."class-utils-0.3.6" // { dependencies = [ @@ -95284,7 +98604,6 @@ in sources."deep-equal-2.0.5" sources."define-properties-1.1.3" sources."define-property-2.0.2" - sources."defined-0.0.0" sources."director-1.2.7" sources."dot-prop-4.2.1" sources."duplexer-0.1.2" @@ -95352,7 +98671,7 @@ in sources."graceful-fs-4.2.9" sources."has-1.0.3" sources."has-bigints-1.0.1" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -95404,7 +98723,6 @@ in sources."isarray-2.0.5" sources."isobject-3.0.1" sources."isstream-0.1.2" - sources."jsonify-0.0.0" sources."kind-of-6.0.3" sources."kuler-2.0.0" sources."lazy-1.0.11" @@ -95499,7 +98817,6 @@ in sources."repeat-element-1.1.4" sources."repeat-string-1.6.1" sources."resolve-url-0.2.1" - sources."resumer-0.0.0" sources."ret-0.1.15" sources."revalidator-0.1.8" sources."rimraf-2.7.1" @@ -95512,7 +98829,7 @@ in sources."is-extendable-0.1.1" ]; }) - sources."shush-1.0.0" + sources."shush-1.0.1" sources."side-channel-1.0.4" sources."signal-exit-3.0.7" sources."simple-swizzle-0.2.2" @@ -95572,12 +98889,7 @@ in sources."string.prototype.trimend-1.0.4" sources."string.prototype.trimstart-1.0.4" sources."string_decoder-1.1.1" - sources."strip-json-comments-0.1.3" - (sources."tape-2.3.3" // { - dependencies = [ - sources."deep-equal-0.1.2" - ]; - }) + sources."strip-json-comments-2.0.1" sources."text-hex-1.0.0" sources."through-2.3.8" (sources."to-object-path-0.3.0" // { @@ -95699,10 +99011,10 @@ in gatsby-cli = nodeEnv.buildNodePackage { name = "gatsby-cli"; packageName = "gatsby-cli"; - version = "4.7.0"; + version = "4.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-4.7.0.tgz"; - sha512 = "y5L+h7dtFjiKeBiiNtNw0HsgcMcTMokpfXHbXfIV7khCS1dxN9xtYx6lKvsxLX3ytxs3OsWTxeqfNhEB87wrNw=="; + url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-4.9.1.tgz"; + sha512 = "iU5pmwAq5d1XXo98BkYe2KccH3Dy/jsj7QsvP0CpfzOO0EFtidg5KUzPPaekLaGyoqxiMwWf0uAX7S1ERzMFYw=="; }; dependencies = [ sources."@ampproject/remapping-2.1.2" @@ -95728,7 +99040,7 @@ in sources."@babel/helper-get-function-arity-7.16.7" sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-module-transforms-7.17.6" sources."@babel/helper-plugin-utils-7.16.7" sources."@babel/helper-simple-access-7.16.7" sources."@babel/helper-split-export-declaration-7.16.7" @@ -95753,7 +99065,7 @@ in sources."@sideway/address-4.1.3" sources."@sideway/formula-3.0.0" sources."@sideway/pinpoint-2.0.0" - sources."@sindresorhus/is-4.4.0" + sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@tokenizer/token-0.3.0" sources."@turist/fetch-7.2.0" @@ -95762,7 +99074,7 @@ in sources."@types/common-tags-1.8.1" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@types/node-fetch-2.6.1" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -95782,7 +99094,7 @@ in sources."boolbase-1.0.0" sources."boxen-5.1.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.19.3" + sources."browserslist-4.20.0" sources."cacheable-lookup-5.0.4" (sources."cacheable-request-7.0.2" // { dependencies = [ @@ -95791,7 +99103,7 @@ in }) sources."call-bind-1.0.2" sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001312" + sources."caniuse-lite-1.0.30001314" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -95828,7 +99140,7 @@ in sources."configstore-5.0.1" sources."convert-hrtime-3.0.0" sources."convert-source-map-1.8.0" - sources."create-gatsby-2.7.0" + sources."create-gatsby-2.9.0" (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" @@ -95855,7 +99167,7 @@ in sources."domutils-2.8.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.4.71" + sources."electron-to-chromium-1.4.82" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-2.2.0" @@ -95887,11 +99199,11 @@ in sources."find-up-4.1.0" sources."form-data-3.0.1" sources."fs-exists-cached-1.0.0" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."gatsby-core-utils-3.7.0" - (sources."gatsby-telemetry-3.7.0" // { + sources."gatsby-core-utils-3.9.1" + (sources."gatsby-telemetry-3.9.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."boxen-4.2.0" @@ -95916,7 +99228,7 @@ in sources."graceful-fs-4.2.9" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-yarn-2.1.0" sources."hosted-git-info-3.0.8" sources."htmlparser2-6.1.0" @@ -95925,6 +99237,7 @@ in sources."human-signals-2.1.0" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" + sources."import-from-4.0.0" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" @@ -95957,6 +99270,7 @@ in sources."keyv-4.1.1" sources."kleur-3.0.3" sources."latest-version-5.1.0" + sources."lmdb-2.2.4" sources."locate-path-5.0.0" sources."lock-1.1.0" sources."lodash-4.17.21" @@ -95976,9 +99290,13 @@ in sources."minimatch-3.1.2" sources."minimist-1.2.5" sources."ms-2.1.2" + sources."msgpackr-1.5.4" + sources."msgpackr-extract-1.0.16" sources."mute-stream-0.0.8" + sources."nan-2.15.0" sources."nice-try-1.0.5" sources."node-fetch-2.6.7" + sources."node-gyp-build-4.3.0" sources."node-object-hash-2.3.10" sources."node-releases-2.0.2" sources."normalize-url-6.1.0" @@ -95989,6 +99307,7 @@ in sources."onetime-5.1.2" sources."open-7.4.2" sources."opentracing-0.14.7" + sources."ordered-binary-1.2.4" sources."os-tmpdir-1.0.2" sources."p-cancelable-2.1.1" sources."p-finally-1.0.0" @@ -96103,7 +99422,7 @@ in sources."tmp-0.2.1" sources."to-fast-properties-2.0.0" sources."to-readable-stream-1.0.0" - sources."token-types-4.1.1" + sources."token-types-4.2.0" sources."tr46-0.0.3" sources."tslib-1.14.1" sources."type-fest-0.20.2" @@ -96115,6 +99434,7 @@ in sources."util-deprecate-1.0.2" sources."utila-0.4.0" sources."uuid-3.4.0" + sources."weak-lru-cache-1.2.2" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-1.3.1" @@ -96160,10 +99480,10 @@ in generator-code = nodeEnv.buildNodePackage { name = "generator-code"; packageName = "generator-code"; - version = "1.6.7"; + version = "1.6.8"; src = fetchurl { - url = "https://registry.npmjs.org/generator-code/-/generator-code-1.6.7.tgz"; - sha512 = "T6i3kosKqbzgVP99cFpGyovKpNHpTmxPIZjfbNMlyCinj1oIclZ3qcHnI7jttJbXb/XHfNPqDLKQEHL+jCHTZQ=="; + url = "https://registry.npmjs.org/generator-code/-/generator-code-1.6.8.tgz"; + sha512 = "0VMjRsX2HVhDboVUJIZ2N6ig7f/KG69V1AlTGIMUcxQzeLtjAFtxSdFQ2Z+hjmsu4Wjl6RjPj6NczIu3eSZ6mQ=="; }; dependencies = [ sources."@babel/code-frame-7.16.7" @@ -96414,6 +99734,7 @@ in sources."asyncmemo-1.0.0" sources."chloride-2.4.1" sources."chloride-test-1.2.4" + sources."clarify-error-1.0.0" sources."commander-2.20.3" sources."debug-4.3.3" sources."deep-extend-0.6.0" @@ -96434,7 +99755,7 @@ in sources."ini-1.3.8" sources."ip-1.1.5" sources."is-canonical-base64-1.1.1" - sources."is-my-ip-valid-1.0.0" + sources."is-my-ip-valid-1.0.1" sources."is-my-json-valid-2.20.6" sources."is-property-1.0.2" sources."is-valid-domain-0.0.20" @@ -96458,7 +99779,7 @@ in sources."multiserver-3.8.2" sources."multiserver-address-1.0.1" sources."multiserver-scopes-2.0.0" - sources."muxrpc-6.7.0" + sources."muxrpc-6.7.2" sources."nearley-2.20.1" sources."node-gyp-build-4.3.0" sources."node-polyglot-1.0.0" @@ -96484,11 +99805,7 @@ in sources."pull-git-packidx-parser-1.0.0" sources."pull-git-remote-helper-2.0.0" sources."pull-git-repo-1.2.1" - (sources."pull-goodbye-0.0.2" // { - dependencies = [ - sources."pull-stream-3.5.0" - ]; - }) + sources."pull-goodbye-0.0.3" sources."pull-handshake-1.1.4" sources."pull-hash-1.0.0" sources."pull-hyperscript-0.2.2" @@ -96521,7 +99838,7 @@ in sources."remove-markdown-0.1.0" sources."ret-0.1.15" sources."safe-buffer-5.2.1" - sources."secret-handshake-1.1.20" + sources."secret-handshake-1.1.21" sources."semver-5.7.1" sources."separator-escape-0.0.1" sources."sha.js-2.4.5" @@ -96624,12 +99941,12 @@ in sources."@gitbeaker/core-35.4.0" sources."@gitbeaker/node-35.4.0" sources."@gitbeaker/requester-utils-35.4.0" - sources."@sindresorhus/is-4.4.0" + sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@types/responselike-1.0.0" sources."ansi-regex-6.0.1" sources."ansi-styles-4.3.0" @@ -96667,7 +99984,7 @@ in sources."got-11.8.3" sources."has-1.0.3" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."http-cache-semantics-4.1.0" sources."http2-wrapper-1.0.3" sources."ieee754-1.2.1" @@ -96679,7 +99996,7 @@ in sources."li-1.3.0" (sources."log-symbols-5.1.0" // { dependencies = [ - sources."chalk-5.0.0" + sources."chalk-5.0.1" ]; }) sources."lowercase-keys-2.0.0" @@ -96694,7 +100011,7 @@ in sources."onetime-5.1.2" (sources."ora-6.1.0" // { dependencies = [ - sources."chalk-5.0.0" + sources."chalk-5.0.1" ]; }) sources."p-cancelable-2.1.1" @@ -96821,7 +100138,7 @@ in sources."defaults-1.0.3" sources."defer-to-connect-1.1.3" sources."degenerator-3.0.2" - sources."depd-1.1.2" + sources."depd-2.0.0" sources."dot-prop-6.0.1" sources."duplexer3-0.1.4" sources."emoji-regex-8.0.0" @@ -96865,7 +100182,7 @@ in sources."has-yarn-2.1.0" sources."hosted-git-info-4.1.0" sources."http-cache-semantics-4.1.0" - sources."http-errors-1.8.1" + sources."http-errors-2.0.0" sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.0" sources."human-signals-2.1.0" @@ -96876,7 +100193,7 @@ in sources."indent-string-4.0.0" sources."inherits-2.0.4" sources."ini-2.0.0" - sources."inquirer-8.2.0" + sources."inquirer-8.2.1" (sources."inquirer-autocomplete-prompt-1.4.0" // { dependencies = [ sources."rxjs-6.6.7" @@ -96982,7 +100299,7 @@ in sources."punycode-2.1.1" sources."pupa-2.1.1" sources."quick-lru-4.0.1" - sources."raw-body-2.4.3" + sources."raw-body-2.5.1" (sources."rc-1.2.8" // { dependencies = [ sources."ini-1.3.8" @@ -97013,7 +100330,7 @@ in sources."responselike-1.0.2" sources."restore-cursor-3.1.0" sources."run-async-2.4.1" - sources."rxjs-7.5.4" + sources."rxjs-7.5.5" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-7.3.5" @@ -97034,7 +100351,7 @@ in sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.11" - sources."statuses-1.5.0" + sources."statuses-2.0.1" sources."string-width-4.2.3" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" @@ -97061,7 +100378,7 @@ in sources."url-parse-lax-3.0.0" sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" - sources."vm2-3.9.8" + sources."vm2-3.9.9" sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" @@ -97262,7 +100579,7 @@ in sources."xtend-4.0.2" sources."y18n-5.0.8" sources."yargs-17.3.1" - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" sources."yauzl-2.10.0" ]; buildInputs = globalBuildInputs; @@ -97328,9 +100645,9 @@ in sources."tslib-2.1.0" ]; }) - (sources."@graphql-tools/import-6.6.5" // { + (sources."@graphql-tools/import-6.6.6" // { dependencies = [ - sources."@graphql-tools/utils-8.6.1" + sources."@graphql-tools/utils-8.6.2" sources."tslib-2.3.1" ]; }) @@ -97355,10 +100672,10 @@ in sources."tslib-2.3.1" ]; }) - (sources."@graphql-tools/schema-8.3.1" // { + (sources."@graphql-tools/schema-8.3.2" // { dependencies = [ - sources."@graphql-tools/merge-8.2.2" - sources."@graphql-tools/utils-8.6.1" + sources."@graphql-tools/merge-8.2.3" + sources."@graphql-tools/utils-8.6.2" sources."tslib-2.3.1" ]; }) @@ -97389,7 +100706,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -97548,7 +100865,7 @@ in sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."http-cache-semantics-4.1.0" sources."http-signature-1.2.0" @@ -97843,7 +101160,7 @@ in sources."yargs-parser-20.2.9" ]; }) - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -97879,15 +101196,15 @@ in }) sources."@cronvel/get-pixels-3.4.0" sources."@endemolshinegroup/cosmiconfig-typescript-loader-3.0.2" - sources."@graphql-tools/batch-execute-8.3.1" - sources."@graphql-tools/delegate-8.5.0" - sources."@graphql-tools/graphql-file-loader-7.3.3" - sources."@graphql-tools/import-6.6.5" - sources."@graphql-tools/json-file-loader-7.3.3" - sources."@graphql-tools/load-7.5.1" - sources."@graphql-tools/merge-8.2.2" - sources."@graphql-tools/schema-8.3.1" - (sources."@graphql-tools/url-loader-7.7.1" // { + sources."@graphql-tools/batch-execute-8.3.2" + sources."@graphql-tools/delegate-8.5.2" + sources."@graphql-tools/graphql-file-loader-7.3.4" + sources."@graphql-tools/import-6.6.6" + sources."@graphql-tools/json-file-loader-7.3.4" + sources."@graphql-tools/load-7.5.2" + sources."@graphql-tools/merge-8.2.3" + sources."@graphql-tools/schema-8.3.2" + (sources."@graphql-tools/url-loader-7.9.1" // { dependencies = [ (sources."subscriptions-transport-ws-0.11.0" // { dependencies = [ @@ -97897,8 +101214,8 @@ in sources."ws-8.5.0" ]; }) - sources."@graphql-tools/utils-8.6.1" - sources."@graphql-tools/wrap-8.4.0" + sources."@graphql-tools/utils-8.6.2" + sources."@graphql-tools/wrap-8.4.3" sources."@iarna/toml-2.2.5" sources."@n1ru4l/graphql-live-query-0.9.0" sources."@nodelib/fs.scandir-2.1.5" @@ -97908,7 +101225,11 @@ in sources."@oclif/config-1.17.0" sources."@oclif/errors-1.3.4" sources."@oclif/linewrap-1.0.0" - sources."@oclif/parser-3.8.6" + (sources."@oclif/parser-3.8.7" // { + dependencies = [ + sources."@oclif/errors-1.3.5" + ]; + }) (sources."@oclif/plugin-help-3.2.1" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -97930,10 +101251,10 @@ in }) sources."@oclif/screen-1.0.4" sources."@types/json-schema-7.0.9" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.5" - sources."@types/ws-8.2.3" + sources."@types/ws-8.5.2" sources."abort-controller-3.0.0" sources."accepts-1.3.8" sources."ansi-escapes-3.2.0" @@ -97997,7 +101318,7 @@ in sources."semver-5.7.1" ]; }) - sources."cross-undici-fetch-0.1.24" + sources."cross-undici-fetch-0.1.25" sources."cwise-compiler-1.1.3" sources."dataloader-2.0.0" sources."debug-4.3.3" @@ -98056,8 +101377,8 @@ in sources."graphql-language-service-parser-1.10.4" sources."graphql-language-service-types-1.8.7" sources."graphql-language-service-utils-2.5.1" - sources."graphql-sse-1.0.6" - sources."graphql-ws-5.6.0" + sources."graphql-sse-1.1.0" + sources."graphql-ws-5.6.2" sources."has-flag-4.0.0" sources."http-errors-1.6.3" sources."hyperlinker-1.0.0" @@ -98101,7 +101422,7 @@ in sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" sources."merge2-1.4.1" - sources."meros-1.1.4" + sources."meros-1.2.0" sources."methods-1.1.2" sources."micromatch-4.0.4" sources."mime-1.4.1" @@ -98196,13 +101517,12 @@ in sources."ts-node-9.1.1" sources."tslib-2.3.1" sources."type-is-1.6.18" - sources."undici-4.14.1" + sources."undici-4.15.1" sources."uniq-1.0.1" sources."universalify-0.1.2" sources."unixify-1.0.0" sources."unpipe-1.0.0" sources."utils-merge-1.0.1" - sources."valid-url-1.0.9" sources."value-or-promise-1.0.11" sources."vary-1.1.2" sources."vscode-languageserver-types-3.16.0" @@ -98328,10 +101648,10 @@ in meshcommander = nodeEnv.buildNodePackage { name = "meshcommander"; packageName = "meshcommander"; - version = "0.9.2-b"; + version = "0.9.3-b"; src = fetchurl { - url = "https://registry.npmjs.org/meshcommander/-/meshcommander-0.9.2-b.tgz"; - sha512 = "aTPHEnqnIDzsCcL7O7FPnMmKN0Z9Sy5rl58atknikYbLISiu3LHESWUFvFGHHodSs0NVCGM/m5OR5BIVWYxnMg=="; + url = "https://registry.npmjs.org/meshcommander/-/meshcommander-0.9.3-b.tgz"; + sha512 = "RNWHDlBCihL4v/BbqmcyqB3mui8qcza28Vp29FZL7j9d0y4u1UJyjtoHEwjOHw76gX6IMYKcLPksUo5cLDJcEw=="; }; dependencies = [ sources."accepts-1.3.8" @@ -98494,7 +101814,7 @@ in sources."marked-4.0.12" (sources."marked-terminal-5.1.1" // { dependencies = [ - sources."chalk-5.0.0" + sources."chalk-5.0.1" ]; }) sources."memory-streams-0.1.3" @@ -98522,7 +101842,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-5.11.4" + sources."systeminformation-5.11.7" sources."term-canvas-0.0.5" sources."type-fest-1.4.0" sources."wordwrap-0.0.3" @@ -98663,7 +101983,7 @@ in sources."each-props-1.3.2" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" - sources."es5-ext-0.10.53" + sources."es5-ext-0.10.58" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.3" sources."es6-weak-map-2.0.3" @@ -98741,7 +102061,7 @@ in sources."gulp-cli-2.3.0" sources."gulplog-1.0.0" sources."has-1.0.3" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -98811,7 +102131,7 @@ in sources."mute-stdout-1.0.1" sources."nan-2.15.0" sources."nanomatch-1.2.13" - sources."next-tick-1.0.0" + sources."next-tick-1.1.0" sources."normalize-package-data-2.5.0" sources."normalize-path-3.0.0" sources."now-and-later-2.0.1" @@ -99083,7 +102403,7 @@ in ]; }) sources."error-ex-1.3.2" - sources."es5-ext-0.10.53" + sources."es5-ext-0.10.58" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.3" (sources."expand-brackets-2.1.4" // { @@ -99142,7 +102462,7 @@ in sources."graceful-fs-4.2.9" sources."gulplog-1.0.0" sources."has-1.0.3" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -99230,7 +102550,7 @@ in sources."kind-of-6.0.3" ]; }) - sources."next-tick-1.0.0" + sources."next-tick-1.1.0" sources."normalize-package-data-2.5.0" sources."number-is-nan-1.0.1" (sources."object-copy-0.1.0" // { @@ -99420,7 +102740,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.15.1" + sources."uglify-js-3.15.3" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; @@ -99508,7 +102828,7 @@ in sources."get-intrinsic-1.1.1" sources."has-1.0.3" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."he-1.2.0" sources."html-encoding-sniffer-3.0.0" sources."http-proxy-1.18.1" @@ -99725,7 +103045,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.1077.0" + sources."aws-sdk-2.1092.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."base64-js-1.5.1" @@ -99929,7 +103249,7 @@ in sources."jmp-2.0.0" sources."jp-kernel-2.0.0" sources."nan-2.14.2" - sources."nel-1.2.0" + sources."nel-1.3.0" sources."node-gyp-build-4.3.0" sources."uuid-3.4.0" sources."zeromq-5.2.8" @@ -100267,7 +103587,7 @@ in }; dependencies = [ sources."@jcubic/lily-0.3.0" - sources."@types/jquery-3.5.13" + sources."@types/jquery-3.5.14" sources."@types/sizzle-2.3.3" sources."ansidec-0.3.4" sources."arch-2.2.0" @@ -100296,7 +103616,7 @@ in sources."is-wsl-2.2.0" sources."isexe-2.0.0" sources."jquery-3.6.0" - sources."jquery.terminal-2.31.1" + sources."jquery.terminal-2.32.1" sources."jsonfile-2.4.0" sources."keyboardevent-key-polyfill-1.1.0" sources."line-reader-0.4.0" @@ -100335,10 +103655,10 @@ in intelephense = nodeEnv.buildNodePackage { name = "intelephense"; packageName = "intelephense"; - version = "1.8.1"; + version = "1.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/intelephense/-/intelephense-1.8.1.tgz"; - sha512 = "fbyGBN90QJX4cRkCQtxWltYp/8c/0QCPZrHCQmZJX9iGN91bq/QmggjPbh5/jdHB6johHGxB/LamJIyFFwOVxQ=="; + url = "https://registry.npmjs.org/intelephense/-/intelephense-1.8.2.tgz"; + sha512 = "u7n8UdvFlZcE8LpGDPpc2miBD0zOd9fBMKajeF04KkVCOX7s6Ua+qK9r+zvQBjQT53O7p9XGSEVAUvB4q98b5w=="; }; dependencies = [ sources."@bmewburn/js-beautify-1.13.0" @@ -100505,7 +103825,7 @@ in sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."typescript-4.5.5" + sources."typescript-4.6.2" sources."universalify-2.0.0" sources."uri-js-4.4.1" sources."uuid-3.4.0" @@ -100515,7 +103835,7 @@ in sources."vscode-languageserver-types-3.16.0" ]; }) - (sources."vscode-html-languageservice-4.2.1" // { + (sources."vscode-html-languageservice-4.2.2" // { dependencies = [ sources."vscode-languageserver-types-3.16.0" ]; @@ -100609,7 +103929,7 @@ in sources."deep-is-0.1.4" sources."degenerator-2.2.0" sources."delayed-stream-1.0.0" - sources."depd-1.1.2" + sources."depd-2.0.0" sources."diff-4.0.2" (sources."duplexer2-0.1.4" // { dependencies = [ @@ -100660,8 +103980,8 @@ in sources."graceful-fs-4.2.9" sources."has-1.0.3" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" - sources."http-errors-1.8.1" + sources."has-symbols-1.0.3" + sources."http-errors-2.0.0" sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.0" sources."iconv-lite-0.4.24" @@ -100759,7 +104079,7 @@ in sources."proxy-from-env-1.1.0" sources."pump-3.0.0" sources."qs-6.10.3" - sources."raw-body-2.4.3" + sources."raw-body-2.5.1" sources."readable-stream-3.6.0" sources."restore-cursor-2.0.0" sources."rimraf-3.0.2" @@ -100789,7 +104109,7 @@ in sources."source-map-0.6.1" sources."split2-3.2.2" sources."ssh-config-1.1.6" - sources."statuses-1.5.0" + sources."statuses-2.0.1" (sources."stream-combiner2-1.1.1" // { dependencies = [ sources."readable-stream-2.3.7" @@ -100870,42 +104190,42 @@ in dependencies = [ sources."@iarna/toml-2.2.5" sources."@msgpack/msgpack-2.7.2" - sources."@ot-builder/bin-composite-types-1.3.3" - sources."@ot-builder/bin-util-1.3.3" - sources."@ot-builder/cli-help-shower-1.3.3" - sources."@ot-builder/cli-proc-1.3.3" - sources."@ot-builder/cli-shared-1.3.3" - sources."@ot-builder/common-impl-1.3.3" - sources."@ot-builder/errors-1.3.3" - sources."@ot-builder/io-bin-cff-1.3.3" - sources."@ot-builder/io-bin-encoding-1.3.3" - sources."@ot-builder/io-bin-ext-private-1.3.3" - sources."@ot-builder/io-bin-font-1.3.3" - sources."@ot-builder/io-bin-glyph-store-1.3.3" - sources."@ot-builder/io-bin-layout-1.3.3" - sources."@ot-builder/io-bin-metadata-1.3.3" - sources."@ot-builder/io-bin-metric-1.3.3" - sources."@ot-builder/io-bin-name-1.3.3" - sources."@ot-builder/io-bin-sfnt-1.3.3" - sources."@ot-builder/io-bin-ttf-1.3.3" - sources."@ot-builder/io-bin-vtt-private-1.3.3" - sources."@ot-builder/ot-1.3.3" - sources."@ot-builder/ot-encoding-1.3.3" - sources."@ot-builder/ot-ext-private-1.3.3" - sources."@ot-builder/ot-glyphs-1.3.3" - sources."@ot-builder/ot-layout-1.3.3" - sources."@ot-builder/ot-metadata-1.3.3" - sources."@ot-builder/ot-name-1.3.3" - sources."@ot-builder/ot-sfnt-1.3.3" - sources."@ot-builder/ot-standard-glyph-namer-1.3.3" - sources."@ot-builder/ot-vtt-private-1.3.3" - sources."@ot-builder/prelude-1.3.3" - sources."@ot-builder/primitive-1.3.3" - sources."@ot-builder/rectify-1.3.3" - sources."@ot-builder/stat-glyphs-1.3.3" - sources."@ot-builder/trace-1.3.3" - sources."@ot-builder/var-store-1.3.3" - sources."@ot-builder/variance-1.3.3" + sources."@ot-builder/bin-composite-types-1.4.0" + sources."@ot-builder/bin-util-1.4.0" + sources."@ot-builder/cli-help-shower-1.4.0" + sources."@ot-builder/cli-proc-1.4.0" + sources."@ot-builder/cli-shared-1.4.0" + sources."@ot-builder/common-impl-1.4.0" + sources."@ot-builder/errors-1.4.0" + sources."@ot-builder/io-bin-cff-1.4.0" + sources."@ot-builder/io-bin-encoding-1.4.0" + sources."@ot-builder/io-bin-ext-private-1.4.0" + sources."@ot-builder/io-bin-font-1.4.0" + sources."@ot-builder/io-bin-glyph-store-1.4.0" + sources."@ot-builder/io-bin-layout-1.4.0" + sources."@ot-builder/io-bin-metadata-1.4.0" + sources."@ot-builder/io-bin-metric-1.4.0" + sources."@ot-builder/io-bin-name-1.4.0" + sources."@ot-builder/io-bin-sfnt-1.4.0" + sources."@ot-builder/io-bin-ttf-1.4.0" + sources."@ot-builder/io-bin-vtt-private-1.4.0" + sources."@ot-builder/ot-1.4.0" + sources."@ot-builder/ot-encoding-1.4.0" + sources."@ot-builder/ot-ext-private-1.4.0" + sources."@ot-builder/ot-glyphs-1.4.0" + sources."@ot-builder/ot-layout-1.4.0" + sources."@ot-builder/ot-metadata-1.4.0" + sources."@ot-builder/ot-name-1.4.0" + sources."@ot-builder/ot-sfnt-1.4.0" + sources."@ot-builder/ot-standard-glyph-namer-1.4.0" + sources."@ot-builder/ot-vtt-private-1.4.0" + sources."@ot-builder/prelude-1.4.0" + sources."@ot-builder/primitive-1.4.0" + sources."@ot-builder/rectify-1.4.0" + sources."@ot-builder/stat-glyphs-1.4.0" + sources."@ot-builder/trace-1.4.0" + sources."@ot-builder/var-store-1.4.0" + sources."@ot-builder/variance-1.4.0" sources."@unicode/unicode-14.0.0-1.2.1" sources."@xmldom/xmldom-0.7.5" sources."aglfn-1.0.2" @@ -100952,7 +104272,7 @@ in sources."esutils-2.0.3" sources."fast-deep-equal-3.1.3" sources."fast-levenshtein-2.0.6" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."get-caller-file-2.0.5" sources."graceful-fs-4.2.9" sources."has-flag-4.0.0" @@ -100967,8 +104287,8 @@ in sources."mimic-fn-2.1.0" sources."onetime-5.1.2" sources."optionator-0.8.3" - sources."ot-builder-1.3.3" - sources."otb-ttc-bundle-1.3.3" + sources."ot-builder-1.4.0" + sources."otb-ttc-bundle-1.4.0" sources."passerror-1.1.1" sources."patel-0.37.1" sources."patrisika-0.24.0" @@ -101003,7 +104323,7 @@ in (sources."verda-1.5.0" // { dependencies = [ sources."yargs-17.3.1" - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" ]; }) sources."wawoff2-2.0.1" @@ -101158,11 +104478,21 @@ in sources."tslib-1.14.1" ]; }) + (sources."@aws-crypto/crc32c-2.0.0" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) (sources."@aws-crypto/ie11-detection-2.0.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) + (sources."@aws-crypto/sha1-browser-2.0.0" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) (sources."@aws-crypto/sha256-browser-2.0.0" // { dependencies = [ sources."tslib-1.14.1" @@ -101183,85 +104513,87 @@ in sources."tslib-1.14.1" ]; }) - sources."@aws-sdk/abort-controller-3.52.0" + sources."@aws-sdk/abort-controller-3.54.0" sources."@aws-sdk/chunked-blob-reader-3.52.0" sources."@aws-sdk/chunked-blob-reader-native-3.52.0" - sources."@aws-sdk/client-s3-3.52.0" - sources."@aws-sdk/client-sso-3.52.0" - sources."@aws-sdk/client-sts-3.52.0" - sources."@aws-sdk/config-resolver-3.52.0" - sources."@aws-sdk/credential-provider-env-3.52.0" - sources."@aws-sdk/credential-provider-imds-3.52.0" - sources."@aws-sdk/credential-provider-ini-3.52.0" - sources."@aws-sdk/credential-provider-node-3.52.0" - sources."@aws-sdk/credential-provider-process-3.52.0" - sources."@aws-sdk/credential-provider-sso-3.52.0" - sources."@aws-sdk/credential-provider-web-identity-3.52.0" - sources."@aws-sdk/eventstream-marshaller-3.52.0" - sources."@aws-sdk/eventstream-serde-browser-3.52.0" - sources."@aws-sdk/eventstream-serde-config-resolver-3.52.0" - sources."@aws-sdk/eventstream-serde-node-3.52.0" - sources."@aws-sdk/eventstream-serde-universal-3.52.0" - sources."@aws-sdk/fetch-http-handler-3.52.0" - sources."@aws-sdk/hash-blob-browser-3.52.0" - sources."@aws-sdk/hash-node-3.52.0" - sources."@aws-sdk/hash-stream-node-3.52.0" - sources."@aws-sdk/invalid-dependency-3.52.0" + sources."@aws-sdk/client-s3-3.54.0" + sources."@aws-sdk/client-sso-3.54.0" + sources."@aws-sdk/client-sts-3.54.0" + sources."@aws-sdk/config-resolver-3.54.0" + sources."@aws-sdk/credential-provider-env-3.54.0" + sources."@aws-sdk/credential-provider-imds-3.54.0" + sources."@aws-sdk/credential-provider-ini-3.54.0" + sources."@aws-sdk/credential-provider-node-3.54.0" + sources."@aws-sdk/credential-provider-process-3.54.0" + sources."@aws-sdk/credential-provider-sso-3.54.0" + sources."@aws-sdk/credential-provider-web-identity-3.54.0" + sources."@aws-sdk/eventstream-marshaller-3.54.0" + sources."@aws-sdk/eventstream-serde-browser-3.54.0" + sources."@aws-sdk/eventstream-serde-config-resolver-3.54.0" + sources."@aws-sdk/eventstream-serde-node-3.54.0" + sources."@aws-sdk/eventstream-serde-universal-3.54.0" + sources."@aws-sdk/fetch-http-handler-3.54.0" + sources."@aws-sdk/hash-blob-browser-3.54.0" + sources."@aws-sdk/hash-node-3.54.0" + sources."@aws-sdk/hash-stream-node-3.54.0" + sources."@aws-sdk/invalid-dependency-3.54.0" sources."@aws-sdk/is-array-buffer-3.52.0" - sources."@aws-sdk/md5-js-3.52.0" - sources."@aws-sdk/middleware-apply-body-checksum-3.52.0" - sources."@aws-sdk/middleware-bucket-endpoint-3.52.0" - sources."@aws-sdk/middleware-content-length-3.52.0" - sources."@aws-sdk/middleware-expect-continue-3.52.0" - sources."@aws-sdk/middleware-header-default-3.52.0" - sources."@aws-sdk/middleware-host-header-3.52.0" - sources."@aws-sdk/middleware-location-constraint-3.52.0" - sources."@aws-sdk/middleware-logger-3.52.0" - (sources."@aws-sdk/middleware-retry-3.52.0" // { + sources."@aws-sdk/md5-js-3.54.0" + sources."@aws-sdk/middleware-bucket-endpoint-3.54.0" + sources."@aws-sdk/middleware-content-length-3.54.0" + sources."@aws-sdk/middleware-expect-continue-3.54.0" + sources."@aws-sdk/middleware-flexible-checksums-3.54.0" + sources."@aws-sdk/middleware-header-default-3.54.0" + sources."@aws-sdk/middleware-host-header-3.54.0" + sources."@aws-sdk/middleware-location-constraint-3.54.0" + sources."@aws-sdk/middleware-logger-3.54.0" + (sources."@aws-sdk/middleware-retry-3.54.0" // { dependencies = [ sources."uuid-8.3.2" ]; }) - sources."@aws-sdk/middleware-sdk-s3-3.52.0" - sources."@aws-sdk/middleware-sdk-sts-3.52.0" - sources."@aws-sdk/middleware-serde-3.52.0" - sources."@aws-sdk/middleware-signing-3.52.0" - sources."@aws-sdk/middleware-ssec-3.52.0" - sources."@aws-sdk/middleware-stack-3.52.0" - sources."@aws-sdk/middleware-user-agent-3.52.0" - sources."@aws-sdk/node-config-provider-3.52.0" - sources."@aws-sdk/node-http-handler-3.52.0" - sources."@aws-sdk/property-provider-3.52.0" - sources."@aws-sdk/protocol-http-3.52.0" - sources."@aws-sdk/querystring-builder-3.52.0" - sources."@aws-sdk/querystring-parser-3.52.0" - sources."@aws-sdk/s3-request-presigner-3.52.0" - sources."@aws-sdk/service-error-classification-3.52.0" + sources."@aws-sdk/middleware-sdk-s3-3.54.0" + sources."@aws-sdk/middleware-sdk-sts-3.54.0" + sources."@aws-sdk/middleware-serde-3.54.0" + sources."@aws-sdk/middleware-signing-3.54.0" + sources."@aws-sdk/middleware-ssec-3.54.0" + sources."@aws-sdk/middleware-stack-3.54.0" + sources."@aws-sdk/middleware-user-agent-3.54.0" + sources."@aws-sdk/node-config-provider-3.54.0" + sources."@aws-sdk/node-http-handler-3.54.0" + sources."@aws-sdk/property-provider-3.54.0" + sources."@aws-sdk/protocol-http-3.54.0" + sources."@aws-sdk/querystring-builder-3.54.0" + sources."@aws-sdk/querystring-parser-3.54.0" + sources."@aws-sdk/s3-request-presigner-3.54.0" + sources."@aws-sdk/service-error-classification-3.54.0" sources."@aws-sdk/shared-ini-file-loader-3.52.0" - sources."@aws-sdk/signature-v4-3.52.0" - sources."@aws-sdk/smithy-client-3.52.0" - sources."@aws-sdk/types-3.52.0" - sources."@aws-sdk/url-parser-3.52.0" + sources."@aws-sdk/signature-v4-3.54.0" + sources."@aws-sdk/smithy-client-3.54.0" + sources."@aws-sdk/types-3.54.0" + sources."@aws-sdk/url-parser-3.54.0" sources."@aws-sdk/util-arn-parser-3.52.0" sources."@aws-sdk/util-base64-browser-3.52.0" sources."@aws-sdk/util-base64-node-3.52.0" - sources."@aws-sdk/util-body-length-browser-3.52.0" - sources."@aws-sdk/util-body-length-node-3.52.0" + sources."@aws-sdk/util-body-length-browser-3.54.0" + sources."@aws-sdk/util-body-length-node-3.54.0" sources."@aws-sdk/util-buffer-from-3.52.0" sources."@aws-sdk/util-config-provider-3.52.0" - sources."@aws-sdk/util-create-request-3.52.0" - sources."@aws-sdk/util-credentials-3.52.0" - sources."@aws-sdk/util-defaults-mode-browser-3.52.0" - sources."@aws-sdk/util-defaults-mode-node-3.52.0" - sources."@aws-sdk/util-format-url-3.52.0" + sources."@aws-sdk/util-create-request-3.54.0" + sources."@aws-sdk/util-credentials-3.53.0" + sources."@aws-sdk/util-defaults-mode-browser-3.54.0" + sources."@aws-sdk/util-defaults-mode-node-3.54.0" + sources."@aws-sdk/util-format-url-3.54.0" sources."@aws-sdk/util-hex-encoding-3.52.0" sources."@aws-sdk/util-locate-window-3.52.0" + sources."@aws-sdk/util-stream-browser-3.54.0" + sources."@aws-sdk/util-stream-node-3.54.0" sources."@aws-sdk/util-uri-escape-3.52.0" - sources."@aws-sdk/util-user-agent-browser-3.52.0" - sources."@aws-sdk/util-user-agent-node-3.52.0" + sources."@aws-sdk/util-user-agent-browser-3.54.0" + sources."@aws-sdk/util-user-agent-node-3.54.0" sources."@aws-sdk/util-utf8-browser-3.52.0" sources."@aws-sdk/util-utf8-node-3.52.0" - sources."@aws-sdk/util-waiter-3.52.0" + sources."@aws-sdk/util-waiter-3.54.0" sources."@aws-sdk/xml-builder-3.52.0" sources."@braintree/sanitize-url-3.1.0" sources."@cronvel/get-pixels-3.4.0" @@ -101269,7 +104601,7 @@ in sources."@joplin/fork-sax-1.2.43" (sources."@joplin/htmlpack-2.6.1" // { dependencies = [ - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" ]; }) sources."@joplin/lib-2.6.3" @@ -101322,7 +104654,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.1077.0" // { + (sources."aws-sdk-2.1092.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -101976,7 +105308,7 @@ in sources."punycode-1.3.2" ]; }) - sources."url-parse-1.5.9" + sources."url-parse-1.5.10" sources."uslug-git+https://github.com/laurent22/uslug.git#emoji-support" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" @@ -102197,17 +105529,17 @@ in json-diff = nodeEnv.buildNodePackage { name = "json-diff"; packageName = "json-diff"; - version = "0.7.1"; + version = "0.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/json-diff/-/json-diff-0.7.1.tgz"; - sha512 = "/LxjcgeDIZwFB1HHTShKAYs2NaxAgwUQjXKvrFLDvw3KqvbffFmy5ZeeamxoSLgQG89tRs9+CFKiR3lJAPPhDw=="; + url = "https://registry.npmjs.org/json-diff/-/json-diff-0.7.3.tgz"; + sha512 = "VBvNBt3cIrCBHa3gYbVsCFUEReqWZPf+Biq1ZtFdIiQ6rytRLDp3qvtrGv7z/iZDd1D4vXWpW7Nx1nP8muLzkg=="; }; dependencies = [ sources."cli-color-2.0.1" sources."d-1.0.1" sources."difflib-0.2.4" sources."dreamopt-0.8.0" - sources."es5-ext-0.10.53" + sources."es5-ext-0.10.58" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.3" sources."es6-weak-map-2.0.3" @@ -102220,12 +105552,8 @@ in sources."heap-0.2.7" sources."is-promise-2.2.2" sources."lru-queue-0.1.0" - (sources."memoizee-0.4.15" // { - dependencies = [ - sources."next-tick-1.1.0" - ]; - }) - sources."next-tick-1.0.0" + sources."memoizee-0.4.15" + sources."next-tick-1.1.0" sources."timers-ext-0.1.7" sources."type-1.2.0" sources."wordwrap-1.0.0" @@ -102267,7 +105595,7 @@ in sources."get-intrinsic-1.1.1" sources."graphlib-2.1.8" sources."has-1.0.3" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."inherits-2.0.4" sources."isarray-1.0.0" sources."js-yaml-3.14.1" @@ -102521,7 +105849,7 @@ in sources."y18n-5.0.8" sources."yallist-4.0.0" sources."yargs-17.3.1" - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -103156,7 +106484,7 @@ in ]; }) sources."@oclif/linewrap-1.0.0" - sources."@oclif/parser-3.8.6" + sources."@oclif/parser-3.8.7" (sources."@oclif/plugin-help-3.3.1" // { dependencies = [ sources."@oclif/config-1.18.2" @@ -103164,7 +106492,7 @@ in ]; }) sources."@oclif/screen-1.0.4" - (sources."@putdotio/api-client-8.27.3" // { + (sources."@putdotio/api-client-8.30.0" // { dependencies = [ sources."axios-0.21.4" ]; @@ -103224,7 +106552,7 @@ in sources."dotenv-8.6.0" sources."emoji-regex-8.0.0" sources."env-paths-2.2.1" - sources."es5-ext-0.10.53" + sources."es5-ext-0.10.58" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.3" sources."escape-string-regexp-4.0.0" @@ -103254,7 +106582,7 @@ in sources."graceful-fs-4.2.9" sources."has-1.0.3" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."hyperlinker-1.0.0" sources."iconv-lite-0.4.24" sources."ignore-5.2.0" @@ -103292,7 +106620,7 @@ in sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."natural-orderby-2.0.3" - sources."next-tick-1.0.0" + sources."next-tick-1.1.0" sources."nice-try-1.0.5" sources."node-downloader-helper-1.0.19" sources."object-inspect-1.12.0" @@ -103346,7 +106674,7 @@ in sources."typedarray-to-buffer-3.1.5" sources."universalify-0.1.2" sources."uri-js-4.4.1" - sources."urijs-1.19.8" + sources."urijs-1.19.10" sources."uuid-8.3.2" sources."which-1.3.1" sources."widest-line-3.1.0" @@ -103388,17 +106716,18 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "6.3.16"; + version = "6.3.17"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-6.3.16.tgz"; - sha512 = "nEU50jLvDe5yvXqkEJRf8IuvddUkOY2x5Xc4WXHz6dxINgGDrgD2uqQWeVrJs4hbfNaotn+HQ1LZJ4yOXrL7xQ=="; + url = "https://registry.npmjs.org/karma/-/karma-6.3.17.tgz"; + sha512 = "2TfjHwrRExC8yHoWlPBULyaLwAFmXmxQrcuFImt/JsAsSZu1uOWTZ1ZsWjqQtWpHLiatJOHL5jFjXSJIgCd01g=="; }; dependencies = [ + sources."@colors/colors-1.5.0" sources."@socket.io/base64-arraybuffer-1.0.2" sources."@types/component-emitter-1.2.11" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."accepts-1.3.8" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -103414,7 +106743,6 @@ in sources."cliui-7.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."colors-1.4.0" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."connect-3.7.0" @@ -103422,7 +106750,7 @@ in sources."cookie-0.4.2" sources."cors-2.8.5" sources."custom-event-1.0.1" - sources."date-format-4.0.3" + sources."date-format-4.0.4" sources."debug-2.6.9" sources."depd-1.1.2" sources."di-0.0.1" @@ -103430,7 +106758,7 @@ in sources."ee-first-1.1.1" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" - (sources."engine.io-6.1.2" // { + (sources."engine.io-6.1.3" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" @@ -103446,7 +106774,7 @@ in sources."finalhandler-1.1.2" sources."flatted-3.2.5" sources."follow-redirects-1.14.9" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."get-caller-file-2.0.5" @@ -103466,7 +106794,7 @@ in sources."isbinaryfile-4.0.8" sources."jsonfile-6.1.0" sources."lodash-4.17.21" - (sources."log4js-6.4.1" // { + (sources."log4js-6.4.2" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" @@ -103514,7 +106842,7 @@ in }) sources."source-map-0.6.1" sources."statuses-1.5.0" - (sources."streamroller-3.0.2" // { + (sources."streamroller-3.0.4" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" @@ -103559,7 +106887,7 @@ in }; dependencies = [ sources."@ampproject/remapping-2.1.2" - sources."@babel/cli-7.17.3" + sources."@babel/cli-7.17.6" sources."@babel/code-frame-7.16.7" sources."@babel/compat-data-7.17.0" (sources."@babel/core-7.17.5" // { @@ -103579,7 +106907,7 @@ in sources."@babel/helper-get-function-arity-7.16.7" sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-module-transforms-7.17.6" sources."@babel/helper-plugin-utils-7.16.7" sources."@babel/helper-simple-access-7.16.7" sources."@babel/helper-split-export-declaration-7.16.7" @@ -103658,12 +106986,12 @@ in sources."brace-expansion-1.1.11" sources."browser-or-node-1.3.0" sources."browser-process-hrtime-1.0.0" - sources."browserslist-4.19.3" + sources."browserslist-4.20.0" sources."buffer-from-1.1.2" sources."bytes-3.1.2" sources."bytesish-0.4.4" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001312" + sources."caniuse-lite-1.0.30001314" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chardet-1.4.0" @@ -103718,7 +107046,7 @@ in }) sources."dotenv-8.6.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.71" + sources."electron-to-chromium-1.4.82" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."enquirer-2.3.6" @@ -103771,7 +107099,7 @@ in sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" (sources."hash-base-3.1.0" // { dependencies = [ @@ -104012,7 +107340,7 @@ in sources."glob-stream-6.1.0" sources."graceful-fs-4.2.9" sources."has-1.0.3" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-absolute-1.0.0" @@ -104734,7 +108062,7 @@ in sources."abbrev-1.1.1" sources."add-stream-1.0.0" sources."agent-base-6.0.2" - sources."agentkeepalive-4.2.0" + sources."agentkeepalive-4.2.1" sources."aggregate-error-3.1.0" sources."ajv-6.12.6" (sources."ansi-escapes-4.3.2" // { @@ -104927,7 +108255,7 @@ in sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-unicode-2.0.1" sources."hosted-git-info-4.1.0" @@ -104955,7 +108283,7 @@ in (sources."init-package-json-2.0.5" // { dependencies = [ sources."normalize-package-data-3.0.3" - sources."read-package-json-4.1.1" + sources."read-package-json-4.1.2" ]; }) sources."inquirer-7.3.3" @@ -105271,7 +108599,7 @@ in sources."type-fest-0.4.1" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" - sources."uglify-js-3.15.1" + sources."uglify-js-3.15.3" sources."uid-number-0.0.6" sources."umask-1.1.0" sources."unbox-primitive-1.0.1" @@ -105529,7 +108857,7 @@ in sources."depd-1.1.2" ]; }) - sources."http-parser-js-0.5.5" + sources."http-parser-js-0.5.6" sources."inherits-2.0.4" sources."is-accessor-descriptor-1.0.0" sources."is-binary-path-1.0.1" @@ -106262,7 +109590,7 @@ in sources."@babel/helper-annotate-as-pure-7.16.7" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.7" sources."@babel/helper-compilation-targets-7.16.7" - sources."@babel/helper-create-class-features-plugin-7.17.1" + sources."@babel/helper-create-class-features-plugin-7.17.6" sources."@babel/helper-create-regexp-features-plugin-7.17.0" sources."@babel/helper-define-polyfill-provider-0.3.1" sources."@babel/helper-environment-visitor-7.16.7" @@ -106272,7 +109600,7 @@ in sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-member-expression-to-functions-7.16.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-module-transforms-7.17.6" sources."@babel/helper-optimise-call-expression-7.16.7" sources."@babel/helper-plugin-utils-7.16.7" sources."@babel/helper-remap-async-to-generator-7.16.8" @@ -106295,7 +109623,7 @@ in sources."@babel/plugin-external-helpers-7.8.3" sources."@babel/plugin-proposal-async-generator-functions-7.16.8" sources."@babel/plugin-proposal-class-properties-7.16.7" - sources."@babel/plugin-proposal-class-static-block-7.16.7" + sources."@babel/plugin-proposal-class-static-block-7.17.6" sources."@babel/plugin-proposal-dynamic-import-7.16.7" sources."@babel/plugin-proposal-export-namespace-from-7.16.7" sources."@babel/plugin-proposal-json-strings-7.16.7" @@ -106387,11 +109715,11 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.9" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.14" - sources."@types/yargs-parser-20.2.1" + sources."@types/yargs-parser-21.0.0" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" sources."@webassemblyjs/helper-api-error-1.9.0" @@ -106544,7 +109872,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.19.3" + sources."browserslist-4.20.0" sources."bser-2.1.1" sources."buffer-5.2.1" sources."buffer-from-1.1.2" @@ -106560,7 +109888,7 @@ in sources."cached-path-relative-1.1.0" sources."call-bind-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001312" + sources."caniuse-lite-1.0.30001314" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -106683,7 +110011,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.4.71" + sources."electron-to-chromium-1.4.82" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -106814,7 +110142,7 @@ in sources."har-validator-5.1.5" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -106924,7 +110252,7 @@ in sources."lodash.debounce-4.0.8" sources."lodash.memoize-3.0.4" sources."lru-cache-5.1.1" - sources."magic-string-0.25.7" + sources."magic-string-0.25.9" sources."make-dir-3.1.0" sources."makeerror-1.0.12" sources."map-cache-0.2.2" @@ -107421,7 +110749,7 @@ in sources."@types/commander-2.12.2" sources."@types/diff-3.5.5" sources."@types/get-stdin-5.0.1" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."commander-2.20.3" sources."diff-3.5.0" sources."get-stdin-5.0.1" @@ -107807,11 +111135,11 @@ in bypassCache = true; reconstructLock = true; }; - "markdown-preview-nvim-../../misc/vim-plugins/markdown-preview-nvim" = nodeEnv.buildNodePackage { + "markdown-preview-nvim-../../applications/editors/vim/plugins/markdown-preview-nvim" = nodeEnv.buildNodePackage { name = "markdown-preview-vim"; packageName = "markdown-preview-vim"; version = "0.0.1"; - src = ../../misc/vim-plugins/markdown-preview-nvim; + src = ../../applications/editors/vim/plugins/markdown-preview-nvim; dependencies = [ sources."accepts-1.3.8" sources."after-0.8.2" @@ -107994,7 +111322,7 @@ in }) sources."ecc-jsbn-0.1.2" sources."entities-1.1.2" - sources."es5-ext-0.10.53" + sources."es5-ext-0.10.58" sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" (sources."es6-set-0.1.5" // { @@ -108074,7 +111402,7 @@ in sources."interpret-1.4.0" sources."is-core-module-2.8.1" sources."is-fullwidth-code-point-1.0.0" - sources."is-my-ip-valid-1.0.0" + sources."is-my-ip-valid-1.0.1" sources."is-my-json-valid-2.20.6" sources."is-property-1.0.2" sources."is-resolvable-1.1.0" @@ -108120,7 +111448,7 @@ in sources."multipipe-0.1.2" sources."mute-stream-0.0.5" sources."natural-compare-1.4.0" - sources."next-tick-1.0.0" + sources."next-tick-1.1.0" sources."node-addon-api-1.7.2" sources."node-fetch-2.6.1" sources."number-is-nan-1.0.1" @@ -108288,7 +111616,7 @@ in }; dependencies = [ sources."@braintree/sanitize-url-3.1.0" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" sources."ansi-styles-4.3.0" @@ -108381,7 +111709,7 @@ in }) sources."debug-4.3.3" sources."delaunator-5.0.0" - sources."devtools-protocol-0.0.960912" + sources."devtools-protocol-0.0.969999" sources."dompurify-2.3.5" sources."end-of-stream-1.4.4" sources."extract-zip-2.0.1" @@ -108419,7 +111747,7 @@ in sources."progress-2.0.3" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - sources."puppeteer-13.3.2" + sources."puppeteer-13.5.1" sources."readable-stream-3.6.0" sources."rimraf-3.0.2" sources."robust-predicates-3.0.1" @@ -108454,10 +111782,10 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "9.2.1"; + version = "9.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-9.2.1.tgz"; - sha512 = "T7uscqjJVS46Pq1XDXyo9Uvey9gd3huT/DD9cYBb4K2Xc/vbKRPUWK067bxDQRK0yIz6Jxk73IrnimvASzBNAQ=="; + url = "https://registry.npmjs.org/mocha/-/mocha-9.2.2.tgz"; + sha512 = "L6XC3EdwT6YrIk0yXpavvLkn8h+EU+Y5UcCHKECyMbdUIxyMuZj4bX4U9e1nvnvUUvQVsV2VHQr5zLdcUkhW/g=="; }; dependencies = [ sources."@ungap/promise-all-settled-1.1.2" @@ -108498,7 +111826,11 @@ in sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."get-caller-file-2.0.5" - sources."glob-7.2.0" + (sources."glob-7.2.0" // { + dependencies = [ + sources."minimatch-3.1.2" + ]; + }) sources."glob-parent-5.1.2" sources."growl-1.10.5" sources."has-flag-4.0.0" @@ -108516,9 +111848,9 @@ in sources."js-yaml-4.1.0" sources."locate-path-6.0.0" sources."log-symbols-4.1.0" - sources."minimatch-3.0.4" + sources."minimatch-4.2.1" sources."ms-2.1.3" - sources."nanoid-3.2.0" + sources."nanoid-3.3.1" sources."normalize-path-3.0.0" sources."once-1.4.0" sources."p-limit-3.1.0" @@ -108583,7 +111915,7 @@ in sources."get-intrinsic-1.1.1" sources."graphlib-2.1.8" sources."has-1.0.3" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."inherits-2.0.4" sources."isarray-1.0.0" sources."js-yaml-3.14.1" @@ -108763,10 +112095,10 @@ in sources."@types/istanbul-lib-coverage-2.0.4" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-3.0.1" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@types/stack-utils-2.0.1" sources."@types/yargs-16.0.4" - sources."@types/yargs-parser-20.2.1" + sources."@types/yargs-parser-21.0.0" sources."agent-base-6.0.2" sources."ansi-align-3.0.1" sources."ansi-regex-5.0.1" @@ -108929,7 +112261,7 @@ in sources."ncp-2.0.0" sources."near-api-js-0.44.2" sources."near-hd-key-1.2.1" - sources."near-ledger-js-0.2.0" + sources."near-ledger-js-0.2.1" sources."near-seed-phrase-0.2.0" (sources."node-abi-2.30.1" // { dependencies = [ @@ -109146,26 +112478,30 @@ in node-gyp = nodeEnv.buildNodePackage { name = "node-gyp"; packageName = "node-gyp"; - version = "8.4.1"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-8.4.1.tgz"; - sha512 = "olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w=="; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-9.0.0.tgz"; + sha512 = "Ma6p4s+XCTPxCuAMrOA/IJRmVy16R8Sdhtwl4PrCr7IBlj4cPawF0vg/l7nOT1jPbuNS7lIRJpBSvVsXwEZuzw=="; }; dependencies = [ sources."@gar/promisify-1.1.3" sources."@npmcli/fs-1.1.1" sources."@npmcli/move-file-1.1.2" - sources."@tootallnate/once-1.1.2" + sources."@tootallnate/once-2.0.0" sources."abbrev-1.1.1" sources."agent-base-6.0.2" - sources."agentkeepalive-4.2.0" + sources."agentkeepalive-4.2.1" sources."aggregate-error-3.1.0" sources."ansi-regex-5.0.1" sources."aproba-2.0.0" sources."are-we-there-yet-3.0.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."cacache-15.3.0" + (sources."cacache-15.3.0" // { + dependencies = [ + sources."lru-cache-6.0.0" + ]; + }) sources."chownr-2.0.0" sources."clean-stack-2.2.0" sources."color-support-1.1.3" @@ -109180,12 +112516,12 @@ in sources."err-code-2.0.3" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" - sources."gauge-4.0.1" + sources."gauge-4.0.3" sources."glob-7.2.0" sources."graceful-fs-4.2.9" sources."has-unicode-2.0.1" sources."http-cache-semantics-4.1.0" - sources."http-proxy-agent-4.0.1" + sources."http-proxy-agent-5.0.0" sources."https-proxy-agent-5.0.0" sources."humanize-ms-1.2.1" sources."iconv-lite-0.6.3" @@ -109198,12 +112534,12 @@ in sources."is-fullwidth-code-point-3.0.0" sources."is-lambda-1.0.1" sources."isexe-2.0.0" - sources."lru-cache-6.0.0" - sources."make-fetch-happen-9.1.0" + sources."lru-cache-7.4.4" + sources."make-fetch-happen-10.0.5" sources."minimatch-3.1.2" sources."minipass-3.1.6" sources."minipass-collect-1.0.2" - sources."minipass-fetch-1.4.1" + sources."minipass-fetch-2.0.3" sources."minipass-flush-1.0.5" sources."minipass-pipeline-1.2.4" sources."minipass-sized-1.0.3" @@ -109223,7 +112559,11 @@ in sources."rimraf-3.0.2" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-7.3.5" + (sources."semver-7.3.5" // { + dependencies = [ + sources."lru-cache-6.0.0" + ]; + }) sources."set-blocking-2.0.0" sources."signal-exit-3.0.7" sources."smart-buffer-4.2.0" @@ -109696,12 +113036,12 @@ in sources."@node-red/registry-2.2.2" sources."@node-red/runtime-2.2.2" sources."@node-red/util-2.2.2" - sources."@sindresorhus/is-4.4.0" + sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."accepts-1.3.8" @@ -109948,7 +113288,7 @@ in sources."normalize-url-6.1.0" sources."npmlog-5.0.1" sources."nth-check-2.0.1" - (sources."number-allocator-1.0.9" // { + (sources."number-allocator-1.0.10" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" @@ -110454,7 +113794,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" sources."@types/minimist-1.2.2" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -110764,7 +114104,7 @@ in sources."os-tmpdir-1.0.2" (sources."ow-0.21.0" // { dependencies = [ - sources."@sindresorhus/is-4.4.0" + sources."@sindresorhus/is-4.6.0" sources."type-fest-0.20.2" ]; }) @@ -110948,10 +114288,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "8.5.1"; + version = "8.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-8.5.1.tgz"; - sha512 = "zHrOHAatEPJ59o2JIPlhgc9LX9mb8xFrqu4kiiul4w1IGMTtKn2lqRiGIRKU0or69NSLXNmqbCP9bNJIr/wB6Q=="; + url = "https://registry.npmjs.org/npm/-/npm-8.5.4.tgz"; + sha512 = "VnGLT4t88cUE78lLw5kxBwtLn2/Sx6O7Uw9dYwmq6AnF/taWHyMYQgDzUEsLhaXAVH7prG+sjG+MvxlHdIasgg=="; }; buildInputs = globalBuildInputs; meta = { @@ -110966,10 +114306,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "12.4.0"; + version = "12.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-12.4.0.tgz"; - sha512 = "X14H74M8SVFkStmP1NDOMh0OjLB3mU2dwUeM71zyITJHkm08MASwwTcydW6YuGcNW1RUlVq1cQY2yWijv4zKUQ=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-12.5.3.tgz"; + sha512 = "siFg/+Un+j4tLA6GJCnk6hz2YU4Yc5bftDnOoiSRLKL6NeAS3FScB32mtKNBtITMJf2nsoZSr8vH+wdUGeP19g=="; }; dependencies = [ sources."@gar/promisify-1.1.3" @@ -110979,20 +114319,20 @@ in sources."@npmcli/fs-1.1.1" (sources."@npmcli/git-3.0.0" // { dependencies = [ - sources."lru-cache-7.3.1" + sources."lru-cache-7.4.4" ]; }) sources."@npmcli/installed-package-contents-1.0.7" sources."@npmcli/move-file-1.1.2" sources."@npmcli/node-gyp-1.0.3" sources."@npmcli/promise-spawn-1.3.2" - sources."@npmcli/run-script-2.0.0" + sources."@npmcli/run-script-3.0.1" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@tootallnate/once-1.1.2" + sources."@tootallnate/once-2.0.0" sources."abbrev-1.1.1" sources."agent-base-6.0.2" - sources."agentkeepalive-4.2.0" + sources."agentkeepalive-4.2.1" sources."aggregate-error-3.1.0" sources."ansi-align-3.0.1" sources."ansi-regex-5.0.1" @@ -111057,7 +114397,7 @@ in sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."gauge-4.0.1" + sources."gauge-4.0.3" sources."get-stdin-8.0.0" sources."get-stream-4.1.0" (sources."glob-7.2.0" // { @@ -111081,7 +114421,7 @@ in sources."has-yarn-2.1.0" sources."hosted-git-info-4.1.0" sources."http-cache-semantics-4.1.0" - sources."http-proxy-agent-4.0.1" + sources."http-proxy-agent-5.0.0" sources."https-proxy-agent-5.0.0" sources."humanize-ms-1.2.1" sources."iconv-lite-0.6.3" @@ -111143,15 +114483,19 @@ in sources."semver-6.3.0" ]; }) - sources."make-fetch-happen-9.1.0" + (sources."make-fetch-happen-10.0.5" // { + dependencies = [ + sources."lru-cache-7.4.4" + ]; + }) sources."merge2-1.4.1" sources."micromatch-4.0.4" sources."mimic-response-1.0.1" - sources."minimatch-5.0.0" + sources."minimatch-5.0.1" sources."minimist-1.2.5" sources."minipass-3.1.6" sources."minipass-collect-1.0.2" - sources."minipass-fetch-1.4.1" + sources."minipass-fetch-2.0.3" sources."minipass-flush-1.0.5" sources."minipass-json-stream-1.0.1" sources."minipass-pipeline-1.2.4" @@ -111160,7 +114504,7 @@ in sources."mkdirp-1.0.4" sources."ms-2.1.2" sources."negotiator-0.6.3" - sources."node-gyp-8.4.1" + sources."node-gyp-9.0.0" sources."nopt-5.0.0" sources."normalize-package-data-3.0.3" sources."normalize-url-4.5.1" @@ -111170,14 +114514,7 @@ in sources."npm-package-arg-9.0.0" sources."npm-packlist-3.0.0" sources."npm-pick-manifest-7.0.0" - (sources."npm-registry-fetch-13.0.0" // { - dependencies = [ - sources."@tootallnate/once-2.0.0" - sources."http-proxy-agent-5.0.0" - sources."lru-cache-7.3.1" - sources."make-fetch-happen-10.0.3" - ]; - }) + sources."npm-registry-fetch-13.0.1" sources."npmlog-6.0.1" sources."once-1.4.0" sources."p-cancelable-1.1.0" @@ -111190,7 +114527,7 @@ in sources."semver-6.3.0" ]; }) - sources."pacote-13.0.2" + sources."pacote-13.0.3" sources."parse-github-url-1.0.2" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" @@ -111207,7 +114544,7 @@ in sources."queue-microtask-1.2.3" sources."rc-1.2.8" sources."rc-config-loader-4.0.0" - sources."read-package-json-4.1.1" + sources."read-package-json-4.1.2" sources."read-package-json-fast-2.0.3" sources."readable-stream-3.6.0" sources."registry-auth-token-4.2.1" @@ -111365,7 +114702,7 @@ in sources."mkdirp-0.5.5" ]; }) - sources."gauge-4.0.1" + sources."gauge-4.0.3" sources."getpass-0.1.7" sources."glob-7.2.0" sources."graceful-fs-2.0.3" @@ -111611,7 +114948,7 @@ in sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.17.1" + sources."@babel/helper-create-class-features-plugin-7.17.6" sources."@babel/helper-create-regexp-features-plugin-7.17.0" (sources."@babel/helper-define-polyfill-provider-0.3.1" // { dependencies = [ @@ -111625,7 +114962,7 @@ in sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-member-expression-to-functions-7.16.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-module-transforms-7.17.6" sources."@babel/helper-optimise-call-expression-7.16.7" sources."@babel/helper-plugin-utils-7.16.7" sources."@babel/helper-remap-async-to-generator-7.16.8" @@ -111643,7 +114980,7 @@ in sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7" sources."@babel/plugin-proposal-async-generator-functions-7.16.8" sources."@babel/plugin-proposal-class-properties-7.16.7" - sources."@babel/plugin-proposal-class-static-block-7.16.7" + sources."@babel/plugin-proposal-class-static-block-7.17.6" sources."@babel/plugin-proposal-dynamic-import-7.16.7" sources."@babel/plugin-proposal-export-namespace-from-7.16.7" sources."@babel/plugin-proposal-json-strings-7.16.7" @@ -111823,7 +115160,7 @@ in sources."pako-1.0.11" ]; }) - sources."browserslist-4.19.3" + sources."browserslist-4.20.0" (sources."buffer-4.9.2" // { dependencies = [ sources."isarray-1.0.0" @@ -111840,7 +115177,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001312" + sources."caniuse-lite-1.0.30001314" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -111977,7 +115314,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.71" + sources."electron-to-chromium-1.4.82" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -112061,7 +115398,7 @@ in }) sources."has-bigints-1.0.1" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -112084,10 +115421,11 @@ in sources."html-tags-1.2.0" (sources."htmlnano-0.2.9" // { dependencies = [ + sources."acorn-8.7.0" sources."posthtml-0.15.2" sources."posthtml-parser-0.7.2" sources."source-map-0.7.3" - sources."terser-5.10.0" + sources."terser-5.12.0" ]; }) (sources."htmlparser2-6.1.0" // { @@ -112614,6 +115952,243 @@ in bypassCache = true; reconstructLock = true; }; + parcel = nodeEnv.buildNodePackage { + name = "parcel"; + packageName = "parcel"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/parcel/-/parcel-2.3.2.tgz"; + sha512 = "4jhgoBcQaiGKmnmBvNyKyOvZrxCgzgUzdEoVup/fRCOP99hNmvYIN5IErIIJxsU9ObcG/RGCFF8wa4kVRsWfIg=="; + }; + dependencies = [ + sources."@babel/code-frame-7.16.7" + sources."@babel/helper-validator-identifier-7.16.7" + (sources."@babel/highlight-7.16.10" // { + dependencies = [ + sources."chalk-2.4.2" + ]; + }) + sources."@parcel/bundler-default-2.3.2" + sources."@parcel/cache-2.3.2" + sources."@parcel/codeframe-2.3.2" + sources."@parcel/compressor-raw-2.3.2" + sources."@parcel/config-default-2.3.2" + sources."@parcel/core-2.3.2" + sources."@parcel/diagnostic-2.3.2" + sources."@parcel/events-2.3.2" + sources."@parcel/fs-2.3.2" + sources."@parcel/fs-search-2.3.2" + sources."@parcel/graph-2.3.2" + sources."@parcel/hash-2.3.2" + sources."@parcel/logger-2.3.2" + sources."@parcel/markdown-ansi-2.3.2" + sources."@parcel/namer-default-2.3.2" + sources."@parcel/node-resolver-core-2.3.2" + sources."@parcel/optimizer-cssnano-2.3.2" + sources."@parcel/optimizer-htmlnano-2.3.2" + sources."@parcel/optimizer-image-2.3.2" + sources."@parcel/optimizer-svgo-2.3.2" + sources."@parcel/optimizer-terser-2.3.2" + sources."@parcel/package-manager-2.3.2" + sources."@parcel/packager-css-2.3.2" + sources."@parcel/packager-html-2.3.2" + sources."@parcel/packager-js-2.3.2" + sources."@parcel/packager-raw-2.3.2" + sources."@parcel/packager-svg-2.3.2" + sources."@parcel/plugin-2.3.2" + sources."@parcel/reporter-cli-2.3.2" + sources."@parcel/reporter-dev-server-2.3.2" + sources."@parcel/resolver-default-2.3.2" + sources."@parcel/runtime-browser-hmr-2.3.2" + sources."@parcel/runtime-js-2.3.2" + sources."@parcel/runtime-react-refresh-2.3.2" + sources."@parcel/runtime-service-worker-2.3.2" + sources."@parcel/source-map-2.0.2" + sources."@parcel/transformer-babel-2.3.2" + sources."@parcel/transformer-css-2.3.2" + (sources."@parcel/transformer-html-2.3.2" // { + dependencies = [ + sources."posthtml-parser-0.10.2" + ]; + }) + sources."@parcel/transformer-image-2.3.2" + sources."@parcel/transformer-js-2.3.2" + sources."@parcel/transformer-json-2.3.2" + sources."@parcel/transformer-postcss-2.3.2" + (sources."@parcel/transformer-posthtml-2.3.2" // { + dependencies = [ + sources."posthtml-parser-0.10.2" + ]; + }) + sources."@parcel/transformer-raw-2.3.2" + sources."@parcel/transformer-react-refresh-wrap-2.3.2" + (sources."@parcel/transformer-svg-2.3.2" // { + dependencies = [ + sources."posthtml-parser-0.10.2" + ]; + }) + sources."@parcel/types-2.3.2" + sources."@parcel/utils-2.3.2" + sources."@parcel/watcher-2.0.5" + sources."@parcel/workers-2.3.2" + sources."@swc/helpers-0.2.14" + sources."@trysound/sax-0.2.0" + sources."@types/parse-json-4.0.0" + sources."abortcontroller-polyfill-1.7.3" + sources."acorn-8.7.0" + sources."ansi-styles-3.2.1" + sources."base-x-3.0.9" + sources."boolbase-1.0.0" + sources."browserslist-4.20.0" + sources."buffer-from-1.1.2" + sources."callsites-3.1.0" + sources."caniuse-api-3.0.0" + sources."caniuse-lite-1.0.30001314" + (sources."chalk-4.1.2" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + sources."chrome-trace-event-1.0.3" + sources."clone-2.1.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."colord-2.9.2" + sources."commander-7.2.0" + sources."cosmiconfig-7.0.1" + sources."css-declaration-sorter-6.1.4" + sources."css-select-4.2.1" + sources."css-tree-1.1.3" + sources."css-what-5.1.0" + sources."cssesc-3.0.0" + sources."cssnano-5.1.3" + sources."cssnano-preset-default-5.2.3" + sources."cssnano-utils-3.1.0" + sources."csso-4.2.0" + sources."detect-libc-1.0.3" + sources."dom-serializer-1.3.2" + sources."domelementtype-2.2.0" + sources."domhandler-4.3.0" + sources."domutils-2.8.0" + sources."dotenv-7.0.0" + sources."dotenv-expand-5.1.0" + sources."electron-to-chromium-1.4.82" + sources."entities-2.2.0" + sources."error-ex-1.3.2" + sources."escalade-3.1.1" + sources."escape-string-regexp-1.0.5" + sources."get-port-4.2.0" + sources."globals-13.12.1" + sources."has-flag-3.0.0" + sources."htmlnano-2.0.0" + (sources."htmlparser2-7.2.0" // { + dependencies = [ + sources."entities-3.0.1" + ]; + }) + sources."import-fresh-3.3.0" + sources."is-arrayish-0.2.1" + sources."is-json-2.0.1" + sources."js-tokens-4.0.0" + sources."json-parse-even-better-errors-2.3.1" + sources."json-source-map-0.6.1" + sources."json5-2.2.0" + sources."lilconfig-2.0.4" + sources."lines-and-columns-1.2.4" + sources."lmdb-2.2.4" + sources."lodash.memoize-4.1.2" + sources."lodash.uniq-4.5.0" + sources."mdn-data-2.0.14" + sources."minimist-1.2.5" + sources."msgpackr-1.5.4" + sources."msgpackr-extract-1.0.16" + sources."nan-2.15.0" + sources."nanoid-3.3.1" + sources."node-addon-api-3.2.1" + sources."node-gyp-build-4.3.0" + sources."node-releases-2.0.2" + sources."normalize-url-6.1.0" + sources."nth-check-2.0.1" + sources."nullthrows-1.1.1" + sources."ordered-binary-1.2.4" + sources."parent-module-1.0.1" + sources."parse-json-5.2.0" + sources."path-type-4.0.0" + sources."picocolors-1.0.0" + sources."postcss-8.4.8" + sources."postcss-calc-8.2.4" + sources."postcss-colormin-5.3.0" + sources."postcss-convert-values-5.1.0" + sources."postcss-discard-comments-5.1.1" + sources."postcss-discard-duplicates-5.1.0" + sources."postcss-discard-empty-5.1.1" + sources."postcss-discard-overridden-5.1.0" + sources."postcss-merge-longhand-5.1.1" + sources."postcss-merge-rules-5.1.0" + sources."postcss-minify-font-values-5.1.0" + sources."postcss-minify-gradients-5.1.0" + sources."postcss-minify-params-5.1.1" + sources."postcss-minify-selectors-5.2.0" + sources."postcss-normalize-charset-5.1.0" + sources."postcss-normalize-display-values-5.1.0" + sources."postcss-normalize-positions-5.1.0" + sources."postcss-normalize-repeat-style-5.1.0" + sources."postcss-normalize-string-5.1.0" + sources."postcss-normalize-timing-functions-5.1.0" + sources."postcss-normalize-unicode-5.1.0" + sources."postcss-normalize-url-5.1.0" + sources."postcss-normalize-whitespace-5.1.1" + sources."postcss-ordered-values-5.1.0" + sources."postcss-reduce-initial-5.1.0" + sources."postcss-reduce-transforms-5.1.0" + sources."postcss-selector-parser-6.0.9" + sources."postcss-svgo-5.1.0" + sources."postcss-unique-selectors-5.1.1" + sources."postcss-value-parser-4.2.0" + sources."posthtml-0.16.6" + sources."posthtml-parser-0.11.0" + sources."posthtml-render-3.0.0" + sources."react-refresh-0.9.0" + sources."regenerator-runtime-0.13.9" + sources."resolve-from-4.0.0" + sources."safe-buffer-5.2.1" + sources."semver-5.7.1" + sources."source-map-0.6.1" + sources."source-map-js-1.0.2" + sources."source-map-support-0.5.21" + sources."stable-0.1.8" + sources."stylehacks-5.1.0" + sources."supports-color-5.5.0" + sources."svgo-2.8.0" + (sources."terser-5.12.0" // { + dependencies = [ + sources."commander-2.20.3" + sources."source-map-0.7.3" + ]; + }) + sources."timsort-0.3.0" + sources."type-fest-0.20.2" + sources."util-deprecate-1.0.2" + sources."utility-types-3.10.0" + sources."v8-compile-cache-2.3.0" + sources."weak-lru-cache-1.2.2" + sources."xxhash-wasm-0.4.2" + sources."yaml-1.10.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Blazing fast, zero configuration web application bundler"; + homepage = "https://github.com/parcel-bundler/parcel#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; parsoid = nodeEnv.buildNodePackage { name = "parsoid"; packageName = "parsoid"; @@ -112733,7 +116308,7 @@ in sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."hat-0.0.3" sources."heapdump-0.3.15" @@ -112864,7 +116439,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."uglify-js-3.15.1" + sources."uglify-js-3.15.3" sources."unix-dgram-2.0.4" sources."unpipe-1.0.0" sources."uri-js-4.4.1" @@ -113079,7 +116654,7 @@ in sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."hat-0.0.3" sources."hosted-git-info-2.8.9" @@ -113937,7 +117512,7 @@ in sources."debug-4.3.3" sources."deep-is-0.1.4" sources."degenerator-3.0.2" - sources."depd-1.1.2" + sources."depd-2.0.0" sources."emitter-listener-1.1.2" sources."enquirer-2.3.6" sources."escape-string-regexp-4.0.0" @@ -113965,7 +117540,7 @@ in sources."graceful-fs-4.2.9" sources."has-1.0.3" sources."has-flag-4.0.0" - sources."http-errors-1.8.1" + sources."http-errors-2.0.0" sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.0" sources."iconv-lite-0.4.24" @@ -114026,7 +117601,7 @@ in sources."promptly-2.2.0" sources."proxy-agent-5.0.0" sources."proxy-from-env-1.1.0" - sources."raw-body-2.4.3" + sources."raw-body-2.5.1" sources."read-1.0.7" sources."readable-stream-1.1.14" sources."readdirp-3.6.0" @@ -114051,11 +117626,11 @@ in sources."source-map-0.6.1" sources."source-map-support-0.5.19" sources."sprintf-js-1.1.2" - sources."statuses-1.5.0" + sources."statuses-2.0.1" sources."string_decoder-0.10.31" sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."systeminformation-5.11.4" + sources."systeminformation-5.11.8" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" sources."tslib-2.3.1" @@ -114070,7 +117645,7 @@ in sources."async-2.6.3" ]; }) - sources."vm2-3.9.8" + sources."vm2-3.9.9" sources."word-wrap-1.2.3" sources."wrappy-1.0.2" sources."ws-7.4.6" @@ -114091,10 +117666,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "6.31.0"; + version = "6.32.3"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-6.31.0.tgz"; - sha512 = "YUCyLI2J2wQsHWgcRYR8wUrTWsE0E8GX46XKtdXcUiE0GJJYi5saRy2Y8BMfLtlDHshHLs2U/KO1e5gsftJTFA=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-6.32.3.tgz"; + sha512 = "lMQgROSwiUA+kt+suAPinjNwqevS1Iz0rppWNZ3jHhzeP07RFRQ+Ksai2OlAnM+YjlbHT9niQ4ICBVSqcdQ04w=="; }; buildInputs = globalBuildInputs; meta = { @@ -114137,10 +117712,10 @@ in postcss = nodeEnv.buildNodePackage { name = "postcss"; packageName = "postcss"; - version = "8.4.6"; + version = "8.4.8"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.6.tgz"; - sha512 = "OovjwIzs9Te46vlEx7+uXB0PLijpwjXGKXjVGGPIGubGpq7uh5Xgf6D6FiJ/SzJMBosHDp6a2hiXOS97iBXcaA=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.8.tgz"; + sha512 = "2tXEqGxrjvAO6U+CJzDL2Fk2kPHTv1jQsYkSoMeOis2SsYaXRO2COxTdQp99cYvif9JTXaAk9lYGc3VhJt7JPQ=="; }; dependencies = [ sources."nanoid-3.3.1" @@ -114186,7 +117761,7 @@ in sources."fast-glob-3.2.11" sources."fastq-1.13.0" sources."fill-range-7.0.1" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."fsevents-2.3.2" sources."get-caller-file-2.0.5" sources."get-stdin-9.0.0" @@ -114227,7 +117802,7 @@ in sources."y18n-5.0.8" sources."yaml-1.10.2" sources."yargs-17.3.1" - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -114341,6 +117916,39 @@ in bypassCache = true; reconstructLock = true; }; + prettier_d_slim = nodeEnv.buildNodePackage { + name = "prettier_d_slim"; + packageName = "prettier_d_slim"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier_d_slim/-/prettier_d_slim-1.2.0.tgz"; + sha512 = "Wq/Qida9MweJX7dKjlNeJ9Ppfeu4YPWY2947x1xev2RXjimvv2QOBRQJhGAir/QZ+WJnrU82e9O67Uqu8JgbZw=="; + }; + dependencies = [ + sources."camelize-1.0.0" + sources."core_d-3.2.0" + sources."function-bind-1.1.1" + sources."has-1.0.3" + sources."has-flag-4.0.0" + sources."is-core-module-2.8.1" + sources."minimist-1.2.5" + sources."nanolru-1.0.0" + sources."path-parse-1.0.7" + sources."prettier-2.5.1" + sources."resolve-1.22.0" + sources."supports-color-8.1.1" + sources."supports-preserve-symlinks-flag-1.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Makes prettier fast"; + homepage = "https://github.com/mikew/prettier_d_slim"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; prettier-plugin-toml = nodeEnv.buildNodePackage { name = "prettier-plugin-toml"; packageName = "prettier-plugin-toml"; @@ -114368,13 +117976,13 @@ in prisma = nodeEnv.buildNodePackage { name = "prisma"; packageName = "prisma"; - version = "3.9.2"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/prisma/-/prisma-3.9.2.tgz"; - sha512 = "i9eK6cexV74OgeWaH3+e6S07kvC9jEZTl6BqtBH398nlCU0tck7mE9dicY6YQd+euvMjjCtY89q4NgmaPnUsSg=="; + url = "https://registry.npmjs.org/prisma/-/prisma-3.10.0.tgz"; + sha512 = "dAld12vtwdz9Rz01nOjmnXe+vHana5PSog8t0XGgLemKsUVsaupYpr74AHaS3s78SaTS5s2HOghnJF+jn91ZrA=="; }; dependencies = [ - sources."@prisma/engines-3.9.0-58.bcc2ff906db47790ee902e7bbc76d7ffb1893009" + sources."@prisma/engines-3.10.0-50.73e60b76d394f8d37d8ebd1f8918c79029f0db86" ]; buildInputs = globalBuildInputs; meta = { @@ -114389,13 +117997,13 @@ in "@prisma/language-server" = nodeEnv.buildNodePackage { name = "_at_prisma_slash_language-server"; packageName = "@prisma/language-server"; - version = "3.9.2"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/language-server/-/language-server-3.9.2.tgz"; - sha512 = "lAe5mPD18PPpVlVmHQqj2ky11N9n6nGI32vuu2RbLHK4mRgkA/sLn8kBg81zs3WIdBLzCX+dYSpM8UFviZrlgA=="; + url = "https://registry.npmjs.org/@prisma/language-server/-/language-server-3.10.0.tgz"; + sha512 = "PDapBurrv72Mn28rWg5cWZrt6cFLftWadNfdbVNmsjdR4G3eX9OrflSsOVEuSOANLrP/yi129zT0hS+XC6P3Wg=="; }; dependencies = [ - sources."@prisma/prisma-fmt-wasm-3.9.0-58.bcc2ff906db47790ee902e7bbc76d7ffb1893009" + sources."@prisma/prisma-fmt-wasm-3.10.0-50.73e60b76d394f8d37d8ebd1f8918c79029f0db86" sources."@types/js-levenshtein-1.1.1" sources."anymatch-3.1.2" sources."binary-extensions-2.2.0" @@ -114474,10 +118082,10 @@ in pulp = nodeEnv.buildNodePackage { name = "pulp"; packageName = "pulp"; - version = "15.0.0"; + version = "16.0.0-0"; src = fetchurl { - url = "https://registry.npmjs.org/pulp/-/pulp-15.0.0.tgz"; - sha512 = "JPzDiSjxwySAFOFnpevZO7YzzDgGdJP/SQap1UJbK0rsrfUVQC+zOHDkm7A8T3gR/0el4ft6KwB6fcDl2bTzVw=="; + url = "https://registry.npmjs.org/pulp/-/pulp-16.0.0-0.tgz"; + sha512 = "6nG6qg/p5IGa0k4w9EkBVBX3+7Ra1mjbOCYwbn85kjUC6x1jkyP+hAP7xAwBxTPgxSD8x5IZtoX9sbrNeKecnQ=="; }; dependencies = [ sources."JSONStream-1.3.5" @@ -114753,11 +118361,11 @@ in sources."isexe-2.0.0" sources."shell-quote-1.7.3" sources."uuid-3.4.0" - sources."vscode-jsonrpc-8.0.0-next.6" - sources."vscode-languageserver-8.0.0-next.8" - sources."vscode-languageserver-protocol-3.17.0-next.14" + sources."vscode-jsonrpc-8.0.0-next.7" + sources."vscode-languageserver-8.0.0-next.9" + sources."vscode-languageserver-protocol-3.17.0-next.15" sources."vscode-languageserver-textdocument-1.0.4" - sources."vscode-languageserver-types-3.17.0-next.7" + sources."vscode-languageserver-types-3.17.0-next.8" sources."vscode-uri-2.1.2" sources."which-2.0.2" ]; @@ -114841,14 +118449,14 @@ in sources."duplexer3-0.1.4" sources."end-of-stream-1.4.4" sources."follow-redirects-1.14.9" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" sources."get-stream-4.1.0" sources."got-9.6.0" sources."graceful-fs-4.2.9" sources."has-1.0.3" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."http-cache-semantics-4.1.0" sources."https-proxy-agent-5.0.0" sources."ini-1.3.8" @@ -114915,10 +118523,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.223"; + version = "1.1.228"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.223.tgz"; - sha512 = "EGLKMQRmSkKNe/eDy6MEkqq5lF91C5MCMYxvmCgKGUjZHIa+HByJIiRY2cOTm7g2CAv0eE7Ift701VxLM5Q0iQ=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.228.tgz"; + sha512 = "Q/LnDoZK6bxc7u60kFjFwi9X3s79kLaGd/g23T0c6T1CUdrRxDyRTvNRLjLPSLaX8EuPIdcXuPXAzXgSjBz/Mw=="; }; buildInputs = globalBuildInputs; meta = { @@ -115123,7 +118731,7 @@ in sources."pako-0.2.9" ]; }) - sources."urijs-1.19.8" + sources."urijs-1.19.10" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."vlq-0.2.3" @@ -115195,7 +118803,7 @@ in sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-bigints-1.0.1" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."i-0.3.7" sources."inflight-1.0.6" @@ -115276,7 +118884,7 @@ in }; dependencies = [ sources."@ampproject/remapping-2.1.2" - sources."@babel/cli-7.17.3" + sources."@babel/cli-7.17.6" sources."@babel/code-frame-7.16.7" sources."@babel/compat-data-7.17.0" (sources."@babel/core-7.17.5" // { @@ -115292,7 +118900,7 @@ in sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.17.1" + sources."@babel/helper-create-class-features-plugin-7.17.6" sources."@babel/helper-create-regexp-features-plugin-7.17.0" (sources."@babel/helper-define-polyfill-provider-0.3.1" // { dependencies = [ @@ -115306,7 +118914,7 @@ in sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-member-expression-to-functions-7.16.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-module-transforms-7.17.6" sources."@babel/helper-optimise-call-expression-7.16.7" sources."@babel/helper-plugin-utils-7.16.7" sources."@babel/helper-remap-async-to-generator-7.16.8" @@ -115324,7 +118932,7 @@ in sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7" sources."@babel/plugin-proposal-async-generator-functions-7.16.8" sources."@babel/plugin-proposal-class-properties-7.16.7" - sources."@babel/plugin-proposal-class-static-block-7.16.7" + sources."@babel/plugin-proposal-class-static-block-7.17.6" sources."@babel/plugin-proposal-dynamic-import-7.16.7" sources."@babel/plugin-proposal-export-default-from-7.16.7" sources."@babel/plugin-proposal-export-namespace-from-7.16.7" @@ -115416,7 +119024,7 @@ in sources."@types/glob-7.2.0" sources."@types/json-schema-7.0.9" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" sources."@webassemblyjs/ast-1.9.0" @@ -115574,7 +119182,7 @@ in ]; }) sources."browserify-zlib-0.1.4" - sources."browserslist-4.19.3" + sources."browserslist-4.20.0" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -115608,7 +119216,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001312" + sources."caniuse-lite-1.0.30001314" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -115836,7 +119444,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.4.71" + sources."electron-to-chromium-1.4.82" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -116020,7 +119628,7 @@ in sources."has-cors-1.1.0" sources."has-flag-3.0.0" sources."has-symbol-support-x-1.4.2" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-to-string-tag-x-1.4.1" sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" @@ -116073,7 +119681,7 @@ in sources."http-cache-semantics-3.8.1" sources."http-deceiver-1.2.7" sources."http-errors-1.8.1" - sources."http-parser-js-0.5.5" + sources."http-parser-js-0.5.6" sources."http-proxy-1.18.1" sources."http-proxy-middleware-0.19.1" sources."https-browserify-1.0.0" @@ -116175,7 +119783,6 @@ in sources."json-parse-better-errors-1.0.2" sources."json-parse-even-better-errors-2.3.1" sources."json-schema-traverse-0.4.1" - sources."json3-3.3.3" sources."json5-2.2.0" sources."jsonfile-4.0.0" sources."keyv-3.0.0" @@ -116235,8 +119842,12 @@ in ]; }) sources."mime-2.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + (sources."mime-types-2.1.34" // { + dependencies = [ + sources."mime-db-1.51.0" + ]; + }) sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" @@ -116726,7 +120337,7 @@ in ]; }) sources."sockjs-0.3.24" - (sources."sockjs-client-1.5.2" // { + (sources."sockjs-client-1.6.0" // { dependencies = [ sources."debug-3.2.7" ]; @@ -116898,7 +120509,7 @@ in ]; }) sources."url-loader-2.3.0" - sources."url-parse-1.5.9" + sources."url-parse-1.5.10" sources."url-parse-lax-3.0.0" sources."url-to-options-1.0.1" sources."use-3.1.1" @@ -117181,7 +120792,7 @@ in sources."xmlchars-2.2.0" sources."y18n-5.0.8" sources."yargs-17.3.1" - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -117196,10 +120807,10 @@ in redoc-cli = nodeEnv.buildNodePackage { name = "redoc-cli"; packageName = "redoc-cli"; - version = "0.13.7"; + version = "0.13.8"; src = fetchurl { - url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.13.7.tgz"; - sha512 = "MkRGhBJfEESAhNnH+duJIkcS+PO5CRPzfJuHjd8tJEfdSXeCu+6UfBVyX4zrstbNGPtZkLn+ZV+bBl5obIcMIA=="; + url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.13.8.tgz"; + sha512 = "P0gh4cIP9KRMMISwVoU0EZKQS6U841UCZ26Lsoh3LANhgPGhKr5IrJzxVX7unxKLGzEjzZWXF778Vye9JXVDEg=="; }; dependencies = [ sources."@babel/code-frame-7.16.7" @@ -117228,7 +120839,7 @@ in sources."@emotion/unitless-0.7.5" sources."@exodus/schemasafe-1.0.0-rc.6" sources."@redocly/ajv-8.6.4" - sources."@redocly/openapi-core-1.0.0-beta.82" + sources."@redocly/openapi-core-1.0.0-beta.87" sources."@redocly/react-dropdown-aria-2.0.12" sources."@types/json-schema-7.0.9" sources."@types/node-14.18.12" @@ -117246,7 +120857,7 @@ in sources."util-0.10.3" ]; }) - sources."babel-plugin-styled-components-2.0.3" + sources."babel-plugin-styled-components-2.0.6" sources."babel-plugin-syntax-jsx-6.18.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" @@ -117377,7 +120988,7 @@ in sources."minimatch-3.1.2" sources."minimist-1.2.5" sources."mkdirp-1.0.4" - sources."mobx-6.4.1" + sources."mobx-6.4.2" sources."mobx-react-7.3.0" sources."mobx-react-lite-3.3.0" sources."ms-2.1.2" @@ -117393,7 +121004,7 @@ in sources."oas-schema-walker-1.1.5" sources."oas-validator-5.0.8" sources."object-assign-4.1.1" - sources."openapi-sampler-1.2.0" + sources."openapi-sampler-1.2.1" sources."os-browserify-0.3.0" sources."pako-1.0.11" sources."parse-asn1-5.1.6" @@ -117431,7 +121042,7 @@ in ]; }) sources."readdirp-3.6.0" - (sources."redoc-2.0.0-rc.63" // { + (sources."redoc-2.0.0-rc.64" // { dependencies = [ sources."path-browserify-1.0.1" ]; @@ -117471,7 +121082,7 @@ in sources."to-regex-range-5.0.1" sources."tr46-0.0.3" sources."tty-browserify-0.0.0" - sources."uglify-js-3.15.1" + sources."uglify-js-3.15.3" (sources."uri-js-4.4.1" // { dependencies = [ sources."punycode-2.1.1" @@ -117505,7 +121116,7 @@ in sources."yaml-1.10.2" sources."yaml-ast-parser-0.0.43" sources."yargs-17.3.1" - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -117661,10 +121272,10 @@ in "reveal.js" = nodeEnv.buildNodePackage { name = "reveal.js"; packageName = "reveal.js"; - version = "4.2.1"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/reveal.js/-/reveal.js-4.2.1.tgz"; - sha512 = "OXH4qT5Gs9di6lZPDmRuanIvdiVzltCe8W9ELz6Q3EhoWS+RjRp5HBwFHr+k1fbbP82/Z83sQiK+/ZYFBwrrsQ=="; + url = "https://registry.npmjs.org/reveal.js/-/reveal.js-4.3.0.tgz"; + sha512 = "KzZxJjj1gmxVNyplY6g9MiGwtDvZJiYkMvG1Qmaita7vWT/8eoTEK+RuIPLvxDeyxOtTz56u2wrOETVO79qL4A=="; }; buildInputs = globalBuildInputs; meta = { @@ -118002,10 +121613,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.67.3"; + version = "2.70.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.67.3.tgz"; - sha512 = "G/x1vUwbGtP6O5ZM8/sWr8+p7YfZhI18pPqMRtMYMWSbHjKZ/ajHGiM+GWNTlWyOR0EHIdT8LHU+Z4ciIZ1oBw=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.70.0.tgz"; + sha512 = "iEzYw+syFxQ0X9RefVwhr8BA2TNJsTaX8L8dhyeyMECDbmiba+8UQzcu+xZdji0+JQ+s7kouQnw+9Oz5M19XKA=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -118020,11 +121631,11 @@ in bypassCache = true; reconstructLock = true; }; - "rust-analyzer-build-deps-../../misc/vscode-extensions/rust-analyzer/build-deps" = nodeEnv.buildNodePackage { + "rust-analyzer-build-deps-../../applications/editors/vscode/extensions/rust-analyzer/build-deps" = nodeEnv.buildNodePackage { name = "rust-analyzer"; packageName = "rust-analyzer"; version = "0.2.834"; - src = ../../misc/vscode-extensions/rust-analyzer/build-deps; + src = ../../applications/editors/vscode/extensions/rust-analyzer/build-deps; dependencies = [ sources."@babel/code-frame-7.12.11" sources."@babel/helper-validator-identifier-7.16.7" @@ -118055,7 +121666,7 @@ in sources."@types/mocha-8.2.3" sources."@types/node-14.17.34" sources."@types/node-fetch-2.6.1" - sources."@types/vscode-1.64.0" + sources."@types/vscode-1.65.0" sources."@typescript-eslint/eslint-plugin-4.33.0" sources."@typescript-eslint/experimental-utils-4.33.0" sources."@typescript-eslint/parser-4.33.0" @@ -118277,7 +121888,7 @@ in sources."growl-1.10.5" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-unicode-2.0.1" sources."he-1.2.0" sources."hosted-git-info-4.1.0" @@ -118333,12 +121944,12 @@ in sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."mkdirp-classic-0.5.3" - (sources."mocha-9.2.1" // { + (sources."mocha-9.2.2" // { dependencies = [ sources."argparse-2.0.1" sources."has-flag-4.0.0" sources."js-yaml-4.1.0" - sources."minimatch-3.0.4" + sources."minimatch-4.2.1" sources."ms-2.1.3" sources."supports-color-8.1.1" sources."yargs-16.2.0" @@ -118347,7 +121958,7 @@ in }) sources."ms-2.1.2" sources."mute-stream-0.0.8" - sources."nanoid-3.2.0" + sources."nanoid-3.3.1" sources."napi-build-utils-1.0.2" sources."natural-compare-1.4.0" sources."node-abi-3.8.0" @@ -118465,7 +122076,7 @@ in sources."type-check-0.4.0" sources."type-fest-0.20.2" sources."typed-rest-client-1.8.6" - sources."typescript-4.5.5" + sources."typescript-4.6.2" sources."typescript-formatter-7.2.2" sources."uc.micro-1.0.6" sources."underscore-1.13.2" @@ -118503,7 +122114,7 @@ in sources."y18n-5.0.8" sources."yallist-4.0.0" sources."yargs-17.3.1" - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" sources."yargs-unparser-2.0.0" sources."yauzl-2.10.0" sources."yazl-2.5.1" @@ -118532,7 +122143,7 @@ in sources."p-locate-5.0.0" sources."path-exists-4.0.0" sources."picocolors-1.0.0" - sources."postcss-8.4.6" + sources."postcss-8.4.8" sources."source-map-js-1.0.2" sources."strip-json-comments-3.1.1" sources."yocto-queue-0.1.0" @@ -118598,7 +122209,7 @@ in sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" sources."has-1.0.3" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."http-auth-2.0.7" sources."inherits-2.0.4" sources."isarray-0.0.1" @@ -118646,10 +122257,10 @@ in sass = nodeEnv.buildNodePackage { name = "sass"; packageName = "sass"; - version = "1.49.8"; + version = "1.49.9"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.49.8.tgz"; - sha512 = "NoGOjvDDOU9og9oAxhRnap71QaTjjlzrvLnKecUJ3GxhaQBrV6e7gPuSPF28u1OcVAArVojPAe4ZhOXwwC4tGw=="; + url = "https://registry.npmjs.org/sass/-/sass-1.49.9.tgz"; + sha512 = "YlYWkkHP9fbwaFRZQRXgDi3mXZShslVmmo+FVK3kHLUELHHEYrCmL1x6IUjC7wLS6VuJSAFXRQS/DxdsC4xL1A=="; }; dependencies = [ sources."anymatch-3.1.2" @@ -118826,10 +122437,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "3.2.1"; + version = "3.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-3.2.1.tgz"; - sha512 = "ocCfLKt+C8rZaalzkbdnxenPZBjS78wnZxJYqDdXx3EYr4e9KND2WyTKUhB8g/f3FPSWjGW35R9e3/Mfd/ceTw=="; + url = "https://registry.npmjs.org/serverless/-/serverless-3.7.4.tgz"; + sha512 = "TsrSGfzKO9N0/rp2dROVUrKgku3b3JHP1wBEPrCgLLmfBTBLRi6YoTK9HAWgehNa+uSHdE4x02s+nttXU6qhtQ=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -118838,26 +122449,27 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@serverless/dashboard-plugin-6.1.0" + sources."@serverless/aws-lambda-otel-extension-dist-0.1.10" + sources."@serverless/dashboard-plugin-6.1.5" sources."@serverless/event-mocks-1.1.1" - (sources."@serverless/platform-client-4.3.1" // { + (sources."@serverless/platform-client-4.3.2" // { dependencies = [ sources."js-yaml-3.14.1" ]; }) - (sources."@serverless/utils-6.0.2" // { + (sources."@serverless/utils-6.0.3" // { dependencies = [ sources."jwt-decode-3.1.2" ]; }) - sources."@sindresorhus/is-4.4.0" + sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@tokenizer/token-0.3.0" sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/lodash-4.14.178" - sources."@types/node-17.0.19" + sources."@types/lodash-4.14.179" + sources."@types/node-17.0.21" sources."@types/responselike-1.0.0" sources."adm-zip-0.5.9" sources."agent-base-6.0.2" @@ -118883,7 +122495,7 @@ in sources."async-3.2.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.1077.0" // { + (sources."aws-sdk-2.1092.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -118974,7 +122586,7 @@ in sources."type-1.2.0" ]; }) - sources."dayjs-1.10.7" + sources."dayjs-1.10.8" sources."debug-4.3.3" (sources."decompress-4.2.1" // { dependencies = [ @@ -119023,11 +122635,7 @@ in sources."duration-0.2.2" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" - (sources."es5-ext-0.10.53" // { - dependencies = [ - sources."next-tick-1.0.0" - ]; - }) + sources."es5-ext-0.10.58" sources."es6-iterator-2.0.3" (sources."es6-set-0.1.5" // { dependencies = [ @@ -119082,7 +122690,7 @@ in sources."graphlib-2.1.8" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."http-cache-semantics-4.1.0" sources."http2-wrapper-1.0.3" sources."https-proxy-agent-5.0.0" @@ -119093,7 +122701,7 @@ in sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."inquirer-8.2.0" + sources."inquirer-8.2.1" sources."is-binary-path-2.1.0" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" @@ -119153,8 +122761,12 @@ in sources."methods-1.1.2" sources."micromatch-4.0.4" sources."mime-1.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + (sources."mime-types-2.1.34" // { + dependencies = [ + sources."mime-db-1.51.0" + ]; + }) sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.1.2" @@ -119221,7 +122833,7 @@ in sources."run-async-2.4.1" sources."run-parallel-1.2.0" sources."run-parallel-limit-1.1.0" - sources."rxjs-7.5.4" + sources."rxjs-7.5.5" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.1" @@ -119272,7 +122884,7 @@ in sources."tmp-0.0.33" sources."to-buffer-1.1.1" sources."to-regex-range-5.0.1" - sources."token-types-4.1.1" + sources."token-types-4.2.0" sources."tr46-0.0.3" sources."traverse-0.6.6" sources."trim-repeated-1.0.0" @@ -119950,10 +123562,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.855.0"; + version = "1.868.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.855.0.tgz"; - sha512 = "LZ8tXVleYHPW2GL3UWfaswKatNY1rTQ7aUNOD1rboD4cWydJsHCnSHzoMQcXq+06XBLw//LxL0G2YhdZhPz2mA=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.868.0.tgz"; + sha512 = "iIzTIgQELgCmqvi3XBdKf+6ButRQ/SKCvR91DJM2SKdnIrRAQykNU2NAzBY5IfM/RHcPqCxlCgeJxTumiswv9g=="; }; buildInputs = globalBuildInputs; meta = { @@ -119977,14 +123589,14 @@ in sources."@types/component-emitter-1.2.11" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."accepts-1.3.8" sources."base64id-2.0.0" sources."component-emitter-1.3.0" sources."cookie-0.4.2" sources."cors-2.8.5" sources."debug-4.3.3" - sources."engine.io-6.1.2" + sources."engine.io-6.1.3" sources."engine.io-parser-5.0.3" sources."mime-db-1.51.0" sources."mime-types-2.1.34" @@ -120085,7 +123697,7 @@ in sources."locate-path-6.0.0" (sources."log-symbols-5.1.0" // { dependencies = [ - sources."chalk-5.0.0" + sources."chalk-5.0.1" ]; }) sources."log-update-5.0.0" @@ -120100,7 +123712,7 @@ in sources."onetime-5.1.2" (sources."ora-6.1.0" // { dependencies = [ - sources."chalk-5.0.0" + sources."chalk-5.0.1" ]; }) sources."p-limit-3.1.0" @@ -120137,7 +123749,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."string-width-5.1.0" + sources."string-width-5.1.2" sources."string_decoder-1.3.0" sources."strip-ansi-7.0.1" sources."strip-indent-4.0.0" @@ -120276,6 +123888,7 @@ in sources."chloride-2.4.1" sources."chloride-test-1.2.4" sources."chokidar-1.7.0" + sources."clarify-error-1.0.0" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -120437,7 +124050,7 @@ in sources."has-ansi-2.0.0" sources."has-bigints-1.0.1" sources."has-network-0.0.1" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" (sources."has-value-1.0.0" // { dependencies = [ @@ -120564,7 +124177,7 @@ in ]; }) sources."levelup-4.4.0" - sources."libnested-1.5.1" + sources."libnested-1.5.2" sources."libsodium-0.7.9" sources."libsodium-wrappers-0.7.9" sources."lodash.debounce-4.0.8" @@ -120595,14 +124208,20 @@ in sources."monotonic-timestamp-0.0.9" sources."moo-0.5.1" sources."ms-2.1.2" - sources."multiblob-1.13.7" - sources."multiblob-http-1.2.0" + (sources."multiblob-1.13.8" // { + dependencies = [ + sources."glob-7.2.0" + sources."mkdirp-1.0.4" + sources."rimraf-3.0.2" + ]; + }) + sources."multiblob-http-1.2.1" sources."multicb-1.2.2" sources."multiserver-3.8.2" sources."multiserver-address-1.0.1" sources."multiserver-scopes-2.0.0" sources."mutexify-1.4.0" - sources."muxrpc-6.7.0" + sources."muxrpc-6.7.2" sources."muxrpc-usage-2.1.0" sources."muxrpc-validation-3.0.2" sources."muxrpcli-3.1.2" @@ -120692,7 +124311,7 @@ in sources."promisify-4loc-1.0.0" sources."promisize-1.1.2" sources."prr-1.0.1" - sources."pull-abortable-4.0.0" + sources."pull-abortable-4.1.1" sources."pull-async-1.0.0" sources."pull-awaitable-1.0.0" sources."pull-box-stream-1.0.13" @@ -120710,14 +124329,10 @@ in ]; }) sources."pull-glob-1.0.7" - (sources."pull-goodbye-0.0.2" // { - dependencies = [ - sources."pull-stream-3.5.0" - ]; - }) + sources."pull-goodbye-0.0.3" sources."pull-handshake-1.1.4" sources."pull-hash-1.0.0" - sources."pull-inactivity-2.1.3" + sources."pull-inactivity-2.1.4" sources."pull-level-2.0.4" sources."pull-live-1.0.1" sources."pull-looper-1.0.0" @@ -120757,7 +124372,6 @@ in sources."push-stream-11.0.1" ]; }) - sources."querystringify-2.2.0" sources."queue-tick-1.0.0" sources."quicktask-1.0.1" sources."railroad-diagrams-1.0.0" @@ -120854,7 +124468,6 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.4" sources."repeat-string-1.6.1" - sources."requires-port-1.0.0" sources."resolve-1.22.0" sources."resolve-url-0.2.1" sources."restore-cursor-1.0.1" @@ -120871,8 +124484,8 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."sanitize-filename-1.6.3" - sources."secret-handshake-1.1.20" - sources."secret-stack-6.4.0" + sources."secret-handshake-1.1.21" + sources."secret-stack-6.4.1" sources."semver-5.7.1" sources."separator-escape-0.0.1" (sources."set-value-2.0.1" // { @@ -120928,13 +124541,13 @@ in sources."source-map-url-0.4.1" sources."split-buffer-1.0.0" sources."split-string-3.1.0" - (sources."ssb-bendy-butt-0.12.4" // { + (sources."ssb-bendy-butt-0.12.5" // { dependencies = [ sources."ssb-keys-8.2.0" ]; }) - sources."ssb-bfe-3.1.1" - sources."ssb-bfe-spec-0.3.0" + sources."ssb-bfe-3.1.3" + sources."ssb-bfe-spec-0.4.0" sources."ssb-blobs-1.2.2" sources."ssb-caps-1.1.0" sources."ssb-client-4.9.0" @@ -120944,7 +124557,7 @@ in ]; }) sources."ssb-db-19.2.0" - (sources."ssb-db2-2.8.9" // { + (sources."ssb-db2-2.8.11" // { dependencies = [ sources."abstract-leveldown-6.2.3" (sources."flumecodec-0.0.1" // { @@ -121000,7 +124613,7 @@ in sources."ssb-replicate-1.3.3" sources."ssb-typescript-2.6.0" sources."ssb-unix-socket-1.0.0" - sources."ssb-uri2-1.7.0" + sources."ssb-uri2-1.7.2" (sources."ssb-validate-4.1.4" // { dependencies = [ sources."ssb-keys-8.2.0" @@ -121094,7 +124707,6 @@ in }) sources."untildify-2.1.0" sources."urix-0.1.0" - sources."url-parse-1.5.9" sources."use-3.1.1" sources."user-home-2.0.0" sources."utf8-byte-length-1.0.4" @@ -121213,7 +124825,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.1077.0" // { + (sources."aws-sdk-2.1092.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -121442,7 +125054,7 @@ in ]; }) sources."has-cors-1.1.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."hawk-3.1.3" sources."highlight.js-8.2.0" @@ -121478,7 +125090,7 @@ in ]; }) sources."is-fullwidth-code-point-1.0.0" - sources."is-my-ip-valid-1.0.0" + sources."is-my-ip-valid-1.0.1" sources."is-my-json-valid-2.20.6" sources."is-promise-2.2.2" sources."is-property-1.0.2" @@ -121991,10 +125603,10 @@ in stylelint = nodeEnv.buildNodePackage { name = "stylelint"; packageName = "stylelint"; - version = "14.5.1"; + version = "14.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/stylelint/-/stylelint-14.5.1.tgz"; - sha512 = "8Hf4HtnhxlWlf7iXF9zFfhSc3X0teRnVzl6PqPs2JEFx+dy/mhMhghZfiTDW4QG0ihDw9+WP7GZw5Nzx7cQF5A=="; + url = "https://registry.npmjs.org/stylelint/-/stylelint-14.5.3.tgz"; + sha512 = "omHETL+kGHR+fCXFK1SkZD/A+emCP9esggAdWEl8GPjTNeyRYj+H6uetRDcU+7E451zwWiUYGVAX+lApsAZgsQ=="; }; dependencies = [ sources."@babel/code-frame-7.16.7" @@ -122122,7 +125734,7 @@ in sources."path-type-4.0.0" sources."picocolors-1.0.0" sources."picomatch-2.3.1" - sources."postcss-8.4.6" + sources."postcss-8.4.8" sources."postcss-media-query-parser-0.2.3" sources."postcss-resolve-nested-selector-0.1.1" sources."postcss-safe-parser-6.0.0" @@ -122354,7 +125966,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@types/pug-2.0.6" sources."@types/sass-1.43.1" sources."anymatch-3.1.2" @@ -122383,7 +125995,7 @@ in sources."is-extglob-2.1.1" sources."is-glob-4.0.3" sources."is-number-7.0.0" - sources."magic-string-0.25.7" + sources."magic-string-0.25.9" sources."merge2-1.4.1" sources."micromatch-4.0.4" sources."min-indent-1.0.1" @@ -122409,9 +126021,9 @@ in sources."source-map-0.7.3" sources."sourcemap-codec-1.4.8" sources."strip-indent-3.0.0" - sources."svelte-preprocess-4.10.3" + sources."svelte-preprocess-4.10.4" sources."to-regex-range-5.0.1" - sources."typescript-4.5.5" + sources."typescript-4.6.2" sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; @@ -122439,7 +126051,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@types/pug-2.0.6" sources."@types/sass-1.43.1" sources."anymatch-3.1.2" @@ -122472,7 +126084,7 @@ in sources."jsonc-parser-2.3.1" sources."lodash-4.17.21" sources."lower-case-2.0.2" - sources."magic-string-0.25.7" + sources."magic-string-0.25.9" sources."merge2-1.4.1" sources."micromatch-4.0.4" sources."min-indent-1.0.1" @@ -122498,11 +126110,11 @@ in sources."sourcemap-codec-1.4.8" sources."strip-indent-3.0.0" sources."svelte-3.46.4" - sources."svelte-preprocess-4.10.3" + sources."svelte-preprocess-4.10.4" sources."svelte2tsx-0.5.5" sources."to-regex-range-5.0.1" sources."tslib-2.3.1" - sources."typescript-4.5.5" + sources."typescript-4.6.2" sources."vscode-css-languageservice-5.1.13" (sources."vscode-emmet-helper-2.6.4" // { dependencies = [ @@ -122799,7 +126411,7 @@ in sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -123159,7 +126771,7 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.15.1" + sources."uglify-js-3.15.3" sources."undefsafe-2.0.5" (sources."union-value-1.0.1" // { dependencies = [ @@ -123302,7 +126914,7 @@ in sources."path-type-4.0.0" sources."picocolors-1.0.0" sources."picomatch-2.3.1" - sources."postcss-8.4.6" + sources."postcss-8.4.8" sources."postcss-js-4.0.0" sources."postcss-load-config-3.1.3" sources."postcss-nested-5.0.6" @@ -123535,12 +127147,13 @@ in terser = nodeEnv.buildNodePackage { name = "terser"; packageName = "terser"; - version = "5.10.0"; + version = "5.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.10.0.tgz"; - sha512 = "AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA=="; + url = "https://registry.npmjs.org/terser/-/terser-5.12.0.tgz"; + sha512 = "R3AUhNBGWiFc77HXag+1fXpAxTAFRQTJemlJKjAgD9r8xXTpjNKqIXwHM/o7Rh+O0kUJtS3WQVdBeMKFk5sw9A=="; }; dependencies = [ + sources."acorn-8.7.0" sources."buffer-from-1.1.2" sources."commander-2.20.3" sources."source-map-0.7.3" @@ -123563,34 +127176,34 @@ in textlint = nodeEnv.buildNodePackage { name = "textlint"; packageName = "textlint"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/textlint/-/textlint-12.1.0.tgz"; - sha512 = "VZ0iVepE0jUchMfIW0uKGdEdv3l0ajOFvUBcpB1xGOLAz3gVwpdWvlagVlFXuwjc2N+9mcjTM0PCIXNwIs2vQA=="; + url = "https://registry.npmjs.org/textlint/-/textlint-12.1.1.tgz"; + sha512 = "AoE/pPL+6e/7hHOxwxL5oBTYIsG6gjrMP77VQZVYxXYfTDduwRlqhQUUrVd32DaLQTm7z3/lCnY46uFkmK06fA=="; }; dependencies = [ sources."@azu/format-text-1.0.1" sources."@azu/style-format-1.0.0" - sources."@textlint/ast-node-types-12.1.0" - sources."@textlint/ast-tester-12.1.0" - sources."@textlint/ast-traverse-12.1.0" - sources."@textlint/feature-flag-12.1.0" - sources."@textlint/fixer-formatter-12.1.0" - sources."@textlint/kernel-12.1.0" - sources."@textlint/linter-formatter-12.1.0" - sources."@textlint/markdown-to-ast-12.1.0" - sources."@textlint/module-interop-12.1.0" - sources."@textlint/source-code-fixer-12.1.0" - sources."@textlint/text-to-ast-12.1.0" - sources."@textlint/textlint-plugin-markdown-12.1.0" - sources."@textlint/textlint-plugin-text-12.1.0" - sources."@textlint/types-12.1.0" - sources."@textlint/utils-12.1.0" + sources."@textlint/ast-node-types-12.1.1" + sources."@textlint/ast-tester-12.1.1" + sources."@textlint/ast-traverse-12.1.1" + sources."@textlint/feature-flag-12.1.1" + sources."@textlint/fixer-formatter-12.1.1" + sources."@textlint/kernel-12.1.1" + sources."@textlint/linter-formatter-12.1.1" + sources."@textlint/markdown-to-ast-12.1.1" + sources."@textlint/module-interop-12.1.1" + sources."@textlint/source-code-fixer-12.1.1" + sources."@textlint/text-to-ast-12.1.1" + sources."@textlint/textlint-plugin-markdown-12.1.1" + sources."@textlint/textlint-plugin-text-12.1.1" + sources."@textlint/types-12.1.1" + sources."@textlint/utils-12.1.1" sources."@types/mdast-3.0.10" sources."@types/unist-2.0.6" sources."ajv-8.10.0" - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" + sources."ansi-regex-5.0.1" + sources."ansi-styles-4.3.0" sources."argparse-1.0.10" sources."astral-regex-2.0.0" sources."bail-1.0.5" @@ -123599,16 +127212,11 @@ in sources."brace-expansion-1.1.11" sources."call-bind-1.0.2" sources."ccount-1.1.0" - (sources."chalk-1.1.3" // { - dependencies = [ - sources."strip-ansi-3.0.1" - ]; - }) + sources."chalk-4.1.2" sources."character-entities-1.2.4" sources."character-entities-legacy-1.1.4" sources."character-reference-invalid-1.1.4" sources."charenc-0.0.2" - sources."code-point-at-1.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."concat-map-0.0.1" @@ -123620,7 +127228,7 @@ in sources."diff-4.0.2" sources."emoji-regex-8.0.0" sources."error-ex-1.3.2" - sources."escape-string-regexp-1.0.5" + sources."escape-string-regexp-4.0.0" sources."esprima-4.0.1" sources."extend-3.0.2" sources."fast-deep-equal-3.1.3" @@ -123638,8 +127246,8 @@ in sources."glob-7.2.0" sources."graceful-fs-4.2.9" sources."has-1.0.3" - sources."has-ansi-2.0.0" - sources."has-symbols-1.0.2" + sources."has-flag-4.0.0" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."hosted-git-info-2.8.9" sources."inflight-1.0.6" @@ -123653,7 +127261,7 @@ in sources."is-date-object-1.0.5" sources."is-decimal-1.0.4" sources."is-file-1.0.0" - sources."is-fullwidth-code-point-1.0.0" + sources."is-fullwidth-code-point-3.0.0" sources."is-hexadecimal-1.0.4" sources."is-plain-obj-2.1.0" sources."is-regex-1.1.4" @@ -123666,7 +127274,6 @@ in sources."load-json-file-1.1.0" sources."locate-path-2.0.0" sources."lodash.truncate-4.4.2" - sources."log-symbols-1.0.2" sources."longest-streak-2.0.4" sources."markdown-table-2.0.0" (sources."md5-2.3.0" // { @@ -123674,11 +127281,7 @@ in sources."is-buffer-1.1.6" ]; }) - (sources."mdast-util-find-and-replace-1.1.1" // { - dependencies = [ - sources."escape-string-regexp-4.0.0" - ]; - }) + sources."mdast-util-find-and-replace-1.1.1" sources."mdast-util-footnote-0.1.7" sources."mdast-util-from-markdown-0.8.5" sources."mdast-util-frontmatter-0.2.0" @@ -123703,7 +127306,6 @@ in sources."mkdirp-0.5.5" sources."ms-2.1.2" sources."normalize-package-data-2.5.0" - sources."number-is-nan-1.0.1" sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."once-1.4.0" @@ -123746,37 +127348,19 @@ in sources."resolve-1.22.0" sources."rimraf-2.6.3" sources."semver-5.7.1" - (sources."slice-ansi-4.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."is-fullwidth-code-point-3.0.0" - ]; - }) + sources."slice-ansi-4.0.0" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.11" sources."sprintf-js-1.0.3" - (sources."string-width-1.0.2" // { - dependencies = [ - sources."strip-ansi-3.0.1" - ]; - }) - (sources."strip-ansi-6.0.1" // { - dependencies = [ - sources."ansi-regex-5.0.1" - ]; - }) + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."strip-bom-2.0.0" sources."structured-source-3.0.2" - sources."supports-color-2.0.0" + sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" - (sources."table-6.8.0" // { - dependencies = [ - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.3" - ]; - }) + sources."table-6.8.0" sources."text-table-0.2.0" sources."traverse-0.6.6" sources."trough-1.0.5" @@ -123843,7 +127427,7 @@ in sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" sources."has-1.0.3" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."match-index-1.0.3" sources."object-keys-1.1.1" sources."regexp.prototype.flags-1.4.1" @@ -124458,7 +128042,7 @@ in sources."get-symbol-description-1.0.0" sources."has-1.0.3" sources."has-bigints-1.0.1" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."internal-slot-1.0.3" sources."is-bigint-1.0.4" @@ -124568,7 +128152,7 @@ in sources."get-symbol-description-1.0.0" sources."has-1.0.3" sources."has-bigints-1.0.1" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."internal-slot-1.0.3" sources."is-bigint-1.0.4" @@ -124646,7 +128230,7 @@ in sha512 = "dkVdH21q9vipV7UU10qQQprPuP8rG+IDJSHUtmOC0WDYvwYTiUC9IYLIpkyWdgfwFYegDTnnR4duHNZynqOXTA=="; }; dependencies = [ - sources."@sindresorhus/is-4.4.0" + sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@tokenizer/token-0.3.0" sources."@types/cacheable-request-6.0.2" @@ -124655,7 +128239,7 @@ in sources."@types/cors-2.8.12" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -124804,7 +128388,7 @@ in sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-unicode-2.0.1" sources."htmlparser2-6.1.0" @@ -125119,7 +128703,7 @@ in sha512 = "o24rZwvzeMbbvuara2bGaX6eHw925aQw1BZhl7VHtY6xlWrJ9Sy7P29/Q2GQNIP4Otzcf09TX29zTBbRjKbrSA=="; }; dependencies = [ - sources."@sindresorhus/is-4.4.0" + sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@tokenizer/token-0.3.0" sources."@types/cacheable-request-6.0.2" @@ -125128,7 +128712,7 @@ in sources."@types/cors-2.8.12" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -125277,7 +128861,7 @@ in sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-unicode-2.0.1" sources."htmlparser2-6.1.0" @@ -125769,7 +129353,7 @@ in sources."has-binary2-1.0.3" sources."has-cors-1.1.0" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-unicode-2.0.1" sources."htmlparser2-3.10.1" sources."http-cache-semantics-4.1.0" @@ -126270,7 +129854,7 @@ in sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -126735,7 +130319,7 @@ in sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -127584,10 +131168,10 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.137.5"; + version = "0.138.3"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.137.5.tgz"; - sha512 = "rTyr+HDFxjnN8+N/guZjDgfVxgHptZQpf6xfL/Mo7a5JYIFwK6tAq3bzxYYB4Ae0RosDZlDuP+X5aXDXz+XnHQ=="; + url = "https://registry.npmjs.org/three/-/three-0.138.3.tgz"; + sha512 = "4t1cKC8gimNyJChJbaklg8W/qj3PpsLJUIFm5LIuAy/hVxxNm1ru2FGTSfbTSsuHmC/7ipsyuGKqrSAKLNtkzg=="; }; buildInputs = globalBuildInputs; meta = { @@ -128031,10 +131615,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "4.5.5"; + version = "4.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.5.5.tgz"; - sha512 = "TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.6.2.tgz"; + sha512 = "HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg=="; }; buildInputs = globalBuildInputs; meta = { @@ -128049,10 +131633,10 @@ in typescript-language-server = nodeEnv.buildNodePackage { name = "typescript-language-server"; packageName = "typescript-language-server"; - version = "0.9.6"; + version = "0.9.7"; src = fetchurl { - url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.9.6.tgz"; - sha512 = "nLB9qvCFq/jRj21tC6SPZgde8JkNbCQZVjoeBHYsCZvzBgSyNh1A1k5puAM9g/kWlEvAlN/G4J8tETbnJySVpg=="; + url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.9.7.tgz"; + sha512 = "xjw6C9PctpLSwKEqaavSKfeH1CRmx1sD/DWXjig4xA/e9Y9/Mr70ViOinq5grFzexzDcdqdb7VDdkf7Ke+eZFg=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -128073,7 +131657,7 @@ in sources."fastq-1.13.0" sources."fill-range-7.0.1" sources."find-up-3.0.0" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."fs.realpath-1.0.0" sources."glob-7.2.0" sources."glob-parent-5.1.2" @@ -128141,10 +131725,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.15.1"; + version = "3.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.1.tgz"; - sha512 = "FAGKF12fWdkpvNJZENacOH0e/83eG6JyVQyanIJaBXCN1J11TUQv1T1/z8S+Z0CG0ZPk1nPcreF/c7lrTd0TEQ=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.3.tgz"; + sha512 = "6iCVm2omGJbsu3JWac+p6kUiOpg3wFO2f8lIXjfEb8RrmLjzog1wTPMmwKB7swfzzqxj9YM+sGUM++u1qN4qJg=="; }; buildInputs = globalBuildInputs; meta = { @@ -128186,7 +131770,7 @@ in sources."@colors/colors-1.5.0" sources."@dabh/diagnostics-2.0.3" sources."@primer/octicons-16.3.1" - sources."@sindresorhus/is-4.4.0" + sources."@sindresorhus/is-4.6.0" sources."@socket.io/base64-arraybuffer-1.0.2" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" @@ -128195,7 +131779,7 @@ in sources."@types/cors-2.8.12" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-16.11.25" + sources."@types/node-16.11.26" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."accepts-1.3.8" @@ -128253,7 +131837,7 @@ in sources."enabled-2.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - (sources."engine.io-6.1.2" // { + (sources."engine.io-6.1.3" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" @@ -128439,7 +132023,7 @@ in sources."y18n-5.0.8" sources."yallist-2.1.2" sources."yargs-17.3.1" - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" sources."yocto-queue-1.0.0" ]; buildInputs = globalBuildInputs; @@ -128469,7 +132053,7 @@ in sources."@types/is-empty-1.2.1" sources."@types/js-yaml-4.0.5" sources."@types/ms-0.7.31" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@types/supports-color-8.1.1" sources."@types/unist-2.0.6" sources."ansi-regex-6.0.1" @@ -128525,7 +132109,7 @@ in sources."readable-stream-3.6.0" sources."safe-buffer-5.2.1" sources."semver-7.3.5" - sources."string-width-5.1.0" + sources."string-width-5.1.2" sources."string_decoder-1.3.0" sources."strip-ansi-7.0.1" sources."supports-color-5.5.0" @@ -128534,10 +132118,10 @@ in sources."typedarray-0.0.6" sources."unified-engine-9.0.5" sources."unist-util-inspect-7.0.0" - sources."unist-util-stringify-position-3.0.0" + sources."unist-util-stringify-position-3.0.2" sources."util-deprecate-1.0.2" - sources."vfile-5.3.0" - sources."vfile-message-3.1.0" + sources."vfile-5.3.2" + sources."vfile-message-3.1.2" (sources."vfile-reporter-7.0.3" // { dependencies = [ sources."supports-color-9.2.1" @@ -128709,7 +132293,7 @@ in sources."y18n-5.0.8" sources."yallist-4.0.0" sources."yargs-17.3.1" - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -128779,7 +132363,7 @@ in dependencies = [ sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@vercel/build-utils-2.14.0" sources."@vercel/go-1.3.0" sources."@vercel/node-1.13.0" @@ -128889,10 +132473,10 @@ in vim-language-server = nodeEnv.buildNodePackage { name = "vim-language-server"; packageName = "vim-language-server"; - version = "2.2.5"; + version = "2.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/vim-language-server/-/vim-language-server-2.2.5.tgz"; - sha512 = "893GcGS5oFjBK2Dakdl4I0x8rtkgI+TOi44M9PmFU6YV+kwoLIRAxIcoF55rGiHFESCq98C+yjWn1OXznWgm7A=="; + url = "https://registry.npmjs.org/vim-language-server/-/vim-language-server-2.2.6.tgz"; + sha512 = "mgX18AzHsg2sDqh4aVVjk23iXf2s93lN7SZnZq2JE74/uGeXfrBckix3YdKtxgZe1vb1tiwDz9JRqoRV9SyGng=="; }; buildInputs = globalBuildInputs; meta = { @@ -129005,7 +132589,7 @@ in sources."globals-13.12.1" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."ignore-4.0.6" sources."import-fresh-3.3.0" @@ -129085,7 +132669,7 @@ in sources."tsutils-2.29.0" sources."type-check-0.4.0" sources."type-fest-0.20.2" - sources."typescript-4.5.5" + sources."typescript-4.6.2" sources."uri-js-4.4.1" sources."v8-compile-cache-2.3.0" (sources."vue-eslint-parser-7.11.0" // { @@ -129270,25 +132854,25 @@ in vscode-langservers-extracted = nodeEnv.buildNodePackage { name = "vscode-langservers-extracted"; packageName = "vscode-langservers-extracted"; - version = "4.0.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-langservers-extracted/-/vscode-langservers-extracted-4.0.0.tgz"; - sha512 = "DTFhpzUhP3M5WA62WT/SVSxtq47R5rbIEznA7svxWD19/+D1iGBrrzAa8LrDCkLUMxyG3gbya99LczV4F9m6Yg=="; + url = "https://registry.npmjs.org/vscode-langservers-extracted/-/vscode-langservers-extracted-4.1.0.tgz"; + sha512 = "HZfrlqpVu8N0UkSyjldPsGFpVFByYaDRDMmBvmKwKai2rAsd2vtde2CFnX9rOpmg3pN2vET8j3qtqZvZLzmkjQ=="; }; dependencies = [ sources."core-js-3.21.1" sources."jsonc-parser-3.0.0" sources."regenerator-runtime-0.13.9" sources."request-light-0.5.7" - sources."typescript-4.5.5" + sources."typescript-4.6.2" sources."vscode-css-languageservice-5.1.13" - sources."vscode-html-languageservice-4.2.1" + sources."vscode-html-languageservice-4.2.2" sources."vscode-json-languageservice-4.2.0" - sources."vscode-jsonrpc-8.0.0-next.6" - sources."vscode-languageserver-8.0.0-next.8" - (sources."vscode-languageserver-protocol-3.17.0-next.14" // { + sources."vscode-jsonrpc-8.0.0-next.7" + sources."vscode-languageserver-8.0.0-next.9" + (sources."vscode-languageserver-protocol-3.17.0-next.15" // { dependencies = [ - sources."vscode-languageserver-types-3.17.0-next.7" + sources."vscode-languageserver-types-3.17.0-next.8" ]; }) sources."vscode-languageserver-textdocument-1.0.4" @@ -129307,20 +132891,20 @@ in bypassCache = true; reconstructLock = true; }; - "vscode-lldb-build-deps-../../misc/vscode-extensions/vscode-lldb/build-deps" = nodeEnv.buildNodePackage { + "vscode-lldb-build-deps-../../applications/editors/vscode/extensions/vscode-lldb/build-deps" = nodeEnv.buildNodePackage { name = "vscode-lldb"; packageName = "vscode-lldb"; version = "1.6.8"; - src = ../../misc/vscode-extensions/vscode-lldb/build-deps; + src = ../../applications/editors/vscode/extensions/vscode-lldb/build-deps; dependencies = [ - sources."@discoveryjs/json-ext-0.5.6" + sources."@discoveryjs/json-ext-0.5.7" sources."@types/eslint-8.4.1" sources."@types/eslint-scope-3.7.3" sources."@types/estree-0.0.51" sources."@types/json-schema-7.0.9" sources."@types/mocha-7.0.2" sources."@types/node-8.10.66" - sources."@types/vscode-1.64.0" + sources."@types/vscode-1.65.0" sources."@types/yauzl-2.9.2" sources."@ungap/promise-all-settled-1.1.2" sources."@webassemblyjs/ast-1.11.1" @@ -129360,12 +132944,12 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-stdout-1.3.1" - sources."browserslist-4.19.3" + sources."browserslist-4.20.0" sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.2" sources."call-bind-1.0.2" sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001312" + sources."caniuse-lite-1.0.30001314" (sources."chalk-4.1.2" // { dependencies = [ sources."supports-color-7.2.0" @@ -129405,10 +132989,10 @@ in sources."domelementtype-2.2.0" sources."domhandler-4.3.0" sources."domutils-2.8.0" - sources."electron-to-chromium-1.4.71" + sources."electron-to-chromium-1.4.82" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" - sources."enhanced-resolve-5.9.0" + sources."enhanced-resolve-5.9.2" sources."entities-2.2.0" sources."envinfo-7.8.1" sources."errno-0.1.8" @@ -129444,7 +133028,7 @@ in sources."growl-1.10.5" sources."has-1.0.3" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."he-1.2.0" sources."htmlparser2-6.1.0" sources."human-signals-2.1.0" @@ -129572,7 +133156,7 @@ in sources."supports-color-8.1.1" sources."supports-preserve-symlinks-flag-1.0.0" sources."tapable-2.2.1" - (sources."terser-5.10.0" // { + (sources."terser-5.12.0" // { dependencies = [ sources."commander-2.20.3" sources."source-map-0.7.3" @@ -129595,7 +133179,7 @@ in sources."tslib-2.3.1" sources."tunnel-0.0.6" sources."typed-rest-client-1.8.6" - sources."typescript-4.5.5" + sources."typescript-4.6.2" sources."uc.micro-1.0.6" sources."underscore-1.13.2" sources."uri-js-4.4.1" @@ -129615,7 +133199,7 @@ in sources."vscode-debugadapter-testsupport-1.51.0" sources."vscode-debugprotocol-1.51.0" sources."watchpack-2.3.1" - sources."webpack-5.69.1" + sources."webpack-5.70.0" (sources."webpack-cli-4.9.2" // { dependencies = [ sources."commander-7.2.0" @@ -129918,7 +133502,7 @@ in sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.15.1" + sources."uglify-js-3.15.3" sources."uid-0.0.2" sources."unbzip2-stream-1.4.3" sources."unyield-0.0.1" @@ -129981,7 +133565,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-17.0.19" + sources."@types/node-17.0.21" sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -130791,7 +134375,7 @@ in sources."unist-util-inspect-4.1.4" sources."unist-util-is-2.1.3" sources."unist-util-modify-children-1.1.6" - sources."unist-util-stringify-position-3.0.0" + sources."unist-util-stringify-position-3.0.2" sources."unist-util-visit-1.4.1" (sources."unist-util-visit-parents-2.1.2" // { dependencies = [ @@ -130823,7 +134407,7 @@ in sources."vfile-message-2.0.4" ]; }) - sources."vfile-message-3.1.0" + sources."vfile-message-3.1.2" (sources."vfile-reporter-6.0.2" // { dependencies = [ sources."ansi-regex-5.0.1" @@ -130976,7 +134560,7 @@ in sources."esutils-2.0.3" sources."fast-levenshtein-2.0.6" sources."form-data-3.0.1" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."gauge-3.0.2" @@ -131085,7 +134669,7 @@ in sources."y18n-5.0.8" sources."yallist-4.0.0" sources."yargs-17.3.1" - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -131123,16 +134707,15 @@ in sources."@devicefarmer/adbkit-2.11.3" sources."@devicefarmer/adbkit-logcat-1.1.0" sources."@devicefarmer/adbkit-monkey-1.0.1" - (sources."@eslint/eslintrc-1.1.0" // { + (sources."@eslint/eslintrc-1.2.1" // { dependencies = [ sources."debug-4.3.3" sources."eslint-visitor-keys-3.3.0" sources."espree-9.3.1" - sources."ignore-4.0.6" sources."ms-2.1.2" ]; }) - (sources."@humanwhocodes/config-array-0.9.3" // { + (sources."@humanwhocodes/config-array-0.9.5" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" @@ -131143,7 +134726,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@types/yauzl-2.9.2" sources."acorn-8.7.0" sources."acorn-jsx-5.3.2" @@ -131289,7 +134872,7 @@ in }) sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fast-redact-3.1.0" + sources."fast-redact-3.1.1" sources."fd-slicer-1.1.0" sources."file-entry-cache-6.0.1" (sources."firefox-profile-4.2.2" // { @@ -131339,7 +134922,7 @@ in sources."har-validator-5.1.5" sources."has-1.0.3" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-yarn-2.1.0" sources."htmlparser2-6.1.0" @@ -131588,7 +135171,7 @@ in sources."text-table-0.2.0" sources."thenify-3.3.1" sources."thenify-all-1.6.0" - sources."thread-stream-0.13.1" + sources."thread-stream-0.13.2" sources."through-2.3.8" sources."tmp-0.2.1" sources."to-readable-stream-1.0.0" @@ -131637,7 +135220,7 @@ in sources."yargs-parser-20.2.9" ]; }) - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" sources."yauzl-2.10.0" (sources."zip-dir-2.0.0" // { dependencies = [ @@ -131658,17 +135241,17 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.69.1"; + version = "5.70.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.69.1.tgz"; - sha512 = "+VyvOSJXZMT2V5vLzOnDuMz5GxEqLk7hKWQ56YxPW/PQRUuKimPqmEIJOx8jHYeyo65pKbapbW464mvsKbaj4A=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.70.0.tgz"; + sha512 = "ZMWWy8CeuTTjCxbeaQI21xSswseF2oNOwc70QSKNePvmxE7XW36i7vpBMYZFAUHPwQiEbNGCEYIOOlyRbdGmxw=="; }; dependencies = [ sources."@types/eslint-8.4.1" sources."@types/eslint-scope-3.7.3" sources."@types/estree-0.0.51" sources."@types/json-schema-7.0.9" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -131690,13 +135273,13 @@ in sources."acorn-import-assertions-1.8.0" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" - sources."browserslist-4.19.3" + sources."browserslist-4.20.0" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001312" + sources."caniuse-lite-1.0.30001314" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" - sources."electron-to-chromium-1.4.71" - sources."enhanced-resolve-5.9.0" + sources."electron-to-chromium-1.4.82" + sources."enhanced-resolve-5.9.2" sources."es-module-lexer-0.9.3" sources."escalade-3.1.1" sources."eslint-scope-5.1.1" @@ -131731,7 +135314,7 @@ in sources."source-map-support-0.5.21" sources."supports-color-8.1.1" sources."tapable-2.2.1" - (sources."terser-5.10.0" // { + (sources."terser-5.12.0" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -131760,7 +135343,7 @@ in sha512 = "m3/AACnBBzK/kMTcxWHcZFPrw/eQuY4Df1TxvIWfWM2x7mRqBQCqKEd96oCUa9jkapLBaFfRce33eGDb4Pr7YQ=="; }; dependencies = [ - sources."@discoveryjs/json-ext-0.5.6" + sources."@discoveryjs/json-ext-0.5.7" sources."@webpack-cli/configtest-1.1.1" sources."@webpack-cli/info-1.4.1" sources."@webpack-cli/serve-1.6.1" @@ -131841,14 +135424,14 @@ in sources."@types/http-proxy-1.17.8" sources."@types/json-schema-7.0.9" sources."@types/mime-1.3.2" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" sources."@types/retry-0.12.1" sources."@types/serve-index-1.9.1" sources."@types/serve-static-1.13.10" sources."@types/sockjs-0.3.33" - sources."@types/ws-8.2.3" + sources."@types/ws-8.5.2" sources."accepts-1.3.8" sources."aggregate-error-3.1.0" sources."ajv-8.10.0" @@ -131936,7 +135519,7 @@ in sources."graceful-fs-4.2.9" sources."handle-thing-2.0.1" sources."has-1.0.3" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" (sources."hpack.js-2.1.6" // { dependencies = [ @@ -131947,7 +135530,7 @@ in sources."html-entities-2.3.2" sources."http-deceiver-1.2.7" sources."http-errors-1.8.1" - sources."http-parser-js-0.5.5" + sources."http-parser-js-0.5.6" sources."http-proxy-1.18.1" sources."http-proxy-middleware-2.0.3" sources."human-signals-2.1.0" @@ -132180,10 +135763,10 @@ in webtorrent-cli = nodeEnv.buildNodePackage { name = "webtorrent-cli"; packageName = "webtorrent-cli"; - version = "4.0.3"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-4.0.3.tgz"; - sha512 = "UuAv33TkzZGpGYgWH8rLWkvebd91UWid6tueQhUj6eGxfLUpAEl6uFyRMLAEmg2/kskKQzI2YPl8+tgex3TWxg=="; + url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-4.0.4.tgz"; + sha512 = "uamNZvqmpk1NpK+Vk/L8hppxq/7n8qtD+pQKia9pkXIAGqOGDA65ql9hx6g8rA2tM7cKDNkJhtxxF9ibJsyveQ=="; }; dependencies = [ sources."@leichtgewicht/ip-codec-2.0.3" @@ -132198,7 +135781,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."@webtorrent/http-node-1.3.0" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.3.0" @@ -132230,7 +135813,7 @@ in sources."ms-2.1.2" ]; }) - (sources."bittorrent-tracker-9.18.3" // { + (sources."bittorrent-tracker-9.18.4" // { dependencies = [ sources."debug-4.3.3" sources."decompress-response-6.0.0" @@ -132286,7 +135869,7 @@ in }) sources."core-util-is-1.0.3" sources."cpus-1.0.3" - sources."create-torrent-5.0.1" + sources."create-torrent-5.0.2" sources."debug-2.6.9" sources."decompress-response-3.3.0" sources."define-lazy-prop-2.0.0" @@ -132388,7 +135971,7 @@ in sources."node-gyp-build-4.3.0" sources."node-ssdp-2.9.1" sources."nodebmc-0.0.7" - sources."on-finished-2.3.0" + sources."on-finished-2.4.1" sources."once-1.4.0" sources."open-8.4.0" sources."package-json-versionify-1.0.4" @@ -132460,7 +136043,7 @@ in sources."stream-to-blob-2.0.1" sources."stream-to-blob-url-3.0.2" sources."stream-with-known-length-to-buffer-1.0.4" - sources."streamx-2.12.2" + sources."streamx-2.12.4" sources."string-width-4.2.3" sources."string2compact-1.3.2" sources."string_decoder-1.3.0" @@ -132471,7 +136054,7 @@ in sources."thunky-0.1.0" sources."timeout-refresh-1.0.3" sources."to-arraybuffer-1.0.1" - (sources."torrent-discovery-9.4.7" // { + (sources."torrent-discovery-9.4.9" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" @@ -132493,12 +136076,12 @@ in ]; }) sources."ut_pex-3.0.2" - sources."utf-8-validate-5.0.8" + sources."utf-8-validate-5.0.9" sources."util-deprecate-1.0.2" sources."utp-native-2.5.3" sources."videostream-3.2.2" sources."vlc-command-1.2.0" - (sources."webtorrent-1.8.2" // { + (sources."webtorrent-1.8.6" // { dependencies = [ sources."debug-4.3.3" sources."decompress-response-6.0.0" @@ -132516,7 +136099,7 @@ in sources."xmldom-0.1.31" sources."y18n-5.0.8" sources."yargs-17.3.1" - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -132576,10 +136159,10 @@ in yaml-language-server = nodeEnv.buildNodePackage { name = "yaml-language-server"; packageName = "yaml-language-server"; - version = "1.4.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-1.4.0.tgz"; - sha512 = "NgUzbSbRQvIH++P303a6Y20qLRqM8qhPESoJ/n26NBXA+GITozV1/JRl2FLEt9oPSR9WkQ1a9J3EsToHfKGQWA=="; + url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-1.5.1.tgz"; + sha512 = "rTrsKFF2G6vY9oInUoMWHuRjdQi/AAeWkt2H4N9TYKMiQPzEWnz91MufNkNwlXCA26JCDFStwqNjaYPUdI6SDw=="; }; dependencies = [ sources."jsonc-parser-3.0.0" @@ -132716,10 +136299,10 @@ in ]; }) sources."@npmcli/installed-package-contents-1.0.7" - (sources."@npmcli/map-workspaces-2.0.1" // { + (sources."@npmcli/map-workspaces-2.0.2" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."minimatch-5.0.0" + sources."minimatch-5.0.1" ]; }) (sources."@npmcli/metavuln-calculator-2.0.0" // { @@ -132750,7 +136333,7 @@ in sources."ms-2.1.2" ]; }) - (sources."agentkeepalive-4.2.0" // { + (sources."agentkeepalive-4.2.1" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" @@ -133141,7 +136724,7 @@ in sources."ansi-regex-5.0.1" sources."are-we-there-yet-3.0.0" sources."env-paths-2.2.1" - sources."gauge-4.0.1" + sources."gauge-4.0.3" sources."is-fullwidth-code-point-3.0.0" sources."npmlog-6.0.1" sources."readable-stream-3.6.0" @@ -133191,8 +136774,12 @@ in sources."debug-4.3.3" sources."http-cache-semantics-4.1.0" sources."http-proxy-agent-5.0.0" - sources."lru-cache-7.3.1" - sources."make-fetch-happen-10.0.3" + sources."lru-cache-7.4.4" + (sources."make-fetch-happen-10.0.5" // { + dependencies = [ + sources."minipass-fetch-2.0.3" + ]; + }) sources."ms-2.1.2" ]; }) @@ -133585,7 +137172,7 @@ in sources."gauge-3.0.2" sources."get-stream-6.0.1" sources."has-flag-4.0.0" - sources."inquirer-8.2.0" + sources."inquirer-8.2.1" sources."is-fullwidth-code-point-3.0.0" sources."is-stream-2.0.1" sources."locate-path-6.0.0" @@ -133601,7 +137188,7 @@ in sources."path-key-3.1.1" sources."readable-stream-3.6.0" sources."restore-cursor-3.1.0" - sources."rxjs-7.5.4" + sources."rxjs-7.5.5" sources."semver-7.3.5" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -133640,10 +137227,10 @@ in zx = nodeEnv.buildNodePackage { name = "zx"; packageName = "zx"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/zx/-/zx-5.1.0.tgz"; - sha512 = "J62b/7sFwqt4zbmPbeKJGwZlvW2X3ynyfWHZPr+xLAGF80h4aY4SgXaadMjljpvIbWGOwRmK38vwEdi5XgUpcQ=="; + url = "https://registry.npmjs.org/zx/-/zx-5.2.0.tgz"; + sha512 = "EzaYf8TGosgEGli8CpcDHnvZck/FRv3vEjIzYnhZLib8H+jKc3p4CG2epTayDqCOYQ2v0xsv2DoQ1Hn2OZ0o/g=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -133651,9 +137238,9 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@types/fs-extra-9.0.13" sources."@types/minimist-1.2.2" - sources."@types/node-17.0.19" + sources."@types/node-17.0.21" sources."braces-3.0.2" - sources."chalk-5.0.0" + sources."chalk-5.0.1" sources."data-uri-to-buffer-4.0.0" sources."dir-glob-3.0.1" sources."duplexer-0.1.2" @@ -133664,7 +137251,7 @@ in sources."fill-range-7.0.1" sources."formdata-polyfill-4.0.10" sources."from-0.1.7" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."glob-parent-5.1.2" sources."globby-13.1.1" sources."graceful-fs-4.2.9" @@ -133679,7 +137266,7 @@ in sources."micromatch-4.0.4" sources."minimist-1.2.5" sources."node-domexception-1.0.0" - sources."node-fetch-3.2.0" + sources."node-fetch-3.2.3" sources."path-type-4.0.0" sources."pause-stream-0.0.11" sources."picomatch-2.3.1" diff --git a/nixpkgs/pkgs/development/ocaml-modules/apron/default.nix b/nixpkgs/pkgs/development/ocaml-modules/apron/default.nix index c9edfd62e06d..bfef3d5b6c66 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/apron/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/apron/default.nix @@ -10,9 +10,12 @@ stdenv.mkDerivation rec { sha256 = "14ymjahqdxj26da8wik9d5dzlxn81b3z1iggdl7rn2nn06jy7lvy"; }; - buildInputs = [ perl gmp mpfr ppl ocaml findlib camlidl ]; + nativeBuildInputs = [ ocaml findlib perl ]; + buildInputs = [ gmp mpfr ppl camlidl ]; propagatedBuildInputs = [ mlgmpidl ]; + strictDeps = false; + outputs = [ "out" "bin" "dev" ]; configurePhase = '' diff --git a/nixpkgs/pkgs/development/ocaml-modules/astring/default.nix b/nixpkgs/pkgs/development/ocaml-modules/astring/default.nix index 8ecac1c124d6..f7478f93b91c 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/astring/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/astring/default.nix @@ -22,7 +22,10 @@ stdenv.mkDerivation { inherit (param) sha256; }; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ]; + + strictDeps = true; inherit (topkg) buildPhase installPhase; diff --git a/nixpkgs/pkgs/development/ocaml-modules/atd/default.nix b/nixpkgs/pkgs/development/ocaml-modules/atd/default.nix index de6ade61518a..7468900e07e6 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/atd/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/atd/default.nix @@ -13,9 +13,11 @@ buildDunePackage rec { sha256 = "17jm79np69ixp53a4njxnlb1pg8sd1g47nm3nyki9clkc8d4qsyv"; }; - buildInputs = [ which menhir ]; + nativeBuildInputs = [ which menhir ]; propagatedBuildInputs = [ easy-format re ]; + strictDeps = true; + doCheck = true; passthru.tests = { diff --git a/nixpkgs/pkgs/development/ocaml-modules/bap/default.nix b/nixpkgs/pkgs/development/ocaml-modules/bap/default.nix index f8e07fd1265c..ea009083e8d1 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/bap/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/bap/default.nix @@ -36,10 +36,9 @@ stdenv.mkDerivation rec { export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/ocaml${ocaml.version}-bap-${version}-llvm-plugins/" ''; - nativeBuildInputs = [ which makeWrapper ]; + nativeBuildInputs = [ which makeWrapper ocaml findlib ocamlbuild ocaml_oasis ]; - buildInputs = [ ocaml findlib ocamlbuild ocaml_oasis - linenoise + buildInputs = [ linenoise ounit ppx_bitstring z3 diff --git a/nixpkgs/pkgs/development/ocaml-modules/batteries/default.nix b/nixpkgs/pkgs/development/ocaml-modules/batteries/default.nix index 69e8289df2cd..184f10a52be4 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/batteries/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/batteries/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, num +{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, num, ounit , doCheck ? lib.versionAtLeast ocaml.version "4.08" && !stdenv.isAarch64 }: @@ -17,10 +17,12 @@ stdenv.mkDerivation rec { sha256 = "sha256:1cd7475n1mxhq482aidmhh27mq5p2vmb8d9fkb1mlza9pz5z66yq"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; - checkInputs = [ qtest ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + checkInputs = [ qtest ounit ]; propagatedBuildInputs = [ num ]; + strictDeps = !doCheck; + inherit doCheck; checkTarget = "test"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/benchmark/default.nix b/nixpkgs/pkgs/development/ocaml-modules/benchmark/default.nix index 3397821319e3..c80162307241 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/benchmark/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/benchmark/default.nix @@ -9,7 +9,10 @@ stdenv.mkDerivation rec { sha256 = "16wi8ld7c3mq77ylpgbnj8qqqqimyzwxs47v06vyrwpma5pab5xa"; }; - buildInputs = [ ocaml findlib ocamlbuild ocaml_pcre ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + buildInputs = [ ocaml_pcre ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/bigarray-overlap/default.nix b/nixpkgs/pkgs/development/ocaml-modules/bigarray-overlap/default.nix index e02b1159a9c7..a5f5ae33ede7 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/bigarray-overlap/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/bigarray-overlap/default.nix @@ -14,9 +14,12 @@ buildDunePackage rec { minimumOCamlVersion = "4.07"; useDune2 = true; + strictDeps = !doCheck; + propagatedBuildInputs = [ bigarray-compat ]; - checkInputs = [ alcotest astring fpath bos findlib pkg-config ]; + nativeBuildInputs = [ findlib pkg-config ]; + checkInputs = [ alcotest astring fpath bos ]; doCheck = true; meta = with lib; { diff --git a/nixpkgs/pkgs/development/ocaml-modules/bigstringaf/default.nix b/nixpkgs/pkgs/development/ocaml-modules/bigstringaf/default.nix index 852459c2bac1..e8d36526d228 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/bigstringaf/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/bigstringaf/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildDunePackage, ocaml, alcotest, bigarray-compat }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml, alcotest, bigarray-compat, pkg-config }: buildDunePackage rec { pname = "bigstringaf"; @@ -15,6 +15,10 @@ buildDunePackage rec { sha256 = "1q1sqxzdnlrpl95ccrhl7lwy3zswgd9rbn19ildclh0lyi2vazbj"; }; + # This currently fails with dune + strictDeps = false; + + nativeBuildInputs = [ pkg-config ]; checkInputs = [ alcotest ]; propagatedBuildInputs = [ bigarray-compat ]; doCheck = lib.versionAtLeast ocaml.version "4.05"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/biniou/1.0.nix b/nixpkgs/pkgs/development/ocaml-modules/biniou/1.0.nix index 795e63401290..5a2e2ea9a7fa 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/biniou/1.0.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/biniou/1.0.nix @@ -16,7 +16,10 @@ stdenv.mkDerivation rec { sha256 = "14j3hrhbjqxbizr1pr8fcig9dmfzhbjjwzwyc99fcsdic67w8izb"; }; - buildInputs = [ ocaml findlib easy-format ]; + nativeBuildInputs = [ ocaml findlib ]; + buildInputs = [ easy-format ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/biniou/default.nix b/nixpkgs/pkgs/development/ocaml-modules/biniou/default.nix index 535b34b03dcd..75725f135518 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/biniou/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/biniou/default.nix @@ -15,6 +15,8 @@ buildDunePackage rec { propagatedBuildInputs = [ easy-format ]; + strictDeps = true; + postPatch = '' patchShebangs . ''; diff --git a/nixpkgs/pkgs/development/ocaml-modules/bitv/default.nix b/nixpkgs/pkgs/development/ocaml-modules/bitv/default.nix index 2ac3a0ba3e76..07649f3655b8 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/bitv/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/bitv/default.nix @@ -15,7 +15,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-sZwq6c10hBBS9tGvKlWD9GE3JBrZPByfDrXE6xIPcG4="; }; - buildInputs = [ autoreconfHook which ocaml findlib ]; + nativeBuildInputs = [ autoreconfHook which ocaml findlib ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/bolt/default.nix b/nixpkgs/pkgs/development/ocaml-modules/bolt/default.nix index a6b63676e775..46e3b6f16cce 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/bolt/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/bolt/default.nix @@ -18,7 +18,9 @@ stdenv.mkDerivation rec { sha256 = "1c807wrpxra9sbb34lajhimwra28ldxv04m570567lh2b04n38zy"; }; - buildInputs = [ ocaml findlib ocamlbuild which camlp4 ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild which camlp4 ]; + + strictDeps = true; patches = [ (fetchpatch { diff --git a/nixpkgs/pkgs/development/ocaml-modules/bos/default.nix b/nixpkgs/pkgs/development/ocaml-modules/bos/default.nix index 17a0185829e9..07d4d4864d82 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/bos/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/bos/default.nix @@ -11,10 +11,12 @@ stdenv.mkDerivation rec { sha256 = "1s10iqx8rgnxr5n93lf4blwirjf8nlm272yg5sipr7lsr35v49wc"; }; - nativeBuildInputs = [ ocaml findlib ocamlbuild ]; - buildInputs = [ findlib topkg ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ]; propagatedBuildInputs = [ astring fmt fpath logs rresult ]; + strictDeps = true; + inherit (topkg) buildPhase installPhase; meta = { diff --git a/nixpkgs/pkgs/development/ocaml-modules/bz2/default.nix b/nixpkgs/pkgs/development/ocaml-modules/bz2/default.nix index 617715fc6edc..4ac0262e1ee3 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/bz2/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/bz2/default.nix @@ -19,9 +19,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - ]; - - buildInputs = [ ocaml findlib ]; @@ -30,6 +27,8 @@ stdenv.mkDerivation rec { bzip2 ]; + strictDeps = true; + preInstall = "mkdir -p $OCAMLFIND_DESTDIR/stublibs"; meta = with lib; { diff --git a/nixpkgs/pkgs/development/ocaml-modules/calendar/default.nix b/nixpkgs/pkgs/development/ocaml-modules/calendar/default.nix index 29927aae04a7..4c089b76f3ed 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/calendar/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/calendar/default.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "04pvhwb664g3s644c7v7419a3kvf5s3pynkhmk5j59dvlfm1yf0f"; }; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/camlimages/default.nix b/nixpkgs/pkgs/development/ocaml-modules/camlimages/default.nix index ba36cfa05b99..a83c7c474ac5 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/camlimages/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/camlimages/default.nix @@ -17,7 +17,10 @@ buildDunePackage rec { sha256 = "1m2c76ghisg73dikz2ifdkrbkgiwa0hcmp21f2fm2rkbf02rq3f4"; }; - buildInputs = [ dune-configurator cppo graphics lablgtk stdio ]; + strictDeps = true; + + nativeBuildInputs = [ cppo ]; + buildInputs = [ dune-configurator graphics lablgtk stdio ]; meta = with lib; { branch = "5.0"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/camlpdf/default.nix b/nixpkgs/pkgs/development/ocaml-modules/camlpdf/default.nix index 42c27f15a5b1..06456b9c930e 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/camlpdf/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/camlpdf/default.nix @@ -15,7 +15,9 @@ stdenv.mkDerivation rec { sha256 = "sha256:1qmsa0xgi960y7r20mvf8hxiiml7l1908s4dm7nq262f19w51gsl"; }; - buildInputs = [ which ocaml findlib ]; + nativeBuildInputs = [ which ocaml findlib ]; + + strictDeps = true; preInstall = '' mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs diff --git a/nixpkgs/pkgs/development/ocaml-modules/camlzip/default.nix b/nixpkgs/pkgs/development/ocaml-modules/camlzip/default.nix index c2c2e98b2e06..8124b8d8e437 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/camlzip/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/camlzip/default.nix @@ -33,10 +33,12 @@ stdenv.mkDerivation { inherit (param) sha256; }; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; propagatedBuildInputs = [zlib]; + strictDeps = true; + inherit (param) patches; createFindlibDestdir = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/camomile/0.8.2.nix b/nixpkgs/pkgs/development/ocaml-modules/camomile/0.8.2.nix index 79c7a46e6e99..43bbfe7b6a6d 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/camomile/0.8.2.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/camomile/0.8.2.nix @@ -13,7 +13,9 @@ stdenv.mkDerivation rec { sha256 = "0x43pjxx70kgip86mmdn08s97k4qzdqc8i79xfyyx28smy1bsa00"; }; - buildInputs = [ocaml findlib camlp4]; + nativeBuildInputs = [ ocaml findlib camlp4 ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/camomile/0.8.5.nix b/nixpkgs/pkgs/development/ocaml-modules/camomile/0.8.5.nix index 67bd8b8c755d..e63953836982 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/camomile/0.8.5.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/camomile/0.8.5.nix @@ -14,7 +14,9 @@ stdenv.mkDerivation { sha256 = "167279lia6qx62mdcyc5rjsi4gf4yi52wn9mhgd9y1v3754z7fwb"; })]; - buildInputs = [ocaml findlib camlp4]; + nativeBuildInputs = [ocaml findlib camlp4 ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix b/nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix index 090b96ece0cc..e5fe67021312 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildDunePackage, cppo }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml, cppo }: buildDunePackage rec { pname = "camomile"; @@ -13,7 +13,9 @@ buildDunePackage rec { sha256 = "00i910qjv6bpk0nkafp5fg97isqas0bwjf7m6rz11rsxilpalzad"; }; - buildInputs = [ cppo ]; + nativeBuildInputs = [ cppo ]; + + strictDeps = true; configurePhase = '' runHook preConfigure @@ -21,6 +23,10 @@ buildDunePackage rec { runHook postConfigure ''; + postInstall = '' + echo "version = \"${version}\"" >> $out/lib/ocaml/${ocaml.version}/site-lib/camomile/META + ''; + meta = { inherit (src.meta) homepage; maintainers = [ lib.maintainers.vbgl ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/caqti/default.nix b/nixpkgs/pkgs/development/ocaml-modules/caqti/default.nix index 105a6a9dfe18..d9606cda1fa3 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/caqti/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/caqti/default.nix @@ -14,7 +14,7 @@ buildDunePackage rec { sha256 = "1vl61kdyj89whc3mh4k9bis6rbj9x2scf6hnv9afyalp4j65sqx1"; }; - buildInputs = [ cppo ]; + nativeBuildInputs = [ cppo ]; propagatedBuildInputs = [ logs ptime uri ]; meta = { diff --git a/nixpkgs/pkgs/development/ocaml-modules/carton/default.nix b/nixpkgs/pkgs/development/ocaml-modules/carton/default.nix index 97e00dc71b62..6868ddc7851c 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/carton/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/carton/default.nix @@ -48,13 +48,15 @@ buildDunePackage rec { ]; doCheck = true; + nativeBuildInputs = [ + findlib + ]; checkInputs = [ base64 alcotest alcotest-lwt crowbar lwt - findlib mirage-flow ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/cfstream/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cfstream/default.nix index 303fdc01011d..62a29a5d4141 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/cfstream/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/cfstream/default.nix @@ -17,7 +17,10 @@ buildDunePackage rec { patches = [ ./git_commit.patch ]; - buildInputs = [ m4 ]; + # This currently fails with dune + strictDeps = false; + + nativeBuildInputs = [ m4 ]; checkInputs = [ ounit ]; propagatedBuildInputs = [ core_kernel ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/checkseum/default.nix b/nixpkgs/pkgs/development/ocaml-modules/checkseum/default.nix index 3483af1dd416..3a07707a4cd1 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/checkseum/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/checkseum/default.nix @@ -18,10 +18,8 @@ buildDunePackage rec { sha256 = "9cdd282ea1cfc424095d7284e39e4d0ad091de3c3f2580539d03f6966d45ccd5"; }; - nativeBuildInputs = [ - dune-configurator - pkg-config - ]; + buildInputs = [ dune-configurator ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ bigarray-compat optint diff --git a/nixpkgs/pkgs/development/ocaml-modules/cil/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cil/default.nix index c5a3dcde2263..7a8a3f2e70a4 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/cil/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/cil/default.nix @@ -13,7 +13,9 @@ stdenv.mkDerivation rec { sha256 = "05739da0b0msx6kmdavr3y2bwi92jbh3szc35d7d8pdisa8g5dv9"; }; - buildInputs = [ perl ocaml findlib ocamlbuild ]; + nativeBuildInputs = [ perl ocaml findlib ocamlbuild ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/cmdliner/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cmdliner/default.nix index 7e49679406ab..9536cc25290e 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/cmdliner/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/cmdliner/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { inherit (param) sha256; }; - nativeBuildInputs = [ ocaml ocamlbuild findlib ]; + nativeBuildInputs = [ ocaml ocamlbuild findlib topkg ]; buildInputs = [ topkg ]; propagatedBuildInputs = [ result ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/coin/default.nix b/nixpkgs/pkgs/development/ocaml-modules/coin/default.nix index f0697a9d880b..f2e0919bdee4 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/coin/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/coin/default.nix @@ -24,9 +24,11 @@ buildDunePackage rec { useDune2 = true; - nativeBuildInputs = [ menhir ]; + nativeBuildInputs = [ menhir findlib ]; + buildInputs = [ re ]; + + strictDeps = true; - checkInputs = [ re ]; doCheck = true; meta = { diff --git a/nixpkgs/pkgs/development/ocaml-modules/comparelib/default.nix b/nixpkgs/pkgs/development/ocaml-modules/comparelib/default.nix index 1d7c314f005c..1da631d683cc 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/comparelib/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/comparelib/default.nix @@ -1,4 +1,4 @@ -{ lib, buildOcaml, fetchFromGitHub, type_conv }: +{ lib, buildOcaml, fetchFromGitHub, type_conv, camlp4 }: buildOcaml rec { pname = "comparelib"; @@ -13,6 +13,7 @@ buildOcaml rec { sha256 = "sha256-gtJvXAUxiIt/L9bCzS+8wHcCQ+QpBubwcjDcyN0K2MA="; }; + buildInputs = [ camlp4 ]; propagatedBuildInputs = [ type_conv ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/ocaml-modules/config-file/default.nix b/nixpkgs/pkgs/development/ocaml-modules/config-file/default.nix index c408d1a392f1..b9dde0e6425f 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/config-file/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/config-file/default.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1b02yxcnsjhr05ssh2br2ka4hxsjpdw34ldl3nk33wfnkwk7g67q"; }; - buildInputs = [ ocaml findlib camlp4 ]; + nativeBuildInputs = [ ocaml findlib camlp4 ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/cpdf/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cpdf/default.nix index 632430fe4f7f..3f60263736e8 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/cpdf/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/cpdf/default.nix @@ -15,9 +15,12 @@ stdenv.mkDerivation rec { sha256 = "sha256:1qmx229nij7g6qmiacmyy4mcgx3k9509p4slahivshqm79d6wiwl"; }; - buildInputs = [ ocaml findlib ncurses ]; + nativeBuildInputs = [ ocaml findlib ]; + buildInputs = [ ncurses ]; propagatedBuildInputs = [ camlpdf ]; + strictDeps = true; + preInstall = '' mkdir -p $OCAMLFIND_DESTDIR mkdir -p $out/bin diff --git a/nixpkgs/pkgs/development/ocaml-modules/cryptgps/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cryptgps/default.nix index 6011c6953baa..aeaa87aaf75f 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/cryptgps/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/cryptgps/default.nix @@ -13,7 +13,9 @@ stdenv.mkDerivation { sha256 = "1mp7i42cm9w9grmcsa69m3h1ycpn6a48p43y4xj8rsc12x9nav3s"; }; - buildInputs = [ocaml findlib]; + nativeBuildInputs = [ ocaml findlib ]; + + strictDeps = true; dontConfigure = true; # Skip configure phase diff --git a/nixpkgs/pkgs/development/ocaml-modules/csv/1.5.nix b/nixpkgs/pkgs/development/ocaml-modules/csv/1.5.nix index ee68782313c5..cd298fb39a9f 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/csv/1.5.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/csv/1.5.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1ca7jgg58j24pccs5fshis726s06fdcjshnwza5kwxpjgdbvc63g"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ctypes/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ctypes/default.nix index 8c20a68c2746..833ea45a8692 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ctypes/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ctypes/default.nix @@ -15,10 +15,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-eu5RAuPYC97IM4XUsUw3HQ1BJlEHQ+eBpsdUE6hd+Q8="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ocaml findlib ncurses ]; + nativeBuildInputs = [ pkg-config ocaml findlib ]; + buildInputs = [ ncurses ]; propagatedBuildInputs = [ integers libffi bigarray-compat ]; + strictDeps = true; + buildPhase = '' make XEN=false libffi.config ctypes-base ctypes-stubs make XEN=false ctypes-foreign diff --git a/nixpkgs/pkgs/development/ocaml-modules/digestif/default.nix b/nixpkgs/pkgs/development/ocaml-modules/digestif/default.nix index 2ddaec5c7c1d..dba0bcb9269e 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/digestif/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/digestif/default.nix @@ -1,4 +1,5 @@ { lib, ocaml, fetchurl, buildDunePackage +, pkg-config, which , bigarray-compat, eqaf, stdlib-shims , alcotest, astring, bos, findlib, fpath }: @@ -14,8 +15,13 @@ buildDunePackage rec { sha256 = "01gwkbrznci4xdcbww4ysgsciz2qs0r8jsmhp0siwbcgcrf1jjv5"; }; + nativeBuildInputs = [ findlib which ]; + buildInputs = [ ocaml ]; + propagatedBuildInputs = [ bigarray-compat eqaf stdlib-shims ]; + strictDeps = !doCheck; + checkInputs = [ alcotest astring bos fpath ]; doCheck = lib.versionAtLeast ocaml.version "4.05"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/dolmen/default.nix b/nixpkgs/pkgs/development/ocaml-modules/dolmen/default.nix index 9a21da986814..7a7a14192f9e 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/dolmen/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/dolmen/default.nix @@ -16,7 +16,9 @@ buildDunePackage rec { sha256 = "133l23mwxa9xy340izvk4zp5jqjz2cwsm2innsgs2kg85pd39c41"; }; - buildInputs = [ menhir ]; + strictDeps = true; + + nativeBuildInputs = [ menhir ]; propagatedBuildInputs = [ menhirLib fmt ]; # Testr are not compatible with menhir 20211128 diff --git a/nixpkgs/pkgs/development/ocaml-modules/dolog/default.nix b/nixpkgs/pkgs/development/ocaml-modules/dolog/default.nix index 64fb2b2c5a59..599cc356031b 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/dolog/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/dolog/default.nix @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-6wfqT5sqo4YA8XoHH3QhG6/TyzzXCzqjmnPuBArRoj8="; }; - buildInputs = [ ocaml findlib ocamlbuild ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/dose3/default.nix b/nixpkgs/pkgs/development/ocaml-modules/dose3/default.nix index 733427cdb914..daf5b3779d73 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/dose3/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/dose3/default.nix @@ -6,13 +6,13 @@ buildDunePackage rec { pname = "dose3"; - version = "6.1"; + version = "7.0.0"; src = fetchFromGitLab { owner = "irill"; repo = "dose3"; rev = version; - sha256 = "sha256-RFChY7VH2pVD4u5U1qng46h9aAv8I/3yXVaNmFDmKFI="; + sha256 = "sha256-K0fYSAWV48Rers/foDrEIqieyJ0PvpXkuYrFrZGBkkE="; }; minimalOCamlVersion = "4.03"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/dum/default.nix b/nixpkgs/pkgs/development/ocaml-modules/dum/default.nix index 7bdaf2dfad90..3faef36e8ec4 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/dum/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/dum/default.nix @@ -13,9 +13,11 @@ stdenv.mkDerivation rec { sha256 = "0yrxl97szjc0s2ghngs346x3y0xszx2chidgzxk93frjjpsr1mlr"; }; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; propagatedBuildInputs = [ easy-format ]; + strictDeps = true; + createFindlibDestdir = true; meta = with lib; { diff --git a/nixpkgs/pkgs/development/ocaml-modules/dypgen/default.nix b/nixpkgs/pkgs/development/ocaml-modules/dypgen/default.nix index 5b5b107b694b..64017bd65fe2 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/dypgen/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/dypgen/default.nix @@ -17,7 +17,9 @@ stdenv.mkDerivation rec { sha256 = "ecb53d6e469e9ec4d57ee6323ff498d45b78883ae13618492488e7c5151fdd97"; }; - buildInputs = [ocaml findlib]; + nativeBuildInputs = [ ocaml findlib ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/elina/default.nix b/nixpkgs/pkgs/development/ocaml-modules/elina/default.nix index 2ddef0f40529..df7f140e5458 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/elina/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/elina/default.nix @@ -8,10 +8,12 @@ stdenv.mkDerivation rec { sha256 = "1nymykskq1yx87y4xl6hl9i4q6kv0qaq25rniqgl1bfn883p1ysc"; }; - buildInputs = [ perl ocaml findlib ]; + nativeBuildInputs = [ perl ocaml findlib ]; propagatedBuildInputs = [ apron camlidl gmp mpfr ]; + strictDeps = true; + prefixKey = "--prefix "; configureFlags = [ "--use-apron" diff --git a/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix b/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix index 69ac628d2014..e3af173edc91 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix @@ -6,6 +6,7 @@ , ocaml , lwt_react , opaline +, ocamlbuild , ppx_deriving , findlib , js_of_ocaml-ocamlbuild @@ -28,13 +29,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-VNxzpVpXEGlixyjadbW0GjL83jcKV5TWd46UReNYO6w="; }; - buildInputs = [ + nativeBuildInputs = [ ocaml which findlib + opaline + ocamlbuild + ]; + buildInputs = [ js_of_ocaml-ocamlbuild js_of_ocaml-ppx_deriving_json - opaline ocamlnet ]; @@ -48,6 +52,8 @@ stdenv.mkDerivation rec { ppx_deriving ]; + strictDeps = true; + installPhase = "opaline -prefix $out -libdir $OCAMLFIND_DESTDIR"; setupHook = [ ./setup-hook.sh ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/enumerate/default.nix b/nixpkgs/pkgs/development/ocaml-modules/enumerate/default.nix index d7f467e8eb98..9bedc4215108 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/enumerate/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/enumerate/default.nix @@ -15,9 +15,11 @@ stdenv.mkDerivation rec { sha256 = "0b6mx5p01lcpimvak4wx6aj2119707wsfzd83rwgb91bhpgzh156"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; propagatedBuildInputs = [ type_conv camlp4 ]; + strictDeps = true; + createFindlibDestdir = true; meta = { diff --git a/nixpkgs/pkgs/development/ocaml-modules/erm_xml/default.nix b/nixpkgs/pkgs/development/ocaml-modules/erm_xml/default.nix index fa072f8bd1c1..ebf9cdaad69a 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/erm_xml/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/erm_xml/default.nix @@ -15,7 +15,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-OQdLTq9tJZc6XlcuPv2gxzYiQAUGd6AiBzfSi169XL0="; }; - buildInputs = [ ocaml findlib ocamlbuild ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/erm_xmpp/default.nix b/nixpkgs/pkgs/development/ocaml-modules/erm_xmpp/default.nix index 3447d590ea23..1507154d2f64 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/erm_xmpp/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/erm_xmpp/default.nix @@ -13,9 +13,12 @@ stdenv.mkDerivation rec { sha256 = "0spzyd9kbyizzwl8y3mq8z19zlkzxnkh2fppry4lyc7vaw7bqrwq"; }; - buildInputs = [ ocaml findlib ocamlbuild camlp4 ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild camlp4 ]; + buildInputs = [ camlp4 ]; propagatedBuildInputs = [ erm_xml mirage-crypto mirage-crypto-rng base64 ]; + strictDeps = true; + configurePhase = '' runHook preConfigure ocaml setup.ml -configure --prefix $out diff --git a/nixpkgs/pkgs/development/ocaml-modules/expat/0.9.nix b/nixpkgs/pkgs/development/ocaml-modules/expat/0.9.nix index 219b8164e7c9..326ffc60b1ad 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/expat/0.9.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/expat/0.9.nix @@ -18,7 +18,10 @@ stdenv.mkDerivation rec { sha256 = "16n2j3y0jc9xgqyshw9plrwqnjiz30vnpbhahmgxlidbycw8rgjz"; }; - buildInputs = [ocaml findlib ounit expat]; + nativeBuildInputs = [ocaml findlib ]; + buildInputs = [ ounit expat]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/expat/default.nix b/nixpkgs/pkgs/development/ocaml-modules/expat/default.nix index e951acaa71a5..6fb7927073d4 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/expat/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/expat/default.nix @@ -15,7 +15,10 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace "gcc" "\$(CC)" ''; - buildInputs = [ ocaml findlib expat ounit ]; + nativeBuildInputs = [ ocaml findlib ]; + buildInputs = [ expat ounit ]; + + strictDeps = true; doCheck = !lib.versionAtLeast ocaml.version "4.06"; checkTarget = "testall"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/extlib/default.nix b/nixpkgs/pkgs/development/ocaml-modules/extlib/default.nix index d1860788838a..7f50548f4b87 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/extlib/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/extlib/default.nix @@ -12,7 +12,9 @@ stdenv.mkDerivation rec { sha256 = "0npq4hq3zym8nmlyji7l5cqk6drx2rkcx73d60rxqh5g8dla8p4k"; }; - buildInputs = [ ocaml findlib cppo ]; + nativeBuildInputs = [ ocaml findlib cppo ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/facile/default.nix b/nixpkgs/pkgs/development/ocaml-modules/facile/default.nix index 8834de53a8fa..df228603e9f4 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/facile/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/facile/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "facile"; version = "1.1.4"; + useDune2 = false; + src = fetchurl { url = "https://github.com/Emmanuel-PLF/facile/releases/download/${version}/facile-${version}.tbz"; sha256 = "0jqrwmn6fr2vj2rrbllwxq4cmxykv7zh0y4vnngx29f5084a04jp"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/farfadet/default.nix b/nixpkgs/pkgs/development/ocaml-modules/farfadet/default.nix index 79b742da575d..1ac5595a015b 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/farfadet/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/farfadet/default.nix @@ -15,10 +15,13 @@ stdenv.mkDerivation rec { sha256 = "0nlafnp0pwx0n4aszpsk6nvcvqi9im306p4jhx70si7k3xprlr2j"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ]; propagatedBuildInputs = [ faraday ]; + strictDeps = true; + inherit (topkg) buildPhase installPhase; meta = { diff --git a/nixpkgs/pkgs/development/ocaml-modules/fdkaac/default.nix b/nixpkgs/pkgs/development/ocaml-modules/fdkaac/default.nix index d3915b65935e..d794e4acce79 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/fdkaac/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/fdkaac/default.nix @@ -21,7 +21,7 @@ buildDunePackage rec { description = "OCaml binding for the fdk-aac library"; inherit (src.meta) homepage; license = lib.licenses.gpl2Only; - maintainers = [ lib.maintainers.vbgl ]; + maintainers = [ lib.maintainers.vbgl lib.maintainers.dandellion ]; }; } diff --git a/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/base.nix b/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/base.nix new file mode 100644 index 000000000000..77a6ef01ac9f --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/base.nix @@ -0,0 +1,21 @@ +{ lib, fetchFromGitHub }: + +rec { + version = "1.1.0"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-ffmpeg"; + rev = "v${version}"; + sha256 = "13rc3d0n963a28my5ahv78r82rh450hvbsc74mb6ld0r9v210r0p"; + }; + + meta = with lib; { + homepage = "https://github.com/savonet/ocaml-ffmpeg"; + description = "Bindings for the ffmpeg libraries"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/default.nix new file mode 100644 index 000000000000..7f0a5da34ddb --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/default.nix @@ -0,0 +1,36 @@ +{ lib, buildDunePackage, fetchFromGitHub, callPackage +, ffmpeg-base ? callPackage ./base.nix { } +, ffmpeg-avutil +, ffmpeg-avcodec +, ffmpeg-avfilter +, ffmpeg-swscale +, ffmpeg-swresample +, ffmpeg-av +, ffmpeg-avdevice +}: + +buildDunePackage { + pname = "ffmpeg"; + + minimalOCamlVersion = "4.08"; + + inherit (ffmpeg-base) version src useDune2; + + propagatedBuildInputs = [ + ffmpeg-avutil + ffmpeg-avcodec + ffmpeg-avfilter + ffmpeg-swscale + ffmpeg-swresample + ffmpeg-av + ffmpeg-avdevice + ]; + + # The tests fail + doCheck = false; + + meta = ffmpeg-base.meta // { + description = "Bindings for the ffmpeg libraries"; + }; + +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix b/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix new file mode 100644 index 000000000000..e8d71aa321e0 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix @@ -0,0 +1,22 @@ +{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage +, ffmpeg-base ? callPackage ./base.nix { } +, ffmpeg-avutil, ffmpeg-avcodec, ffmpeg }: + +buildDunePackage { + pname = "ffmpeg-av"; + + minimalOCamlVersion = "4.08"; + + inherit (ffmpeg-base) version src useDune2; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ ffmpeg-avutil ffmpeg-avcodec ffmpeg.dev ]; + + doCheck = true; + + meta = ffmpeg-base.meta // { + description = "Bindings for the ffmpeg libraries -- top-level helpers"; + }; + +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix b/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix new file mode 100644 index 000000000000..8ee5428c473e --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix @@ -0,0 +1,23 @@ +{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage +, ffmpeg-base ? callPackage ./base.nix { } +, ffmpeg-avutil, ffmpeg +}: + +buildDunePackage { + pname = "ffmpeg-avcodec"; + + minimalOCamlVersion = "4.08"; + + inherit (ffmpeg-base) version src useDune2; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ ffmpeg-avutil ffmpeg.dev ]; + + doCheck = true; + + meta = ffmpeg-base.meta // { + description = "Bindings for the ffmpeg avcodec library"; + }; + +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix b/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix new file mode 100644 index 000000000000..e6641a6ca030 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix @@ -0,0 +1,23 @@ +{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage +, ffmpeg-base ? callPackage ./base.nix { } +, ffmpeg-av, ffmpeg +}: + +buildDunePackage { + pname = "ffmpeg-avdevice"; + + minimalOCamlVersion = "4.08"; + + inherit (ffmpeg-base) version src useDune2; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ ffmpeg-av ffmpeg.dev ]; + + doCheck = true; + + meta = ffmpeg-base.meta // { + description = "Bindings for the ffmpeg avdevice library"; + }; + +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix b/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix new file mode 100644 index 000000000000..6479bbe55bf6 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix @@ -0,0 +1,23 @@ +{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage +, ffmpeg-base ? callPackage ./base.nix { } +, ffmpeg-avutil, ffmpeg +}: + +buildDunePackage { + pname = "ffmpeg-avfilter"; + + minimalOCamlVersion = "4.08"; + + inherit (ffmpeg-base) version src useDune2; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ ffmpeg-avutil ffmpeg.dev ]; + + doCheck = true; + + meta = ffmpeg-base.meta // { + description = "Bindings for the ffmpeg avfilter library"; + }; + +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix b/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix new file mode 100644 index 000000000000..121fb115146e --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix @@ -0,0 +1,23 @@ +{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage +, ffmpeg-base ? callPackage ./base.nix { } +, ffmpeg +}: + +buildDunePackage { + pname = "ffmpeg-avutil"; + + minimalOCamlVersion = "4.08"; + + inherit (ffmpeg-base) version src useDune2; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ ffmpeg.dev ]; + + doCheck = true; + + meta = ffmpeg-base.meta // { + description = "Bindings for the ffmpeg avutil libraries"; + }; + +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix b/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix new file mode 100644 index 000000000000..92011e48eab6 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix @@ -0,0 +1,23 @@ +{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage +, ffmpeg-base ? callPackage ./base.nix { } +, ffmpeg-avutil, ffmpeg-avcodec, ffmpeg +}: + +buildDunePackage { + pname = "ffmpeg-swresample"; + + minimalOCamlVersion = "4.08"; + + inherit (ffmpeg-base) version src useDune2; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ ffmpeg-avutil ffmpeg-avcodec ffmpeg.dev ]; + + doCheck = true; + + meta = ffmpeg-base.meta // { + description = "Bindings for the ffmpeg swresample library"; + }; + +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix b/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix new file mode 100644 index 000000000000..9d97b722551b --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix @@ -0,0 +1,22 @@ +{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage +, ffmpeg-base ? callPackage ./base.nix { } +, ffmpeg-avutil, ffmpeg +}: + +buildDunePackage { + pname = "ffmpeg-swscale"; + + minimalOCamlVersion = "4.08"; + + inherit (ffmpeg-base) version src useDune2; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ ffmpeg-avutil ffmpeg.dev ]; + + doCheck = true; + + meta = ffmpeg-base.meta // { + description = "Bindings for the ffmpeg swscale library"; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/flac/default.nix b/nixpkgs/pkgs/development/ocaml-modules/flac/default.nix new file mode 100644 index 000000000000..e08841ac32fe --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/flac/default.nix @@ -0,0 +1,26 @@ +{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, pkg-config, ogg, flac }: + +buildDunePackage rec { + pname = "flac"; + version = "0.3.0"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-flac"; + rev = "v${version}"; + sha256 = "06gfbrp30sdxigzkix83y1b610ljzik6rrxmbl3ppmpx4dqlwnxa"; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ ogg flac.dev ]; + + meta = with lib; { + homepage = "https://github.com/savonet/ocaml-flac"; + description = "Bindings for flac"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/fmt/default.nix b/nixpkgs/pkgs/development/ocaml-modules/fmt/default.nix index a66976b4a2b5..edf8d08eaaba 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/fmt/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/fmt/default.nix @@ -13,9 +13,11 @@ stdenv.mkDerivation rec { sha256 = "0gkkkj4x678vxdda4xaw2dd44qjacavsvn5nx8gydfwah6pjbkxk"; }; - nativeBuildInputs = [ ocaml findlib ocamlbuild ]; - buildInputs = [ findlib topkg cmdliner ]; - propagatedBuildInputs = [ seq stdlib-shims ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ]; + propagatedBuildInputs = [ cmdliner seq stdlib-shims ]; + + strictDeps = true; inherit (topkg) buildPhase installPhase; diff --git a/nixpkgs/pkgs/development/ocaml-modules/fontconfig/default.nix b/nixpkgs/pkgs/development/ocaml-modules/fontconfig/default.nix index f4afe80d532d..2eca9a4644b5 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/fontconfig/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/fontconfig/default.nix @@ -11,8 +11,11 @@ stdenv.mkDerivation { sha256 = "1fw6bzydmnyh2g4x35mcbg0hypnxqhynivk4nakcsx7prr8zr3yh"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ocaml fontconfig ]; + nativeBuildInputs = [ pkg-config ocaml ]; + buildInputs = [ fontconfig ]; + + strictDeps = true; + makeFlags = [ "OCAML_STDLIB_DIR=$(out)/lib/ocaml/${lib.getVersion ocaml}/site-lib/" "OCAML_HAVE_OCAMLOPT=yes" diff --git a/nixpkgs/pkgs/development/ocaml-modules/fpath/default.nix b/nixpkgs/pkgs/development/ocaml-modules/fpath/default.nix index 532210888bf3..53489f69cc3e 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/fpath/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/fpath/default.nix @@ -13,10 +13,13 @@ stdenv.mkDerivation rec { sha256 = "03z7mj0sqdz465rc4drj1gr88l9q3nfs374yssvdjdyhjbqqzc0j"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ]; propagatedBuildInputs = [ astring ]; + strictDeps = true; + inherit (topkg) buildPhase installPhase; meta = { diff --git a/nixpkgs/pkgs/development/ocaml-modules/frontc/default.nix b/nixpkgs/pkgs/development/ocaml-modules/frontc/default.nix index bc74a5b58a08..c05422497ee7 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/frontc/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/frontc/default.nix @@ -18,7 +18,9 @@ stdenv.mkDerivation rec { sha256 = "1dq5nks0c9gsbr1m8k39m1bniawr5hqcy1r8x5px7naa95ch06ak"; }; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; + + strictDeps = true; meta = with lib; { inherit (src.meta) homepage; diff --git a/nixpkgs/pkgs/development/ocaml-modules/functory/default.nix b/nixpkgs/pkgs/development/ocaml-modules/functory/default.nix index 959963c4752a..a05472366a21 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/functory/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/functory/default.nix @@ -21,7 +21,9 @@ stdenv.mkDerivation { inherit (param) sha256; }; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; + + strictDeps = true; installTargets = [ "ocamlfind-install" ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/genspio/default.nix b/nixpkgs/pkgs/development/ocaml-modules/genspio/default.nix index db3c42bca36c..963cd1dab138 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/genspio/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/genspio/default.nix @@ -6,6 +6,8 @@ buildDunePackage rec { pname = "genspio"; version = "0.0.2"; + useDune2 = false; + src = fetchFromGitHub { owner = "hammerlab"; repo = pname; @@ -13,7 +15,7 @@ buildDunePackage rec { sha256 = "0cp6p1f713sfv4p2r03bzvjvakzn4ili7hf3a952b3w1k39hv37x"; }; - minimumOCamlVersion = "4.03"; + minimalOCamlVersion = "4.03"; propagatedBuildInputs = [ nonstd sosa ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/getopt/default.nix b/nixpkgs/pkgs/development/ocaml-modules/getopt/default.nix index 3400774d4c07..e3bf2fb5d641 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/getopt/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/getopt/default.nix @@ -9,12 +9,14 @@ stdenv.mkDerivation rec { sha256 = "0bng2mmdixpmj23xn8krlnaq66k22iclwz46r8zjrsrq3wcn1xgn"; }; - buildInputs = [ + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + strictDeps = true; + doCheck = true; createFindlibDestdir = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/gg/default.nix b/nixpkgs/pkgs/development/ocaml-modules/gg/default.nix index 58e2b67eacc6..ec8bbb31617d 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/gg/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/gg/default.nix @@ -1,31 +1,27 @@ -{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, opaline }: +{ lib, stdenv, fetchurl, ocaml, findlib, topkg, ocamlbuild }: let - inherit (lib) getVersion versionAtLeast; - - pname = "gg"; - version = "0.9.1"; - webpage = "https://erratique.ch/software/${pname}"; + homepage = "https://erratique.ch/software/gg"; + version = "1.0.0"; in -assert versionAtLeast (getVersion ocaml) "4.01.0"; +lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") + "gg is not available for OCaml ${ocaml.version}" stdenv.mkDerivation { - name = "ocaml-${pname}-${version}"; + pname = "ocaml${ocaml.version}-gg"; + inherit version; src = fetchurl { - url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "0czj41sr8jsivl3z8wyblf9k971j3kx2wc3s0c1nhzcc8allg9i2"; + url = "${homepage}/releases/gg-${version}.tbz"; + sha256 = "sha256:0j7bpj8k17csnz6v6frkz9aycywsb7xmznnb31g8rbfk3626f3ci"; }; - buildInputs = [ ocaml findlib ocamlbuild opaline ]; - - createFindlibDestdir = true; - - buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true"; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ]; - installPhase = "opaline -libdir $OCAMLFIND_DESTDIR"; + inherit (topkg) buildPhase installPhase; meta = with lib; { description = "Basic types for computer graphics in OCaml"; @@ -35,8 +31,8 @@ stdenv.mkDerivation { matrices, quaternions, axis aligned boxes, colors, color spaces, and raster data. ''; - homepage = webpage; - platforms = ocaml.meta.platforms or []; + inherit homepage; + inherit (ocaml.meta) platforms; license = licenses.bsd3; maintainers = [ maintainers.jirkamarsik ]; }; diff --git a/nixpkgs/pkgs/development/ocaml-modules/gmetadom/default.nix b/nixpkgs/pkgs/development/ocaml-modules/gmetadom/default.nix index 29df5ce8f4e4..50be2adcb384 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/gmetadom/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/gmetadom/default.nix @@ -21,11 +21,12 @@ stdenv.mkDerivation rec { configureFlags="--with-ocaml-lib-prefix=$out/lib/ocaml/${ocaml.version}/site-lib" ''; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ocaml findlib gdome2 libxslt]; + nativeBuildInputs = [ pkg-config ocaml findlib ]; + buildInputs = [ gdome2 libxslt]; propagatedBuildInputs = [gdome2]; + strictDeps = true; + meta = { homepage = "http://gmetadom.sourceforge.net/"; description = "A collection of librares, each library providing a DOM implementation"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/hacl-star/default.nix b/nixpkgs/pkgs/development/ocaml-modules/hacl-star/default.nix index 8a29439c7a59..004aa5c9a449 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/hacl-star/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/hacl-star/default.nix @@ -12,7 +12,9 @@ buildDunePackage { zarith ]; - buildInputs = [ + nativeBuildInputs = [ cppo ]; + + strictDeps = true; } diff --git a/nixpkgs/pkgs/development/ocaml-modules/hacl-star/raw.nix b/nixpkgs/pkgs/development/ocaml-modules/hacl-star/raw.nix index c7852338253c..58fa1eb00212 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/hacl-star/raw.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/hacl-star/raw.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { dontAddStaticConfigureFlags = true; configurePlatforms = []; - buildInputs = [ + nativeBuildInputs = [ which ocaml findlib @@ -42,6 +42,8 @@ stdenv.mkDerivation rec { cppo ]; + strictDeps = true; + doCheck = true; meta = { diff --git a/nixpkgs/pkgs/development/ocaml-modules/herelib/default.nix b/nixpkgs/pkgs/development/ocaml-modules/herelib/default.nix index 14c775d25fcd..f9267ede60ae 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/herelib/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/herelib/default.nix @@ -1,4 +1,4 @@ -{ lib, buildOcaml, fetchFromGitHub }: +{ lib, buildOcaml, fetchFromGitHub, camlp4 }: buildOcaml rec { version = "112.35.00"; @@ -13,6 +13,10 @@ buildOcaml rec { sha256 = "sha256-EuMhHu2na3lcpsJ1wMVOgBr6VKndlonq8jgAW01eelI="; }; + strictDeps = true; + + buildInputs = [ camlp4 ]; + meta = with lib; { homepage = "https://github.com/janestreet/herelib"; description = "Syntax extension for inserting the current location"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/hidapi/default.nix b/nixpkgs/pkgs/development/ocaml-modules/hidapi/default.nix index 2caa25654e39..44b1d5f150a8 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/hidapi/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/hidapi/default.nix @@ -13,9 +13,12 @@ buildDunePackage rec { sha256 = "1j7rd7ajrzla76r3sxljx6fb18f4f4s3jd7vhv59l2ilxyxycai2"; }; + strictDeps = true; + minimumOCamlVersion = "4.03"; - buildInputs = [ pkgs.hidapi pkg-config dune-configurator ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ pkgs.hidapi dune-configurator ]; propagatedBuildInputs = [ bigstring ]; doCheck = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/hmap/default.nix b/nixpkgs/pkgs/development/ocaml-modules/hmap/default.nix index 67622a8ef6a0..d0ae47031b23 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/hmap/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/hmap/default.nix @@ -22,7 +22,10 @@ stdenv.mkDerivation rec { sha256 = "10xyjy4ab87z7jnghy0wnla9wrmazgyhdwhr4hdmxxdn28dxn03a"; }; - buildInputs = [ ocaml ocamlbuild findlib topkg ]; + nativeBuildInputs = [ ocaml ocamlbuild findlib topkg ]; + buildInputs = [ topkg ]; + + strictDeps = true; inherit (topkg) installPhase; diff --git a/nixpkgs/pkgs/development/ocaml-modules/hxd/default.nix b/nixpkgs/pkgs/development/ocaml-modules/hxd/default.nix index 0775e21b1f8d..0b05a83dd7ef 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/hxd/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/hxd/default.nix @@ -21,14 +21,11 @@ buildDunePackage rec { sed -i 's|yes ".\+"|& 2> /dev/null|' test/*.t ''; - nativeBuildInputs = [ - dune-configurator - ]; - propagatedBuildInputs = lib.optional withLwt lwt; buildInputs = [ cmdliner + dune-configurator ]; doCheck = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/index/default.nix b/nixpkgs/pkgs/development/ocaml-modules/index/default.nix index 34b2ee668ea8..3dc4a9856f93 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/index/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/index/default.nix @@ -6,11 +6,11 @@ buildDunePackage rec { pname = "index"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { url = "https://github.com/mirage/index/releases/download/${version}/index-${version}.tbz"; - sha256 = "1q1lv960dk1br8nz8gkibdywl2wv64ywib7b9jn33f6mpb81qc9f"; + sha256 = "sha256:150mcsh8vj2hapfnxbjmacanjy4avrv8yk1lyaxmqj3fpmn1y32y"; }; minimalOCamlVersion = "4.08"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/inifiles/default.nix b/nixpkgs/pkgs/development/ocaml-modules/inifiles/default.nix index 90308ee7d6d9..cbeae7bca839 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/inifiles/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/inifiles/default.nix @@ -16,9 +16,11 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; propagatedBuildInputs = [ ocaml_pcre ]; + strictDeps = true; + buildFlags = [ "all" "opt" ]; createFindlibDestdir = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/inotify/default.nix b/nixpkgs/pkgs/development/ocaml-modules/inotify/default.nix index e8289d929637..d1c6dc376164 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/inotify/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/inotify/default.nix @@ -19,9 +19,13 @@ stdenv.mkDerivation rec { sha256 = "04lfxrrsmk2mc704kaln8jqx93jc4bkxhijmfy2d4cmk1cim7r6k"; }) ]; - buildInputs = [ ocaml findlib ocamlbuild ocaml_lwt ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + buildInputs = [ ocaml_lwt ]; checkInputs = [ ounit fileutils ]; + # Otherwise checkInputs can't be found + strictDeps = false; + configureFlags = [ "--enable-lwt" (lib.optionalString doCheck "--enable-tests") ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/iso8601/default.nix b/nixpkgs/pkgs/development/ocaml-modules/iso8601/default.nix index add18281008c..ff9ce94bbbd4 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/iso8601/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/iso8601/default.nix @@ -11,7 +11,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-sXnYAJcU88797orzzfbA2XG91Lk8mDV677J1Am5o7Xo="; }; - buildInputs = [ ocaml findlib ocamlbuild ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + + strictDeps = true; + createFindlibDestdir = true; meta = { diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.12.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.12.nix index 10d8886d9947..c3b4b0c6d705 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.12.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.12.nix @@ -24,6 +24,7 @@ with self; hash = "0gl89zpgsf3n30nb6v5cns27g2bfg4rf3s2427gqvwbkr5gcf7ri"; meta.description = "Full standard library replacement for OCaml"; propagatedBuildInputs = [ sexplib0 ]; + buildInputs = [ dune_1 ]; }; stdio = janePackage { @@ -207,7 +208,7 @@ with self; pname = "jst-config"; hash = "0yxcz13vda1mdh9ah7qqxwfxpcqang5sgdssd8721rszbwqqaw93"; meta.description = "Compile-time configuration for Jane Street libraries"; - buildInputs = [ ppx_assert ]; + buildInputs = [ dune_1 ppx_assert ]; }; ppx_optcomp = janePackage { diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix index d22a87a92f3f..2f9aeea1d628 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix @@ -203,6 +203,8 @@ with self; meta.description = "Trivial metaprogramming tool"; propagatedBuildInputs = [ re ]; checkInputs = [ ppx_jane ]; + # This currently fails with dune + strictDeps = false; }; core = janePackage { @@ -664,6 +666,7 @@ with self; pname = "pythonlib"; hash = "0qr0mh9jiv1ham5zlz9i4im23a1vh6x1yp6dp2db2s4icmfph639"; meta.description = "A library to help writing wrappers around ocaml code for python"; + meta.broken = lib.versionAtLeast ocaml.version "4.13"; propagatedBuildInputs = [ ppx_expect ppx_let ppx_python stdio typerep ]; }; @@ -761,6 +764,8 @@ with self; buildInputs = [ jst-config ]; propagatedBuildInputs = [ textutils ]; checkInputs = [ ounit ]; + # This currently fails with dune + strictDeps = false; }; shexp = janePackage { diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage.nix index 9a67db4966ce..da2687576015 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage.nix @@ -1,11 +1,13 @@ { lib, fetchFromGitHub, buildDunePackage, defaultVersion ? "0.11.0" }: -{ pname, version ? defaultVersion, hash, ...}@args: +{ pname, version ? defaultVersion, hash, buildInputs ? [], ...}@args: buildDunePackage (args // { - inherit version; + inherit version buildInputs; - minimumOCamlVersion = "4.04"; + useDune2 = false; + + minimalOCamlVersion = "4.04"; src = fetchFromGitHub { owner = "janestreet"; @@ -14,6 +16,8 @@ buildDunePackage (args // { sha256 = hash; }; + strictDeps = true; + meta = { license = lib.licenses.asl20; homepage = "https://github.com/janestreet/${pname}"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix index 6c7d746e9481..5b9186835701 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix @@ -5,7 +5,9 @@ buildDunePackage (args // { inherit version; - minimumOCamlVersion = "4.07"; + useDune2 = false; + + minimalOCamlVersion = "4.07"; src = fetchFromGitHub { owner = "janestreet"; @@ -14,6 +16,8 @@ buildDunePackage (args // { sha256 = hash; }; + strictDeps = true; + meta = { license = lib.licenses.mit; homepage = "https://github.com/janestreet/${pname}"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix index 1ed2e6bc4f20..d124baea8972 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix @@ -5,11 +5,13 @@ , hash , minimumOCamlVersion ? "4.08" , doCheck ? true +, buildInputs ? [] +, strictDeps ? true , ...}@args: buildDunePackage (args // { useDune2 = true; - inherit version; + inherit version buildInputs strictDeps; inherit minimumOCamlVersion; diff --git a/nixpkgs/pkgs/development/ocaml-modules/javalib/default.nix b/nixpkgs/pkgs/development/ocaml-modules/javalib/default.nix index 78b61de8d9c1..ccd3fa19a92c 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/javalib/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/javalib/default.nix @@ -23,7 +23,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-du1h+S+A7CetMXofsYxdGeSsobCgspDB9oUE9WNUbbo="; }; - buildInputs = [ which ocaml findlib ]; + nativeBuildInputs = [ which ocaml findlib ]; + + strictDeps = true; patches = [ ./configure.sh.patch ./Makefile.config.example.patch ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/jsonm/default.nix b/nixpkgs/pkgs/development/ocaml-modules/jsonm/default.nix index c228242fda9e..2b9c9918382b 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/jsonm/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/jsonm/default.nix @@ -9,10 +9,12 @@ stdenv.mkDerivation rec { sha256 = "1176dcmxb11fnw49b7yysvkjh0kpzx4s48lmdn5psq9vshp5c29w"; }; - buildInputs = [ findlib topkg ]; - nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ]; propagatedBuildInputs = [ uutf ]; + strictDeps = true; + inherit (topkg) buildPhase installPhase; meta = { diff --git a/nixpkgs/pkgs/development/ocaml-modules/lablgl/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lablgl/default.nix index da4318aef4c1..85c27f93a091 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/lablgl/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/lablgl/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { sha256 = "sha256:141kc816iv59z96738i3vn9m9iw9g2zhi45hk4cchpwd99ar5l6k"; }; - buildInputs = [ ocaml findlib freeglut ]; + nativeBuildInputs = [ ocaml findlib ]; + buildInputs = [ freeglut ]; propagatedBuildInputs = [ libGLU libGL ]; patches = [ ./Makefile.config.patch ./META.patch ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix b/nixpkgs/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix index f2fbc71b5a93..bcf82e1c3842 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "09fqxwdib7r9yxynknc9gv3jw2hnhj5cak7q5jngk6m8rzvmhfcc"; }; - buildInputs = [ ocaml findlib camlp4 ]; + nativeBuildInputs = [ ocaml findlib camlp4 ]; propagatedBuildInputs = [ config-file lablgtk xmlm ]; createFindlibDestdir = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/lablgtk-extras/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lablgtk-extras/default.nix index d97f2f5bffd2..736e345dfb35 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/lablgtk-extras/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/lablgtk-extras/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "1bbdp5j18s582mmyd7qiaq1p08g2ag4gl7x65pmzahbhg719hjda"; }; - buildInputs = [ ocaml findlib camlp4 ]; + nativeBuildInputs = [ ocaml findlib camlp4 ]; propagatedBuildInputs = [ config-file lablgtk xmlm ]; createFindlibDestdir = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix b/nixpkgs/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix index f64b6571970b..f37c3b5c6f9a 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation (rec { sha256 = "1fnh0amm7lwgyjdhmlqgsp62gwlar1140425yc1j6inwmgnsp0a9"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ocaml findlib gtk2 libgnomecanvas gtksourceview camlp4 ]; + nativeBuildInputs = [ pkg-config ocaml findlib camlp4 ]; + buildInputs = [ gtk2 libgnomecanvas gtksourceview ]; configureFlags = [ "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib" ]; buildFlags = [ "world" ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/lablgtk/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lablgtk/default.nix index a442ae35aa52..36ade6979c3e 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation { pname = "lablgtk"; inherit (param) version src; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ocaml findlib gtk2 libgnomecanvas gtksourceview ]; + nativeBuildInputs = [ pkg-config ocaml findlib ]; + buildInputs = [ gtk2 libgnomecanvas gtksourceview ]; configureFlags = [ "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib" ]; buildFlags = [ "world" ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix b/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix index 971668ce0e11..56e79ffc5904 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix @@ -51,7 +51,8 @@ stdenv.mkDerivation rec { inherit (param) version src; pname = "ocaml${ocaml.version}-labltk"; - buildInputs = [ ocaml findlib tcl tk makeWrapper ]; + nativeBuildInputs = [ ocaml findlib makeWrapper ]; + buildInputs = [ tcl tk ]; configureFlags = [ "--use-findlib" "--installbindir" "$(out)/bin" ]; dontAddPrefix = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/lambda-term/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lambda-term/default.nix index 0d5babad0428..b7ed4f24b1d9 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/lambda-term/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/lambda-term/default.nix @@ -1,8 +1,18 @@ -{ lib, fetchFromGitHub, buildDunePackage, zed, lwt_log, lwt_react, mew_vi }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml, zed, lwt_log, lwt_react, mew_vi }: + +let params = + if lib.versionAtLeast ocaml.version "4.08" then { + version = "3.2.0"; + sha256 = "sha256:048k26644wq5wlwk0j179dxrxyz9nxqqq4vvhyh6pqpgxdajd44i"; + } else { + version = "3.1.0"; + sha256 = "1k0ykiz0vhpyyj9fkss29ajas4fh1xh449j702xkvayqipzj1mkg"; + } +; in buildDunePackage rec { pname = "lambda-term"; - version = "3.1.0"; + inherit (params) version; useDune2 = true; @@ -10,7 +20,7 @@ buildDunePackage rec { owner = "ocaml-community"; repo = pname; rev = version; - sha256 = "1k0ykiz0vhpyyj9fkss29ajas4fh1xh449j702xkvayqipzj1mkg"; + inherit (params) sha256; }; propagatedBuildInputs = [ zed lwt_log lwt_react mew_vi ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/llvm/default.nix b/nixpkgs/pkgs/development/ocaml-modules/llvm/default.nix index 264d95f39f67..9ab3d906ab1e 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/llvm/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/llvm/default.nix @@ -8,10 +8,12 @@ stdenv.mkDerivation { inherit (libllvm) src; - nativeBuildInputs = [ cmake ]; - buildInputs = [ python2 ocaml findlib ctypes ]; + nativeBuildInputs = [ cmake python2 ocaml findlib ]; + buildInputs = [ ctypes ]; propagatedBuildInputs = [ libllvm ]; + strictDeps = true; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=YES" # fixes bytecode builds "-DLLVM_OCAML_OUT_OF_TREE=TRUE" diff --git a/nixpkgs/pkgs/development/ocaml-modules/logs/default.nix b/nixpkgs/pkgs/development/ocaml-modules/logs/default.nix index 157e7c52fee1..4359f09ebd32 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/logs/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/logs/default.nix @@ -21,11 +21,13 @@ stdenv.mkDerivation rec { sha256 = "1jnmd675wmsmdwyb5mx5b0ac66g4c6gpv5s4mrx2j6pb0wla1x46"; }; - nativeBuildInputs = [ ocaml findlib ocamlbuild ]; - buildInputs = [ findlib topkg fmt cmdliner lwt ] + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ fmt cmdliner lwt topkg ] ++ lib.optional jsooSupport js_of_ocaml; propagatedBuildInputs = [ result ]; + strictDeps = true; + buildPhase = "${topkg.run} build --with-js_of_ocaml ${lib.boolToString jsooSupport}"; inherit (topkg) installPhase; diff --git a/nixpkgs/pkgs/development/ocaml-modules/lua-ml/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lua-ml/default.nix index 8a4f58ccbbd7..586fc395064f 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/lua-ml/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/lua-ml/default.nix @@ -16,8 +16,9 @@ stdenv.mkDerivation rec { sha256 = "04lv98nxmzanvyn4c0k6k0ax29f5xfdl8qzpf5hwadslq213a044"; }; - nativeBuildInputs = [ opaline ]; - buildInputs = [ ocaml findlib ocamlbuild ]; + nativeBuildInputs = [ opaline ocaml findlib ocamlbuild ]; + + strictDeps = true; buildFlags = [ "lib" ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/lwt-exit/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lwt-exit/default.nix index 34aadc8761fb..a2a6f14524f9 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/lwt-exit/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/lwt-exit/default.nix @@ -24,7 +24,8 @@ buildDunePackage rec { ptime ]; - doCheck = true; + # for some reason this never exits + doCheck = false; meta = { description = "An opinionated clean-exit and signal-handling library for Lwt programs"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/lwt/camlp4.nix b/nixpkgs/pkgs/development/ocaml-modules/lwt/camlp4.nix index 88bb3d6759a0..e48d7cfa185a 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/lwt/camlp4.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/lwt/camlp4.nix @@ -11,7 +11,9 @@ buildDunePackage rec { sha256 = "1lv8z6ljfy47yvxmwf5jrvc5d3dc90r1n291x53j161sf22ddrk9"; }; - minimumOCamlVersion = "4.02"; + useDune2 = false; + + minimalOCamlVersion = "4.02"; propagatedBuildInputs = [ camlp4 ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/lwt/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lwt/default.nix index 76e973a813e4..96e3abc26746 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/lwt/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/lwt/default.nix @@ -19,9 +19,12 @@ buildDunePackage rec { sha256 = "sha256-XpoRKcdNo2j05Gxm5wmKSdwqimFDSWvmLyooPYTHAjM="; }; - nativeBuildInputs = [ pkg-config cppo dune-configurator ]; - buildInputs = optional (!versionAtLeast ocaml.version "4.08") ocaml-syntax-shims - ++ optional (!versionAtLeast ocaml.version "4.07") ncurses; + strictDeps = true; + + nativeBuildInputs = [ pkg-config cppo ] + ++ optional (!versionAtLeast ocaml.version "4.08") ocaml-syntax-shims; + buildInputs = [ dune-configurator ] + ++ optional (!versionAtLeast ocaml.version "4.07") ncurses; propagatedBuildInputs = [ libev mmap ocplib-endian seq result ]; meta = { diff --git a/nixpkgs/pkgs/development/ocaml-modules/macaque/default.nix b/nixpkgs/pkgs/development/ocaml-modules/macaque/default.nix index a91e898227d6..d47c0c4f11c5 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/macaque/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/macaque/default.nix @@ -11,8 +11,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-W9ZFaINYYtIikKy/ZqdlKeFQSA7DQT9plc3+ZhlSIJI="; }; - buildInputs = [ ocaml findlib ocamlbuild camlp4 ]; - propagatedBuildInputs = [ pgocaml ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild camlp4 ]; + propagatedBuildInputs = [ pgocaml camlp4 ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/magick/default.nix b/nixpkgs/pkgs/development/ocaml-modules/magick/default.nix index f9fec120a625..87c43fb68693 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/magick/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/magick/default.nix @@ -13,8 +13,10 @@ stdenv.mkDerivation rec { sha256 = "0gn9l2qdr8gby2x8c2mb59x1kipb2plr45rbq6ymcxyi0wmzfh3q"; }; - nativeBuildInputs = [ which pkg-config ]; - buildInputs = [ ocaml findlib imagemagick ]; + nativeBuildInputs = [ which pkg-config ocaml findlib ]; + buildInputs = [ imagemagick ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/mdx/default.nix b/nixpkgs/pkgs/development/ocaml-modules/mdx/default.nix index cd9cb2370d39..09f505c0e254 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/mdx/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/mdx/default.nix @@ -8,6 +8,8 @@ buildDunePackage rec { version = "2.1.0"; useDune2 = true; + minimalOCamlVersion = "4.08"; + src = fetchurl { url = "https://github.com/realworldocaml/mdx/releases/download/${version}/mdx-${version}.tbz"; sha256 = "sha256-ol1zy8LODDYdcnv/jByE0pnqJ5ujQuMALq3v9y7td/o="; diff --git a/nixpkgs/pkgs/development/ocaml-modules/merlin-extend/default.nix b/nixpkgs/pkgs/development/ocaml-modules/merlin-extend/default.nix index 6d4fcad09775..9cb35f34c1c2 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/merlin-extend/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/merlin-extend/default.nix @@ -11,7 +11,9 @@ buildDunePackage rec { sha256 = "0hvc4mz92x3rl2dxwrhvhzwl4gilnyvvwcqgr45vmdpyjyp3dwn2"; }; - buildInputs = [ cppo ]; + strictDeps = true; + + nativeBuildInputs = [ cppo ]; meta = with lib; { homepage = "https://github.com/let-def/merlin-extend"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix index 102d3d2de07e..c942972597ad 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix @@ -19,13 +19,16 @@ buildDunePackage rec { doCheck = true; checkInputs = [ ounit ]; - nativeBuildInputs = [ dune-configurator pkg-config ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ cstruct eqaf ] ++ lib.optionals withFreestanding [ ocaml-freestanding ]; + strictDeps = !doCheck; + meta = with lib; { homepage = "https://github.com/mirage/mirage-crypto"; description = "Simple symmetric cryptography for the modern age"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/ec.nix b/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/ec.nix index bcd7a1f04f25..5506243ec3a4 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/ec.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/ec.nix @@ -1,4 +1,5 @@ { lib +, ocaml , buildDunePackage , mirage-crypto , dune-configurator @@ -16,18 +17,18 @@ , ocaml-freestanding }: -buildDunePackage { +buildDunePackage rec { pname = "mirage-crypto-ec"; inherit (mirage-crypto) minimumOCamlVersion src version - useDune2 - ; + useDune2; - nativeBuildInputs = [ - pkg-config + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + ocaml dune-configurator ]; propagatedBuildInputs = [ @@ -38,6 +39,8 @@ buildDunePackage { ocaml-freestanding ]; + strictDeps = !doCheck; + doCheck = true; checkInputs = [ hex diff --git a/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/pk.nix b/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/pk.nix index 82400b5da7c2..9a2b9c98e458 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/pk.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/pk.nix @@ -1,7 +1,7 @@ { buildDunePackage, ounit, randomconv, mirage-crypto, mirage-crypto-rng , cstruct, sexplib0, zarith, eqaf, gmp }: -buildDunePackage { +buildDunePackage rec { pname = "mirage-crypto-pk"; inherit (mirage-crypto) version src useDune2 minimumOCamlVersion; @@ -10,6 +10,8 @@ buildDunePackage { propagatedBuildInputs = [ cstruct mirage-crypto mirage-crypto-rng zarith eqaf sexplib0 ]; + strictDeps = !doCheck; + doCheck = true; checkInputs = [ ounit randomconv ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix b/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix index e8c8dd06eab5..91da7aa56816 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix @@ -8,7 +8,7 @@ buildDunePackage { inherit (mirage-crypto) useDune2 version minimumOCamlVersion src; - nativeBuildInputs = [ + buildInputs = [ dune-configurator ]; @@ -19,6 +19,8 @@ buildDunePackage { mirage-crypto-rng ]; + strictDeps = true; + meta = mirage-crypto.meta // { description = "Feed the entropy source in an Async-friendly way"; }; diff --git a/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix b/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix index 5152d3c8ecde..8d67ade9b465 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix @@ -3,7 +3,7 @@ , logs, lwt }: -buildDunePackage { +buildDunePackage rec { pname = "mirage-crypto-rng-mirage"; inherit (mirage-crypto-rng) version src useDune2 minimumOCamlVersion; @@ -14,6 +14,8 @@ buildDunePackage { propagatedBuildInputs = [ duration cstruct mirage-crypto-rng mirage-runtime mirage-time mirage-clock logs lwt ]; + strictDeps = !doCheck; + meta = mirage-crypto-rng.meta // { description = "Entropy collection for a cryptographically secure PRNG"; }; diff --git a/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng.nix b/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng.nix index b4da06816351..2281f10580cd 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng.nix @@ -1,7 +1,7 @@ { buildDunePackage, mirage-crypto, ounit, randomconv, dune-configurator , cstruct, duration, logs, mtime, ocaml_lwt }: -buildDunePackage { +buildDunePackage rec { pname = "mirage-crypto-rng"; inherit (mirage-crypto) version src useDune2 minimumOCamlVersion; @@ -9,9 +9,11 @@ buildDunePackage { doCheck = true; checkInputs = [ ounit randomconv ]; - nativeBuildInputs = [ dune-configurator ]; + buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ cstruct mirage-crypto duration logs mtime ocaml_lwt ]; + strictDeps = !doCheck; + meta = mirage-crypto.meta // { description = "A cryptographically secure PRNG"; }; diff --git a/nixpkgs/pkgs/development/ocaml-modules/mlgmp/default.nix b/nixpkgs/pkgs/development/ocaml-modules/mlgmp/default.nix index ffd78150689a..a396549d76f4 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/mlgmp/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/mlgmp/default.nix @@ -21,7 +21,10 @@ stdenv.mkDerivation rec { ]; preConfigure = "make clean"; - buildInputs = [ocaml findlib gmp mpfr ncurses]; + nativeBuildInputs = [ocaml findlib ]; + buildInputs = [ gmp mpfr ncurses]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/mlgmpidl/default.nix b/nixpkgs/pkgs/development/ocaml-modules/mlgmpidl/default.nix index 4e27c8ff3bb7..d12329b811e6 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/mlgmpidl/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/mlgmpidl/default.nix @@ -10,7 +10,10 @@ stdenv.mkDerivation rec { sha256 = "17xqiclaqs4hmnb92p9z6z9a1xfr31vcn8nlnj8ykk57by31vfza"; }; - buildInputs = [ perl gmp mpfr ocaml findlib camlidl ]; + nativeBuildInputs = [ perl ocaml findlib mpfr camlidl ]; + buildInputs = [ gmp mpfr ]; + + strictDeps = true; prefixKey = "-prefix "; configureFlags = [ @@ -20,7 +23,7 @@ stdenv.mkDerivation rec { postConfigure = '' sed -i Makefile \ - -e 's|^ /bin/rm | rm |' + -e 's|/bin/rm|rm|' mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs ''; diff --git a/nixpkgs/pkgs/development/ocaml-modules/mtime/default.nix b/nixpkgs/pkgs/development/ocaml-modules/mtime/default.nix index 3e4438f6da58..ace29633964b 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/mtime/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/mtime/default.nix @@ -24,9 +24,10 @@ stdenv.mkDerivation { inherit (param) sha256; }; - nativeBuildInputs = [ ocaml findlib ocamlbuild ]; - buildInputs = [ findlib topkg ] - ++ optional jsooSupport js_of_ocaml; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ] ++ optional jsooSupport js_of_ocaml; + + strictDeps = true; buildPhase = "${topkg.buildPhase} --with-js_of_ocaml ${boolToString jsooSupport}"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/mysql/default.nix b/nixpkgs/pkgs/development/ocaml-modules/mysql/default.nix index 6ccdfa9cf81c..c980984a26c8 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/mysql/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/mysql/default.nix @@ -22,12 +22,14 @@ stdenv.mkDerivation rec { "--libdir=$out/lib/ocaml/${ocaml.version}/site-lib/mysql" ]; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; createFindlibDestdir = true; propagatedBuildInputs = [ libmysqlclient ]; + strictDeps = true; + patches = [ (fetchpatch { url = "https://github.com/ygrek/ocaml-mysql/compare/v1.2.1...d6d1b3b262ae2cf493ef56f1dd7afcf663a70a26.patch"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/nocrypto/default.nix b/nixpkgs/pkgs/development/ocaml-modules/nocrypto/default.nix index fdd24094c17b..d179c8c1c901 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/nocrypto/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/nocrypto/default.nix @@ -56,9 +56,11 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ ocaml findlib ocamlbuild cc-wrapper ]; - buildInputs = [ ocamlbuild findlib topkg cpuid ocb-stubblr ]; + buildInputs = [ topkg cpuid ocb-stubblr ocamlbuild ]; propagatedBuildInputs = [ cstruct ppx_deriving ppx_sexp_conv sexplib zarith ] ++ optional withLwt cstruct-lwt; + strictDeps = true; + buildPhase = "${topkg.buildPhase} --accelerate false --with-lwt ${boolToString withLwt}"; inherit (topkg) installPhase; diff --git a/nixpkgs/pkgs/development/ocaml-modules/nonstd/default.nix b/nixpkgs/pkgs/development/ocaml-modules/nonstd/default.nix index 9de535154eeb..82b1feed540b 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/nonstd/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/nonstd/default.nix @@ -4,7 +4,9 @@ buildDunePackage rec { pname = "nonstd"; version = "0.0.3"; - minimumOCamlVersion = "4.02"; + useDune2 = false; + + minimalOCamlVersion = "4.02"; src = fetchzip { url = "https://bitbucket.org/smondet/${pname}/get/${pname}.${version}.tar.gz"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/notty/default.nix b/nixpkgs/pkgs/development/ocaml-modules/notty/default.nix index 94342bb31282..1598b2ee5cd3 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/notty/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/notty/default.nix @@ -19,10 +19,13 @@ stdenv.mkDerivation rec { sha256 = "1y3hx8zjri3x50nyiqal5gak1sw54gw3xssrqbj7srinvkdmrz1q"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg ocb-stubblr ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + buildInputs = [ ocb-stubblr topkg ocamlbuild ]; propagatedBuildInputs = [ result uucp uuseg uutf ] ++ optional withLwt lwt; + strictDeps = true; + buildPhase = topkg.buildPhase + " --with-lwt ${boolToString withLwt}"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/num/default.nix b/nixpkgs/pkgs/development/ocaml-modules/num/default.nix index b1293a2ab553..1f978a90df45 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/num/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/num/default.nix @@ -17,10 +17,10 @@ stdenv.mkDerivation rec { ] ++ lib.optional withStatic ./enable-static.patch; nativeBuildInputs = [ ocaml findlib ]; - buildInputs = [ ocaml findlib ]; - createFindlibDestdir = true; + strictDeps = true; + createFindlibDestdir = true; meta = { description = "Legacy Num library for arbitrary-precision integer and rational arithmetic"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocaml-cairo/default.nix index 7d2960fc5a66..6748619d4928 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ocaml-cairo/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ocaml-cairo/default.nix @@ -19,9 +19,8 @@ stdenv.mkDerivation rec { patches = [ ./META.patch ]; - nativeBuildInputs = [ pkg-config unzip ]; - buildInputs = [ ocaml automake gnum4 autoconf - findlib freetype lablgtk cairo gdk-pixbuf gtk2 pango ]; + nativeBuildInputs = [ pkg-config unzip ocaml automake gnum4 autoconf findlib ]; + buildInputs = [ freetype lablgtk cairo gdk-pixbuf gtk2 pango ]; createFindlibDestdir = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix index 581890178eae..b4410981afbd 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libvirt ]; - nativeBuildInputs = [ autoreconfHook pkg-config findlib perl ]; + nativeBuildInputs = [ autoreconfHook pkg-config findlib perl ocaml ]; - buildInputs = [ ocaml ]; + strictDeps = true; buildFlags = [ "all" "opt" "CPPFLAGS=-Wno-error" ]; installTargets = "install-opt"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix b/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix index 26deb2f05970..4f192fe20ecb 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix @@ -12,8 +12,8 @@ let params = if lib.versionAtLeast ocaml.version "4.13" then { - version = "1.9.1"; - sha256 = "sha256:1vnwdpjppihprc8q2i5zcqq7vp67255jclg90ldfvwafgljxn76g"; + version = "1.10.3"; + sha256 = "sha256-o6wQc7Byi5T0vbARF3LAq69/9wMkOZRQ6rcVa/rBUfE="; } else if lib.versionAtLeast ocaml.version "4.12" then { version = "1.9.0"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix b/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix index 5d8d967bf4fd..009d95992fb7 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix @@ -1,5 +1,9 @@ { lib, fetchFromGitHub, buildDunePackage, ocaml, result, ppx_derivers }: +if lib.versionOlder "4.13" ocaml.version +then throw "ocaml-migrate-parsetree-1.8 is not available for OCaml ${ocaml.version}" +else + buildDunePackage rec { pname = "ocaml-migrate-parsetree"; version = "1.8.0"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocaml-r/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocaml-r/default.nix index d76a98fc05c9..fcee63de3b5d 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ocaml-r/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ocaml-r/default.nix @@ -27,7 +27,11 @@ buildDunePackage rec { ' libRmath"' '"' ''; - buildInputs = [ pkg-config R dune-configurator stdio ]; + # This currently fails with dune + strictDeps = false; + + nativeBuildInputs = [ pkg-config R ]; + buildInputs = [ dune-configurator stdio R ]; doCheck = true; checkInputs = [ alcotest ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocamlfuse/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocamlfuse/default.nix index c2ca6a2cc8aa..13ac62f64514 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ocamlfuse/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ocamlfuse/default.nix @@ -1,16 +1,21 @@ -{ lib, buildDunePackage, fetchFromGitHub, camlidl, fuse }: +{ lib, buildDunePackage, fetchFromGitHub, camlidl, fuse, dune-configurator }: -buildDunePackage { +buildDunePackage rec { pname = "ocamlfuse"; - version = "2.7.1_cvs6_e35e76b"; + version = "2.7.1_cvs7"; src = fetchFromGitHub { owner = "astrada"; repo = "ocamlfuse"; - rev = "e35e76bee3b06806256b5bfca108b7697267cd5c"; - sha256 = "1v9g0wh7rnjkrjrnw50145g6ry38plyjs8fq8w0nlzwizhf3qhff"; + rev = "v${version}"; + sha256 = "6nmPXZx38hBGlg+gV9nnlRpPfeSAqDj4zBPcjUNvTRo="; }; + # This currently fails with dune + strictDeps = false; + + nativeBuildInputs = [ camlidl ]; + buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ camlidl fuse ]; meta = { diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocamlnat/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocamlnat/default.nix index f8d20b7124bc..66bd00707add 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ocamlnat/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ocamlnat/default.nix @@ -12,7 +12,10 @@ stdenv.mkDerivation rec { sha256 = "0dyvy0j6f47laxhnadvm71z1py9hz9zd49hamf6bij99cggb2ij1"; }; - buildInputs = [ocaml findlib ounit]; + nativeBuildInputs = [ocaml findlib ]; + buildInputs = [ ounit]; + + strictDeps = true; prefixKey = "--prefix "; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocamlnet/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocamlnet/default.nix index d6e8f83968aa..d435d7a04842 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ocamlnet/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ocamlnet/default.nix @@ -15,8 +15,10 @@ stdenv.mkDerivation rec { sha256 = "1vlwxjxr946gdl61a1d7yk859cijq45f60dhn54ik3w4g6cx33pr"; }; - nativeBuildInputs = [ pkg-config which ]; - buildInputs = [ ncurses ocaml findlib ocaml_pcre camlzip gnutls nettle ]; + nativeBuildInputs = [ pkg-config which ocaml findlib ]; + buildInputs = [ ncurses ocaml_pcre camlzip gnutls nettle ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocamlsdl/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocamlsdl/default.nix index 7c782b5268fd..3482aa37e750 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ocamlsdl/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ocamlsdl/default.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { sha256 = "abfb295b263dc11e97fffdd88ea1a28b46df8cc2b196777093e4fe7f509e4f8f"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ocaml findlib SDL SDL_image SDL_mixer SDL_ttf SDL_gfx lablgl]; + nativeBuildInputs = [ pkg-config ocaml findlib ]; + buildInputs = [ SDL SDL_image SDL_mixer SDL_ttf SDL_gfx lablgl ]; propagatedBuildInputs = [ SDL SDL_image SDL_mixer SDL_ttf SDL_gfx pkg-config ]; createFindlibDestdir = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocb-stubblr/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocb-stubblr/default.nix index 2f26eb32ffb6..fcd63ced7a80 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ocb-stubblr/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ocb-stubblr/default.nix @@ -12,10 +12,13 @@ stdenv.mkDerivation rec { patches = [ ./pkg-config.patch ]; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ocamlbuild ]; propagatedBuildInputs = [ astring ]; + strictDeps = true; + inherit (topkg) buildPhase installPhase; meta = { diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix index 7635f3a686cd..763617be1328 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix @@ -14,7 +14,11 @@ stdenv.mkDerivation rec { sha256 = "0smfwrj8qhzknhzawygxi0vgl2af4vyi652fkma59rzjpvscqrnn"; }; - buildInputs = [ ocaml findlib astring pprint ]; + nativeBuildInputs = [ ocaml findlib ]; + buildInputs = [ astring pprint ]; + + strictDeps = true; + createFindlibDestdir = true; installFlags = [ "BINDIR=$(out)/bin" ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocplib-simplex/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocplib-simplex/default.nix index 8435d1c5e516..474f69546d1a 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ocplib-simplex/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ocplib-simplex/default.nix @@ -15,8 +15,9 @@ stdenv.mkDerivation { sha256 = "09niyidrjzrj8g1qwx4wgsdf5m6cwrnzg7zsgala36jliic4di60"; }; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ autoreconfHook ocaml findlib ]; + + strictDeps = true; installFlags = [ "LIBDIR=$(OCAMLFIND_DESTDIR)" ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix index d2e20838ecaf..480ea6daf203 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix @@ -26,7 +26,10 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; - buildInputs = [ ocaml findlib ocamlbuild oasis camlp4 num ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild oasis camlp4 ]; + buildInputs = [ oasis camlp4 ocamlbuild num ]; + + strictDeps = true; meta = { homepage = "https://github.com/ocsigen/deriving"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocsigen-start/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-start/default.nix index 1fccbbb9b30c..118138dc8fd0 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ocsigen-start/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-start/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, ocaml, findlib, ocsigen-toolkit, pgocaml_ppx, safepass, yojson -, cohttp-lwt-unix +, cohttp-lwt-unix, eliom , resource-pooling , ocamlnet }: @@ -8,9 +8,11 @@ stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-ocsigen-start"; version = "4.3.0"; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib eliom ]; propagatedBuildInputs = [ pgocaml_ppx safepass ocsigen-toolkit yojson resource-pooling cohttp-lwt-unix ocamlnet ]; + strictDeps = true; + patches = [ ./templates-dir.patch ]; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix index 78420d09779b..1b2dd72a2ec3 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix @@ -8,7 +8,9 @@ stdenv.mkDerivation rec { version = "3.0.1"; propagatedBuildInputs = [ calendar js_of_ocaml-ppx_deriving_json eliom ]; - buildInputs = [ ocaml findlib opaline ]; + nativeBuildInputs = [ ocaml findlib opaline eliom ]; + + strictDeps = true; installPhase = '' runHook preInstall diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocurl/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocurl/default.nix index ea2af8dd4c82..5e815d4dca6b 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ocurl/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ocurl/default.nix @@ -13,8 +13,12 @@ stdenv.mkDerivation rec { sha256 = "0n621cxb9012pj280c7821qqsdhypj8qy9qgrah79dkh6a8h2py6"; }; - buildInputs = [ pkg-config ocaml findlib ncurses ]; + nativeBuildInputs = [ pkg-config ocaml findlib ]; + buildInputs = [ ncurses ]; propagatedBuildInputs = [ curl lwt ]; + + strictDeps = true; + createFindlibDestdir = true; meta = { description = "OCaml bindings to libcurl"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/odate/default.nix b/nixpkgs/pkgs/development/ocaml-modules/odate/default.nix index aed5e92765f8..8967a3815471 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/odate/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/odate/default.nix @@ -17,7 +17,9 @@ buildDunePackage rec { sha256 = "1dk33lr0g2jnia2gqsm6nnc7nf256qgkm3v30w477gm6y2ppfm3h"; }; - buildInputs = [ menhir ]; + strictDeps = true; + + nativeBuildInputs = [ menhir ]; meta = { description = "Date and duration in OCaml"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/odn/default.nix b/nixpkgs/pkgs/development/ocaml-modules/odn/default.nix index 9179ce3f1d16..66fc5d1f1872 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/odn/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/odn/default.nix @@ -13,7 +13,10 @@ stdenv.mkDerivation rec { sha256 = "09a8zdyifpc2nl4hdvg9206142y31cq95ajgij011s1qcg3z93lj"; }; - buildInputs = [ ocaml findlib ocamlbuild type_conv ounit camlp4 ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + buildInputs = [ type_conv ounit camlp4 ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ogg/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ogg/default.nix new file mode 100644 index 000000000000..e1e1df6c2a00 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/ogg/default.nix @@ -0,0 +1,25 @@ +{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, libogg }: + +buildDunePackage rec { + pname = "ogg"; + version = "0.7.1"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-ogg"; + rev = "v${version}"; + sha256 = "0z3z0816rxq8wdjw51plzn8lmilic621ilk4x9wpnr0axmnl3wqb"; + }; + + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ libogg ]; + + meta = with lib; { + homepage = "https://github.com/savonet/ocaml-ogg"; + description = "Bindings to libogg"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/omd/default.nix b/nixpkgs/pkgs/development/ocaml-modules/omd/default.nix index d6cea183d85c..b9797e257abc 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/omd/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/omd/default.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1sgdgzpx96br7npj8mh91cli5mqmzsjpngwm7x4212n3k1d0ivwa"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/opam-repository/default.nix b/nixpkgs/pkgs/development/ocaml-modules/opam-repository/default.nix index 1480a7d5915a..ff9ad75fad86 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/opam-repository/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/opam-repository/default.nix @@ -15,8 +15,9 @@ buildDunePackage rec { --replace "SUBSTITUTE_NIXOS_CURL_PATH" "\"${curl}/bin/curl\"" ''; - nativeBuildInputs = [ unzip ]; - buildInputs = [ curl ]; + strictDeps = true; + + nativeBuildInputs = [ unzip curl ]; propagatedBuildInputs = [ opam-format ]; meta = opam-format.meta // { diff --git a/nixpkgs/pkgs/development/ocaml-modules/opus/default.nix b/nixpkgs/pkgs/development/ocaml-modules/opus/default.nix new file mode 100644 index 000000000000..30e461b9f9a0 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/opus/default.nix @@ -0,0 +1,26 @@ +{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, pkg-config, ogg, libopus }: + +buildDunePackage rec { + pname = "opus"; + version = "0.2.1"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-opus"; + rev = "v${version}"; + sha256 = "09mgnprhhs1adqm25c0qjhknswbh6va3jknq06fnp1jszszcjf4s"; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ ogg libopus.dev ]; + + meta = with lib; { + homepage = "https://github.com/savonet/ocaml-opus"; + description = "Bindings to libopus"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/otfm/default.nix b/nixpkgs/pkgs/development/ocaml-modules/otfm/default.nix index 0642b30699c2..91d91bdc46fe 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/otfm/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/otfm/default.nix @@ -17,10 +17,13 @@ stdenv.mkDerivation { sha256 = "054s82539k3kc9na6s47g3scsl04icjahpas7pv5351jmsgqcq3k"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ]; propagatedBuildInputs = [ uutf result ]; + strictDeps = true; + inherit (topkg) buildPhase installPhase; meta = with lib; { diff --git a/nixpkgs/pkgs/development/ocaml-modules/otoml/default.nix b/nixpkgs/pkgs/development/ocaml-modules/otoml/default.nix index 17e8fc855ea0..c3f53fc611e5 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/otoml/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/otoml/default.nix @@ -19,7 +19,9 @@ buildDunePackage rec { sha256 = "0l0c60rzgk11y8xq05kr8q9hkzb3c8vi995mq84x98ys73wb42j3"; }; - buildInputs = [ menhir ]; + strictDeps = true; + + nativeBuildInputs = [ menhir ]; propagatedBuildInputs = [ menhirLib uutf ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ounit/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ounit/default.nix index fbb75e613309..a40111cd3b37 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ounit/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ounit/default.nix @@ -4,9 +4,11 @@ stdenv.mkDerivation { pname = "ocaml${ocaml.version}-ounit"; inherit (ounit2) version src meta; - buildInputs = [ findlib ]; + nativeBuildInputs = [ findlib ]; propagatedBuildInputs = [ ounit2 ]; + strictDeps = true; + dontBuild = true; createFindlibDestdir = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/owee/default.nix b/nixpkgs/pkgs/development/ocaml-modules/owee/default.nix index 9eb81003d47a..7b15437a7ed2 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/owee/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/owee/default.nix @@ -1,20 +1,19 @@ -{ lib, buildDunePackage, fetchFromGitHub }: +{ lib, buildDunePackage, fetchurl }: buildDunePackage rec { - minimumOCamlVersion = "4.06"; + minimalOCamlVersion = "4.06"; + useDune2 = true; pname = "owee"; - version = "0.3"; + version = "0.4"; - src = fetchFromGitHub { - owner = "let-def"; - repo = "owee"; - rev = "v${version}"; - sha256 = "0jp8ca57488d7sj2nqy4yxcdpda6sxx51yyi8k6888hbinhyqp0j"; + src = fetchurl { + url = "https://github.com/let-def/owee/releases/download/v${version}/owee-${version}.tbz"; + sha256 = "sha256:055bi0yfdki1pqagbhrwmfvigyawjgsmqw04zhpp6hds8513qzvb"; }; meta = { description = "An experimental OCaml library to work with DWARF format"; - inherit (src.meta) homepage; + homepage = "https://github.com/let-def/owee/"; license = lib.licenses.mit; maintainers = [ lib.maintainers.vbgl ]; }; diff --git a/nixpkgs/pkgs/development/ocaml-modules/pipebang/default.nix b/nixpkgs/pkgs/development/ocaml-modules/pipebang/default.nix index 489ca3d2c708..251aeb8de8ec 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/pipebang/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/pipebang/default.nix @@ -1,4 +1,4 @@ -{ lib, buildOcaml, fetchFromGitHub }: +{ lib, buildOcaml, fetchFromGitHub, camlp4 }: buildOcaml rec { pname = "pipebang"; @@ -13,6 +13,10 @@ buildOcaml rec { sha256 = "sha256-9A3X/ciL5HtuKQ5awS+hDDBLL5ytOr12wHsmJLNRn+Q="; }; + strictDeps = true; + + buildInputs = [ camlp4 ]; + meta = with lib; { homepage = "https://github.com/janestreet/pipebang"; description = "Syntax extension to transform x |! f into f x"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/piqi-ocaml/default.nix b/nixpkgs/pkgs/development/ocaml-modules/piqi-ocaml/default.nix index 590c001c4195..4f2e4693357f 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/piqi-ocaml/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/piqi-ocaml/default.nix @@ -12,7 +12,10 @@ stdenv.mkDerivation rec { sha256 = "1913jpsb8mvqi8609j4g4sm5jhg50dq0xqxgy8nmvknfryyc89nm"; }; - buildInputs = [ ocaml findlib piqi stdlib-shims ]; + nativeBuildInputs = [ ocaml findlib ]; + buildInputs = [ piqi stdlib-shims ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/piqi/default.nix b/nixpkgs/pkgs/development/ocaml-modules/piqi/default.nix index faeb804d8aa8..45d65a5be04f 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/piqi/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/piqi/default.nix @@ -12,9 +12,11 @@ stdenv.mkDerivation rec { sha256 = "0v04hs85xv6d4ysqxyv1dik34dx49yab9shpi4x7iv19qlzl7csb"; }; - buildInputs = [ ocaml findlib which ]; + nativeBuildInputs = [ ocaml findlib which ]; propagatedBuildInputs = [ sedlex_2 xmlm easy-format base64 ]; + strictDeps = true; + patches = [ ./no-ocamlpath-override.patch ]; createFindlibDestdir = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ppx_cstubs/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ppx_cstubs/default.nix index 935d67f70845..f4794eea76ed 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ppx_cstubs/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ppx_cstubs/default.nix @@ -9,6 +9,7 @@ , num , ppxlib , re +, findlib }: buildDunePackage rec { @@ -26,17 +27,21 @@ buildDunePackage rec { sha256 = "15cjb9ygnvp2kv85rrb7ncz7yalifyl7wd2hp2cl8r1qrpgi1d0w"; }; + nativeBuildInputs = [ cppo ]; + buildInputs = [ bigarray-compat containers - cppo ctypes integers num ppxlib re + findlib ]; + strictDeps = true; + meta = with lib; { homepage = "https://github.com/fdopen/ppx_cstubs"; changelog = "https://github.com/fdopen/ppx_cstubs/raw/${version}/CHANGES.md"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving/default.nix index 5563e6113462..fbe484dea044 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving/default.nix @@ -6,6 +6,7 @@ , ppx_derivers , result , ounit +, ounit2 , ocaml-migrate-parsetree , ocaml-migrate-parsetree-2 }: @@ -37,7 +38,11 @@ buildDunePackage rec { inherit (params) sha256; }; - buildInputs = [ ppxlib cppo ]; + # This currently fails with dune + strictDeps = false; + + nativeBuildInputs = [ cppo ]; + buildInputs = [ ppxlib ]; propagatedBuildInputs = [ (if params.useOMP2 then ocaml-migrate-parsetree-2 @@ -47,7 +52,9 @@ buildDunePackage rec { ]; doCheck = true; - checkInputs = [ ounit ]; + checkInputs = [ + (if lib.versionAtLeast version "5.2" then ounit2 else ounit) + ]; meta = with lib; { description = "deriving is a library simplifying type-driven code generation on OCaml >=4.02."; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ppx_tools/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ppx_tools/default.nix index 64948c29ae50..59b7c29730aa 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ppx_tools/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ppx_tools/default.nix @@ -5,6 +5,7 @@ let param = version = "6.4"; sha256 = "15v7yfv6gyp8lzlgwi9garz10wpg34dk4072jdv19n6v20zfg7n1"; useDune2 = true; + nativeBuildInputs = [cppo]; buildInputs = [cppo]; }; in { @@ -54,7 +55,9 @@ if lib.versionAtLeast param.version "6.0" then buildDunePackage { inherit pname src meta; - inherit (param) version useDune2 buildInputs; + inherit (param) version useDune2 buildInputs nativeBuildInputs; + + strictDeps = true; } else stdenv.mkDerivation { @@ -63,7 +66,8 @@ else inherit src; nativeBuildInputs = [ ocaml findlib ]; - buildInputs = [ ocaml findlib ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/printbox/default.nix b/nixpkgs/pkgs/development/ocaml-modules/printbox/default.nix index b42df087a9a6..179e559d72fe 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/printbox/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/printbox/default.nix @@ -17,8 +17,8 @@ buildDunePackage rec { checkInputs = [ mdx.bin ]; - # mdx is not available for OCaml < 4.07 - doCheck = lib.versionAtLeast ocaml.version "4.07"; + # mdx is not available for OCaml < 4.08 + doCheck = lib.versionAtLeast ocaml.version "4.08"; meta = { homepage = "https://github.com/c-cube/printbox/"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/prof_spacetime/default.nix b/nixpkgs/pkgs/development/ocaml-modules/prof_spacetime/default.nix index 91e30e155db4..bfbd466bad67 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/prof_spacetime/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/prof_spacetime/default.nix @@ -7,7 +7,7 @@ , cohttp , ocaml_lwt , cohttp-lwt-unix -, lambdaTerm +, lambda-term , stdlib-shims }: @@ -30,7 +30,7 @@ buildDunePackage rec { cohttp ocaml_lwt cohttp-lwt-unix - lambdaTerm + lambda-term stdlib-shims ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/psmt2-frontend/default.nix b/nixpkgs/pkgs/development/ocaml-modules/psmt2-frontend/default.nix index dbdf3970f636..25c9ec4b870c 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/psmt2-frontend/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/psmt2-frontend/default.nix @@ -15,7 +15,9 @@ buildDunePackage rec { minimumOCamlVersion = "4.03"; - buildInputs = [ menhir ]; + strictDeps = true; + + nativeBuildInputs = [ menhir ]; meta = { description = "A simple parser and type-checker for polomorphic extension of the SMT-LIB 2 language"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ptime/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ptime/default.nix index 7015c6058b4f..ac30876520a6 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ptime/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ptime/default.nix @@ -11,9 +11,10 @@ stdenv.mkDerivation rec { sha256 = "1fxq57xy1ajzfdnvv5zfm7ap2nf49znw5f9gbi4kb9vds942ij27"; }; - nativeBuildInputs = [ ocaml findlib ocamlbuild ]; - buildInputs = [ findlib topkg ] - ++ lib.optional jsooSupport js_of_ocaml; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ] ++ lib.optional jsooSupport js_of_ocaml; + + strictDeps = true; propagatedBuildInputs = [ result ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ptmap/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ptmap/default.nix index 018f1e3edf06..fd59368f82df 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ptmap/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ptmap/default.nix @@ -14,12 +14,13 @@ buildDunePackage rec { sha256 = "1apk61fc1y1g7x3m3c91fnskvxp6i0vk5nxwvipj56k7x2pzilgb"; }; + strictDeps = true; + + buildInputs = [ stdlib-shims ]; propagatedBuildInputs = [ seq ]; doCheck = true; - checkInputs = [ stdlib-shims ]; - meta = { homepage = "https://www.lri.fr/~filliatr/software.en.html"; description = "Maps over integers implemented as Patricia trees"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/pycaml/default.nix b/nixpkgs/pkgs/development/ocaml-modules/pycaml/default.nix deleted file mode 100644 index c19b40eb9afe..000000000000 --- a/nixpkgs/pkgs/development/ocaml-modules/pycaml/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, stdenv, fetchurl, ocaml, findlib, ncurses, python2, ocaml_make }: - -# This is the original pycaml version with patches from debian. - -stdenv.mkDerivation rec { - pname = "pycaml"; - version = "0.82-14"; - - srcs = [ - (fetchurl { - url = "mirror://debian/pool/main/p/pycaml/pycaml_${lib.versions.majorMinor version}.orig.tar.gz"; - sha256 = "d57be559c8d586c575717d47817986bbdbcebe2ffd16ad6b291525c62868babe"; - }) - - (fetchurl { - url = "mirror://debian/pool/main/p/pycaml/pycaml_${version}.debian.tar.gz"; - sha256 = "a763088ec1fa76c769bf586ed6692e7ac035b0a2bfd48a90a8e7a9539ec0c2f1"; - }) - ]; - - postPatch = '' - rm -f Makefile* configure* - cp ../debian/META ../debian/Makefile . - sed -i "Makefile" -e's|/usr/share/ocamlmakefile/OCamlMakefile|${ocaml_make}/include/OCamlMakefile|g' - ''; - - sourceRoot = "pycaml"; - patches = [ "../debian/patches/*.patch" ]; - - buildInputs = [ ncurses ocaml findlib python2 ocaml_make ]; - createFindlibDestdir = true; - - # the Makefile is not shipped with an install target, hence we do it ourselves. - installPhase = '' - ocamlfind install pycaml \ - dllpycaml_stubs.so libpycaml_stubs.a pycaml.a pycaml.cma \ - pycaml.cmi pycaml.cmo pycaml.cmx pycaml.cmxa \ - META - ''; - - meta = { - homepage = "https://github.com/chemoelectric/pycaml"; - description = "Bindings for python and ocaml"; - license = "LGPL"; - platforms = ocaml.meta.platforms or [ ]; - }; -} diff --git a/nixpkgs/pkgs/development/ocaml-modules/pyml/default.nix b/nixpkgs/pkgs/development/ocaml-modules/pyml/default.nix index 7bc794fa2487..afcc47e38dc4 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/pyml/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/pyml/default.nix @@ -2,18 +2,20 @@ stdenv.mkDerivation rec { pname = "pyml"; - version = "20210226"; + version = "20211015"; src = fetchFromGitHub { owner = "thierry-martinez"; repo = pname; rev = version; - sha256 = "15xk6bgdzsf04d6wdjpr3s1ci2g7d7qnbq3102avkz179d5n62h7"; + sha256 = "sha256-GCO6KlRhJmADFjQ5QF4naMQBskF63yqnJnLnuQsagEk="; }; - buildInputs = [ + nativeBuildInputs = [ ocaml findlib + ]; + buildInputs = [ utop ncurses ]; @@ -23,6 +25,8 @@ stdenv.mkDerivation rec { stdcompat ]; + strictDeps = true; + buildPhase = '' make all pymltop pymlutop PREFIX=$out ''; diff --git a/nixpkgs/pkgs/development/ocaml-modules/react/default.nix b/nixpkgs/pkgs/development/ocaml-modules/react/default.nix index 0edae9830698..4e07a2021e32 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/react/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/react/default.nix @@ -9,7 +9,10 @@ stdenv.mkDerivation rec { sha256 = "1aj8w79gdd9xnrbz7s5p8glcb4pmimi8jp9f439dqnf6ih3mqb3v"; }; - buildInputs = [ ocaml findlib topkg ocamlbuild ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + buildInputs = [ topkg ]; + + strictDeps = true; inherit (topkg) buildPhase installPhase; diff --git a/nixpkgs/pkgs/development/ocaml-modules/reactivedata/default.nix b/nixpkgs/pkgs/development/ocaml-modules/reactivedata/default.nix index bc0c8f9e9b8c..23ebb3144d11 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/reactivedata/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/reactivedata/default.nix @@ -15,9 +15,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-YLkacIbjxZQ/ThgSxjTqviBYih6eW2GX5H7iybQDv1A="; }; - buildInputs = [ ocaml findlib ocamlbuild opaline ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild opaline ]; propagatedBuildInputs = [ react ]; + strictDeps = true; + buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true"; installPhase = "opaline -prefix $out -libdir $OCAMLFIND_DESTDIR"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/reason-native/cli.nix b/nixpkgs/pkgs/development/ocaml-modules/reason-native/cli.nix index 1a4c020dc352..ee5e7d2774d2 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/reason-native/cli.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/reason-native/cli.nix @@ -3,9 +3,12 @@ { pname = "cli"; + nativeBuildInputs = [ + reason + ]; + 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 index c11c12b46730..b4b30cab4a0c 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/reason-native/console.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/reason-native/console.nix @@ -3,7 +3,7 @@ { pname = "console"; - buildInputs = [ + nativeBuildInputs = [ reason ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/reason-native/dir.nix b/nixpkgs/pkgs/development/ocaml-modules/reason-native/dir.nix index e6eb9c0c403f..6b2aa0c3cd8f 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/reason-native/dir.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/reason-native/dir.nix @@ -3,7 +3,7 @@ { pname = "dir"; - buildInputs = [ + nativeBuildInputs = [ reason ]; 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 index 749e727feeca..a7c663493ef5 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/reason-native/file-context-printer.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/reason-native/file-context-printer.nix @@ -3,7 +3,7 @@ { pname = "file-context-printer"; - buildInputs = [ + nativeBuildInputs = [ reason ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/reason-native/fp.nix b/nixpkgs/pkgs/development/ocaml-modules/reason-native/fp.nix index ae6ae50705d5..8ff2ed65c4c0 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/reason-native/fp.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/reason-native/fp.nix @@ -3,7 +3,7 @@ { pname = "fp"; - buildInputs = [ + nativeBuildInputs = [ reason ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/reason-native/pastel-console.nix b/nixpkgs/pkgs/development/ocaml-modules/reason-native/pastel-console.nix index f1d2c7cc7264..968b9f88af91 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/reason-native/pastel-console.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/reason-native/pastel-console.nix @@ -3,7 +3,7 @@ { pname = "pastel-console"; - buildInputs = [ + nativeBuildInputs = [ reason ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/reason-native/pastel.nix b/nixpkgs/pkgs/development/ocaml-modules/reason-native/pastel.nix index a5abc4e219c5..f2c975d938e0 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/reason-native/pastel.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/reason-native/pastel.nix @@ -5,7 +5,7 @@ minimalOCamlVersion = "4.05"; - buildInputs = [ + nativeBuildInputs = [ reason ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix b/nixpkgs/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix index 993bcbefafdc..1250dc2d3a71 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix @@ -3,7 +3,7 @@ { pname = "qcheck-rely"; - buildInputs = [ + nativeBuildInputs = [ reason ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/reason-native/refmterr.nix b/nixpkgs/pkgs/development/ocaml-modules/reason-native/refmterr.nix index 9b14d4a8ba31..b4d6708467f0 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/reason-native/refmterr.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/reason-native/refmterr.nix @@ -3,7 +3,7 @@ { pname = "refmterr"; - buildInputs = [ + nativeBuildInputs = [ reason ]; 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 index 6e8b41bbd1c4..8a7080f624df 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/reason-native/rely-junit-reporter.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/reason-native/rely-junit-reporter.nix @@ -3,9 +3,12 @@ { pname = "rely-junit-reporter"; + nativeBuildInputs = [ + reason + ]; + buildInputs = [ atdgen - reason ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/ocaml-modules/reason-native/rely.nix b/nixpkgs/pkgs/development/ocaml-modules/reason-native/rely.nix index a2230426bec1..f29565f9c463 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/reason-native/rely.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/reason-native/rely.nix @@ -3,7 +3,7 @@ { pname = "rely"; - buildInputs = [ + nativeBuildInputs = [ reason ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/rope/default.nix b/nixpkgs/pkgs/development/ocaml-modules/rope/default.nix index 9410ab21ea34..9ac090a780e9 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/rope/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/rope/default.nix @@ -6,7 +6,7 @@ let param = version = "0.6.2"; url = "https://github.com/Chris00/ocaml-rope/releases/download/${version}/rope-${version}.tbz"; sha256 = "15cvfa0s1vjx7gjd07d3fkznilishqf4z4h2q5f20wm9ysjh2h2i"; - buildInputs = [ dune_2 ]; + nativeBuildInputs = [ dune_2 ]; extra = { buildPhase = "dune build -p rope"; installPhase = '' @@ -17,7 +17,7 @@ let param = version = "0.5"; url = "https://forge.ocamlcore.org/frs/download.php/1156/rope-0.5.tar.gz"; sha256 = "05fr2f5ch2rqhyaj06rv5218sbg99p1m9pq5sklk04hpslxig21f"; - buildInputs = [ ocamlbuild ]; + nativeBuildInputs = [ ocamlbuild ]; extra = { createFindlibDestdir = true; }; }; in @@ -30,7 +30,10 @@ stdenv.mkDerivation ({ inherit (param) url sha256; }; - buildInputs = [ ocaml findlib benchmark ] ++ param.buildInputs; + nativeBuildInputs = [ ocaml findlib ] ++ param.nativeBuildInputs; + buildInputs = [ benchmark ] ; + + strictDeps = true; meta = { homepage = "http://rope.forge.ocamlcore.org/"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/rresult/default.nix b/nixpkgs/pkgs/development/ocaml-modules/rresult/default.nix index 1198ca957f01..cdc3a1dba68a 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/rresult/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/rresult/default.nix @@ -8,10 +8,13 @@ stdenv.mkDerivation rec { sha256 = "1k69a3gvrk7f2cshwjzvk7818f0bwxhacgd14wxy6d4gmrggci86"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ]; propagatedBuildInputs = [ result ]; + strictDeps = true; + inherit (topkg) buildPhase installPhase; meta = { diff --git a/nixpkgs/pkgs/development/ocaml-modules/sawja/default.nix b/nixpkgs/pkgs/development/ocaml-modules/sawja/default.nix index 284ba97b9c70..3b0878155a53 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/sawja/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/sawja/default.nix @@ -23,9 +23,9 @@ stdenv.mkDerivation { sha256 = "sha256:0k51rscs9mdgpg3qn4cahql5ncdvlb207m015hr8v6r1vfgn0ddq"; }; - nativeBuildInputs = [ which ]; + nativeBuildInputs = [ which ocaml findlib ]; - buildInputs = [ ocaml findlib ]; + strictDeps = true; patches = [ ./configure.sh.patch ./Makefile.config.example.patch ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/sedlex/default.nix b/nixpkgs/pkgs/development/ocaml-modules/sedlex/default.nix index c1ea56b5c506..b808145bcbbc 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/sedlex/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/sedlex/default.nix @@ -15,10 +15,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-VhzlDTYBFXgKWT69PqZYLuHkiaDwzhmyX2XfaqzHFl4="; }; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; propagatedBuildInputs = [ gen ocaml-migrate-parsetree ppx_tools_versioned ]; + strictDeps = true; + buildFlags = [ "all" "opt" ]; createFindlibDestdir = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/sha/default.nix b/nixpkgs/pkgs/development/ocaml-modules/sha/default.nix index c1a76e4149e6..4cbb658b6549 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/sha/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/sha/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildDunePackage, stdlib-shims, ounit }: +{ lib, fetchurl, buildDunePackage, stdlib-shims, dune-configurator, ounit }: buildDunePackage rec { pname = "sha"; @@ -11,6 +11,8 @@ buildDunePackage rec { useDune2 = true; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ stdlib-shims ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/shine/default.nix b/nixpkgs/pkgs/development/ocaml-modules/shine/default.nix new file mode 100644 index 000000000000..3aa8cce7980c --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/shine/default.nix @@ -0,0 +1,25 @@ +{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, shine }: + +buildDunePackage rec { + pname = "shine"; + version = "0.2.2"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-shine"; + rev = "2e1de686ea031f1056df389161ea2b721bfdb39e"; + sha256 = "0v6i4ym5zijki6ffkp2qkp00lk4fysjhmg690xscj23gwz4zx8ir"; + }; + + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ shine ]; + + meta = with lib; { + homepage = "https://github.com/savonet/ocaml-shine"; + description = "Bindings to the fixed-point mp3 encoding library shine"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/sodium/default.nix b/nixpkgs/pkgs/development/ocaml-modules/sodium/default.nix index cff3d6186d1a..040a34ef6f1d 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/sodium/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/sodium/default.nix @@ -16,9 +16,11 @@ stdenv.mkDerivation rec { ./lib-gen-link-bigarray.patch ]; - buildInputs = [ ocaml findlib ocamlbuild ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; propagatedBuildInputs = [ ctypes libsodium ]; + strictDeps = true; + createFindlibDestdir = true; hardeningDisable = lib.optional stdenv.isDarwin "strictoverflow"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/sosa/default.nix b/nixpkgs/pkgs/development/ocaml-modules/sosa/default.nix index 1605a15bea8e..141e2a50193d 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/sosa/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/sosa/default.nix @@ -17,7 +17,9 @@ stdenv.mkDerivation rec { sha256 = "053hdv6ww0q4mivajj4iyp7krfvgq8zajq9d8x4mia4lid7j0dyk"; }; - buildInputs = [ ocaml ocamlbuild findlib ]; + nativeBuildInputs = [ ocaml ocamlbuild findlib ]; + + strictDeps = true; buildPhase = "make build"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/spacetime_lib/default.nix b/nixpkgs/pkgs/development/ocaml-modules/spacetime_lib/default.nix index 009b2ce32619..442d06e4f698 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/spacetime_lib/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/spacetime_lib/default.nix @@ -1,4 +1,7 @@ -{ lib, fetchFromGitHub, buildDunePackage, owee }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml, owee }: + +lib.throwIfNot (lib.versionAtLeast "4.12" ocaml.version) + "spacetime_lib is not available for OCaml ${ocaml.version}" buildDunePackage rec { pname = "spacetime_lib"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/speex/default.nix b/nixpkgs/pkgs/development/ocaml-modules/speex/default.nix new file mode 100644 index 000000000000..1bf5f308ecf2 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/speex/default.nix @@ -0,0 +1,25 @@ +{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, ogg, speex }: + +buildDunePackage rec { + pname = "speex"; + version = "0.4.1"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-speex"; + rev = "v${version}"; + sha256 = "0p4ip37kihlz9qy604llak2kzd00g45ix1yiihnrri2nm01scfab"; + }; + + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ ogg speex.dev ]; + + meta = with lib; { + homepage = "https://github.com/savonet/ocaml-speex"; + description = "Bindings to libspeex"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/sqlite3EZ/default.nix b/nixpkgs/pkgs/development/ocaml-modules/sqlite3EZ/default.nix index 02a281740b9f..6009eaecce1d 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/sqlite3EZ/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/sqlite3EZ/default.nix @@ -17,10 +17,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-pKysvth0efxJeyJQY2Dnqarg7OtsKyyLnFV/1ZhsfDY="; }; - buildInputs = [ ocaml findlib ocamlbuild twt ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + buildInputs = [ twt ]; propagatedBuildInputs = [ ocaml_sqlite3 ]; + strictDeps = true; + createFindlibDestdir = true; meta = with lib; { diff --git a/nixpkgs/pkgs/development/ocaml-modules/ssl/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ssl/default.nix index 1f4fd7b85805..04f181d7598d 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ssl/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ssl/default.nix @@ -24,6 +24,7 @@ buildDunePackage rec { maintainers = [ lib.maintainers.maggesi lib.maintainers.anmonteiro + lib.maintainers.dandellion ]; }; } diff --git a/nixpkgs/pkgs/development/ocaml-modules/stdcompat/default.nix b/nixpkgs/pkgs/development/ocaml-modules/stdcompat/default.nix index 0f3b5377fc51..eae9b264ba1f 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/stdcompat/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/stdcompat/default.nix @@ -11,7 +11,10 @@ stdenv.mkDerivation rec { sha256 = "sha256:01y67rndjlzfp5zq0gbqpg9skqq2hfbvhbq9lfhhk5xidr98sfj8"; }; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; + + strictDeps = true; + # build fails otherwise enableParallelBuilding = false; diff --git a/nixpkgs/pkgs/development/ocaml-modules/tezos/legacy-store.nix b/nixpkgs/pkgs/development/ocaml-modules/tezos/legacy-store.nix index 6029401e3618..b6d9f20df3c7 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/tezos/legacy-store.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/tezos/legacy-store.nix @@ -23,10 +23,12 @@ buildDunePackage { lwt-watcher ]; - buildInputs = [ + nativeBuildInputs = [ tezos-protocol-compiler ]; + strictDeps = true; + checkInputs = [ alcotest-lwt ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/tezos/lmdb.nix b/nixpkgs/pkgs/development/ocaml-modules/tezos/lmdb.nix index 6eaed942317f..5b5690707ab3 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/tezos/lmdb.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/tezos/lmdb.nix @@ -25,7 +25,7 @@ buildDunePackage { useDune2 = true; - buildInputs = [ + nativeBuildInputs = [ pkg-config ]; @@ -34,6 +34,8 @@ buildDunePackage { lmdb ]; + strictDeps = true; + checkInputs = [ cstruct alcotest diff --git a/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-010-PtGRANAD.nix b/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-010-PtGRANAD.nix index 2321245220f6..85dc33dc98f1 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-010-PtGRANAD.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-010-PtGRANAD.nix @@ -2,6 +2,7 @@ , buildDunePackage , tezos-stdlib , tezos-protocol-compiler +, tezos-protocol-environment }: buildDunePackage { @@ -9,10 +10,16 @@ buildDunePackage { inherit (tezos-stdlib) version useDune2; src = "${tezos-stdlib.base_src}/src"; - buildInputs = [ + nativeBuildInputs = [ tezos-protocol-compiler ]; + buildInputs = [ + tezos-protocol-environment + ]; + + strictDeps = true; + doCheck = true; meta = tezos-stdlib.meta // { diff --git a/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-011-PtHangz2.nix b/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-011-PtHangz2.nix index 2dec60851770..3cfb8cced04d 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-011-PtHangz2.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-011-PtHangz2.nix @@ -2,6 +2,7 @@ , buildDunePackage , tezos-stdlib , tezos-protocol-compiler +, tezos-protocol-environment }: buildDunePackage { @@ -9,10 +10,16 @@ buildDunePackage { inherit (tezos-stdlib) version useDune2; src = "${tezos-stdlib.base_src}/src"; - buildInputs = [ + nativeBuildInputs = [ tezos-protocol-compiler ]; + buildInputs = [ + tezos-protocol-environment + ]; + + strictDeps = true; + doCheck = true; meta = tezos-stdlib.meta // { diff --git a/nixpkgs/pkgs/development/ocaml-modules/tezos/store.nix b/nixpkgs/pkgs/development/ocaml-modules/tezos/store.nix index 69dad7512707..3fbe945d07b7 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/tezos/store.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/tezos/store.nix @@ -31,10 +31,12 @@ buildDunePackage { tezos-legacy-store ]; - buildInputs = [ + nativeBuildInputs = [ tezos-protocol-compiler ]; + strictDeps = true; + checkInputs = [ alcotest-lwt ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/tezos/validation.nix b/nixpkgs/pkgs/development/ocaml-modules/tezos/validation.nix index b26b81f4a779..44a7576cc065 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/tezos/validation.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/tezos/validation.nix @@ -14,10 +14,12 @@ buildDunePackage { tezos-protocol-updater ]; - buildInputs = [ + nativeBuildInputs = [ tezos-protocol-compiler ]; + strictDeps = true; + doCheck = true; meta = tezos-stdlib.meta // { diff --git a/nixpkgs/pkgs/development/ocaml-modules/theora/default.nix b/nixpkgs/pkgs/development/ocaml-modules/theora/default.nix new file mode 100644 index 000000000000..0f7b4aca1c79 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/theora/default.nix @@ -0,0 +1,25 @@ +{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, ogg, libtheora }: + +buildDunePackage rec { + pname = "theora"; + version = "0.4.0"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-theora"; + rev = "v${version}"; + sha256 = "1sggjmlrx4idkih1ddfk98cgpasq60haj4ykyqbfs22cmii5gpal"; + }; + + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ ogg libtheora ]; + + meta = with lib; { + homepage = "https://github.com/savonet/ocaml-theora"; + description = "Bindings to libtheora"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/toml/default.nix b/nixpkgs/pkgs/development/ocaml-modules/toml/default.nix index 6980a148e105..dd765e388235 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/toml/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/toml/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { sha256 = "08ywzqckllvwawl1wpgg7qzvx6jhq7d6vysa0d5hj7qdwq213ggm"; }; - buildInputs = [ menhir ]; + nativeBuildInputs = [ menhir ]; propagatedBuildInputs = [ iso8601 ]; meta = { diff --git a/nixpkgs/pkgs/development/ocaml-modules/topkg/default.nix b/nixpkgs/pkgs/development/ocaml-modules/topkg/default.nix index 9e1369a8567b..10104228c839 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/topkg/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/topkg/default.nix @@ -38,6 +38,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ ocaml findlib ocamlbuild ]; propagatedBuildInputs = param.propagatedBuildInputs or []; + strictDeps = true; + buildPhase = "${run} build"; createFindlibDestdir = true; installPhase = "${opaline}/bin/opaline -prefix $out -libdir $OCAMLFIND_DESTDIR"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/tsdl/default.nix b/nixpkgs/pkgs/development/ocaml-modules/tsdl/default.nix index 7c09e8cd9d7a..a56cccbe0717 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/tsdl/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/tsdl/default.nix @@ -18,8 +18,8 @@ stdenv.mkDerivation { sha256 = "1zwv0ixkigh1gzk5n49rwvz2f2m62jdkkqg40j7dclg4gri7691f"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; + nativeBuildInputs = [ pkg-config ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ]; propagatedBuildInputs = [ SDL2 ctypes ]; preConfigure = '' diff --git a/nixpkgs/pkgs/development/ocaml-modules/twt/default.nix b/nixpkgs/pkgs/development/ocaml-modules/twt/default.nix index 407601c7a46c..4e76f0c16d38 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/twt/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/twt/default.nix @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-xbjLPd7P1KyuC3i6WHLBcdLwd14atcBsd5ER+l97KAk="; }; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; + + strictDeps = true; preInstall = '' mkdir -p $out/bin diff --git a/nixpkgs/pkgs/development/ocaml-modules/type_conv/108.08.00.nix b/nixpkgs/pkgs/development/ocaml-modules/type_conv/108.08.00.nix index 337874e11a94..fb3977223f7e 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/type_conv/108.08.00.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/type_conv/108.08.00.nix @@ -13,7 +13,10 @@ stdenv.mkDerivation rec { sha256 = "08ysikwwp69zvc147lzzg79nwlrzrk738rj0ggcfadi8h5il42sl"; }; - buildInputs = [ ocaml findlib camlp4 ]; + nativeBuildInputs = [ ocaml findlib ]; + buildInputs = [ camlp4 ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/type_conv/109.60.01.nix b/nixpkgs/pkgs/development/ocaml-modules/type_conv/109.60.01.nix index 4ec160a92230..1f6500c6ed17 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/type_conv/109.60.01.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/type_conv/109.60.01.nix @@ -15,7 +15,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-8Oz/fPL3+RghyxQp5u6seSEdf0BgfP6XNcsMYty0rNs="; }; - buildInputs = [ ocaml findlib camlp4 ]; + nativeBuildInputs = [ ocaml findlib ]; + buildInputs = [ camlp4 ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/type_conv/112.01.01.nix b/nixpkgs/pkgs/development/ocaml-modules/type_conv/112.01.01.nix index e90ca2d16a64..468b872ec3d0 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/type_conv/112.01.01.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/type_conv/112.01.01.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildOcaml}: +{ lib, fetchFromGitHub, buildOcaml, camlp4}: buildOcaml rec { minimumSupportedOcamlVersion = "4.02"; @@ -13,6 +13,10 @@ buildOcaml rec { sha256 = "sha256-HzH0hnceCQ2kDRATjl+tfKk3XSBDsGnPzVUGYpDQUmU="; }; + strictDeps = true; + + buildInputs = [ camlp4 ]; + meta = { homepage = "https://github.com/janestreet/type_conv/"; description = "Support library for preprocessor type conversions"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/uchar/default.nix b/nixpkgs/pkgs/development/ocaml-modules/uchar/default.nix index 7d7d87af8532..09004e8a9438 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/uchar/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/uchar/default.nix @@ -10,7 +10,9 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ ocaml ocamlbuild findlib ]; - buildInputs = [ findlib ocaml ocamlbuild ]; + + strictDeps = true; + buildPhase = "ocaml pkg/build.ml native=true native-dynlink=${lib.boolToString withShared}"; installPhase = "${opaline}/bin/opaline -libdir $OCAMLFIND_DESTDIR"; configurePlatforms = [ ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ulex/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ulex/default.nix index f1ada5d09981..9a5848db3f7b 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ulex/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ulex/default.nix @@ -25,8 +25,9 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; - buildInputs = [ ocaml findlib ocamlbuild ]; - propagatedBuildInputs = [ camlp4 ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild camlp4 ]; + + strictDeps = true; buildFlags = [ "all" "all.opt" ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/uucd/default.nix b/nixpkgs/pkgs/development/ocaml-modules/uucd/default.nix index 244f3f36dc39..0c71ddf0d700 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/uucd/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/uucd/default.nix @@ -13,7 +13,10 @@ stdenv.mkDerivation rec { sha256 = "sha256:0fc737v5gj3339jx4x9xr096lxrpwvp6vaiylhavcvsglcwbgm30"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ]; + + strictDeps = true; inherit (topkg) buildPhase installPhase; diff --git a/nixpkgs/pkgs/development/ocaml-modules/uucp/default.nix b/nixpkgs/pkgs/development/ocaml-modules/uucp/default.nix index 2e8a360d4550..9031087f5053 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/uucp/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/uucp/default.nix @@ -21,10 +21,13 @@ stdenv.mkDerivation { sha256 = "sha256:1yx9nih3d9prb9zizq8fzmmqylf24a6yifhf81h33znrj5xn1mpj"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg uutf uunf ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg uutf uunf uucd ]; propagatedBuildInputs = [ uchar ]; + strictDeps = true; + buildPhase = '' runHook preBuild ${topkg.buildPhase} --with-cmdliner false --tests ${lib.boolToString doCheck} diff --git a/nixpkgs/pkgs/development/ocaml-modules/uuidm/default.nix b/nixpkgs/pkgs/development/ocaml-modules/uuidm/default.nix index b260a05505bc..336d66cb0a64 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/uuidm/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/uuidm/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1ivxb3hxn9bk62rmixx6px4fvn52s4yr1bpla7rgkcn8981v45r8"; }; - nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; configurePlatforms = []; buildInputs = [ topkg cmdliner ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/uunf/default.nix b/nixpkgs/pkgs/development/ocaml-modules/uunf/default.nix index 073e6865fcdd..12031c53927c 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/uunf/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/uunf/default.nix @@ -18,10 +18,13 @@ stdenv.mkDerivation { sha256 = "sha256:17wv0nm3vvwcbzb1b09akw8jblmigyhbfmh1sy9lkb5756ni94a2"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg uutf cmdliner ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg uutf cmdliner ]; propagatedBuildInputs = [ uchar ]; + strictDeps = true; + prePatch = lib.optionalString stdenv.isAarch64 "ulimit -s 16384"; inherit (topkg) buildPhase installPhase; diff --git a/nixpkgs/pkgs/development/ocaml-modules/uuseg/default.nix b/nixpkgs/pkgs/development/ocaml-modules/uuseg/default.nix index 1fbcb57f3a6a..42642d2dc24e 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/uuseg/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/uuseg/default.nix @@ -15,9 +15,12 @@ stdenv.mkDerivation rec { sha256 = "sha256:1g9zyzjkhqxgbb9mh3cgaawscwdazv6y8kdqvmy6yhnimmfqv25p"; }; - buildInputs = [ ocaml findlib ocamlbuild cmdliner topkg uutf ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg cmdliner uutf ]; propagatedBuildInputs = [ uucp ]; + strictDeps = true; + inherit (topkg) buildPhase installPhase; meta = with lib; { diff --git a/nixpkgs/pkgs/development/ocaml-modules/uutf/default.nix b/nixpkgs/pkgs/development/ocaml-modules/uutf/default.nix index e8179e369afa..6701c8650513 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/uutf/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/uutf/default.nix @@ -13,10 +13,12 @@ stdenv.mkDerivation rec { sha256 = "1nx1rly3qj23jzn9yk3x6fwqimcxjd84kv5859vvhdg56psq26p6"; }; - nativeBuildInputs = [ ocaml ocamlbuild findlib ]; - buildInputs = [ findlib topkg cmdliner ]; + nativeBuildInputs = [ ocaml ocamlbuild findlib topkg ]; + buildInputs = [ topkg cmdliner ]; propagatedBuildInputs = [ uchar ]; + strictDeps = true; + inherit (topkg) buildPhase installPhase; meta = with lib; { diff --git a/nixpkgs/pkgs/development/ocaml-modules/uuuu/default.nix b/nixpkgs/pkgs/development/ocaml-modules/uuuu/default.nix index 7d2eaac181df..4f400d1ec75b 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/uuuu/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/uuuu/default.nix @@ -24,10 +24,12 @@ buildDunePackage rec { useDune2 = true; - nativeBuildInputs = [ menhir ]; + nativeBuildInputs = [ menhir findlib ]; buildInputs = [ angstrom ]; + strictDeps = !doCheck; + checkInputs = [ re ]; doCheck = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/vg/default.nix b/nixpkgs/pkgs/development/ocaml-modules/vg/default.nix index a9a4c0d3d6b4..9dc7a4eeeeff 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/vg/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/vg/default.nix @@ -28,12 +28,15 @@ stdenv.mkDerivation { sha256 = "181sz6l5xrj5jvwg4m2yqsjzwp2s5h8v0mwhjcwbam90kdfx2nak"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + buildInputs = [ topkg ]; propagatedBuildInputs = [ uchar result gg ] ++ optionals pdfBackend [ uutf otfm ] ++ optionals htmlcBackend [ js_of_ocaml js_of_ocaml-ppx ]; + strictDeps = true; + buildPhase = topkg.buildPhase + " --with-uutf ${boolToString pdfBackend}" + " --with-otfm ${boolToString pdfBackend}" diff --git a/nixpkgs/pkgs/development/ocaml-modules/vorbis/default.nix b/nixpkgs/pkgs/development/ocaml-modules/vorbis/default.nix new file mode 100644 index 000000000000..f33182e5fc19 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/vorbis/default.nix @@ -0,0 +1,25 @@ +{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, ogg, libvorbis }: + +buildDunePackage rec { + pname = "vorbis"; + version = "0.8.0"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-vorbis"; + rev = "v${version}"; + sha256 = "1acy7yvf2y5dggzxw4vmrpdipakr98si3pw5kxw0mh7livn08al8"; + }; + + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ ogg libvorbis ]; + + meta = with lib; { + homepage = "https://github.com/savonet/ocaml-vorbis"; + description = "Bindings to libvorbis"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/wasm/default.nix b/nixpkgs/pkgs/development/ocaml-modules/wasm/default.nix index bf7fcb66fe5c..6b0008912906 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/wasm/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/wasm/default.nix @@ -1,6 +1,7 @@ { stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild }: if !lib.versionAtLeast ocaml.version "4.02" +|| lib.versionOlder "4.13" ocaml.version then throw "wasm is not available for OCaml ${ocaml.version}" else diff --git a/nixpkgs/pkgs/development/ocaml-modules/webbrowser/default.nix b/nixpkgs/pkgs/development/ocaml-modules/webbrowser/default.nix index 6a21a1e1f751..a8adced93882 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/webbrowser/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/webbrowser/default.nix @@ -11,9 +11,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; - buildInputs = []; + buildInputs = [ topkg ]; propagatedBuildInputs = [ astring bos cmdliner rresult ]; + strictDeps = true; + inherit (topkg) buildPhase installPhase; meta = { diff --git a/nixpkgs/pkgs/development/ocaml-modules/xml-light/default.nix b/nixpkgs/pkgs/development/ocaml-modules/xml-light/default.nix index 683d2ec214f1..8eb700a4d14a 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/xml-light/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/xml-light/default.nix @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-2txmkl/ZN5RGaLQJmr+orqwB4CbFk2RpLJd4gr7kPiE="; }; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/xmlm/default.nix b/nixpkgs/pkgs/development/ocaml-modules/xmlm/default.nix index 43b0bf5faa7e..f7aa1fdf113e 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/xmlm/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/xmlm/default.nix @@ -17,7 +17,10 @@ stdenv.mkDerivation rec { sha256 = "1rrdxg5kh9zaqmgapy9bhdqyxbbvxxib3bdfg1vhw4rrkp1z0x8n"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ]; + + strictDeps = true; inherit (topkg) buildPhase installPhase; diff --git a/nixpkgs/pkgs/development/ocaml-modules/z3/default.nix b/nixpkgs/pkgs/development/ocaml-modules/z3/default.nix index 43fc5b245c8d..b17f29b43531 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/z3/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/z3/default.nix @@ -29,9 +29,11 @@ stdenv.mkDerivation { runHook postInstall ''; - buildInputs = [ findlib ]; + nativeBuildInputs = [ findlib ]; propagatedBuildInputs = [ zarith ]; + strictDeps = true; + meta = z3.meta // { description = "Z3 Theorem Prover (OCaml API)"; }; diff --git a/nixpkgs/pkgs/development/pharo/launcher/default.nix b/nixpkgs/pkgs/development/pharo/launcher/default.nix index 23afd44b67d9..d8d3bcb2cdd9 100644 --- a/nixpkgs/pkgs/development/pharo/launcher/default.nix +++ b/nixpkgs/pkgs/development/pharo/launcher/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { comment = "Launcher for Pharo distributions"; desktopName = "Pharo"; genericName = "Pharo"; - categories = "Development;"; + categories = [ "Development" ]; }; # because upstream tarball has no top-level directory. diff --git a/nixpkgs/pkgs/development/pharo/wrapper/default.nix b/nixpkgs/pkgs/development/pharo/wrapper/default.nix index 1f0892950723..1202b2dce6d4 100644 --- a/nixpkgs/pkgs/development/pharo/wrapper/default.nix +++ b/nixpkgs/pkgs/development/pharo/wrapper/default.nix @@ -11,11 +11,9 @@ stdenv.mkDerivation rec { genericName = "Pharo Virtual Machine"; exec = "pharo %F"; icon = "pharo"; - terminal = "false"; - type="Application"; - startupNotify = "false"; - categories = "Development;"; - mimeType = "application/x-pharo-image"; + startupNotify = false; + categories = [ "Development" ]; + mimeTypes = [ "application/x-pharo-image" ]; }; unpackPhase = '' cp $src ./pharo-vm.sh diff --git a/nixpkgs/pkgs/development/php-packages/box/default.nix b/nixpkgs/pkgs/development/php-packages/box/default.nix index b19b275019df..bc0f4ac636c6 100644 --- a/nixpkgs/pkgs/development/php-packages/box/default.nix +++ b/nixpkgs/pkgs/development/php-packages/box/default.nix @@ -16,10 +16,12 @@ mkDerivation { nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall mkdir -p $out/bin install -D $src $out/libexec/box/box.phar makeWrapper ${php}/bin/php $out/bin/box \ --add-flags "-d phar.readonly=0 $out/libexec/box/box.phar" + runHook postInstall ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/php-packages/composer/default.nix b/nixpkgs/pkgs/development/php-packages/composer/default.nix index a3920691a8d2..4c94b7421253 100644 --- a/nixpkgs/pkgs/development/php-packages/composer/default.nix +++ b/nixpkgs/pkgs/development/php-packages/composer/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, unzip, lib, php }: let pname = "composer"; - version = "2.2.6"; + version = "2.2.7"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "sha256-HVhIa4keWengZMDVS7OFOPdNYBT3VIFULGmthNTpdwQ="; + sha256 = "sha256-EAQN7WY1QZkO74zh9vpEyztKR+FF77jp5ZkHoVBoAz0="; }; dontUnpack = true; diff --git a/nixpkgs/pkgs/development/php-packages/couchbase/default.nix b/nixpkgs/pkgs/development/php-packages/couchbase/default.nix index 1b90e71fd209..84f307204319 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, substituteAll }: let pname = "couchbase"; - version = "3.2.1"; + version = "3.2.2"; in buildPecl { inherit pname version; @@ -10,7 +10,7 @@ buildPecl { owner = "couchbase"; repo = "php-couchbase"; rev = "v${version}"; - sha256 = "sha256-Ti1jo1do0xiY/FAfyG/YI/TTcgFTMWy8cuhorDodUko="; + sha256 = "sha256-JpzLR4NcyShl2VTivj+15iAsTTsZmdMIdZYc3dLCbIA="; }; configureFlags = [ "--with-couchbase" ]; diff --git a/nixpkgs/pkgs/development/php-packages/deployer/default.nix b/nixpkgs/pkgs/development/php-packages/deployer/default.nix index 7679fb5ea51b..661a6310958c 100644 --- a/nixpkgs/pkgs/development/php-packages/deployer/default.nix +++ b/nixpkgs/pkgs/development/php-packages/deployer/default.nix @@ -14,6 +14,7 @@ mkDerivation rec { nativeBuildInputs = [ makeWrapper installShellFiles ]; installPhase = '' + runHook preInstall mkdir -p $out/bin install -D $src $out/libexec/deployer/deployer.phar makeWrapper ${php}/bin/php $out/bin/dep --add-flags "$out/libexec/deployer/deployer.phar" @@ -22,6 +23,7 @@ mkDerivation rec { installShellCompletion --cmd dep \ --bash <($out/bin/dep autocomplete --install) \ --zsh <($out/bin/dep autocomplete --install) + runHook postInstall ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/php-packages/grumphp/default.nix b/nixpkgs/pkgs/development/php-packages/grumphp/default.nix new file mode 100644 index 000000000000..e9b88d8155e2 --- /dev/null +++ b/nixpkgs/pkgs/development/php-packages/grumphp/default.nix @@ -0,0 +1,31 @@ +{ mkDerivation, fetchurl, makeWrapper, lib, php }: +mkDerivation rec { + pname = "grumphp"; + version = "1.8.1"; + + src = fetchurl { + url = "https://github.com/phpro/${pname}/releases/download/v${version}/${pname}.phar"; + sha256 = "sha256-3XPMyH2F3ZfRr8DmvlBY3Z6uolhaRraQxwKIskIwPq8="; + }; + + dontUnpack = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + install -D $src $out/libexec/${pname}/grumphp.phar + makeWrapper ${php}/bin/php $out/bin/grumphp \ + --add-flags "$out/libexec/${pname}/grumphp.phar" + runHook postInstall + ''; + + meta = with lib; { + broken = versionOlder php.version "8.0"; + description = "A PHP code-quality tool"; + homepage = "https://github.com/phpro/grumphp"; + license = licenses.mit; + maintainers = teams.php.members; + }; +} diff --git a/nixpkgs/pkgs/development/php-packages/mailparse/default.nix b/nixpkgs/pkgs/development/php-packages/mailparse/default.nix index f3796eb3b6c6..de3ec2d11d4b 100644 --- a/nixpkgs/pkgs/development/php-packages/mailparse/default.nix +++ b/nixpkgs/pkgs/development/php-packages/mailparse/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "mailparse"; - version = "3.1.2"; - sha256 = "sha256-sGR6sH6kgPzBNTM2jjj9tPS7RdMNzmX8kGUqZwpPQBA="; + version = "3.1.3"; + sha256 = "sha256-hlnKYtyaTX0V8H+XoOIULLWCUcjncs02Zp7HQNIpJHE="; internalDeps = [ php.extensions.mbstring ]; postConfigure = '' diff --git a/nixpkgs/pkgs/development/php-packages/mongodb/default.nix b/nixpkgs/pkgs/development/php-packages/mongodb/default.nix index 2ff72b608c2c..6f28d1af10e3 100644 --- a/nixpkgs/pkgs/development/php-packages/mongodb/default.nix +++ b/nixpkgs/pkgs/development/php-packages/mongodb/default.nix @@ -14,8 +14,8 @@ buildPecl { pname = "mongodb"; - version = "1.12.0"; - sha256 = "sha256-DZ9nCwISiLtsmwYJefGR8dp3PXKRAGcxZvOLYX4kMX4="; + version = "1.12.1"; + sha256 = "sha256-kl1+YAXG6Eu0CiUBnBKw7kvaYlxkSXadzn1bAmmD9DM="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/nixpkgs/pkgs/development/php-packages/phing/default.nix b/nixpkgs/pkgs/development/php-packages/phing/default.nix new file mode 100644 index 000000000000..6c5af7d5d275 --- /dev/null +++ b/nixpkgs/pkgs/development/php-packages/phing/default.nix @@ -0,0 +1,33 @@ +{ mkDerivation, fetchurl, makeWrapper, lib, php }: +let + pname = "phing"; + version = "2.17.2"; +in +mkDerivation { + inherit pname version; + + src = fetchurl { + url = "https://www.phing.info/get/phing-${version}.phar"; + sha256 = "sha256-KDqJdHIqgtar6ofNG4ENRlpRg9XYFeL5YS7Rclh1+PQ="; + }; + + dontUnpack = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + install -D $src $out/libexec/phing/phing.phar + makeWrapper ${php}/bin/php $out/bin/phing \ + --add-flags "$out/libexec/phing/phing.phar" + runHook postInstall + ''; + + meta = with lib; { + description = "PHing Is Not GNU make; it's a PHP project build system or build tool based on Apache Ant"; + license = licenses.lgpl3; + homepage = "https://github.com/phingofficial/phing"; + maintainers = with maintainers; teams.php.members; + }; +} diff --git a/nixpkgs/pkgs/development/php-packages/phive/default.nix b/nixpkgs/pkgs/development/php-packages/phive/default.nix new file mode 100644 index 000000000000..f564cb536922 --- /dev/null +++ b/nixpkgs/pkgs/development/php-packages/phive/default.nix @@ -0,0 +1,31 @@ +{ mkDerivation, fetchurl, makeWrapper, lib, php }: + +mkDerivation rec { + pname = "phive"; + version = "0.15.0"; + + src = fetchurl { + url = "https://github.com/phar-io/phive/releases/download/${version}/phive-${version}.phar"; + sha256 = "sha256-crMr8d5nsVt7+zQ5xPeph/JXmTEn6jJFVtp3mOgylB4="; + }; + + dontUnpack = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + install -D $src $out/libexec/phive/phive.phar + makeWrapper ${php}/bin/php $out/bin/phive \ + --add-flags "$out/libexec/phive/phive.phar" + runHook postInstall + ''; + + meta = with lib; { + description = "The Phar Installation and Verification Environment (PHIVE)"; + homepage = "https://github.com/phar-io/phive"; + license = licenses.bsd3; + maintainers = with maintainers; teams.php.members; + }; +} diff --git a/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix b/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix index bf1c806dfc38..90bd1af00789 100644 --- a/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix +++ b/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: let pname = "php-cs-fixer"; - version = "3.6.0"; + version = "3.7.0"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar"; - sha256 = "sha256-sbz8uq6nJ6dEL6FHJ01VTrovaJa8bwQ9Ic+dLr7yPnA="; + sha256 = "sha256-a7mKM++0iQm9hQFCDfyR6Jdb9h98YNHmbdQso8BU3WE="; }; dontUnpack = true; @@ -16,10 +16,12 @@ mkDerivation { nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall mkdir -p $out/bin install -D $src $out/libexec/php-cs-fixer/php-cs-fixer.phar makeWrapper ${php}/bin/php $out/bin/php-cs-fixer \ --add-flags "$out/libexec/php-cs-fixer/php-cs-fixer.phar" + runHook postInstall ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/php-packages/php-parallel-lint/default.nix b/nixpkgs/pkgs/development/php-packages/php-parallel-lint/default.nix index 50fd23540ee5..d0335142490e 100644 --- a/nixpkgs/pkgs/development/php-packages/php-parallel-lint/default.nix +++ b/nixpkgs/pkgs/development/php-packages/php-parallel-lint/default.nix @@ -20,15 +20,19 @@ mkDerivation { ]; buildPhase = '' + runHook preBuild composer dump-autoload box build + runHook postBuild ''; installPhase = '' + runHook preInstall mkdir -p $out/bin install -D parallel-lint.phar $out/libexec/php-parallel-lint/php-parallel-lint.phar makeWrapper ${php}/bin/php $out/bin/php-parallel-lint \ --add-flags "$out/libexec/php-parallel-lint/php-parallel-lint.phar" + runHook postInstall ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/php-packages/phpcbf/default.nix b/nixpkgs/pkgs/development/php-packages/phpcbf/default.nix index cef7c2986e8f..1cc6f46bd09d 100644 --- a/nixpkgs/pkgs/development/php-packages/phpcbf/default.nix +++ b/nixpkgs/pkgs/development/php-packages/phpcbf/default.nix @@ -16,10 +16,12 @@ mkDerivation { nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall mkdir -p $out/bin install -D $src $out/libexec/phpcbf/phpcbf.phar makeWrapper ${php}/bin/php $out/bin/phpcbf \ --add-flags "$out/libexec/phpcbf/phpcbf.phar" + runHook postInstall ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/php-packages/phpcs/default.nix b/nixpkgs/pkgs/development/php-packages/phpcs/default.nix index baad111cec55..877f587717da 100644 --- a/nixpkgs/pkgs/development/php-packages/phpcs/default.nix +++ b/nixpkgs/pkgs/development/php-packages/phpcs/default.nix @@ -16,10 +16,12 @@ mkDerivation { nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall mkdir -p $out/bin install -D $src $out/libexec/phpcs/phpcs.phar makeWrapper ${php}/bin/php $out/bin/phpcs \ --add-flags "$out/libexec/phpcs/phpcs.phar" + runHook postInstall ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/php-packages/phpmd/default.nix b/nixpkgs/pkgs/development/php-packages/phpmd/default.nix index 763fd857c357..228fd25ea553 100644 --- a/nixpkgs/pkgs/development/php-packages/phpmd/default.nix +++ b/nixpkgs/pkgs/development/php-packages/phpmd/default.nix @@ -16,10 +16,12 @@ mkDerivation { nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall mkdir -p $out/bin install -D $src $out/libexec/phpmd/phpmd.phar makeWrapper ${php}/bin/php $out/bin/phpmd \ --add-flags "$out/libexec/phpmd/phpmd.phar" + runHook postInstall ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/php-packages/phpstan/default.nix b/nixpkgs/pkgs/development/php-packages/phpstan/default.nix index b00da4972f67..6351a076fded 100644 --- a/nixpkgs/pkgs/development/php-packages/phpstan/default.nix +++ b/nixpkgs/pkgs/development/php-packages/phpstan/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: let pname = "phpstan"; - version = "1.4.6"; + version = "1.4.9"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "sha256-h19rFEs7VrdlxGS1qeYJnO5aQaKzpFZTdsN2h3Hmm0w="; + sha256 = "sha256-N2oYhhcU6uCGUzJbL8/vMUlypJa/Z86d4Xddvj6k1fc="; }; dontUnpack = true; @@ -16,10 +16,12 @@ mkDerivation { nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall mkdir -p $out/bin install -D $src $out/libexec/phpstan/phpstan.phar makeWrapper ${php}/bin/php $out/bin/phpstan \ --add-flags "$out/libexec/phpstan/phpstan.phar" + runHook postInstall ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/php-packages/psalm/default.nix b/nixpkgs/pkgs/development/php-packages/psalm/default.nix index a772ae441a5f..01f79c36397d 100644 --- a/nixpkgs/pkgs/development/php-packages/psalm/default.nix +++ b/nixpkgs/pkgs/development/php-packages/psalm/default.nix @@ -16,10 +16,12 @@ mkDerivation { nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall mkdir -p $out/bin install -D $src $out/libexec/psalm/psalm.phar makeWrapper ${php}/bin/php $out/bin/psalm \ --add-flags "$out/libexec/psalm/psalm.phar" + runHook postInstall ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/php-packages/psysh/default.nix b/nixpkgs/pkgs/development/php-packages/psysh/default.nix index a9a5a007d94d..f1105dea9113 100644 --- a/nixpkgs/pkgs/development/php-packages/psysh/default.nix +++ b/nixpkgs/pkgs/development/php-packages/psysh/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: let pname = "psysh"; - version = "0.11.1"; + version = "0.11.2"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/bobthecow/psysh/releases/download/v${version}/psysh-v${version}.tar.gz"; - sha256 = "sha256-OiEXI7AVcC5udISfJ41285OBL82mSd1Xb5qhVtG4p9I="; + sha256 = "sha256-u7VTlZw9k7VDWKGK/8fzFw0bjNu6DMGsoQnDedHgCWg="; }; dontUnpack = true; @@ -16,16 +16,18 @@ mkDerivation { nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall mkdir -p $out/bin tar -xzf $src -C $out/bin chmod +x $out/bin/psysh wrapProgram $out/bin/psysh --prefix PATH : "${lib.makeBinPath [ php ]}" + runHook postInstall ''; meta = with lib; { description = "PsySH is a runtime developer console, interactive debugger and REPL for PHP."; license = licenses.mit; homepage = "https://psysh.org/"; - maintainers = with maintainers; [ caugner ] ++ teams.php.members; + maintainers = teams.php.members; }; } diff --git a/nixpkgs/pkgs/development/php-packages/rdkafka/default.nix b/nixpkgs/pkgs/development/php-packages/rdkafka/default.nix index c7c8e8d059c4..04e6df329a1b 100644 --- a/nixpkgs/pkgs/development/php-packages/rdkafka/default.nix +++ b/nixpkgs/pkgs/development/php-packages/rdkafka/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "rdkafka"; - version = "6.0.0"; - sha256 = "sha256-24kHOvonhXvMnnMfe3/fDYHGkyD8vnuC4NaVBwP9TY4="; + version = "6.0.1"; + sha256 = "sha256-ikq+cB5ZPRBCwhB0YQT0sEsVrJjbYzGEju2RrK388ZI="; buildInputs = [ rdkafka pcre2 ]; diff --git a/nixpkgs/pkgs/development/php-packages/redis/default.nix b/nixpkgs/pkgs/development/php-packages/redis/default.nix index f893a4ed7979..070112ba6552 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.6"; - sha256 = "sha256-/ilewmolIE5sB+jXFEIQ92e9cAiFhxnaIwQJ6z9vLgk="; + version = "5.3.7"; + sha256 = "sha256-uVgWbM2k9AvRfGmY+eIjkCGuZERnzYrVwV3vQgqtZbA="; 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 99b2b53f7ee7..3cbd55221e11 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.8.6"; - sha256 = "sha256-4ot8LXpWcjMmD3e/EzrYNMxqUPPupQQkv2ibLkZoWxs="; + version = "4.8.7"; + sha256 = "sha256-yoiMuIbIgwkuvoeIJT1gC8UsOE504nEQ+XsE7Oprb9o="; buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin) [ valgrind ]; internalDeps = lib.optionals (lib.versionOlder php.version "7.4") [ php.extensions.hash ]; diff --git a/nixpkgs/pkgs/development/python-modules/APScheduler/default.nix b/nixpkgs/pkgs/development/python-modules/APScheduler/default.nix index 52d4ecdc3b71..b6f79b6c5fc6 100644 --- a/nixpkgs/pkgs/development/python-modules/APScheduler/default.nix +++ b/nixpkgs/pkgs/development/python-modules/APScheduler/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "apscheduler"; - version = "3.8.1"; + version = "3.9.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "APScheduler"; inherit version; - hash = "sha256-XPNE68+9qkiuF4wCnAVc7HvHpKR8IeMV5NHwi9NfI1U="; + hash = "sha256-ZeZXS2OVSY03HQRfKop+T31Qxq0h73MT0VscfPIN8eM="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/adafruit-io/default.nix b/nixpkgs/pkgs/development/python-modules/adafruit-io/default.nix new file mode 100644 index 000000000000..88bdff440c4a --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/adafruit-io/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, paho-mqtt +, pytestCheckHook +, pythonOlder +, requests +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "adafruit-io"; + version = "2.6.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "adafruit"; + repo = "Adafruit_IO_Python"; + rev = version; + hash = "sha256-tjm+HvUuLK3IxXwuxPidJaBetj+n0BzKOuLj75bM7a8="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + paho-mqtt + requests + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "Adafruit_IO" + ]; + + disabledTestPaths = [ + # Tests requires valid credentials + "tests/test_client.py" + "tests/test_errors.py" + "tests/test_mqtt_client.py" + ]; + + meta = with lib; { + description = "Module for interacting with Adafruit IO"; + homepage = "https://github.com/adafruit/Adafruit_IO_Python"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix index a93137f136b8..9ed55214b4c7 100644 --- a/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.19.6"; + version = "3.21.0"; format = "setuptools"; src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - sha256 = "sha256-Y9g0A9pVjEVcITyaQsyAew6rraTPwZuevSsDD46c0DM="; + sha256 = "sha256-H65Ar/+9AwhKFNRK/SZyU8XzrMt3myjBo+YNJYtQ0b4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aesara/default.nix b/nixpkgs/pkgs/development/python-modules/aesara/default.nix new file mode 100644 index 000000000000..3e2e9cb2cf37 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/aesara/default.nix @@ -0,0 +1,65 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, scipy +, filelock +, etuples +, logical-unification +, minikanren +, cons +, numba +, numba-scipy +, libgpuarray +, sympy +, cython +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "aesara"; + version = "2.4.0"; + + src = fetchFromGitHub { + owner = "aesara-devs"; + repo = "aesara"; + rev = "38d7a813646c1e350170c46bafade0e7d0e2427c"; + sha256 = "sha256-933bM15BZi4sTjnIOGAg5dc5tXVWQ9lFzktOtzj5DNQ="; + }; + + nativeBuildInputs = [ + cython + ]; + + propagatedBuildInputs = [ + numpy + scipy + filelock + etuples + logical-unification + minikanren + cons + numba + numba-scipy + libgpuarray + sympy + ]; + + checkInputs = [ + pytestCheckHook + ]; + + preBuild = '' + export HOME=$(mktemp -d) + ''; + + pythonImportsCheck = [ "aesara" ]; + + meta = with lib; { + description = "Python library to define, optimize, and efficiently evaluate mathematical expressions involving multi-dimensional arrays"; + homepage = "https://github.com/aesara-devs/aesara"; + changelog = "https://github.com/aesara-devs/aesara/releases"; + license = licenses.bsd3; + maintainers = with maintainers; [ Etjean ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/aio-geojson-client/default.nix b/nixpkgs/pkgs/development/python-modules/aio-geojson-client/default.nix index f00a75961b9c..b0629483d014 100644 --- a/nixpkgs/pkgs/development/python-modules/aio-geojson-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aio-geojson-client/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aio-geojson-client"; - version = "0.16"; + version = "0.17"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "exxamalte"; repo = "python-aio-geojson-client"; rev = "v${version}"; - hash = "sha256-u3SwrSxeBJrBTHfqKY/mAb2p1jqW2AvRsHomKsI81gM="; + hash = "sha256-5GiQgtbvYeleovFbXO2vlr2XPsDIWZiElM64O+urMcY="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiodiscover/default.nix b/nixpkgs/pkgs/development/python-modules/aiodiscover/default.nix index 4e2b0c5897fc..dbc684281fb4 100644 --- a/nixpkgs/pkgs/development/python-modules/aiodiscover/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiodiscover/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiodiscover"; - version = "1.4.7"; + version = "1.4.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NtiShZpPFl+elYNPLaKAg6uV8pDJv0pyR+NTUiFoMm0="; + sha256 = "sha256-ts3PnL1ePWJHHaLuC0eQKqBOt+HeEeAayeVBAIhnUWs="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiogithubapi/default.nix b/nixpkgs/pkgs/development/python-modules/aiogithubapi/default.nix index 747aa3f4d471..82c1145f9e3f 100644 --- a/nixpkgs/pkgs/development/python-modules/aiogithubapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiogithubapi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiogithubapi"; - version = "22.2.3"; + version = "22.2.4"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "sha256-oeUcyClTmOYF6vdhwiOp2L7x27DXEbujdtRV4NwGcYo="; + sha256 = "sha256-2RYpeyX88+eEilK/wLDJ6Ock1JBgIUPWbm/ZBJSQ2pg="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix b/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix index a2c3d182be1c..b1938c88aa90 100644 --- a/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "0.6.11"; + version = "0.7.16"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = pname; rev = version; - sha256 = "1rrdzzb2gcl3lc8l5vb99hy2lmdj5723fds2q78n4sf83y93czw7"; + sha256 = "sha256-dakxPhnI1m6KiOj6oQkfQ0UVA7NEBTHFGYnF6L6c8Ck="; }; nativeBuildInputs = [ @@ -34,6 +34,8 @@ buildPythonPackage rec { zeroconf ]; + doCheck = lib.versionAtLeast pytest-aiohttp.version "1.0.0"; + checkInputs = [ pytest-aiohttp pytestCheckHook diff --git a/nixpkgs/pkgs/development/python-modules/aiohue/default.nix b/nixpkgs/pkgs/development/python-modules/aiohue/default.nix index ece6d6140b3b..5862a7e65a6e 100644 --- a/nixpkgs/pkgs/development/python-modules/aiohue/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiohue/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "aiohue"; - version = "4.2.1"; + version = "4.3.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-bcSCYNJt9xYBMmuZYM6s+PWV0TAUFOn3ibHE0KRX+iw="; + hash = "sha256-PslmDeG/o9WAOc0FhidUNaISrlXa3rba3UEuvPVN/+A="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aioitertools/default.nix b/nixpkgs/pkgs/development/python-modules/aioitertools/default.nix index cae0b10ea690..451fb9e7fa10 100644 --- a/nixpkgs/pkgs/development/python-modules/aioitertools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioitertools/default.nix @@ -17,30 +17,21 @@ buildPythonPackage rec { pname = "aioitertools"; - version = "0.8.0"; + version = "0.10.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "8b02facfbc9b0f1867739949a223f3d3267ed8663691cc95abd94e2c1d8c2b46"; + hash = "sha256-fR0dSgPUYsWghAeH098JjxJYR+DTi4M7MPj4y8RaFCA="; }; - patches = lib.optionals (pythonAtLeast "3.10") [ - (fetchpatch { - # Fix TypeError: wait() got an unexpected keyword argument 'loop' - # See https://github.com/omnilib/aioitertools/issues/84 - url = "https://raw.githubusercontent.com/archlinux/svntogit-community/packages/python-aioitertools/trunk/python310.patch"; - sha256 = "sha256-F10sduGaLBcxEoP83N/lGpZIlzkM2JTnQnhHKFwc7P0="; - }) - ]; - nativeBuildInputs = [ flit-core ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ + propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ typing-extensions ]; @@ -53,7 +44,7 @@ buildPythonPackage rec { ''; meta = with lib; { - description = "Implementation of itertools, builtins, and more for AsyncIO and mixed-type iterables."; + description = "Implementation of itertools, builtins, and more for AsyncIO and mixed-type iterables"; license = licenses.mit; homepage = "https://pypi.org/project/aioitertools/"; maintainers = with maintainers; [ teh ]; diff --git a/nixpkgs/pkgs/development/python-modules/aiolifx/default.nix b/nixpkgs/pkgs/development/python-modules/aiolifx/default.nix index 100405c1abed..2cc04130c671 100644 --- a/nixpkgs/pkgs/development/python-modules/aiolifx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiolifx/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "aiolifx"; - version = "0.7.0"; + version = "0.7.1"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-9FwTYcaXwGMMnhp+MXe1Iu8Og5aHL6qo9SVKWHFtc7o="; + sha256 = "sha256-ktXnAgrxfDELfMQATcWHn/u6C4bKQii+mbT4mA54coo="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiolyric/default.nix b/nixpkgs/pkgs/development/python-modules/aiolyric/default.nix index 44e532a6149d..855748f665cf 100644 --- a/nixpkgs/pkgs/development/python-modules/aiolyric/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiolyric/default.nix @@ -8,25 +8,34 @@ buildPythonPackage rec { pname = "aiolyric"; - version = "1.0.8"; + version = "1.0.10"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "timmo001"; repo = pname; rev = "v${version}"; - sha256 = "sha256-A4EkqSIQ5p4E4DPLYu9a/lmb1sFhwDqFLhjhZS6Zf5c="; + hash = "sha256-yKeG0UCQ8haT1hvywoIwKQ519GK2wFg0wXaRTFeKYIk="; }; - propagatedBuildInputs = [ aiohttp ]; + propagatedBuildInputs = [ + aiohttp + ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; disabledTests = [ # AssertionError, https://github.com/timmo001/aiolyric/issues/5 "test_location" ]; - pythonImportsCheck = [ "aiolyric" ]; + + pythonImportsCheck = [ + "aiolyric" + ]; meta = with lib; { description = "Python module for the Honeywell Lyric Platform"; diff --git a/nixpkgs/pkgs/development/python-modules/aiopvpc/default.nix b/nixpkgs/pkgs/development/python-modules/aiopvpc/default.nix index 54e237898447..032bf995a7d4 100644 --- a/nixpkgs/pkgs/development/python-modules/aiopvpc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiopvpc/default.nix @@ -46,6 +46,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # Failures seem related to changes in holidays-0.13, https://github.com/azogue/aiopvpc/issues/44 + "test_number_of_national_holidays" + ]; + postPatch = '' substituteInPlace pyproject.toml --replace \ " --cov --cov-report term --cov-report html" "" diff --git a/nixpkgs/pkgs/development/python-modules/aiopyarr/default.nix b/nixpkgs/pkgs/development/python-modules/aiopyarr/default.nix index 54eab469629f..b1618081b878 100644 --- a/nixpkgs/pkgs/development/python-modules/aiopyarr/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiopyarr/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aiopyarr"; - version = "22.2.1"; + version = "22.2.2"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tkdrob"; repo = pname; rev = version; - hash = "sha256-SEF47hz5XbATuuuO5t5H40+kT7RWSBjP0BfYd38pNSw="; + hash = "sha256-gkiUPznAJ5nkrdbDKAvODsf6UStsxFugCfkZ0fCJkng="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix b/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix index f2bd2f0d36de..d6f2c1289081 100644 --- a/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "1.0.9"; + version = "1.0.11"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = version; - hash = "sha256-XGmhLc64efQ1eIgCYN1Wkp4sPXvYXlR7/9WF5cWZyys="; + hash = "sha256-N+8vmB41AUu4aTUTBYX6SPVsW1PARaq5mCOdhg9h0/g="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/allure-behave/default.nix b/nixpkgs/pkgs/development/python-modules/allure-behave/default.nix new file mode 100644 index 000000000000..e7cd81d5b5d5 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/allure-behave/default.nix @@ -0,0 +1,38 @@ +{ lib +, fetchPypi +, buildPythonPackage +, pythonOlder +, behave +, allure-python-commons +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "allure-behave"; + version = "2.9.45"; + + disabled = pythonOlder "3.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-aK0SgQIXpuUoSTz8jg5IPKQM2Xvk2EfkSGigsy/GFNo="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + pythonImportsCheck = [ "allure_behave" ]; + + propagatedBuildInputs = [ + allure-python-commons + behave + ]; + + meta = with lib; { + description = "Allure behave integration."; + homepage = "https://github.com/allure-framework/allure-python"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/amcrest/default.nix b/nixpkgs/pkgs/development/python-modules/amcrest/default.nix index 697b9bba00fa..dcdf918344a3 100644 --- a/nixpkgs/pkgs/development/python-modules/amcrest/default.nix +++ b/nixpkgs/pkgs/development/python-modules/amcrest/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "amcrest"; - version = "1.9.4"; + version = "1.9.7"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "tchellomello"; repo = "python-amcrest"; rev = version; - sha256 = "sha256-smwPKZLevolNvpkLxoFR3NGL9YFPlBk3WYQqJXBaS7s="; + sha256 = "sha256-An7MnGtZsmEZU/y6E0sivdexFD6HJRTB1juXqHfbDzE="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix b/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix index 92d377d0886c..7cfe51e29c87 100644 --- a/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "ansible-runner"; - version = "2.1.1"; + version = "2.1.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-doRhL3VDxfB/PoE1Zn7rIqnb2Y9iXMaZAbqZJDKe8k8="; + hash = "sha256-GK/CqmMm67VmvzlhMV6ow+40m0DYUpXCFkP+9NgR/e4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/asn1/default.nix b/nixpkgs/pkgs/development/python-modules/asn1/default.nix index c8b1b78b78f7..b46152f3a094 100644 --- a/nixpkgs/pkgs/development/python-modules/asn1/default.nix +++ b/nixpkgs/pkgs/development/python-modules/asn1/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "asn1"; - version = "2.4.2"; + version = "2.5.0"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "andrivet"; repo = "python-asn1"; rev = "v${version}"; - sha256 = "sha256-fx/kWOnh5Gk1DjeX0xiCJYnd5teD18RvKyOnawcfWWA="; + sha256 = "sha256-5Fnk94aUkV9lHnd64wuHzGcPqW7AC0O0dEwXMBL+tuo="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/async-lru/default.nix b/nixpkgs/pkgs/development/python-modules/async-lru/default.nix index 8a5694ffde77..9dc412ccde86 100644 --- a/nixpkgs/pkgs/development/python-modules/async-lru/default.nix +++ b/nixpkgs/pkgs/development/python-modules/async-lru/default.nix @@ -8,19 +8,19 @@ buildPythonPackage rec { pname = "async-lru"; - version = "unstable-2020-10-24"; + version = "unstable-2022-02-03"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "aio-libs"; repo = "async-lru"; - rev = "ae252508f9c5aecf9c02ddeb879d06c28dbffc42"; - sha256 = "1gk5qzdvhl2j1mw7xzchbw7bcgk9mzhvqa62nwwmvlbnx88pkwnc"; + rev = "3574af7691371015c47faf77e0abf8c7b06a3cdc"; + hash = "sha256-EsadpQlRNnebp0UUybzQwzyK4zwFlortutv3VTUsprU="; }; postPatch = '' - sed -i '/^addopts/d' setup.cfg + sed -i -e '/^addopts/d' -e '/^filterwarnings/,+2d' setup.cfg ''; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/asyncsleepiq/default.nix b/nixpkgs/pkgs/development/python-modules/asyncsleepiq/default.nix new file mode 100644 index 000000000000..53bd099fce50 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/asyncsleepiq/default.nix @@ -0,0 +1,37 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "asyncsleepiq"; + version = "1.1.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-ZpxiFV9Ch46vIDxNDYm0BBD5EY8+j8AzOu6lKsQpGrY="; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ + "asyncsleepiq" + ]; + + meta = with lib; { + description = "Async interface to SleepIQ API"; + homepage = "https://github.com/kbickar/asyncsleepiq"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix b/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix index 399926c5e05f..468dac556614 100755 --- a/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "atlassian-python-api"; - version = "3.19.0"; + version = "3.20.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "atlassian-api"; repo = pname; rev = version; - sha256 = "sha256-SJsqk8TM+5UztN1ZDyYrOjNIWDLhm5XtLxPflIGPxKQ="; + sha256 = "sha256-yTRJz5zLt5eV+IHrVVLmVZnkbf0FBLM7CiCQ28X1cgc="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/awkward/default.nix b/nixpkgs/pkgs/development/python-modules/awkward/default.nix index f1152da2d1d4..2b3b1e4ce8c1 100644 --- a/nixpkgs/pkgs/development/python-modules/awkward/default.nix +++ b/nixpkgs/pkgs/development/python-modules/awkward/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "awkward"; - version = "1.7.0"; + version = "1.8.0"; src = fetchPypi { inherit pname version; - sha256 = "e4e642dfe496d2acb245c90e37dc18028e25d5e936421e7371ea6ba0fde6435a"; + sha256 = "sha256-ZlX6ItGx0dy5zO4NUCNQq5DFNGehC1QLdiRCK1lNLnI="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix b/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix index c5565500a321..db168c9b325e 100644 --- a/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -2,32 +2,29 @@ , buildPythonPackage , fetchFromGitHub , six -, pathlib , pytest , mock , parameterized -, isPy27 -, isPy35 +, pythonOlder }: buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "1.12.0"; + version = "1.13.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; - # No tests available in PyPI tarball src = fetchFromGitHub { owner = "awslabs"; repo = "aws-lambda-builders"; rev = "v${version}"; - sha256 = "sha256-3Of3E32+Txe2844pl0sWxj46EgaTG2aEfbAELlxIT/E="; + sha256 = "sha256-t04g65TPeOYgEQw6kPJrlJN1ssQrsN9kl7g69J4pPwo="; }; - # Package is not compatible with Python 3.5 - disabled = isPy35; - propagatedBuildInputs = [ six - ] ++ lib.optionals isPy27 [ pathlib ]; + ]; checkInputs = [ pytest diff --git a/nixpkgs/pkgs/development/python-modules/awsiotpythonsdk/default.nix b/nixpkgs/pkgs/development/python-modules/awsiotpythonsdk/default.nix index 70161d3fd6a0..fc188ae683c6 100644 --- a/nixpkgs/pkgs/development/python-modules/awsiotpythonsdk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/awsiotpythonsdk/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "AWSIoTPythonSDK"; - version = "1.5.0"; + version = "1.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "aws"; repo = "aws-iot-device-sdk-python"; rev = "v${version}"; - sha256 = "0bmvwv471mvlwj2rfz08j9qvzsp4vyjz67cbzkvsy6kmihx3wfqh"; + sha256 = "sha256-UpfgoCVbweOpWbgaqNebAAkWmhjkZu3txVoTZ/qhl3g="; }; # Module has no tests diff --git a/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix b/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix index 2013bc645450..ea0696e294a0 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "azure-identity"; - version = "1.7.1"; + version = "1.8.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "7f22cd0c7a9b92ed297dd67ae79d9bb9a866e404061c02cec709ad10c4c88e19"; + sha256 = "sha256-Ag/w5HFXhS5KrIo62waEGCcUfyepTL50qQRCXY5i2Tw="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-batch/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-batch/default.nix index c153534cc642..421f068aa13e 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-batch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-batch/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-batch"; - version = "16.0.0"; + version = "16.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1b3cecd6f16813879c6ac1a1bb01f9a6f2752cd1f9157eb04d5e41e4a89f3c34"; + sha256 = "sha256-9J0VQ3uAsi4kuEe9UG4xpcEV1Sc+nkjECgVfzG7j5jk="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix index 3038f8720e70..3dbb8f5a87ab 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "26.0.0"; + version = "26.1.0"; pname = "azure-mgmt-compute"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-nGot8UIeL0DNuw5+v7XmLjrNiJMfpsk1z2K2Tdo4Q+s="; + sha256 = "sha256-K63nT8sx2PCIFhc+1eCAs/ItESbv9xA+8GDn2hZCJHU="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix index 8afcde620194..fae7318cd486 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "9.0.0"; + version = "9.1.0"; pname = "azure-mgmt-containerregistry"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "9f6c5894d32ba696527ecf0ff155bb43c325dff6a11a6de60cd22ea3f5fb180d"; + sha256 = "sha256-jkzGLDqrJgwCnz27lGzFk4d2q+j0P+PU8uUVGQg7MkA="; extension = "zip"; }; diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index b9e75eca44c3..57fe4655aeec 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "16.4.0"; + version = "17.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "23a8047668ebd1fa7c3c2445eba4e69c07675306e2a94ae6a3e455df162bd008"; + sha256 = "sha256-oUbWdZryabCCg/gTujchT7p1nS7IDoU5W9MQ4ekJYH8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix index bfd0b6196954..eed367c2206d 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-datafactory"; - version = "2.2.0"; + version = "2.3.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "bc2560b4de1528292883b53a337b89f04a5ceab7c3500b6bc388e3a77ff093cc"; + sha256 = "sha256-pjBjFPkKhKd8XI6wmzX/rAssHINMzDAZa+XRqG/pLYo="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/default.nix index eeec10b5eade..26bc4064fb26 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "2.1.0"; + version = "2.2.0"; pname = "azure-mgmt-kusto"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "171ea8719f543bd0dd4f3d6fa2277162d763182fe8e61b4db03f02668c1685b5"; + sha256 = "sha256-A369Y5cqKthMz43QUvWQHq5ggz93plGObl7K4xnUdnc="; extension = "zip"; }; diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix index 626a60d7c998..68cf99fa0d4a 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-rdbms"; - version = "10.0.0"; + version = "10.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "bdc479b3bbcac423943d63e746a81dd5fc80b46a4dbb4393e760016e3fa4f74a"; + sha256 = "sha256-qH1AHIdshHNM3UiIr1UeShRhtLMo2YFq9gy4rFl58DU="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix index ed5b19bd80d6..cd7e96049d1f 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -7,14 +7,14 @@ }: buildPythonPackage rec { - version = "19.0.0"; + version = "19.1.0"; pname = "azure-mgmt-storage"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "f05963e5a8696d0fd4dcadda4feecb9b382a380d2e461b3647704ac787d79876"; + sha256 = "sha256-Seoi8A4JZaNVCvNKQcGh06SBaQ9lAMeOhUCIAvVtdBY="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-storage-blob/default.nix b/nixpkgs/pkgs/development/python-modules/azure-storage-blob/default.nix index 8d3bb5aca3e8..669ab37e4db9 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-storage-blob/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-storage-blob/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-storage-blob"; - version = "12.9.0"; + version = "12.10.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "cff66a115c73c90e496c8c8b3026898a3ce64100840276e9245434e28a864225"; + sha256 = "sha256-PH3CyT5/8qcxrNZqNqHwpiZgcrQVTeukiU2riRKF6jo="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix b/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix index 421b46a9948f..c7c59fd2b9f4 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "azure-storage-file-share"; - version = "12.6.0"; + version = "12.7.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "7eb0cde00fbbb6b780da8bdd81312ab79de706c4a2601e4eded1bc430da680a8"; + sha256 = "sha256-kYNugiWNlXEgryKLwrzytca/W+2481RqqUCbdJWrqDI="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix b/nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix index b24417b325ab..5a83385b7541 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "azure-synapse-artifacts"; - version = "0.11.0"; + version = "0.12.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "79eb973280ea89c0e6e2872d8f3f175b172b7438c2e2b9b4e655ae206be705fa"; + sha256 = "sha256-IfQWsITuThzh+TRgv99JTtcDFY3gMq5PjALkN4mJEZo="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix b/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix index 5f9eb41bf821..2adc8b784f10 100644 --- a/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix @@ -3,7 +3,6 @@ , buildPythonPackage , fetchPypi , importlib-metadata -, isPy27 , logfury , pytestCheckHook , pytest-lazy-fixture @@ -16,12 +15,14 @@ buildPythonPackage rec { pname = "b2sdk"; - version = "1.14.0"; - disabled = isPy27; + version = "1.14.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "900da60f9e569e02405b85db35541a79e1cac776ace5d054498b107982ea443c"; + hash = "sha256-fYOeyhKm9mRT61NcQVaXFKeRC8AS9lfIZMO/s6iFaeg="; }; nativeBuildInputs = [ @@ -65,5 +66,6 @@ buildPythonPackage rec { description = "Client library and utilities for access to B2 Cloud Storage (backblaze)"; homepage = "https://github.com/Backblaze/b2-sdk-python"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/bandit/default.nix b/nixpkgs/pkgs/development/python-modules/bandit/default.nix index 4a2a2803d3aa..cf1bbd9c54aa 100644 --- a/nixpkgs/pkgs/development/python-modules/bandit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bandit/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "bandit"; - version = "1.7.2"; + version = "1.7.4"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-bRGt6gIUpDgTiHv+caN3tamVXkyCbI/9NBtJTjqyUmA="; + sha256 = "sha256-LWOoxXNBe64ziWLUubBvvGCA907NlVoJKEnh5lxxe9I="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/bc-python-hcl2/default.nix b/nixpkgs/pkgs/development/python-modules/bc-python-hcl2/default.nix index 42203a43da46..78529e288ca2 100644 --- a/nixpkgs/pkgs/development/python-modules/bc-python-hcl2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bc-python-hcl2/default.nix @@ -1,33 +1,21 @@ { lib , buildPythonPackage , fetchPypi +, lark , nose , pythonOlder }: -let - lark-parser = buildPythonPackage rec { - pname = "lark-parser"; - version = "0.10.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "15jr4c1falvgkq664xdgamykk6waklh1psy8v3wlrg0v59hngws2"; - }; - - doCheck = true; - }; -in buildPythonPackage rec { pname = "bc-python-hcl2"; - version = "0.3.30"; + version = "0.3.33"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-wfcTIPKbMPa7xpXzkFtxnxG2ZRFzTw35EP7f4zwHxcs="; + hash = "sha256-tdsw9gf64VGH9tRWgYZZq3FNa5B5JNhN3k6wUHrU5zY="; }; # Nose is required during build process, so can not use `checkInputs`. @@ -36,7 +24,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - lark-parser + lark ]; # This fork of python-hcl2 doesn't ship tests diff --git a/nixpkgs/pkgs/development/python-modules/beartype/default.nix b/nixpkgs/pkgs/development/python-modules/beartype/default.nix index d77a4db3e331..097971c9ce35 100644 --- a/nixpkgs/pkgs/development/python-modules/beartype/default.nix +++ b/nixpkgs/pkgs/development/python-modules/beartype/default.nix @@ -5,17 +5,16 @@ , pythonOlder }: - buildPythonPackage rec { pname = "beartype"; - version = "0.9.1"; + version = "0.10.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "YjYw3CQ7DaWoTw+kFOaqryYT5WetGav+aoHBfqWrYvE="; + hash = "sha256-Lo1AUxj+QR7N2Tdif58zGBMSp5Pr0jmz2nacRDnLS5g="; }; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix b/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix index 49952b4f5f17..4a0bd988c1ef 100644 --- a/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "1.8.9"; + version = "1.9.2"; pname = "bids-validator"; src = fetchPypi { inherit pname version; - sha256 = "01fcb5a8fe6de1280cdfd5b37715103ffa0bafb3c739ca7f5ffc41e46549612e"; + sha256 = "sha256-JxPOHeK8glWwAhYwlCVJtfWeMtU6KHgvNg5b2DgGxGc="; }; # needs packages which are not available in nixpkgs diff --git a/nixpkgs/pkgs/development/python-modules/binwalk/default.nix b/nixpkgs/pkgs/development/python-modules/binwalk/default.nix index 112f12e5f25b..a63df0d7d399 100644 --- a/nixpkgs/pkgs/development/python-modules/binwalk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/binwalk/default.nix @@ -21,7 +21,7 @@ , visualizationSupport ? false }: buildPythonPackage rec { - pname = "binwalk"; + pname = "binwalk${lib.optionalString visualizationSupport "-full"}"; version = "2.3.3"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/python-modules/bitarray/default.nix b/nixpkgs/pkgs/development/python-modules/bitarray/default.nix index 743c749a1f1b..be7f69fbd8dc 100644 --- a/nixpkgs/pkgs/development/python-modules/bitarray/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bitarray/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "bitarray"; - version = "2.3.6"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-O/21ne0VyWHm49W38WcVXNoFO+JHXqgBdGHfC02CC30="; + sha256 = "sha256-8SA+kC1R3zGRfXfuupw/540DKHOirXjHN+JkIPAIDlg="; }; checkPhase = '' diff --git a/nixpkgs/pkgs/development/python-modules/bitlist/default.nix b/nixpkgs/pkgs/development/python-modules/bitlist/default.nix index dcb83d1ca2a7..c96c2e8707b7 100644 --- a/nixpkgs/pkgs/development/python-modules/bitlist/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bitlist/default.nix @@ -4,16 +4,19 @@ , nose , parts , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "bitlist"; - version = "0.6.2"; + version = "0.7.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "69cf632ca61b5fb5d2fd7587ddf023bcab8f327302f15070ec9079b68df9082a"; + sha256 = "sha256-p3Gws48u1/AzltbtPyWvSX4O0u4MgSXiVq4GstpPCCg="; }; propagatedBuildInputs = [ @@ -29,6 +32,11 @@ buildPythonPackage rec { "bitlist" ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace " --cov=bitlist --cov-report term-missing" "" + ''; + meta = with lib; { description = "Python library for working with little-endian list representation of bit strings"; homepage = "https://github.com/lapets/bitlist"; diff --git a/nixpkgs/pkgs/development/python-modules/blinkpy/default.nix b/nixpkgs/pkgs/development/python-modules/blinkpy/default.nix index 572dbad932b3..27b7ba03d450 100644 --- a/nixpkgs/pkgs/development/python-modules/blinkpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/blinkpy/default.nix @@ -5,11 +5,16 @@ , python-slugify , requests , pytestCheckHook +, pythonAtLeast +, pythonOlder }: buildPythonPackage rec { pname = "blinkpy"; version = "0.18.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "fronzbot"; @@ -38,6 +43,12 @@ buildPythonPackage rec { "blinkpy.sync_module" ]; + disabledTests = lib.optionals (pythonAtLeast "3.10") [ + "test_download_video_exit" + "test_parse_camera_not_in_list" + "test_parse_downloaded_items" + ]; + meta = with lib; { description = "Python library for the Blink Camera system"; homepage = "https://github.com/fronzbot/blinkpy"; diff --git a/nixpkgs/pkgs/development/python-modules/blspy/default.nix b/nixpkgs/pkgs/development/python-modules/blspy/default.nix index 1c491cb5de0f..aac2c2b97391 100644 --- a/nixpkgs/pkgs/development/python-modules/blspy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/blspy/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "blspy"; - version = "1.0.8"; + version = "1.0.9"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-yKLirwWWeUTs5BFXZfqfuNJUXtQW40EiNPxuP+FeHso="; + hash = "sha256-6keimQqwh37G9xc1Xyxlr+0n9Qgv87Np2D7Gzj6ik5Y="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/boschshcpy/default.nix b/nixpkgs/pkgs/development/python-modules/boschshcpy/default.nix index 29a5dd569aed..518a2d8b69e0 100644 --- a/nixpkgs/pkgs/development/python-modules/boschshcpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/boschshcpy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "boschshcpy"; - version = "0.2.29"; + version = "0.2.30"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tschamm"; repo = pname; rev = version; - sha256 = "sha256-x+TXHG7xJWd5t6pKQ/6X48lOuIQWUnEwsySFRh5GJnE="; + sha256 = "sha256-qq01hnNiJ6BUGhi5owYvxM+Kj7/KYp0vBpILmwPuZaw="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/bsdiff4/default.nix b/nixpkgs/pkgs/development/python-modules/bsdiff4/default.nix index cbc75ef2843f..5ee2ff0522af 100644 --- a/nixpkgs/pkgs/development/python-modules/bsdiff4/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bsdiff4/default.nix @@ -1,24 +1,32 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder }: buildPythonPackage rec { pname = "bsdiff4"; - version = "1.2.1"; + version = "1.2.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "87cffc7522effdda03fd1564b212ad2279c0af50d16c3e65776f80acb6705d4b"; + hash = "sha256-GICsP1KmxGrmvMbbEX5Ps1+bDM1a91/U/uaQfQDWmDw="; }; + pythonImportsCheck = [ + "bsdiff4" + ]; + checkPhase = '' mv bsdiff4 _bsdiff4 python -c 'import bsdiff4; bsdiff4.test()' ''; meta = with lib; { - description = "binary diff and patch using the BSDIFF4-format"; + description = "Binary diff and patch using the BSDIFF4-format"; homepage = "https://github.com/ilanschnell/bsdiff4"; license = licenses.bsdProtection; maintainers = with maintainers; [ ris ]; diff --git a/nixpkgs/pkgs/development/python-modules/btrees/default.nix b/nixpkgs/pkgs/development/python-modules/btrees/default.nix index 49acee691cfa..d900beca38a4 100644 --- a/nixpkgs/pkgs/development/python-modules/btrees/default.nix +++ b/nixpkgs/pkgs/development/python-modules/btrees/default.nix @@ -6,15 +6,20 @@ , transaction , zope_testrunner , python +, pythonOlder }: buildPythonPackage rec { - pname = "BTrees"; - version = "4.9.2"; + pname = "btrees"; + version = "4.10.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - sha256 = "d33323655924192c4ac998d9ee3002e787915d19c1e17a6baf47c9a63d9556e3"; + pname = "BTrees"; + inherit version; + hash = "sha256-1qsONBDQdNcVQkXW3GSTrobxtQvWCA0TEOuz7N6l3rY="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/buildbot/default.nix b/nixpkgs/pkgs/development/python-modules/buildbot/default.nix index a6ae6e87036b..2836ee24c34a 100644 --- a/nixpkgs/pkgs/development/python-modules/buildbot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/buildbot/default.nix @@ -31,11 +31,11 @@ let package = buildPythonPackage rec { pname = "buildbot"; - version = "3.4.0"; + version = "3.4.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-14w1sF1aOpfUW76uhAIUpdrjAEhQkEWcRGg9Osc+qFk="; + sha256 = "sha256-GmKMqejHjtEiEtlZffze7PGNjVwUKB/ZcvUgJ4DoeDQ="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix b/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix index a1d2fa59cb5d..a35506c89b8d 100644 --- a/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix +++ b/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-NAc85JomnxS052SjCu8+UQ/hik2gbq1u7/gc21Nj67Q="; + sha256 = "sha256-A2a5rEL5MN9jlu5vVnUIKx9ma2H6wuJAWjkqLpQgcfc="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix b/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix index 797395205a04..5b64f4c51ab9 100644 --- a/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix +++ b/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix @@ -7,7 +7,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-65ZbCiNtxH3YjAcdhv5cwSUNrLT65jlQh/2oL8342Tw="; + sha256 = "sha256-Hly1dwUbWblHoP+ufjxyz4boXby8kxeFSHLMHcCpc1o="; }; # Remove unneccessary circular dependency on buildbot @@ -34,7 +34,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-2wu6rE5tgjPXxlcIND8s+DAmX9CF29M3ElonV0L8WOs="; + sha256 = "sha256-QuV808Wg9epCgjehuUaMKCLLTLfFJVWBdKPy8sZfBYg="; }; buildInputs = [ buildbot-pkg ]; @@ -56,7 +56,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-Vu4CouTuVyxpmx5C4fthQJPdFBAtN1jliQjy4pLYAzc="; + sha256 = "sha256-p8PRQaWrPb63RrF4FtTX65qM3HdzI4Gl4tR0zTOBFEI="; }; buildInputs = [ buildbot-pkg ]; @@ -78,7 +78,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-BDzI4VBbNGCKRxv6294IIVkDXZV0KHauvUYDjIVovvE="; + sha256 = "sha256-cNYptEp98padbyoY1DmZbpaED7O5pfck9oMjst4RHnI="; }; buildInputs = [ buildbot-pkg ]; @@ -100,7 +100,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-hkcxwZWFJOLHMIRJfzzMTEoH6oc2UblJEKFjYthFfDc="; + sha256 = "sha256-o747SIyqJom4ucZ7hmODcP0VC7i+ydgvi+oMxn/vupc="; }; buildInputs = [ buildbot-pkg ]; diff --git a/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix b/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix index 0c7e2f33716f..97a3eec770bd 100644 --- a/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix +++ b/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix @@ -7,7 +7,7 @@ buildPythonPackage (rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-SFZ0Q51hrBb7eBMGzvVOhc/ogFCIO/Mo7U9652WJ2GU="; + sha256 = "sha256-9wdUvp00vuP7peJ+Oo4guHLfIz0YWHwp6q/zlKOOoXg="; }; propagatedBuildInputs = [ twisted future ]; diff --git a/nixpkgs/pkgs/development/python-modules/canonicaljson/default.nix b/nixpkgs/pkgs/development/python-modules/canonicaljson/default.nix index b5679978c2cc..8743c01ba2ad 100644 --- a/nixpkgs/pkgs/development/python-modules/canonicaljson/default.nix +++ b/nixpkgs/pkgs/development/python-modules/canonicaljson/default.nix @@ -9,13 +9,14 @@ buildPythonPackage rec { pname = "canonicaljson"; - version = "1.5.0"; + version = "1.6.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Xr3c10xbBm7mjsylZGUzjpsTgEZ+CpBvR5dpfJ+zgeI="; + hash = "sha256-hznV/ZGspygdQlZgrmWvdmOAjIF3d4ll9n6QsWorJCc="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/celery/default.nix b/nixpkgs/pkgs/development/python-modules/celery/default.nix index eabb3521416e..247d25bf420a 100644 --- a/nixpkgs/pkgs/development/python-modules/celery/default.nix +++ b/nixpkgs/pkgs/development/python-modules/celery/default.nix @@ -19,6 +19,7 @@ , pythonOlder , pytz , vine +, nixosTests }: buildPythonPackage rec { @@ -78,6 +79,10 @@ buildPythonPackage rec { "celery" ]; + passthru.tests = { + inherit (nixosTests) sourcehut; + }; + meta = with lib; { description = "Distributed task queue"; homepage = "https://github.com/celery/celery/"; diff --git a/nixpkgs/pkgs/development/python-modules/censys/default.nix b/nixpkgs/pkgs/development/python-modules/censys/default.nix index 4a00155a4ec6..754d7ca0f2aa 100644 --- a/nixpkgs/pkgs/development/python-modules/censys/default.nix +++ b/nixpkgs/pkgs/development/python-modules/censys/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "censys"; - version = "2.1.2"; + version = "2.1.3"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "censys"; repo = "censys-python"; rev = "v${version}"; - sha256 = "0qxqd5ip98d6q1d48vcprpr38sa47ky3cr6lprd01nzibdmf2r2d"; + sha256 = "sha256-Zv3ViOrdQby+7UQrHy6174W2qh1vx21R0yOA7ecr0lU="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/cerberus/default.nix b/nixpkgs/pkgs/development/python-modules/cerberus/default.nix index 7686b919272f..be597277b6b7 100644 --- a/nixpkgs/pkgs/development/python-modules/cerberus/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cerberus/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , pytestCheckHook }: @@ -15,6 +16,10 @@ buildPythonPackage rec { sha256 = "03kj15cf1pbd11mxsik96m5w1m6p0fbdc4ia5ihzmq8rz28razpq"; }; + propagatedBuildInputs = [ + setuptools + ]; + checkInputs = [ pytestCheckHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix b/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix index 354f90f12b6b..1c5b96ea48cd 100644 --- a/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "cfn-lint"; - version = "0.56.4"; + version = "0.58.2"; src = fetchFromGitHub { owner = "aws-cloudformation"; repo = "cfn-python-lint"; rev = "v${version}"; - sha256 = "0li8zkdvmgfxqzqs1rvd48mwim0bhjwmxlywqxjix0a43kvkvh77"; + sha256 = "sha256-ArpvP4tbRf1fK8BPokRXqS3YyaFiOLBrR8uQHko5iKo="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/cftime/default.nix b/nixpkgs/pkgs/development/python-modules/cftime/default.nix index 3991dc6bf685..6479933293fa 100644 --- a/nixpkgs/pkgs/development/python-modules/cftime/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cftime/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "cftime"; - version = "1.5.2"; + version = "1.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "375d37d9ab8bf501c048e44efce2276296e3d67bb276e891e0e93b0a8bbb988a"; + sha256 = "sha256-ExA+ZlC+6mVSMWvVgl1qo7fpj1uBFQJt9IJnmN/590E="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/channels-redis/default.nix b/nixpkgs/pkgs/development/python-modules/channels-redis/default.nix index c7383e98219d..803104d85471 100644 --- a/nixpkgs/pkgs/development/python-modules/channels-redis/default.nix +++ b/nixpkgs/pkgs/development/python-modules/channels-redis/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "channels-redis"; - version = "3.3.1"; + version = "3.4.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit version; pname = "channels_redis"; - sha256 = "899dc6433f5416cf8ad74505baaf2acb5461efac3cad40751a41119e3f68421b"; + sha256 = "sha256-Xf/UzBYXQSW9QEP8j+dGLKdAPPgB1Zqfp0EO0QH6alc="; }; buildInputs = [ redis hiredis ]; diff --git a/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix b/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix index 28e777e8fdd2..30a620b5ad6f 100644 --- a/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "chart-studio"; - version = "5.5.0"; + version = "5.6.0"; # chart-studio was split from plotly src = fetchFromGitHub { owner = "plotly"; repo = "plotly.py"; rev = "v${version}"; - sha256 = "04hsh1z2ngfslmvi8fdzfccssg6i0ziksil84j129f049m96wd51"; + sha256 = "sha256-mf4QASdvO7doV5pKAAEzaKJP66w29osBlbLrJuopUvA="; }; sourceRoot = "source/packages/python/chart-studio"; diff --git a/nixpkgs/pkgs/development/python-modules/chromaprint/default.nix b/nixpkgs/pkgs/development/python-modules/chromaprint/default.nix new file mode 100644 index 000000000000..2a07a4eb6dce --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/chromaprint/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 +, m2r +}: + +buildPythonPackage rec { + pname = "chromaprint"; + version = "0.5"; + + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-d4M+ieNQpIXcnEH1WyIWnTYZe3P+Y58W0uz1uYPwLQE="; + }; + + buildInputs = [ m2r ]; + + # no tests + doCheck = false; + + pythonImportsCheck = [ "chromaprint" ]; + + meta = with lib; { + description = "Facilitate effortless color terminal output"; + homepage = "https://pypi.org/project/${pname}/"; + license = licenses.mit; + maintainers = with maintainers; [ dschrempf peterhoeg ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/ciscoconfparse/default.nix b/nixpkgs/pkgs/development/python-modules/ciscoconfparse/default.nix index 8831999e9923..e6db689a45c5 100644 --- a/nixpkgs/pkgs/development/python-modules/ciscoconfparse/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ciscoconfparse/default.nix @@ -1,26 +1,54 @@ -{ lib, buildPythonPackage, fetchFromGitHub, passlib, dnspython, loguru, toml -, ipaddr, poetry, poetry-core, black, Fabric, pytest, sphinx }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, passlib +, dnspython +, loguru +, toml +, pytestCheckHook +}: buildPythonPackage rec { pname = "ciscoconfparse"; - version = "1.6.21"; + version = "1.6.36"; format = "pyproject"; src = fetchFromGitHub { owner = "mpenning"; repo = pname; rev = version; - sha256 = "1d6nzhmdg7zlg1h3lm4v7j4hsb2aqd475r5q5vcqxfdxszc92w21"; + sha256 = "sha256-nIuuqAxz8eHEQRuH8nfYVQ+vGMmcDcARJLizoI5Mty8="; }; - patchPhase = '' + postPatch = '' patchShebangs tests ''; - propagatedBuildInputs = - [ passlib dnspython loguru toml ipaddr poetry black Fabric sphinx ]; + nativeBuildInputs = [ + poetry-core + ]; - checkInputs = [ pytest ]; + propagatedBuildInputs = [ + passlib + dnspython + loguru + ]; + + checkInputs = [ + pytestCheckHook + ]; + + disabledTestPaths = [ + "tests/parse_test.py" + ]; + + disabledTests = [ + "test_dns_lookup" + "test_reverse_dns_lookup" + ]; + + pythonImportsCheck = [ "ciscoconfparse" ]; meta = with lib; { description = diff --git a/nixpkgs/pkgs/development/python-modules/ckcc-protocol/default.nix b/nixpkgs/pkgs/development/python-modules/ckcc-protocol/default.nix index 409164cf830e..670e4a3c9237 100644 --- a/nixpkgs/pkgs/development/python-modules/ckcc-protocol/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ckcc-protocol/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "ckcc-protocol"; - version = "1.2.1"; + version = "1.3.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "65f0313f9915b36068f6dfcab08e04671621e6227650443bc12e81997081ae7f"; + sha256 = "sha256-UVLKJHDPxi9ivY3JyIySmce0NUhxIIlIxVTdPoXMaKM="; }; propagatedBuildInputs = [ click ecdsa hidapi pyaes ]; diff --git a/nixpkgs/pkgs/development/python-modules/cloudsmith-api/default.nix b/nixpkgs/pkgs/development/python-modules/cloudsmith-api/default.nix index 0e1aca73522e..92e5a71ee80d 100644 --- a/nixpkgs/pkgs/development/python-modules/cloudsmith-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cloudsmith-api/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "cloudsmith-api"; - version = "1.8.2"; + version = "1.33.7"; format = "wheel"; src = fetchPypi { pname = "cloudsmith_api"; inherit format version; - sha256 = "f00410210f0efa1af7a2d344deafc12b946e3efc7d5c8374b27dc67ed8580183"; + sha256 = "sha256-KNm2O2kZg+YzjtebsBoL7BOHCuffDELXm2k8vIFtKdk="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/clvm-rs/bump-cargo-lock.patch b/nixpkgs/pkgs/development/python-modules/clvm-rs/bump-cargo-lock.patch deleted file mode 100644 index 9939e6fb43a0..000000000000 --- a/nixpkgs/pkgs/development/python-modules/clvm-rs/bump-cargo-lock.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -80,7 +80,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - - [[package]] - name = "clvm_rs" --version = "0.1.14" -+version = "0.1.15" - dependencies = [ - "bls12_381", - "hex", diff --git a/nixpkgs/pkgs/development/python-modules/clvm-rs/default.nix b/nixpkgs/pkgs/development/python-modules/clvm-rs/default.nix index ec078970bc1a..7b5a5a96a8c9 100644 --- a/nixpkgs/pkgs/development/python-modules/clvm-rs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/clvm-rs/default.nix @@ -5,35 +5,59 @@ , pythonOlder , openssl , perl +, pkgs }: +let + # clvm-rs does not work with maturin 0.12 + # https://github.com/Chia-Network/clvm_rs/commit/32fba40178a5440a1306623f47d8b0684ae2339a#diff-50c86b7ed8ac2cf95bd48334961bf0530cdc77b5a56f852c5c61b89d735fd711 + maturin_0_11 = with pkgs; rustPlatform.buildRustPackage rec { + pname = "maturin"; + version = "0.11.5"; + src = fetchFromGitHub { + owner = "PyO3"; + repo = "maturin"; + rev = "v${version}"; + hash = "sha256-hwc6WObcJa6EXf+9PRByUtiupMMYuXThA8i/K4rl0MA="; + }; + cargoHash = "sha256-qGCEfKpQwAC57LKonFnUEgLW4Cc7HFJgSyUOzHkKN9c="; + + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = lib.optionals stdenv.isLinux [ dbus ] + ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security libiconv ]; + + # Requires network access, fails in sandbox. + doCheck = false; + }; +in + buildPythonPackage rec { pname = "clvm_rs"; - version = "0.1.15"; + version = "0.1.19"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Chia-Network"; repo = "clvm_rs"; rev = version; - sha256 = "sha256-4QFreQlRjKqGhPvuXU/pZpxMfF8LkIf6X7C3K2q77MI="; + sha256 = "sha256-mCKY/PqNOUTaRsFDxQBvbTD6wC4qzP0uv5FldYkwl6c="; }; - patches = [ - # upstream forgot to refresh the lock file - ./bump-cargo-lock.patch - ]; - cargoDeps = rustPlatform.fetchCargoTarball { - inherit src patches; + inherit src; name = "${pname}-${version}"; - sha256 = "sha256-jPNU+P6JgxTPL1GYUBE4VPU3p6cgL8u/+AIELr7r5Mk="; + sha256 = "sha256-TmrR8EeySsGWXohMdo3dCX4oT3l9uLVv5TUeRxCBQeE="; }; format = "pyproject"; + buildAndTestSubdir = "wheel"; + nativeBuildInputs = [ perl # used by openssl-sys to configure + maturin_0_11 ] ++ (with rustPlatform; [ cargoSetupHook maturinBuildHook diff --git a/nixpkgs/pkgs/development/python-modules/cmarkgfm/default.nix b/nixpkgs/pkgs/development/python-modules/cmarkgfm/default.nix index c0863a5b3945..d609508822e4 100644 --- a/nixpkgs/pkgs/development/python-modules/cmarkgfm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cmarkgfm/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "cmarkgfm"; - version = "0.7.0"; + version = "0.8.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-plwVL52ov4JxTxnCh/4JaO6Of4mejZRQPXPQ/lcinBk="; + sha256 = "sha256-/oWbDpjSIrS0WAIgB9qsJ1fpcPBnHUXlXQGTHBtLs8s="; }; propagatedNativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/connexion/default.nix b/nixpkgs/pkgs/development/python-modules/connexion/default.nix index a077b828264c..6ccd3c98c213 100644 --- a/nixpkgs/pkgs/development/python-modules/connexion/default.nix +++ b/nixpkgs/pkgs/development/python-modules/connexion/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "connexion"; - version = "2.11.2"; + version = "2.12.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "zalando"; repo = pname; rev = version; - sha256 = "sha256-kFNKRWl/Q8vxIELQURfzCRbVs2JYUwbKro/zKlzNcHU="; + sha256 = "sha256-JMuI3h0Pg7nCXrJtF0fhSFJTOWelEqcvmqv3ooIfkqM="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/cons/default.nix b/nixpkgs/pkgs/development/python-modules/cons/default.nix new file mode 100644 index 000000000000..2977051d87b2 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/cons/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, logical-unification +, pytestCheckHook +, pytest-html +}: + +buildPythonPackage rec { + pname = "cons"; + version = "0.4.5"; + + src = fetchFromGitHub { + owner = "pythological"; + repo = "python-cons"; + rev = "fbeedfc8a3d1bff4ba179d492155cdd55538365e"; + sha256 = "sha256-ivHFep9iYPvyiBIZKMAzqrLGnQkeuxd0meYMZwZFFH0="; + }; + + propagatedBuildInputs = [ + logical-unification + ]; + + checkInputs = [ + pytestCheckHook + pytest-html + ]; + + pytestFlagsArray = [ + "--html=testing-report.html" + "--self-contained-html" + ]; + + pythonImportsCheck = [ "cons" ]; + + meta = with lib; { + description = "An implementation of Lisp/Scheme-like cons in Python"; + homepage = "https://github.com/pythological/python-cons"; + changelog = "https://github.com/pythological/python-cons/releases"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ Etjean ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/coqui-trainer/default.nix b/nixpkgs/pkgs/development/python-modules/coqui-trainer/default.nix new file mode 100644 index 000000000000..5ff53b8eb753 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/coqui-trainer/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +, coqpit +, fsspec +, pytorch-bin + +, pytestCheckHook +, soundfile +, tensorboardx +, torchvision +}: + +let + pname = "coqui-trainer"; + version = "0.0.4"; +in +buildPythonPackage { + inherit pname version; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "coqui-ai"; + repo = "Trainer"; + # https://github.com/coqui-ai/Trainer/issues/4 + rev = "776eba829231543d3207927fc69b321d121e527c"; + hash = "sha256-ICveftJjBNsCgegTmd/ewd/Y6XGMg7YOvchx640RFPI="; + }; + + propagatedBuildInputs = [ + coqpit + fsspec + pytorch-bin + soundfile + tensorboardx + ]; + + # tests are failing; tests require the clearml library + # https://github.com/coqui-ai/Trainer/issues/5 + doCheck = false; + + checkInputs = [ + pytestCheckHook + torchvision + ]; + + pythonImportsCheck = [ + "trainer" + ]; + + meta = with lib; { + description = "A general purpose model trainer, as flexible as it gets"; + homepage = "https://github.com/coqui-ai/Trainer"; + license = licenses.asl20; + maintainers = teams.tts.members; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/cssutils/default.nix b/nixpkgs/pkgs/development/python-modules/cssutils/default.nix index 6c1c5de2c56a..265504938df9 100644 --- a/nixpkgs/pkgs/development/python-modules/cssutils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cssutils/default.nix @@ -4,6 +4,7 @@ , pythonOlder , fetchpatch , fetchPypi +, setuptools , setuptools-scm , toml , importlib-metadata @@ -11,28 +12,24 @@ , lxml , mock , pytestCheckHook +, importlib-resources }: buildPythonPackage rec { pname = "cssutils"; - version = "2.3.0"; + version = "2.4.0"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; + + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-stOxYEfKroLlxZADaTW6+htiHPRcLziIWvS+SDjw/QA="; + hash = "sha256-LZchCoOwo/4eRGn1/5pkILB4VyA1GIsbq3EDw6NtyJs="; }; - patches = lib.optionals (pythonAtLeast "3.10") [ - # fix tests for python3.10 - (fetchpatch { - url = "https://github.com/jaraco/cssutils/pull/17/commits/355b1795dde77bd4b49d8df35377230fdb503802.patch"; - sha256 = "sha256-hwe8oeZO2rq00cs079lje3wjQDEczAu3Tfy/X/M9+GQ="; - }) - ]; - nativeBuildInputs = [ + setuptools setuptools-scm toml ]; @@ -46,6 +43,8 @@ buildPythonPackage rec { lxml mock pytestCheckHook + ] ++ lib.optionals (pythonOlder "3.9") [ + importlib-resources ]; disabledTests = [ @@ -53,11 +52,6 @@ buildPythonPackage rec { "test_parseUrl" "encutils" "website.logging" - ] ++ lib.optionals (pythonOlder "3.9") [ - # AttributeError: module 'importlib.resources' has no attribute 'files' - "test_parseFile" - "test_parseString" - "test_combine" ]; pythonImportsCheck = [ "cssutils" ]; diff --git a/nixpkgs/pkgs/development/python-modules/cupy/default.nix b/nixpkgs/pkgs/development/python-modules/cupy/default.nix index 250d337a07f6..2ae38e50513a 100644 --- a/nixpkgs/pkgs/development/python-modules/cupy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cupy/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "cupy"; - version = "10.1.0"; + version = "10.2.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "ad28e7311b2023391f2278b7649828decdd9d9599848e18845eb4ab1b2d01936"; + sha256 = "sha256-5ovvA76QGOsOnVztMfDgLerks5nJrKR08rLc+ArmWA8="; }; preConfigure = '' diff --git a/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix b/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix index 79ed1ebac5f2..73609966ba84 100644 --- a/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "cvxpy"; - version = "1.1.18"; + version = "1.2.0"; format = "pyproject"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-W67+Hy7Wk3dJspNYbGzk9C7TDniQIj92Ycyyu333C+8="; + sha256 = "sha256-QURm/ehJovqr/ZRE7ILKLnvxQsAdcjdSTPlzCt60IBw="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/dasbus/default.nix b/nixpkgs/pkgs/development/python-modules/dasbus/default.nix new file mode 100644 index 000000000000..96a4eccbc582 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/dasbus/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi, pygobject3, dbus }: + +buildPythonPackage rec { + pname = "dasbus"; + version = "1.6"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-FJrY/Iw9KYMhq1AVm1R6soNImaieR+IcbULyyS5W6U0="; + }; + + propagatedBuildInputs = [ pygobject3 ]; + checkInputs = [ dbus ]; + + meta = with lib; { + homepage = "https://github.com/rhinstaller/dasbus"; + description = "DBus library in Python3"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ fortuneteller2k ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/dash/default.nix b/nixpkgs/pkgs/development/python-modules/dash/default.nix index 004d42a81df3..dc0813acefa6 100644 --- a/nixpkgs/pkgs/development/python-modules/dash/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dash/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dash"; - version = "2.2.0"; + version = "2.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "plotly"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ul3j1BJd3lKzGCEhPFYxZG0CcAqAZqmOEDi8vGPFItw="; + sha256 = "sha256-iH56c2PO1G/NlLmYC+6sdAMZ+kXvUkpkqxfnl9EmDsQ="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/dask/default.nix b/nixpkgs/pkgs/development/python-modules/dask/default.nix index 0358083c3a57..7af0eca747e8 100644 --- a/nixpkgs/pkgs/development/python-modules/dask/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dask/default.nix @@ -18,12 +18,11 @@ , pythonOlder , pyyaml , toolz -, withExtraComplete ? false }: buildPythonPackage rec { pname = "dask"; - version = "2022.01.0"; + version = "2022.02.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -32,8 +31,7 @@ buildPythonPackage rec { owner = "dask"; repo = pname; rev = version; - sha256 = "sha256-HlVvnhEDzefzv9xchlXl9d4KCumoAqoYUWmIiCXLJyM= -"; + hash = "sha256-tDqpIS8j6a16YbJak+P1GkCEZvJyheWV5vkUrkhScRY="; }; propagatedBuildInputs = [ @@ -47,9 +45,6 @@ buildPythonPackage rec { jinja2 bokeh numpy - ] ++ lib.optionals (withExtraComplete) [ - # infinite recursion between distributed and dask - distributed ]; doCheck = true; @@ -105,6 +100,10 @@ buildPythonPackage rec { "dask.diagnostics" ]; + passthru.extras-require = { + complete = [ distributed ]; + }; + meta = with lib; { description = "Minimal task scheduling abstraction"; homepage = "https://dask.org/"; diff --git a/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix b/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix index f77b279eb64f..d242c59acdbd 100644 --- a/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "databricks-connect"; - version = "9.1.9"; + version = "9.1.10"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/I0yMrh2OinvSeMX8C10Y64FuD/nr3dOKIN3Pkb3Zrs="; + sha256 = "sha256-OR3TXO6IzqwqbBbfFf+FGIUbwTa0DoKry84e1hL0I3Q="; }; sourceRoot = "."; diff --git a/nixpkgs/pkgs/development/python-modules/datamodeldict/default.nix b/nixpkgs/pkgs/development/python-modules/datamodeldict/default.nix index b87ce1803c0d..145342a60a36 100644 --- a/nixpkgs/pkgs/development/python-modules/datamodeldict/default.nix +++ b/nixpkgs/pkgs/development/python-modules/datamodeldict/default.nix @@ -1,27 +1,38 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , xmltodict }: buildPythonPackage rec { - version = "0.9.8"; - pname = "DataModelDict"; + pname = "datamodeldict"; + version = "0.9.9"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - sha256 = "65c36954efa17449c69a4d8cb11c9273593ef01428cd77a609ee134eba771550"; + pname = "DataModelDict"; + inherit version; + hash = "sha256-DadBRsc8qEu9PWgMNllGS2ESKL7kgBLDhg4yDr87WRk="; }; - propagatedBuildInputs = [ xmltodict ]; + propagatedBuildInputs = [ + xmltodict + ]; # no tests doCheck = false; + pythonImportsCheck = [ + "DataModelDict" + ]; + meta = with lib; { - homepage = "https://github.com/usnistgov/DataModelDict/"; description = "Class allowing for data models equivalently represented as Python dictionaries, JSON, and XML"; + homepage = "https://github.com/usnistgov/DataModelDict/"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/datashader/default.nix b/nixpkgs/pkgs/development/python-modules/datashader/default.nix index d4515b064833..152582f6716f 100644 --- a/nixpkgs/pkgs/development/python-modules/datashader/default.nix +++ b/nixpkgs/pkgs/development/python-modules/datashader/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { param pyct scipy - ]; + ] ++ dask.extras-require.complete; checkInputs = [ pytestCheckHook diff --git a/nixpkgs/pkgs/development/python-modules/decopatch/default.nix b/nixpkgs/pkgs/development/python-modules/decopatch/default.nix index 92c2c27de2f6..71e302a8b538 100644 --- a/nixpkgs/pkgs/development/python-modules/decopatch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/decopatch/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "decopatch"; - version = "1.4.9"; + version = "1.4.10"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-tYgsjPDVsB0hi04E9nYtB7ModCDqUJcG9Zlxw9b+xW8="; + hash = "sha256-lX9JyT9BUBgsI/j7UdE7syE+DxenngnIzKcFdZi1VyA="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/deep-translator/default.nix b/nixpkgs/pkgs/development/python-modules/deep-translator/default.nix index 0f67b2ae3529..fd6d4d478f46 100644 --- a/nixpkgs/pkgs/development/python-modules/deep-translator/default.nix +++ b/nixpkgs/pkgs/development/python-modules/deep-translator/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "deep-translator"; - version = "1.7.0"; + version = "1.8.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-k4RhUZN/aC9D1NKkmCGZGZNU9In577RobBnDagMYHbo="; + sha256 = "sha256-2u4ZmLUEOwbN2sbPgLu9R1VdNevXBP4lBFuGw2aiRMg="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/deezer-py/default.nix b/nixpkgs/pkgs/development/python-modules/deezer-py/default.nix index a05c7335214e..f36a73fc27d1 100644 --- a/nixpkgs/pkgs/development/python-modules/deezer-py/default.nix +++ b/nixpkgs/pkgs/development/python-modules/deezer-py/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "deezer-py"; - version = "1.3.6"; + version = "1.3.7"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "a3ef151f7971d69769e7393f71373eaf896bccd22167213872ae46e04e14a2d7"; + sha256 = "sha256-saMy+IeAy6H9SgS8XHnZ9klFerGyr+vQqhuCtimgbEo="; }; propagatedBuildInputs = [ requests ]; diff --git a/nixpkgs/pkgs/development/python-modules/distributed/default.nix b/nixpkgs/pkgs/development/python-modules/distributed/default.nix index 08e38f2a1498..ee86418a6651 100644 --- a/nixpkgs/pkgs/development/python-modules/distributed/default.nix +++ b/nixpkgs/pkgs/development/python-modules/distributed/default.nix @@ -19,20 +19,17 @@ buildPythonPackage rec { pname = "distributed"; - version = "2021.12.0"; - disabled = pythonOlder "3.6"; + version = "2022.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; # get full repository need conftest.py to run tests src = fetchPypi { inherit pname version; - sha256 = "c6119a2cf1fb2d8ac60337915bb9a790af6530afcb5d7a809a3308323b874714"; + hash = "sha256-Gi9u7JczpnAEg53E7N5tXBfAeWZaLBVzRU3SpbU3bZU="; }; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "dask == 2021.11.2" "dask" - ''; - propagatedBuildInputs = [ bokeh click @@ -49,10 +46,17 @@ buildPythonPackage rec { zict ]; + postPatch = '' + substituteInPlace requirements.txt \ + --replace "dask == 2022.02.0" "dask" + ''; + # when tested random tests would fail and not repeatably doCheck = false; - pythonImportsCheck = [ "distributed" ]; + pythonImportsCheck = [ + "distributed" + ]; meta = with lib; { description = "Distributed computation in Python"; diff --git a/nixpkgs/pkgs/development/python-modules/django-configurations/default.nix b/nixpkgs/pkgs/development/python-modules/django-configurations/default.nix index 4cb23d989fae..4bddb62bdd1a 100644 --- a/nixpkgs/pkgs/development/python-modules/django-configurations/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-configurations/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "django-configurations"; - version = "2.3.1"; + version = "2.3.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "e2ca25530e184f0ee3b7f5ae69563461a93a8914493306ee0bf6d71e7d8ad1d0"; + sha256 = "bd1a77a60735839b7d105912cc3977735fa005ea06544c632fbd322d1e021677"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/django-dynamic-preferences/default.nix b/nixpkgs/pkgs/development/python-modules/django-dynamic-preferences/default.nix index 9f04f25f4648..c9a0f10947ea 100644 --- a/nixpkgs/pkgs/development/python-modules/django-dynamic-preferences/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-dynamic-preferences/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "django-dynamic-preferences"; - version = "1.11.0"; + version = "1.12.0"; src = fetchPypi { inherit pname version; - sha256 = "f214c938b5872a17647e2b2ccfd9ad00a90a3c6c4aa83fa65d3c5c446e7a66c7"; + sha256 = "sha256-zYmHz45N024BmtPoolxYm8S0EMpKZs38vlwlpRenwK0="; }; propagatedBuildInputs = [ six django persisting-theory ]; diff --git a/nixpkgs/pkgs/development/python-modules/django/4.nix b/nixpkgs/pkgs/development/python-modules/django/4.nix index eb24edb4bff1..57c752725d58 100644 --- a/nixpkgs/pkgs/development/python-modules/django/4.nix +++ b/nixpkgs/pkgs/development/python-modules/django/4.nix @@ -39,14 +39,14 @@ buildPythonPackage rec { pname = "Django"; - version = "4.0.2"; + version = "4.0.3"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-EQ+1j7Euylngcq1Z/ELXcc1kLdei8kFlgqqdp6jvlUo="; + hash = "sha256-d/8ucFDjMkybZ+KbZwd1RWb1hRQRKprHMxD2DNUmGTA="; }; patches = lib.optional withGdal diff --git a/nixpkgs/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix b/nixpkgs/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix index 4c616bdeb274..d84a542d0bba 100644 --- a/nixpkgs/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "djangorestframework-simplejwt"; - version = "5.0.0"; + version = "5.1.0"; src = fetchPypi { pname = "djangorestframework_simplejwt"; inherit version; - sha256 = "30b10e7732395c44d21980f773214d2b9bdeadf2a6c6809cd1a7c9abe272873c"; + sha256 = "sha256-dTI1KKe5EIQ7h5GUdG8OvDSBxK2fNU3i3RYhYGYvuVo="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/downloader-cli/default.nix b/nixpkgs/pkgs/development/python-modules/downloader-cli/default.nix index 9d99709c9166..40cfd888a5d4 100644 --- a/nixpkgs/pkgs/development/python-modules/downloader-cli/default.nix +++ b/nixpkgs/pkgs/development/python-modules/downloader-cli/default.nix @@ -1,25 +1,37 @@ -{ lib, buildPythonPackage, fetchFromGitHub, urllib3 }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, urllib3 +, pythonOlder +}: buildPythonPackage rec { pname = "downloader-cli"; - version = "0.3.2"; + version = "0.3.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "deepjyoti30"; repo = pname; rev = version; - sha256 = "0hjwy3qa6al6p35pv01sdl3szh7asf6vlmhwjbkpppn4zi239k0y"; + hash = "sha256-Dl5XIvdZInz+edL9uQv7V6Kc6FB+7hFAGe/nybnqvQU="; }; - propagatedBuildInputs = [ urllib3 ]; + propagatedBuildInputs = [ + urllib3 + ]; # Disable checks due to networking (Errno 101) doCheck = false; - pythonImportsCheck = [ "downloader_cli" ]; + pythonImportsCheck = [ + "downloader_cli" + ]; meta = with lib; { - description = "A simple downloader written in Python with an awesome customizable progressbar. "; + description = "Downloader 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/dropbox/default.nix b/nixpkgs/pkgs/development/python-modules/dropbox/default.nix index 8f53ff4ebbf7..2e2490568e9d 100644 --- a/nixpkgs/pkgs/development/python-modules/dropbox/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dropbox/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dropbox"; - version = "11.27.0"; + version = "11.28.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "dropbox"; repo = "dropbox-sdk-python"; rev = "v${version}"; - sha256 = "sha256-atIrrK4BgTfu0UaHTqJ66AxEeSJLanrmYx8myrOCOfo="; + sha256 = "sha256-xNenBmeCRIYxQqAkV8IDpPpIHyVAYJs1jAFr8w1tz2Y="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/elastic-apm/default.nix b/nixpkgs/pkgs/development/python-modules/elastic-apm/default.nix index bf78fec5e5d3..f273b1a6428c 100644 --- a/nixpkgs/pkgs/development/python-modules/elastic-apm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/elastic-apm/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "elastic-apm"; - version = "6.7.2"; + version = "6.8.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "elastic"; repo = "apm-agent-python"; rev = "v${version}"; - sha256 = "sha256-NyoFJ3HVxE3AdCCZCZrEk4dDiTIv9cGZYPHVre/PMO4="; + sha256 = "sha256-5G+ALFDEClItXvSQFGari0QdhW+RGV8FukxUoxqphFg="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/elkm1-lib/default.nix b/nixpkgs/pkgs/development/python-modules/elkm1-lib/default.nix index 05625f928396..6e30203ad0f8 100644 --- a/nixpkgs/pkgs/development/python-modules/elkm1-lib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/elkm1-lib/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "elkm1-lib"; - version = "1.0.0"; + version = "1.2.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "gwww"; repo = "elkm1"; rev = version; - sha256 = "04xidix6l5d9rqfwp6cmj6wvais04nlvz5ynp0zwgyjp9sh2nhp6"; + hash = "sha256-+rFW7qFpay/ebUz9EEB8nn0kuqVtVmG5ZHOWG2bMPts="; }; nativeBuildInputs = [ @@ -36,15 +36,6 @@ buildPythonPackage rec { pytestCheckHook ]; - patches = [ - # Switch to poetry-core, https://github.com/gwww/elkm1/pull/45 - (fetchpatch { - name = "switch-to-poetry-core.patch"; - url = "https://github.com/gwww/elkm1/commit/807a17268498298908bf82af4933b158b37c8f32.patch"; - sha256 = "1539g8wsxppqj6dm6w81ps05frb8vrfaxahxn2cqs76zdhvly3p9"; - }) - ]; - pythonImportsCheck = [ "elkm1_lib" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/emoji/default.nix b/nixpkgs/pkgs/development/python-modules/emoji/default.nix index 76579e4dd89f..84a709ac5392 100644 --- a/nixpkgs/pkgs/development/python-modules/emoji/default.nix +++ b/nixpkgs/pkgs/development/python-modules/emoji/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "emoji"; - version = "1.6.3"; + version = "1.7.0"; src = fetchFromGitHub { owner = "carpedm20"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0QOtsHGhqbjaEDpSbUXdE8+u6xzWbrTexx+BAeYwKa8="; + sha256 = "sha256-vKQ51RP7uy57vP3dOnHZRSp/Wz+YDzeLUR8JnIELE/I="; }; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/etuples/default.nix b/nixpkgs/pkgs/development/python-modules/etuples/default.nix new file mode 100644 index 000000000000..bfb4552732b2 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/etuples/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cons +, multipledispatch +, pytestCheckHook +, pytest-html +}: + +buildPythonPackage rec { + pname = "etuples"; + version = "0.3.4"; + + src = fetchFromGitHub { + owner = "pythological"; + repo = "etuples"; + rev = "35d760ceb64ec318f302a6e4d3a4a80feda97a9e"; + sha256 = "sha256-CXD8MhsdWYAcG5WDVTT/A2HDtiO1xfQbrwlYVnxXpBU="; + }; + + propagatedBuildInputs = [ + cons + multipledispatch + ]; + + checkInputs = [ + pytestCheckHook + pytest-html + ]; + + pytestFlagsArray = [ + "--html=testing-report.html" + "--self-contained-html" + ]; + + pythonImportsCheck = [ "etuples" ]; + + meta = with lib; { + description = "Python S-expression emulation using tuple-like objects"; + homepage = "https://github.com/pythological/etuples"; + changelog = "https://github.com/pythological/etuples/releases"; + license = licenses.asl20; + maintainers = with maintainers; [ Etjean ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/fastapi/default.nix b/nixpkgs/pkgs/development/python-modules/fastapi/default.nix index ec14e956c3fd..6f0a39a7b2d2 100644 --- a/nixpkgs/pkgs/development/python-modules/fastapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fastapi/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "fastapi"; - version = "0.73.0"; + version = "0.75.0"; format = "flit"; disabled = pythonOlder "3.6"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "tiangolo"; repo = pname; rev = version; - sha256 = "0v3w9b8107b3g2rgy5y58f0p64inhwl1j9cybp627myypwpqx4b7"; + sha256 = "sha256-LCdScvQUdwOM8Don/5n/49bKrivT+bkhqWcBNku4fso="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/fastavro/default.nix b/nixpkgs/pkgs/development/python-modules/fastavro/default.nix index 935eefa5182f..fcd65f1f317a 100644 --- a/nixpkgs/pkgs/development/python-modules/fastavro/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fastavro/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "fastavro"; - version = "1.4.9"; + version = "1.4.10"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0af6d67s6mi9ylqla8nga6cj4y0y4gp3l2q68br2mrdyivkml0g0"; + sha256 = "sha256-JTNRm/nCQckAZrVTgcJVP3bLE53QPtccdoDcGLbP6BE="; }; preBuild = '' diff --git a/nixpkgs/pkgs/development/python-modules/fastcore/default.nix b/nixpkgs/pkgs/development/python-modules/fastcore/default.nix index 4783b8d33c78..9d0ce4f2ec72 100644 --- a/nixpkgs/pkgs/development/python-modules/fastcore/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fastcore/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "fastcore"; - version = "1.3.27"; + version = "1.3.29"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "fastai"; repo = pname; rev = version; - sha256 = "sha256-ogCNDh18FHP9KY0q0BIbsjPH5vGGioGh4FFUUb3c3Jc="; + sha256 = "sha256-V5mJJqWsCy8Wes8VzEkCKeb2/1ahvtbUO80R8IFLvNU="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/fastprogress/default.nix b/nixpkgs/pkgs/development/python-modules/fastprogress/default.nix index 2164bc93f622..cd1b4e3bbacf 100644 --- a/nixpkgs/pkgs/development/python-modules/fastprogress/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fastprogress/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "fastprogress"; - version = "1.0.0"; + version = "1.0.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1zhv37q6jkqd1pfhlkd4yzrc3dg83vyksgzf32mjlhd5sb0qmql9"; + sha256 = "sha256-lga6RCUFo6RFgdY97dzlv/HfF6y9w3JS98PxvlLB0kM="; }; propagatedBuildInputs = [ numpy ]; diff --git a/nixpkgs/pkgs/development/python-modules/fe25519/default.nix b/nixpkgs/pkgs/development/python-modules/fe25519/default.nix index 05afcff5627c..216a84b9ec6a 100644 --- a/nixpkgs/pkgs/development/python-modules/fe25519/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fe25519/default.nix @@ -6,16 +6,19 @@ , parts , nose , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "fe25519"; - version = "1.1.0"; + version = "1.2.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-3WFpbt4bA7zPlK+mp5DJXdgk44MBimCbpIMhRjZ5p0o="; + hash = "sha256-Hzdt8932WonJAaQPtL346JFPqxFXkNW4XQvbQlSoJJE="; }; propagatedBuildInputs = [ @@ -29,6 +32,11 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace " --cov=fe25519 --cov-report term-missing" "" + ''; + pythonImportsCheck = [ "fe25519" ]; diff --git a/nixpkgs/pkgs/development/python-modules/ffmpeg-python/default.nix b/nixpkgs/pkgs/development/python-modules/ffmpeg-python/default.nix index 1f8c6983cbd8..f514cf325371 100644 --- a/nixpkgs/pkgs/development/python-modules/ffmpeg-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ffmpeg-python/default.nix @@ -1,25 +1,38 @@ { lib , buildPythonPackage , fetchFromGitHub -, substituteAll -, pytestCheckHook , ffmpeg , future -, pytest-runner , pytest-mock +, pytestCheckHook +, pythonAtLeast +, pythonOlder +, substituteAll }: buildPythonPackage rec { pname = "ffmpeg-python"; version = "0.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "kkroening"; repo = "ffmpeg-python"; rev = version; - sha256 = "0mmydmfz3yiclbgi4lqrv9fh2nalafg4bkm92y2qi50mwqgffk8f"; + hash = "sha256-Dk3nHuYVlIiFF6nORZ5TVFkBXdoZUxLfoiz68V1tvlY="; }; + propagatedBuildInputs = [ + future + ]; + + checkInputs = [ + pytestCheckHook + pytest-mock + ]; + patches = [ (substituteAll { src = ./ffmpeg-location.patch; @@ -27,14 +40,23 @@ buildPythonPackage rec { }) ]; - buildInputs = [ pytest-runner ]; - propagatedBuildInputs = [ future ]; - checkInputs = [ pytestCheckHook pytest-mock ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "'pytest-runner'" "" + ''; + + pythonImportsCheck = [ + "ffmpeg" + ]; + + disabledTests = lib.optionals (pythonAtLeast "3.10") [ + "test__output__video_size" + ]; meta = with lib; { description = "Python bindings for FFmpeg - with complex filtering support"; homepage = "https://github.com/kkroening/ffmpeg-python"; license = licenses.asl20; - maintainers = [ maintainers.AluisioASG ]; + maintainers = with maintainers; [ AluisioASG ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/fiblary3-fork/default.nix b/nixpkgs/pkgs/development/python-modules/fiblary3-fork/default.nix new file mode 100644 index 000000000000..e2c53c3e417b --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/fiblary3-fork/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, isPy3k +, fetchPypi +, fixtures +, jsonpatch +, netaddr +, prettytable +, python-dateutil +, pytestCheckHook +, requests +, requests-mock +, six +, sphinx +, testtools +}: + +buildPythonPackage rec { + pname = "fiblary3-fork"; + version = "0.1.12"; + + src = fetchPypi { + inherit pname version; + sha256 = "001wqh7gx2dv3sf7a5xsbppz9r88f5qwrp05jzjsjcm6cbcvmsz0"; + }; + + propagatedBuildInputs = [ + jsonpatch + netaddr + prettytable + python-dateutil + requests + six + ]; + + checkInputs = [ + fixtures + pytestCheckHook + requests-mock + testtools + ]; + + pythonImportsCheck = [ "fiblary3" ]; + + meta = with lib; { + homepage = "https://github.com/graham33/fiblary"; + description = "Fibaro Home Center API Python Library"; + license = licenses.asl20; + maintainers = with maintainers; [ graham33 ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/fiona/default.nix b/nixpkgs/pkgs/development/python-modules/fiona/default.nix index f8fc454e05ee..3cd8eef93277 100644 --- a/nixpkgs/pkgs/development/python-modules/fiona/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fiona/default.nix @@ -49,14 +49,6 @@ buildPythonPackage rec { disabledTests = [ # Some tests access network, others test packaging "http" "https" "wheel" - # Assert not true - "test_no_append_driver_cannot_append" - ] ++ lib.optionals stdenv.isAarch64 [ - # https://github.com/Toblerity/Fiona/issues/1012 the existence of this - # as a bug hasn't been challenged and other distributors seem to also - # be skipping these tests on aarch64, so this is not unique to nixpkgs. - "test_write_or_driver_error" - "test_append_or_driver_error" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/fleep/0001-Fixing-paths-on-tests.patch b/nixpkgs/pkgs/development/python-modules/fleep/0001-Fixing-paths-on-tests.patch new file mode 100644 index 000000000000..234bf0cb379b --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/fleep/0001-Fixing-paths-on-tests.patch @@ -0,0 +1,48 @@ +From 716fcfa3203bc881b543916bdb9a17460951cd26 Mon Sep 17 00:00:00 2001 +From: "P. R. d. O" <d.ol.rod@protonmail.com> +Date: Fri, 26 Nov 2021 07:13:32 -0600 +Subject: [PATCH] Fixing paths on tests + +--- + tests/maintest.py | 7 ++++++- + tests/speedtest.py | 7 ++++++- + 2 files changed, 12 insertions(+), 2 deletions(-) + +diff --git a/tests/maintest.py b/tests/maintest.py +index 0e24ca4..3484437 100644 +--- a/tests/maintest.py ++++ b/tests/maintest.py +@@ -1,6 +1,11 @@ + import fleep ++import os + +-with open("testfile", "rb") as file: ++current_dir = os.path.realpath(os.path.join(os.getcwd(), ++ os.path.dirname(__file__))) ++ ++with open(os.path.join(current_dir, "./testfile"), ++ "rb") as file: + info = fleep.get(file.read(128)) + + assert info.type == ["raster-image"] +diff --git a/tests/speedtest.py b/tests/speedtest.py +index 89338ab..829d563 100644 +--- a/tests/speedtest.py ++++ b/tests/speedtest.py +@@ -1,7 +1,12 @@ + import time + import fleep ++import os + +-with open("testfile", "rb") as file: ++current_dir = os.path.realpath(os.path.join(os.getcwd(), ++ os.path.dirname(__file__))) ++ ++with open(os.path.join(current_dir, "./testfile"), ++ "rb") as file: + stream = file.read(128) + + times = [] +-- +2.33.1 + diff --git a/nixpkgs/pkgs/development/python-modules/fleep/default.nix b/nixpkgs/pkgs/development/python-modules/fleep/default.nix new file mode 100644 index 000000000000..04b607325136 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/fleep/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, python +}: + +buildPythonPackage rec { + pname = "fleep"; + version = "1.0.1"; + + # Pypi version does not have tests + src = fetchFromGitHub { + owner = "floyernick"; + repo = "fleep-py"; + rev = "994bc2c274482d80ab13d89d8f7343eb316d3e44"; + sha256 = "sha256-TaU7njx98nxkhZawGMFqWj4g+yCtIX9aPWQHoamzfMY="; + }; + + patches = [ + ./0001-Fixing-paths-on-tests.patch + ]; + + checkPhase = '' + ${python.interpreter} tests/maintest.py + ${python.interpreter} tests/speedtest.py + ''; + + pythonImportsCheck = [ "fleep" ]; + + meta = with lib; { + description = "File format determination library"; + homepage = "https://github.com/floyernick/fleep-py"; + license = licenses.mit; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/flipr-api/default.nix b/nixpkgs/pkgs/development/python-modules/flipr-api/default.nix index 418c7cf42fef..1a53b46c4463 100644 --- a/nixpkgs/pkgs/development/python-modules/flipr-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flipr-api/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , poetry-core , requests-mock , pythonOlder @@ -13,7 +12,7 @@ buildPythonPackage rec { pname = "flipr-api"; - version = "1.4.1"; + version = "1.4.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -22,7 +21,7 @@ buildPythonPackage rec { owner = "cnico"; repo = pname; rev = version; - sha256 = "00qkzr2g38fpa7ndnbfx9m4d50lmz0j74nkxif3amnkbl4m6l5vn"; + sha256 = "sha256-/G92WkWUr3T5T7VVzMERFVmLDfLz6m9rlZLQZCBQbCI="; }; nativeBuildInputs = [ @@ -40,17 +39,10 @@ buildPythonPackage rec { pytestCheckHook ]; - patches = [ - # Switch to poetry-core, https://github.com/cnico/flipr-api/pull/4 - (fetchpatch { - name = "switch-to-poetry-core.patch"; - url = "https://github.com/cnico/flipr-api/commit/f14be1dfd4f46d4d43d9ea47e51cafca3cc18e86.patch"; - sha256 = "1fdi19cq21zcjx4g132k480yhi5y0x5qj2l0h8k5zky5cdxs58r6"; - }) + pythonImportsCheck = [ + "flipr_api" ]; - pythonImportsCheck = [ "flipr_api" ]; - meta = with lib; { description = "Python client for Flipr API"; homepage = "https://github.com/cnico/flipr-api"; diff --git a/nixpkgs/pkgs/development/python-modules/flux-led/default.nix b/nixpkgs/pkgs/development/python-modules/flux-led/default.nix index 873b26a29f9d..f07efbee7f30 100644 --- a/nixpkgs/pkgs/development/python-modules/flux-led/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flux-led/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "flux-led"; - version = "0.28.26"; + version = "0.28.27"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "flux_led"; rev = version; - sha256 = "sha256-t8SE+TU9OW/iQHVLbEdTgX4azXendKSgJQ4/QpDSkL8="; + sha256 = "sha256-Z1NgQo4BrfdPAwoELzyjZphmuvPK/c09j/BvDOWaD9I="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/fontparts/default.nix b/nixpkgs/pkgs/development/python-modules/fontparts/default.nix index 7c04c54d424c..7830cb117128 100644 --- a/nixpkgs/pkgs/development/python-modules/fontparts/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fontparts/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "fontParts"; - version = "0.10.2"; + version = "0.10.3"; src = fetchPypi { inherit pname version; - sha256 = "a3a3926e977f82ae19e6823760b59f2338085973da1eaad5badaf969f261a737"; + sha256 = "sha256-aHtjLHdc2/s3ppF8fz8qFAqxwEKMZJJAFNlBaZ7FAb4="; extension = "zip"; }; diff --git a/nixpkgs/pkgs/development/python-modules/fountains/default.nix b/nixpkgs/pkgs/development/python-modules/fountains/default.nix index b869d583fc8d..e62eedf0468c 100644 --- a/nixpkgs/pkgs/development/python-modules/fountains/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fountains/default.nix @@ -2,16 +2,19 @@ , buildPythonPackage , fetchPypi , bitlist +, pythonOlder }: buildPythonPackage rec { pname = "fountains"; - version = "1.2.0"; + version = "1.3.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "6de6bc117c376f40a26e111111d638159a2e8a25cfe32f946db0d779decbb70a"; + sha256 = "sha256-c6nw22UtAREYZp0XCEZE6p7GpRvSLukq5y0c9KvVf9w="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/fsspec/default.nix b/nixpkgs/pkgs/development/python-modules/fsspec/default.nix index 9d538214c4b4..fb84371e2035 100644 --- a/nixpkgs/pkgs/development/python-modules/fsspec/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fsspec/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "fsspec"; - version = "2021.10.1"; + version = "2022.01.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "intake"; repo = "filesystem_spec"; rev = version; - sha256 = "sha256-LgrOHBXKs2bEgtgrdHb1OEhOeQ5Rbgr6X5YtgiqiCH0="; + sha256 = "sha256-iPe2q9hY3ZRIKQGpxrHda3t9G0AtbtohVcWdnAzlzCo="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/furo/default.nix b/nixpkgs/pkgs/development/python-modules/furo/default.nix index dd517a2f547e..615bf3ebe9c0 100644 --- a/nixpkgs/pkgs/development/python-modules/furo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/furo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "furo"; - version = "2022.2.14.1"; + version = "2022.3.4"; format = "wheel"; disable = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { inherit pname version format; dist = "py3"; python = "py3"; - sha256 = "sha256-18uBJgNGNyEjMjUOyEkMuVcy02UGsCQxiljO4ufeD9o="; + sha256 = "sha256-bHGCk+v4d1XwufFIseaXyeOqvXr5VWRNS8ruXOddt4E="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/garages-amsterdam/default.nix b/nixpkgs/pkgs/development/python-modules/garages-amsterdam/default.nix index 01ff36e63795..cc89020e4430 100644 --- a/nixpkgs/pkgs/development/python-modules/garages-amsterdam/default.nix +++ b/nixpkgs/pkgs/development/python-modules/garages-amsterdam/default.nix @@ -1,22 +1,23 @@ { lib +, aiohttp , buildPythonPackage , fetchFromGitHub -, pythonOlder , poetry-core -, aiohttp +, pythonOlder }: buildPythonPackage rec { pname = "garages-amsterdam"; - version = "3.2.1"; + version = "4.0.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "klaasnicolaas"; repo = "garages_amsterdam"; rev = "v${version}"; - sha256 = "16f2742r9p3mrg2nz8lnkgsxabbjga2qnp9vzq59026q6mmfwkm9"; + sha256 = "sha256-3YSCf5sUnq2+Bt7LA30XeIMg4zsaPF3K5SVzGZ68SbY="; }; postPatch = '' @@ -35,7 +36,9 @@ buildPythonPackage rec { # The only test requires network access doCheck = false; - pythonImportsCheck = [ "garages_amsterdam" ]; + pythonImportsCheck = [ + "garages_amsterdam" + ]; meta = with lib; { description = "Python client for getting garage occupancy in Amsterdam"; diff --git a/nixpkgs/pkgs/development/python-modules/gcsfs/default.nix b/nixpkgs/pkgs/development/python-modules/gcsfs/default.nix index 66d05f2a355b..518226f34dd2 100644 --- a/nixpkgs/pkgs/development/python-modules/gcsfs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gcsfs/default.nix @@ -18,15 +18,16 @@ buildPythonPackage rec { pname = "gcsfs"; - version = "2021.10.1"; + version = "2022.01.0"; + format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "fsspec"; repo = pname; rev = version; - sha256 = "sha256-cpV+HKE39Yct1yu5xW9HZftx2Wy9ydFL2YLvPD3YM2M="; + hash = "sha256-wNeK1GdjK9GKaaECcFeBLjFf/h3MbLI5e4MX0UNoTqE="; }; propagatedBuildInputs = [ @@ -47,11 +48,15 @@ buildPythonPackage rec { vcrpy ]; - disabledTests = [ - # Tests wants to communicate with the Link-local address - "test_GoogleCredentials_None" + disabledTestPaths = [ + # Tests require a running Docker instance + "gcsfs/tests/test_core.py" + "gcsfs/tests/test_mapping.py" + "gcsfs/tests/test_retry.py" ]; + pytestFlagsArray = [ "-x" ]; + pythonImportsCheck = [ "gcsfs" ]; diff --git a/nixpkgs/pkgs/development/python-modules/gdown/default.nix b/nixpkgs/pkgs/development/python-modules/gdown/default.nix index 180624ea8168..305fd93c9635 100644 --- a/nixpkgs/pkgs/development/python-modules/gdown/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gdown/default.nix @@ -11,12 +11,12 @@ buildPythonApplication rec { pname = "gdown"; - version = "4.3.0"; + version = "4.4.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-KswYue892Mlpa8wnPf9bt8MEJGtjGaMjlDt0TXGoEdE="; + sha256 = "sha256-GPw6TaSiJz3reqKcdIa+TfORnZBBWK1qaj4lyBFUcNc="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ge25519/default.nix b/nixpkgs/pkgs/development/python-modules/ge25519/default.nix index 5c9369e005b9..22c96920be6c 100644 --- a/nixpkgs/pkgs/development/python-modules/ge25519/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ge25519/default.nix @@ -7,16 +7,19 @@ , nose , parts , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "ge25519"; - version = "1.1.0"; + version = "1.2.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-0M9RF8tlEoLyduvY3RvltGAnsus3HF6FEy22b6w6aUs="; + hash = "sha256-8GsNY62SusUmQcaqlhKOPHbd0jvZulCaxMxeob37JJM="; }; propagatedBuildInputs = [ @@ -31,6 +34,12 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace " --cov=ge25519 --cov-report term-missing" "" + ''; + + pythonImportsCheck = [ "ge25519" ]; diff --git a/nixpkgs/pkgs/development/python-modules/gehomesdk/default.nix b/nixpkgs/pkgs/development/python-modules/gehomesdk/default.nix index b74ef29e5438..a4c9d2d7460d 100644 --- a/nixpkgs/pkgs/development/python-modules/gehomesdk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gehomesdk/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "gehomesdk"; - version = "0.4.23"; + version = "0.4.24"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-y8L0krMSAOFP97j5QQGiJJMhzRidhMgoHGsMYMyUdd8="; + sha256 = "sha256-20l3zNOvZVGucm1SFzmSjkj3iOXPQhp4T5sInTGO/aQ="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/geojson-client/default.nix b/nixpkgs/pkgs/development/python-modules/geojson-client/default.nix index 8c4eb2cdf1bf..64fbf0661159 100644 --- a/nixpkgs/pkgs/development/python-modules/geojson-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/geojson-client/default.nix @@ -6,17 +6,21 @@ , pytz , requests , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "geojson-client"; - version = "0.6"; + version = "0.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-geojson-client"; rev = "v${version}"; - sha256 = "sha256-8eSLimCgFRn3cHTz5TE9fAUAbwFO72b23C0lg6fVOLQ="; + sha256 = "sha256-7EhdIfVM6d5fp6k+RdX6z33O5sZGeF/ThNkSXL8EjE8="; }; propagatedBuildInputs = [ @@ -26,9 +30,13 @@ buildPythonPackage rec { requests ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "geojson_client" ]; + pythonImportsCheck = [ + "geojson_client" + ]; meta = with lib; { description = "Python module for convenient access to GeoJSON feeds"; diff --git a/nixpkgs/pkgs/development/python-modules/glcontext/default.nix b/nixpkgs/pkgs/development/python-modules/glcontext/default.nix index b091d2583b6b..fe25277e8cda 100644 --- a/nixpkgs/pkgs/development/python-modules/glcontext/default.nix +++ b/nixpkgs/pkgs/development/python-modules/glcontext/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "glcontext"; - version = "2.3.4"; + version = "2.3.5"; src = fetchFromGitHub { owner = "moderngl"; repo = pname; rev = version; - sha256 = "1m2zkl696vqmgrd5k1c5kl0krk6qgjgsz88qhahwva0l40bswvhp"; + sha256 = "sha256-wvoIfwd0UBooqbJGshADjf96Xqx2k9G1nN3Dy6v3GIY="; }; disabled = !isPy3k; diff --git a/nixpkgs/pkgs/development/python-modules/glean-parser/default.nix b/nixpkgs/pkgs/development/python-modules/glean-parser/default.nix index 52fdf6745c9f..30d4db0d2613 100644 --- a/nixpkgs/pkgs/development/python-modules/glean-parser/default.nix +++ b/nixpkgs/pkgs/development/python-modules/glean-parser/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "glean_parser"; - version = "5.0.1"; + version = "5.1.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MJ827VXy8e2CRyq4sY4d0B7etxBgRk4/hZybYOOLh9Q="; + sha256 = "sha256-8oMbaGsW5Lkw9OluNsXXe2IBNbjeoIb9vDjVOt+uHR0="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/glfw/default.nix b/nixpkgs/pkgs/development/python-modules/glfw/default.nix index ab42e8fffbfb..e9587d0b765c 100644 --- a/nixpkgs/pkgs/development/python-modules/glfw/default.nix +++ b/nixpkgs/pkgs/development/python-modules/glfw/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "glfw"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "FlorianRhiem"; repo = "pyGLFW"; rev = "v${version}"; - sha256 = "15kk0zhhja0yqah09wzpg6912zd5bjmk84ab1n5nwryicpg44hqk"; + sha256 = "sha256-XR6TqIrbCR93Qe9cRMgJ0aT/6ZZFj+6Mz+9GhiMD8lM="; }; # Patch path to GLFW shared object diff --git a/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix b/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix index 98339c851cd4..ef809dcf7002 100644 --- a/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "3.4.2"; + version = "3.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "globus"; repo = "globus-sdk-python"; rev = version; - hash = "sha256-QdeEaOP+gPWMqtUofTwrHRqLBtjG8Kta0LfZtccTjCQ="; + hash = "sha256-doyKTGPm4tpmLrXQgsDOGklG54HSN8VFCAXa4Q73Uos="; }; propagatedBuildInputs = [ 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 05963856edce..5861c66ca58d 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 @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "google-cloud-access-context-manager"; - version = "0.1.9"; + version = "0.1.10"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "249a1c1a858bb182b73749784457baacfcab8e7c13da5f3421109d5b8dace5b8"; + sha256 = "sha256-/qQxNUVAHKZ5Go4GYpJ9ATi/EeseJPMyK5HsQCjtL0o="; }; propagatedBuildInputs = [ 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 index 67296f667ab2..c6f17c8d8b00 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix @@ -7,15 +7,19 @@ , proto-plus , pytest-asyncio , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-appengine-logging"; - version = "1.1.0"; + version = "1.1.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "91fe9b0833f6e1a46293dcc0e483716372c9ff4a95ebe51276c5f0092cb9defd"; + hash = "sha256-NhRQ7X17/Y79DvJT4haArrb23zzwV+XoJT9YUfjLvKc="; }; propagatedBuildInputs = [ 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 4e25662b5796..d28cdbf08443 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "3.7.1"; + version = "3.8.1"; src = fetchPypi { inherit pname version; - sha256 = "848b3028d87358666c50b36253404c15d0a83686700c4586475997b1478d71d5"; + sha256 = "sha256-DvbHQV71hTsWtjN/D1+bHGLSss+UidCZRi3J0zTa07U="; }; 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 6cb405d3c146..be13251d2f4b 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -10,15 +10,19 @@ , proto-plus , pytest-asyncio , mock +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-automl"; - version = "2.6.0"; + version = "2.7.2"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "bcd3b2913c2eb83e356a457ad6e89a2a9505b2e9cb7be37055d6ce1f0fef20cf"; + hash = "sha256-CUsLMX0zRONChgzejZnBztth5ORMZyb6rj6mok2pMMU="; }; propagatedBuildInputs = [ 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 35c082e05632..2717af605ef3 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 @@ -8,19 +8,33 @@ , pytest-asyncio , pytz , mock +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.6.0"; + version = "3.6.1"; + format = "setuptools"; + disabled = pythonOlder "3.6"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-1syubhGCY8sYgV2mdneAV/8YOdplf5YZNEeZ0RAJC6E="; + hash = "sha256-hR5qHucBpq1LS9pIZeovcPMiVbw3dhSeeJxkYH8xuMk="; }; - propagatedBuildInputs = [ google-api-core libcst proto-plus pytz ]; - checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + propagatedBuildInputs = [ + google-api-core + libcst + proto-plus + pytz + ]; + + checkInputs = [ + mock + pytestCheckHook + pytest-asyncio + ]; pythonImportsCheck = [ "google.cloud.bigquery_datatransfer" 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 index 32988e35deac..c26d7582c23d 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-logging"; - version = "1.0.1"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "3cdbf4f82199d2ee0d07fa2c75527661fe034130e27e5c05fd070ed615cd7e23"; + sha256 = "sha256-i8Bh39MnQRQtE4WwDNhHdxFX2bGL6txT+sV8RcvXiZw="; }; propagatedBuildInputs = [ 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 1d5d1b9a6890..a7ee6a72913b 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "2.34.0"; + version = "2.34.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-K3XhnlPIWSRBIBgMcqGqmehJFW48BBMHGkv7rgt0xTA="; + sha256 = "sha256-DriC3zCgD1oe89M5ojpnAjCACyqySUWVkafmharWcU8="; }; propagatedBuildInputs = [ 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 6ef36c17796d..9ffa885ab4a5 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -8,15 +8,19 @@ , mock , proto-plus , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "2.5.1"; + version = "2.7.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zqyLJX3ufjIpdiS7Qw85R6K/2p2m1KbYtmH2DH/r0nE="; + hash = "sha256-TUgC/6IZ9kNE5iDtbhKPHJqo3sv9W+nl7KcxuXfrbyM="; }; propagatedBuildInputs = [ @@ -51,6 +55,6 @@ buildPythonPackage rec { description = "Google Cloud Bigtable API client library"; homepage = "https://github.com/googleapis/python-bigtable"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with 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 c99d5d0a8bff..b66ff08cff8a 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.10.5"; + version = "2.10.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-doxO6Q8SaRqXNNMQow8kPp2BawpiTtSm2yuzyaOl7RY="; + sha256 = "sha256-dBt2Vs9J0+l534YtKS70MuUEUegwVoU66zghmcz7fGk="; }; propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ]; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index bf9e8552aec1..c3e748810ee3 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -1,19 +1,44 @@ -{ lib, buildPythonPackage, fetchPypi, libcst, google-api-core, grpc-google-iam-v1, proto-plus, pytest-asyncio, pytestCheckHook, mock }: +{ lib +, buildPythonPackage +, fetchPypi +, libcst +, google-api-core +, grpc-google-iam-v1 +, proto-plus +, pytest-asyncio +, pytestCheckHook +, mock +, pythonOlder +}: buildPythonPackage rec { pname = "google-cloud-datacatalog"; - version = "3.6.2"; + version = "3.7.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-9oixM+4HxHn0G3j8Hpg1iB5gM+7xyD5GBbWpEzzjdrE="; + hash = "sha256-99hJvY195iUjXOZEOwFQftDkfgtD5V8hSg5ZLWKyWZU="; }; - propagatedBuildInputs = [ libcst google-api-core grpc-google-iam-v1 proto-plus ]; + propagatedBuildInputs = [ + libcst + google-api-core + grpc-google-iam-v1 + proto-plus + ]; - checkInputs = [ pytest-asyncio pytestCheckHook mock ]; + checkInputs = [ + pytest-asyncio + pytestCheckHook + mock + ]; - pythonImportsCheck = [ "google.cloud.datacatalog" ]; + pythonImportsCheck = [ + "google.cloud.datacatalog" + ]; meta = with lib; { description = "Google Cloud Data Catalog API API client library"; 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 3badd796121e..d8451ec097cc 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -7,20 +7,32 @@ , proto-plus , pytestCheckHook , pytest-asyncio +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "3.2.0"; + version = "4.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "c3b60ea9059070e6d0d5c3bd3a705b5c7216a54e6a586149f9caa9158d099c3f"; + sha256 = "sha256-IAnsz7UxMf3GqaPYPltis0WWPM+IIWwpK1iTSV7Kl5c="; }; - propagatedBuildInputs = [ google-api-core libcst proto-plus ]; + propagatedBuildInputs = [ + google-api-core + libcst + proto-plus + ]; - checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + mock + pytestCheckHook + pytest-asyncio + ]; disabledTests = [ # requires credentials 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 0ea9c3e5e33f..d2afea058d0c 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-datastore/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-datastore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-datastore"; - version = "2.4.0"; + version = "2.5.1"; src = fetchPypi { inherit pname version; - sha256 = "4a6f04112f2685a0a5cd8c7cb7946572bb7e0f6ca7cbe0088514006fca8594ca"; + sha256 = "sha256-1fpWovsg60uyAGps9QKXTdqV4WqZOOyeDFxX8YfgAMc="; }; propagatedBuildInputs = [ 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 d2e3abef82d1..1961789e3b58 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -9,20 +9,34 @@ , pytest-asyncio , pytz , mock +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.6.0"; + version = "3.6.2"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "20abce8d8d3939db243cbc0da62a73ff1a4e3b3b341f7ced0cfeb5e2c4a66621"; + hash = "sha256-MMTeoyC30MW9NdrXLAqelIeeIdsdNi7u5zwVhLeeTyk="; }; - propagatedBuildInputs = [ google-api-core libcst proto-plus pytz ]; + propagatedBuildInputs = [ + google-api-core + libcst + proto-plus + pytz + ]; - checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + google-cloud-testutils + mock + pytestCheckHook + pytest-asyncio + ]; disabledTests = [ # requires credentials 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 06c4d9e23696..9c5af01714c5 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 @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-error-reporting"; - version = "1.5.0"; + version = "1.5.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-qvhZU7T2fHA2uRyXJjRxqeEAFwShH+TpGwICczgX7Sk="; + sha256 = "sha256-7gFpvFxtYneABxW2mOwW1V2E7kobmj0yzV0pxaRhs8c="; }; postPatch = '' 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 50a08e66f360..bc22afe4614b 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.3.4"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-cU4bwfxRAp14qmSTO+8u/APa7clWXqeeyRuEOwUgFuw="; + sha256 = "sha256-9+esejwSitfYEkD03KsPiTIKxmYhRxTrgfy3QKqIIO4="; }; propagatedBuildInputs = [ 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 index 47ca59ab2a21..017634fd5273 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-iam-logging/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-iam-logging/default.nix @@ -7,15 +7,19 @@ , proto-plus , pytest-asyncio , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-iam-logging"; - version = "1.0.0"; + version = "1.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "4ac688593279c48d7863f0a90457202ff9b235e3ee8862498e8a5b8f867cc137"; + hash = "sha256-ZmoBaY0OM2pQcqasGCJQIeN6Rmbo4xlYK7LtH7SecgY="; }; propagatedBuildInputs = [ 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 3a4402beed69..26c89af2addb 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "google-cloud-iam"; - version = "2.5.1"; + version = "2.6.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "b26294d02b14b40586eceb099a0e3a74265ae10a3f46fd49890cac55ad5f861f"; + sha256 = "sha256-c1XPE5PBDXRgpiKGBfAhHB6yTPyvby3aZ5nF40+qFiQ="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-iot/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-iot/default.nix index 507ba6aef18c..24afcea7a73d 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-iot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-iot/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-iot"; - version = "2.3.0"; + version = "2.4.1"; src = fetchPypi { inherit pname version; - sha256 = "cb31a864be75c47880748b6c81f0c57cbce190a87e402ce32b2b772be2dba5fa"; + sha256 = "sha256-AjGoEAAI8aTACtcZp7zT5n9y6WCMc4GOfgUusUVXAVk="; }; propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix index 1efbcf02de42..6317d621a0b9 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-kms"; - version = "2.11.0"; + version = "2.11.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8JOa8HzYGJq1lrPXCWRvspXpopEK+qf5av7kmKbFIrQ="; + sha256 = "sha256-n0alfJIsaqhQ4Wr4/d2JRXTCE24JTrRJBsYOnRhpV00="; }; propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-language/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-language/default.nix index b817c50ad5a5..c4caa9474e40 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-language/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-language/default.nix @@ -7,20 +7,32 @@ , proto-plus , pytestCheckHook , pytest-asyncio +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-language"; - version = "2.3.2"; + version = "2.4.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "90af7858911f52350191575bb729305114c3c80d1f585d0f6cea39ab1ab3e409"; + sha256 = "sha256-BhQQ4QZ7GbacjpLLg5LXm1g5IhIMk3tJdDrHZLquuTk="; }; - propagatedBuildInputs = [ google-api-core libcst proto-plus ]; + propagatedBuildInputs = [ + google-api-core + libcst + proto-plus + ]; - checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + mock + pytestCheckHook + pytest-asyncio + ]; pythonImportsCheck = [ "google.cloud.language" diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix index 4872f7ac448a..32572b0115e6 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -9,20 +9,34 @@ , pytestCheckHook , pytest-asyncio , mock +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-monitoring"; - version = "2.8.0"; + version = "2.9.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "2a25f7535f21cdeabfccb07fe4a75eae5a47bb36b82025537755b37d3376da46"; + hash = "sha256-FoB6SGDrVDHG60WeWmGwfVbSwt6xdq9da2QwSikpIlU="; }; - propagatedBuildInputs = [ libcst google-api-core proto-plus ]; + propagatedBuildInputs = [ + libcst + google-api-core + proto-plus + ]; - checkInputs = [ google-cloud-testutils mock pandas pytestCheckHook pytest-asyncio ]; + checkInputs = [ + google-cloud-testutils + mock + pandas + pytestCheckHook + pytest-asyncio + ]; disabledTests = [ # requires credentials 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 5bada28d01dc..2e698db4aef2 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 = "1.2.1"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "cdb2d6878c426ed34af8950b052845a76b0f5fab3f96a2ec5dc80be994ca5cf8"; + sha256 = "sha256-r9qz2/HjDYHXu9jY03rt0QC1BofzQ/HrKVjGCtvXzsU="; }; propagatedBuildInputs = [ google-api-core proto-plus ]; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix index 3ce5f92fe7b8..6f6223f1be98 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-os-config"; - version = "1.9.0"; + version = "1.11.1"; src = fetchPypi { inherit pname version; - sha256 = "872774c4791b15d59d866fd965c780beac2772f335ded4a0047e2d844d988f30"; + sha256 = "sha256-i4STXwnFyfXauRx4zvYMO1uWMechvNUOxolOcY3Z5us="; }; propagatedBuildInputs = [ google-api-core libcst 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 67a8daf6f997..5f9fdb2833d2 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.9.0"; + version = "2.11.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "2b3d9336afab0e5df67201234976519a28da3ccb7c9a0e463be28e2827a9fdaa"; + sha256 = "sha256-btPJ2X+I0f8C3YDB9bZwPv7HWnqsq9koWsT+CyK1AgM="; }; propagatedBuildInputs = [ 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 aa49340f24a3..fc1ca3121252 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -7,20 +7,32 @@ , proto-plus , pytestCheckHook , pytest-asyncio +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-redis"; - version = "2.5.1"; + version = "2.7.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "ad81fed19af6af68426e76891e4acc8a021a8bc475e2ce4be51bf28a610a9713"; + hash = "sha256-tz2upcRjgE6/4cB0riARwot3Vhw4QSKqqHTlJS3i7is="; }; - propagatedBuildInputs = [ google-api-core libcst proto-plus ]; + propagatedBuildInputs = [ + google-api-core + libcst + proto-plus + ]; - checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + mock + pytestCheckHook + pytest-asyncio + ]; pythonImportsCheck = [ "google.cloud.redis" diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix index 98c9f3163202..da5d110225e8 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix @@ -7,20 +7,32 @@ , grpc-google-iam-v1 , proto-plus , mock +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-resource-manager"; - version = "1.3.3"; + version = "1.4.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "b13e0a614b4865287a4b5fc43f4810d3d48fef7e24d9bcf54cb4bd93bfbb2bf2"; + hash = "sha256-NUqFkvIwfaqz3MZEUoLqO7hFCVwV5124+lA8LGzccl0="; }; - propagatedBuildInputs = [ google-api-core google-cloud-core grpc-google-iam-v1 proto-plus ]; + propagatedBuildInputs = [ + google-api-core + google-cloud-core + grpc-google-iam-v1 + proto-plus + ]; - checkInputs = [ mock pytestCheckHook ]; + checkInputs = [ + mock + pytestCheckHook + ]; # prevent google directory from shadowing google imports preCheck = '' diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index b66091c15b29..e3c3e05ac183 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.8.0"; + version = "2.9.1"; src = fetchPypi { inherit pname version; - sha256 = "e8a3fb7c2a1595f59923661c568667d1ba40fcaaa4dd55fe8b1f5e54871e9460"; + sha256 = "sha256-apn1ex/2VX18GHgN5+JYurzTKMqzPTNqTNOAI+DEBLw="; }; propagatedBuildInputs = [ 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 e982aefae5a9..056c57ecd541 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -8,20 +8,33 @@ , proto-plus , pytestCheckHook , pytest-asyncio +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.8.0"; + version = "1.10.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "c77a765415d5e5465a3d74fefee9ce8f9a914ff228f1b10dda70841400ce1320"; + hash = "sha256-VaU6DRkq1pOESSOSynRRjaljp68C1X2H8anjHeHorbI="; }; - propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; + propagatedBuildInputs = [ + grpc-google-iam-v1 + google-api-core + libcst + proto-plus + ]; - checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + mock + pytestCheckHook + pytest-asyncio + ]; pythonImportsCheck = [ "google.cloud.securitycenter" 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 5f2737912e2c..e461b4cdcb53 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -7,25 +7,37 @@ , proto-plus , pytestCheckHook , pytest-asyncio +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.12.0"; + version = "2.13.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "acbf9948ce3870c72b45089356985de9df3cd881830d1127a10cb80ada9786c7"; + hash = "sha256-JxhIC4OMsXjdJYNDomEhmHPUCzveFS0oeDWsX/wd5zA="; }; - propagatedBuildInputs = [ libcst google-api-core proto-plus ]; + propagatedBuildInputs = [ + libcst + google-api-core + proto-plus + ]; - checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + mock + pytestCheckHook + pytest-asyncio + ]; - pytestFlagsArray = [ - # requrire credentials - "--ignore=tests/system/gapic/v1/test_system_speech_v1.py" - "--ignore=tests/system/gapic/v1p1beta1/test_system_speech_v1p1beta1.py" + disabledTestPaths = [ + # Requrire credentials + "tests/system/gapic/v1/test_system_speech_v1.py" + "tests/system/gapic/v1p1beta1/test_system_speech_v1p1beta1.py" ]; pythonImportsCheck = [ 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 c1b58c0e1c26..881f00ead548 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.7.2"; + version = "2.8.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-h/lmrrT8fu1YLDYF6s856EAB8+k7CMFfIMGZPDxC7Ys="; + sha256 = "sha256-VfRDZRgwq1pOwjzmq6mdbVqcT6wQdD6qOMivQn4Ua10="; }; 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 c2ab6afafaa4..a7c49f0cabe9 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.10.0"; + version = "2.11.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-j2MSeQLw7udQrEqj9LtMqvaGSgTLiItdpN8dUTedYdI="; + sha256 = "sha256-UJSP3a9G6k1arMpoh4/rWrnR4gYtPW6d6LGwWuk5WGg="; }; 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 4032de9d7c45..bb9eb5f477ac 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.5.1"; + version = "1.6.1"; src = fetchPypi { inherit pname version; - sha256 = "fd4cb8a9efa20598c35a4e6f7ac013a04868e37d7d4ff4ec3080f528b06f8a0e"; + sha256 = "sha256-JkKW9vJAAkw3sHYDapRvu5jjunV8oWSg/ykDmd1wpyA="; }; 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 956f27e2e525..c36bd09ba7ca 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -9,15 +9,19 @@ , mock , proto-plus , pytest-asyncio +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-translate"; - version = "3.6.1"; + version = "3.7.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "38772cc60ef4315d25a7dbeef5ddab9e75674722cb4500bc69b295e5d0af6a97"; + hash = "sha256-icZG33G/noii9V0rsHTG/Qe8cKDVDfASRKy2XRYM5Yg="; }; propagatedBuildInputs = [ 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 db6027f3a1ff..58368693523c 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.5.1"; + version = "2.6.1"; src = fetchPypi { inherit pname version; - sha256 = "7b735f623d6c3c80d1d40fa491bfe1776a5369d7b240dddab522fd0076d97b1d"; + sha256 = "sha256-p1HXFxURs0axONrqHahl/SPvWN2mhAhvJePFOwzRR4c="; }; 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 c67f910321a4..61c383dca6ed 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -7,20 +7,32 @@ , proto-plus , pytestCheckHook , pytest-asyncio +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-vision"; - version = "2.6.3"; + version = "2.7.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "54b7f63c746ab95a504bd6b9b1d806192483976a3452a1a59a7faa0eaaa03491"; + hash = "sha256-Ty80C73K3/TebsdSHinmp2y8TKgOftqT5PIDafq1GgM="; }; - propagatedBuildInputs = [ libcst google-api-core proto-plus]; + propagatedBuildInputs = [ + libcst + google-api-core + proto-plus + ]; - checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + mock + pytestCheckHook + pytest-asyncio + ]; pythonImportsCheck = [ "google.cloud.vision" 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 521d6c49f15c..2ea8de6f139f 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.6.1"; + version = "1.7.1"; src = fetchPypi { inherit pname version; - sha256 = "392a21dd238958eb7f480d056ed24110be22808cf4474939db40df0ade2910f3"; + sha256 = "sha256-yK4xEu9rfFkA6RDNDjul0V+Xjc8TehJ6f8lv1k2WULc="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/nixpkgs/pkgs/development/python-modules/google-nest-sdm/default.nix b/nixpkgs/pkgs/development/python-modules/google-nest-sdm/default.nix index ac40e446530d..acf2e734f8c3 100644 --- a/nixpkgs/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-nest-sdm"; - version = "1.7.1"; + version = "1.8.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "python-google-nest-sdm"; rev = version; - sha256 = "sha256-c/Btc2CiYGb9ZGzNYDd1xJoGID6amTyv/Emdh1M6e/U="; + sha256 = "sha256-oaUR/2G8dcQ5A4YZeLTSzyMNLI8a29pSoEtTdWvTVKE="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-resumable-media/default.nix b/nixpkgs/pkgs/development/python-modules/google-resumable-media/default.nix index 5d5d2fda18a6..6aca35ae9e0b 100644 --- a/nixpkgs/pkgs/development/python-modules/google-resumable-media/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-resumable-media/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-resumable-media"; - version = "2.2.1"; + version = "2.3.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-se37mIZ8n6Jap68S1kaGZbg8UytzSe/6uAWgJ+qLvuU="; + sha256 = "sha256-BpJOix558VjwIC590VGtdbDqnVm5l8hQ9WvdSlo2FRM="; }; propagatedBuildInputs = [ google-auth google-crc32c requests ]; diff --git a/nixpkgs/pkgs/development/python-modules/gql/default.nix b/nixpkgs/pkgs/development/python-modules/gql/default.nix index 3df5f4c8458d..679d0fbdb7cb 100644 --- a/nixpkgs/pkgs/development/python-modules/gql/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gql/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "gql"; - version = "3.0.0"; + version = "3.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "graphql-python"; repo = pname; rev = "v${version}"; - hash = "sha256-c2OVBOIwQlwyqET8Q22O65VtWduVzQjYOhkE8GpD6LQ="; + hash = "sha256-ZtrT+zeoP9KXdaCDKOUrjEwe7dN0+IwA20FDe5ja7l8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/graphql-subscription-manager/default.nix b/nixpkgs/pkgs/development/python-modules/graphql-subscription-manager/default.nix index 6ae0dce79cee..660a6f51688a 100644 --- a/nixpkgs/pkgs/development/python-modules/graphql-subscription-manager/default.nix +++ b/nixpkgs/pkgs/development/python-modules/graphql-subscription-manager/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "graphql-subscription-manager"; - version = "0.4.3"; + version = "0.5.4"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "PyGraphqlWebsocketManager"; rev = version; - sha256 = "sha256-+LP+MDeHo0svoN/o0in6xtIqrfxs+UCBQRtBe4lZt+4="; + sha256 = "sha256-J3us0xZN1jOFRcvUQg8PQP6AVHa/swGjKU8IivmfjQE="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/greeclimate/default.nix b/nixpkgs/pkgs/development/python-modules/greeclimate/default.nix index 6fbefe827b45..531ead0f1945 100644 --- a/nixpkgs/pkgs/development/python-modules/greeclimate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/greeclimate/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "greeclimate"; - version = "1.0.3"; + version = "1.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "cmroche"; repo = "greeclimate"; rev = "v${version}"; - hash = "sha256-z8X/AZx5Vam7nqYTjhhyXz7E23Crf5vLlNhWXLGSMcs="; + hash = "sha256-KVrm99aP2Nq15pDa8zaYIvTTcl6JEYU+7IkcMayHRQw="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/gridnet/default.nix b/nixpkgs/pkgs/development/python-modules/gridnet/default.nix new file mode 100644 index 000000000000..1288471c6b29 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/gridnet/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, poetry-core +, aiohttp +, yarl +, aresponses +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "gridnet"; + version = "4.0.0"; + + disabled = pythonOlder "3.9"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "klaasnicolaas"; + repo = "python-gridnet"; + rev = "v${version}"; + hash = "sha256-Ihs8qUx50tAUcRBsVArRhzoLcQUi1vbYh8sPyK75AEk="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "0.0.0" "${version}" \ + --replace "--cov" "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + yarl + ]; + + checkInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "gridnet" ]; + + meta = with lib; { + description = "Asynchronous Python client for NET2GRID devices"; + homepage = "https://github.com/klaasnicolaas/python-gridnet"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/gspread/default.nix b/nixpkgs/pkgs/development/python-modules/gspread/default.nix index 741882bdbd3d..466b3ae4770f 100644 --- a/nixpkgs/pkgs/development/python-modules/gspread/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gspread/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "5.1.1"; + version = "5.2.0"; pname = "gspread"; src = fetchPypi { inherit pname version; - sha256 = "d9db8c43d552f541ea072d4727d1e955bc2368b095dd86c5429a845c9d8aed8f"; + sha256 = "sha256-JRc6wIFGnPnWIVFMZXbGz0bznIJfF4uMueeDdKY3sL8="; }; propagatedBuildInputs = [ requests google-auth google-auth-oauthlib ]; diff --git a/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix b/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix index 656b89ab7b53..515d6ed8d950 100644 --- a/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "0.35.0"; + version = "0.36.3"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = version; - sha256 = "sha256-VgtdnKj+TlAsFr1un6eMlYfumap4mwE8H4kkKAUrxfo="; + sha256 = "sha256-S5KWyW7aeR2qdBzXQ4ka2nuxGPt69LHyq2CUdRPG9ig="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix b/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix index 2e3be091cef6..e7732e1f6a42 100644 --- a/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.52.0"; + version = "0.54.0"; src = fetchFromGitHub { owner = "nabucasa"; repo = pname; rev = version; - sha256 = "sha256-mTbNuER26BPQIjcmlpkdFNeBcNF1vTldaNpoEla0XbM="; + sha256 = "sha256-UL7HPmii65p+WO22y0qv8zq3yICKarRORqE+FK1u7OE="; }; postPatch = '' @@ -41,6 +41,8 @@ buildPythonPackage rec { warrant ]; + doCheck = lib.versionAtLeast pytest-aiohttp.version "1.0.0"; + checkInputs = [ asynctest pytest-aiohttp diff --git a/nixpkgs/pkgs/development/python-modules/herepy/default.nix b/nixpkgs/pkgs/development/python-modules/herepy/default.nix index ef7e5b8755c0..71aad2650f36 100644 --- a/nixpkgs/pkgs/development/python-modules/herepy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/herepy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "herepy"; - version = "3.5.6"; + version = "3.5.7"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "abdullahselek"; repo = "HerePy"; rev = version; - sha256 = "sha256-I5u5PKB29jQNFdsx+y5ZJOE837D7Hpcsf3pwlCvmEqU="; + hash = "sha256-iPFFEFGH3csqzDtBtLkVkUezObwiMHNbiD/mTgIrdpo="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix b/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix index 27c2167ff1dd..9b1264e738b4 100644 --- a/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "hg-evolve"; - version = "10.4.1"; + version = "10.5.0"; src = fetchPypi { inherit pname version; - sha256 = "b47d9a1e0af3d7b54edd646581ac3e3ab046a572368eeb22dfd89dff7f9964d2"; + sha256 = "sha256-p2zPUCc+KrsNxPChdW3ZgkOo+HJB7IcYtqh5Uh0Qnaw="; }; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/holidays/default.nix b/nixpkgs/pkgs/development/python-modules/holidays/default.nix index ecefce19aede..dd97b4700756 100644 --- a/nixpkgs/pkgs/development/python-modules/holidays/default.nix +++ b/nixpkgs/pkgs/development/python-modules/holidays/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.12"; + version = "0.13"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "d99f2b6ddc5bfab7b7f8bbed457a82104f8980122a04b982bfc0e4f8820a1d46"; + sha256 = "sha256-xvfDq4ralIBnAtqTHZTTfNYbz6kstNOdNRtqnFIQZ1w="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/homeconnect/default.nix b/nixpkgs/pkgs/development/python-modules/homeconnect/default.nix index 98aab26ffac8..b6fca4201ad7 100644 --- a/nixpkgs/pkgs/development/python-modules/homeconnect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/homeconnect/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "homeconnect"; - version = "0.6.3"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "0n4h4mi23zw3v6fbkz17fa6kkl5v9bfmj0p57jvfzcfww511y9mn"; + sha256 = "sha256-/h0dEVmP0R9tVt56mvu72Ksrvnuox1FA7BgrZMOhV6Q="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/hypothesmith/default.nix b/nixpkgs/pkgs/development/python-modules/hypothesmith/default.nix index 3ce0f068fec9..ee8b897154bd 100644 --- a/nixpkgs/pkgs/development/python-modules/hypothesmith/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hypothesmith/default.nix @@ -9,10 +9,15 @@ buildPythonPackage rec { sha256 = "0fb7b3fd03d76eddd4474b0561e1c2662457593a74cc300fd27e5409cd4d7922"; }; + postPatch = '' + substituteInPlace setup.py --replace "lark-parser" "lark" + ''; + propagatedBuildInputs = [ hypothesis lark libcst ]; checkInputs = [ black parso pytestCheckHook pytest-cov pytest-xdist ]; + pytestFlagsArray = [ "-v" ]; # tests are fairly slow, prevents timeout due to no stdout printing pythonImportsCheck = [ "hypothesmith" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index 64ecd3c496bb..6345eebad1bc 100644 --- a/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "ibm-cloud-sdk-core"; - version = "3.14.0"; + version = "3.15.0"; src = fetchPypi { inherit pname version; - sha256 = "695c4125436f4f8354a67bc85af9ac306b66911c75d19ade25072dd436b55c4e"; + sha256 = "sha256-oHQXgiW80zqgpyt5osbBCtoT3XYCGEk4mgKPIsMmBHY="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/icnsutil/default.nix b/nixpkgs/pkgs/development/python-modules/icnsutil/default.nix new file mode 100644 index 000000000000..05c24ec7c37e --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/icnsutil/default.nix @@ -0,0 +1,31 @@ +{ lib +, python +, fetchFromGitHub +, buildPythonPackage +}: + +buildPythonPackage rec { + pname = "icnsutil"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "relikd"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-TfQvAbP7iCpRQg2G+ejl245NCYo9DpYwMgiwY2BuJnY="; + }; + + doCheck = true; + + checkPhase = '' + ${python.interpreter} tests/test_icnsutil.py + ${python.interpreter} tests/test_cli.py + ''; + + meta = { + homepage = "https://github.com/relikd/icnsutil"; + description = "Create and extract .icns files."; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.reckenrode ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/identify/default.nix b/nixpkgs/pkgs/development/python-modules/identify/default.nix index 949ae27273c6..9f2a066ebdf2 100644 --- a/nixpkgs/pkgs/development/python-modules/identify/default.nix +++ b/nixpkgs/pkgs/development/python-modules/identify/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "identify"; - version = "2.4.10"; + version = "2.4.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-a12a4PvACkB+zpJts6syDqMPafjhZp1UWnob9UiKMbM="; + sha256 = "sha256-Q86n2uAjmA05h+0NE77TBkbPiKoRYqB1b2H3MbOVmMY="; }; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ihatemoney/default.nix b/nixpkgs/pkgs/development/python-modules/ihatemoney/default.nix index 4fe56c616146..d351f1ca7d44 100644 --- a/nixpkgs/pkgs/development/python-modules/ihatemoney/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ihatemoney/default.nix @@ -96,6 +96,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.cfg \ + --replace "cachetools>=4.1,<5" "cachetools>=4.1" \ --replace "Flask-WTF>=0.14.3,<1" "Flask-WTF>=0.14.3,<2" \ --replace "SQLAlchemy>=1.3.0,<1.4" "SQLAlchemy>=1.3.0,<1.5" \ --replace "WTForms>=2.3.1,<2.4" "WTForms" @@ -106,7 +107,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportChecks = [ "ihatemoney" ]; + pythonImportsCheck = [ "ihatemoney" ]; disabledTests = [ "test_notifications" # requires running service. diff --git a/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix b/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix index 59de3b3f3ff0..9d017b242235 100644 --- a/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix @@ -7,15 +7,17 @@ buildPythonPackage rec { pname = "imap-tools"; - version = "0.51.0"; + version = "0.52.0"; disabled = isPy27; + format = "setuptools"; + src = fetchFromGitHub { owner = "ikvk"; repo = "imap_tools"; rev = "v${version}"; - hash = "sha256-ZJen+hpNpeZjScD7aqdaW796KRlJ8K1JBXPOagpceXk="; + hash = "sha256-la2+cpTnHZQn/FXtySp+3zDCBTONiLC16Tm+hDiIERc="; }; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix b/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix index 9eb9bd48d47e..85456fcc15f8 100644 --- a/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix @@ -14,14 +14,16 @@ buildPythonPackage rec { pname = "influxdb-client"; - version = "1.25.0"; + version = "1.26.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "influxdata"; repo = "influxdb-client-python"; rev = "v${version}"; - sha256 = "0anziqlczzc9qmz1mrk8yapn0pc18wz2pknyghyj5qpym3w2azas"; + hash = "sha256-9MI6AgFTEw9dnBWdry3FnPERXnXZJhbYX4tXj9sGMkg="; }; propagatedBuildInputs = [ @@ -38,12 +40,14 @@ buildPythonPackage rec { # requires influxdb server doCheck = false; - pythonImportsCheck = [ "influxdb_client" ]; + pythonImportsCheck = [ + "influxdb_client" + ]; meta = with lib; { description = "InfluxDB 2.0 Python client library"; homepage = "https://github.com/influxdata/influxdb-client-python"; license = licenses.mit; - maintainers = [ maintainers.mic92 ]; + maintainers = with maintainers; [ mic92 ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/intellifire4py/default.nix b/nixpkgs/pkgs/development/python-modules/intellifire4py/default.nix index 5418b237d1b7..329d7a77dfde 100644 --- a/nixpkgs/pkgs/development/python-modules/intellifire4py/default.nix +++ b/nixpkgs/pkgs/development/python-modules/intellifire4py/default.nix @@ -1,4 +1,5 @@ { lib +, aenum , aiohttp , buildPythonPackage , fetchFromGitHub @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "intellifire4py"; - version = "0.9.9"; + version = "1.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,10 +20,11 @@ buildPythonPackage rec { owner = "jeeftor"; repo = pname; rev = version; - hash = "sha256-oI4iGnfitou8/Jhe7K4rnSPnmddfO+6FLZzqgNmaPV8="; + hash = "sha256-lQV5KpASbrz+wCi9x/0rNYrQE+dLCZzsNBFhYAQvPH4="; }; propagatedBuildInputs = [ + aenum aiohttp pydantic requests diff --git a/nixpkgs/pkgs/development/python-modules/iodata/default.nix b/nixpkgs/pkgs/development/python-modules/iodata/default.nix new file mode 100644 index 000000000000..b81d7981a280 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/iodata/default.nix @@ -0,0 +1,28 @@ +{ buildPythonPackage, lib, fetchFromGitHub, numpy, scipy, attrs, cython, nose }: + +buildPythonPackage rec { + pname = "iodata"; + version = "0.1.7"; + + src = fetchFromGitHub { + owner = "theochem"; + repo = pname; + rev = version; + hash = "sha256-Qn2xWFxdS12K92DhdHVzYrBjPRV+vYo7Cs27vkeCaxM="; + }; + + leaveDotGit = true; + + nativeBuildInputs = [ cython nose ]; + propagatedBuildInputs = [ numpy scipy attrs ]; + + pythonImportsCheck = [ "iodata" "iodata.overlap_accel" ]; + doCheck = false; # Requires roberto or nose and a lenghtly setup to find the cython modules + + meta = with lib; { + description = "Python library for reading, writing, and converting computational chemistry file formats and generating input files"; + homepage = "https://github.com/theochem/iodata"; + license = licenses.lgpl3Only; + maintainers = [ maintainers.sheepforce ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/ipyparallel/default.nix b/nixpkgs/pkgs/development/python-modules/ipyparallel/default.nix index 51b76fc532bb..aa7cc22b7a84 100644 --- a/nixpkgs/pkgs/development/python-modules/ipyparallel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ipyparallel/default.nix @@ -9,23 +9,26 @@ , ipython , jupyter-client , ipykernel +, packaging +, psutil , tornado +, tqdm , isPy3k , futures ? null }: buildPythonPackage rec { pname = "ipyparallel"; - version = "8.1.0"; + version = "8.2.0"; src = fetchPypi { inherit pname version; - sha256 = "63f7e136e88f890e9802522fa5475dd81e7614ba06a8cfe4f80cc3056fdb7d73"; + sha256 = "sha256-D9n2SlEgmAqJtkKZgGwSu434zuoVXlIAtwUwHrJAHhk="; }; buildInputs = [ nose ]; - propagatedBuildInputs = [ python-dateutil ipython_genutils decorator pyzmq ipython jupyter-client ipykernel tornado + propagatedBuildInputs = [ python-dateutil ipython_genutils decorator pyzmq ipython jupyter-client ipykernel packaging psutil tornado tqdm ] ++ lib.optionals (!isPy3k) [ futures ]; # Requires access to cluster diff --git a/nixpkgs/pkgs/development/python-modules/ipython/default.nix b/nixpkgs/pkgs/development/python-modules/ipython/default.nix index cee9868cfacb..432f83e75cc5 100644 --- a/nixpkgs/pkgs/development/python-modules/ipython/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ipython/default.nix @@ -26,7 +26,7 @@ , testpath }: -buildPythonPackage rec { +buildPythonPackage (rec { pname = "ipython"; version = "8.0.1"; format = "pyproject"; @@ -82,4 +82,8 @@ buildPythonPackage rec { license = licenses.bsd3; maintainers = with maintainers; [ bjornfor fridh ]; }; -} +} // lib.optionalAttrs stdenv.isDarwin { + disabledTests = [ + "test_clipboard_get" # uses pbpaste + ]; +}) diff --git a/nixpkgs/pkgs/development/python-modules/isbnlib/default.nix b/nixpkgs/pkgs/development/python-modules/isbnlib/default.nix index e43db60fb11d..50e171feb6a2 100644 --- a/nixpkgs/pkgs/development/python-modules/isbnlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/isbnlib/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "isbnlib"; - version = "3.10.9"; + version = "3.10.10"; src = fetchPypi { inherit pname version; - sha256 = "sha256-P4GH6462+gJ9Jv8HdfKr1CDinOMyeUv1Uqhqa9ukcLg="; + sha256 = "c9e6c1dcaa9dff195429373cf2beb3117f30b3fca43d7db5aec5a2d1f6f59784"; }; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/islpy/default.nix b/nixpkgs/pkgs/development/python-modules/islpy/default.nix index d6e4332fdeaa..67b547b724ea 100644 --- a/nixpkgs/pkgs/development/python-modules/islpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/islpy/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "islpy"; - version = "2021.1"; + version = "2022.1.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "b3f49de925149dbf2482e648016507cd66d0dce6668a1bc4de5e7a937e9c576d"; + sha256 = "sha256-eWNc1xxOqEmPdSC1Ha6tfM8ofgkudfOGjvp3ZyM4pxE="; }; postConfigure = '' diff --git a/nixpkgs/pkgs/development/python-modules/jax/default.nix b/nixpkgs/pkgs/development/python-modules/jax/default.nix index c91b6e485226..d5e536540195 100644 --- a/nixpkgs/pkgs/development/python-modules/jax/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jax/default.nix @@ -1,8 +1,10 @@ { lib , absl-py +, blas , buildPythonPackage , fetchFromGitHub , jaxlib +, lapack , numpy , opt-einsum , pytestCheckHook @@ -12,6 +14,9 @@ , typing-extensions }: +let + usingMKL = blas.implementation == "mkl" || lapack.implementation == "mkl"; +in buildPythonPackage rec { pname = "jax"; version = "0.3.1"; @@ -59,6 +64,16 @@ buildPythonPackage rec { "tests/" ]; + # See + # * https://github.com/google/jax/issues/9705 + # * https://discourse.nixos.org/t/getting-different-results-for-the-same-build-on-two-equally-configured-machines/17921 + # * https://github.com/NixOS/nixpkgs/issues/161960 + disabledTests = lib.optionals usingMKL [ + "test_custom_linear_solve_cholesky" + "test_custom_root_with_aux" + "testEigvalsGrad_shape" + ]; + pythonImportsCheck = [ "jax" ]; diff --git a/nixpkgs/pkgs/development/python-modules/jaxlib/bin.nix b/nixpkgs/pkgs/development/python-modules/jaxlib/bin.nix index 3504c6bf3204..7e6b00429dfa 100644 --- a/nixpkgs/pkgs/development/python-modules/jaxlib/bin.nix +++ b/nixpkgs/pkgs/development/python-modules/jaxlib/bin.nix @@ -24,50 +24,73 @@ , flatbuffers , isPy39 , lib +, python , scipy , stdenv # Options: , cudaSupport ? config.cudaSupport or false }: -# Note that these values are tied to the specific version of the GPU wheel that -# we fetch. When updating, try to go for the latest possible versions that are -# still compatible with the cudatoolkit and cudnn versions available in nixpkgs. +# There are no jaxlib wheels targeting cudnn <8.0.5, and although there are +# wheels for cudatoolkit <11.1, we don't support them. assert cudaSupport -> lib.versionAtLeast cudatoolkit_11.version "11.1"; assert cudaSupport -> lib.versionAtLeast cudnn.version "8.0.5"; let - device = if cudaSupport then "gpu" else "cpu"; -in -buildPythonPackage rec { - pname = "jaxlib"; version = "0.3.0"; - format = "wheel"; - # At the time of writing (8/19/21), there are releases for 3.7-3.9. Supporting - # all of them is a pain, so we focus on 3.9, the current nixpkgs python3 - # version. - disabled = !isPy39; + pythonVersion = python.pythonVersion; - # Find new releases at https://storage.googleapis.com/jax-releases. - src = { - cpu = fetchurl { + # Find new releases at https://storage.googleapis.com/jax-releases. When + # upgrading, you can get these hashes from prefetch.sh. + cpuSrcs = { + "3.9" = fetchurl { url = "https://storage.googleapis.com/jax-releases/nocuda/jaxlib-${version}-cp39-none-manylinux2010_x86_64.whl"; - sha256 = "151p4vqli8x0iqgrzrr8piqk7d76a2xq2krf23jlb142iam5bw01"; + hash = "sha256-AfBVqoqChEXlEC5PgbtQ5rQzcbwo558fjqCjSPEmN5Q="; }; - gpu = fetchurl { - # Note that there's also a release targeting cuDNN 8.2, but unfortunately - # we don't yet have that packaged at the time of writing (02/03/2022). - # Check pkgs/development/libraries/science/math/cudnn/default.nix for more - # details. - url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn805-cp39-none-manylinux2010_x86_64.whl"; - sha256 = "0z15rdw3a8sq51rpjmfc41ix1q095aasl79rvlib85ir6f3wh2h8"; + "3.10" = fetchurl { + url = "https://storage.googleapis.com/jax-releases/nocuda/jaxlib-${version}-cp310-none-manylinux2010_x86_64.whl"; + hash = "sha256-9uBkFOO8LlRpO6AP+S8XK9/d2yRdyHxQGlbAjShqHRQ="; + }; + }; - # This is what the cuDNN 8.2 download looks like for future reference: - # url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn82-cp39-none-manylinux2010_x86_64.whl"; - # sha256 = "000mnm2masm3sx3haddcmgw43j4gxa3m4fcm14p9nb8dnncjkgpb"; + gpuSrcs = { + "3.9-805" = fetchurl { + url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn805-cp39-none-manylinux2010_x86_64.whl"; + hash = "sha256-CArIhzM5FrQi3TkdqpUqCeDQYyDMVXlzKFgjNXjLJXw="; + }; + "3.9-82" = fetchurl { + url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn82-cp39-none-manylinux2010_x86_64.whl"; + hash = "sha256-Q0plVnA9pUNQ+gCHSXiLNs4i24xCg8gBGfgfYe3bot4="; }; - }.${device}; + "3.10-805" = fetchurl { + url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn805-cp310-none-manylinux2010_x86_64.whl"; + hash = "sha256-JopevCEAs0hgDngIId6NqbLam5YfcS8Lr9cEffBKp1U="; + }; + "3.10-82" = fetchurl { + url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn82-cp310-none-manylinux2010_x86_64.whl"; + hash = "sha256-2f5TwbdP7EfQNRM3ZcJXCAkS2VXBwNYH6gwT9pdu3Go="; + }; + }; +in +buildPythonPackage rec { + pname = "jaxlib"; + inherit version; + format = "wheel"; + + # At the time of writing (2022-03-03), there are releases for <=3.10. + # Supporting all of them is a pain, so we focus on 3.9, the current nixpkgs + # python3 version, and 3.10. + disabled = !(pythonVersion == "3.9" || pythonVersion == "3.10"); + + src = + if !cudaSupport then cpuSrcs."${pythonVersion}" else + let + # jaxlib wheels are currently provided for cudnn versions at least 8.0.5 and + # 8.2. Try to use 8.2 whenever possible. + cudnnVersion = if (lib.versionAtLeast cudnn.version "8.2") then "82" else "805"; + in + gpuSrcs."${pythonVersion}-${cudnnVersion}"; # Prebuilt wheels are dynamically linked against things that nix can't find. # Run `autoPatchelfHook` to automagically fix them. diff --git a/nixpkgs/pkgs/development/python-modules/jaxlib/prefetch.sh b/nixpkgs/pkgs/development/python-modules/jaxlib/prefetch.sh new file mode 100755 index 000000000000..31db6530639f --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/jaxlib/prefetch.sh @@ -0,0 +1,7 @@ +version="$1" +nix hash to-sri --type sha256 "$(nix-prefetch-url https://storage.googleapis.com/jax-releases/nocuda/jaxlib-${version}-cp39-none-manylinux2010_x86_64.whl)" +nix hash to-sri --type sha256 "$(nix-prefetch-url https://storage.googleapis.com/jax-releases/nocuda/jaxlib-${version}-cp310-none-manylinux2010_x86_64.whl)" +nix hash to-sri --type sha256 "$(nix-prefetch-url https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn805-cp39-none-manylinux2010_x86_64.whl)" +nix hash to-sri --type sha256 "$(nix-prefetch-url https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn82-cp39-none-manylinux2010_x86_64.whl)" +nix hash to-sri --type sha256 "$(nix-prefetch-url https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn805-cp310-none-manylinux2010_x86_64.whl)" +nix hash to-sri --type sha256 "$(nix-prefetch-url https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn82-cp310-none-manylinux2010_x86_64.whl)" diff --git a/nixpkgs/pkgs/development/python-modules/jc/default.nix b/nixpkgs/pkgs/development/python-modules/jc/default.nix index ba70918cde1f..9722497c75ab 100644 --- a/nixpkgs/pkgs/development/python-modules/jc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jc/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jc"; - version = "1.18.3"; + version = "1.18.5"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OMFW2xR6X/6H8ouHAe5qX8ltuwkNG9esjdosac+MiNw="; + sha256 = "sha256-rsD8euVGf1nbIHnDyxbyW7LJWtUSsc4Uf3c5OmgYpMY="; }; propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ]; diff --git a/nixpkgs/pkgs/development/python-modules/jschema-to-python/default.nix b/nixpkgs/pkgs/development/python-modules/jschema-to-python/default.nix index a9100e061d7b..5b25b5c18a4b 100644 --- a/nixpkgs/pkgs/development/python-modules/jschema-to-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jschema-to-python/default.nix @@ -15,13 +15,10 @@ buildPythonPackage rec { sha256 = "76ff14fe5d304708ccad1284e4b11f96a658949a31ee7faed9e0995279549b91"; }; - nativeBuildInputs = [ - pbr - ]; - propagatedBuildInputs = [ attrs jsonpickle + pbr ]; checkInputs =[ diff --git a/nixpkgs/pkgs/development/python-modules/jupyter-lsp/default.nix b/nixpkgs/pkgs/development/python-modules/jupyter-lsp/default.nix new file mode 100644 index 000000000000..ffcde4a5b216 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/jupyter-lsp/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +, jupyter_server +}: + +buildPythonPackage rec { + pname = "jupyter-lsp"; + version = "1.5.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-dRq9NUE76ZpDMfNZewk0Gtx1VYntMgkawvaG2z1hJn4="; + }; + + propagatedBuildInputs = [ + jupyter_server + ]; + # tests require network + doCheck = false; + pythonImportsCheck = [ "jupyter_lsp" ]; + + meta = with lib; { + description = "Multi-Language Server WebSocket proxy for your Jupyter notebook or lab server"; + homepage = "https://pypi.org/project/jupyter-lsp"; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ doronbehar ]; + }; +} + diff --git a/nixpkgs/pkgs/development/python-modules/jupyter-server-mathjax/default.nix b/nixpkgs/pkgs/development/python-modules/jupyter-server-mathjax/default.nix index 47f5f8e58407..cd5e1e0f7620 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyter-server-mathjax/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyter-server-mathjax/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "jupyter-server-mathjax"; - version = "0.2.3"; + version = "0.2.5"; src = fetchPypi { inherit version; pname = "jupyter_server_mathjax"; - sha256 = "564e8d1272019c6771208f577b5f9f2b3afb02b9e2bff3b34c042cef8ed84451"; + sha256 = "sha256-ZNlsjm3+btunN5ArLcOi3AWPF1FndsJfTTDKJGF+57M="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/jupyterlab-lsp/default.nix b/nixpkgs/pkgs/development/python-modules/jupyterlab-lsp/default.nix new file mode 100644 index 000000000000..ad6286f4de4a --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/jupyterlab-lsp/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +, jupyterlab +, jupyter-lsp +}: + +buildPythonPackage rec { + pname = "jupyterlab-lsp"; + version = "3.10.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-8/ZGTIwpFuPiYVGZZLF+1Gc8aJcWc3BirtXdahYKwt8="; + }; + + propagatedBuildInputs = [ + jupyterlab + jupyter-lsp + ]; + # No tests + doCheck = false; + pythonImportsCheck = [ "jupyterlab_lsp" ]; + + meta = with lib; { + description = "Language Server Protocol integration for Jupyter(Lab)"; + homepage = "https://github.com/jupyter-lsp/jupyterlab-lsp"; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix b/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix index 21158ebb5393..c000bb050d89 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "3.2.9"; + version = "3.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Zd3DTl2hp2RgbjjE9wz51KwcBRgoE88Kst/qMSxwESQ="; + sha256 = "sha256-zkgnmTeccKqH5jtZ4sU3l3nOGGWLkkYM0gu0QVSGWXM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/0001-stub.patch b/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/0001-stub.patch index 4ebe5472b44a..597907c14be6 100644 --- a/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/0001-stub.patch +++ b/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/0001-stub.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 66e6d49..78f7b42 100644 +index 17c7032..12ed398 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1,23 +1,6 @@ +@@ -1,87 +1,12 @@ cmake_minimum_required(VERSION 3.13.0) project(kaldi_binaries) @@ -24,9 +24,8 @@ index 66e6d49..78f7b42 100644 -endif() - set(BINARIES - tools/openfst/bin/fstarcsort${CMAKE_EXECUTABLE_SUFFIX} - tools/openfst/bin/fstcompile${CMAKE_EXECUTABLE_SUFFIX} -@@ -29,63 +12,6 @@ set(LIBRARIES + ) + set(LIBRARIES src/lib/libkaldi-dragonfly${CMAKE_SHARED_LIBRARY_SUFFIX} ) @@ -87,30 +86,33 @@ index 66e6d49..78f7b42 100644 - message(FATAL_ERROR "KALDI_BRANCH not set! Use 'origin/master'?") - # set(KALDI_BRANCH "origin/master") -endif() - +- message("MAKE_EXE = ${MAKE_EXE}") message("PYTHON_EXECUTABLE = ${PYTHON_EXECUTABLE}") -@@ -99,63 +25,4 @@ message("CMAKE_CURRENT_BINARY_DIR = ${CMAKE_CURRENT_BINARY_DIR}") + message("PYTHON_INCLUDE_DIR = ${PYTHON_INCLUDE_DIR}") +@@ -94,65 +19,4 @@ message("CMAKE_CURRENT_BINARY_DIR = ${CMAKE_CURRENT_BINARY_DIR}") # CXXFLAGS are set and exported in kaldi-configure-wrapper.sh -if(NOT "${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows") - set(STRIP_LIBS_COMMAND find src/lib tools/openfst/lib -name *${CMAKE_SHARED_LIBRARY_SUFFIX} | xargs strip) -- set(STRIP_DST_COMMAND find ${DST} | xargs strip) +- # set(STRIP_DST_COMMAND find ${DST} [[[other specifiers]]] | xargs strip) - if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Darwin") - list(APPEND STRIP_LIBS_COMMAND -x) -- list(APPEND STRIP_DST_COMMAND -x) +- # list(APPEND STRIP_DST_COMMAND -x) - endif() +- # set(STRIP_LIBS_COMMAND true) +- set(STRIP_DST_COMMAND true) - ExternalProject_Add(kaldi - GIT_CONFIG advice.detachedHead=false - GIT_REPOSITORY https://github.com/daanzu/kaldi-fork-active-grammar.git - GIT_TAG ${KALDI_BRANCH} - GIT_SHALLOW TRUE -- CONFIGURE_COMMAND sed -i.bak -e "s/status=0/exit 0/g" tools/extras/check_dependencies.sh && cp ${PROJECT_SOURCE_DIR}/building/kaldi-configure-wrapper.sh src/ +- CONFIGURE_COMMAND sed -i.bak -e "s/status=0/exit 0/g" tools/extras/check_dependencies.sh && sed -i.bak -e "s/openfst_add_CXXFLAGS = -g -O2/openfst_add_CXXFLAGS = -g0 -O3/g" tools/Makefile && cp ${PROJECT_SOURCE_DIR}/building/kaldi-configure-wrapper.sh src/ - BUILD_IN_SOURCE TRUE -- BUILD_COMMAND ${MATHLIB_BUILD_COMMAND} && cd tools && ${MAKE_EXE} ${MAKE_FLAGS} && cd openfst && autoreconf && cd ../../src && bash ./kaldi-configure-wrapper.sh ./configure ${KALDI_CONFIG_FLAGS} && ${MAKE_EXE} ${MAKE_FLAGS} depend && ${MAKE_EXE} ${MAKE_FLAGS} dragonfly dragonflybin bin fstbin lmbin +- BUILD_COMMAND ${MATHLIB_BUILD_COMMAND} && cd tools && ${MAKE_EXE} ${MAKE_FLAGS} && cd openfst && autoreconf && cd ../../src && bash ./kaldi-configure-wrapper.sh ./configure ${KALDI_CONFIG_FLAGS} && ${MAKE_EXE} ${MAKE_FLAGS} depend && ${MAKE_EXE} ${MAKE_FLAGS} dragonfly - LIST_SEPARATOR " " -- INSTALL_COMMAND ${STRIP_LIBS_COMMAND} && mkdir -p ${DST} && cp ${BINARIES} ${LIBRARIES} ${DST} +- INSTALL_COMMAND ${STRIP_LIBS_COMMAND} && mkdir -p ${DST} && cp ${BINARIES} ${LIBRARIES} ${DST} && ${STRIP_DST_COMMAND} - ) -endif() - diff --git a/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/0002-exec-path.patch b/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/0002-exec-path.patch index 60f50d707db0..3a45ea7e104d 100644 --- a/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/0002-exec-path.patch +++ b/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/0002-exec-path.patch @@ -1,5 +1,5 @@ diff --git a/kaldi_active_grammar/utils.py b/kaldi_active_grammar/utils.py -index 0b70c7f..21e1d62 100644 +index 823f997..3850336 100644 --- a/kaldi_active_grammar/utils.py +++ b/kaldi_active_grammar/utils.py @@ -79,7 +79,7 @@ elif sys.platform.startswith('linux'): platform = 'linux' @@ -8,10 +8,10 @@ index 0b70c7f..21e1d62 100644 -exec_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'exec', platform) +exec_dir = '/' - library_extension = dict(windows='.dll', linux='.so', macos='.dylib')[platform] - subprocess_seperator = '^&' if platform == 'windows' else ';' -@@ -89,13 +89,13 @@ class ExternalProcess(object): + import ush + +@@ -87,13 +87,13 @@ class ExternalProcess(object): shell = ush.Shell(raise_on_error=True) diff --git a/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/default.nix b/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/default.nix index d5a906dd733b..46fc619b4cb3 100644 --- a/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/default.nix +++ b/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/default.nix @@ -50,6 +50,8 @@ buildPythonPackage rec { nativeBuildInputs = [ scikit-build cmake ]; propagatedBuildInputs = [ ush requests numpy cffi ]; + doCheck = false; # no tests exist + meta = with lib; { description = "Python Kaldi speech recognition"; homepage = "https://github.com/daanzu/kaldi-active-grammar"; diff --git a/nixpkgs/pkgs/development/python-modules/karton-config-extractor/default.nix b/nixpkgs/pkgs/development/python-modules/karton-config-extractor/default.nix index 71170ac5342e..ab092fc25605 100644 --- a/nixpkgs/pkgs/development/python-modules/karton-config-extractor/default.nix +++ b/nixpkgs/pkgs/development/python-modules/karton-config-extractor/default.nix @@ -3,17 +3,21 @@ , fetchFromGitHub , karton-core , malduck +, pythonOlder }: buildPythonPackage rec { pname = "karton-config-extractor"; - version = "2.0.1"; + version = "2.0.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; rev = "v${version}"; - sha256 = "1kq0gbfz9y0n0bcblyrmwv4la3lcf86lf80794sdvyvn49g0brny"; + sha256 = "sha256-r0WMtfau5zeVDSjxy2h96INQl8bm4EP0IAcgnGPhTtk="; }; propagatedBuildInputs = [ @@ -28,7 +32,10 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "karton.config_extractor" ]; + + pythonImportsCheck = [ + "karton.config_extractor" + ]; meta = with lib; { description = "Static configuration extractor for the Karton framework"; diff --git a/nixpkgs/pkgs/development/python-modules/karton-mwdb-reporter/default.nix b/nixpkgs/pkgs/development/python-modules/karton-mwdb-reporter/default.nix index 65bb683be2b8..f976e3fedba3 100644 --- a/nixpkgs/pkgs/development/python-modules/karton-mwdb-reporter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/karton-mwdb-reporter/default.nix @@ -3,17 +3,21 @@ , fetchFromGitHub , karton-core , mwdblib +, pythonOlder }: buildPythonPackage rec { pname = "karton-mwdb-reporter"; - version = "1.0.1"; + version = "unstable-2022-02-22"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; - rev = "v${version}"; - sha256 = "0jrn5c83nhcjny4bc879wrsgcr7mbazm51jzdkxmxyqf543cc841"; + rev = "1afa32251b4826eac4386596b4a20f295699faec"; + hash = "sha256-dbtIjWSNIRMccrGJspZMOBUD2EzuvW7xESlEwiOhKfQ="; }; propagatedBuildInputs = [ @@ -21,14 +25,12 @@ buildPythonPackage rec { mwdblib ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "mwdblib==3.4.0" "mwdblib" - ''; - # Project has no tests doCheck = false; - pythonImportsCheck = [ "karton.mwdb_reporter" ]; + + pythonImportsCheck = [ + "karton.mwdb_reporter" + ]; meta = with lib; { description = "Karton service that uploads analyzed artifacts and metadata to MWDB Core"; diff --git a/nixpkgs/pkgs/development/python-modules/kiss-headers/default.nix b/nixpkgs/pkgs/development/python-modules/kiss-headers/default.nix new file mode 100644 index 000000000000..0ceced85cacf --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/kiss-headers/default.nix @@ -0,0 +1,39 @@ +{ lib, buildPythonPackage, fetchFromGitHub, requests, pytestCheckHook }: + +buildPythonPackage rec { + pname = "kiss-headers"; + version = "2.3.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "Ousret"; + repo = pname; + rev = version; + sha256 = "sha256-/eTRyxFyAKQMzE/JjdoEN3w0lRiaIJcsJHTWV8M0CYQ="; + }; + + propagatedBuildInputs = [ requests ]; + + checkInputs = [ pytestCheckHook ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov=kiss_headers --doctest-modules --cov-report=term-missing -rxXs" "--doctest-modules -rxXs" + ''; + + disabledTestPaths = [ + # Tests require internet access + "kiss_headers/__init__.py" + "tests/test_serializer.py" + "tests/test_with_http_request.py" + ]; + + pythonImportsCheck = [ "kiss_headers" ]; + + meta = with lib; { + description = "Python package for HTTP/1.1 style headers"; + homepage = "https://github.com/Ousret/kiss-headers"; + license = licenses.mit; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/kombu/default.nix b/nixpkgs/pkgs/development/python-modules/kombu/default.nix index bb39b29c0d51..be4f4aad5665 100644 --- a/nixpkgs/pkgs/development/python-modules/kombu/default.nix +++ b/nixpkgs/pkgs/development/python-modules/kombu/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "kombu"; - version = "5.2.3"; + version = "5.2.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-gakMHel+CNPbN9vxY+qvZnRF4QaMmL/YnwUaQOn2270="; + hash = "sha256-N87j7nJflOqLsXPqq3wXYCA+pTu+uuImMoYA+dJ5lhA="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/lark/default.nix b/nixpkgs/pkgs/development/python-modules/lark/default.nix index 6c29a662524c..8fc32539d69d 100644 --- a/nixpkgs/pkgs/development/python-modules/lark/default.nix +++ b/nixpkgs/pkgs/development/python-modules/lark/default.nix @@ -3,17 +3,18 @@ , fetchFromGitHub , python , regex +, pytestCheckHook }: buildPythonPackage rec { pname = "lark"; - version = "1.0.0"; + version = "1.1.2"; src = fetchFromGitHub { owner = "lark-parser"; repo = "lark"; rev = version; - sha256 = "0pfvjh4ydc49gs6m8b3ip85c8nd4da2bhz9714fwcyl3hdp33q7n"; + sha256 = "sha256-Y1bDSiFnqAKTlIcd8aAgtc+I3TLnWF8hhQK2ez96TQs="; }; # Optional import, but fixes some re known bugs & allows advanced regex features @@ -26,15 +27,11 @@ buildPythonPackage rec { "lark.grammars" ]; - checkPhase = '' - runHook preCheck + checkInputs = [ pytestCheckHook ]; - # Official way to run the tests. Runs unittest internally. - # pytest produces issues with some test resource paths (relies on __main__) - ${python.interpreter} -m tests - - runHook postCheck - ''; + disabledTestPaths = [ + "tests/test_nearley/test_nearley.py" # requires unpackaged Js2Py library + ]; meta = with lib; { description = "A modern parsing library for Python, implementing Earley & LALR(1) and an easy interface"; diff --git a/nixpkgs/pkgs/development/python-modules/libcloud/default.nix b/nixpkgs/pkgs/development/python-modules/libcloud/default.nix index 77aa9e2927a5..d46e86ca106b 100644 --- a/nixpkgs/pkgs/development/python-modules/libcloud/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libcloud/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "apache-libcloud"; - version = "3.4.1"; + version = "3.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-iPGNoM8/rAr3I+dD+3QdnRviUYge2reloNFimVW1ARs="; + sha256 = "sha256-Bz8QSSl2+qODoisTuCwkmCfP6QoIPHFiDoMW6BWm2zs="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/librosa/default.nix b/nixpkgs/pkgs/development/python-modules/librosa/default.nix index c23b9df7cd78..21a58e7e9817 100644 --- a/nixpkgs/pkgs/development/python-modules/librosa/default.nix +++ b/nixpkgs/pkgs/development/python-modules/librosa/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "librosa"; - version = "0.9.0"; + version = "0.9.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zSFnXTuYWPjRs7FDKzYONoFFvtN4B+HxOwcRqozTkP0="; + sha256 = "sha256-ftXW4/RUbl48KEBpH53cVoePkUo1pQBg31/KKybUthQ="; }; propagatedBuildInputs = [ joblib matplotlib six scikit-learn decorator audioread resampy soundfile pooch ]; diff --git a/nixpkgs/pkgs/development/python-modules/libvirt/default.nix b/nixpkgs/pkgs/development/python-modules/libvirt/default.nix index a8e21a698f7f..d69885fcb0f3 100644 --- a/nixpkgs/pkgs/development/python-modules/libvirt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libvirt/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "libvirt"; - version = "7.10.0"; + version = "8.1.0"; src = assert version == libvirt.version; fetchFromGitLab { owner = "libvirt"; repo = "libvirt-python"; rev = "v${version}"; - sha256 = "sha256-I1FNjNwWRyDAUSq2Co9EnjAbzKQtS0Rx8vHgPsFzSYw="; + sha256 = "sha256-/uGxjptiqm5B823z4mcjredj9ZLZC2WTTqhQrQPVfDU="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/python-modules/localimport/default.nix b/nixpkgs/pkgs/development/python-modules/localimport/default.nix index 3c41618d5b83..c5bc45aae4f2 100644 --- a/nixpkgs/pkgs/development/python-modules/localimport/default.nix +++ b/nixpkgs/pkgs/development/python-modules/localimport/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "localimport"; - version = "1.7.3"; + version = "1.7.6"; src = fetchPypi { inherit pname version; - hash = "sha256-p7ACOzJRwH9hICMcxtVt/r+twEoFsDxPKGuarFnFIbo="; + hash = "sha256-8UhaZyGdN/N6UwR7pPYQR2hZCz3TrBxr1KOBJRx28ok="; }; pythonImportsCheck = [ "localimport" ]; diff --git a/nixpkgs/pkgs/development/python-modules/logical-unification/default.nix b/nixpkgs/pkgs/development/python-modules/logical-unification/default.nix new file mode 100644 index 000000000000..b89fcb25339e --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/logical-unification/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, toolz +, multipledispatch +, pytestCheckHook +, pytest-html +, pytest-benchmark +}: + +buildPythonPackage rec { + pname = "logical-unification"; + version = "0.4.5"; + + src = fetchFromGitHub { + owner = "pythological"; + repo = "unification"; + rev = "707cf4a39e27a4a8bf06b7e7dce7223085574e65"; + sha256 = "sha256-3wqO0pWWFRQeoGNvbSDdLNYFyjNnv+O++F7+vTBUJoI="; + }; + + propagatedBuildInputs = [ + toolz + multipledispatch + ]; + + checkInputs = [ + pytestCheckHook + pytest-html + pytest-benchmark # Needed for the `--benchmark-skip` flag + ]; + + pytestFlagsArray = [ + "--benchmark-skip" + "--html=testing-report.html" + "--self-contained-html" + ]; + + pythonImportsCheck = [ "unification" ]; + + meta = with lib; { + description = "Straightforward unification in Python that's extensible via generic functions"; + homepage = "https://github.com/pythological/unification"; + changelog = "https://github.com/pythological/unification/releases"; + license = licenses.bsd3; + maintainers = with maintainers; [ Etjean ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/losant-rest/default.nix b/nixpkgs/pkgs/development/python-modules/losant-rest/default.nix index 83ff792a62a3..6dac34a9f7a8 100644 --- a/nixpkgs/pkgs/development/python-modules/losant-rest/default.nix +++ b/nixpkgs/pkgs/development/python-modules/losant-rest/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "losant-rest"; - version = "1.15.2"; + version = "1.16.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Losant"; repo = "losant-rest-python"; rev = "v${version}"; - sha256 = "sha256-JmLQ3Hj9WnL/XfMxDiVAizGFASWMwF36ohp8asErUMM="; + sha256 = "sha256-1beURMpQ2klwupcd4wJZud6MnAKzwXPvVlobk/eSvXo="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/lupa/default.nix b/nixpkgs/pkgs/development/python-modules/lupa/default.nix index 681ef649d8fb..b2099e162d20 100644 --- a/nixpkgs/pkgs/development/python-modules/lupa/default.nix +++ b/nixpkgs/pkgs/development/python-modules/lupa/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "lupa"; - version = "1.10"; + version = "1.13"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4lEbJ/OB9v22bvQNzFGCFQOBl0MbJBk1Z438PVEXgjE="; + sha256 = "sha256-4dlKwqYw0nECfawsIdFCh3HZ6p1NiPFfIKd4E0DwKk4="; }; nativeBuildInputs = [ cython ]; diff --git a/nixpkgs/pkgs/development/python-modules/maestral/default.nix b/nixpkgs/pkgs/development/python-modules/maestral/default.nix index 90494de82233..ccbd70ff48e3 100644 --- a/nixpkgs/pkgs/development/python-modules/maestral/default.nix +++ b/nixpkgs/pkgs/development/python-modules/maestral/default.nix @@ -10,16 +10,18 @@ buildPythonPackage rec { pname = "maestral"; - version = "1.5.2"; + version = "1.5.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral"; rev = "v${version}"; - sha256 = "sha256-nFXgvFLw6ru/Sw3+LoZ7V09dyn0L21We/Dlwib2gZB8="; + sha256 = "sha256-Uo3vcYez2qSq162SSKjoCkwygwR5awzDceIq8/h3dao="; }; + format = "pyproject"; + propagatedBuildInputs = [ click desktop-notifier diff --git a/nixpkgs/pkgs/development/python-modules/mailchecker/default.nix b/nixpkgs/pkgs/development/python-modules/mailchecker/default.nix index 23146a4f5a7c..ab609b597a4e 100644 --- a/nixpkgs/pkgs/development/python-modules/mailchecker/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mailchecker/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "mailchecker"; - version = "4.1.12"; + version = "4.1.13"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-AqpT2Mqo5bjmKsu6WzVw/+AUOaSwlDfmXO0ufB6uc8A="; + hash = "sha256-4ez18K9ksVGjzspHHcw/Ja6hxoKTkYLBFn65m7VBWYk="; }; # Module has no tests diff --git a/nixpkgs/pkgs/development/python-modules/mariadb/default.nix b/nixpkgs/pkgs/development/python-modules/mariadb/default.nix index 251b69e8e67c..987fe203edb7 100644 --- a/nixpkgs/pkgs/development/python-modules/mariadb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mariadb/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "mariadb"; - version = "1.0.9"; + version = "1.0.10"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Aqmz0KB26aDQ6hxItF7Qm2R14rak6Mge2fHoLK87/Ck="; + hash = "sha256-eQKLpgURc9rRrQvnUYOJyrcCOfkrT/i4gT2uVcPyxT0="; extension = "zip"; }; diff --git a/nixpkgs/pkgs/development/python-modules/mat2/bubblewrap-path.patch b/nixpkgs/pkgs/development/python-modules/mat2/bubblewrap-path.patch new file mode 100644 index 000000000000..2c71930b6df8 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/mat2/bubblewrap-path.patch @@ -0,0 +1,35 @@ +diff --git a/libmat2/bubblewrap.py b/libmat2/bubblewrap.py +index 970d5dd..5d3c0b7 100644 +--- a/libmat2/bubblewrap.py ++++ b/libmat2/bubblewrap.py +@@ -22,11 +22,7 @@ CalledProcessError = subprocess.CalledProcessError + + + def _get_bwrap_path() -> str: +- which_path = shutil.which('bwrap') +- if which_path: +- return which_path +- +- raise RuntimeError("Unable to find bwrap") # pragma: no cover ++ return '@bwrap@' + + + def _get_bwrap_args(tempdir: str, +@@ -37,16 +33,11 @@ def _get_bwrap_args(tempdir: str, + + # XXX: use --ro-bind-try once all supported platforms + # have a bubblewrap recent enough to support it. +- ro_bind_dirs = ['/usr', '/lib', '/lib64', '/bin', '/sbin', '/etc/alternatives', cwd] ++ ro_bind_dirs = ['/nix/store', cwd] + for bind_dir in ro_bind_dirs: + if os.path.isdir(bind_dir): # pragma: no cover + ro_bind_args.extend(['--ro-bind', bind_dir, bind_dir]) + +- ro_bind_files = ['/etc/ld.so.cache'] +- for bind_file in ro_bind_files: +- if os.path.isfile(bind_file): # pragma: no cover +- ro_bind_args.extend(['--ro-bind', bind_file, bind_file]) +- + args = ro_bind_args + \ + ['--dev', '/dev', + '--proc', '/proc', diff --git a/nixpkgs/pkgs/development/python-modules/mat2/default.nix b/nixpkgs/pkgs/development/python-modules/mat2/default.nix index 97b52855f6ba..1d5a76b7b804 100644 --- a/nixpkgs/pkgs/development/python-modules/mat2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mat2/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , python , pythonOlder @@ -37,7 +38,6 @@ buildPythonPackage rec { # hardcode paths to some binaries (substituteAll ({ src = ./paths.patch; - bwrap = "${bubblewrap}/bin/bwrap"; exiftool = "${exiftool}/bin/exiftool"; ffmpeg = "${ffmpeg}/bin/ffmpeg"; } // lib.optionalAttrs dolphinIntegration { @@ -52,6 +52,11 @@ buildPythonPackage rec { src = ./fix_poppler.patch; poppler_path = "${poppler_gi}/lib/girepository-1.0"; }) + ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ + (substituteAll { + src = ./bubblewrap-path.patch; + bwrap = "${bubblewrap}/bin/bwrap"; + }) ]; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/mat2/paths.patch b/nixpkgs/pkgs/development/python-modules/mat2/paths.patch index 50b0c9aaa789..784e04cda383 100644 --- a/nixpkgs/pkgs/development/python-modules/mat2/paths.patch +++ b/nixpkgs/pkgs/development/python-modules/mat2/paths.patch @@ -12,41 +12,6 @@ index 41c8de4..11df258 100644 +Icon=@mat2svg@ +Exec=@kdialog@ --yesno "$( @mat2@ -s %F )" --title "Clean Metadata?" && @mat2@ %U +Exec[de]=@kdialog@ --yesno "$( @mat2@ -s %F )" --title "Metadaten löschen?" && @mat2@ %U -diff --git a/libmat2/bubblewrap.py b/libmat2/bubblewrap.py -index 970d5dd..5d3c0b7 100644 ---- a/libmat2/bubblewrap.py -+++ b/libmat2/bubblewrap.py -@@ -22,11 +22,7 @@ CalledProcessError = subprocess.CalledProcessError - - - def _get_bwrap_path() -> str: -- which_path = shutil.which('bwrap') -- if which_path: -- return which_path -- -- raise RuntimeError("Unable to find bwrap") # pragma: no cover -+ return '@bwrap@' - - - def _get_bwrap_args(tempdir: str, -@@ -37,16 +33,11 @@ def _get_bwrap_args(tempdir: str, - - # XXX: use --ro-bind-try once all supported platforms - # have a bubblewrap recent enough to support it. -- ro_bind_dirs = ['/usr', '/lib', '/lib64', '/bin', '/sbin', '/etc/alternatives', cwd] -+ ro_bind_dirs = ['/nix/store', cwd] - for bind_dir in ro_bind_dirs: - if os.path.isdir(bind_dir): # pragma: no cover - ro_bind_args.extend(['--ro-bind', bind_dir, bind_dir]) - -- ro_bind_files = ['/etc/ld.so.cache'] -- for bind_file in ro_bind_files: -- if os.path.isfile(bind_file): # pragma: no cover -- ro_bind_args.extend(['--ro-bind', bind_file, bind_file]) -- - args = ro_bind_args + \ - ['--dev', '/dev', - '--proc', '/proc', diff --git a/libmat2/exiftool.py b/libmat2/exiftool.py index eb65b2a..51a0fa1 100644 --- a/libmat2/exiftool.py diff --git a/nixpkgs/pkgs/development/python-modules/mathlibtools/default.nix b/nixpkgs/pkgs/development/python-modules/mathlibtools/default.nix index 517d74563aea..be1df56206d8 100644 --- a/nixpkgs/pkgs/development/python-modules/mathlibtools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mathlibtools/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "mathlibtools"; - version = "1.1.0"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "789f070f35424e89e4f2e2c007382250133cc48877627e37c5c463bcf4a1b58a"; + sha256 = "sha256-0iW7SWIxb+Ek4T26hru5EgBgXfqRh6zOR73GAgLFNyE="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/matrix-common/default.nix b/nixpkgs/pkgs/development/python-modules/matrix-common/default.nix index 44d37b988a7d..b1dd247987cf 100644 --- a/nixpkgs/pkgs/development/python-modules/matrix-common/default.nix +++ b/nixpkgs/pkgs/development/python-modules/matrix-common/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "matrix_common"; - version = "1.0.0"; + version = "1.1.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ZmiKRoJ8hv1USuJBDzV2U1uIFt2lRxmT+iAOqOShJK4="; + sha256 = "sha256-qCOHSK/Cs3B5gYNn/tUVbzVXcbB8j/ChdZNPR+D/MnY="; }; propagatedBuildInputs = [ attrs ]; diff --git a/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix b/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix index 0af337bc13ff..9a7c834c0ef3 100644 --- a/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "1.2.85"; + version = "1.2.90"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = version; - sha256 = "sha256-DFRnyWBQ3/g5NwZH5hoVYJfj3gN/UP57JvNSnNaqws4="; + sha256 = "sha256-n/M1Q6YS3EkUcn45ffiTy0wuj9yKf6qBLLfD2XJkhHU="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/mido/default.nix b/nixpkgs/pkgs/development/python-modules/mido/default.nix index 909c224685ce..25d8d492dd71 100644 --- a/nixpkgs/pkgs/development/python-modules/mido/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mido/default.nix @@ -4,9 +4,7 @@ , fetchPypi , substituteAll , portmidi -, pygame , python-rtmidi -, rtmidi-python , pytestCheckHook }: @@ -27,9 +25,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - pygame python-rtmidi - rtmidi-python ]; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/minikanren/default.nix b/nixpkgs/pkgs/development/python-modules/minikanren/default.nix new file mode 100644 index 000000000000..7452148e8e47 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/minikanren/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, toolz +, cons +, multipledispatch +, etuples +, logical-unification +, pytestCheckHook +, pytest-html +}: + +buildPythonPackage rec { + pname = "minikanren"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "pythological"; + repo = "kanren"; + rev = "5aa9b1734cbb3fe072a7c72b46e1b72a174d28ac"; + sha256 = "sha256-daAtREgm91634Q0mc0/WZivDiyZHC7TIRoGRo8hMnGE="; + }; + + propagatedBuildInputs = [ + toolz + cons + multipledispatch + etuples + logical-unification + ]; + + checkInputs = [ + pytestCheckHook + pytest-html + ]; + + pytestFlagsArray = [ + "--html=testing-report.html" + "--self-contained-html" + ]; + + pythonImportsCheck = [ "kanren" ]; + + meta = with lib; { + description = "Relational programming in Python"; + homepage = "https://github.com/pythological/kanren"; + changelog = "https://github.com/pythological/kanren/releases"; + license = licenses.bsd3; + maintainers = with maintainers; [ Etjean ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/minikerberos/default.nix b/nixpkgs/pkgs/development/python-modules/minikerberos/default.nix index f242ac69c25e..4b75006bea46 100644 --- a/nixpkgs/pkgs/development/python-modules/minikerberos/default.nix +++ b/nixpkgs/pkgs/development/python-modules/minikerberos/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "minikerberos"; - version = "0.2.17"; + version = "0.2.18"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-yoPUTwpsk8wimN9DXFFz6ZJi1tI0uAVcfAi5BiwsfJM="; + sha256 = "sha256-5bmuCbX4a69sP9SnHkB4OQrOHmFufUTlchHkgu6iBYk="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/mlflow/default.nix b/nixpkgs/pkgs/development/python-modules/mlflow/default.nix index 658470ec72b8..add6ee40de4c 100644 --- a/nixpkgs/pkgs/development/python-modules/mlflow/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mlflow/default.nix @@ -6,6 +6,7 @@ , six , flask , numpy +, scipy , pandas , python-dateutil , protobuf @@ -26,12 +27,12 @@ buildPythonPackage rec { pname = "mlflow"; - version = "1.22.0"; + version = "1.23.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "f680390715e436ae38cf7056ec91030fc9eb67cc631226f28ff9504fbe395add"; + sha256 = "03rfyhli7vbb1pz0zw75mdwj9pz3awxi3dadxn5glpwn953w6r5y"; }; # run into https://stackoverflow.com/questions/51203641/attributeerror-module-alembic-context-has-no-attribute-config @@ -46,6 +47,7 @@ buildPythonPackage rec { six flask numpy + scipy pandas python-dateutil protobuf @@ -64,14 +66,7 @@ buildPythonPackage rec { importlib-metadata ]; - patches = [ - # Relex alembic version, https://github.com/mlflow/mlflow/pull/5245 - (fetchpatch { - name = "relax-alembic-version.patch"; - url = "https://github.com/mlflow/mlflow/commit/945eb4b67f315c0b2c4018b1df006fde910f115f.patch"; - sha256 = "sha256-jETVEPzlNe0PvFZVOi1SwgJELfx/KCeq6REL3vl+YT0="; - }) - ]; + pythonImportsCheck = [ "mlflow" ]; meta = with lib; { homepage = "https://github.com/mlflow/mlflow"; diff --git a/nixpkgs/pkgs/development/python-modules/monty/default.nix b/nixpkgs/pkgs/development/python-modules/monty/default.nix index 16205286c003..ea95e2b2d85d 100644 --- a/nixpkgs/pkgs/development/python-modules/monty/default.nix +++ b/nixpkgs/pkgs/development/python-modules/monty/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "monty"; - version = "2022.1.12.1"; + version = "2022.1.19"; disabled = pythonOlder "3.5"; # uses type annotations src = fetchFromGitHub { owner = "materialsvirtuallab"; repo = pname; rev = "v${version}"; - sha256 = "11bp3zkmqffc6rqw93qfk8d905mzc10nqbjmvj2bay8h197q0dg2"; + sha256 = "sha256-CGYYPpXRBvqf6GJYYZUARpzt4XFc5uAw91n21UInYpU="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/motionblinds/default.nix b/nixpkgs/pkgs/development/python-modules/motionblinds/default.nix index f6f176dcd572..8bed74a4d520 100644 --- a/nixpkgs/pkgs/development/python-modules/motionblinds/default.nix +++ b/nixpkgs/pkgs/development/python-modules/motionblinds/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "motionblinds"; - version = "0.5.13"; + version = "0.6.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "motion-blinds"; rev = version; - sha256 = "sha256-7o8mov8uV5ZrEYvX1qPSMT2T8Jb/1eV2MytU+1SEYfY="; + sha256 = "sha256-31ofLiBQjSMDtptgYF5rqS1bB5UDUbsbo25Nrk4WvIY="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/mwdblib/default.nix b/nixpkgs/pkgs/development/python-modules/mwdblib/default.nix index 53ca11459efe..96c3f193396e 100644 --- a/nixpkgs/pkgs/development/python-modules/mwdblib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mwdblib/default.nix @@ -8,18 +8,22 @@ , keyring , python , python-dateutil +, pythonOlder , requests }: buildPythonPackage rec { pname = "mwdblib"; - version = "3.4.1"; + version = "4.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jCtK3Fk725EaA26GG6j6xqEMFH4Qq92QWrJ7sxcWRaY="; + sha256 = "sha256-afqE6zL1uwsLNAuy5XY7OduP1e3W2ueteOOVaFJg3b0="; }; propagatedBuildInputs = [ @@ -38,7 +42,9 @@ buildPythonPackage rec { runHook postCheck ''; - pythonImportsCheck = [ "mwdblib" ]; + pythonImportsCheck = [ + "mwdblib" + ]; meta = with lib; { description = "Python client library for the mwdb service"; 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 4bb371456373..b224d40ee0bc 100644 --- a/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "mypy-boto3-builder"; - version = "7.1.2"; + version = "7.3.0"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "vemel"; repo = "mypy_boto3_builder"; rev = version; - hash = "sha256-p81Dk6Kv0MzHvexhM8Su5/yIpB+ZGBFqOtm0D18l26s="; + hash = "sha256-X/dPO2p6GmnyJwcVPOmyo9zYda2uYfBAkuKTeX0Bt0Q="; }; nativeBuildInputs = [ 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 bddccabf067f..4f33912d3dfe 100644 --- a/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.21.0"; + version = "1.21.7"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-3P3dThYXpmtZ/cn+NCDS9RNtu6N48Vb78ZqmCdkTK50="; + hash = "sha256-SWzL6AMXoZzYw3LwrBdvbe9JzLMudZioKZWo7HtHM8U="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/neo/default.nix b/nixpkgs/pkgs/development/python-modules/neo/default.nix index 27da5b71b68b..d6be449eb1b1 100644 --- a/nixpkgs/pkgs/development/python-modules/neo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/neo/default.nix @@ -9,25 +9,36 @@ buildPythonPackage rec { pname = "neo"; - version = "0.10.0"; - disabled = pythonOlder "3.6"; + version = "0.10.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0lw3r9p1ky1cswhrs9radc0vq1qfzbrk7qd00f34g96g30zab4g5"; + sha256 = "sha256-LUIYsIJtruqIDhVSJwYAKew4oAI4zrXwlxONlGfGOZs="; }; - propagatedBuildInputs = [ numpy quantities ]; + propagatedBuildInputs = [ + numpy + quantities + ]; - checkInputs = [ nose ]; + checkInputs = [ + nose + ]; checkPhase = '' nosetests --exclude=iotest ''; + pythonImportsCheck = [ + "neo" + ]; + meta = with lib; { + description = "Package for representing electrophysiology data"; homepage = "https://neuralensemble.org/neo/"; - description = "Package for representing electrophysiology data in Python"; license = licenses.bsd3; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/nextcord/default.nix b/nixpkgs/pkgs/development/python-modules/nextcord/default.nix new file mode 100644 index 000000000000..ab814061b58d --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/nextcord/default.nix @@ -0,0 +1,64 @@ +{ lib +, stdenv +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, substituteAll +, ffmpeg +, libopus +, aiohttp +, aiodns +, brotli +, cchardet +, orjson +, pynacl +}: + +buildPythonPackage rec { + pname = "nextcord"; + version = "2.0.0a9"; + + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "nextcord"; + repo = "nextcord"; + rev = version; + hash = "sha256-9UJLfSYud/pIkIkJ75jE3pxsYm5bKNNRCwjDerDHp9c="; + }; + + patches = [ + (substituteAll { + src = ./paths.patch; + ffmpeg = "${ffmpeg}/bin/ffmpeg"; + libopus = "${libopus}/lib/libopus${stdenv.hostPlatform.extensions.sharedLibrary}"; + }) + ]; + + propagatedBuildInputs = [ + aiodns + aiohttp + brotli + cchardet + orjson + pynacl + ]; + + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ + "nextcord" + "nextcord.ext.commands" + "nextcord.ext.tasks" + ]; + + meta = with lib; { + description = "Python wrapper for the Discord API forked from discord.py"; + homepage = "https://github.com/nextcord/nextcord"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/nextcord/paths.patch b/nixpkgs/pkgs/development/python-modules/nextcord/paths.patch new file mode 100644 index 000000000000..389637a18878 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/nextcord/paths.patch @@ -0,0 +1,26 @@ +diff --git a/nextcord/opus.py b/nextcord/opus.py +index 97d437a3..755e1a5c 100644 +--- a/nextcord/opus.py ++++ b/nextcord/opus.py +@@ -213,7 +213,7 @@ def _load_default() -> bool: + _filename = os.path.join(_basedir, 'bin', f'libopus-0.{_target}.dll') + _lib = libopus_loader(_filename) + else: +- _lib = libopus_loader(ctypes.util.find_library('opus')) ++ _lib = libopus_loader('@libopus@') + except Exception: + _lib = None + +diff --git a/nextcord/player.py b/nextcord/player.py +index bedefc5a..34de0459 100644 +--- a/nextcord/player.py ++++ b/nextcord/player.py +@@ -140,7 +140,7 @@ class FFmpegAudio(AudioSource): + .. versionadded:: 1.3 + """ + +- def __init__(self, source: Union[str, io.BufferedIOBase], *, executable: str = 'ffmpeg', args: Any, **subprocess_kwargs: Any): ++ def __init__(self, source: Union[str, io.BufferedIOBase], *, executable: str = '@ffmpeg@', args: Any, **subprocess_kwargs: Any): + piping = subprocess_kwargs.get('stdin') == subprocess.PIPE + if piping and isinstance(source, str): + raise TypeError("parameter conflict: 'source' parameter cannot be a string when piping to stdin") diff --git a/nixpkgs/pkgs/development/python-modules/nitransforms/default.nix b/nixpkgs/pkgs/development/python-modules/nitransforms/default.nix index 79fd93d32123..695c674e0dce 100644 --- a/nixpkgs/pkgs/development/python-modules/nitransforms/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nitransforms/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "nitransforms"; - version = "21.0.0"; + version = "22.0.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "njJqHqXVxldyGfmdM8GmgKdgIT4kMYLzcM5+ayR2EDo="; + sha256 = "sha256-iV9TEIGogIfbj+fmOGftoQqEdtZiewbHEw3hYlMEP4c="; }; buildInputs = [ setuptools-scm toml ]; diff --git a/nixpkgs/pkgs/development/python-modules/numba-scipy/default.nix b/nixpkgs/pkgs/development/python-modules/numba-scipy/default.nix new file mode 100644 index 000000000000..c8f84cbf43f5 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/numba-scipy/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, scipy +, numba +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "numba-scipy"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-qJeoWiG1LdtFB9cME1d8xVaC0BXGDJEYjCOEdHvSkmQ="; + }; + + propagatedBuildInputs = [ + scipy + numba + ]; + + postPatch = '' + substituteInPlace setup.py --replace "scipy>=0.16,<=1.6.2" "scipy>=0.16,<=1.7.3" + ''; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "numba" ]; + + meta = with lib; { + description = "Extends Numba to make it aware of SciPy"; + homepage = "https://github.com/numba/numba-scipy"; + changelog = "https://github.com/numba/numba-scipy/blob/master/CHANGE_LOG"; + license = licenses.bsd2; + maintainers = with maintainers; [ Etjean ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/oci/default.nix b/nixpkgs/pkgs/development/python-modules/oci/default.nix index 8da783dbdb27..8fd06ae3b403 100644 --- a/nixpkgs/pkgs/development/python-modules/oci/default.nix +++ b/nixpkgs/pkgs/development/python-modules/oci/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.56.0"; + version = "2.60.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "oracle"; repo = "oci-python-sdk"; rev = "v${version}"; - hash = "sha256-olrWv4c2DoZ7ddm58Wpb5jZntw8WEKJ6IzAND11tdjk="; + hash = "sha256-fXeea4MftVSJWzanHeAuERRiQLBp8l1l1Cw2lG3uz24="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/openai/default.nix b/nixpkgs/pkgs/development/python-modules/openai/default.nix index 3c557eabb9dc..bbe9d4a01caf 100644 --- a/nixpkgs/pkgs/development/python-modules/openai/default.nix +++ b/nixpkgs/pkgs/development/python-modules/openai/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "openai"; - version = "0.14.0"; + version = "0.15.0"; disabled = pythonOlder "3.7.1"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "v${version}"; - sha256 = "sha256-AFfbMeYxdZaIABhf4XpszhLvFuMJebhl07sv9kuiknA="; + sha256 = "sha256-HOMBVrAz3cP8r4w8CKXKy6epxf00myYJiKv1PQ1iqhQ="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/opensfm/0002-cmake-find-system-distributed-gtest.patch b/nixpkgs/pkgs/development/python-modules/opensfm/0002-cmake-find-system-distributed-gtest.patch new file mode 100644 index 000000000000..27b87c0b2d09 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/opensfm/0002-cmake-find-system-distributed-gtest.patch @@ -0,0 +1,57 @@ +From 79577371be21df40f1f6d4a4fe3453be6df9e93c Mon Sep 17 00:00:00 2001 +From: Someone Serge <sergei.kozlukov@aalto.fi> +Date: Fri, 31 Dec 2021 10:03:25 +0200 +Subject: [PATCH 2/4] cmake: find system-distributed gtest + +--- + opensfm/src/CMakeLists.txt | 19 +++++++------------ + 1 file changed, 7 insertions(+), 12 deletions(-) + +diff --git a/opensfm/src/CMakeLists.txt b/opensfm/src/CMakeLists.txt +index c85aa6fb..640d47a6 100644 +--- a/opensfm/src/CMakeLists.txt ++++ b/opensfm/src/CMakeLists.txt +@@ -52,12 +52,14 @@ if (OPENMP_FOUND) + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") + endif() + ++find_package(gflags REQUIRED) ++ + find_package(LAPACK) + find_package(SuiteSparse) + find_package(Eigen3 REQUIRED) + find_package(Ceres) +-find_package(Gflags REQUIRED) +-find_package(Glog REQUIRED) ++find_package(glog REQUIRED) ++find_package(GTest REQUIRED) + + # Ceres2 exposes Ceres::ceres target. + # Ceres1 exposes just ceres. +@@ -100,20 +102,13 @@ option(OPENSFM_BUILD_TESTS "Build OpenSfM unit tests." on) + + if (OPENSFM_BUILD_TESTS) + enable_testing() +- include_directories(third_party/gtest) +- add_definitions(-DCERES_GFLAGS_NAMESPACE=${GFLAGS_NAMESPACE}) +- +- add_library(gtest +- third_party/gtest/gmock_gtest_all.cc +- third_party/gtest/gmock_main.cc) +- target_include_directories(gtest PRIVATE ${GFLAGS_INCLUDE_DIR}) + + set(TEST_MAIN test_main) + add_library(${TEST_MAIN} testing_main.cc) + target_link_libraries(${TEST_MAIN} +- ${GFLAGS_LIBRARY} +- ${GLOG_LIBRARY} +- gtest) ++ gflags ++ glog::glog ++ GTest::gtest) + endif() + + ####### OpenSfM libraries ####### +-- +2.33.1 + diff --git a/nixpkgs/pkgs/development/python-modules/opensfm/0003-cmake-use-system-pybind11.patch b/nixpkgs/pkgs/development/python-modules/opensfm/0003-cmake-use-system-pybind11.patch new file mode 100644 index 000000000000..2815886e7e18 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/opensfm/0003-cmake-use-system-pybind11.patch @@ -0,0 +1,161 @@ +From 36820fbab1abeeebd99f14e368093e0e3f934ca7 Mon Sep 17 00:00:00 2001 +From: Someone Serge <sergei.kozlukov@aalto.fi> +Date: Sat, 19 Feb 2022 02:37:54 +0200 +Subject: [PATCH 3/4] cmake: use system pybind11 + +--- + opensfm/src/CMakeLists.txt | 3 ++- + opensfm/src/bundle/CMakeLists.txt | 2 +- + opensfm/src/dense/CMakeLists.txt | 2 +- + opensfm/src/features/CMakeLists.txt | 1 - + opensfm/src/foundation/CMakeLists.txt | 1 - + opensfm/src/geo/CMakeLists.txt | 1 - + opensfm/src/geometry/CMakeLists.txt | 1 - + opensfm/src/map/CMakeLists.txt | 3 +-- + opensfm/src/robust/CMakeLists.txt | 1 - + opensfm/src/sfm/CMakeLists.txt | 1 - + 10 files changed, 5 insertions(+), 11 deletions(-) + +diff --git a/opensfm/src/CMakeLists.txt b/opensfm/src/CMakeLists.txt +index 640d47a6..6e391ffa 100644 +--- a/opensfm/src/CMakeLists.txt ++++ b/opensfm/src/CMakeLists.txt +@@ -54,6 +54,8 @@ endif() + + find_package(gflags REQUIRED) + ++find_package(pybind11 REQUIRED) ++ + find_package(LAPACK) + find_package(SuiteSparse) + find_package(Eigen3 REQUIRED) +@@ -82,7 +84,6 @@ else() + endif() + + ####### Third party libraries ####### +-add_subdirectory(third_party/pybind11) + add_subdirectory(third_party/akaze) + add_subdirectory(third_party/vlfeat) + +diff --git a/opensfm/src/bundle/CMakeLists.txt b/opensfm/src/bundle/CMakeLists.txt +index 7cd9cf74..307e963a 100644 +--- a/opensfm/src/bundle/CMakeLists.txt ++++ b/opensfm/src/bundle/CMakeLists.txt +@@ -52,7 +52,7 @@ target_link_libraries(pybundle PRIVATE + bundle + geometry + foundation +- pybind11) ++) + set_target_properties(pybundle PROPERTIES + LIBRARY_OUTPUT_DIRECTORY "${opensfm_SOURCE_DIR}/.." + ) +diff --git a/opensfm/src/dense/CMakeLists.txt b/opensfm/src/dense/CMakeLists.txt +index cbebb5ea..2728749d 100644 +--- a/opensfm/src/dense/CMakeLists.txt ++++ b/opensfm/src/dense/CMakeLists.txt +@@ -23,7 +23,7 @@ endif() + + pybind11_add_module(pydense python/pybind.cc) + target_include_directories(pydense PRIVATE ${GLOG_INCLUDE_DIR}) +-target_link_libraries(pydense PRIVATE dense foundation pybind11) ++target_link_libraries(pydense PRIVATE dense foundation) + set_target_properties(pydense PROPERTIES + LIBRARY_OUTPUT_DIRECTORY "${opensfm_SOURCE_DIR}/.." + ) +diff --git a/opensfm/src/features/CMakeLists.txt b/opensfm/src/features/CMakeLists.txt +index b131d30a..6db5b3f1 100644 +--- a/opensfm/src/features/CMakeLists.txt ++++ b/opensfm/src/features/CMakeLists.txt +@@ -22,7 +22,6 @@ target_link_libraries(pyfeatures + PRIVATE + features + foundation +- pybind11 + akaze + ) + set_target_properties(pyfeatures PROPERTIES +diff --git a/opensfm/src/foundation/CMakeLists.txt b/opensfm/src/foundation/CMakeLists.txt +index 40185227..9e0e45e7 100644 +--- a/opensfm/src/foundation/CMakeLists.txt ++++ b/opensfm/src/foundation/CMakeLists.txt +@@ -12,7 +12,6 @@ set(FOUNDATION_FILES + add_library(foundation ${FOUNDATION_FILES}) + target_link_libraries(foundation + PUBLIC +- pybind11 + ${OpenCV_LIBS} + ${OpenMP_libomp_LIBRARY} + Eigen3::Eigen +diff --git a/opensfm/src/geo/CMakeLists.txt b/opensfm/src/geo/CMakeLists.txt +index a9cbae02..75620d06 100644 +--- a/opensfm/src/geo/CMakeLists.txt ++++ b/opensfm/src/geo/CMakeLists.txt +@@ -29,7 +29,6 @@ target_link_libraries(pygeo + PRIVATE + geo + foundation +- pybind11 + ) + set_target_properties(pygeo PROPERTIES + LIBRARY_OUTPUT_DIRECTORY "${opensfm_SOURCE_DIR}/.." +diff --git a/opensfm/src/geometry/CMakeLists.txt b/opensfm/src/geometry/CMakeLists.txt +index e6dda2c2..51bfd6c5 100644 +--- a/opensfm/src/geometry/CMakeLists.txt ++++ b/opensfm/src/geometry/CMakeLists.txt +@@ -48,7 +48,6 @@ target_link_libraries(pygeometry + PRIVATE + geometry + foundation +- pybind11 + ) + set_target_properties(pygeometry PROPERTIES + LIBRARY_OUTPUT_DIRECTORY "${opensfm_SOURCE_DIR}/.." +diff --git a/opensfm/src/map/CMakeLists.txt b/opensfm/src/map/CMakeLists.txt +index b6f67bcd..f869aa4c 100644 +--- a/opensfm/src/map/CMakeLists.txt ++++ b/opensfm/src/map/CMakeLists.txt +@@ -20,7 +20,7 @@ set(MAP_FILES + add_library(map ${MAP_FILES}) + target_link_libraries(map + PUBLIC +- pybind11 ++ pybind11::module + Eigen3::Eigen + PRIVATE + geo +@@ -39,7 +39,6 @@ target_link_libraries(pymap + map + geometry + bundle +- pybind11 + ) + + if (OPENSFM_BUILD_TESTS) +diff --git a/opensfm/src/robust/CMakeLists.txt b/opensfm/src/robust/CMakeLists.txt +index ce70749f..40bdf7a4 100644 +--- a/opensfm/src/robust/CMakeLists.txt ++++ b/opensfm/src/robust/CMakeLists.txt +@@ -29,7 +29,6 @@ target_link_libraries(pyrobust + PRIVATE + robust + foundation +- pybind11 + ) + set_target_properties(pyrobust PROPERTIES + LIBRARY_OUTPUT_DIRECTORY "${opensfm_SOURCE_DIR}/.." +diff --git a/opensfm/src/sfm/CMakeLists.txt b/opensfm/src/sfm/CMakeLists.txt +index 98c28f41..7f56b791 100644 +--- a/opensfm/src/sfm/CMakeLists.txt ++++ b/opensfm/src/sfm/CMakeLists.txt +@@ -35,7 +35,6 @@ target_include_directories(pysfm PRIVATE ${GLOG_INCLUDE_DIR}) + target_link_libraries(pysfm + PRIVATE + foundation +- pybind11 + sfm + ) + set_target_properties(pysfm PROPERTIES +-- +2.33.1 + diff --git a/nixpkgs/pkgs/development/python-modules/opensfm/0004-pybind_utils.h-conflicts-with-nixpkgs-pybind.patch b/nixpkgs/pkgs/development/python-modules/opensfm/0004-pybind_utils.h-conflicts-with-nixpkgs-pybind.patch new file mode 100644 index 000000000000..f3cb2db00ecb --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/opensfm/0004-pybind_utils.h-conflicts-with-nixpkgs-pybind.patch @@ -0,0 +1,86 @@ +From c35b110a83286e7413d7309eb218eb43b52f7d48 Mon Sep 17 00:00:00 2001 +From: Someone Serge <sergei.kozlukov@aalto.fi> +Date: Sat, 19 Feb 2022 14:36:12 +0200 +Subject: [PATCH 4/4] pybind_utils.h: conflicts with nixpkgs' pybind + +--- + opensfm/src/map/pybind_utils.h | 45 +++------------------------------- + 1 file changed, 3 insertions(+), 42 deletions(-) + +diff --git a/opensfm/src/map/pybind_utils.h b/opensfm/src/map/pybind_utils.h +index 817d1a16..3f98a2ab 100644 +--- a/opensfm/src/map/pybind_utils.h ++++ b/opensfm/src/map/pybind_utils.h +@@ -52,38 +52,6 @@ struct sfm_iterator_state { + }; + PYBIND11_NAMESPACE_END_(detail) + +-/// Makes an python iterator over the keys (`.first`) of a iterator over pairs +-/// from a first and past-the-end InputIterator. +-template <return_value_policy Policy = return_value_policy::reference_internal, +- typename Iterator, typename Sentinel, +- typename KeyType = decltype((*std::declval<Iterator>()).second), +- typename... Extra> +-iterator make_value_iterator(Iterator first, Sentinel last, Extra &&... extra) { +- typedef detail::sfm_iterator_state<Iterator, Sentinel, detail::RefIterator, +- Policy> +- state; +- +- if (!detail::get_type_info(typeid(state), false)) { +- class_<state>(handle(), "iterator", pybind11::module_local()) +- .def("__iter__", [](state &s) -> state & { return s; }) +- .def("__next__", +- [](state &s) -> KeyType { +- if (!s.first_or_done) +- ++s.it; +- else +- s.first_or_done = false; +- if (s.it == s.end) { +- s.first_or_done = true; +- throw stop_iteration(); +- } +- return (*s.it).second; +- }, +- std::forward<Extra>(extra)..., Policy); +- } +- +- return cast(state{first, last, true}); +-} +- + template <return_value_policy Policy = return_value_policy::reference_internal, + typename Iterator, typename Sentinel, + typename KeyType = decltype(&((*std::declval<Iterator>()).second)), +@@ -148,12 +116,13 @@ iterator make_ref_iterator(Iterator first, Sentinel last, Extra &&... extra) { + } + + /// Makes a python iterator from a first and past-the-end C++ InputIterator. +-template <return_value_policy Policy = return_value_policy::reference_internal, ++template <typename Access, ++ return_value_policy Policy = return_value_policy::reference_internal, + typename Iterator, typename Sentinel, + typename ValueType = decltype(std::declval<Iterator>()), + typename... Extra> + iterator make_ptr_iterator(Iterator first, Sentinel last, Extra &&... extra) { +- typedef detail::iterator_state<Iterator, Sentinel, false, Policy> state; ++ typedef detail::iterator_state<Access, Policy, Iterator, Sentinel, ValueType, Extra...> state; + + if (!detail::get_type_info(typeid(state), false)) { + class_<state>(handle(), "iterator", pybind11::module_local()) +@@ -176,14 +145,6 @@ iterator make_ptr_iterator(Iterator first, Sentinel last, Extra &&... extra) { + return cast(state{first, last, true}); + } + +-/// Makes an iterator over the keys (`.first`) of a stl map-like container +-/// supporting `std::begin()`/`std::end()` +-template <return_value_policy Policy = return_value_policy::reference_internal, +- typename Type, typename... Extra> +-iterator make_value_iterator(Type &value, Extra &&... extra) { +- return make_value_iterator<Policy>(std::begin(value), std::end(value), +- extra...); +-} + template <return_value_policy Policy = return_value_policy::reference_internal, + typename Type, typename... Extra> + iterator make_unique_ptr_value_iterator(Type &value, Extra &&... extra) { +-- +2.33.1 + diff --git a/nixpkgs/pkgs/development/python-modules/opensfm/default.nix b/nixpkgs/pkgs/development/python-modules/opensfm/default.nix new file mode 100644 index 000000000000..dec998f451c1 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/opensfm/default.nix @@ -0,0 +1,127 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, cmake +, opencv4 +, ceres-solver +, suitesparse +, metis +, eigen +, pkg-config +, pybind11 +, numpy +, pyyaml +, lapack +, gtest +, gflags +, glog +, pytestCheckHook +, networkx +, pillow +, exifread +, gpxpy +, pyproj +, python-dateutil +, joblib +, repoze_lru +, xmltodict +, cloudpickle +, scipy +, sphinx +, matplotlib +, fpdf +, +}: + +let + ceresSplit = (builtins.length ceres-solver.outputs) > 1; + ceres' = + if ceresSplit + then ceres-solver.dev + else ceres-solver; +in +buildPythonPackage rec { + pname = "OpenSfM"; + version = "0.5.2"; + + src = fetchFromGitHub { + owner = "mapillary"; + repo = pname; + rev = "79aa4bdd8bd08dc0cd9e3086d170cedb29ac9760"; + sha256 = "sha256-dHBrkYwLA1OUxUSoe7DysyeEm9Yy70tIJvAsXivdjrM="; + }; + patches = [ + (fetchpatch { + url = "https://github.com/mapillary/OpenSfM/pull/872/commits/a76671db11038f3f4dfe5b8f17582fb447ad7dd5.patch"; + sha256 = "sha256-4nizQiZIjucdydOLrETvs1xdV3qiYqAQ7x1HECKvlHs="; + }) + ./0002-cmake-find-system-distributed-gtest.patch + ./0003-cmake-use-system-pybind11.patch + ./0004-pybind_utils.h-conflicts-with-nixpkgs-pybind.patch + ./fix-scripts.patch + ]; + postPatch = '' + rm opensfm/src/cmake/FindGlog.cmake + rm opensfm/src/cmake/FindGflags.cmake + + # HAHOG is the default descriptor. + # We'll test both HAHOG and SIFT because this is + # where segfaults might be introduced in future + echo 'feature_type: SIFT' >> data/berlin/config.yaml + echo 'feature_type: HAHOG' >> data/lund/config.yaml + ''; + + nativeBuildInputs = [ cmake pkg-config sphinx ]; + buildInputs = [ + ceres' + suitesparse + metis + eigen + lapack + gflags + gtest + glog + pybind11 + ]; + propagatedBuildInputs = [ + numpy + scipy + pyyaml + opencv4 + networkx + pillow + matplotlib + fpdf + exifread + gpxpy + pyproj + python-dateutil + joblib + repoze_lru + xmltodict + cloudpickle + ]; + checkInputs = [ pytestCheckHook ]; + + dontUseCmakeBuildDir = true; + cmakeFlags = [ + "-Bcmake_build" + "-Sopensfm/src" + ]; + + disabledTests = lib.optionals stdenv.isDarwin [ + "test_reconstruction_incremental" + "test_reconstruction_triangulation" + ]; + + pythonImportsCheck = [ "opensfm" ]; + + meta = { + maintainers = [ lib.maintainers.SomeoneSerge ]; + license = lib.licenses.bsd2; + description = "Open source Structure-from-Motion pipeline from Mapillary"; + homepage = "https://opensfm.org/"; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/opensfm/fix-scripts.patch b/nixpkgs/pkgs/development/python-modules/opensfm/fix-scripts.patch new file mode 100644 index 000000000000..634820a32755 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/opensfm/fix-scripts.patch @@ -0,0 +1,41 @@ +diff --git a/bin/opensfm b/bin/opensfm +index b5ee4b15..f05c0d1c 100755 +--- a/bin/opensfm ++++ b/bin/opensfm +@@ -1,12 +1,6 @@ +-#!/bin/bash ++#!/usr/bin/env bash + set -e + + DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) + +-if [ -x "$(command -v python3)" ]; then +- PYTHON=python3 +-else +- PYTHON=python +-fi +- +-"$PYTHON" "$DIR"/opensfm_main.py "$@" ++exec "$DIR"/opensfm_main.py "$@" +diff --git a/bin/opensfm_main.py b/bin/opensfm_main.py +index 31249e12..cc71560c 100755 +--- a/bin/opensfm_main.py ++++ b/bin/opensfm_main.py +@@ -1,3 +1,5 @@ ++#!/usr/bin/env python ++ + import sys + from os.path import abspath, join, dirname + +diff --git a/setup.py b/setup.py +index 1120717f..438a16db 100644 +--- a/setup.py ++++ b/setup.py +@@ -71,6 +71,7 @@ setuptools.setup( + scripts=[ + "bin/opensfm_run_all", + "bin/opensfm", ++ "bin/opensfm_main.py", + ], + package_data={ + "opensfm": [ diff --git a/nixpkgs/pkgs/development/python-modules/orderedset/default.nix b/nixpkgs/pkgs/development/python-modules/orderedset/default.nix index db9c265ef3ef..9910aefe1cbe 100644 --- a/nixpkgs/pkgs/development/python-modules/orderedset/default.nix +++ b/nixpkgs/pkgs/development/python-modules/orderedset/default.nix @@ -14,5 +14,8 @@ buildPythonPackage rec { homepage = "https://pypi.python.org/pypi/orderedset"; license = licenses.bsd3; maintainers = [ maintainers.jtojnar ]; + # No support for Python 3.9/3.10 + # https://github.com/simonpercivall/orderedset/issues/36 + broken = true; }; } diff --git a/nixpkgs/pkgs/development/python-modules/ormar/default.nix b/nixpkgs/pkgs/development/python-modules/ormar/default.nix index d5b9b7cf88e8..bbf95e98cffe 100644 --- a/nixpkgs/pkgs/development/python-modules/ormar/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ormar/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "ormar"; - version = "0.10.24"; + version = "0.10.25"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "collerek"; repo = pname; rev = version; - hash = "sha256-zKugeGDcYDI4VKspJPWeZCBubTqMxxfOVQCuF4pC49E="; + hash = "sha256-AggrsXw9fUYfc38AiSDSoh7SIEf4gPf+LlAvrxZiFL4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/oslo-db/default.nix b/nixpkgs/pkgs/development/python-modules/oslo-db/default.nix index 5070b43515e8..3fd7c4e28c5c 100644 --- a/nixpkgs/pkgs/development/python-modules/oslo-db/default.nix +++ b/nixpkgs/pkgs/development/python-modules/oslo-db/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "oslo-db"; - version = "11.1.0"; + version = "11.2.0"; src = fetchPypi { pname = "oslo.db"; inherit version; - sha256 = "8469c54544f1c0d7ac0a998477033eab13733b186d159554311c6132b43862e9"; + sha256 = "sha256-ezppPrC1BEkUmiJWGMdQtvDhZWyEJoGEe0e4UK1FYL4="; }; nativeBuildInputs = [ pbr ]; diff --git a/nixpkgs/pkgs/development/python-modules/panel/default.nix b/nixpkgs/pkgs/development/python-modules/panel/default.nix index 8673c637eda6..c5da10a30b07 100644 --- a/nixpkgs/pkgs/development/python-modules/panel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/panel/default.nix @@ -9,40 +9,23 @@ , pyct , testpath , tqdm -, callPackage +, nodejs }: -let - node = callPackage ./node { }; -in buildPythonPackage rec { pname = "panel"; version = "0.12.6"; - # Don't forget to also update the node packages - # 1. retrieve the package.json file - # 2. nix shell nixpkgs#nodePackages.node2nix - # 3. node2nix + format = "wheel"; + + # We fetch a wheel because while we can fetch the node + # artifacts using npm, the bundling invoked in setup.py + # tries to fetch even more artifacts src = fetchPypi { - inherit pname version; - sha256 = "97e158e8eb941f88d71929407f9455c903b5e18d89969db8ce8af66036f46b53"; + inherit pname version format; + hash = "sha256-ARAbBM0QYZlZqV51lMRoEZEQH1jlHRhlon3nfTi7dnM="; }; - # Since 0.10.0 panel attempts to fetch from the web. - # We avoid this: - # - we use node2nix to fetch assets - # - we disable bundling (which also tries to fetch assets) - # Downside of disabling bundling is that in an airgapped environment - # one may miss assets. - # https://github.com/holoviz/panel/issues/1819 - preBuild = '' - substituteInPlace setup.py --replace "bundle_resources()" "" - pushd panel - ln -s ${node.nodeDependencies}/lib/node_modules - export PATH="${node.nodeDependencies}/bin:$PATH" - popd - ''; - propagatedBuildInputs = [ bleach bokeh @@ -58,7 +41,7 @@ buildPythonPackage rec { doCheck = false; passthru = { - inherit node; # For convenience + inherit nodejs; # For convenience }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/panel/node/default.nix b/nixpkgs/pkgs/development/python-modules/panel/node/default.nix deleted file mode 100644 index 64326c6b2160..000000000000 --- a/nixpkgs/pkgs/development/python-modules/panel/node/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file has been generated by node2nix 1.9.0. Do not edit! - -{pkgs ? import <nixpkgs> { - inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: - -let - nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; - inherit pkgs nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; - }; -in -import ./node-packages.nix { - inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; - inherit nodeEnv; -} diff --git a/nixpkgs/pkgs/development/python-modules/panel/node/node-env.nix b/nixpkgs/pkgs/development/python-modules/panel/node/node-env.nix deleted file mode 100644 index 21089c4d5459..000000000000 --- a/nixpkgs/pkgs/development/python-modules/panel/node/node-env.nix +++ /dev/null @@ -1,573 +0,0 @@ -# This file originates from node2nix - -{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile}: - -let - # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master - utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux; - - python = if nodejs ? python then nodejs.python else python2; - - # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise - tarWrapper = runCommand "tarWrapper" {} '' - mkdir -p $out/bin - - cat > $out/bin/tar <<EOF - #! ${stdenv.shell} -e - $(type -p tar) "\$@" --warning=no-unknown-keyword --delay-directory-restore - EOF - - chmod +x $out/bin/tar - ''; - - # Function that generates a TGZ file from a NPM project - buildNodeSourceDist = - { name, version, src, ... }: - - stdenv.mkDerivation { - name = "node-tarball-${name}-${version}"; - inherit src; - buildInputs = [ nodejs ]; - buildPhase = '' - export HOME=$TMPDIR - tgzFile=$(npm pack | tail -n 1) # Hooks to the pack command will add output (https://docs.npmjs.com/misc/scripts) - ''; - installPhase = '' - mkdir -p $out/tarballs - mv $tgzFile $out/tarballs - mkdir -p $out/nix-support - echo "file source-dist $out/tarballs/$tgzFile" >> $out/nix-support/hydra-build-products - ''; - }; - - includeDependencies = {dependencies}: - lib.optionalString (dependencies != []) - (lib.concatMapStrings (dependency: - '' - # Bundle the dependencies of the package - mkdir -p node_modules - cd node_modules - - # Only include dependencies if they don't exist. They may also be bundled in the package. - if [ ! -e "${dependency.name}" ] - then - ${composePackage dependency} - fi - - cd .. - '' - ) dependencies); - - # Recursively composes the dependencies of a package - composePackage = { name, packageName, src, dependencies ? [], ... }@args: - builtins.addErrorContext "while evaluating node package '${packageName}'" '' - DIR=$(pwd) - cd $TMPDIR - - unpackFile ${src} - - # Make the base dir in which the target dependency resides first - mkdir -p "$(dirname "$DIR/${packageName}")" - - if [ -f "${src}" ] - then - # Figure out what directory has been unpacked - packageDir="$(find . -maxdepth 1 -type d | tail -1)" - - # Restore write permissions to make building work - find "$packageDir" -type d -exec chmod u+x {} \; - chmod -R u+w "$packageDir" - - # Move the extracted tarball into the output folder - mv "$packageDir" "$DIR/${packageName}" - elif [ -d "${src}" ] - then - # Get a stripped name (without hash) of the source directory. - # On old nixpkgs it's already set internally. - if [ -z "$strippedName" ] - then - strippedName="$(stripHash ${src})" - fi - - # Restore write permissions to make building work - chmod -R u+w "$strippedName" - - # Move the extracted directory into the output folder - mv "$strippedName" "$DIR/${packageName}" - fi - - # Unset the stripped name to not confuse the next unpack step - unset strippedName - - # Include the dependencies of the package - cd "$DIR/${packageName}" - ${includeDependencies { inherit dependencies; }} - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - ''; - - pinpointDependencies = {dependencies, production}: - let - pinpointDependenciesFromPackageJSON = writeTextFile { - name = "pinpointDependencies.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - function resolveDependencyVersion(location, name) { - if(location == process.env['NIX_STORE']) { - return null; - } else { - var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json"); - - if(fs.existsSync(dependencyPackageJSON)) { - var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON)); - - if(dependencyPackageObj.name == name) { - return dependencyPackageObj.version; - } - } else { - return resolveDependencyVersion(path.resolve(location, ".."), name); - } - } - } - - function replaceDependencies(dependencies) { - if(typeof dependencies == "object" && dependencies !== null) { - for(var dependency in dependencies) { - var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency); - - if(resolvedVersion === null) { - process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n"); - } else { - dependencies[dependency] = resolvedVersion; - } - } - } - } - - /* Read the package.json configuration */ - var packageObj = JSON.parse(fs.readFileSync('./package.json')); - - /* Pinpoint all dependencies */ - replaceDependencies(packageObj.dependencies); - if(process.argv[2] == "development") { - replaceDependencies(packageObj.devDependencies); - } - replaceDependencies(packageObj.optionalDependencies); - - /* Write the fixed package.json file */ - fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2)); - ''; - }; - in - '' - node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} - - ${lib.optionalString (dependencies != []) - '' - if [ -d node_modules ] - then - cd node_modules - ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} - cd .. - fi - ''} - ''; - - # Recursively traverses all dependencies of a package and pinpoints all - # dependencies in the package.json file to the versions that are actually - # being used. - - pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: - '' - if [ -d "${packageName}" ] - then - cd "${packageName}" - ${pinpointDependencies { inherit dependencies production; }} - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - fi - ''; - - # Extract the Node.js source code which is used to compile packages with - # native bindings - nodeSources = runCommand "node-sources" {} '' - tar --no-same-owner --no-same-permissions -xf ${nodejs.src} - mv node-* $out - ''; - - # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty) - addIntegrityFieldsScript = writeTextFile { - name = "addintegrityfields.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - function augmentDependencies(baseDir, dependencies) { - for(var dependencyName in dependencies) { - var dependency = dependencies[dependencyName]; - - // Open package.json and augment metadata fields - var packageJSONDir = path.join(baseDir, "node_modules", dependencyName); - var packageJSONPath = path.join(packageJSONDir, "package.json"); - - if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored - console.log("Adding metadata fields to: "+packageJSONPath); - var packageObj = JSON.parse(fs.readFileSync(packageJSONPath)); - - if(dependency.integrity) { - packageObj["_integrity"] = dependency.integrity; - } else { - packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads. - } - - if(dependency.resolved) { - packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided - } else { - packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories. - } - - if(dependency.from !== undefined) { // Adopt from property if one has been provided - packageObj["_from"] = dependency.from; - } - - fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2)); - } - - // Augment transitive dependencies - if(dependency.dependencies !== undefined) { - augmentDependencies(packageJSONDir, dependency.dependencies); - } - } - } - - if(fs.existsSync("./package-lock.json")) { - var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); - - if(![1, 2].includes(packageLock.lockfileVersion)) { - process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n"); - process.exit(1); - } - - if(packageLock.dependencies !== undefined) { - augmentDependencies(".", packageLock.dependencies); - } - } - ''; - }; - - # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes - reconstructPackageLock = writeTextFile { - name = "addintegrityfields.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - var packageObj = JSON.parse(fs.readFileSync("package.json")); - - var lockObj = { - name: packageObj.name, - version: packageObj.version, - lockfileVersion: 1, - requires: true, - dependencies: {} - }; - - function augmentPackageJSON(filePath, dependencies) { - var packageJSON = path.join(filePath, "package.json"); - if(fs.existsSync(packageJSON)) { - var packageObj = JSON.parse(fs.readFileSync(packageJSON)); - dependencies[packageObj.name] = { - version: packageObj.version, - integrity: "sha1-000000000000000000000000000=", - dependencies: {} - }; - processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies); - } - } - - function processDependencies(dir, dependencies) { - if(fs.existsSync(dir)) { - var files = fs.readdirSync(dir); - - files.forEach(function(entry) { - var filePath = path.join(dir, entry); - var stats = fs.statSync(filePath); - - if(stats.isDirectory()) { - if(entry.substr(0, 1) == "@") { - // When we encounter a namespace folder, augment all packages belonging to the scope - var pkgFiles = fs.readdirSync(filePath); - - pkgFiles.forEach(function(entry) { - if(stats.isDirectory()) { - var pkgFilePath = path.join(filePath, entry); - augmentPackageJSON(pkgFilePath, dependencies); - } - }); - } else { - augmentPackageJSON(filePath, dependencies); - } - } - }); - } - } - - processDependencies("node_modules", lockObj.dependencies); - - fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2)); - ''; - }; - - prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}: - let - forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; - in - '' - # Pinpoint the versions of all dependencies to the ones that are actually being used - echo "pinpointing versions of dependencies..." - source $pinpointDependenciesScriptPath - - # Patch the shebangs of the bundled modules to prevent them from - # calling executables outside the Nix store as much as possible - patchShebangs . - - # Deploy the Node.js package by running npm install. Since the - # dependencies have been provided already by ourselves, it should not - # attempt to install them again, which is good, because we want to make - # it Nix's responsibility. If it needs to install any dependencies - # anyway (e.g. because the dependency parameters are - # incomplete/incorrect), it fails. - # - # The other responsibilities of NPM are kept -- version checks, build - # steps, postprocessing etc. - - export HOME=$TMPDIR - cd "${packageName}" - runHook preRebuild - - ${lib.optionalString bypassCache '' - ${lib.optionalString reconstructLock '' - if [ -f package-lock.json ] - then - echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" - echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!" - rm package-lock.json - else - echo "No package-lock.json file found, reconstructing..." - fi - - node ${reconstructPackageLock} - ''} - - node ${addIntegrityFieldsScript} - ''} - - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild - - if [ "''${dontNpmInstall-}" != "1" ] - then - # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. - rm -f npm-shrinkwrap.json - - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install - fi - ''; - - # Builds and composes an NPM package including all its dependencies - buildNodePackage = - { name - , packageName - , version - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , preRebuild ? "" - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , meta ? {} - , ... }@args: - - let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ]; - in - stdenv.mkDerivation ({ - name = "${name}-${version}"; - buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool - ++ buildInputs; - - inherit nodejs; - - inherit dontStrip; # Stripping may fail a build for some package deployments - inherit dontNpmInstall preRebuild unpackPhase buildPhase; - - compositionScript = composePackage args; - pinpointDependenciesScript = pinpointDependenciesOfPackage args; - - passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; - - installPhase = '' - # Create and enter a root node_modules/ folder - mkdir -p $out/lib/node_modules - cd $out/lib/node_modules - - # Compose the package and all its dependencies - source $compositionScriptPath - - ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} - - # Create symlink to the deployed executable folder, if applicable - if [ -d "$out/lib/node_modules/.bin" ] - then - ln -s $out/lib/node_modules/.bin $out/bin - fi - - # Create symlinks to the deployed manual page folders, if applicable - if [ -d "$out/lib/node_modules/${packageName}/man" ] - then - mkdir -p $out/share - for dir in "$out/lib/node_modules/${packageName}/man/"* - do - mkdir -p $out/share/man/$(basename "$dir") - for page in "$dir"/* - do - ln -s $page $out/share/man/$(basename "$dir") - done - done - fi - - # Run post install hook, if provided - runHook postInstall - ''; - - meta = { - # default to Node.js' platforms - platforms = nodejs.meta.platforms; - } // meta; - } // extraArgs); - - # Builds a node environment (a node_modules folder and a set of binaries) - buildNodeDependencies = - { name - , packageName - , version - , src - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , ... }@args: - - let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; - in - stdenv.mkDerivation ({ - name = "node-dependencies-${name}-${version}"; - - buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool - ++ buildInputs; - - inherit dontStrip; # Stripping may fail a build for some package deployments - inherit dontNpmInstall unpackPhase buildPhase; - - includeScript = includeDependencies { inherit dependencies; }; - pinpointDependenciesScript = pinpointDependenciesOfPackage args; - - passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; - - installPhase = '' - mkdir -p $out/${packageName} - cd $out/${packageName} - - source $includeScriptPath - - # Create fake package.json to make the npm commands work properly - cp ${src}/package.json . - chmod 644 package.json - ${lib.optionalString bypassCache '' - if [ -f ${src}/package-lock.json ] - then - cp ${src}/package-lock.json . - fi - ''} - - # Go to the parent folder to make sure that all packages are pinpointed - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - - ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} - - # Expose the executables that were installed - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - - mv ${packageName} lib - ln -s $out/lib/node_modules/.bin $out/bin - ''; - } // extraArgs); - - # Builds a development shell - buildNodeShell = - { name - , packageName - , version - , src - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , ... }@args: - - let - nodeDependencies = buildNodeDependencies args; - in - stdenv.mkDerivation { - name = "node-shell-${name}-${version}"; - - buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; - buildCommand = '' - mkdir -p $out/bin - cat > $out/bin/shell <<EOF - #! ${stdenv.shell} -e - $shellHook - exec ${stdenv.shell} - EOF - chmod +x $out/bin/shell - ''; - - # Provide the dependencies in a development shell through the NODE_PATH environment variable - inherit nodeDependencies; - shellHook = lib.optionalString (dependencies != []) '' - export NODE_PATH=${nodeDependencies}/lib/node_modules - export PATH="${nodeDependencies}/bin:$PATH" - ''; - }; -in -{ - buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist; - buildNodePackage = lib.makeOverridable buildNodePackage; - buildNodeDependencies = lib.makeOverridable buildNodeDependencies; - buildNodeShell = lib.makeOverridable buildNodeShell; -} diff --git a/nixpkgs/pkgs/development/python-modules/panel/node/node-packages.nix b/nixpkgs/pkgs/development/python-modules/panel/node/node-packages.nix deleted file mode 100644 index 78c7c4ac37d1..000000000000 --- a/nixpkgs/pkgs/development/python-modules/panel/node/node-packages.nix +++ /dev/null @@ -1,562 +0,0 @@ -# This file has been generated by node2nix 1.9.0. Do not edit! - -{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: - -let - sources = { - "@babel/runtime-7.15.3" = { - name = "_at_babel_slash_runtime"; - packageName = "@babel/runtime"; - version = "7.15.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.3.tgz"; - sha512 = "OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA=="; - }; - }; - "@bokeh/bokehjs-2.3.3" = { - name = "_at_bokeh_slash_bokehjs"; - packageName = "@bokeh/bokehjs"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@bokeh/bokehjs/-/bokehjs-2.3.3.tgz"; - sha512 = "Zev3p5xnS47YsZo5hcGGNUdISH3mkVLKSc6LMVqEIRlnc7Ay79TD9bnApeYh90k0JU1pcMh0gEqHgwVOGPTZ/w=="; - }; - }; - "@bokeh/numbro-1.6.2" = { - name = "_at_bokeh_slash_numbro"; - packageName = "@bokeh/numbro"; - version = "1.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@bokeh/numbro/-/numbro-1.6.2.tgz"; - sha512 = "owIECPc3T3QXHCb2v5Ez+/uE9SIxI7N4nd9iFlWnfBrOelr0/omvFn09VisRn37AAFAY39sJiCVgECwryHWUPA=="; - }; - }; - "@bokeh/slickgrid-2.4.2702" = { - name = "_at_bokeh_slash_slickgrid"; - packageName = "@bokeh/slickgrid"; - version = "2.4.2702"; - src = fetchurl { - url = "https://registry.npmjs.org/@bokeh/slickgrid/-/slickgrid-2.4.2702.tgz"; - sha512 = "W9tm8Qdw5BrylbZbaVWaQMgLfW/klesnj6J3FnyWpo18hCCOFApccUD8iOnRv7bF6PHlgWk84mW3JT5RSzYKjA=="; - }; - }; - "@luma.gl/constants-8.5.5" = { - name = "_at_luma.gl_slash_constants"; - packageName = "@luma.gl/constants"; - version = "8.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@luma.gl/constants/-/constants-8.5.5.tgz"; - sha512 = "3pDC7jFaXliDP7Gvr6pPkorLFBXDnuakNeN87aEYcIM+p3XrkF0rPnDQJEzwScWS9RIopXT858xmL3vG7IYsDw=="; - }; - }; - "@types/debounce-1.2.0" = { - name = "_at_types_slash_debounce"; - packageName = "@types/debounce"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/debounce/-/debounce-1.2.0.tgz"; - sha512 = "bWG5wapaWgbss9E238T0R6bfo5Fh3OkeoSt245CM7JJwVwpw6MEBCbIxLq5z8KzsE3uJhzcIuQkyiZmzV3M/Dw=="; - }; - }; - "@types/gl-matrix-2.4.5" = { - name = "_at_types_slash_gl-matrix"; - packageName = "@types/gl-matrix"; - version = "2.4.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/gl-matrix/-/gl-matrix-2.4.5.tgz"; - sha512 = "0L8Mq1+oaIW0oVzGUDbSW+HnTjCNb4CmoIQE5BkoHt/A7x20z0MJ1PnwfH3atty/vbWLGgvJwVu2Mz3SKFiEFw=="; - }; - }; - "@types/jquery-3.5.6" = { - name = "_at_types_slash_jquery"; - packageName = "@types/jquery"; - version = "3.5.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz"; - sha512 = "SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg=="; - }; - }; - "@types/sizzle-2.3.3" = { - name = "_at_types_slash_sizzle"; - packageName = "@types/sizzle"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz"; - sha512 = "JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ=="; - }; - }; - "@types/slickgrid-2.1.31" = { - name = "_at_types_slash_slickgrid"; - packageName = "@types/slickgrid"; - version = "2.1.31"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/slickgrid/-/slickgrid-2.1.31.tgz"; - sha512 = "t/LodOkh8yP+o2jKcHsC0hAjDh1kl4RSFXKWmR9+U5FwXE7VpipqiAkE1W3NnGNA3ni5xnKQJt/CNXurJWTQ6w=="; - }; - }; - "choices.js-9.0.1" = { - name = "choices.js"; - packageName = "choices.js"; - version = "9.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/choices.js/-/choices.js-9.0.1.tgz"; - sha512 = "JgpeDY0Tmg7tqY6jaW/druSklJSt7W68tXFJIw0GSGWmO37SDAL8o60eICNGbzIODjj02VNNtf5h6TgoHDtCsA=="; - }; - }; - "d-1.0.1" = { - name = "d"; - packageName = "d"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/d/-/d-1.0.1.tgz"; - sha512 = "m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA=="; - }; - }; - "debounce-1.2.1" = { - name = "debounce"; - packageName = "debounce"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/debounce/-/debounce-1.2.1.tgz"; - sha512 = "XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug=="; - }; - }; - "deepmerge-4.2.2" = { - name = "deepmerge"; - packageName = "deepmerge"; - version = "4.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz"; - sha512 = "FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="; - }; - }; - "es5-ext-0.10.53" = { - name = "es5-ext"; - packageName = "es5-ext"; - version = "0.10.53"; - src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz"; - sha512 = "Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q=="; - }; - }; - "es6-iterator-2.0.3" = { - name = "es6-iterator"; - packageName = "es6-iterator"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz"; - sha1 = "a7de889141a05a94b0854403b2d0a0fbfa98f3b7"; - }; - }; - "es6-map-0.1.5" = { - name = "es6-map"; - packageName = "es6-map"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz"; - sha1 = "9136e0503dcc06a301690f0bb14ff4e364e949f0"; - }; - }; - "es6-promise-4.2.8" = { - name = "es6-promise"; - packageName = "es6-promise"; - version = "4.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz"; - sha512 = "HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="; - }; - }; - "es6-set-0.1.5" = { - name = "es6-set"; - packageName = "es6-set"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz"; - sha1 = "d2b3ec5d4d800ced818db538d28974db0a73ccb1"; - }; - }; - "es6-symbol-3.1.1" = { - name = "es6-symbol"; - packageName = "es6-symbol"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz"; - sha1 = "bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"; - }; - }; - "es6-symbol-3.1.3" = { - name = "es6-symbol"; - packageName = "es6-symbol"; - version = "3.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz"; - sha512 = "NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA=="; - }; - }; - "es6-weak-map-2.0.3" = { - name = "es6-weak-map"; - packageName = "es6-weak-map"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz"; - sha512 = "p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA=="; - }; - }; - "event-emitter-0.3.5" = { - name = "event-emitter"; - packageName = "event-emitter"; - version = "0.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz"; - sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39"; - }; - }; - "ext-1.5.0" = { - name = "ext"; - packageName = "ext"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ext/-/ext-1.5.0.tgz"; - sha512 = "+ONcYoWj/SoQwUofMr94aGu05Ou4FepKi7N7b+O8T4jVfyIsZQV1/xeS8jpaBzF0csAk0KLXoHCxU7cKYZjo1Q=="; - }; - }; - "fast-deep-equal-2.0.1" = { - name = "fast-deep-equal"; - packageName = "fast-deep-equal"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz"; - sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; - }; - }; - "fast-json-patch-2.2.1" = { - name = "fast-json-patch"; - packageName = "fast-json-patch"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-2.2.1.tgz"; - sha512 = "4j5uBaTnsYAV5ebkidvxiLUYOwjQ+JSFljeqfTxCrH9bDmlCQaOJFS84oDJ2rAXZq2yskmk3ORfoP9DCwqFNig=="; - }; - }; - "flatbush-3.3.0" = { - name = "flatbush"; - packageName = "flatbush"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/flatbush/-/flatbush-3.3.0.tgz"; - sha512 = "F3EzQvKpdmXUbFwWxLKBpytOFEGYQMCTBLuqZ4GEajFOEAvnOIBiyxW3OFSZXIOtpCS8teN6bFEpNZtnVXuDQA=="; - }; - }; - "flatpickr-4.6.9" = { - name = "flatpickr"; - packageName = "flatpickr"; - version = "4.6.9"; - src = fetchurl { - url = "https://registry.npmjs.org/flatpickr/-/flatpickr-4.6.9.tgz"; - sha512 = "F0azNNi8foVWKSF+8X+ZJzz8r9sE1G4hl06RyceIaLvyltKvDl6vqk9Lm/6AUUCi5HWaIjiUbk7UpeE/fOXOpw=="; - }; - }; - "flatqueue-1.2.1" = { - name = "flatqueue"; - packageName = "flatqueue"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/flatqueue/-/flatqueue-1.2.1.tgz"; - sha512 = "X86TpWS1rGuY7m382HuA9vngLeDuWA9lJvhEG+GfgKMV5onSvx5a71cl7GMbXzhWtlN9dGfqOBrpfqeOtUfGYQ=="; - }; - }; - "fuse.js-3.6.1" = { - name = "fuse.js"; - packageName = "fuse.js"; - version = "3.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/fuse.js/-/fuse.js-3.6.1.tgz"; - sha512 = "hT9yh/tiinkmirKrlv4KWOjztdoZo1mx9Qh4KvWqC7isoXwdUY3PNWUxceF4/qO9R6riA2C29jdTOeQOIROjgw=="; - }; - }; - "gl-matrix-3.3.0" = { - name = "gl-matrix"; - packageName = "gl-matrix"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/gl-matrix/-/gl-matrix-3.3.0.tgz"; - sha512 = "COb7LDz+SXaHtl/h4LeaFcNdJdAQSDeVqjiIihSXNrkWObZLhDI4hIkZC11Aeqp7bcE72clzB0BnDXr2SmslRA=="; - }; - }; - "hammerjs-2.0.8" = { - name = "hammerjs"; - packageName = "hammerjs"; - version = "2.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz"; - sha1 = "04ef77862cff2bb79d30f7692095930222bf60f1"; - }; - }; - "htm-3.1.0" = { - name = "htm"; - packageName = "htm"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/htm/-/htm-3.1.0.tgz"; - sha512 = "L0s3Sid5r6YwrEvkig14SK3Emmc+kIjlfLhEGn2Vy3bk21JyDEes4MoDsbJk6luaPp8bugErnxPz86ZuAw6e5Q=="; - }; - }; - "jquery-3.6.0" = { - name = "jquery"; - packageName = "jquery"; - version = "3.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz"; - sha512 = "JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="; - }; - }; - "jquery-ui-1.12.1" = { - name = "jquery-ui"; - packageName = "jquery-ui"; - version = "1.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.12.1.tgz"; - sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"; - }; - }; - "json-formatter-js-2.3.4" = { - name = "json-formatter-js"; - packageName = "json-formatter-js"; - version = "2.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/json-formatter-js/-/json-formatter-js-2.3.4.tgz"; - sha512 = "gmAzYRtPRmYzeAT4T7+t3NhTF89JOAIioCVDddl9YDb3ls3kWcskirafw/MZGJaRhEU6fRimGJHl7CC7gaAI2Q=="; - }; - }; - "mgrs-1.0.0" = { - name = "mgrs"; - packageName = "mgrs"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mgrs/-/mgrs-1.0.0.tgz"; - sha1 = "fb91588e78c90025672395cb40b25f7cd6ad1829"; - }; - }; - "next-tick-1.0.0" = { - name = "next-tick"; - packageName = "next-tick"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz"; - sha1 = "ca86d1fe8828169b0120208e3dc8424b9db8342c"; - }; - }; - "nouislider-14.7.0" = { - name = "nouislider"; - packageName = "nouislider"; - version = "14.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nouislider/-/nouislider-14.7.0.tgz"; - sha512 = "4RtQ1+LHJKesDCNJrXkQcwXAWCrC2aggdLYMstS/G5fEWL+fXZbUA9pwVNHFghMGuFGRATlDLNInRaPeRKzpFQ=="; - }; - }; - "preact-10.5.14" = { - name = "preact"; - packageName = "preact"; - version = "10.5.14"; - src = fetchurl { - url = "https://registry.npmjs.org/preact/-/preact-10.5.14.tgz"; - sha512 = "KojoltCrshZ099ksUZ2OQKfbH66uquFoxHSbnwKbTJHeQNvx42EmC7wQVWNuDt6vC5s3nudRHFtKbpY4ijKlaQ=="; - }; - }; - "proj4-2.7.5" = { - name = "proj4"; - packageName = "proj4"; - version = "2.7.5"; - src = fetchurl { - url = "https://registry.npmjs.org/proj4/-/proj4-2.7.5.tgz"; - sha512 = "5ecXUXbHAfvdhfBQpU7EhUfPCQGUCPmVup/4gnZA3bJY3JcK/xxzm4QQDz1xiXokN6ux65VDczlCtBtKrTSpAQ=="; - }; - }; - "redux-4.1.1" = { - name = "redux"; - packageName = "redux"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/redux/-/redux-4.1.1.tgz"; - sha512 = "hZQZdDEM25UY2P493kPYuKqviVwZ58lEmGQNeQ+gXa+U0gYPUBf7NKYazbe3m+bs/DzM/ahN12DbF+NG8i0CWw=="; - }; - }; - "regenerator-runtime-0.13.9" = { - name = "regenerator-runtime"; - packageName = "regenerator-runtime"; - version = "0.13.9"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz"; - sha512 = "p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="; - }; - }; - "sprintf-js-1.1.2" = { - name = "sprintf-js"; - packageName = "sprintf-js"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz"; - sha512 = "VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="; - }; - }; - "timezone-1.0.23" = { - name = "timezone"; - packageName = "timezone"; - version = "1.0.23"; - src = fetchurl { - url = "https://registry.npmjs.org/timezone/-/timezone-1.0.23.tgz"; - sha512 = "yhQgk6qmSLB+TF8HGmApZAVI5bfzR1CoKUGr+WMZWmx75ED1uDewAZA8QMGCQ70TEv4GmM8pDB9jrHuxdaQ1PA=="; - }; - }; - "tslib-1.14.1" = { - name = "tslib"; - packageName = "tslib"; - version = "1.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz"; - sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; - }; - }; - "tslib-2.3.1" = { - name = "tslib"; - packageName = "tslib"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz"; - sha512 = "77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="; - }; - }; - "type-1.2.0" = { - name = "type"; - packageName = "type"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/type/-/type-1.2.0.tgz"; - sha512 = "+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="; - }; - }; - "type-2.5.0" = { - name = "type"; - packageName = "type"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/type/-/type-2.5.0.tgz"; - sha512 = "180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw=="; - }; - }; - "underscore.template-0.1.7" = { - name = "underscore.template"; - packageName = "underscore.template"; - version = "0.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/underscore.template/-/underscore.template-0.1.7.tgz"; - sha1 = "3013e0ea181756306f1609e959cafbc722adb3e9"; - }; - }; - "wkt-parser-1.3.1" = { - name = "wkt-parser"; - packageName = "wkt-parser"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/wkt-parser/-/wkt-parser-1.3.1.tgz"; - sha512 = "XK5qV+Y5gsygQfHx2/cS5a7Zxsgleaw8iX5UPC5eOXPc0TgJAu1JB9lr0iYYX3zAnN3p0aNiaN5c+1Bdblxwrg=="; - }; - }; - }; - args = { - name = "_at_holoviz_slash_panel"; - packageName = "@holoviz/panel"; - version = "0.12.1"; - src = ./.; - dependencies = [ - sources."@babel/runtime-7.15.3" - sources."@bokeh/bokehjs-2.3.3" - sources."@bokeh/numbro-1.6.2" - (sources."@bokeh/slickgrid-2.4.2702" // { - dependencies = [ - sources."tslib-1.14.1" - ]; - }) - sources."@luma.gl/constants-8.5.5" - sources."@types/debounce-1.2.0" - sources."@types/gl-matrix-2.4.5" - sources."@types/jquery-3.5.6" - sources."@types/sizzle-2.3.3" - sources."@types/slickgrid-2.1.31" - sources."choices.js-9.0.1" - sources."d-1.0.1" - sources."debounce-1.2.1" - sources."deepmerge-4.2.2" - sources."es5-ext-0.10.53" - sources."es6-iterator-2.0.3" - sources."es6-map-0.1.5" - sources."es6-promise-4.2.8" - (sources."es6-set-0.1.5" // { - dependencies = [ - sources."es6-symbol-3.1.1" - ]; - }) - sources."es6-symbol-3.1.3" - sources."es6-weak-map-2.0.3" - sources."event-emitter-0.3.5" - (sources."ext-1.5.0" // { - dependencies = [ - sources."type-2.5.0" - ]; - }) - sources."fast-deep-equal-2.0.1" - sources."fast-json-patch-2.2.1" - sources."flatbush-3.3.0" - sources."flatpickr-4.6.9" - sources."flatqueue-1.2.1" - sources."fuse.js-3.6.1" - sources."gl-matrix-3.3.0" - sources."hammerjs-2.0.8" - sources."htm-3.1.0" - sources."jquery-3.6.0" - sources."jquery-ui-1.12.1" - sources."json-formatter-js-2.3.4" - sources."mgrs-1.0.0" - sources."next-tick-1.0.0" - sources."nouislider-14.7.0" - sources."preact-10.5.14" - sources."proj4-2.7.5" - sources."redux-4.1.1" - sources."regenerator-runtime-0.13.9" - sources."sprintf-js-1.1.2" - sources."timezone-1.0.23" - sources."tslib-2.3.1" - sources."type-1.2.0" - sources."underscore.template-0.1.7" - sources."wkt-parser-1.3.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A high level dashboarding library for python visualization libraries."; - license = "BSD-3-Clause"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; -in -{ - args = args; - sources = sources; - tarball = nodeEnv.buildNodeSourceDist args; - package = nodeEnv.buildNodePackage args; - shell = nodeEnv.buildNodeShell args; - nodeDependencies = nodeEnv.buildNodeDependencies (lib.overrideExisting args { - src = stdenv.mkDerivation { - name = args.name + "-package-json"; - src = nix-gitignore.gitignoreSourcePure [ - "*" - "!package.json" - "!package-lock.json" - ] args.src; - dontBuild = true; - installPhase = "mkdir -p $out; cp -r ./* $out;"; - }; - }); -} diff --git a/nixpkgs/pkgs/development/python-modules/panel/node/package.json b/nixpkgs/pkgs/development/python-modules/panel/node/package.json deleted file mode 100644 index dc1d13ab4875..000000000000 --- a/nixpkgs/pkgs/development/python-modules/panel/node/package.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "name": "@holoviz/panel", - "version": "0.12.1", - "description": "A high level dashboarding library for python visualization libraries.", - "license": "BSD-3-Clause", - "repository": { - "type": "git", - "url": "https://github.com/holoviz/panel.git" - }, - "dependencies": { - "@bokeh/bokehjs": "^2.3.3", - "@luma.gl/constants": "^8.0.3", - "@types/debounce": "^1.2.0", - "@types/gl-matrix": "^2.4.5", - "debounce": "^1.2.0", - "fast-json-patch": "^2.2.1", - "gl-matrix": "^3.1.0", - "htm": "^3.0.4", - "json-formatter-js": "^2.2.1", - "preact": "^10.5.12" - }, - "devDependencies": {}, - "files": [ - "dist/**/*.{js,js.map,d.ts,json,css}" - ], - "main": "dist/panel.min.js" -} diff --git a/nixpkgs/pkgs/development/python-modules/parts/default.nix b/nixpkgs/pkgs/development/python-modules/parts/default.nix index 4c798f43c25c..65ebd1bf3a15 100644 --- a/nixpkgs/pkgs/development/python-modules/parts/default.nix +++ b/nixpkgs/pkgs/development/python-modules/parts/default.nix @@ -1,16 +1,19 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder }: buildPythonPackage rec { pname = "parts"; - version = "1.2.2"; + version = "1.3.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "6463d5c49142d14029196a6a781b57bc98ba5b3d93244f4ed637f534d08129c1"; + sha256 = "sha256-NrhNpWyzqwn1bNnuqmcyKcUED0A4v7VJE4ZlTHFafJY="; }; # Project has no tests diff --git a/nixpkgs/pkgs/development/python-modules/pc-ble-driver-py/default.nix b/nixpkgs/pkgs/development/python-modules/pc-ble-driver-py/default.nix index 093e3e67ab23..6dec8d2308f1 100644 --- a/nixpkgs/pkgs/development/python-modules/pc-ble-driver-py/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pc-ble-driver-py/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pc-ble-driver-py"; - version = "0.16.2"; + version = "0.16.3"; disabled = pythonOlder "3.7" || pythonAtLeast "3.10"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "NordicSemiconductor"; repo = "pc-ble-driver-py"; rev = "v${version}"; - sha256 = "013kpj2df5grkrzxak22k01mskpmwf7g3aa1fmxdwi90bb1sabs5"; + sha256 = "sha256-X21GQsyRZu1xdoTlD9DjceIWKpcuTLdIDf8UahntS3s="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/persistent/default.nix b/nixpkgs/pkgs/development/python-modules/persistent/default.nix index f8ba8d3cf240..5b5462cf4757 100644 --- a/nixpkgs/pkgs/development/python-modules/persistent/default.nix +++ b/nixpkgs/pkgs/development/python-modules/persistent/default.nix @@ -1,25 +1,43 @@ { lib , buildPythonPackage +, cffi , fetchPypi -, zope_interface, cffi -, sphinx, manuel +, zope_interface +, sphinx +, manuel +, pythonOlder }: buildPythonPackage rec { pname = "persistent"; - version = "4.7.0"; + version = "4.9.0"; + format = "setuptools"; - nativeBuildInputs = [ sphinx manuel ]; - propagatedBuildInputs = [ zope_interface cffi ]; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0ef7c05a6dca0104dc224fe7ff31feb30a63d970421c9462104a4752148ac333"; + hash = "sha256-RwGzHYHBBCJlclrzkEUOnZFq10ucF4twEAU4U1keDGo="; }; - meta = { + nativeBuildInputs = [ + sphinx + manuel + ]; + + propagatedBuildInputs = [ + zope_interface + cffi + ]; + + pythonImportsCheck = [ + "persistent" + ]; + + meta = with lib; { description = "Automatic persistence for Python objects"; - homepage = "http://www.zodb.org/"; - license = lib.licenses.zpl21; + homepage = "https://github.com/zopefoundation/persistent/"; + license = licenses.zpl21; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pex/default.nix b/nixpkgs/pkgs/development/python-modules/pex/default.nix index ba6fd3cb7f8e..4a03d60f1eea 100644 --- a/nixpkgs/pkgs/development/python-modules/pex/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pex/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.66"; + version = "2.1.71"; format = "flit"; src = fetchPypi { inherit pname version; - sha256 = "sha256-FYDudoCgxk2wkjPVXTnzHzCQRwtHmgJS+2mwoKbj3Ms="; + sha256 = "sha256-jJ7J4upDL1X1Eut1kUWdJu3Ih2mheNFt0wI+QTZMKow="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pg8000/default.nix b/nixpkgs/pkgs/development/python-modules/pg8000/default.nix index 57c9f77f1fed..8653c28c878d 100644 --- a/nixpkgs/pkgs/development/python-modules/pg8000/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pg8000/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pg8000"; - version = "1.24.0"; + version = "1.24.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-BsawsGjQfONm97ztrfdqC12mph+GMCyMr/aQt/xd/ts="; + sha256 = "sha256-KRIixd39ZqP8DTIXAM9ZHIsPkw0vyEh3fWz8/1VEPOY="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pglast/default.nix b/nixpkgs/pkgs/development/python-modules/pglast/default.nix index 673b3c8ffe8d..a3836570f04b 100644 --- a/nixpkgs/pkgs/development/python-modules/pglast/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pglast/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pglast"; - version = "3.8"; + version = "3.9"; src = fetchPypi { inherit pname version; - sha256 = "31ad29b6a27048b1a26c072992fc5213d2eaf366854679e6c97111e300e0ef01"; + sha256 = "sha256-fwXOfQW+ybhROdgayOAsgaFjf8HHh5jr5xczkBnA40w="; }; disabled = !isPy3k; diff --git a/nixpkgs/pkgs/development/python-modules/pillow/default.nix b/nixpkgs/pkgs/development/python-modules/pillow/default.nix index 57b085a54051..c1df3ce27513 100644 --- a/nixpkgs/pkgs/development/python-modules/pillow/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pillow/default.nix @@ -1,6 +1,8 @@ { lib, stdenv, buildPythonPackage, fetchPypi, isPyPy, isPy3k , defusedxml, olefile, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11 , libxcb, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook +# for passthru.tests +, imageio, matplotlib, pilkit, pydicom, reportlab }@args: import ./generic.nix (rec { @@ -14,6 +16,10 @@ import ./generic.nix (rec { sha256 = "0gjry0yqryd2678sm47jhdnbghzxn5wk8pgyaqwr4qi7x5ijjvpf"; }; + passthru.tests = { + inherit imageio matplotlib pilkit pydicom reportlab; + }; + meta = with lib; { homepage = "https://python-pillow.org/"; description = "The friendly PIL fork (Python Imaging Library)"; diff --git a/nixpkgs/pkgs/development/python-modules/pillow/generic.nix b/nixpkgs/pkgs/development/python-modules/pillow/generic.nix index 3e33f1a8aa0f..97c67fd5fa49 100644 --- a/nixpkgs/pkgs/development/python-modules/pillow/generic.nix +++ b/nixpkgs/pkgs/development/python-modules/pillow/generic.nix @@ -3,13 +3,14 @@ , disabled , src , meta +, passthru ? {} , ... }@args: with args; buildPythonPackage rec { - inherit pname version src meta; + inherit pname version src meta passthru; # Disable imagefont tests, because they don't work well with infinality: # https://github.com/python-pillow/Pillow/issues/1259 diff --git a/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix b/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix index 387853ad28c5..83c697aa7c86 100644 --- a/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix @@ -4,15 +4,19 @@ , nulltype , python-dateutil , urllib3 +, pythonOlder }: buildPythonPackage rec { pname = "plaid-python"; - version = "8.10.0"; + version = "9.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "8930949bd43e3126289f50e927d1acacf53c57ec3227c764e0c1feb72bbb61a3"; + hash = "sha256-jvg/2dL+W4N7rbbBcIUZUrSt0BCV15k4QgYST2lEA5U="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/plexapi/default.nix b/nixpkgs/pkgs/development/python-modules/plexapi/default.nix index ef702b93adb1..02831000e883 100644 --- a/nixpkgs/pkgs/development/python-modules/plexapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/plexapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "plexapi"; - version = "4.9.2"; + version = "4.10.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pkkid"; repo = "python-plexapi"; rev = version; - sha256 = "sha256-93qMSOnCl18dRZQB8v2Cxv21vsdFzHefQ7zttQAuPKk="; + sha256 = "sha256-paj1QFSHQw7MfOor1yYwb2vkF9b5RPj6R6dRstK24gA="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pontos/default.nix b/nixpkgs/pkgs/development/python-modules/pontos/default.nix index 6acd81854681..d36c5d7e7ae3 100644 --- a/nixpkgs/pkgs/development/python-modules/pontos/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pontos/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pontos"; - version = "22.2.2"; + version = "22.2.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "v${version}"; - hash = "sha256-9QnimA9y5mVgJA9LkDVC+eNyp6Ltvw+fErtoSVL/1iw="; + hash = "sha256-RmMlwnAJlCTDnTyim0MdAeW3NA8r2IiqrE0YeWgxUk4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/poolsense/default.nix b/nixpkgs/pkgs/development/python-modules/poolsense/default.nix index 10e50804ef58..53d142299707 100644 --- a/nixpkgs/pkgs/development/python-modules/poolsense/default.nix +++ b/nixpkgs/pkgs/development/python-modules/poolsense/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-WCyuhk77QNJAiuzccrb2u0mfc81LYrYSSq9atgO0LdE="; + hash = "sha256-WCyuhk77QNJAiuzccrb2u0mfc81LYrYSSq9atgO0LdE="; }; propagatedBuildInputs = [ aiohttp ]; diff --git a/nixpkgs/pkgs/development/python-modules/portpicker/default.nix b/nixpkgs/pkgs/development/python-modules/portpicker/default.nix index fd7bf7bc09c3..faf3b9581628 100644 --- a/nixpkgs/pkgs/development/python-modules/portpicker/default.nix +++ b/nixpkgs/pkgs/development/python-modules/portpicker/default.nix @@ -1,6 +1,8 @@ -{ buildPythonPackage -, lib +{ lib +, buildPythonPackage , fetchPypi +, psutil +, pythonOlder }: buildPythonPackage rec { @@ -8,15 +10,25 @@ buildPythonPackage rec { version = "1.5.0"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "e13b148008adeb2793cf8b55bcd20fdcec4f763f2d3bf3c45f5e5e5d1df7d228"; + hash = "sha256-4TsUgAit6yeTz4tVvNIP3OxPdj8tO/PEX15eXR330ig="; }; - meta = { - description = "A library to choose unique available network ports."; + propagatedBuildInputs = [ + psutil + ]; + + pythonImportsCheck = [ + "portpicker" + ]; + + meta = with lib; { + description = "Library to choose unique available network ports"; homepage = "https://github.com/google/python_portpicker"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ danharaj ]; + license = licenses.asl20; + maintainers = with maintainers; [ danharaj ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/psygnal/default.nix b/nixpkgs/pkgs/development/python-modules/psygnal/default.nix index 94cfaaa78c5c..4e05dd51b057 100644 --- a/nixpkgs/pkgs/development/python-modules/psygnal/default.nix +++ b/nixpkgs/pkgs/development/python-modules/psygnal/default.nix @@ -13,12 +13,12 @@ }: buildPythonPackage rec { pname = "psygnal"; - version = "0.3.0"; + version = "0.3.3"; src = fetchFromGitHub { owner = "tlambert03"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vrGym/V0cSGIjBWMWpDrPBijEOFayK1vdR02gsWzRvo="; + sha256 = "sha256-BQmcA1gD2i4sxROH+a7gStcNK1mXYVerIZ2y6gn8vI8="; }; buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ typing-extensions ]; diff --git a/nixpkgs/pkgs/development/python-modules/pubnub/default.nix b/nixpkgs/pkgs/development/python-modules/pubnub/default.nix index c36554122de1..0c87391aba01 100644 --- a/nixpkgs/pkgs/development/python-modules/pubnub/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pubnub/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pubnub"; - version = "6.0.1"; + version = "6.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = pname; repo = "python"; rev = "v${version}"; - hash = "sha256-TXxnFKDq1eWShimtNKaUMEQrs1nRQ8NqAQSI8Hutcp8="; + hash = "sha256-rAeZxCaSY9tgoMk7l+mlqqiZfD2yIGoywITC0Y2z7oI="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pudb/default.nix b/nixpkgs/pkgs/development/python-modules/pudb/default.nix index 0ae60b381c64..406d81e15bb0 100644 --- a/nixpkgs/pkgs/development/python-modules/pudb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pudb/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , dataclasses -, isPy3k , fetchPypi , jedi , pygments @@ -14,14 +13,14 @@ buildPythonPackage rec { pname = "pudb"; - version = "2022.1"; + version = "2022.1.1"; format = "setuptools"; - disabled = !isPy3k; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "e827a4b489dcad561189535db6677becbf32164b2b44df00786eb2d5e00c587e"; + hash = "sha256-2zvdZkI8nSkHTBwsSfyyJL0Nbwgxn+0bTn6taDkUCD8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/py3status/default.nix b/nixpkgs/pkgs/development/python-modules/py3status/default.nix index 160c5763995e..a5de75f70f88 100644 --- a/nixpkgs/pkgs/development/python-modules/py3status/default.nix +++ b/nixpkgs/pkgs/development/python-modules/py3status/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "py3status"; - version = "3.40"; + version = "3.41"; src = fetchPypi { inherit pname version; - sha256 = "9eb6f721f94f28a17a8599ca2743a2bedd58c16cfe74e9817ffa948c13dbb79c"; + sha256 = "sha256-2G+5lKkLtgZ/2ghU0xVTDqIXbTNykYIKRiwZiagusoc="; }; doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/py_scrypt/default.nix b/nixpkgs/pkgs/development/python-modules/py_scrypt/default.nix index 01fae999cf4d..acfab6791a2e 100644 --- a/nixpkgs/pkgs/development/python-modules/py_scrypt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/py_scrypt/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "scrypt"; - version = "0.8.19"; + version = "0.8.20"; src = fetchPypi { inherit pname version; - sha256 = "ad143035ae0cf5e97c4b399f4e4686adf442c5f0f06f9f198a0cc6c091335fb7"; + sha256 = "sha256-DSJsHGdE+y4wizkUEGabHfXP6CY3/8te1Im/grLS63g="; }; buildInputs = [ openssl ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyamg/default.nix b/nixpkgs/pkgs/development/python-modules/pyamg/default.nix index bf46734df514..b2a230685cc8 100644 --- a/nixpkgs/pkgs/development/python-modules/pyamg/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyamg/default.nix @@ -5,17 +5,22 @@ , scipy , pytest , pybind11 +, setuptools-scm }: buildPythonPackage rec { pname = "pyamg"; - version = "4.2.1"; + version = "4.2.2"; src = fetchPypi { inherit pname version; - sha256 = "48d9be622049d8363cda84125c45d18b89e0ab7d99be5a93c0246f375ebad344"; + sha256 = "sha256-mtrFqUwEustYlCcCiV1FQZm7dJKohu650xHdiNg6D6E="; }; + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ numpy scipy @@ -23,9 +28,17 @@ buildPythonPackage rec { pybind11 ]; - preBuild = '' - export HOME=$(mktemp -d) - ''; + # failed with "ModuleNotFoundError: No module named 'pyamg.amg_core.evolution_strength'" + doCheck = false; + # taken from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=python-pyamg#n27 + # checkPhase = '' + # PYTHONPATH="$PWD/build/lib.linux-*:$PYTHONPATH" ${python3.interpreter} -c "import pyamg; pyamg.test()" + # ''; + + pythonImportsCheck = [ + "pyamg" + "pyamg.amg_core.evolution_strength" + ]; meta = with lib; { description = "Algebraic Multigrid Solvers in Python"; diff --git a/nixpkgs/pkgs/development/python-modules/pyathena/default.nix b/nixpkgs/pkgs/development/python-modules/pyathena/default.nix index c24bcefec167..fe9d3276e1be 100644 --- a/nixpkgs/pkgs/development/python-modules/pyathena/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyathena/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyathena"; - version = "2.4.1"; + version = "2.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyAthena"; inherit version; - sha256 = "9d42b4e2cdbd8c48f8157692b50681b08569aa3cac3a9694e671ec9aa40f969b"; + sha256 = "sha256-GTcDiDtZGgTpdl6YBgPuztv7heEPZ/ymhup/4JwfELA="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pycep-parser/default.nix b/nixpkgs/pkgs/development/python-modules/pycep-parser/default.nix new file mode 100644 index 000000000000..f286e6b45bdb --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pycep-parser/default.nix @@ -0,0 +1,58 @@ +{ lib +, assertpy +, buildPythonPackage +, fetchFromGitHub +, lark +, poetry-core +, pytestCheckHook +, pythonOlder +, regex +, typing-extensions +}: + +buildPythonPackage rec { + pname = "pycep-parser"; + version = "0.3.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "gruebel"; + repo = "pycep"; + rev = version; + hash = "sha256-S4jBqMgyreWrEp1SuR8J5RVFc+i1O0xbfgux1UvFP5k="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + lark + regex + typing-extensions + ]; + + checkInputs = [ + assertpy + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'version = "0.3.1-alpha.1"' 'version = "${version}"' \ + --replace 'regex = "^2022.3.2"' 'regex = "*"' + ''; + + pythonImportsCheck = [ + "pycep" + ]; + + meta = with lib; { + description = "Python based Bicep parser"; + homepage = "https://github.com/gruebel/pycep"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pycfmodel/default.nix b/nixpkgs/pkgs/development/python-modules/pycfmodel/default.nix index 5918c1feb751..a6a2446da07b 100644 --- a/nixpkgs/pkgs/development/python-modules/pycfmodel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pycfmodel/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pycfmodel"; - version = "0.16.2"; + version = "0.17.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Skyscanner"; repo = pname; rev = version; - hash = "sha256-hOe6BH8aSGJ7YeraiCsJ10mbeGbFGaR3Bt5fh6M8iWI="; + hash = "sha256-Rw0sZ2k+tXo04mvlL83hUgdHIND5NIsVH/CzrfmbKlE="; }; propagatedBuildInputs = [ @@ -36,6 +36,7 @@ buildPythonPackage rec { "test_auxiliar_cast" "test_valid_es_domain_from_aws_documentation_examples_resource_can_be_built" "test_valid_opensearch_domain_from_aws_documentation_examples_resource_can_be_built" + "test_resolve_booleans_different_properties_for_generic_resource" ]; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix b/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix index f5921d0dfd20..37ef4da7daf6 100644 --- a/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pychromecast"; - version = "10.2.3"; + version = "10.3.0"; format = "setuptools"; disabled = !isPy3k; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyChromecast"; inherit version; - sha256 = "ddb86c5acdc13e8bdadd2b7f5738fda36b32c1750548f7b629ca8d178f05e0da"; + sha256 = "sha256-TrEHRG/b7YdvSMgyArYhKyIShhaKVcFrPrjt9CAPEKE="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyctr/default.nix b/nixpkgs/pkgs/development/python-modules/pyctr/default.nix new file mode 100644 index 000000000000..3817342be3ed --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyctr/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder +, pycryptodomex }: + +buildPythonPackage rec { + pname = "pyctr"; + version = "0.6.0"; + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-05lMcsIeJIHI3LwHQTjr4M+bn1FG+GQscuGq34XxjK8="; + }; + + propagatedBuildInputs = [ pycryptodomex ]; + + pythonImportsCheck = [ "pyctr" ]; + + meta = with lib; { + description = "Python library to interact with Nintendo 3DS files"; + license = licenses.mit; + maintainers = with maintainers; [ rileyinman ]; + homepage = "https://github.com/ihaveamac/pyctr"; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pycurl/default.nix b/nixpkgs/pkgs/development/python-modules/pycurl/default.nix index 5494360e51fc..0b87aba81655 100644 --- a/nixpkgs/pkgs/development/python-modules/pycurl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pycurl/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "pycurl"; - version = "7.44.1"; + version = "7.45.0"; disabled = isPyPy || (pythonOlder "3.5"); # https://github.com/pycurl/pycurl/issues/208 src = fetchPypi { inherit pname version; - sha256 = "5bcef4d988b74b99653602101e17d8401338d596b9234d263c728a0c3df003e8"; + sha256 = "sha256-UDbFPG9BBukWDQU6S6o0M6AhX7M4YHPiESc8VqOpXz0="; }; preConfigure = '' diff --git a/nixpkgs/pkgs/development/python-modules/pydeconz/default.nix b/nixpkgs/pkgs/development/python-modules/pydeconz/default.nix index fe418be71adb..8d37521f3266 100644 --- a/nixpkgs/pkgs/development/python-modules/pydeconz/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pydeconz/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pydeconz"; - version = "86"; + version = "87"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = "deconz"; rev = "v${version}"; - sha256 = "sha256-NqNXbF5rGMCbugzZY+AQPPHYmQx/RrSwqtnoF1shSSU="; + sha256 = "sha256-scNTHbUL8TOhkUJyib4cgL8A4gZ73asmFLi8aGw3sX8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pydexcom/default.nix b/nixpkgs/pkgs/development/python-modules/pydexcom/default.nix index c2f8953bbced..f79cfc9493dd 100644 --- a/nixpkgs/pkgs/development/python-modules/pydexcom/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pydexcom/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pydexcom"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "gagebenne"; repo = pname; rev = version; - sha256 = "sha256-8PE+MFQkuwYey82jNSRjMaK8kAhYSBbjqnsbGJHGW9I="; + sha256 = "sha256-ItDGnUUUTwCz4ZJtFVlMYjjoBPn2h8QZgLzgnV2T/Qk="; }; propagatedBuildInputs = [ requests ]; diff --git a/nixpkgs/pkgs/development/python-modules/pydroid-ipcam/default.nix b/nixpkgs/pkgs/development/python-modules/pydroid-ipcam/default.nix index 3d9b4188172b..50e04ef2018d 100644 --- a/nixpkgs/pkgs/development/python-modules/pydroid-ipcam/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pydroid-ipcam/default.nix @@ -8,14 +8,16 @@ buildPythonPackage rec { pname = "pydroid-ipcam"; - version = "unstable-2021-06-01"; + version = "1.3.1"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = pname; rev = "3ca14ff178f3506a6a91d8736deea8f06e9ad1c1"; - sha256 = "0w81pl5fya17hg5xgba2vgxnylfd8jc70il575wdz2pw6z6ihj3s"; + hash = "sha256-ekgYzTf8it94OYVGcJhEzVFv+9tCrdfLgyco7wq9AXE="; }; propagatedBuildInputs = [ @@ -25,7 +27,10 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "pydroid_ipcam" ]; + + pythonImportsCheck = [ + "pydroid_ipcam" + ]; meta = with lib; { description = "Python library for Android IP Webcam"; diff --git a/nixpkgs/pkgs/development/python-modules/pyeapi/default.nix b/nixpkgs/pkgs/development/python-modules/pyeapi/default.nix index 101f41c5ca01..a31123492d42 100644 --- a/nixpkgs/pkgs/development/python-modules/pyeapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyeapi/default.nix @@ -1,11 +1,20 @@ -{ lib, buildPythonPackage, fetchFromGitHub, netaddr, pytestCheckHook, coverage -, mock }: +{ lib +, buildPythonPackage +, pythonAtLeast +, fetchFromGitHub +, netaddr +, pytestCheckHook +, mock +}: buildPythonPackage rec { pname = "pyeapi"; version = "0.8.4"; format = "pyproject"; + # https://github.com/arista-eosplus/pyeapi/issues/189 + disabled = pythonAtLeast "3.10"; + src = fetchFromGitHub { owner = "arista-eosplus"; repo = pname; @@ -15,10 +24,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ netaddr ]; - checkInputs = [ coverage mock ]; - checkPhase = '' - make unittest - ''; + checkInputs = [ + mock + pytestCheckHook + ]; + + pytestFlagsArray = [ "test/unit" ]; + + pythonImportsCheck = [ "pyeapi" ]; meta = with lib; { description = "Client for Arista eAPI"; diff --git a/nixpkgs/pkgs/development/python-modules/pyefergy/default.nix b/nixpkgs/pkgs/development/python-modules/pyefergy/default.nix index 20f3fb9f417b..28fb058c52a2 100644 --- a/nixpkgs/pkgs/development/python-modules/pyefergy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyefergy/default.nix @@ -1,15 +1,18 @@ { lib , aiohttp +, aresponses , buildPythonPackage , fetchFromGitHub , iso4217 +, pytest-asyncio +, pytestCheckHook , pythonOlder , pytz }: buildPythonPackage rec { pname = "pyefergy"; - version = "0.1.5"; + version = "22.1.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +21,7 @@ buildPythonPackage rec { owner = "tkdrob"; repo = pname; rev = version; - sha256 = "sha256-8xcKgsZ6buaQdrKD8Qn7jB5IlQ0NkR0nZGuFk+Dd8Q8="; + sha256 = "sha256-AdoM+PcVoajxhnEfkyN9UuNufChu8XGmZDLNC3mjrps="; }; propagatedBuildInputs = [ @@ -27,10 +30,15 @@ buildPythonPackage rec { pytz ]; - # Project has no tests - doCheck = false; + checkInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; - pythonImportsCheck = [ "pyefergy" ]; + pythonImportsCheck = [ + "pyefergy" + ]; meta = with lib; { description = "Python API library for Efergy energy meters"; diff --git a/nixpkgs/pkgs/development/python-modules/pyface/default.nix b/nixpkgs/pkgs/development/python-modules/pyface/default.nix index aafd60c0dbae..d10e20eb0b2e 100644 --- a/nixpkgs/pkgs/development/python-modules/pyface/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyface/default.nix @@ -1,21 +1,35 @@ -{ lib, fetchPypi, buildPythonPackage -, importlib-metadata, importlib-resources, six, traits +{ lib +, fetchPypi +, buildPythonPackage +, importlib-metadata +, importlib-resources +, traits +, pythonOlder }: buildPythonPackage rec { pname = "pyface"; - version = "7.4.0"; + version = "7.4.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-r8Awj9dOYPWxh1Ar2JK/nhuY8hAGFO4+6yr9yq7Pb6s="; + sha256 = "sha256-UtzzZ5yj5hCjynxLmQSpbGkWiASNtdflKvjlAZ5HrbY="; }; - propagatedBuildInputs = [ importlib-metadata importlib-resources six traits ]; + propagatedBuildInputs = [ + importlib-metadata + importlib-resources + traits + ]; doCheck = false; # Needs X server - pythonImportsCheck = [ "pyface" ]; + pythonImportsCheck = [ + "pyface" + ]; meta = with lib; { description = "Traits-capable windowing framework"; diff --git a/nixpkgs/pkgs/development/python-modules/pyftdi/default.nix b/nixpkgs/pkgs/development/python-modules/pyftdi/default.nix index a1fd4215faf9..baf57da4160e 100644 --- a/nixpkgs/pkgs/development/python-modules/pyftdi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyftdi/default.nix @@ -8,22 +8,29 @@ buildPythonPackage rec { pname = "pyftdi"; - version = "0.53.3"; - disabled = pythonOlder "3.5"; + version = "0.54.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "eblot"; repo = pname; rev = "v${version}"; - sha256 = "sha256-t4rFsuhcpYdgmQeog+DRFxHk0wpMc+aukQi981vH/44="; + hash = "sha256-vL8jSgTtDvaHuCvaCYmFixILQFasTl82yINL5yRtOwU="; }; - propagatedBuildInputs = [ pyusb pyserial ]; + propagatedBuildInputs = [ + pyserial + pyusb + ]; - # tests requires access to the serial port + # Tests require access to the serial port doCheck = false; - pythonImportsCheck = [ "pyftdi" ]; + pythonImportsCheck = [ + "pyftdi" + ]; meta = with lib; { description = "User-space driver for modern FTDI devices"; diff --git a/nixpkgs/pkgs/development/python-modules/pyglet/default.nix b/nixpkgs/pkgs/development/python-modules/pyglet/default.nix index 7addcf531426..fbf5ccf9edef 100644 --- a/nixpkgs/pkgs/development/python-modules/pyglet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyglet/default.nix @@ -18,13 +18,13 @@ }: buildPythonPackage rec { - version = "1.5.21"; + version = "1.5.22"; pname = "pyglet"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "5aaaddb06dc4b6f9ba08254d8d806a2bd2406925a9caf3a51fdffbd5d09728e2"; + sha256 = "sha256-VjDcNuoA/cEa06g5TGdkF+w2WyX92a9XoQfhmtxBGw8="; extension = "zip"; }; diff --git a/nixpkgs/pkgs/development/python-modules/pygmo/default.nix b/nixpkgs/pkgs/development/python-modules/pygmo/default.nix index d846cc4f18c7..b06cb5430064 100644 --- a/nixpkgs/pkgs/development/python-modules/pygmo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pygmo/default.nix @@ -1,52 +1,63 @@ { lib -, buildPythonPackage +, stdenv +, toPythonModule +, fetchFromGitHub +, cmake +, boost , eigen -, nlopt , ipopt -, boost +, nlopt , pagmo2 -, numpy +, python , cloudpickle , ipyparallel , numba -, python +, numpy +, pybind11 }: -let - propagatedBuildInputs = [ numpy cloudpickle ipyparallel numba ]; - - pagmo2WithPython = pagmo2.overrideAttrs (oldAttrs: { - cmakeFlags = oldAttrs.cmakeFlags ++ [ - "-DPAGMO_BUILD_PYGMO=yes" - "-DPAGMO_BUILD_PAGMO=no" - "-DPagmo_DIR=${pagmo2}" - ]; - buildInputs = [ eigen nlopt ipopt boost pagmo2 ] ++ propagatedBuildInputs; - postInstall = '' - mv wheel $out - ''; - }); - -in buildPythonPackage { +toPythonModule (stdenv.mkDerivation rec { pname = "pygmo"; - version = pagmo2WithPython.version; - - inherit propagatedBuildInputs; + version = "2.18.0"; - src = pagmo2WithPython; - - preBuild = '' - mv ${python.sitePackages}/pygmo wheel - cd wheel - ''; + src = fetchFromGitHub { + owner = "esa"; + repo = "pygmo2"; + rev = "v${version}"; + sha256 = "sha256-he7gxRRJd6bBrD0Z0i+CQTr5JH4P3Im/beNGO+HfmNM="; + }; - # dont do tests - doCheck = false; + cmakeFlags = [ + "-DPYGMO_INSTALL_PATH=${placeholder "out"}/lib/${python.libPrefix}/site-packages" + ]; + + nativeBuildInputs = [ + cmake + ]; + + propagatedBuildInputs = [ + cloudpickle + ipyparallel + numba + numpy + python + ]; + + buildInputs = [ + boost + eigen + ipopt + nlopt + pagmo2 + pybind11 + ]; + + doCheck = true; meta = with lib; { description = "Parallel optimisation for Python"; - homepage = "https://esa.github.io/pagmo2/"; + homepage = "https://github.com/esa/pygmo2"; license = licenses.gpl3Plus; maintainers = [ maintainers.costrouc ]; }; -} +}) diff --git a/nixpkgs/pkgs/development/python-modules/pyhaversion/default.nix b/nixpkgs/pkgs/development/python-modules/pyhaversion/default.nix index 6fe9df519652..6028f19bdab2 100644 --- a/nixpkgs/pkgs/development/python-modules/pyhaversion/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyhaversion/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyhaversion"; - version = "21.11.1"; + version = "22.02.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "sha256-wh6NJRDgOrEHYEN3QlC4lOZHPnPeiPCJFF1xLoixQ14="; + sha256 = "sha256-7cBUsTEZ9yVlWsUdKs4YWm647baN09AQJI+7CTORhLc="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyicloud/default.nix b/nixpkgs/pkgs/development/python-modules/pyicloud/default.nix index 039d6259f36d..56f4e4236215 100644 --- a/nixpkgs/pkgs/development/python-modules/pyicloud/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyicloud/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "pyicloud"; - version = "0.10.2"; + version = "1.0.0"; src = fetchFromGitHub { owner = "picklepete"; repo = pname; rev = version; - sha256 = "0bxbhvimwbj2jm8dg7sil8yvln17xgjhvpwr4m783vwfcf76kdmy"; + sha256 = "sha256-2E1pdHHt8o7CGpdG+u4xy5OyNCueUGVw5CY8oicYd5w="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyisy/default.nix b/nixpkgs/pkgs/development/python-modules/pyisy/default.nix index b671dbde59ef..5daadce41f44 100644 --- a/nixpkgs/pkgs/development/python-modules/pyisy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyisy/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pyisy"; - version = "3.0.2"; + version = "3.0.5"; src = fetchFromGitHub { owner = "automicus"; repo = "PyISY"; rev = "v${version}"; - hash = "sha256-ad3hVs0B3uBHj/LVWwAXAkUMbjHPtyaeKueRPcmIMFg="; + hash = "sha256-lVutG/xJvVP0qS0UnEyS/9KwwqdRX6ownTKek8/VXbU="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pylru/default.nix b/nixpkgs/pkgs/development/python-modules/pylru/default.nix index 8ca565834d4a..a83f2fd3ad14 100644 --- a/nixpkgs/pkgs/development/python-modules/pylru/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pylru/default.nix @@ -1,18 +1,35 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "pylru"; - version = "1.2.0"; + version = "1.2.1"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "492f934bb98dc6c8b2370c02c95c65516ddc08c8f64d27f70087eb038621d297"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "jlhutch"; + repo = pname; + rev = "v${version}"; + hash = "sha256-dTYiD+/zt0ZSP+sefYyeD87To1nRXyoFodlBg8pm1YE="; }; + # Check with the next release if tests are ready + doCheck = false; + + pythonImportsCheck = [ + "pylru" + ]; + meta = with lib; { - homepage = "https://github.com/jlhutch/pylru"; description = "A least recently used (LRU) cache implementation"; - license = licenses.gpl2; + homepage = "https://github.com/jlhutch/pylru"; + license = licenses.gpl2Only; maintainers = with maintainers; [ abbradar ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix b/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix index 6f846481b039..8bf43a445437 100644 --- a/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymavlink"; - version = "2.4.20"; + version = "2.4.27"; src = fetchPypi { inherit pname version; - sha256 = "sha256-QdYlmlDZzVH8tErGdgAz6FjT/L7jexduvrffKVEqMfY="; + sha256 = "sha256-DzW1jB7L7sD9WAhk/3/0UD8PW7Nw/bHTI527NmMV6CY="; }; propagatedBuildInputs = [ future lxml ]; diff --git a/nixpkgs/pkgs/development/python-modules/pymc3/default.nix b/nixpkgs/pkgs/development/python-modules/pymc3/default.nix index 5cf2615ed031..7c1e46647e39 100644 --- a/nixpkgs/pkgs/development/python-modules/pymc3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymc3/default.nix @@ -2,10 +2,11 @@ , fetchPypi , buildPythonPackage , pythonOlder -, Theano +, theano-pymc , pandas , patsy , joblib +, cachetools , tqdm , six , h5py @@ -16,6 +17,8 @@ , parameterized , fastprogress , typing-extensions +, dill +, semver }: buildPythonPackage rec { @@ -34,7 +37,6 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - Theano pandas patsy joblib @@ -45,12 +47,10 @@ buildPythonPackage rec { packaging fastprogress typing-extensions - ]; - - checkInputs = [ - pytest - nose - parameterized + dill + theano-pymc + cachetools + semver ]; # The test suite is computationally intensive and test failures are not @@ -67,9 +67,6 @@ buildPythonPackage rec { description = "Bayesian estimation, particularly using Markov chain Monte Carlo (MCMC)"; homepage = "https://github.com/pymc-devs/pymc3"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ ilya-kolpakov ]; - # several dependencies are not declared and in the end it requires theano-pymc3 - # instead of Theano. The former is currently not packaged. - broken = true; + maintainers = with lib.maintainers; [ nidabdella ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pymediaroom/default.nix b/nixpkgs/pkgs/development/python-modules/pymediaroom/default.nix index e977cb23d752..364063f78628 100644 --- a/nixpkgs/pkgs/development/python-modules/pymediaroom/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymediaroom/default.nix @@ -1,21 +1,19 @@ { lib , async-timeout , buildPythonPackage -, fetchFromGitHub +, fetchPypi , pythonOlder , xmltodict }: buildPythonPackage rec { pname = "pymediaroom"; - version = "0.6.4.1"; + version = "0.6.5.4"; disabled = pythonOlder "3.5"; - src = fetchFromGitHub { - owner = "dgomes"; - repo = pname; - rev = version; - sha256 = "1klf2dxd8rlq3n4b9m03lzwcsasn9vi6m3hzrjqhqnprhrnp0xmy"; + src = fetchPypi { + inherit pname version; + hash = "sha256-CZh2knpLT7xt5s6+kTQ4Mq9LcpKgWvgdFCkPtMucJTM="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix b/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix index 42c369dbf7e7..24c214fcba34 100644 --- a/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "pymupdf"; - version = "1.19.4"; + version = "1.19.6"; src = fetchPypi { pname = "PyMuPDF"; inherit version; - sha256 = "125783986da87fe1a5372d621e90fa49e454454af0b3d0f894858c146c712f81"; + sha256 = "sha256-7z0T4n8Vhdd29qJZfxE6q9KNNrZIuYOnKFCyHFOZqwg="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pynina/default.nix b/nixpkgs/pkgs/development/python-modules/pynina/default.nix index 5eaf015e9bb4..8227e01edc24 100644 --- a/nixpkgs/pkgs/development/python-modules/pynina/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pynina/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pynina"; - version = "0.1.4"; + version = "0.1.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyNINA"; inherit version; - sha256 = "1q382b70ydzzbqb9sa5y5w7039rp6q0wyffarrsdw916kbc4zyqd"; + sha256 = "sha256-7sceYmzOmXJMKaIdGmXMuCAum0aJeVTxx1w/jZy5Eig="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyobihai/default.nix b/nixpkgs/pkgs/development/python-modules/pyobihai/default.nix index 79d8363372be..0cc62311f329 100644 --- a/nixpkgs/pkgs/development/python-modules/pyobihai/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyobihai/default.nix @@ -7,13 +7,15 @@ buildPythonPackage rec { pname = "pyobihai"; - version = "1.3.1"; - disabled = pythonOlder "3.6"; + version = "1.3.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; # GitHub release, https://github.com/dshokouhi/pyobihai/issues/10 src = fetchPypi { inherit pname version; - sha256 = "1vvf5if57dfd091a7fb5rvx63hvf0isrx28j72nj2aav1as460qp"; + hash = "sha256-zhsnJyhXlugK0nJ7FJZZcrq2VDQt1a9uCgsJAIABZ28="; }; propagatedBuildInputs = [ @@ -23,7 +25,9 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "pyobihai" ]; + pythonImportsCheck = [ + "pyobihai" + ]; meta = with lib; { description = "Python package to interact with Obihai devices"; diff --git a/nixpkgs/pkgs/development/python-modules/pyoverkiz/default.nix b/nixpkgs/pkgs/development/python-modules/pyoverkiz/default.nix index 00380f341fcb..60d09f35a464 100644 --- a/nixpkgs/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyoverkiz/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyoverkiz"; - version = "1.3.5"; + version = "1.3.10"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "iMicknl"; repo = "python-overkiz-api"; rev = "v${version}"; - hash = "sha256-KxZYluXa15RojAyNe5hA8Yf/Q9/mVl+b0TrDGRE6iuM="; + hash = "sha256-XvQDCCxqqY902cpn7Ee48XOvbjBhs0UsJH/b4skjazE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyparted/default.nix b/nixpkgs/pkgs/development/python-modules/pyparted/default.nix index ee34f91b57e2..1c054defbef3 100644 --- a/nixpkgs/pkgs/development/python-modules/pyparted/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyparted/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyparted"; - version = "3.11.7"; + version = "3.12.0"; disabled = isPyPy; src = fetchFromGitHub { repo = pname; owner = "dcantrell"; rev = "v${version}"; - sha256 = "01193fmkss9icjvqpw85szpk8ld1pnha7p9kqm7mpwk6rc6gi2m3"; + sha256 = "sha256-LfBLR0A/wnfBtXISAAY6Nl4vnk1rtY03F+PT8UIMrEs="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pyprecice/default.nix b/nixpkgs/pkgs/development/python-modules/pyprecice/default.nix new file mode 100644 index 000000000000..7c278d6e1be9 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyprecice/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchFromGitHub, precice, numpy, mpi4py, cython }: + +buildPythonPackage rec { + pname = "pyprecice"; + version = "2.3.0.1"; + + src = fetchFromGitHub { + owner = "precice"; + repo = "python-bindings"; + rev = "v${version}"; + sha256 = "1yz96pif63ms797bzxbfrjba4mgz7cz5dqrqghn5sg0g1b9qxnn5"; + }; + + nativeBuildInputs = [ cython ]; + propagatedBuildInputs = [ numpy mpi4py precice ]; + + doCheck = false; # Disable Test because everything depends on open mpi which requires network. + # Do not use pythonImportsCheck because this will also initialize mpi which requires a network interface + + meta = with lib; { + description = "Python language bindings for preCICE"; + homepage = "https://github.com/precice/python-bindings"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ Scriptkiddi ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyrfxtrx/default.nix b/nixpkgs/pkgs/development/python-modules/pyrfxtrx/default.nix index 7e1fb8876cb0..30dd52e3eeaf 100644 --- a/nixpkgs/pkgs/development/python-modules/pyrfxtrx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyrfxtrx/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "pyrfxtrx"; - version = "0.27.1"; + version = "0.28.0"; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pyRFXtrx"; rev = version; - hash = "sha256-JBU/ApBumdW87fQqMAopzv+UV0f6VsHMiyNqG7BRLgo="; + hash = "sha256-Ty+yIA8amKyV3z++7n1m/YRH0gEoVIVTdX8xiZYp/eM="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyrogram/default.nix b/nixpkgs/pkgs/development/python-modules/pyrogram/default.nix index dc453e86c702..dfc10c638e0d 100644 --- a/nixpkgs/pkgs/development/python-modules/pyrogram/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyrogram/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyrogram"; - version = "1.4.3"; + version = "1.4.8"; disabled = pythonOlder "3.6"; src = fetchPypi { pname = "Pyrogram"; inherit version; - hash = "sha256-5twH9ZfwtP6gi50K8nqXOmCPSFkHO5Hitd7XaDP0EQg="; + hash = "sha256-mUJEV8DLYhXNvYiuiVDCfgMmZRDCNZuydngj9C9FvQU="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyroute2-core/default.nix b/nixpkgs/pkgs/development/python-modules/pyroute2-core/default.nix index fe92d88beaec..758c848c7ecc 100644 --- a/nixpkgs/pkgs/development/python-modules/pyroute2-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyroute2-core/default.nix @@ -2,16 +2,20 @@ , buildPythonPackage , fetchPypi , pyroute2-core +, pythonOlder }: buildPythonPackage rec { pname = "pyroute2-core"; - version = "0.6.5"; + version = "0.6.8"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "pyroute2.core"; inherit version; - sha256 = "sha256-Jm10Dq5A+mTdBFQfAH0022ls7PMVTLpb4w+nWmfUOFI="; + hash = "sha256-gkvr1FgFWI1eurjbuUYhYj0D4eZTIBsDMRXSWrKiCP4="; }; # pyroute2 sub-modules have no tests diff --git a/nixpkgs/pkgs/development/python-modules/pyroute2-ethtool/default.nix b/nixpkgs/pkgs/development/python-modules/pyroute2-ethtool/default.nix index 6f2695507863..4838b6690424 100644 --- a/nixpkgs/pkgs/development/python-modules/pyroute2-ethtool/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyroute2-ethtool/default.nix @@ -2,16 +2,20 @@ , buildPythonPackage , fetchPypi , pyroute2-core +, pythonOlder }: buildPythonPackage rec { pname = "pyroute2-ethtool"; - version = "0.6.5"; + version = "0.6.8"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "pyroute2.ethtool"; inherit version; - sha256 = "sha256-yvgBS2dlIRNcR2DXLPWu72q7x/onUhD36VMzBzzHcVo="; + hash = "sha256-+/B+YQOluzyGYmnwAZonsjgZeiZPYl8LhJ9OjnvV/64="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyroute2-ipdb/default.nix b/nixpkgs/pkgs/development/python-modules/pyroute2-ipdb/default.nix index 7411f49cb52a..4704d95279ff 100644 --- a/nixpkgs/pkgs/development/python-modules/pyroute2-ipdb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyroute2-ipdb/default.nix @@ -2,16 +2,20 @@ , buildPythonPackage , fetchPypi , pyroute2-core +, pythonOlder }: buildPythonPackage rec { pname = "pyroute2-ipdb"; - version = "0.6.5"; + version = "0.6.8"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "pyroute2.ipdb"; inherit version; - sha256 = "sha256-8gKP0QE9iviIFQ0DPuz3U3ZXpL434MzOqYAICZYetXc="; + hash = "sha256-sjlJ1eBoMQaJzEF/4Qk9ZwZB0s/yvR5wUUDP3UWBA50="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyroute2-ipset/default.nix b/nixpkgs/pkgs/development/python-modules/pyroute2-ipset/default.nix index 5ab21f8f22c7..1889b5ead881 100644 --- a/nixpkgs/pkgs/development/python-modules/pyroute2-ipset/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyroute2-ipset/default.nix @@ -2,16 +2,20 @@ , buildPythonPackage , fetchPypi , pyroute2-core +, pythonOlder }: buildPythonPackage rec { pname = "pyroute2-ipset"; - version = "0.6.5"; + version = "0.6.8"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "pyroute2.ipset"; inherit version; - sha256 = "sha256-rlJ8D5mXSCMKH2iNmit8JXst9tdDafROylMNAHeTt50="; + hash = "sha256-j2vEQyfuuMH0QRtXw6acX9AMureQwgeS+Ap7m2uP9OY="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyroute2-ndb/default.nix b/nixpkgs/pkgs/development/python-modules/pyroute2-ndb/default.nix index 7caa902dfa7d..86bbde3e52ab 100644 --- a/nixpkgs/pkgs/development/python-modules/pyroute2-ndb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyroute2-ndb/default.nix @@ -2,16 +2,20 @@ , buildPythonPackage , fetchPypi , pyroute2-core +, pythonOlder }: buildPythonPackage rec { pname = "pyroute2-ndb"; - version = "0.6.5"; + version = "0.6.8"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "pyroute2.ndb"; inherit version; - sha256 = "sha256-pNMJWE6e9seEKvT4MrSPxTRKsiXnDjhLrtG3/iuU2fg="; + hash = "sha256-90DAbXCkoIFUbWZotKYkCSGsQvb7LrEpf6xGCviP40w="; }; propagatedBuildInputs = [ @@ -21,7 +25,9 @@ buildPythonPackage rec { # pyroute2 sub-modules have no tests doCheck = false; - pythonImportsCheck = [ "pr2modules.ndb" ]; + pythonImportsCheck = [ + "pr2modules.ndb" + ]; meta = with lib; { description = "NDB module for pyroute2"; diff --git a/nixpkgs/pkgs/development/python-modules/pyroute2-nftables/default.nix b/nixpkgs/pkgs/development/python-modules/pyroute2-nftables/default.nix index ec5ada77dd2e..4a3d58c896c2 100644 --- a/nixpkgs/pkgs/development/python-modules/pyroute2-nftables/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyroute2-nftables/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pyroute2-nftables"; - version = "0.6.5"; + version = "0.6.8"; src = fetchPypi { pname = "pyroute2.nftables"; inherit version; - sha256 = "sha256-sUVaY6PvwFDRCNVQ0cr9AR7d7W6JTZnnvfoC1ZK/bxY="; + sha256 = "sha256-SNebxs0mCFEI4bejuLMeU3wrO8KZZT1frnfQw8Gko6E="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyroute2-nslink/default.nix b/nixpkgs/pkgs/development/python-modules/pyroute2-nslink/default.nix index 722ea0a12f9c..0f47e7228d34 100644 --- a/nixpkgs/pkgs/development/python-modules/pyroute2-nslink/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyroute2-nslink/default.nix @@ -2,16 +2,20 @@ , buildPythonPackage , fetchPypi , pyroute2-core +, pythonOlder }: buildPythonPackage rec { pname = "pyroute2-nslink"; - version = "0.6.5"; + version = "0.6.8"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "pyroute2.nslink"; inherit version; - sha256 = "sha256-KS5sKDKnNUTBxtW6cn9xF6qEflX4jXjpS31GB7KZmZ4="; + hash = "sha256-bTGzXouEdVUFaT5mxGfonFu3aOMxZKRTDMaHFciofec="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyroute2-protocols/default.nix b/nixpkgs/pkgs/development/python-modules/pyroute2-protocols/default.nix index ec3226f0cd98..84c9813b5eaa 100644 --- a/nixpkgs/pkgs/development/python-modules/pyroute2-protocols/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyroute2-protocols/default.nix @@ -2,16 +2,20 @@ , buildPythonPackage , fetchPypi , pyroute2-core +, pythonOlder }: buildPythonPackage rec { pname = "pyroute2-protocols"; - version = "0.6.5"; + version = "0.6.8"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "pyroute2.protocols"; inherit version; - sha256 = "sha256-lj9Q8ew+44m+Y72miQyuZhzjHmdLqYB+c2FK+ph1d84="; + hash = "sha256-l07CEwZzDxym+QAnKFFEpX690RStOA+rAwMXiEd7FOs="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix b/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix index 9afea342e6d7..a2ae4d3c3857 100644 --- a/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, importlib-metadata , mitogen , pyroute2-core , pyroute2-ethtool @@ -9,15 +10,19 @@ , pyroute2-ndb , pyroute2-nftables , pyroute2-nslink +, pythonOlder }: buildPythonPackage rec { pname = "pyroute2"; - version = "0.6.5"; + version = "0.6.8"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-0JlciuuWwOTu1NYul8nXlQAKGjO3R9bcVDJmZYV88Rw="; + hash = "sha256-WhqjvCwKrUUBLKvjpva7pc94UIZvTf7j705Bt2DHyKQ="; }; propagatedBuildInputs = [ @@ -29,18 +34,22 @@ buildPythonPackage rec { pyroute2-ndb pyroute2-nftables pyroute2-nslink + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata ]; # Requires root privileges, https://github.com/svinota/pyroute2/issues/778 doCheck = false; - pythonImportsCheck = [ "pyroute2" ]; + pythonImportsCheck = [ + "pyroute2" + ]; meta = with lib; { description = "Python Netlink library"; homepage = "https://github.com/svinota/pyroute2"; license = licenses.asl20; - maintainers = with maintainers; [ mic92 ]; + maintainers = with maintainers; [ fab mic92 ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix b/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix index bc21b0a309d1..e658ca40be7a 100644 --- a/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "pysaml2"; - version = "7.1.0"; + version = "7.1.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "IdentityPython"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3Yl6j6KAlw7QQYnwU7+naY6D97IqX766zguekKAuic8="; + sha256 = "sha256-uRfcn3nCK+tx6ol6ZFarOSrDOh0cfC9gZXBZ7EICQzw="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pysigma-backend-splunk/default.nix b/nixpkgs/pkgs/development/python-modules/pysigma-backend-splunk/default.nix new file mode 100644 index 000000000000..f3b122b4ecac --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pysigma-backend-splunk/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pysigma +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pysigma-backend-splunk"; + version = "0.1.1"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "SigmaHQ"; + repo = "pySigma-backend-splunk"; + rev = "v${version}"; + hash = "sha256-AGT+7BKtINe2ukmomYyoUa5PHYAH1N0tUTtbyjMD+kw="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + pysigma + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "sigma.backends.splunk" + ]; + + meta = with lib; { + description = "Library to support Splunk for pySigma"; + homepage = "https://github.com/SigmaHQ/pySigma-backend-splunk"; + license = with licenses; [ lgpl21Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix b/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix new file mode 100644 index 000000000000..22f589d3b149 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pysigma +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pysigma-pipeline-crowdstrike"; + version = "0.1.3"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "SigmaHQ"; + repo = "pySigma-pipeline-crowdstrike"; + rev = "v${version}"; + hash = "sha256-JNJHKydMzKreN+6liLlGMT1CFBUr/IX8Ah+exddKR3g="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + pysigma + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "sigma.pipelines.crowdstrike" + ]; + + meta = with lib; { + description = "Library to support CrowdStrike pipeline for pySigma"; + homepage = "https://github.com/SigmaHQ/pySigma-pipeline-crowdstrike"; + license = with licenses; [ lgpl21Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix b/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix new file mode 100644 index 000000000000..e784ac1eca16 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pysigma +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pysigma-pipeline-sysmon"; + version = "0.1.1"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "SigmaHQ"; + repo = "pySigma-pipeline-sysmon"; + rev = "v${version}"; + hash = "sha256-BBJt2SAbnPEzIwJ+tXW4NmA4Nrb/glIaPlnmYHLoMD0="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + pysigma + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "sigma.pipelines.sysmon" + ]; + + meta = with lib; { + description = "Library to support Sysmon pipeline for pySigma"; + homepage = "https://github.com/SigmaHQ/pySigma-pipeline-sysmon"; + license = with licenses; [ lgpl21Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pysigma/default.nix b/nixpkgs/pkgs/development/python-modules/pysigma/default.nix new file mode 100644 index 000000000000..39ab5c9918b5 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pysigma/default.nix @@ -0,0 +1,66 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, poetry-core +, pyparsing +, pytestCheckHook +, pythonOlder +, pyyaml +}: + +buildPythonPackage rec { + pname = "pysigma"; + version = "0.3.2"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "SigmaHQ"; + repo = "pySigma"; + rev = "v${version}"; + hash = "sha256-V/E2rZqVrk0kIvk+hPhNcAifhMM/rN3mk3pB+CGd43w="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + pyparsing + pyyaml + ]; + + checkInputs = [ + pytestCheckHook + ]; + + patches = [ + # Switch to poetry-core, https://github.com/SigmaHQ/pySigma/pull/31 + (fetchpatch { + name = "switch-to-poetry-core.patch"; + url = "https://github.com/SigmaHQ/pySigma/commit/b7a852d18852007da90c2ec35bff347c97b36f07.patch"; + sha256 = "sha256-zgg8Bsc37W2uuQluFpIZT4jHCQaitY2ZgS93Wk6Hxt0="; + }) + ]; + + postPatch = '' + # https://github.com/SigmaHQ/pySigma/issues/32 + # https://github.com/SigmaHQ/pySigma/issues/33 + substituteInPlace pyproject.toml \ + --replace 'pyparsing = "^2.4.7"' 'pyparsing = "*"' \ + --replace 'pyyaml = "^5.3.1"' 'pyyaml = "*"' + ''; + + pythonImportsCheck = [ + "sigma" + ]; + + meta = with lib; { + description = "Library to parse and convert Sigma rules into queries"; + homepage = "https://github.com/SigmaHQ/pySigma"; + license = with licenses; [ lgpl21Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pysignalclirestapi/default.nix b/nixpkgs/pkgs/development/python-modules/pysignalclirestapi/default.nix new file mode 100644 index 000000000000..023b6dde3eb8 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pysignalclirestapi/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +, future +}: + +buildPythonPackage rec { + pname = "pysignalclirestapi"; + version = "0.3.18"; + + format = "setuptools"; + + src = fetchFromGitHub { + owner = "bbernhard"; + repo = "pysignalclirestapi"; + rev = version; + hash = "sha256-BF4BmnQVfrj7f0N+TN/d7GNuDTbDQfwsCkUn2pVmMWo="; + }; + + propagatedBuildInputs = [ + requests + future + ]; + + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ "pysignalclirestapi" ]; + + meta = with lib; { + description = "Small python library for the Signal Cli REST API"; + homepage = "https://github.com/bbernhard/pysignalclirestapi"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyskyqremote/default.nix b/nixpkgs/pkgs/development/python-modules/pyskyqremote/default.nix index a971751c9ea5..e72e38b30cba 100644 --- a/nixpkgs/pkgs/development/python-modules/pyskyqremote/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyskyqremote/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, pycountry , pythonOlder , requests , websocket-client @@ -10,7 +9,7 @@ buildPythonPackage rec { pname = "pyskyqremote"; - version = "0.3.2"; + version = "0.3.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,11 +18,10 @@ buildPythonPackage rec { owner = "RogerSelwyn"; repo = "skyq_remote"; rev = version; - sha256 = "sha256-R/HmkVbVKbO54lDSw1tLYs2mXi/XqZX9GGXozv+96iI="; + sha256 = "sha256-/BhNoU1dnZj07ZvG126srSb6eW00n8htFuDttq006QE="; }; propagatedBuildInputs = [ - pycountry requests websocket-client xmltodict diff --git a/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix b/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix index 96037d512838..38e7e2733ead 100644 --- a/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix @@ -2,18 +2,21 @@ , bluepy , buildPythonPackage , fetchFromGitHub +, pythonOlder }: buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.13.2"; + version = "0.13.3"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = version; - sha256 = "0pdmssd5dr364p3lrkxqryjc0rbaw6xp724zwqf3i87qs6ljs928"; + hash = "sha256-Zgpnw4It3yyy9RQqt5SxeJXl1Z3J3Rp9baLfiw5Bgow="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pytenable/default.nix b/nixpkgs/pkgs/development/python-modules/pytenable/default.nix index e4417139bfa3..843f140ce754 100644 --- a/nixpkgs/pkgs/development/python-modules/pytenable/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytenable/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "pytenable"; - version = "1.4.3"; + version = "1.4.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "tenable"; repo = "pyTenable"; rev = version; - hash = "sha256-p9d3wZkOMhNQWJN6tCNUlW15A3irU8QN/nm7PLGTE/M="; + hash = "sha256-qp+e40z24RIOV5RfSw/nI/y1Z3972nCLN8DgQyLbDOc="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pytest-console-scripts/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-console-scripts/default.nix index 609ed9cc343e..6bc6fb22b031 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-console-scripts/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-console-scripts/default.nix @@ -5,28 +5,41 @@ , python , mock , setuptools-scm +, pythonOlder }: buildPythonPackage rec { pname = "pytest-console-scripts"; - version = "1.2.2"; + version = "1.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "caeaaaf57f3a99e4482127e8a18467a1cfd49c92f4b37e5578d0bc40bf1b3394"; + hash = "sha256-w8rb9nz7MKHrHMHp5py23kTDpkhCbxub9j6F2XNX/H8="; }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + checkInputs = [ + mock + pytestCheckHook + ]; + postPatch = '' - # setuptools-scm is pinned to <6 because it dropped Python 3.5 - # support. That's not something that affects us. - substituteInPlace setup.py --replace "'setuptools_scm<6'" "'setuptools_scm'" # Patch the shebang of a script generated during test. - substituteInPlace tests/test_run_scripts.py --replace "#!/usr/bin/env python" "#!${python.interpreter}" + substituteInPlace tests/test_run_scripts.py \ + --replace "#!/usr/bin/env python" "#!${python.interpreter}" ''; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; - - checkInputs = [ mock pytestCheckHook ]; + pythonImportsCheck = [ + "pytest_console_scripts" + ]; meta = with lib; { description = "Pytest plugin for testing console scripts"; diff --git a/nixpkgs/pkgs/development/python-modules/python-benedict/default.nix b/nixpkgs/pkgs/development/python-modules/python-benedict/default.nix index 9cf5ffc63abf..bf386d6d62dc 100644 --- a/nixpkgs/pkgs/development/python-modules/python-benedict/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-benedict/default.nix @@ -2,16 +2,15 @@ , aiohttp , buildPythonPackage , fetchFromGitHub -, pytestCheckHook -, pythonOlder - +, ftfy , mailchecker , phonenumbers +, pytestCheckHook , python-dateutil , python-fsutil +, pythonOlder , python-slugify , pyyaml -, ftfy , requests , six , toml @@ -20,7 +19,7 @@ buildPythonPackage rec { pname = "python-benedict"; - version = "0.24.3"; + version = "0.25.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +28,7 @@ buildPythonPackage rec { owner = "fabiocaccamo"; repo = pname; rev = version; - hash = "sha256-06n8MNoGQRSrBK2XeEBBoQ2NIXWf0qXPVBeP9ERMEj0="; + hash = "sha256-G7pTbxNcESMUiKpQxjiF0gwN5mBhmuwIDlzauN5JCB4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-efl/default.nix b/nixpkgs/pkgs/development/python-modules/python-efl/default.nix index 293d97712808..c5557b3fa6dc 100644 --- a/nixpkgs/pkgs/development/python-modules/python-efl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-efl/default.nix @@ -4,6 +4,7 @@ , pkg-config , python , dbus-python +, packaging , enlightenment }: @@ -11,18 +12,18 @@ buildPythonPackage rec { pname = "python-efl"; - version = "1.25.0"; + version = "1.26.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/bindings/python/${pname}-${version}.tar.xz"; - sha256 = "0bk161xwlz4dlv56r68xwkm8snzfifaxd1j7w2wcyyk4fgvnvq4r"; + sha256 = "0dj6f24n33hkpy0bkdclnzpxhvs8vpaxqaf7hkw0di19pjwrq25h"; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ enlightenment.efl ]; - propagatedBuildInputs = [ dbus-python ]; + propagatedBuildInputs = [ dbus-python packaging ]; preConfigure = '' NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl evas) $NIX_CFLAGS_COMPILE" @@ -39,8 +40,8 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - description = "Python bindings for EFL and Elementary"; - homepage = "https://phab.enlightenment.org/w/projects/python_bindings_for_efl/"; + description = "Python bindings for Enlightenment Foundation Libraries"; + homepage = "https://github.com/DaveMDS/python-efl"; platforms = platforms.linux; license = with licenses; [ gpl3 lgpl3 ]; maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx romildo ]; diff --git a/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix b/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix index 6704cb8ad006..e15a75484219 100644 --- a/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "3.1.1"; + version = "3.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ytEzjB/xp5GnuueZXcYh4mx3378iW63kVqzsdRJ4KCU="; + sha256 = "sha256-j27oEQn+wjH8K3TixANbt94FSOr4LdEZ/ilN8sSlJL4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-hosts/default.nix b/nixpkgs/pkgs/development/python-modules/python-hosts/default.nix index 934f15a7a464..4eca7cca13fc 100644 --- a/nixpkgs/pkgs/development/python-modules/python-hosts/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-hosts/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-hosts"; - version = "1.0.2"; + version = "1.0.3"; src = fetchPypi { inherit pname version; - sha256 = "8f827da4a1bf69d4f4f881f7d7ebc8b378967b60924aa4baea2c9d1debedf5fc"; + sha256 = "sha256-4SAXjx5pRDhv4YVUgrUttyUa5izpYqpDKiiGJc2y8V0="; }; # win_inet_pton is required for windows support diff --git a/nixpkgs/pkgs/development/python-modules/python-izone/default.nix b/nixpkgs/pkgs/development/python-modules/python-izone/default.nix index f1f8be9d3d27..e3ce43109725 100644 --- a/nixpkgs/pkgs/development/python-modules/python-izone/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-izone/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "python-izone"; - version = "1.2.4"; + version = "1.2.7"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Swamp-Ig"; repo = "pizone"; rev = "v${version}"; - hash = "sha256-HV8aQlwJ7VbGlJU0HpS9fK/QnRfYrk4ijKTGPWj0Jww="; + hash = "sha256-CvFOhs56dfNerK3junWElQfTJi1YXA86zMbv0tseQC8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-juicenet/default.nix b/nixpkgs/pkgs/development/python-modules/python-juicenet/default.nix index 1547c8914617..ad27a913257e 100644 --- a/nixpkgs/pkgs/development/python-modules/python-juicenet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-juicenet/default.nix @@ -1,18 +1,22 @@ { lib +, aiohttp , buildPythonPackage , fetchFromGitHub -, aiohttp +, pythonOlder }: buildPythonPackage rec { pname = "python-juicenet"; - version = "1.0.2"; + version = "1.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jesserockz"; repo = "python-juicenet"; rev = "v${version}"; - sha256 = "04547pj51ds31yhyc7ng47v9giz16h2s3wgb6szc8ivhb5rclqz2"; + hash = "sha256-5RKnVwOfEHzFZCiC8OUpS8exKrENK+I3Ok45HlKEvtU="; }; propagatedBuildInputs = [ @@ -22,7 +26,9 @@ buildPythonPackage rec { # no tests implemented doCheck = false; - pythonImportsCheck = [ "pyjuicenet" ]; + pythonImportsCheck = [ + "pyjuicenet" + ]; meta = with lib; { description = "Read and control Juicenet/Juicepoint/Juicebox based EVSE devices"; diff --git a/nixpkgs/pkgs/development/python-modules/python-miio/default.nix b/nixpkgs/pkgs/development/python-modules/python-miio/default.nix index 4095ff9285c4..c1391995ddaa 100644 --- a/nixpkgs/pkgs/development/python-modules/python-miio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-miio/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "python-miio"; - version = "0.5.10"; + version = "0.5.11"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-6iV+uIdVi0Z3FeM9xnp1Ss3VzFVEOm7wykxjSTXUIGM="; + sha256 = "sha256-1hC7yE/hGLx9g3NXqU45yC/6dcW6/0oZwgYW5bj/37c="; }; nativeBuildInputs = [ @@ -70,10 +70,6 @@ buildPythonPackage rec { "miio" ]; - disabledTestPaths = [ - "miio/tests/test_vacuums.py" - ]; - meta = with lib; { description = "Python library for interfacing with Xiaomi smart appliances"; homepage = "https://github.com/rytilahti/python-miio"; diff --git a/nixpkgs/pkgs/development/python-modules/python-openstackclient/default.nix b/nixpkgs/pkgs/development/python-modules/python-openstackclient/default.nix index 05efc97b6448..8c76861bcb86 100644 --- a/nixpkgs/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-openstackclient/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "python-openstackclient"; - version = "5.7.0"; + version = "5.8.0"; src = fetchPypi { inherit pname version; - sha256 = "c65e3d51018f193cce2daf3d0fd69daa36003bdb2b85df6b07b973e4c39e2f92"; + sha256 = "sha256-M0hS34iXuV8FgewS7ih96MepKJogihjwqLOHdwGf2YY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-slugify/default.nix b/nixpkgs/pkgs/development/python-modules/python-slugify/default.nix index 5b7af8ad7360..16c4dc0f2308 100644 --- a/nixpkgs/pkgs/development/python-modules/python-slugify/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-slugify/default.nix @@ -9,12 +9,14 @@ buildPythonPackage rec { pname = "python-slugify"; - version = "5.0.2"; + version = "6.1.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8TODoLn8vmSaGJK5yOtPjqsdbYS4S7emJDF6+pgVnKs="; + hash = "sha256-7/GQ5N+sl9L4wYkO5oJwns0jZQdCNhaH24LZXh5eJfU="; }; propagatedBuildInputs = [ @@ -26,9 +28,13 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "test.py" ]; + pytestFlagsArray = [ + "test.py" + ]; - pythonImportsCheck = [ "slugify" ]; + pythonImportsCheck = [ + "slugify" + ]; meta = with lib; { description = "Python Slugify application that handles Unicode"; diff --git a/nixpkgs/pkgs/development/python-modules/python-songpal/default.nix b/nixpkgs/pkgs/development/python-modules/python-songpal/default.nix index 715bf164a4b3..7215bd73281a 100644 --- a/nixpkgs/pkgs/development/python-modules/python-songpal/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-songpal/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "python-songpal"; - version = "0.14"; + version = "0.14.1"; format = "pyproject"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "rytilahti"; repo = "python-songpal"; rev = version; - hash = "sha256-yuCtz1B5bj3mWz4eP2GXzoaHuIQ47tIWn19jkZN54lw="; + hash = "sha256-lLRAXoz95hSt1JcWbQ1g5xmvDOeUmeXPa9pCuJktaeY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-trovo/default.nix b/nixpkgs/pkgs/development/python-modules/python-trovo/default.nix new file mode 100644 index 000000000000..d7fa18cfba3e --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/python-trovo/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "python-trovo"; + version = "0.1.5"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-JUJax9nk4NqpMMrbDmQhcy22GIqPha+K4tudQ98PvlE="; + }; + + propagatedBuildInputs = [ requests ]; + + # No tests found + doCheck = false; + + pythonImportsCheck = [ "trovoApi" ]; + + meta = with lib; { + description = "A Python wrapper for the Trovo API"; + homepage = "https://codeberg.org/wolfangaukang/python-trovo"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/python-vlc/default.nix b/nixpkgs/pkgs/development/python-modules/python-vlc/default.nix index 2690f8ea7ebe..de14a4010b65 100644 --- a/nixpkgs/pkgs/development/python-modules/python-vlc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-vlc/default.nix @@ -4,15 +4,19 @@ , setuptools , libvlc , substituteAll +, pythonOlder }: buildPythonPackage rec { pname = "python-vlc"; - version = "3.0.12118"; + version = "3.0.16120"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Vm8vfDA/aACFHKzAFt8cbu7AlK1j4KSdh9udaYCU8fs="; + hash = "sha256-kvmP7giPcr1tBjs7MxLQvSmzfnrWXd6zpzAzIDAMKAc="; }; patches = [ @@ -27,9 +31,12 @@ buildPythonPackage rec { setuptools ]; - doCheck = false; # no tests + # Module has no tests + doCheck = false; - pythonImportsCheck = [ "vlc" ]; + pythonImportsCheck = [ + "vlc" + ]; meta = with lib; { description = "Python bindings for VLC, the cross-platform multimedia player and framework"; diff --git a/nixpkgs/pkgs/development/python-modules/python-zbar/default.nix b/nixpkgs/pkgs/development/python-modules/python-zbar/default.nix new file mode 100644 index 000000000000..04e89b664c49 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/python-zbar/default.nix @@ -0,0 +1,42 @@ +{ lib , buildPythonPackage , fetchFromGitHub , pillow , zbar , pytestCheckHook }: + +buildPythonPackage rec { + pname = "python-zbar"; + version = "0.23.90"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "mchehab"; + repo = "zbar"; + rev = version; + sha256 = "sha256-FvV7TMc4JbOiRjWLka0IhtpGGqGm5fis7h870OmJw2U="; + }; + + propagatedBuildInputs = [ pillow ]; + + buildInputs = [ zbar ]; + + checkInputs = [ pytestCheckHook ]; + + preBuild = '' + cd python + ''; + + disabledTests = [ + #AssertionError: b'Y800' != 'Y800' + "test_format" + "test_new" + #Requires loading a recording device + #zbar.SystemError: <zbar.Processor object at 0x7ffff615a680> + "test_processing" + ]; + + pythonImportsCheck = [ "zbar" ]; + + meta = with lib; { + description = "Python bindings for zbar"; + homepage = "https://github.com/mchehab/zbar"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pythonfinder/default.nix b/nixpkgs/pkgs/development/python-modules/pythonfinder/default.nix index bf9cb69721c4..9500a42a916f 100644 --- a/nixpkgs/pkgs/development/python-modules/pythonfinder/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pythonfinder/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pythonfinder"; - version = "1.2.9"; + version = "1.2.10"; format = "pyproject"; src = fetchFromGitHub { owner = "sarugaku"; repo = pname; rev = version; - sha256 = "sha256-tPMqVKbYwBRvb8/GyYNxO8lwJLcUUQyRoCoF5tg6rxs="; + sha256 = "sha256-4a648wOh+ASeocevFVh/4Fkq0CEhkFbt+2mWVmb9Bhw="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pytube/default.nix b/nixpkgs/pkgs/development/python-modules/pytube/default.nix index d2c8be795f1d..d00d26f1bae2 100644 --- a/nixpkgs/pkgs/development/python-modules/pytube/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytube/default.nix @@ -7,21 +7,30 @@ buildPythonPackage rec { pname = "pytube"; - version = "11.0.2"; + version = "12.0.0"; disabled = pythonOlder "3.6"; + format = "setuptools"; + src = fetchFromGitHub { owner = "pytube"; repo = "pytube"; rev = "v${version}"; - hash = "sha256-3HrkhlwV8OLqbzC6QgddLB1fQxWbwCQ6STCgUXlr5So="; + hash = "sha256-1zoLd4J7aCR5omMpCZhlttWDu7mYyKCypH3JEB4VGXg="; }; checkInputs = [ pytestCheckHook ]; + disabledTestPaths = [ + "tests/test_extract.py" + "tests/test_query.py" + "tests/test_streams.py" + "tests/test_main.py" + ]; + pythonImportsCheck = [ "pytube" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/pyturbojpeg/default.nix b/nixpkgs/pkgs/development/python-modules/pyturbojpeg/default.nix index 6fb7d5d47283..64b3d11e95a5 100644 --- a/nixpkgs/pkgs/development/python-modules/pyturbojpeg/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyturbojpeg/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "pyturbojpeg"; - version = "1.6.5"; + version = "1.6.6"; format = "setuptools"; src = fetchPypi { pname = "PyTurboJPEG"; inherit version; - hash = "sha256-l3eeD/WGiqVQ2E92WBV8eTRPVdtUnP7wP4brE8PPTkw="; + hash = "sha256-gN0VNISogw2rTr58DuHLQ8VyOg6VE3X9T/j6fw0EdXw="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/pytwitchapi/default.nix b/nixpkgs/pkgs/development/python-modules/pytwitchapi/default.nix deleted file mode 100644 index 27289a13d5d6..000000000000 --- a/nixpkgs/pkgs/development/python-modules/pytwitchapi/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, aiohttp -, python-dateutil -, requests -, websockets -}: - -buildPythonPackage rec { - pname = "pytwitchapi"; - version = "2.5.1"; - disabled = pythonOlder "3.7"; - - src = fetchFromGitHub { - owner = "Teekeks"; - repo = "pyTwitchAPI"; - rev = "v${version}"; - sha256 = "091p9yx0cc7aclj76s1n1jdzkypicy9b2mxgmk2fym5viqlgpbkk"; - }; - - propagatedBuildInputs = [ - aiohttp - python-dateutil - requests - websockets - ]; - - # Project has no tests. - doCheck = false; - - pythonImportsCheck = [ "twitchAPI" ]; - - meta = with lib; { - description = "Python implementation of the Twitch Helix API, its Webhook and PubSub"; - homepage = "https://github.com/Teekeks/pyTwitchAPI"; - license = licenses.mit; - maintainers = with maintainers; [ wolfangaukang ]; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/pyupgrade/default.nix b/nixpkgs/pkgs/development/python-modules/pyupgrade/default.nix index 8d815ee1ce9f..09c2c1ca7a69 100644 --- a/nixpkgs/pkgs/development/python-modules/pyupgrade/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyupgrade/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyupgrade"; - version = "2.31.0"; + version = "2.31.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "asottile"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nuYWJ4nilbXa/1KOuGhc6rB7uXDE4+lcESNud4Ug+3Y="; + sha256 = "sha256-l4wF/I3wsA9nowIdLjNPUxCaTPBu5v5oPQ3oNbLh+/o="; }; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyuptimerobot/default.nix b/nixpkgs/pkgs/development/python-modules/pyuptimerobot/default.nix index 6334c3f64c08..601faccb37f7 100644 --- a/nixpkgs/pkgs/development/python-modules/pyuptimerobot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyuptimerobot/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyuptimerobot"; - version = "21.11.0"; + version = "22.2.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "1nmmwp9m38b75lz51ypcj0qxnxm9wq4id5cggl0pn2rx6gwnbw9n"; + sha256 = "sha256-QZm8FlUm17Vv80hB3iai54QcVlhSrq2AvbdBaRWDyok="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pywizlight/default.nix b/nixpkgs/pkgs/development/python-modules/pywizlight/default.nix index cff482c1f6c5..707a82054cba 100644 --- a/nixpkgs/pkgs/development/python-modules/pywizlight/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pywizlight/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pywizlight"; - version = "0.5.12"; + version = "0.5.13"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "sbidy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1clvZyuRFS9URftjz0YDDAqR3FlBLTpTQJg4LjBME/8="; + sha256 = "sha256-UePrG49Q2tJq3f2QaW4BjbWHHif6cTFGdiO/DZfpMFA="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pywlroots/default.nix b/nixpkgs/pkgs/development/python-modules/pywlroots/default.nix index 5cf52185bcaf..7dc17cf74ecd 100644 --- a/nixpkgs/pkgs/development/python-modules/pywlroots/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pywlroots/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "pywlroots"; - version = "0.15.9"; + version = "0.15.10"; src = fetchPypi { inherit pname version; - sha256 = "V6P5zAvr0L7p+yEjr6To2rKoMPqxIvSPrlLzf6yj3WA="; + sha256 = "VWfcDhMAuUkYObRiaXRfcB7dI75SM7zVwWWvnlrxV0k="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/python-modules/qimage2ndarray/default.nix b/nixpkgs/pkgs/development/python-modules/qimage2ndarray/default.nix index 0bb9ed2199a2..431b5c9bfa10 100644 --- a/nixpkgs/pkgs/development/python-modules/qimage2ndarray/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qimage2ndarray/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "qimage2ndarray"; - version = "1.8.3"; + version = "1.9.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "b02bd2dc7de774f954544312ec1020cf2d7e03fdd23ec9eb79901da55ccb3365"; + sha256 = "sha256-p5B1xtDYRDxEIu6WmlQJ5E/QJUVxYEzOqHXGyV4/Veo="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/qiskit-finance/default.nix b/nixpkgs/pkgs/development/python-modules/qiskit-finance/default.nix index 05676a60f124..1fc98361ad09 100644 --- a/nixpkgs/pkgs/development/python-modules/qiskit-finance/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qiskit-finance/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "qiskit-finance"; - version = "0.3.0"; + version = "0.3.1"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "qiskit"; repo = pname; rev = version; - sha256 = "1wpx519apnpp25yiq20warg4q8yv09x8fk0m8b9kyp199x86iffp"; + sha256 = "sha256-wnto3IqrJFAqIv6QAXe3BB9fvXQXe2fw/iUZe3+198M="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/qiskit-optimization/default.nix b/nixpkgs/pkgs/development/python-modules/qiskit-optimization/default.nix index b1ce0561dc4b..d2b87d9cfeaf 100644 --- a/nixpkgs/pkgs/development/python-modules/qiskit-optimization/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qiskit-optimization/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "qiskit-optimization"; - version = "0.3.0"; + version = "0.3.1"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "qiskit"; repo = pname; rev = version; - sha256 = "18qs0m21j73fjawq3pxz5q5c0g2wgqgicy7p4a57lialpv6vrmc0"; + sha256 = "sha256-6oqhM5sEu0id0qYrhdVyx0xXUvwxBgZSPvrlAnmtY5A="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/radios/default.nix b/nixpkgs/pkgs/development/python-modules/radios/default.nix new file mode 100644 index 000000000000..c5b4413540c4 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/radios/default.nix @@ -0,0 +1,67 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, poetry-core +, aiodns +, aiohttp +, awesomeversion +, backoff +, cachetools +, pycountry +, pydantic +, yarl +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "radios"; + version = "0.1.1"; + + disabled = pythonOlder "3.9"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "frenck"; + repo = "python-radios"; + rev = "v${version}"; + hash = "sha256-NCBch9MCWVD6ez0sIUph8rwOOzEMZtwC4atXJe53xZM="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "0.0.0" "${version}" \ + --replace "--cov" "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiodns + aiohttp + awesomeversion + backoff + cachetools + pycountry + pydantic + yarl + ]; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "radios" ]; + + meta = with lib; { + description = "Asynchronous Python client for the Radio Browser API"; + homepage = "https://github.com/frenck/python-radios"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/readability-lxml/default.nix b/nixpkgs/pkgs/development/python-modules/readability-lxml/default.nix new file mode 100644 index 000000000000..e012bf75fe58 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/readability-lxml/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, chardet +, cssselect +, lxml +}: + +buildPythonPackage rec { + pname = "readability-lxml"; + version = "0.8.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-5R/qVrWQmq+IbTB9SOeeCWKTJVr6Vnt9CLypTSWxpOE="; + }; + + propagatedBuildInputs = [ chardet cssselect lxml ]; + + postPatch = '' + substituteInPlace setup.py --replace 'sys.platform == "darwin"' "False" + ''; + + doCheck = false; + + meta = with lib; { + description = "Fast python port of arc90's readability tool"; + homepage = "https://github.com/buriy/python-readability"; + license = licenses.apsl20; + maintainers = with maintainers; [ siraben ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/readme_renderer/default.nix b/nixpkgs/pkgs/development/python-modules/readme_renderer/default.nix index 65ab0cb2682a..b7709da9dca4 100644 --- a/nixpkgs/pkgs/development/python-modules/readme_renderer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/readme_renderer/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "readme-renderer"; - version = "32.0"; + version = "33.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "readme_renderer"; inherit version; - sha256 = "sha256-tRK+r6Z5gmDH1a8+Gx8Jfli/zZpXXafE3dXgN0kKW4U="; + sha256 = "sha256-47U7yEvWrwVOTMH+NWfcGuGfVUE0IhBDo/jGdOIiCds="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/renault-api/default.nix b/nixpkgs/pkgs/development/python-modules/renault-api/default.nix index 8ebf9a2d26ab..2ddd65790fa0 100644 --- a/nixpkgs/pkgs/development/python-modules/renault-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/renault-api/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "renault-api"; - version = "0.1.8"; + version = "0.1.9"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "hacf-fr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gGr9yzcEgcte2uYhHzgmqT80JRJyRia31bK/v+42teU="; + sha256 = "sha256-CZDxJ5vgk9I1cRDXoqcrUHu+buPWYVrEcHaRXcyts7I="; }; nativeBuildInputs = [ @@ -47,7 +47,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "renault_api" ]; + pythonImportsCheck = [ + "renault_api" + ]; meta = with lib; { description = "Python library to interact with the Renault API"; diff --git a/nixpkgs/pkgs/development/python-modules/rencode/default.nix b/nixpkgs/pkgs/development/python-modules/rencode/default.nix index a742c422ee90..464bbd78515c 100644 --- a/nixpkgs/pkgs/development/python-modules/rencode/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rencode/default.nix @@ -1,17 +1,18 @@ { lib , buildPythonPackage -, fetchgit +, fetchFromGitHub , cython }: -buildPythonPackage { +buildPythonPackage rec { pname = "rencode"; - version = "git20150810"; + version = "1.0.6"; - src = fetchgit { - url = "https://github.com/aresch/rencode"; - rev = "b45e04abdca0dea36e383a8199783269f186c99e"; - sha256 = "b4bd82852d4220e8a9493d3cfaecbc57b1325708a2d48c0f8acf262edb10dc40"; + src = fetchFromGitHub { + owner = "aresch"; + repo = "rencode"; + rev = "v${version}"; + sha256 = "sha256-PGjjrZuoGYSPMNqXG1KXoZnOoWIe4g6s056jFhqrJ60="; }; buildInputs = [ cython ]; diff --git a/nixpkgs/pkgs/development/python-modules/reolink/default.nix b/nixpkgs/pkgs/development/python-modules/reolink/default.nix index 69a1b11fea4c..0b5d78358199 100644 --- a/nixpkgs/pkgs/development/python-modules/reolink/default.nix +++ b/nixpkgs/pkgs/development/python-modules/reolink/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "reolink"; - version = "0053"; + version = "0.60"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fwestenberg"; repo = pname; rev = "v${version}"; - sha256 = "0qjp7n2qa9n9fdhfcgfgw89hy19z5144cxhkhmhv1xnfdiz175qd"; + sha256 = "sha256-4yk05obra0icWHPXaJ+Wj+xxDRkVYg/VsrXTQUdHJIc="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/requests-cache/default.nix b/nixpkgs/pkgs/development/python-modules/requests-cache/default.nix index adaf824d3d92..6f11559aad4c 100644 --- a/nixpkgs/pkgs/development/python-modules/requests-cache/default.nix +++ b/nixpkgs/pkgs/development/python-modules/requests-cache/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "requests-cache"; - version = "0.9.1"; + version = "0.9.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -29,8 +29,7 @@ buildPythonPackage rec { owner = "reclosedev"; repo = "requests-cache"; rev = "v${version}"; - sha256 = "sha256-MZ3N0zbo745erF52D6DqOEb4OPpXFwSsemi0z6Do02c= -"; + hash = "sha256-9eA2fx+j6WLbEkLaemwEuoWLUWlS0iF5AkR2YienN5g="; }; nativeBuildInputs = [ @@ -56,6 +55,10 @@ buildPythonPackage rec { timeout-decorator ]; + preCheck = '' + export HOME=$(mktemp -d); + ''; + pytestFlagsArray = [ # Integration tests require local DBs "tests/unit" diff --git a/nixpkgs/pkgs/development/python-modules/rich-rst/default.nix b/nixpkgs/pkgs/development/python-modules/rich-rst/default.nix new file mode 100644 index 000000000000..4c543febb813 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/rich-rst/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, docutils +, rich +}: + +buildPythonPackage rec { + pname = "rich-rst"; + version = "1.1.7"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "wasi-master"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-s48hdJo1LIRXTf+PeSBa6y/AH1NLmnyAafFydJ+exDk="; + }; + + propagatedBuildInputs = [ docutils rich ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ "rich_rst" ]; + + meta = with lib; { + description = "A beautiful reStructuredText renderer for rich"; + homepage = "https://github.com/wasi-master/rich-rst"; + license = licenses.mit; + maintainers = with maintainers; [ jyooru ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/rki-covid-parser/default.nix b/nixpkgs/pkgs/development/python-modules/rki-covid-parser/default.nix index 83b8d9319f26..928723897b5d 100644 --- a/nixpkgs/pkgs/development/python-modules/rki-covid-parser/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rki-covid-parser/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "rki-covid-parser"; - version = "1.3.2"; + version = "1.3.3"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "thebino"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lJFeGg34L+hmH/ZhTx7FGir/9dK/rviaGveOl2HgNlM="; + sha256 = "sha256-e0MJjE4zgBPL+vt9EkgsdGrgqUyKK/1S9ZFxy56PUjc="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/rokuecp/default.nix b/nixpkgs/pkgs/development/python-modules/rokuecp/default.nix index 32c5d552ff3f..358c2ed600e2 100644 --- a/nixpkgs/pkgs/development/python-modules/rokuecp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rokuecp/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "rokuecp"; - version = "0.14.1"; + version = "0.15.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "ctalkington"; repo = "python-rokuecp"; rev = version; - hash = "sha256-K9R//xbyXaJ+AHmt42Fv40j43UkvKVyAFiXAq+P4mh8="; + hash = "sha256-yNmnCoHIBlpQCLd+YcsKCKd1wWh8WZNpILWmChZGWH4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ropgadget/default.nix b/nixpkgs/pkgs/development/python-modules/ropgadget/default.nix index aaf31f06a1cc..4d0a4aa94f11 100644 --- a/nixpkgs/pkgs/development/python-modules/ropgadget/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ropgadget/default.nix @@ -2,17 +2,21 @@ , buildPythonPackage , fetchFromGitHub , capstone +, pythonOlder }: buildPythonPackage rec { pname = "ropgadget"; - version = "6.6"; + version = "6.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "JonathanSalwan"; repo = "ROPgadget"; rev = "v${version}"; - sha256 = "1i0gx0cwhxk6d8byvck17hh83szz3k6ndd118ha3q0r0msap0lz1"; + hash = "sha256-zOTbncsOvmLQMZGpcRLviSZP/d1cQTQHXCLUKyEgVBk="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/rpyc/default.nix b/nixpkgs/pkgs/development/python-modules/rpyc/default.nix index 61a2f1e75605..a8849fd17cd3 100644 --- a/nixpkgs/pkgs/development/python-modules/rpyc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rpyc/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "rpyc"; - version = "5.0.1"; + version = "5.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "tomerfiliba"; repo = pname; rev = version; - sha256 = "1g75k4valfjgab00xri4pf8c8bb2zxkhgkpyy44fjk7s5j66daa1"; + sha256 = "sha256-Xeot4QEgTZjvdO0ydmKjccp6zwC93Yp/HkRlSgyDf8k="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/rstcheck/default.nix b/nixpkgs/pkgs/development/python-modules/rstcheck/default.nix index d109a6cce747..606b2879908e 100644 --- a/nixpkgs/pkgs/development/python-modules/rstcheck/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rstcheck/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "rstcheck"; - version = "v3.3.1"; + version = "3.3.1"; src = fetchFromGitHub { owner = "myint"; repo = pname; - rev = version; + rev = "v${version}"; sha256 = "sha256-4AhENuT+LtUMCi+aaI/rKa2gHti8sKGLdVGjdRithXI="; }; diff --git a/nixpkgs/pkgs/development/python-modules/sabyenc3/default.nix b/nixpkgs/pkgs/development/python-modules/sabyenc3/default.nix index aab3201047d6..2e44326acc40 100644 --- a/nixpkgs/pkgs/development/python-modules/sabyenc3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sabyenc3/default.nix @@ -1,22 +1,32 @@ -{ lib, fetchPypi, python3Packages }: +{ lib +, fetchPypi +, buildPythonPackage +, pythonOlder +}: -python3Packages.buildPythonPackage rec { +buildPythonPackage rec { pname = "sabyenc3"; - version = "4.0.2"; + version = "5.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "dfaa0bdd01752a9cfde0d349a8f4e178b04b1cf9c1bc018b287961192cd2bb90"; + hash = "sha256-y2I/kSyPIPSz7PrwW/AbP4BsEXHWQgXRb1VT0nTHQcE="; }; - # tests are not included in pypi distribution + # Tests are not included in pypi distribution doCheck = false; - meta = { + pythonImportsCheck = [ + "sabyenc3" + ]; + + meta = with lib; { description = "yEnc Decoding for Python 3"; homepage = "https://github.com/sabnzbd/sabyenc/"; - license = lib.licenses.lgpl3; - maintainers = [ lib.maintainers.lovek323 ]; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ lovek323 ]; }; - } diff --git a/nixpkgs/pkgs/development/python-modules/samsungtvws/default.nix b/nixpkgs/pkgs/development/python-modules/samsungtvws/default.nix index bf2e4ef620f6..b4bebb79a0fd 100644 --- a/nixpkgs/pkgs/development/python-modules/samsungtvws/default.nix +++ b/nixpkgs/pkgs/development/python-modules/samsungtvws/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "samsungtvws"; - version = "1.7.0"; + version = "2.3.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "431af8348164cbb56b62492c3fde7ab81911b7905c8009580ccc54bd3f50f7ee"; + sha256 = "sha256-2ly9lbnIHGHB55ml10jKE7dC5LdN1ToGW4GqfxTC5kI="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/sanic/default.nix b/nixpkgs/pkgs/development/python-modules/sanic/default.nix index 660ca5de80bf..63c24e9936fc 100644 --- a/nixpkgs/pkgs/development/python-modules/sanic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sanic/default.nix @@ -13,6 +13,7 @@ , pytest-sugar , pytestCheckHook , pythonOlder +, pythonAtLeast , sanic-routing , sanic-testing , ujson @@ -26,7 +27,8 @@ buildPythonPackage rec { version = "21.12.1"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.7" || + pythonAtLeast "3.10"; # see GHSA-7p79-6x2v-5h88 src = fetchFromGitHub { owner = "sanic-org"; diff --git a/nixpkgs/pkgs/development/python-modules/scikit-survival/default.nix b/nixpkgs/pkgs/development/python-modules/scikit-survival/default.nix index 69b9bf05467c..fcf165034622 100644 --- a/nixpkgs/pkgs/development/python-modules/scikit-survival/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scikit-survival/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "scikit-survival"; - version = "0.17.0"; + version = "0.17.1"; src = fetchPypi { inherit pname version; - sha256 = "ba49325f6a31e8bdccfb88337aa85218d209e88a6a704e9c41ef13bf749e0f46"; + sha256 = "sha256-Sx+reZKBbahjkVgo8hC8EP5vMsRhnprwGjKumQqH83k="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/scp/default.nix b/nixpkgs/pkgs/development/python-modules/scp/default.nix index 61baf3724e1a..a8a152b0a34c 100644 --- a/nixpkgs/pkgs/development/python-modules/scp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scp/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "scp"; - version = "0.14.3"; + version = "0.14.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-LQNJpUAIHdJGyBQeRWmfP4Y/LVOswISr0H0+OHox5cc="; + sha256 = "sha256-VGmbkstorjS1koxIqIjquXIqISUCy6iap5W9Vll1Bb0="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/sendgrid/default.nix b/nixpkgs/pkgs/development/python-modules/sendgrid/default.nix index c9b6d7c96808..aab6ab049da5 100644 --- a/nixpkgs/pkgs/development/python-modules/sendgrid/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sendgrid/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "sendgrid"; - version = "6.9.6"; + version = "6.9.7"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = pname; repo = "sendgrid-python"; rev = version; - sha256 = "sha256-6MkAtkbKVoa8UatG92RzbCdAM+WsQN2WnOIh4pRoUVk="; + sha256 = "sha256-Lx84jmgJz/J5MJtJyqDTVIbN6H63gD2rkJrdNeojd08="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix b/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix index a6fc087c9041..dbb85c911102 100644 --- a/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix @@ -40,14 +40,14 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.5.5"; + version = "1.5.6"; format = "setuptools"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-python"; rev = version; - sha256 = "sha256-hOWMrAFPwtURIngCN4vCxWrI6QZLOnakkNf+fZVyzzc="; + sha256 = "sha256-PxoxOeFdmmfpXBnGs9D5aKP6vlGKx9nPO3ngYuTa+Rs="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/shodan/default.nix b/nixpkgs/pkgs/development/python-modules/shodan/default.nix index 772b38be30f2..800bb0f2f4cf 100644 --- a/nixpkgs/pkgs/development/python-modules/shodan/default.nix +++ b/nixpkgs/pkgs/development/python-modules/shodan/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "shodan"; - version = "1.26.1"; + version = "1.27.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8oJ7QNaRiYjvn18W3LihM4OqrhooRYmPcBLqyJBru4c="; + sha256 = "sha256-XkrnBuALYxZ6n/f34PM0QvxqxvC08mKci9Mswwf41VA="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/simber/default.nix b/nixpkgs/pkgs/development/python-modules/simber/default.nix index 331f84252cee..68e9638c350a 100644 --- a/nixpkgs/pkgs/development/python-modules/simber/default.nix +++ b/nixpkgs/pkgs/development/python-modules/simber/default.nix @@ -1,20 +1,36 @@ -{ lib, buildPythonPackage, fetchFromGitHub, colorama, pytestCheckHook }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, colorama +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "simber"; - version = "0.2.3"; + version = "0.2.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "deepjyoti30"; repo = pname; rev = version; - sha256 = "04dp9b4s7zb166vlacsaypc6iw1p75azqas1wf0flp570qqf3rkx"; + hash = "sha256-P4bhxu9Di4E2Zkd0vIkyDi1S6Y0V/EQSMF4ftWoiXKE="; }; - propagatedBuildInputs = [ colorama ]; + propagatedBuildInputs = [ + colorama + ]; + + checkInputs = [ + pytestCheckHook + ]; - checkInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "simber" ]; + pythonImportsCheck = [ + "simber" + ]; meta = with lib; { description = "Simple, minimal and powerful logger for Python"; diff --git a/nixpkgs/pkgs/development/python-modules/simple-di/default.nix b/nixpkgs/pkgs/development/python-modules/simple-di/default.nix index 612d913b7b6f..c79b58f8a629 100644 --- a/nixpkgs/pkgs/development/python-modules/simple-di/default.nix +++ b/nixpkgs/pkgs/development/python-modules/simple-di/default.nix @@ -8,13 +8,16 @@ }: buildPythonPackage rec { - pname = "simple_di"; - version = "0.1.4"; + pname = "simple-di"; + version = "0.1.5"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { - inherit pname version; - sha256 = "2667f2b9095e86c7726b3853c30b37f527f7d247282c7dd0b3428a7fb5d1a8a9"; + pname = "simple_di"; + inherit version; + hash = "sha256-GSuZne5M1PsRpdhhFlyq0C2PBhfA+Ab8Wwn5BfGgPKA="; }; propagatedBuildInputs = [ @@ -31,10 +34,10 @@ buildPythonPackage rec { # pypi distribution contains no tests doCheck = false; - meta = { + meta = with lib; { description = "Simple dependency injection library"; homepage = "https://github.com/bentoml/simple_di"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ sauyon ]; + license = licenses.asl20; + maintainers = with maintainers; [ sauyon ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/single-version/0001-set-poetry-core.patch b/nixpkgs/pkgs/development/python-modules/single-version/0001-set-poetry-core.patch new file mode 100644 index 000000000000..4c6f869c0c27 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/single-version/0001-set-poetry-core.patch @@ -0,0 +1,21 @@ +From d949b37151cd538d4c6a15e1ba6c1343f8bff76d Mon Sep 17 00:00:00 2001 +From: "P. R. d. O" <d.ol.rod@protonmail.com> +Date: Mon, 6 Dec 2021 15:26:19 -0600 +Subject: [PATCH] set poetry-core + +--- + pyproject.toml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pyproject.toml b/pyproject.toml +index d3fdc52..bd7ddc2 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -27,4 +27,4 @@ black = "^19.10b0" + + [build-system] + requires = ["poetry>=0.12"] +-build-backend = "poetry.masonry.api" ++build-backend = "poetry.core.masonry.api" +-- +2.33.1 diff --git a/nixpkgs/pkgs/development/python-modules/single-version/default.nix b/nixpkgs/pkgs/development/python-modules/single-version/default.nix new file mode 100644 index 000000000000..39cd92f5f67e --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/single-version/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchFromGitHub, poetry-core, pytestCheckHook }: + +buildPythonPackage rec { + pname = "single-version"; + version = "1.5.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "hongquan"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-I8ATQzPRH9FVjqPoqrNjYMBU5azpmkLjRmHcz943C10="; + }; + + patches = [ + ./0001-set-poetry-core.patch + ]; + + nativeBuildInputs = [ poetry-core ]; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "single_version" ]; + + meta = with lib; { + description = "Utility to let you have a single source of version in your code base"; + homepage = "https://github.com/hongquan/single-version"; + license = licenses.mit; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix b/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix index 7b94067aeee9..09682a2a3d0e 100644 --- a/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.15.1"; + version = "3.15.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "v${version}"; - sha256 = "sha256-N8JvNK1ddlCabzCmEv9TItqXDT7A4Dt8dhMLBICWXHA="; + sha256 = "sha256-lhdh4Eo7yIsukXoKI6Ss793fYmAu91O1UElmxV9xAc4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/slixmpp/default.nix b/nixpkgs/pkgs/development/python-modules/slixmpp/default.nix index f28708bdf03b..4a4386ff5bc0 100644 --- a/nixpkgs/pkgs/development/python-modules/slixmpp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/slixmpp/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "slixmpp"; - version = "1.7.1"; + version = "1.8.0.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-mvg23FdHJZeIZRcm8GLWmm9DDTBt29jmsUHB/smVSec="; + sha256 = "sha256-J3znZl77jST94KhUBQcCxSK0qnsVWIYTG6u3po5FHh8="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/slowapi/default.nix b/nixpkgs/pkgs/development/python-modules/slowapi/default.nix index 9ae293e455c7..430c17dfb61e 100644 --- a/nixpkgs/pkgs/development/python-modules/slowapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/slowapi/default.nix @@ -7,6 +7,7 @@ , hiro , poetry-core , pytestCheckHook +, pythonAtLeast , pythonOlder , redis , starlette @@ -16,6 +17,7 @@ buildPythonPackage rec { pname = "slowapi"; version = "0.1.5"; format = "pyproject"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { @@ -42,13 +44,23 @@ buildPythonPackage rec { starlette ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'limits = "^1.5"' 'limits = "*"' \ + --replace 'redis = "^3.4.1"' 'redis = "*"' + ''; + disabledTests = [ - # E AssertionError: Regex pattern 'parameter `request` must be an instance of starlette.requests.Request' does not match 'This portal is not running'. + # AssertionError: Regex pattern 'parameter `request` must be an instance of starlette.requests.Request' does not match 'This portal is not running'. "test_endpoint_request_param_invalid" "test_endpoint_response_param_invalid" + ] ++ lib.optionals (pythonAtLeast "3.10") [ + "test_multiple_decorators" ]; - pythonImportsCheck = [ "slowapi" ]; + pythonImportsCheck = [ + "slowapi" + ]; meta = with lib; { description = "Python library for API rate limiting"; diff --git a/nixpkgs/pkgs/development/python-modules/snitun/default.nix b/nixpkgs/pkgs/development/python-modules/snitun/default.nix index 293b8069b58f..d1645e1fbe74 100644 --- a/nixpkgs/pkgs/development/python-modules/snitun/default.nix +++ b/nixpkgs/pkgs/development/python-modules/snitun/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "snitun"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "NabuCasa"; repo = pname; rev = version; - sha256 = "sha256-IjdgxX6ed9IWMFaMXIXQWZWoODrZBzXtMAcMOIhPFVQ="; + sha256 = "sha256-Ehafb35H462Ffn6omGh/MDJKQX5qJJZeiIBO3n0IGlA="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/soco/default.nix b/nixpkgs/pkgs/development/python-modules/soco/default.nix index 0922f8c10d2b..e79a38d8cf5b 100644 --- a/nixpkgs/pkgs/development/python-modules/soco/default.nix +++ b/nixpkgs/pkgs/development/python-modules/soco/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "soco"; - version = "0.26.3"; + version = "0.26.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "SoCo"; repo = "SoCo"; rev = "v${version}"; - hash = "sha256-tMW5SCsO1XMQdbasMw3qIMwj+Y6wTQHAmTZ+9r8Mffs="; + hash = "sha256-DoONq6Iqi8t47jtqggKYMHSNJAf/Kha3tszR6mYeB9Y="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/somajo/default.nix b/nixpkgs/pkgs/development/python-modules/somajo/default.nix index e332d0defd73..a03052c7e429 100644 --- a/nixpkgs/pkgs/development/python-modules/somajo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/somajo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "somajo"; - version = "2.2.0"; + version = "2.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "tsproisl"; repo = "SoMaJo"; rev = "v${version}"; - sha256 = "0ywdh1pfk0pgm64p97i9cwz0h9wggbp4shxp5l7kkqs2n2v5c6qg"; + sha256 = "sha256-M0WtONhsqmmK0PBB+Df4YrFpT+vfVidDkt80eBHOo04="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/sopel/default.nix b/nixpkgs/pkgs/development/python-modules/sopel/default.nix index bc39bb998e8e..bbc3f8edbf2d 100644 --- a/nixpkgs/pkgs/development/python-modules/sopel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sopel/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "sopel"; - version = "7.1.7"; + version = "7.1.8"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "4eb12e9753162e4c19a1bfdd42aea9eb7f5f15e316a6609b925350792fb454fd"; + sha256 = "sha256-zxb95GVcDrd3FG/k+0PLg+dVlMgQpf1ntG8jF/zpHH4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/soundfile/default.nix b/nixpkgs/pkgs/development/python-modules/soundfile/default.nix index 9a1d614062b7..c1b68e61088e 100644 --- a/nixpkgs/pkgs/development/python-modules/soundfile/default.nix +++ b/nixpkgs/pkgs/development/python-modules/soundfile/default.nix @@ -1,7 +1,8 @@ { lib , buildPythonPackage , fetchPypi -, pytest +, fetchpatch +, pytestCheckHook , numpy , libsndfile , cffi @@ -12,6 +13,8 @@ buildPythonPackage rec { pname = "soundfile"; version = "0.10.3.post1"; + # https://github.com/bastibe/python-soundfile/issues/157 + disabled = isPyPy || stdenv.isi686; src = fetchPypi { pname = "SoundFile"; @@ -19,22 +22,30 @@ buildPythonPackage rec { sha256 = "0yqhrfz7xkvqrwdxdx2ydy4h467sk7z3gf984y1x2cq7cm1gy329"; }; - checkInputs = [ pytest ]; - propagatedBuildInputs = [ numpy libsndfile cffi ]; - propagatedNativeBuildInputs = [ cffi ]; + patches = [ + # Fix build on macOS arm64, https://github.com/bastibe/python-soundfile/pull/332 + (fetchpatch { + url = "https://github.com/bastibe/python-soundfile/commit/e554e9ce8bed96207d587e6aa661e4b08f1c6a79.patch"; + sha256 = "sha256-vu/7s5q4I3yBnoNHmmFmcXvOLFcPwY9ri9ri6cKLDwU="; + }) + ]; - meta = { - description = "An audio library based on libsndfile, CFFI and NumPy"; - license = lib.licenses.bsd3; - homepage = "https://github.com/bastibe/PySoundFile"; - maintainers = with lib.maintainers; [ fridh ]; - }; + postPatch = '' + substituteInPlace soundfile.py --replace "_find_library('sndfile')" "'${libsndfile.out}/lib/libsndfile${stdenv.hostPlatform.extensions.sharedLibrary}'" + ''; - postPatch = '' - substituteInPlace soundfile.py --replace "_find_library('sndfile')" "'${libsndfile.out}/lib/libsndfile${stdenv.hostPlatform.extensions.sharedLibrary}'" - ''; + checkInputs = [ pytestCheckHook ]; + propagatedBuildInputs = [ numpy libsndfile cffi ]; + propagatedNativeBuildInputs = [ cffi ]; - # https://github.com/bastibe/PySoundFile/issues/157 - disabled = isPyPy || stdenv.isi686; + # Test fails on aarch64-darwin with `MemoryError`, 53 failed, 31 errors, see + # https://github.com/bastibe/python-soundfile/issues/331 + doCheck = stdenv.system != "aarch64-darwin"; + meta = { + description = "An audio library based on libsndfile, CFFI and NumPy"; + license = lib.licenses.bsd3; + homepage = "https://github.com/bastibe/python-soundfile"; + maintainers = with lib.maintainers; [ fridh ]; + }; } diff --git a/nixpkgs/pkgs/development/python-modules/spacy/default.nix b/nixpkgs/pkgs/development/python-modules/spacy/default.nix index e8b46e99cc1d..5e3bc6aac8b7 100644 --- a/nixpkgs/pkgs/development/python-modules/spacy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/spacy/default.nix @@ -31,13 +31,13 @@ buildPythonPackage rec { pname = "spacy"; - version = "3.2.2"; + version = "3.2.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-s9mjYeHjwcGtD38kTyaH+s5CD+LWQtkpic01eUSn1w8="; + sha256 = "sha256-JdAz/Ae4+/yb3Te3cLilhtxBTb1gMShEmvMldqOJFnM="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/spacy/legacy.nix b/nixpkgs/pkgs/development/python-modules/spacy/legacy.nix index b09983aeae3d..3ee2feeaa96a 100644 --- a/nixpkgs/pkgs/development/python-modules/spacy/legacy.nix +++ b/nixpkgs/pkgs/development/python-modules/spacy/legacy.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "spacy-legacy"; - version = "3.0.8"; + version = "3.0.9"; src = fetchPypi { inherit pname version; - sha256 = "b4725c5c161f0685ab4fce3fc912bc68aefdb7e102ba9848e852bb5842256c2f"; + sha256 = "sha256-T33LxObI6MtOrbsAn5wKGipnRC4AMsjWd2yUcMN1mQM="; }; # checkInputs = [ pytestCheckHook spacy ]; diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix index b82d1afe4764..df05cd27364b 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-plantuml"; - version = "0.22"; + version = "0.23"; src = fetchPypi { inherit pname version; - sha256 = "a42c7a13ab1ae9ed18e8e8b0f76b8d35dc476fdebe6e634354fe6fd0f261f686"; + sha256 = "sha256-HVVRjwqG7NbJa6j/jIhK3KBbrD5Y52ppKjzRmqf0Ks8="; }; # No tests included. diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix index dcb96f317d4e..95926b569a0a 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-tikz"; - version = "0.4.15"; + version = "0.4.16"; src = fetchPypi { inherit pname version; - sha256 = "27f9a7a6a64f1bf3ea4dd0e963b7da7c7778948856c8d557a71d64ace086519f"; + sha256 = "sha256-8f9FNx6WMopcqihUzNlQoPBGYoW2YkFi6W1iaFLD4qU="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/sphinxext-opengraph/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxext-opengraph/default.nix index 8b8cb4cdbb53..8b68eea25668 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinxext-opengraph/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinxext-opengraph/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "sphinxext-opengraph"; - version = "0.5.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "wpilibsuite"; repo = "sphinxext-opengraph"; rev = "v${version}"; - sha256 = "sha256-US0UXxcTlN7x5v2ilpL+umTr7tadqthqhvfaQnm7tCc="; + sha256 = "sha256-3bZFFtGW6j/3m/3F4+tapZujzpMZnrIcYTngDCNGylI="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/spyder/default.nix b/nixpkgs/pkgs/development/python-modules/spyder/default.nix index 419ac6bbb39c..cfeaf08fb33f 100644 --- a/nixpkgs/pkgs/development/python-modules/spyder/default.nix +++ b/nixpkgs/pkgs/development/python-modules/spyder/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { comment = "Scientific Python Development Environment"; desktopName = "Spyder"; genericName = "Python IDE"; - categories = "Development;IDE;"; + categories = [ "Development" "IDE" ]; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix b/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix index 439f15549125..5d96f8e1505c 100644 --- a/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "sqlite-utils"; - version = "3.24"; + version = "3.25.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-0bkvh1L+HqyH5/GKaw4J+OPJ/yR882JgWI4vBH6v0lM="; + sha256 = "sha256-32lfUJoTbkflztLU/BDhbHbuOkW66OGpHLuiyAKFy8k="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix b/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix index 18dac082f06a..a435b363a0f7 100644 --- a/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.6.2"; + version = "1.6.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-X8FpGnrF0aHuf3yIzRrxoNAu77UASTL36CQpcuxESV8="; + sha256 = "sha256-W/UdJPLcFOEHHz7VYeQ3CcXysNju5DuxqvYA+xMkb20="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/stripe/default.nix b/nixpkgs/pkgs/development/python-modules/stripe/default.nix index 5b1ff139ff9c..e98112628381 100644 --- a/nixpkgs/pkgs/development/python-modules/stripe/default.nix +++ b/nixpkgs/pkgs/development/python-modules/stripe/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "stripe"; - version = "2.66.0"; + version = "2.67.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-d8YDIjD3cUsaG0WQdPCMYNYMIpucO+rDcnGQY+PRQJw="; + hash = "sha256-cYuT1qGBBSQ7zgybSOUY9y8fCD0n8H4HuL2zpUH+ODU="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/striprtf/default.nix b/nixpkgs/pkgs/development/python-modules/striprtf/default.nix index 0e884a09b440..52fe3769e224 100644 --- a/nixpkgs/pkgs/development/python-modules/striprtf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/striprtf/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "striprtf"; - version = "0.0.19"; + version = "0.0.20"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "b7f15e11306e466dbe91665409233a06d9fdb4ee156489a3d879579891b04c25"; + sha256 = "sha256-8eMeMrazl1o9XcIyWICDg6ycRMtFMfgTUNz51w9hAmc="; }; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/stups-pierone/default.nix b/nixpkgs/pkgs/development/python-modules/stups-pierone/default.nix index 4757cd323186..f627f0e7231e 100644 --- a/nixpkgs/pkgs/development/python-modules/stups-pierone/default.nix +++ b/nixpkgs/pkgs/development/python-modules/stups-pierone/default.nix @@ -7,19 +7,21 @@ , pytest , pytest-cov , hypothesis -, isPy3k +, pythonOlder }: buildPythonPackage rec { pname = "stups-pierone"; - version = "1.1.49"; - disabled = !isPy3k; + version = "1.1.50"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "zalando-stups"; repo = "pierone-cli"; rev = version; - sha256 = "1kb1lpnxbcq821mx75vzapndvxfvsdrplyhsqjq4vdhyqrx2dn3q"; + hash = "sha256-YAoj+Ou0Q64QRN5R0CQSxQGP7xDQQNISS6VT5txV0sw="; }; propagatedBuildInputs = [ @@ -28,9 +30,9 @@ buildPythonPackage rec { stups-zign ]; - preCheck = " + preCheck = '' export HOME=$TEMPDIR - "; + ''; checkInputs = [ pytest @@ -38,10 +40,14 @@ buildPythonPackage rec { hypothesis ]; + pythonImportsCheck = [ + "pierone" + ]; + meta = with lib; { description = "Convenient command line client for STUPS' Pier One Docker registry"; homepage = "https://github.com/zalando-stups/pierone-cli"; license = licenses.asl20; - maintainers = [ maintainers.mschuwalow ]; + maintainers = with maintainers; [ mschuwalow ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/subarulink/default.nix b/nixpkgs/pkgs/development/python-modules/subarulink/default.nix index 24678319b04a..ab514735ec26 100644 --- a/nixpkgs/pkgs/development/python-modules/subarulink/default.nix +++ b/nixpkgs/pkgs/development/python-modules/subarulink/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "subarulink"; - version = "0.4.2"; + version = "0.4.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "G-Two"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EI7m2SFa1eAtncMA0g1OmXumzub4UvE6ssGfUGtLO2Q="; + sha256 = "sha256-q+a+OFFMAGl8KQi+KZ8h21+Pj0XEqP9ZIJii2PCgD6E="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/sybil/default.nix b/nixpkgs/pkgs/development/python-modules/sybil/default.nix index 55cea70924e6..41baf697fff3 100644 --- a/nixpkgs/pkgs/development/python-modules/sybil/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sybil/default.nix @@ -7,14 +7,14 @@ buildPythonApplication rec { pname = "sybil"; - version = "3.0.0"; + version = "3.0.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-dpLtZueT5eea5qcM8s+GGRftSOr/DYrfgl5k2Fgg8lE="; + hash = "sha256-bwLcIgSvflohIDeSTZdPcngfbcGP08RMx85GOhIPUw0="; }; checkInputs = [ @@ -22,7 +22,7 @@ buildPythonApplication rec { ]; disabledTests = [ - # sensitive to output of other commands + # Sensitive to output of other commands "test_namespace" "test_unittest" ]; diff --git a/nixpkgs/pkgs/development/python-modules/symengine/default.nix b/nixpkgs/pkgs/development/python-modules/symengine/default.nix index c2c223586616..db0f01ae51f0 100644 --- a/nixpkgs/pkgs/development/python-modules/symengine/default.nix +++ b/nixpkgs/pkgs/development/python-modules/symengine/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "symengine"; - version = "0.9.0"; + version = "0.9.2"; src = fetchFromGitHub { owner = "symengine"; repo = "symengine.py"; rev = "v${version}"; - sha256 = "sha256-kz4M4ghR9Mi8Ig5K+pZC4zHt8XxoP3vU4ATImejqbgg="; + sha256 = "sha256-ZHplYEG97foy/unOdSokFFkDl4LK5TI4kypHSLpcCM4="; }; postConfigure = '' diff --git a/nixpkgs/pkgs/development/python-modules/tappy/default.nix b/nixpkgs/pkgs/development/python-modules/tappy/default.nix index abbf70df62fb..4652ea99f6d8 100644 --- a/nixpkgs/pkgs/development/python-modules/tappy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tappy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "tap.py"; version = "3.1"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; diff --git a/nixpkgs/pkgs/development/python-modules/tatsu/default.nix b/nixpkgs/pkgs/development/python-modules/tatsu/default.nix index 18ab606afdd7..b2a719a020b8 100644 --- a/nixpkgs/pkgs/development/python-modules/tatsu/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tatsu/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "tatsu"; - version = "5.7.3"; + version = "5.8.0"; # upstream only supports 3.10+ disabled = pythonOlder "3.10"; @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "neogeny"; repo = "TatSu"; rev = "v${version}"; - sha256 = "1d6rnlybj971b5j5glvq288hd4r204nkmssqb0k8rm6cqcwhz292"; + sha256 = "sha256-spTIHiyspjrIV8DKR7YNpNTNO9SlcLOROuABhmu3ckA="; }; nativeBuildInputs = [ pytest-runner ]; diff --git a/nixpkgs/pkgs/development/python-modules/teamcity-messages/default.nix b/nixpkgs/pkgs/development/python-modules/teamcity-messages/default.nix index e378227b2f56..4f2b7f76de89 100644 --- a/nixpkgs/pkgs/development/python-modules/teamcity-messages/default.nix +++ b/nixpkgs/pkgs/development/python-modules/teamcity-messages/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "teamcity-messages"; - version = "1.30"; + version = "1.31"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "JetBrains"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5C9ElCmTH+xSrFQ/x9IRJ89RfSd9cxzkETlOCzwyU8s="; + sha256 = "sha256-oYXP9HWdgmEq48rYyuX6zHf+cp835C0BtHUAME+5S+k="; }; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix b/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix index 47acd1f53c75..517faef3f8fc 100644 --- a/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix @@ -72,7 +72,7 @@ let tfFeature = x: if x then "1" else "0"; - version = "2.7.0"; + version = "2.7.1"; variant = if cudaSupport then "-gpu" else ""; pname = "tensorflow${variant}"; @@ -185,7 +185,7 @@ let owner = "tensorflow"; repo = "tensorflow"; rev = "v${version}"; - sha256 = "sha256-n7jRDPeXsyq4pEWSWmOCas4c8VsArIKlCuwvSU/Ro/c="; + sha256 = "1qwzbqq899swrwrwmm6z7mq9sc55gyh0r4ca0mcnchbvn7w0qbkh"; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix b/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix index 93fc92bd6320..91f91a3d7b17 100644 --- a/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix +++ b/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "testfixtures"; - version = "6.18.3"; + version = "6.18.5"; format = "setuptools"; # DO NOT CONTACT upstream. # https://github.com/simplistix/ is only concerned with internal CI process. @@ -25,12 +25,9 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-JgAQCulv/QgjNLN441VVD++LSlKab6TDT0cTCQXHQm0="; + hash = "sha256-Atrog/Vn9bcP0608nu+5WRLniskL5sdES14vRr9XLIQ="; }; - # no longer compatible with sybil - # https://github.com/simplistix/testfixtures/issues/169 - doCheck = false; checkInputs = [ mock pytestCheckHook @@ -44,19 +41,6 @@ buildPythonPackage rec { "testfixtures/tests/test_django" ]; - disabledTests = lib.optionals (pythonAtLeast "3.10") [ - # https://github.com/simplistix/testfixtures/issues/168 - "test_invalid_communicate_call" - "test_invalid_kill" - "test_invalid_parameters" - "test_invalid_poll" - "test_invalid_send_signal" - "test_invalid_terminate" - "test_invalid_wait_call" - "test_replace_delattr_cant_remove" - "test_replace_delattr_cant_remove_not_strict" - ]; - pytestFlagsArray = [ "testfixtures/tests" ]; diff --git a/nixpkgs/pkgs/development/python-modules/textual/default.nix b/nixpkgs/pkgs/development/python-modules/textual/default.nix new file mode 100644 index 000000000000..e14c64730a23 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/textual/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, poetry-core +, rich +, typing-extensions +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "textual"; + version = "0.1.15"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "Textualize"; + repo = pname; + rev = "v${version}"; + sha256 = "1jmjais0yq8dwi9yikgrxdw4rwp8aq1981nhfxn0v97jb07i4cj6"; + }; + + patches = [ + (fetchpatch { + # v0.1.15 git tag has 0.1.14 in pyproject.toml + name = "version.patch"; + url = "https://github.com/Textualize/textual/commit/1b8d7d184e10889002425641222702afba508aea.patch"; + sha256 = "1nfqp5f8ba3fg0ar3lghrlqypbjbsaywxaz3iiff8fy8j2wgsppp"; + }) + ]; + + nativeBuildInputs = [ poetry-core ]; + + propagatedBuildInputs = [ + rich + typing-extensions + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "textual" ]; + + meta = with lib; { + description = "TUI framework for Python inspired by modern web development"; + homepage = "https://github.com/Textualize/textual"; + license = licenses.mit; + maintainers = with maintainers; [ jyooru ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/theano-pymc/default.nix b/nixpkgs/pkgs/development/python-modules/theano-pymc/default.nix new file mode 100644 index 000000000000..ad0b93fe0940 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/theano-pymc/default.nix @@ -0,0 +1,48 @@ +{ lib +, fetchPypi +, buildPythonPackage +, pythonOlder +, pandas +, numpy +, scipy +, filelock +, pytest +, nose +, parameterized +}: + +buildPythonPackage rec { + pname = "theano-pymc"; + version = "1.1.2"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + pname = "Theano-PyMC"; + inherit version; + sha256 = "5da6c2242ea72a991c8446d7fe7d35189ea346ef7d024c890397011114bf10fc"; + }; + + # No need for coverage stats in Nix builds + postPatch = '' + substituteInPlace setup.py --replace ", 'pytest-cov'" "" + ''; + + propagatedBuildInputs = [ + pandas + numpy + scipy + filelock + ]; + + # The test suite is computationally intensive and test failures are not + # indicative for package usability hence tests are disabled by default. + doCheck = false; + pythonImportsCheck = [ "theano" ]; + + meta = { + description = "PyMC theano fork"; + homepage = "https://github.com/majidaldo/Theano-PyMC"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ nidabdella ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/tifffile/default.nix b/nixpkgs/pkgs/development/python-modules/tifffile/default.nix index fdd4c2bf0b2f..01294ff5007f 100644 --- a/nixpkgs/pkgs/development/python-modules/tifffile/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tifffile/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "tifffile"; - version = "2021.11.2"; + version = "2022.2.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-FT4x+h2JL0gvq7KunyVh+kKe5C0BpvZ+WM7hNjfZKFs="; + hash = "sha256-ftp0EXZDaBuyyqaVtI854iQ7SIf3z5kdWt/9gT5cg3M="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/tifffile/python2-regex-compat.patch b/nixpkgs/pkgs/development/python-modules/tifffile/python2-regex-compat.patch deleted file mode 100644 index 7f4ec5764bb2..000000000000 --- a/nixpkgs/pkgs/development/python-modules/tifffile/python2-regex-compat.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/setup.py 2019-02-20 18:52:12.000000000 +0100 -+++ b/setup.py 2019-03-02 13:55:39.014019260 +0100 -@@ -20,12 +20,6 @@ - - description = re.search(r'"""(.*)\.(?:\r\n|\r|\n)', code).groups()[0] - --readme = re.search(r'(?:\r\n|\r|\n){2}"""(.*)"""(?:\r\n|\r|\n){2}from', code, -- re.MULTILINE | re.DOTALL).groups()[0] -- --readme = '\n'.join([description, '=' * len(description)] -- + readme.splitlines()[1:]) -- - license = re.search(r'(# Copyright.*?(?:\r\n|\r|\n))(?:\r\n|\r|\n)+""', code, - re.MULTILINE | re.DOTALL).groups()[0] - -@@ -41,7 +35,6 @@ - name='tifffile', - version=version, - description=description, -- long_description=readme, - author='Christoph Gohlke', - author_email='cgohlke@uci.edu', - url='https://www.lfd.uci.edu/~gohlke/', diff --git a/nixpkgs/pkgs/development/python-modules/tikzplotlib/default.nix b/nixpkgs/pkgs/development/python-modules/tikzplotlib/default.nix new file mode 100644 index 000000000000..ebf58dd12e9c --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/tikzplotlib/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, matplotlib +, numpy +, pillow +, webcolors +, flit-core +, pytestCheckHook +, pandas +}: + +buildPythonPackage rec { + pname = "tikzplotlib"; + version = "0.10.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "nschloe"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-PLExHhEnxkEiXsE0rqvpNWwVZ+YoaDa2BTx8LktdHl0="; + }; + + propagatedBuildInputs = [ + matplotlib + numpy + pillow + webcolors + flit-core + ]; + + checkInputs = [ + pytestCheckHook + pandas + ]; + + meta = with lib; { + description = "Save matplotlib figures as TikZ/PGFplots for smooth integration into LaTeX"; + homepage = "https://github.com/nschloe/tikzplotlib"; + license = licenses.mit; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/timetagger/default.nix b/nixpkgs/pkgs/development/python-modules/timetagger/default.nix index 29f2ffbc49b9..1da2887a12f1 100644 --- a/nixpkgs/pkgs/development/python-modules/timetagger/default.nix +++ b/nixpkgs/pkgs/development/python-modules/timetagger/default.nix @@ -9,13 +9,13 @@ python3Packages.buildPythonPackage rec { pname = "timetagger"; - version = "22.2.2"; + version = "22.2.3"; src = fetchFromGitHub { owner = "almarklein"; repo = pname; rev = "v${version}"; - sha256 = "sha256-U2OvvS61t4RnWAA/mv84TWRj+/8SRRXrBR+fX3bakqw="; + sha256 = "sha256-tQel+IVqP+MngAvFgr7Yh+XCSIPWpzCBXHOj9b0Os98="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/nixpkgs/pkgs/development/python-modules/tldextract/default.nix b/nixpkgs/pkgs/development/python-modules/tldextract/default.nix index d39b4fa82c81..f2f15c8bb7fa 100644 --- a/nixpkgs/pkgs/development/python-modules/tldextract/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tldextract/default.nix @@ -14,15 +14,19 @@ buildPythonPackage rec { pname = "tldextract"; - version = "3.1.2"; + version = "3.2.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-0gNMNVhlH32P2t6oP7aBBQstZi3GegDZUDJtyQIClEQ="; + sha256 = "sha256-PUtqIQVgC30CkOoje/MLaw3HY+UPy+QOhJoBm9bby/8="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools-scm + ]; propagatedBuildInputs = [ filelock @@ -38,10 +42,13 @@ buildPythonPackage rec { ]; postPatch = '' - substituteInPlace pytest.ini --replace " --pylint" "" + substituteInPlace pytest.ini \ + --replace " --pylint" "" ''; - pythonImportsCheck = [ "tldextract" ]; + pythonImportsCheck = [ + "tldextract" + ]; meta = with lib; { description = "Python module to accurately separate the TLD from the domain of an URL"; diff --git a/nixpkgs/pkgs/development/python-modules/torch-tb-profiler/default.nix b/nixpkgs/pkgs/development/python-modules/torch-tb-profiler/default.nix new file mode 100644 index 000000000000..fc53c5ba8232 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/torch-tb-profiler/default.nix @@ -0,0 +1,48 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, pandas +, pytestCheckHook +, pytorch +, tensorflow-tensorboard +, torchvision +}: + +let + version = "0.3.1"; + repo = fetchFromGitHub { + owner = "pytorch"; + repo = "kineto"; + rev = "v${version}"; + hash = "sha256-Yg001XzOPDmz9wEP2b7Ggz/uU6x5PFzaaBeUBwWKFS0="; + }; +in +buildPythonPackage rec { + pname = "torch_tb_profiler"; + inherit version; + format = "setuptools"; + + # See https://discourse.nixos.org/t/extracting-sub-directory-from-fetchgit-or-fetchurl-or-any-derivation/8830. + src = "${repo}/tb_plugin"; + + propagatedBuildInputs = [ pandas tensorflow-tensorboard ]; + + checkInputs = [ pytestCheckHook pytorch torchvision ]; + + disabledTests = [ + # Tests that attempt to access the filesystem in naughty ways. + "test_profiler_api_without_gpu" + "test_tensorboard_end2end" + "test_tensorboard_with_path_prefix" + "test_tensorboard_with_symlinks" + ]; + + pythonImportsCheck = [ "torch_tb_profiler" ]; + + meta = with lib; { + description = "PyTorch Profiler TensorBoard Plugin"; + homepage = "https://github.com/pytorch/kineto"; + license = licenses.bsd3; + maintainers = with maintainers; [ samuela ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/traitsui/default.nix b/nixpkgs/pkgs/development/python-modules/traitsui/default.nix index 774a42fc13a3..d09a855bd32a 100644 --- a/nixpkgs/pkgs/development/python-modules/traitsui/default.nix +++ b/nixpkgs/pkgs/development/python-modules/traitsui/default.nix @@ -1,24 +1,39 @@ -{ lib, fetchPypi, buildPythonPackage -, traits, pyface, six +{ lib +, fetchPypi +, buildPythonPackage +, traits +, pyface +, pythonOlder }: buildPythonPackage rec { pname = "traitsui"; - version = "7.2.1"; + version = "7.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "dfc39015faf0591f9927e3d4d22bd95a16d49c85db30e60acd4ba7b85c7c5d5b"; + hash = "sha256-ZkSz+PYColdgcC3IchuneM51lFBAk68UpIadI56GdPQ="; }; - propagatedBuildInputs = [ traits pyface six ]; + propagatedBuildInputs = [ + traits + pyface + ]; + + # Needs X server + doCheck = false; - doCheck = false; # Needs X server + pythonImportsCheck = [ + "traitsui" + ]; meta = with lib; { description = "Traits-capable windowing framework"; homepage = "https://github.com/enthought/traitsui"; - maintainers = with maintainers; [ knedlsepp ]; license = licenses.bsdOriginal; + maintainers = with maintainers; [ knedlsepp ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/transitions/default.nix b/nixpkgs/pkgs/development/python-modules/transitions/default.nix index 76a82e7c6213..e50dec28ef50 100644 --- a/nixpkgs/pkgs/development/python-modules/transitions/default.nix +++ b/nixpkgs/pkgs/development/python-modules/transitions/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "transitions"; - version = "0.8.10"; + version = "0.8.11"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "b0385975a842e885c1a55c719d2f90164471665794d39d51f9eb3f11e1d9c8ac"; + sha256 = "sha256-eyDTKQbqTWDub2wfXcnJ8XiAJCXFsVUhPrDyXCd/BOQ="; }; propagatedBuildInputs = [ @@ -38,12 +38,6 @@ buildPythonPackage rec { export HOME=$TMPDIR ''; - disabledTests = lib.optionals (pythonAtLeast "3.10") [ - # https://github.com/pytransitions/transitions/issues/563 - "test_multiple_models" - "test_timeout" - ]; - pythonImportsCheck = [ "transitions" ]; diff --git a/nixpkgs/pkgs/development/python-modules/trimesh/default.nix b/nixpkgs/pkgs/development/python-modules/trimesh/default.nix index d4da6ee6928a..de28f70bca00 100644 --- a/nixpkgs/pkgs/development/python-modules/trimesh/default.nix +++ b/nixpkgs/pkgs/development/python-modules/trimesh/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.10.0"; + version = "3.10.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-mPsV25oD8FlPSDOGHOX+nLCN/I6RS83l3efUCgavmHY="; + sha256 = "sha256-PcR84la6ZJjtpjg4WGVUkyZJqVT8Ge7vjk90X6gStAo="; }; propagatedBuildInputs = [ numpy ]; diff --git a/nixpkgs/pkgs/development/python-modules/ttls/default.nix b/nixpkgs/pkgs/development/python-modules/ttls/default.nix index a389135bc35e..9f5917749e67 100644 --- a/nixpkgs/pkgs/development/python-modules/ttls/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ttls/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ttls"; - version = "1.4.2"; + version = "1.4.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "jschlyter"; repo = pname; rev = "v${version}"; - hash = "sha256-zDMgH9o9obfuihX8pXj226T1eMiKx33xyYOGKjdB1wk="; + hash = "sha256-lBmkfB7HXB+1xLbfOl4wVtsOVfKhztoDBqzV8i6bFAg="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/twitchapi/default.nix b/nixpkgs/pkgs/development/python-modules/twitchapi/default.nix new file mode 100644 index 000000000000..ce4ae1a8874d --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/twitchapi/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchPypi +, aiohttp +, python-dateutil +, requests +, typing-extensions +, websockets +}: + +buildPythonPackage rec { + pname = "twitchapi"; + version = "2.5.3"; + + format = "setuptools"; + + src = fetchPypi { + pname = "twitchAPI"; + inherit version; + sha256 = "e7987dd8c3d1a3d25fe85ff0c0b0bad492f916c920f618dca8efd6baad3ac704"; + }; + + propagatedBuildInputs = [ + aiohttp + python-dateutil + requests + typing-extensions + websockets + ]; + + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ + "twitchAPI.eventsub" + "twitchAPI.oauth" + "twitchAPI.pubsub" + "twitchAPI.twitch" + "twitchAPI.types" + ]; + + meta = with lib; { + description = "Python implementation of the Twitch Helix API, its Webhook, PubSub and EventSub"; + homepage = "https://github.com/Teekeks/pyTwitchAPI"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda wolfangaukang ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/types-cryptography/default.nix b/nixpkgs/pkgs/development/python-modules/types-cryptography/default.nix new file mode 100644 index 000000000000..dd68bfddef7b --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/types-cryptography/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, types-enum34 +, types-ipaddress +}: + +buildPythonPackage rec { + pname = "types-cryptography"; + version = "3.3.18"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-RI/q+a4xImFJvGvOHPj/9U2mYe8Eg398DDFoKYhcNig="; + }; + + pythonImportsCheck = [ + "cryptography-stubs" + ]; + + propagatedBuildInputs = [ types-enum34 types-ipaddress ]; + + meta = with lib; { + description = "Typing stubs for cryptography"; + homepage = "https://github.com/python/typeshed"; + license = licenses.asl20; + maintainers = with maintainers; [ jpetrucciani ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/types-enum34/default.nix b/nixpkgs/pkgs/development/python-modules/types-enum34/default.nix new file mode 100644 index 000000000000..6c186f2d8756 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/types-enum34/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "types-enum34"; + version = "1.1.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "0421lr89vv3fpg77kkj5nmzd7z3nmhw4vh8ibsjp6vfh86b7d73g"; + }; + + pythonImportsCheck = [ + "enum-python2-stubs" + ]; + + meta = with lib; { + description = "Typing stubs for enum34"; + homepage = "https://github.com/python/typeshed"; + license = licenses.asl20; + maintainers = with maintainers; [ jpetrucciani ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/types-ipaddress/default.nix b/nixpkgs/pkgs/development/python-modules/types-ipaddress/default.nix new file mode 100644 index 000000000000..19e048d1a9f4 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/types-ipaddress/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "types-ipaddress"; + version = "1.0.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "0h9q9pjvw1ap5k70ygp750d096jkzymxlhx87yh0pr9mb6zg6gd0"; + }; + + pythonImportsCheck = [ + "ipaddress-python2-stubs" + ]; + + meta = with lib; { + description = "Typing stubs for ipaddress"; + homepage = "https://github.com/python/typeshed"; + license = licenses.asl20; + maintainers = with maintainers; [ jpetrucciani ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/types-paramiko/default.nix b/nixpkgs/pkgs/development/python-modules/types-paramiko/default.nix new file mode 100644 index 000000000000..f43fc5ed507b --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/types-paramiko/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, types-cryptography +}: + +buildPythonPackage rec { + pname = "types-paramiko"; + version = "2.8.16"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-HWkCWoa5509G2OHyPFijb5RVORAvE1tQEgL7myxP0SI="; + }; + + pythonImportsCheck = [ + "paramiko-stubs" + ]; + + propagatedBuildInputs = [ types-cryptography ]; + + meta = with lib; { + description = "Typing stubs for paramiko"; + homepage = "https://github.com/python/typeshed"; + license = licenses.asl20; + maintainers = with maintainers; [ jpetrucciani ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/types-requests/default.nix b/nixpkgs/pkgs/development/python-modules/types-requests/default.nix index 4fc0cf836a15..c62190ff5dab 100644 --- a/nixpkgs/pkgs/development/python-modules/types-requests/default.nix +++ b/nixpkgs/pkgs/development/python-modules/types-requests/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.27.10"; + version = "2.27.12"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-XcsIj8qneO/u5rf8RpZwN+mD+/uf7AJZRXi9M/115VU="; + sha256 = "sha256-/ROC+i4o6shI+u2wMyhAIE8G8MtRcAjjx7goLKU+VtI="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/types-setuptools/default.nix b/nixpkgs/pkgs/development/python-modules/types-setuptools/default.nix index 24ee2ce5b294..46fe7da5d1c7 100644 --- a/nixpkgs/pkgs/development/python-modules/types-setuptools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/types-setuptools/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "57.4.9"; + version = "57.4.10"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-U273R0T44eS+T8cZiH+IbnTkzzx5K0oGmEMgvk30ULU="; + sha256 = "sha256-mhNRNnnGQPZhbi2atQ1DHJnKiumEipckP4h8gP1c8pQ="; }; # Module doesn't have tests diff --git a/nixpkgs/pkgs/development/python-modules/types-urllib3/default.nix b/nixpkgs/pkgs/development/python-modules/types-urllib3/default.nix index 3e6eac4427a0..235535ce9716 100644 --- a/nixpkgs/pkgs/development/python-modules/types-urllib3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/types-urllib3/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-urllib3"; - version = "1.26.9"; + version = "1.26.11"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-q9LUhXg3SCsYNLSBfwWHZ43MUx28mr5M3k2ijO8/Uiw="; + hash = "sha256-JNZORBFohR6wXx0CLeGK4xVY9WScjxEX44TC6F4xMVs="; }; # Module doesn't have tests diff --git a/nixpkgs/pkgs/development/python-modules/unidiff/default.nix b/nixpkgs/pkgs/development/python-modules/unidiff/default.nix index 7dfd5c9d276a..4c776070ae6e 100644 --- a/nixpkgs/pkgs/development/python-modules/unidiff/default.nix +++ b/nixpkgs/pkgs/development/python-modules/unidiff/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "unidiff"; - version = "0.7.0"; + version = "0.7.3"; src = fetchPypi { inherit pname version; - sha256 = "91bb13b4969514a400679d9ae5e29a6ffad85346087677f8b5e2e036af817447"; + sha256 = "sha256-1fLlOpoA2zIkqMNjSbU4Dg4i0a7GxpSxT7lIPuk8YgU="; }; pythonImportsCheck = [ "unidiff" ]; diff --git a/nixpkgs/pkgs/development/python-modules/uvloop/default.nix b/nixpkgs/pkgs/development/python-modules/uvloop/default.nix index 41a0972a3155..72ede5dc1716 100644 --- a/nixpkgs/pkgs/development/python-modules/uvloop/default.nix +++ b/nixpkgs/pkgs/development/python-modules/uvloop/default.nix @@ -53,6 +53,8 @@ buildPythonPackage rec { ] ++ 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" + # Broken: https://github.com/NixOS/nixpkgs/issues/160904 + "--deselect" "tests/test_context.py::Test_UV_Context::test_create_ssl_server_manual_connection_lost" ]; disabledTestPaths = [ diff --git a/nixpkgs/pkgs/development/python-modules/versioneer/default.nix b/nixpkgs/pkgs/development/python-modules/versioneer/default.nix index 868ad5fed966..cbc03ea0d048 100644 --- a/nixpkgs/pkgs/development/python-modules/versioneer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/versioneer/default.nix @@ -6,19 +6,23 @@ buildPythonPackage rec { pname = "versioneer"; - version = "0.21"; - disabled = pythonOlder "3.6"; + version = "0.22"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "64f2dbcbbed15f9a6da2b85f643997db729cf496cafdb97670fb2fa73a7d8e20"; + hash = "sha256-nw6aLLXvUhy/0QTUOiCN2RJN+0rM+nLWlODQQwoBQrw="; }; # Couldn't get tests to work because, for instance, they used virtualenv and # pip. doCheck = false; - pythonImportsCheck = [ "versioneer" ]; + pythonImportsCheck = [ + "versioneer" + ]; meta = with lib; { description = "Version-string management for VCS-controlled trees"; diff --git a/nixpkgs/pkgs/development/python-modules/videocr/default.nix b/nixpkgs/pkgs/development/python-modules/videocr/default.nix new file mode 100644 index 000000000000..a6ac156b7063 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/videocr/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python-Levenshtein +, pytesseract +, opencv4 +, fuzzywuzzy +}: + +buildPythonPackage rec { + pname = "videocr"; + version = "0.1.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "1clifwczvhvbaw2spgxkkyqsbqh21vyfw3rh094pxfmq89ylyj63"; + }; + + propagatedBuildInputs = [ + python-Levenshtein + pytesseract + opencv4 + fuzzywuzzy + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "opencv-python" "opencv" + substituteInPlace videocr/constants.py \ + --replace "master" "main" + substituteInPlace videocr/video.py \ + --replace '--tessdata-dir "{}"' '--tessdata-dir="{}"' + ''; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "videocr" ]; + + meta = with lib; { + description = "Extract hardcoded subtitles from videos using machine learning"; + homepage = "https://github.com/apm1467/videocr"; + license = licenses.mit; + maintainers = with maintainers; [ ozkutuk ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/volvooncall/default.nix b/nixpkgs/pkgs/development/python-modules/volvooncall/default.nix new file mode 100644 index 000000000000..247a192588de --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/volvooncall/default.nix @@ -0,0 +1,62 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, setuptools +, geopy +, docopt +, certifi +, amqtt +, websockets +, aiohttp +, pytestCheckHook +, asynctest +, pytest-asyncio +}: + +buildPythonPackage rec { + pname = "volvooncall"; + version = "0.10.0"; + + disabled = pythonOlder "3.8"; + + format = "setuptools"; + + src = fetchFromGitHub { + owner = "molobrakos"; + repo = "volvooncall"; + rev = "v${version}"; + hash = "sha256-HLSanXJs1yPSgYo4oX0zJtrV5sKkxV2yLPhc2dVRHY8="; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + passthru.extras-require = { + console = [ + certifi + docopt + geopy + ]; + mqtt = [ + amqtt + certifi + ]; + }; + + checkInputs = [ + asynctest + pytest-asyncio + pytestCheckHook + ] ++ passthru.extras-require.mqtt; + + pythonImportsCheck = [ "volvooncall" ]; + + meta = with lib; { + description = "Retrieve information from the Volvo On Call web service"; + homepage = "https://github.com/molobrakos/volvooncall"; + license = licenses.unlicense; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/vt-py/default.nix b/nixpkgs/pkgs/development/python-modules/vt-py/default.nix index 2d0988473ddb..13eeb86be8db 100644 --- a/nixpkgs/pkgs/development/python-modules/vt-py/default.nix +++ b/nixpkgs/pkgs/development/python-modules/vt-py/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "vt-py"; - version = "0.13.1"; + version = "0.13.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "VirusTotal"; repo = pname; rev = version; - sha256 = "sha256-85ohhynXHWjuwKB18DciB48tNGZcHzafobMDaGoTkoc="; + sha256 = "sha256-ULzMz81s/C5wjIUtZ+Rz5o1Uump1FV0rTcNW9keERDk="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/wandb/default.nix b/nixpkgs/pkgs/development/python-modules/wandb/default.nix index 6b10b30a1930..ef8e6cfd247e 100644 --- a/nixpkgs/pkgs/development/python-modules/wandb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/wandb/default.nix @@ -28,6 +28,7 @@ , requests , scikit-learn , sentry-sdk +, setproctitle , setuptools , shortuuid , stdenv @@ -37,13 +38,13 @@ buildPythonPackage rec { pname = "wandb"; - version = "0.12.10"; + version = "0.12.11"; src = fetchFromGitHub { owner = pname; repo = "client"; rev = "v${version}"; - sha256 = "198c6zx7xih74cw0dwfqw7s7b7whik7wv4nfq6x6xw0kw86r6hby"; + sha256 = "0av4vv4llan40678bw0vlah0gn6hjg5pdqwq0c5cv15lqrdb8g32"; }; # The wandb requirements.txt does not distinguish python2/3 dependencies. We @@ -70,6 +71,7 @@ buildPythonPackage rec { pyyaml requests sentry-sdk + setproctitle setuptools shortuuid yaspin @@ -99,11 +101,11 @@ buildPythonPackage rec { "tests/test_telemetry_full.py" "tests/wandb_agent_test.py" "tests/wandb_artifacts_test.py" - "tests/wandb_history_test.py" "tests/wandb_integration_test.py" "tests/wandb_run_test.py" "tests/wandb_settings_test.py" "tests/wandb_sweep_test.py" + "tests/wandb_verify_test.py" # Fails and borks the pytest runner as well. "tests/wandb_test.py" diff --git a/nixpkgs/pkgs/development/python-modules/weasyprint/default.nix b/nixpkgs/pkgs/development/python-modules/weasyprint/default.nix index 27c7521cef86..3d752596dec3 100644 --- a/nixpkgs/pkgs/development/python-modules/weasyprint/default.nix +++ b/nixpkgs/pkgs/development/python-modules/weasyprint/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "weasyprint"; - version = "54.1"; + version = "54.2"; disabled = !isPy3k; format = "pyproject"; @@ -35,7 +35,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "weasyprint"; - sha256 = "sha256-+lfbhi4GvQHF59gtrTmbO5lSo5gnAjwXvumxwGH/G70="; + sha256 = "sha256-1eiqguPiokd6RUPwZG2fsUCAybo0oIWXUesjdXzABGY="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/weconnect-mqtt/default.nix b/nixpkgs/pkgs/development/python-modules/weconnect-mqtt/default.nix index 82bf024c824c..42a3877cffc1 100644 --- a/nixpkgs/pkgs/development/python-modules/weconnect-mqtt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/weconnect-mqtt/default.nix @@ -4,12 +4,13 @@ , pytestCheckHook , pythonOlder , paho-mqtt +, python-dateutil , weconnect }: buildPythonPackage rec { pname = "weconnect-mqtt"; - version = "0.29.1"; + version = "0.30.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,11 +19,12 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-mqtt"; rev = "v${version}"; - sha256 = "sha256-/hFlH0naE62d2dyYIJD/+TuSQDOVgS8tQsSX8JuReC0="; + sha256 = "sha256-/mlN9gEEy8DJSFef0Pp2PLjHhwStKwANKSzw4nT19eM="; }; propagatedBuildInputs = [ paho-mqtt + python-dateutil weconnect ]; diff --git a/nixpkgs/pkgs/development/python-modules/weconnect/default.nix b/nixpkgs/pkgs/development/python-modules/weconnect/default.nix index 794fde431671..f5af3e5aa504 100644 --- a/nixpkgs/pkgs/development/python-modules/weconnect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/weconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "weconnect"; - version = "0.36.4"; + version = "0.37.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-python"; rev = "v${version}"; - sha256 = "sha256-B4RZftGngV85Trm0iPj50WAv1M0H+sjQ9ABiGh070/M="; + sha256 = "sha256-h6jKtQt9vCh5bnhIqWLniUIJ41GxCs0uSi4vBVNs8tE="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/whitenoise/default.nix b/nixpkgs/pkgs/development/python-modules/whitenoise/default.nix index 5598b189afac..d4d956119409 100644 --- a/nixpkgs/pkgs/development/python-modules/whitenoise/default.nix +++ b/nixpkgs/pkgs/development/python-modules/whitenoise/default.nix @@ -1,6 +1,7 @@ { lib , brotli , buildPythonPackage +, django , fetchFromGitHub , pytestCheckHook , pythonOlder @@ -9,14 +10,16 @@ buildPythonPackage rec { pname = "whitenoise"; - version = "5.3.0"; - disabled = pythonOlder "3.5"; + version = "6.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "evansd"; repo = pname; - rev = "v${version}"; - sha256 = "17j1rml1hb43c7fs7kf4ygkpmnjppzgsbnyw3plq9w3yh9w5hkhg"; + rev = version; + hash = "sha256-mUjyX4eQOiMweje6UPyfyJsiHwzF5OQ93KuxFedWxbQ="; }; propagatedBuildInputs = [ @@ -24,6 +27,7 @@ buildPythonPackage rec { ]; checkInputs = [ + django pytestCheckHook requests ]; @@ -40,7 +44,9 @@ buildPythonPackage rec { "test_modified" ]; - pythonImportsCheck = [ "whitenoise" ]; + pythonImportsCheck = [ + "whitenoise" + ]; meta = with lib; { description = "Radically simplified static file serving for WSGI applications"; diff --git a/nixpkgs/pkgs/development/python-modules/willow/default.nix b/nixpkgs/pkgs/development/python-modules/willow/default.nix index 3dafd4df44b3..4f6955c2dbdb 100644 --- a/nixpkgs/pkgs/development/python-modules/willow/default.nix +++ b/nixpkgs/pkgs/development/python-modules/willow/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "willow"; - version = "1.4"; + version = "1.4.1"; disabled = pythonOlder "2.7"; src = fetchPypi { pname = "Willow"; inherit version; - sha256 = "0b3lh7z98nlh4yn0cmvk7bimhfk5w4qvbmjr6jn880ji9h2ixq6d"; + sha256 = "sha256-Dfj/UoUx4AtI1Av3Ltgb6sHcgvLULlu+1K/wIYvvjA0="; }; propagatedBuildInputs = [ six pillow ]; diff --git a/nixpkgs/pkgs/development/python-modules/wled/default.nix b/nixpkgs/pkgs/development/python-modules/wled/default.nix index 3b88afa7e65c..3bd0d5b55b90 100644 --- a/nixpkgs/pkgs/development/python-modules/wled/default.nix +++ b/nixpkgs/pkgs/development/python-modules/wled/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "wled"; - version = "0.13.0"; + version = "0.13.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-wled"; rev = "v${version}"; - sha256 = "sha256-n+TIzlnyPeSywTQr7wlGNezsbQ2+S/WYt1H95+Id2Rw="; + sha256 = "sha256-QQPrAfk+BX8mjqn9ISim9hLEZR2nbgxbkwCv+91yeRY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/xkcdpass/default.nix b/nixpkgs/pkgs/development/python-modules/xkcdpass/default.nix index f74332e53649..5aac18d21077 100644 --- a/nixpkgs/pkgs/development/python-modules/xkcdpass/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xkcdpass/default.nix @@ -1,24 +1,40 @@ { lib , buildPythonPackage , fetchPypi -, pytestCheckHook , installShellFiles +, pytestCheckHook +, pythonAtLeast +, pythonOlder }: buildPythonPackage rec { pname = "xkcdpass"; version = "1.19.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "c5a2e948746da6fe504e8404284f457d8e98da6df5047c6bb3f71b18882e9d2a"; + hash = "sha256-xaLpSHRtpv5QToQEKE9FfY6Y2m31BHxrs/cbGIgunSo="; }; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + ]; + + checkInputs = [ + pytestCheckHook + ]; - checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ + "xkcdpass" + ]; - pythonImportsCheck = [ "xkcdpass" ]; + disabledTests = lib.optionals (pythonAtLeast "3.10") [ + # https://github.com/redacted/XKCD-password-generator/issues/138 + "test_entropy_printout_valid_input" + ]; postInstall = '' installManPage *.? @@ -27,7 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Generate secure multiword passwords/passphrases, inspired by XKCD"; - homepage = "https://pypi.python.org/pypi/xkcdpass/"; + homepage = "https://github.com/redacted/XKCD-password-generator"; license = licenses.bsd3; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix b/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix index 49693353204f..c9cf286b6cce 100644 --- a/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix @@ -22,13 +22,13 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "3.12.2"; + version = "3.12.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-CsxelHZbg25oBRM3P5UYlbWgsnR/L/w8vSFgHK1FKKI="; + sha256 = "sha256-YUrcD3Q1fkDW+nwf6k2T/aBL8+W9iWkPYW/TqdTiuA0="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/yamlfix/default.nix b/nixpkgs/pkgs/development/python-modules/yamlfix/default.nix index f0203d58dffb..7243b3891f40 100644 --- a/nixpkgs/pkgs/development/python-modules/yamlfix/default.nix +++ b/nixpkgs/pkgs/development/python-modules/yamlfix/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "yamlfix"; - version = "0.8.0"; + version = "0.8.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "lyz-code"; repo = pname; rev = version; - sha256 = "sha256-Gkq80YMeiPy7xxLauA/nloW4znMV2tfE+e24HyZgUaQ="; + sha256 = "sha256-YCC4xK1fB5Gyv32JhbSuejtzLNMRnH7iyUpzccVijS0="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/yara-python/default.nix b/nixpkgs/pkgs/development/python-modules/yara-python/default.nix index e29ff3b12de7..8d5892979e1f 100644 --- a/nixpkgs/pkgs/development/python-modules/yara-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/yara-python/default.nix @@ -2,18 +2,22 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook +, pythonOlder , yara }: buildPythonPackage rec { pname = "yara-python"; - version = "4.1.3"; + version = "4.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "VirusTotal"; repo = "yara-python"; rev = "v${version}"; - sha256 = "sha256-lOP+OVnMgpP8S+Q3jGRNEAFXAohXgX5Nvl+l4EK5ebs="; + hash = "sha256-jNxYuIddMzANZoQ0p7BbRrX6ISpaCA7T6j+iS+FOocg="; }; buildInputs = [ @@ -28,9 +32,13 @@ buildPythonPackage rec { "--dynamic-linking" ]; - pytestFlagsArray = [ "tests.py" ]; + pytestFlagsArray = [ + "tests.py" + ]; - pythonImportsCheck = [ "yara" ]; + pythonImportsCheck = [ + "yara" + ]; meta = with lib; { description = "Python interface for YARA"; diff --git a/nixpkgs/pkgs/development/python-modules/yowsup/default.nix b/nixpkgs/pkgs/development/python-modules/yowsup/default.nix index 91c58192b8a2..30c056db9340 100644 --- a/nixpkgs/pkgs/development/python-modules/yowsup/default.nix +++ b/nixpkgs/pkgs/development/python-modules/yowsup/default.nix @@ -1,5 +1,13 @@ -{ buildPythonPackage, lib, fetchFromGitHub, six, python-axolotl, pytest -, isPy3k, consonance, appdirs +{ lib +, buildPythonPackage +, isPy3k +, fetchFromGitHub +, appdirs +, consonance +, protobuf +, python-axolotl +, six +, pytestCheckHook }: buildPythonPackage rec { @@ -17,19 +25,28 @@ buildPythonPackage rec { sha256 = "1pz0r1gif15lhzdsam8gg3jm6zsskiv2yiwlhaif5rl7lv3p0v7q"; }; - checkInputs = [ pytest ]; - checkPhase = '' - HOME=$(mktemp -d) py.test yowsup + postPatch = '' + substituteInPlace setup.py \ + --replace "argparse" "" \ + --replace "==" ">=" \ ''; - patches = [ ./dependency-fixes.patch ]; + checkInputs = [ + pytestCheckHook + ]; - propagatedBuildInputs = [ six python-axolotl consonance appdirs ]; + propagatedBuildInputs = [ + appdirs + consonance + protobuf + python-axolotl + six + ]; meta = with lib; { homepage = "https://github.com/tgalal/yowsup"; description = "The python WhatsApp library"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/yowsup/dependency-fixes.patch b/nixpkgs/pkgs/development/python-modules/yowsup/dependency-fixes.patch deleted file mode 100644 index eab56332d492..000000000000 --- a/nixpkgs/pkgs/development/python-modules/yowsup/dependency-fixes.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/setup.py b/setup.py -index e3871a7..930bd6a 100755 ---- a/setup.py -+++ b/setup.py -@@ -5,7 +5,7 @@ import yowsup - import platform - import sys - --deps = ['consonance==0.1.2', 'argparse', 'python-axolotl==0.2.2', 'six==1.10', 'appdirs', 'protobuf>=3.6.0'] -+deps = ['consonance>=0.1', 'python-axolotl>=0.2', 'six>=1.10', 'appdirs', 'protobuf>=3.6.0'] - - if sys.version_info < (2, 7): - deps.append('importlib') diff --git a/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix b/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix index 218c2edd0ac5..fdee7ace495a 100644 --- a/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ytmusicapi"; - version = "0.20.0"; + version = "0.21.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-DvLrytLp28TVFVdkmWg19cC2VRetFcSx7dmsO4HQqVo="; + hash = "sha256-JstIHc61TFQEgRHr54N4Doq6ML0EcIcDGTEJ/tbrC2A="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/zcs/default.nix b/nixpkgs/pkgs/development/python-modules/zcs/default.nix index 9f22cd1dfc86..8ad26668bc5e 100644 --- a/nixpkgs/pkgs/development/python-modules/zcs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zcs/default.nix @@ -15,6 +15,10 @@ buildPythonPackage rec { sha256 = "sha256-ZoQgAaJy3kKHLljyKA0Oo/D1kefE8X9FlsGDSNt1nPw="; }; + patches = [ + ./fix-test-yaml.patch + ]; + propagatedBuildInputs = [ yacs ]; pythonImportsCheck = [ "zcs" ]; diff --git a/nixpkgs/pkgs/development/python-modules/zcs/fix-test-yaml.patch b/nixpkgs/pkgs/development/python-modules/zcs/fix-test-yaml.patch new file mode 100644 index 000000000000..a046f1808296 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/zcs/fix-test-yaml.patch @@ -0,0 +1,13 @@ +diff --git a/test/test_zcs.py b/test/test_zcs.py +index e4981d3..893999f 100644 +--- a/test/test_zcs.py ++++ b/test/test_zcs.py +@@ -65,7 +65,7 @@ class TestCfgNode(unittest.TestCase): + cfg = self.cfg.clone() + yamlp = pathjoin(tmpboxx(), "test.yaml") + cfg.dump(yamlp) +- cfg_dict = yaml.load(open(yamlp)) ++ cfg_dict = yaml.load(open(yamlp), yaml.Loader) + cfgd = CfgNode(cfg_dict) + self.assertTrue(str(cfg.dump()) == str(cfgd.dump())) + diff --git a/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix b/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix index 319cd7cce0f1..b81ac4f1fc5f 100644 --- a/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.38.3"; + version = "0.38.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = version; - sha256 = "sha256-pLTqnIbe7rTZrQFe//0/h5Tyx0GzJW+q9mUuDNifo/0="; + sha256 = "sha256-CLV1/maraSJ3GWnyN/0rLyEyWoQIL18rhm35llgvthw="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/zfec/default.nix b/nixpkgs/pkgs/development/python-modules/zfec/default.nix index 1cb2780cc948..f91706b97d18 100644 --- a/nixpkgs/pkgs/development/python-modules/zfec/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zfec/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "zfec"; - version = "1.5.5"; + version = "1.5.7.2"; src = fetchPypi { inherit pname version; - sha256 = "6033b2f3cc3edacf3f7eeed5f258c1ebf8a1d7e5e35b623db352512ce564e5ca"; + sha256 = "sha256-TuUZvg3MfaLohIK8/Av5d6Ql4dfoJ4z1u7uNAPiir7Y="; }; propagatedBuildInputs = [ pyutil ]; diff --git a/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix b/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix index d8398ac40235..56d2704fcc19 100644 --- a/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.66"; + version = "0.0.67"; src = fetchFromGitHub { owner = "zigpy"; repo = "zha-device-handlers"; rev = version; - sha256 = "18g0i6b60ndfmbvdsx5pniq56fyc5k39ylp3sjhrfjcj434wvbvc"; + sha256 = "sha256-qkXXrwqMEtfafHsXtlyy6HFwuo/8sOZuQ9SvGRJkGtA="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/zict/default.nix b/nixpkgs/pkgs/development/python-modules/zict/default.nix index 611660fc3eb5..822a041e5d18 100644 --- a/nixpkgs/pkgs/development/python-modules/zict/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zict/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "zict"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "8e2969797627c8a663575c2fc6fcb53a05e37cdb83ee65f341fc6e0c3d0ced16"; + sha256 = "sha256-FbLMFflaR2++BiP9j3ceHncTEL96AflUEqC2BbbkdRA="; }; disabled = pythonOlder "3.6"; 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 543056972723..5f4203634acb 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 @@ -2,6 +2,7 @@ , aiohttp , buildPythonPackage , fetchFromGitHub +, pydantic , pytest-aiohttp , pytestCheckHook , pythonOlder @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.34.0"; + version = "0.35.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,13 +19,16 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = version; - sha256 = "sha256-hqq/CYlM9ZahDiH3iFLFzfE22CB19WQnFIDt+gCrEXU="; + sha256 = "sha256-Bte4pAi+atdkMvxYlzdN/UOrHB2WKfl44U9m/vKFMoA="; }; propagatedBuildInputs = [ aiohttp + pydantic ]; + doCheck = lib.versionAtLeast pytest-aiohttp.version "1.0.0"; + checkInputs = [ pytest-aiohttp pytestCheckHook diff --git a/nixpkgs/pkgs/development/python2-modules/gtkme/default.nix b/nixpkgs/pkgs/development/python2-modules/gtkme/default.nix new file mode 100644 index 000000000000..bc23854d95c8 --- /dev/null +++ b/nixpkgs/pkgs/development/python2-modules/gtkme/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pkg-config +, gobject-introspection +, pygobject3 +, gtk3 +, glib +}: + +buildPythonPackage rec { + pname = "gtkme"; + version = "1.5.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-NIUgnbfcHjbPfsH3CF2Bywo8owrdsi1wqDoMxOa+2U4="; + }; + + nativeBuildInputs = [ pkg-config gobject-introspection gtk3 ]; + buildInputs = [ pygobject3 glib ]; + propagatedBuildInputs = [ gtk3 ]; + + pythonImportsCheck = [ + "gtkme" + ]; + + meta = with lib; { + description = "Manages an Application with Gtk windows, forms, lists and other complex items easily"; + homepage = "https://gitlab.com/doctormo/gtkme"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ + revol-xut + ]; + }; +} diff --git a/nixpkgs/pkgs/development/ruby-modules/bundled-common/default.nix b/nixpkgs/pkgs/development/ruby-modules/bundled-common/default.nix index 6a4a87bc8963..7bad0b442da6 100644 --- a/nixpkgs/pkgs/development/ruby-modules/bundled-common/default.nix +++ b/nixpkgs/pkgs/development/ruby-modules/bundled-common/default.nix @@ -1,6 +1,6 @@ { stdenv, runCommand, ruby, lib, rsync , defaultGemConfig, buildRubyGem, buildEnv -, makeWrapper +, makeBinaryWrapper , bundler }@defs: @@ -118,9 +118,12 @@ let wrappedRuby = stdenv.mkDerivation { name = "wrapped-ruby-${pname'}"; - nativeBuildInputs = [ makeWrapper ]; - inherit (ruby) gemPath meta; - buildCommand = '' + + nativeBuildInputs = [ makeBinaryWrapper ]; + + dontUnpack = true; + + buildPhase = '' mkdir -p $out/bin for i in ${ruby}/bin/*; do makeWrapper "$i" $out/bin/$(basename "$i") \ @@ -131,6 +134,15 @@ let --set GEM_PATH ${basicEnv}/${ruby.gemPath} done ''; + + dontInstall = true; + + doCheck = true; + checkPhase = '' + $out/bin/ruby --help > /dev/null + ''; + + inherit (ruby) meta; }; env = let diff --git a/nixpkgs/pkgs/development/tools/alloy/default.nix b/nixpkgs/pkgs/development/tools/alloy/default.nix index 92f7e8095128..4ec5b28bdd03 100644 --- a/nixpkgs/pkgs/development/tools/alloy/default.nix +++ b/nixpkgs/pkgs/development/tools/alloy/default.nix @@ -17,7 +17,7 @@ let generic = { version, sha256 }: desktopName = "Alloy ${lib.versions.major version}"; genericName = "Relational modelling tool"; comment = meta.description; - categories = "Development;IDE;Education;"; + categories = [ "Development" "IDE" "Education" ]; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/amazon-qldb-shell/default.nix b/nixpkgs/pkgs/development/tools/amazon-qldb-shell/default.nix index 06fc4d2e90ea..6f6ef1ca8af7 100644 --- a/nixpkgs/pkgs/development/tools/amazon-qldb-shell/default.nix +++ b/nixpkgs/pkgs/development/tools/amazon-qldb-shell/default.nix @@ -9,7 +9,7 @@ let pname = "amazon-qldb-shell"; - version = "2.0.0"; + version = "2.0.1"; package = rustPlatform.buildRustPackage { inherit pname version; @@ -17,13 +17,13 @@ let owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Pnm1HxEjjNKpS3tTymtOXxUF7EEnWM+7WBsqeaG8seA="; + sha256 = "sha256-aXScqJ1LijMSAy9YkS5QyXtTqxd19lLt3BbyVXlbw8o="; }; nativeBuildInputs = [ clang cmake ]; buildInputs = [ llvmPackages.libclang ]; - cargoSha256 = "sha256-EUqGSKcGnhrdLn8ystaLkkR31RjEvjW6vRzKPMK77e8="; + cargoSha256 = "sha256-y3dNEa2U9mwsENPda44zweszlk4UJXGtfeH+er8mi0U="; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; @@ -34,6 +34,7 @@ let homepage = "https://github.com/awslabs/amazon-qldb-shell"; license = licenses.asl20; maintainers = [ maintainers.terlar ]; + mainProgram = "qldb"; }; }; in diff --git a/nixpkgs/pkgs/development/tools/analysis/actionlint/default.nix b/nixpkgs/pkgs/development/tools/analysis/actionlint/default.nix index a2c1e0a06c0b..68112b01cfb8 100644 --- a/nixpkgs/pkgs/development/tools/analysis/actionlint/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/actionlint/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "actionlint"; - version = "1.6.8"; + version = "1.6.10"; subPackages = [ "cmd/actionlint" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "rhysd"; repo = "actionlint"; rev = "v${version}"; - sha256 = "sha256-wjLY40bxpoMk6YIG/4KbjxSWUDVNn3cX5OcsgfEPjzk="; + sha256 = "sha256-RFsNJiCeSAeEWOUnfBpeIZKoS2mlXazYMQd1M6yFLGU="; }; - vendorSha256 = "sha256-0tytdTZxnWYl8AxaquF0ArY3dy51j8H2kzw69qcSHzk="; + vendorSha256 = "sha256-CxNER8aQftMG14M+x6bPwcXgUZRkUDYZtFg1cPxxg+I="; nativeBuildInputs = [ ronn installShellFiles ]; diff --git a/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix b/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix index 79efb55f0810..8862464156f1 100644 --- a/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix @@ -32,13 +32,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.875"; + version = "2.0.941"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-ZM554FZayuxxf9dgbGcvfPoXm5rWjjZoNySnKpxRO/w="; + hash = "sha256-hNmIJmxzKEaKQzqLl9LSqtMj1dTpFDeztUo2ESCHIw0="; }; nativeBuildInputs = with py.pkgs; [ @@ -71,6 +71,7 @@ buildPythonApplication rec { packaging policyuniverse prettytable + pycep-parser pyyaml semantic-version tabulate @@ -106,11 +107,12 @@ buildPythonApplication rec { "TestSarifReport" # Will probably be fixed in one of the next releases "test_valid_cyclonedx_bom" - "test_record_relative_path_with_direct_oberlay" - "test_record_relative_path_with_direct_prod2_oberlay" + "test_record_relative_path_with" + "test_record_relative_path_with_relative_dir" # Requires prettytable release which is only available in staging "test_skipped_check_exists" - "test_record_relative_path_with_relative_dir" + # AssertionError: 0 not greater than 0 + "test_skip_mapping_default" ]; disabledTestPaths = [ diff --git a/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix b/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix index 8bf2ed7c04ec..a6a95e74e4a1 100644 --- a/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.8.0"; + version = "2.8.1"; dontConfigure = true; dontBuild = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "sha256-IcYD9o6rv1ti4IvTEEJ5iV1OdJP7cHN0vetrvabxeas="; + sha256 = "sha256-zZoK5x+nE8AVZWDSMmsVPFuXNnAHBPyu9+1GgSwN19c="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/tools/analysis/flow/default.nix b/nixpkgs/pkgs/development/tools/analysis/flow/default.nix index 36c852857041..6ef9806bf371 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.172.0"; + version = "0.173.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "sha256-N3mP1dhul7Ljn278CJmge4IrVllQJsc73A3/7mTSU70="; + sha256 = "sha256-F0t85/sq9p+eNEf2XAGxw+ZWeRgUbkhrKFdGASijuAs="; }; installPhase = '' diff --git a/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix b/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix index da73737530ed..503d5c630498 100644 --- a/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pmd"; - version = "6.42.0"; + version = "6.43.0"; src = fetchurl { url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; - sha256 = "sha256-rVqHMhiuFLVTz/J9TGnA/42m9GaGORsf+CrUUqsdUfs="; + sha256 = "sha256-+eJCN890vm4WBcMZ2VCGOS8WUyIckL+DfQVNaUSovGE="; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix b/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix index 1bef8cd07586..d5d393ee96eb 100644 --- a/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix @@ -44,13 +44,13 @@ let in stdenv.mkDerivation rec { pname = "radare2"; - version = "5.6.2"; + version = "5.6.4"; src = fetchFromGitHub { owner = "radare"; repo = "radare2"; rev = version; - sha256 = "sha256-R53S2+v0qCY5Q7Uf2gQ4veaOzYN2iE6F00+ERvknD2g="; + sha256 = "sha256-rqGlp9fHTF1z8A+DROYfzHXi5xfLMdUWzssGN5uHQmE="; }; preBuild = '' diff --git a/nixpkgs/pkgs/development/tools/apktool/default.nix b/nixpkgs/pkgs/development/tools/apktool/default.nix index 3b9044a544a9..3dda078397ea 100644 --- a/nixpkgs/pkgs/development/tools/apktool/default.nix +++ b/nixpkgs/pkgs/development/tools/apktool/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "apktool"; - version = "2.6.0"; + version = "2.6.1"; src = fetchurl { urls = [ "https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_${version}.jar" "https://github.com/iBotPeaches/Apktool/releases/download/v${version}/apktool_${version}.jar" ]; - sha256 = "sha256-91CjzSwflC8n9ff9XRfq2jva/wpmQ/SduEfoQlef3aU="; + sha256 = "sha256-vCuah6xahpBbbKNDwhoNs7w3vdURVLyc32VSPZWJXTQ="; }; dontUnpack = true; diff --git a/nixpkgs/pkgs/development/tools/ashpd-demo/default.nix b/nixpkgs/pkgs/development/tools/ashpd-demo/default.nix index f6842dacec9e..9d873b8461f1 100644 --- a/nixpkgs/pkgs/development/tools/ashpd-demo/default.nix +++ b/nixpkgs/pkgs/development/tools/ashpd-demo/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { rustPlatform.cargoSetupHook rustPlatform.rust.rustc wrapGAppsHook4 + rustPlatform.bindgenHook desktop-file-utils glib # for glib-compile-schemas ]; @@ -63,11 +64,6 @@ stdenv.mkDerivation rec { libshumate ]; - # libspa-sys requires this for bindgen - LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; - # <spa-0.2/spa/utils/defs.h> included by libspa-sys requires <stdbool.h> - BINDGEN_EXTRA_CLANG_ARGS = "-I${llvmPackages.libclang.lib}/lib/clang/${lib.getVersion llvmPackages.clang}/include -I${glibc.dev}/include"; - passthru = { updateScript = nix-update-script { attrPath = pname; diff --git a/nixpkgs/pkgs/development/tools/avro-tools/default.nix b/nixpkgs/pkgs/development/tools/avro-tools/default.nix index c7a96ce247eb..9f19dee156da 100644 --- a/nixpkgs/pkgs/development/tools/avro-tools/default.nix +++ b/nixpkgs/pkgs/development/tools/avro-tools/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "avro-tools"; - version = "1.9.2"; + version = "1.11.0"; src = fetchurl { url = "mirror://maven/org/apache/avro/avro-tools/${version}/${pname}-${version}.jar"; - sha256 = "169cv4fjsj69fa2s87gh1i7wk0xzh3l7sx5yyz3cgyjalg4a12n1"; + sha256 = "sha256-XnfvND5WPojzIS8t0ntwn+3+Zjz9ABEUK2FO6aD4ulw="; }; dontUnpack = true; diff --git a/nixpkgs/pkgs/development/tools/bacon/default.nix b/nixpkgs/pkgs/development/tools/bacon/default.nix index 271d946000be..093a37e2b96d 100644 --- a/nixpkgs/pkgs/development/tools/bacon/default.nix +++ b/nixpkgs/pkgs/development/tools/bacon/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "bacon"; - version = "1.2.5"; + version = "2.0.1"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dpdQ1qBfLU6whkqVHQ/zQxqs/y+nmdvxHanaNw66QxA="; + sha256 = "sha256-aOxwM9ur0E/biLOzhDyTCWYBwdbpsTQ49aCfkFea5ck="; }; - cargoSha256 = "sha256-jidZhaB8gF4QBcTvVuygTZdQnlOVwOQO8MMjUuSPht0="; + cargoSha256 = "sha256-AUoLwryuEdUdWasaHuap6qff8DRi90iq/v4afyG9beo="; buildInputs = lib.optional stdenv.isDarwin CoreServices; diff --git a/nixpkgs/pkgs/development/tools/biodiff/default.nix b/nixpkgs/pkgs/development/tools/biodiff/default.nix new file mode 100644 index 000000000000..340c3b736caf --- /dev/null +++ b/nixpkgs/pkgs/development/tools/biodiff/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "biodiff"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "8051Enthusiast"; + repo = "biodiff"; + rev = "v${version}"; + sha256 = "sha256-M1hwuIe5+quxcvFAacBkxQMiQyN6lhtWA6hEi5Buoho="; + }; + + cargoSha256 = "sha256-NIt4D2/T7Zl7rgksbQeVo6cNBt6cZkUGTJGztnp6SB0="; + + meta = with lib; { + description = "Hex diff viewer using alignment algorithms from biology"; + homepage = "https://github.com/8051Enthusiast/biodiff"; + changelog = "https://github.com/8051Enthusiast/biodiff/blob/v${version}/CHANGELOG"; + license = licenses.mit; + maintainers = with maintainers; [ newam ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/buf/default.nix b/nixpkgs/pkgs/development/tools/buf/default.nix index 60d8d8f58b8c..1b0ccab29644 100644 --- a/nixpkgs/pkgs/development/tools/buf/default.nix +++ b/nixpkgs/pkgs/development/tools/buf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "buf"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jJaob2eaozMFRsXwW6ulgM5De3UmpLZddTHwq6PnaeE="; + sha256 = "sha256-8GwZsFvxaTtG/q7DaWvZcGdbyJ4Cm41BqSvwq3SqoEg="; }; - vendorSha256 = "sha256-wPnrkfv6pJB6tkZo2oeMbWHbF9njGh1ZEWu8tkHDhGo="; + vendorSha256 = "sha256-g3bvfNF0XkC12/tRZsO+o2z20w+riWiHOer8Pzp1QF0="; patches = [ # Skip a test that requires networking to be available to work. 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 dd3b2ae2bf26..44e8b9e44147 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.3.3"; + version = "2.3.4"; src = fetchFromGitHub { owner = "buchgr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3ZN/SCTQ5k0X4cqnrpp8Yt1QDnYkT2RbMLKpDfdWaxk="; + sha256 = "sha256-ijR3RjGzm0HtVp5lSKGJemCGkRzhgQqaDOgg+MjDB1c="; }; - vendorSha256 = "sha256-UhES+jJil6+JmGH27p/LC/b5rZfHC4RIjA9nCFeB7Ao="; + vendorSha256 = "sha256-NmTdS5xgv0o7AT4lBJk472Lq1e73EcrcfnI8RIxKEoc="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix b/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix index 7dfb6c9b2ad5..80919cfc377f 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix @@ -3,16 +3,16 @@ stdenv.mkDerivation rec { pname = "leiningen"; - version = "2.9.7"; + version = "2.9.8"; src = fetchurl { url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg"; - sha256 = "sha256-948g0ZMfAoJw53vA8MAKWg76Tst6VnYwSjSuT0aeKB0="; + sha256 = "1sgnxw58srjxqnskl700p7r7n23pfpjvqpiqnz1m8r6c76jwnllr"; }; jarsrc = fetchurl { url = "https://github.com/technomancy/leiningen/releases/download/${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-gvAUFKzs3bsOvW1XFQW7Zxpv0JMja82sJGjP5fLqqAI="; + sha256 = "13f4n15i0gsk9jq52gxivnsk32qjahmxgrddm54cf8ynw0a923ia"; }; JARNAME = "${pname}-${version}-standalone.jar"; diff --git a/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix b/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix index 49d454d86864..6e79bee6a242 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mill"; - version = "0.10.0"; + version = "0.10.1"; src = fetchurl { url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}-assembly"; - sha256 = "sha256:1acm1z24cw2yzykwwjfrcf66mi16xvsrnrrhrsd9yqrajqab707n"; + hash = "sha256:hYQOmnJjsOIIri5H0/B5LhixwfiLxxpVoN4ON1NUkWg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix b/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix index 37cb4dd86609..3ec37b89fd39 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix @@ -81,7 +81,7 @@ let (rebar3WithPlugins { globalPlugins = [rebar3-nix]; }) ] } - latest=$(list-git-tags https://github.com/${owner}/${pname}.git | sed -n '/[\d\.]\+/p' | sort -V | tail -1) + latest=$(list-git-tags --url=https://github.com/${owner}/${pname}.git | sed -n '/[\d\.]\+/p' | sort -V | tail -1) if [ "$latest" != "${version}" ]; then nixpkgs="$(git rev-parse --show-toplevel)" nix_path="$nixpkgs/pkgs/development/tools/build-managers/rebar3" diff --git a/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix index 6c366be8b42f..f6d5de348932 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rocm-cmake"; - version = "4.5.2"; + version = "5.0.2"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "rocm-cmake"; rev = "rocm-${version}"; - hash = "sha256-5RwhIIOtqeMl/Gyufl5U1gTEpoCjdPJP5MbVnhEKYMM="; + hash = "sha256-4PtLe864MQ9wUn+l1fshiiTQvP06ewD39TDYZl70Hgg="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/tools/build-managers/samurai/default.nix b/nixpkgs/pkgs/development/tools/build-managers/samurai/default.nix index 1fb4206d5cec..cd058bfc2632 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/samurai/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/samurai/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { pname = "samurai"; @@ -13,6 +13,19 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=" "PREFIX=${placeholder "out"}" ]; + patches = [ + (fetchpatch { + name = "CVE-2021-30218.patch"; + url = "https://github.com/michaelforney/samurai/commit/e84b6d99c85043fa1ba54851ee500540ec206918.patch"; + sha256 = "sha256-hyndwj6st4rwOJ35Iu0qL12dR5E6CBvsulvR27PYKMw="; + }) + (fetchpatch { + name = "CVE-2021-30219.patch"; + url = "https://github.com/michaelforney/samurai/commit/d2af3bc375e2a77139c3a28d6128c60cd8d08655.patch"; + sha256 = "sha256-rcdwKjHeq5Oaga9wezdHSg/7ljkynfbnkBc2ciMW5so="; + }) + ]; + meta = with lib; { description = "ninja-compatible build tool written in C"; homepage = "https://github.com/michaelforney/samurai"; diff --git a/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix b/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix index 759c9f681593..267702763722 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "sbt-extras"; - rev = "8ccccd8a1d7efa097b7f30e0ec76e39b3aa0f3df"; - version = "2021-11-08"; + rev = "ef403f4ce126441f126dfc61ca6357a7b42539af"; + version = "2022-02-01"; src = fetchFromGitHub { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "376yaucqzoe36VKaJmCz+5vQHc+KNQG4iamAdOb/YQU="; + sha256 = "G7nR2wV0Wv019bCA+ecfYhmFh/DDHFjihKGFKNQ5dgM="; }; dontBuild = true; diff --git a/nixpkgs/pkgs/development/tools/build-managers/scala-cli/default.nix b/nixpkgs/pkgs/development/tools/build-managers/scala-cli/default.nix index 8e8503227e88..c045944b7737 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/scala-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/scala-cli/default.nix @@ -1,15 +1,15 @@ { stdenv, coreutils, lib, installShellFiles, zlib, autoPatchelfHook, fetchurl }: let - version = "0.1.1"; + version = "0.1.2"; assets = { x86_64-darwin = { asset = "scala-cli-x86_64-apple-darwin.gz"; - sha256 = "sha256-wULC0/n0ZFdBXOjxVe/VYsdsGBorNd51HczCK20Pmwc="; + sha256 = "10453af2kz10k9vmcgdwpk10z36cnblnj6l09wkqngxwx9vxbf9q"; }; x86_64-linux = { asset = "scala-cli-x86_64-pc-linux.gz"; - sha256 = "sha256-tXcg+FOm+Ig61/Jw9ibEp0sHeXI9tpt+ya3Z/yS7MCk="; + sha256 = "0720c4s717hcssp4b3x295rhgac4ifjr95zn45bm1n70jr3xqzyj"; }; }; in diff --git a/nixpkgs/pkgs/development/tools/buildkit/default.nix b/nixpkgs/pkgs/development/tools/buildkit/default.nix index b9ae4e4dd887..df644935cf16 100644 --- a/nixpkgs/pkgs/development/tools/buildkit/default.nix +++ b/nixpkgs/pkgs/development/tools/buildkit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "buildkit"; - version = "0.9.3"; + version = "0.10.0"; src = fetchFromGitHub { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - sha256 = "sha256-xjuHMjJjA4sx2Hrr6tPpvKtSmhGZ3AZka733DLxmYfk="; + sha256 = "sha256-Pdnu0zG1LteAob0YUuG/XDh2pfBj5UO2GrkWFlMZeGY="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/development/tools/checkmate/default.nix b/nixpkgs/pkgs/development/tools/checkmate/default.nix index b8ad9c6d7789..bcb115e409b7 100644 --- a/nixpkgs/pkgs/development/tools/checkmate/default.nix +++ b/nixpkgs/pkgs/development/tools/checkmate/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "checkmate"; - version = "0.5.7"; + version = "0.5.8"; src = fetchFromGitHub { owner = "adedayo"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RCGJ7Xa5HLzcngv79NyocbNGoYZMAKyv/svRScM1vq0="; + sha256 = "sha256-nzhzeXy70UQ1HP3/PCBnUPhrjg7CnKURMCH0iJ099E0="; }; - vendorSha256 = "sha256-ZURtNED8gb0QsuXxJd9oBSx68ABcwlvVpkbd7lhiA9s="; + vendorSha256 = "sha256-uQRAVbLnzY+E3glMJ3AvmbtmwD2LkuqCh2mUpqZbmaA="; subPackages = [ "." ]; diff --git a/nixpkgs/pkgs/development/tools/clj-kondo/default.nix b/nixpkgs/pkgs/development/tools/clj-kondo/default.nix index bd9819f8a006..0a369bd5f034 100644 --- a/nixpkgs/pkgs/development/tools/clj-kondo/default.nix +++ b/nixpkgs/pkgs/development/tools/clj-kondo/default.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "clj-kondo"; - version = "2022.02.09"; + version = "2022.03.09"; src = fetchurl { url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-WfPjn0S7Jd6zFcfaudcSsx9d5luyZuaeB8lFaOLg21w="; + sha256 = "sha256-gPn3wORb30I/zTXUdxUxMesKFJx6ES7jEjUYuC/DAVI="; }; extraNativeImageBuildArgs = [ diff --git a/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix b/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix index 4fa198f32c0c..f1f44a577755 100644 --- a/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix +++ b/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-y1YpPYTejeZjz4nJmyAPT8rYaEguaJpBfAAfF38dpA4="; + sha256 = "sha256-G1RQEKb3vK8lg0jakCtIMgQXmWqfsq0QWHwU8TAbBbE="; }; vendorSha256 = "sha256-McCbogZvgm9pnVjay9O2CxAh+653JnDMcU4CHD0PTPI="; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix index f2136346c1f3..f02a6cf8762f 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fly"; - version = "7.6.0"; + version = "7.7.0"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "sha256-Zi+gyO+2AKDgcfgYrzLskJYZ6hQKOVlOL7Y9nxH/pGg="; + sha256 = "sha256-BKEUKQQxZ+Maq2JSHeWuQ7Lhgfc33pSiVS6VfAlMu/g="; }; - vendorSha256 = "sha256-OF3parnlTPmcr7tVcc6495sUMRApSpBHHjSE/4EFIxE="; + vendorSha256 = "sha256-G9HdhPi4iezUR6SIVYnjL0fznOfiusY4T9ClLPr1w5c="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix index 67433ab5d88a..222ffb0688fe 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -43,13 +43,13 @@ let in stdenv.mkDerivation rec { pname = "github-runner"; - version = "2.287.1"; + version = "2.288.1"; src = fetchFromGitHub { owner = "actions"; repo = "runner"; rev = "v${version}"; - hash = "sha256-4SPrtX3j8blWTYnSkD2Z7IecZvI4xdAqHRJ1lBM0aAo="; + hash = "sha256-bP+6aAKnu6PxN9eppFXsqOSVSGQ6Lv+gEF2MdEz52WE="; }; nativeBuildInputs = [ @@ -102,11 +102,6 @@ stdenv.mkDerivation rec { configurePhase = '' runHook preConfigure - # Set up Nuget dependencies - export HOME=$(mktemp -d) - export DOTNET_CLI_TELEMETRY_OPTOUT=1 - export DOTNET_NOLOGO=1 - # Never use nuget.org nuget sources Disable -Name "nuget.org" @@ -184,6 +179,11 @@ stdenv.mkDerivation rec { "EnsureDotnetsdkPowershellDownloadScriptUpToDate" ] ++ [ "GitHub.Runner.Common.Tests.Listener.RunnerL0.TestRunOnceHandleUpdateMessage" ] + # Tests for trimmed runner packages which aim at reducing the update size. Not relevant for Nix. + ++ map (x: "GitHub.Runner.Common.Tests.PackagesTrimL0.${x}") [ + "RunnerLayoutParts_CheckExternalsHash" + "RunnerLayoutParts_CheckDotnetRuntimeHash" + ] ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [ # "JavaScript Actions in Alpine containers are only supported on x64 Linux runners. Detected Linux Arm64" "GitHub.Runner.Common.Tests.Worker.StepHostL0.DetermineNodeRuntimeVersionInAlpineContainerAsync" diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 57e9d15dce66..6dc0a7d30ee1 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,31 +1,54 @@ -{ lib, buildGoPackage, fetchFromGitLab, fetchurl }: +{ lib, buildGoModule, fetchFromGitLab, fetchurl }: let - version = "14.7.0"; + version = "14.8.2"; in -buildGoPackage rec { +buildGoModule rec { inherit version; pname = "gitlab-runner"; - goPackagePath = "gitlab.com/gitlab-org/gitlab-runner"; - subPackages = [ "." ]; - commonPackagePath = "${goPackagePath}/common"; + + commonPackagePath = "gitlab.com/gitlab-org/gitlab-runner/common"; ldflags = [ "-X ${commonPackagePath}.NAME=gitlab-runner" "-X ${commonPackagePath}.VERSION=${version}" "-X ${commonPackagePath}.REVISION=v${version}" ]; + vendorSha256 = "1aa04hbavr0bclddp5adjwwj21sp46gbhjydxc3w7vs1siw0ivq2"; + src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "0l7bbmhvgz12nq52nmvgs1qmcknikw8f2dn9l93ijb1sr495fygl"; + sha256 = "1zwr09lrrc3xx3sp00vs30ks0n77d7v0xkz0mz9jy2qdls9nfmrv"; }; patches = [ ./fix-shell-path.patch ]; + prePatch = '' + # Remove some tests that can't work during a nix build + + # Requires to run in a git repo + sed -i "s/func TestCacheArchiverAddingUntrackedFiles/func OFF_TestCacheArchiverAddingUntrackedFiles/" commands/helpers/file_archiver_test.go + sed -i "s/func TestCacheArchiverAddingUntrackedUnicodeFiles/func OFF_TestCacheArchiverAddingUntrackedUnicodeFiles/" commands/helpers/file_archiver_test.go + + # No writable developer environment + rm common/build_test.go + rm executors/custom/custom_test.go + + # No docker during build + rm executors/docker/terminal_test.go + rm executors/docker/docker_test.go + rm helpers/docker/auth/auth_test.go + ''; + + preCheck = '' + # Make the tests pass outside of GitLab CI + export CI=0 + ''; + meta = with lib; { description = "GitLab Runner the continuous integration executor of GitLab"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix index 2b61d377e9fc..9c87c5f08f4c 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.319.3"; + version = "2.332.1"; src = fetchurl { url = "http://get.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "sha256-c92Rs5W89i/iXm0wdHZfFRDJ5YTswen69EBRBkGBtDQ="; + sha256 = "0xrrqdwfz19mr4wl4sdzk0qnq9rjdh65vd1386qsn6a4axwv652s"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/convco/default.nix b/nixpkgs/pkgs/development/tools/convco/default.nix index f137cbd078bc..6094df8757a0 100644 --- a/nixpkgs/pkgs/development/tools/convco/default.nix +++ b/nixpkgs/pkgs/development/tools/convco/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "convco"; - version = "0.3.8"; + version = "0.3.9"; src = fetchFromGitHub { owner = "convco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sNVl+bbCj3vPYz4wKOaAHeaPCCubG4XvXZ+AZijhFJE="; + sha256 = "sha256-ys7fuaD1jj3tWD6U+BRvqFneZEdKV5c1RO2FLEtqIUk="; }; - cargoSha256 = "sha256-FHiX9XpNjBFfs9fwi3Wzq7bAwRi7e/sqtji5WWPA5Qo="; + cargoSha256 = "sha256-5/uF0aPNNNUruRF8euuEnGSJHsRehSZipa0677zc12c="; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/development/tools/coursier/default.nix b/nixpkgs/pkgs/development/tools/coursier/default.nix index 85f7e603bbb0..c7450f738a1e 100644 --- a/nixpkgs/pkgs/development/tools/coursier/default.nix +++ b/nixpkgs/pkgs/development/tools/coursier/default.nix @@ -2,7 +2,7 @@ , coreutils, git, gnused, nix, nixfmt }: let - version = "2.0.16"; + version = "2.1.0-M1"; zshCompletion = fetchurl { url = @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - sha256 = "sha256-Yx6PvBo763GnEwU5s7AYUs++Au25TF6cZ4WYGgruHpw="; + sha256 = "sha256-JeqWzAkSSqhdbgkse1uSA3k4bupepWuvx6GUtBfodcg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/database/liquibase/default.nix b/nixpkgs/pkgs/development/tools/database/liquibase/default.nix index ec56d582e603..06f4c947b205 100644 --- a/nixpkgs/pkgs/development/tools/database/liquibase/default.nix +++ b/nixpkgs/pkgs/development/tools/database/liquibase/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "liquibase"; - version = "4.7.1"; + version = "4.8.0"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-cHMsBkP5R7rxRZgzzKaHJrFq36xC9PBuzTzc1kHKc4U="; + sha256 = "sha256-dGK26S9wd+GFiGXEA9UvDc4b1m0DsfrpB4FcEIJf6zM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix b/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix index eee49d1c6fcc..48456166b92b 100644 --- a/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix +++ b/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix @@ -10,19 +10,19 @@ rustPlatform.buildRustPackage rec { pname = "prisma-engines"; - version = "3.8.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma-engines"; rev = version; - sha256 = "sha256-pP5gNWRucr2rJqBPBt4Y/akf7tABFWhmr3EWC3/kj+g="; + sha256 = "sha256-0m0RjIasEGB9QxZc7wKCMLnxHXkSlvCDA2QWa87mRRs="; }; # Use system openssl. OPENSSL_NO_VENDOR = 1; - cargoSha256 = "sha256-F105SOFWEhFVGMmPOEdBZwhNHCYkRh1HI7fESzL2uQw="; + cargoSha256 = "sha256-KNQa+wLLl4abz48QKYkWu7A+FTGIyB+1EWAnLuWpJwc="; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix b/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix index ef95263185c9..da43a4daf7d1 100644 --- a/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/nixpkgs/pkgs/development/tools/database/sqldeveloper/default.nix @@ -10,7 +10,7 @@ let desktopName = "Oracle SQL Developer"; genericName = "Oracle SQL Developer"; comment = "Oracle's Oracle DB GUI client"; - categories = "Development;"; + categories = [ "Development" ]; }; in stdenv.mkDerivation { diff --git a/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix b/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix index 7c95565487d8..82b7ea8ea954 100644 --- a/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix +++ b/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - hash = "sha256-ZgLg+pIdTBxMNXgFFL8jCbQa444pkgtnSx+QjMqQhag="; + hash = "sha256-Cem53w/pzSDTi9A9mh9VeLlRn1m6KhkxWaqJjEtfwUs="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/nixpkgs/pkgs/development/tools/database/squirrel-sql/default.nix b/nixpkgs/pkgs/development/tools/database/squirrel-sql/default.nix index 0220e2d61f9d..e908849a3b3a 100644 --- a/nixpkgs/pkgs/development/tools/database/squirrel-sql/default.nix +++ b/nixpkgs/pkgs/development/tools/database/squirrel-sql/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { comment = meta.description; desktopName = "SQuirreL SQL"; genericName = "SQL Client"; - categories = "Development;"; + categories = [ "Development" ]; icon = "squirrel-sql"; }; diff --git a/nixpkgs/pkgs/development/tools/database/webdis/default.nix b/nixpkgs/pkgs/development/tools/database/webdis/default.nix index 83d57ba5c2e4..01cbb22c854c 100644 --- a/nixpkgs/pkgs/development/tools/database/webdis/default.nix +++ b/nixpkgs/pkgs/development/tools/database/webdis/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "webdis"; - version = "0.1.19"; + version = "0.1.20"; src = fetchFromGitHub { owner = "nicolasff"; repo = pname; rev = version; - sha256 = "sha256-Q5tFEuyTfjXaa/0JOpNjzokstKaQPwR1szqdzYrqXxc="; + sha256 = "sha256-QvPawRYmk5HcE4XnI4B4G7AAaN/8cFov9lOa2e++g4A="; }; buildInputs = [ hiredis http-parser jansson libevent ]; diff --git a/nixpkgs/pkgs/development/tools/datree/default.nix b/nixpkgs/pkgs/development/tools/datree/default.nix index b50d348d7dbb..e94917f15d7c 100644 --- a/nixpkgs/pkgs/development/tools/datree/default.nix +++ b/nixpkgs/pkgs/development/tools/datree/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "datree"; - version = "0.15.16"; + version = "0.15.22"; src = fetchFromGitHub { owner = "datreeio"; repo = "datree"; rev = version; - sha256 = "sha256-FIFsx6iSirUY14cn6E7CPhZQKtcgnyZ2fYghrMUx3Lw="; + hash = "sha256-g5u2QQtVmNp01KtUKwC8uoEIuoBDLHsOlRz1Mv0n/y8="; }; - vendorSha256 = "sha256-HaOgRbF3gMsl6PufdB5IZ2sLunvPo4GeObLb7DRSD0o="; + vendorSha256 = "1cvlvlwdk41f145kzifg7rv7ymwhc9k0ck91bn106240rq1igcr0"; ldflags = [ "-s" diff --git a/nixpkgs/pkgs/development/tools/ddosify/default.nix b/nixpkgs/pkgs/development/tools/ddosify/default.nix index 91ce1bb08719..fdec9ad19ed0 100644 --- a/nixpkgs/pkgs/development/tools/ddosify/default.nix +++ b/nixpkgs/pkgs/development/tools/ddosify/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ddosify"; - version = "0.7.3"; + version = "0.7.5"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-urls47jS9Vu64PC/Ie+UTDfg17krs+UegqKub1QaYK4="; + sha256 = "sha256-n9xKg8RN2o20dTsV8a0tAJjmvAlwZ7TF2cTrXx+f49k="; }; vendorSha256 = "sha256-lbo9P2UN9TmUAqyhFdbOHWokoAogVQZihpcOlhmumxU="; diff --git a/nixpkgs/pkgs/development/tools/delve/default.nix b/nixpkgs/pkgs/development/tools/delve/default.nix index 9681bfe75bd2..478ef3b6fc68 100644 --- a/nixpkgs/pkgs/development/tools/delve/default.nix +++ b/nixpkgs/pkgs/development/tools/delve/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "delve"; - version = "1.8.1"; + version = "1.8.2"; goPackagePath = "github.com/go-delve/delve"; excludedPackages = "\\(_fixtures\\|scripts\\|service/test\\)"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "go-delve"; repo = "delve"; rev = "v${version}"; - sha256 = "sha256-GIwu3G8cy2xKqFzN/7d/mbpS+5oGJa3QexoELlEwWRA="; + sha256 = "sha256-rW3uKf5T+ZCjZxVuSFWWXw0mhAW9Y9L83xtU98JTuik="; }; subPackages = [ "cmd/dlv" ]; diff --git a/nixpkgs/pkgs/development/tools/devpi-client/default.nix b/nixpkgs/pkgs/development/tools/devpi-client/default.nix index 2b122326bfe5..863336257251 100644 --- a/nixpkgs/pkgs/development/tools/devpi-client/default.nix +++ b/nixpkgs/pkgs/development/tools/devpi-client/default.nix @@ -1,26 +1,24 @@ { lib +, argon2-cffi-bindings , buildPythonApplication +, check-manifest +, devpi-common +, devpi-server , fetchPypi -# buildInputs +, git , glibcLocales +, mercurial +, mock , pkginfo -, check-manifest -# propagatedBuildInputs -, py -, devpi-common , pluggy -, setuptools -# CheckInputs -, pytest +, py +, pytestCheckHook , pytest-flake8 -, webtest -, mock -, devpi-server -, tox +, setuptools , sphinx +, tox +, webtest , wheel -, git -, mercurial }: buildPythonApplication rec { @@ -29,24 +27,45 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "362eb26e95136a792491861cc2728d14a6309a9d4c4f13a7b9c3e6fd39de58ec"; + hash = "sha256-Ni6ybpUTankkkYYcwnKNFKYwmp1MTxOnucPm/TneWOw="; }; - buildInputs = [ glibcLocales ]; + buildInputs = [ + glibcLocales + ]; - propagatedBuildInputs = [ py devpi-common pluggy setuptools check-manifest pkginfo ]; + propagatedBuildInputs = [ + argon2-cffi-bindings + check-manifest + devpi-common + pkginfo + pluggy + py + setuptools + ]; checkInputs = [ - pytest pytest-flake8 webtest mock - devpi-server tox - sphinx wheel git mercurial + devpi-server + git + mercurial + mock + pytestCheckHook + pytest-flake8 + sphinx + tox + webtest + wheel ]; - # --fast skips tests which try to start a devpi-server improperly - checkPhase = '' - HOME=$TMPDIR py.test --fast + preCheck = '' + export HOME=$(mktemp -d); ''; + pytestFlagsArray = [ + # --fast skips tests which try to start a devpi-server improperly + "--fast" + ]; + LC_ALL = "en_US.UTF-8"; __darwinAllowLocalNetworking = true; @@ -57,5 +76,4 @@ buildPythonApplication rec { license = licenses.mit; maintainers = with maintainers; [ lewo makefu ]; }; - } diff --git a/nixpkgs/pkgs/development/tools/dockle/default.nix b/nixpkgs/pkgs/development/tools/dockle/default.nix index b647505fe4bf..d117d9319d88 100644 --- a/nixpkgs/pkgs/development/tools/dockle/default.nix +++ b/nixpkgs/pkgs/development/tools/dockle/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dockle"; - version = "0.4.3"; + version = "0.4.5"; src = fetchFromGitHub { owner = "goodwithtech"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0yeHxQW6zX8Mh9JBmp915czEZCmbIom/KYHWLc/O6NY="; + sha256 = "sha256-QC0WAM+qitee0dyJorl5Hio3COy4JiIHmFgBIj7S2yM="; }; - vendorSha256 = "sha256-klTIGmMKA6gp1strgvKnVBtYGQu2407UwxZ8brdGEkQ="; + vendorSha256 = "sha256-9n/782uKu7qNV/WEpbEV3aHcPXipyOhGdAhT/F4O2xc="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ btrfs-progs lvm2 ]; diff --git a/nixpkgs/pkgs/development/tools/dprint/default.nix b/nixpkgs/pkgs/development/tools/dprint/default.nix index 87e1ca02745b..f2bd4bb1b2a2 100644 --- a/nixpkgs/pkgs/development/tools/dprint/default.nix +++ b/nixpkgs/pkgs/development/tools/dprint/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "dprint"; - version = "0.22.0"; + version = "0.22.2"; src = fetchCrate { inherit pname version; - sha256 = "sha256-sE5Ojm4ZkMNQ6ihaT5GGRjqqJ6gEvoMaliMbRSkS8wI="; + sha256 = "sha256-iYqQABXd3Vra+U7cfGKBEyTXfQGwHxFSxEoDyCfKk5Y="; }; - cargoSha256 = "sha256-KQLoF0yvlZaQIn50WlmlfHsIYjgca6odCnhmWG2au2U="; + cargoSha256 = "sha256-QMOS8Pn3RwZZRtKqp077ihh91Q4VPe8alrtQ6dYIXmA="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/nixpkgs/pkgs/development/tools/earthly/default.nix b/nixpkgs/pkgs/development/tools/earthly/default.nix index cd324ae387d2..477b28b6a1fe 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.6.8"; + version = "0.6.10"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - sha256 = "sha256-VXBDgBcByONEOznUVbzxySE7rcevIwCk8rVxRxhF0Gc="; + sha256 = "sha256-CzVcoIvf9sqomua5AJtNpCnGfPmCNJMwex/l7p+hEfw="; }; - vendorSha256 = "sha256-6lzusbfedDJESJIxsTVGoRnjdtPnMSDdL2OjXIFFL04="; + vendorSha256 = "sha256-uUx9C7uEdXjhDWxehGHuhuFQXdUjZAXK3qogESkRm8E="; ldflags = [ "-s" "-w" diff --git a/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix b/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix index 01146542d0cc..7408b35fe5ad 100644 --- a/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix +++ b/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { comment = "Eclipse Memory Analyzer"; desktopName = "Eclipse MAT"; genericName = "Java Memory Analyzer"; - categories = "Development;"; + categories = [ "Development" ]; }; unpackPhase = '' diff --git a/nixpkgs/pkgs/development/tools/efm-langserver/default.nix b/nixpkgs/pkgs/development/tools/efm-langserver/default.nix index 96a8d694e778..29304d7d2654 100644 --- a/nixpkgs/pkgs/development/tools/efm-langserver/default.nix +++ b/nixpkgs/pkgs/development/tools/efm-langserver/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "efm-langserver"; - version = "0.0.40"; + version = "0.0.41"; src = fetchFromGitHub { owner = "mattn"; repo = "efm-langserver"; rev = "v${version}"; - sha256 = "sha256-0C7iSWO7zzOhPgzxj9k2MK6poi4XaCbMjTGah3ohVJg="; + sha256 = "sha256-0s6GmMbjtXGUcChzc8Pkqvmt3iU5uDUqe76OUDngboU="; }; vendorSha256 = "sha256-tca+1SRrFyvU8ttHmfMFiGXd1A8rQSEWm1Mc2qp0EfI="; diff --git a/nixpkgs/pkgs/development/tools/electron/default.nix b/nixpkgs/pkgs/development/tools/electron/default.nix index df55b51a0ada..655ad71e7b23 100644 --- a/nixpkgs/pkgs/development/tools/electron/default.nix +++ b/nixpkgs/pkgs/development/tools/electron/default.nix @@ -83,33 +83,33 @@ rec { headers = "0rxbij6qvi0xzcmbxf3fm1snvakaxp9c512z9ni36y98sgg4s3l8"; }; - electron_15 = mkElectron "15.3.7" { - armv7l-linux = "1cc5ce2ab6d795271f54e67a78eec607c0a14761ee1177078a157abad7aa61e6"; - aarch64-linux = "caf7146c738207b78ea63e95fa055f36829bb360e2d81fce10513fae238f2750"; - x86_64-linux = "e424dded1ac545634128bfb5c6195807aa96b7761be95f52ed760886f42874cc"; - i686-linux = "9f1898f9c96672076a87ca559dd11788964347fd17316f0c24f75c9c53985ce5"; - x86_64-darwin = "282f8737fdc73a3ddc82f56b4affc9f6fefec1b233e532e08d206344b657cd8a"; - aarch64-darwin = "d64e12c680d60b535fea7de4322504db04a83e63e8557d8e9b3677a334911752"; - headers = "0nfk75r72p5dgz0rdyqfqjmlwn2wlgn7h93a1v5ghjpwn1rp89m7"; + electron_15 = mkElectron "15.4.0" { + armv7l-linux = "40c073a3b416f83264327bdf5e33b334ffcd56a729ef237360d66f520f670d16"; + aarch64-linux = "ef18ba74b4fa34a26f9ee819bb908c60d0dd9ec2048414629979760f262d72f8"; + x86_64-linux = "5bdea4cbf5559491e9ad9f365fa6f7ec26603fd6f68bfa8848f2884ebd51662d"; + i686-linux = "636d0e28bb20ca127c9b8722fe39e7e7d95fc63bd15b156b7af563296b3d9595"; + x86_64-darwin = "8a132b2be0f27c7e8fa9a91a8b4b0fcdf3ec571c721cb5f5610dc8a6b3f0fd26"; + aarch64-darwin = "82b29c37a427464a9278d617435ca19f472b00689c9e58163e99f30b90f33046"; + headers = "0fc1sck7g160klpqzfcqv9zc45ia914mrncyma58zzcbzpk6k6yb"; }; - electron_16 = mkElectron "16.0.9" { - armv7l-linux = "7071f18230f5d4bbf84d3f1955056f2a6952e5487dfdecb51708e419c0b1a594"; - aarch64-linux = "a7873d1cb2b632c9c48a6942bf4a436463c07cc488f4b0b4575e0e4a496c357d"; - x86_64-linux = "06d57bc1e59ebe046d5731d64eb67c41e793731e67aefbf33f4e3c23139285d4"; - i686-linux = "8603545bdaec512380050ce6f9f1ef283514b960c8d6c8682eaa6563d93705b2"; - x86_64-darwin = "d092af5e5fddb295e9ebb9b639006deec125b1f6b30896d22e98b84e5a74af40"; - aarch64-darwin = "62fd4d033fd0ad62d1c13ac219bd68e76b1625c305097c7aa2ab799f45c9e879"; - headers = "0d0jkjjfq32j09bjlpmx1hvi20rh8yfkfm7hfcv3xs831physbj5"; + electron_16 = mkElectron "16.0.10" { + armv7l-linux = "1a72fe59011cfcc1f376f2948dd5a70d2f75d6c12fb682a0246d2e596227b5e0"; + aarch64-linux = "46cd1393816364a666ead410505bce4b51d68ce872446a71d16886b88c4b275a"; + x86_64-linux = "3b4779e41e27200ce5fa94d20f9df05ff5c757be6805eb0e8952fe198d66f324"; + i686-linux = "9e1426a8135d3fe195ba9fc1a5ea5ad4d5ce96bd513691897b39106698e3c3c8"; + x86_64-darwin = "00b0222efa67fbb29f723fabebc4221646ebd6d5fdc09524df9a203f63ce660c"; + aarch64-darwin = "1203f6ec4e8b97312254ceb122ca4399f39ae67bfe1636e426a798c89ec2a9ee"; + headers = "10f6px88vg6napyhniczi6l660qs4l5mm0b9gdlds4i1y94s1zrl"; }; - electron_17 = mkElectron "17.0.1" { - armv7l-linux = "0867f74427152c3b4110e11c9ce38e351531554868f62665b064f3d1dae5fd00"; - aarch64-linux = "7715f7eaaa287f83b945f491c2ca1eb0befed93725d81c85d06f8584db3a6cc4"; - x86_64-linux = "de789f548d6cc2ddff8db53b3bbfaac5631e90f14506935d2d7fafedf82e5adf"; - i686-linux = "4e81ce43552f22e271527d5f7ab84db6dda61c0922f8b6350e44fa52967f2dd9"; - x86_64-darwin = "d270858938e2f0e68479d91384e6f4d01be1d4e22b305dc2023ecd1a5e113d17"; - aarch64-darwin = "aecf14a88ede956e93fee5b48b773ad4d8d6605424c9d69a45950b673c89f8ca"; - headers = "1c3fl9fxmhkhvm825vmyxm8dm89xfy4iwqrb4ifmv5cz9dh9b9a8"; + electron_17 = mkElectron "17.1.0" { + armv7l-linux = "09d92195821aad4ac03fbc858287a7372b6aa059081bb825d267853ee1b0425d"; + aarch64-linux = "6a34d6802d44a391902f53baf0adc8b819d33e7c31b34614757b17b3223c9d1e"; + x86_64-linux = "106ec28a5969366c1e1f642cc33ac41950c68bd182db23b04d7ac6886bfe28e8"; + i686-linux = "19fe206be07a6df7f9f0ecdb411e3cafd3a53618edb19cc6adc77156f698444e"; + x86_64-darwin = "bd80d6b0b62c9bec195d264aa21a255f4324a8b56849e04972c1fcc262757c31"; + aarch64-darwin = "83fe2fc24976d09a0e0fcc3a60226f190cf9b67287fe4434d3d76d59fa45315c"; + headers = "1zv1pigfbis1bsan28wx3bgkdwjc48pjq19wmxs73kd1khsy6w8r"; }; } diff --git a/nixpkgs/pkgs/development/tools/ent/default.nix b/nixpkgs/pkgs/development/tools/ent/default.nix index ba30aa97e094..79470814ada0 100644 --- a/nixpkgs/pkgs/development/tools/ent/default.nix +++ b/nixpkgs/pkgs/development/tools/ent/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ent-go"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "ent"; repo = "ent"; rev = "v${version}"; - sha256 = "sha256-TG08GRo1gNxC5iHt/Md5WVWaEQ1m2mUDGqpuxw8Pavg="; + sha256 = "sha256-MvfbQKGVYWbZkqc3X3BqsB+z2KMkr0gMOquL02qHwUY="; }; - vendorSha256 = "sha256-n5dS78SSBAEgE4/9jMZZhbOQZ3IGi9n3ErA0ioP9Tsg="; + vendorSha256 = "sha256-BF2eD/jOtY1XhZ0hB7f3/frKQYwS9PbuGxum5SSnjzA="; subPackages = [ "cmd/ent" ]; diff --git a/nixpkgs/pkgs/development/tools/esbuild/default.nix b/nixpkgs/pkgs/development/tools/esbuild/default.nix index 82e69c2d91ee..f7335a8ef8da 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.14.23"; + version = "0.14.25"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-7J8l4PCXDSddlUdMYaTo3KQjhUl1IRpks0iMiYxJzD4="; + sha256 = "sha256-95xVQU1AWIDvMlWJpB54RxGoOtZtaUlyfmfdcKERe6Y="; }; vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs="; diff --git a/nixpkgs/pkgs/development/tools/faas-cli/default.nix b/nixpkgs/pkgs/development/tools/faas-cli/default.nix index c4b0b6569533..58e048b4f5fe 100644 --- a/nixpkgs/pkgs/development/tools/faas-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/faas-cli/default.nix @@ -9,15 +9,13 @@ let in buildGoModule rec { pname = "faas-cli"; - # When updating version change rev. - version = "0.14.2"; - rev = "b1c09c0243f69990b6c81a17d7337f0fd23e7542"; + version = "0.14.3"; src = fetchFromGitHub { owner = "openfaas"; repo = "faas-cli"; rev = version; - sha256 = "sha256-OdFd4q5IHu4FjNArcqVt4dNyLWegR4GdAyyCzgNIU+Q="; + sha256 = "sha256-1aflQXfW/y31Dk0OZW77qNQKEwkhi6p8ZBfTUyRDbdo="; }; CGO_ENABLED = 0; @@ -28,7 +26,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/openfaas/faas-cli/version.GitCommit=${rev}" + "-X github.com/openfaas/faas-cli/version.GitCommit=ref/tags/${version}" "-X github.com/openfaas/faas-cli/version.Version=${version}" "-X github.com/openfaas/faas-cli/commands.Platform=${faasPlatform stdenv.targetPlatform}" ]; diff --git a/nixpkgs/pkgs/development/tools/frugal/default.nix b/nixpkgs/pkgs/development/tools/frugal/default.nix index f0e125245efa..5cb92b3b834b 100644 --- a/nixpkgs/pkgs/development/tools/frugal/default.nix +++ b/nixpkgs/pkgs/development/tools/frugal/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "frugal"; - version = "3.14.14"; + version = "3.14.15"; src = fetchFromGitHub { owner = "Workiva"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1ie/pkg0pv8bJphQ8PXceRd2WALYaVxBAW1O/s4kKHA="; + sha256 = "sha256-7840HndsU5+mWKQ/HXLVYA2dV7L8NlM7so1nk8Zdc2c="; }; subPackages = [ "." ]; diff --git a/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix b/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix index db9aba705cf6..336c24819baf 100644 --- a/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix +++ b/nixpkgs/pkgs/development/tools/git-quick-stats/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "git-quick-stats"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { repo = "git-quick-stats"; owner = "arzzen"; rev = version; - sha256 = "sha256-uioL4ysioxo+YMCa3VPoUMpY1cVZJ0Jljt8d9jWRT9k="; + sha256 = "sha256-QmHb5MWZpbZjc93XgdPFabgzT7S522ZN27p6tdL46Y0="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/go-bindata/default.nix b/nixpkgs/pkgs/development/tools/go-bindata/default.nix index fc44efca8289..f3a5ab297eeb 100644 --- a/nixpkgs/pkgs/development/tools/go-bindata/default.nix +++ b/nixpkgs/pkgs/development/tools/go-bindata/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "go-bindata"; - version = "3.22.0"; + version = "3.23.0"; goPackagePath = "github.com/kevinburke/go-bindata"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "kevinburke"; repo = pname; rev = "v${version}"; - sha256 = "10dq77dml5jvvq2jkdq81a9yjg7rncq8iw8r84cc3dz6l9hxzj0x"; + sha256 = "sha256-pIEkD0HD/6JFOzkvEG9j9yQP7hLWvmXU3MiyvVFH2rY="; }; subPackages = [ "go-bindata" ]; diff --git a/nixpkgs/pkgs/development/tools/go-swag/default.nix b/nixpkgs/pkgs/development/tools/go-swag/default.nix index 967fbb625a6e..8c340b2ccf6c 100644 --- a/nixpkgs/pkgs/development/tools/go-swag/default.nix +++ b/nixpkgs/pkgs/development/tools/go-swag/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-swag"; - version = "1.7.9-p1"; + version = "1.8.0"; src = fetchFromGitHub { owner = "swaggo"; repo = "swag"; rev = "v${version}"; - sha256 = "sha256-JzPCNUoO3biNJLYKLkyJvVG/L7pqWBthtBuZL+Lc21U="; + sha256 = "sha256-axvc3iwAfsKunheLLKmUThZh27axRh/GJRcKy9EfEBw="; }; vendorSha256 = "sha256-QphjiJSQRULphWjrJ8RzrUblTDYL/fYoSNT3+g0tP48="; diff --git a/nixpkgs/pkgs/development/tools/go-task/default.nix b/nixpkgs/pkgs/development/tools/go-task/default.nix index 05ffe14dd4de..d6e5855d992c 100644 --- a/nixpkgs/pkgs/development/tools/go-task/default.nix +++ b/nixpkgs/pkgs/development/tools/go-task/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-task"; - version = "3.10.0"; + version = "3.11.0"; src = fetchFromGitHub { owner = pname; repo = "task"; rev = "v${version}"; - sha256 = "sha256-E0wMFdLK8lA8oluFQuq7hPMWh4t6OsoJ14d7ErDjAdA="; + sha256 = "sha256-KHeZ0UH7qa+fii+sT7q9ri3DpLOKqQZqCAKQYn4l5M8="; }; - vendorSha256 = "sha256-ClMvbxDKwwoVUC9+AJPZfBxJ26KKuLueUn9Nz/gh4Fs="; + vendorSha256 = "sha256-u+LeH9GijquBeYlA3f2GcyoSP/S7BtBqb8C9OgEA9fY="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/gofumpt/default.nix b/nixpkgs/pkgs/development/tools/gofumpt/default.nix index b807006369e5..2c3922964948 100644 --- a/nixpkgs/pkgs/development/tools/gofumpt/default.nix +++ b/nixpkgs/pkgs/development/tools/gofumpt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gofumpt"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "mvdan"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NkflJwFdVcFTjXkDr8qqAFUlKwGNPTso6hvu7Vikn2U="; + sha256 = "sha256-S6IF/MtNCkhPHHdaQJyT78j2z4xdf4z/xLfXDmCWR2Y="; }; - vendorSha256 = "sha256-RZPfdj+rimKGvRZKaXOirkd7ietri55rBofwa/l2z8s="; + vendorSha256 = "sha256-LhiCxpjySEezhcgICfgD+mABd1QXyZn3uI1Fj+eWiyo="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/gopls/default.nix b/nixpkgs/pkgs/development/tools/gopls/default.nix index ae813c0f6ee9..0f57be390f2e 100644 --- a/nixpkgs/pkgs/development/tools/gopls/default.nix +++ b/nixpkgs/pkgs/development/tools/gopls/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gopls"; - version = "0.7.5"; + version = "0.8.0"; src = fetchFromGitHub { owner = "golang"; repo = "tools"; rev = "gopls/v${version}"; - sha256 = "sha256-2+tbwFkT3Z2dfYCs1Fd/9IqD39VuTMGHQ43b7gBBktM="; + sha256 = "sha256-VBan3IKqf3AFrPoryT/U7lGabFHSXMhaBpnNw3LRH/I="; }; modRoot = "gopls"; - vendorSha256 = "sha256-8osb5C5G58x9KWCxqiepmN6J0jp+q6aR+As/pJeeTKM="; + vendorSha256 = "sha256-pW4G89fYFwVM2EkIqTCsl2lhN677LIMFpKPvLVV2boY="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/gosec/default.nix b/nixpkgs/pkgs/development/tools/gosec/default.nix index a7eb80366c4c..d9e19fdac90e 100644 --- a/nixpkgs/pkgs/development/tools/gosec/default.nix +++ b/nixpkgs/pkgs/development/tools/gosec/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gosec"; - version = "2.9.6"; + version = "2.10.0"; src = fetchFromGitHub { owner = "securego"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eDzLVoOPYm8WG07dfi6s+xtBliCwf1LXoHxQ10YWs1A="; + sha256 = "sha256-a3MDGsTqndHlT6fbUkdsBShDqWXOHQiJFUIjyMqvMq8="; }; - vendorSha256 = "sha256-ELfbdrMMeK6ZG+hnibhHNB+k/Zvkepl+cbUx+E/Dvr8="; + vendorSha256 = "sha256-3ZGzVGKwnNab8wUn0fRepl4FDo43MAqNAO3zijH90/0="; subPackages = [ "cmd/gosec" diff --git a/nixpkgs/pkgs/development/tools/haskell/vaultenv/default.nix b/nixpkgs/pkgs/development/tools/haskell/vaultenv/default.nix index 72d5469f0f99..4f51c8238ce0 100644 --- a/nixpkgs/pkgs/development/tools/haskell/vaultenv/default.nix +++ b/nixpkgs/pkgs/development/tools/haskell/vaultenv/default.nix @@ -28,13 +28,13 @@ }: mkDerivation rec { pname = "vaultenv"; - version = "0.13.3"; + version = "0.14.0"; src = fetchFromGitHub { owner = "channable"; repo = "vaultenv"; rev = "v${version}"; - sha256 = "sha256-17tdlqG8z4GviI7kkLbktC6SqnQFDdZhWtejscG0n48="; + sha256 = "sha256-sH4iaKQXgwI/WISXzMR7xqh9Dyx61U/gjYn7exgUetI="; }; buildTools = [ hpack ]; diff --git a/nixpkgs/pkgs/development/tools/java/visualvm/default.nix b/nixpkgs/pkgs/development/tools/java/visualvm/default.nix index 7f89961f9f80..ee72bc62efae 100644 --- a/nixpkgs/pkgs/development/tools/java/visualvm/default.nix +++ b/nixpkgs/pkgs/development/tools/java/visualvm/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { comment = "Java Troubleshooting Tool"; desktopName = "VisualVM"; genericName = "Java Troubleshooting Tool"; - categories = "Development;"; + categories = [ "Development" ]; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/jless/default.nix b/nixpkgs/pkgs/development/tools/jless/default.nix index f18f3f556c58..558c9e019e19 100644 --- a/nixpkgs/pkgs/development/tools/jless/default.nix +++ b/nixpkgs/pkgs/development/tools/jless/default.nix @@ -1,21 +1,27 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform, stdenv, python3, AppKit, libxcb }: rustPlatform.buildRustPackage rec { pname = "jless"; - version = "0.7.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "PaulJuliusMartinez"; repo = "jless"; rev = "v${version}"; - sha256 = "sha256-IK+EllkctdhIYuzj7eLjadxKoutICPeSXAjLMFiRjmo="; + sha256 = "sha256-NB/s29M46mVhTsJWFYnBgJjSjUVbfdmuz69VdpVuR7c="; }; - cargoSha256 = "sha256-CAyKWwtMq5UOODVRrpVHrhlep2wqG434dMGeYV2FSZY="; + cargoSha256 = "sha256-cPj9cTRhWK/YU8Cae63p4Vm5ohB1IfGL5fu7yyFGSXA="; + + nativeBuildInputs = lib.optionals stdenv.isLinux [ python3 ]; + + buildInputs = [ ] + ++ lib.optionals stdenv.isDarwin [ AppKit ] + ++ lib.optionals stdenv.isLinux [ libxcb ]; meta = with lib; { description = "A command-line pager for JSON data"; - homepage = "https://github.com/PaulJuliusMartinez/jless"; + homepage = "https://jless.io"; license = licenses.mit; maintainers = with maintainers; [ jfchevrette zowoq ]; }; diff --git a/nixpkgs/pkgs/development/tools/jpexs/default.nix b/nixpkgs/pkgs/development/tools/jpexs/default.nix index 37d1cf7dc2e4..8c0d20d328d2 100644 --- a/nixpkgs/pkgs/development/tools/jpexs/default.nix +++ b/nixpkgs/pkgs/development/tools/jpexs/default.nix @@ -36,10 +36,8 @@ stdenv.mkDerivation rec { desktopName = "JPEXS Free Flash Decompiler"; genericName = "Flash Decompiler"; comment = meta.description; - categories = "Development;Java;"; - extraEntries = '' - StartupWMClass=com-jpexs-decompiler-flash-gui-Main - ''; + categories = [ "Development" "Java" ]; + startupWMClass = "com-jpexs-decompiler-flash-gui-Main"; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/tools/jql/default.nix b/nixpkgs/pkgs/development/tools/jql/default.nix index 7af7e36b223f..732175edab9c 100644 --- a/nixpkgs/pkgs/development/tools/jql/default.nix +++ b/nixpkgs/pkgs/development/tools/jql/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "jql"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "yamafaktory"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mFTJJCoC5nxo5ugJdi+MmssV70yKrQQsH+a+K7hTyS8="; + sha256 = "sha256-CntAxOsAaKkCvQanLZ4d99VEGrbsVM+IYOhUuimvjlA="; }; - cargoSha256 = "sha256-aclfFy2tQL57EaIsg1e30JCF5nX2Cm/MaxeSPtR/Uas="; + cargoSha256 = "sha256-mzHLAmm0wvF35ku+wg6QG/pKwIFjb22fOtBmMhgC0Ik="; meta = with lib; { description = "A JSON Query Language CLI tool built with Rust"; diff --git a/nixpkgs/pkgs/development/tools/just/default.nix b/nixpkgs/pkgs/development/tools/just/default.nix index 59b61135fae6..29694c08ed8d 100644 --- a/nixpkgs/pkgs/development/tools/just/default.nix +++ b/nixpkgs/pkgs/development/tools/just/default.nix @@ -1,30 +1,29 @@ -{ lib, fetchFromGitHub, stdenv, rustPlatform, coreutils, bash, installShellFiles, libiconv }: +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, coreutils +, bash +, installShellFiles +, libiconv +}: rustPlatform.buildRustPackage rec { pname = "just"; - version = "0.11.2"; + version = "1.1.0"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = version; - sha256 = "sha256-9lC3vegfxEACoX25ebcLQU453IYy1zQf1K84YyLEnlU="; + sha256 = "sha256-hbBAbk0n80BbbIx81427bRz4x6enBsxJ0bHJKww44oc="; }; - cargoSha256 = "sha256-cTAbAnSqvrc6e9NtbiV7caj1JnQReWMUhCQoFXZ7Nbs="; + cargoSha256 = "sha256-lZyFoOCWUE2ahU/lS+bIdrZXNm/sFEfLsQm1BxREg5w="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; - postInstall = '' - installManPage man/just.1 - - installShellCompletion --cmd just \ - --bash completions/just.bash \ - --fish completions/just.fish \ - --zsh completions/just.zsh - ''; - checkInputs = [ coreutils bash ]; preCheck = '' @@ -49,10 +48,17 @@ rustPlatform.buildRustPackage rec { "--skip=edit" # trying to run "vim" fails as there's no /usr/bin/env or which in the sandbox to find vim and the dependency is not easily patched "--skip=run_shebang" # test case very rarely fails with "Text file busy" "--skip=invoke_error_function" # wants JUST_CHOOSER to be fzf - "--skip=status_error" # "exit status" instead of "exit code" - "--skip=exit_status" # "exit status" instead of "exit code" ]; + postInstall = '' + installManPage man/just.1 + + installShellCompletion --cmd just \ + --bash completions/just.bash \ + --fish completions/just.fish \ + --zsh completions/just.zsh + ''; + meta = with lib; { homepage = "https://github.com/casey/just"; changelog = "https://github.com/casey/just/blob/${version}/CHANGELOG.md"; diff --git a/nixpkgs/pkgs/development/tools/mani/default.nix b/nixpkgs/pkgs/development/tools/mani/default.nix index 079e4bf6fedc..aa047c2471c7 100644 --- a/nixpkgs/pkgs/development/tools/mani/default.nix +++ b/nixpkgs/pkgs/development/tools/mani/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "mani"; - version = "0.12.0"; + version = "0.12.2"; src = fetchFromGitHub { owner = "alajmo"; repo = "mani"; rev = "v${version}"; - sha256 = "sha256-EkoDyVDK+DmwK45qBPwyHegQGsK9B5SQ0zVf1lBYbPE="; + sha256 = "sha256-sjudHGqSCgwafyT8alrGvTdC3yM2zmbRcYshxSm23Ko="; }; vendorSha256 = "sha256-NnXQAf8m2cGLvwSOzQWXffiG1zyVqDPQnGAeqe7EUHY="; diff --git a/nixpkgs/pkgs/development/tools/mars-mips/default.nix b/nixpkgs/pkgs/development/tools/mars-mips/default.nix index 97ffd564c45c..fa98ab9da8f1 100644 --- a/nixpkgs/pkgs/development/tools/mars-mips/default.nix +++ b/nixpkgs/pkgs/development/tools/mars-mips/default.nix @@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation rec { exec = "mars-mips"; icon = "mars-mips"; comment = "An IDE for programming in MIPS assembly language"; - categories = "Development;IDE;"; + categories = [ "Development" "IDE" ]; }) ]; diff --git a/nixpkgs/pkgs/development/tools/metals/default.nix b/nixpkgs/pkgs/development/tools/metals/default.nix index 3d4eb2c7788f..a4fd0ee23380 100644 --- a/nixpkgs/pkgs/development/tools/metals/default.nix +++ b/nixpkgs/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "0.11.1"; + version = "0.11.2"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-wYIuRTvkPqS4SE5RnkBgmLCwmNv+cYB/iPb9TYip9s0="; + outputHash = "sha256-sriiHgKs2hC8inBGWuLM9qFfGgtcYqKHh0VZWNmg51U="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/minizinc/default.nix b/nixpkgs/pkgs/development/tools/minizinc/default.nix index 06a6bd3dfd54..131c899dcfb9 100644 --- a/nixpkgs/pkgs/development/tools/minizinc/default.nix +++ b/nixpkgs/pkgs/development/tools/minizinc/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake, flex, bison }: stdenv.mkDerivation rec { pname = "minizinc"; - version = "2.5.5"; + version = "2.6.1"; nativeBuildInputs = [ cmake flex bison ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "MiniZinc"; repo = "libminizinc"; rev = version; - sha256 = "sha256-9z2E6KqOys9UUXlXWB4eDhg34kS3PhUB1Dd1F6iGYoE="; + sha256 = "sha256-JCR2wvtMNyHBIIqrH5eBc0CIOVyo8mnPUZXtwjJt3sw="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/tools/misc/ccache/default.nix b/nixpkgs/pkgs/development/tools/misc/ccache/default.nix index 10e11391cd35..8b5e61580590 100644 --- a/nixpkgs/pkgs/development/tools/misc/ccache/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/ccache/default.nix @@ -15,13 +15,13 @@ let ccache = stdenv.mkDerivation rec { pname = "ccache"; - version = "4.5.1"; + version = "4.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-AmzfBuase3RDoRVswyIgBnyL5TK0LXEGmYIpDzsCwgs="; + sha256 = "011i1aczv4nixq4gvjixcd73df2xplcrldfv0w12yaz5iy4vaw6b"; }; outputs = [ "out" "man" ]; diff --git a/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix b/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix index ef5b276adaa2..5184f22aecdc 100644 --- a/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.16737"; + version = "0.1.16947"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2dgoREWGA+YpsESUmua5HcJu6Z/lEhzBdakx97xfLFk="; + sha256 = "sha256-RGkC1XhrssrX4IBh1OrzEowvbPPUK7jXZxxa+FEV/WE="; }; vendorSha256 = "sha256-7u2y1yBVpXf+D19tslD4s3B1KmABl4OWNzzLaBNL/2U="; diff --git a/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix b/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix index 4841c48d0ee2..6a372fb40f19 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 @@ buildGraalvmNativeImage rec { pname = "clojure-lsp"; - version = "2022.02.01-16.53.14"; + version = "2022.02.23-12.12.12"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-VyDnDlK40Sj/0cethclnRlKc5tOentAEUzjDOqbItpo="; + sha256 = "sha256-PfO1G66Z3zQ+Hyjb6J0bomsT8juQURwF2mPKJY5auMw="; }; jar = fetchurl { url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp-standalone.jar"; - sha256 = "sha256-gIG8sjf55aRo4xI/RFrxhzLSD6RHzn/YGG9+gWrXcgE="; + sha256 = "sha256-f8bEALl9j0aDkKZtThLTseqibeYIUeOx4ulelPWQkoo="; }; extraNativeImageBuildArgs = [ diff --git a/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/default.nix b/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/default.nix index d746a6d1ff33..c49fb15610e3 100644 --- a/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/default.nix @@ -17,12 +17,12 @@ let stdenvNoCC.mkDerivation rec { pname = "coreboot-toolchain-${arch}"; - version = "4.15"; + version = "4.16"; src = fetchgit { url = "https://review.coreboot.org/coreboot"; rev = version; - sha256 = "1qsb2ca22h5f0iwc254qsfm7qcn8967ir8aybdxa1pakgmnfsyp9"; + sha256 = "073n8yid3v0l9wgwnrdqrlgzaj9mnhs33a007dgr7xq3z0iw3i52"; fetchSubmodules = false; leaveDotGit = true; postFetch = '' diff --git a/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/stable.nix b/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/stable.nix index 9460353873e4..64ee3da1ad92 100644 --- a/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/stable.nix +++ b/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/stable.nix @@ -35,10 +35,10 @@ }; } { - name = "acpica-unix2-20210331.tar.gz"; + name = "acpica-unix2-20211217.tar.gz"; archive = fetchurl { - sha256 = "1h98pvc9iy1c49cid0ppjwk5zsy2m1xbvfqb72pkwkrd4rn35arx"; - url = "https://acpica.org/sites/acpica/files/acpica-unix2-20210331.tar.gz"; + sha256 = "0521hmaw2zhi0mpgnaf2i83dykfgql4bx98cg7xqy8wmj649z194"; + url = "https://acpica.org/sites/acpica/files/acpica-unix2-20211217.tar.gz"; }; } { diff --git a/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/update.sh b/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/update.sh index d4c348a5d0c7..3acf22e2cd7d 100755 --- a/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/update.sh +++ b/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/update.sh @@ -8,7 +8,7 @@ fi pkg_dir="$(dirname "$0")" -src="$(nix-build . --no-out-link -A coreboot-toolchain.src)" +src="$(nix-build . --no-out-link -A coreboot-toolchain.i386.src)" urls=$($src/util/crossgcc/buildgcc -u) tmp=$(mktemp) diff --git a/nixpkgs/pkgs/development/tools/misc/editorconfig-core-c/default.nix b/nixpkgs/pkgs/development/tools/misc/editorconfig-core-c/default.nix index eb2e124a35e9..893a1925dd71 100644 --- a/nixpkgs/pkgs/development/tools/misc/editorconfig-core-c/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/editorconfig-core-c/default.nix @@ -1,13 +1,14 @@ -{ lib, stdenv, fetchgit, cmake, pcre, doxygen }: +{ lib, stdenv, fetchFromGitHub, cmake, pcre, doxygen }: stdenv.mkDerivation rec { pname = "editorconfig-core-c"; version = "0.12.1"; - src = fetchgit { - url = "https://github.com/editorconfig/editorconfig-core-c.git"; + src = fetchFromGitHub { + owner = "editorconfig"; + repo = "editorconfig-core-c"; rev = "v${version}"; - sha256 = "0awpb63ci85kal3pnlj2b54bay8igj1rbc13d8gqkvidlb51nnx4"; + sha256 = "sha256-pFsbyqIt7okfaiOwlYN8EXm1SFlCUnsHVbOgyIZZlys="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/development/tools/misc/grcov/default.nix b/nixpkgs/pkgs/development/tools/misc/grcov/default.nix new file mode 100644 index 000000000000..45e1ba8e4bc0 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/misc/grcov/default.nix @@ -0,0 +1,38 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "grcov"; + version = "0.8.7"; + + src = fetchFromGitHub { + owner = "mozilla"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-4McF9tLIjDCftyGI29pm/LnTUBVWG+pY5z+mGFKySQM="; + }; + + cargoSha256 = "sha256-/filuQ4AWsKVIsXbDX7S1yhCArLNTZpOMEn3ID6WuMo="; + + # tests do not find grcov path correctly + checkFlags = let + skipList = [ + "test_coveralls_service_job_id_is_not_sufficient" + "test_coveralls_service_name_is_not_sufficient" + "test_coveralls_works_with_just_service_name_and_job_id_args" + "test_coveralls_works_with_just_token_arg" + "test_integration" + "test_integration_guess_single_file" + "test_integration_zip_dir" + "test_integration_zip_zip" + ]; + skipFlag = test: "--skip " + test; + in builtins.concatStringsSep " " (builtins.map skipFlag skipList); + + meta = with lib; { + description = + "Rust tool to collect and aggregate code coverage data for multiple source files"; + homepage = "https://github.com/mozilla/grcov"; + license = licenses.mpl20; + maintainers = with maintainers; [ DieracDelta ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/misc/hydra/default.nix b/nixpkgs/pkgs/development/tools/misc/hydra/default.nix index 1688e92c8441..27ff31dae963 100644 --- a/nixpkgs/pkgs/development/tools/misc/hydra/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/hydra/default.nix @@ -9,6 +9,7 @@ rev = "9bce425c3304173548d8e822029644bb51d35263"; sha256 = "sha256-tGzwKNW/odtAYcazWA9bPVSmVXMGKfXsqCA1UYaaxmU="; }; + patches = [ ./eval.patch ]; nix = nixVersions.unstable; tests = { diff --git a/nixpkgs/pkgs/development/tools/misc/hydra/eval.patch b/nixpkgs/pkgs/development/tools/misc/hydra/eval.patch new file mode 100644 index 000000000000..a1b7599cc2b4 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/misc/hydra/eval.patch @@ -0,0 +1,34 @@ +--- a/src/hydra-eval-jobs/hydra-eval-jobs.cc ++++ b/src/hydra-eval-jobs/hydra-eval-jobs.cc +@@ -64,11 +64,11 @@ + + static std::string queryMetaStrings(EvalState & state, DrvInfo & drv, const string & name, const string & subAttribute) + { +- Strings res; ++ std::list<std::string_view> res; + std::function<void(Value & v)> rec; + + rec = [&](Value & v) { +- state.forceValue(v); ++ state.forceValue(v, noPos); + if (v.type() == nString) + res.push_back(v.string.s); + else if (v.isList()) +@@ -112,7 +112,7 @@ + callFlake(state, lockedFlake, *vFlake); + + auto vOutputs = vFlake->attrs->get(state.symbols.create("outputs"))->value; +- state.forceValue(*vOutputs); ++ state.forceValue(*vOutputs, noPos); + + auto aHydraJobs = vOutputs->attrs->get(state.symbols.create("hydraJobs")); + if (!aHydraJobs) +@@ -191,7 +191,7 @@ + state.forceList(*a->value, *a->pos); + for (unsigned int n = 0; n < a->value->listSize(); ++n) { + auto v = a->value->listElems()[n]; +- state.forceValue(*v); ++ state.forceValue(*v, noPos); + if (v->type() == nString) + job["namedConstituents"].push_back(state.forceStringNoCtx(*v)); + } diff --git a/nixpkgs/pkgs/development/tools/misc/netcoredbg/default.nix b/nixpkgs/pkgs/development/tools/misc/netcoredbg/default.nix index 1907eb8b3637..cb0c1cdc8ec7 100644 --- a/nixpkgs/pkgs/development/tools/misc/netcoredbg/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/netcoredbg/default.nix @@ -24,14 +24,7 @@ let unmanaged = clangStdenv.mkDerivation rec { inherit src pname version; - nativeBuildInputs = [ cmake ]; - - # Building the "unmanaged part" still involves compiling C# code. - preBuild = '' - export HOME=$(mktemp -d) - export DOTNET_CLI_TELEMETRY_OPTOUT=1 - export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 - ''; + nativeBuildInputs = [ cmake dotnet-sdk ]; hardeningDisable = [ "strictoverflow" ]; diff --git a/nixpkgs/pkgs/development/tools/misc/qtspim/default.nix b/nixpkgs/pkgs/development/tools/misc/qtspim/default.nix index 842cf0eb5b49..7329ad509671 100644 --- a/nixpkgs/pkgs/development/tools/misc/qtspim/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/qtspim/default.nix @@ -1,23 +1,17 @@ { lib, stdenv, fetchsvn, wrapQtAppsHook, qtbase, qttools, qmake, bison, flex, ... }: stdenv.mkDerivation rec { pname = "qtspim"; - version = "9.1.22"; + version = "9.1.23"; src = fetchsvn { url = "https://svn.code.sf.net/p/spimsimulator/code/"; - rev = "r739"; - sha256 = "1kazfgrbmi4xq7nrkmnqw1280rhdyc1hmr82flrsa3g1b1rlmj1s"; + rev = "r749"; + sha256 = "0iazl7mlcilrdbw8gb98v868a8ldw2lmkn1xs8hnfvr93l6aj0rp"; }; postPatch = '' cd QtSpim - # Patches from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=qtspim - sed -i 's/zero_imm/is_zero_imm/g' parser_yacc.cpp - sed -i 's/^int data_dir/bool data_dir/g' parser_yacc.cpp - sed -i 's/^int text_dir/bool text_dir/g' parser_yacc.cpp - sed -i 's/^int parse_error_occurred/bool parse_error_occurred/g' parser_yacc.cpp - substituteInPlace QtSpim.pro --replace /usr/lib/qtspim/lib $out/lib substituteInPlace menu.cpp \ --replace /usr/lib/qtspim/bin/assistant ${qttools.dev}/bin/assistant \ diff --git a/nixpkgs/pkgs/development/tools/misc/saleae-logic-2/default.nix b/nixpkgs/pkgs/development/tools/misc/saleae-logic-2/default.nix index 4472cae2053a..242d76174ce9 100644 --- a/nixpkgs/pkgs/development/tools/misc/saleae-logic-2/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/saleae-logic-2/default.nix @@ -13,7 +13,7 @@ let comment = "Software for Saleae logic analyzers"; desktopName = "Saleae Logic"; genericName = "Logic analyzer"; - categories = "Development"; + categories = [ "Development" ]; }; in appimageTools.wrapType2 { diff --git a/nixpkgs/pkgs/development/tools/misc/saleae-logic/default.nix b/nixpkgs/pkgs/development/tools/misc/saleae-logic/default.nix index 5943b57d8088..487445e0fc35 100644 --- a/nixpkgs/pkgs/development/tools/misc/saleae-logic/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/saleae-logic/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { comment = "Software for Saleae logic analyzers"; desktopName = "Saleae Logic"; genericName = "Logic analyzer"; - categories = "Development"; + categories = [ "Development" ]; }; nativeBuildInputs = [ unzip ]; diff --git a/nixpkgs/pkgs/development/tools/misc/sipp/default.nix b/nixpkgs/pkgs/development/tools/misc/sipp/default.nix index 22bf244662b3..0d5ceba12530 100644 --- a/nixpkgs/pkgs/development/tools/misc/sipp/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/sipp/default.nix @@ -1,29 +1,29 @@ -{lib, stdenv, fetchurl, ncurses, libpcap }: +{ lib, stdenv, fetchurl, ncurses, libpcap, cmake, openssl, git, lksctp-tools }: stdenv.mkDerivation rec { - version = "3.6.0"; - + version = "3.6.1"; pname = "sipp"; src = fetchurl { url = "https://github.com/SIPp/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "1fx1iy2n0m2kr91n1ii30frbscq375k3lqihdgvrqxn0zq8pnzp4"; + sha256 = "sha256-alYOg6/5gvMx3byt+zvVMMWJbNW3V91utoITPMhg7LE="; }; postPatch = '' - sed -i "s@pcap/\(.*\).pcap@$out/share/pcap/\1.pcap@g" src/scenario.cpp + cp version.h src/version.h ''; - configureFlags = [ - "--with-pcap" + cmakeFlags = [ + "-DUSE_GSL=1" + "-DUSE_PCAP=1" + "-DUSE_SSL=1" + "-DUSE_SCTP=${if stdenv.isLinux then "1" else "0"}" ]; + enableParallelBuilding = true; - postInstall = '' - mkdir -pv $out/share/pcap - cp pcap/* $out/share/pcap - ''; - - buildInputs = [ncurses libpcap]; + nativeBuildInputs = [ cmake git ]; + buildInputs = [ ncurses libpcap openssl ] + ++ lib.optional (stdenv.isLinux) lksctp-tools; meta = with lib; { homepage = "http://sipp.sf.net"; @@ -32,4 +32,3 @@ stdenv.mkDerivation rec { platforms = platforms.unix; }; } - diff --git a/nixpkgs/pkgs/development/tools/misc/svls/default.nix b/nixpkgs/pkgs/development/tools/misc/svls/default.nix index 13b529147995..2e3075c7b128 100644 --- a/nixpkgs/pkgs/development/tools/misc/svls/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/svls/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "svls"; - version = "0.1.27"; + version = "0.2.0"; src = fetchFromGitHub { owner = "dalance"; repo = "svls"; rev = "v${version}"; - sha256 = "sha256-+/4D0pRZs1Gy6DJnsDZA8wWi1FKhr7gRS0oq1TyWpuE="; + sha256 = "sha256-WZuFYiPV6HbBH9QT4h9FbnmkbFBadUaV0HujiQ0hu7I="; }; - cargoSha256 = "sha256-xkRlUXlkXQwvzIuhExf+tSSBi+8BZv58btvln05UI+k="; + cargoSha256 = "sha256-tafxN3ots1UTSv950NlwCs6TItMnKz5tn5vw7PTcARU="; meta = with lib; { description = "SystemVerilog language server"; diff --git a/nixpkgs/pkgs/development/tools/misc/texlab/default.nix b/nixpkgs/pkgs/development/tools/misc/texlab/default.nix index 5f969721aaf7..8cf86d9d782e 100644 --- a/nixpkgs/pkgs/development/tools/misc/texlab/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/texlab/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "3.3.1"; + version = "3.3.2"; src = fetchFromGitHub { owner = "latex-lsp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HX1Mnzq+GsRnUsJERK5gPI5x4op885t+9Vn6vogSK1o="; + sha256 = "sha256-SpfX/3uM1y8skN5BqudUtswkCpinrmHWT7ixbgg8QNI="; }; - cargoSha256 = "sha256-AdzaLqwONI7WEcL8U0OGuyX/pg+BpZbJz9aaSClo47Q="; + cargoSha256 = "sha256-0YipSDKss8qaINkUw9dW8n0fVKp4FmagI9+9jFyXaLA="; outputs = [ "out" "man" ]; diff --git a/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix b/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix index af10523e3b04..3c191d7c6a91 100644 --- a/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, cmake, python2 }: +{ lib, stdenv, fetchFromGitHub, cmake, python3 }: stdenv.mkDerivation rec { pname = "uncrustify"; - version = "0.72.0"; + version = "0.74.0"; src = fetchFromGitHub { owner = "uncrustify"; repo = "uncrustify"; rev = "uncrustify-${version}"; - sha256 = "sha256-ZVC5tsn2m1uB7EPNJFPLWLZpLSk4WrFOgJvy1KFYqBY="; + sha256 = "0v48vhmzxjzysbf0vhxzayl2pkassvbabvwg84xd6b8n5i74ijxd"; }; - nativeBuildInputs = [ cmake python2 ]; + nativeBuildInputs = [ cmake python3 ]; meta = with lib; { description = "Source code beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA"; diff --git a/nixpkgs/pkgs/development/tools/misc/universal-ctags/default.nix b/nixpkgs/pkgs/development/tools/misc/universal-ctags/default.nix index e443ca7751eb..51ea6302743a 100644 --- a/nixpkgs/pkgs/development/tools/misc/universal-ctags/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/universal-ctags/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "universal-ctags"; - version = "5.9.20210411.0"; + version = "5.9.20220220.0"; src = fetchFromGitHub { owner = "universal-ctags"; repo = "ctags"; rev = "p${version}"; - sha256 = "0c031y0dl2b70pd0mqfbylplf8f27x11b0ch7ljka3rqav0zb1zr"; + sha256 = "1118iq33snxyw1jk8nwvsl08f3zdainksh0yiapzvg0y5906jjjd"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -29,6 +29,11 @@ stdenv.mkDerivation rec { substituteInPlace Tmain/utils.sh \ --replace /bin/echo ${coreutils}/bin/echo + + # Remove git-related housekeeping from check phase + substituteInPlace makefiles/testing.mak \ + --replace "check: tmain units tlib man-test check-genfile" \ + "check: tmain units tlib man-test" ''; postConfigure = '' @@ -37,8 +42,6 @@ stdenv.mkDerivation rec { doCheck = true; - checkFlags = [ "units" ]; - meta = with lib; { description = "A maintained ctags implementation"; homepage = "https://ctags.io/"; diff --git a/nixpkgs/pkgs/development/tools/mold/default.nix b/nixpkgs/pkgs/development/tools/mold/default.nix index 6de56fb47058..db1c13da2f98 100644 --- a/nixpkgs/pkgs/development/tools/mold/default.nix +++ b/nixpkgs/pkgs/development/tools/mold/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "mold"; - version = "1.0.3"; + version = "1.1.1"; src = fetchFromGitHub { owner = "rui314"; repo = pname; rev = "v${version}"; - sha256 = "sha256-L/io0kMYkFVSmOiH6sM/CoibE1rPRwDM0fFddw6kM+4="; + sha256 = "sha256-+uPVt3w3A25JFyENxqhAcjZMRzSowi2uHwGjkeQP8Og="; }; buildInputs = [ zlib openssl ]; diff --git a/nixpkgs/pkgs/development/tools/ocaml/camlidl/default.nix b/nixpkgs/pkgs/development/tools/ocaml/camlidl/default.nix index 1c3da92273ce..5c3153a88493 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/camlidl/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/camlidl/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0483cs66zsxsavcllpw1qqvyhxb39ddil3h72clcd69g7fyxazl5"; }; - buildInputs = [ ocaml ]; + nativeBuildInputs = [ ocaml ]; # build fails otherwise enableParallelBuilding = false; diff --git a/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix b/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix index e94e98d8f723..65debca11c23 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchFromGitHub, ocaml, perl }: if lib.versionOlder ocaml.version "4.02" +|| lib.versionOlder "4.13" ocaml.version then throw "camlp5 is not available for OCaml ${ocaml.version}" else diff --git a/nixpkgs/pkgs/development/tools/ocaml/dune/3.nix b/nixpkgs/pkgs/development/tools/ocaml/dune/3.nix index 59ea9c43512f..f6f45944a816 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/dune/3.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/dune/3.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/fiber-${version}.tbz"; - sha256 = "sha256-o108qIeWMOX0VU/wWdc5bg/UDCT2CCcw/Xx3nFiDbes="; + sha256 = "sha256-1QRJmhZY8Nmcrvv/1zhvLjHUbOynMWcVf+RobEHlcy8="; }; nativeBuildInputs = [ ocaml findlib ]; diff --git a/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix index a08aaac832e3..39f6d5f7aa2d 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix @@ -6,6 +6,8 @@ buildDunePackage rec { version = "3.2.1"; pname = "js_of_ocaml-camlp4"; + useDune2 = false; + src = fetchFromGitHub { owner = "ocsigen"; repo = "js_of_ocaml"; diff --git a/nixpkgs/pkgs/development/tools/ocaml/merlin/4.x.nix b/nixpkgs/pkgs/development/tools/ocaml/merlin/4.x.nix index 831360cd858d..2d030b2d1560 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/merlin/4.x.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/merlin/4.x.nix @@ -57,11 +57,19 @@ buildDunePackage { useDune2 = true; + strictDeps = true; + + nativeBuildInputs = [ + menhir + jq + ]; buildInputs = [ dot-merlin-reader yojson csexp result + menhirSdk + menhirLib ]; doCheck = true; @@ -71,12 +79,6 @@ buildDunePackage { dune runtest # filtering with -p disables tests runHook postCheck ''; - checkInputs = [ - jq - menhir - menhirLib - menhirSdk - ]; meta = with lib; { description = "An editor-independent tool to ease the development of programs in OCaml"; diff --git a/nixpkgs/pkgs/development/tools/ocaml/merlin/default.nix b/nixpkgs/pkgs/development/tools/ocaml/merlin/default.nix index 1c9b549d6120..3db5d1377831 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/merlin/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/merlin/default.nix @@ -1,5 +1,5 @@ { lib, fetchurl, buildDunePackage, substituteAll -, dot-merlin-reader, dune_2, yojson, csexp, result }: +, dot-merlin-reader, dune_2, yojson, csexp, result, menhirSdk }: buildDunePackage rec { pname = "merlin"; @@ -22,7 +22,9 @@ buildDunePackage rec { }) ]; - buildInputs = [ dot-merlin-reader yojson csexp result ]; + strictDeps = true; + + buildInputs = [ dot-merlin-reader yojson csexp result menhirSdk ]; meta = with lib; { description = "An editor-independent tool to ease the development of programs in OCaml"; diff --git a/nixpkgs/pkgs/development/tools/ocaml/oasis/default.nix b/nixpkgs/pkgs/development/tools/ocaml/oasis/default.nix index 10c7bf63aa41..d35ddbe210bf 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/oasis/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/oasis/default.nix @@ -13,11 +13,15 @@ stdenv.mkDerivation { createFindlibDestdir = true; - buildInputs = + strictDeps = true; + + nativeBuildInputs = [ ocaml findlib ocamlbuild ocamlmod ocamlify ]; + buildInputs = [ ocamlbuild ]; + configurePhase = '' runHook preConfigure ocaml setup.ml -configure --prefix $out diff --git a/nixpkgs/pkgs/development/tools/ocaml/obelisk/default.nix b/nixpkgs/pkgs/development/tools/ocaml/obelisk/default.nix index 0d92840a82be..a37a8c8b3927 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/obelisk/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/obelisk/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, ocamlPackages }: +{ lib, fetchFromGitHub, ocamlPackages, menhir }: ocamlPackages.buildDunePackage rec { pname = "obelisk"; @@ -11,7 +11,10 @@ ocamlPackages.buildDunePackage rec { sha256 = "1jjaqa2b7msl9qd3x7j34vdh1s9alq8hbvzk8a5srb4yyfyim15b"; }; - buildInputs = with ocamlPackages; [ menhir re ]; + strictDeps = true; + + nativeBuildInputs = [ menhir ]; + buildInputs = with ocamlPackages; [ re ]; meta = { description = "A simple tool which produces pretty-printed output from a Menhir parser file (.mly)"; diff --git a/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix b/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix index 5686e33f9b73..517ca6585fe1 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix @@ -28,8 +28,10 @@ let src = }."${version}"; }; ocamlPackages = - if lib.versionAtLeast version "0.17.0" + if lib.versionAtLeast version "0.19.0" then ocaml-ng.ocamlPackages + else if lib.versionAtLeast version "0.17.0" + then ocaml-ng.ocamlPackages_4_12 else if lib.versionAtLeast version "0.14.3" then ocaml-ng.ocamlPackages_4_10 else ocaml-ng.ocamlPackages_4_07 @@ -48,6 +50,12 @@ buildDunePackage { useDune2 = true; + strictDeps = true; + + nativeBuildInputs = [ + menhir + ]; + buildInputs = if lib.versionAtLeast version "0.20.0" then [ @@ -57,7 +65,6 @@ buildDunePackage { either fix fpath - menhir menhirLib menhirSdk ocaml-version @@ -78,7 +85,6 @@ buildDunePackage { uuseg uutf fix - menhir menhirLib menhirSdk ocp-indent @@ -96,7 +102,6 @@ buildDunePackage { uuseg uutf fix - menhir menhirLib menhirSdk dune-build-info @@ -115,7 +120,6 @@ buildDunePackage { uuseg uutf fix - menhir menhirLib menhirSdk dune-build-info @@ -135,7 +139,6 @@ buildDunePackage { uuseg uutf fix - menhir menhirLib menhirSdk (ppxlib.override { version = "0.18.0"; }) @@ -154,7 +157,6 @@ buildDunePackage { uuseg uutf fix - menhir menhirLib menhirSdk ] else [ diff --git a/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix b/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix index 716e2679a94a..1ca8cfb5c52c 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix @@ -13,7 +13,10 @@ buildDunePackage rec { sha256 = "120w72fqymjp6ibicbp31jyx9yv34mdvgkr0zdfpzvfb7lgd8rc7"; }; - buildInputs = [ cppo cmdliner re ]; + strictDeps = true; + + nativeBuildInputs = [ cppo ]; + buildInputs = [ cmdliner re ]; propagatedBuildInputs = [ ocp-indent ]; diff --git a/nixpkgs/pkgs/development/tools/ocaml/utop/default.nix b/nixpkgs/pkgs/development/tools/ocaml/utop/default.nix index 913871314cfe..3e5471db5ae0 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/utop/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/utop/default.nix @@ -1,26 +1,23 @@ { lib, stdenv, fetchurl, ocaml, findlib -, lambdaTerm, cppo, makeWrapper, buildDunePackage +, lambda-term, cppo, makeWrapper, buildDunePackage }: -if !lib.versionAtLeast ocaml.version "4.03" -then throw "utop is not available for OCaml ${ocaml.version}" -else - buildDunePackage rec { pname = "utop"; - version = "2.8.0"; + version = "2.9.0"; useDune2 = true; + minimalOCamlVersion = "4.03"; + src = fetchurl { url = "https://github.com/ocaml-community/utop/releases/download/${version}/utop-${version}.tbz"; - sha256 = "0mi571ifjzq4wcjarn8q1b7yl8nxjm1jfx3afac224lqwn6bhb2d"; + sha256 = "sha256:17jd61bc6pva5wqmnc9xq70ysyjplrzf1p25sq1s7wgrfq2vlyyd"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ cppo ]; + nativeBuildInputs = [ makeWrapper cppo ]; - propagatedBuildInputs = [ lambdaTerm ]; + propagatedBuildInputs = [ lambda-term ]; postFixup = let diff --git a/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix b/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix index 7fd1fff89d20..1099e7cc800c 100644 --- a/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix +++ b/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -98,7 +98,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "OmniSharp based on roslyn workspaces"; homepage = "https://github.com/OmniSharp/omnisharp-roslyn"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.mit; maintainers = with maintainers; [ tesq0 ericdallo corngood ]; }; diff --git a/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix b/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix index 1e805e8932e5..66648faed1d8 100644 --- a/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix +++ b/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "open-policy-agent"; - version = "0.37.2"; + version = "0.38.1"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - sha256 = "sha256-2DkqRKAN7eOTBG6P3YYa5N9oJ0ndm35jIxK7o5Z3dfA="; + sha256 = "sha256-x8mSlZ2X0DdkhaW5QXs5axERJkwARu8tHueQHXfamXM="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/development/tools/operator-sdk/default.nix b/nixpkgs/pkgs/development/tools/operator-sdk/default.nix index cc18a6af2272..0cad56864222 100644 --- a/nixpkgs/pkgs/development/tools/operator-sdk/default.nix +++ b/nixpkgs/pkgs/development/tools/operator-sdk/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "operator-sdk"; - version = "1.17.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "operator-framework"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zgiJDmpjmm2rzi12XAT+bHpiOKwi1k6xd9fvPGwFNXQ="; + sha256 = "sha256-TamtjFnh+HT7JHcRTEpALdkXM9MyZGulb644bNr/BQI="; }; - vendorSha256 = "sha256-kilFwOSIToURJFqfa1/PtdUA21ieJzL9vgsXbYNbht0="; + vendorSha256 = "sha256-uci8/gQqLtjmxxqSlpgZhgBnvMotMvklNfwR+ua8H3M="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/osslsigncode/default.nix b/nixpkgs/pkgs/development/tools/osslsigncode/default.nix index fb4abb21c58b..212a710de6e2 100644 --- a/nixpkgs/pkgs/development/tools/osslsigncode/default.nix +++ b/nixpkgs/pkgs/development/tools/osslsigncode/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "osslsigncode"; - version = "2.2"; + version = "2.3"; src = fetchFromGitHub { owner = "mtrojnar"; repo = pname; rev = version; - sha256 = "sha256-/YKj6JkVbQ4Fz+KSmBIRQ7F7A8fxi5Eg+pvKwhjpGYQ="; + sha256 = "sha256-KJyGDrT3dr8DfjfRrWIENoBFuiWrgQx4qz1V+mT8/yI="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/development/tools/packer/default.nix b/nixpkgs/pkgs/development/tools/packer/default.nix index 0b3b15d85bff..d42bb9e2860a 100644 --- a/nixpkgs/pkgs/development/tools/packer/default.nix +++ b/nixpkgs/pkgs/development/tools/packer/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "packer"; - version = "1.7.10"; + version = "1.8.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "sha256-KkdkLos55n+IE9oIZPADIcSgrE6kn0rDWzEkwoYfoFw="; + sha256 = "sha256-rvOfDMALzZx8LfChgB3nC4GCTlSET43SkhW1EkA59zo="; }; - vendorSha256 = "sha256-oSIwp8t+US8yNziuq0BR8BsVR1/e0jkxE4QuiqyheQQ="; + vendorSha256 = "sha256-ZQ+7F49VnpPtxWlZVBez2mpVCx8gIPEDKBD5qM9NcMo="; subPackages = [ "." ]; @@ -32,7 +32,7 @@ buildGoModule rec { description = "A tool for creating identical machine images for multiple platforms from a single source configuration"; homepage = "https://www.packer.io"; license = licenses.mpl20; - maintainers = with maintainers; [ cstrahan zimbatm ma27 ]; + maintainers = with maintainers; [ cstrahan zimbatm ma27 techknowlogick ]; changelog = "https://github.com/hashicorp/packer/blob/v${version}/CHANGELOG.md"; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/development/tools/packet/default.nix b/nixpkgs/pkgs/development/tools/packet/default.nix index 723e5d8bb2d1..61e9b210683f 100644 --- a/nixpkgs/pkgs/development/tools/packet/default.nix +++ b/nixpkgs/pkgs/development/tools/packet/default.nix @@ -1,25 +1,25 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "packet"; - version = "v2.2.2"; + version = "2.2.2"; goPackagePath = "github.com/ebsarr/packet"; - src = fetchgit { - rev = version; - url = "https://github.com/ebsarr/packet"; - sha256 = "18n8f2rlab4icb28k1b9gnh30zy382v792x07fmcdqq4nkw6wvwf"; + src = fetchFromGitHub { + owner = "ebsarr"; + repo = "packet"; + rev = "v${version}"; + sha256 = "sha256-jm9u+LQE48aqO6CLdLZAw38woH1phYnEYpEsRbNwyKI="; }; goDeps = ./deps.nix; - meta = { + meta = with lib; { description = "a CLI tool to manage packet.net services"; homepage = "https://github.com/ebsarr/packet"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.grahamc ]; - platforms = lib.platforms.unix; + license = licenses.mit; + maintainers = with maintainers; [ grahamc ]; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix index dfed3c91bc5e..484254a099c3 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -29,9 +29,9 @@ let # 2) nix-build -A tree-sitter.updater.update-all-grammars # 3) OPTIONAL: Set GITHUB_TOKEN env variable to avoid api rate limit # 4) run the ./result script that is output by that (it updates ./grammars) - version = "0.20.4"; - sha256 = "sha256-H/7j4HnaccmaH5m/FMTbi01uA3JtKVHiJLTQ4VZ7jfo="; - cargoSha256 = "sha256-Pf/gVBQFssOomzq0IZp5H7MYwvFBRjMYfifLKCB7DCs="; + version = "0.20.6"; + sha256 = "sha256-zaxy8VCfJKK8NtfuFFojmmP5a19FP1zO/eB5q1EoQPw="; + cargoSha256 = "sha256-sOOhzm2nz+HC6dvT+8hj/wh19o+OB2zQ6Uz+H89txSA="; src = fetchFromGitHub { owner = "tree-sitter"; diff --git a/nixpkgs/pkgs/development/tools/picotool/default.nix b/nixpkgs/pkgs/development/tools/picotool/default.nix index d4a6f1c409b1..507284081f5a 100644 --- a/nixpkgs/pkgs/development/tools/picotool/default.nix +++ b/nixpkgs/pkgs/development/tools/picotool/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "picotool"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "raspberrypi"; repo = pname; rev = version; - sha256 = "1k5j742sj91akdrgnd3wa5csqb638dgaz0c09zsr22fcqz0qhzig"; + sha256 = "sha256-YjDHoRcDoezyli42bJ0bnfjdNNY8l6ZilrxhOudqvwE="; }; buildInputs = [ libusb1 pico-sdk ]; diff --git a/nixpkgs/pkgs/development/tools/profiling/systemtap/default.nix b/nixpkgs/pkgs/development/tools/profiling/systemtap/default.nix index 31eafb1086b8..ac00e3418782 100644 --- a/nixpkgs/pkgs/development/tools/profiling/systemtap/default.nix +++ b/nixpkgs/pkgs/development/tools/profiling/systemtap/default.nix @@ -16,8 +16,8 @@ let pname = "systemtap"; inherit version; src = fetchgit { inherit url rev sha256; }; - nativeBuildInputs = [ pkg-config cpio ]; - buildInputs = [ elfutils gettext python3 python3.pkgs.setuptools ]; + nativeBuildInputs = [ pkg-config cpio python3 python3.pkgs.setuptools ]; + buildInputs = [ elfutils gettext ]; enableParallelBuilding = true; }; diff --git a/nixpkgs/pkgs/development/tools/protoc-gen-grpc-web/default.nix b/nixpkgs/pkgs/development/tools/protoc-gen-grpc-web/default.nix index acbd23ec2929..279f8101f78f 100644 --- a/nixpkgs/pkgs/development/tools/protoc-gen-grpc-web/default.nix +++ b/nixpkgs/pkgs/development/tools/protoc-gen-grpc-web/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "protoc-gen-grpc-web"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc-web"; rev = version; - sha256 = "sha256-piKpaylzuanhGR+7BzApplv8e/CWPoR9tG3vHrF7WXw="; + sha256 = "sha256-NRShN4X9JmCjqPVY/q9oSxSOvv1bP//vM9iOZ6ap5vc="; }; sourceRoot = "source/javascript/net/grpc/web/generator"; @@ -17,7 +17,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ protobuf ]; buildInputs = [ protobuf ]; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ "PREFIX=$(out)" "STATIC=no" ]; + + patches = [ + # https://github.com/grpc/grpc-web/pull/1210 + ./optional-static.patch + ]; doCheck = true; checkInputs = [ protobuf ]; diff --git a/nixpkgs/pkgs/development/tools/protoc-gen-grpc-web/optional-static.patch b/nixpkgs/pkgs/development/tools/protoc-gen-grpc-web/optional-static.patch new file mode 100644 index 000000000000..a7ca112749c1 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/protoc-gen-grpc-web/optional-static.patch @@ -0,0 +1,19 @@ +--- a/Makefile ++++ b/Makefile +@@ -18,12 +18,15 @@ CXXFLAGS += -std=c++11 + LDFLAGS += -L/usr/local/lib -lprotoc -lprotobuf -lpthread -ldl + PREFIX ?= /usr/local + MIN_MACOS_VERSION := 10.7 # Supports OS X Lion ++STATIC ?= yes + + UNAME_S := $(shell uname -s) + ifeq ($(UNAME_S),Darwin) + CXXFLAGS += -stdlib=libc++ -mmacosx-version-min=$(MIN_MACOS_VERSION) + else ifeq ($(UNAME_S),Linux) +- LDFLAGS += -static ++ ifeq ($(STATIC),yes) ++ LDFLAGS += -static ++ endif + endif + + all: protoc-gen-grpc-web diff --git a/nixpkgs/pkgs/development/tools/protoc-gen-validate/default.nix b/nixpkgs/pkgs/development/tools/protoc-gen-validate/default.nix new file mode 100644 index 000000000000..9a77437a3723 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/protoc-gen-validate/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "protoc-gen-validate"; + version = "0.6.7"; + + src = fetchFromGitHub { + owner = "envoyproxy"; + repo = "protoc-gen-validate"; + rev = "v${version}"; + sha256 = "sha256-ouo6raNbvQyuY4IY1JEN45Ss7zb3EoR/WIRzL7hXLNI="; + }; + + vendorSha256 = "sha256-HbUEhoB6PPHwN/xym6dTkS54+EqVU1n8EIym8W2wt3I="; + + excludedPackages = [ "tests" ]; + + meta = with lib; { + description = "Protobuf plugin for generating polyglot message validators"; + homepage = "https://github.com/envoyproxy/protoc-gen-validate"; + license = licenses.asl20; + maintainers = with maintainers; [ matthewpi ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/pulumictl/default.nix b/nixpkgs/pkgs/development/tools/pulumictl/default.nix new file mode 100644 index 000000000000..b9538235c466 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/pulumictl/default.nix @@ -0,0 +1,28 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "pulumictl"; + version = "0.0.29"; + + src = fetchFromGitHub { + owner = "pulumi"; + repo = "pulumictl"; + rev = "v${version}"; + sha256 = "sha256-2jTxtgEg+x/NY/LTWT5+9K9bilOw2bLTUIctjd+qwLE="; + }; + + vendorSha256 = "sha256-xalfnLc6bPBvm2B42+FzpgrOH541HMWmNHChveI792s="; + + ldflags = [ + "-s" "-w" "-X=github.com/pulumi/pulumictl/pkg/version.Version=${src.rev}" + ]; + + subPackages = [ "cmd/pulumictl" ]; + + meta = with lib; { + description = "Swiss Army Knife for Pulumi Development"; + homepage = "https://github.com/pulumi/pulumictl"; + license = licenses.asl20; + maintainers = with maintainers; [ vincentbernat ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/quick-lint-js/default.nix b/nixpkgs/pkgs/development/tools/quick-lint-js/default.nix index 9c47695a5dec..82a31ea52b10 100644 --- a/nixpkgs/pkgs/development/tools/quick-lint-js/default.nix +++ b/nixpkgs/pkgs/development/tools/quick-lint-js/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "quick-lint-js"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "quick-lint"; repo = "quick-lint-js"; rev = version; - sha256 = "09jp118n487g467d4zhqcpnwwrvmjw02ssv1rbyw2s22cgz9701f"; + sha256 = "1ay59pmprcswip6zzbqfy5g2rdv4lgmps8vrxay4l9w6xn9lg03v"; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix b/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix index ea842c820899..ee03e043dd86 100644 --- a/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix +++ b/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix @@ -70,7 +70,7 @@ in stdenv.mkDerivation rec { exec = "react-native-debugger"; desktopName = "React Native Debugger"; genericName = "React Native Debugger"; - categories = "Development;Debugger;"; + categories = [ "Development" "Debugger" ]; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/tools/rebazel/default.nix b/nixpkgs/pkgs/development/tools/rebazel/default.nix index 5dee0a1b9e86..c28701f96a21 100644 --- a/nixpkgs/pkgs/development/tools/rebazel/default.nix +++ b/nixpkgs/pkgs/development/tools/rebazel/default.nix @@ -1,4 +1,5 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, CoreServices }: + rustPlatform.buildRustPackage rec { pname = "rebazel"; version = "0.1.4"; @@ -12,6 +13,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-cBAm8LyNKEVJkhZJ+QZU5XtQutb1oNvad8xH70Bi2LM="; + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + meta = with lib; { description = "tool for expediting bazel build workflows"; homepage = "https://github.com/meetup/rebazel"; diff --git a/nixpkgs/pkgs/development/tools/rocminfo/default.nix b/nixpkgs/pkgs/development/tools/rocminfo/default.nix index 2734cfa09317..60ca0a51d265 100644 --- a/nixpkgs/pkgs/development/tools/rocminfo/default.nix +++ b/nixpkgs/pkgs/development/tools/rocminfo/default.nix @@ -7,13 +7,13 @@ # compilers to determine the desired target. , defaultTargets ? []}: stdenv.mkDerivation rec { - version = "4.5.2"; + version = "5.0.1"; pname = "rocminfo"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "rocminfo"; rev = "rocm-${version}"; - sha256 = "sha256-VIlHYiGLen4xmdP7kpmObj5wKy6Qq7iupJFtPa4Zd98="; + sha256 = "sha256-H9JdrDS/pbvYMKkayu/1rrXusHeXBH1CO9jYArsbCNI="; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix b/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix index 782996d92180..444db1173225 100644 --- a/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix @@ -34,7 +34,9 @@ let touch $out ''; }; - } '' + } + # if you modify the logic to find the right clang flags, also modify rustPlatform.bindgenHook + '' mkdir -p $out/bin export cincludes="$(< ${clang}/nix-support/cc-cflags) $(< ${clang}/nix-support/libc-cflags)" export cxxincludes="$(< ${clang}/nix-support/libcxx-cxxflags)" diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-llvm-lines/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-llvm-lines/default.nix index 7fc1da095e5f..eede871e38c6 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-llvm-lines/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-llvm-lines/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-llvm-lines"; - version = "0.4.13"; + version = "0.4.14"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-sN0i2oo0XuxneIK/w+jpxkcdm2rtqhyH2Y3CMPnH+ro="; + sha256 = "sha256-ooFkw6QlMnlvyHPMkqAZUDaOHH8dktzbob5WevQsYXQ="; }; - cargoSha256 = "sha256-Gv7C4NFThNawhT+IYO0ZbpOh6w/yPeIJKZjzTyM/GJw="; + cargoSha256 = "sha256-MgtFNrSjSvyjp1uD/OueSh+MCYSvZCyDabP20pI/8HI="; meta = with lib; { description = "Count the number of lines of LLVM IR across all instantiations of a generic function"; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix index 24d309eb68aa..2e2ff56fd050 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.35.8"; + version = "0.35.10"; src = fetchCrate { inherit pname version; - sha256 = "sha256-YNPAIdN9FDUHs/5aCYJN+1/12ZYk1YJsUjjB1a09KvA="; + sha256 = "sha256-l34sThvzhAW8VfxVuv+UGVil7yOvsOiWSqr/N91V8C8="; }; nativeBuildInputs = [ pkg-config ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; - cargoSha256 = "sha256-xLFBF8fEbupLgFNdYC1NzM6p7O2gvsv0Utk4Et2oBDc="; + cargoSha256 = "sha256-974Gqtv+g32iHrIqIzqwBsE8frzmjF0Ma/hSMGzMaGs="; # 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 32ecbf9b340a..e3694b310837 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-msrv/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-msrv/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-msrv"; - version = "0.14.2"; + version = "0.15.1"; src = fetchFromGitHub { owner = "foresterre"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rKkU49sqVArp/iCfcG78ieoEbyZoqB1owTwLfl09DSM="; + sha256 = "sha256-rmWPkxxrpVamYHII0xkZq62ubL3/jrcqXUvFH9VuNtg="; }; - cargoSha256 = "sha256-aA4l7kyVnu416LcHddJqrEpi8WS0AImbROZG+kBy5tk="; + cargoSha256 = "sha256-/Bspy94uIP/e4uJY8qo+UPK1tnPjglxiMWeYWx2qoHk="; passthru = { updateScript = nix-update-script { diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-rr/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-rr/default.nix index 47d58e9b92ac..f2099a855ccb 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-rr/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-rr/default.nix @@ -1,7 +1,8 @@ { lib , rustPlatform , fetchFromGitHub -, nix-update-script +, genericUpdater +, common-updater-scripts , makeWrapper , rr }: @@ -20,8 +21,9 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0fjs76n6bbbv83s213h2dgsszgxy4hbjsclyk9m81b3bfbmmb9sa"; passthru = { - updateScript = nix-update-script { - attrPath = pname; + updateScript = genericUpdater { + inherit pname version; + versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; }; }; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix index b4e0364d0861..c8021a74441c 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-udeps"; - version = "0.1.26"; + version = "0.1.27"; src = fetchFromGitHub { owner = "est31"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7QTlbZZcWZx/E2jYYu0A6kBbScmCml0wpJ17tqLYg90="; + sha256 = "sha256-nxcrllAoS/1e5hFURtrB9e6zyHnot90PFAuyVCsO4lY="; }; - cargoSha256 = "sha256-E9AouGvZTg3wD/loc80Cz933oEnWMSqwQEYTU+NPtjM="; + cargoSha256 = "sha256-AV3fgKloQ/9UEWjYRI4gENSqilhFlpbUrXhXREytcWc="; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-valgrind/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-valgrind/default.nix index 97f3d4d4b3b6..ac54657c8af0 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-valgrind/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-valgrind/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-valgrind"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "jfrimmel"; repo = "cargo-valgrind"; rev = version; - sha256 = "sha256-yKmm24X+5P5UATjWn0LJqby9lKRhwlvDK5suTPxKGwU="; + sha256 = "sha256-PEGDao010COqSJGha7GQvR7vNOV+C7faduijVNjB5DE="; }; - cargoSha256 = "sha256-8n2WryAWi/bIL0XCSlNYcxXN2ld1tis435ScuU0QcBs="; + cargoSha256 = "sha256-00WUYrkKKJOEN9jXKQ3YraTq89U+3djdvLRuZSbeNHk="; passthru = { updateScript = nix-update-script { diff --git a/nixpkgs/pkgs/development/tools/rust/duckscript/default.nix b/nixpkgs/pkgs/development/tools/rust/duckscript/default.nix new file mode 100644 index 000000000000..aabb8b94c810 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/rust/duckscript/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchurl +, runCommand +, fetchCrate +, rustPlatform +, Security +, openssl +, pkg-config +, SystemConfiguration +, libiconv +}: + +rustPlatform.buildRustPackage rec { + pname = "duckscript_cli"; + version = "0.8.10"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-cMvcCX8ViCcUFMuxAPo3/wxXvg5swAcBrLx1x7lSwvM="; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; + + cargoSha256 = "sha256-8ywMLXFmdq119K/hl1hpsVhzG+nrdO4eux3lAqUjB+A="; + + meta = with lib; { + description = "Simple, extendable and embeddable scripting language."; + homepage = "https://github.com/sagiegurari/duckscript"; + license = licenses.asl20; + maintainers = with maintainers; [ mkg20001 ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/rust/probe-run/default.nix b/nixpkgs/pkgs/development/tools/rust/probe-run/default.nix index 2626de0f84ba..a668fdd11725 100644 --- a/nixpkgs/pkgs/development/tools/rust/probe-run/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/probe-run/default.nix @@ -3,14 +3,14 @@ rustPlatform.buildRustPackage rec { pname = "probe-run"; - version = "0.3.1"; + version = "0.3.2"; src = fetchCrate { inherit pname version; - sha256 = "1nfbpdx378p988q75hka9r8zp3xb9zy3dnagcxmha6dca5dhgsdm"; + sha256 = "sha256-SXA77LXM1SuBJ8BH+ahwJl/3gWsCbdLXBiHZdJySWq0="; }; - cargoSha256 = "05p3vmar00215x4mwsvs5knf4wrwmpq52rmbbi6b4qaqs3gqaghy"; + cargoSha256 = "sha256-e9POSuA/I7IUKUOxMTfCWxNn0AicojpGQpxamzmHa7g="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 ] @@ -21,6 +21,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/knurling-rs/probe-run"; changelog = "https://github.com/knurling-rs/probe-run/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ hoverbear ]; + maintainers = with maintainers; [ hoverbear newam ]; }; } diff --git a/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix b/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix index 53e74bf16394..2221ae0a14b3 100644 --- a/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2022-01-31"; - cargoSha256 = "sha256-BWCLzyCcLWwmh7Os7NjN2o89KD+VB0EHyZfTyYoYM08="; + version = "2022-02-28"; + cargoSha256 = "sha256-dTw6xp99uGtGp6YuqAX3r3GDD6Wto3KHTaO2DUUE2FA="; src = fetchFromGitHub { owner = "rust-analyzer"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-6+d/x7ZIyvkPLdn7ziXuPyKfxt/7z5PCWs7B960DFqk="; + sha256 = "sha256-GQ1cPO4povnozLl0MTFs0ZXpmBn+AZeFWQVnxHHWf9g="; }; patches = [ diff --git a/nixpkgs/pkgs/development/tools/rust/sqlx-cli/default.nix b/nixpkgs/pkgs/development/tools/rust/sqlx-cli/default.nix index e86380c53e76..005c5cfc4749 100644 --- a/nixpkgs/pkgs/development/tools/rust/sqlx-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/sqlx-cli/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "sqlx-cli"; - version = "0.5.10"; + version = "0.5.11"; src = fetchFromGitHub { owner = "launchbadge"; repo = "sqlx"; rev = "v${version}"; - sha256 = "sha256-OBIuURj0C/ws71KTGN9EbMwN4QsGMEdgoWyctmHaHjQ="; + sha256 = "sha256-Tz7YzGkQUwH0U14dvsttP2GpnM9kign6L9PkAVs3dEc="; }; - cargoSha256 = "sha256-9+I4mi7w1WK2NkmN65EtC52KtSZR9GjrHCPE9w82IXw="; + cargoSha256 = "sha256-EKuRaVxwotgTPj95GJnrQGbulsFPClSettwS5f0TzoM="; doCheck = false; cargoBuildFlags = [ "-p sqlx-cli" ]; diff --git a/nixpkgs/pkgs/development/tools/scalafmt/default.nix b/nixpkgs/pkgs/development/tools/scalafmt/default.nix index ee49ee1bf6d9..6a442424c4f7 100644 --- a/nixpkgs/pkgs/development/tools/scalafmt/default.nix +++ b/nixpkgs/pkgs/development/tools/scalafmt/default.nix @@ -2,7 +2,7 @@ let baseName = "scalafmt"; - version = "3.4.0"; + version = "3.4.3"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -13,7 +13,7 @@ let ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "l5F09bjRev2eBHKTMzojC7+USkW7qf3YtA2KSoN7MxM="; + outputHash = "FWGvhKK/VnvetnHS35/z1errYTRZCrcfWyEAHlhKApk="; }; in stdenv.mkDerivation { diff --git a/nixpkgs/pkgs/development/tools/scenebuilder/default.nix b/nixpkgs/pkgs/development/tools/scenebuilder/default.nix index 438555998fde..77928a1f22a5 100644 --- a/nixpkgs/pkgs/development/tools/scenebuilder/default.nix +++ b/nixpkgs/pkgs/development/tools/scenebuilder/default.nix @@ -64,13 +64,13 @@ let ''; desktopItem = makeDesktopItem { - name = "Scene Builder"; + name = "scenebuilder"; exec = "scenebuilder"; icon = "scenebuilder"; comment = "A visual, drag'n'drop, layout tool for designing JavaFX application user interfaces."; - desktopName = pname; - mimeType = "application/java;application/java-vm;application/java-archive"; - categories = "Development"; + desktopName = "Scene Builder"; + mimeTypes = [ "application/java" "application/java-vm" "application/java-archive" ]; + categories = [ "Development" ]; }; in stdenv.mkDerivation rec { diff --git a/nixpkgs/pkgs/development/tools/scenic-view/default.nix b/nixpkgs/pkgs/development/tools/scenic-view/default.nix index 6dd3e11b6095..1322cfc751a8 100644 --- a/nixpkgs/pkgs/development/tools/scenic-view/default.nix +++ b/nixpkgs/pkgs/development/tools/scenic-view/default.nix @@ -66,8 +66,8 @@ let desktopName = pname; exec = pname; comment = "JavaFx application to visualize and modify the scenegraph of running JavaFx applications."; - mimeType = "application/java;application/java-vm;application/java-archive"; - categories = "Development"; + mimeTypes = [ "application/java" "application/java-vm" "application/java-archive" ]; + categories = [ "Development" ]; }; in stdenv.mkDerivation rec { diff --git a/nixpkgs/pkgs/development/tools/sentry-cli/default.nix b/nixpkgs/pkgs/development/tools/sentry-cli/default.nix index 8087148c169d..2d20beb2eb9a 100644 --- a/nixpkgs/pkgs/development/tools/sentry-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/sentry-cli/default.nix @@ -9,13 +9,13 @@ }: rustPlatform.buildRustPackage rec { pname = "sentry-cli"; - version = "1.72.2"; + version = "1.73.0"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-cli"; rev = version; - sha256 = "sha256-iaU0+sbssHhenz7QgXI9n5J2P5b0Tbw7fdvekRmjEeY="; + sha256 = "sha256-wnpC/LVhGOXWaa198bcahjdXRVuh1Xv0tFe2BCfOnNE="; }; doCheck = false; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; nativeBuildInputs = [ pkg-config ]; - cargoSha256 = "sha256-vz0qSKFoM5kRgATshQ8W+yJTtWyQRvHp22t4nsJHqG0="; + cargoSha256 = "sha256-7mjAKuiFcNzjt8Ti5/50TmPy3LY6dwXuQCHtbcoVZm8="; meta = with lib; { homepage = "https://docs.sentry.io/cli/"; diff --git a/nixpkgs/pkgs/development/tools/stylua/default.nix b/nixpkgs/pkgs/development/tools/stylua/default.nix index 7db111a50f26..1b25634502a9 100644 --- a/nixpkgs/pkgs/development/tools/stylua/default.nix +++ b/nixpkgs/pkgs/development/tools/stylua/default.nix @@ -1,30 +1,26 @@ { fetchFromGitHub , lib , rustPlatform -, stdenvNoCC , lua52Support ? true , luauSupport ? false }: rustPlatform.buildRustPackage rec { pname = "stylua"; - version = "0.12.3"; + version = "0.12.4"; src = fetchFromGitHub { owner = "johnnymorganz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bgfG1cPhauU85FG/ZX1n2KqfydMeh92q347UsREkOGo="; + sha256 = "sha256-BPLN7/LaVDtCOJBgIJVbnENUyFtacRsK3JxDupytzOA="; }; - cargoSha256 = "sha256-njZTD6O67v787Z1tJ7G0QzxJLhqU2sfpOVw6r4woE9s="; + cargoSha256 = "sha256-MZsFbFQp5Rw20pXzvTFNhMiVx/TJZ63/2rU7vj7IcqQ="; buildFeatures = lib.optional lua52Support "lua52" ++ lib.optional luauSupport "luau"; - # test_standard fails on darwin - doCheck = !stdenvNoCC.isDarwin; - meta = with lib; { description = "An opinionated Lua code formatter"; homepage = "https://github.com/johnnymorganz/stylua"; diff --git a/nixpkgs/pkgs/development/tools/sumneko-lua-language-server/default.nix b/nixpkgs/pkgs/development/tools/sumneko-lua-language-server/default.nix index 4ec62ed4d29d..88fa62903dd8 100644 --- a/nixpkgs/pkgs/development/tools/sumneko-lua-language-server/default.nix +++ b/nixpkgs/pkgs/development/tools/sumneko-lua-language-server/default.nix @@ -4,13 +4,13 @@ let in stdenv.mkDerivation rec { pname = "sumneko-lua-language-server"; - version = "2.6.4"; + version = "2.6.7"; src = fetchFromGitHub { owner = "sumneko"; repo = "lua-language-server"; rev = version; - sha256 = "sha256-oUIgEWLcpEZHtL1wvTAezLtz2PecddtwhzbLhGqso/k="; + sha256 = "sha256-m9vtopRjxT9Re8pDdzfFUpg3zYAFE8zqFemgaNAbsvM="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/development/tools/symfony-cli/default.nix b/nixpkgs/pkgs/development/tools/symfony-cli/default.nix index 1e182b888cee..d87ecddbf894 100644 --- a/nixpkgs/pkgs/development/tools/symfony-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/symfony-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "symfony-cli"; - version = "5.3.4"; - vendorSha256 = "sha256-i4p9kEe0eT2L4U/DjkWlLVqgGT5ZJaoGyFAoYyxmoyI="; + version = "5.4.1"; + vendorSha256 = "sha256-MlsgII1QybyW+B7DGbSyn7VQ36n29yOC0pZnaemEHO8="; src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; - sha256 = "sha256-6k1yMGW/UYCFB1APGlcU8bjNcCD7/IXhG+RJR6ii56I="; + sha256 = "sha256-92Pth+IrILWkcP4mm3IcSN4+zs7TNg4CPGT2liop7/I="; }; # Tests requires network access diff --git a/nixpkgs/pkgs/development/tools/vala-lint/default.nix b/nixpkgs/pkgs/development/tools/vala-lint/default.nix index f9c98bc4fb10..d8f316863200 100644 --- a/nixpkgs/pkgs/development/tools/vala-lint/default.nix +++ b/nixpkgs/pkgs/development/tools/vala-lint/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "vala-lint"; - version = "unstable-2021-12-28"; + version = "unstable-2022-02-16"; src = fetchFromGitHub { owner = "vala-lang"; repo = "vala-lint"; - rev = "1eeb3538b2a71addd0d8adc9f53ffe80fdfb8ce0"; - sha256 = "sha256-u2VJIDc1yvhbBgdMKL1RijoKEL4Vl8sbrGUYu5t/wJI="; + rev = "2f8a970cbf41ac54d2b4124c9d7db64543031901"; + sha256 = "sha256-jIC9nUWxs4iDpqEQGxl8JrHbBEkz60/elWHqGKQqlX8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/tools/wails/default.nix b/nixpkgs/pkgs/development/tools/wails/default.nix new file mode 100644 index 000000000000..2d0576592ec6 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/wails/default.nix @@ -0,0 +1,78 @@ +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +, pkg-config +, makeWrapper +, go +, gcc +, gtk3 +, webkitgtk +, nodejs +, upx +, zlib +}: + +buildGoModule rec { + pname = "wails"; + version = "2.0.0-beta.33"; + + src = fetchFromGitHub { + owner = "wailsapp"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-efxOL/FllToum0P4JyAJt0fbrznTFYh7czTWpZu3uk0="; + } + "/v2"; + + vendorSha256 = "sha256-qPMVsvud2L7hpXUOfYYMiO32JXff8ZZC34EsxFoSJ0g="; + + proxyVendor = true; + + subPackages = [ "cmd/wails" ]; + + # These packages are needed to build wails + # and will also need to be used when building a wails app. + nativeBuildInputs = [ + pkg-config + makeWrapper + ]; + + # Wails apps are built with Go, so we need to be able to + # add it in propagatedBuildInputs. + allowGoReference = true; + + # Following packages are required when wails used as a builder. + propagatedBuildInputs = [ + pkg-config + go + gcc + gtk3 + webkitgtk + nodejs + upx + ]; + + ldflags = [ + "-s" + "-w" + ]; + + # As Wails calls a compiler, certain apps and libraries need to be made available. + postFixup = '' + wrapProgram $out/bin/wails \ + --prefix PATH : ${lib.makeBinPath [ pkg-config go gcc nodejs upx ]} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gtk3 webkitgtk ]} \ + --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH" \ + --set CGO_LDFLAGS "-L${lib.makeLibraryPath [ zlib ]}" + ''; + + doCheck = true; + + meta = with lib; { + description = "Build applications using Go + HTML + CSS + JS"; + homepage = "https://wails.io"; + license = licenses.mit; + maintainers = with maintainers; [ ianmjones ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/tools/winpdb/default.nix b/nixpkgs/pkgs/development/tools/winpdb/default.nix index 58fef12cd6e8..8f8d03db950b 100644 --- a/nixpkgs/pkgs/development/tools/winpdb/default.nix +++ b/nixpkgs/pkgs/development/tools/winpdb/default.nix @@ -19,7 +19,7 @@ python2Packages.buildPythonApplication rec { comment = "Platform independend Python debugger"; desktopName = "Winpdb"; genericName = "Python Debugger"; - categories = "Development;Debugger;"; + categories = [ "Development" "Debugger" ]; }; # Don't call gnome-terminal with "--disable-factory" flag, which is diff --git a/nixpkgs/pkgs/development/tools/wllvm/default.nix b/nixpkgs/pkgs/development/tools/wllvm/default.nix index 85dbc4f731a1..0234c936dc15 100644 --- a/nixpkgs/pkgs/development/tools/wllvm/default.nix +++ b/nixpkgs/pkgs/development/tools/wllvm/default.nix @@ -1,13 +1,12 @@ { lib, python3Packages }: python3Packages.buildPythonApplication rec { - version = "1.2.8"; + version = "1.3.1"; pname = "wllvm"; - name = "${pname}-${version}"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1d88fzg4ba4r3hwrinnv6agiyj3xxdy4yryb8wz2ml51nc6bi591"; + sha256 = "sha256-PgV6V18FyezIZpqMQEbyv98MaVM7h7T7/Kvg3yMMwzE="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/tools/wp-cli/default.nix b/nixpkgs/pkgs/development/tools/wp-cli/default.nix index 8d8b1a004d5e..9ee452b26f9c 100644 --- a/nixpkgs/pkgs/development/tools/wp-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/wp-cli/default.nix @@ -1,19 +1,25 @@ -{ stdenv, lib, fetchurl, writeText, php, makeWrapper }: +{ stdenv +, lib +, fetchurl +, formats +, installShellFiles +, makeWrapper +, php +}: + let - version = "2.5.0"; + version = "2.6.0"; completion = fetchurl { url = "https://raw.githubusercontent.com/wp-cli/wp-cli/v${version}/utils/wp-completion.bash"; - sha256 = "sha256-RDygYQzK6NLWrOug7EqnkpuH7Wz1T2Zq/tGNZjoYo5U="; + hash = "sha256-RDygYQzK6NLWrOug7EqnkpuH7Wz1T2Zq/tGNZjoYo5U="; }; - ini = writeText "php.ini" '' - [PHP] - memory_limit = -1 ; no limit as composer uses a lot of memory + ini = (formats.ini { }).generate "php.ini" { + PHP.memory_limit = -1; # no limit as composer uses a lot of memory + Phar."phar.readonly" = "Off"; + }; - [Phar] - phar.readonly = Off - ''; in stdenv.mkDerivation rec { pname = "wp-cli"; @@ -21,19 +27,18 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${pname}-${version}.phar"; - sha256 = "sha256-vghT6fRD84SFZgcIcdNE6K2B6x4V0V3PkyS0p14nJ4k="; + hash = "sha256-0WZSjKtgvIIpwGcp5wc4OPu6aNaytXRQTLAniDXIeIg="; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ installShellFiles makeWrapper ]; buildCommand = '' dir=$out/share/wp-cli - mkdir -p $out/bin $dir - install -Dm444 ${src} $dir/wp-cli install -Dm444 ${ini} $dir/php.ini - install -Dm444 ${completion} $out/share/bash-completion/completions/wp + installShellCompletion --bash --name wp ${completion} + mkdir -p $out/bin makeWrapper ${lib.getBin php}/bin/php $out/bin/wp \ --add-flags "-c $dir/php.ini" \ --add-flags "-f $dir/wp-cli" diff --git a/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix b/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix index 087658fe5513..81d4a36a869c 100644 --- a/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix +++ b/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix @@ -174,7 +174,7 @@ in rec { let package = lib.importJSON packageJSON; - packageGlobs = package.workspaces; + packageGlobs = if lib.isList package.workspaces then package.workspaces else package.workspaces.packages; globElemToRegex = lib.replaceStrings ["*"] [".*"]; diff --git a/nixpkgs/pkgs/development/tools/yq-go/default.nix b/nixpkgs/pkgs/development/tools/yq-go/default.nix index 483523e1807b..e8cd2a134fd4 100644 --- a/nixpkgs/pkgs/development/tools/yq-go/default.nix +++ b/nixpkgs/pkgs/development/tools/yq-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yq-go"; - version = "4.20.2"; + version = "4.22.1"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - sha256 = "sha256-vhHT9re35aT+TUYhl4rxv4PE/sd7Vp1PoFbS8s5lWLE="; + sha256 = "sha256-+yVf9pSK2cH/d5fdaGSBrjce8vVqE9XMpZSI8s4xoJI="; }; - vendorSha256 = "sha256-samz70Dybu/Xf9+ftgIKgd2pyQcXw6Ybs/0oJN47IFE="; + vendorSha256 = "sha256-F11FnDYJ59aKrdRXDPpKlhX52yQXdaN1sblSkVI2j9w="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/ytt/default.nix b/nixpkgs/pkgs/development/tools/ytt/default.nix index fb13244daf71..7f8498a3523e 100644 --- a/nixpkgs/pkgs/development/tools/ytt/default.nix +++ b/nixpkgs/pkgs/development/tools/ytt/default.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ytt"; - version = "0.40.0"; + version = "0.40.1"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-ytt"; rev = "v${version}"; - sha256 = "sha256-Oc4hNeSDsGHsA7V05LHFAJ5xvxWth2wEd3ag2ltVR10="; + sha256 = "sha256-DtzdgEHgxoZRSvylq2vLzU1PAk1ETBDpBWFHcIW95r4="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/development/web/deno/default.nix b/nixpkgs/pkgs/development/web/deno/default.nix index c05737d1c86e..fa2fe98f76cc 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.19.0"; + version = "1.19.1"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FLT4O542Q3qFjrsIsF9O/dgQQNAWhsZq+MaLqF8lLPA="; + sha256 = "sha256-BqwiconG5hn5RPV+hlKu6e6+GjZA4Im/dD+no3IduYw="; }; - cargoSha256 = "sha256-mKmMgAoEavv5kb2fo+X5dfpw0ftAho6aU3/wCTgwXao="; + cargoSha256 = "sha256-q/5AezLQgN7WdGsbHoxX5riJMlxw3cTFhVs5OvCeI5U="; # 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 5fac42ab7b24..7de71132d6a1 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.297"; + version = "0.0.301"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-Ug/dGHj3prgmiIr6tkEYveTwGPUI0ivy6UtuU5QoJ2U="; + sha256 = "sha256-UwouKnUfEcYpwtLXxwe93mHzVvj/+72FSQ0OW55oztE="; }; preBuild = '' @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "." ]; - vendorSha256 = "sha256-EwMPPZOZ0xE1DKvaU7+PrUH+Ty6ut3UYJZSY4EqXFWo="; + vendorSha256 = "sha256-VKX/Wt7CQy3w4Zv51M/IF1RIPpn7nTCL1T6jJ+oxti4="; doCheck = false; diff --git a/nixpkgs/pkgs/development/web/grails/default.nix b/nixpkgs/pkgs/development/web/grails/default.nix index 2a888b8056d0..0efa2b41a983 100644 --- a/nixpkgs/pkgs/development/web/grails/default.nix +++ b/nixpkgs/pkgs/development/web/grails/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { pname = "grails"; - version = "4.1.0.M1"; + version = "5.1.3"; src = fetchurl { url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip"; - sha256 = "0l99x3g485qjpdd7ga553xpi1s6rq21p8v16qjzqwdhyld961qsr"; + sha256 = "sha256-BacAVAnS3qdmzHGVUdZI2hn4Arp9Qep6cAXRabpB10M="; }; nativeBuildInputs = [ unzip ]; diff --git a/nixpkgs/pkgs/development/web/postman/default.nix b/nixpkgs/pkgs/development/web/postman/default.nix index a45d06cb4c3e..2c0698b74a8a 100644 --- a/nixpkgs/pkgs/development/web/postman/default.nix +++ b/nixpkgs/pkgs/development/web/postman/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "postman"; - version = "9.13.0"; + version = "9.14.0"; src = fetchurl { url = "https://dl.pstmn.io/download/version/${version}/linux64"; - sha256 = "sha256-ZlCIqQ4i/jaf/uDBonVXf6kAuKEhinnKTk3nO7mnBV4="; + sha256 = "sha256-pA3gT4xoIWhajY03JzVgHK5KyTx1uH6gyasuLTdt6cM="; name = "${pname}.tar.gz"; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { comment = "API Development Environment"; desktopName = "Postman"; genericName = "Postman"; - categories = "Development;"; + categories = [ "Development" ]; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/web/protege-distribution/default.nix b/nixpkgs/pkgs/development/web/protege-distribution/default.nix index 3b885e651510..a6ef66d06950 100644 --- a/nixpkgs/pkgs/development/web/protege-distribution/default.nix +++ b/nixpkgs/pkgs/development/web/protege-distribution/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { desktopName = "Protege Desktop"; icon = "protege"; comment = "OWL2 ontology editor"; - categories = "Development"; + categories = [ "Development" ]; exec = "run-protege"; }) ]; |