From 4d86790456c4656ca67acbaef2d702436ff5edb4 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 13 Jun 2018 17:37:37 +0200 Subject: pkgs.writePython*: normalize arguments --- pkgs/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/default.nix b/pkgs/default.nix index ea98bd7..2286d28 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -284,7 +284,7 @@ pkgs: oldpkgs: { ${pkgs.cabal2nix}/bin/cabal2nix ${path} > $out ''); - writePython2 = deps: + writePython2 = name: deps: let py = pkgs.python2.withPackages(ps: attrVals deps ps); in @@ -293,12 +293,12 @@ pkgs: oldpkgs: { check = pkgs.writeDash "python2check.sh" '' exec ${pkgs.python2Packages.flake8}/bin/flake8 --show-source "$1" ''; - }; + } name; - writePython2Bin = d: name: - pkgs.writePython2 d "/bin/${name}"; + writePython2Bin = name: + pkgs.writePython2 "/bin/${name}"; - writePython3 = deps: + writePython3 = name: deps: let py = pkgs.python3.withPackages(ps: attrVals deps ps); in @@ -307,10 +307,10 @@ pkgs: oldpkgs: { check = pkgs.writeDash "python3check.sh" '' exec ${pkgs.python3Packages.flake8}/bin/flake8 --show-source "$1" ''; - }; + } name; - writePython3Bin = d: name: - pkgs.writePython3 d "/bin/${name}"; + writePython3Bin = name: + pkgs.writePython3 "/bin/${name}"; writeSed = pkgs.makeScriptWriter { interpreter = "${pkgs.gnused}/bin/sed -f"; -- cgit v1.2.3