From e5e4d387e11e2d877acd7cfc791b63e42000116b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 3 Oct 2019 16:57:51 +0300 Subject: pythonPackages.python-pam: init at 1.8.4 --- .../python-modules/python-pam/default.nix | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/python-pam/default.nix (limited to 'pkgs/development/python-modules') 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; + }; +} -- cgit 1.4.1 From 1968f115b5b52e95fc1e45ac007894bae6ec6ff0 Mon Sep 17 00:00:00 2001 From: Michael Lingelbach Date: Fri, 5 Jun 2020 15:34:35 -0700 Subject: pyxdg: fix missing class field Type Fixes #88593 by replacing call to missing Type field with getType() --- pkgs/development/python-modules/pyxdg/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'pkgs/development/python-modules') 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"; -- cgit 1.4.1 From 277bbb8efec5ff10ee5c23b0de13fbc1b268bc2c Mon Sep 17 00:00:00 2001 From: 1000101 Date: Mon, 8 Jun 2020 09:37:17 +0200 Subject: formatting: fix missing leading whitespace --- pkgs/applications/science/misc/sasview/xhtml2pdf.nix | 2 +- pkgs/applications/virtualization/8086tiny/default.nix | 2 +- pkgs/development/libraries/celt/0.5.1.nix | 2 +- pkgs/development/libraries/celt/0.7.nix | 2 +- pkgs/development/libraries/celt/default.nix | 2 +- pkgs/development/python-modules/pandocfilters/default.nix | 2 +- pkgs/development/python-modules/periodictable/default.nix | 2 +- pkgs/development/python-modules/toolz/default.nix | 2 +- pkgs/development/python-modules/trezor_agent/default.nix | 2 +- pkgs/development/python-modules/x11_hash/default.nix | 2 +- pkgs/development/python-modules/yenc/default.nix | 2 +- pkgs/tools/admin/scaleway-cli/default.nix | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) (limited to 'pkgs/development/python-modules') diff --git a/pkgs/applications/science/misc/sasview/xhtml2pdf.nix b/pkgs/applications/science/misc/sasview/xhtml2pdf.nix index 42b9560d9b8d..41d15e2f1bab 100644 --- a/pkgs/applications/science/misc/sasview/xhtml2pdf.nix +++ b/pkgs/applications/science/misc/sasview/xhtml2pdf.nix @@ -2,7 +2,7 @@ let #xhtml2pdf specifically requires version "1.0b10" of html5lib - html5 = html5lib.overrideAttrs( oldAttrs: rec{ + html5 = html5lib.overrideAttrs( oldAttrs: rec { name = "${oldAttrs.pname}-${version}"; version = "1.0b10"; src = oldAttrs.src.override { diff --git a/pkgs/applications/virtualization/8086tiny/default.nix b/pkgs/applications/virtualization/8086tiny/default.nix index 96ccc2558815..db76efb96e5f 100644 --- a/pkgs/applications/virtualization/8086tiny/default.nix +++ b/pkgs/applications/virtualization/8086tiny/default.nix @@ -4,7 +4,7 @@ assert sdlSupport -> (SDL != null); -stdenv.mkDerivation rec{ +stdenv.mkDerivation rec { pname = "8086tiny"; version = "1.25"; diff --git a/pkgs/development/libraries/celt/0.5.1.nix b/pkgs/development/libraries/celt/0.5.1.nix index e45d74345d44..759dd6254b4e 100644 --- a/pkgs/development/libraries/celt/0.5.1.nix +++ b/pkgs/development/libraries/celt/0.5.1.nix @@ -1,6 +1,6 @@ { callPackage, fetchurl, ... } @ args: -callPackage ./generic.nix (args // rec{ +callPackage ./generic.nix (args // rec { version = "0.5.1.3"; src = fetchurl { diff --git a/pkgs/development/libraries/celt/0.7.nix b/pkgs/development/libraries/celt/0.7.nix index a5dd401ec49d..2092941dc761 100644 --- a/pkgs/development/libraries/celt/0.7.nix +++ b/pkgs/development/libraries/celt/0.7.nix @@ -1,6 +1,6 @@ { callPackage, fetchurl, ... } @ args: -callPackage ./generic.nix (args // rec{ +callPackage ./generic.nix (args // rec { version = "0.7.1"; src = fetchurl { diff --git a/pkgs/development/libraries/celt/default.nix b/pkgs/development/libraries/celt/default.nix index 61352d5caf93..3071b5d7c6bb 100644 --- a/pkgs/development/libraries/celt/default.nix +++ b/pkgs/development/libraries/celt/default.nix @@ -1,6 +1,6 @@ { callPackage, fetchurl, ... } @ args: -callPackage ./generic.nix (args // rec{ +callPackage ./generic.nix (args // rec { version = "0.11.3"; src = fetchurl { 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/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 { diff --git a/pkgs/tools/admin/scaleway-cli/default.nix b/pkgs/tools/admin/scaleway-cli/default.nix index f9b608ebc4c6..eeae7fbe1bf0 100644 --- a/pkgs/tools/admin/scaleway-cli/default.nix +++ b/pkgs/tools/admin/scaleway-cli/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, buildGoPackage }: -buildGoPackage rec{ +buildGoPackage rec { pname = "scaleway-cli"; version = "1.20"; -- cgit 1.4.1 From 2aa93eb730653216892bedf8387f945cc99bab5e Mon Sep 17 00:00:00 2001 From: Rakesh Gupta Date: Mon, 8 Jun 2020 19:33:07 +1000 Subject: pythonPackages.pytest-dependency: 0.4.0 -> 0.5.1 --- .../python-modules/pytest-dependency/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'pkgs/development/python-modules') 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 ]; -- cgit 1.4.1 From 0574ace715a901fe1ab0a5ddbcedd8be95206762 Mon Sep 17 00:00:00 2001 From: Guillaume Desforges Date: Mon, 8 Jun 2020 14:30:00 +0200 Subject: pythonPackages.pytorch: 1.4.1 -> 1.5.0 Fixes previous bugs that required a patch Fixes CUDA build, see https://github.com/NixOS/nixpkgs/issues/89403 --- .../development/python-modules/pytorch/default.nix | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) (limited to 'pkgs/development/python-modules') 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; -- cgit 1.4.1 From 74734f3f3d9e7e671a7c669b86c509ecb2e161a2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 9 Jun 2020 15:02:16 +0200 Subject: python38.pkgs.gst-python: Fix build --- pkgs/development/python-modules/gst-python/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'pkgs/development/python-modules') 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 = [ -- cgit 1.4.1 From 7440f0f3862abcee9c352d8e898ff7da279a2780 Mon Sep 17 00:00:00 2001 From: Niklas Hambüchen Date: Fri, 5 Jun 2020 15:49:58 +0200 Subject: pycurl: Exclude another flaky test. Fixes #77304 --- pkgs/development/python-modules/pycurl/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'pkgs/development/python-modules') 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 = '' -- cgit 1.4.1