Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9bbad4c62545
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d55192e25a6d
Choose a head ref
  • 3 commits
  • 2 files changed
  • 3 contributors

Commits on Oct 10, 2019

  1. diceware: add missing 'setuptools' to propagatedBuildInputs 

    (cherry picked from commit f641fca)
    @grahamc
    Jan Hrnko authored and grahamc committed Oct 10, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    cb1dbf6 View commit details

  2. Merge pull request #70912 from grahamc/backport-diceware-fix 

    diceware: add missing 'setuptools' to propagatedBuildInputs
    @grahamc
    grahamc authored Oct 10, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    654a95b View commit details

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

    It is used during runtime.

cc #68314

(cherry picked from commit 06dc7cb)
    @flokli @worldofpeace
    flokli authored and worldofpeace committed Oct 10, 2019
    Copy the full SHA
    d55192e View commit details
Showing with 4 additions and 1 deletion.
  1. +2 −1 pkgs/development/python-modules/python-jenkins/default.nix
  2. +2 −0 pkgs/tools/security/diceware/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 = ''
2 changes: 2 additions & 0 deletions pkgs/tools/security/diceware/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,6 +15,8 @@ buildPythonApplication rec {

nativeBuildInputs = [ pytestrunner ];

propagatedBuildInputs = [ setuptools ];

checkInputs = [ coverage pytest ];

# see https://github.com/ulif/diceware/commit/a7d844df76cd4b95a717f21ef5aa6167477b6733