kfm/nix-writers
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed writePython{2,3}{,Bin}

Browse Source 
moved deps (and additional rarely used parameters in an attribute set)
now you have to do instead of:
```
writePython2Bin "foo.py" [] '' ... ''
```

this:
```
writePython2Bin "foo.py" {} '' ... ''
```
This commit is contained in:
Ingolf Wagner
2018-08-30 17:52:42 +02:00
parent 5d79992262
commit bd003832d2
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/default.nix
View File

@@ -299,28 +299,30 @@ pkgs: oldpkgs: {
${pkgs.cabal2nix}/bin/cabal2nix ${path} > $out ${pkgs.cabal2nix}/bin/cabal2nix ${path} > $out
''); '');
writePython2 = name: deps: writePython2 = name: { deps ? [], flakeIgnore ? [] }:
let let
py = pkgs.python2.withPackages(ps: attrVals deps ps); py = pkgs.python2.withPackages (ps: deps);
ignoreAttribute = lib.optionalString (ignore != []) "--ignore ${lib.concatMapStringsSep "," lib.escapeShellArg flakeIgnore}";
in in
pkgs.makeScriptWriter { pkgs.makeScriptWriter {
interpreter = "${py}/bin/python"; interpreter = "${py}/bin/python";
check = pkgs.writeDash "python2check.sh" '' check = pkgs.writeDash "python2check.sh" ''
exec ${pkgs.python2Packages.flake8}/bin/flake8 --show-source "$1" exec ${pkgs.python2Packages.flake8}/bin/flake8 --show-source ${ignoreAttribute} "$1"
''; '';
} name; } name;
writePython2Bin = name: writePython2Bin = name:
pkgs.writePython2 "/bin/${name}"; pkgs.writePython2 "/bin/${name}";
writePython3 = name: deps: writePython3 = name: { deps ? [], flakeIgnore ? [] }:
let let
py = pkgs.python3.withPackages(ps: attrVals deps ps); py = pkgs.python3.withPackages (ps: deps);
ignoreAttribute = lib.optionalString (ignore != []) "--ignore ${lib.concatMapStringsSep "," lib.escapeShellArg flakeIgnore}";
in in
pkgs.makeScriptWriter { pkgs.makeScriptWriter {
interpreter = "${py}/bin/python"; interpreter = "${py}/bin/python";
check = pkgs.writeDash "python3check.sh" '' check = pkgs.writeDash "python3check.sh" ''
exec ${pkgs.python3Packages.flake8}/bin/flake8 --show-source "$1" exec ${pkgs.python3Packages.flake8}/bin/flake8 --show-source ${ignoreAttribute} "$1"
''; '';
} name; } name;