From 52c35767ae7d8cdb86bf8fb10d570b3562d1bc34 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Fri, 16 Apr 2021 10:18:32 -0400 Subject: [PATCH 1/5] python3Packages.tqdm: 4.58.0 -> 4.60.0 --- .../development/python-modules/tqdm/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index 70893dc541f..ae89b3ee0b0 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.58.0"; + version = "4.60.0"; src = fetchPypi { inherit pname version; - sha256 = "1fjvaag1wy70gglxjkfnn0acrya7fbhzi4adbs1bpap8x03wffn2"; + sha256 = "ebdebdb95e3477ceea267decfc0784859aa3df3e27e22d23b83e9b272bf157ae"; }; nativeBuildInputs = [ @@ -39,14 +39,19 @@ buildPythonPackage rec { # Remove performance testing. # Too sensitive for on Hydra. - PYTEST_ADDOPTS = "-k \"not perf\""; + disabledTests = [ + "perf" + ]; LC_ALL="en_US.UTF-8"; - meta = { + pythonImportsCheck = [ "tqdm" ]; + + meta = with lib; { description = "A Fast, Extensible Progress Meter"; homepage = "https://github.com/tqdm/tqdm"; - license = with lib.licenses; [ mit ]; - maintainers = with lib.maintainers; [ fridh ]; + changelog = "https://tqdm.github.io/releases/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fridh ]; }; } From f4d48fc720547d1c63562267b6574f06d1e027b4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 22 Apr 2021 20:02:54 +0200 Subject: [PATCH 2/5] python3Packages.pydroid-ipcam: init at unstable-2021-04-16 --- .../python-modules/pydroid-ipcam/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/pydroid-ipcam/default.nix diff --git a/pkgs/development/python-modules/pydroid-ipcam/default.nix b/pkgs/development/python-modules/pydroid-ipcam/default.nix new file mode 100644 index 00000000000..ca171edde44 --- /dev/null +++ b/pkgs/development/python-modules/pydroid-ipcam/default.nix @@ -0,0 +1,36 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, yarl +}: + +buildPythonPackage rec { + pname = "pydroid-ipcam"; + version = "unstable-2021-04-16"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = pname; + rev = "9f22682c6f9182aa5e42762f52223337b8b6909c"; + sha256 = "1lvppyzmwg0fp8zch11j51an4sb074yl9shzanakvjmbqpnif6s6"; + }; + + propagatedBuildInputs = [ + aiohttp + yarl + ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "pydroid_ipcam" ]; + + meta = with lib; { + description = "Python library for Android IP Webcam"; + homepage = "https://github.com/home-assistant-libs/pydroid-ipcam"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7488dfd8fd3..8973960b23e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5785,6 +5785,8 @@ in { pydrive = callPackage ../development/python-modules/pydrive { }; + pydroid-ipcam = callPackage ../development/python-modules/pydroid-ipcam { }; + pydsdl = callPackage ../development/python-modules/pydsdl { }; pydub = callPackage ../development/python-modules/pydub { }; From d312288e17991738c34572190b9759bc9672f7ba Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 23 Apr 2021 09:09:36 +0200 Subject: [PATCH 3/5] home-assistant: update component-packages --- 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 65d304fb90b..b27a39d4e91 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -32,7 +32,7 @@ "amcrest" = ps: with ps; [ amcrest ha-ffmpeg ]; "ampio" = ps: with ps; [ ]; # missing inputs: asmog "analytics" = ps: with ps; [ aiohttp-cors ]; - "android_ip_webcam" = ps: with ps; [ ]; # missing inputs: pydroid-ipcam + "android_ip_webcam" = ps: with ps; [ pydroid-ipcam ]; "androidtv" = ps: with ps; [ adb-shell androidtv pure-python-adb ]; "anel_pwrctrl" = ps: with ps; [ ]; # missing inputs: anel_pwrctrl-homeassistant "anthemav" = ps: with ps; [ ]; # missing inputs: anthemav From a4597c441706e258a5fdb3827501202fac4fa088 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Fri, 23 Apr 2021 11:55:43 +0100 Subject: [PATCH 4/5] dockle: 0.3.11 -> 0.3.13 --- pkgs/development/tools/dockle/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/dockle/default.nix b/pkgs/development/tools/dockle/default.nix index 5ecaddc6f1b..f0d8a5ac6e0 100644 --- a/pkgs/development/tools/dockle/default.nix +++ b/pkgs/development/tools/dockle/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dockle"; - version = "0.3.11"; + version = "0.3.13"; src = fetchFromGitHub { owner = "goodwithtech"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TAV+bdHURclrwM0ByfbM2S4GdAnHrwclStyUlGraOpw="; + sha256 = "sha256-U0nIGuQ4QjBaCck0Kg1RTS2IQwfivN3VI5vxh8lxAYE="; }; - vendorSha256 = "sha256-npbUE3ch8TamW0aikdKuFElE4YDRKwNVUscuvmlQxl4="; + vendorSha256 = "sha256-uHHm4AgnjTdPgpu3OpXXIRzrGhkpOoRY8qynfl7DO6w="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ btrfs-progs lvm2 ]; From fe3c957f3753a3b33107ca39cea8c4cd1b93f620 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 23 Apr 2021 13:28:44 +0200 Subject: [PATCH 5/5] angrop: init at 9.0.6790 --- .../python-modules/angrop/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/angrop/default.nix diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix new file mode 100644 index 00000000000..45c092cf0d6 --- /dev/null +++ b/pkgs/development/python-modules/angrop/default.nix @@ -0,0 +1,37 @@ +{ lib +, angr +, buildPythonPackage +, fetchFromGitHub +, progressbar +, pythonOlder +}: + +buildPythonPackage rec { + pname = "angrop"; + version = "9.0.6790"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "angr"; + repo = pname; + rev = "v${version}"; + sha256 = "16r22ajkj8sxbgsym0i85xdjvphgf1566p5s7d915kkj37qdrrpy"; + }; + + propagatedBuildInputs = [ + angr + progressbar + ]; + + # Tests have additional requirements, e.g., angr binaries + # cle is executing the tests with the angr binaries already and is a requirement of angr + doCheck = false; + pythonImportsCheck = [ "angrop" ]; + + meta = with lib; { + description = "ROP gadget finder and chain builder"; + homepage = "https://github.com/angr/angrop"; + license = with licenses; [ bsd2 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8169495a3e1..3839daa1ac3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -395,6 +395,8 @@ in { angr = callPackage ../development/python-modules/angr { }; + angrop = callPackage ../development/python-modules/angrop { }; + aniso8601 = callPackage ../development/python-modules/aniso8601 { }; annexremote = callPackage ../development/python-modules/annexremote { };