diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3adde0d14e41..3e1f2e1e371b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3723,6 +3723,12 @@ fingerprint = "78C2 E81C 828A 420B 269A EBC1 49FA 39F8 A7F7 35F9"; }]; }; + humancalico = { + email = "humancalico@disroot.org"; + github = "humancalico"; + githubId = 51334444; + name = "Akshat Agarwal"; + }; hodapp = { email = "hodapp87@gmail.com"; github = "Hodapp87"; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 712af93591d6..175a1164b63a 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -346,7 +346,6 @@ in sanoid = handleTest ./sanoid.nix {}; sbt = handleTest ./sbt.nix {}; sbt-extras = handleTest ./sbt-extras.nix {}; - scala = handleTest ./scala.nix {}; sddm = handleTest ./sddm.nix {}; searx = handleTest ./searx.nix {}; service-runner = handleTest ./service-runner.nix {}; diff --git a/nixos/tests/scala.nix b/nixos/tests/scala.nix deleted file mode 100644 index 4fc3f8aa7b0a..000000000000 --- a/nixos/tests/scala.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ system ? builtins.currentSystem, - config ? {}, - pkgs ? import ../.. { inherit system config; } -}: - -with pkgs.lib; - -let - common = name: package: (import ./make-test-python.nix ({ - inherit name; - meta = with pkgs.lib.maintainers; { - maintainers = [ nequissimus ]; - }; - - nodes = { - scala = { ... }: { - environment.systemPackages = [ package ]; - }; - }; - - testScript = '' - start_all() - - scala.succeed("scalac -version 2>&1 | grep '^Scala compiler version ${package.version}'") - ''; - }) { inherit system; }); - -in with pkgs; { - scala_2_10 = common "scala_2_10" scala_2_10; - scala_2_11 = common "scala_2_11" scala_2_11; - scala_2_12 = common "scala_2_12" scala_2_12; - scala_2_13 = common "scala_2_13" scala_2_13; -} diff --git a/pkgs/applications/graphics/fig2dev/default.nix b/pkgs/applications/graphics/fig2dev/default.nix index 667f5afe5793..99e8478224f4 100644 --- a/pkgs/applications/graphics/fig2dev/default.nix +++ b/pkgs/applications/graphics/fig2dev/default.nix @@ -1,5 +1,15 @@ -{ lib, stdenv, fetchurl, ghostscript, libpng, makeWrapper -, coreutils, bc, gnugrep, gawk, gnused } : +{ lib +, stdenv +, fetchurl +, ghostscript +, libpng +, makeWrapper +, coreutils +, bc +, gnugrep +, gawk +, gnused +}: stdenv.mkDerivation rec { pname = "fig2dev"; diff --git a/pkgs/applications/graphics/xfig/default.nix b/pkgs/applications/graphics/xfig/default.nix index 53a9632e1923..8773db5bead6 100644 --- a/pkgs/applications/graphics/xfig/default.nix +++ b/pkgs/applications/graphics/xfig/default.nix @@ -1,5 +1,15 @@ -{ lib, stdenv, fetchurl, xlibsWrapper, makeWrapper, libXpm -, libXmu, libXi, libXp, Xaw3d, libXaw, fig2dev +{ lib +, stdenv +, fetchurl +, xlibsWrapper +, makeWrapper +, libXpm +, libXmu +, libXi +, libXp +, Xaw3d +, libXaw +, fig2dev }: stdenv.mkDerivation rec { @@ -11,6 +21,18 @@ stdenv.mkDerivation rec { sha256 = "1czamqp0xn0j6qjnasa3fjnrzi072v6qknylr6jrs4gwsfw4ybyw"; }; + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ + xlibsWrapper + libXpm + libXmu + libXi + libXp + Xaw3d + libXaw + ]; + postPatch = '' sed -i 's:"fig2dev":"${fig2dev}/bin/fig2dev":' src/main.c ''; @@ -25,10 +47,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ makeWrapper ]; - - buildInputs = [ xlibsWrapper libXpm libXmu libXi libXp Xaw3d libXaw ]; - meta = with lib; { description = "An interactive drawing tool for X11"; longDescription = '' diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 9f229e4821b7..af42466d0ead 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -144,7 +144,9 @@ let postPatch = let ignoreVersionConstraints = [ + "emoji" "sentry-sdk" + "watchdog" ]; in '' diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 230399898ea0..c54d53384026 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -1,6 +1,6 @@ { pname, ffversion, meta, updateScript ? null , src, unpackPhase ? null, patches ? [] -, extraNativeBuildInputs ? [], extraConfigureFlags ? [], extraMakeFlags ? [] }: +, extraNativeBuildInputs ? [], extraConfigureFlags ? [], extraMakeFlags ? [], tests ? [] }: { lib, stdenv, pkg-config, pango, perl, python3, zip , libjpeg, zlib, dbus, dbus-glib, bzip2, xorg @@ -351,6 +351,7 @@ buildStdenv.mkDerivation ({ inherit gssSupport; inherit execdir; inherit browserName; + inherit tests; } // lib.optionalAttrs gtk3Support { inherit gtk3; }; hardeningDisable = [ "format" ]; # -Werror=format-security diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index ad835623394c..53830b7d1805 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, callPackage, fetchurl, fetchpatch }: +{ stdenv, lib, callPackage, fetchurl, fetchpatch, nixosTests }: let common = opts: callPackage (import ./common.nix opts) {}; @@ -23,6 +23,7 @@ rec { # not in `badPlatforms` because cross-compilation on 64-bit machine might work. license = lib.licenses.mpl20; }; + tests = [ nixosTests.firefox ]; updateScript = callPackage ./update.nix { attrPath = "firefox-unwrapped"; versionKey = "ffversion"; @@ -47,6 +48,7 @@ rec { # not in `badPlatforms` because cross-compilation on 64-bit machine might work. license = lib.licenses.mpl20; }; + tests = [ nixosTests.firefox-esr ]; updateScript = callPackage ./update.nix { attrPath = "firefox-esr-78-unwrapped"; versionKey = "ffversion"; diff --git a/pkgs/applications/networking/cluster/nixops/default.nix b/pkgs/applications/networking/cluster/nixops/default.nix new file mode 100644 index 000000000000..3885278f1f13 --- /dev/null +++ b/pkgs/applications/networking/cluster/nixops/default.nix @@ -0,0 +1,65 @@ +{ pkgs +, poetry2nix +, lib +, overrides ? (self: super: {}) +, stdenv +}: + +let + + interpreter = ( + poetry2nix.mkPoetryPackages { + projectDir = ./.; + overrides = [ + poetry2nix.defaultPoetryOverrides + (import ./poetry-git-overlay.nix { inherit pkgs; }) + ( + self: super: { + + nixops = super.nixops.overridePythonAttrs ( + old: { + meta = old.meta // { + homepage = https://github.com/NixOS/nixops; + description = "NixOS cloud provisioning and deployment tool"; + maintainers = with lib.maintainers; [ adisbladis aminechikhaoui eelco rob domenkozar ]; + platforms = lib.platforms.unix; + license = lib.licenses.lgpl3; + }; + + } + ); + } + ) + + # User provided overrides + overrides + + # Make nixops pluginable + (self: super: { + nixops = super.__toPluginAble { + drv = super.nixops; + finalDrv = self.nixops; + + nativeBuildInputs = [ self.sphinx ]; + postInstall = '' + doc_cache=$(mktemp -d) + sphinx-build -b man -d $doc_cache doc/ $out/share/man/man1 + + html=$(mktemp -d) + sphinx-build -b html -d $doc_cache doc/ $out/share/nixops/doc + ''; + + }; + }) + + ]; + } + ).python; + +in interpreter.pkgs.nixops.withPlugins(ps: [ + ps.nixops-encrypted-links + ps.nixops-virtd + ps.nixops-aws + ps.nixops-gcp + ps.nixopsvbox +]) diff --git a/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix b/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix new file mode 100644 index 000000000000..365221dd3166 --- /dev/null +++ b/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix @@ -0,0 +1,74 @@ +{ pkgs }: +self: super: { + + nixops = super.nixops.overridePythonAttrs ( + _: { + src = pkgs.fetchgit { + url = "https://github.com/NixOS/nixops.git"; + rev = "1ed5a091bc52de6c91319f446f833018a1cb326e"; + sha256 = "1fx17qv9cl7hz7322zh4xlg02xn7bwwjj82cdcvqpsjf83crz3xi"; + }; + } + ); + + nixops-aws = super.nixops-aws.overridePythonAttrs ( + _: { + src = pkgs.fetchgit { + url = "https://github.com/NixOS/nixops-aws.git"; + rev = "dbbaa1b15b6cf7ca1ceeb0a6195f5ee27693c505"; + sha256 = "13gw3h7g19a0s7dpayjfksrmw6g0364dcm5z2d6mlyzdkfgak4jn"; + }; + } + ); + + nixops-encrypted-links = super.nixops-encrypted-links.overridePythonAttrs ( + _: { + src = pkgs.fetchgit { + url = "https://github.com/nix-community/nixops-encrypted-links.git"; + rev = "0bb9aa50a7294ee9dca10a18ff7d9024234913e1"; + sha256 = "00wj03wcry83acwljq5v80dyrqaxpqb4j3jsdkfy3d7n5g4aq19l"; + }; + } + ); + + nixops-gcp = super.nixops-gcp.overridePythonAttrs ( + _: { + src = pkgs.fetchgit { + url = "https://github.com/nix-community/nixops-gce.git"; + rev = "23596af53eabc4e3bcf72beaaed82b2c8d40e419"; + sha256 = "10gfdhf4b3ldrpns8z66mqxwfcbgf9ccz8fx0rcp7gsgsffb0i3c"; + }; + } + ); + + nixops-virtd = super.nixops-virtd.overridePythonAttrs ( + _: { + src = pkgs.fetchgit { + url = "https://github.com/nix-community/nixops-libvirtd.git"; + rev = "af6cf5b2ced57b7b6d36b5df7dd27a14e0a5cfb6"; + sha256 = "1j75yg8a44dlbig38mf7n7p71mdzff6ii1z1pdp32i4ivk3l0hy6"; + }; + } + ); + + nixopsvbox = super.nixopsvbox.overridePythonAttrs ( + _: { + src = pkgs.fetchgit { + url = "https://github.com/nix-community/nixops-vbox.git"; + rev = "2729672865ebe2aa973c062a3fbddda8c1359da0"; + sha256 = "07bmrbg3g2prnba2kwg1rg6rvmnx1vzc538y2q3g04s958hala56"; + }; + } + ); + + nixos-modules-contrib = super.nixos-modules-contrib.overridePythonAttrs ( + _: { + src = pkgs.fetchgit { + url = "https://github.com/nix-community/nixos-modules-contrib.git"; + rev = "81a1c2ef424dcf596a97b2e46a58ca73a1dd1ff8"; + sha256 = "0f6ra5r8i1jz8ymw6l3j68b676a1lv0466lv0xa6mi80k6v9457x"; + }; + } + ); + +} diff --git a/pkgs/applications/networking/cluster/nixops/poetry.lock b/pkgs/applications/networking/cluster/nixops/poetry.lock new file mode 100644 index 000000000000..1c6ed7459947 --- /dev/null +++ b/pkgs/applications/networking/cluster/nixops/poetry.lock @@ -0,0 +1,841 @@ +[[package]] +name = "alabaster" +version = "0.7.12" +description = "A configurable sidebar-enabled Sphinx theme" +category = "dev" +optional = false +python-versions = "*" + +[[package]] +name = "apache-libcloud" +version = "3.3.1" +description = "A standard Python library that abstracts away differences among multiple cloud provider APIs. For more information and documentation, please see https://libcloud.apache.org" +category = "main" +optional = false +python-versions = ">=3.5.*, <4" + +[package.dependencies] +requests = ">=2.5.0" + +[[package]] +name = "babel" +version = "2.9.0" +description = "Internationalization utilities" +category = "dev" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" + +[package.dependencies] +pytz = ">=2015.7" + +[[package]] +name = "boto" +version = "2.49.0" +description = "Amazon Web Services Library" +category = "main" +optional = false +python-versions = "*" + +[[package]] +name = "boto3" +version = "1.17.0" +description = "The AWS SDK for Python" +category = "main" +optional = false +python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" + +[package.dependencies] +botocore = ">=1.20.0,<1.21.0" +jmespath = ">=0.7.1,<1.0.0" +s3transfer = ">=0.3.0,<0.4.0" + +[[package]] +name = "botocore" +version = "1.20.0" +description = "Low-level, data-driven core of boto 3." +category = "main" +optional = false +python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" + +[package.dependencies] +jmespath = ">=0.7.1,<1.0.0" +python-dateutil = ">=2.1,<3.0.0" +urllib3 = ">=1.25.4,<1.27" + +[[package]] +name = "certifi" +version = "2020.12.5" +description = "Python package for providing Mozilla's CA Bundle." +category = "main" +optional = false +python-versions = "*" + +[[package]] +name = "cffi" +version = "1.14.4" +description = "Foreign Function Interface for Python calling C code." +category = "main" +optional = false +python-versions = "*" + +[package.dependencies] +pycparser = "*" + +[[package]] +name = "chardet" +version = "4.0.0" +description = "Universal encoding detector for Python 2 and 3" +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" + +[[package]] +name = "colorama" +version = "0.4.4" +description = "Cross-platform colored terminal text." +category = "dev" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" + +[[package]] +name = "cryptography" +version = "3.3.1" +description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers." +category = "main" +optional = false +python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*" + +[package.dependencies] +cffi = ">=1.12" +six = ">=1.4.1" + +[package.extras] +docs = ["sphinx (>=1.6.5,!=1.8.0,!=3.1.0,!=3.1.1)", "sphinx-rtd-theme"] +docstest = ["doc8", "pyenchant (>=1.6.11)", "twine (>=1.12.0)", "sphinxcontrib-spelling (>=4.0.1)"] +pep8test = ["black", "flake8", "flake8-import-order", "pep8-naming"] +ssh = ["bcrypt (>=3.1.5)"] +test = ["pytest (>=3.6.0,!=3.9.0,!=3.9.1,!=3.9.2)", "pretend", "iso8601", "pytz", "hypothesis (>=1.11.4,!=3.79.2)"] + +[[package]] +name = "docutils" +version = "0.16" +description = "Docutils -- Python Documentation Utilities" +category = "dev" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" + +[[package]] +name = "idna" +version = "2.10" +description = "Internationalized Domain Names in Applications (IDNA)" +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" + +[[package]] +name = "imagesize" +version = "1.2.0" +description = "Getting image size from png/jpeg/jpeg2000/gif file" +category = "dev" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" + +[[package]] +name = "jinja2" +version = "2.11.3" +description = "A very fast and expressive template engine." +category = "dev" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" + +[package.dependencies] +MarkupSafe = ">=0.23" + +[package.extras] +i18n = ["Babel (>=0.8)"] + +[[package]] +name = "jmespath" +version = "0.10.0" +description = "JSON Matching Expressions" +category = "main" +optional = false +python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" + +[[package]] +name = "libvirt-python" +version = "6.10.0" +description = "The libvirt virtualization API python binding" +category = "main" +optional = false +python-versions = "*" + +[[package]] +name = "markupsafe" +version = "1.1.1" +description = "Safely add untrusted strings to HTML/XML markup." +category = "dev" +optional = false +python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*" + +[[package]] +name = "nixops" +version = "2.0.0" +description = "NixOS cloud provisioning and deployment tool" +category = "main" +optional = false +python-versions = "^3.7" +develop = false + +[package.dependencies] +pluggy = "^0.13.1" +PrettyTable = "^0.7.2" +typeguard = "^2.7.1" +typing-extensions = "^3.7.4" + +[package.source] +type = "git" +url = "https://github.com/NixOS/nixops.git" +reference = "master" +resolved_reference = "1ed5a091bc52de6c91319f446f833018a1cb326e" + +[[package]] +name = "nixops-aws" +version = "1.0" +description = "NixOps AWS plugin" +category = "main" +optional = false +python-versions = "^3.7" +develop = false + +[package.dependencies] +boto = "^2.49.0" +boto3 = "^1.13.7" +nixops = "rev master" +nixos-modules-contrib = "rev master" +typing-extensions = "^3.7.4" + +[package.source] +type = "git" +url = "https://github.com/NixOS/nixops-aws.git" +reference = "master" +resolved_reference = "dbbaa1b15b6cf7ca1ceeb0a6195f5ee27693c505" + +[[package]] +name = "nixops-encrypted-links" +version = "1.0" +description = "Encrypted links support for NixOps" +category = "main" +optional = false +python-versions = "^3.7" +develop = false + +[package.dependencies] +nixops = "branch master" + +[package.source] +type = "git" +url = "https://github.com/nix-community/nixops-encrypted-links.git" +reference = "master" +resolved_reference = "0bb9aa50a7294ee9dca10a18ff7d9024234913e1" + +[[package]] +name = "nixops-gcp" +version = "1.0" +description = "NixOps backend for Google Cloud Platform" +category = "main" +optional = false +python-versions = "^3.7" +develop = false + +[package.dependencies] +apache-libcloud = "^3.2.0" +cryptography = "^3.1.1" +nixops = "branch master" +nixos-modules-contrib = "branch master" + +[package.source] +type = "git" +url = "https://github.com/nix-community/nixops-gce.git" +reference = "master" +resolved_reference = "23596af53eabc4e3bcf72beaaed82b2c8d40e419" + +[[package]] +name = "nixops-virtd" +version = "1.0" +description = "NixOps plugin for virtd" +category = "main" +optional = false +python-versions = "^3.7" +develop = false + +[package.dependencies] +libvirt-python = "^6.1" +nixops = "branch master" + +[package.source] +type = "git" +url = "https://github.com/nix-community/nixops-libvirtd.git" +reference = "master" +resolved_reference = "af6cf5b2ced57b7b6d36b5df7dd27a14e0a5cfb6" + +[[package]] +name = "nixopsvbox" +version = "1.7" +description = "NixOps backend for VirtualBox" +category = "main" +optional = false +python-versions = "^3.7" +develop = false + +[package.dependencies] +nixops = "rev master" + +[package.source] +type = "git" +url = "https://github.com/nix-community/nixops-vbox.git" +reference = "master" +resolved_reference = "2729672865ebe2aa973c062a3fbddda8c1359da0" + +[[package]] +name = "nixos-modules-contrib" +version = "0.1.0" +description = "NixOS modules that don't quite belong in NixOS." +category = "main" +optional = false +python-versions = "^3.7" +develop = false + +[package.dependencies] +nixops = "rev master" + +[package.source] +type = "git" +url = "https://github.com/nix-community/nixos-modules-contrib.git" +reference = "master" +resolved_reference = "81a1c2ef424dcf596a97b2e46a58ca73a1dd1ff8" + +[[package]] +name = "packaging" +version = "20.9" +description = "Core utilities for Python packages" +category = "dev" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" + +[package.dependencies] +pyparsing = ">=2.0.2" + +[[package]] +name = "pluggy" +version = "0.13.1" +description = "plugin and hook calling mechanisms for python" +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" + +[package.extras] +dev = ["pre-commit", "tox"] + +[[package]] +name = "prettytable" +version = "0.7.2" +description = "A simple Python library for easily displaying tabular data in a visually appealing ASCII table format." +category = "main" +optional = false +python-versions = "*" + +[[package]] +name = "pycparser" +version = "2.20" +description = "C parser in Python" +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" + +[[package]] +name = "pygments" +version = "2.7.4" +description = "Pygments is a syntax highlighting package written in Python." +category = "dev" +optional = false +python-versions = ">=3.5" + +[[package]] +name = "pyparsing" +version = "2.4.7" +description = "Python parsing module" +category = "dev" +optional = false +python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" + +[[package]] +name = "python-dateutil" +version = "2.8.1" +description = "Extensions to the standard Python datetime module" +category = "main" +optional = false +python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7" + +[package.dependencies] +six = ">=1.5" + +[[package]] +name = "pytz" +version = "2021.1" +description = "World timezone definitions, modern and historical" +category = "dev" +optional = false +python-versions = "*" + +[[package]] +name = "requests" +version = "2.25.1" +description = "Python HTTP for Humans." +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" + +[package.dependencies] +certifi = ">=2017.4.17" +chardet = ">=3.0.2,<5" +idna = ">=2.5,<3" +urllib3 = ">=1.21.1,<1.27" + +[package.extras] +security = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)"] +socks = ["PySocks (>=1.5.6,!=1.5.7)", "win-inet-pton"] + +[[package]] +name = "s3transfer" +version = "0.3.4" +description = "An Amazon S3 Transfer Manager" +category = "main" +optional = false +python-versions = "*" + +[package.dependencies] +botocore = ">=1.12.36,<2.0a.0" + +[[package]] +name = "six" +version = "1.15.0" +description = "Python 2 and 3 compatibility utilities" +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*" + +[[package]] +name = "snowballstemmer" +version = "2.1.0" +description = "This package provides 29 stemmers for 28 languages generated from Snowball algorithms." +category = "dev" +optional = false +python-versions = "*" + +[[package]] +name = "sphinx" +version = "3.4.3" +description = "Python documentation generator" +category = "dev" +optional = false +python-versions = ">=3.5" + +[package.dependencies] +alabaster = ">=0.7,<0.8" +babel = ">=1.3" +colorama = {version = ">=0.3.5", markers = "sys_platform == \"win32\""} +docutils = ">=0.12" +imagesize = "*" +Jinja2 = ">=2.3" +packaging = "*" +Pygments = ">=2.0" +requests = ">=2.5.0" +snowballstemmer = ">=1.1" +sphinxcontrib-applehelp = "*" +sphinxcontrib-devhelp = "*" +sphinxcontrib-htmlhelp = "*" +sphinxcontrib-jsmath = "*" +sphinxcontrib-qthelp = "*" +sphinxcontrib-serializinghtml = "*" + +[package.extras] +docs = ["sphinxcontrib-websupport"] +lint = ["flake8 (>=3.5.0)", "isort", "mypy (>=0.790)", "docutils-stubs"] +test = ["pytest", "pytest-cov", "html5lib", "cython", "typed-ast"] + +[[package]] +name = "sphinxcontrib-applehelp" +version = "1.0.2" +description = "sphinxcontrib-applehelp is a sphinx extension which outputs Apple help books" +category = "dev" +optional = false +python-versions = ">=3.5" + +[package.extras] +lint = ["flake8", "mypy", "docutils-stubs"] +test = ["pytest"] + +[[package]] +name = "sphinxcontrib-devhelp" +version = "1.0.2" +description = "sphinxcontrib-devhelp is a sphinx extension which outputs Devhelp document." +category = "dev" +optional = false +python-versions = ">=3.5" + +[package.extras] +lint = ["flake8", "mypy", "docutils-stubs"] +test = ["pytest"] + +[[package]] +name = "sphinxcontrib-htmlhelp" +version = "1.0.3" +description = "sphinxcontrib-htmlhelp is a sphinx extension which renders HTML help files" +category = "dev" +optional = false +python-versions = ">=3.5" + +[package.extras] +lint = ["flake8", "mypy", "docutils-stubs"] +test = ["pytest", "html5lib"] + +[[package]] +name = "sphinxcontrib-jsmath" +version = "1.0.1" +description = "A sphinx extension which renders display math in HTML via JavaScript" +category = "dev" +optional = false +python-versions = ">=3.5" + +[package.extras] +test = ["pytest", "flake8", "mypy"] + +[[package]] +name = "sphinxcontrib-qthelp" +version = "1.0.3" +description = "sphinxcontrib-qthelp is a sphinx extension which outputs QtHelp document." +category = "dev" +optional = false +python-versions = ">=3.5" + +[package.extras] +lint = ["flake8", "mypy", "docutils-stubs"] +test = ["pytest"] + +[[package]] +name = "sphinxcontrib-serializinghtml" +version = "1.1.4" +description = "sphinxcontrib-serializinghtml is a sphinx extension which outputs \"serialized\" HTML files (json and pickle)." +category = "dev" +optional = false +python-versions = ">=3.5" + +[package.extras] +lint = ["flake8", "mypy", "docutils-stubs"] +test = ["pytest"] + +[[package]] +name = "typeguard" +version = "2.10.0" +description = "Run-time type checker for Python" +category = "main" +optional = false +python-versions = ">=3.5.3" + +[package.extras] +doc = ["sphinx-rtd-theme", "sphinx-autodoc-typehints (>=1.2.0)"] +test = ["pytest", "typing-extensions"] + +[[package]] +name = "typing-extensions" +version = "3.7.4.3" +description = "Backported and Experimental Type Hints for Python 3.5+" +category = "main" +optional = false +python-versions = "*" + +[[package]] +name = "urllib3" +version = "1.26.3" +description = "HTTP library with thread-safe connection pooling, file post, and more." +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4" + +[package.extras] +brotli = ["brotlipy (>=0.6.0)"] +secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "ipaddress"] +socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] + +[metadata] +lock-version = "1.1" +python-versions = "^3.8" +content-hash = "bd064837654a0d4a4691b3df01338b92c95a449ff400a9cd49fee843ab13ee92" + +[metadata.files] +alabaster = [ + {file = "alabaster-0.7.12-py2.py3-none-any.whl", hash = "sha256:446438bdcca0e05bd45ea2de1668c1d9b032e1a9154c2c259092d77031ddd359"}, + {file = "alabaster-0.7.12.tar.gz", hash = "sha256:a661d72d58e6ea8a57f7a86e37d86716863ee5e92788398526d58b26a4e4dc02"}, +] +apache-libcloud = [ + {file = "apache-libcloud-3.3.1.tar.gz", hash = "sha256:d7450453eaf5904eb4fb4f74cf9f37dc83721a719bce34f5abb336b1a1ab974d"}, + {file = "apache_libcloud-3.3.1-py2.py3-none-any.whl", hash = "sha256:c3722c4dd58b0ee4beaf4e615e0ba82505d9a915e55319dc84383687166a3eed"}, +] +babel = [ + {file = "Babel-2.9.0-py2.py3-none-any.whl", hash = "sha256:9d35c22fcc79893c3ecc85ac4a56cde1ecf3f19c540bba0922308a6c06ca6fa5"}, + {file = "Babel-2.9.0.tar.gz", hash = "sha256:da031ab54472314f210b0adcff1588ee5d1d1d0ba4dbd07b94dba82bde791e05"}, +] +boto = [ + {file = "boto-2.49.0-py2.py3-none-any.whl", hash = "sha256:147758d41ae7240dc989f0039f27da8ca0d53734be0eb869ef16e3adcfa462e8"}, + {file = "boto-2.49.0.tar.gz", hash = "sha256:ea0d3b40a2d852767be77ca343b58a9e3a4b00d9db440efb8da74b4e58025e5a"}, +] +boto3 = [ + {file = "boto3-1.17.0-py2.py3-none-any.whl", hash = "sha256:b4860f56bc585d3d1fde90d288da5eb4d1198401d72201dc3e25de8887b080e2"}, + {file = "boto3-1.17.0.tar.gz", hash = "sha256:2a39bd5e5f2d50ce9267d682cc92750f8771399665021f47e80f9c8d2fb812a6"}, +] +botocore = [ + {file = "botocore-1.20.0-py2.py3-none-any.whl", hash = "sha256:634b39ab0d55477cfbffb0e5dff31b7ab4bb171b04a0c69f8bcf65135f26ba94"}, + {file = "botocore-1.20.0.tar.gz", hash = "sha256:a608d6d644b852f3c154fc433eaae52febbebc7c474fa8f4d666797d0931770a"}, +] +certifi = [ + {file = "certifi-2020.12.5-py2.py3-none-any.whl", hash = "sha256:719a74fb9e33b9bd44cc7f3a8d94bc35e4049deebe19ba7d8e108280cfd59830"}, + {file = "certifi-2020.12.5.tar.gz", hash = "sha256:1a4995114262bffbc2413b159f2a1a480c969de6e6eb13ee966d470af86af59c"}, +] +cffi = [ + {file = "cffi-1.14.4-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:ebb253464a5d0482b191274f1c8bf00e33f7e0b9c66405fbffc61ed2c839c775"}, + {file = "cffi-1.14.4-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:2c24d61263f511551f740d1a065eb0212db1dbbbbd241db758f5244281590c06"}, + {file = "cffi-1.14.4-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:9f7a31251289b2ab6d4012f6e83e58bc3b96bd151f5b5262467f4bb6b34a7c26"}, + {file = "cffi-1.14.4-cp27-cp27m-win32.whl", hash = "sha256:5cf4be6c304ad0b6602f5c4e90e2f59b47653ac1ed9c662ed379fe48a8f26b0c"}, + {file = "cffi-1.14.4-cp27-cp27m-win_amd64.whl", hash = "sha256:f60567825f791c6f8a592f3c6e3bd93dd2934e3f9dac189308426bd76b00ef3b"}, + {file = "cffi-1.14.4-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:c6332685306b6417a91b1ff9fae889b3ba65c2292d64bd9245c093b1b284809d"}, + {file = "cffi-1.14.4-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:d9efd8b7a3ef378dd61a1e77367f1924375befc2eba06168b6ebfa903a5e59ca"}, + {file = "cffi-1.14.4-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:51a8b381b16ddd370178a65360ebe15fbc1c71cf6f584613a7ea08bfad946698"}, + {file = "cffi-1.14.4-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:1d2c4994f515e5b485fd6d3a73d05526aa0fcf248eb135996b088d25dfa1865b"}, + {file = "cffi-1.14.4-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:af5c59122a011049aad5dd87424b8e65a80e4a6477419c0c1015f73fb5ea0293"}, + {file = "cffi-1.14.4-cp35-cp35m-win32.whl", hash = "sha256:594234691ac0e9b770aee9fcdb8fa02c22e43e5c619456efd0d6c2bf276f3eb2"}, + {file = "cffi-1.14.4-cp35-cp35m-win_amd64.whl", hash = "sha256:64081b3f8f6f3c3de6191ec89d7dc6c86a8a43911f7ecb422c60e90c70be41c7"}, + {file = "cffi-1.14.4-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:f803eaa94c2fcda012c047e62bc7a51b0bdabda1cad7a92a522694ea2d76e49f"}, + {file = "cffi-1.14.4-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:105abaf8a6075dc96c1fe5ae7aae073f4696f2905fde6aeada4c9d2926752362"}, + {file = "cffi-1.14.4-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:0638c3ae1a0edfb77c6765d487fee624d2b1ee1bdfeffc1f0b58c64d149e7eec"}, + {file = "cffi-1.14.4-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:7c6b1dece89874d9541fc974917b631406233ea0440d0bdfbb8e03bf39a49b3b"}, + {file = "cffi-1.14.4-cp36-cp36m-win32.whl", hash = "sha256:155136b51fd733fa94e1c2ea5211dcd4c8879869008fc811648f16541bf99668"}, + {file = "cffi-1.14.4-cp36-cp36m-win_amd64.whl", hash = "sha256:6bc25fc545a6b3d57b5f8618e59fc13d3a3a68431e8ca5fd4c13241cd70d0009"}, + {file = "cffi-1.14.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:a7711edca4dcef1a75257b50a2fbfe92a65187c47dab5a0f1b9b332c5919a3fb"}, + {file = "cffi-1.14.4-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:00e28066507bfc3fe865a31f325c8391a1ac2916219340f87dfad602c3e48e5d"}, + {file = "cffi-1.14.4-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:798caa2a2384b1cbe8a2a139d80734c9db54f9cc155c99d7cc92441a23871c03"}, + {file = "cffi-1.14.4-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:a5ed8c05548b54b998b9498753fb9cadbfd92ee88e884641377d8a8b291bcc01"}, + {file = "cffi-1.14.4-cp37-cp37m-win32.whl", hash = "sha256:00a1ba5e2e95684448de9b89888ccd02c98d512064b4cb987d48f4b40aa0421e"}, + {file = "cffi-1.14.4-cp37-cp37m-win_amd64.whl", hash = "sha256:9cc46bc107224ff5b6d04369e7c595acb700c3613ad7bcf2e2012f62ece80c35"}, + {file = "cffi-1.14.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:df5169c4396adc04f9b0a05f13c074df878b6052430e03f50e68adf3a57aa28d"}, + {file = "cffi-1.14.4-cp38-cp38-manylinux1_i686.whl", hash = "sha256:9ffb888f19d54a4d4dfd4b3f29bc2c16aa4972f1c2ab9c4ab09b8ab8685b9c2b"}, + {file = "cffi-1.14.4-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:8d6603078baf4e11edc4168a514c5ce5b3ba6e3e9c374298cb88437957960a53"}, + {file = "cffi-1.14.4-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:d5ff0621c88ce83a28a10d2ce719b2ee85635e85c515f12bac99a95306da4b2e"}, + {file = "cffi-1.14.4-cp38-cp38-win32.whl", hash = "sha256:b4e248d1087abf9f4c10f3c398896c87ce82a9856494a7155823eb45a892395d"}, + {file = "cffi-1.14.4-cp38-cp38-win_amd64.whl", hash = "sha256:ec80dc47f54e6e9a78181ce05feb71a0353854cc26999db963695f950b5fb375"}, + {file = "cffi-1.14.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:840793c68105fe031f34d6a086eaea153a0cd5c491cde82a74b420edd0a2b909"}, + {file = "cffi-1.14.4-cp39-cp39-manylinux1_i686.whl", hash = "sha256:b18e0a9ef57d2b41f5c68beefa32317d286c3d6ac0484efd10d6e07491bb95dd"}, + {file = "cffi-1.14.4-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:045d792900a75e8b1e1b0ab6787dd733a8190ffcf80e8c8ceb2fb10a29ff238a"}, + {file = "cffi-1.14.4-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:7ef7d4ced6b325e92eb4d3502946c78c5367bc416398d387b39591532536734e"}, + {file = "cffi-1.14.4-cp39-cp39-win32.whl", hash = "sha256:ba4e9e0ae13fc41c6b23299545e5ef73055213e466bd107953e4a013a5ddd7e3"}, + {file = "cffi-1.14.4-cp39-cp39-win_amd64.whl", hash = "sha256:f032b34669220030f905152045dfa27741ce1a6db3324a5bc0b96b6c7420c87b"}, + {file = "cffi-1.14.4.tar.gz", hash = "sha256:1a465cbe98a7fd391d47dce4b8f7e5b921e6cd805ef421d04f5f66ba8f06086c"}, +] +chardet = [ + {file = "chardet-4.0.0-py2.py3-none-any.whl", hash = "sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5"}, + {file = "chardet-4.0.0.tar.gz", hash = "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa"}, +] +colorama = [ + {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"}, + {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"}, +] +cryptography = [ + {file = "cryptography-3.3.1-cp27-cp27m-macosx_10_10_x86_64.whl", hash = "sha256:c366df0401d1ec4e548bebe8f91d55ebcc0ec3137900d214dd7aac8427ef3030"}, + {file = "cryptography-3.3.1-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:9f6b0492d111b43de5f70052e24c1f0951cb9e6022188ebcb1cc3a3d301469b0"}, + {file = "cryptography-3.3.1-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:a69bd3c68b98298f490e84519b954335154917eaab52cf582fa2c5c7efc6e812"}, + {file = "cryptography-3.3.1-cp27-cp27m-win32.whl", hash = "sha256:84ef7a0c10c24a7773163f917f1cb6b4444597efd505a8aed0a22e8c4780f27e"}, + {file = "cryptography-3.3.1-cp27-cp27m-win_amd64.whl", hash = "sha256:594a1db4511bc4d960571536abe21b4e5c3003e8750ab8365fafce71c5d86901"}, + {file = "cryptography-3.3.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:0003a52a123602e1acee177dc90dd201f9bb1e73f24a070db7d36c588e8f5c7d"}, + {file = "cryptography-3.3.1-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:83d9d2dfec70364a74f4e7c70ad04d3ca2e6a08b703606993407bf46b97868c5"}, + {file = "cryptography-3.3.1-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:dc42f645f8f3a489c3dd416730a514e7a91a59510ddaadc09d04224c098d3302"}, + {file = "cryptography-3.3.1-cp36-abi3-manylinux1_x86_64.whl", hash = "sha256:788a3c9942df5e4371c199d10383f44a105d67d401fb4304178020142f020244"}, + {file = "cryptography-3.3.1-cp36-abi3-manylinux2010_x86_64.whl", hash = "sha256:69e836c9e5ff4373ce6d3ab311c1a2eed274793083858d3cd4c7d12ce20d5f9c"}, + {file = "cryptography-3.3.1-cp36-abi3-manylinux2014_aarch64.whl", hash = "sha256:9e21301f7a1e7c03dbea73e8602905a4ebba641547a462b26dd03451e5769e7c"}, + {file = "cryptography-3.3.1-cp36-abi3-win32.whl", hash = "sha256:b4890d5fb9b7a23e3bf8abf5a8a7da8e228f1e97dc96b30b95685df840b6914a"}, + {file = "cryptography-3.3.1-cp36-abi3-win_amd64.whl", hash = "sha256:0e85aaae861d0485eb5a79d33226dd6248d2a9f133b81532c8f5aae37de10ff7"}, + {file = "cryptography-3.3.1.tar.gz", hash = "sha256:7e177e4bea2de937a584b13645cab32f25e3d96fc0bc4a4cf99c27dc77682be6"}, +] +docutils = [ + {file = "docutils-0.16-py2.py3-none-any.whl", hash = "sha256:0c5b78adfbf7762415433f5515cd5c9e762339e23369dbe8000d84a4bf4ab3af"}, + {file = "docutils-0.16.tar.gz", hash = "sha256:c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc"}, +] +idna = [ + {file = "idna-2.10-py2.py3-none-any.whl", hash = "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"}, + {file = "idna-2.10.tar.gz", hash = "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6"}, +] +imagesize = [ + {file = "imagesize-1.2.0-py2.py3-none-any.whl", hash = "sha256:6965f19a6a2039c7d48bca7dba2473069ff854c36ae6f19d2cde309d998228a1"}, + {file = "imagesize-1.2.0.tar.gz", hash = "sha256:b1f6b5a4eab1f73479a50fb79fcf729514a900c341d8503d62a62dbc4127a2b1"}, +] +jinja2 = [ + {file = "Jinja2-2.11.3-py2.py3-none-any.whl", hash = "sha256:03e47ad063331dd6a3f04a43eddca8a966a26ba0c5b7207a9a9e4e08f1b29419"}, + {file = "Jinja2-2.11.3.tar.gz", hash = "sha256:a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6"}, +] +jmespath = [ + {file = "jmespath-0.10.0-py2.py3-none-any.whl", hash = "sha256:cdf6525904cc597730141d61b36f2e4b8ecc257c420fa2f4549bac2c2d0cb72f"}, + {file = "jmespath-0.10.0.tar.gz", hash = "sha256:b85d0567b8666149a93172712e68920734333c0ce7e89b78b3e987f71e5ed4f9"}, +] +libvirt-python = [ + {file = "libvirt-python-6.10.0.tar.gz", hash = "sha256:47a8e90d9f49bc0296d2817f6009e18dbb69844ce10b81c2a2672bccd6f49fd5"}, +] +markupsafe = [ + {file = "MarkupSafe-1.1.1-cp27-cp27m-macosx_10_6_intel.whl", hash = "sha256:09027a7803a62ca78792ad89403b1b7a73a01c8cb65909cd876f7fcebd79b161"}, + {file = "MarkupSafe-1.1.1-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:e249096428b3ae81b08327a63a485ad0878de3fb939049038579ac0ef61e17e7"}, + {file = "MarkupSafe-1.1.1-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:500d4957e52ddc3351cabf489e79c91c17f6e0899158447047588650b5e69183"}, + {file = "MarkupSafe-1.1.1-cp27-cp27m-win32.whl", hash = "sha256:b2051432115498d3562c084a49bba65d97cf251f5a331c64a12ee7e04dacc51b"}, + {file = "MarkupSafe-1.1.1-cp27-cp27m-win_amd64.whl", hash = "sha256:98c7086708b163d425c67c7a91bad6e466bb99d797aa64f965e9d25c12111a5e"}, + {file = "MarkupSafe-1.1.1-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:cd5df75523866410809ca100dc9681e301e3c27567cf498077e8551b6d20e42f"}, + {file = "MarkupSafe-1.1.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:43a55c2930bbc139570ac2452adf3d70cdbb3cfe5912c71cdce1c2c6bbd9c5d1"}, + {file = "MarkupSafe-1.1.1-cp34-cp34m-macosx_10_6_intel.whl", hash = "sha256:1027c282dad077d0bae18be6794e6b6b8c91d58ed8a8d89a89d59693b9131db5"}, + {file = "MarkupSafe-1.1.1-cp34-cp34m-manylinux1_i686.whl", hash = "sha256:62fe6c95e3ec8a7fad637b7f3d372c15ec1caa01ab47926cfdf7a75b40e0eac1"}, + {file = "MarkupSafe-1.1.1-cp34-cp34m-manylinux1_x86_64.whl", hash = "sha256:88e5fcfb52ee7b911e8bb6d6aa2fd21fbecc674eadd44118a9cc3863f938e735"}, + {file = "MarkupSafe-1.1.1-cp34-cp34m-win32.whl", hash = "sha256:ade5e387d2ad0d7ebf59146cc00c8044acbd863725f887353a10df825fc8ae21"}, + {file = "MarkupSafe-1.1.1-cp34-cp34m-win_amd64.whl", hash = "sha256:09c4b7f37d6c648cb13f9230d847adf22f8171b1ccc4d5682398e77f40309235"}, + {file = "MarkupSafe-1.1.1-cp35-cp35m-macosx_10_6_intel.whl", hash = "sha256:79855e1c5b8da654cf486b830bd42c06e8780cea587384cf6545b7d9ac013a0b"}, + {file = "MarkupSafe-1.1.1-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:c8716a48d94b06bb3b2524c2b77e055fb313aeb4ea620c8dd03a105574ba704f"}, + {file = "MarkupSafe-1.1.1-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:7c1699dfe0cf8ff607dbdcc1e9b9af1755371f92a68f706051cc8c37d447c905"}, + {file = "MarkupSafe-1.1.1-cp35-cp35m-win32.whl", hash = "sha256:6dd73240d2af64df90aa7c4e7481e23825ea70af4b4922f8ede5b9e35f78a3b1"}, + {file = "MarkupSafe-1.1.1-cp35-cp35m-win_amd64.whl", hash = "sha256:9add70b36c5666a2ed02b43b335fe19002ee5235efd4b8a89bfcf9005bebac0d"}, + {file = "MarkupSafe-1.1.1-cp36-cp36m-macosx_10_6_intel.whl", hash = "sha256:24982cc2533820871eba85ba648cd53d8623687ff11cbb805be4ff7b4c971aff"}, + {file = "MarkupSafe-1.1.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:d53bc011414228441014aa71dbec320c66468c1030aae3a6e29778a3382d96e5"}, + {file = "MarkupSafe-1.1.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:00bc623926325b26bb9605ae9eae8a215691f33cae5df11ca5424f06f2d1f473"}, + {file = "MarkupSafe-1.1.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:717ba8fe3ae9cc0006d7c451f0bb265ee07739daf76355d06366154ee68d221e"}, + {file = "MarkupSafe-1.1.1-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:3b8a6499709d29c2e2399569d96719a1b21dcd94410a586a18526b143ec8470f"}, + {file = "MarkupSafe-1.1.1-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:84dee80c15f1b560d55bcfe6d47b27d070b4681c699c572af2e3c7cc90a3b8e0"}, + {file = "MarkupSafe-1.1.1-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:b1dba4527182c95a0db8b6060cc98ac49b9e2f5e64320e2b56e47cb2831978c7"}, + {file = "MarkupSafe-1.1.1-cp36-cp36m-win32.whl", hash = "sha256:535f6fc4d397c1563d08b88e485c3496cf5784e927af890fb3c3aac7f933ec66"}, + {file = "MarkupSafe-1.1.1-cp36-cp36m-win_amd64.whl", hash = "sha256:b1282f8c00509d99fef04d8ba936b156d419be841854fe901d8ae224c59f0be5"}, + {file = "MarkupSafe-1.1.1-cp37-cp37m-macosx_10_6_intel.whl", hash = "sha256:8defac2f2ccd6805ebf65f5eeb132adcf2ab57aa11fdf4c0dd5169a004710e7d"}, + {file = "MarkupSafe-1.1.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:bf5aa3cbcfdf57fa2ee9cd1822c862ef23037f5c832ad09cfea57fa846dec193"}, + {file = "MarkupSafe-1.1.1-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:46c99d2de99945ec5cb54f23c8cd5689f6d7177305ebff350a58ce5f8de1669e"}, + {file = "MarkupSafe-1.1.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:ba59edeaa2fc6114428f1637ffff42da1e311e29382d81b339c1817d37ec93c6"}, + {file = "MarkupSafe-1.1.1-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:6fffc775d90dcc9aed1b89219549b329a9250d918fd0b8fa8d93d154918422e1"}, + {file = "MarkupSafe-1.1.1-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:a6a744282b7718a2a62d2ed9d993cad6f5f585605ad352c11de459f4108df0a1"}, + {file = "MarkupSafe-1.1.1-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:195d7d2c4fbb0ee8139a6cf67194f3973a6b3042d742ebe0a9ed36d8b6f0c07f"}, + {file = "MarkupSafe-1.1.1-cp37-cp37m-win32.whl", hash = "sha256:b00c1de48212e4cc9603895652c5c410df699856a2853135b3967591e4beebc2"}, + {file = "MarkupSafe-1.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:9bf40443012702a1d2070043cb6291650a0841ece432556f784f004937f0f32c"}, + {file = "MarkupSafe-1.1.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:6788b695d50a51edb699cb55e35487e430fa21f1ed838122d722e0ff0ac5ba15"}, + {file = "MarkupSafe-1.1.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:cdb132fc825c38e1aeec2c8aa9338310d29d337bebbd7baa06889d09a60a1fa2"}, + {file = "MarkupSafe-1.1.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:13d3144e1e340870b25e7b10b98d779608c02016d5184cfb9927a9f10c689f42"}, + {file = "MarkupSafe-1.1.1-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:acf08ac40292838b3cbbb06cfe9b2cb9ec78fce8baca31ddb87aaac2e2dc3bc2"}, + {file = "MarkupSafe-1.1.1-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:d9be0ba6c527163cbed5e0857c451fcd092ce83947944d6c14bc95441203f032"}, + {file = "MarkupSafe-1.1.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:caabedc8323f1e93231b52fc32bdcde6db817623d33e100708d9a68e1f53b26b"}, + {file = "MarkupSafe-1.1.1-cp38-cp38-win32.whl", hash = "sha256:596510de112c685489095da617b5bcbbac7dd6384aeebeda4df6025d0256a81b"}, + {file = "MarkupSafe-1.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:e8313f01ba26fbbe36c7be1966a7b7424942f670f38e666995b88d012765b9be"}, + {file = "MarkupSafe-1.1.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:d73a845f227b0bfe8a7455ee623525ee656a9e2e749e4742706d80a6065d5e2c"}, + {file = "MarkupSafe-1.1.1-cp39-cp39-manylinux1_i686.whl", hash = "sha256:98bae9582248d6cf62321dcb52aaf5d9adf0bad3b40582925ef7c7f0ed85fceb"}, + {file = "MarkupSafe-1.1.1-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:2beec1e0de6924ea551859edb9e7679da6e4870d32cb766240ce17e0a0ba2014"}, + {file = "MarkupSafe-1.1.1-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:7fed13866cf14bba33e7176717346713881f56d9d2bcebab207f7a036f41b850"}, + {file = "MarkupSafe-1.1.1-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:6f1e273a344928347c1290119b493a1f0303c52f5a5eae5f16d74f48c15d4a85"}, + {file = "MarkupSafe-1.1.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:feb7b34d6325451ef96bc0e36e1a6c0c1c64bc1fbec4b854f4529e51887b1621"}, + {file = "MarkupSafe-1.1.1-cp39-cp39-win32.whl", hash = "sha256:22c178a091fc6630d0d045bdb5992d2dfe14e3259760e713c490da5323866c39"}, + {file = "MarkupSafe-1.1.1-cp39-cp39-win_amd64.whl", hash = "sha256:b7d644ddb4dbd407d31ffb699f1d140bc35478da613b441c582aeb7c43838dd8"}, + {file = "MarkupSafe-1.1.1.tar.gz", hash = "sha256:29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b"}, +] +nixops = [] +nixops-aws = [] +nixops-encrypted-links = [] +nixops-gcp = [] +nixops-virtd = [] +nixopsvbox = [] +nixos-modules-contrib = [] +packaging = [ + {file = "packaging-20.9-py2.py3-none-any.whl", hash = "sha256:67714da7f7bc052e064859c05c595155bd1ee9f69f76557e21f051443c20947a"}, + {file = "packaging-20.9.tar.gz", hash = "sha256:5b327ac1320dc863dca72f4514ecc086f31186744b84a230374cc1fd776feae5"}, +] +pluggy = [ + {file = "pluggy-0.13.1-py2.py3-none-any.whl", hash = "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d"}, + {file = "pluggy-0.13.1.tar.gz", hash = "sha256:15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0"}, +] +prettytable = [ + {file = "prettytable-0.7.2.tar.bz2", hash = "sha256:853c116513625c738dc3ce1aee148b5b5757a86727e67eff6502c7ca59d43c36"}, + {file = "prettytable-0.7.2.tar.gz", hash = "sha256:2d5460dc9db74a32bcc8f9f67de68b2c4f4d2f01fa3bd518764c69156d9cacd9"}, + {file = "prettytable-0.7.2.zip", hash = "sha256:a53da3b43d7a5c229b5e3ca2892ef982c46b7923b51e98f0db49956531211c4f"}, +] +pycparser = [ + {file = "pycparser-2.20-py2.py3-none-any.whl", hash = "sha256:7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705"}, + {file = "pycparser-2.20.tar.gz", hash = "sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0"}, +] +pygments = [ + {file = "Pygments-2.7.4-py3-none-any.whl", hash = "sha256:bc9591213a8f0e0ca1a5e68a479b4887fdc3e75d0774e5c71c31920c427de435"}, + {file = "Pygments-2.7.4.tar.gz", hash = "sha256:df49d09b498e83c1a73128295860250b0b7edd4c723a32e9bc0d295c7c2ec337"}, +] +pyparsing = [ + {file = "pyparsing-2.4.7-py2.py3-none-any.whl", hash = "sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b"}, + {file = "pyparsing-2.4.7.tar.gz", hash = "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1"}, +] +python-dateutil = [ + {file = "python-dateutil-2.8.1.tar.gz", hash = "sha256:73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c"}, + {file = "python_dateutil-2.8.1-py2.py3-none-any.whl", hash = "sha256:75bb3f31ea686f1197762692a9ee6a7550b59fc6ca3a1f4b5d7e32fb98e2da2a"}, +] +pytz = [ + {file = "pytz-2021.1-py2.py3-none-any.whl", hash = "sha256:eb10ce3e7736052ed3623d49975ce333bcd712c7bb19a58b9e2089d4057d0798"}, + {file = "pytz-2021.1.tar.gz", hash = "sha256:83a4a90894bf38e243cf052c8b58f381bfe9a7a483f6a9cab140bc7f702ac4da"}, +] +requests = [ + {file = "requests-2.25.1-py2.py3-none-any.whl", hash = "sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e"}, + {file = "requests-2.25.1.tar.gz", hash = "sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804"}, +] +s3transfer = [ + {file = "s3transfer-0.3.4-py2.py3-none-any.whl", hash = "sha256:1e28620e5b444652ed752cf87c7e0cb15b0e578972568c6609f0f18212f259ed"}, + {file = "s3transfer-0.3.4.tar.gz", hash = "sha256:7fdddb4f22275cf1d32129e21f056337fd2a80b6ccef1664528145b72c49e6d2"}, +] +six = [ + {file = "six-1.15.0-py2.py3-none-any.whl", hash = "sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced"}, + {file = "six-1.15.0.tar.gz", hash = "sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259"}, +] +snowballstemmer = [ + {file = "snowballstemmer-2.1.0-py2.py3-none-any.whl", hash = "sha256:b51b447bea85f9968c13b650126a888aabd4cb4463fca868ec596826325dedc2"}, + {file = "snowballstemmer-2.1.0.tar.gz", hash = "sha256:e997baa4f2e9139951b6f4c631bad912dfd3c792467e2f03d7239464af90e914"}, +] +sphinx = [ + {file = "Sphinx-3.4.3-py3-none-any.whl", hash = "sha256:c314c857e7cd47c856d2c5adff514ac2e6495f8b8e0f886a8a37e9305dfea0d8"}, + {file = "Sphinx-3.4.3.tar.gz", hash = "sha256:41cad293f954f7d37f803d97eb184158cfd90f51195131e94875bc07cd08b93c"}, +] +sphinxcontrib-applehelp = [ + {file = "sphinxcontrib-applehelp-1.0.2.tar.gz", hash = "sha256:a072735ec80e7675e3f432fcae8610ecf509c5f1869d17e2eecff44389cdbc58"}, + {file = "sphinxcontrib_applehelp-1.0.2-py2.py3-none-any.whl", hash = "sha256:806111e5e962be97c29ec4c1e7fe277bfd19e9652fb1a4392105b43e01af885a"}, +] +sphinxcontrib-devhelp = [ + {file = "sphinxcontrib-devhelp-1.0.2.tar.gz", hash = "sha256:ff7f1afa7b9642e7060379360a67e9c41e8f3121f2ce9164266f61b9f4b338e4"}, + {file = "sphinxcontrib_devhelp-1.0.2-py2.py3-none-any.whl", hash = "sha256:8165223f9a335cc1af7ffe1ed31d2871f325254c0423bc0c4c7cd1c1e4734a2e"}, +] +sphinxcontrib-htmlhelp = [ + {file = "sphinxcontrib-htmlhelp-1.0.3.tar.gz", hash = "sha256:e8f5bb7e31b2dbb25b9cc435c8ab7a79787ebf7f906155729338f3156d93659b"}, + {file = "sphinxcontrib_htmlhelp-1.0.3-py2.py3-none-any.whl", hash = "sha256:3c0bc24a2c41e340ac37c85ced6dafc879ab485c095b1d65d2461ac2f7cca86f"}, +] +sphinxcontrib-jsmath = [ + {file = "sphinxcontrib-jsmath-1.0.1.tar.gz", hash = "sha256:a9925e4a4587247ed2191a22df5f6970656cb8ca2bd6284309578f2153e0c4b8"}, + {file = "sphinxcontrib_jsmath-1.0.1-py2.py3-none-any.whl", hash = "sha256:2ec2eaebfb78f3f2078e73666b1415417a116cc848b72e5172e596c871103178"}, +] +sphinxcontrib-qthelp = [ + {file = "sphinxcontrib-qthelp-1.0.3.tar.gz", hash = "sha256:4c33767ee058b70dba89a6fc5c1892c0d57a54be67ddd3e7875a18d14cba5a72"}, + {file = "sphinxcontrib_qthelp-1.0.3-py2.py3-none-any.whl", hash = "sha256:bd9fc24bcb748a8d51fd4ecaade681350aa63009a347a8c14e637895444dfab6"}, +] +sphinxcontrib-serializinghtml = [ + {file = "sphinxcontrib-serializinghtml-1.1.4.tar.gz", hash = "sha256:eaa0eccc86e982a9b939b2b82d12cc5d013385ba5eadcc7e4fed23f4405f77bc"}, + {file = "sphinxcontrib_serializinghtml-1.1.4-py2.py3-none-any.whl", hash = "sha256:f242a81d423f59617a8e5cf16f5d4d74e28ee9a66f9e5b637a18082991db5a9a"}, +] +typeguard = [ + {file = "typeguard-2.10.0-py3-none-any.whl", hash = "sha256:a75c6d86ac9d1faf85c5ae952de473e5d26824dda6d4394ff6bc676849cfb939"}, + {file = "typeguard-2.10.0.tar.gz", hash = "sha256:d830132dcd544d3f8a2a842ea739eaa0d7c099fcebb9dcdf3802f4c9929d8191"}, +] +typing-extensions = [ + {file = "typing_extensions-3.7.4.3-py2-none-any.whl", hash = "sha256:dafc7639cde7f1b6e1acc0f457842a83e722ccca8eef5270af2d74792619a89f"}, + {file = "typing_extensions-3.7.4.3-py3-none-any.whl", hash = "sha256:7cb407020f00f7bfc3cb3e7881628838e69d8f3fcab2f64742a5e76b2f841918"}, + {file = "typing_extensions-3.7.4.3.tar.gz", hash = "sha256:99d4073b617d30288f569d3f13d2bd7548c3a7e4c8de87db09a9d29bb3a4a60c"}, +] +urllib3 = [ + {file = "urllib3-1.26.3-py2.py3-none-any.whl", hash = "sha256:1b465e494e3e0d8939b50680403e3aedaa2bc434b7d5af64dfd3c958d7f5ae80"}, + {file = "urllib3-1.26.3.tar.gz", hash = "sha256:de3eedaad74a2683334e282005cd8d7f22f4d55fa690a2a1020a416cb0a47e73"}, +] diff --git a/pkgs/applications/networking/cluster/nixops/pyproject.toml b/pkgs/applications/networking/cluster/nixops/pyproject.toml new file mode 100644 index 000000000000..09ffb54fa2bb --- /dev/null +++ b/pkgs/applications/networking/cluster/nixops/pyproject.toml @@ -0,0 +1,21 @@ +[tool.poetry] +name = "nixopsenv" +version = "2.0.0" +description = "NixOps 2.0" +authors = ["Adam Hoese "] + +[tool.poetry.dependencies] +python = "^3.8" +nixops = {git = "https://github.com/NixOS/nixops.git"} +nixops-aws = {git = "https://github.com/NixOS/nixops-aws.git"} +nixops-gcp = {git = "https://github.com/nix-community/nixops-gce.git"} +nixopsvbox = {git = "https://github.com/nix-community/nixops-vbox.git"} +nixops-encrypted-links = {git = "https://github.com/nix-community/nixops-encrypted-links.git"} +nixops-virtd = {git = "https://github.com/nix-community/nixops-libvirtd.git"} + +[tool.poetry.dev-dependencies] +sphinx = "^3.1.2" + +[build-system] +requires = ["poetry>=0.12"] +build-backend = "poetry.masonry.api" diff --git a/pkgs/applications/networking/cluster/nixops/shell.nix b/pkgs/applications/networking/cluster/nixops/shell.nix new file mode 100644 index 000000000000..6d298b8df83e --- /dev/null +++ b/pkgs/applications/networking/cluster/nixops/shell.nix @@ -0,0 +1,10 @@ +{ pkgs ? import {} }: + +pkgs.mkShell { + buildInputs = [ + pkgs.poetry2nix.cli + pkgs.pkgconfig + pkgs.libvirt + pkgs.poetry + ]; +} diff --git a/pkgs/applications/networking/cluster/nixops/update b/pkgs/applications/networking/cluster/nixops/update new file mode 100755 index 000000000000..1d1fd93fdbea --- /dev/null +++ b/pkgs/applications/networking/cluster/nixops/update @@ -0,0 +1,11 @@ +#!/usr/bin/env nix-shell +#! nix-shell -I nixpkgs=../../../../../. -i bash +set -eux + +rm -f ./poetry.lock ./poetry-git-overlay.nix + +poetry lock + +# builtins.fetchGit is disabled in restricted eval +# Pin fixed-output derivations from lock file +poetry2nix lock diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index 9f60c014c767..b974b507980a 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "src/electron-main.js", - "version": "1.7.18", + "version": "1.7.19", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { @@ -30,19 +30,19 @@ "hak": "node scripts/hak/index.js" }, "dependencies": { - "auto-launch": "^5.0.1", - "electron-store": "^2.0.0", - "electron-window-state": "^4.1.0", + "auto-launch": "^5.0.5", + "electron-store": "^6.0.1", + "electron-window-state": "^5.0.3", "minimist": "^1.2.3", - "png-to-ico": "^2.1.0", + "png-to-ico": "^2.1.1", "request": "^2.88.2" }, "devDependencies": { "asar": "^2.0.1", - "electron-builder": "^22.7.0", - "electron-builder-squirrel-windows": "^22.7.0", - "electron-devtools-installer": "^2.2.4", - "electron-notarize": "^0.2.0", + "electron-builder": "22.9.1", + "electron-builder-squirrel-windows": "22.9.1", + "electron-devtools-installer": "^3.1.1", + "electron-notarize": "^1.0.0", "eslint": "7.3.1", "eslint-config-matrix-org": "^0.1.2", "find-npm-prefix": "^1.0.2", @@ -51,10 +51,10 @@ "mkdirp": "^1.0.3", "needle": "^2.5.0", "node-pre-gyp": "^0.15.0", - "npm": "^6.14.6", + "npm": "^6.14.11", "rimraf": "^3.0.2", - "semver": "^7.1.3", - "tar": "^6.0.1" + "semver": "^7.3.4", + "tar": "^6.1.0" }, "hakDependencies": { "matrix-seshat": "^2.2.3", diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix index 08c3d2554c9a..a0fb802ac042 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix @@ -9,14 +9,6 @@ sha1 = "bc5b5532ecafd923a61f2fb097e3b108c0106a3f"; }; } - { - name = "7zip___7zip_0.0.6.tgz"; - path = fetchurl { - name = "7zip___7zip_0.0.6.tgz"; - url = "https://registry.yarnpkg.com/7zip/-/7zip-0.0.6.tgz"; - sha1 = "9cafb171af82329490353b4816f03347aa150a30"; - }; - } { name = "_babel_code_frame___code_frame_7.5.5.tgz"; path = fetchurl { @@ -146,251 +138,251 @@ }; } { - name = "_jimp_bmp___bmp_0.9.8.tgz"; + name = "_jimp_bmp___bmp_0.16.1.tgz"; path = fetchurl { - name = "_jimp_bmp___bmp_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/bmp/-/bmp-0.9.8.tgz"; - sha1 = "5933ab8fb359889bec380b0f7802163374933624"; + name = "_jimp_bmp___bmp_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/bmp/-/bmp-0.16.1.tgz"; + sha1 = "6e2da655b2ba22e721df0795423f34e92ef13768"; }; } { - name = "_jimp_core___core_0.9.8.tgz"; + name = "_jimp_core___core_0.16.1.tgz"; path = fetchurl { - name = "_jimp_core___core_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/core/-/core-0.9.8.tgz"; - sha1 = "b2b74263a80559c0ee244e0f2d1052b36a358b85"; + name = "_jimp_core___core_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/core/-/core-0.16.1.tgz"; + sha1 = "68c4288f6ef7f31a0f6b859ba3fb28dae930d39d"; }; } { - name = "_jimp_custom___custom_0.9.8.tgz"; + name = "_jimp_custom___custom_0.16.1.tgz"; path = fetchurl { - name = "_jimp_custom___custom_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/custom/-/custom-0.9.8.tgz"; - sha1 = "1e9d904b1b05aa22b00b899baba2be7c0704a5d1"; + name = "_jimp_custom___custom_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/custom/-/custom-0.16.1.tgz"; + sha1 = "28b659c59e20a1d75a0c46067bd3f4bd302cf9c5"; }; } { - name = "_jimp_gif___gif_0.9.8.tgz"; + name = "_jimp_gif___gif_0.16.1.tgz"; path = fetchurl { - name = "_jimp_gif___gif_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/gif/-/gif-0.9.8.tgz"; - sha1 = "513aff511634c338d1ab33a7bba1ba3412220b5b"; + name = "_jimp_gif___gif_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/gif/-/gif-0.16.1.tgz"; + sha1 = "d1f7c3a58f4666482750933af8b8f4666414f3ca"; }; } { - name = "_jimp_jpeg___jpeg_0.9.8.tgz"; + name = "_jimp_jpeg___jpeg_0.16.1.tgz"; path = fetchurl { - name = "_jimp_jpeg___jpeg_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/jpeg/-/jpeg-0.9.8.tgz"; - sha1 = "8c086f69d0e8c46e43a7db9725576edc30925cb1"; + name = "_jimp_jpeg___jpeg_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/jpeg/-/jpeg-0.16.1.tgz"; + sha1 = "3b7bb08a4173f2f6d81f3049b251df3ee2ac8175"; }; } { - name = "_jimp_plugin_blit___plugin_blit_0.9.8.tgz"; + name = "_jimp_plugin_blit___plugin_blit_0.16.1.tgz"; path = fetchurl { - name = "_jimp_plugin_blit___plugin_blit_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-blit/-/plugin-blit-0.9.8.tgz"; - sha1 = "916bf6f261e6a91dbecca0ca866b8d9cba563753"; + name = "_jimp_plugin_blit___plugin_blit_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-blit/-/plugin-blit-0.16.1.tgz"; + sha1 = "09ea919f9d326de3b9c2826fe4155da37dde8edb"; }; } { - name = "_jimp_plugin_blur___plugin_blur_0.9.8.tgz"; + name = "_jimp_plugin_blur___plugin_blur_0.16.1.tgz"; path = fetchurl { - name = "_jimp_plugin_blur___plugin_blur_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-blur/-/plugin-blur-0.9.8.tgz"; - sha1 = "00055d54b90532b7951dae377b3e40352c187f07"; + name = "_jimp_plugin_blur___plugin_blur_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-blur/-/plugin-blur-0.16.1.tgz"; + sha1 = "e614fa002797dcd662e705d4cea376e7db968bf5"; }; } { - name = "_jimp_plugin_circle___plugin_circle_0.9.8.tgz"; + name = "_jimp_plugin_circle___plugin_circle_0.16.1.tgz"; path = fetchurl { - name = "_jimp_plugin_circle___plugin_circle_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-circle/-/plugin-circle-0.9.8.tgz"; - sha1 = "5de8735f32f931d9160d0f5211e9aab6413a1d4b"; + name = "_jimp_plugin_circle___plugin_circle_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-circle/-/plugin-circle-0.16.1.tgz"; + sha1 = "20e3194a67ca29740aba2630fd4d0a89afa27491"; }; } { - name = "_jimp_plugin_color___plugin_color_0.9.8.tgz"; + name = "_jimp_plugin_color___plugin_color_0.16.1.tgz"; path = fetchurl { - name = "_jimp_plugin_color___plugin_color_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-color/-/plugin-color-0.9.8.tgz"; - sha1 = "3c633f22955a4f5013025e9e9e78a267ac4c3a88"; + name = "_jimp_plugin_color___plugin_color_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-color/-/plugin-color-0.16.1.tgz"; + sha1 = "0f298ba74dee818b663834cd80d53e56f3755233"; }; } { - name = "_jimp_plugin_contain___plugin_contain_0.9.8.tgz"; + name = "_jimp_plugin_contain___plugin_contain_0.16.1.tgz"; path = fetchurl { - name = "_jimp_plugin_contain___plugin_contain_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-contain/-/plugin-contain-0.9.8.tgz"; - sha1 = "f892fb7fc87134a47b37281f0ff17d608f3e51af"; + name = "_jimp_plugin_contain___plugin_contain_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-contain/-/plugin-contain-0.16.1.tgz"; + sha1 = "3c5f5c495fd9bb08a970739d83694934f58123f2"; }; } { - name = "_jimp_plugin_cover___plugin_cover_0.9.8.tgz"; + name = "_jimp_plugin_cover___plugin_cover_0.16.1.tgz"; path = fetchurl { - name = "_jimp_plugin_cover___plugin_cover_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-cover/-/plugin-cover-0.9.8.tgz"; - sha1 = "37474b19027ac0155100b71ca17266aab19e50fc"; + name = "_jimp_plugin_cover___plugin_cover_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-cover/-/plugin-cover-0.16.1.tgz"; + sha1 = "0e8caec16a40abe15b1b32e5383a603a3306dc41"; }; } { - name = "_jimp_plugin_crop___plugin_crop_0.9.8.tgz"; + name = "_jimp_plugin_crop___plugin_crop_0.16.1.tgz"; path = fetchurl { - name = "_jimp_plugin_crop___plugin_crop_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-crop/-/plugin-crop-0.9.8.tgz"; - sha1 = "2308696597a8bcb528d09eeebbbadb22248e7c1c"; + name = "_jimp_plugin_crop___plugin_crop_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-crop/-/plugin-crop-0.16.1.tgz"; + sha1 = "b362497c873043fe47ba881ab08604bf7226f50f"; }; } { - name = "_jimp_plugin_displace___plugin_displace_0.9.8.tgz"; + name = "_jimp_plugin_displace___plugin_displace_0.16.1.tgz"; path = fetchurl { - name = "_jimp_plugin_displace___plugin_displace_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-displace/-/plugin-displace-0.9.8.tgz"; - sha1 = "00331047039cb2d0d9d5f7c3d8ce542e07eea791"; + name = "_jimp_plugin_displace___plugin_displace_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-displace/-/plugin-displace-0.16.1.tgz"; + sha1 = "4dd9db518c3e78de9d723f86a234bf98922afe8d"; }; } { - name = "_jimp_plugin_dither___plugin_dither_0.9.8.tgz"; + name = "_jimp_plugin_dither___plugin_dither_0.16.1.tgz"; path = fetchurl { - name = "_jimp_plugin_dither___plugin_dither_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-dither/-/plugin-dither-0.9.8.tgz"; - sha1 = "9cca12997f2917f27d5681275b32affdb3083450"; + name = "_jimp_plugin_dither___plugin_dither_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-dither/-/plugin-dither-0.16.1.tgz"; + sha1 = "b47de2c0bb09608bed228b41c3cd01a85ec2d45b"; }; } { - name = "_jimp_plugin_fisheye___plugin_fisheye_0.9.8.tgz"; + name = "_jimp_plugin_fisheye___plugin_fisheye_0.16.1.tgz"; path = fetchurl { - name = "_jimp_plugin_fisheye___plugin_fisheye_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-fisheye/-/plugin-fisheye-0.9.8.tgz"; - sha1 = "e3f5f616ec06a9ef99aa268446f0096eac863437"; + name = "_jimp_plugin_fisheye___plugin_fisheye_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-fisheye/-/plugin-fisheye-0.16.1.tgz"; + sha1 = "f625047b6cdbe1b83b89e9030fd025ab19cdb1a4"; }; } { - name = "_jimp_plugin_flip___plugin_flip_0.9.8.tgz"; + name = "_jimp_plugin_flip___plugin_flip_0.16.1.tgz"; path = fetchurl { - name = "_jimp_plugin_flip___plugin_flip_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-flip/-/plugin-flip-0.9.8.tgz"; - sha1 = "c00559a8543a684c7cff4d1128b7152e598fbb1c"; + name = "_jimp_plugin_flip___plugin_flip_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-flip/-/plugin-flip-0.16.1.tgz"; + sha1 = "7a99ea22bde802641017ed0f2615870c144329bb"; }; } { - name = "_jimp_plugin_gaussian___plugin_gaussian_0.9.8.tgz"; + name = "_jimp_plugin_gaussian___plugin_gaussian_0.16.1.tgz"; path = fetchurl { - name = "_jimp_plugin_gaussian___plugin_gaussian_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-gaussian/-/plugin-gaussian-0.9.8.tgz"; - sha1 = "d1666167ce1b947b65db5093bb9a00d319bcfe4d"; + name = "_jimp_plugin_gaussian___plugin_gaussian_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-gaussian/-/plugin-gaussian-0.16.1.tgz"; + sha1 = "0845e314085ccd52e34fad9a83949bc0d81a68e8"; }; } { - name = "_jimp_plugin_invert___plugin_invert_0.9.8.tgz"; + name = "_jimp_plugin_invert___plugin_invert_0.16.1.tgz"; path = fetchurl { - name = "_jimp_plugin_invert___plugin_invert_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-invert/-/plugin-invert-0.9.8.tgz"; - sha1 = "41d6e87faf01a5d8fe7554e322d2aad25f596ab1"; + name = "_jimp_plugin_invert___plugin_invert_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-invert/-/plugin-invert-0.16.1.tgz"; + sha1 = "7e6f5a15707256f3778d06921675bbcf18545c97"; }; } { - name = "_jimp_plugin_mask___plugin_mask_0.9.8.tgz"; + name = "_jimp_plugin_mask___plugin_mask_0.16.1.tgz"; path = fetchurl { - name = "_jimp_plugin_mask___plugin_mask_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-mask/-/plugin-mask-0.9.8.tgz"; - sha1 = "fe92132db1a2b9f7718226bc3c37794dd148ce36"; + name = "_jimp_plugin_mask___plugin_mask_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-mask/-/plugin-mask-0.16.1.tgz"; + sha1 = "e7f2460e05c3cda7af5e76f33ccb0579f66f90df"; }; } { - name = "_jimp_plugin_normalize___plugin_normalize_0.9.8.tgz"; + name = "_jimp_plugin_normalize___plugin_normalize_0.16.1.tgz"; path = fetchurl { - name = "_jimp_plugin_normalize___plugin_normalize_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-normalize/-/plugin-normalize-0.9.8.tgz"; - sha1 = "05646aa15b6a789c4ba447edcad77c83c1d51f16"; + name = "_jimp_plugin_normalize___plugin_normalize_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-normalize/-/plugin-normalize-0.16.1.tgz"; + sha1 = "032dfd88eefbc4dedc8b1b2d243832e4f3af30c8"; }; } { - name = "_jimp_plugin_print___plugin_print_0.9.8.tgz"; + name = "_jimp_plugin_print___plugin_print_0.16.1.tgz"; path = fetchurl { - name = "_jimp_plugin_print___plugin_print_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-print/-/plugin-print-0.9.8.tgz"; - sha1 = "808f723176d0a57186d7558290c7e53a7a8bf812"; + name = "_jimp_plugin_print___plugin_print_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-print/-/plugin-print-0.16.1.tgz"; + sha1 = "66b803563f9d109825970714466e6ab9ae639ff6"; }; } { - name = "_jimp_plugin_resize___plugin_resize_0.9.8.tgz"; + name = "_jimp_plugin_resize___plugin_resize_0.16.1.tgz"; path = fetchurl { - name = "_jimp_plugin_resize___plugin_resize_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-resize/-/plugin-resize-0.9.8.tgz"; - sha1 = "eef750b77f1cc06e8bcf9b390860c95c489dcc02"; + name = "_jimp_plugin_resize___plugin_resize_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-resize/-/plugin-resize-0.16.1.tgz"; + sha1 = "65e39d848ed13ba2d6c6faf81d5d590396571d10"; }; } { - name = "_jimp_plugin_rotate___plugin_rotate_0.9.8.tgz"; + name = "_jimp_plugin_rotate___plugin_rotate_0.16.1.tgz"; path = fetchurl { - name = "_jimp_plugin_rotate___plugin_rotate_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-rotate/-/plugin-rotate-0.9.8.tgz"; - sha1 = "5eba01f75a397777c6782b7999c9ac6c7ed8a411"; + name = "_jimp_plugin_rotate___plugin_rotate_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-rotate/-/plugin-rotate-0.16.1.tgz"; + sha1 = "53fb5d51a4b3d05af9c91c2a8fffe5d7a1a47c8c"; }; } { - name = "_jimp_plugin_scale___plugin_scale_0.9.8.tgz"; + name = "_jimp_plugin_scale___plugin_scale_0.16.1.tgz"; path = fetchurl { - name = "_jimp_plugin_scale___plugin_scale_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-scale/-/plugin-scale-0.9.8.tgz"; - sha1 = "c875d5e0b377b15b8b398ee402f45e3fc43fea40"; + name = "_jimp_plugin_scale___plugin_scale_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-scale/-/plugin-scale-0.16.1.tgz"; + sha1 = "89f6ba59feed3429847ed226aebda33a240cc647"; }; } { - name = "_jimp_plugin_shadow___plugin_shadow_0.9.8.tgz"; + name = "_jimp_plugin_shadow___plugin_shadow_0.16.1.tgz"; path = fetchurl { - name = "_jimp_plugin_shadow___plugin_shadow_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-shadow/-/plugin-shadow-0.9.8.tgz"; - sha1 = "ca2d18afa29a1027b77b3e1fb2ce7d4e073a7170"; + name = "_jimp_plugin_shadow___plugin_shadow_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-shadow/-/plugin-shadow-0.16.1.tgz"; + sha1 = "a7af892a740febf41211e10a5467c3c5c521a04c"; }; } { - name = "_jimp_plugin_threshold___plugin_threshold_0.9.8.tgz"; + name = "_jimp_plugin_threshold___plugin_threshold_0.16.1.tgz"; path = fetchurl { - name = "_jimp_plugin_threshold___plugin_threshold_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-threshold/-/plugin-threshold-0.9.8.tgz"; - sha1 = "2d1dde0791f70b2ff2d0b915cab8d40b0e446594"; + name = "_jimp_plugin_threshold___plugin_threshold_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-threshold/-/plugin-threshold-0.16.1.tgz"; + sha1 = "34f3078f9965145b7ae26c53a32ad74b1195bbf5"; }; } { - name = "_jimp_plugins___plugins_0.9.8.tgz"; + name = "_jimp_plugins___plugins_0.16.1.tgz"; path = fetchurl { - name = "_jimp_plugins___plugins_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugins/-/plugins-0.9.8.tgz"; - sha1 = "5279dfe22d0d27633f4201ab36103e587b32eb85"; + name = "_jimp_plugins___plugins_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugins/-/plugins-0.16.1.tgz"; + sha1 = "9f08544c97226d6460a16ced79f57e85bec3257b"; }; } { - name = "_jimp_png___png_0.9.8.tgz"; + name = "_jimp_png___png_0.16.1.tgz"; path = fetchurl { - name = "_jimp_png___png_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/png/-/png-0.9.8.tgz"; - sha1 = "f88dacc9b9da1c2ea8e91026a9530d0fb45c4409"; + name = "_jimp_png___png_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/png/-/png-0.16.1.tgz"; + sha1 = "f24cfc31529900b13a2dd9d4fdb4460c1e4d814e"; }; } { - name = "_jimp_tiff___tiff_0.9.8.tgz"; + name = "_jimp_tiff___tiff_0.16.1.tgz"; path = fetchurl { - name = "_jimp_tiff___tiff_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/tiff/-/tiff-0.9.8.tgz"; - sha1 = "91dc3eab2f222e23414f139e917f3407caa73560"; + name = "_jimp_tiff___tiff_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/tiff/-/tiff-0.16.1.tgz"; + sha1 = "0e8756695687d7574b6bc73efab0acd4260b7a12"; }; } { - name = "_jimp_types___types_0.9.8.tgz"; + name = "_jimp_types___types_0.16.1.tgz"; path = fetchurl { - name = "_jimp_types___types_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/types/-/types-0.9.8.tgz"; - sha1 = "46980a4a7bfcadf2f0484d187c32b4e7d6d61b8e"; + name = "_jimp_types___types_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/types/-/types-0.16.1.tgz"; + sha1 = "0dbab37b3202315c91010f16c31766d35a2322cc"; }; } { - name = "_jimp_utils___utils_0.9.8.tgz"; + name = "_jimp_utils___utils_0.16.1.tgz"; path = fetchurl { - name = "_jimp_utils___utils_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/@jimp/utils/-/utils-0.9.8.tgz"; - sha1 = "6a6f47158ec6b424f03df0f55f0baff5b4b5e096"; + name = "_jimp_utils___utils_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@jimp/utils/-/utils-0.16.1.tgz"; + sha1 = "2f51e6f14ff8307c4aa83d5e1a277da14a9fe3f7"; }; } { @@ -466,11 +458,11 @@ }; } { - name = "_types_node___node_13.13.21.tgz"; + name = "_types_node___node_14.14.21.tgz"; path = fetchurl { - name = "_types_node___node_13.13.21.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-13.13.21.tgz"; - sha1 = "e48d3c2e266253405cf404c8654d1bcf0d333e5c"; + name = "_types_node___node_14.14.21.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.14.21.tgz"; + sha1 = "d934aacc22424fe9622ebf6857370c052eae464e"; }; } { @@ -625,6 +617,14 @@ sha1 = "c629c5eced17baf314437918d2da88c99d5958cd"; }; } + { + name = "ajv___ajv_6.12.6.tgz"; + path = fetchurl { + name = "ajv___ajv_6.12.6.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz"; + sha1 = "baf5a62e802b07d977034586f8c3baf5adf26df4"; + }; + } { name = "ajv___ajv_6.12.5.tgz"; path = fetchurl { @@ -738,19 +738,19 @@ }; } { - name = "app_builder_bin___app_builder_bin_3.5.9.tgz"; + name = "app_builder_bin___app_builder_bin_3.5.10.tgz"; path = fetchurl { - name = "app_builder_bin___app_builder_bin_3.5.9.tgz"; - url = "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.9.tgz"; - sha1 = "a3ac0c25286bac68357321cb2eaf7128b0bc0a4f"; + name = "app_builder_bin___app_builder_bin_3.5.10.tgz"; + url = "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.10.tgz"; + sha1 = "4a7f9999fccc0c435b6284ae1366bc76a17c4a7d"; }; } { - name = "app_builder_lib___app_builder_lib_22.7.0.tgz"; + name = "app_builder_lib___app_builder_lib_22.9.1.tgz"; path = fetchurl { - name = "app_builder_lib___app_builder_lib_22.7.0.tgz"; - url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.7.0.tgz"; - sha1 = "ccd3e7ece2d46bc209423a77aa142f74aaf65db0"; + name = "app_builder_lib___app_builder_lib_22.9.1.tgz"; + url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.9.1.tgz"; + sha1 = "ccb8f1a02b628514a5dfab9401fa2a976689415c"; }; } { @@ -786,11 +786,11 @@ }; } { - name = "archiver___archiver_4.0.1.tgz"; + name = "archiver___archiver_5.2.0.tgz"; path = fetchurl { - name = "archiver___archiver_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/archiver/-/archiver-4.0.1.tgz"; - sha1 = "3f722b121777e361ca9fad374ecda38e77e63c7f"; + name = "archiver___archiver_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/archiver/-/archiver-5.2.0.tgz"; + sha1 = "25aa1b3d9febf7aec5b0f296e77e69960c26db94"; }; } { @@ -898,11 +898,11 @@ }; } { - name = "async___async_2.6.3.tgz"; + name = "async___async_3.2.0.tgz"; path = fetchurl { - name = "async___async_2.6.3.tgz"; - url = "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz"; - sha1 = "d72625e2344a3656e3a3ad4fa749fa83299d82ff"; + name = "async___async_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz"; + sha1 = "b3a2685c5ebb641d3de02d161002c60fc9f85720"; }; } { @@ -921,6 +921,14 @@ sha1 = "602cd4b46e844ad4effc92a8011a3c46e0238dc2"; }; } + { + name = "atomically___atomically_1.7.0.tgz"; + path = fetchurl { + name = "atomically___atomically_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/atomically/-/atomically-1.7.0.tgz"; + sha1 = "c07a0458432ea6dbc9a3506fffa424b48bccaafe"; + }; + } { name = "auto_launch___auto_launch_5.0.5.tgz"; path = fetchurl { @@ -985,6 +993,14 @@ sha1 = "34b79ea9d0e575d7308afeff0c6b2fc24c793359"; }; } + { + name = "bin_links___bin_links_1.1.8.tgz"; + path = fetchurl { + name = "bin_links___bin_links_1.1.8.tgz"; + url = "https://registry.yarnpkg.com/bin-links/-/bin-links-1.1.8.tgz"; + sha1 = "bd39aadab5dc4bdac222a07df5baf1af745b2228"; + }; + } { name = "bl___bl_4.0.3.tgz"; path = fetchurl { @@ -1074,19 +1090,19 @@ }; } { - name = "builder_util_runtime___builder_util_runtime_8.7.1.tgz"; + name = "builder_util_runtime___builder_util_runtime_8.7.2.tgz"; path = fetchurl { - name = "builder_util_runtime___builder_util_runtime_8.7.1.tgz"; - url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.1.tgz"; - sha1 = "23c808cddd650d4376a7a1518ec1e80e85c10f00"; + name = "builder_util_runtime___builder_util_runtime_8.7.2.tgz"; + url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.2.tgz"; + sha1 = "d93afc71428a12789b437e13850e1fa7da956d72"; }; } { - name = "builder_util___builder_util_22.7.0.tgz"; + name = "builder_util___builder_util_22.9.1.tgz"; path = fetchurl { - name = "builder_util___builder_util_22.7.0.tgz"; - url = "https://registry.yarnpkg.com/builder-util/-/builder-util-22.7.0.tgz"; - sha1 = "0776a66e6d6e408a78bed7f17a7ad22516d9e7f0"; + name = "builder_util___builder_util_22.9.1.tgz"; + url = "https://registry.yarnpkg.com/builder-util/-/builder-util-22.9.1.tgz"; + sha1 = "b7087a5cde477f90d718ca5d7fafb6ae261b16af"; }; } { @@ -1218,11 +1234,11 @@ }; } { - name = "chownr___chownr_1.1.3.tgz"; + name = "chownr___chownr_2.0.0.tgz"; path = fetchurl { - name = "chownr___chownr_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/chownr/-/chownr-1.1.3.tgz"; - sha1 = "42d837d5239688d55f303003a508230fa6727142"; + name = "chownr___chownr_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz"; + sha1 = "15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"; }; } { @@ -1314,19 +1330,19 @@ }; } { - name = "cliui___cliui_4.1.0.tgz"; + name = "cliui___cliui_5.0.0.tgz"; path = fetchurl { - name = "cliui___cliui_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz"; - sha1 = "348422dbe82d800b3022eef4f6ac10bf2e4d1b49"; + name = "cliui___cliui_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz"; + sha1 = "deefcfdb2e800784aa34f46fa08e06851c7bbbc5"; }; } { - name = "cliui___cliui_6.0.0.tgz"; + name = "cliui___cliui_7.0.4.tgz"; path = fetchurl { - name = "cliui___cliui_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz"; - sha1 = "511d702c0c4e41ca156d7d0e96021f23e13225b1"; + name = "cliui___cliui_7.0.4.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz"; + sha1 = "a0265ee655476fc807aea9df3df8df7783808b4f"; }; } { @@ -1426,11 +1442,11 @@ }; } { - name = "compress_commons___compress_commons_3.0.0.tgz"; + name = "compress_commons___compress_commons_4.0.2.tgz"; path = fetchurl { - name = "compress_commons___compress_commons_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/compress-commons/-/compress-commons-3.0.0.tgz"; - sha1 = "833944d84596e537224dd91cf92f5246823d4f1d"; + name = "compress_commons___compress_commons_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.0.2.tgz"; + sha1 = "d6896be386e52f37610cef9e6fa5defc58c31bd7"; }; } { @@ -1450,11 +1466,11 @@ }; } { - name = "conf___conf_2.2.0.tgz"; + name = "conf___conf_7.1.2.tgz"; path = fetchurl { - name = "conf___conf_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/conf/-/conf-2.2.0.tgz"; - sha1 = "ee282efafc1450b61e205372041ad7d866802d9a"; + name = "conf___conf_7.1.2.tgz"; + url = "https://registry.yarnpkg.com/conf/-/conf-7.1.2.tgz"; + sha1 = "d9678a9d8f04de8bf5cd475105da8fdae49c2ec4"; }; } { @@ -1505,14 +1521,6 @@ sha1 = "92297398cae34937fcafd6ec8139c18051f0b5e0"; }; } - { - name = "core_js___core_js_3.6.5.tgz"; - path = fetchurl { - name = "core_js___core_js_3.6.5.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz"; - sha1 = "7395dc273af37fb2e50e9bd3d9fe841285231d1a"; - }; - } { name = "core_util_is___core_util_is_1.0.2.tgz"; path = fetchurl { @@ -1522,19 +1530,19 @@ }; } { - name = "crc32_stream___crc32_stream_3.0.1.tgz"; + name = "crc_32___crc_32_1.2.0.tgz"; path = fetchurl { - name = "crc32_stream___crc32_stream_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-3.0.1.tgz"; - sha1 = "cae6eeed003b0e44d739d279de5ae63b171b4e85"; + name = "crc_32___crc_32_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.0.tgz"; + sha1 = "cb2db6e29b88508e32d9dd0ec1693e7b41a18208"; }; } { - name = "crc___crc_3.8.0.tgz"; + name = "crc32_stream___crc32_stream_4.0.1.tgz"; path = fetchurl { - name = "crc___crc_3.8.0.tgz"; - url = "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz"; - sha1 = "ad60269c2c856f8c299e2c4cc0de4556914056c6"; + name = "crc32_stream___crc32_stream_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-4.0.1.tgz"; + sha1 = "0f047d74041737f8a55e86837a1b826bd8ab0067"; }; } { @@ -1569,14 +1577,6 @@ sha1 = "f73a85b9d5d41d045551c177e2882d4ac85728a6"; }; } - { - name = "cross_unzip___cross_unzip_0.0.2.tgz"; - path = fetchurl { - name = "cross_unzip___cross_unzip_0.0.2.tgz"; - url = "https://registry.yarnpkg.com/cross-unzip/-/cross-unzip-0.0.2.tgz"; - sha1 = "5183bc47a09559befcf98cc4657964999359372f"; - }; - } { name = "crypto_random_string___crypto_random_string_1.0.0.tgz"; path = fetchurl { @@ -1617,6 +1617,14 @@ sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; }; } + { + name = "debounce_fn___debounce_fn_4.0.0.tgz"; + path = fetchurl { + name = "debounce_fn___debounce_fn_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/debounce-fn/-/debounce-fn-4.0.0.tgz"; + sha1 = "ed76d206d8a50e60de0dd66d494d82835ffe61c7"; + }; + } { name = "debug___debug_3.1.0.tgz"; path = fetchurl { @@ -1650,11 +1658,11 @@ }; } { - name = "debug___debug_4.2.0.tgz"; + name = "debug___debug_4.3.1.tgz"; path = fetchurl { - name = "debug___debug_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz"; - sha1 = "7f150f93920e94c58f5574c2fd01a3110effe7f1"; + name = "debug___debug_4.3.1.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz"; + sha1 = "f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"; }; } { @@ -1689,14 +1697,6 @@ sha1 = "80a4dd323748384bfa248083622aedec982adff3"; }; } - { - name = "deep_equal___deep_equal_1.1.1.tgz"; - path = fetchurl { - name = "deep_equal___deep_equal_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz"; - sha1 = "b5c98c942ceffaf7cb051e24e1434a25a2e6076a"; - }; - } { name = "deep_extend___deep_extend_0.6.0.tgz"; path = fetchurl { @@ -1786,11 +1786,11 @@ }; } { - name = "dmg_builder___dmg_builder_22.7.0.tgz"; + name = "dmg_builder___dmg_builder_22.9.1.tgz"; path = fetchurl { - name = "dmg_builder___dmg_builder_22.7.0.tgz"; - url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.7.0.tgz"; - sha1 = "ead7e7c046cbdc52d29d302a4455f6668cdf7d45"; + name = "dmg_builder___dmg_builder_22.9.1.tgz"; + url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.9.1.tgz"; + sha1 = "64647224f37ee47fc9bd01947c21cc010a30511f"; }; } { @@ -1898,67 +1898,67 @@ }; } { - name = "ejs___ejs_3.1.3.tgz"; + name = "ejs___ejs_3.1.5.tgz"; path = fetchurl { - name = "ejs___ejs_3.1.3.tgz"; - url = "https://registry.yarnpkg.com/ejs/-/ejs-3.1.3.tgz"; - sha1 = "514d967a8894084d18d3d47bd169a1c0560f093d"; + name = "ejs___ejs_3.1.5.tgz"; + url = "https://registry.yarnpkg.com/ejs/-/ejs-3.1.5.tgz"; + sha1 = "aed723844dc20acb4b170cd9ab1017e476a0d93b"; }; } { - name = "electron_builder_squirrel_windows___electron_builder_squirrel_windows_22.7.0.tgz"; + name = "electron_builder_squirrel_windows___electron_builder_squirrel_windows_22.9.1.tgz"; path = fetchurl { - name = "electron_builder_squirrel_windows___electron_builder_squirrel_windows_22.7.0.tgz"; - url = "https://registry.yarnpkg.com/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-22.7.0.tgz"; - sha1 = "8d6f09d541c039f52202935c66d592c38575ceff"; + name = "electron_builder_squirrel_windows___electron_builder_squirrel_windows_22.9.1.tgz"; + url = "https://registry.yarnpkg.com/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-22.9.1.tgz"; + sha1 = "d9ad65a8f5abd1011ac1dbd01492623fb5466a32"; }; } { - name = "electron_builder___electron_builder_22.7.0.tgz"; + name = "electron_builder___electron_builder_22.9.1.tgz"; path = fetchurl { - name = "electron_builder___electron_builder_22.7.0.tgz"; - url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.7.0.tgz"; - sha1 = "a42d08a1654ffc2f7d9e2860829d3cc55d4a0c81"; + name = "electron_builder___electron_builder_22.9.1.tgz"; + url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.9.1.tgz"; + sha1 = "a2962db6f2757bc01d02489f38fafe0809f68f60"; }; } { - name = "electron_devtools_installer___electron_devtools_installer_2.2.4.tgz"; + name = "electron_devtools_installer___electron_devtools_installer_3.1.1.tgz"; path = fetchurl { - name = "electron_devtools_installer___electron_devtools_installer_2.2.4.tgz"; - url = "https://registry.yarnpkg.com/electron-devtools-installer/-/electron-devtools-installer-2.2.4.tgz"; - sha1 = "261a50337e37121d338b966f07922eb4939a8763"; + name = "electron_devtools_installer___electron_devtools_installer_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/electron-devtools-installer/-/electron-devtools-installer-3.1.1.tgz"; + sha1 = "7b56c8c86475c5e4e10de6917d150c53c9ceb55e"; }; } { - name = "electron_notarize___electron_notarize_0.2.1.tgz"; + name = "electron_notarize___electron_notarize_1.0.0.tgz"; path = fetchurl { - name = "electron_notarize___electron_notarize_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/electron-notarize/-/electron-notarize-0.2.1.tgz"; - sha1 = "759e8006decae19134f82996ed910db26d9192cc"; + name = "electron_notarize___electron_notarize_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/electron-notarize/-/electron-notarize-1.0.0.tgz"; + sha1 = "bc925b1ccc3f79e58e029e8c4706572b01a9fd8f"; }; } { - name = "electron_publish___electron_publish_22.7.0.tgz"; + name = "electron_publish___electron_publish_22.9.1.tgz"; path = fetchurl { - name = "electron_publish___electron_publish_22.7.0.tgz"; - url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.7.0.tgz"; - sha1 = "d92ba7c4007c9ac1dd070593e48028184fb2dc19"; + name = "electron_publish___electron_publish_22.9.1.tgz"; + url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.9.1.tgz"; + sha1 = "7cc76ac4cc53efd29ee31c1e5facb9724329068e"; }; } { - name = "electron_store___electron_store_2.0.0.tgz"; + name = "electron_store___electron_store_6.0.1.tgz"; path = fetchurl { - name = "electron_store___electron_store_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/electron-store/-/electron-store-2.0.0.tgz"; - sha1 = "1035cca2a95409d1f54c7466606345852450d64a"; + name = "electron_store___electron_store_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/electron-store/-/electron-store-6.0.1.tgz"; + sha1 = "2178b9dc37aeb749d99cf9d1d1bc090890b922dc"; }; } { - name = "electron_window_state___electron_window_state_4.1.1.tgz"; + name = "electron_window_state___electron_window_state_5.0.3.tgz"; path = fetchurl { - name = "electron_window_state___electron_window_state_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/electron-window-state/-/electron-window-state-4.1.1.tgz"; - sha1 = "6b34fdc31b38514dfec8b7c8f7b5d4addb67632d"; + name = "electron_window_state___electron_window_state_5.0.3.tgz"; + url = "https://registry.yarnpkg.com/electron-window-state/-/electron-window-state-5.0.3.tgz"; + sha1 = "4f36d09e3f953d87aff103bf010f460056050aa8"; }; } { @@ -2001,14 +2001,6 @@ sha1 = "2a7fe5dd634a1e4125a975ec994ff5456dc3734d"; }; } - { - name = "env_paths___env_paths_1.0.0.tgz"; - path = fetchurl { - name = "env_paths___env_paths_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/env-paths/-/env-paths-1.0.0.tgz"; - sha1 = "4168133b42bb05c38a35b1ae4397c8298ab369e0"; - }; - } { name = "env_paths___env_paths_2.2.0.tgz"; path = fetchurl { @@ -2081,6 +2073,14 @@ sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203"; }; } + { + name = "escalade___escalade_3.1.1.tgz"; + path = fetchurl { + name = "escalade___escalade_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz"; + sha1 = "d8cfdc7000965c5a0174b4a82eaa5c0552742e40"; + }; + } { name = "escape_goat___escape_goat_2.1.1.tgz"; path = fetchurl { @@ -2345,14 +2345,6 @@ sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777"; }; } - { - name = "execa___execa_1.0.0.tgz"; - path = fetchurl { - name = "execa___execa_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz"; - sha1 = "c6236a5bb4df6d6f15e88e7f017798216749ddd8"; - }; - } { name = "exif_parser___exif_parser_0.1.12.tgz"; path = fetchurl { @@ -2361,6 +2353,14 @@ sha1 = "58a9d2d72c02c1f6f02a0ef4a9166272b7760922"; }; } + { + name = "exit_on_epipe___exit_on_epipe_1.0.1.tgz"; + path = fetchurl { + name = "exit_on_epipe___exit_on_epipe_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz"; + sha1 = "0bdd92e87d5285d267daa8171d0eb06159689692"; + }; + } { name = "extend___extend_3.0.2.tgz"; path = fetchurl { @@ -2489,14 +2489,6 @@ sha1 = "49169f1d7993430646da61ecc5ae355c21c97b73"; }; } - { - name = "find_up___find_up_4.1.0.tgz"; - path = fetchurl { - name = "find_up___find_up_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz"; - sha1 = "97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"; - }; - } { name = "flat_cache___flat_cache_2.0.1.tgz"; path = fetchurl { @@ -2657,6 +2649,14 @@ sha1 = "13538db5029400f98684be4894e8a7d8f0d1ea7f"; }; } + { + name = "gentle_fs___gentle_fs_2.3.1.tgz"; + path = fetchurl { + name = "gentle_fs___gentle_fs_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/gentle-fs/-/gentle-fs-2.3.1.tgz"; + sha1 = "11201bf66c18f930ddca72cf69460bdfa05727b1"; + }; + } { name = "get_caller_file___get_caller_file_1.0.3.tgz"; path = fetchurl { @@ -2705,6 +2705,14 @@ sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; }; } + { + name = "gifwrap___gifwrap_0.9.2.tgz"; + path = fetchurl { + name = "gifwrap___gifwrap_0.9.2.tgz"; + url = "https://registry.yarnpkg.com/gifwrap/-/gifwrap-0.9.2.tgz"; + sha1 = "348e286e67d7cf57942172e1e6f05a71cee78489"; + }; + } { name = "glob_parent___glob_parent_5.1.1.tgz"; path = fetchurl { @@ -2882,11 +2890,11 @@ }; } { - name = "hosted_git_info___hosted_git_info_3.0.4.tgz"; + name = "hosted_git_info___hosted_git_info_3.0.7.tgz"; path = fetchurl { - name = "hosted_git_info___hosted_git_info_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.4.tgz"; - sha1 = "be4973eb1fd2737b11c9c7c19380739bb249f60d"; + name = "hosted_git_info___hosted_git_info_3.0.7.tgz"; + url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.7.tgz"; + sha1 = "a30727385ea85acfcee94e0aad9e368c792e036c"; }; } { @@ -2946,11 +2954,11 @@ }; } { - name = "iconv_lite___iconv_lite_0.5.1.tgz"; + name = "iconv_lite___iconv_lite_0.6.2.tgz"; path = fetchurl { - name = "iconv_lite___iconv_lite_0.5.1.tgz"; - url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.5.1.tgz"; - sha1 = "b2425d3c7b18f7219f2ca663d103bddb91718d64"; + name = "iconv_lite___iconv_lite_0.6.2.tgz"; + url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.2.tgz"; + sha1 = "ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01"; }; } { @@ -2993,6 +3001,22 @@ sha1 = "750e3db5862087b4737ebac8207ffd1ef27b25fc"; }; } + { + name = "image_q___image_q_1.1.1.tgz"; + path = fetchurl { + name = "image_q___image_q_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/image-q/-/image-q-1.1.1.tgz"; + sha1 = "fc84099664460b90ca862d9300b6bfbbbfbf8056"; + }; + } + { + name = "immediate___immediate_3.0.6.tgz"; + path = fetchurl { + name = "immediate___immediate_3.0.6.tgz"; + url = "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz"; + sha1 = "9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"; + }; + } { name = "import_fresh___import_fresh_3.2.1.tgz"; path = fetchurl { @@ -3081,14 +3105,6 @@ sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; }; } - { - name = "invert_kv___invert_kv_2.0.0.tgz"; - path = fetchurl { - name = "invert_kv___invert_kv_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz"; - sha1 = "7393f5afa59ec9ff5f67a27620d11c226e3eec02"; - }; - } { name = "ip_regex___ip_regex_2.1.0.tgz"; path = fetchurl { @@ -3105,14 +3121,6 @@ sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a"; }; } - { - name = "is_arguments___is_arguments_1.0.4.tgz"; - path = fetchurl { - name = "is_arguments___is_arguments_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz"; - sha1 = "3faf966c7cba0ff437fb31f6250082fcf0448cf3"; - }; - } { name = "is_arrayish___is_arrayish_0.2.1.tgz"; path = fetchurl { @@ -3402,19 +3410,19 @@ }; } { - name = "jimp___jimp_0.9.8.tgz"; + name = "jimp___jimp_0.16.1.tgz"; path = fetchurl { - name = "jimp___jimp_0.9.8.tgz"; - url = "https://registry.yarnpkg.com/jimp/-/jimp-0.9.8.tgz"; - sha1 = "2ee87b81b42e723ad74c73b8012f879c0abe5b04"; + name = "jimp___jimp_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/jimp/-/jimp-0.16.1.tgz"; + sha1 = "192f851a30e5ca11112a3d0aa53137659a78ca7a"; }; } { - name = "jpeg_js___jpeg_js_0.3.7.tgz"; + name = "jpeg_js___jpeg_js_0.4.2.tgz"; path = fetchurl { - name = "jpeg_js___jpeg_js_0.3.7.tgz"; - url = "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.3.7.tgz"; - sha1 = "471a89d06011640592d314158608690172b1028d"; + name = "jpeg_js___jpeg_js_0.4.2.tgz"; + url = "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.4.2.tgz"; + sha1 = "8b345b1ae4abde64c2da2fe67ea216a114ac279d"; }; } { @@ -3481,6 +3489,14 @@ sha1 = "69f6a87d9513ab8bb8fe63bdb0979c448e684660"; }; } + { + name = "json_schema_typed___json_schema_typed_7.0.3.tgz"; + path = fetchurl { + name = "json_schema_typed___json_schema_typed_7.0.3.tgz"; + url = "https://registry.yarnpkg.com/json-schema-typed/-/json-schema-typed-7.0.3.tgz"; + sha1 = "23ff481b8b4eebcd2ca123b4fa0409e66469a2d9"; + }; + } { name = "json_schema___json_schema_0.2.3.tgz"; path = fetchurl { @@ -3521,14 +3537,6 @@ sha1 = "c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"; }; } - { - name = "jsonfile___jsonfile_2.4.0.tgz"; - path = fetchurl { - name = "jsonfile___jsonfile_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz"; - sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"; - }; - } { name = "jsonfile___jsonfile_4.0.0.tgz"; path = fetchurl { @@ -3569,6 +3577,14 @@ sha1 = "1114a4c1209481db06c690c2b4f488cc665f657e"; }; } + { + name = "jszip___jszip_3.5.0.tgz"; + path = fetchurl { + name = "jszip___jszip_3.5.0.tgz"; + url = "https://registry.yarnpkg.com/jszip/-/jszip-3.5.0.tgz"; + sha1 = "b4fd1f368245346658e781fec9675802489e15f6"; + }; + } { name = "keyv___keyv_3.1.0.tgz"; path = fetchurl { @@ -3625,14 +3641,6 @@ sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835"; }; } - { - name = "lcid___lcid_2.0.0.tgz"; - path = fetchurl { - name = "lcid___lcid_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz"; - sha1 = "6ef5d2df60e52f82eb228a4c373e8d1f397253cf"; - }; - } { name = "levn___levn_0.3.0.tgz"; path = fetchurl { @@ -3650,11 +3658,11 @@ }; } { - name = "libcipm___libcipm_4.0.7.tgz"; + name = "libcipm___libcipm_4.0.8.tgz"; path = fetchurl { - name = "libcipm___libcipm_4.0.7.tgz"; - url = "https://registry.yarnpkg.com/libcipm/-/libcipm-4.0.7.tgz"; - sha1 = "76cd675c98bdaae64db88b782b01b804b6d02c8a"; + name = "libcipm___libcipm_4.0.8.tgz"; + url = "https://registry.yarnpkg.com/libcipm/-/libcipm-4.0.8.tgz"; + sha1 = "dcea4919e10dfbce420327e63901613b9141bc89"; }; } { @@ -3722,11 +3730,19 @@ }; } { - name = "libnpx___libnpx_10.2.2.tgz"; + name = "libnpx___libnpx_10.2.4.tgz"; path = fetchurl { - name = "libnpx___libnpx_10.2.2.tgz"; - url = "https://registry.yarnpkg.com/libnpx/-/libnpx-10.2.2.tgz"; - sha1 = "5a4171b9b92dd031463ef66a4af9f5cbd6b09572"; + name = "libnpx___libnpx_10.2.4.tgz"; + url = "https://registry.yarnpkg.com/libnpx/-/libnpx-10.2.4.tgz"; + sha1 = "ef0e3258e29aef2ec7ee3276115e20e67f67d4ee"; + }; + } + { + name = "lie___lie_3.3.0.tgz"; + path = fetchurl { + name = "lie___lie_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/lie/-/lie-3.3.0.tgz"; + sha1 = "dcf82dee545f46074daf200c7c1c5a08e0f40f6a"; }; } { @@ -3761,14 +3777,6 @@ sha1 = "dbec3b3ab759758071b58fe59fc41871af21400e"; }; } - { - name = "locate_path___locate_path_5.0.0.tgz"; - path = fetchurl { - name = "locate_path___locate_path_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz"; - sha1 = "1afba396afd676a6d42504d0a67a3a7eb9f62aa0"; - }; - } { name = "lock_verify___lock_verify_2.2.0.tgz"; path = fetchurl { @@ -3929,6 +3937,14 @@ sha1 = "1da27e6710271947695daf6848e847f01d84b920"; }; } + { + name = "lru_cache___lru_cache_6.0.0.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz"; + sha1 = "6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"; + }; + } { name = "make_dir___make_dir_1.3.0.tgz"; path = fetchurl { @@ -3945,6 +3961,14 @@ sha1 = "04a1acbf22221e1d6ef43559f43e05a90dbb4392"; }; } + { + name = "make_dir___make_dir_3.1.0.tgz"; + path = fetchurl { + name = "make_dir___make_dir_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz"; + sha1 = "415e967046b3a7f1d185277d84aa58203726a13f"; + }; + } { name = "make_fetch_happen___make_fetch_happen_5.0.2.tgz"; path = fetchurl { @@ -3954,19 +3978,11 @@ }; } { - name = "map_age_cleaner___map_age_cleaner_0.1.3.tgz"; + name = "meant___meant_1.0.3.tgz"; path = fetchurl { - name = "map_age_cleaner___map_age_cleaner_0.1.3.tgz"; - url = "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz"; - sha1 = "7d583a7306434c055fe474b0f45078e6e1b4b92a"; - }; - } - { - name = "meant___meant_1.0.1.tgz"; - path = fetchurl { - name = "meant___meant_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/meant/-/meant-1.0.1.tgz"; - sha1 = "66044fea2f23230ec806fb515efea29c44d2115d"; + name = "meant___meant_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/meant/-/meant-1.0.3.tgz"; + sha1 = "67769af9de1d158773e928ae82c456114903554c"; }; } { @@ -3977,14 +3993,6 @@ sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76"; }; } - { - name = "mem___mem_4.3.0.tgz"; - path = fetchurl { - name = "mem___mem_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz"; - sha1 = "461af497bc4ae09608cdb2e60eefb69bff744178"; - }; - } { name = "mime_db___mime_db_1.42.0.tgz"; path = fetchurl { @@ -4010,11 +4018,11 @@ }; } { - name = "mime___mime_2.4.6.tgz"; + name = "mime___mime_2.5.0.tgz"; path = fetchurl { - name = "mime___mime_2.4.6.tgz"; - url = "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz"; - sha1 = "e5b407c90db442f2beb5b162373d07b69affa4d1"; + name = "mime___mime_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-2.5.0.tgz"; + sha1 = "2b4af934401779806ee98026bb42e8c1ae1876b1"; }; } { @@ -4033,6 +4041,14 @@ sha1 = "7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"; }; } + { + name = "mimic_fn___mimic_fn_3.1.0.tgz"; + path = fetchurl { + name = "mimic_fn___mimic_fn_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-3.1.0.tgz"; + sha1 = "65755145bbf3e36954b949c16450427451d5ca74"; + }; + } { name = "mimic_response___mimic_response_1.0.1.tgz"; path = fetchurl { @@ -4106,11 +4122,11 @@ }; } { - name = "minizlib___minizlib_2.1.0.tgz"; + name = "minizlib___minizlib_2.1.2.tgz"; path = fetchurl { - name = "minizlib___minizlib_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.0.tgz"; - sha1 = "fd52c645301ef09a63a2c209697c294c6ce02cf3"; + name = "minizlib___minizlib_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz"; + sha1 = "e90d3466ba209b932451508a11ce3d3632145931"; }; } { @@ -4274,11 +4290,11 @@ }; } { - name = "npm_audit_report___npm_audit_report_1.3.2.tgz"; + name = "npm_audit_report___npm_audit_report_1.3.3.tgz"; path = fetchurl { - name = "npm_audit_report___npm_audit_report_1.3.2.tgz"; - url = "https://registry.yarnpkg.com/npm-audit-report/-/npm-audit-report-1.3.2.tgz"; - sha1 = "303bc78cd9e4c226415076a4f7e528c89fc77018"; + name = "npm_audit_report___npm_audit_report_1.3.3.tgz"; + url = "https://registry.yarnpkg.com/npm-audit-report/-/npm-audit-report-1.3.3.tgz"; + sha1 = "8226deeb253b55176ed147592a3995442f2179ed"; }; } { @@ -4313,6 +4329,14 @@ sha1 = "de6975c7d8df65f5150db110b57cce498b0b604c"; }; } + { + name = "npm_lifecycle___npm_lifecycle_3.1.5.tgz"; + path = fetchurl { + name = "npm_lifecycle___npm_lifecycle_3.1.5.tgz"; + url = "https://registry.yarnpkg.com/npm-lifecycle/-/npm-lifecycle-3.1.5.tgz"; + sha1 = "9882d3642b8c82c815782a12e6a1bfeed0026309"; + }; + } { name = "npm_logical_tree___npm_logical_tree_1.2.1.tgz"; path = fetchurl { @@ -4378,11 +4402,11 @@ }; } { - name = "npm_registry_fetch___npm_registry_fetch_4.0.5.tgz"; + name = "npm_registry_fetch___npm_registry_fetch_4.0.7.tgz"; path = fetchurl { - name = "npm_registry_fetch___npm_registry_fetch_4.0.5.tgz"; - url = "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-4.0.5.tgz"; - sha1 = "cb87cf7f25bfb048d6c3ee19d115bebf93ea5bfa"; + name = "npm_registry_fetch___npm_registry_fetch_4.0.7.tgz"; + url = "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-4.0.7.tgz"; + sha1 = "57951bf6541e0246b34c9f9a38ab73607c9449d7"; }; } { @@ -4402,11 +4426,11 @@ }; } { - name = "npm___npm_6.14.6.tgz"; + name = "npm___npm_6.14.11.tgz"; path = fetchurl { - name = "npm___npm_6.14.6.tgz"; - url = "https://registry.yarnpkg.com/npm/-/npm-6.14.6.tgz"; - sha1 = "1a81ce1fac2bf5457dbf6342ceed503627ff228f"; + name = "npm___npm_6.14.11.tgz"; + url = "https://registry.yarnpkg.com/npm/-/npm-6.14.11.tgz"; + sha1 = "e0b5598d7b9a42d275e61d8bd28cd7eee0074a3b"; }; } { @@ -4449,14 +4473,6 @@ sha1 = "f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"; }; } - { - name = "object_is___object_is_1.0.1.tgz"; - path = fetchurl { - name = "object_is___object_is_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/object-is/-/object-is-1.0.1.tgz"; - sha1 = "0aa60ec9989a0b3ed795cf4d06f62cf1ad6539b6"; - }; - } { name = "object_keys___object_keys_1.1.1.tgz"; path = fetchurl { @@ -4530,11 +4546,11 @@ }; } { - name = "opener___opener_1.5.1.tgz"; + name = "opener___opener_1.5.2.tgz"; path = fetchurl { - name = "opener___opener_1.5.1.tgz"; - url = "https://registry.yarnpkg.com/opener/-/opener-1.5.1.tgz"; - sha1 = "6d2f0e77f1a0af0032aca716c2c1fbb8e7e8abed"; + name = "opener___opener_1.5.2.tgz"; + url = "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz"; + sha1 = "5d37e1f35077b9dcac4301372271afdeb2a13598"; }; } { @@ -4569,14 +4585,6 @@ sha1 = "42bc2900a6b5b8bd17376c8e882b65afccf24bf2"; }; } - { - name = "os_locale___os_locale_3.1.0.tgz"; - path = fetchurl { - name = "os_locale___os_locale_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz"; - sha1 = "a802a6ee17f24c10483ab9935719cef4ed16bf1a"; - }; - } { name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; path = fetchurl { @@ -4601,14 +4609,6 @@ sha1 = "d078d15a3af409220c886f1d9a0ca2e441ab26cc"; }; } - { - name = "p_defer___p_defer_1.0.0.tgz"; - path = fetchurl { - name = "p_defer___p_defer_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz"; - sha1 = "9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"; - }; - } { name = "p_finally___p_finally_1.0.0.tgz"; path = fetchurl { @@ -4617,14 +4617,6 @@ sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; }; } - { - name = "p_is_promise___p_is_promise_2.1.0.tgz"; - path = fetchurl { - name = "p_is_promise___p_is_promise_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz"; - sha1 = "918cebaea248a62cf7ffab8e3bca8c5f882fc42e"; - }; - } { name = "p_limit___p_limit_1.3.0.tgz"; path = fetchurl { @@ -4641,14 +4633,6 @@ sha1 = "aa07a788cc3151c939b5131f63570f0dd2009537"; }; } - { - name = "p_limit___p_limit_2.2.2.tgz"; - path = fetchurl { - name = "p_limit___p_limit_2.2.2.tgz"; - url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz"; - sha1 = "61279b67721f5287aa1c13a9a7fbbc48c9291b1e"; - }; - } { name = "p_locate___p_locate_2.0.0.tgz"; path = fetchurl { @@ -4665,14 +4649,6 @@ sha1 = "322d69a05c0264b25997d9f40cd8a891ab0064a4"; }; } - { - name = "p_locate___p_locate_4.1.0.tgz"; - path = fetchurl { - name = "p_locate___p_locate_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz"; - sha1 = "a3428bb7088b3a60292f66919278b7c297ad4f07"; - }; - } { name = "p_try___p_try_1.0.0.tgz"; path = fetchurl { @@ -4785,14 +4761,6 @@ sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; }; } - { - name = "path_exists___path_exists_4.0.0.tgz"; - path = fetchurl { - name = "path_exists___path_exists_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz"; - sha1 = "513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"; - }; - } { name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; path = fetchurl { @@ -4890,19 +4858,19 @@ }; } { - name = "pkg_up___pkg_up_2.0.0.tgz"; + name = "pkg_up___pkg_up_3.1.0.tgz"; path = fetchurl { - name = "pkg_up___pkg_up_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz"; - sha1 = "c819ac728059a461cab1c3889a2be3c49a004d7f"; + name = "pkg_up___pkg_up_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz"; + sha1 = "100ec235cc150e4fd42519412596a28512a0def5"; }; } { - name = "png_to_ico___png_to_ico_2.1.0.tgz"; + name = "png_to_ico___png_to_ico_2.1.1.tgz"; path = fetchurl { - name = "png_to_ico___png_to_ico_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/png-to-ico/-/png-to-ico-2.1.0.tgz"; - sha1 = "b7a59bc7e95093f6dd4dc85f27b9048e12d2fe71"; + name = "png_to_ico___png_to_ico_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/png-to-ico/-/png-to-ico-2.1.1.tgz"; + sha1 = "35be46f93c1ac8d77025f6f4b60c1fa567c1d47c"; }; } { @@ -4945,6 +4913,14 @@ sha1 = "e92434bfa5ea8c19f41cdfd401d741a3c819d897"; }; } + { + name = "printj___printj_1.1.2.tgz"; + path = fetchurl { + name = "printj___printj_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/printj/-/printj-1.1.2.tgz"; + sha1 = "d90deb2975a8b9f600fb3a1c94e3f4c53c78a222"; + }; + } { name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; path = fetchurl { @@ -5233,6 +5209,14 @@ sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; }; } + { + name = "readdir_glob___readdir_glob_1.1.1.tgz"; + path = fetchurl { + name = "readdir_glob___readdir_glob_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/readdir-glob/-/readdir-glob-1.1.1.tgz"; + sha1 = "f0e10bb7bf7bfa7e0add8baffdc54c3f7dbee6c4"; + }; + } { name = "readdir_scoped_modules___readdir_scoped_modules_1.1.0.tgz"; path = fetchurl { @@ -5249,14 +5233,6 @@ sha1 = "cac2dacc8a1ea675feaabaeb8ae833898ae46f55"; }; } - { - name = "regexp.prototype.flags___regexp.prototype.flags_1.2.0.tgz"; - path = fetchurl { - name = "regexp.prototype.flags___regexp.prototype.flags_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz"; - sha1 = "6b30724e306a27833eeb171b66ac8890ba37e41c"; - }; - } { name = "regexp.prototype.flags___regexp.prototype.flags_1.3.0.tgz"; path = fetchurl { @@ -5537,14 +5513,6 @@ sha1 = "ee0a64c8af5e8ceea67687b133761e1becbd1d3d"; }; } - { - name = "semver___semver_7.1.3.tgz"; - path = fetchurl { - name = "semver___semver_7.1.3.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-7.1.3.tgz"; - sha1 = "e4345ce73071c53f336445cfc19efb1c311df2a6"; - }; - } { name = "semver___semver_7.3.2.tgz"; path = fetchurl { @@ -5553,6 +5521,14 @@ sha1 = "604962b052b81ed0786aae84389ffba70ffd3938"; }; } + { + name = "semver___semver_7.3.4.tgz"; + path = fetchurl { + name = "semver___semver_7.3.4.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz"; + sha1 = "27aaa7d2e4ca76452f98d3add093a72c943edc97"; + }; + } { name = "set_blocking___set_blocking_2.0.0.tgz"; path = fetchurl { @@ -5561,6 +5537,14 @@ sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; }; } + { + name = "set_immediate_shim___set_immediate_shim_1.0.1.tgz"; + path = fetchurl { + name = "set_immediate_shim___set_immediate_shim_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz"; + sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"; + }; + } { name = "sha___sha_3.0.0.tgz"; path = fetchurl { @@ -5994,11 +5978,11 @@ }; } { - name = "tar_stream___tar_stream_2.1.2.tgz"; + name = "tar_stream___tar_stream_2.2.0.tgz"; path = fetchurl { - name = "tar_stream___tar_stream_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.2.tgz"; - sha1 = "6d5ef1a7e5783a95ff70b69b97455a5968dc1325"; + name = "tar_stream___tar_stream_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz"; + sha1 = "acad84c284136b060dc3faa64474aa9aebd77287"; }; } { @@ -6010,11 +5994,11 @@ }; } { - name = "tar___tar_6.0.1.tgz"; + name = "tar___tar_6.1.0.tgz"; path = fetchurl { - name = "tar___tar_6.0.1.tgz"; - url = "https://registry.yarnpkg.com/tar/-/tar-6.0.1.tgz"; - sha1 = "7b3bd6c313cb6e0153770108f8d70ac298607efa"; + name = "tar___tar_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/tar/-/tar-6.1.0.tgz"; + sha1 = "d1724e9bcc04b977b18d5c573b333a2207229a83"; }; } { @@ -6233,6 +6217,14 @@ sha1 = "97abf0872310fed88a5c466b25681576145e33f1"; }; } + { + name = "type_fest___type_fest_0.16.0.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.16.0.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.16.0.tgz"; + sha1 = "3240b891a78b0deae910dbeb86553e552a148860"; + }; + } { name = "type_fest___type_fest_0.8.1.tgz"; path = fetchurl { @@ -6345,6 +6337,14 @@ sha1 = "1e7b42b140bcfd922b22e70ca1265bfe3634c7c9"; }; } + { + name = "unzip_crx_3___unzip_crx_3_0.2.0.tgz"; + path = fetchurl { + name = "unzip_crx_3___unzip_crx_3_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/unzip-crx-3/-/unzip-crx-3-0.2.0.tgz"; + sha1 = "d5324147b104a8aed9ae8639c95521f6f7cda292"; + }; + } { name = "unzip_response___unzip_response_2.0.1.tgz"; path = fetchurl { @@ -6362,11 +6362,11 @@ }; } { - name = "update_notifier___update_notifier_4.1.0.tgz"; + name = "update_notifier___update_notifier_4.1.3.tgz"; path = fetchurl { - name = "update_notifier___update_notifier_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/update-notifier/-/update-notifier-4.1.0.tgz"; - sha1 = "4866b98c3bc5b5473c020b1250583628f9a328f3"; + name = "update_notifier___update_notifier_4.1.3.tgz"; + url = "https://registry.yarnpkg.com/update-notifier/-/update-notifier-4.1.3.tgz"; + sha1 = "be86ee13e8ce48fb50043ff72057b5bd598e1ea3"; }; } { @@ -6578,11 +6578,19 @@ }; } { - name = "wrap_ansi___wrap_ansi_6.2.0.tgz"; + name = "wrap_ansi___wrap_ansi_5.1.0.tgz"; path = fetchurl { - name = "wrap_ansi___wrap_ansi_6.2.0.tgz"; - url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz"; - sha1 = "e9393ba07102e6c91a3b221478f0257cd2856e53"; + name = "wrap_ansi___wrap_ansi_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz"; + sha1 = "1fd1f67235d5b6d0fee781056001bfb694c03b09"; + }; + } + { + name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; + path = fetchurl { + name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; + sha1 = "67e145cff510a6a6984bdf1152911d69d2eb9e43"; }; } { @@ -6689,6 +6697,22 @@ sha1 = "95ef94f85ecc81d007c264e190a120f0a3c8566b"; }; } + { + name = "y18n___y18n_5.0.5.tgz"; + path = fetchurl { + name = "y18n___y18n_5.0.5.tgz"; + url = "https://registry.yarnpkg.com/y18n/-/y18n-5.0.5.tgz"; + sha1 = "8769ec08d03b1ea2df2500acef561743bbb9ab18"; + }; + } + { + name = "yaku___yaku_0.16.7.tgz"; + path = fetchurl { + name = "yaku___yaku_0.16.7.tgz"; + url = "https://registry.yarnpkg.com/yaku/-/yaku-0.16.7.tgz"; + sha1 = "1d195c78aa9b5bf8479c895b9504fd4f0847984e"; + }; + } { name = "yallist___yallist_2.1.2.tgz"; path = fetchurl { @@ -6714,11 +6738,19 @@ }; } { - name = "yargs_parser___yargs_parser_18.1.3.tgz"; + name = "yargs_parser___yargs_parser_15.0.1.tgz"; path = fetchurl { - name = "yargs_parser___yargs_parser_18.1.3.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz"; - sha1 = "be68c4975c6b2abf469236b0c870362fab09a7b0"; + name = "yargs_parser___yargs_parser_15.0.1.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-15.0.1.tgz"; + sha1 = "54786af40b820dcb2fb8025b11b4d659d76323b3"; + }; + } + { + name = "yargs_parser___yargs_parser_20.2.4.tgz"; + path = fetchurl { + name = "yargs_parser___yargs_parser_20.2.4.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz"; + sha1 = "b42890f14566796f85ae8e3a25290d205f154a54"; }; } { @@ -6730,27 +6762,19 @@ }; } { - name = "yargs_parser___yargs_parser_9.0.2.tgz"; + name = "yargs___yargs_14.2.3.tgz"; path = fetchurl { - name = "yargs_parser___yargs_parser_9.0.2.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz"; - sha1 = "9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"; + name = "yargs___yargs_14.2.3.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-14.2.3.tgz"; + sha1 = "1a1c3edced1afb2a2fea33604bc6d1d8d688a414"; }; } { - name = "yargs___yargs_11.1.1.tgz"; + name = "yargs___yargs_16.2.0.tgz"; path = fetchurl { - name = "yargs___yargs_11.1.1.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-11.1.1.tgz"; - sha1 = "5052efe3446a4df5ed669c995886cc0f13702766"; - }; - } - { - name = "yargs___yargs_15.3.1.tgz"; - path = fetchurl { - name = "yargs___yargs_15.3.1.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-15.3.1.tgz"; - sha1 = "9505b472763963e54afe60148ad27a330818e98b"; + name = "yargs___yargs_16.2.0.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz"; + sha1 = "1c82bf0f6b6a66eafce7ef30e376f49a12477f66"; }; } { @@ -6762,11 +6786,11 @@ }; } { - name = "zip_stream___zip_stream_3.0.1.tgz"; + name = "zip_stream___zip_stream_4.0.4.tgz"; path = fetchurl { - name = "zip_stream___zip_stream_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/zip-stream/-/zip-stream-3.0.1.tgz"; - sha1 = "cb8db9d324a76c09f9b76b31a12a48638b0b9708"; + name = "zip_stream___zip_stream_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/zip-stream/-/zip-stream-4.0.4.tgz"; + sha1 = "3a8f100b73afaa7d1ae9338d910b321dec77ff3a"; }; } ]; diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index 833d1731b727..04e81337b66e 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -8,12 +8,12 @@ let executableName = "element-desktop"; - version = "1.7.18"; + version = "1.7.19"; src = fetchFromGitHub { owner = "vector-im"; repo = "element-desktop"; rev = "v${version}"; - sha256 = "sha256-5k+VVcloFAcFvk683r7njOCuj7OOnHS9QLEHFu0g+5o="; + sha256 = "sha256-al49O13biReX1pCkmljUPLdV1uP//L3fdTLLsay0V1A="; }; in mkYarnPackage rec { name = "element-desktop-${version}"; diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index a997ea156769..fd59384b6367 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "element-web"; - version = "1.7.18"; + version = "1.7.19"; src = fetchurl { url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz"; - sha256 = "sha256-fgbdlVTPPZriOoDsBbpmDWEEzHEunaDIl/sT4/6A9LM="; + sha256 = "sha256-rHxHP3KneB9SrXRMvcq0pmFj6YnLmazw/pRxMsP2o/k="; }; installPhase = '' diff --git a/pkgs/applications/networking/ipfs-migrator/default.nix b/pkgs/applications/networking/ipfs-migrator/default.nix index 8d83c27e6208..abc81e213d7d 100644 --- a/pkgs/applications/networking/ipfs-migrator/default.nix +++ b/pkgs/applications/networking/ipfs-migrator/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ipfs-migrator"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "ipfs"; repo = "fs-repo-migrations"; rev = "v${version}"; - sha256 = "0s2mmprhhb04i8pa3lfgb61wvlrp44xnb4d08y7vd2i82lmh234b"; + sha256 = "sha256-MxEKmoveIpuxBkGGGJHp9T11i3Py8a1fLpF0fWk0ftg="; }; vendorSha256 = null; diff --git a/pkgs/applications/science/chemistry/chemtool/default.nix b/pkgs/applications/science/chemistry/chemtool/default.nix new file mode 100644 index 000000000000..3b5d144ba22b --- /dev/null +++ b/pkgs/applications/science/chemistry/chemtool/default.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, fetchurl +, pkg-config +, libX11 +, gtk2 +, fig2dev +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "chemtool"; + version = "1.6.14"; + + src = fetchurl { + url = "http://ruby.chemie.uni-freiburg.de/~martin/${pname}/${pname}-${version}.tar.gz"; + sha256 = "hhYaBGE4azNKX/sXzfCUpJGUGIRngnL0V0mBNRTdr8s="; + }; + + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + buildInputs = [ + libX11 + gtk2 + fig2dev + ]; + + preFixup = '' + gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ fig2dev ]}") + ''; + + meta = with lib; { + homepage = "http://ruby.chemie.uni-freiburg.de/~martin/chemtool/"; + description = "Draw chemical structures"; + longDescription = '' + Chemtool is a program for drawing organic molecules. It runs under the X + Window System using the GTK widget set. + + Most operations in chemtool can be accomplished using the mouse - the + first (usually the left) button is used to select or place things, the + middle button modifies properties (e.g. reverses the direction of a bond), + and the right button is used to delete objects. + + The program offers essentially unlimited undo/redo, two text fonts plus + symbols, seven colors, drawing at several zoom scales, and square and + hexagonal backdrop grids for easier alignment. + ''; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + }; +} diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix index ba6c9bc8fdf8..abef9cf9bfec 100644 --- a/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/pkgs/applications/terminal-emulators/xterm/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchurl, fetchpatch, xorg, ncurses, freetype, fontconfig, pkg-config -, makeWrapper, nixosTests, writeScript, common-updater-scripts, git, nixfmt, nix -, gnused, coreutils, enableDecLocator ? true }: +{ lib, stdenv, fetchurl, fetchpatch, xorg, ncurses, freetype, fontconfig +, pkg-config, makeWrapper, nixosTests, writeScript, common-updater-scripts, git +, nixfmt, nix, gnused, coreutils, enableDecLocator ? true }: stdenv.mkDerivation rec { pname = "xterm"; - version = "363"; + version = "364"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - sha256 = "2Bo2OeJlUrZ2W9zyi+Hs24rKv5B5VXCOgwrWOX6hC0g="; + sha256 = "0fizaalpv96sc199dfc00696vq18fixqb4fxb3jsard19k96x4pb"; }; buildInputs = [ diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix index 9a9e5a9ce10a..6592621570ce 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix @@ -24,8 +24,6 @@ let "unshareUser" "unshareCgroup" "unshareUts" "unshareNet" "unsharePid" "unshareIpc" ]); - chrootenv = callPackage ./chrootenv {}; - etcBindFlags = let files = [ # NixOS Compatibility @@ -37,6 +35,8 @@ let "hosts" "resolv.conf" "nsswitch.conf" + # User profiles + "profiles" # Sudo & Su "login.defs" "sudoers" @@ -80,6 +80,11 @@ let if [[ -d ${env}/etc ]]; then for i in ${env}/etc/*; do path="/''${i##*/}" + # NOTE: we're binding /etc/fonts from the host so we don't want to + # override it with a path from the FHS environment. + if [[ $path == '/fonts' ]]; then + continue + fi ro_mounts+=(--ro-bind "$i" "/etc$path") done fi diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix index 083e7617b502..89b567a249f6 100644 --- a/pkgs/build-support/build-fhs-userenv/env.nix +++ b/pkgs/build-support/build-fhs-userenv/env.nix @@ -89,6 +89,9 @@ let ln -s /host/etc/resolv.conf resolv.conf ln -s /host/etc/nsswitch.conf nsswitch.conf + # symlink user profiles + ln -s /host/etc/profiles profiles + # symlink sudo and su stuff ln -s /host/etc/login.defs login.defs ln -s /host/etc/sudoers sudoers diff --git a/pkgs/development/compilers/scala/2.x.nix b/pkgs/development/compilers/scala/2.x.nix index a747206dff8d..d3fa31ddd94b 100644 --- a/pkgs/development/compilers/scala/2.x.nix +++ b/pkgs/development/compilers/scala/2.x.nix @@ -10,28 +10,24 @@ let "2.10" = { version = "2.10.7"; sha256 = "koMRmRb2u3cU4HaihAzPItWIGbNVIo7RWRrm92kp8RE="; - tests = [ nixosTests.scala.scala_2_10 ]; pname = "scala_2_10"; }; "2.11" = { version = "2.11.12"; sha256 = "sR19M2mcpPYLw7K2hY/ZU+PeK4UiyUP0zaS2dDFhlqg="; - tests = [ nixosTests.scala.scala_2_11 ]; pname = "scala_2_11"; }; "2.12" = { version = "2.12.13"; sha256 = "17548sx7liskkadqiqaajmwp2w7bh9m2d8hp2mwyg8yslmjx4pcc"; - tests = [ nixosTests.scala.scala_2_12 ]; pname = "scala_2_12"; }; "2.13" = { version = "2.13.4"; sha256 = "1alcnzmxga00nsvgy8yky91zw5b4q0xg2697vrrdgjlglpxiqwdw"; - tests = [ nixosTests.scala.scala_2_13 ]; pname = "scala_2_13"; }; }; @@ -69,8 +65,14 @@ stdenv.mkDerivation rec { done ''; + doInstallCheck = true; + installCheckPhase = '' + $out/bin/scalac -version 2>&1 | grep '^Scala compiler version ${version}' + + echo 'println("foo"*3)' | $out/bin/scala 2>/dev/null | grep "foofoofoo" + ''; + passthru = { - inherit tests; updateScript = writeScript "update.sh" '' #!${stdenv.shell} set -o errexit diff --git a/pkgs/development/libraries/audio/rtaudio/default.nix b/pkgs/development/libraries/audio/rtaudio/default.nix index 820ea1e49b9e..03048abcc321 100644 --- a/pkgs/development/libraries/audio/rtaudio/default.nix +++ b/pkgs/development/libraries/audio/rtaudio/default.nix @@ -1,4 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, libjack2, alsaLib, pulseaudio, rtmidi }: +{ stdenv +, lib +, config +, fetchFromGitHub +, fetchpatch +, cmake +, pkg-config +, alsaSupport ? stdenv.hostPlatform.isLinux +, alsaLib +, pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux +, libpulseaudio +, jackSupport ? true +, jack +, coreaudioSupport ? stdenv.hostPlatform.isDarwin +, CoreAudio +}: stdenv.mkDerivation rec { version = "5.1.0"; @@ -11,22 +26,40 @@ stdenv.mkDerivation rec { sha256 = "1pglnjz907ajlhnlnig3p0sx7hdkpggr8ss7b3wzf1lykzgv9l52"; }; - patches = [ ./rtaudio-pkgconfig.patch ]; + patches = [ + # Fixes missing headers & install location + # Drop with version > 5.1.0 + (fetchpatch { + name = "RtAudio-Adjust-CMake-public-header-installs-to-match-autotools.patch"; + url = "https://github.com/thestk/rtaudio/commit/4273cf7572b8f51b5996cf6b42e3699cc6b165da.patch"; + sha256 = "1p0idll0xsfk3jwjg83jkxkaf20gk0wqa7l982ni389rn6i4n26p"; + }) + ]; - enableParallelBuilding = true; - - buildInputs = [ autoconf automake libtool libjack2 alsaLib pulseaudio rtmidi ]; - - preConfigure = '' - ./autogen.sh --no-configure - ./configure + postPatch = '' + substituteInPlace rtaudio.pc.in \ + --replace 'Requires:' 'Requires.private:' ''; + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = lib.optional alsaSupport alsaLib + ++ lib.optional pulseaudioSupport libpulseaudio + ++ lib.optional jackSupport jack + ++ lib.optional coreaudioSupport CoreAudio; + + cmakeFlags = [ + "-DRTAUDIO_API_ALSA=${if alsaSupport then "ON" else "OFF"}" + "-DRTAUDIO_API_PULSE=${if pulseaudioSupport then "ON" else "OFF"}" + "-DRTAUDIO_API_JACK=${if jackSupport then "ON" else "OFF"}" + "-DRTAUDIO_API_CORE=${if coreaudioSupport then "ON" else "OFF"}" + ]; + meta = with lib; { description = "A set of C++ classes that provide a cross platform API for realtime audio input/output"; - homepage = "http://www.music.mcgill.ca/~gary/rtaudio/"; + homepage = "https://www.music.mcgill.ca/~gary/rtaudio/"; license = licenses.mit; - maintainers = [ maintainers.magnetophon ]; + maintainers = with maintainers; [ magnetophon ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/audio/rtaudio/rtaudio-pkgconfig.patch b/pkgs/development/libraries/audio/rtaudio/rtaudio-pkgconfig.patch deleted file mode 100644 index 8536332d46d7..000000000000 --- a/pkgs/development/libraries/audio/rtaudio/rtaudio-pkgconfig.patch +++ /dev/null @@ -1,5 +0,0 @@ ---- a/rtaudio.pc.in -+++ b/rtaudio.pc.in -@@ -9 +9 @@ Version: @PACKAGE_VERSION@ --Requires: @req@ -+Requires.private: @req@ diff --git a/pkgs/development/libraries/audio/rtmidi/default.nix b/pkgs/development/libraries/audio/rtmidi/default.nix index f6208bab6c60..540e152655f6 100644 --- a/pkgs/development/libraries/audio/rtmidi/default.nix +++ b/pkgs/development/libraries/audio/rtmidi/default.nix @@ -1,4 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, libjack2, alsaLib, pkg-config }: +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, cmake +, pkg-config +, alsaSupport ? stdenv.hostPlatform.isLinux +, alsaLib +, jackSupport ? true +, jack +, coremidiSupport ? stdenv.hostPlatform.isDarwin +, CoreMIDI +, CoreAudio +, CoreServices +}: stdenv.mkDerivation rec { version = "4.0.0"; @@ -11,21 +25,45 @@ stdenv.mkDerivation rec { sha256 = "1g31p6a96djlbk9jh5r4pjly3x76lhccva9hrw6xzdma8dsjzgyq"; }; - enableParallelBuilding = true; + patches = [ + # PR #230, fix CMake problems + (fetchpatch { + name = "RtMidi-Fix-JACK_HAS_PORT_RENAME-define.patch"; + url = "https://github.com/thestk/rtmidi/pull/230/commits/768a30a61b60240b66cc2d43bc27a544ff9f1622.patch"; + sha256 = "1sym4f7nb2qyyxfhi1l0xsm2hfh6gddn81y36qvfq4mcs33vvid0"; + }) + (fetchpatch { + name = "RtMidi-Add-prefix-define-for-pkgconfig.patch"; + url = "https://github.com/thestk/rtmidi/pull/230/commits/7a32e23e3f6cb43c0d2d58443ce205d438e76f44.patch"; + sha256 = "06im8mb05wah6bnkadw2gpkhmilxb8p84pxqr50b205cchpq304w"; + }) + ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ autoconf automake libtool libjack2 alsaLib ]; - - preConfigure = '' - ./autogen.sh --no-configure - ./configure + postPatch = '' + substituteInPlace rtmidi.pc.in \ + --replace 'Requires:' 'Requires.private:' + substituteInPlace CMakeLists.txt \ + --replace 'PUBLIC_HEADER RtMidi.h' 'PUBLIC_HEADER "RtMidi.h;rtmidi_c.h"' \ + --replace 'PUBLIC_HEADER DESTINATION $''\{CMAKE_INSTALL_INCLUDEDIR}' 'PUBLIC_HEADER DESTINATION $''\{CMAKE_INSTALL_INCLUDEDIR}/rtmidi' ''; - meta = { + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = lib.optional alsaSupport alsaLib + ++ lib.optional jackSupport jack + ++ lib.optionals coremidiSupport [ CoreMIDI CoreAudio CoreServices ]; + + cmakeFlags = [ + "-DRTMIDI_API_ALSA=${if alsaSupport then "ON" else "OFF"}" + "-DRTMIDI_API_JACK=${if jackSupport then "ON" else "OFF"}" + "-DRTMIDI_API_CORE=${if coremidiSupport then "ON" else "OFF"}" + ]; + + meta = with lib; { description = "A set of C++ classes that provide a cross platform API for realtime MIDI input/output"; - homepage = "http://www.music.mcgill.ca/~gary/rtmidi/"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.magnetophon ]; - platforms = with lib.platforms; linux ++ darwin; + homepage = "https://www.music.mcgill.ca/~gary/rtmidi/"; + license = licenses.mit; + maintainers = with maintainers; [ magnetophon ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index 6e62484ac681..01c6ef002e50 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "21.1.0"; + version = "21.1.1"; src = fetchFromGitHub { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "17cgs52f42jdvfb6q3wpkxaz2b41z59jdribpgb9qmcvizsnglxc"; + sha256 = "1cgmpy2wqhv8zljz73wm4rggpk9w1prpmab5qphfp7ljajfv7k8r"; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix index f7cdf7f97c02..49af2593e51e 100644 --- a/pkgs/development/libraries/mpich/default.nix +++ b/pkgs/development/libraries/mpich/default.nix @@ -1,24 +1,52 @@ -{ lib, stdenv, fetchurl, perl, gfortran -, openssh, hwloc +{ stdenv, lib, fetchurl, perl, gfortran +, openssh, hwloc, autoconf, automake, libtool +# device options are ch3 or ch4 +, device ? "ch4" +# backend option are libfabric or ucx +, ch4backend ? "libfabric" +, ucx, libfabric +# Process manager to build +, withPm ? "hydra:gforker" } : +assert (ch4backend == "ucx" || ch4backend == "libfabric"); + stdenv.mkDerivation rec { pname = "mpich"; - version = "3.3.2"; + version = "3.4.1"; src = fetchurl { url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz"; - sha256 = "1farz5zfx4cd0c3a0wb9pgfypzw0xxql1j1294z1sxslga1ziyjb"; + sha256 = "09wpfw9lsrc84vcmfw94razd4xv4znx4mmg7rqmljvgg0jc96dl8"; }; + patches = [ + # Reverts an upstream change that causes json-c test to fail + ./jsonc-test.patch + ]; + + # Required for the json-c patch + nativeBuildInputs = [ autoconf automake libtool ]; + + # Update configure after patch + postPatch = '' + cd modules/json-c + ./autogen.sh + cd ../.. + ''; + + configureFlags = [ "--enable-shared" "--enable-sharedlib" + "--with-pm=${withPm}" ]; enableParallelBuilding = true; - buildInputs = [ perl gfortran openssh hwloc ]; + buildInputs = [ perl gfortran openssh hwloc ] + ++ lib.optional (ch4backend == "ucx") ucx + ++ lib.optional (ch4backend == "libfabric") libfabric; doCheck = true; @@ -27,14 +55,7 @@ stdenv.mkDerivation rec { sed -i 's:CC="gcc":CC=${stdenv.cc}/bin/gcc:' $out/bin/mpicc sed -i 's:CXX="g++":CXX=${stdenv.cc}/bin/g++:' $out/bin/mpicxx sed -i 's:FC="gfortran":FC=${gfortran}/bin/gfortran:' $out/bin/mpifort - '' - + lib.optionalString (!stdenv.isDarwin) '' - # /tmp/nix-build... ends up in the RPATH, fix it manually - for entry in $out/bin/mpichversion $out/bin/mpivars; do - echo "fix rpath: $entry" - patchelf --set-rpath "$out/lib" $entry - done - ''; + ''; meta = with lib; { description = "Implementation of the Message Passing Interface (MPI) standard"; diff --git a/pkgs/development/libraries/mpich/jsonc-test.patch b/pkgs/development/libraries/mpich/jsonc-test.patch new file mode 100644 index 000000000000..2f8d87b409b4 --- /dev/null +++ b/pkgs/development/libraries/mpich/jsonc-test.patch @@ -0,0 +1,62 @@ +--- b/modules/json-c/configure.ac ++++ a/modules/json-c/configure.ac +@@ -75,7 +75,7 @@ + AC_FUNC_VPRINTF + AC_FUNC_MEMCMP + AC_CHECK_FUNCS([realloc]) ++AC_CHECK_FUNCS(strcasecmp strdup strerror snprintf vsnprintf vasprintf open strncasecmp setlocale) +-AC_CHECK_FUNCS(strcasecmp strdup strerror snprintf vsnprintf open strncasecmp setlocale) + AC_CHECK_DECLS([INFINITY], [], [], [[#include ]]) + AC_CHECK_DECLS([nan], [], [], [[#include ]]) + AC_CHECK_DECLS([isnan], [], [], [[#include ]]) +--- b/modules/json-c/json_pointer.c ++++ a/modules/json-c/json_pointer.c +@@ -208,7 +208,7 @@ + } + + va_start(args, path_fmt); ++ rc = vasprintf(&path_copy, path_fmt, args); +- rc = json_vasprintf(&path_copy, path_fmt, args); + va_end(args); + + if (rc < 0) +@@ -287,7 +287,7 @@ + + /* pass a working copy to the recursive call */ + va_start(args, path_fmt); ++ rc = vasprintf(&path_copy, path_fmt, args); +- rc = json_vasprintf(&path_copy, path_fmt, args); + va_end(args); + + if (rc < 0) +--- b/modules/json-c/printbuf.c ++++ a/modules/json-c/printbuf.c +@@ -129,7 +129,7 @@ + would have been written - this code handles both cases. */ + if(size == -1 || size > 127) { + va_start(ap, msg); ++ if((size = vasprintf(&t, msg, ap)) < 0) { va_end(ap); return -1; } +- if((size = json_vasprintf(&t, msg, ap)) < 0) { va_end(ap); return -1; } + va_end(ap); + printbuf_memappend(p, t, size); + free(t); +--- b/modules/json-c/vasprintf_compat.h ++++ a/modules/json-c/vasprintf_compat.h +@@ -8,8 +8,9 @@ + + #include "snprintf_compat.h" + ++#if !defined(HAVE_VASPRINTF) + /* CAW: compliant version of vasprintf */ ++static int vasprintf(char **buf, const char *fmt, va_list ap) +-static int json_vasprintf(char **buf, const char *fmt, va_list ap) + { + #ifndef WIN32 + static char _T_emptybuffer = '\0'; +@@ -40,5 +41,6 @@ + + return chars; + } ++#endif /* !HAVE_VASPRINTF */ + + #endif /* __vasprintf_compat_h */ diff --git a/pkgs/development/python-modules/androidtv/default.nix b/pkgs/development/python-modules/androidtv/default.nix index 91140dc0bf1a..ec00c31147b0 100644 --- a/pkgs/development/python-modules/androidtv/default.nix +++ b/pkgs/development/python-modules/androidtv/default.nix @@ -1,29 +1,40 @@ -{ aiofiles, adb-shell, buildPythonPackage, fetchFromGitHub, isPy3k, lib, mock -, pure-python-adb, python }: +{ lib +, adb-shell +, aiofiles +, buildPythonPackage +, fetchFromGitHub +, isPy3k +, mock +, pure-python-adb +, pytestCheckHook +, python +}: buildPythonPackage rec { pname = "androidtv"; - version = "0.0.50"; + version = "0.0.57"; # pypi does not contain tests, using github sources instead src = fetchFromGitHub { owner = "JeffLIrion"; repo = "python-androidtv"; rev = "v${version}"; - sha256 = "1iqw40szwgzvhv3fbnx2wwfnw0d3clcwk9vsq1xsn30fjil2vl7b"; + sha256 = "sha256-xOLMUf72VHeBzbMnhJGOnUIKkflnY4rV9NS/P1aYLJc="; }; propagatedBuildInputs = [ adb-shell pure-python-adb ] ++ lib.optionals (isPy3k) [ aiofiles ]; - checkInputs = [ mock ]; - checkPhase = '' - ${python.interpreter} -m unittest discover -s tests -t . - ''; + checkInputs = [ + mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "androidtv" ]; meta = with lib; { description = - "Communicate with an Android TV or Fire TV device via ADB over a network."; + "Communicate with an Android TV or Fire TV device via ADB over a network"; homepage = "https://github.com/JeffLIrion/python-androidtv/"; license = licenses.mit; maintainers = with maintainers; [ jamiemagee ]; diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index 1baabf692037..ca8a293503a0 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.16.63"; # N.B: if you change this, change botocore too + version = "1.17.0"; # N.B: if you change this, change botocore too src = fetchPypi { inherit pname version; - sha256 = "sha256-yRnayXcxFQJeHip+Ri9gygguMiu29DVCR1I+QiYTOws="; + sha256 = "sha256-Kjm9Xl8tUM6SZ9aCzJJ1D4dxOZZlAh9H6A+cjS+4EqY="; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 47585feac983..ef621574f76d 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.19.63"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.20.0"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-02lPbvkY3vgIJRPl7zCc1s2DthLpmE46ZuityYxlCpI="; + sha256 = "sha256-pgjW1kS4UvPBVPxDPqrlL+u+vHxHT6j01mZ5fQkxdwo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/brother/default.nix b/pkgs/development/python-modules/brother/default.nix index 394021ff2b21..1c261d173051 100644 --- a/pkgs/development/python-modules/brother/default.nix +++ b/pkgs/development/python-modules/brother/default.nix @@ -4,16 +4,24 @@ buildPythonPackage rec { pname = "brother"; - version = "0.1.18"; + version = "0.2.0"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "bieniu"; repo = pname; rev = version; - sha256 = "14fiwhgcgymgqsl9kcfb0597rcjxvdknhwbakpdf0xp2ph6cj266"; + sha256 = "0d984apw73kzd6bid65bqhp26gvvgqjni56nqr0gnb2sv7mknnm8"; }; + # pytest-error-for-skips is not packaged + postPatch = '' + substituteInPlace pytest.ini \ + --replace " --error-for-skips" "" + substituteInPlace setup.py \ + --replace "\"pytest-error-for-skips\"" "" + ''; + propagatedBuildInputs = [ pysnmp ]; diff --git a/pkgs/development/python-modules/bt-proximity/default.nix b/pkgs/development/python-modules/bt-proximity/default.nix index 8ac1b977f392..584b7b126055 100644 --- a/pkgs/development/python-modules/bt-proximity/default.nix +++ b/pkgs/development/python-modules/bt-proximity/default.nix @@ -3,7 +3,7 @@ buildPythonPackage { pname = "bt-proximity"; - version = "0.0.20180217"; + version = "0.2"; # pypi only has a pre-compiled wheel and no sources src = fetchFromGitHub { @@ -18,6 +18,8 @@ buildPythonPackage { # there are no tests doCheck = false; + pythonImportsCheck = [ "bt_proximity" ]; + meta = with lib; { description = "Bluetooth Proximity Detection using Python"; homepage = "https://github.com/FrederikBolding/bluetooth-proximity"; diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix index d15185e14479..ce2beb235116 100644 --- a/pkgs/development/python-modules/emoji/default.nix +++ b/pkgs/development/python-modules/emoji/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "emoji"; - version = "0.6.0"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "e42da4f8d648f8ef10691bc246f682a1ec6b18373abfd9be10ec0b398823bd11"; + sha256 = "18siknldyqvxvjf0nv18m0a1c26ahkg7vmhkij1qayanb0h46vs9"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/fixerio/default.nix b/pkgs/development/python-modules/fixerio/default.nix index 786681df1c83..8605d0f65da0 100644 --- a/pkgs/development/python-modules/fixerio/default.nix +++ b/pkgs/development/python-modules/fixerio/default.nix @@ -4,23 +4,20 @@ , requests , pytestCheckHook , httpretty +, responses }: buildPythonPackage rec { pname = "fixerio"; - version = "0.1.1"; + version = "1.0.0-alpha"; src = fetchFromGitHub { owner = "amatellanes"; repo = pname; rev = "v${version}"; - sha256 = "1k9ss5jc7sbpkjd2774vbmvljny0wm2lrc8155ha8yk2048jsaxk"; + sha256 = "009h1mys175xdyznn5bl980vly40544s4ph1zcgqwg2i2ic93gvb"; }; - postPatch = '' - substituteInPlace setup.py --replace "requests==2.10.0" "requests" - ''; - propagatedBuildInputs = [ requests ]; @@ -28,6 +25,17 @@ buildPythonPackage rec { checkInputs = [ httpretty pytestCheckHook + responses + ]; + + disabledTests = [ + # tests require network access + "test_returns_historical_rates_for_symbols_passed_if_both" + "test_returns_historical_rates_for_symbols_passed_in_constructor" + "test_returns_historical_rates_for_symbols_passed_in_method" + "test_returns_latest_rates_for_symbols_passed_in_constructor" + "test_returns_latest_rates_for_symbols_passed_in_method" + "test_returns_latest_rates_for_symbols_passed_in_method_if_both" ]; pythonImportsCheck = [ "fixerio" ]; diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix index bc2f39ad2178..56436cdd0eb9 100644 --- a/pkgs/development/python-modules/influxdb-client/default.nix +++ b/pkgs/development/python-modules/influxdb-client/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "influxdb-client"; - version = "1.13.0"; + version = "1.14.0"; disabled = pythonOlder "3.6"; # requires python version >=3.6 @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "influxdata"; repo = "influxdb-client-python"; rev = "v${version}"; - sha256 = "0g7jhjnag8jx8zbjh6xlqds42alpj87a4dpqc37xqa4ir55m3c2q"; + sha256 = "1qq727gwz5migr3xlqxj57qxv1y52g7xpkdgggz2wz739w5czffd"; }; # makes test not reproducible diff --git a/pkgs/development/python-modules/libsoundtouch/default.nix b/pkgs/development/python-modules/libsoundtouch/default.nix index a4f98ffada81..77dcdcaef025 100644 --- a/pkgs/development/python-modules/libsoundtouch/default.nix +++ b/pkgs/development/python-modules/libsoundtouch/default.nix @@ -1,30 +1,40 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchFromGitHub - -, lib -, pythonOlder +, enum-compat , requests -, enum34 +, websocket_client +, zeroconf +, pytestCheckHook }: -buildPythonPackage { +buildPythonPackage rec { pname = "libsoundtouch"; - version = "0.4.0"; + version = "0.8.0"; src = fetchFromGitHub { - owner = "CharlesBlonde"; - repo = "libsoundtouch"; - rev = "875074b7a23734021974345b3dc297918e453aa2"; - sha256 = "1psd556j4x77hjxahxxgdgnq2mcd769whvnf0gmwf3jy2svfkqlg"; + owner = "CharlesBlonde"; + repo = "libsoundtouch"; + rev = version; + sha256 = "1wl2w5xfdkrv0qzsz084z2k6sycfyq62mqqgciycha3dywf2fvva"; }; - postPatch = lib.optionalString (! (pythonOlder "3.4")) '' - substituteInPlace setup.py --replace "'enum34>=1.1.6'" "" - ''; + propagatedBuildInputs = [ + requests + enum-compat + websocket_client + zeroconf + ]; - propagatedBuildInputs = [ requests enum34 ]; + checkInputs = [ + pytestCheckHook + ]; - doCheck = false; + disabledTests = [ + # mock data order mismatch + "test_select_content_item" + "test_snapshot_restore" + ]; meta = with lib; { description = "Bose Soundtouch Python library"; diff --git a/pkgs/development/python-modules/mnemonic/default.nix b/pkgs/development/python-modules/mnemonic/default.nix index 2811d0ecda54..8d47db636964 100644 --- a/pkgs/development/python-modules/mnemonic/default.nix +++ b/pkgs/development/python-modules/mnemonic/default.nix @@ -1,20 +1,28 @@ -{ lib, fetchPypi, buildPythonPackage, pbkdf2 }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: buildPythonPackage rec { pname = "mnemonic"; version = "0.19"; - src = fetchPypi { - inherit pname version; - sha256 = "4e37eb02b2cbd56a0079cabe58a6da93e60e3e4d6e757a586d9f23d96abea931"; + src = fetchFromGitHub { + owner = "trezor"; + repo = "python-${pname}"; + rev = "v${version}"; + sha256 = "0rs3szdikkgypiwn43ad3lwh7zvpccw39j5ggkziq6v7pnw3isaq"; }; - propagatedBuildInputs = [ pbkdf2 ]; + checkInputs = [ pytestCheckHook ]; - meta = { - description = "Implementation of Bitcoin BIP-0039"; + pythonImportsCheck = [ "mnemonic" ]; + + meta = with lib; { + description = "Reference implementation of BIP-0039"; homepage = "https://github.com/trezor/python-mnemonic"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ np ]; + license = licenses.mit; + maintainers = with maintainers; [ np prusnak ]; }; } diff --git a/pkgs/development/python-modules/mpd2/default.nix b/pkgs/development/python-modules/mpd2/default.nix index 031f26c49972..8d17d8b3b0cf 100644 --- a/pkgs/development/python-modules/mpd2/default.nix +++ b/pkgs/development/python-modules/mpd2/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "python-mpd2"; - version = "3.0.3"; + version = "3.0.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1ikvn2qv6cnbjscpbk6hhsqg34h832mxgg6hp1mf4d8d6nwdx4sn"; + sha256 = "1r8saq1460yfa0sxfrvxqs2r453wz2xchlc9gzbpqznr49786rvs"; }; buildInputs = [ mock ]; diff --git a/pkgs/development/python-modules/pylxd/default.nix b/pkgs/development/python-modules/pylxd/default.nix new file mode 100644 index 000000000000..5d373ada09b5 --- /dev/null +++ b/pkgs/development/python-modules/pylxd/default.nix @@ -0,0 +1,30 @@ +{ lib, buildPythonPackage, fetchPypi, pbr, dateutil, ws4py, requests-unixsocket, requests-toolbelt, mock }: + +buildPythonPackage rec { + pname = "pylxd"; + version = "2.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1db88l55q974fm9z5gllx3i8bkj0jzi25xrr5cs6id3bfy4zp8a7"; + }; + + propagatedBuildInputs = [ + pbr + dateutil + ws4py + requests-unixsocket + requests-toolbelt + ]; + + # tests require an old version of requests-mock that we do not have a package for + doCheck = false; + pythonImportsCheck = [ "pylxd" ]; + + meta = with lib; { + description = "A Python library for interacting with the LXD REST API"; + homepage = "https://pylxd.readthedocs.io/en/latest/"; + license = licenses.asl20; + maintainers = with maintainers; [ petabyteboy ]; + }; +} diff --git a/pkgs/development/python-modules/pysonos/default.nix b/pkgs/development/python-modules/pysonos/default.nix index 4a0fb1413bbe..fdf350bd377c 100644 --- a/pkgs/development/python-modules/pysonos/default.nix +++ b/pkgs/development/python-modules/pysonos/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , isPy3k , xmltodict , requests @@ -9,17 +9,21 @@ # Test dependencies , pytest, pylint, flake8, graphviz , mock, sphinx, sphinx_rtd_theme +, requests-mock }: buildPythonPackage rec { pname = "pysonos"; - version = "0.0.37"; + version = "0.0.40"; disabled = !isPy3k; - src = fetchPypi { - inherit pname version; - sha256 = "43a046c1c6086500fb0f4be1094ca963f5b0f555a04b692832b2b88ab741824e"; + # pypi package is missing test fixtures + src = fetchFromGitHub { + owner = "amelchio"; + repo = pname; + rev = "v${version}"; + sha256 = "0a0c7jwv39nbvpdcx32sd8kjmj4nyrd7k0yxhpmxdnx4zr4vvzqg"; }; propagatedBuildInputs = [ xmltodict requests ifaddr ]; @@ -27,6 +31,7 @@ buildPythonPackage rec { checkInputs = [ pytest pylint flake8 graphviz mock sphinx sphinx_rtd_theme + requests-mock ]; checkPhase = '' diff --git a/pkgs/development/python-modules/pywilight/default.nix b/pkgs/development/python-modules/pywilight/default.nix index 66bdcca4793d..4fa4c0fa8542 100644 --- a/pkgs/development/python-modules/pywilight/default.nix +++ b/pkgs/development/python-modules/pywilight/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pywilight"; - version = "0.0.65"; + version = "0.0.68"; src = fetchPypi { inherit pname version; - sha256 = "1bldhg81lal9mbf55ky3gj2ndlplr0vfjp1bamd0mz5d9icas8nf"; + sha256 = "1s1xyw5hkfr4rlni1p9z4941pp1740fsg4a3b23a618hv2p1i4ww"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/shamir-mnemonic/default.nix b/pkgs/development/python-modules/shamir-mnemonic/default.nix index 2225466658d5..ceb3b9abcd8b 100644 --- a/pkgs/development/python-modules/shamir-mnemonic/default.nix +++ b/pkgs/development/python-modules/shamir-mnemonic/default.nix @@ -1,22 +1,40 @@ -{ lib, fetchPypi, buildPythonPackage, isPy3k, click, colorama }: +{ lib +, buildPythonPackage +, isPy3k +, fetchFromGitHub +, attrs +, click +, colorama +, pytestCheckHook +}: buildPythonPackage rec { pname = "shamir-mnemonic"; - version = "0.1.0"; + version = "0.2.1"; disabled = !isPy3k; - src = fetchPypi { - inherit pname version; - sha256 = "1cc08d276e05b13cd32bd3b0c5d1cb6c30254e0086e0f6857ec106d4cceff121"; + src = fetchFromGitHub { + owner = "trezor"; + repo = "python-${pname}"; + rev = "v${version}"; + sha256 = "1mi1n01yw8yycbiv1l0xnfzlhhq2arappyvyi2jm5yq65jln77kg"; }; - propagatedBuildInputs = [ click colorama ]; + propagatedBuildInputs = [ + attrs + click + colorama + ]; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "shamir_mnemonic" ]; meta = with lib; { description = "Reference implementation of SLIP-0039"; homepage = "https://github.com/trezor/python-shamir-mnemonic"; license = licenses.mit; - maintainers = with maintainers; [ _1000101 ]; + maintainers = with maintainers; [ _1000101 prusnak ]; }; } diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index b448f87a2d36..ae9156099c84 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "xknx"; - version = "0.16.1"; + version = "0.16.2"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "XKNX"; repo = pname; rev = version; - sha256 = "0nma0fq67p9c90b6s5v7n4s6j94sdiwqf8rk1k2vfc6nxxn1jfll"; + sha256 = "14cx54ia38ifz7c750i8jxcmnybzwh03ds6hinlwhx8hd2cx9knj"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 2f3500516cb9..3141f666a63a 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.51"; + version = "0.0.53"; src = fetchFromGitHub { owner = "zigpy"; repo = "zha-device-handlers"; rev = version; - sha256 = "14v01kclf096ax88cd6ckfs8gcffqissli9vpr0wfzli08afmbi9"; + sha256 = "16n99r7bjd3lnxn72lfnxg44n7mkv196vdhkw2sf1nq1an4ks1nc"; }; propagatedBuildInputs = [ aiohttp zigpy ]; diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 9a6b0feb3b77..dbc42561db63 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.30.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "zigpy"; repo = "zigpy"; rev = version; - sha256 = "14qyxm7bj62fsvxfp6x3r1ygjlv7q3jjvq6gzj30na78x1fqr9g1"; + sha256 = "18grqx1fzh539ccar0865shgd2mnfni65rjj787cq5j5p5rn0yc7"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/analysis/dotenv-linter/default.nix b/pkgs/development/tools/analysis/dotenv-linter/default.nix new file mode 100644 index 000000000000..b05f9b944400 --- /dev/null +++ b/pkgs/development/tools/analysis/dotenv-linter/default.nix @@ -0,0 +1,25 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "dotenv-linter"; + version = "3.0.0"; + + src = fetchFromGitHub { + owner = "dotenv-linter"; + repo = "dotenv-linter"; + rev = "v${version}"; + sha256 = "sha256-3Lj5GtWGyWDkZPhxYQu7UWzmh7TO5wk1UJ0lek1jTto="; + }; + + cargoSha256 = "sha256-zdvIC+VUASjhrlyRts+JJeh5xdcdpX6Ixle6HhbMJJU="; + + meta = with lib; { + description = "Lightning-fast linter for .env files. Written in Rust"; + homepage = "https://dotenv-linter.github.io"; + license = licenses.mit; + maintainers = with maintainers; [ humancalico ]; + }; +} diff --git a/pkgs/os-specific/darwin/impure-cmds/default.nix b/pkgs/os-specific/darwin/impure-cmds/default.nix new file mode 100644 index 000000000000..51e345f048bd --- /dev/null +++ b/pkgs/os-specific/darwin/impure-cmds/default.nix @@ -0,0 +1,34 @@ +{ lib, runCommandLocal }: + +# On darwin, there are some commands neither opensource nor able to build in nixpkgs. +# We have no choice but to use those system-shipped impure ones. + +let + commands = { + ditto = "/usr/bin/ditto"; # ditto is not opensource + sudo = "/usr/bin/sudo"; # sudo must be owned by uid 0 and have the setuid bit set + }; + + mkImpureDrv = name: path: + runCommandLocal "${name}-impure-darwin" { + __impureHostDeps = [ path ]; + + meta = { + platforms = lib.platforms.darwin; + }; + } '' + if ! [ -x ${path} ]; then + echo Cannot find command ${path} + exit 1 + fi + + mkdir -p $out/bin + ln -s ${path} $out/bin + + manpage="/usr/share/man/man1/${name}.1" + if [ -f $manpage ]; then + mkdir -p $out/share/man/man1 + ln -s $manpage $out/share/man/man1 + fi + ''; +in lib.mapAttrs mkImpureDrv commands diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index 55e58d7a017f..eeb117a984e4 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ mypy attrs ]) +#! nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ mypy attrs packaging rich ]) # # This script downloads Home Assistant's source tarball. # Inside the homeassistant/components directory, each integration has an associated manifest.json, @@ -26,6 +26,9 @@ import tempfile from io import BytesIO from typing import Dict, Optional, Set, Any from urllib.request import urlopen +from packaging import version as Version +from rich.console import Console +from rich.table import Table COMPONENT_PREFIX = "homeassistant.components" PKG_SET = "python3Packages" @@ -142,12 +145,20 @@ def name_to_attr_path(req: str, packages: Dict[str, Dict[str, str]]) -> Optional return None +def get_pkg_version(package: str, packages: Dict[str, Dict[str, str]]) -> Optional[str]: + pkg = packages.get(f"{PKG_SET}.{package}", None) + if not pkg: + return None + return pkg["version"] + + def main() -> None: packages = dump_packages() version = get_version() print("Generating component-packages.nix for version {}".format(version)) components = parse_components(version=version) build_inputs = {} + outdated = {} for component in sorted(components.keys()): attr_paths = [] missing_reqs = [] @@ -156,8 +167,14 @@ def main() -> None: # Some requirements are specified by url, e.g. https://example.org/foobar#xyz==1.0.0 # Therefore, if there's a "#" in the line, only take the part after it req = req[req.find("#") + 1 :] - name = req.split("==")[0] + name, required_version = req.split("==", maxsplit=1) attr_path = name_to_attr_path(name, packages) + if our_version := get_pkg_version(name, packages): + if Version.parse(our_version) < Version.parse(required_version): + outdated[name] = { + 'wanted': required_version, + 'current': our_version + } if attr_path is not None: # Add attribute path without "python3Packages." prefix attr_paths.append(attr_path[len(PKG_SET + ".") :]) @@ -189,6 +206,17 @@ def main() -> None: f.write(" };\n") f.write("}\n") + if outdated: + table = Table(title="Outdated dependencies") + table.add_column("Package") + table.add_column("Current") + table.add_column("Wanted") + for package, version in sorted(outdated.items()): + table.add_row(package, version['current'], version['wanted']) + + console = Console() + console.print(table) + if __name__ == "__main__": run_mypy() diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix index d4a26f086ce4..a178d43d231e 100644 --- a/pkgs/servers/nosql/influxdb/default.nix +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "influxdb"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "influxdata"; repo = pname; rev = "v${version}"; - sha256 = "1siv31gp7ypjphxjfv91sxzpz2rxk1nn2aj17pgk0cz7c8m59ic7"; + sha256 = "sha256-cL+QaUGMElYd6P+xXkQgRnL8BKo2C95bhCwy59kRnwo="; }; - vendorSha256 = "1pylw30dg6ljxm9ykmsqapg1vq71bj1ngdq4arvmmzcdhy1nhmh0"; + vendorSha256 = "sha256-v4CEkhQiETeU6i186XIE/8z4T71gdKL+6W7sQ7/2RuI="; doCheck = false; diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 82dbdc8620f5..332f7d4189b2 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -28,11 +28,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.18.223"; # N.B: if you change this, change botocore to a matching version too + version = "1.19.0"; # N.B: if you change this, change botocore to a matching version too src = fetchPypi { inherit pname version; - sha256 = "sha256-Myc6iT04VO2DliCiYvn4JtuoLVBWYNp8EbE4giYmrtk="; + sha256 = "sha256-K9wu8zD5M02+77kclCBh/ralNka9VcZj4AVvjQ3Gb+0="; }; # https://github.com/aws/aws-cli/issues/4837 diff --git a/pkgs/tools/package-management/nixops/unstable.nix b/pkgs/tools/package-management/nixops/unstable.nix deleted file mode 100644 index 94975807dea6..000000000000 --- a/pkgs/tools/package-management/nixops/unstable.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ callPackage, fetchurl }: - -# To upgrade pick the hydra job of the nixops revision that you want to upgrade -# to from: https://hydra.nixos.org/job/nixops/master/tarball -# Then copy the URL to the tarball. - -callPackage ./generic.nix (rec { - version = "1.7pre2764_932bf43"; - src = fetchurl { - url = "https://hydra.nixos.org/build/92372343/download/2/nixops-${version}.tar.bz2"; - sha256 = "f35bf81bf2805473ea54248d0ee92d163d00a1992f3f75d17e8cf430db1f9919"; - }; -}) diff --git a/pkgs/tools/text/mark/default.nix b/pkgs/tools/text/mark/default.nix index 36ca24ebf3e9..c91d2f208164 100644 --- a/pkgs/tools/text/mark/default.nix +++ b/pkgs/tools/text/mark/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mark"; - version = "3.5"; + version = "5.0"; src = fetchFromGitHub { owner = "kovetskiy"; repo = "mark"; rev = version; - sha256 = "0za4n2caqr3gflfxr1hdd328g7r52h7x0ws7r9mjvdnmwjgc0b2b"; + sha256 = "sha256-PN7YSpTl7RoW5zgoYjXHDFB6sTroSA3TNpTCsOsdB34="; }; - vendorSha256 = "1hvizcg5b3y2qgjiw77rb795xz9w1dzr3b8q2ji48ihll27g9f0m"; + vendorSha256 = "sha256-1YQD+QwCOAPOsj946DNF92LYKfRgXZXcfhIADP8s2CY="; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 817a95aa4719..cf7454a88ddf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2128,6 +2128,8 @@ in dosage = callPackage ../applications/graphics/dosage { }; + dotenv-linter = callPackage ../development/tools/analysis/dotenv-linter { }; + dot-merlin-reader = callPackage ../development/tools/ocaml/merlin/dot-merlin-reader.nix { }; dozenal = callPackage ../applications/misc/dozenal { }; @@ -7293,9 +7295,15 @@ in rocket = libsForQt5.callPackage ../tools/graphics/rocket { }; - rtaudio = callPackage ../development/libraries/audio/rtaudio { }; + rtaudio = callPackage ../development/libraries/audio/rtaudio { + jack = libjack2; + inherit (darwin.apple_sdk.frameworks) CoreAudio; + }; - rtmidi = callPackage ../development/libraries/audio/rtmidi { }; + rtmidi = callPackage ../development/libraries/audio/rtmidi { + jack = libjack2; + inherit (darwin.apple_sdk.frameworks) CoreMIDI CoreAudio CoreServices; + }; openmpi = callPackage ../development/libraries/openmpi { }; @@ -8037,7 +8045,7 @@ in subsurface = libsForQt514.callPackage ../applications/misc/subsurface { }; - sudo = callPackage ../tools/security/sudo { }; + sudo = if stdenv.isDarwin then darwin.sudo else callPackage ../tools/security/sudo { }; suidChroot = callPackage ../tools/system/suid-chroot { }; @@ -27405,6 +27413,8 @@ in eigen = eigen2; }; + chemtool = callPackage ../applications/science/chemistry/chemtool { }; + d-seams = callPackage ../applications/science/chemistry/d-seams {}; gwyddion = callPackage ../applications/science/chemistry/gwyddion {}; @@ -28744,7 +28754,7 @@ in nixops_1_6_1 = callPackage ../tools/package-management/nixops/nixops-v1_6_1.nix {}; - nixopsUnstable = lowPrio (callPackage ../tools/package-management/nixops/unstable.nix { }); + nixopsUnstable = lowPrio (callPackage ../applications/networking/cluster/nixops { }); nixops-dns = callPackage ../tools/package-management/nixops/nixops-dns.nix { }; diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 6fafe09438cd..2197f128388a 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -4,9 +4,11 @@ let apple-source-releases = callPackage ../os-specific/darwin/apple-source-releases { }; + + impure-cmds = callPackage ../os-specific/darwin/impure-cmds { }; in -(apple-source-releases // { +(impure-cmds // apple-source-releases // { callPackage = newScope (darwin.apple_sdk.frameworks // darwin); diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f7442cc3fe75..94497d7571f0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6986,6 +6986,23 @@ let }; }; + EmailStuffer = buildPerlPackage { + pname = "Email-Stuffer"; + version = "0.018"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Stuffer-0.018.tar.gz"; + sha256 = "02wapphmcqbl1sg32x2az863lz5bb2dlckibxfqrjdlny27a406h"; + }; + buildInputs = [ Moo TestFatal ]; + propagatedBuildInputs = [ EmailMIME EmailSender ModuleRuntime ParamsUtil ]; + meta = { + homepage = "https://github.com/rjbs/Email-Stuffer"; + description = "A more casual approach to creating and sending Email:: emails"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ sgo ]; + }; + }; + EmailValid = buildPerlPackage { pname = "Email-Valid"; version = "1.202"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c1b6ec996837..e54d6acc5cbd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5599,6 +5599,8 @@ in { pylutron = callPackage ../development/python-modules/pylutron { }; + pylxd = callPackage ../development/python-modules/pylxd { }; + pymacaroons = callPackage ../development/python-modules/pymacaroons { }; pymaging = callPackage ../development/python-modules/pymaging { };