mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-08-25 17:55:21 +00:00
Merge master into staging-next
This commit is contained in:
@@ -10,24 +10,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiodiscover";
|
||||
version = "1.3.2";
|
||||
version = "1.3.3";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bdraco";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0qg2wm6ddsfai788chylr5ynrvakwg91q3dszz7dxzbkfdcxixj3";
|
||||
sha256 = "186agrjx818vn00d3pqlka5ir48rgpbfyn1cifkn9ylsxg9cz3ph";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "remove-entry_point.patch";
|
||||
url = "https://github.com/bdraco/aiodiscover/commit/4c497fb7d4c8685a78209c710e92e0bd17f46bb2.patch";
|
||||
sha256 = "0py9alhg6qdncbn6a04mrnjhs4j19kg759dv69knpqzryikcfa63";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
async-dns
|
||||
pyroute2
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, ed25519
|
||||
, fetchFromGitHub
|
||||
, nats-server
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "asyncio-nats-client";
|
||||
version = "0.11.4";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nats-io";
|
||||
repo = "nats.py";
|
||||
rev = "v${version}";
|
||||
sha256 = "1aj57xi2rj1xswq8air13xdsll1ybpi0nmz5f6jq01azm0zy9xyd";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ed25519
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
nats-server
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "--cov=nats --cov-report html" ""
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# RuntimeError: Event loop is closed
|
||||
"test_subscribe_no_echo"
|
||||
"test_reconnect_to_new_server_with_auth"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "nats.aio" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python client for NATS.io";
|
||||
homepage = "https://github.com/nats-io/nats.py";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@@ -1,6 +1,19 @@
|
||||
{ python_openzwave, fetchPypi }:
|
||||
{ python_openzwave, fetchPypi, openzwave, fetchFromGitHub }:
|
||||
|
||||
python_openzwave.overridePythonAttrs (oldAttrs: rec {
|
||||
(python_openzwave.override {
|
||||
openzwave = openzwave.overrideAttrs (oldAttrs: {
|
||||
version = "unstable-2020-03-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "home-assistant";
|
||||
repo = "open-zwave";
|
||||
rev = "94267fa298c1882f0dc73c0fd08f1f755ba83e83";
|
||||
sha256 = "0p2869fwidz1wcqzfm52cwm9ab96pmwkna3d4yvvh21nh09cvmwk";
|
||||
};
|
||||
|
||||
patches = [ ];
|
||||
});
|
||||
}).overridePythonAttrs (oldAttrs: rec {
|
||||
pname = "homeassistant_pyozw";
|
||||
version = "0.1.10";
|
||||
|
||||
|
||||
46
pkgs/development/python-modules/nats-python/default.nix
Normal file
46
pkgs/development/python-modules/nats-python/default.nix
Normal file
@@ -0,0 +1,46 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, poetry-core
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nats-python";
|
||||
version = "0.8.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Gr1N";
|
||||
repo = "nats-python";
|
||||
rev = version;
|
||||
sha256 = "1j7skyxldir3mphvnsyhjxmf3cimv4h7n5v58jl2gff4yd0hdw7g";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Switch to poetry-core, https://github.com/Gr1N/nats-python/pull/19
|
||||
(fetchpatch {
|
||||
name = "use-poetry-core.patch";
|
||||
url = "https://github.com/Gr1N/nats-python/commit/71b25b324212dccd7fc06ba3914491adba22e83f.patch";
|
||||
sha256 = "1fip1qpzk2ka7qgkrdpdr6vnrnb1p8cwapa51xp0h26nm7yis1gl";
|
||||
})
|
||||
];
|
||||
|
||||
# Tests require a running NATS server
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "pynats" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python client for NATS messaging system";
|
||||
homepage = "https://github.com/Gr1N/nats-python";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchhg
|
||||
, fetchFromGitHub
|
||||
, isPyPy
|
||||
}:
|
||||
|
||||
@@ -9,15 +9,21 @@ buildPythonPackage rec {
|
||||
pname = "smartypants";
|
||||
disabled = isPyPy;
|
||||
|
||||
src = fetchhg {
|
||||
url = "https://bitbucket.org/livibetter/smartypants.py";
|
||||
src = fetchFromGitHub {
|
||||
owner = "leohemsted";
|
||||
repo = "smartypants.py";
|
||||
rev = "v${version}";
|
||||
sha256 = "1cmzz44d2hm6y8jj2xcq1wfr26760gi7iq92ha8xbhb1axzd7nq6";
|
||||
# remove this file and the name on the next version update
|
||||
extraPostFetch = ''
|
||||
cp ${./hgtags} "$out"/.hgtags
|
||||
'';
|
||||
name = "hg-archive";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python with the SmartyPants";
|
||||
homepage = "https://bitbucket.org/livibetter/smartypants.py";
|
||||
homepage = "https://github.com/leohemsted/smartypants.py";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
||||
17
pkgs/development/python-modules/smartypants/hgtags
Normal file
17
pkgs/development/python-modules/smartypants/hgtags
Normal file
@@ -0,0 +1,17 @@
|
||||
47e996532eff9d3bb2c7048aca37d5fd1028e706 v1.5_1.2
|
||||
4ff48eba1d3d37d708005e465cf701b63eb68fd3 v1.5_1.1
|
||||
6ba7f3a14ff77e4e9bf9918413b1710c33deae4d v1.5_1.3.1
|
||||
71006a014216defb21e4db6e03434d289564ea60 v1.5_1.6
|
||||
90950ff693122f80710974abc0f2be64d4105e84 v1.5_1.3
|
||||
a6ecae6541d64f5b12c7b788c65362b0c012278d v1.5_1.0
|
||||
eed4a8a16f116f98e8280dc79128845020bbe766 v1.5_1.5
|
||||
f9a62f541f19ead9be4c3be896b64d1caa0b524c v1.5_1.4
|
||||
fc0bee49a07daf05f034560cfef81a8a8d034d1f v1.5_1.7
|
||||
096ed5f806b6dbc473fae1848643cf45005b9bf1 v1.7.0
|
||||
aaeb8099a24ad7db3f36ebe71ef326d6377730aa v1.7.1
|
||||
fd8ccc937af7280db4e581b2eb1354245f4672ab v1.8.0
|
||||
7839b0eab3e9daf5b346edfa5c54f3cc46fc202a v1.8.1
|
||||
6140b78317beabb6e49cd91b35a779ccb0af7327 v1.8.2
|
||||
c3b1c83c5ddada685b421b8f82f7e92c794bf2f6 v1.8.3
|
||||
460c1add9b9f89831e1ab965f1e1c31325f6e72d v1.8.4
|
||||
78165f4976299c37d6e3dd5463adcd61f9cb2b75 v1.8.5
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ytmusicapi";
|
||||
version = "0.15.0";
|
||||
version = "0.15.1";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-pVQqoMvuuFc/1QNG5z/AspGlgIGPi9aqjZ3/3eVNhis=";
|
||||
sha256 = "sha256-W/eZubJ/SNLBya1S6wLUwTwZCUD+wCQ5FAuNcSpl+9Y=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
Reference in New Issue
Block a user