From c3f28aed94ba37279d02b1de5eb15b8000754c5d Mon Sep 17 00:00:00 2001 From: Casey Ransom Date: Mon, 21 Jun 2021 22:58:07 -0400 Subject: [PATCH 01/15] make-disk-image: Reduce forking The disk image calculator was using find + exec forking du for every file in the disk image, making it very slow. Change du to accept files, nul delimeted on stdin to speed it back up. Before change: nix-build nixos/tests/image-contents.nix 9.71s user 1.06s system 8% cpu 2:13.11 total After change: nix-build nixos/tests/image-contents.nix 9.93s user 1.23s system 21% cpu 51.601 total --- nixos/lib/make-disk-image.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index 7d40d3b5548e..55643facea03 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -278,7 +278,7 @@ let format' = format; in let additionalSpace=$(( $(numfmt --from=iec '${additionalSpace}') + reservedSpace )) # Compute required space in filesystem blocks - diskUsage=$(find . ! -type d -exec 'du' '--apparent-size' '--block-size' "${blockSize}" '{}' ';' | cut -f1 | sum_lines) + diskUsage=$(find . ! -type d -print0 | du --files0-from=- --apparent-size --block-size "${blockSize}" | cut -f1 | sum_lines) # Each inode takes space! numInodes=$(find . | wc -l) # Convert to bytes, inodes take two blocks each! From 6e2471d793ecfadf81c32b6b54133d44a4310497 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 25 Jun 2021 15:31:54 +0000 Subject: [PATCH 02/15] twitterBootstrap: 5.0.1 -> 5.0.2 --- pkgs/development/web/twitter-bootstrap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/twitter-bootstrap/default.nix b/pkgs/development/web/twitter-bootstrap/default.nix index 65625ca7d21f..8e3fd36b73fa 100644 --- a/pkgs/development/web/twitter-bootstrap/default.nix +++ b/pkgs/development/web/twitter-bootstrap/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bootstrap"; - version = "5.0.1"; + version = "5.0.2"; src = fetchurl { url = "https://github.com/twbs/bootstrap/releases/download/v${version}/${pname}-${version}-dist.zip"; - sha256 = "sha256-eep9s1YxTHeDDh+WhDMENho/N3AfJHVitis22bIGa6w="; + sha256 = "sha256-ZvvBNDF9sjcO4JnLPRkzC1B1YG3fcMyjM9qwFlAg9sE="; }; nativeBuildInputs = [ unzip ]; From b3152c1467549871d32e8aa2e88b61e5f883c030 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 25 Jun 2021 20:07:02 +0200 Subject: [PATCH 03/15] python3Packages.dataclasses-json: 0.5.2 -> 0.5.4 --- pkgs/development/python-modules/dataclasses-json/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dataclasses-json/default.nix b/pkgs/development/python-modules/dataclasses-json/default.nix index 4a2a410c4ad5..f97217cd29ea 100644 --- a/pkgs/development/python-modules/dataclasses-json/default.nix +++ b/pkgs/development/python-modules/dataclasses-json/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "dataclasses-json"; - version = "0.5.2"; + version = "0.5.4"; src = fetchFromGitHub { owner = "lidatong"; repo = pname; rev = "v${version}"; - sha256 = "1gcnm41rwg0jvq4vhr57vv9hyasws425zl8h4p05x2nzq86l0w1n"; + sha256 = "193xklf1xrsin7fr24yqx5ckr4m5s9v1bdyr00qr51j74hiy8qsv"; }; propagatedBuildInputs = [ From 7694ae4752a3af4787d149dc187b9c7b93cbd303 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 25 Jun 2021 20:32:17 +0200 Subject: [PATCH 04/15] python3Packages.pysiaalarm: init at 3.0.0 --- .../python-modules/pysiaalarm/default.nix | 54 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/development/python-modules/pysiaalarm/default.nix diff --git a/pkgs/development/python-modules/pysiaalarm/default.nix b/pkgs/development/python-modules/pysiaalarm/default.nix new file mode 100644 index 000000000000..206d24a40dc5 --- /dev/null +++ b/pkgs/development/python-modules/pysiaalarm/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, dataclasses-json +, pycryptodome +, setuptools +, pytest-asyncio +, pytest-cases +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pysiaalarm"; + version = "3.0.0"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "b1c3a3d48d399bc91014167f59b23af601044d182db9267c23a9cf3559922122"; + }; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "==" ">=" + substituteInPlace pytest.ini \ + --replace "--cov pysiaalarm --cov-report term-missing" "" + ''; + + propagatedBuildInputs = [ + dataclasses-json + pycryptodome + setuptools + ]; + + checkInputs = [ + pytest-asyncio + pytest-cases + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pysiaalarm" + "pysiaalarm.aio" + ]; + + meta = with lib; { + description = "Python package for creating a client that talks with SIA-based alarm systems"; + homepage = "https://github.com/eavanvalkenburg/pysiaalarm"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8a12c1556ab1..0ee4004dee55 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5325,6 +5325,8 @@ in { pyshark = callPackage ../development/python-modules/pyshark { }; + pysiaalarm = callPackage ../development/python-modules/pysiaalarm { }; + pytest-subprocess = callPackage ../development/python-modules/pytest-subprocess { }; python-codon-tables = callPackage ../development/python-modules/python-codon-tables { }; From 111cc8838a3443f4031ddedef9d15966067d1386 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 25 Jun 2021 20:33:44 +0200 Subject: [PATCH 05/15] 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 c17cb8d1714d..03972e9134be 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -750,7 +750,7 @@ "shodan" = ps: with ps; [ shodan ]; "shopping_list" = ps: with ps; [ aiohttp-cors ]; "sht31" = ps: with ps; [ ]; # missing inputs: Adafruit-GPIO Adafruit-SHT31 - "sia" = ps: with ps; [ ]; # missing inputs: pysiaalarm + "sia" = ps: with ps; [ pysiaalarm ]; "sigfox" = ps: with ps; [ ]; "sighthound" = ps: with ps; [ pillow simplehound ]; "signal_messenger" = ps: with ps; [ ]; # missing inputs: pysignalclirestapi From 9cd99e192e14b345372566591e4599e1f5a71553 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 25 Jun 2021 20:34:41 +0200 Subject: [PATCH 06/15] home-assistant: test sia 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 e00b355f0c32..61508dc6d0b5 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -627,6 +627,7 @@ in with py.pkgs; buildPythonApplication rec { "shell_command" "shelly" "shopping_list" + "sia" "sigfox" "sighthound" "simplisafe" From 9be67d830ea153752ae234cf39add0fdf77e42bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 25 Jun 2021 20:49:27 +0200 Subject: [PATCH 07/15] python3Packages.krakenex: init at 2.1.0 --- .../python-modules/krakenex/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/krakenex/default.nix diff --git a/pkgs/development/python-modules/krakenex/default.nix b/pkgs/development/python-modules/krakenex/default.nix new file mode 100644 index 000000000000..bf907eb847de --- /dev/null +++ b/pkgs/development/python-modules/krakenex/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +}: + +buildPythonPackage rec { + pname = "krakenex"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "veox"; + repo = "python3-krakenex"; + rev = "v${version}"; + sha256 = "0j8qmpk6lm57h80i5njhgvm1qnxllm18dlqxfd4kyxdb93si4z2p"; + }; + + propagatedBuildInputs = [ + requests + ]; + + # no tests implemented + doCheck = false; + + pythonImportsCheck = [ "krakenex" ]; + + meta = with lib; { + description = "Kraken.com cryptocurrency exchange API"; + homepage = "https://github.com/veox/python3-krakenex"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8a12c1556ab1..33801cbfe0ac 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3882,6 +3882,8 @@ in { korean-lunar-calendar = callPackage ../development/python-modules/korean-lunar-calendar { }; + krakenex = callPackage ../development/python-modules/krakenex { }; + kubernetes = callPackage ../development/python-modules/kubernetes { }; labelbox = callPackage ../development/python-modules/labelbox { }; From 67794d04f7b2944e0ad26fda15342d7501efe36e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 25 Jun 2021 20:53:37 +0200 Subject: [PATCH 08/15] python3Packages.pykrakenapi: init at 0.2.1 --- .../python-modules/pykrakenapi/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/pykrakenapi/default.nix diff --git a/pkgs/development/python-modules/pykrakenapi/default.nix b/pkgs/development/python-modules/pykrakenapi/default.nix new file mode 100644 index 000000000000..e3620e7de6ad --- /dev/null +++ b/pkgs/development/python-modules/pykrakenapi/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, krakenex +, pandas +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pykrakenapi"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "dominiktraxl"; + repo = "pykrakenapi"; + rev = "v${version}"; + sha256 = "0byqa4qk6a8ww1y822izpcfscv4frcfjysw6lx1pqyqjr23bfnbh"; + }; + + propagatedBuildInputs = [ + krakenex + pandas + ]; + + # tests require network connection + doCheck = false; + + pythonImportsCheck = [ "pykrakenapi" ]; + + meta = with lib; { + description = "Python implementation of the Kraken API"; + homepage = "https://github.com/dominiktraxl/pykrakenapi"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 33801cbfe0ac..81cdadc986bf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5311,6 +5311,8 @@ in { pyisy = callPackage ../development/python-modules/pyisy { }; + pykrakenapi = callPackage ../development/python-modules/pykrakenapi { }; + pynndescent = callPackage ../development/python-modules/pynndescent { }; pynobo = callPackage ../development/python-modules/pynobo { }; From 64e8b3df7c073824a11a16447b8d7704ba870867 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 25 Jun 2021 20:54:12 +0200 Subject: [PATCH 09/15] 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 c17cb8d1714d..7f3d463301b6 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -432,7 +432,7 @@ "kodi" = ps: with ps; [ pykodi ]; "konnected" = ps: with ps; [ aiohttp-cors konnected ]; "kostal_plenticore" = ps: with ps; [ ]; # missing inputs: kostal_plenticore - "kraken" = ps: with ps; [ ]; # missing inputs: krakenex pykrakenapi + "kraken" = ps: with ps; [ krakenex pykrakenapi ]; "kulersky" = ps: with ps; [ pykulersky ]; "kwb" = ps: with ps; [ ]; # missing inputs: pykwb "lacrosse" = ps: with ps; [ pylacrosse ]; From 0d6a4262366a10a85d8ea5b93a6a3d2d50d8a4c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 25 Jun 2021 20:55:09 +0200 Subject: [PATCH 10/15] home-assistant: test kraken 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 e00b355f0c32..d78e9558c110 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -495,6 +495,7 @@ in with py.pkgs; buildPythonApplication rec { "knx" "kodi" "konnected" + "kraken" "kulersky" "lastfm" "lcn" From c57f05447e8da6758b54a5b495c541868606ea64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 25 Jun 2021 21:49:27 +0200 Subject: [PATCH 11/15] home-assistant: test syncthing 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 e00b355f0c32..c1353e262d0b 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -662,6 +662,7 @@ in with py.pkgs; buildPythonApplication rec { "surepetcare" "switch" "switcher_kis" + "syncthing" "system_health" "system_log" "tado" From 2033cad4e69b262161cb65c698dc1b6de96c5591 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 25 Jun 2021 20:21:08 +0000 Subject: [PATCH 12/15] exploitdb: 2021-06-23 -> 2021-06-24 --- 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 0e73ac2325ed..f0489deedb69 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-23"; + version = "2021-06-24"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "15gxxs5wjxvcjh5q9h17p163byzl33zg5yjlay1f1n2ng8nypygi"; + sha256 = "sha256-7KmHb52hFhMDkpLniVNC8lR6w787dWzoWmSRW7rAl7w="; }; installPhase = '' From fb5d1d87eeab1882fccaa1c5ac72d583c7aa06ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 25 Jun 2021 23:51:35 +0200 Subject: [PATCH 13/15] gpg-tui: 0.5.0 -> 0.6.0 https://github.com/orhun/gpg-tui/blob/v0.6.0/CHANGELOG.md --- pkgs/tools/security/gpg-tui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gpg-tui/default.nix b/pkgs/tools/security/gpg-tui/default.nix index acef238c1fe6..50a014374f1a 100644 --- a/pkgs/tools/security/gpg-tui/default.nix +++ b/pkgs/tools/security/gpg-tui/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "gpg-tui"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "orhun"; repo = "gpg-tui"; rev = "v${version}"; - sha256 = "sha256-D3H1tJ+7ObNssrc/eMzYQPxeA8cOpGgRF/5VX2kfha0="; + sha256 = "sha256-aKMO/T7jojlQGdtOqsEqTtnSBkVjyFuXmPxvFjVYl4Y="; }; - cargoSha256 = "sha256-0NctI16ZsOAEkuCRQ45aOl4p2a3N6Nx88HwtbWht/UY="; + cargoSha256 = "sha256-hRpzW2kISPZ2lwun+nqTi8vIv+9j6r/0yI1TjtH+ltw="; nativeBuildInputs = [ gpgme # for gpgme-config From 104c2ede734f9a2159025a5bafe3a5e59be9f1ff Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 25 Jun 2021 20:40:24 -0400 Subject: [PATCH 14/15] pythonPackages.awkward: 1.2.3 -> 1.3.0 --- pkgs/development/python-modules/awkward/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index 4057758155e6..b39a72903876 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "awkward"; - version = "1.2.3"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "7d727542927a926f488fa62d04e2c5728c72660f17f822e627f349285f295063"; + sha256 = "b6021694adec9813842bad1987b837e439dabaf5b0dff9041201d238fca71fb4"; }; nativeBuildInputs = [ cmake ]; From c464271bf79deb4a23746b13517f35ebe8deff76 Mon Sep 17 00:00:00 2001 From: Lein Matsumaru Date: Sat, 26 Jun 2021 02:58:08 +0000 Subject: [PATCH 15/15] exploitdb: 2021-06-23 -> 2021-06-25 --- 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 f0489deedb69..d5d9138a15a4 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-24"; + version = "2021-06-25"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-7KmHb52hFhMDkpLniVNC8lR6w787dWzoWmSRW7rAl7w="; + sha256 = "sha256-xaRk/H2jITtU+93+7KxrYTTl0cCObvqcd+F9NNhjMjo="; }; installPhase = ''