Merge remote-tracking branch 'prism/master'

1 files changed, 6 insertions, 3 deletions

diff --git a/krebs/5pkgs/simple/buildbot-classic/default.nix b/krebs/5pkgs/simple/buildbot-classic/default.nix
index c127d2987..5e075f1a1 100644
--- a/krebs/5pkgs/simple/buildbot-classic/default.nix
+++ b/krebs/5pkgs/simple/buildbot-classic/default.nix
@@ -1,6 +1,9 @@
-{ pkgs, fetchFromGitHub, python2Packages, git, ... }:
+{ pkgs, fetchFromGitHub, python2Packages, git, ... }: let
 
-python2Packages.buildPythonApplication rec {
+  # we need the old sqlparse since the new one is python2 incompatible
+  sqlparse = python2Packages.callPackage ./sqlparse.nix {};
+
+in python2Packages.buildPythonApplication rec {
   name = "buildbot-classic-${version}";
   version = "0.8.18";
   namePrefix = "";
@@ -18,7 +21,7 @@ python2Packages.buildPythonApplication rec {
     python2Packages.jinja2
     python2Packages.twisted
     python2Packages.dateutil
-    python2Packages.sqlalchemy_migrate
+    (python2Packages.sqlalchemy_migrate.override { sqlparse = sqlparse; })
     python2Packages.pysqlite
     pkgs.coreutils
   ];