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

Commits on May 10, 2018

  1. python.pkgs.traitlets: fix build and don't include .pytest_cache 

    Fixes build and prevents including `.pytest_cache` file (#40259).
    @FRidh
    FRidh committed May 10, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    tilpner Till Höppner
    GPG key ID: 6A13327225BE51F6
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3390592 View commit details
Showing with 6 additions and 2 deletions.
  1. +6 −2 pkgs/development/python-modules/traitlets/default.nix
8 changes: 6 additions & 2 deletions pkgs/development/python-modules/traitlets/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,6 +7,8 @@
, ipython_genutils
, decorator
, enum34
, pythonOlder
, six
}:

buildPythonPackage rec {
@@ -20,12 +22,14 @@ buildPythonPackage rec {
};

checkInputs = [ glibcLocales pytest mock ];
propagatedBuildInputs = [ ipython_genutils decorator enum34 ];
propagatedBuildInputs = [ ipython_genutils decorator six ] ++ lib.optional (pythonOlder "3.4") enum34;

checkPhase = ''
LC_ALL="en_US.UTF-8" py.test $out
LC_ALL="en_US.UTF-8" py.test
'';

# doCheck = false;

meta = {
description = "Traitlets Python config system";
homepage = http://ipython.org/;