From 4395aa32b3699acd73b9a579578dc653b8500444 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 19 Aug 2021 18:56:01 +0000 Subject: [PATCH 01/42] toxic: 0.10.1 -> 0.11.1 --- .../networking/instant-messengers/toxic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index fc6c78a4f673..3082748a3518 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "toxic"; - version = "0.10.1"; + version = "0.11.1"; src = fetchFromGitHub { owner = "Tox"; repo = "toxic"; rev = "v${version}"; - sha256 = "sha256-EElDi/VEYgYPpoDNatxcKQC1pnCU8kOcj0bAFojD9fU="; + sha256 = "sha256-5jLXXI+IMrYa7ZtdMjJrah1zB5TJ3GdHfvcMd1TYE4E="; }; makeFlags = [ "PREFIX=$(out)"]; From 79bab74f0ec63353f694a6bb7e2faa5630926dbf Mon Sep 17 00:00:00 2001 From: Roland Gritzer Date: Mon, 23 Aug 2021 15:50:43 +0200 Subject: [PATCH 02/42] bitwig-studio: fix gtk file dialog Fixes: #133554 GTK file dialog was broken in 4.0.1 --- pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix index 492054396702..447bc7d6635d 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { -not -name '*.so.*' \ -not -name '*.so' \ -not -name '*.jar' \ + -not -name 'jspawnhelper' \ -not -path '*/resources/*' | \ while IFS= read -r f ; do patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" $f @@ -58,6 +59,10 @@ stdenv.mkDerivation rec { --suffix LD_LIBRARY_PATH : "${lib.strings.makeLibraryPath buildInputs}" done + find $out -type f -executable -name 'jspawnhelper' | \ + while IFS= read -r f ; do + patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" $f + done ''; meta = with lib; { From 07d6a1a78c7d0833c05d140866708b076a60697e Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Fri, 27 Aug 2021 08:20:53 -0400 Subject: [PATCH 03/42] eclipses: 2021-03 -> 2021-06 --- pkgs/applications/editors/eclipse/default.nix | 22 +++++++++---------- pkgs/applications/editors/eclipse/plugins.nix | 6 ++--- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 000726dd81aa..dc19191d769a 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -16,10 +16,10 @@ assert stdenv ? glibc; let platform_major = "4"; - platform_minor = "19"; + platform_minor = "20"; year = "2021"; - month = "03"; - timestamp = "${year}${month}031800"; + month = "06"; + timestamp = "${year}${month}111600"; gtk = gtk3; in rec { @@ -37,7 +37,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "3j0lmll0glcr9p0hf49jiaq9xr8hadsy0y58wbbkdpldj3rclxr056dkswmiw2bkypfiwrjygbli5qxyp6mz380562hc2kjwijqq476"; + sha512 = "3ggqiwa1nfszdqzdzw1lzs1sdikkvh2fqq10bqjxsq7xdxkis4zix8g4jcjiwlsz5gz98s61gp0k4m5rqsj0krpklxs9ijwq76khc7z"; }; }; @@ -49,7 +49,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "0iqz9a3ixcbmaci6lnspdnzwd2h1fcygi54hmsl89pq3d1k5scyhcl123ixi24csi782w847bn0lq00n0zwras9akmnhsflra4mw5pz"; + sha512 = "38cdhy6v8jmndanvl3bimfs3pnlnl3w066fqrljy2hwki58gqmxxmbld5mphbh9y5kz9b5kiqvhx06sf0l2ywbarxy9wfhynvzb2k17"; }; }; @@ -61,7 +61,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz"; - sha512 = "03v1ly7j9d9qnl3d9rl5a9kp483dz8i8v3cfnh55ksm9fk8iy2fzg6wq178ggnx2z5x9k88a4wk6n647yilh2hgc2l7926imkh2j1ly"; + sha512 = "2chshmn09xdq42nix0jqryhac33xc5sg7nlp2vfmz5km6q4m6mc1k7pw10jmg86zzcvcsdl9k1wkrbcsj5y2gv4cg6rddzsbx9hw3s7"; }; }; @@ -86,7 +86,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz"; - sha512 = "37m91my121pch12bwpwk5svfqkm7vl07wjx4fkhpy947v5kjf36hm6x0i45swdg7f0hk72y2qz5ka15ki5jv890qy5psj6z7ax9sys7"; + sha512 = "308sszkmp5lkva5hfb1qc5cy9b1wajas96xz5nwjl7dm2fn4saiwg3ifh71hzq59wf337hndlb2c2dp6yczsfp3mzfqmsi5a3z7dchr"; }; }; @@ -98,7 +98,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "3qrnj6krhrqc9rfwlim3v7kshwfhsi050pszw6xdfbj56mzr9whr7l76isbpxd5j0zipgfw3qrzrx379pdp899d35fv284ilvllzl4k"; + sha512 = "1wp3g85bsmv0mbpk76adsz1rzd3vbdn4y4ddv9z41bq96wi9npmybidckvwnrq57lbj8k5g8m0x0f1nhj2rv5bqbsnqjxjpknwa6is0"; }; }; @@ -110,7 +110,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-jee-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "04k4x9imabxddqlrgajn33ak8i58wcap40ll09xz23d1sxn9a8prh01s06ymgwg6ldg939srphvbz4112p8p0b1hl7m25a02qll91zv"; + sha512 = "35v8kjpdlhbcxncqygx7c1kjqy1644c6rhrasg8gxnrhlc69zblf4nvgzf1894vd13qzpkzzxx0qll49933prnw98dqkrd0wxcx7f49"; }; }; @@ -122,7 +122,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "2yksl3w7yr1a3h4zdpa9zf394r5c185zqxhigdv858ldg46kmr9h0l2c7shbgb16kkybcnrk4x44dhjvh60x8xw6ma05klp4lp9v5va"; + sha512 = "1jj5h69d4814j1mq6fjd47vkswq7bshbh2flgzmn8ibs0ys67x0nd2lm2ksxmvnipj4j9rw3mh9fmw8m0dzpp41c6q8xxfa93c7pqyg"; }; }; @@ -134,7 +134,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rcp-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "3fhrhwbyqcys56c93s1vl9rbvn269nn5y3cb9f3n1qwgw6i97mim2zy98jl3r8cksf97jwsmqmsqclsgz9v799wcckv81dj1l628382"; + sha512 = "19fr63bdifxqp6imgb4d7v5dnkn9i0n2wmr08xzb0ph425ib936jiw84c2nwnsfnljh0yfj1r3wd36y2nn52fsj6ginl8plc6pi5416"; }; }; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 5937311b5c93..839b079ce7b7 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -248,12 +248,12 @@ rec { cdt = buildEclipseUpdateSite rec { name = "cdt-${version}"; # find current version at https://www.eclipse.org/cdt/downloads.php - version = "10.2.0"; + version = "10.3.2"; src = fetchzip { stripRoot = false; - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/10.2/${name}/${name}.zip"; - sha256 = "1r30cbpbzw3dfcsn54p6sqip86dqhydhsppjgaz60b6z138vzx49"; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/${lib.versions.majorMinor version}/${name}/${name}.zip"; + sha256 = "0zrxgb8mkrzc1zm5225hzn8awj9yl5fd2dcr92692g0yg61nv4jd"; }; meta = with lib; { From e6e71a137de448e43c2a3e680e0cabb75e648fa4 Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Mon, 30 Aug 2021 23:11:17 +0300 Subject: [PATCH 04/42] gradle: 7.1.1 -> 7.2 --- pkgs/development/tools/build-managers/gradle/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index cdcae79dde1e..5e2ef7ef9442 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -66,9 +66,9 @@ rec { gradle_latest = gradle_7; gradle_7 = gradleGen (gradleSpec { - version = "7.1.1"; - nativeVersion = "0.22-milestone-16"; - sha256 = "0p9nss2xywwhjbpdcyma3d0ijvkav9hzmldpkcp447ch92cqd2xz"; + version = "7.2"; + nativeVersion = "0.22-milestone-21"; + sha256 = "1pg6w5czysywsgdvmll5bwd2p6y99cn5sn3gw69cps9mkjd710gm"; }); gradle_6_8 = gradleGen (gradleSpec { From 2a54e05c1cfeea0d765615a2484717f8d54a7a54 Mon Sep 17 00:00:00 2001 From: Emmanuel Rosa Date: Wed, 1 Sep 2021 09:42:02 +0700 Subject: [PATCH 05/42] bisq-desktop: 1.7.2 -> 1.7.3 --- pkgs/applications/blockchains/bisq-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/bisq-desktop/default.nix b/pkgs/applications/blockchains/bisq-desktop/default.nix index 16bcc71653bd..832c453ce7cc 100644 --- a/pkgs/applications/blockchains/bisq-desktop/default.nix +++ b/pkgs/applications/blockchains/bisq-desktop/default.nix @@ -35,11 +35,11 @@ let in stdenv.mkDerivation rec { pname = "bisq-desktop"; - version = "1.7.2"; + version = "1.7.3"; src = fetchurl { url = "https://github.com/bisq-network/bisq/releases/download/v${version}/Bisq-64bit-${version}.deb"; - sha256 = "0b2rh9sphc9wffkawprrl20frgv0rah7y2k5sfxpjc3shgkqsw80"; + sha256 = "1q250lj0ig6aqd1dfc335z8pjj7qa7l75kws6d78k3wchzmk7jrk"; }; nativeBuildInputs = [ makeWrapper copyDesktopItems imagemagick dpkg gnutar zip xz ]; From 3ca47430513672fc42f1bb9f85bfecdb1618df05 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 13 Sep 2021 02:01:45 +0000 Subject: [PATCH 06/42] python38Packages.bitarray: 2.3.3 -> 2.3.4 --- pkgs/development/python-modules/bitarray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index ad20467f162d..43cc2dbd5bce 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "bitarray"; - version = "2.3.3"; + version = "2.3.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Dt9jCkRxpIYnrsC4QM87jhCQEZHTKPZRFWBCBFneKC4="; + sha256 = "f19c62425576d3d1821ed711b94d1a4e5ede8f05ca121e99b6d978ed49c7a765"; }; checkPhase = '' From 4c30cd112cce47cace1ac424072ef360c35a3349 Mon Sep 17 00:00:00 2001 From: Vanilla Date: Mon, 13 Sep 2021 13:50:34 +0800 Subject: [PATCH 07/42] vscode-extensions.tobiasalthoff.atom-material-theme: init at 1.10.7 --- pkgs/misc/vscode-extensions/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index c65307e50644..9eb66c41a896 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1362,6 +1362,18 @@ let }; }; + tobiasalthoff.atom-material-theme = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "atom-material-theme"; + publisher = "tobiasalthoff"; + version = "1.10.7"; + sha256 = "sha256-t5CKrDEbDCuo28wN+hiWrvkt3C9vQAPfV/nd3QBGQ/s="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + tomoki1207.pdf = buildVscodeMarketplaceExtension { mktplcRef = { name = "pdf"; From 34d91e675bfac9cfed653b88ae3093357bd6d59f Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Mon, 13 Sep 2021 13:56:04 +0200 Subject: [PATCH 08/42] ntttcp: init at 1.4.0 --- pkgs/tools/networking/ntttcp/default.nix | 30 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/networking/ntttcp/default.nix diff --git a/pkgs/tools/networking/ntttcp/default.nix b/pkgs/tools/networking/ntttcp/default.nix new file mode 100644 index 000000000000..662e4d32fb72 --- /dev/null +++ b/pkgs/tools/networking/ntttcp/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "ntttcp"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "ntttcp-for-linux"; + rev = version; + sha256 = "sha256-6O7qSrR6EFr7k9lHQHGs/scZxJJ5DBNDxlSL5hzlRf4="; + }; + + preBuild = "cd src"; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp ntttcp $out/bin + runHook postInstall + ''; + + meta = with lib; { + description = "A Linux network throughput multiple-thread benchmark tool"; + homepage = "https://github.com/microsoft/ntttcp-for-linux"; + license = licenses.mit; + maintainers = with maintainers; [ delroth ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ada782c58b3d..fb96956c83a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7683,6 +7683,8 @@ with pkgs; nttcp = callPackage ../tools/networking/nttcp { }; + ntttcp = callPackage ../tools/networking/ntttcp { }; + nuttcp = callPackage ../tools/networking/nuttcp { }; nssmdns = callPackage ../tools/networking/nss-mdns { }; From ab13dc4381e6fd6430a5d33cf71fae66f458dc5a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 13 Sep 2021 20:35:10 +0000 Subject: [PATCH 09/42] vnstat: 2.7 -> 2.8 --- pkgs/applications/networking/vnstat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix index f85f00bf0ae0..77812f88ad17 100644 --- a/pkgs/applications/networking/vnstat/default.nix +++ b/pkgs/applications/networking/vnstat/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "vnstat"; - version = "2.7"; + version = "2.8"; src = fetchFromGitHub { owner = "vergoh"; repo = pname; rev = "v${version}"; - sha256 = "105krrc7hl5mbj89i1k3w8yzqrg4f0q96lmyv4rc7fhhds5zam2h"; + sha256 = "sha256-r+dmsL3bPgCDdBje7uzg+ArhMkqj+R/hepNLMDqe350="; }; postPatch = '' From 2bf7e53bc3044575fcb69a27942ed355d2ce0d1d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 13 Sep 2021 21:44:05 +0000 Subject: [PATCH 10/42] wtf: 0.38.0 -> 0.39.2 --- pkgs/applications/misc/wtf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index 30ae2d9be0f6..ea7986595f49 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/pkgs/applications/misc/wtf/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "wtf"; - version = "0.38.0"; + version = "0.39.2"; src = fetchFromGitHub { owner = "wtfutil"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZKv207pkjgXtCZ6kXGn94i8QtOBHpSkPKo1Sy2Nw9qQ="; + sha256 = "sha256-nP56HzjtIg9EIOBda9TQl8soUqlGfRmixidWrmQ7+vs="; }; - vendorSha256 = "sha256-E5sfT7uGnruVUfhhjkZM2mgauXzbmcLWS6s1J85nssE="; + vendorSha256 = "sha256-yD4BUauYvyGk/D0Gr5Z15xWPtI/ZR9xTbmeS6RAxw1o="; doCheck = false; From f3735c9dd709d5a428117f5b1baf38675b4b7bf3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 00:49:47 +0000 Subject: [PATCH 11/42] symfony-cli: 4.25.5 -> 4.26.0 --- pkgs/development/tools/symfony-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/symfony-cli/default.nix b/pkgs/development/tools/symfony-cli/default.nix index a57d666aa822..6eb4efda62bd 100644 --- a/pkgs/development/tools/symfony-cli/default.nix +++ b/pkgs/development/tools/symfony-cli/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "symfony-cli"; - version = "4.25.5"; + version = "4.26.0"; src = fetchurl { url = "https://github.com/symfony/cli/releases/download/v${version}/symfony_linux_amd64.gz"; - sha256 = "sha256-DMyW2lKuoFVEguCQQ6efXrzvujL5H7PcgI0go98M0xI="; + sha256 = "sha256-fQZKRDLc6T+YEX443k6DnarSNV3Rbc2Y34ingJik+sc="; }; dontBuild = true; From 3f5ad2d345abac18d99b1b98bfd69cef536072d2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 16:39:16 +0000 Subject: [PATCH 12/42] minify: 2.9.21 -> 2.9.22 --- pkgs/development/web/minify/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/minify/default.nix b/pkgs/development/web/minify/default.nix index 31c6ba9253bb..1c91fdef97eb 100644 --- a/pkgs/development/web/minify/default.nix +++ b/pkgs/development/web/minify/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minify"; - version = "2.9.21"; + version = "2.9.22"; src = fetchFromGitHub { owner = "tdewolff"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cHoQtvxofMet7j/PDKlFoVB9Qo5EMWcXqAwhqR4vNko="; + sha256 = "sha256-ph5PrM917qGwp7SLg6Ujfk5YJWFSlUBdW/JJRiwq7fw="; }; - vendorSha256 = "sha256-awlrjXXX9PWs4dt78yK4qNE1wCaA+tGL45tHQxxby8c="; + vendorSha256 = "sha256-0GKIGIVtMywpKxopsVrUZMgeXP/l76U2As8FiG2Niqw="; doCheck = false; From 82367d8543e8c3b703911e1a429896d54b805c84 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 14 Sep 2021 21:17:03 +0000 Subject: [PATCH 13/42] pure-prompt: 1.17.1 -> 1.17.2 --- pkgs/shells/zsh/pure-prompt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/pure-prompt/default.nix b/pkgs/shells/zsh/pure-prompt/default.nix index d5ed2641d536..527c95676fae 100644 --- a/pkgs/shells/zsh/pure-prompt/default.nix +++ b/pkgs/shells/zsh/pure-prompt/default.nix @@ -4,13 +4,13 @@ with lib; stdenv.mkDerivation rec { pname = "pure-prompt"; - version = "1.17.1"; + version = "1.17.2"; src = fetchFromGitHub { owner = "sindresorhus"; repo = "pure"; rev = "v${version}"; - sha256 = "sha256-bWp04xT+/Xhgxj1Rm0FgTkRtLH9nuSFtqBsO3B7Exvo="; + sha256 = "sha256-sk7uAYVw/9OLKi3ClBXwEEnfaiprM/gQcNJMDFGqhE0="; }; installPhase = '' From 1dc2e2aa8c3b3dd12cfc407faf1ba5c145a5599f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 15 Sep 2021 01:12:55 +0000 Subject: [PATCH 14/42] terragrunt: 0.31.7 -> 0.31.11 --- pkgs/applications/networking/cluster/terragrunt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 214d3bfe3440..ff9a79415336 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.31.7"; + version = "0.31.11"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PCBKuTJ0IbYma584qIPrxGfwOIzHszWH+bW8iy0OUvo="; + sha256 = "sha256-TBglZb0DZoHYtAL+0I+9v/a7zQ915MoNGS0GXvhgVss="; }; vendorSha256 = "sha256-y84EFmoJS4SeA5YFIVFU0iWa5NnjU5yvOj7OFE+jGN0="; From 82510b5a519a44b76ac6db84861b5fcdb989d2a2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 15 Sep 2021 01:20:06 +0000 Subject: [PATCH 15/42] the-powder-toy: 96.1.349 -> 96.2.350 --- pkgs/games/the-powder-toy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/the-powder-toy/default.nix b/pkgs/games/the-powder-toy/default.nix index 8857e3868b52..6d7b4bccc955 100644 --- a/pkgs/games/the-powder-toy/default.nix +++ b/pkgs/games/the-powder-toy/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "the-powder-toy"; - version = "96.1.349"; + version = "96.2.350"; src = fetchFromGitHub { owner = "The-Powder-Toy"; repo = "The-Powder-Toy"; rev = "v${version}"; - sha256 = "sha256-MSN81kPaH8cWZO+QEOlMUQQghs1kn8CpsKA5SUC/RX8="; + sha256 = "sha256-OAy/Hd2UksNiIfTdpA+u9NzIq1pfe8RYG3slI4/LNnM="; }; nativeBuildInputs = [ meson ninja pkg-config python3 ]; From 3b61e2c2b972505ccb77fd5e4d4c607dc1371148 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Tue, 14 Sep 2021 22:24:35 -0500 Subject: [PATCH 16/42] tree-sitter: add rydesun/tree-sitter-dot --- .../tools/parsing/tree-sitter/grammars/default.nix | 1 + .../parsing/tree-sitter/grammars/tree-sitter-dot.json | 11 +++++++++++ pkgs/development/tools/parsing/tree-sitter/update.nix | 4 ++++ 3 files changed, 16 insertions(+) create mode 100644 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index 10c551c1442a..9acd39b7448e 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -6,6 +6,7 @@ tree-sitter-comment = (builtins.fromJSON (builtins.readFile ./tree-sitter-comment.json)); tree-sitter-cpp = (builtins.fromJSON (builtins.readFile ./tree-sitter-cpp.json)); tree-sitter-css = (builtins.fromJSON (builtins.readFile ./tree-sitter-css.json)); + tree-sitter-dot = (builtins.fromJSON (builtins.readFile ./tree-sitter-dot.json)); tree-sitter-embedded-template = (builtins.fromJSON (builtins.readFile ./tree-sitter-embedded-template.json)); tree-sitter-fennel = (builtins.fromJSON (builtins.readFile ./tree-sitter-fennel.json)); tree-sitter-fish = (builtins.fromJSON (builtins.readFile ./tree-sitter-fish.json)); diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json new file mode 100644 index 000000000000..7adb92cdd601 --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json @@ -0,0 +1,11 @@ +{ + "url": "https://github.com/rydesun/tree-sitter-dot", + "rev": "e6f55c43b87b81cc982e38d414f0147fefa2515c", + "date": "2021-09-01T14:36:57+08:00", + "path": "/nix/store/n5a6bzh8rf35865wvcr3cis9r0fn2047-tree-sitter-dot", + "sha256": "1s3fpd0lnbm3gk9nbskdkdjlmdm7kz0l0g2zipv1m7qkc05nnkfy", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index 308ca3eeb69f..c5771a565306 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -114,6 +114,10 @@ let orga = "ram02z"; repo = "tree-sitter-fish"; }; + "tree-sitter-dot" = { + orga = "rydesun"; + repo = "tree-sitter-dot"; + }; }; allGrammars = From 5196b3df7c687195388986b440934b7b2068ee72 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Tue, 14 Sep 2021 22:25:14 -0500 Subject: [PATCH 17/42] tree-sitter: update grammars --- .../parsing/tree-sitter/grammars/tree-sitter-c-sharp.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-cpp.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-haskell.json | 8 ++++---- .../tree-sitter/grammars/tree-sitter-javascript.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-php.json | 8 ++++---- .../tree-sitter/grammars/tree-sitter-typescript.json | 8 ++++---- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json index eefde83db98b..8a9dd7be6db7 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-c-sharp", - "rev": "87c1aba089207f0fcc022ed88138af5a3e4cf454", - "date": "2021-09-05T21:16:06+01:00", - "path": "/nix/store/wx1asjwcpcmizavl7z756q55z3mvn714-tree-sitter-c-sharp", - "sha256": "1c1s2x7bpirsrkr6cqj9v4czpgavyf6b9dg290l9v7vd9fg3zh6v", + "rev": "c9e1952d311cf87762a42a79cb801c7bef1af815", + "date": "2021-09-09T23:38:47+01:00", + "path": "/nix/store/cl05d3zpbbkhms5fmd6wc4jhasjhg12l-tree-sitter-c-sharp", + "sha256": "0kn7p203ij8vz1cdxmxvn85mf3hpmz08l5psza96xxif2lcz8li8", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json index 95a0ea8a478d..1d7b15b99dce 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-cpp", - "rev": "5bb411db33c86b108c891fb2c1473ddc9fad9701", - "date": "2021-08-17T11:20:29-07:00", - "path": "/nix/store/a23w5pnww3wryjs1vimp5ggvgq9bg0rl-tree-sitter-cpp", - "sha256": "1gxd40ipbzjhlk2amsk09v67cjxk4wal60kxycnb04lp6wxwlm8b", + "rev": "f53c3c013a1c223f7ca4614895bef4fe05928101", + "date": "2021-09-14T15:11:36-05:00", + "path": "/nix/store/lc1jjys6lgp19d52n6qgymfqx9pwg0xa-tree-sitter-cpp", + "sha256": "05al4yrb39cfa96cf4armv47ja5qccmc3mvbmzfwc7hh1rq621n7", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json index 3f04f23304dc..807c09a70fe5 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-haskell", - "rev": "acafd11d9e45b1c28b49ff798022022b29d8b450", - "date": "2021-08-27T16:35:25+02:00", - "path": "/nix/store/wmw8ppdkndwg3f8phdhws985ckxs0yvk-tree-sitter-haskell", - "sha256": "1zm8m7lpgmh4gr0iw0792bsqi5jpf3w0kx6l3s91clici69nwkiq", + "rev": "bf7d643b494b7c7eed909ed7fbd8447231152cb0", + "date": "2021-09-09T20:07:38+02:00", + "path": "/nix/store/nkx9qf63nwl1ql6gl3q1fm4ykqax1isx-tree-sitter-haskell", + "sha256": "1wlp6kncjadhfz8y2wn90gkbqf35iidrn0y1ga360l5wyzx1mpid", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json index f5b7e3f1c092..a5d506dc2420 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-javascript", - "rev": "2cc5803225a307308005930b3bedb939b1543722", - "date": "2021-08-29T11:32:53-07:00", - "path": "/nix/store/kjviknhcrayrzv94i762zsy2kvpxpkx6-tree-sitter-javascript", - "sha256": "1xkll7g38j1vajylfaifbn6i5y5f22kmjfy2dxy9bk903assxy05", + "rev": "435db852fbeff8fe298e25ad967c634d9698eec0", + "date": "2021-09-13T13:32:20-07:00", + "path": "/nix/store/idvb37g3nqpidw0jviiw4b71sqpihhs0-tree-sitter-javascript", + "sha256": "0plc5jxxh1bm1dig6gsk1ma7gp29ad3p0169jd9xlagc4vysfgc3", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json index ac5891e5409d..6c288b7cdae5 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-php", - "rev": "77d98f3ce47ea52ff39137be29bc6376951c2286", - "date": "2021-09-03T18:25:31+02:00", - "path": "/nix/store/l143h3fxi89kk7dcp71zjdhdfmfmr68s-tree-sitter-php", - "sha256": "15cl1mdclhjiw72xzkcmw0lxq2hv1bjf2xf2nkgibi7zp8s1qvyw", + "rev": "d1bdb1e535d39d4f93f7373f406e1837c8a7bb25", + "date": "2021-09-10T08:16:50+02:00", + "path": "/nix/store/4zzs4f1hz5il35pqyf355aps6k4a83i8-tree-sitter-php", + "sha256": "0ymkwlh1japlwsajxd06254qadzq9bvm5db02cg4n3zv0pkvyrzz", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json index adeb1e182735..3f08de7bcc4b 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-typescript", - "rev": "83816f563c8d9d2f1b9c921206a7944d0c5904ad", - "date": "2021-08-17T11:21:26-07:00", - "path": "/nix/store/jwxdv5xbs92n43yqvxnwz443jvngxmqp-tree-sitter-typescript", - "sha256": "1w989z36pvfv7m4z9s9qq67l81p8rx37z53kqmsxsyc01wnpb4nr", + "rev": "98ef311701c51f72c83e5285366e00adb7a446c8", + "date": "2021-09-14T18:18:35-07:00", + "path": "/nix/store/fcl3abkk7blcq8hfk7l70j32nhx4ka24-tree-sitter-typescript", + "sha256": "1jpfmpisyz020h3vj7i4km8ha9axl6kqn75ikd26bvyxqir38cnr", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, From 709450400c762ab70f023f00ad37dfb6b8e6b27d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 15 Sep 2021 20:50:26 +0000 Subject: [PATCH 18/42] pueue: 0.12.2 -> 1.0.2 --- pkgs/applications/misc/pueue/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix index 298307b58f91..31879d376f9c 100644 --- a/pkgs/applications/misc/pueue/default.nix +++ b/pkgs/applications/misc/pueue/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pueue"; - version = "0.12.2"; + version = "1.0.2"; src = fetchFromGitHub { owner = "Nukesor"; repo = pname; rev = "v${version}"; - sha256 = "sha256-umVIMboKG6cZ1JOcfhOEZTQwPLxC2LdlGUa4U6LXh/g="; + sha256 = "sha256-rU+/fW7yF71MG5kEqjeJDC3uSBzCy0aUH5aVRpImYE8="; }; - cargoSha256 = "sha256-nppwwO0dBXYG/ZJMNWGnl7J77GDI7+NV8QAmfcbpJD4="; + cargoSha256 = "sha256-cmtxVNkYyrkrVXWb7xoJUByl7k1+uYRRVXI8jIHCC7Y="; nativeBuildInputs = [ installShellFiles ]; From 9574e57471eeb85b9a214eca7445c0ac13069c6e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 15 Sep 2021 21:10:57 +0000 Subject: [PATCH 19/42] resvg: 0.17.0 -> 0.18.0 --- pkgs/tools/graphics/resvg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/resvg/default.nix b/pkgs/tools/graphics/resvg/default.nix index 4b4b16c929ed..54f3152ebec0 100644 --- a/pkgs/tools/graphics/resvg/default.nix +++ b/pkgs/tools/graphics/resvg/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "resvg"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GcBI+wQ5a6ZaSdUpbMigo89h0jYOv0R+kx05YEn+fW8="; + sha256 = "sha256-/r1rTU+te8pKKiPGCHJTTBkg9RZ/N1yFTlaDAhWWxjs="; }; - cargoSha256 = "sha256-fE8Ox5mTdImUzd4ygoiSpW2/fXJyIeUiebxHZi43UD0="; + cargoSha256 = "sha256-pHZRKXZo5fyyXjgNTDBZjRiMDOaoCfFUSl53yE2t210="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; From 7566d3679a0a74a9ad9b242693b9b25ddd9d9e51 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 15 Sep 2021 23:49:56 +0200 Subject: [PATCH 20/42] esphome: 2021.8.2 -> 2021.9.0 --- pkgs/tools/misc/esphome/dashboard.nix | 4 ++-- pkgs/tools/misc/esphome/default.nix | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/esphome/dashboard.nix b/pkgs/tools/misc/esphome/dashboard.nix index 777415de5800..cc2123c9d33b 100644 --- a/pkgs/tools/misc/esphome/dashboard.nix +++ b/pkgs/tools/misc/esphome/dashboard.nix @@ -4,11 +4,11 @@ with python3.pkgs; buildPythonPackage rec { pname = "esphome-dashboard"; - version = "20210728.0"; + version = "20210908.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-OmlMrPLFMIV0Nu3aEKFotFXCZ2RKH9wYaev0SKvMBfQ="; + sha256 = "sha256-Oz/87FFP9AEK7vVTjgqIA6hSSQJLKet759S2t5Ci1oA="; }; # no tests diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 4c58632e0df6..3a7cc24e6700 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -16,13 +16,13 @@ let in with python.pkgs; buildPythonApplication rec { pname = "esphome"; - version = "2021.8.2"; + version = "2021.9.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-R+5eefPUZc6y/B8cZbxsLVrVwvBbVISZQAb1KwiYdFg="; + sha256 = "sha256-QYtScfw+VFYc5rljDf1W+vI8Rx2UJuQ51yBTBVhO7Ns="; }; patches = [ @@ -48,6 +48,7 @@ with python.pkgs; buildPythonApplication rec { # - validate_cryptography_installed # - validate_pillow_installed propagatedBuildInputs = [ + aioesphomeapi click colorama cryptography From 159c59a6b97c8dccdeced3d4eb772717d6bf4306 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 16 Sep 2021 00:09:07 +0000 Subject: [PATCH 21/42] terracognita: 0.7.2 -> 0.7.3 --- pkgs/development/tools/misc/terracognita/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/terracognita/default.nix b/pkgs/development/tools/misc/terracognita/default.nix index c10543e17689..dfb297cd8d6f 100644 --- a/pkgs/development/tools/misc/terracognita/default.nix +++ b/pkgs/development/tools/misc/terracognita/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terracognita"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "cycloidio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-n+aCNKGujvmXSFmLo2h1d29NFgdk/G+ehGwMHCJQoU8="; + sha256 = "sha256-V+/RjvCPq27SBMk5EZhLCc98XnHgSqJVoFqob0nZVjo="; }; vendorSha256 = "sha256-i6AkLAXGOXe3jmAKKQN6aX/DvovSS9CYFYO28bYIdUw="; From f52575c06b8d22263c78d0efba32b396e5422a31 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 16 Sep 2021 00:16:04 +0000 Subject: [PATCH 22/42] tflint: 0.32.0 -> 0.32.1 --- pkgs/development/tools/analysis/tflint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 443d9b4b1e69..c645cd359032 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.32.0"; + version = "0.32.1"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "1yf725lfwhvkc1mvzqpl9wchwq2z4pz3z7bp0qlbgdym8z66x8wm"; + sha256 = "sha256-0DK6uTbuIVqrfsrTF0tAbx1WnVpc97nE0zuwTcFoBf8="; }; - vendorSha256 = "0jg8a6vx2n71awr2zdkiisx76qcnj3qj6vj1w9m1c9kczz3mc7m3"; + vendorSha256 = "sha256-ox5Wx/9sJhZq4kFuI/GQlmFzuo5xti8yV+FY0bdR6Ek="; doCheck = false; From d3e7c6df189612be0ba0eb08e56ccee10b51a953 Mon Sep 17 00:00:00 2001 From: Daniel Ebbert <20522234+ebbertd@users.noreply.github.com> Date: Thu, 16 Sep 2021 03:28:57 +0200 Subject: [PATCH 23/42] owncloud-client: 2.8.4 -> 2.9.0 (#135876) * owncloud-client: Switch to Qt version 5 * owncloud-client: 2.8.4 -> 2.9.0 --- pkgs/applications/networking/owncloud-client/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index 34ab19f6e27a..7c9a697243bd 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "owncloud-client"; - version = "2.8.2.4246"; + version = "2.9.0.5150"; src = fetchurl { url = "https://download.owncloud.com/desktop/ownCloud/stable/${version}/source/ownCloud-${version}.tar.xz"; - sha256 = "0cc2e5154a1349bd21941ac3c32e8621778a9ff150730a19de2710e22d32fc43"; + sha256 = "0nf68x840p30yng4fh1nlyiqg40z0rkcv0lskpz8dd4pj1iw5jjs"; }; nativeBuildInputs = [ pkg-config cmake extra-cmake-modules ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d683cd8f39f3..86382226ddb5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7973,7 +7973,7 @@ with pkgs; ovito = libsForQt5.callPackage ../applications/graphics/ovito { }; - owncloud-client = libsForQt514.callPackage ../applications/networking/owncloud-client { }; + owncloud-client = libsForQt5.callPackage ../applications/networking/owncloud-client { }; oxefmsynth = callPackage ../applications/audio/oxefmsynth { }; From a84555ba2e332b5d51e1a19eab105229c0dd7a76 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 31 Aug 2021 10:42:15 +0200 Subject: [PATCH 24/42] python3Packages.aioambient: 1.2.6 -> 1.3.0 --- pkgs/development/python-modules/aioambient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioambient/default.nix b/pkgs/development/python-modules/aioambient/default.nix index 16678c9f04e6..3e5c0c8dfe89 100644 --- a/pkgs/development/python-modules/aioambient/default.nix +++ b/pkgs/development/python-modules/aioambient/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aioambient"; - version = "1.2.6"; + version = "1.3.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-EppnuZP62YTFI3UJUzBUj2m5TvFh1WiDz9smHY7We60="; + sha256 = "sha256-blejTXyLe3B2kNytBh+zJz0Q0xDP+Vo2SV9gc7OX6S0="; }; nativeBuildInputs = [ From dc85b1cbda47f1f52cae98958248670b675dc8f4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 31 Aug 2021 10:44:15 +0200 Subject: [PATCH 25/42] python3Packages.pyiqvia: 1.0.1 -> 1.1.0 --- pkgs/development/python-modules/pyiqvia/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyiqvia/default.nix b/pkgs/development/python-modules/pyiqvia/default.nix index 5dce573eaebb..89df38b80c50 100644 --- a/pkgs/development/python-modules/pyiqvia/default.nix +++ b/pkgs/development/python-modules/pyiqvia/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , aiohttp , aresponses +, backoff , fetchFromGitHub , poetry-core , pytest-aiohttp @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "pyiqvia"; - version = "1.0.1"; + version = "1.1.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "18qzxxn9xw9rwv3qz8k3zxh9xxy8c7rs8xlsrdrcq9wb0dhd7p0r"; + sha256 = "sha256-uDcBpPHh+wQHI2vGjnumwVGt5ZOreVq+L3kOam97uW4="; }; nativeBuildInputs = [ @@ -30,6 +31,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + backoff ]; checkInputs = [ From 7b77921490b9fb8d08ecc0ed7d986a71c3a51e66 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 31 Aug 2021 10:44:50 +0200 Subject: [PATCH 26/42] python3Packages.pyopenuv: 2.1.0 -> 2.2.0 --- pkgs/development/python-modules/pyopenuv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyopenuv/default.nix b/pkgs/development/python-modules/pyopenuv/default.nix index 5560f3811fa3..15f8cf8883e8 100644 --- a/pkgs/development/python-modules/pyopenuv/default.nix +++ b/pkgs/development/python-modules/pyopenuv/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pyopenuv"; - version = "2.1.0"; + version = "2.2.0"; format = "pyproject"; src = fetchFromGitHub { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-S2X7cTArjiWOFjQGnrZ4AuhgN8t18wf9d6i9X5thRZg="; + sha256 = "sha256-WYCIQTQbDh9U4nB+dgLXbBJXErC4l5Hnk8K5n4CctCw="; }; nativeBuildInputs = [ poetry-core ]; From 19c8d521bb43cff4c46aeea7ff56ba5de98dd794 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 31 Aug 2021 11:18:50 +0200 Subject: [PATCH 27/42] python3Packages.yeelight: 0.7.2 -> 0.7.4 --- pkgs/development/python-modules/yeelight/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yeelight/default.nix b/pkgs/development/python-modules/yeelight/default.nix index 9416ff7ef4e2..36b67e2daa22 100644 --- a/pkgs/development/python-modules/yeelight/default.nix +++ b/pkgs/development/python-modules/yeelight/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "yeelight"; - version = "0.7.3"; + version = "0.7.4"; disabled = pythonOlder "3.4"; src = fetchFromGitLab { owner = "stavros"; repo = "python-yeelight"; rev = "v${version}"; - sha256 = "sha256-sdSzriAgY3LSOeyPB2Pe1k9iamStZ1OlYXJZviRa+TY="; + sha256 = "sha256-qpyD4o8YMVu6DiizuBs/44Vz0oPIMR4/YQwaCDNKpFI="; }; propagatedBuildInputs = [ From 9f76c53a301cdafe641894608891abf7a76a742f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 31 Aug 2021 22:16:07 +0200 Subject: [PATCH 28/42] python3Packages.env-canada: 0.5.0 -> 0.5.1 --- pkgs/development/python-modules/env-canada/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix index 5ea89392826b..3591bbde5ec7 100644 --- a/pkgs/development/python-modules/env-canada/default.nix +++ b/pkgs/development/python-modules/env-canada/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "env-canada"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "michaeldavie"; repo = "env_canada"; rev = "v${version}"; - sha256 = "0dgw2mf760r1y0mq8bcvx6y3bcqpaf8p97rzf7pd0pbwvwrcsj3n"; + sha256 = "sha256-tafhOW1wd/D0ojRUdDzp62cQ8w7wgx5ITcWAcoY1i5Y="; }; propagatedBuildInputs = [ From 251ff92d53fd89e0b9b39a3a5e1d5bf1f753a3a5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 Sep 2021 00:11:11 +0200 Subject: [PATCH 29/42] python3Packages.soco: 0.23.3 -> 0.24.0 --- 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 2360cc81e39a..624ef4e30fc9 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.3"; + version = "0.24.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "SoCo"; repo = "SoCo"; rev = "v${version}"; - sha256 = "sha256-T6gDImH/HfHg8e1YzUYB8zr2GJHRtF6vdYm2cSiXSb0="; + sha256 = "sha256-3VL2JFlukfQdjTP65X40OOsuCUVsY9kuvRKUZ3qEd+s="; }; propagatedBuildInputs = [ From 677c17fe74c9f9961231e563fdb527e4ce28141c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 Sep 2021 08:42:33 +0200 Subject: [PATCH 30/42] python3Packages.aioswitcher: 2.0.4 -> 2.0.5 --- pkgs/development/python-modules/aioswitcher/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix index 2682b1365645..a3146da188c0 100644 --- a/pkgs/development/python-modules/aioswitcher/default.nix +++ b/pkgs/development/python-modules/aioswitcher/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "aioswitcher"; - version = "2.0.4"; + version = "2.0.5"; format = "pyproject"; src = fetchFromGitHub { owner = "TomerFi"; repo = pname; rev = version; - sha256 = "sha256-n4JvtShs2/shJxAzxm6qyipVQ7e3QfeVwhnqu6RWZss="; + sha256 = "sha256-q1toEKEqTJuZbsrqDjfbUWsQmrwiu2MtcoWqKKRUEJA="; }; nativeBuildInputs = [ From 465ec543658691b12b43cfb236033bc6047564e8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Sep 2021 09:00:11 +0200 Subject: [PATCH 31/42] python3Packages.pymyq: 3.1.3 -> 3.1.4 --- pkgs/development/python-modules/pymyq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymyq/default.nix b/pkgs/development/python-modules/pymyq/default.nix index 04a8b596e844..5f151aa46e23 100644 --- a/pkgs/development/python-modules/pymyq/default.nix +++ b/pkgs/development/python-modules/pymyq/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pymyq"; - version = "3.1.3"; + version = "3.1.4"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "arraylabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-V2u2wUSPwiF6o6OWhQVKiHtzhn0/rzyM6e2+a+D7UNA="; + sha256 = "sha256-B8CnyM0nQr8HWnD5toMd8A57j/UtnQ2aWys0netOAtA="; }; propagatedBuildInputs = [ From 716f05ea514ee561b4e52a1b5093ae91f4523228 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Sep 2021 09:00:54 +0200 Subject: [PATCH 32/42] python3Packages.snitun: 0.27.0 -> 0.30.0 --- pkgs/development/python-modules/snitun/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/snitun/default.nix b/pkgs/development/python-modules/snitun/default.nix index f09876eadb16..293b8069b58f 100644 --- a/pkgs/development/python-modules/snitun/default.nix +++ b/pkgs/development/python-modules/snitun/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "snitun"; - version = "0.27.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = "NabuCasa"; repo = pname; rev = version; - sha256 = "sha256-vx9F+Nat69Yadd+YpsnBCstnxCEICFJI14TdG6PvstI="; + sha256 = "sha256-IjdgxX6ed9IWMFaMXIXQWZWoODrZBzXtMAcMOIhPFVQ="; }; propagatedBuildInputs = [ From 1cf568ae28121b17b0a3c5c9615a7394b08d8e9d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 15 Sep 2021 15:22:07 +0200 Subject: [PATCH 33/42] python3Packages.bellows: 0.26.0 -> 0.27.0 --- pkgs/development/python-modules/bellows/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index a95bf6054fd8..8caebee0ed5d 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.26.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "zigpy"; repo = "bellows"; rev = version; - sha256 = "0qbsk5iv3vrpwz7kfmjdbc66rfkg788p6wwxbf6jzfarfhcgrh3k"; + sha256 = "sha256-lsGpCd4XgwP91JmRpV6ohXefd1Hm9C51Jk4shU6Irkw="; }; propagatedBuildInputs = [ From 2d33f52f474e6250fe61ea353b11b44feade2ef3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 15 Sep 2021 15:25:31 +0200 Subject: [PATCH 34/42] python3Packages.pymodbus: 2.5.2 -> 2.5.3rc1 --- pkgs/development/python-modules/pymodbus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix index b96c5f8d15da..40dae5c6997b 100644 --- a/pkgs/development/python-modules/pymodbus/default.nix +++ b/pkgs/development/python-modules/pymodbus/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "pymodbus"; - version = "2.5.2"; + version = "2.5.3rc1"; src = fetchFromGitHub { owner = "riptideio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jqVfBAjIdRBB5AYd0ZkMi7qAUR6vSYeBI4OYEv+mKwE="; + sha256 = "sha256-jynljjTipN/Yx97RSWikcotxCqosNWSDH7GdwcSIiRU="; }; # Twisted asynchronous version is not supported due to a missing dependency From 3296526c34b7e2409469b9d0f368fc4538c6772c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 15 Sep 2021 15:27:17 +0200 Subject: [PATCH 35/42] python3Packages.zha-quirks: 0.0.59 -> 0.0.61 --- pkgs/development/python-modules/zha-quirks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 89db9de12b75..38a6d236d83c 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.59"; + version = "0.0.61"; src = fetchFromGitHub { owner = "zigpy"; repo = "zha-device-handlers"; rev = version; - sha256 = "1x6s44apl393as847ghbqr26h0y0h4w3wp53bs0m2nfbzjwin3i7"; + sha256 = "sha256-uDQAXH0p8Ly0ZbwNlkVo1b7fAXSu77U7v3BHd0B1YQk="; }; propagatedBuildInputs = [ From a9de55317e3f0a6a43cedf3b8db9cb94a60dea2c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 15 Sep 2021 15:28:21 +0200 Subject: [PATCH 36/42] python3Packages.zigpy-deconz: 0.12.1 -> 0.13.0 --- 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 f41b3836db93..466026556e0a 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.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "zigpy"; repo = pname; rev = version; - sha256 = "sha256-NpLhVQfezXbJQMvqqZjr9sc8tCjJgGu5Xk3C5/IDeUQ="; + sha256 = "sha256-9rxdnY5tMtPJLE/lRaphNR1L1vdhAxnIDoh8xCHmzjc="; }; propagatedBuildInputs = [ pyserial pyserial-asyncio zigpy ]; From 2d9604be7e9af0e980bf7df243208eaa71c82f66 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 15 Sep 2021 15:28:43 +0200 Subject: [PATCH 37/42] python3Packages.zwave-js-server-python: 0.28.0 -> 0.30.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 067b35dde6ad..a37ee67ed828 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.28.0"; + version = "0.30.0"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = version; - sha256 = "137m9052ndbii0q6zw9vmwsfimai05q9np4wv06nw2p2mhy5x48p"; + sha256 = "sha256-KYMq0qDVLHzgaYljwYeK58aggD5kBAI1J/RsirGcVvs="; }; propagatedBuildInputs = [ From 15259dfa2c1eee31963060482973142f63f03650 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 15 Sep 2021 15:46:20 +0200 Subject: [PATCH 38/42] python3Packages.herepy: relax requests constraint --- pkgs/development/python-modules/herepy/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/herepy/default.nix b/pkgs/development/python-modules/herepy/default.nix index 13454e4e1966..9b1a50a532fa 100644 --- a/pkgs/development/python-modules/herepy/default.nix +++ b/pkgs/development/python-modules/herepy/default.nix @@ -20,6 +20,11 @@ buildPythonPackage rec { sha256 = "sha256-05x3EQoyv38j4UcixN0sf5BI2oTjfasAIQyZqQSjdPM="; }; + postPatch = '' + substituteInPlace requirements.txt \ + --replace "requests==2.25.1" "requests>=2.25.1" + ''; + propagatedBuildInputs = [ requests ]; From f702a64062abfa6fe2d5aeb8eb30eb88025be1cf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 15 Sep 2021 16:35:32 +0200 Subject: [PATCH 39/42] python3Packages.async-upnp-client: 0.21.0 -> 0.21.3 --- .../async-upnp-client/default.nix | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix index 7f235485b757..f9256b11ae78 100644 --- a/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/pkgs/development/python-modules/async-upnp-client/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "async-upnp-client"; - version = "0.21.0"; + version = "0.21.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "StevenLooman"; repo = "async_upnp_client"; rev = version; - sha256 = "sha256-GKvljxm2N4pC8Mh+UOW170VPB3va9X9BuQXp6OJ/SSQ="; + sha256 = "sha256-85MdzvNac199pZObhfGv33ycgzt4nr9eHYvSjMW6kq8="; }; propagatedBuildInputs = [ @@ -39,20 +39,22 @@ buildPythonPackage rec { disabledTests = [ # socket.gaierror: [Errno -2] Name or service not known - "test_get_local_ip" "test_async_get_local_ip" + "test_get_local_ip" # OSError: [Errno 101] Network is unreachable - "test_subscribe_fail" - "test_subscribe_auto_resubscribe" - "test_subscribe_manual_resubscribe" "test_auto_resubscribe_fail" + "test_init" "test_on_notify_dlna_event" "test_on_notify_upnp_event" - "test_unsubscribe" - "test_subscribe" - "test_subscribe_renew" + "test_server_init" + "test_server_start" "test_start_server" - "test_init" + "test_subscribe" + "test_subscribe_auto_resubscribe" + "test_subscribe_fail" + "test_subscribe_manual_resubscribe" + "test_subscribe_renew" + "test_unsubscribe" ] ++ lib.optionals stdenv.isDarwin [ "test_deferred_callback_url" ]; From b63e4fc84b0aa9fb29887530a1ea11f8ba13aeda Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 15 Sep 2021 17:04:35 +0200 Subject: [PATCH 40/42] python3Packages.stdlib-list: init at 0.8.0 --- .../python-modules/stdlib-list/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/stdlib-list/default.nix diff --git a/pkgs/development/python-modules/stdlib-list/default.nix b/pkgs/development/python-modules/stdlib-list/default.nix new file mode 100644 index 000000000000..d654d2588066 --- /dev/null +++ b/pkgs/development/python-modules/stdlib-list/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, isPy27 +, fetchPypi +, python +}: + +buildPythonPackage rec { + pname = "stdlib-list"; + version = "0.8.0"; + format = "setuptools"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "17vdn4q0sdlndc2fr9svapxx6366hnrhkn0fswp1xmr0jxqh7rd1"; + }; + + pythonImportsCheck = [ + "stdlib_list" + ]; + + # tests see mismatches to our standard library + doCheck = false; + + meta = with lib; { + description = "A list of Python Standard Libraries"; + homepage = "https://github.com/jackmaney/python-stdlib-list"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 52a14a3365c2..73d246b3b88e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8592,6 +8592,8 @@ in { stdiomask = callPackage ../development/python-modules/stdiomask { }; + stdlib-list = callPackage ../development/python-modules/stdlib-list { }; + stem = callPackage ../development/python-modules/stem { }; stestr = callPackage ../development/python-modules/stestr { }; From 5de4afa614032055405cb234ca98e541c7f55307 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 10 Sep 2021 03:59:36 +0200 Subject: [PATCH 41/42] home-assistant: 2021.8.8 -> 2021.9.6 --- .../home-assistant/component-packages.nix | 66 ++++++++++--------- pkgs/servers/home-assistant/default.nix | 38 +++++------ pkgs/servers/home-assistant/frontend.nix | 4 +- pkgs/servers/home-assistant/update.sh | 2 + 4 files changed, 56 insertions(+), 54 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 28285fa2ee37..d1d70bff7ab4 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2021.8.8"; + version = "2021.9.6"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; @@ -19,12 +19,13 @@ "air_quality" = ps: with ps; [ ]; "airly" = ps: with ps; [ airly ]; "airnow" = ps: with ps; [ pyairnow ]; + "airtouch4" = ps: with ps; [ ]; # missing inputs: airtouch4pyapi "airvisual" = ps: with ps; [ pyairvisual ]; "aladdin_connect" = ps: with ps; [ aladdin-connect ]; "alarm_control_panel" = ps: with ps; [ ]; "alarmdecoder" = ps: with ps; [ adext ]; "alert" = ps: with ps; [ ]; - "alexa" = ps: with ps; [ aiohttp-cors ]; + "alexa" = ps: with ps; [ pyturbojpeg aiohttp-cors ]; "almond" = ps: with ps; [ aiohttp-cors pyalmond ]; "alpha_vantage" = ps: with ps; [ alpha-vantage ]; "amazon_polly" = ps: with ps; [ boto3 ]; @@ -111,9 +112,9 @@ "buienradar" = ps: with ps; [ buienradar ]; "caldav" = ps: with ps; [ caldav ]; "calendar" = ps: with ps; [ aiohttp-cors ]; - "camera" = ps: with ps; [ aiohttp-cors ]; + "camera" = ps: with ps; [ pyturbojpeg aiohttp-cors ]; "canary" = ps: with ps; [ ha-ffmpeg py-canary ]; - "cast" = ps: with ps; [ aiohttp-cors hass-nabucasa ifaddr mutagen plexapi plexauth plexwebsocket PyChromecast zeroconf ]; + "cast" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa ifaddr mutagen plexapi plexauth plexwebsocket PyChromecast zeroconf ]; "cert_expiry" = ps: with ps; [ ]; "channels" = ps: with ps; [ pychannels ]; "circuit" = ps: with ps; [ ]; # missing inputs: circuit-webhook @@ -127,7 +128,7 @@ "clicksend_tts" = ps: with ps; [ ]; "climacell" = ps: with ps; [ pyclimacell ]; "climate" = ps: with ps; [ ]; - "cloud" = ps: with ps; [ aiohttp-cors hass-nabucasa ]; + "cloud" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa ]; "cloudflare" = ps: with ps; [ pycfdns ]; "cmus" = ps: with ps; [ ]; # missing inputs: pycmus "co2signal" = ps: with ps; [ ]; # missing inputs: co2signal @@ -159,7 +160,7 @@ "deconz" = ps: with ps; [ pydeconz ]; "decora" = ps: with ps; [ bluepy ]; # missing inputs: decora "decora_wifi" = ps: with ps; [ ]; # missing inputs: decora_wifi - "default_config" = ps: with ps; [ pynacl aiodiscover aiohttp-cors async-upnp-client defusedxml distro emoji hass-nabucasa home-assistant-frontend ifaddr pillow scapy sqlalchemy zeroconf ]; + "default_config" = ps: with ps; [ pynacl pyturbojpeg aiodiscover aiohttp-cors async-upnp-client defusedxml emoji hass-nabucasa home-assistant-frontend ifaddr pillow pyserial pyudev scapy sqlalchemy zeroconf ]; "delijn" = ps: with ps; [ pydelijn ]; "deluge" = ps: with ps; [ deluge-client ]; "demo" = ps: with ps; [ aiohttp-cors ]; @@ -266,8 +267,9 @@ "firmata" = ps: with ps; [ pymata-express ]; "fitbit" = ps: with ps; [ aiohttp-cors fitbit ]; "fixer" = ps: with ps; [ fixerio ]; + "fjaraskupan" = ps: with ps; [ ]; # missing inputs: fjaraskupan "fleetgo" = ps: with ps; [ ]; # missing inputs: ritassist - "flexit" = ps: with ps; [ pymodbus ]; # missing inputs: pyflexit + "flexit" = ps: with ps; [ pymodbus ]; "flic" = ps: with ps; [ pyflic ]; "flick_electric" = ps: with ps; [ pyflick ]; "flipr" = ps: with ps; [ ]; # missing inputs: flipr-api @@ -311,7 +313,7 @@ "geonetnz_quakes" = ps: with ps; [ aio-geojson-geonetnz-quakes ]; "geonetnz_volcano" = ps: with ps; [ aio-geojson-geonetnz-volcano ]; "gios" = ps: with ps; [ gios ]; - "github" = ps: with ps; [ PyGithub ]; + "github" = ps: with ps; [ aiogithubapi ]; "gitlab_ci" = ps: with ps; [ python-gitlab ]; "gitter" = ps: with ps; [ ]; # missing inputs: gitterpy "glances" = ps: with ps; [ glances-api ]; @@ -320,7 +322,7 @@ "goalzero" = ps: with ps; [ goalzero ]; "gogogate2" = ps: with ps; [ ismartgate ]; "google" = ps: with ps; [ google-api-python-client httplib2 oauth2client ]; - "google_assistant" = ps: with ps; [ aiohttp-cors ]; + "google_assistant" = ps: with ps; [ pyturbojpeg aiohttp-cors ]; "google_cloud" = ps: with ps; [ google-cloud-texttospeech ]; "google_domains" = ps: with ps; [ ]; "google_maps" = ps: with ps; [ locationsharinglib ]; @@ -392,7 +394,7 @@ "ign_sismologia" = ps: with ps; [ georss-ign-sismologia-client ]; "ihc" = ps: with ps; [ defusedxml ]; # missing inputs: ihcsdk "image" = ps: with ps; [ aiohttp-cors pillow ]; - "image_processing" = ps: with ps; [ aiohttp-cors ]; + "image_processing" = ps: with ps; [ pyturbojpeg aiohttp-cors ]; "imap" = ps: with ps; [ aioimaplib ]; "imap_email_content" = ps: with ps; [ ]; "incomfort" = ps: with ps; [ incomfort-client ]; @@ -409,6 +411,7 @@ "intesishome" = ps: with ps; [ pyintesishome ]; "ios" = ps: with ps; [ aiohttp-cors ifaddr zeroconf ]; "iota" = ps: with ps; [ ]; # missing inputs: pyota + "iotawatt" = ps: with ps; [ ]; # missing inputs: iotawattpy "iperf3" = ps: with ps; [ ]; # missing inputs: iperf3 "ipma" = ps: with ps; [ pyipma ]; "ipp" = ps: with ps; [ pyipp ]; @@ -510,9 +513,9 @@ "mfi" = ps: with ps; [ ]; # missing inputs: mficlient "mhz19" = ps: with ps; [ pmsensor ]; "microsoft" = ps: with ps; [ ]; # missing inputs: pycsspeechtts - "microsoft_face" = ps: with ps; [ aiohttp-cors ]; - "microsoft_face_detect" = ps: with ps; [ aiohttp-cors ]; - "microsoft_face_identify" = ps: with ps; [ aiohttp-cors ]; + "microsoft_face" = ps: with ps; [ pyturbojpeg aiohttp-cors ]; + "microsoft_face_detect" = ps: with ps; [ pyturbojpeg aiohttp-cors ]; + "microsoft_face_identify" = ps: with ps; [ pyturbojpeg aiohttp-cors ]; "miflora" = ps: with ps; [ bluepy ]; # missing inputs: miflora "mikrotik" = ps: with ps; [ librouteros ]; "mill" = ps: with ps; [ millheater ]; @@ -521,7 +524,7 @@ "minio" = ps: with ps; [ minio ]; "mitemp_bt" = ps: with ps; [ ]; # missing inputs: mitemp_bt "mjpeg" = ps: with ps; [ ]; - "mobile_app" = ps: with ps; [ pynacl aiohttp-cors emoji hass-nabucasa pillow ]; + "mobile_app" = ps: with ps; [ pynacl pyturbojpeg aiohttp-cors emoji hass-nabucasa pillow ]; "mochad" = ps: with ps; [ ]; # missing inputs: pymochad "modbus" = ps: with ps; [ pymodbus ]; "modem_callerid" = ps: with ps; [ ]; # missing inputs: basicmodem @@ -558,7 +561,7 @@ "nello" = ps: with ps; [ ]; # missing inputs: pynello "ness_alarm" = ps: with ps; [ ]; # missing inputs: nessclient "nest" = ps: with ps; [ aiohttp-cors ha-ffmpeg python-nest ]; # missing inputs: google-nest-sdm - "netatmo" = ps: with ps; [ aiohttp-cors hass-nabucasa pyatmo ]; + "netatmo" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa pyatmo ]; "netdata" = ps: with ps; [ netdata ]; "netgear" = ps: with ps; [ ]; # missing inputs: pynetgear "netgear_lte" = ps: with ps; [ ]; # missing inputs: eternalegypt @@ -573,7 +576,7 @@ "niko_home_control" = ps: with ps; [ ]; # missing inputs: niko-home-control "nilu" = ps: with ps; [ ]; # missing inputs: niluclient "nissan_leaf" = ps: with ps; [ ]; # missing inputs: pycarwings2 - "nmap_tracker" = ps: with ps; [ getmac python-nmap ]; + "nmap_tracker" = ps: with ps; [ aiohttp-cors getmac ifaddr netmap ]; # missing inputs: mac-vendor-lookup "nmbs" = ps: with ps; [ ]; # missing inputs: pyrail "no_ip" = ps: with ps; [ ]; "noaa_tides" = ps: with ps; [ ]; # missing inputs: noaa-coops @@ -602,7 +605,7 @@ "ondilo_ico" = ps: with ps; [ aiohttp-cors ondilo ]; "onewire" = ps: with ps; [ ]; # missing inputs: pi1wire pyownet "onkyo" = ps: with ps; [ onkyo-eiscp ]; - "onvif" = ps: with ps; [ ha-ffmpeg zeep ]; # missing inputs: WSDiscovery onvif-zeep-async + "onvif" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: WSDiscovery onvif-zeep-async "openalpr_cloud" = ps: with ps; [ ]; "openalpr_local" = ps: with ps; [ ]; "opencv" = ps: with ps; [ numpy ]; # missing inputs: opencv-python-headless @@ -625,8 +628,9 @@ "osramlightify" = ps: with ps; [ ]; # missing inputs: lightify "otp" = ps: with ps; [ pyotp ]; "ovo_energy" = ps: with ps; [ ovoenergy ]; - "owntracks" = ps: with ps; [ pynacl aiohttp-cors hass-nabucasa paho-mqtt ]; + "owntracks" = ps: with ps; [ pynacl pyturbojpeg aiohttp-cors hass-nabucasa paho-mqtt ]; "ozw" = ps: with ps; [ aiohttp-cors paho-mqtt python-openzwave-mqtt ]; + "p1_monitor" = ps: with ps; [ ]; # missing inputs: p1monitor "panasonic_bluray" = ps: with ps; [ ]; # missing inputs: panacotta "panasonic_viera" = ps: with ps; [ ]; # missing inputs: panasonic_viera "pandora" = ps: with ps; [ pexpect ]; @@ -646,7 +650,7 @@ "ping" = ps: with ps; [ icmplib ]; "pioneer" = ps: with ps; [ ]; "pjlink" = ps: with ps; [ ]; # missing inputs: pypjlink2 - "plaato" = ps: with ps; [ aiohttp-cors hass-nabucasa pyplaato ]; + "plaato" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa pyplaato ]; "plant" = ps: with ps; [ sqlalchemy ]; "plex" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket ]; "plugwise" = ps: with ps; [ plugwise ]; @@ -681,12 +685,12 @@ "quantum_gateway" = ps: with ps; [ ]; # missing inputs: quantum-gateway "qvr_pro" = ps: with ps; [ ]; # missing inputs: pyqvrpro "qwikswitch" = ps: with ps; [ ]; # missing inputs: pyqwikswitch - "rachio" = ps: with ps; [ aiohttp-cors hass-nabucasa rachiopy ]; + "rachio" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa rachiopy ]; "radarr" = ps: with ps; [ ]; "radiotherm" = ps: with ps; [ radiotherm ]; "rainbird" = ps: with ps; [ ]; # missing inputs: pyrainbird "raincloud" = ps: with ps; [ ]; # missing inputs: raincloudy - "rainforest_eagle" = ps: with ps; [ ]; # missing inputs: eagle200_reader uEagle + "rainforest_eagle" = ps: with ps; [ aioeagle ueagle ]; "rainmachine" = ps: with ps; [ regenmaschine ]; "random" = ps: with ps; [ ]; "raspihats" = ps: with ps; [ smbus-cffi ]; # missing inputs: raspihats @@ -728,7 +732,7 @@ "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 sqlalchemy ]; + "safe_mode" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa home-assistant-frontend pillow sqlalchemy ]; "saj" = ps: with ps; [ ]; # missing inputs: pysaj "samsungtv" = ps: with ps; [ getmac samsungctl samsungtvws wakeonlan ]; "satel_integra" = ps: with ps; [ ]; # missing inputs: satel_integra @@ -779,7 +783,7 @@ "smappee" = ps: with ps; [ aiohttp-cors pysmappee ]; "smart_meter_texas" = ps: with ps; [ smart-meter-texas ]; "smarthab" = ps: with ps; [ smarthab ]; - "smartthings" = ps: with ps; [ aiohttp-cors hass-nabucasa pysmartapp pysmartthings ]; + "smartthings" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa pysmartapp pysmartthings ]; "smarttub" = ps: with ps; [ python-smarttub ]; "smarty" = ps: with ps; [ ]; # missing inputs: pysmarty "smhi" = ps: with ps; [ smhi-pkg ]; @@ -881,7 +885,7 @@ "todoist" = ps: with ps; [ todoist ]; "tof" = ps: with ps; [ ]; # missing inputs: RPi.GPIO VL53L1X2 "tomato" = ps: with ps; [ ]; - "toon" = ps: with ps; [ aiohttp-cors hass-nabucasa toonapi ]; + "toon" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa toonapi ]; "torque" = ps: with ps; [ aiohttp-cors ]; "totalconnect" = ps: with ps; [ total-connect-client ]; "touchline" = ps: with ps; [ ]; # missing inputs: pytouchline @@ -890,6 +894,7 @@ "traccar" = ps: with ps; [ aiohttp-cors stringcase ]; # missing inputs: pytraccar "trace" = ps: with ps; [ ]; "trackr" = ps: with ps; [ ]; # missing inputs: pytrackr + "tractive" = ps: with ps; [ aiotractive ]; "tradfri" = ps: with ps; [ pytradfri ]; "trafikverket_train" = ps: with ps; [ pytrafikverket ]; "trafikverket_weatherstation" = ps: with ps; [ pytrafikverket ]; @@ -916,13 +921,14 @@ "upb" = ps: with ps; [ upb-lib ]; "upc_connect" = ps: with ps; [ connect-box ]; "upcloud" = ps: with ps; [ upcloud-api ]; - "updater" = ps: with ps; [ distro ]; + "updater" = ps: with ps; [ ]; "upnp" = ps: with ps; [ aiohttp-cors async-upnp-client defusedxml ifaddr zeroconf ]; "uptime" = ps: with ps; [ ]; "uptimerobot" = ps: with ps; [ ]; # missing inputs: pyuptimerobot + "usb" = ps: with ps; [ aiohttp-cors pyserial pyudev ]; "uscis" = ps: with ps; [ ]; # missing inputs: uscisstatus "usgs_earthquakes_feed" = ps: with ps; [ geojson-client ]; - "utility_meter" = ps: with ps; [ ]; + "utility_meter" = ps: with ps; [ croniter ]; "uvc" = ps: with ps; [ uvcclient ]; "vacuum" = ps: with ps; [ ]; "vallox" = ps: with ps; [ ]; # missing inputs: vallox-websocket-api @@ -987,10 +993,10 @@ "xs1" = ps: with ps; [ ]; # missing inputs: xs1-api-client "yale_smart_alarm" = ps: with ps; [ yalesmartalarmclient ]; "yamaha" = ps: with ps; [ rxv ]; - "yamaha_musiccast" = ps: with ps; [ aiomusiccast ]; + "yamaha_musiccast" = ps: with ps; [ aiohttp-cors aiomusiccast async-upnp-client defusedxml ifaddr zeroconf ]; "yandex_transport" = ps: with ps; [ aioymaps ]; "yandextts" = ps: with ps; [ ]; - "yeelight" = ps: with ps; [ yeelight ]; + "yeelight" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr yeelight ]; "yeelightsunflower" = ps: with ps; [ ]; # missing inputs: yeelightsunflower "yi" = ps: with ps; [ aioftp ha-ffmpeg ]; "youless" = ps: with ps; [ youless-api ]; @@ -1000,13 +1006,13 @@ "zeroconf" = ps: with ps; [ aiohttp-cors ifaddr zeroconf ]; "zerproc" = ps: with ps; [ pyzerproc ]; "zestimate" = ps: with ps; [ xmltodict ]; - "zha" = ps: with ps; [ aiohttp-cors bellows ifaddr pyserial-asyncio pyserial zeroconf zha-quirks zigpy-cc zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp zigpy ]; + "zha" = ps: with ps; [ aiohttp-cors bellows ifaddr pyserial-asyncio pyserial pyudev zeroconf zha-quirks zigpy-cc zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp zigpy ]; "zhong_hong" = ps: with ps; [ ]; # missing inputs: zhong_hong_hvac "ziggo_mediabox_xl" = ps: with ps; [ ]; # missing inputs: ziggo-mediabox-xl "zodiac" = ps: with ps; [ ]; "zone" = ps: with ps; [ ]; "zoneminder" = ps: with ps; [ zm-py ]; "zwave" = ps: with ps; [ aiohttp-cors homeassistant-pyozw paho-mqtt pydispatcher python-openzwave-mqtt ]; - "zwave_js" = ps: with ps; [ aiohttp-cors zwave-js-server-python ]; + "zwave_js" = ps: with ps; [ aiohttp-cors pyserial pyudev zwave-js-server-python ]; }; } diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 2e1dbfbcacb8..9cd83d69eec3 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -21,21 +21,22 @@ let defaultOverrides = [ - # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt - (mkOverride "python-slugify" "4.0.1" "69a517766e00c1268e5bbfc0d010a0a8508de0b18d30ad5a1ff357f8ae724270") - + # Pinned due to API changes in async-upnp-client>=0.20.0, remove after (self: super: { async-upnp-client = super.async-upnp-client.overridePythonAttrs (oldAttrs: rec { - version = "0.19.2"; + version = "0.20.0"; src = fetchFromGitHub { owner = "StevenLooman"; repo = "async_upnp_client"; - rev = version; - sha256 = "1v8d2lvxihqasn7866zssys16s0lgxkk6ri2dp4rr7wr8g9ixvdr"; + rev = "v${version}"; + sha256 = "sha256-jxYGOljV7tcsiAgpOhbXj7g7AwyP1kDDC83PiHG6ZFg="; }; }); }) + # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt + (mkOverride "python-slugify" "4.0.1" "69a517766e00c1268e5bbfc0d010a0a8508de0b18d30ad5a1ff357f8ae724270") + # Pinned due to API changes in iaqualink>=2.0, remove after # https://github.com/home-assistant/core/pull/48137 was merged (self: super: { @@ -95,6 +96,9 @@ let }); }) + # Pinned due to API changes in 0.1.0 + (mkOverride "poolsense" "0.0.8" "09y4fq0gdvgkfsykpxnvmfv92dpbknnq5v82spz43ak6hjnhgcyp") + # Pinned due to changes in total-connect-client>0.58 which made the tests fails at the moment (self: super: { total-connect-client = super.total-connect-client.overridePythonAttrs (oldAttrs: rec { @@ -112,19 +116,6 @@ let (self: super: { home-assistant-frontend = self.callPackage ./frontend.nix { }; }) - - # Pinned due to incompability with aioesphomeapi 8.0.0 - (self: super: { - aioesphomeapi = super.aioesphomeapi.overrideAttrs (oldAttrs: rec { - version = "7.0.0"; - src = fetchFromGitHub { - owner = "esphome"; - repo = oldAttrs.pname; - rev = "v${version}"; - hash = "sha256-ho/1fpq4yAgmYNERPqs51oqr08ncaN9+GRTUUuGU7ps="; - }; - }); - }) ]; mkOverride = attrname: version: sha256: @@ -154,7 +145,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.8.8"; + hassVersion = "2021.9.6"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -171,7 +162,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "1fj16qva04d9qhpnfxxacsp82vqqfha5c2zg4f850kld4qhwrgky"; + sha256 = "1ac56gdnhzkf19h29g0f54camw6v1cg5wx0crhm23r45qlfsjacs"; }; # leave this in, so users don't have to constantly update their downstream patch handling @@ -181,7 +172,6 @@ in with py.pkgs; buildPythonApplication rec { postPatch = '' substituteInPlace setup.py \ - --replace "attrs==21.2.0" "attrs" \ --replace "awesomeversion==21.4.0" "awesomeversion" \ --replace "bcrypt==3.1.7" "bcrypt" \ --replace "cryptography==3.3.2" "cryptography" \ @@ -234,6 +224,7 @@ in with py.pkgs; buildPythonApplication rec { pytest-xdist pytestCheckHook requests-mock + stdlib-list jsonpickle respx # required by tests/auth/mfa_modules @@ -796,6 +787,9 @@ in with py.pkgs; buildPythonApplication rec { "--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" + # wemo/test_sensor.py: KeyError for various power attributes + "--deselect tests/components/wemo/test_sensor.py::TestInsightTodayEnergy::test_state_unavailable" + "--deselect tests/components/wemo/test_sensor.py::TestInsightCurrentPower::test_state_unavailable" # 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/ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 926cb48ce30e..3e32f7276867 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 = "20210809.0"; + version = "20210830.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-5NWNDhQ7XKK9/tC+SbpwOm2MSA2VGHLcE1ggyl6vPkc="; + sha256 = "sha256-4sNCnYFQ4IjmMPj7axgienZUMDo+GwTJ38cEf0iZzJI="; }; # 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 56f7b0aaede8..8a47daf51c55 100755 --- a/pkgs/servers/home-assistant/update.sh +++ b/pkgs/servers/home-assistant/update.sh @@ -31,6 +31,8 @@ sed -i -e "s/hassVersion =.*/hassVersion = \"${TARGET_VERSION}\";/" \ ./parse-requirements.py +read + ( cd ../../.. nix-update --version "$TARGET_VERSION" --build home-assistant From cf755399718e2d1a1c7f36b48d95c56450f5ecef Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 15 Sep 2021 18:18:49 +0200 Subject: [PATCH 42/42] nixos/home-assistant: allow serial access for usb discovery and zwave_js via https://www.home-assistant.io/blog/2021/09/01/release-20219/#usb-discovery and https://www.home-assistant.io/integrations/usb/ --- nixos/modules/services/misc/home-assistant.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix index 73ec3b9a17a2..800bea4ff571 100644 --- a/nixos/modules/services/misc/home-assistant.nix +++ b/nixos/modules/services/misc/home-assistant.nix @@ -310,11 +310,13 @@ in { "serial_pm" "sms" "upb" + "usb" "velbus" "w800rf32" "xbee" "zha" "zwave" + "zwave_js" ]; in { ExecStart = "${package}/bin/hass --runner --config '${cfg.configDir}'";