public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #120281 from mweinelt/home-assistant 

home-assistant: find unstable versions in parse-requirements.py
This commit is contained in:
Jörg Thalheim 2021-04-23 05:57:05 +01:00 committed by GitHub
parent bc6fe91da1 bf77354e38
commit 3ab9aaa5cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/python-modules/slackclient/default.nix
View File

@ -18,7 +18,7 @@
}:
buildPythonPackage rec {
pname = "python-slackclient";
pname = "slackclient";
version = "2.9.3";
disabled = !isPy3k;

4
pkgs/servers/home-assistant/component-packages.nix
View File

@ -90,7 +90,7 @@
"blueprint" = ps: with ps; [ ];
"bluesound" = ps: with ps; [ xmltodict ];
"bluetooth_le_tracker" = ps: with ps; [ ]; # missing inputs: pygatt[GATTTOOL]
"bluetooth_tracker" = ps: with ps; [ bt_proximity ]; # missing inputs: pybluez
"bluetooth_tracker" = ps: with ps; [ bt_proximity pybluez ];
"bme280" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense
"bme680" = ps: with ps; [ bme680 smbus-cffi ];
"bmp280" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-bmp280
@ -750,7 +750,7 @@
"sky_hub" = ps: with ps; [ ]; # missing inputs: pyskyqhub
"skybeacon" = ps: with ps; [ ]; # missing inputs: pygatt[GATTTOOL]
"skybell" = ps: with ps; [ skybellpy ];
"slack" = ps: with ps; [ ]; # missing inputs: slackclient
"slack" = ps: with ps; [ slackclient ];
"sleepiq" = ps: with ps; [ sleepyq ];
"slide" = ps: with ps; [ ]; # missing inputs: goslide-api
"sma" = ps: with ps; [ pysma ];

1
pkgs/servers/home-assistant/default.nix
View File

@ -354,6 +354,7 @@ in with py.pkgs; buildPythonApplication rec {
"sleepiq"
"sma"
"sensor"
"slack"
"smarttub"
"smtp"
"smappee"

5
pkgs/servers/home-assistant/parse-requirements.py
View File

@ -124,7 +124,10 @@ def name_to_attr_path(req: str, packages: Dict[str, Dict[str, str]]) -> Optional
for name in names:
# treat "-" and "_" equally
name = re.sub("[-_]", "[-_]", name)
pattern = re.compile("^python\\d\\.\\d-{}-\\d".format(name), re.I)
# python(minor).(major)-(pname)-(version or unstable-date)
# we need the version qualifier, or we'll have multiple matches
# (e.g. pyserial and pyserial-asyncio when looking for pyserial)
pattern = re.compile("^python\\d\\.\\d-{}-(?:\\d|unstable-.*)".format(name), re.I)
for attr_path, package in packages.items():
if pattern.match(package["name"]):
attr_paths.add(attr_path)