From 44e4971df51f8492c9f3bbb3b1dc2786e75dd30c Mon Sep 17 00:00:00 2001 From: SkohTV Date: Mon, 25 May 2026 11:06:34 -0400 Subject: [PATCH 1/4] python3Packages.virtualenv-clone: migrate to pyproject --- .../python-modules/virtualenv-clone/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/virtualenv-clone/default.nix b/pkgs/development/python-modules/virtualenv-clone/default.nix index cceee784a234..3333a15c6dfc 100644 --- a/pkgs/development/python-modules/virtualenv-clone/default.nix +++ b/pkgs/development/python-modules/virtualenv-clone/default.nix @@ -4,12 +4,13 @@ fetchFromGitHub, virtualenv, pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "virtualenv-clone"; version = "0.5.7"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "edwardgeorge"; @@ -18,6 +19,8 @@ buildPythonPackage rec { hash = "sha256-qrN74IwLRqiVPxU8gVhdiM34yBmiS/5ot07uroYPDVw="; }; + build-system = [ setuptools ]; + postPatch = '' substituteInPlace tests/__init__.py \ --replace-fail "'virtualenv'" "'${virtualenv}/bin/virtualenv'" \ @@ -35,7 +38,7 @@ buildPythonPackage rec { "pth = '$(mktemp -d)/test_fixup_pth_file.pth'" ''; - propagatedBuildInputs = [ virtualenv ]; + dependencies = [ virtualenv ]; nativeCheckInputs = [ pytestCheckHook ]; From 081558516516f004d9fc4022e1352f2a8c8077a6 Mon Sep 17 00:00:00 2001 From: SkohTV Date: Mon, 25 May 2026 11:07:18 -0400 Subject: [PATCH 2/4] python3Packages.virtualenv-clone: modernize --- .../python-modules/virtualenv-clone/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/virtualenv-clone/default.nix b/pkgs/development/python-modules/virtualenv-clone/default.nix index 3333a15c6dfc..b9dc5c5736a5 100644 --- a/pkgs/development/python-modules/virtualenv-clone/default.nix +++ b/pkgs/development/python-modules/virtualenv-clone/default.nix @@ -7,7 +7,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "virtualenv-clone"; version = "0.5.7"; pyproject = true; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "edwardgeorge"; repo = "virtualenv-clone"; - rev = version; + tag = finalAttrs.version; hash = "sha256-qrN74IwLRqiVPxU8gVhdiM34yBmiS/5ot07uroYPDVw="; }; @@ -23,11 +23,11 @@ buildPythonPackage rec { postPatch = '' substituteInPlace tests/__init__.py \ - --replace-fail "'virtualenv'" "'${virtualenv}/bin/virtualenv'" \ + --replace-fail "'virtualenv'" "'${lib.getExe virtualenv}'" \ --replace-fail "'3.9', '3.10']" "'3.9', '3.10', '3.11', '3.12', '3.13', '3.14']" # if the Python version used isn't in this list, tests fail substituteInPlace tests/test_virtualenv_sys.py \ - --replace-fail "'virtualenv'" "'${virtualenv}/bin/virtualenv'" + --replace-fail "'virtualenv'" "'${lib.getExe virtualenv}'" # PermissionError: [Errno 13] Permission denied: '/tmp/test_fixup_pth_file.pth' # Unable to reproduce. @@ -49,4 +49,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ ]; }; -} +}) From 0f29fb61da5c654e4f0a0128f53c9882e4261862 Mon Sep 17 00:00:00 2001 From: SkohTV Date: Mon, 25 May 2026 11:07:48 -0400 Subject: [PATCH 3/4] python3Packages.virtualenv-clone: adopt --- pkgs/development/python-modules/virtualenv-clone/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/virtualenv-clone/default.nix b/pkgs/development/python-modules/virtualenv-clone/default.nix index b9dc5c5736a5..1549193592aa 100644 --- a/pkgs/development/python-modules/virtualenv-clone/default.nix +++ b/pkgs/development/python-modules/virtualenv-clone/default.nix @@ -47,6 +47,6 @@ buildPythonPackage (finalAttrs: { description = "Script to clone virtualenvs"; mainProgram = "virtualenv-clone"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = with lib.maintainers; [ skohtv ]; }; }) From aa74ca8c8a8199cf9e4af86e93f7126ab2d1e25a Mon Sep 17 00:00:00 2001 From: SkohTV Date: Mon, 25 May 2026 20:44:53 -0400 Subject: [PATCH 4/4] python3Packages.virtualenv-clone: add changelog --- pkgs/development/python-modules/virtualenv-clone/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/virtualenv-clone/default.nix b/pkgs/development/python-modules/virtualenv-clone/default.nix index 1549193592aa..4181a1b5047d 100644 --- a/pkgs/development/python-modules/virtualenv-clone/default.nix +++ b/pkgs/development/python-modules/virtualenv-clone/default.nix @@ -46,6 +46,7 @@ buildPythonPackage (finalAttrs: { homepage = "https://github.com/edwardgeorge/virtualenv-clone"; description = "Script to clone virtualenvs"; mainProgram = "virtualenv-clone"; + changelog = "https://github.com/edwardgeorge/virtualenv-clone/blob/${finalAttrs.src.tag}/changelog.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ skohtv ]; };