From ec5c081715187867871c956e5745c82b5e5b9579 Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 1 Jul 2021 06:14:58 +0300 Subject: [PATCH 001/235] udevil: refactor and fix #35650 --- pkgs/applications/misc/udevil/default.nix | 33 ++++++++++++++++------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/udevil/default.nix b/pkgs/applications/misc/udevil/default.nix index e83a5e9a2c7e..9d1df5245edc 100644 --- a/pkgs/applications/misc/udevil/default.nix +++ b/pkgs/applications/misc/udevil/default.nix @@ -1,12 +1,20 @@ -{ lib, stdenv, fetchurl, intltool, glib, pkg-config, udev, util-linux, acl }: -stdenv.mkDerivation { - name = "udevil-0.4.4"; - src = fetchurl { - url = "https://github.com/IgnorantGuru/udevil/archive/0.4.4.tar.gz"; - sha256 = "0z1bhaayambrcn7bgnrqk445k50ifabmw8q4i9qj49nnbcvxhbxd"; +{ lib, stdenv, fetchFromGitHub, intltool, glib, pkg-config, udev, util-linux, acl }: + +stdenv.mkDerivation rec { + pname = "udevil"; + version = "0.4.4"; + + src = fetchFromGitHub { + owner = "IgnorantGuru"; + repo = "udevil"; + rev = version; + sha256 = "0nd44r8rbxifx4x4m24z5aji1c6k1fhw8cmf5s43wd5qys0bcdad"; }; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ intltool glib udev ]; + configurePhase = '' substituteInPlace src/Makefile.in --replace "-o root -g root" "" # do not set setuid bit in nix store @@ -19,11 +27,18 @@ stdenv.mkDerivation { --with-setfacl-prog=${acl.bin}/bin/setfacl \ --sysconfdir=$prefix/etc ''; + + postInstall = '' + substituteInPlace $out/lib/systemd/system/devmon@.service \ + --replace /usr/bin/devmon "$out/bin/devmon" + ''; + patches = [ ./device-info-sys-stat.patch ]; - meta = { + + meta = with lib; { description = "A command line Linux program which mounts and unmounts removable devices without a password, shows device info, and monitors device changes"; homepage = "https://ignorantguru.github.io/udevil/"; - platforms = lib.platforms.linux; - license = lib.licenses.gpl3; + platforms = platforms.linux; + license = licenses.gpl3Plus; }; } From 1db44c4ff12dfe2e6e825e7e018cc10fc8467fa1 Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 7 Jul 2021 20:27:19 +0300 Subject: [PATCH 002/235] nixos/devmon: add systemd service --- nixos/modules/programs/udevil.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/programs/udevil.nix b/nixos/modules/programs/udevil.nix index ba5670f9dfe9..25975d88ec86 100644 --- a/nixos/modules/programs/udevil.nix +++ b/nixos/modules/programs/udevil.nix @@ -10,5 +10,8 @@ in { config = mkIf cfg.enable { security.wrappers.udevil.source = "${lib.getBin pkgs.udevil}/bin/udevil"; + + systemd.packages = [ pkgs.udevil ]; + systemd.services."devmon@".wantedBy = [ "multi-user.target" ]; }; } From ac5cd3a6a224b8f06f58e7270c4140517c8d3296 Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Sat, 10 Jul 2021 12:50:52 +0200 Subject: [PATCH 003/235] build-fhs-user-env-bubblewrap: add compatibility for pipewire alsa emulation The NixOS pipewire module places its alsa compatiblity configuration in /etc/alsa/conf.d/ instead of /etc/asound.conf. This commit enables applications running in a bubblewrap fhs environment to use alsa on systems running pipewire. --- pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix index 868686bd5c01..23718bf636c6 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix @@ -62,6 +62,7 @@ let # Fonts "fonts" # ALSA + "alsa" "asound.conf" # SSL "ssl/certs" From f9ffd72d7ee1365cdf6d7fdc5463cb8f90484c55 Mon Sep 17 00:00:00 2001 From: Johann Dahm Date: Tue, 13 Jul 2021 22:38:24 -0700 Subject: [PATCH 004/235] python3Packages.devtools: init at 0.6.1 --- .../python-modules/devtools/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/devtools/default.nix diff --git a/pkgs/development/python-modules/devtools/default.nix b/pkgs/development/python-modules/devtools/default.nix new file mode 100644 index 000000000000..29a5234608bd --- /dev/null +++ b/pkgs/development/python-modules/devtools/default.nix @@ -0,0 +1,27 @@ +{ buildPythonPackage, pythonOlder, fetchFromGitHub, lib, pygments +, pytestCheckHook, pytest-mock }: + +buildPythonPackage rec { + pname = "devtools"; + version = "0.6.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "samuelcolvin"; + repo = "python-${pname}"; + rev = "v${version}"; + sha256 = "0s1d2jwijini7y1a3318yhb98mh1mw4pzlfx2zck3a8nqw984ki3"; + }; + + propagatedBuildInputs = [ pygments ]; + + checkInputs = [ pytestCheckHook pytest-mock ]; + + pythonImportsCheck = [ "devtools" ]; + + meta = with lib; { + description = "Python's missing debug print command and other development tools"; + homepage = "https://python-devtools.helpmanual.io/"; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 85b0302ea00f..15e2866effaf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1909,6 +1909,8 @@ in { devpi-common = callPackage ../development/python-modules/devpi-common { }; + devtools = callPackage ../development/python-modules/devtools { }; + diagrams = callPackage ../development/python-modules/diagrams { }; diceware = callPackage ../development/python-modules/diceware { }; From 04531da0fdb56e63448a073ac08f11f4fd8953df Mon Sep 17 00:00:00 2001 From: arjix Date: Mon, 12 Jul 2021 14:41:16 +0200 Subject: [PATCH 005/235] python3Packages.nengo: init at 3.1.0 --- .../python-modules/nengo/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/nengo/default.nix diff --git a/pkgs/development/python-modules/nengo/default.nix b/pkgs/development/python-modules/nengo/default.nix new file mode 100644 index 000000000000..566540a4c972 --- /dev/null +++ b/pkgs/development/python-modules/nengo/default.nix @@ -0,0 +1,36 @@ +{ lib, fetchFromGitHub, buildPythonPackage +, numpy +, scipySupport ? false, scipy +, scikitSupport ? false, scikit-learn +}: + +buildPythonPackage rec { + pname = "nengo"; + version = "3.1.0"; + + src = fetchFromGitHub { + owner = "nengo"; + repo = "nengo"; + rev = "v${version}"; + sha256 = "1wkayimf2jqkbr6piikh5zd6yw8gf2qv4v4bfrprs4laa6wzh2qh"; + }; + + propagatedBuildInputs = [ numpy ] + ++ lib.optionals scipySupport [ scipy ] + ++ lib.optionals scikitSupport [ scikit-learn ]; + + # checks req missing: + # pytest-allclose + # pytest-plt + # pytest-rng + doCheck = false; + + pythonImportsCheck = [ "nengo" ]; + + meta = with lib; { + description = "A Python library for creating and simulating large-scale brain models"; + homepage = "https://nengo.ai/"; + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ arjix ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 78db6b3db5c9..1328b06b6aa9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4726,6 +4726,8 @@ in { ndtypes = callPackage ../development/python-modules/ndtypes { }; + nengo = callPackage ../development/python-modules/nengo { }; + neo = callPackage ../development/python-modules/neo { }; nest-asyncio = callPackage ../development/python-modules/nest-asyncio { }; From 6a510304aa02cd61d08eb2a357d5ebaaa7722b20 Mon Sep 17 00:00:00 2001 From: arjix Date: Tue, 13 Jul 2021 10:35:47 +0200 Subject: [PATCH 006/235] maintainers: add arjix --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ef102e3a7a3d..9bd6bd428c13 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1054,6 +1054,12 @@ githubId = 135230; name = "Aycan iRiCAN"; }; + arjix = { + email = "arjix@protonmail.com"; + github = "arjix"; + githubId = 62168569; + name = "arjix"; + }; artturin = { email = "artturin@artturin.com"; github = "artturin"; From f3cb27405c3add4cc0d01ac191fe1041d31af96e Mon Sep 17 00:00:00 2001 From: Johann Dahm Date: Tue, 13 Jul 2021 22:39:53 -0700 Subject: [PATCH 007/235] Add @jdahm as maintainer of python3Packages.devtools --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/development/python-modules/devtools/default.nix | 1 + 2 files changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ef102e3a7a3d..1df8fb0293a4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4793,6 +4793,12 @@ githubId = 1383440; name = "Jason Gilliland"; }; + jdahm = { + email = "johann.dahm@gmail.com"; + github = "jdahm"; + githubId = 68032; + name = "Johann Dahm"; + }; jdanek = { email = "jdanek@redhat.com"; github = "jdanekrh"; diff --git a/pkgs/development/python-modules/devtools/default.nix b/pkgs/development/python-modules/devtools/default.nix index 29a5234608bd..32050acfdf27 100644 --- a/pkgs/development/python-modules/devtools/default.nix +++ b/pkgs/development/python-modules/devtools/default.nix @@ -23,5 +23,6 @@ buildPythonPackage rec { description = "Python's missing debug print command and other development tools"; homepage = "https://python-devtools.helpmanual.io/"; license = licenses.mit; + maintainers = with maintainers; [ jdahm ]; }; } From d6ec883de2bdcb38927b8ce8405c12e758a512f6 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Bernardy Date: Tue, 13 Jul 2021 19:48:26 +0200 Subject: [PATCH 008/235] rhythmbox: add support for more features (depend on more libraries) - libsecret: remember passwords for DAAP servers in the keyring - libnotify: watch changes in the music library - more gstreamer plugins --- pkgs/applications/audio/rhythmbox/default.nix | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix index 9e338e198133..4898648599c3 100644 --- a/pkgs/applications/audio/rhythmbox/default.nix +++ b/pkgs/applications/audio/rhythmbox/default.nix @@ -6,6 +6,8 @@ , intltool , libpeas , libsoup +, libsecret +, libnotify , libdmapsharing , gnome , totem-pl-parser @@ -17,8 +19,6 @@ , gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ] }: let - pname = "rhythmbox"; - version = "3.4.4"; # The API version of libdmapsharing required by rhythmbox 3.4.4 is 3.0. @@ -39,10 +39,11 @@ let }); in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + pname = "rhythmbox"; + version = "3.4.4"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "142xcvw4l19jyr5i72nbnrihs953pvrrzcbijjn9dxmxszbv03pf"; }; @@ -66,11 +67,21 @@ in stdenv.mkDerivation rec { gst_all_1.gstreamer gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly + gst_all_1.gst-libav libdmapsharing_3 # necessary for daap support + libsecret + libnotify ] ++ gst_plugins; - configureFlags = [ "--enable-daap" ]; + configureFlags = [ + "--enable-daap" + "--enable-libnotify" + "--with-libsecret" + ]; enableParallelBuilding = true; @@ -84,7 +95,7 @@ in stdenv.mkDerivation rec { meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Rhythmbox"; description = "A music playing application for GNOME"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.rasendubi ]; }; From de77ce3040e458e5b0fc755b365cd078d457efb9 Mon Sep 17 00:00:00 2001 From: toonn Date: Wed, 14 Jul 2021 11:21:40 +0200 Subject: [PATCH 009/235] joypixels: 6.5.0 -> 6.6.0 --- pkgs/data/fonts/joypixels/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/fonts/joypixels/default.nix b/pkgs/data/fonts/joypixels/default.nix index 146b832af9c7..593817275669 100644 --- a/pkgs/data/fonts/joypixels/default.nix +++ b/pkgs/data/fonts/joypixels/default.nix @@ -58,15 +58,15 @@ in stdenv.mkDerivation rec { pname = "joypixels"; - version = "6.5.0"; + version = "6.6.0"; src = assert !acceptLicense -> throwLicense; with systemSpecific; fetchurl { name = fontFile; url = "https://cdn.joypixels.com/distributions/${systemTag}/font/${version}/${fontFile}"; sha256 = { - darwin = "034bwxy6ljvhx9zlm6jkb8vw222sg79sjwlcjfql51rk6zkmv4wx"; - }.${kernel.name} or "1v6hz0qhbnzayxhs5j9qfa2ggn7nak53ij7kr06m93wcmlnnln86"; + darwin = "0qcmb2vn2nykyikzgnlma627zhks7ksy1vkgvpcmqwyxq4bd38d7"; + }.${kernel.name} or "17gjaz7353zyprmds64p01qivy2r8pwf88nvvhi57idas2qd604n"; }; dontUnpack = true; @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The finest emoji you can use legally (formerly EmojiOne)"; longDescription = '' - Updated for 2021! JoyPixels 6.5 includes 3,559 originally crafted icon + Updated for 2021! JoyPixels 6.6 includes 3,559 originally crafted icon designs and is 100% Unicode 13.1 compatible. We offer the largest selection of files ranging from png, svg, iconjar, sprites, and fonts. ''; From 29c2135a2784e62bc815b26942a18c9100b03b3f Mon Sep 17 00:00:00 2001 From: Sebastian Jordan Date: Sat, 15 May 2021 18:45:05 +0200 Subject: [PATCH 010/235] cask: Add build phase hooks and install phase hooks Add the pre and post phase hooks was done to fix the broken shebangs of the cask executable. --- pkgs/development/tools/cask/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/cask/default.nix b/pkgs/development/tools/cask/default.nix index 1c5f316cea9d..f9e7d215f320 100644 --- a/pkgs/development/tools/cask/default.nix +++ b/pkgs/development/tools/cask/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3, emacs }: +{ lib, stdenv, python3, emacs, bash }: stdenv.mkDerivation rec { pname = "cask"; @@ -13,15 +13,19 @@ stdenv.mkDerivation rec { noflet ert-async shell-split-string git package-build ] ++ [ python3 + bash ]; strictDeps = true; buildPhase = '' + runHook preBuild emacs --batch -L . -f batch-byte-compile cask.el cask-cli.el + runHook postBuild ''; installPhase = '' + runHook preInstall mkdir -p $out/bin mkdir -p $out/templates mkdir -p $out/share/emacs/site-lisp/cask/bin @@ -30,6 +34,7 @@ stdenv.mkDerivation rec { install -Dm644 templates/* $out/templates/ touch $out/.no-upgrade ln -s $out/share/emacs/site-lisp/cask/bin/cask $out/bin/cask + runHook postInstall ''; meta = with lib; { From 45cd9ad22db1f0f053c6dca46f5b470c750b99aa Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 15 Jul 2021 19:18:03 -0300 Subject: [PATCH 011/235] linkerd_edge: 21.7.2 -> 21.7.3 --- pkgs/applications/networking/cluster/linkerd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix index 9bd9a8e7a187..883d16319b17 100644 --- a/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/pkgs/applications/networking/cluster/linkerd/default.nix @@ -64,8 +64,8 @@ in }; edge = generic { channel = "edge"; - version = "21.7.2"; - sha256 = "sha256-rEO84t6znNb59a9i+SHgT4r0xzja6eMYi9lWmdU24Cc="; - vendorSha256 = "sha256-esVy+oIZa/ucvucdNV7MfUGFkIql9T2zl0+eu3hZAt8="; + version = "21.7.3"; + sha256 = "sha256-fEkqZ/4BQVnmOKUrrLmi6DKlMVNeqvW95bxbZX0o7iI="; + vendorSha256 = "sha256-NqOmmeEGWvy/LYfSpIdnJZX4lGweCgiL008ed05XIFs="; }; } From 443a880ccba0eaf78771c586df498a4f3fd8c47f Mon Sep 17 00:00:00 2001 From: Angus Trau Date: Fri, 16 Jul 2021 10:19:41 +1000 Subject: [PATCH 012/235] python3Packages.pymunk: init at 6.0.0 --- .../python-modules/pymunk/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/pymunk/default.nix diff --git a/pkgs/development/python-modules/pymunk/default.nix b/pkgs/development/python-modules/pymunk/default.nix new file mode 100644 index 000000000000..92918efa8ed8 --- /dev/null +++ b/pkgs/development/python-modules/pymunk/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python +, cffi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pymunk"; + version = "6.0.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "04jqqd2y0wzzkqppbl08vyzgbcpl5qj946w8da2ilypqdx7j2akp"; + }; + + propagatedBuildInputs = [ cffi ]; + + preBuild = '' + ${python.interpreter} setup.py build_ext --inplace + ''; + + checkInputs = [ pytestCheckHook ]; + pytestFlagsArray = [ + "pymunk/tests" + ]; + + meta = with lib; { + description = "2d physics library"; + homepage = "https://www.pymunk.org"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ angustrau ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index abf8dc2ee804..ea34502d2cd7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6250,6 +6250,8 @@ in { pymumble = callPackage ../development/python-modules/pymumble { }; + pymunk = callPackage ../development/python-modules/pymunk { }; + pymupdf = callPackage ../development/python-modules/pymupdf { }; PyMVGLive = callPackage ../development/python-modules/pymvglive { }; From 5a13a8fe65755e852a9544dcf086aefa0ef79f79 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 16 Jul 2021 19:51:20 +0200 Subject: [PATCH 013/235] ssss: 0.5 -> 0.5.7 --- pkgs/tools/security/ssss/default.nix | 53 ++++++++++++++++++---------- 1 file changed, 35 insertions(+), 18 deletions(-) diff --git a/pkgs/tools/security/ssss/default.nix b/pkgs/tools/security/ssss/default.nix index 34407f5f5ad9..61d10111120e 100644 --- a/pkgs/tools/security/ssss/default.nix +++ b/pkgs/tools/security/ssss/default.nix @@ -1,28 +1,45 @@ -{ lib, stdenv, fetchurl, gmp }: +{ lib +, stdenv +, fetchFromGitHub +, gmp +, installShellFiles +}: -stdenv.mkDerivation { - name = "ssss-0.5"; +stdenv.mkDerivation rec { + pname = "ssss"; + version = "0.5.7"; - src = fetchurl { - url = "http://point-at-infinity.org/ssss/ssss-0.5.tar.gz"; - sha256 = "15grn2fp1x8p92kxkwbmsx8rz16g93y9grl3hfqbh1jn21ama5jx"; + src = fetchFromGitHub { + owner = "MrJoy"; + repo = pname; + rev = "releases%2Fv${version}"; + sha256 = "18r1hwch6nq6gjijavr4pvrxz2plrlrvdx8ssqhdj2vmqvlqwbvd"; }; - buildInputs = [ gmp ]; + nativeBuildInputs = [ + installShellFiles + ]; - preBuild = - '' - sed -e s@/usr/@$out/@g -i Makefile - cp ssss.manpage.xml ssss.1 - cp ssss.manpage.xml ssss.1.html - mkdir -p $out/bin $out/share/man/man1 - echo -e 'install:\n\tcp ssss-combine ssss-split '"$out"'/bin' >>Makefile - ''; + buildInputs = [ + gmp + ]; - meta = { + preBuild = '' + sed -e s@/usr/@$out/@g -i Makefile + cp ssss.manpage.xml ssss.1 + mkdir -p $out/bin + echo -e 'install:\n\tcp ssss-combine ssss-split '"$out"'/bin' >>Makefile + ''; + + postInstall = '' + installManPage ssss.1 + ''; + + meta = with lib; { description = "Shamir Secret Sharing Scheme"; homepage = "http://point-at-infinity.org/ssss/"; - platforms = lib.platforms.unix; - license = lib.licenses.gpl2; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ ]; }; } From eb7b28cae86c8a61c5e3e116aef79b59953ec46b Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sat, 17 Jul 2021 23:16:39 +0200 Subject: [PATCH 014/235] zandronum-sqlite: remove phases --- pkgs/games/zandronum/sqlite.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/games/zandronum/sqlite.nix b/pkgs/games/zandronum/sqlite.nix index c9baefcf0af6..e38dedbb7f73 100644 --- a/pkgs/games/zandronum/sqlite.nix +++ b/pkgs/games/zandronum/sqlite.nix @@ -9,8 +9,6 @@ stdenv.mkDerivation { sha256 = "0p5cx7nbjxk7glcm277ypi5w4gv144qazw79ql47svlpccj62mrp"; }; - phases = [ "unpackPhase" "buildPhase" ]; - buildPhase = '' mkdir -p $out cp sqlite3.c $out/ From 539dbfae804e1e12e36fe6e7a31bfba667489575 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 18 Jul 2021 12:50:24 +0200 Subject: [PATCH 015/235] caja-with-extensions: deprecate phases --- pkgs/desktops/mate/caja-with-extensions/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/mate/caja-with-extensions/default.nix b/pkgs/desktops/mate/caja-with-extensions/default.nix index 125e39d1f461..dd9ab9be1d37 100644 --- a/pkgs/desktops/mate/caja-with-extensions/default.nix +++ b/pkgs/desktops/mate/caja-with-extensions/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { pname = "${caja.pname}-with-extensions"; version = caja.version; - phases = [ "installPhase" ]; + dontUnpack = true; nativeBuildInputs = [ makeWrapper ]; From 2cceb4b94829fbec2573f3f7293066cdc7fa3dd6 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 18 Jul 2021 16:24:21 +0800 Subject: [PATCH 016/235] microsoft_gsl: 2.1.0 -> 3.1.0 --- .../libraries/microsoft_gsl/default.nix | 48 ++++++++++--------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/pkgs/development/libraries/microsoft_gsl/default.nix b/pkgs/development/libraries/microsoft_gsl/default.nix index 5a5257168eb4..11931199999b 100644 --- a/pkgs/development/libraries/microsoft_gsl/default.nix +++ b/pkgs/development/libraries/microsoft_gsl/default.nix @@ -1,44 +1,46 @@ -{ lib, stdenv, fetchFromGitHub, catch, cmake +{ lib +, stdenv +, fetchFromGitHub +, cmake +, gtest +, fetchurl +, pkg-config }: -let - nativeBuild = stdenv.hostPlatform == stdenv.buildPlatform; -in stdenv.mkDerivation rec { pname = "microsoft_gsl"; - version = "2.1.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "Microsoft"; repo = "GSL"; rev = "v${version}"; - sha256 = "09f08lxqm00152bx9yrizlgabzpzxlpbv06h00z4w78yxywgxlgx"; + sha256 = "sha256-gIpyuNlp3mvR8r1Azs2r76ElEodykRLGAwMN4BDJez0="; }; - # build phase just runs the unit tests, so skip it if - # we're doing a cross build - nativeBuildInputs = [ catch cmake ]; - buildPhase = if nativeBuild then "make" else "true"; + patches = [ + # Search for GoogleTest via pkg-config first, ref: https://github.com/NixOS/nixpkgs/pull/130525 + (fetchurl { + url = "https://github.com/microsoft/GSL/commit/f5cf01083baf7e8dc8318db3648bc6098dc32d67.patch"; + sha256 = "sha256-uouv35crtly8kYhKyvMyZkqwTKt1jXC6dZjw4sQ6uv0="; + }) + ]; - # https://github.com/microsoft/GSL/issues/806 - cmakeFlags = lib.optionals stdenv.cc.isGNU - [ "-DCMAKE_CXX_FLAGS=-Wno-catch-value" ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ gtest ]; - installPhase = '' - mkdir -p $out/include - mv ../include/ $out/ - ''; + doCheck = true; meta = with lib; { description = "C++ Core Guideline support library"; longDescription = '' - The Guideline Support Library (GSL) contains functions and types that are suggested for - use by the C++ Core Guidelines maintained by the Standard C++ Foundation. - This package contains Microsoft's implementation of GSL. + The Guideline Support Library (GSL) contains functions and types that are suggested for + use by the C++ Core Guidelines maintained by the Standard C++ Foundation. + This package contains Microsoft's implementation of GSL. ''; - homepage = "https://github.com/Microsoft/GSL"; - license = licenses.mit; - platforms = platforms.all; + homepage = "https://github.com/Microsoft/GSL"; + license = licenses.mit; + platforms = platforms.all; maintainers = with maintainers; [ thoughtpolice xwvvvvwx yuriaisaka ]; }; } From 5514844d05bce5bc51ac7b88a863ad6d515ee3f9 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Sun, 18 Jul 2021 14:52:58 +0200 Subject: [PATCH 017/235] python3Packages.skytemple-rust: fix for Darwin --- pkgs/development/python-modules/skytemple-rust/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/skytemple-rust/default.nix b/pkgs/development/python-modules/skytemple-rust/default.nix index d22d61099587..d98d23fada6d 100644 --- a/pkgs/development/python-modules/skytemple-rust/default.nix +++ b/pkgs/development/python-modules/skytemple-rust/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, rustPlatform, setuptools-rust }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, libiconv, rustPlatform, setuptools-rust }: buildPythonPackage rec { pname = "skytemple-rust"; @@ -17,6 +17,7 @@ buildPythonPackage rec { sha256 = "1ypcsf9gbq1bz29kfn7g4kg8741mxg1lfcbb14a0vfhjq4d6pnx9"; }; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [ cargoSetupHook rust.cargo rust.rustc ]); doCheck = false; # there are no tests From acbc4bd3113a4e36189e9f72d27b2a0b44034eda Mon Sep 17 00:00:00 2001 From: Jakob Leifhelm Date: Sun, 18 Jul 2021 15:26:08 +0200 Subject: [PATCH 018/235] mixxx: Fix udev rules installation --- pkgs/applications/audio/mixxx/default.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index 6f0d34b870aa..60591f42e816 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , mkDerivation , fetchurl , fetchFromGitHub @@ -116,6 +117,23 @@ mkDerivation rec { "--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive" ]; + # mixxx installs udev rules to DATADIR instead of SYSCONFDIR + # let's disable this and install udev rules manually via postInstall + # see https://github.com/mixxxdj/mixxx/blob/2.3.0/CMakeLists.txt#L1381-L1392 + cmakeFlags = [ + "-DINSTALL_USER_UDEV_RULES=OFF" + ]; + + postInstall = lib.optionalString stdenv.isLinux '' + rules="$src/res/linux/mixxx-usb-uaccess.rules" + if [ ! -f "$rules" ]; then + echo "$rules is missing, must update the Nix file." + exit 1 + fi + mkdir -p "$out/lib/udev/rules.d" + cp "$rules" "$out/lib/udev/rules.d/69-mixxx-usb-uaccess.rules" + ''; + meta = with lib; { homepage = "https://mixxx.org"; description = "Digital DJ mixing software"; From bf6c6276299f3f82d28cd8050bece07073df0f2d Mon Sep 17 00:00:00 2001 From: arcnmx Date: Sun, 18 Jul 2021 10:48:22 -0700 Subject: [PATCH 019/235] terraform-providers.oci: 3.79.0 -> 4.35.0 --- .../networking/cluster/terraform-providers/providers.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index f7eb378e716e..cc46bf16ac7d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -728,9 +728,10 @@ "owner": "terraform-providers", "provider-source-address": "registry.terraform.io/hashicorp/oci", "repo": "terraform-provider-oci", - "rev": "v3.79.0", - "sha256": "11n2v537zniiv5xvhpypqrm09my8zybirvq4ly94hp69v73xj89c", - "version": "3.79.0" + "rev": "v4.35.0", + "sha256": "12acy39cr6pxq8gk483b6i78x463ml9pk10qp9jpz0dr05zcyhqw", + "vendorSha256": null, + "version": "4.35.0" }, "okta": { "owner": "terraform-providers", From 214f7549ec000c4fe8694cfcd5283de9976f598c Mon Sep 17 00:00:00 2001 From: Enno Richter Date: Mon, 19 Jul 2021 10:05:35 +0200 Subject: [PATCH 020/235] cewl: init at 5.5.2 --- pkgs/tools/security/cewl/Gemfile | 8 ++ pkgs/tools/security/cewl/Gemfile.lock | 31 ++++++++ pkgs/tools/security/cewl/default.nix | 33 ++++++++ pkgs/tools/security/cewl/gemset.nix | 104 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 178 insertions(+) create mode 100644 pkgs/tools/security/cewl/Gemfile create mode 100644 pkgs/tools/security/cewl/Gemfile.lock create mode 100644 pkgs/tools/security/cewl/default.nix create mode 100644 pkgs/tools/security/cewl/gemset.nix diff --git a/pkgs/tools/security/cewl/Gemfile b/pkgs/tools/security/cewl/Gemfile new file mode 100644 index 000000000000..97d9ae757acc --- /dev/null +++ b/pkgs/tools/security/cewl/Gemfile @@ -0,0 +1,8 @@ +source 'https://rubygems.org' +gem 'mime' +gem 'mime-types', ">=3.3.1" +gem 'mini_exiftool' +gem 'nokogiri' +gem 'rexml' +gem 'rubyzip' +gem 'spider' diff --git a/pkgs/tools/security/cewl/Gemfile.lock b/pkgs/tools/security/cewl/Gemfile.lock new file mode 100644 index 000000000000..85bb2eb4b822 --- /dev/null +++ b/pkgs/tools/security/cewl/Gemfile.lock @@ -0,0 +1,31 @@ +GEM + remote: https://rubygems.org/ + specs: + mime (0.4.4) + mime-types (3.3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2021.0704) + mini_exiftool (2.10.2) + mini_portile2 (2.5.3) + nokogiri (1.11.7) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) + racc (1.5.2) + rexml (3.2.5) + rubyzip (2.3.2) + spider (0.5.4) + +PLATFORMS + ruby + +DEPENDENCIES + mime + mime-types (>= 3.3.1) + mini_exiftool + nokogiri + rexml + rubyzip + spider + +BUNDLED WITH + 2.1.4 diff --git a/pkgs/tools/security/cewl/default.nix b/pkgs/tools/security/cewl/default.nix new file mode 100644 index 000000000000..06d983c14e36 --- /dev/null +++ b/pkgs/tools/security/cewl/default.nix @@ -0,0 +1,33 @@ +{ stdenv, lib, fetchFromGitHub, bundlerEnv }: + +let + rubyEnv = bundlerEnv { + name = "cewl-ruby-env"; + gemdir = ./.; + }; +in +stdenv.mkDerivation rec { + pname = "cewl"; + version = "5.5.2"; + src = fetchFromGitHub { + owner = "digininja"; + repo = "CeWL"; + rev = version; + sha256 = "sha256-5LTZUr3OMeu1NODhIgBiVqtQnUWYfZTm73q61vT3rXc="; + }; + + buildInputs = [ rubyEnv.wrappedRuby ]; + + installPhase = '' + mkdir -p $out/bin + cp *.rb $out/bin/ + mv $out/bin/cewl.rb $out/bin/cewl + ''; + + meta = with lib; { + description = "Custom wordlist generator"; + homepage = "https://digi.ninja/projects/cewl.php/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ elohmeier ]; + }; +} diff --git a/pkgs/tools/security/cewl/gemset.nix b/pkgs/tools/security/cewl/gemset.nix new file mode 100644 index 000000000000..851a6d2442d3 --- /dev/null +++ b/pkgs/tools/security/cewl/gemset.nix @@ -0,0 +1,104 @@ +{ + mime = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nskys7brz2bylhxiknl0z9i19w3wb1knf0h93in6mjq70jdw5cr"; + type = "gem"; + }; + version = "0.4.4"; + }; + mime-types = { + dependencies = ["mime-types-data"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh"; + type = "gem"; + }; + version = "3.3.1"; + }; + mime-types-data = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dlxwc75iy0dj23x824cxpvpa7c8aqcpskksrmb32j6m66h5mkcy"; + type = "gem"; + }; + version = "3.2021.0704"; + }; + mini_exiftool = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ir4wigpm6nkd3f40wcjdqrhjx3l60w1hwcg143is1a95ypnvqhr"; + type = "gem"; + }; + version = "2.10.2"; + }; + mini_portile2 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ad0mli9rc0f17zw4ibp24dbj1y39zkykijsjmnzl4gwpg5s0j6k"; + type = "gem"; + }; + version = "2.5.3"; + }; + nokogiri = { + dependencies = ["mini_portile2" "racc"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vrn31385ix5k9b0yalnlzv360isv6dincbcvi8psllnwz4sjxj9"; + type = "gem"; + }; + version = "1.11.7"; + }; + racc = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; + type = "gem"; + }; + version = "1.5.2"; + }; + rexml = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + type = "gem"; + }; + version = "3.2.5"; + }; + rubyzip = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz"; + type = "gem"; + }; + version = "2.3.2"; + }; + spider = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fix7zhnvlfqg66bxwdpbsffbynzdnaifnxpakn07bjh3rdj75cx"; + type = "gem"; + }; + version = "0.5.4"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 247726bad020..8c1e3f37d7d4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -241,6 +241,8 @@ in cereal = callPackage ../development/libraries/cereal { }; + cewl = callPackage ../tools/security/cewl { }; + checkov = callPackage ../development/tools/analysis/checkov {}; chrysalis = callPackage ../applications/misc/chrysalis { }; From ac435806a5dd3bcbb144bf453f4a58c56fad48e5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 20 Jul 2021 01:33:42 +0000 Subject: [PATCH 021/235] delve: 1.6.1 -> 1.7.0 --- pkgs/development/tools/delve/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix index 9a0d19840e46..57f30ec3ae48 100644 --- a/pkgs/development/tools/delve/default.nix +++ b/pkgs/development/tools/delve/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "delve"; - version = "1.6.1"; + version = "1.7.0"; goPackagePath = "github.com/go-delve/delve"; excludedPackages = "\\(_fixtures\\|scripts\\|service/test\\)"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "go-delve"; repo = "delve"; rev = "v${version}"; - sha256 = "sha256-bTVCasemE8Vyjcs8wZBiiXEsW3UBndjpPQ5bi+4vQkw="; + sha256 = "sha256-RfBDeBuI/Yk24Q2jX/Re7fvx1bhYWJjqLhRkNHCaM9k="; }; subPackages = [ "cmd/dlv" ]; From 36be6c5d026b7ac00825abd18f2d323b8af6d3d8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 20 Jul 2021 05:41:47 +0000 Subject: [PATCH 022/235] headscale: 0.3.3 -> 0.3.4 --- pkgs/servers/headscale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/headscale/default.nix b/pkgs/servers/headscale/default.nix index 8b9380c6baf2..bece609fc4e0 100644 --- a/pkgs/servers/headscale/default.nix +++ b/pkgs/servers/headscale/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "headscale"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "juanfont"; repo = "headscale"; rev = "v${version}"; - sha256 = "0nf2l8l23wzn3l3x4698rfr3g6lkx5qfzsbfl0rv25q1pqgybdzj"; + sha256 = "sha256-O8PJrowP9iDK4sQXHNi1eo44X/tRc7nyKZgJUB6fKC4="; }; vendorSha256 = "sha256-0Lqr/tWk31S01vi21sG2gtlGouOhecL4u8ScKG0nWLo="; From 278909b507200db2a9245368f21d10eec1a5a232 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 20 Jul 2021 05:49:23 +0000 Subject: [PATCH 023/235] hostctl: 1.0.14 -> 1.1.0 --- pkgs/tools/system/hostctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/hostctl/default.nix b/pkgs/tools/system/hostctl/default.nix index 6f557e05cd12..54bc72144ea3 100644 --- a/pkgs/tools/system/hostctl/default.nix +++ b/pkgs/tools/system/hostctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hostctl"; - version = "1.0.14"; + version = "1.1.0"; src = fetchFromGitHub { owner = "guumaster"; repo = pname; rev = "v${version}"; - sha256 = "02bjii97l4fy43v2rb93m9b0ad8y6mjvbvp4sz6a5n0w9dm1z1q9"; + sha256 = "sha256-X07JvXN1mwOQE2XBfaYbqQnQ92fBSg/Erj0yUygAqmM="; }; - vendorSha256 = "1lqk3cda0frqp2vwkqa4b3xkdw814wgkbr7g9r2mwxn85fpdcq5c"; + vendorSha256 = "sha256-rGDWrivIdl5FTu/kNR8nAfE2+1hE4cm3uDg7oBobE9M="; buildFlagsArray = [ "-ldflags=-s -w -X github.com/guumaster/hostctl/cmd/hostctl/actions.version=${version}" ]; From f6d9f880975563f0497da67a7c4c540a61525f93 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 20 Jul 2021 07:37:10 +0000 Subject: [PATCH 024/235] leatherman: 1.12.5 -> 1.12.6 --- pkgs/development/libraries/leatherman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index 2d439db5934e..24bec8ec350f 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "leatherman"; - version = "1.12.5"; + version = "1.12.6"; src = fetchFromGitHub { - sha256 = "sha256-1romJiOIQDlglo/nAJjn1l06dSwDRwG1b49H6js9MB4="; + sha256 = "sha256-k5Lt/NCSlBaTGhpR4T3Q4Ih+RR1xKROxz+RNYor7zaQ="; rev = version; repo = "leatherman"; owner = "puppetlabs"; From a9d3d2f349ae01c46f9e506502b494f0ee2caa98 Mon Sep 17 00:00:00 2001 From: Troels Henriksen Date: Tue, 20 Jul 2021 09:45:04 +0200 Subject: [PATCH 025/235] emscripten: 2.0.1 -> 2.0.10 binaryen: 96 -> 99 These updates must be in the same commit because emscripten depends on a specific version of binaryen. --- .../compilers/binaryen/default.nix | 14 +- .../compilers/emscripten/default.nix | 12 +- .../compilers/emscripten/package.json | 10 +- .../compilers/emscripten/yarn.lock | 599 ++++++++++++++- .../development/compilers/emscripten/yarn.nix | 688 +++++++++++++++++- 5 files changed, 1246 insertions(+), 77 deletions(-) diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index d2d866a2804b..ee47ebd98887 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -1,24 +1,16 @@ -{ lib, stdenv, cmake, python3, fetchFromGitHub, fetchpatch, emscripten }: +{ lib, stdenv, cmake, python3, fetchFromGitHub, emscripten }: stdenv.mkDerivation rec { pname = "binaryen"; - version = "96"; + version = "99"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "binaryen"; rev = "version_${version}"; - sha256 = "1mqpb6yy87aifpbcy0lczi3bp6kddrwi6d0g6lrhjrdxx2kvbdag"; + sha256 = "1a6ixxm1f8mrr9mn6a0pimajdzsdr4w1qhr92skxq67168vvc1ic"; }; - patches = [ - # Adds --minimize-wasm-changes option required by emscripten 2.0.1 - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/WebAssembly/binaryen/pull/3044.patch"; - sha256 = "1hdbc9h9zhh2d3bl4sqv6v9psfmny715612bwpjdln0ibdvc129s"; - }) - ]; - nativeBuildInputs = [ cmake python3 ]; meta = with lib; { diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index 648ec156abea..a142008e2e30 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "emscripten"; - version = "2.0.1"; + version = "2.0.10"; llvmEnv = symlinkJoin { name = "emscripten-llvm-${version}"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "emscripten-core"; repo = "emscripten"; - sha256 = "06dsd819qjv4n2ihrz1mpn5aigmbv0gpkm7iw06wrqx30nzphnpk"; + sha256 = "0jy4n1pykk9vkm5da9v3qsfrl6j7yhngcazh2792xxs6wzfcs9gk"; rev = version; }; @@ -43,10 +43,14 @@ stdenv.mkDerivation rec { sed -i '/^def/!s/root_is_writable()/True/' tools/shared.py sed -i "/^def check_sanity/a\\ return" tools/shared.py + # super ugly: monkeypatch to add sysroot/include to the include + # path because they are otherwise not part of Nix's clang. + sed -i "490a\\ '/include'," tools/shared.py + # required for wasm2c ln -s ${nodeModules}/node_modules . - echo "EMSCRIPTEN_ROOT = '$appdir'" > .emscripten + echo "EMSCRIPTEN_ROOT = '$out/share/emscripten'" > .emscripten echo "LLVM_ROOT = '${llvmEnv}/bin'" >> .emscripten echo "NODE_JS = '${nodejs}/bin/node'" >> .emscripten echo "JS_ENGINES = [NODE_JS]" >> .emscripten @@ -74,7 +78,7 @@ stdenv.mkDerivation rec { chmod -R +w $appdir mkdir -p $out/bin - for b in em++ em-config emar embuilder.py emcc emcmake emconfigure emlink.py emmake emranlib emrun emscons; do + for b in em++ em-config emar embuilder.py emcc emcmake emconfigure emmake emranlib emrun emscons; do makeWrapper $appdir/$b $out/bin/$b \ --set NODE_PATH ${nodeModules}/node_modules \ --set EM_EXCLUSIVE_CACHE_ACCESS 1 \ diff --git a/pkgs/development/compilers/emscripten/package.json b/pkgs/development/compilers/emscripten/package.json index 039d215efcd7..36cd2efe27a0 100644 --- a/pkgs/development/compilers/emscripten/package.json +++ b/pkgs/development/compilers/emscripten/package.json @@ -1,15 +1,15 @@ { "name": "emscripten", - "version": "2.0.1", - "private": true, + "version": "2.0.10", "devDependencies": { + "es-check": "^5.1.0", "ws": "~0.4.28" }, "dependencies": { - "google-closure-compiler": "20200224.0.0", + "acorn": "7.3.1", + "google-closure-compiler": "20200920.0.0", "html-minifier-terser": "5.0.2", "source-map": "0.5.6", - "wasm2c": "1.0.0", - "acorn": "7.3.1" + "wasm2c": "1.0.0" } } diff --git a/pkgs/development/compilers/emscripten/yarn.lock b/pkgs/development/compilers/emscripten/yarn.lock index 079b254a4728..948fcd4ed7f1 100644 --- a/pkgs/development/compilers/emscripten/yarn.lock +++ b/pkgs/development/compilers/emscripten/yarn.lock @@ -7,6 +7,31 @@ acorn@7.3.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.3.1.tgz#85010754db53c3fbaf3b9ea3e083aa5c5d147ffd" integrity sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA== +acorn@^6.4.1: + version "6.4.2" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6" + integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ== + +ansi-escapes@^1.1.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e" + integrity sha1-06ioOzGapneTZisT52HHkRQiMG4= + +ansi-regex@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" + integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= + +ansi-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" + integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= + +ansi-styles@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" + integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= + ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" @@ -14,6 +39,42 @@ ansi-styles@^3.2.1: dependencies: color-convert "^1.9.0" +ansi@^0.3.0, ansi@~0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21" + integrity sha1-DELU+xcWDVqa8eSEus4cZpIsGyE= + +are-we-there-yet@~1.1.2: + version "1.1.5" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21" + integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w== + dependencies: + delegates "^1.0.0" + readable-stream "^2.0.6" + +async@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/async/-/async-1.0.0.tgz#f8fc04ca3a13784ade9e1641af98578cfbd647a9" + integrity sha1-+PwEyjoTeErenhZBr5hXjPvWR6k= + +balanced-match@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== + +bluebird@^3.4.7: + version "3.7.2" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" + integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== + +brace-expansion@^1.1.7: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + buffer-from@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" @@ -27,6 +88,21 @@ camel-case@^3.0.0: no-case "^2.2.0" upper-case "^1.1.1" +caporal@1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/caporal/-/caporal-1.4.0.tgz#d6087b815e3df97c3a0f55dbb82850fae29ed585" + integrity sha512-3pWfIwKVdIbB/gWmpLloO6iGAXTRi9mcTinPOwvHfzH3BYjOhLgq2XRG3hKtp+F6vBcBXxMgCobUzBAx1d8T4A== + dependencies: + bluebird "^3.4.7" + cli-table3 "^0.5.0" + colorette "^1.0.1" + fast-levenshtein "^2.0.6" + lodash "^4.17.14" + micromist "1.1.0" + prettyjson "^1.2.1" + tabtab "^2.2.2" + winston "^2.3.1" + chalk@2.x: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" @@ -36,6 +112,17 @@ chalk@2.x: escape-string-regexp "^1.0.5" supports-color "^5.3.0" +chalk@^1.0.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" + integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= + dependencies: + ansi-styles "^2.2.1" + escape-string-regexp "^1.0.2" + has-ansi "^2.0.0" + strip-ansi "^3.0.0" + supports-color "^2.0.0" + clean-css@^4.2.1: version "4.2.3" resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78" @@ -43,6 +130,28 @@ clean-css@^4.2.1: dependencies: source-map "~0.6.0" +cli-cursor@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987" + integrity sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc= + dependencies: + restore-cursor "^1.0.1" + +cli-table3@^0.5.0: + version "0.5.1" + resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.5.1.tgz#0252372d94dfc40dbd8df06005f48f31f656f202" + integrity sha512-7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw== + dependencies: + object-assign "^4.1.0" + string-width "^2.1.1" + optionalDependencies: + colors "^1.1.2" + +cli-width@^2.0.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48" + integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw== + clone-buffer@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58" @@ -67,6 +176,11 @@ cloneable-readable@^1.0.0: process-nextick-args "^2.0.0" readable-stream "^2.3.5" +code-point-at@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" + integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= + color-convert@^1.9.0: version "1.9.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" @@ -79,6 +193,21 @@ color-name@1.1.3: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= +colorette@^1.0.1: + version "1.2.2" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94" + integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w== + +colors@1.0.x: + version "1.0.3" + resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" + integrity sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs= + +colors@^1.1.2: + version "1.4.0" + resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" + integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== + commander@^2.20.0: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" @@ -94,62 +223,174 @@ commander@~2.1.0: resolved "https://registry.yarnpkg.com/commander/-/commander-2.1.0.tgz#d121bbae860d9992a3d517ba96f56588e47c6781" integrity sha1-0SG7roYNmZKj1Re6lvVliOR8Z4E= +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= + +concat-stream@^1.4.7: + version "1.6.2" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" + integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== + dependencies: + buffer-from "^1.0.0" + inherits "^2.0.3" + readable-stream "^2.2.2" + typedarray "^0.0.6" + core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= -escape-string-regexp@^1.0.5: +cycle@1.0.x: + version "1.0.3" + resolved "https://registry.yarnpkg.com/cycle/-/cycle-1.0.3.tgz#21e80b2be8580f98b468f379430662b046c34ad2" + integrity sha1-IegLK+hYD5i0aPN5QwZisEbDStI= + +debug@^2.2.0: + version "2.6.9" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" + integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== + dependencies: + ms "2.0.0" + +delegates@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" + integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= + +es-check@^5.1.0: + version "5.2.4" + resolved "https://registry.yarnpkg.com/es-check/-/es-check-5.2.4.tgz#76fe2d96ad238bd8ec1d9c3b3d0e98ddbcc723e7" + integrity sha512-FZ3qAJ9hwguqPvGGagaKAVDnusSkezeHbiKNM5rOepOjloeVuX2e6meMxQ+mKcnWbAFucCG7fszNrzUT8bvHcQ== + dependencies: + acorn "^6.4.1" + caporal "1.4.0" + glob "^7.1.2" + +escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= -google-closure-compiler-java@^20200224.0.0: - version "20200224.0.0" - resolved "https://registry.yarnpkg.com/google-closure-compiler-java/-/google-closure-compiler-java-20200224.0.0.tgz#03d71aefd0a07010fd8a7057d09c76f6729767bc" - integrity sha512-palFcDoScauZjWIsGDzMK6h+IctcRb55I3wJX8Ko/DTSz72xwadRdKm0lGt8OoYL7SKEO+IjgD7s8XrAGpLnlQ== +exit-hook@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8" + integrity sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g= -google-closure-compiler-js@^20200224.0.0: - version "20200224.0.0" - resolved "https://registry.yarnpkg.com/google-closure-compiler-js/-/google-closure-compiler-js-20200224.0.0.tgz#cf4b598abf7be686c683e530529756805b8af500" - integrity sha512-70VKN0kbnTRtu2dqxDjWZQGfEQIHj7b7oUUCsYPO5oEXCDfgxNc13oYUJXvrTONLRWlHCNl/I8FNrVOwZ3gY/g== +extend@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" + integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== -google-closure-compiler-linux@^20200224.0.0: - version "20200224.0.0" - resolved "https://registry.yarnpkg.com/google-closure-compiler-linux/-/google-closure-compiler-linux-20200224.0.0.tgz#d9608b224b4d8f38d4d34e99a24da54bca6b1902" - integrity sha512-/BaE889EPrXWOKJVolA9++e99xBDMzeFBf7zF7nBB8PUmU5DlvtsoLL82xnT6nbZC1ktHaETlVx+vYGju8zKBQ== +external-editor@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-1.1.1.tgz#12d7b0db850f7ff7e7081baf4005700060c4600b" + integrity sha1-Etew24UPf/fnCBuvQAVwAGDEYAs= + dependencies: + extend "^3.0.0" + spawn-sync "^1.0.15" + tmp "^0.0.29" -google-closure-compiler-osx@^20200224.0.0: - version "20200224.0.0" - resolved "https://registry.yarnpkg.com/google-closure-compiler-osx/-/google-closure-compiler-osx-20200224.0.0.tgz#aee62d8b878a662fc73b92419603168c0c3a35ed" - integrity sha512-WXVNW9nPUqjvCe38mUIlBGEPVPCTKLtdaXC+q+kQdonkJFHNrpdyYWa746Y8cNP/byQyDNpPsqcKseZTLh17sQ== +eyes@0.1.x: + version "0.1.8" + resolved "https://registry.yarnpkg.com/eyes/-/eyes-0.1.8.tgz#62cf120234c683785d902348a800ef3e0cc20bc0" + integrity sha1-Ys8SAjTGg3hdkCNIqADvPgzCC8A= -google-closure-compiler-windows@^20200224.0.0: - version "20200224.0.0" - resolved "https://registry.yarnpkg.com/google-closure-compiler-windows/-/google-closure-compiler-windows-20200224.0.0.tgz#cae323b898625ca57b0e87aaddde021a414dda58" - integrity sha512-l6w2D8r9+GC9CQTAYEMAuNI996Zb6YV5qG7+FR0gCoL6h6S3Mc7mi87bafgwaicsVcmmHE/9kCBuW4ZyTMs5Fg== +fast-levenshtein@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" + integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= -google-closure-compiler@20200224.0.0: - version "20200224.0.0" - resolved "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20200224.0.0.tgz#ec0e708d9716a48e12fff43fe37fa5cec732a283" - integrity sha512-V81dRYygdHbZtOtU16VX26xAdJBB1UZyfSg3OTzdNl3l/xEIx1D/L7TYUqjeTXsxcy+JruJ/UfUlIJAOaMRTog== +figures@^1.3.5: + version "1.7.0" + resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e" + integrity sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4= + dependencies: + escape-string-regexp "^1.0.5" + object-assign "^4.1.0" + +fs.realpath@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= + +gauge@~1.2.5: + version "1.2.7" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-1.2.7.tgz#e9cec5483d3d4ee0ef44b60a7d99e4935e136d93" + integrity sha1-6c7FSD09TuDvRLYKfZnkk14TbZM= + dependencies: + ansi "^0.3.0" + has-unicode "^2.0.0" + lodash.pad "^4.1.0" + lodash.padend "^4.1.0" + lodash.padstart "^4.1.0" + +glob@^7.1.2: + version "7.1.7" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" + integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + +google-closure-compiler-java@^20200920.0.0: + version "20200920.0.0" + resolved "https://registry.yarnpkg.com/google-closure-compiler-java/-/google-closure-compiler-java-20200920.0.0.tgz#23519b14e004f2a9eda4f5b887842ae46ad7022e" + integrity sha512-q8m/+QLBWrzjg5VZ2b4B628zDvbi0Gyenj9bvZQlPY7mqj68HXhe5aOfKzZO7vXgHDXMvsvI3v/1g5mPAku/5w== + +google-closure-compiler-linux@^20200920.0.0: + version "20200920.0.0" + resolved "https://registry.yarnpkg.com/google-closure-compiler-linux/-/google-closure-compiler-linux-20200920.0.0.tgz#622c28a784e8a93f9cc5e7cd7b675d2ed0e11d0b" + integrity sha512-F5HcTbeklcaxdWzlZu5b1ZKzCt1kSBUWsBfvlrDCFkA2pdBxIIC2VPokGAUZCqlfno2J2gYARz8FNCrx0tCx5g== + +google-closure-compiler-osx@^20200920.0.0: + version "20200920.0.0" + resolved "https://registry.yarnpkg.com/google-closure-compiler-osx/-/google-closure-compiler-osx-20200920.0.0.tgz#6157a06e7d851d25d60de95c4bcd464d768278b1" + integrity sha512-2WY+HaUWVQNg9WZs9d4Op3zvS6yIVN2AIouU4grwYWXfFk+CMXZou0ASlsOURaYc2WZ22LW/G1w3vINDoCkSww== + +google-closure-compiler-windows@^20200920.0.0: + version "20200920.0.0" + resolved "https://registry.yarnpkg.com/google-closure-compiler-windows/-/google-closure-compiler-windows-20200920.0.0.tgz#755ddeb8032530c6ed13962e328d9af3269d0748" + integrity sha512-0c4Dem3em3ASNpcR/2USx1Kvb+I7L2MvsV1IZ5Pu98jTuhnkmlccQqPzk2rZR6lllVbVFXTb6tju0JxZ7Zoxjg== + +google-closure-compiler@20200920.0.0: + version "20200920.0.0" + resolved "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20200920.0.0.tgz#e1c54b7f1be8cbb33649d8d05e761bbf11e4eaa3" + integrity sha512-IOC77xL3+pYcAM+OVfcILKdrZNEy767JmpdVs2sq3I9+4JoHeKaJrmQXgbcXN2reUmzBw5b5m9Kd036Cr8ouBA== dependencies: chalk "2.x" - google-closure-compiler-java "^20200224.0.0" - google-closure-compiler-js "^20200224.0.0" + google-closure-compiler-java "^20200920.0.0" minimist "1.x" vinyl "2.x" vinyl-sourcemaps-apply "^0.2.0" optionalDependencies: - google-closure-compiler-linux "^20200224.0.0" - google-closure-compiler-osx "^20200224.0.0" - google-closure-compiler-windows "^20200224.0.0" + google-closure-compiler-linux "^20200920.0.0" + google-closure-compiler-osx "^20200920.0.0" + google-closure-compiler-windows "^20200920.0.0" + +has-ansi@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" + integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= + dependencies: + ansi-regex "^2.0.0" has-flag@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= +has-unicode@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" + integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= + he@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" @@ -168,26 +409,137 @@ html-minifier-terser@5.0.2: relateurl "^0.2.7" terser "^4.3.9" -inherits@^2.0.1, inherits@~2.0.3: +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3: version "2.0.4" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== +inquirer@^1.0.2: + version "1.2.3" + resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-1.2.3.tgz#4dec6f32f37ef7bb0b2ed3f1d1a5c3f545074918" + integrity sha1-TexvMvN+97sLLtPx0aXD9UUHSRg= + dependencies: + ansi-escapes "^1.1.0" + chalk "^1.0.0" + cli-cursor "^1.0.1" + cli-width "^2.0.0" + external-editor "^1.1.0" + figures "^1.3.5" + lodash "^4.3.0" + mute-stream "0.0.6" + pinkie-promise "^2.0.0" + run-async "^2.2.0" + rx "^4.1.0" + string-width "^1.0.1" + strip-ansi "^3.0.0" + through "^2.3.6" + +is-fullwidth-code-point@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" + integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= + dependencies: + number-is-nan "^1.0.0" + +is-fullwidth-code-point@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" + integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= + isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= +isstream@0.1.x: + version "0.1.2" + resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" + integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= + +lodash.camelcase@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" + integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY= + +lodash.difference@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.difference/-/lodash.difference-4.5.0.tgz#9ccb4e505d486b91651345772885a2df27fd017c" + integrity sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw= + +lodash.pad@^4.1.0: + version "4.5.1" + resolved "https://registry.yarnpkg.com/lodash.pad/-/lodash.pad-4.5.1.tgz#4330949a833a7c8da22cc20f6a26c4d59debba70" + integrity sha1-QzCUmoM6fI2iLMIPaibE1Z3runA= + +lodash.padend@^4.1.0: + version "4.6.1" + resolved "https://registry.yarnpkg.com/lodash.padend/-/lodash.padend-4.6.1.tgz#53ccba047d06e158d311f45da625f4e49e6f166e" + integrity sha1-U8y6BH0G4VjTEfRdpiX05J5vFm4= + +lodash.padstart@^4.1.0: + version "4.6.1" + resolved "https://registry.yarnpkg.com/lodash.padstart/-/lodash.padstart-4.6.1.tgz#d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b" + integrity sha1-0uPuv/DZ05rVD1y9G1KnvOa7YRs= + +lodash.uniq@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" + integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= + +lodash@^4.17.14, lodash@^4.3.0: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== + lower-case@^1.1.1: version "1.1.4" resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac" integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw= -minimist@1.x: +micromist@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/micromist/-/micromist-1.1.0.tgz#a490bcf9a4b918ad9eed8e52d0ec98b9c3b2d3c8" + integrity sha512-+CQ76pabE9egniSEdmDuH+j2cYyIBKP97kujG8ZLZyLCRq5ExwtIy4DPHPFrq4jVbhMRBnyjuH50KU9Ohs8QCg== + dependencies: + lodash.camelcase "^4.3.0" + +minimatch@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== + dependencies: + brace-expansion "^1.1.7" + +minimist@1.x, minimist@^1.2.0, minimist@^1.2.5: version "1.2.5" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== +mkdirp@^0.5.1: + version "0.5.5" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" + integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== + dependencies: + minimist "^1.2.5" + +ms@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= + +mute-stream@0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.6.tgz#48962b19e169fd1dfc240b3f1e7317627bbc47db" + integrity sha1-SJYrGeFp/R38JAs/HnMXYnu8R9s= + nan@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/nan/-/nan-1.0.0.tgz#ae24f8850818d662fcab5acf7f3b95bfaa2ccf38" @@ -200,11 +552,52 @@ no-case@^2.2.0: dependencies: lower-case "^1.1.1" +npmlog@^2.0.3: + version "2.0.4" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-2.0.4.tgz#98b52530f2514ca90d09ec5b22c8846722375692" + integrity sha1-mLUlMPJRTKkNCexbIsiEZyI3VpI= + dependencies: + ansi "~0.3.1" + are-we-there-yet "~1.1.2" + gauge "~1.2.5" + +number-is-nan@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" + integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= + +object-assign@^4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= + +once@^1.3.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= + dependencies: + wrappy "1" + +onetime@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789" + integrity sha1-ofeDj4MUxRbwXs78vEzP4EtO14k= + options@>=0.0.5: version "0.0.6" resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f" integrity sha1-7CLTEoBrtT5zF3Pnza788cZDEo8= +os-shim@^0.1.2: + version "0.1.3" + resolved "https://registry.yarnpkg.com/os-shim/-/os-shim-0.1.3.tgz#6b62c3791cf7909ea35ed46e17658bb417cb3917" + integrity sha1-a2LDeRz3kJ6jXtRuF2WLtBfLORc= + +os-tmpdir@~1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" + integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= + param-case@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247" @@ -212,12 +605,37 @@ param-case@^2.1.1: dependencies: no-case "^2.2.0" +path-is-absolute@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= + +pinkie-promise@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" + integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o= + dependencies: + pinkie "^2.0.0" + +pinkie@^2.0.0: + version "2.0.4" + resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" + integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA= + +prettyjson@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/prettyjson/-/prettyjson-1.2.1.tgz#fcffab41d19cab4dfae5e575e64246619b12d289" + integrity sha1-/P+rQdGcq0365eV15kJGYZsS0ok= + dependencies: + colors "^1.1.2" + minimist "^1.2.0" + process-nextick-args@^2.0.0, process-nextick-args@~2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== -readable-stream@^2.3.5: +readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@^2.3.5: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== @@ -245,6 +663,24 @@ replace-ext@^1.0.0: resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.1.tgz#2d6d996d04a15855d967443631dd5f77825b016a" integrity sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw== +restore-cursor@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541" + integrity sha1-NGYfRohjJ/7SmRR5FSJS35LapUE= + dependencies: + exit-hook "^1.0.0" + onetime "^1.0.0" + +run-async@^2.2.0: + version "2.4.1" + resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455" + integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ== + +rx@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782" + integrity sha1-pfE/957zt0D+MKqAP7CfmIBdR4I= + safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" @@ -273,6 +709,36 @@ source-map@^0.6.0, source-map@~0.6.0, source-map@~0.6.1: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== +spawn-sync@^1.0.15: + version "1.0.15" + resolved "https://registry.yarnpkg.com/spawn-sync/-/spawn-sync-1.0.15.tgz#b00799557eb7fb0c8376c29d44e8a1ea67e57476" + integrity sha1-sAeZVX63+wyDdsKdROih6mfldHY= + dependencies: + concat-stream "^1.4.7" + os-shim "^0.1.2" + +stack-trace@0.0.x: + version "0.0.10" + resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" + integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA= + +string-width@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" + integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= + dependencies: + code-point-at "^1.0.0" + is-fullwidth-code-point "^1.0.0" + strip-ansi "^3.0.0" + +string-width@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" + integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== + dependencies: + is-fullwidth-code-point "^2.0.0" + strip-ansi "^4.0.0" + string_decoder@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" @@ -280,6 +746,25 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" +strip-ansi@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" + integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= + dependencies: + ansi-regex "^2.0.0" + +strip-ansi@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" + integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8= + dependencies: + ansi-regex "^3.0.0" + +supports-color@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" + integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= + supports-color@^5.3.0: version "5.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" @@ -287,6 +772,20 @@ supports-color@^5.3.0: dependencies: has-flag "^3.0.0" +tabtab@^2.2.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/tabtab/-/tabtab-2.2.2.tgz#7a047f143b010b4cbd31f857e82961512cbf4e14" + integrity sha1-egR/FDsBC0y9MfhX6ClhUSy/ThQ= + dependencies: + debug "^2.2.0" + inquirer "^1.0.2" + lodash.difference "^4.5.0" + lodash.uniq "^4.5.0" + minimist "^1.2.0" + mkdirp "^0.5.1" + npmlog "^2.0.3" + object-assign "^4.1.0" + terser@^4.3.9: version "4.8.0" resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17" @@ -296,11 +795,28 @@ terser@^4.3.9: source-map "~0.6.1" source-map-support "~0.5.12" +through@^2.3.6: + version "2.3.8" + resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" + integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= + tinycolor@0.x: version "0.0.1" resolved "https://registry.yarnpkg.com/tinycolor/-/tinycolor-0.0.1.tgz#320b5a52d83abb5978d81a3e887d4aefb15a6164" integrity sha1-MgtaUtg6u1l42Bo+iH1K77FaYWQ= +tmp@^0.0.29: + version "0.0.29" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.29.tgz#f25125ff0dd9da3ccb0c2dd371ee1288bb9128c0" + integrity sha1-8lEl/w3Z2jzLDC3Tce4SiLuRKMA= + dependencies: + os-tmpdir "~1.0.1" + +typedarray@^0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" + integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= + upper-case@^1.1.1: version "1.1.3" resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598" @@ -335,6 +851,23 @@ wasm2c@1.0.0: resolved "https://registry.yarnpkg.com/wasm2c/-/wasm2c-1.0.0.tgz#761671e141c46b8a7c6c54429db1e6bfa3cd0ec0" integrity sha512-4SIESF2JNxrry6XFa/UQcsQibn+bxPkQ/oqixiXz2o8fsMl8J4vtvhH/evgbi8vZajAlaukuihEcQTWb9tVLUA== +winston@^2.3.1: + version "2.4.5" + resolved "https://registry.yarnpkg.com/winston/-/winston-2.4.5.tgz#f2e431d56154c4ea765545fc1003bd340c95b59a" + integrity sha512-TWoamHt5yYvsMarGlGEQE59SbJHqGsZV8/lwC+iCcGeAe0vUaOh+Lv6SYM17ouzC/a/LB1/hz/7sxFBtlu1l4A== + dependencies: + async "~1.0.0" + colors "1.0.x" + cycle "1.0.x" + eyes "0.1.x" + isstream "0.1.x" + stack-trace "0.0.x" + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + ws@~0.4.28: version "0.4.32" resolved "https://registry.yarnpkg.com/ws/-/ws-0.4.32.tgz#787a6154414f3c99ed83c5772153b20feb0cec32" diff --git a/pkgs/development/compilers/emscripten/yarn.nix b/pkgs/development/compilers/emscripten/yarn.nix index af01d9c6869b..d0c3395f28af 100644 --- a/pkgs/development/compilers/emscripten/yarn.nix +++ b/pkgs/development/compilers/emscripten/yarn.nix @@ -9,6 +9,46 @@ sha1 = "85010754db53c3fbaf3b9ea3e083aa5c5d147ffd"; }; } + { + name = "acorn___acorn_6.4.2.tgz"; + path = fetchurl { + name = "acorn___acorn_6.4.2.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz"; + sha1 = "35866fd710528e92de10cf06016498e47e39e1e6"; + }; + } + { + name = "ansi_escapes___ansi_escapes_1.4.0.tgz"; + path = fetchurl { + name = "ansi_escapes___ansi_escapes_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz"; + sha1 = "d3a8a83b319aa67793662b13e761c7911422306e"; + }; + } + { + name = "ansi_regex___ansi_regex_2.1.1.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; + }; + } + { + name = "ansi_regex___ansi_regex_3.0.0.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz"; + sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; + }; + } + { + name = "ansi_styles___ansi_styles_2.2.1.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz"; + sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; + }; + } { name = "ansi_styles___ansi_styles_3.2.1.tgz"; path = fetchurl { @@ -17,6 +57,54 @@ sha1 = "41fbb20243e50b12be0f04b8dedbf07520ce841d"; }; } + { + name = "ansi___ansi_0.3.1.tgz"; + path = fetchurl { + name = "ansi___ansi_0.3.1.tgz"; + url = "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz"; + sha1 = "0c42d4fb17160d5a9af1e484bace1c66922c1b21"; + }; + } + { + name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz"; + path = fetchurl { + name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz"; + sha1 = "4b35c2944f062a8bfcda66410760350fe9ddfc21"; + }; + } + { + name = "async___async_1.0.0.tgz"; + path = fetchurl { + name = "async___async_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/async/-/async-1.0.0.tgz"; + sha1 = "f8fc04ca3a13784ade9e1641af98578cfbd647a9"; + }; + } + { + name = "balanced_match___balanced_match_1.0.2.tgz"; + path = fetchurl { + name = "balanced_match___balanced_match_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz"; + sha1 = "e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"; + }; + } + { + name = "bluebird___bluebird_3.7.2.tgz"; + path = fetchurl { + name = "bluebird___bluebird_3.7.2.tgz"; + url = "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz"; + sha1 = "9f229c15be272454ffa973ace0dbee79a1b0c36f"; + }; + } + { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + path = fetchurl { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha1 = "3c7fcbf529d87226f3d2f52b966ff5271eb441dd"; + }; + } { name = "buffer_from___buffer_from_1.1.1.tgz"; path = fetchurl { @@ -33,6 +121,14 @@ sha1 = "ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"; }; } + { + name = "caporal___caporal_1.4.0.tgz"; + path = fetchurl { + name = "caporal___caporal_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/caporal/-/caporal-1.4.0.tgz"; + sha1 = "d6087b815e3df97c3a0f55dbb82850fae29ed585"; + }; + } { name = "chalk___chalk_2.4.2.tgz"; path = fetchurl { @@ -41,6 +137,14 @@ sha1 = "cd42541677a54333cf541a49108c1432b44c9424"; }; } + { + name = "chalk___chalk_1.1.3.tgz"; + path = fetchurl { + name = "chalk___chalk_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz"; + sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; + }; + } { name = "clean_css___clean_css_4.2.3.tgz"; path = fetchurl { @@ -49,6 +153,30 @@ sha1 = "507b5de7d97b48ee53d84adb0160ff6216380f78"; }; } + { + name = "cli_cursor___cli_cursor_1.0.2.tgz"; + path = fetchurl { + name = "cli_cursor___cli_cursor_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz"; + sha1 = "64da3f7d56a54412e59794bd62dc35295e8f2987"; + }; + } + { + name = "cli_table3___cli_table3_0.5.1.tgz"; + path = fetchurl { + name = "cli_table3___cli_table3_0.5.1.tgz"; + url = "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.5.1.tgz"; + sha1 = "0252372d94dfc40dbd8df06005f48f31f656f202"; + }; + } + { + name = "cli_width___cli_width_2.2.1.tgz"; + path = fetchurl { + name = "cli_width___cli_width_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz"; + sha1 = "b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"; + }; + } { name = "clone_buffer___clone_buffer_1.0.0.tgz"; path = fetchurl { @@ -81,6 +209,14 @@ sha1 = "120a00cb053bfb63a222e709f9683ea2e11d8cec"; }; } + { + name = "code_point_at___code_point_at_1.1.0.tgz"; + path = fetchurl { + name = "code_point_at___code_point_at_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz"; + sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; + }; + } { name = "color_convert___color_convert_1.9.3.tgz"; path = fetchurl { @@ -97,6 +233,30 @@ sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; }; } + { + name = "colorette___colorette_1.2.2.tgz"; + path = fetchurl { + name = "colorette___colorette_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz"; + sha1 = "cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"; + }; + } + { + name = "colors___colors_1.0.3.tgz"; + path = fetchurl { + name = "colors___colors_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz"; + sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b"; + }; + } + { + name = "colors___colors_1.4.0.tgz"; + path = fetchurl { + name = "colors___colors_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz"; + sha1 = "c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"; + }; + } { name = "commander___commander_2.20.3.tgz"; path = fetchurl { @@ -121,6 +281,22 @@ sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781"; }; } + { + name = "concat_map___concat_map_0.0.1.tgz"; + path = fetchurl { + name = "concat_map___concat_map_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + } + { + name = "concat_stream___concat_stream_1.6.2.tgz"; + path = fetchurl { + name = "concat_stream___concat_stream_1.6.2.tgz"; + url = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz"; + sha1 = "904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"; + }; + } { name = "core_util_is___core_util_is_1.0.2.tgz"; path = fetchurl { @@ -129,6 +305,38 @@ sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; }; } + { + name = "cycle___cycle_1.0.3.tgz"; + path = fetchurl { + name = "cycle___cycle_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/cycle/-/cycle-1.0.3.tgz"; + sha1 = "21e80b2be8580f98b468f379430662b046c34ad2"; + }; + } + { + name = "debug___debug_2.6.9.tgz"; + path = fetchurl { + name = "debug___debug_2.6.9.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz"; + sha1 = "5d128515df134ff327e90a4c93f4e077a536341f"; + }; + } + { + name = "delegates___delegates_1.0.0.tgz"; + path = fetchurl { + name = "delegates___delegates_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz"; + sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; + }; + } + { + name = "es_check___es_check_5.2.4.tgz"; + path = fetchurl { + name = "es_check___es_check_5.2.4.tgz"; + url = "https://registry.yarnpkg.com/es-check/-/es-check-5.2.4.tgz"; + sha1 = "76fe2d96ad238bd8ec1d9c3b3d0e98ddbcc723e7"; + }; + } { name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; path = fetchurl { @@ -138,51 +346,123 @@ }; } { - name = "google_closure_compiler_java___google_closure_compiler_java_20200224.0.0.tgz"; + name = "exit_hook___exit_hook_1.1.1.tgz"; path = fetchurl { - name = "google_closure_compiler_java___google_closure_compiler_java_20200224.0.0.tgz"; - url = "https://registry.yarnpkg.com/google-closure-compiler-java/-/google-closure-compiler-java-20200224.0.0.tgz"; - sha1 = "03d71aefd0a07010fd8a7057d09c76f6729767bc"; + name = "exit_hook___exit_hook_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz"; + sha1 = "f05ca233b48c05d54fff07765df8507e95c02ff8"; }; } { - name = "google_closure_compiler_js___google_closure_compiler_js_20200224.0.0.tgz"; + name = "extend___extend_3.0.2.tgz"; path = fetchurl { - name = "google_closure_compiler_js___google_closure_compiler_js_20200224.0.0.tgz"; - url = "https://registry.yarnpkg.com/google-closure-compiler-js/-/google-closure-compiler-js-20200224.0.0.tgz"; - sha1 = "cf4b598abf7be686c683e530529756805b8af500"; + name = "extend___extend_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz"; + sha1 = "f8b1136b4071fbd8eb140aff858b1019ec2915fa"; }; } { - name = "google_closure_compiler_linux___google_closure_compiler_linux_20200224.0.0.tgz"; + name = "external_editor___external_editor_1.1.1.tgz"; path = fetchurl { - name = "google_closure_compiler_linux___google_closure_compiler_linux_20200224.0.0.tgz"; - url = "https://registry.yarnpkg.com/google-closure-compiler-linux/-/google-closure-compiler-linux-20200224.0.0.tgz"; - sha1 = "d9608b224b4d8f38d4d34e99a24da54bca6b1902"; + name = "external_editor___external_editor_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/external-editor/-/external-editor-1.1.1.tgz"; + sha1 = "12d7b0db850f7ff7e7081baf4005700060c4600b"; }; } { - name = "google_closure_compiler_osx___google_closure_compiler_osx_20200224.0.0.tgz"; + name = "eyes___eyes_0.1.8.tgz"; path = fetchurl { - name = "google_closure_compiler_osx___google_closure_compiler_osx_20200224.0.0.tgz"; - url = "https://registry.yarnpkg.com/google-closure-compiler-osx/-/google-closure-compiler-osx-20200224.0.0.tgz"; - sha1 = "aee62d8b878a662fc73b92419603168c0c3a35ed"; + name = "eyes___eyes_0.1.8.tgz"; + url = "https://registry.yarnpkg.com/eyes/-/eyes-0.1.8.tgz"; + sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; }; } { - name = "google_closure_compiler_windows___google_closure_compiler_windows_20200224.0.0.tgz"; + name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; path = fetchurl { - name = "google_closure_compiler_windows___google_closure_compiler_windows_20200224.0.0.tgz"; - url = "https://registry.yarnpkg.com/google-closure-compiler-windows/-/google-closure-compiler-windows-20200224.0.0.tgz"; - sha1 = "cae323b898625ca57b0e87aaddde021a414dda58"; + name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; + sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; }; } { - name = "google_closure_compiler___google_closure_compiler_20200224.0.0.tgz"; + name = "figures___figures_1.7.0.tgz"; path = fetchurl { - name = "google_closure_compiler___google_closure_compiler_20200224.0.0.tgz"; - url = "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20200224.0.0.tgz"; - sha1 = "ec0e708d9716a48e12fff43fe37fa5cec732a283"; + name = "figures___figures_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz"; + sha1 = "cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"; + }; + } + { + name = "fs.realpath___fs.realpath_1.0.0.tgz"; + path = fetchurl { + name = "fs.realpath___fs.realpath_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + } + { + name = "gauge___gauge_1.2.7.tgz"; + path = fetchurl { + name = "gauge___gauge_1.2.7.tgz"; + url = "https://registry.yarnpkg.com/gauge/-/gauge-1.2.7.tgz"; + sha1 = "e9cec5483d3d4ee0ef44b60a7d99e4935e136d93"; + }; + } + { + name = "glob___glob_7.1.7.tgz"; + path = fetchurl { + name = "glob___glob_7.1.7.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz"; + sha1 = "3b193e9233f01d42d0b3f78294bbeeb418f94a90"; + }; + } + { + name = "google_closure_compiler_java___google_closure_compiler_java_20200920.0.0.tgz"; + path = fetchurl { + name = "google_closure_compiler_java___google_closure_compiler_java_20200920.0.0.tgz"; + url = "https://registry.yarnpkg.com/google-closure-compiler-java/-/google-closure-compiler-java-20200920.0.0.tgz"; + sha1 = "23519b14e004f2a9eda4f5b887842ae46ad7022e"; + }; + } + { + name = "google_closure_compiler_linux___google_closure_compiler_linux_20200920.0.0.tgz"; + path = fetchurl { + name = "google_closure_compiler_linux___google_closure_compiler_linux_20200920.0.0.tgz"; + url = "https://registry.yarnpkg.com/google-closure-compiler-linux/-/google-closure-compiler-linux-20200920.0.0.tgz"; + sha1 = "622c28a784e8a93f9cc5e7cd7b675d2ed0e11d0b"; + }; + } + { + name = "google_closure_compiler_osx___google_closure_compiler_osx_20200920.0.0.tgz"; + path = fetchurl { + name = "google_closure_compiler_osx___google_closure_compiler_osx_20200920.0.0.tgz"; + url = "https://registry.yarnpkg.com/google-closure-compiler-osx/-/google-closure-compiler-osx-20200920.0.0.tgz"; + sha1 = "6157a06e7d851d25d60de95c4bcd464d768278b1"; + }; + } + { + name = "google_closure_compiler_windows___google_closure_compiler_windows_20200920.0.0.tgz"; + path = fetchurl { + name = "google_closure_compiler_windows___google_closure_compiler_windows_20200920.0.0.tgz"; + url = "https://registry.yarnpkg.com/google-closure-compiler-windows/-/google-closure-compiler-windows-20200920.0.0.tgz"; + sha1 = "755ddeb8032530c6ed13962e328d9af3269d0748"; + }; + } + { + name = "google_closure_compiler___google_closure_compiler_20200920.0.0.tgz"; + path = fetchurl { + name = "google_closure_compiler___google_closure_compiler_20200920.0.0.tgz"; + url = "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20200920.0.0.tgz"; + sha1 = "e1c54b7f1be8cbb33649d8d05e761bbf11e4eaa3"; + }; + } + { + name = "has_ansi___has_ansi_2.0.0.tgz"; + path = fetchurl { + name = "has_ansi___has_ansi_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz"; + sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; }; } { @@ -193,6 +473,14 @@ sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; }; } + { + name = "has_unicode___has_unicode_2.0.1.tgz"; + path = fetchurl { + name = "has_unicode___has_unicode_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz"; + sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; + }; + } { name = "he___he_1.2.0.tgz"; path = fetchurl { @@ -209,6 +497,14 @@ sha1 = "0e67a0b062ae1dd0719fc73199479298f807ae16"; }; } + { + name = "inflight___inflight_1.0.6.tgz"; + path = fetchurl { + name = "inflight___inflight_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + }; + } { name = "inherits___inherits_2.0.4.tgz"; path = fetchurl { @@ -217,6 +513,30 @@ sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c"; }; } + { + name = "inquirer___inquirer_1.2.3.tgz"; + path = fetchurl { + name = "inquirer___inquirer_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/inquirer/-/inquirer-1.2.3.tgz"; + sha1 = "4dec6f32f37ef7bb0b2ed3f1d1a5c3f545074918"; + }; + } + { + name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; + sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; + }; + } + { + name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; + sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + }; + } { name = "isarray___isarray_1.0.0.tgz"; path = fetchurl { @@ -225,6 +545,70 @@ sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; }; } + { + name = "isstream___isstream_0.1.2.tgz"; + path = fetchurl { + name = "isstream___isstream_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz"; + sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + }; + } + { + name = "lodash.camelcase___lodash.camelcase_4.3.0.tgz"; + path = fetchurl { + name = "lodash.camelcase___lodash.camelcase_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz"; + sha1 = "b28aa6288a2b9fc651035c7711f65ab6190331a6"; + }; + } + { + name = "lodash.difference___lodash.difference_4.5.0.tgz"; + path = fetchurl { + name = "lodash.difference___lodash.difference_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.difference/-/lodash.difference-4.5.0.tgz"; + sha1 = "9ccb4e505d486b91651345772885a2df27fd017c"; + }; + } + { + name = "lodash.pad___lodash.pad_4.5.1.tgz"; + path = fetchurl { + name = "lodash.pad___lodash.pad_4.5.1.tgz"; + url = "https://registry.yarnpkg.com/lodash.pad/-/lodash.pad-4.5.1.tgz"; + sha1 = "4330949a833a7c8da22cc20f6a26c4d59debba70"; + }; + } + { + name = "lodash.padend___lodash.padend_4.6.1.tgz"; + path = fetchurl { + name = "lodash.padend___lodash.padend_4.6.1.tgz"; + url = "https://registry.yarnpkg.com/lodash.padend/-/lodash.padend-4.6.1.tgz"; + sha1 = "53ccba047d06e158d311f45da625f4e49e6f166e"; + }; + } + { + name = "lodash.padstart___lodash.padstart_4.6.1.tgz"; + path = fetchurl { + name = "lodash.padstart___lodash.padstart_4.6.1.tgz"; + url = "https://registry.yarnpkg.com/lodash.padstart/-/lodash.padstart-4.6.1.tgz"; + sha1 = "d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b"; + }; + } + { + name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; + path = fetchurl { + name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz"; + sha1 = "d0225373aeb652adc1bc82e4945339a842754773"; + }; + } + { + name = "lodash___lodash_4.17.21.tgz"; + path = fetchurl { + name = "lodash___lodash_4.17.21.tgz"; + url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz"; + sha1 = "679591c564c3bffaae8454cf0b3df370c3d6911c"; + }; + } { name = "lower_case___lower_case_1.1.4.tgz"; path = fetchurl { @@ -233,6 +617,22 @@ sha1 = "9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"; }; } + { + name = "micromist___micromist_1.1.0.tgz"; + path = fetchurl { + name = "micromist___micromist_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/micromist/-/micromist-1.1.0.tgz"; + sha1 = "a490bcf9a4b918ad9eed8e52d0ec98b9c3b2d3c8"; + }; + } + { + name = "minimatch___minimatch_3.0.4.tgz"; + path = fetchurl { + name = "minimatch___minimatch_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz"; + sha1 = "5166e286457f03306064be5497e8dbb0c3d32083"; + }; + } { name = "minimist___minimist_1.2.5.tgz"; path = fetchurl { @@ -241,6 +641,30 @@ sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602"; }; } + { + name = "mkdirp___mkdirp_0.5.5.tgz"; + path = fetchurl { + name = "mkdirp___mkdirp_0.5.5.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; + sha1 = "d91cefd62d1436ca0f41620e251288d420099def"; + }; + } + { + name = "ms___ms_2.0.0.tgz"; + path = fetchurl { + name = "ms___ms_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + }; + } + { + name = "mute_stream___mute_stream_0.0.6.tgz"; + path = fetchurl { + name = "mute_stream___mute_stream_0.0.6.tgz"; + url = "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.6.tgz"; + sha1 = "48962b19e169fd1dfc240b3f1e7317627bbc47db"; + }; + } { name = "nan___nan_1.0.0.tgz"; path = fetchurl { @@ -257,6 +681,46 @@ sha1 = "60b813396be39b3f1288a4c1ed5d1e7d28b464ac"; }; } + { + name = "npmlog___npmlog_2.0.4.tgz"; + path = fetchurl { + name = "npmlog___npmlog_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/npmlog/-/npmlog-2.0.4.tgz"; + sha1 = "98b52530f2514ca90d09ec5b22c8846722375692"; + }; + } + { + name = "number_is_nan___number_is_nan_1.0.1.tgz"; + path = fetchurl { + name = "number_is_nan___number_is_nan_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; + }; + } + { + name = "object_assign___object_assign_4.1.1.tgz"; + path = fetchurl { + name = "object_assign___object_assign_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + }; + } + { + name = "once___once_1.4.0.tgz"; + path = fetchurl { + name = "once___once_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + } + { + name = "onetime___onetime_1.1.0.tgz"; + path = fetchurl { + name = "onetime___onetime_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz"; + sha1 = "a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"; + }; + } { name = "options___options_0.0.6.tgz"; path = fetchurl { @@ -265,6 +729,22 @@ sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f"; }; } + { + name = "os_shim___os_shim_0.1.3.tgz"; + path = fetchurl { + name = "os_shim___os_shim_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/os-shim/-/os-shim-0.1.3.tgz"; + sha1 = "6b62c3791cf7909ea35ed46e17658bb417cb3917"; + }; + } + { + name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; + path = fetchurl { + name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; + sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + }; + } { name = "param_case___param_case_2.1.1.tgz"; path = fetchurl { @@ -273,6 +753,38 @@ sha1 = "df94fd8cf6531ecf75e6bef9a0858fbc72be2247"; }; } + { + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; + path = fetchurl { + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + } + { + name = "pinkie_promise___pinkie_promise_2.0.1.tgz"; + path = fetchurl { + name = "pinkie_promise___pinkie_promise_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; + sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; + }; + } + { + name = "pinkie___pinkie_2.0.4.tgz"; + path = fetchurl { + name = "pinkie___pinkie_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz"; + sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; + }; + } + { + name = "prettyjson___prettyjson_1.2.1.tgz"; + path = fetchurl { + name = "prettyjson___prettyjson_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/prettyjson/-/prettyjson-1.2.1.tgz"; + sha1 = "fcffab41d19cab4dfae5e575e64246619b12d289"; + }; + } { name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; path = fetchurl { @@ -313,6 +825,30 @@ sha1 = "2d6d996d04a15855d967443631dd5f77825b016a"; }; } + { + name = "restore_cursor___restore_cursor_1.0.1.tgz"; + path = fetchurl { + name = "restore_cursor___restore_cursor_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz"; + sha1 = "34661f46886327fed2991479152252df92daa541"; + }; + } + { + name = "run_async___run_async_2.4.1.tgz"; + path = fetchurl { + name = "run_async___run_async_2.4.1.tgz"; + url = "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz"; + sha1 = "8440eccf99ea3e70bd409d49aab88e10c189a455"; + }; + } + { + name = "rx___rx_4.1.0.tgz"; + path = fetchurl { + name = "rx___rx_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz"; + sha1 = "a5f13ff79ef3b740fe30aa803fb09f98805d4782"; + }; + } { name = "safe_buffer___safe_buffer_5.1.2.tgz"; path = fetchurl { @@ -353,6 +889,38 @@ sha1 = "74722af32e9614e9c287a8d0bbde48b5e2f1a263"; }; } + { + name = "spawn_sync___spawn_sync_1.0.15.tgz"; + path = fetchurl { + name = "spawn_sync___spawn_sync_1.0.15.tgz"; + url = "https://registry.yarnpkg.com/spawn-sync/-/spawn-sync-1.0.15.tgz"; + sha1 = "b00799557eb7fb0c8376c29d44e8a1ea67e57476"; + }; + } + { + name = "stack_trace___stack_trace_0.0.10.tgz"; + path = fetchurl { + name = "stack_trace___stack_trace_0.0.10.tgz"; + url = "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz"; + sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0"; + }; + } + { + name = "string_width___string_width_1.0.2.tgz"; + path = fetchurl { + name = "string_width___string_width_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz"; + sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + }; + } + { + name = "string_width___string_width_2.1.1.tgz"; + path = fetchurl { + name = "string_width___string_width_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz"; + sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e"; + }; + } { name = "string_decoder___string_decoder_1.1.1.tgz"; path = fetchurl { @@ -361,6 +929,30 @@ sha1 = "9cf1611ba62685d7030ae9e4ba34149c3af03fc8"; }; } + { + name = "strip_ansi___strip_ansi_3.0.1.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + }; + } + { + name = "strip_ansi___strip_ansi_4.0.0.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz"; + sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; + }; + } + { + name = "supports_color___supports_color_2.0.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz"; + sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; + }; + } { name = "supports_color___supports_color_5.5.0.tgz"; path = fetchurl { @@ -369,6 +961,14 @@ sha1 = "e2e69a44ac8772f78a1ec0b35b689df6530efc8f"; }; } + { + name = "tabtab___tabtab_2.2.2.tgz"; + path = fetchurl { + name = "tabtab___tabtab_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/tabtab/-/tabtab-2.2.2.tgz"; + sha1 = "7a047f143b010b4cbd31f857e82961512cbf4e14"; + }; + } { name = "terser___terser_4.8.0.tgz"; path = fetchurl { @@ -377,6 +977,14 @@ sha1 = "63056343d7c70bb29f3af665865a46fe03a0df17"; }; } + { + name = "through___through_2.3.8.tgz"; + path = fetchurl { + name = "through___through_2.3.8.tgz"; + url = "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz"; + sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + }; + } { name = "tinycolor___tinycolor_0.0.1.tgz"; path = fetchurl { @@ -385,6 +993,22 @@ sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164"; }; } + { + name = "tmp___tmp_0.0.29.tgz"; + path = fetchurl { + name = "tmp___tmp_0.0.29.tgz"; + url = "https://registry.yarnpkg.com/tmp/-/tmp-0.0.29.tgz"; + sha1 = "f25125ff0dd9da3ccb0c2dd371ee1288bb9128c0"; + }; + } + { + name = "typedarray___typedarray_0.0.6.tgz"; + path = fetchurl { + name = "typedarray___typedarray_0.0.6.tgz"; + url = "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz"; + sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + }; + } { name = "upper_case___upper_case_1.1.3.tgz"; path = fetchurl { @@ -425,6 +1049,22 @@ sha1 = "761671e141c46b8a7c6c54429db1e6bfa3cd0ec0"; }; } + { + name = "winston___winston_2.4.5.tgz"; + path = fetchurl { + name = "winston___winston_2.4.5.tgz"; + url = "https://registry.yarnpkg.com/winston/-/winston-2.4.5.tgz"; + sha1 = "f2e431d56154c4ea765545fc1003bd340c95b59a"; + }; + } + { + name = "wrappy___wrappy_1.0.2.tgz"; + path = fetchurl { + name = "wrappy___wrappy_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + } { name = "ws___ws_0.4.32.tgz"; path = fetchurl { From c0664f564bc9569d04c56171b7769956e9a708e5 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 20 Jul 2021 13:39:48 +0200 Subject: [PATCH 026/235] open-ecard: deprecate phases --- pkgs/tools/security/open-ecard/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/open-ecard/default.nix b/pkgs/tools/security/open-ecard/default.nix index 5c07add90563..00ff112ba844 100644 --- a/pkgs/tools/security/open-ecard/default.nix +++ b/pkgs/tools/security/open-ecard/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { src = srcs.richclient; - phases = "installPhase"; + dontUnpack = true; nativeBuildInputs = [ makeWrapper ]; From 0aa95470e8b67a3508c33ae8af903d490bd1c8ea Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 20 Jul 2021 13:54:47 +0200 Subject: [PATCH 027/235] gorilla-bin: remove phases --- pkgs/tools/security/gorilla-bin/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/tools/security/gorilla-bin/default.nix b/pkgs/tools/security/gorilla-bin/default.nix index 68aa7c488198..228271742c64 100644 --- a/pkgs/tools/security/gorilla-bin/default.nix +++ b/pkgs/tools/security/gorilla-bin/default.nix @@ -11,7 +11,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ patchelf makeWrapper ]; - phases = [ "unpackPhase" "installPhase" ]; unpackCmd = '' mkdir gorilla; From f65dafaabcae5f6c159d2c346a77e51cf72d78e0 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Tue, 20 Jul 2021 15:03:01 +0300 Subject: [PATCH 028/235] procs: 0.11.8 -> 0.11.9 --- pkgs/tools/admin/procs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix index e86bfb31101a..0578bb4703cc 100644 --- a/pkgs/tools/admin/procs/default.nix +++ b/pkgs/tools/admin/procs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "procs"; - version = "0.11.8"; + version = "0.11.9"; src = fetchFromGitHub { owner = "dalance"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZeCTUoi2HAMUeyze7LdxH0mi1Dd6q8Sw6+xPAVf3HTs="; + sha256 = "sha256-zqRjMCyFT7knI1/zH+RF1pA/OKaDhJZLLjWJhfmqopE="; }; - cargoSha256 = "sha256-8myay5y4PGb/8s0vPLeg9xt6xqAQxGFXJz/GiV0ABlA="; + cargoSha256 = "sha256-W/ZMDbHC1VsllTSxCt77n4eb8Xgfj9YNx5NG5u+D+qA="; nativeBuildInputs = [ installShellFiles ]; From 148366e635185c2415d38ea7e4a0a9cd2bef1477 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 20 Jul 2021 12:38:49 +0000 Subject: [PATCH 029/235] eksctl: 0.56.0 -> 0.57.0 --- pkgs/tools/admin/eksctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 0bfedc2f0362..6a28e18c7d3a 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.56.0"; + version = "0.57.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-Wa6uvoAsPuswcrPgkLb8qTDEbUyeSeRSIO5t9z5/dqY="; + sha256 = "sha256-5Y//OD/UsqDnM8MPVJghrc5SbVwBEG/Eu761QWy5xK8="; }; - vendorSha256 = "sha256-N2jdaz0lb4Ut8P+FgNNjgyUeJ731fTQ5XSQgOF8KCQs="; + vendorSha256 = "sha256-CQ7A4vwUrshKRZBdIJZlCXmcxS0O0CkE1tNkZskYu1E="; doCheck = false; From 504c9335f695f9cdb5257d6e9a259422ec689dd5 Mon Sep 17 00:00:00 2001 From: Harrison Houghton Date: Sun, 18 Jul 2021 19:59:28 -0400 Subject: [PATCH 030/235] simutrans: 120.4.1 -> 121.0.0 The former version was having compilation issues; the latter does not. --- pkgs/games/simutrans/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index fc2654fd8e9b..60b2bc5faf77 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -11,28 +11,28 @@ let else map (name: pakSpec.${name}) (splitString " " paksets) ); - ver1 = "120"; - ver2 = "4"; - ver3 = "1"; - version = "${ver1}.${ver2}.${ver3}"; - ver_dash = "${ver1}-${ver2}-${ver3}"; + ver1 = "121"; + ver2 = "0"; + ver3 = ""; + version = "${ver1}.${ver2}${lib.optionalString (ver3 != "") ".${ver3}"}"; + ver_dash = "${ver1}-${ver2}${lib.optionalString (ver3 != "") "-${ver3}"}"; binary_src = fetchurl { url = "mirror://sourceforge/simutrans/simutrans/${ver_dash}/simutrans-src-${ver_dash}.zip"; - sha256 = "0yw7vjvmczp022mgk35swwhpbiszpz91mwsgicxglwivgc30vvic"; + sha256 = "1f463r6kr5ig0zd3mncc74k93xbjywsq3d06j5r17831jyc9bzb9"; }; - # As of 2015/03, many packsets still didn't have a release for version 120. + # As of 2021/07, many of these paksets have not been updated for years, so are on old versions. pakSpec = lib.mapAttrs (pakName: attrs: mkPak (attrs // {inherit pakName;})) { pak64 = { - srcPath = "121-0/simupak64-121-0"; + srcPath = "${ver_dash}/simupak64-${ver_dash}"; sha256 = "1k335kh8dhm1hdn5iwn3sdgnrlpk0rqxmmgqgqcwsi09cmw45m5c"; }; "pak64.japan" = { - # No release for 120.2 yet! + # No release for 121.0 yet! srcPath = "120-0/simupak64.japan-120-0-1"; sha256 = "14swy3h4ij74bgaw7scyvmivfb5fmp21nixmhlpk3mav3wr3167i"; }; From 7498e4c28242dcf79c0f8d2202158316a4fc31d2 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Tue, 20 Jul 2021 15:37:57 +0200 Subject: [PATCH 031/235] libsidplayfp: 2.2.0 -> 2.2.1 --- pkgs/development/libraries/libsidplayfp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsidplayfp/default.nix b/pkgs/development/libraries/libsidplayfp/default.nix index fe02a96a565c..99c8b7352943 100644 --- a/pkgs/development/libraries/libsidplayfp/default.nix +++ b/pkgs/development/libraries/libsidplayfp/default.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { pname = "libsidplayfp"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "libsidplayfp"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-lDM4nJozZF8Rt+XWnM41hBAYatZVsmvvQajgHLI9uy0="; + sha256 = "sha256-Ut6tXaM97R8Y5D2dV/xPvxVzS6Ep6fOKAujtRNKoQCc="; }; postPatch = '' From 48d0ac9791c40ab2ce647db921e0291df11ab338 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Tue, 20 Jul 2021 15:40:32 +0200 Subject: [PATCH 032/235] punes: unstable-2021-06-05 -> unstable-2021-07-19 --- pkgs/misc/emulators/punes/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/emulators/punes/default.nix b/pkgs/misc/emulators/punes/default.nix index c0bf7a223a3b..d3ad2f681997 100644 --- a/pkgs/misc/emulators/punes/default.nix +++ b/pkgs/misc/emulators/punes/default.nix @@ -12,18 +12,20 @@ , ffmpeg , libGLU , alsa-lib +, libX11 +, libXrandr , sndio }: mkDerivation rec { pname = "punes"; - version = "unstable-2021-06-05"; + version = "unstable-2021-07-19"; src = fetchFromGitHub { owner = "punesemu"; repo = "puNES"; - rev = "07fd123f62b2d075894a0cc966124db7b427b791"; - sha256 = "1wxff7b397ayd2s2v14w6a0zfgklc7y0kv3mkz1gg5x47mnll24l"; + rev = "15ab85dabb220889419df0c249c06f3db2b09dc0"; + sha256 = "1w0c5lfdl9ha4sxxva6hcpcaa444px6x25471q37l69n71rmjpy8"; }; postPatch = '' @@ -34,7 +36,7 @@ mkDerivation rec { nativeBuildInputs = [ autoreconfHook cmake pkg-config qttools ]; buildInputs = [ ffmpeg qtbase qtsvg libGLU ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libX11 libXrandr ] ++ lib.optionals stdenv.hostPlatform.isBSD [ sndio ]; dontUseCmakeConfigure = true; From dc1afb4a49ad707a4384c2e100ad7f64f0e8619d Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 20 Jul 2021 15:44:02 +0200 Subject: [PATCH 033/235] electrum: 4.1.3 -> 4.1.5 --- pkgs/applications/misc/electrum/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 4197c1af040b..28c965a72b5c 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -20,7 +20,7 @@ }: let - version = "4.1.3"; + version = "4.1.5"; libsecp256k1_name = if stdenv.isLinux then "libsecp256k1.so.0" @@ -36,7 +36,7 @@ let owner = "spesmilo"; repo = "electrum"; rev = version; - sha256 = "1nkcybalkfna9zn33dxm13ic3brj50cfzwspjl349rgyar07j781"; + sha256 = "1ps8yaps5kfd7yv7bpdvssbwm6f5qivxcvhwn17cpddc2760a7nk"; extraPostFetch = '' mv $out ./all @@ -51,7 +51,7 @@ python3.pkgs.buildPythonApplication { src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "1mlwpmgfm3n45agx65jzsi4dr8nxf95x7nl01jnwa3qk5krrv4cf"; + sha256 = "188r4zji985z8pm9b942xhmvv174yndk6jxagxl7ljk03wl2wiwi"; }; postUnpack = '' @@ -154,6 +154,8 @@ python3.pkgs.buildPythonApplication { of the blockchain. ''; homepage = "https://electrum.org/"; + downloadPage = "https://electrum.org/#download"; + changelog = "https://github.com/spesmilo/electrum/blob/master/RELEASE-NOTES"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ joachifm np prusnak ]; From 8994b8f6a5abf4c7f2c43896443c6548d557a6d5 Mon Sep 17 00:00:00 2001 From: Max Wittig Date: Tue, 20 Jul 2021 16:43:17 +0200 Subject: [PATCH 034/235] gitlab-runner: 14.0.1 -> 14.1.0 --- .../continuous-integration/gitlab-runner/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index e89c784df747..ff5799df4acc 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "14.0.1"; + version = "14.1.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/binaries/gitlab-runner-helper/gitlab-runner-helper.x86_64"; - sha256 = "1i1fddsz7cr0kg4bxqisx29cwyd07zqfbpmh5mhvi5zqy0gfmcn8"; + sha256 = "09p0biig07plf9qiwpsdllh6midi8kzpzk2s71rmms491g4634k2"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/binaries/gitlab-runner-helper/gitlab-runner-helper.arm"; - sha256 = "1d2ywc3cikffiwpql2kp5zg21vjinz51f76c6wdn0v35wl705fz4"; + sha256 = "0z5q5y9lsznwglpg7sd5af51v9640m85v4x4dcj5j37w24bi4wq0"; }; in buildGoPackage rec { @@ -30,7 +30,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "1prvmppq5w897bd9ch5z0h6h8mndy6myv8al24cr0bjc27c6wyn7"; + sha256 = "1v2yxs92awwn4m6hq6wc53whfmk6fr4l6j87amcbdzcm4ikzxcvk"; }; patches = [ ./fix-shell-path.patch ]; From da87aef5325eb1d797e209349b8d4ac967346825 Mon Sep 17 00:00:00 2001 From: dan4ik <6057430gu@gmail.com> Date: Tue, 20 Jul 2021 21:51:34 +0700 Subject: [PATCH 035/235] tonelib-gfx: fixed runtimeDependencies --- pkgs/applications/audio/tonelib-gfx/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/audio/tonelib-gfx/default.nix b/pkgs/applications/audio/tonelib-gfx/default.nix index 137014508a3c..00be09345520 100644 --- a/pkgs/applications/audio/tonelib-gfx/default.nix +++ b/pkgs/applications/audio/tonelib-gfx/default.nix @@ -12,6 +12,7 @@ , fribidi , pango , freetype +, curl }: stdenv.mkDerivation rec { @@ -50,6 +51,10 @@ stdenv.mkDerivation rec { mv $out/bin/ToneLib-GFX $out/bin/tonelib-gfx ''; + runtimeDependencies = [ + (lib.getLib curl) + ]; + meta = with lib; { description = "Tonelib GFX is an amp and effects modeling software for electric guitar and bass."; homepage = "https://tonelib.net/"; From e9092c24c42b744a49998fc835825f0b09221316 Mon Sep 17 00:00:00 2001 From: dan4ik <6057430gu@gmail.com> Date: Tue, 20 Jul 2021 21:52:24 +0700 Subject: [PATCH 036/235] tonelib-jam: fixed runtimeDependencies --- pkgs/applications/audio/tonelib-jam/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/audio/tonelib-jam/default.nix b/pkgs/applications/audio/tonelib-jam/default.nix index c58023d6a4bd..7a5a5c7280fa 100644 --- a/pkgs/applications/audio/tonelib-jam/default.nix +++ b/pkgs/applications/audio/tonelib-jam/default.nix @@ -12,6 +12,7 @@ , fribidi , pango , freetype +, curl }: stdenv.mkDerivation rec { @@ -50,6 +51,10 @@ stdenv.mkDerivation rec { mv $out/bin/ToneLib-Jam $out/bin/tonelib-jam ''; + runtimeDependencies = [ + (lib.getLib curl) + ]; + meta = with lib; { description = "ToneLib Jam – the learning and practice software for guitar players"; homepage = "https://tonelib.net/"; From 0ef0c8b532fda2c72497e85221f3fc284d8f5016 Mon Sep 17 00:00:00 2001 From: dan4ik <6057430gu@gmail.com> Date: Tue, 20 Jul 2021 21:53:53 +0700 Subject: [PATCH 037/235] tonelib-zoom: fixed runtimeDependencies --- pkgs/applications/audio/tonelib-zoom/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/audio/tonelib-zoom/default.nix b/pkgs/applications/audio/tonelib-zoom/default.nix index 94ef3037a7c2..2eef1f7bd609 100644 --- a/pkgs/applications/audio/tonelib-zoom/default.nix +++ b/pkgs/applications/audio/tonelib-zoom/default.nix @@ -6,6 +6,7 @@ , webkitgtk , libjack2 , alsa-lib +, curl }: stdenv.mkDerivation rec { @@ -38,6 +39,10 @@ stdenv.mkDerivation rec { mv $out/bin/ToneLib-Zoom $out/bin/tonelib-zoom ''; + runtimeDependencies = [ + (lib.getLib curl) + ]; + meta = with lib; { description = "ToneLib Zoom – change and save all the settings in your Zoom(r) guitar pedal"; homepage = "https://tonelib.net/"; From 2047bf6e784ab16fe00b971396690054e5d657b7 Mon Sep 17 00:00:00 2001 From: dan4ik <6057430gu@gmail.com> Date: Tue, 20 Jul 2021 16:01:55 +0700 Subject: [PATCH 038/235] coreterminal: init at 4.2.0 --- .../coreterminal/default.nix | 42 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 46 insertions(+) create mode 100644 pkgs/applications/terminal-emulators/coreterminal/default.nix diff --git a/pkgs/applications/terminal-emulators/coreterminal/default.nix b/pkgs/applications/terminal-emulators/coreterminal/default.nix new file mode 100644 index 000000000000..e358fae0716f --- /dev/null +++ b/pkgs/applications/terminal-emulators/coreterminal/default.nix @@ -0,0 +1,42 @@ +{ mkDerivation +, lib +, fetchFromGitLab +, cmake +, ninja +, qtbase +, qtserialport +, qtermwidget +, libcprime +}: + +mkDerivation rec { + pname = "coreterminal"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-YXs6VTem3AaK4n1DYwKP/jqNuf09Srn2THHyJJnArlc="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + qtserialport + qtermwidget + libcprime + ]; + + meta = with lib; { + description = "A terminal emulator from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/coreterminal"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 58ccafd7cada..9c95ff91ab57 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -931,6 +931,10 @@ in cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { }; + coreterminal = libsForQt5.callPackage ../applications/terminal-emulators/coreterminal { + inherit (lxqt) qtermwidget; + }; + eterm = callPackage ../applications/terminal-emulators/eterm { }; evilvte = callPackage ../applications/terminal-emulators/evilvte (config.evilvte or {}); From ced49e422559437d33f3cf2ef4354410e5de5c1a Mon Sep 17 00:00:00 2001 From: dan4ik <6057430gu@gmail.com> Date: Tue, 20 Jul 2021 22:45:46 +0700 Subject: [PATCH 039/235] libcprime: init at 4.2.2 --- .../libraries/libcprime/default.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/libraries/libcprime/default.nix diff --git a/pkgs/development/libraries/libcprime/default.nix b/pkgs/development/libraries/libcprime/default.nix new file mode 100644 index 000000000000..4db6ac1b46b8 --- /dev/null +++ b/pkgs/development/libraries/libcprime/default.nix @@ -0,0 +1,40 @@ +{ mkDerivation +, lib +, fetchFromGitLab +, libnotify +, cmake +, ninja +, qtbase +, qtconnectivity +}: + +mkDerivation rec { + pname = "libcprime"; + version = "4.2.2"; + + src = fetchFromGitLab { + owner = "cubocore"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-RywvFATA/+fDP/TR5QRWaJlDgy3EID//iVmrJcj3GXI="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + qtconnectivity + libnotify + ]; + + meta = with lib; { + description = "A library for bookmarking, saving recent activites, managing settings of C-Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/libcprime"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c95ff91ab57..2e1a024f5ec5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6363,6 +6363,8 @@ in libscrypt = callPackage ../development/libraries/libscrypt { }; + libcprime = libsForQt5.callPackage ../development/libraries/libcprime { }; + libcloudproviders = callPackage ../development/libraries/libcloudproviders { }; libcoap = callPackage ../applications/networking/libcoap { From 960fffcbf935deb3bac245128a50d5afd4e5031b Mon Sep 17 00:00:00 2001 From: dan4ik <6057430gu@gmail.com> Date: Tue, 20 Jul 2021 23:19:03 +0700 Subject: [PATCH 040/235] coreimage: init at 4.2.0 --- .../graphics/coreimage/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/graphics/coreimage/default.nix diff --git a/pkgs/applications/graphics/coreimage/default.nix b/pkgs/applications/graphics/coreimage/default.nix new file mode 100644 index 000000000000..1dcff1f6e8f2 --- /dev/null +++ b/pkgs/applications/graphics/coreimage/default.nix @@ -0,0 +1,31 @@ +{ mkDerivation, lib, fetchFromGitLab, libcprime, qtbase, cmake, ninja }: + +mkDerivation rec { + pname = "coreimage"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-dxRHzSG5ea1MhpTjgZbFztV9mElEaeOK4NsmieSgf5Q"; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + libcprime + ]; + + meta = with lib; { + description = "An image viewer from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/coreimage"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index acda472dbbd6..706455ce0397 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23455,6 +23455,8 @@ in corrscope = libsForQt5.callPackage ../applications/video/corrscope { }; + coreimage = libsForQt5.callPackage ../applications/graphics/coreimage { }; + csa = callPackage ../applications/audio/csa { }; csound = callPackage ../applications/audio/csound { From 204f7e1725f697b76eb4591016798ee5987f48ea Mon Sep 17 00:00:00 2001 From: hqurve Date: Mon, 19 Jul 2021 07:47:56 -0400 Subject: [PATCH 041/235] maintainers: add hqurve --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9ba85483ccd2..f3cb1a32be05 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4337,6 +4337,12 @@ github = "HolgerPeters"; githubId = 4097049; }; + hqurve = { + email = "hqurve@outlook.com"; + github = "hqurve"; + githubId = 53281855; + name = "hqurve"; + }; hrdinka = { email = "c.nix@hrdinka.at"; github = "hrdinka"; From 4ac8c881c37875f4e5099b1a65fef03c2e0b9389 Mon Sep 17 00:00:00 2001 From: hqurve Date: Sun, 18 Jul 2021 21:53:02 -0400 Subject: [PATCH 042/235] krunner-symbols: init at 1.1.0 --- .../3rdparty/addons/krunner-symbols.nix | 40 +++++++++++++++++++ pkgs/desktops/plasma-5/default.nix | 1 + pkgs/top-level/aliases.nix | 1 + 3 files changed, 42 insertions(+) create mode 100644 pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix b/pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix new file mode 100644 index 000000000000..7a0b61622570 --- /dev/null +++ b/pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix @@ -0,0 +1,40 @@ +{ lib, stdenv +, cmake, fetchFromGitHub, extra-cmake-modules +, qtbase, wrapQtAppsHook, ki18n, kdelibs4support, krunner +}: + +stdenv.mkDerivation rec { + pname = "krunner-symbols"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "domschrei"; + repo = "krunner-symbols"; + rev = version; + sha256 = "sha256-YsoZdPTWpk3/YERwerrVEcaf2IfGVJwpq32onhP8Exo="; + }; + + buildInputs = [ qtbase ki18n kdelibs4support krunner ]; + nativeBuildInputs = [ cmake wrapQtAppsHook extra-cmake-modules ]; + + postPatch = '' + # symbols.cpp hardcodes the location of configuration files + substituteInPlace symbols.cpp \ + --replace "/usr/share/config/krunner-symbol" "$out/share/config/krunner-symbol" + + # change cmake flag names to output using the correct qt-plugin prefix and kservice location + substituteInPlace CMakeLists.txt \ + --replace "LOCATION_PLUGIN" "KDE_INSTALL_PLUGINDIR" \ + --replace "LOCATION_DESKTOP" "KDE_INSTALL_KSERVICES5DIR" + ''; + + cmakeFlags = [ "-DLOCATION_CONFIG=share/config" ]; + + meta = with lib; { + description = "A little krunner plugin (Plasma 5) to retrieve unicode symbols, or any other string, based on a corresponding keyword"; + homepage = "https://github.com/domschrei/krunner-symbols"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ hqurve ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 4b41e5ad9d5f..9252aa7b39ba 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -158,6 +158,7 @@ let kwin-dynamic-workspaces = callPackage ./3rdparty/kwin/scripts/dynamic-workspaces.nix { }; kwin-tiling = callPackage ./3rdparty/kwin/scripts/tiling.nix { }; krohnkite = callPackage ./3rdparty/kwin/scripts/krohnkite.nix { }; + krunner-symbols = callPackage ./3rdparty/addons/krunner-symbols.nix { }; parachute = callPackage ./3rdparty/kwin/scripts/parachute.nix { }; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8c59db87b739..99b12d5da4e0 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1134,6 +1134,7 @@ mapAliases ({ kwin-dynamic-workspaces kwin-tiling krohnkite + krunner-symbols ; inherit (libsForQt5) sddm From b9c4bdb4f7741a95738b68ebd3bfa191adad8f29 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 20 Jul 2021 21:57:04 +0200 Subject: [PATCH 043/235] python3Packages.asyncio-mqtt: 0.9.1 -> 0.10.0 --- pkgs/development/python-modules/asyncio_mqtt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asyncio_mqtt/default.nix b/pkgs/development/python-modules/asyncio_mqtt/default.nix index 522f406da423..d8a378b082fc 100644 --- a/pkgs/development/python-modules/asyncio_mqtt/default.nix +++ b/pkgs/development/python-modules/asyncio_mqtt/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "asyncio_mqtt"; - version = "0.9.1"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "0550229cecde6ff1751c49dd5ea26b02bf52b7e9bbe9bf763da765f35bb281de"; + sha256 = "0s94dvgh1fazycppki5m6f9d60hc4ykhqfznlzpwl4dzknxplpsz"; }; propagatedBuildInputs = [ From 3082d4c45a33489dccb510faba067a4a18bf2b42 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 20 Jul 2021 22:19:11 +0200 Subject: [PATCH 044/235] python3Packages.adb-shell: 0.3.4 -> 0.4.0 --- pkgs/development/python-modules/adb-shell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adb-shell/default.nix b/pkgs/development/python-modules/adb-shell/default.nix index 22e4a67ff2ab..47a70940e927 100644 --- a/pkgs/development/python-modules/adb-shell/default.nix +++ b/pkgs/development/python-modules/adb-shell/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "adb-shell"; - version = "0.3.4"; + version = "0.4.0"; disabled = !isPy3k; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "JeffLIrion"; repo = "adb_shell"; rev = "v${version}"; - sha256 = "sha256-H1GVbMeaVUZh8T1jgZP2o+emEkK4fOi5k4aL9ayVesA="; + sha256 = "1dzpgpvjvss4mk2kp1s9g1gg0d008pbmfdsi9b98q9fax9syk725"; }; propagatedBuildInputs = [ From cca25fe1e0ee7ee3e597d8671f800a2cd6b86fa2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 20 Jul 2021 21:59:12 +0000 Subject: [PATCH 045/235] gmic: 2.9.7 -> 2.9.8 --- pkgs/tools/graphics/gmic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index 37b398ef1c62..d12a213a31e5 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "gmic"; - version = "2.9.7"; + version = "2.9.8"; outputs = [ "out" "lib" "dev" "man" ]; src = fetchurl { url = "https://gmic.eu/files/source/gmic_${version}.tar.gz"; - sha256 = "sha256-lCU3SH6nIhQSMFeds81DMTaEKcDjPLOP7hsXqulVfxY="; + sha256 = "sha256-GNa7xzGuO02oplasGJR2eTsRGp3Rn3LbIxLwdN983II="; }; nativeBuildInputs = [ From fba8a6910502d9ecca535b09490a2173382f2099 Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 21 Jul 2021 03:54:34 +0300 Subject: [PATCH 046/235] mint: 0.11.0 -> 0.14.0 --- pkgs/development/compilers/mint/default.nix | 10 ++-- pkgs/development/compilers/mint/shards.nix | 60 +++++++-------------- 2 files changed, 23 insertions(+), 47 deletions(-) diff --git a/pkgs/development/compilers/mint/default.nix b/pkgs/development/compilers/mint/default.nix index 1024ddb6a8a6..adb7490785e4 100644 --- a/pkgs/development/compilers/mint/default.nix +++ b/pkgs/development/compilers/mint/default.nix @@ -1,18 +1,18 @@ -{ lib, fetchFromGitHub, crystal_0_36, openssl }: +{ lib, fetchFromGitHub, crystal_1_0, openssl }: let - crystal = crystal_0_36; + crystal = crystal_1_0; in crystal.buildCrystalPackage rec { - version = "0.11.0"; + version = "0.14.0"; pname = "mint"; src = fetchFromGitHub { owner = "mint-lang"; repo = "mint"; rev = version; - sha256 = "sha256-QqO4Kc8hf6WNCENPvLwYIF9gtXG/VRR7DhyZvxB4VsA="; + sha256 = "1mf9d0jpdb21hkzaqvwyx2171dv3hr50zhl07p85wpf0d3n5wml8"; }; postPatch = '' @@ -34,6 +34,6 @@ crystal.buildCrystalPackage rec { license = licenses.bsd3; maintainers = with maintainers; [ manveru ]; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; - broken = lib.versionOlder crystal.version "0.33"; + broken = lib.versionOlder crystal.version "1.0"; }; } diff --git a/pkgs/development/compilers/mint/shards.nix b/pkgs/development/compilers/mint/shards.nix index 595f9c5ebee7..49ba1ad74325 100644 --- a/pkgs/development/compilers/mint/shards.nix +++ b/pkgs/development/compilers/mint/shards.nix @@ -2,79 +2,55 @@ admiral = { owner = "jwaldrip"; repo = "admiral.cr"; - rev = "v1.11.2"; - sha256 = "0rxsy41d0qpw9h1d3jvhmbmzqba9yhgyzc0jrdbg28f59fl7zp7q"; + rev = "v1.11.4"; + sha256 = "1rpybhhzz892s2dp2kzbkkn1c8c7574275ql6amhbvc6ds5j3i46"; }; ameba = { owner = "crystal-ameba"; repo = "ameba"; - rev = "v0.13.3"; - sha256 = "0yhb8vfrfzsm3a45h2jmcrn1n7jy3zn2hwims3dikgq8kaggws9y"; + rev = "v0.14.2"; + sha256 = "1l1q1icpzg1zvhfj8948w36j7ikaj7w816677zi29vi6y2d1dmf2"; }; baked_file_system = { owner = "schovi"; repo = "baked_file_system"; - rev = "7183bfde8d86a976a6912f582b51cbd1783456af"; - sha256 = "0s1bsrimz30wfkkfmb4bm49mx44nhqj0hky8jkn0kz0mpc28mkkl"; - }; - diff = { - owner = "MakeNowJust"; - repo = "crystal-diff"; - rev = "v1.1.0"; - sha256 = "1q5q2d5mp1r8c6k5v4755sb3b6awiz85d1j280djzhbd0pggk3z7"; + rev = "v0.10.0"; + sha256 = "10f25sby8ipps5c2jj4j2q30kscgv4g1s5nhdddmldhg9isj0jli"; }; dotenv = { owner = "gdotdesign"; repo = "cr-dotenv"; - rev = "v0.3.1"; - sha256 = "1xp7c3g8dj1hqk2b885qr4y0s8661gpp9q28lv6rhr0ckllc6zgz"; + rev = "v1.0.0"; + sha256 = "00pdawysns1w1iqwh6j3shilpwh41ljz1chsqkacn6dj2yn21n0r"; }; exception_page = { owner = "crystal-loot"; repo = "exception_page"; - rev = "v0.1.4"; - sha256 = "0bsp2m89sl0bg9d5szbs1nxyk7yk58rkk24aibr39hhb5zi70pqi"; + rev = "v0.1.5"; + sha256 = "0nlph4rmavwsndf94hisdikh3qhhkyyh97cc39mvbqzrqrc6lbx3"; }; kemal = { owner = "kemalcr"; repo = "kemal"; - rev = "v0.27.0"; - sha256 = "01p5fkm6q9k6390dhhw3dwwzlxhxafykknkkcayv1k4ynn126hi7"; + rev = "v1.0.0"; + sha256 = "0yy6mkqyxlgdi6svj206iprw3njrxw61y2s2wwz78yz7j6sly1wf"; }; kilt = { owner = "jeromegn"; repo = "kilt"; - rev = "v0.4.0"; - sha256 = "1w9ib6j4xhwxdxx58nzc06gw7ci7vga03vgj1z1bnklamb0b0l0k"; + rev = "v0.4.1"; + sha256 = "1bhmmk4djnysf2fr0020dakn1730a33xzi10c8lg1a343x77rm64"; }; markd = { owner = "icyleaf"; repo = "markd"; - rev = "620845abb6776d1765d20d86cc0220aa40f89a91"; - sha256 = "1nq1ddmd2kgnl8vrk0y65lqhy145740a3s68kn0advm2xx8rbhmy"; + rev = "v0.4.0"; + sha256 = "0zi39ik7zqnidysafwn6icpr0gdb6z40v63bx5hablarpf2r9637"; }; radix = { owner = "luislavena"; repo = "radix"; - rev = "v0.3.9"; - sha256 = "19pksfr7ddc31hvikb433jg0zav1ar93k6zmsgaf3vsrjnvia3ix"; - }; - string_inflection = { - owner = "mosop"; - repo = "string_inflection"; - rev = "v0.2.1"; - sha256 = "10vkr28h7n53ijjv57ldxhh473086qg313lzs55a7wsh0zgc104m"; - }; - time_format = { - owner = "vladfaust"; - repo = "time_format.cr"; - rev = "v0.1.1"; - sha256 = "0mmssnabf476i07sajm7s3rlvfcav4lkh0n8g12rybxr6c9f683v"; - }; - tree_template = { - owner = "gdotdesign"; - repo = "tree_template"; - rev = "7e24c92208cc99938f3fbd8f5fecda22bcbe3cc3"; - sha256 = "0ixscq7nqlp83x976d41kq83a5gw9kkk7lnxhlsc91000hm5h3wq"; + rev = "v0.4.1"; + sha256 = "1l08cydkdidq9yyil1wl240hvk41iycv04jrg6nx5mkvzw4z1bzg"; }; } From 4cdb8dc132ad821c343d89eb9dd90f6ee74dd4f9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 21 Jul 2021 02:49:01 +0000 Subject: [PATCH 047/235] ibus-engines.table-others: 1.3.11 -> 1.3.12 --- .../inputmethods/ibus-engines/ibus-table-others/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix index 258ab93689bc..18fc21e98088 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ibus-table-others"; - version = "1.3.11"; + version = "1.3.12"; src = fetchurl { url = "https://github.com/moebiuscurve/ibus-table-others/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "0763wnlklcs3d8fk21nkp7dgn4qzqgxh1s24q3kl8gzgng2a88jj"; + sha256 = "sha256-2k7JtLr+zO71rbTz11CCiIPx+orn0dw/Y8m47WfRDEU="; }; nativeBuildInputs = [ pkg-config ]; From 05a5611fe971e1b588c2becf698c18cd4b8b2613 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 21 Jul 2021 04:20:00 +0000 Subject: [PATCH 048/235] grpc: 1.38.1 -> 1.39.0 https://github.com/grpc/grpc/releases/tag/v1.39.0 --- pkgs/development/libraries/grpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 00d3c4a5637e..2bf843241a6a 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -3,13 +3,13 @@ }: stdenv.mkDerivation rec { - version = "1.38.1"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too + version = "1.39.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too pname = "grpc"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - sha256 = "0hjp946x5695srmc6bg2m7iih81jdmhpxn4bjcl80f09v4qsb0nl"; + sha256 = "1wa7n7mf20fnvxqw093kr7a4c7vilcmx9yl3hicnyfcd663jgqvd"; fetchSubmodules = true; }; patches = [ From b155b06e1dc296b471f0e43e02400c8d9c5af70d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 21 Jul 2021 04:20:00 +0000 Subject: [PATCH 049/235] redis: 6.2.4 -> 6.2.5 https://github.com/redis/redis/releases/tag/6.2.5 --- pkgs/servers/nosql/redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 14061974a9dd..77eae32e27f4 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "redis"; - version = "6.2.4"; + version = "6.2.5"; src = fetchurl { url = "https://download.redis.io/releases/${pname}-${version}.tar.gz"; - sha256 = "0vp1d9mlfsppry3nsj9f7bmh9wjgsy3jggp24sac1hhgl43c8cms"; + sha256 = "1bjismh8lrvsjkm1wf5ak0igak5rr9cc39i0brwb6x0vk9q7b6jb"; }; # Cross-compiling fixes From cae1f9847926b5739b7fb258599328da50abd83c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 21 Jul 2021 04:20:00 +0000 Subject: [PATCH 050/235] python38Packages.grpcio-tools: 1.38.1 -> 1.39.0 --- pkgs/development/python-modules/grpcio-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index 7236f7c22e3d..0e095126676d 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.38.1"; + version = "1.39.0"; src = fetchPypi { inherit pname version; - sha256 = "cd85f58038b92e1961f8127d79691e84e151390d35cae73c4c0cbe2042f76b77"; + sha256 = "39dfe7415bc0d3860fdb8dd90607594b046b88b57dbe64284efa4820f951c805"; }; outputs = [ "out" "dev" ]; From d374ba7445a3857bcd6b3b2b9af311127a086345 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 21 Jul 2021 07:08:34 +0000 Subject: [PATCH 051/235] libkeyfinder: 2.2.4 -> 2.2.5 --- pkgs/development/libraries/libkeyfinder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libkeyfinder/default.nix b/pkgs/development/libraries/libkeyfinder/default.nix index 324e675f33bf..04137eb02e7b 100644 --- a/pkgs/development/libraries/libkeyfinder/default.nix +++ b/pkgs/development/libraries/libkeyfinder/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libkeyfinder"; - version = "2.2.4"; + version = "2.2.5"; src = fetchFromGitHub { owner = "mixxxdj"; repo = "libkeyfinder"; rev = "v${version}"; - sha256 = "005qq81xfzi1iifvpgkqpizxcrfisafq2r0cjp4fxqh1ih7bfimv"; + sha256 = "sha256-4jbnsKMGJKUIRfRPymGGgqPgwPyLInc6rLvCXnOcQ5g="; }; # needed for finding libkeyfinder.so to link it into keyfinder-tests executable From 0e80580b98d069c78861aadd372484f160f256b5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 21 Jul 2021 09:24:47 +0000 Subject: [PATCH 052/235] cherrytree: 0.99.38 -> 0.99.39 --- pkgs/applications/misc/cherrytree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index ef307ce3460b..daef73a56796 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "cherrytree"; - version = "0.99.38"; + version = "0.99.39"; src = fetchFromGitHub { owner = "giuspen"; repo = "cherrytree"; rev = version; - sha256 = "sha256-04MRw6pMtJGxTMKwOzPNGg1T85SfVY5bMkF3gt2V0e0="; + sha256 = "sha256-QSRYtnZxLAaq42PvPd5+LxSzq/Hd/Cz5bquBTiGWnAE="; }; nativeBuildInputs = [ From 0c98dd91ffde756bf4e77c8c70e9545c82fe2a50 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 21 Jul 2021 10:33:09 +0000 Subject: [PATCH 053/235] dnsproxy: 0.38.2 -> 0.38.3 --- pkgs/tools/networking/dnsproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 96528a78d4cb..ffa2138ffa82 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.38.2"; + version = "0.38.3"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-v2uVIFPc8h58W03Jo2vsbLT5f7F8bJw4uMtSErrBYdo="; + sha256 = "sha256-VfEfxcewKo8D8kNsMuCvrLOZNl632ZIFyD+RG8qzjQ4="; }; vendorSha256 = null; From 4209fed914e4362f952f4fa6d88c1808aa3df7b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 20 Jul 2021 22:42:24 +0200 Subject: [PATCH 054/235] pythonPackages: deprecate pytestcov alias --- pkgs/applications/graphics/cq-editor/default.nix | 2 +- pkgs/applications/misc/buku/default.nix | 2 +- .../networking/instant-messengers/zulip-term/default.nix | 2 +- pkgs/applications/office/todoman/default.nix | 2 +- pkgs/development/compilers/vyper/default.nix | 2 +- pkgs/development/libraries/galario/default.nix | 2 +- pkgs/development/python-modules/APScheduler/default.nix | 4 ++-- pkgs/development/python-modules/aioftp/default.nix | 4 ++-- pkgs/development/python-modules/aiohttp-jinja2/default.nix | 4 ++-- pkgs/development/python-modules/aiohttp-remotes/default.nix | 4 ++-- pkgs/development/python-modules/aiostream/default.nix | 4 ++-- pkgs/development/python-modules/alembic/default.nix | 4 ++-- pkgs/development/python-modules/apprise/default.nix | 4 ++-- pkgs/development/python-modules/aria2p/default.nix | 4 ++-- pkgs/development/python-modules/arrow/2.nix | 4 ++-- pkgs/development/python-modules/atpublic/default.nix | 4 ++-- .../python-modules/backports_functools_lru_cache/default.nix | 4 ++-- pkgs/development/python-modules/capturer/default.nix | 2 +- pkgs/development/python-modules/cfn-flip/default.nix | 4 ++-- pkgs/development/python-modules/cftime/default.nix | 4 ++-- pkgs/development/python-modules/cheroot/default.nix | 4 ++-- pkgs/development/python-modules/cherrypy/17.nix | 4 ++-- pkgs/development/python-modules/cherrypy/default.nix | 4 ++-- pkgs/development/python-modules/clickclick/default.nix | 4 ++-- pkgs/development/python-modules/cookiecutter/default.nix | 4 ++-- pkgs/development/python-modules/cssselect2/default.nix | 4 ++-- pkgs/development/python-modules/dbus-next/default.nix | 4 ++-- pkgs/development/python-modules/diskcache/default.nix | 4 ++-- pkgs/development/python-modules/django-extensions/default.nix | 4 ++-- pkgs/development/python-modules/dockerfile-parse/default.nix | 4 ++-- pkgs/development/python-modules/dogpile.cache/default.nix | 4 ++-- pkgs/development/python-modules/dyn/default.nix | 4 ++-- pkgs/development/python-modules/easysnmp/default.nix | 4 ++-- pkgs/development/python-modules/flask-caching/default.nix | 4 ++-- pkgs/development/python-modules/flickrapi/default.nix | 4 ++-- pkgs/development/python-modules/flufl/lock.nix | 4 ++-- pkgs/development/python-modules/graspologic/default.nix | 4 ++-- pkgs/development/python-modules/gunicorn/19.nix | 4 ++-- pkgs/development/python-modules/gunicorn/default.nix | 4 ++-- pkgs/development/python-modules/hickle/default.nix | 4 ++-- pkgs/development/python-modules/httpcore/default.nix | 4 ++-- pkgs/development/python-modules/httpx/default.nix | 4 ++-- pkgs/development/python-modules/hyppo/default.nix | 4 ++-- .../development/python-modules/ibm-cloud-sdk-core/default.nix | 4 ++-- pkgs/development/python-modules/inquirer/default.nix | 4 ++-- pkgs/development/python-modules/iocapture/default.nix | 4 ++-- pkgs/development/python-modules/ipydatawidgets/default.nix | 4 ++-- pkgs/development/python-modules/jedi/default.nix | 4 ++-- pkgs/development/python-modules/jira/default.nix | 4 ++-- pkgs/development/python-modules/jsonlines/default.nix | 4 ++-- pkgs/development/python-modules/jupyterlab_server/default.nix | 2 +- pkgs/development/python-modules/keras/default.nix | 4 ++-- pkgs/development/python-modules/libais/default.nix | 4 ++-- pkgs/development/python-modules/m3u8/default.nix | 4 ++-- .../python-modules/markdownsuperscript/default.nix | 4 ++-- .../python-modules/marshmallow-polyfield/default.nix | 4 ++-- pkgs/development/python-modules/mne-python/default.nix | 4 ++-- pkgs/development/python-modules/multidict/default.nix | 4 ++-- pkgs/development/python-modules/mwclient/default.nix | 4 ++-- pkgs/development/python-modules/natsort/default.nix | 4 ++-- pkgs/development/python-modules/nbdime/default.nix | 4 ++-- pkgs/development/python-modules/nbval/default.nix | 4 ++-- pkgs/development/python-modules/nipype/default.nix | 4 ++-- .../python-modules/nix-prefetch-github/default.nix | 4 ++-- pkgs/development/python-modules/nplusone/default.nix | 4 ++-- .../python-modules/openapi-schema-validator/default.nix | 4 ++-- .../python-modules/openapi-spec-validator/default.nix | 4 ++-- pkgs/development/python-modules/orm/default.nix | 4 ++-- pkgs/development/python-modules/papermill/default.nix | 4 ++-- pkgs/development/python-modules/papis/default.nix | 4 ++-- pkgs/development/python-modules/periodictable/default.nix | 4 ++-- pkgs/development/python-modules/pglast/default.nix | 4 ++-- pkgs/development/python-modules/phonemizer/default.nix | 4 ++-- .../python-modules/plaster-pastedeploy/default.nix | 4 ++-- pkgs/development/python-modules/plaster/default.nix | 4 ++-- pkgs/development/python-modules/poetry/default.nix | 4 ++-- pkgs/development/python-modules/portalocker/default.nix | 2 +- pkgs/development/python-modules/portend/default.nix | 4 ++-- pkgs/development/python-modules/prance/default.nix | 4 ++-- pkgs/development/python-modules/property-manager/default.nix | 4 ++-- pkgs/development/python-modules/psautohint/default.nix | 4 ++-- .../python-modules/py-air-control-exporter/default.nix | 4 ++-- pkgs/development/python-modules/pycategories/default.nix | 4 ++-- pkgs/development/python-modules/pyls-mypy/default.nix | 4 ++-- pkgs/development/python-modules/pylti/default.nix | 4 ++-- .../python-modules/pytest-astropy-header/default.nix | 4 ++-- pkgs/development/python-modules/pytest-factoryboy/default.nix | 4 ++-- .../python-modules/pytest-filter-subpackage/default.nix | 4 ++-- pkgs/development/python-modules/pytest-shutil/default.nix | 4 ++-- pkgs/development/python-modules/pytest-timeout/default.nix | 4 ++-- pkgs/development/python-modules/pytest-virtualenv/default.nix | 4 ++-- pkgs/development/python-modules/python-hosts/default.nix | 4 ++-- .../python-modules/python-jsonrpc-server/default.nix | 4 ++-- .../python-modules/python-language-server/default.nix | 4 ++-- pkgs/development/python-modules/python-lz4/default.nix | 4 ++-- pkgs/development/python-modules/python-multipart/default.nix | 4 ++-- pkgs/development/python-modules/qcelemental/default.nix | 4 ++-- pkgs/development/python-modules/qcengine/default.nix | 4 ++-- pkgs/development/python-modules/rasterio/default.nix | 4 ++-- pkgs/development/python-modules/readchar/default.nix | 4 ++-- pkgs/development/python-modules/reikna/default.nix | 4 ++-- pkgs/development/python-modules/resampy/default.nix | 4 ++-- pkgs/development/python-modules/rising/default.nix | 4 ++-- pkgs/development/python-modules/runway-python/default.nix | 4 ++-- pkgs/development/python-modules/rxv/default.nix | 4 ++-- pkgs/development/python-modules/scikit-build/default.nix | 4 ++-- .../python-modules/scrapy-fake-useragent/default.nix | 4 ++-- pkgs/development/python-modules/skorch/default.nix | 4 ++-- pkgs/development/python-modules/softlayer/default.nix | 4 ++-- pkgs/development/python-modules/stripe/default.nix | 4 ++-- pkgs/development/python-modules/stups-cli-support/default.nix | 4 ++-- pkgs/development/python-modules/stups-fullstop/default.nix | 4 ++-- pkgs/development/python-modules/stups-pierone/default.nix | 4 ++-- pkgs/development/python-modules/stups-tokens/default.nix | 4 ++-- pkgs/development/python-modules/stups-zign/default.nix | 4 ++-- pkgs/development/python-modules/subliminal/default.nix | 4 ++-- pkgs/development/python-modules/sunpy/default.nix | 4 ++-- pkgs/development/python-modules/tablib/default.nix | 4 ++-- pkgs/development/python-modules/tempora/default.nix | 4 ++-- pkgs/development/python-modules/textwrap3/default.nix | 4 ++-- pkgs/development/python-modules/threadpoolctl/default.nix | 4 ++-- pkgs/development/python-modules/timezonefinder/default.nix | 4 ++-- pkgs/development/python-modules/tinycss2/default.nix | 4 ++-- pkgs/development/python-modules/toggl-cli/default.nix | 4 ++-- pkgs/development/python-modules/typer/default.nix | 4 ++-- pkgs/development/python-modules/typesentry/default.nix | 4 ++-- pkgs/development/python-modules/typesystem/default.nix | 4 ++-- pkgs/development/python-modules/uarray/default.nix | 4 ++-- pkgs/development/python-modules/venusian/default.nix | 4 ++-- pkgs/development/python-modules/weasyprint/default.nix | 4 ++-- pkgs/development/python-modules/word2vec/default.nix | 4 ++-- pkgs/development/python-modules/wordcloud/default.nix | 4 ++-- pkgs/development/tools/sourcetrail/jedi.nix | 4 ++-- pkgs/development/tools/vim-vint/default.nix | 2 +- pkgs/servers/dns/doh-proxy/default.nix | 2 +- pkgs/tools/admin/lexicon/default.nix | 2 +- pkgs/tools/admin/salt/pepper/default.nix | 2 +- pkgs/tools/backup/zfs-replicate/default.nix | 4 ++-- pkgs/tools/filesystems/gitfs/default.nix | 2 +- pkgs/tools/misc/bonfire/default.nix | 2 +- pkgs/tools/security/vulnix/default.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 3 +-- 143 files changed, 268 insertions(+), 268 deletions(-) diff --git a/pkgs/applications/graphics/cq-editor/default.nix b/pkgs/applications/graphics/cq-editor/default.nix index b9b2eb368735..33bae268c8a6 100644 --- a/pkgs/applications/graphics/cq-editor/default.nix +++ b/pkgs/applications/graphics/cq-editor/default.nix @@ -41,7 +41,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { pytest pytest-xvfb pytest-mock - pytestcov + pytest-cov pytest-repeat pytest-qt ]; diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index 68b4f7b3e560..c559e239c09e 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -12,7 +12,7 @@ with python3.pkgs; buildPythonApplication rec { }; checkInputs = [ - pytestcov + pytest-cov hypothesis pytest pylint diff --git a/pkgs/applications/networking/instant-messengers/zulip-term/default.nix b/pkgs/applications/networking/instant-messengers/zulip-term/default.nix index e97ea7bb65f5..b2f80c70d240 100644 --- a/pkgs/applications/networking/instant-messengers/zulip-term/default.nix +++ b/pkgs/applications/networking/instant-messengers/zulip-term/default.nix @@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication rec { glibcLocales ] ++ (with python3.pkgs; [ pytestCheckHook - pytestcov + pytest-cov pytest-mock ]); diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix index 5894c6c3e141..83bbc6cf53f9 100644 --- a/pkgs/applications/office/todoman/default.nix +++ b/pkgs/applications/office/todoman/default.nix @@ -45,7 +45,7 @@ buildPythonApplication rec { hypothesis pytest pytestrunner - pytestcov + pytest-cov glibcLocales ]; diff --git a/pkgs/development/compilers/vyper/default.nix b/pkgs/development/compilers/vyper/default.nix index d0bfa5b0b962..4bdad5f7c61c 100644 --- a/pkgs/development/compilers/vyper/default.nix +++ b/pkgs/development/compilers/vyper/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, writeText, asttokens -, pycryptodome, pytest_xdist, pytestcov, recommonmark, semantic-version, sphinx +, pycryptodome, pytest_xdist, pytest-cov, recommonmark, semantic-version, sphinx , sphinx_rtd_theme, pytestrunner }: let diff --git a/pkgs/development/libraries/galario/default.nix b/pkgs/development/libraries/galario/default.nix index 4e28f84bacdb..7fb93a61a0fe 100644 --- a/pkgs/development/libraries/galario/default.nix +++ b/pkgs/development/libraries/galario/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { pythonPackages.pytest ]; - checkInputs = lib.optional enablePython [ pythonPackages.scipy pythonPackages.pytestcov ]; + checkInputs = lib.optional enablePython [ pythonPackages.scipy pythonPackages.pytest-cov ]; preConfigure = '' mkdir -p build/external/src diff --git a/pkgs/development/python-modules/APScheduler/default.nix b/pkgs/development/python-modules/APScheduler/default.nix index 1a27c8c1f0fc..a4083707a072 100644 --- a/pkgs/development/python-modules/APScheduler/default.nix +++ b/pkgs/development/python-modules/APScheduler/default.nix @@ -6,7 +6,7 @@ , pytestCheckHook , pytest-asyncio , pytest-tornado -, pytestcov +, pytest-cov , sqlalchemy , tornado , twisted @@ -38,7 +38,7 @@ buildPythonPackage rec { pytest-asyncio pytest-tornado pytestCheckHook - pytestcov + pytest-cov sqlalchemy tornado twisted diff --git a/pkgs/development/python-modules/aioftp/default.nix b/pkgs/development/python-modules/aioftp/default.nix index e3ca13859acc..a610dba76614 100644 --- a/pkgs/development/python-modules/aioftp/default.nix +++ b/pkgs/development/python-modules/aioftp/default.nix @@ -4,7 +4,7 @@ , isPy27 , pytest , pytest-asyncio -, pytestcov +, pytest-cov , trustme , async-timeout }: @@ -22,7 +22,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytest-asyncio - pytestcov + pytest-cov trustme async-timeout ]; diff --git a/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/pkgs/development/python-modules/aiohttp-jinja2/default.nix index 0a939dfb0097..589aa14509e2 100644 --- a/pkgs/development/python-modules/aiohttp-jinja2/default.nix +++ b/pkgs/development/python-modules/aiohttp-jinja2/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, aiohttp, jinja2, pytest, pytest-aiohttp, pytestcov }: +{ lib, buildPythonPackage, fetchPypi, aiohttp, jinja2, pytest, pytest-aiohttp, pytest-cov }: buildPythonPackage rec { pname = "aiohttp-jinja2"; @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp jinja2 ]; - checkInputs = [ pytest pytest-aiohttp pytestcov ]; + checkInputs = [ pytest pytest-aiohttp pytest-cov ]; checkPhase = '' pytest -W ignore::DeprecationWarning diff --git a/pkgs/development/python-modules/aiohttp-remotes/default.nix b/pkgs/development/python-modules/aiohttp-remotes/default.nix index 8a8f7c4b3132..f3abbddfd957 100644 --- a/pkgs/development/python-modules/aiohttp-remotes/default.nix +++ b/pkgs/development/python-modules/aiohttp-remotes/default.nix @@ -1,5 +1,5 @@ { lib, fetchpatch, buildPythonPackage, fetchPypi -, aiohttp, pytest, pytestcov, pytest-aiohttp +, aiohttp, pytest, pytest-cov, pytest-aiohttp }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp ]; - checkInputs = [ pytest pytestcov pytest-aiohttp ]; + checkInputs = [ pytest pytest-cov pytest-aiohttp ]; checkPhase = '' python -m pytest ''; diff --git a/pkgs/development/python-modules/aiostream/default.nix b/pkgs/development/python-modules/aiostream/default.nix index 0bdab3bb2833..e15271bafdbc 100644 --- a/pkgs/development/python-modules/aiostream/default.nix +++ b/pkgs/development/python-modules/aiostream/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , pythonOlder , pytestCheckHook -, pytestcov +, pytest-cov , pytest-asyncio }: @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "1r3x9qwl08yscmzvhafc6gsmq84lr17s6p7a1qxr49cmdvjzsc13"; }; - checkInputs = [ pytestCheckHook pytestcov pytest-asyncio ]; + checkInputs = [ pytestCheckHook pytest-cov pytest-asyncio ]; meta = with lib; { description = "Generator-based operators for asynchronous iteration"; diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 81502a470a68..9c7244b3c066 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, pytest, pytestcov, mock, coverage, setuptools +, pytest, pytest-cov, mock, coverage, setuptools , Mako, sqlalchemy, python-editor, python-dateutil }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "a21fedebb3fb8f6bbbba51a11114f08c78709377051384c9c5ead5705ee93a51"; }; - buildInputs = [ pytest pytestcov mock coverage ]; + buildInputs = [ pytest pytest-cov mock coverage ]; propagatedBuildInputs = [ Mako sqlalchemy python-editor python-dateutil setuptools ]; # no traditional test suite diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index 61cfed3dbb9e..1bf5a93130dd 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, installShellFiles , Babel, requests, requests_oauthlib, six, click, markdown, pyyaml, cryptography -, pytestrunner, coverage, flake8, mock, pytestCheckHook, pytestcov, tox, gntp, sleekxmpp +, pytestrunner, coverage, flake8, mock, pytestCheckHook, pytest-cov, tox, gntp, sleekxmpp }: buildPythonPackage rec { @@ -19,7 +19,7 @@ buildPythonPackage rec { ]; checkInputs = [ - pytestrunner coverage flake8 mock pytestCheckHook pytestcov tox gntp sleekxmpp + pytestrunner coverage flake8 mock pytestCheckHook pytest-cov tox gntp sleekxmpp ]; disabledTests = [ "test_apprise_cli_nux_env" ]; diff --git a/pkgs/development/python-modules/aria2p/default.nix b/pkgs/development/python-modules/aria2p/default.nix index 9ea4fdf64b5b..4755c80e707c 100644 --- a/pkgs/development/python-modules/aria2p/default.nix +++ b/pkgs/development/python-modules/aria2p/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder -, aria2, poetry, pytest, pytestcov, pytest_xdist, responses +, aria2, poetry, pytest, pytest-cov, pytest_xdist, responses , asciimatics, loguru, requests, setuptools, websocket-client }: @@ -22,7 +22,7 @@ buildPythonPackage rec { export HOME=$TMPDIR ''; - checkInputs = [ aria2 responses pytest pytestcov pytest_xdist ]; + checkInputs = [ aria2 responses pytest pytest-cov pytest_xdist ]; # Tests are not all stable/deterministic, # they rely on actually running an aria2c daemon and communicating with it, diff --git a/pkgs/development/python-modules/arrow/2.nix b/pkgs/development/python-modules/arrow/2.nix index d87f1ede3ccd..88864ec78b77 100644 --- a/pkgs/development/python-modules/arrow/2.nix +++ b/pkgs/development/python-modules/arrow/2.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, isPy27 , nose, chai, simplejson, backports_functools_lru_cache -, python-dateutil, pytz, pytest-mock, sphinx, dateparser, pytestcov +, python-dateutil, pytz, pytest-mock, sphinx, dateparser, pytest-cov , pytestCheckHook }: @@ -19,7 +19,7 @@ buildPythonPackage rec { checkInputs = [ dateparser pytestCheckHook - pytestcov + pytest-cov pytest-mock pytz simplejson diff --git a/pkgs/development/python-modules/atpublic/default.nix b/pkgs/development/python-modules/atpublic/default.nix index 5f00955eef92..4d96bcbe26b5 100644 --- a/pkgs/development/python-modules/atpublic/default.nix +++ b/pkgs/development/python-modules/atpublic/default.nix @@ -1,6 +1,6 @@ { lib, isPy3k, pythonOlder, fetchPypi, buildPythonPackage , pytest -, pytestcov +, pytest-cov , sybil , typing-extensions }: @@ -20,7 +20,7 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest pytestcov sybil + pytest pytest-cov sybil ]; checkPhase = '' diff --git a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix index 586176300b7d..cb5665363f9c 100644 --- a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix +++ b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix @@ -6,7 +6,7 @@ , pytest , pytest-black , pytest-flake8 -, pytestcov +, pytest-cov }: buildPythonPackage rec { @@ -20,7 +20,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; - checkInputs = [ pytest pytest-flake8 pytest-black pytestcov ]; + checkInputs = [ pytest pytest-flake8 pytest-black pytest-cov ]; # ironically, they fail a linting test, and pytest.ini forces that test suite checkPhase = '' rm backports/functools_lru_cache.py diff --git a/pkgs/development/python-modules/capturer/default.nix b/pkgs/development/python-modules/capturer/default.nix index 0e8732f69a8f..02bdd0fc72ed 100644 --- a/pkgs/development/python-modules/capturer/default.nix +++ b/pkgs/development/python-modules/capturer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub, humanfriendly, pytestCheckHook, pytestcov }: +{ stdenv, lib, buildPythonPackage, fetchFromGitHub, humanfriendly, pytestCheckHook, pytest-cov }: buildPythonPackage rec { pname = "capturer"; diff --git a/pkgs/development/python-modules/cfn-flip/default.nix b/pkgs/development/python-modules/cfn-flip/default.nix index da04ecf68897..98d428cdbeba 100644 --- a/pkgs/development/python-modules/cfn-flip/default.nix +++ b/pkgs/development/python-modules/cfn-flip/default.nix @@ -5,7 +5,7 @@ # pythonPackages , click , pytest -, pytestcov +, pytest-cov , pytestrunner , pyyaml , six @@ -30,7 +30,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestcov + pytest-cov pytestrunner ]; diff --git a/pkgs/development/python-modules/cftime/default.nix b/pkgs/development/python-modules/cftime/default.nix index bec5f03cd88b..46fad656cabe 100644 --- a/pkgs/development/python-modules/cftime/default.nix +++ b/pkgs/development/python-modules/cftime/default.nix @@ -2,7 +2,7 @@ , fetchPypi , pytestCheckHook , coveralls -, pytestcov +, pytest-cov , cython , numpy , python @@ -20,7 +20,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook coveralls - pytestcov + pytest-cov ]; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 50f6d33791de..6e9256ffacfe 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -9,7 +9,7 @@ , portend , pyopenssl , pytestCheckHook -, pytestcov +, pytest-cov , pytest-mock , requests , requests-toolbelt @@ -46,7 +46,7 @@ buildPythonPackage rec { portend pyopenssl pytestCheckHook - pytestcov + pytest-cov pytest-mock requests requests-toolbelt diff --git a/pkgs/development/python-modules/cherrypy/17.nix b/pkgs/development/python-modules/cherrypy/17.nix index df50219fb170..82e878c83042 100644 --- a/pkgs/development/python-modules/cherrypy/17.nix +++ b/pkgs/development/python-modules/cherrypy/17.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildPythonPackage, fetchPypi , setuptools-scm , cheroot, contextlib2, portend, routes, six, zc_lockfile -, backports_unittest-mock, objgraph, pathpy, pytest, pytestcov, backports_functools_lru_cache, requests_toolbelt +, backports_unittest-mock, objgraph, pathpy, pytest, pytest-cov, backports_functools_lru_cache, requests_toolbelt }: buildPythonPackage rec { @@ -21,7 +21,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; checkInputs = [ - backports_unittest-mock objgraph pathpy pytest pytestcov backports_functools_lru_cache requests_toolbelt + backports_unittest-mock objgraph pathpy pytest pytest-cov backports_functools_lru_cache requests_toolbelt ]; checkPhase = '' diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 0b574e9114cf..b4fa2b8aeb45 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -2,7 +2,7 @@ , setuptools-scm , cheroot, portend, more-itertools, zc_lockfile, routes , jaraco_collections -, objgraph, pytest, pytestcov, pathpy, requests_toolbelt, pytest-services +, objgraph, pytest, pytest-cov, pathpy, requests_toolbelt, pytest-services , fetchpatch }: @@ -47,7 +47,7 @@ buildPythonPackage rec { ]; checkInputs = [ - objgraph pytest pytestcov pathpy requests_toolbelt pytest-services + objgraph pytest pytest-cov pathpy requests_toolbelt pytest-services ]; # Keyboard interrupt ends test suite run diff --git a/pkgs/development/python-modules/clickclick/default.nix b/pkgs/development/python-modules/clickclick/default.nix index d829f43dc0d1..8aeb73bb25b2 100644 --- a/pkgs/development/python-modules/clickclick/default.nix +++ b/pkgs/development/python-modules/clickclick/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy36, flake8, click, pyyaml, six, pytestCheckHook, pytestcov }: +{ lib, buildPythonPackage, fetchFromGitHub, isPy36, flake8, click, pyyaml, six, pytestCheckHook, pytest-cov }: buildPythonPackage rec { pname = "clickclick"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "1rij9ws9nhsmagiy1vclzliiqfkxi006rf65qvrw1k3sm2s8p5g0"; }; - checkInputs = [ pytestCheckHook pytestcov ]; + checkInputs = [ pytestCheckHook pytest-cov ]; propagatedBuildInputs = [ flake8 click pyyaml six ]; # test_cli asserts on exact quoting style of output diff --git a/pkgs/development/python-modules/cookiecutter/default.nix b/pkgs/development/python-modules/cookiecutter/default.nix index b2a13cdbb654..de42f7284112 100644 --- a/pkgs/development/python-modules/cookiecutter/default.nix +++ b/pkgs/development/python-modules/cookiecutter/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, isPyPy -, pytest, pytestcov, pytest-mock, freezegun +, pytest, pytest-cov, pytest-mock, freezegun , jinja2, future, binaryornot, click, whichcraft, poyo, jinja2_time, requests , python-slugify }: @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "sha256-a5pNcoguJDvgd6c5fQ8fdv5mzz35HzEV27UzDiFPpFc="; }; - checkInputs = [ pytest pytestcov pytest-mock freezegun ]; + checkInputs = [ pytest pytest-cov pytest-mock freezegun ]; propagatedBuildInputs = [ jinja2 future binaryornot click whichcraft poyo jinja2_time requests python-slugify ]; diff --git a/pkgs/development/python-modules/cssselect2/default.nix b/pkgs/development/python-modules/cssselect2/default.nix index eadc3eb32b1f..28e524a265ba 100644 --- a/pkgs/development/python-modules/cssselect2/default.nix +++ b/pkgs/development/python-modules/cssselect2/default.nix @@ -5,7 +5,7 @@ , tinycss2 , pytest , pytestrunner -, pytestcov +, pytest-cov , pytest-flake8 , pytest-isort }: @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ tinycss2 ]; - checkInputs = [ pytest pytestrunner pytestcov pytest-flake8 pytest-isort ]; + checkInputs = [ pytest pytestrunner pytest-cov pytest-flake8 pytest-isort ]; meta = with lib; { description = "CSS selectors for Python ElementTree"; diff --git a/pkgs/development/python-modules/dbus-next/default.nix b/pkgs/development/python-modules/dbus-next/default.nix index d7cf79f9d07c..ba27b633fefd 100644 --- a/pkgs/development/python-modules/dbus-next/default.nix +++ b/pkgs/development/python-modules/dbus-next/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , python -, dbus, dbus-python, pytest, pytestcov, pytest-asyncio, pytest-timeout +, dbus, dbus-python, pytest, pytest-cov, pytest-asyncio, pytest-timeout }: buildPythonPackage rec { @@ -20,7 +20,7 @@ buildPythonPackage rec { dbus dbus-python pytest - pytestcov + pytest-cov pytest-asyncio pytest-timeout ]; diff --git a/pkgs/development/python-modules/diskcache/default.nix b/pkgs/development/python-modules/diskcache/default.nix index ed6007f87ed2..50b1a94c7795 100644 --- a/pkgs/development/python-modules/diskcache/default.nix +++ b/pkgs/development/python-modules/diskcache/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook -, pytestcov +, pytest-cov , pytest_xdist , pytest-django , mock @@ -22,7 +22,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytestcov + pytest-cov pytest_xdist pytest-django mock diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix index 8ee903bedc2a..cbe5dfbaa70b 100644 --- a/pkgs/development/python-modules/django-extensions/default.nix +++ b/pkgs/development/python-modules/django-extensions/default.nix @@ -5,7 +5,7 @@ , mock , pygments , pytest -, pytestcov +, pytest-cov , pytest-django , python-dateutil , shortuuid @@ -40,7 +40,7 @@ buildPythonPackage rec { mock pygments # not explicitly declared in setup.py, but some tests require it pytest - pytestcov + pytest-cov pytest-django python-dateutil shortuuid diff --git a/pkgs/development/python-modules/dockerfile-parse/default.nix b/pkgs/development/python-modules/dockerfile-parse/default.nix index 7afe92b4337b..e9a31b461fd6 100644 --- a/pkgs/development/python-modules/dockerfile-parse/default.nix +++ b/pkgs/development/python-modules/dockerfile-parse/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, six, pytestcov, pytest }: +{ lib, buildPythonPackage, fetchPypi, six, pytest-cov, pytest }: buildPythonPackage rec { version = "1.2.0"; @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ pytestcov pytest ]; + checkInputs = [ pytest-cov pytest ]; meta = with lib; { description = "Python library for parsing Dockerfile files"; diff --git a/pkgs/development/python-modules/dogpile.cache/default.nix b/pkgs/development/python-modules/dogpile.cache/default.nix index 6e14355c2934..05eb173c5599 100644 --- a/pkgs/development/python-modules/dogpile.cache/default.nix +++ b/pkgs/development/python-modules/dogpile.cache/default.nix @@ -3,7 +3,7 @@ , fetchPypi , pythonOlder , pytest -, pytestcov +, pytest-cov , mock , Mako , decorator @@ -33,7 +33,7 @@ buildPythonPackage rec { pytest ''; - checkInputs = [ pytest pytestcov mock Mako ]; + checkInputs = [ pytest pytest-cov mock Mako ]; propagatedBuildInputs = [ decorator stevedore ]; diff --git a/pkgs/development/python-modules/dyn/default.nix b/pkgs/development/python-modules/dyn/default.nix index 7cddb324f3a1..72986e7bda1e 100644 --- a/pkgs/development/python-modules/dyn/default.nix +++ b/pkgs/development/python-modules/dyn/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, pytestcov, mock +{ lib, buildPythonPackage, fetchPypi, pytest, pytest-cov, mock , pytest_xdist, covCore, glibcLocales }: buildPythonPackage rec { @@ -14,7 +14,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestcov + pytest-cov mock pytest_xdist covCore diff --git a/pkgs/development/python-modules/easysnmp/default.nix b/pkgs/development/python-modules/easysnmp/default.nix index 11b13d8325a0..c55bf52a6643 100644 --- a/pkgs/development/python-modules/easysnmp/default.nix +++ b/pkgs/development/python-modules/easysnmp/default.nix @@ -5,7 +5,7 @@ , net-snmp , openssl , pytest -, pytestcov +, pytest-cov , pytest-flake8 , pytest-sugar , termcolor @@ -27,7 +27,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestcov + pytest-cov pytest-flake8 pytest-sugar termcolor diff --git a/pkgs/development/python-modules/flask-caching/default.nix b/pkgs/development/python-modules/flask-caching/default.nix index 708c5c351ea0..9fd80ac6d677 100644 --- a/pkgs/development/python-modules/flask-caching/default.nix +++ b/pkgs/development/python-modules/flask-caching/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27, flask, pytestCheckHook, pytestcov, pytest-xprocess, pytestcache }: +{ lib, buildPythonPackage, fetchPypi, isPy27, flask, pytestCheckHook, pytest-cov, pytest-xprocess, pytestcache }: buildPythonPackage rec { pname = "Flask-Caching"; @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ flask ]; - checkInputs = [ pytestCheckHook pytestcov pytest-xprocess pytestcache ]; + checkInputs = [ pytestCheckHook pytest-cov pytest-xprocess pytestcache ]; disabledTests = [ # backend_cache relies on pytest-cache, which is a stale package from 2013 diff --git a/pkgs/development/python-modules/flickrapi/default.nix b/pkgs/development/python-modules/flickrapi/default.nix index cfcc4d362997..73b7eea6e63a 100644 --- a/pkgs/development/python-modules/flickrapi/default.nix +++ b/pkgs/development/python-modules/flickrapi/default.nix @@ -6,7 +6,7 @@ , requests_oauthlib , pytest , pytestrunner -, pytestcov +, pytest-cov , responses }: @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests requests_toolbelt requests_oauthlib ]; - checkInputs = [ pytest pytestrunner pytestcov responses ]; + checkInputs = [ pytest pytestrunner pytest-cov responses ]; doCheck = false; # Otherwise: # ========================= no tests ran in 0.01 seconds ========================= # builder for '/nix/store/c8a58v6aa18zci08q2l53s12ywn8jqhq-python3.6-flickrapi-2.4.0.drv' failed with exit code 5 diff --git a/pkgs/development/python-modules/flufl/lock.nix b/pkgs/development/python-modules/flufl/lock.nix index ce2ead246f95..40ce524c6675 100644 --- a/pkgs/development/python-modules/flufl/lock.nix +++ b/pkgs/development/python-modules/flufl/lock.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, pytestCheckHook -, atpublic, psutil, pytestcov, sybil +, atpublic, psutil, pytest-cov, sybil }: buildPythonPackage rec { @@ -12,7 +12,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ atpublic psutil ]; - checkInputs = [ pytestCheckHook pytestcov sybil ]; + checkInputs = [ pytestCheckHook pytest-cov sybil ]; # disable code coverage checks for all OS. Upstream does not enforce these # checks on Darwin, and code coverage cannot be improved downstream nor is it diff --git a/pkgs/development/python-modules/graspologic/default.nix b/pkgs/development/python-modules/graspologic/default.nix index 758f988a2395..37ff849a3cb9 100644 --- a/pkgs/development/python-modules/graspologic/default.nix +++ b/pkgs/development/python-modules/graspologic/default.nix @@ -3,7 +3,7 @@ , isPy27 , fetchFromGitHub , pytestCheckHook -, pytestcov +, pytest-cov , hyppo , matplotlib , networkx @@ -36,7 +36,7 @@ buildPythonPackage rec { seaborn ]; - checkInputs = [ pytestCheckHook pytestcov ]; + checkInputs = [ pytestCheckHook pytest-cov ]; pytestFlagsArray = [ "tests" "--ignore=docs" "--ignore=tests/test_sklearn.py" ]; disabledTests = [ "gridplot_outputs" ]; diff --git a/pkgs/development/python-modules/gunicorn/19.nix b/pkgs/development/python-modules/gunicorn/19.nix index 7d43ce95a7e3..a7a418afa18c 100644 --- a/pkgs/development/python-modules/gunicorn/19.nix +++ b/pkgs/development/python-modules/gunicorn/19.nix @@ -2,7 +2,7 @@ , coverage , mock , pytest -, pytestcov +, pytest-cov , setuptools }: @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools ]; - checkInputs = [ pytest mock pytestcov coverage ]; + checkInputs = [ pytest mock pytest-cov coverage ]; prePatch = '' substituteInPlace requirements_test.txt --replace "==" ">=" \ diff --git a/pkgs/development/python-modules/gunicorn/default.nix b/pkgs/development/python-modules/gunicorn/default.nix index c1f36c20566f..ba948a68915a 100644 --- a/pkgs/development/python-modules/gunicorn/default.nix +++ b/pkgs/development/python-modules/gunicorn/default.nix @@ -2,7 +2,7 @@ , coverage , mock , pytest -, pytestcov +, pytest-cov , setuptools }: @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools ]; - checkInputs = [ pytest mock pytestcov coverage ]; + checkInputs = [ pytest mock pytest-cov coverage ]; prePatch = '' substituteInPlace requirements_test.txt --replace "==" ">=" \ diff --git a/pkgs/development/python-modules/hickle/default.nix b/pkgs/development/python-modules/hickle/default.nix index 1d6d6b39d043..0852ce4d4430 100644 --- a/pkgs/development/python-modules/hickle/default.nix +++ b/pkgs/development/python-modules/hickle/default.nix @@ -9,7 +9,7 @@ , pandas , codecov , pytest -, pytestcov +, pytest-cov , pytestrunner , coveralls , twine @@ -36,7 +36,7 @@ buildPythonPackage rec { doCheck = false; # incompatible with latest astropy checkInputs = [ - pytest pytestcov pytestrunner coveralls scipy pandas astropy twine check-manifest codecov + pytest pytest-cov pytestrunner coveralls scipy pandas astropy twine check-manifest codecov ]; pythonImportsCheck = [ "hickle" ]; diff --git a/pkgs/development/python-modules/httpcore/default.nix b/pkgs/development/python-modules/httpcore/default.nix index de2f9b00f538..c6c7b3372140 100644 --- a/pkgs/development/python-modules/httpcore/default.nix +++ b/pkgs/development/python-modules/httpcore/default.nix @@ -8,7 +8,7 @@ , pproxy , pytest-asyncio , pytestCheckHook -, pytestcov +, pytest-cov , sniffio , trio , trustme @@ -38,7 +38,7 @@ buildPythonPackage rec { pproxy pytest-asyncio pytestCheckHook - pytestcov + pytest-cov trio trustme uvicorn diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix index b45c3e85f502..e5db065defcd 100644 --- a/pkgs/development/python-modules/httpx/default.nix +++ b/pkgs/development/python-modules/httpx/default.nix @@ -11,7 +11,7 @@ , pytestCheckHook , pytest-asyncio , pytest-trio -, pytestcov +, pytest-cov , trustme , uvicorn }: @@ -41,7 +41,7 @@ buildPythonPackage rec { pytestCheckHook pytest-asyncio pytest-trio - pytestcov + pytest-cov trustme uvicorn ]; diff --git a/pkgs/development/python-modules/hyppo/default.nix b/pkgs/development/python-modules/hyppo/default.nix index 9fdeca082b2f..8dcca1983ba3 100644 --- a/pkgs/development/python-modules/hyppo/default.nix +++ b/pkgs/development/python-modules/hyppo/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , isPy27 , fetchFromGitHub -, pytestCheckHook , pytestcov , numba +, pytestCheckHook , pytest-cov , numba , numpy , scikit-learn , scipy @@ -30,7 +30,7 @@ buildPythonPackage rec { scipy ]; - checkInputs = [ pytestCheckHook pytestcov matplotlib seaborn ]; + checkInputs = [ pytestCheckHook pytest-cov matplotlib seaborn ]; disabledTestPaths = [ "docs" "benchmarks" diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index a63617ba2a2a..8e7f4832c254 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -5,7 +5,7 @@ , pyjwt , pylint , pytestCheckHook -, pytestcov +, pytest-cov , python-dateutil , requests , responses @@ -25,7 +25,7 @@ buildPythonPackage rec { codecov pylint pytestCheckHook - pytestcov + pytest-cov responses tox ]; diff --git a/pkgs/development/python-modules/inquirer/default.nix b/pkgs/development/python-modules/inquirer/default.nix index e55fd8f39d55..84e381f0b8c8 100644 --- a/pkgs/development/python-modules/inquirer/default.nix +++ b/pkgs/development/python-modules/inquirer/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, python-editor, readchar, blessed, pytest, pytestcov, pexpect, pytest-mock }: +{ lib, buildPythonPackage, fetchFromGitHub, python-editor, readchar, blessed, pytest, pytest-cov, pexpect, pytest-mock }: buildPythonPackage rec { pname = "inquirer"; @@ -20,7 +20,7 @@ buildPythonPackage rec { --replace "readchar==2.0.1" "readchar>=2.0.0" ''; - checkInputs = [ pytest pytestcov pexpect pytest-mock ]; + checkInputs = [ pytest pytest-cov pexpect pytest-mock ]; checkPhase = '' pytest --cov-report=term-missing --cov inquirer --no-cov-on-fail tests/unit tests/integration diff --git a/pkgs/development/python-modules/iocapture/default.nix b/pkgs/development/python-modules/iocapture/default.nix index 0f0466c8b3eb..cc56f8d0bdea 100644 --- a/pkgs/development/python-modules/iocapture/default.nix +++ b/pkgs/development/python-modules/iocapture/default.nix @@ -3,7 +3,7 @@ , fetchPypi , flexmock , pytest -, pytestcov +, pytest-cov , six }: @@ -19,7 +19,7 @@ buildPythonPackage rec { checkInputs = [ flexmock pytest - pytestcov + pytest-cov six ]; diff --git a/pkgs/development/python-modules/ipydatawidgets/default.nix b/pkgs/development/python-modules/ipydatawidgets/default.nix index a0efa9b575db..3f8811f4f3b4 100644 --- a/pkgs/development/python-modules/ipydatawidgets/default.nix +++ b/pkgs/development/python-modules/ipydatawidgets/default.nix @@ -3,7 +3,7 @@ , fetchPypi , isPy27 , pytest -, pytestcov +, pytest-cov , nbval , ipywidgets , numpy @@ -29,7 +29,7 @@ buildPythonPackage rec { traittypes ]; - checkInputs = [ pytest pytestcov nbval ]; + checkInputs = [ pytest pytest-cov nbval ]; checkPhase = "pytest ipydatawidgets/tests"; diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index 305b9f6c6b6b..0dba5e8f192c 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }: +{ lib, buildPythonPackage, fetchFromGitHub, fetchPypi, pytest, glibcLocales, tox, pytest-cov, parso }: buildPythonPackage rec { pname = "jedi"; @@ -14,7 +14,7 @@ buildPythonPackage rec { fetchSubmodules = true; }; - checkInputs = [ pytest glibcLocales tox pytestcov ]; + checkInputs = [ pytest glibcLocales tox pytest-cov ]; propagatedBuildInputs = [ parso ]; diff --git a/pkgs/development/python-modules/jira/default.nix b/pkgs/development/python-modules/jira/default.nix index 78aaadf690e2..7507789fd533 100644 --- a/pkgs/development/python-modules/jira/default.nix +++ b/pkgs/development/python-modules/jira/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, isPy3k -, pytest, pytestrunner, pbr, glibcLocales , pytestcov +, pytest, pytestrunner, pbr, glibcLocales , pytest-cov , requests, requests_oauthlib, requests_toolbelt, defusedxml , ipython }: @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "e2a94adff98e45b29ded030adc76103eab34fa7d4d57303f211f572bedba0e93"; }; - buildInputs = [ glibcLocales pytest pytestcov pytestrunner pbr ]; + buildInputs = [ glibcLocales pytest pytest-cov pytestrunner pbr ]; propagatedBuildInputs = [ requests requests_oauthlib requests_toolbelt defusedxml pbr ipython ]; # impure tests because of connectivity attempts to jira servers diff --git a/pkgs/development/python-modules/jsonlines/default.nix b/pkgs/development/python-modules/jsonlines/default.nix index 82ddb3bf23a7..d16fa89a97c4 100644 --- a/pkgs/development/python-modules/jsonlines/default.nix +++ b/pkgs/development/python-modules/jsonlines/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, buildPythonPackage, six -, flake8, pep8-naming, pytest, pytestcov }: +, flake8, pep8-naming, pytest, pytest-cov }: buildPythonPackage rec { pname = "jsonlines"; @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ flake8 pep8-naming pytest pytestcov ]; + checkInputs = [ flake8 pep8-naming pytest pytest-cov ]; checkPhase = '' pytest ''; diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix index 7f1a729b5b1a..f3f2b9dc32c1 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -10,7 +10,7 @@ , jupyter_server , openapi-core , pytest-tornasync -, pytestcov +, pytest-cov , ruamel-yaml , strict-rfc3339 }: diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index e90dd1a806aa..b6ac0a1fa132 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, pytest, pytestcov, pytest_xdist +, pytest, pytest-cov, pytest_xdist , six, numpy, scipy, pyyaml, h5py , keras-applications, keras-preprocessing }: @@ -15,7 +15,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestcov + pytest-cov pytest_xdist ]; diff --git a/pkgs/development/python-modules/libais/default.nix b/pkgs/development/python-modules/libais/default.nix index 33710c6682dc..36918a484c3e 100644 --- a/pkgs/development/python-modules/libais/default.nix +++ b/pkgs/development/python-modules/libais/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, - six, pytest, pytestrunner, pytestcov, coverage + six, pytest, pytestrunner, pytest-cov, coverage }: buildPythonPackage rec { pname = "libais"; @@ -13,7 +13,7 @@ buildPythonPackage rec { # data files missing doCheck = false; - checkInputs = [ pytest pytestrunner pytestcov coverage ]; + checkInputs = [ pytest pytestrunner pytest-cov coverage ]; propagatedBuildInputs = [ six ]; meta = with lib; { diff --git a/pkgs/development/python-modules/m3u8/default.nix b/pkgs/development/python-modules/m3u8/default.nix index 01ff1458c0fa..decad482bef1 100644 --- a/pkgs/development/python-modules/m3u8/default.nix +++ b/pkgs/development/python-modules/m3u8/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, python, fetchFromGitHub, requests, iso8601, bottle, pytest, pytestcov }: +{ lib, buildPythonPackage, python, fetchFromGitHub, requests, iso8601, bottle, pytest, pytest-cov }: buildPythonPackage rec { pname = "m3u8"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "0cmg993icpsa1b19kljxvjwhs167bsqrs0ad4wnwsi8qq6na5d4p"; }; - checkInputs = [ bottle pytest pytestcov ]; + checkInputs = [ bottle pytest pytest-cov ]; checkPhase = '' pytest tests/test_{parser,model,variant_m3u8}.py diff --git a/pkgs/development/python-modules/markdownsuperscript/default.nix b/pkgs/development/python-modules/markdownsuperscript/default.nix index 94cfb637a15e..a7876a75e495 100644 --- a/pkgs/development/python-modules/markdownsuperscript/default.nix +++ b/pkgs/development/python-modules/markdownsuperscript/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, markdown, - pytest, pytestrunner, pytestcov, coverage }: + pytest, pytestrunner, pytest-cov, coverage }: buildPythonPackage rec { pname = "MarkdownSuperscript"; @@ -20,7 +20,7 @@ buildPythonPackage rec { sed 's/=.*//' -i requirements/*.txt ''; - checkInputs = [ pytest pytestrunner pytestcov coverage ]; + checkInputs = [ pytest pytestrunner pytest-cov coverage ]; meta = with lib; { description = "An extension to the Python Markdown package enabling superscript text"; diff --git a/pkgs/development/python-modules/marshmallow-polyfield/default.nix b/pkgs/development/python-modules/marshmallow-polyfield/default.nix index e3b629b3034e..aa2784cd1dbb 100644 --- a/pkgs/development/python-modules/marshmallow-polyfield/default.nix +++ b/pkgs/development/python-modules/marshmallow-polyfield/default.nix @@ -4,7 +4,7 @@ , marshmallow # Check Inputs , pytestCheckHook -, pytestcov +, pytest-cov }: buildPythonPackage rec { @@ -23,7 +23,7 @@ buildPythonPackage rec { ]; # setuptools check can run, but won't find tests - checkInputs = [ pytestCheckHook pytestcov ]; + checkInputs = [ pytestCheckHook pytest-cov ]; meta = with lib; { description = "An unofficial extension to Marshmallow to allow for polymorphic fields"; diff --git a/pkgs/development/python-modules/mne-python/default.nix b/pkgs/development/python-modules/mne-python/default.nix index 77e6f9c24685..2dfe06d51770 100644 --- a/pkgs/development/python-modules/mne-python/default.nix +++ b/pkgs/development/python-modules/mne-python/default.nix @@ -5,7 +5,7 @@ , numpy , scipy , pytestCheckHook -, pytestcov +, pytest-cov , pytest-timeout , h5py , matplotlib @@ -34,7 +34,7 @@ buildPythonPackage rec { doCheck = false; checkInputs = [ pytestCheckHook - pytestcov + pytest-cov pytest-timeout h5py matplotlib diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index 555011a314d9..10cbc58eb8d8 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -1,7 +1,7 @@ { lib , fetchPypi , buildPythonPackage -, pytestCheckHook, pytestrunner, pytestcov +, pytestCheckHook, pytestrunner, pytest-cov , isPy3k }: @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "25b4e5f22d3a37ddf3effc0710ba692cfc792c2b9edfb9c05aefe823256e84d5"; }; - checkInputs = [ pytestCheckHook pytestrunner pytestcov ]; + checkInputs = [ pytestCheckHook pytestrunner pytest-cov ]; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/mwclient/default.nix b/pkgs/development/python-modules/mwclient/default.nix index 2eed1eefeec8..bffc4247632d 100644 --- a/pkgs/development/python-modules/mwclient/default.nix +++ b/pkgs/development/python-modules/mwclient/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub , requests, requests_oauthlib, six -, pytest, pytestcache, pytestcov, responses, mock +, pytest, pytestcache, pytest-cov, responses, mock }: buildPythonPackage rec { @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "120snnsh9n5svfwkyj1w9jrxf99jnqm0jk282yypd3lpyca1l9hj"; }; - checkInputs = [ pytest pytestcache pytestcov responses mock ]; + checkInputs = [ pytest pytestcache pytest-cov responses mock ]; propagatedBuildInputs = [ requests requests_oauthlib six ]; diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix index d475f21fcb51..e7a2a6808a8a 100644 --- a/pkgs/development/python-modules/natsort/default.nix +++ b/pkgs/development/python-modules/natsort/default.nix @@ -3,7 +3,7 @@ , pythonOlder , fetchPypi , pytest -, pytestcov +, pytest-cov , pytest-mock , hypothesis , glibcLocales @@ -17,7 +17,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestcov + pytest-cov pytest-mock hypothesis glibcLocales diff --git a/pkgs/development/python-modules/nbdime/default.nix b/pkgs/development/python-modules/nbdime/default.nix index 221915efca03..96fc94d43e85 100644 --- a/pkgs/development/python-modules/nbdime/default.nix +++ b/pkgs/development/python-modules/nbdime/default.nix @@ -5,7 +5,7 @@ , attrs , py , setuptools -, pytestcov +, pytest-cov , pytest-timeout , pytest-tornado , mock @@ -34,7 +34,7 @@ buildPythonPackage rec { checkInputs = [ hypothesis - pytestcov + pytest-cov pytest-timeout pytest-tornado jsonschema diff --git a/pkgs/development/python-modules/nbval/default.nix b/pkgs/development/python-modules/nbval/default.nix index b9a336f7fbe9..176986492555 100644 --- a/pkgs/development/python-modules/nbval/default.nix +++ b/pkgs/development/python-modules/nbval/default.nix @@ -11,7 +11,7 @@ , glibcLocales , matplotlib , sympy -, pytestcov +, pytest-cov }: buildPythonPackage rec { @@ -27,7 +27,7 @@ buildPythonPackage rec { pytestCheckHook matplotlib sympy - pytestcov + pytest-cov ]; buildInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 078c455a6373..7ecba3b7d3b1 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -26,7 +26,7 @@ , simplejson , traits , xvfbwrapper -, pytestcov +, pytest-cov , codecov , sphinx # other dependencies @@ -94,7 +94,7 @@ buildPythonPackage rec { pytest pytest-forked pytest_xdist - pytestcov + pytest-cov which ]; diff --git a/pkgs/development/python-modules/nix-prefetch-github/default.nix b/pkgs/development/python-modules/nix-prefetch-github/default.nix index 597b6814281f..0821e0b763d0 100644 --- a/pkgs/development/python-modules/nix-prefetch-github/default.nix +++ b/pkgs/development/python-modules/nix-prefetch-github/default.nix @@ -6,7 +6,7 @@ , effect , git , pytestCheckHook -, pytestcov +, pytest-cov , pythonOlder }: @@ -29,7 +29,7 @@ buildPythonPackage rec { effect ]; - checkInputs = [ pytestCheckHook pytestcov git ]; + checkInputs = [ pytestCheckHook pytest-cov git ]; # ignore tests which are impure disabledTests = [ "network" "requires_nix_build" ]; diff --git a/pkgs/development/python-modules/nplusone/default.nix b/pkgs/development/python-modules/nplusone/default.nix index c2f484cb3a92..7d29428d93e6 100644 --- a/pkgs/development/python-modules/nplusone/default.nix +++ b/pkgs/development/python-modules/nplusone/default.nix @@ -1,5 +1,5 @@ { blinker, buildPythonPackage, fetchFromGitHub, lib, isPy27, six, mock, pytest -, webtest, pytestcov, pytest-django, pytest-pythonpath, flake8, sqlalchemy +, webtest, pytest-cov, pytest-django, pytest-pythonpath, flake8, sqlalchemy , flask_sqlalchemy, peewee }: buildPythonPackage rec { @@ -31,7 +31,7 @@ buildPythonPackage rec { mock pytest webtest - pytestcov + pytest-cov pytest-django pytest-pythonpath flake8 diff --git a/pkgs/development/python-modules/openapi-schema-validator/default.nix b/pkgs/development/python-modules/openapi-schema-validator/default.nix index f09a42ddd69b..18e357c1f2d2 100644 --- a/pkgs/development/python-modules/openapi-schema-validator/default.nix +++ b/pkgs/development/python-modules/openapi-schema-validator/default.nix @@ -5,7 +5,7 @@ , isodate , jsonschema , pytest-flake8 -, pytestcov +, pytest-cov , rfc3339-validator , six , strict-rfc3339 @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ isodate jsonschema six strict-rfc3339 rfc3339-validator ]; - checkInputs = [ pytestCheckHook pytestcov pytest-flake8 ]; + checkInputs = [ pytestCheckHook pytest-cov pytest-flake8 ]; pythonImportsCheck = [ "openapi_schema_validator" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/openapi-spec-validator/default.nix b/pkgs/development/python-modules/openapi-spec-validator/default.nix index b431ef507525..4e61a86a5013 100644 --- a/pkgs/development/python-modules/openapi-spec-validator/default.nix +++ b/pkgs/development/python-modules/openapi-spec-validator/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, isPy27, fetchPypi , jsonschema, openapi-schema-validator, pyyaml, six, pathlib -, mock, pytest, pytestcov, pytest-flake8, tox, setuptools }: +, mock, pytest, pytest-cov, pytest-flake8, tox, setuptools }: buildPythonPackage rec { pname = "openapi-spec-validator"; @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jsonschema openapi-schema-validator pyyaml six setuptools ] ++ (lib.optionals (isPy27) [ pathlib ]); - checkInputs = [ mock pytest pytestcov pytest-flake8 tox ]; + checkInputs = [ mock pytest pytest-cov pytest-flake8 tox ]; meta = with lib; { homepage = "https://github.com/p1c2u/openapi-spec-validator"; diff --git a/pkgs/development/python-modules/orm/default.nix b/pkgs/development/python-modules/orm/default.nix index 872a54076125..f2dd196be942 100644 --- a/pkgs/development/python-modules/orm/default.nix +++ b/pkgs/development/python-modules/orm/default.nix @@ -5,7 +5,7 @@ , typesystem , aiosqlite , pytestCheckHook -, pytestcov +, pytest-cov , typing-extensions }: @@ -28,7 +28,7 @@ buildPythonPackage rec { checkInputs = [ aiosqlite pytestCheckHook - pytestcov + pytest-cov typing-extensions ]; diff --git a/pkgs/development/python-modules/papermill/default.nix b/pkgs/development/python-modules/papermill/default.nix index 9af09d569466..5b9a6d8e968b 100644 --- a/pkgs/development/python-modules/papermill/default.nix +++ b/pkgs/development/python-modules/papermill/default.nix @@ -19,7 +19,7 @@ , backports_tempfile , isPy27 , pytest -, pytestcov +, pytest-cov , pytest-mock }: @@ -54,7 +54,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestcov + pytest-cov pytest-mock ]; diff --git a/pkgs/development/python-modules/papis/default.nix b/pkgs/development/python-modules/papis/default.nix index 3e7c6ae00116..72eb9a185d7a 100644 --- a/pkgs/development/python-modules/papis/default.nix +++ b/pkgs/development/python-modules/papis/default.nix @@ -3,7 +3,7 @@ , pyyaml, chardet, beautifulsoup4, colorama, bibtexparser , click, python-slugify, habanero, isbnlib, typing-extensions , prompt_toolkit, pygments, stevedore, tqdm, lxml -, python-doi, isPy3k, pytestcov +, python-doi, isPy3k, pytest-cov #, optional, dependencies , whoosh, pytest , stdenv @@ -43,7 +43,7 @@ buildPythonPackage rec { doCheck = !stdenv.isDarwin; checkInputs = ([ - pytest pytestcov + pytest pytest-cov ]) ++ [ xdg-utils ]; diff --git a/pkgs/development/python-modules/periodictable/default.nix b/pkgs/development/python-modules/periodictable/default.nix index 783d85b6c08c..7c08468c03f4 100644 --- a/pkgs/development/python-modules/periodictable/default.nix +++ b/pkgs/development/python-modules/periodictable/default.nix @@ -1,4 +1,4 @@ -{lib, fetchPypi, buildPythonPackage, numpy, pyparsing, pytestcov, pytestCheckHook }: +{lib, fetchPypi, buildPythonPackage, numpy, pyparsing, pytest-cov, pytestCheckHook }: buildPythonPackage rec { pname = "periodictable"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "52e925220005c20e97601e7b04ad6cebc271680947ab9adcbb1a796ddbaa0f23"; }; - checkInputs = [ pytestcov pytestCheckHook ]; + checkInputs = [ pytest-cov pytestCheckHook ]; meta = { homepage = "https://www.reflectometry.org/danse/software.html"; diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix index 6a0f8940788c..8184c6d0d18a 100644 --- a/pkgs/development/python-modules/pglast/default.nix +++ b/pkgs/development/python-modules/pglast/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , isPy3k , setuptools -, pytestcov +, pytest-cov , pytest }: @@ -24,7 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools ]; - checkInputs = [ pytest pytestcov ]; + checkInputs = [ pytest pytest-cov ]; pythonImportsCheck = [ "pglast" ]; diff --git a/pkgs/development/python-modules/phonemizer/default.nix b/pkgs/development/python-modules/phonemizer/default.nix index 8eab09046dc2..54a816643818 100644 --- a/pkgs/development/python-modules/phonemizer/default.nix +++ b/pkgs/development/python-modules/phonemizer/default.nix @@ -7,7 +7,7 @@ , attrs , espeak-ng , pytestCheckHook -, pytestcov +, pytest-cov }: buildPythonApplication rec { @@ -45,7 +45,7 @@ buildPythonApplication rec { checkInputs = [ pytestCheckHook - pytestcov + pytest-cov ]; # We tried to package festvial, but were unable to get the backend running, diff --git a/pkgs/development/python-modules/plaster-pastedeploy/default.nix b/pkgs/development/python-modules/plaster-pastedeploy/default.nix index 262bdceb5db7..75bc033807f6 100644 --- a/pkgs/development/python-modules/plaster-pastedeploy/default.nix +++ b/pkgs/development/python-modules/plaster-pastedeploy/default.nix @@ -1,6 +1,6 @@ { buildPythonPackage, fetchPypi, fetchpatch , plaster, PasteDeploy -, pytest, pytestcov +, pytest, pytest-cov }: buildPythonPackage rec { @@ -26,5 +26,5 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ plaster PasteDeploy ]; - checkInputs = [ pytest pytestcov ]; + checkInputs = [ pytest pytest-cov ]; } diff --git a/pkgs/development/python-modules/plaster/default.nix b/pkgs/development/python-modules/plaster/default.nix index 82aaebb10039..749ffdb7f321 100644 --- a/pkgs/development/python-modules/plaster/default.nix +++ b/pkgs/development/python-modules/plaster/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, fetchPypi -, pytest, pytestcov +, pytest, pytest-cov }: buildPythonPackage rec { @@ -15,5 +15,5 @@ buildPythonPackage rec { py.test ''; - checkInputs = [ pytest pytestcov ]; + checkInputs = [ pytest pytest-cov ]; } diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix index c37c428805eb..7287797ef331 100644 --- a/pkgs/development/python-modules/poetry/default.nix +++ b/pkgs/development/python-modules/poetry/default.nix @@ -13,7 +13,7 @@ , pkginfo , poetry-core , pytestCheckHook -, pytestcov +, pytest-cov , pytest-mock , requests , requests-toolbelt @@ -71,7 +71,7 @@ buildPythonPackage rec { "$out/bin/poetry" completions fish > "$out/share/fish/vendor_completions.d/poetry.fish" ''; - checkInputs = [ pytestCheckHook httpretty pytest-mock pytestcov ]; + checkInputs = [ pytestCheckHook httpretty pytest-mock pytest-cov ]; preCheck = "export HOME=$TMPDIR"; disabledTests = [ # touches network diff --git a/pkgs/development/python-modules/portalocker/default.nix b/pkgs/development/python-modules/portalocker/default.nix index 7b4fc177bc11..8b642240f9cb 100644 --- a/pkgs/development/python-modules/portalocker/default.nix +++ b/pkgs/development/python-modules/portalocker/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi , pytestCheckHook -, pytestcov +, pytest-cov , pytest-flake8 , pytest-mypy , redis diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix index da27dd3cd922..d48f387400e4 100644 --- a/pkgs/development/python-modules/portend/default.nix +++ b/pkgs/development/python-modules/portend/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, pytest, setuptools-scm, tempora, pytest-black, pytestcov }: +, pytest, setuptools-scm, tempora, pytest-black, pytest-cov }: buildPythonPackage rec { pname = "portend"; @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ tempora ]; - checkInputs = [ pytest pytest-black pytestcov ]; + checkInputs = [ pytest pytest-black pytest-cov ]; checkPhase = '' py.test --deselect=test_portend.py::TestChecker::test_check_port_listening diff --git a/pkgs/development/python-modules/prance/default.nix b/pkgs/development/python-modules/prance/default.nix index b13808f1a9db..783c936cf2d1 100644 --- a/pkgs/development/python-modules/prance/default.nix +++ b/pkgs/development/python-modules/prance/default.nix @@ -7,7 +7,7 @@ , six , semver , pytestCheckHook -, pytestcov +, pytest-cov , pytestrunner , openapi-spec-validator }: @@ -35,7 +35,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytestcov + pytest-cov openapi-spec-validator ]; diff --git a/pkgs/development/python-modules/property-manager/default.nix b/pkgs/development/python-modules/property-manager/default.nix index ad47163e4842..f50f9625fd96 100644 --- a/pkgs/development/python-modules/property-manager/default.nix +++ b/pkgs/development/python-modules/property-manager/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, humanfriendly, verboselogs, coloredlogs, pytest, pytestcov }: +{ lib, buildPythonPackage, fetchFromGitHub, humanfriendly, verboselogs, coloredlogs, pytest, pytest-cov }: buildPythonPackage rec { pname = "property-manager"; @@ -12,7 +12,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ coloredlogs humanfriendly verboselogs ]; - checkInputs = [ pytest pytestcov ]; + checkInputs = [ pytest pytest-cov ]; meta = with lib; { description = "Useful property variants for Python programming"; diff --git a/pkgs/development/python-modules/psautohint/default.nix b/pkgs/development/python-modules/psautohint/default.nix index 01b249e1c77f..3a720bf328f3 100644 --- a/pkgs/development/python-modules/psautohint/default.nix +++ b/pkgs/development/python-modules/psautohint/default.nix @@ -2,7 +2,7 @@ , fonttools , lxml, fs # for fonttools extras , setuptools-scm -, pytestCheckHook, pytestcov, pytest_xdist +, pytestCheckHook, pytest-cov, pytest_xdist }: buildPythonPackage rec { @@ -31,7 +31,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytestcov + pytest-cov pytest_xdist ]; disabledTests = [ diff --git a/pkgs/development/python-modules/py-air-control-exporter/default.nix b/pkgs/development/python-modules/py-air-control-exporter/default.nix index 2f494dcb7002..c333c3ea4fd1 100644 --- a/pkgs/development/python-modules/py-air-control-exporter/default.nix +++ b/pkgs/development/python-modules/py-air-control-exporter/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, fetchPypi, flask, isPy27, lib, nixosTests -, prometheus_client, py-air-control, pytestCheckHook, pytestcov, pytestrunner +, prometheus_client, py-air-control, pytestCheckHook, pytest-cov, pytestrunner , setuptools-scm }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ setuptools-scm ]; - checkInputs = [ pytestCheckHook pytestcov pytestrunner ]; + checkInputs = [ pytestCheckHook pytest-cov pytestrunner ]; propagatedBuildInputs = [ flask prometheus_client py-air-control ]; passthru.tests = { inherit (nixosTests.prometheus-exporters) py-air-control; }; diff --git a/pkgs/development/python-modules/pycategories/default.nix b/pkgs/development/python-modules/pycategories/default.nix index 55f30f9e55a9..48686225e1ef 100644 --- a/pkgs/development/python-modules/pycategories/default.nix +++ b/pkgs/development/python-modules/pycategories/default.nix @@ -1,6 +1,6 @@ { buildPythonPackage , callPackage -, pytestcov +, pytest-cov , fetchPypi , lib , pytest @@ -24,7 +24,7 @@ buildPythonPackage rec { # and shouldn't be used in production code propagatedBuildInputs = [ (callPackage ./infix.nix { }) ]; - checkInputs = [ pytest pytestcov ]; + checkInputs = [ pytest pytest-cov ]; meta = with lib; { homepage = "https://gitlab.com/danielhones/pycategories"; diff --git a/pkgs/development/python-modules/pyls-mypy/default.nix b/pkgs/development/python-modules/pyls-mypy/default.nix index f919ac21cb7b..acce4469eed4 100644 --- a/pkgs/development/python-modules/pyls-mypy/default.nix +++ b/pkgs/development/python-modules/pyls-mypy/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub, isPy27 , future, python-language-server, mypy, configparser -, pytestCheckHook, mock, pytestcov, coverage +, pytestCheckHook, mock, pytest-cov, coverage , fetchpatch }: @@ -34,7 +34,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ mock pytestcov coverage pytestCheckHook ]; + checkInputs = [ mock pytest-cov coverage pytestCheckHook ]; propagatedBuildInputs = [ mypy python-language-server configparser diff --git a/pkgs/development/python-modules/pylti/default.nix b/pkgs/development/python-modules/pylti/default.nix index a6778a4aa7e8..80fa5bff3200 100644 --- a/pkgs/development/python-modules/pylti/default.nix +++ b/pkgs/development/python-modules/pylti/default.nix @@ -11,7 +11,7 @@ , pyflakes , pytest , pytestcache -, pytestcov +, pytest-cov , covCore , pytest-flakes , sphinx @@ -33,7 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ httplib2 oauth oauth2 semantic-version ]; checkInputs = [ - flask httpretty oauthlib pyflakes pytest pytestcache pytestcov covCore + flask httpretty oauthlib pyflakes pytest pytestcache pytest-cov covCore pytest-flakes sphinx mock chalice ]; diff --git a/pkgs/development/python-modules/pytest-astropy-header/default.nix b/pkgs/development/python-modules/pytest-astropy-header/default.nix index 963e621986cf..acc555035822 100644 --- a/pkgs/development/python-modules/pytest-astropy-header/default.nix +++ b/pkgs/development/python-modules/pytest-astropy-header/default.nix @@ -3,7 +3,7 @@ , fetchPypi , fetchpatch , pytest -, pytestcov +, pytest-cov , pytestCheckHook , numpy , astropy @@ -37,7 +37,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytestcov + pytest-cov numpy scipy h5py diff --git a/pkgs/development/python-modules/pytest-factoryboy/default.nix b/pkgs/development/python-modules/pytest-factoryboy/default.nix index 39d6bc127e6b..eea6c61a7274 100644 --- a/pkgs/development/python-modules/pytest-factoryboy/default.nix +++ b/pkgs/development/python-modules/pytest-factoryboy/default.nix @@ -7,7 +7,7 @@ , pytest , pytestcache , pytestCheckHook -, pytestcov +, pytest-cov }: buildPythonPackage rec { @@ -32,7 +32,7 @@ buildPythonPackage rec { mock pytestCheckHook pytestcache - pytestcov + pytest-cov ]; pytestFlagsArray = [ "--ignore=docs" ]; diff --git a/pkgs/development/python-modules/pytest-filter-subpackage/default.nix b/pkgs/development/python-modules/pytest-filter-subpackage/default.nix index 148b2c7185fb..df152eaa5eca 100644 --- a/pkgs/development/python-modules/pytest-filter-subpackage/default.nix +++ b/pkgs/development/python-modules/pytest-filter-subpackage/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , pytest -, pytestcov +, pytest-cov , pytest-doctestplus , pytestCheckHook , setuptools-scm @@ -25,7 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pytest-doctestplus - pytestcov + pytest-cov pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytest-shutil/default.nix b/pkgs/development/python-modules/pytest-shutil/default.nix index 0483063c53bc..e43a837d6aa4 100644 --- a/pkgs/development/python-modules/pytest-shutil/default.nix +++ b/pkgs/development/python-modules/pytest-shutil/default.nix @@ -1,5 +1,5 @@ { lib, isPyPy, buildPythonPackage, fetchPypi -, pytest, cmdline, pytestcov, coverage, setuptools-git, mock, pathpy, execnet +, pytest, cmdline, pytest-cov, coverage, setuptools-git, mock, pathpy, execnet , contextlib2, termcolor }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { buildInputs = [ pytest ]; checkInputs = [ cmdline pytest ]; - propagatedBuildInputs = [ pytestcov coverage setuptools-git mock pathpy execnet contextlib2 termcolor ]; + propagatedBuildInputs = [ pytest-cov coverage setuptools-git mock pathpy execnet contextlib2 termcolor ]; checkPhase = '' py.test ${lib.optionalString isPyPy "-k'not (test_run or test_run_integration)'"} diff --git a/pkgs/development/python-modules/pytest-timeout/default.nix b/pkgs/development/python-modules/pytest-timeout/default.nix index 8c59b6ee2c9c..40f67eb0b0ba 100644 --- a/pkgs/development/python-modules/pytest-timeout/default.nix +++ b/pkgs/development/python-modules/pytest-timeout/default.nix @@ -4,7 +4,7 @@ , pytest , pytestCheckHook , pexpect -, pytestcov +, pytest-cov }: buildPythonPackage rec { @@ -18,7 +18,7 @@ buildPythonPackage rec { buildInputs = [ pytest ]; - checkInputs = [ pytestCheckHook pexpect pytestcov ]; + checkInputs = [ pytestCheckHook pexpect pytest-cov ]; disabledTests = [ "test_suppresses_timeout_when_pdb_is_entered" diff --git a/pkgs/development/python-modules/pytest-virtualenv/default.nix b/pkgs/development/python-modules/pytest-virtualenv/default.nix index 8ea981ba2e7a..c4a66cc48e5d 100644 --- a/pkgs/development/python-modules/pytest-virtualenv/default.nix +++ b/pkgs/development/python-modules/pytest-virtualenv/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, pytest, pytestcov, mock, cmdline, pytest-fixture-config, pytest-shutil, virtualenv }: +, pytest, pytest-cov, mock, cmdline, pytest-fixture-config, pytest-shutil, virtualenv }: buildPythonPackage rec { pname = "pytest-virtualenv"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "03w2zz3crblj1p6i8nq17946hbn3zqp9z7cfnifw47hi4a4fww12"; }; - checkInputs = [ pytest pytestcov mock cmdline ]; + checkInputs = [ pytest pytest-cov mock cmdline ]; propagatedBuildInputs = [ pytest-fixture-config pytest-shutil virtualenv ]; checkPhase = "py.test tests/unit "; diff --git a/pkgs/development/python-modules/python-hosts/default.nix b/pkgs/development/python-modules/python-hosts/default.nix index c8f1179bc66b..861addf81eef 100644 --- a/pkgs/development/python-modules/python-hosts/default.nix +++ b/pkgs/development/python-modules/python-hosts/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pyyaml, pytest, pytestcov }: +{ lib, buildPythonPackage, fetchPypi, pyyaml, pytest, pytest-cov }: buildPythonPackage rec { pname = "python-hosts"; @@ -15,7 +15,7 @@ buildPythonPackage rec { substituteInPlace python_hosts/utils.py --replace "import win_inet_pton" "" ''; - checkInputs = [ pyyaml pytest pytestcov ]; + checkInputs = [ pyyaml pytest pytest-cov ]; # Removing 1 test file (it requires internet connection) and keeping the other two checkPhase = '' diff --git a/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/pkgs/development/python-modules/python-jsonrpc-server/default.nix index e641a943f865..a6d0bf800ea6 100644 --- a/pkgs/development/python-modules/python-jsonrpc-server/default.nix +++ b/pkgs/development/python-modules/python-jsonrpc-server/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder -, pytestCheckHook, mock, pytestcov, coverage +, pytestCheckHook, mock, pytest-cov, coverage , future, futures ? null, ujson, isPy38 }: @@ -19,7 +19,7 @@ buildPythonPackage rec { ''; checkInputs = [ - pytestCheckHook mock pytestcov coverage + pytestCheckHook mock pytest-cov coverage ]; propagatedBuildInputs = [ future ujson ] diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix index 3ed9b75ef91f..f022eba58571 100644 --- a/pkgs/development/python-modules/python-language-server/default.nix +++ b/pkgs/development/python-modules/python-language-server/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonAtLeast, pythonOlder, isPy27 , backports_functools_lru_cache ? null, configparser ? null, futures ? null, future, jedi, pluggy, python-jsonrpc-server, flake8 -, pytestCheckHook, mock, pytestcov, coverage, setuptools, ujson, flaky +, pytestCheckHook, mock, pytest-cov, coverage, setuptools, ujson, flaky , # Allow building a limited set of providers, e.g. ["pycodestyle"]. providers ? ["*"] # The following packages are optional and @@ -55,7 +55,7 @@ buildPythonPackage rec { doCheck = providers == ["*"]; checkInputs = [ - pytestCheckHook mock pytestcov coverage flaky + pytestCheckHook mock pytest-cov coverage flaky # Do not propagate flake8 or it will enable pyflakes implicitly flake8 # rope is technically a dependency, but we don't add it by default since we diff --git a/pkgs/development/python-modules/python-lz4/default.nix b/pkgs/development/python-modules/python-lz4/default.nix index 95208c7b94b6..901a368d5d85 100644 --- a/pkgs/development/python-modules/python-lz4/default.nix +++ b/pkgs/development/python-modules/python-lz4/default.nix @@ -6,7 +6,7 @@ , pkgconfig , psutil , pytest -, pytestcov +, pytest-cov , pytestrunner , setuptools-scm }: @@ -24,7 +24,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ setuptools-scm pkgconfig pytestrunner ]; - checkInputs = [ pytest pytestcov psutil ]; + checkInputs = [ pytest pytest-cov psutil ]; propagatedBuildInputs = lib.optionals (!isPy3k) [ future ]; # give a hint to setuptools-scm on package version diff --git a/pkgs/development/python-modules/python-multipart/default.nix b/pkgs/development/python-modules/python-multipart/default.nix index c27923424872..ccac3e8b3cb2 100644 --- a/pkgs/development/python-modules/python-multipart/default.nix +++ b/pkgs/development/python-modules/python-multipart/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , pytest -, pytestcov +, pytest-cov , mock , pyyaml , six @@ -19,7 +19,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestcov + pytest-cov mock pyyaml ]; diff --git a/pkgs/development/python-modules/qcelemental/default.nix b/pkgs/development/python-modules/qcelemental/default.nix index 3a3e9bced050..e06afb02165b 100644 --- a/pkgs/development/python-modules/qcelemental/default.nix +++ b/pkgs/development/python-modules/qcelemental/default.nix @@ -1,12 +1,12 @@ { buildPythonPackage, lib, fetchPypi, numpy -, pydantic, pint, networkx, pytestrunner, pytestcov, pytest +, pydantic, pint, networkx, pytestrunner, pytest-cov, pytest } : buildPythonPackage rec { pname = "qcelemental"; version = "0.21.0"; - checkInputs = [ pytestrunner pytestcov pytest ]; + checkInputs = [ pytestrunner pytest-cov pytest ]; propagatedBuildInputs = [ numpy pydantic pint networkx ]; src = fetchPypi { diff --git a/pkgs/development/python-modules/qcengine/default.nix b/pkgs/development/python-modules/qcengine/default.nix index 847eeb23c9a1..793e1ada739e 100644 --- a/pkgs/development/python-modules/qcengine/default.nix +++ b/pkgs/development/python-modules/qcengine/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, lib, fetchPypi, pyyaml, qcelemental, pydantic -, py-cpuinfo, psutil, pytestrunner, pytest, pytestcov +, py-cpuinfo, psutil, pytestrunner, pytest, pytest-cov } : buildPythonPackage rec { @@ -8,7 +8,7 @@ buildPythonPackage rec { checkInputs = [ pytestrunner - pytestcov + pytest-cov pytest ]; diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index 85d5d5d0b7d8..1ec6448d74c1 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage, lib, fetchFromGitHub, isPy3k , cython, setuptools , numpy, affine, attrs, cligj, click-plugins, snuggs, gdal -, pytest, pytestcov, packaging, hypothesis, boto3, mock +, pytest, pytest-cov, packaging, hypothesis, boto3, mock , certifi, shapely }: @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "sha256-rf2qdUhbS4Z2+mvlN1RzZvlgTgjqiBoQzry4z5QLSUc="; }; - checkInputs = [ boto3 pytest pytestcov packaging hypothesis shapely ] ++ lib.optional (!isPy3k) mock; + checkInputs = [ boto3 pytest pytest-cov packaging hypothesis shapely ] ++ lib.optional (!isPy3k) mock; nativeBuildInputs = [ cython gdal ]; propagatedBuildInputs = [ certifi gdal numpy attrs affine cligj click-plugins snuggs setuptools ]; diff --git a/pkgs/development/python-modules/readchar/default.nix b/pkgs/development/python-modules/readchar/default.nix index ea13c7083fe7..c83a2bba1cd6 100644 --- a/pkgs/development/python-modules/readchar/default.nix +++ b/pkgs/development/python-modules/readchar/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, flake8, pytest, pytestcov, pexpect }: +{ lib, buildPythonPackage, fetchFromGitHub, flake8, pytest, pytest-cov, pexpect }: buildPythonPackage rec { pname = "readchar"; @@ -13,7 +13,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ flake8 ]; - checkInputs = [ pytest pytestcov pexpect ]; + checkInputs = [ pytest pytest-cov pexpect ]; meta = with lib; { homepage = "https://github.com/magmax/python-readchar"; diff --git a/pkgs/development/python-modules/reikna/default.nix b/pkgs/development/python-modules/reikna/default.nix index 896bc8e02f09..873a39244fe3 100644 --- a/pkgs/development/python-modules/reikna/default.nix +++ b/pkgs/development/python-modules/reikna/default.nix @@ -2,7 +2,7 @@ , fetchPypi , buildPythonPackage , sphinx -, pytestcov +, pytest-cov , pytest , Mako , numpy @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "d01f4264c8379ef2962a93aacb002d491b92ef9b5b22b45f77e7821dfa87bef7"; }; - checkInputs = [ sphinx pytestcov pytest ]; + checkInputs = [ sphinx pytest-cov pytest ]; propagatedBuildInputs = [ Mako numpy funcsigs ] ++ lib.optional withCuda pycuda diff --git a/pkgs/development/python-modules/resampy/default.nix b/pkgs/development/python-modules/resampy/default.nix index 551c7f5b93e6..e7e7ed5a7381 100644 --- a/pkgs/development/python-modules/resampy/default.nix +++ b/pkgs/development/python-modules/resampy/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pytest -, pytestcov +, pytest-cov , numpy , scipy , cython @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "0qmkxl5sbgh0j73n667vyi7ywzh09iaync91yp1j5rrcmwsn0qfs"; }; - checkInputs = [ pytest pytestcov ]; + checkInputs = [ pytest pytest-cov ]; propagatedBuildInputs = [ numpy scipy cython numba six ]; checkPhase = '' diff --git a/pkgs/development/python-modules/rising/default.nix b/pkgs/development/python-modules/rising/default.nix index eb9afc8353c7..03aed296aa63 100644 --- a/pkgs/development/python-modules/rising/default.nix +++ b/pkgs/development/python-modules/rising/default.nix @@ -3,7 +3,7 @@ , isPy27 , fetchFromGitHub , pytestCheckHook -, pytestcov +, pytest-cov , dill , numpy , pytorch @@ -25,7 +25,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ numpy pytorch threadpoolctl tqdm ]; - checkInputs = [ dill pytestcov pytestCheckHook ]; + checkInputs = [ dill pytest-cov pytestCheckHook ]; disabledTests = [ "test_affine" ]; # deprecated division operator '/' diff --git a/pkgs/development/python-modules/runway-python/default.nix b/pkgs/development/python-modules/runway-python/default.nix index c47054632c6f..4e062d9928ec 100644 --- a/pkgs/development/python-modules/runway-python/default.nix +++ b/pkgs/development/python-modules/runway-python/default.nix @@ -20,7 +20,7 @@ , wget , deepdiff , pytestCheckHook -, pytestcov +, pytest-cov , websocket-client }: @@ -61,7 +61,7 @@ buildPythonPackage rec { checkInputs = [ deepdiff pytestCheckHook - pytestcov + pytest-cov websocket-client ]; diff --git a/pkgs/development/python-modules/rxv/default.nix b/pkgs/development/python-modules/rxv/default.nix index 7f3e6527d060..5f0653236acf 100644 --- a/pkgs/development/python-modules/rxv/default.nix +++ b/pkgs/development/python-modules/rxv/default.nix @@ -6,7 +6,7 @@ , pytest , requests-mock , mock -, pytestcov +, pytest-cov , pytest-timeout , testtools }: @@ -25,7 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ defusedxml requests ]; - checkInputs = [ pytest requests-mock mock pytestcov pytest-timeout testtools ]; + checkInputs = [ pytest requests-mock mock pytest-cov pytest-timeout testtools ]; checkPhase = '' pytest ''; diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/pkgs/development/python-modules/scikit-build/default.nix index 6694c3abe4df..3a3feaa14edc 100644 --- a/pkgs/development/python-modules/scikit-build/default.nix +++ b/pkgs/development/python-modules/scikit-build/default.nix @@ -15,7 +15,7 @@ , ninja , pathpy , pytest -, pytestcov +, pytest-cov , pytest-mock , pytestrunner , pytest-virtualenv @@ -48,7 +48,7 @@ buildPythonPackage rec { ninja pathpy pytest - pytestcov + pytest-cov pytest-mock pytestrunner pytest-virtualenv diff --git a/pkgs/development/python-modules/scrapy-fake-useragent/default.nix b/pkgs/development/python-modules/scrapy-fake-useragent/default.nix index f9f896a563b7..643afd6dc8bf 100644 --- a/pkgs/development/python-modules/scrapy-fake-useragent/default.nix +++ b/pkgs/development/python-modules/scrapy-fake-useragent/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildPythonPackage, pytestCheckHook, pytestcov, pytest-mock, fake-useragent, faker, scrapy }: +{ lib, fetchFromGitHub, buildPythonPackage, pytestCheckHook, pytest-cov, pytest-mock, fake-useragent, faker, scrapy }: buildPythonPackage rec { pname = "scrapy-fake-useragent"; @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ fake-useragent faker ]; - checkInputs = [ pytestCheckHook scrapy pytestcov pytest-mock ]; + checkInputs = [ pytestCheckHook scrapy pytest-cov pytest-mock ]; meta = with lib; { description = "Random User-Agent middleware based on fake-useragent"; diff --git a/pkgs/development/python-modules/skorch/default.nix b/pkgs/development/python-modules/skorch/default.nix index db3b8ed4312c..3bbf28d2884e 100644 --- a/pkgs/development/python-modules/skorch/default.nix +++ b/pkgs/development/python-modules/skorch/default.nix @@ -3,7 +3,7 @@ , fetchPypi , pytestCheckHook , pytest -, pytestcov +, pytest-cov , flaky , numpy , pandas @@ -24,7 +24,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ numpy pytorch scikit-learn scipy tabulate tqdm ]; - checkInputs = [ pytest pytestcov flaky pandas pytestCheckHook ]; + checkInputs = [ pytest pytest-cov flaky pandas pytestCheckHook ]; disabledTests = [ # on CPU, these expect artifacts from previous GPU run diff --git a/pkgs/development/python-modules/softlayer/default.nix b/pkgs/development/python-modules/softlayer/default.nix index 3c2a5e2a356d..78ecb3face30 100644 --- a/pkgs/development/python-modules/softlayer/default.nix +++ b/pkgs/development/python-modules/softlayer/default.nix @@ -9,7 +9,7 @@ , pygments , urllib3 , pytest -, pytestcov +, pytest-cov , mock , sphinx , testtools @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ ptable click requests prompt_toolkit pygments urllib3 ]; - checkInputs = [ pytest pytestcov mock sphinx testtools ptable click requests prompt_toolkit pygments urllib3 ]; + checkInputs = [ pytest pytest-cov mock sphinx testtools ptable click requests prompt_toolkit pygments urllib3 ]; checkPhase = '' pytest diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index cfdc173995c3..a0b5c9799254 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, requests, pytest, pytestcov, pytest-mock, pytest_xdist }: +{ lib, buildPythonPackage, fetchPypi, requests, pytest, pytest-cov, pytest-mock, pytest_xdist }: buildPythonPackage rec { pname = "stripe"; @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - checkInputs = [ pytest pytestcov pytest-mock pytest_xdist ]; + checkInputs = [ pytest pytest-cov pytest-mock pytest_xdist ]; meta = with lib; { description = "Stripe Python bindings"; diff --git a/pkgs/development/python-modules/stups-cli-support/default.nix b/pkgs/development/python-modules/stups-cli-support/default.nix index 35aaf45ed1a2..97a7d6ebbdda 100644 --- a/pkgs/development/python-modules/stups-cli-support/default.nix +++ b/pkgs/development/python-modules/stups-cli-support/default.nix @@ -5,7 +5,7 @@ , dnspython , requests , pytest -, pytestcov +, pytest-cov , isPy3k }: @@ -31,7 +31,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestcov + pytest-cov ]; meta = with lib; { diff --git a/pkgs/development/python-modules/stups-fullstop/default.nix b/pkgs/development/python-modules/stups-fullstop/default.nix index 5f51112324aa..8628c83334ba 100644 --- a/pkgs/development/python-modules/stups-fullstop/default.nix +++ b/pkgs/development/python-modules/stups-fullstop/default.nix @@ -5,7 +5,7 @@ , stups-cli-support , stups-zign , pytest -, pytestcov +, pytest-cov , isPy3k }: @@ -33,7 +33,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestcov + pytest-cov ]; meta = with lib; { diff --git a/pkgs/development/python-modules/stups-pierone/default.nix b/pkgs/development/python-modules/stups-pierone/default.nix index aaa049916411..92cd344edb6d 100644 --- a/pkgs/development/python-modules/stups-pierone/default.nix +++ b/pkgs/development/python-modules/stups-pierone/default.nix @@ -5,7 +5,7 @@ , stups-cli-support , stups-zign , pytest -, pytestcov +, pytest-cov , hypothesis , isPy3k }: @@ -34,7 +34,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestcov + pytest-cov hypothesis ]; diff --git a/pkgs/development/python-modules/stups-tokens/default.nix b/pkgs/development/python-modules/stups-tokens/default.nix index 3e785d8febbe..62dec6f348e8 100644 --- a/pkgs/development/python-modules/stups-tokens/default.nix +++ b/pkgs/development/python-modules/stups-tokens/default.nix @@ -4,7 +4,7 @@ , requests , mock , pytest -, pytestcov +, pytest-cov , isPy3k }: @@ -27,7 +27,7 @@ buildPythonPackage rec { checkInputs = [ mock pytest - pytestcov + pytest-cov ]; meta = with lib; { diff --git a/pkgs/development/python-modules/stups-zign/default.nix b/pkgs/development/python-modules/stups-zign/default.nix index 6b80f55636a9..e7f6c2805de5 100644 --- a/pkgs/development/python-modules/stups-zign/default.nix +++ b/pkgs/development/python-modules/stups-zign/default.nix @@ -5,7 +5,7 @@ , stups-tokens , stups-cli-support , pytest -, pytestcov +, pytest-cov , isPy3k }: @@ -40,7 +40,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestcov + pytest-cov ]; meta = with lib; { diff --git a/pkgs/development/python-modules/subliminal/default.nix b/pkgs/development/python-modules/subliminal/default.nix index cedbb7bcf786..fe92b71f3f52 100644 --- a/pkgs/development/python-modules/subliminal/default.nix +++ b/pkgs/development/python-modules/subliminal/default.nix @@ -19,7 +19,7 @@ , vcrpy , pytest , pytest-flakes -, pytestcov +, pytest-cov , pytestrunner }: @@ -40,7 +40,7 @@ buildPythonPackage rec { checkInputs = [ sympy vcrpy pytest pytest-flakes - pytestcov pytestrunner + pytest-cov pytestrunner ]; # https://github.com/Diaoul/subliminal/pull/963 diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index c8fd82043a81..0079b44cfd35 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -19,7 +19,7 @@ , parfive , pytest-astropy , pytest-mock -, pytestcov +, pytest-cov , python-dateutil , scikitimage , scipy @@ -68,7 +68,7 @@ buildPythonPackage rec { checkInputs = [ hypothesis pytest-astropy - pytestcov + pytest-cov pytest-mock ]; diff --git a/pkgs/development/python-modules/tablib/default.nix b/pkgs/development/python-modules/tablib/default.nix index b6754e15ad5d..404edac7e59b 100644 --- a/pkgs/development/python-modules/tablib/default.nix +++ b/pkgs/development/python-modules/tablib/default.nix @@ -4,7 +4,7 @@ , pandas , setuptools-scm , pytest -, pytestcov +, pytest-cov , pyyaml , unicodecsv , xlrd @@ -23,7 +23,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ xlwt openpyxl pyyaml xlrd odfpy ]; - checkInputs = [ pytest pytestcov unicodecsv pandas ]; + checkInputs = [ pytest pytest-cov unicodecsv pandas ]; # test_tablib needs MarkupPy, which isn't packaged yet checkPhase = '' diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index b06a53cb333c..8da8d622a7b3 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchPypi , setuptools-scm, pytest, pytest-freezegun, freezegun, backports_unittest-mock , six, pytz, jaraco_functools, pythonOlder -, pytest-flake8, pytestcov, pytest-black, pytest-mypy +, pytest-flake8, pytest-cov, pytest-black, pytest-mypy }: buildPythonPackage rec { @@ -21,7 +21,7 @@ buildPythonPackage rec { checkInputs = [ pytest-freezegun pytest freezegun backports_unittest-mock - pytest-flake8 pytestcov pytest-black pytest-mypy + pytest-flake8 pytest-cov pytest-black pytest-mypy ]; checkPhase = '' diff --git a/pkgs/development/python-modules/textwrap3/default.nix b/pkgs/development/python-modules/textwrap3/default.nix index 791479b69e14..995a62230b22 100644 --- a/pkgs/development/python-modules/textwrap3/default.nix +++ b/pkgs/development/python-modules/textwrap3/default.nix @@ -4,7 +4,7 @@ , tox , pytest , coverage -, pytestcov +, pytest-cov }: buildPythonPackage rec { @@ -21,7 +21,7 @@ buildPythonPackage rec { tox pytest coverage - pytestcov + pytest-cov ]; checkPhase = '' diff --git a/pkgs/development/python-modules/threadpoolctl/default.nix b/pkgs/development/python-modules/threadpoolctl/default.nix index fb2c6094b37c..20fad7c18a0a 100644 --- a/pkgs/development/python-modules/threadpoolctl/default.nix +++ b/pkgs/development/python-modules/threadpoolctl/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , flit , pytestCheckHook -, pytestcov +, pytest-cov , numpy , scipy }: @@ -23,7 +23,7 @@ buildPythonPackage rec { sha256 = "0sl6mp3b2gb0dvqkhnkmrp2g3r5c7clyyyxzq44xih6sw1pgx9df"; }; - checkInputs = [ pytestCheckHook pytestcov numpy scipy ]; + checkInputs = [ pytestCheckHook pytest-cov numpy scipy ]; meta = with lib; { homepage = "https://github.com/joblib/threadpoolctl"; diff --git a/pkgs/development/python-modules/timezonefinder/default.nix b/pkgs/development/python-modules/timezonefinder/default.nix index 48aff396aaad..1cd055588c28 100644 --- a/pkgs/development/python-modules/timezonefinder/default.nix +++ b/pkgs/development/python-modules/timezonefinder/default.nix @@ -5,7 +5,7 @@ , numba , numpy , pytestCheckHook -, pytestcov +, pytest-cov }: buildPythonPackage rec { @@ -23,7 +23,7 @@ buildPythonPackage rec { numpy ]; - checkInputs = [ numba pytestCheckHook pytestcov ]; + checkInputs = [ numba pytestCheckHook pytest-cov ]; meta = with lib; { description = "fast python package for finding the timezone of any point on earth (coordinates) offline"; diff --git a/pkgs/development/python-modules/tinycss2/default.nix b/pkgs/development/python-modules/tinycss2/default.nix index 35c0f76b0843..7a025577dbb0 100644 --- a/pkgs/development/python-modules/tinycss2/default.nix +++ b/pkgs/development/python-modules/tinycss2/default.nix @@ -7,7 +7,7 @@ # Check inputs , pytest , pytestrunner -, pytestcov +, pytest-cov , pytest-flake8 , pytest-isort }: @@ -34,7 +34,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ webencodings ]; - checkInputs = [ pytest pytestrunner pytestcov pytest-flake8 pytest-isort ]; + checkInputs = [ pytest pytestrunner pytest-cov pytest-flake8 pytest-isort ]; # https://github.com/PyCQA/pycodestyle/issues/598 preCheck = '' diff --git a/pkgs/development/python-modules/toggl-cli/default.nix b/pkgs/development/python-modules/toggl-cli/default.nix index d8225e7031ea..fb39831a0d18 100644 --- a/pkgs/development/python-modules/toggl-cli/default.nix +++ b/pkgs/development/python-modules/toggl-cli/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, pythonAtLeast, pythonOlder, click , click-completion, factory_boy, faker, inquirer, notify-py, pbr, pendulum -, ptable, pytestCheckHook, pytestcov, pytest-mock, requests, twine +, ptable, pytestCheckHook, pytest-cov, pytest-mock, requests, twine , validate-email }: buildPythonPackage rec { @@ -20,7 +20,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ pbr twine ]; - checkInputs = [ pbr pytestCheckHook pytestcov pytest-mock faker factory_boy ]; + checkInputs = [ pbr pytestCheckHook pytest-cov pytest-mock faker factory_boy ]; preCheck = '' export TOGGL_API_TOKEN=your_api_token diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix index 61adcf9254ff..13d037515c3f 100644 --- a/pkgs/development/python-modules/typer/default.nix +++ b/pkgs/development/python-modules/typer/default.nix @@ -4,7 +4,7 @@ , click , pytestCheckHook , shellingham -, pytestcov +, pytest-cov , pytest_xdist , pytest-sugar , coverage @@ -26,7 +26,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytestcov + pytest-cov pytest_xdist pytest-sugar shellingham diff --git a/pkgs/development/python-modules/typesentry/default.nix b/pkgs/development/python-modules/typesentry/default.nix index ef3b1c78c399..a4d8125b5d61 100644 --- a/pkgs/development/python-modules/typesentry/default.nix +++ b/pkgs/development/python-modules/typesentry/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , colorama , pytest -, pytestcov +, pytest-cov }: buildPythonPackage { @@ -19,7 +19,7 @@ buildPythonPackage { }; propagatedBuildInputs = [ colorama ]; - checkInputs = [ pytest pytestcov ]; + checkInputs = [ pytest pytest-cov ]; checkPhase = '' pytest ''; diff --git a/pkgs/development/python-modules/typesystem/default.nix b/pkgs/development/python-modules/typesystem/default.nix index c278680404ba..f7dcf33ea7fd 100644 --- a/pkgs/development/python-modules/typesystem/default.nix +++ b/pkgs/development/python-modules/typesystem/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , isPy27 , pytestCheckHook -, pytestcov +, pytest-cov , jinja2 , pyyaml }: @@ -27,7 +27,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytestcov + pytest-cov ]; disabledTests = [ diff --git a/pkgs/development/python-modules/uarray/default.nix b/pkgs/development/python-modules/uarray/default.nix index 32a877582342..4d7fe6b034b4 100644 --- a/pkgs/development/python-modules/uarray/default.nix +++ b/pkgs/development/python-modules/uarray/default.nix @@ -7,7 +7,7 @@ , astunparse , typing-extensions , pytestCheckHook -, pytestcov +, pytest-cov }: buildPythonPackage rec { @@ -30,7 +30,7 @@ buildPythonPackage rec { } )]; - checkInputs = [ pytestCheckHook pytestcov ]; + checkInputs = [ pytestCheckHook pytest-cov ]; propagatedBuildInputs = [ matchpy numpy astunparse typing-extensions ]; # Tests must be run from outside the source directory diff --git a/pkgs/development/python-modules/venusian/default.nix b/pkgs/development/python-modules/venusian/default.nix index 82e291ae4623..f13bd4cbdc43 100644 --- a/pkgs/development/python-modules/venusian/default.nix +++ b/pkgs/development/python-modules/venusian/default.nix @@ -3,7 +3,7 @@ , fetchPypi , isPy27 , pytest -, pytestcov +, pytest-cov }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "f6842b7242b1039c0c28f6feef29016e7e7dd3caaeb476a193acf737db31ee38"; }; - checkInputs = [ pytest pytestcov ]; + checkInputs = [ pytest pytest-cov ]; checkPhase = '' pytest diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index 8f946c47786d..c578b7c7c8c0 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -16,7 +16,7 @@ pytestrunner, pytest-isort, pytest-flake8, - pytestcov, + pytest-cov, isPy3k, substituteAll }: @@ -39,7 +39,7 @@ buildPythonPackage rec { --replace '[tool:pytest]' '[tool:pytest]\nflake8-ignore = E501' ''; - checkInputs = [ pytest pytestrunner pytest-isort pytest-flake8 pytestcov ]; + checkInputs = [ pytest pytestrunner pytest-isort pytest-flake8 pytest-cov ]; FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf"; diff --git a/pkgs/development/python-modules/word2vec/default.nix b/pkgs/development/python-modules/word2vec/default.nix index b078231c9429..1272916d41f7 100644 --- a/pkgs/development/python-modules/word2vec/default.nix +++ b/pkgs/development/python-modules/word2vec/default.nix @@ -9,7 +9,7 @@ , setuptools-scm , gcc , pytest -, pytestcov +, pytest-cov , isPy27 }: let @@ -32,7 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cython numpy scikit-learn six ]; - checkInputs = [ pytest pytestcov ]; + checkInputs = [ pytest pytest-cov ]; # Checks require test data downloaded separately # See project source Makefile:test-data rule for reference diff --git a/pkgs/development/python-modules/wordcloud/default.nix b/pkgs/development/python-modules/wordcloud/default.nix index 80f22efbda85..e04f17c214df 100644 --- a/pkgs/development/python-modules/wordcloud/default.nix +++ b/pkgs/development/python-modules/wordcloud/default.nix @@ -4,7 +4,7 @@ , numpy , pillow , cython -, pytestcov +, pytest-cov , pytest , fetchpatch }: @@ -25,7 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ matplotlib numpy pillow ]; # Tests require extra dependencies - checkInputs = [ mock pytest pytestcov ]; + checkInputs = [ mock pytest pytest-cov ]; checkPhase = '' PATH=$out/bin:$PATH pytest test diff --git a/pkgs/development/tools/sourcetrail/jedi.nix b/pkgs/development/tools/sourcetrail/jedi.nix index 2e1ca55dad3f..93650c9027a4 100644 --- a/pkgs/development/tools/sourcetrail/jedi.nix +++ b/pkgs/development/tools/sourcetrail/jedi.nix @@ -1,6 +1,6 @@ # Taken from a past commit of nixpkgs -{ lib, buildPythonPackage, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }: +{ lib, buildPythonPackage, fetchPypi, pytest, glibcLocales, tox, pytest-cov, parso }: buildPythonPackage rec { pname = "jedi"; @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "86ed7d9b750603e4ba582ea8edc678657fb4007894a12bcf6f4bb97892f31d20"; }; - checkInputs = [ pytest glibcLocales tox pytestcov ]; + checkInputs = [ pytest glibcLocales tox pytest-cov ]; propagatedBuildInputs = [ parso ]; diff --git a/pkgs/development/tools/vim-vint/default.nix b/pkgs/development/tools/vim-vint/default.nix index fcab1f952f2b..a6d28b36bffd 100644 --- a/pkgs/development/tools/vim-vint/default.nix +++ b/pkgs/development/tools/vim-vint/default.nix @@ -14,7 +14,7 @@ buildPythonApplication rec { # For python 3.5 > version > 2.7 , a nested dependency (pythonPackages.hypothesis) fails. disabled = ! pythonAtLeast "3.5"; - checkInputs = [ pytest pytestcov ]; + checkInputs = [ pytest pytest-cov ]; propagatedBuildInputs = [ ansicolor chardet pyyaml setuptools ]; # Unpin test dependency versions. This is fixed in master but not yet released. diff --git a/pkgs/servers/dns/doh-proxy/default.nix b/pkgs/servers/dns/doh-proxy/default.nix index e65021599ad4..8774715bb1d8 100644 --- a/pkgs/servers/dns/doh-proxy/default.nix +++ b/pkgs/servers/dns/doh-proxy/default.nix @@ -22,7 +22,7 @@ buildPythonApplication rec { asynctest unittest-data-provider pytest - pytestcov + pytest-cov pytest-aiohttp ]; diff --git a/pkgs/tools/admin/lexicon/default.nix b/pkgs/tools/admin/lexicon/default.nix index 6c105cf9b335..7737205ce02d 100644 --- a/pkgs/tools/admin/lexicon/default.nix +++ b/pkgs/tools/admin/lexicon/default.nix @@ -65,7 +65,7 @@ buildPythonApplication rec { checkInputs = [ mock pytest - pytestcov + pytest-cov pytest_xdist vcrpy ]; diff --git a/pkgs/tools/admin/salt/pepper/default.nix b/pkgs/tools/admin/salt/pepper/default.nix index 25d3eaa15fc8..31cb2861f39f 100644 --- a/pkgs/tools/admin/salt/pepper/default.nix +++ b/pkgs/tools/admin/salt/pepper/default.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { buildInputs = with python3Packages; [ setuptools setuptools-scm salt ]; checkInputs = with python3Packages; [ - pytest mock pyzmq pytest-rerunfailures pytestcov cherrypy tornado + pytest mock pyzmq pytest-rerunfailures pytest-cov cherrypy tornado ]; meta = with lib; { diff --git a/pkgs/tools/backup/zfs-replicate/default.nix b/pkgs/tools/backup/zfs-replicate/default.nix index c167ad1fa018..aae6ce329f68 100644 --- a/pkgs/tools/backup/zfs-replicate/default.nix +++ b/pkgs/tools/backup/zfs-replicate/default.nix @@ -1,5 +1,5 @@ { buildPythonApplication, click, fetchPypi, hypothesis, mypy, pytest -, pytestcov, pytestrunner, lib, stringcase +, pytest-cov, pytestrunner, lib, stringcase }: buildPythonApplication rec { @@ -15,7 +15,7 @@ buildPythonApplication rec { hypothesis mypy pytest - pytestcov + pytest-cov ]; buildInputs = [ diff --git a/pkgs/tools/filesystems/gitfs/default.nix b/pkgs/tools/filesystems/gitfs/default.nix index 03e76e5fb275..b5b1256a9b5e 100644 --- a/pkgs/tools/filesystems/gitfs/default.nix +++ b/pkgs/tools/filesystems/gitfs/default.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { 'from pygit2 import RemoteCallbacks' ''; - checkInputs = with python3Packages; [ pytest pytestcov mock ]; + checkInputs = with python3Packages; [ pytest pytest-cov mock ]; propagatedBuildInputs = with python3Packages; [ atomiclong fusepy pygit2 six ]; checkPhase = "py.test"; diff --git a/pkgs/tools/misc/bonfire/default.nix b/pkgs/tools/misc/bonfire/default.nix index a3f1608c3ad1..f71d8a8b8ef3 100644 --- a/pkgs/tools/misc/bonfire/default.nix +++ b/pkgs/tools/misc/bonfire/default.nix @@ -29,7 +29,7 @@ buildPythonApplication rec { --replace "data_files = *.rst, *.txt" "" ''; - buildInputs = [ httpretty pytest pytestcov ]; + buildInputs = [ httpretty pytest pytest-cov ]; preCheck = '' # fix compatibility with pytest 4 diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix index d49c1e925dc1..037adda92eb6 100644 --- a/pkgs/tools/security/vulnix/default.nix +++ b/pkgs/tools/security/vulnix/default.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { checkInputs = with python3Packages; [ freezegun pytest - pytestcov + pytest-cov pytest-flake8 ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 017d27a8a208..f42713fee3db 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -52,6 +52,7 @@ mapAliases ({ privacyidea = throw "renamed to pkgs.privacyidea"; # added 2021-06-20 pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 + pytestcov = pytest-cov; # added 2021-01-04 pytest-pep8 = pytestpep8; # added 2021-01-04 pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c4654534e6c9..f689a562a49d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6786,8 +6786,7 @@ in { pytest-console-scripts = callPackage ../development/python-modules/pytest-console-scripts { }; - pytest-cov = self.pytestcov; # self 2021-01-04 - pytestcov = callPackage ../development/python-modules/pytest-cov { }; + pytest-cov = callPackage ../development/python-modules/pytest-cov { }; pytest-cram = callPackage ../development/python-modules/pytest-cram { }; From 9bfdf57e139e7e3b253979da828285bb8284a217 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 20 Jul 2021 23:07:53 +0200 Subject: [PATCH 055/235] pythonPackages: deprecate pytestrunner alias --- pkgs/applications/misc/pyditz/cerberus.nix | 4 ++-- pkgs/applications/networking/dyndns/dyndnsc/default.nix | 2 +- .../networking/instant-messengers/matrixcli/default.nix | 4 ++-- pkgs/applications/office/todoman/default.nix | 2 +- pkgs/applications/terminal-emulators/terminator/default.nix | 2 +- pkgs/applications/version-management/nbstripout/default.nix | 2 +- pkgs/development/compilers/vyper/default.nix | 4 ++-- pkgs/development/python-modules/aiocontextvars/default.nix | 4 ++-- pkgs/development/python-modules/apprise/default.nix | 4 ++-- pkgs/development/python-modules/arpeggio/default.nix | 4 ++-- pkgs/development/python-modules/awkward0/default.nix | 4 ++-- pkgs/development/python-modules/bacpypes/default.nix | 4 ++-- pkgs/development/python-modules/bleach/default.nix | 4 ++-- pkgs/development/python-modules/cairocffi/0_9.nix | 2 +- pkgs/development/python-modules/cairocffi/default.nix | 2 +- pkgs/development/python-modules/cairocffi/generic.nix | 2 +- pkgs/development/python-modules/cfn-flip/default.nix | 4 ++-- pkgs/development/python-modules/chardet/2.nix | 4 ++-- pkgs/development/python-modules/ci-py/default.nix | 4 ++-- pkgs/development/python-modules/coveralls/default.nix | 4 ++-- pkgs/development/python-modules/cssselect2/default.nix | 4 ++-- pkgs/development/python-modules/daphne/default.nix | 4 ++-- pkgs/development/python-modules/defcon/default.nix | 4 ++-- pkgs/development/python-modules/diceware/default.nix | 4 ++-- pkgs/development/python-modules/django_guardian/default.nix | 4 ++-- pkgs/development/python-modules/dropbox/default.nix | 4 ++-- pkgs/development/python-modules/fastpair/default.nix | 4 ++-- pkgs/development/python-modules/fastparquet/default.nix | 4 ++-- pkgs/development/python-modules/favicon/default.nix | 4 ++-- pkgs/development/python-modules/ffmpeg-python/default.nix | 4 ++-- pkgs/development/python-modules/flake8/default.nix | 4 ++-- pkgs/development/python-modules/flickrapi/default.nix | 4 ++-- pkgs/development/python-modules/fontmath/default.nix | 4 ++-- pkgs/development/python-modules/genanki/default.nix | 4 ++-- pkgs/development/python-modules/gidgethub/default.nix | 4 ++-- pkgs/development/python-modules/grandalf/default.nix | 4 ++-- pkgs/development/python-modules/guessit/default.nix | 4 ++-- pkgs/development/python-modules/hickle/default.nix | 4 ++-- pkgs/development/python-modules/image-match/default.nix | 4 ++-- pkgs/development/python-modules/inform/default.nix | 4 ++-- pkgs/development/python-modules/jira/default.nix | 4 ++-- pkgs/development/python-modules/keyutils/default.nix | 4 ++-- pkgs/development/python-modules/libais/default.nix | 4 ++-- pkgs/development/python-modules/libcloud/2.nix | 4 ++-- pkgs/development/python-modules/libcloud/default.nix | 4 ++-- pkgs/development/python-modules/lomond/default.nix | 4 ++-- pkgs/development/python-modules/lyricwikia/default.nix | 4 ++-- pkgs/development/python-modules/marisa-trie/default.nix | 4 ++-- .../python-modules/markdownsuperscript/default.nix | 4 ++-- pkgs/development/python-modules/matchpy/default.nix | 4 ++-- pkgs/development/python-modules/matrix-client/default.nix | 4 ++-- pkgs/development/python-modules/mccabe/default.nix | 4 ++-- pkgs/development/python-modules/measurement/default.nix | 4 ++-- pkgs/development/python-modules/multidict/default.nix | 4 ++-- pkgs/development/python-modules/multiset/default.nix | 4 ++-- .../development/python-modules/mwparserfromhell/default.nix | 4 ++-- pkgs/development/python-modules/ndjson/default.nix | 4 ++-- pkgs/development/python-modules/numpy-stl/default.nix | 4 ++-- pkgs/development/python-modules/omegaconf/default.nix | 4 ++-- pkgs/development/python-modules/packet-python/default.nix | 6 +++--- pkgs/development/python-modules/paho-mqtt/default.nix | 4 ++-- pkgs/development/python-modules/parse-type/default.nix | 4 ++-- pkgs/development/python-modules/parsedatetime/default.nix | 4 ++-- pkgs/development/python-modules/paste/default.nix | 4 ++-- pkgs/development/python-modules/pastedeploy/default.nix | 4 ++-- pkgs/development/python-modules/prance/default.nix | 4 ++-- pkgs/development/python-modules/praw/6.3.nix | 4 ++-- .../python-modules/py-air-control-exporter/default.nix | 4 ++-- pkgs/development/python-modules/py-multibase/default.nix | 4 ++-- pkgs/development/python-modules/pycategories/default.nix | 4 ++-- pkgs/development/python-modules/pydicom/default.nix | 4 ++-- pkgs/development/python-modules/pyee/default.nix | 4 ++-- pkgs/development/python-modules/pygal/default.nix | 4 ++-- pkgs/development/python-modules/pylint/1.9.nix | 4 ++-- pkgs/development/python-modules/pymatgen-lammps/default.nix | 4 ++-- pkgs/development/python-modules/pynvim/default.nix | 4 ++-- pkgs/development/python-modules/pyosf/default.nix | 4 ++-- pkgs/development/python-modules/pysrim/default.nix | 4 ++-- pkgs/development/python-modules/pytest-pylint/default.nix | 4 ++-- .../python-modules/{pytestrunner => pytest-runner}/2.nix | 0 .../{pytestrunner => pytest-runner}/default.nix | 0 pkgs/development/python-modules/python-lz4/default.nix | 4 ++-- pkgs/development/python-modules/python-twitter/default.nix | 4 ++-- pkgs/development/python-modules/pythran/default.nix | 4 ++-- pkgs/development/python-modules/pyvips/default.nix | 4 ++-- pkgs/development/python-modules/qcelemental/default.nix | 4 ++-- pkgs/development/python-modules/qcengine/default.nix | 4 ++-- pkgs/development/python-modules/rebulk/default.nix | 4 ++-- pkgs/development/python-modules/reflink/default.nix | 4 ++-- pkgs/development/python-modules/scikit-build/default.nix | 4 ++-- pkgs/development/python-modules/secp256k1/default.nix | 4 ++-- pkgs/development/python-modules/setuptoolstrial/default.nix | 4 ++-- pkgs/development/python-modules/slackclient/default.nix | 4 ++-- pkgs/development/python-modules/sqlite-utils/default.nix | 4 ++-- pkgs/development/python-modules/srptools/default.nix | 4 ++-- pkgs/development/python-modules/ssdeep/default.nix | 4 ++-- pkgs/development/python-modules/sseclient/default.nix | 4 ++-- pkgs/development/python-modules/stone/default.nix | 4 ++-- pkgs/development/python-modules/subliminal/default.nix | 4 ++-- pkgs/development/python-modules/tatsu/default.nix | 4 ++-- pkgs/development/python-modules/tinycss2/default.nix | 4 ++-- pkgs/development/python-modules/token-bucket/default.nix | 4 ++-- pkgs/development/python-modules/torchgpipe/default.nix | 4 ++-- pkgs/development/python-modules/variants/default.nix | 4 ++-- pkgs/development/python-modules/weasyprint/default.nix | 4 ++-- pkgs/development/python-modules/yarl/default.nix | 4 ++-- pkgs/development/tools/analysis/cpplint/default.nix | 2 +- pkgs/development/tools/asn2quickder/default.nix | 4 ++-- pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix | 4 +--- pkgs/misc/flashfocus/default.nix | 2 +- pkgs/servers/dns/doh-proxy/default.nix | 2 +- pkgs/servers/radicale/2.x.nix | 2 +- pkgs/tools/backup/duplicity/default.nix | 2 +- pkgs/tools/backup/zfs-replicate/default.nix | 4 ++-- pkgs/tools/misc/yle-dl/default.nix | 2 +- pkgs/tools/security/sequoia/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 3 +-- pkgs/top-level/python2-packages.nix | 2 +- 120 files changed, 218 insertions(+), 220 deletions(-) rename pkgs/development/python-modules/{pytestrunner => pytest-runner}/2.nix (100%) rename pkgs/development/python-modules/{pytestrunner => pytest-runner}/default.nix (100%) diff --git a/pkgs/applications/misc/pyditz/cerberus.nix b/pkgs/applications/misc/pyditz/cerberus.nix index 5eb43c0e3575..0e473c6a1ba1 100644 --- a/pkgs/applications/misc/pyditz/cerberus.nix +++ b/pkgs/applications/misc/pyditz/cerberus.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pytestrunner, pytest }: +{ lib, buildPythonPackage, fetchPypi, pytest-runner, pytest }: buildPythonPackage rec { pname = "Cerberus"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1pxzr8sfm2hc5s96m9k044i44nwkva70n0ypr6a35v73zn891cx5"; }; - checkInputs = [ pytestrunner pytest ]; + checkInputs = [ pytest-runner pytest ]; meta = with lib; { homepage = "http://python-cerberus.org/"; diff --git a/pkgs/applications/networking/dyndns/dyndnsc/default.nix b/pkgs/applications/networking/dyndns/dyndnsc/default.nix index 66b1d2639d68..07854f48fcc6 100644 --- a/pkgs/applications/networking/dyndns/dyndnsc/default.nix +++ b/pkgs/applications/networking/dyndns/dyndnsc/default.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { substituteInPlace setup.py --replace "bottle==" "bottle>=" ''; - nativeBuildInputs = with python3Packages; [ pytestrunner ]; + nativeBuildInputs = with python3Packages; [ pytest-runner ]; propagatedBuildInputs = with python3Packages; [ daemonocle dnspython diff --git a/pkgs/applications/networking/instant-messengers/matrixcli/default.nix b/pkgs/applications/networking/instant-messengers/matrixcli/default.nix index aadb18606e11..7e88a77193b6 100644 --- a/pkgs/applications/networking/instant-messengers/matrixcli/default.nix +++ b/pkgs/applications/networking/instant-messengers/matrixcli/default.nix @@ -1,6 +1,6 @@ { lib, fetchgit , buildPythonApplication, buildPythonPackage - , pygobject3, pytestrunner, requests, responses, pytest, python-olm + , pygobject3, pytest-runner, requests, responses, pytest, python-olm , canonicaljson, olm }: let @@ -20,7 +20,7 @@ let propagatedBuildInputs = [ requests responses olm python-olm canonicaljson - pytestrunner pytest + pytest-runner pytest ]; doCheck = false; diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix index 83bbc6cf53f9..fc9f70094da1 100644 --- a/pkgs/applications/office/todoman/default.nix +++ b/pkgs/applications/office/todoman/default.nix @@ -44,7 +44,7 @@ buildPythonApplication rec { freezegun hypothesis pytest - pytestrunner + pytest-runner pytest-cov glibcLocales ]; diff --git a/pkgs/applications/terminal-emulators/terminator/default.nix b/pkgs/applications/terminal-emulators/terminator/default.nix index 6ddeffe68eb8..e922a34423c0 100644 --- a/pkgs/applications/terminal-emulators/terminator/default.nix +++ b/pkgs/applications/terminal-emulators/terminator/default.nix @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { intltool gobject-introspection wrapGAppsHook - python3.pkgs.pytestrunner + python3.pkgs.pytest-runner ]; buildInputs = [ diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix index 06a4b2c98a69..5e556b40a890 100644 --- a/pkgs/applications/version-management/nbstripout/default.nix +++ b/pkgs/applications/version-management/nbstripout/default.nix @@ -9,7 +9,7 @@ buildPythonApplication rec { # application, it would mess up the Python environment. Thus, don't add it # here, instead add it to PATH when running unit tests checkInputs = [ pytest pytest-flake8 git ]; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ ipython nbformat ]; src = fetchPypi { diff --git a/pkgs/development/compilers/vyper/default.nix b/pkgs/development/compilers/vyper/default.nix index 4bdad5f7c61c..7df426177483 100644 --- a/pkgs/development/compilers/vyper/default.nix +++ b/pkgs/development/compilers/vyper/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, writeText, asttokens , pycryptodome, pytest_xdist, pytest-cov, recommonmark, semantic-version, sphinx -, sphinx_rtd_theme, pytestrunner }: +, sphinx_rtd_theme, pytest-runner }: let sample-contract = writeText "example.vy" '' @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "e763561a161c35c03b92a0c176096dd9b4c78ab003c2f08324d443f459b3de84"; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; postPatch = '' substituteInPlace setup.py \ diff --git a/pkgs/development/python-modules/aiocontextvars/default.nix b/pkgs/development/python-modules/aiocontextvars/default.nix index 728f2b5fa61a..dc70baab9e5c 100644 --- a/pkgs/development/python-modules/aiocontextvars/default.nix +++ b/pkgs/development/python-modules/aiocontextvars/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, pytestrunner +, pytest-runner , pytest , pytest-asyncio , contextvars @@ -23,7 +23,7 @@ buildPythonPackage rec { }; buildInputs = [ - pytestrunner + pytest-runner ]; checkInputs = [ diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index 1bf5a93130dd..04a3e11be3ef 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, installShellFiles , Babel, requests, requests_oauthlib, six, click, markdown, pyyaml, cryptography -, pytestrunner, coverage, flake8, mock, pytestCheckHook, pytest-cov, tox, gntp, sleekxmpp +, pytest-runner, coverage, flake8, mock, pytestCheckHook, pytest-cov, tox, gntp, sleekxmpp }: buildPythonPackage rec { @@ -19,7 +19,7 @@ buildPythonPackage rec { ]; checkInputs = [ - pytestrunner coverage flake8 mock pytestCheckHook pytest-cov tox gntp sleekxmpp + pytest-runner coverage flake8 mock pytestCheckHook pytest-cov tox gntp sleekxmpp ]; disabledTests = [ "test_apprise_cli_nux_env" ]; diff --git a/pkgs/development/python-modules/arpeggio/default.nix b/pkgs/development/python-modules/arpeggio/default.nix index 97718a300693..5ad433413ce7 100644 --- a/pkgs/development/python-modules/arpeggio/default.nix +++ b/pkgs/development/python-modules/arpeggio/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , glibcLocales -, pytestrunner +, pytest-runner , pytestCheckHook }: @@ -19,7 +19,7 @@ buildPythonPackage rec { LC_ALL = "en_US.UTF-8"; buildInputs = [ glibcLocales ]; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/awkward0/default.nix b/pkgs/development/python-modules/awkward0/default.nix index 3783f9776cd1..ce9f1eabc77a 100644 --- a/pkgs/development/python-modules/awkward0/default.nix +++ b/pkgs/development/python-modules/awkward0/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , numpy -, pytestrunner +, pytest-runner , pytestCheckHook }: @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "039pxzgll2yz8xpr6bw788ymvgvqgna5kgl9m6d9mzi4yhbjsjpx"; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/bacpypes/default.nix b/pkgs/development/python-modules/bacpypes/default.nix index e07b02a08e74..8a1e6771b114 100644 --- a/pkgs/development/python-modules/bacpypes/default.nix +++ b/pkgs/development/python-modules/bacpypes/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, fetchFromGitHub -, wheel, pytestCheckHook, pytestrunner, pythonAtLeast }: +, wheel, pytestCheckHook, pytest-runner, pythonAtLeast }: buildPythonPackage rec { version = "0.18.4"; @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ wheel ]; # Using pytes instead of setuptools check hook allows disabling specific tests - checkInputs = [ pytestCheckHook pytestrunner ]; + checkInputs = [ pytestCheckHook pytest-runner ]; dontUseSetuptoolsCheck = true; disabledTests = [ # Test fails with a an error: AssertionError: assert 30 == 31 diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix index 53319466d3a5..d68318355d88 100644 --- a/pkgs/development/python-modules/bleach/default.nix +++ b/pkgs/development/python-modules/bleach/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , pytest -, pytestrunner +, pytest-runner , six , html5lib , setuptools @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "sha256-mLMXBznl6D3Z3BljPwdHJ62EjL7bYCZwjIrC07aXpDM="; }; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest pytest-runner ]; propagatedBuildInputs = [ packaging six html5lib setuptools ]; # Disable network tests diff --git a/pkgs/development/python-modules/cairocffi/0_9.nix b/pkgs/development/python-modules/cairocffi/0_9.nix index bd7bde42901e..84c1767bc29f 100644 --- a/pkgs/development/python-modules/cairocffi/0_9.nix +++ b/pkgs/development/python-modules/cairocffi/0_9.nix @@ -8,7 +8,7 @@ , makeFontsConf , freefont_ttf , pytest -, pytestrunner +, pytest-runner , glibcLocales , cairo , cffi diff --git a/pkgs/development/python-modules/cairocffi/default.nix b/pkgs/development/python-modules/cairocffi/default.nix index 5c561af2f172..9b64dbeb66c1 100644 --- a/pkgs/development/python-modules/cairocffi/default.nix +++ b/pkgs/development/python-modules/cairocffi/default.nix @@ -8,7 +8,7 @@ , makeFontsConf , freefont_ttf , pytest -, pytestrunner +, pytest-runner , glibcLocales , cairo , cffi diff --git a/pkgs/development/python-modules/cairocffi/generic.nix b/pkgs/development/python-modules/cairocffi/generic.nix index 8b674f3baaa8..cdcdbad3395d 100644 --- a/pkgs/development/python-modules/cairocffi/generic.nix +++ b/pkgs/development/python-modules/cairocffi/generic.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { fontDirectories = [ freefont_ttf ]; }; - checkInputs = [ numpy pytest pytestrunner glibcLocales ]; + checkInputs = [ numpy pytest pytest-runner glibcLocales ]; propagatedBuildInputs = [ cairo cffi ] ++ lib.optional withXcffib xcffib; checkPhase = '' diff --git a/pkgs/development/python-modules/cfn-flip/default.nix b/pkgs/development/python-modules/cfn-flip/default.nix index 98d428cdbeba..bf3eab19d4fa 100644 --- a/pkgs/development/python-modules/cfn-flip/default.nix +++ b/pkgs/development/python-modules/cfn-flip/default.nix @@ -6,7 +6,7 @@ , click , pytest , pytest-cov -, pytestrunner +, pytest-runner , pyyaml , six }: @@ -31,7 +31,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytest-cov - pytestrunner + pytest-runner ]; checkPhase = '' diff --git a/pkgs/development/python-modules/chardet/2.nix b/pkgs/development/python-modules/chardet/2.nix index 65381d40268f..5f6fe0a672a7 100644 --- a/pkgs/development/python-modules/chardet/2.nix +++ b/pkgs/development/python-modules/chardet/2.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, fetchpatch -, pytest, pytestrunner, hypothesis }: +, pytest, pytest-runner, hypothesis }: buildPythonPackage rec { pname = "chardet"; @@ -18,7 +18,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ pytest pytestrunner hypothesis ]; + checkInputs = [ pytest pytest-runner hypothesis ]; meta = with lib; { homepage = "https://github.com/chardet/chardet"; diff --git a/pkgs/development/python-modules/ci-py/default.nix b/pkgs/development/python-modules/ci-py/default.nix index 30220b48b72d..61e1760f3727 100644 --- a/pkgs/development/python-modules/ci-py/default.nix +++ b/pkgs/development/python-modules/ci-py/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, isPy27 -, pytest, pytestrunner, pytestCheckHook }: +, pytest, pytest-runner, pytestCheckHook }: buildPythonPackage rec { version = "1.0.0"; @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "12ax07n81vxbyayhwzi1q6x7gfmwmvrvwm1n4ii6qa6fqlp9pzj7"; }; - nativeBuildInputs = [ pytestrunner ]; # pytest-runner included in setup-requires + nativeBuildInputs = [ pytest-runner ]; # pytest-runner included in setup-requires checkInputs = [ pytest pytestCheckHook ]; pythonImportsCheck = [ "ci" ]; diff --git a/pkgs/development/python-modules/coveralls/default.nix b/pkgs/development/python-modules/coveralls/default.nix index 5d5b07ffd05e..109667582188 100644 --- a/pkgs/development/python-modules/coveralls/default.nix +++ b/pkgs/development/python-modules/coveralls/default.nix @@ -4,7 +4,7 @@ , isPy27 , mock , pytest -, pytestrunner +, pytest-runner , sh , coverage , docopt @@ -33,7 +33,7 @@ buildPythonPackage rec { ]; buildInputs = [ - pytestrunner + pytest-runner ]; postPatch = '' diff --git a/pkgs/development/python-modules/cssselect2/default.nix b/pkgs/development/python-modules/cssselect2/default.nix index 28e524a265ba..25bb35eab2d8 100644 --- a/pkgs/development/python-modules/cssselect2/default.nix +++ b/pkgs/development/python-modules/cssselect2/default.nix @@ -4,7 +4,7 @@ , fetchPypi , tinycss2 , pytest -, pytestrunner +, pytest-runner , pytest-cov , pytest-flake8 , pytest-isort @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ tinycss2 ]; - checkInputs = [ pytest pytestrunner pytest-cov pytest-flake8 pytest-isort ]; + checkInputs = [ pytest pytest-runner pytest-cov pytest-flake8 pytest-isort ]; meta = with lib; { description = "CSS selectors for Python ElementTree"; diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix index f6d7fcac62a5..90b108e3bc74 100644 --- a/pkgs/development/python-modules/daphne/default.nix +++ b/pkgs/development/python-modules/daphne/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPythonPackage, isPy3k, fetchFromGitHub -, asgiref, autobahn, twisted, pytestrunner +, asgiref, autobahn, twisted, pytest-runner , hypothesis, pytest, pytest-asyncio, service-identity, pyopenssl }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "sha256-KWkMV4L7bA2Eo/u4GGif6lmDNrZAzvYyDiyzyWt9LeI="; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ asgiref autobahn twisted service-identity pyopenssl ]; diff --git a/pkgs/development/python-modules/defcon/default.nix b/pkgs/development/python-modules/defcon/default.nix index 100c7ee6fc1f..30853aa41a64 100644 --- a/pkgs/development/python-modules/defcon/default.nix +++ b/pkgs/development/python-modules/defcon/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder , fonttools, setuptools-scm -, pytest, pytestrunner, lxml, fs, unicodedata2, fontpens +, pytest, pytest-runner, lxml, fs, unicodedata2, fontpens }: buildPythonPackage rec { @@ -25,7 +25,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestrunner + pytest-runner lxml fs unicodedata2 diff --git a/pkgs/development/python-modules/diceware/default.nix b/pkgs/development/python-modules/diceware/default.nix index 8e35eabfb0d7..d519aa76c8b1 100644 --- a/pkgs/development/python-modules/diceware/default.nix +++ b/pkgs/development/python-modules/diceware/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, pytestrunner +, pytest-runner , setuptools , coverage, pytest }: @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "0klb0ysybzlh2wihvir82hgq62v0jjmlcqklwajyms7c0p529yby"; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/django_guardian/default.nix b/pkgs/development/python-modules/django_guardian/default.nix index 0e3eaff6cb57..9685e55bb1c3 100644 --- a/pkgs/development/python-modules/django_guardian/default.nix +++ b/pkgs/development/python-modules/django_guardian/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi , django_environ, mock, django -, pytest, pytestrunner, pytest-django +, pytest, pytest-runner, pytest-django }: buildPythonPackage rec { pname = "django-guardian"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "c58a68ae76922d33e6bdc0e69af1892097838de56e93e78a8361090bcd9f89a0"; }; - checkInputs = [ pytest pytestrunner pytest-django django_environ mock ]; + checkInputs = [ pytest pytest-runner pytest-django django_environ mock ]; propagatedBuildInputs = [ django ]; meta = with lib; { diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index c6751eede2fe..f5a9274a0d18 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, pytestrunner, requests, urllib3, mock, setuptools, stone }: +, pytest-runner, requests, urllib3, mock, setuptools, stone }: buildPythonPackage rec { pname = "dropbox"; @@ -18,7 +18,7 @@ buildPythonPackage rec { # Set DROPBOX_TOKEN environment variable to a valid token. doCheck = false; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ requests urllib3 mock setuptools stone ]; meta = with lib; { diff --git a/pkgs/development/python-modules/fastpair/default.nix b/pkgs/development/python-modules/fastpair/default.nix index eaf1a78520a2..45d9976896ec 100644 --- a/pkgs/development/python-modules/fastpair/default.nix +++ b/pkgs/development/python-modules/fastpair/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytestrunner, pytest, scipy, pytestCheckHook }: +{ lib, buildPythonPackage, fetchFromGitHub, pytest-runner, pytest, scipy, pytestCheckHook }: buildPythonPackage { pname = "fastpair"; @@ -11,7 +11,7 @@ buildPythonPackage { sha256 = "1l8zgr8awg27lhlkpa2dsvghrb7b12jl1bkgpzg5q7pg8nizl9mx"; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; checkInputs = [ pytest pytestCheckHook ]; diff --git a/pkgs/development/python-modules/fastparquet/default.nix b/pkgs/development/python-modules/fastparquet/default.nix index c0694a58cb71..155f3b6e8290 100644 --- a/pkgs/development/python-modules/fastparquet/default.nix +++ b/pkgs/development/python-modules/fastparquet/default.nix @@ -5,7 +5,7 @@ , numba , numpy , pandas -, pytestrunner +, pytest-runner , cramjam , fsspec , thrift @@ -23,7 +23,7 @@ buildPythonPackage rec { hash = "sha256-wSJ6PqW7c8DJCsGuPhXaVGM2s/1dZhLjG4C0JWPcjhY="; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ cramjam fsspec numba numpy pandas thrift ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/favicon/default.nix b/pkgs/development/python-modules/favicon/default.nix index 5af3be420b02..1a3917fbdb7a 100644 --- a/pkgs/development/python-modules/favicon/default.nix +++ b/pkgs/development/python-modules/favicon/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, requests, beautifulsoup4, pytest, requests-mock, - pytestrunner }: + pytest-runner }: buildPythonPackage rec { pname = "favicon"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "6d6b5a78de2a0d0084589f687f384b2ecd6a6527093fec564403b1a30605d7a8"; }; - buildInputs = [ pytestrunner ]; + buildInputs = [ pytest-runner ]; checkInputs = [ pytest requests-mock ]; propagatedBuildInputs = [ requests beautifulsoup4 ]; diff --git a/pkgs/development/python-modules/ffmpeg-python/default.nix b/pkgs/development/python-modules/ffmpeg-python/default.nix index f845ca6a5d36..1f8c6983cbd8 100644 --- a/pkgs/development/python-modules/ffmpeg-python/default.nix +++ b/pkgs/development/python-modules/ffmpeg-python/default.nix @@ -5,7 +5,7 @@ , pytestCheckHook , ffmpeg , future -, pytestrunner +, pytest-runner , pytest-mock }: @@ -27,7 +27,7 @@ buildPythonPackage rec { }) ]; - buildInputs = [ pytestrunner ]; + buildInputs = [ pytest-runner ]; propagatedBuildInputs = [ future ]; checkInputs = [ pytestCheckHook pytest-mock ]; diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index b6f287669c58..0110db18c4c3 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder -, mock, pytest, pytestrunner +, mock, pytest, pytest-runner , configparser, enum34, mccabe, pycodestyle, pyflakes, functools32, typing ? null, importlib-metadata }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "07528381786f2a6237b061f6e96610a4167b226cb926e2aa2b6b1d78057c576b"; }; - checkInputs = [ pytest mock pytestrunner ]; + checkInputs = [ pytest mock pytest-runner ]; propagatedBuildInputs = [ pyflakes pycodestyle mccabe ] ++ lib.optionals (pythonOlder "3.2") [ configparser functools32 ] ++ lib.optionals (pythonOlder "3.4") [ enum34 ] diff --git a/pkgs/development/python-modules/flickrapi/default.nix b/pkgs/development/python-modules/flickrapi/default.nix index 73b7eea6e63a..c989cfbb56d5 100644 --- a/pkgs/development/python-modules/flickrapi/default.nix +++ b/pkgs/development/python-modules/flickrapi/default.nix @@ -5,7 +5,7 @@ , requests_toolbelt , requests_oauthlib , pytest -, pytestrunner +, pytest-runner , pytest-cov , responses }: @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests requests_toolbelt requests_oauthlib ]; - checkInputs = [ pytest pytestrunner pytest-cov responses ]; + checkInputs = [ pytest pytest-runner pytest-cov responses ]; doCheck = false; # Otherwise: # ========================= no tests ran in 0.01 seconds ========================= # builder for '/nix/store/c8a58v6aa18zci08q2l53s12ywn8jqhq-python3.6-flickrapi-2.4.0.drv' failed with exit code 5 diff --git a/pkgs/development/python-modules/fontmath/default.nix b/pkgs/development/python-modules/fontmath/default.nix index a6982037c1eb..d9516ceb88b4 100644 --- a/pkgs/development/python-modules/fontmath/default.nix +++ b/pkgs/development/python-modules/fontmath/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, isPy27 , fonttools, setuptools-scm -, pytest, pytestrunner +, pytest, pytest-runner }: buildPythonPackage rec { @@ -17,7 +17,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ fonttools ]; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest pytest-runner ]; meta = with lib; { description = "A collection of objects that implement fast font, glyph, etc. math"; diff --git a/pkgs/development/python-modules/genanki/default.nix b/pkgs/development/python-modules/genanki/default.nix index f755bb8cf8f5..2c54bc4910b5 100644 --- a/pkgs/development/python-modules/genanki/default.nix +++ b/pkgs/development/python-modules/genanki/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, isPy3k -, cached-property, frozendict, pystache, pyyaml, pytest, pytestrunner +, cached-property, frozendict, pystache, pyyaml, pytest, pytest-runner }: buildPythonPackage rec { @@ -12,7 +12,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - pytestrunner + pytest-runner cached-property frozendict pystache diff --git a/pkgs/development/python-modules/gidgethub/default.nix b/pkgs/development/python-modules/gidgethub/default.nix index a65de61b6dbe..691af2eda849 100644 --- a/pkgs/development/python-modules/gidgethub/default.nix +++ b/pkgs/development/python-modules/gidgethub/default.nix @@ -3,7 +3,7 @@ , fetchPypi , pythonOlder , setuptools -, pytestrunner +, pytest-runner , pytest , pytest-asyncio , twisted @@ -25,7 +25,7 @@ buildPythonPackage rec { sha256 = "3efbd6998600254ec7a2869318bd3ffde38edc3a0d37be0c14bc46b45947b682"; }; - nativeBuildInputs = [ setuptools pytestrunner ]; + nativeBuildInputs = [ setuptools pytest-runner ]; checkInputs = [ pytest pytest-asyncio twisted treq tornado aiohttp ]; propagatedBuildInputs = [ uritemplate diff --git a/pkgs/development/python-modules/grandalf/default.nix b/pkgs/development/python-modules/grandalf/default.nix index 2d2658e00f84..6056d215d227 100644 --- a/pkgs/development/python-modules/grandalf/default.nix +++ b/pkgs/development/python-modules/grandalf/default.nix @@ -4,7 +4,7 @@ , pyparsing , future , pytest -, pytestrunner +, pytest-runner }: buildPythonPackage rec { @@ -24,7 +24,7 @@ buildPythonPackage rec { future ]; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest pytest-runner ]; patches = [ ./no-setup-requires-pytestrunner.patch ]; diff --git a/pkgs/development/python-modules/guessit/default.nix b/pkgs/development/python-modules/guessit/default.nix index adb131868c7c..0e8d07465989 100644 --- a/pkgs/development/python-modules/guessit/default.nix +++ b/pkgs/development/python-modules/guessit/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, pytestrunner +, pytest-runner , python-dateutil , babelfish , rebulk @@ -18,7 +18,7 @@ buildPythonPackage rec { # Tests require more packages. doCheck = false; - buildInputs = [ pytestrunner ]; + buildInputs = [ pytest-runner ]; propagatedBuildInputs = [ python-dateutil babelfish rebulk ]; diff --git a/pkgs/development/python-modules/hickle/default.nix b/pkgs/development/python-modules/hickle/default.nix index 0852ce4d4430..21af8addaac0 100644 --- a/pkgs/development/python-modules/hickle/default.nix +++ b/pkgs/development/python-modules/hickle/default.nix @@ -10,7 +10,7 @@ , codecov , pytest , pytest-cov -, pytestrunner +, pytest-runner , coveralls , twine , check-manifest @@ -36,7 +36,7 @@ buildPythonPackage rec { doCheck = false; # incompatible with latest astropy checkInputs = [ - pytest pytest-cov pytestrunner coveralls scipy pandas astropy twine check-manifest codecov + pytest pytest-cov pytest-runner coveralls scipy pandas astropy twine check-manifest codecov ]; pythonImportsCheck = [ "hickle" ]; diff --git a/pkgs/development/python-modules/image-match/default.nix b/pkgs/development/python-modules/image-match/default.nix index ed5179d6db5f..a59f7e08b988 100644 --- a/pkgs/development/python-modules/image-match/default.nix +++ b/pkgs/development/python-modules/image-match/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytestrunner, scikitimage }: +{ lib, buildPythonPackage, fetchFromGitHub, pytest-runner, scikitimage }: buildPythonPackage { pname = "image-match"; @@ -11,7 +11,7 @@ buildPythonPackage { sha256 = "0vlmpidmhkpgdzw2k03x5layhijcrjpmyfd93yv2ls77ihz00ix5"; }; - buildInputs = [ pytestrunner ]; + buildInputs = [ pytest-runner ]; propagatedBuildInputs = [ scikitimage diff --git a/pkgs/development/python-modules/inform/default.nix b/pkgs/development/python-modules/inform/default.nix index 86bad819a6f7..9f78d86a2be6 100644 --- a/pkgs/development/python-modules/inform/default.nix +++ b/pkgs/development/python-modules/inform/default.nix @@ -3,7 +3,7 @@ , six , hypothesis , pytest -, pytestrunner +, pytest-runner , pytestCheckHook }: @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "114cyff00j9r7qm2ld4w1a4kklr5gx570vk67p56gpr2553dkmly"; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ arrow six ]; checkInputs = [ pytest hypothesis ]; diff --git a/pkgs/development/python-modules/jira/default.nix b/pkgs/development/python-modules/jira/default.nix index 7507789fd533..e386f390bc23 100644 --- a/pkgs/development/python-modules/jira/default.nix +++ b/pkgs/development/python-modules/jira/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, isPy3k -, pytest, pytestrunner, pbr, glibcLocales , pytest-cov +, pytest, pytest-runner, pbr, glibcLocales , pytest-cov , requests, requests_oauthlib, requests_toolbelt, defusedxml , ipython }: @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "e2a94adff98e45b29ded030adc76103eab34fa7d4d57303f211f572bedba0e93"; }; - buildInputs = [ glibcLocales pytest pytest-cov pytestrunner pbr ]; + buildInputs = [ glibcLocales pytest pytest-cov pytest-runner pbr ]; propagatedBuildInputs = [ requests requests_oauthlib requests_toolbelt defusedxml pbr ipython ]; # impure tests because of connectivity attempts to jira servers diff --git a/pkgs/development/python-modules/keyutils/default.nix b/pkgs/development/python-modules/keyutils/default.nix index 4134c47084a2..3d1575d8c37f 100644 --- a/pkgs/development/python-modules/keyutils/default.nix +++ b/pkgs/development/python-modules/keyutils/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, keyutils, pytestrunner, pytest }: +{ lib, buildPythonPackage, fetchFromGitHub, keyutils, pytest-runner, pytest }: buildPythonPackage rec { pname = "keyutils"; @@ -13,7 +13,7 @@ buildPythonPackage rec { }; buildInputs = [ keyutils ]; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest pytest-runner ]; meta = { description = "A set of python bindings for keyutils"; diff --git a/pkgs/development/python-modules/libais/default.nix b/pkgs/development/python-modules/libais/default.nix index 36918a484c3e..8985e8fbcf51 100644 --- a/pkgs/development/python-modules/libais/default.nix +++ b/pkgs/development/python-modules/libais/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, - six, pytest, pytestrunner, pytest-cov, coverage + six, pytest, pytest-runner, pytest-cov, coverage }: buildPythonPackage rec { pname = "libais"; @@ -13,7 +13,7 @@ buildPythonPackage rec { # data files missing doCheck = false; - checkInputs = [ pytest pytestrunner pytest-cov coverage ]; + checkInputs = [ pytest pytest-runner pytest-cov coverage ]; propagatedBuildInputs = [ six ]; meta = with lib; { diff --git a/pkgs/development/python-modules/libcloud/2.nix b/pkgs/development/python-modules/libcloud/2.nix index 52c1cf9a9d7f..c59e026fe4f3 100644 --- a/pkgs/development/python-modules/libcloud/2.nix +++ b/pkgs/development/python-modules/libcloud/2.nix @@ -5,7 +5,7 @@ , mock , pycrypto , requests -, pytestrunner +, pytest-runner , pytest , requests-mock , typing @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "70096690b24a7832cc5abdfda1954b49fddc1c09a348a1e6caa781ac867ed4c6"; }; - checkInputs = [ mock pytest pytestrunner requests-mock ]; + checkInputs = [ mock pytest pytest-runner requests-mock ]; propagatedBuildInputs = [ pycrypto requests ] ++ lib.optionals isPy27 [ typing backports_ssl_match_hostname ]; diff --git a/pkgs/development/python-modules/libcloud/default.nix b/pkgs/development/python-modules/libcloud/default.nix index 0449f6099581..78afad13dd20 100644 --- a/pkgs/development/python-modules/libcloud/default.nix +++ b/pkgs/development/python-modules/libcloud/default.nix @@ -5,7 +5,7 @@ , mock , pycrypto , requests -, pytestrunner +, pytest-runner , pytest , requests-mock , typing @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "d7450453eaf5904eb4fb4f74cf9f37dc83721a719bce34f5abb336b1a1ab974d"; }; - checkInputs = [ mock pytest pytestrunner requests-mock ]; + checkInputs = [ mock pytest pytest-runner requests-mock ]; propagatedBuildInputs = [ pycrypto requests ] ++ lib.optionals isPy27 [ typing ]; preConfigure = "cp libcloud/test/secrets.py-dist libcloud/test/secrets.py"; diff --git a/pkgs/development/python-modules/lomond/default.nix b/pkgs/development/python-modules/lomond/default.nix index 669f16e5f928..3efe41e00797 100644 --- a/pkgs/development/python-modules/lomond/default.nix +++ b/pkgs/development/python-modules/lomond/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, freezegun, fetchFromGitHub, lib, pytestCheckHook -, pytest-mock, pytestrunner, six, tornado_4 }: +, pytest-mock, pytest-runner, six, tornado_4 }: buildPythonPackage rec { pname = "lomond"; @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0lydq0imala08wxdyg2iwhqa6gcdrn24ah14h91h2zcxjhjk4gv8"; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ six ]; checkInputs = [ pytestCheckHook freezegun pytest-mock tornado_4 ]; # Makes HTTP requests diff --git a/pkgs/development/python-modules/lyricwikia/default.nix b/pkgs/development/python-modules/lyricwikia/default.nix index a5ea55c39cf5..19bb14419a4f 100644 --- a/pkgs/development/python-modules/lyricwikia/default.nix +++ b/pkgs/development/python-modules/lyricwikia/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage, pytestrunner, six, beautifulsoup4, requests, }: +{ lib, fetchPypi, buildPythonPackage, pytest-runner, six, beautifulsoup4, requests, }: buildPythonPackage rec { pname = "lyricwikia"; version = "0.1.11"; @@ -8,7 +8,7 @@ buildPythonPackage rec { sha256 = "0l5lkvr3299x79i7skdiggp67rzgax3s00psd1zqkxfysq27jvc8"; }; - buildInputs = [ pytestrunner ]; + buildInputs = [ pytest-runner ]; propagatedBuildInputs = [ six beautifulsoup4 requests ]; # upstream has no code tests doCheck = false; diff --git a/pkgs/development/python-modules/marisa-trie/default.nix b/pkgs/development/python-modules/marisa-trie/default.nix index 69f272c409d8..ade031409b41 100644 --- a/pkgs/development/python-modules/marisa-trie/default.nix +++ b/pkgs/development/python-modules/marisa-trie/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , cython -, pytestrunner +, pytest-runner , pytestCheckHook , hypothesis }: @@ -23,7 +23,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cython - pytestrunner + pytest-runner ]; preBuild = '' diff --git a/pkgs/development/python-modules/markdownsuperscript/default.nix b/pkgs/development/python-modules/markdownsuperscript/default.nix index a7876a75e495..04e59287a86a 100644 --- a/pkgs/development/python-modules/markdownsuperscript/default.nix +++ b/pkgs/development/python-modules/markdownsuperscript/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, markdown, - pytest, pytestrunner, pytest-cov, coverage }: + pytest, pytest-runner, pytest-cov, coverage }: buildPythonPackage rec { pname = "MarkdownSuperscript"; @@ -20,7 +20,7 @@ buildPythonPackage rec { sed 's/=.*//' -i requirements/*.txt ''; - checkInputs = [ pytest pytestrunner pytest-cov coverage ]; + checkInputs = [ pytest pytest-runner pytest-cov coverage ]; meta = with lib; { description = "An extension to the Python Markdown package enabling superscript text"; diff --git a/pkgs/development/python-modules/matchpy/default.nix b/pkgs/development/python-modules/matchpy/default.nix index 794b2c8f4add..8ee3d60f8010 100644 --- a/pkgs/development/python-modules/matchpy/default.nix +++ b/pkgs/development/python-modules/matchpy/default.nix @@ -5,7 +5,7 @@ , hopcroftkarp , multiset , pytest -, pytestrunner +, pytest-runner , hypothesis , setuptools-scm , isPy27 @@ -36,7 +36,7 @@ buildPythonPackage rec { --replace "pytest>=3.0,<4.0" "pytest" ''; - buildInputs = [ setuptools-scm pytestrunner ]; + buildInputs = [ setuptools-scm pytest-runner ]; checkInputs = [ pytest hypothesis ]; propagatedBuildInputs = [ hopcroftkarp multiset ]; diff --git a/pkgs/development/python-modules/matrix-client/default.nix b/pkgs/development/python-modules/matrix-client/default.nix index b8439a0c23d4..354eace5047d 100644 --- a/pkgs/development/python-modules/matrix-client/default.nix +++ b/pkgs/development/python-modules/matrix-client/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , requests -, pytest, pytestrunner, responses +, pytest, pytest-runner, responses }: buildPythonPackage rec { @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "1mgjd0ymf9mvqjkvgx3xjhxap7rzdmpa21wfy0cxbw2xcswcrqyw"; }; - checkInputs = [ pytest pytestrunner responses ]; + checkInputs = [ pytest pytest-runner responses ]; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/mccabe/default.nix b/pkgs/development/python-modules/mccabe/default.nix index 03343aec16e8..f20cb18b4885 100644 --- a/pkgs/development/python-modules/mccabe/default.nix +++ b/pkgs/development/python-modules/mccabe/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, pytestrunner }: +{ lib, buildPythonPackage, fetchPypi, pytest, pytest-runner }: buildPythonPackage rec { pname = "mccabe"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "07w3p1qm44hgxf3vvwz84kswpsx6s7kvaibzrsx5dzm0hli1i3fx"; }; - buildInputs = [ pytest pytestrunner ]; + buildInputs = [ pytest pytest-runner ]; meta = with lib; { description = "McCabe checker, plugin for flake8"; diff --git a/pkgs/development/python-modules/measurement/default.nix b/pkgs/development/python-modules/measurement/default.nix index c3ce875b4f57..30969501213c 100644 --- a/pkgs/development/python-modules/measurement/default.nix +++ b/pkgs/development/python-modules/measurement/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, buildPythonPackage, isPy3k -, sympy, pytest, pytestrunner, sphinx, setuptools-scm }: +, sympy, pytest, pytest-runner, sphinx, setuptools-scm }: buildPythonPackage rec { pname = "measurement"; @@ -18,7 +18,7 @@ buildPythonPackage rec { sed -i 's|use_scm_version=True|version="${version}"|' setup.py ''; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest pytest-runner ]; nativeBuildInputs = [ sphinx setuptools-scm ]; propagatedBuildInputs = [ sympy ]; diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index 10cbc58eb8d8..ec19843ab9dc 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -1,7 +1,7 @@ { lib , fetchPypi , buildPythonPackage -, pytestCheckHook, pytestrunner, pytest-cov +, pytestCheckHook, pytest-runner, pytest-cov , isPy3k }: @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "25b4e5f22d3a37ddf3effc0710ba692cfc792c2b9edfb9c05aefe823256e84d5"; }; - checkInputs = [ pytestCheckHook pytestrunner pytest-cov ]; + checkInputs = [ pytestCheckHook pytest-runner pytest-cov ]; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/multiset/default.nix b/pkgs/development/python-modules/multiset/default.nix index e183031b8d95..fa2fa87d0e89 100644 --- a/pkgs/development/python-modules/multiset/default.nix +++ b/pkgs/development/python-modules/multiset/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , setuptools-scm -, pytestrunner +, pytest-runner , pytest }: @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "4801569c08bfcecfe7b0927b17f079c90f8607aca8fecaf42ded92b737162bc7"; }; - buildInputs = [ setuptools-scm pytestrunner ]; + buildInputs = [ setuptools-scm pytest-runner ]; checkInputs = [ pytest ]; meta = with lib; { diff --git a/pkgs/development/python-modules/mwparserfromhell/default.nix b/pkgs/development/python-modules/mwparserfromhell/default.nix index 8c29971afe79..c1e57be4ded0 100644 --- a/pkgs/development/python-modules/mwparserfromhell/default.nix +++ b/pkgs/development/python-modules/mwparserfromhell/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , pytestCheckHook -, pytestrunner +, pytest-runner }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytestrunner + pytest-runner ]; meta = with lib; { diff --git a/pkgs/development/python-modules/ndjson/default.nix b/pkgs/development/python-modules/ndjson/default.nix index b69e8401eb51..cd70025d6106 100644 --- a/pkgs/development/python-modules/ndjson/default.nix +++ b/pkgs/development/python-modules/ndjson/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, watchdog, flake8 -, pytest, pytestrunner, coverage, sphinx, twine }: +, pytest, pytest-runner, coverage, sphinx, twine }: buildPythonPackage rec { pname = "ndjson"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "v5dGy2uxy1PRcs2n8VTAfHhtZl/yg0Hk5om3lrIp5dY="; }; - checkInputs = [ pytest pytestrunner flake8 twine sphinx coverage watchdog ]; + checkInputs = [ pytest pytest-runner flake8 twine sphinx coverage watchdog ]; meta = with lib; { homepage = "https://github.com/rhgrant10/ndjson"; diff --git a/pkgs/development/python-modules/numpy-stl/default.nix b/pkgs/development/python-modules/numpy-stl/default.nix index 53577567bf6e..f9c27b4c79a3 100644 --- a/pkgs/development/python-modules/numpy-stl/default.nix +++ b/pkgs/development/python-modules/numpy-stl/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, cython, numpy, nine, pytest, pytestrunner, python-utils, enum34 }: +{ lib, buildPythonPackage, fetchPypi, cython, numpy, nine, pytest, pytest-runner, python-utils, enum34 }: buildPythonPackage rec { pname = "numpy-stl"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "411c633d2a03c295d98fb26023a6e7f574ceead04015d06e80cdab20b630a742"; }; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest pytest-runner ]; checkPhase = "py.test"; diff --git a/pkgs/development/python-modules/omegaconf/default.nix b/pkgs/development/python-modules/omegaconf/default.nix index ad9da46243b0..42249e933789 100644 --- a/pkgs/development/python-modules/omegaconf/default.nix +++ b/pkgs/development/python-modules/omegaconf/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder -, pytest, pytestrunner, pyyaml, six, pathlib2, isPy27 }: +, pytest, pytest-runner, pyyaml, six, pathlib2, isPy27 }: buildPythonPackage rec { pname = "omegaconf"; @@ -13,7 +13,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; - buildInputs = [ pytestrunner ]; + buildInputs = [ pytest-runner ]; propagatedBuildInputs = [ pyyaml six ] ++ lib.optional isPy27 pathlib2; meta = with lib; { diff --git a/pkgs/development/python-modules/packet-python/default.nix b/pkgs/development/python-modules/packet-python/default.nix index 1bbb713f40bd..c63c6df86f9f 100644 --- a/pkgs/development/python-modules/packet-python/default.nix +++ b/pkgs/development/python-modules/packet-python/default.nix @@ -6,7 +6,7 @@ # For tests/setup.py , pytest -, pytestrunner +, pytest-runner , requests-mock }: @@ -17,11 +17,11 @@ buildPythonPackage rec { inherit pname version; sha256 = "4af12f2fbcc9713878ab4ed571e9fda028bc68add34cde0e7226af4d833a4d38"; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ requests ]; checkInputs = [ pytest - pytestrunner + pytest-runner requests-mock ]; diff --git a/pkgs/development/python-modules/paho-mqtt/default.nix b/pkgs/development/python-modules/paho-mqtt/default.nix index 92f8f5d90f10..e8344e88f110 100644 --- a/pkgs/development/python-modules/paho-mqtt/default.nix +++ b/pkgs/development/python-modules/paho-mqtt/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, isPy3k -, stdenv, pytestrunner, pytest, mock }: +, stdenv, pytest-runner, pytest, mock }: buildPythonPackage rec { pname = "paho-mqtt"; @@ -18,7 +18,7 @@ buildPythonPackage rec { substituteInPlace setup.cfg --replace "--pylama" "" ''; - checkInputs = [ pytestrunner pytest ] ++ lib.optional (!isPy3k) mock; + checkInputs = [ pytest-runner pytest ] ++ lib.optional (!isPy3k) mock; doCheck = !stdenv.isDarwin; diff --git a/pkgs/development/python-modules/parse-type/default.nix b/pkgs/development/python-modules/parse-type/default.nix index decb15ff5e6c..709b257e3375 100644 --- a/pkgs/development/python-modules/parse-type/default.nix +++ b/pkgs/development/python-modules/parse-type/default.nix @@ -1,6 +1,6 @@ { lib, fetchPypi , buildPythonPackage, pythonOlder -, pytest, pytestrunner +, pytest, pytest-runner , parse, six, enum34 }: @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "02wclgiqky06y36b3q07b7ngpks5j0gmgl6n71ac2j2hscc0nsbz"; }; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest pytest-runner ]; propagatedBuildInputs = [ parse six ] ++ lib.optional (pythonOlder "3.4") enum34; checkPhase = '' diff --git a/pkgs/development/python-modules/parsedatetime/default.nix b/pkgs/development/python-modules/parsedatetime/default.nix index 77196a7c0e99..ba3662a44b03 100644 --- a/pkgs/development/python-modules/parsedatetime/default.nix +++ b/pkgs/development/python-modules/parsedatetime/default.nix @@ -3,7 +3,7 @@ , fetchPypi , isPy27 , pytest -, pytestrunner +, pytest-runner , future }: @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "4cb368fbb18a0b7231f4d76119165451c8d2e35951455dfee97c62a87b04d455"; }; - buildInputs = [ pytest pytestrunner ]; + buildInputs = [ pytest pytest-runner ]; propagatedBuildInputs = [ future ]; meta = with lib; { diff --git a/pkgs/development/python-modules/paste/default.nix b/pkgs/development/python-modules/paste/default.nix index 533a4dc3a308..71b670b707cc 100644 --- a/pkgs/development/python-modules/paste/default.nix +++ b/pkgs/development/python-modules/paste/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , six -, pytestrunner +, pytest-runner , pytest }: @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ pytestrunner pytest ]; + checkInputs = [ pytest-runner pytest ]; # Certain tests require network checkPhase = '' diff --git a/pkgs/development/python-modules/pastedeploy/default.nix b/pkgs/development/python-modules/pastedeploy/default.nix index 672708b0fd9d..b5d429de081a 100644 --- a/pkgs/development/python-modules/pastedeploy/default.nix +++ b/pkgs/development/python-modules/pastedeploy/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, pytestrunner +, pytest-runner , pytest }: @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "6dead6ab9823a85d585ef27f878bc647f787edb9ca8da0716aa9f1261b464817"; }; - buildInputs = [ pytestrunner ]; + buildInputs = [ pytest-runner ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/prance/default.nix b/pkgs/development/python-modules/prance/default.nix index 783c936cf2d1..0f18a6ad2072 100644 --- a/pkgs/development/python-modules/prance/default.nix +++ b/pkgs/development/python-modules/prance/default.nix @@ -8,7 +8,7 @@ , semver , pytestCheckHook , pytest-cov -, pytestrunner +, pytest-runner , openapi-spec-validator }: @@ -22,7 +22,7 @@ buildPythonPackage rec { }; buildInputs = [ - pytestrunner + pytest-runner ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/praw/6.3.nix b/pkgs/development/python-modules/praw/6.3.nix index 242300949ecb..13ecab806c45 100644 --- a/pkgs/development/python-modules/praw/6.3.nix +++ b/pkgs/development/python-modules/praw/6.3.nix @@ -4,7 +4,7 @@ , betamax-matchers , mock , six -, pytestrunner +, pytest-runner , prawcore , pytest , requests-toolbelt @@ -24,7 +24,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - pytestrunner + pytest-runner ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/py-air-control-exporter/default.nix b/pkgs/development/python-modules/py-air-control-exporter/default.nix index c333c3ea4fd1..869aea01a29a 100644 --- a/pkgs/development/python-modules/py-air-control-exporter/default.nix +++ b/pkgs/development/python-modules/py-air-control-exporter/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, fetchPypi, flask, isPy27, lib, nixosTests -, prometheus_client, py-air-control, pytestCheckHook, pytest-cov, pytestrunner +, prometheus_client, py-air-control, pytestCheckHook, pytest-cov, pytest-runner , setuptools-scm }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ setuptools-scm ]; - checkInputs = [ pytestCheckHook pytest-cov pytestrunner ]; + checkInputs = [ pytestCheckHook pytest-cov pytest-runner ]; propagatedBuildInputs = [ flask prometheus_client py-air-control ]; passthru.tests = { inherit (nixosTests.prometheus-exporters) py-air-control; }; diff --git a/pkgs/development/python-modules/py-multibase/default.nix b/pkgs/development/python-modules/py-multibase/default.nix index b229361917f6..87cfd6b8e427 100644 --- a/pkgs/development/python-modules/py-multibase/default.nix +++ b/pkgs/development/python-modules/py-multibase/default.nix @@ -4,7 +4,7 @@ , lib , morphys , pytest -, pytestrunner +, pytest-runner , python-baseconv , six }: @@ -24,7 +24,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - pytestrunner + pytest-runner ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pycategories/default.nix b/pkgs/development/python-modules/pycategories/default.nix index 48686225e1ef..ec902e0b385d 100644 --- a/pkgs/development/python-modules/pycategories/default.nix +++ b/pkgs/development/python-modules/pycategories/default.nix @@ -5,7 +5,7 @@ , lib , pytest , pythonOlder -, pytestrunner +, pytest-runner }: buildPythonPackage rec { @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "bd70ecb5e94e7659e564ea153f0c7673291dc37c526c246800fc08d6c5378099"; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; # Is private because the author states it's unmaintained # and shouldn't be used in production code diff --git a/pkgs/development/python-modules/pydicom/default.nix b/pkgs/development/python-modules/pydicom/default.nix index a0924fa7f633..539fb9b929d7 100644 --- a/pkgs/development/python-modules/pydicom/default.nix +++ b/pkgs/development/python-modules/pydicom/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , fetchFromGitHub , isPy27 -, pytestrunner +, pytest-runner , pytestCheckHook , numpy , pillow @@ -36,7 +36,7 @@ buildPythonPackage { propagatedBuildInputs = [ numpy pillow ]; - checkInputs = [ pytestrunner pytestCheckHook ]; + checkInputs = [ pytest-runner pytestCheckHook ]; # Setting $HOME to prevent pytest to try to create a folder inside # /homeless-shelter which is read-only. diff --git a/pkgs/development/python-modules/pyee/default.nix b/pkgs/development/python-modules/pyee/default.nix index 833b83b39136..f4afd49bbc28 100644 --- a/pkgs/development/python-modules/pyee/default.nix +++ b/pkgs/development/python-modules/pyee/default.nix @@ -2,7 +2,7 @@ , fetchPypi , lib , vcversioner -, pytestrunner +, pytest-runner , mock , pytest , pytest-asyncio @@ -35,7 +35,7 @@ buildPythonPackage rec { pytest pytest-asyncio pytest-trio - pytestrunner + pytest-runner twisted ] ++ lib.optional isPy27 [ attrs diff --git a/pkgs/development/python-modules/pygal/default.nix b/pkgs/development/python-modules/pygal/default.nix index ec4cff2de615..eb6734649b5d 100644 --- a/pkgs/development/python-modules/pygal/default.nix +++ b/pkgs/development/python-modules/pygal/default.nix @@ -6,7 +6,7 @@ , flask , pyquery , pytest -, pytestrunner +, pytest-runner , cairosvg , tinycss , cssselect @@ -38,7 +38,7 @@ buildPythonPackage rec { # Should be a check input, but upstream lists it under "setup_requires". # https://github.com/Kozea/pygal/issues/430 - pytestrunner + pytest-runner ]; checkInputs = [ diff --git a/pkgs/development/python-modules/pylint/1.9.nix b/pkgs/development/python-modules/pylint/1.9.nix index 64573a1a5282..5dbb3d6750f8 100644 --- a/pkgs/development/python-modules/pylint/1.9.nix +++ b/pkgs/development/python-modules/pylint/1.9.nix @@ -1,6 +1,6 @@ { stdenv, lib, buildPythonPackage, fetchPypi, astroid, six, isort, mccabe, configparser, backports_functools_lru_cache, singledispatch, - pytest, pytestrunner, setuptools }: + pytest, pytest-runner, setuptools }: buildPythonPackage rec { pname = "pylint"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "004kfapkqxqy2s85pmddqv0fabxdxywxrlbi549p0v237pr2v94p"; }; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest pytest-runner ]; propagatedBuildInputs = [ astroid six isort mccabe configparser backports_functools_lru_cache singledispatch setuptools ]; diff --git a/pkgs/development/python-modules/pymatgen-lammps/default.nix b/pkgs/development/python-modules/pymatgen-lammps/default.nix index 72f362f85c45..87d46a35fa84 100644 --- a/pkgs/development/python-modules/pymatgen-lammps/default.nix +++ b/pkgs/development/python-modules/pymatgen-lammps/default.nix @@ -2,7 +2,7 @@ , fetchurl , buildPythonPackage , pymatgen -, pytestrunner +, pytest-runner , pytestCheckHook , isPy3k }: @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "0shldl8is3195jmji7dr3zsh1bzxlahaqrmpr28niks7nnfj80fx"; }; - buildInputs = [ pytestrunner ]; + buildInputs = [ pytest-runner ]; checkInputs = [ pytestCheckHook ]; propagatedBuildInputs = [ pymatgen ]; diff --git a/pkgs/development/python-modules/pynvim/default.nix b/pkgs/development/python-modules/pynvim/default.nix index 244b366081c0..67079a8c1d26 100644 --- a/pkgs/development/python-modules/pynvim/default.nix +++ b/pkgs/development/python-modules/pynvim/default.nix @@ -6,7 +6,7 @@ , greenlet , pythonOlder , isPyPy -, pytestrunner +, pytest-runner }: buildPythonPackage rec { @@ -20,7 +20,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - pytestrunner + pytest-runner ]; # Tests require pkgs.neovim, diff --git a/pkgs/development/python-modules/pyosf/default.nix b/pkgs/development/python-modules/pyosf/default.nix index c25b1b114355..07c657bf226e 100644 --- a/pkgs/development/python-modules/pyosf/default.nix +++ b/pkgs/development/python-modules/pyosf/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , isPy27 -, pytestrunner +, pytest-runner , requests }: @@ -19,7 +19,7 @@ buildPythonPackage rec { }; preBuild = "export HOME=$TMP"; - buildInputs = [ pytestrunner ]; # required via `setup_requires` + buildInputs = [ pytest-runner ]; # required via `setup_requires` propagatedBuildInputs = [ requests ]; doCheck = false; # requires network access diff --git a/pkgs/development/python-modules/pysrim/default.nix b/pkgs/development/python-modules/pysrim/default.nix index b8570427d303..4f295dfc7c27 100644 --- a/pkgs/development/python-modules/pysrim/default.nix +++ b/pkgs/development/python-modules/pysrim/default.nix @@ -1,7 +1,7 @@ { lib , fetchPypi , buildPythonPackage -, pytestrunner +, pytest-runner , numpy , pyyaml }: @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "ada088f73f7e1a3bf085206e81e0f83ed89c1d0b23a789ecd0ba0a250724aee8"; }; - buildInputs = [ pytestrunner ]; + buildInputs = [ pytest-runner ]; propagatedBuildInputs = [ numpy pyyaml ]; # Tests require git lfs download of repository diff --git a/pkgs/development/python-modules/pytest-pylint/default.nix b/pkgs/development/python-modules/pytest-pylint/default.nix index 16a1fb92dd6f..e03e0fbe626c 100644 --- a/pkgs/development/python-modules/pytest-pylint/default.nix +++ b/pkgs/development/python-modules/pytest-pylint/default.nix @@ -5,7 +5,7 @@ , pytest , pylint , six -, pytestrunner +, pytest-runner , toml }: @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "790c7a8019fab08e59bd3812db1657a01995a975af8b1c6ce95b9aa39d61da27"; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytestrunner/2.nix b/pkgs/development/python-modules/pytest-runner/2.nix similarity index 100% rename from pkgs/development/python-modules/pytestrunner/2.nix rename to pkgs/development/python-modules/pytest-runner/2.nix diff --git a/pkgs/development/python-modules/pytestrunner/default.nix b/pkgs/development/python-modules/pytest-runner/default.nix similarity index 100% rename from pkgs/development/python-modules/pytestrunner/default.nix rename to pkgs/development/python-modules/pytest-runner/default.nix diff --git a/pkgs/development/python-modules/python-lz4/default.nix b/pkgs/development/python-modules/python-lz4/default.nix index 901a368d5d85..180264f102d0 100644 --- a/pkgs/development/python-modules/python-lz4/default.nix +++ b/pkgs/development/python-modules/python-lz4/default.nix @@ -7,7 +7,7 @@ , psutil , pytest , pytest-cov -, pytestrunner +, pytest-runner , setuptools-scm }: @@ -23,7 +23,7 @@ buildPythonPackage rec { sha256 = "009c4rbyj4cjb8fznccfpr5wrzdmi56wq990yjh22n0z2qqylmkf"; }; - nativeBuildInputs = [ setuptools-scm pkgconfig pytestrunner ]; + nativeBuildInputs = [ setuptools-scm pkgconfig pytest-runner ]; checkInputs = [ pytest pytest-cov psutil ]; propagatedBuildInputs = lib.optionals (!isPy3k) [ future ]; diff --git a/pkgs/development/python-modules/python-twitter/default.nix b/pkgs/development/python-modules/python-twitter/default.nix index c368d97633f4..f6814a8d0fda 100644 --- a/pkgs/development/python-modules/python-twitter/default.nix +++ b/pkgs/development/python-modules/python-twitter/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , fetchpatch -, pytestrunner +, pytest-runner , future , requests , responses @@ -31,7 +31,7 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ future requests requests_oauthlib ]; checkInputs = [ pytest responses hypothesis ]; diff --git a/pkgs/development/python-modules/pythran/default.nix b/pkgs/development/python-modules/pythran/default.nix index 10dc9f305724..cb25b09dad72 100644 --- a/pkgs/development/python-modules/pythran/default.nix +++ b/pkgs/development/python-modules/pythran/default.nix @@ -2,7 +2,7 @@ , python , buildPythonPackage , fetchFromGitHub -, pytestrunner +, pytest-runner , ply , networkx , decorator @@ -39,7 +39,7 @@ in buildPythonPackage rec { ]; nativeBuildInputs = [ - pytestrunner + pytest-runner ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvips/default.nix b/pkgs/development/python-modules/pyvips/default.nix index 1a01eda244b0..ea40fc573b63 100644 --- a/pkgs/development/python-modules/pyvips/default.nix +++ b/pkgs/development/python-modules/pyvips/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, pytestrunner, pytestCheckHook, glib, vips, cffi +{ buildPythonPackage, fetchPypi, pytest-runner, pytestCheckHook, glib, vips, cffi , pkg-config, pkgconfig, lib }: buildPythonPackage rec { @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "244e79c625be65237677c79424d4476de6c406805910015d4adbd0186c64a6a2"; }; - nativeBuildInputs = [ pytestrunner pkgconfig pkg-config ]; + nativeBuildInputs = [ pytest-runner pkgconfig pkg-config ]; buildInputs = [ glib vips ]; diff --git a/pkgs/development/python-modules/qcelemental/default.nix b/pkgs/development/python-modules/qcelemental/default.nix index e06afb02165b..b6e0684a2d48 100644 --- a/pkgs/development/python-modules/qcelemental/default.nix +++ b/pkgs/development/python-modules/qcelemental/default.nix @@ -1,12 +1,12 @@ { buildPythonPackage, lib, fetchPypi, numpy -, pydantic, pint, networkx, pytestrunner, pytest-cov, pytest +, pydantic, pint, networkx, pytest-runner, pytest-cov, pytest } : buildPythonPackage rec { pname = "qcelemental"; version = "0.21.0"; - checkInputs = [ pytestrunner pytest-cov pytest ]; + checkInputs = [ pytest-runner pytest-cov pytest ]; propagatedBuildInputs = [ numpy pydantic pint networkx ]; src = fetchPypi { diff --git a/pkgs/development/python-modules/qcengine/default.nix b/pkgs/development/python-modules/qcengine/default.nix index 793e1ada739e..0dd24112bd0b 100644 --- a/pkgs/development/python-modules/qcengine/default.nix +++ b/pkgs/development/python-modules/qcengine/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, lib, fetchPypi, pyyaml, qcelemental, pydantic -, py-cpuinfo, psutil, pytestrunner, pytest, pytest-cov +, py-cpuinfo, psutil, pytest-runner, pytest, pytest-cov } : buildPythonPackage rec { @@ -7,7 +7,7 @@ buildPythonPackage rec { version = "0.19.0"; checkInputs = [ - pytestrunner + pytest-runner pytest-cov pytest ]; diff --git a/pkgs/development/python-modules/rebulk/default.nix b/pkgs/development/python-modules/rebulk/default.nix index fae0bf08e54b..f422934f02fb 100644 --- a/pkgs/development/python-modules/rebulk/default.nix +++ b/pkgs/development/python-modules/rebulk/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, pytestrunner, six, regex}: +{ lib, buildPythonPackage, fetchPypi, pytest, pytest-runner, six, regex}: buildPythonPackage rec { pname = "rebulk"; @@ -11,7 +11,7 @@ buildPythonPackage rec { # Some kind of trickery with imports that doesn't work. doCheck = false; - buildInputs = [ pytest pytestrunner ]; + buildInputs = [ pytest pytest-runner ]; propagatedBuildInputs = [ six regex ]; meta = with lib; { diff --git a/pkgs/development/python-modules/reflink/default.nix b/pkgs/development/python-modules/reflink/default.nix index e9b8beadd16d..9f5024daf7e8 100644 --- a/pkgs/development/python-modules/reflink/default.nix +++ b/pkgs/development/python-modules/reflink/default.nix @@ -3,7 +3,7 @@ , fetchPypi , lib , pytestCheckHook -, pytestrunner +, pytest-runner }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "sha256-ySU1gtskQTv9cDq/wbKkneePMbSQcjnyhumhkpoebjo="; }; - propagatedBuildInputs = [ cffi pytestrunner ]; + propagatedBuildInputs = [ cffi pytest-runner ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/pkgs/development/python-modules/scikit-build/default.nix index 3a3feaa14edc..42f10aedf393 100644 --- a/pkgs/development/python-modules/scikit-build/default.nix +++ b/pkgs/development/python-modules/scikit-build/default.nix @@ -17,7 +17,7 @@ , pytest , pytest-cov , pytest-mock -, pytestrunner +, pytest-runner , pytest-virtualenv , requests , six @@ -50,7 +50,7 @@ buildPythonPackage rec { pytest pytest-cov pytest-mock - pytestrunner + pytest-runner pytest-virtualenv requests six diff --git a/pkgs/development/python-modules/secp256k1/default.nix b/pkgs/development/python-modules/secp256k1/default.nix index bb5cc138a749..58fa81b444f3 100644 --- a/pkgs/development/python-modules/secp256k1/default.nix +++ b/pkgs/development/python-modules/secp256k1/default.nix @@ -3,7 +3,7 @@ , fetchPypi , pkg-config , pytest -, pytestrunner +, pytest-runner , cffi , secp256k1 }: @@ -18,7 +18,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ pkg-config ]; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest pytest-runner ]; propagatedBuildInputs = [ cffi secp256k1 ]; # Tests are not included in archive diff --git a/pkgs/development/python-modules/setuptoolstrial/default.nix b/pkgs/development/python-modules/setuptoolstrial/default.nix index 26b8d732be1d..f959458d2653 100644 --- a/pkgs/development/python-modules/setuptoolstrial/default.nix +++ b/pkgs/development/python-modules/setuptoolstrial/default.nix @@ -3,7 +3,7 @@ , fetchPypi , pytest , virtualenv -, pytestrunner +, pytest-runner , pytest-virtualenv , twisted , pathlib2 @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "14220f8f761c48ba1e2526f087195077cf54fad7098b382ce220422f0ff59b12"; }; - buildInputs = [ pytest virtualenv pytestrunner pytest-virtualenv ]; + buildInputs = [ pytest virtualenv pytest-runner pytest-virtualenv ]; propagatedBuildInputs = [ twisted pathlib2 ]; postPatch = '' diff --git a/pkgs/development/python-modules/slackclient/default.nix b/pkgs/development/python-modules/slackclient/default.nix index e96161228a52..c82eba66acae 100644 --- a/pkgs/development/python-modules/slackclient/default.nix +++ b/pkgs/development/python-modules/slackclient/default.nix @@ -10,7 +10,7 @@ , pytest-cov , pytest-mock , pytestCheckHook -, pytestrunner +, pytest-runner , requests , responses , six @@ -45,7 +45,7 @@ buildPythonPackage rec { pytest-cov pytest-mock pytestCheckHook - pytestrunner + pytest-runner responses ]; diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix index 67a6dba1a8ed..35f7d7c07c98 100644 --- a/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/pkgs/development/python-modules/sqlite-utils/default.nix @@ -7,7 +7,7 @@ , sqlite-fts4 , tabulate , pytestCheckHook -, pytestrunner +, pytest-runner , black , hypothesis , sqlite @@ -32,7 +32,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytestrunner + pytest-runner black hypothesis ]; diff --git a/pkgs/development/python-modules/srptools/default.nix b/pkgs/development/python-modules/srptools/default.nix index 68ca009d9dc2..5339529f3d75 100644 --- a/pkgs/development/python-modules/srptools/default.nix +++ b/pkgs/development/python-modules/srptools/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, six, pytest, pytestrunner }: +{ lib, buildPythonPackage, fetchPypi, six, pytest, pytest-runner }: buildPythonPackage rec { pname = "srptools"; @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest pytest-runner ]; meta = with lib; { description = "Python-Tools to implement Secure Remote Password (SRP) authentication"; diff --git a/pkgs/development/python-modules/ssdeep/default.nix b/pkgs/development/python-modules/ssdeep/default.nix index 904595865b8c..510bbbac9518 100644 --- a/pkgs/development/python-modules/ssdeep/default.nix +++ b/pkgs/development/python-modules/ssdeep/default.nix @@ -5,7 +5,7 @@ , cffi , six , pytest -, pytestrunner +, pytest-runner }: buildPythonPackage rec { @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "0px8k4fjbkjb717bg2v7rjhm4iclrxzq7sh0hfqs55f4ddqi0m8v"; }; - buildInputs = [ pkgs.ssdeep pytestrunner ]; + buildInputs = [ pkgs.ssdeep pytest-runner ]; checkInputs = [ pytest ]; propagatedBuildInputs = [ cffi six ]; diff --git a/pkgs/development/python-modules/sseclient/default.nix b/pkgs/development/python-modules/sseclient/default.nix index 6bbeb23ed1f5..a9fdfe2050e2 100644 --- a/pkgs/development/python-modules/sseclient/default.nix +++ b/pkgs/development/python-modules/sseclient/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, isPy27 , requests, six -, backports_unittest-mock, pytestCheckHook, pytestrunner }: +, backports_unittest-mock, pytestCheckHook, pytest-runner }: buildPythonPackage rec { pname = "sseclient"; @@ -15,7 +15,7 @@ buildPythonPackage rec { # some tests use python3 strings doCheck = !isPy27; - checkInputs = [ backports_unittest-mock pytestCheckHook pytestrunner ]; + checkInputs = [ backports_unittest-mock pytestCheckHook pytest-runner ]; # tries to open connection to wikipedia disabledTests = [ "event_stream" ]; diff --git a/pkgs/development/python-modules/stone/default.nix b/pkgs/development/python-modules/stone/default.nix index 21c92fcee7e9..8ea42d1f2795 100644 --- a/pkgs/development/python-modules/stone/default.nix +++ b/pkgs/development/python-modules/stone/default.nix @@ -2,7 +2,7 @@ , coverage , mock , ply -, pytestrunner +, pytest-runner , pytestCheckHook , six }: @@ -24,7 +24,7 @@ buildPythonPackage rec { --replace "coverage==5.3" "coverage" ''; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ ply six ]; diff --git a/pkgs/development/python-modules/subliminal/default.nix b/pkgs/development/python-modules/subliminal/default.nix index fe92b71f3f52..e334608bd4dc 100644 --- a/pkgs/development/python-modules/subliminal/default.nix +++ b/pkgs/development/python-modules/subliminal/default.nix @@ -20,7 +20,7 @@ , pytest , pytest-flakes , pytest-cov -, pytestrunner +, pytest-runner }: buildPythonPackage rec { @@ -40,7 +40,7 @@ buildPythonPackage rec { checkInputs = [ sympy vcrpy pytest pytest-flakes - pytest-cov pytestrunner + pytest-cov pytest-runner ]; # https://github.com/Diaoul/subliminal/pull/963 diff --git a/pkgs/development/python-modules/tatsu/default.nix b/pkgs/development/python-modules/tatsu/default.nix index d5dfda53c08c..83f6d9ac0637 100644 --- a/pkgs/development/python-modules/tatsu/default.nix +++ b/pkgs/development/python-modules/tatsu/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder , colorama, regex -, pytestrunner, pytestCheckHook, pytest-mypy +, pytest-runner, pytestCheckHook, pytest-mypy }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.8"; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ colorama regex ]; checkInputs = [ pytestCheckHook pytest-mypy ]; diff --git a/pkgs/development/python-modules/tinycss2/default.nix b/pkgs/development/python-modules/tinycss2/default.nix index 7a025577dbb0..05ca81772d81 100644 --- a/pkgs/development/python-modules/tinycss2/default.nix +++ b/pkgs/development/python-modules/tinycss2/default.nix @@ -6,7 +6,7 @@ , webencodings # Check inputs , pytest -, pytestrunner +, pytest-runner , pytest-cov , pytest-flake8 , pytest-isort @@ -34,7 +34,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ webencodings ]; - checkInputs = [ pytest pytestrunner pytest-cov pytest-flake8 pytest-isort ]; + checkInputs = [ pytest pytest-runner pytest-cov pytest-flake8 pytest-isort ]; # https://github.com/PyCQA/pycodestyle/issues/598 preCheck = '' diff --git a/pkgs/development/python-modules/token-bucket/default.nix b/pkgs/development/python-modules/token-bucket/default.nix index f1e90114ac6d..508e38da4500 100644 --- a/pkgs/development/python-modules/token-bucket/default.nix +++ b/pkgs/development/python-modules/token-bucket/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, pytestrunner +, pytest-runner , pytestCheckHook }: @@ -18,7 +18,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - pytestrunner + pytest-runner ]; checkInputs = [ diff --git a/pkgs/development/python-modules/torchgpipe/default.nix b/pkgs/development/python-modules/torchgpipe/default.nix index dbfad336d0f3..2c289f852699 100644 --- a/pkgs/development/python-modules/torchgpipe/default.nix +++ b/pkgs/development/python-modules/torchgpipe/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , isPy27 -, pytestrunner +, pytest-runner , pytestCheckHook , pytorch }: @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pytorch ]; - checkInputs = [ pytestrunner pytestCheckHook ]; + checkInputs = [ pytest-runner pytestCheckHook ]; disabledTests = [ "test_inplace_on_requires_grad" "test_input_requiring_grad" diff --git a/pkgs/development/python-modules/variants/default.nix b/pkgs/development/python-modules/variants/default.nix index a9345b374a7e..2055a4813447 100644 --- a/pkgs/development/python-modules/variants/default.nix +++ b/pkgs/development/python-modules/variants/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage , isPy27 , fetchPypi -, pytestrunner +, pytest-runner , setuptools-scm , singledispatch ? null , pytest @@ -18,7 +18,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - pytestrunner + pytest-runner setuptools-scm ]; diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index c578b7c7c8c0..ecc13b1d6377 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -13,7 +13,7 @@ fontconfig, lib, stdenv, pytest, - pytestrunner, + pytest-runner, pytest-isort, pytest-flake8, pytest-cov, @@ -39,7 +39,7 @@ buildPythonPackage rec { --replace '[tool:pytest]' '[tool:pytest]\nflake8-ignore = E501' ''; - checkInputs = [ pytest pytestrunner pytest-isort pytest-flake8 pytest-cov ]; + checkInputs = [ pytest pytest-runner pytest-isort pytest-flake8 pytest-cov ]; FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf"; diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix index 0aeb85e6ca2d..66d219f9348e 100644 --- a/pkgs/development/python-modules/yarl/default.nix +++ b/pkgs/development/python-modules/yarl/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , pythonOlder , multidict -, pytestrunner +, pytest-runner , pytest , typing-extensions , idna @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "8a9066529240171b68893d60dca86a763eae2139dd42f42106b03cf4b426bf10"; }; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest pytest-runner ]; propagatedBuildInputs = [ multidict idna ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions diff --git a/pkgs/development/tools/analysis/cpplint/default.nix b/pkgs/development/tools/analysis/cpplint/default.nix index 61aee215031a..f880d8fa7b7f 100644 --- a/pkgs/development/tools/analysis/cpplint/default.nix +++ b/pkgs/development/tools/analysis/cpplint/default.nix @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { patchShebangs cpplint_unittest.py ''; - checkInputs = with python3Packages; [ pytest pytestrunner ]; + checkInputs = with python3Packages; [ pytest pytest-runner ]; checkPhase = '' ./cpplint_unittest.py ''; diff --git a/pkgs/development/tools/asn2quickder/default.nix b/pkgs/development/tools/asn2quickder/default.nix index 9ffcbb172d48..1341017df056 100644 --- a/pkgs/development/tools/asn2quickder/default.nix +++ b/pkgs/development/tools/asn2quickder/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonApplication, fetchFromGitHub, makeWrapper, cmake -, pytestrunner, pytest, six, pyparsing, asn1ate }: +, pytest-runner, pytest, six, pyparsing, asn1ate }: buildPythonApplication rec { pname = "asn2quickder"; @@ -19,7 +19,7 @@ buildPythonApplication rec { dontUseCmakeConfigure = true; nativeBuildInputs = [ makeWrapper cmake ]; - checkInputs = [ pytestrunner pytest ]; + checkInputs = [ pytest-runner pytest ]; propagatedBuildInputs = [ pyparsing asn1ate six ]; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index 787513855772..58a634ee86c9 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -499,7 +499,7 @@ self: super: old: { inherit (pkgs.python3Packages.jira) patches; buildInputs = (old.buildInputs or [ ]) ++ [ - self.pytestrunner + self.pytest-runner self.cryptography self.pyjwt ]; @@ -1269,8 +1269,6 @@ self: super: } ); - pytest-runner = super.pytest-runner or super.pytestrunner; - pytest-pylint = super.pytest-pylint.overridePythonAttrs ( old: { buildInputs = [ self.pytest-runner ]; diff --git a/pkgs/misc/flashfocus/default.nix b/pkgs/misc/flashfocus/default.nix index 1bac8b0fe0ce..6a8786be6eaa 100644 --- a/pkgs/misc/flashfocus/default.nix +++ b/pkgs/misc/flashfocus/default.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { }; nativeBuildInputs = with python3.pkgs; [ - pytestrunner + pytest-runner ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/servers/dns/doh-proxy/default.nix b/pkgs/servers/dns/doh-proxy/default.nix index 8774715bb1d8..8128ec6f04d4 100644 --- a/pkgs/servers/dns/doh-proxy/default.nix +++ b/pkgs/servers/dns/doh-proxy/default.nix @@ -10,7 +10,7 @@ buildPythonApplication rec { sha256 = "1fxzxipzdvk75yrcr78mpdz8lwpisba67lk4jcwxdnkv6997dwfp"; }; - nativeBuildInputs = [ pytestrunner flake8]; + nativeBuildInputs = [ pytest-runner flake8]; propagatedBuildInputs = [ aioh2 diff --git a/pkgs/servers/radicale/2.x.nix b/pkgs/servers/radicale/2.x.nix index b0902feeead4..d4ab51ce84f8 100644 --- a/pkgs/servers/radicale/2.x.nix +++ b/pkgs/servers/radicale/2.x.nix @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { ]; checkInputs = with python3.pkgs; [ - pytestrunner + pytest-runner pytest ]; diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index ab6b7d812211..28929615bcdb 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -100,7 +100,7 @@ pythonPackages.buildPythonApplication rec { mock pexpect pytest - pytestrunner + pytest-runner ]); postInstall = '' diff --git a/pkgs/tools/backup/zfs-replicate/default.nix b/pkgs/tools/backup/zfs-replicate/default.nix index aae6ce329f68..fa2f69bb3ef5 100644 --- a/pkgs/tools/backup/zfs-replicate/default.nix +++ b/pkgs/tools/backup/zfs-replicate/default.nix @@ -1,5 +1,5 @@ { buildPythonApplication, click, fetchPypi, hypothesis, mypy, pytest -, pytest-cov, pytestrunner, lib, stringcase +, pytest-cov, pytest-runner, lib, stringcase }: buildPythonApplication rec { @@ -19,7 +19,7 @@ buildPythonApplication rec { ]; buildInputs = [ - pytestrunner + pytest-runner ]; propagatedBuildInputs = [ diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix index cd04e2020b1c..08da843ad33e 100644 --- a/pkgs/tools/misc/yle-dl/default.nix +++ b/pkgs/tools/misc/yle-dl/default.nix @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { pythonPath = [ rtmpdump php wget ]; doCheck = false; # tests require network access - checkInputs = with python3Packages; [ ffmpeg pytest pytestrunner ]; + checkInputs = with python3Packages; [ ffmpeg pytest pytest-runner ]; meta = with lib; { description = "Downloads videos from Yle (Finnish Broadcasting Company) servers"; diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix index a40e2ce33c99..d84f6f299005 100644 --- a/pkgs/tools/security/sequoia/default.nix +++ b/pkgs/tools/security/sequoia/default.nix @@ -51,7 +51,7 @@ rustPlatform.buildRustPackage rec { checkInputs = lib.optionals pythonSupport [ pythonPackages.pytest - pythonPackages.pytestrunner + pythonPackages.pytest-runner ]; buildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b64a5bb748ec..3fe3b02860de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25540,7 +25540,7 @@ in matrixcli = callPackage ../applications/networking/instant-messengers/matrixcli { inherit (python3Packages) buildPythonApplication buildPythonPackage - pygobject3 pytestrunner requests responses pytest python-olm + pygobject3 pytest-runner requests responses pytest python-olm canonicaljson; }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index f42713fee3db..7e74bce1f7bf 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -55,6 +55,7 @@ mapAliases ({ pytestcov = pytest-cov; # added 2021-01-04 pytest-pep8 = pytestpep8; # added 2021-01-04 pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10 + pytestrunner = pytest-runner; # added 2021-01-04 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 rotate-backups = throw "pythonPackages.rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01 selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # Added 2021-06-10 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f689a562a49d..3a811bc9b7d2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6883,8 +6883,7 @@ in { pytest-rerunfailures = callPackage ../development/python-modules/pytest-rerunfailures { }; - pytest-runner = self.pytestrunner; # added 2021-01-04 - pytestrunner = callPackage ../development/python-modules/pytestrunner { }; + pytest-runner = callPackage ../development/python-modules/pytest-runner { }; pytest-sanic = callPackage ../development/python-modules/pytest-sanic { sanic = self.sanic.override { doCheck = false; }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 471548b9fa20..decf36f31e8b 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -478,7 +478,7 @@ with self; with super; { pytest-mock = callPackage ../development/python-modules/pytest-mock/2.nix { }; - pytestrunner = callPackage ../development/python-modules/pytestrunner/2.nix { }; + pytest-runner = callPackage ../development/python-modules/pytest-runner/2.nix { }; pytest_xdist = self.pytest-xdist; # added 2021-01-04 pytest-xdist = callPackage ../development/python-modules/pytest-xdist/1.nix { }; From dd712027be98a6d782fc9cb492f557bb48e3dd31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 20 Jul 2021 23:08:40 +0200 Subject: [PATCH 056/235] pythonPackages: deprecate pytestquickcheck alias --- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 7e74bce1f7bf..8c11398d6b9a 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -55,6 +55,7 @@ mapAliases ({ pytestcov = pytest-cov; # added 2021-01-04 pytest-pep8 = pytestpep8; # added 2021-01-04 pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10 + pytestquickcheck = pytest-quickcheck; # added 2021-07-20 pytestrunner = pytest-runner; # added 2021-01-04 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 rotate-backups = throw "pythonPackages.rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3a811bc9b7d2..640f1fdc2521 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6862,8 +6862,7 @@ in { pytest-qt = callPackage ../development/python-modules/pytest-qt { }; - pytest-quickcheck = self.pytestquickcheck; - pytestquickcheck = callPackage ../development/python-modules/pytest-quickcheck { }; + pytest-quickcheck = callPackage ../development/python-modules/pytest-quickcheck { }; pytest-raises = callPackage ../development/python-modules/pytest-raises { }; From 2e9c330216f5fbb3a5e645ba398a839c5ea08e61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 20 Jul 2021 23:08:56 +0200 Subject: [PATCH 057/235] pythonPackages: deprecate pytest_xdist alias --- pkgs/applications/audio/quodlibet/default.nix | 2 +- pkgs/applications/office/paperless/default.nix | 2 +- pkgs/development/compilers/vyper/default.nix | 2 +- pkgs/development/python-modules/aria2p/default.nix | 4 ++-- pkgs/development/python-modules/certbot/default.nix | 4 ++-- pkgs/development/python-modules/debugpy/default.nix | 4 ++-- pkgs/development/python-modules/diskcache/default.nix | 4 ++-- pkgs/development/python-modules/dyn/default.nix | 4 ++-- pkgs/development/python-modules/hypothesis/2.nix | 4 ++-- pkgs/development/python-modules/ignite/default.nix | 4 ++-- pkgs/development/python-modules/keras/default.nix | 4 ++-- pkgs/development/python-modules/lazy_import/default.nix | 4 ++-- pkgs/development/python-modules/nipype/default.nix | 4 ++-- pkgs/development/python-modules/psautohint/default.nix | 4 ++-- pkgs/development/python-modules/pytest-django/default.nix | 4 ++-- pkgs/development/python-modules/pytest-randomly/default.nix | 4 ++-- pkgs/development/python-modules/sqlalchemy/default.nix | 2 +- pkgs/development/python-modules/stripe/default.nix | 4 ++-- pkgs/development/python-modules/typer/default.nix | 4 ++-- pkgs/tools/admin/lexicon/default.nix | 2 +- pkgs/tools/text/ocrmypdf/default.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 1 - pkgs/top-level/python2-packages.nix | 1 - 24 files changed, 37 insertions(+), 38 deletions(-) diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 24f9f057b65a..6c8ad8225f0b 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ wrapGAppsHook gettext ]; - checkInputs = [ gdk-pixbuf hicolor-icon-theme ] ++ (with python3.pkgs; [ pytest pytest_xdist polib xvfb-run dbus.daemon glibcLocales ]); + checkInputs = [ gdk-pixbuf hicolor-icon-theme ] ++ (with python3.pkgs; [ pytest pytest-xdist polib xvfb-run dbus.daemon glibcLocales ]); buildInputs = [ gnome.adwaita-icon-theme libsoup glib glib-networking gtk3 webkitgtk gdk-pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ] ++ (if xineBackend then [ xine-lib ] else with gst_all_1; diff --git a/pkgs/applications/office/paperless/default.nix b/pkgs/applications/office/paperless/default.nix index 68032ebe8497..74bdacd95845 100644 --- a/pkgs/applications/office/paperless/default.nix +++ b/pkgs/applications/office/paperless/default.nix @@ -148,7 +148,7 @@ let pytest pytest-django pytest-env - pytest_xdist + pytest-xdist ]; pyocrWithUserTesseract = pyPkgs: diff --git a/pkgs/development/compilers/vyper/default.nix b/pkgs/development/compilers/vyper/default.nix index 7df426177483..74c2503523e8 100644 --- a/pkgs/development/compilers/vyper/default.nix +++ b/pkgs/development/compilers/vyper/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, writeText, asttokens -, pycryptodome, pytest_xdist, pytest-cov, recommonmark, semantic-version, sphinx +, pycryptodome, pytest-xdist, pytest-cov, recommonmark, semantic-version, sphinx , sphinx_rtd_theme, pytest-runner }: let diff --git a/pkgs/development/python-modules/aria2p/default.nix b/pkgs/development/python-modules/aria2p/default.nix index 4755c80e707c..2a7e6cb0df95 100644 --- a/pkgs/development/python-modules/aria2p/default.nix +++ b/pkgs/development/python-modules/aria2p/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder -, aria2, poetry, pytest, pytest-cov, pytest_xdist, responses +, aria2, poetry, pytest, pytest-cov, pytest-xdist, responses , asciimatics, loguru, requests, setuptools, websocket-client }: @@ -22,7 +22,7 @@ buildPythonPackage rec { export HOME=$TMPDIR ''; - checkInputs = [ aria2 responses pytest pytest-cov pytest_xdist ]; + checkInputs = [ aria2 responses pytest pytest-cov pytest-xdist ]; # Tests are not all stable/deterministic, # they rely on actually running an aria2c daemon and communicating with it, diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index 7c324e646a4d..255c3ebfdeb9 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , ConfigArgParse, acme, configobj, cryptography, distro, josepy, parsedatetime, pyRFC3339, pyopenssl, pytz, requests, six, zope_component, zope_interface , dialog, gnureadline -, pytest_xdist, pytestCheckHook, python-dateutil +, pytest-xdist, pytestCheckHook, python-dateutil }: buildPythonPackage rec { @@ -42,7 +42,7 @@ buildPythonPackage rec { checkInputs = [ python-dateutil pytestCheckHook - pytest_xdist + pytest-xdist ]; pytestFlagsArray = [ diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index da1f25ad2c3e..283682708840 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -8,7 +8,7 @@ , flask , psutil , pytest-timeout -, pytest_xdist +, pytest-xdist , pytestCheckHook , requests , isPy27 @@ -75,7 +75,7 @@ buildPythonPackage rec { flask psutil pytest-timeout - pytest_xdist + pytest-xdist pytestCheckHook requests ] ++ lib.optionals (!isPy27) [ diff --git a/pkgs/development/python-modules/diskcache/default.nix b/pkgs/development/python-modules/diskcache/default.nix index 50b1a94c7795..0264c0ff10c5 100644 --- a/pkgs/development/python-modules/diskcache/default.nix +++ b/pkgs/development/python-modules/diskcache/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , pytestCheckHook , pytest-cov -, pytest_xdist +, pytest-xdist , pytest-django , mock }: @@ -23,7 +23,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook pytest-cov - pytest_xdist + pytest-xdist pytest-django mock ]; diff --git a/pkgs/development/python-modules/dyn/default.nix b/pkgs/development/python-modules/dyn/default.nix index 72986e7bda1e..8db7f6c9169d 100644 --- a/pkgs/development/python-modules/dyn/default.nix +++ b/pkgs/development/python-modules/dyn/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, pytest, pytest-cov, mock -, pytest_xdist, covCore, glibcLocales }: +, pytest-xdist, covCore, glibcLocales }: buildPythonPackage rec { pname = "dyn"; @@ -16,7 +16,7 @@ buildPythonPackage rec { pytest pytest-cov mock - pytest_xdist + pytest-xdist covCore ]; # Disable checks because they are not stateless and require internet access. diff --git a/pkgs/development/python-modules/hypothesis/2.nix b/pkgs/development/python-modules/hypothesis/2.nix index 5b086d5f1a7f..47bc8860bc54 100644 --- a/pkgs/development/python-modules/hypothesis/2.nix +++ b/pkgs/development/python-modules/hypothesis/2.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub , isPy3k, attrs, coverage, enum34, pexpect -, doCheck ? true, pytest, pytest_xdist, flaky, mock +, doCheck ? true, pytest, pytest-xdist, flaky, mock , sortedcontainers }: buildPythonPackage rec { @@ -29,7 +29,7 @@ buildPythonPackage rec { sortedcontainers ] ++ lib.optional (!isPy3k) enum34; - checkInputs = [ pytest pytest_xdist flaky mock pexpect ]; + checkInputs = [ pytest pytest-xdist flaky mock pexpect ]; inherit doCheck; checkPhase = '' diff --git a/pkgs/development/python-modules/ignite/default.nix b/pkgs/development/python-modules/ignite/default.nix index b82fe568e2a9..432767b9f984 100644 --- a/pkgs/development/python-modules/ignite/default.nix +++ b/pkgs/development/python-modules/ignite/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook -, pytest_xdist +, pytest-xdist , pythonOlder , matplotlib , mock @@ -23,7 +23,7 @@ buildPythonPackage rec { sha256 = "057v8v5p2picmgiidr9lzjbh7nj54pv95m6lyya3y7dw4vzaamij"; }; - checkInputs = [ pytestCheckHook matplotlib mock pytest_xdist ]; + checkInputs = [ pytestCheckHook matplotlib mock pytest-xdist ]; propagatedBuildInputs = [ pytorch scikit-learn tqdm pynvml ]; # runs succesfully in 3.9, however, async isn't correctly closed so it will fail after test suite. diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index b6ac0a1fa132..28b09222b472 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, pytest, pytest-cov, pytest_xdist +, pytest, pytest-cov, pytest-xdist , six, numpy, scipy, pyyaml, h5py , keras-applications, keras-preprocessing }: @@ -16,7 +16,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytest-cov - pytest_xdist + pytest-xdist ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/lazy_import/default.nix b/pkgs/development/python-modules/lazy_import/default.nix index 60eba0577b03..fe35126ea26c 100644 --- a/pkgs/development/python-modules/lazy_import/default.nix +++ b/pkgs/development/python-modules/lazy_import/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi , pytest -, pytest_xdist +, pytest-xdist , six }: buildPythonPackage rec { @@ -14,7 +14,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytest_xdist + pytest-xdist ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 7ecba3b7d3b1..8d0c597a1af0 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -19,7 +19,7 @@ , pybids , pydot , pytest -, pytest_xdist +, pytest-xdist , pytest-forked , rdflib , scipy @@ -93,7 +93,7 @@ buildPythonPackage rec { mock pytest pytest-forked - pytest_xdist + pytest-xdist pytest-cov which ]; diff --git a/pkgs/development/python-modules/psautohint/default.nix b/pkgs/development/python-modules/psautohint/default.nix index 3a720bf328f3..ff312cbff891 100644 --- a/pkgs/development/python-modules/psautohint/default.nix +++ b/pkgs/development/python-modules/psautohint/default.nix @@ -2,7 +2,7 @@ , fonttools , lxml, fs # for fonttools extras , setuptools-scm -, pytestCheckHook, pytest-cov, pytest_xdist +, pytestCheckHook, pytest-cov, pytest-xdist }: buildPythonPackage rec { @@ -32,7 +32,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook pytest-cov - pytest_xdist + pytest-xdist ]; disabledTests = [ # Test that fails on pytest >= v6 diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix index 0253ed5a5138..47cc882f548e 100644 --- a/pkgs/development/python-modules/pytest-django/default.nix +++ b/pkgs/development/python-modules/pytest-django/default.nix @@ -5,7 +5,7 @@ , django , setuptools-scm , django-configurations -, pytest_xdist +, pytest-xdist , six }: buildPythonPackage rec { @@ -18,7 +18,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ pytest setuptools-scm ]; - checkInputs = [ pytest django-configurations pytest_xdist six ]; + checkInputs = [ pytest django-configurations pytest-xdist six ]; propagatedBuildInputs = [ django ]; # Complicated. Requires Django setup. diff --git a/pkgs/development/python-modules/pytest-randomly/default.nix b/pkgs/development/python-modules/pytest-randomly/default.nix index f8e240ca57e4..0020a4bf433f 100644 --- a/pkgs/development/python-modules/pytest-randomly/default.nix +++ b/pkgs/development/python-modules/pytest-randomly/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder , factory_boy, faker, numpy, backports-entry-points-selectable -, pytestCheckHook, pytest_xdist +, pytestCheckHook, pytest-xdist }: buildPythonPackage rec { @@ -23,7 +23,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytest_xdist + pytest-xdist numpy factory_boy faker diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 6c576f0b85e9..a3e00dff4ef6 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -9,7 +9,7 @@ , mock , pysqlite ? null , pytestCheckHook -, pytest_xdist +, pytest-xdist }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index a0b5c9799254..7aa955e99e25 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, requests, pytest, pytest-cov, pytest-mock, pytest_xdist }: +{ lib, buildPythonPackage, fetchPypi, requests, pytest, pytest-cov, pytest-mock, pytest-xdist }: buildPythonPackage rec { pname = "stripe"; @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - checkInputs = [ pytest pytest-cov pytest-mock pytest_xdist ]; + checkInputs = [ pytest pytest-cov pytest-mock pytest-xdist ]; meta = with lib; { description = "Stripe Python bindings"; diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix index 13d037515c3f..5b7b17c8bb84 100644 --- a/pkgs/development/python-modules/typer/default.nix +++ b/pkgs/development/python-modules/typer/default.nix @@ -5,7 +5,7 @@ , pytestCheckHook , shellingham , pytest-cov -, pytest_xdist +, pytest-xdist , pytest-sugar , coverage , mypy @@ -27,7 +27,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook pytest-cov - pytest_xdist + pytest-xdist pytest-sugar shellingham coverage diff --git a/pkgs/tools/admin/lexicon/default.nix b/pkgs/tools/admin/lexicon/default.nix index 7737205ce02d..c183e3741429 100644 --- a/pkgs/tools/admin/lexicon/default.nix +++ b/pkgs/tools/admin/lexicon/default.nix @@ -66,7 +66,7 @@ buildPythonApplication rec { mock pytest pytest-cov - pytest_xdist + pytest-xdist vcrpy ]; diff --git a/pkgs/tools/text/ocrmypdf/default.nix b/pkgs/tools/text/ocrmypdf/default.nix index 0e13e4c5f35c..1a60d7d013ef 100644 --- a/pkgs/tools/text/ocrmypdf/default.nix +++ b/pkgs/tools/text/ocrmypdf/default.nix @@ -64,7 +64,7 @@ buildPythonApplication rec { pypdf2 pytest pytest-helpers-namespace - pytest_xdist + pytest-xdist pytest-cov python-xmp-toolkit pytestCheckHook diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 8c11398d6b9a..d84505d22a62 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -57,6 +57,7 @@ mapAliases ({ pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10 pytestquickcheck = pytest-quickcheck; # added 2021-07-20 pytestrunner = pytest-runner; # added 2021-01-04 + pytest_xdist = pytest-xdist; # added 2021-01-04 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 rotate-backups = throw "pythonPackages.rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01 selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # Added 2021-06-10 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 640f1fdc2521..8ecef5f04efa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6926,7 +6926,6 @@ in { pytest-watch = callPackage ../development/python-modules/pytest-watch { }; - pytest_xdist = self.pytest-xdist; # added 2021-01-04 pytest-xdist = callPackage ../development/python-modules/pytest-xdist { }; pytest-xprocess = callPackage ../development/python-modules/pytest-xprocess { }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index decf36f31e8b..48ddb18291af 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -480,7 +480,6 @@ with self; with super; { pytest-runner = callPackage ../development/python-modules/pytest-runner/2.nix { }; - pytest_xdist = self.pytest-xdist; # added 2021-01-04 pytest-xdist = callPackage ../development/python-modules/pytest-xdist/1.nix { }; python-otr = callPackage ../development/python-modules/python-otr { }; From a5158b8c01cc92b6057beec08ed402cc5614ccdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 20 Jul 2021 23:19:21 +0200 Subject: [PATCH 058/235] pythonPackages: deprecate python_simple_hipchat alias --- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index d84505d22a62..bb986d7fd125 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -58,6 +58,7 @@ mapAliases ({ pytestquickcheck = pytest-quickcheck; # added 2021-07-20 pytestrunner = pytest-runner; # added 2021-01-04 pytest_xdist = pytest-xdist; # added 2021-01-04 + python_simple_hipchat = python-simple-hipchat; # added 2021-07-21 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 rotate-backups = throw "pythonPackages.rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01 selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # Added 2021-06-10 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8ecef5f04efa..efd77004c3dd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7124,7 +7124,6 @@ in { python-sat = callPackage ../development/python-modules/python-sat { }; python-simple-hipchat = callPackage ../development/python-modules/python-simple-hipchat { }; - python_simple_hipchat = self.python-simple-hipchat; python-slugify = callPackage ../development/python-modules/python-slugify { }; From 703c10847211d13fd897a54061d90123680b410a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 20 Jul 2021 23:21:18 +0200 Subject: [PATCH 059/235] pythonPackages: deprecate requests_toolbelt alias --- pkgs/applications/misc/khal/default.nix | 2 +- pkgs/applications/networking/sync/acd_cli/default.nix | 4 ++-- pkgs/development/python-modules/argcomplete/default.nix | 4 ++-- pkgs/development/python-modules/betamax-matchers/default.nix | 4 ++-- pkgs/development/python-modules/cherrypy/17.nix | 4 ++-- pkgs/development/python-modules/cherrypy/default.nix | 4 ++-- pkgs/development/python-modules/flickrapi/default.nix | 4 ++-- pkgs/development/python-modules/gradient/default.nix | 4 ++-- pkgs/development/python-modules/jira/default.nix | 4 ++-- pkgs/development/python-modules/prawcore/default.nix | 4 ++-- pkgs/development/python-modules/twine/default.nix | 4 ++-- pkgs/development/python-modules/vdirsyncer/default.nix | 4 ++-- pkgs/development/python-modules/webexteamssdk/default.nix | 4 ++-- pkgs/development/python-modules/zeep/default.nix | 4 ++-- pkgs/development/tools/cloudsmith-cli/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 18 files changed, 30 insertions(+), 31 deletions(-) diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index c7c184febe17..8ad7578adebb 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -20,7 +20,7 @@ with python3.pkgs; buildPythonApplication rec { pkgs.vdirsyncer pytz pyxdg - requests_toolbelt + requests-toolbelt tzlocal urwid pkginfo diff --git a/pkgs/applications/networking/sync/acd_cli/default.nix b/pkgs/applications/networking/sync/acd_cli/default.nix index f630cb4071a4..95970a7b8709 100644 --- a/pkgs/applications/networking/sync/acd_cli/default.nix +++ b/pkgs/applications/networking/sync/acd_cli/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, buildPythonApplication, fuse -, appdirs, colorama, python-dateutil, requests, requests_toolbelt +, appdirs, colorama, python-dateutil, requests, requests-toolbelt , fusepy, sqlalchemy, setuptools }: buildPythonApplication rec { @@ -16,7 +16,7 @@ buildPythonApplication rec { }; propagatedBuildInputs = [ appdirs colorama python-dateutil fusepy requests - requests_toolbelt setuptools sqlalchemy ]; + requests-toolbelt setuptools sqlalchemy ]; makeWrapperArgs = [ "--prefix LIBFUSE_PATH : ${fuse}/lib/libfuse.so" ]; diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix index 6c62fd104f21..cf2f92557206 100644 --- a/pkgs/development/python-modules/argcomplete/default.nix +++ b/pkgs/development/python-modules/argcomplete/default.nix @@ -3,7 +3,7 @@ , importlib-metadata , pexpect , prettytable -, requests_toolbelt +, requests-toolbelt }: buildPythonPackage rec { pname = "argcomplete"; @@ -24,7 +24,7 @@ buildPythonPackage rec { importlib-metadata pexpect prettytable - requests_toolbelt + requests-toolbelt ]; pythonImportsCheck = [ "argcomplete" ]; diff --git a/pkgs/development/python-modules/betamax-matchers/default.nix b/pkgs/development/python-modules/betamax-matchers/default.nix index 459d3c51d7ed..087329d103e7 100644 --- a/pkgs/development/python-modules/betamax-matchers/default.nix +++ b/pkgs/development/python-modules/betamax-matchers/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, betamax, requests_toolbelt }: +, betamax, requests-toolbelt }: buildPythonPackage rec { pname = "betamax-matchers"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "07qpwjyq2i2aqhz5iwghnj4pqr2ys5n45v1vmpcfx9r5mhwrsq43"; }; - buildInputs = [ betamax requests_toolbelt ]; + buildInputs = [ betamax requests-toolbelt ]; meta = with lib; { homepage = "https://github.com/sigmavirus24/betamax_matchers"; diff --git a/pkgs/development/python-modules/cherrypy/17.nix b/pkgs/development/python-modules/cherrypy/17.nix index 82e878c83042..2ae180a8bae6 100644 --- a/pkgs/development/python-modules/cherrypy/17.nix +++ b/pkgs/development/python-modules/cherrypy/17.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildPythonPackage, fetchPypi , setuptools-scm , cheroot, contextlib2, portend, routes, six, zc_lockfile -, backports_unittest-mock, objgraph, pathpy, pytest, pytest-cov, backports_functools_lru_cache, requests_toolbelt +, backports_unittest-mock, objgraph, pathpy, pytest, pytest-cov, backports_functools_lru_cache, requests-toolbelt }: buildPythonPackage rec { @@ -21,7 +21,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; checkInputs = [ - backports_unittest-mock objgraph pathpy pytest pytest-cov backports_functools_lru_cache requests_toolbelt + backports_unittest-mock objgraph pathpy pytest pytest-cov backports_functools_lru_cache requests-toolbelt ]; checkPhase = '' diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index b4fa2b8aeb45..0c6f83ea71db 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -2,7 +2,7 @@ , setuptools-scm , cheroot, portend, more-itertools, zc_lockfile, routes , jaraco_collections -, objgraph, pytest, pytest-cov, pathpy, requests_toolbelt, pytest-services +, objgraph, pytest, pytest-cov, pathpy, requests-toolbelt, pytest-services , fetchpatch }: @@ -47,7 +47,7 @@ buildPythonPackage rec { ]; checkInputs = [ - objgraph pytest pytest-cov pathpy requests_toolbelt pytest-services + objgraph pytest pytest-cov pathpy requests-toolbelt pytest-services ]; # Keyboard interrupt ends test suite run diff --git a/pkgs/development/python-modules/flickrapi/default.nix b/pkgs/development/python-modules/flickrapi/default.nix index c989cfbb56d5..d7d20f19ea7b 100644 --- a/pkgs/development/python-modules/flickrapi/default.nix +++ b/pkgs/development/python-modules/flickrapi/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , requests -, requests_toolbelt +, requests-toolbelt , requests_oauthlib , pytest , pytest-runner @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "03g2z21k6nhxgwysjrgnxj9m1yg25mnnkr10gpyfhfkd9w77pcpz"; }; - propagatedBuildInputs = [ requests requests_toolbelt requests_oauthlib ]; + propagatedBuildInputs = [ requests requests-toolbelt requests_oauthlib ]; checkInputs = [ pytest pytest-runner pytest-cov responses ]; doCheck = false; # Otherwise: diff --git a/pkgs/development/python-modules/gradient/default.nix b/pkgs/development/python-modules/gradient/default.nix index 92ddbbd73f7b..57b58699ec38 100644 --- a/pkgs/development/python-modules/gradient/default.nix +++ b/pkgs/development/python-modules/gradient/default.nix @@ -15,7 +15,7 @@ , pyopenssl , pyyaml , requests -, requests_toolbelt +, requests-toolbelt , terminaltables , websocket-client }: @@ -53,7 +53,7 @@ buildPythonPackage rec { pyopenssl pyyaml requests - requests_toolbelt + requests-toolbelt terminaltables websocket-client ]; diff --git a/pkgs/development/python-modules/jira/default.nix b/pkgs/development/python-modules/jira/default.nix index e386f390bc23..a3f790abfc51 100644 --- a/pkgs/development/python-modules/jira/default.nix +++ b/pkgs/development/python-modules/jira/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, isPy3k , pytest, pytest-runner, pbr, glibcLocales , pytest-cov -, requests, requests_oauthlib, requests_toolbelt, defusedxml +, requests, requests_oauthlib, requests-toolbelt, defusedxml , ipython }: @@ -16,7 +16,7 @@ buildPythonPackage rec { }; buildInputs = [ glibcLocales pytest pytest-cov pytest-runner pbr ]; - propagatedBuildInputs = [ requests requests_oauthlib requests_toolbelt defusedxml pbr ipython ]; + propagatedBuildInputs = [ requests requests_oauthlib requests-toolbelt defusedxml pbr ipython ]; # impure tests because of connectivity attempts to jira servers doCheck = false; diff --git a/pkgs/development/python-modules/prawcore/default.nix b/pkgs/development/python-modules/prawcore/default.nix index 686487c0256d..cb72e69af77d 100644 --- a/pkgs/development/python-modules/prawcore/default.nix +++ b/pkgs/development/python-modules/prawcore/default.nix @@ -4,7 +4,7 @@ , requests , testfixtures , mock -, requests_toolbelt +, requests-toolbelt , betamax , betamax-serializers , betamax-matchers @@ -32,7 +32,7 @@ buildPythonPackage rec { betamax betamax-serializers betamax-matchers - requests_toolbelt + requests-toolbelt pytestCheckHook ]; diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix index b78f38c46cf8..da5c4a9c3f51 100644 --- a/pkgs/development/python-modules/twine/default.nix +++ b/pkgs/development/python-modules/twine/default.nix @@ -5,7 +5,7 @@ , pyblake2 , readme_renderer , requests -, requests_toolbelt +, requests-toolbelt , setuptools-scm , tqdm , colorama @@ -30,7 +30,7 @@ buildPythonPackage rec { pyblake2 readme_renderer requests - requests_toolbelt + requests-toolbelt tqdm colorama rfc3986 diff --git a/pkgs/development/python-modules/vdirsyncer/default.nix b/pkgs/development/python-modules/vdirsyncer/default.nix index 1dd80b52d19b..cdd8ff02b97e 100644 --- a/pkgs/development/python-modules/vdirsyncer/default.nix +++ b/pkgs/development/python-modules/vdirsyncer/default.nix @@ -6,7 +6,7 @@ , click , click-log , click-threading -, requests_toolbelt +, requests-toolbelt , requests , requests_oauthlib # required for google oauth sync , atomicwrites @@ -34,7 +34,7 @@ buildPythonPackage rec { click-threading requests requests_oauthlib # required for google oauth sync - requests_toolbelt + requests-toolbelt ]; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/webexteamssdk/default.nix b/pkgs/development/python-modules/webexteamssdk/default.nix index 21c9e352bf0d..e70cdfd96c86 100644 --- a/pkgs/development/python-modules/webexteamssdk/default.nix +++ b/pkgs/development/python-modules/webexteamssdk/default.nix @@ -4,7 +4,7 @@ , future , pyjwt , requests -, requests_toolbelt +, requests-toolbelt }: buildPythonPackage rec { @@ -22,7 +22,7 @@ buildPythonPackage rec { future pyjwt requests - requests_toolbelt + requests-toolbelt ]; # Tests require a Webex Teams test domain diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix index 7c72d2500346..16fb27774631 100644 --- a/pkgs/development/python-modules/zeep/default.nix +++ b/pkgs/development/python-modules/zeep/default.nix @@ -19,7 +19,7 @@ , pythonOlder , pytz , requests -, requests_toolbelt +, requests-toolbelt , requests-file , requests-mock , xmlsec @@ -47,7 +47,7 @@ buildPythonPackage rec { lxml pytz requests - requests_toolbelt + requests-toolbelt requests-file xmlsec ]; diff --git a/pkgs/development/tools/cloudsmith-cli/default.nix b/pkgs/development/tools/cloudsmith-cli/default.nix index 8de2bc1aeed2..8d36c8990828 100644 --- a/pkgs/development/tools/cloudsmith-cli/default.nix +++ b/pkgs/development/tools/cloudsmith-cli/default.nix @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { colorama future requests - requests_toolbelt + requests-toolbelt semver simplejson six diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3fe3b02860de..28d0674bd8b0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22964,7 +22964,7 @@ in acd-cli = callPackage ../applications/networking/sync/acd_cli { inherit (python3Packages) buildPythonApplication appdirs colorama python-dateutil - requests requests_toolbelt setuptools sqlalchemy fusepy; + requests requests-toolbelt setuptools sqlalchemy fusepy; }; adobe-reader = pkgsi686Linux.callPackage ../applications/misc/adobe-reader { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index bb986d7fd125..2573d07e4a20 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -60,6 +60,7 @@ mapAliases ({ pytest_xdist = pytest-xdist; # added 2021-01-04 python_simple_hipchat = python-simple-hipchat; # added 2021-07-21 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 + requests_toolbelt = requests-toolbelt; # added 2017-09-26 rotate-backups = throw "pythonPackages.rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01 selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # Added 2021-06-10 setuptools_scm = setuptools-scm; # added 2021-06-03 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index efd77004c3dd..12fd990bad1e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7551,8 +7551,6 @@ in { requests-toolbelt = callPackage ../development/python-modules/requests-toolbelt { }; - requests_toolbelt = self.requests-toolbelt; # Old attr, 2017-09-26 - requests-unixsocket = callPackage ../development/python-modules/requests-unixsocket { }; requirements-detector = callPackage ../development/python-modules/requirements-detector { }; From 5c31546ae8a4b0103ed7d5378c8e281df8946585 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 20 Jul 2021 23:22:39 +0200 Subject: [PATCH 060/235] pythonPackages: deprecate scikitlearn alias --- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 2573d07e4a20..f97da2c4b34a 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -62,6 +62,7 @@ mapAliases ({ qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 requests_toolbelt = requests-toolbelt; # added 2017-09-26 rotate-backups = throw "pythonPackages.rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01 + scikitlearn = scikit-learn; # added 2021-07-21 selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # Added 2021-06-10 setuptools_scm = setuptools-scm; # added 2021-06-03 smart_open = smart-open; # added 2021-03-14 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 12fd990bad1e..f789bce4a8bd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7804,8 +7804,6 @@ in { inherit (pkgs) gfortran glibcLocales; }; - scikitlearn = self.scikit-learn; - scikit-optimize = callPackage ../development/python-modules/scikit-optimize { }; scikits-odes = callPackage ../development/python-modules/scikits-odes { }; From 5c425ca23d9e36854f4bacaf3365d85f330553dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 20 Jul 2021 23:24:25 +0200 Subject: [PATCH 061/235] python-aliases: sort --- pkgs/top-level/python-aliases.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index f97da2c4b34a..4a689edc1afc 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -34,6 +34,7 @@ in mapAliases ({ blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # Added 2020-11-29 + bt_proximity = bt-proximity; # added 2021-07-02 bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # Added 2019-11-27 dateutil = python-dateutil; # added 2021-07-03 detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04 @@ -70,5 +71,4 @@ mapAliases ({ topydo = throw "python3Packages.topydo was moved to topydo"; # 2017-09-22 tvnamer = throw "python3Packages.tvnamer was moved to tvnamer"; # 2021-07-05 websocket_client = websocket-client; - bt_proximity = bt-proximity; # added 2021-07-02 }) From 9df3d2ca2c2dff2961a0be338fb90454e11349fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 20 Jul 2021 23:24:38 +0200 Subject: [PATCH 062/235] pythonPackages: deprecate zc_buildout221 alias --- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 4a689edc1afc..376250bcb2f6 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -71,4 +71,5 @@ mapAliases ({ topydo = throw "python3Packages.topydo was moved to topydo"; # 2017-09-22 tvnamer = throw "python3Packages.tvnamer was moved to tvnamer"; # 2021-07-05 websocket_client = websocket-client; + zc_buildout221 = zc_buildout; # added 2021-07-21 }) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f789bce4a8bd..e9289880cac1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9447,9 +9447,7 @@ in { zarr = callPackage ../development/python-modules/zarr { }; - zc_buildout221 = callPackage ../development/python-modules/buildout { }; - - zc_buildout = self.zc_buildout221; # A patched version of buildout, useful for buildout based development on Nix + zc_buildout = callPackage ../development/python-modules/buildout { }; zc_buildout_nix = callPackage ../development/python-modules/buildout-nix { }; From b4099137b1c8e9e9dd78705058fabe785eba9df7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 20 Jul 2021 23:26:16 +0200 Subject: [PATCH 063/235] pythonPackages: deprecate ConfigArgParse alias --- pkgs/applications/misc/coursera-dl/default.nix | 2 +- pkgs/applications/misc/rofimoji/default.nix | 4 ++-- pkgs/applications/science/misc/snakemake/default.nix | 2 +- pkgs/development/misc/resholve/resholve.nix | 2 +- pkgs/development/python-modules/certbot/default.nix | 4 ++-- pkgs/development/python-modules/libagent/default.nix | 4 ++-- pkgs/development/python-modules/xml2rfc/default.nix | 4 ++-- pkgs/misc/acpilight/default.nix | 2 +- pkgs/tools/admin/gixy/default.nix | 2 +- pkgs/tools/misc/yle-dl/default.nix | 2 +- pkgs/tools/networking/linkchecker/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 1 - 14 files changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/misc/coursera-dl/default.nix b/pkgs/applications/misc/coursera-dl/default.nix index 56938f5338dc..954501c0b7fe 100644 --- a/pkgs/applications/misc/coursera-dl/default.nix +++ b/pkgs/applications/misc/coursera-dl/default.nix @@ -18,7 +18,7 @@ in pythonPackages.buildPythonApplication rec { buildInputs = with pythonPackages; [ glibcLocales ]; - propagatedBuildInputs = with pythonPackages; [ attrs beautifulsoup4 ConfigArgParse keyring pyasn1 requests six urllib3 ]; + propagatedBuildInputs = with pythonPackages; [ attrs beautifulsoup4 configargparse keyring pyasn1 requests six urllib3 ]; checkInputs = with pythonPackages; [ pytest mock ]; diff --git a/pkgs/applications/misc/rofimoji/default.nix b/pkgs/applications/misc/rofimoji/default.nix index 79a4d9fc7abe..d0d59af604d4 100644 --- a/pkgs/applications/misc/rofimoji/default.nix +++ b/pkgs/applications/misc/rofimoji/default.nix @@ -5,7 +5,7 @@ , waylandSupport ? true , x11Support ? true -, ConfigArgParse +, configargparse , rofi , wl-clipboard , wtype @@ -26,7 +26,7 @@ buildPythonApplication rec { # `rofi` and the `waylandSupport` and `x11Support` dependencies # contain binaries needed at runtime. - propagatedBuildInputs = with lib; [ ConfigArgParse rofi ] + propagatedBuildInputs = with lib; [ configargparse rofi ] ++ optionals waylandSupport [ wl-clipboard wtype ] ++ optionals x11Support [ xdotool xsel ]; diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 5270cac57823..419323cfa31f 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ appdirs - ConfigArgParse + configargparse connection-pool datrie docutils diff --git a/pkgs/development/misc/resholve/resholve.nix b/pkgs/development/misc/resholve/resholve.nix index 4d039770ce0e..d3603266bea9 100644 --- a/pkgs/development/misc/resholve/resholve.nix +++ b/pkgs/development/misc/resholve/resholve.nix @@ -43,7 +43,7 @@ python27Packages.buildPythonApplication { nativeBuildInputs = [ installShellFiles ]; - propagatedBuildInputs = [ deps.oildev python27Packages.ConfigArgParse ]; + propagatedBuildInputs = [ deps.oildev python27Packages.configargparse ]; patchPhase = '' for file in resholve; do diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index 255c3ebfdeb9..61ec6c2125ff 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , python, runCommand , fetchFromGitHub -, ConfigArgParse, acme, configobj, cryptography, distro, josepy, parsedatetime, pyRFC3339, pyopenssl, pytz, requests, six, zope_component, zope_interface +, configargparse, acme, configobj, cryptography, distro, josepy, parsedatetime, pyRFC3339, pyopenssl, pytz, requests, six, zope_component, zope_interface , dialog, gnureadline , pytest-xdist, pytestCheckHook, python-dateutil }: @@ -21,7 +21,7 @@ buildPythonPackage rec { sourceRoot = "source/${pname}"; propagatedBuildInputs = [ - ConfigArgParse + configargparse acme configobj cryptography diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix index 5334513e23c8..24d8ada58902 100644 --- a/pkgs/development/python-modules/libagent/default.nix +++ b/pkgs/development/python-modules/libagent/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, buildPythonPackage, ed25519, ecdsa , semver, mnemonic, - unidecode, mock, pytest , backports-shutil-which, ConfigArgParse, + unidecode, mock, pytest , backports-shutil-which, configargparse, python-daemon, pymsgbox }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "16y1y9ahcv3wj7f0v4mfiwzkmn2hz1iv7y13cgr57sxa3ymyqx6c"; }; - propagatedBuildInputs = [ unidecode backports-shutil-which ConfigArgParse + propagatedBuildInputs = [ unidecode backports-shutil-which configargparse python-daemon pymsgbox ecdsa ed25519 mnemonic semver ]; checkInputs = [ mock pytest ]; diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index 9837128a7fdc..c975218e5b1d 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -1,5 +1,5 @@ { lib, fetchPypi, buildPythonPackage, pythonAtLeast, intervaltree, pyflakes, requests, lxml, google-i18n-address -, pycountry, html5lib, six, kitchen, pypdf2, dict2xml, weasyprint, pyyaml, jinja2, ConfigArgParse, appdirs +, pycountry, html5lib, six, kitchen, pypdf2, dict2xml, weasyprint, pyyaml, jinja2, configargparse, appdirs }: buildPythonPackage rec { @@ -27,7 +27,7 @@ buildPythonPackage rec { pypdf2 dict2xml weasyprint - ConfigArgParse + configargparse appdirs ]; diff --git a/pkgs/misc/acpilight/default.nix b/pkgs/misc/acpilight/default.nix index b5a385ab4076..d6fead938a45 100644 --- a/pkgs/misc/acpilight/default.nix +++ b/pkgs/misc/acpilight/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; pyenv = python3.withPackages (pythonPackages: with pythonPackages; [ - ConfigArgParse + configargparse ]); postConfigure = '' diff --git a/pkgs/tools/admin/gixy/default.nix b/pkgs/tools/admin/gixy/default.nix index 1711792ab2bc..65ca85b463e9 100644 --- a/pkgs/tools/admin/gixy/default.nix +++ b/pkgs/tools/admin/gixy/default.nix @@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ cached-property - ConfigArgParse + configargparse pyparsing jinja2 nose diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix index 08da843ad33e..209072da3b0b 100644 --- a/pkgs/tools/misc/yle-dl/default.nix +++ b/pkgs/tools/misc/yle-dl/default.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { }; propagatedBuildInputs = with python3Packages; [ - attrs ConfigArgParse ffmpeg future lxml requests + attrs configargparse ffmpeg future lxml requests ]; pythonPath = [ rtmpdump php wget ]; diff --git a/pkgs/tools/networking/linkchecker/default.nix b/pkgs/tools/networking/linkchecker/default.nix index 05da924c47e4..480321ad15fc 100644 --- a/pkgs/tools/networking/linkchecker/default.nix +++ b/pkgs/tools/networking/linkchecker/default.nix @@ -16,7 +16,7 @@ buildPythonApplication rec { nativeBuildInputs = [ gettext ]; propagatedBuildInputs = [ - ConfigArgParse + configargparse argcomplete beautifulsoup4 pyopenssl diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 28d0674bd8b0..55550e8fa11a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26825,7 +26825,7 @@ in rofi-systemd = callPackage ../tools/system/rofi-systemd { }; rofimoji = callPackage ../applications/misc/rofimoji { - inherit (python3Packages) buildPythonApplication ConfigArgParse; + inherit (python3Packages) buildPythonApplication configargparse; }; rootlesskit = callPackage ../tools/virtualization/rootlesskit {}; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 376250bcb2f6..4582583f33ba 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -36,6 +36,7 @@ mapAliases ({ blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # Added 2020-11-29 bt_proximity = bt-proximity; # added 2021-07-02 bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # Added 2019-11-27 + ConfigArgParse = configargparse; # added 2021-03-18 dateutil = python-dateutil; # added 2021-07-03 detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04 dftfit = throw "it's dependency lammps-cython no longer builds"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e9289880cac1..c554aa014ea4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1607,7 +1607,6 @@ in { conda = callPackage ../development/python-modules/conda { }; - ConfigArgParse = self.configargparse; # added 2021-03-18 configargparse = callPackage ../development/python-modules/configargparse { }; configobj = callPackage ../development/python-modules/configobj { }; From 4a87fb096d66eb7336d30d326c6839fe71a399cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 20 Jul 2021 23:27:12 +0200 Subject: [PATCH 064/235] pythonPackages: deprecate djangorestframework-jwt alias --- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 4582583f33ba..294c90f66566 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -42,6 +42,7 @@ mapAliases ({ dftfit = throw "it's dependency lammps-cython no longer builds"; diff_cover = diff-cover; # added 2021-07-02 discogs_client = discogs-client; # added 2021-07-02 + djangorestframework-jwt = drf-jwt; dns = dnspython; # Alias for compatibility, 2017-12-10 faulthandler = throw "faulthandler is built into ${python.executable}"; gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c554aa014ea4..3a2c7aec4f43 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2063,8 +2063,6 @@ in { djangorestframework = callPackage ../development/python-modules/djangorestframework { }; - djangorestframework-jwt = self.drf-jwt; - djangorestframework-simplejwt = callPackage ../development/python-modules/djangorestframework-simplejwt { }; django_reversion = callPackage ../development/python-modules/django_reversion { }; From 0a97ad68276544f9be5e0f79d79c7e515d740421 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 21 Jul 2021 13:34:51 +0200 Subject: [PATCH 065/235] brotli: cleanup --- pkgs/tools/compression/brotli/default.nix | 28 +++++++++++------------ 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index af0cbc4fe22e..dfac5af0980b 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/pkgs/tools/compression/brotli/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, cmake, fetchpatch +{ lib +, stdenv +, fetchFromGitHub +, cmake +, fetchpatch , staticOnly ? stdenv.hostPlatform.isStatic }: @@ -11,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "google"; repo = "brotli"; - rev = "v" + version; + rev = "v${version}"; sha256 = "z6Dhrabav1MDQ4rAcXaDv0aN+qOoh9cvoXZqEWBB13c="; }; @@ -24,8 +28,7 @@ stdenv.mkDerivation rec { sha256 = "sOeXNVsCaBSD9i82GRUDrkyreGeQ7qaJWjjy/uLL0/0="; }); - cmakeFlags = [] - ++ lib.optional staticOnly "-DBUILD_SHARED_LIBS=OFF"; + cmakeFlags = lib.optional staticOnly "-DBUILD_SHARED_LIBS=OFF"; outputs = [ "out" "dev" "lib" ]; @@ -36,13 +39,13 @@ stdenv.mkDerivation rec { # This breaks on Darwin because our cmake hook tries to make a build folder # and the wonderful bazel BUILD file is already there (yay case-insensitivity?) prePatch = '' - rm BUILD + rm BUILD - # Upstream fixed this reference to runtime-path after the release - # and with this references g++ complains about invalid option -R - sed -i 's/ -R''${libdir}//' scripts/libbrotli*.pc.in - cat scripts/libbrotli*.pc.in - ''; + # Upstream fixed this reference to runtime-path after the release + # and with this references g++ complains about invalid option -R + sed -i 's/ -R''${libdir}//' scripts/libbrotli*.pc.in + cat scripts/libbrotli*.pc.in + ''; # Don't bother with "man" output for now, # it currently only makes the manpages hard to use. @@ -53,10 +56,8 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - inherit (src.meta) homepage; - + homepage = "https://github.com/google/brotli"; description = "A generic-purpose lossless compression algorithm and tool"; - longDescription = '' Brotli is a generic-purpose lossless compression algorithm that compresses data using a combination of a modern variant of the LZ77 @@ -69,7 +70,6 @@ stdenv.mkDerivation rec { in the following internet draft: http://www.ietf.org/id/draft-alakuijala-brotli ''; - license = licenses.mit; maintainers = with maintainers; [ freezeboy ]; platforms = platforms.all; From eaf2c4a2dda0ff1a86f4c6074d839cf763880180 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 21 Jul 2021 13:36:12 +0200 Subject: [PATCH 066/235] bsc: cleanup --- pkgs/tools/compression/bsc/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/compression/bsc/default.nix b/pkgs/tools/compression/bsc/default.nix index ac0c0544f017..93b715f853cf 100644 --- a/pkgs/tools/compression/bsc/default.nix +++ b/pkgs/tools/compression/bsc/default.nix @@ -1,30 +1,31 @@ -{ lib, stdenv, fetchurl, openmp ? null }: +{ lib, stdenv, fetchFromGitHub, openmp }: stdenv.mkDerivation rec { pname = "bsc"; version = "3.1.0"; - src = fetchurl { - url = "https://github.com/IlyaGrebnov/libbsc/archive/${version}.tar.gz"; - sha256 = "01yhizaf6qjv1plyrx0fcib264maa5qwvgfvvid9rzlzj9fxjib6"; + src = fetchFromGitHub { + owner = "IlyaGrebnov"; + repo = "libbsc"; + rev = version; + sha256 = "0c0jmirh9y23kyi1jnrm13sa3xsjn54jazfr84ag45pai279fciz"; }; enableParallelBuilding = true; buildInputs = lib.optional stdenv.isDarwin openmp; - prePatch = '' + postPatch = '' substituteInPlace makefile \ --replace 'g++' '$(CXX)' ''; - preInstall = '' - makeFlagsArray+=("PREFIX=$out") - ''; + makeFlags = [ "PREFIX=$(out)" ]; meta = with lib; { description = "High performance block-sorting data compression library"; homepage = "http://libbsc.com/"; + maintainers = with maintainers; [ ]; # Later commits changed the licence to Apache2 (no release yet, though) license = with licenses; [ lgpl3Plus ]; platforms = platforms.unix; From 7c49b4143cf3bafbf9c3ebf87ff012488f13dedb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 21 Jul 2021 13:37:36 +0200 Subject: [PATCH 067/235] bsdiff: cleanup --- pkgs/tools/compression/bsdiff/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/compression/bsdiff/default.nix b/pkgs/tools/compression/bsdiff/default.nix index 8b5dfe919c7d..8f8818781ab4 100644 --- a/pkgs/tools/compression/bsdiff/default.nix +++ b/pkgs/tools/compression/bsdiff/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "4.3"; src = fetchurl { - url = "https://www.daemonology.net/bsdiff/${pname}-${version}.tar.gz"; + url = "https://www.daemonology.net/bsdiff/${pname}-${version}.tar.gz"; sha256 = "0j2zm3z271x5aw63mwhr3vymzn45p2vvrlrpm9cz2nywna41b0hq"; }; @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { cp bspatch.1 $out/share/man/man1 ''; - meta = { + meta = with lib; { description = "An efficient binary diff/patch tool"; - homepage = "http://www.daemonology.net/bsdiff"; - license = lib.licenses.bsd2; - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.thoughtpolice ]; + homepage = "https://www.daemonology.net/bsdiff/"; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = [ maintainers.thoughtpolice ]; }; } From a2d112eb4b0d82e6ea7e76f3ca7d8d195f32cbfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 21 Jul 2021 13:38:03 +0200 Subject: [PATCH 068/235] dejsonlz4: cleanup --- pkgs/tools/compression/dejsonlz4/default.nix | 48 ++++++++++---------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/pkgs/tools/compression/dejsonlz4/default.nix b/pkgs/tools/compression/dejsonlz4/default.nix index 07b6a5979a4f..0dd703035fa9 100644 --- a/pkgs/tools/compression/dejsonlz4/default.nix +++ b/pkgs/tools/compression/dejsonlz4/default.nix @@ -1,28 +1,30 @@ { lib, stdenv, fetchFromGitHub }: + stdenv.mkDerivation rec { - pname = "dejsonlz4"; - version = "1.1"; - src = fetchFromGitHub { - owner = "avih"; - repo = pname; - rev = "v${version}"; - sha256 = "0ggs69qamaama5mid07mhp95m1x42wljdb953lrwfr7p8p6f8czh"; - }; + pname = "dejsonlz4"; + version = "1.1"; - buildPhase = '' - ${stdenv.cc.targetPrefix}cc -o dejsonlz4 src/dejsonlz4.c src/lz4.c - ''; + src = fetchFromGitHub { + owner = "avih"; + repo = pname; + rev = "v${version}"; + sha256 = "0ggs69qamaama5mid07mhp95m1x42wljdb953lrwfr7p8p6f8czh"; + }; - installPhase = '' - mkdir -p $out/bin/ - cp dejsonlz4 $out/bin/ - ''; + buildPhase = '' + ${stdenv.cc.targetPrefix}cc -o dejsonlz4 src/dejsonlz4.c src/lz4.c + ''; - meta = with lib; { - description = "Decompress Mozilla Firefox bookmarks backup files"; - homepage = "https://github.com/avih/dejsonlz4"; - license = licenses.bsd2; - maintainers = with maintainers; [ mt-caret ]; - platforms = platforms.all; - }; - } + installPhase = '' + mkdir -p $out/bin/ + cp dejsonlz4 $out/bin/ + ''; + + meta = with lib; { + description = "Decompress Mozilla Firefox bookmarks backup files"; + homepage = "https://github.com/avih/dejsonlz4"; + license = licenses.bsd2; + maintainers = with maintainers; [ mt-caret ]; + platforms = platforms.all; + }; +} From 9807562b1fc23c1afd26b249d0dfcccc3102ef69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 21 Jul 2021 13:38:55 +0200 Subject: [PATCH 069/235] gzrt: cleanup --- pkgs/tools/compression/gzrt/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/compression/gzrt/default.nix b/pkgs/tools/compression/gzrt/default.nix index 18efc1b64c28..664c1eb78565 100644 --- a/pkgs/tools/compression/gzrt/default.nix +++ b/pkgs/tools/compression/gzrt/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - name = "gzrt-0.8"; + pname = "gzrt"; + version = "0.8"; src = fetchurl { - url = "https://www.urbanophile.com/arenn/coding/gzrt/${name}.tar.gz"; + url = "https://www.urbanophile.com/arenn/coding/gzrt/gzrt-${version}.tar.gz"; sha256 = "1vhzazj47xfpbfhzkwalz27cc0n5gazddmj3kynhk0yxv99xrdxh"; }; @@ -15,10 +16,11 @@ stdenv.mkDerivation rec { cp gzrecover $out/bin ''; - meta = { + meta = with lib; { homepage = "https://www.urbanophile.com/arenn/hacking/gzrt/"; description = "The gzip Recovery Toolkit"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; + maintainers = with maintainers; [ ]; + license = licenses.gpl2Plus; + platforms = platforms.unix; }; } From 459da1755b09c6b99355f15c8011d98a5c18bcec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 21 Jul 2021 13:39:50 +0200 Subject: [PATCH 070/235] kzipmix: cleanup --- pkgs/tools/compression/kzipmix/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/compression/kzipmix/default.nix b/pkgs/tools/compression/kzipmix/default.nix index 73931f6bcaea..ab325ac14a83 100644 --- a/pkgs/tools/compression/kzipmix/default.nix +++ b/pkgs/tools/compression/kzipmix/default.nix @@ -1,10 +1,11 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "kzipmix-20091108"; +stdenv.mkDerivation rec { + pname = "kzipmix"; + version = "20091108"; src = fetchurl { - url = "http://static.jonof.id.au/dl/kenutils/kzipmix-20091108-linux.tar.gz"; + url = "http://static.jonof.id.au/dl/kenutils/kzipmix-${version}-linux.tar.gz"; sha256 = "19gyn8pblffdz1bf3xkbpzx8a8wn3xb0v411pqzmz5g5l6pm5gph"; }; @@ -16,10 +17,10 @@ stdenv.mkDerivation { patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/bin/zipmix ''; - meta = { + meta = with lib; { description = "A tool that aggressively optimizes the sizes of Zip archives"; - license = lib.licenses.unfree; + license = licenses.unfree; homepage = "http://advsys.net/ken/utils.htm"; - maintainers = [ lib.maintainers.sander ]; + maintainers = [ maintainers.sander ]; }; } From 7ca9718c5fab01370539d0dc576f760f7fd5d032 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 21 Jul 2021 13:40:22 +0200 Subject: [PATCH 071/235] lbzip2: cleanup --- pkgs/tools/compression/lbzip2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/lbzip2/default.nix b/pkgs/tools/compression/lbzip2/default.nix index ad36ebb81de6..6d4017ac62ca 100644 --- a/pkgs/tools/compression/lbzip2/default.nix +++ b/pkgs/tools/compression/lbzip2/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, gnulib, perl, autoconf, automake }: stdenv.mkDerivation rec { + pname = "lbzip2"; version = "2.5"; - name = "lbzip2-${version}"; src = fetchFromGitHub { owner = "kjn"; repo = "lbzip2"; - sha256 = "1h321wva6fp6khz6x0i6rqb76xh327nw6v5jhgjpcckwdarj5jv8"; rev = "v${version}"; + sha256 = "1h321wva6fp6khz6x0i6rqb76xh327nw6v5jhgjpcckwdarj5jv8"; }; buildInputs = [ gnulib perl ]; From 40e00bb8d4a07663a277e01a35087cbc13779895 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 21 Jul 2021 13:41:20 +0200 Subject: [PATCH 072/235] lhasa: cleanup --- pkgs/tools/compression/lhasa/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/compression/lhasa/default.nix b/pkgs/tools/compression/lhasa/default.nix index 77df84879b8d..4f1ba702831f 100644 --- a/pkgs/tools/compression/lhasa/default.nix +++ b/pkgs/tools/compression/lhasa/default.nix @@ -1,21 +1,24 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "lhasa"; + version = "0.3.1"; -stdenv.mkDerivation { - name = "lhasa-0.3.1"; src = fetchurl { - url = "https://soulsphere.org/projects/lhasa/lhasa-0.3.1.tar.gz"; + url = "https://soulsphere.org/projects/lhasa/lhasa-${version}.tar.gz"; sha256 = "092zi9av18ma20c6h9448k0bapvx2plnp292741dvfd9hmgqxc1z"; }; - meta = { + + meta = with lib; { description = "Free Software replacement for the Unix LHA tool"; longDescription = '' Lhasa is a Free Software replacement for the Unix LHA tool, for decompressing .lzh (LHA / LHarc) and .lzs (LArc) archives. The backend for the tool is a library, so that it can be reused for other purposes. ''; - license = lib.licenses.isc; + license = licenses.isc; homepage = "http://fragglet.github.io/lhasa"; - maintainers = with lib; [ maintainers.sander ]; - platforms = with lib.platforms; linux ++ darwin; + maintainers = [ maintainers.sander ]; + platforms = platforms.unix; }; } From 8f9e79923c5a9ca62ca1f84c003c7ff7a86d9d4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 21 Jul 2021 13:41:59 +0200 Subject: [PATCH 073/235] lrzip: cleanup --- pkgs/tools/compression/lrzip/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/compression/lrzip/default.nix b/pkgs/tools/compression/lrzip/default.nix index 820389300e3b..02f62c3e3c01 100644 --- a/pkgs/tools/compression/lrzip/default.nix +++ b/pkgs/tools/compression/lrzip/default.nix @@ -1,8 +1,8 @@ -{lib, stdenv, fetchurl, zlib, lzo, bzip2, lz4, nasm, perl}: +{ lib, stdenv, fetchurl, zlib, lzo, bzip2, lz4, nasm, perl }: stdenv.mkDerivation rec { - version = "0.641"; pname = "lrzip"; + version = "0.641"; src = fetchurl { url = "http://ck.kolivas.org/apps/lrzip/${pname}-${version}.tar.xz"; @@ -15,10 +15,11 @@ stdenv.mkDerivation rec { "--disable-asm" ]; - meta = { + meta = with lib; { homepage = "http://ck.kolivas.org/apps/lrzip/"; description = "The CK LRZIP compression program (LZMA + RZIP)"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; + maintainers = with maintainers; [ ]; + license = licenses.gpl2Plus; + platforms = platforms.unix; }; } From 68e843b5046fc88429d5615197c6f05515f4e7e2 Mon Sep 17 00:00:00 2001 From: Roman Timushev Date: Wed, 21 Jul 2021 13:51:51 +0200 Subject: [PATCH 074/235] npm-merge-driver: init at 2.3.6 --- .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 1065 +++++++++-------- 2 files changed, 583 insertions(+), 483 deletions(-) diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 7e17928d7dcb..e2c4d4414175 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -178,6 +178,7 @@ , "np" , "npm" , "npm-check-updates" +, "npm-merge-driver" , {"npm2nix": "git://github.com/NixOS/npm2nix.git#5.12.0"} , "ocaml-language-server" , "parcel-bundler" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 1f7599914136..79425525bb0c 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -310,13 +310,13 @@ let sha1 = "e70187f8a862e191b1bce6c0268f13acd3a56b20"; }; }; - "@babel/cli-7.14.5" = { + "@babel/cli-7.14.8" = { name = "_at_babel_slash_cli"; packageName = "@babel/cli"; - version = "7.14.5"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/cli/-/cli-7.14.5.tgz"; - sha512 = "poegjhRvXHWO0EAsnYajwYZuqcz7gyfxwfaecUESxDujrqOivf3zrjFbub8IJkrqEaz3fvJWh001EzxBub54fg=="; + url = "https://registry.npmjs.org/@babel/cli/-/cli-7.14.8.tgz"; + sha512 = "lcy6Lymft9Rpfqmrqdd4oTDdUx9ZwaAhAfywVrHG4771Pa6PPT0danJ1kDHBXYqh4HHSmIdA+nlmfxfxSDPtBg=="; }; }; "@babel/code-frame-7.10.4" = { @@ -364,13 +364,13 @@ let sha512 = "O34LQooYVDXPl7QWCdW9p4NR+QlzOr7xShPPJz8GsuCU3/8ua/wqTr7gmnxXv+WBESiGU/G5s16i6tUvHkNb+w=="; }; }; - "@babel/core-7.14.6" = { + "@babel/core-7.14.8" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.14.6"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.14.6.tgz"; - sha512 = "gJnOEWSqTk96qG5BoIrl5bVtc23DCycmIePPYnamY9RboYdI4nFy5vAQMSl81O5K/W0sLDWfGysnOECC+KUUCA=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.14.8.tgz"; + sha512 = "/AtaeEhT6ErpDhInbXmjHcUQXH0L0TEgscfcxk1qbOvLuKCa5aZT0SOOtDKFY96/CLROwbLSKyFor6idgNaU4Q=="; }; }; "@babel/core-7.9.0" = { @@ -382,13 +382,13 @@ let sha512 = "kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w=="; }; }; - "@babel/generator-7.14.5" = { + "@babel/generator-7.14.8" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.14.5"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.14.5.tgz"; - sha512 = "y3rlP+/G25OIX3mYKKIOlQRcqj7YgrvHxOLbVmyLJ9bPmi5ttvUmpydVjcFjZphOktWuA7ovbx91ECloWTfjIA=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.14.8.tgz"; + sha512 = "cYDUpvIzhBVnMzRoY1fkSEhK/HmwEVwlyULYgn/tMQYd6Obag3ylCjONle3gdErfXBW61SVTlR9QR7uWlgeIkg=="; }; }; "@babel/helper-annotate-as-pure-7.14.5" = { @@ -418,13 +418,13 @@ let sha512 = "v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw=="; }; }; - "@babel/helper-create-class-features-plugin-7.14.6" = { + "@babel/helper-create-class-features-plugin-7.14.8" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.14.6"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.6.tgz"; - sha512 = "Z6gsfGofTxH/+LQXqYEK45kxmcensbzmk/oi8DmaQytlQCgqNZt9XQF8iqlI/SeXWVjaMNxvYvzaYw+kh42mDg=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.8.tgz"; + sha512 = "bpYvH8zJBWzeqi1o+co8qOrw+EXzQ/0c74gVmY205AWXy9nifHrOg77y+1zwxX5lXE7Icq4sPlSQ4O2kWBrteQ=="; }; }; "@babel/helper-create-regexp-features-plugin-7.14.5" = { @@ -499,13 +499,13 @@ let sha512 = "SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ=="; }; }; - "@babel/helper-module-transforms-7.14.5" = { + "@babel/helper-module-transforms-7.14.8" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.14.5"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.5.tgz"; - sha512 = "iXpX4KW8LVODuAieD7MzhNjmM6dzYY5tfRqT+R9HDXWl0jPn/djKmA+G9s/2C2T9zggw5tK1QNqZ70USfedOwA=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.8.tgz"; + sha512 = "RyE+NFOjXn5A9YU1dkpeBaduagTlZ0+fccnIcAGbv1KGUlReBj7utF7oEth8IdIBQPcux0DDgW5MFBH2xu9KcA=="; }; }; "@babel/helper-optimise-call-expression-7.14.5" = { @@ -553,13 +553,13 @@ let sha512 = "3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow=="; }; }; - "@babel/helper-simple-access-7.14.5" = { + "@babel/helper-simple-access-7.14.8" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.14.5"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.14.5.tgz"; - sha512 = "nfBN9xvmCt6nrMZjfhkl7i0oTV3yxR4/FztsbOASyTvVcoYd0TRHh7eMLdlEcCqobydC0LAF3LtC92Iwxo0wyw=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.14.8.tgz"; + sha512 = "TrFN4RHh9gnWEU+s7JloIho2T76GPwRHhdzOWLqTrMnlas8T9O7ec+oEDNsRXndOmru9ymH9DFrEOxpzPoSbdg=="; }; }; "@babel/helper-skip-transparent-expression-wrappers-7.14.5" = { @@ -580,13 +580,13 @@ let sha512 = "hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA=="; }; }; - "@babel/helper-validator-identifier-7.14.5" = { + "@babel/helper-validator-identifier-7.14.8" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.14.5"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz"; - sha512 = "5lsetuxCLilmVGyiLEfoHBRX8UCFD+1m2x3Rj97WrW3V7H3u4RWRXA4evMjImCsin2J2YT0QaVDGf+z8ondbAg=="; + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz"; + sha512 = "ZGy6/XQjllhYQrNw/3zfWRwZCTVSiBLZ9DHVZxn9n2gip/7ab8mv2TWlKPIBk26RwedCBoWdjLmn+t9na2Gcow=="; }; }; "@babel/helper-validator-option-7.14.5" = { @@ -607,13 +607,13 @@ let sha512 = "YEdjTCq+LNuNS1WfxsDCNpgXkJaIyqco6DAelTUjT4f2KIWC1nBcaCaSdHTBqQVLnTBexBcVcFhLSU1KnYuePQ=="; }; }; - "@babel/helpers-7.14.6" = { + "@babel/helpers-7.14.8" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.14.6"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.6.tgz"; - sha512 = "yesp1ENQBiLI+iYHSJdoZKUtRpfTlL1grDIX9NRlAVppljLw/4tTyYupIB7uIYmC3stW/imAv8EqaKaS/ibmeA=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.8.tgz"; + sha512 = "ZRDmI56pnV+p1dH6d+UN6GINGz7Krps3+270qqI9UJ4wxYThfAIcI5i7j5vXC4FJ3Wap+S9qcebxeYiqn87DZw=="; }; }; "@babel/highlight-7.14.5" = { @@ -634,13 +634,13 @@ let sha512 = "OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw=="; }; }; - "@babel/parser-7.14.7" = { + "@babel/parser-7.14.8" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.14.7"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.14.7.tgz"; - sha512 = "X67Z5y+VBJuHB/RjwECp8kSl5uYi0BvRbNeWqkaJCVh+LiTPl19WBUfG627psSgp9rSf6ojuXghQM3ha6qHHdA=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.14.8.tgz"; + sha512 = "syoCQFOoo/fzkWDeM0dLEZi5xqurb5vuyzwIMNZRNun+N/9A4cUZeQaE7dTrB8jGaKuJRBtEOajtnmw0I5hvvA=="; }; }; "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" = { @@ -1399,13 +1399,13 @@ let sha512 = "9PMijx8zFbCwTHrd2P4PJR5nWGH3zWebx2OcpTjqQrHhCiL2ssSR2Sc9ko2BsI2VmVBfoaQmPrlMTCui4LmXQg=="; }; }; - "@babel/preset-env-7.14.7" = { + "@babel/preset-env-7.14.8" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.14.7"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.14.7.tgz"; - sha512 = "itOGqCKLsSUl0Y+1nSfhbuuOlTs0MJk2Iv7iSH+XT/mR8U1zRLO7NjWlYXB47yhK4J/7j+HYty/EhFZDYKa/VA=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.14.8.tgz"; + sha512 = "a9aOppDU93oArQ51H+B8M1vH+tayZbuBqzjOhntGetZVa+4tTu5jp+XTwqHGG2lxslqomPYVSjIxQkFwXzgnxg=="; }; }; "@babel/preset-flow-7.14.5" = { @@ -1489,13 +1489,13 @@ let sha512 = "aY2kU+xgJ3dJ1eU6FMB9EH8dIe8dmusF1xEku52joLvw6eAFN0AI+WxCLDnpev2LEejWBAy2sBvBOBAjI3zmvA=="; }; }; - "@babel/runtime-7.14.6" = { + "@babel/runtime-7.14.8" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.14.6"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.6.tgz"; - sha512 = "/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.8.tgz"; + sha512 = "twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg=="; }; }; "@babel/runtime-7.9.0" = { @@ -1507,22 +1507,22 @@ let sha512 = "cTIudHnzuWLS56ik4DnRnqqNf8MkdUzV4iFFI1h7Jo9xvrpQROYaAnaSd2mHLQAzzZAPfATynX5ord6YlNYNMA=="; }; }; - "@babel/runtime-corejs3-7.14.7" = { + "@babel/runtime-corejs3-7.14.8" = { name = "_at_babel_slash_runtime-corejs3"; packageName = "@babel/runtime-corejs3"; - version = "7.14.7"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.7.tgz"; - sha512 = "Wvzcw4mBYbTagyBVZpAJWI06auSIj033T/yNE0Zn1xcup83MieCddZA7ls3kme17L4NOGBrQ09Q+nKB41RLWBA=="; + url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.8.tgz"; + sha512 = "4dMD5QRBkumn45oweR0SxoNtt15oz3BUBAQ8cIx7HJqZTtE8zjpM0My8aHJHVnyf4XfRg6DNzaE1080WLBiC1w=="; }; }; - "@babel/standalone-7.14.7" = { + "@babel/standalone-7.14.8" = { name = "_at_babel_slash_standalone"; packageName = "@babel/standalone"; - version = "7.14.7"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/standalone/-/standalone-7.14.7.tgz"; - sha512 = "7RlfMPR4604SbYpj5zvs2ZK587hVhixgU9Pd9Vs8lB8KYtT3U0apXSf0vZXhy8XRh549eUmJOHXhWKTO3ObzOQ=="; + url = "https://registry.npmjs.org/@babel/standalone/-/standalone-7.14.8.tgz"; + sha512 = "5Aa1Bhis4oZD23iLJE5CDYHEs1zSC3ejppHE5aim0OWjGCWTa9Oq1PwopK4u1++ao6B6POW/PqNZjOCZNTSx0Q=="; }; }; "@babel/template-7.14.5" = { @@ -1534,13 +1534,13 @@ let sha512 = "6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g=="; }; }; - "@babel/traverse-7.14.7" = { + "@babel/traverse-7.14.8" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.14.7"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.7.tgz"; - sha512 = "9vDr5NzHu27wgwejuKL7kIOm4bwEtaPQ4Z6cpCmjSuaRqpH/7xc4qcGEscwMqlkwgcXl6MvqoAjZkQ24uSdIZQ=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.8.tgz"; + sha512 = "kexHhzCljJcFNn1KYAQ6A5wxMRzq9ebYpEDV4+WdNyr3i7O44tanbDOR/xjiG2F3sllan+LgwK+7OMk0EmydHg=="; }; }; "@babel/types-7.13.12" = { @@ -1552,13 +1552,13 @@ let sha512 = "K4nY2xFN4QMvQwkQ+zmBDp6ANMbVNw6BbxWmYA4qNjhR9W+Lj/8ky5MEY2Me5r+B2c6/v6F53oMndG+f9s3IiA=="; }; }; - "@babel/types-7.14.5" = { + "@babel/types-7.14.8" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.14.5"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.14.5.tgz"; - sha512 = "M/NzBpEL95I5Hh4dwhin5JlE7EzO5PHMAuzjxss3tiOBD46KfQvVedN/3jEPZvdRvtsK2222XfdHogNIttFgcg=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.14.8.tgz"; + sha512 = "iob4soQa7dZw8nodR/KlOQkPh9S4I8RwCxwRIFuiMRYjOzH/KJzdUfDgz6cGi5dDaclXF4P2PAhCdrBJNIg68Q=="; }; }; "@braintree/sanitize-url-3.1.0" = { @@ -2497,13 +2497,13 @@ let sha512 = "d4VSA86eL/AFTe5xtyZX+ePUjE8dIFu2T8zmdeNBSa5/kNgXPCx/o/wbFNHAGLJdGnk1vddRuMESD9HbOC8irw=="; }; }; - "@google-cloud/pubsub-2.16.0" = { + "@google-cloud/pubsub-2.16.1" = { name = "_at_google-cloud_slash_pubsub"; packageName = "@google-cloud/pubsub"; - version = "2.16.0"; + version = "2.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.16.0.tgz"; - sha512 = "1cZveyznm9qHXzRqlbS3GLeDiaFp8JVN6Urkrt5hgJGWP/IY9kxuJ0ZCnCeZE4x9O/+a5hWgKaQtBKseJYw//Q=="; + url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.16.1.tgz"; + sha512 = "+uO7r9uRfD/x0BzBI67clbIu0VIdqYLZ5NINuGEsMiAXIGWQWmceuLMixMEb/JOxeaqKygH1mL2rshkDisUmGg=="; }; }; "@graphql-cli/common-4.1.0" = { @@ -4171,13 +4171,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-15.11.5" = { + "@netlify/build-16.0.1" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "15.11.5"; + version = "16.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-15.11.5.tgz"; - sha512 = "qsL1bvVAa5ZPIkYxo1Z4vdOcq8sDxQhyKjDqPAEasLqfX3ZTABctze3WdD6WmpyR9wzQEJLpCy1s3ncTDeiU0w=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-16.0.1.tgz"; + sha512 = "DRuFNlK309541EbnY4xHBXrYTgn4K59IpzbE9+ACCuOOav0lJHrVXTeZCzl2dAg/dvEp0/9YwDncmyjr4uKqWQ=="; }; }; "@netlify/cache-utils-1.0.7" = { @@ -4189,13 +4189,13 @@ let sha512 = "yrdrnQkzg/qMovoFYwQ24UVt/OyHtP+t0KpQFd7eBl6gnuuGGgxFocaFFv6eKpMVwzHTsOwx/y9B/FcC3/6cfA=="; }; }; - "@netlify/config-12.6.0" = { + "@netlify/config-13.0.0" = { name = "_at_netlify_slash_config"; packageName = "@netlify/config"; - version = "12.6.0"; + version = "13.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-12.6.0.tgz"; - sha512 = "L+ZmoGsO2Gql+T6+147G7ZctcXgViuh8Q1ReADICM4xdaYVmipRFC+ICU4iJ8I9UQnc0M7qM0ZHzKuhTdPJfiA=="; + url = "https://registry.npmjs.org/@netlify/config/-/config-13.0.0.tgz"; + sha512 = "d7NNG3lbvZN/w9eCRdlFKBY21Vpjxlwis08v5NJjkZpNTuuAuemNFrhZv2y5zmy33TM+zTrkaoEAk6vJ96R5cQ=="; }; }; "@netlify/esbuild-0.13.6" = { @@ -4261,13 +4261,13 @@ let sha512 = "Z2RNrNhO7fsNFmpUQ+eNawgtfHwbGH/4Hji2g+GCRYL7W60kgK5rsWxveky1Nrye45I2OQn/4ZGapKqB1IqTaw=="; }; }; - "@netlify/routing-local-proxy-0.30.2" = { + "@netlify/routing-local-proxy-0.31.0" = { name = "_at_netlify_slash_routing-local-proxy"; packageName = "@netlify/routing-local-proxy"; - version = "0.30.2"; + version = "0.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/routing-local-proxy/-/routing-local-proxy-0.30.2.tgz"; - sha512 = "rQnv383/vFF1x3iKnY/2Q2i7Z7RhugfoVfAIbEJ2bIaWFMQ2YcGMVpwj1w8rK+4MGH5uwvlNNlfE0gGYQOq+4Q=="; + url = "https://registry.npmjs.org/@netlify/routing-local-proxy/-/routing-local-proxy-0.31.0.tgz"; + sha512 = "SSlWic9za/0QtfCP7GllJcOV98BWlx2goOF9bLLhmsHGiPfrhlhZfemqdMtKM4BIs+G70wzUqaIYeyjtxVh37A=="; }; }; "@netlify/run-utils-1.0.7" = { @@ -4639,13 +4639,13 @@ let sha512 = "SWTdXsVheRmlotWNjKzPOb6Js6tjSqA2a8z9+glDJng0Aqjzti8MEWOtuT8ZSu6wHnci7LZNuarE87+WJBG4vg=="; }; }; - "@octokit/openapi-types-8.3.0" = { + "@octokit/openapi-types-9.0.0" = { name = "_at_octokit_slash_openapi-types"; packageName = "@octokit/openapi-types"; - version = "8.3.0"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-8.3.0.tgz"; - sha512 = "ZFyQ30tNpoATI7o+Z9MWFUzUgWisB8yduhcky7S4UYsRijgIGSnwUKzPBDGzf/Xkx1DuvUtqzvmuFlDSqPJqmQ=="; + url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-9.0.0.tgz"; + sha512 = "GSpv5VUFqarOXZl6uWPsDnjChkKCxnaMALmQhzvCWGiMxONQxX7ZwlomCMS+wB1KqxLPCA5n6gYt016oEMkHmQ=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -4675,13 +4675,13 @@ let sha512 = "mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA=="; }; }; - "@octokit/plugin-rest-endpoint-methods-5.4.1" = { + "@octokit/plugin-rest-endpoint-methods-5.4.2" = { name = "_at_octokit_slash_plugin-rest-endpoint-methods"; packageName = "@octokit/plugin-rest-endpoint-methods"; - version = "5.4.1"; + version = "5.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.4.1.tgz"; - sha512 = "Nx0g7I5ayAYghsLJP4Q1Ch2W9jYYM0FlWWWZocUro8rNxVwuZXGfFd7Rcqi9XDWepSXjg1WByiNJnZza2hIOvQ=="; + url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.4.2.tgz"; + sha512 = "imNDDvUMy9YzECcP6zTcKNjwutSwqCYGMZjLPnBHF0kdb3V9URrHWmalD0ZvNEYjwbpm2zw8RPewj3ebCpMBRw=="; }; }; "@octokit/request-5.6.0" = { @@ -4702,22 +4702,22 @@ let sha512 = "1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg=="; }; }; - "@octokit/rest-18.6.7" = { + "@octokit/rest-18.6.8" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; - version = "18.6.7"; + version = "18.6.8"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.6.7.tgz"; - sha512 = "Kn6WrI2ZvmAztdx+HEaf88RuJn+LK72S8g6OpciE4kbZddAN84fu4fiPGxcEu052WmqKVnA/cnQsbNlrYC6rqQ=="; + url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.6.8.tgz"; + sha512 = "n2aT0mJL9N/idCPmnBynCino1qNScfRHvr8OeskQdBNhUYAMc7cxoc8KLlv1DMWxlZUNhed+5kVdu7majVdVag=="; }; }; - "@octokit/types-6.19.0" = { + "@octokit/types-6.19.1" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "6.19.0"; + version = "6.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-6.19.0.tgz"; - sha512 = "9wdZFiJfonDyU6DjIgDHxAIn92vdSUBOwAXbO2F9rOFt6DJwuAkyGLu1CvdJPphCbPBoV9iSDMX7y4fu0v6AtA=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-6.19.1.tgz"; + sha512 = "hMI2EokQzMG8ABWcnvcrabqQFuFHqUdN0HUOG4DPTaOtnf/jqhzhK1SHOGu5vDlI/x+hWJ60e28VxB7QhOP0CQ=="; }; }; "@open-policy-agent/opa-wasm-1.2.0" = { @@ -5476,13 +5476,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-3.13.4" = { + "@serverless/components-3.14.0" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "3.13.4"; + version = "3.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-3.13.4.tgz"; - sha512 = "Qv0hDwj5dG2WaCnVvfzZ4LggMWPfONVtCUWIM7LbCGwVq+K3nnkdql1nJqrfCMkqc3rz2hjxck35ckOPxDiVRQ=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-3.14.0.tgz"; + sha512 = "Ssuu+OcyWvisGIMZD4Lr9Uj20Ndgb9a8Z/Jw4VbhFS+grc89uK7vZR3pS9I4LTfTUKH4HUbMJXxDndNEFGgLAA=="; }; }; "@serverless/core-1.1.2" = { @@ -5557,13 +5557,13 @@ let sha512 = "cl5uPaGg72z0sCUpF0zsOhwYYUV72Gxc1FwFfxltO8hSvMeFDvwD7JrNE4kHcIcKRjwPGbSH0fdVPUpErZ8Mog=="; }; }; - "@serverless/utils-5.4.0" = { + "@serverless/utils-5.5.0" = { name = "_at_serverless_slash_utils"; packageName = "@serverless/utils"; - version = "5.4.0"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils/-/utils-5.4.0.tgz"; - sha512 = "abEYhQ8Bgh48w/8uzvv8hlfOXsbkvTns3vuMU4THpb0nhbhqL7Y4AWf6z4wJFxcMd0yffkgUQWwSzYHwGJp3kA=="; + url = "https://registry.npmjs.org/@serverless/utils/-/utils-5.5.0.tgz"; + sha512 = "cn1eoSla6/hbytPgwh3tiUCeBjVBHt3nKgFwYtF0Aj3B1V+qaBMLOcXmXop+WHhWUil8rP4R9HJ4buR5BgLYWw=="; }; }; "@serverless/utils-china-1.1.4" = { @@ -7213,6 +7213,15 @@ let sha512 = "8h7k1YgQKxKXWckzFCMfsIwn0Y61UK6tlD6y2lOb3hTOIMlK3t9/QwHOhc81TwU+RMf0As5fj7NPjroERCnejQ=="; }; }; + "@types/node-16.4.0" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "16.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-16.4.0.tgz"; + sha512 = "HrJuE7Mlqcjj+00JqMWpZ3tY8w7EUd+S0U3L1+PQSWiXZbOgyQDvi+ogoUxaHApPJq5diKxYBQwA3iIlNcPqOg=="; + }; + }; "@types/node-6.14.13" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -11254,13 +11263,13 @@ let sha512 = "tbMZ/Y2rRo6R6TTBODJXTiil+MXaoT6Qzotws3yvI1IWGpYxKo7N/3L06XB8ul8tCG0TigxIOY70SMICM70Ppg=="; }; }; - "aws-sdk-2.949.0" = { + "aws-sdk-2.950.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.949.0"; + version = "2.950.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.949.0.tgz"; - sha512 = "n9vqtsLPmSvJcvYvBLBbI1n4GZokwc/5zgHZD7VxdioLNXo1nHQ3VUi4MiW+3kIN40NUNf+Gc5vpc82yNYCvsw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.950.0.tgz"; + sha512 = "iFC5fKLuFLEV27xeKmxDHDZzIDj4upm5+Ts3NpYYRbwPlOG0nE0gZzf9fRYkLkLgTr0TQq26CbKorgeo+6ailw=="; }; }; "aws-sign2-0.6.0" = { @@ -14674,13 +14683,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001245" = { + "caniuse-lite-1.0.30001246" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001245"; + version = "1.0.30001246"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001245.tgz"; - sha512 = "768fM9j1PKXpOCKws6eTo3RHmvTUsG9UrpT4WoREFeZgJBTi4/X9g565azS/rVUGtqb8nt7FjLeF5u4kukERnA=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001246.tgz"; + sha512 = "Tc+ff0Co/nFNbLOrziBXmMVtpt9S2c2Y+Z9Nk9Khj09J+0zR9ejvIW5qkZAErCbOrVODCx/MN+GpB5FNBs5GFA=="; }; }; "canvas-2.8.0" = { @@ -17365,13 +17374,13 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "constructs-3.3.98" = { + "constructs-3.3.99" = { name = "constructs"; packageName = "constructs"; - version = "3.3.98"; + version = "3.3.99"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.98.tgz"; - sha512 = "VvDuJMqDUb16jB4EsCHthVb74yJcnD/5XWkybYgK5Ieee5o54eyxEzM9jFbZEasysPX4zR05Z/ygEzdlj+QZPg=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.99.tgz"; + sha512 = "uX3bZtp6Zn53Utyurp4DrKolIDUuiDddHVTgsQ39KhVRkQ8TRMtl0nyXllysMtu78t8zLo9QygeyQ0QOBy3LHw=="; }; }; "consume-http-header-1.0.0" = { @@ -18140,13 +18149,13 @@ let sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; }; }; - "create-gatsby-1.9.0" = { + "create-gatsby-1.10.0" = { name = "create-gatsby"; packageName = "create-gatsby"; - version = "1.9.0"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-1.9.0.tgz"; - sha512 = "KYQnXV2uaZCUt3y4Kkh4hlBGg4LYc6XCEdp99CEfMKOCu34rte5+6c1EZRpphATLqdKIitdFlPp5dJm3knBeMA=="; + url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-1.10.0.tgz"; + sha512 = "EiN8bJepWMN4itheoQ9ul1jNrSWoWy5Cw+kAfF1sN0J7ZWtuYCFfRZX97VRTt6C7bvlHkTw7gew2pUbFS8La+Q=="; }; }; "create-graphback-1.0.1" = { @@ -21857,13 +21866,13 @@ let sha512 = "07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g=="; }; }; - "duplexify-4.1.1" = { + "duplexify-4.1.2" = { name = "duplexify"; packageName = "duplexify"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/duplexify/-/duplexify-4.1.1.tgz"; - sha512 = "DY3xVEmVHTv1wSzKNbwoU6nVjzI369Y6sPoqfYr0/xlx3IdX2n94xIszTcjPO8W8ZIv0Wb0PXNcjuZyT4wiICA=="; + url = "https://registry.npmjs.org/duplexify/-/duplexify-4.1.2.tgz"; + sha512 = "fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw=="; }; }; "duration-0.2.2" = { @@ -22055,13 +22064,13 @@ let sha512 = "1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ=="; }; }; - "electron-to-chromium-1.3.780" = { + "electron-to-chromium-1.3.782" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.780"; + version = "1.3.782"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.780.tgz"; - sha512 = "2KQ9OYm9WMUNpAPA/4aerURl3hwRc9tNlpsiEj3Y8Gf7LVf26NzyLIX2v0hSagQwrS9+cWab+28A2GPKDoVNRA=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.782.tgz"; + sha512 = "6AI2se1NqWA1SBf/tlD6tQD/6ZOt+yAhqmrTlh4XZw4/g0Mt3p6JhTQPZxRPxPZiOg0o7ss1EBP/CpYejfnoIA=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -25000,13 +25009,13 @@ let sha512 = "sXAMgFk67fQLcetXustxfKX+PZgHIUFn96Xld9uH8aXPdX3xOp0/jg9OdouVTvQrf7mrn+wAa4jN/y9fUOOiRA=="; }; }; - "file-type-16.5.1" = { + "file-type-16.5.2" = { name = "file-type"; packageName = "file-type"; - version = "16.5.1"; + version = "16.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/file-type/-/file-type-16.5.1.tgz"; - sha512 = "Pi1G43smrCy82Q3be3sfKaeS5uHdfj905dP88YqhroG6TYbVY2ljTdDXeXqa6Cn5nOk6znOjWM2uZptA8vH/qQ=="; + url = "https://registry.npmjs.org/file-type/-/file-type-16.5.2.tgz"; + sha512 = "lnHRZj2USLF3v4C5ZY7/vQQeoTVA1YV9TtD6UUCr9z5Cd0uyutqxPBJxkXzM6lufPNuSfefq/yFmnSPz0C3wNw=="; }; }; "file-type-3.9.0" = { @@ -26602,31 +26611,31 @@ let sha1 = "cbed2d20a40c1f5679a35908e2b9415733e78db9"; }; }; - "gatsby-core-utils-2.9.0" = { + "gatsby-core-utils-2.10.0" = { name = "gatsby-core-utils"; packageName = "gatsby-core-utils"; - version = "2.9.0"; + version = "2.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-2.9.0.tgz"; - sha512 = "LKmkk4B/VnSEYKR9W/C8Lp9lwk/l/qY5jbsoiChc43F67VM667gITWH0noSUdcGzbEsN8xi0Wuc8dMA6BvKkvg=="; + url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-2.10.0.tgz"; + sha512 = "xvVebKSrjHkZQQkeEjuAekCAg17KT2l44d/yn7w2dzBGay244m8hoY8LRtLRdsrSp30ix89QklefuP9frEfhbA=="; }; }; - "gatsby-recipes-0.20.0" = { + "gatsby-recipes-0.21.0" = { name = "gatsby-recipes"; packageName = "gatsby-recipes"; - version = "0.20.0"; + version = "0.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.20.0.tgz"; - sha512 = "GsQOovAFImV3MtZVTTjv6utMRRo5QDC1+7l3Je3kqHz425J7UcmjMH/ZzHdzIZ1hO2/RUgGoFXAbWgqhipJp2g=="; + url = "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.21.0.tgz"; + sha512 = "oo9ci5G6TiXc5wVnRrTfJhX92ZsjICVa0ldX7aQ/8JR77HelfO3MFfQuIkswla+o0MGcbyxgVoLX45kgzY7aaA=="; }; }; - "gatsby-telemetry-2.9.0" = { + "gatsby-telemetry-2.10.0" = { name = "gatsby-telemetry"; packageName = "gatsby-telemetry"; - version = "2.9.0"; + version = "2.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-2.9.0.tgz"; - sha512 = "Ji40by9qHm9Zz2vKIBACT77awt0FpqKES9uT9nLmaqyiOZ/7Hs1dKwMrZ2yCkHNBh6S9RplcgfUQLq2LE4oeaA=="; + url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-2.10.0.tgz"; + sha512 = "uon+KRo6NQqkc6Qk/QTw+RmaxIjFFIK7cSU8XXE3y353il2Tk04Kxct2hMHn8Zdl4TYyKla1T5UIvVV/EfpBcg=="; }; }; "gauge-1.2.7" = { @@ -33435,13 +33444,13 @@ let sha512 = "Heu6D+yI5mmUklLQdX3PdDvHUQm14618Fj4PQM9seKa4cohxzJ7EHopfRObKYHMko9awopx4Qr7Gtu6u/QPqfw=="; }; }; - "jsii-srcmak-0.1.301" = { + "jsii-srcmak-0.1.302" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.301"; + version = "0.1.302"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.301.tgz"; - sha512 = "RmUimAPVkk1QflCGjJVUsQsv+W+lD6yZMLpHEHkNEdUvlYSUkZIM2VXjF7LUw7HnS9gFFBftUd6W02OVGbd9Bg=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.302.tgz"; + sha512 = "UsXZ6LGLqP/nUNyq0ey3xOLpNDpkye5HeNAnJCVqw4vsT9o5EX7MHv9ca/JDlt7fWn+cUdo/Bcj5UZJvg+Chfg=="; }; }; "json-bigint-0.2.3" = { @@ -33750,13 +33759,13 @@ let sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A=="; }; }; - "json2jsii-0.1.270" = { + "json2jsii-0.1.272" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.1.270"; + version = "0.1.272"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.270.tgz"; - sha512 = "blBOb7+GDWTLv6jxye684joWzQyuFM6HT+NsPQPuASkT7pABBt3Xx2wsVm/qMJeg7ITufgSfeh1TnNrFROicMg=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.272.tgz"; + sha512 = "OUZqjQhnRalQmQx3kFM3mG5DQcfEYzmUYBWGdb6QwGLuvwB/eJ2PhXuLEkGF+PhRwOrW5IyEcF8U+O39mh3G5Q=="; }; }; "json3-3.2.6" = { @@ -35101,13 +35110,13 @@ let sha512 = "yRHaiQDizWSzoXk3APcA71eOI/UuhEkNN9DiW2Tt44mhYzX4joFoCZlxsSOF7RyeLlfqzFLQI1ngFq3ggMPhOw=="; }; }; - "lighthouse-logger-1.2.0" = { + "lighthouse-logger-1.3.0" = { name = "lighthouse-logger"; packageName = "lighthouse-logger"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/lighthouse-logger/-/lighthouse-logger-1.2.0.tgz"; - sha512 = "wzUvdIeJZhRsG6gpZfmSCfysaxNEr43i+QT+Hie94wvHDKFLi4n7C2GqZ4sTC+PH5b5iktmXJvU87rWvhP3lHw=="; + url = "https://registry.npmjs.org/lighthouse-logger/-/lighthouse-logger-1.3.0.tgz"; + sha512 = "BbqAKApLb9ywUli+0a+PcV04SyJ/N1q/8qgCNe6U97KbPCS1BTksEuHFLYdvc8DltuhfxIUBqDZsC0bBGtl3lA=="; }; }; "lightning-3.3.12" = { @@ -35137,6 +35146,15 @@ let sha512 = "z/bfkDEAKyN0HtN7rkiyVlDA3J5L/jxXsE4YuGfQPa8TyPWovyLdo6/aHP0mMy8n+G4tq0g2oKZ/1Z5ONJAVqA=="; }; }; + "lightning-3.4.0" = { + name = "lightning"; + packageName = "lightning"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lightning/-/lightning-3.4.0.tgz"; + sha512 = "lD6PgHipqedfFcTEf/9mDF3s4KGO/lecr02W6zHBJHohNphuBUZS1z68kKRJAl3N4iHmDEfLxt+G86PBP0jhHw=="; + }; + }; "lilconfig-2.0.3" = { name = "lilconfig"; packageName = "lilconfig"; @@ -35281,6 +35299,15 @@ let sha512 = "EBEeBymqktoaViGAG5aVmgIOZpWc6IwDqxq93ZYYIw+Uc9Vy/86nUDPx8A/jJC0f8lwEGcqT+hnSIiBF4SyqeA=="; }; }; + "ln-service-51.10.0" = { + name = "ln-service"; + packageName = "ln-service"; + version = "51.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ln-service/-/ln-service-51.10.0.tgz"; + sha512 = "k6wGBB6RfyHhMY296MsHhZrVuJSqNsqx3nF3WM5lkKAg+58OdU6bLzqVttpit9uHamc6tssD2GDxNS6gdUzOYQ=="; + }; + }; "ln-service-51.8.2" = { name = "ln-service"; packageName = "ln-service"; @@ -35317,6 +35344,15 @@ let sha512 = "FMfcEISlboFVz+wLTAJ+FnEIQkoMR7IHcUg4l5JNwsU/UOijM1vTQDFhHVqg5fEQAFboZe3lNd7Rh1uxxqs47Q=="; }; }; + "ln-sync-0.4.7" = { + name = "ln-sync"; + packageName = "ln-sync"; + version = "0.4.7"; + src = fetchurl { + url = "https://registry.npmjs.org/ln-sync/-/ln-sync-0.4.7.tgz"; + sha512 = "2yqc59OhK0affnkwhgw7iY4x2tKZTb8y8KSWxRHn6cSXL3clUJgXdTNOGr4Jp8j1TkTl0iRVnLSNZlRbtU4vVA=="; + }; + }; "ln-telegram-3.2.9" = { name = "ln-telegram"; packageName = "ln-telegram"; @@ -45265,6 +45301,15 @@ let sha512 = "iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA=="; }; }; + "peek-readable-3.1.4" = { + name = "peek-readable"; + packageName = "peek-readable"; + version = "3.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/peek-readable/-/peek-readable-3.1.4.tgz"; + sha512 = "DX7ec7frSMtCWw+zMd27f66hcxIz/w9LQTY2RflB4WNHCVPAye1pJiP2t3gvaaOhu7IOhtPbHw8MemMj+F5lrg=="; + }; + }; "peek-readable-4.0.0" = { name = "peek-readable"; packageName = "peek-readable"; @@ -51584,13 +51629,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.53.2" = { + "rollup-2.53.3" = { name = "rollup"; packageName = "rollup"; - version = "2.53.2"; + version = "2.53.3"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.53.2.tgz"; - sha512 = "1CtEYuS5CRCzFZ7SNW5528SlDlk4VDXIRGwbm/2POQxA/G4+7/crIqJwkmnj8Q/74hGx4oVlNvh4E1CJQ5hZ6w=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.53.3.tgz"; + sha512 = "79QIGP5DXz5ZHYnCPi3tLz+elOQi6gudp9YINdaJdjG0Yddubo6JRFUM//qCZ0Bap/GJrsUoEBVdSOc4AkMlRA=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -55202,13 +55247,13 @@ let sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA=="; }; }; - "sscaff-1.2.21" = { + "sscaff-1.2.22" = { name = "sscaff"; packageName = "sscaff"; - version = "1.2.21"; + version = "1.2.22"; src = fetchurl { - url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.21.tgz"; - sha512 = "X9Ei1liwS+LljdRsWz/QbgYK2sByLbDpvLTwVlL8+fGSz9Oh1D85WU3TR8kCCuPKLvfdGWIRimSQWvJ8zh5riw=="; + url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.22.tgz"; + sha512 = "aEkcIR+UIro2xsDASNy/K0v7hxGi18jgFshHpGrJ/tfB0GlQHQJR0W9y23mNxfDmFg/lbTaR0BdEsgC0znNEGA=="; }; }; "ssh-config-1.1.6" = { @@ -56480,6 +56525,15 @@ let sha1 = "0fdedc68e91addcfcb2e6be9c262581a6e8c28aa"; }; }; + "strtok3-6.1.3" = { + name = "strtok3"; + packageName = "strtok3"; + version = "6.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/strtok3/-/strtok3-6.1.3.tgz"; + sha512 = "ssWSKFOeUTurMSucgyUf+a6Z9mVTYrsYiyEK5RLnh8BM6sFrKSljVlnjZXIDxMguYfdQI+mUPFHo88FYTxq1XA=="; + }; + }; "strtok3-6.2.2" = { name = "strtok3"; packageName = "strtok3"; @@ -58623,6 +58677,15 @@ let sha512 = "wnQcqlreS6VjthyHO3Y/kpK/emflxDBNhlNUPfh7wE39KnuDdOituXomIbyI79vBtF0Ninpkh72mcuRHo+RG3Q=="; }; }; + "token-types-3.1.0" = { + name = "token-types"; + packageName = "token-types"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/token-types/-/token-types-3.1.0.tgz"; + sha512 = "WhoeIW7UTn7NC7L0t/4x3vU/YYSS1oeUxYgiGXQLd82Kaf1qtlxOex3ETY0+o2QuRgAdyursMlUhQBKDCfMUkQ=="; + }; + }; "toml-2.3.6" = { name = "toml"; packageName = "toml"; @@ -66429,7 +66492,7 @@ in sources."@hyperswarm/hypersign-2.1.1" sources."@hyperswarm/network-2.1.0" sources."@leichtgewicht/ip-codec-2.0.3" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."abstract-extension-3.1.1" sources."abstract-leveldown-6.2.3" sources."ansi-colors-3.2.3" @@ -66743,7 +66806,7 @@ in sources."pump-3.0.0" (sources."pumpify-2.0.1" // { dependencies = [ - sources."duplexify-4.1.1" + sources."duplexify-4.1.2" sources."readable-stream-3.6.0" ]; }) @@ -66934,7 +66997,7 @@ in ]; }) sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -66959,7 +67022,7 @@ in sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.49" sources."@types/json-schema-7.0.8" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/parse-json-4.0.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" @@ -66998,7 +67061,7 @@ in sources."buffer-5.7.1" sources."buffer-from-1.1.1" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.2" @@ -67025,7 +67088,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-5.8.2" // { @@ -67273,12 +67336,12 @@ in sources."@apollographql/graphql-upload-8-fork-8.1.3" sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.14.7" - sources."@babel/core-7.14.6" - sources."@babel/generator-7.14.5" + sources."@babel/core-7.14.8" + sources."@babel/generator-7.14.8" sources."@babel/helper-annotate-as-pure-7.14.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" sources."@babel/helper-compilation-targets-7.14.5" - sources."@babel/helper-create-class-features-plugin-7.14.6" + sources."@babel/helper-create-class-features-plugin-7.14.8" sources."@babel/helper-create-regexp-features-plugin-7.14.5" sources."@babel/helper-define-polyfill-provider-0.2.3" sources."@babel/helper-explode-assignable-expression-7.14.5" @@ -67287,20 +67350,20 @@ in sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-remap-async-to-generator-7.14.5" sources."@babel/helper-replace-supers-7.14.5" - sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.14.6" + sources."@babel/helpers-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" sources."@babel/plugin-proposal-async-generator-functions-7.14.7" sources."@babel/plugin-proposal-class-properties-7.14.5" @@ -67367,7 +67430,7 @@ in sources."@babel/plugin-transform-typescript-7.14.6" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - sources."@babel/preset-env-7.14.7" + sources."@babel/preset-env-7.14.8" sources."@babel/preset-flow-7.14.5" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-typescript-7.14.5" @@ -67378,10 +67441,10 @@ in sources."semver-5.7.1" ]; }) - sources."@babel/runtime-7.14.6" + sources."@babel/runtime-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" sources."@hapi/hoek-8.5.1" @@ -67434,7 +67497,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-1.3.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/normalize-package-data-2.4.1" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" @@ -67577,7 +67640,7 @@ in sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."caseless-0.12.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -67705,7 +67768,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -68598,12 +68661,12 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/generator-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/generator-7.14.8" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/types-7.14.5" + sources."@babel/types-7.14.8" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -68679,12 +68742,12 @@ in dependencies = [ sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.14.7" - (sources."@babel/core-7.14.6" // { + (sources."@babel/core-7.14.8" // { dependencies = [ sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.14.5" // { + (sources."@babel/generator-7.14.8" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -68695,19 +68758,19 @@ in sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-replace-supers-7.14.5" - sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.14.6" + sources."@babel/helpers-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" sources."array-unique-0.3.2" @@ -68715,7 +68778,7 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."browserslist-4.16.6" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -68726,7 +68789,7 @@ in sources."convert-source-map-1.8.0" sources."debug-4.3.2" sources."ejs-3.1.6" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -68820,7 +68883,7 @@ in dependencies = [ sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -68855,9 +68918,9 @@ in }; dependencies = [ sources."browserslist-4.16.6" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."colorette-1.2.2" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" sources."escalade-3.1.1" sources."fraction.js-4.1.1" sources."node-releases-1.1.73" @@ -68884,14 +68947,14 @@ in }; dependencies = [ sources."@tootallnate/once-1.1.2" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" - (sources."aws-sdk-2.949.0" // { + (sources."aws-sdk-2.950.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -69095,10 +69158,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "10.7.0"; + version = "10.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.7.0.tgz"; - sha512 = "rJ29qKw5UMS5WM9hdur696oXNiuszSJLhYKMBQuHDuwITeuwNk9GYhXyXRVFFOKVNetjsP/HruSU6tZ3jBq4kQ=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.7.1.tgz"; + sha512 = "V3LVbkFNTiy+ctpvCDgEgP8e0myUC/Iupm8D9URkS76SFYibAoMX3elcLVtsOXXqM4QyRrg29iGZj+HB+sQCHg=="; }; dependencies = [ sources."@alexbosworth/html2unicode-1.1.5" @@ -69111,7 +69174,7 @@ in sources."@cto.af/textdecoder-0.0.0" (sources."@grpc/grpc-js-1.3.2" // { dependencies = [ - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" ]; }) sources."@grpc/proto-loader-0.6.2" @@ -69478,7 +69541,34 @@ in sources."ws-7.5.0" ]; }) - (sources."ln-service-51.9.0" // { + (sources."ln-service-51.10.0" // { + dependencies = [ + sources."@grpc/grpc-js-1.3.6" + sources."@grpc/proto-loader-0.6.4" + sources."@types/express-4.17.13" + sources."@types/node-16.3.3" + sources."@types/request-2.48.6" + sources."@types/ws-7.4.7" + sources."bn.js-5.2.0" + sources."form-data-2.5.1" + sources."lightning-3.4.0" + sources."ws-7.5.3" + ]; + }) + (sources."ln-sync-0.4.7" // { + dependencies = [ + sources."@grpc/grpc-js-1.3.6" + sources."@grpc/proto-loader-0.6.4" + sources."@types/express-4.17.13" + sources."@types/node-16.3.3" + sources."@types/request-2.48.6" + sources."@types/ws-7.4.7" + sources."bn.js-5.2.0" + sources."form-data-2.5.1" + sources."lightning-3.4.0" + ]; + }) + (sources."ln-telegram-3.2.9" // { dependencies = [ sources."@grpc/grpc-js-1.3.5" sources."@grpc/proto-loader-0.6.4" @@ -69487,23 +69577,24 @@ in sources."@types/request-2.48.6" sources."@types/ws-7.4.6" sources."bn.js-5.2.0" + sources."cbor-7.0.5" sources."form-data-2.5.1" sources."lightning-3.3.16" + sources."ln-service-51.9.0" + (sources."ln-sync-0.4.6" // { + dependencies = [ + sources."@grpc/grpc-js-1.3.4" + sources."@grpc/proto-loader-0.6.3" + sources."@types/express-4.17.12" + sources."@types/node-15.12.5" + sources."@types/request-2.48.5" + sources."@types/ws-7.4.5" + sources."lightning-3.3.12" + ]; + }) sources."ws-7.5.3" ]; }) - (sources."ln-sync-0.4.6" // { - dependencies = [ - sources."@grpc/grpc-js-1.3.4" - sources."@grpc/proto-loader-0.6.3" - sources."@types/node-15.12.5" - sources."@types/ws-7.4.5" - sources."bn.js-5.2.0" - sources."cbor-7.0.5" - sources."lightning-3.3.12" - ]; - }) - sources."ln-telegram-3.2.9" sources."lodash-4.17.21" sources."lodash.camelcase-4.3.0" sources."lodash.clonedeep-4.5.0" @@ -69626,7 +69717,7 @@ in sources."process-nextick-args-2.0.1" (sources."protobufjs-6.11.2" // { dependencies = [ - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" ]; }) sources."proxy-addr-2.0.7" @@ -70344,10 +70435,10 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/parser-7.14.8" + sources."@babel/types-7.14.8" sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" sources."@types/minimist-1.2.2" @@ -70806,7 +70897,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -71240,7 +71331,7 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.29.3" - sources."constructs-3.3.98" + sources."constructs-3.3.99" sources."date-format-3.0.0" sources."debug-4.3.2" sources."decamelize-5.0.0" @@ -71313,13 +71404,13 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.301" // { + (sources."jsii-srcmak-0.1.302" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.3.0" - sources."json2jsii-0.1.270" + sources."json2jsii-0.1.272" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" @@ -71355,7 +71446,7 @@ in sources."snake-case-3.0.4" sources."sort-json-2.0.0" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.21" + sources."sscaff-1.2.22" (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" @@ -71470,7 +71561,7 @@ in sources."commonmark-0.29.3" sources."compress-commons-4.1.1" sources."concat-map-0.0.1" - sources."constructs-3.3.98" + sources."constructs-3.3.99" sources."convert-to-spaces-1.0.2" sources."core-util-is-1.0.2" sources."crc-32-1.2.0" @@ -71589,7 +71680,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.301" // { + (sources."jsii-srcmak-0.1.302" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -71672,7 +71763,7 @@ in sources."slice-ansi-3.0.0" sources."sort-json-2.0.0" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.21" + sources."sscaff-1.2.22" sources."stack-utils-2.0.3" sources."stream-buffers-3.0.2" (sources."streamroller-2.2.4" // { @@ -72147,10 +72238,10 @@ in coc-java = nodeEnv.buildNodePackage { name = "coc-java"; packageName = "coc-java"; - version = "1.5.3"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/coc-java/-/coc-java-1.5.3.tgz"; - sha512 = "St4Vg5DSHaBW0zqXoSKlKL0KJiASSGMIKDUX2zp/l8ImJd6YI5+SoEwYjCxA2c5x01hZ7k3prXDdfgpKp304RA=="; + url = "https://registry.npmjs.org/coc-java/-/coc-java-1.5.4.tgz"; + sha512 = "6/dloBU+OuRHO/YxX/vWYEFykCQSyN+ASTiwIw0O/l5CyDh9E967sLtodN9uH/MAyExOYfl5i65zI20CMZ6zDQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -72473,7 +72564,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" @@ -72552,7 +72643,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."capture-stack-trace-1.0.1" sources."ccount-1.1.0" (sources."chalk-4.1.1" // { @@ -72650,7 +72741,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" @@ -73607,31 +73698,31 @@ in dependencies = [ sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.14.7" - sources."@babel/core-7.14.6" - sources."@babel/generator-7.14.5" + sources."@babel/core-7.14.8" + sources."@babel/generator-7.14.8" sources."@babel/helper-compilation-targets-7.14.5" sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-replace-supers-7.14.5" - sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.14.6" + sources."@babel/helpers-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -73661,7 +73752,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" (sources."chalk-4.1.1" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -73699,7 +73790,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -73986,7 +74077,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/highlight-7.14.5" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" @@ -74101,7 +74192,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" @@ -75159,14 +75250,14 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/highlight-7.14.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/normalize-package-data-2.4.1" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -75537,7 +75628,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -76852,7 +76943,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.9.2" sources."abbrev-1.1.1" @@ -77447,12 +77538,12 @@ in dependencies = [ sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.14.7" - (sources."@babel/core-7.14.6" // { + (sources."@babel/core-7.14.8" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.14.5" + sources."@babel/generator-7.14.8" sources."@babel/helper-annotate-as-pure-7.14.5" (sources."@babel/helper-compilation-targets-7.14.5" // { dependencies = [ @@ -77464,17 +77555,17 @@ in sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-replace-supers-7.14.5" - sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.14.6" + sources."@babel/helpers-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/plugin-proposal-object-rest-spread-7.14.7" sources."@babel/plugin-syntax-jsx-7.14.5" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" @@ -77482,15 +77573,15 @@ in sources."@babel/plugin-transform-parameters-7.14.5" sources."@babel/plugin-transform-react-jsx-7.14.5" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@sindresorhus/is-4.0.1" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimist-1.2.2" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/normalize-package-data-2.4.1" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -77525,7 +77616,7 @@ in sources."quick-lru-4.0.1" ]; }) - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -77562,7 +77653,7 @@ in }) sources."defer-to-connect-2.0.1" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -77805,7 +77896,7 @@ in src = ../../applications/video/epgstation; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -79507,7 +79598,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" @@ -79668,7 +79759,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" @@ -79856,7 +79947,7 @@ in sources."semver-5.7.1" ]; }) - sources."@babel/generator-7.14.5" + sources."@babel/generator-7.14.8" sources."@babel/helper-annotate-as-pure-7.14.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" (sources."@babel/helper-compilation-targets-7.14.5" // { @@ -79864,7 +79955,7 @@ in sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.14.6" + sources."@babel/helper-create-class-features-plugin-7.14.8" sources."@babel/helper-create-regexp-features-plugin-7.14.5" (sources."@babel/helper-define-polyfill-provider-0.2.3" // { dependencies = [ @@ -79877,24 +79968,24 @@ in sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-remap-async-to-generator-7.14.5" sources."@babel/helper-replace-supers-7.14.5" - sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.14.6" + sources."@babel/helpers-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/plugin-proposal-async-generator-functions-7.14.7" sources."@babel/plugin-proposal-class-properties-7.12.13" sources."@babel/plugin-proposal-dynamic-import-7.14.5" @@ -79976,10 +80067,10 @@ in }) sources."@babel/preset-modules-0.1.4" sources."@babel/preset-typescript-7.12.17" - sources."@babel/runtime-7.14.6" + sources."@babel/runtime-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@expo/apple-utils-0.0.0-alpha.20" sources."@expo/bunyan-4.0.0" sources."@expo/config-5.0.5" @@ -80399,7 +80490,7 @@ in }) sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."caseless-0.12.0" (sources."chalk-4.1.1" // { dependencies = [ @@ -80668,7 +80759,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -81741,7 +81832,7 @@ in ]; }) sources."ripemd160-2.0.2" - sources."rollup-2.53.2" + sources."rollup-2.53.3" (sources."rollup-plugin-terser-7.0.2" // { dependencies = [ sources."commander-2.20.3" @@ -82274,7 +82365,7 @@ in sources."workbox-broadcast-update-6.1.5" (sources."workbox-build-6.1.5" // { dependencies = [ - (sources."@babel/core-7.14.6" // { + (sources."@babel/core-7.14.8" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -82390,8 +82481,8 @@ in dependencies = [ sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.14.7" - sources."@babel/core-7.14.6" - sources."@babel/generator-7.14.5" + sources."@babel/core-7.14.8" + sources."@babel/generator-7.14.8" sources."@babel/helper-annotate-as-pure-7.14.5" sources."@babel/helper-compilation-targets-7.14.5" sources."@babel/helper-function-name-7.14.5" @@ -82399,17 +82490,17 @@ in sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-replace-supers-7.14.5" - sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.14.6" + sources."@babel/helpers-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/plugin-proposal-object-rest-spread-7.14.7" sources."@babel/plugin-syntax-jsx-7.14.5" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" @@ -82417,10 +82508,10 @@ in sources."@babel/plugin-transform-parameters-7.14.5" sources."@babel/plugin-transform-react-jsx-7.14.5" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@types/minimist-1.2.2" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/normalize-package-data-2.4.1" sources."@types/yauzl-2.9.2" sources."@types/yoga-layout-1.9.2" @@ -82447,7 +82538,7 @@ in sources."callsites-2.0.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."chalk-2.4.2" sources."chownr-1.1.4" sources."ci-info-2.0.0" @@ -82472,7 +82563,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.869402" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -82664,17 +82755,17 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/generator-7.14.5" + sources."@babel/generator-7.14.8" sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" (sources."@heroku-cli/color-1.1.14" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -83292,7 +83383,7 @@ in sources."@google-cloud/precise-date-2.0.3" sources."@google-cloud/projectify-2.1.0" sources."@google-cloud/promisify-2.0.3" - (sources."@google-cloud/pubsub-2.16.0" // { + (sources."@google-cloud/pubsub-2.16.1" // { dependencies = [ sources."google-auth-library-7.3.0" ]; @@ -83326,7 +83417,7 @@ in sources."@types/json-schema-7.0.8" sources."@types/long-4.0.1" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -83542,7 +83633,7 @@ in ]; }) sources."duplexer3-0.1.4" - sources."duplexify-4.1.1" + sources."duplexify-4.1.2" sources."ecc-jsbn-0.1.2" sources."ecdsa-sig-formatter-1.0.11" sources."ee-first-1.1.1" @@ -84252,7 +84343,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -84432,7 +84523,7 @@ in dependencies = [ sources."@types/atob-2.1.2" sources."@types/inquirer-6.5.0" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/through-0.0.30" sources."ajv-6.12.6" sources."ansi-escapes-4.3.2" @@ -85119,10 +85210,10 @@ in gatsby-cli = nodeEnv.buildNodePackage { name = "gatsby-cli"; packageName = "gatsby-cli"; - version = "3.9.0"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-3.9.0.tgz"; - sha512 = "mfd+e5dNzQ8CkjggrYw3PkQwizJmK1+hR6VWmstDkc5+h1c6xFFNFfauexllDFi8H1SMokAEV4TQRDYDilpByw=="; + url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-3.10.0.tgz"; + sha512 = "RgHTA2qdxhdUugoi+S6BCv6LFDYxuV7P8QfbG0QRmmIAybtmpgfse6oLspWgtXwR4liRDZh/hRgwVA4y48JmlA=="; }; dependencies = [ (sources."@ardatan/aggregate-error-0.0.6" // { @@ -85132,13 +85223,13 @@ in }) sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.14.7" - (sources."@babel/core-7.14.6" // { + (sources."@babel/core-7.14.8" // { dependencies = [ sources."semver-6.3.0" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.14.5" // { + (sources."@babel/generator-7.14.8" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -85154,22 +85245,22 @@ in sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-replace-supers-7.14.5" - sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.14.6" + sources."@babel/helpers-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/plugin-proposal-object-rest-spread-7.10.4" sources."@babel/plugin-proposal-optional-chaining-7.14.5" sources."@babel/plugin-syntax-jsx-7.14.5" @@ -85177,11 +85268,11 @@ in sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/plugin-transform-parameters-7.14.5" sources."@babel/plugin-transform-react-jsx-7.14.5" - sources."@babel/runtime-7.14.6" - sources."@babel/standalone-7.14.7" + sources."@babel/runtime-7.14.8" + sources."@babel/standalone-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@graphql-tools/schema-7.1.5" sources."@graphql-tools/utils-7.10.0" sources."@hapi/address-2.1.4" @@ -85217,7 +85308,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-patch-0.0.30" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/node-fetch-2.5.11" sources."@types/unist-2.0.6" sources."@types/yargs-15.0.14" @@ -85284,7 +85375,7 @@ in sources."call-bind-1.0.2" sources."camel-case-4.1.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."ccount-1.1.0" (sources."chalk-4.1.1" // { dependencies = [ @@ -85345,7 +85436,7 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."cors-2.8.5" - sources."create-gatsby-1.9.0" + sources."create-gatsby-1.10.0" (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" @@ -85380,7 +85471,7 @@ in sources."dotenv-8.6.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -85392,13 +85483,12 @@ in sources."escape-string-regexp-1.0.5" sources."estree-util-is-identifier-name-1.1.0" sources."etag-1.8.1" - (sources."execa-3.4.0" // { + (sources."execa-5.1.1" // { dependencies = [ sources."cross-spawn-7.0.3" - sources."get-stream-5.2.0" + sources."get-stream-6.0.1" sources."is-stream-2.0.0" sources."npm-run-path-4.0.1" - sources."p-finally-2.0.1" sources."path-key-3.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -85433,7 +85523,7 @@ in }) sources."fast-copy-2.1.1" sources."figures-3.2.0" - sources."file-type-16.5.1" + sources."file-type-16.5.2" sources."fill-range-7.0.1" sources."filter-obj-1.1.0" (sources."finalhandler-1.1.2" // { @@ -85452,22 +85542,13 @@ in sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" - sources."gatsby-core-utils-2.9.0" - (sources."gatsby-recipes-0.20.0" // { + sources."gatsby-core-utils-2.10.0" + (sources."gatsby-recipes-0.21.0" // { dependencies = [ - sources."cross-spawn-7.0.3" - sources."execa-4.1.0" - sources."get-stream-5.2.0" - sources."is-stream-2.0.0" - sources."npm-run-path-4.0.1" - sources."path-key-3.1.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" sources."strip-ansi-6.0.0" - sources."which-2.0.2" ]; }) - sources."gatsby-telemetry-2.9.0" + sources."gatsby-telemetry-2.10.0" sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" @@ -85498,7 +85579,7 @@ in sources."inherits-2.0.3" ]; }) - sources."human-signals-1.1.1" + sources."human-signals-2.1.0" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" sources."import-lazy-2.1.0" @@ -85661,7 +85742,7 @@ in sources."path-key-2.0.1" sources."path-parse-1.0.7" sources."path-to-regexp-0.1.7" - sources."peek-readable-4.0.0" + sources."peek-readable-3.1.4" sources."picomatch-2.3.0" sources."pkg-dir-4.2.0" sources."prepend-http-2.0.0" @@ -85791,7 +85872,7 @@ in sources."strip-final-newline-2.0.0" sources."strip-indent-3.0.0" sources."strip-json-comments-2.0.1" - sources."strtok3-6.2.2" + sources."strtok3-6.1.3" sources."style-to-object-0.3.0" sources."supports-color-5.5.0" sources."term-size-2.2.1" @@ -85801,7 +85882,7 @@ in sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" - sources."token-types-2.1.1" + sources."token-types-3.1.0" sources."trim-0.0.1" sources."trim-trailing-lines-1.1.4" sources."trough-1.0.5" @@ -86156,7 +86237,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -86513,7 +86594,7 @@ in dependencies = [ sources."@ardatan/aggregate-error-0.0.6" sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -86607,7 +86688,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -89693,7 +89774,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.949.0" // { + (sources."aws-sdk-2.950.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -90410,7 +90491,7 @@ in sha512 = "sxKt7h0vzCd+3Y81Ey2qinupL6DpRSZJclS04ugHDNmRUXGzqicMJ6iwayhSA0S0DwwX30c5ozyUthr1QKF6uw=="; }; dependencies = [ - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."argparse-1.0.10" sources."bluebird-3.7.2" sources."catharsis-0.9.0" @@ -91717,7 +91798,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -92739,7 +92820,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -92861,19 +92942,19 @@ in ]; }) sources."@octokit/graphql-4.6.4" - sources."@octokit/openapi-types-8.3.0" + sources."@octokit/openapi-types-9.0.0" sources."@octokit/plugin-enterprise-rest-6.0.1" sources."@octokit/plugin-paginate-rest-2.14.0" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.4.1" + sources."@octokit/plugin-rest-endpoint-methods-5.4.2" (sources."@octokit/request-5.6.0" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.6.7" - sources."@octokit/types-6.19.0" + sources."@octokit/rest-18.6.8" + sources."@octokit/types-6.19.1" sources."@tootallnate/once-1.1.2" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" @@ -94404,12 +94485,12 @@ in dependencies = [ sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.14.7" - sources."@babel/core-7.14.6" - sources."@babel/generator-7.14.5" + sources."@babel/core-7.14.8" + sources."@babel/generator-7.14.8" sources."@babel/helper-annotate-as-pure-7.14.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" sources."@babel/helper-compilation-targets-7.14.5" - sources."@babel/helper-create-class-features-plugin-7.14.6" + sources."@babel/helper-create-class-features-plugin-7.14.8" sources."@babel/helper-create-regexp-features-plugin-7.14.5" sources."@babel/helper-define-polyfill-provider-0.2.3" sources."@babel/helper-explode-assignable-expression-7.14.5" @@ -94418,24 +94499,24 @@ in sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-remap-async-to-generator-7.14.5" sources."@babel/helper-replace-supers-7.14.5" - sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.14.6" + sources."@babel/helpers-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" sources."@babel/plugin-external-helpers-7.8.3" sources."@babel/plugin-proposal-async-generator-functions-7.14.7" @@ -94502,13 +94583,13 @@ in sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - sources."@babel/preset-env-7.14.7" + sources."@babel/preset-env-7.14.8" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-stage-2-7.8.3" - sources."@babel/runtime-7.14.6" + sources."@babel/runtime-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@cnakazawa/watch-1.0.4" sources."@comandeer/babel-plugin-banner-5.0.0" sources."@istanbuljs/load-nyc-config-1.1.0" @@ -94529,7 +94610,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.8" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.14" @@ -94702,7 +94783,7 @@ in sources."cached-path-relative-1.0.2" sources."call-bind-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -94826,7 +94907,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -96074,7 +96155,7 @@ in }; dependencies = [ sources."@braintree/sanitize-url-3.1.0" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" sources."ansi-styles-4.3.0" @@ -96732,20 +96813,20 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "4.4.4"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-4.4.4.tgz"; - sha512 = "vDyRF0MxUCccnk/nttQtWSE+KrcHgqjT0s/SyK7Hw06dAKg9X5kDyvDXjHQl2Dmc8Nc68050xc9ql36xUid2dQ=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-5.0.0.tgz"; + sha512 = "bOXs3BRJ/3wC9aAIMw3r7IwQFDSDz+BG69nERTH11YqFLP45SLpro1lhGUIY4M28AdiX6DbHdC3zBZb2+4QONw=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.14.7" - (sources."@babel/core-7.14.6" // { + (sources."@babel/core-7.14.8" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.14.5" + sources."@babel/generator-7.14.8" sources."@babel/helper-annotate-as-pure-7.14.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" (sources."@babel/helper-compilation-targets-7.14.5" // { @@ -96753,7 +96834,7 @@ in sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.14.6" + sources."@babel/helper-create-class-features-plugin-7.14.8" sources."@babel/helper-create-regexp-features-plugin-7.14.5" (sources."@babel/helper-define-polyfill-provider-0.2.3" // { dependencies = [ @@ -96766,18 +96847,18 @@ in sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-remap-async-to-generator-7.14.5" sources."@babel/helper-replace-supers-7.14.5" - sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.14.6" + sources."@babel/helpers-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -96787,7 +96868,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" sources."@babel/plugin-proposal-async-generator-functions-7.14.7" sources."@babel/plugin-proposal-class-properties-7.14.5" @@ -96850,16 +96931,16 @@ in sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - (sources."@babel/preset-env-7.14.7" // { + (sources."@babel/preset-env-7.14.8" // { dependencies = [ sources."semver-6.3.0" ]; }) sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.14.6" + sources."@babel/runtime-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@bugsnag/browser-7.10.5" sources."@bugsnag/core-7.10.0" sources."@bugsnag/cuid-3.0.0" @@ -96869,7 +96950,7 @@ in sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-15.11.5" // { + (sources."@netlify/build-16.0.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."boxen-4.2.0" @@ -96891,7 +96972,7 @@ in sources."slash-3.0.0" ]; }) - (sources."@netlify/config-12.6.0" // { + (sources."@netlify/config-13.0.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-3.0.0" @@ -96927,7 +97008,7 @@ in ]; }) sources."@netlify/plugins-list-2.19.3" - sources."@netlify/routing-local-proxy-0.30.2" + sources."@netlify/routing-local-proxy-0.31.0" (sources."@netlify/run-utils-1.0.7" // { dependencies = [ sources."execa-3.4.0" @@ -97060,18 +97141,18 @@ in ]; }) sources."@octokit/graphql-4.6.4" - sources."@octokit/openapi-types-8.3.0" + sources."@octokit/openapi-types-9.0.0" sources."@octokit/plugin-paginate-rest-2.14.0" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.4.1" + sources."@octokit/plugin-rest-endpoint-methods-5.4.2" (sources."@octokit/request-5.6.0" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.6.7" - sources."@octokit/types-6.19.0" + sources."@octokit/rest-18.6.8" + sources."@octokit/types-6.19.1" sources."@rollup/plugin-babel-5.3.0" (sources."@rollup/plugin-commonjs-18.1.0" // { dependencies = [ @@ -97108,7 +97189,7 @@ in sources."@types/istanbul-reports-1.1.2" sources."@types/keyv-3.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/node-fetch-2.5.11" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-1.17.1" @@ -97267,7 +97348,7 @@ in sources."call-me-maybe-1.0.1" sources."callsite-1.0.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."cardinal-2.1.1" (sources."chalk-4.1.1" // { dependencies = [ @@ -97533,7 +97614,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" sources."elegant-spinner-1.0.1" sources."elf-cam-0.1.1" sources."emoji-regex-8.0.0" @@ -98351,7 +98432,7 @@ in sources."reusify-1.0.4" sources."rfdc-1.3.0" sources."rimraf-3.0.2" - sources."rollup-2.53.2" + sources."rollup-2.53.3" (sources."rollup-plugin-inject-3.0.2" // { dependencies = [ sources."estree-walker-0.6.1" @@ -99237,7 +99318,7 @@ in sha512 = "r+wpPLWySuj/toc1mMkR8++mpFoTm9RZwsqe6guFc/IwEpQdDpmYkT11OGmTqjUqr8WdteOP+MNvdgNgtTzyxQ=="; }; dependencies = [ - sources."@babel/runtime-7.14.6" + sources."@babel/runtime-7.14.8" sources."@mapbox/node-pre-gyp-1.0.5" sources."@node-red/editor-api-2.0.1" sources."@node-red/editor-client-2.0.1" @@ -99262,7 +99343,7 @@ in sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."accepts-1.3.7" @@ -99374,7 +99455,7 @@ in sources."domelementtype-2.2.0" sources."domhandler-4.2.0" sources."domutils-2.7.0" - (sources."duplexify-4.1.1" // { + (sources."duplexify-4.1.2" // { dependencies = [ sources."readable-stream-3.6.0" sources."string_decoder-1.3.0" @@ -99996,7 +100077,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -100022,7 +100103,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimist-1.2.2" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -100901,6 +100982,24 @@ in bypassCache = true; reconstructLock = true; }; + npm-merge-driver = nodeEnv.buildNodePackage { + name = "npm-merge-driver"; + packageName = "npm-merge-driver"; + version = "2.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-merge-driver/-/npm-merge-driver-2.3.6.tgz"; + sha512 = "uPjCEWZ93f379zw0AMEgFtZIlpSSnpXc8BEIcs8yYHEZs5Y3d85OZHisLjNhjbYnbdAznxTq+VbyBWAQZDEm9w=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "git merge driver for automatically merging lockfiles"; + homepage = "https://github.com/npm/npm-merge-driver#readme"; + license = "ISC"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; "npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0" = nodeEnv.buildNodePackage { name = "npm2nix"; packageName = "npm2nix"; @@ -101127,14 +101226,14 @@ in dependencies = [ sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.14.7" - (sources."@babel/core-7.14.6" // { + (sources."@babel/core-7.14.8" // { dependencies = [ sources."json5-2.2.0" sources."semver-6.3.0" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.14.5" // { + (sources."@babel/generator-7.14.8" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -101146,7 +101245,7 @@ in sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.14.6" + sources."@babel/helper-create-class-features-plugin-7.14.8" sources."@babel/helper-create-regexp-features-plugin-7.14.5" (sources."@babel/helper-define-polyfill-provider-0.2.3" // { dependencies = [ @@ -101159,20 +101258,20 @@ in sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-remap-async-to-generator-7.14.5" sources."@babel/helper-replace-supers-7.14.5" - sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.14.6" + sources."@babel/helpers-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" sources."@babel/plugin-proposal-async-generator-functions-7.14.7" sources."@babel/plugin-proposal-class-properties-7.14.5" @@ -101239,16 +101338,16 @@ in sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - (sources."@babel/preset-env-7.14.7" // { + (sources."@babel/preset-env-7.14.8" // { dependencies = [ sources."semver-6.3.0" ]; }) sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.14.6" + sources."@babel/runtime-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@iarna/toml-2.2.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -101370,7 +101469,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -101508,7 +101607,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -103173,7 +103272,7 @@ in sha512 = "/DGG+QcSPraMAIxaoGCNqb2A6Xkm2jBQMsj2mjb4ag236ByTY9Xhpikvj5ixwlSQV0euuJw4fphKCd5YHRPS8w=="; }; dependencies = [ - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/parser-7.13.13" sources."@babel/types-7.13.12" sources."@nodelib/fs.scandir-2.1.5" @@ -104508,15 +104607,15 @@ in sha512 = "coA9MuNPfN+8TyFj7aOycw2e5W9t+sSgFOUyK30oDrh2MWWWHLjY0I4V1puyCconC2arggfDE2GYXvqOTCGv9Q=="; }; dependencies = [ - sources."@babel/cli-7.14.5" + sources."@babel/cli-7.14.8" sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.14.7" - (sources."@babel/core-7.14.6" // { + (sources."@babel/core-7.14.8" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.14.5" + sources."@babel/generator-7.14.8" sources."@babel/helper-annotate-as-pure-7.14.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" (sources."@babel/helper-compilation-targets-7.14.5" // { @@ -104524,7 +104623,7 @@ in sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.14.6" + sources."@babel/helper-create-class-features-plugin-7.14.8" sources."@babel/helper-create-regexp-features-plugin-7.14.5" (sources."@babel/helper-define-polyfill-provider-0.2.3" // { dependencies = [ @@ -104537,20 +104636,20 @@ in sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-remap-async-to-generator-7.14.5" sources."@babel/helper-replace-supers-7.14.5" - sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.14.6" + sources."@babel/helpers-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" sources."@babel/plugin-proposal-async-generator-functions-7.14.7" sources."@babel/plugin-proposal-class-properties-7.14.5" @@ -104625,7 +104724,7 @@ in sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - (sources."@babel/preset-env-7.14.7" // { + (sources."@babel/preset-env-7.14.8" // { dependencies = [ sources."semver-6.3.0" ]; @@ -104634,16 +104733,16 @@ in sources."@babel/preset-react-7.14.5" sources."@babel/preset-stage-0-7.8.3" sources."@babel/register-7.14.5" - sources."@babel/runtime-7.14.6" + sources."@babel/runtime-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@reach/router-1.3.4" sources."@sindresorhus/is-0.7.0" sources."@types/glob-7.1.4" sources."@types/json-schema-7.0.8" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" sources."@webassemblyjs/ast-1.9.0" @@ -104831,7 +104930,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caw-2.0.1" (sources."chalk-2.4.2" // { @@ -105060,7 +105159,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -106423,7 +106522,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - (sources."@babel/generator-7.14.5" // { + (sources."@babel/generator-7.14.8" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -106434,13 +106533,13 @@ in sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-module-imports-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.7" - sources."@babel/runtime-7.14.6" + sources."@babel/parser-7.14.8" + sources."@babel/runtime-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@emotion/is-prop-valid-0.8.8" sources."@emotion/memoize-0.7.4" sources."@emotion/stylis-0.8.5" @@ -106930,10 +107029,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.53.2"; + version = "2.53.3"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.53.2.tgz"; - sha512 = "1CtEYuS5CRCzFZ7SNW5528SlDlk4VDXIRGwbm/2POQxA/G4+7/crIqJwkmnj8Q/74hGx4oVlNvh4E1CJQ5hZ6w=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.53.3.tgz"; + sha512 = "79QIGP5DXz5ZHYnCPi3tLz+elOQi6gudp9YINdaJdjG0Yddubo6JRFUM//qCZ0Bap/GJrsUoEBVdSOc4AkMlRA=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -106955,7 +107054,7 @@ in src = ../../misc/vscode-extensions/rust-analyzer/build-deps; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" @@ -107259,7 +107358,7 @@ in sources."resolve-from-4.0.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."rollup-2.53.2" + sources."rollup-2.53.3" sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."semver-7.3.5" @@ -107673,7 +107772,7 @@ in ]; }) sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-3.13.4" // { + (sources."@serverless/components-3.14.0" // { dependencies = [ (sources."@serverless/utils-4.1.0" // { dependencies = [ @@ -107716,7 +107815,7 @@ in ]; }) sources."@serverless/template-1.1.4" - (sources."@serverless/utils-5.4.0" // { + (sources."@serverless/utils-5.5.0" // { dependencies = [ sources."get-stream-6.0.1" sources."jwt-decode-3.1.2" @@ -107734,7 +107833,7 @@ in sources."@types/keyv-3.1.2" sources."@types/lodash-4.14.171" sources."@types/long-4.0.1" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/request-2.48.6" sources."@types/request-promise-native-1.0.18" sources."@types/responselike-1.0.0" @@ -107795,7 +107894,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.949.0" // { + (sources."aws-sdk-2.950.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -107977,7 +108076,7 @@ in sources."dotenv-10.0.0" sources."dotenv-expand-5.1.0" sources."duplexer3-0.1.4" - sources."duplexify-4.1.1" + sources."duplexify-4.1.2" sources."duration-0.2.2" sources."ecc-jsbn-0.1.2" sources."emoji-regex-8.0.0" @@ -108024,7 +108123,7 @@ in sources."fd-slicer-1.1.0" sources."fecha-4.2.1" sources."figures-3.2.0" - sources."file-type-16.5.1" + sources."file-type-16.5.2" sources."file-uri-to-path-1.0.0" sources."filename-reserved-regex-2.0.0" sources."filenamify-4.3.0" @@ -108270,7 +108369,7 @@ in sources."path-loader-1.0.10" sources."path-type-4.0.0" sources."path2-0.1.0" - sources."peek-readable-4.0.0" + sources."peek-readable-3.1.4" sources."pend-1.2.0" sources."performance-now-2.1.0" sources."picomatch-2.3.0" @@ -108381,7 +108480,7 @@ in sources."strip-dirs-2.1.0" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" - sources."strtok3-6.2.2" + sources."strtok3-6.1.3" (sources."superagent-3.8.3" // { dependencies = [ sources."debug-3.2.7" @@ -108442,7 +108541,7 @@ in sources."to-buffer-1.1.1" sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" - sources."token-types-2.1.1" + sources."token-types-3.1.0" sources."tough-cookie-2.5.0" sources."traverse-0.6.6" sources."trim-repeated-1.0.0" @@ -109911,7 +110010,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."accepts-1.3.7" sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" @@ -111177,7 +111276,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.949.0" // { + (sources."aws-sdk-2.950.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -111961,31 +112060,31 @@ in dependencies = [ sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.14.7" - sources."@babel/core-7.14.6" - sources."@babel/generator-7.14.5" + sources."@babel/core-7.14.8" + sources."@babel/generator-7.14.8" sources."@babel/helper-compilation-targets-7.14.5" sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-replace-supers-7.14.5" - sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.14.6" + sources."@babel/helpers-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -112015,7 +112114,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" (sources."chalk-4.1.1" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -112053,7 +112152,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -112295,7 +112394,7 @@ in sources."@emmetio/abbreviation-2.2.2" sources."@emmetio/css-abbreviation-2.1.4" sources."@emmetio/scanner-1.0.0" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/pug-2.0.5" sources."@types/sass-1.16.1" sources."anymatch-3.1.2" @@ -113643,7 +113742,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/highlight-7.14.5" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" @@ -114453,7 +114552,7 @@ in sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -115991,7 +116090,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" @@ -116391,7 +116490,7 @@ in sources."buffer-from-1.1.1" sources."call-bind-1.0.2" sources."camelcase-6.2.0" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" (sources."chalk-4.1.1" // { dependencies = [ sources."supports-color-7.2.0" @@ -116431,7 +116530,7 @@ in sources."domelementtype-2.2.0" sources."domhandler-4.2.0" sources."domutils-2.7.0" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."enhanced-resolve-5.8.2" @@ -116981,7 +117080,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/highlight-7.14.5" sources."@emmetio/extract-abbreviation-0.1.6" sources."@mrmlnc/readdir-enhanced-2.2.1" @@ -116998,7 +117097,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -117921,7 +118020,7 @@ in sha512 = "uhSNGU27KDT2e2v51l/NqMc59O7X0DG7CHonZOwsnvMHLvyudCLZgXCU8Rw4T8gpqg2asn50vfPHq7l3DGlN5w=="; }; dependencies = [ - sources."@babel/runtime-corejs3-7.14.7" + sources."@babel/runtime-corejs3-7.14.8" sources."@mapbox/node-pre-gyp-1.0.5" sources."@tootallnate/once-1.1.2" sources."@types/raf-3.4.0" @@ -118144,7 +118243,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -118170,7 +118269,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/yauzl-2.9.1" sources."acorn-7.4.1" sources."acorn-jsx-5.3.2" @@ -118470,7 +118569,7 @@ in sources."lcid-3.1.1" sources."levn-0.4.1" sources."lie-3.3.0" - sources."lighthouse-logger-1.2.0" + sources."lighthouse-logger-1.3.0" sources."lines-and-columns-1.1.6" sources."lodash.clonedeep-4.5.0" sources."lodash.includes-4.3.0" @@ -118733,7 +118832,7 @@ in sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.8" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -118756,11 +118855,11 @@ in sources."ajv-keywords-3.5.2" sources."browserslist-4.16.6" sources."buffer-from-1.1.1" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."chrome-trace-event-1.0.3" sources."colorette-1.2.2" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" sources."enhanced-resolve-5.8.2" sources."es-module-lexer-0.7.1" sources."escalade-3.1.1" @@ -118898,7 +118997,7 @@ in dependencies = [ sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ajv-errors-1.0.1" @@ -119552,7 +119651,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."ansi-regex-5.0.0" @@ -119988,7 +120087,7 @@ in sha512 = "dbHkO8dp4/KDsU5V7akSWVdWB+yyfadR0q3vGxRKXxg1umiYlFUrPuiu66Iy4IpRRr2Qrqx495kInkZJIJtqmA=="; }; dependencies = [ - sources."@babel/runtime-7.14.6" + sources."@babel/runtime-7.14.8" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -120926,7 +121025,7 @@ in dependencies = [ sources."@types/fs-extra-9.0.12" sources."@types/minimist-1.2.2" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/node-fetch-2.5.11" sources."ansi-styles-4.3.0" sources."asynckit-0.4.0" From b37087603eac209e139260c72e1c8970974308e3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 20 Jul 2021 21:21:36 +0200 Subject: [PATCH 075/235] ppp: 2.4.8 -> 2.4.9 --- pkgs/tools/networking/ppp/default.nix | 71 +++++---- .../networking/ppp/musl-fix-headers.patch | 137 ------------------ pkgs/tools/networking/ppp/nix-purity.patch | 34 +++-- 3 files changed, 52 insertions(+), 190 deletions(-) delete mode 100644 pkgs/tools/networking/ppp/musl-fix-headers.patch diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix index 36d156a3994b..708932ac1c9d 100644 --- a/pkgs/tools/networking/ppp/default.nix +++ b/pkgs/tools/networking/ppp/default.nix @@ -1,45 +1,37 @@ -{ lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, substituteAll, libpcap, openssl }: +{ lib +, stdenv +, fetchFromGitHub +, substituteAll +, libpcap +, openssl +}: stdenv.mkDerivation rec { - version = "2.4.8"; + version = "2.4.9"; pname = "ppp"; src = fetchFromGitHub { - owner = "paulusmack"; - repo = "ppp"; - rev = "ppp-${version}"; - sha256 = "1i88m79h6g3fzsb4yw3k8bq1grsx3hsyawm7id2vcaab0gfqzjjv"; + owner = "ppp-project"; + repo = pname; + rev = "${pname}-${version}"; + sha256 = "sha256-8+nbqRNfKPLDx+wmuKSkv+BSeG72hKJI4dNqypqeEK4="; }; - patches = - [ - ( substituteAll { - src = ./nix-purity.patch; - inherit libpcap; - glibc = stdenv.cc.libc.dev or stdenv.cc.libc; - openssl = openssl.dev; - }) - # Without nonpriv.patch, pppd --version doesn't work when not run as - # root. - ./nonpriv.patch - (fetchpatch { - name = "CVE-2015-3310.patch"; - url = "https://github.com/paulusmack/ppp/commit/858976b1fc3107f1261aae337831959b511b83c2.patch"; - sha256 = "0wirmcis67xjwllqhz9lsz1b7dcvl8shvz78lxgybc70j2sv7ih4"; - }) - (fetchurl { - url = "https://www.nikhef.nl/~janjust/ppp/ppp-2.4.7-eaptls-mppe-1.102.patch"; - sha256 = "04war8l5szql53l36043hvzgfwqp3v76kj8brbz7wlf7vs2mlkia"; - }) - (fetchpatch { - name = "CVE-2020-8597.patch"; - url = "https://github.com/paulusmack/ppp/commit/8d7970b8f3db727fe798b65f3377fe6787575426.patch"; - sha256 = "129wnhwxmzvr3y9gzxv82jnb5y8m4yg8vkpa0xl2rwkl8anbzgkh"; - }) - ./musl-fix-headers.patch - ]; + patches = [ + (substituteAll { + src = ./nix-purity.patch; + glibc = stdenv.cc.libc.dev or stdenv.cc.libc; + openssl_dev = openssl.dev; + openssl_out = openssl.out; + }) + # Without nonpriv.patch, pppd --version doesn't work when not run as root. + ./nonpriv.patch + ]; - buildInputs = [ libpcap openssl ]; + buildInputs = [ + libpcap + openssl + ]; postPatch = '' # strip is not found when cross compiling with seemingly no way to point @@ -66,9 +58,14 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://ppp.samba.org/"; - description = "Point-to-point implementation for Linux and Solaris"; - license = with licenses; [ bsdOriginal publicDomain gpl2 lgpl2 ]; + homepage = "https://ppp.samba.org"; + description = "Point-to-point implementation to provide Internet connections over serial lines"; + license = with licenses; [ + bsdOriginal + publicDomain + gpl2 + lgpl2 + ]; platforms = platforms.linux; maintainers = [ ]; }; diff --git a/pkgs/tools/networking/ppp/musl-fix-headers.patch b/pkgs/tools/networking/ppp/musl-fix-headers.patch deleted file mode 100644 index d6252a52675b..000000000000 --- a/pkgs/tools/networking/ppp/musl-fix-headers.patch +++ /dev/null @@ -1,137 +0,0 @@ -diff --git a/include/net/ppp_defs.h b/include/net/ppp_defs.h -index b06eda5..dafa36c 100644 ---- a/include/net/ppp_defs.h -+++ b/include/net/ppp_defs.h -@@ -38,6 +38,8 @@ - #ifndef _PPP_DEFS_H_ - #define _PPP_DEFS_H_ - -+#include -+ - /* - * The basic PPP frame. - */ -diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux -index a74c914..7acd2cf 100644 ---- a/pppd/Makefile.linux -+++ b/pppd/Makefile.linux -@@ -126,7 +126,7 @@ LIBS += -lcrypt - endif - - ifdef USE_LIBUTIL --CFLAGS += -DHAVE_LOGWTMP=1 -+#CFLAGS += -DHAVE_LOGWTMP=1 - LIBS += -lutil - endif - -diff --git a/pppd/magic.h b/pppd/magic.h -index c81213b..305aece 100644 ---- a/pppd/magic.h -+++ b/pppd/magic.h -@@ -42,6 +42,8 @@ - * $Id: magic.h,v 1.5 2003/06/11 23:56:26 paulus Exp $ - */ - -+#include -+ - void magic_init (void); /* Initialize the magic number generator */ - u_int32_t magic (void); /* Returns the next magic number */ - -diff --git a/pppd/plugins/rp-pppoe/if.c b/pppd/plugins/rp-pppoe/if.c -index 91e9a57..9c0fac3 100644 ---- a/pppd/plugins/rp-pppoe/if.c -+++ b/pppd/plugins/rp-pppoe/if.c -@@ -30,10 +30,6 @@ static char const RCSID[] = - #include - #endif - --#ifdef HAVE_NET_ETHERNET_H --#include --#endif -- - #ifdef HAVE_ASM_TYPES_H - #include - #endif -diff --git a/pppd/plugins/rp-pppoe/plugin.c b/pppd/plugins/rp-pppoe/plugin.c -index a8c2bb4..ca34d79 100644 ---- a/pppd/plugins/rp-pppoe/plugin.c -+++ b/pppd/plugins/rp-pppoe/plugin.c -@@ -46,7 +46,6 @@ static char const RCSID[] = - #include - #include - #include --#include - #include - #include - #include -diff --git a/pppd/plugins/rp-pppoe/pppoe-discovery.c b/pppd/plugins/rp-pppoe/pppoe-discovery.c -index 3d3bf4e..b5f82d3 100644 ---- a/pppd/plugins/rp-pppoe/pppoe-discovery.c -+++ b/pppd/plugins/rp-pppoe/pppoe-discovery.c -@@ -27,10 +27,6 @@ - #include - #endif - --#ifdef HAVE_NET_ETHERNET_H --#include --#endif -- - #ifdef HAVE_ASM_TYPES_H - #include - #endif -@@ -55,6 +51,8 @@ void die(int status) - exit(status); - } - -+#define error(x...) fprintf(stderr, x) -+ - /* Initialize frame types to RFC 2516 values. Some broken peers apparently - use different frame types... sigh... */ - -diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h -index c4aaa6e..70aef85 100644 ---- a/pppd/plugins/rp-pppoe/pppoe.h -+++ b/pppd/plugins/rp-pppoe/pppoe.h -@@ -88,18 +88,6 @@ typedef unsigned long UINT32_t; - #include - #endif - --#ifdef HAVE_NETINET_IF_ETHER_H --#include -- --#ifdef HAVE_SYS_SOCKET_H --#include --#endif --#ifndef HAVE_SYS_DLPI_H --#include --#endif --#endif -- -- - /* Ethernet frame types according to RFC 2516 */ - #define ETH_PPPOE_DISCOVERY 0x8863 - #define ETH_PPPOE_SESSION 0x8864 -diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c -index 6d71530..86d224e 100644 ---- a/pppd/sys-linux.c -+++ b/pppd/sys-linux.c -@@ -102,19 +102,11 @@ - #define MAX_ADDR_LEN 7 - #endif - --#if !defined(__GLIBC__) || __GLIBC__ >= 2 - #include /* glibc 2 conflicts with linux/types.h */ - #include - #include - #include - #include --#else --#include --#include --#include --#include --#include --#endif - #include - #include - diff --git a/pkgs/tools/networking/ppp/nix-purity.patch b/pkgs/tools/networking/ppp/nix-purity.patch index 975ea9db6096..c3363e0ccb64 100644 --- a/pkgs/tools/networking/ppp/nix-purity.patch +++ b/pkgs/tools/networking/ppp/nix-purity.patch @@ -1,31 +1,33 @@ diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux -index 9664f70..d07e01e 100644 +index 22837c5..6f6fff5 100644 --- a/pppd/Makefile.linux +++ b/pppd/Makefile.linux -@@ -125,7 +125,7 @@ CFLAGS += -DHAS_SHADOW +@@ -111,8 +111,8 @@ endif + + # EAP SRP-SHA1 + ifdef USE_SRP +-CFLAGS += -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include +-LIBS += -lsrp -L/usr/local/ssl/lib ++CFLAGS += -DUSE_SRP -DOPENSSL -I@openssl_dev@/include/openssl ++LIBS += -lsrp -L@openssl_out@/lib + NEEDCRYPTOLIB = y + TARGETS += srp-entry + EXTRAINSTALL = $(INSTALL) -c -m 555 srp-entry $(BINDIR)/srp-entry +@@ -143,7 +143,7 @@ CFLAGS += -DHAS_SHADOW #LIBS += -lshadow $(LIBS) endif --ifneq ($(wildcard $(shell $(CC) --print-sysroot)/usr/include/crypt.h),) +-ifeq ($(shell echo '\#include ' | $(CC) -E - >/dev/null 2>&1 && echo yes),yes) +ifneq ($(wildcard @glibc@/include/crypt.h),) CFLAGS += -DHAVE_CRYPT_H=1 - LIBS += -lcrypt + LIBS += -lcrypt endif -@@ -137,7 +137,7 @@ endif +@@ -155,7 +155,7 @@ endif ifdef NEEDDES ifndef USE_CRYPT -CFLAGS += -I$(shell $(CC) --print-sysroot)/usr/include/openssl -+CFLAGS += -I@openssl@/include/openssl - LIBS += -lcrypto ++CFLAGS += -I@openssl_dev@/include/openssl + NEEDCRYPTOLIB = y else CFLAGS += -DUSE_CRYPT=1 -@@ -188,7 +188,7 @@ LIBS += -ldl - endif - - ifdef FILTER --ifneq ($(wildcard /usr/include/pcap-bpf.h),) -+ifneq ($(wildcard @libpcap@/include/pcap-bpf.h),) - LIBS += -lpcap - CFLAGS += -DPPP_FILTER - endif From 8abcc6ba09d0a8978f901fecf66fe8072de02ab9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 21 Jul 2021 15:08:44 +0200 Subject: [PATCH 076/235] nixos/pppd: replace CAP_SYS_ADMIN with CAP_BPF The kernel before version 5.7 required CAP_SYS_ADMIN to conduct BPF operations. After that a separate capability CAP_BPF was created, which should be sufficient in this scenario and will further tighten the sandbox around our pppd service. Tested on my personal DSL line. --- nixos/modules/services/networking/pppd.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/networking/pppd.nix b/nixos/modules/services/networking/pppd.nix index c1cbdb461765..45c841dbea8b 100644 --- a/nixos/modules/services/networking/pppd.nix +++ b/nixos/modules/services/networking/pppd.nix @@ -82,13 +82,21 @@ in LD_PRELOAD = "${pkgs.libredirect}/lib/libredirect.so"; NIX_REDIRECTS = "/var/run=/run/pppd"; }; - serviceConfig = { + serviceConfig = let + capabilities = [ + "CAP_BPF" + "CAP_SYS_TTY_CONFIG" + "CAP_NET_ADMIN" + "CAP_NET_RAW" + ]; + in + { ExecStart = "${getBin cfg.package}/sbin/pppd call ${peerCfg.name} nodetach nolog"; Restart = "always"; RestartSec = 5; - AmbientCapabilities = "CAP_SYS_TTY_CONFIG CAP_NET_ADMIN CAP_NET_RAW CAP_SYS_ADMIN"; - CapabilityBoundingSet = "CAP_SYS_TTY_CONFIG CAP_NET_ADMIN CAP_NET_RAW CAP_SYS_ADMIN"; + AmbientCapabilities = capabilities; + CapabilityBoundingSet = capabilities; KeyringMode = "private"; LockPersonality = true; MemoryDenyWriteExecute = true; From d56417ecd9f5662e9aeb7927800d9935419f735a Mon Sep 17 00:00:00 2001 From: Luflosi Date: Wed, 21 Jul 2021 14:27:54 +0200 Subject: [PATCH 077/235] lsiutil: 1.60 -> 1.72 Also make various improvements and fixes: - Rename pname from lsiutils to lsiutil since that is the actual name - Update the URL since the old one was broken - Inline the call to fetchurl - Use the installPhase to install instead of installing in the buildPhase - Replace a call to the modprobe binary with the absolute path to the binary - Properly determine the absolute path of the mknod binary - Update the description with text from the source code header - Declare that this only works on Linux - Add myself as maintainer --- pkgs/os-specific/linux/lsiutil/default.nix | 59 ++++++++++++---------- 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/pkgs/os-specific/linux/lsiutil/default.nix b/pkgs/os-specific/linux/lsiutil/default.nix index 1b1acdb535f5..f88cdcda5237 100644 --- a/pkgs/os-specific/linux/lsiutil/default.nix +++ b/pkgs/os-specific/linux/lsiutil/default.nix @@ -1,41 +1,44 @@ -{ lib, stdenv, fetchurl, unzip }: +{ lib +, stdenv +, fetchurl +, kmod +, coreutils +}: -let - - version = "1.60"; +stdenv.mkDerivation rec { + pname = "lsiutil"; + version = "1.72"; src = fetchurl { - name = "lsiutil-${version}.zip"; - url = "http://www.lsi.com/DistributionSystem/AssetDocument/support/downloads/hbas/fibre_channel/hardware_drivers/LSIUtil%20Kit_${version}.zip"; - sha256 = "1d4337faa56e24f7d98db87b9de94d6e2c17ab671f4e301b93833eea08b9e426"; + url = "https://github.com/exactassembly/meta-xa-stm/raw/f96cf6e13f3c9c980f5651510dd96279b9b2af4f/recipes-support/lsiutil/files/lsiutil-${version}.tar.gz"; + sha256 = "sha256-aTi+EogY1aDWYq3anjRkjz1mzINVfUPQbOPHthxrvS4="; }; -in + buildPhase = '' + runHook preBuild -stdenv.mkDerivation { - pname = "lsiutils"; - inherit version; + substituteInPlace lsiutil.c \ + --replace /sbin/modprobe "${kmod}/bin/modprobe" \ + --replace /bin/mknod "${coreutils}/bin/mknod" + gcc -Wall -O lsiutil.c -o lsiutil - srcs = [ src "Source/lsiutil.tar.gz" ]; + runHook postBuild + ''; - nativeBuildInputs = [ unzip ]; + installPhase = '' + runHook preInstall - sourceRoot = "lsiutil"; + mkdir -p "$out/bin" + install -Dm755 lsiutil "$out/bin/lsiutil" - preBuild = - '' - mkdir -p $out/bin - substituteInPlace Makefile --replace /usr/bin $out/bin - substituteInPlace lsiutil.c \ - --replace /sbin/modprobe modprobe \ - --replace /bin/mknod $(type -P mknod) - ''; + runHook postInstall + ''; - installPhase = "true"; - - meta = { - homepage = "http://www.lsi.com/"; - description = "LSI Logic Fusion MPT command line management tool"; - license = lib.licenses.unfree; + meta = with lib; { + homepage = "https://github.com/exactassembly/meta-xa-stm/tree/master/recipes-support/lsiutil/files"; + description = "Configuration utility for MPT adapters (FC, SCSI, and SAS/SATA)"; + license = licenses.unfree; + platforms = platforms.linux; + maintainers = with maintainers; [ Luflosi ]; }; } From 75286ae01675cb3de19bd5c1fad4ef428cbcc727 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 21 Jul 2021 13:43:46 +0200 Subject: [PATCH 078/235] lzop: cleanup --- pkgs/tools/compression/lzop/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/compression/lzop/default.nix b/pkgs/tools/compression/lzop/default.nix index be31048c2186..8bf58d9cc356 100644 --- a/pkgs/tools/compression/lzop/default.nix +++ b/pkgs/tools/compression/lzop/default.nix @@ -1,9 +1,11 @@ -{lib, stdenv, fetchurl, lzo}: +{ lib, stdenv, fetchurl, lzo }: stdenv.mkDerivation rec { - name = "lzop-1.04"; + pname = "lzop"; + version = "1.04"; + src = fetchurl { - url = "https://www.lzop.org/download/${name}.tar.gz"; + url = "https://www.lzop.org/download/lzop-${version}.tar.gz"; sha256 = "0h9gb8q7y54m9mvy3jvsmxf21yx8fc3ylzh418hgbbv0i8mbcwky"; }; @@ -12,6 +14,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.lzop.org"; description = "Fast file compressor"; + maintainers = with maintainers; [ ]; license = licenses.gpl2; platforms = platforms.unix; }; From d04efb055ca9db7d7676d6502d15e1438a20c12f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 21 Jul 2021 13:44:58 +0200 Subject: [PATCH 079/235] pigz: cleanup --- pkgs/tools/compression/pigz/default.nix | 28 ++++++++++++------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/tools/compression/pigz/default.nix index a4cdcc08549e..6dbe190c400b 100644 --- a/pkgs/tools/compression/pigz/default.nix +++ b/pkgs/tools/compression/pigz/default.nix @@ -1,36 +1,34 @@ { lib, stdenv, fetchurl, zlib, util-linux }: -let name = "pigz"; - version = "2.6"; -in -stdenv.mkDerivation { - name = name + "-" + version; +stdenv.mkDerivation rec { + pname = "pigz"; + version = "2.6"; src = fetchurl { - url = "https://www.zlib.net/${name}/${name}-${version}.tar.gz"; + url = "https://www.zlib.net/${pname}/${pname}-${version}.tar.gz"; sha256 = "sha256-Lu17DXRJ0dcJA/KmLNYAXSYus6jJ6YaHvIy7WAnbKn0="; }; enableParallelBuilding = true; - buildInputs = [zlib] ++ lib.optional stdenv.isLinux util-linux; + buildInputs = [ zlib ] ++ lib.optional stdenv.isLinux util-linux; makeFlags = [ "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" ]; doCheck = stdenv.isLinux; checkTarget = "tests"; - installPhase = - '' - install -Dm755 pigz "$out/bin/pigz" - ln -s pigz "$out/bin/unpigz" - install -Dm755 pigz.1 "$out/share/man/man1/pigz.1" - ln -s pigz.1 "$out/share/man/man1/unpigz.1" - install -Dm755 pigz.pdf "$out/share/doc/pigz/pigz.pdf" + installPhase = '' + install -Dm755 pigz "$out/bin/pigz" + ln -s pigz "$out/bin/unpigz" + install -Dm755 pigz.1 "$out/share/man/man1/pigz.1" + ln -s pigz.1 "$out/share/man/man1/unpigz.1" + install -Dm755 pigz.pdf "$out/share/doc/pigz/pigz.pdf" ''; meta = with lib; { - homepage = "http://www.zlib.net/pigz/"; + homepage = "https://www.zlib.net/pigz/"; description = "A parallel implementation of gzip for multi-core machines"; + maintainers = with maintainers; [ ]; license = licenses.zlib; platforms = platforms.unix; }; From ab4a6cbdafb150e20ff1826c8b77c064703c3c2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 21 Jul 2021 13:45:43 +0200 Subject: [PATCH 080/235] pixz: cleanup --- pkgs/tools/compression/pixz/default.nix | 45 +++++++++++++++++-------- 1 file changed, 31 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/compression/pixz/default.nix b/pkgs/tools/compression/pixz/default.nix index bb504e85f612..ec05a44a5189 100644 --- a/pkgs/tools/compression/pixz/default.nix +++ b/pkgs/tools/compression/pixz/default.nix @@ -1,25 +1,42 @@ -{ - lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config - , asciidoc, libxslt, libxml2, docbook_xml_dtd_45, docbook_xsl - , libarchive, xz +{ lib +, stdenv +, fetchFromGitHub +, autoconf +, automake +, libtool +, pkg-config +, asciidoc +, libxslt +, libxml2 +, docbook_xml_dtd_45 +, docbook_xsl +, libarchive +, xz }: + stdenv.mkDerivation rec { - baseName = "pixz"; + pname = "pixz"; version = "1.0.7"; - name = "${baseName}-${version}"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - autoconf automake libtool asciidoc libxslt libxml2 - docbook_xml_dtd_45 docbook_xsl - libarchive xz + autoconf + automake + libtool + asciidoc + libxslt + libxml2 + docbook_xml_dtd_45 + docbook_xsl + libarchive + xz ]; preBuild = '' echo "XML_CATALOG_FILES='$XML_CATALOG_FILES'" ''; src = fetchFromGitHub { owner = "vasi"; - repo = baseName; + repo = pname; rev = "v${version}"; sha256 = "163axxs22w7pghr786hda22mnlpvmi50hzhfr9axwyyjl9n41qs2"; }; @@ -27,10 +44,10 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - meta = { + meta = with lib; { description = "A parallel compressor/decompressor for xz format"; - license = lib.licenses.bsd2; - maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.unix; + license = licenses.bsd2; + maintainers = [ maintainers.raskin ]; + platforms = platforms.unix; }; } From 676fe1cc8fb7cfc89d246fbb2a1c36d9e9ebcf75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 21 Jul 2021 13:48:43 +0200 Subject: [PATCH 081/235] pxz: cleanup --- pkgs/tools/compression/pxz/default.nix | 34 ++++++++++++++------------ 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/compression/pxz/default.nix b/pkgs/tools/compression/pxz/default.nix index eb1f5d3570b1..725dd4defb92 100644 --- a/pkgs/tools/compression/pxz/default.nix +++ b/pkgs/tools/compression/pxz/default.nix @@ -1,15 +1,14 @@ -{ lib, stdenv, fetchgit, xz }: +{ lib, stdenv, fetchFromGitHub, xz }: -let name = "pxz"; - version = "4.999.9beta+git"; -in -stdenv.mkDerivation { - name = name + "-" + version; +stdenv.mkDerivation rec { + pname = "pxz"; + version = "4.999.9beta+git"; - src = fetchgit { - url = "https://github.com/jnovy/pxz.git"; - rev = "ae808463c2950edfdedb8fb49f95006db0a18667"; - sha256 = "0na2kw8cf0qd8l1aywlv9m3xrxnqlcwxfdwp3f7x9vxwqx3k32kc"; + src = fetchFromGitHub { + owner = "jnovy"; + repo = "pxz"; + rev = "124382a6d0832b13b7c091f72264f8f3f463070a"; + sha256 = "15mmv832iqsqwigidvwnf0nyivxf0y8m22j2szy4h0xr76x4z21m"; }; buildInputs = [ xz ]; @@ -30,15 +29,18 @@ stdenv.mkDerivation { cp pxz.1 $out/share/man/man1 ''; - meta = { + meta = with lib; { homepage = "https://jnovy.fedorapeople.org/pxz/"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [pashev]; - description = ''Parallel XZ is a compression utility that takes advantage of + license = licenses.gpl2Plus; + maintainers = with maintainers; [ pashev ]; + description = "compression utility that runs LZMA compression of different parts on multiple cores simultaneously"; + longDescription = '' + Parallel XZ is a compression utility that takes advantage of running LZMA compression of different parts of an input file on multiple cores and processors simultaneously. Its primary goal is to utilize all resources to speed up compression time with minimal possible influence - on compression ratio''; - platforms = with lib.platforms; linux; + on compression ratio + ''; + platforms = with platforms; linux; }; } From 56d6f78a0ddb993c2629efa567d09a9c61ba7173 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 21 Jul 2021 13:49:44 +0200 Subject: [PATCH 082/235] rzip: cleanup --- pkgs/tools/compression/rzip/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/compression/rzip/default.nix b/pkgs/tools/compression/rzip/default.nix index 60364afa9f30..5f878f8c494f 100644 --- a/pkgs/tools/compression/rzip/default.nix +++ b/pkgs/tools/compression/rzip/default.nix @@ -1,9 +1,11 @@ -{lib, stdenv, fetchurl, fetchpatch, bzip2}: +{ lib, stdenv, fetchurl, fetchpatch, bzip2 }: + +stdenv.mkDerivation rec { + pname = "rzip"; + version = "2.1"; -stdenv.mkDerivation { - name = "rzip-2.1"; src = fetchurl { - url = "mirror://samba/rzip/rzip-2.1.tar.gz"; + url = "mirror://samba/rzip/rzip-${version}.tar.gz"; sha256 = "4bb96f4d58ccf16749ed3f836957ce97dbcff3e3ee5fd50266229a48f89815b7"; }; buildInputs = [ bzip2 ]; @@ -16,10 +18,11 @@ stdenv.mkDerivation { }) ]; - meta = { + meta = with lib; { homepage = "https://rzip.samba.org/"; description = "Compression program"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; + maintainers = with maintainers; [ ]; + license = licenses.gpl2Plus; + platforms = platforms.unix; }; } From 09f99feeba84c614d01b3653567b54de9c4dd88e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 21 Jul 2021 13:50:26 +0200 Subject: [PATCH 083/235] zsync: cleanup --- pkgs/tools/compression/zsync/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/compression/zsync/default.nix b/pkgs/tools/compression/zsync/default.nix index 94921397e303..b92112a4816e 100644 --- a/pkgs/tools/compression/zsync/default.nix +++ b/pkgs/tools/compression/zsync/default.nix @@ -1,20 +1,21 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "zsync-0.6.2"; + pname = "zsync"; + version = "0.6.2"; src = fetchurl { - url = "http://zsync.moria.org.uk/download/${name}.tar.bz2"; + url = "http://zsync.moria.org.uk/download/${pname}-${version}.tar.bz2"; sha256 = "1wjslvfy76szf0mgg2i9y9q30858xyjn6v2acc24zal76d1m778b"; }; makeFlags = [ "AR=${stdenv.cc.bintools.targetPrefix}ar" ]; - meta = { + meta = with lib; { homepage = "http://zsync.moria.org.uk/"; description = "File distribution system using the rsync algorithm"; - license = lib.licenses.free; - maintainers = with lib.maintainers; [viric]; - platforms = with lib.platforms; all; + license = licenses.free; + maintainers = with maintainers; [ viric ]; + platforms = with platforms; all; }; } From ee26807e35e436cd0a29d32a58577a3c01f2e860 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 21 Jul 2021 16:38:51 +0200 Subject: [PATCH 084/235] nixos/pppd: allow AF_NETLINK The pppd daemon starting with version 2.4.9 uses rtnetlink to configure the ipv6 peer address on the ppp interface. It therefore requires allowing AF_NETLINK sockets. --- nixos/modules/services/networking/pppd.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/pppd.nix b/nixos/modules/services/networking/pppd.nix index 45c841dbea8b..37f44f07ac46 100644 --- a/nixos/modules/services/networking/pppd.nix +++ b/nixos/modules/services/networking/pppd.nix @@ -111,7 +111,17 @@ in ProtectKernelTunables = false; ProtectSystem = "strict"; RemoveIPC = true; - RestrictAddressFamilies = "AF_PACKET AF_UNIX AF_PPPOX AF_ATMPVC AF_ATMSVC AF_INET AF_INET6 AF_IPX"; + RestrictAddressFamilies = [ + "AF_ATMPVC" + "AF_ATMSVC" + "AF_INET" + "AF_INET6" + "AF_IPX" + "AF_NETLINK" + "AF_PACKET" + "AF_PPPOX" + "AF_UNIX" + ]; RestrictNamespaces = true; RestrictRealtime = true; RestrictSUIDSGID = true; From acf6abcafcf0282cbc2ea85e10ce759e5203d445 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Tue, 20 Jul 2021 19:58:09 -0400 Subject: [PATCH 085/235] kodi: set proper PYTHONPATH for addons --- .../video/kodi-packages/certifi/default.nix | 7 +++++-- .../video/kodi-packages/chardet/default.nix | 7 +++++-- .../video/kodi-packages/dateutil/default.nix | 7 +++++-- .../video/kodi-packages/idna/default.nix | 7 +++++-- .../kodi-packages/inputstreamhelper/default.nix | 7 +++++-- .../video/kodi-packages/kodi-six/default.nix | 7 +++++-- .../video/kodi-packages/myconnpy/default.nix | 7 +++++-- .../video/kodi-packages/pdfreader/default.nix | 2 ++ .../video/kodi-packages/requests/default.nix | 7 +++++-- .../video/kodi-packages/signals/default.nix | 7 +++++-- .../video/kodi-packages/urllib3/default.nix | 7 +++++-- .../video/kodi-packages/websocket/default.nix | 7 +++++-- .../video/kodi-packages/youtube/default.nix | 7 +++++-- pkgs/applications/video/kodi/wrapper.nix | 17 ++++++++++++++--- 14 files changed, 76 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/video/kodi-packages/certifi/default.nix b/pkgs/applications/video/kodi-packages/certifi/default.nix index b99a64f3eec3..1088f560adf9 100644 --- a/pkgs/applications/video/kodi-packages/certifi/default.nix +++ b/pkgs/applications/video/kodi-packages/certifi/default.nix @@ -9,8 +9,11 @@ buildKodiAddon rec { sha256 = "1z49b8va7wdyr714c8ixb2sldi0igffcjj3xpbmga58ph0z985vy"; }; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.certifi"; + passthru = { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.certifi"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/chardet/default.nix b/pkgs/applications/video/kodi-packages/chardet/default.nix index cfe3d501cbd4..fe482447cfa3 100644 --- a/pkgs/applications/video/kodi-packages/chardet/default.nix +++ b/pkgs/applications/video/kodi-packages/chardet/default.nix @@ -9,8 +9,11 @@ buildKodiAddon rec { sha256 = "1jsd165mb1b8jdan2jbjd3y3xa0xam2cxcccmwazkybpa0r6a7dj"; }; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.chardet"; + passthru = { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.chardet"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/dateutil/default.nix b/pkgs/applications/video/kodi-packages/dateutil/default.nix index 665858d3d573..54a22cedf905 100644 --- a/pkgs/applications/video/kodi-packages/dateutil/default.nix +++ b/pkgs/applications/video/kodi-packages/dateutil/default.nix @@ -14,8 +14,11 @@ buildKodiAddon rec { six ]; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.dateutil"; + passthru = { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.dateutil"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/idna/default.nix b/pkgs/applications/video/kodi-packages/idna/default.nix index c90f52ffdc94..01f16696faee 100644 --- a/pkgs/applications/video/kodi-packages/idna/default.nix +++ b/pkgs/applications/video/kodi-packages/idna/default.nix @@ -9,8 +9,11 @@ buildKodiAddon rec { sha256 = "0pm86m8kh2p0brps3xzxcmmabvb4izkglzkj8dsn33br3vlc7cm7"; }; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.idna"; + passthru = { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.idna"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix b/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix index 4ca45f8b7b90..fcf53e7a1694 100644 --- a/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix +++ b/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix @@ -9,8 +9,11 @@ buildKodiAddon rec { sha256 = "0y4xn3ygwv1kb7gya7iwdga0g9sa89snpnram0wwqzqn8wn2lyb4"; }; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.inputstreamhelper"; + passthru = { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.inputstreamhelper"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/kodi-six/default.nix b/pkgs/applications/video/kodi-packages/kodi-six/default.nix index b4f1169b36db..24404ef349e2 100644 --- a/pkgs/applications/video/kodi-packages/kodi-six/default.nix +++ b/pkgs/applications/video/kodi-packages/kodi-six/default.nix @@ -10,8 +10,11 @@ buildKodiAddon rec { sha256 = "14m232p9hx925pbk8knsg994m1nbpa5278zmcrnfblh4z84gjv4x"; }; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.kodi-six"; + passthru = { + pythonPath = "libs"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.kodi-six"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/myconnpy/default.nix b/pkgs/applications/video/kodi-packages/myconnpy/default.nix index bd0c98137a5a..e39625545f6a 100644 --- a/pkgs/applications/video/kodi-packages/myconnpy/default.nix +++ b/pkgs/applications/video/kodi-packages/myconnpy/default.nix @@ -9,8 +9,11 @@ buildKodiAddon rec { sha256 = "1cx3qdzw9lkkmbyvyrmc2i193is20fihn2sfl7kmv43f708vam0k"; }; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.myconnpy"; + passthru = { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.myconnpy"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/pdfreader/default.nix b/pkgs/applications/video/kodi-packages/pdfreader/default.nix index 8896a94c9c39..62a5853c796b 100644 --- a/pkgs/applications/video/kodi-packages/pdfreader/default.nix +++ b/pkgs/applications/video/kodi-packages/pdfreader/default.nix @@ -11,6 +11,8 @@ buildKodiAddon rec { sha256 = "0nkqhlm1gyagq6xpdgqvd5qxyr2ngpml9smdmzfabc8b972mwjml"; }; + passthru.pythonPath = "lib/api"; + meta = with lib; { homepage = "https://forum.kodi.tv/showthread.php?tid=187421"; description = "A comic book reader"; diff --git a/pkgs/applications/video/kodi-packages/requests/default.nix b/pkgs/applications/video/kodi-packages/requests/default.nix index 0f2d5044f04c..c5759fcc325b 100644 --- a/pkgs/applications/video/kodi-packages/requests/default.nix +++ b/pkgs/applications/video/kodi-packages/requests/default.nix @@ -16,8 +16,11 @@ buildKodiAddon rec { urllib3 ]; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.requests"; + passthru = { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.requests"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/signals/default.nix b/pkgs/applications/video/kodi-packages/signals/default.nix index bba7b112e9f0..b66b1e99a8bf 100644 --- a/pkgs/applications/video/kodi-packages/signals/default.nix +++ b/pkgs/applications/video/kodi-packages/signals/default.nix @@ -9,8 +9,11 @@ buildKodiAddon rec { sha256 = "1qcjbakch8hvx02wc01zv014nmzgn6ahc4n2bj5mzr114ppd3hjs"; }; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.signals"; + passthru= { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.signals"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/urllib3/default.nix b/pkgs/applications/video/kodi-packages/urllib3/default.nix index 12d8e60d67be..de0fbb997654 100644 --- a/pkgs/applications/video/kodi-packages/urllib3/default.nix +++ b/pkgs/applications/video/kodi-packages/urllib3/default.nix @@ -9,8 +9,11 @@ buildKodiAddon rec { sha256 = "1d2k6gbsnhdadcl1xc7igz4m71z2fcnpln5ppfjv455cmkk110vf"; }; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.urllib3"; + passthru = { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.urllib3"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/websocket/default.nix b/pkgs/applications/video/kodi-packages/websocket/default.nix index 3c83e1f9b000..423dfa73f34f 100644 --- a/pkgs/applications/video/kodi-packages/websocket/default.nix +++ b/pkgs/applications/video/kodi-packages/websocket/default.nix @@ -14,8 +14,11 @@ buildKodiAddon rec { six ]; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.websocket"; + passthru = { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.websocket"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/youtube/default.nix b/pkgs/applications/video/kodi-packages/youtube/default.nix index 65613658e0f0..8e57adbfb1af 100644 --- a/pkgs/applications/video/kodi-packages/youtube/default.nix +++ b/pkgs/applications/video/kodi-packages/youtube/default.nix @@ -16,8 +16,11 @@ buildKodiAddon rec { inputstreamhelper ]; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.youtube"; + passthru = { + pythonPath = "resources/lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.youtube"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi/wrapper.nix b/pkgs/applications/video/kodi/wrapper.nix index 86164682138d..7377e638676e 100644 --- a/pkgs/applications/video/kodi/wrapper.nix +++ b/pkgs/applications/video/kodi/wrapper.nix @@ -1,8 +1,19 @@ -{ lib, makeWrapper, buildEnv, kodi, addons }: +{ lib, makeWrapper, buildEnv, kodi, addons, callPackage }: let + kodiPackages = callPackage ../../../top-level/kodi-packages.nix { inherit kodi; }; + # linux distros are supposed to provide pillow and pycryptodome - requiredPythonPackages = with kodi.pythonPackages; [ pillow pycryptodome] ++ addons; + requiredPythonPath = with kodi.pythonPackages; makePythonPath ([ pillow pycryptodome ]); + + # each kodi addon can potentially export a python module which should be included in PYTHONPATH + # see any addon which supplies `passthru.pythonPath` and the corresponding entry in the addons `addon.xml` + # eg. `` -> pythonPath = "lib"; + additionalPythonPath = + let + addonsWithPythonPath = lib.filter (addon: addon ? pythonPath) addons; + in + lib.concatMapStringsSep ":" (addon: "${addon}${kodiPackages.addonDir}/${addon.namespace}/${addon.pythonPath}") addonsWithPythonPath; in buildEnv { @@ -18,7 +29,7 @@ buildEnv { for exe in kodi{,-standalone} do makeWrapper ${kodi}/bin/$exe $out/bin/$exe \ - --prefix PYTHONPATH : ${kodi.pythonPackages.makePythonPath requiredPythonPackages} \ + --prefix PYTHONPATH : ${requiredPythonPath}:${additionalPythonPath} \ --prefix KODI_HOME : $out/share/kodi \ --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath (lib.concatMap From c19a2b91cdca82f68d1ef170b7b21bd71f4ae068 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 21 Jul 2021 15:52:35 +0000 Subject: [PATCH 086/235] jackett: 0.18.372 -> 0.18.455 --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 341c91304817..a324dcb58bdc 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jackett"; - version = "0.18.372"; + version = "0.18.455"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "sha256-GkAKYxa5F0N9jg9TZrwt3hjkhybZTKU2Ia/gIxBRGuo="; + sha256 = "sha256-qEuhgtDtdMCHJtUcUDUmKI8FT0ti7veleI7UhwTAUfE="; }; nativeBuildInputs = [ makeWrapper ]; From 4ca54a6ef9ebf5f0ad2219179796e39253221a74 Mon Sep 17 00:00:00 2001 From: Victor Freire Date: Wed, 21 Jul 2021 13:21:25 -0300 Subject: [PATCH 087/235] vscode-extensions.foam.foam-vscode: 0.13.7 -> 0.14.1 --- pkgs/misc/vscode-extensions/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index c47e17b1c129..08bf2307d785 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -497,6 +497,12 @@ let }; foam.foam-vscode = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "foam-vscode"; + publisher = "foam"; + version = "0.14.1"; + sha256 = "sha256-w9xGkezS3A9z6sTk8WWgW7g8qYX6mJFfRV0lv5cu160="; + }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/foam.foam-vscode/changelog"; description = "A personal knowledge management and sharing system for VSCode "; @@ -505,12 +511,6 @@ let license = licenses.mit; maintainers = with maintainers; [ ratsclub ]; }; - mktplcRef = { - name = "foam-vscode"; - publisher = "foam"; - version = "0.13.7"; - sha256 = "Y2pcd4iXPiuhJdD/9d+tbTJN18O4+kRMqUdOtbx8xy8="; - }; }; formulahendry.auto-close-tag = buildVscodeMarketplaceExtension { From d7b89d596f5218dc4851186f5d99e2bde89924c8 Mon Sep 17 00:00:00 2001 From: Victor Freire Date: Wed, 21 Jul 2021 13:37:17 -0300 Subject: [PATCH 088/235] vscode-extensions.angular.ng-template: init at 12.1.2 --- pkgs/misc/vscode-extensions/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index c47e17b1c129..873ae9135a5e 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -85,6 +85,23 @@ let }; }; + angular.ng-template = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "ng-template"; + publisher = "Angular"; + version = "12.1.2"; + sha256 = "sha256-fIHh1eRmu4zSgrtZr0XwLB+1Ad6a/0ABC55akGr0DOA="; + }; + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/Angular.ng-template/changelog"; + description = "Editor services for Angular templates"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=Angular.ng-template"; + homepage = "https://github.com/angular/vscode-ng-language-service"; + license = licenses.mit; + maintainers = with maintainers; [ ratsclub ]; + }; + }; + antfu.icons-carbon = buildVscodeMarketplaceExtension { mktplcRef = { name = "icons-carbon"; From d2b557bcdd52dbd79cc8074d859d390eaed81a1f Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 21 Jul 2021 19:37:43 +0300 Subject: [PATCH 089/235] grapejuice: 3.12.5 -> 3.40.14 --- pkgs/games/grapejuice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/grapejuice/default.nix b/pkgs/games/grapejuice/default.nix index 1cb27f7b8c52..586d93151e2c 100644 --- a/pkgs/games/grapejuice/default.nix +++ b/pkgs/games/grapejuice/default.nix @@ -15,13 +15,13 @@ python3Packages.buildPythonApplication rec { pname = "grapejuice"; - version = "3.12.5"; + version = "3.40.14"; src = fetchFromGitLab { owner = "BrinkerVII"; repo = "grapejuice"; rev = "v${version}"; - sha256 = "1xgxyfwwghy9l17i6y40axdrpp4fgxgdr5y97flwmfivif01ifs1"; + sha256 = "1bmkkmi1gx5kc39cjnz5bzwqaicxs0zb6bcv4iny9qccbqf3icrd"; }; nativeBuildInputs = [ From 787feb03db8c8e346edc10fb46f40ec7220ae2d4 Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 21 Jul 2021 20:59:47 +0300 Subject: [PATCH 090/235] nexus: use jre8_headless --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d8738ed9bf2e..5f00c2bff212 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13949,7 +13949,9 @@ in nix-build-uncached = callPackage ../development/tools/misc/nix-build-uncached { }; - nexus = callPackage ../development/tools/repository-managers/nexus { }; + nexus = callPackage ../development/tools/repository-managers/nexus { + jre_headless = jre8_headless; + }; nwjs = callPackage ../development/tools/nwjs { gconf = pkgs.gnome2.GConf; From e060a9515343e5240e2f6a4ff8354ff2a0096b43 Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 21 Jul 2021 21:12:41 +0300 Subject: [PATCH 091/235] strawberry: add glib-networking --- pkgs/applications/audio/strawberry/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index a1cba439c493..8fb3bda683fe 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -28,6 +28,7 @@ , qtx11extras , qttools , withGstreamer ? true +, glib-networking , gst_all_1 ? null , withVlc ? true , libvlc ? null @@ -69,6 +70,7 @@ mkDerivation rec { p11-kit ] ++ lib.optionals withGstreamer (with gst_all_1; [ + glib-networking gstreamer gst-plugins-base gst-plugins-good @@ -85,8 +87,11 @@ mkDerivation rec { util-linux ]; - postInstall = '' - qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") + postInstall = lib.optionalString withGstreamer '' + qtWrapperArgs+=( + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" + --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" + ) ''; meta = with lib; { From a10a648a436724888b3368db52534aa9f0152df8 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 21 Jul 2021 14:32:30 -0400 Subject: [PATCH 092/235] fcp: 0.2.0 -> 0.2.1 --- pkgs/tools/misc/fcp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fcp/default.nix b/pkgs/tools/misc/fcp/default.nix index db4330e5b0f1..7124e9078457 100644 --- a/pkgs/tools/misc/fcp/default.nix +++ b/pkgs/tools/misc/fcp/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fcp"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "svetlitski"; repo = pname; rev = "v${version}"; - sha256 = "0ahd79dh48hsi4bhs4zs0a7hr55jzsjix9c61lc42ipdbqgifg2d"; + sha256 = "0f242n8w88rikg1srimdifadhggrb2r1z0g65id60ahb4bjm8a0x"; }; - cargoSha256 = "1arrw4fz3f3wfjy9nb8vm707vhh4x0vv9wv8z2s07b4qcwwih8k4"; + cargoSha256 = "0gw7gjfwc4r03rg6z65ml0y37sh4yf716isqs0mb4jqkp7rwfbc9"; nativeBuildInputs = [ expect ]; From c9004a2ccc96dc32df373aa067cee9be752562cd Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 21 Jul 2021 21:42:22 +0300 Subject: [PATCH 093/235] virtinst: remove because its included in virt-manager --- .../virtualization/virtinst/default.nix | 47 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 49 deletions(-) delete mode 100644 pkgs/applications/virtualization/virtinst/default.nix diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix deleted file mode 100644 index 37f03d8772f5..000000000000 --- a/pkgs/applications/virtualization/virtinst/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, stdenv, fetchurl, python2Packages, intltool, libxml2Python }: - -with lib; - -let version = "0.600.4"; in - -stdenv.mkDerivation rec { - pname = "virtinst"; - inherit version; - - src = fetchurl { - url = "http://virt-manager.org/download/sources/virtinst/virtinst-${version}.tar.gz"; - sha256 = "175laiy49dni8hzi0cn14bbsdsigvgr9h6d9z2bcvbpa29spldvf"; - }; - - pythonPath = with python2Packages; - [ setuptools eventlet greenlet gflags netaddr carrot routes - PasteDeploy m2crypto ipy twisted - distutils_extra simplejson cheetah lockfile httplib2 - # !!! should libvirt be a build-time dependency? Note that - # libxml2Python is a dependency of libvirt.py. - libvirt libxml2Python urlgrabber - ]; - - buildInputs = - [ python2Packages.python - python2Packages.wrapPython - python2Packages.mox - intltool - ] ++ pythonPath; - - buildPhase = "python setup.py build"; - - installPhase = - '' - python setup.py install --prefix="$out"; - wrapPythonPrograms - ''; - - meta = { - homepage = "http://virt-manager.org"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [qknight]; - description = "Command line tool which provides an easy way to provision operating systems into virtual machines"; - platforms = with lib.platforms; linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8c59db87b739..eeb6df85462a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -886,6 +886,7 @@ mapAliases ({ virtviewer = virt-viewer; # added 2015-12-24 virtmanager = virt-manager; # added 2019-10-29 virtmanager-qt = virt-manager-qt; # added 2019-10-29 + virtinst = throw "virtinst has been removed, as it's included in virt-manager"; # added 2021-07-21 vorbisTools = vorbis-tools; # added 2016-01-26 webkit = webkitgtk; # added 2019-03-05 webkitgtk24x-gtk3 = throw "webkitgtk24x-gtk3 has been removed because it's insecure. Please use webkitgtk."; # added 2019-12-05 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d8738ed9bf2e..b27c051849ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27707,8 +27707,6 @@ in qtermwidget = lxqt.qtermwidget; }; - virtinst = callPackage ../applications/virtualization/virtinst {}; - virtscreen = callPackage ../tools/admin/virtscreen {}; virtual-ans = callPackage ../applications/audio/virtual-ans {}; From 7c1d4d8255e5a3a1e7ae629a168af20e79c37fa0 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Thu, 22 Jul 2021 02:04:47 +0700 Subject: [PATCH 094/235] coq: enable parallel building --- pkgs/applications/science/logic/coq/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index b5c66289c9d3..cd19b9a94424 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -162,6 +162,7 @@ self = stdenv.mkDerivation { prefixKey = "-prefix "; buildFlags = [ "revision" "coq" "coqide" "bin/votour" ]; + enableParallelBuilding = true; createFindlibDestdir = true; From 669849691ee6e58e6e9b9d1b2672df46e00343da Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 21 Jul 2021 22:46:13 +0200 Subject: [PATCH 095/235] python3Packages.homepluscontrol: 0.0.5 -> 0.0.61 --- pkgs/development/python-modules/homepluscontrol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/homepluscontrol/default.nix b/pkgs/development/python-modules/homepluscontrol/default.nix index 680c4a5a7266..7870247e2fdf 100644 --- a/pkgs/development/python-modules/homepluscontrol/default.nix +++ b/pkgs/development/python-modules/homepluscontrol/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "homepluscontrol"; - version = "0.0.5"; + version = "0.0.61"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "chemaaa"; repo = pname; rev = version; - sha256 = "1nd3a7nhh1xb70cdh2h2bimwbffvpc3457smyzr9fqkjwfbcrr93"; + sha256 = "1g61xj417dz1nz5g5ic8rs34fp424zvbgsymry1zldg3gskaqgvk"; }; propagatedBuildInputs = [ From 0d82c3a0e743e3b837a476c3f0f6d286e902464f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 21 Jul 2021 22:55:12 +0200 Subject: [PATCH 096/235] python3Packages.soco: 0.22.6 -> 0.23.1 --- pkgs/development/python-modules/soco/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index edadde8995ec..af2226741301 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "soco"; - version = "0.22.6"; + version = "0.23.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "SoCo"; repo = "SoCo"; rev = "v${version}"; - sha256 = "06qar4syi6g3x84klnk0mg6w5ryl50c5k3s1hag4rimbkap3x6ks"; + sha256 = "15q82fq10d162xanypn1k51y15r38l7sj0417jzbjx40zz6c93f7"; }; propagatedBuildInputs = [ From 9bee9d6d476b5cecad597c184a761c088b0058b2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 21 Jul 2021 23:02:27 +0200 Subject: [PATCH 097/235] python3Packages.surepy: 0.6.0 -> 0.7.0 --- pkgs/development/python-modules/surepy/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/surepy/default.nix b/pkgs/development/python-modules/surepy/default.nix index 39be204a3d31..e983dfc0e7fd 100644 --- a/pkgs/development/python-modules/surepy/default.nix +++ b/pkgs/development/python-modules/surepy/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "surepy"; - version = "0.6.0"; + version = "0.7.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "benleb"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XoYiZPBc9SybyKocui1HqSA+YPiPpbupJWMCfmQT5RU="; + sha256 = "04ywkbgs1lnnlhxakbr96crwc8hl97px8w7yigps2ki69md0xf60"; }; postPatch = '' @@ -35,7 +35,9 @@ buildPythonPackage rec { --replace 'attrs = "^20.3.0"' 'attrs = "*"' ''; - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = [ + poetry-core + ]; propagatedBuildInputs = [ aiodns @@ -53,6 +55,7 @@ buildPythonPackage rec { # Project has no tests doCheck = false; + pythonImportsCheck = [ "surepy" ]; meta = with lib; { From d687fe88fdbb00b89f4e5b82824c7b187659d648 Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Tue, 29 Jun 2021 11:54:05 -0600 Subject: [PATCH 098/235] zsh: remove conflicting nixUnstable completions --- nixos/modules/programs/zsh/zsh.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index 049a315c7622..81f1395662a8 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -279,7 +279,7 @@ in environment.etc.zinputrc.source = ./zinputrc; environment.systemPackages = [ pkgs.zsh ] - ++ optional cfg.enableCompletion pkgs.nix-zsh-completions; + ++ optional (cfg.enableCompletion && ! lib.versionAtLeast (lib.getVersion config.nix.package) "2.4pre") pkgs.nix-zsh-completions; environment.pathsToLink = optional cfg.enableCompletion "/share/zsh"; From 9ad645dce8e11a3ffcf27cd797abc99476c837f0 Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Tue, 29 Jun 2021 14:31:10 -0600 Subject: [PATCH 099/235] zsh: format module with nixpkgs-fmt --- nixos/modules/programs/zsh/zsh.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index 81f1395662a8..4eac7c8afbf6 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -53,7 +53,7 @@ in }; shellAliases = mkOption { - default = {}; + default = { }; description = '' Set of aliases for zsh shell, which overrides . See for an option format description. @@ -118,7 +118,9 @@ in setOptions = mkOption { type = types.listOf types.str; default = [ - "HIST_IGNORE_DUPS" "SHARE_HISTORY" "HIST_FCNTL_LOCK" + "HIST_IGNORE_DUPS" + "SHARE_HISTORY" + "HIST_FCNTL_LOCK" ]; example = [ "EXTENDED_HISTORY" "RM_STAR_WAIT" ]; description = '' @@ -279,14 +281,18 @@ in environment.etc.zinputrc.source = ./zinputrc; environment.systemPackages = [ pkgs.zsh ] - ++ optional (cfg.enableCompletion && ! lib.versionAtLeast (lib.getVersion config.nix.package) "2.4pre") pkgs.nix-zsh-completions; + ++ optional + (cfg.enableCompletion + && !lib.versionAtLeast (lib.getVersion config.nix.package) "2.4pre") + pkgs.nix-zsh-completions; environment.pathsToLink = optional cfg.enableCompletion "/share/zsh"; #users.defaultUserShell = mkDefault "/run/current-system/sw/bin/zsh"; environment.shells = - [ "/run/current-system/sw/bin/zsh" + [ + "/run/current-system/sw/bin/zsh" "${pkgs.zsh}/bin/zsh" ]; From 6dbf8c04097c8961bb1cb9cb319fee42eb19ab7a Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Sat, 3 Jul 2021 13:54:00 -0600 Subject: [PATCH 100/235] zsh: include completions for nix-* commands --- nixos/modules/programs/zsh/zsh.nix | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index 4eac7c8afbf6..e0335643b6e3 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -280,11 +280,21 @@ in environment.etc.zinputrc.source = ./zinputrc; - environment.systemPackages = [ pkgs.zsh ] - ++ optional - (cfg.enableCompletion - && !lib.versionAtLeast (lib.getVersion config.nix.package) "2.4pre") - pkgs.nix-zsh-completions; + environment.systemPackages = + let + completions = + if lib.versionAtLeast (lib.getVersion config.nix.package) "2.4pre" + then + pkgs.nix-zsh-completions.overrideAttrs + (_: { + postInstall = '' + rm $out/share/zsh/site-functions/_nix + ''; + }) + else pkgs.nix-zsh-completions; + in + [ pkgs.zsh ] + ++ optional cfg.enableCompletion completions; environment.pathsToLink = optional cfg.enableCompletion "/share/zsh"; From aaa06c39d5169fa245c42e08758698cee3efb281 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 22 Jul 2021 01:06:19 +0200 Subject: [PATCH 101/235] kzipmix: 20091108 -> 20200115 --- pkgs/tools/compression/kzipmix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/compression/kzipmix/default.nix b/pkgs/tools/compression/kzipmix/default.nix index ab325ac14a83..9072a24b7fb5 100644 --- a/pkgs/tools/compression/kzipmix/default.nix +++ b/pkgs/tools/compression/kzipmix/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "kzipmix"; - version = "20091108"; + version = "20200115"; src = fetchurl { url = "http://static.jonof.id.au/dl/kenutils/kzipmix-${version}-linux.tar.gz"; - sha256 = "19gyn8pblffdz1bf3xkbpzx8a8wn3xb0v411pqzmz5g5l6pm5gph"; + sha256 = "sha256-ePgye0D6/ED53zx6xffLnYhkjed7SPU4BLOZQr9E3yA="; }; installPhase = '' mkdir -p $out/bin - cp kzip zipmix $out/bin + cp amd64/{kzip,zipmix} $out/bin patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/bin/kzip patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/bin/zipmix From 93de4f3f6c9ec0ce574add26adef73cf5b594018 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 22 Jul 2021 01:09:13 +0200 Subject: [PATCH 102/235] pxz: drop no longer required patch --- pkgs/tools/compression/pxz/_SC_ARG_MAX.patch | 36 -------------------- pkgs/tools/compression/pxz/default.nix | 2 -- 2 files changed, 38 deletions(-) delete mode 100644 pkgs/tools/compression/pxz/_SC_ARG_MAX.patch diff --git a/pkgs/tools/compression/pxz/_SC_ARG_MAX.patch b/pkgs/tools/compression/pxz/_SC_ARG_MAX.patch deleted file mode 100644 index fac8f1fc147c..000000000000 --- a/pkgs/tools/compression/pxz/_SC_ARG_MAX.patch +++ /dev/null @@ -1,36 +0,0 @@ -From b8f9827fc4de9296c7a6f5e6fdac46e070cd6cb4 Mon Sep 17 00:00:00 2001 -From: Igor Pashev -Date: Sat, 1 Nov 2014 18:10:05 +0300 -Subject: [PATCH] Fixed crash on Linux when stack size is unlimited - ---- - pxz.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/pxz.c b/pxz.c -index 9cb843e..52713e2 100644 ---- a/pxz.c -+++ b/pxz.c -@@ -65,7 +65,7 @@ FILE **ftemp; - char str[0x100]; - char buf[BUFFSIZE]; - char *xzcmd; --size_t xzcmd_max; -+const size_t xzcmd_max = 10240; - - unsigned opt_complevel = 6, opt_stdout, opt_keep, opt_threads, opt_verbose; - unsigned opt_force, opt_stdout; -@@ -243,9 +243,12 @@ int main( int argc, char **argv ) { - lzma_filter filters[LZMA_FILTERS_MAX + 1]; - lzma_options_lzma lzma_options; - -- xzcmd_max = sysconf(_SC_ARG_MAX); - page_size = sysconf(_SC_PAGE_SIZE); - xzcmd = malloc(xzcmd_max); -+ if (!xzcmd) { -+ fprintf(stderr, "Failed to allocate %lu bytes for xz command.\n", xzcmd_max); -+ return -1; -+ } - snprintf(xzcmd, xzcmd_max, XZ_BINARY); - - parse_args(argc, argv); diff --git a/pkgs/tools/compression/pxz/default.nix b/pkgs/tools/compression/pxz/default.nix index 725dd4defb92..4ea95a3f78ac 100644 --- a/pkgs/tools/compression/pxz/default.nix +++ b/pkgs/tools/compression/pxz/default.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { buildInputs = [ xz ]; - patches = [ ./_SC_ARG_MAX.patch ]; - buildPhase = '' gcc -o pxz pxz.c -llzma \ -fopenmp -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -O2 \ From 5871962ba579ffef8475300c5f6ed5bfba7f97b9 Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 22 Jul 2021 00:16:45 +0300 Subject: [PATCH 103/235] virtscreen: unbreak --- pkgs/tools/admin/virtscreen/default.nix | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/admin/virtscreen/default.nix b/pkgs/tools/admin/virtscreen/default.nix index ebfd6c21772f..a1558248f802 100644 --- a/pkgs/tools/admin/virtscreen/default.nix +++ b/pkgs/tools/admin/virtscreen/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, x11vnc, xrandr, libGL }: +{ lib +, stdenv +, fetchFromGitHub +, python3Packages +, x11vnc +, xrandr +, libGL +, qt5 +}: python3Packages.buildPythonApplication rec { pname = "virtscreen"; @@ -16,6 +24,8 @@ python3Packages.buildPythonApplication rec { sha256 = "005qach6phz8w17k8kqmyd647c6jkfybczybxq0yxi5ik0s91a08"; }; + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; + propagatedBuildInputs = with python3Packages; [ netifaces pyqt5 @@ -24,10 +34,17 @@ python3Packages.buildPythonApplication rec { xrandr ]; - postPatch = let - ext = stdenv.hostPlatform.extensions.sharedLibrary; in '' + dontWrapQtApps = true; + + makeWrapperArgs = [ + "\${qtWrapperArgs[@]}" + # import Qt.labs.platform failed without this + "--prefix QML2_IMPORT_PATH : ${qt5.qtquickcontrols2.bin}/${qt5.qtbase.qtQmlPrefix}" + ]; + + postPatch = '' substituteInPlace virtscreen/__main__.py \ - --replace "'GL'" "'${libGL}/lib/libGL${ext}'" \ + --replace "'GL'" "'${libGL}/lib/libGL${stdenv.hostPlatform.extensions.sharedLibrary}'" \ ''; meta = with lib; { From 6da3d1b023260ab72d909aae1256e248027856ff Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 22 Jul 2021 00:00:00 +0000 Subject: [PATCH 104/235] terraform_1_0: 1.0.2 -> 1.0.3 https://github.com/hashicorp/terraform/releases/tag/v1.0.3 --- pkgs/applications/networking/cluster/terraform/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index c255ccd1ef82..8d13fab793c9 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -195,9 +195,9 @@ rec { }; terraform_1_0 = mkTerraform { - version = "1.0.2"; - sha256 = "0gnv6hajpn1ks4944cr8rgkvly9cgvx4zj1zwc7nf1sikqfa8r1a"; - vendorSha256 = "0q1frza5625b1va0ipak7ns3myca9mb02r60h0py3v5gyl2cb4dk"; + version = "1.0.3"; + sha256 = "0m7r66nw0nppra90sjhbq5d0f4q525c73q6ncmy6w37j2nixz35z"; + vendorSha256 = "07pzqvf9lwgc1fadmyam5hn7arlvzrjsplls445738jpn61854gg"; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; }; }; From e133ff645ebcda2e2da6cecaad6d6a85b542d970 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 22 Jul 2021 02:18:02 +0200 Subject: [PATCH 105/235] strawberry: cleanup --- .../applications/audio/strawberry/default.nix | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index 8fb3bda683fe..6cc55650220a 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -19,19 +19,19 @@ , protobuf , sqlite , taglib -, libpulseaudio ? null -, libselinux ? null -, libsepol ? null -, p11-kit ? null -, util-linux ? null +, libpulseaudio +, libselinux +, libsepol +, p11-kit +, util-linux , qtbase , qtx11extras , qttools , withGstreamer ? true , glib-networking -, gst_all_1 ? null +, gst_all_1 , withVlc ? true -, libvlc ? null +, libvlc }: mkDerivation rec { @@ -62,21 +62,18 @@ mkDerivation rec { taglib qtbase qtx11extras - ] - ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ libpulseaudio libselinux libsepol p11-kit - ] - ++ lib.optionals withGstreamer (with gst_all_1; [ + ] ++ lib.optionals withGstreamer (with gst_all_1; [ glib-networking gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly - ]) - ++ lib.optional withVlc libvlc; + ]) ++ lib.optional withVlc libvlc; nativeBuildInputs = [ cmake From 429bbe3bc309ea5a36477c4d8cd17414e2f5a945 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 21 Jul 2021 20:21:05 -0400 Subject: [PATCH 106/235] tidyp: revert to fetchurl fetchFromGitHub doesn't build --- pkgs/development/libraries/tidyp/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/tidyp/default.nix b/pkgs/development/libraries/tidyp/default.nix index c676f8f0174d..268a5f8e5c6b 100644 --- a/pkgs/development/libraries/tidyp/default.nix +++ b/pkgs/development/libraries/tidyp/default.nix @@ -1,14 +1,12 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "tidyp"; version = "1.04"; - src = fetchFromGitHub { - owner = "petdance"; - repo = "tidyp"; - rev = version; - sha256 = "0jslskziwzk4hb6i640fvpnbv2zxrvim6pdx2gwx5wyc64aviskc"; + src = fetchurl { + url = "https://github.com/downloads/petdance/tidyp/${pname}-${version}.tar.gz"; + sha256 = "0f5ky0ih4vap9c6j312jn73vn8m2bj69pl2yd3a5nmv35k9zmc10"; }; hardeningDisable = [ "format" ]; From 56c11fe8a4fe79c60c64ca65a8bde65d22c85b6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 22 Jul 2021 02:25:17 +0200 Subject: [PATCH 107/235] dnscontrol: 3.10.1 -> 3.11.0 --- pkgs/applications/networking/dnscontrol/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index 69f71a7479e1..494a40c6bfe0 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "3.10.1"; + version = "3.11.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fYQqH/J027XJPML/qKMpuu2Nxuvb0cyjOu2czLH8SoM="; + sha256 = "sha256-ExpwJ4lMrYy1WztYo+RYa9jb8slIa3IJk/SUKA1fBKI="; }; - vendorSha256 = "sha256-225TR9jTZSGEJZz3csl/pR/v2unUK67l08x5ESQTJzA="; + vendorSha256 = "sha256-IXA4YNdWR6DWIH4ceif2XcAdwnMr2kCuG3ozagtzsgo="; subPackages = [ "." ]; From 1f183abb9eeac059629ca5bbf94a275d96f9cafa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 22 Jul 2021 02:30:58 +0200 Subject: [PATCH 108/235] treewide: remove discogs_client alias --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/tools/audio/beets/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 123984e66a49..675d9b437576 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -176,7 +176,7 @@ "digital_ocean" = ps: with ps; [ digital-ocean ]; "digitalloggers" = ps: with ps; [ ]; # missing inputs: dlipower "directv" = ps: with ps; [ directv ]; - "discogs" = ps: with ps; [ discogs_client ]; + "discogs" = ps: with ps; [ discogs-client ]; "discord" = ps: with ps; [ discordpy ]; "discovery" = ps: with ps; [ aiohttp-cors ifaddr netdisco zeroconf ]; "dlib_face_detect" = ps: with ps; [ face_recognition ]; diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index c218aa7e4e12..059174ae0a27 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -133,7 +133,7 @@ in pythonPackages.buildPythonApplication rec { ++ lib.optional enableAcoustid pythonPackages.pyacoustid ++ lib.optional enableBeatport pythonPackages.requests_oauthlib ++ lib.optional enableConvert ffmpeg - ++ lib.optional enableDiscogs pythonPackages.discogs_client + ++ lib.optional enableDiscogs pythonPackages.discogs-client ++ lib.optional (enableFetchart || enableDeezer || enableEmbyupdate @@ -175,7 +175,7 @@ in pythonPackages.buildPythonApplication rec { # https://github.com/beetbox/beets/blob/v1.4.9/setup.py pylast mpd2 - discogs_client + discogs-client pyxdg ]; From 38bc6d4941e5272f7475b0313abd95d9375ec11a Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 21 Jul 2021 20:35:43 -0400 Subject: [PATCH 109/235] tidyp: document autoreconf issues with a source tarball Co-authored-by: Sandro --- pkgs/development/libraries/tidyp/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/tidyp/default.nix b/pkgs/development/libraries/tidyp/default.nix index 268a5f8e5c6b..c2a8ae0337ac 100644 --- a/pkgs/development/libraries/tidyp/default.nix +++ b/pkgs/development/libraries/tidyp/default.nix @@ -5,6 +5,8 @@ stdenv.mkDerivation rec { version = "1.04"; src = fetchurl { + # downloads from a legacy GitHub download page from ~11 years ago + # project does not work with autoconf anymore and the configure script cannot be generated from the source download url = "https://github.com/downloads/petdance/tidyp/${pname}-${version}.tar.gz"; sha256 = "0f5ky0ih4vap9c6j312jn73vn8m2bj69pl2yd3a5nmv35k9zmc10"; }; From 0044c62188d381bd952ec70d763b58ed42a2f3cb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 22 Jul 2021 00:49:14 +0000 Subject: [PATCH 110/235] cdogs-sdl: 0.12.0 -> 0.13.0 --- pkgs/games/cdogs-sdl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/cdogs-sdl/default.nix b/pkgs/games/cdogs-sdl/default.nix index 30abb71a1296..c34c9efb1673 100644 --- a/pkgs/games/cdogs-sdl/default.nix +++ b/pkgs/games/cdogs-sdl/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "cdogs"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { repo = "cdogs-sdl"; owner = "cxong"; rev = version; - sha256 = "sha256-qbMR7otsC+uz+9mwgFaD2Z5fC6rj8ueYG3KwpPiqL98="; + sha256 = "sha256-7wNiDA/gOpqzSFWw8Bn6suC/f5RXdDTxPV49nCvOxas="; }; postPatch = '' From e383b11197db54bc0417f77d87978c5c5c6efa5c Mon Sep 17 00:00:00 2001 From: Victor Freire Date: Wed, 21 Jul 2021 13:24:34 -0300 Subject: [PATCH 111/235] vscode-extensions.svsool.markdown-memo: 0.3.8 -> 0.3.9 --- pkgs/misc/vscode-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 6ecdd4cc2f2f..a6ea451ba1c3 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1244,8 +1244,8 @@ let mktplcRef = { name = "markdown-memo"; publisher = "svsool"; - version = "0.3.8"; - sha256 = "eFiCCXxrOnXwJK1AOMfIDsPGsFG3ArLD1X/uAEH5lRY="; + version = "0.3.9"; + sha256 = "sha256-BsKFHR3wkSRHS8QOi63vLwGj3T2CPzvqXhgtEOq6gJM="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/svsool.markdown-memo/changelog"; From fcc6e036c0b00e8dfb5ce1c11b526c4deaa16370 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Wed, 21 Jul 2021 18:31:55 -0700 Subject: [PATCH 112/235] =?UTF-8?q?zulip:=205.7.0=20=E2=86=92=205.8.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Anders Kaseorg --- .../networking/instant-messengers/zulip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zulip/default.nix b/pkgs/applications/networking/instant-messengers/zulip/default.nix index a4a1b3405b16..6e3ef93ec771 100644 --- a/pkgs/applications/networking/instant-messengers/zulip/default.nix +++ b/pkgs/applications/networking/instant-messengers/zulip/default.nix @@ -5,12 +5,12 @@ let pname = "zulip"; - version = "5.7.0"; + version = "5.8.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage"; - sha256 = "0yfr0n84p3jp8mnnqww2dqpcj9gd7rwpygpq4v10rmrnli18qygw"; + sha256 = "0z8lp56j6qvm57sfqdyqrqzj9add3drh1z4zsckg45jfw6yn3jdv"; name="${pname}-${version}.AppImage"; }; From e0e396f357e546e8bf30e7b54015d47e5fd188ef Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 22 Jul 2021 04:42:35 +0300 Subject: [PATCH 113/235] interception-tools: 0.6.6 -> 0.6.7 --- pkgs/tools/inputmethods/interception-tools/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/inputmethods/interception-tools/default.nix b/pkgs/tools/inputmethods/interception-tools/default.nix index 35b3b1e336d3..ad18becfc72f 100644 --- a/pkgs/tools/inputmethods/interception-tools/default.nix +++ b/pkgs/tools/inputmethods/interception-tools/default.nix @@ -3,23 +3,17 @@ stdenv.mkDerivation rec { pname = "interception-tools"; - version = "0.6.6"; + version = "0.6.7"; src = fetchFromGitLab { owner = "interception/linux"; repo = "tools"; rev = "v${version}"; - sha256 = "0k9h14a9d65nwvv7pj0kigjgzfv453mm3r4svnxfg1h5lccmy8jj"; + sha256 = "0wcmppa7092b33wb8vc782day5phf90pc25cn1x7rk0rlw565z36"; }; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libevdev udev libyamlcpp boost ]; - prePatch = '' - substituteInPlace CMakeLists.txt --replace \ - '"/usr/include/libevdev-1.0"' \ - "\"$(pkg-config --cflags libevdev | cut -c 3-)\"" - ''; - meta = { description = "A minimal composable infrastructure on top of libudev and libevdev"; homepage = "https://gitlab.com/interception/linux/tools"; From e0640636a801a8c63204742c22925da0e94b9819 Mon Sep 17 00:00:00 2001 From: Angus Trau Date: Fri, 16 Jul 2021 09:49:18 +1000 Subject: [PATCH 114/235] python3Packages.pygame-gui: init at 0.5.7 --- .../python-modules/pygame-gui/default.nix | 53 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/development/python-modules/pygame-gui/default.nix diff --git a/pkgs/development/python-modules/pygame-gui/default.nix b/pkgs/development/python-modules/pygame-gui/default.nix new file mode 100644 index 000000000000..58f65b6d0f41 --- /dev/null +++ b/pkgs/development/python-modules/pygame-gui/default.nix @@ -0,0 +1,53 @@ +{ lib +, pkgs +, buildPythonPackage +, fetchFromGitHub +, pygame +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pygame-gui"; + version = "0.5.7"; + + src = fetchFromGitHub { + owner = "MyreMylar"; + repo = "pygame_gui"; + rev = "v_${lib.replaceStrings ["."] [""] version}"; + sha256 = "4P2PT8/7oA5Q7H4+pm7BOET7w05pQYQltXVV3+YVrVE="; + }; + + propagatedBuildInputs = [ pygame ]; + + postPatch = '' + substituteInPlace pygame_gui/core/utility.py \ + --replace "xsel" "${pkgs.xsel}/bin/xsel" + ''; + + checkInputs = [ pytestCheckHook ]; + + preCheck = '' + export HOME=$TMPDIR + export SDL_VIDEODRIVER=dummy + ''; + + disabledTests = [ + # Clipboard doesn't exist in test environment + "test_process_event_text_ctrl_c" + "test_process_event_text_ctrl_v" + "test_process_event_text_ctrl_v_nothing" + "test_process_event_ctrl_v_over_limit" + "test_process_event_ctrl_v_at_limit" + "test_process_event_ctrl_v_over_limit_select_range" + "test_process_event_text_ctrl_v_select_range" + "test_process_event_text_ctrl_a" + "test_process_event_text_ctrl_x" + ]; + + meta = with lib; { + description = "A GUI system for pygame"; + homepage = "https://github.com/MyreMylar/pygame_gui"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ angustrau ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index abf8dc2ee804..7ef540cfd7ff 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5992,6 +5992,8 @@ in { pygame_sdl2 = callPackage ../development/python-modules/pygame_sdl2 { }; + pygame-gui = callPackage ../development/python-modules/pygame-gui { }; + pygatt = callPackage ../development/python-modules/pygatt { }; pygbm = callPackage ../development/python-modules/pygbm { }; From 34f8dbf47665bfa40aa94b26c495531b0d0c57a0 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 22 Jul 2021 04:20:00 +0000 Subject: [PATCH 115/235] rclone: 1.55.1 -> 1.56.0 --- pkgs/applications/networking/sync/rclone/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 0a74d19dfdb0..4b1a0bed048f 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "rclone"; - version = "1.55.1"; + version = "1.56.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1fyi12qz2igcf9rqsp9gmcgfnmgy4g04s2b03b95ml6klbf73cns"; + sha256 = "03fqwsbpwb8vmgxg6knkp8f4xlvgg88n2c7inwjg8x91c7c77i0b"; }; - vendorSha256 = "199z3j62xw9h8yviyv4jfls29y2ri9511hcyp5ix8ahgk6ypz8vw"; + vendorSha256 = "1gryisn63f6ss889s162ncvlsaznwgvgxdwk2pn5c5zw8dkmjdmi"; subPackages = [ "." ]; From af7d0a070cc1257341ad7d8f7931fa9e6d7c3219 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Thu, 22 Jul 2021 06:28:08 +0200 Subject: [PATCH 116/235] poweralertd: 0.1.0 -> 0.2.0 --- pkgs/tools/misc/poweralertd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/poweralertd/default.nix b/pkgs/tools/misc/poweralertd/default.nix index a00a5b9a4026..4121b0712bd7 100644 --- a/pkgs/tools/misc/poweralertd/default.nix +++ b/pkgs/tools/misc/poweralertd/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "poweralertd"; - version = "0.1.0"; + version = "0.2.0"; outputs = [ "out" "man" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "~kennylevinsen"; repo = "poweralertd"; rev = version; - sha256 = "136xcrp7prilh905a6v933vryqy20l7nw24ahc4ycax8f0s906x9"; + sha256 = "19rw9q4pcqw56nmzjfglfikzx5wwjl4n08awwdhg0jy1k0bm3dvp"; }; patchPhase = '' From edcbe15d53a187f4c81fe8dd52a589c7553231e4 Mon Sep 17 00:00:00 2001 From: Lein Matsumaru Date: Thu, 22 Jul 2021 04:55:28 +0000 Subject: [PATCH 117/235] exploitdb: 2021-07-20 -> 2021-07-21 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index bd3057896f68..09309e98ce4c 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-07-20"; + version = "2021-07-21"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-WjCayhpWeZ19DygKNLfwE5OGi4sQI+I+j3BMLuce9Z4="; + sha256 = "sha256-VKjbVlSvJmp6GIyQ3DVPMl+ARRWslFIf7Oc2Qtb5ouI="; }; installPhase = '' From 3ef4779dfeb5a833fd988a118ec486f51784a8eb Mon Sep 17 00:00:00 2001 From: Tristan Gosselin-Hane Date: Thu, 22 Jul 2021 01:26:00 -0400 Subject: [PATCH 118/235] kubedb-cli: init at 0.19.0 --- .../networking/cluster/kubedb-cli/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/applications/networking/cluster/kubedb-cli/default.nix diff --git a/pkgs/applications/networking/cluster/kubedb-cli/default.nix b/pkgs/applications/networking/cluster/kubedb-cli/default.nix new file mode 100644 index 000000000000..3d2771638842 --- /dev/null +++ b/pkgs/applications/networking/cluster/kubedb-cli/default.nix @@ -0,0 +1,25 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "kubedb-cli"; + version = "0.19.0"; + + src = fetchFromGitHub { + owner = "kubedb"; + repo = "cli"; + rev = "v${version}"; + sha256 = "sha256-CwAa2YqJ0R+L+VwxqruQmZJUctP4GgKszY49ZVyyNBE="; + }; + + vendorSha256 = null; + + # Don't compile the documentation stuff + subPackages = [ "cmd/kubectl-dba" ]; + + meta = with lib; { + description = "kubectl plugin for KubeDB by AppsCode."; + homepage = "https://github.com/kubedb/cli"; + license = licenses.unfree; + maintainers = [ maintainers.starcraft66 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed1329180b20..a99918e677eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25232,6 +25232,8 @@ in ktorrent = libsForQt5.callPackage ../applications/networking/p2p/ktorrent { }; + kubedb-cli = callPackage ../applications/networking/cluster/kubedb-cli { }; + kubecfg = callPackage ../applications/networking/cluster/kubecfg { }; kube-score = callPackage ../applications/networking/cluster/kube-score { }; From 64538f92553066d0ce61024b306046912c6392e4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 21 Jul 2021 10:46:44 +0000 Subject: [PATCH 119/235] dua: 2.14.1 -> 2.14.2 --- pkgs/tools/misc/dua/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index d097beca9114..627f22361794 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.14.1"; + version = "2.14.2"; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "sha256-46azJ7q0Ix/8wdg01hYQ2V2E4tBD/NDdHpexnFBD5so="; + sha256 = "sha256-gUTDiUH/jlGAGbhOOCa63wfNy5Y8W6VWlSb9E+hQjHY="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-hCf6Ih2bJrMX2ntWbIrX3Dk8wI5tio+OcN4WNWuU7j4="; + cargoSha256 = "sha256-P8QFeP5KD5YeD4Px7OQNwCrvErgT9ytr4OlFkXuPgGU="; doCheck = false; From 7ae5ab5942ccc80932935261a8631685fc3b5c22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vin=C3=ADcius=20M=C3=BCller?= Date: Wed, 21 Jul 2021 16:31:54 -0300 Subject: [PATCH 120/235] vimPlugins.fzf-checkout-vim: init at 2021-07-21 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/overrides.nix | 8 ++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 3 files changed, 21 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 9b4d36fd372f..b31924a9de42 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -1713,6 +1713,18 @@ final: prev: meta.homepage = "https://github.com/rktjmp/fwatch.nvim/"; }; + fzf-checkout-vim = buildVimPluginFrom2Nix { + name = "fzf-checkout.vim"; + version = "2021-07-21"; + src = fetchFromGitHub { + owner = "stsewd"; + repo = "fzf-checkout.vim"; + rev = "4d5ecae74460de8fed4f743f6bd53c4c31d32797"; + sha256 = "0mia7p2z8l3lrid0v8ml4i8y190gh4ll9898yyg4gcghhxp83zpm"; + }; + meta.homepage = "https://github.com/stsewd/fzf-checkout.vim"; + }; + fzf-lsp-nvim = buildVimPluginFrom2Nix { pname = "fzf-lsp-nvim"; version = "2021-06-20"; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index dffb5dd798b5..a63d05441281 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -251,6 +251,14 @@ self: super: { ''; }); + fzf-checkout-vim = super.fzf-checkout-vim.overrideAttrs (old: { + # The plugin has a makefile which tries to run tests in a docker container. + # This prevents it. + prePatch = '' + rm Makefile + ''; + }); + fzf-vim = super.fzf-vim.overrideAttrs (old: { dependencies = with self; [ fzfWrapper ]; }); diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index c3c89b5af461..3f1963101cec 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -645,6 +645,7 @@ steelsojka/completion-buffers steelsojka/pears.nvim stefandtw/quickfix-reflector.vim stephpy/vim-yaml +stsewd/fzf-checkout.vim stevearc/aerial.nvim sunaku/vim-dasht sunjon/Shade.nvim From dd19e6272e3e7463451021693a3de933842d86ff Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 14 Jul 2021 17:57:01 +0200 Subject: [PATCH 121/235] ocamlPackages.ocaml_http: remove at 0.1.5 --- .../ocaml-modules/http/default.nix | 39 ------------------- pkgs/top-level/ocaml-packages.nix | 2 - 2 files changed, 41 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/http/default.nix diff --git a/pkgs/development/ocaml-modules/http/default.nix b/pkgs/development/ocaml-modules/http/default.nix deleted file mode 100644 index f762e9c7b238..000000000000 --- a/pkgs/development/ocaml-modules/http/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{lib, stdenv, fetchurl, ocaml_pcre, ocamlnet, ocaml, findlib, camlp4}: - -if lib.versionAtLeast ocaml.version "4.06" -then throw "ocaml-http is not available for OCaml ${ocaml.version}" -else - -stdenv.mkDerivation { - name = "ocaml-http-0.1.5"; - - src = fetchurl { - url = "https://forge.ocamlcore.org/frs/download.php/545/ocaml-http-0.1.5.tar.gz"; - sha256 = "09q12b0j01iymflssxigsqggbsp8dqh9pfvkm76dv860544mygws"; - }; - - buildInputs = [ocaml findlib camlp4]; - propagatedBuildInputs = [ocaml_pcre ocamlnet]; - - createFindlibDestdir = true; - - prePatch = '' - BASH=$(type -tp bash) - echo $BASH - substituteInPlace Makefile --replace "SHELL=/bin/bash" "SHELL=$BASH" - ''; - - dontConfigure = true; # Skip configure phase - - buildPhase = '' - make all opt - ''; - - meta = with lib; { - homepage = "http://ocaml-http.forge.ocamlcore.org/"; - platforms = ocaml.meta.platforms or []; - description = "Do it yourself (OCaml) HTTP daemon"; - license = licenses.lgpl2; - maintainers = with maintainers; [ roconnor vbgl ]; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 28f8436ea999..4febee5f5a8b 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -848,8 +848,6 @@ let ocamlgraph = callPackage ../development/ocaml-modules/ocamlgraph { }; ocamlgraph_gtk = callPackage ../development/ocaml-modules/ocamlgraph/gtk.nix { }; - ocaml_http = callPackage ../development/ocaml-modules/http { }; - ocaml_libvirt = callPackage ../development/ocaml-modules/ocaml-libvirt { }; ocamlify = callPackage ../development/tools/ocaml/ocamlify { }; From 5349ebee9a395dcc66884b3ea03916e432b75a05 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 14 Jul 2021 17:57:06 +0200 Subject: [PATCH 122/235] =?UTF-8?q?ocamlPackages.ocaml=5Fpcre:=207.2.3=20?= =?UTF-8?q?=E2=86=92=207.4.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/pcre/default.nix | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/development/ocaml-modules/pcre/default.nix b/pkgs/development/ocaml-modules/pcre/default.nix index 210b7d58857c..ea853c4648b1 100644 --- a/pkgs/development/ocaml-modules/pcre/default.nix +++ b/pkgs/development/ocaml-modules/pcre/default.nix @@ -1,26 +1,26 @@ -{ lib, stdenv, fetchurl, pcre, ocaml, findlib, ocamlbuild }: +{ lib, buildDunePackage, fetchurl, pcre, dune-configurator }: -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-pcre-${version}"; - version = "7.2.3"; +buildDunePackage rec { + pname = "pcre"; + version = "7.4.6"; + + useDune2 = true; + + minimalOCamlVersion = "4.08"; src = fetchurl { - url = "https://github.com/mmottl/pcre-ocaml/releases/download/v${version}/pcre-ocaml-${version}.tar.gz"; - sha256 = "0rj6dw79px4sj2kq0iss2nzq3rnsn9wivvc0f44wa1mppr6njfb3"; + url = "https://github.com/mmottl/pcre-ocaml/releases/download/${version}/pcre-${version}.tbz"; + sha256 = "17ajl0ra5xkxn5pf0m0zalylp44wsfy6mvcq213djh2pwznh4gya"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; - propagatedBuildInputs = [pcre]; + buildInputs = [ dune-configurator ]; - createFindlibDestdir = true; - - dontConfigure = true; # Skip configure phase + propagatedBuildInputs = [ pcre ]; meta = with lib; { - homepage = "https://bitbucket.org/mmottl/pcre-ocaml"; + homepage = "https://mmottl.github.io/pcre-ocaml"; description = "An efficient C-library for pattern matching with Perl-style regular expressions in OCaml"; - license = licenses.lgpl21; - platforms = ocaml.meta.platforms or []; + license = licenses.lgpl21Plus; maintainers = with maintainers; [ maggesi vbmithr ]; }; } From 94675cc77a57461bb9b25934e3cf9a574d799382 Mon Sep 17 00:00:00 2001 From: happysalada Date: Thu, 22 Jul 2021 14:57:49 +0900 Subject: [PATCH 123/235] dua: fix darwin build --- pkgs/tools/misc/dua/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index 627f22361794..0c3d319f2a70 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv, Foundation }: rustPlatform.buildRustPackage rec { pname = "dua"; version = "2.14.2"; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; src = fetchFromGitHub { owner = "Byron"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed1329180b20..3c5ae15d23e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2565,7 +2565,9 @@ in dtrx = callPackage ../tools/compression/dtrx { }; - dua = callPackage ../tools/misc/dua { }; + dua = callPackage ../tools/misc/dua { + inherit (darwin.apple_sdk.frameworks) Foundation; + }; duf = callPackage ../tools/misc/duf { }; From 4085c3c4d3d310f8482b88cf06efd7644a325844 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Thu, 22 Jul 2021 10:16:39 +0200 Subject: [PATCH 124/235] lightning-loop: 0.14.1-beta -> 0.14.2-beta --- pkgs/applications/blockchains/lightning-loop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/lightning-loop/default.nix b/pkgs/applications/blockchains/lightning-loop/default.nix index 851a1b1d0400..f14af0ae7969 100644 --- a/pkgs/applications/blockchains/lightning-loop/default.nix +++ b/pkgs/applications/blockchains/lightning-loop/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "lightning-loop"; - version = "0.14.1-beta"; + version = "0.14.2-beta"; src = fetchFromGitHub { owner = "lightninglabs"; repo = "loop"; rev = "v${version}"; - sha256 = "0fnbf0cryrw9yk3z1g7innv1rxxk7h2lhfakdj994l5a0pgzghmy"; + sha256 = "02ndln0n5k2pin9pngjcmn3wak761ml923111fyqb379zcfscrfv"; }; - vendorSha256 = "1i7mmf4ab4a6h08df6zlyjdnmvn44i2y3fc05hq6g1ln1bzdrz40"; + vendorSha256 = "1izdd9i4bqzmwagq0ilz2s37jajvzf1xwx3hmmbd1k3ss7mjm72r"; subPackages = [ "cmd/loop" "cmd/loopd" ]; From c6de8182ddc0aedba6ffc3341293897c06260dc7 Mon Sep 17 00:00:00 2001 From: ethancreeger <73786280+ethancreeger@users.noreply.github.com> Date: Thu, 22 Jul 2021 04:29:08 -0400 Subject: [PATCH 125/235] nym: 0.10.0 -> 0.11.0 (#130994) Co-authored-by: Ethan Creeger --- pkgs/applications/networking/nym/default.nix | 15 ++- .../nym/ignore-networking-tests.patch | 123 ------------------ 2 files changed, 11 insertions(+), 127 deletions(-) delete mode 100644 pkgs/applications/networking/nym/ignore-networking-tests.patch diff --git a/pkgs/applications/networking/nym/default.nix b/pkgs/applications/networking/nym/default.nix index b7bffcd694e1..43fee635f454 100644 --- a/pkgs/applications/networking/nym/default.nix +++ b/pkgs/applications/networking/nym/default.nix @@ -10,26 +10,33 @@ rustPlatform.buildRustPackage rec { pname = "nym"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "nymtech"; repo = "nym"; rev = "v${version}"; - sha256 = "sha256-7x+B+6T0cnEOjXevA5n1k/SY1Q2tcu0bbZ9gIGoljw0="; + sha256 = "sha256-bZXbteryXkOxft63zUMWdpBgbDSvrBHQY3f70/+mBtI="; }; - cargoSha256 = "0a7yja0ihjc66fqlshlaxpnpcpdy7h7gbv6120w2cr605qdnqvkx"; + cargoSha256 = "0xwa114fs4h6y2a3nrl2dp0rv0k336xy9y330g9yix4g34qmrynq"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; - patches = [ ./ignore-networking-tests.patch ]; checkType = "debug"; passthru.updateScript = ./update.sh; + checkFlags = [ + "--skip commands::upgrade::upgrade_tests" + "--skip allowed_hosts::tests::creating_a_new_host_store" + "--skip allowed_hosts::tests::getting_the_domain_root" + "--skip allowed_hosts::tests::requests_to_allowed_hosts" + "--skip allowed_hosts::tests::requests_to_unknown_hosts" + ]; + meta = with lib; { description = "A mixnet providing IP-level privacy"; longDescription = '' diff --git a/pkgs/applications/networking/nym/ignore-networking-tests.patch b/pkgs/applications/networking/nym/ignore-networking-tests.patch deleted file mode 100644 index e971557e7ce0..000000000000 --- a/pkgs/applications/networking/nym/ignore-networking-tests.patch +++ /dev/null @@ -1,123 +0,0 @@ -diff --git a/service-providers/network-requester/src/allowed_hosts.rs b/service-providers/network-requester/src/allowed_hosts.rs -index 3026b4ee..fd156682 100644 ---- a/service-providers/network-requester/src/allowed_hosts.rs -+++ b/service-providers/network-requester/src/allowed_hosts.rs -@@ -306,6 +306,7 @@ mod tests { - } - - #[test] -+ #[ignore] - fn leaves_a_com_alone() { - let filter = setup(); - assert_eq!( -@@ -315,6 +316,7 @@ mod tests { - } - - #[test] -+ #[ignore] - fn trims_subdomains_from_com() { - let filter = setup(); - assert_eq!( -@@ -324,6 +326,7 @@ mod tests { - } - - #[test] -+ #[ignore] - fn works_for_non_com_roots() { - let filter = setup(); - assert_eq!( -@@ -333,6 +336,7 @@ mod tests { - } - - #[test] -+ #[ignore] - fn works_for_non_com_roots_with_subdomains() { - let filter = setup(); - assert_eq!( -@@ -342,12 +346,14 @@ mod tests { - } - - #[test] -+ #[ignore] - fn returns_none_on_garbage() { - let filter = setup(); - assert_eq!(None, filter.get_domain_root("::/&&%@")); - } - - #[test] -+ #[ignore] - fn returns_none_on_nonsense_domains() { - let filter = setup(); - assert_eq!(None, filter.get_domain_root("flappappa")); -@@ -368,6 +374,7 @@ mod tests { - } - - #[test] -+ #[ignore] - fn are_not_allowed() { - let host = "unknown.com"; - let mut filter = setup(); -@@ -375,6 +382,7 @@ mod tests { - } - - #[test] -+ #[ignore] - fn get_appended_once_to_the_unknown_hosts_list() { - let host = "unknown.com"; - let mut filter = setup(); -@@ -405,6 +413,7 @@ mod tests { - } - - #[test] -+ #[ignore] - fn are_allowed() { - let host = "nymtech.net"; - -@@ -413,6 +422,7 @@ mod tests { - } - - #[test] -+ #[ignore] - fn are_allowed_for_subdomains() { - let host = "foomp.nymtech.net"; - -@@ -421,6 +431,7 @@ mod tests { - } - - #[test] -+ #[ignore] - fn are_not_appended_to_file() { - let mut filter = setup(&["nymtech.net"]); - -@@ -436,6 +447,7 @@ mod tests { - } - - #[test] -+ #[ignore] - fn are_allowed_for_ipv4_addresses() { - let address_good = "1.1.1.1"; - let address_good_port = "1.1.1.1:1234"; -@@ -448,6 +460,7 @@ mod tests { - } - - #[test] -+ #[ignore] - fn are_allowed_for_ipv6_addresses() { - let ip_v6_full = "2001:0db8:85a3:0000:0000:8a2e:0370:7334"; - let ip_v6_full_rendered = "2001:0db8:85a3::8a2e:0370:7334"; -@@ -477,6 +490,7 @@ mod tests { - } - - #[test] -+ #[ignore] - fn are_allowed_for_ipv4_address_ranges() { - let range1 = "127.0.0.1/32"; - let range2 = "1.2.3.4/24"; -@@ -495,6 +509,7 @@ mod tests { - } - - #[test] -+ #[ignore] - fn are_allowed_for_ipv6_address_ranges() { - let range = "2620:0:2d0:200::7/32"; - From 105a3f48eef6c1e4215b1d896656d4f118743abd Mon Sep 17 00:00:00 2001 From: John Winston <59228178+winston0410@users.noreply.github.com> Date: Thu, 22 Jul 2021 09:34:19 +0100 Subject: [PATCH 126/235] nodePackages.autoprefixer: init (#130977) Co-authored-by: Hugo Sum --- .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 361 ++++++++++++++---- 2 files changed, 285 insertions(+), 77 deletions(-) diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index e2c4d4414175..1bf813952eaa 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -227,6 +227,7 @@ , "stf" , "stylelint" , "svelte-language-server" +, "svelte-check" , "svgo" , "swagger" , {"tedicross": "git+https://github.com/TediCross/TediCross.git#v0.8.7"} diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 79425525bb0c..8c9726808957 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -4171,13 +4171,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-16.0.1" = { + "@netlify/build-16.1.0" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "16.0.1"; + version = "16.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-16.0.1.tgz"; - sha512 = "DRuFNlK309541EbnY4xHBXrYTgn4K59IpzbE9+ACCuOOav0lJHrVXTeZCzl2dAg/dvEp0/9YwDncmyjr4uKqWQ=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-16.1.0.tgz"; + sha512 = "FEPgiR2IoEC7fwCkAguMdWbiWwdAr6Zh1+mEFlgqTPAQDE6j/ji3elD8kuXwtdHHhC8U28YYOTZL6fCodlvRAw=="; }; }; "@netlify/cache-utils-1.0.7" = { @@ -4234,6 +4234,123 @@ let sha512 = "bvlvFAB9VU3wTYYEEUinsOeRFxZ/MmetffzHehSMEyP00kXakvrySq4XbC6G8u3wCDln34eOjKDt8uPYoqfuNQ=="; }; }; + "@netlify/local-functions-proxy-0.1.0" = { + name = "_at_netlify_slash_local-functions-proxy"; + packageName = "@netlify/local-functions-proxy"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/local-functions-proxy/-/local-functions-proxy-0.1.0.tgz"; + sha512 = "n4Y3LE3I6MrSCCLqLjY4VOVAi/uXdU35Kswd0eK0060Fla5huj+rKSnzu8GIERrvuRJMPi/AY7WFxB5mkFS8qw=="; + }; + }; + "@netlify/local-functions-proxy-darwin-arm64-0.1.0" = { + name = "_at_netlify_slash_local-functions-proxy-darwin-arm64"; + packageName = "@netlify/local-functions-proxy-darwin-arm64"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-darwin-arm64/-/local-functions-proxy-darwin-arm64-0.1.0.tgz"; + sha512 = "QsVber2F4H2zS2Oi31y226zeLkhWQrjy+9lYV4bsU0lZB9wHqrLGQNlOabqs6MWUQmWMqcDHLv31XMFpfhndnw=="; + }; + }; + "@netlify/local-functions-proxy-darwin-x64-0.1.0" = { + name = "_at_netlify_slash_local-functions-proxy-darwin-x64"; + packageName = "@netlify/local-functions-proxy-darwin-x64"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-darwin-x64/-/local-functions-proxy-darwin-x64-0.1.0.tgz"; + sha512 = "7Wb3ooicvRzHMErMWF+L+QG+rVy7iBEQ7b2GOzywL/VmeajatVk/D16v5b9adM2sX0KX1dyj3O9x2QLkDW2G7w=="; + }; + }; + "@netlify/local-functions-proxy-freebsd-arm64-0.1.0" = { + name = "_at_netlify_slash_local-functions-proxy-freebsd-arm64"; + packageName = "@netlify/local-functions-proxy-freebsd-arm64"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-freebsd-arm64/-/local-functions-proxy-freebsd-arm64-0.1.0.tgz"; + sha512 = "Keno1p1rvp5fiGEDZDm0fIOZTbcE1QwyqF5hgVSpD0bxitSAFOaXZwhcyo80x8qcMlBqQp9zWEJWu4zN1UiZMA=="; + }; + }; + "@netlify/local-functions-proxy-freebsd-x64-0.1.0" = { + name = "_at_netlify_slash_local-functions-proxy-freebsd-x64"; + packageName = "@netlify/local-functions-proxy-freebsd-x64"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-freebsd-x64/-/local-functions-proxy-freebsd-x64-0.1.0.tgz"; + sha512 = "kyEjE/aW/k7yD1+Oy28LLZjg6W8091HPCqUHzCk5GzT46zvR61vTPfeAEQwNaEL2uFHPJ3SauDNUZ1+U+FNlHA=="; + }; + }; + "@netlify/local-functions-proxy-linux-arm-0.1.0" = { + name = "_at_netlify_slash_local-functions-proxy-linux-arm"; + packageName = "@netlify/local-functions-proxy-linux-arm"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-arm/-/local-functions-proxy-linux-arm-0.1.0.tgz"; + sha512 = "Un4RIA3xaiWT1njCMgYJsYc1etksFuARz8suHtcoKadsEJ1XICh6OzJoCO3AdHCN1kMQlo3cVC/sHoAB2EyEqw=="; + }; + }; + "@netlify/local-functions-proxy-linux-arm64-0.1.0" = { + name = "_at_netlify_slash_local-functions-proxy-linux-arm64"; + packageName = "@netlify/local-functions-proxy-linux-arm64"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-arm64/-/local-functions-proxy-linux-arm64-0.1.0.tgz"; + sha512 = "ZDdy+5fgpHxFqpKghtJuMyyQ5tKWV+LJm6t8tKlXkAgC1n1GuqeWNP0JqHV8DSSShFHRaRNoBVpLoXJbtNIorQ=="; + }; + }; + "@netlify/local-functions-proxy-linux-ia32-0.1.0" = { + name = "_at_netlify_slash_local-functions-proxy-linux-ia32"; + packageName = "@netlify/local-functions-proxy-linux-ia32"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-ia32/-/local-functions-proxy-linux-ia32-0.1.0.tgz"; + sha512 = "vR1qlu341JKN91t0TPsYt2xC+ug8Bjp/WCqMtARmFT9jaL8NBTm6kiUh89QcGILYCo2hMNcYb9eih8y5D4N5Iw=="; + }; + }; + "@netlify/local-functions-proxy-linux-ppc64-0.1.0" = { + name = "_at_netlify_slash_local-functions-proxy-linux-ppc64"; + packageName = "@netlify/local-functions-proxy-linux-ppc64"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-ppc64/-/local-functions-proxy-linux-ppc64-0.1.0.tgz"; + sha512 = "pcAPe+PzFkNrHpICvrIHHfxk5KNIVo3GgZKoI67NXECCtVel48aXitvlcOwsodrejD8ruQkfbvossBQs9Deq8A=="; + }; + }; + "@netlify/local-functions-proxy-linux-x64-0.1.0" = { + name = "_at_netlify_slash_local-functions-proxy-linux-x64"; + packageName = "@netlify/local-functions-proxy-linux-x64"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-linux-x64/-/local-functions-proxy-linux-x64-0.1.0.tgz"; + sha512 = "sjlMLoKNJRJnq8Esk+GkxEk9CByDNouKdeQ+doiiQhYGRjLhKXZdXbaC137z2tm/vHhI/94Lg7mhCcGygitJpA=="; + }; + }; + "@netlify/local-functions-proxy-openbsd-x64-0.1.0" = { + name = "_at_netlify_slash_local-functions-proxy-openbsd-x64"; + packageName = "@netlify/local-functions-proxy-openbsd-x64"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-openbsd-x64/-/local-functions-proxy-openbsd-x64-0.1.0.tgz"; + sha512 = "Dn9wQfeAU6FvurFo8eJL2scahtVigQyAi6lpV+c4YLD87WUfmiQ/mVgB7dfYB9zMiq5GO/iXbcK6wWjFyAZ6Aw=="; + }; + }; + "@netlify/local-functions-proxy-win32-ia32-0.1.0" = { + name = "_at_netlify_slash_local-functions-proxy-win32-ia32"; + packageName = "@netlify/local-functions-proxy-win32-ia32"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-win32-ia32/-/local-functions-proxy-win32-ia32-0.1.0.tgz"; + sha512 = "LRz6UZpgS0UzB5IKgOvBnVNkpBcnzRfT4YBBSBL31fucJ1J2c0zGJIUTqbFdS8eBLOS9Npq2qUT7qlnrgAWyMw=="; + }; + }; + "@netlify/local-functions-proxy-win32-x64-0.1.0" = { + name = "_at_netlify_slash_local-functions-proxy-win32-x64"; + packageName = "@netlify/local-functions-proxy-win32-x64"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/local-functions-proxy-win32-x64/-/local-functions-proxy-win32-x64-0.1.0.tgz"; + sha512 = "YYzVpBPsAiup/Jg+kCAi0/EsV80BMF6JkQ3/2JjJhUqRuEG99THA+HwrFpsQOpOnr3niJBY93YrQymnJPgrk3A=="; + }; + }; "@netlify/open-api-2.5.0" = { name = "_at_netlify_slash_open-api"; packageName = "@netlify/open-api"; @@ -4639,13 +4756,13 @@ let sha512 = "SWTdXsVheRmlotWNjKzPOb6Js6tjSqA2a8z9+glDJng0Aqjzti8MEWOtuT8ZSu6wHnci7LZNuarE87+WJBG4vg=="; }; }; - "@octokit/openapi-types-9.0.0" = { + "@octokit/openapi-types-9.1.0" = { name = "_at_octokit_slash_openapi-types"; packageName = "@octokit/openapi-types"; - version = "9.0.0"; + version = "9.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-9.0.0.tgz"; - sha512 = "GSpv5VUFqarOXZl6uWPsDnjChkKCxnaMALmQhzvCWGiMxONQxX7ZwlomCMS+wB1KqxLPCA5n6gYt016oEMkHmQ=="; + url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-9.1.0.tgz"; + sha512 = "XBP03pG4XuTU+VgeJM1ozRdmZJerMG4tk6wA+raFKycC4qV9jtD2UQroAg9bAcmI3Q0zWvifeDGtPqsFjMzkLg=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -4675,13 +4792,13 @@ let sha512 = "mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA=="; }; }; - "@octokit/plugin-rest-endpoint-methods-5.4.2" = { + "@octokit/plugin-rest-endpoint-methods-5.5.0" = { name = "_at_octokit_slash_plugin-rest-endpoint-methods"; packageName = "@octokit/plugin-rest-endpoint-methods"; - version = "5.4.2"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.4.2.tgz"; - sha512 = "imNDDvUMy9YzECcP6zTcKNjwutSwqCYGMZjLPnBHF0kdb3V9URrHWmalD0ZvNEYjwbpm2zw8RPewj3ebCpMBRw=="; + url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.5.0.tgz"; + sha512 = "v4dNoHF8cXNx7C67yQx7oarHs5Wg2IiafWvp/ULkNcCOuXgQdBOkJtwidpYqPiRPUw4uHDkI6Tgfje+nXB+Deg=="; }; }; "@octokit/request-5.6.0" = { @@ -4702,22 +4819,22 @@ let sha512 = "1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg=="; }; }; - "@octokit/rest-18.6.8" = { + "@octokit/rest-18.7.0" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; - version = "18.6.8"; + version = "18.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.6.8.tgz"; - sha512 = "n2aT0mJL9N/idCPmnBynCino1qNScfRHvr8OeskQdBNhUYAMc7cxoc8KLlv1DMWxlZUNhed+5kVdu7majVdVag=="; + url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.7.0.tgz"; + sha512 = "8K8BJFyPFRSfnwu+aSbdjU5w3EtxC33PkDlEi5tyVTYC+t4n7gaqygRg5ajJLCpb/ZzVaXXFJXC9OxQ9TvFRAw=="; }; }; - "@octokit/types-6.19.1" = { + "@octokit/types-6.21.0" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "6.19.1"; + version = "6.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-6.19.1.tgz"; - sha512 = "hMI2EokQzMG8ABWcnvcrabqQFuFHqUdN0HUOG4DPTaOtnf/jqhzhK1SHOGu5vDlI/x+hWJ60e28VxB7QhOP0CQ=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-6.21.0.tgz"; + sha512 = "VPSxn9uhCoOUMpxCsOAQhf8DgIx+uzFjZRYDiZS5+TvrKaEwBrWkjr/5NmUVvPbW6xdPC2n3yL3XCnoxa4rxvg=="; }; }; "@open-policy-agent/opa-wasm-1.2.0" = { @@ -5557,13 +5674,13 @@ let sha512 = "cl5uPaGg72z0sCUpF0zsOhwYYUV72Gxc1FwFfxltO8hSvMeFDvwD7JrNE4kHcIcKRjwPGbSH0fdVPUpErZ8Mog=="; }; }; - "@serverless/utils-5.5.0" = { + "@serverless/utils-5.6.0" = { name = "_at_serverless_slash_utils"; packageName = "@serverless/utils"; - version = "5.5.0"; + version = "5.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils/-/utils-5.5.0.tgz"; - sha512 = "cn1eoSla6/hbytPgwh3tiUCeBjVBHt3nKgFwYtF0Aj3B1V+qaBMLOcXmXop+WHhWUil8rP4R9HJ4buR5BgLYWw=="; + url = "https://registry.npmjs.org/@serverless/utils/-/utils-5.6.0.tgz"; + sha512 = "R3mb6DlPwrlo49fwQNz3YTQb2XJCxVui+s/olVBSdAh82fi8EbbjgkZkaLKB9ES7lV2MIr3jqrIWjYyGE/2Bgw=="; }; }; "@serverless/utils-china-1.1.4" = { @@ -11263,13 +11380,13 @@ let sha512 = "tbMZ/Y2rRo6R6TTBODJXTiil+MXaoT6Qzotws3yvI1IWGpYxKo7N/3L06XB8ul8tCG0TigxIOY70SMICM70Ppg=="; }; }; - "aws-sdk-2.950.0" = { + "aws-sdk-2.951.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.950.0"; + version = "2.951.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.950.0.tgz"; - sha512 = "iFC5fKLuFLEV27xeKmxDHDZzIDj4upm5+Ts3NpYYRbwPlOG0nE0gZzf9fRYkLkLgTr0TQq26CbKorgeo+6ailw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.951.0.tgz"; + sha512 = "YPqhdESUzd4+pSuGJcfMnG1qNVbmZjnmsa85Z9jofR1ilIpuV31onIiFHv8iubM59ETok/+zy3QOmxRSLYzFmQ=="; }; }; "aws-sign2-0.6.0" = { @@ -34309,13 +34426,13 @@ let sha512 = "dD2ga5gLcQhsq1yNoQdy1MU4x4z7YnXM5bcG9SdQuiNr5KKuAmXixH1Mggwdah5o7EfholFbcNDPSVA6BIfaug=="; }; }; - "katex-0.13.11" = { + "katex-0.13.13" = { name = "katex"; packageName = "katex"; - version = "0.13.11"; + version = "0.13.13"; src = fetchurl { - url = "https://registry.npmjs.org/katex/-/katex-0.13.11.tgz"; - sha512 = "yJBHVIgwlAaapzlbvTpVF/ZOs8UkTj/sd46Fl8+qAf2/UiituPYVeapVD8ADZtqyRg/qNWUKt7gJoyYVWLrcXw=="; + url = "https://registry.npmjs.org/katex/-/katex-0.13.13.tgz"; + sha512 = "cCMcil4jwMm7behpXGiQfXJA29sko/Gd/26iCsr53Dv5Jn2iHbHyEb14dm9uVrIijUXx6Zz1WhlFhHE6DckvkQ=="; }; }; "keep-alive-agent-0.0.1" = { @@ -45985,13 +46102,13 @@ let sha512 = "40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw=="; }; }; - "pnp-webpack-plugin-1.6.4" = { + "pnp-webpack-plugin-1.7.0" = { name = "pnp-webpack-plugin"; packageName = "pnp-webpack-plugin"; - version = "1.6.4"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz"; - sha512 = "7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg=="; + url = "https://registry.npmjs.org/pnp-webpack-plugin/-/pnp-webpack-plugin-1.7.0.tgz"; + sha512 = "2Rb3vm+EXble/sMXNSu6eoBx8e79gKqhNq9F5ZWW6ERNCTE/Q0wQNne5541tE5vKjfM8hpNCYL+LGc1YTfI0dg=="; }; }; "polished-4.1.3" = { @@ -46103,13 +46220,13 @@ let sha512 = "/tZY0PXExXXnNhKv3TOvZAOUYRyuqcCbBm2c17YMDK0PlVII3K7/LKdt3ScHL+hhouddjUWi+1sKDf9xXW+8YA=="; }; }; - "postcss-8.3.5" = { + "postcss-8.3.6" = { name = "postcss"; packageName = "postcss"; - version = "8.3.5"; + version = "8.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.3.5.tgz"; - sha512 = "NxTuJocUhYGsMiMFHDUkmjSKT3EdH4/WbGF6GCi1NDGk+vbcUTun4fpbOqaPtD8IIsztA2ilZm2DhYCuyN58gA=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.3.6.tgz"; + sha512 = "wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A=="; }; }; "postcss-calc-7.0.5" = { @@ -51125,13 +51242,13 @@ let sha512 = "W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q=="; }; }; - "resolve-alpn-1.1.2" = { + "resolve-alpn-1.2.0" = { name = "resolve-alpn"; packageName = "resolve-alpn"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.1.2.tgz"; - sha512 = "8OyfzhAtA32LVUsJSke3auIyINcwdh5l3cvYKdKO0nvsYSKuiLfTM5i78PJswFPT8y6cPW+L1v6/hE95chcpDA=="; + url = "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.0.tgz"; + sha512 = "e4FNQs+9cINYMO5NMFc6kOUCdohjqFPSgMuwuZAOUWqrfWsen+Yjy5qZFkV5K7VO7tFSLKcUL97olkED7sCBHA=="; }; }; "resolve-cwd-2.0.0" = { @@ -51998,6 +52115,15 @@ let sha1 = "182a991208fc1ab5214443eb250fc8f53b4bc9ea"; }; }; + "sade-1.7.4" = { + name = "sade"; + packageName = "sade"; + version = "1.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sade/-/sade-1.7.4.tgz"; + sha512 = "y5yauMD93rX840MwUJr7C1ysLFBgMspsdTo4UVrDg3fXDvtwOyIqykhVAAm6fk/3au77773itJStObgK+LKaiA=="; + }; + }; "safe-buffer-5.0.1" = { name = "safe-buffer"; packageName = "safe-buffer"; @@ -68954,7 +69080,7 @@ in sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" - (sources."aws-sdk-2.950.0" // { + (sources."aws-sdk-2.951.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -77382,7 +77508,7 @@ in sources."request-2.88.2" sources."require-directory-2.1.1" sources."resolve-1.20.0" - sources."resolve-alpn-1.1.2" + sources."resolve-alpn-1.2.0" sources."resolve-dir-1.0.1" sources."resolve-package-1.0.1" sources."responselike-2.0.0" @@ -77806,7 +77932,7 @@ in }) sources."redent-3.0.0" sources."resolve-1.20.0" - sources."resolve-alpn-1.1.2" + sources."resolve-alpn-1.2.0" sources."resolve-from-3.0.0" sources."responselike-2.0.0" sources."restore-cursor-3.1.0" @@ -81555,7 +81681,7 @@ in }) sources."plist-3.0.2" sources."pngjs-3.4.0" - sources."pnp-webpack-plugin-1.6.4" + sources."pnp-webpack-plugin-1.7.0" (sources."portfinder-1.0.28" // { dependencies = [ sources."async-2.6.3" @@ -81811,7 +81937,7 @@ in }) sources."requires-port-1.0.0" sources."resolve-1.20.0" - sources."resolve-alpn-1.1.2" + sources."resolve-alpn-1.2.0" (sources."resolve-cwd-2.0.0" // { dependencies = [ sources."resolve-from-3.0.0" @@ -89774,7 +89900,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.950.0" // { + (sources."aws-sdk-2.951.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -90061,7 +90187,7 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-4.0.0" sources."jsprim-1.4.1" - sources."katex-0.13.11" + sources."katex-0.13.13" sources."keytar-7.7.0" sources."khroma-1.4.1" sources."klaw-1.3.1" @@ -91768,10 +91894,10 @@ in katex = nodeEnv.buildNodePackage { name = "katex"; packageName = "katex"; - version = "0.13.11"; + version = "0.13.13"; src = fetchurl { - url = "https://registry.npmjs.org/katex/-/katex-0.13.11.tgz"; - sha512 = "yJBHVIgwlAaapzlbvTpVF/ZOs8UkTj/sd46Fl8+qAf2/UiituPYVeapVD8ADZtqyRg/qNWUKt7gJoyYVWLrcXw=="; + url = "https://registry.npmjs.org/katex/-/katex-0.13.13.tgz"; + sha512 = "cCMcil4jwMm7behpXGiQfXJA29sko/Gd/26iCsr53Dv5Jn2iHbHyEb14dm9uVrIijUXx6Zz1WhlFhHE6DckvkQ=="; }; dependencies = [ sources."commander-6.2.1" @@ -92942,19 +93068,19 @@ in ]; }) sources."@octokit/graphql-4.6.4" - sources."@octokit/openapi-types-9.0.0" + sources."@octokit/openapi-types-9.1.0" sources."@octokit/plugin-enterprise-rest-6.0.1" sources."@octokit/plugin-paginate-rest-2.14.0" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.4.2" + sources."@octokit/plugin-rest-endpoint-methods-5.5.0" (sources."@octokit/request-5.6.0" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.6.8" - sources."@octokit/types-6.19.1" + sources."@octokit/rest-18.7.0" + sources."@octokit/types-6.21.0" sources."@tootallnate/once-1.1.2" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" @@ -96813,10 +96939,10 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "5.0.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-5.0.0.tgz"; - sha512 = "bOXs3BRJ/3wC9aAIMw3r7IwQFDSDz+BG69nERTH11YqFLP45SLpro1lhGUIY4M28AdiX6DbHdC3zBZb2+4QONw=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-5.2.0.tgz"; + sha512 = "Jwy74SaN5rM4xTE2QSZijF0qN1a/ZGh1PJWUmzmVFX1RnEgA1QMZ7MVHW04UXxZ3igx+G03GGzC071+FRLKT6g=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -96950,7 +97076,7 @@ in sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-16.0.1" // { + (sources."@netlify/build-16.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."boxen-4.2.0" @@ -97001,6 +97127,19 @@ in sources."to-regex-range-5.0.1" ]; }) + sources."@netlify/local-functions-proxy-0.1.0" + sources."@netlify/local-functions-proxy-darwin-arm64-0.1.0" + sources."@netlify/local-functions-proxy-darwin-x64-0.1.0" + sources."@netlify/local-functions-proxy-freebsd-arm64-0.1.0" + sources."@netlify/local-functions-proxy-freebsd-x64-0.1.0" + sources."@netlify/local-functions-proxy-linux-arm-0.1.0" + sources."@netlify/local-functions-proxy-linux-arm64-0.1.0" + sources."@netlify/local-functions-proxy-linux-ia32-0.1.0" + sources."@netlify/local-functions-proxy-linux-ppc64-0.1.0" + sources."@netlify/local-functions-proxy-linux-x64-0.1.0" + sources."@netlify/local-functions-proxy-openbsd-x64-0.1.0" + sources."@netlify/local-functions-proxy-win32-ia32-0.1.0" + sources."@netlify/local-functions-proxy-win32-x64-0.1.0" sources."@netlify/open-api-2.5.0" (sources."@netlify/plugin-edge-handlers-1.11.22" // { dependencies = [ @@ -97141,18 +97280,18 @@ in ]; }) sources."@octokit/graphql-4.6.4" - sources."@octokit/openapi-types-9.0.0" + sources."@octokit/openapi-types-9.1.0" sources."@octokit/plugin-paginate-rest-2.14.0" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.4.2" + sources."@octokit/plugin-rest-endpoint-methods-5.5.0" (sources."@octokit/request-5.6.0" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.6.8" - sources."@octokit/types-6.19.1" + sources."@octokit/rest-18.7.0" + sources."@octokit/types-6.21.0" sources."@rollup/plugin-babel-5.3.0" (sources."@rollup/plugin-commonjs-18.1.0" // { dependencies = [ @@ -98344,7 +98483,7 @@ in ]; }) sources."posix-character-classes-0.1.1" - sources."postcss-8.3.5" + sources."postcss-8.3.6" sources."postcss-values-parser-2.0.1" sources."precinct-8.1.0" sources."precond-0.2.3" @@ -99635,7 +99774,7 @@ in sources."regenerator-runtime-0.13.8" sources."reinterval-1.1.0" sources."require-from-string-2.0.2" - sources."resolve-alpn-1.1.2" + sources."resolve-alpn-1.2.0" sources."responselike-2.0.0" sources."retry-0.6.1" sources."rimraf-3.0.2" @@ -103730,10 +103869,10 @@ in postcss = nodeEnv.buildNodePackage { name = "postcss"; packageName = "postcss"; - version = "8.3.5"; + version = "8.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.3.5.tgz"; - sha512 = "NxTuJocUhYGsMiMFHDUkmjSKT3EdH4/WbGF6GCi1NDGk+vbcUTun4fpbOqaPtD8IIsztA2ilZm2DhYCuyN58gA=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.3.6.tgz"; + sha512 = "wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A=="; }; dependencies = [ sources."colorette-1.2.2" @@ -107815,7 +107954,7 @@ in ]; }) sources."@serverless/template-1.1.4" - (sources."@serverless/utils-5.5.0" // { + (sources."@serverless/utils-5.6.0" // { dependencies = [ sources."get-stream-6.0.1" sources."jwt-decode-3.1.2" @@ -107894,7 +108033,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.950.0" // { + (sources."aws-sdk-2.951.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -108417,7 +108556,7 @@ in }) sources."request-promise-core-1.1.4" sources."request-promise-native-1.0.9" - sources."resolve-alpn-1.1.2" + sources."resolve-alpn-1.2.0" sources."responselike-1.0.2" sources."restore-cursor-3.1.0" sources."retry-0.10.1" @@ -109756,7 +109895,7 @@ in sources."readable-stream-3.6.0" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" - sources."resolve-alpn-1.1.2" + sources."resolve-alpn-1.2.0" sources."responselike-2.0.0" sources."restore-cursor-3.1.0" sources."reusify-1.0.4" @@ -111276,7 +111415,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.950.0" // { + (sources."aws-sdk-2.951.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -112467,6 +112606,74 @@ in bypassCache = true; reconstructLock = true; }; + svelte-check = nodeEnv.buildNodePackage { + name = "svelte-check"; + packageName = "svelte-check"; + version = "2.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/svelte-check/-/svelte-check-2.2.3.tgz"; + sha512 = "mqe/lgF0Ew+54YI4bPW5D26sMolh+MofQiz41U0c1GvUsP3bKsLLH0mjs4P4Xc+ajUFJtvGBo5PWaf0dd46sIQ=="; + }; + dependencies = [ + sources."@types/node-16.4.0" + sources."@types/pug-2.0.5" + sources."@types/sass-1.16.1" + sources."ansi-styles-4.3.0" + sources."anymatch-3.1.2" + sources."balanced-match-1.0.2" + sources."binary-extensions-2.2.0" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."callsites-3.1.0" + sources."chalk-4.1.1" + sources."chokidar-3.5.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."concat-map-0.0.1" + sources."detect-indent-6.1.0" + sources."fill-range-7.0.1" + sources."fs.realpath-1.0.0" + sources."fsevents-2.3.2" + sources."glob-7.1.7" + sources."glob-parent-5.1.2" + sources."has-flag-4.0.0" + sources."import-fresh-3.3.0" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."is-binary-path-2.1.0" + sources."is-extglob-2.1.1" + sources."is-glob-4.0.1" + sources."is-number-7.0.0" + sources."min-indent-1.0.1" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + sources."mri-1.1.6" + sources."normalize-path-3.0.0" + sources."once-1.4.0" + sources."parent-module-1.0.1" + sources."path-is-absolute-1.0.1" + sources."picomatch-2.3.0" + sources."readdirp-3.6.0" + sources."resolve-from-4.0.0" + sources."sade-1.7.4" + sources."source-map-0.7.3" + sources."strip-indent-3.0.0" + sources."supports-color-7.2.0" + sources."svelte-preprocess-4.7.4" + sources."to-regex-range-5.0.1" + sources."typescript-4.3.5" + sources."wrappy-1.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Svelte Code Checker Terminal Interface"; + homepage = "https://github.com/sveltejs/language-tools#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; svgo = nodeEnv.buildNodePackage { name = "svgo"; packageName = "svgo"; @@ -114880,7 +115087,7 @@ in sources."uuid-3.4.0" ]; }) - sources."resolve-alpn-1.1.2" + sources."resolve-alpn-1.2.0" sources."responselike-2.0.0" sources."rimraf-2.7.1" sources."safe-buffer-5.2.1" From 503dc62d0468e303758a720c8d650075a48956ec Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 22 Jul 2021 10:34:59 +0200 Subject: [PATCH 127/235] chromiumDev: 93.0.4573.0 -> 93.0.4577.8 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 1064356be542..a6df334a97de 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,9 +31,9 @@ } }, "dev": { - "version": "93.0.4573.0", - "sha256": "0knks0padlcqhwnjpg32d875nycznlbd228sx8qwnylg1ilrzqck", - "sha256bin64": "1kxbsdcc0gh2pllz3szmnjswxqbw9sr457pq8aafpgk9rdchikg1", + "version": "93.0.4577.8", + "sha256": "1x6i5bmcnj8bkpcb9gcyd1m9nzpq206yyprxrnpak117k7abr2b1", + "sha256bin64": "0qjfb9jxr2gmwb1dsvl6yzz06vsjny2l3icrsdcm0pl6r6davk2w", "deps": { "gn": { "version": "2021-07-08", From 9bb59cf6b6c6cd16b9ec32072883d61a7ef37366 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 18 Jul 2021 18:49:17 +0200 Subject: [PATCH 128/235] fcft: 2.4.2 -> 2.4.3 https://codeberg.org/dnkl/fcft/releases/tag/2.4.3 --- pkgs/development/libraries/fcft/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/fcft/default.nix b/pkgs/development/libraries/fcft/default.nix index c413cf277c8b..b61505f60e6a 100644 --- a/pkgs/development/libraries/fcft/default.nix +++ b/pkgs/development/libraries/fcft/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "fcft"; - version = "2.4.2"; + version = "2.4.3"; src = fetchzip { url = "https://codeberg.org/dnkl/fcft/archive/${version}.tar.gz"; - sha256 = "01zvc8519fcg14nmcx3iqap9jnspcnr6pvlr59ipqxs0jprnrxl2"; + sha256 = "0hxvd6xbvgq1rk8851gswffmvh3fv41lyvz4fhwzln7m12759yw8"; }; depsBuildBuild = [ pkg-config ]; From cdeb36d8314cc2cc90133bcd7b2dd3502ca7d4bf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 22 Jul 2021 11:03:06 +0200 Subject: [PATCH 129/235] python3Packages.env-canada: 0.4.0 -> 0.4.1 --- pkgs/development/python-modules/env-canada/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix index 3beb01e3b13e..22894ab9f2a6 100644 --- a/pkgs/development/python-modules/env-canada/default.nix +++ b/pkgs/development/python-modules/env-canada/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "env-canada"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "michaeldavie"; repo = "env_canada"; rev = "v${version}"; - sha256 = "0y4yjzmg6ns7a13j1cxqvrff4fd6k97cpc1xjwqrwp7gq49rzhy7"; + sha256 = "0v1wmjvi05i6mjh6yxqigbf2spf7842198yp98f7h0nyfjmz96hn"; }; propagatedBuildInputs = [ @@ -42,6 +42,7 @@ buildPythonPackage rec { "test_get_latest_frame" "test_get_loop" "test_get_ec_sites" + "test_ecradar" ]; pythonImportsCheck = [ "env_canada" ]; From e3fd13a5a60ebfdc176121e8f368f52ca84b06f0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 22 Jul 2021 11:22:27 +0200 Subject: [PATCH 130/235] python3Packages.twitterapi: 2.7.4 -> 2.7.5 --- pkgs/development/python-modules/twitterapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twitterapi/default.nix b/pkgs/development/python-modules/twitterapi/default.nix index 166e42ced821..cf3ec977d0ea 100644 --- a/pkgs/development/python-modules/twitterapi/default.nix +++ b/pkgs/development/python-modules/twitterapi/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "twitterapi"; - version = "2.7.4"; + version = "2.7.5"; src = fetchFromGitHub { owner = "geduldig"; repo = "TwitterAPI"; rev = "v${version}"; - sha256 = "sha256-HDPRpM1LDTtUbldzfCrsdh/GpbzNCVVUVGwohyMe/YE="; + sha256 = "1s5q3gzd69syk8khlyy7ap8gpymvhgqrlv3vp6vdmwnaafjvvyy3"; }; propagatedBuildInputs = [ From b84ed601665d75f852aae47255687e663dfd0715 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 22 Jul 2021 11:28:59 +0200 Subject: [PATCH 131/235] python3Packages.requests-cache: 0.7.1 -> 0.7.2 --- pkgs/development/python-modules/requests-cache/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/requests-cache/default.nix b/pkgs/development/python-modules/requests-cache/default.nix index 64dafa7bca29..ce1dfc366f45 100644 --- a/pkgs/development/python-modules/requests-cache/default.nix +++ b/pkgs/development/python-modules/requests-cache/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "requests-cache"; - version = "0.7.1"; + version = "0.7.2"; disabled = pythonOlder "3.6"; format = "pyproject"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "reclosedev"; repo = "requests-cache"; rev = "v${version}"; - sha256 = "sha256-Ai/8l2p3S/NE+uyz3eQ+rJSD/xYCsXf89aYijINQ18I="; + sha256 = "055dfyjm8dqwr62v86lyvq4r04692gmvlgp86218vwvzgm7p3p2c"; }; nativeBuildInputs = [ From 30f1736583a9d5f8feb978625ea51ed8fc57aef8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 22 Jul 2021 11:31:36 +0200 Subject: [PATCH 132/235] tfsec: 0.50.3 -> 0.50.7 --- pkgs/development/tools/analysis/tfsec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 661025a5f573..7800f4c1eda6 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.50.3"; + version = "0.50.7"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "1hah13icvwnaim628q6q88wbipwz1gwgnxgr3i8cnky9cx4qd3ig"; + sha256 = "0rklv9wj8gf95ar345k3ghpg9hxjpbsi693239wdfarzbsjrlcla"; }; goPackagePath = "github.com/aquasecurity/tfsec"; From eaa5a3dc36a58abb63db3afd9d3c862d27fde6b4 Mon Sep 17 00:00:00 2001 From: Ethan Edwards Date: Thu, 22 Jul 2021 05:35:56 -0400 Subject: [PATCH 133/235] guile-git: 0.5.1 -> 0.5.2 --- pkgs/development/guile-modules/guile-git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/guile-modules/guile-git/default.nix b/pkgs/development/guile-modules/guile-git/default.nix index 254afae0cc4f..0b3dfefcbe8c 100644 --- a/pkgs/development/guile-modules/guile-git/default.nix +++ b/pkgs/development/guile-modules/guile-git/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "guile-git"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitLab { owner = "guile-git"; repo = pname; rev = "v${version}"; - sha256 = "7Cnuyk9xAPTvz9R44O3lvKDrT6tUQui7YzxIoqhRfPQ="; + sha256 = "x6apF9fmwzrkyzAexKjClOTFrbE31+fVhSLyFZkKRYU="; }; postConfigure = '' From db139427824916f6e6a03fd895410f763b4b8aff Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 22 Jul 2021 11:39:52 +0200 Subject: [PATCH 134/235] python3Packages.questionary: 1.9.0 -> 1.10.0 --- .../python-modules/questionary/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/questionary/default.nix b/pkgs/development/python-modules/questionary/default.nix index ecb33f6adb15..d7f93b3a47e5 100644 --- a/pkgs/development/python-modules/questionary/default.nix +++ b/pkgs/development/python-modules/questionary/default.nix @@ -9,19 +9,23 @@ buildPythonPackage rec { pname = "questionary"; - version = "1.9.0"; + version = "1.10.0"; format = "pyproject"; src = fetchFromGitHub { owner = "tmbo"; repo = pname; rev = version; - sha256 = "1x748bz7l2r48031dj6vr6jvvac28pv6vx1bina4lz60h1qac1kf"; + sha256 = "14k24fq2nmk90iv0k7pnmmdhmk8z261397wg52sfcsccyhpdw3i7"; }; - nativeBuildInputs = [ poetry ]; + nativeBuildInputs = [ + poetry + ]; - propagatedBuildInputs = [ prompt_toolkit ]; + propagatedBuildInputs = [ + prompt_toolkit + ]; checkInputs = [ pytest-cov @@ -32,7 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to build command line user prompts"; - homepage = "https://github.com/bachya/regenmaschine"; + homepage = "https://github.com/tmbo/questionary"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From 3ee9b99200bcbdb4e3fa43203ce16a0d7deaf9c9 Mon Sep 17 00:00:00 2001 From: Danil <6057430gu@gmail.com> Date: Thu, 22 Jul 2021 16:59:36 +0700 Subject: [PATCH 135/235] github-desktop: init at 2.9.0 (#130774) --- .../github-desktop/default.nix | 73 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 75 insertions(+) create mode 100644 pkgs/applications/version-management/github-desktop/default.nix diff --git a/pkgs/applications/version-management/github-desktop/default.nix b/pkgs/applications/version-management/github-desktop/default.nix new file mode 100644 index 000000000000..650ec73619a6 --- /dev/null +++ b/pkgs/applications/version-management/github-desktop/default.nix @@ -0,0 +1,73 @@ +{ stdenv +, lib +, fetchurl +, autoPatchelfHook +, wrapGAppsHook +, gnome +, libsecret +, git +, curl +, nss +, nspr +, xorg +, libdrm +, alsa-lib +, cups +, mesa +, systemd +}: + +stdenv.mkDerivation rec { + pname = "github-desktop"; + version = "2.9.0"; + + src = fetchurl { + url = "https://github.com/shiftkey/desktop/releases/download/release-${version}-linux4/GitHubDesktop-linux-${version}-linux4.deb"; + sha256 = "sha256-kyzvvzSCfo6uaTA0Z1yqAUjr4A5p3OuIpaVQv64WW7M"; + }; + + nativeBuildInputs = [ + autoPatchelfHook + wrapGAppsHook + ]; + + buildInputs = [ + gnome.gnome-keyring + xorg.libXdamage + xorg.libX11 + libsecret + git + curl + nss + nspr + libdrm + alsa-lib + cups + mesa + ]; + + unpackPhase = '' + mkdir -p $TMP/${pname} $out/{opt,bin} + cp $src $TMP/${pname}.deb + ar vx ${pname}.deb + tar --no-overwrite-dir -xvf data.tar.xz -C $TMP/${pname}/ + ''; + + installPhase = '' + cp -R $TMP/${pname}/usr/share $out/ + cp -R $TMP/${pname}/usr/lib/${pname}/* $out/opt/ + ln -sf $out/opt/${pname} $out/bin/${pname} + ''; + + runtimeDependencies = [ + (lib.getLib systemd) + ]; + + meta = with lib; { + description = "GUI for managing Git and GitHub."; + homepage = "https://desktop.github.com/"; + license = licenses.mit; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c76aeba5fcc7..c15ef4e44140 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1562,6 +1562,8 @@ in github-commenter = callPackage ../development/tools/github-commenter { }; + github-desktop = callPackage ../applications/version-management/github-desktop { }; + github-to-sqlite = with python3Packages; toPythonApplication github-to-sqlite; gitless = callPackage ../applications/version-management/gitless { python = python3; }; From 42721bad69a1c95ccad120af06bee3456c1c1e9d Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Thu, 22 Jul 2021 11:47:06 +0200 Subject: [PATCH 136/235] vapoursynth: R53 -> R54 --- pkgs/development/libraries/vapoursynth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index 3b6362f7396c..37d82b0b4bd9 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -10,13 +10,13 @@ with lib; stdenv.mkDerivation rec { pname = "vapoursynth"; - version = "R53"; + version = "R54"; src = fetchFromGitHub { owner = "vapoursynth"; repo = "vapoursynth"; rev = version; - sha256 = "0qcsfkpkry0cmvi60khjwvfz4fqhy23nqmn4pb9qrwll26sn9dcr"; + sha256 = "01jym2rq28j0g792yagk9dvm411gwmk6qgj9rgrg7ckpxmw27w2s"; }; patches = [ From 8c1f8ac915ec379872a88b2613718723dc7f6c35 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 22 Jul 2021 11:55:20 +0200 Subject: [PATCH 137/235] signal-desktop: 5.9.0 -> 5.10.0 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index daf1c476e67e..a46649acb182 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -28,7 +28,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.9.0"; # Please backport all updates to the stable channel. + version = "5.10.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1pmyi9b0b5h6mi6dwml41x4igy8rfpsv6j67izh78m5gla8wp34h"; + sha256 = "049i4nypqr6lx8f3w32pia6cfb3pmqmvasxjb5zhp6mxb3vn7wz3"; }; nativeBuildInputs = [ From 13140ece61fb07a31dc508596359602bf1a8c3b0 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Mon, 19 Jul 2021 16:17:47 +0200 Subject: [PATCH 138/235] python3Packages.sphinx-copybutton: init at 0.4.0 --- .../sphinx-copybutton/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/sphinx-copybutton/default.nix diff --git a/pkgs/development/python-modules/sphinx-copybutton/default.nix b/pkgs/development/python-modules/sphinx-copybutton/default.nix new file mode 100644 index 000000000000..8d408d300c71 --- /dev/null +++ b/pkgs/development/python-modules/sphinx-copybutton/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, sphinx +}: + +buildPythonPackage rec { + pname = "sphinx-copybutton"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "executablebooks"; + repo = "sphinx-copybutton"; + rev = "v${version}"; + sha256 = "sha256-vrEIvQeP7AMXSme1PBp0ox5k8Q1rz+1cbHIO+o17Jqc="; + fetchSubmodules = true; + }; + + propagatedBuildInputs = [ + sphinx + ]; + + doCheck = false; # no tests + + pythonImportsCheck = [ "sphinx_copybutton" ]; + + meta = with lib; { + description = "A small sphinx extension to add a \"copy\" button to code blocks"; + homepage = "https://github.com/executablebooks/sphinx-copybutton"; + license = licenses.mit; + maintainers = with maintainers; [ Luflosi ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 172fdc4b6681..0286ce594068 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8234,6 +8234,8 @@ in { sphinx-autobuild = callPackage ../development/python-modules/sphinx-autobuild { }; + sphinx-copybutton = callPackage ../development/python-modules/sphinx-copybutton { }; + sphinx-jinja = callPackage ../development/python-modules/sphinx-jinja { }; sphinx-markdown-parser = callPackage ../development/python-modules/sphinx-markdown-parser { }; From cafa8febea5952e5f9429c7db3f4c6e0f545b0d0 Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Thu, 22 Jul 2021 07:09:11 -0400 Subject: [PATCH 139/235] pyls-flake8: init at 0.4.0 --- .../python-modules/pyls-flake8/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/pyls-flake8/default.nix diff --git a/pkgs/development/python-modules/pyls-flake8/default.nix b/pkgs/development/python-modules/pyls-flake8/default.nix new file mode 100644 index 000000000000..495c54d58593 --- /dev/null +++ b/pkgs/development/python-modules/pyls-flake8/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flake8 +, python-lsp-server +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pyls-flake8"; + version = "0.4.0"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "emanspeaks"; + repo = "pyls-flake8"; + rev = "3df8606ad821100e64743f457c77c20170bde722"; + sha256 = "14wkmwh8mqr826vdzxhvhdwrnx2akzmnbv3ar391qs4imwqfjx3l"; + }; + + propagatedBuildInputs = [ flake8 python-lsp-server ]; + + meta = with lib; { + homepage = "https://github.com/emanspeaks/pyls-flake8"; + description = "A Flake8 plugin for the Python LSP Server."; + license = licenses.mit; + maintainers = with maintainers; [ cpcloud ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fd469440e8b6..702008cc9b3c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6181,6 +6181,8 @@ in { pyls-black = callPackage ../development/python-modules/pyls-black { }; + pyls-flake8 = callPackage ../development/python-modules/pyls-flake8 { }; + pyls-isort = callPackage ../development/python-modules/pyls-isort { }; pyls-mypy = callPackage ../development/python-modules/pyls-mypy { }; From d6e025edd1cb950a2db3f9c425d42c72f902e0e0 Mon Sep 17 00:00:00 2001 From: Angus Trau Date: Thu, 22 Jul 2021 21:13:26 +1000 Subject: [PATCH 140/235] python3Packages.pygame: enable test suite (#131011) Co-authored-by: Sandro --- .../development/python-modules/pygame/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index 333312d6aa0b..bcdce070c633 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -1,5 +1,6 @@ { lib, fetchPypi, buildPythonPackage, python, pkg-config, libX11 , SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, libpng, libjpeg, portmidi, freetype +, fontconfig }: buildPythonPackage rec { @@ -20,9 +21,6 @@ buildPythonPackage rec { portmidi libX11 freetype ]; - # Tests fail because of no audio device and display. - doCheck = false; - preConfigure = '' sed \ -e "s/origincdirs = .*/origincdirs = []/" \ @@ -39,9 +37,18 @@ buildPythonPackage rec { LOCALBASE=/ ${python.interpreter} buildconfig/config.py ''; + checkInputs = [ fontconfig ]; + + preCheck = '' + # No audio or video device in test environment + export SDL_VIDEODRIVER=dummy + export SDL_AUDIODRIVER=disk + export SDL_DISKAUDIOFILE=/dev/null + ''; + meta = with lib; { description = "Python library for games"; - homepage = "http://www.pygame.org/"; + homepage = "https://www.pygame.org/"; license = licenses.lgpl21Plus; platforms = platforms.linux; }; From e375b926722ff3dd77680b5c3b32a1375e408f1b Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Thu, 22 Jul 2021 07:23:03 -0400 Subject: [PATCH 141/235] python-lsp-black: init at 1.0.0 --- .../python-lsp-black/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/python-lsp-black/default.nix diff --git a/pkgs/development/python-modules/python-lsp-black/default.nix b/pkgs/development/python-modules/python-lsp-black/default.nix new file mode 100644 index 000000000000..3c18d291e37f --- /dev/null +++ b/pkgs/development/python-modules/python-lsp-black/default.nix @@ -0,0 +1,32 @@ +{ lib +, black +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, python-lsp-server +, pythonOlder +}: + +buildPythonPackage rec { + pname = "python-lsp-black"; + version = "1.0.0"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "python-lsp"; + repo = "python-lsp-black"; + rev = "v${version}"; + sha256 = "1blxhj70jxb9xfbd4dxqikd262n6dn9dw5qhyml5yvdwxbv0bybc"; + }; + + checkInputs = [ pytestCheckHook ]; + + propagatedBuildInputs = [ black python-lsp-server ]; + + meta = with lib; { + homepage = "https://github.com/python-lsp/python-lsp-black"; + description = "Black plugin for the Python LSP Server"; + license = licenses.mit; + maintainers = with maintainers; [ cpcloud ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fd469440e8b6..e6d32027fdcd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5410,6 +5410,8 @@ in { python-juicenet = callPackage ../development/python-modules/python-juicenet { }; + python-lsp-black = callPackage ../development/python-modules/python-lsp-black { }; + python-openems = callPackage ../development/python-modules/python-openems { }; python-openzwave-mqtt = callPackage ../development/python-modules/python-openzwave-mqtt { }; From 15320693cefc85e07998bbb62f7408dcb65df8fb Mon Sep 17 00:00:00 2001 From: Ilan Joselevich <56614642+Kranzes@users.noreply.github.com> Date: Thu, 22 Jul 2021 14:35:20 +0300 Subject: [PATCH 142/235] fdroidserver: 1.1.9 -> 2.0.3 (#129931) Co-authored-by: Sandro --- pkgs/development/tools/fdroidserver/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/fdroidserver/default.nix b/pkgs/development/tools/fdroidserver/default.nix index 2cc5e6b7ca5c..af851e252110 100644 --- a/pkgs/development/tools/fdroidserver/default.nix +++ b/pkgs/development/tools/fdroidserver/default.nix @@ -4,19 +4,19 @@ , lib }: python.pkgs.buildPythonApplication rec { - version = "1.1.9"; + version = "2.0.3"; pname = "fdroidserver"; src = fetchFromGitLab { owner = "fdroid"; repo = "fdroidserver"; rev = version; - sha256 = "098dcg8jdi4q1prfjmd2lbhcyzb8fmmfhbxhid4kqx8vcv7r0iql"; + sha256 = "sha256-/tX45t/DsWd0/R9VJJsqNjoOkgGIvqvq05YaVp0pLf0="; }; - patchPhase = '' + postPatch = '' substituteInPlace fdroidserver/common.py --replace "FDROID_PATH = os.path.realpath(os.path.join(os.path.dirname(__file__), '..'))" "FDROID_PATH = '$out/bin'" - substituteInPlace setup.py --replace "pyasn1-modules == 0.2.1" "pyasn1-modules" + substituteInPlace setup.py --replace "pyasn1-modules >= 0.2.1, < 0.3" "pyasn1-modules" ''; preConfigure = '' @@ -47,11 +47,14 @@ python.pkgs.buildPythonApplication rec { qrcode requests ruamel_yaml + yamllint ]; # no tests doCheck = false; + pythonImportsCheck = [ "fdroidserver" ]; + meta = with lib; { homepage = "https://f-droid.org"; description = "Server and tools for F-Droid, the Free Software repository system for Android"; From bcba72f8941c4439cebfaf7b9e83a6908f68fb0f Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 22 Jul 2021 13:54:42 +0200 Subject: [PATCH 143/235] anarchism: remove phases --- pkgs/data/documentation/anarchism/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/data/documentation/anarchism/default.nix b/pkgs/data/documentation/anarchism/default.nix index d0cda3da544c..b9cedffa1948 100644 --- a/pkgs/data/documentation/anarchism/default.nix +++ b/pkgs/data/documentation/anarchism/default.nix @@ -12,8 +12,6 @@ stdenv.mkDerivation rec { sha256 = "04ylk0y5b3jml2awmyz7m1hnymni8y1n83m0k6ychdh0px8frhm5"; }; - phases = [ "unpackPhase" "postPatch" "installPhase" ]; - postPatch = '' substituteInPlace debian/anarchism.desktop \ --replace "/usr/bin/xdg-open" "${xdg-utils}/bin/xdg-open" From e6c95888776fbd3b71bebf994b59cc46a2ddc224 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 22 Jul 2021 13:56:46 +0200 Subject: [PATCH 144/235] comic-neue: remove phases --- pkgs/data/fonts/comic-neue/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/data/fonts/comic-neue/default.nix b/pkgs/data/fonts/comic-neue/default.nix index df618aea8110..7485d435cb23 100644 --- a/pkgs/data/fonts/comic-neue/default.nix +++ b/pkgs/data/fonts/comic-neue/default.nix @@ -10,8 +10,6 @@ stdenv.mkDerivation rec { stripRoot = false; # because it comes with a __MACOSX directory }; - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' mkdir -pv $out/share/{doc/${pname}-${version},fonts/{opentype,truetype,WOFF,WOFF2}} cp -v ${pname}-${version}/{FONTLOG,OFL-FAQ,OFL}.txt $out/share/doc/ From 29eec21d13cefe5337dbcbf590b9974830620b8d Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 22 Jul 2021 14:04:25 +0200 Subject: [PATCH 145/235] iosevka-bin: deprecate phases --- pkgs/data/fonts/iosevka/bin.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index b399741f9333..27577047ecac 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ unzip ]; - phases = [ "unpackPhase" ]; + dontInstall = true; unpackPhase = '' mkdir -p $out/share/fonts From ce878a90966403a2603ac27ce84b400f0d73edfe Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 22 Jul 2021 14:44:00 +0200 Subject: [PATCH 146/235] meslo-lg: remove phases --- pkgs/data/fonts/meslo-lg/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/data/fonts/meslo-lg/default.nix b/pkgs/data/fonts/meslo-lg/default.nix index 7083b9e00313..a55fb65c56c2 100644 --- a/pkgs/data/fonts/meslo-lg/default.nix +++ b/pkgs/data/fonts/meslo-lg/default.nix @@ -21,7 +21,6 @@ stdenv.mkDerivation rec { sourceRoot = "."; - phases = [ "unpackPhase" "installPhase" ]; unpackPhase = '' unzip -j ${meslo-lg} unzip -j ${meslo-lg-dz} From 687e5f6516569cc4cad2931c5dd70c2977bd6728 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 21 Jul 2021 13:03:52 +0200 Subject: [PATCH 147/235] =?UTF-8?q?ocamlPackages.mdx:=201.8.1=20=E2=86=92?= =?UTF-8?q?=201.10.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/mdx/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/mdx/default.nix b/pkgs/development/ocaml-modules/mdx/default.nix index 7051c51cc5cc..c8035eea42d3 100644 --- a/pkgs/development/ocaml-modules/mdx/default.nix +++ b/pkgs/development/ocaml-modules/mdx/default.nix @@ -1,16 +1,16 @@ -{ lib, fetchurl, buildDunePackage, opaline, ocaml +{ lib, fetchurl, buildDunePackage, ocaml , alcotest , astring, cmdliner, cppo, fmt, logs, ocaml-version, odoc, ocaml_lwt, re, result, csexp , pandoc}: buildDunePackage rec { pname = "mdx"; - version = "1.8.1"; + version = "1.10.1"; useDune2 = true; src = fetchurl { url = "https://github.com/realworldocaml/mdx/releases/download/${version}/mdx-${version}.tbz"; - sha256 = "1szik1lyg2vs8jrisnvjdc29n0ifls8mghimff4jcz6f48haa3cv"; + sha256 = "10d4sfv4qk9569kj46pcaw6cih40v6bkgd44lmsp7cyfhvl8pa9x"; }; nativeBuildInputs = [ cppo ]; @@ -23,7 +23,9 @@ buildDunePackage rec { outputs = [ "bin" "lib" "out" ]; installPhase = '' - ${opaline}/bin/opaline -prefix $bin -libdir $lib/lib/ocaml/${ocaml.version}/site-lib + runHook preInstall + dune install --prefix=$bin --libdir=$lib/lib/ocaml/${ocaml.version}/site-lib ${pname} + runHook postInstall ''; meta = { From edc30bb87f364386c0dbfd73af0a69f1985f75dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 22 Jul 2021 16:00:56 +0200 Subject: [PATCH 148/235] diffoscope: disable failing test --- pkgs/tools/misc/diffoscope/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index a4b2b888faea..88a9846e8352 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -72,6 +72,7 @@ python3Packages.buildPythonApplication rec { "test_sbin_added_to_path" "test_diff_meta" "test_diff_meta2" + "test_obj_no_differences" ]; meta = with lib; { From aab3c48aef2260867272bf6797a980e32ccedbe0 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Thu, 22 Jul 2021 10:21:20 -0400 Subject: [PATCH 149/235] awscli2: fixup python 3.9 fallout from the applied patch: Replace use of deprecated base64.encodestring() Replace the uses of deprecated base64.encodestring() in favor of botocore.compat.encodebytes(). This fixes incompatibility with Python 3.9 where the former function has finally been removed. --- pkgs/tools/admin/awscli2/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index 1ce3cb452b8c..d84c1816fec4 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -1,4 +1,4 @@ -{ lib, python3, groff, less, fetchFromGitHub }: +{ lib, python3, groff, less, fetchFromGitHub, fetchpatch }: let py = python3.override { packageOverrides = self: super: { @@ -33,6 +33,13 @@ with py.pkgs; buildPythonApplication rec { sha256 = "sha256-LU9Tqzdi8ULZ5y3FbfSXdrip4NcxFkXRCTpVGo05LcM="; }; + patches = [ + (fetchpatch { + url = "https://github.com/mgorny/aws-cli/commit/85361123d2fa12eaedf912c046ffe39aebdd2bad.patch"; + sha256 = "sha256-1Rb+/CY7ze1/DbJ6TfqHF01cfI2vixZ1dT91bmHTg/A="; + }) + ]; + postPatch = '' substituteInPlace setup.py \ --replace "awscrt==0.11.13" "awscrt" \ From 13183513a01a460190dab3ecf44447deeee9db09 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Thu, 22 Jul 2021 16:40:20 +0200 Subject: [PATCH 150/235] ocrmypdf: 11.7.3 -> 12.3.0 (#130175) --- pkgs/tools/text/ocrmypdf/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/ocrmypdf/default.nix b/pkgs/tools/text/ocrmypdf/default.nix index 1a60d7d013ef..0dff6d76fffe 100644 --- a/pkgs/tools/text/ocrmypdf/default.nix +++ b/pkgs/tools/text/ocrmypdf/default.nix @@ -30,14 +30,13 @@ let in buildPythonApplication rec { pname = "ocrmypdf"; - version = "11.7.3"; - disabled = ! python3Packages.isPy3k; + version = "12.3.0"; src = fetchFromGitHub { owner = "jbarlow83"; repo = "OCRmyPDF"; rev = "v${version}"; - sha256 = "0gs2w9kl5wwrs0hx2sivq3pdvpf3lkaifblwfbz5g31yl770blji"; + sha256 = "122yv3p0v4fbx30zgppcznwnm7svg97gv0sa103xb6zcld68ggn2"; }; nativeBuildInputs = with python3Packages; [ From 63269809d33b25ce68026f451cee6012ef2f4527 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Thu, 22 Jul 2021 21:40:47 +0700 Subject: [PATCH 151/235] cyclone-scheme: 0.21 -> 0.30.0 (#130628) --- pkgs/development/interpreters/cyclone/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/cyclone/default.nix b/pkgs/development/interpreters/cyclone/default.nix index c0a11cf9f026..0d2984904d85 100644 --- a/pkgs/development/interpreters/cyclone/default.nix +++ b/pkgs/development/interpreters/cyclone/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, libck, darwin }: let - version = "0.21"; + version = "0.30.0"; bootstrap = stdenv.mkDerivation { pname = "cyclone-bootstrap"; inherit version; @@ -10,7 +10,7 @@ let owner = "justinethier"; repo = "cyclone-bootstrap"; rev = "v${version}"; - sha256 = "0bb3a7x7vzmdyhm4nilm8bcn4q50pwqryggnxz21n16v6xakwjmr"; + sha256 = "sha256-/zAcCBdJ7YQXsspdjrMca1Oj9SUUFXQKLwZPoZLhHYg="; }; enableParallelBuilding = true; @@ -30,7 +30,7 @@ stdenv.mkDerivation { owner = "justinethier"; repo = "cyclone"; rev = "v${version}"; - sha256 = "1vb4yaprs2bwbxmxx2zkqvysxx8r9qww2q1nqkz8yps3ji715jw7"; + sha256 = "sha256-a3wiqKlIbnvIhyrI0lyVGciQiM7KSuYH5iUfGFrgOuM="; }; enableParallelBuilding = true; From 8a328256b0ad1b7c56a6cd77fb5e1184e4aad3f8 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 22 Jul 2021 17:20:32 +0200 Subject: [PATCH 152/235] unifont: deprecate phases --- pkgs/data/fonts/unifont/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index 507faae53e35..7fb7387179a9 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ]; - phases = [ "buildPhase" "installPhase" ]; + dontUnpack = true; buildPhase = '' From 3285cc390e9aff7c828a156424b34ba86885b014 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 22 Jul 2021 16:54:35 +0200 Subject: [PATCH 153/235] chromium: Fix the text rendering (some text was invisible) The recent glibc update (acdcb85) broke the text rendering, see #131074. This will hopefully work for ungoogled-chromium as well (at least the patch applies). Thanks: Lily Foster --- .../networking/browsers/chromium/common.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 18565f31a2fb..6daafc204eb8 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -167,6 +167,19 @@ let # Fix the build by adding a missing dependency (s. https://crbug.com/1197837): ./patches/fix-missing-atspi2-dependency.patch ./patches/closure_compiler-Use-the-Java-binary-from-the-system.patch + ] ++ lib.optionals (versionRange "91" "94.0.4583.0") [ + # Required as dependency for the next patch: + (githubPatch { + # Reland "Reland "Linux sandbox syscall broker: use struct kernel_stat"" + commit = "4b438323d68840453b5ef826c3997568e2e0e8c7"; + sha256 = "1lf6yilx2ffd3r0840ilihp4px35w7jvr19ll56bncqmz4r5fd82"; + }) + # To fix the text rendering, see #131074: + (githubPatch { + # Linux sandbox: fix fstatat() crash + commit = "60d5e803ef2a4874d29799b638754152285e0ed9"; + sha256 = "0apmsqqlfxprmdmi3qzp3kr9jc52mcc4xzps206kwr8kzwv48b70"; + }) ] ++ lib.optionals (chromiumVersionAtLeast "93") [ # We need to revert this patch to build M93 with LLVM 12. (githubPatch { From cf5f275d23ba3e4dab05a320d5776e15f33f585e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 21 Jul 2021 10:11:00 +0200 Subject: [PATCH 154/235] ocamlPackages.lsp: fix sets of (propagated) inputs --- pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix index b501282c1558..6e172dee6ee6 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix @@ -1,4 +1,5 @@ { buildDunePackage +, cppo , stdlib-shims , ppx_yojson_conv_lib , ocaml-syntax-shims @@ -26,16 +27,20 @@ buildDunePackage { ''; buildInputs = [ - stdlib-shims + cppo ppx_yojson_conv_lib ocaml-syntax-shims octavius - uutf - csexp dune-build-info omd cmdliner + ]; + + propagatedBuildInputs = [ + csexp jsonrpc + stdlib-shims + uutf ]; meta = jsonrpc.meta // { From d89015db440ad85d18b3dcd593e40552020cb8ef Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 21 Jul 2021 10:11:05 +0200 Subject: [PATCH 155/235] ocamlPackages.yojson: remove legacy version 1.2.3 --- .../ocaml-modules/yojson/default.nix | 46 ++++--------------- 1 file changed, 10 insertions(+), 36 deletions(-) diff --git a/pkgs/development/ocaml-modules/yojson/default.nix b/pkgs/development/ocaml-modules/yojson/default.nix index 07025be296ce..2be9ce1b0210 100644 --- a/pkgs/development/ocaml-modules/yojson/default.nix +++ b/pkgs/development/ocaml-modules/yojson/default.nix @@ -1,48 +1,22 @@ -{ lib, stdenv, fetchzip, ocaml, findlib, dune_2, cppo, easy-format, biniou }: -let +{ lib, fetchurl, buildDunePackage, cppo, easy-format, biniou }: + +buildDunePackage rec { pname = "yojson"; - param = - if lib.versionAtLeast ocaml.version "4.02" then rec { - version = "1.7.0"; + version = "1.7.0"; + useDune2 = true; + + src = fetchurl { url = "https://github.com/ocaml-community/yojson/releases/download/${version}/yojson-${version}.tbz"; - sha256 = "08llz96if8bcgnaishf18si76cv11zbkni0aldb54k3cn7ipiqvd"; - nativeBuildInputs = [ dune_2 ]; - extra = { - installPhase = '' - dune install --prefix $out --libdir $OCAMLFIND_DESTDIR ${pname} - ''; - }; - } else rec { - version = "1.2.3"; - url = "https://github.com/ocaml-community/yojson/archive/v${version}.tar.gz"; - sha256 = "10dvkndgwanvw4agbjln7kgb1n9s6lii7jw82kwxczl5rd1sgmvl"; - extra = { - createFindlibDestdir = true; - - makeFlags = [ "PREFIX=$(out)" ]; - - preBuild = "mkdir $out/bin"; - }; - }; -in -stdenv.mkDerivation ({ - - name = "ocaml${ocaml.version}-${pname}-${param.version}"; - - src = fetchzip { - inherit (param) url sha256; + sha256 = "1iich6323npvvs8r50lkr4pxxqm9mf6w67cnid7jg1j1g5gwcvv5"; }; - nativeBuildInputs = [ ocaml findlib ] ++ (param.nativeBuildInputs or []); - propagatedNativeBuildInputs = [ cppo ]; + nativeBuildInputs = [ cppo ]; propagatedBuildInputs = [ easy-format biniou ]; - configurePlatforms = []; meta = with lib; { description = "An optimized parsing and printing library for the JSON format"; homepage = "https://github.com/ocaml-community/${pname}"; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms or []; }; -} // param.extra) +} From d9b7e47007249943f4068add429da8443d3c71ee Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Thu, 22 Jul 2021 09:32:47 -0600 Subject: [PATCH 156/235] matrix-synapse: 1.38.0 -> 1.38.1 --- pkgs/servers/matrix-synapse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index c7894529e2bb..b2e61d506560 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -12,11 +12,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.38.0"; + version = "1.38.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-k9/enFktixO4zvgBW3zw0COBakDP1PHVWAlbMi+FiWQ="; + sha256 = "sha256-bGKGzhuDjKaNbjXSwvidk9SrRmJsLQyLe5jps4DXN+s="; }; patches = [ From 3106d973c69c2099166a9b2aafe51582ee6719b9 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Thu, 22 Jul 2021 17:05:06 +0100 Subject: [PATCH 157/235] terragrunt: 0.31.0 -> 0.31.1 --- pkgs/applications/networking/cluster/terragrunt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 1717d3209007..589164e2769f 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.31.0"; + version = "0.31.1"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JRIwPOExPbwLS7ps4pJpvIRaZ9jZZjVK+POaUHAmiPI="; + sha256 = "sha256-vc3DGYb3vp55LRguhg3nG5zH7w1lTFEI2bx7kNffvas="; }; - vendorSha256 = "sha256-lck4nabDhFA8N0lo+cIKiJjlg2TGx3qMExbblHQwbvQ="; + vendorSha256 = "sha256-lBhLaYn8adgfCXQJBsIVuwnA0vY8+tgeqE+C669AV+A="; doCheck = false; From 3f790df34c0845c9dbd4c1ea8a4d55ebe5e205a6 Mon Sep 17 00:00:00 2001 From: Lein Matsumaru Date: Thu, 22 Jul 2021 16:08:32 +0000 Subject: [PATCH 158/235] exploitdb: 2021-07-21 -> 2021-07-22 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 09309e98ce4c..9509288b5819 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-07-21"; + version = "2021-07-22"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-VKjbVlSvJmp6GIyQ3DVPMl+ARRWslFIf7Oc2Qtb5ouI="; + sha256 = "sha256-pmi1oKam3t4iKqbisFghdVlzp1Ozmc9Nmn19JLrsams="; }; installPhase = '' From 121ed6bdf4059f14c095271a24e4d7a754c1c210 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 22 Jul 2021 18:16:35 +0200 Subject: [PATCH 159/235] nix-binary-cache: deprecate phases --- pkgs/servers/http/nix-binary-cache/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/http/nix-binary-cache/default.nix b/pkgs/servers/http/nix-binary-cache/default.nix index 5baba231026d..4f26610e10cf 100644 --- a/pkgs/servers/http/nix-binary-cache/default.nix +++ b/pkgs/servers/http/nix-binary-cache/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2014-06-29-1"; pname = "nix-binary-cache"; - phases = ["installPhase"]; + dontUnpack = true; installPhase = '' mkdir -p "$out/bin" From f98bc23805c5956314f0c0359794225a2557088f Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Thu, 22 Jul 2021 16:18:10 +0000 Subject: [PATCH 160/235] nix-gitignore: fix evaluation when .gitignore contains \# or \! (#130643) --- pkgs/build-support/nix-gitignore/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/nix-gitignore/default.nix b/pkgs/build-support/nix-gitignore/default.nix index 5d7b945bf1b1..497dcb0660b0 100644 --- a/pkgs/build-support/nix-gitignore/default.nix +++ b/pkgs/build-support/nix-gitignore/default.nix @@ -41,6 +41,9 @@ in rec { let split = match "^(!?)(.*)" l; in [(elemAt split 1) (head split == "!")]; + # regex -> regex + handleHashesBangs = replaceStrings ["\\#" "\\!"] ["#" "!"]; + # ignore -> regex substWildcards = let @@ -86,7 +89,7 @@ in rec { mapPat = f: l: [(f (head l)) (last l)]; in map (l: # `l' for "line" - mapPat (l: handleSlashSuffix (handleSlashPrefix (mapAroundCharclass substWildcards l))) + mapPat (l: handleSlashSuffix (handleSlashPrefix (handleHashesBangs (mapAroundCharclass substWildcards l)))) (computeNegation l)) (filter (l: !isList l && !isComment l) (split "\n" gitignore)); From 1717abe8c8171cb5e3362c9530bab2665c7eb082 Mon Sep 17 00:00:00 2001 From: Ethan Edwards Date: Thu, 22 Jul 2021 12:26:57 -0400 Subject: [PATCH 161/235] tmuxPlugins.dracula: v1.0.1 -> v2.0.0 --- pkgs/misc/tmux-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 60d6545ae5f3..b4978e200ab1 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -127,12 +127,12 @@ in rec { dracula = mkTmuxPlugin rec { pluginName = "dracula"; - version = "1.0.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "dracula"; repo = "tmux"; rev = "v${version}"; - sha256 = "sha256-hq+sKA/EkiKia/31SY1zYPz/bxLuwm6sSrGlip1DULw="; + sha256 = "ILs+GMltb2AYNUecFMyQZ/AuETB0PCFF2InSnptVBos="; }; meta = with lib; { homepage = "https://draculatheme.com/tmux"; From 1cb496e83ff30ade17ca7513f712cfcb554c2b6b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 20 Jul 2021 20:19:38 +0000 Subject: [PATCH 162/235] girara: 0.3.5 -> 0.3.6 --- pkgs/applications/misc/girara/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 6fde2c8fac8b..802c1532979b 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "girara"; - version = "0.3.5"; + version = "0.3.6"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://git.pwmt.org/pwmt/${pname}/-/archive/${version}/${pname}-${version}.tar.gz"; - sha256 = "1n3i960b458172mc3pkq7m9dn5qxry6fms3c3k06v27cjp5whsyf"; + sha256 = "sha256-GPECj0CVxKh+gTfAkkvs13tdiy93il97iqbSTxLQSiM="; }; nativeBuildInputs = [ meson ninja pkg-config gettext check dbus ]; From 20ee78c710f302dec537edb989c6fd1096c6638d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 21 Jul 2021 15:38:17 +0000 Subject: [PATCH 163/235] imgproxy: 2.16.6 -> 2.16.7 --- pkgs/servers/imgproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix index 601e93a998aa..fc099e905e5a 100644 --- a/pkgs/servers/imgproxy/default.nix +++ b/pkgs/servers/imgproxy/default.nix @@ -3,12 +3,12 @@ buildGoModule rec { pname = "imgproxy"; - version = "2.16.6"; + version = "2.16.7"; src = fetchFromGitHub { owner = pname; repo = pname; - sha256 = "sha256-wrd8G2y8oepaHMJaU4Bcvkf91ABX4ZapQSlztq4Gg84="; + sha256 = "sha256-7UGIkYChXIht/dyMhvPeu8oeGQEA7/Ns7+e56wEmAwQ="; rev = "v${version}"; }; From 7e3d130d0d12db354deb6ec911e105663aea1d78 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 20 Jul 2021 03:38:41 +0000 Subject: [PATCH 164/235] flyctl: 0.0.228 -> 0.0.229 --- pkgs/development/web/flyctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 3c61121b0357..8828b0222cc2 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.228"; + version = "0.0.229"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-h8ZiAabB0IIJoeQMMvOO1lQNMdFYAoTXKcTAPmLP5Sw="; + sha256 = "sha256-mw+rTMFj41+T6lDe/MOQpmRcjt/gJhOCfaHcBkpjcsg="; }; preBuild = '' From 7d3e3ab81f53ebfd5f5710f2f66a09ff717a12a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20B=C3=BChler?= Date: Thu, 22 Jul 2021 18:52:34 +0200 Subject: [PATCH 165/235] system-sendmail: deprecate phases (#131108) --- pkgs/servers/mail/system-sendmail/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/mail/system-sendmail/default.nix b/pkgs/servers/mail/system-sendmail/default.nix index 28c54fc0fae9..76b92299409e 100644 --- a/pkgs/servers/mail/system-sendmail/default.nix +++ b/pkgs/servers/mail/system-sendmail/default.nix @@ -20,7 +20,9 @@ stdenv.mkDerivation { src = script; - phases = [ "buildPhase" ]; + dontUnpack = true; + dontInstall = true; + buildPhase = '' mkdir -p $out/bin < $src sed "s#{{MYPATH}}#$out/bin/sendmail#" > $out/bin/sendmail From f189192358c522b5d0162db40c9fb01b3417ebeb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 20 Jul 2021 02:59:18 +0000 Subject: [PATCH 166/235] fend: 0.1.20 -> 0.1.21 --- pkgs/tools/misc/fend/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix index 93e13996f7f4..4ed308643e56 100644 --- a/pkgs/tools/misc/fend/default.nix +++ b/pkgs/tools/misc/fend/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fend"; - version = "0.1.20"; + version = "0.1.21"; src = fetchFromGitHub { owner = "printfn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2CzpPzUylzDiP9rbjneRR6joa9UEgnDfJ4Ffa/orhkk="; + sha256 = "sha256-LrHZsnW96+QsXuGxWoGqIEKTE86m3tMnh4fpDPIhd1w="; }; - cargoSha256 = "sha256-xDh7SF73Qnx/GeW43JDmF+qeljSHbWWq4unWdTmAO+c="; + cargoSha256 = "sha256-GZ4Yt5iQkgupJMTYIbvCPtz19985MFf8IDy3ui0M6DE="; doInstallCheck = true; From 5efb6f23b045b836de1f4f1e3c9897c2b15d7ae4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 20 Jul 2021 01:57:39 +0000 Subject: [PATCH 167/235] docker-credential-gcr: 2.0.4 -> 2.0.5 --- pkgs/tools/admin/docker-credential-gcr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/docker-credential-gcr/default.nix b/pkgs/tools/admin/docker-credential-gcr/default.nix index 48851c3784b7..ee2efb206af6 100644 --- a/pkgs/tools/admin/docker-credential-gcr/default.nix +++ b/pkgs/tools/admin/docker-credential-gcr/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "docker-credential-gcr"; - version = "2.0.4"; + version = "2.0.5"; goPackagePath = "github.com/GoogleCloudPlatform/docker-credential-gcr"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "GoogleCloudPlatform"; repo = "docker-credential-gcr"; rev = "v${version}"; - sha256 = "sha256-yG8gpsD1KZBSbJnnNTXgZah/mcrOUH1O37s7AGpeHjQ="; + sha256 = "sha256-WrcGTXy5SMWDHJWddXUuvUvEWjOsJcoB1zBg02p5ggY="; }; meta = with lib; { From f0d8e047ddeebd506792e3aa9247c1270a7545d1 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Wed, 14 Jul 2021 17:52:08 +0200 Subject: [PATCH 168/235] grafana: 8.0.5 -> 8.0.6 --- pkgs/servers/monitoring/grafana/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 4fa003250096..2c8ba20f6d41 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,23 +2,23 @@ buildGoModule rec { pname = "grafana"; - version = "8.0.5"; + version = "8.0.6"; - excludedPackages = [ "release_publisher" ]; + excludedPackages = "\\(alert_webhook_listener\\|clean-swagger\\|release_publisher\\|slow_proxy\\|slow_proxy_mac\\)"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-tehqb86Mkg1dD4x34zHwLD9uV/PssslLDIs9bl28ap0="; + sha256 = "sha256-incw/Uv1Jeg/WAkWUgJGvdJ2OpZYfkCAvgLW/qXWXEo="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-aVZpTQ4ERrJV3YN4U0v/tJoYkTg7vlQVe6sIIK2NE0k="; + sha256 = "sha256-JSpNAi9NvZpo0HzdDmdi1i+lNGLylHgctT6PPWHNhkk="; }; - vendorSha256 = "sha256-INvFZ9hNbtpaDXuhBPaSaqBZyi7QJ18tMk+AZjJtYjg="; + vendorSha256 = "sha256-72i2NgulRpdBZ9dwx+0VlKDzzNnBJgEKKizrLPwzUY4="; preBuild = '' # The testcase makes an API call against grafana.com: From 6846ce94a153e31a6bbbb0ef7bb9fcb4de10a346 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 20 Jul 2021 01:43:22 +0000 Subject: [PATCH 169/235] discordchatexporter-cli: 2.28 -> 2.29 --- .../backup/discordchatexporter-cli/default.nix | 4 ++-- pkgs/tools/backup/discordchatexporter-cli/deps.nix | 13 +++++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/backup/discordchatexporter-cli/default.nix b/pkgs/tools/backup/discordchatexporter-cli/default.nix index 76b7d1da59b4..770a64b841c3 100644 --- a/pkgs/tools/backup/discordchatexporter-cli/default.nix +++ b/pkgs/tools/backup/discordchatexporter-cli/default.nix @@ -7,13 +7,13 @@ let in stdenv.mkDerivation rec { pname = "discordchatexporter-cli"; - version = "2.28"; + version = "2.29"; src = fetchFromGitHub { owner = "tyrrrz"; repo = "discordchatexporter"; rev = version; - sha256 = "1bcq8mwjr8635g8mkgbxnszk20hnwf0zk672glrxjqga6f6fnykg"; + sha256 = "0hbhDlGEK2rxuCByW8RaT/0vne8Z+q0ZobCkW1FBoG8="; }; nativeBuildInputs = [ dotnet-sdk_5 dotnetPackages.Nuget cacert makeWrapper autoPatchelfHook ]; diff --git a/pkgs/tools/backup/discordchatexporter-cli/deps.nix b/pkgs/tools/backup/discordchatexporter-cli/deps.nix index a7703f2ba2c1..9849e6c63662 100644 --- a/pkgs/tools/backup/discordchatexporter-cli/deps.nix +++ b/pkgs/tools/backup/discordchatexporter-cli/deps.nix @@ -1,8 +1,8 @@ { fetchNuGet }: [ (fetchNuGet { name = "CliFx"; - version = "2.0.4"; - sha256 = "1wwpjli4y2545yi6k17mvjqy994wl3wm6nngszk87rbdwhkbncaj"; + version = "2.0.6"; + sha256 = "09yyjgpp52b0r3mqlvx75ld4vjp8hry7ql7r20nnvj0lach6fyh6"; }) (fetchNuGet { name = "Gress"; @@ -46,8 +46,13 @@ }) (fetchNuGet { name = "Spectre.Console"; - version = "0.40.0"; - sha256 = "17bb31nsvfk7m337zwqcz4v6cvayhfx51ri4yrv5i8nbp7f4rpb1"; + version = "0.41.0"; + sha256 = "104vyzwbbq5m75dm31xk7ilvmik8hw1cj3bc301a8w6gq8i0fpk3"; + }) + (fetchNuGet { + name = "Superpower"; + version = "2.3.0"; + sha256 = "0bdsc3c0d6jb0wr67siqfba0ldl0jxbwis6xr0whzqzf6m2cyahm"; }) (fetchNuGet { name = "System.Memory"; From b0834c031e1a17f5a1769254c052e9631ab71f0e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 20 Jul 2021 02:34:38 +0000 Subject: [PATCH 170/235] ergo: 4.0.12 -> 4.0.13 --- pkgs/applications/blockchains/ergo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix index 8b8ff3f48ba4..a0e648218f50 100644 --- a/pkgs/applications/blockchains/ergo/default.nix +++ b/pkgs/applications/blockchains/ergo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "4.0.12"; + version = "4.0.13"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "sha256-cIMaCouzuI7UQ6UY4caGcTzA+Xp7vLdoOwIfGG+ahsU="; + sha256 = "sha256-HNpyUD2Tep2XnY3lr5a3ec+NmJtt0VvJx6ujVvSugXo="; }; nativeBuildInputs = [ makeWrapper ]; From 84f5253bd7210d40b78bf8c6f48377438cab5767 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 20 Jul 2021 00:10:24 +0000 Subject: [PATCH 171/235] clightd: 5.3 -> 5.4 --- pkgs/applications/misc/clight/clightd.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/clight/clightd.nix b/pkgs/applications/misc/clight/clightd.nix index 192cddc2e172..7b52145f794b 100644 --- a/pkgs/applications/misc/clight/clightd.nix +++ b/pkgs/applications/misc/clight/clightd.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "clightd"; - version = "5.3"; + version = "5.4"; src = fetchFromGitHub { owner = "FedeDP"; repo = "Clightd"; rev = version; - sha256 = "sha256-CuTYCNZ9oiDsm5mUDmjbxkmAl61PEXv3WMrZRzgdZeE="; + sha256 = "sha256-ppaxfnZB3+aOzvc/wk1f8D2mFYngQspEOl9XArNMdBE="; }; # dbus-1.pc has datadir=/etc From b18b496a6349cfe11a4a3d1d56fe16558b9b96eb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 20 Jul 2021 01:20:25 +0000 Subject: [PATCH 172/235] datasette: 0.57.1 -> 0.58.1 --- pkgs/development/python-modules/datasette/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix index 58920b406466..5a611c989f4d 100644 --- a/pkgs/development/python-modules/datasette/default.nix +++ b/pkgs/development/python-modules/datasette/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "datasette"; - version = "0.57.1"; + version = "0.58.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "simonw"; repo = pname; rev = version; - sha256 = "sha256-BHsf3GOganPhsDiZlRxvAsRZH/Sq+Jr+CZcc2ubce+8="; + sha256 = "sha256-dtKqp7LV1fRjwOMAlmmAnC19j8hLA1oixGextATW6z0="; }; nativeBuildInputs = [ pytest-runner ]; From ea9673e4749dd03ead6cc5041bdfdcb9eec7f1a3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 19 Jul 2021 21:41:57 +0000 Subject: [PATCH 173/235] bazarr: 0.9.5 -> 0.9.6 --- pkgs/servers/bazarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/bazarr/default.nix b/pkgs/servers/bazarr/default.nix index 7e7349408855..d15844e682e2 100644 --- a/pkgs/servers/bazarr/default.nix +++ b/pkgs/servers/bazarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bazarr"; - version = "0.9.5"; + version = "0.9.6"; src = fetchurl { url = "https://github.com/morpheus65535/bazarr/archive/v${version}.tar.gz"; - sha256 = "sha256-N0HoZgAtWPgYPU9OWpMEXO2qUoNIGCsFn9vll0hLal0="; + sha256 = "sha256-aO9PIE/YlSIGEcntDCdxIYuuvV5jG266ldhC2QfT+e4="; }; nativeBuildInputs = [ makeWrapper ]; From 459c95b6a7670f59009907915d26901af735dc3c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 19 Jul 2021 22:46:18 +0000 Subject: [PATCH 174/235] cargo-watch: 7.8.0 -> 7.8.1 --- pkgs/development/tools/rust/cargo-watch/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-watch/default.nix b/pkgs/development/tools/rust/cargo-watch/default.nix index 017fb7d484d4..c7cdf92dcd83 100644 --- a/pkgs/development/tools/rust/cargo-watch/default.nix +++ b/pkgs/development/tools/rust/cargo-watch/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-watch"; - version = "7.8.0"; + version = "7.8.1"; src = fetchFromGitHub { owner = "passcod"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZbVBwSg3roIMA+5LVP3omtTgbAJ7HAdJDXyAybWuRLw="; + sha256 = "sha256-g6k/7jo8pvTn5snU05uSGzprNMt8/x+bJsLb/y0jHRg="; }; - cargoSha256 = "sha256-6aoi/CLla/yKa5RuVgn8RJ9AK1j1wtZeBn+6tpXrJvA="; + cargoSha256 = "sha256-pfjWTkDw4D7eMADkPX01vapka8I6o0ZvkNjQt5X2pUk="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices libiconv ]; From 2dd937fbf8279bf1e6eb468e12a17347cc310dee Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 20 Jul 2021 00:15:50 +0000 Subject: [PATCH 175/235] cmark: 0.30.0 -> 0.30.1 --- pkgs/development/libraries/cmark/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix index ec90d0086c9d..1cc19277522d 100644 --- a/pkgs/development/libraries/cmark/default.nix +++ b/pkgs/development/libraries/cmark/default.nix @@ -2,19 +2,19 @@ stdenv.mkDerivation rec { pname = "cmark"; - version = "0.30.0"; + version = "0.30.1"; src = fetchFromGitHub { owner = "jgm"; repo = pname; rev = version; - sha256 = "sha256-SU31kJL+8wt57bGW5fNeXjXPgPeCXZIknZwDxMXCfdc="; + sha256 = "sha256-UjDM2N6gCwO94F1nW3qCP9JX42MYAicAuGTKAXMy1Gg="; }; nativeBuildInputs = [ cmake ]; cmakeFlags = [ - # https://github.com/commonmark/cmark/releases/tag/0.30.0 + # https://github.com/commonmark/cmark/releases/tag/0.30.1 # recommends distributions dynamically link "-DCMARK_STATIC=OFF" ]; From 641127995345ae97a8049cd2e4ab705989deea2d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 8 Jul 2021 18:29:27 +0000 Subject: [PATCH 176/235] grip: 4.2.1 -> 4.2.2 --- pkgs/applications/misc/grip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix index a30778762b27..c182db8fdd3a 100644 --- a/pkgs/applications/misc/grip/default.nix +++ b/pkgs/applications/misc/grip/default.nix @@ -15,11 +15,11 @@ }: stdenv.mkDerivation rec { - name = "grip-4.2.1"; + name = "grip-4.2.2"; src = fetchurl { url = "mirror://sourceforge/grip/${name}.tar.gz"; - sha256 = "sha256-3bFJURPbq9rzLsJCppRjSARhcOJxC4eSfw5VxvZgQ3Q="; + sha256 = "sha256-nXtGgJeNYM8lyllNi9UdmsnVcHOCXfryWmKGZ9QFTHE="; }; nativeBuildInputs = [ pkg-config libtool ]; From ecf76c5f093a8c33c1a2272d616719237c0ed954 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 9 Jul 2021 04:44:50 +0000 Subject: [PATCH 177/235] async-profiler: 1.8.5 -> 1.8.6 --- pkgs/development/tools/async-profiler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/async-profiler/default.nix b/pkgs/development/tools/async-profiler/default.nix index 66177d3a34f3..3f31b921831a 100644 --- a/pkgs/development/tools/async-profiler/default.nix +++ b/pkgs/development/tools/async-profiler/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "async-profiler"; - version = "1.8.5"; + version = "1.8.6"; src = fetchFromGitHub { owner = "jvm-profiling-tools"; repo = "async-profiler"; rev = "v${version}"; - sha256 = "sha256-vSBueRNraMgLcaprPsBUriX3WZ7N0UrllnSVLL2F738="; + sha256 = "sha256-MtRO0tbo4kDHcQmir8ulv0q1Qh+KnKIshb1NDtu1SKg="; }; buildInputs = [ jdk8 ]; From 86bd2ffbe3183dc4d116b8b0c7e0e71cbd61f06a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 9 Jul 2021 09:20:00 +0000 Subject: [PATCH 178/235] helmsman: 3.7.0 -> 3.7.2 --- pkgs/applications/networking/cluster/helmsman/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmsman/default.nix b/pkgs/applications/networking/cluster/helmsman/default.nix index ed4a201db3a0..933f1bfe71b4 100644 --- a/pkgs/applications/networking/cluster/helmsman/default.nix +++ b/pkgs/applications/networking/cluster/helmsman/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmsman"; - version = "3.7.0"; + version = "3.7.2"; src = fetchFromGitHub { owner = "Praqma"; repo = "helmsman"; rev = "v${version}"; - sha256 = "sha256-Xp86tCIM7XVtue/MjQ8/wGs2fHfxSWS3B6MzNMYRqg4="; + sha256 = "sha256-wzmn06nUycNaQ4tUEBd4q17M1CVC0+5X13rqF7zaHqU="; }; - vendorSha256 = "sha256-icX8mOc8g+DhfAjD1pzneLWTXY17lXyAjdPOWAxkHwI="; + vendorSha256 = "sha256-XHgdVFGIzbPPYgv/T4TtvDDbKAe3niev4S5tu/nwSqg="; doCheck = false; From 8748bd4742fd560b58516327edb9ffadc40c2e6b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 6 Jul 2021 11:17:23 +0000 Subject: [PATCH 179/235] buildkite-agent: 3.30.0 -> 3.31.0 --- .../tools/continuous-integration/buildkite-agent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index a8d35a44bb96..b32eed9a1662 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -3,13 +3,13 @@ nixosTests }: buildGoModule rec { name = "buildkite-agent-${version}"; - version = "3.30.0"; + version = "3.31.0"; src = fetchFromGitHub { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - sha256 = "sha256-U2UnT41IpICy08jPQkr25wjAL1kBxiQCD4lysYnLAPk="; + sha256 = "sha256-Rot5A2zSEleTifadHEvAlydchzCdDo/VPZELostDfng="; }; vendorSha256 = "sha256-n3XRxpEKjHf7L7fcGscWTVKBtot9waZbLoS9cG0kHfI="; From 1371cca07370356512f88972ecd0533f740b1c3d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 3 Jul 2021 20:49:31 +0000 Subject: [PATCH 180/235] kubie: 0.15.0 -> 0.15.1 --- pkgs/development/tools/kubie/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/kubie/default.nix b/pkgs/development/tools/kubie/default.nix index c563d9bef096..5c86b9a24060 100644 --- a/pkgs/development/tools/kubie/default.nix +++ b/pkgs/development/tools/kubie/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kubie"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "sbstp"; repo = "kubie"; - sha256 = "sha256-uNlKxcU1iCR4JzNfBatEeKMMdu9ZqvOqna0sGrcwK30="; + sha256 = "sha256-jv5IhTxusB74pnpoopl+fKnXDJI/65D8PSuhGVgbDyo="; }; - cargoSha256 = "sha256-4Xo17HlYvJLf90R0gS9EFJSJKmNHClXqAJTx9mY29KA="; + cargoSha256 = "sha256-6SaW3wqhn251GaH3GRNaSqRLnbQimDBRSt+RPgJG1M8="; nativeBuildInputs = [ installShellFiles ]; From 30bd95ce2190422ea6ef3d1ff39ac784467dc2d4 Mon Sep 17 00:00:00 2001 From: MayNiklas Date: Thu, 22 Jul 2021 18:29:47 +0200 Subject: [PATCH 181/235] maintainers: add MayNiklas --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e85efc82a4be..f6bc656610f8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6658,6 +6658,12 @@ githubId = 1191859; name = "Maxim Krivchikov"; }; + MayNiklas = { + email = "info@niklas-steffen.de"; + github = "MayNiklas"; + githubId = 44636701; + name = "Niklas Steffen"; + }; mazurel = { email = "mateusz.mazur@yahoo.com"; github = "Mazurel"; From 87756d9e397145c85aaea56e8e4141af253f5184 Mon Sep 17 00:00:00 2001 From: MayNiklas Date: Thu, 22 Jul 2021 18:31:57 +0200 Subject: [PATCH 182/235] plex: add MayNiklas to maintainers --- pkgs/servers/plex/raw.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index feab959a2df9..1d527fb203c1 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -88,6 +88,7 @@ stdenv.mkDerivation rec { pjones thoughtpolice maxeaubrey + MayNiklas ]; description = "Media library streaming server"; longDescription = '' From 9d5515c3e64b5ce41fc09547cb5fc83169680e2d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 10 Jul 2021 06:25:41 +0000 Subject: [PATCH 183/235] libxlsxwriter: 1.0.8 -> 1.0.9 --- pkgs/development/libraries/libxlsxwriter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libxlsxwriter/default.nix b/pkgs/development/libraries/libxlsxwriter/default.nix index ce9a72f00c1c..dfeaeed8ca80 100644 --- a/pkgs/development/libraries/libxlsxwriter/default.nix +++ b/pkgs/development/libraries/libxlsxwriter/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "libxlsxwriter"; - version = "1.0.8"; + version = "1.0.9"; src = fetchFromGitHub { owner = "jmcnamara"; repo = "libxlsxwriter"; rev = "RELEASE_${version}"; - sha256 = "1z9bkg0pfkzxbpj2rys4mx9wmcxyjjqsg0nbiaabsg455q00plki"; + sha256 = "sha256-6MMQr0ynMmfZj+RFoKtLB/f1nTBfn9tcYpzyUwnfB3M="; }; nativeBuildInputs = [ From a1f06a6f6120cf81267240dc8905b2570ddf0ab6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 21 Jul 2021 12:55:01 +0000 Subject: [PATCH 184/235] go-md2man: 2.0.0 -> 2.0.1 --- pkgs/development/tools/misc/go-md2man/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/go-md2man/default.nix b/pkgs/development/tools/misc/go-md2man/default.nix index fe43da91b54b..8c43fe7f5947 100644 --- a/pkgs/development/tools/misc/go-md2man/default.nix +++ b/pkgs/development/tools/misc/go-md2man/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "go-md2man"; - version = "2.0.0"; + version = "2.0.1"; vendorSha256 = null; @@ -10,7 +10,7 @@ buildGoModule rec { rev = "v${version}"; owner = "cpuguy83"; repo = "go-md2man"; - sha256 = "0r1f7v475dxxgzqci1mxfliwadcrk86ippflx9n411325l4g3ghv"; + sha256 = "sha256-DnXWnHWtczNnLaQg9Wnp9U/K4h/FbhqGgba44P6VNBQ="; }; meta = with lib; { From 462be6acbeb2c2370f958aba7e6ddd3da8fe70fe Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 22 Jul 2021 19:28:36 +0200 Subject: [PATCH 185/235] code-server: remove phases --- pkgs/servers/code-server/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/servers/code-server/default.nix b/pkgs/servers/code-server/default.nix index 8370dfb16a54..039f0578569b 100644 --- a/pkgs/servers/code-server/default.nix +++ b/pkgs/servers/code-server/default.nix @@ -46,7 +46,6 @@ in stdenv.mkDerivation rec { yarnCache = stdenv.mkDerivation { name = "${pname}-${version}-${system}-yarn-cache"; inherit src; - phases = ["unpackPhase" "buildPhase"]; nativeBuildInputs = [ yarn' git ]; buildPhase = '' export HOME=$PWD From 732de3dcb3eefbc532373d5e53039315e6227c4a Mon Sep 17 00:00:00 2001 From: Julius de Bruijn Date: Thu, 22 Jul 2021 18:56:30 +0200 Subject: [PATCH 186/235] pscale: 0.58.0 -> 0.60.0 --- pkgs/development/tools/pscale/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/pscale/default.nix b/pkgs/development/tools/pscale/default.nix index 14518939dcd9..483a85db02a1 100644 --- a/pkgs/development/tools/pscale/default.nix +++ b/pkgs/development/tools/pscale/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.58.0"; + version = "0.60.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-9XVvdAt/TWQdCY8s//QHZC6THFAf+pMYQpjHjUR3wrc="; + sha256 = "sha256-hrWSieWeVAg28f3Fh9mElr+mDh4v4T5JI1c3+Hrm7c0="; }; - vendorSha256 = "sha256-m6eQ843aP68TO4W5Nq4zKqcf2wgdH/7Srzt37t/NSdk="; + vendorSha256 = "sha256-h4YUQWmFYouEvHup8Pu6OqfHf1EoPszVFzklU9SbJZQ="; meta = with lib; { homepage = "https://www.planetscale.com/"; From a4c132fd65f347f44c9599634f8c7f674f789010 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Thu, 22 Jul 2021 16:39:07 +0200 Subject: [PATCH 187/235] github-runner: 2.278.0 -> 2.279.0 --- .../github-runner/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index b03dcc89d447..e2d40630905c 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -20,7 +20,7 @@ }: let pname = "github-actions-runner"; - version = "2.278.0"; + version = "2.279.0"; deps = (import ./deps.nix { inherit fetchurl; }); nugetPackages = map @@ -41,6 +41,10 @@ let # Online tests (x: "FullyQualifiedName!=GitHub.Runner.Common.Tests.Worker.ActionManagerL0.PrepareActions_${x}") [ + "CompositeActionWithActionfile_CompositeContainerNested" + "CompositeActionWithActionfile_CompositePrestepNested" + "CompositeActionWithActionfile_MaxLimit" + "CompositeActionWithActionfile_Node" "DownloadActionFromGraph" "DownloadActionFromGraph_Legacy" "NotPullOrBuildImagesMultipleTimes" @@ -80,8 +84,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "actions"; repo = "runner"; - rev = "62d926efce35d3ea16d7624a25aaa5b300737def"; # v${version} - sha256 = "sha256-KAb14739DYnuNIf7ZNZk5CShye6XFGn8aLu8BAcuT/c="; + rev = "6b75179ec79e2041b3b5b4e9206b73db2d206aac"; # v${version} + sha256 = "sha256-d7LAHL8Ff7R++d1HuLxWjtiBZRogySe7xHY/xJAcFms="; }; nativeBuildInputs = [ @@ -123,6 +127,11 @@ stdenv.mkDerivation rec { --replace 'dotnet test Test/Test.csproj' \ "dotnet test Test/Test.csproj --filter '${testFilterXml}'" + # We don't use a Git checkout + substituteInPlace src/dir.proj \ + --replace 'git update-index --assume-unchanged ./Runner.Sdk/BuildConstants.cs' \ + 'echo Patched out.' + # Fix FHS path substituteInPlace src/Test/L0/Util/IOUtilL0.cs \ --replace '/bin/ln' '${coreutils}/bin/ln' From c1fa60f2df53f4ea81bafda4d06ac063dc65b0ee Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 20 Jul 2021 16:55:25 +0100 Subject: [PATCH 188/235] trivy: 0.19.1 -> 0.19.2 --- pkgs/tools/admin/trivy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index f69909d85461..50ca76f0d6d3 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "trivy"; - version = "0.19.1"; + version = "0.19.2"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oiaH0w7TEztR1i0wBuXXr+JN37UZOQ/zObBzQQvAnZY="; + sha256 = "sha256-aYPG0xvuijASKXBGgB+6UyF9bmeU8l5snOoPWI8Ewh8="; }; - vendorSha256 = "sha256-bIQSZ+QQ0CnyOQ692Wpy4nXIPDSkD3LmnjwHZRG6soY="; + vendorSha256 = "sha256-4FO6/1eNyxy/CH7XMUkLfRqEg2+XUXL1gKleL6o4EoM="; excludedPackages = "misc"; From 75d859eab8926b60af6cce59f0e1f467fc7167e4 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Wed, 21 Jul 2021 10:26:28 +0100 Subject: [PATCH 189/235] terraform-ls: 0.19.0 -> 0.19.1 --- pkgs/development/tools/misc/terraform-ls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix index f48c6f9e0b63..86afbcc9421a 100644 --- a/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "terraform-ls"; - version = "0.19.0"; + version = "0.19.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-q97N9I1EzpcFlMuHe3X5rfZHt6XTytYO1inpGEvv1IQ="; + sha256 = "sha256-ag8Dq3lhLoKE4rgrnWLHtKRHEnw/ytyXI+pRt5CgZJI="; }; - vendorSha256 = "sha256-7XcAt0+slNIjxxf7pUl7XO/PAN2z8WmzTuI0FsjgrBM="; + vendorSha256 = "sha256-/lpjlThr6HPkuJ6om9ifBsdsh0x4kVXM6PAonk7GJCY="; ldflags = [ "-s" "-w" "-X main.version=v${version}" "-X main.prerelease=" ]; From 54efed35dfea4a00e8d9e8375aa4184800e866be Mon Sep 17 00:00:00 2001 From: Marcos Benevides Date: Thu, 22 Jul 2021 09:52:20 -0300 Subject: [PATCH 190/235] pythonPackages.tesserocr: 2.5.1 -> 2.5.2 --- pkgs/development/python-modules/tesserocr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tesserocr/default.nix b/pkgs/development/python-modules/tesserocr/default.nix index df1b02283043..0b21e17f96b0 100644 --- a/pkgs/development/python-modules/tesserocr/default.nix +++ b/pkgs/development/python-modules/tesserocr/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "tesserocr"; - version = "2.5.1"; + version = "2.5.2"; src = fetchPypi { inherit pname version; - sha256 = "0cc7d4r11z26rhcwpmcc42fi9kr3f20nq5pk84jrczr18i0g99mh"; + sha256 = "1bmj76gi8401lcqdaaznfmz9yf11myy1bzivqwwq08z3dwzxswck"; }; nativeBuildInputs = [ cython pkg-config ]; From b09718f3852c83a0b7c974feb6c1db729d3b7079 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 22 Jul 2021 16:30:19 +0200 Subject: [PATCH 191/235] mdcat: 0.23.1 -> 0.23.2 --- pkgs/tools/text/mdcat/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index 93f65f45d375..67f69ecc71d2 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -8,33 +8,24 @@ , Security , ansi2html , installShellFiles -, fetchpatch }: rustPlatform.buildRustPackage rec { pname = "mdcat"; - version = "0.23.1"; + version = "0.23.2"; src = fetchFromGitHub { owner = "lunaryorn"; repo = pname; rev = "mdcat-${version}"; - sha256 = "sha256-aJ7rL+EKa5zWmCmekVuRmdeOwTmVo0IQ+GJ8Ga4iTI0="; + sha256 = "sha256-PM6bx7qzEx4He9aX4WRO7ad/f9+wzT+gPGXKwYwG8+A="; }; - patches = [ - # detect wezterm through TERM again which was removed in 0.23.1 - (fetchpatch { - url = "https://github.com/lunaryorn/mdcat/commit/a897b223904748a47c277f7c9a07d59e7d5c916b.patch"; - sha256 = "sha256-tSeNyrlqoGvlfQ3xMRkvqZ7HajMvPCIk7kyt/sVjmTo="; - }) - ]; - nativeBuildInputs = [ pkg-config asciidoctor installShellFiles ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; - cargoSha256 = "sha256-r0dJ/lDOfRzEdwySR/eEvsrO8qn4g7ZIfpekiirUp3Q="; + cargoSha256 = "sha256-GL9WGoyM1++QFAR+bzj0XkjaRaDCWcbcahles5amNpk="; checkInputs = [ ansi2html ]; # Skip tests that use the network and that include files. From f259726f8a21a4ae6a4b3c1af82fc0cb89fb4a16 Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Thu, 22 Jul 2021 07:17:04 -0400 Subject: [PATCH 192/235] pyls-isort: 0.1.1 -> 0.2.2 --- .../python-modules/pyls-isort/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pyls-isort/default.nix b/pkgs/development/python-modules/pyls-isort/default.nix index 35b43969e529..a11acce3c8ba 100644 --- a/pkgs/development/python-modules/pyls-isort/default.nix +++ b/pkgs/development/python-modules/pyls-isort/default.nix @@ -1,29 +1,29 @@ { lib, buildPythonPackage, fetchFromGitHub -, python-language-server, isort +, python-lsp-server, isort }: buildPythonPackage rec { pname = "pyls-isort"; - version = "0.1.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "paradoxxxzero"; repo = "pyls-isort"; - rev = version; - sha256 = "0mf8c6dw5lsj9np20p0vrhr1yfycq2awjk2pil28l579xj9nr0dc"; + rev = "v${version}"; + sha256 = "0xba0aiyjfdi9swjzxk26l94dwlwvn17kkfjfscxl8gvspzsn057"; }; # no tests doCheck = false; propagatedBuildInputs = [ - isort python-language-server + isort python-lsp-server ]; meta = with lib; { homepage = "https://github.com/paradoxxxzero/pyls-isort"; - description = "Isort plugin for python-language-server"; + description = "Isort plugin for python-lsp-server"; license = licenses.mit; - maintainers = [ ]; + maintainers = with maintainers; [ cpcloud ]; }; } From 3e15231c5a299ae75de9fca4915839c31ef21d2c Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 22 Jul 2021 14:29:18 +0200 Subject: [PATCH 193/235] lobster-two: remove and alias to google-fonts is is broken due to the google-code-link but already included in google-fonts. --- pkgs/data/fonts/lobster-two/default.nix | 80 ------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 82 deletions(-) delete mode 100644 pkgs/data/fonts/lobster-two/default.nix diff --git a/pkgs/data/fonts/lobster-two/default.nix b/pkgs/data/fonts/lobster-two/default.nix deleted file mode 100644 index fb1595fe2fc7..000000000000 --- a/pkgs/data/fonts/lobster-two/default.nix +++ /dev/null @@ -1,80 +0,0 @@ -{lib, stdenv, fetchurl}: - -let - - # HG revision in which this version of the font can be fount. - rev = "8e98053718f9a15184c93d6530885791be71b756"; - - urlBase = "https://googlefontdirectory.googlecode.com/hg-history/${rev}/ofl/lobstertwo"; - - # Just a small convenience function. - fetch = {name, path ? "/src", sha256}: - { - inherit name; - file = fetchurl { - url = "${urlBase}${path}/${name}"; - inherit sha256; - }; - }; - - fontlog = - fetch { - name = "FONTLOG.txt"; - path = ""; - sha256 = "0n405i8m70q95y8w43gzr5yvkj7gx7rd3xa4rx6y8qcqv5g7v9if"; - }; - - bold = - fetch { - name = "LobsterTwo-Bold.otf"; - sha256 = "0gkayn96vvgngs9xnmcyyf16q4payk79ghvl354rl93ayb3gf7x0"; - }; - - boldItalic = - fetch { - name = "LobsterTwo-BoldItalic.otf"; - sha256 = "0wznqkvwjqi9s4bg10fpp2345by3nxa0m0w6b3al3zaqyx2p1dxp"; - }; - - italic = - fetch { - name = "LobsterTwo-Italic.otf"; - sha256 = "0lpnzwgwl5fm6gqy8bylbryz0hy94mf1mp615y5sh0wikdvk570z"; - }; - - regular = - fetch { - name = "LobsterTwo-Regular.otf"; - sha256 = "147m3sa3sqqbkbw1hgjdwnw8w0y37x58g5p09s7q2vm74flcpbq1"; - }; -in - - stdenv.mkDerivation rec { - pname = "lobstertwo"; - version = "1.006"; - - phases = ["installPhase"]; - - installPhase = '' - mkdir -p $out/share/fonts/opentype - mkdir -p $out/share/doc/${pname}-${version} - cp -v ${fontlog.file} $out/share/doc/${pname}-${version}/${fontlog.name} - cp -v ${bold.file} $out/share/fonts/opentype/${bold.name} - cp -v ${boldItalic.file} $out/share/fonts/opentype/${boldItalic.name} - cp -v ${italic.file} $out/share/fonts/opentype/${italic.name} - cp -v ${regular.file} $out/share/fonts/opentype/${regular.name} - ''; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "0if9l8pzwgfnbdjg5yblcy08dwn9yj3wzz29l0fycia46xlzd4ym"; - - meta = with lib; { - homepage = "https://github.com/librefonts/lobstertwo"; - description = "Script font with many ligatures"; - license = licenses.ofl; - platforms = platforms.all; - maintainers = [maintainers.rycee]; - broken = true; # googlecode.com RIP; can be built from sources - }; - } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f5cd18c1fbbb..5412880b5f83 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -448,6 +448,7 @@ mapAliases ({ linux-steam-integration = throw "linux-steam-integration has been removed, as the upstream project has been abandoned"; # added 2020-05-22 loadcaffe = throw "loadcaffe has been removed, as the upstream project has been abandoned"; # added 2020-03-28 + lobster-two = google-fonts; # added 2021-07-22 lprof = throw "lprof has been removed as it's unmaintained upstream and broken in nixpkgs since a while ago"; # added 2021-02-15 lttngTools = lttng-tools; # added 2014-07-31 lttngUst = lttng-ust; # added 2014-07-31 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c15ef4e44140..e548a237fc61 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22445,8 +22445,6 @@ in lmodern = callPackage ../data/fonts/lmodern { }; - lobster-two = callPackage ../data/fonts/lobster-two {}; - logitech-udev-rules = callPackage ../os-specific/linux/logitech-udev-rules {}; # lohit-fonts.assamese lohit-fonts.bengali lohit-fonts.devanagari lohit-fonts.gujarati lohit-fonts.gurmukhi From eed26c83ce6f2ede073694c246f10d69fd066bcc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 22 Jul 2021 05:02:54 +0000 Subject: [PATCH 194/235] pantheon.elementary-calculator: 1.6.1 -> 1.6.2 --- pkgs/desktops/pantheon/apps/elementary-calculator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix index 791c2508e120..8b02af57d42d 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "elementary-calculator"; - version = "1.6.1"; + version = "1.6.2"; repoName = "calculator"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "sha256-LGY111wPldxuSfqhZ2E2TeJjexcGbfS25RjLw+Wi99c="; + sha256 = "sha256-kOQr94PAfLPv4LjY2WDdTtlbf3/tYf+NUESZ94+L41M="; }; passthru = { From 704e66cd8321672f2783276cca4f2230f4b28dba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 22 Jul 2021 10:23:22 +0200 Subject: [PATCH 195/235] pythonPackages.capturer: remove unused inputs --- pkgs/development/python-modules/capturer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/capturer/default.nix b/pkgs/development/python-modules/capturer/default.nix index 02bdd0fc72ed..2495040887fd 100644 --- a/pkgs/development/python-modules/capturer/default.nix +++ b/pkgs/development/python-modules/capturer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub, humanfriendly, pytestCheckHook, pytest-cov }: +{ stdenv, lib, buildPythonPackage, fetchFromGitHub, humanfriendly, pytestCheckHook }: buildPythonPackage rec { pname = "capturer"; From 8c95b8c62f9aa2cc9b62b8a934ef94af5cf552b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 22 Jul 2021 10:23:34 +0200 Subject: [PATCH 196/235] pythonPackages.jupyterlab_server: remove unused inputs --- pkgs/development/python-modules/jupyterlab_server/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix index f3f2b9dc32c1..2c60d7b3b273 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -10,7 +10,6 @@ , jupyter_server , openapi-core , pytest-tornasync -, pytest-cov , ruamel-yaml , strict-rfc3339 }: From 06c821aa4eb5d99bf96d6f8541e479240cd607a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 22 Jul 2021 10:23:38 +0200 Subject: [PATCH 197/235] pythonPackages.portalocker: remove unused inputs --- pkgs/development/python-modules/portalocker/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/portalocker/default.nix b/pkgs/development/python-modules/portalocker/default.nix index 8b642240f9cb..eee4a1047fdd 100644 --- a/pkgs/development/python-modules/portalocker/default.nix +++ b/pkgs/development/python-modules/portalocker/default.nix @@ -1,7 +1,5 @@ { lib, buildPythonPackage, fetchPypi , pytestCheckHook -, pytest-cov -, pytest-flake8 , pytest-mypy , redis }: From 093c632b2c742bed57d91cbaa937e62fd27488a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 22 Jul 2021 10:23:43 +0200 Subject: [PATCH 198/235] pythonPackages.sqlalchemy: remove unused inputs --- pkgs/development/python-modules/sqlalchemy/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index a3e00dff4ef6..3aaff20a9eaa 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -9,7 +9,6 @@ , mock , pysqlite ? null , pytestCheckHook -, pytest-xdist }: buildPythonPackage rec { From 97d0bc38f41b707f3f597c8ba7b2569bd9adb549 Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Thu, 22 Jul 2021 12:55:07 -0400 Subject: [PATCH 199/235] pythonPackages.sfepy: 2020.4 -> 2021.2 --- pkgs/development/python-modules/sfepy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sfepy/default.nix b/pkgs/development/python-modules/sfepy/default.nix index dacd589b1212..bf73e7561a13 100644 --- a/pkgs/development/python-modules/sfepy/default.nix +++ b/pkgs/development/python-modules/sfepy/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { name = "sfepy"; - version = "2020.4"; + version = "2021.2"; disabled = pythonOlder "3.8"; src = fetchurl { url="https://github.com/sfepy/sfepy/archive/release_${version}.tar.gz"; - sha256 = "1wb0ik6kjg3mksxin0abr88bhsly67fpg36qjdzabhj0xn7j1yaz"; + sha256 = "1vnynxzbspj900wjyy6020l71jdv2l1wkyax7nhi6w5wvav4kfwz"; }; propagatedBuildInputs = [ From 3bc9d7702ef3358fbdc9cba40f160b116f76108f Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Thu, 22 Jul 2021 11:57:31 -0700 Subject: [PATCH 200/235] alacritty: drop cole-h as maintainer I don't use alacritty any more. --- pkgs/applications/terminal-emulators/alacritty/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix index 60fb743f8591..e4c5eb752d73 100644 --- a/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -131,7 +131,7 @@ rustPlatform.buildRustPackage rec { description = "A cross-platform, GPU-accelerated terminal emulator"; homepage = "https://github.com/alacritty/alacritty"; license = licenses.asl20; - maintainers = with maintainers; [ Br1ght0ne mic92 cole-h ma27 ]; + maintainers = with maintainers; [ Br1ght0ne mic92 ma27 ]; platforms = platforms.unix; changelog = "https://github.com/alacritty/alacritty/blob/v${version}/CHANGELOG.md"; }; From dd1b4bb1334042dffb0ea5a243a8d3b46f2165ad Mon Sep 17 00:00:00 2001 From: Yuka Date: Thu, 22 Jul 2021 21:27:58 +0200 Subject: [PATCH 201/235] qt5.qtwebengine: Fix invisible fonts (#131121) Fixes #131074 --- pkgs/development/libraries/qt-5/5.15/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 5cfca8d80c71..5d8688cfdc75 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -125,6 +125,12 @@ let url = "https://github.com/qt/qtwebengine/commit/199ea00a9eea13315a652c62778738629185b059.patch"; sha256 = "1b5k2g1v8913cvsgvp6ja4mcprjlk5vcwqzi0p1qq7b1wyi4f0g2"; }) + # Fix invisible fonts with glibc 2.33: https://github.com/NixOS/nixpkgs/issues/131074 + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/qt5-qtwebengine/raw/d122c011631137b79455850c363676c655cf9e09/f/qtwebengine-everywhere-src-5.15.5-%231904652.patch"; + name = "qtwebengine-everywhere-src-5.15.5-_1904652.patch"; + sha256 = "01q7hagq0ysii1jnrh5adm97vdm9cis592xr6im7accyw6hgcn7b"; + }) ] ++ optionals stdenv.isDarwin [ ./qtwebengine-darwin-no-platform-check.patch ./qtwebengine-mac-dont-set-dsymutil-path.patch From 9a0f9214cf039f4ab39197d295715d0b1feaff61 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 16 Jul 2021 08:40:40 +0200 Subject: [PATCH 202/235] =?UTF-8?q?ocamlPackages.ocaml-monadic:=200.4.1=20?= =?UTF-8?q?=E2=86=92=200.5.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/ocaml-monadic/default.nix | 9 ++++----- pkgs/top-level/ocaml-packages.nix | 4 +--- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocaml-monadic/default.nix b/pkgs/development/ocaml-modules/ocaml-monadic/default.nix index 69fa4cba8511..9a6dd1f7cb66 100644 --- a/pkgs/development/ocaml-modules/ocaml-monadic/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-monadic/default.nix @@ -1,10 +1,10 @@ { lib, fetchFromGitHub, buildDunePackage -, ocaml-migrate-parsetree, ppx_tools_versioned +, ppxlib }: buildDunePackage rec { pname = "ocaml-monadic"; - version = "0.4.1"; + version = "0.5.0"; useDune2 = true; @@ -12,11 +12,10 @@ buildDunePackage rec { owner = "zepalmer"; repo = pname; rev = version; - sha256 = "1zcwydypk5vwfn1g7srnl5076scwwq5a5y8xwcjl70pc4cpzszll"; + sha256 = "1ynv3yhdqmkhkgnz6c5kv6ryjcc934sdvw9rhh8rjg2dlzlffgbw"; }; - buildInputs = [ ppx_tools_versioned ]; - propagatedBuildInputs = [ ocaml-migrate-parsetree ]; + buildInputs = [ ppxlib ]; meta = { inherit (src.meta) homepage; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 4febee5f5a8b..c17ea27a9e51 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -864,9 +864,7 @@ let ocamlmod = callPackage ../development/tools/ocaml/ocamlmod { }; - ocaml-monadic = callPackage ../development/ocaml-modules/ocaml-monadic { - ocaml-migrate-parsetree = ocaml-migrate-parsetree-2; - }; + ocaml-monadic = callPackage ../development/ocaml-modules/ocaml-monadic { }; ocaml_mysql = callPackage ../development/ocaml-modules/mysql { }; From e7cbc2ef63ee1d586ef14f6c4d6a1cb940d30224 Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Thu, 22 Jul 2021 15:49:28 -0400 Subject: [PATCH 203/235] python3Packages.fastapi: 0.65.2 -> 0.67.0 --- pkgs/development/python-modules/fastapi/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index b804d4943b28..3b14560eb9dd 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "fastapi"; - version = "0.65.2"; + version = "0.67.0"; format = "flit"; src = fetchFromGitHub { owner = "tiangolo"; repo = "fastapi"; rev = version; - sha256 = "032srvbfdy02m1b664x67lkdcx6b2bd4c9a9cb176lscjk213240"; + sha256 = "15zbalyib7ndcbxvf9prj0n9n6qb4bfzhmaacsjrvdmjzmqdjgw0"; }; postPatch = '' @@ -51,7 +51,11 @@ buildPythonPackage rec { ]; # disabled tests require orjson which requires rust nightly - pytestFlagsArray = [ "--ignore=tests/test_default_response_class.py" ]; + + # ignoring deprecation warnings to avoid test failure from + # tests/test_tutorial/test_testing/test_tutorial001.py + + pytestFlagsArray = [ "--ignore=tests/test_default_response_class.py" "-W ignore::DeprecationWarning"]; disabledTests = [ "test_get_custom_response" ]; meta = with lib; { From 100d7db8d05f9ce17e86ec94a000c99d34ae6674 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 22 Jul 2021 11:45:26 +0200 Subject: [PATCH 204/235] python3Packages.aioguardian: 1.0.7 -> 1.0.8 --- .../python-modules/aioguardian/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/aioguardian/default.nix b/pkgs/development/python-modules/aioguardian/default.nix index 74ff8fb3fde6..71e1fb43dd5d 100644 --- a/pkgs/development/python-modules/aioguardian/default.nix +++ b/pkgs/development/python-modules/aioguardian/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "aioguardian"; - version = "1.0.7"; + version = "1.0.8"; src = fetchFromGitHub { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-KMhq86hcqoYloS/6VHsl+3KVEZBbN97ABrZlmEr32Z8="; + sha256 = "0nqsacg0yrsqr6qax4486ffk8r88ra5yixxd6r88jwscm2bmjg3p"; }; format = "pyproject"; @@ -45,15 +45,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - # https://github.com/bachya/aioguardian/pull/66 - substituteInPlace pyproject.toml \ - --replace 'asyncio_dgram = "^1.0.1"' 'asyncio_dgram = "^2.0.0"' - # https://github.com/bachya/aioguardian/pull/67 - substituteInPlace pyproject.toml \ - --replace "poetry>=0.12" "poetry-core" - ''; - disabledTestPaths = [ "examples/" ]; pythonImportsCheck = [ "aioguardian" ]; From 10bc114e32c42eea5222d7c8434a7a8d02e51d0b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 1 Jul 2021 18:29:35 +0200 Subject: [PATCH 205/235] python3Packages.zeroconf: 0.31.0 -> 0.32.0 --- .../python-modules/zeroconf/default.nix | 34 +++++++++++++------ 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 313f121510e1..4c8848c7e5ff 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -1,32 +1,41 @@ { stdenv , lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , ifaddr +, pytest-asyncio , pythonOlder , pytestCheckHook }: buildPythonPackage rec { pname = "zeroconf"; - version = "0.31.0"; + version = "0.32.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-U6GAJIRxxvgb0f/8vOA+2T19jq8QkFyRIaweqZbRmEQ="; + # no tests in pypi sdist + src = fetchFromGitHub { + owner = "jstasiak"; + repo = "python-zeroconf"; + rev = version; + sha256 = "08fnpc236v4n9vrxjj6y2xsm06ax0bnygxf294m6lhwmn1vygy7i"; }; - propagatedBuildInputs = [ ifaddr ]; + propagatedBuildInputs = [ + ifaddr + ]; - checkInputs = [ pytestCheckHook ]; - - pytestFlagsArray = [ "zeroconf/test.py" ]; + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; disabledTests = [ - # disable tests that expect some sort of networking in the build container + # tests that require network interaction "test_close_multiple_times" "test_launch_and_close" + "test_launch_and_close_context_manager" "test_launch_and_close_v4_v6" "test_launch_and_close_v6_only" "test_integration_with_listener_ipv6" @@ -36,7 +45,10 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - pythonImportsCheck = [ "zeroconf" ]; + pythonImportsCheck = [ + "zeroconf" + "zeroconf.asyncio" + ]; meta = with lib; { description = "Python implementation of multicast DNS service discovery"; From 35b447f656402b1c540c9e583cc0ec21148821d1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 1 Jul 2021 18:29:59 +0200 Subject: [PATCH 206/235] python3Packages.aioesphomeapi: 2.9.0 -> 4.1.0 --- .../python-modules/aioesphomeapi/default.nix | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 896b9c71a707..5def5b1d13f8 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -1,22 +1,34 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, attrs, protobuf, zeroconf }: +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, protobuf +, zeroconf +}: buildPythonPackage rec { pname = "aioesphomeapi"; - version = "2.9.0"; + version = "4.1.0"; + format = "setuptools"; - disabled = !isPy3k; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "11259cd1f115d31b91512a209779fa813dded747408100805bc8ecf7c1c1fa82"; + sha256 = "0210l2d5g76pllr2vh990k9shfv3zrknx5d2dmgqb5y90142cp76"; }; - propagatedBuildInputs = [ attrs protobuf zeroconf ]; + propagatedBuildInputs = [ + protobuf + zeroconf + ]; # no tests implemented doCheck = false; - pythonImportsCheck = [ "aioesphomeapi" ]; + pythonImportsCheck = [ + "aioesphomeapi" + ]; meta = with lib; { description = "Python Client for ESPHome native API"; From fc0b15b696152c5c5ef1573f3cdbfde74f009e30 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Jul 2021 02:14:36 +0200 Subject: [PATCH 207/235] octoprint: update zeroconf override Required so it still works with the latest changes to the derivation. Does not make octoprint build, this would require further overrides around the flask/werkzeug ecosystem. --- pkgs/applications/misc/octoprint/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 750043d4a9e3..d7393313c151 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -50,19 +50,25 @@ let } ) - # Octoprint needs zeroconf >=0.24 <0.25. While this should be done in - # the mkOverride aboves, this package also has broken tests, so we need - # a proper override. + # Octoprint needs zeroconf >=0.24 <0.25. This can't be done via mkOverride, because in zeroconf 0.32 + # the super package was migrated to fetchFromGitHub. ( self: super: { zeroconf = super.zeroconf.overrideAttrs (oldAttrs: rec { version = "0.24.5"; - src = oldAttrs.src.override { + src = super.fetchPypi { + inherit (oldAttrs) pname; inherit version; sha256 = "0jpgd0rk91si93857mjrizan5gc42kj1q4fi4160qgk68la88fl9"; }; - buildInputs = [ self.nose ]; - checkPhase = "nosetests"; + pythonImportsCheck = [ + "zeroconf" + ]; + buildInputs = with self; [ + pytestCheckHook + nose + ]; + pytestFlagsArray = [ "zeroconf/test.py" ]; }); } ) From a4ba417d44583f7b6abc57b4f9ff1174cab7aa85 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 6 Jun 2021 17:19:42 +0200 Subject: [PATCH 208/235] python3Packages.vultr: 0.1.2 -> 1.0.1 --- .../python-modules/vultr/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/vultr/default.nix b/pkgs/development/python-modules/vultr/default.nix index 975e4098112a..b6f8a407b234 100644 --- a/pkgs/development/python-modules/vultr/default.nix +++ b/pkgs/development/python-modules/vultr/default.nix @@ -5,26 +5,29 @@ }: buildPythonPackage rec { - version = "0.1.2"; + version = "1.0.1"; pname = "vultr"; src = fetchFromGitHub { - owner = "spry-group"; - repo = "python-vultr"; - rev = version; - sha256 = "1qjvvr2v9gfnwskdl0ayazpcmiyw9zlgnijnhgq9mcri5gq9jw5h"; + owner = "spry-group"; + repo = "python-vultr"; + rev = "v${version}"; + sha256 = "00lc5hdhchvm0472p03019bp9541d8y2773xkjy8vblq9qhys8q7"; }; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ + requests + ]; # Tests disabled. They fail because they try to access the network doCheck = false; + pythonImportsCheck = [ "vultr" ]; + meta = with lib; { description = "Vultr.com API Client"; homepage = "https://github.com/spry-group/python-vultr"; license = licenses.mit; maintainers = with maintainers; [ lihop ]; }; - } From 48add123b4395c0c7bb0df69027a3820567e486a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Jun 2021 21:17:40 +0200 Subject: [PATCH 209/235] python3Packages.python-slugify: 4.0.1 -> 5.0.2 --- .../python-modules/python-slugify/default.nix | 51 ++++++++++++------- 1 file changed, 33 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/python-slugify/default.nix b/pkgs/development/python-modules/python-slugify/default.nix index fd488f4be9d3..14d15df16f68 100644 --- a/pkgs/development/python-modules/python-slugify/default.nix +++ b/pkgs/development/python-modules/python-slugify/default.nix @@ -1,25 +1,40 @@ -{ lib, fetchPypi, buildPythonPackage, python, text-unidecode }: +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, python +, pythonOlder +, text-unidecode +, unidecode +}: buildPythonPackage rec { - pname = "python-slugify"; - version = "4.0.1"; + pname = "python-slugify"; + version = "5.0.2"; + disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "69a517766e00c1268e5bbfc0d010a0a8508de0b18d30ad5a1ff357f8ae724270"; - }; + src = fetchPypi { + inherit pname version; + sha256 = "sha256-8TODoLn8vmSaGJK5yOtPjqsdbYS4S7emJDF6+pgVnKs="; + }; - propagatedBuildInputs = [ text-unidecode ]; + propagatedBuildInputs = [ + text-unidecode + unidecode + ]; - checkPhase = '' - ${python.interpreter} test.py - ''; + checkInputs = [ + pytestCheckHook + ]; - meta = with lib; { - homepage = "https://github.com/un33k/python-slugify"; - description = "A Python Slugify application that handles Unicode"; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ vrthra ]; - }; + pytestFlagsArray = [ "test.py" ]; + + pythonImportsCheck = [ "slugify" ]; + + meta = with lib; { + description = "Python Slugify application that handles Unicode"; + homepage = "https://github.com/un33k/python-slugify"; + license = licenses.mit; + maintainers = with maintainers; [ vrthra ]; + }; } From 6a100bcbac17e0106504d240493abf82c85f0f68 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 18 Jun 2021 23:12:40 +0200 Subject: [PATCH 210/235] python3Packages.pydeconz: 79 -> 80 --- pkgs/development/python-modules/pydeconz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydeconz/default.nix b/pkgs/development/python-modules/pydeconz/default.nix index c202e5df19b5..c6029d216d6f 100644 --- a/pkgs/development/python-modules/pydeconz/default.nix +++ b/pkgs/development/python-modules/pydeconz/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pydeconz"; - version = "79"; + version = "80"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Kane610"; repo = "deconz"; rev = "v${version}"; - sha256 = "sha256-I29UIyHjsIymZxcE084hQoyaEMTXIIQPFcB8lsxY+UI="; + sha256 = "sha256-om1Nhqu2CU+W2k2PGP1+6jLRJihacSQDayOfTzblZKo="; }; propagatedBuildInputs = [ From f986815ac0d47ae03c6ff1bf3bbd31ee82d08acd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 28 Jun 2021 22:59:40 +0200 Subject: [PATCH 211/235] python3Packages.hatasmota: 0.2.14 -> 0.2.19 --- pkgs/development/python-modules/hatasmota/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hatasmota/default.nix b/pkgs/development/python-modules/hatasmota/default.nix index abfc4523965f..9a7ab056a311 100644 --- a/pkgs/development/python-modules/hatasmota/default.nix +++ b/pkgs/development/python-modules/hatasmota/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "hatasmota"; - version = "0.2.14"; + version = "0.2.19"; src = fetchFromGitHub { owner = "emontnemery"; repo = pname; rev = version; - sha256 = "sha256-sCGUlEN1ejWhc2+9JRQ7UPqueq30u8gGSPRxbs4cnLE="; + sha256 = "sha256-h1idJJd2lPV3+tAE59gzITa7jmtBhcEpRuyflf76EAk="; }; propagatedBuildInputs = [ From ce2968c6999e691ee7b6febb4f435e7c4a4c1305 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 22 Jun 2021 14:25:12 +0200 Subject: [PATCH 212/235] python3Packages.wled: 0.6.0 -> 0.7.1 --- pkgs/development/python-modules/wled/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wled/default.nix b/pkgs/development/python-modules/wled/default.nix index 6f06c8dba90b..e38d43ef56b6 100644 --- a/pkgs/development/python-modules/wled/default.nix +++ b/pkgs/development/python-modules/wled/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "wled"; - version = "0.6.0"; + version = "0.7.1"; disabled = pythonOlder "3.8"; format = "pyproject"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-wled"; rev = "v${version}"; - sha256 = "sha256-aFBcSGPCT49TbqzjUv/d8agdPOCC090rNxDnE9y91Pk="; + sha256 = "02xrml9mpq3akwyryg1m7xjmgnlgi5kjvx7vkq6110ai0f9hzpwi"; }; nativeBuildInputs = [ From 1a658c26654448d7b5584acede72c33ce6693e57 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 29 Jun 2021 12:19:59 +0200 Subject: [PATCH 213/235] python3Packages.py17track: init at 3.3.0 --- .../python-modules/py17track/default.nix | 61 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 63 insertions(+) create mode 100644 pkgs/development/python-modules/py17track/default.nix diff --git a/pkgs/development/python-modules/py17track/default.nix b/pkgs/development/python-modules/py17track/default.nix new file mode 100644 index 000000000000..2c7dc8e52eaf --- /dev/null +++ b/pkgs/development/python-modules/py17track/default.nix @@ -0,0 +1,61 @@ +{ lib +, aiohttp +, aresponses +, async-timeout +, attrs +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, pytz +}: + +buildPythonPackage rec { + pname = "py17track"; + version = "3.3.0"; + format = "pyproject"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "bachya"; + repo = pname; + rev = version; + sha256 = "1rnq9ybzj2l3699mjyplc29mxla8fayh52x52cnsz21ixlfd9fky"; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + async-timeout + attrs + pytz + ]; + + checkInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace ">=19.3,<21.0" ">=19.3,<22.0" + ''; + + # Ignore the examples directory as the files are prefixed with test_ + disabledTestPaths = [ "examples/" ]; + + pythonImportsCheck = [ "py17track" ]; + + meta = with lib; { + description = "Python library to track package info from 17track.com"; + homepage = "https://github.com/bachya/py17track"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a1bd5d816af0..68ce1c351608 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5690,6 +5690,8 @@ in { py-ubjson = callPackage ../development/python-modules/py-ubjson { }; + py17track = callPackage ../development/python-modules/py17track { }; + py2bit = callPackage ../development/python-modules/py2bit { }; py3buddy = toPythonModule (callPackage ../development/python-modules/py3buddy { }); From ceb3b9db21fbf66535512b8aa4f654b74c283bf4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 3 Jul 2021 19:59:53 +0200 Subject: [PATCH 214/235] python3Packages.aiohomekit: 0.3.0 -> 0.4.1 --- pkgs/development/python-modules/aiohomekit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index f1c018989c2d..203293ea99aa 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "0.3.0"; + version = "0.4.1"; format = "pyproject"; src = fetchFromGitHub { owner = "Jc2k"; repo = pname; rev = version; - sha256 = "sha256-chRUQyCDXW4of0XBdmKuQEzUE3Gt4A2uGlPNy+oEoco="; + sha256 = "sha256-HAomYZKxf3VDIoy8VvhGy59KfJv7H2Or1YUZX+6CxKk="; }; nativeBuildInputs = [ From 1f458316958a8147091c47a6289f855f005e3a0f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 5 Jul 2021 08:49:37 +0200 Subject: [PATCH 215/235] python3Packages.gios: 1.0.1 -> 1.0.2 --- pkgs/development/python-modules/gios/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gios/default.nix b/pkgs/development/python-modules/gios/default.nix index 71aae7b66ad9..3c5de1295c26 100644 --- a/pkgs/development/python-modules/gios/default.nix +++ b/pkgs/development/python-modules/gios/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "gios"; - version = "1.0.1"; + version = "1.0.2"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "bieniu"; repo = pname; rev = version; - sha256 = "031z5j1j961pcw8s4ajj5z2xn2jxb2hyfn3x3bxbaagwl9a5qkvn"; + sha256 = "sha256-7+np1lUbBFSTJNAD6OT5k89MM+kzEj90JlulXGm36k8="; }; propagatedBuildInputs = [ From a6416a9b114fb30544596ee115456726ce744392 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 5 Jul 2021 09:01:10 +0200 Subject: [PATCH 216/235] python3Packages.hap-python: 3.5.0 -> 3.5.1 --- pkgs/development/python-modules/hap-python/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/hap-python/default.nix b/pkgs/development/python-modules/hap-python/default.nix index 946f0039a0af..cba02387be5d 100644 --- a/pkgs/development/python-modules/hap-python/default.nix +++ b/pkgs/development/python-modules/hap-python/default.nix @@ -17,15 +17,15 @@ buildPythonPackage rec { pname = "hap-python"; - version = "3.5.0"; - disabled = pythonOlder "3.5"; + version = "3.5.1"; + disabled = pythonOlder "3.6"; # pypi package does not include tests src = fetchFromGitHub { owner = "ikalchev"; repo = "HAP-python"; rev = "v${version}"; - sha256 = "1vzlfx0gpidl0rzv4z94pziwm6rj4lrilly5pykgq984y708pcqf"; + sha256 = "sha256-ZHTqlb7LIDp8MFNW8MFg6jX7QwaxT40cLi3H13ONLCI="; }; propagatedBuildInputs = [ From 231a108d5e6f3f6944e5c63ae7a436dc3abd5380 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 24 Jun 2021 10:03:10 +0200 Subject: [PATCH 217/235] python3Packages.dacite: init at 1.6.0 --- .../python-modules/dacite/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/dacite/default.nix diff --git a/pkgs/development/python-modules/dacite/default.nix b/pkgs/development/python-modules/dacite/default.nix new file mode 100644 index 000000000000..67b1722be51f --- /dev/null +++ b/pkgs/development/python-modules/dacite/default.nix @@ -0,0 +1,32 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, pythonOlder +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "dacite"; + version = "1.6.0"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "konradhalas"; + repo = pname; + rev = "v${version}"; + sha256 = "0nv2bnj3bq2v08ac4p583cnpjq2d6bv5isycgji5i5wg1y082a3d"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "dacite" ]; + + meta = with lib; { + description = "Python helper to create data classes from dictionaries"; + homepage = "https://github.com/konradhalas/dacite"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 68ce1c351608..c62b48906c76 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1770,6 +1770,8 @@ in { d2to1 = callPackage ../development/python-modules/d2to1 { }; + dacite = callPackage ../development/python-modules/dacite { }; + daemonize = callPackage ../development/python-modules/daemonize { }; daemonocle = callPackage ../development/python-modules/daemonocle { }; From 43b204b66a51e0f94ff36a7a5e7bf7ea4da6c3a9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 24 Jun 2021 10:03:41 +0200 Subject: [PATCH 218/235] python3Packages.nettigo-air-monitor: 0.2.6 -> 1.0.0 --- .../python-modules/nettigo-air-monitor/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix index 9cf8618bb301..4787d9d6f768 100644 --- a/pkgs/development/python-modules/nettigo-air-monitor/default.nix +++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -2,6 +2,7 @@ , aiohttp , aioresponses , buildPythonPackage +, dacite , fetchFromGitHub , pytest-asyncio , pytest-error-for-skips @@ -11,18 +12,19 @@ buildPythonPackage rec { pname = "nettigo-air-monitor"; - version = "0.2.6"; + version = "1.0.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "bieniu"; repo = pname; rev = version; - sha256 = "0zs14g02m1ahyrhl2ihk74fp390g4672r1jjiaawmkxrvib07dvp"; + sha256 = "sha256-VTKIUo3rR/HyEW/d/Nm0fm7wbgSdLGf02i8R3om1oCE="; }; propagatedBuildInputs = [ aiohttp + dacite ]; checkInputs = [ From 42e92cbec32d73f6eae95e0e6e21500d92b5a952 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Jul 2021 02:45:38 +0200 Subject: [PATCH 219/235] python3Packages.aiohomekit: 0.4.1 -> 0.4.2 --- pkgs/development/python-modules/aiohomekit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index 203293ea99aa..981a541e9ec8 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "0.4.1"; + version = "0.4.2"; format = "pyproject"; src = fetchFromGitHub { owner = "Jc2k"; repo = pname; rev = version; - sha256 = "sha256-HAomYZKxf3VDIoy8VvhGy59KfJv7H2Or1YUZX+6CxKk="; + sha256 = "12v9szalh3yzfqgmspk4ch8l38kzmhwzjn9jvsq632n4zhjd7qg4"; }; nativeBuildInputs = [ From 19fa9055f961e83f89b6c356bc943a8ed9e2e863 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Jul 2021 02:58:18 +0200 Subject: [PATCH 220/235] python3Packages.pyeight: 0.1.7 -> 0.1.9 --- pkgs/development/python-modules/pyeight/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyeight/default.nix b/pkgs/development/python-modules/pyeight/default.nix index a714bbfaba95..dc390120f600 100644 --- a/pkgs/development/python-modules/pyeight/default.nix +++ b/pkgs/development/python-modules/pyeight/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyeight"; - version = "0.1.7"; + version = "0.1.9"; disabled = !isPy3k; src = fetchFromGitHub { owner = "mezz64"; repo = "pyEight"; rev = version; - sha256 = "sha256-kTxd6nRsPvCjrXApjKcoghOISIMho5x9/kK7OvHjKQM="; + sha256 = "1ybhs09wyzzaryghd6ijxhajp3677x63c4qzqsgln1mmxhj8wm5k"; }; propagatedBuildInputs = [ From 73e7c7da0d67c41e75e3ed30c4f1025bd7ab657c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Jul 2021 03:02:47 +0200 Subject: [PATCH 221/235] python3Packages.simplisafe-python: 10.0.0 -> 11.0.1 --- pkgs/development/python-modules/simplisafe-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/simplisafe-python/default.nix b/pkgs/development/python-modules/simplisafe-python/default.nix index 3e2a90b496b6..7bcd6340acfc 100644 --- a/pkgs/development/python-modules/simplisafe-python/default.nix +++ b/pkgs/development/python-modules/simplisafe-python/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "simplisafe-python"; - version = "10.0.0"; + version = "11.0.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-VF8R+dty54GuWvYs/OqWhfGtOVieuxtfndQUxHhu5lc="; + sha256 = "04fn65iwzgvxi44kgvgvxjr3nzi2f4hwlqrjxfvc5yda96qp347c"; }; nativeBuildInputs = [ poetry-core ]; From 0f83dca20d0e2afb0d4040cd9d8057fcc3c12810 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Jul 2021 03:06:34 +0200 Subject: [PATCH 222/235] python3Packages.zeroconf: 0.32.0 -> 0.32.1 --- pkgs/development/python-modules/zeroconf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 4c8848c7e5ff..fc869efe087d 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.32.0"; + version = "0.32.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = version; - sha256 = "08fnpc236v4n9vrxjj6y2xsm06ax0bnygxf294m6lhwmn1vygy7i"; + sha256 = "02fvh5ii73rf6pg9x93pc0sl1isx2ivg3d80l6s8h35w2f4g4azf"; }; propagatedBuildInputs = [ From 7055df11b82840167c63aceb58102889f26cffec Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Jul 2021 03:09:33 +0200 Subject: [PATCH 223/235] python3Packages.zha-quirks: 0.0.58 -> 0.0.59 --- pkgs/development/python-modules/zha-quirks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 37fbc87f3f79..89db9de12b75 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.58"; + version = "0.0.59"; src = fetchFromGitHub { owner = "zigpy"; repo = "zha-device-handlers"; rev = version; - sha256 = "sha256-QU5ssbnT3/gioQ3vM9zvlbwxqSWyKIylsV9NuFkNe+Q="; + sha256 = "1x6s44apl393as847ghbqr26h0y0h4w3wp53bs0m2nfbzjwin3i7"; }; propagatedBuildInputs = [ From 607652844dde20143cad9fb49ba4ed709e899a6b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Jul 2021 14:08:46 +0200 Subject: [PATCH 224/235] fritzprofiles init at 0.6.1 --- .../python-modules/fritzprofiles/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/fritzprofiles/default.nix diff --git a/pkgs/development/python-modules/fritzprofiles/default.nix b/pkgs/development/python-modules/fritzprofiles/default.nix new file mode 100644 index 000000000000..17716e5fc950 --- /dev/null +++ b/pkgs/development/python-modules/fritzprofiles/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, lxml +, requests +}: + +buildPythonPackage rec { + pname = "fritzprofiles"; + version = "0.6.1"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "1bd4sa3i1ldkg6lnsvg004csgqklvi5xk71y971qyjvsbdbwgbn3"; + }; + + propagatedBuildInputs = [ + lxml + requests + ]; + + pythonImportsCheck = [ + "fritzprofiles" + ]; + + # no tests + doCheck = false; + + meta = with lib; { + description = "Tool to switch the online time of profiles in the AVM Fritz!Box"; + homepage = "https://github.com/AaronDavidSchneider/fritzprofiles"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c15ef4e44140..5e0d44e6b41c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23978,6 +23978,8 @@ in fritzing = libsForQt5.callPackage ../applications/science/electronics/fritzing { }; + fritzprofiles = with python3.pkgs; toPythonApplication fritzprofiles; + fsv = callPackage ../applications/misc/fsv { autoreconfHook = buildPackages.autoreconfHook269; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c62b48906c76..d2be8ea83633 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2736,6 +2736,8 @@ in { fritzconnection = callPackage ../development/python-modules/fritzconnection { }; + fritzprofiles = callPackage ../development/python-modules/fritzprofiles { }; + frozendict = callPackage ../development/python-modules/frozendict { }; frozenlist = callPackage ../development/python-modules/frozenlist { }; From a88211b55af24072aaaa78fdc9feb0373c61a7c8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 8 Jul 2021 10:04:38 +0200 Subject: [PATCH 225/235] python3Packages.plexapi: 4.5.2 -> 4.6.1 --- pkgs/development/python-modules/plexapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix index 5c41c3308bed..d2e04586e382 100644 --- a/pkgs/development/python-modules/plexapi/default.nix +++ b/pkgs/development/python-modules/plexapi/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "PlexAPI"; - version = "4.5.2"; + version = "4.6.1"; disabled = isPy27; src = fetchFromGitHub { owner = "pkkid"; repo = "python-plexapi"; rev = version; - sha256 = "sha256-9rdpisEuLUO7oO7+7SQb4fXqRG30rf4R7bSFY+QpMhM="; + sha256 = "sha256-WL5UBsvAdtfOCkVX9NI0Z2fJ2CAO+NwD8wvkvkJ2uww="; }; propagatedBuildInputs = [ From 7553e11825b73baef9f3ad27308b3ddb2c17e860 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 8 Jul 2021 09:47:44 +0200 Subject: [PATCH 226/235] python3Packages.pysma: 0.6.0 -> 0.6.2 --- pkgs/development/python-modules/pysma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysma/default.nix b/pkgs/development/python-modules/pysma/default.nix index 8a6452fb6682..15d40bce9fa8 100644 --- a/pkgs/development/python-modules/pysma/default.nix +++ b/pkgs/development/python-modules/pysma/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pysma"; - version = "0.6.0"; + version = "0.6.2"; src = fetchPypi { inherit pname version; - sha256 = "8e997cf28c3ae7ccc90caa84aa3a3ed9245fac3e9cf76efb1467e4f4800143dc"; + sha256 = "sha256-nKnOWVPRFmylwUeb0yApMHdW8vGvPCLlOGkZGNYC128="; }; propagatedBuildInputs = [ From cf868fab6c3a949078a4904659d8df25ad442cdc Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Thu, 22 Jul 2021 23:10:26 +0200 Subject: [PATCH 227/235] trillian: 1.3.11 -> 1.3.13 Changelogs: https://github.com/google/trillian/releases/tag/v1.3.12 https://github.com/google/trillian/releases/tag/v1.3.13 --- pkgs/tools/misc/trillian/default.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/misc/trillian/default.nix b/pkgs/tools/misc/trillian/default.nix index 8a96248e718a..9959fe9375be 100644 --- a/pkgs/tools/misc/trillian/default.nix +++ b/pkgs/tools/misc/trillian/default.nix @@ -5,28 +5,21 @@ buildGoModule rec { pname = "trillian"; - version = "1.3.11"; - vendorSha256 = "0zxp1gjzcc3z6vkpc2bchbs1shwm1b28ks0jh4gf6zxpp4361j4l"; + version = "1.3.13"; + vendorSha256 = "1ad0vaw0k57njzk9x233iqjbplyvw66qjk8r9j7sx87pdc6a4lpb"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "1lh19wba90y91l5jj8ilzjqxgmqqqdvyn7pzrwvmzv7iiy18wcmh"; + sha256 = "1ns394yd4js9g1psd1dkrffidyzixqvjp5lhw2x2iycrxbnm3y44"; }; - # Remove tests that require networking - postPatch = '' - rm cmd/get_tree_public_key/main_test.go - ''; - subPackages = [ "cmd/trillian_log_server" "cmd/trillian_log_signer" - "cmd/trillian_map_server" "cmd/createtree" "cmd/deletetree" - "cmd/get_tree_public_key" "cmd/updatetree" ]; From 05ae01fcea6c7d270cc15374b0a806b09f548a9a Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 22 Jul 2021 23:15:53 +0200 Subject: [PATCH 228/235] buku: fix build Failing Hydra build: https://hydra.nixos.org/build/148285785 The underlying issue is `flask-admin` not working with newer versions of `SQLAlchemy` and `SQLAlchemy-Utils`[1]. I decided to only fix `buku` now since this is the package I wanted to take care of initially. Also, multiple versions of python packages - a measure that would be necessary for `flask-admin` - are generally discouraged[2]. [1] 1.5.8 works with `SQLAlchemy`, but is broken with `SQLAlchemy-Utils` at 0.37, see also https://github.com/flask-admin/flask-admin/issues/2113 [2] https://github.com/NixOS/nixpkgs/pull/127707 --- pkgs/applications/misc/buku/default.nix | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index 68b4f7b3e560..90bd40e64579 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -1,6 +1,26 @@ { lib, python3, fetchFromGitHub }: -with python3.pkgs; buildPythonApplication rec { +let + python3' = python3.override { + packageOverrides = self: super: { + sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { + version = "1.3.24"; + src = oldAttrs.src.override { + inherit version; + sha256 = "ebbb777cbf9312359b897bf81ba00dae0f5cb69fba2a18265dcc18a6f5ef7519"; + }; + }); + sqlalchemy-utils = super.sqlalchemy-utils.overridePythonAttrs (oldAttrs: rec { + version = "0.36.6"; + src = oldAttrs.src.override { + inherit version; + sha256 = "0srs5w486wp5zydjs70igi5ypgxhm6h73grb85jz03fqpqaanzvs"; + }; + }); + }; + }; +in +with python3'.pkgs; buildPythonApplication rec { version = "4.5"; pname = "buku"; From b47a85441986b14661fd2109eab6834c6a2b9c55 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 22 Jul 2021 23:21:28 +0200 Subject: [PATCH 229/235] buku: 4.5 -> 4.6 ChangeLog: https://github.com/jarun/buku/releases/tag/v4.6 --- pkgs/applications/misc/buku/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index 90bd40e64579..0729df72492b 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -21,20 +21,21 @@ let }; in with python3'.pkgs; buildPythonApplication rec { - version = "4.5"; + version = "4.6"; pname = "buku"; src = fetchFromGitHub { owner = "jarun"; repo = "buku"; rev = "v${version}"; - sha256 = "1lcq5fk8d5j2kfhn9m5l2hk46v7nj4vfa22m1psz35c9zpw4px8q"; + sha256 = "sha256-hr9qiP7SbloigDcs+6KVWu0SOlggMaBr7CCfY8zoJG0="; }; checkInputs = [ pytestcov hypothesis pytest + pytest-vcr pylint flake8 pyyaml @@ -75,8 +76,8 @@ with python3'.pkgs; buildPythonApplication rec { # Disables a test which requires internet substituteInPlace tests/test_bukuDb.py \ --replace "@pytest.mark.slowtest" "@unittest.skip('skipping')" \ - --replace "self.assertEqual(shorturl, 'http://tny.im/yt')" "" \ - --replace "self.assertEqual(url, 'https://www.google.com')" "" + --replace "self.assertEqual(shorturl, \"http://tny.im/yt\")" "" \ + --replace "self.assertEqual(url, \"https://www.google.com\")" "" substituteInPlace setup.py \ --replace mypy-extensions==0.4.1 mypy-extensions>=0.4.1 ''; @@ -95,7 +96,7 @@ with python3'.pkgs; buildPythonApplication rec { homepage = "https://github.com/jarun/Buku"; license = licenses.gpl3; platforms = platforms.unix; - maintainers = with maintainers; [ matthiasbeyer infinisil ]; + maintainers = with maintainers; [ matthiasbeyer infinisil ma27 ]; }; } From 49f7a7a1f096dc39ce77429e571e620ba44c1e94 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 22 Jul 2021 23:43:00 +0200 Subject: [PATCH 230/235] sqldeveloper: remove `ma27` from maintainer-list I don't use this anymore. I guess this is sufficiently trivial to directly push. --- pkgs/development/tools/database/sqldeveloper/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix index 2e361076ae48..ef95263185c9 100644 --- a/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/pkgs/development/tools/database/sqldeveloper/default.nix @@ -79,6 +79,6 @@ in homepage = "http://www.oracle.com/technetwork/developer-tools/sql-developer/overview/"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ ardumont ma27 ]; + maintainers = with maintainers; [ ardumont ]; }; } From 92b738ad790da95a07160a16f85c0ca70965285e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Jul 2021 02:38:18 +0200 Subject: [PATCH 231/235] home-assistant: 2021.6.6 -> 2021.7.0 --- ...ests-ignore-OSErrors-in-hass-fixture.patch | 27 ++++++++++ .../home-assistant/component-packages.nix | 25 +++++---- pkgs/servers/home-assistant/default.nix | 52 +++++++------------ pkgs/servers/home-assistant/frontend.nix | 4 +- pkgs/servers/home-assistant/update.sh | 8 ++- 5 files changed, 69 insertions(+), 47 deletions(-) create mode 100644 pkgs/servers/home-assistant/0001-tests-ignore-OSErrors-in-hass-fixture.patch diff --git a/pkgs/servers/home-assistant/0001-tests-ignore-OSErrors-in-hass-fixture.patch b/pkgs/servers/home-assistant/0001-tests-ignore-OSErrors-in-hass-fixture.patch new file mode 100644 index 000000000000..add0ea1d5521 --- /dev/null +++ b/pkgs/servers/home-assistant/0001-tests-ignore-OSErrors-in-hass-fixture.patch @@ -0,0 +1,27 @@ +From 3e3f5c37252a33ea1e71c39f2ca0f13940c261ad Mon Sep 17 00:00:00 2001 +From: Martin Weinelt +Date: Sat, 17 Jul 2021 16:11:23 +0200 +Subject: [PATCH] tests: ignore OSErrors in hass fixture + +The nix sandbox will cause OSErrors due to limitations imposed on +network interaction. This change makes it so we forgive these cases. +--- + tests/conftest.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tests/conftest.py b/tests/conftest.py +index 1f5ffc80d0..b284727a0f 100644 +--- a/tests/conftest.py ++++ b/tests/conftest.py +@@ -168,6 +168,8 @@ def hass(loop, load_registries, hass_storage, request): + continue + if isinstance(ex, ServiceNotFound): + continue ++ if isinstance(ex, OSError): ++ continue + raise ex + + +-- +2.32.0 + diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 675d9b437576..2190bd6b2787 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2021.6.6"; + version = "2021.7.0"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; @@ -27,6 +27,7 @@ "almond" = ps: with ps; [ aiohttp-cors pyalmond ]; "alpha_vantage" = ps: with ps; [ alpha-vantage ]; "amazon_polly" = ps: with ps; [ boto3 ]; + "ambee" = ps: with ps; [ ambee ]; "ambiclimate" = ps: with ps; [ aiohttp-cors ambiclimate ]; "ambient_station" = ps: with ps; [ aioambient ]; "amcrest" = ps: with ps; [ amcrest ha-ffmpeg ]; @@ -90,7 +91,7 @@ "blueprint" = ps: with ps; [ ]; "bluesound" = ps: with ps; [ xmltodict ]; "bluetooth_le_tracker" = ps: with ps; [ pygatt ]; - "bluetooth_tracker" = ps: with ps; [ bt_proximity pybluez ]; + "bluetooth_tracker" = ps: with ps; [ bt-proximity pybluez ]; "bme280" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense "bme680" = ps: with ps; [ bme680 smbus-cffi ]; "bmp280" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-bmp280 @@ -157,7 +158,7 @@ "deconz" = ps: with ps; [ pydeconz ]; "decora" = ps: with ps; [ bluepy ]; # missing inputs: decora "decora_wifi" = ps: with ps; [ ]; # missing inputs: decora_wifi - "default_config" = ps: with ps; [ pynacl aiodiscover aiohttp-cors async-upnp-client defusedxml distro emoji hass-nabucasa home-assistant-frontend ifaddr netdisco pillow scapy sqlalchemy zeroconf ]; + "default_config" = ps: with ps; [ pynacl aiodiscover aiohttp-cors async-upnp-client defusedxml distro emoji hass-nabucasa home-assistant-frontend ifaddr pillow scapy sqlalchemy zeroconf ]; "delijn" = ps: with ps; [ pydelijn ]; "deluge" = ps: with ps; [ deluge-client ]; "demo" = ps: with ps; [ aiohttp-cors ]; @@ -276,6 +277,7 @@ "folder" = ps: with ps; [ ]; "folder_watcher" = ps: with ps; [ watchdog ]; "foobot" = ps: with ps; [ foobot-async ]; + "forecast_solar" = ps: with ps; [ forecast-solar ]; "forked_daapd" = ps: with ps; [ ]; # missing inputs: pyforked-daapd pylibrespot-java "fortios" = ps: with ps; [ fortiosapi ]; "foscam" = ps: with ps; [ libpyfoscam ]; @@ -283,7 +285,8 @@ "free_mobile" = ps: with ps; [ ]; # missing inputs: freesms "freebox" = ps: with ps; [ freebox-api ]; "freedns" = ps: with ps; [ ]; - "fritz" = ps: with ps; [ fritzconnection ]; + "freedompro" = ps: with ps; [ pyfreedompro ]; + "fritz" = ps: with ps; [ aiohttp-cors fritzconnection fritzprofiles ifaddr xmltodict ]; "fritzbox" = ps: with ps; [ pyfritzhome ]; "fritzbox_callmonitor" = ps: with ps; [ fritzconnection ]; "fritzbox_netmonitor" = ps: with ps; [ fritzconnection ]; @@ -520,6 +523,7 @@ "mochad" = ps: with ps; [ ]; # missing inputs: pymochad "modbus" = ps: with ps; [ pymodbus ]; "modem_callerid" = ps: with ps; [ ]; # missing inputs: basicmodem + "modern_forms" = ps: with ps; [ aiomodernforms ]; "mold_indicator" = ps: with ps; [ ]; "monoprice" = ps: with ps; [ ]; # missing inputs: pymonoprice "moon" = ps: with ps; [ ]; @@ -732,6 +736,7 @@ "scsgate" = ps: with ps; [ ]; # missing inputs: scsgate "search" = ps: with ps; [ aiohttp-cors ]; "season" = ps: with ps; [ ephem ]; + "select" = ps: with ps; [ ]; "sendgrid" = ps: with ps; [ sendgrid ]; "sense" = ps: with ps; [ sense-energy ]; "sensehat" = ps: with ps; [ ]; # missing inputs: sense-hat @@ -742,7 +747,7 @@ "serial_pm" = ps: with ps; [ pmsensor ]; "sesame" = ps: with ps; [ ]; # missing inputs: pysesame2 "seven_segments" = ps: with ps; [ pillow ]; - "seventeentrack" = ps: with ps; [ ]; # missing inputs: py17track + "seventeentrack" = ps: with ps; [ py17track ]; "sharkiq" = ps: with ps; [ sharkiqpy ]; "shell_command" = ps: with ps; [ ]; "shelly" = ps: with ps; [ aioshelly ]; @@ -788,7 +793,7 @@ "somfy_mylink" = ps: with ps; [ somfy-mylink-synergy ]; "sonarr" = ps: with ps; [ sonarr ]; "songpal" = ps: with ps; [ python-songpal ]; - "sonos" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket pysonos ]; + "sonos" = ps: with ps; [ aiohttp-cors async-upnp-client defusedxml ifaddr plexapi plexauth plexwebsocket pysonos zeroconf ]; "sony_projector" = ps: with ps; [ ]; # missing inputs: pysdcp "soundtouch" = ps: with ps; [ aiohttp-cors ifaddr libsoundtouch zeroconf ]; "spaceapi" = ps: with ps; [ aiohttp-cors ]; @@ -800,7 +805,7 @@ "sql" = ps: with ps; [ sqlalchemy ]; "squeezebox" = ps: with ps; [ pysqueezebox ]; "srp_energy" = ps: with ps; [ srpenergy ]; - "ssdp" = ps: with ps; [ aiohttp-cors async-upnp-client defusedxml ifaddr netdisco zeroconf ]; + "ssdp" = ps: with ps; [ aiohttp-cors async-upnp-client defusedxml ifaddr zeroconf ]; "starline" = ps: with ps; [ starline ]; "starlingbank" = ps: with ps; [ ]; # missing inputs: starlingbank "startca" = ps: with ps; [ xmltodict ]; @@ -907,7 +912,7 @@ "upc_connect" = ps: with ps; [ connect-box ]; "upcloud" = ps: with ps; [ upcloud-api ]; "updater" = ps: with ps; [ distro ]; - "upnp" = ps: with ps; [ async-upnp-client ]; + "upnp" = ps: with ps; [ aiohttp-cors async-upnp-client defusedxml ifaddr zeroconf ]; "uptime" = ps: with ps; [ ]; "uptimerobot" = ps: with ps; [ ]; # missing inputs: pyuptimerobot "uscis" = ps: with ps; [ ]; # missing inputs: uscisstatus @@ -972,13 +977,13 @@ "xeoma" = ps: with ps; [ pyxeoma ]; "xiaomi" = ps: with ps; [ ha-ffmpeg ]; "xiaomi_aqara" = ps: with ps; [ pyxiaomigateway aiohttp-cors ifaddr netdisco zeroconf ]; - "xiaomi_miio" = ps: with ps; [ construct python-miio ]; + "xiaomi_miio" = ps: with ps; [ construct micloud python-miio ]; "xiaomi_tv" = ps: with ps; [ pymitv ]; "xmpp" = ps: with ps; [ slixmpp ]; "xs1" = ps: with ps; [ ]; # missing inputs: xs1-api-client "yale_smart_alarm" = ps: with ps; [ yalesmartalarmclient ]; "yamaha" = ps: with ps; [ rxv ]; - "yamaha_musiccast" = ps: with ps; [ ]; # missing inputs: pymusiccast + "yamaha_musiccast" = ps: with ps; [ aiomusiccast ]; "yandex_transport" = ps: with ps; [ aioymaps ]; "yandextts" = ps: with ps; [ ]; "yeelight" = ps: with ps; [ yeelight ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index c9a4a15a87c0..36af74cc1620 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -22,19 +22,7 @@ let defaultOverrides = [ # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt - - # Pinned due to API changes in aiopvpc>=2.2.0, remove after 2021.7.0 - (self: super: { - aiopvpc = super.aiopvpc.overridePythonAttrs (oldAttr: rec { - version = "2.1.2"; - src = fetchFromGitHub { - owner = "azogue"; - repo = "aiopvpc"; - rev = "v${version}"; - sha256 = "0s8ki46dh39kw6qvsjcfcxa0gblyi33m3hry137kbi4lw5ws6qhr"; - }; - }); - }) + (mkOverride "python-slugify" "4.0.1" "69a517766e00c1268e5bbfc0d010a0a8508de0b18d30ad5a1ff357f8ae724270") # Pinned due to API changes in iaqualink>=2.0, remove after # https://github.com/home-assistant/core/pull/48137 was merged @@ -70,19 +58,6 @@ let (mkOverride "ring-doorbell" "0.6.2" "fbd537722a27b3b854c26506d894b7399bb8dc57ff36083285971227a2d46560") - # Pinned due to API changes in pyatmo>=5.1.0 - (self: super: { - pyatmo = super.pyatmo.overridePythonAttrs (oldAttrs: rec { - version = "5.0.1"; - src = fetchFromGitHub { - owner = "jabesq"; - repo = "pyatmo"; - rev = "v${version}"; - sha256 = "0can9v602iqfn0l01fd7gr63qzvcngfm0qka4s1x0pldh6avxmfh"; - }; - }); - }) - # Pinned due to API changes in pyatv>=0.8.0 (self: super: { pyatv = super.pyatv.overridePythonAttrs (olAttrs: rec { @@ -149,8 +124,6 @@ let }); }) - (mkOverride "pysma" "0.4.3" "sha256-vriMnJFS7yfTyDT1f4sx1xEBTQjqc4ZHmkdHp1vcd+Q=") - # Pinned due to API changes in eebrightbox>=0.0.5 (self: super: { eebrightbox = super.eebrightbox.overridePythonAttrs (oldAttrs: rec { @@ -197,7 +170,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.6.6"; + hassVersion = "2021.7.0"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -214,11 +187,12 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "0r8l2qya9pdl65kq3xrnb1vhmbnxm3bj12hn1wyxmw56l8m9l5d5"; + sha256 = "1dx1pmi0w265pyajmmvd7k6vb5z7s77a7b161zd0n4zsb989dil6"; }; # leave this in, so users don't have to constantly update their downstream patch handling patches = [ + ./0001-tests-ignore-OSErrors-in-hass-fixture.patch ]; postPatch = '' @@ -673,7 +647,8 @@ in with py.pkgs; buildPythonApplication rec { "somfy_mylink" "sonarr" "songpal" - "sonos" + # disable sonos components test because they rely on ssdp, which doesn't work in our sandbox + # "sonos" "soundtouch" "spaceapi" "speedtestdotnet" @@ -735,7 +710,8 @@ in with py.pkgs; buildPythonApplication rec { "upb" "upcloud" "updater" - "upnp" + # disabled, because it tries to join a multicast group and fails to find a usable network interface + # "upnp" "uptime" "usgs_earthquakes_feed" "utility_meter" @@ -751,7 +727,8 @@ in with py.pkgs; buildPythonApplication rec { "vizio" "voicerss" "volumio" - "vultr" + # disabled, becaused AttributeError: does not have the attribute 'server_list' + # "vultr" "wake_on_lan" "wallbox" "water_heater" @@ -776,7 +753,8 @@ in with py.pkgs; buildPythonApplication rec { "yandex_transport" "yandextts" "yeelight" - "zeroconf" + # disabled, because it tries to join a multicast group and fails to find a usable network interface + # "zeroconf" "zerproc" "zha" "zodiac" @@ -826,6 +804,8 @@ in with py.pkgs; buildPythonApplication rec { # wallbox/test_config_flow.py: Tries to connect to api.wall-box.cim: Failed to establish a new connection: [Errno -2] Name or service not known "--deselect tests/components/wallbox/test_config_flow.py::test_form_invalid_auth" "--deselect tests/components/wallbox/test_config_flow.py::test_form_cannot_connect" + # tests/components/default_config/test_init.py: Tries to check for updates and fails ungracefully without network access + "--deselect tests/components/default_config/test_init.py::test_setup" # tests are located in tests/ "tests" # dynamically add packages required for component tests @@ -861,6 +841,10 @@ in with py.pkgs; buildPythonApplication rec { "test_onboarding_core_no_rpi_power" # hue/test_sensor_base.py: Race condition when counting events "test_hue_events" + # homekit/test_homekit.py: Tries to use zeroconf, which tries to join a multicast group + "test_homekit_uses_system_zeroconf" + # august/test_lock.py: AssertionError: assert 'unlocked' == 'locked' + "test_lock_update_via_pubnub" ]; preCheck = '' diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index f59f3943cd03..a42b13a260d5 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20210603.0"; + version = "20210707.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2UhbtaxEcOkD9Z5g9gZs+QjuVLXZGCEcmKoxRtIEYxw="; + sha256 = "sha256-6RR+T4+vS6g00+MS1ty8aFVx6WM2dE+c17+wDoPxnGg="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/update.sh b/pkgs/servers/home-assistant/update.sh index 5ed865f411e2..8b17dabdfe28 100755 --- a/pkgs/servers/home-assistant/update.sh +++ b/pkgs/servers/home-assistant/update.sh @@ -23,10 +23,16 @@ sed -i -e "s/version =.*/version = \"${TARGET_VERSION}\";/" \ sed -i -e "s/hassVersion =.*/hassVersion = \"${TARGET_VERSION}\";/" \ default.nix -./parse-requirements.py ( + # update the frontend before running parse-requirements, so it doesn't get shown as outdated cd ../../.. nix-update --version "$FRONTEND_VERSION" home-assistant.python.pkgs.home-assistant-frontend +) + +./parse-requirements.py + +( + cd ../../.. nix-update --version "$TARGET_VERSION" --build home-assistant ) From a284c01d2a41e385e38ccd7c6210fe91f04dc2a0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Jul 2021 13:27:03 +0200 Subject: [PATCH 232/235] nixos/home-assistant: allow serial access for the zwave component --- nixos/modules/services/misc/home-assistant.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix index d68d7b05c173..dcd825bba433 100644 --- a/nixos/modules/services/misc/home-assistant.nix +++ b/nixos/modules/services/misc/home-assistant.nix @@ -313,6 +313,7 @@ in { "w800rf32" "xbee" "zha" + "zwave" ]; in { ExecStart = "${package}/bin/hass --runner --config '${cfg.configDir}'"; From 7df66a9f1856f42cf28ae62f0a4127370ab54885 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 17 Jul 2021 15:36:00 +0200 Subject: [PATCH 233/235] zigpy: 0.33.0 -> 0.35.1 Disable two failing tests and add import checks. --- .../python-modules/zigpy/default.nix | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index f03b9e96759e..2778581566fa 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.33.0"; + version = "0.35.1"; src = fetchFromGitHub { owner = "zigpy"; repo = "zigpy"; rev = version; - sha256 = "sha256-oEf4GnvbQ6LY4NaNFWRmnNz1TK2tMpIVUxskhU38g4w="; + sha256 = "0y5sv8zzlkjwimknpld3fakl22cfkqv0cnw0immb7k4zb9xmls2v"; }; propagatedBuildInputs = [ @@ -40,6 +40,21 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # RuntimeError: coroutine 'test_remigrate_forcibly_downgraded_v4' was never awaited + "test_remigrate_forcibly_downgraded_v4" + # RuntimeError: Event loop is closed + "test_startup" + ]; + + pythonImportsCheck = [ + "zigpy.application" + "zigpy.config" + "zigpy.exceptions" + "zigpy.types" + "zigpy.zcl" + ]; + meta = with lib; { description = "Library implementing a ZigBee stack"; homepage = "https://github.com/zigpy/zigpy"; From 9d94c99d6592b5dd78768756668b9bf0cd3b9723 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 17 Jul 2021 15:37:06 +0200 Subject: [PATCH 234/235] python3Packages.bellows: 0.24.0 -> 0.25.0 --- pkgs/development/python-modules/bellows/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index 7df23d1a25aa..7d8e6ff5bee3 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "zigpy"; repo = "bellows"; rev = version; - sha256 = "00sa4x1qzv861z9d83lk4lp1g2pqiv9hpawj92w4qn1wnqxbz6rw"; + sha256 = "1836wm8whbryp31zdaj3b6w40sx1wjsxgpjdb1x9rgmwff4d1hc0"; }; prePatch = '' From 7a77d8c487d5ecc27ca1608663748bb6813d1be3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 17 Jul 2021 15:39:33 +0200 Subject: [PATCH 235/235] python3Packages.zigpy-znp: apply patch for failing test --- pkgs/development/python-modules/zigpy-znp/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix index 894539a3e2e0..71f102f36671 100644 --- a/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/pkgs/development/python-modules/zigpy-znp/default.nix @@ -4,6 +4,7 @@ , buildPythonPackage , coloredlogs , fetchFromGitHub +, fetchpatch , jsonschema , pyserial , pyserial-asyncio @@ -27,6 +28,14 @@ buildPythonPackage rec { sha256 = "152d803jfrvkj4namni41fnbbnq85wd7zsqjhmkwrrmn2gvqjiln"; }; + patches = [ + (fetchpatch { + # Fixes tests/application/test_joining.py::test_new_device_join_and_bind_complex[FormedLaunchpadCC26X2R1] + url = "https://github.com/zigpy/zigpy-znp/commit/582cffb68fdf0c5bc14d55efca2a683222d7fed7.patch"; + sha256 = "0qsfziqqjnnf21gdqv3wwk50vni46i0h1liw5ysq641yjfnas9az"; + }) + ]; + propagatedBuildInputs = [ async-timeout coloredlogs