nix-community/dream2nix
1
1
Fork 0
mirror of https://github.com/nix-community/dream2nix.git synced 2024-09-11 14:35:30 +03:00
Code Issues Projects Releases Wiki Activity

php: use project.name from discoverer

Browse Source
This commit is contained in:
Martin Toman 2022-09-12 15:07:45 -07:00
parent 969cba514c
commit 39c5375a94
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/subsystems/php/discoverers/default/default.nix
View File

@ -7,10 +7,8 @@
l = lib // builtins;
# get translators for the project
getTranslators = path: let
nodes = l.readDir path;
in
l.optional (nodes ? "composer.lock") "composer-lock"
getTranslators = tree:
l.optional (tree.files ? "composer.lock") "composer-lock"
++ ["composer-json"];
# discover php projects
@ -18,8 +16,14 @@
currentProjectInfo = dlib.construct.discoveredProject {
inherit subsystem;
inherit (tree) relPath;
name = tree.files."composer.json".jsonContent.name or tree.relPath;
translators = getTranslators tree.fullPath;
name =
tree.files."composer.json".jsonContent.name
or (
if tree.relPath != ""
then tree.relPath
else "unknown"
);
translators = getTranslators tree;
subsystemInfo = {};
};
in

2
src/subsystems/php/translators/composer-lock/default.nix
View File

@ -245,7 +245,7 @@ in {
};
# name of the default package
defaultPackage = composerJson.name or "unknown";
defaultPackage = project.name;
/*
List the package candidates which should be exposed to the user.