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

Commits on Feb 7, 2020

  1. Verified

    This commit was signed with the committer’s verified signature.
    etu Elis Hirwing
    Copy the full SHA
    d13ab40 View commit details
  2. Verified

    This commit was signed with the committer’s verified signature.
    etu Elis Hirwing
    Copy the full SHA
    3dd255e View commit details
  3. Verified

    This commit was signed with the committer’s verified signature.
    etu Elis Hirwing
    Copy the full SHA
    4284b0d View commit details
  4. python: Mako: 1.1.0 -> 1.1.1

    FRidh committed Feb 7, 2020
    Copy the full SHA
    605bc5d View commit details
  5. Copy the full SHA
    e12b667 View commit details
  6. Copy the full SHA
    2315c6b View commit details
  7. Copy the full SHA
    1ba0a9b View commit details
  8. python: autopep8: 1.4.4 -> 1.5

    FRidh committed Feb 7, 2020
    Copy the full SHA
    7e9b6be View commit details
  9. Copy the full SHA
    125930b View commit details
  10. Copy the full SHA
    e6d41fa View commit details
  11. Copy the full SHA
    c3885f9 View commit details
  12. Copy the full SHA
    6867b58 View commit details
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/Mako/default.nix
Original file line number Diff line number Diff line change
@@ -10,11 +10,11 @@

buildPythonPackage rec {
pname = "Mako";
version = "1.1.0";
version = "1.1.1";

src = fetchPypi {
inherit pname version;
sha256 = "a36919599a9b7dc5d86a7a8988f23a9a3a3d083070023bab23d64f7f1d1e0a4b";
sha256 = "2984a6733e1d472796ceef37ad48c26f4a984bb18119bb2dbc37a44d8f6e75a4";
};

checkInputs = [ markupsafe nose mock ];
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/autopep8/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

buildPythonPackage rec {
pname = "autopep8";
version = "1.4.4";
version = "1.5";

src = fetchPypi {
inherit pname version;
sha256 = "4d8eec30cc81bc5617dbf1218201d770dc35629363547f17577c61683ccfb3ee";
sha256 = "0f592a0447acea0c2b0a9602be1e4e3d86db52badd2e3c84f0193bfd89fd3a43";
};

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

buildPythonPackage rec {
pname = "docutils";
version = "0.15.2";
version = "0.16";

src = fetchPypi {
inherit pname version;
sha256 = "168s5v7bff5ar9jspr6wn823q1sbn0jhnbp9clk41nl8j09fmbm2";
sha256 = "c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc";
};

# Only Darwin needs LANG, but we could set it in general.
# It's done here conditionally to prevent mass-rebuilds.
checkPhase = lib.optionalString (isPy3k && stdenv.isDarwin) ''LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" '' + (if isPy3k then ''
${python.interpreter} test3/alltests.py
'' else ''
checkPhase = lib.optionalString (isPy3k && stdenv.isDarwin) ''LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" '' + ''
${python.interpreter} test/alltests.py
'');
'';

# Create symlinks lacking a ".py" suffix, many programs depend on these names
postFixup = ''
@@ -31,10 +29,6 @@ buildPythonPackage rec {
done
'';

# Four tests are broken with 3.8.
# test_writers.test_odt.DocutilsOdtTestCase
doCheck = !isPy38;

meta = {
description = "Docutils -- Python Documentation Utilities";
homepage = http://docutils.sourceforge.net/;
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/ipython/default.nix
Original file line number Diff line number Diff line change
@@ -22,12 +22,12 @@

buildPythonPackage rec {
pname = "ipython";
version = "7.10.2";
version = "7.12.0";
disabled = pythonOlder "3.6";

src = fetchPypi {
inherit pname version;
sha256 = "762d79a62b6aa96b04971e920543f558dfbeedc0468b899303c080c8068d4ac2";
sha256 = "d9459e7237e2e5858738ff9c3e26504b79899b58a6d49e574d352493d80684c6";
};

prePatch = lib.optionalString stdenv.isDarwin ''
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/jinja2/default.nix
Original file line number Diff line number Diff line change
@@ -3,11 +3,11 @@

buildPythonPackage rec {
pname = "Jinja2";
version = "2.10.3";
version = "2.11.1";

src = fetchPypi {
inherit pname version;
sha256 = "9fe95f19286cfefaa917656583d020be14e7859c6b0252588391e47db34527de";
sha256 = "93187ffbc7808079673ef52771baa950426fd664d3aad1d0fa3e95644360e250";
};

checkInputs = [ pytest ];
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/matplotlib/default.nix
Original file line number Diff line number Diff line change
@@ -20,14 +20,14 @@ assert enableTk -> (tcl != null)
assert enableQt -> pyqt5 != null;

buildPythonPackage rec {
version = "3.1.2";
version = "3.1.3";
pname = "matplotlib";

disabled = !isPy3k;

src = fetchPypi {
inherit pname version;
sha256 = "8e8e2c2fe3d873108735c6ee9884e6f36f467df4a143136209cff303b183bada";
sha256 = "db3121f12fb9b99f105d1413aebaeb3d943f269f3d262b45586d12765866f0c6";
};

NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/multidict/default.nix
Original file line number Diff line number Diff line change
@@ -8,11 +8,11 @@

buildPythonPackage rec {
pname = "multidict";
version = "4.7.2";
version = "4.7.4";

src = fetchPypi {
inherit pname version;
sha256 = "d4dafdcfbf0ac80fc5f00603f0ce43e487c654ae34a656e4749f175d9832b1b5";
sha256 = "d7d428488c67b09b26928950a395e41cc72bb9c3d5abfe9f0521940ee4f796d4";
};

checkInputs = [ pytest pytestrunner pytestcov ];
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/reportlab/default.nix
Original file line number Diff line number Diff line change
@@ -11,11 +11,11 @@ let
ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; });
in buildPythonPackage rec {
pname = "reportlab";
version = "3.5.32";
version = "3.5.34";

src = fetchPypi {
inherit pname version;
sha256 = "83ef44936ef4e9c432d62bc2b72ec8d772b87af319d123e827a72e9b6884c851";
sha256 = "9675a26d01ec141cb717091bb139b6227bfb3794f521943101da50327bff4825";
};

checkInputs = [ glibcLocales ];
19 changes: 2 additions & 17 deletions pkgs/development/python-modules/sqlalchemy/default.nix
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
{ stdenv, lib, fetchPypi, buildPythonPackage, isPy3k, isPy35
, mock
, pysqlite
, fetchpatch
, pytestCheckHook
}:

buildPythonPackage rec {
pname = "SQLAlchemy";
version = "1.3.10";
version = "1.3.13";

src = fetchPypi {
inherit pname version;
sha256 = "0f0768b5db594517e1f5e1572c73d14cf295140756431270d89496dc13d5e46c";
sha256 = "64a7b71846db6423807e96820993fa12a03b89127d278290ca25c0b11ed7b4fb";
};

checkInputs = [
@@ -29,20 +28,6 @@ buildPythonPackage rec {
disabledTests = lib.optionals isPy35 [ "exception_persistent_flush_py3k "]
++ lib.optionals stdenv.isDarwin [ "MemUsageWBackendTest" "MemUsageTest" ];

patches = [
# Two patches for sqlite 3.30 compatibility.
# https://github.com/sqlalchemy/sqlalchemy/pull/4921
(fetchpatch {
url = https://github.com/sqlalchemy/sqlalchemy/commit/8b35ba54ab31aab13a34c360a31d014da1f5c809.patch;
sha256 = "065csr6pd7j1fjnv72wbz8s6xhydi5f161gj7nyqq86rxkh0nl0n";
})
(fetchpatch {
url = https://github.com/sqlalchemy/sqlalchemy/commit/e18534a9045786efdaf4963515222838c62e0300.patch;
sha256 = "0bwfwp5gmgg12qilvwdd2a5xi76bllzzapb23ybh1k34c5pla195";
})

];

meta = with lib; {
homepage = http://www.sqlalchemy.org/;
description = "A Python SQL toolkit and Object Relational Mapper";
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/urllib3/default.nix
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@

buildPythonPackage rec {
pname = "urllib3";
version = "1.25.7";
version = "1.25.8";

src = fetchPypi {
inherit pname version;
sha256 = "f3c5fd51747d450d4dcf6f923c81f78f811aab8205fda64b0aba34a4e48b0745";
sha256 = "87716c2d2a7121198ebcb7ce7cccf6ce5e9ba539041cfbaeecfb641dc0bf6acc";
};

NOSE_EXCLUDE = stdenv.lib.concatStringsSep "," [
10 changes: 6 additions & 4 deletions pkgs/development/python-modules/werkzeug/default.nix
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
{ stdenv, buildPythonPackage, fetchPypi
, itsdangerous, hypothesis
, pytest, requests }:
, pytest, requests
, pytest-timeout
}:

buildPythonPackage rec {
pname = "Werkzeug";
version = "0.16.0";
version = "0.16.1";

src = fetchPypi {
inherit pname version;
sha256 = "7280924747b5733b246fe23972186c6b348f9ae29724135a6dfc1e53cea433e7";
sha256 = "b353856d37dec59d6511359f97f6a4b2468442e454bd1c98298ddce53cac1f04";
};

propagatedBuildInputs = [ itsdangerous ];
checkInputs = [ pytest requests hypothesis ];
checkInputs = [ pytest requests hypothesis pytest-timeout ];

checkPhase = ''
pytest ${stdenv.lib.optionalString stdenv.isDarwin "-k 'not test_get_machine_id'"}
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/zeroconf/default.nix
Original file line number Diff line number Diff line change
@@ -10,12 +10,12 @@

buildPythonPackage rec {
pname = "zeroconf";
version = "0.24.3";
version = "0.24.4";
disabled = isPy27;

src = fetchPypi {
inherit pname version;
sha256 = "de62e5067ea7ab356f7168a3562d79fececa8632ed0fad0e82f505e01fafbc6d";
sha256 = "f66d38f16026097572939ab78b1f46a97f556bca415491eb0fd094d0b5827dfe";
};

propagatedBuildInputs = [ ifaddr ]