diff options
author | Jonathan Ringer <jonringer117@gmail.com> | 2021-10-22 09:33:07 -0700 |
---|---|---|
committer | Jonathan Ringer <jonringer117@gmail.com> | 2021-10-22 09:33:07 -0700 |
commit | fc25d940101161034ac357c48a5912b413fa75cc (patch) | |
tree | 8d704fee8fa5137952e12e19d74e683ce1fea729 /pkgs/development/python-modules/eventlet | |
parent | 54a42ab84624e64ad5a1f34daa9559d148970f95 (diff) | |
parent | 1cab3e231b41f38f2d2cbf5617eb7b88e433428a (diff) |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/development/python-modules/jupyter-client/default.nix pkgs/development/python-modules/jupyterlab-git/default.nix
Diffstat (limited to 'pkgs/development/python-modules/eventlet')
-rw-r--r-- | pkgs/development/python-modules/eventlet/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix index 9b8ff979ffd22..24639b98e64b9 100644 --- a/pkgs/development/python-modules/eventlet/default.nix +++ b/pkgs/development/python-modules/eventlet/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { doCheck = !stdenv.isDarwin; - preCheck = '' + preCheck = lib.optionalString doCheck '' echo "nameserver 127.0.0.1" > resolv.conf export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) export LD_PRELOAD=${libredirect}/lib/libredirect.so |