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: d9da434505c1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 73ddd3e16c9c
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Mar 15, 2019

  1. python.pkgs.zetup: fix build 

    (cherry picked from commit 8eee646)
    Robert Schütz committed Mar 15, 2019
    Copy the full SHA
    9925c28 View commit details

  2. python.pkgs.moretools: fix build 

    (cherry picked from commit b5ddc8f)
    Robert Schütz committed Mar 15, 2019
    Copy the full SHA
    be4d31e View commit details

  3. python.pkgs.robotframework-tools: fix build, mark as broken on Python 3 

    (cherry picked from commit 790b927)
    Robert Schütz committed Mar 15, 2019
    Copy the full SHA
    73ddd3e View commit details
5 changes: 3 additions & 2 deletions pkgs/development/python-modules/moretools/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,8 +15,9 @@ buildPythonPackage rec {
py.test test
'';

buildInputs = [ six pathpy pytest ];
propagatedBuildInputs = [ decorator zetup ];
nativeBuildInputs = [ zetup ];
checkInputs = [ six pathpy pytest ];
propagatedBuildInputs = [ decorator ];

meta = with stdenv.lib; {
description = ''
10 changes: 6 additions & 4 deletions pkgs/development/python-modules/robotframework-tools/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, isPy3k
, robotframework
, moretools
, pathpy
, six
, setuptools
, zetup
}:

buildPythonPackage rec {
@@ -17,13 +18,14 @@ buildPythonPackage rec {
sha256 = "04gkn1zpf3rsvbqdxrrjqqi8sa0md9gqwh6n5w2m03fdwjg4lc7q";
};

propagatedBuildInputs = [ robotframework moretools pathpy six setuptools ];
nativeBuildInputs = [ zetup ];

propagatedBuildInputs = [ robotframework moretools pathpy six ];

meta = with stdenv.lib; {
description = "Python Tools for Robot Framework and Test Libraries";
homepage = https://bitbucket.org/userzimmermann/robotframework-tools;
license = licenses.gpl3;
platforms = platforms.linux;
broken = isPy3k; # 2019-03-15, missing dependency robotframework-python3
};

}
11 changes: 9 additions & 2 deletions pkgs/development/python-modules/zetup/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, buildPythonPackage, fetchPypi
, setuptools_scm, pathpy, nbconvert
, pytest }:
, pytest_3 }:

buildPythonPackage rec {
pname = "zetup";
@@ -11,11 +11,18 @@ buildPythonPackage rec {
sha256 = "f1cde33d0ef3bedaf697e432201fa86da698dadd3445c0efd2a114753853c675";
};

# Python 3.7 compatibility
# See https://github.com/zimmermanncode/zetup/pull/1
postPatch = ''
substituteInPlace zetup/zetup_config.py \
--replace "'3.6']" "'3.6', '3.7']"
'';

checkPhase = ''
py.test test
'';

checkInputs = [ pytest pathpy nbconvert ];
checkInputs = [ pytest_3 pathpy nbconvert ];
propagatedBuildInputs = [ setuptools_scm ];

meta = with stdenv.lib; {