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

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2020-11-11 16:00:34 +01:00
parent fad425cfbb f70be9a3d1
commit 4076ffe580
155 changed files with 1569 additions and 801 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/python-modules/awkward/default.nix
+2 -2
View File
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "awkward";
version = "0.13.0";
version = "0.14.0";
src = fetchPypi {
inherit pname version;
sha256 = "1a461ee084ea5e98333dacf2506e9b2619ee89cece14b9b99830b546b35c5922";
sha256 = "6a3878f46e8bc2acf28a0b9feb69d354ad2fee2a2a0f65c48c115aa74f245204";
};
nativeBuildInputs = [ pytestrunner ];
pkgs/development/python-modules/azure-mgmt-sql/default.nix
+2 -2
View File
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-sql";
version = "0.23.0";
version = "0.24.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "acf7d4c83fb43152a809e3894528e561e601be543250c2824cc615cc88a70855";
sha256 = "da391ed00d82cd8e20ca50affdc43b99fd9a7919b54a3a0d53c73cb41eea09d3";
};
propagatedBuildInputs = [
pkgs/development/python-modules/cairosvg/default.nix
+2 -2
View File
@@ -4,13 +4,13 @@
buildPythonPackage rec {
pname = "CairoSVG";
version = "2.4.2";
version = "2.5.0";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "1bb7irxbaxxb9ahm3z5wsx1q96mm5gzskc7b6q07h9ikcnb8yrjf";
sha256 = "3fc50d10f0cbef53b3ee376a97a88d81bbd9e2f190f7e63de08431a1a08e9afa";
};
propagatedBuildInputs = [ cairocffi cssselect2 defusedxml pillow tinycss2 ];
pkgs/development/python-modules/dbus-next/default.nix
+2 -2
View File
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "dbus-next";
version = "0.1.4";
version = "0.2.1";
src = fetchFromGitHub {
owner = "altdesktop";
repo = "python-dbus-next";
rev = "v${version}";
sha256 = "sha256-C/aFDHmt6Qws6ek+++wM5GRN6TEvMGMiFktKIXRdGL0=";
sha256 = "0c14mmysx014n1m4pi4ymi6pzxf8dkjr6fm2cmp96x05z9v90vlr";
};
checkInputs = [
pkgs/development/python-modules/dropbox/default.nix
+2 -2
View File
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "dropbox";
version = "10.7.0";
version = "10.8.0";
src = fetchPypi {
inherit pname version;
sha256 = "08c1e0bbc16499e0138431e34777c35ea086734ff15ee5067b0df3424df2a9ec";
sha256 = "2312a0314d7698f6aa6944bf6d73a756f4ff7d7d90fa26c323a418a84dc3b533";
};
# Set DROPBOX_TOKEN environment variable to a valid token.
pkgs/development/python-modules/google_cloud_automl/default.nix
+2 -2
View File
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "google-cloud-automl";
version = "2.0.0";
version = "2.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "16hr1i2771z4yh19xg6kk037h9cv5j64q5bxb9nmkvj12hdwbwgv";
sha256 = "520dfe2ee04d28f3088c9c582fa2a534fc272647d5e2e59acc903c0152e61696";
};
disabled = pythonOlder "3.6";
pkgs/development/python-modules/gphoto2/default.nix
+2 -2
View File
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "gphoto2";
version = "2.2.3";
version = "2.2.4";
src = fetchPypi {
inherit pname version;
sha256 = "35d3ae97a9f13526746fb506de627a73328328528b436a51567fcb7e640883e9";
sha256 = "48b4c4ab70826d3ddaaf7440564d513c02d78680fa690994b0640d383ffb8a7d";
};
nativeBuildInputs = [ pkgconfig ];
pkgs/development/python-modules/itemadapter/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "itemadapter";
version = "0.1.1";
version = "0.2.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "b5e75d48c769ee5c89de12aeba537b2d62d7b575cd549d5d430ed8a67faa63f2";
sha256 = "cb7aaa577fefe2aa6f229ccf4d058e05f44e0178a98c8fb70ee4d95acfabb423";
};
doCheck = false; # infinite recursion with Scrapy
pkgs/development/python-modules/keep/default.nix
+2 -2
View File
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "keep";
version = "2.9";
version = "2.10";
src = fetchPypi {
inherit pname version;
sha256 = "0902kcvhbmy5q5n0ai1df29ybf87qaljz306c5ssl8j9xdjipcq2";
sha256 = "ce71d14110df197ab5afdbd26a14c0bd266b79671118ae1351835fa192e61d9b";
};
propagatedBuildInputs = [
pkgs/development/python-modules/onnx/default.nix
+2 -2
View File
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "onnx";
version = "1.7.0";
version = "1.8.0";
# Due to Protobuf packaging issues this build of Onnx with Python 2 gives
# errors on import.
@@ -27,7 +27,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "0j6rgfbhsw3a8id8pyg18y93k68lbjbj1kq6qia36h69f6pvlyjy";
sha256 = "5f787fd3ce1290e12da335237b3b921152157e51aa09080b65631b3ce3fcc50c";
};
nativeBuildInputs = [ cmake ];
pkgs/development/python-modules/pytorch/default.nix
+26 -20
View File
@@ -4,8 +4,18 @@
openMPISupport ? false, openmpi ? null,
buildDocs ? false,
cudaArchList ? null,
numpy, pyyaml, cffi, click, typing, cmake, hypothesis, numactl, psutil,
linkFarm, symlinkJoin,
# Native build inputs
cmake, utillinux, linkFarm, symlinkJoin, which,
# Build inputs
numactl,
# Propagated build inputs
dataclasses, numpy, pyyaml, cffi, click, typing-extensions,
# Unit tests
hypothesis, psutil,
# virtual pkg that consistently instantiates blas across nixpkgs
# See https://github.com/NixOS/nixpkgs/pull/83888
@@ -17,7 +27,7 @@
# dependencies for torch.utils.tensorboard
pillow, six, future, tensorflow-tensorboard, protobuf,
utillinux, which, isPy3k }:
isPy3k, pythonOlder }:
assert !openMPISupport || openmpi != null;
@@ -102,7 +112,7 @@ let
in buildPythonPackage rec {
pname = "pytorch";
# Don't forget to update pytorch-bin to the same version.
version = "1.6.0";
version = "1.7.0";
disabled = !isPy3k;
@@ -117,23 +127,10 @@ in buildPythonPackage rec {
repo = "pytorch";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "14hhjsi6fnpaw9m1a3bhvdinsks6fhss6bbcrfk6jgns64abqdaz";
sha256 = "0hb11m5kvs4nsi5bc9ijnv6k07593p9dw40rcn33s9vspinrcjd4";
};
patches = lib.optionals stdenv.isAarch64 [
# GNU aarch64 assembler does not support 4s on neon mov:
# https://github.com/pytorch/pytorch/issues/33124
#
# Fix from:
# https://github.com/pytorch/pytorch/pull/40584
#
# This patch can be removed with the next major version (1.7.0).
(fetchpatch {
name = "qnnpack-neon-fix.patch";
url = "https://github.com/pytorch/pytorch/commit/7676682584d0caf9243bce74ea0a88711ec4a807.diff";
sha256 = "13spncaqlpsp8qk2850yly7xqwmhhfwznhmzkk8jgpslkbx75vgq";
})
] ++ lib.optionals stdenv.isDarwin [
patches = lib.optionals stdenv.isDarwin [
# pthreadpool added support for Grand Central Dispatch in April
# 2020. However, this relies on functionality (DISPATCH_APPLY_AUTO)
# that is available starting with macOS 10.13. However, our current
@@ -142,6 +139,13 @@ in buildPythonPackage rec {
./pthreadpool-disable-gcd.diff
];
# The dataclasses module is included with Python >= 3.7. This should
# be fixed with the next PyTorch release.
postPatch = ''
substituteInPlace setup.py \
--replace "'dataclasses'" "'dataclasses; python_version < \"3.7\"'"
'';
preConfigure = lib.optionalString cudaSupport ''
export TORCH_CUDA_ARCH_LIST="${lib.strings.concatStringsSep ";" final_cudaArchList}"
export CC=${cudatoolkit.cc}/bin/gcc CXX=${cudatoolkit.cc}/bin/g++
@@ -217,9 +221,11 @@ in buildPythonPackage rec {
click
numpy
pyyaml
typing-extensions
# the following are required for tensorboard support
pillow six future tensorflow-tensorboard protobuf
] ++ lib.optionals openMPISupport [ openmpi ];
] ++ lib.optionals openMPISupport [ openmpi ]
++ lib.optionals (pythonOlder "3.7") [ dataclasses ];
checkInputs = [ hypothesis ninja psutil ];
pkgs/development/python-modules/rope/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "rope";
version = "0.17.0";
version = "0.18.0";
src = fetchPypi {
inherit pname version;
sha256 = "658ad6705f43dcf3d6df379da9486529cf30e02d9ea14c5682aa80eb33b649e1";
sha256 = "786b5c38c530d4846aa68a42604f61b4e69a493390e3ca11b88df0fbfdc3ed04";
};
checkInputs = [ nose ];
pkgs/development/python-modules/tensorboardx/default.nix
+6
View File
@@ -19,6 +19,12 @@ buildPythonPackage rec {
propagatedBuildInputs = [ numpy protobuf six ];
# apparently torch API changed a bit at 1.6
postPatch = ''
substituteInPlace tensorboardX/pytorch_graph.py --replace "torch.onnx.set_training(model, False)" "torch.onnx.select_model_mode_for_export(model, torch.onnx.TrainingMode.EVAL)"
'';
disabledTests = [ "test_TorchVis" "test_onnx_graph" ];
meta = with lib; {
pkgs/development/python-modules/tokenizers/default.nix
+13 -3
View File
@@ -32,6 +32,14 @@ let
url = "https://norvig.com/big.txt";
sha256 = "0yz80icdly7na03cfpl0nfk5h3j3cam55rj486n03wph81ynq1ps";
};
docPipelineTokenizer = fetchurl {
url = "https://s3.amazonaws.com/models.huggingface.co/bert/anthony/doc-pipeline/tokenizer.json";
hash = "sha256-i533xC8J5CDMNxBjo+p6avIM8UOcui8RmGAmK0GmfBc=";
};
docQuicktourTokenizer = fetchurl {
url = "https://s3.amazonaws.com/models.huggingface.co/bert/anthony/doc-quicktour/tokenizer.json";
hash = "sha256-ipY9d5DR5nxoO6kj7rItueZ9AO5wq9+Nzr6GuEIfIBI=";
};
openaiVocab = fetchurl {
url = "https://s3.amazonaws.com/models.huggingface.co/bert/openai-gpt-vocab.json";
sha256 = "0y40gc9bixj5rxv674br1rxmxkd3ly29p80x1596h8yywwcrpx7x";
@@ -42,16 +50,16 @@ let
};
in rustPlatform.buildRustPackage rec {
pname = "tokenizers";
version = "0.9.2";
version = "0.9.4";
src = fetchFromGitHub {
owner = "huggingface";
repo = pname;
rev = "python-v${version}";
sha256 = "0rsm1g5zfq3ygdb3s8v9xqqpgfzvvkc4n5ik3ahy8sw7pyjljb4m";
hash = "sha256-JXoH9yfhMIFg5qDY5zrF6iWb7XKugjMfk1NxSizfaWg=";
};
cargoSha256 = "0yn699dq9hdjh7fyci99ni8mmd5qdhzrsi80grzgf5cch8g38rbi";
cargoSha256 = "sha256-u9qitrOxJSABs0VjwHUZgmw7VTQXNbp6l8fKKE/RQ7M=";
sourceRoot = "source/bindings/python";
@@ -82,6 +90,8 @@ in rustPlatform.buildRustPackage rec {
ln -s ${robertaMerges} roberta-base-merges.txt
ln -s ${albertVocab} albert-base-v1-tokenizer.json
ln -s ${bertVocab} bert-base-uncased-vocab.txt
ln -s ${docPipelineTokenizer} bert-wiki.json
ln -s ${docQuicktourTokenizer} tokenizer-wiki.json
ln -s ${norvigBig} big.txt
ln -s ${openaiVocab} openai-gpt-vocab.json
ln -s ${openaiMerges} openai-gpt-merges.txt )
pkgs/development/python-modules/transformers/default.nix
+5
View File
@@ -45,6 +45,11 @@ buildPythonPackage rec {
timeout-decorator
];
postPatch = ''
substituteInPlace setup.py \
--replace "tokenizers == 0.9.2" "tokenizers"
'';
preCheck = ''
export HOME="$TMPDIR"
pkgs/development/python-modules/trytond/default.nix
+2 -2
View File
@@ -25,12 +25,12 @@ with stdenv.lib;
buildPythonApplication rec {
pname = "trytond";
version = "5.6.8";
version = "5.8.0";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
sha256 = "330067d7319a50b9fb15e89d224e89ab28bc363926774adf7fa119f681b106b6";
sha256 = "ae9baf7a83a3249686703eee71e81a0283570f545ce985a999fd74b6ab3d4e4f";
};
# Tells the tests which database to use
pkgs/development/python-modules/uproot-methods/default.nix
+2 -2
View File
@@ -6,12 +6,12 @@
}:
buildPythonPackage rec {
version = "0.7.4";
version = "0.8.0";
pname = "uproot-methods";
src = fetchPypi {
inherit pname version;
sha256 = "7f110208a3a2aa9b4d6da11233fd0f206ea039b52bca4bfe312f1b9dcf788476";
sha256 = "57da3d67e1a42b548020debdd23285b5710e3bb2aac20eb7b2d2a686822aa1ab";
};
propagatedBuildInputs = [ numpy awkward ];
pkgs/development/python-modules/wxPython/4.1.nix
+75
View File
@@ -0,0 +1,75 @@
{ lib
, stdenv
, fetchPypi
, buildPythonPackage
, which
, pkgconfig
, python
, isPy27
, pyopengl
, doxygen
, cairo
, ncurses
, pango
, wxGTK
}:
let
dynamic-linker = stdenv.cc.bintools.dynamicLinker;
in
buildPythonPackage rec {
pname = "wxPython";
version = "4.1.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "12x4ci5q7qni4rkfiq6lnpn1fk8b0sfc6dck5wyxkj2sfp5pa91f";
};
# https://github.com/NixOS/nixpkgs/issues/75759
# https://github.com/wxWidgets/Phoenix/issues/1316
doCheck = false;
nativeBuildInputs = [ which doxygen wxGTK pkgconfig ];
buildInputs = [
wxGTK.gtk
ncurses
];
DOXYGEN = "${doxygen}/bin/doxygen";
preConfigure = lib.optionalString (!stdenv.isDarwin) ''
substituteInPlace wx/lib/wxcairo/wx_pycairo.py \
--replace 'cairoLib = None' 'cairoLib = ctypes.CDLL("${cairo}/lib/libcairo.so")'
substituteInPlace wx/lib/wxcairo/wx_pycairo.py \
--replace '_dlls = dict()' '_dlls = {k: ctypes.CDLL(v) for k, v in [
("gdk", "${wxGTK.gtk}/lib/libgtk-x11-3.0.so"),
("pangocairo", "${pango.out}/lib/libpangocairo-1.0.so"),
("appsvc", None)
]}'
# https://github.com/wxWidgets/Phoenix/pull/1584
# It'll be not needed in next version because https://github.com/wxWidgets/Phoenix/pull/1699
substituteInPlace build.py --replace "os.environ['PYTHONPATH'] = phoenixDir()" \
"os.environ['PYTHONPATH'] = os.environ['PYTHONPATH'] + os.pathsep + phoenixDir()"
'';
buildPhase = ''
${python.interpreter} build.py -v --use_syswx dox etg --nodoc build_py
'';
installPhase = ''
${python.interpreter} setup.py install --skip-build --prefix=$out
wrapPythonPrograms
'';
passthru = { inherit wxGTK; };
meta = with lib; {
description = "Cross platform GUI toolkit for Python, Phoenix version";
homepage = "http://wxpython.org/";
license = licenses.wxWindows;
maintainers = with maintainers; [ tfmoraes ];
};
}
pkgs/development/python-modules/xstatic-bootbox/default.nix
+2 -2
View File
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "XStatic-Bootbox";
version = "4.4.0.1";
version = "5.5.1.1";
src = fetchPypi {
inherit version pname;
sha256 = "1g00q38g1k576lxjlwglv4w3fj4z0z8lxlwpc66wyhjglj4r4bwd";
sha256 = "4b2120bb33a1d8ada8f9e0532ad99987aa03879b17b08bfdc6b8326d6eb7c205";
};
# no tests implemented