public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging-next

Browse Source
This commit is contained in:
Jan Tojnar
2020-06-10 04:10:34 +02:00
parent 0b4afef84a 986ff168c7
commit c637cbe992
169 changed files with 5627 additions and 11437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/python-modules/gst-python/default.nix
View File

@@ -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 = [

2
pkgs/development/python-modules/pandocfilters/default.nix
View File

@@ -3,7 +3,7 @@
, fetchPypi
}:
buildPythonPackage rec{
buildPythonPackage rec {
version = "1.4.2";
pname = "pandocfilters";

2
pkgs/development/python-modules/periodictable/default.nix
View File

@@ -1,6 +1,6 @@
{lib, fetchPypi, buildPythonPackage, numpy, pyparsing}:
buildPythonPackage rec{
buildPythonPackage rec {
pname = "periodictable";
version = "1.5.2";

5
pkgs/development/python-modules/pycurl/default.nix
View File

@@ -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 = ''

13
pkgs/development/python-modules/pytest-dependency/default.nix
View File

@@ -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 ];

23
pkgs/development/python-modules/python-pam/default.nix Normal file
View File

@@ -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;
};
}

22
pkgs/development/python-modules/pytorch/default.nix
View File

@@ -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;

9
pkgs/development/python-modules/pyxdg/default.nix
View File

@@ -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";

2
pkgs/development/python-modules/toolz/default.nix
View File

@@ -4,7 +4,7 @@
, nose
}:
buildPythonPackage rec{
buildPythonPackage rec {
pname = "toolz";
version = "0.10.0";

2
pkgs/development/python-modules/trezor_agent/default.nix
View File

@@ -13,7 +13,7 @@
, pinentry
}:
buildPythonPackage rec{
buildPythonPackage rec {
pname = "trezor_agent";
version = "0.10.0";

2
pkgs/development/python-modules/x11_hash/default.nix
View File

@@ -3,7 +3,7 @@
, fetchPypi
}:
buildPythonPackage rec{
buildPythonPackage rec {
version = "1.4";
pname = "x11_hash";

2
pkgs/development/python-modules/yenc/default.nix
View File

@@ -6,7 +6,7 @@
, isPy3k
}:
buildPythonPackage rec{
buildPythonPackage rec {
pname = "yenc";
version = "0.4.0";
src = fetchurl {