JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sourcehut.*: remove SRHT_PATH patch

Browse Source
This commit is contained in:
Edmund Wu 2020-06-22 20:08:08 -04:00 committed by Jon
parent 222a7a3a7a
commit 42f17611a1
10 changed files with 0 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/version-management/sourcehut/builds.nix
View File

@ -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 = ''

5
pkgs/applications/version-management/sourcehut/dispatch.nix
View File

@ -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; {

5
pkgs/applications/version-management/sourcehut/git.nix
View File

@ -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 = ''

5
pkgs/applications/version-management/sourcehut/hg.nix
View File

@ -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; {

5
pkgs/applications/version-management/sourcehut/lists.nix
View File

@ -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; {

5
pkgs/applications/version-management/sourcehut/man.nix
View File

@ -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; {

5
pkgs/applications/version-management/sourcehut/meta.nix
View File

@ -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; {

5
pkgs/applications/version-management/sourcehut/paste.nix
View File

@ -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; {

5
pkgs/applications/version-management/sourcehut/todo.nix
View File

@ -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

43
pkgs/applications/version-management/sourcehut/use-srht-path.patch
View File

@ -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: