diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-01-19 14:15:51 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-19 14:15:51 +0100 |
commit | d531da6f8ae7a8dab806bcd3211cd84d2d189d24 (patch) | |
tree | 5b4c5b9e34d2e1bfd02fb8ff26db876806007edc /pkgs/development/python-modules | |
parent | 4eca960cb4ed5e68b93d112fd90623a5a2bae433 (diff) | |
parent | bcf54ce5bbc8c325cfd2b6bcc5cec7661ef49183 (diff) | |
download | nixlib-d531da6f8ae7a8dab806bcd3211cd84d2d189d24.tar nixlib-d531da6f8ae7a8dab806bcd3211cd84d2d189d24.tar.gz nixlib-d531da6f8ae7a8dab806bcd3211cd84d2d189d24.tar.bz2 nixlib-d531da6f8ae7a8dab806bcd3211cd84d2d189d24.tar.lz nixlib-d531da6f8ae7a8dab806bcd3211cd84d2d189d24.tar.xz nixlib-d531da6f8ae7a8dab806bcd3211cd84d2d189d24.tar.zst nixlib-d531da6f8ae7a8dab806bcd3211cd84d2d189d24.zip |
Merge pull request #54094 from rnhmjoj/shell
treewide: use ${stdenv.shell} instead of /bin/sh where possible
Diffstat (limited to 'pkgs/development/python-modules')
-rw-r--r-- | pkgs/development/python-modules/cmd2/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/python-modules/cmd2/old.nix | 4 | ||||
-rw-r--r-- | pkgs/development/python-modules/pandas/default.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index 66626cb76f43..4e8b76f91063 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -18,8 +18,8 @@ buildPythonPackage rec { postPatch = stdenv.lib.optional stdenv.isDarwin '' # Fake the impure dependencies pbpaste and pbcopy mkdir bin - echo '#/bin/sh' > bin/pbpaste - echo '#/bin/sh' > bin/pbcopy + echo '#${stdenv.shell}' > bin/pbpaste + echo '#${stdenv.shell}' > bin/pbcopy chmod +x bin/{pbcopy,pbpaste} export PATH=$(realpath bin):$PATH ''; diff --git a/pkgs/development/python-modules/cmd2/old.nix b/pkgs/development/python-modules/cmd2/old.nix index 7778e73f92f7..c6ee1eaf8bc0 100644 --- a/pkgs/development/python-modules/cmd2/old.nix +++ b/pkgs/development/python-modules/cmd2/old.nix @@ -19,8 +19,8 @@ buildPythonPackage rec { postPatch = stdenv.lib.optional stdenv.isDarwin '' # Fake the impure dependencies pbpaste and pbcopy mkdir bin - echo '#/bin/sh' > bin/pbpaste - echo '#/bin/sh' > bin/pbcopy + echo '#${stdenv.shell}' > bin/pbpaste + echo '#${stdenv.shell}' > bin/pbcopy chmod +x bin/{pbcopy,pbpaste} export PATH=$(realpath bin):$PATH ''; diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 839e7f1e8192..c489b2cd1254 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -96,8 +96,8 @@ in buildPythonPackage rec { # Until then we disable the tests. + optionalString isDarwin '' # Fake the impure dependencies pbpaste and pbcopy - echo "#!/bin/sh" > pbcopy - echo "#!/bin/sh" > pbpaste + echo "#!${stdenv.shell}" > pbcopy + echo "#!${stdenv.shell}" > pbpaste chmod a+x pbcopy pbpaste export PATH=$(pwd):$PATH '' + '' |