diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-09-27 16:00:58 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-09-27 16:00:58 +0000 |
| commit | c504e5d19d940926b3ddcf62c983d66f49f3cbb2 (patch) | |
| tree | ec955e58bcac2cb93b9f8c10786b23f61d40cd7e /nixpkgs/pkgs/development/python-modules/virtualenv | |
| parent | 72789cefce7b17419815f600fbd18238d89afcc9 (diff) | |
| parent | 1737f98af6667560e3e4f930312f9b5002649d04 (diff) | |
| download | nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.gz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.bz2 nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.lz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.xz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.zst nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.zip | |
Merge commit '1737f98af6667560e3e4f930312f9b5002649d04'
Conflicts: nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix nixpkgs/pkgs/development/node-packages/default.nix nixpkgs/pkgs/development/python-modules/priority/deadline.patch
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/virtualenv')
| -rw-r--r-- | nixpkgs/pkgs/development/python-modules/virtualenv/default.nix | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix b/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix index 2bcfa88b6ae4..10e1ebbc87bc 100644 --- a/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix +++ b/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix @@ -1,6 +1,9 @@ -{ buildPythonPackage -, appdirs -, contextlib2 +{ stdenv +, lib +, buildPythonPackage +, pythonOlder +, isPy27 +, backports-entry-points-selectable , cython , distlib , fetchPypi @@ -8,26 +11,23 @@ , flaky , importlib-metadata , importlib-resources -, isPy27 -, lib , pathlib2 +, platformdirs , pytest-freezegun , pytest-mock , pytest-timeout , pytestCheckHook -, pythonOlder , setuptools-scm , six -, stdenv }: buildPythonPackage rec { pname = "virtualenv"; - version = "20.4.7"; + version = "20.7.2"; src = fetchPypi { inherit pname version; - sha256 = "14fdf849f80dbb29a4eb6caa9875d476ee2a5cf76a5f5415fa2f1606010ab467"; + sha256 = "9ef4e8ee4710826e98ff3075c9a4739e2cb1040de6a2a8d35db0055840dc96a0"; }; nativeBuildInputs = [ @@ -35,13 +35,12 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - appdirs + backports-entry-points-selectable distlib filelock + platformdirs six - ] ++ lib.optionals isPy27 [ - contextlib2 - ] ++ lib.optionals (isPy27 && !stdenv.hostPlatform.isWindows) [ + ] ++ lib.optionals (pythonOlder "3.4" && !stdenv.hostPlatform.isWindows) [ pathlib2 ] ++ lib.optionals (pythonOlder "3.7") [ importlib-resources |