Merge branch 'staging-next' into staging

This commit is contained in:
Florian Franzen 2019-02-10 14:37:31 +01:00
commit f470720aa8
33 changed files with 118 additions and 72 deletions

View file

@ -7,16 +7,14 @@
, speechd, brltty, setproctitle, gst_all_1, gst-python
}:
let
buildPythonApplication rec {
pname = "orca";
version = "3.30.2";
in buildPythonApplication rec {
name = "${pname}-${version}";
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "17asibc46i5gr2fw04jvvdi85zzmxwlnhyq7r6cr3m5prrdr8a53";
};

View file

@ -35,6 +35,7 @@ let
inherit flint ecl arb;
inherit sage-src pynac singular;
linbox = pkgs.linbox.override { withSage = true; };
pkg-config = pkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig
};
};
};

View file

@ -30,6 +30,7 @@
, numpy
, pari
, pkgconfig
, pkg-config
, planarity
, ppl
, pynac
@ -63,6 +64,7 @@ buildPythonPackage rec {
iml
perl
jupyter_core
pkg-config
];
buildInputs = [

View file

@ -747,6 +747,10 @@ self: super: {
rev = "v${ver}";
sha256 = "0kqglih3rv12nmkzxvalhfaaafk4b2irvv9x5xmc48i1ns71y23l";
}}/doc";
# Needed after sphinx 1.7.9 -> 1.8.3
postPatch = ''
substituteInPlace conf.py --replace "'.md': CommonMarkParser," ""
'';
nativeBuildInputs = with pkgs.buildPackages.pythonPackages; [ sphinx recommonmark sphinx_rtd_theme ];
makeFlags = "html";
installPhase = ''

View file

@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
configureFlags = stdenv.lib.optional stdenv.isLinux
"--with-module-dir=${libGL_driver.driverLink}/lib/vdpau";
NIX_LDFLAGS = if stdenv.isDarwin then "-lX11" else null;
installFlags = [ "moduledir=$(out)/lib/vdpau" ];
meta = with stdenv.lib; {

View file

@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "google-api-core";
version = "1.5.2";
version = "1.7.0";
src = fetchPypi {
inherit pname version;
sha256 = "16knimv41rjhrqkibm1p8f5ssmbbcjn7njc71lpr8v03l7mr6f9q";
sha256 = "85693e163a1a6faea69a74f8feaf35d54dfa2559fbdbbe389c93ffb3bb4c9a79";
};
propagatedBuildInputs = [

View file

@ -5,6 +5,7 @@
, grpc_google_iam_v1
, google_api_core
, pytest
, mock
}:
buildPythonPackage rec {
@ -16,7 +17,7 @@ buildPythonPackage rec {
sha256 = "233157c5d902a084477fb5fe6ca1f946d6fe7911577d4a36aee0227777db61b7";
};
checkInputs = [ pytest ];
checkInputs = [ pytest mock ];
propagatedBuildInputs = [ enum34 grpc_google_iam_v1 google_api_core ];
checkPhase = ''

View file

@ -4,6 +4,7 @@
, enum34
, google_api_core
, pytest
, mock
}:
buildPythonPackage rec {
@ -15,7 +16,7 @@ buildPythonPackage rec {
sha256 = "32890d1e043eb09a86ff1839096dfb49051cd436bdf1a1708299484cfd06db1a";
};
checkInputs = [ pytest ];
checkInputs = [ pytest mock ];
propagatedBuildInputs = [ enum34 google_api_core ];
checkPhase = ''

View file

@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "google-cloud-bigquery";
version = "1.6.1";
version = "1.8.1";
src = fetchPypi {
inherit pname version;
sha256 = "04f0a2bb53d779fc62927be92f8253c34774a1a9f95cccec3e45d000d1547ef9";
sha256 = "621e05321d7a26b87fa2d4f8dd24f963d3424d7566a6454d65c4427b9d8552e2";
};
checkInputs = [ pytest mock ipython ];

View file

@ -3,18 +3,19 @@
, fetchPypi
, google_api_core
, pytest
, mock
}:
buildPythonPackage rec {
pname = "google-cloud-bigquery-datatransfer";
version = "0.1.1";
version = "0.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "f5b5d0de43805fa9ebb620c58e1d27e6d32d2fc8e9a2f954ee170f7a026c8757";
sha256 = "02bf1a508ffbc730904fd8a5e7d7c33946f0aa539127c1b1e235dfdedd7bc9a5";
};
checkInputs = [ pytest ];
checkInputs = [ pytest mock ];
propagatedBuildInputs = [ google_api_core ];
checkPhase = ''

View file

@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "google-cloud-bigtable";
version = "0.31.1";
version = "0.32.1";
src = fetchPypi {
inherit pname version;
sha256 = "f0e66d7c9b37b0a7fc021f10ffaf848b10618a91060ac143ef7f615d682c97d5";
sha256 = "bb113894e1322102d4917740be4870798cad76aa4291ff742ada5548988b2223";
};
checkInputs = [ pytest mock ];

View file

@ -3,18 +3,19 @@
, fetchPypi
, google_api_core
, pytest
, mock
}:
buildPythonPackage rec {
pname = "google-cloud-container";
version = "0.1.1";
version = "0.2.1";
src = fetchPypi {
inherit pname version;
sha256 = "a89afcb1fe96bc9361c231c223c3bbe19fa3787caeb4697cd5778990e1077270";
sha256 = "566834ef43e79917b112e3bd2848e84cfb0f4d7b565581607e2548f5c8e5d87a";
};
checkInputs = [ pytest ];
checkInputs = [ pytest mock ];
propagatedBuildInputs = [ google_api_core ];
checkPhase = ''

View file

@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "google-cloud-core";
version = "0.28.1";
version = "0.29.1";
src = fetchPypi {
inherit pname version;
sha256 = "89e8140a288acec20c5e56159461d3afa4073570c9758c05d4e6cb7f2f8cc440";
sha256 = "d85b1aaaf3bad9415ad1d8ee5eadce96d7007a82f13ce0a0629a003a11e83f29";
};
propagatedBuildInputs = [ google_api_core grpcio ];

View file

@ -3,18 +3,19 @@
, fetchPypi
, google_api_core
, pytest
, mock
}:
buildPythonPackage rec {
pname = "google-cloud-dataproc";
version = "0.2.0";
version = "0.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "531dbd3e5862df5e67751efdcd89f00d0ded35f3a87a18fd3245e1c365080720";
sha256 = "3acbb1bd9e25fd233ae321c137a58306d5d0ef262e3cbe825c511c8ef55b33a2";
};
checkInputs = [ pytest ];
checkInputs = [ pytest mock ];
propagatedBuildInputs = [ google_api_core ];
checkPhase = ''

View file

@ -4,18 +4,19 @@
, enum34
, google_api_core
, pytest
, mock
}:
buildPythonPackage rec {
pname = "google-cloud-dlp";
version = "0.9.0";
version = "0.10.0";
src = fetchPypi {
inherit pname version;
sha256 = "408e5c6820dc53dd589a7bc378d25c2cf5817c448b7c7b1268bc745ecbe04ec3";
sha256 = "5cc7e40842b6c3dc586d04e3d2b2326b44afbe3896da6a30032d64650a7c6b00";
};
checkInputs = [ pytest ];
checkInputs = [ pytest mock ];
propagatedBuildInputs = [ enum34 google_api_core ];
checkPhase = ''

View file

@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "google-cloud-firestore";
version = "0.30.1";
version = "0.31.0";
src = fetchPypi {
inherit pname version;
sha256 = "2e82481ff396e166f530c097a74670efab93466a70a6a2676081a3f30ef74b7f";
sha256 = "5349d1a112dc8ff1b96d400a04ab18949503b542c72f526847e2066eef6cbc25";
};
checkInputs = [ pytest ];

View file

@ -5,18 +5,19 @@
, grpc_google_iam_v1
, google_api_core
, pytest
, mock
}:
buildPythonPackage rec {
pname = "google-cloud-iot";
version = "0.1.0";
version = "0.2.0";
src = fetchPypi {
inherit pname version;
sha256 = "1502fa6d64f8f0f7c0e34e71c82c5daacc8fd8f78256cfadef5ae06c5efcc3b4";
sha256 = "b274fb5d38cfaa556a07943d9c9a23ca4aa3ecca51135a70325e1c95fa699474";
};
checkInputs = [ pytest ];
checkInputs = [ pytest mock ];
propagatedBuildInputs = [ enum34 grpc_google_iam_v1 google_api_core ];
checkPhase = ''

View file

@ -5,6 +5,7 @@
, grpc_google_iam_v1
, google_api_core
, pytest
, mock
}:
buildPythonPackage rec {
@ -16,7 +17,7 @@ buildPythonPackage rec {
sha256 = "3e9d9e07af8651826db5997ca0f11f02401cef42eb822d416a19df05b17c5a45";
};
checkInputs = [ pytest ];
checkInputs = [ pytest mock ];
propagatedBuildInputs = [ enum34 grpc_google_iam_v1 google_api_core ];
checkPhase = ''

View file

@ -4,6 +4,7 @@
, enum34
, google_api_core
, pytest
, mock
}:
buildPythonPackage rec {
@ -15,7 +16,7 @@ buildPythonPackage rec {
sha256 = "e4742b98e2d69ca21864e3218805a9db7e04e06f0672f2385cf6b5361ee35605";
};
checkInputs = [ pytest ];
checkInputs = [ pytest mock ];
propagatedBuildInputs = [ enum34 google_api_core ];
checkPhase = ''

View file

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-logging";
version = "1.8.0";
version = "1.10.0";
src = fetchPypi {
inherit pname version;
sha256 = "418ae534a8044ea5fd385fc4958763d76b8f315785d7a61f264c5a04035d02d5";
sha256 = "13ac67399289b202b409e6cef7a87dea32ddabf902f69a677bd05554f6aecf0b";
};
checkInputs = [ pytest mock webapp2 django flask ];

View file

@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "google-cloud-monitoring";
version = "0.30.1";
version = "0.31.1";
src = fetchPypi {
inherit pname version;
sha256 = "6b26d659360306d51b9fb88c5b1eb77bf49967a37b6348ae9568c083e466274d";
sha256 = "ac0a7657a11459894abf35d3e35e804df0fb81ef35bc18f80199d4ce02440c2d";
};
checkInputs = [ pytest mock ];

View file

@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "google-cloud-pubsub";
version = "0.38.0";
version = "0.39.1";
src = fetchPypi {
inherit pname version;
sha256 = "0b0481fa61faf8143c3cffc9d3fbe757423a200fbddddcf27feb2c49e3c35e58";
sha256 = "4186386aec02752e982eeb1e399d76f1cf70eed56312934df04bfa68d8cfabf0";
};
checkInputs = [ pytest mock ];

View file

@ -4,6 +4,7 @@
, enum34
, google_api_core
, pytest
, mock
}:
buildPythonPackage rec {
@ -15,7 +16,7 @@ buildPythonPackage rec {
sha256 = "449fd11699f9ae23ec2ccf1b06681bb90b4c1788f82fbbf1ce1c1d2e77833eb1";
};
checkInputs = [ pytest ];
checkInputs = [ pytest mock ];
propagatedBuildInputs = [ enum34 google_api_core ];
# requires old version of google-api-core (override)

View file

@ -5,6 +5,7 @@
, grpc_google_iam_v1
, google_api_core
, pytest
, mock
}:
buildPythonPackage rec {
@ -16,7 +17,7 @@ buildPythonPackage rec {
sha256 = "11d19052c84dd8e5bc936f5276443e14c2a5ccaae031b2a39415a9f3832a1029";
};
checkInputs = [ pytest ];
checkInputs = [ pytest mock ];
propagatedBuildInputs = [ enum34 grpc_google_iam_v1 google_api_core ];
checkPhase = ''

View file

@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "google-cloud-spanner";
version = "1.6.1";
version = "1.7.1";
src = fetchPypi {
inherit pname version;
sha256 = "28e56bd8aefa0837e59ba67974f446efda45e7691aea176d78b4ca1d2217dd86";
sha256 = "422a1bd5bded723151faeb4d1b1711f5776d2cc23d5c192cf53634eaf55c74aa";
};
checkInputs = [ pytest mock ];

View file

@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "google-cloud-speech";
version = "0.36.2";
version = "0.36.3";
src = fetchPypi {
inherit pname version;
sha256 = "afe0d69e5db64bd58bc5fd9d16aad90c1507556bf317fdeadcfc8ccbdaa1659a";
sha256 = "3d77da6086c01375908c8b800808ff83748a34b98313f885bd86df95448304fc";
};
propagatedBuildInputs = [ google_api_core ];

View file

@ -5,18 +5,19 @@
, grpc_google_iam_v1
, google_api_core
, pytest
, mock
}:
buildPythonPackage rec {
pname = "google-cloud-tasks";
version = "0.3.0";
version = "0.4.0";
src = fetchPypi {
inherit pname version;
sha256 = "f874a7aabad225588263c6cbcd4d67455cc682ebb6d9f00bd06c8d2d5673b4db";
sha256 = "3c5f26dd3750f9b222a69c37e85ee1acf198456dfebe1e0058f366dd27729559";
};
checkInputs = [ pytest ];
checkInputs = [ pytest mock ];
propagatedBuildInputs = [ enum34 grpc_google_iam_v1 google_api_core ];
checkPhase = ''

View file

@ -3,18 +3,19 @@
, fetchPypi
, google_api_core
, pytest
, mock
}:
buildPythonPackage rec {
pname = "google-cloud-texttospeech";
version = "0.2.0";
version = "0.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "6064bc6e2761694b708878ff3d5902c6ce5eb44a770a921e7a99caf6c2533ae3";
sha256 = "39d2c83ee198ec1995c03faf5d557089e7027a8356802302dee08b18380c8250";
};
checkInputs = [ pytest ];
checkInputs = [ pytest mock ];
propagatedBuildInputs = [ google_api_core ];
checkPhase = ''

View file

@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "google-cloud-trace";
version = "0.19.0";
version = "0.20.2";
src = fetchPypi {
inherit pname version;
sha256 = "2cb774498e90143a9565dd50e2814b6b0292242a53b8804a1a529989e18b7461";
sha256 = "2129e736d5a21242a4840dc4b494720feb51edd6fafdc12cd6da4b0cb24e5295";
};
checkInputs = [ pytest mock ];

View file

@ -3,18 +3,19 @@
, fetchPypi
, google_api_core
, pytest
, mock
}:
buildPythonPackage rec {
pname = "google-cloud-videointelligence";
version = "1.5.0";
version = "1.6.1";
src = fetchPypi {
inherit pname version;
sha256 = "bd0abc18070520fd5757b15356e8483149e1caebbe43019257ccb2c43cddbbbe";
sha256 = "382ec37eab72b37571a2a76ad25c9dda51744dbff76ad9a85cc3791fee0c96ef";
};
checkInputs = [ pytest ];
checkInputs = [ pytest mock ];
propagatedBuildInputs = [ google_api_core ];
checkPhase = ''

View file

@ -3,6 +3,7 @@
, fetchPypi
, google_api_core
, pytest
, mock
}:
buildPythonPackage rec {
@ -14,7 +15,7 @@ buildPythonPackage rec {
sha256 = "d965d986053b49e4005b6b6cdf035d7dd4a3b64dcfb6325050b70c97831f8d6f";
};
checkInputs = [ pytest ];
checkInputs = [ pytest mock ];
propagatedBuildInputs = [ google_api_core ];
checkPhase = ''

View file

@ -33,7 +33,8 @@ buildPythonPackage rec {
hardeningDisable = [ "format" ];
propagatedBuildInputs = [ pkgconfig ]
nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ ]
++ (lib.optional openglSupport pyopengl)
++ (lib.optionals (!stdenv.isDarwin) [ wxGTK (wxGTK.gtk) libX11 ])
++ (lib.optionals stdenv.isDarwin [ wxmac darwin.apple_sdk.frameworks.Cocoa ])
@ -60,8 +61,6 @@ buildPythonPackage rec {
]}'
'';
NIX_LDFLAGS = lib.optionalString (!stdenv.isDarwin) "-lX11 -lgdk-x11-2.0";
buildPhase = "";
installPhase = ''

View file

@ -578,7 +578,9 @@ in {
inherit (pkgs) pkgconfig;
};
pycangjie = disabledIf (!isPy3k) (callPackage ../development/python-modules/pycangjie { });
pycangjie = disabledIf (!isPy3k) (callPackage ../development/python-modules/pycangjie {
inherit (pkgs) pkgconfig;
});
pycrc = callPackage ../development/python-modules/pycrc { };
@ -627,7 +629,9 @@ in {
libglade = null;
};
pygtksourceview = callPackage ../development/python-modules/pygtksourceview { };
pygtksourceview = callPackage ../development/python-modules/pygtksourceview {
inherit (pkgs) pkgconfig;
};
pyGtkGlade = self.pygtk.override {
libglade = pkgs.gnome2.libglade;
@ -664,6 +668,7 @@ in {
pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix {
pythonPackages = self;
inherit (pkgs) pkgconfig;
};
pyqt5 = pkgs.libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix {
@ -993,7 +998,9 @@ in {
autopep8 = callPackage ../development/python-modules/autopep8 { };
av = callPackage ../development/python-modules/av { };
av = callPackage ../development/python-modules/av {
inherit (pkgs) pkgconfig;
};
avro = callPackage ../development/python-modules/avro {};
@ -1191,7 +1198,9 @@ in {
blaze = callPackage ../development/python-modules/blaze { };
html5-parser = callPackage ../development/python-modules/html5-parser {};
html5-parser = callPackage ../development/python-modules/html5-parser {
inherit (pkgs) pkgconfig;
};
httpserver = callPackage ../development/python-modules/httpserver {};
@ -1944,7 +1953,7 @@ in {
latexcodec = callPackage ../development/python-modules/latexcodec {};
libsexy = callPackage ../development/python-modules/libsexy {
libsexy = pkgs.libsexy;
inherit (pkgs) libsexy pkgconfig;
};
libsoundtouch = callPackage ../development/python-modules/libsoundtouch { };
@ -2063,6 +2072,7 @@ in {
poppler-qt5 = callPackage ../development/python-modules/poppler-qt5 {
inherit (pkgs.qt5) qtbase;
inherit (pkgs.libsForQt5) poppler;
inherit (pkgs) pkgconfig;
};
poyo = callPackage ../development/python-modules/poyo { };
@ -2505,7 +2515,9 @@ in {
wtforms = callPackage ../development/python-modules/wtforms { };
graph-tool = callPackage ../development/python-modules/graph-tool/2.x.x.nix { };
graph-tool = callPackage ../development/python-modules/graph-tool/2.x.x.nix {
inherit (pkgs) pkgconfig;
};
grappelli_safe = callPackage ../development/python-modules/grappelli_safe { };
@ -2916,7 +2928,9 @@ in {
python-oauth2 = callPackage ../development/python-modules/python-oauth2 { };
python_openzwave = callPackage ../development/python-modules/python_openzwave { };
python_openzwave = callPackage ../development/python-modules/python_openzwave {
inherit (pkgs) pkgconfig;
};
python-Levenshtein = callPackage ../development/python-modules/python-levenshtein { };
@ -3494,6 +3508,7 @@ in {
kmsxx = (callPackage ../development/libraries/kmsxx {
inherit (pkgs.kmsxx) stdenv;
inherit (pkgs) pkgconfig;
}).overrideAttrs (oldAttrs: {
name = "${python.libPrefix}-${pkgs.kmsxx.name}";
});
@ -3692,7 +3707,9 @@ in {
pyshp = callPackage ../development/python-modules/pyshp { };
pysmbc = callPackage ../development/python-modules/pysmbc { };
pysmbc = callPackage ../development/python-modules/pysmbc {
inherit (pkgs) pkgconfig;
};
pyspread = callPackage ../development/python-modules/pyspread { };
@ -3847,6 +3864,7 @@ in {
pythonnet = callPackage ../development/python-modules/pythonnet {
# `mono >= 4.6` required to prevent crashes encountered with earlier versions.
mono = pkgs.mono4;
inherit (pkgs) pkgconfig;
};
pytz = callPackage ../development/python-modules/pytz { };
@ -4204,7 +4222,9 @@ in {
vega_datasets = callPackage ../development/python-modules/vega_datasets { };
virtkey = callPackage ../development/python-modules/virtkey { };
virtkey = callPackage ../development/python-modules/virtkey {
inherit (pkgs) pkgconfig;
};
virtual-display = callPackage ../development/python-modules/virtual-display { };
@ -4240,6 +4260,7 @@ in {
wxPython30 = callPackage ../development/python-modules/wxPython/3.0.nix {
wxGTK = pkgs.wxGTK30;
inherit (pkgs) pkgconfig;
};
xml2rfc = callPackage ../development/python-modules/xml2rfc { };
@ -4706,7 +4727,7 @@ in {
Logbook = callPackage ../development/python-modules/Logbook { };
libversion = callPackage ../development/python-modules/libversion {
inherit (pkgs) libversion;
inherit (pkgs) libversion pkgconfig;
};
libvirt = callPackage ../development/python-modules/libvirt {
@ -4729,7 +4750,9 @@ in {
power = callPackage ../development/python-modules/power { };
pythonefl = callPackage ../development/python-modules/python-efl { };
pythonefl = callPackage ../development/python-modules/python-efl {
inherit (pkgs) pkgconfig;
};
tlsh = callPackage ../development/python-modules/tlsh { };
@ -4831,7 +4854,9 @@ in {
dot2tex = callPackage ../development/python-modules/dot2tex { };
poezio = callPackage ../applications/networking/instant-messengers/poezio { };
poezio = callPackage ../applications/networking/instant-messengers/poezio {
inherit (pkgs) pkgconfig;
};
potr = callPackage ../development/python-modules/potr {};