diff --git a/pkgs/development/tools/continuous-integration/jenkins-job-builder/default.nix b/pkgs/development/tools/continuous-integration/jenkins-job-builder/default.nix new file mode 100644 index 00000000000..31ab75947df --- /dev/null +++ b/pkgs/development/tools/continuous-integration/jenkins-job-builder/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, pythonPackages, buildPythonPackage, git }: + +let + upstreamName = "jenkins-job-builder"; + version = "1.2.0"; + +in + +buildPythonPackage rec { + name = "${upstreamName}-${version}"; + namePrefix = ""; # Don't prepend "pythonX.Y-" to the name + + src = fetchurl { + url = "https://pypi.python.org/packages/source/j/${upstreamName}/${name}.tar.gz"; + sha256 = "09nxdhb0ilxpmk5gbvik6kj9b6j718j5an903dpcvi3r6vzk9b3p"; + }; + + pythonPath = with pythonPackages; [ pip six pyyaml pbr python-jenkins ]; + doCheck = false; # Requires outdated Sphinx + + meta = { + description = "System for configuring Jenkins jobs using simple YAML files"; + homepage = http://ci.openstack.org/jjb.html; + license = stdenv.lib.licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9936330936c..7cab823b7ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5258,6 +5258,8 @@ let jenkins = callPackage ../development/tools/continuous-integration/jenkins { }; + jenkins-job-builder = callPackage ../development/tools/continuous-integration/jenkins-job-builder { }; + lcov = callPackage ../development/tools/analysis/lcov { }; leiningen = callPackage ../development/tools/build-managers/leiningen { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e8aafa0e2f8..9a946d661d9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4222,6 +4222,27 @@ let }; }; + + setuptools-git = buildPythonPackage rec { + name = "setuptools-git-${version}"; + version = "1.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/s/setuptools-git/${name}.tar.gz"; + md5 = "7b5967e9527c789c3113b07a1f196f6e"; + }; + + propagatedBuildInputs = [ pkgs.git ]; + doCheck = false; + + meta = { + description = "Setuptools revision control system plugin for Git"; + homepage = https://pypi.python.org/pypi/setuptools-git; + license = licenses.bsd3; + }; + }; + + watchdog = buildPythonPackage rec { name = "watchdog-${version}"; version = "0.8.3"; @@ -8314,6 +8335,26 @@ let }; + python-jenkins = buildPythonPackage rec { + name = "python-jenkins-${version}"; + version = "0.4.5"; + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/python-jenkins/${name}.tar.gz"; + md5 = "10f1c24d45afe9cadd43f8d60b37d04c"; + }; + + buildInputs = with self; [ pbr pip ]; + pythonPath = with self; [ pyyaml six ]; + doCheck = false; + + meta = { + description = "Python bindings for the remote Jenkins API"; + homepage = https://pypi.python.org/pypi/python-jenkins; + license = licenses.bsd3; + }; + }; + + pil = buildPythonPackage rec { name = "PIL-${version}"; version = "1.1.7";