summaryrefslogtreecommitdiffstats
path: root/krebs/5pkgs/simple
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2017-07-29 00:38:22 +0200
committerlassulus <lassulus@lassul.us>2017-07-29 00:38:22 +0200
commit5ff77c7c64fe8eb94004a77718e70cfa14a3c9c4 (patch)
treeb9ceba038f1e54fe68dd3ff94b551535554cd0fa /krebs/5pkgs/simple
parentc575f32d56b53ecbc1bcf28342f4eff683b7818c (diff)
parent17497235e84985f9b2ec4acda47f15a9fe68453e (diff)
Merge remote-tracking branch 'gum/master' into HEAD
Diffstat (limited to 'krebs/5pkgs/simple')
-rw-r--r--krebs/5pkgs/simple/buildbot-classic-slave/default.nix9
-rw-r--r--krebs/5pkgs/simple/buildbot-classic/default.nix27
2 files changed, 18 insertions, 18 deletions
diff --git a/krebs/5pkgs/simple/buildbot-classic-slave/default.nix b/krebs/5pkgs/simple/buildbot-classic-slave/default.nix
index c316889e4..bbc824a6a 100644
--- a/krebs/5pkgs/simple/buildbot-classic-slave/default.nix
+++ b/krebs/5pkgs/simple/buildbot-classic-slave/default.nix
@@ -1,16 +1,15 @@
-{ coreutils, fetchgit, fetchFromGitHub, buildbot-classic, python2Packages, ... }:
+{ coreutils, fetchgit, git, buildbot-classic, python2Packages, ... }:
python2Packages.buildPythonApplication {
- name = "buildbot-classic-slave-0.8.12";
+ name = "buildbot-classic-slave-0.8.13";
namePrefix = "";
src = buildbot-classic.src;
postUnpack = "sourceRoot=\${sourceRoot}/slave";
- patchPhase = ''
- substituteInPlace buildslave/scripts/logwatcher.py --replace /usr/bin/tail ${coreutils}/bin/tail
- '';
+ patchPhase = ":";
+ nativeBuildInputs = [ git ];
propagatedBuildInputs = [ python2Packages.twisted ];
doCheck = false;
diff --git a/krebs/5pkgs/simple/buildbot-classic/default.nix b/krebs/5pkgs/simple/buildbot-classic/default.nix
index a3d924c4a..353972109 100644
--- a/krebs/5pkgs/simple/buildbot-classic/default.nix
+++ b/krebs/5pkgs/simple/buildbot-classic/default.nix
@@ -1,4 +1,4 @@
-{ fetchgit, fetchFromGitHub, python2Packages, ... }:
+{ fetchgit, fetchFromGitHub, python2Packages, git, ... }:
let
# https://github.com/NixOS/nixpkgs/issues/14026
nixpkgs-fix = import (fetchgit {
@@ -8,18 +8,19 @@ let
}) {};
in nixpkgs-fix.buildPythonApplication {
- name = "buildbot-classic-0.8.12";
+ name = "buildbot-classic-0.8.13";
namePrefix = "";
patches = [];
- src = fetchFromGitHub {
- owner = "krebscode";
- repo = "buildbot-classic";
- rev = "5b4f5f6f1";
- sha256 = "1j3xn1gjzvsf90jvfmyln71fzlhjx642ivrqf47zfxpkacljja93";
+ src = fetchgit {
+ url = "https://github.com/krebscode/buildbot-classic";
+ rev = "211ec7815";
+ sha256 = "0cyn406r31qdqhpsih7w83x47b443svpgfhxqd6w3iryv0y1z95i";
+ leaveDotGit = true;
+
};
postUnpack = "sourceRoot=\${sourceRoot}/master";
-
+ buildInputs = [ git ];
patchPhase =
# The code insists on /usr/bin/tail, /usr/bin/make, etc.
'' echo "patching erroneous absolute path references..."
@@ -32,11 +33,11 @@ in nixpkgs-fix.buildPythonApplication {
sed -i 's/==/>=/' setup.py
'';
- propagatedBuildInputs = [
- python2Packages.jinja2
- python2Packages.twisted
- nixpkgs-fix.pythonPackages.dateutil_1_5
- nixpkgs-fix.pythonPackages.sqlalchemy_migrate_0_7
+ propagatedBuildInputs = with nixpkgs-fix.pythonPackages; [
+ jinja2
+ twisted
+ dateutil_1_5
+ sqlalchemy_migrate_0_7
];
doCheck = false;
postInstall = ''