buildbot{-slave}: simplify builder

remove obsolete patchPhase, use fetchFromGitHub
This commit is contained in:
makefu 2017-08-05 14:49:59 +02:00
parent b4e8ae1369
commit ad7c43c727
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
2 changed files with 7 additions and 22 deletions

View File

@ -1,14 +1,12 @@
{ coreutils, fetchgit, git, buildbot-classic, python2Packages, ... }: { coreutils, fetchgit, git, buildbot-classic, python2Packages, ... }:
python2Packages.buildPythonApplication { python2Packages.buildPythonApplication {
name = "buildbot-classic-slave-0.8.13"; name = "buildbot-classic-slave-${buildbot-classic.version}";
namePrefix = ""; namePrefix = "";
src = buildbot-classic.src; src = buildbot-classic.src;
postUnpack = "sourceRoot=\${sourceRoot}/slave"; postUnpack = "sourceRoot=\${sourceRoot}/slave";
patchPhase = ":";
nativeBuildInputs = [ git ]; nativeBuildInputs = [ git ];
propagatedBuildInputs = [ python2Packages.twisted ]; propagatedBuildInputs = [ python2Packages.twisted ];
doCheck = false; doCheck = false;

View File

@ -1,4 +1,4 @@
{ pkgs, fetchgit, fetchFromGitHub, python2Packages, git, ... }: { pkgs, fetchFromGitHub, python2Packages, git, ... }:
python2Packages.buildPythonApplication rec { python2Packages.buildPythonApplication rec {
name = "buildbot-classic-${version}"; name = "buildbot-classic-${version}";
@ -6,26 +6,13 @@ python2Packages.buildPythonApplication rec {
namePrefix = ""; namePrefix = "";
patches = []; patches = [];
src = fetchgit { src = fetchFromGitHub {
url = "https://github.com/krebscode/buildbot-classic"; owner = "krebscode";
rev = "f26147d17"; repo = "buildbot-classic";
sha256 = "096fzcg36qbvfqc3nx3g4608khlkwx81myl1dww1q2i1sa6bgzzh"; rev = "v${version}";
leaveDotGit = true; sha256 = "0j3mb3g3pgx9nar798igfva7pc5hzcg845gwz8lw7dxr504fky30";
}; };
postUnpack = "sourceRoot=\${sourceRoot}/master"; postUnpack = "sourceRoot=\${sourceRoot}/master";
buildInputs = [ git ];
patchPhase =
# The code insists on /usr/bin/tail, /usr/bin/make, etc.
'' echo "patching erroneous absolute path references..."
for i in $(find -name \*.py)
do
sed -i "$i" \
-e "s|/usr/bin/python|$(type -P python)|g ; s|/usr/bin/||g"
done
sed -i 's/==/>=/' setup.py
'';
propagatedBuildInputs = [ propagatedBuildInputs = [
python2Packages.jinja2 python2Packages.jinja2