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: 09eeebad26b6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 306a07f8d4c1
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Dec 21, 2018

  1. pythonPackages.behave: fix build on Python 2.7

    @lopsided98 @FRidh
    lopsided98 authored and FRidh committed Dec 21, 2018
    Copy the full SHA
    306a07f View commit details
Showing with 9 additions and 1 deletion.
  1. +9 −1 pkgs/development/python-modules/behave/default.nix
10 changes: 9 additions & 1 deletion pkgs/development/python-modules/behave/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchPypi
{ stdenv, fetchPypi, fetchpatch
, buildPythonApplication, python, pythonOlder
, mock, nose, pathpy, pyhamcrest, pytest
, glibcLocales, parse, parse-type, six
@@ -13,6 +13,14 @@ buildPythonApplication rec {
sha256 = "11hsz365qglvpp1m1w16239c3kiw15lw7adha49lqaakm8kj6rmr";
};

patches = [
# Fix tests on Python 2.7
(fetchpatch {
url = https://github.com/behave/behave/commit/0a9430a94881cd18437deb03d2ae23afea0f009c.patch;
sha256 = "1nrh9ii6ik6gw2kjh8a6jk4mg5yqw3jfjfllbyxardclsab62ydy";
})
];

checkInputs = [ mock nose pathpy pyhamcrest pytest ];
buildInputs = [ glibcLocales ];
propagatedBuildInputs = [ parse parse-type six ] ++ stdenv.lib.optional (pythonOlder "3.0") traceback2;