From 073f50593b643438ab73c581028c38d5bb059183 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 30 Sep 2019 06:30:36 -0700 Subject: [PATCH] pythonPackages.jenkins-job-builder: 3.0.1 -> 3.0.2 --- .../jenkins-job-builder/default.nix | 23 ++++++++----------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix index e6c4086c386..184c86e9268 100644 --- a/pkgs/development/python-modules/jenkins-job-builder/default.nix +++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix @@ -1,37 +1,32 @@ -{ stdenv -, buildPythonPackage -, fetchPypi +{ lib, buildPythonPackage, fetchPypi, isPy27 +, fasteners +, jinja2 , pbr -, mock , python-jenkins , pyyaml , six , stevedore -, isPy27 -, fasteners -, jinja2 }: buildPythonPackage rec { pname = "jenkins-job-builder"; - version = "3.0.1"; - disabled = !isPy27; + version = "3.0.2"; src = fetchPypi { inherit pname version; - sha256 = "16x97pdr90x3xsc1xl66l7q77pgja5dzsk921by2h09k7dvxaqmh"; + sha256 = "02ggscsyrrqk06w9lb43km77qgcj8cixrrm5mkigr4gz2pzdjhmf"; }; postPatch = '' export HOME=$TMPDIR ''; - propagatedBuildInputs = [ pbr mock python-jenkins pyyaml six stevedore fasteners jinja2 ]; + propagatedBuildInputs = [ pbr python-jenkins pyyaml six stevedore fasteners jinja2 ]; - # Need to fix test deps - doCheck = false; + # Need to fix test deps, relies on stestr and a few other packages that aren't available on nixpkgs + checkPhase = ''$out/bin/jenkins-jobs --help''; - meta = with stdenv.lib; { + meta = with lib; { description = "Jenkins Job Builder is a system for configuring Jenkins jobs using simple YAML files stored in Git"; homepage = "https://docs.openstack.org/infra/system-config/jjb.html"; license = licenses.asl20;