From 4f302223a1867e04c8947e634e5d4e70aabb951d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 1 Sep 2016 16:32:43 +0200 Subject: [PATCH 1/4] pythonPackages.sqlalchemy7: mark as broken We need an older version of sqlite. --- pkgs/top-level/python-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0e254996cc6..db4352dd6e3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -23157,6 +23157,7 @@ in modules // { meta = { homepage = http://www.sqlalchemy.org/; description = "A Python SQL toolkit and Object Relational Mapper"; + broken = true; }; }; From 69b676978c52b5bca16be71876a2cff6e8a52f19 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 1 Sep 2016 16:34:33 +0200 Subject: [PATCH 2/4] Remove sqlalchemy_migrate_0_7 --- pkgs/top-level/python-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index db4352dd6e3..44a6604bb48 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -23253,7 +23253,6 @@ in modules // { }; sqlalchemy_migrate = self.sqlalchemy_migrate_func self.sqlalchemy; - sqlalchemy_migrate_0_7 = self.sqlalchemy_migrate_func self.sqlalchemy7; sqlparse = buildPythonPackage rec { name = "sqlparse-${version}"; From 65d983678b5675c2c6af8141f77700df8e51579f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 1 Sep 2016 16:34:40 +0200 Subject: [PATCH 3/4] Remove sqlalchemy7 --- pkgs/top-level/python-packages.nix | 34 ------------------------------ 1 file changed, 34 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 44a6604bb48..66d6fb41f07 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -23098,40 +23098,6 @@ in modules // { rope = if isPy3k then null else self.rope; }; - sqlalchemy7 = buildPythonPackage rec { - name = "SQLAlchemy-0.7.10"; - disabled = isPy34 || isPy35; - doCheck = !isPyPy; - - src = pkgs.fetchurl { - url = "mirror://pypi/S/SQLAlchemy/${name}.tar.gz"; - sha256 = "0rhxgr85xdhjn467qfs0dkyj8x46zxcv6ad3dfx3w14xbkb3kakp"; - }; - - patches = [ - # see https://groups.google.com/forum/#!searchin/sqlalchemy/module$20logging$20handlers/sqlalchemy/ukuGhmQ2p6g/2_dOpBEYdDYJ - # waiting for 0.7.11 release - ../development/python-modules/sqlalchemy-0.7.10-test-failures.patch - ]; - - preConfigure = optionalString isPy3k '' - python3 sa2to3.py --no-diffs -w lib test examples - ''; - - buildInputs = with self; [ nose mock ] - ++ stdenv.lib.optional doCheck pysqlite; - propagatedBuildInputs = with self; [ modules.sqlite3 ]; - - checkPhase = '' - ${python.executable} sqla_nose.py - ''; - - meta = { - homepage = http://www.sqlalchemy.org/; - description = "A Python SQL toolkit and Object Relational Mapper"; - }; - }; - sqlalchemy8 = buildPythonPackage rec { name = "SQLAlchemy-0.8.7"; disabled = isPy34 || isPy35; From f2fc64a4121a6960e41f47f47b43ef0c166f7a23 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 1 Sep 2016 16:37:04 +0200 Subject: [PATCH 4/4] Remove buildbot_8 We now have a newer version and the older version didn't work anymore anyway because it depended on sqlalchemy7 which was itself broken, because it depended on an older version of sqlite. --- .../tools/build-managers/buildbot/8.nix | 82 ------------------- pkgs/top-level/all-packages.nix | 5 -- 2 files changed, 87 deletions(-) delete mode 100644 pkgs/development/tools/build-managers/buildbot/8.nix diff --git a/pkgs/development/tools/build-managers/buildbot/8.nix b/pkgs/development/tools/build-managers/buildbot/8.nix deleted file mode 100644 index 94d9008a4f3..00000000000 --- a/pkgs/development/tools/build-managers/buildbot/8.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ stdenv, buildPythonApplication, fetchurl, twisted, dateutil, jinja2 -, sqlalchemy_migrate_0_7 -, enableDebugClient ? false, pygobject ? null, pyGtkGlade ? null -}: - -# enableDebugClient enables "buildbot debugclient", a Gtk-based debug control -# panel. Its mostly for developers. - -assert enableDebugClient -> pygobject != null && pyGtkGlade != null; - -buildPythonApplication (rec { - name = "buildbot-0.8.12"; - namePrefix = ""; - - src = fetchurl { - url = "mirror://pypi/b/buildbot/${name}.tar.gz"; - sha256 = "1mn4h04sp6smr3ahqfflys15cpn13q9mfkapcs2jc4ppvxv6kdn6"; - }; - - 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 = - [ twisted dateutil jinja2 sqlalchemy_migrate_0_7 - ] ++ stdenv.lib.optional enableDebugClient [ pygobject pyGtkGlade ]; - - # What's up with this?! 'trial' should be 'test', no? - # - # running tests - # usage: setup.py [global_opts] cmd1 [cmd1_opts] [cmd2 [cmd2_opts] ...] - # or: setup.py --help [cmd1 cmd2 ...] - # or: setup.py --help-commands - # or: setup.py cmd --help - # - # error: invalid command 'trial' - doCheck = false; - - postInstall = '' - mkdir -p "$out/share/man/man1" - cp docs/buildbot.1 "$out/share/man/man1" - ''; - - meta = with stdenv.lib; { - homepage = http://buildbot.net/; - license = stdenv.lib.licenses.gpl2Plus; - # Of course, we don't really need that on NixOS. :-) - description = "Continuous integration system that automates the build/test cycle"; - longDescription = - '' The BuildBot is a system to automate the compile/test cycle - required by most software projects to validate code changes. By - automatically rebuilding and testing the tree each time something - has changed, build problems are pinpointed quickly, before other - developers are inconvenienced by the failure. The guilty - developer can be identified and harassed without human - intervention. By running the builds on a variety of platforms, - developers who do not have the facilities to test their changes - everywhere before checkin will at least know shortly afterwards - whether they have broken the build or not. Warning counts, lint - checks, image size, compile time, and other build parameters can - be tracked over time, are more visible, and are therefore easier - to improve. - - The overall goal is to reduce tree breakage and provide a platform - to run tests or code-quality checks that are too annoying or - pedantic for any human to waste their time with. Developers get - immediate (and potentially public) feedback about their changes, - encouraging them to be more careful about testing before checking - in code. - ''; - maintainers = with maintainers; [ bjornfor ]; - platforms = platforms.all; - }; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69f67481fc1..6681fa7bc52 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6180,11 +6180,6 @@ in wxGTK = wxGTK30; }; - buildbot_8 = callPackage ../development/tools/build-managers/buildbot/8.nix { - inherit (pythonPackages) twisted jinja2 sqlalchemy_migrate_0_7; - dateutil = pythonPackages.dateutil_1_5; - }; - buildbot-slave = callPackage ../development/tools/build-managers/buildbot-slave { inherit (pythonPackages) twisted; };