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: 868529b2ce5f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 03ba5ef6d3d4
Choose a head ref
  • 5 commits
  • 4 files changed
  • 2 contributors

Commits on May 29, 2017

  1. python.pkgs.hypothesis: add pytest_xdist as a checkInputs dependency 

    without this py.test doesn't recognize the -n flag and fails
    @risicle
    risicle committed May 29, 2017

    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
    7bbb982 View commit details

  2. python.pkgs.pylibmc: use fetchPypi for src

    @risicle
    risicle committed May 29, 2017
    Copy the full SHA
    2c228f6 View commit details

  3. python.pkgs.ldap: use fetchPypi for src

    @risicle
    risicle committed May 29, 2017
    Copy the full SHA
    d2ef1a2 View commit details

  4. python.pkgs.pylint: add pytestrunner to buildInputs

    @risicle
    risicle committed May 29, 2017
    Copy the full SHA
    21e3b2f View commit details

  5. Merge pull request #26198 from risicle/varied-minor-python-pkgs-fixes 

    python.pkgs: hypothesis, pylibmc, ldap, pylint: minor build fixes
    @FRidh
    FRidh authored May 29, 2017
    Copy the full SHA
    03ba5ef View commit details
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/hypothesis.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, python
, pythonOlder, pythonAtLeast, enum34
, doCheck ? true, pytest, flake8, flaky
, doCheck ? true, pytest, pytest_xdist, flake8, flaky
}:
buildPythonPackage rec {
# http://hypothesis.readthedocs.org/en/latest/packaging.html
@@ -21,7 +21,7 @@ buildPythonPackage rec {
sha256 = "1s911pd3y9hvk0hq2fr6i68dqv1ciagryhgp13wgyfqh8hz8j6zv";
};

checkInputs = stdenv.lib.optionals doCheck [ pytest flake8 flaky ];
checkInputs = stdenv.lib.optionals doCheck [ pytest pytest_xdist flake8 flaky ];
propagatedBuildInputs = stdenv.lib.optionals (pythonOlder "3.4") [ enum34 ];

inherit doCheck;
6 changes: 3 additions & 3 deletions pkgs/development/python-modules/ldap.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ buildPythonPackage, isPy3k, fetchurl
{ buildPythonPackage, isPy3k, fetchPypi
, openldap, cyrus_sasl, openssl }:

buildPythonPackage rec {
@@ -7,8 +7,8 @@ buildPythonPackage rec {
name = "${pname}-${version}";
disabled = isPy3k;

src = fetchurl {
url = "mirror://pypi/p/python-ldap/python-${name}.tar.gz";
src = fetchPypi {
inherit pname version;
sha256 = "88bab69e519dd8bd83becbe36bd141c174b0fe309e84936cf1bae685b31be779";
};

6 changes: 3 additions & 3 deletions pkgs/development/python-modules/pylibmc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ buildPythonPackage, fetchurl, stdenv, libmemcached, zlib }:
{ buildPythonPackage, fetchPypi, stdenv, libmemcached, zlib }:
buildPythonPackage rec {
version = "1.5.2";
pname = "pylibmc";
name = "${pname}-${version}";

src = fetchurl {
url = "https://pypi.python.org/packages/source/p/pylibmc/${name}.tar.gz";
src = fetchPypi {
inherit pname version;
sha256 = "fc54e28a9f1b5b2ec0c030da29c7ad8a15c2755bd98aaa4142eaf419d5fabb33";
};

4 changes: 2 additions & 2 deletions pkgs/development/python-modules/pylint/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, buildPythonPackage, python, astroid, isort,
pytest, mccabe, configparser, backports_functools_lru_cache }:
pytest, pytestrunner, mccabe, configparser, backports_functools_lru_cache }:

buildPythonPackage rec {
name = "${pname}-${version}";
@@ -11,7 +11,7 @@
sha256 = "8b4a7ab6cf5062e40e2763c0b4a596020abada1d7304e369578b522e46a6264a";
};

buildInputs = [ pytest mccabe configparser backports_functools_lru_cache ];
buildInputs = [ pytest pytestrunner mccabe configparser backports_functools_lru_cache ];

propagatedBuildInputs = [ astroid isort ];