From 05ce344fe1e6de2f8accc431f4ad0ef9b1a2c7db Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 17 Feb 2021 21:32:36 +0700 Subject: [PATCH 01/83] zasm: 4.2.6 -> 4.4.7, fix darwin build and cross-compilation --- pkgs/development/compilers/zasm/default.nix | 37 ++++++++++++--------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/pkgs/development/compilers/zasm/default.nix b/pkgs/development/compilers/zasm/default.nix index 97c7aa3c2acf..88d77653f923 100644 --- a/pkgs/development/compilers/zasm/default.nix +++ b/pkgs/development/compilers/zasm/default.nix @@ -1,20 +1,26 @@ -{ fetchFromGitHub, zlib, lib, stdenv }: +{ lib, stdenv, fetchFromGitHub, zlib }: let libs-src = fetchFromGitHub { owner = "megatokio"; repo = "Libraries"; - rev = "97ea480051b106e83a086dd42583dfd3e9d458a1"; - sha256 = "1kqmjb9660mnb0r18s1grrrisx6b73ijsinlyr97vz6992jd5dzh"; + # 2021-02-02 + rev = "c5cb3ed512c677db6f33e2d3539dfbb6e547030b"; + sha256 = "sha256-GiplhZf640uScVdKL6E/fegOgtC9SE1xgBqcX86XADk="; }; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "zasm"; - version = "4.2.6"; + version = "4.4.7"; + src = fetchFromGitHub { owner = "megatokio"; repo = "zasm"; - rev = "f1424add17a5514895a598d6b5e3982579961519"; - sha256 = "1kqnqdqp2bfsazs6vfx2aiqanxxagn8plx8g6rc11vmr8yqnnpks"; + rev = version; + sha256 = "sha256-Zbno8kmzss1H2FjwzHB4U7UXxa6oDfsPV80MVVFfM68="; + extraPostFetch = '' + # remove folder containing files with weird names (causes the hash to turn out differently under macOS vs. Linux) + rm -rv $out/Test + ''; }; buildInputs = [ zlib ]; @@ -23,22 +29,23 @@ stdenv.mkDerivation { ln -sf ${libs-src} Libraries ''; - buildPhase = '' - cd Linux - make - ''; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "CXX=${stdenv.cc.targetPrefix}c++" + "LINK=${stdenv.cc.targetPrefix}c++" + "STRIP=${stdenv.cc.targetPrefix}strip" + ]; installPhase = '' - mkdir -p $out/bin - mv zasm $out/bin + install -Dm755 -t $out/bin zasm ''; meta = with lib; { - description = "Z80 / 8080 assembler (for unix-style OS)"; + description = "Z80 / 8080 / Z180 assembler (for unix-style OS)"; homepage = "https://k1.spdns.de/Develop/Projects/zasm/Distributions/"; license = licenses.bsd2; maintainers = [ maintainers.turbomack ]; - platforms = platforms.linux; + platforms = platforms.unix; badPlatforms = platforms.aarch64; }; } From 56be38378590d26a8b25b05ca2c99e7257f252e3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 27 Mar 2021 20:25:24 +0000 Subject: [PATCH 02/83] shipyard: 0.3.1 -> 0.3.2 --- pkgs/tools/virtualization/shipyard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/shipyard/default.nix b/pkgs/tools/virtualization/shipyard/default.nix index 10a270b484c4..cd8a4c36a920 100644 --- a/pkgs/tools/virtualization/shipyard/default.nix +++ b/pkgs/tools/virtualization/shipyard/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "shipyard"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "shipyard-run"; repo = pname; - sha256 = "sha256-zN9anlm+KbSbFKphC8mLaK+w8cOuOSKrVw5YGNCjEeA="; + sha256 = "sha256-9eGaOSmHrJlcLOvZuLaNu8D/D/rWiyFb4ztxybUP0uM="; }; vendorSha256 = "sha256-tTkPFftPDNXafIjAjNg6V6e/+2S/v5Do/YyAXPaGIqA="; From f02264af8244de928c9c72bba3bbd35d2ccb0de4 Mon Sep 17 00:00:00 2001 From: Simon Thoby Date: Sun, 23 May 2021 19:31:21 +0200 Subject: [PATCH 03/83] nixos/services/torrent/transmission.nix: add the web UI files to apparmor allowed paths --- pkgs/applications/networking/p2p/transmission/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index cfccff689fe0..1efa9ec76da7 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -98,6 +98,8 @@ in stdenv.mkDerivation { rwk /tmp/tr_session_id_*, r /run/systemd/resolve/stub-resolv.conf, + r $out/share/transmission/web/**, + include } EOF From 294ae3fe8cbde2fd0bad9a0192ae4d39a19df73e Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 27 May 2021 13:36:48 +0200 Subject: [PATCH 04/83] release-combined.tested: Add the Sway test Sway is a Wayland compositor. It should have a smaller userbase than Gnome and KDE but Sway plays an important role in the Wayland ecosystem (it is e.g. maintained by Simon Ser who also maintains wlroots, Wayland, and Weston (the reference compositor) and contributes to a lot of important packages in the Wayland ecosystem). Sway also comes with much fewer dependencies than large desktop environments. This should make the Sway VM test an ideal choice for testing updates to core packages (e.g. wayland, wayland-protocols, wlroots, libdrm, mesa, and xwayland - I maintain all but XWayland in Nixpkgs) and test failures should be much easier to debug. The test is fairly new but so far all 18 Hydra builds on x86_64-linux have succeeded [0]. I'm actively maintaining the test and can look into build failures if I'm pinged. [0]: https://hydra.nixos.org/job/nixos/trunk-combined/nixos.tests.sway.x86_64-linux/all --- nixos/release-combined.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 34183c0ba9ff..ee3f3d19174e 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -147,6 +147,7 @@ in rec { (onFullSupported "nixos.tests.sddm.default") (onFullSupported "nixos.tests.shadow") (onFullSupported "nixos.tests.simple") + (onFullSupported "nixos.tests.sway") (onFullSupported "nixos.tests.switchTest") (onFullSupported "nixos.tests.udisks2") (onFullSupported "nixos.tests.xfce") From 1421309df4793bc69e722c2f7a6910da062382b6 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Fri, 28 May 2021 18:38:34 -0700 Subject: [PATCH 05/83] papi: 5.6.0 -> 6.0.0.1 --- .../science/benchmark/papi/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/science/benchmark/papi/default.nix b/pkgs/development/libraries/science/benchmark/papi/default.nix index c265f24c182b..d4610d60415b 100644 --- a/pkgs/development/libraries/science/benchmark/papi/default.nix +++ b/pkgs/development/libraries/science/benchmark/papi/default.nix @@ -2,19 +2,17 @@ , fetchurl }: -stdenv.mkDerivation { - version = "5.6.0"; +stdenv.mkDerivation rec { + version = "6.0.0.1"; pname = "papi"; src = fetchurl { - url = "https://bitbucket.org/icl/papi/get/papi-5-6-0-t.tar.gz"; - sha256 = "13mngf9kl0y2wfxqvkad0smdaag7k8fvw82b4312gx62nwhc1i6r"; + url = "https://bitbucket.org/icl/papi/get/papi-${lib.replaceStrings ["."] ["-"] version}-t.tar.gz"; + sha256 = "1jd67yadyffzxwsqlylsi0bx8ishb0cgj2ziz1wdslaz6ylvyf9j"; }; - NIX_CFLAGS_COMPILE = "-Wno-error=format-truncation"; - - preConfigure = '' - cd src + setSourceRoot = '' + sourceRoot=$(echo */src) ''; doCheck = true; @@ -22,9 +20,9 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://icl.utk.edu/papi/"; - description = "PAPI provides the tool designer and application engineer with a consistent interface and methodology for use of the performance counter hardware found in most major microprocessors"; + description = "Library providing access to various hardware performance counters"; license = licenses.bsdOriginal; platforms = platforms.linux; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc zhaofengli ]; }; } From c4cb9a08a5192768773fa13b1b6dcfcf68ba8dcc Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 22 May 2021 21:59:26 +0300 Subject: [PATCH 06/83] =?UTF-8?q?lagrange:=201.4.0=20=E2=86=92=201.5.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/networking/browsers/lagrange/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix index c9846d92b8c0..436bccba47a3 100644 --- a/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "lagrange"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${version}"; - sha256 = "sha256-l8k81w+ilkOk8iQTc46+HK40JQZ0dCYVAvkGTrEpZSQ="; + sha256 = "sha256-W7uSyApTKBTE7bgprgCd8T5dKQ/nLYKIzFxjDMCRmZQ="; fetchSubmodules = true; }; From 78e77a0c4d168bd723d5481501a0f01e4a08d055 Mon Sep 17 00:00:00 2001 From: arcnmx Date: Fri, 7 May 2021 09:50:51 -0700 Subject: [PATCH 07/83] xmrig: 6.6.1 -> 6.12.2 --- pkgs/applications/misc/xmrig/default.nix | 11 ++++++----- pkgs/applications/misc/xmrig/donate-level.patch | 12 ++++++++++++ 2 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 pkgs/applications/misc/xmrig/donate-level.patch diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index 35a19cb3063e..4ac463068678 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -4,22 +4,23 @@ stdenv.mkDerivation rec { pname = "xmrig"; - version = "6.6.1"; + version = "6.12.2"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "03phq1c6fylvkg5x7l0bskspr9jdfx61jy67yx2lxhymqgpbf64z"; + sha256 = "1gjwh509cxs8vqz72v97cir0aazcrd9y9l0k1q5ywbl5l3yf6ryf"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ libuv libmicrohttpd openssl hwloc ]; + inherit donateLevel; + + patches = [ ./donate-level.patch ]; postPatch = '' - substituteInPlace src/donate.h \ - --replace "kDefaultDonateLevel = 5;" "kDefaultDonateLevel = ${toString donateLevel};" \ - --replace "kMinimumDonateLevel = 1;" "kMinimumDonateLevel = ${toString donateLevel};" + substituteAllInPlace src/donate.h ''; installPhase = '' diff --git a/pkgs/applications/misc/xmrig/donate-level.patch b/pkgs/applications/misc/xmrig/donate-level.patch new file mode 100644 index 000000000000..3aaae3e67763 --- /dev/null +++ b/pkgs/applications/misc/xmrig/donate-level.patch @@ -0,0 +1,12 @@ +diff --git a/src/donate.h b/src/donate.h +--- a/src/donate.h ++++ b/src/donate.h +@@ -46,6 +46,6 @@ + */ +-constexpr const int kDefaultDonateLevel = 1; +-constexpr const int kMinimumDonateLevel = 1; ++constexpr const int kDefaultDonateLevel = @donateLevel@; ++constexpr const int kMinimumDonateLevel = @donateLevel@; + + + #endif /* XMRIG_DONATE_H */ From b4778d1cac92da60a32da398b247e33426402248 Mon Sep 17 00:00:00 2001 From: Irene Knapp Date: Mon, 31 May 2021 08:01:21 -0700 Subject: [PATCH 08/83] maintainers: add irenes --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6a7fbc13e621..b810e904e47c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4323,6 +4323,16 @@ githubId = 54999; name = "Ariel Nunez"; }; + irenes = { + name = "Irene Knapp"; + email = "ireneista@gmail.com"; + github = "IreneKnapp"; + githubId = 157678; + keys = [{ + longkeyid = "rsa4096/0xDBF252AFFB2619FD"; + fingerprint = "E864 BDFA AB55 36FD C905 5195 DBF2 52AF FB26 19FD"; + }]; + }; ironpinguin = { email = "michele@catalano.de"; github = "ironpinguin"; From d5a782c1e04bd6f4613e5ffbc208845b90e1b068 Mon Sep 17 00:00:00 2001 From: Irene Knapp Date: Mon, 31 May 2021 08:01:53 -0700 Subject: [PATCH 09/83] oneko: 1.2.sakura.5 -> 1.2.hanami.6; new upstream; add myself as maintainer --- pkgs/applications/misc/oneko/default.nix | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/oneko/default.nix b/pkgs/applications/misc/oneko/default.nix index 48b29f4b561d..e8399aeb098f 100644 --- a/pkgs/applications/misc/oneko/default.nix +++ b/pkgs/applications/misc/oneko/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, imake, gccmakedep, xlibsWrapper }: +{ lib, stdenv, fetchFromGitHub, imake, gccmakedep, xlibsWrapper }: stdenv.mkDerivation rec { - version_name = "1.2.sakura.5"; - version = "1.2.5"; + version_name = "1.2.hanami.6"; + version = "1.2.6"; pname = "oneko"; - src = fetchurl { - url = "http://www.daidouji.com/oneko/distfiles/oneko-${version_name}.tar.gz"; - sha256 = "2c2e05f1241e9b76f54475b5577cd4fb6670de058218d04a741a04ebd4a2b22f"; + src = fetchFromGitHub { + owner = "IreneKnapp"; + repo = "oneko"; + rev = version_name; + sha256 = "0vx12v5fm8ar3f1g6jbpmd3b1q652d32nc67ahkf28djbqjgcbnc"; }; nativeBuildInputs = [ imake gccmakedep ]; buildInputs = [ xlibsWrapper ]; @@ -22,9 +24,9 @@ stdenv.mkDerivation rec { chasing around your mouse cursor. When the cat is done catching the mouse, it starts sleeping. ''; - homepage = "http://www.daidouji.com/oneko/"; - license = licenses.publicDomain; - maintainers = [ maintainers.xaverdh ]; + homepage = "https://github.com/IreneKnapp/oneko"; + license = with licenses; [ publicDomain ]; + maintainers = with maintainers; [ xaverdh irenes ]; platforms = platforms.unix; }; } From 80a7bb5f767fc923cd5e26365bac17cc3fcd78fe Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 May 2021 16:30:30 +0000 Subject: [PATCH 10/83] freetube: 0.13.0 -> 0.13.1 --- pkgs/applications/video/freetube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/freetube/default.nix b/pkgs/applications/video/freetube/default.nix index df6cf6192003..0dbc328459bc 100644 --- a/pkgs/applications/video/freetube/default.nix +++ b/pkgs/applications/video/freetube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "freetube"; - version = "0.13.0"; + version = "0.13.1"; src = fetchurl { url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${version}-beta/freetube_${version}_amd64.AppImage"; - sha256 = "sha256-CutTSpwb0G7FZgeKf/lvWHlhOn+X5AWLvPk0cpFQ1lk="; + sha256 = "sha256-DN78ASe29h7o6emCtN861arGqWKAWjjWKtsHs8jjROI="; }; appimageContents = appimageTools.extractType2 { From 17cfba9b0ad22feba6ff65bc1371922a444ac195 Mon Sep 17 00:00:00 2001 From: "\"Maas Lalani\"" <"maaslalani0@gmail.com"> Date: Sat, 29 May 2021 00:14:30 -0400 Subject: [PATCH 11/83] vimPlugins.colorbuddy-nvim: init at 2021-04-16 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 2e9710c016a5..78e7c6023e43 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -579,6 +579,18 @@ final: prev: meta.homepage = "https://github.com/metakirby5/codi.vim/"; }; + colorbuddy-nvim = buildVimPluginFrom2Nix { + pname = "colorbuddy-nvim"; + version = "2021-04-16"; + src = fetchFromGitHub { + owner = "tjdevries"; + repo = "colorbuddy.nvim"; + rev = "87c80e3f4a590d0387d9b128d1f1fc456759408a"; + sha256 = "19gfmyhmwpr8gi03w44zm056zrzaj74hplpl4psy9mylvb0ghf0k"; + }; + meta.homepage = "https://github.com/tjdevries/colorbuddy.nvim/"; + }; + colorizer = buildVimPluginFrom2Nix { pname = "colorizer"; version = "2020-07-23"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 85ee704b0567..677ebffb8f99 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -643,6 +643,7 @@ thosakwe/vim-flutter tiagofumo/vim-nerdtree-syntax-highlight tikhomirov/vim-glsl TimUntersberger/neogit +tjdevries/colorbuddy.nvim tjdevries/nlua.nvim tjdevries/train.nvim tmhedberg/SimpylFold From da159b5308c7b3fa4c36ed794fdb13a6071192fa Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Mon, 31 May 2021 15:21:06 -0300 Subject: [PATCH 12/83] raspberrypi-eeprom: 2021-03-18 -> 2021.04.29-138a1 --- pkgs/os-specific/linux/raspberrypi-eeprom/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix b/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix index 90af44f83530..5113d3c10704 100644 --- a/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix +++ b/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix @@ -1,15 +1,15 @@ { stdenvNoCC, lib, fetchFromGitHub, makeWrapper , python3, binutils-unwrapped, findutils, kmod, pciutils, libraspberrypi }: -stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation rec { pname = "raspberrypi-eeprom"; - version = "2021-03-18"; + version = "2021.04.29-138a1"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "rpi-eeprom"; - rev = "ff27ccf69403b01e337fc4ee6e7ae75244028cce"; - sha256 = "1q1vlld0xxh9zinf5g0qa6jw1dggq93br938mvrfx3nb2aviiwcj"; + rev = "v${version}"; + sha256 = "sha256-nzAMPa4gqCAcROFa7z34IoMA3aoMHX9fYCsPFde9dac="; }; buildInputs = [ python3 ]; @@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation { # Don't try to verify md5 signatures from /var/lib/dpkg and # fix path to the configuration. substituteInPlace rpi-eeprom-update \ - --replace 'IGNORE_DPKG_CHECKSUMS=$LOCAL_MODE' 'IGNORE_DPKG_CHECKSUMS=1' \ + --replace 'IGNORE_DPKG_CHECKSUMS=''${LOCAL_MODE}' 'IGNORE_DPKG_CHECKSUMS=1' \ --replace '/etc/default' '/etc' ''; From 5f991f366fa1897ae946fc8708d6d09f4603cbb3 Mon Sep 17 00:00:00 2001 From: Hyzual Date: Mon, 3 May 2021 17:12:50 +0200 Subject: [PATCH 13/83] dgoss: init at 0.3.16 --- pkgs/tools/misc/dgoss/default.nix | 48 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 50 insertions(+) create mode 100644 pkgs/tools/misc/dgoss/default.nix diff --git a/pkgs/tools/misc/dgoss/default.nix b/pkgs/tools/misc/dgoss/default.nix new file mode 100644 index 000000000000..5af576b3877a --- /dev/null +++ b/pkgs/tools/misc/dgoss/default.nix @@ -0,0 +1,48 @@ +{ lib +, fetchFromGitHub +, resholvePackage +, substituteAll +, bash +, coreutils +, goss +, which +}: + +resholvePackage rec { + pname = "dgoss"; + version = "0.3.16"; + + src = fetchFromGitHub { + owner = "aelsabbahy"; + repo = "goss"; + rev = "v${version}"; + sha256 = "1m5w5vwmc9knvaihk61848rlq7qgdyylzpcwi64z84rkw8qdnj6p"; + }; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + sed -i '2i GOSS_PATH=${goss}/bin/goss' extras/dgoss/dgoss + install -D extras/dgoss/dgoss $out/bin/dgoss + ''; + + solutions = { + default = { + scripts = [ "bin/dgoss" ]; + interpreter = "${bash}/bin/bash"; + inputs = [ coreutils which ]; + fake = { + external = [ "docker" ]; + }; + }; + }; + + meta = with lib; { + homepage = "https://github.com/aelsabbahy/goss/blob/v${version}/extras/dgoss/README.md"; + description = "Convenience wrapper around goss that aims to bring the simplicity of goss to docker containers"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ hyzual ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70d1a1873aa0..9281bf5c623f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2324,6 +2324,8 @@ in ioport = callPackage ../os-specific/linux/ioport {}; + dgoss = callPackage ../tools/misc/dgoss { }; + diagrams-builder = callPackage ../tools/graphics/diagrams-builder { inherit (haskellPackages) ghcWithPackages diagrams-builder; }; From a3132b2686eee3ba9643864de3d4a5f19c317cb9 Mon Sep 17 00:00:00 2001 From: Mrinal Purohit Date: Tue, 1 Jun 2021 01:42:12 +0530 Subject: [PATCH 14/83] google-cloud-sdk: 340.0.0 -> 342.0.0 --- pkgs/tools/admin/google-cloud-sdk/default.nix | 6 +++--- .../google-cloud-sdk/gsutil-disable-updates.patch | 14 +++----------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index c945ae5557a7..53c57f17a6ac 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -21,18 +21,18 @@ let sources = name: system: { x86_64-darwin = { url = "${baseUrl}/${name}-darwin-x86_64.tar.gz"; - sha256 = "1ag8h8gj3cld2qxqdrrqdwrz3d9d5m4c2wkx7b78vjpimv76qx5d"; + sha256 = "1mrhzg07dm11dirxhwdpxz9rch65z631abss0khdi944l3zv8lq4"; }; x86_64-linux = { url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; - sha256 = "1mm9lvbgszr5d6gs1qqn63012mgxq94xxkcc400fgfx3apzpkbpj"; + sha256 = "0m8zbjzr9a4f13z4szhqs5296lmyqrfmxr7pyvy8mrap3fqxvv02"; }; }.${system}; in stdenv.mkDerivation rec { pname = "google-cloud-sdk"; - version = "340.0.0"; + version = "342.0.0"; src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system); diff --git a/pkgs/tools/admin/google-cloud-sdk/gsutil-disable-updates.patch b/pkgs/tools/admin/google-cloud-sdk/gsutil-disable-updates.patch index de44ea7e7915..1147668862b0 100644 --- a/pkgs/tools/admin/google-cloud-sdk/gsutil-disable-updates.patch +++ b/pkgs/tools/admin/google-cloud-sdk/gsutil-disable-updates.patch @@ -1,16 +1,8 @@ diff --git a/platform/gsutil/gslib/command_runner.py b/platform/gsutil/gslib/command_runner.py -index 06ca5e5..4a4e225 100644 +index f490bb3..dc6bbcc 100644 --- a/platform/gsutil/gslib/command_runner.py +++ b/platform/gsutil/gslib/command_runner.py -@@ -61,7 +61,6 @@ from gslib.utils.text_util import InsistAsciiHeaderValue - from gslib.utils.text_util import print_to_fd - from gslib.utils.unit_util import SECONDS_PER_DAY - from gslib.utils.update_util import LookUpGsutilVersion --from gslib.tests.util import HAS_NON_DEFAULT_GS_HOST - - - def HandleHeaderCoding(headers): -@@ -331,17 +330,6 @@ class CommandRunner(object): +@@ -330,17 +330,6 @@ class CommandRunner(object): Returns: Return value(s) from Command that was run. """ @@ -28,7 +20,7 @@ index 06ca5e5..4a4e225 100644 if not args: args = [] -@@ -414,18 +402,10 @@ class CommandRunner(object): +@@ -413,18 +402,10 @@ class CommandRunner(object): ShutDownGsutil() if GetFailureCount() > 0: return_code = 1 From 78b11682349ce95de8764de59e603c2cc2208bab Mon Sep 17 00:00:00 2001 From: InternetUnexplorer Date: Mon, 31 May 2021 16:09:24 -0700 Subject: [PATCH 15/83] renoise: 3.3.1 -> 3.3.2 --- pkgs/applications/audio/renoise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index fd9a9f00502d..e874b63898a8 100644 --- a/pkgs/applications/audio/renoise/default.nix +++ b/pkgs/applications/audio/renoise/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { pname = "renoise"; - version = "3.3.1"; + version = "3.3.2"; src = if stdenv.hostPlatform.system == "x86_64-linux" then @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_Linux.tar.gz" "https://web.archive.org/web/https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_Linux.tar.gz" ]; - sha256 = "05baicks5dx278z2dx6h5n2vabsn64niwqssgys36xy469l9m1h0"; + sha256 = "0d9pnrvs93d4bwbfqxwyr3lg3k6gnzmp81m95gglzwdzczxkw38k"; } else releasePath From 3a78e24a522d11835b69d31c93962b353b0e91ec Mon Sep 17 00:00:00 2001 From: Vonfry Date: Tue, 1 Jun 2021 08:02:06 +0800 Subject: [PATCH 16/83] fortune: 3.4.1 -> 3.6.1 --- pkgs/tools/misc/fortune/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fortune/default.nix b/pkgs/tools/misc/fortune/default.nix index cbb5eae84877..350e28428d4b 100644 --- a/pkgs/tools/misc/fortune/default.nix +++ b/pkgs/tools/misc/fortune/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fortune-mod"; - version = "3.4.1"; + version = "3.6.1"; # We use fetchurl instead of fetchFromGitHub because the release pack has some # special files. src = fetchurl { url = "https://github.com/shlomif/fortune-mod/releases/download/${pname}-${version}/${pname}-${version}.tar.xz"; - sha256 = "02hjf432mq5qpbf1hywid7b356jys5n9brrrmm6z6r05jpzybbg3"; + sha256 = "1cw7xf9xhh6d73y4h4q57g6akjhc1gq6xv37k57sx0wx77wjxqdp"; }; nativeBuildInputs = [ cmake perl ]; From 8c80185fdef57b91892d9d8cdc804bf5dd7c2cd9 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 1 Jun 2021 03:24:16 +0300 Subject: [PATCH 17/83] autotiling: 1.1 -> 1.5 --- pkgs/misc/autotiling/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/misc/autotiling/default.nix b/pkgs/misc/autotiling/default.nix index b104f359363b..56e607c9d604 100644 --- a/pkgs/misc/autotiling/default.nix +++ b/pkgs/misc/autotiling/default.nix @@ -1,12 +1,14 @@ -{ lib, buildPythonApplication, fetchPypi, i3ipc, importlib-metadata }: +{ lib, buildPythonApplication, fetchFromGitHub, i3ipc, importlib-metadata }: buildPythonApplication rec { pname = "autotiling"; - version = "1.1"; + version = "1.5"; - src = fetchPypi { - inherit pname version; - sha256 = "0hwvy9bxwv9fakqqiyrkmpckxgm0z85c240p84ibdhja9sm086v0"; + src = fetchFromGitHub { + owner = "nwg-piotr"; + repo = pname; + rev = "v${version}"; + sha256 = "0ih8yd1gankjxn88gd88vxs6f1cniyi04z25jz4nsgqi9snz65v4"; }; propagatedBuildInputs = [ i3ipc importlib-metadata ]; @@ -16,7 +18,7 @@ buildPythonApplication rec { homepage = "https://github.com/nwg-piotr/autotiling"; description = "Script for sway and i3 to automatically switch the horizontal / vertical window split orientation"; license = licenses.gpl3Plus; - platforms= platforms.linux; + platforms = platforms.linux; maintainers = with maintainers; [ artturin ]; }; } From c23e59dbc7f9e18fac21deb58e5f9f408f1e3642 Mon Sep 17 00:00:00 2001 From: Yannick Markus Date: Tue, 1 Jun 2021 09:07:43 +0200 Subject: [PATCH 18/83] bookstack: 21.04.5 -> 21.05 --- pkgs/servers/web-apps/bookstack/default.nix | 4 +- .../web-apps/bookstack/php-packages.nix | 138 +++++++++--------- 2 files changed, 71 insertions(+), 71 deletions(-) diff --git a/pkgs/servers/web-apps/bookstack/default.nix b/pkgs/servers/web-apps/bookstack/default.nix index 14ccf4eb43fd..139a8588eedd 100644 --- a/pkgs/servers/web-apps/bookstack/default.nix +++ b/pkgs/servers/web-apps/bookstack/default.nix @@ -15,13 +15,13 @@ let in package.override rec { name = "bookstack"; - version = "21.04.5"; + version = "21.05"; src = fetchFromGitHub { owner = "bookstackapp"; repo = name; rev = "v${version}"; - sha256 = "0gwpa4g2xna4s3lnd970wjpr32i9cwyaixfqxhb8zbz1i9gyxjaa"; + sha256 = "0vn1n2l66xsv2qjhh53dm28vwm7d9ba62syx2gviznva1lsyn78z"; }; meta = with lib; { diff --git a/pkgs/servers/web-apps/bookstack/php-packages.nix b/pkgs/servers/web-apps/bookstack/php-packages.nix index b2ea52df8785..aa3115ef955d 100644 --- a/pkgs/servers/web-apps/bookstack/php-packages.nix +++ b/pkgs/servers/web-apps/bookstack/php-packages.nix @@ -5,10 +5,10 @@ let "aws/aws-sdk-php" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "aws-aws-sdk-php-948a4defbe2a571cc4460725015b8e98b7060f2d"; + name = "aws-aws-sdk-php-3b3aafdceac4cb820e2ae65a8785e4d07db471a7"; src = fetchurl { - url = https://api.github.com/repos/aws/aws-sdk-php/zipball/948a4defbe2a571cc4460725015b8e98b7060f2d; - sha256 = "06vv6h5j909gbn2d8ih1yr2vf19jnw2va1kghj9qykvll6jzx1cq"; + url = https://api.github.com/repos/aws/aws-sdk-php/zipball/3b3aafdceac4cb820e2ae65a8785e4d07db471a7; + sha256 = "0pyc5n1h9c12li03wk0p04k25rg1x8qlq4ns4wr8xbxcysdm6xi1"; }; }; }; @@ -35,10 +35,10 @@ let "doctrine/cache" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "doctrine-cache-a9c1b59eba5a08ca2770a76eddb88922f504e8e0"; + name = "doctrine-cache-3bb5588cec00a0268829cc4a518490df6741af9d"; src = fetchurl { - url = https://api.github.com/repos/doctrine/cache/zipball/a9c1b59eba5a08ca2770a76eddb88922f504e8e0; - sha256 = "0r1rdfs7k0zl6fqm35qjwbfiqmf3r3nbvfyxzig1379xsgvdd84y"; + url = https://api.github.com/repos/doctrine/cache/zipball/3bb5588cec00a0268829cc4a518490df6741af9d; + sha256 = "0r9fhv0y79ma7a5llmj1skycflnwbxyyrblkavjj6svld46li94q"; }; }; }; @@ -135,10 +135,10 @@ let "facade/ignition" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "facade-ignition-b6aea4a99303d9d32afd486a285162a89af8a8a3"; + name = "facade-ignition-dc49305538aeb77e4c89eba57cee4ceff9e42f33"; src = fetchurl { - url = https://api.github.com/repos/facade/ignition/zipball/b6aea4a99303d9d32afd486a285162a89af8a8a3; - sha256 = "1dx6gf4qz6jf8hds3lyxs09zlr6ndl3d36212w2hr4b15ihmyszw"; + url = https://api.github.com/repos/facade/ignition/zipball/dc49305538aeb77e4c89eba57cee4ceff9e42f33; + sha256 = "1nwqgxgp1dsrixf44qh4ywsvd0d35nqg23a8bc9mjvn9wmhdn2q0"; }; }; }; @@ -225,10 +225,10 @@ let "laravel/framework" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-framework-0117d797dc1ab64b1f88d4f6b966380ea7def091"; + name = "laravel-framework-92c0417e60efc39bc556ba5dfc9b20a56f7848fb"; src = fetchurl { - url = https://api.github.com/repos/laravel/framework/zipball/0117d797dc1ab64b1f88d4f6b966380ea7def091; - sha256 = "11aw7smg042g8kyyhdzawmkwgbv5hkn6l6k2m27lc34v84r6kdqm"; + url = https://api.github.com/repos/laravel/framework/zipball/92c0417e60efc39bc556ba5dfc9b20a56f7848fb; + sha256 = "17wpm3fk6qakq4b8qf2bvmyzm7zfamiabdgqshzcnfjm7kj4rijy"; }; }; }; @@ -245,10 +245,10 @@ let "league/commonmark" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-commonmark-2651c497f005de305c7ba3f232cbd87b8c00ee8c"; + name = "league-commonmark-7d70d2f19c84bcc16275ea47edabee24747352eb"; src = fetchurl { - url = https://api.github.com/repos/thephpleague/commonmark/zipball/2651c497f005de305c7ba3f232cbd87b8c00ee8c; - sha256 = "0mf2avlnn0c9p4fi1jz5m85k6y7xg2p0dm1n4r7cpg25vngswmfs"; + url = https://api.github.com/repos/thephpleague/commonmark/zipball/7d70d2f19c84bcc16275ea47edabee24747352eb; + sha256 = "1clfi4k0xp15pzg8c344qj5jk54k9dm9xbg4sd6l6iv66md1xasn"; }; }; }; @@ -315,10 +315,10 @@ let "nesbot/carbon" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "nesbot-carbon-606262fd8888b75317ba9461825a24fc34001e1e"; + name = "nesbot-carbon-8d1f50f1436fb4b05e7127360483dd9c6e73da16"; src = fetchurl { - url = https://api.github.com/repos/briannesbitt/Carbon/zipball/606262fd8888b75317ba9461825a24fc34001e1e; - sha256 = "0iqhb3gfmray8jkwki19pwm15vmf96vfj4m12nk7lmn74470lf2x"; + url = https://api.github.com/repos/briannesbitt/Carbon/zipball/8d1f50f1436fb4b05e7127360483dd9c6e73da16; + sha256 = "102pypd7x9l739qv2fp5lv4gw4sywr1jpgxlgpqyi1ww1dm3dch0"; }; }; }; @@ -615,20 +615,20 @@ let "symfony/console" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-console-36bbd079b69b94bcc9c9c9e1e37ca3b1e7971625"; + name = "symfony-console-1b15ca1b1bedda86f98064da9ff5d800560d4c6d"; src = fetchurl { - url = https://api.github.com/repos/symfony/console/zipball/36bbd079b69b94bcc9c9c9e1e37ca3b1e7971625; - sha256 = "0n5caxf7vgx0x6izsxfkkjdl9jw96qi7h9h0k4s8fccqqmwb61cc"; + url = https://api.github.com/repos/symfony/console/zipball/1b15ca1b1bedda86f98064da9ff5d800560d4c6d; + sha256 = "0xpk6241vg866z56dksv384xmk0vkrz1by9vb8q2d6cbp6nw17y0"; }; }; }; "symfony/css-selector" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-css-selector-01c77324d1d47efbfd7891f62a7c256c69330115"; + name = "symfony-css-selector-947cacaf1b3a2af6f13a435392873d5ddaba5f70"; src = fetchurl { - url = https://api.github.com/repos/symfony/css-selector/zipball/01c77324d1d47efbfd7891f62a7c256c69330115; - sha256 = "12hd9vga35w8g4bwmlkr87pxlwdx71sp2bkxs8j854hf28yam75w"; + url = https://api.github.com/repos/symfony/css-selector/zipball/947cacaf1b3a2af6f13a435392873d5ddaba5f70; + sha256 = "1v5fl6vhbc2n9mm0y9m28i1gz12n1v0zqzc2sspymyq98921q3gp"; }; }; }; @@ -655,10 +655,10 @@ let "symfony/error-handler" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-error-handler-76603a8df8e001436df80758eb03a8baa5324175"; + name = "symfony-error-handler-21d75bfbdfdd3581a7f97080deb98926987f14a7"; src = fetchurl { - url = https://api.github.com/repos/symfony/error-handler/zipball/76603a8df8e001436df80758eb03a8baa5324175; - sha256 = "15s46vjwzny821qq93qsnd9ig14d72rakbavgb3sd43gipyjld8g"; + url = https://api.github.com/repos/symfony/error-handler/zipball/21d75bfbdfdd3581a7f97080deb98926987f14a7; + sha256 = "0hdcvmid17xcm21crj3k2gxvnhfww3yaw3liiqrjrkwmny9pr73q"; }; }; }; @@ -685,10 +685,10 @@ let "symfony/finder" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-finder-2543795ab1570df588b9bbd31e1a2bd7037b94f6"; + name = "symfony-finder-a96bc19ed87c88eec78e1a4c803bdc1446952983"; src = fetchurl { - url = https://api.github.com/repos/symfony/finder/zipball/2543795ab1570df588b9bbd31e1a2bd7037b94f6; - sha256 = "0scclnfc9aphjsric1xaj51vbqqz56kiz6l8l6ldqv6cvyg8zlyi"; + url = https://api.github.com/repos/symfony/finder/zipball/a96bc19ed87c88eec78e1a4c803bdc1446952983; + sha256 = "065mk0cvby82wv799gl5n4xw75nm7q32g816kily39d70rfjwzrs"; }; }; }; @@ -705,110 +705,110 @@ let "symfony/http-foundation" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-http-foundation-1a6f87ef99d05b1bf5c865b4ef7992263e1cb081"; + name = "symfony-http-foundation-2ffb43bd6c589a274ee1e93a5fd6b7ef1577b9c5"; src = fetchurl { - url = https://api.github.com/repos/symfony/http-foundation/zipball/1a6f87ef99d05b1bf5c865b4ef7992263e1cb081; - sha256 = "0da13w35j7hrkv87p8rrfxdxpksbf1dvji0ag7chwzhfg63516l6"; + url = https://api.github.com/repos/symfony/http-foundation/zipball/2ffb43bd6c589a274ee1e93a5fd6b7ef1577b9c5; + sha256 = "02dras9h0h2g3xkibvpqfly7108qhg609cv16cgmw109m9d6rv7p"; }; }; }; "symfony/http-kernel" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-http-kernel-cd2e325fc34a4a5bbec91eecf69dda8ee8c5ea4f"; + name = "symfony-http-kernel-59925ee79f2541b4c6e990843e1a42768e898254"; src = fetchurl { - url = https://api.github.com/repos/symfony/http-kernel/zipball/cd2e325fc34a4a5bbec91eecf69dda8ee8c5ea4f; - sha256 = "0wk4nivw1w4kl7gziazvvzxzjhs7lalc2gc1pnscxj6k3gkfq6fl"; + url = https://api.github.com/repos/symfony/http-kernel/zipball/59925ee79f2541b4c6e990843e1a42768e898254; + sha256 = "1v6ah9ibz6n2kdpmji1wfqzvb4cbndnwfz4hjqhhrysc0vffpbk4"; }; }; }; "symfony/mime" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-mime-7af452bf51c46f18da00feb32e1ad36db9426515"; + name = "symfony-mime-64258e870f8cc75c3dae986201ea2df58c210b52"; src = fetchurl { - url = https://api.github.com/repos/symfony/mime/zipball/7af452bf51c46f18da00feb32e1ad36db9426515; - sha256 = "1rkm66zr6sfp8jw80h4vjrbpx40sqhhlpbc126x990mbzzapjlay"; + url = https://api.github.com/repos/symfony/mime/zipball/64258e870f8cc75c3dae986201ea2df58c210b52; + sha256 = "14s26zam8dxhbskizcw6mpyizg6n4i1ambq5ni6r9gv3rs6cfr9p"; }; }; }; "symfony/polyfill-ctype" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-ctype-c6c942b1ac76c82448322025e084cadc56048b4e"; + name = "symfony-polyfill-ctype-46cd95797e9df938fdd2b03693b5fca5e64b01ce"; src = fetchurl { - url = https://api.github.com/repos/symfony/polyfill-ctype/zipball/c6c942b1ac76c82448322025e084cadc56048b4e; - sha256 = "0jpk859wx74vm03q5s9z25f4ak2138p2x5q3b587wvy8rq2m4pbd"; + url = https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce; + sha256 = "0z4iiznxxs4r72xs4irqqb6c0wnwpwf0hklwn2imls67haq330zn"; }; }; }; "symfony/polyfill-iconv" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-iconv-06fb361659649bcfd6a208a0f1fcaf4e827ad342"; + name = "symfony-polyfill-iconv-63b5bb7db83e5673936d6e3b8b3e022ff6474933"; src = fetchurl { - url = https://api.github.com/repos/symfony/polyfill-iconv/zipball/06fb361659649bcfd6a208a0f1fcaf4e827ad342; - sha256 = "0glb56w5q4v2j629rkndp2c7v4mcs6xdl14nwaaxy85lr5w4ixnq"; + url = https://api.github.com/repos/symfony/polyfill-iconv/zipball/63b5bb7db83e5673936d6e3b8b3e022ff6474933; + sha256 = "1jyjsjprsgb3r6cbc4x1wg1q1zqakqm8a62ah5lppxnjgq1sgjc5"; }; }; }; "symfony/polyfill-intl-idn" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-intl-idn-2d63434d922daf7da8dd863e7907e67ee3031483"; + name = "symfony-polyfill-intl-idn-65bd267525e82759e7d8c4e8ceea44f398838e65"; src = fetchurl { - url = https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/2d63434d922daf7da8dd863e7907e67ee3031483; - sha256 = "0sk592qrdb6dvk6v8msjva8p672qmhmnzkw1lw53gks0xrc20xjy"; + url = https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/65bd267525e82759e7d8c4e8ceea44f398838e65; + sha256 = "1cx2cjx0vzni297l7avd3cb1q4c8d2hylkvdqcjlpxjqdimn4jkn"; }; }; }; "symfony/polyfill-intl-normalizer" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-intl-normalizer-43a0283138253ed1d48d352ab6d0bdb3f809f248"; + name = "symfony-polyfill-intl-normalizer-8590a5f561694770bdcd3f9b5c69dde6945028e8"; src = fetchurl { - url = https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/43a0283138253ed1d48d352ab6d0bdb3f809f248; - sha256 = "04irkl6aks8zyfy17ni164060liihfyraqm1fmpjbs5hq0b14sc9"; + url = https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8; + sha256 = "1c60xin00q0d2gbyaiglxppn5hqwki616v5chzwyhlhf6aplwsh3"; }; }; }; "symfony/polyfill-mbstring" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-mbstring-5232de97ee3b75b0360528dae24e73db49566ab1"; + name = "symfony-polyfill-mbstring-2df51500adbaebdc4c38dea4c89a2e131c45c8a1"; src = fetchurl { - url = https://api.github.com/repos/symfony/polyfill-mbstring/zipball/5232de97ee3b75b0360528dae24e73db49566ab1; - sha256 = "1mm670fxj2x72a9mbkyzs3yifpp6glravq2ss438bags1xf6psz8"; + url = https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2df51500adbaebdc4c38dea4c89a2e131c45c8a1; + sha256 = "1fbi13p4a6nn01ix3gcj966kq6z8qx03li4vbjylsr9ac2mgnmnn"; }; }; }; "symfony/polyfill-php72" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-php72-cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9"; + name = "symfony-polyfill-php72-9a142215a36a3888e30d0a9eeea9766764e96976"; src = fetchurl { - url = https://api.github.com/repos/symfony/polyfill-php72/zipball/cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9; - sha256 = "12dmz2n1b9pqqd758ja0c8h8h5dxdai5ik74iwvaxc5xn86a026b"; + url = https://api.github.com/repos/symfony/polyfill-php72/zipball/9a142215a36a3888e30d0a9eeea9766764e96976; + sha256 = "06ipbcvrxjzgvraf2z9fwgy0bzvzjvs5z1j67grg1gb15x3d428b"; }; }; }; "symfony/polyfill-php73" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-php73-a678b42e92f86eca04b7fa4c0f6f19d097fb69e2"; + name = "symfony-polyfill-php73-fba8933c384d6476ab14fb7b8526e5287ca7e010"; src = fetchurl { - url = https://api.github.com/repos/symfony/polyfill-php73/zipball/a678b42e92f86eca04b7fa4c0f6f19d097fb69e2; - sha256 = "10rq2x2q9hsdzskrz0aml5qcji27ypxam324044fi24nl60fyzg0"; + url = https://api.github.com/repos/symfony/polyfill-php73/zipball/fba8933c384d6476ab14fb7b8526e5287ca7e010; + sha256 = "0fc1d60iw8iar2zcvkzwdvx0whkbw8p6ll0cry39nbkklzw85n1h"; }; }; }; "symfony/polyfill-php80" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-php80-dc3063ba22c2a1fd2f45ed856374d79114998f91"; + name = "symfony-polyfill-php80-eca0bf41ed421bed1b57c4958bab16aa86b757d0"; src = fetchurl { - url = https://api.github.com/repos/symfony/polyfill-php80/zipball/dc3063ba22c2a1fd2f45ed856374d79114998f91; - sha256 = "1mhfjibk7mqyzlqpz6jjpxpd93fnfw0nik140x3mq1d2blg5cbvd"; + url = https://api.github.com/repos/symfony/polyfill-php80/zipball/eca0bf41ed421bed1b57c4958bab16aa86b757d0; + sha256 = "1y5kc4vqh920wyjdlgxp23b958g5i9mw10mhbr30vf8j20vf1gra"; }; }; }; @@ -825,10 +825,10 @@ let "symfony/routing" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-routing-049e7c5c41f98511959668791b4adc0898a821b3"; + name = "symfony-routing-b42c3631fd9e3511610afb2ba081ea7e38d9fa38"; src = fetchurl { - url = https://api.github.com/repos/symfony/routing/zipball/049e7c5c41f98511959668791b4adc0898a821b3; - sha256 = "1557bvcmxpa7hmcvwl9qf94l7n9x0y7xw2k3s8v85ys35fi54clw"; + url = https://api.github.com/repos/symfony/routing/zipball/b42c3631fd9e3511610afb2ba081ea7e38d9fa38; + sha256 = "167lvg9n8qvgkz7hgx8hv7a53j4shqiriir03g5qz7zhvddlk7vp"; }; }; }; @@ -845,10 +845,10 @@ let "symfony/translation" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-translation-eb8f5428cc3b40d6dffe303b195b084f1c5fbd14"; + name = "symfony-translation-424d29dfcc15575af05196de0100d7b52f650602"; src = fetchurl { - url = https://api.github.com/repos/symfony/translation/zipball/eb8f5428cc3b40d6dffe303b195b084f1c5fbd14; - sha256 = "0x80ijdhpfv9is847pp09jlr0g0hwg9sil95jknil7dgx5pjsa5z"; + url = https://api.github.com/repos/symfony/translation/zipball/424d29dfcc15575af05196de0100d7b52f650602; + sha256 = "0fpbhbiix0yqvbq5iv5wy7b37wsfgnsay0g1292s339dil60i6a6"; }; }; }; From 1439845fed0c8d595af808d32d7f9b9e014b4f62 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 19 Apr 2021 18:11:37 +0000 Subject: [PATCH 19/83] perl.perl-cross-src: use fetchFromGitHub --- pkgs/development/interpreters/perl/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 01b3e995f5e4..847200e400e6 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -1,4 +1,5 @@ -{ config, lib, stdenv, fetchurl, pkgs, buildPackages, callPackage +{ config, lib, stdenv, fetchurl, fetchFromGitHub, pkgs, buildPackages +, callPackage , enableThreading ? true, coreutils, makeWrapper }: @@ -173,16 +174,20 @@ let } // optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { crossVersion = "e53999d0c340769792ba18d749751b0df3d1d177"; # Mar 21, 2021 - perl-cross-src = fetchurl { - url = "https://github.com/arsv/perl-cross/archive/${crossVersion}.tar.gz"; - sha256 = "14vcpwjhq667yh0cs7ism70df8l7068vn4a0ww59hdjyj7yc84i6"; + perl-cross-src = fetchFromGitHub { + name = "perl-cross-${crossVersion}"; + owner = "arsv"; + repo = "perl-cross"; + rev = crossVersion; + sha256 = "1kw5xjv6pvkrrcycl6aiqx4zaas1w3652hgd3907q67pcrc4mmdm"; }; depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ]; postUnpack = '' unpackFile ${perl-cross-src} - cp -R perl-cross-${crossVersion}/* perl-${version}/ + chmod -R u+w ${perl-cross-src.name} + cp -R ${perl-cross-src.name}/* perl-${version}/ ''; configurePlatforms = [ "build" "host" "target" ]; From d5607f05aff9bf13d85491943ad6eb85c11acd0e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 19 Apr 2021 18:18:37 +0000 Subject: [PATCH 20/83] perl.perl-cross-src: 2021-03-21 -> 1.3.6 New version adds support for NetBSD (by me!). --- pkgs/development/interpreters/perl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 847200e400e6..ad369956745a 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -172,14 +172,14 @@ let priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl` }; } // optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { - crossVersion = "e53999d0c340769792ba18d749751b0df3d1d177"; # Mar 21, 2021 + crossVersion = "1.3.6"; perl-cross-src = fetchFromGitHub { name = "perl-cross-${crossVersion}"; owner = "arsv"; repo = "perl-cross"; rev = crossVersion; - sha256 = "1kw5xjv6pvkrrcycl6aiqx4zaas1w3652hgd3907q67pcrc4mmdm"; + sha256 = "0k5vyj40czbkfl7r3dcwxpc7dvdlp2xliaav358bviq3dq9vq9bb"; }; depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ]; From a0eacd45474543da317561c9b1c01ec0a9e89161 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 1 Jun 2021 00:40:14 +0200 Subject: [PATCH 21/83] deltachat-cursed: init at 0.2.0 --- .../deltachat-cursed/default.nix | 49 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix diff --git a/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix new file mode 100644 index 000000000000..e7263b1d1617 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix @@ -0,0 +1,49 @@ +{ lib +, python3 +, fetchFromGitHub +, wrapGAppsHook +, gobject-introspection +, libnotify +}: + +python3.pkgs.buildPythonApplication rec { + pname = "deltachat-cursed"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "adbenitez"; + repo = "deltachat-cursed"; + rev = "v${version}"; + sha256 = "0kbb7lh17dbkd85mcqf438qwk5masz2fxsy8ljdh23kis55nksh8"; + }; + + nativeBuildInputs = [ + wrapGAppsHook + ]; + + buildInputs = [ + gobject-introspection + libnotify + ]; + + propagatedBuildInputs = with python3.pkgs; [ + deltachat + pygobject3 + urwid-readline + ]; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + doCheck = false; # no tests implemented + + meta = with lib; { + description = "Lightweight Delta Chat client"; + homepage = "https://github.com/adbenitez/deltachat-cursed"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2dcf97a211de..552835074c1a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1398,6 +1398,8 @@ in cyclonedx-python = callPackage ../tools/misc/cyclonedx-python { }; + deltachat-cursed = callPackage ../applications/networking/instant-messengers/deltachat-cursed { }; + deltachat-electron = callPackage ../applications/networking/instant-messengers/deltachat-electron { }; From adc36dcaf8bcc43df86063a88395d08a9d74c9e8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 1 Jun 2021 12:01:10 +0200 Subject: [PATCH 22/83] python3Packages.aiopvpc: 2.0.2 -> 2.1.2 --- .../python-modules/aiopvpc/default.nix | 24 +++++++------------ 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/aiopvpc/default.nix b/pkgs/development/python-modules/aiopvpc/default.nix index 489ca5d6f6fb..0b079e0d1a59 100644 --- a/pkgs/development/python-modules/aiopvpc/default.nix +++ b/pkgs/development/python-modules/aiopvpc/default.nix @@ -1,28 +1,28 @@ { lib , aiohttp , async-timeout +, backports-zoneinfo , buildPythonPackage , fetchFromGitHub -, fetchpatch , poetry-core , pytest-asyncio , pytest-timeout , pytestCheckHook , pythonOlder -, pytz +, tzdata }: buildPythonPackage rec { pname = "aiopvpc"; - version = "2.0.2"; - disabled = pythonOlder "3.7"; + version = "2.1.2"; + disabled = pythonOlder "3.8"; format = "pyproject"; src = fetchFromGitHub { owner = "azogue"; repo = pname; rev = "v${version}"; - sha256 = "1ajs4kbdlfn4h7f3d6lwkp4yl1rl7zyvj997nhsz93jjwxbajkpv"; + sha256 = "0s8ki46dh39kw6qvsjcfcxa0gblyi33m3hry137kbi4lw5ws6qhr"; }; nativeBuildInputs = [ @@ -31,7 +31,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp - pytz + backports-zoneinfo + tzdata async-timeout ]; @@ -41,17 +42,8 @@ buildPythonPackage rec { pytestCheckHook ]; - patches = [ - # Switch to poetry-core, https://github.com/azogue/aiopvpc/pull/10 - (fetchpatch { - name = "use-peotry-core.patch"; - url = "https://github.com/azogue/aiopvpc/commit/4bc2740ffd485a60acf579b4f3eb5ee6a353245c.patch"; - sha256 = "0ynj7pqq3akdvdrvqcwnnslay3mn1q92qhk8fg95ppflzscixli6"; - }) - ]; - postPatch = '' - substituteInPlace pytest.ini --replace \ + substituteInPlace pyproject.toml --replace \ " --cov --cov-report term --cov-report html" "" ''; From 11424e10912959f8a8f11b4654676d44c88e62ea Mon Sep 17 00:00:00 2001 From: David Birks Date: Tue, 1 Jun 2021 12:45:10 -0400 Subject: [PATCH 23/83] kapp: 0.36.0 -> 0.37.0 --- pkgs/tools/networking/kapp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/kapp/default.nix b/pkgs/tools/networking/kapp/default.nix index 2ff2fd8daec1..181a9d9b85ef 100644 --- a/pkgs/tools/networking/kapp/default.nix +++ b/pkgs/tools/networking/kapp/default.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "kapp"; - version = "0.36.0"; + version = "0.37.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-kapp"; rev = "v${version}"; - sha256 = "sha256-hYKRfAnpHw8hHT70sOQSGlDj0dgzU0wlZpXA5f2BBfg="; + sha256 = "sha256-SxS6KBiKc68PcRycdVDWWfXBKOJvo7GuG/0dUQGcHsg="; }; vendorSha256 = null; From c8ec847d487c3685f898a1b92ca8ea109de472d1 Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Tue, 1 Jun 2021 13:08:53 -0400 Subject: [PATCH 24/83] openimageio2: add giflib dependency --- pkgs/applications/graphics/openimageio/2.x.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/graphics/openimageio/2.x.nix b/pkgs/applications/graphics/openimageio/2.x.nix index 5982e4abe0f7..771af5133561 100644 --- a/pkgs/applications/graphics/openimageio/2.x.nix +++ b/pkgs/applications/graphics/openimageio/2.x.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , boost , cmake +, giflib , ilmbase , libjpeg , libpng @@ -33,6 +34,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost + giflib ilmbase libjpeg libpng From 15679e7c2017a3f23b5f6a54b00695768968321f Mon Sep 17 00:00:00 2001 From: V Date: Tue, 1 Jun 2021 19:18:42 +0200 Subject: [PATCH 25/83] obs-studio: 26.1.2 -> 27.0.0 --- pkgs/applications/video/obs-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 47ab73d0ab7b..109744969c23 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -43,13 +43,13 @@ let in mkDerivation rec { pname = "obs-studio"; - version = "26.1.2"; + version = "27.0.0"; src = fetchFromGitHub { owner = "obsproject"; repo = "obs-studio"; rev = version; - sha256 = "1plr5a7k5scxlibhbknhhk19ipk8las14dzs7v64zx7rhpj00009"; + sha256 = "1n71705b9lbdff3svkmgwmbhlhhxvi8ajxqb74lm07v56a5bvi6p"; fetchSubmodules = true; }; From d198902b4d80cf64fa5e1f5c1b431ba003d46665 Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Tue, 1 Jun 2021 20:38:30 +0200 Subject: [PATCH 26/83] innernet: add shell completions --- pkgs/tools/networking/innernet/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/networking/innernet/default.nix b/pkgs/tools/networking/innernet/default.nix index 7bedbb3a6dc5..cee4956269e1 100644 --- a/pkgs/tools/networking/innernet/default.nix +++ b/pkgs/tools/networking/innernet/default.nix @@ -24,6 +24,8 @@ rustPlatform.buildRustPackage rec { postInstall = '' installManPage doc/innernet-server.8.gz installManPage doc/innernet.8.gz + installShellCompletion doc/innernet.completions.{bash,fish,zsh} + installShellCompletion doc/innernet-server.completions.{bash,fish,zsh} ''; doInstallCheck = true; From 03956aa12b801dd337d06453ab329c51f138b003 Mon Sep 17 00:00:00 2001 From: mingmingrr Date: Tue, 1 Jun 2021 12:42:04 -0400 Subject: [PATCH 27/83] pythonPackages.hydrus: 438 -> 441 --- pkgs/applications/graphics/hydrus/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index c7d4a77ea2a9..a3b043adbe5c 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -3,20 +3,21 @@ , xz , wrapQtAppsHook , miniupnpc_2 +, enableSwftools ? false , swftools , pythonPackages }: pythonPackages.buildPythonPackage rec { pname = "hydrus"; - version = "438"; + version = "441"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "v${version}"; - sha256 = "sha256-iBJkbVUlsjt26SbDe92eIrWKQwWBhkjjeLM14Pm/obc="; + sha256 = "13h4qcz0iqba4mwyvgmdqh99jy22x7kw20f3g43b5aq3qyk9ca2h"; }; nativeBuildInputs = [ @@ -79,7 +80,7 @@ pythonPackages.buildPythonPackage rec { postPatch = '' sed 's;os\.path\.join(\sHC\.BIN_DIR,.*;"${miniupnpc_2}/bin/upnpc";' \ -i ./hydrus/core/networking/HydrusNATPunch.py - + '' + lib.optionalString enableSwftools '' sed 's;os\.path\.join(\sHC\.BIN_DIR,.*;"${swftools}/bin/swfrender";' \ -i ./hydrus/core/HydrusFlashHandling.py ''; From 35b9c063c226a33fbedc09d69b2de3747c6120ce Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Tue, 1 Jun 2021 18:06:33 -0400 Subject: [PATCH 28/83] python3Packages.retworkx: 0.8.0 -> 0.9.0 Also fixes retworkx Darwin build. Fixes linker error for retworkx that required libiconv. Error log: error: linking with `/nix/store/47vpv5i10dwfg1cf5wca1k40f982g5fm-clang-wrapper-7.1.0/bin/cc` failed: exit code: 1 ... ld: library not found for -liconv clang-7: error: linker command failed with exit code 1 (use -v to see invocation) Also fix tests running on build, that didn't get converted when switched to the new way of running Cargo builds for python packages. --- .../python-modules/retworkx/default.nix | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/retworkx/default.nix b/pkgs/development/python-modules/retworkx/default.nix index c4b7a6323e4d..f4490c72876d 100644 --- a/pkgs/development/python-modules/retworkx/default.nix +++ b/pkgs/development/python-modules/retworkx/default.nix @@ -1,18 +1,23 @@ { lib +, stdenv , buildPythonPackage , pythonOlder , rustPlatform , fetchFromGitHub - +, libiconv # Check inputs , pytestCheckHook +, fixtures +, graphviz +, matplotlib , networkx , numpy +, pydot }: buildPythonPackage rec { pname = "retworkx"; - version = "0.8.0"; + version = "0.9.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -20,22 +25,29 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "retworkx"; rev = version; - sha256 = "0plpri6a3d6f1000kmcah9066vq2i37d14bdf8sm96493fhpqhrd"; + hash = "sha256-1W7DexS+ECAPsxyZAF36xcEguFkjUMX9lDBylNVPqyk="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-+k779gmge8wDdoZrWn9ND47kUqt7pqe75Zuj2Byfefo="; + hash = "sha256-y5l7jqrlk3ONHefZPS31IvcaO9ttXWLM7fIUmNVwbco="; }; nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ]; - # Needed b/c need to check AFTER python wheel is installed (using Rust Build, not buildPythonPackage) - doCheck = false; - doInstallCheck = true; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; - installCheckInputs = [ pytestCheckHook networkx numpy ]; + pythonImportsCheck = [ "retworkx" ]; + checkInputs = [ + pytestCheckHook + fixtures + graphviz + matplotlib + networkx + numpy + pydot + ]; preCheck = '' export TESTDIR=$(mktemp -d) From bc9d05509a3e7fa9c0fbee0ead07c3934432a09e Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Tue, 27 Apr 2021 14:17:52 -0400 Subject: [PATCH 29/83] python3Packages.yfinance: 0.1.56 -> 0.1.59 --- pkgs/development/python-modules/yfinance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index bceac92d79ed..81250f98a64d 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.1.56"; + version = "0.1.59"; # GitHub source releases aren't tagged src = fetchPypi { inherit pname version; - sha256 = "a6d4c7b939fdd48d983556501f5b387e20aaef86afc8e6ba6f91a49a7e22d2dd"; + sha256 = "fe4dc46807eceadc6604bf51ece7297b752dc5402a38a87385094fbfc7565fa0"; }; propagatedBuildInputs = [ From d173e91589a3e2604dfbadbf8d7a5b8e1089d842 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Tue, 27 Apr 2021 14:21:34 -0400 Subject: [PATCH 30/83] python3Packages.qiskit-terra: 0.17.0 -> 0.17.4 Also unbreak build on master by disabling tests that compare visual matplotlib images. Also remove force deletes from postCheck. --- .../python-modules/qiskit-terra/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/qiskit-terra/default.nix b/pkgs/development/python-modules/qiskit-terra/default.nix index a5faf69f942e..8b83c506808e 100644 --- a/pkgs/development/python-modules/qiskit-terra/default.nix +++ b/pkgs/development/python-modules/qiskit-terra/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , pythonOlder , buildPythonPackage , fetchFromGitHub @@ -56,7 +57,7 @@ in buildPythonPackage rec { pname = "qiskit-terra"; - version = "0.17.0"; + version = "0.17.4"; disabled = pythonOlder "3.6"; @@ -64,7 +65,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = version; - hash = "sha256-LbNbaHAWAVG5YLc9juuwcOlrREBW6OjEl7VPtACfl3I="; + hash = "sha256-JyNuke+XPqjLVZbvPud9Y7k0+EmvETVKcOYcDldBiVo="; }; nativeBuildInputs = [ cython ]; @@ -106,11 +107,17 @@ buildPythonPackage rec { "test/python/classical_function_compiler/" ]; disabledTests = [ + # Not working on matplotlib >= 3.4.0, checks images match. + "test_plot_circuit_layout" + # Flaky tests "test_cx_equivalence" "test_pulse_limits" + "test_1q_random" ] ++ lib.optionals (!withClassicalFunctionCompiler) [ "TestPhaseOracle" + ] ++ lib.optionals stdenv.isAarch64 [ + "test_circuit_init" # failed on aarch64, https://gist.github.com/r-rmcgibbo/c2e173d43ced4f6954811004f6b5b842 ] # Disabling slow tests for build constraints ++ [ @@ -155,8 +162,8 @@ buildPythonPackage rec { pushd $PACKAGEDIR ''; postCheck = '' - rm -rf test - rm -rf examples + rm -r test + rm -r examples popd ''; From bf1bad92637565f6787b62ca5e58fc356cd3ce60 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Tue, 27 Apr 2021 14:23:15 -0400 Subject: [PATCH 31/83] python3Packages.qiskit-ibmq-provider: 0.12.2 -> 0.13.1 --- .../python-modules/qiskit-ibmq-provider/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix index 80f060c66815..aa02de42fb32 100644 --- a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix +++ b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix @@ -39,7 +39,7 @@ let in buildPythonPackage rec { pname = "qiskit-ibmq-provider"; - version = "0.12.2"; + version = "0.13.1"; disabled = pythonOlder "3.6"; @@ -47,7 +47,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = version; - sha256 = "0yil363mqssq0453nrwxgkjivzk3a4jgbnaf21bp7lwfcl2jdhqm"; + hash = "sha256-DlHlXncttzGo4uVoh2aQ7urW6krN3ej2sJ/EwuxeF2I="; }; propagatedBuildInputs = [ @@ -83,7 +83,9 @@ buildPythonPackage rec { # Skip tests that rely on internet access (mostly to IBM Quantum Experience cloud). # Options defined in qiskit.terra.test.testing_options.py::get_test_options - QISKIT_TESTS = "skip_online"; + preCheck = '' + export QISKIT_TESTS=skip_online + ''; meta = with lib; { description = "Qiskit provider for accessing the quantum devices and simulators at IBMQ"; From 2d90781e4d78bf753e8e5285002b1bce3f5fa101 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Wed, 19 May 2021 18:13:40 -0400 Subject: [PATCH 32/83] python3Packages.qiskit-aer: 0.8.0 -> 0.8.2 Use a patch submitted via PR instead of custom substitute. Remove pybind11 install requirement, as requested by @dotlambda --- .../python-modules/qiskit-aer/default.nix | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix index 54de098bdc46..89041f7508df 100644 --- a/pkgs/development/python-modules/qiskit-aer/default.nix +++ b/pkgs/development/python-modules/qiskit-aer/default.nix @@ -2,6 +2,7 @@ , pythonOlder , buildPythonPackage , fetchFromGitHub +, fetchpatch # C Inputs , blas , catch2 @@ -27,7 +28,7 @@ buildPythonPackage rec { pname = "qiskit-aer"; - version = "0.8.0"; + version = "0.8.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -36,13 +37,30 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-aer"; rev = version; - hash = "sha256-CWF3ehLs0HBXnYH11r+2CQwIcxddAfQm3ulAf1agl/o="; + hash = "sha256-7NWM7qpMQ3vA6p0dhEPnkBjsPMdhceYTYcAD4tsClf0="; }; + patches = [ + (fetchpatch { + # https://github.com/Qiskit/qiskit-aer/pull/1250 + name = "qiskit-aer-pr-1250-native-cmake_dl_libs.patch"; + url = "https://github.com/Qiskit/qiskit-aer/commit/2bf04ade3e5411776817706cf82cc67a3b3866f6.patch"; + sha256 = "0ldwzxxfgaad7ifpci03zfdaj0kqj0p3h94qgshrd2953mf27p6z"; + }) + ]; + # Remove need for cmake python package + # pybind11 shouldn't be an install requirement, just build requirement. + postPatch = '' + substituteInPlace setup.py \ + --replace "'cmake!=3.17,!=3.17.0'," "" \ + --replace "'pybind11>=2.6'" "" + ''; + nativeBuildInputs = [ cmake ninja scikit-build + pybind11 ]; buildInputs = [ @@ -58,14 +76,8 @@ buildPythonPackage rec { cvxpy cython # generates some cython files at runtime that need to be cython-ized numpy - pybind11 ]; - # tries to install pypi cmake package, not needed - postPatch = '' - substituteInPlace setup.py --replace "'cmake!=3.17,!=3.17.0'," "" - ''; - # Disable using conan for build preBuild = '' export DISABLE_CONAN=1 From 7af89007ad2913453646de12597eaf415eb565f0 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Tue, 4 May 2021 13:06:19 -0400 Subject: [PATCH 33/83] python3Packages.qiskit-ignis: fix aarch64 build Also remove unused patch & unneeded docs delete (they're not in $out). --- .../python-modules/qiskit-ignis/default.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/qiskit-ignis/default.nix b/pkgs/development/python-modules/qiskit-ignis/default.nix index 996259f683b4..f7ebbee39f80 100644 --- a/pkgs/development/python-modules/qiskit-ignis/default.nix +++ b/pkgs/development/python-modules/qiskit-ignis/default.nix @@ -1,8 +1,8 @@ { lib +, stdenv , pythonOlder , buildPythonPackage , fetchFromGitHub -, python , numpy , qiskit-terra , scikit-learn @@ -35,12 +35,6 @@ buildPythonPackage rec { hash = "sha256-L5fwCMsN03ojiDvKIyqsGfUnwej1P7bpyHlL6mu7nh0="; }; - # hacky, fix https://github.com/Qiskit/qiskit-ignis/issues/532. - # TODO: remove on qiskit-ignis v0.5.2 - postPatch = '' - substituteInPlace qiskit/ignis/mitigation/expval/base_meas_mitigator.py --replace "plt.axes" "'plt.axes'" - ''; - propagatedBuildInputs = [ numpy qiskit-terra @@ -49,12 +43,13 @@ buildPythonPackage rec { ] ++ lib.optionals (withCvx) [ cvxpy ] ++ lib.optionals (withVisualization) [ matplotlib ] ++ lib.optionals (withJit) [ numba ]; - postInstall = "rm -rf $out/${python.sitePackages}/docs"; # this dir can create conflicts # Tests pythonImportsCheck = [ "qiskit.ignis" ]; dontUseSetuptoolsCheck = true; - preCheck = "export HOME=$TMPDIR"; + preCheck = '' + export HOME=$TMPDIR + ''; checkInputs = [ pytestCheckHook ddt @@ -63,7 +58,8 @@ buildPythonPackage rec { ]; disabledTests = [ "test_tensored_meas_cal_on_circuit" # Flaky test, occasionally returns result outside bounds - "test_qv_fitter" # execution hangs, ran for several minutes + ] ++ lib.optionals stdenv.isAarch64 [ + "test_fitters" # Fails check that arrays are close. Might be due to aarch64 math issues. ]; meta = with lib; { From 6171c77ad3c42b840fe56796c40cf932139c0950 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Tue, 27 Apr 2021 14:29:50 -0400 Subject: [PATCH 34/83] python3Packages.qiskit-aqua: 0.9.0 -> 0.9.1 Remove unneeded docs delete, they're no longer in $out. --- .../python-modules/qiskit-aqua/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/qiskit-aqua/default.nix b/pkgs/development/python-modules/qiskit-aqua/default.nix index 3233e435f071..7069629470cd 100644 --- a/pkgs/development/python-modules/qiskit-aqua/default.nix +++ b/pkgs/development/python-modules/qiskit-aqua/default.nix @@ -10,7 +10,6 @@ , networkx , numpy , psutil -, python , qiskit-ignis , qiskit-terra , quandl @@ -34,7 +33,7 @@ buildPythonPackage rec { pname = "qiskit-aqua"; - version = "0.9.0"; + version = "0.9.1"; disabled = pythonOlder "3.6"; @@ -43,7 +42,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-aqua"; rev = version; - hash = "sha256-knue9uJih72UQHsvfXZ9AA94mol4ERa9Lo/GMcp+2hA="; + hash = "sha256-fptyqPrkUgl3UjtlEmDYORdX/SsONxWozQGEs/EahmU="; }; # Optional packages: pyscf (see below NOTE) & pytorch. Can install via pip/nix if needed. @@ -97,8 +96,6 @@ buildPythonPackage rec { >> qiskit/optimization/__init__.py ''; - postInstall = "rm -rf $out/${python.sitePackages}/docs"; # Remove docs dir b/c it can cause conflicts. - checkInputs = [ pytestCheckHook ddt @@ -123,9 +120,6 @@ buildPythonPackage rec { "--ignore=test/chemistry/test_bopes_sampler.py" ]; disabledTests = [ - # Disabled due to missing pyscf - "test_validate" # test/chemistry/test_inputparser.py - # Online tests "test_exchangedata" "test_yahoo" @@ -163,6 +157,8 @@ buildPythonPackage rec { "test_eoh" "test_qasm_5" "test_uccsd_hf" + ] ++ lib.optionals (!withPyscf) [ + "test_validate" # test/chemistry/test_inputparser.py ]; meta = with lib; { From bb6aec6f49196b58e31963759de0a6021e153a8a Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Tue, 27 Apr 2021 14:31:29 -0400 Subject: [PATCH 35/83] python3Packages.qiskit: 0.25.0 -> 0.26.2 Add optional subpackages as arguments. Most of these are not in nixpkgs, but can be found in https://github.com/drewrisinger/nur-packages/. --- pkgs/development/python-modules/qiskit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index d2866d41c3ab..6cc24be1958a 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "qiskit"; # NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history - version = "0.25.0"; + version = "0.26.2"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "qiskit"; repo = "qiskit"; rev = version; - hash = "sha256-pJM6d3AyFs9AexvQXG+8QQ4zwpFisJC16iBFR9gNSk0="; + hash = "sha256-QYWKKS7e/uCt5puWV4jA9Emp7M4Cyv2RUCxilbChWhw="; }; propagatedBuildInputs = [ From 57af1727bc620bae47d1136e5e4aa60af952b35d Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Sat, 15 May 2021 13:59:28 +0800 Subject: [PATCH 36/83] nodePackages.wavedrom-cli: init at 2.6.9 Also update nodePackages --- pkgs/development/node-packages/default.nix | 11 + .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 1935 ++++++++++------- 3 files changed, 1207 insertions(+), 740 deletions(-) diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 71eb3727c6a4..d77739683414 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -331,5 +331,16 @@ let --prefix NODE_PATH : ${self.prettier}/lib/node_modules ''; }; + + wavedrom-cli = super.wavedrom-cli.override { + nativeBuildInputs = [ pkgs.pkg-config self.node-pre-gyp ]; + # These dependencies are required by + # https://github.com/Automattic/node-canvas. + buildInputs = with pkgs; [ + pixman + cairo + pango + ]; + }; }; in self diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 268ca2409ed2..27d13e4adeb3 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -261,6 +261,7 @@ , { "vscode-lldb-build-deps": "../../misc/vscode-extensions/vscode-lldb/build-deps" } , "vue-cli" , "vue-language-server" +, "wavedrom-cli" , "web-ext" , "webpack" , "webpack-cli" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index be075bfdb04a..d5381c9c288d 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -1498,6 +1498,15 @@ let sha512 = "cTIudHnzuWLS56ik4DnRnqqNf8MkdUzV4iFFI1h7Jo9xvrpQROYaAnaSd2mHLQAzzZAPfATynX5ord6YlNYNMA=="; }; }; + "@babel/runtime-corejs3-7.14.0" = { + name = "_at_babel_slash_runtime-corejs3"; + packageName = "@babel/runtime-corejs3"; + version = "7.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.0.tgz"; + sha512 = "0R0HTZWHLk6G8jIk0FtoX+AatCtKnswS98VhXwGImFc759PJRp4Tru0PQYZofyijTFUr+gT8Mu7sgXVJLQ0ceg=="; + }; + }; "@babel/standalone-7.14.4" = { name = "_at_babel_slash_standalone"; packageName = "@babel/standalone"; @@ -2038,31 +2047,31 @@ let sha512 = "Ydf4LidRB/EBI+YrB+cVLqIseiRfjUI/AeHBgjGMtq3GroraDu81OV7zqophRgupngoL3iS3JUMDMnxO7g39qA=="; }; }; - "@expo/config-4.0.0" = { + "@expo/config-4.0.2" = { name = "_at_expo_slash_config"; packageName = "@expo/config"; - version = "4.0.0"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config/-/config-4.0.0.tgz"; - sha512 = "Hy2/49BMMzziDhJFf+N0gG5znLuhoorS9/+OFO7wqDbRV4LRraNx4UuGdyY06yLI7F0BgEJBGy109pZ4LZoKrA=="; + url = "https://registry.npmjs.org/@expo/config/-/config-4.0.2.tgz"; + sha512 = "zKKWt6Qs2lJLSwp8NeBCQ+iAPuKYkRJB6PZZJFIXaXD9AC5uJYSElUG+HVfy73se4KF/4JjndOWXWZEkCAivxw=="; }; }; - "@expo/config-plugins-2.0.0" = { + "@expo/config-plugins-2.0.2" = { name = "_at_expo_slash_config-plugins"; packageName = "@expo/config-plugins"; - version = "2.0.0"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-2.0.0.tgz"; - sha512 = "MyD9cdoVuXEw/xzpHiFNzRvMFi1DWTU2oShTTviA8xt1U1gyuBTa9aBwFSyvZmpMoCEscOsC8ED0sZl7LM5wNw=="; + url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-2.0.2.tgz"; + sha512 = "kaTfzLfg9sjy9uAHq708FVqC2hlVQyzCmrCsnfRguk2d+5V9ZyCVdMPiDdAIKHtWCPygIPNmlIP4FYQ093RNzQ=="; }; }; - "@expo/config-types-40.0.0-beta.2" = { + "@expo/config-types-41.0.0" = { name = "_at_expo_slash_config-types"; packageName = "@expo/config-types"; - version = "40.0.0-beta.2"; + version = "41.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config-types/-/config-types-40.0.0-beta.2.tgz"; - sha512 = "t9pHCQMXOP4nwd7LGXuHkLlFy0JdfknRSCAeVF4Kw2/y+5OBbR9hW9ZVnetpBf0kORrekgiI7K/qDaa3hh5+Qg=="; + url = "https://registry.npmjs.org/@expo/config-types/-/config-types-41.0.0.tgz"; + sha512 = "Ax0pHuY5OQaSrzplOkT9DdpdmNzaVDnq9VySb4Ujq7UJ4U4jriLy8u93W98zunOXpcu0iiKubPsqD6lCiq0pig=="; }; }; "@expo/configure-splash-screen-0.4.0" = { @@ -2074,22 +2083,22 @@ let sha512 = "IDPnr2/DW1tYpDHqedFYNCDzRTf9HYinWFQ7fOelNZLuOCMoErLbSStA5zfkv46o69AgcCpteqgKHSoxsIBz5g=="; }; }; - "@expo/dev-server-0.1.70" = { + "@expo/dev-server-0.1.72" = { name = "_at_expo_slash_dev-server"; packageName = "@expo/dev-server"; - version = "0.1.70"; + version = "0.1.72"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.70.tgz"; - sha512 = "6OytCPP8krQwjhJeluzDZd1dBb9oIptpkskSsrZHQTHyCGK9m3CLILu/hSiUffN73vINscnUXwCusfbKU+g3yQ=="; + url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.72.tgz"; + sha512 = "W1ULabPSCDiV1ySy3ZkX2nTUPiWLqj1ocMLE8sk1wddO8RWneKGB9FlrGDj0+RFTDOYi6ZmBESesKrH/elNkRw=="; }; }; - "@expo/dev-tools-0.13.100" = { + "@expo/dev-tools-0.13.102" = { name = "_at_expo_slash_dev-tools"; packageName = "@expo/dev-tools"; - version = "0.13.100"; + version = "0.13.102"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.100.tgz"; - sha512 = "S/kI8boX8cc8pSkLApARxeW3ukdOMXFDBS02bQYx7+oZsY6hqfefUX2gvAnWatzCSOUBnRRdmrDAcFuZRnRP3w=="; + url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.102.tgz"; + sha512 = "yVpt9EERqMrPXaFgjV5HumcDSoni0rhaafTB186NB4BYPNuBDytSeb9RnpxyHHWxzF3/mav5DIQ+x6HB6TdWig=="; }; }; "@expo/devcert-1.0.0" = { @@ -2119,13 +2128,13 @@ let sha512 = "vrgGyPEXBoFI5NY70IegusCSoSVIFV3T3ry4tjJg1MFQKTUlR7E0r+8g8XR6qC705rc2PawaZQjqXMAVtV6s2A=="; }; }; - "@expo/metro-config-0.1.70" = { + "@expo/metro-config-0.1.72" = { name = "_at_expo_slash_metro-config"; packageName = "@expo/metro-config"; - version = "0.1.70"; + version = "0.1.72"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.70.tgz"; - sha512 = "zegpHSI0EedKSXkBg0wtU99YYA6OY8qCgm0urdKszDJ9c8Oea26b2+x2j0PBqspUiTC4kY+t/pzZkKWDEFAquQ=="; + url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.72.tgz"; + sha512 = "PvWn5DZCV6hNYA9CTOBWEfwb9FCjyQCiyYnmxjsT0k9eplIBGTtfy74uIOd0SdDdCTPCgCO8SMyabc+Qg599xg=="; }; }; "@expo/osascript-2.0.28" = { @@ -2155,13 +2164,13 @@ let sha512 = "zGPSq9OrCn7lWvwLLHLpHUUq2E40KptUFXn53xyZXPViI0k9lbApcR9KlonQZ95C+ELsf0BQ3gRficwK92Ivcw=="; }; }; - "@expo/prebuild-config-1.0.1" = { + "@expo/prebuild-config-1.0.3" = { name = "_at_expo_slash_prebuild-config"; packageName = "@expo/prebuild-config"; - version = "1.0.1"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-1.0.1.tgz"; - sha512 = "A0MBD5NceJWwRO8dKe+yMjV5LMJX0CXGRX5q57XuV/UJ4RkdX0ZuRdiVpAPpkHXWU5lJAHwtebV0swuDMkWKMQ=="; + url = "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-1.0.3.tgz"; + sha512 = "4rkWeVs6FaO4TcOVf5GnH5HTPOaVHJX9d1GnqF/Msh3IdhX1+v+c3s6HYmxDezkild27SYwrinqu89CWRUtM/A=="; }; }; "@expo/results-1.0.0" = { @@ -2200,13 +2209,13 @@ let sha512 = "LB7jWkqrHo+5fJHNrLAFdimuSXQ2MQ4lA7SQW5bf/HbsXuV2VrT/jN/M8f/KoWt0uJMGN4k/j7Opx4AvOOxSew=="; }; }; - "@expo/webpack-config-0.12.74" = { + "@expo/webpack-config-0.12.76" = { name = "_at_expo_slash_webpack-config"; packageName = "@expo/webpack-config"; - version = "0.12.74"; + version = "0.12.76"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.74.tgz"; - sha512 = "xYyiin5uvRwRC3ehqRxb+MSzv9ArJSb3spOgl4yNZPkojXUbNjgyC3xfliVAH7ZuRMlEgL1Is7miixVe69ftYw=="; + url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.76.tgz"; + sha512 = "8Q4sH+KBgM9jsH7Dp0A5lEmGiKvBXNcax2H6k8i54vfptaUh8gBZqohGuLshzeTJYT43I3LDulheOGr83yNB3g=="; }; }; "@expo/xcpretty-2.0.1" = { @@ -3109,22 +3118,22 @@ let sha512 = "EjPkDQOzV/oZfbolEUgFT6SE++PtCccVBvjuACkttyCfl0P2jnpR49SwstyVLc2u8AwBAZEHHAw9lPYaMjtbXQ=="; }; }; - "@joplin/fork-htmlparser2-4.1.24" = { + "@joplin/fork-htmlparser2-4.1.26" = { name = "_at_joplin_slash_fork-htmlparser2"; packageName = "@joplin/fork-htmlparser2"; - version = "4.1.24"; + version = "4.1.26"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/fork-htmlparser2/-/fork-htmlparser2-4.1.24.tgz"; - sha512 = "lggBrPT0Lg/WcD7oe166HbpAS+ajQwSNAzUl8pYBhNChJzjbngJxm5hs94xYJ3qDzyxHRMU+x4iTZAn0/SNFDQ=="; + url = "https://registry.npmjs.org/@joplin/fork-htmlparser2/-/fork-htmlparser2-4.1.26.tgz"; + sha512 = "ltw7n6MdZyz+oM8DUzOxDeVPdOs/ZTavkmHeP4mp7FE4HYyU7ynhRAVsBpGmzRbXTCYXzl6QHVtocKEUZHkbSg=="; }; }; - "@joplin/fork-sax-1.2.28" = { + "@joplin/fork-sax-1.2.30" = { name = "_at_joplin_slash_fork-sax"; packageName = "@joplin/fork-sax"; - version = "1.2.28"; + version = "1.2.30"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/fork-sax/-/fork-sax-1.2.28.tgz"; - sha512 = "oWUpaBZlfUC+dGJqmb8hwwgjk3dSHcKL7e8n1LpmkUBqqdh1lxLrrFoGqYpKiSBgDY0KTIdyB8S8INBMlY+l7A=="; + url = "https://registry.npmjs.org/@joplin/fork-sax/-/fork-sax-1.2.30.tgz"; + sha512 = "cRSVysAJwLnaRbFRGHCLDl3rB980iLThCDVwL5lVLpaB43pk+0GVJF3k288mJ1U20mPoZqwc0hV8C0Q5oDMKHw=="; }; }; "@joplin/lib-1.8.2" = { @@ -3145,22 +3154,22 @@ let sha512 = "Khl2DoM1aFEy15RX9JaMaYinjoNEYQHOgQqzMHq4wuWr+QuAQaX8/SofTe1FU2rS4SJrkObPA+XPavhVSAxpOQ=="; }; }; - "@joplin/turndown-4.0.46" = { + "@joplin/turndown-4.0.48" = { name = "_at_joplin_slash_turndown"; packageName = "@joplin/turndown"; - version = "4.0.46"; + version = "4.0.48"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/turndown/-/turndown-4.0.46.tgz"; - sha512 = "OqI9DFEKdEOxfQUkbfRiWpNfDXf+/E4u9c9hXVRK66xFrVkZww7FBmoGqIMHzOrKeQBIPZQuHCav31cFl7oMCQ=="; + url = "https://registry.npmjs.org/@joplin/turndown/-/turndown-4.0.48.tgz"; + sha512 = "QJeys/bR9qtEdUs8EFfpwRTfu01+iGQ6GaW+gxQjgXttsmfV+NuoVWfz5/NCdZ+9hqF6DdE9tU45G4EX1diFJA=="; }; }; - "@joplin/turndown-plugin-gfm-1.0.28" = { + "@joplin/turndown-plugin-gfm-1.0.30" = { name = "_at_joplin_slash_turndown-plugin-gfm"; packageName = "@joplin/turndown-plugin-gfm"; - version = "1.0.28"; + version = "1.0.30"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.28.tgz"; - sha512 = "CAmcFWK2bgAgQq3h+xEKjjk8/7v8ZaY2ixHDoiSCRiSqv868EuAQLCks6Ox4rq35R2yX8FK/pHeciRpZo5wNcg=="; + url = "https://registry.npmjs.org/@joplin/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.30.tgz"; + sha512 = "81syBeLWxduhIM+gZSdM9OGOBL5XXFSMymwfWSFTzS8svYx/I95TPwq0oERcIz6rZkeqf6C9Q52iY30GvKEOog=="; }; }; "@josephg/resolvable-1.0.1" = { @@ -3811,13 +3820,13 @@ let sha512 = "W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA=="; }; }; - "@microsoft/load-themed-styles-1.10.173" = { + "@microsoft/load-themed-styles-1.10.174" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.173"; + version = "1.10.174"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.173.tgz"; - sha512 = "Bi4U2IQr5uWl1RVhCZduWO04em4CbYcH6cvmgvkN2K09kFW9VSQ4qAQYnnZ6w8HOCOsa3BJaHtGq+TTOP4eYkg=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.174.tgz"; + sha512 = "O0ERVgeTrpzCzCLHOTZZDSg0K3FKdWRdBpFjs+X5wS21Jg21QqrA4T9FhCheilEcrF4Qmf41gBtgZ/16JNSWIA=="; }; }; "@mitmaro/errors-1.0.0" = { @@ -3883,13 +3892,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-11.29.0" = { + "@netlify/build-11.29.2" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "11.29.0"; + version = "11.29.2"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-11.29.0.tgz"; - sha512 = "e5tmKxHORmJABpgSdlylXBnhibwHZGdSTZWJa3eVIHSMwRC5xK37TLi+HmSL+AeCEqaHozFhHedsdgkKB9figw=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-11.29.2.tgz"; + sha512 = "fxVBpKjsTdcRkfj9RdMBVxy/TABQJhkf5/vFwzNZqnnBwes/Em6YFutNpML6zm5Ub9hpvE0HaceyOU4HkvjSFg=="; }; }; "@netlify/cache-utils-1.0.7" = { @@ -3910,22 +3919,22 @@ let sha512 = "4DyiSauSFaorJ46l4tBu+nbvPKY9i1gOQvw9L4yql7gd7qqJsHJi2zivdJ50+MPedQn0cgcs5lk303UBEfFsBQ=="; }; }; - "@netlify/framework-info-5.0.0" = { + "@netlify/framework-info-5.1.2" = { name = "_at_netlify_slash_framework-info"; packageName = "@netlify/framework-info"; - version = "5.0.0"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-5.0.0.tgz"; - sha512 = "EVyCVfSi9SKI7siVqAggQ4gsgkjzIxpUgUwh6ChNw7wQ8UykZ4gqYJjtw81VrxNqGV37yyI3Upy1u3MeusLLig=="; + url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-5.1.2.tgz"; + sha512 = "v3Fs9REofVNMgye8j1c0NBfVRA+P+2cS50Y1RRwrlVz344UUwZd7b0LKhZl0EkQadsdyxG2a3XgjxF5Zb3jJ0Q=="; }; }; - "@netlify/functions-utils-1.3.35" = { + "@netlify/functions-utils-1.3.37" = { name = "_at_netlify_slash_functions-utils"; packageName = "@netlify/functions-utils"; - version = "1.3.35"; + version = "1.3.37"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.3.35.tgz"; - sha512 = "b607BKWwh81DDDLEW+430v0MJka71Rr5aIeEUtkWqPe6Io+ei6DjqIJJrHsBnNh0vWXeo0Stf3f1kMAA2P+fUA=="; + url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.3.37.tgz"; + sha512 = "Lq1Aj3N2vWB3nNFRbEHgVjB+MpwCsZz+rUOCki3h5PwEUwnGFyFi2VcdHQ2FJtzF7vrcm5NoMfg4pG8iY91YGA=="; }; }; "@netlify/git-utils-1.0.11" = { @@ -3946,13 +3955,13 @@ let sha512 = "ffNpGiJulY4is1pWkrs1dn3/ytNoqJxyAD/N70cnkIVNpOWMnPGSPKGBk/TBpaZhispgSBBQ+JZXEMJAGMDZ6Q=="; }; }; - "@netlify/plugin-edge-handlers-1.11.12" = { + "@netlify/plugin-edge-handlers-1.11.13" = { name = "_at_netlify_slash_plugin-edge-handlers"; packageName = "@netlify/plugin-edge-handlers"; - version = "1.11.12"; + version = "1.11.13"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.11.12.tgz"; - sha512 = "zbQkQHho/SkTTTOsRBvVvx74IEMsLHL/FxJYhkfgMXwXTQSsq35/pRRYq6TfQyRBSlUkllDRmTOB+f2DQCvQrw=="; + url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.11.13.tgz"; + sha512 = "GPSg5bYlU2hgmt1MGx22+ZoXbPdnEiqkdj40hWxJjHuDIGqfvFa3nGup7BvHBNfd1uI+OVSlLXzabWl6aVjQIg=="; }; }; "@netlify/plugins-list-2.14.2" = { @@ -4009,13 +4018,13 @@ let sha512 = "ea6S9ik5X0TlA2e+jXk5D7lfvArPZjyQoIBEo7G1Tjw/vUU5Fx6KLfXv1iy7eJy+ENTLoyidscAjJ2wXlHI47g=="; }; }; - "@netlify/zip-it-and-ship-it-4.2.1" = { + "@netlify/zip-it-and-ship-it-4.2.5" = { name = "_at_netlify_slash_zip-it-and-ship-it"; packageName = "@netlify/zip-it-and-ship-it"; - version = "4.2.1"; + version = "4.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.2.1.tgz"; - sha512 = "IWh/VhLOH1412Mm1eBBKktV1SeSJHAiBehhdFMTrKJfFdK7vh+TylNImc/wuGCAdci85FXOWQ+YpnMOibhGvng=="; + url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.2.5.tgz"; + sha512 = "2ncCQEs49I8Ir30w2T3E1yogJp9cw+X8vfvL9a8i1AA0VE51F2rfhNsLbceWrEWn2T3TgogOMQP/0Qsxw2v0Tg=="; }; }; "@node-red/editor-api-1.3.5" = { @@ -4495,310 +4504,310 @@ let sha512 = "+0P+PrP9qSFVaayNdek4P1OAGE+PEl2SsufuHDRmUpOY25Wzjo7Atyar56Trjc32jkNy4lID6ZFT6BahsR9P9A=="; }; }; - "@ot-builder/bin-composite-types-1.0.7" = { + "@ot-builder/bin-composite-types-1.0.8" = { name = "_at_ot-builder_slash_bin-composite-types"; packageName = "@ot-builder/bin-composite-types"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.0.7.tgz"; - sha512 = "JGXpefpLj/FDhhTldcVbw4tXW5OBBbHalfOCiR7Af6SOdHD2Fy3gXSrkuULFS/4t8lw0byREhjCHZ3mKbOdCjw=="; + url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.0.8.tgz"; + sha512 = "YVSC2OhhBYx4nTELZrS/DKbdseDhCIlyMiey4Zgc6VKQgC33ZXaGB9gUnAT/CHuGJINQJoKtsgyRA3nkd+2QJw=="; }; }; - "@ot-builder/bin-util-1.0.7" = { + "@ot-builder/bin-util-1.0.8" = { name = "_at_ot-builder_slash_bin-util"; packageName = "@ot-builder/bin-util"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.0.7.tgz"; - sha512 = "diiALKLHQwiyQJ1hDrLdPNfZXs0GXtOm5QDYn1U/gJWewCfgWr1LVwX8+QzwgVEI/QuZi+A3G0I6qqvegPrEGg=="; + url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.0.8.tgz"; + sha512 = "GkyOMuUD3AQGCguvyaAgraEc7DMsKAHoujFPSUN76h6C9LUYGmayCDsbHjZoInkb90+m2OXcZ9hqSCIThZ6dcA=="; }; }; - "@ot-builder/cli-help-shower-1.0.7" = { + "@ot-builder/cli-help-shower-1.0.8" = { name = "_at_ot-builder_slash_cli-help-shower"; packageName = "@ot-builder/cli-help-shower"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.0.7.tgz"; - sha512 = "SsipXPTXTAWlxXVFvWd+TY01gWC/3VSp8l4Cs1p1PguzourRyWtLD6y8prQV+zvuARDJ+XLjn3Fy1RoL3PMjiA=="; + url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.0.8.tgz"; + sha512 = "MXbzoFtpSbU9eQozzynlEPRjUBDbtDq187SylpYIeV7FARfkaKd7f8M6FDH+gqeNMeAUcivnMYifAC+nz8bWOA=="; }; }; - "@ot-builder/cli-proc-1.0.7" = { + "@ot-builder/cli-proc-1.0.8" = { name = "_at_ot-builder_slash_cli-proc"; packageName = "@ot-builder/cli-proc"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.0.7.tgz"; - sha512 = "cDCfKjsnu0iGrEoAR2XCoZfIjo9WXu8Xdhc3VTyBfV9tmrUpyh9t/9YCRyq6haFU69l9BzoDC3Vsl32vh27eSQ=="; + url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.0.8.tgz"; + sha512 = "kOGCHlc7cSI8J24gCRHXNbl4IvsjdorRUX9L3HtDDH9pVpHqVrlb3X2opcNVtPo0kYbKidANEGf76c/WRi0ERQ=="; }; }; - "@ot-builder/cli-shared-1.0.7" = { + "@ot-builder/cli-shared-1.0.8" = { name = "_at_ot-builder_slash_cli-shared"; packageName = "@ot-builder/cli-shared"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.0.7.tgz"; - sha512 = "BPBEpZQ04KFHFMlR/xDGLYjGihwI6b22UfgQolckpySKduk328Li4dE7kUBKPpoLsWAF6Z+SMImHifrcNkOwOQ=="; + url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.0.8.tgz"; + sha512 = "B5c0RqrRkB8gb7h0+mX+JQAP6I8TtnLD8JiYRGMo+JszI2anh7ecD3XbVgMF0oJi8e5r5+p0xq8sDrJi4qy9SQ=="; }; }; - "@ot-builder/common-impl-1.0.7" = { + "@ot-builder/common-impl-1.0.8" = { name = "_at_ot-builder_slash_common-impl"; packageName = "@ot-builder/common-impl"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.0.7.tgz"; - sha512 = "alYW8r3tH33cK87Dnmz4TaPxOR6ViA249OZYhkdbMVKz4Dj1LBceXdpJp7NgcQbLDSIqzB+yI4/zEQEYFIg4cQ=="; + url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.0.8.tgz"; + sha512 = "ho7WtOf+MiMq6jjF6LbepqTTnyzEv6OeNTT1erkdWb52QETZnINYtbMks/HVPYHnGMZqy62dmN8f1PSe74yD0A=="; }; }; - "@ot-builder/errors-1.0.7" = { + "@ot-builder/errors-1.0.8" = { name = "_at_ot-builder_slash_errors"; packageName = "@ot-builder/errors"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.0.7.tgz"; - sha512 = "iHBTQuIzgoojViqQlduL8LJhX+hUpvQZb34oV0foTBMLBUL444q9WgBoOq1YfE34eizxuEXi2tUf2wHI1Lsw0g=="; + url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.0.8.tgz"; + sha512 = "I8XzcO4tg8rWKFTS3nHKvPOE27uGH8fZLy9HsqU4yw8rGMYUo1EDxabReQ8v53DhrIlpbObW3/nSrGF4LT6m8Q=="; }; }; - "@ot-builder/io-bin-cff-1.0.7" = { + "@ot-builder/io-bin-cff-1.0.8" = { name = "_at_ot-builder_slash_io-bin-cff"; packageName = "@ot-builder/io-bin-cff"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.0.7.tgz"; - sha512 = "bnI4ZTTzZkx70KjVBlMv4LrarFKV8mDGcYOY2ZreWGDg0netY9lMUNmCXvEOOx1g4SX619wf1UWx599vepsZcQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.0.8.tgz"; + sha512 = "rHp9PFGeoblPwuCZd/i5l/CgNGv9hWEDQHZP11uQcO45H83iZugVxaT65ChBHoKDFp5x/+oxLSxp6kMu/7diZg=="; }; }; - "@ot-builder/io-bin-encoding-1.0.7" = { + "@ot-builder/io-bin-encoding-1.0.8" = { name = "_at_ot-builder_slash_io-bin-encoding"; packageName = "@ot-builder/io-bin-encoding"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.0.7.tgz"; - sha512 = "HWybHlIZfD/lsC9XjCmkq4EHNV8jv7/TBKZBC61DZuqe2P1IldKVSTg73si133/IHGP49qMyVplmF3ihq29hUQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.0.8.tgz"; + sha512 = "bP7U7cr3fkdM3jYtW6fSgBfqjIcVKJu3iZfAOtcP0o+aID6FbETWGpxYrfGcJuvjcQLDPhc0pda1Ag/ypeTnvg=="; }; }; - "@ot-builder/io-bin-ext-private-1.0.7" = { + "@ot-builder/io-bin-ext-private-1.0.8" = { name = "_at_ot-builder_slash_io-bin-ext-private"; packageName = "@ot-builder/io-bin-ext-private"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.0.7.tgz"; - sha512 = "McugROG+MkmqDqJGIh6zHNO2s7k/gido1T4Ow/dmNQBRYUSikRLOm+eusUP7X2dV1H148fIGbIJYXjldTVwyKw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.0.8.tgz"; + sha512 = "RTCaiGvbO340gLHh2omj62v0ysOE+rEdcVuISiIb08fo0azLsi+MvzQdwprCOc1+8s5wY/peDCQ38HN/gYC7dA=="; }; }; - "@ot-builder/io-bin-font-1.0.7" = { + "@ot-builder/io-bin-font-1.0.8" = { name = "_at_ot-builder_slash_io-bin-font"; packageName = "@ot-builder/io-bin-font"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.0.7.tgz"; - sha512 = "gN6QQ90Kg29GQS5DW9HSk7z/BHccdZTFIPA7z2xbhb94b+r7gvkt+MGFFTpPdh+7JEFUGhKkHcv05fRh1kDOGw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.0.8.tgz"; + sha512 = "6cL1cn7Qmzu1bsx4hr2aqKCMVu1+Si2xA8uGEVOryD94odjX76HJMta4bjH9P///PcQdIeJDczpk1s21LPg6Cw=="; }; }; - "@ot-builder/io-bin-glyph-store-1.0.7" = { + "@ot-builder/io-bin-glyph-store-1.0.8" = { name = "_at_ot-builder_slash_io-bin-glyph-store"; packageName = "@ot-builder/io-bin-glyph-store"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.0.7.tgz"; - sha512 = "AI0/pOqaWxhvuKIk5Rm1aRVCuVDJj/F34L9t6F5fvUhkOha6+FOwkZdXaVzUF82396CdVYY7X4D6m+YOjDCQXA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.0.8.tgz"; + sha512 = "vqr4pyK1oa3ADPUydKQgWZHKk1WAjO7hmMYARbqKzUCPHrqrr2dXJHMW8RNg+JhQykhG0ibHf6NdjHklBzTWIQ=="; }; }; - "@ot-builder/io-bin-layout-1.0.7" = { + "@ot-builder/io-bin-layout-1.0.8" = { name = "_at_ot-builder_slash_io-bin-layout"; packageName = "@ot-builder/io-bin-layout"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.0.7.tgz"; - sha512 = "Y0UOiIkNPlbzUcJ4yccTrgS8lwLGHlleJkntTKnMIcYbXhMYTARhiJOZYJ7RjSzZ5n01bpejzGeXYCt4YpfwNw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.0.8.tgz"; + sha512 = "0xrUl6WPQLpRwsVQXh1aBF28f7gJ0OR7N9xK5CZLsEku6R/uEGPSR0K9xlw8L+74J/ZWCX/WkbNgvvNUfyQLcw=="; }; }; - "@ot-builder/io-bin-metadata-1.0.7" = { + "@ot-builder/io-bin-metadata-1.0.8" = { name = "_at_ot-builder_slash_io-bin-metadata"; packageName = "@ot-builder/io-bin-metadata"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.0.7.tgz"; - sha512 = "Ze5D2ngX6bSM1Rjm9/0OWUKWVEJRE69ck/aIt1b3cAkreu8p1ldsPMFSL02LcmUpUhGTUCgUzqfhyq3eDC/46Q=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.0.8.tgz"; + sha512 = "hgkeZy8JI5pgr3B0ayLDHxOxuIDRSnK/PRxZBydOCsArcW61N8cEPv/DzMKS3iNY0hpTUghZ7INLWC5+0KL63g=="; }; }; - "@ot-builder/io-bin-metric-1.0.7" = { + "@ot-builder/io-bin-metric-1.0.8" = { name = "_at_ot-builder_slash_io-bin-metric"; packageName = "@ot-builder/io-bin-metric"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.0.7.tgz"; - sha512 = "DILo1KPj6ZP8VOZIeXCLGXRwgzSmxwGlqjv5b36j+Z+YoOs3pUqrpGz1KK1hWR/URQvDjEXMIWI3bFsiVFgxXw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.0.8.tgz"; + sha512 = "dKtTJ8AB1VWj/WYv9i+qhm6uKcwdC++MqQiaTLA7/eCnG9O2QjfTbOptYr6KI3+BKwe6/tbyzrqj7G5ZaVmtKA=="; }; }; - "@ot-builder/io-bin-name-1.0.7" = { + "@ot-builder/io-bin-name-1.0.8" = { name = "_at_ot-builder_slash_io-bin-name"; packageName = "@ot-builder/io-bin-name"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.0.7.tgz"; - sha512 = "NmIXTMXGJ4kP8eIKx99u620b9XSSUinZT47KKxjqtYLLuZcsmaToh/eUN7Z4XSMDKO33PeNwWlXNcDAkC82K6g=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.0.8.tgz"; + sha512 = "p93QSIEoBXtRyBEWI4KLuTTh3EtJTsoSeM7Ifopga7sCPDWFky5GeRqTq+Mvlk0cPiJtV24qdPdaIem5r5PBmg=="; }; }; - "@ot-builder/io-bin-sfnt-1.0.7" = { + "@ot-builder/io-bin-sfnt-1.0.8" = { name = "_at_ot-builder_slash_io-bin-sfnt"; packageName = "@ot-builder/io-bin-sfnt"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.0.7.tgz"; - sha512 = "CtjuqqR+QjEXwo630PPtvW7RYxqfekFGqIZkYHbHI8SnBXGv70jB62itEszuJcipAqfcHBO7ndCCQU9dY/7N3g=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.0.8.tgz"; + sha512 = "2yogXf3cdd6dI022HPU6lnzL10KU4DOOALkeg84qQCmse0WZdhZAKhdn08sqHIJ+EDjkfpRjHld0F96sKH8e0g=="; }; }; - "@ot-builder/io-bin-ttf-1.0.7" = { + "@ot-builder/io-bin-ttf-1.0.8" = { name = "_at_ot-builder_slash_io-bin-ttf"; packageName = "@ot-builder/io-bin-ttf"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.0.7.tgz"; - sha512 = "47ZXRatZFx4E7WeFPMOhndkWxeW5uIgUCMu6bVZTxUnw8qRIHXfl+Vgcw9SPxBEod1/9RL0koFcbWIQj5RoE6Q=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.0.8.tgz"; + sha512 = "TaX7s9UFyoyajgig7944DgWFmEzzcGjVGz3qz3olgAZcHhrgLoqIlmaxt1jEHgb7LZx3wG4G9WwcSl6arqMdAQ=="; }; }; - "@ot-builder/ot-1.0.7" = { + "@ot-builder/ot-1.0.8" = { name = "_at_ot-builder_slash_ot"; packageName = "@ot-builder/ot"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.0.7.tgz"; - sha512 = "kHdj0NcWHx+UetLZL+aVfMMTs+tQ/jEp3p+aaWGUI77lJF7ChRWpHdZx7TxnNaoz5/C4WkthHL9pcL0dr0DuPA=="; + url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.0.8.tgz"; + sha512 = "X2/4GcLGA1dTaR2+iHdhGn64cCLQJ9gZdoAVS3DZjMJIyyScFDVLAGhYHPLYk97EDQ5Pm7RnQNoY11U5igm28g=="; }; }; - "@ot-builder/ot-encoding-1.0.7" = { + "@ot-builder/ot-encoding-1.0.8" = { name = "_at_ot-builder_slash_ot-encoding"; packageName = "@ot-builder/ot-encoding"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.0.7.tgz"; - sha512 = "rM8bYLy+fAAqtO4lKNkpE6UdXlenJiKG7buGD/GwIcTyCLdmIh8V1iJkMm6g2EJ/CkSR9+6b+YnR38TeU2CFwA=="; + url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.0.8.tgz"; + sha512 = "dRmxL8WUfjZAjd8RcSmd3wI442Gzy9i4X7Ock2rj0ZwVxlfQB7F3dx71IVgvSRbrkz2Ny+7htW3eq+V0be+cmw=="; }; }; - "@ot-builder/ot-ext-private-1.0.7" = { + "@ot-builder/ot-ext-private-1.0.8" = { name = "_at_ot-builder_slash_ot-ext-private"; packageName = "@ot-builder/ot-ext-private"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.0.7.tgz"; - sha512 = "P/+ZsjPRyR2tyKrUOXdXOfY1KrmeNo0zQ78jE5LVuOzv5DfC8+rIMnZlmlCwPmUS9mk6up5AapxFaJ+6REjhPw=="; + url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.0.8.tgz"; + sha512 = "uloryF2vSRkIGHPqLN6FkAb1oZ6xkTR2w407PCgVYO9Pkq/j5d8ZHGM80VOYukfHFUdqskFyYcmojF/0WUA06A=="; }; }; - "@ot-builder/ot-glyphs-1.0.7" = { + "@ot-builder/ot-glyphs-1.0.8" = { name = "_at_ot-builder_slash_ot-glyphs"; packageName = "@ot-builder/ot-glyphs"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.0.7.tgz"; - sha512 = "JRg/9XwgyrTZOHSeA9oe11FUKC4ho4o9PZq6QtfQ2kyoRtsvHGeQNuBdJ50GOFz1AypMCowfSo6qPHly15IKnQ=="; + url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.0.8.tgz"; + sha512 = "XP7pRUJPq/2dbDqzEAHWIFvwIdVK+BkZ/xPV75hGECEIquh7MpFKAXtLjRyFpVU+RRD0Xplmj/1P4W0047A4JQ=="; }; }; - "@ot-builder/ot-layout-1.0.7" = { + "@ot-builder/ot-layout-1.0.8" = { name = "_at_ot-builder_slash_ot-layout"; packageName = "@ot-builder/ot-layout"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.0.7.tgz"; - sha512 = "vg7AIL6HtsrdRfPi8HIP3UdikG3WB9nawSb1MOd9/wCjYvln/elikzxCDVxcMaV9ojrzqQYTa53PBZFTSGaR3g=="; + url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.0.8.tgz"; + sha512 = "fRazZF4bTzyeYjFivbWim6/+dsWeGI6ZW6mCES5GmgidHzcFw2OrvDO1VYIKg5KSafjEZxe4QcMrF86bFkSDTg=="; }; }; - "@ot-builder/ot-metadata-1.0.7" = { + "@ot-builder/ot-metadata-1.0.8" = { name = "_at_ot-builder_slash_ot-metadata"; packageName = "@ot-builder/ot-metadata"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.0.7.tgz"; - sha512 = "y7p6yZ5anIrK2SpU4zLrgFZUWzYTUJzN2kvOVl7hCGLnRWLoQKmyGZ3cMF93BsuHiTRuAv2LoASrDIzup2uL2A=="; + url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.0.8.tgz"; + sha512 = "p0z1ywytkvDVUivKV9m8dE7jFztnBFvn/WIqXgpxaqhzXcDIc5mDl1hca/1DJU1ZAwdR03fifEsniCz+3Vaynw=="; }; }; - "@ot-builder/ot-name-1.0.7" = { + "@ot-builder/ot-name-1.0.8" = { name = "_at_ot-builder_slash_ot-name"; packageName = "@ot-builder/ot-name"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.0.7.tgz"; - sha512 = "0y6hkn3v2Z6DgJwy1jjt0mXg+O6DNXbq0sZxKVN3iGvEo2dW9MVCIdDvFT3uEIeaA8Etbr7p2gMmUXh+7SWomQ=="; + url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.0.8.tgz"; + sha512 = "P9X7Fwg7s27n4eTXJqh68Cfrg2K5x28JaIINdgIo4wnRNVfmc/JjH/Z5Rz5U3ahytUdY6+pS+YJAW9BYJ2DJOw=="; }; }; - "@ot-builder/ot-sfnt-1.0.7" = { + "@ot-builder/ot-sfnt-1.0.8" = { name = "_at_ot-builder_slash_ot-sfnt"; packageName = "@ot-builder/ot-sfnt"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.0.7.tgz"; - sha512 = "1DZQoSqirRPHOHpUcVBOo3M3s1DefEyLYVURwNQEH9HmJkcaNNAaZpBcqW2NtqGLQ/fUVeuM3cOI3Ek+4L+QGQ=="; + url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.0.8.tgz"; + sha512 = "tfKv7EuSVKWgKFKOcdCMqWA6tCTf+bye3kWyYYJaG149w1YpzFqMMYk1uB95rL6cjJWvkphZdN2BSbEaUcD+sg=="; }; }; - "@ot-builder/ot-standard-glyph-namer-1.0.7" = { + "@ot-builder/ot-standard-glyph-namer-1.0.8" = { name = "_at_ot-builder_slash_ot-standard-glyph-namer"; packageName = "@ot-builder/ot-standard-glyph-namer"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.0.7.tgz"; - sha512 = "9Icp+Bb6g6Su+7Q9thSiLtmzbHDU5dOlhAUFnrKmHBu13UGYXJBHoe2F6GQ7kDooSrIBvO7b3v61beY+Pi2fwg=="; + url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.0.8.tgz"; + sha512 = "sNEu9Ye5IdISzSaLnyNl/0ZwQY8DLUfvGuQs45JPT84WTpkB7c1BpndlSfcCDZaqdtTXN/tNS2fAN7TJm1g9Ig=="; }; }; - "@ot-builder/prelude-1.0.7" = { + "@ot-builder/prelude-1.0.8" = { name = "_at_ot-builder_slash_prelude"; packageName = "@ot-builder/prelude"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.0.7.tgz"; - sha512 = "bh+7Tp847MvnwZYV7ghSJkekprxsEAPlCgGopTwBWhgk7So/8+RZK+a24VSK4qSNDCr8lNoYh9PSMO4mAR0j/Q=="; + url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.0.8.tgz"; + sha512 = "wknxzHrwwcN4m32P1FmYScTD03Vtj5mQWCx21NCzcsUyEfGasUvTzoPhOw5qUdklN3azFSjByfjpMUAjCRfnJg=="; }; }; - "@ot-builder/primitive-1.0.7" = { + "@ot-builder/primitive-1.0.8" = { name = "_at_ot-builder_slash_primitive"; packageName = "@ot-builder/primitive"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.0.7.tgz"; - sha512 = "rvIDdf+20reSTbZWro6RcBwmIoeLE0r8wprUWEWP/hBEzbIvfTw4cik188zBjRXKhZUsAnLUynjeqokhP51Txw=="; + url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.0.8.tgz"; + sha512 = "jJydJoA67wop43AVcH+E+5Q2DU7epll1J6krs6Oz3Rrs7x2RB5fc79nWJMm8bHpKPB0xnA3zsLiJjERB7Ud9dw=="; }; }; - "@ot-builder/rectify-1.0.7" = { + "@ot-builder/rectify-1.0.8" = { name = "_at_ot-builder_slash_rectify"; packageName = "@ot-builder/rectify"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.0.7.tgz"; - sha512 = "RNQxUMGkcqeoYirAjJjVfUIofZzR9ZPmwD1BnQPznabCgC1cuIXCgDdYzjANh72hJeOhhN9ewVA3WM013llZRA=="; + url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.0.8.tgz"; + sha512 = "RFD/oA3kTviuj7WHRynyMT4zBFNB8tSifrMjQxyY28BEWckieX27RM9+QynfuHg07s1pZ/mZC5g3wLwjdeE5+w=="; }; }; - "@ot-builder/stat-glyphs-1.0.7" = { + "@ot-builder/stat-glyphs-1.0.8" = { name = "_at_ot-builder_slash_stat-glyphs"; packageName = "@ot-builder/stat-glyphs"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.0.7.tgz"; - sha512 = "KVW+RS5DJwWvrrbe2zO+p60kaYeDMlf+zN2D8JrpCr5pbVumOWtgBHMInD9HU4Qnng2DW5X1IPy4dEMyGLla6w=="; + url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.0.8.tgz"; + sha512 = "rSQPs0laN2H+jBTKFA/q9+rcOJO9bJVHvCxHu74hfwjvlpysWbaN/+9PwMb5mFIP/GzToYfYhgZ6e7qBNRSM+g=="; }; }; - "@ot-builder/trace-1.0.7" = { + "@ot-builder/trace-1.0.8" = { name = "_at_ot-builder_slash_trace"; packageName = "@ot-builder/trace"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.0.7.tgz"; - sha512 = "jO5Op3OHs18erCA3jv2/fmfht9jyiXYqbGtfssWC5vZuwtC4h998nj07PRh+MT4L+tsIbJfgj6WuG2K9rwSy9Q=="; + url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.0.8.tgz"; + sha512 = "VGPt+1UT+yDzouUDugMW2z7tFED+sHJKT5mOwl6N2t/+Er6gaxrRlfYKvdHqdgFKIg8oKytoZS3wOauWiVF02w=="; }; }; - "@ot-builder/var-store-1.0.7" = { + "@ot-builder/var-store-1.0.8" = { name = "_at_ot-builder_slash_var-store"; packageName = "@ot-builder/var-store"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.0.7.tgz"; - sha512 = "z47s+cbzRtI4coWgdVgjSX+lktYUenL0k+z+pIwKU6nI+ASpnJtgfczB7FpqvDhLw3fYV9U4K5bSAUC+z8KYmw=="; + url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.0.8.tgz"; + sha512 = "Wo3xfMDzmlqSNEn5YOO8hxW7X9YTw6fCUmfUmfaOAmNYRWsVHnLwTSnu92M6p0shMqVHzgqhCHDxG7KZAuSNwQ=="; }; }; - "@ot-builder/variance-1.0.7" = { + "@ot-builder/variance-1.0.8" = { name = "_at_ot-builder_slash_variance"; packageName = "@ot-builder/variance"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.0.7.tgz"; - sha512 = "7yHCMLolNIlR4QsXYvNNoSAagSg8niSoXWo/43YSWlsdU6O1/osJhGOPBMA+LcDj1Gl2SLSaQfDr92e3Wk7dRQ=="; + url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.0.8.tgz"; + sha512 = "GaWs/PMrzkAJJmf5Wm0qr09AHYP9ydNk6J9KEs7GXH7gBm6X5pl/V6D105u+6Tx+QSGotRvc8einQm/vazug7A=="; }; }; "@parcel/fs-1.11.0" = { @@ -5044,13 +5053,13 @@ let sha512 = "RB6vWO78v6c+SW/3bZh+XZMr4nGdJKAiPGsBALuUZnLuCiQ7aXCT1AuFHqnfS2gyXbEUEj+kw8p4ux8KdAfs3A=="; }; }; - "@redocly/openapi-core-1.0.0-beta.48" = { + "@redocly/openapi-core-1.0.0-beta.49" = { name = "_at_redocly_slash_openapi-core"; packageName = "@redocly/openapi-core"; - version = "1.0.0-beta.48"; + version = "1.0.0-beta.49"; src = fetchurl { - url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.48.tgz"; - sha512 = "rlus9qQC4Pkzz2Ljcv+jQjFdKOYSWnsYXWN6zNik9iiiQtMmGEdszsERCbSAYw/CZ5DRCAHMeKrh8f4LBCpx1A=="; + url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.49.tgz"; + sha512 = "SwCtQeyovcV7cS6YQoe5GWX3hWXAZrnrZQtQv0YW91CtrZMBdk5qA5eQ9Mkkbk6YOKKCWkc8yD+KdkRATlyPNw=="; }; }; "@redocly/react-dropdown-aria-2.0.11" = { @@ -6619,13 +6628,13 @@ let sha512 = "MPtoySlAZQ37VoLaPcTHCu1RWJ4llDkULYZIzOYxlhxBqYPB0RsRlmMU0R6tahtFe27mIdkHV+551ZWV4PLmVw=="; }; }; - "@types/koa-2.13.2" = { + "@types/koa-2.13.3" = { name = "_at_types_slash_koa"; packageName = "@types/koa"; - version = "2.13.2"; + version = "2.13.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/koa/-/koa-2.13.2.tgz"; - sha512 = "MHKUNSaw940A8h4tRo+ccDR5SxCkT+OKq1QS5ZmvgB64hO2wsUhb5yvFa464uqTH+R/A/SzxneIfOjiQ6EpBGA=="; + url = "https://registry.npmjs.org/@types/koa/-/koa-2.13.3.tgz"; + sha512 = "TaujBV+Dhe/FvmSMZJtCFBms+bqQacgUebk/M2C2tq8iGmHE/DDf4DcW2Hc7NqusVZmy5xzrWOjtdPKNP+fTfw=="; }; }; "@types/koa-compose-3.2.5" = { @@ -7015,6 +7024,15 @@ let sha512 = "0/HnwIfW4ki2D8L8c9GVcG5I72s9jP5GSLVF0VIXDW00kmIpA6O33G7a8n59Tmh7Nz0WUC3rSb7PTY/sdW2JzA=="; }; }; + "@types/raf-3.4.0" = { + name = "_at_types_slash_raf"; + packageName = "@types/raf"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/raf/-/raf-3.4.0.tgz"; + sha512 = "taW5/WYqo36N7V39oYyHP9Ipfd5pNFvGTIQsNGj86xV88YQ7GnI30/yMfKDF7Zgin0m3e+ikX88FvImnK4RjGw=="; + }; + }; "@types/range-parser-1.2.3" = { name = "_at_types_slash_range-parser"; packageName = "@types/range-parser"; @@ -7402,13 +7420,13 @@ let sha512 = "S9q47ByT2pPvD65IvrWp7qppVMpk9WGMbVq9wbWZOHg6tnXSD4vyhao6nOSBwwfDdV2p3Kx9evA9vI+XWTfDvw=="; }; }; - "@typescript-eslint/eslint-plugin-4.25.0" = { + "@typescript-eslint/eslint-plugin-4.26.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "4.25.0"; + version = "4.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.25.0.tgz"; - sha512 = "Qfs3dWkTMKkKwt78xp2O/KZQB8MPS1UQ5D3YW2s6LQWBE1074BE+Rym+b1pXZIX3M3fSvPUDaCvZLKV2ylVYYQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.26.0.tgz"; + sha512 = "yA7IWp+5Qqf+TLbd8b35ySFOFzUfL7i+4If50EqvjT6w35X8Lv0eBHb6rATeWmucks37w+zV+tWnOXI9JlG6Eg=="; }; }; "@typescript-eslint/experimental-utils-3.10.1" = { @@ -7420,13 +7438,13 @@ let sha512 = "DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw=="; }; }; - "@typescript-eslint/experimental-utils-4.25.0" = { + "@typescript-eslint/experimental-utils-4.26.0" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "4.25.0"; + version = "4.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.25.0.tgz"; - sha512 = "f0doRE76vq7NEEU0tw+ajv6CrmPelw5wLoaghEHkA2dNLFb3T/zJQqGPQ0OYt5XlZaS13MtnN+GTPCuUVg338w=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.26.0.tgz"; + sha512 = "TH2FO2rdDm7AWfAVRB5RSlbUhWxGVuxPNzGT7W65zVfl8H/WeXTk1e69IrcEVsBslrQSTDKQSaJD89hwKrhdkw=="; }; }; "@typescript-eslint/parser-3.10.1" = { @@ -7438,22 +7456,22 @@ let sha512 = "Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw=="; }; }; - "@typescript-eslint/parser-4.25.0" = { + "@typescript-eslint/parser-4.26.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "4.25.0"; + version = "4.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.25.0.tgz"; - sha512 = "OZFa1SKyEJpAhDx8FcbWyX+vLwh7OEtzoo2iQaeWwxucyfbi0mT4DijbOSsTgPKzGHr6GrF2V5p/CEpUH/VBxg=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.26.0.tgz"; + sha512 = "b4jekVJG9FfmjUfmM4VoOItQhPlnt6MPOBUL0AQbiTmm+SSpSdhHYlwayOm4IW9KLI/4/cRKtQCmDl1oE2OlPg=="; }; }; - "@typescript-eslint/scope-manager-4.25.0" = { + "@typescript-eslint/scope-manager-4.26.0" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "4.25.0"; + version = "4.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.25.0.tgz"; - sha512 = "2NElKxMb/0rya+NJG1U71BuNnp1TBd1JgzYsldsdA83h/20Tvnf/HrwhiSlNmuq6Vqa0EzidsvkTArwoq+tH6w=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.26.0.tgz"; + sha512 = "G6xB6mMo4xVxwMt5lEsNTz3x4qGDt0NSGmTBNBPJxNsrTXJSm21c6raeYroS2OwQsOyIXqKZv266L/Gln1BWqg=="; }; }; "@typescript-eslint/types-3.10.1" = { @@ -7465,22 +7483,13 @@ let sha512 = "+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ=="; }; }; - "@typescript-eslint/types-4.25.0" = { + "@typescript-eslint/types-4.26.0" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "4.25.0"; + version = "4.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.25.0.tgz"; - sha512 = "+CNINNvl00OkW6wEsi32wU5MhHti2J25TJsJJqgQmJu3B3dYDBcmOxcE5w9cgoM13TrdE/5ND2HoEnBohasxRQ=="; - }; - }; - "@typescript-eslint/typescript-estree-2.34.0" = { - name = "_at_typescript-eslint_slash_typescript-estree"; - packageName = "@typescript-eslint/typescript-estree"; - version = "2.34.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.34.0.tgz"; - sha512 = "OMAr+nJWKdlVM9LOqCqh3pQQPwxHAN7Du8DR6dmwCrAmxtiXQnhHJ6tBNtf+cggqfo51SG/FCwnKhXCIM7hnVg=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.26.0.tgz"; + sha512 = "rADNgXl1kS/EKnDr3G+m7fB9yeJNnR9kF7xMiXL6mSIWpr3Wg5MhxyfEXy/IlYthsqwBqHOr22boFbf/u6O88A=="; }; }; "@typescript-eslint/typescript-estree-3.10.1" = { @@ -7492,13 +7501,13 @@ let sha512 = "QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w=="; }; }; - "@typescript-eslint/typescript-estree-4.25.0" = { + "@typescript-eslint/typescript-estree-4.26.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "4.25.0"; + version = "4.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.25.0.tgz"; - sha512 = "1B8U07TGNAFMxZbSpF6jqiDs1cVGO0izVkf18Q/SPcUAc9LhHxzvSowXDTvkHMWUVuPpagupaW63gB6ahTXVlg=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.26.0.tgz"; + sha512 = "GHUgahPcm9GfBuy3TzdsizCcPjKOAauG9xkz9TR8kOdssz2Iz9jRCSQm6+aVFa23d5NcSpo1GdHGSQKe0tlcbg=="; }; }; "@typescript-eslint/visitor-keys-3.10.1" = { @@ -7510,13 +7519,13 @@ let sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ=="; }; }; - "@typescript-eslint/visitor-keys-4.25.0" = { + "@typescript-eslint/visitor-keys-4.26.0" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "4.25.0"; + version = "4.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.25.0.tgz"; - sha512 = "AmkqV9dDJVKP/TcZrbf6s6i1zYXt5Hl8qOLrRDTFfRNae4+LB8A4N3i+FLZPW85zIxRy39BgeWOfMS3HoH5ngg=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.26.0.tgz"; + sha512 = "cw4j8lH38V1ycGBbF+aFiLUls9Z0Bw8QschP3mkth50BbWzgFS33ISIgBzUMuQ2IdahoEv/rXstr8Zhlz4B1Zg=="; }; }; "@uifabric/foundation-7.9.26" = { @@ -8536,13 +8545,13 @@ let sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; }; }; - "acorn-8.2.4" = { + "acorn-8.3.0" = { name = "acorn"; packageName = "acorn"; - version = "8.2.4"; + version = "8.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.2.4.tgz"; - sha512 = "Ibt84YwBDDA890eDiDCEqcbwvHlBvzzDkU2cGBBDDI1QWT12jTiXIOn2CIw5KK4i6N5Z2HUxwYjzriDyqaqqZg=="; + url = "https://registry.npmjs.org/acorn/-/acorn-8.3.0.tgz"; + sha512 = "tqPKHZ5CaBJw0Xmy0ZZvLs1qTV+BNFSyvn77ASXkpBNfIRk8ev26fKrD9iLGwGA9zedPao52GSHzq8lyZG0NUw=="; }; }; "acorn-globals-1.0.9" = { @@ -12352,6 +12361,15 @@ let sha512 = "SrLwMzrpETJDiH9z12EMcqtApgcQo9XsPi+S9Aodezu53ALcGjBBQ7+C+IWbsSCBlSvNEec8sqfh3itO/j/QUw=="; }; }; + "bit-field-1.3.6" = { + name = "bit-field"; + packageName = "bit-field"; + version = "1.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/bit-field/-/bit-field-1.3.6.tgz"; + sha512 = "gu+wXJ+saekzja7tSRygoR+M+C88U0IoVTdp0SmZj5tyDwSkWmZNhSUkBmHx2NNZcSAB0gu9g8yBd1Kn7ECVmw=="; + }; + }; "bitcoin-core-2.3.0" = { name = "bitcoin-core"; packageName = "bitcoin-core"; @@ -12883,13 +12901,13 @@ let sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"; }; }; - "boolean-3.0.4" = { + "boolean-3.1.0" = { name = "boolean"; packageName = "boolean"; - version = "3.0.4"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/boolean/-/boolean-3.0.4.tgz"; - sha512 = "5pyOr+w2LNN72F2mAq6J0ckHUfJYSgRKma7e/wlcMMhgOLV9OI0ERhERYXxUqo+dPyVxcbXKy9n+wg13+LpNnA=="; + url = "https://registry.npmjs.org/boolean/-/boolean-3.1.0.tgz"; + sha512 = "K6r5tvO1ykeYerI7jIyTvSFw2l6D6DzqkljGj2E2uyYAAdDo2SV4qGJIV75cHIQpTFyb6BB0BEHiDdDrFsNI+g=="; }; }; "boom-2.10.1" = { @@ -13423,6 +13441,15 @@ let sha512 = "tkrtMDxeJorn5p0KxaLXELneT8AbfZMpOFeoKYZ5qCCMMSluNuwut7pGccLC5YOJqmuk0DR774vNVQLC9sNq/A=="; }; }; + "btoa-1.2.1" = { + name = "btoa"; + packageName = "btoa"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/btoa/-/btoa-1.2.1.tgz"; + sha512 = "SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g=="; + }; + }; "btoa-lite-1.0.0" = { name = "btoa-lite"; packageName = "btoa-lite"; @@ -14287,13 +14314,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001230" = { + "caniuse-lite-1.0.30001232" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001230"; + version = "1.0.30001232"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001230.tgz"; - sha512 = "5yBd5nWCBS+jWKTcHOzXwo5xzcj4ePE/yjtkZyUV1BTUmrBaA9MRGC+e7mxnqXSA90CmCA8L3eKLaSUkt099IQ=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001232.tgz"; + sha512 = "e4Gyp7P8vqC2qV2iHA+cJNf/yqUKOShXQOJHQt81OHxlIZl/j/j3soEA0adAQi8CPUQgvOdDENyQ5kd6a6mNSg=="; }; }; "canvas-2.8.0" = { @@ -14305,6 +14332,15 @@ let sha512 = "gLTi17X8WY9Cf5GZ2Yns8T5lfBOcGgFehDFb+JQwDqdOoBOcECS9ZWMEAqMSVcMYwXD659J8NyzjRY/2aE+C2Q=="; }; }; + "canvg-3.0.7" = { + name = "canvg"; + packageName = "canvg"; + version = "3.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/canvg/-/canvg-3.0.7.tgz"; + sha512 = "4sq6iL5Q4VOXS3PL1BapiXIZItpxYyANVzsAKpTPS5oq4u3SKbGfUcbZh2gdLCQ3jWpG/y5wRkMlBBAJhXeiZA=="; + }; + }; "caporal-1.4.0" = { name = "caporal"; packageName = "caporal"; @@ -14440,13 +14476,13 @@ let sha512 = "vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg=="; }; }; - "cdk8s-1.0.0-beta.11" = { + "cdk8s-1.0.0-beta.14" = { name = "cdk8s"; packageName = "cdk8s"; - version = "1.0.0-beta.11"; + version = "1.0.0-beta.14"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.0.0-beta.11.tgz"; - sha512 = "G6SIJSg6mxeEzWEWNY8NAn/jqysTPegV79mOQ6eYj1uyKYggyzP5MzuWt8fKmYShM5BTDadnCRajwDnku9LZeQ=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.0.0-beta.14.tgz"; + sha512 = "NU5mZbOE3RgRX7a9zHf4AgiNcI/clqQ9vw/YixSgVe2AOiAsUXuSH2BCc3eFAZSlPSQYLxWG6mSCGY/06cy5Hw=="; }; }; "cdktf-0.4.0" = { @@ -16681,13 +16717,13 @@ let sha512 = "eVw6n7CnEMFzc3duyFVrQEuY1BlHR3rYsSztyG32ibGMW722i3C6IizEGMFmfMU+A+fALvBIwxN3czffTcdA+Q=="; }; }; - "compress-commons-4.1.0" = { + "compress-commons-4.1.1" = { name = "compress-commons"; packageName = "compress-commons"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/compress-commons/-/compress-commons-4.1.0.tgz"; - sha512 = "ofaaLqfraD1YRTkrRKPCrGJ1pFeDG/MVCkVVV2FNGeWquSlqw5wOrwOfPQ1xF2u+blpeWASie5EubHz+vsNIgA=="; + url = "https://registry.npmjs.org/compress-commons/-/compress-commons-4.1.1.tgz"; + sha512 = "QLdDLCKNV2dtoTorqgxngQCMA+gWXkM/Nwu7FpeBhk/RdkzimqC3jueb/FDmaZeXh+uby1jkBqE3xArsLBE5wQ=="; }; }; "compressible-2.0.18" = { @@ -17005,15 +17041,6 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "constructs-3.3.71" = { - name = "constructs"; - packageName = "constructs"; - version = "3.3.71"; - src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.71.tgz"; - sha512 = "3KFtTsA7OV27m/+pJhN4iJkKzHbPIPvyvEX5BQ/JCAWjfCHOQEVpIgxHLpT4i8L1OFta+pJrzcEVAHo6UitwqA=="; - }; - }; "constructs-3.3.75" = { name = "constructs"; packageName = "constructs"; @@ -17519,13 +17546,13 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-3.13.0" = { + "core-js-3.13.1" = { name = "core-js"; packageName = "core-js"; - version = "3.13.0"; + version = "3.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.13.0.tgz"; - sha512 = "iWDbiyha1M5vFwPFmQnvRv+tJzGbFAm6XimJUT0NgHYW3xZEs1SkCAcasWSVFxpI2Xb/V1DDJckq3v90+bQnog=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.13.1.tgz"; + sha512 = "JqveUc4igkqwStL2RTRn/EPFGBOfEZHxJl/8ej1mXJR75V3go2mFF4bmUYkEIT1rveHKnkUlcJX/c+f1TyIovQ=="; }; }; "core-js-3.8.3" = { @@ -17537,22 +17564,22 @@ let sha512 = "KPYXeVZYemC2TkNEkX/01I+7yd+nX3KddKwZ1Ww7SKWdI2wQprSgLmrTddT8nw92AjEklTsPBoSdQBhbI1bQ6Q=="; }; }; - "core-js-compat-3.13.0" = { + "core-js-compat-3.13.1" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.13.0"; + version = "3.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.13.0.tgz"; - sha512 = "jhbI2zpVskgfDC9mGRaDo1gagd0E0i/kYW0+WvibL/rafEHKAHO653hEXIxJHqRlRLITluXtRH3AGTL5qJmifQ=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.13.1.tgz"; + sha512 = "mdrcxc0WznfRd8ZicEZh1qVeJ2mu6bwQFh8YVUK48friy/FOwFV5EJj9/dlh+nMQ74YusdVfBFDuomKgUspxWQ=="; }; }; - "core-js-pure-3.13.0" = { + "core-js-pure-3.13.1" = { name = "core-js-pure"; packageName = "core-js-pure"; - version = "3.13.0"; + version = "3.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.13.0.tgz"; - sha512 = "7VTvXbsMxROvzPAVczLgfizR8CyYnvWPrb1eGrtlZAJfjQWEHLofVfCKljLHdpazTfpaziRORwUH/kfGDKvpdA=="; + url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.13.1.tgz"; + sha512 = "wVlh0IAi2t1iOEh16y4u1TRk6ubd4KvLE8dlMi+3QUI6SfKphQUh7tAwihGGSQ8affxEXpVIPpOdf9kjR4v4Pw=="; }; }; "core-util-is-1.0.2" = { @@ -17672,6 +17699,15 @@ let sha512 = "0Cbj7gyvFVApzpK/uhCtQ/9kE9UnYpxMzaq5nQQC/Dh4iaj5fxp7iEFIullrYwzj8nf0qnsI1Qsx34hAeAebvw=="; }; }; + "cp-file-9.0.0" = { + name = "cp-file"; + packageName = "cp-file"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cp-file/-/cp-file-9.0.0.tgz"; + sha512 = "hNEM3AuZz84zOPgL8ozJ057+DjuD6LpwyYNiyTsLDU71Ke2E3KV909xhGYLK7WQ0srJRwzs/1+bSE1pk/HRC6w=="; + }; + }; "cpu-percentage-1.0.3" = { name = "cpu-percentage"; packageName = "cpu-percentage"; @@ -20390,13 +20426,13 @@ let sha512 = "Rps1xDkEEBSq3kLdsdnHZL1x2S4NGDcbrjmd4q+PykK5aJwDdP5MBgrJw1Xo+kyUHuv3JEzPqxr+Dj9ryeDRTA=="; }; }; - "detective-postcss-3.0.1" = { + "detective-postcss-4.0.0" = { name = "detective-postcss"; packageName = "detective-postcss"; - version = "3.0.1"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/detective-postcss/-/detective-postcss-3.0.1.tgz"; - sha512 = "tfTS2GdpUal5NY0aCqI4dpEy8Xfr88AehYKB0iBIZvo8y2g3UsrcDnrp9PR2FbzoW7xD5Rip3NJW7eCSvtqdUw=="; + url = "https://registry.npmjs.org/detective-postcss/-/detective-postcss-4.0.0.tgz"; + sha512 = "Fwc/g9VcrowODIAeKRWZfVA/EufxYL7XfuqJQFroBKGikKX83d2G7NFw6kDlSYGG3LNQIyVa+eWv1mqre+v4+A=="; }; }; "detective-sass-3.0.1" = { @@ -20426,13 +20462,13 @@ let sha1 = "50aee7db8babb990381f010c63fabba5b58e54cd"; }; }; - "detective-typescript-5.8.0" = { + "detective-typescript-7.0.0" = { name = "detective-typescript"; packageName = "detective-typescript"; - version = "5.8.0"; + version = "7.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/detective-typescript/-/detective-typescript-5.8.0.tgz"; - sha512 = "SrsUCfCaDTF64QVMHMidRal+kmkbIc5zP8cxxZPsomWx9vuEUjBlSJNhf7/ypE5cLdJJDI4qzKDmyzqQ+iz/xg=="; + url = "https://registry.npmjs.org/detective-typescript/-/detective-typescript-7.0.0.tgz"; + sha512 = "y/Ev98AleGvl43YKTNcA2Q+lyFmsmCfTTNWy4cjEJxoLkbobcXtRS0Kvx06daCgr2GdtlwLfNzL553BkktfJoA=="; }; }; "devtools-protocol-0.0.854822" = { @@ -21119,13 +21155,13 @@ let sha512 = "3VdM/SXBZX2omc9JF9nOPCtDaYQ67BGp5CoLpIQlO2KCAPETs8TcDHacF26jXadGbvUteZzRTeos2fhID5+ucQ=="; }; }; - "dompurify-2.2.8" = { + "dompurify-2.2.9" = { name = "dompurify"; packageName = "dompurify"; - version = "2.2.8"; + version = "2.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/dompurify/-/dompurify-2.2.8.tgz"; - sha512 = "9H0UL59EkDLgY3dUFjLV6IEUaHm5qp3mxSqWw7Yyx4Zhk2Jn2cmLe+CNPP3xy13zl8Bqg+0NehQzkdMoVhGRww=="; + url = "https://registry.npmjs.org/dompurify/-/dompurify-2.2.9.tgz"; + sha512 = "+9MqacuigMIZ+1+EwoEltogyWGFTJZWU3258Rupxs+2CGs4H914G9er6pZbsme/bvb5L67o2rade9n21e4RW/w=="; }; }; "domutils-1.4.3" = { @@ -21641,13 +21677,13 @@ let sha512 = "1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ=="; }; }; - "electron-to-chromium-1.3.741" = { + "electron-to-chromium-1.3.743" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.741"; + version = "1.3.743"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.741.tgz"; - sha512 = "4i3T0cwnHo1O4Mnp9JniEco8bZiXoqbm3PhW5hv7uu8YLg35iajYrRnNyKFaN8/8SSTskU2hYqVTeYVPceSpUA=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.743.tgz"; + sha512 = "K2wXfo9iZQzNJNx67+Pld0DRF+9bYinj62gXCdgPhcu1vidwVuLPHQPPFnCdO55njWigXXpfBiT90jGUPbw8Zg=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -22732,13 +22768,13 @@ let sha512 = "Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ=="; }; }; - "eslint-plugin-vue-7.9.0" = { + "eslint-plugin-vue-7.10.0" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; - version = "7.9.0"; + version = "7.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.9.0.tgz"; - sha512 = "2Q0qQp5+5h+pZvJKCbG1/jCRUYrdgAz5BYKGyTlp2NU8mx09u3Hp7PsH6d5qef6ojuPoCXMnrbbDxeoplihrSw=="; + url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.10.0.tgz"; + sha512 = "xdr6e4t/L2moRAeEQ9HKgge/hFq+w9v5Dj+BA54nTAzSFdUyKLiSOdZaRQjCHMY0Pk2WaQBFH9QiWG60xiC+6A=="; }; }; "eslint-scope-3.7.3" = { @@ -22786,6 +22822,15 @@ let sha512 = "w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg=="; }; }; + "eslint-utils-3.0.0" = { + name = "eslint-utils"; + packageName = "eslint-utils"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz"; + sha512 = "uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA=="; + }; + }; "eslint-visitor-keys-1.3.0" = { name = "eslint-visitor-keys"; packageName = "eslint-visitor-keys"; @@ -23461,13 +23506,13 @@ let sha512 = "j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA=="; }; }; - "execa-5.0.0" = { + "execa-5.0.1" = { name = "execa"; packageName = "execa"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-5.0.0.tgz"; - sha512 = "ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ=="; + url = "https://registry.npmjs.org/execa/-/execa-5.0.1.tgz"; + sha512 = "4hFTjFbFzQa3aCLobpbPJR/U+VoL1wdV5ozOWjeet0AWDeYr9UFGM1eUFWHX+VtOWFq4p0xXUXfW1YxUaP4fpw=="; }; }; "execall-1.0.0" = { @@ -23614,13 +23659,13 @@ let sha1 = "a793d3ac0cad4c6ab571e9968fbbab6cb2532929"; }; }; - "expo-pwa-0.0.80" = { + "expo-pwa-0.0.82" = { name = "expo-pwa"; packageName = "expo-pwa"; - version = "0.0.80"; + version = "0.0.82"; src = fetchurl { - url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.80.tgz"; - sha512 = "AZefVqcB3OFS7yOhfOtkHANhFRTG34fAMrlDx69ERbxh0sEPI/Gv+wwYycUdmq/aYh7u8zuaoOlY9BUgMd6U6w=="; + url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.82.tgz"; + sha512 = "4TSJRmVl3/gOQbE56Xe7P+A+zIqNF2asqMtC8Au/YQF0o4emmEAICEwCCRMg2jdtgq7qVDwWjBfMNLDdGS4HrQ=="; }; }; "express-2.5.11" = { @@ -25594,6 +25639,15 @@ let sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; }; }; + "forwarded-0.2.0" = { + name = "forwarded"; + packageName = "forwarded"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz"; + sha512 = "buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="; + }; + }; "fp-and-or-0.1.3" = { name = "fp-and-or"; packageName = "fp-and-or"; @@ -26431,15 +26485,6 @@ let sha512 = "jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g=="; }; }; - "get-stdin-7.0.0" = { - name = "get-stdin"; - packageName = "get-stdin"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/get-stdin/-/get-stdin-7.0.0.tgz"; - sha512 = "zRKcywvrXlXsA0v0i9Io4KDRaAw7+a1ZpjRwl9Wox8PFlVCCHra7E9c4kqXCoCM9nR5tBkaTTZRBoCm60bFqTQ=="; - }; - }; "get-stdin-8.0.0" = { name = "get-stdin"; packageName = "get-stdin"; @@ -27620,13 +27665,13 @@ let sha512 = "J+vjof74oMlCWXSvt0DOf2APEdZOCdubEvGDUAlqH//VBYcOYsGgRW7Xzorr44LvkjiuvecWc8fChxuZZbChtg=="; }; }; - "graphql-ws-4.5.2" = { + "graphql-ws-4.7.0" = { name = "graphql-ws"; packageName = "graphql-ws"; - version = "4.5.2"; + version = "4.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-4.5.2.tgz"; - sha512 = "kowYwIq2SEJGaHMoKlgR5fgIAyFJbEdVpwjlct22eg6uuDkJK9Irv/b1XHdrFWny8KFssTd/+dUkDpT2vX9Log=="; + url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-4.7.0.tgz"; + sha512 = "Md8SsmC9ZlsogFPd3Ot8HbIAAqsHh8Xoq7j4AmcIat1Bh6k91tjVyQvA0Au1/BolXSYq+RDvib6rATU2Hcf1Xw=="; }; }; "gray-matter-2.1.1" = { @@ -32346,6 +32391,15 @@ let sha512 = "KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ=="; }; }; + "jest-worker-27.0.2" = { + name = "jest-worker"; + packageName = "jest-worker"; + version = "27.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.0.2.tgz"; + sha512 = "EoBdilOTTyOgmHXtw/cPc+ZrCA0KJMrkXzkrPGNwLmnvvlN1nj7MPrxpT7m+otSv2e1TLaVffzDnE/LB14zJMg=="; + }; + }; "jimp-0.12.1" = { name = "jimp"; packageName = "jimp"; @@ -32481,13 +32535,13 @@ let sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"; }; }; - "jquery.terminal-2.24.0" = { + "jquery.terminal-2.25.1" = { name = "jquery.terminal"; packageName = "jquery.terminal"; - version = "2.24.0"; + version = "2.25.1"; src = fetchurl { - url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.24.0.tgz"; - sha512 = "rtjTBj7/FYoBiWawiNTYNXIRqVI4n39WF/x1h/bEKFb48Rzgr4/dpkKGd1dgZau714ewzczAi7CEBTKvhM6RjA=="; + url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.25.1.tgz"; + sha512 = "I3PlUluRswKZb3UPBtH1UFdyBLLwPwdAJPVheV6xUJdS+0buguXCjn6aqmENWtZiobGGA2wkxCXR2hVQqtMCrw=="; }; }; "js-base64-2.6.4" = { @@ -36352,6 +36406,15 @@ let sha512 = "N0qPlqfypFx7UHNn4B3lzS/b0uLqt2hmuoa+PpuXNYgozdJYAyauF5Ky0BWVjrxDlMWiT3qN4zPq3vVAfZy7Yg=="; }; }; + "logidrom-0.3.1" = { + name = "logidrom"; + packageName = "logidrom"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/logidrom/-/logidrom-0.3.1.tgz"; + sha512 = "B1Rjay3Ye/JcythUjMt+KLiLIwOjnMJN1M5BRbDgNMsJhmn7yApbx6n1rw7cT3Fi/NA77HDM+y3y1nXvKQVB9Q=="; + }; + }; "loglevel-1.7.1" = { name = "loglevel"; packageName = "loglevel"; @@ -38593,6 +38656,15 @@ let sha512 = "QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw=="; }; }; + "mime-db-1.48.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.48.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz"; + sha512 = "FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ=="; + }; + }; "mime-types-2.1.18" = { name = "mime-types"; packageName = "mime-types"; @@ -40944,13 +41016,13 @@ let sha512 = "fPNFIp2hF/Dq7qLDzSg4vZ0J4e9v60gJR+Qx7RbjbWqzPDdEqeVpEx5CFeDAELIl+A/woaaNn1fQ5nEVerMxJg=="; }; }; - "node-object-hash-2.3.2" = { + "node-object-hash-2.3.3" = { name = "node-object-hash"; packageName = "node-object-hash"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/node-object-hash/-/node-object-hash-2.3.2.tgz"; - sha512 = "QsV+vb6Kegh1V9eKeLJf2swNGkhH1sBtGWQz1fmwknGylbsyUt60iDIJWyGq2DeBRtuywdb+xXJydKa9BFNxTA=="; + url = "https://registry.npmjs.org/node-object-hash/-/node-object-hash-2.3.3.tgz"; + sha512 = "KdQsVgu0QoU3ycGidQLcULQdJudW2dizlxJvb2ntV4zxn1oBe7FYBcOO//qIza6oPM1xNwj7Y+rsWxiGPWekOw=="; }; }; "node-persist-2.1.0" = { @@ -41781,22 +41853,22 @@ let sha512 = "pJTS2+T0oGIwgjGpw7sIRU8RQMcUoKCDWFLdBqKB2BNmGpbBMH2sdqAaOXUg8OzonZHU0L7vfJu1mJFEiYDWOQ=="; }; }; - "oas-linter-3.2.1" = { + "oas-linter-3.2.2" = { name = "oas-linter"; packageName = "oas-linter"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/oas-linter/-/oas-linter-3.2.1.tgz"; - sha512 = "e5G6bbq3Nrfxm+SDPR5AiZ6n2smVUmhLA1OgI2/Bl8e2ywfWsKw/yuqrwiXXiNHb1wdM/GyPMX6QjCGJODlaaA=="; + url = "https://registry.npmjs.org/oas-linter/-/oas-linter-3.2.2.tgz"; + sha512 = "KEGjPDVoU5K6swgo9hJVA/qYGlwfbFx+Kg2QB/kd7rzV5N8N5Mg6PlsoCMohVnQmo+pzJap/F610qTodKzecGQ=="; }; }; - "oas-resolver-2.5.4" = { + "oas-resolver-2.5.5" = { name = "oas-resolver"; packageName = "oas-resolver"; - version = "2.5.4"; + version = "2.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/oas-resolver/-/oas-resolver-2.5.4.tgz"; - sha512 = "1vIj5Wkjmi+kZj5sFamt95LkuXoalmoKUohtaUQoCQZjLfPFaY8uZ7nw6IZaWuE6eLON2b6xrXhxD4hiTdYl0g=="; + url = "https://registry.npmjs.org/oas-resolver/-/oas-resolver-2.5.5.tgz"; + sha512 = "1po1gzIlTXQqyVNtLFWJuzDm4xxhMCJ8QcP3OarKDO8aJ8AmCtQ67XZ1X+nBbHH4CjTcEsIab1qX5+GIU4f2Gg=="; }; }; "oas-schema-walker-1.1.5" = { @@ -41817,13 +41889,13 @@ let sha512 = "bIt8erTyclF7bkaySTtQ9sppqyVc+mAlPi7vPzCLVHJsL9nrivQjc/jHLX/o+eGbxHd6a6YBwuY/Vxa6wGsiuw=="; }; }; - "oas-validator-5.0.5" = { + "oas-validator-5.0.6" = { name = "oas-validator"; packageName = "oas-validator"; - version = "5.0.5"; + version = "5.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/oas-validator/-/oas-validator-5.0.5.tgz"; - sha512 = "d10yy6xlhRTh6np44k2U0gm5M66pioYTllH8J1ZTj+WSY3cpTvU+Dt51iWOT85HJqyGHo0RZKXF3u/NGQWDFgg=="; + url = "https://registry.npmjs.org/oas-validator/-/oas-validator-5.0.6.tgz"; + sha512 = "bI+gyr3MiG/4Q5Ibvg0R77skVWS882gFMkxwB1p6qY7Rc4p7EoDezFVfondjYhJDPDnB1ZD7Aqj7AWROAsMBZg=="; }; }; "oauth-0.9.15" = { @@ -42376,6 +42448,24 @@ let sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="; }; }; + "onml-1.3.0" = { + name = "onml"; + packageName = "onml"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/onml/-/onml-1.3.0.tgz"; + sha512 = "RhGUsC6Im2A5vAdIvxE3auRKTqrqUZQl/AYLn8+9lM3SO4da5bwhcI5TcM+hfQxNCSLLOVErsl9p0ZPjKKmz+g=="; + }; + }; + "onml-2.1.0" = { + name = "onml"; + packageName = "onml"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/onml/-/onml-2.1.0.tgz"; + sha512 = "fvaSZRzprpwLFge/mcwE0CItfniNisVNamDdMK1FQUjh4ArQZ8ZWSkDaJbZc3XaANKZHq0xIa8NJpZ2HSe3oXA=="; + }; + }; "oo-ascii-tree-1.30.0" = { name = "oo-ascii-tree"; packageName = "oo-ascii-tree"; @@ -42583,13 +42673,13 @@ let sha512 = "Su8jA45PhegUgJnEAT15DYt2spPJgvjyTtXqg+Lw5AtGePfcQskV6ACEzsL0XPoAXIFf09Vx6sBor9pek+tl+Q=="; }; }; - "openapi-sampler-1.0.0" = { + "openapi-sampler-1.0.1" = { name = "openapi-sampler"; packageName = "openapi-sampler"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.0.0.tgz"; - sha512 = "HysKj4ZuLk0RpZkopao5SIupUX8LMOTsEDTw9dSzcRv6BBW6Ep1IdbKwYsCrYM9tnw4VZtebR/N5sJHY6qqRew=="; + url = "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.0.1.tgz"; + sha512 = "qBjxkSLJV183zTTs4fgxtU/iWSLUUu2aH2+5ddWkNhV7p8CSe/mnAgoLkEbMfHtel6yr9NF+vjUWqfM+iiwORQ=="; }; }; "openapi-schema-validator-3.0.3" = { @@ -43060,22 +43150,22 @@ let sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; }; }; - "ot-builder-1.0.7" = { + "ot-builder-1.0.8" = { name = "ot-builder"; packageName = "ot-builder"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.0.7.tgz"; - sha512 = "VhBztvKbf4PfsWIePHVzRhcstXWNv4StU7AqYpypzG/vxXbuRxamROSgHxklY2iDivLUbZWXIgxP5yeThQO4UQ=="; + url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.0.8.tgz"; + sha512 = "e9PkE4wr4mskFMNuV5IvCujBVp9Nc+yl5ltu7qad/BNcHIFh4nn9iWFE+Klva6h8prDefgE2FOuG+sYLU0IOrQ=="; }; }; - "otb-ttc-bundle-1.0.7" = { + "otb-ttc-bundle-1.0.8" = { name = "otb-ttc-bundle"; packageName = "otb-ttc-bundle"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.0.7.tgz"; - sha512 = "j6HyPSsOuDFLSupDEyXcg8XcaVTlO6L9RDyeq1pSDuMUhF0zqJIMLvNC0CyXmjYuzq43VALjMgT18y7A//O34g=="; + url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.0.8.tgz"; + sha512 = "VqlzOefegjHk0OTM7XIay7M+v0PSKYznKTmBPCds6X+NfaumDInoBrF7OTrhq5IN1LXlu4TwW29u0wzDCgc2+A=="; }; }; "ow-0.21.0" = { @@ -43996,15 +44086,6 @@ let sha512 = "yy7UTSmliOT/7Yl+P4hwwW2W7PbCTAMcD0lasaVG+k4/2laj42YWzLm468bLFGDoFPIb29g3BuwBcA3gLopKww=="; }; }; - "parse-torrent-7.1.3" = { - name = "parse-torrent"; - packageName = "parse-torrent"; - version = "7.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-7.1.3.tgz"; - sha512 = "to8zT7+o6bVTyP35r2QgG1svuFGMFO1mE6ri1oWHgL9tlgnOtfjmfHmA3mOuP9HTIU/8OiZw0NG5zbyqVLxhvA=="; - }; - }; "parse-torrent-9.1.3" = { name = "parse-torrent"; packageName = "parse-torrent"; @@ -45256,13 +45337,13 @@ let sha512 = "7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg=="; }; }; - "polished-3.7.1" = { + "polished-3.7.2" = { name = "polished"; packageName = "polished"; - version = "3.7.1"; + version = "3.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/polished/-/polished-3.7.1.tgz"; - sha512 = "/QgHrNGYwIA4mwxJ/7FSvalUJsm7KNfnXiScVSEG2Xa5qxDeBn4nmdjN2pW00mkM2Tts64ktc47U8F7Ed1BRAA=="; + url = "https://registry.npmjs.org/polished/-/polished-3.7.2.tgz"; + sha512 = "pQKtpZGmsZrW8UUpQMAnR7s3ppHeMQVNyMDKtUyKwuvDmklzcEyM5Kllb3JyE/sE/x7arDmyd35i+4vp99H6sQ=="; }; }; "polyraf-1.1.0" = { @@ -45365,6 +45446,15 @@ let sha512 = "b/h7CPV7QEdrqIxtAf2j31U5ef05uBDuvoXv6L51Q4rcS1jdlXAVKJv+atCFdUXYl9dyTHGyoMzIepwowRJjFw=="; }; }; + "postcss-8.3.0" = { + name = "postcss"; + packageName = "postcss"; + version = "8.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss/-/postcss-8.3.0.tgz"; + sha512 = "+ogXpdAjWGa+fdYY5BQ96V/6tAo+TdSSIMP5huJBIygdWwKtVoB5JWZ7yUd4xZ8r+8Kvvx4nyg/PQ071H4UtcQ=="; + }; + }; "postcss-calc-7.0.5" = { name = "postcss-calc"; packageName = "postcss-calc"; @@ -45914,13 +46004,13 @@ let sha512 = "97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ=="; }; }; - "postcss-values-parser-1.5.0" = { + "postcss-values-parser-2.0.1" = { name = "postcss-values-parser"; packageName = "postcss-values-parser"; - version = "1.5.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-values-parser/-/postcss-values-parser-1.5.0.tgz"; - sha512 = "3M3p+2gMp0AH3da530TlX8kiO1nxdTnc3C6vr8dMxRLIlh8UYkz0/wcwptSXjhtx2Fr0TySI7a+BHDQ8NL7LaQ=="; + url = "https://registry.npmjs.org/postcss-values-parser/-/postcss-values-parser-2.0.1.tgz"; + sha512 = "2tLuBsA6P4rYTNKCXYG/71C7j1pU6pK503suYOmn4xYrQIzW+opD+7FAFNuGSdZC/3Qfy334QbeMu7MEb8gOxg=="; }; }; "postgres-array-2.0.0" = { @@ -46031,13 +46121,13 @@ let sha512 = "PzYWIKZeP+967WuKYXlTOhYBgGOvTRSfaKI89XnfJ0ansRAH7hDU45X+K+FZeI1Wb/7p/NnuctPH3g0IqKUuSQ=="; }; }; - "precinct-6.3.1" = { + "precinct-8.1.0" = { name = "precinct"; packageName = "precinct"; - version = "6.3.1"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/precinct/-/precinct-6.3.1.tgz"; - sha512 = "JAwyLCgTylWminoD7V0VJwMElWmwrVSR6r9HaPWCoswkB4iFzX7aNtO7VBfAVPy+NhmjKb8IF8UmlWJXzUkOIQ=="; + url = "https://registry.npmjs.org/precinct/-/precinct-8.1.0.tgz"; + sha512 = "oeZBR9IdER42Ef6Rz11z1oOUqicsI5J1Qffj6tYghKLhxN2UnHy7uE1axxNr0VZRevPK2HWkROk36uXrbJwHFA=="; }; }; "precond-0.2.3" = { @@ -46850,13 +46940,13 @@ let sha1 = "71c0ee3b102de3f202f3b64f608d173fcba1a918"; }; }; - "proxy-addr-2.0.6" = { + "proxy-addr-2.0.7" = { name = "proxy-addr"; packageName = "proxy-addr"; - version = "2.0.6"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz"; - sha512 = "dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw=="; + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz"; + sha512 = "llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg=="; }; }; "proxy-agent-4.0.1" = { @@ -47903,13 +47993,13 @@ let sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7"; }; }; - "pyright-1.1.144" = { + "pyright-1.1.145" = { name = "pyright"; packageName = "pyright"; - version = "1.1.144"; + version = "1.1.145"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.144.tgz"; - sha512 = "nzCTqxg7JPHy5FkyX4+meD4c7Zt/mgPBI+nFGS9HoN/3GVPHAlTcCKa1JPTEh7O/N5+8W/9WZUuUntBW2R3adg=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.145.tgz"; + sha512 = "eyrK9Ilut2shvqi/TFmpfUrm7U6DrkskMa8UPofkGJZCO1PJzVwzKaGWrR57zlbcAxs5PVvK9JGSIO9DJUVNyA=="; }; }; "q-0.9.7" = { @@ -50612,6 +50702,15 @@ let sha1 = "43374e2e2ca0968b0ef1523460b7d730ff22eeb3"; }; }; + "rgbcolor-1.0.1" = { + name = "rgbcolor"; + packageName = "rgbcolor"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/rgbcolor/-/rgbcolor-1.0.1.tgz"; + sha1 = "d6505ecdb304a6595da26fa4b43307306775945d"; + }; + }; "right-align-0.1.3" = { name = "right-align"; packageName = "right-align"; @@ -50738,13 +50837,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.50.3" = { + "rollup-2.50.5" = { name = "rollup"; packageName = "rollup"; - version = "2.50.3"; + version = "2.50.5"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.50.3.tgz"; - sha512 = "58KiHnaCzZn6F5yRMjHe7WTZuFj6r4iJVJz5UwvKD6f/xfTy2IdtbR2AVHN6cyfK1tBy//hJ66ebXy6Y1h7HlQ=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.50.5.tgz"; + sha512 = "Ztz4NurU2LbS3Jn5rlhnYv35z6pkjBUmYKr94fOBIKINKRO6kug9NTFHArT7jqwMP2kqEZ39jJuEtkk91NBltQ=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -53420,6 +53519,15 @@ let sha512 = "CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="; }; }; + "source-map-js-0.6.2" = { + name = "source-map-js"; + packageName = "source-map-js"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-js/-/source-map-js-0.6.2.tgz"; + sha512 = "/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug=="; + }; + }; "source-map-resolve-0.5.3" = { name = "source-map-resolve"; packageName = "source-map-resolve"; @@ -54374,6 +54482,15 @@ let sha512 = "gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw=="; }; }; + "stackblur-canvas-2.5.0" = { + name = "stackblur-canvas"; + packageName = "stackblur-canvas"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stackblur-canvas/-/stackblur-canvas-2.5.0.tgz"; + sha512 = "EeNzTVfj+1In7aSLPKDD03F/ly4RxEuF/EX0YcOG0cKoPXs+SLZxDawQbexQDBzwROs4VKLWTOaZQlZkGBFEIQ=="; + }; + }; "stackframe-1.2.0" = { name = "stackframe"; packageName = "stackframe"; @@ -55877,6 +55994,15 @@ let sha1 = "3cf87dfeb4d07b4a3f14827bc186b3fd0c645cd8"; }; }; + "svg-pathdata-5.0.5" = { + name = "svg-pathdata"; + packageName = "svg-pathdata"; + version = "5.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/svg-pathdata/-/svg-pathdata-5.0.5.tgz"; + sha512 = "TAAvLNSE3fEhyl/Da19JWfMAdhSXTYeviXsLSoDT1UM76ADj5ndwAPX1FKQEgB/gFMPavOy6tOqfalXKUiXrow=="; + }; + }; "svg-tags-1.0.0" = { name = "svg-tags"; packageName = "svg-tags"; @@ -55886,6 +56012,15 @@ let sha1 = "58f71cee3bd519b59d4b2a843b6c7de64ac04764"; }; }; + "svg2img-0.9.2" = { + name = "svg2img"; + packageName = "svg2img"; + version = "0.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/svg2img/-/svg2img-0.9.2.tgz"; + sha512 = "sjyUgQhfEPJpBRTGxqI9bRzE+3k41Nzc7OtcHSSko96i/EQJZAisdxyhk12Ho/mDVCsb1QsVHLbevbxrFC6onQ=="; + }; + }; "svgo-0.6.6" = { name = "svgo"; packageName = "svgo"; @@ -56012,13 +56147,13 @@ let sha512 = "cUUktzLpK69UwpMbcTzjMw2ns9RZChfxh56AHv6+hTx3StPOX2foZjPgds3HlJcINbxosYYBn/D3cG8nwcCWwQ=="; }; }; - "swagger2openapi-7.0.5" = { + "swagger2openapi-7.0.6" = { name = "swagger2openapi"; packageName = "swagger2openapi"; - version = "7.0.5"; + version = "7.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/swagger2openapi/-/swagger2openapi-7.0.5.tgz"; - sha512 = "Hzxse+VTX0u8xBgYJ665EjO6BfvW2PN9Yv+yIjBDm6ga9jl83+4CEdCCpznH+ILr5MS8bIIXB+XcQUM3u25w4g=="; + url = "https://registry.npmjs.org/swagger2openapi/-/swagger2openapi-7.0.6.tgz"; + sha512 = "VIT414koe0eJqre0KrhNMUB7QEUfPjGAKesPZZosIKr2rxZ6vpUoersHUFNOsN/OZ5u2zsniCslBOwVcmQZwlg=="; }; }; "sway-1.0.0" = { @@ -56724,13 +56859,13 @@ let sha512 = "3qAQpykRTD5DReLu5/cwpsg7EZFzP3Q0Hp2XUWJUw2mpq2jfgOKTZr8IZKKnNieRVVo1UauROTdhbQJZveGKtQ=="; }; }; - "terser-webpack-plugin-5.1.2" = { + "terser-webpack-plugin-5.1.3" = { name = "terser-webpack-plugin"; packageName = "terser-webpack-plugin"; - version = "5.1.2"; + version = "5.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.1.2.tgz"; - sha512 = "6QhDaAiVHIQr5Ab3XUWZyDmrIPCHMiqJVljMF91YKyqwKkL5QHnYMkrMBy96v9Z7ev1hGhSEw1HQZc2p/s5Z8Q=="; + url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.1.3.tgz"; + sha512 = "cxGbMqr6+A2hrIB5ehFIF+F/iST5ZOxvOmy9zih9ySbP1C2oEWQSOUS+2SNBTjzx5xLKO4xnod9eywdfq1Nb9A=="; }; }; "test-exclude-6.0.0" = { @@ -58164,6 +58299,15 @@ let sha512 = "IbR4nkT96EQOvKE2PW/djGz8iGNeJ4rF2mBfiYaR/nvUWYKJhLwimoJKgjIFEIDibBtOevj7BqCRL4oHeWWUCg=="; }; }; + "tspan-0.4.0" = { + name = "tspan"; + packageName = "tspan"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tspan/-/tspan-0.4.0.tgz"; + sha512 = "0ELL9tpLpTqLliFyQySaxgCO43buCML+j3TI4E1LuSI8wkzITGEVhZCyMvv/A+3ek9KpgALhhgnZESRLTbN+iw=="; + }; + }; "tsscmp-1.0.6" = { name = "tsscmp"; packageName = "tsscmp"; @@ -58515,13 +58659,13 @@ let sha512 = "4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="; }; }; - "type-fest-1.1.3" = { + "type-fest-1.2.0" = { name = "type-fest"; packageName = "type-fest"; - version = "1.1.3"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-1.1.3.tgz"; - sha512 = "CsiQeFMR1jZEq8R+H59qe+bBevnjoV5N2WZTTdlyqxeoODQOOepN2+msQOywcieDq5sBjabKzTn3U+sfHZlMdw=="; + url = "https://registry.npmjs.org/type-fest/-/type-fest-1.2.0.tgz"; + sha512 = "++0N6KyAj0t2webXst0PE0xuXb4Dv3z1Z+4SGzK+j/epeWBZCfkQbkW/ezscZwpinmBQ5wu/l4TqagKSVcAGCA=="; }; }; "type-is-1.6.18" = { @@ -61261,13 +61405,13 @@ let sha1 = "614f7fbf8d801f0bb5f0661f5b2f5785750e4f09"; }; }; - "vsce-1.88.0" = { + "vsce-1.91.0" = { name = "vsce"; packageName = "vsce"; - version = "1.88.0"; + version = "1.91.0"; src = fetchurl { - url = "https://registry.npmjs.org/vsce/-/vsce-1.88.0.tgz"; - sha512 = "FS5ou3G+WRnPPr/tWVs8b/jVzeDacgZHy/y7/QQW7maSPFEAmRt2bFGUJtJVEUDLBqtDm/3VGMJ7D31cF2U1tw=="; + url = "https://registry.npmjs.org/vsce/-/vsce-1.91.0.tgz"; + sha512 = "y75QryWKzAw5KIR4NFEXc6XAy/Er1BHXdNwAESgKKFw8Yc8cA/+dP4Gj7VYhNPOJlV0v5j1in/cPkLFZAqC7cQ=="; }; }; "vscode-css-languageservice-3.0.13" = { @@ -61981,6 +62125,15 @@ let sha1 = "79331f666366b3b1c6ab02ceb04bad8dd2eebb0c"; }; }; + "wavedrom-2.6.9" = { + name = "wavedrom"; + packageName = "wavedrom"; + version = "2.6.9"; + src = fetchurl { + url = "https://registry.npmjs.org/wavedrom/-/wavedrom-2.6.9.tgz"; + sha512 = "EXBubejy7GrzibGLJ6OXH5HAP7KbA62gXMm8FvqJH0W5S05D6pgqdnRG20KP1w/WSY+zqdVIkiHNxwgquPbs2w=="; + }; + }; "wawoff2-1.0.2" = { name = "wawoff2"; packageName = "wawoff2"; @@ -63349,13 +63502,13 @@ let sha512 = "N1XQngeqMBoj9wM4ZFadVV2MymImeiFfYD+fJrNlcVcOHsJFFQe7n3b+aBoTPwARuq2HQxukfzVpQmAk1gN4sQ=="; }; }; - "xdl-59.0.40" = { + "xdl-59.0.42" = { name = "xdl"; packageName = "xdl"; - version = "59.0.40"; + version = "59.0.42"; src = fetchurl { - url = "https://registry.npmjs.org/xdl/-/xdl-59.0.40.tgz"; - sha512 = "TRSCBA2bRGiMATsf0dpyKtTo80WHYRWL+Rbo6OOLh1ODR032dvdrh0v1eaUcmnEnjUxF2uXgUQaoi5qiVhxB3A=="; + url = "https://registry.npmjs.org/xdl/-/xdl-59.0.42.tgz"; + sha512 = "/Er1hvi8AB5YbAL/JulvFkNHKd1B+9Sl8PttHZmu8kaqApkDZWPNvWhN3hBEnJIIzEODTejYII3IoAQmf7PveA=="; }; }; "xenvar-0.5.1" = { @@ -63764,13 +63917,13 @@ let sha512 = "2t7FahYnGJys6DpHLhajusId7R0Pm2yTmuL0GV9+mV0ZlaLSnb2toBmppATfg5sWIhZQGlsTLoecSzya+l4EAQ=="; }; }; - "xstate-4.19.2" = { + "xstate-4.20.0" = { name = "xstate"; packageName = "xstate"; - version = "4.19.2"; + version = "4.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/xstate/-/xstate-4.19.2.tgz"; - sha512 = "eWI6kOHavcqhu1ACCmRowYGaQnH0KGvBoGg3lqmle9ZYyVWa2ZcVTgZlsK7o419/jw9gWX2LYmYGkm9w/VoXMA=="; + url = "https://registry.npmjs.org/xstate/-/xstate-4.20.0.tgz"; + sha512 = "u5Ou1CMo/oWApasmv1TYTHgj38k69DJdTqQdBBwt+/ooNhPJQiSIKTB3Y3HvX0h5tulwfSo6xAwZgBgjRsK3LA=="; }; }; "xstream-11.14.0" = { @@ -65286,7 +65439,7 @@ in sources."@webassemblyjs/wast-printer-1.11.0" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.2.4" + sources."acorn-8.3.0" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" sources."ansi-colors-4.1.1" @@ -65305,7 +65458,7 @@ in sources."buffer-5.7.1" sources."buffer-from-1.1.1" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001230" + sources."caniuse-lite-1.0.30001232" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.1" @@ -65325,7 +65478,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.741" + sources."electron-to-chromium-1.3.743" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-5.8.2" // { @@ -65393,7 +65546,11 @@ in sources."is-stream-2.0.0" sources."is-unicode-supported-0.1.0" sources."isexe-2.0.0" - sources."jest-worker-26.6.2" + (sources."jest-worker-27.0.2" // { + dependencies = [ + sources."supports-color-8.1.1" + ]; + }) sources."js-tokens-4.0.0" sources."json-parse-better-errors-1.0.2" sources."json-parse-even-better-errors-2.3.1" @@ -65492,7 +65649,7 @@ in sources."commander-2.20.3" ]; }) - (sources."terser-webpack-plugin-5.1.2" // { + (sources."terser-webpack-plugin-5.1.3" // { dependencies = [ sources."schema-utils-3.0.0" sources."source-map-0.6.1" @@ -65721,7 +65878,7 @@ in ]; }) sources."@types/keygrip-1.0.2" - sources."@types/koa-2.13.2" + sources."@types/koa-2.13.3" sources."@types/koa-compose-3.2.5" sources."@types/long-4.0.1" sources."@types/mime-1.3.2" @@ -65870,7 +66027,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.30001230" + sources."caniuse-lite-1.0.30001232" sources."caseless-0.12.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -65928,12 +66085,12 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - (sources."core-js-compat-3.13.0" // { + (sources."core-js-compat-3.13.1" // { dependencies = [ sources."semver-7.0.0" ]; }) - sources."core-js-pure-3.13.0" + sources."core-js-pure-3.13.1" sources."core-util-is-1.0.2" sources."cors-2.8.5" (sources."cross-spawn-6.0.5" // { @@ -66000,7 +66157,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.741" + sources."electron-to-chromium-1.3.743" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -66088,7 +66245,7 @@ in sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" - sources."forwarded-0.1.2" + sources."forwarded-0.2.0" sources."fragment-cache-0.2.1" sources."fresh-0.5.2" sources."from2-2.3.0" @@ -66430,7 +66587,7 @@ in sources."process-exists-3.1.0" sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" - sources."proxy-addr-2.0.6" + sources."proxy-addr-2.0.7" sources."ps-list-4.1.0" sources."pseudomap-1.0.2" sources."psl-1.8.0" @@ -67016,7 +67173,7 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."browserslist-4.16.6" - sources."caniuse-lite-1.0.30001230" + sources."caniuse-lite-1.0.30001232" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -67027,7 +67184,7 @@ in sources."convert-source-map-1.7.0" sources."debug-4.3.2" sources."ejs-3.1.6" - sources."electron-to-chromium-1.3.741" + sources."electron-to-chromium-1.3.743" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -67616,7 +67773,7 @@ in sources."finalhandler-1.1.2" sources."forever-agent-0.6.1" sources."form-data-3.0.0" - sources."forwarded-0.1.2" + sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."gauge-1.2.7" sources."gaxios-4.3.0" @@ -67921,7 +68078,7 @@ in sources."@types/node-15.6.1" ]; }) - sources."proxy-addr-2.0.6" + sources."proxy-addr-2.0.7" (sources."psbt-1.1.9" // { dependencies = [ sources."bn.js-5.2.0" @@ -68328,7 +68485,7 @@ in sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" sources."meow-3.7.0" - sources."mime-db-1.47.0" + sources."mime-db-1.48.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -68800,7 +68957,7 @@ in sources."follow-redirects-1.14.1" sources."forever-agent-0.6.1" sources."form-data-2.3.3" - sources."forwarded-0.1.2" + sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" @@ -68927,7 +69084,7 @@ in }) sources."pngjs-3.4.0" sources."promise-7.3.1" - sources."proxy-addr-2.0.6" + sources."proxy-addr-2.0.7" sources."psl-1.8.0" sources."pug-3.0.2" sources."pug-attrs-3.0.0" @@ -69500,10 +69657,10 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "1.0.0-beta.11"; + version = "1.0.0-beta.18"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.11.tgz"; - sha512 = "Oo/tO5aqmjsBORN93dSnidF7+2u77Q9zwUn9VbCQkZqCNfeZZcwIV9AG108hMYwtcXqtKQC7wevX6rmi9l8lng=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.18.tgz"; + sha512 = "eT0Z2u8yB8gMAIOMJ76TjeCQZ8nzxSbN/Y87cbzhT9I6vyLjgCw/w+48XXudOfW63kY2/TugWtZE+mwQlu3QXw=="; }; dependencies = [ sources."@jsii/spec-1.30.0" @@ -69515,7 +69672,7 @@ in sources."call-bind-1.0.2" sources."camelcase-6.2.0" sources."case-1.6.3" - sources."cdk8s-1.0.0-beta.11" + sources."cdk8s-1.0.0-beta.14" sources."cliui-7.0.4" sources."clone-2.1.2" (sources."codemaker-1.30.0" // { @@ -69527,7 +69684,7 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.29.3" - sources."constructs-3.3.71" + sources."constructs-3.3.75" sources."date-format-3.0.0" sources."debug-4.3.2" sources."decamelize-5.0.0" @@ -69682,7 +69839,6 @@ in buildInputs = globalBuildInputs; meta = { description = "CDK for Kubernetes CLI"; - homepage = "https://github.com/awslabs/cdk8s#readme"; license = "Apache-2.0"; }; production = true; @@ -69756,7 +69912,7 @@ in sources."colors-1.4.0" sources."combined-stream-1.0.8" sources."commonmark-0.29.3" - sources."compress-commons-4.1.0" + sources."compress-commons-4.1.1" sources."concat-map-0.0.1" sources."constructs-3.3.75" sources."convert-to-spaces-1.0.2" @@ -70539,10 +70695,10 @@ in coc-metals = nodeEnv.buildNodePackage { name = "coc-metals"; packageName = "coc-metals"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/coc-metals/-/coc-metals-1.0.5.tgz"; - sha512 = "YWnhsa/SDrxdJwcRrvFUiNOYuhDE8STBo5t1Nvokk/OaFoKfTS/OrxE2xTrDPWgJAxytyfnIjxBduokB1+LT3g=="; + url = "https://registry.npmjs.org/coc-metals/-/coc-metals-1.0.6.tgz"; + sha512 = "MQuXdCblmy5Qnrlqmb7ntDjpgxtdXsbdAgxf23Ai2QFpf14bdc+gz4U/+9pOEpSswODtMvMqnjfTA1lY7p2AfQ=="; }; dependencies = [ sources."@chemzqm/neovim-5.2.13" @@ -70833,7 +70989,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001230" + sources."caniuse-lite-1.0.30001232" sources."capture-stack-trace-1.0.1" sources."ccount-1.1.0" (sources."chalk-4.1.1" // { @@ -70895,7 +71051,7 @@ in ]; }) sources."copy-descriptor-0.1.1" - sources."core-js-3.13.0" + sources."core-js-3.13.1" sources."cosmiconfig-3.1.0" sources."create-error-class-3.0.2" sources."cross-spawn-7.0.3" @@ -70931,7 +71087,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.741" + sources."electron-to-chromium-1.3.743" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" @@ -71740,7 +71896,7 @@ in sha512 = "bUb/GuY0QjlDAws60UNDL8ZiRzp6sLmSqRkMyAAUEb9arsSphvok80P3i/NEsJhG2lgx2LaEz1mKUCnR+UjTlA=="; }; dependencies = [ - sources."pyright-1.1.144" + sources."pyright-1.1.145" ]; buildInputs = globalBuildInputs; meta = { @@ -71814,10 +71970,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.45.1"; + version = "0.46.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.45.1.tgz"; - sha512 = "2BFV6NJDi2s8Z41xf0Zk49fAWkYioZH+D7bKVQTb2LrhhKlmgfw4HGLe/9AZrvUPOcCDEuE9CS+lSnZjeJuUPg=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.46.0.tgz"; + sha512 = "KwkFaDNBwZtqdahUPKYKoCb0nvLZ1wu5L2/8kpK94IMDgNPy3TUTxujtwDjLwjYo/z+W5reRfwIYNJZ3FZ2Onw=="; }; buildInputs = globalBuildInputs; meta = { @@ -71945,7 +72101,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001230" + sources."caniuse-lite-1.0.30001232" (sources."chalk-4.1.1" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -71983,7 +72139,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.741" + sources."electron-to-chromium-1.3.743" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -72245,10 +72401,10 @@ in coc-texlab = nodeEnv.buildNodePackage { name = "coc-texlab"; packageName = "coc-texlab"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/coc-texlab/-/coc-texlab-3.0.1.tgz"; - sha512 = "0uom/t9g+4u1SgRDbfBIbnPRmlRS2odBCDcyP8+JQcEHYS2LXni0udDVZOG/4lbOFEZmMLbAcds0tTJpJ9SZhg=="; + url = "https://registry.npmjs.org/coc-texlab/-/coc-texlab-3.0.2.tgz"; + sha512 = "YiPB0gasof89HqAGz55BICHtt9gDyTjsNY1mwdKkJP0ZmgSxub5q+hOYYbay56X4+348Raxx0fp75JI8ax1nAw=="; }; buildInputs = globalBuildInputs; meta = { @@ -72431,7 +72587,7 @@ in sources."enquirer-2.3.6" sources."escape-string-regexp-4.0.0" sources."eslint-7.27.0" - sources."eslint-plugin-vue-7.9.0" + sources."eslint-plugin-vue-7.10.0" sources."eslint-scope-5.1.1" (sources."eslint-utils-2.1.0" // { dependencies = [ @@ -73040,7 +73196,7 @@ in sources."find-up-2.1.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" - sources."forwarded-0.1.2" + sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."fs-extra-9.1.0" sources."fs-minipass-2.1.0" @@ -73277,7 +73433,7 @@ in sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" sources."promzard-0.3.0" - sources."proxy-addr-2.0.6" + sources."proxy-addr-2.0.7" sources."psl-1.8.0" sources."pump-3.0.0" sources."punycode-2.1.1" @@ -75175,7 +75331,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."bl-4.1.0" sources."bluebird-3.7.2" - sources."boolean-3.0.4" + sources."boolean-3.1.0" sources."brace-expansion-1.1.11" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" @@ -75213,7 +75369,7 @@ in sources."concat-map-0.0.1" sources."config-chain-1.1.12" sources."console-control-strings-1.1.0" - sources."core-js-3.13.0" + sources."core-js-3.13.1" sources."core-util-is-1.0.2" sources."cross-spawn-7.0.3" sources."currently-unhandled-0.4.1" @@ -75803,7 +75959,7 @@ in sources."quick-lru-4.0.1" ]; }) - sources."caniuse-lite-1.0.30001230" + sources."caniuse-lite-1.0.30001232" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -75840,7 +75996,7 @@ in }) sources."defer-to-connect-2.0.1" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.741" + sources."electron-to-chromium-1.3.743" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -76115,7 +76271,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.173" + sources."@microsoft/load-themed-styles-1.10.174" sources."@nodelib/fs.scandir-2.1.4" sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" @@ -76684,7 +76840,7 @@ in sources."for-own-1.0.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" - sources."forwarded-0.1.2" + sources."forwarded-0.2.0" sources."fragment-cache-0.2.1" sources."fresh-0.5.2" (sources."from2-2.3.0" // { @@ -77284,7 +77440,7 @@ in sources."promise-inflight-1.0.1" sources."promise-queue-2.2.5" sources."prop-types-15.7.2" - sources."proxy-addr-2.0.6" + sources."proxy-addr-2.0.7" sources."prr-1.0.1" sources."psl-1.8.0" (sources."public-encrypt-4.0.3" // { @@ -78140,10 +78296,10 @@ in expo-cli = nodeEnv.buildNodePackage { name = "expo-cli"; packageName = "expo-cli"; - version = "4.5.0"; + version = "4.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.5.0.tgz"; - sha512 = "SY+ff6RtgviIV5p776TbeiG3qfI8lRGKBwUbrGQNVWnlgFhrRIY8H8Dixc3jcZmNV669Id5Ha0v+UqBF1duQzw=="; + url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.5.2.tgz"; + sha512 = "r6SeIMk2ZP1/rSKGcXquiQp/A7MGAmJvG0otmJhlO5ypdYXfAJ1fhEJIqt7ufSngc5RRJ0cjnKZ1WBSyJlJTNA=="; }; dependencies = [ sources."@babel/code-frame-7.12.13" @@ -78279,16 +78435,16 @@ in sources."@babel/types-7.14.4" sources."@expo/apple-utils-0.0.0-alpha.20" sources."@expo/bunyan-4.0.0" - sources."@expo/config-4.0.0" - sources."@expo/config-plugins-2.0.0" - sources."@expo/config-types-40.0.0-beta.2" + sources."@expo/config-4.0.2" + sources."@expo/config-plugins-2.0.2" + sources."@expo/config-types-41.0.0" (sources."@expo/configure-splash-screen-0.4.0" // { dependencies = [ sources."commander-5.1.0" sources."pngjs-5.0.0" ]; }) - (sources."@expo/dev-server-0.1.70" // { + (sources."@expo/dev-server-0.1.72" // { dependencies = [ sources."body-parser-1.19.0" sources."bytes-3.1.0" @@ -78297,13 +78453,15 @@ in sources."iconv-lite-0.4.24" sources."inherits-2.0.3" sources."ms-2.0.0" + sources."open-8.2.0" sources."qs-6.7.0" sources."raw-body-2.4.0" sources."setprototypeof-1.1.1" sources."statuses-1.5.0" + sources."temp-dir-2.0.0" ]; }) - sources."@expo/dev-tools-0.13.100" + sources."@expo/dev-tools-0.13.102" (sources."@expo/devcert-1.0.0" // { dependencies = [ sources."debug-3.2.7" @@ -78323,7 +78481,7 @@ in sources."json5-1.0.1" ]; }) - sources."@expo/metro-config-0.1.70" + sources."@expo/metro-config-0.1.72" sources."@expo/osascript-2.0.28" (sources."@expo/package-manager-0.0.43" // { dependencies = [ @@ -78337,7 +78495,7 @@ in sources."xmlbuilder-14.0.0" ]; }) - sources."@expo/prebuild-config-1.0.1" + sources."@expo/prebuild-config-1.0.3" sources."@expo/results-1.0.0" (sources."@expo/schemer-1.3.29" // { dependencies = [ @@ -78348,7 +78506,7 @@ in }) sources."@expo/simple-spinner-1.0.2" sources."@expo/spawn-async-1.5.0" - (sources."@expo/webpack-config-0.12.74" // { + (sources."@expo/webpack-config-0.12.76" // { dependencies = [ sources."@babel/runtime-7.9.0" sources."react-refresh-0.8.3" @@ -78691,7 +78849,7 @@ in }) sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001230" + sources."caniuse-lite-1.0.30001232" sources."caseless-0.12.0" (sources."chalk-4.1.1" // { dependencies = [ @@ -78825,7 +78983,7 @@ in ]; }) sources."core-js-2.6.12" - (sources."core-js-compat-3.13.0" // { + (sources."core-js-compat-3.13.1" // { dependencies = [ sources."semver-7.0.0" ]; @@ -78908,6 +79066,7 @@ in sources."default-gateway-4.2.0" sources."defaults-1.0.3" sources."defer-to-connect-2.0.1" + sources."define-lazy-prop-2.0.0" sources."define-properties-1.1.3" sources."define-property-2.0.2" (sources."del-6.0.0" // { @@ -78964,7 +79123,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.741" + sources."electron-to-chromium-1.3.743" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -79045,7 +79204,7 @@ in sources."ms-2.0.0" ]; }) - (sources."expo-pwa-0.0.80" // { + (sources."expo-pwa-0.0.82" // { dependencies = [ sources."commander-2.20.0" ]; @@ -79118,7 +79277,7 @@ in ]; }) sources."form-data-2.5.1" - sources."forwarded-0.1.2" + sources."forwarded-0.2.0" sources."fragment-cache-0.2.1" sources."freeport-async-2.0.0" sources."fresh-0.5.2" @@ -79908,7 +80067,7 @@ in sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" sources."prompts-2.4.1" - sources."proxy-addr-2.0.6" + sources."proxy-addr-2.0.7" sources."prr-1.0.1" sources."psl-1.8.0" (sources."public-encrypt-4.0.3" // { @@ -80592,7 +80751,7 @@ in sources."uuid-7.0.3" ]; }) - (sources."xdl-59.0.40" // { + (sources."xdl-59.0.42" // { dependencies = [ sources."chownr-1.1.4" sources."fs-minipass-1.2.7" @@ -81644,7 +81803,7 @@ in sources."combined-stream-1.0.8" sources."commander-4.1.1" sources."compare-semver-1.1.0" - sources."compress-commons-4.1.0" + sources."compress-commons-4.1.1" sources."compressible-2.0.18" (sources."compression-1.7.4" // { dependencies = [ @@ -81804,7 +81963,7 @@ in sources."fn.name-1.1.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" - sources."forwarded-0.1.2" + sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."fs-constants-1.0.0" sources."fs-extra-5.0.0" @@ -82111,7 +82270,7 @@ in sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" sources."protobufjs-6.11.2" - sources."proxy-addr-2.0.6" + sources."proxy-addr-2.0.7" (sources."proxy-agent-4.0.1" // { dependencies = [ sources."lru-cache-5.1.1" @@ -82461,7 +82620,7 @@ in sources."error-ex-1.3.2" sources."esc-exit-2.0.2" sources."escape-string-regexp-1.0.5" - sources."execa-5.0.0" + sources."execa-5.0.1" sources."external-editor-3.1.0" sources."figures-3.2.0" sources."find-up-4.1.0" @@ -82820,13 +82979,12 @@ in forever = nodeEnv.buildNodePackage { name = "forever"; packageName = "forever"; - version = "3.0.4"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/forever/-/forever-3.0.4.tgz"; - sha512 = "MZDQu9nxVavSOez+k0MGdoe9/0tGN/QfAj3Xn8OjJbRYlLghq/3isf5c2xt280x04EVKguU9/tmLE74259Xazw=="; + url = "https://registry.npmjs.org/forever/-/forever-4.0.0.tgz"; + sha512 = "8cFfO0lvIs4c0P5LvKbdvZvtOK/z79AF/vC9DQLH+niyOCPxqq1+12CyYrzHC+5hBILjPU9ClWLVrXvrK+2ZVw=="; }; dependencies = [ - sources."ansi-regex-2.1.1" (sources."anymatch-2.0.0" // { dependencies = [ sources."normalize-path-2.1.1" @@ -82840,6 +82998,7 @@ in sources."async-1.5.2" sources."async-each-1.0.3" sources."atob-2.1.2" + sources."available-typed-arrays-1.0.4" sources."balanced-match-1.0.2" (sources."base-0.11.2" // { dependencies = [ @@ -82857,17 +83016,15 @@ in }) (sources."broadway-0.3.6" // { dependencies = [ - sources."async-0.2.9" + sources."async-0.2.10" sources."cliff-0.1.9" sources."eventemitter2-0.4.14" - sources."nconf-0.6.9" sources."winston-0.8.0" ]; }) sources."cache-base-1.0.1" sources."call-bind-1.0.2" sources."caller-0.0.1" - sources."camelcase-2.1.1" sources."chokidar-2.1.8" (sources."class-utils-0.3.6" // { dependencies = [ @@ -82891,25 +83048,28 @@ in sources."colors-1.0.3" ]; }) - sources."cliui-3.2.0" sources."clone-2.1.2" - sources."code-point-at-1.1.0" sources."collection-visit-1.0.0" sources."colors-0.6.2" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" + sources."configstore-4.0.0" sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" + sources."crypto-random-string-1.0.0" sources."cycle-1.0.3" sources."debug-2.6.9" - sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" - sources."deep-equal-1.1.1" + sources."deep-equal-2.0.5" sources."define-properties-1.1.3" sources."define-property-2.0.2" sources."defined-0.0.0" sources."director-1.2.7" + sources."dot-prop-4.2.1" sources."duplexer-0.1.2" + sources."es-abstract-1.18.3" + sources."es-get-iterator-1.1.2" + sources."es-to-primitive-1.2.1" sources."event-stream-3.3.4" sources."eventemitter2-6.4.3" (sources."expand-brackets-2.1.4" // { @@ -82949,6 +83109,7 @@ in }) sources."flatiron-0.4.3" sources."for-in-1.0.2" + sources."foreach-2.0.5" sources."forever-monitor-3.0.3" sources."fragment-cache-0.2.1" sources."from-0.1.7" @@ -82965,6 +83126,7 @@ in }) sources."graceful-fs-4.2.6" sources."has-1.0.3" + sources."has-bigints-1.0.1" sources."has-symbols-1.0.2" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -82973,36 +83135,48 @@ in ]; }) sources."i-0.3.6" + sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" - sources."invert-kv-1.0.0" sources."is-accessor-descriptor-1.0.0" sources."is-arguments-1.1.0" + sources."is-bigint-1.0.2" sources."is-binary-path-1.0.1" + sources."is-boolean-object-1.1.1" sources."is-buffer-1.1.6" + sources."is-callable-1.2.3" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.4" sources."is-descriptor-1.0.2" sources."is-extendable-1.0.1" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-1.0.0" sources."is-glob-4.0.1" + sources."is-map-2.0.2" + sources."is-negative-zero-2.0.1" (sources."is-number-3.0.0" // { dependencies = [ sources."kind-of-3.2.2" ]; }) + sources."is-number-object-1.0.5" + sources."is-obj-1.0.1" sources."is-plain-object-2.0.4" sources."is-regex-1.1.3" + sources."is-set-2.0.2" + sources."is-string-1.0.6" + sources."is-symbol-1.0.4" + sources."is-typed-array-1.1.5" + sources."is-weakmap-2.0.1" + sources."is-weakset-2.0.1" sources."is-windows-1.0.2" - sources."isarray-1.0.0" + sources."isarray-2.0.5" sources."isobject-3.0.1" sources."isstream-0.1.2" sources."jsonify-0.0.0" sources."kind-of-6.0.3" sources."lazy-1.0.11" - sources."lcid-1.0.0" + sources."make-dir-1.3.0" sources."map-cache-0.2.2" sources."map-stream-0.1.0" sources."map-visit-1.0.0" @@ -83019,7 +83193,11 @@ in sources."mute-stream-0.0.8" sources."nan-2.14.2" sources."nanomatch-1.2.13" - sources."nconf-0.10.0" + (sources."nconf-0.6.9" // { + dependencies = [ + sources."async-0.2.9" + ]; + }) sources."ncp-0.4.2" sources."normalize-path-3.0.0" (sources."nssocket-0.6.0" // { @@ -83027,7 +83205,6 @@ in sources."eventemitter2-0.4.14" ]; }) - sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" (sources."object-copy-0.1.0" // { dependencies = [ @@ -83042,17 +83219,19 @@ in sources."kind-of-3.2.2" ]; }) + sources."object-inspect-1.10.3" sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object-visit-1.0.1" + sources."object.assign-4.1.2" sources."object.pick-1.3.0" sources."once-1.4.0" sources."optimist-0.6.0" - sources."os-locale-1.4.0" sources."pascalcase-0.1.1" sources."path-dirname-1.0.2" sources."path-is-absolute-1.0.1" sources."pause-stream-0.0.11" + sources."pify-3.0.0" sources."pkginfo-0.3.1" sources."posix-character-classes-0.1.1" (sources."prettyjson-1.2.1" // { @@ -83065,7 +83244,11 @@ in sources."prompt-0.2.14" sources."ps-tree-1.2.0" sources."read-1.0.7" - sources."readable-stream-2.3.7" + (sources."readable-stream-2.3.7" // { + dependencies = [ + sources."isarray-1.0.0" + ]; + }) sources."readdirp-2.2.1" sources."regex-not-1.0.2" sources."regexp.prototype.flags-1.3.1" @@ -83079,7 +83262,6 @@ in sources."rimraf-2.7.1" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" - sources."secure-keys-1.0.0" (sources."set-value-2.0.1" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -83087,6 +83269,8 @@ in ]; }) sources."shush-1.0.0" + sources."side-channel-1.0.4" + sources."signal-exit-3.0.3" (sources."snapdragon-0.8.2" // { dependencies = [ sources."define-property-0.2.5" @@ -83140,9 +83324,9 @@ in ]; }) sources."stream-combiner-0.0.4" - sources."string-width-1.0.2" + sources."string.prototype.trimend-1.0.4" + sources."string.prototype.trimstart-1.0.4" sources."string_decoder-1.1.1" - sources."strip-ansi-3.0.1" sources."strip-json-comments-0.1.3" (sources."tape-2.3.3" // { dependencies = [ @@ -83157,11 +83341,13 @@ in }) sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" + sources."unbox-primitive-1.0.1" (sources."union-value-1.0.1" // { dependencies = [ sources."is-extendable-0.1.1" ]; }) + sources."unique-string-1.0.0" (sources."unset-value-1.0.0" // { dependencies = [ (sources."has-value-0.3.1" // { @@ -83170,6 +83356,7 @@ in ]; }) sources."has-values-0.1.4" + sources."isarray-1.0.0" ]; }) sources."upath-1.2.0" @@ -83181,17 +83368,18 @@ in sources."async-0.2.10" ]; }) - sources."window-size-0.1.4" + sources."which-boxed-primitive-1.0.2" + sources."which-collection-1.0.1" + sources."which-typed-array-1.1.4" (sources."winston-0.8.3" // { dependencies = [ sources."async-0.2.10" ]; }) sources."wordwrap-0.0.3" - sources."wrap-ansi-2.1.0" sources."wrappy-1.0.2" - sources."y18n-3.2.2" - sources."yargs-3.32.0" + sources."write-file-atomic-2.4.3" + sources."xdg-basedir-3.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -83364,7 +83552,7 @@ in sources."@types/yargs-parser-20.2.0" sources."@types/yoga-layout-1.9.2" sources."accepts-1.3.7" - sources."acorn-8.2.4" + sources."acorn-8.3.0" sources."acorn-jsx-5.3.1" sources."address-1.1.2" (sources."ansi-align-3.0.0" // { @@ -83424,7 +83612,7 @@ in sources."call-bind-1.0.2" sources."camel-case-4.1.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001230" + sources."caniuse-lite-1.0.30001232" sources."ccount-1.1.0" (sources."chalk-4.1.1" // { dependencies = [ @@ -83524,7 +83712,7 @@ in sources."dotenv-8.6.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.741" + sources."electron-to-chromium-1.3.743" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -83589,7 +83777,7 @@ in sources."find-up-4.1.0" sources."follow-redirects-1.14.1" sources."form-data-3.0.1" - sources."forwarded-0.1.2" + sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."fs-exists-cached-1.0.0" sources."fs-extra-8.1.0" @@ -83774,7 +83962,7 @@ in sources."no-case-3.0.4" sources."node-eta-0.9.0" sources."node-fetch-2.6.1" - sources."node-object-hash-2.3.2" + sources."node-object-hash-2.3.3" sources."node-releases-1.1.72" sources."normalize-path-3.0.0" sources."normalize-url-3.3.0" @@ -83827,7 +84015,7 @@ in sources."prop-types-15.7.2" sources."proper-lockfile-4.1.2" sources."protocols-1.4.8" - sources."proxy-addr-2.0.6" + sources."proxy-addr-2.0.7" sources."pump-3.0.0" sources."pupa-2.1.1" sources."qs-6.10.1" @@ -84008,7 +84196,7 @@ in sources."write-file-atomic-3.0.3" sources."ws-7.4.6" sources."xdg-basedir-4.0.0" - sources."xstate-4.19.2" + sources."xstate-4.20.0" sources."xtend-4.0.2" sources."y18n-4.0.3" sources."yallist-4.0.0" @@ -84408,7 +84596,7 @@ in sources."esprima-4.0.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" - sources."execa-5.0.0" + sources."execa-5.0.1" sources."external-editor-3.1.0" sources."fast-deep-equal-3.1.3" sources."fast-levenshtein-2.0.6" @@ -84907,7 +85095,7 @@ in }) sources."graphql-subscriptions-1.2.1" sources."graphql-type-json-0.3.2" - sources."graphql-ws-4.5.2" + sources."graphql-ws-4.7.0" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" @@ -85043,14 +85231,14 @@ in sources."normalize-url-4.5.1" sources."npm-run-path-2.0.2" sources."oas-kit-common-1.0.8" - sources."oas-linter-3.2.1" - (sources."oas-resolver-2.5.4" // { + sources."oas-linter-3.2.2" + (sources."oas-resolver-2.5.5" // { dependencies = [ - sources."yargs-16.2.0" + sources."yargs-17.0.1" ]; }) sources."oas-schema-walker-1.1.5" - sources."oas-validator-5.0.5" + sources."oas-validator-5.0.6" sources."oauth-sign-0.9.0" sources."object-inspect-1.10.3" sources."object-is-1.1.5" @@ -85161,9 +85349,9 @@ in ]; }) sources."supports-color-7.2.0" - (sources."swagger2openapi-7.0.5" // { + (sources."swagger2openapi-7.0.6" // { dependencies = [ - sources."yargs-16.2.0" + sources."yargs-17.0.1" ]; }) sources."symbol-observable-1.2.0" @@ -85338,7 +85526,7 @@ in sources."express-4.17.1" sources."express-ws-2.0.0" sources."finalhandler-1.1.2" - sources."forwarded-0.1.2" + sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."http-errors-1.7.2" sources."iconv-lite-0.4.24" @@ -85357,7 +85545,7 @@ in sources."options-0.0.6" sources."parseurl-1.3.3" sources."path-to-regexp-0.1.7" - sources."proxy-addr-2.0.6" + sources."proxy-addr-2.0.7" sources."qs-6.7.0" sources."range-parser-1.2.1" sources."raw-body-2.4.0" @@ -87090,7 +87278,7 @@ in sources."is-wsl-2.2.0" sources."isexe-2.0.0" sources."jquery-3.6.0" - sources."jquery.terminal-2.24.0" + sources."jquery.terminal-2.25.1" sources."jsonfile-2.4.0" sources."keyboardevent-key-polyfill-1.1.0" sources."line-reader-0.4.0" @@ -87447,9 +87635,9 @@ in }; dependencies = [ sources."@iarna/toml-2.2.5" - sources."@ot-builder/bin-composite-types-1.0.7" - sources."@ot-builder/bin-util-1.0.7" - (sources."@ot-builder/cli-help-shower-1.0.7" // { + sources."@ot-builder/bin-composite-types-1.0.8" + sources."@ot-builder/bin-util-1.0.8" + (sources."@ot-builder/cli-help-shower-1.0.8" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.1" @@ -87459,7 +87647,7 @@ in sources."supports-color-7.2.0" ]; }) - (sources."@ot-builder/cli-proc-1.0.7" // { + (sources."@ot-builder/cli-proc-1.0.8" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.1" @@ -87469,7 +87657,7 @@ in sources."supports-color-7.2.0" ]; }) - (sources."@ot-builder/cli-shared-1.0.7" // { + (sources."@ot-builder/cli-shared-1.0.8" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.1" @@ -87479,35 +87667,35 @@ in sources."supports-color-7.2.0" ]; }) - sources."@ot-builder/common-impl-1.0.7" - sources."@ot-builder/errors-1.0.7" - sources."@ot-builder/io-bin-cff-1.0.7" - sources."@ot-builder/io-bin-encoding-1.0.7" - sources."@ot-builder/io-bin-ext-private-1.0.7" - sources."@ot-builder/io-bin-font-1.0.7" - sources."@ot-builder/io-bin-glyph-store-1.0.7" - sources."@ot-builder/io-bin-layout-1.0.7" - sources."@ot-builder/io-bin-metadata-1.0.7" - sources."@ot-builder/io-bin-metric-1.0.7" - sources."@ot-builder/io-bin-name-1.0.7" - sources."@ot-builder/io-bin-sfnt-1.0.7" - sources."@ot-builder/io-bin-ttf-1.0.7" - sources."@ot-builder/ot-1.0.7" - sources."@ot-builder/ot-encoding-1.0.7" - sources."@ot-builder/ot-ext-private-1.0.7" - sources."@ot-builder/ot-glyphs-1.0.7" - sources."@ot-builder/ot-layout-1.0.7" - sources."@ot-builder/ot-metadata-1.0.7" - sources."@ot-builder/ot-name-1.0.7" - sources."@ot-builder/ot-sfnt-1.0.7" - sources."@ot-builder/ot-standard-glyph-namer-1.0.7" - sources."@ot-builder/prelude-1.0.7" - sources."@ot-builder/primitive-1.0.7" - sources."@ot-builder/rectify-1.0.7" - sources."@ot-builder/stat-glyphs-1.0.7" - sources."@ot-builder/trace-1.0.7" - sources."@ot-builder/var-store-1.0.7" - sources."@ot-builder/variance-1.0.7" + sources."@ot-builder/common-impl-1.0.8" + sources."@ot-builder/errors-1.0.8" + sources."@ot-builder/io-bin-cff-1.0.8" + sources."@ot-builder/io-bin-encoding-1.0.8" + sources."@ot-builder/io-bin-ext-private-1.0.8" + sources."@ot-builder/io-bin-font-1.0.8" + sources."@ot-builder/io-bin-glyph-store-1.0.8" + sources."@ot-builder/io-bin-layout-1.0.8" + sources."@ot-builder/io-bin-metadata-1.0.8" + sources."@ot-builder/io-bin-metric-1.0.8" + sources."@ot-builder/io-bin-name-1.0.8" + sources."@ot-builder/io-bin-sfnt-1.0.8" + sources."@ot-builder/io-bin-ttf-1.0.8" + sources."@ot-builder/ot-1.0.8" + sources."@ot-builder/ot-encoding-1.0.8" + sources."@ot-builder/ot-ext-private-1.0.8" + sources."@ot-builder/ot-glyphs-1.0.8" + sources."@ot-builder/ot-layout-1.0.8" + sources."@ot-builder/ot-metadata-1.0.8" + sources."@ot-builder/ot-name-1.0.8" + sources."@ot-builder/ot-sfnt-1.0.8" + sources."@ot-builder/ot-standard-glyph-namer-1.0.8" + sources."@ot-builder/prelude-1.0.8" + sources."@ot-builder/primitive-1.0.8" + sources."@ot-builder/rectify-1.0.8" + sources."@ot-builder/stat-glyphs-1.0.8" + sources."@ot-builder/trace-1.0.8" + sources."@ot-builder/var-store-1.0.8" + sources."@ot-builder/variance-1.0.8" sources."@unicode/unicode-13.0.0-1.0.6" sources."aglfn-1.0.2" sources."amdefine-1.0.1" @@ -87594,8 +87782,8 @@ in sources."once-1.4.0" sources."onetime-5.1.2" sources."optionator-0.8.3" - sources."ot-builder-1.0.7" - (sources."otb-ttc-bundle-1.0.7" // { + sources."ot-builder-1.0.8" + (sources."otb-ttc-bundle-1.0.8" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.1" @@ -87831,8 +88019,8 @@ in dependencies = [ sources."@braintree/sanitize-url-3.1.0" sources."@cronvel/get-pixels-3.4.0" - sources."@joplin/fork-htmlparser2-4.1.24" - sources."@joplin/fork-sax-1.2.28" + sources."@joplin/fork-htmlparser2-4.1.26" + sources."@joplin/fork-sax-1.2.30" sources."@joplin/lib-1.8.2" (sources."@joplin/renderer-1.8.2" // { dependencies = [ @@ -87841,12 +88029,12 @@ in sources."uslug-git+https://github.com/laurent22/uslug.git#emoji-support" ]; }) - (sources."@joplin/turndown-4.0.46" // { + (sources."@joplin/turndown-4.0.48" // { dependencies = [ sources."css-2.2.4" ]; }) - sources."@joplin/turndown-plugin-gfm-1.0.28" + sources."@joplin/turndown-plugin-gfm-1.0.30" sources."abab-2.0.5" sources."abbrev-1.1.1" sources."acorn-7.4.1" @@ -88672,10 +88860,10 @@ in jshint = nodeEnv.buildNodePackage { name = "jshint"; packageName = "jshint"; - version = "2.12.0"; + version = "2.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/jshint/-/jshint-2.12.0.tgz"; - sha512 = "TwuuaUDmra0JMkuqvqy+WGo2xGHSNjv1BA1nTIgtH2K5z1jHuAEeAgp7laaR+hLRmajRjcrM71+vByBDanCyYA=="; + url = "https://registry.npmjs.org/jshint/-/jshint-2.13.0.tgz"; + sha512 = "Nd+md9wIeyfDK+RGrbOBzwLONSTdihGMtyGYU/t7zYcN2EgUa4iuY3VK2oxtPYrW5ycTj18iC+UbhNTxe4C66g=="; }; dependencies = [ sources."balanced-match-1.0.2" @@ -88908,7 +89096,7 @@ in ]; }) sources."finalhandler-1.1.2" - sources."forwarded-0.1.2" + sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."get-caller-file-2.0.5" sources."get-stream-4.1.0" @@ -88988,7 +89176,7 @@ in sources."please-upgrade-node-3.2.0" sources."pluralize-8.0.0" sources."prepend-http-2.0.0" - sources."proxy-addr-2.0.6" + sources."proxy-addr-2.0.7" sources."pump-3.0.0" sources."pupa-2.1.1" sources."qs-6.7.0" @@ -90403,7 +90591,7 @@ in sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" sources."eventemitter3-4.0.7" - sources."execa-5.0.0" + sources."execa-5.0.1" sources."extend-3.0.2" (sources."external-editor-3.1.0" // { dependencies = [ @@ -91438,7 +91626,7 @@ in sources."for-own-0.1.5" sources."forever-agent-0.6.1" sources."form-data-2.3.3" - sources."forwarded-0.1.2" + sources."forwarded-0.2.0" sources."fragment-cache-0.2.1" sources."fresh-0.5.2" sources."fsevents-1.2.13" @@ -91591,7 +91779,7 @@ in sources."posix-character-classes-0.1.1" sources."preserve-0.2.0" sources."process-nextick-args-2.0.1" - sources."proxy-addr-2.0.6" + sources."proxy-addr-2.0.7" sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.7.0" @@ -92109,7 +92297,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.30001230" + sources."caniuse-lite-1.0.30001232" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -92181,7 +92369,7 @@ in }) sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.13.0" // { + (sources."core-js-compat-3.13.1" // { dependencies = [ sources."semver-7.0.0" ]; @@ -92233,7 +92421,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.741" + sources."electron-to-chromium-1.3.743" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -93642,7 +93830,7 @@ in sources."@fluentui/react-focus-7.17.6" sources."@fluentui/react-window-provider-1.0.2" sources."@fluentui/theme-1.7.4" - sources."@microsoft/load-themed-styles-1.10.173" + sources."@microsoft/load-themed-styles-1.10.174" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@uifabric/foundation-7.9.26" @@ -93724,7 +93912,7 @@ in sources."fast-json-stable-stringify-2.1.0" sources."figures-2.0.0" sources."finalhandler-1.1.2" - sources."forwarded-0.1.2" + sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."fs-routes-7.0.1" sources."fs.realpath-1.0.0" @@ -93814,7 +94002,7 @@ in sources."prepend-http-2.0.0" sources."promise-queue-2.2.5" sources."prop-types-15.7.2" - sources."proxy-addr-2.0.6" + sources."proxy-addr-2.0.7" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.7.0" @@ -94154,10 +94342,10 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "3.31.16"; + version = "3.32.6"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-3.31.16.tgz"; - sha512 = "zUjRjBkXVRFO4M5pvffRXjYs+E+4guB927kRN1HbU1+pwQoqbyxj5qemCbnNBglpWlU4DPW2Quvch7IVevWzCg=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-3.32.6.tgz"; + sha512 = "VG2b3SJHbAIVErZvaeD0cU496GnuHpBqUYJiMrtEJ3eaPSQGc6HHZz9/P0Zbl7S67jaOk/wANOfcSxtbmPEORQ=="; }; dependencies = [ sources."@babel/code-frame-7.12.13" @@ -94291,7 +94479,7 @@ in sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-11.29.0" // { + (sources."@netlify/build-11.29.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-3.0.0" @@ -94301,7 +94489,6 @@ in sources."resolve-2.0.0-next.3" sources."semver-6.3.0" sources."update-notifier-4.1.3" - sources."uuid-7.0.3" ]; }) (sources."@netlify/cache-utils-1.0.7" // { @@ -94319,13 +94506,13 @@ in sources."locate-path-5.0.0" ]; }) - (sources."@netlify/framework-info-5.0.0" // { + (sources."@netlify/framework-info-5.1.2" // { dependencies = [ - sources."is-plain-obj-2.1.0" - sources."locate-path-5.0.0" + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" ]; }) - sources."@netlify/functions-utils-1.3.35" + sources."@netlify/functions-utils-1.3.37" (sources."@netlify/git-utils-1.0.11" // { dependencies = [ sources."braces-3.0.2" @@ -94337,7 +94524,7 @@ in ]; }) sources."@netlify/open-api-2.4.0" - (sources."@netlify/plugin-edge-handlers-1.11.12" // { + (sources."@netlify/plugin-edge-handlers-1.11.13" // { dependencies = [ sources."@nodelib/fs.stat-2.0.4" sources."@types/node-14.17.1" @@ -94366,11 +94553,29 @@ in sources."@netlify/traffic-mesh-agent-darwin-x64-0.27.10" sources."@netlify/traffic-mesh-agent-linux-x64-0.27.10" sources."@netlify/traffic-mesh-agent-win32-x64-0.27.10" - (sources."@netlify/zip-it-and-ship-it-4.2.1" // { + (sources."@netlify/zip-it-and-ship-it-4.2.5" // { dependencies = [ - sources."p-map-3.0.0" + sources."@nodelib/fs.stat-2.0.4" + sources."array-union-2.1.0" + sources."braces-3.0.2" + sources."cliui-7.0.4" + sources."cp-file-9.0.0" + sources."del-6.0.0" + sources."dir-glob-3.0.1" + sources."fast-glob-3.2.5" + sources."fill-range-7.0.1" + sources."glob-parent-5.1.2" + sources."globby-11.0.3" + sources."ignore-5.1.8" + sources."is-number-7.0.0" + sources."micromatch-4.0.4" + sources."pkg-dir-5.0.0" sources."resolve-2.0.0-next.3" - sources."semver-6.3.0" + sources."slash-3.0.0" + sources."to-regex-range-5.0.1" + sources."y18n-5.0.8" + sources."yargs-16.2.0" + sources."yargs-parser-20.2.7" ]; }) (sources."@nodelib/fs.scandir-2.1.4" // { @@ -94542,7 +94747,25 @@ in sources."@types/semver-5.5.0" sources."@types/yargs-13.0.11" sources."@types/yargs-parser-20.2.0" - sources."@typescript-eslint/typescript-estree-2.34.0" + sources."@typescript-eslint/types-4.26.0" + (sources."@typescript-eslint/typescript-estree-4.26.0" // { + dependencies = [ + sources."@nodelib/fs.stat-2.0.4" + sources."array-union-2.1.0" + sources."braces-3.0.2" + sources."dir-glob-3.0.1" + sources."fast-glob-3.2.5" + sources."fill-range-7.0.1" + sources."glob-parent-5.1.2" + sources."globby-11.0.3" + sources."ignore-5.1.8" + sources."is-number-7.0.0" + sources."micromatch-4.0.4" + sources."slash-3.0.0" + sources."to-regex-range-5.0.1" + ]; + }) + sources."@typescript-eslint/visitor-keys-4.26.0" sources."@ungap/from-entries-0.2.1" sources."accepts-1.3.7" sources."agent-base-6.0.2" @@ -94679,7 +94902,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.30001230" + sources."caniuse-lite-1.0.30001232" sources."cardinal-2.1.1" sources."caw-2.0.1" (sources."chalk-4.1.1" // { @@ -94771,7 +94994,7 @@ in sources."common-path-prefix-2.0.0" sources."commondir-1.0.1" sources."component-emitter-1.3.0" - sources."compress-commons-4.1.0" + sources."compress-commons-4.1.1" sources."concat-map-0.0.1" sources."concordance-5.0.4" sources."config-chain-1.1.12" @@ -94798,7 +95021,7 @@ in sources."safe-buffer-5.1.2" ]; }) - (sources."core-js-compat-3.13.0" // { + (sources."core-js-compat-3.13.1" // { dependencies = [ sources."semver-7.0.0" ]; @@ -94886,11 +95109,11 @@ in sources."detective-cjs-3.1.1" sources."detective-es6-2.2.0" sources."detective-less-1.0.2" - sources."detective-postcss-3.0.1" + sources."detective-postcss-4.0.0" sources."detective-sass-3.0.1" sources."detective-scss-2.0.1" sources."detective-stylus-1.0.0" - (sources."detective-typescript-5.8.0" // { + (sources."detective-typescript-7.0.0" // { dependencies = [ sources."typescript-3.9.9" ]; @@ -94923,7 +95146,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.741" + sources."electron-to-chromium-1.3.743" sources."elegant-spinner-1.0.1" sources."elf-cam-0.1.1" sources."emoji-regex-8.0.0" @@ -94944,7 +95167,7 @@ in sources."source-map-0.6.1" ]; }) - sources."eslint-visitor-keys-1.3.0" + sources."eslint-visitor-keys-2.1.0" sources."esprima-4.0.1" sources."estraverse-5.2.0" sources."estree-walker-1.0.1" @@ -94952,7 +95175,7 @@ in sources."etag-1.8.1" sources."eventemitter3-4.0.7" sources."events-1.1.1" - (sources."execa-5.0.0" // { + (sources."execa-5.0.1" // { dependencies = [ sources."get-stream-6.0.1" sources."human-signals-2.1.0" @@ -95071,7 +95294,7 @@ in sources."follow-redirects-1.14.1" sources."for-in-1.0.2" sources."form-data-3.0.1" - sources."forwarded-0.1.2" + sources."forwarded-0.2.0" sources."fragment-cache-0.2.1" sources."fresh-0.5.2" (sources."from2-2.3.0" // { @@ -95473,6 +95696,7 @@ in ]; }) sources."mute-stream-0.0.7" + sources."nanoid-3.1.23" sources."nanomatch-1.2.13" sources."natural-orderby-2.0.3" sources."negotiator-0.6.2" @@ -95661,22 +95885,9 @@ in ]; }) sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.35" // { - dependencies = [ - sources."ansi-styles-3.2.1" - (sources."chalk-2.4.2" // { - dependencies = [ - sources."supports-color-5.5.0" - ]; - }) - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."source-map-0.6.1" - sources."supports-color-6.1.0" - ]; - }) - sources."postcss-values-parser-1.5.0" - sources."precinct-6.3.1" + sources."postcss-8.3.0" + sources."postcss-values-parser-2.0.1" + sources."precinct-8.1.0" sources."precond-0.2.3" sources."prelude-ls-1.1.2" sources."prepend-http-2.0.0" @@ -95693,7 +95904,7 @@ in sources."process-es6-0.11.6" sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" - sources."proxy-addr-2.0.6" + sources."proxy-addr-2.0.7" sources."ps-list-6.3.0" sources."pump-3.0.0" sources."punycode-2.1.1" @@ -95764,7 +95975,7 @@ in sources."ret-0.1.15" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."rollup-2.50.3" + sources."rollup-2.50.5" (sources."rollup-plugin-inject-3.0.2" // { dependencies = [ sources."estree-walker-0.6.1" @@ -95859,6 +96070,7 @@ in }) sources."sort-keys-length-1.0.1" sources."source-map-0.5.7" + sources."source-map-js-0.6.2" sources."source-map-resolve-0.5.3" (sources."source-map-support-0.5.19" // { dependencies = [ @@ -96362,7 +96574,7 @@ in sources."find-up-1.1.2" sources."forever-agent-0.6.1" sources."form-data-2.1.4" - sources."forwarded-0.1.2" + sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."fs.realpath-1.0.0" sources."fstream-1.0.12" @@ -96464,7 +96676,7 @@ in sources."pinkie-promise-2.0.1" sources."plist-1.2.0" sources."process-nextick-args-2.0.1" - sources."proxy-addr-2.0.6" + sources."proxy-addr-2.0.7" sources."punycode-1.4.1" sources."qs-6.7.0" sources."range-parser-1.2.1" @@ -96845,7 +97057,7 @@ in sources."follow-redirects-1.14.1" sources."forever-agent-0.6.1" sources."form-data-2.3.3" - sources."forwarded-0.1.2" + sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."fs-extra-8.1.0" sources."fs-minipass-2.1.0" @@ -97036,7 +97248,7 @@ in sources."pause-0.0.1" sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" - sources."proxy-addr-2.0.6" + sources."proxy-addr-2.0.7" sources."pseudomap-1.0.2" sources."psl-1.8.0" sources."pump-3.0.0" @@ -97637,7 +97849,7 @@ in sources."error-ex-1.3.2" sources."escape-goat-3.0.0" sources."escape-string-regexp-4.0.0" - sources."execa-5.0.0" + sources."execa-5.0.1" sources."external-editor-3.1.0" sources."fast-glob-3.2.5" sources."fastq-1.11.0" @@ -98047,10 +98259,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "7.15.0"; + version = "7.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-7.15.0.tgz"; - sha512 = "GIXNqy3obii54oPF0gbcBNq4aYuB/Ovuu/uYp1eS4nij2PEDMnoOh6RoSv2MDvAaB4a+JbpX/tjDxLO7JAADgQ=="; + url = "https://registry.npmjs.org/npm/-/npm-7.15.1.tgz"; + sha512 = "sPk+GrqawshbG3T81r2QvvSxSQXBFWyn5NGLacf87l+/odi2ZRHkWdLrg304Lw0DrwwIIaGxUjp0FJXaMtIErQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -98065,10 +98277,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "11.5.13"; + version = "11.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-11.5.13.tgz"; - sha512 = "4R9MOr101RdTWYKZSbIbCFIXYegxt0Z7CYMNSYUzkLuusMcueMoH3E/dgfL3h4S9W/z4XboDNbP6jV9FJP/73A=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-11.6.0.tgz"; + sha512 = "/l4S7Gh+8+Rg5itWsqFya5RRSHtPzw5neyAlbWNJfBfEeRX6lYVxKgs85QFBOKrZj3eL5MGBaUW8228TmjMhrw=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.4" @@ -98893,7 +99105,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001230" + sources."caniuse-lite-1.0.30001232" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -98920,7 +99132,7 @@ in sources."convert-source-map-1.7.0" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.13.0" // { + (sources."core-js-compat-3.13.1" // { dependencies = [ sources."semver-7.0.0" ]; @@ -99031,7 +99243,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.741" + sources."electron-to-chromium-1.3.743" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -99751,7 +99963,7 @@ in sources."find-up-3.0.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" - sources."forwarded-0.1.2" + sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" @@ -99839,7 +100051,7 @@ in sources."process-nextick-args-2.0.1" sources."prom-client-11.5.3" sources."promise-8.1.0" - sources."proxy-addr-2.0.6" + sources."proxy-addr-2.0.7" sources."prr-1.0.1" sources."psl-1.8.0" sources."punycode-2.1.1" @@ -100445,7 +100657,7 @@ in sources."fluent-ffmpeg-2.1.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" - sources."forwarded-0.1.2" + sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."fs-chunk-store-1.7.0" sources."fs-constants-1.0.0" @@ -100564,7 +100776,7 @@ in sources."peer-wire-swarm-0.12.2" sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" - sources."proxy-addr-2.0.6" + sources."proxy-addr-2.0.7" sources."psl-1.8.0" sources."pump-3.0.0" sources."punycode-2.1.1" @@ -100918,10 +101130,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-6.6.1.tgz"; - sha512 = "viktTHmFzFckpvY/Gwtl8esjeOItpCgycIrVgLPh4qbxK4f+JqkEM+3LZF5dudyWzBZCOspZHePNuxeM0zn/Ew=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-6.6.2.tgz"; + sha512 = "w1YEyx+xiTbrxVt5OP6JG0LqwkK/hq2OkCYj7RZhK9oyv7cCEkgkX5Z5MPVC1wTCv2kQDJRoXzBeedPiIhzN8Q=="; }; buildInputs = globalBuildInputs; meta = { @@ -101470,10 +101682,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.144"; + version = "1.1.145"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.144.tgz"; - sha512 = "nzCTqxg7JPHy5FkyX4+meD4c7Zt/mgPBI+nFGS9HoN/3GVPHAlTcCKa1JPTEh7O/N5+8W/9WZUuUntBW2R3adg=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.145.tgz"; + sha512 = "eyrK9Ilut2shvqi/TFmpfUrm7U6DrkskMa8UPofkGJZCO1PJzVwzKaGWrR57zlbcAxs5PVvK9JGSIO9DJUVNyA=="; }; buildInputs = globalBuildInputs; meta = { @@ -102144,7 +102356,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001230" + sources."caniuse-lite-1.0.30001232" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caw-2.0.1" (sources."chalk-2.4.2" // { @@ -102229,7 +102441,7 @@ in sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.13.0" // { + (sources."core-js-compat-3.13.1" // { dependencies = [ sources."semver-7.0.0" ]; @@ -102369,7 +102581,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.741" + sources."electron-to-chromium-1.3.743" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -102505,7 +102717,7 @@ in sources."flush-write-stream-1.1.1" sources."follow-redirects-1.14.1" sources."for-in-1.0.2" - sources."forwarded-0.1.2" + sources."forwarded-0.2.0" sources."fragment-cache-0.2.1" sources."fresh-0.5.2" sources."from2-2.3.0" @@ -102766,8 +102978,12 @@ in ]; }) sources."mime-2.5.2" - sources."mime-db-1.47.0" - sources."mime-types-2.1.30" + sources."mime-db-1.48.0" + (sources."mime-types-2.1.30" // { + dependencies = [ + sources."mime-db-1.47.0" + ]; + }) sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" @@ -103043,7 +103259,7 @@ in sources."promise-inflight-1.0.1" sources."prop-types-15.7.2" sources."proto-list-1.2.4" - sources."proxy-addr-2.0.6" + sources."proxy-addr-2.0.7" sources."prr-1.0.1" sources."pseudomap-1.0.2" (sources."public-encrypt-4.0.3" // { @@ -103619,7 +103835,7 @@ in sources."@mozilla/readability-0.4.1" sources."@tootallnate/once-1.1.2" sources."abab-2.0.5" - sources."acorn-8.2.4" + sources."acorn-8.3.0" (sources."acorn-globals-6.0.0" // { dependencies = [ sources."acorn-7.4.1" @@ -103651,7 +103867,7 @@ in sources."webidl-conversions-5.0.0" ]; }) - sources."dompurify-2.2.8" + sources."dompurify-2.2.9" sources."emoji-regex-8.0.0" sources."escalade-3.1.1" sources."escodegen-2.0.0" @@ -103748,7 +103964,7 @@ in sources."@emotion/unitless-0.7.5" sources."@exodus/schemasafe-1.0.0-rc.3" sources."@redocly/ajv-6.12.4" - (sources."@redocly/openapi-core-1.0.0-beta.48" // { + (sources."@redocly/openapi-core-1.0.0-beta.49" // { dependencies = [ sources."@types/node-14.17.1" ]; @@ -103822,7 +104038,7 @@ in sources."concat-map-0.0.1" sources."console-browserify-1.2.0" sources."constants-browserify-1.0.0" - sources."core-js-3.13.0" + sources."core-js-3.13.1" sources."core-util-is-1.0.2" (sources."create-ecdh-4.0.4" // { dependencies = [ @@ -103845,7 +104061,7 @@ in ]; }) sources."domain-browser-1.2.0" - sources."dompurify-2.2.8" + sources."dompurify-2.2.9" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -103936,16 +104152,16 @@ in sources."node-readfiles-0.2.0" sources."normalize-path-3.0.0" sources."oas-kit-common-1.0.8" - sources."oas-linter-3.2.1" - (sources."oas-resolver-2.5.4" // { + sources."oas-linter-3.2.2" + (sources."oas-resolver-2.5.5" // { dependencies = [ - sources."yargs-16.2.0" + sources."yargs-17.0.1" ]; }) sources."oas-schema-walker-1.1.5" sources."oas-validator-4.0.8" sources."object-assign-4.1.1" - sources."openapi-sampler-1.0.0" + sources."openapi-sampler-1.0.1" sources."os-browserify-0.3.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" @@ -103957,7 +104173,7 @@ in sources."pbkdf2-3.1.2" sources."perfect-scrollbar-1.5.1" sources."picomatch-2.3.0" - sources."polished-3.7.1" + sources."polished-3.7.2" sources."postcss-value-parser-4.1.0" sources."prismjs-1.23.0" sources."process-0.11.10" @@ -104272,10 +104488,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.50.3"; + version = "2.50.5"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.50.3.tgz"; - sha512 = "58KiHnaCzZn6F5yRMjHe7WTZuFj6r4iJVJz5UwvKD6f/xfTy2IdtbR2AVHN6cyfK1tBy//hJ66ebXy6Y1h7HlQ=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.50.5.tgz"; + sha512 = "Ztz4NurU2LbS3Jn5rlhnYv35z6pkjBUmYKr94fOBIKINKRO6kug9NTFHArT7jqwMP2kqEZ39jJuEtkk91NBltQ=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -104330,13 +104546,13 @@ in sources."@types/node-fetch-2.5.10" sources."@types/resolve-1.17.1" sources."@types/vscode-1.56.0" - sources."@typescript-eslint/eslint-plugin-4.25.0" - sources."@typescript-eslint/experimental-utils-4.25.0" - sources."@typescript-eslint/parser-4.25.0" - sources."@typescript-eslint/scope-manager-4.25.0" - sources."@typescript-eslint/types-4.25.0" - sources."@typescript-eslint/typescript-estree-4.25.0" - sources."@typescript-eslint/visitor-keys-4.25.0" + sources."@typescript-eslint/eslint-plugin-4.26.0" + sources."@typescript-eslint/experimental-utils-4.26.0" + sources."@typescript-eslint/parser-4.26.0" + sources."@typescript-eslint/scope-manager-4.26.0" + sources."@typescript-eslint/types-4.26.0" + sources."@typescript-eslint/typescript-estree-4.26.0" + sources."@typescript-eslint/visitor-keys-4.26.0" sources."@ungap/promise-all-settled-1.1.2" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" @@ -104420,15 +104636,16 @@ in sources."escape-string-regexp-4.0.0" (sources."eslint-7.27.0" // { dependencies = [ + (sources."eslint-utils-2.1.0" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) sources."ignore-4.0.6" ]; }) sources."eslint-scope-5.1.1" - (sources."eslint-utils-2.1.0" // { - dependencies = [ - sources."eslint-visitor-keys-1.3.0" - ]; - }) + sources."eslint-utils-3.0.0" sources."eslint-visitor-keys-2.1.0" (sources."espree-7.3.1" // { dependencies = [ @@ -104603,7 +104820,7 @@ in sources."resolve-from-4.0.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."rollup-2.50.3" + sources."rollup-2.50.5" sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."semver-7.3.5" @@ -104661,7 +104878,7 @@ in sources."url-join-1.1.0" sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.3.0" - (sources."vsce-1.88.0" // { + (sources."vsce-1.91.0" // { dependencies = [ sources."chalk-2.4.2" sources."commander-6.2.1" @@ -105100,7 +105317,7 @@ in sources."@tencent-sdk/cls-0.2.1" (sources."@tencent-sdk/common-0.1.0" // { dependencies = [ - sources."type-fest-1.1.3" + sources."type-fest-1.2.0" ]; }) sources."@tencent-sdk/faas-0.1.5" @@ -105279,7 +105496,7 @@ in sources."component-bind-1.0.0" sources."component-emitter-1.3.0" sources."component-inherit-0.0.3" - sources."compress-commons-4.1.0" + sources."compress-commons-4.1.1" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" (sources."content-disposition-0.5.3" // { @@ -105974,7 +106191,7 @@ in sources."finalhandler-1.1.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" - sources."forwarded-0.1.2" + sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."from-0.1.7" sources."getpass-0.1.7" @@ -106036,7 +106253,7 @@ in sources."path-to-regexp-0.1.7" sources."pause-stream-0.0.11" sources."performance-now-2.1.0" - sources."proxy-addr-2.0.6" + sources."proxy-addr-2.0.7" sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.7.0" @@ -106518,10 +106735,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.618.0"; + version = "1.619.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.618.0.tgz"; - sha512 = "N4pTbZQgoZYsammFO65c8SPdmH0bxd3iP0cV6xWsbNeueLqjAJ9pKkT3+tYcIi97HmkXo6Zf1RAliH/Kge/akA=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.619.0.tgz"; + sha512 = "ZQFDU+WniTjD6Z1vqKQcBq50jJ9DWSBBCg0PNW54MZbK5oO+L2rHtbpaD3NI3lQI+AFCe64kdzkWMgsEemkFHQ=="; }; dependencies = [ sources."@arcanis/slice-ansi-1.0.2" @@ -106676,7 +106893,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."binjumper-0.1.4" sources."bl-4.1.0" - sources."boolean-3.0.4" + sources."boolean-3.1.0" sources."bottleneck-2.19.5" (sources."boxen-5.0.1" // { dependencies = [ @@ -106727,7 +106944,7 @@ in sources."color-name-1.1.4" sources."concat-map-0.0.1" sources."configstore-5.0.1" - sources."core-js-3.13.0" + sources."core-js-3.13.1" sources."core-util-is-1.0.2" (sources."cross-spawn-6.0.5" // { dependencies = [ @@ -108693,7 +108910,7 @@ in }) (sources."express-4.17.1" // { dependencies = [ - sources."proxy-addr-2.0.6" + sources."proxy-addr-2.0.7" sources."qs-6.7.0" ]; }) @@ -108716,7 +108933,7 @@ in sources."forever-agent-0.6.1" sources."form-data-2.1.4" sources."formidable-1.2.2" - sources."forwarded-0.1.2" + sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" @@ -108962,6 +109179,7 @@ in sources."protobufjs-3.8.2" (sources."proxy-addr-1.1.5" // { dependencies = [ + sources."forwarded-0.1.2" sources."ipaddr.js-1.4.0" ]; }) @@ -109359,7 +109577,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001230" + sources."caniuse-lite-1.0.30001232" (sources."chalk-4.1.1" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -109397,7 +109615,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.741" + sources."electron-to-chromium-1.3.743" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -110963,7 +111181,7 @@ in sources."@types/normalize-package-data-2.4.0" sources."@types/parse5-5.0.3" sources."@types/unist-2.0.3" - sources."acorn-8.2.4" + sources."acorn-8.3.0" sources."acorn-jsx-5.3.1" sources."alex-9.1.0" (sources."ansi-align-3.0.0" // { @@ -111846,7 +112064,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.13.0" + sources."core-js-3.13.1" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -111913,7 +112131,7 @@ in sources."finalhandler-1.1.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" - sources."forwarded-0.1.2" + sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" @@ -112075,7 +112293,7 @@ in sources."precond-0.2.3" sources."prepend-http-2.0.0" sources."process-nextick-args-2.0.1" - sources."proxy-addr-2.0.6" + sources."proxy-addr-2.0.7" sources."psl-1.8.0" sources."pump-3.0.0" sources."punycode-2.1.1" @@ -112822,7 +113040,7 @@ in sources."fecha-4.2.1" sources."finalhandler-1.1.2" sources."fn.name-1.1.0" - sources."forwarded-0.1.2" + sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."fs.realpath-1.0.0" sources."get-caller-file-2.0.5" @@ -112911,7 +113129,7 @@ in sources."pause-0.0.1" sources."prepend-http-2.0.0" sources."process-nextick-args-2.0.1" - sources."proxy-addr-2.0.6" + sources."proxy-addr-2.0.7" sources."pseudomap-1.0.2" sources."pump-3.0.0" sources."qs-6.7.0" @@ -113308,7 +113526,7 @@ in sources."enquirer-2.3.6" sources."escape-string-regexp-4.0.0" sources."eslint-7.27.0" - sources."eslint-plugin-vue-7.9.0" + sources."eslint-plugin-vue-7.10.0" sources."eslint-scope-5.1.1" (sources."eslint-utils-2.1.0" // { dependencies = [ @@ -114344,7 +114562,7 @@ in sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.3.0" sources."vm-browserify-1.1.2" - sources."vsce-1.88.0" + sources."vsce-1.91.0" sources."vscode-debugadapter-testsupport-1.47.0" sources."vscode-debugprotocol-1.47.0" (sources."watchpack-1.7.5" // { @@ -115646,6 +115864,245 @@ in bypassCache = true; reconstructLock = true; }; + wavedrom-cli = nodeEnv.buildNodePackage { + name = "wavedrom-cli"; + packageName = "wavedrom-cli"; + version = "2.6.8"; + src = fetchurl { + url = "https://registry.npmjs.org/wavedrom-cli/-/wavedrom-cli-2.6.8.tgz"; + sha512 = "uhSNGU27KDT2e2v51l/NqMc59O7X0DG7CHonZOwsnvMHLvyudCLZgXCU8Rw4T8gpqg2asn50vfPHq7l3DGlN5w=="; + }; + dependencies = [ + sources."@babel/runtime-corejs3-7.14.0" + sources."@mapbox/node-pre-gyp-1.0.5" + sources."@tootallnate/once-1.1.2" + sources."@types/raf-3.4.0" + sources."abab-2.0.5" + sources."abbrev-1.1.1" + sources."acorn-8.3.0" + (sources."acorn-globals-6.0.0" // { + dependencies = [ + sources."acorn-7.4.1" + ]; + }) + sources."acorn-walk-7.2.0" + sources."agent-base-6.0.2" + sources."ansi-regex-2.1.1" + sources."ansi-styles-4.3.0" + sources."aproba-1.2.0" + sources."are-we-there-yet-1.1.5" + sources."asynckit-0.4.0" + sources."at-least-node-1.0.0" + sources."atob-2.1.2" + sources."balanced-match-1.0.2" + (sources."bit-field-1.3.6" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."fs-extra-8.1.0" + sources."is-fullwidth-code-point-3.0.0" + sources."jsonfile-4.0.0" + sources."onml-1.3.0" + sources."string-width-4.2.2" + sources."strip-ansi-6.0.0" + sources."universalify-0.1.2" + sources."yargs-15.4.1" + ]; + }) + sources."brace-expansion-1.1.11" + sources."browser-process-hrtime-1.0.0" + sources."btoa-1.2.1" + sources."camelcase-5.3.1" + sources."canvas-2.8.0" + sources."canvg-3.0.7" + sources."chownr-2.0.0" + (sources."cliui-6.0.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.2" + sources."strip-ansi-6.0.0" + ]; + }) + sources."code-point-at-1.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."combined-stream-1.0.8" + sources."concat-map-0.0.1" + sources."console-control-strings-1.1.0" + sources."core-js-pure-3.13.1" + sources."core-util-is-1.0.2" + sources."cssom-0.4.4" + (sources."cssstyle-2.3.0" // { + dependencies = [ + sources."cssom-0.3.8" + ]; + }) + sources."data-urls-2.0.0" + sources."debug-4.3.2" + sources."decamelize-1.2.0" + sources."decimal.js-10.2.1" + sources."decompress-response-4.2.1" + sources."deep-is-0.1.3" + sources."delayed-stream-1.0.0" + sources."delegates-1.0.0" + sources."detect-libc-1.0.3" + (sources."domexception-2.0.1" // { + dependencies = [ + sources."webidl-conversions-5.0.0" + ]; + }) + sources."emoji-regex-8.0.0" + sources."escalade-3.1.1" + sources."escodegen-2.0.0" + sources."esprima-4.0.1" + sources."estraverse-5.2.0" + sources."esutils-2.0.3" + sources."fast-levenshtein-2.0.6" + sources."find-up-4.1.0" + sources."form-data-3.0.1" + sources."fs-extra-9.1.0" + sources."fs-minipass-2.1.0" + sources."fs.realpath-1.0.0" + sources."gauge-2.7.4" + sources."get-caller-file-2.0.5" + sources."glob-7.1.7" + sources."graceful-fs-4.2.6" + sources."has-unicode-2.0.1" + sources."html-encoding-sniffer-2.0.1" + sources."http-proxy-agent-4.0.1" + sources."https-proxy-agent-5.0.0" + sources."iconv-lite-0.4.24" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."is-fullwidth-code-point-1.0.0" + sources."is-potential-custom-element-name-1.0.1" + sources."isarray-1.0.0" + sources."jsdom-16.6.0" + sources."json5-2.2.0" + sources."jsonfile-6.1.0" + sources."levn-0.3.0" + sources."locate-path-5.0.0" + sources."lodash-4.17.21" + sources."logidrom-0.3.1" + sources."lru-cache-6.0.0" + (sources."make-dir-3.1.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."mime-db-1.47.0" + sources."mime-types-2.1.30" + sources."mimic-response-2.1.0" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + sources."minipass-3.1.3" + sources."minizlib-2.1.2" + sources."mkdirp-1.0.4" + sources."ms-2.1.2" + sources."nan-2.14.2" + sources."node-fetch-2.6.1" + sources."nopt-5.0.0" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" + sources."nwsapi-2.2.0" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."onml-2.1.0" + sources."optionator-0.8.3" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-try-2.2.0" + sources."parse5-6.0.1" + sources."path-exists-4.0.0" + sources."path-is-absolute-1.0.1" + sources."performance-now-2.1.0" + sources."prelude-ls-1.1.2" + sources."process-nextick-args-2.0.1" + sources."psl-1.8.0" + sources."punycode-2.1.1" + sources."raf-3.4.1" + sources."readable-stream-2.3.7" + sources."regenerator-runtime-0.13.8" + sources."require-directory-2.1.1" + sources."require-main-filename-2.0.0" + sources."rgbcolor-1.0.1" + sources."rimraf-3.0.2" + sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" + sources."sax-1.2.4" + sources."saxes-5.0.1" + sources."semver-7.3.5" + sources."set-blocking-2.0.0" + sources."signal-exit-3.0.3" + sources."simple-concat-1.0.1" + sources."simple-get-3.1.0" + sources."source-map-0.6.1" + sources."stackblur-canvas-2.5.0" + sources."string-width-1.0.2" + sources."string_decoder-1.1.1" + sources."strip-ansi-3.0.1" + sources."svg-pathdata-5.0.5" + sources."svg2img-0.9.2" + sources."symbol-tree-3.2.4" + sources."tar-6.1.0" + (sources."tough-cookie-4.0.0" // { + dependencies = [ + sources."universalify-0.1.2" + ]; + }) + sources."tr46-2.1.0" + sources."tspan-0.4.0" + sources."type-check-0.3.2" + sources."universalify-2.0.0" + sources."util-deprecate-1.0.2" + sources."w3c-hr-time-1.0.2" + sources."w3c-xmlserializer-2.0.0" + sources."wavedrom-2.6.9" + sources."webidl-conversions-6.1.0" + sources."whatwg-encoding-1.0.5" + sources."whatwg-mimetype-2.3.0" + sources."whatwg-url-8.5.0" + sources."which-module-2.0.0" + sources."wide-align-1.1.3" + sources."word-wrap-1.2.3" + (sources."wrap-ansi-6.2.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.2" + sources."strip-ansi-6.0.0" + ]; + }) + sources."wrappy-1.0.2" + sources."ws-7.4.6" + sources."xml-name-validator-3.0.0" + sources."xmlchars-2.2.0" + sources."y18n-4.0.3" + sources."yallist-4.0.0" + (sources."yargs-16.2.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."cliui-7.0.4" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.2" + sources."strip-ansi-6.0.0" + sources."wrap-ansi-7.0.0" + sources."y18n-5.0.8" + sources."yargs-parser-20.2.7" + ]; + }) + sources."yargs-parser-18.1.3" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "WaveDrom command-line interface (CLI)"; + homepage = "https://github.com/wavedrom/cli#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; web-ext = nodeEnv.buildNodePackage { name = "web-ext"; packageName = "web-ext"; @@ -116268,16 +116725,16 @@ in sources."@webassemblyjs/wast-printer-1.11.0" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.2.4" + sources."acorn-8.3.0" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" sources."browserslist-4.16.6" sources."buffer-from-1.1.1" - sources."caniuse-lite-1.0.30001230" + sources."caniuse-lite-1.0.30001232" sources."chrome-trace-event-1.0.3" sources."colorette-1.2.2" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.741" + sources."electron-to-chromium-1.3.743" sources."enhanced-resolve-5.8.2" sources."es-module-lexer-0.4.1" sources."escalade-3.1.1" @@ -116294,7 +116751,7 @@ in sources."glob-to-regexp-0.4.1" sources."graceful-fs-4.2.6" sources."has-flag-4.0.0" - sources."jest-worker-26.6.2" + sources."jest-worker-27.0.2" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" sources."loader-runner-4.2.0" @@ -116312,14 +116769,14 @@ in sources."source-list-map-2.0.1" sources."source-map-0.6.1" sources."source-map-support-0.5.19" - sources."supports-color-7.2.0" + sources."supports-color-8.1.1" sources."tapable-2.2.0" (sources."terser-5.7.0" // { dependencies = [ sources."source-map-0.7.3" ]; }) - sources."terser-webpack-plugin-5.1.2" + sources."terser-webpack-plugin-5.1.3" sources."uri-js-4.4.1" sources."watchpack-2.2.0" sources."webpack-sources-2.3.0" @@ -116353,7 +116810,7 @@ in sources."commander-7.2.0" sources."cross-spawn-7.0.3" sources."envinfo-7.8.1" - sources."execa-5.0.0" + sources."execa-5.0.1" sources."fastest-levenshtein-1.0.12" sources."find-up-4.1.0" sources."function-bind-1.1.1" @@ -116602,7 +117059,7 @@ in sources."find-up-3.0.0" sources."follow-redirects-1.14.1" sources."for-in-1.0.2" - sources."forwarded-0.1.2" + sources."forwarded-0.2.0" sources."fragment-cache-0.2.1" sources."fresh-0.5.2" sources."fs.realpath-1.0.0" @@ -116763,7 +117220,7 @@ in }) sources."posix-character-classes-0.1.1" sources."process-nextick-args-2.0.1" - sources."proxy-addr-2.0.6" + sources."proxy-addr-2.0.7" sources."prr-1.0.1" sources."pump-3.0.0" sources."punycode-2.1.1" @@ -117051,10 +117508,10 @@ in webtorrent-cli = nodeEnv.buildNodePackage { name = "webtorrent-cli"; packageName = "webtorrent-cli"; - version = "3.2.1"; + version = "3.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-3.2.1.tgz"; - sha512 = "DHUtDymD5ZGv/h35FY4n9YdlHoNOy07X7ibexi+19AL/+MFdGuIIQEEnJQT/wA05mrzR6ubeJmcLXXqZISwLFQ=="; + url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-3.2.4.tgz"; + sha512 = "fobRASGOskIqf/ciwZ3TF14RhqWga6dR8kUD6a2E0L2YAY5n1PIJv1dVPXEwvfKHBFWDo5VwIH2OAzt/Tw2poQ=="; }; dependencies = [ sources."@protobufjs/aspromise-1.1.2" @@ -117150,6 +117607,7 @@ in sources."create-torrent-4.7.0" sources."debug-2.6.9" sources."decompress-response-3.3.0" + sources."define-lazy-prop-2.0.0" (sources."dlnacasts-0.1.0" // { dependencies = [ sources."mime-1.6.0" @@ -117173,7 +117631,7 @@ in }) sources."fs.realpath-1.0.0" sources."get-browser-rtc-1.1.0" - sources."get-stdin-7.0.0" + sources."get-stdin-8.0.0" sources."glob-7.1.7" sources."he-1.2.0" sources."http-node-git://github.com/feross/http-node#webtorrent" @@ -117211,7 +117669,7 @@ in sources."ms-2.1.2" ]; }) - sources."magnet-uri-5.4.0" + sources."magnet-uri-6.2.0" sources."mdns-js-0.5.0" sources."mdns-js-packet-0.2.0" sources."mediasource-2.4.0" @@ -117240,13 +117698,13 @@ in sources."nodebmc-0.0.7" sources."on-finished-2.3.0" sources."once-1.4.0" - sources."open-7.4.2" + sources."open-8.2.0" sources."package-json-versionify-1.0.4" - (sources."parse-torrent-7.1.3" // { + (sources."parse-torrent-9.1.3" // { dependencies = [ - sources."decompress-response-4.2.1" - sources."mimic-response-2.1.0" - sources."simple-get-3.1.0" + sources."decompress-response-6.0.0" + sources."mimic-response-3.1.0" + sources."simple-get-4.0.0" ]; }) sources."path-is-absolute-1.0.1" @@ -117347,11 +117805,8 @@ in dependencies = [ sources."debug-4.3.2" sources."decompress-response-6.0.0" - sources."get-stdin-8.0.0" - sources."magnet-uri-6.2.0" sources."mimic-response-3.1.0" sources."ms-2.1.2" - sources."parse-torrent-9.1.3" sources."simple-get-4.0.0" ]; }) @@ -117592,7 +118047,7 @@ in sources."readable-stream-3.6.0" ]; }) - sources."boolean-3.0.4" + sources."boolean-3.1.0" (sources."boxen-1.3.0" // { dependencies = [ sources."camelcase-4.1.0" @@ -117650,7 +118105,7 @@ in sources."config-chain-1.1.12" sources."configstore-3.1.5" sources."console-control-strings-1.1.0" - sources."core-js-3.13.0" + sources."core-js-3.13.1" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" sources."cross-spawn-6.0.5" @@ -118345,7 +118800,7 @@ in sources."cross-spawn-7.0.3" sources."debug-4.3.2" sources."escape-string-regexp-4.0.0" - sources."execa-5.0.0" + sources."execa-5.0.1" (sources."figures-3.2.0" // { dependencies = [ sources."escape-string-regexp-1.0.5" From 30a285bf88d913e00d91474cdad2c3a42195e130 Mon Sep 17 00:00:00 2001 From: GTrunSec Date: Tue, 1 Jun 2021 19:45:13 -0700 Subject: [PATCH 37/83] polar-bookshelf: 2.0.43 -> 2.0.103 --- .../misc/polar-bookshelf/default.nix | 62 +++++++++++++++---- 1 file changed, 51 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/polar-bookshelf/default.nix b/pkgs/applications/misc/polar-bookshelf/default.nix index faa139a3da4e..03a83c1179b8 100644 --- a/pkgs/applications/misc/polar-bookshelf/default.nix +++ b/pkgs/applications/misc/polar-bookshelf/default.nix @@ -1,24 +1,60 @@ -{ stdenv, lib, makeWrapper, fetchurl -, dpkg, wrapGAppsHook, autoPatchelfHook -, gtk3, cairo, pango, atk, gdk-pixbuf, glib -, at-spi2-atk, dbus, libX11, libxcb, libXi -, libXcursor, libXdamage, libXrandr, libXcomposite -, libXext, libXfixes, libXrender, libXtst, libXScrnSaver -, nss, nspr, alsaLib, cups, fontconfig, expat -, libudev0-shim, glibc, curl, openssl, libnghttp2, gsettings-desktop-schemas }: +{ stdenv +, lib +, makeWrapper +, fetchurl +, dpkg +, wrapGAppsHook +, autoPatchelfHook +, gtk3 +, cairo +, pango +, atk +, gdk-pixbuf +, glib +, at-spi2-atk +, dbus +, libX11 +, libxcb +, libXi +, libXcursor +, libXdamage +, libXrandr +, libXcomposite +, libXext +, libXfixes +, libXrender +, libXtst +, libXScrnSaver +, nss +, nspr +, alsaLib +, cups +, fontconfig +, expat +, libudev0-shim +, glibc +, curl +, openssl +, libnghttp2 +, gsettings-desktop-schemas +, libdrm +, mesa +}: stdenv.mkDerivation rec { pname = "polar-bookshelf"; - version = "2.0.42"; + version = "2.0.103"; # fetching a .deb because there's no easy way to package this Electron app src = fetchurl { url = "https://github.com/burtonator/polar-bookshelf/releases/download/v${version}/polar-desktop-app-${version}-amd64.deb"; - hash = "sha256-JyO71wyE6b0iHAYs/6/WbG+OdUVUUPpJla+ZUzg0Gng="; + hash = "sha256-jcq0hW698bAhVM3fLQQeKAnld33XLkHsGjS3QwUpciQ="; }; buildInputs = [ + libdrm + mesa gsettings-desktop-schemas glib gtk3 @@ -60,6 +96,8 @@ stdenv.mkDerivation rec { unpackPhase = "dpkg-deb -x $src ."; installPhase = '' + runHook preInstall + mkdir -p $out/share/polar-bookshelf mkdir -p $out/bin mkdir -p $out/lib @@ -73,6 +111,8 @@ stdenv.mkDerivation rec { substituteInPlace $out/share/applications/polar-desktop-app.desktop \ --replace "/opt/Polar/polar-desktop-app" "$out/bin/polar-desktop-app" + + runHook postInstall ''; preFixup = '' @@ -82,7 +122,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://getpolarized.io/"; description = "Personal knowledge repository for PDF and web content supporting incremental reading and document annotation"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.noneucat ]; }; From 5c747647aace0d81803d5e10bdf628ad799ed810 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Thu, 20 May 2021 00:48:19 +0800 Subject: [PATCH 38/83] tiramisu: 1.0 -> unstable-2021-05-20 --- pkgs/applications/misc/tiramisu/default.nix | 22 +++++++++------------ 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/misc/tiramisu/default.nix b/pkgs/applications/misc/tiramisu/default.nix index 79286ff10c3c..f3743d33c364 100644 --- a/pkgs/applications/misc/tiramisu/default.nix +++ b/pkgs/applications/misc/tiramisu/default.nix @@ -1,20 +1,16 @@ { lib, stdenv, fetchFromGitHub, pkg-config, glib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "tiramisu"; - version = "1.0"; + version = "unstable-2021-05-20"; src = fetchFromGitHub { owner = "Sweets"; - repo = pname; - rev = version; - sha256 = "0aw17riwgrhsmcndzh7sw2zw8xvn3d203c2gcrqi9nk5pa7fwp9m"; + repo = "tiramisu"; + rev = "e53833d0b5b0ae41ceb7dc434d8e25818fe62291"; + sha256 = "sha256-F4oaTOAQQfOkEXeBVbGH+0CHc9v9Ac08GyzHliOdAfc="; }; - postPatch = '' - sed -i 's/printf(element_delimiter)/printf("%s", element_delimiter)/' src/output.c - ''; - buildInputs = [ glib ]; nativeBuildInputs = [ pkg-config ]; @@ -24,13 +20,13 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Desktop notifications, the UNIX way"; longDescription = '' - tiramisu is a notification daemon based on dunst that outputs notifications - to STDOUT in order to allow the user to process notifications any way they - prefer. + tiramisu is a notification daemon based on dunst that outputs notifications + to STDOUT in order to allow the user to process notifications any way they + prefer. ''; homepage = "https://github.com/Sweets/tiramisu"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ wishfort36 ]; + maintainers = with maintainers; [ wishfort36 fortuneteller2k ]; }; } From 0a28b66a2ce4bd4fe0ae6dfc7ddb780af9e9d8ba Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 2 Jun 2021 11:21:00 +0200 Subject: [PATCH 39/83] python3Packages.archinfo: 9.0.7491 -> 9.0.7833 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 47d3374bae81..ba678975fea6 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.0.7491"; + version = "9.0.7833"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5mKXpvMhdcIKgvQkmj//YigvsgozZofvv6CvMdW3BHo="; + sha256 = "sha256-wieg38cHxliHU7esoSOl5ViiS/uR5yVJh9l3SEsb3mo="; }; checkInputs = [ From 9715dd530ad045a3514a5c23f87f83e0e51a35ba Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 2 Jun 2021 11:21:03 +0200 Subject: [PATCH 40/83] python3Packages.ailment: 9.0.7491 -> 9.0.7833 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index fcc51360d0e4..de1a749bc32b 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.0.7491"; + version = "9.0.7833"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rxrj+5cz6zNsc+zgrOp8+/XY/RZG93PJQU59mMy5lDA="; + sha256 = "sha256-GUy1wETKV9Y9RYwJZqV22a0GrWkVRJRuFv/ADzPCzPg="; }; propagatedBuildInputs = [ pyvex ]; From ec6ae854831c00f4ca87d4f012dc900ebc742aaa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 2 Jun 2021 11:21:05 +0200 Subject: [PATCH 41/83] python3Packages.pyvex: 9.0.7491 -> 9.0.7833 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index c4eee2a482d5..fa757a39dda1 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.0.7491"; + version = "9.0.7833"; src = fetchPypi { inherit pname version; - sha256 = "sha256-tKfOkW1mLa4gCweF5bGVwnS7E+dRdc/PiuOfT7AgKNo="; + sha256 = "sha256-vasPukhDpvTNEvSy3A2H4ZkFMpLSoHB6+uuimYH1VT4="; }; postPatch = lib.optionalString stdenv.isDarwin '' From f729c073044faf893f64110850bc5dc63dec56d5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 2 Jun 2021 11:21:08 +0200 Subject: [PATCH 42/83] python3Packages.claripy: 9.0.7491 -> 9.0.7833 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 6a301a780636..4866d302815b 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.0.7491"; + version = "9.0.7833"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-M6Irec8p4l2WNrVeqUob3m2xF3JMtdp7I+LSi0iArZk="; + sha256 = "sha256-C+YjpnMpz96v9QUkcdlhGl83V4UHnWAKZV2eR+vZX3c="; }; # Use upstream z3 implementation From edab1face168fa626f8018988c07bbc3480c18ae Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 2 Jun 2021 11:21:11 +0200 Subject: [PATCH 43/83] python3Packages.cle: 9.0.7491 -> 9.0.7833 --- pkgs/development/python-modules/cle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 30193032ff49..cb9daa66b0d5 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.0.7491"; + version = "9.0.7833"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-P126IcUpq7b8u74YJFBXluGIIru+UOCnmHYmJBiK9Pc="; + sha256 = "sha256-P8bz50OgJifGWbWRyGXEB3FRfJHG1m9RgMatKA/XQLc="; }; propagatedBuildInputs = [ From 36d3e10d1a765436a7076e9f97f36bf88aacac59 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 2 Jun 2021 11:21:14 +0200 Subject: [PATCH 44/83] python3Packages.angr: 9.0.7491 -> 9.0.7833 --- pkgs/development/python-modules/angr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 0c7c68a55182..fd3bb30d20ac 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -42,14 +42,14 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.0.7491"; + version = "9.0.7833"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-d0EWPko3jWCexFNCWbofD6CjDIpjKb5mha2tRgtzL4M="; + sha256 = "sha256-1D1FhRhFHpQSQnMAPmp78TRIx9T5LL5MIdaYV/hPCv0="; }; propagatedBuildInputs = [ From 251ee3d7cbb4f25dec994134d8e2972e38bc138c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 2 Jun 2021 11:21:16 +0200 Subject: [PATCH 45/83] python3Packages.angrop: 9.0.7491 -> 9.0.7833 --- pkgs/development/python-modules/angrop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index b9774b929549..0af812d49321 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.0.7491"; + version = "9.0.7833"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UWqHNgJ8vUbLK3n9tvwOgHyOyTXsqRJKaAPWQfqi3lo="; + sha256 = "sha256-JhD4/P5/IhmLBvmG3XoIEYVkowK+dDoLuwOdMhGi5q8="; }; propagatedBuildInputs = [ From 8a0f3cd58b84488dff1e5936da188f5bb98c6e15 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Wed, 2 Jun 2021 12:41:13 +0300 Subject: [PATCH 46/83] =?UTF-8?q?cudatext:=201.131.0=20=E2=86=92=201.133.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../applications/editors/cudatext/default.nix | 4 ++-- pkgs/applications/editors/cudatext/deps.json | 24 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index cdf327441482..f6e6283338d3 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.131.0"; + version = "1.133.5"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - sha256 = "1zq17yi5zn4hdgrrn3c3cdk6s38fv36r66dl0dqz2z8jjd6vy4p3"; + sha256 = "sha256-0QWYitlOS3x7BQpFTYDAjIgkw83IkRFfA/slyEvQUnw="; }; postPatch = '' diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index 05490b9d6fc4..7866f2dd2725 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -11,33 +11,33 @@ }, "ATFlatControls": { "owner": "Alexey-T", - "rev": "2021.04.01", - "sha256": "12sncivsv6pvwflzzy12rpn1fjiq64n2n3bcj7630xxlrbygkhxb" + "rev": "2021.05.16", + "sha256": "sha256-oQW0M8Sx1bC+keOWivXwlD5SDKJuO5Sk/3HiO9HvJtY=" }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2021.04.09", - "sha256": "1ldr2z88zywn0ccgs17vfhq55ibihjcmfjjxcqsjifrbm0y6wipp" + "rev": "2021.05.31", + "sha256": "sha256-4B6/I0CH9gfslwUbCTTI4kycgTHUjLGtVrCctfO6gRo=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", - "rev": "2021.04.01", - "sha256": "1g6zp9d7vwjisad3y1mfnk1jcbjqxp3yimm0sh1655al6qwn886m" + "rev": "2021.05.03", + "sha256": "sha256-zns83XA2SslHRGqa3iro0phIBlz5/neJ34TTYAKhX5Q=" }, "EControl": { "owner": "Alexey-T", - "rev": "2021.03.16", - "sha256": "159s1rpl829bmaa4bllqhjm8z0vji1ncsd6hw2s8z8hz28n905k8" + "rev": "2021.05.27", + "sha256": "sha256-D0UBK69V28Izs9FgevtvX6vyDU7KpfIGJqcqpWaxU9E=" }, "ATSynEdit_Ex": { "owner": "Alexey-T", - "rev": "2021.04.01", - "sha256": "1hq9hbv81mcymjcms97wcwcfqfpxis6h6v5m0syyih4r53khv0az" + "rev": "2021.05.27", + "sha256": "sha256-1zhSB6bgeW5G6RAZvhznNTpRk0uEDZnLXsk+cgElKLw=" }, "Python-for-Lazarus": { "owner": "Alexey-T", - "rev": "2021.02.18", - "sha256": "0fy6bmpdcl2aa8pb7zban6midkfwdj99x14hdghrv7cp8l4gcsg5" + "rev": "2021.04.16", + "sha256": "sha256-HN3Lr3uDCyNk+8+J09ivyC0LZxQ6x6SaUH4swZJBFkM=" }, "Emmet-Pascal": { "owner": "Alexey-T", From e946a376db6d13ffaf5db37676b12ba7ac2082c8 Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Wed, 2 Jun 2021 09:51:09 +0200 Subject: [PATCH 47/83] onionshare: 2.3.1 -> 2.3.2 --- pkgs/applications/networking/onionshare/default.nix | 6 ++++-- .../applications/networking/onionshare/fix-paths-gui.patch | 5 ++--- pkgs/applications/networking/onionshare/fix-paths.patch | 7 ++++--- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/onionshare/default.nix b/pkgs/applications/networking/onionshare/default.nix index 124ee9a20ead..529b871d20c8 100644 --- a/pkgs/applications/networking/onionshare/default.nix +++ b/pkgs/applications/networking/onionshare/default.nix @@ -4,6 +4,7 @@ substituteAll, fetchFromGitHub, isPy3k, + colorama, flask, flask-httpauth, flask-socketio, @@ -22,12 +23,12 @@ }: let - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "micahflee"; repo = "onionshare"; rev = "v${version}"; - sha256 = "sha256-H09x3OF6l1HLHukGPvV2rZUjW9fxeKKMZkKbY9a2m9I="; + sha256 = "sha256-mzLDvvpO82iGDnzY42wx1KCNmAxUgVhpaDVprtb+YOI="; }; meta = with lib; { description = "Securely and anonymously send and receive files"; @@ -69,6 +70,7 @@ in rec { ]; disable = !isPy3k; propagatedBuildInputs = [ + colorama flask flask-httpauth flask-socketio diff --git a/pkgs/applications/networking/onionshare/fix-paths-gui.patch b/pkgs/applications/networking/onionshare/fix-paths-gui.patch index cdc2e3d47dd8..841af8fa95af 100644 --- a/pkgs/applications/networking/onionshare/fix-paths-gui.patch +++ b/pkgs/applications/networking/onionshare/fix-paths-gui.patch @@ -1,7 +1,6 @@ - --- a/onionshare/gui_common.py +++ b/onionshare/gui_common.py -@@ -376,29 +376,10 @@ class GuiCommon: +@@ -391,29 +391,10 @@ class GuiCommon: } def get_tor_paths(self): @@ -20,7 +19,7 @@ - elif self.common.platform == "Darwin": - base_path = self.get_resource_path("tor") - tor_path = os.path.join(base_path, "tor") -- obfs4proxy_file_path = os.path.join(base_path, "obfs4proxy.exe") +- obfs4proxy_file_path = os.path.join(base_path, "obfs4proxy") - tor_geo_ip_file_path = os.path.join(base_path, "geoip") - tor_geo_ipv6_file_path = os.path.join(base_path, "geoip6") - elif self.common.platform == "BSD": diff --git a/pkgs/applications/networking/onionshare/fix-paths.patch b/pkgs/applications/networking/onionshare/fix-paths.patch index a290dd884104..9280ec4d255a 100644 --- a/pkgs/applications/networking/onionshare/fix-paths.patch +++ b/pkgs/applications/networking/onionshare/fix-paths.patch @@ -1,8 +1,8 @@ --- a/onionshare_cli/common.py +++ b/onionshare_cli/common.py -@@ -86,33 +86,10 @@ class Common: +@@ -308,33 +308,10 @@ class Common: return path - + def get_tor_paths(self): - if self.platform == "Linux": - tor_path = shutil.which("tor") @@ -35,6 +35,7 @@ + tor_geo_ip_file_path = "@geoip@/share/tor/geoip" + tor_geo_ipv6_file_path = "@geoip@/share/tor/geoip6" + obfs4proxy_file_path = "@obfs4@/bin/obfs4proxy" - + return ( tor_path, + From 2e4df1d5c4c68d85a403ec19b56557e8fb816f05 Mon Sep 17 00:00:00 2001 From: SCOTT-HAMILTON Date: Wed, 2 Jun 2021 11:58:38 +0200 Subject: [PATCH 48/83] mutt-wizard: init at 3.2.1 --- pkgs/tools/misc/mutt-wizard/default.nix | 26 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/misc/mutt-wizard/default.nix diff --git a/pkgs/tools/misc/mutt-wizard/default.nix b/pkgs/tools/misc/mutt-wizard/default.nix new file mode 100644 index 000000000000..1a63730d31e4 --- /dev/null +++ b/pkgs/tools/misc/mutt-wizard/default.nix @@ -0,0 +1,26 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +}: + +stdenvNoCC.mkDerivation rec { + pname = "mutt-wizard"; + version = "3.2.1"; + + src = fetchFromGitHub { + owner = "LukeSmithxyz"; + repo = "mutt-wizard"; + rev = "v${version}"; + sha256 = "1m4s0vj57hh38rdgdc28p10vnsq80dh708imvdgxbj1i96nq41r8"; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "System for automatically configuring mutt and isync"; + homepage = "https://github.com/LukeSmithxyz/mutt-wizard"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ shamilton ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4387b8583f56..30ab485684c1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25346,6 +25346,7 @@ in mutt-with-sidebar = mutt.override { withSidebar = true; }; + mutt-wizard = callPackage ../tools/misc/mutt-wizard { }; mwic = callPackage ../applications/misc/mwic { pythonPackages = python3Packages; From 768ffda1abb3e8bef6ad305f5e6e7da58d043c34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Wed, 2 Jun 2021 16:37:47 +0300 Subject: [PATCH 49/83] matcha-gtk-theme: 2021-05-20 -> 2021-06-02 --- pkgs/data/themes/matcha/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix index bfede60c2f74..d060e20267e8 100644 --- a/pkgs/data/themes/matcha/default.nix +++ b/pkgs/data/themes/matcha/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "matcha-gtk-theme"; - version = "2021-05-20"; + version = "2021-06-02"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "0jx55dn9j0395ws7507mj8px4yq4jlmms6xr9jlhp0qxnr4y1smd"; + sha256 = "0wx0dgfl71wx02nrmf794xn28cvjx81vcmbnzwyyzwcbb9pacdpp"; }; buildInputs = [ gdk-pixbuf librsvg ]; From 9c14e1f92a91895ea5141f7ff9038eec55f16e68 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Wed, 2 Jun 2021 15:52:28 +0200 Subject: [PATCH 50/83] purescript: add meta.mainProgram --- pkgs/development/compilers/purescript/purescript/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix index 6d7f05ebdae7..fbe96ca179d7 100644 --- a/pkgs/development/compilers/purescript/purescript/default.nix +++ b/pkgs/development/compilers/purescript/purescript/default.nix @@ -61,5 +61,6 @@ in stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = with maintainers; [ justinwoo mbbx6spp cdepillabout ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; + mainProgram = "purs"; }; } From 01450a71a7e0145a00cb95181eaa5eb43d56c485 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Jun 2021 16:09:31 +0200 Subject: [PATCH 51/83] lasso: 2.6.1 -> 2.7.0 https://git.entrouvert.org/lasso.git/tree/NEWS?id=v2.7.0 Fixes: CVE-2021-28091 --- pkgs/development/libraries/lasso/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/lasso/default.nix b/pkgs/development/libraries/lasso/default.nix index 24efa689c581..e5503169fd5f 100644 --- a/pkgs/development/libraries/lasso/default.nix +++ b/pkgs/development/libraries/lasso/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "lasso"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { url = "https://dev.entrouvert.org/lasso/lasso-${version}.tar.gz"; - sha256 = "1pniisy4z9cshf6lvlz28kfa3qnwnhldb2rvkjxzc0l84g7dpa7q"; + sha256 = "138x8pmj4k1pbah32z14rd8ylyx4lgz70s93m39vd17f8sjz50lj"; }; From 42aa9864063ed00dc1196619de82491eb744dcbd Mon Sep 17 00:00:00 2001 From: Niko Pavlinek Date: Wed, 2 Jun 2021 21:06:00 +0200 Subject: [PATCH 52/83] natural-docs: init at 2.1.1 --- .../misc/natural-docs/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/applications/misc/natural-docs/default.nix diff --git a/pkgs/applications/misc/natural-docs/default.nix b/pkgs/applications/misc/natural-docs/default.nix new file mode 100644 index 000000000000..15816b669286 --- /dev/null +++ b/pkgs/applications/misc/natural-docs/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchzip, makeWrapper, mono, lib }: + +stdenv.mkDerivation rec { + pname = "natural-docs"; + version = "2.1.1"; + + src = fetchzip { + url = "https://naturaldocs.org/download/natural_docs/${version}/Natural_Docs_${version}.zip"; + sha256 = "03fizjgvhiw3lqyykqw1whdh97xyiy3f226c1348ll61ryjxamqw"; + }; + + dontPatch = true; + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + cp -r . $out/ + makeWrapper ${mono}/bin/mono $out/bin/NaturalDocs --add-flags "$out/NaturalDocs.exe" + ''; + + meta = with lib; { + description = "Documentation generator for multiple programming languages."; + longDescription = '' + Natural Docs is an open source documentation generator for multiple + programming languages. You document your code in a natural syntax that + reads like plain English. Natural Docs then scans your code and builds + high-quality HTML documentation from it. + ''; + homepage = "https://naturaldocs.org"; + license = licenses.agpl3Only; + maintainers = [ maintainers.nkpvk ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 646bed9aba69..199f69e5b03f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25369,6 +25369,8 @@ in natron = callPackage ../applications/video/natron { }; + natural-docs = callPackage ../applications/misc/natural-docs { }; + neocomp = callPackage ../applications/window-managers/neocomp { }; newsflash = callPackage ../applications/networking/feedreaders/newsflash { }; From 4b0c3de58c8e4b4c8275ad934f2fcbc4c0bd5f9f Mon Sep 17 00:00:00 2001 From: Niko Pavlinek Date: Wed, 2 Jun 2021 21:06:30 +0200 Subject: [PATCH 53/83] maintainers: nipav -> nkpvk --- maintainers/maintainer-list.nix | 4 ++-- pkgs/applications/misc/yokadi/default.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 69b94bd7d001..470674d1669c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7297,9 +7297,9 @@ githubId = 3159451; name = "Nicolas Schneider"; }; - nipav = { + nkpvk = { email = "niko.pavlinek@gmail.com"; - github = "nipav"; + github = "nkpvk"; githubId = 16385648; name = "Niko Pavlinek"; }; diff --git a/pkgs/applications/misc/yokadi/default.nix b/pkgs/applications/misc/yokadi/default.nix index e31a69963ff0..20defe419880 100644 --- a/pkgs/applications/misc/yokadi/default.nix +++ b/pkgs/applications/misc/yokadi/default.nix @@ -24,6 +24,6 @@ buildPythonApplication rec { description = "A command line oriented, sqlite powered, todo-list"; homepage = "https://yokadi.github.io/index.html"; license = licenses.gpl3Plus; - maintainers = [ maintainers.nipav ]; + maintainers = [ maintainers.nkpvk ]; }; } From de7986d7afd9f140ebc43e8a95bdb7f1f7ed08af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Tue, 1 Jun 2021 21:08:20 +0200 Subject: [PATCH 54/83] teams: enable appindicator tray icon support --- .../networking/instant-messengers/teams/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/applications/networking/instant-messengers/teams/default.nix index 498bee8aafc5..cd7efb7ad89c 100644 --- a/pkgs/applications/networking/instant-messengers/teams/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams/default.nix @@ -6,6 +6,7 @@ , dpkg , atomEnv , libuuid +, libappindicator-gtk3 , pulseaudio , at-spi2-atk , coreutils @@ -34,6 +35,7 @@ stdenv.mkDerivation rec { runtimeDependencies = [ (lib.getLib systemd) pulseaudio + libappindicator-gtk3 ]; preFixup = '' From 659c0ea7941366fda5c871539fe642637e6f1c9a Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Wed, 2 Jun 2021 21:49:12 +0200 Subject: [PATCH 55/83] i3lock-color: 2.13.c.2 -> 2.13.c.3 --- pkgs/applications/window-managers/i3/lock-color.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index 3581e4749431..4182c8689ed2 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "2.13.c.2"; + version = "2.13.c.3"; pname = "i3lock-color"; src = fetchFromGitHub { owner = "PandorasFox"; repo = "i3lock-color"; rev = version; - sha256 = "sha256-cMj1uB2Hf7v5Rukw9c5YeUmwbdTn1+PV13bUaOWzBp0="; + sha256 = "0spldmis8fvnclwwi9xvnq2rq3hmpbiv3ck5p9pjf40ismvsi16k"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From cad76c256195ba4c8392f2e273d0f3835028a850 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 1 Jun 2021 02:45:40 +0300 Subject: [PATCH 56/83] =?UTF-8?q?josm:=2017833=20=E2=86=92=2017919?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/josm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index aa1ef4f8eff0..96ea01f53740 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -3,15 +3,15 @@ }: let pname = "josm"; - version = "17833"; + version = "17919"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "sha256-i3seRVfCLXNvUkWAAPZK0XloRHuXWCNp1tqnVr7CQ7Y="; + sha256 = "sha256-Bj1s3vFSHPiZNTjp7hQhu1X2v8nlynC37Cm6sMNOi3g="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java16.zip"; - sha256 = "sha256-PM/wNXqtEwalhorWHqVHWsaiGv60SFrHXZrb1Mw/QqQ="; + sha256 = "sha256-W+s6ARA5lyRwTuRD89wm4HChb2Up5AXQwh5uk0U7pQk="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; From 14a6aedeeacac931e2ab96395de82831298f3188 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 3 Jun 2021 05:26:14 +0000 Subject: [PATCH 57/83] jenkins: 2.277.4 -> 2.289.1 --- .../tools/continuous-integration/jenkins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 67074d435435..415b22894cbe 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.277.4"; + version = "2.289.1"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "19z72d0rkxpvl03aqz102in9ln08r9831lj3ymsgmglk8c37ici6"; + sha256 = "1wkm1y2bj245b9i51vhns9qfxc6xm44hg60vhgmswndcy5pwrybh"; }; buildCommand = '' From ffae5e3650d160c39d84b790bf46d26a2a264a7b Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Mon, 17 May 2021 18:16:40 +0200 Subject: [PATCH 58/83] routinator: 0.8.3 -> 0.9.0 --- pkgs/servers/routinator/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/routinator/default.nix b/pkgs/servers/routinator/default.nix index c874a9309afe..8412d0069c7d 100644 --- a/pkgs/servers/routinator/default.nix +++ b/pkgs/servers/routinator/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "routinator"; - version = "0.8.3"; + version = "0.9.0"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-JwPAwhD+Pkx8Kx24m7z/RbEvDnI2YR8dnTgAV7TMsFE="; + rev = version; + sha256 = "sha256-8CBsLOAF0JnRMe7qLod6UDPGLMPwqDm0Z5BjB4KCkBc="; }; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "sha256-NtugqvaickcEowxGwotGuh6jb2NTK95csJxtjezy90s="; + cargoSha256 = "sha256-S/RAt3tCIlaSqIHqP5C+QK9aQq+4CO/MW2toUo9kVKk="; meta = with lib; { description = "An RPKI Validator written in Rust"; From 89d5f4b3d09f86ffe9d9335c37d1f7e2dccaa5dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 3 Jun 2021 12:09:11 +0200 Subject: [PATCH 59/83] treewide: setuptools_scm -> setuptools-scm --- doc/languages-frameworks/python.section.md | 4 ++-- pkgs/applications/audio/whipper/default.nix | 2 +- pkgs/applications/blockchains/chia/default.nix | 2 +- pkgs/applications/misc/khal/default.nix | 2 +- pkgs/applications/misc/plover/default.nix | 2 +- pkgs/applications/misc/pyditz/default.nix | 2 +- pkgs/applications/misc/raiseorlaunch/default.nix | 2 +- pkgs/applications/networking/mailreaders/afew/default.nix | 2 +- .../networking/mailreaders/mlarchive2maildir/default.nix | 2 +- pkgs/applications/window-managers/qtile/default.nix | 2 +- pkgs/data/fonts/noto-fonts/tools.nix | 4 ++-- pkgs/development/python-modules/FormEncode/default.nix | 4 ++-- pkgs/development/python-modules/acme-tiny/default.nix | 4 ++-- pkgs/development/python-modules/afdko/default.nix | 4 ++-- pkgs/development/python-modules/amply/default.nix | 4 ++-- pkgs/development/python-modules/ansi2html/default.nix | 4 ++-- pkgs/development/python-modules/apipkg/default.nix | 4 ++-- pkgs/development/python-modules/asciimatics/default.nix | 4 ++-- pkgs/development/python-modules/astropy/default.nix | 4 ++-- pkgs/development/python-modules/asttokens/default.nix | 4 ++-- pkgs/development/python-modules/automat/default.nix | 4 ++-- .../backports_functools_lru_cache/default.nix | 4 ++-- pkgs/development/python-modules/backports_os/default.nix | 4 ++-- .../python-modules/backports_tempfile/default.nix | 4 ++-- .../python-modules/backports_unittest-mock/default.nix | 4 ++-- .../python-modules/backports_weakref/default.nix | 4 ++-- pkgs/development/python-modules/bidict/default.nix | 4 ++-- pkgs/development/python-modules/black/default.nix | 4 ++-- .../python-modules/booleanoperations/default.nix | 4 ++-- pkgs/development/python-modules/cbor2/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/clvm-tools/default.nix | 2 +- pkgs/development/python-modules/clvm/default.nix | 2 +- pkgs/development/python-modules/cmd2/default.nix | 4 ++-- pkgs/development/python-modules/configparser/4.nix | 4 ++-- pkgs/development/python-modules/configparser/default.nix | 4 ++-- pkgs/development/python-modules/diofant/default.nix | 4 ++-- .../python-modules/django-configurations/default.nix | 4 ++-- pkgs/development/python-modules/django-haystack/default.nix | 4 ++-- pkgs/development/python-modules/dotty-dict/default.nix | 4 ++-- pkgs/development/python-modules/drf-yasg/default.nix | 4 ++-- pkgs/development/python-modules/duckdb/default.nix | 4 ++-- pkgs/development/python-modules/fontparts/default.nix | 4 ++-- pkgs/development/python-modules/freetype-py/default.nix | 4 ++-- pkgs/development/python-modules/geoalchemy2/default.nix | 4 ++-- pkgs/development/python-modules/hmmlearn/default.nix | 4 ++-- pkgs/development/python-modules/humanize/default.nix | 4 ++-- pkgs/development/python-modules/inflect/default.nix | 4 ++-- pkgs/development/python-modules/irc/default.nix | 4 ++-- pkgs/development/python-modules/jaraco_classes/default.nix | 4 ++-- .../python-modules/jaraco_collections/default.nix | 4 ++-- pkgs/development/python-modules/jaraco_functools/2.nix | 4 ++-- .../development/python-modules/jaraco_functools/default.nix | 4 ++-- .../development/python-modules/jaraco_itertools/default.nix | 4 ++-- pkgs/development/python-modules/jaraco_logging/default.nix | 4 ++-- pkgs/development/python-modules/jaraco_stream/2.nix | 4 ++-- pkgs/development/python-modules/jaraco_stream/default.nix | 4 ++-- pkgs/development/python-modules/jaraco_text/default.nix | 4 ++-- pkgs/development/python-modules/jsonpickle/default.nix | 4 ++-- pkgs/development/python-modules/jsonschema/default.nix | 4 ++-- pkgs/development/python-modules/keyring/2.nix | 4 ++-- pkgs/development/python-modules/keyrings-alt/default.nix | 4 ++-- .../python-modules/lazy-object-proxy/default.nix | 4 ++-- pkgs/development/python-modules/makefun/default.nix | 4 ++-- pkgs/development/python-modules/matchpy/default.nix | 4 ++-- pkgs/development/python-modules/measurement/default.nix | 4 ++-- pkgs/development/python-modules/mecab-python3/default.nix | 4 ++-- pkgs/development/python-modules/multiset/default.nix | 4 ++-- pkgs/development/python-modules/nbdime/default.nix | 4 ++-- pkgs/development/python-modules/nmigen-boards/default.nix | 4 ++-- pkgs/development/python-modules/nmigen-soc/default.nix | 4 ++-- pkgs/development/python-modules/numcodecs/default.nix | 4 ++-- pkgs/development/python-modules/parfive/default.nix | 4 ++-- pkgs/development/python-modules/path.py/2.nix | 4 ++-- pkgs/development/python-modules/path.py/default.nix | 4 ++-- pkgs/development/python-modules/pdoc3/default.nix | 4 ++-- pkgs/development/python-modules/pint/default.nix | 4 ++-- pkgs/development/python-modules/pluggy/default.nix | 4 ++-- pkgs/development/python-modules/portend/default.nix | 4 ++-- pkgs/development/python-modules/prettytable/1.nix | 4 ++-- pkgs/development/python-modules/prettytable/default.nix | 4 ++-- pkgs/development/python-modules/psautohint/default.nix | 4 ++-- pkgs/development/python-modules/pure-eval/default.nix | 4 ++-- .../python-modules/py-air-control-exporter/default.nix | 4 ++-- pkgs/development/python-modules/py/default.nix | 4 ++-- pkgs/development/python-modules/pyarrow/default.nix | 4 ++-- pkgs/development/python-modules/pybindgen/default.nix | 4 ++-- pkgs/development/python-modules/pyclipper/default.nix | 4 ++-- pkgs/development/python-modules/pymediainfo/default.nix | 4 ++-- pkgs/development/python-modules/pyocr/default.nix | 4 ++-- pkgs/development/python-modules/pysolr/default.nix | 4 ++-- pkgs/development/python-modules/pytest-astropy/default.nix | 4 ++-- pkgs/development/python-modules/pytest-black/default.nix | 4 ++-- pkgs/development/python-modules/pytest-celery/default.nix | 2 +- pkgs/development/python-modules/pytest-datadir/default.nix | 4 ++-- pkgs/development/python-modules/pytest-django/default.nix | 4 ++-- .../python-modules/pytest-doctestplus/default.nix | 4 ++-- .../python-modules/pytest-filter-subpackage/default.nix | 4 ++-- pkgs/development/python-modules/pytest-flask/default.nix | 4 ++-- pkgs/development/python-modules/pytest-forked/default.nix | 4 ++-- pkgs/development/python-modules/pytest-html/default.nix | 4 ++-- pkgs/development/python-modules/pytest-metadata/default.nix | 4 ++-- pkgs/development/python-modules/pytest-mock/2.nix | 4 ++-- pkgs/development/python-modules/pytest-mock/default.nix | 4 ++-- pkgs/development/python-modules/pytest-mypy/default.nix | 4 ++-- .../development/python-modules/pytest-openfiles/default.nix | 4 ++-- pkgs/development/python-modules/pytest-qt/default.nix | 4 ++-- pkgs/development/python-modules/pytest-repeat/default.nix | 4 ++-- pkgs/development/python-modules/pytest-services/default.nix | 4 ++-- pkgs/development/python-modules/pytest-xdist/1.nix | 4 ++-- pkgs/development/python-modules/pytest-xdist/default.nix | 4 ++-- pkgs/development/python-modules/pytest-xprocess/default.nix | 4 ++-- pkgs/development/python-modules/pytest/4.nix | 4 ++-- pkgs/development/python-modules/pytest/5.nix | 4 ++-- pkgs/development/python-modules/pytestrunner/2.nix | 4 ++-- pkgs/development/python-modules/pytestrunner/default.nix | 4 ++-- pkgs/development/python-modules/python-lz4/default.nix | 6 +++--- pkgs/development/python-modules/pyusb/default.nix | 4 ++-- pkgs/development/python-modules/pyvcd/default.nix | 4 ++-- pkgs/development/python-modules/reproject/default.nix | 4 ++-- .../python-modules/sapi-python-client/default.nix | 4 ++-- .../python-modules/setuptools-scm-git-archive/default.nix | 4 ++-- .../python-modules/{setuptools_scm => setuptools-scm}/2.nix | 0 .../{setuptools_scm => setuptools-scm}/default.nix | 0 pkgs/development/python-modules/sievelib/default.nix | 4 ++-- pkgs/development/python-modules/simpy/default.nix | 4 ++-- pkgs/development/python-modules/snscrape/default.nix | 4 ++-- pkgs/development/python-modules/sorl_thumbnail/default.nix | 4 ++-- .../python-modules/sphinxcontrib-openapi/default.nix | 4 ++-- pkgs/development/python-modules/stack-data/default.nix | 4 ++-- pkgs/development/python-modules/tempora/default.nix | 4 ++-- pkgs/development/python-modules/tenacity/default.nix | 4 ++-- pkgs/development/python-modules/tiledb/default.nix | 4 ++-- pkgs/development/python-modules/tox/default.nix | 4 ++-- pkgs/development/python-modules/tqdm/default.nix | 4 ++-- pkgs/development/python-modules/twine/default.nix | 4 ++-- pkgs/development/python-modules/ufonormalizer/default.nix | 4 ++-- pkgs/development/python-modules/ufoprocessor/default.nix | 4 ++-- pkgs/development/python-modules/ujson/2.nix | 4 ++-- pkgs/development/python-modules/ujson/default.nix | 4 ++-- pkgs/development/python-modules/variants/default.nix | 4 ++-- pkgs/development/python-modules/vdirsyncer/default.nix | 4 ++-- pkgs/development/python-modules/virtualenv/default.nix | 4 ++-- pkgs/development/python-modules/vispy/default.nix | 4 ++-- pkgs/development/python-modules/word2vec/default.nix | 4 ++-- pkgs/development/python-modules/xlib/default.nix | 4 ++-- pkgs/development/python-modules/zarr/default.nix | 4 ++-- pkgs/development/python-modules/zipp/1.nix | 4 ++-- pkgs/development/python-modules/zipp/default.nix | 4 ++-- pkgs/development/tools/analysis/checkov/default.nix | 2 +- pkgs/development/tools/dt-schema/default.nix | 4 ++-- pkgs/development/tools/misc/tinyprog/default.nix | 2 +- pkgs/development/tools/poetry2nix/poetry2nix/default.nix | 2 +- .../tools/poetry2nix/poetry2nix/mk-poetry-dep.nix | 2 +- pkgs/games/portmod/default.nix | 2 +- pkgs/tools/X11/caffeine-ng/default.nix | 2 +- pkgs/tools/admin/salt/pepper/default.nix | 2 +- pkgs/tools/admin/simp_le/default.nix | 2 +- pkgs/tools/misc/adafruit-ampy/default.nix | 2 +- pkgs/tools/misc/bepasty/default.nix | 2 +- pkgs/tools/package-management/protontricks/default.nix | 4 ++-- pkgs/tools/package-management/reuse/default.nix | 2 +- pkgs/tools/security/sshuttle/default.nix | 2 +- pkgs/tools/text/ocrmypdf/default.nix | 2 +- pkgs/top-level/python-aliases.nix | 3 ++- pkgs/top-level/python-packages.nix | 3 +-- pkgs/top-level/python2-packages.nix | 2 +- 169 files changed, 308 insertions(+), 308 deletions(-) rename pkgs/development/python-modules/{setuptools_scm => setuptools-scm}/2.nix (100%) rename pkgs/development/python-modules/{setuptools_scm => setuptools-scm}/default.nix (100%) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index b466748f5480..feefefeabb78 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -847,7 +847,7 @@ using setup hooks. The following is an example: ```nix -{ lib, buildPythonPackage, fetchPypi, hypothesis, setuptools_scm, attrs, py, setuptools, six, pluggy }: +{ lib, buildPythonPackage, fetchPypi, hypothesis, setuptools-scm, attrs, py, setuptools, six, pluggy }: buildPythonPackage rec { pname = "pytest"; @@ -864,7 +864,7 @@ buildPythonPackage rec { ''; checkInputs = [ hypothesis ]; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ attrs py setuptools six pluggy ]; meta = with lib; { diff --git a/pkgs/applications/audio/whipper/default.nix b/pkgs/applications/audio/whipper/default.nix index a295788c117b..e96a6bfef208 100644 --- a/pkgs/applications/audio/whipper/default.nix +++ b/pkgs/applications/audio/whipper/default.nix @@ -23,7 +23,7 @@ in python3.pkgs.buildPythonApplication rec { }; nativeBuildInputs = with python3.pkgs; [ - setuptools_scm + setuptools-scm docutils ]; diff --git a/pkgs/applications/blockchains/chia/default.nix b/pkgs/applications/blockchains/chia/default.nix index 0c4220b72ba5..09fe6d1b2ddd 100644 --- a/pkgs/applications/blockchains/chia/default.nix +++ b/pkgs/applications/blockchains/chia/default.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { python3Packages.setuptools-scm ]; - # give a hint to setuptools_scm on package version + # give a hint to setuptools-scm on package version SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}"; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index 97d01a1e1b5f..5c6b505dd683 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -30,7 +30,7 @@ with python3.pkgs; buildPythonApplication rec { pkginfo freezegun ]; - nativeBuildInputs = [ setuptools_scm sphinx sphinxcontrib_newsfeed ]; + nativeBuildInputs = [ setuptools-scm sphinx sphinxcontrib_newsfeed ]; checkInputs = [ pytest glibcLocales ]; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix index 05886a85bf0c..ac4811b30c41 100644 --- a/pkgs/applications/misc/plover/default.nix +++ b/pkgs/applications/misc/plover/default.nix @@ -17,7 +17,7 @@ sha256 = "1hdg5491phx6svrxxsxp8v6n4b25y7y4wxw7x3bxlbyhaskgj53r"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; buildInputs = [ pytest mock ]; propagatedBuildInputs = [ six setuptools pyserial appdirs hidapi wxPython xlib wmctrl dbus-python diff --git a/pkgs/applications/misc/pyditz/default.nix b/pkgs/applications/misc/pyditz/default.nix index 5765aeba7dd0..c5f3143bedc1 100644 --- a/pkgs/applications/misc/pyditz/default.nix +++ b/pkgs/applications/misc/pyditz/default.nix @@ -12,7 +12,7 @@ in buildPythonApplication rec { inherit pname version; sha256 = "da0365ae9064e30c4a27526fb0d7a802fda5c8651cda6990d17be7ede89a2551"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ pyyaml six jinja2 cerberus_1_1 ]; checkPhase = '' diff --git a/pkgs/applications/misc/raiseorlaunch/default.nix b/pkgs/applications/misc/raiseorlaunch/default.nix index e43cf7b95b93..88b215acdfa9 100644 --- a/pkgs/applications/misc/raiseorlaunch/default.nix +++ b/pkgs/applications/misc/raiseorlaunch/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { sha256 = "3d694015d020a888b42564d56559213b94981ca2b32b952a49b2de4d029d2e59"; }; - nativeBuildInputs = [ python3Packages.setuptools_scm ]; + nativeBuildInputs = [ python3Packages.setuptools-scm ]; pythonPath = with python3Packages; [ i3ipc ]; # no tests diff --git a/pkgs/applications/networking/mailreaders/afew/default.nix b/pkgs/applications/networking/mailreaders/afew/default.nix index 8a5f607dd32c..2e6c8cf02368 100644 --- a/pkgs/applications/networking/mailreaders/afew/default.nix +++ b/pkgs/applications/networking/mailreaders/afew/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { sha256 = "0wpfqbqjlfb9z0hafvdhkm7qw56cr9kfy6n8vb0q42dwlghpz1ff"; }; - nativeBuildInputs = with python3Packages; [ sphinx setuptools_scm ]; + nativeBuildInputs = with python3Packages; [ sphinx setuptools-scm ]; propagatedBuildInputs = with python3Packages; [ python3Packages.setuptools python3Packages.notmuch chardet dkimpy diff --git a/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix b/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix index 6cd0b3db7863..a3a6051ef0c0 100644 --- a/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix +++ b/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix @@ -9,7 +9,7 @@ python3.pkgs.buildPythonApplication rec { sha256 = "02zjwa7zbcbqj76l0qmg7bbf3fqli60pl2apby3j4zwzcrrryczs"; }; - nativeBuildInputs = with python3.pkgs; [ setuptools_scm ]; + nativeBuildInputs = with python3.pkgs; [ setuptools-scm ]; propagatedBuildInputs = with python3.pkgs; [ beautifulsoup4 diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index 21059c25afb1..ba7228f5b961 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -38,7 +38,7 @@ python37Packages.buildPythonApplication rec { xcffib cairocffi-xcffib setuptools - setuptools_scm + setuptools-scm dateutil dbus-python mpd2 diff --git a/pkgs/data/fonts/noto-fonts/tools.nix b/pkgs/data/fonts/noto-fonts/tools.nix index c43ff3a313f2..791aa6534d28 100644 --- a/pkgs/data/fonts/noto-fonts/tools.nix +++ b/pkgs/data/fonts/noto-fonts/tools.nix @@ -3,7 +3,7 @@ , defcon, fontmath, fontparts, fontpens, fonttools, lxml , mutatormath, pathspec, psautohint, pyclipper, pytz, regex, scour , toml, typed-ast, ufonormalizer, ufoprocessor, unicodedata2, zopfli -, pillow, six, bash, setuptools_scm }: +, pillow, six, bash, setuptools-scm }: buildPythonPackage rec { pname = "nototools"; @@ -22,7 +22,7 @@ buildPythonPackage rec { sed -i 's/use_scm_version=.*,/version="${version}",/' setup.py ''; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ afdko diff --git a/pkgs/development/python-modules/FormEncode/default.nix b/pkgs/development/python-modules/FormEncode/default.nix index 74884f36f033..7a3967404c94 100644 --- a/pkgs/development/python-modules/FormEncode/default.nix +++ b/pkgs/development/python-modules/FormEncode/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, dnspython, pycountry, nose, setuptools_scm, six, isPy27 }: +{ lib, buildPythonPackage, fetchPypi, dnspython, pycountry, nose, setuptools-scm, six, isPy27 }: buildPythonPackage rec { pname = "FormEncode"; @@ -16,7 +16,7 @@ buildPythonPackage rec { sed -i 's/use_scm_version=.*,/version="${version}",/' setup.py ''; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ six ]; checkInputs = [ dnspython pycountry nose ]; diff --git a/pkgs/development/python-modules/acme-tiny/default.nix b/pkgs/development/python-modules/acme-tiny/default.nix index c979104914da..76e8a8401fd4 100644 --- a/pkgs/development/python-modules/acme-tiny/default.nix +++ b/pkgs/development/python-modules/acme-tiny/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools_scm, fusepy, fuse +{ lib, buildPythonPackage, fetchPypi, setuptools-scm, fusepy, fuse , openssl }: buildPythonPackage rec { @@ -17,7 +17,7 @@ buildPythonPackage rec { substituteInPlace tests/monkey.py --replace /etc/ssl/openssl.cnf ${openssl.out}/etc/ssl/openssl.cnf ''; - buildInputs = [ setuptools_scm ]; + buildInputs = [ setuptools-scm ]; checkInputs = [ fusepy fuse ]; doCheck = false; # seems to hang, not sure diff --git a/pkgs/development/python-modules/afdko/default.nix b/pkgs/development/python-modules/afdko/default.nix index f86151f2f51f..9a4dbbab3745 100644 --- a/pkgs/development/python-modules/afdko/default.nix +++ b/pkgs/development/python-modules/afdko/default.nix @@ -2,7 +2,7 @@ , fonttools, defcon, lxml, fs, unicodedata2, zopfli, brotlipy, fontpens , brotli, fontmath, mutatormath, booleanoperations , ufoprocessor, ufonormalizer, psautohint, tqdm -, setuptools_scm +, setuptools-scm , pytestCheckHook }: @@ -32,7 +32,7 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ booleanoperations diff --git a/pkgs/development/python-modules/amply/default.nix b/pkgs/development/python-modules/amply/default.nix index 0589caf1e6a1..35aa3ecb4d3a 100644 --- a/pkgs/development/python-modules/amply/default.nix +++ b/pkgs/development/python-modules/amply/default.nix @@ -1,7 +1,7 @@ { lib , fetchPypi , buildPythonPackage -, setuptools_scm +, setuptools-scm , docutils , pyparsing , pytestCheckHook @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "cb12dcb49d16b168c02be128a1527ecde50211e4bd94af76ff4e67707f5a2d38"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ docutils pyparsing diff --git a/pkgs/development/python-modules/ansi2html/default.nix b/pkgs/development/python-modules/ansi2html/default.nix index df115cf7c470..4abcec541a04 100644 --- a/pkgs/development/python-modules/ansi2html/default.nix +++ b/pkgs/development/python-modules/ansi2html/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, six, mock, pytestCheckHook, setuptools, setuptools_scm, toml }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, six, mock, pytestCheckHook, setuptools, setuptools-scm, toml }: buildPythonPackage rec { pname = "ansi2html"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "0f124ea7efcf3f24f1f9398e527e688c9ae6eab26b0b84e1299ef7f94d92c596"; }; - nativeBuildInputs = [ setuptools_scm toml ]; + nativeBuildInputs = [ setuptools-scm toml ]; propagatedBuildInputs = [ six setuptools ]; preCheck = "export PATH=$PATH:$out/bin"; diff --git a/pkgs/development/python-modules/apipkg/default.nix b/pkgs/development/python-modules/apipkg/default.nix index 10e2369e12ee..5e7ae3860a93 100644 --- a/pkgs/development/python-modules/apipkg/default.nix +++ b/pkgs/development/python-modules/apipkg/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, pytest, setuptools_scm, isPy3k }: +, pytest, setuptools-scm, isPy3k }: buildPythonPackage rec { pname = "apipkg"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "37228cda29411948b422fae072f57e31d3396d2ee1c9783775980ee9c9990af6"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; checkInputs = [ pytest ]; # Fix pytest 4 support. See: https://github.com/pytest-dev/apipkg/issues/14 diff --git a/pkgs/development/python-modules/asciimatics/default.nix b/pkgs/development/python-modules/asciimatics/default.nix index aafbaa15ffe7..cbddf962bd10 100644 --- a/pkgs/development/python-modules/asciimatics/default.nix +++ b/pkgs/development/python-modules/asciimatics/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, setuptools_scm +, setuptools-scm , pyfiglet , pillow , wcwidth @@ -20,7 +20,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - setuptools_scm + setuptools-scm ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index 9ffcba63954b..06cfafc134f3 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -1,6 +1,6 @@ { lib , fetchPypi -, setuptools_scm +, setuptools-scm , buildPythonPackage , isPy3k , cython @@ -25,7 +25,7 @@ buildPythonPackage rec { sha256 = "2c194f8a429b8399de64a413a06881ea49f0525cabaa2d78fc132b9e970adc6a"; }; - nativeBuildInputs = [ setuptools_scm astropy-helpers astropy-extension-helpers cython jinja2 ]; + nativeBuildInputs = [ setuptools-scm astropy-helpers astropy-extension-helpers cython jinja2 ]; propagatedBuildInputs = [ numpy pyerfa ]; checkInputs = [ pytest pytest-astropy ]; diff --git a/pkgs/development/python-modules/asttokens/default.nix b/pkgs/development/python-modules/asttokens/default.nix index ecbbfa909112..bb4cf989cddf 100644 --- a/pkgs/development/python-modules/asttokens/default.nix +++ b/pkgs/development/python-modules/asttokens/default.nix @@ -1,5 +1,5 @@ { lib, fetchPypi, fetchpatch, buildPythonPackage, - setuptools_scm, toml, six, astroid, pytest + setuptools-scm, toml, six, astroid, pytest }: buildPythonPackage rec { @@ -21,7 +21,7 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ setuptools_scm toml six astroid ]; + propagatedBuildInputs = [ setuptools-scm toml six astroid ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/automat/default.nix b/pkgs/development/python-modules/automat/default.nix index 20f54870e1f9..ce7566deb30d 100644 --- a/pkgs/development/python-modules/automat/default.nix +++ b/pkgs/development/python-modules/automat/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, - m2r, setuptools_scm, six, attrs }: + m2r, setuptools-scm, six, attrs }: buildPythonPackage rec { version = "20.2.0"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33"; }; - buildInputs = [ m2r setuptools_scm ]; + buildInputs = [ m2r setuptools-scm ]; propagatedBuildInputs = [ six attrs ]; # Some tests require twisetd, but twisted requires Automat to build. 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 6c0d1df81f39..8a9bc2283858 100644 --- a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix +++ b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, setuptools_scm +, setuptools-scm , isPy3k , pytest , pytest-black @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "d84e126e2a29e4fde8931ff8131240bbf30a0e7dbcc3897a8dbd8ea5ac11419c"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; checkInputs = [ pytest pytest-flake8 pytest-black pytestcov ]; # ironically, they fail a linting test, and pytest.ini forces that test suite diff --git a/pkgs/development/python-modules/backports_os/default.nix b/pkgs/development/python-modules/backports_os/default.nix index 39973e433eed..214449708433 100644 --- a/pkgs/development/python-modules/backports_os/default.nix +++ b/pkgs/development/python-modules/backports_os/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, setuptools_scm +, setuptools-scm , future , isPy3k , python @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "b472c4933094306ca08ec90b2a8cbb50c34f1fb2767775169a1c1650b7b74630"; }; - buildInputs = [ setuptools_scm ]; + buildInputs = [ setuptools-scm ]; checkInputs = [ hypothesis ]; propagatedBuildInputs = [ future ]; diff --git a/pkgs/development/python-modules/backports_tempfile/default.nix b/pkgs/development/python-modules/backports_tempfile/default.nix index cc51e23260b8..0d1203d28be2 100644 --- a/pkgs/development/python-modules/backports_tempfile/default.nix +++ b/pkgs/development/python-modules/backports_tempfile/default.nix @@ -2,7 +2,7 @@ , python , buildPythonPackage , fetchPypi -, setuptools_scm +, setuptools-scm , backports_weakref }: @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "1c648c452e8770d759bdc5a5e2431209be70d25484e1be24876cf2168722c762"; }; - buildInputs = [ setuptools_scm ]; + buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ backports_weakref ]; diff --git a/pkgs/development/python-modules/backports_unittest-mock/default.nix b/pkgs/development/python-modules/backports_unittest-mock/default.nix index a9950eb704f8..bf81efce8d89 100644 --- a/pkgs/development/python-modules/backports_unittest-mock/default.nix +++ b/pkgs/development/python-modules/backports_unittest-mock/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools_scm, mock }: +{ lib, buildPythonPackage, fetchPypi, setuptools-scm, mock }: buildPythonPackage rec { pname = "backports.unittest_mock"; @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ mock ]; - buildInputs = [ setuptools_scm ]; + buildInputs = [ setuptools-scm ]; # does not contain tests doCheck = false; diff --git a/pkgs/development/python-modules/backports_weakref/default.nix b/pkgs/development/python-modules/backports_weakref/default.nix index c04b88a3f328..4db504ac3306 100644 --- a/pkgs/development/python-modules/backports_weakref/default.nix +++ b/pkgs/development/python-modules/backports_weakref/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, setuptools_scm +, setuptools-scm # , backports , python }: @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "bc4170a29915f8b22c9e7c4939701859650f2eb84184aee80da329ac0b9825c2"; }; - buildInputs = [ setuptools_scm ]; + buildInputs = [ setuptools-scm ]; # checkInputs = [ backports ]; # Requires backports package diff --git a/pkgs/development/python-modules/bidict/default.nix b/pkgs/development/python-modules/bidict/default.nix index dcb684a55e0d..8ad3534170d5 100644 --- a/pkgs/development/python-modules/bidict/default.nix +++ b/pkgs/development/python-modules/bidict/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, setuptools_scm +, setuptools-scm , sphinx , hypothesis , py @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "4fa46f7ff96dc244abfc437383d987404ae861df797e2fd5b190e233c302be09"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ sphinx ]; checkInputs = [ diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix index 0ce3b8d0eaea..bf82df4afa34 100644 --- a/pkgs/development/python-modules/black/default.nix +++ b/pkgs/development/python-modules/black/default.nix @@ -1,5 +1,5 @@ { stdenv, lib -, buildPythonPackage, fetchPypi, pythonOlder, setuptools_scm, pytestCheckHook +, buildPythonPackage, fetchPypi, pythonOlder, setuptools-scm, pytestCheckHook , aiohttp , aiohttp-cors , appdirs @@ -25,7 +25,7 @@ buildPythonPackage rec { sha256 = "1cdkrl5vw26iy7s23v2zpr39m6g5xsgxhfhagzzflgfbvdc56s93"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; # Necessary for the tests to pass on Darwin with sandbox enabled. # Black starts a local server and needs to bind a local address. diff --git a/pkgs/development/python-modules/booleanoperations/default.nix b/pkgs/development/python-modules/booleanoperations/default.nix index c747df90f5a5..f5f3dda77a45 100644 --- a/pkgs/development/python-modules/booleanoperations/default.nix +++ b/pkgs/development/python-modules/booleanoperations/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi , fonttools, fs, pyclipper, defcon, fontpens -, setuptools_scm, pytest +, setuptools-scm, pytest }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { extension = "zip"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ fonttools diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix index 776cc4d38e98..534ba3c9af52 100644 --- a/pkgs/development/python-modules/cbor2/default.nix +++ b/pkgs/development/python-modules/cbor2/default.nix @@ -4,7 +4,7 @@ , fetchPypi , pytestCheckHook , pytest-cov -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "a33aa2e5534fd74401ac95686886e655e3b2ce6383b3f958199b6e70a87c94bf"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; checkInputs = [ pytest-cov diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 7e79d5c63a3c..50f6d33791de 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -14,7 +14,7 @@ , requests , requests-toolbelt , requests-unixsocket -, setuptools_scm +, setuptools-scm , setuptools-scm-git-archive , six , trustme @@ -31,7 +31,7 @@ buildPythonPackage rec { sha256 = "f137d03fd5155b1364bea557a7c98168665c239f6c8cedd8f80e81cdfac01567"; }; - nativeBuildInputs = [ setuptools_scm setuptools-scm-git-archive ]; + nativeBuildInputs = [ setuptools-scm setuptools-scm-git-archive ]; propagatedBuildInputs = [ # install_requires diff --git a/pkgs/development/python-modules/cherrypy/17.nix b/pkgs/development/python-modules/cherrypy/17.nix index 2ee8eb3bd0ca..df50219fb170 100644 --- a/pkgs/development/python-modules/cherrypy/17.nix +++ b/pkgs/development/python-modules/cherrypy/17.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPythonPackage, fetchPypi -, setuptools_scm +, setuptools-scm , cheroot, contextlib2, portend, routes, six, zc_lockfile , backports_unittest-mock, objgraph, pathpy, pytest, pytestcov, backports_functools_lru_cache, requests_toolbelt }: @@ -18,7 +18,7 @@ buildPythonPackage rec { cheroot contextlib2 portend routes six zc_lockfile ]; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; checkInputs = [ backports_unittest-mock objgraph pathpy pytest pytestcov backports_functools_lru_cache requests_toolbelt diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 9a01a030e685..9eebff1b1e6f 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPythonPackage, fetchPypi, isPy3k -, setuptools_scm +, setuptools-scm , cheroot, portend, more-itertools, zc_lockfile, routes , jaraco_collections , objgraph, pytest, pytestcov, pathpy, requests_toolbelt, pytest-services @@ -36,7 +36,7 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ # required diff --git a/pkgs/development/python-modules/clvm-tools/default.nix b/pkgs/development/python-modules/clvm-tools/default.nix index 365f21e8c36e..66856191d403 100644 --- a/pkgs/development/python-modules/clvm-tools/default.nix +++ b/pkgs/development/python-modules/clvm-tools/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { "test_cmd_unknown-1_txt" ]; - # give a hint to setuptools_scm on package version + # give a hint to setuptools-scm on package version SETUPTOOLS_SCM_PRETEND_VERSION="v${version}"; meta = with lib; { diff --git a/pkgs/development/python-modules/clvm/default.nix b/pkgs/development/python-modules/clvm/default.nix index f7168832fa43..00bc14e280f4 100644 --- a/pkgs/development/python-modules/clvm/default.nix +++ b/pkgs/development/python-modules/clvm/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { setuptools-scm ]; - # give a hint to setuptools_scm on package version + # give a hint to setuptools-scm on package version SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}"; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index a6b49d32bcb9..dee6c2ab499e 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchPypi, buildPythonPackage, pythonOlder, isPy3k , pyperclip, six, pyparsing, vim, wcwidth, colorama, attrs -, contextlib2 ? null, typing ? null, setuptools_scm +, contextlib2 ? null, typing ? null, setuptools-scm , pytest, mock ? null, pytest-mock , which, glibcLocales }: @@ -27,7 +27,7 @@ buildPythonPackage rec { disabled = !isPy3k; buildInputs = [ - setuptools_scm + setuptools-scm ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/configparser/4.nix b/pkgs/development/python-modules/configparser/4.nix index cbef6fd2ce7f..0f3b6e0b4912 100644 --- a/pkgs/development/python-modules/configparser/4.nix +++ b/pkgs/development/python-modules/configparser/4.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools_scm }: +{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools-scm }: buildPythonPackage rec { pname = "configparser"; @@ -12,7 +12,7 @@ buildPythonPackage rec { # No tests available doCheck = false; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; preConfigure = '' export LC_ALL=${if stdenv.isDarwin then "en_US" else "C"}.UTF-8 diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix index 47fe88d4e61a..a939f6623c9c 100644 --- a/pkgs/development/python-modules/configparser/default.nix +++ b/pkgs/development/python-modules/configparser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools_scm +{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools-scm , toml }: @@ -14,7 +14,7 @@ buildPythonPackage rec { # No tests available doCheck = false; - nativeBuildInputs = [ setuptools_scm toml ]; + nativeBuildInputs = [ setuptools-scm toml ]; preConfigure = '' export LC_ALL=${if stdenv.isDarwin then "en_US" else "C"}.UTF-8 diff --git a/pkgs/development/python-modules/diofant/default.nix b/pkgs/development/python-modules/diofant/default.nix index c473f2fb4200..f99e17137de9 100644 --- a/pkgs/development/python-modules/diofant/default.nix +++ b/pkgs/development/python-modules/diofant/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , fetchPypi , pytestrunner -, setuptools_scm +, setuptools-scm , isort , mpmath , strategies @@ -22,7 +22,7 @@ buildPythonPackage rec { nativeBuildInputs = [ isort pytestrunner - setuptools_scm + setuptools-scm ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-configurations/default.nix b/pkgs/development/python-modules/django-configurations/default.nix index b6b736e92383..de01f4f70417 100644 --- a/pkgs/development/python-modules/django-configurations/default.nix +++ b/pkgs/development/python-modules/django-configurations/default.nix @@ -9,7 +9,7 @@ , django-cache-url , six , django -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "9e3bcea1355ac50a4c9f854f751d214cb17e5f8adf18405a4488d0a1e8945915"; }; - buildInputs = [ setuptools_scm ]; + buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ six ]; checkInputs = [ django-discover-runner mock dj-database-url dj-email-url dj-search-url django-cache-url ]; diff --git a/pkgs/development/python-modules/django-haystack/default.nix b/pkgs/development/python-modules/django-haystack/default.nix index 7342aa3300c4..2c678e672a3e 100644 --- a/pkgs/development/python-modules/django-haystack/default.nix +++ b/pkgs/development/python-modules/django-haystack/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, setuptools, setuptools_scm, django, dateutil, whoosh, pysolr +, setuptools, setuptools-scm, django, dateutil, whoosh, pysolr , coverage, mock, nose, geopy, requests }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { checkInputs = [ pysolr whoosh dateutil geopy coverage nose mock coverage requests ]; propagatedBuildInputs = [ django setuptools ]; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; postPatch = '' sed -i 's/geopy==/geopy>=/' setup.py diff --git a/pkgs/development/python-modules/dotty-dict/default.nix b/pkgs/development/python-modules/dotty-dict/default.nix index 22d469b96693..a2af0920da9e 100644 --- a/pkgs/development/python-modules/dotty-dict/default.nix +++ b/pkgs/development/python-modules/dotty-dict/default.nix @@ -1,7 +1,7 @@ { lib , fetchPypi , buildPythonPackage -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "sha256-6wA1o2KezYQ5emjx9C8elKvRw0V3oZzT6srTMe58uvA="; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; doCheck = false; diff --git a/pkgs/development/python-modules/drf-yasg/default.nix b/pkgs/development/python-modules/drf-yasg/default.nix index 5342ff8da83f..45842fb809cc 100644 --- a/pkgs/development/python-modules/drf-yasg/default.nix +++ b/pkgs/development/python-modules/drf-yasg/default.nix @@ -3,7 +3,7 @@ , fetchPypi , inflection , ruamel_yaml -, setuptools_scm +, setuptools-scm , six , coreapi , djangorestframework @@ -27,7 +27,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - setuptools_scm + setuptools-scm ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/duckdb/default.nix b/pkgs/development/python-modules/duckdb/default.nix index 56fb450b3e5d..4a4dd279a52e 100644 --- a/pkgs/development/python-modules/duckdb/default.nix +++ b/pkgs/development/python-modules/duckdb/default.nix @@ -4,7 +4,7 @@ , numpy , pandas , pybind11 -, setuptools_scm +, setuptools-scm , pytestrunner , pytestCheckHook }: @@ -27,7 +27,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pybind11 - setuptools_scm + setuptools-scm pytestrunner ]; diff --git a/pkgs/development/python-modules/fontparts/default.nix b/pkgs/development/python-modules/fontparts/default.nix index 3280f5f4bb1e..8ed3ef17adb5 100644 --- a/pkgs/development/python-modules/fontparts/default.nix +++ b/pkgs/development/python-modules/fontparts/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchPypi, python , fonttools, lxml, fs, unicodedata2 , defcon, fontpens, fontmath, booleanoperations -, pytest, setuptools_scm +, pytest, setuptools-scm }: buildPythonPackage rec { @@ -14,7 +14,7 @@ buildPythonPackage rec { extension = "zip"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ booleanoperations diff --git a/pkgs/development/python-modules/freetype-py/default.nix b/pkgs/development/python-modules/freetype-py/default.nix index a1259b85673a..b0035e838447 100644 --- a/pkgs/development/python-modules/freetype-py/default.nix +++ b/pkgs/development/python-modules/freetype-py/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, substituteAll, stdenv, setuptools_scm, freetype }: +{ lib, buildPythonPackage, fetchPypi, substituteAll, stdenv, setuptools-scm, freetype }: buildPythonPackage rec { pname = "freetype-py"; @@ -16,7 +16,7 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ freetype ]; diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix index b629d48c61f6..06139b40c385 100644 --- a/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/pkgs/development/python-modules/geoalchemy2/default.nix @@ -3,7 +3,7 @@ , fetchPypi , sqlalchemy , shapely -, setuptools_scm +, setuptools-scm , pytest }: @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "02jbad9vbnjx8bmfvxg77z18nymrry6li8hy9pwi0yiyvwbnycyr"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ sqlalchemy shapely ]; # https://github.com/geoalchemy/geoalchemy2/blob/e05a676350b11f0e73609379dae5625c5de2e868/TEST.rst diff --git a/pkgs/development/python-modules/hmmlearn/default.nix b/pkgs/development/python-modules/hmmlearn/default.nix index eb7e05afff7a..d079b18a30c2 100644 --- a/pkgs/development/python-modules/hmmlearn/default.nix +++ b/pkgs/development/python-modules/hmmlearn/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildPythonPackage, numpy, scikit-learn, setuptools_scm, cython, pytest }: +{ lib, fetchurl, buildPythonPackage, numpy, scikit-learn, setuptools-scm, cython, pytest }: buildPythonPackage rec { pname = "hmmlearn"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "14fb4ad3fb7529785844a25fae5d32272619fb5973cc02c8784018055470ca01"; }; - buildInputs = [ setuptools_scm cython ]; + buildInputs = [ setuptools-scm cython ]; propagatedBuildInputs = [ numpy scikit-learn ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix index 5db7d6d02545..5184f83881f0 100644 --- a/pkgs/development/python-modules/humanize/default.nix +++ b/pkgs/development/python-modules/humanize/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , isPy27 -, setuptools_scm +, setuptools-scm , setuptools , pytestCheckHook , freezegun @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "8bf7abd672b867f38b8b04593829b85b9b6199a61ef6586bf3629cc06458ff35"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ setuptools ]; checkInputs = [ pytestCheckHook freezegun ]; diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix index b8ebce462dce..f81ceabd27e1 100644 --- a/pkgs/development/python-modules/inflect/default.nix +++ b/pkgs/development/python-modules/inflect/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , isPy27 -, setuptools_scm +, setuptools-scm , toml , pytestCheckHook }: @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "41a23f6788962e9775e40e2ecfb1d6455d02de315022afeedd3c5dc070019d73"; }; - nativeBuildInputs = [ setuptools_scm toml ]; + nativeBuildInputs = [ setuptools-scm toml ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/irc/default.nix b/pkgs/development/python-modules/irc/default.nix index ed113dc6da64..60a960a204c4 100644 --- a/pkgs/development/python-modules/irc/default.nix +++ b/pkgs/development/python-modules/irc/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, isPy3k , six, jaraco_logging, jaraco_text, jaraco_stream, pytz, jaraco_itertools -, setuptools_scm, jaraco_collections, importlib-metadata, toml +, setuptools-scm, jaraco_collections, importlib-metadata, toml }: buildPythonPackage rec { @@ -18,7 +18,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "irc" ]; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ six importlib-metadata diff --git a/pkgs/development/python-modules/jaraco_classes/default.nix b/pkgs/development/python-modules/jaraco_classes/default.nix index 9054f1f109c5..a727e774ec30 100644 --- a/pkgs/development/python-modules/jaraco_classes/default.nix +++ b/pkgs/development/python-modules/jaraco_classes/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, isPy27 -, setuptools_scm, toml +, setuptools-scm, toml , more-itertools , pytestCheckHook }: @@ -20,7 +20,7 @@ buildPythonPackage rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools_scm toml ]; + nativeBuildInputs = [ setuptools-scm toml ]; propagatedBuildInputs = [ more-itertools ]; diff --git a/pkgs/development/python-modules/jaraco_collections/default.nix b/pkgs/development/python-modules/jaraco_collections/default.nix index eac4e2ca328a..17bb30e1352a 100644 --- a/pkgs/development/python-modules/jaraco_collections/default.nix +++ b/pkgs/development/python-modules/jaraco_collections/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, setuptools_scm +{ buildPythonPackage, fetchPypi, setuptools-scm , six, jaraco_classes, jaraco_text }: @@ -13,7 +13,7 @@ buildPythonPackage rec { pythonNamespaces = [ "jaraco" ]; doCheck = false; - buildInputs = [ setuptools_scm ]; + buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ six jaraco_classes jaraco_text ]; # break dependency cycle diff --git a/pkgs/development/python-modules/jaraco_functools/2.nix b/pkgs/development/python-modules/jaraco_functools/2.nix index e0bbde47d250..e10a11018a5d 100644 --- a/pkgs/development/python-modules/jaraco_functools/2.nix +++ b/pkgs/development/python-modules/jaraco_functools/2.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, setuptools_scm +, setuptools-scm , more-itertools, backports_functools_lru_cache }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { doCheck = false; - buildInputs = [ setuptools_scm ]; + buildInputs = [ setuptools-scm ]; meta = with lib; { description = "Additional functools in the spirit of stdlib's functools"; diff --git a/pkgs/development/python-modules/jaraco_functools/default.nix b/pkgs/development/python-modules/jaraco_functools/default.nix index 3fa4de9f3d95..534b18764f33 100644 --- a/pkgs/development/python-modules/jaraco_functools/default.nix +++ b/pkgs/development/python-modules/jaraco_functools/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, setuptools_scm, toml +, setuptools-scm, toml , more-itertools, backports_functools_lru_cache }: buildPythonPackage rec { @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "97cf88b46ab544c266e2d81fa17bb183622268722a7dd1a3711ea426e9c26f94"; }; - nativeBuildInputs = [ setuptools_scm toml ]; + nativeBuildInputs = [ setuptools-scm toml ]; propagatedBuildInputs = [ more-itertools backports_functools_lru_cache ]; diff --git a/pkgs/development/python-modules/jaraco_itertools/default.nix b/pkgs/development/python-modules/jaraco_itertools/default.nix index 91bb83fdb5a4..9b34a4c441d4 100644 --- a/pkgs/development/python-modules/jaraco_itertools/default.nix +++ b/pkgs/development/python-modules/jaraco_itertools/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools_scm +{ lib, buildPythonPackage, fetchPypi, setuptools-scm , inflect, more-itertools, six, pytest }: @@ -13,7 +13,7 @@ buildPythonPackage rec { pythonNamespaces = [ "jaraco" ]; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ inflect more-itertools six ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/jaraco_logging/default.nix b/pkgs/development/python-modules/jaraco_logging/default.nix index e378240e6ccc..d8ff10d95b62 100644 --- a/pkgs/development/python-modules/jaraco_logging/default.nix +++ b/pkgs/development/python-modules/jaraco_logging/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools_scm +{ lib, buildPythonPackage, fetchPypi, setuptools-scm , tempora, six }: @@ -13,7 +13,7 @@ buildPythonPackage rec { pythonNamespaces = [ "jaraco" ]; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ tempora six ]; # test no longer packaged with pypi diff --git a/pkgs/development/python-modules/jaraco_stream/2.nix b/pkgs/development/python-modules/jaraco_stream/2.nix index e1737083c86c..1f5a70477a3f 100644 --- a/pkgs/development/python-modules/jaraco_stream/2.nix +++ b/pkgs/development/python-modules/jaraco_stream/2.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, setuptools_scm, six }: +{ buildPythonPackage, fetchPypi, setuptools-scm, six }: buildPythonPackage rec { pname = "jaraco.stream"; @@ -8,6 +8,6 @@ buildPythonPackage rec { sha256 = "196synw4g76yagcflmavi7wakf5cdgsflmvbj7zs616gv03xbsf2"; }; doCheck = false; - buildInputs = [ setuptools_scm ]; + buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ six ]; } diff --git a/pkgs/development/python-modules/jaraco_stream/default.nix b/pkgs/development/python-modules/jaraco_stream/default.nix index f62cb1db8ba8..367959e37ff9 100644 --- a/pkgs/development/python-modules/jaraco_stream/default.nix +++ b/pkgs/development/python-modules/jaraco_stream/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, setuptools_scm, six }: +{ buildPythonPackage, fetchPypi, setuptools-scm, six }: buildPythonPackage rec { pname = "jaraco.stream"; @@ -12,6 +12,6 @@ buildPythonPackage rec { pythonNamespaces = [ "jaraco" ]; doCheck = false; - buildInputs = [ setuptools_scm ]; + buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ six ]; } diff --git a/pkgs/development/python-modules/jaraco_text/default.nix b/pkgs/development/python-modules/jaraco_text/default.nix index fb945d5b3f6f..3126ab999674 100644 --- a/pkgs/development/python-modules/jaraco_text/default.nix +++ b/pkgs/development/python-modules/jaraco_text/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder , importlib-resources , jaraco_functools -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { pythonNamespaces = [ "jaraco" ]; - nativeBuildInputs =[ setuptools_scm ]; + nativeBuildInputs =[ setuptools-scm ]; propagatedBuildInputs = [ jaraco_functools ] ++ lib.optional (pythonOlder "3.7") [ importlib-resources ]; diff --git a/pkgs/development/python-modules/jsonpickle/default.nix b/pkgs/development/python-modules/jsonpickle/default.nix index 78d2a5f6c8ce..a91e6b3accd2 100644 --- a/pkgs/development/python-modules/jsonpickle/default.nix +++ b/pkgs/development/python-modules/jsonpickle/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , pytest -, setuptools_scm +, setuptools-scm , toml , importlib-metadata }: @@ -19,7 +19,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; nativeBuildInputs = [ - setuptools_scm + setuptools-scm toml ]; diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix index d90040c4269f..583936255fde 100644 --- a/pkgs/development/python-modules/jsonschema/default.nix +++ b/pkgs/development/python-modules/jsonschema/default.nix @@ -6,7 +6,7 @@ , nose , pyperf , pyrsistent -, setuptools_scm +, setuptools-scm , twisted , vcversioner }: @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ attrs importlib-metadata functools32 pyrsistent ]; checkInputs = [ nose mock pyperf twisted vcversioner ]; diff --git a/pkgs/development/python-modules/keyring/2.nix b/pkgs/development/python-modules/keyring/2.nix index ee3b42b9bb85..553b649b6382 100644 --- a/pkgs/development/python-modules/keyring/2.nix +++ b/pkgs/development/python-modules/keyring/2.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPythonPackage, fetchPypi -, dbus-python, setuptools_scm, entrypoints, secretstorage +, dbus-python, setuptools-scm, entrypoints, secretstorage , pytest, pytest-flake8 }: buildPythonPackage rec { @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "0f58jq58jhfzlhix7x2zz7c4ycdvcs1z3sgs4lkr4xxx680wrmk7"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; checkInputs = [ pytest pytest-flake8 ]; diff --git a/pkgs/development/python-modules/keyrings-alt/default.nix b/pkgs/development/python-modules/keyrings-alt/default.nix index 5b53d201a0b6..abcd04a1d307 100644 --- a/pkgs/development/python-modules/keyrings-alt/default.nix +++ b/pkgs/development/python-modules/keyrings-alt/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder, isPy27, six -, pytest, backports_unittest-mock, keyring, setuptools_scm, toml +, pytest, backports_unittest-mock, keyring, setuptools-scm, toml }: buildPythonPackage rec { @@ -17,7 +17,7 @@ buildPythonPackage rec { --replace "--flake8" "" ''; - nativeBuildInputs = [ setuptools_scm toml ]; + nativeBuildInputs = [ setuptools-scm toml ]; propagatedBuildInputs = [ six ]; checkInputs = [ pytest keyring ] ++ lib.optional (pythonOlder "3.3") backports_unittest-mock; diff --git a/pkgs/development/python-modules/lazy-object-proxy/default.nix b/pkgs/development/python-modules/lazy-object-proxy/default.nix index 9eaae90f46ed..09232cbc6242 100644 --- a/pkgs/development/python-modules/lazy-object-proxy/default.nix +++ b/pkgs/development/python-modules/lazy-object-proxy/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , pytestCheckHook -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - setuptools_scm + setuptools-scm ]; postPatch = '' diff --git a/pkgs/development/python-modules/makefun/default.nix b/pkgs/development/python-modules/makefun/default.nix index 1f5596a46ccc..731226fdbfb3 100644 --- a/pkgs/development/python-modules/makefun/default.nix +++ b/pkgs/development/python-modules/makefun/default.nix @@ -1,7 +1,7 @@ { lib , fetchPypi , buildPythonPackage -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "sha256-2qNQpILtWLVyREPGUUMhkem5ewyDdDh50JExccaigIU="; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; # Disabling tests for now due to various (transitive) dependencies on modules # from @smarie which are, as of yet, not part of nixpkgs. Also introduces diff --git a/pkgs/development/python-modules/matchpy/default.nix b/pkgs/development/python-modules/matchpy/default.nix index 132be56f19b3..794b2c8f4add 100644 --- a/pkgs/development/python-modules/matchpy/default.nix +++ b/pkgs/development/python-modules/matchpy/default.nix @@ -7,7 +7,7 @@ , pytest , pytestrunner , hypothesis -, setuptools_scm +, setuptools-scm , isPy27 }: @@ -36,7 +36,7 @@ buildPythonPackage rec { --replace "pytest>=3.0,<4.0" "pytest" ''; - buildInputs = [ setuptools_scm pytestrunner ]; + buildInputs = [ setuptools-scm pytestrunner ]; checkInputs = [ pytest hypothesis ]; propagatedBuildInputs = [ hopcroftkarp multiset ]; diff --git a/pkgs/development/python-modules/measurement/default.nix b/pkgs/development/python-modules/measurement/default.nix index 6b7a02a76eb5..c3ce875b4f57 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, pytestrunner, sphinx, setuptools-scm }: buildPythonPackage rec { pname = "measurement"; @@ -19,7 +19,7 @@ buildPythonPackage rec { ''; checkInputs = [ pytest pytestrunner ]; - nativeBuildInputs = [ sphinx setuptools_scm ]; + nativeBuildInputs = [ sphinx setuptools-scm ]; propagatedBuildInputs = [ sympy ]; meta = with lib; { diff --git a/pkgs/development/python-modules/mecab-python3/default.nix b/pkgs/development/python-modules/mecab-python3/default.nix index e3abdaa70916..bb5ffb7de791 100644 --- a/pkgs/development/python-modules/mecab-python3/default.nix +++ b/pkgs/development/python-modules/mecab-python3/default.nix @@ -3,7 +3,7 @@ , fetchPypi , mecab , swig -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -18,7 +18,7 @@ buildPythonPackage rec { nativeBuildInputs = [ mecab # for mecab-config swig - setuptools_scm + setuptools-scm ]; buildInputs = [ mecab ]; diff --git a/pkgs/development/python-modules/multiset/default.nix b/pkgs/development/python-modules/multiset/default.nix index 020617abebf4..e183031b8d95 100644 --- a/pkgs/development/python-modules/multiset/default.nix +++ b/pkgs/development/python-modules/multiset/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, setuptools_scm +, setuptools-scm , pytestrunner , pytest }: @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "4801569c08bfcecfe7b0927b17f079c90f8607aca8fecaf42ded92b737162bc7"; }; - buildInputs = [ setuptools_scm pytestrunner ]; + buildInputs = [ setuptools-scm pytestrunner ]; checkInputs = [ pytest ]; meta = with lib; { diff --git a/pkgs/development/python-modules/nbdime/default.nix b/pkgs/development/python-modules/nbdime/default.nix index 66e1edd93908..221915efca03 100644 --- a/pkgs/development/python-modules/nbdime/default.nix +++ b/pkgs/development/python-modules/nbdime/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, isPy3k , hypothesis -, setuptools_scm +, setuptools-scm , six , attrs , py @@ -52,7 +52,7 @@ buildPythonPackage rec { "test_merge" ]; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ attrs diff --git a/pkgs/development/python-modules/nmigen-boards/default.nix b/pkgs/development/python-modules/nmigen-boards/default.nix index cb7d57f75307..209d1f090779 100644 --- a/pkgs/development/python-modules/nmigen-boards/default.nix +++ b/pkgs/development/python-modules/nmigen-boards/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , nmigen , setuptools -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "1flbcyb2xz174dgqv2964qra80xj2vbzbqwjb27shvxm6knj9ikf"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ setuptools nmigen ]; preBuild = '' diff --git a/pkgs/development/python-modules/nmigen-soc/default.nix b/pkgs/development/python-modules/nmigen-soc/default.nix index b987557d5f68..22422adad92a 100644 --- a/pkgs/development/python-modules/nmigen-soc/default.nix +++ b/pkgs/development/python-modules/nmigen-soc/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , nmigen , setuptools -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "0afmnfs1ms7p1r4c1nc0sfvlcq36zjwaim7775v5i2vajcn3020c"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ setuptools nmigen ]; preBuild = '' diff --git a/pkgs/development/python-modules/numcodecs/default.nix b/pkgs/development/python-modules/numcodecs/default.nix index 89471207c944..ca31e34d297c 100644 --- a/pkgs/development/python-modules/numcodecs/default.nix +++ b/pkgs/development/python-modules/numcodecs/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , isPy27 -, setuptools_scm +, setuptools-scm , cython , numpy , msgpack @@ -22,7 +22,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - setuptools_scm + setuptools-scm cython gcc8 ]; diff --git a/pkgs/development/python-modules/parfive/default.nix b/pkgs/development/python-modules/parfive/default.nix index 45f4a66f2605..7b32cbb55bb3 100644 --- a/pkgs/development/python-modules/parfive/default.nix +++ b/pkgs/development/python-modules/parfive/default.nix @@ -4,7 +4,7 @@ , tqdm , aiohttp , pytest -, setuptools_scm +, setuptools-scm , pytest-localserver , pytest-socket , pytest-asyncio @@ -21,7 +21,7 @@ buildPythonPackage rec { }; buildInputs = [ - setuptools_scm + setuptools-scm ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/path.py/2.nix b/pkgs/development/python-modules/path.py/2.nix index fb4ff20b7076..d7c635c2fe4a 100644 --- a/pkgs/development/python-modules/path.py/2.nix +++ b/pkgs/development/python-modules/path.py/2.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, setuptools_scm +, setuptools-scm , pytest , pytest-flake8 , glibcLocales @@ -21,7 +21,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest pytest-flake8 glibcLocales packaging ]; - buildInputs = [ setuptools_scm ]; + buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ importlib-metadata ] ++ lib.optional isPy27 backports_os diff --git a/pkgs/development/python-modules/path.py/default.nix b/pkgs/development/python-modules/path.py/default.nix index 5a0322edf657..e49b1ceb462c 100644 --- a/pkgs/development/python-modules/path.py/default.nix +++ b/pkgs/development/python-modules/path.py/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, setuptools_scm +, setuptools-scm , pytestCheckHook , pytest-flake8 , glibcLocales @@ -21,7 +21,7 @@ buildPythonPackage rec { }; checkInputs = [ pytestCheckHook pytest-flake8 glibcLocales packaging ]; - buildInputs = [ setuptools_scm ]; + buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ importlib-metadata ]; diff --git a/pkgs/development/python-modules/pdoc3/default.nix b/pkgs/development/python-modules/pdoc3/default.nix index d544f27b988b..66bed253cb86 100644 --- a/pkgs/development/python-modules/pdoc3/default.nix +++ b/pkgs/development/python-modules/pdoc3/default.nix @@ -3,7 +3,7 @@ , Mako , markdown , setuptools-git -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "9df5d931f25f353c69c46819a3bd03ef96dd286f2a70bb1b93a23a781f91faa1"; }; - nativeBuildInputs = [ setuptools-git setuptools_scm ]; + nativeBuildInputs = [ setuptools-git setuptools-scm ]; propagatedBuildInputs = [ Mako markdown ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pint/default.nix b/pkgs/development/python-modules/pint/default.nix index c0aa86a3763d..f39caef6e59d 100644 --- a/pkgs/development/python-modules/pint/default.nix +++ b/pkgs/development/python-modules/pint/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder -, setuptools_scm +, setuptools-scm , importlib-metadata , packaging # Check Inputs @@ -24,7 +24,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ packaging ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; diff --git a/pkgs/development/python-modules/pluggy/default.nix b/pkgs/development/python-modules/pluggy/default.nix index ecb01f252f43..30fa2e1945b2 100644 --- a/pkgs/development/python-modules/pluggy/default.nix +++ b/pkgs/development/python-modules/pluggy/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage , lib , fetchPypi -, setuptools_scm +, setuptools-scm , importlib-metadata }: @@ -21,7 +21,7 @@ buildPythonPackage rec { # To prevent infinite recursion with pytest doCheck = false; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ importlib-metadata ]; diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix index 0429519c2021..da27dd3cd922 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, pytestcov }: buildPythonPackage rec { pname = "portend"; @@ -14,7 +14,7 @@ buildPythonPackage rec { substituteInPlace pytest.ini --replace "--flake8" "" ''; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ tempora ]; diff --git a/pkgs/development/python-modules/prettytable/1.nix b/pkgs/development/python-modules/prettytable/1.nix index 0bd18f0721fc..8191e9b5f579 100644 --- a/pkgs/development/python-modules/prettytable/1.nix +++ b/pkgs/development/python-modules/prettytable/1.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , glibcLocales -, setuptools_scm +, setuptools-scm , wcwidth }: @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "0wcpp1nkicrswb353yn6xd2x535cpif62nw5rgz33c1wj0wzbdvb"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; buildInputs = [ glibcLocales ]; propagatedBuildInputs = [ wcwidth ]; diff --git a/pkgs/development/python-modules/prettytable/default.nix b/pkgs/development/python-modules/prettytable/default.nix index 50b9eb57630e..23702f8e8cfb 100644 --- a/pkgs/development/python-modules/prettytable/default.nix +++ b/pkgs/development/python-modules/prettytable/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , glibcLocales -, setuptools_scm +, setuptools-scm , wcwidth , importlib-metadata , pythonOlder @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "5882ed9092b391bb8f6e91f59bcdbd748924ff556bb7c634089d5519be87baa0"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; buildInputs = [ glibcLocales ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/psautohint/default.nix b/pkgs/development/python-modules/psautohint/default.nix index cfed6dd74cf6..01b249e1c77f 100644 --- a/pkgs/development/python-modules/psautohint/default.nix +++ b/pkgs/development/python-modules/psautohint/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder , fonttools , lxml, fs # for fonttools extras -, setuptools_scm +, setuptools-scm , pytestCheckHook, pytestcov, pytest_xdist }: @@ -25,7 +25,7 @@ buildPythonPackage rec { sed -i '/setup(/a \ version="${version}",' setup.py ''; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ fonttools lxml fs ]; diff --git a/pkgs/development/python-modules/pure-eval/default.nix b/pkgs/development/python-modules/pure-eval/default.nix index 6e504951cdbe..c8fde03d79dc 100644 --- a/pkgs/development/python-modules/pure-eval/default.nix +++ b/pkgs/development/python-modules/pure-eval/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, isPy3k, lib, fetchFromGitHub, setuptools_scm, toml, pytest }: +{ buildPythonPackage, isPy3k, lib, fetchFromGitHub, setuptools-scm, toml, pytest }: buildPythonPackage rec { pname = "pure_eval"; @@ -15,7 +15,7 @@ buildPythonPackage rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; - buildInputs = [ setuptools_scm ]; + buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ toml ]; checkInputs = [ pytest ]; 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 b5ffc1fc0a5d..2f494dcb7002 100644 --- a/pkgs/development/python-modules/py-air-control-exporter/default.nix +++ b/pkgs/development/python-modules/py-air-control-exporter/default.nix @@ -1,6 +1,6 @@ { buildPythonPackage, fetchPypi, flask, isPy27, lib, nixosTests , prometheus_client, py-air-control, pytestCheckHook, pytestcov, pytestrunner -, setuptools_scm }: +, setuptools-scm }: buildPythonPackage rec { pname = "py-air-control-exporter"; @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "ece2e446273542e5c0352c9d6e80d8279132c6ada3649c59e87a711448801a3b"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; checkInputs = [ pytestCheckHook pytestcov pytestrunner ]; propagatedBuildInputs = [ flask prometheus_client py-air-control ]; diff --git a/pkgs/development/python-modules/py/default.nix b/pkgs/development/python-modules/py/default.nix index 26afa14c1ef7..ce7abe4dc273 100644 --- a/pkgs/development/python-modules/py/default.nix +++ b/pkgs/development/python-modules/py/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools_scm }: +{ lib, buildPythonPackage, fetchPypi, setuptools-scm }: buildPythonPackage rec { pname = "py"; @@ -12,7 +12,7 @@ buildPythonPackage rec { # Circular dependency on pytest doCheck = false; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; pythonImportsCheck = [ "py" diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index dabe85b90432..3a375b8d284b 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkg-config, setuptools_scm, six }: +{ lib, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkg-config, setuptools-scm, six }: let _arrow-cpp = arrow-cpp.override { python3 = python; }; @@ -12,7 +12,7 @@ buildPythonPackage rec { sourceRoot = "apache-arrow-${version}/python"; - nativeBuildInputs = [ cmake cython pkg-config setuptools_scm ]; + nativeBuildInputs = [ cmake cython pkg-config setuptools-scm ]; propagatedBuildInputs = [ numpy six ]; checkInputs = [ hypothesis pandas pytestCheckHook pytest-lazy-fixture ]; diff --git a/pkgs/development/python-modules/pybindgen/default.nix b/pkgs/development/python-modules/pybindgen/default.nix index 9e8174f9b7f7..496ae04876d6 100644 --- a/pkgs/development/python-modules/pybindgen/default.nix +++ b/pkgs/development/python-modules/pybindgen/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage, isPy3k, setuptools_scm, pygccxml }: +{ lib, fetchPypi, buildPythonPackage, isPy3k, setuptools-scm, pygccxml }: buildPythonPackage rec { pname = "PyBindGen"; version = "0.21.0"; @@ -8,7 +8,7 @@ buildPythonPackage rec { sha256 = "4501aa3954fdac7bb4c049894f8aa1f0f4e1c1f50cc2303feef9bbe3aecfe364"; }; - buildInputs = [ setuptools_scm ]; + buildInputs = [ setuptools-scm ]; checkInputs = [ pygccxml ]; doCheck = (!isPy3k); # Fails to import module 'cxxfilt' from pygccxml on Py3k diff --git a/pkgs/development/python-modules/pyclipper/default.nix b/pkgs/development/python-modules/pyclipper/default.nix index 27a2a1d80844..0fe3998b3e89 100644 --- a/pkgs/development/python-modules/pyclipper/default.nix +++ b/pkgs/development/python-modules/pyclipper/default.nix @@ -1,7 +1,7 @@ { lib , fetchPypi , buildPythonPackage -, setuptools_scm +, setuptools-scm , cython }: @@ -16,7 +16,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - setuptools_scm + setuptools-scm cython ]; diff --git a/pkgs/development/python-modules/pymediainfo/default.nix b/pkgs/development/python-modules/pymediainfo/default.nix index b04276f1f559..ac054bef9569 100644 --- a/pkgs/development/python-modules/pymediainfo/default.nix +++ b/pkgs/development/python-modules/pymediainfo/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchPypi, buildPythonPackage , libmediainfo -, setuptools_scm +, setuptools-scm , pytest, glibcLocales }: buildPythonPackage rec { @@ -22,7 +22,7 @@ buildPythonPackage rec { "${libmediainfo}/lib/libmediainfo${stdenv.hostPlatform.extensions.sharedLibrary}.0" ''; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; checkInputs = [ glibcLocales pytest ]; diff --git a/pkgs/development/python-modules/pyocr/default.nix b/pkgs/development/python-modules/pyocr/default.nix index 8cfce9ba43f1..099c9e237111 100644 --- a/pkgs/development/python-modules/pyocr/default.nix +++ b/pkgs/development/python-modules/pyocr/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitLab, buildPythonPackage, pillow, setuptools_scm, +{ lib, fetchFromGitLab, buildPythonPackage, pillow, setuptools-scm, setuptools-scm-git-archive , tesseract, cuneiform, isPy3k, substituteAll, pytest, tox }: @@ -23,7 +23,7 @@ buildPythonPackage rec { }) ]; - buildInputs = [ setuptools_scm setuptools-scm-git-archive ]; + buildInputs = [ setuptools-scm setuptools-scm-git-archive ]; propagatedBuildInputs = [ pillow ]; checkInputs = [ pytest tox ]; checkPhase = "pytest"; diff --git a/pkgs/development/python-modules/pysolr/default.nix b/pkgs/development/python-modules/pysolr/default.nix index bf56d7ca56e6..a7f34b9c13a1 100644 --- a/pkgs/development/python-modules/pysolr/default.nix +++ b/pkgs/development/python-modules/pysolr/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools_scm, requests, mock }: +{ lib, buildPythonPackage, fetchPypi, setuptools-scm, requests, mock }: buildPythonPackage rec { pname = "pysolr"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1rj5jmscvxjwcmlfi6hmkj44l4x6n3ln5p7d8d18j566hzmmzw3f"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/pytest-astropy/default.nix b/pkgs/development/python-modules/pytest-astropy/default.nix index 5d5a0de447d2..3df836ee562b 100644 --- a/pkgs/development/python-modules/pytest-astropy/default.nix +++ b/pkgs/development/python-modules/pytest-astropy/default.nix @@ -9,7 +9,7 @@ , pytest-remotedata , pytest-openfiles , pytest-arraydiff -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -22,7 +22,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - setuptools_scm + setuptools-scm ]; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-black/default.nix b/pkgs/development/python-modules/pytest-black/default.nix index 629b4292f86e..918d53c4fa7f 100644 --- a/pkgs/development/python-modules/pytest-black/default.nix +++ b/pkgs/development/python-modules/pytest-black/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchPypi , black , pytest -, setuptools_scm +, setuptools-scm , toml }: @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "1d339b004f764d6cd0f06e690f6dd748df3d62e6fe1a692d6a5500ac2c5b75a5"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-celery/default.nix b/pkgs/development/python-modules/pytest-celery/default.nix index 414cf1ecc9cb..648e5c0fbc8e 100644 --- a/pkgs/development/python-modules/pytest-celery/default.nix +++ b/pkgs/development/python-modules/pytest-celery/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, setuptools_scm }: +{ lib, buildPythonPackage, fetchPypi, pytest, setuptools-scm }: buildPythonPackage rec { pname = "pytest-celery"; diff --git a/pkgs/development/python-modules/pytest-datadir/default.nix b/pkgs/development/python-modules/pytest-datadir/default.nix index 6acdecf5d88c..26c22dfa388b 100644 --- a/pkgs/development/python-modules/pytest-datadir/default.nix +++ b/pkgs/development/python-modules/pytest-datadir/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub -, setuptools_scm, pytest, cmake +, setuptools-scm, pytest, cmake }: buildPythonPackage rec { @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "0kwgp6sqnqnmww5r0dkmyfpi0lmw0iwxz3fnwn2fs8w6bvixzznf"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; preBuild = '' export SETUPTOOLS_SCM_PRETEND_VERSION="${version}" diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix index bfcda812529e..c147996705e2 100644 --- a/pkgs/development/python-modules/pytest-django/default.nix +++ b/pkgs/development/python-modules/pytest-django/default.nix @@ -3,7 +3,7 @@ , fetchPypi , pytest , django -, setuptools_scm +, setuptools-scm , django-configurations , pytest_xdist , six @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "26f02c16d36fd4c8672390deebe3413678d89f30720c16efb8b2a6bf63b9041f"; }; - nativeBuildInputs = [ pytest setuptools_scm ]; + nativeBuildInputs = [ pytest setuptools-scm ]; checkInputs = [ pytest django-configurations pytest_xdist six ]; propagatedBuildInputs = [ django ]; diff --git a/pkgs/development/python-modules/pytest-doctestplus/default.nix b/pkgs/development/python-modules/pytest-doctestplus/default.nix index 2b1ab664a139..01ec38458c9f 100644 --- a/pkgs/development/python-modules/pytest-doctestplus/default.nix +++ b/pkgs/development/python-modules/pytest-doctestplus/default.nix @@ -6,7 +6,7 @@ , pytest , pytestCheckHook , numpy -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -20,7 +20,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - setuptools_scm + setuptools-scm ]; buildInputs = [ pytest diff --git a/pkgs/development/python-modules/pytest-filter-subpackage/default.nix b/pkgs/development/python-modules/pytest-filter-subpackage/default.nix index 67f759cb59f1..148b2c7185fb 100644 --- a/pkgs/development/python-modules/pytest-filter-subpackage/default.nix +++ b/pkgs/development/python-modules/pytest-filter-subpackage/default.nix @@ -5,7 +5,7 @@ , pytestcov , pytest-doctestplus , pytestCheckHook -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -18,7 +18,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - setuptools_scm + setuptools-scm ]; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-flask/default.nix b/pkgs/development/python-modules/pytest-flask/default.nix index f5fd4c5251d4..5fdd5c757d41 100644 --- a/pkgs/development/python-modules/pytest-flask/default.nix +++ b/pkgs/development/python-modules/pytest-flask/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, flask, werkzeug, setuptools_scm, isPy27 }: +{ lib, buildPythonPackage, fetchPypi, pytest, flask, werkzeug, setuptools-scm, isPy27 }: buildPythonPackage rec { pname = "pytest-flask"; @@ -19,7 +19,7 @@ buildPythonPackage rec { werkzeug ]; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; meta = with lib; { homepage = "https://github.com/pytest-dev/pytest-flask/"; diff --git a/pkgs/development/python-modules/pytest-forked/default.nix b/pkgs/development/python-modules/pytest-forked/default.nix index 0cfb8cd6afc8..cbba86641c13 100644 --- a/pkgs/development/python-modules/pytest-forked/default.nix +++ b/pkgs/development/python-modules/pytest-forked/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, setuptools_scm +, setuptools-scm , py , pytest , pytestCheckHook @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "6aa9ac7e00ad1a539c41bec6d21011332de671e938c7637378ec9710204e37ca"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; buildInputs = [ pytest diff --git a/pkgs/development/python-modules/pytest-html/default.nix b/pkgs/development/python-modules/pytest-html/default.nix index 4df30e3f1936..78b2de292f1d 100644 --- a/pkgs/development/python-modules/pytest-html/default.nix +++ b/pkgs/development/python-modules/pytest-html/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder -, pytest, pytest-metadata, setuptools_scm }: +, pytest, pytest-metadata, setuptools-scm }: buildPythonPackage rec { pname = "pytest-html"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "3ee1cf319c913d19fe53aeb0bc400e7b0bc2dbeb477553733db1dad12eb75ee3"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; buildInputs = [ pytest ]; propagatedBuildInputs = [ pytest-metadata ]; diff --git a/pkgs/development/python-modules/pytest-metadata/default.nix b/pkgs/development/python-modules/pytest-metadata/default.nix index 1a03ec2f91d2..9f04cbe407d3 100644 --- a/pkgs/development/python-modules/pytest-metadata/default.nix +++ b/pkgs/development/python-modules/pytest-metadata/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, pytest, setuptools_scm }: +, pytest, setuptools-scm }: buildPythonPackage rec { pname = "pytest-metadata"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "71b506d49d34e539cc3cfdb7ce2c5f072bea5c953320002c95968e0238f8ecf1"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; buildInputs = [ pytest ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pytest-mock/2.nix b/pkgs/development/python-modules/pytest-mock/2.nix index d474d281a686..ad1e7f0c3fd3 100644 --- a/pkgs/development/python-modules/pytest-mock/2.nix +++ b/pkgs/development/python-modules/pytest-mock/2.nix @@ -5,7 +5,7 @@ , isPy3k , pytest , mock -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = lib.optional (!isPy3k) mock; nativeBuildInputs = [ - setuptools_scm + setuptools-scm ]; checkInputs = [ diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix index a39e2e716ea4..5be8529433fc 100644 --- a/pkgs/development/python-modules/pytest-mock/default.nix +++ b/pkgs/development/python-modules/pytest-mock/default.nix @@ -3,7 +3,7 @@ , fetchPypi , pytest-asyncio , pytestCheckHook -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "1z6r3n78bilfzkbxj083p0ib04ia1bhfgnj2qq9x6q4mmykapqm1"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; checkInputs = [ pytest-asyncio diff --git a/pkgs/development/python-modules/pytest-mypy/default.nix b/pkgs/development/python-modules/pytest-mypy/default.nix index 88b8017e1c09..8c52fa2e6988 100644 --- a/pkgs/development/python-modules/pytest-mypy/default.nix +++ b/pkgs/development/python-modules/pytest-mypy/default.nix @@ -4,7 +4,7 @@ , filelock , pytest , mypy -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "1fa55723a4bf1d054fcba1c3bd694215a2a65cc95ab10164f5808afd893f3b11"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-openfiles/default.nix b/pkgs/development/python-modules/pytest-openfiles/default.nix index baa5438dfa88..573dbf275117 100644 --- a/pkgs/development/python-modules/pytest-openfiles/default.nix +++ b/pkgs/development/python-modules/pytest-openfiles/default.nix @@ -5,7 +5,7 @@ , pytest , pytestCheckHook , psutil -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "179c2911d8aee3441fee051aba08e0d9b4dab61b829ae4811906d5c49a3b0a58"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-qt/default.nix b/pkgs/development/python-modules/pytest-qt/default.nix index c91c3eae4abe..4add58efbca3 100644 --- a/pkgs/development/python-modules/pytest-qt/default.nix +++ b/pkgs/development/python-modules/pytest-qt/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, setuptools_scm +, setuptools-scm , pytest , pyqt5 }: @@ -16,7 +16,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - setuptools_scm + setuptools-scm ]; buildInputs = [ diff --git a/pkgs/development/python-modules/pytest-repeat/default.nix b/pkgs/development/python-modules/pytest-repeat/default.nix index b90e8ebef385..0652bcacbccd 100644 --- a/pkgs/development/python-modules/pytest-repeat/default.nix +++ b/pkgs/development/python-modules/pytest-repeat/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, setuptools_scm +, setuptools-scm , pytest , fetchpatch }: @@ -16,7 +16,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - setuptools_scm + setuptools-scm ]; checkInputs = [ diff --git a/pkgs/development/python-modules/pytest-services/default.nix b/pkgs/development/python-modules/pytest-services/default.nix index 70caefea8953..4f2a577bb4db 100644 --- a/pkgs/development/python-modules/pytest-services/default.nix +++ b/pkgs/development/python-modules/pytest-services/default.nix @@ -5,7 +5,7 @@ , requests , psutil , pytest -, setuptools_scm +, setuptools-scm , subprocess32 ? null , toml , zc_lockfile @@ -21,7 +21,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - setuptools_scm + setuptools-scm toml ]; diff --git a/pkgs/development/python-modules/pytest-xdist/1.nix b/pkgs/development/python-modules/pytest-xdist/1.nix index fa794f94141a..466d86f50f78 100644 --- a/pkgs/development/python-modules/pytest-xdist/1.nix +++ b/pkgs/development/python-modules/pytest-xdist/1.nix @@ -1,5 +1,5 @@ { lib, fetchPypi, buildPythonPackage, execnet, pytest -, setuptools_scm, pytest-forked, filelock, psutil, six, isPy3k }: +, setuptools-scm, pytest-forked, filelock, psutil, six, isPy3k }: buildPythonPackage rec { pname = "pytest-xdist"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "1vh4ps32lp5ignch5adbl3pgchvigdfmrl6qpmhxih54wa1qw3il"; }; - nativeBuildInputs = [ setuptools_scm pytest ]; + nativeBuildInputs = [ setuptools-scm pytest ]; checkInputs = [ pytest filelock ]; propagatedBuildInputs = [ execnet pytest-forked psutil six ]; diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index bbc08fb59df4..f87169a630bd 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , isPy27 -, setuptools_scm +, setuptools-scm , pytestCheckHook , filelock , execnet @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "718887296892f92683f6a51f25a3ae584993b06f7076ce1e1fd482e59a8220a2"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-xprocess/default.nix b/pkgs/development/python-modules/pytest-xprocess/default.nix index 5949840d1e81..0695b49191b4 100644 --- a/pkgs/development/python-modules/pytest-xprocess/default.nix +++ b/pkgs/development/python-modules/pytest-xprocess/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchPypi , psutil , pytest -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "59c739edee7f3f2258e7c77989241698e356c552f5efb28bb46b478616888bf6"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest/4.nix b/pkgs/development/python-modules/pytest/4.nix index f30eec15a0a8..c764b55d1f10 100644 --- a/pkgs/development/python-modules/pytest/4.nix +++ b/pkgs/development/python-modules/pytest/4.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, pythonOlder, fetchPypi, attrs, hypothesis, py -, setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools +, setuptools-scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools , atomicwrites, mock, writeText, pathlib2, wcwidth, packaging, isPyPy }: buildPythonPackage rec { @@ -12,7 +12,7 @@ buildPythonPackage rec { }; checkInputs = [ hypothesis mock ]; - buildInputs = [ setuptools_scm ]; + buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites wcwidth packaging ] ++ lib.optionals (!isPy3k) [ funcsigs ] ++ lib.optionals (pythonOlder "3.6") [ pathlib2 ]; diff --git a/pkgs/development/python-modules/pytest/5.nix b/pkgs/development/python-modules/pytest/5.nix index 341d5ac2240d..b3e69578d7eb 100644 --- a/pkgs/development/python-modules/pytest/5.nix +++ b/pkgs/development/python-modules/pytest/5.nix @@ -12,7 +12,7 @@ , pygments , python , setuptools -, setuptools_scm +, setuptools-scm , six , toml , wcwidth @@ -31,7 +31,7 @@ buildPythonPackage rec { }; checkInputs = [ hypothesis pygments ]; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ atomicwrites attrs diff --git a/pkgs/development/python-modules/pytestrunner/2.nix b/pkgs/development/python-modules/pytestrunner/2.nix index d6203276b827..bea83146c37d 100644 --- a/pkgs/development/python-modules/pytestrunner/2.nix +++ b/pkgs/development/python-modules/pytestrunner/2.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools_scm, pytest }: +{ lib, buildPythonPackage, fetchPypi, setuptools-scm, pytest }: buildPythonPackage rec { pname = "pytest-runner"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "96c7e73ead7b93e388c5d614770d2bae6526efd997757d3543fe17b557a0942b"; }; - nativeBuildInputs = [ setuptools_scm pytest ]; + nativeBuildInputs = [ setuptools-scm pytest ]; postPatch = '' rm pytest.ini diff --git a/pkgs/development/python-modules/pytestrunner/default.nix b/pkgs/development/python-modules/pytestrunner/default.nix index 6f68bcd02354..897efebf1dca 100644 --- a/pkgs/development/python-modules/pytestrunner/default.nix +++ b/pkgs/development/python-modules/pytestrunner/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools_scm, pytest }: +{ lib, buildPythonPackage, fetchPypi, setuptools-scm, pytest }: buildPythonPackage rec { pname = "pytest-runner"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "ca3f58ff4957e8be6c54c55d575b235725cbbcf4dc0d5091c29c6444cfc8a5fe"; }; - nativeBuildInputs = [ setuptools_scm pytest ]; + nativeBuildInputs = [ setuptools-scm pytest ]; postPatch = '' rm pytest.ini diff --git a/pkgs/development/python-modules/python-lz4/default.nix b/pkgs/development/python-modules/python-lz4/default.nix index b851ed6b826f..95208c7b94b6 100644 --- a/pkgs/development/python-modules/python-lz4/default.nix +++ b/pkgs/development/python-modules/python-lz4/default.nix @@ -8,7 +8,7 @@ , pytest , pytestcov , pytestrunner -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -23,11 +23,11 @@ buildPythonPackage rec { sha256 = "009c4rbyj4cjb8fznccfpr5wrzdmi56wq990yjh22n0z2qqylmkf"; }; - nativeBuildInputs = [ setuptools_scm pkgconfig pytestrunner ]; + nativeBuildInputs = [ setuptools-scm pkgconfig pytestrunner ]; checkInputs = [ pytest pytestcov psutil ]; propagatedBuildInputs = lib.optionals (!isPy3k) [ future ]; - # give a hint to setuptools_scm on package version + # give a hint to setuptools-scm on package version preBuild = '' export SETUPTOOLS_SCM_PRETEND_VERSION="v${version}" ''; diff --git a/pkgs/development/python-modules/pyusb/default.nix b/pkgs/development/python-modules/pyusb/default.nix index 1ad312dd5d6a..43ae18741e1d 100644 --- a/pkgs/development/python-modules/pyusb/default.nix +++ b/pkgs/development/python-modules/pyusb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, libusb1, setuptools_scm }: +{ lib, stdenv, fetchPypi, buildPythonPackage, libusb1, setuptools-scm }: buildPythonPackage rec { pname = "pyusb"; @@ -10,7 +10,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - setuptools_scm + setuptools-scm ]; # Fix the USB backend library lookup diff --git a/pkgs/development/python-modules/pyvcd/default.nix b/pkgs/development/python-modules/pyvcd/default.nix index 3684fee0d22e..09f995412fcd 100644 --- a/pkgs/development/python-modules/pyvcd/default.nix +++ b/pkgs/development/python-modules/pyvcd/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder -, setuptools_scm +, setuptools-scm , six , pytest }: @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "071e51a8362908ad5a2a12f078185639b98b20b653a56f01679de169d0fa425d"; }; - buildInputs = [ setuptools_scm ]; + buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ six ]; checkPhase = '' diff --git a/pkgs/development/python-modules/reproject/default.nix b/pkgs/development/python-modules/reproject/default.nix index 98bed15cfa06..999c68823805 100644 --- a/pkgs/development/python-modules/reproject/default.nix +++ b/pkgs/development/python-modules/reproject/default.nix @@ -10,7 +10,7 @@ , scipy , pytest , pytest-astropy -, setuptools_scm +, setuptools-scm , cython }: @@ -32,7 +32,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ numpy astropy astropy-healpix astropy-helpers scipy ]; - nativeBuildInputs = [ astropy-helpers cython astropy-extension-helpers setuptools_scm ]; + nativeBuildInputs = [ astropy-helpers cython astropy-extension-helpers setuptools-scm ]; checkInputs = [ pytest pytest-astropy ]; # Tests must be run in the build directory diff --git a/pkgs/development/python-modules/sapi-python-client/default.nix b/pkgs/development/python-modules/sapi-python-client/default.nix index 222b4c60c7f2..58cdfe646c65 100644 --- a/pkgs/development/python-modules/sapi-python-client/default.nix +++ b/pkgs/development/python-modules/sapi-python-client/default.nix @@ -1,4 +1,4 @@ -{ lib, git, setuptools, setuptools_scm, fetchFromGitHub, requests, boto3, buildPythonPackage, responses }: +{ lib, git, setuptools, setuptools-scm, fetchFromGitHub, requests, boto3, buildPythonPackage, responses }: buildPythonPackage rec { pname = "sapi-python-client"; @@ -17,7 +17,7 @@ buildPythonPackage rec { doCheck = false; # requires API token and an active keboola bucket - nativeBuildInputs = [ git setuptools_scm ]; + nativeBuildInputs = [ git setuptools-scm ]; propagatedBuildInputs = [ setuptools requests boto3 responses ]; diff --git a/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix b/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix index 98795eadfd4d..5dbb8ca2d10f 100644 --- a/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix +++ b/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools_scm, pytest }: +{ lib, buildPythonPackage, fetchPypi, setuptools-scm, pytest }: buildPythonPackage rec { pname = "setuptools-scm-git-archive"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "6026f61089b73fa1b5ee737e95314f41cb512609b393530385ed281d0b46c062"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/setuptools_scm/2.nix b/pkgs/development/python-modules/setuptools-scm/2.nix similarity index 100% rename from pkgs/development/python-modules/setuptools_scm/2.nix rename to pkgs/development/python-modules/setuptools-scm/2.nix diff --git a/pkgs/development/python-modules/setuptools_scm/default.nix b/pkgs/development/python-modules/setuptools-scm/default.nix similarity index 100% rename from pkgs/development/python-modules/setuptools_scm/default.nix rename to pkgs/development/python-modules/setuptools-scm/default.nix diff --git a/pkgs/development/python-modules/sievelib/default.nix b/pkgs/development/python-modules/sievelib/default.nix index 7fd955abd17c..de023377c050 100644 --- a/pkgs/development/python-modules/sievelib/default.nix +++ b/pkgs/development/python-modules/sievelib/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, fetchpatch, mock -, future, six, setuptools_scm }: +, future, six, setuptools-scm }: buildPythonPackage rec { pname = "sievelib"; @@ -23,7 +23,7 @@ buildPythonPackage rec { }) ]; - buildInputs = [ setuptools_scm ]; + buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ future six ]; checkInputs = [ mock ]; diff --git a/pkgs/development/python-modules/simpy/default.nix b/pkgs/development/python-modules/simpy/default.nix index f718b3655f6f..ff139523e1f4 100644 --- a/pkgs/development/python-modules/simpy/default.nix +++ b/pkgs/development/python-modules/simpy/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, isPy27, lib, setuptools, setuptools_scm +{ buildPythonPackage, fetchPypi, isPy27, lib, setuptools, setuptools-scm , pytestCheckHook }: buildPythonPackage rec { @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "b36542e2faab612f861c5ef4da17220ac1553f5892b3583c67281dbe4faad404"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/snscrape/default.nix b/pkgs/development/python-modules/snscrape/default.nix index b7d7f25614d9..a8f565aa3533 100644 --- a/pkgs/development/python-modules/snscrape/default.nix +++ b/pkgs/development/python-modules/snscrape/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , isPy3k , fetchPypi -, setuptools_scm +, setuptools-scm , setuptools , requests , lxml @@ -26,7 +26,7 @@ buildPythonPackage rec { snscrape --help ''; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ setuptools requests lxml beautifulsoup4 ]; meta = with lib; { diff --git a/pkgs/development/python-modules/sorl_thumbnail/default.nix b/pkgs/development/python-modules/sorl_thumbnail/default.nix index daeca60c1e14..4a6f1c1ae9d7 100644 --- a/pkgs/development/python-modules/sorl_thumbnail/default.nix +++ b/pkgs/development/python-modules/sorl_thumbnail/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , isPy27 -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "fbe6dfd66a1aceb7e0203895ff5622775e50266f8d8cfd841fe1500bd3e19018"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; # Disabled due to an improper configuration error when tested against django. This looks like something broken in the test cases for sorl. doCheck = false; diff --git a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix index a9548305d3bd..c85d967222e3 100644 --- a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , isPy27 -, setuptools_scm +, setuptools-scm , m2r , pyyaml , jsonschema @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "1c1bd10d7653912c59a42f727c62cbb7b75f7905ddd9ccc477ebfd1bc69f0cf3"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ pyyaml jsonschema m2r sphinxcontrib_httpdomain ]; doCheck = false; diff --git a/pkgs/development/python-modules/stack-data/default.nix b/pkgs/development/python-modules/stack-data/default.nix index 71f114e3528b..f529a8a00b00 100644 --- a/pkgs/development/python-modules/stack-data/default.nix +++ b/pkgs/development/python-modules/stack-data/default.nix @@ -8,7 +8,7 @@ , pure-eval , pygments , pytestCheckHook -, setuptools_scm +, setuptools-scm , toml , typeguard }: @@ -28,7 +28,7 @@ buildPythonPackage rec { nativeBuildInputs = [ git - setuptools_scm + setuptools-scm toml ]; diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index 0536b0f2ccd4..734bfc645027 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, setuptools_scm, pytest, pytest-freezegun, freezegun, backports_unittest-mock +, setuptools-scm, pytest, pytest-freezegun, freezegun, backports_unittest-mock , six, pytz, jaraco_functools, pythonOlder , pytest-flake8, pytestcov, pytest-black, pytest-mypy }: @@ -15,7 +15,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.2"; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ six pytz jaraco_functools ]; diff --git a/pkgs/development/python-modules/tenacity/default.nix b/pkgs/development/python-modules/tenacity/default.nix index c1c0abcec241..4591677cdf9e 100644 --- a/pkgs/development/python-modules/tenacity/default.nix +++ b/pkgs/development/python-modules/tenacity/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, isPy27, isPy3k -, pbr, six, futures ? null, monotonic ? null, typing ? null, setuptools_scm +, pbr, six, futures ? null, monotonic ? null, typing ? null, setuptools-scm , pytest, sphinx, tornado, typeguard }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "5bd16ef5d3b985647fe28dfa6f695d343aa26479a04e8792b9d3c8f49e361ae1"; }; - nativeBuildInputs = [ pbr setuptools_scm ]; + nativeBuildInputs = [ pbr setuptools-scm ]; propagatedBuildInputs = [ six ] ++ lib.optionals isPy27 [ futures monotonic typing ]; diff --git a/pkgs/development/python-modules/tiledb/default.nix b/pkgs/development/python-modules/tiledb/default.nix index ddfa83e30f58..bdd6ad241158 100644 --- a/pkgs/development/python-modules/tiledb/default.nix +++ b/pkgs/development/python-modules/tiledb/default.nix @@ -8,7 +8,7 @@ , numpy , wheel , isPy3k -, setuptools_scm +, setuptools-scm , psutil , pandas }: @@ -28,7 +28,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cython pybind11 - setuptools_scm + setuptools-scm ]; buildInputs = [ diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index 0fc0ffbf2e72..a90b3dcfdf14 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -6,7 +6,7 @@ , py , six , virtualenv -, setuptools_scm +, setuptools-scm , toml , filelock }: @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "tox"; version = "3.23.0"; - buildInputs = [ setuptools_scm ]; + buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ packaging pluggy py six virtualenv toml filelock ]; doCheck = false; diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index ae89b3ee0b07..b941727189ea 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -2,7 +2,7 @@ , stdenv , buildPythonPackage , fetchPypi -, setuptools_scm +, setuptools-scm , pytestCheckHook , pytest-asyncio , pytest-timeout @@ -22,7 +22,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - setuptools_scm + setuptools-scm ]; checkInputs = [ diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix index 9a246faff51c..b78f38c46cf8 100644 --- a/pkgs/development/python-modules/twine/default.nix +++ b/pkgs/development/python-modules/twine/default.nix @@ -6,7 +6,7 @@ , readme_renderer , requests , requests_toolbelt -, setuptools_scm +, setuptools-scm , tqdm , colorama , rfc3986 @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "a56c985264b991dc8a8f4234eb80c5af87fa8080d0c224ad8f2cd05a2c22e83b"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ importlib-metadata keyring diff --git a/pkgs/development/python-modules/ufonormalizer/default.nix b/pkgs/development/python-modules/ufonormalizer/default.nix index c88fe994ee82..357c09ab4e8d 100644 --- a/pkgs/development/python-modules/ufonormalizer/default.nix +++ b/pkgs/development/python-modules/ufonormalizer/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder, setuptools_scm }: +{ lib, buildPythonPackage, fetchPypi, pythonOlder, setuptools-scm }: buildPythonPackage rec { pname = "ufonormalizer"; @@ -12,7 +12,7 @@ buildPythonPackage rec { extension = "zip"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; meta = with lib; { description = "Script to normalize the XML and other data inside of a UFO"; diff --git a/pkgs/development/python-modules/ufoprocessor/default.nix b/pkgs/development/python-modules/ufoprocessor/default.nix index b0f5b11ad3a4..540aadd90132 100644 --- a/pkgs/development/python-modules/ufoprocessor/default.nix +++ b/pkgs/development/python-modules/ufoprocessor/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchPypi , defcon, fonttools, lxml, fs , mutatormath, fontmath, fontparts -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -14,7 +14,7 @@ buildPythonPackage rec { extension = "zip"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ defcon diff --git a/pkgs/development/python-modules/ujson/2.nix b/pkgs/development/python-modules/ujson/2.nix index 36aa5a020c35..d9ec65c2392e 100644 --- a/pkgs/development/python-modules/ujson/2.nix +++ b/pkgs/development/python-modules/ujson/2.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, setuptools_scm +, setuptools-scm , pytestCheckHook }: @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "18z9gb9ggy1r464b9q1gqs078mqgrkj6dys5a47529rqk3yfybdx"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; checkInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/ujson/default.nix b/pkgs/development/python-modules/ujson/default.nix index d93ee9f5af70..ab1f3e2b7cab 100644 --- a/pkgs/development/python-modules/ujson/default.nix +++ b/pkgs/development/python-modules/ujson/default.nix @@ -3,7 +3,7 @@ , fetchPypi , isPy3k , isPyPy -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "c615a9e9e378a7383b756b7e7a73c38b22aeb8967a8bfbffd4741f7ffd043c4d"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; meta = with lib; { homepage = "https://pypi.python.org/pypi/ujson"; diff --git a/pkgs/development/python-modules/variants/default.nix b/pkgs/development/python-modules/variants/default.nix index 3a45230720e2..a9345b374a7e 100644 --- a/pkgs/development/python-modules/variants/default.nix +++ b/pkgs/development/python-modules/variants/default.nix @@ -2,7 +2,7 @@ , isPy27 , fetchPypi , pytestrunner -, setuptools_scm +, setuptools-scm , singledispatch ? null , pytest , lib @@ -19,7 +19,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pytestrunner - setuptools_scm + setuptools-scm ]; checkInputs = [ diff --git a/pkgs/development/python-modules/vdirsyncer/default.nix b/pkgs/development/python-modules/vdirsyncer/default.nix index 01ab42ed9c36..eb720c7f2066 100644 --- a/pkgs/development/python-modules/vdirsyncer/default.nix +++ b/pkgs/development/python-modules/vdirsyncer/default.nix @@ -14,7 +14,7 @@ , pytestCheckHook , pytest-localserver , pytest-subtesthack -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -36,7 +36,7 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ - setuptools_scm + setuptools-scm ]; checkInputs = [ diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index bcd672601534..b25f162baefb 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -16,7 +16,7 @@ , pytest-timeout , pytestCheckHook , pythonOlder -, setuptools_scm +, setuptools-scm , six , stdenv }: @@ -31,7 +31,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - setuptools_scm + setuptools-scm ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/vispy/default.nix b/pkgs/development/python-modules/vispy/default.nix index 6dd32508befa..5524258a7e82 100644 --- a/pkgs/development/python-modules/vispy/default.nix +++ b/pkgs/development/python-modules/vispy/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, substituteAll, stdenv, fetchPypi, numpy, cython, freetype-py, fontconfig, libGL, - setuptools_scm, setuptools-scm-git-archive + setuptools-scm, setuptools-scm-git-archive }: buildPythonPackage rec { @@ -21,7 +21,7 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ - cython setuptools_scm setuptools-scm-git-archive + cython setuptools-scm setuptools-scm-git-archive ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/word2vec/default.nix b/pkgs/development/python-modules/word2vec/default.nix index bda8f59d2ef4..b078231c9429 100644 --- a/pkgs/development/python-modules/word2vec/default.nix +++ b/pkgs/development/python-modules/word2vec/default.nix @@ -6,7 +6,7 @@ , numpy , scikit-learn , six -, setuptools_scm +, setuptools-scm , gcc , pytest , pytestcov @@ -28,7 +28,7 @@ buildPythonPackage rec { sha256 = "222d8ffb47f385c43eba45e3f308e605fc9736b2b7137d74979adf1a31e7c8b4"; }; - nativeBuildInputs = [ setuptools_scm gcc ]; + nativeBuildInputs = [ setuptools-scm gcc ]; propagatedBuildInputs = [ cython numpy scikit-learn six ]; diff --git a/pkgs/development/python-modules/xlib/default.nix b/pkgs/development/python-modules/xlib/default.nix index 1819fd5a5124..cfb72680fa8b 100644 --- a/pkgs/development/python-modules/xlib/default.nix +++ b/pkgs/development/python-modules/xlib/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , six -, setuptools_scm +, setuptools-scm , xorg , python , mock @@ -26,7 +26,7 @@ buildPythonPackage rec { ''; checkInputs = [ mock nose util-linux /* mcookie */ xorg.xauth xorg.xorgserver /* xvfb */ ]; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; buildInputs = [ xorg.libX11 ]; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix index 3d21bbb3fe39..5c43494d28d7 100644 --- a/pkgs/development/python-modules/zarr/default.nix +++ b/pkgs/development/python-modules/zarr/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , isPy27 , fetchPypi -, setuptools_scm +, setuptools-scm , asciitree , numpy , fasteners @@ -21,7 +21,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - setuptools_scm + setuptools-scm ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zipp/1.nix b/pkgs/development/python-modules/zipp/1.nix index 0de729928d0f..ab9603926770 100644 --- a/pkgs/development/python-modules/zipp/1.nix +++ b/pkgs/development/python-modules/zipp/1.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, setuptools_scm +, setuptools-scm , pytest , pytest-flake8 , more-itertools @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "0v3qayhqv7vyzydpydwcp51bqciw8p2ajddw68x5k8zppc0vx3yk"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ more-itertools ]; diff --git a/pkgs/development/python-modules/zipp/default.nix b/pkgs/development/python-modules/zipp/default.nix index ccb916a147a7..7ef26dbd7606 100644 --- a/pkgs/development/python-modules/zipp/default.nix +++ b/pkgs/development/python-modules/zipp/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, setuptools_scm +, setuptools-scm , pytest , pytest-flake8 , more-itertools @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "3607921face881ba3e026887d8150cca609d517579abe052ac81fc5aeffdbd76"; }; - nativeBuildInputs = [ setuptools_scm toml ]; + nativeBuildInputs = [ setuptools-scm toml ]; propagatedBuildInputs = [ more-itertools ]; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 06c366529df3..8750b61c48fa 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -28,7 +28,7 @@ in python3.pkgs.buildPythonPackage rec { inherit pname version disabled src; - nativeBuildInputs = with python3.pkgs; [ setuptools_scm ]; + nativeBuildInputs = with python3.pkgs; [ setuptools-scm ]; propagatedBuildInputs = with python3.pkgs; [ pytest diff --git a/pkgs/development/tools/dt-schema/default.nix b/pkgs/development/tools/dt-schema/default.nix index 7f439d9b59e8..9ba53881bf35 100644 --- a/pkgs/development/tools/dt-schema/default.nix +++ b/pkgs/development/tools/dt-schema/default.nix @@ -6,7 +6,7 @@ , jsonschema , rfc3987 , setuptools -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "d9f88f069068dc5dc7e895785d7172d260cbbc34cab3b52704b20e89b80c6de8"; }; - nativeBuildInputs = [ setuptools_scm git ]; + nativeBuildInputs = [ setuptools-scm git ]; propagatedBuildInputs = [ setuptools ruamel_yaml diff --git a/pkgs/development/tools/misc/tinyprog/default.nix b/pkgs/development/tools/misc/tinyprog/default.nix index 4618906038eb..06a8c3e98712 100644 --- a/pkgs/development/tools/misc/tinyprog/default.nix +++ b/pkgs/development/tools/misc/tinyprog/default.nix @@ -28,7 +28,7 @@ with python3Packages; buildPythonApplication rec { pyusb ]; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; preBuild = '' export SETUPTOOLS_SCM_PRETEND_VERSION="${version}" diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index 9b55b72c2fa0..712baf613e4e 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -210,7 +210,7 @@ lib.makeScope pkgs.newScope (self: { poetry = if __isBootstrap then null else poetryPkg; # The canonical name is setuptools-scm - setuptools-scm = super.setuptools_scm; + setuptools-scm = super.setuptools-scm; __toPluginAble = toPluginAble self; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix index b403e9941f34..193e44935b42 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix @@ -89,7 +89,7 @@ pythonPackages.callPackage # Prevent infinite recursion skipSetupToolsSCM = [ - "setuptools_scm" + "setuptools-scm" "setuptools-scm" "toml" # Toml is an extra for setuptools-scm ]; diff --git a/pkgs/games/portmod/default.nix b/pkgs/games/portmod/default.nix index 464939084c21..9db57d3e0a94 100644 --- a/pkgs/games/portmod/default.nix +++ b/pkgs/games/portmod/default.nix @@ -48,7 +48,7 @@ python3Packages.buildPythonApplication rec { ''; propagatedBuildInputs = with python3Packages; [ - setuptools_scm + setuptools-scm setuptools requests chardet diff --git a/pkgs/tools/X11/caffeine-ng/default.nix b/pkgs/tools/X11/caffeine-ng/default.nix index 8493d312eb47..cadfa2c99973 100644 --- a/pkgs/tools/X11/caffeine-ng/default.nix +++ b/pkgs/tools/X11/caffeine-ng/default.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ wrapGAppsHook glib ]; buildInputs = [ gdk-pixbuf gobject-introspection libnotify gtk3 - python3Packages.setuptools_scm + python3Packages.setuptools-scm ]; pythonPath = with python3Packages; [ dbus-python docopt ewmh pygobject3 pyxdg diff --git a/pkgs/tools/admin/salt/pepper/default.nix b/pkgs/tools/admin/salt/pepper/default.nix index 0c6e9dc0ab23..25d3eaa15fc8 100644 --- a/pkgs/tools/admin/salt/pepper/default.nix +++ b/pkgs/tools/admin/salt/pepper/default.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { sha256 = "1wh6yidwdk8jvjpr5g3azhqgsk24c5rlzmw6l86dmi0mpvmxm94w"; }; - buildInputs = with python3Packages; [ setuptools setuptools_scm salt ]; + buildInputs = with python3Packages; [ setuptools setuptools-scm salt ]; checkInputs = with python3Packages; [ pytest mock pyzmq pytest-rerunfailures pytestcov cherrypy tornado ]; diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix index 393d9d145c2e..88b0e6147736 100644 --- a/pkgs/tools/admin/simp_le/default.nix +++ b/pkgs/tools/admin/simp_le/default.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { $out/bin/simp_le --test ''; - propagatedBuildInputs = with python3Packages; [ acme setuptools_scm josepy idna ]; + propagatedBuildInputs = with python3Packages; [ acme setuptools-scm josepy idna ]; checkInputs = with python3Packages; [ mock ]; diff --git a/pkgs/tools/misc/adafruit-ampy/default.nix b/pkgs/tools/misc/adafruit-ampy/default.nix index c9466f54a621..8a07b2c6c9cb 100644 --- a/pkgs/tools/misc/adafruit-ampy/default.nix +++ b/pkgs/tools/misc/adafruit-ampy/default.nix @@ -11,7 +11,7 @@ buildPythonApplication rec { sha256 = "1dz5sksalccv4c3bzk3c1jxpg3s28lwlw8hfwc9dfxhw3a1np3fd"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ click python-dotenv pyserial ]; # No tests diff --git a/pkgs/tools/misc/bepasty/default.nix b/pkgs/tools/misc/bepasty/default.nix index 460f20a5f5f9..69a784ec4cc3 100644 --- a/pkgs/tools/misc/bepasty/default.nix +++ b/pkgs/tools/misc/bepasty/default.nix @@ -36,7 +36,7 @@ in with python.pkgs; buildPythonPackage rec { xstatic-pygments ]; - buildInputs = [ setuptools_scm ]; + buildInputs = [ setuptools-scm ]; src = fetchPypi { inherit pname version; diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix index f82dc0e4bc01..db76c9913f60 100644 --- a/pkgs/tools/package-management/protontricks/default.nix +++ b/pkgs/tools/package-management/protontricks/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonApplication , fetchFromGitHub -, setuptools_scm +, setuptools-scm , vdf , bash , steam-run @@ -27,7 +27,7 @@ buildPythonApplication rec { ]; SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ vdf ]; makeWrapperArgs = [ diff --git a/pkgs/tools/package-management/reuse/default.nix b/pkgs/tools/package-management/reuse/default.nix index af072de3e144..bc6ca60a9e7b 100644 --- a/pkgs/tools/package-management/reuse/default.nix +++ b/pkgs/tools/package-management/reuse/default.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { license-expression requests setuptools - setuptools_scm + setuptools-scm ]; checkInputs = with python3Packages; [ pytestCheckHook ]; diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index dbdd94a3d5c9..9fd57c82e88f 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { patches = [ ./sudo.patch ]; - nativeBuildInputs = [ makeWrapper python3Packages.setuptools_scm ]; + nativeBuildInputs = [ makeWrapper python3Packages.setuptools-scm ]; checkInputs = with python3Packages; [ mock pytest pytestcov pytestrunner flake8 ]; diff --git a/pkgs/tools/text/ocrmypdf/default.nix b/pkgs/tools/text/ocrmypdf/default.nix index 99e2bf065086..0e13e4c5f35c 100644 --- a/pkgs/tools/text/ocrmypdf/default.nix +++ b/pkgs/tools/text/ocrmypdf/default.nix @@ -43,7 +43,7 @@ buildPythonApplication rec { nativeBuildInputs = with python3Packages; [ setuptools setuptools-scm-git-archive - setuptools_scm + setuptools-scm ]; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index dbbe5ca57f10..f11a9dc3c0b2 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -36,5 +36,6 @@ mapAliases ({ smart_open = smart-open; # added 2021-03-14 google_api_python_client = google-api-python-client; # added 2021-03-19 googleapis_common_protos = googleapis-common-protos; # added 2021-03-19 - MechanicalSoup = mechanicalsoup; # added 2021-06-01 + MechanicalSoup = mechanicalsoup; # added 2021-06-01 + 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 5444bff767c6..31847d1367de 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7622,8 +7622,7 @@ in { setuptools-rust = callPackage ../development/python-modules/setuptools-rust { }; - setuptools-scm = self.setuptools_scm; # added 2021-01-04 - setuptools_scm = callPackage ../development/python-modules/setuptools_scm { }; + setuptools-scm = callPackage ../development/python-modules/setuptools-scm { }; setuptools-scm-git-archive = callPackage ../development/python-modules/setuptools-scm-git-archive { }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 221da6daa9aa..bc37fd28db08 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -548,7 +548,7 @@ with self; with super; { setuptools = callPackage ../development/python-modules/setuptools/44.0.nix { }; - setuptools_scm = callPackage ../development/python-modules/setuptools_scm/2.nix { }; + setuptools-scm = callPackage ../development/python-modules/setuptools-scm/2.nix { }; setuptoolsDarcs = callPackage ../development/python-modules/setuptoolsdarcs { }; From 1f9a83201ec8f1739cc7e8a9f2b6021a17c0d219 Mon Sep 17 00:00:00 2001 From: Ajeet D'Souza <98ajeet@gmail.com> Date: Wed, 2 Jun 2021 08:33:39 +0530 Subject: [PATCH 60/83] nushell: 0.31.0 -> 0.32.0 --- pkgs/shells/nushell/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 06ff6011d263..39048730485c 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.31.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1dpbc6m0pxizkh4r02nw1i1fx9v43llylqnd28naqkklwc15pb2w"; + sha256 = "1wj054rzv88ys4ask4zp7crrw0dxrck8svlj3i16qqd8x5dnyhqs"; }; - cargoSha256 = "1znqac3s48ah9a7zpqdgw0lvvhklryj2j7mym65myzjbn1g264rm"; + cargoSha256 = "09ph3njll9assk85yh5pyvpsab3nk0mvxrdpqhy5rwps1478w0cq"; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ]; From b00ce50f6d2443d48b05e829ca35367c086544cb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 3 Jun 2021 11:33:39 +0000 Subject: [PATCH 61/83] libtpms: 0.8.2 -> 0.8.3 --- pkgs/tools/security/libtpms/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/libtpms/default.nix b/pkgs/tools/security/libtpms/default.nix index 85a2c1f72253..71ae5c969a0e 100644 --- a/pkgs/tools/security/libtpms/default.nix +++ b/pkgs/tools/security/libtpms/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "libtpms"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "stefanberger"; repo = "libtpms"; rev = "v${version}"; - sha256 = "sha256-ljzxaZYC2RzasKoRvnjead8CEkbdptGD4V5QapvAQUQ="; + sha256 = "sha256-D6lYOVlgtBY6C07YqbG6TPnDKrUoEj82Ra6GK/HB7X8="; }; nativeBuildInputs = [ From b760ab8cfbac9894b8b8e472c2810f8d4ea60b91 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Mon, 31 May 2021 18:41:25 +0200 Subject: [PATCH 62/83] samba: add missing python dependencies for ldap and domain controller --- pkgs/servers/samba/4.x.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 7beaeb20943d..3ae30699546d 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -26,6 +26,7 @@ , tdb , cmocka , rpcsvc-proto +, python3Packages , nixosTests , enableLDAP ? false, openldap @@ -91,10 +92,10 @@ stdenv.mkDerivation rec { libtasn1 tdb ] ++ optionals stdenv.isLinux [ liburing systemd ] - ++ optional enableLDAP openldap + ++ optionals enableLDAP [ openldap.dev python3Packages.markdown ] ++ optional (enablePrinting && stdenv.isLinux) cups ++ optional enableMDNS avahi - ++ optionals enableDomainController [ gpgme lmdb ] + ++ optionals enableDomainController [ gpgme lmdb python3Packages.dnspython ] ++ optional enableRegedit ncurses ++ optional (enableCephFS && stdenv.isLinux) libceph ++ optionals (enableGlusterFS && stdenv.isLinux) [ glusterfs libuuid ] From fac761a55ad4d6c6a8498c468ec7e5c43b984264 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 3 Jun 2021 04:34:04 +0200 Subject: [PATCH 63/83] samba4Full: disable glusterfs support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The samba package was marked as broken, when enableGlusterFS is true. The samba build with glusterfs fails due to API breakage that I am unable to debug: [3562/4088] Compiling source3/modules/vfs_virusfilter.c ../../source3/modules/vfs_glusterfs.c: In function ‘vfs_gluster_pread’: ../../source3/modules/vfs_glusterfs.c:856:8: error: too few arguments to function ‘glfs_pread’ 856 | ret = glfs_pread(glfd, data, n, offset, 0); | ^~~~~~~~~~ In file included from ../../source3/modules/vfs_glusterfs.c:41: /nix/store/0gzaf6fqgfxfns19zlc07dyjqigj7ak7-glusterfs-9.0/include/glusterfs/api/glfs.h:713:1: note: declared here 713 | glfs_pread(glfs_fd_t *fd, void *buf, size_t count, off_t offset, int flags, | ^~~~~~~~~~ ../../source3/modules/vfs_glusterfs.c: In function ‘vfs_gluster_pread_do’: ../../source3/modules/vfs_glusterfs.c:938:16: error: too few arguments to function ‘glfs_pread’ 938 | state->ret = glfs_pread(state->fd, state->buf, state->count, | ^~~~~~~~~~ In file included from ../../source3/modules/vfs_glusterfs.c:41: /nix/store/0gzaf6fqgfxfns19zlc07dyjqigj7ak7-glusterfs-9.0/include/glusterfs/api/glfs.h:713:1: note: declared here 713 | glfs_pread(glfs_fd_t *fd, void *buf, size_t count, off_t offset, int flags, | ^~~~~~~~~~ ../../source3/modules/vfs_glusterfs.c: In function ‘vfs_gluster_pwrite_do’: ../../source3/modules/vfs_glusterfs.c:1077:16: error: too few arguments to function ‘glfs_pwrite’ 1077 | state->ret = glfs_pwrite(state->fd, state->buf, state->count, | ^~~~~~~~~~~ In file included from ../../source3/modules/vfs_glusterfs.c:41: /nix/store/0gzaf6fqgfxfns19zlc07dyjqigj7ak7-glusterfs-9.0/include/glusterfs/api/glfs.h:717:1: note: declared here 717 | glfs_pwrite(glfs_fd_t *fd, const void *buf, size_t count, off_t offset, | ^~~~~~~~~~~ ../../source3/modules/vfs_glusterfs.c: In function ‘vfs_gluster_pwrite’: ../../source3/modules/vfs_glusterfs.c:1161:8: error: too few arguments to function ‘glfs_pwrite’ 1161 | ret = glfs_pwrite(glfd, data, n, offset, 0); | ^~~~~~~~~~~ In file included from ../../source3/modules/vfs_glusterfs.c:41: /nix/store/0gzaf6fqgfxfns19zlc07dyjqigj7ak7-glusterfs-9.0/include/glusterfs/api/glfs.h:717:1: note: declared here 717 | glfs_pwrite(glfs_fd_t *fd, const void *buf, size_t count, off_t offset, | ^~~~~~~~~~~ ../../source3/modules/vfs_glusterfs.c: In function ‘vfs_gluster_fsync_do’: ../../source3/modules/vfs_glusterfs.c:1287:16: error: too few arguments to function ‘glfs_fsync’ 1287 | state->ret = glfs_fsync(state->fd); | ^~~~~~~~~~ In file included from ../../source3/modules/vfs_glusterfs.c:41: /nix/store/0gzaf6fqgfxfns19zlc07dyjqigj7ak7-glusterfs-9.0/include/glusterfs/api/glfs.h:790:1: note: declared here 790 | glfs_fsync(glfs_fd_t *fd, struct glfs_stat *prestat, | ^~~~~~~~~~ ../../source3/modules/vfs_glusterfs.c: In function ‘vfs_gluster_ftruncate’: ../../source3/modules/vfs_glusterfs.c:1621:8: error: too few arguments to function ‘glfs_ftruncate’ 1621 | ret = glfs_ftruncate(glfd, offset); | ^~~~~~~~~~~~~~ In file included from ../../source3/modules/vfs_glusterfs.c:41: /nix/store/0gzaf6fqgfxfns19zlc07dyjqigj7ak7-glusterfs-9.0/include/glusterfs/api/glfs.h:768:1: note: declared here 768 | glfs_ftruncate(glfs_fd_t *fd, off_t length, struct glfs_stat *prestat, | ^~~~~~~~~~~~~~ ../../source3/modules/vfs_virusfilter.c: In function ‘quarantine_create_dir’: ../../source3/modules/vfs_virusfilter.c:132:13: warning: implicit declaration of function ‘strlcat’; did you mean ‘strncat’? [-Wimplicit-function-declaration] 132 | cat_len = strlcat(new_dir, "/", len + 1); | ^~~~~~~ | strncat Waf: Leaving directory `/build/samba-4.14.4/bin/default' Build failed -> task in 'vfs_glusterfs.objlist' failed with exit status 1 (run with -v to display more information) --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 043d76347418..7e5c4805e45e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19791,7 +19791,6 @@ in enableDomainController = true; enableRegedit = true; enableCephFS = !pkgs.stdenv.hostPlatform.isAarch64; - enableGlusterFS = true; }); sambaFull = samba4Full; From af0844c7a2992b7d653a879e1cb1f7257e5957c0 Mon Sep 17 00:00:00 2001 From: happysalada Date: Thu, 3 Jun 2021 21:58:02 +0900 Subject: [PATCH 64/83] beam: nixpkgs-fmt --- .../beam-modules/build-erlang-mk.nix | 76 +++++----- pkgs/development/beam-modules/build-mix.nix | 4 +- .../development/beam-modules/build-rebar3.nix | 22 +-- .../interpreters/erlang/generic-builder.nix | 141 +++++++++++------- 4 files changed, 146 insertions(+), 97 deletions(-) diff --git a/pkgs/development/beam-modules/build-erlang-mk.nix b/pkgs/development/beam-modules/build-erlang-mk.nix index a94524276b26..d1afa55387d3 100644 --- a/pkgs/development/beam-modules/build-erlang-mk.nix +++ b/pkgs/development/beam-modules/build-erlang-mk.nix @@ -1,19 +1,21 @@ { stdenv, writeText, erlang, perl, which, gitMinimal, wget, lib }: -{ name, version +{ name +, version , src , setupHook ? null -, buildInputs ? [] -, beamDeps ? [] +, buildInputs ? [ ] +, beamDeps ? [ ] , postPatch ? "" , compilePorts ? false , installPhase ? null , buildPhase ? null , configurePhase ? null -, meta ? {} +, meta ? { } , enableDebugInfo ? false -, buildFlags ? [] -, ... }@attrs: +, buildFlags ? [ ] +, ... +}@attrs: with lib; @@ -21,11 +23,11 @@ let debugInfoFlag = lib.optionalString (enableDebugInfo || erlang.debugInfo) "+debug_info"; shell = drv: stdenv.mkDerivation { - name = "interactive-shell-${drv.name}"; - buildInputs = [ drv ]; - }; + name = "interactive-shell-${drv.name}"; + buildInputs = [ drv ]; + }; - pkg = self: stdenv.mkDerivation ( attrs // { + pkg = self: stdenv.mkDerivation (attrs // { app_name = name; name = "${name}-${version}"; inherit version; @@ -34,11 +36,13 @@ let inherit src; - setupHook = if setupHook == null - then writeText "setupHook.sh" '' - addToSearchPath ERL_LIBS "$1/lib/erlang/lib" - '' - else setupHook; + setupHook = + if setupHook == null + then + writeText "setupHook.sh" '' + addToSearchPath ERL_LIBS "$1/lib/erlang/lib" + '' + else setupHook; buildInputs = buildInputs ++ [ erlang perl which gitMinimal wget ]; propagatedBuildInputs = beamDeps; @@ -47,30 +51,33 @@ let ++ lib.optional (enableDebugInfo || erlang.debugInfo) ''ERL_OPTS="$ERL_OPTS +debug_info"'' ++ buildFlags; - configurePhase = if configurePhase == null - then '' - runHook preConfigure + configurePhase = + if configurePhase == null + then '' + runHook preConfigure - # We shouldnt need to do this, but it seems at times there is a *.app in - # the repo/package. This ensures we start from a clean slate - make SKIP_DEPS=1 clean + # We shouldnt need to do this, but it seems at times there is a *.app in + # the repo/package. This ensures we start from a clean slate + make SKIP_DEPS=1 clean - runHook postConfigure - '' - else configurePhase; + runHook postConfigure + '' + else configurePhase; - buildPhase = if buildPhase == null - then '' + buildPhase = + if buildPhase == null + then '' runHook preBuild make $buildFlags "''${buildFlagsArray[@]}" runHook postBuild - '' - else buildPhase; + '' + else buildPhase; - installPhase = if installPhase == null - then '' + installPhase = + if installPhase == null + then '' runHook preInstall mkdir -p $out/lib/erlang/lib/${name} @@ -90,13 +97,14 @@ let fi runHook postInstall - '' - else installPhase; + '' + else installPhase; passthru = { packageName = name; env = shell self; inherit beamDeps; }; -}); -in fix pkg + }); +in +fix pkg diff --git a/pkgs/development/beam-modules/build-mix.nix b/pkgs/development/beam-modules/build-mix.nix index 7e19f19a093f..4da627a844ba 100644 --- a/pkgs/development/beam-modules/build-mix.nix +++ b/pkgs/development/beam-modules/build-mix.nix @@ -35,9 +35,7 @@ let # add to ERL_LIBS so other modules can find at runtime. # http://erlang.org/doc/man/code.html#code-path - # Mix also searches the code path when compiling with the --no-deps-check - # flag, which is why there is no complicated booterstrapper like the one - # used by buildRebar3. + # Mix also searches the code path when compiling with the --no-deps-check flag setupHook = attrs.setupHook or writeText "setupHook.sh" '' addToSearchPath ERL_LIBS "$1/lib/erlang/lib" diff --git a/pkgs/development/beam-modules/build-rebar3.nix b/pkgs/development/beam-modules/build-rebar3.nix index dc882a133188..b66dc535ce03 100644 --- a/pkgs/development/beam-modules/build-rebar3.nix +++ b/pkgs/development/beam-modules/build-rebar3.nix @@ -1,16 +1,20 @@ { stdenv, writeText, erlang, rebar3WithPlugins, openssl, libyaml, lib }: -{ name, version +{ name +, version , src , setupHook ? null -, buildInputs ? [], beamDeps ? [], buildPlugins ? [] +, buildInputs ? [ ] +, beamDeps ? [ ] +, buildPlugins ? [ ] , postPatch ? "" , installPhase ? null , buildPhase ? null , configurePhase ? null -, meta ? {} +, meta ? { } , enableDebugInfo ? false -, ... }@attrs: +, ... +}@attrs: with lib; @@ -22,9 +26,9 @@ let }; shell = drv: stdenv.mkDerivation { - name = "interactive-shell-${drv.name}"; - buildInputs = [ drv ]; - }; + name = "interactive-shell-${drv.name}"; + buildInputs = [ drv ]; + }; customPhases = filterAttrs (_: v: v != null) @@ -42,7 +46,7 @@ let inherit src; setupHook = writeText "setupHook.sh" '' - addToSearchPath ERL_LIBS "$1/lib/erlang/lib/" + addToSearchPath ERL_LIBS "$1/lib/erlang/lib/" ''; postPatch = '' @@ -77,4 +81,4 @@ let }; } // customPhases); in - fix pkg +fix pkg diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index aba4c318bea2..1f2f3a25a5e2 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -1,12 +1,32 @@ -{ pkgs, lib, stdenv, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused -, libxml2, libxslt, ncurses, openssl, perl, autoconf +{ pkgs +, lib +, stdenv +, fetchFromGitHub +, makeWrapper +, gawk +, gnum4 +, gnused +, libxml2 +, libxslt +, ncurses +, openssl +, perl +, autoconf , openjdk11 ? null # javacSupport , unixODBC ? null # odbcSupport -, libGL ? null, libGLU ? null, wxGTK ? null, wxmac ? null, xorg ? null +, libGL ? null +, libGLU ? null +, wxGTK ? null +, wxmac ? null +, xorg ? null , parallelBuild ? false -, systemd, wxSupport ? true -# updateScript deps -, writeScript, common-updater-scripts, coreutils, git +, systemd +, wxSupport ? true + # updateScript deps +, writeScript +, common-updater-scripts +, coreutils +, git }: { baseName ? "erlang" , version @@ -18,25 +38,42 @@ , enableThreads ? true , enableSmpSupport ? true , enableKernelPoll ? true -, javacSupport ? false, javacPackages ? [ openjdk11 ] -, odbcSupport ? false, odbcPackages ? [ unixODBC ] +, javacSupport ? false +, javacPackages ? [ openjdk11 ] +, odbcSupport ? false +, odbcPackages ? [ unixODBC ] , withSystemd ? stdenv.isLinux # systemd support in epmd , opensslPackage ? openssl , wxPackages ? [ libGL libGLU wxGTK xorg.libX11 ] -, preUnpack ? "", postUnpack ? "" -, patches ? [], patchPhase ? "", prePatch ? "", postPatch ? "" -, configureFlags ? [], configurePhase ? "", preConfigure ? "", postConfigure ? "" -, buildPhase ? "", preBuild ? "", postBuild ? "" -, installPhase ? "", preInstall ? "", postInstall ? "" +, preUnpack ? "" +, postUnpack ? "" +, patches ? [ ] +, patchPhase ? "" +, prePatch ? "" +, postPatch ? "" +, configureFlags ? [ ] +, configurePhase ? "" +, preConfigure ? "" +, postConfigure ? "" +, buildPhase ? "" +, preBuild ? "" +, postBuild ? "" +, installPhase ? "" +, preInstall ? "" +, postInstall ? "" , installTargets ? [ "install" "install-docs" ] -, checkPhase ? "", preCheck ? "", postCheck ? "" -, fixupPhase ? "", preFixup ? "", postFixup ? "" -, meta ? {} +, checkPhase ? "" +, preCheck ? "" +, postCheck ? "" +, fixupPhase ? "" +, preFixup ? "" +, postFixup ? "" +, meta ? { } }: assert wxSupport -> (if stdenv.isDarwin - then wxmac != null - else libGL != null && libGLU != null && wxGTK != null && xorg != null); +then wxmac != null +else libGL != null && libGLU != null && wxGTK != null && xorg != null); assert odbcSupport -> unixODBC != null; assert javacSupport -> openjdk11 != null; @@ -45,7 +82,8 @@ let inherit (lib) optional optionals optionalAttrs optionalString; wxPackages2 = if stdenv.isDarwin then [ wxmac ] else wxPackages; -in stdenv.mkDerivation ({ +in +stdenv.mkDerivation ({ name = "${baseName}-${version}" + optionalString javacSupport "-javac" + optionalString odbcSupport "-odbc"; @@ -109,19 +147,20 @@ in stdenv.mkDerivation ({ passthru = { updateScript = let major = builtins.head (builtins.splitVersion version); - in writeScript "update.sh" '' - #!${stdenv.shell} - set -ox errexit - PATH=${lib.makeBinPath [ common-updater-scripts coreutils git gnused ]} - latest=$(list-git-tags https://github.com/erlang/otp.git | sed -n 's/^OTP-${major}/${major}/p' | sort -V | tail -1) - if [ "$latest" != "${version}" ]; then - nixpkgs="$(git rev-parse --show-toplevel)" - nix_file="$nixpkgs/pkgs/development/interpreters/erlang/R${major}.nix" - update-source-version ${baseName}R${major} "$latest" --version-key=version --print-changes --file="$nix_file" - else - echo "${baseName}R${major} is already up-to-date" - fi - ''; + in + writeScript "update.sh" '' + #!${stdenv.shell} + set -ox errexit + PATH=${lib.makeBinPath [ common-updater-scripts coreutils git gnused ]} + latest=$(list-git-tags https://github.com/erlang/otp.git | sed -n 's/^OTP-${major}/${major}/p' | sort -V | tail -1) + if [ "$latest" != "${version}" ]; then + nixpkgs="$(git rev-parse --show-toplevel)" + nix_file="$nixpkgs/pkgs/development/interpreters/erlang/R${major}.nix" + update-source-version ${baseName}R${major} "$latest" --version-key=version --print-changes --file="$nix_file" + else + echo "${baseName}R${major} is already up-to-date" + fi + ''; }; meta = with lib; ({ @@ -143,24 +182,24 @@ in stdenv.mkDerivation ({ license = licenses.asl20; } // meta); } -// optionalAttrs (preUnpack != "") { inherit preUnpack; } -// optionalAttrs (postUnpack != "") { inherit postUnpack; } -// optionalAttrs (patches != []) { inherit patches; } -// optionalAttrs (prePatch != "") { inherit prePatch; } -// optionalAttrs (patchPhase != "") { inherit patchPhase; } +// optionalAttrs (preUnpack != "") { inherit preUnpack; } +// optionalAttrs (postUnpack != "") { inherit postUnpack; } +// optionalAttrs (patches != [ ]) { inherit patches; } +// optionalAttrs (prePatch != "") { inherit prePatch; } +// optionalAttrs (patchPhase != "") { inherit patchPhase; } // optionalAttrs (configurePhase != "") { inherit configurePhase; } -// optionalAttrs (preConfigure != "") { inherit preConfigure; } -// optionalAttrs (postConfigure != "") { inherit postConfigure; } -// optionalAttrs (buildPhase != "") { inherit buildPhase; } -// optionalAttrs (preBuild != "") { inherit preBuild; } -// optionalAttrs (postBuild != "") { inherit postBuild; } -// optionalAttrs (checkPhase != "") { inherit checkPhase; } -// optionalAttrs (preCheck != "") { inherit preCheck; } -// optionalAttrs (postCheck != "") { inherit postCheck; } -// optionalAttrs (installPhase != "") { inherit installPhase; } -// optionalAttrs (installTargets != []) { inherit installTargets; } -// optionalAttrs (preInstall != "") { inherit preInstall; } -// optionalAttrs (fixupPhase != "") { inherit fixupPhase; } -// optionalAttrs (preFixup != "") { inherit preFixup; } -// optionalAttrs (postFixup != "") { inherit postFixup; } +// optionalAttrs (preConfigure != "") { inherit preConfigure; } +// optionalAttrs (postConfigure != "") { inherit postConfigure; } +// optionalAttrs (buildPhase != "") { inherit buildPhase; } +// optionalAttrs (preBuild != "") { inherit preBuild; } +// optionalAttrs (postBuild != "") { inherit postBuild; } +// optionalAttrs (checkPhase != "") { inherit checkPhase; } +// optionalAttrs (preCheck != "") { inherit preCheck; } +// optionalAttrs (postCheck != "") { inherit postCheck; } +// optionalAttrs (installPhase != "") { inherit installPhase; } +// optionalAttrs (installTargets != [ ]) { inherit installTargets; } +// optionalAttrs (preInstall != "") { inherit preInstall; } +// optionalAttrs (fixupPhase != "") { inherit fixupPhase; } +// optionalAttrs (preFixup != "") { inherit preFixup; } +// optionalAttrs (postFixup != "") { inherit postFixup; } ) From 71c1bf81e25243b53ddc2b7db6dde34296712998 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 3 Jun 2021 13:23:01 +0000 Subject: [PATCH 65/83] perldevel: 5.33.8 -> 5.35.0 --- pkgs/development/interpreters/perl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index ad369956745a..5c75894c4f7e 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -216,7 +216,7 @@ in { perldevel = common { perl = pkgs.perldevel; buildPerl = buildPackages.perldevel; - version = "5.33.8"; - sha256 = "1zr6sdsfcmk86n3f8j65x07xkv29v0pi8bwc986ahmjx7x92xzgl"; + version = "5.35.0"; + sha256 = "0217nbswhkjhw60kng2p64611xna7za681kk30fkriyicd3yph6n"; }; } From 3915d2fd27e2d8a62cff752bd1e4146317c76f31 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Thu, 3 Jun 2021 00:20:26 +0200 Subject: [PATCH 66/83] libraspberrypi: fix URL --- pkgs/development/libraries/libraspberrypi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libraspberrypi/default.nix b/pkgs/development/libraries/libraspberrypi/default.nix index 8ffe8f488b25..8a8f41981aae 100644 --- a/pkgs/development/libraries/libraspberrypi/default.nix +++ b/pkgs/development/libraries/libraspberrypi/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { # https://github.com/raspberrypi/userland/pull/670 - url = "https://github.com/raspberrypi/userland/pull/670/commits/37cb44f314ab1209fe2a0a2449ef78893b1e5f62.patch"; + url = "https://github.com/raspberrypi/userland/commit/37cb44f314ab1209fe2a0a2449ef78893b1e5f62.patch"; sha256 = "1fbrbkpc4cc010ji8z4ll63g17n6jl67kdy62m74bhlxn72gg9rw"; }) ]; From 8f166b95c9ee10743039d1f2b1c21f9edee5da88 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 3 Jun 2021 11:24:19 -0300 Subject: [PATCH 67/83] gitRepo: Add import to ssl module to avoid runtime error (#125373) Co-authored-by: Ricardo M. Correia --- .../version-management/git-repo/default.nix | 9 ++++-- .../git-repo/import-ssl-module.patch | 28 +++++++++++++++++++ 2 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/version-management/git-repo/import-ssl-module.patch diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index 7b29e466160b..75a9fe377649 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, nix-update-script -, python3, git, gnupg, less +, python3, git, gnupg, less, openssh }: stdenv.mkDerivation rec { @@ -10,9 +10,12 @@ stdenv.mkDerivation rec { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "sha256-3FSkWpHda1jVhy/633B+ippWcbKd83IlQcJYS9Qx5wQ="; + sha256 = "sha256-SuHp6C5ueUErvRiWDQNEmCybFIa7Iu7C/FtnHys9XqU="; }; + # Fix 'NameError: name 'ssl' is not defined' + patches = [ ./import-ssl-module.patch ]; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ python3 ]; @@ -34,7 +37,7 @@ stdenv.mkDerivation rec { # Important runtime dependencies postFixup = '' wrapProgram $out/bin/repo --prefix PATH ":" \ - "${lib.makeBinPath [ git gnupg less ]}" + "${lib.makeBinPath [ git gnupg less openssh ]}" ''; passthru = { diff --git a/pkgs/applications/version-management/git-repo/import-ssl-module.patch b/pkgs/applications/version-management/git-repo/import-ssl-module.patch new file mode 100644 index 000000000000..efc3d2b1f8a5 --- /dev/null +++ b/pkgs/applications/version-management/git-repo/import-ssl-module.patch @@ -0,0 +1,28 @@ +Fix runtime error due missing import + +Traceback (most recent call last): + File "/nix/store/4qqhr7g9ri3n7v6ik9ahlpvyp18wcn4p-git-repo-2.15.3/bin/.repo-wrapped", line 1339, in + main(sys.argv[1:]) + File "/nix/store/4qqhr7g9ri3n7v6ik9ahlpvyp18wcn4p-git-repo-2.15.3/bin/.repo-wrapped", line 1304, in main + _Init(args, gitc_init=(cmd == 'gitc-init')) + File "/nix/store/4qqhr7g9ri3n7v6ik9ahlpvyp18wcn4p-git-repo-2.15.3/bin/.repo-wrapped", line 607, in _Init + _Clone(url, dst, opt.clone_bundle, opt.quiet, opt.verbose) + File "/nix/store/4qqhr7g9ri3n7v6ik9ahlpvyp18wcn4p-git-repo-2.15.3/bin/.repo-wrapped", line 912, in _Clone + if clone_bundle and _DownloadBundle(url, cwd, quiet, verbose): + File "/nix/store/4qqhr7g9ri3n7v6ik9ahlpvyp18wcn4p-git-repo-2.15.3/bin/.repo-wrapped", line 860, in _DownloadBundle + r = urllib.request.urlopen(url, context=ssl.create_default_context()) +NameError: name 'ssl' is not defined +builder for '/nix/store/4hvds8fv8xmzlm86yg9cf1lj6hrya7sg-amdvlk-src.drv' failed with exit code 1 + +diff --git a/repo b/repo +index 8b05def..f394b3e 100755 +--- a/repo ++++ b/repo +@@ -236,6 +236,7 @@ import optparse + import re + import shutil + import stat ++import ssl + + if sys.version_info[0] == 3: + import urllib.request From 35b4ca8dd554753a5309d434f28107cf96e300e3 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 25 Apr 2021 21:27:21 +0000 Subject: [PATCH 68/83] nvi: 1.79 -> 1.81.6; unbreak; name -> pname Most other distributions seem to use Debian as upstream, so let's do that too. There doesn't seem to be any extant homepage. --- pkgs/applications/editors/nvi/default.nix | 73 +++++++++-------------- 1 file changed, 28 insertions(+), 45 deletions(-) diff --git a/pkgs/applications/editors/nvi/default.nix b/pkgs/applications/editors/nvi/default.nix index 328aad29efab..38aea982633c 100644 --- a/pkgs/applications/editors/nvi/default.nix +++ b/pkgs/applications/editors/nvi/default.nix @@ -1,56 +1,39 @@ -{ fetchurl, lib, stdenv, ncurses }: +{ lib, stdenv, fetchurl, fetchpatch, ncurses, db }: -stdenv.mkDerivation { - name = "nvi-1.79"; +stdenv.mkDerivation rec { + pname = "nvi"; + version = "1.81.6"; src = fetchurl { - urls = - [ "ftp://ftp.eenet.ee/pub/cpan/src/misc/nvi-1.79.tar.gz" - "ftp://ftp.saintjoe.edu/pub/CPAN/src/misc/nvi-1.79.tar.gz" - "ftp://ftp.free.fr/.mirrors1/ftp.netbsd.org/packages/distfiles/nvi-1.79.tar.gz" - ]; - sha256 = "0cvf56rbylz7ksny6g2256sjg8yrsxrmbpk82r64rhi53sm8fnvm"; + url = "https://deb.debian.org/debian/pool/main/n/nvi/nvi_${version}.orig.tar.gz"; + sha256 = "13cp9iz017bk6ryi05jn7drbv7a5dyr201zqd3r4r8srj644ihwb"; }; - buildInputs = [ ncurses ]; + patches = [ + # Fix runtime error with modern versions of db. + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/nvi/raw/f33/f/nvi-03-db4.patch"; + sha256 = "1vpnly3dcldwl8gwl0jrh5yh0vhgbdhsh6xn7lnwhrawlvk6d55y"; + }) - # nvi tries to write to a usual tmp directory (/var/tmp), - # so we will force it to use /tmp. - patchPhase = '' - sed -i build/configure \ - -e s@vi_cv_path_preserve=no@vi_cv_path_preserve=/tmp/vi.recover@ \ - -e s@/var/tmp@@ \ - -e s@-lcurses@-lncurses@ + # Fix build with Glibc. + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/nvi/raw/f33/f/nvi-20-glibc_has_grantpt.patch"; + sha256 = "1ypqj263wh53m5rgiag5c4gy1rksj2waginny1lcj34n72p2dsml"; + }) + ]; + + buildInputs = [ ncurses db ]; + + preConfigure = '' + cd build.unix ''; + configureScript = "../dist/configure"; + configureFlags = [ "vi_cv_path_preserve=/tmp" ]; - configurePhase = '' - mkdir mybuild - cd mybuild - ../build/configure --prefix=$out --disable-curses - ''; - - installPhase = '' - mkdir -p $out/bin $out/share/vi/catalog - for a in dutch english french german ru_SU.KOI8-R spanish swedish; do - cp ../catalog/$a $out/share/vi/catalog - done - cp nvi $out/bin/nvi - ln -s $out/bin/nvi $out/bin/vi - ln -s $out/bin/nvi $out/bin/ex - ln -s $out/bin/nvi $out/bin/view - - mkdir -p $out/share/man/man1 - cp ../docs/USD.doc/vi.man/vi.1 $out/share/man/man1/nvi.1 - ln -s $out/share/man/man1/nvi.1 $out/share/man/man1/vi - ln -s $out/share/man/man1/nvi.1 $out/share/man/man1/ex - ln -s $out/share/man/man1/nvi.1 $out/share/man/man1/view - ln -s $out/bin/{,vi-}nvi # create a symlink so that all vi(m) users will find it - ''; - - meta = { - homepage = "http://www.bostic.com/vi/"; + meta = with lib; { description = "The Berkeley Vi Editor"; - license = lib.licenses.free; - broken = true; # since 2020-02-08 + license = licenses.free; + platforms = platforms.unix; }; } From 388bc58b7f572e6e9f94541d496764d69a037bbd Mon Sep 17 00:00:00 2001 From: polygon Date: Thu, 3 Jun 2021 16:36:26 +0200 Subject: [PATCH 69/83] liquidwar: fix build (#125480) Co-authored-by: Sandro --- pkgs/games/liquidwar/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/games/liquidwar/default.nix b/pkgs/games/liquidwar/default.nix index 09ddcb0346c8..827c7d696c77 100644 --- a/pkgs/games/liquidwar/default.nix +++ b/pkgs/games/liquidwar/default.nix @@ -3,7 +3,8 @@ , expat, gettext, perl, guile , SDL, SDL_image, SDL_mixer, SDL_ttf , curl, sqlite, libtool, readline -, libogg, libvorbis, libcaca, csound, cunit } : +, libogg, libvorbis, libcaca, csound, cunit +, pkg-config }: stdenv.mkDerivation rec { pname = "liquidwar6"; @@ -25,6 +26,8 @@ stdenv.mkDerivation rec { libtool readline ]; + nativeBuildInputs = [ pkg-config ]; + hardeningDisable = [ "format" ]; NIX_CFLAGS_COMPILE = From 01ef9faecb7e1be1f40f7aac4ebcefa4885d4652 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Wed, 2 Jun 2021 22:55:29 +0800 Subject: [PATCH 70/83] vocal: fix build Co-authored-by: Sandro --- pkgs/applications/audio/vocal/default.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/vocal/default.nix b/pkgs/applications/audio/vocal/default.nix index b91a8e6d50c5..f06f950f13fc 100644 --- a/pkgs/applications/audio/vocal/default.nix +++ b/pkgs/applications/audio/vocal/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , cmake , ninja @@ -61,13 +63,22 @@ stdenv.mkDerivation rec { glib-networking ]; + patches = [ + # granite 6.0.0 removed about dialogs + # see: https://github.com/needle-and-thread/vocal/issues/483 + (fetchpatch { + name = "remove-about.patch"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-community/03543ffdb6cd52ce1a8293f3303225b3afac2431/trunk/remove-about.patch"; + sha256 = "sha256-yGD7BYOTmqs4h+Odh/mB3fI1HM7GDO6F+QaHpRUD5p4="; + }) + ]; + passthru = { updateScript = nix-update-script { attrPath = pname; }; }; - meta = with lib; { description = "The podcast client for the modern free desktop"; longDescription = '' From d84f604077e0a3a46df514c668253acdfa3d7099 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Thu, 3 Jun 2021 17:53:30 +0300 Subject: [PATCH 71/83] dico: enable on darwin --- pkgs/servers/dico/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/dico/default.nix b/pkgs/servers/dico/default.nix index a48215a57d51..7820dbaff744 100644 --- a/pkgs/servers/dico/default.nix +++ b/pkgs/servers/dico/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/dico/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.linux; + platforms = platforms.unix; longDescription = '' GNU Dico is a flexible modular implementation of DICT server From 86d21294bf6d0382cf26d2deaffa6ac70ce0dcda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 3 Jun 2021 17:02:47 +0200 Subject: [PATCH 72/83] pythonPackages.pytest-celery: remove unused inputs, add empty maintainer --- pkgs/development/python-modules/pytest-celery/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pytest-celery/default.nix b/pkgs/development/python-modules/pytest-celery/default.nix index 648e5c0fbc8e..4b3999ec86b4 100644 --- a/pkgs/development/python-modules/pytest-celery/default.nix +++ b/pkgs/development/python-modules/pytest-celery/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, setuptools-scm }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "pytest-celery"; @@ -17,5 +17,6 @@ buildPythonPackage rec { description = "pytest plugin for unittest subTest() support and subtests fixture"; homepage = "https://github.com/pytest-dev/pytest-subtests"; license = licenses.mit; + maintainers = [ ]; }; } From 1400cdc8a51859ac100266598907b06cfc4d6e26 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Thu, 3 Jun 2021 23:14:53 +0800 Subject: [PATCH 73/83] linuxPackages.tuxedo-keyboard: mark broken for aarch64 --- pkgs/os-specific/linux/tuxedo-keyboard/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix index fabfebfcba11..79271448b75b 100644 --- a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix +++ b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/tuxedocomputers/tuxedo-keyboard/"; license = licenses.gpl3Plus; platforms = platforms.linux; + broken = stdenv.isAarch64; maintainers = [ maintainers.blanky0230 ]; }; } From 613238018708a176a154695d8320dae6aa0357ee Mon Sep 17 00:00:00 2001 From: devins2518 Date: Thu, 3 Jun 2021 10:28:55 -0500 Subject: [PATCH 74/83] nvfancontrol: init at 0.5.1 (#125070) Co-authored-by: Sandro --- pkgs/tools/misc/nvfancontrol/default.nix | 31 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/tools/misc/nvfancontrol/default.nix diff --git a/pkgs/tools/misc/nvfancontrol/default.nix b/pkgs/tools/misc/nvfancontrol/default.nix new file mode 100644 index 000000000000..2bfdb9896e4a --- /dev/null +++ b/pkgs/tools/misc/nvfancontrol/default.nix @@ -0,0 +1,31 @@ +{ lib, rustPlatform, fetchFromGitHub, libXNVCtrl, libX11, libXext }: + +rustPlatform.buildRustPackage rec { + pname = "nvfancontrol"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "foucault"; + repo = pname; + rev = version; + sha256 = "sha256-0WBQSnTYVc3sNmZf/KFzznMg9AVsyaBgdx/IvG1dZAw="; + }; + + cargoSha256 = "sha256-fEzdghGQSSeyeyiHjw1ggQ38gsETJFl9bq/tizGxIis="; + + nativeBuildInputs = [ libXNVCtrl libX11 libXext ]; + + # Needed for static linking + preConfigure = '' + export LIBRARY_PATH=${libXNVCtrl}/lib:${libX11}/lib:${libXext}/lib + ''; + + meta = with lib; { + description = "NVidia dynamic fan control for Linux"; + homepage = "https://github.com/foucault/nvfancontrol"; + changelog = "https://github.com/foucault/nvfancontrol/releases/tag/${version}"; + license = with licenses; [ gpl3Only ]; + platforms = platforms.linux; + maintainers = with maintainers; [ devins2518 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae2de37978f6..ec3bc9f70742 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7305,6 +7305,10 @@ in nssmdns = callPackage ../tools/networking/nss-mdns { }; + nvfancontrol = callPackage ../tools/misc/nvfancontrol { + libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; + }; + nvimpager = callPackage ../tools/misc/nvimpager { }; nwdiag = with python3Packages; toPythonApplication nwdiag; From ad8ea0b9012ec1bf5b6641de593260090e8fdb8a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 3 Jun 2021 15:42:30 +0000 Subject: [PATCH 75/83] dnsx: 1.0.3 -> 1.0.4 --- pkgs/tools/security/dnsx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/dnsx/default.nix b/pkgs/tools/security/dnsx/default.nix index b294bb6281be..33f40ce59d48 100644 --- a/pkgs/tools/security/dnsx/default.nix +++ b/pkgs/tools/security/dnsx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dnsx"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "dnsx"; rev = "v${version}"; - sha256 = "sha256-k71Pw6XdOFMUf7w7QAAxqQkmkCINl+3KApkIPRyAQLM="; + sha256 = "sha256-dfjchsmGqyWLxO2sP+TlBEeKz9Fd4bHWG2r4FJPGNMs="; }; - vendorSha256 = "sha256-YA0XZSXmpAcNEFutrBbQE8DN7v5hcva0fscemEMLewU="; + vendorSha256 = "sha256-KJyWb+coWSdvZGwDw/JSLtPeynndnaevwyYIzyEH4Kc="; meta = with lib; { description = "Fast and multi-purpose DNS toolkit"; From 28a0d6d7a2c80f7bd6975312bfd0470fae2486e2 Mon Sep 17 00:00:00 2001 From: Niklas <44636701+MayNiklas@users.noreply.github.com> Date: Thu, 3 Jun 2021 18:55:15 +0200 Subject: [PATCH 76/83] tautulli: 2.6.8 -> 2.7.3 (#125087) --- pkgs/servers/tautulli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix index 9c1bc1cc3de3..cecdce5aa960 100644 --- a/pkgs/servers/tautulli/default.nix +++ b/pkgs/servers/tautulli/default.nix @@ -1,8 +1,8 @@ -{ lib, fetchFromGitHub, python, buildPythonApplication, bash, setuptools, wrapPython, makeWrapper }: +{ lib, fetchFromGitHub, buildPythonApplication, setuptools, wrapPython, makeWrapper }: buildPythonApplication rec { pname = "Tautulli"; - version = "2.6.8"; + version = "2.7.3"; format = "other"; pythonPath = [ setuptools ]; @@ -12,7 +12,7 @@ buildPythonApplication rec { owner = "Tautulli"; repo = pname; rev = "v${version}"; - sha256 = "0pkki72maxnrp3frninw2qbxyf76rvkza23k3s8fppandkr7qpvj"; + sha256 = "1ig2vq19sb6n2x2w2zbf54izynaqay9l8xq1zds116v0z729wlkh"; }; installPhase = '' From 845f41770e098745737279cf9d107dc2cba5c9e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Thu, 3 Jun 2021 18:57:13 +0200 Subject: [PATCH 77/83] snapcast: 0.24.0 -> 0.25.0 Also move boost to buildInputs, which fixes cross-compilation (an override that sets avahi = null is also required). --- pkgs/applications/audio/snapcast/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix index 18d073caba71..9351d1b0db76 100644 --- a/pkgs/applications/audio/snapcast/default.nix +++ b/pkgs/applications/audio/snapcast/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cmake, pkg-config -, alsaLib, asio, avahi, boost170, flac, libogg, libvorbis, soxr +, alsaLib, asio, avahi, boost17x, flac, libogg, libvorbis, soxr , nixosTests }: let @@ -34,19 +34,20 @@ in stdenv.mkDerivation rec { pname = "snapcast"; - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "badaix"; repo = "snapcast"; rev = "v${version}"; - sha256 = "13yz8alplnqwkcns3mcli01qbyy6l3h62xx0v71ygcrz371l4g9g"; + sha256 = "064pcpr5dsv9hncqkrnxriva4xjv1vcxhvc69h1an8x8vn4dwgmf"; }; - nativeBuildInputs = [ cmake pkg-config boost170.dev ]; + nativeBuildInputs = [ cmake pkg-config ]; # snapcast also supports building against tremor but as we have libogg, that's # not needed buildInputs = [ + boost17x alsaLib asio avahi flac libogg libvorbis aixlog popl soxr ]; From 4bcb22e17aa8677c6b3fc4625732d4da791a576f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 9 May 2021 11:48:31 +0200 Subject: [PATCH 78/83] nixos/jenkins-job-builder: add support for folder jobs Add support for folder jobs (https://plugins.jenkins.io/cloudbees-folder/) by reworking the service to support nested jobs. This also fixes this deprecation warning (as a happy side effect): WARNING:jenkins_jobs.cli.subcommand.test:(Deprecated) The default output behavior of `jenkins-jobs test` when given the --output flag will change in JJB 3.0. Instead of writing jobs to OUTPUT/jobname; they will be written to OUTPUT/jobname/config.xml. The new behavior can be enabled by the passing `--config-xml` parameter --- .../jenkins/job-builder.nix | 64 +++++++++++++++---- 1 file changed, 50 insertions(+), 14 deletions(-) diff --git a/nixos/modules/services/continuous-integration/jenkins/job-builder.nix b/nixos/modules/services/continuous-integration/jenkins/job-builder.nix index 5d1bfe4ec407..536d394b3fd4 100644 --- a/nixos/modules/services/continuous-integration/jenkins/job-builder.nix +++ b/nixos/modules/services/continuous-integration/jenkins/job-builder.nix @@ -165,6 +165,42 @@ in { ''; in '' + joinByString() + { + local separator="$1" + shift + local first="$1" + shift + printf "%s" "$first" "''${@/#/$separator}" + } + + # Map a relative directory path in the output from + # jenkins-job-builder (jobname) to the layout expected by jenkins: + # each directory level gets prepended "jobs/". + getJenkinsJobDir() + { + IFS='/' read -ra input_dirs <<< "$1" + printf "jobs/" + joinByString "/jobs/" "''${input_dirs[@]}" + } + + # The inverse of getJenkinsJobDir (remove the "jobs/" prefixes) + getJobname() + { + IFS='/' read -ra input_dirs <<< "$1" + local i=0 + local nelem=''${#input_dirs[@]} + for e in "''${input_dirs[@]}"; do + if [ $((i % 2)) -eq 1 ]; then + printf "$e" + if [ $i -lt $(( nelem - 1 )) ]; then + printf "/" + fi + fi + i=$((i + 1)) + done + } + rm -rf ${jobBuilderOutputDir} cur_decl_jobs=/run/jenkins-job-builder/declarative-jobs rm -f "$cur_decl_jobs" @@ -172,27 +208,27 @@ in { # Create / update jobs mkdir -p ${jobBuilderOutputDir} for inputFile in ${yamlJobsFile} ${concatStringsSep " " jsonJobsFiles}; do - HOME="${jenkinsCfg.home}" "${pkgs.jenkins-job-builder}/bin/jenkins-jobs" --ignore-cache test -o "${jobBuilderOutputDir}" "$inputFile" + HOME="${jenkinsCfg.home}" "${pkgs.jenkins-job-builder}/bin/jenkins-jobs" --ignore-cache test --config-xml -o "${jobBuilderOutputDir}" "$inputFile" done - for file in "${jobBuilderOutputDir}/"*; do - test -f "$file" || continue - jobname="$(basename $file)" - jobdir="${jenkinsCfg.home}/jobs/$jobname" + find "${jobBuilderOutputDir}" -type f -name config.xml | while read -r f; do echo "$(dirname "$f")"; done | sort | while read -r dir; do + jobname="$(realpath --relative-to="${jobBuilderOutputDir}" "$dir")" + jenkinsjobname=$(getJenkinsJobDir "$jobname") + jenkinsjobdir="${jenkinsCfg.home}/$jenkinsjobname" echo "Creating / updating job \"$jobname\"" - mkdir -p "$jobdir" - touch "$jobdir/${ownerStamp}" - cp "$file" "$jobdir/config.xml" - echo "$jobname" >> "$cur_decl_jobs" + mkdir -p "$jenkinsjobdir" + touch "$jenkinsjobdir/${ownerStamp}" + cp "$dir"/config.xml "$jenkinsjobdir/config.xml" + echo "$jenkinsjobname" >> "$cur_decl_jobs" done # Remove stale jobs - for file in "${jenkinsCfg.home}"/jobs/*/${ownerStamp}; do - test -f "$file" || continue - jobdir="$(dirname $file)" - jobname="$(basename "$jobdir")" - grep --quiet --line-regexp "$jobname" "$cur_decl_jobs" 2>/dev/null && continue + find "${jenkinsCfg.home}" -type f -name "${ownerStamp}" | while read -r f; do echo "$(dirname "$f")"; done | sort --reverse | while read -r dir; do + jenkinsjobname="$(realpath --relative-to="${jenkinsCfg.home}" "$dir")" + grep --quiet --line-regexp "$jenkinsjobname" "$cur_decl_jobs" 2>/dev/null && continue + jobname=$(getJobname "$jenkinsjobname") echo "Deleting stale job \"$jobname\"" + jobdir="${jenkinsCfg.home}/$jenkinsjobname" rm -rf "$jobdir" done '' + (if cfg.accessUser != "" then reloadScript else ""); From 3edde6562e19698da69a499881e0a2e4f5a497a2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 7 Nov 2020 13:04:50 +0100 Subject: [PATCH 79/83] make-test-python: disallow aliases When importing Nixpkgs within Nixpkgs, we should not consider aliases to ensure we don't rely on them internally. There are probably more places that need to be converted. --- nixos/lib/testing-python.nix | 8 +++++++- nixos/tests/make-test-python.nix | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix index c9d4f0f0861d..99d0a9a0bfaf 100644 --- a/nixos/lib/testing-python.nix +++ b/nixos/lib/testing-python.nix @@ -130,7 +130,13 @@ rec { { virtualisation.qemu.package = qemu_pkg; } - ); + ) ++ [( + { + # Ensure we do not use aliases. Ideally this is only set + # when the test framework is used by Nixpkgs NixOS tests. + nixpkgs.config.allowAliases = false; + } + )]; }; # FIXME: get this pkg from the module system diff --git a/nixos/tests/make-test-python.nix b/nixos/tests/make-test-python.nix index 89897fe7e61b..7a96f538d8d7 100644 --- a/nixos/tests/make-test-python.nix +++ b/nixos/tests/make-test-python.nix @@ -1,6 +1,6 @@ f: { system ? builtins.currentSystem, - pkgs ? import ../.. { inherit system; config = {}; }, + pkgs ? import ../.. { inherit system; }, ... } @ args: From 6d27068d7c1b35b3a074671fae658c3f3aa445cd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 3 Jun 2021 20:29:02 +0200 Subject: [PATCH 80/83] nixos/tests/snapcast: minor polish to make the tests more expressive --- nixos/tests/snapcast.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/snapcast.nix b/nixos/tests/snapcast.nix index ef35d586c9c8..8d960b4cc069 100644 --- a/nixos/tests/snapcast.nix +++ b/nixos/tests/snapcast.nix @@ -72,10 +72,10 @@ in { ) with subtest("test a connection"): - client.execute("systemd-run snapclient -h server -p ${toString port}") + client.execute("systemd-run --unit=snapcast-client snapclient -h server -p ${toString port}") server.wait_until_succeeds( "journalctl -o cat -u snapserver.service | grep -q 'Hello from'" ) - client.wait_until_succeeds("journalctl -o cat -u run-\* | grep -q ${toString bufferSize}") + client.wait_until_succeeds("journalctl -o cat -u snapcast-client | grep -q 'buffer: ${toString bufferSize}'") ''; }) From b173e855fa73cafec99c3c0273035d991827625f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 3 Jun 2021 18:54:48 +0000 Subject: [PATCH 81/83] kalk: 0.5.4 -> 1.0.0 --- pkgs/tools/misc/kalk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/kalk/default.nix b/pkgs/tools/misc/kalk/default.nix index 64fabd805a6d..44b3e3b14a3f 100644 --- a/pkgs/tools/misc/kalk/default.nix +++ b/pkgs/tools/misc/kalk/default.nix @@ -5,16 +5,16 @@ }: rustPlatform.buildRustPackage rec { pname = "kalk"; - version = "0.5.4"; + version = "1.0.0"; src = fetchFromGitHub { owner = "PaddiM8"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lHHnNiNy8L8GdjOj5EqtticnksPrCwhFoFatFrWEQJ4="; + sha256 = "sha256-1iZvp30/V0bw9NBxiKNiDgOMYJkDsGhTGdBsAPggdEg="; }; - cargoSha256 = "sha256-Qtip9CeurTM4aY67F5tSM3fis6W/dlnaIVMQ29UoBzc="; + cargoSha256 = "sha256-qHXlhKeuDpebpbbGr34Uvwyg//HdCL0UoTqRf9vEfmE="; nativeBuildInputs = [ m4 ]; From f5f8341c76ffad22ae52c622be97c94ccbd2a847 Mon Sep 17 00:00:00 2001 From: talyz Date: Wed, 28 Apr 2021 16:56:06 +0200 Subject: [PATCH 82/83] nixos/geoipupdate: Replace the old `geoip-updater` module Our old bespoke GeoIP updater doesn't seem to be working anymore. Instead of trying to fix it, replace it with the official updater from MaxMind. --- .../from_md/release-notes/rl-2111.section.xml | 20 +- .../manual/release-notes/rl-2111.section.md | 7 + nixos/modules/misc/ids.nix | 2 +- nixos/modules/module-list.nix | 2 +- nixos/modules/services/misc/geoip-updater.nix | 306 ------------------ nixos/modules/services/misc/geoipupdate.nix | 145 +++++++++ 6 files changed, 171 insertions(+), 311 deletions(-) delete mode 100644 nixos/modules/services/misc/geoip-updater.nix create mode 100644 nixos/modules/services/misc/geoipupdate.nix diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index e861b4fe7e28..e0b52ffa342c 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -19,18 +19,32 @@
New Services - - + + + + geoipupdate, + a GeoIP database updater from MaxMind. Available as + services.geoipupdate. + + +
Backward Incompatibilities - + The staticjinja package has been upgraded from 1.0.4 to 2.0.0 + + + services.geoip-updater was broken and has + been replaced by + services.geoipupdate. + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 9a6da7f22bd0..d4604447f83f 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -8,8 +8,15 @@ In addition to numerous new and upgraded packages, this release has the followin ## New Services +* [geoipupdate](https://github.com/maxmind/geoipupdate), a GeoIP + database updater from MaxMind. Available as + [services.geoipupdate](options.html#opt-services.geoipupdate.enable). + ## Backward Incompatibilities * The `staticjinja` package has been upgraded from 1.0.4 to 2.0.0 +* `services.geoip-updater` was broken and has been replaced by + [services.geoipupdate](options.html#opt-services.geoipupdate.enable). + ## Other Notable Changes diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 05cc5002aaf6..7ea2940292b3 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -300,7 +300,7 @@ in #pdns-recursor = 269; # dynamically allocated as of 2020-20-18 #kresd = 270; # switched to "knot-resolver" with dynamic ID rpc = 271; - geoip = 272; + #geoip = 272; # new module uses DynamicUser fcron = 273; sonarr = 274; radarr = 275; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index ebafb5ef5aab..42f0471c4cff 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -492,7 +492,7 @@ ./services/misc/freeswitch.nix ./services/misc/fstrim.nix ./services/misc/gammu-smsd.nix - ./services/misc/geoip-updater.nix + ./services/misc/geoipupdate.nix ./services/misc/gitea.nix #./services/misc/gitit.nix ./services/misc/gitlab.nix diff --git a/nixos/modules/services/misc/geoip-updater.nix b/nixos/modules/services/misc/geoip-updater.nix deleted file mode 100644 index baf0a8d73d19..000000000000 --- a/nixos/modules/services/misc/geoip-updater.nix +++ /dev/null @@ -1,306 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.geoip-updater; - - dbBaseUrl = "https://geolite.maxmind.com/download/geoip/database"; - - randomizedTimerDelaySec = "3600"; - - # Use writeScriptBin instead of writeScript, so that argv[0] (logged to the - # journal) doesn't include the long nix store path hash. (Prefixing the - # ExecStart= command with '@' doesn't work because we start a shell (new - # process) that creates a new argv[0].) - geoip-updater = pkgs.writeScriptBin "geoip-updater" '' - #!${pkgs.runtimeShell} - skipExisting=0 - debug() - { - echo "<7>$@" - } - info() - { - echo "<6>$@" - } - error() - { - echo "<3>$@" - } - die() - { - error "$@" - exit 1 - } - waitNetworkOnline() - { - ret=1 - for i in $(seq 6); do - curl_out=$("${pkgs.curl.bin}/bin/curl" \ - --silent --fail --show-error --max-time 60 "${dbBaseUrl}" 2>&1) - if [ $? -eq 0 ]; then - debug "Server is reachable (try $i)" - ret=0 - break - else - debug "Server is unreachable (try $i): $curl_out" - sleep 10 - fi - done - return $ret - } - dbFnameTmp() - { - dburl=$1 - echo "${cfg.databaseDir}/.$(basename "$dburl")" - } - dbFnameTmpDecompressed() - { - dburl=$1 - echo "${cfg.databaseDir}/.$(basename "$dburl")" | sed 's/\.\(gz\|xz\)$//' - } - dbFname() - { - dburl=$1 - echo "${cfg.databaseDir}/$(basename "$dburl")" | sed 's/\.\(gz\|xz\)$//' - } - downloadDb() - { - dburl=$1 - curl_out=$("${pkgs.curl.bin}/bin/curl" \ - --silent --fail --show-error --max-time 900 -L -o "$(dbFnameTmp "$dburl")" "$dburl" 2>&1) - if [ $? -ne 0 ]; then - error "Failed to download $dburl: $curl_out" - return 1 - fi - } - decompressDb() - { - fn=$(dbFnameTmp "$1") - ret=0 - case "$fn" in - *.gz) - cmd_out=$("${pkgs.gzip}/bin/gzip" --decompress --force "$fn" 2>&1) - ;; - *.xz) - cmd_out=$("${pkgs.xz.bin}/bin/xz" --decompress --force "$fn" 2>&1) - ;; - *) - cmd_out=$(echo "File \"$fn\" is neither a .gz nor .xz file") - false - ;; - esac - if [ $? -ne 0 ]; then - error "$cmd_out" - ret=1 - fi - } - atomicRename() - { - dburl=$1 - mv "$(dbFnameTmpDecompressed "$dburl")" "$(dbFname "$dburl")" - } - removeIfNotInConfig() - { - # Arg 1 is the full path of an installed DB. - # If the corresponding database is not specified in the NixOS config we - # remove it. - db=$1 - for cdb in ${lib.concatStringsSep " " cfg.databases}; do - confDb=$(echo "$cdb" | sed 's/\.\(gz\|xz\)$//') - if [ "$(basename "$db")" = "$(basename "$confDb")" ]; then - return 0 - fi - done - rm "$db" - if [ $? -eq 0 ]; then - debug "Removed $(basename "$db") (not listed in services.geoip-updater.databases)" - else - error "Failed to remove $db" - fi - } - removeUnspecifiedDbs() - { - for f in "${cfg.databaseDir}/"*; do - test -f "$f" || continue - case "$f" in - *.dat|*.mmdb|*.csv) - removeIfNotInConfig "$f" - ;; - *) - debug "Not removing \"$f\" (unknown file extension)" - ;; - esac - done - } - downloadAndInstall() - { - dburl=$1 - if [ "$skipExisting" -eq 1 -a -f "$(dbFname "$dburl")" ]; then - debug "Skipping existing file: $(dbFname "$dburl")" - return 0 - fi - downloadDb "$dburl" || return 1 - decompressDb "$dburl" || return 1 - atomicRename "$dburl" || return 1 - info "Updated $(basename "$(dbFname "$dburl")")" - } - for arg in "$@"; do - case "$arg" in - --skip-existing) - skipExisting=1 - info "Option --skip-existing is set: not updating existing databases" - ;; - *) - error "Unknown argument: $arg";; - esac - done - waitNetworkOnline || die "Network is down (${dbBaseUrl} is unreachable)" - test -d "${cfg.databaseDir}" || die "Database directory (${cfg.databaseDir}) doesn't exist" - debug "Starting update of GeoIP databases in ${cfg.databaseDir}" - all_ret=0 - for db in ${lib.concatStringsSep " \\\n " cfg.databases}; do - downloadAndInstall "${dbBaseUrl}/$db" || all_ret=1 - done - removeUnspecifiedDbs || all_ret=1 - if [ $all_ret -eq 0 ]; then - info "Completed GeoIP database update in ${cfg.databaseDir}" - else - error "Completed GeoIP database update in ${cfg.databaseDir}, with error(s)" - fi - # Hack to work around systemd journal race: - # https://github.com/systemd/systemd/issues/2913 - sleep 2 - exit $all_ret - ''; - -in - -{ - options = { - services.geoip-updater = { - enable = mkOption { - default = false; - type = types.bool; - description = '' - Whether to enable periodic downloading of GeoIP databases from - maxmind.com. You might want to enable this if you, for instance, use - ntopng or Wireshark. - ''; - }; - - interval = mkOption { - type = types.str; - default = "weekly"; - description = '' - Update the GeoIP databases at this time / interval. - The format is described in - systemd.time - 7. - To prevent load spikes on maxmind.com, the timer interval is - randomized by an additional delay of ${randomizedTimerDelaySec} - seconds. Setting a shorter interval than this is not recommended. - ''; - }; - - databaseDir = mkOption { - type = types.path; - default = "/var/lib/geoip-databases"; - description = '' - Directory that will contain GeoIP databases. - ''; - }; - - databases = mkOption { - type = types.listOf types.str; - default = [ - "GeoLiteCountry/GeoIP.dat.gz" - "GeoIPv6.dat.gz" - "GeoLiteCity.dat.xz" - "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" - "asnum/GeoIPASNum.dat.gz" - "asnum/GeoIPASNumv6.dat.gz" - "GeoLite2-Country.mmdb.gz" - "GeoLite2-City.mmdb.gz" - ]; - description = '' - Which GeoIP databases to update. The full URL is ${dbBaseUrl}/ + - the_database. - ''; - }; - - }; - - }; - - config = mkIf cfg.enable { - - assertions = [ - { assertion = (builtins.filter - (x: builtins.match ".*\\.(gz|xz)$" x == null) cfg.databases) == []; - message = '' - services.geoip-updater.databases supports only .gz and .xz databases. - - Current value: - ${toString cfg.databases} - - Offending element(s): - ${toString (builtins.filter (x: builtins.match ".*\\.(gz|xz)$" x == null) cfg.databases)}; - ''; - } - ]; - - users.users.geoip = { - group = "root"; - description = "GeoIP database updater"; - uid = config.ids.uids.geoip; - }; - - systemd.timers.geoip-updater = - { description = "GeoIP Updater Timer"; - partOf = [ "geoip-updater.service" ]; - wantedBy = [ "timers.target" ]; - timerConfig.OnCalendar = cfg.interval; - timerConfig.Persistent = "true"; - timerConfig.RandomizedDelaySec = randomizedTimerDelaySec; - }; - - systemd.services.geoip-updater = { - description = "GeoIP Updater"; - after = [ "network-online.target" "nss-lookup.target" ]; - wants = [ "network-online.target" ]; - preStart = '' - mkdir -p "${cfg.databaseDir}" - chmod 755 "${cfg.databaseDir}" - chown geoip:root "${cfg.databaseDir}" - ''; - serviceConfig = { - ExecStart = "${geoip-updater}/bin/geoip-updater"; - User = "geoip"; - PermissionsStartOnly = true; - }; - }; - - systemd.services.geoip-updater-setup = { - description = "GeoIP Updater Setup"; - after = [ "network-online.target" "nss-lookup.target" ]; - wants = [ "network-online.target" ]; - wantedBy = [ "multi-user.target" ]; - conflicts = [ "geoip-updater.service" ]; - preStart = '' - mkdir -p "${cfg.databaseDir}" - chmod 755 "${cfg.databaseDir}" - chown geoip:root "${cfg.databaseDir}" - ''; - serviceConfig = { - ExecStart = "${geoip-updater}/bin/geoip-updater --skip-existing"; - User = "geoip"; - PermissionsStartOnly = true; - # So it won't be (needlessly) restarted: - RemainAfterExit = true; - }; - }; - - }; -} diff --git a/nixos/modules/services/misc/geoipupdate.nix b/nixos/modules/services/misc/geoipupdate.nix new file mode 100644 index 000000000000..5d87be928d98 --- /dev/null +++ b/nixos/modules/services/misc/geoipupdate.nix @@ -0,0 +1,145 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.geoipupdate; +in +{ + imports = [ + (lib.mkRemovedOptionModule [ "services" "geoip-updater" ] "services.geoip-updater has been removed, use services.geoipupdate instead.") + ]; + + options = { + services.geoipupdate = { + enable = lib.mkEnableOption '' + periodic downloading of GeoIP databases using + geoipupdate. + ''; + + interval = lib.mkOption { + type = lib.types.str; + default = "weekly"; + description = '' + Update the GeoIP databases at this time / interval. + The format is described in + systemd.time + 7. + ''; + }; + + settings = lib.mkOption { + description = '' + geoipupdate configuration + options. See + + for a full list of available options. + ''; + type = lib.types.submodule { + freeformType = + with lib.types; + let + type = oneOf [str int bool]; + in + attrsOf (either type (listOf type)); + + options = { + + AccountID = lib.mkOption { + type = lib.types.int; + description = '' + Your MaxMind account ID. + ''; + }; + + EditionIDs = lib.mkOption { + type = with lib.types; listOf (either str int); + example = [ + "GeoLite2-ASN" + "GeoLite2-City" + "GeoLite2-Country" + ]; + description = '' + List of database edition IDs. This includes new string + IDs like GeoIP2-City and old + numeric IDs like 106. + ''; + }; + + LicenseKey = lib.mkOption { + type = lib.types.path; + description = '' + A file containing the MaxMind + license key. + ''; + }; + + DatabaseDirectory = lib.mkOption { + type = lib.types.path; + default = "/var/lib/GeoIP"; + example = "/run/GeoIP"; + description = '' + The directory to store the database files in. The + directory will be automatically created, the owner + changed to geoip and permissions + set to world readable. This applies if the directory + already exists as well, so don't use a directory with + sensitive contents. + ''; + }; + + }; + }; + }; + }; + + }; + + config = lib.mkIf cfg.enable { + + services.geoipupdate.settings = { + LockFile = "/run/geoipupdate/.lock"; + }; + + systemd.services.geoipupdate = { + description = "GeoIP Updater"; + after = [ "network-online.target" "nss-lookup.target" ]; + wants = [ "network-online.target" ]; + startAt = cfg.interval; + serviceConfig = { + ExecStartPre = + let + geoipupdateKeyValue = lib.generators.toKeyValue { + mkKeyValue = lib.flip lib.generators.mkKeyValueDefault " " rec { + mkValueString = v: with builtins; + if isInt v then toString v + else if isString v then v + else if true == v then "1" + else if false == v then "0" + else if isList v then lib.concatMapStringsSep " " mkValueString v + else throw "unsupported type ${typeOf v}: ${(lib.generators.toPretty {}) v}"; + }; + }; + + geoipupdateConf = pkgs.writeText "discourse.conf" (geoipupdateKeyValue cfg.settings); + + script = '' + mkdir -p "${cfg.settings.DatabaseDirectory}" + chmod 755 "${cfg.settings.DatabaseDirectory}" + chown geoip "${cfg.settings.DatabaseDirectory}" + + cp ${geoipupdateConf} /run/geoipupdate/GeoIP.conf + ${pkgs.replace-secret}/bin/replace-secret '${cfg.settings.LicenseKey}' \ + '${cfg.settings.LicenseKey}' \ + /run/geoipupdate/GeoIP.conf + ''; + in + "+${pkgs.writeShellScript "start-pre-full-privileges" script}"; + ExecStart = "${pkgs.geoipupdate}/bin/geoipupdate -f /run/geoipupdate/GeoIP.conf"; + User = "geoip"; + DynamicUser = true; + ReadWritePaths = cfg.settings.DatabaseDirectory; + RuntimeDirectory = "geoipupdate"; + RuntimeDirectoryMode = 0700; + }; + }; + }; +} From 3f297bfcbb2078ae32491bea2db2dfa38c5a8ac5 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 3 Jun 2021 12:29:19 -0700 Subject: [PATCH 83/83] kalk -> kalker --- pkgs/tools/misc/{kalk => kalker}/default.nix | 8 ++++---- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) rename pkgs/tools/misc/{kalk => kalker}/default.nix (77%) diff --git a/pkgs/tools/misc/kalk/default.nix b/pkgs/tools/misc/kalker/default.nix similarity index 77% rename from pkgs/tools/misc/kalk/default.nix rename to pkgs/tools/misc/kalker/default.nix index 44b3e3b14a3f..503edb910f0c 100644 --- a/pkgs/tools/misc/kalk/default.nix +++ b/pkgs/tools/misc/kalker/default.nix @@ -4,7 +4,7 @@ , rustPlatform }: rustPlatform.buildRustPackage rec { - pname = "kalk"; + pname = "kalker"; version = "1.0.0"; src = fetchFromGitHub { @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-1iZvp30/V0bw9NBxiKNiDgOMYJkDsGhTGdBsAPggdEg="; }; - cargoSha256 = "sha256-qHXlhKeuDpebpbbGr34Uvwyg//HdCL0UoTqRf9vEfmE="; + cargoSha256 = "sha256-fBWnMlOLgwrOBPS2GIfOUDHQHcMMaU5r9JZVMbA+W58="; nativeBuildInputs = [ m4 ]; @@ -25,8 +25,8 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - homepage = "https://kalk.strct.net"; - changelog = "https://github.com/PaddiM8/kalk/releases/tag/v${version}"; + homepage = "https://kalker.strct.net"; + changelog = "https://github.com/PaddiM8/kalker/releases/tag/v${version}"; description = "A command line calculator"; longDescription = '' A command line calculator that supports math-like syntax with user-defined diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ba631bb45ec5..351e3025dede 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -340,6 +340,7 @@ mapAliases ({ jikes = throw "jikes was deprecated on 2019-10-07: abandoned by upstream"; joseki = apache-jena-fuseki; # added 2016-02-28 json_glib = json-glib; # added 2018-02-25 + kalk = kalker; # added 2021-06-03 kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # 2020-06-16 k9copy = throw "k9copy has been removed from nixpkgs, as there is no upstream activity"; # 2020-11-06 kodiGBM = kodi-gbm; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e35b0a197ab..66152153fc76 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2845,7 +2845,7 @@ in kaldi = callPackage ../tools/audio/kaldi { }; - kalk = callPackage ../tools/misc/kalk { }; + kalker = callPackage ../tools/misc/kalker { }; kisslicer = callPackage ../tools/misc/kisslicer { };