Merge branch 'master' into staging-next

Changed files
+148 -14
nixos
pkgs
development
python-modules
dataclasses-json
krakenex
pykrakenapi
pysiaalarm
web
twitter-bootstrap
servers
tools
security
exploitdb
gpg-tui
top-level
+1 -1
nixos/lib/make-disk-image.nix
···
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!
+6 -4
pkgs/development/python-modules/dataclasses-json/default.nix
···
{ lib
, buildPythonPackage
-
, fetchPypi
+
, fetchFromGitHub
, stringcase
, typing-inspect
, marshmallow-enum
···
pname = "dataclasses-json";
version = "0.5.4";
-
src = fetchPypi {
-
inherit pname version;
-
sha256 = "6c3976816fd3cdd8db3be2b516b64fc083acd46ac22c680d3dc24cb1d6ae3367";
+
src = fetchFromGitHub {
+
owner = "lidatong";
+
repo = pname;
+
rev = "v${version}";
+
sha256 = "193xklf1xrsin7fr24yqx5ckr4m5s9v1bdyr00qr51j74hiy8qsv";
};
propagatedBuildInputs = [
+33
pkgs/development/python-modules/krakenex/default.nix
···
+
{ 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 ];
+
};
+
}
+36
pkgs/development/python-modules/pykrakenapi/default.nix
···
+
{ 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 ];
+
};
+
}
+54
pkgs/development/python-modules/pysiaalarm/default.nix
···
+
{ 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 ];
+
};
+
}
+2 -2
pkgs/development/web/twitter-bootstrap/default.nix
···
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 ];
+2 -2
pkgs/servers/home-assistant/component-packages.nix
···
"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 ];
···
"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
+3
pkgs/servers/home-assistant/default.nix
···
"knx"
"kodi"
"konnected"
+
"kraken"
"kulersky"
"lastfm"
"lcn"
···
"shell_command"
"shelly"
"shopping_list"
+
"sia"
"sigfox"
"sighthound"
"simplisafe"
···
"surepetcare"
"switch"
"switcher_kis"
+
"syncthing"
"system_health"
"system_log"
"tado"
+2 -2
pkgs/tools/security/exploitdb/default.nix
···
stdenv.mkDerivation rec {
pname = "exploitdb";
-
version = "2021-06-23";
+
version = "2021-06-25";
src = fetchFromGitHub {
owner = "offensive-security";
repo = pname;
rev = version;
-
sha256 = "15gxxs5wjxvcjh5q9h17p163byzl33zg5yjlay1f1n2ng8nypygi";
+
sha256 = "sha256-xaRk/H2jITtU+93+7KxrYTTl0cCObvqcd+F9NNhjMjo=";
};
installPhase = ''
+3 -3
pkgs/tools/security/gpg-tui/default.nix
···
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
+6
pkgs/top-level/python-packages.nix
···
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 { };
···
pyisy = callPackage ../development/python-modules/pyisy { };
+
pykrakenapi = callPackage ../development/python-modules/pykrakenapi { };
+
pynndescent = callPackage ../development/python-modules/pynndescent { };
pynobo = callPackage ../development/python-modules/pynobo { };
···
pysbd = callPackage ../development/python-modules/pysbd { };
pyshark = callPackage ../development/python-modules/pyshark { };
+
+
pysiaalarm = callPackage ../development/python-modules/pysiaalarm { };
pytest-subprocess = callPackage ../development/python-modules/pytest-subprocess { };