diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-08-26 22:20:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-26 22:20:36 +0200 |
| commit | 7f70726259f53d9d23fa1ee725474fa60a9b83b7 (patch) | |
| tree | 085125da2951b4310ca4f3baf6d5920b8638f4f6 | |
| parent | 4d509b12c284567b30e80cd7a4c5c4a7cc9f03ae (diff) | |
| parent | 252669adcc51651b716c714de25bc162683bf24d (diff) | |
| download | nixpkgs-7f70726259f53d9d23fa1ee725474fa60a9b83b7.tar nixpkgs-7f70726259f53d9d23fa1ee725474fa60a9b83b7.tar.gz nixpkgs-7f70726259f53d9d23fa1ee725474fa60a9b83b7.tar.bz2 nixpkgs-7f70726259f53d9d23fa1ee725474fa60a9b83b7.tar.lz nixpkgs-7f70726259f53d9d23fa1ee725474fa60a9b83b7.tar.xz nixpkgs-7f70726259f53d9d23fa1ee725474fa60a9b83b7.tar.zst nixpkgs-7f70726259f53d9d23fa1ee725474fa60a9b83b7.zip | |
Merge pull request #134878 from r-ryantm/auto-update/python3.8-virtualenv-clone
| -rw-r--r-- | pkgs/development/python-modules/virtualenv-clone/default.nix | 35 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 28 insertions, 11 deletions
diff --git a/pkgs/development/python-modules/virtualenv-clone/default.nix b/pkgs/development/python-modules/virtualenv-clone/default.nix index 4dfebc13075..0cd5d6a7fe2 100644 --- a/pkgs/development/python-modules/virtualenv-clone/default.nix +++ b/pkgs/development/python-modules/virtualenv-clone/default.nix @@ -1,29 +1,42 @@ { lib , buildPythonPackage -, fetchPypi -, pytest +, fetchFromGitHub , virtualenv +, pytestCheckHook }: buildPythonPackage rec { pname = "virtualenv-clone"; - version = "0.5.4"; + version = "0.5.6"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "0absh96fsxk9di7ir76f5djyfm2c214wnyk53avrhjy8akflhpk6"; + src = fetchFromGitHub { + owner = "edwardgeorge"; + repo = pname; + rev = version; + sha256 = "0xb20fhl99dw5vnyb43sjpj9628nbdnwp5g7m8f2id7w8kpwzvfw"; }; - buildInputs = [ pytest ]; - propagatedBuildInputs = [ virtualenv ]; + postPatch = '' + substituteInPlace tests/__init__.py \ + --replace "'virtualenv'" "'${virtualenv}/bin/virtualenv'" - # needs tox to run the tests - doCheck = false; + substituteInPlace tests/test_virtualenv_sys.py \ + --replace "'virtualenv'" "'${virtualenv}/bin/virtualenv'" + ''; + + propagatedBuildInputs = [ + virtualenv + ]; + + checkInputs = [ + pytestCheckHook + ]; meta = with lib; { homepage = "https://github.com/edwardgeorge/virtualenv-clone"; description = "Script to clone virtualenvs"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; - } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9dfd6e616c3..0083ae3ac49 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20653,6 +20653,10 @@ with pkgs; virtlyst = libsForQt5.callPackage ../servers/web-apps/virtlyst { }; + virtualenv = with python3Packages; toPythonApplication virtualenv; + + virtualenv-clone = with python3Packages; toPythonApplication virtualenv-clone; + virtuoso6 = callPackage ../servers/sql/virtuoso/6.x.nix { openssl = openssl_1_0_2; }; |