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

home-assistant: deal with multiple packages matching requirement

Browse Source
This commit is contained in:
Robert Schütz 2018-05-22 14:48:55 +02:00 committed by Robin Gloster
parent 7a9bf82999
commit 3807a0d526
2 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -167,7 +167,7 @@
"lutron_caseta" = ps: with ps; [ ]; "lutron_caseta" = ps: with ps; [ ];
"matrix" = ps: with ps; [ matrix-client ]; "matrix" = ps: with ps; [ matrix-client ];
"maxcube" = ps: with ps; [ ]; "maxcube" = ps: with ps; [ ];
"media_extractor" = ps: with ps; [ ]; "media_extractor" = ps: with ps; [ youtube-dl-light ];
"media_player.anthemav" = ps: with ps; [ ]; "media_player.anthemav" = ps: with ps; [ ];
"media_player.aquostv" = ps: with ps; [ ]; "media_player.aquostv" = ps: with ps; [ ];
"media_player.blackbird" = ps: with ps; [ ]; "media_player.blackbird" = ps: with ps; [ ];
@ -276,7 +276,7 @@
"satel_integra" = ps: with ps; [ ]; "satel_integra" = ps: with ps; [ ];
"scene.hunterdouglas_powerview" = ps: with ps; [ ]; "scene.hunterdouglas_powerview" = ps: with ps; [ ];
"scsgate" = ps: with ps; [ ]; "scsgate" = ps: with ps; [ ];
"sensor.airvisual" = ps: with ps; [ ]; "sensor.airvisual" = ps: with ps; [ pyairvisual ];
"sensor.alpha_vantage" = ps: with ps; [ ]; "sensor.alpha_vantage" = ps: with ps; [ ];
"sensor.bbox" = ps: with ps; [ ]; "sensor.bbox" = ps: with ps; [ ];
"sensor.bh1750" = ps: with ps; [ ]; "sensor.bh1750" = ps: with ps; [ ];

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

@ -25,6 +25,13 @@ GENERAL_PREFIX = '# homeassistant.'
COMPONENT_PREFIX = GENERAL_PREFIX + 'components.' COMPONENT_PREFIX = GENERAL_PREFIX + 'components.'
PKG_SET = 'python3Packages' PKG_SET = 'python3Packages'
# If some requirements are matched by multiple python packages,
# the following can be used to choose one of them
PKG_PREFERENCES = {
# Use python3Packages.youtube-dl-light instead of python3Packages.youtube-dl
'youtube-dl': 'youtube-dl-light'
}
def get_version(): def get_version():
with open(os.path.dirname(sys.argv[0]) + '/default.nix') as f: with open(os.path.dirname(sys.argv[0]) + '/default.nix') as f:
m = re.search('hassVersion = "([\\d\\.]+)";', f.read()) m = re.search('hassVersion = "([\\d\\.]+)";', f.read())
@ -59,7 +66,7 @@ output = subprocess.check_output(['nix-env', '-f', os.path.dirname(sys.argv[0])
packages = json.loads(output) packages = json.loads(output)
def name_to_attr_path(req): def name_to_attr_path(req):
attr_paths = [] attr_paths = set()
names = [req] names = [req]
# E.g. python-mpd2 is actually called python3.6-mpd2 # E.g. python-mpd2 is actually called python3.6-mpd2
# instead of python-3.6-python-mpd2 inside Nixpkgs # instead of python-3.6-python-mpd2 inside Nixpkgs
@ -71,11 +78,18 @@ def name_to_attr_path(req):
pattern = re.compile('^python\\d\\.\\d-{}-\\d'.format(name), re.I) pattern = re.compile('^python\\d\\.\\d-{}-\\d'.format(name), re.I)
for attr_path, package in packages.items(): for attr_path, package in packages.items():
if pattern.match(package['name']): if pattern.match(package['name']):
attr_paths.append(attr_path) attr_paths.add(attr_path)
if len(attr_paths) > 1:
for to_replace, replacement in PKG_PREFERENCES.items():
try:
attr_paths.remove(PKG_SET + '.' + to_replace)
attr_paths.add(PKG_SET + '.' + replacement)
except KeyError:
pass
# Let's hope there's only one derivation with a matching name # Let's hope there's only one derivation with a matching name
assert(len(attr_paths) <= 1) assert(len(attr_paths) <= 1)
if attr_paths: if len(attr_paths) == 1:
return attr_paths[0] return attr_paths.pop()
else: else:
return None return None
@ -86,14 +100,11 @@ build_inputs = {}
for component, reqs in OrderedDict(sorted(requirements.items())).items(): for component, reqs in OrderedDict(sorted(requirements.items())).items():
attr_paths = [] attr_paths = []
for req in reqs: for req in reqs:
try:
name = req.split('==')[0] name = req.split('==')[0]
attr_path = name_to_attr_path(name) attr_path = name_to_attr_path(name)
if attr_path is not None: if attr_path is not None:
# Add attribute path without "python3Packages." prefix # Add attribute path without "python3Packages." prefix
attr_paths.append(attr_path[len(PKG_SET + '.'):]) attr_paths.append(attr_path[len(PKG_SET + '.'):])
except RequirementParseError:
continue
else: else:
build_inputs[component] = attr_paths build_inputs[component] = attr_paths