From d8d6fe24a0d4de0b6a1c3d20b9eac11031b0eaae Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 9 Jun 2021 22:20:33 +0200 Subject: [PATCH] buildbot-classic: fix build on 21.05 --- .../5pkgs/simple/buildbot-classic/default.nix | 9 +++-- .../simple/buildbot-classic/sqlparse.nix | 34 +++++++++++++++++++ 2 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 krebs/5pkgs/simple/buildbot-classic/sqlparse.nix 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 ]; diff --git a/krebs/5pkgs/simple/buildbot-classic/sqlparse.nix b/krebs/5pkgs/simple/buildbot-classic/sqlparse.nix new file mode 100644 index 000000000..b6aee633e --- /dev/null +++ b/krebs/5pkgs/simple/buildbot-classic/sqlparse.nix @@ -0,0 +1,34 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pytest +, isPy3k +}: + +buildPythonPackage rec { + pname = "sqlparse"; + version = "0.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "e162203737712307dfe78860cc56c8da8a852ab2ee33750e33aeadf38d12c548"; + }; + + checkInputs = [ pytest ]; + checkPhase = '' + py.test + ''; + + # Package supports 3.x, but tests are clearly 2.x only. + doCheck = !isPy3k; + + meta = with stdenv.lib; { + description = "Non-validating SQL parser for Python"; + longDescription = '' + Provides support for parsing, splitting and formatting SQL statements. + ''; + homepage = "https://github.com/andialbrecht/sqlparse"; + license = licenses.bsd3; + }; + +}