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: dfe338e464a1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 383556b5e706
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 10, 2019

  1. python.pkgs.python-jenkins: propagate setuptools 

    It is used during runtime.

cc #68314
    @flokli
    flokli committed Oct 10, 2019
    Copy the full SHA
    06dc7cb View commit details

  2. Merge pull request #70915 from flokli/python-jenkins-setuptools 

    python.pkgs.python-jenkins: propagate setuptools
    @worldofpeace
    worldofpeace authored Oct 10, 2019
    Copy the full SHA
    383556b View commit details
Showing with 2 additions and 1 deletion.
  1. +2 −1 pkgs/development/python-modules/python-jenkins/default.nix
3 changes: 2 additions & 1 deletion pkgs/development/python-modules/python-jenkins/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@
, mock
, pbr
, pyyaml
, setuptools
, six
, multi_key_dict
, testscenarios
@@ -22,7 +23,7 @@ buildPythonPackage rec {
};

buildInputs = [ mock ];
propagatedBuildInputs = [ pbr pyyaml six multi_key_dict requests ];
propagatedBuildInputs = [ pbr pyyaml setuptools six multi_key_dict requests ];

checkInputs = [ unittest2 testscenarios requests-mock ];
checkPhase = ''