diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2020-06-10 04:10:34 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2020-06-10 04:10:34 +0200 |
commit | c637cbe99208d1fcffc50579f5dbfe0ee0cb5c67 (patch) | |
tree | abe2ada0ccc733bfe437cb231da7daf7ae36417c /pkgs/development/python-modules | |
parent | 0b4afef84a37c47bd6a5319513db6279fc4bc4fc (diff) | |
parent | 986ff168c7da80db109eee8b0309b35aee169826 (diff) | |
download | nixlib-c637cbe99208d1fcffc50579f5dbfe0ee0cb5c67.tar nixlib-c637cbe99208d1fcffc50579f5dbfe0ee0cb5c67.tar.gz nixlib-c637cbe99208d1fcffc50579f5dbfe0ee0cb5c67.tar.bz2 nixlib-c637cbe99208d1fcffc50579f5dbfe0ee0cb5c67.tar.lz nixlib-c637cbe99208d1fcffc50579f5dbfe0ee0cb5c67.tar.xz nixlib-c637cbe99208d1fcffc50579f5dbfe0ee0cb5c67.tar.zst nixlib-c637cbe99208d1fcffc50579f5dbfe0ee0cb5c67.zip |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/development/python-modules')
12 files changed, 53 insertions, 38 deletions
diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix index dc15e4b043d2..00d05e189126 100644 --- a/pkgs/development/python-modules/gst-python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -45,6 +45,13 @@ buildPythonPackage rec { url = "https://github.com/GStreamer/gst-python/commit/f98c206bdf01529f8ea395a719b10baf2bdf717f.patch"; sha256 = "04n4zrnfivgr7iaqw4sjlbd882s8halc2bbbhfxqf0sg2lqwmrxg"; }) + ] ++ [ + # Fix linking against Python 3.8 + # https://gitlab.freedesktop.org/gstreamer/gst-python/merge_requests/30 + (fetchpatch { + url = "https://gitlab.freedesktop.org/gstreamer/gst-python/commit/22f28155d86e27c4134de4ed2861264003fcfd23.patch"; + sha256 = "Y70qVguHUBmmRVMFBKAP0d6anBQw5W0TKyu2bAwxbQg="; + }) ]; mesonFlags = [ diff --git a/pkgs/development/python-modules/pandocfilters/default.nix b/pkgs/development/python-modules/pandocfilters/default.nix index 5b87593e0c67..f688d97c91d1 100644 --- a/pkgs/development/python-modules/pandocfilters/default.nix +++ b/pkgs/development/python-modules/pandocfilters/default.nix @@ -3,7 +3,7 @@ , fetchPypi }: -buildPythonPackage rec{ +buildPythonPackage rec { version = "1.4.2"; pname = "pandocfilters"; diff --git a/pkgs/development/python-modules/periodictable/default.nix b/pkgs/development/python-modules/periodictable/default.nix index e35362326805..acbfc06850e4 100644 --- a/pkgs/development/python-modules/periodictable/default.nix +++ b/pkgs/development/python-modules/periodictable/default.nix @@ -1,6 +1,6 @@ {lib, fetchPypi, buildPythonPackage, numpy, pyparsing}: -buildPythonPackage rec{ +buildPythonPackage rec { pname = "periodictable"; version = "1.5.2"; diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix index e65ae7a167b3..6b6aad2b2342 100644 --- a/pkgs/development/python-modules/pycurl/default.nix +++ b/pkgs/development/python-modules/pycurl/default.nix @@ -36,6 +36,8 @@ buildPythonPackage rec { ]; # skip impure or flakey tests + # See also: + # * https://github.com/NixOS/nixpkgs/issues/77304 checkPhase = '' HOME=$TMPDIR pytest tests -k "not test_ssl_in_static_libs \ and not test_keyfunction \ @@ -44,7 +46,8 @@ buildPythonPackage rec { and not test_libcurl_ssl_nss \ and not test_libcurl_ssl_openssl" \ --ignore=tests/getinfo_test.py \ - --ignore=tests/memory_mgmt_test.py + --ignore=tests/memory_mgmt_test.py \ + --ignore=tests/multi_memory_mgmt_test.py ''; preConfigure = '' diff --git a/pkgs/development/python-modules/pytest-dependency/default.nix b/pkgs/development/python-modules/pytest-dependency/default.nix index 13806781125e..9e570a801f99 100644 --- a/pkgs/development/python-modules/pytest-dependency/default.nix +++ b/pkgs/development/python-modules/pytest-dependency/default.nix @@ -1,23 +1,14 @@ { stdenv, buildPythonPackage, fetchPypi, fetchpatch, pytest }: buildPythonPackage rec { - version = "0.4.0"; + version = "0.5.1"; pname = "pytest-dependency"; src = fetchPypi { inherit pname version; - sha256 = "bda0ef48e6a44c091399b12ab4a7e580d2dd8294c222b301f88d7d57f47ba142"; + sha256 = "c2a892906192663f85030a6ab91304e508e546cddfe557d692d61ec57a1d946b"; }; - patches = [ - # Fix tests for pytest>=4.2.0. Remove with the next release - (fetchpatch { - url = "https://github.com/RKrahl/pytest-dependency/commit/089395bf77e629ee789666361ee12395d840252c.patch"; - sha256 = "1nkha2gndrr3mx11kx2ipxhphqd6wr25hvkrfwzyrispqfhgl0wm"; - excludes = [ "doc/src/changelog.rst" ]; - }) - ]; - propagatedBuildInputs = [ pytest ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/python-pam/default.nix b/pkgs/development/python-modules/python-pam/default.nix new file mode 100644 index 000000000000..4065cd7c0145 --- /dev/null +++ b/pkgs/development/python-modules/python-pam/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, pam }: + +buildPythonPackage rec { + pname = "python-pam"; + version = "1.8.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "16whhc0vr7gxsbzvsnq65nq8fs3wwmx755cavm8kkczdkz4djmn8"; + }; + + postPatch = '' + substituteInPlace pam.py --replace 'find_library("pam")' \ + '"${pam}/lib/libpam${stdenv.hostPlatform.extensions.sharedLibrary}"' + ''; + + meta = with stdenv.lib; { + description = "Python PAM module using ctypes"; + homepage = "https://github.com/FirefighterBlu3/python-pam"; + maintainers = with maintainers; [ abbradar ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index 2318738411f4..80c3c6d72931 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -104,7 +104,7 @@ let "LD_LIBRARY_PATH=${cudaStub}\${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH "; in buildPythonPackage rec { - version = "1.4.1"; + version = "1.5.0"; pname = "pytorch"; disabled = !isPy3k; @@ -118,7 +118,7 @@ in buildPythonPackage rec { repo = "pytorch"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "1aa1il4f98pswfj20cv27yfb91l1jcq4515i7mvq7sh5647yzwms"; + sha256 = "19qyrjd72mc0llcfn50av8ym05f2iwa38gv068wykji4ph7qjlv2"; }; preConfigure = lib.optionalString cudaSupport '' @@ -128,24 +128,6 @@ in buildPythonPackage rec { export CUDNN_INCLUDE_DIR=${cudnn}/include ''; - patches = [ - # Prevents a race condition which would be introduced by pull 30333. - # See https://github.com/pytorch/pytorch/issues/32277 - # Can be removed >1.5.0. - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/pytorch/pytorch/pull/30332.patch"; - sha256 = "1v9dwbhz3rdxcx6sz8y8j9n3bj6nqs78b1r8yg89yc15n6l4cqx2"; - }) - - # Fixes errors with gcc-9 compilation. Cherry-picked on advice from ezyang. - # See https://github.com/pytorch/pytorch/issues/32277 - # Can be removed >1.5.0. - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/pytorch/pytorch/pull/30333.patch"; - sha256 = "139413fl37h2fnil0cv99a67mqqnsh02k74b92by1qyr6pcfyg3q"; - }) - ]; - # Use pytorch's custom configurations dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/pyxdg/default.nix b/pkgs/development/python-modules/pyxdg/default.nix index a5cb694b4c15..65cb4389583c 100644 --- a/pkgs/development/python-modules/pyxdg/default.nix +++ b/pkgs/development/python-modules/pyxdg/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, fetchpatch }: buildPythonPackage rec { @@ -15,6 +16,14 @@ buildPythonPackage rec { # error: invalid command 'test' doCheck = false; + patches = [ + # see: https://gitlab.freedesktop.org/xdg/pyxdg/-/merge_requests/5 + (fetchpatch { + url = "https://gitlab.freedesktop.org/xdg/pyxdg/-/commit/78405aaa34463db2c6f33ca28ae2293dd3bb1e91.patch"; + sha256 = "17cjax546rkqv5kvwczjqjdd6vmlvcxjanz0296dlfq23j2wbx63"; + }) + ]; + meta = with stdenv.lib; { homepage = "http://freedesktop.org/wiki/Software/pyxdg"; description = "Contains implementations of freedesktop.org standards"; diff --git a/pkgs/development/python-modules/toolz/default.nix b/pkgs/development/python-modules/toolz/default.nix index cb635d227f7c..e0039057d828 100644 --- a/pkgs/development/python-modules/toolz/default.nix +++ b/pkgs/development/python-modules/toolz/default.nix @@ -4,7 +4,7 @@ , nose }: -buildPythonPackage rec{ +buildPythonPackage rec { pname = "toolz"; version = "0.10.0"; diff --git a/pkgs/development/python-modules/trezor_agent/default.nix b/pkgs/development/python-modules/trezor_agent/default.nix index ad4a30d97c50..2c254aa25bbf 100644 --- a/pkgs/development/python-modules/trezor_agent/default.nix +++ b/pkgs/development/python-modules/trezor_agent/default.nix @@ -13,7 +13,7 @@ , pinentry }: -buildPythonPackage rec{ +buildPythonPackage rec { pname = "trezor_agent"; version = "0.10.0"; diff --git a/pkgs/development/python-modules/x11_hash/default.nix b/pkgs/development/python-modules/x11_hash/default.nix index 7cc921047ac1..22ce5917e2a6 100644 --- a/pkgs/development/python-modules/x11_hash/default.nix +++ b/pkgs/development/python-modules/x11_hash/default.nix @@ -3,7 +3,7 @@ , fetchPypi }: -buildPythonPackage rec{ +buildPythonPackage rec { version = "1.4"; pname = "x11_hash"; diff --git a/pkgs/development/python-modules/yenc/default.nix b/pkgs/development/python-modules/yenc/default.nix index 13c8d53f19b3..453f3113853b 100644 --- a/pkgs/development/python-modules/yenc/default.nix +++ b/pkgs/development/python-modules/yenc/default.nix @@ -6,7 +6,7 @@ , isPy3k }: -buildPythonPackage rec{ +buildPythonPackage rec { pname = "yenc"; version = "0.4.0"; src = fetchurl { |