yogsototh/mach-nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

simplify flakes cmdline api

Browse source
This commit is contained in:
DavHau 2021-05-22 21:49:39 +07:00
parent ad45c36495
commit 97d744887b
3 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
default.nix
View file

@ -101,7 +101,6 @@ rec {
# expose dot interface for flakes cmdline
"with" = pythonWith;
pythonWith = (withDot (__mkPython "'.pythonWith'")).pythonWith;
shellWith = (withDot (__mkPython "'.shellWith'")).shellWith;
dockerImageWith = (withDot (__mkPython "'.dockerImageWith'")).dockerImageWith;
# expose mach-nix' nixpkgs

4
flake.nix
View file

@ -19,7 +19,7 @@
true
else
false;
usageGen = "usage: nix (build|develop) mach-nix#gen.(python|shell|docker).package1.package2...";
usageGen = "usage: nix (build|shell) mach-nix#gen.(python|docker).package1.package2...";
in
(flake-utils.lib.eachDefaultSystem (system:
let
@ -49,11 +49,9 @@
src = throw usageGen;
passthru = {
python = mach-nix-default.pythonWith;
shell = mach-nix-default.shellWith;
docker = mach-nix-default.dockerImageWith;
inherit (mach-nix-default)
pythonWith
shellWith
dockerImageWith;
};
};

1
mach_nix/nix/withDot.nix
View file

@ -23,6 +23,5 @@ let
in
{
"pythonWith" = gen "" [];
"shellWith" = gen "env" [];
"dockerImageWith" = gen "dockerImage" [];
}