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

Commits on Jun 6, 2017

  1. Copy the full SHA
    0037107 View commit details
  2. Copy the full SHA
    8144d13 View commit details
  3. Copy the full SHA
    6df7edd View commit details
  4. Copy the full SHA
    e6ff0aa View commit details
  5. 4
    Copy the full SHA
    51d9995 View commit details
  6. Copy the full SHA
    64cd993 View commit details
  7. Copy the full SHA
    7111351 View commit details
  8. python.pkgs.bootstripped-pip: remove obsolete argparse code

    because we no longer have Python 2.6.
    FRidh committed Jun 6, 2017
    Copy the full SHA
    76e0829 View commit details
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/Nikola/default.nix
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "Nikola";
version = "7.8.6";
version = "7.8.7";

# Nix contains only Python 3 supported version of doit, which is a dependency
# of Nikola. Python 2 support would require older doit 0.29.0 (which on the
@@ -47,7 +47,7 @@ buildPythonPackage rec {

src = fetchPypi {
inherit pname version;
sha256 = "48d3a00c3fc9c61bcd305653a531949bdd777d9211434172549498fd8136e036";
sha256 = "d9c77ce9758cc0e848d4c99229a28314e8bd2a590c77c56540fa919fca4d779f";
};

meta = {
10 changes: 5 additions & 5 deletions pkgs/development/python-modules/astroid/default.nix
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{ lib, fetchurl, buildPythonPackage, python, logilab_common, six
{ lib, fetchPypi, buildPythonPackage, python, logilab_common, six
, lazy-object-proxy, wrapt, singledispatch, enum34, pythonOlder
, backports_functools_lru_cache
}:

buildPythonPackage rec {
name = "${pname}-${version}";
pname = "astroid";
version = "1.5.2";
version = "1.5.3";

src = fetchurl {
url = "mirror://pypi/a/${pname}/${name}.tar.gz";
sha256 = "271f1c9ad6519a5dde2a7f0c9b62c2923b55e16569bdd888f9f9055cc5be37ed";
src = fetchPypi {
inherit pname version;
sha256 = "492c2a2044adbf6a84a671b7522e9295ad2f6a7c781b899014308db25312dd35";
};

propagatedBuildInputs = [ logilab_common six lazy-object-proxy wrapt ]
8 changes: 0 additions & 8 deletions pkgs/development/python-modules/bootstrapped-pip/default.nix
Original file line number Diff line number Diff line change
@@ -13,11 +13,6 @@ let
format = "wheel";
sha256 = "f2900e560efc479938a219433c48f15a4ff4ecfe575a65de385eeb44f2425587";
};
argparse_source = fetchPypi {
pname = "argparse";
version = "1.4.0";
sha256 = "c31647edb69fd3d465a847ea3157d37bed1f95f19760b11a47aa91c04b666314";
};
in stdenv.mkDerivation rec {
pname = "pip";
version = "9.0.1";
@@ -34,11 +29,8 @@ in stdenv.mkDerivation rec {
unzip -d $out/${python.sitePackages} $src
unzip -d $out/${python.sitePackages} ${setuptools_source}
unzip -d $out/${python.sitePackages} ${wheel_source}
'' + stdenv.lib.optionalString (python.isPy26 or false) ''
unzip -d $out/${python.sitePackages} ${argparse_source}
'';


patchPhase = ''
mkdir -p $out/bin
'';
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/guessit/default.nix
Original file line number Diff line number Diff line change
@@ -9,12 +9,12 @@

buildPythonPackage rec {
pname = "guessit";
version = "2.1.3";
version = "2.1.4";
name = "${pname}-${version}";

src = fetchPypi {
inherit pname version;
sha256 = "b2eebbb61e4d2b3764ce4462e0b27da0dccbb25b78e13493a2f913a402e1d0fb";
sha256 = "90e6f9fb49246ad27f34f8b9984357e22562ccc3059241cbc08b4fac1d401c56";
};

# Tests require more packages.
10 changes: 5 additions & 5 deletions pkgs/development/python-modules/m2r/default.nix
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{ stdenv, buildPythonPackage, fetchurl,
{ stdenv, buildPythonPackage, fetchPypi,
mistune, docutils } :
buildPythonPackage rec {
pname = "m2r";
name = "${pname}-${version}";
version = "0.1.5";
version = "0.1.6";

src = fetchurl {
url = "mirror://pypi/m/m2r/${name}.tar.gz";
sha256 = "08rjn3x1qag60wawjnq95wmgijrn33apr4fhj01s2p6hmrqgfj1l";
src = fetchPypi {
inherit pname version;
sha256 = "a26bc2e25e0ad3f8650385aea25cf734ac4fcd30e54faec92fd39675da75e527";
};

propagatedBuildInputs = [ mistune docutils ];
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/ntlm-auth/default.nix
Original file line number Diff line number Diff line change
@@ -9,14 +9,14 @@

buildPythonPackage rec {
pname = "ntlm-auth";
version = "1.0.3";
version = "1.0.4";
name = "${pname}-${version}";

src = fetchFromGitHub {
owner = "jborean93";
repo = "ntlm-auth";
rev = "v${version}";
sha256 = "09f2g4ivfi9lh1kr30hlg0q4n2imnvmd79w83gza11q9nmhhiwpz";
sha256 = "3d411413f1309fcd443095d57ab169b637e5b57ce701ac7ae8dbf572cb3533c0";
};

checkInputs = [ mock pytest unittest2 ];
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/pandas/default.nix
Original file line number Diff line number Diff line change
@@ -27,12 +27,12 @@ let
inherit (stdenv) isDarwin;
in buildPythonPackage rec {
pname = "pandas";
version = "0.20.1";
version = "0.20.2";
name = "${pname}-${version}";

src = fetchPypi {
inherit pname version;
sha256 = "42707365577ef69f7c9c168ddcf045df2957595a9ee71bc13c7997eecb96b190";
sha256 = "92173c976fcca70cb19a958eccdacf98af62ef7301bf786d0321cb8857cdfae6";
};

LC_ALL = "en_US.UTF-8";
10 changes: 5 additions & 5 deletions pkgs/development/python-modules/pyopencl/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv
, fetchurl
, fetchPypi
, buildPythonPackage
, Mako
, pytest
@@ -15,16 +15,16 @@

buildPythonPackage rec {
pname = "pyopencl";
version = "2017.1";
version = "2017.1.1";
name = "${pname}-${version}";

buildInputs = [ pytest opencl-headers ocl-icd ];

propagatedBuildInputs = [ numpy cffi pytools decorator appdirs six Mako ];

src = fetchurl {
url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
sha256 = "b5085b6412e5a1037b893853e4e47ecb36dd04586b0f8e1809f50f7fe1437dae";
src = fetchPypi {
inherit pname version;
sha256 = "928c458a463321c6c91e7fa54bf325bf71d7a8aa5ff750ec8fed2472f6aeb323";
};

# gcc: error: pygpu_language_opencl.cpp: No such file or directory