Merge staging-next into staging
This commit is contained in:
commit
8839cc1d53
|
@ -92,9 +92,10 @@ let
|
||||||
};
|
};
|
||||||
|
|
||||||
defaultDependencies = [
|
defaultDependencies = [
|
||||||
|
(libpng.override { apngSupport = false; }) # https://bugs.chromium.org/p/chromium/issues/detail?id=752403
|
||||||
bzip2 flac speex opusWithCustomModes
|
bzip2 flac speex opusWithCustomModes
|
||||||
libevent expat libjpeg snappy
|
libevent expat libjpeg snappy
|
||||||
libpng libcap
|
libcap
|
||||||
xdg-utils minizip libwebp
|
xdg-utils minizip libwebp
|
||||||
libusb1 re2
|
libusb1 re2
|
||||||
ffmpeg libxslt libxml2
|
ffmpeg libxslt libxml2
|
||||||
|
|
|
@ -6,12 +6,12 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "adafruit-platformdetect";
|
pname = "adafruit-platformdetect";
|
||||||
version = "3.13.4";
|
version = "3.14.0";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
pname = "Adafruit-PlatformDetect";
|
pname = "Adafruit-PlatformDetect";
|
||||||
inherit version;
|
inherit version;
|
||||||
sha256 = "sha256-e8hliPYLvHR3JjZ4AFgJWjPW1vK10BYuVqUYtF54J5c=";
|
sha256 = "1v33546cflsbm6k8mhmi1r5c8fqjlirvzmf62a604xns8wrxb88h";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ setuptools-scm ];
|
nativeBuildInputs = [ setuptools-scm ];
|
||||||
|
|
47
pkgs/development/python-modules/habitipy/default.nix
Normal file
47
pkgs/development/python-modules/habitipy/default.nix
Normal file
|
@ -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 ];
|
||||||
|
};
|
||||||
|
}
|
70
pkgs/development/python-modules/hangups/default.nix
Normal file
70
pkgs/development/python-modules/hangups/default.nix
Normal file
|
@ -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 ];
|
||||||
|
};
|
||||||
|
}
|
28
pkgs/development/python-modules/readlike/default.nix
Normal file
28
pkgs/development/python-modules/readlike/default.nix
Normal file
|
@ -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 ];
|
||||||
|
};
|
||||||
|
}
|
31
pkgs/development/python-modules/reparser/default.nix
Normal file
31
pkgs/development/python-modules/reparser/default.nix
Normal file
|
@ -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 ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -335,8 +335,8 @@
|
||||||
"gstreamer" = ps: with ps; [ ]; # missing inputs: gstreamer-player
|
"gstreamer" = ps: with ps; [ ]; # missing inputs: gstreamer-player
|
||||||
"gtfs" = ps: with ps; [ pygtfs ];
|
"gtfs" = ps: with ps; [ pygtfs ];
|
||||||
"guardian" = ps: with ps; [ aioguardian ];
|
"guardian" = ps: with ps; [ aioguardian ];
|
||||||
"habitica" = ps: with ps; [ ]; # missing inputs: habitipy
|
"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
|
"harman_kardon_avr" = ps: with ps; [ ]; # missing inputs: hkavr
|
||||||
"harmony" = ps: with ps; [ aioharmony ];
|
"harmony" = ps: with ps; [ aioharmony ];
|
||||||
"hassio" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow ];
|
"hassio" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow ];
|
||||||
|
|
|
@ -435,6 +435,8 @@ in with py.pkgs; buildPythonApplication rec {
|
||||||
"group"
|
"group"
|
||||||
"growatt_server"
|
"growatt_server"
|
||||||
"guardian"
|
"guardian"
|
||||||
|
"habitica"
|
||||||
|
"hangouts"
|
||||||
"harmony"
|
"harmony"
|
||||||
"hassio"
|
"hassio"
|
||||||
"hddtemp"
|
"hddtemp"
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "exploitdb";
|
pname = "exploitdb";
|
||||||
version = "2021-06-12";
|
version = "2021-06-18";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "offensive-security";
|
owner = "offensive-security";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-62Yi5JTrVlN4V2jfiyEUbl8GidaYgcuBkYGyb6ldihQ=";
|
sha256 = "0b91r7bl3abg3mb7vg4qnk319jy7civ583la0054xhpg0c0svyk1";
|
||||||
};
|
};
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
buildGoPackage rec {
|
buildGoPackage rec {
|
||||||
pname = "vault";
|
pname = "vault";
|
||||||
version = "1.7.2";
|
version = "1.7.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "hashicorp";
|
owner = "hashicorp";
|
||||||
repo = "vault";
|
repo = "vault";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "0nd77lfccl71qn98cq1yz85aiafplxbr58nafbbflijs1fz1771q";
|
sha256 = "sha256-BO4xzZrX9eVETQWjBDBfP7TlD7sO+gLgbB330A11KAI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
goPackagePath = "github.com/hashicorp/vault";
|
goPackagePath = "github.com/hashicorp/vault";
|
||||||
|
|
|
@ -1,26 +1,26 @@
|
||||||
{ lib, stdenv, fetchurl, unzip }:
|
{ lib, stdenv, fetchurl, unzip }:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "1.7.2";
|
version = "1.7.3";
|
||||||
|
|
||||||
sources = let
|
sources = let
|
||||||
base = "https://releases.hashicorp.com/vault/${version}";
|
base = "https://releases.hashicorp.com/vault/${version}";
|
||||||
in {
|
in {
|
||||||
x86_64-linux = fetchurl {
|
x86_64-linux = fetchurl {
|
||||||
url = "${base}/vault_${version}_linux_amd64.zip";
|
url = "${base}/vault_${version}_linux_amd64.zip";
|
||||||
sha256 = "1g37pgj7hbi6vfpwq9rrh6is980lfwbq5jb4736jfp5m360vprjy";
|
sha256 = "sha256-hFMTKpO3VcCondSy8amb1K8G+BZ7gZF/EXCAg5Ax4D8=";
|
||||||
};
|
};
|
||||||
i686-linux = fetchurl {
|
i686-linux = fetchurl {
|
||||||
url = "${base}/vault_${version}_linux_386.zip";
|
url = "${base}/vault_${version}_linux_386.zip";
|
||||||
sha256 = "0777xkkfiy0s3nyygcfpw0nbfsm6yz1n5hxcvfafhzcdyr58fpb7";
|
sha256 = "02wbbzffb2m7y3476l5qa5dhi0v30f3sfif0svqhhzh927kg4s5w";
|
||||||
};
|
};
|
||||||
x86_64-darwin = fetchurl {
|
x86_64-darwin = fetchurl {
|
||||||
url = "${base}/vault_${version}_darwin_amd64.zip";
|
url = "${base}/vault_${version}_darwin_amd64.zip";
|
||||||
sha256 = "0wzmah542bhyvrm9brhrx7drjyzan8vxhqnm0gjak5wlrcnf2dvx";
|
sha256 = "0sw56dhjbasdnlwg668swhyxrn5gy7h9gysdg96za4dhq3iimkrn";
|
||||||
};
|
};
|
||||||
aarch64-linux = fetchurl {
|
aarch64-linux = fetchurl {
|
||||||
url = "${base}/vault_${version}_linux_arm64.zip";
|
url = "${base}/vault_${version}_linux_arm64.zip";
|
||||||
sha256 = "0cs56ircad2z2msqgb0l5h53cwmwybi5rs4y2jigz4rq4ndx9f9b";
|
sha256 = "0c2w0684adaqildwviajp6pi8vp76g4zwwgc1k2bb5mwv1h2y293";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -3160,6 +3160,8 @@ in {
|
||||||
|
|
||||||
habanero = callPackage ../development/python-modules/habanero { };
|
habanero = callPackage ../development/python-modules/habanero { };
|
||||||
|
|
||||||
|
habitipy = callPackage ../development/python-modules/habitipy { };
|
||||||
|
|
||||||
hachoir = callPackage ../development/python-modules/hachoir { };
|
hachoir = callPackage ../development/python-modules/hachoir { };
|
||||||
|
|
||||||
hdate = callPackage ../development/python-modules/hdate { };
|
hdate = callPackage ../development/python-modules/hdate { };
|
||||||
|
@ -3172,6 +3174,8 @@ in {
|
||||||
|
|
||||||
handout = callPackage ../development/python-modules/handout { };
|
handout = callPackage ../development/python-modules/handout { };
|
||||||
|
|
||||||
|
hangups = callPackage ../development/python-modules/hangups { };
|
||||||
|
|
||||||
hap-python = callPackage ../development/python-modules/hap-python { };
|
hap-python = callPackage ../development/python-modules/hap-python { };
|
||||||
|
|
||||||
hass-nabucasa = callPackage ../development/python-modules/hass-nabucasa { };
|
hass-nabucasa = callPackage ../development/python-modules/hass-nabucasa { };
|
||||||
|
@ -7311,6 +7315,8 @@ in {
|
||||||
|
|
||||||
readchar = callPackage ../development/python-modules/readchar { };
|
readchar = callPackage ../development/python-modules/readchar { };
|
||||||
|
|
||||||
|
readlike = callPackage ../development/python-modules/readlike { };
|
||||||
|
|
||||||
readme = callPackage ../development/python-modules/readme { };
|
readme = callPackage ../development/python-modules/readme { };
|
||||||
|
|
||||||
readme_renderer = callPackage ../development/python-modules/readme_renderer { };
|
readme_renderer = callPackage ../development/python-modules/readme_renderer { };
|
||||||
|
@ -7349,6 +7355,8 @@ in {
|
||||||
|
|
||||||
rencode = callPackage ../development/python-modules/rencode { };
|
rencode = callPackage ../development/python-modules/rencode { };
|
||||||
|
|
||||||
|
reparser = callPackage ../development/python-modules/reparser { };
|
||||||
|
|
||||||
repeated_test = callPackage ../development/python-modules/repeated_test { };
|
repeated_test = callPackage ../development/python-modules/repeated_test { };
|
||||||
|
|
||||||
repocheck = callPackage ../development/python-modules/repocheck { };
|
repocheck = callPackage ../development/python-modules/repocheck { };
|
||||||
|
|
Loading…
Reference in a new issue