Merge pull request #45890 from lopsided98/buildbot-python3

buildbot: Python 3 support and other improvements

5 files changed, 0 insertions, 264 deletions

diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix
deleted file mode 100644
index adb279cdea68..000000000000
--- a/pkgs/development/tools/build-managers/buildbot/default.nix
+++ /dev/null
@@ -1,95 +0,0 @@
-{ stdenv, openssh, buildbot-worker, buildbot-pkg, pythonPackages, runCommand, makeWrapper }:
-
-let
-  withPlugins = plugins: runCommand "wrapped-${package.name}" {
-    buildInputs = [ makeWrapper ] ++ plugins;
-    propagatedBuildInputs = package.propagatedBuildInputs;
-    passthru.withPlugins = moarPlugins: withPlugins (moarPlugins ++ plugins);
-  } ''
-    makeWrapper ${package}/bin/buildbot $out/bin/buildbot \
-      --prefix PYTHONPATH : "${package}/lib/python2.7/site-packages:$PYTHONPATH"
-    ln -sfv ${package}/lib $out/lib
-  '';
-
-  package = pythonPackages.buildPythonApplication rec {
-    name = "${pname}-${version}";
-    pname = "buildbot";
-    version = "1.2.0";
-
-    src = pythonPackages.fetchPypi {
-      inherit pname version;
-      sha256 = "02gwmls8kgm6scy36hdy0bg645zs1pxlrgwkcn79wrl7cfmabcbv";
-    };
-
-    buildInputs = with pythonPackages; [
-      lz4
-      txrequests
-      pyjade
-      boto3
-      moto
-      txgithub
-      mock
-      setuptoolsTrial
-      isort
-      pylint
-      astroid
-      pyflakes
-      openssh
-      buildbot-worker
-      buildbot-pkg
-      treq
-    ];
-
-    propagatedBuildInputs = with pythonPackages; [
-      # core
-      twisted
-      jinja2
-      zope_interface
-      sqlalchemy
-      sqlalchemy_migrate
-      future
-      dateutil
-      txaio
-      autobahn
-      pyjwt
-      distro
-
-      # tls
-      pyopenssl
-      service-identity
-      idna
-
-      # docs
-      sphinx
-      sphinxcontrib-blockdiag
-      sphinxcontrib-spelling
-      pyenchant
-      docutils
-      ramlfications
-      sphinx-jinja
-
-    ];
-
-    patches = [
-      # This patch disables the test that tries to read /etc/os-release which
-      # is not accessible in sandboxed builds.
-      ./skip_test_linux_distro.patch
-    ];
-
-    # TimeoutErrors on slow machines -> aarch64
-    doCheck = !stdenv.isAarch64;
-
-    postPatch = ''
-      substituteInPlace buildbot/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)"
-    '';
-
-    passthru = { inherit withPlugins; };
-
-    meta = with stdenv.lib; {
-      homepage = http://buildbot.net/;
-      description = "Buildbot is an open-source continuous integration framework for automating software build, test, and release processes";
-      maintainers = with maintainers; [ nand0p ryansydnor ];
-      license = licenses.gpl2;
-    };
-  };
-in package
diff --git a/pkgs/development/tools/build-managers/buildbot/pkg.nix b/pkgs/development/tools/build-managers/buildbot/pkg.nix
deleted file mode 100644
index 11f5be4e98e9..000000000000
--- a/pkgs/development/tools/build-managers/buildbot/pkg.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, buildPythonPackage, fetchPypi, setuptools }:
-
-buildPythonPackage rec {
-  name = "${pname}-${version}";
-  pname = "buildbot-pkg";
-  version = "1.2.0";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "70f429311c5812ffd334f023f4f50b904be5c672c8674ee6d28a11a7c096f18a";
-  };
-
-  propagatedBuildInputs = [ setuptools ];
-
-  postPatch = ''
-    # Their listdir function filters out `node_modules` folders.
-    # Do we have to care about that with Nix...?
-    substituteInPlace buildbot_pkg.py --replace "os.listdir = listdir" ""
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = http://buildbot.net/;
-    description = "Buildbot Packaging Helper";
-    maintainers = with maintainers; [ nand0p ryansydnor ];
-    license = licenses.gpl2;
-  };
-}
diff --git a/pkgs/development/tools/build-managers/buildbot/plugins.nix b/pkgs/development/tools/build-managers/buildbot/plugins.nix
deleted file mode 100644
index 430cdee3ca8c..000000000000
--- a/pkgs/development/tools/build-managers/buildbot/plugins.nix
+++ /dev/null
@@ -1,105 +0,0 @@
-{ stdenv, pythonPackages, buildbot-pkg }:
-
-{
-  www = pythonPackages.buildPythonPackage rec {
-    name = "${pname}-${version}";
-    pname = "buildbot_www";
-    version = buildbot-pkg.version;
-
-    # NOTE: wheel is used due to buildbot circular dependency
-    format = "wheel";
-
-    src = pythonPackages.fetchPypi {
-      inherit pname version format;
-      sha256 = "001kxjcyn5sxiq7m1izy4djj7alw6qpgaid4f518s9xgm4a8hwcb";
-    };
-
-    meta = with stdenv.lib; {
-      homepage = http://buildbot.net/;
-      description = "Buildbot UI";
-      maintainers = with maintainers; [ nand0p ryansydnor ];
-      license = licenses.gpl2;
-    };
-  };
-
-  console-view = pythonPackages.buildPythonPackage rec {
-    name = "${pname}-${version}";
-    pname = "buildbot-console-view";
-    version = buildbot-pkg.version;
-
-    src = pythonPackages.fetchPypi {
-      inherit pname version;
-      sha256 = "11p9l9r9rh8cq0ihzjcdxfbi55n7inbsz45zqq67rkvqn5nhj5b6";
-    };
-
-    propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
-
-    meta = with stdenv.lib; {
-      homepage = http://buildbot.net/;
-      description = "Buildbot Console View Plugin";
-      maintainers = with maintainers; [ nand0p ryansydnor ];
-      license = licenses.gpl2;
-    };
-  };
-
-  waterfall-view = pythonPackages.buildPythonPackage rec {
-    name = "${pname}-${version}";
-    pname = "buildbot-waterfall-view";
-    version = buildbot-pkg.version;
-
-    src = pythonPackages.fetchPypi {
-      inherit pname version;
-      sha256 = "1yx63frfpbvwy4hfib1psyq5ad0wysyzfrla8d7lgbdaip021wzw";
-    };
-
-    propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
-
-    meta = with stdenv.lib; {
-      homepage = http://buildbot.net/;
-      description = "Buildbot Waterfall View Plugin";
-      maintainers = with maintainers; [ nand0p ryansydnor ];
-      license = licenses.gpl2;
-    };
-  };
-
-  grid-view = pythonPackages.buildPythonPackage rec {
-    name = "${pname}-${version}";
-    pname = "buildbot-grid-view";
-    version = buildbot-pkg.version;
-
-    src = pythonPackages.fetchPypi {
-      inherit pname version;
-      sha256 = "06my75hli3w1skdkx1qz6zqw2wckanhrcvlqm4inylj9v9pcrgv6";
-    };
-
-    propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
-
-    meta = with stdenv.lib; {
-      homepage = http://buildbot.net/;
-      description = "Buildbot Grid View Plugin";
-      maintainers = with maintainers; [ nand0p ];
-      license = licenses.gpl2;
-    };
-  };
-
-  wsgi-dashboards = pythonPackages.buildPythonPackage rec {
-    name = "${pname}-${version}";
-    pname = "buildbot-wsgi-dashboards";
-    version = buildbot-pkg.version;
-
-    src = pythonPackages.fetchPypi {
-      inherit pname version;
-      sha256 = "073gz44fa5k1p8k46k0ld9gg16j8zdj6sc297qfyqpiw28ybhc5s";
-    };
-
-    propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
-
-    meta = with stdenv.lib; {
-      homepage = http://buildbot.net/;
-      description = "Buildbot WSGI dashboards Plugin";
-      maintainers = with maintainers; [ ];
-      license = licenses.gpl2;
-    };
-  };
-
-}
diff --git a/pkgs/development/tools/build-managers/buildbot/skip_test_linux_distro.patch b/pkgs/development/tools/build-managers/buildbot/skip_test_linux_distro.patch
deleted file mode 100644
index 8fe5c7b56b4f..000000000000
--- a/pkgs/development/tools/build-managers/buildbot/skip_test_linux_distro.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur buildbot-0.9.6/buildbot/test/unit/test_buildbot_net_usage_data.py buildbot-0.9.6.patched/buildbot/test/unit/test_buildbot_net_usage_data.py
---- buildbot-0.9.6/buildbot/test/unit/test_buildbot_net_usage_data.py	2017-04-19 16:57:02.000000000 +0200
-+++ buildbot-0.9.6.patched/buildbot/test/unit/test_buildbot_net_usage_data.py	2017-05-04 12:22:54.575762551 +0200
-@@ -147,6 +147,7 @@
-         _sendBuildbotNetUsageData({'foo': 'bar'})
- 
-     def test_linux_distro(self):
-+        raise SkipTest("NixOS sandboxed builds hides /etc/os-release")
-         system = platform.system()
-         if system != "Linux":
-             raise SkipTest("test is only for linux")
diff --git a/pkgs/development/tools/build-managers/buildbot/worker.nix b/pkgs/development/tools/build-managers/buildbot/worker.nix
deleted file mode 100644
index 4fabad9d3701..000000000000
--- a/pkgs/development/tools/build-managers/buildbot/worker.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, pythonPackages }:
-
-pythonPackages.buildPythonApplication (rec {
-  name = "${pname}-${version}";
-  pname = "buildbot-worker";
-  version = "1.4.0";
-
-  src = pythonPackages.fetchPypi {
-    inherit pname version;
-    sha256 = "12zvf4c39b6s4g1f2w407q8kkw602m88rc1ggi4w9pkw3bwbxrgy";
-  };
-
-  buildInputs = with pythonPackages; [ setuptoolsTrial mock ];
-  propagatedBuildInputs = with pythonPackages; [ twisted future ];
-
-  postPatch = ''
-    substituteInPlace buildbot_worker/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = http://buildbot.net/;
-    description = "Buildbot Worker Daemon";
-    maintainers = with maintainers; [ nand0p ryansydnor ];
-    license = licenses.gpl2;
-  };
-})