diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/pkgs/applications/version-management/sourcehut/builds.nix index 2f786be5267..8fd52d0a906 100644 --- a/pkgs/applications/version-management/sourcehut/builds.nix +++ b/pkgs/applications/version-management/sourcehut/builds.nix @@ -24,10 +24,6 @@ in buildPythonPackage rec { sha256 = "1vSUcqYyOitfGaSZVOj5vkmoiAvQbTHgiDVSV5qJLyQ="; }; - patches = [ - ./use-srht-path.patch - ]; - nativeBuildInputs = srht.nativeBuildInputs; propagatedBuildInputs = [ @@ -40,7 +36,6 @@ in buildPythonPackage rec { preBuild = '' export PKGVER=${version} - export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; postInstall = '' diff --git a/pkgs/applications/version-management/sourcehut/dispatch.nix b/pkgs/applications/version-management/sourcehut/dispatch.nix index e8efa700bca..fa557ce78aa 100644 --- a/pkgs/applications/version-management/sourcehut/dispatch.nix +++ b/pkgs/applications/version-management/sourcehut/dispatch.nix @@ -12,10 +12,6 @@ buildPythonPackage rec { sha256 = "JUffuJTKY4I8CrJc8tJWL+CbJCZtiqtUSO9SgYoeux0="; }; - patches = [ - ./use-srht-path.patch - ]; - nativeBuildInputs = srht.nativeBuildInputs; propagatedBuildInputs = [ @@ -26,7 +22,6 @@ buildPythonPackage rec { preBuild = '' export PKGVER=${version} - export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/sourcehut/git.nix b/pkgs/applications/version-management/sourcehut/git.nix index 42ee67fbc1d..08a099f9eb8 100644 --- a/pkgs/applications/version-management/sourcehut/git.nix +++ b/pkgs/applications/version-management/sourcehut/git.nix @@ -51,10 +51,6 @@ in buildPythonPackage rec { sha256 = "EdxgT6IQZgj3KeU3UC+QAQb7BilBY769NhJK633tmE4="; }; - patches = [ - ./use-srht-path.patch - ]; - nativeBuildInputs = srht.nativeBuildInputs; propagatedBuildInputs = [ @@ -66,7 +62,6 @@ in buildPythonPackage rec { preBuild = '' export PKGVER=${version} - export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; postInstall = '' diff --git a/pkgs/applications/version-management/sourcehut/hg.nix b/pkgs/applications/version-management/sourcehut/hg.nix index 3592a91f6a8..841cec581a5 100644 --- a/pkgs/applications/version-management/sourcehut/hg.nix +++ b/pkgs/applications/version-management/sourcehut/hg.nix @@ -12,10 +12,6 @@ buildPythonPackage rec { sha256 = "j+7yG6WdWoU0Uk6doz9GpKZsEGXy/n2smgU6c56/A+Q="; }; - patches = [ - ./use-srht-path.patch - ]; - nativeBuildInputs = srht.nativeBuildInputs; propagatedBuildInputs = [ @@ -27,7 +23,6 @@ buildPythonPackage rec { preBuild = '' export PKGVER=${version} - export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/sourcehut/lists.nix b/pkgs/applications/version-management/sourcehut/lists.nix index 1c8cbbbc75d..7037688f92e 100644 --- a/pkgs/applications/version-management/sourcehut/lists.nix +++ b/pkgs/applications/version-management/sourcehut/lists.nix @@ -12,10 +12,6 @@ buildPythonPackage rec { sha256 = "2Wb1hBx4GuRvVC0pD7gpE9dj5ketW/4ozxuVq2X5dDM="; }; - patches = [ - ./use-srht-path.patch - ]; - nativeBuildInputs = srht.nativeBuildInputs; propagatedBuildInputs = [ @@ -28,7 +24,6 @@ buildPythonPackage rec { preBuild = '' export PKGVER=${version} - export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/sourcehut/man.nix b/pkgs/applications/version-management/sourcehut/man.nix index 2f0efc4480f..7fdf42a52e7 100644 --- a/pkgs/applications/version-management/sourcehut/man.nix +++ b/pkgs/applications/version-management/sourcehut/man.nix @@ -12,10 +12,6 @@ buildPythonPackage rec { sha256 = "hCpuVngpu2AacFGn0F78k2qrn09Z/p1rP8vfW7gkzWc="; }; - patches = [ - ./use-srht-path.patch - ]; - nativeBuildInputs = srht.nativeBuildInputs; propagatedBuildInputs = [ @@ -25,7 +21,6 @@ buildPythonPackage rec { preBuild = '' export PKGVER=${version} - export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/sourcehut/meta.nix b/pkgs/applications/version-management/sourcehut/meta.nix index 89d5d6fc976..26e8ec8d3ee 100644 --- a/pkgs/applications/version-management/sourcehut/meta.nix +++ b/pkgs/applications/version-management/sourcehut/meta.nix @@ -29,13 +29,8 @@ buildPythonPackage rec { weasyprint ]; - patches = [ - ./use-srht-path.patch - ]; - preBuild = '' export PKGVER=${version} - export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/sourcehut/paste.nix b/pkgs/applications/version-management/sourcehut/paste.nix index 4cbcafe432a..15d9839ea37 100644 --- a/pkgs/applications/version-management/sourcehut/paste.nix +++ b/pkgs/applications/version-management/sourcehut/paste.nix @@ -12,10 +12,6 @@ buildPythonPackage rec { sha256 = "vk+h9gQX9KeynjulDaK/vHpKeRQAjVyxk7ttKG27ZIo="; }; - patches = [ - ./use-srht-path.patch - ]; - nativeBuildInputs = srht.nativeBuildInputs; propagatedBuildInputs = [ @@ -25,7 +21,6 @@ buildPythonPackage rec { preBuild = '' export PKGVER=${version} - export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/sourcehut/todo.nix b/pkgs/applications/version-management/sourcehut/todo.nix index 959b259d925..7eaa6776560 100644 --- a/pkgs/applications/version-management/sourcehut/todo.nix +++ b/pkgs/applications/version-management/sourcehut/todo.nix @@ -13,10 +13,6 @@ buildPythonPackage rec { sha256 = "lUM81FYlR6AXCtXZtYiB+1FD8E1aOX7qxbWUVc36lJM="; }; - patches = [ - ./use-srht-path.patch - ]; - nativeBuildInputs = srht.nativeBuildInputs; propagatedBuildInputs = [ @@ -28,7 +24,6 @@ buildPythonPackage rec { preBuild = '' export PKGVER=${version} - export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; # pytest tests fail diff --git a/pkgs/applications/version-management/sourcehut/use-srht-path.patch b/pkgs/applications/version-management/sourcehut/use-srht-path.patch deleted file mode 100644 index 43b494bf9d2..00000000000 --- a/pkgs/applications/version-management/sourcehut/use-srht-path.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/setup.py b/setup.py -index e6ecfb6..89fa92a 100755 ---- a/setup.py -+++ b/setup.py -@@ -5,28 +5,16 @@ import os - import site - import sys - --if hasattr(site, 'getsitepackages'): -- pkg_dirs = site.getsitepackages() -- if site.getusersitepackages(): -- pkg_dirs.append(site.getusersitepackages()) -- for pkg_dir in pkg_dirs: -- srht_path = os.path.join(pkg_dir, "srht") -- if os.path.isdir(srht_path): -- break -- else: -- raise Exception("Can't find core srht module in your site packages " -- "directories. Please install it first.") --else: -- srht_path = os.getenv("SRHT_PATH") -- if not srht_path: -- raise Exception("You're running inside a virtual environment. " -- "Due to virtualenv limitations, you need to set the " -- "$SRHT_PATH environment variable to the path of the " -- "core srht module.") -- elif not os.path.isdir(srht_path): -- raise Exception( -- "The $SRHT_PATH environment variable points to an invalid " -- "directory: {}".format(srht_path)) -+srht_path = os.getenv("SRHT_PATH") -+if not srht_path: -+ raise Exception("You're running inside a virtual environment. " -+ "Due to virtualenv limitations, you need to set the " -+ "$SRHT_PATH environment variable to the path of the " -+ "core srht module.") -+elif not os.path.isdir(srht_path): -+ raise Exception( -+ "The $SRHT_PATH environment variable points to an invalid " -+ "directory: {}".format(srht_path)) - - subp = subprocess.run(["make", "SRHT_PATH=" + srht_path]) - if subp.returncode != 0: