From 68026a22190b37b74015283efb369a90a76cb509 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 13 Jan 2021 16:59:53 +0100 Subject: [PATCH 01/11] python3Packages.hydrawiser: init at 0.2 --- .../python-modules/hydrawiser/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/hydrawiser/default.nix diff --git a/pkgs/development/python-modules/hydrawiser/default.nix b/pkgs/development/python-modules/hydrawiser/default.nix new file mode 100644 index 00000000000..feccc73707c --- /dev/null +++ b/pkgs/development/python-modules/hydrawiser/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytest-cov +, pytestCheckHook +, pythonOlder +, pyyaml +, requests +, requests-mock +}: + +buildPythonPackage rec { + pname = "hydrawiser"; + version = "0.2"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "ptcryan"; + repo = pname; + rev = "v${version}"; + sha256 = "161hazlpvd71xcl2ja86560wm5lnrjv210ki3ji37l6c6gwmhjdj"; + }; + + propagatedBuildInputs = [ requests ]; + + checkInputs = [ + pytest-asyncio + pytest-cov + pytestCheckHook + requests + requests-mock + ]; + + pythonImportsCheck = [ "hydrawiser" ]; + + meta = with lib; { + description = "Python library for Hydrawise API"; + homepage = "https://github.com/ptcryan/hydrawiser"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4c738a3cef9..f45f2e2a40e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2952,6 +2952,8 @@ in { hydra-check = callPackage ../development/python-modules/hydra-check { }; + hydrawiser = callPackage ../development/python-modules/hydrawiser { }; + hypchat = callPackage ../development/python-modules/hypchat { }; hyperframe = callPackage ../development/python-modules/hyperframe { }; From e6b1439ac26aba939b39c3d86f00f690288ba424 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Wed, 13 Jan 2021 16:00:15 +0000 Subject: [PATCH 02/11] electron_11: 11.1.0 -> 11.2.0 https://github.com/electron/electron/releases/tag/v11.2.0 --- pkgs/development/tools/electron/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 29d00a159ab..27e4eb88d46 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -94,12 +94,12 @@ rec { headers = "116h3b02da18w5mqgw6adgbzc9l02vl3c62syw4wsy6xww6i0mgr"; }; - electron_11 = mkElectron "11.1.0" { - x86_64-linux = "64f9c0864a12a9e0a435b967ed63209a9bb447456aafe8660edaaa2f6517c538"; - x86_64-darwin = "827b0b3e562535de25d3e4d2c4d7529338efae9197e8cf6702dda786b5870bd0"; - i686-linux = "aa424de2c480d0deb26aa53dc45622857521cb9876cf29a52d32a4da66cae3c6"; - armv7l-linux = "375bbea1ecf521ab95760052df5e0ad167e41f61cc79c7c441553ecc2f64d1dd"; - aarch64-linux = "caaf1f9a2e62c9dbbcb777e5c64640d8a1f60a0f5791a2c8f62ab44067c88777"; - headers = "1kafrz2rxryv7psgfn20qrkpcn83hi9fz7df2ra1nzkngfj7xdjr"; + electron_11 = mkElectron "11.2.0" { + x86_64-linux = "a2ed11a5ec9ad10302053e5e2bdf2abf0f9bac521e4f80a377308bffe8c24c00"; + x86_64-darwin = "c8485cc6cb754bccfb1a01db93f5f0f1ee1ed3017551f3d25a1191c7c7aea654"; + i686-linux = "508b9276f97c66418e530cbfa584701d4b0a42825fb2519b21ff161db1dc121f"; + armv7l-linux = "edf1ad6606eab5efc1c9a33ce16489dae1df21ce6e69166f4c8da27ca6fde2ca"; + aarch64-linux = "ed8e318ce0ba92058efdc667790bcbfce1c7f888f9d94038c1c76ed8678158fc"; + headers = "0mwv9vm2km6sawyds87fzy7m4pcmmwl9c2qihs1nc7cwmdz388lv"; }; } From 27f11bd967b011fb051df7beec75e5e3065fdedd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 13 Jan 2021 17:02:13 +0100 Subject: [PATCH 03/11] 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 8404d6645e5..417c60bff62 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -367,7 +367,7 @@ "humidifier" = ps: with ps; [ ]; "hunterdouglas_powerview" = ps: with ps; [ ]; # missing inputs: aiopvapi "hvv_departures" = ps: with ps; [ ]; # missing inputs: pygti - "hydrawise" = ps: with ps; [ ]; # missing inputs: hydrawiser + "hydrawise" = ps: with ps; [ hydrawiser ]; "hyperion" = ps: with ps; [ ]; # missing inputs: hyperion-py "iammeter" = ps: with ps; [ ]; # missing inputs: iammeter "iaqualink" = ps: with ps; [ ]; # missing inputs: iaqualink From e0dd82d30972390962d7f3351b7babf90e567a09 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 13 Jan 2021 17:51:42 +0100 Subject: [PATCH 04/11] python3Packages.icmplib: init at 2.0.1 --- .../python-modules/icmplib/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/icmplib/default.nix diff --git a/pkgs/development/python-modules/icmplib/default.nix b/pkgs/development/python-modules/icmplib/default.nix new file mode 100644 index 00000000000..b89df0bd2ce --- /dev/null +++ b/pkgs/development/python-modules/icmplib/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pbr +, pythonOlder +, requests +, six +}: + +buildPythonPackage rec { + pname = "icmplib"; + version = "2.0.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "ValentinBELYN"; + repo = pname; + rev = "v${version}"; + sha256 = "0vps4iz87f8l0z3va92srsx5v19nnd65c22hvbgvhag3vhqsxg7h"; + }; + + propagatedBuildInputs = [ + pbr + six + requests + ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "icmplib" ]; + + meta = with lib; { + description = "Python implementation of the ICMP protocol"; + homepage = "https://github.com/ValentinBELYN/icmplib"; + license = with licenses; [ lgpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4c738a3cef9..d74ee8dc734 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2985,6 +2985,8 @@ in { icecream = callPackage ../development/python-modules/icecream { }; + icmplib = callPackage ../development/python-modules/icmplib { }; + ics = callPackage ../development/python-modules/ics { }; identify = callPackage ../development/python-modules/identify { }; From e8a2613d589ca02973580160faf8faa8c8fa89df Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 13 Jan 2021 17:53:00 +0100 Subject: [PATCH 05/11] 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 8404d6645e5..fb067131549 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -615,7 +615,7 @@ "picotts" = ps: with ps; [ ]; "piglow" = ps: with ps; [ ]; # missing inputs: piglow "pilight" = ps: with ps; [ ]; # missing inputs: pilight - "ping" = ps: with ps; [ ]; # missing inputs: icmplib + "ping" = ps: with ps; [ icmplib ]; "pioneer" = ps: with ps; [ ]; "pjlink" = ps: with ps; [ ]; # missing inputs: pypjlink2 "plaato" = ps: with ps; [ aiohttp-cors ]; From ab879aa622c4b051fb4ca6519ce0b38b9b98e8fe Mon Sep 17 00:00:00 2001 From: archaeron Date: Wed, 13 Jan 2021 17:57:07 +0100 Subject: [PATCH 06/11] nushell: 0.24.1 -> 0.25.1 --- pkgs/shells/nushell/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 1774a1c6677..74843dea6cc 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.24.1"; + version = "0.25.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0nza860gg9lnkld9c7is93fmfxl9yay8yf2f18h16cgjk3n686kd"; + sha256 = "0wsl57i3cd9whqvgjdnbz05230mkn2174gqld7mzn9iiym1rkcm4"; }; - cargoSha256 = "1mb6ws2zw089cx475c1vpvvxkzi8by6wmw4frans5lbl3a2lldl0"; + cargoSha256 = "1ifvfwmrl97skjwp1qwrj863npsxcgfqm4a81cvw9bqhbylbjc77"; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ]; From 113848213f07d429ff9eafcc3ed590aeb76d292e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 13 Jan 2021 18:08:46 +0100 Subject: [PATCH 07/11] python3Packages.poolsense: init at 0.0.8 --- .../python-modules/poolsense/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/poolsense/default.nix diff --git a/pkgs/development/python-modules/poolsense/default.nix b/pkgs/development/python-modules/poolsense/default.nix new file mode 100644 index 00000000000..0ffdf895227 --- /dev/null +++ b/pkgs/development/python-modules/poolsense/default.nix @@ -0,0 +1,28 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "poolsense"; + version = "0.0.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "09y4fq0gdvgkfsykpxnvmfv92dpbknnq5v82spz43ak6hjnhgcyp"; + }; + + propagatedBuildInputs = [ aiohttp ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "poolsense" ]; + + meta = with lib; { + description = "Python module to access PoolSense device"; + homepage = "https://github.com/haemishkyd/poolsense"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4c738a3cef9..f8c21131cc1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4864,6 +4864,8 @@ in { pooch = callPackage ../development/python-modules/pooch { }; + poolsense = callPackage ../development/python-modules/poolsense { }; + poppler-qt5 = callPackage ../development/python-modules/poppler-qt5 { inherit (pkgs.qt5) qtbase; inherit (pkgs.libsForQt5) poppler; From 6bb763e820a86385da4e6c893404908dd29a0e3e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 13 Jan 2021 18:27:18 +0100 Subject: [PATCH 08/11] 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 8404d6645e5..f3815bca941 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -625,7 +625,7 @@ "plum_lightpad" = ps: with ps; [ ]; # missing inputs: plumlightpad "pocketcasts" = ps: with ps; [ ]; # missing inputs: pycketcasts "point" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pypoint - "poolsense" = ps: with ps; [ ]; # missing inputs: poolsense + "poolsense" = ps: with ps; [ poolsense ]; "powerwall" = ps: with ps; [ ]; # missing inputs: tesla-powerwall "profiler" = ps: with ps; [ objgraph pyprof2calltree ]; # missing inputs: guppy3 "progettihwsw" = ps: with ps; [ ]; # missing inputs: progettihwsw From 52a6cc02c5fc308c0a034d3a484b8ca45de3f8fd Mon Sep 17 00:00:00 2001 From: ilian Date: Wed, 13 Jan 2021 19:15:09 +0100 Subject: [PATCH 09/11] openldap: fix typo in maintainers --- nixos/modules/services/databases/openldap.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix index 94a5c573768..f0efc659cff 100644 --- a/nixos/modules/services/databases/openldap.nix +++ b/nixos/modules/services/databases/openldap.nix @@ -244,7 +244,7 @@ in { }; }; - meta.maintainers = with lib.maintainters; [ mic92 kwohlfahrt ]; + meta.maintainers = with lib.maintainers; [ mic92 kwohlfahrt ]; config = mkIf cfg.enable { assertions = map (opt: { From 25d391213329df420747dc6fcaf488661aa839c5 Mon Sep 17 00:00:00 2001 From: Pamplemousse Date: Wed, 13 Jan 2021 11:46:17 -0700 Subject: [PATCH 10/11] radare2: Minor cleaning in expression Upstream is fixed: Removing this line does not break the build. Signed-off-by: Pamplemousse --- pkgs/development/tools/analysis/radare2/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 3d6ec0f1bf3..a3c02503b37 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -56,11 +56,6 @@ let # radare 3.3 compat for radare2-cutter (cd shlr && ln -s ../capstone-${cs_ver} capstone) tar -czvf shlr/capstone-${cs_ver}.tar.gz capstone-${cs_ver} - # necessary because they broke the offline-build: - # https://github.com/radare/radare2/commit/6290e4ff4cc167e1f2c28ab924e9b99783fb1b38#diff-a44d840c10f1f1feaf401917ae4ccd54R258 - # https://github.com/radare/radare2/issues/13087#issuecomment-465159716 - curl() { true; } - export -f curl ''; postInstall = '' From a089d80e15875023cb30ad7ad209063944631335 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 14 Jan 2021 10:51:14 +0800 Subject: [PATCH 11/11] darkhttpd: drive-by cleanup --- pkgs/servers/http/darkhttpd/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/http/darkhttpd/default.nix b/pkgs/servers/http/darkhttpd/default.nix index 84adea1f4dc..49097fe2bfa 100644 --- a/pkgs/servers/http/darkhttpd/default.nix +++ b/pkgs/servers/http/darkhttpd/default.nix @@ -12,19 +12,16 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; installPhase = '' - # install darkhttpd - install -Dm755 "darkhttpd" "$out/bin/darkhttpd" - - # install license - install -d "$out/share/licenses/darkhttpd" - head -n 18 darkhttpd.c > "$out/share/licenses/darkhttpd/LICENSE" + install -Dm555 -t $out/bin darkhttpd + install -Dm444 -t $out/share/doc/${pname} README + head -n 18 darkhttpd.c > $out/share/doc/${pname}/LICENSE ''; meta = with lib; { description = "Small and secure static webserver"; - homepage = "https://unix4lyfe.org/darkhttpd/"; - license = licenses.bsd3; + homepage = "https://unix4lyfe.org/darkhttpd/"; + license = licenses.bsd3; maintainers = with maintainers; [ bobvanderlinden ]; - platforms = platforms.all; + platforms = platforms.all; }; }