Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1e148f1a33c3
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4c70f45e8aa2
Choose a head ref
  • 4 commits
  • 3 files changed
  • 2 contributors

Commits on Sep 30, 2019

  1. pythonPackages.stevedore: 1.30.1 -> 1.31.0

    Jonathan Ringer committed Sep 30, 2019
    Copy the full SHA
    432ba51 View commit details

  2. pythonPackages.jenkins-job-builder: 3.0.1 -> 3.0.2

    Jonathan Ringer committed Sep 30, 2019
    Copy the full SHA
    073f505 View commit details

  3. jenkins-job-builder: use python3

    Jonathan Ringer committed Sep 30, 2019
    Copy the full SHA
    3c8a7af View commit details

Commits on Oct 1, 2019

  1. Merge pull request #70057 from jonringer/bump-jenkins-job 

    pythonPackages.jenkins-job-builder: 3.0.1 -> 3.0.2
    @teto
    teto authored Oct 1, 2019
    Copy the full SHA
    4c70f45 View commit details
Showing with 14 additions and 19 deletions.
  1. +9 −14 pkgs/development/python-modules/jenkins-job-builder/default.nix
  2. +4 −4 pkgs/development/python-modules/stevedore/default.nix
  3. +1 −1 pkgs/top-level/all-packages.nix
23 changes: 9 additions & 14 deletions pkgs/development/python-modules/jenkins-job-builder/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
8 changes: 4 additions & 4 deletions pkgs/development/python-modules/stevedore/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{ stdenv, buildPythonPackage, fetchPypi, pbr, six }:
{ stdenv, buildPythonPackage, fetchPypi, pbr, setuptools, six }:

buildPythonPackage rec {
pname = "stevedore";
version = "1.30.1";
version = "1.31.0";

src = fetchPypi {
inherit pname version;
sha256 = "1860zslirsqskc2iifljxcyly28zqgjpmkm7k3bj6zyqagzriq3v";
sha256 = "054apq55yg7058pmbnyc8jhrcpi9clmi0sm7znhwg0d676brywz0";
};

doCheck = false;

propagatedBuildInputs = [ pbr six ];
propagatedBuildInputs = [ pbr setuptools six ];

meta = with stdenv.lib; {
description = "Manage dynamic plugins for Python applications";
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -9756,7 +9756,7 @@ in

jenkins = callPackage ../development/tools/continuous-integration/jenkins { };

jenkins-job-builder = pythonPackages.jenkins-job-builder;
jenkins-job-builder = with python3Packages; toPythonApplication jenkins-job-builder;

kafkacat = callPackage ../development/tools/kafkacat { };