From 11b6ded912c48bc15beab5abac337bef0073df0f Mon Sep 17 00:00:00 2001 From: Alex Brandt Date: Mon, 30 Nov 2020 21:19:50 +0000 Subject: [PATCH 001/120] nixos/nixpkgs/doc: add missing operator to attrsets.mapAttrs example. It looks like this operator was missing (just a dropped +) unless I'm missing something unexpected about the Nix syntax I've forgotten. --- doc/functions/library/attrsets.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/functions/library/attrsets.xml b/doc/functions/library/attrsets.xml index 3c5823c25891..f3ceeac0e888 100644 --- a/doc/functions/library/attrsets.xml +++ b/doc/functions/library/attrsets.xml @@ -772,7 +772,7 @@ nameValuePair "some" 6 Modifying each value of an attribute set { x = "x-foo"; y = "y-bar"; } ]]> From c923bcbb309095f261468d9853e870e6d1e0fad5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 18 Jan 2021 15:40:08 +0000 Subject: [PATCH 002/120] elogind: 243.7 -> 246.9.2 --- pkgs/applications/misc/elogind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/elogind/default.nix b/pkgs/applications/misc/elogind/default.nix index a3919648f749..c83385810839 100644 --- a/pkgs/applications/misc/elogind/default.nix +++ b/pkgs/applications/misc/elogind/default.nix @@ -29,13 +29,13 @@ with lib; stdenv.mkDerivation rec { pname = "elogind"; - version = "243.7"; + version = "246.9.2"; src = fetchFromGitHub { owner = "elogind"; repo = pname; rev = "v${version}"; - sha256 = "0cihdf7blhncm2359qxli24j9l3dkn15gjys5vpjwny80zlym5ma"; + sha256 = "sha256-EsW19D6eoEO4RJO+jwMA/SMFus+cxq9Fcy2zrcn9pd8="; }; nativeBuildInputs = [ From ba1cf80b7ca43f85b9b31875dff75f8153fd64e8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 30 Jan 2021 10:35:03 +0000 Subject: [PATCH 003/120] kore: 4.0.1 -> 4.1.0 --- pkgs/development/web/kore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/kore/default.nix b/pkgs/development/web/kore/default.nix index bc8113fc6a1d..a1bd3ecd451b 100644 --- a/pkgs/development/web/kore/default.nix +++ b/pkgs/development/web/kore/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kore"; - version = "4.0.1"; + version = "4.1.0"; src = fetchFromGitHub { owner = "jorisvink"; repo = pname; rev = version; - sha256 = "0186lih30zps2d4600ikafbgsml269jzpcszdggzzkdw8p628qw9"; + sha256 = "sha256-w5H1USQ2aladwSFdfYsX925pjCt3QWoXK4HqyEL7rH0="; }; buildInputs = [ openssl curl postgresql yajl ]; From d790e59ed2e9f5c20e5ef778e6b4994ed34d48fc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 8 Mar 2021 04:05:09 +0000 Subject: [PATCH 004/120] libsForQt5.alkimia: 8.0.4 -> 8.1.0 --- pkgs/development/libraries/alkimia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/alkimia/default.nix b/pkgs/development/libraries/alkimia/default.nix index 18c40c5b5fb3..34d6bf14e0b6 100644 --- a/pkgs/development/libraries/alkimia/default.nix +++ b/pkgs/development/libraries/alkimia/default.nix @@ -5,11 +5,11 @@ mkDerivation rec { pname = "alkimia"; - version = "8.0.4"; + version = "8.1.0"; src = fetchurl { url = "mirror://kde/stable/alkimia/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-AASnBo3/CqLLb0f3DSHBKQc74R8u2yHxRRK8RHBIfR8="; + sha256 = "sha256-kWgHNScHsEkM3ZymVoLv9zsAylIwKb2m/nonSaG8knw="; }; nativeBuildInputs = [ extra-cmake-modules doxygen graphviz ]; From 929ea1b082f18fa57a2634e54936fec314fe5826 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Mar 2021 10:36:14 +0000 Subject: [PATCH 005/120] convbin: 3.0 -> 3.4 --- pkgs/tools/misc/convbin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/convbin/default.nix b/pkgs/tools/misc/convbin/default.nix index 7f57cab585bc..7405535edd43 100644 --- a/pkgs/tools/misc/convbin/default.nix +++ b/pkgs/tools/misc/convbin/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "convbin"; - version = "3.0"; + version = "3.4"; src = fetchFromGitHub { owner = "mateoconlechuga"; repo = pname; rev = "v${version}"; - sha256 = "0n502zj8igm583kbfvyv7zhd97vb71jac41ncb9jr2yz2v5ir8j9"; + sha256 = "sha256-JM9ixxOI3NnK3h54byFycTCJ/A+JTcNHKR71zxRed/s="; }; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; From 398748deb1d4936ec414887826c38940961adeeb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Mar 2021 11:10:44 +0000 Subject: [PATCH 006/120] dhewm3: 1.5.0 -> 1.5.1 --- pkgs/games/dhewm3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/dhewm3/default.nix b/pkgs/games/dhewm3/default.nix index b5caa603eaf8..e0590403f7b4 100644 --- a/pkgs/games/dhewm3/default.nix +++ b/pkgs/games/dhewm3/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "dhewm3"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "dhewm"; repo = "dhewm3"; rev = version; - sha256 = "0wsabvh1x4g12xmhzs2m2pgri2q9sir1w3m2r7fpy6kzxp32hqdk"; + sha256 = "sha256-QI2INtNP+TSXdGSNxBcJ+lQK9dvDStrir20z3kCY8v4="; }; # Add libGLU libGL linking From 1111ebc4a13f742b94f69e714b355eafda5ca5c5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Mar 2021 20:19:02 +0000 Subject: [PATCH 007/120] yad: 8.0 -> 9.0 --- pkgs/tools/misc/yad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/yad/default.nix b/pkgs/tools/misc/yad/default.nix index 2069ba6b1593..77491f22f987 100644 --- a/pkgs/tools/misc/yad/default.nix +++ b/pkgs/tools/misc/yad/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "yad"; - version = "8.0"; + version = "9.0"; src = fetchFromGitHub { owner = "v1cont"; repo = "yad"; rev = "v${version}"; - sha256 = "sha256-KntJtli1PtqH/9XOTq4FkVJYklp0L7bChwQQGCBTLDA="; + sha256 = "sha256-P22DMmR+z2kl05SkOsbjFHFz9I5cu4W6EaYLpd1a0mg="; }; configureFlags = [ From 0206bf6d7539c68108d100d46967983fc578ad4b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 18 Mar 2021 08:46:31 +0000 Subject: [PATCH 008/120] ibus-engines.bamboo: 0.6.9 -> 0.7.0 --- pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix index 623c29124ff1..0785b7563456 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "ibus-bamboo"; - version = "0.6.9"; + version = "0.7.0"; src = fetchFromGitHub { owner = "BambooEngine"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7UXURvZX5UrpLHFYgBnuTX/sKQkubnBlvkSD/WBa4ZU="; + sha256 = "sha256-WKNDrm8PSU/F8MzpVsJ9oUkbolCxrwbjOZYYNiFr5Qs="; }; nativeBuildInputs = [ From 8671b73a727553cce0031b042595bd780b6f7f18 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 22 Mar 2021 05:31:17 +0000 Subject: [PATCH 009/120] calamares: 3.2.36 -> 3.2.39 --- pkgs/tools/misc/calamares/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index 90abc7659203..d65d31d44c4e 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -6,12 +6,12 @@ mkDerivation rec { pname = "calamares"; - version = "3.2.36"; + version = "3.2.39"; # release including submodule src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-pgA0mRglIBObNNUQIozNy6EvJQSmHRF+kN4EjqL4tt4="; + sha256 = "sha256-QGdy49RndRIBR3B+Z7iXbFyx5gxXO2GHNYc+iv0z47w="; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; From e669ec230f55aec86ffffeba17b7773650991bb9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 22 Mar 2021 08:20:31 +0000 Subject: [PATCH 010/120] git-hub: 2.1.0 -> 2.1.1 --- .../version-management/git-and-tools/git-hub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix index 8c7ecee04768..83397d1934e1 100644 --- a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "git-hub"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "sociomantic-tsunami"; repo = "git-hub"; rev = "v${version}"; - sha256 = "1df9l8fpbxjgcgi72fwaqxiay5kpfihyc63f0gj67mns9n9ic1i7"; + sha256 = "sha256-k8sGgDhQn9e0lxM604Wz2sy4lrX5o82xAgWbqscOmQw="; }; nativeBuildInputs = [ From 3b215e7a2fe55711518f2c00231504943d5d0f91 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 22 Mar 2021 10:26:47 +0000 Subject: [PATCH 011/120] kpt: 0.38.0 -> 0.38.1 --- pkgs/applications/networking/cluster/kpt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kpt/default.nix b/pkgs/applications/networking/cluster/kpt/default.nix index 577e52ed49d6..be91a64b74f9 100644 --- a/pkgs/applications/networking/cluster/kpt/default.nix +++ b/pkgs/applications/networking/cluster/kpt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kpt"; - version = "0.38.0"; + version = "0.38.1"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MBZa4LdpCZnVVbjzkYpPi9/CYGqVLeYy2N/AS1PSYBE="; + sha256 = "sha256-gJAdxg/evsQ+mKsNx/migDMK5lCZ2qSrksbsGDr4fmU="; }; - vendorSha256 = "sha256-P0cN8aw62nPD1OlUAw1E36YxptxtPqqruZfDDG4Ag2w="; + vendorSha256 = "sha256-GvkT51JudEdPz6zbqyf5qY6P2AbsaSMbirnxXmza5aI="; subPackages = [ "." ]; From 62b9e3398e24976c9de17769642514db745e21b9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 5 Apr 2021 08:41:01 +0000 Subject: [PATCH 012/120] felix: 6.0.3 -> 7.0.0 --- pkgs/servers/felix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/felix/default.nix b/pkgs/servers/felix/default.nix index dd9d34c85fdd..1f355e61e457 100644 --- a/pkgs/servers/felix/default.nix +++ b/pkgs/servers/felix/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "apache-felix"; - version = "6.0.3"; + version = "7.0.0"; src = fetchurl { url = "mirror://apache/felix/org.apache.felix.main.distribution-${version}.tar.gz"; - sha256 = "1yk04q8rfbbabacbhmrsw5ywr96496x1cz4icdqimb1cfxixv1q0"; + sha256 = "sha256-ea1QYUqf6m3HB17TrEQ7UEc48fl5QHQMYsN3t0T9VD4="; }; buildCommand = '' From f75ccee1f0e7b466e1ec29e7ee0aeec28a750060 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 22 May 2021 16:52:10 +0000 Subject: [PATCH 013/120] galene: 0.3.4 -> 0.3.5 --- pkgs/servers/web-apps/galene/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/galene/default.nix b/pkgs/servers/web-apps/galene/default.nix index c24857d9dc5f..0ae5523c35a3 100644 --- a/pkgs/servers/web-apps/galene/default.nix +++ b/pkgs/servers/web-apps/galene/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "galene"; - version = "0.3.4"; + version = "0.3.5"; src = fetchFromGitHub { owner = "jech"; repo = "galene"; rev = "galene-${version}"; - sha256 = "sha256-yb+gEex4WEvIAEMuSTkw25rsBTL9tlfhf9qQtISWUd0="; + sha256 = "sha256-CqwxHLXhiBYPS+93/MycS2IR//31puhI+oSpMS/jR1s="; }; vendorSha256 = "sha256-Vm7tTTQJyZZVbORl5ziy4GJ34kHh5dh0ojX/ZuTpshA="; From 49b89bb8f0442a30128fffe18974f3083fddd8d5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 23 May 2021 02:13:52 +0000 Subject: [PATCH 014/120] alephone-marathon: 20200904 -> 20210408 --- pkgs/games/alephone/marathon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/alephone/marathon/default.nix b/pkgs/games/alephone/marathon/default.nix index 4518215a3374..9c2c9ad1ecf4 100644 --- a/pkgs/games/alephone/marathon/default.nix +++ b/pkgs/games/alephone/marathon/default.nix @@ -3,13 +3,13 @@ alephone.makeWrapper rec { pname = "marathon"; desktopName = "Marathon"; - version = "20200904"; + version = "20210408"; icon = alephone.icons + "/marathon.png"; zip = fetchurl { url = "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/Marathon-${version}-Data.zip"; - sha256 = "sha256-x5M8RkxH+Rn8hUJIIq/AFC5Ibn0zF95BqZIDEwM6wVg="; + sha256 = "sha256-WM5c0X/BGeDu8d7hME3LiZavkgJll6rc3Beat/2bsdg="; }; meta = { From 056d7221aadbca98a23fdadb3b2963d43433ac2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Wed, 26 May 2021 07:34:06 +0200 Subject: [PATCH 015/120] SDL_Pango: fix darwin build --- pkgs/development/libraries/SDL_Pango/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/SDL_Pango/default.nix b/pkgs/development/libraries/SDL_Pango/default.nix index 83afeaf2d67b..7c90092fe8dd 100644 --- a/pkgs/development/libraries/SDL_Pango/default.nix +++ b/pkgs/development/libraries/SDL_Pango/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { ]; preConfigure = "autoreconf -i -f"; + configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ SDL pango ]; From 59af88ef87fb73c6d074aa2d2ef2827e568da14b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 17 Jun 2021 03:41:34 +0000 Subject: [PATCH 016/120] blktrace: 1.2.0 -> 1.3.0 --- pkgs/os-specific/linux/blktrace/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/blktrace/default.nix b/pkgs/os-specific/linux/blktrace/default.nix index fb5a5d06212b..31460297213c 100644 --- a/pkgs/os-specific/linux/blktrace/default.nix +++ b/pkgs/os-specific/linux/blktrace/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchurl, libaio }: stdenv.mkDerivation { - name = "blktrace-1.2.0"; + name = "blktrace-1.3.0"; # Official source # "git://git.kernel.org/pub/scm/linux/kernel/git/axboe/blktrace.git" src = fetchurl { - url = "http://brick.kernel.dk/snaps/blktrace-1.2.0.tar.bz2"; - sha256 = "0i9z7ayh9qx4wi0ihyz15bhr1c9aknjl8v5i8c9mx3rhyy41i5i6"; + url = "http://brick.kernel.dk/snaps/blktrace-1.3.0.tar.bz2"; + sha256 = "sha256-1t7aA4Yt4r0bG5+6cpu7hi2bynleaqf3yoa2VoEacNY="; }; buildInputs = [ libaio ]; From 6f9e8ba1e4fb692c99458057d720776dd28f66bb Mon Sep 17 00:00:00 2001 From: edef Date: Mon, 3 Aug 2020 08:40:16 +0000 Subject: [PATCH 017/120] libfx2: fix git ref cache.nixos.org has the actual source cached, so this didn't impact builds for anyone using that cache. edef@jaguar ~/s/nixpkgs> nix eval -I nixpkgs=. nixpkgs.pythonPackages.fx2.src.urls [ "https://github.com/whitequark/libfx2/archive/0.9.tar.gz" ] edef@jaguar ~/s/nixpkgs> curl -L https://github.com/whitequark/libfx2/archive/0.9.tar.gz 404: Not Found --- pkgs/development/python-modules/fx2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/fx2/default.nix b/pkgs/development/python-modules/fx2/default.nix index bcc7a4b5c988..e82679443562 100644 --- a/pkgs/development/python-modules/fx2/default.nix +++ b/pkgs/development/python-modules/fx2/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "whitequark"; repo = "libfx2"; - rev = version; + rev = "v${version}"; sha256 = "sha256-Uk+K7ym92JX4fC3PyTNxd0UvBzoNZmtbscBYjSWChuk="; }; From b1399834acc8b3bd92e52b8d4ef8effc0dee66e6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 23 Jul 2021 04:51:33 +0000 Subject: [PATCH 018/120] entt: 3.7.1 -> 3.8.0 --- pkgs/development/libraries/entt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/entt/default.nix b/pkgs/development/libraries/entt/default.nix index 34a4f93bb860..3057c888b02a 100644 --- a/pkgs/development/libraries/entt/default.nix +++ b/pkgs/development/libraries/entt/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "entt"; - version = "3.7.1"; + version = "3.8.0"; src = fetchFromGitHub { owner = "skypjack"; repo = "entt"; rev = "v${version}"; - sha256 = "sha256-t1QRqasb82W277XEV2FG5JrsQWIWZ0G5V7wLI+p4MpQ="; + sha256 = "sha256-gieft0sErTr3aB6mZLdALSx+RkmCQuE9lopAwJbOXnA="; }; nativeBuildInputs = [ cmake ]; From f5d3419121d7d1e4b92227d6952dfeec8e1df579 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Jul 2021 11:48:55 +0200 Subject: [PATCH 019/120] python3Packages.systembridge: 1.2.4 -> 2.0.4 --- pkgs/development/python-modules/systembridge/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/systembridge/default.nix b/pkgs/development/python-modules/systembridge/default.nix index 2c7328c50d6f..62dbc118a997 100644 --- a/pkgs/development/python-modules/systembridge/default.nix +++ b/pkgs/development/python-modules/systembridge/default.nix @@ -1,19 +1,19 @@ { lib , aiohttp -, websockets , buildPythonPackage , fetchFromGitHub +, websockets }: buildPythonPackage rec { pname = "systembridge"; - version = "1.2.4"; + version = "2.0.4"; src = fetchFromGitHub { owner = "timmo001"; repo = "system-bridge-connector-py"; rev = "v${version}"; - sha256 = "sha256-dZOtvJXBXMKC+VOyQRMyaWAXg8lHjLcM2Zz9P0/ILT8="; + sha256 = "03scbn6khvw1nj73j8kmvyfrxnqcc0wh3ncck4byby6if1an5dvd"; }; propagatedBuildInputs = [ @@ -23,6 +23,7 @@ buildPythonPackage rec { # Project has no tests doCheck = false; + pythonImportsCheck = [ "systembridge" ]; meta = with lib; { From 40b02a9f5b7658b0765138d0f4a3d4882deb938a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 25 Jul 2021 16:36:29 +0000 Subject: [PATCH 020/120] libsForQt5.kdsoap: 1.10.0 -> 2.0.0 --- pkgs/development/libraries/kdsoap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/kdsoap/default.nix b/pkgs/development/libraries/kdsoap/default.nix index a4dd9cbaa45d..26d684004b6f 100644 --- a/pkgs/development/libraries/kdsoap/default.nix +++ b/pkgs/development/libraries/kdsoap/default.nix @@ -5,7 +5,7 @@ mkDerivation rec { pname = "kdsoap"; - version = "1.10.0"; + version = "2.0.0"; meta = { description = "A Qt-based client-side and server-side SOAP component"; longDescription = '' @@ -20,7 +20,7 @@ mkDerivation rec { }; src = fetchurl { url = "https://github.com/KDAB/KDSoap/releases/download/kdsoap-${version}/kdsoap-${version}.tar.gz"; - sha256 = "sha256-DGBuzENEZtutsoKYIMoWOvYMx8oib1U7XUAyGWc3M48="; + sha256 = "sha256-0YljEE+m99ArBEYxzdvnjxj3DgbGB69oDHrOBNbPBO4="; }; outputs = [ "out" "dev" ]; nativeBuildInputs = [ cmake ]; From d7423272a86b5104cd8cd65ee0a4c2adfe00b40c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 26 Jul 2021 23:26:11 +0000 Subject: [PATCH 021/120] codeql: 2.5.7 -> 2.5.8 --- pkgs/development/tools/analysis/codeql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index df3c42b4718f..8dac16f243ca 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.5.7"; + version = "2.5.8"; dontConfigure = true; dontBuild = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "sha256-dKJQv/omXT/L5dWYkveXodNNt5Q3i1WDIA9nwmo0Sfc="; + sha256 = "sha256-XfxzvzGiSBhPVIvdtDifKjkcGK2afWXVWul3Pah3tKo="; }; nativeBuildInputs = [ From e04e21c8df5e39524aae24326164326f349a6bc8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Jul 2021 18:22:11 +0200 Subject: [PATCH 022/120] python3Packages.gios: 1.0.2 -> 2.0.0 --- pkgs/development/python-modules/gios/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gios/default.nix b/pkgs/development/python-modules/gios/default.nix index 3c5de1295c26..00e67e40ee17 100644 --- a/pkgs/development/python-modules/gios/default.nix +++ b/pkgs/development/python-modules/gios/default.nix @@ -2,6 +2,7 @@ , aiohttp , aioresponses , buildPythonPackage +, dacite , fetchFromGitHub , pytest-asyncio , pytest-error-for-skips @@ -11,18 +12,19 @@ buildPythonPackage rec { pname = "gios"; - version = "1.0.2"; + version = "2.0.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "bieniu"; repo = pname; rev = version; - sha256 = "sha256-7+np1lUbBFSTJNAD6OT5k89MM+kzEj90JlulXGm36k8="; + sha256 = "1xbbp08ssan0b9j6s3vzg8cn421avc0xvahx5fvrb8kcbzkg8ssl"; }; propagatedBuildInputs = [ aiohttp + dacite ]; checkInputs = [ From c98ce413852d42328b95458d12c032adf591c23b Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 31 Jul 2021 20:24:42 -0400 Subject: [PATCH 023/120] opentx: 2.3.13 -> 2.3.14 --- pkgs/applications/misc/opentx/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix index 71bab089601d..dc36fffe8462 100644 --- a/pkgs/applications/misc/opentx/default.nix +++ b/pkgs/applications/misc/opentx/default.nix @@ -6,13 +6,16 @@ mkDerivation rec { pname = "opentx"; - version = "2.3.13"; + version = "2.3.14"; src = fetchFromGitHub { owner = "opentx"; repo = "opentx"; - rev = "release/${version}"; - sha256 = "sha256-Bi/Cz2T2NdtnJZHav8qvo+gErPsR8Ym7K3KcD5APt6Y="; + # 2.3.14 release tag points to the commit before the one that updates the + # version number. + # rev = "release/${version}"; + rev = "1e09791a1e2fe2a0ca9835019d634a4c6a4fa3bf"; + sha256 = "0mhzp1j6nmqvkjxg8lv8xa637m1lavdsak30mdlq0g25dhwg6k92"; }; nativeBuildInputs = [ cmake gcc-arm-embedded python3Packages.pillow ]; From 8d497293052790ae8f08d369e80ba0b51cdba2be Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 1 Aug 2021 13:36:28 +0300 Subject: [PATCH 024/120] =?UTF-8?q?qgis:=203.16.7=20=E2=86=92=203.16.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/gis/qgis/unwrapped.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 3ed11aa8b706..b32dd4c8fe2f 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -24,7 +24,7 @@ let six ]; in mkDerivation rec { - version = "3.16.7"; + version = "3.16.9"; pname = "qgis"; name = "${pname}-unwrapped-${version}"; @@ -32,7 +32,7 @@ in mkDerivation rec { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "0yvb2w83dplh0my72xljglq9a4a7qkfliwslav26lw4yqxr8mr0p"; + sha256 = "sha256-Y9WVgKEMOSMaXxfC9EQ8yqBYEj4XNL7YdMp8vjV55d0="; }; passthru = { From 63b382f7188f7c330c078b9a103e599430733024 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 1 Aug 2021 17:00:54 +0200 Subject: [PATCH 025/120] python3Packages.bellows: 0.25.0 -> 0.26.0 --- .../python-modules/bellows/default.nix | 31 +++++++++++++------ 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index 7d8e6ff5bee3..e52e07627dbb 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -3,31 +3,29 @@ , fetchFromGitHub , click , click-log +, dataclasses , pure-pcapy3 , pyserial-asyncio , voluptuous , zigpy , asynctest +, pythonOlder , pytestCheckHook , pytest-asyncio +, pytest-timeout }: buildPythonPackage rec { pname = "bellows"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "zigpy"; repo = "bellows"; rev = version; - sha256 = "1836wm8whbryp31zdaj3b6w40sx1wjsxgpjdb1x9rgmwff4d1hc0"; + sha256 = "0qbsk5iv3vrpwz7kfmjdbc66rfkg788p6wwxbf6jzfarfhcgrh3k"; }; - prePatch = '' - substituteInPlace setup.py \ - --replace "click-log==0.2.1" "click-log>=0.2.1" - ''; - propagatedBuildInputs = [ click click-log @@ -35,16 +33,31 @@ buildPythonPackage rec { pyserial-asyncio voluptuous zigpy + ] ++ lib.optionals (pythonOlder "3.7") [ + dataclasses ]; checkInputs = [ - asynctest pytestCheckHook pytest-asyncio + pytest-timeout + ] ++ lib.optionals (pythonOlder "3.8") [ + asynctest + ]; + + disabledTests = [ + # RuntimeError: coroutine 'test_remigrate_forcibly_downgraded_v4' was never awaited + #"test_remigrate_forcibly_downgraded_v4" + # RuntimeError: Event loop is closed + "test_thread_already_stopped" + ]; + + pythonImportsCheck = [ + "bellows" ]; meta = with lib; { - description = "A Python 3 project to implement EZSP for EmberZNet devices"; + description = "Python module to implement EZSP for EmberZNet devices"; homepage = "https://github.com/zigpy/bellows"; license = licenses.gpl3Plus; maintainers = with maintainers; [ etu mvnetbiz ]; From ac28bff93fb5ad978b2eafe994aa5d2f3ce0001c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 1 Aug 2021 17:01:28 +0200 Subject: [PATCH 026/120] python3Packages.zigpy: 0.35.2 -> 0.36.1 --- .../python-modules/zigpy/default.nix | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 8d393606fbca..7dab5cda6cc5 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -5,46 +5,46 @@ , buildPythonPackage , crccheck , fetchFromGitHub -, pycrypto , pycryptodome , pytest-aiohttp -, pytest-asyncio +, pytest-timeout , pytestCheckHook -, tox -, voluptuous }: +, pythonOlder +, voluptuous +}: buildPythonPackage rec { pname = "zigpy"; - version = "0.35.2"; + version = "0.36.1"; src = fetchFromGitHub { owner = "zigpy"; repo = "zigpy"; rev = version; - sha256 = "sha256-p0q0wGp3NaBO7gBTsPAt7FEAHW0MDPJCKqLklY21zBQ="; + sha256 = "0rfif8ds6m9ndxnc0f02fivc2pwidf476ylyx9y2b1sa2qz36z5w"; }; propagatedBuildInputs = [ aiohttp aiosqlite crccheck - pycrypto pycryptodome voluptuous ]; checkInputs = [ - asynctest pytest-aiohttp - pytest-asyncio + pytest-timeout pytestCheckHook + ] ++ lib.optionals (pythonOlder "3.8") [ + asynctest ]; disabledTests = [ # RuntimeError: coroutine 'test_remigrate_forcibly_downgraded_v4' was never awaited - "test_remigrate_forcibly_downgraded_v4" + #"test_remigrate_forcibly_downgraded_v4" # RuntimeError: Event loop is closed - "test_startup" + #"test_startup" ]; pythonImportsCheck = [ From 25f24b0eb00a154da4d7e211b7235227dffde199 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 1 Aug 2021 17:01:54 +0200 Subject: [PATCH 027/120] python3Packages.zigpy-znp: 0.5.1 -> 0.5.2 --- .../python-modules/zigpy-znp/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix index 71f102f36671..9e338e27acf1 100644 --- a/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/pkgs/development/python-modules/zigpy-znp/default.nix @@ -4,7 +4,6 @@ , buildPythonPackage , coloredlogs , fetchFromGitHub -, fetchpatch , jsonschema , pyserial , pyserial-asyncio @@ -19,23 +18,15 @@ buildPythonPackage rec { pname = "zigpy-znp"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "zigpy"; repo = pname; rev = "v${version}"; - sha256 = "152d803jfrvkj4namni41fnbbnq85wd7zsqjhmkwrrmn2gvqjiln"; + sha256 = "15i93f32dr3a9dgx8s08cxangpkgrkx8rn2n6l18rncjknhk9wmc"; }; - patches = [ - (fetchpatch { - # Fixes tests/application/test_joining.py::test_new_device_join_and_bind_complex[FormedLaunchpadCC26X2R1] - url = "https://github.com/zigpy/zigpy-znp/commit/582cffb68fdf0c5bc14d55efca2a683222d7fed7.patch"; - sha256 = "0qsfziqqjnnf21gdqv3wwk50vni46i0h1liw5ysq641yjfnas9az"; - }) - ]; - propagatedBuildInputs = [ async-timeout coloredlogs From 184f1ffea00ad5c1bc75dc7841759eac70cd8640 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 1 Aug 2021 20:35:05 +0200 Subject: [PATCH 028/120] bambootracker: 0.4.6 -> 0.5.0 --- .../audio/bambootracker/default.nix | 34 +++++++------------ 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/audio/bambootracker/default.nix b/pkgs/applications/audio/bambootracker/default.nix index 09be8faa8a0f..591c14c1adfa 100644 --- a/pkgs/applications/audio/bambootracker/default.nix +++ b/pkgs/applications/audio/bambootracker/default.nix @@ -2,7 +2,6 @@ , stdenv , lib , fetchFromGitHub -, fetchpatch , qmake , pkg-config , qttools @@ -13,25 +12,16 @@ mkDerivation rec { pname = "bambootracker"; - version = "0.4.6"; + version = "0.5.0"; src = fetchFromGitHub { - owner = "rerrahkr"; + owner = "BambooTracker"; repo = "BambooTracker"; rev = "v${version}"; - sha256 = "0iddqfw951dw9xpl4w7310sl4z544507ppb12i8g4fzvlxfw2ifc"; + fetchSubmodules = true; + sha256 = "1mpbvhsmrn0wdmxfp3n5dwv4474qlhy47r3vwc2jwdslq6vgl1fa"; }; - # TODO Remove when updating past 0.4.6 - # Fixes build failure on darwin - patches = [ - (fetchpatch { - name = "bambootracker-Add_braces_in_initialization_of_std-array.patch"; - url = "https://github.com/rerrahkr/BambooTracker/commit/0fc96c60c7ae6c2504ee696bb7dec979ac19717d.patch"; - sha256 = "1z28af46mqrgnyrr4i8883gp3wablkk8rijnj0jvpq01s4m2sfjn"; - }) - ]; - nativeBuildInputs = [ qmake qttools pkg-config ]; buildInputs = [ qtbase rtaudio rtmidi ]; @@ -40,18 +30,20 @@ mkDerivation rec { postConfigure = "make qmake_all"; - # installs app bundle on darwin, re-extract the binary - # wrapQtAppsHook fails to wrap mach-o binaries, manually call wrapper (https://github.com/NixOS/nixpkgs/issues/102044) + # 1. installs app bundle on darwin, move to app bundle dir & link binary to bin + # 2. wrapQtAppsHook fails to wrap mach-o binaries automatically, manually call wrapper + # (see https://github.com/NixOS/nixpkgs/issues/102044) postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - mv $out/bin/BambooTracker{.app/Contents/MacOS/BambooTracker,} - rm -r $out/bin/BambooTracker.app - wrapQtApp $out/bin/BambooTracker + mkdir -p $out/Applications + mv $out/{bin,Applications}/BambooTracker.app + wrapQtApp $out/Applications/BambooTracker.app/Contents/MacOS/BambooTracker + ln -s $out/{Applications/BambooTracker.app/Contents/MacOS,bin}/BambooTracker ''; meta = with lib; { description = "A tracker for YM2608 (OPNA) which was used in NEC PC-8801/9801 series computers"; - homepage = "https://rerrahkr.github.io/BambooTracker"; - license = licenses.gpl2Only; + homepage = "https://bambootracker.github.io/BambooTracker/"; + license = licenses.gpl2Plus; platforms = platforms.all; maintainers = with maintainers; [ OPNA2608 ]; }; From b1804e8d7a4a045ccf349dc14d0a93daf2427ae4 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Mon, 2 Aug 2021 15:57:51 +0100 Subject: [PATCH 029/120] terragrunt: 0.31.1 -> 0.31.3 --- pkgs/applications/networking/cluster/terragrunt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 589164e2769f..66e80f6648dc 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.31.1"; + version = "0.31.3"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vc3DGYb3vp55LRguhg3nG5zH7w1lTFEI2bx7kNffvas="; + sha256 = "sha256-I7S7B+mQxLdMWiLAkUIW39kXGU9k647OOhHysYotkfU="; }; - vendorSha256 = "sha256-lBhLaYn8adgfCXQJBsIVuwnA0vY8+tgeqE+C669AV+A="; + vendorSha256 = "sha256-CVWg2SvRO//xye05G3svGeqgaTKdRcoERrR7Tp0JZUo="; doCheck = false; From cdd709942866bf386c872f5f76e092666be47313 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 2 Aug 2021 22:52:54 +0200 Subject: [PATCH 030/120] python3Packages.aiohue: 2.5.1 -> 2.6.1 --- pkgs/development/python-modules/aiohue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index 990228039ddb..f06f4aba2ad3 100644 --- a/pkgs/development/python-modules/aiohue/default.nix +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "aiohue"; - version = "2.5.1"; + version = "2.6.1"; src = fetchPypi { inherit pname version; - sha256 = "3ee8e857b07364516f8b9f0e5c52d4cd775036f3ace37c2769de1e8579f4dc07"; + sha256 = "0101bw2n6vd3c0p323qqr61wwraja48xbrwcw5sn7i5sa3ygfx0k"; }; propagatedBuildInputs = [ From 1d847651bcaad9d98ccccab329a3187eafc0f701 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 3 Aug 2021 08:20:09 +0000 Subject: [PATCH 031/120] juju: 2.9.9 -> 2.9.10 --- pkgs/applications/networking/juju/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/juju/default.nix b/pkgs/applications/networking/juju/default.nix index e82680e36b3a..dce623897f73 100644 --- a/pkgs/applications/networking/juju/default.nix +++ b/pkgs/applications/networking/juju/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "juju"; - version = "2.9.9"; + version = "2.9.10"; src = fetchFromGitHub { owner = "juju"; repo = "juju"; rev = "juju-${version}"; - sha256 = "sha256-36/fatztop2eB1z9DfnseQXw0Di3Wss72IfgdnKpsNU="; + sha256 = "sha256-2gCJ6aN6uN0KtOVddLDry4pLhScSh4JHmdsFws59phk="; }; - vendorSha256 = "sha256-MH9lZNc9KevovZJCN2nClmqJbRSwYoQ4Jb0CXqBBUd0="; + vendorSha256 = "sha256-vFO3Rv+7CLIkl1qS4zp177GmerewfgmyjxEbzdt/RsE="; # Disable tests because it attempts to use a mongodb instance doCheck = false; From 97bf1de2070f2d341f813918d50a3c0b0d2347c0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 3 Aug 2021 13:29:48 +0200 Subject: [PATCH 032/120] python3Packages.aiohomekit: 0.5.1 -> 0.6.2 --- pkgs/development/python-modules/aiohomekit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index f720cdf9b133..4561b79f4ae3 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "0.5.1"; + version = "0.6.2"; format = "pyproject"; src = fetchFromGitHub { owner = "Jc2k"; repo = pname; rev = version; - sha256 = "sha256-Fo9KWBcN6Y/fa7vkWugSer5L7+hOWz99+hw6Hz1LAMM="; + sha256 = "16lfav83g12vzs3ssfva7chcqqb7xdx54djwfwyn9xcwfaa7cwhw"; }; nativeBuildInputs = [ From b6df90f1c02de8725298909f37a655ecebe7683e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 3 Aug 2021 22:06:56 +0200 Subject: [PATCH 033/120] python3Packages.zwave-js-server-python: 0.27.1 -> 0.28.0 --- .../python-modules/zwave-js-server-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zwave-js-server-python/default.nix b/pkgs/development/python-modules/zwave-js-server-python/default.nix index 18cb2a987104..067b35dde6ad 100644 --- a/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.27.1"; + version = "0.28.0"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = version; - sha256 = "sha256-Q02S0jEFZe4qOkRok/sY0UPrMpmD13off85UL3+8o/o="; + sha256 = "137m9052ndbii0q6zw9vmwsfimai05q9np4wv06nw2p2mhy5x48p"; }; propagatedBuildInputs = [ From d128accf6c1ea9a767b1c23a09ee62d0750b3240 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 3 Aug 2021 22:12:26 +0200 Subject: [PATCH 034/120] python3Packages.pyatmo: 5.2.0 -> 5.2.3 --- pkgs/development/python-modules/pyatmo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix index e313d2b8b054..e2c6d8e37fdb 100644 --- a/pkgs/development/python-modules/pyatmo/default.nix +++ b/pkgs/development/python-modules/pyatmo/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pyatmo"; - version = "5.2.0"; + version = "5.2.3"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jabesq"; repo = "pyatmo"; rev = "v${version}"; - sha256 = "sha256-P9c9tm2RcF/4r0OYBoAQxQbMBaFAsaHg/stg9rrYHNM="; + sha256 = "1w9rhh85z9m3c4rbz6zxlrxglsm5sk5d6796dsj1p1l3b3ad476z"; }; postPatch = '' From e8d4359bfc3a5742bec5c2e49525b91b749054dc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 3 Aug 2021 22:19:53 +0200 Subject: [PATCH 035/120] python3Packages.pyatv: 0.8.1 -> 0.8.2 --- pkgs/development/python-modules/pyatv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix index cef64c084f2f..eaeda0ed3417 100644 --- a/pkgs/development/python-modules/pyatv/default.nix +++ b/pkgs/development/python-modules/pyatv/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "pyatv"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "postlund"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/ccmYNOYE+RkJiJbGkQgdYE8/X4xzyRT4dkMa/qSZEc="; + sha256 = "035cjm78xakvfi7k8zahjk0xr23p9my67d8jvq5bqrd506awrl0f"; }; postPatch = '' From 8f3cb847ac67aa8621ec1a5eef8bd01856c6f7d3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 3 Aug 2021 22:26:21 +0200 Subject: [PATCH 036/120] python3Packages.soco: 0.23.1 -> 0.23.2 --- pkgs/development/python-modules/soco/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index af2226741301..d45540ba85eb 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "soco"; - version = "0.23.1"; + version = "0.23.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "SoCo"; repo = "SoCo"; rev = "v${version}"; - sha256 = "15q82fq10d162xanypn1k51y15r38l7sj0417jzbjx40zz6c93f7"; + sha256 = "0qq2k0xy8a5b54nk7h4ipkvq8dpzklhgcwcffhnlcnl1vhq2dh33"; }; propagatedBuildInputs = [ From 606e53dc8504acece7d430a2deb9b93b2a4ddd86 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 3 Aug 2021 22:42:40 +0200 Subject: [PATCH 037/120] python3Packages.types-pytz: init at 2021.1.0 --- .../python-modules/types-pytz/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/types-pytz/default.nix diff --git a/pkgs/development/python-modules/types-pytz/default.nix b/pkgs/development/python-modules/types-pytz/default.nix new file mode 100644 index 000000000000..2fc5cc0d4503 --- /dev/null +++ b/pkgs/development/python-modules/types-pytz/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "types-pytz"; + version = "2021.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0hzjz6wgzfyybcfli4rpmfxk49cn6x3slbs2xdmlnckvlahs5pxd"; + }; + + # Modules doesn't have tests + doCheck = false; + + pythonImportsCheck = [ "pytz-stubs" ]; + + meta = with lib; { + description = "Typing stubs for pytz"; + homepage = "https://github.com/python/typeshed"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 80fec6354089..f319bc8a7815 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8879,6 +8879,8 @@ in { types-decorator = callPackage ../development/python-modules/types-decorator { }; + types-pytz = callPackage ../development/python-modules/types-pytz { }; + types-requests = callPackage ../development/python-modules/types-requests { }; typesentry = callPackage ../development/python-modules/typesentry { }; From 16cb8cb7294e4252b8169d2431c434d51324baed Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Jun 2021 23:49:12 +0200 Subject: [PATCH 038/120] python3Packages.homematicip: 1.0.0 -> 1.0.1 --- pkgs/development/python-modules/homematicip/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/homematicip/default.nix b/pkgs/development/python-modules/homematicip/default.nix index c8cc21278b66..9c15cecf5ef3 100644 --- a/pkgs/development/python-modules/homematicip/default.nix +++ b/pkgs/development/python-modules/homematicip/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "homematicip"; - version = "1.0.0"; + version = "1.0.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "coreGreenberet"; repo = "homematicip-rest-api"; rev = version; - sha256 = "0bgvrjcf10kiqqkbl56sxx3jydd722b08q2j9c8sxpk0qdrmrinv"; + sha256 = "sha256-AvZfcFvtn90FXJ8iRpNE2qNMYLYrXNSnDPfuh7IK3ck="; }; propagatedBuildInputs = [ @@ -53,6 +53,7 @@ buildPythonPackage rec { "test_pluggable_switch_measuring" "test_rotary_handle_sensor" "test_security_group" + "test_security_zone" "test_shutter_device" "test_smoke_detector" "test_switching_group" From 711fbaa0b0dea4358fb4264deb3d3a8da3e69b68 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 3 Aug 2021 22:46:06 +0200 Subject: [PATCH 039/120] python3Packages.simplisafe-python: 11.0.2 -> 11.0.3 --- .../python-modules/simplisafe-python/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/simplisafe-python/default.nix b/pkgs/development/python-modules/simplisafe-python/default.nix index 9128018825c1..e31181f5905c 100644 --- a/pkgs/development/python-modules/simplisafe-python/default.nix +++ b/pkgs/development/python-modules/simplisafe-python/default.nix @@ -6,16 +6,17 @@ , buildPythonPackage , fetchFromGitHub , poetry-core -, pytest-asyncio +, pytest-aiohttp , pytestCheckHook , pythonOlder , pytz +, types-pytz , voluptuous }: buildPythonPackage rec { pname = "simplisafe-python"; - version = "11.0.2"; + version = "11.0.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-sIv7zoLp+1CfeyhVYWMp93TkNk+h14WawOJOQMhwAp8="; + sha256 = "17zld62q4qw2z2q7i5kkpnyc3immgc4xs009hp53jq4qc38w0jm5"; }; nativeBuildInputs = [ poetry-core ]; @@ -32,16 +33,22 @@ buildPythonPackage rec { aiohttp backoff pytz + types-pytz voluptuous ]; checkInputs = [ aioresponses asynctest - pytest-asyncio + pytest-aiohttp pytestCheckHook ]; + disabledTests = [ + # simplipy/api.py:253: InvalidCredentialsError + "test_request_error_failed_retry" + ]; + disabledTestPaths = [ "examples/" ]; pythonImportsCheck = [ "simplipy" ]; From cfb9f807557f350d9337b91925dd01cc6b642d9e Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 2 Aug 2021 22:13:03 +0200 Subject: [PATCH 040/120] activemq: remove phases --- pkgs/development/libraries/apache-activemq/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/development/libraries/apache-activemq/default.nix index 79c1715c61d7..13305d312736 100644 --- a/pkgs/development/libraries/apache-activemq/default.nix +++ b/pkgs/development/libraries/apache-activemq/default.nix @@ -9,8 +9,6 @@ stdenv.mkDerivation rec { url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz"; }; - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' mkdir -p $out mv * $out/ From b80e2fa5090ff7a9d91a642c3410d631c1e43b94 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 2 Aug 2021 22:13:22 +0200 Subject: [PATCH 041/120] postgresql_jdbc: remove phases --- pkgs/development/java-modules/postgresql_jdbc/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/java-modules/postgresql_jdbc/default.nix b/pkgs/development/java-modules/postgresql_jdbc/default.nix index 524273e080fe..f58441beedbf 100644 --- a/pkgs/development/java-modules/postgresql_jdbc/default.nix +++ b/pkgs/development/java-modules/postgresql_jdbc/default.nix @@ -11,8 +11,6 @@ stdenv.mkDerivation rec { inherit version; }; - phases = [ "installPhase" ]; - installPhase = '' runHook preInstall install -m444 -D $src/share/java/*postgresql-${version}.jar $out/share/java/postgresql-jdbc.jar From e7a35cdb31f84152b0090f653ae9bba50dd73082 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 2 Aug 2021 22:14:00 +0200 Subject: [PATCH 042/120] aspell: deprecate phases --- pkgs/development/libraries/aspell/dictionaries.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index 3923416c4a35..81f4bb6c2dce 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -153,7 +153,7 @@ let } ''; - phases = [ "preBuild" "buildPhase" "installPhase" ]; + dontUnpack = true; } // args); in rec { @@ -905,7 +905,11 @@ in rec { langInputs = [ en ]; - buildPhase = "cat $src | aspell-affix en-computers --dont-validate-words --lang=en"; + buildPhase = '' + runHook preBuild + cat $src | aspell-affix en-computers --dont-validate-words --lang=en + runHook postBuild + ''; installPhase = "aspell-install en-computers"; meta = { @@ -930,8 +934,10 @@ in rec { langInputs = [ en ]; buildPhase = '' + runHook preBuild cat $src1 | aspell-plain en_US-science --dont-validate-words --lang=en cat $src2 | aspell-plain en_GB-science --dont-validate-words --lang=en + runHook postBuild ''; installPhase = "aspell-install en_US-science en_GB-science"; From afe3fa49f9583536cb4808515cb13e5ceefa8caa Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 2 Aug 2021 22:14:24 +0200 Subject: [PATCH 043/120] hunspell: remove phases --- pkgs/development/libraries/hunspell/dictionaries.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index 596326b36df4..f1a2aa0c6c60 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -45,7 +45,6 @@ let maintainers = with maintainers; [ renzo ]; platforms = platforms.all; }; - phases = "unpackPhase patchPhase buildPhase installPhase"; nativeBuildInputs = [ unzip ]; buildInputs = [ bash coreutils which zip ]; patchPhase = '' @@ -89,7 +88,6 @@ let platforms = platforms.all; }; nativeBuildInputs = [ unzip ]; - phases = "unpackPhase installPhase"; sourceRoot = "."; unpackCmd = '' unzip $src dictionaries/${dictFileName}.dic dictionaries/${dictFileName}.aff $readmeFile @@ -129,7 +127,6 @@ let platforms = platforms.all; }; nativeBuildInputs = [ unzip ]; - phases = "unpackPhase installPhase"; sourceRoot = "."; unpackCmd = '' unzip $src ${dictFileName}.dic ${dictFileName}.aff ${readmeFile} @@ -158,7 +155,6 @@ let platforms = platforms.all; }; nativeBuildInputs = [ unzip ]; - phases = "unpackPhase installPhase"; sourceRoot = "."; unpackCmd = '' unzip $src ${srcFileName}.dic ${srcFileName}.aff ${srcReadmeFile} @@ -185,7 +181,6 @@ let platforms = platforms.all; }; nativeBuildInputs = [ unzip ]; - phases = "unpackPhase patchPhase installPhase"; sourceRoot = "."; prePatch = '' # Fix dic file empty lines (FS#22275) @@ -204,7 +199,6 @@ let inherit srcs; - phases = ["unpackPhase" "installPhase"]; sourceRoot = "."; # Copy files stripping until first dash (path and hash) unpackCmd = "cp $curSrc \${curSrc##*-}"; @@ -242,7 +236,8 @@ let buildInputs = [ ispell perl hunspell ]; - phases = ["unpackPhase" "installPhase"]; + dontBuild = true; + installPhase = '' patchShebangs bin make hunspell/${dictFileName}.aff hunspell/${dictFileName}.dic From 50bf14a4d4e406b476b7d9cc3cc08216a40abddd Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 2 Aug 2021 22:14:43 +0200 Subject: [PATCH 044/120] avr8-burn-omat: remove phases --- pkgs/development/misc/avr8-burn-omat/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/misc/avr8-burn-omat/default.nix b/pkgs/development/misc/avr8-burn-omat/default.nix index 4b5793dc1332..d8f75875b9b3 100644 --- a/pkgs/development/misc/avr8-burn-omat/default.nix +++ b/pkgs/development/misc/avr8-burn-omat/default.nix @@ -11,8 +11,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ unzip ]; - phases = "unpackPhase installPhase"; - # move to nix-support to not create that many symlinks.. # TODO burnomat tries to read /usr/local/etc/avrdude.conf (but you can edit it within the settings dialog) installPhase = '' From b22dd97818af18ec826997c99f8dfbf0b9d76115 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 2 Aug 2021 22:14:55 +0200 Subject: [PATCH 045/120] miniball: deprecate phases --- pkgs/development/libraries/miniball/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/miniball/default.nix b/pkgs/development/libraries/miniball/default.nix index e48857861d68..13a814684a42 100644 --- a/pkgs/development/libraries/miniball/default.nix +++ b/pkgs/development/libraries/miniball/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1piap5v8wqq0aachrq6j50qkr01gzpyndl6vf661vyykrfq0nnd2"; }; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' mkdir -p $out/include From 565234fdb9c4b3eb56a9209c32bb39118806efa0 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 2 Aug 2021 22:15:16 +0200 Subject: [PATCH 046/120] ocaml/z3: deprecate phases --- pkgs/development/ocaml-modules/z3/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/z3/default.nix b/pkgs/development/ocaml-modules/z3/default.nix index d24a95102013..01b384fe0ba5 100644 --- a/pkgs/development/ocaml-modules/z3/default.nix +++ b/pkgs/development/ocaml-modules/z3/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { pname = "ocaml${ocaml.version}-z3"; inherit (z3-with-ocaml) version; - phases = [ "installPhase" "fixupPhase" ]; + dontUnpack = true; installPhase = '' runHook preInstall From 22626353b4e4d1988883e9098ed1825185bd0b7c Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 2 Aug 2021 22:15:56 +0200 Subject: [PATCH 047/120] ocaml/ounit: deprecate phases --- pkgs/development/ocaml-modules/ounit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/ounit/default.nix b/pkgs/development/ocaml-modules/ounit/default.nix index 2f4a4f0437a2..fbb75e613309 100644 --- a/pkgs/development/ocaml-modules/ounit/default.nix +++ b/pkgs/development/ocaml-modules/ounit/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { buildInputs = [ findlib ]; propagatedBuildInputs = [ ounit2 ]; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + dontBuild = true; createFindlibDestdir = true; From 6d0437b5323b1d7aa6eaa4bb500cffb6ecc03474 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Aug 2021 23:18:23 +0200 Subject: [PATCH 048/120] python3Packages.hatasmota: 0.2.19 -> 0.2.20 --- pkgs/development/python-modules/hatasmota/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hatasmota/default.nix b/pkgs/development/python-modules/hatasmota/default.nix index 9a7ab056a311..b3165a7e3c02 100644 --- a/pkgs/development/python-modules/hatasmota/default.nix +++ b/pkgs/development/python-modules/hatasmota/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "hatasmota"; - version = "0.2.19"; + version = "0.2.20"; src = fetchFromGitHub { owner = "emontnemery"; repo = pname; rev = version; - sha256 = "sha256-h1idJJd2lPV3+tAE59gzITa7jmtBhcEpRuyflf76EAk="; + sha256 = "1qdvm1bnn7x2mf4fq997gvq6a5901ndhd2s75h92zsgmlcp7rc77"; }; propagatedBuildInputs = [ @@ -23,6 +23,7 @@ buildPythonPackage rec { # Project has no tests doCheck = false; + pythonImportsCheck = [ "hatasmota" ]; meta = with lib; { From ddd26bbeb67368b894289ffa515853006b05eddc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Aug 2021 23:45:00 +0200 Subject: [PATCH 049/120] python3Packages.pyflunearyou: 2.0.1 -> 2.0.2 --- .../python-modules/pyflunearyou/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyflunearyou/default.nix b/pkgs/development/python-modules/pyflunearyou/default.nix index c8706760343e..953f381ff498 100644 --- a/pkgs/development/python-modules/pyflunearyou/default.nix +++ b/pkgs/development/python-modules/pyflunearyou/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyflunearyou"; - version = "2.0.1"; + version = "2.0.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -23,10 +23,12 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-2a4OKPmy9tFLJqRg9bEXqrbr3RKVHmKPSYDrtAEqvdo="; + sha256 = "07n2dvnfpfglpdlnwzj4dy41x2zc07ia2krvxdarnv8wzap30y23"; }; - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = [ + poetry-core + ]; propagatedBuildInputs = [ aiohttp @@ -44,7 +46,8 @@ buildPythonPackage rec { # Ignore the examples directory as the files are prefixed with test_. # disabledTestFiles doesn't seem to work here - pytestFlagsArray = [ "--ignore examples/" ]; + disabledTestPaths = [ "examples/" ]; + pythonImportsCheck = [ "pyflunearyou" ]; meta = with lib; { From d6e39ba369924be8973eaaba0edbd873f351d583 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 5 Aug 2021 12:00:30 +0200 Subject: [PATCH 050/120] python3Packages.wled: 0.7.1 -> 0.8.0 --- pkgs/development/python-modules/wled/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wled/default.nix b/pkgs/development/python-modules/wled/default.nix index e38d43ef56b6..cb6ec2b606d5 100644 --- a/pkgs/development/python-modules/wled/default.nix +++ b/pkgs/development/python-modules/wled/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "wled"; - version = "0.7.1"; + version = "0.8.0"; disabled = pythonOlder "3.8"; format = "pyproject"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-wled"; rev = "v${version}"; - sha256 = "02xrml9mpq3akwyryg1m7xjmgnlgi5kjvx7vkq6110ai0f9hzpwi"; + sha256 = "1jhykilb81sp1srxk91222qglwdlr993ssvgfnl837nbcx6ws1hw"; }; nativeBuildInputs = [ From c4a39df4a8746073e1ddb758485922f359fe1502 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Aug 2021 20:46:20 +0200 Subject: [PATCH 051/120] python3Packages.assertpy: init at 1.1 --- .../python-modules/assertpy/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/assertpy/default.nix diff --git a/pkgs/development/python-modules/assertpy/default.nix b/pkgs/development/python-modules/assertpy/default.nix new file mode 100644 index 000000000000..5280808fb3cf --- /dev/null +++ b/pkgs/development/python-modules/assertpy/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "assertpy"; + version = "1.1"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "0hnfh45cmqyp7zasrllwf8gbq3mazqlhhk0sq1iqlh6fig0yfq2f"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "assertpy" + ]; + + meta = with lib; { + description = "Simple assertion library for unit testing with a fluent API"; + homepage = "https://github.com/assertpy/assertpy"; + license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f319bc8a7815..886ffb42daef 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -567,6 +567,8 @@ in { aspy-yaml = callPackage ../development/python-modules/aspy.yaml { }; + assertpy = callPackage ../development/python-modules/assertpy { }; + asteval = callPackage ../development/python-modules/asteval { }; astor = callPackage ../development/python-modules/astor { }; From bde91debf361ba8393c48eeca72cedf69daf85fe Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Aug 2021 21:04:20 +0200 Subject: [PATCH 052/120] python3Packages.time-machine: init at 2.3.1 --- .../python-modules/time-machine/default.nix | 50 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/development/python-modules/time-machine/default.nix diff --git a/pkgs/development/python-modules/time-machine/default.nix b/pkgs/development/python-modules/time-machine/default.nix new file mode 100644 index 000000000000..1c4be8946aef --- /dev/null +++ b/pkgs/development/python-modules/time-machine/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonAtLeast +, pythonOlder +, backports-zoneinfo +, python-dateutil +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "time-machine"; + version = "2.3.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "adamchainz"; + repo = pname; + rev = version; + sha256 = "1flim8xaa7qglh2b39cf57i8g0kg0707pw3mdkrgh0xjn27bv9bi"; + }; + + propagatedBuildInputs = [ + python-dateutil + #] ++ lib.optionals (pythonOlder "3.9") [ + backports-zoneinfo + ]; + + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = lib.optionals (pythonAtLeast "3.9") [ + # Assertion Errors related to Africa/Addis_Ababa + "test_destination_datetime_tzinfo_zoneinfo" + "test_destination_datetime_tzinfo_zoneinfo_nested" + "test_move_to_datetime_with_tzinfo_zoneinfo" + ]; + + pythonImportsCheck = [ + "time_machine" + ]; + + meta = with lib; { + description = "Travel through time in your tests"; + homepage = "https://github.com/adamchainz/time-machine"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 886ffb42daef..76b13720dde6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8675,6 +8675,8 @@ in { timelib = callPackage ../development/python-modules/timelib { }; + time-machine = callPackage ../development/python-modules/time-machine { }; + timeout-decorator = callPackage ../development/python-modules/timeout-decorator { }; timezonefinder = callPackage ../development/python-modules/timezonefinder { }; From 1b01e363b6e4f41d5bf299bd9457d0a2fcef6615 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Aug 2021 21:16:51 +0200 Subject: [PATCH 053/120] python3Packages.pytest-resource-path: init at 1.3.0 --- .../pytest-resource-path/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-resource-path/default.nix diff --git a/pkgs/development/python-modules/pytest-resource-path/default.nix b/pkgs/development/python-modules/pytest-resource-path/default.nix new file mode 100644 index 000000000000..a0517ee20aa8 --- /dev/null +++ b/pkgs/development/python-modules/pytest-resource-path/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, colorama +, pytest-runner +, pytest +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pytest-resource-path"; + version = "1.3.0"; + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "yukihiko-shinoda"; + repo = pname; + rev = "v${version}"; + sha256 = "1siv3pk4fsabz254fdzr7c0pxy124habnbw4ym66pfk883fr96g2"; + }; + + nativeBuildInputs = [ + pytest-runner + ]; + + propagatedBuildInputs = [ + colorama + pytest + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pytest_resource_path" + ]; + + meta = with lib; { + description = "Pytest plugin to provide path for uniform access to test resources"; + homepage = "https://github.com/yukihiko-shinoda/pytest-resource-path"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 76b13720dde6..052f17c6db66 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6909,6 +6909,8 @@ in { pytest-rerunfailures = callPackage ../development/python-modules/pytest-rerunfailures { }; + pytest-resource-path = callPackage ../development/python-modules/pytest-resource-path { }; + pytest-runner = callPackage ../development/python-modules/pytest-runner { }; pytest-sanic = callPackage ../development/python-modules/pytest-sanic { From 6ada3dd856f65265353939bbceaa539312df2724 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Aug 2021 21:25:58 +0200 Subject: [PATCH 054/120] python3Packages.pytest-mockservers: init at 0.6.0 --- .../pytest-mockservers/default.nix | 54 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-mockservers/default.nix diff --git a/pkgs/development/python-modules/pytest-mockservers/default.nix b/pkgs/development/python-modules/pytest-mockservers/default.nix new file mode 100644 index 000000000000..6de88632027f --- /dev/null +++ b/pkgs/development/python-modules/pytest-mockservers/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, poetry-core +, aiohttp +, pytest +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pytest-mockservers"; + version = "0.6.0"; + format = "pyproject"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "Gr1N"; + repo = pname; + rev = version; + sha256 = "0xql0fnw7m2zn103601gqbpyd761kzvgjj2iz9hjsv56nr4z1g9i"; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "poetry.masonry.api" "poetry.core.masonry.api" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + pytest + pytest-asyncio + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pytest_mockservers" + ]; + + meta = with lib; { + description = "A set of fixtures to test your requests to HTTP/UDP servers"; + homepage = "https://github.com/Gr1N/pytest-mockservers"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 052f17c6db66..7bfeb94f8216 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6871,6 +6871,8 @@ in { pytest-mock = callPackage ../development/python-modules/pytest-mock { }; + pytest-mockservers = callPackage ../development/python-modules/pytest-mockservers { }; + pytest-mpl = callPackage ../development/python-modules/pytest-mpl { }; pytest-mypy = callPackage ../development/python-modules/pytest-mypy { }; From 01c146d4c5015b1fb925303a44200d4689f583f6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Aug 2021 21:48:35 +0200 Subject: [PATCH 055/120] python3Packages.aioswitcher: 1.2.5 -> 2.0.4 --- .../python-modules/aioswitcher/default.nix | 31 +++++++++++++------ 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix index 2535253dc2a3..2682b1365645 100644 --- a/pkgs/development/python-modules/aioswitcher/default.nix +++ b/pkgs/development/python-modules/aioswitcher/default.nix @@ -1,41 +1,52 @@ { lib -, aiohttp -, asynctest +, assertpy , buildPythonPackage , fetchFromGitHub , poetry-core -, pytest-aiohttp , pytest-asyncio +, pytest-mockservers +, pytest-resource-path , pytest-sugar , pytestCheckHook +, time-machine }: buildPythonPackage rec { pname = "aioswitcher"; - version = "1.2.5"; + version = "2.0.4"; format = "pyproject"; src = fetchFromGitHub { owner = "TomerFi"; repo = pname; rev = version; - sha256 = "sha256-eiWmB2DVNAYHPHfnVwv0+4A/wYLgtAa1ReGsmwiIvAk="; + sha256 = "sha256-n4JvtShs2/shJxAzxm6qyipVQ7e3QfeVwhnqu6RWZss="; }; nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ - aiohttp - ]; + preCheck = '' + export TZ=Asia/Jerusalem + ''; checkInputs = [ - asynctest - pytest-aiohttp + assertpy pytest-asyncio + pytest-mockservers + pytest-resource-path pytest-sugar pytestCheckHook + time-machine + ]; + + disabledTests = [ + # AssertionError: Expected <14:00> to be equal to <17:00>, but was not. + "test_schedule_parser_with_a_weekly_recurring_enabled_schedule_data" + "test_schedule_parser_with_a_daily_recurring_enabled_schedule_data" + "test_schedule_parser_with_a_partial_daily_recurring_enabled_schedule_data" + "test_schedule_parser_with_a_non_recurring_enabled_schedule_data" ]; pythonImportsCheck = [ "aioswitcher" ]; From 41670243c3b962d2360cf7ecafe1fb7a21e1bbc8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Aug 2021 22:10:08 +0200 Subject: [PATCH 056/120] python3Packages.roonapi: 0.0.37 -> 0.0.38 --- pkgs/development/python-modules/roonapi/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/roonapi/default.nix b/pkgs/development/python-modules/roonapi/default.nix index 677483e8823b..aded311feab0 100644 --- a/pkgs/development/python-modules/roonapi/default.nix +++ b/pkgs/development/python-modules/roonapi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "roonapi"; - version = "0.0.37"; + version = "0.0.38"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pavoni"; repo = "pyroon"; rev = version; - sha256 = "1hxr473z9h3kb91m3ygina58pfwfyjsv1yb29spxmnbzvk34rzzz"; + sha256 = "sha256-vXx7MgoGjBPdx7uKUtAVqlXphPJYt5SyuTo2JlKia60="; }; nativeBuildInputs = [ @@ -34,15 +34,6 @@ buildPythonPackage rec { websocket-client ]; - patches = [ - # Switch to poetry-core, https://github.com/pavoni/pyroon/pull/43 - (fetchpatch { - name = "use-peotry-core.patch"; - url = "https://github.com/pavoni/pyroon/commit/16f890314683a6c2700fa4da5c937559e2e24bea.patch"; - sha256 = "047bhimr72rwqqyjy7jkfzacdc2ycy81wbmgnvf7xyhgjw1jyvh5"; - }) - ]; - # Tests require access to the Roon API doCheck = false; From e5b326d58cdebabd8aef810f09b37b1cd2cfed8b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Aug 2021 22:14:50 +0200 Subject: [PATCH 057/120] python3Packages.zeroconf: 0.32.1 -> 0.33.2 --- pkgs/development/python-modules/zeroconf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index fc869efe087d..18d0b381bd11 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.32.1"; + version = "0.33.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = version; - sha256 = "02fvh5ii73rf6pg9x93pc0sl1isx2ivg3d80l6s8h35w2f4g4azf"; + sha256 = "sha256-LtLLPffwznND7zciSdXJGFKHxk0m2AnLMna0vDt9jl0="; }; propagatedBuildInputs = [ From a2208fd6aad41298a9abdf737b01a9c5bc48b510 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 5 Aug 2021 12:55:01 +0200 Subject: [PATCH 058/120] python3Packages.homematicip: fix src hash hash mismatch in fixed-output derivation '/nix/store/fyi1hssgkvycql9vcmwcl5w6p03r2m3n-source': wanted: sha256:1jfx1ar8gvpp1jkx8p1bnrh4r8ys8j9lc8lzbh2xv7zdbdq5zxh2 got: sha256:008snxx9ijpi1zr1pi1v4a6g74j821hyw0khs9lmi08v2mcabm36 --- pkgs/development/python-modules/homematicip/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/homematicip/default.nix b/pkgs/development/python-modules/homematicip/default.nix index 9c15cecf5ef3..e6759f498a32 100644 --- a/pkgs/development/python-modules/homematicip/default.nix +++ b/pkgs/development/python-modules/homematicip/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "coreGreenberet"; repo = "homematicip-rest-api"; rev = version; - sha256 = "sha256-AvZfcFvtn90FXJ8iRpNE2qNMYLYrXNSnDPfuh7IK3ck="; + sha256 = "008snxx9ijpi1zr1pi1v4a6g74j821hyw0khs9lmi08v2mcabm36"; }; propagatedBuildInputs = [ From 60ddedce3768a942a56b456449c52469ada683f5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 5 Aug 2021 13:27:22 +0200 Subject: [PATCH 059/120] python3Packages.aioesphomeapi: 5.1.1 -> 6.1.0 --- pkgs/development/python-modules/aioesphomeapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index b9ee3af9ed87..f1033e9e5ba0 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "5.1.1"; + version = "6.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "v${version}"; - sha256 = "09hhkwkphyqa31yd1mmpz8xmyz6hav8vwf36v8xc4v6g1xm9l6f5"; + sha256 = "sha256-C799JoW58mmwHeoXLMJ5pYg8hjaZqVBqrbxBXpmF/mQ="; }; propagatedBuildInputs = [ From c9f1c1380e25ee1cbe9cf20db456f22f158d50b0 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 5 Aug 2021 18:01:26 +0200 Subject: [PATCH 060/120] corrscope: 0.7.0 -> 0.7.1 --- pkgs/applications/video/corrscope/default.nix | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/video/corrscope/default.nix b/pkgs/applications/video/corrscope/default.nix index d691882a2c6f..610342c3f809 100644 --- a/pkgs/applications/video/corrscope/default.nix +++ b/pkgs/applications/video/corrscope/default.nix @@ -1,6 +1,8 @@ { lib , mkDerivationWith , python3Packages +, fetchFromGitHub +, fetchpatch , wrapQtAppsHook , ffmpeg , qtbase @@ -8,24 +10,31 @@ mkDerivationWith python3Packages.buildPythonApplication rec { pname = "corrscope"; - version = "0.7.0"; + version = "0.7.1"; - src = python3Packages.fetchPypi { - inherit pname version; - sha256 = "0m62p3jlbx5dlp3j8wn1ka1sqpffsxbpsgv2h5cvj1n1lsgbss2s"; + src = fetchFromGitHub { + owner = "corrscope"; + repo = "corrscope"; + rev = version; + sha256 = "0c9kmrw6pcda68li04b5j2kmsgdw1q463qlc32wn96zn9hl82v6m"; }; - postPatch = '' - substituteInPlace setup.py \ - --replace 'attrs>=18.2.0,<19.0.0' 'attrs>=18.2.0' \ - --replace 'numpy>=1.15,<2.0,!=1.19.4' 'numpy>=1.15,<2.0' - ''; + format = "pyproject"; + + patches = [ + # Remove when bumping past 0.7.1 + (fetchpatch { + name = "0001-Use-poetry-core.patch"; + url = "https://github.com/corrscope/corrscope/commit/d40d1846dd54b8bccd7b8055d6aece48aacbb943.patch"; + sha256 = "0xxsbmxdbh3agfm6ww3rpa7ab0ysppan490w0gaqwmwzrxmmdljv"; + }) + ]; nativeBuildInputs = [ wrapQtAppsHook ]; buildInputs = [ ffmpeg qtbase ]; - propagatedBuildInputs = with python3Packages; [ appdirs attrs click matplotlib numpy pyqt5 ruamel_yaml ]; + propagatedBuildInputs = with python3Packages; [ appdirs atomicwrites attrs click matplotlib numpy poetry-core pyqt5 ruamel_yaml ]; dontWrapQtApps = true; @@ -36,8 +45,6 @@ mkDerivationWith python3Packages.buildPythonApplication rec { ) ''; - preCheck = "export HOME=$TEMP"; - meta = with lib; { description = "Render wave files into oscilloscope views, featuring advanced correlation-based triggering algorithm"; longDescription = '' From c1879f75081e86b63d9600c2b000f51d6dc5ef73 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 6 Aug 2021 11:06:31 +0000 Subject: [PATCH 061/120] twitterBootstrap: 5.0.2 -> 5.1.0 --- pkgs/development/web/twitter-bootstrap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/twitter-bootstrap/default.nix b/pkgs/development/web/twitter-bootstrap/default.nix index 8e3fd36b73fa..13b1e7b95c44 100644 --- a/pkgs/development/web/twitter-bootstrap/default.nix +++ b/pkgs/development/web/twitter-bootstrap/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bootstrap"; - version = "5.0.2"; + version = "5.1.0"; src = fetchurl { url = "https://github.com/twbs/bootstrap/releases/download/v${version}/${pname}-${version}-dist.zip"; - sha256 = "sha256-ZvvBNDF9sjcO4JnLPRkzC1B1YG3fcMyjM9qwFlAg9sE="; + sha256 = "sha256-OVNCspdOM1BWDmV1LTaqtlc2UrEcxste95ouXoOtZLE="; }; nativeBuildInputs = [ unzip ]; From d555bd3a84ff1c005d29ec808d819bef740a8551 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= Date: Fri, 6 Aug 2021 16:16:12 +0200 Subject: [PATCH 062/120] kubebuilder: fix sha256 Also, remove unused argument. --- pkgs/applications/networking/cluster/kubebuilder/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubebuilder/default.nix b/pkgs/applications/networking/cluster/kubebuilder/default.nix index d123790edd2f..3a3193cd5904 100644 --- a/pkgs/applications/networking/cluster/kubebuilder/default.nix +++ b/pkgs/applications/networking/cluster/kubebuilder/default.nix @@ -1,7 +1,6 @@ { lib , buildGoModule , fetchFromGitHub -, installShellFiles , makeWrapper , git , go @@ -15,7 +14,7 @@ buildGoModule rec { owner = "kubernetes-sigs"; repo = "kubebuilder"; rev = "v${version}"; - sha256 = "1726j2b5jyvllvnk60g6px3g2jyyphd9pc4vgid45mis9b60sh8a"; + sha256 = "0bl5ff2cplal6hg75800crhyviamk1ws85sq60h4zg21hzf21y68"; }; vendorSha256 = "0zxyd950ksjswja64rfri5v2yaalfg6qmq8215ildgrcavl9974n"; From 4c946ee3ee3a1a900b8fb536aa782bcd164e1def Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= Date: Fri, 6 Aug 2021 16:17:00 +0200 Subject: [PATCH 063/120] kubebuilder: only build the `cmd` package --- pkgs/applications/networking/cluster/kubebuilder/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/kubebuilder/default.nix b/pkgs/applications/networking/cluster/kubebuilder/default.nix index 3a3193cd5904..5784c2a472ef 100644 --- a/pkgs/applications/networking/cluster/kubebuilder/default.nix +++ b/pkgs/applications/networking/cluster/kubebuilder/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { }; vendorSha256 = "0zxyd950ksjswja64rfri5v2yaalfg6qmq8215ildgrcavl9974n"; - subPackages = ["cmd" "pkg/..."]; + subPackages = ["cmd"]; preBuild = '' export buildFlagsArray+=("-ldflags=-X main.kubeBuilderVersion=v${version} \ From a35341affe81ee06f3277b270b6f06fad5355cc9 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 6 Aug 2021 19:15:13 +0200 Subject: [PATCH 064/120] diffoscope: 179 -> 180 ChangeLog: https://diffoscope.org/news/diffoscope-180-released/ --- pkgs/tools/misc/diffoscope/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index d804b5200d2c..069343b8a478 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -9,11 +9,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "179"; + version = "180"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "sha256-SIFLWlmENuhgwG0YbIDTWG6uCHEfuoc0IMVz4cp5NX4="; + sha256 = "sha256-P6u+5MwnJ4xQ955qdX1I/ujRCcgyCXjXDXvvpUbhqt8="; }; outputs = [ "out" "man" ]; @@ -35,7 +35,7 @@ python3Packages.buildPythonApplication rec { # Most of the non-Python dependencies here are optional command-line tools for various file-format parsers. # To help figuring out what's missing from the list, run: ./pkgs/tools/misc/diffoscope/list-missing-tools.sh # - # Still missing these tools: docx2txt dumppdf dumpxsb enjarify lipo ocamlobjinfo oggDump otool procyon + # Still missing these tools: docx2txt dumpimage dumppdf dumpxsb enjarify lipo ocamlobjinfo oggDump otool procyon pythonPath = [ binutils-unwrapped bzip2 colordiff coreutils cpio db diffutils dtc e2fsprogs file findutils fontforge-fonttools gettext gnutar gzip From be5d310839d72c8a3742ff8e1a9fd30d187ca969 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 6 Aug 2021 19:24:50 +0200 Subject: [PATCH 065/120] nextcloud20: 20.0.11 -> 20.0.12 ChangeLog: https://nextcloud.com/changelog/#20-0-12 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 1776987bae09..199ea0c1ec02 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -44,8 +44,8 @@ in { ''; nextcloud20 = generic { - version = "20.0.11"; - sha256 = "sha256-CLrJH5eNTiJJrDzfCg+re3J2qmwxFOe12nUU/QgtD6A="; + version = "20.0.12"; + sha256 = "sha256-gIIPuWVcWv/5nuXMWticcPBKMjJVsCmvs83tj8fdbgY="; }; nextcloud21 = generic { From 20707acda8d7b8491deb35ad7e2b2fa1334d16ce Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 6 Aug 2021 19:25:39 +0200 Subject: [PATCH 066/120] nextcloud21: 21.0.3 -> 21.0.4 ChangeLog: https://nextcloud.com/changelog/#21-0-4 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 199ea0c1ec02..6534c541ec30 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -49,8 +49,8 @@ in { }; nextcloud21 = generic { - version = "21.0.3"; - sha256 = "8adcd175c7a70c33332586fa9ce36d03ba02d1df5d4c334d1210201d3fb953ee"; + version = "21.0.4"; + sha256 = "sha256-Sg0w/r+6UxGLqZCgwtLBZ2e3eqZ2r8k30gGNaGXF/jo="; }; nextcloud22 = generic { From 985d9f39aeffc4c882417f44f95b468497b98901 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 6 Aug 2021 19:26:08 +0200 Subject: [PATCH 067/120] nextcloud22: 22.0.0 -> 22.1.0 ChangeLog: https://nextcloud.com/changelog/#22-1-0 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 6534c541ec30..f4131f6338ad 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -54,8 +54,8 @@ in { }; nextcloud22 = generic { - version = "22.0.0"; - sha256 = "sha256-ORHTdUw3rKfJtfOys3UTwPK1u5ea8AgWwRF7Hu28XXo="; + version = "22.1.0"; + sha256 = "sha256-SCCAj3mRRoU2BOH6J9fykkSQGKRNxzv5KKl7AgKDGLo="; }; # tip: get she sha with: # curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256' From bf6d934cf80e6f5365d3193e01840397709d4d87 Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Fri, 6 Aug 2021 21:50:09 +0200 Subject: [PATCH 068/120] rgbds: 0.4.2 -> 0.5.1 This also changes the owner of the GitHub repository and the homepage URL because the repository was moved to a different organisation (the old GitHub repository now redirects to the new one). Also, since upstream switched to GNU Bison[1], the comment about byacc is no longer necessary. [1] https://github.com/gbdev/rgbds/issues/595 --- pkgs/development/compilers/rgbds/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/rgbds/default.nix b/pkgs/development/compilers/rgbds/default.nix index 6bc74971c4e9..00b20abbda8a 100644 --- a/pkgs/development/compilers/rgbds/default.nix +++ b/pkgs/development/compilers/rgbds/default.nix @@ -1,23 +1,19 @@ {lib, stdenv, fetchFromGitHub, bison, flex, pkg-config, libpng}: -# TODO: byacc is the recommended parser generator but due to https://github.com/rednex/rgbds/issues/333 -# it does not work for the moment. We should switch back to byacc as soon as the fix is integrated -# in a published version. - stdenv.mkDerivation rec { pname = "rgbds"; - version = "0.4.2"; + version = "0.5.1"; src = fetchFromGitHub { - owner = "rednex"; + owner = "gbdev"; repo = "rgbds"; rev = "v${version}"; - sha256 = "0lygj7jzjlq4w0mkiir7ycysrd1p1akyvzrppjcchja05mi8wy9p"; + sha256 = "11b1hg2m2f60q5622rb0nxhrzzylsxjx0c8inbxifi6lvmj9ak4x"; }; nativeBuildInputs = [ bison flex pkg-config libpng ]; installFlags = [ "PREFIX=\${out}" ]; meta = with lib; { - homepage = "https://rednex.github.io/rgbds/"; + homepage = "https://rgbds.gbdev.io/"; description = "A free assembler/linker package for the Game Boy and Game Boy Color"; license = licenses.mit; longDescription = From 246ac3167d82c7adafed4a861ddb71817810586c Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Fri, 6 Aug 2021 00:03:52 +0200 Subject: [PATCH 069/120] gzdoom: add desktop item --- pkgs/games/gzdoom/default.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index 8ab54468c001..787184273fc3 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, makeWrapper, openal, fluidsynth_1 , soundfont-fluid, libGL, SDL2, bzip2, zlib, libjpeg, libsndfile, mpg123 -, game-music-emu, pkg-config }: +, game-music-emu, pkg-config, copyDesktopItems, makeDesktopItem }: let zmusic-src = fetchFromGitHub { @@ -38,7 +38,7 @@ let fetchSubmodules = true; }; - nativeBuildInputs = [ cmake makeWrapper pkg-config ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config copyDesktopItems ]; buildInputs = [ SDL2 libGL @@ -55,7 +55,18 @@ let NIX_CFLAGS_LINK = "-lopenal -lfluidsynth"; + desktopItems = [ + (makeDesktopItem { + name = "gzdoom"; + exec = "gzdoom"; + desktopName = "GZDoom"; + categories = "Game;"; + }) + ]; + installPhase = '' + runHook preInstall + install -Dm755 gzdoom "$out/lib/gzdoom/gzdoom" for i in *.pk3; do install -Dm644 "$i" "$out/lib/gzdoom/$i" @@ -68,6 +79,8 @@ let done mkdir $out/bin makeWrapper $out/lib/gzdoom/gzdoom $out/bin/gzdoom + + runHook postInstall ''; meta = with lib; { From 55c21071de9d58498166ad96ddb157a4f5051702 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Fri, 6 Aug 2021 00:04:17 +0200 Subject: [PATCH 070/120] quakespasm: add desktop item --- pkgs/games/quakespasm/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/games/quakespasm/default.nix b/pkgs/games/quakespasm/default.nix index 41589caed6db..87ecd4601339 100644 --- a/pkgs/games/quakespasm/default.nix +++ b/pkgs/games/quakespasm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, SDL, fetchurl, gzip, libvorbis, libmad }: +{ lib, stdenv, SDL, fetchurl, gzip, libvorbis, libmad, copyDesktopItems, makeDesktopItem }: stdenv.mkDerivation rec { pname = "quakespasm"; @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { sourceRoot = "${pname}-${version}/Quake"; + nativeBuildInputs = [ copyDesktopItems ]; buildInputs = [ gzip SDL libvorbis libmad ]; @@ -25,6 +26,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + desktopItems = [ + (makeDesktopItem { + name = "quakespasm"; + exec = "quake"; + desktopName = "Quakespasm"; + categories = "Game;"; + }) + ]; + meta = with lib; { description = "An engine for iD software's Quake"; homepage = "http://quakespasm.sourceforge.net/"; From f7ae4163e027ad6269e6f51a7f9d0726a97be96b Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Fri, 6 Aug 2021 00:04:39 +0200 Subject: [PATCH 071/120] dhewm: add desktop item --- pkgs/games/dhewm3/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/games/dhewm3/default.nix b/pkgs/games/dhewm3/default.nix index b5caa603eaf8..beb037dc240a 100644 --- a/pkgs/games/dhewm3/default.nix +++ b/pkgs/games/dhewm3/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, SDL2, libGLU, libGL, zlib, libjpeg, libogg, libvorbis -, openal, curl }: +, openal, curl, copyDesktopItems, makeDesktopItem }: stdenv.mkDerivation rec { pname = "dhewm3"; @@ -21,9 +21,18 @@ stdenv.mkDerivation rec { cd "$(ls -d dhewm3-*.src)"/neo ''; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake copyDesktopItems ]; buildInputs = [ SDL2 libGLU libGL zlib libjpeg libogg libvorbis openal curl ]; + desktopItems = [ + (makeDesktopItem { + name = "dhewm3"; + exec = "dhewm3"; + desktopName = "Doom 3"; + categories = "Game;"; + }) + ]; + hardeningDisable = [ "format" ]; meta = with lib; { From c796704a786afa9204daa42b1e15c2b2963e36a8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 6 Aug 2021 22:47:29 +0200 Subject: [PATCH 072/120] python3Packages.pylitterbot: 2021.7.2 -> 2021.8.0 --- pkgs/development/python-modules/pylitterbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix index 4e22d52a4c8f..08924d515732 100644 --- a/pkgs/development/python-modules/pylitterbot/default.nix +++ b/pkgs/development/python-modules/pylitterbot/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pylitterbot"; - version = "2021.7.2"; + version = "2021.8.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "natekspencer"; repo = pname; rev = version; - sha256 = "0hnjqj9n2sq1jhiwdrw2aayhyz94cwjxniiak2h1nxh2q0nzigh3"; + sha256 = "sha256-Z7/j5ZZd8cOJhY/GfKUcDSJZvmU/TR/KDK60j1eYsik="; }; propagatedBuildInputs = [ From 1d537947e73e3e155241a023e065142c81d0fa56 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 6 Aug 2021 22:49:03 +0200 Subject: [PATCH 073/120] python3Packages.zeroconf: 0.33.2 -> 0.33.4 --- pkgs/development/python-modules/zeroconf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 18d0b381bd11..ad84bdd1c566 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.33.2"; + version = "0.33.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = version; - sha256 = "sha256-LtLLPffwznND7zciSdXJGFKHxk0m2AnLMna0vDt9jl0="; + sha256 = "sha256-ld8Mo465fJTVNSv6YvKcsPafiIij4PEmeycWB3M3ewU="; }; propagatedBuildInputs = [ From af3000e671ea68d6e93c7b7b9da462d16fbab906 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 6 Aug 2021 22:49:36 +0200 Subject: [PATCH 074/120] python3Packages.zigpy-deconz: 0.12.0 -> 0.12.1 --- pkgs/development/python-modules/zigpy-deconz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-deconz/default.nix b/pkgs/development/python-modules/zigpy-deconz/default.nix index 0b7c027c0fef..f41b3836db93 100644 --- a/pkgs/development/python-modules/zigpy-deconz/default.nix +++ b/pkgs/development/python-modules/zigpy-deconz/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "zigpy-deconz"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "zigpy"; repo = pname; rev = version; - sha256 = "sha256-d/yAk8owMu+J1BzlwR5mzF9HkXiE6Kc81AznvsAboy8="; + sha256 = "sha256-NpLhVQfezXbJQMvqqZjr9sc8tCjJgGu5Xk3C5/IDeUQ="; }; propagatedBuildInputs = [ pyserial pyserial-asyncio zigpy ]; From 0a299d0ba29d57f11501e23967b71b8cc5b8d0d5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 6 Aug 2021 22:52:23 +0200 Subject: [PATCH 075/120] python3Packages.zigpy-znp: 0.5.2 -> 0.5.3 --- pkgs/development/python-modules/zigpy-znp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix index 9e338e27acf1..474e7f309e34 100644 --- a/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/pkgs/development/python-modules/zigpy-znp/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "zigpy-znp"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "zigpy"; repo = pname; rev = "v${version}"; - sha256 = "15i93f32dr3a9dgx8s08cxangpkgrkx8rn2n6l18rncjknhk9wmc"; + sha256 = "sha256-nnA/gVXBpCZFkspcO6kF3ZkEDu0vV0d9p1WNGVrN0u8="; }; propagatedBuildInputs = [ From c4e68cb4518ef838e0479deda6703ae70f9a7520 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Sat, 7 Aug 2021 00:26:08 +0200 Subject: [PATCH 076/120] vault: 1.8.0 -> 1.8.1 --- pkgs/tools/security/vault/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 346141ca8925..b1d7ec6bc2b7 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "vault"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "sha256-jyGymAplSe8vaSwbONtpRoAondxNBcRbFZ+YyOtr7qo="; + sha256 = "sha256-zBUUhHecf3jn9HSoydsKBQLXtfsVb56RbECg7zteZzc="; }; - vendorSha256 = "11mrdf7pwf8v7bb7wamv2yhixw4x06rd0qym942kk9bwif2balfp"; + vendorSha256 = "sha256-uuzcDsi3f8KWE8WtN9v4jqmZPWsOm5I2LAbsyj1sjOY="; subPackages = [ "." ]; From 0c0b5661c71cc4913399e8fe6a8fe749666f9013 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Sat, 7 Aug 2021 00:26:18 +0200 Subject: [PATCH 077/120] vault-bin: 1.8.0 -> 1.8.1 --- pkgs/tools/security/vault/vault-bin.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index c2f0c2ea51d0..52d0f261d4be 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -1,26 +1,26 @@ { lib, stdenv, fetchurl, unzip, makeWrapper, gawk, glibc }: let - version = "1.8.0"; + version = "1.8.1"; sources = let base = "https://releases.hashicorp.com/vault/${version}"; in { x86_64-linux = fetchurl { url = "${base}/vault_${version}_linux_amd64.zip"; - sha256 = "sha256-H+kPDE8xuu2lgENf4t+vCb+Tni+ChkB8K5ZEgIY3Jyo="; + sha256 = "sha256-u0EfK7rXnC5PBkDx09XvUOK9p9T0CHWlaRfJX/eDwts="; }; i686-linux = fetchurl { url = "${base}/vault_${version}_linux_386.zip"; - sha256 = "19c7d7yr5nm1xgrkh46pcgwwxa6iic6is06n343qaxcj0dfg43kn"; + sha256 = "11khjx5lrb7zmrahkniqwn4ad98yjy2fm0miz63nzpq85c0yrjdn"; }; x86_64-darwin = fetchurl { url = "${base}/vault_${version}_darwin_amd64.zip"; - sha256 = "0zql0r6gmq0yqb1cbpjgwsg6cky9y43n5gsvijp6snhnp86bicdr"; + sha256 = "02gqavhg3pk6jkdmn1yp9pl3pv4ni2sg56q218gs8gbbypj22wpq"; }; aarch64-linux = fetchurl { url = "${base}/vault_${version}_linux_arm64.zip"; - sha256 = "1ajkgkanq8ijcxbb5zbn9z25r0v7qcq13ivjqr0x7ql5bxm3xfmc"; + sha256 = "0500nc8v7hwnrckz4fkf5fpqcg3i45q25lz4lghzkcabnss4qand"; }; }; From acc32a54114c645e4facee7dce0f14b1ac0ce246 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 6 Aug 2021 22:53:16 +0200 Subject: [PATCH 078/120] home-assistant: 2021.7.4 -> 2021.8.3 --- .../home-assistant/component-packages.nix | 55 ++++++++++--------- pkgs/servers/home-assistant/default.nix | 40 ++++---------- pkgs/servers/home-assistant/frontend.nix | 4 +- pkgs/servers/home-assistant/update.sh | 4 +- 4 files changed, 46 insertions(+), 57 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index cb74e1cecb6f..3f8565ed392f 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,13 +2,14 @@ # Do not edit! { - version = "2021.7.4"; + version = "2021.8.3"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; "acer_projector" = ps: with ps; [ pyserial ]; "acmeda" = ps: with ps; [ aiopulse ]; "actiontec" = ps: with ps; [ ]; + "adax" = ps: with ps; [ ]; # missing inputs: adax "adguard" = ps: with ps; [ adguardhome ]; "ads" = ps: with ps; [ pyads ]; "advantage_air" = ps: with ps; [ advantage-air ]; @@ -32,7 +33,7 @@ "ambient_station" = ps: with ps; [ aioambient ]; "amcrest" = ps: with ps; [ amcrest ha-ffmpeg ]; "ampio" = ps: with ps; [ ]; # missing inputs: asmog - "analytics" = ps: with ps; [ aiohttp-cors ]; + "analytics" = ps: with ps; [ aiohttp-cors sqlalchemy ]; "android_ip_webcam" = ps: with ps; [ pydroid-ipcam ]; "androidtv" = ps: with ps; [ adb-shell androidtv pure-python-adb ]; "anel_pwrctrl" = ps: with ps; [ ]; # missing inputs: anel_pwrctrl-homeassistant @@ -92,7 +93,7 @@ "bluesound" = ps: with ps; [ xmltodict ]; "bluetooth_le_tracker" = ps: with ps; [ pygatt ]; "bluetooth_tracker" = ps: with ps; [ bt-proximity pybluez ]; - "bme280" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense + "bme280" = ps: with ps; [ smbus-cffi ]; # missing inputs: bme280spi i2csense "bme680" = ps: with ps; [ bme680 smbus-cffi ]; "bmp280" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-bmp280 "bmw_connected_drive" = ps: with ps; [ bimmer-connected ]; @@ -183,7 +184,7 @@ "dlib_face_detect" = ps: with ps; [ face_recognition ]; "dlib_face_identify" = ps: with ps; [ face_recognition ]; "dlink" = ps: with ps; [ ]; # missing inputs: pyW215 - "dlna_dmr" = ps: with ps; [ async-upnp-client ]; + "dlna_dmr" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr ]; "dnsip" = ps: with ps; [ aiodns ]; "dominos" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pizzapi "doods" = ps: with ps; [ pillow ]; # missing inputs: pydoods @@ -224,7 +225,8 @@ "emonitor" = ps: with ps; [ aioemonitor ]; "emulated_hue" = ps: with ps; [ aiohttp-cors ]; "emulated_kasa" = ps: with ps; [ sense-energy ]; - "emulated_roku" = ps: with ps; [ emulated-roku ]; + "emulated_roku" = ps: with ps; [ aiohttp-cors emulated-roku ifaddr ]; + "energy" = ps: with ps; [ aiohttp-cors sqlalchemy ]; "enigma2" = ps: with ps; [ openwebifpy ]; "enocean" = ps: with ps; [ enocean ]; "enphase_envoy" = ps: with ps; [ envoy-reader ]; @@ -268,6 +270,7 @@ "flexit" = ps: with ps; [ pymodbus ]; # missing inputs: pyflexit "flic" = ps: with ps; [ pyflic ]; "flick_electric" = ps: with ps; [ pyflick ]; + "flipr" = ps: with ps; [ ]; # missing inputs: flipr-api "flo" = ps: with ps; [ aioflo ]; "flock" = ps: with ps; [ ]; "flume" = ps: with ps; [ pyflume ]; @@ -286,20 +289,19 @@ "freebox" = ps: with ps; [ freebox-api ]; "freedns" = ps: with ps; [ ]; "freedompro" = ps: with ps; [ pyfreedompro ]; - "fritz" = ps: with ps; [ aiohttp-cors fritzconnection fritzprofiles ifaddr xmltodict ]; + "fritz" = ps: with ps; [ aiohttp-cors fritzconnection ifaddr xmltodict ]; "fritzbox" = ps: with ps; [ pyfritzhome ]; "fritzbox_callmonitor" = ps: with ps; [ fritzconnection ]; - "fritzbox_netmonitor" = ps: with ps; [ fritzconnection ]; "fronius" = ps: with ps; [ pyfronius ]; - "frontend" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow ]; + "frontend" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ]; "frontier_silicon" = ps: with ps; [ ]; # missing inputs: afsapi "futurenow" = ps: with ps; [ pyfnip ]; "garadget" = ps: with ps; [ ]; "garages_amsterdam" = ps: with ps; [ garages-amsterdam ]; - "garmin_connect" = ps: with ps; [ garminconnect-ha ]; "gc100" = ps: with ps; [ ]; # missing inputs: python-gc100 "gdacs" = ps: with ps; [ aio-georss-gdacs ]; "generic" = ps: with ps; [ ]; + "generic_hygrostat" = ps: with ps; [ ]; "generic_thermostat" = ps: with ps; [ sqlalchemy ]; "geniushub" = ps: with ps; [ ]; # missing inputs: geniushub-client "geo_json_events" = ps: with ps; [ geojson-client ]; @@ -342,7 +344,7 @@ "hangouts" = ps: with ps; [ hangups ]; "harman_kardon_avr" = ps: with ps; [ ]; # missing inputs: hkavr "harmony" = ps: with ps; [ aioharmony ]; - "hassio" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow ]; + "hassio" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ]; "haveibeenpwned" = ps: with ps; [ ]; "hddtemp" = ps: with ps; [ ]; "hdmi_cec" = ps: with ps; [ pycec ]; @@ -371,7 +373,7 @@ "html5" = ps: with ps; [ aiohttp-cors pywebpush ]; "http" = ps: with ps; [ aiohttp-cors ]; "htu21d" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense - "huawei_lte" = ps: with ps; [ getmac huawei-lte-api stringcase url-normalize ]; + "huawei_lte" = ps: with ps; [ huawei-lte-api stringcase url-normalize ]; "huawei_router" = ps: with ps; [ ]; "hue" = ps: with ps; [ aiohue ]; "huisbaasje" = ps: with ps; [ huisbaasje-client ]; @@ -460,7 +462,7 @@ "litterrobot" = ps: with ps; [ pylitterbot ]; "llamalab_automate" = ps: with ps; [ ]; "local_file" = ps: with ps; [ ]; - "local_ip" = ps: with ps; [ ]; + "local_ip" = ps: with ps; [ aiohttp-cors ifaddr ]; "locative" = ps: with ps; [ aiohttp-cors ]; "lock" = ps: with ps; [ ]; "logbook" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ]; @@ -484,7 +486,7 @@ "mailgun" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pymailgunner "manual" = ps: with ps; [ ]; "manual_mqtt" = ps: with ps; [ aiohttp-cors paho-mqtt ]; - "map" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow ]; + "map" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ]; "marytts" = ps: with ps; [ ]; # missing inputs: speak2mary "mastodon" = ps: with ps; [ mastodon-py ]; "matrix" = ps: with ps; [ matrix-client ]; @@ -528,7 +530,7 @@ "monoprice" = ps: with ps; [ ]; # missing inputs: pymonoprice "moon" = ps: with ps; [ ]; "motion_blinds" = ps: with ps; [ ]; # missing inputs: motionblinds - "motioneye" = ps: with ps; [ motioneye-client ]; + "motioneye" = ps: with ps; [ aiohttp-cors motioneye-client ]; "mpchc" = ps: with ps; [ ]; "mpd" = ps: with ps; [ mpd2 ]; "mqtt" = ps: with ps; [ aiohttp-cors paho-mqtt ]; @@ -540,7 +542,7 @@ "mullvad" = ps: with ps; [ mullvad-api ]; "mutesync" = ps: with ps; [ mutesync ]; "mvglive" = ps: with ps; [ PyMVGLive ]; - "my" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow ]; + "my" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ]; "mychevy" = ps: with ps; [ ]; # missing inputs: mychevy "mycroft" = ps: with ps; [ ]; # missing inputs: mycroftapi "myq" = ps: with ps; [ pymyq ]; @@ -566,7 +568,7 @@ "nexia" = ps: with ps; [ nexia ]; "nextbus" = ps: with ps; [ ]; # missing inputs: py_nextbusnext "nextcloud" = ps: with ps; [ nextcloudmonitor ]; - "nfandroidtv" = ps: with ps; [ ]; + "nfandroidtv" = ps: with ps; [ ]; # missing inputs: notifications-android-tv "nightscout" = ps: with ps; [ ]; # missing inputs: py-nightscout "niko_home_control" = ps: with ps; [ ]; # missing inputs: niko-home-control "nilu" = ps: with ps; [ ]; # missing inputs: niluclient @@ -596,7 +598,7 @@ "ohmconnect" = ps: with ps; [ defusedxml ]; "ombi" = ps: with ps; [ ]; # missing inputs: pyombi "omnilogic" = ps: with ps; [ omnilogic ]; - "onboarding" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow ]; + "onboarding" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ]; "ondilo_ico" = ps: with ps; [ aiohttp-cors ondilo ]; "onewire" = ps: with ps; [ ]; # missing inputs: pi1wire pyownet "onkyo" = ps: with ps; [ onkyo-eiscp ]; @@ -628,8 +630,8 @@ "panasonic_bluray" = ps: with ps; [ ]; # missing inputs: panacotta "panasonic_viera" = ps: with ps; [ ]; # missing inputs: panasonic_viera "pandora" = ps: with ps; [ pexpect ]; - "panel_custom" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow ]; - "panel_iframe" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow ]; + "panel_custom" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ]; + "panel_iframe" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ]; "pcal9535a" = ps: with ps; [ ]; # missing inputs: pcal9535a "pencom" = ps: with ps; [ ]; # missing inputs: pencompy "persistent_notification" = ps: with ps; [ ]; @@ -657,6 +659,7 @@ "progettihwsw" = ps: with ps; [ ]; # missing inputs: progettihwsw "proliphix" = ps: with ps; [ ]; # missing inputs: proliphix "prometheus" = ps: with ps; [ aiohttp-cors prometheus_client ]; + "prosegur" = ps: with ps; [ ]; # missing inputs: pyprosegur "prowl" = ps: with ps; [ ]; "proximity" = ps: with ps; [ ]; "proxmoxve" = ps: with ps; [ proxmoxer ]; @@ -696,6 +699,7 @@ "remember_the_milk" = ps: with ps; [ httplib2 ]; # missing inputs: RtmAPI "remote" = ps: with ps; [ ]; "remote_rpi_gpio" = ps: with ps; [ ]; # missing inputs: gpiozero + "renault" = ps: with ps; [ ]; # missing inputs: renault-api "repetier" = ps: with ps; [ ]; # missing inputs: pyrepetier "rest" = ps: with ps; [ jsonpath xmltodict ]; "rest_command" = ps: with ps; [ ]; @@ -717,16 +721,16 @@ "rpi_gpio_pwm" = ps: with ps; [ ]; # missing inputs: pwmled "rpi_pfio" = ps: with ps; [ ]; # missing inputs: pifacecommon pifacedigitalio "rpi_power" = ps: with ps; [ ]; # missing inputs: rpi-bad-power - "rpi_rf" = ps: with ps; [ ]; # missing inputs: rpi-rf + "rpi_rf" = ps: with ps; [ ]; # missing inputs: RPi.GPIO rpi-rf "rss_feed_template" = ps: with ps; [ aiohttp-cors ]; "rtorrent" = ps: with ps; [ ]; "ruckus_unleashed" = ps: with ps; [ pyruckus ]; "russound_rio" = ps: with ps; [ ]; # missing inputs: russound_rio "russound_rnet" = ps: with ps; [ ]; # missing inputs: russound "sabnzbd" = ps: with ps; [ aiohttp-cors ifaddr netdisco zeroconf ]; # missing inputs: pysabnzbd - "safe_mode" = ps: with ps; [ aiohttp-cors hass-nabucasa home-assistant-frontend pillow ]; + "safe_mode" = ps: with ps; [ aiohttp-cors hass-nabucasa home-assistant-frontend pillow sqlalchemy ]; "saj" = ps: with ps; [ ]; # missing inputs: pysaj - "samsungtv" = ps: with ps; [ samsungctl samsungtvws wakeonlan ]; + "samsungtv" = ps: with ps; [ getmac samsungctl samsungtvws wakeonlan ]; "satel_integra" = ps: with ps; [ ]; # missing inputs: satel_integra "scene" = ps: with ps; [ ]; "schluter" = ps: with ps; [ ]; # missing inputs: py-schluter @@ -763,6 +767,7 @@ "simplisafe" = ps: with ps; [ simplisafe-python ]; "simulated" = ps: with ps; [ ]; "sinch" = ps: with ps; [ ]; # missing inputs: clx-sdk-xms + "siren" = ps: with ps; [ ]; "sisyphus" = ps: with ps; [ ]; # missing inputs: sisyphus-control "sky_hub" = ps: with ps; [ ]; # missing inputs: pyskyqhub "skybeacon" = ps: with ps; [ pygatt ]; @@ -793,7 +798,7 @@ "somfy_mylink" = ps: with ps; [ somfy-mylink-synergy ]; "sonarr" = ps: with ps; [ sonarr ]; "songpal" = ps: with ps; [ python-songpal ]; - "sonos" = ps: with ps; [ aiohttp-cors async-upnp-client defusedxml ifaddr plexapi plexauth plexwebsocket pysonos zeroconf ]; + "sonos" = ps: with ps; [ aiohttp-cors async-upnp-client defusedxml ifaddr plexapi plexauth plexwebsocket soco zeroconf ]; "sony_projector" = ps: with ps; [ ]; # missing inputs: pysdcp "soundtouch" = ps: with ps; [ aiohttp-cors ifaddr libsoundtouch zeroconf ]; "spaceapi" = ps: with ps; [ aiohttp-cors ]; @@ -833,7 +838,7 @@ "syncthing" = ps: with ps; [ aiosyncthing ]; "syncthru" = ps: with ps; [ pysyncthru url-normalize ]; "synology_chat" = ps: with ps; [ ]; - "synology_dsm" = ps: with ps; [ synologydsm-api ]; + "synology_dsm" = ps: with ps; [ ]; # missing inputs: py-synologydsm-api "synology_srm" = ps: with ps; [ ]; # missing inputs: synology-srm "syslog" = ps: with ps; [ ]; "system_bridge" = ps: with ps; [ aiohttp-cors ifaddr systembridge zeroconf ]; @@ -969,7 +974,6 @@ "worldtidesinfo" = ps: with ps; [ ]; "worxlandroid" = ps: with ps; [ ]; "wsdot" = ps: with ps; [ ]; - "wunderground" = ps: with ps; [ ]; "x10" = ps: with ps; [ ]; "xbee" = ps: with ps; [ ]; # missing inputs: xbee-helper "xbox" = ps: with ps; [ aiohttp-cors xbox-webapi ]; @@ -989,6 +993,7 @@ "yeelight" = ps: with ps; [ yeelight ]; "yeelightsunflower" = ps: with ps; [ ]; # missing inputs: yeelightsunflower "yi" = ps: with ps; [ aioftp ha-ffmpeg ]; + "youless" = ps: with ps; [ ]; # missing inputs: youless-api "zabbix" = ps: with ps; [ ]; # missing inputs: py-zabbix "zamg" = ps: with ps; [ ]; "zengge" = ps: with ps; [ ]; # missing inputs: zengge diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 5601a6c0cdec..ce08141358b3 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -58,25 +58,6 @@ let (mkOverride "ring-doorbell" "0.6.2" "fbd537722a27b3b854c26506d894b7399bb8dc57ff36083285971227a2d46560") - # Pinned due to API changes in pyflunearyou>=2.0 - (self: super: { - pyflunearyou = super.pyflunearyou.overridePythonAttrs (oldAttrs: rec { - version = "1.0.7"; - src = fetchFromGitHub { - owner = "bachya"; - repo = "pyflunearyou"; - rev = version; - sha256 = "0hq55k298m9a90qb3lasw9bi093hzndrah00rfq94bp53aq0is99"; - }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "poetry.masonry.api" "poetry.core.masonry.api" \ - --replace 'msgpack = "^0.6.2"' 'msgpack = "*"' \ - --replace 'ujson = "^1.35"' 'ujson = "*"' - ''; - }); - }) - # Pinned due to API changes in pylast 4.2.1 (mkOverride "pylast" "4.2.0" "0zd0dn2l738ndz62vpa751z0ldnm91dcz9zzbvxv53r08l0s9yf3") @@ -157,7 +138,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.7.4"; + hassVersion = "2021.8.3"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -174,7 +155,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "1y6p3hg487ishar1r8vir5cxfbaw4c86s5w3zn9bmbf6jbd51pyk"; + sha256 = "02hm4x1qx9vd39d9l2gl2pnfnjmpk6p2w72lj45cvp3jimdg30fz"; }; # leave this in, so users don't have to constantly update their downstream patch handling @@ -388,7 +369,6 @@ in with py.pkgs; buildPythonApplication rec { "fritzbox_callmonitor" "frontend" "garages_amsterdam" - "garmin_connect" "gdacs" "generic" "generic_thermostat" @@ -430,7 +410,8 @@ in with py.pkgs; buildPythonApplication rec { "home_connect" "home_plus_control" "homeassistant" - "homekit" + # disable homekit tests because they fail in the network component + #"homekit" "homekit_controller" "homematic" "homematicip_cloud" @@ -658,7 +639,6 @@ in with py.pkgs; buildPythonApplication rec { "switcher_kis" "syncthing" "syncthru" - "synology_dsm" "system_health" "system_log" "tado" @@ -731,7 +711,6 @@ in with py.pkgs; buildPythonApplication rec { "workday" "worldclock" "wsdot" - "wunderground" "xbox" "xiaomi" "xiaomi_aqara" @@ -791,8 +770,15 @@ in with py.pkgs; buildPythonApplication rec { # wallbox/test_config_flow.py: Tries to connect to api.wall-box.cim: Failed to establish a new connection: [Errno -2] Name or service not known "--deselect tests/components/wallbox/test_config_flow.py::test_form_invalid_auth" "--deselect tests/components/wallbox/test_config_flow.py::test_form_cannot_connect" - # tests/components/default_config/test_init.py: Tries to check for updates and fails ungracefully without network access + # default_config/test_init.py: Tries to check for updates and fails ungracefully without network access "--deselect tests/components/default_config/test_init.py::test_setup" + # local_ip/test_{init,config_flow}.py: tries to lookup a route towards a multicast address and fails + "--deselect tests/components/local_ip/test_init.py::test_basic_setup" + "--deselect tests/components/local_ip/test_config_flow.py::test_config_flow" + # netatmo/test_select.py: NoneType object has no attribute state + "--deselect tests/components/netatmo/test_select.py::test_select_schedule_thermostats" + # helpers/test_system_info.py: AssertionError: assert 'Unknown' == 'Home Assistant Container' + "--deselect tests/helpers/test_system_info.py::test_container_installationtype" # tests are located in tests/ "tests" # dynamically add packages required for component tests @@ -828,8 +814,6 @@ in with py.pkgs; buildPythonApplication rec { "test_onboarding_core_no_rpi_power" # hue/test_sensor_base.py: Race condition when counting events "test_hue_events" - # homekit/test_homekit.py: Tries to use zeroconf, which tries to join a multicast group - "test_homekit_uses_system_zeroconf" # august/test_lock.py: AssertionError: assert 'unlocked' == 'locked' "test_lock_update_via_pubnub" ]; diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index a42b13a260d5..72e48629a6d2 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20210707.0"; + version = "20210804.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-6RR+T4+vS6g00+MS1ty8aFVx6WM2dE+c17+wDoPxnGg="; + sha256 = "sha256-0VCukSHI4PXAecxHc1DJSQ1GrErenNb0K4OhSIgkQbs="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/update.sh b/pkgs/servers/home-assistant/update.sh index 8b17dabdfe28..56f7b0aaede8 100755 --- a/pkgs/servers/home-assistant/update.sh +++ b/pkgs/servers/home-assistant/update.sh @@ -36,5 +36,5 @@ sed -i -e "s/hassVersion =.*/hassVersion = \"${TARGET_VERSION}\";/" \ nix-update --version "$TARGET_VERSION" --build home-assistant ) -git add ./component-packages.nix ./default.nix ./frontend.nix -git commit -m "home-assistant: ${CURRENT_VERSION} -> ${TARGET_VERSION}" +#git add ./component-packages.nix ./default.nix ./frontend.nix +#git commit -m "home-assistant: ${CURRENT_VERSION} -> ${TARGET_VERSION}" From 51ce9692ef438b18a90dd4350a456d50d63c6f65 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Aug 2021 01:42:45 +0000 Subject: [PATCH 079/120] keepass: 2.46 -> 2.48.1 --- pkgs/applications/misc/keepass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index 843193bba182..336bd5a7f64d 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -3,11 +3,11 @@ with builtins; buildDotnetPackage rec { baseName = "keepass"; - version = "2.46"; + version = "2.48.1"; src = fetchurl { url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip"; - sha256 = "0zyclydgyg8nhwxrzw7x4f82975cqdmp12py33k6sballx6jhgiy"; + sha256 = "sha256-HkAgKPvf8TUgUlgsGWVgjuYJaRPGi8obOFQEtmzDtLE="; }; sourceRoot = "."; From 7444a4b946f6cca464b3103661d1000a35e48818 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Aug 2021 01:56:05 +0000 Subject: [PATCH 080/120] ispell: 3.4.00 -> 3.4.04 --- pkgs/tools/text/ispell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/ispell/default.nix b/pkgs/tools/text/ispell/default.nix index 6c92983585b3..9a3f37cc64a5 100644 --- a/pkgs/tools/text/ispell/default.nix +++ b/pkgs/tools/text/ispell/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ispell"; - version = "3.4.00"; + version = "3.4.04"; src = fetchurl { url = "https://www.cs.hmc.edu/~geoff/tars/${pname}-${version}.tar.gz"; - sha256 = "1hmfnz55qzfpz7lz0r3m4kkv31smir92ks9s5l1iiwimhr2jxi2x"; + sha256 = "sha256-h7zW8FIdhaCjp4NCFZVtdOvEkxRMx8eR+HvmhyzP4T4="; }; buildInputs = [ bison ncurses ]; From 7f3755e67a3f147d8627f35030470e14aac62a42 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Aug 2021 04:13:01 +0000 Subject: [PATCH 081/120] blueman: 2.2.1 -> 2.2.2 --- pkgs/tools/bluetooth/blueman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index 0939584fa970..528f0999b2c6 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "blueman"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { url = "https://github.com/blueman-project/blueman/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "0whs1bqnn1fgzrq7y2w1d06ldvfafq6h2xzmcfncbwmyb4i0mhgw"; + sha256 = "sha256-Ge1ZsaE09YT8AF9HKV/vZAqXCf2bmyMHOI4RKjLs0PY="; }; nativeBuildInputs = [ From 385b1c3293a85105db8df5d317509ada31a6fe83 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Aug 2021 06:25:50 +0000 Subject: [PATCH 082/120] faudio: 21.02 -> 21.08 --- pkgs/development/libraries/faudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index 2ca20eaa5f0d..a4f19678f240 100644 --- a/pkgs/development/libraries/faudio/default.nix +++ b/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "21.02"; + version = "21.08"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "sha256-4w0Zd3vmrw4KM9O/axy1BJpoHeQeZy0P6Ptolxrabjc="; + sha256 = "sha256-zgXIho1jmoOCVcjvDwiq+J1jOzsPgxvvaWN8NfszEdA="; }; nativeBuildInputs = [cmake]; From a4cd1123fee07dea719486dd72bf1a8f529d8aaf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Aug 2021 07:19:40 +0000 Subject: [PATCH 083/120] fheroes2: 0.9.5 -> 0.9.6 --- pkgs/games/fheroes2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/fheroes2/default.nix b/pkgs/games/fheroes2/default.nix index ea154db121ee..fabfdeea8ce6 100644 --- a/pkgs/games/fheroes2/default.nix +++ b/pkgs/games/fheroes2/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "fheroes2"; - version = "0.9.5"; + version = "0.9.6"; src = fetchFromGitHub { owner = "ihhub"; repo = "fheroes2"; rev = version; - sha256 = "sha256-fqV2u6vChzU8387aQGf3OKeiWX188GouYZr4ZUmXWxs="; + sha256 = "sha256-zm7yR87pJY26USHocT7HnPNQK5xYjFPNo4RT2Lr3C/k="; }; buildInputs = [ gettext libpng SDL2 SDL2_image SDL2_mixer SDL2_ttf zlib ]; From 09cb9682a2661206e05555e1da21263a2f19e679 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Aug 2021 07:43:27 +0000 Subject: [PATCH 084/120] fluxcd: 0.16.1 -> 0.16.2 --- pkgs/applications/networking/cluster/fluxcd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index baf67f2b6816..eb55e3f9aa9e 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: let - version = "0.16.1"; + version = "0.16.2"; manifests = fetchzip { url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz"; @@ -19,10 +19,10 @@ buildGoModule rec { owner = "fluxcd"; repo = "flux2"; rev = "v${version}"; - sha256 = "sha256-OjbyDg+3dSJco162NubK12pbmwib6uGlJQxVaJOzSig="; + sha256 = "sha256-hP2HQI9Oc7IlzVS5r7yqGAgSgqECOSZVe2B3vO2sgKA="; }; - vendorSha256 = "sha256-GPbuHv/Xi9sWWZ6SIlW8cm5bY1gTO41vygx2C8dEt0k="; + vendorSha256 = "sha256-6ABnX0GV3HmhpUpPWS0bigubRqpXGoikEeQ/LqO6Ybs="; nativeBuildInputs = [ installShellFiles ]; From 34892123a4edf8479c1d93e5b0c96feacf86a6a2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Aug 2021 07:48:50 +0000 Subject: [PATCH 085/120] folly: 2021.01.25.00 -> 2021.08.02.00 --- pkgs/development/libraries/folly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 212b656adda5..a80a5cd9f8f0 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (rec { pname = "folly"; - version = "2021.01.25.00"; + version = "2021.08.02.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "sha256-n2cpXdjPZYNjvSHBZFFn3JFwqYCFWc8qSKwet80LtJE="; + sha256 = "sha256-Y2CqPlhbfC++udbbURnI9mvRZswC8kmikp1HY0qJz4k="; }; nativeBuildInputs = [ From c19127cf93d8f862f940f6dbbf7a4c4090352d7d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Aug 2021 10:30:13 +0000 Subject: [PATCH 086/120] k9s: 0.24.14 -> 0.24.15 --- pkgs/applications/networking/cluster/k9s/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index 89d07da74829..3c7b232cc214 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.24.14"; + version = "0.24.15"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "sha256-Kw3TT8IeJT0y2vSd38/y7BRq7PxMH2tiXV4/lOn5INA="; + sha256 = "sha256-ws5JC2/WkgwxKwYtP9xtFELRhztzL6tNSvopyeC6H0Q="; }; buildFlagsArray = '' @@ -18,7 +18,7 @@ buildGoModule rec { -X github.com/derailed/k9s/cmd.commit=${src.rev} ''; - vendorSha256 = "sha256-JBWQxRaMvIbUiOD7sJiZH1SHNCdysgh5FeSmYf+FdG4="; + vendorSha256 = "sha256-T9khJeg5XPhVyUiu4gEEHZR6RgJF4P8LYFycqJglms8="; doCheck = false; From dd90700f6167ac9239f0d651354cc45ffc087414 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Aug 2021 10:47:25 +0000 Subject: [PATCH 087/120] kora-icon-theme: 1.4.4 -> 1.4.5 --- pkgs/data/icons/kora-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/kora-icon-theme/default.nix b/pkgs/data/icons/kora-icon-theme/default.nix index 9e50fb0c1369..5c8f3d15b663 100644 --- a/pkgs/data/icons/kora-icon-theme/default.nix +++ b/pkgs/data/icons/kora-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kora-icon-theme"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { owner = "bikass"; repo = "kora"; rev = "v${version}"; - sha256 = "sha256-79C/M5WXQswA1xuA6pwVSRlDtQC9+EzkwSEV3SdPzBc="; + sha256 = "sha256-5tXXAfGY5JQ5RiKayUuQJDgX6sPHRi8Hy2ht/Hl0hdo="; }; nativeBuildInputs = [ From bb550a67d820bc581a58cf96e1e4dff3ad6f4ce9 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sat, 7 Aug 2021 14:37:26 +0200 Subject: [PATCH 088/120] mautrix-whatsapp: 0.1.7 -> 0.1.8 --- pkgs/servers/mautrix-whatsapp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index a5b2f14e9d58..0b2da872bd06 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "tulir"; repo = "mautrix-whatsapp"; rev = "v${version}"; - sha256 = "sha256-PXahSrA+jBWreFhqCp1Ar9yYfIJGJfU2xH88Ax3fdkE="; + sha256 = "bFuJa4pKwqQmpJDqYwA97CjrTeQ1Q8V/pNqD0ff6x/U="; }; buildInputs = [ olm ]; - vendorSha256 = "sha256-Iscojrn6wVnweOQV1GvhZ4QjUdTfDLOsCP1hVR4u/b4="; + vendorSha256 = "NTORR0ixVozUllWlGziTUSJNy1zHoPWQMZbmPUchpQ0="; doCheck = false; From 7e1bfa7ac78560fb9df8b06bc402a62c05d2cfea Mon Sep 17 00:00:00 2001 From: Simon Chatterjee Date: Fri, 6 Aug 2021 22:34:58 +0100 Subject: [PATCH 089/120] nushell: 0.33 -> 0.35 --- pkgs/shells/nushell/default.nix | 22 +++++++++++--- pkgs/shells/nushell/use-system-zstd-lib.diff | 32 ++++++++++++++++++++ 2 files changed, 50 insertions(+), 4 deletions(-) create mode 100644 pkgs/shells/nushell/use-system-zstd-lib.diff diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index b7fa5453d87a..eb3d61dc6651 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -4,6 +4,7 @@ , rustPlatform , openssl , zlib +, zstd , pkg-config , python3 , xorg @@ -17,27 +18,40 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.33.0"; + version = "0.35.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-Asjm3IoAfzphITLQuNh6r/i/pjEM/A+wpCsAB83bu2U="; + sha256 = "0p5whwx6wk9k7mrxhr7azrppbj9mv53hd4bl1cgygxz231aq8337"; }; - cargoSha256 = "sha256-Ly59mdUzSI2pIPbckWn1WBz/o2zVzpAzaCDROLdjG7Y="; + cargoSha256 = "0xs0s02zf78pgd94ifh465mg14rrwjfg7qbzmmq8jha758gfwdi3"; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ python3 ]; - buildInputs = [ openssl ] + buildInputs = [ openssl zstd ] ++ lib.optionals stdenv.isDarwin [ zlib libiconv Security ] ++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ xorg.libX11 ] ++ lib.optionals (withExtraFeatures && stdenv.isDarwin) [ AppKit nghttp2 libgit2 ]; cargoBuildFlags = lib.optional withExtraFeatures "--features=extra"; + # Since 0.34, nu has an indirect dependency on `zstd-sys` (via `polars` and + # `parquet`, for dataframe support), which by default has an impure build + # (git submodule for the `zstd` C library). The `pkg-config` feature flag + # fixes this, but it's hard to invoke this in the right place, because of + # the indirect dependencies. So add a direct dependency on `zstd-sys` here + # at the top level, along with this feature flag, to ensure that when + # `zstd-sys` is transitively invoked, it triggers a pure build using the + # system `zstd` library provided above. + # + # (If this patch needs updating, in a nushell repo add the zstd-sys line to + # Cargo.toml, then `cargo update --package zstd-sys` to update Cargo.lock.) + cargoPatches = [ ./use-system-zstd-lib.diff ]; + # TODO investigate why tests are broken on darwin # failures show that tests try to write to paths # outside of TMPDIR diff --git a/pkgs/shells/nushell/use-system-zstd-lib.diff b/pkgs/shells/nushell/use-system-zstd-lib.diff new file mode 100644 index 000000000000..271ad6c692ed --- /dev/null +++ b/pkgs/shells/nushell/use-system-zstd-lib.diff @@ -0,0 +1,32 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 8833c3e5..0c90d2fe 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -3188,6 +3188,7 @@ dependencies = [ + "nu_plugin_xpath", + "rstest", + "serial_test", ++ "zstd-sys", + ] + + [[package]] +@@ -6954,4 +6955,5 @@ checksum = "615120c7a2431d16cf1cf979e7fc31ba7a5b5e5707b29c8a99e5dbf8a8392a33" + dependencies = [ + "cc", + "libc", ++ "pkg-config", + ] +diff --git a/Cargo.toml b/Cargo.toml +index 89e8a311..4cc2331a 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -63,6 +63,9 @@ serial_test = "0.5.1" + hamcrest2 = "0.3.0" + rstest = "0.10.0" + ++# Specify that the indirect dependency ztsd-sys should pick up the system zstd C library ++zstd-sys = { version = "1", features = [ "pkg-config" ] } ++ + [build-dependencies] + + [features] From 79282b5a99c91823b15d1b8cf2e5dc289f3e0db4 Mon Sep 17 00:00:00 2001 From: Sage Raflik Date: Fri, 6 Aug 2021 19:49:37 -0500 Subject: [PATCH 090/120] pinyin-tool: init at 0.1.3 --- pkgs/tools/text/pinyin-tool/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/text/pinyin-tool/default.nix diff --git a/pkgs/tools/text/pinyin-tool/default.nix b/pkgs/tools/text/pinyin-tool/default.nix new file mode 100644 index 000000000000..9d98385933b1 --- /dev/null +++ b/pkgs/tools/text/pinyin-tool/default.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, rustPlatform, fetchFromGitHub, Security }: + +rustPlatform.buildRustPackage rec { + pname = "pinyin-tool"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "briankung"; + repo = pname; + rev = version; + sha256 = "1gwqwxlvdrm4sdyqkvpvvfi6jh6qqn6qybn0z66wm06k62f8zj5b"; + }; + + cargoSha256 = "1ixl4bsb8c8dmz9s28a2v5l5f2hi3g9xjy6ribmhybpwmfs4mr4d"; + + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + + meta = with lib; { + description = "A simple command line tool for converting Chinese characters to space-separate pinyin words"; + homepage = "https://github.com/briankung/pinyin-tool"; + license = licenses.mit; + maintainers = with maintainers; [ neonfuz ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b8e02dda2654..564b8bba2935 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8077,6 +8077,10 @@ in pixiewps = callPackage ../tools/networking/pixiewps {}; + pinyin-tool = callPackage ../tools/text/pinyin-tool { + inherit (darwin.apple_sdk.frameworks) Security; + }; + pk2cmd = callPackage ../tools/misc/pk2cmd { }; plantuml = callPackage ../tools/misc/plantuml { }; From 57e621437054555b6b1e563208badec390e4efea Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sat, 7 Aug 2021 15:21:51 +0200 Subject: [PATCH 091/120] mautrix-whatsapp: update repository location --- pkgs/servers/mautrix-whatsapp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index 0b2da872bd06..759d53df6663 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -5,8 +5,8 @@ buildGoModule rec { version = "0.1.8"; src = fetchFromGitHub { - owner = "tulir"; - repo = "mautrix-whatsapp"; + owner = "mautrix"; + repo = "whatsapp"; rev = "v${version}"; sha256 = "bFuJa4pKwqQmpJDqYwA97CjrTeQ1Q8V/pNqD0ff6x/U="; }; From a6692271eb99c51137e8604d4c4a58b2e71bb7d0 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sat, 7 Aug 2021 15:22:16 +0200 Subject: [PATCH 092/120] mautrix-whatsapp: specify agpl3plus license e.g. https://github.com/mautrix/whatsapp/blob/f4a7394b670db59aadd6ad99f761acbff255e1b6/bridgestate.go mentions the option of using a later version. --- pkgs/servers/mautrix-whatsapp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index 759d53df6663..c2f9e206e9cb 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/tulir/mautrix-whatsapp"; description = "Matrix <-> Whatsapp hybrid puppeting/relaybot bridge"; - license = licenses.agpl3; + license = licenses.agpl3Plus; maintainers = with maintainers; [ vskilet ma27 ]; }; } From 14266db9f2e36a3c0ad7e55236048fe5bd8b7451 Mon Sep 17 00:00:00 2001 From: polykernel <81340136+polykernel@users.noreply.github.com> Date: Sat, 7 Aug 2021 10:30:43 -0400 Subject: [PATCH 093/120] fnott: use fetchFromGitea instead of fetchgit --- pkgs/applications/misc/fnott/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/fnott/default.nix b/pkgs/applications/misc/fnott/default.nix index 8610f5411960..4c2e262c9ae1 100644 --- a/pkgs/applications/misc/fnott/default.nix +++ b/pkgs/applications/misc/fnott/default.nix @@ -1,6 +1,6 @@ { stdenv , lib -, fetchgit +, fetchFromGitea , pkg-config , meson , ninja @@ -21,10 +21,12 @@ stdenv.mkDerivation rec { pname = "fnott"; version = "1.1.0"; - src = fetchgit { - url = "https://codeberg.org/dnkl/fnott.git"; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "dnkl"; + repo = "fnott"; rev = version; - sha256 = "sha256-lePd36TFQKZd+B7puUbQhLVrbybeSPjMTFWfY0B82S4="; + sha256 = "sha256-gzU5AqjCIZlhLbnj/xuSGJ69ZhLv9zQxlM0Nn+MIX/U="; }; nativeBuildInputs = [ From dae92ad5e6b7fea52b2761dfa6facc925268ed35 Mon Sep 17 00:00:00 2001 From: Atkins Chang Date: Fri, 6 Aug 2021 22:36:28 +0800 Subject: [PATCH 094/120] chart-testing: init at 3.4.0 Signed-off-by: Atkins Chang --- .../cluster/helm/chart-testing/default.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/applications/networking/cluster/helm/chart-testing/default.nix diff --git a/pkgs/applications/networking/cluster/helm/chart-testing/default.nix b/pkgs/applications/networking/cluster/helm/chart-testing/default.nix new file mode 100644 index 000000000000..c4365975713a --- /dev/null +++ b/pkgs/applications/networking/cluster/helm/chart-testing/default.nix @@ -0,0 +1,40 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "chart-testing"; + version = "3.4.0"; + + src = fetchFromGitHub { + owner = "helm"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-c7Rjk2YZaQXyFwrDVwYgOCnq/F2ooIUVETXVn5FVlZE="; + }; + + vendorSha256 = "sha256-1Py66ljDjJC38biJ25D8KnWEi3nXAVt9QSgyH1KkwHM="; + + postPatch = '' + substituteInPlace pkg/config/config.go \ + --replace "\"/etc/ct\"," "\"$out/etc/ct\"," + ''; + + ldflags = [ + "-w" + "-s" + "-X github.com/helm/chart-testing/v3/ct/cmd.Version=${version}" + "-X github.com/helm/chart-testing/v3/ct/cmd.GitCommit=${src.rev}" + "-X github.com/helm/chart-testing/v3/ct/cmd.BuildDate=19700101-00:00:00" + ]; + + postInstall = '' + install -Dm644 -t $out/etc/ct etc/chart_schema.yaml + install -Dm644 -t $out/etc/ct etc/lintconf.yaml + ''; + + meta = with lib; { + description = "A tool for testing Helm charts"; + homepage = "https://github.com/helm/chart-testing"; + license = licenses.asl20; + maintainers = with maintainers; [ atkinschang ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 204f3c8b6ef4..8c0289fb1e07 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25503,6 +25503,8 @@ in kubernetes-helmPlugins = dontRecurseIntoAttrs (callPackage ../applications/networking/cluster/helm/plugins { }); + chart-testing = callPackage ../applications/networking/cluster/helm/chart-testing { }; + kubetail = callPackage ../applications/networking/cluster/kubetail { } ; kupfer = callPackage ../applications/misc/kupfer { From 55aeab1edfadb938fa271283b66427a0369f8bbe Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 7 Aug 2021 16:57:53 +0200 Subject: [PATCH 095/120] evcxr: 0.10.0 -> 0.11.0 (#133019) ChangeLog: https://github.com/google/evcxr/blob/v0.11.0/RELEASE_NOTES.md#version-0110 --- pkgs/development/interpreters/evcxr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix index 7dabff3d2e5e..81200a94aae9 100644 --- a/pkgs/development/interpreters/evcxr/default.nix +++ b/pkgs/development/interpreters/evcxr/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "evcxr"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "google"; repo = "evcxr"; rev = "v${version}"; - sha256 = "sha256-EPxWLPw+V5eIm+eL8m8Xw14adgshthJSDRyWohsJH88="; + sha256 = "sha256-JziLEsY6kF5UeDt17q/HDrTlNtHj7DWy1tTq3s2eZHE="; }; - cargoSha256 = "sha256-5jGrv0YRVMo2X9p/WPgjYV3z193hl2+NiFTZr3v0Iik="; + cargoSha256 = "sha256-I164eXgc/yiKKskloh6FGYD3bLCLWXaM6uWa01PRDXs="; RUST_SRC_PATH = "${rustPlatform.rustLibSrc}"; From d6f6521030bc948498d5d69bdbe9b48e5d049955 Mon Sep 17 00:00:00 2001 From: Poscat Date: Sat, 7 Aug 2021 23:12:33 +0800 Subject: [PATCH 096/120] epson-escpr: 1.7.3 -> 1.7.16 --- pkgs/misc/drivers/epson-escpr/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/drivers/epson-escpr/default.nix b/pkgs/misc/drivers/epson-escpr/default.nix index bdb2839ab0b3..9c4998ecaa0f 100644 --- a/pkgs/misc/drivers/epson-escpr/default.nix +++ b/pkgs/misc/drivers/epson-escpr/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "epson-escpr"; - version = "1.7.3"; + version = "1.7.16"; src = fetchurl { # To find new versions, visit @@ -11,10 +11,10 @@ stdenv.mkDerivation { # version. # NOTE: Don't forget to update the webarchive link too! urls = [ - "https://download3.ebz.epson.net/dsc/f/03/00/09/83/26/f90d0f70b33a9d7d77a2408364c47fba1ccbf943/epson-inkjet-printer-escpr-1.7.3-1lsb3.2.tar.gz" - "https://web.archive.org/web/https://download3.ebz.epson.net/dsc/f/03/00/09/83/26/f90d0f70b33a9d7d77a2408364c47fba1ccbf943/epson-inkjet-printer-escpr-1.7.3-1lsb3.2.tar.gz" + "https://download3.ebz.epson.net/dsc/f/03/00/12/97/30/97f146010d33b9a55badbc23429296f6b9b46011/epson-inkjet-printer-escpr-1.7.16-1lsb3.2.tar.gz" + "https://web.archive.org/web/https://download3.ebz.epson.net/dsc/f/03/00/12/97/30/97f146010d33b9a55badbc23429296f6b9b46011/epson-inkjet-printer-escpr-1.7.16-1lsb3.2.tar.gz" ]; - sha256 = "0r3jkdfk33irha9gpyvhha056ans59p7dq9i153i292ifjsd8458"; + sha256 = "18n6fgyrii8084vdjhys94lr6nhhbmn7zzjd8jckvv1grb0iz9nv"; }; patches = [ ./cups-filter-ppd-dirs.patch ]; From 6847ca7d13c6fc53b90d9074dbf3a1d6e63522a5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 7 Aug 2021 17:20:27 +0200 Subject: [PATCH 097/120] python3Packages.simplisafe-python: disable test_update_error if "403" in str(err): > raise InvalidCredentialsError("Unauthorized") from err E simplipy.errors.InvalidCredentialsError: Unauthorized simplipy/api.py:253: InvalidCredentialsError --- pkgs/development/python-modules/simplisafe-python/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/simplisafe-python/default.nix b/pkgs/development/python-modules/simplisafe-python/default.nix index e31181f5905c..f362c0686feb 100644 --- a/pkgs/development/python-modules/simplisafe-python/default.nix +++ b/pkgs/development/python-modules/simplisafe-python/default.nix @@ -47,6 +47,7 @@ buildPythonPackage rec { disabledTests = [ # simplipy/api.py:253: InvalidCredentialsError "test_request_error_failed_retry" + "test_update_error" ]; disabledTestPaths = [ "examples/" ]; From 4e370c502055d63f8db5702395caea1a271e78c5 Mon Sep 17 00:00:00 2001 From: legendofmiracles Date: Sat, 7 Aug 2021 09:51:14 -0600 Subject: [PATCH 098/120] rpg-cli: 0.5.0 -> 0.6.0 --- pkgs/games/rpg-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/rpg-cli/default.nix b/pkgs/games/rpg-cli/default.nix index 44e35c3787d7..602bdb1ee31b 100644 --- a/pkgs/games/rpg-cli/default.nix +++ b/pkgs/games/rpg-cli/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rpg-cli"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "facundoolano"; repo = pname; rev = version; - sha256 = "sha256-LRTHnYxjPraVISAERT6XJGKIA3YJIilgEwU6olq2CRc="; + sha256 = "sha256-R0Yaxe7Z1gPH0pvfytl5lOJKDZi4hN/upY/baMLc3Aw="; }; - cargoSha256 = "sha256-ZlQy/JiYKDKPCEWrAFvKV6WsAkk2zsPpfJADB+kPyuo="; + cargoSha256 = "sha256-pvhZlj1uy5DZV+RBnqkUlVQPdQqGhh0YLE9aGFS3s1g="; # tests assume the authors macbook, and thus fail doCheck = false; From c121c5f295452185982c7604c8e41060c84946d3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Aug 2021 15:59:27 +0000 Subject: [PATCH 099/120] eksctl: 0.59.0 -> 0.60.0 --- pkgs/tools/admin/eksctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index f7cc0cb8fcae..a51d33735b77 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "eksctl"; - version = "0.59.0"; + version = "0.60.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-qSZos1BO48Z5aiay8B/9DFGPgAOC8ib7IRjlFhzFh5Y="; + sha256 = "sha256-zRwdluwVi4hbDZGlRwhNWkeq05c2VTZ52KrxvyFIBio="; }; vendorSha256 = "sha256-mapok/c3uh7xmLZnN5S9zavgxSOfytqtqxBScv4Ao8w="; From 5e03f9e8e0c41ac1c4a8ad3b0078663e504ef82a Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 7 Aug 2021 12:51:33 -0300 Subject: [PATCH 100/120] gftp: move/reclassify it to applications --- pkgs/{tools => applications}/networking/gftp/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{tools => applications}/networking/gftp/default.nix (100%) diff --git a/pkgs/tools/networking/gftp/default.nix b/pkgs/applications/networking/gftp/default.nix similarity index 100% rename from pkgs/tools/networking/gftp/default.nix rename to pkgs/applications/networking/gftp/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 298c197e175b..4dc2ff145366 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5147,7 +5147,7 @@ in gexiv2 = callPackage ../development/libraries/gexiv2 { }; - gftp = callPackage ../tools/networking/gftp { }; + gftp = callPackage ../applications/networking/gftp { }; gfbgraph = callPackage ../development/libraries/gfbgraph { }; From 3f0a4b814e172a3efa0c8afcdae912214165e50d Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 7 Aug 2021 13:34:54 -0300 Subject: [PATCH 101/120] gftp: 2.0.19 -> 2.7.0b --- pkgs/applications/networking/gftp/default.nix | 61 ++++++++++++++----- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 49 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/networking/gftp/default.nix b/pkgs/applications/networking/gftp/default.nix index ab956a45b492..947a75d0e2d2 100644 --- a/pkgs/applications/networking/gftp/default.nix +++ b/pkgs/applications/networking/gftp/default.nix @@ -1,25 +1,56 @@ -{ lib, stdenv, fetchurl, gtk2, readline, ncurses, gettext, openssl, pkg-config }: +{ lib +, stdenv +, fetchFromGitHub +, autoconf +, automake +, gettext +, gtk +, intltool +, libtool +, ncurses +, openssl +, pkg-config +, readline +}: stdenv.mkDerivation rec { pname = "gftp"; - version = "2.0.19"; + version = "2.7.0b"; - src = fetchurl { - url = "https://www.gftp.org/gftp-${version}.tar.bz2"; - sha256 = "1z8b26n23k0sjbxgrix646b06cnpndpq7cbcj0ilsvvdx5ms81jk"; + src = fetchFromGitHub { + owner = "masneyb"; + repo = pname; + rev = version; + hash = "sha256-cIB3SneYKavgdI8eTtM1qsOrBJJ0c7/3CEvNPishNog="; }; - postPatch = '' - sed -i -e '//d' lib/pty.c + nativeBuildInputs = [ + autoconf + automake + gettext + intltool + libtool + pkg-config + ]; + buildInputs = [ + gtk + ncurses + openssl + readline + ]; + + hardeningDisable = [ "format" ]; + + preConfigure = '' + ./autogen.sh ''; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 readline ncurses gettext openssl ]; - - meta = { - description = "GTK-based FTP client"; - homepage = "http://www.gftp.org"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; + meta = with lib; { + homepage = "https://github.com/masneyb/gftp"; + description = "GTK-based multithreaded FTP client for *nix-based machines"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; }; } +# TODO: report the hardeningDisable to upstream diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4dc2ff145366..69ec4d8ca8d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5147,7 +5147,9 @@ in gexiv2 = callPackage ../development/libraries/gexiv2 { }; - gftp = callPackage ../applications/networking/gftp { }; + gftp = callPackage ../applications/networking/gftp { + gtk = gtk2; + }; gfbgraph = callPackage ../development/libraries/gfbgraph { }; From c0976faff9e2a8f10bb19c09c2eaace6d83abce4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Aug 2021 14:13:33 +0200 Subject: [PATCH 102/120] python3Packages.asyncio-dgram: 2.0.0 -> 2.1.0 --- pkgs/development/python-modules/asyncio-dgram/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asyncio-dgram/default.nix b/pkgs/development/python-modules/asyncio-dgram/default.nix index b5ae2b4baf8d..b06af4d2bbe0 100644 --- a/pkgs/development/python-modules/asyncio-dgram/default.nix +++ b/pkgs/development/python-modules/asyncio-dgram/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "asyncio-dgram"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "jsbronder"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EL3iOoCfLAtfdMI1J2XMf4izOEo9+a+0PNQs+4HuEfo="; + sha256 = "1ibyphncb3d8vrs3yk8j6l1smmnibizx9k1vir2njhi09r57h9mx"; }; # OSError: AF_UNIX path too long @@ -26,6 +26,7 @@ buildPythonPackage rec { ]; disabledTests = [ "test_protocol_pause_resume" ]; + pythonImportsCheck = [ "asyncio_dgram" ]; meta = with lib; { From 4a8b300253796b63782484b413869afa02bc46fe Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Fri, 6 Aug 2021 13:22:02 -0400 Subject: [PATCH 103/120] python3Packages.envisage: unbreak package by adding setuptools dependency --- pkgs/development/python-modules/envisage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/envisage/default.nix b/pkgs/development/python-modules/envisage/default.nix index f53184a8166c..b1c5170100b1 100644 --- a/pkgs/development/python-modules/envisage/default.nix +++ b/pkgs/development/python-modules/envisage/default.nix @@ -1,7 +1,7 @@ { lib, fetchPypi, isPy27 , buildPythonPackage , traits, apptools, pytestCheckHook -, ipykernel, ipython +, ipykernel, ipython, setuptools }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "0zrxlq4v3091727vf10ngc8418sp26raxa8q83i4h0sydfkh2dic"; }; - propagatedBuildInputs = [ traits apptools ]; + propagatedBuildInputs = [ traits apptools setuptools ]; preCheck = '' export HOME=$PWD/HOME From 7844ff7afbd52191c6d2e212929461eca63fe307 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sat, 7 Aug 2021 19:23:44 +0200 Subject: [PATCH 104/120] mu: 1.6.1 -> 1.6.2 --- pkgs/tools/networking/mu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index b6fce962d751..e224cc33a03c 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "mu"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; rev = version; - sha256 = "7mSP1F2RxW0CEDRWbMzDRfoehrr24b11sCLM2gQFjuI="; + sha256 = "EYERtDYIf0aw9nMLFZPGZ5s1i+erSq9H3tP29KwCAgQ="; }; postPatch = lib.optionalString (batchSize != null) '' From 3886eed32cbfae19d04f4b5f63cc4047092eef9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 7 Aug 2021 20:19:08 +0200 Subject: [PATCH 105/120] python39Packages.pytest-mockservers: move pytest to buildInputs --- .../python-modules/pytest-mockservers/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pytest-mockservers/default.nix b/pkgs/development/python-modules/pytest-mockservers/default.nix index 6de88632027f..4022befcb14d 100644 --- a/pkgs/development/python-modules/pytest-mockservers/default.nix +++ b/pkgs/development/python-modules/pytest-mockservers/default.nix @@ -31,9 +31,12 @@ buildPythonPackage rec { poetry-core ]; + buildInputs = [ + pytest + ]; + propagatedBuildInputs = [ aiohttp - pytest pytest-asyncio ]; From 8eca45322c658321224d9dc58e19b701a2ba8b7c Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Fri, 6 Aug 2021 20:33:24 +0530 Subject: [PATCH 106/120] gajim: Add dependency on libappindicator-gtk3 This is required by "Ayatana Appindicator integration" plugin which provides appindicator support to Gajim --- .../networking/instant-messengers/gajim/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 74a4ab968c9c..ced3dcf5fe48 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -15,6 +15,7 @@ , enableSpelling ? true, gspell , enableUPnP ? true, gupnp-igd , enableOmemoPluginDependencies ? true +, enableAppIndicator ? true, libappindicator-gtk3 , extraPythonPackages ? ps: [] }: @@ -33,7 +34,8 @@ python3.pkgs.buildPythonApplication rec { ] ++ lib.optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-good libnice ] ++ lib.optional enableSecrets libsecret ++ lib.optional enableSpelling gspell - ++ lib.optional enableUPnP gupnp-igd; + ++ lib.optional enableUPnP gupnp-igd + ++ lib.optional enableAppIndicator libappindicator-gtk3; nativeBuildInputs = [ gettext wrapGAppsHook From a537bad8a15f5d81e0d86bb4c5c3310295dd7cfc Mon Sep 17 00:00:00 2001 From: Benjamin Tan Date: Sat, 7 Aug 2021 23:50:22 +0800 Subject: [PATCH 107/120] neovim: build with luajit on `aarch64-linux` https://github.com/NixOS/nixpkgs/pull/129543 disabled building neovim with luajit on all `aarch64` platforms, however, building neovim with luajit on `aarch64-linux` builds successfully, and avoids various issues I encountered with some Lua-based plugins. --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5eb3e231342e..2e657df3b042 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27907,7 +27907,7 @@ in wrapNeovimUnstable = callPackage ../applications/editors/neovim/wrapper.nix { }; wrapNeovim = neovim-unwrapped: lib.makeOverridable (neovimUtils.legacyWrapper neovim-unwrapped); neovim-unwrapped = callPackage ../applications/editors/neovim { - # neovim doesn't build with luajit on aarch64: + # neovim doesn't build with luajit on aarch64-darwin : # ./luarocks init # PANIC: unprotected error in call to Lua API (module 'luarocks.core.hardcoded' not found: # no field package.preload['luarocks.core.hardcoded'] @@ -27931,7 +27931,7 @@ in # See https://github.com/NixOS/nixpkgs/issues/129099 # Possibly related: https://github.com/neovim/neovim/issues/7879 lua = - if stdenv.isAarch64 then lua5_1 else + if (stdenv.isDarwin && stdenv.isAarch64) then lua5_1 else luajit; }; From c6b0678d18fb7753366e6586f5cf9aeec2d3e61c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 24 May 2021 23:00:54 +0000 Subject: [PATCH 108/120] mcelog: 175 -> 178 --- pkgs/os-specific/linux/mcelog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index b20632be334c..85e4065e90a4 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mcelog"; - version = "175"; + version = "178"; src = fetchFromGitHub { owner = "andikleen"; repo = "mcelog"; rev = "v${version}"; - sha256 = "sha256-Xzbck/nRdTR9H5o2XVFlFdNLz2ve65KEcefKAKe0eW8="; + sha256 = "sha256-++R/R3oRw0O0MoDnASdVr9UIiI0yS4UcIO8nV62PLzE="; }; postPatch = '' @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { errors are logged to /var/log/mcelog or syslog or the journal. ''; homepage = "http://mcelog.org/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } From 06667df72b73dd4a9b7351bc49bc9f7b654711ce Mon Sep 17 00:00:00 2001 From: Rouven Czerwinski Date: Sat, 7 Aug 2021 20:56:21 +0200 Subject: [PATCH 109/120] nixos/etc: use runCommandLocal (#133037) Instead of setting preferLocalBuild & allowSubstitutes explicitly, use runCommandLocal which sets the same options. --- nixos/modules/system/etc/etc.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/nixos/modules/system/etc/etc.nix b/nixos/modules/system/etc/etc.nix index 183de7292101..6971ab42d99f 100644 --- a/nixos/modules/system/etc/etc.nix +++ b/nixos/modules/system/etc/etc.nix @@ -8,10 +8,7 @@ let etc' = filter (f: f.enable) (attrValues config.environment.etc); - etc = pkgs.runCommand "etc" { - preferLocalBuild = true; - allowSubstitutes = false; - + etc = pkgs.runCommandLocal "etc" { # This is needed for the systemd module passthru.targets = map (x: x.target) etc'; } /* sh */ '' From c97e7e13806d75d471d1fe3759333f70ba66a51a Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Sat, 7 Aug 2021 15:39:26 -0400 Subject: [PATCH 110/120] tailscale: 1.12.2 -> 1.12.3 --- pkgs/servers/tailscale/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index c642784af922..4e0d3d0b701f 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "tailscale"; - version = "1.12.2"; + version = "1.12.3"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "sha256-wbww6pYq2ATRRmeUAzFDGKzLk6MNYyGp6QKf8ybeaTc="; + sha256 = "sha256-jjxO35PaxEI9n0qsawTPt3mHNC0PjWfmEA4NkIAwyTY="; }; nativeBuildInputs = [ makeWrapper ]; CGO_ENABLED = 0; - vendorSha256 = "sha256-NIf5nyUXZY5UGFcdjeeFZdGKVcD2pve+PytziCD2NFk="; + vendorSha256 = "sha256-2MPenTV0fgvXbf8WkoPd9uApPSDLPyHtCq9o3CHB/D0="; doCheck = false; From 038a01feeab7195e4291bc752620338cc47a670c Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 7 Aug 2021 19:54:14 +0000 Subject: [PATCH 111/120] opentx: fix licence --- pkgs/applications/misc/opentx/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix index dc36fffe8462..d220d5fa2fa1 100644 --- a/pkgs/applications/misc/opentx/default.nix +++ b/pkgs/applications/misc/opentx/default.nix @@ -44,7 +44,7 @@ mkDerivation rec { running radio simulators. ''; homepage = "https://www.open-tx.org/"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; maintainers = with maintainers; [ elitak lopsided98 ]; }; From a9f116715b80329c21657e91fe8eb2464a9d1533 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 7 Aug 2021 20:23:24 +0200 Subject: [PATCH 112/120] python39Packages.pytest-resource-path: move pytest to buildInputs, remove pytest-runner --- .../python-modules/pytest-resource-path/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pytest-resource-path/default.nix b/pkgs/development/python-modules/pytest-resource-path/default.nix index a0517ee20aa8..7476801794c3 100644 --- a/pkgs/development/python-modules/pytest-resource-path/default.nix +++ b/pkgs/development/python-modules/pytest-resource-path/default.nix @@ -3,7 +3,6 @@ , pythonOlder , fetchFromGitHub , colorama -, pytest-runner , pytest , pytestCheckHook }: @@ -20,13 +19,17 @@ buildPythonPackage rec { sha256 = "1siv3pk4fsabz254fdzr7c0pxy124habnbw4ym66pfk883fr96g2"; }; - nativeBuildInputs = [ - pytest-runner + postPatch = '' + substituteInPlace setup.cfg \ + --replace "pytest-runner" "" + ''; + + buildInputs = [ + pytest ]; propagatedBuildInputs = [ colorama - pytest ]; checkInputs = [ From ae43a849a9852904e8e4b421953179ca4d0260aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 7 Aug 2021 20:23:40 +0200 Subject: [PATCH 113/120] python39Packages.roonapi: remove unused input --- pkgs/development/python-modules/roonapi/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/roonapi/default.nix b/pkgs/development/python-modules/roonapi/default.nix index aded311feab0..ccc5749387b1 100644 --- a/pkgs/development/python-modules/roonapi/default.nix +++ b/pkgs/development/python-modules/roonapi/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , ifaddr , poetry-core , pythonOlder From 8e139f0750587f96adb9048598df3356c59f3336 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 7 Aug 2021 23:14:51 +0300 Subject: [PATCH 114/120] weather-icons: 2.0.10 -> 2.0.12 --- pkgs/data/fonts/weather-icons/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/weather-icons/default.nix b/pkgs/data/fonts/weather-icons/default.nix index cf45152178ec..5108376c735d 100644 --- a/pkgs/data/fonts/weather-icons/default.nix +++ b/pkgs/data/fonts/weather-icons/default.nix @@ -1,11 +1,11 @@ { lib, fetchzip }: let - version = "2.0.10"; + version = "2.0.12"; in fetchzip { name = "weather-icons-${version}"; - url = "https://github.com/erikflowers/weather-icons/archive/${version}.zip"; + url = "https://github.com/erikflowers/weather-icons/archive/refs/tags/${version}.zip"; postFetch = '' mkdir -p $out/share/fonts From adfd9f5cc94d3e4744216373426696767baf6ef9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 7 Aug 2021 22:49:29 +0200 Subject: [PATCH 115/120] kdsoap: format --- pkgs/development/libraries/kdsoap/default.nix | 44 +++++++++++-------- 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/pkgs/development/libraries/kdsoap/default.nix b/pkgs/development/libraries/kdsoap/default.nix index 26d684004b6f..0d3c20651c75 100644 --- a/pkgs/development/libraries/kdsoap/default.nix +++ b/pkgs/development/libraries/kdsoap/default.nix @@ -1,4 +1,6 @@ -{ mkDerivation, lib, fetchurl +{ mkDerivation +, lib +, fetchurl , cmake , qtbase }: @@ -6,7 +8,27 @@ mkDerivation rec { pname = "kdsoap"; version = "2.0.0"; - meta = { + + src = fetchurl { + url = "https://github.com/KDAB/KDSoap/releases/download/kdsoap-${version}/kdsoap-${version}.tar.gz"; + sha256 = "sha256-0YljEE+m99ArBEYxzdvnjxj3DgbGB69oDHrOBNbPBO4="; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ qtbase ]; + + postInstall = '' + moveToOutput bin/kdwsdl2cpp "$dev" + sed -i "$out/lib/cmake/KDSoap/KDSoapTargets.cmake" \ + -e "/^ INTERFACE_INCLUDE_DIRECTORIES/ c INTERFACE_INCLUDE_DIRECTORIES \"$dev/include\"" + sed -i "$out/lib/cmake/KDSoap/KDSoapTargets-release.cmake" \ + -e "s@$out/bin@$dev/bin@" + ''; + + meta = with lib; { description = "A Qt-based client-side and server-side SOAP component"; longDescription = '' KD Soap is a Qt-based client-side and server-side SOAP component. @@ -15,21 +37,7 @@ mkDerivation rec { provides the means to create web services without the need for any further component such as a dedicated web server. ''; - license = with lib.licenses; [ gpl2 gpl3 lgpl21 ]; - maintainers = [ lib.maintainers.ttuegel ]; + license = with licenses; [ gpl2 gpl3 lgpl21 ]; + maintainers = [ maintainers.ttuegel ]; }; - src = fetchurl { - url = "https://github.com/KDAB/KDSoap/releases/download/kdsoap-${version}/kdsoap-${version}.tar.gz"; - sha256 = "sha256-0YljEE+m99ArBEYxzdvnjxj3DgbGB69oDHrOBNbPBO4="; - }; - outputs = [ "out" "dev" ]; - nativeBuildInputs = [ cmake ]; - buildInputs = [ qtbase ]; - postInstall = '' - moveToOutput bin/kdwsdl2cpp "$dev" - sed -i "$out/lib/cmake/KDSoap/KDSoapTargets.cmake" \ - -e "/^ INTERFACE_INCLUDE_DIRECTORIES/ c INTERFACE_INCLUDE_DIRECTORIES \"$dev/include\"" - sed -i "$out/lib/cmake/KDSoap/KDSoapTargets-release.cmake" \ - -e "s@$out/bin@$dev/bin@" - ''; } From 07f30b4b132fb91eeb66822f4cc657cdf291c0b1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Aug 2021 21:11:53 +0000 Subject: [PATCH 116/120] frostwire-bin: 6.8.9 -> 6.9.4 --- pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix index 2991550defcd..017525142881 100644 --- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix +++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix @@ -3,12 +3,12 @@ with lib; stdenv.mkDerivation rec { - version = "6.8.9"; + version = "6.9.4"; pname = "frostwire"; src = fetchurl { url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.amd64.tar.gz"; - sha256 = "0f5vyliwncryj6hj5xx0dycxycxddsn28n6zixjrn56jajijyl6q"; + sha256 = "sha256-sWvQDUJGytKA9/UbC7fOk6WhDtTqdhyRmW9GvHFMZh4="; }; nativeBuildInputs = [ makeWrapper ]; From 4925f5367eda85059f96eb5fb02f43d410cf1c15 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 8 Aug 2021 01:06:07 +0300 Subject: [PATCH 117/120] weather-icons: forgot to update sha256 --- pkgs/data/fonts/weather-icons/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/fonts/weather-icons/default.nix b/pkgs/data/fonts/weather-icons/default.nix index 5108376c735d..a979dca44774 100644 --- a/pkgs/data/fonts/weather-icons/default.nix +++ b/pkgs/data/fonts/weather-icons/default.nix @@ -6,13 +6,13 @@ in fetchzip { name = "weather-icons-${version}"; url = "https://github.com/erikflowers/weather-icons/archive/refs/tags/${version}.zip"; + sha256 = "sha256-NGPzAloeZa1nCazb+mjAbYw7ZYYDoKpLwcvzg1Ly9oM="; postFetch = '' mkdir -p $out/share/fonts unzip -j $downloadedFile weather-icons-${version}/_docs/font-source/weathericons-regular.otf -d $out/share/fonts/opentype ''; - sha256 = "10zny9987wybq55sm803hrjkp33dq1lgmnxc15kssr8yb81g6qrl"; meta = with lib; { description = "Weather Icons"; From 0dcffb7b0f456cd00d5bc6d294996205d255e01e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Aug 2021 22:41:04 +0000 Subject: [PATCH 118/120] flexibee: 2020.2.6 -> 2021.2.1 --- pkgs/applications/office/flexibee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/flexibee/default.nix b/pkgs/applications/office/flexibee/default.nix index 9dbdae3f0206..97edd9e1fa2e 100644 --- a/pkgs/applications/office/flexibee/default.nix +++ b/pkgs/applications/office/flexibee/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, makeWrapper, jre }: let - version = "2020.2.6"; + version = "2021.2.1"; majorVersion = builtins.substring 0 6 version; in @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.flexibee.eu/download/${majorVersion}/${version}/${pname}-${version}.tar.gz"; - sha256 = "0vscz24sabk9xafywnx41rqhq6300ddsw1x95ibc7ghsgbkq80ja"; + sha256 = "sha256-WorRyfjWucV8UhAjvuW+22CRzPcz5tjXF7Has4wrLMI="; }; nativeBuildInputs = [ makeWrapper ]; From ddce0ec126f1c92504761bd8ece98548a40aa44f Mon Sep 17 00:00:00 2001 From: matthewcroughan Date: Sat, 7 Aug 2021 23:40:36 +0100 Subject: [PATCH 119/120] lynx: add patch for CVE-2021-38165 Co-authored-by: nixinator <33lockdown33@protonmail.com> Co-authored-by: John Bargman Co-authored-by: Martin Weinelt --- pkgs/applications/networking/browsers/lynx/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix index 713f934f7789..40feaebd72cc 100644 --- a/pkgs/applications/networking/browsers/lynx/default.nix +++ b/pkgs/applications/networking/browsers/lynx/default.nix @@ -2,6 +2,7 @@ , fetchurl, pkg-config, ncurses, gzip , sslSupport ? true, openssl ? null , nukeReferences +, fetchpatch }: assert sslSupport -> openssl != null; @@ -22,6 +23,14 @@ stdenv.mkDerivation rec { hardeningEnable = [ "pie" ]; + patches = [ + (fetchpatch { + name = "CVE-2021-38165.patch"; + url = "https://git.alpinelinux.org/aports/plain/main/lynx/CVE-2021-38165.patch?id=3400945dbbb8a87065360963e4caa0e17d3dcc61"; + sha256 = "1aykb9y2g2vdpbbpvjlm4r40x7py2yv6jbywwcqcxrlciqcw4x57"; + }) + ]; + configureFlags = [ "--enable-default-colors" "--enable-widec" From 45f3eea9224ea71176526db7dc0c858e9e4b31f5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Aug 2021 17:05:24 -0700 Subject: [PATCH 120/120] angband: 4.2.2 -> 4.2.3 (#132372) Co-authored-by: Artturi --- pkgs/games/angband/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/angband/default.nix b/pkgs/games/angband/default.nix index e14629dce8fc..ed18624deb12 100644 --- a/pkgs/games/angband/default.nix +++ b/pkgs/games/angband/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "angband"; - version = "4.2.2"; + version = "4.2.3"; src = fetchFromGitHub { owner = "angband"; repo = "angband"; rev = version; - sha256 = "sha256-z1HTt3+lWIr2F9YZFdw47lkYVgYl17qbb/OJ9YyYQa8="; + sha256 = "sha256-SFHAG74qJcV3E+jxPcOH2moW/kXhpwUwbGZVkNxqWd8="; }; nativeBuildInputs = [ autoreconfHook ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installFlags = [ "bindir=$(out)/bin" ]; meta = with lib; { - homepage = "http://rephial.org/"; + homepage = "https://angband.github.io/angband"; description = "A single-player roguelike dungeon exploration game"; maintainers = [ maintainers.chattered ]; license = licenses.gpl2;