From 8b6de797ed058c90d90e77d438cfda2c9d6977ea Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 18 Jun 2021 21:08:31 +0200 Subject: [PATCH 01/13] exploitdb: 2021-06-12 -> 2021-06-18 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 40ff36c1b18..922b6c3f2ba 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-06-12"; + version = "2021-06-18"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-62Yi5JTrVlN4V2jfiyEUbl8GidaYgcuBkYGyb6ldihQ="; + sha256 = "0b91r7bl3abg3mb7vg4qnk319jy7civ583la0054xhpg0c0svyk1"; }; installPhase = '' From e9d2c701e15aa60a2617827af5026d72b07bc456 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Fri, 18 Jun 2021 22:41:36 +0200 Subject: [PATCH 02/13] vault: 1.7.2 -> 1.7.3 --- pkgs/tools/security/vault/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index eb5ac31d300..45bd76b9091 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "vault"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "0nd77lfccl71qn98cq1yz85aiafplxbr58nafbbflijs1fz1771q"; + sha256 = "sha256-BO4xzZrX9eVETQWjBDBfP7TlD7sO+gLgbB330A11KAI="; }; goPackagePath = "github.com/hashicorp/vault"; From 20569d40d4ca626e6ad2f59bf73d8de8f2a74a81 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Fri, 18 Jun 2021 22:41:46 +0200 Subject: [PATCH 03/13] vault-bin: 1.7.2 -> 1.7.3 --- 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 b283a40888b..11175c3c889 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 }: let - version = "1.7.2"; + version = "1.7.3"; sources = let base = "https://releases.hashicorp.com/vault/${version}"; in { x86_64-linux = fetchurl { url = "${base}/vault_${version}_linux_amd64.zip"; - sha256 = "1g37pgj7hbi6vfpwq9rrh6is980lfwbq5jb4736jfp5m360vprjy"; + sha256 = "sha256-hFMTKpO3VcCondSy8amb1K8G+BZ7gZF/EXCAg5Ax4D8="; }; i686-linux = fetchurl { url = "${base}/vault_${version}_linux_386.zip"; - sha256 = "0777xkkfiy0s3nyygcfpw0nbfsm6yz1n5hxcvfafhzcdyr58fpb7"; + sha256 = "02wbbzffb2m7y3476l5qa5dhi0v30f3sfif0svqhhzh927kg4s5w"; }; x86_64-darwin = fetchurl { url = "${base}/vault_${version}_darwin_amd64.zip"; - sha256 = "0wzmah542bhyvrm9brhrx7drjyzan8vxhqnm0gjak5wlrcnf2dvx"; + sha256 = "0sw56dhjbasdnlwg668swhyxrn5gy7h9gysdg96za4dhq3iimkrn"; }; aarch64-linux = fetchurl { url = "${base}/vault_${version}_linux_arm64.zip"; - sha256 = "0cs56ircad2z2msqgb0l5h53cwmwybi5rs4y2jigz4rq4ndx9f9b"; + sha256 = "0c2w0684adaqildwviajp6pi8vp76g4zwwgc1k2bb5mwv1h2y293"; }; }; From 52651ca62a9e9bf5833ffda13baed4b96b766381 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 18 Jun 2021 22:46:49 +0000 Subject: [PATCH 04/13] chromium: fix APNG support https://bugs.chromium.org/p/chromium/issues/detail?id=752403 --- pkgs/applications/networking/browsers/chromium/common.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 156932aa13f..18565f31a2f 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -92,9 +92,10 @@ let }; defaultDependencies = [ + (libpng.override { apngSupport = false; }) # https://bugs.chromium.org/p/chromium/issues/detail?id=752403 bzip2 flac speex opusWithCustomModes libevent expat libjpeg snappy - libpng libcap + libcap xdg-utils minizip libwebp libusb1 re2 ffmpeg libxslt libxml2 From 3abfb38f083f4fdbab30f88858e06283bf9c10c6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 18 Jun 2021 21:36:08 +0200 Subject: [PATCH 05/13] python3Packages.adafruit-platformdetect: 3.13.4 -> 3.14.0 --- .../python-modules/adafruit-platformdetect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 64df2e02759..adb72d0cd03 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.13.4"; + version = "3.14.0"; src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - sha256 = "sha256-e8hliPYLvHR3JjZ4AFgJWjPW1vK10BYuVqUYtF54J5c="; + sha256 = "1v33546cflsbm6k8mhmi1r5c8fqjlirvzmf62a604xns8wrxb88h"; }; nativeBuildInputs = [ setuptools-scm ]; From 7df9c074470664698f9439cd6ce5c7fdab38828e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 19 Jun 2021 11:44:44 +0200 Subject: [PATCH 06/13] pythonPackages.habitipy: init at 0.3.0 --- .../python-modules/habitipy/default.nix | 47 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/python-modules/habitipy/default.nix diff --git a/pkgs/development/python-modules/habitipy/default.nix b/pkgs/development/python-modules/habitipy/default.nix new file mode 100644 index 00000000000..d20c89e82e7 --- /dev/null +++ b/pkgs/development/python-modules/habitipy/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, plumbum +, requests +, setuptools +, hypothesis +, nose +, responses +}: + +buildPythonPackage rec { + pname = "habitipy"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "ASMfreaK"; + repo = "habitipy"; + rev = "v${version}"; + sha256 = "1vf485z5m4h61p64zr3sgkcil2s3brq7dja4n7m49d1fvzcirylv"; + }; + + propagatedBuildInputs = [ + plumbum + requests + setuptools + ]; + + checkInputs = [ + hypothesis + nose + responses + ]; + + checkPhase = '' + HOME=$TMPDIR nosetests + ''; + + pythonImportsCheck = [ "habitipy" ]; + + meta = with lib; { + description = "Tools and library for Habitica restful API"; + homepage = "https://github.com/ASMfreaK/habitipy"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a6ebffcb891..9adf1f90129 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3160,6 +3160,8 @@ in { habanero = callPackage ../development/python-modules/habanero { }; + habitipy = callPackage ../development/python-modules/habitipy { }; + hachoir = callPackage ../development/python-modules/hachoir { }; hdate = callPackage ../development/python-modules/hdate { }; From 1f356cf7a8d1a900c71741ab19393abde262cd36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 19 Jun 2021 11:45:22 +0200 Subject: [PATCH 07/13] home-assistant: update component-packages.nix --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 1a0d0b0f89f..159b77e8b77 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -335,7 +335,7 @@ "gstreamer" = ps: with ps; [ ]; # missing inputs: gstreamer-player "gtfs" = ps: with ps; [ pygtfs ]; "guardian" = ps: with ps; [ aioguardian ]; - "habitica" = ps: with ps; [ ]; # missing inputs: habitipy + "habitica" = ps: with ps; [ habitipy ]; "hangouts" = ps: with ps; [ ]; # missing inputs: hangups "harman_kardon_avr" = ps: with ps; [ ]; # missing inputs: hkavr "harmony" = ps: with ps; [ aioharmony ]; From d8e175011a0656f7078d76f406b2976f2f849ec0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 19 Jun 2021 11:46:33 +0200 Subject: [PATCH 08/13] home-assistant: test habitica component --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 87fdb9f4231..b0ba15e8820 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -435,6 +435,7 @@ in with py.pkgs; buildPythonApplication rec { "group" "growatt_server" "guardian" + "habitica" "harmony" "hassio" "hddtemp" From 6f9d7000ce1cc2a8a87e55a2d5b0925afb500b14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 19 Jun 2021 12:10:54 +0200 Subject: [PATCH 09/13] pythonPackages.readlike: init at 0.1.3 --- .../python-modules/readlike/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/readlike/default.nix diff --git a/pkgs/development/python-modules/readlike/default.nix b/pkgs/development/python-modules/readlike/default.nix new file mode 100644 index 00000000000..f2e3d11e7ed --- /dev/null +++ b/pkgs/development/python-modules/readlike/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, python +}: + +buildPythonPackage rec { + pname = "readlike"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "jangler"; + repo = "readlike"; + rev = version; + sha256 = "1mw8j8ads8hqdbz42siwpffi4wi5s33z9g14a5c2i7vxp8m68qc1"; + }; + + checkPhase = '' + ${python.interpreter} -m unittest discover -s tests + ''; + + meta = with lib; { + description = "GNU Readline-like line editing module"; + homepage = "https://github.com/jangler/readlike"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9adf1f90129..cdc571cc886 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7313,6 +7313,8 @@ in { readchar = callPackage ../development/python-modules/readchar { }; + readlike = callPackage ../development/python-modules/readlike { }; + readme = callPackage ../development/python-modules/readme { }; readme_renderer = callPackage ../development/python-modules/readme_renderer { }; From fd6e2d87937443a3d44791c98599d058bb5c6c0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 19 Jun 2021 12:18:48 +0200 Subject: [PATCH 10/13] python3Packages.reparser: init at 1.4.3 --- .../python-modules/reparser/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/reparser/default.nix diff --git a/pkgs/development/python-modules/reparser/default.nix b/pkgs/development/python-modules/reparser/default.nix new file mode 100644 index 00000000000..90d701a0e46 --- /dev/null +++ b/pkgs/development/python-modules/reparser/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, isPy27 +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "reparser"; + version = "1.4.3"; + + disabled = isPy27; + + src = fetchFromGitHub { + owner = "xmikos"; + repo = "reparser"; + rev = "v${version}"; + sha256 = "04v7h52wny0j2qj37501nk33j0s4amm134kagdicx2is49zylzq1"; + }; + + # no tests implemented + doCheck = false; + + pythonImportsCheck = [ "reparser" ]; + + meta = with lib; { + description = "Simple regex-based lexer/parser for inline markup"; + homepage = "https://github.com/xmikos/reparser"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cdc571cc886..6df69b987c8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7353,6 +7353,8 @@ in { rencode = callPackage ../development/python-modules/rencode { }; + reparser = callPackage ../development/python-modules/reparser { }; + repeated_test = callPackage ../development/python-modules/repeated_test { }; repocheck = callPackage ../development/python-modules/repocheck { }; From 07d5520ce2e8f6ae4bad34fc4f8cb1db4004b6da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 19 Jun 2021 13:28:15 +0200 Subject: [PATCH 11/13] python3Packages.hangups: init at 0.4.14 --- .../python-modules/hangups/default.nix | 70 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 72 insertions(+) create mode 100644 pkgs/development/python-modules/hangups/default.nix diff --git a/pkgs/development/python-modules/hangups/default.nix b/pkgs/development/python-modules/hangups/default.nix new file mode 100644 index 00000000000..9c32bc2dd95 --- /dev/null +++ b/pkgs/development/python-modules/hangups/default.nix @@ -0,0 +1,70 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, configargparse +, aiohttp +, async-timeout +, appdirs +, readlike +, requests +, reparser +, protobuf +, urwid +, mechanicalsoup +, httpretty +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "hangups"; + version = "0.4.14"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "tdryer"; + repo = "hangups"; + rev = "v${version}"; + sha256 = "14njagpdp13zlaqnwl2mh7fkpnsaqr6wkr4lwh608v06pkwwcwcm"; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "protobuf>=3.1.0,<3.16" "protobuf" \ + --replace "MechanicalSoup>=0.6.0,<0.13" "MechanicalSoup" + ''; + + propagatedBuildInputs = [ + configargparse + aiohttp + async-timeout + appdirs + readlike + requests + reparser + protobuf + urwid + mechanicalsoup + ]; + + checkInputs = [ + httpretty + pytestCheckHook + ]; + + pythonImportsCheck = [ + "hangups" + "hangups.client" + "hangups.event" + "hangups.parsers" + "hangups.user" + ]; + + meta = with lib; { + description = "The first third-party instant messaging client for Google Hangouts"; + homepage = "https://github.com/tdryer/hangups"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6df69b987c8..58f9c3d0e02 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3174,6 +3174,8 @@ in { handout = callPackage ../development/python-modules/handout { }; + hangups = callPackage ../development/python-modules/hangups { }; + hap-python = callPackage ../development/python-modules/hap-python { }; hass-nabucasa = callPackage ../development/python-modules/hass-nabucasa { }; From 46c5313b78d1c0152dd734c74ea4c4e70bada879 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 19 Jun 2021 13:33:01 +0200 Subject: [PATCH 12/13] home-assistant: update component-packages.nix --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 159b77e8b77..d8ba038c000 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -336,7 +336,7 @@ "gtfs" = ps: with ps; [ pygtfs ]; "guardian" = ps: with ps; [ aioguardian ]; "habitica" = ps: with ps; [ habitipy ]; - "hangouts" = ps: with ps; [ ]; # missing inputs: hangups + "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 ]; From 6db54500680fd50421e8badbc58945074034f796 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 19 Jun 2021 13:35:01 +0200 Subject: [PATCH 13/13] home-assistant: test hangouts component --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index b0ba15e8820..3873692c3a1 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -436,6 +436,7 @@ in with py.pkgs; buildPythonApplication rec { "growatt_server" "guardian" "habitica" + "hangouts" "harmony" "hassio" "hddtemp"