diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 98 | ||||
| -rw-r--r-- | pkgs/top-level/lua-packages.nix | 29 | ||||
| -rw-r--r-- | pkgs/top-level/node-packages-generated.nix | 16 | ||||
| -rw-r--r-- | pkgs/top-level/perl-packages.nix | 127 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 340 |
6 files changed, 450 insertions, 164 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c40dcb63bf79..4fafdfb726cb 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -66,6 +66,10 @@ mapAliases (rec { gst_plugins_bad = gst-plugins-bad; # added 2017-02 gst_plugins_ugly = gst-plugins-ugly; # added 2017-02 gst_python = gst-python; # added 2017-02 + guileCairo = guile-cairo; # added 2017-09-24 + guileGnome = guile-gnome; # added 2017-09-24 + guile_lib = guile-lib; # added 2017-09-24 + guile_ncurses = guile-ncurses; # added 2017-09-24 gupnptools = gupnp-tools; # added 2015-12-19 gnustep-make = gnustep.make; # added 2016-7-6 htmlTidy = html-tidy; # added 2014-12-06 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74c9df866007..72ddcb185e02 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -808,8 +808,10 @@ with pkgs; makeWrapper $exe $out/bin/${drv.pname} \ --prefix PATH ":" "${nix}/bin" \ --prefix PATH ":" "${nix-prefetch-scripts}/bin" - mkdir -p $out/share/bash-completion/completions + mkdir -p $out/share/{bash-completion/completions,zsh/vendor-completions,fish/completions} $exe --bash-completion-script $exe >$out/share/bash-completion/completions/${drv.pname} + $exe --zsh-completion-script $exe >$out/share/zsh/vendor-completions/_${drv.pname} + $exe --fish-completion-script $exe >$out/share/fish/completions/${drv.pname}.fish ''; }); @@ -1150,6 +1152,8 @@ with pkgs; stagit = callPackage ../development/tools/stagit { }; + bash-supergenpass = callPackage ../tools/security/bash-supergenpass { }; + syscall_limiter = callPackage ../os-specific/linux/syscall_limiter {}; syslogng = callPackage ../tools/system/syslog-ng { }; @@ -1671,6 +1675,8 @@ with pkgs; dev86 = callPackage ../development/compilers/dev86 { }; + djbdns = callPackage ../tools/networking/djbdns { }; + dnscrypt-proxy = callPackage ../tools/networking/dnscrypt-proxy { }; dnscrypt-wrapper = callPackage ../tools/networking/dnscrypt-wrapper { }; @@ -1877,6 +1883,8 @@ with pkgs; epstool = callPackage ../tools/graphics/epstool { }; + epsxe = callPackage ../misc/emulators/epsxe { }; + ethtool = callPackage ../tools/misc/ethtool { }; ettercap = callPackage ../applications/networking/sniffers/ettercap { }; @@ -2297,11 +2305,11 @@ with pkgs; google-authenticator = callPackage ../os-specific/linux/google-authenticator { }; - google-cloud-sdk = callPackage ../tools/admin/google-cloud-sdk { }; + google-cloud-sdk = python2.pkgs.google-cloud-sdk; google-fonts = callPackage ../data/fonts/google-fonts { }; - google-compute-engine = callPackage ../tools/virtualization/google-compute-engine { }; + google-compute-engine = python2.pkgs.google-compute-engine; gource = callPackage ../applications/version-management/gource { }; @@ -4630,6 +4638,11 @@ with pkgs; tor-browser-bundle-bin = callPackage ../applications/networking/browsers/tor-browser-bundle-bin { }; + tor-browser-bundle = callPackage ../applications/networking/browsers/tor-browser-bundle { + stdenv = stdenvNoCC; + tor-browser-unwrapped = firefoxPackages.tor-browser; + }; + touchegg = callPackage ../tools/inputmethods/touchegg { }; torsocks = callPackage ../tools/security/tor/torsocks.nix { }; @@ -5598,8 +5611,8 @@ with pkgs; profiledCompiler = false; }); - gcj = gcj49; - gcj49 = wrapCC (gcc49.cc.override { + gcj = gcj6; + gcj6 = wrapCC (gcc6.cc.override { name = "gcj"; langJava = true; langFortran = false; @@ -5880,12 +5893,18 @@ with pkgs; oraclejdk8psu = pkgs.oraclejdk8psu_distro true false; + oraclejdk9 = pkgs.oraclejdk9distro "JDK" false; + oraclejre = lowPrio (pkgs.jdkdistro false false); oraclejre8 = lowPrio (pkgs.oraclejdk8distro false false); oraclejre8psu = lowPrio (pkgs.oraclejdk8psu_distro false false); + oraclejre9 = lowPrio (pkgs.oraclejdk9distro "JRE" false); + + oracleserverjre9 = lowPrio (pkgs.oraclejdk9distro "ServerJRE" false); + jrePlugin = jre8Plugin; jre8Plugin = lowPrio (pkgs.oraclejdk8distro false true); @@ -5900,12 +5919,17 @@ with pkgs; oraclejdk8distro = installjdk: pluginSupport: assert supportsJDK; (if pluginSupport then appendToName "with-plugin" else x: x) - (callPackage ../development/compilers/oraclejdk/jdk8cpu-linux.nix { inherit installjdk; }); + (callPackage ../development/compilers/oraclejdk/jdk8cpu-linux.nix { inherit installjdk pluginSupport; }); oraclejdk8psu_distro = installjdk: pluginSupport: assert supportsJDK; (if pluginSupport then appendToName "with-plugin" else x: x) - (callPackage ../development/compilers/oraclejdk/jdk8psu-linux.nix { inherit installjdk; }); + (callPackage ../development/compilers/oraclejdk/jdk8psu-linux.nix { inherit installjdk pluginSupport; }); + + oraclejdk9distro = packageType: pluginSupport: + assert supportsJDK; + (if pluginSupport then appendToName "with-plugin" else x: x) + (callPackage ../development/compilers/oraclejdk/jdk9-linux.nix { inherit packageType pluginSupport; }); jikes = callPackage ../development/compilers/jikes { }; @@ -6708,18 +6732,18 @@ with pkgs; jython = callPackage ../development/interpreters/jython {}; - guileCairo = callPackage ../development/guile-modules/guile-cairo { }; + guile-cairo = callPackage ../development/guile-modules/guile-cairo { }; guile-fibers = callPackage ../development/guile-modules/guile-fibers { }; - guileGnome = callPackage ../development/guile-modules/guile-gnome { + guile-gnome = callPackage ../development/guile-modules/guile-gnome { gconf = gnome2.GConf; inherit (gnome2) gnome_vfs libglade libgnome libgnomecanvas libgnomeui; }; - guile_lib = callPackage ../development/guile-modules/guile-lib { }; + guile-lib = callPackage ../development/guile-modules/guile-lib { }; - guile_ncurses = callPackage ../development/guile-modules/guile-ncurses { }; + guile-ncurses = callPackage ../development/guile-modules/guile-ncurses { }; guile-opengl = callPackage ../development/guile-modules/guile-opengl { }; @@ -7514,7 +7538,7 @@ with pkgs; texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { }; texinfo4 = texinfo413; texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { }; - texinfo6 = callPackage ../development/tools/misc/texinfo/6.3.nix { }; + texinfo6 = callPackage ../development/tools/misc/texinfo/6.5.nix { }; texinfo = texinfo6; texinfoInteractive = appendToName "interactive" ( texinfo.override { interactive = true; } @@ -7572,6 +7596,8 @@ with pkgs; pythonPackages = python3Packages; }; + watson-ruby = callPackage ../development/tools/misc/watson-ruby {}; + xc3sprog = callPackage ../development/tools/misc/xc3sprog { }; xcbuild = callPackage ../development/tools/xcbuild/wrapper.nix { @@ -9117,6 +9143,8 @@ with pkgs; libnfc = callPackage ../development/libraries/libnfc { }; + libnfs = callPackage ../development/libraries/libnfs { }; + libnfsidmap = callPackage ../development/libraries/libnfsidmap { }; libnice = callPackage ../development/libraries/libnice { }; @@ -9253,6 +9281,8 @@ with pkgs; libminc = callPackage ../development/libraries/libminc { }; + libmirage = callPackage ../misc/emulators/cdemu/libmirage.nix { }; + libmkv = callPackage ../development/libraries/libmkv { }; libmms = callPackage ../development/libraries/libmms { }; @@ -10377,8 +10407,8 @@ with pkgs; resolv_wrapper = callPackage ../development/libraries/resolv_wrapper { }; rhino = callPackage ../development/libraries/java/rhino { - javac = gcj; - jvm = gcj; + javac = jdk; + jvm = jre; }; rlog = callPackage ../development/libraries/rlog { }; @@ -11369,6 +11399,8 @@ with pkgs; openssl = openssl_1_0_2; }; + fusionInventory = callPackage ../servers/monitoring/fusion-inventory { }; + gatling = callPackage ../servers/http/gatling { }; glabels = callPackage ../applications/graphics/glabels { }; @@ -12030,6 +12062,7 @@ with pkgs; # unstable until the first 1.x release fscrypt-experimental = callPackage ../os-specific/linux/fscrypt { }; + fscryptctl-experimental = callPackage ../os-specific/linux/fscryptctl { }; fwupd = callPackage ../os-specific/linux/firmware/fwupd { inherit (gnome2) gtk_doc; inherit (python3Packages) pygobject3 pillow; }; @@ -13161,6 +13194,8 @@ with pkgs; kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {}; + latinmodern-math = callPackage ../data/fonts/lm-math {}; + lato = callPackage ../data/fonts/lato {}; league-of-moveable-type = callPackage ../data/fonts/league-of-moveable-type {}; @@ -13368,6 +13403,8 @@ with pkgs; terminus_font_ttf = callPackage ../data/fonts/terminus-font-ttf { }; + tex-gyre-termes-math = callPackage ../data/fonts/tex-gyre-termes-math { }; + tipa = callPackage ../data/fonts/tipa { }; ttf_bitstream_vera = callPackage ../data/fonts/ttf-bitstream-vera { }; @@ -14378,6 +14415,8 @@ with pkgs; gqrx = qt5.callPackage ../applications/misc/gqrx { }; + gpx-viewer = callPackage ../applications/misc/gpx-viewer { }; + grass = callPackage ../applications/gis/grass { }; grepm = callPackage ../applications/search/grepm { }; @@ -14794,8 +14833,6 @@ with pkgs; hello = callPackage ../applications/misc/hello { }; - kubernetes-helm = callPackage ../applications/networking/cluster/helm { }; - helmholtz = callPackage ../applications/audio/pd-plugins/helmholtz { }; heme = callPackage ../applications/editors/heme { }; @@ -15121,6 +15158,8 @@ with pkgs; kubernetes = callPackage ../applications/networking/cluster/kubernetes { }; + kubernetes-helm = callPackage ../applications/networking/cluster/helm { }; + kupfer = callPackage ../applications/misc/kupfer { }; lame = callPackage ../development/libraries/lame { }; @@ -15571,7 +15610,9 @@ with pkgs; scudcloud = callPackage ../applications/networking/instant-messengers/scudcloud { }; - shotcut = libsForQt5.callPackage ../applications/video/shotcut { }; + shotcut = libsForQt5.callPackage ../applications/video/shotcut { + libmlt = mlt; + }; smplayer = libsForQt5.callPackage ../applications/video/smplayer { }; @@ -16223,6 +16264,11 @@ with pkgs; ssvnc = callPackage ../applications/networking/remote/ssvnc { }; + stupidterm = callPackage ../applications/misc/stupidterm { + vte = gnome3.vte; + gtk = gtk3; + }; + styx = callPackage ../applications/misc/styx { }; tecoc = callPackage ../applications/editors/tecoc { }; @@ -16610,6 +16656,8 @@ with pkgs; twmn = libsForQt5.callPackage ../applications/misc/twmn { }; + testssl = callPackage ../applications/networking/testssl { }; + umurmur = callPackage ../applications/networking/umurmur { }; unigine-valley = callPackage ../applications/graphics/unigine-valley { }; @@ -17228,6 +17276,8 @@ with pkgs; inherit (pythonPackages) youtube-dl; + youtube-viewer = perlPackages.WWWYoutubeViewer; + zam-plugins = callPackage ../applications/audio/zam-plugins { }; zanshin = libsForQt5.callPackage ../applications/office/zanshin { @@ -17954,9 +18004,7 @@ with pkgs; libcanberra = self.libcanberra_gtk2; }); - gnome3_24 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.24 { }); - - gnome3 = gnome3_24; + gnome3 = recurseIntoAttrs (callPackage ../desktops/gnome-3 { }); gnomeExtensions = { caffeine = callPackage ../desktops/gnome-3/extensions/caffeine { }; @@ -18024,6 +18072,8 @@ with pkgs; numix-gtk-theme = callPackage ../misc/themes/numix { }; + numix-solarized-gtk-theme = callPackage ../misc/themes/gtk3/numix-solarized-gtk-theme { }; + numix-sx-gtk-theme = callPackage ../misc/themes/numix-sx { }; theme-vertex = callPackage ../misc/themes/vertex { }; @@ -18550,7 +18600,9 @@ with pkgs; sbcl = null; }; - mxnet = callPackage ../applications/science/math/mxnet { }; + mxnet = callPackage ../applications/science/math/mxnet { + inherit (linuxPackages) nvidia_x11; + }; wxmaxima = callPackage ../applications/science/math/wxmaxima { wxGTK = wxGTK30; }; @@ -18878,9 +18930,9 @@ with pkgs; hplipWithPlugin = hplip.override { withPlugin = true; }; - hplip_3_15_9 = callPackage ../misc/drivers/hplip/3.15.9.nix { }; + hplip_3_16_11 = callPackage ../misc/drivers/hplip/3.16.11.nix { }; - hplipWithPlugin_3_15_9 = hplip_3_15_9.override { withPlugin = true; }; + hplipWithPlugin_3_16_11 = hplip.override { withPlugin = true; }; epkowa = callPackage ../misc/drivers/epkowa { }; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 91efa306ce4e..98192d2c3d7c 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -8,7 +8,7 @@ { fetchurl, fetchzip, stdenv, lua, callPackage, unzip, zziplib, pkgconfig, libtool , pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat, cairo , perl, gtk2, python, glib, gobjectIntrospection, libevent, zlib, autoreconfHook -, fetchFromGitHub, libmpack +, fetchFromGitHub, libmpack, which }: let @@ -270,6 +270,33 @@ let }; }; + luxio = buildLuaPackage rec { + name = "luxio-${version}"; + version = "13"; + src = fetchurl { + url = "https://git.gitano.org.uk/luxio.git/snapshot/luxio-luxio-13.tar.bz2"; + sha256 = "1hvwslc25q7k82rxk461zr1a2041nxg7sn3sw3w0y5jxf0giz2pz"; + }; + nativeBuildInputs = [ which pkgconfig ]; + postPatch = '' + patchShebangs . + ''; + meta = { + platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.mit; + description = "Lightweight UNIX I/O and POSIX binding for Lua"; + maintainers = [ maintainers.richardipsum ]; + }; + preBuild = '' + makeFlagsArray=( + INST_LIBDIR="$out/lib/lua/${lua.luaversion}" + INST_LUADIR="$out/share/lua/${lua.luaversion}" + LUA_BINDIR="$out/bin" + INSTALL=install + ); + ''; + }; + luazip = buildLuaPackage rec { name = "zip-${version}"; version = "1.2.3"; diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 432a367d1535..3014273e5c3a 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -5381,15 +5381,15 @@ cpu = [ ]; }; by-spec."bower2nix"."*" = - self.by-version."bower2nix"."3.1.1"; - by-version."bower2nix"."3.1.1" = self.buildNodePackage { - name = "bower2nix-3.1.1"; - version = "3.1.1"; + self.by-version."bower2nix"."3.2.0"; + by-version."bower2nix"."3.2.0" = self.buildNodePackage { + name = "bower2nix-3.2.0"; + version = "3.2.0"; bin = true; src = fetchurl { - url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.1.1.tgz"; - name = "bower2nix-3.1.1.tgz"; - sha1 = "wfzj1k6jkfnk1bkgbmpni59mdab8zk3p"; + url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.2.0.tgz"; + name = "bower2nix-3.2.0.tgz"; + sha1 = "nlzr17lidjf72s60vcsnqpjxgnnsn32s"; }; deps = { "argparse-1.0.4" = self.by-version."argparse"."1.0.4"; @@ -5410,7 +5410,7 @@ os = [ ]; cpu = [ ]; }; - "bower2nix" = self.by-version."bower2nix"."3.0.1"; + "bower2nix" = self.by-version."bower2nix"."3.2.0"; by-spec."bplist-creator"."0.0.4" = self.by-version."bplist-creator"."0.0.4"; by-version."bplist-creator"."0.0.4" = self.buildNodePackage { diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ed78f67739e3..d8c69ae44e9b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -549,6 +549,19 @@ let self = _self // overrides; _self = with self; { }; }; + AuthenSimple = buildPerlPackage rec { + name = "Authen-Simple-0.5"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CH/CHANSEN/${name}.tar.gz"; + sha256 = "02cddab47f8bf1a1cbd4c9bf8d258f6d05111499c33f8315e7244812f72613aa"; + }; + propagatedBuildInputs = [ ClassAccessor ClassDataInheritable CryptPasswdMD5 ParamsValidate ]; + meta = { + description = "Simple Authentication"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + autobox = buildPerlPackage rec { name = "autobox-2.84"; src = fetchurl { @@ -3177,6 +3190,19 @@ let self = _self // overrides; _self = with self; { }; }; + DataStructureUtil = buildPerlPackage rec { + name = "Data-Structure-Util-0.16"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AN/ANDYA/${name}.tar.gz"; + sha256 = "9cd42a13e65cb15f3a76296eb9a134da220168ec747c568d331a50ae7a2ddbc6"; + }; + buildInputs = [ TestPod ]; + meta = { + description = "Change nature of data within a structure"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + DataTaxi = buildPerlPackage { name = "Data-Taxi-0.96"; propagatedBuildInputs = [DebugShowStuff]; @@ -6824,6 +6850,22 @@ let self = _self // overrides; _self = with self; { buildInputs = [ TestMore ]; }; + HTTPProxy = buildPerlPackage rec { + name = "HTTP-Proxy-0.304"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BO/BOOK/${name}.tar.gz"; + sha256 = "b05290534ec73625c21a0565fc35170890dab163843d95331c292c23f504c69d"; + }; + buildInputs = [ HTMLParser ]; + propagatedBuildInputs = [ HTTPDaemon HTTPDate HTTPMessage LWP ]; + meta = { + description = "A pure Perl HTTP proxy"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + # tests fail because they require network access + doCheck = false; + }; + HTTPRequestAsCGI = buildPerlPackage rec { name = "HTTP-Request-AsCGI-1.2"; src = fetchurl { @@ -6857,6 +6899,18 @@ let self = _self // overrides; _self = with self; { }; }; + HTTPServerSimpleAuthen = buildPerlPackage rec { + name = "HTTP-Server-Simple-Authen-0.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz"; + sha256 = "2dddc8ab9dc8986980151e4ba836a6bbf091f45cf195be1768ebdb4a993ed59b"; + }; + propagatedBuildInputs = [ AuthenSimple HTTPServerSimple ]; + meta = { + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + HTTPServerSimpleMason = buildPerlPackage { name = "HTTP-Server-Simple-Mason-0.14"; src = fetchurl { @@ -6995,6 +7049,17 @@ let self = _self // overrides; _self = with self; { }; }; + IOCapture = buildPerlPackage rec { + name = "IO-Capture-0.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RE/REYNOLDS/${name}.tar.gz"; + sha256 = "c2c15a254ca74fb8c57d25d7b6cbcaff77a3b4fb5695423f1f80bb423abffea9"; + }; + meta = { + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + IOCaptureOutput = buildPerlPackage rec { name = "IO-CaptureOutput-1.1104"; src = fetchurl { @@ -13314,6 +13379,20 @@ let self = _self // overrides; _self = with self; { }; }; + TestCompile = buildPerlPackage rec { + name = "Test-Compile-v1.3.0"; + src = fetchurl { + url = "mirror://cpan/authors/id/E/EG/EGILES/${name}.tar.gz"; + sha256 = "77527e9477ac5260443c756367a7f7bc3d8f6c6ebbc561b0b2fb3f79303bad33"; + }; + buildInputs = [ ModuleBuild ]; + propagatedBuildInputs = [ UNIVERSALrequire ]; + meta = { + description = "Check whether Perl files compile correctly"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TestCPANMeta = buildPerlPackage { name = "Test-CPAN-Meta-0.23"; src = fetchurl { @@ -15501,6 +15580,32 @@ let self = _self // overrides; _self = with self; { }; }; + WWWYoutubeViewer = buildPerlPackage rec { + name = "WWW-YoutubeViewer-${version}"; + version = "3.3.0"; + + src = fetchFromGitHub { + owner = "trizen"; + repo = "youtube-viewer"; + rev = "${version}"; + sha256 = "15xyrwv08fw8jmpydwzks26ipxnzliwddgyjcfqiaj0p7lwlhmx1"; + }; + + propagatedBuildInputs = [ + LWP + LWPProtocolHttps + DataDump + JSON + ]; + + meta = { + description = "A lightweight application for searching and streaming videos from YouTube"; + homepage = https://github.com/trizen/youtube-viewer; + maintainers = with maintainers; [ woffs ]; + license = with stdenv.lib.licenses; [ artistic2 ]; + }; + }; + Want = buildPerlPackage rec { name = "Want-0.29"; src = fetchurl { @@ -15675,14 +15780,19 @@ let self = _self // overrides; _self = with self; { }; XMLLibXML = buildPerlPackage rec { - name = "XML-LibXML-2.0122"; + name = "XML-LibXML-2.0129"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; - sha256 = "0llgkgifcw7zz7r7f2jiqryi5axymmd3fwzp4aa5gk6j37w66xkn"; + sha256 = "0rmk6vysfgcn8434wyydd56midgshly37wx7c50ch038l2djd82w"; }; SKIP_SAX_INSTALL = 1; buildInputs = [ pkgs.libxml2 ]; propagatedBuildInputs = [ XMLSAX ]; + + # https://rt.cpan.org/Public/Bug/Display.html?id=122958 + preCheck = '' + rm t/32xpc_variables.t t/48_reader_undef_warning_on_empty_str_rt106830.t + ''; }; XMLLibXMLSimple = buildPerlPackage { @@ -15852,6 +15962,19 @@ let self = _self // overrides; _self = with self; { }; }; + XMLTreePP = buildPerlPackage rec { + name = "XML-TreePP-0.43"; + src = fetchurl { + url = "mirror://cpan/authors/id/K/KA/KAWASAKI/${name}.tar.gz"; + sha256 = "7fbe2d6430860059894aeeebf75d4cacf1bf8d7b75294eb87d8e1502f81bd760"; + }; + propagatedBuildInputs = [ LWP ]; + meta = { + description = "Pure Perl implementation for parsing/writing XML documents"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + XMLTwig = buildPerlPackage rec { name = "XML-Twig-3.49"; src = fetchurl { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 204b16b5879e..7c6ca4bd1fc9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1313,11 +1313,11 @@ in { }; betamax = buildPythonPackage rec { - name = "betamax-0.6.0"; + name = "betamax-0.8.0"; src = pkgs.fetchurl { url = "mirror://pypi/b/betamax/${name}.tar.gz"; - sha256 = "0vw4d53jbbb2kdl7l891h8iyxklqcd6ldvgcyhw9hl40ljdhv1wz"; + sha256 = "18f8v5gng3j773jlbbzx4rg1i4y2zw3m2l1zpmbvp8bh5a2q1i42"; }; propagatedBuildInputs = [ self.requests ]; @@ -1944,6 +1944,23 @@ in { blaze = callPackage ../development/python-modules/blaze { }; + # Needed for bleach 1.5.0 + html5lib_0_9999999 = self.html5lib.overridePythonAttrs rec { + name = "html5lib-${version}"; + disabled = isPy3k && pythonAtLeast "3.6"; + buildInputs = with self; [ nose flake8 ]; + propagatedBuildInputs = with self; [ six ]; + checkPhase = '' + nosetests + ''; + + version = "0.9999999"; + src = pkgs.fetchurl { + url = "https://github.com/html5lib/html5lib-python/archive/0.9999999.tar.gz"; + sha256 = "1s6wdbrjzw5jhyfbskf4nj1i5bjpjqq9f89a7r1rl59rhpwmfhhq"; + }; + }; + html5-parser = callPackage ../development/python-modules/html5-parser {}; httpserver = callPackage ../development/python-modules/httpserver {}; @@ -1981,6 +1998,24 @@ in { }; }; + # needed for tensorflow-tensorboard + bleach_1_5_0 = self.bleach.overridePythonAttrs rec { + version = "1.5.0"; + pname = "bleach"; + name = "${pname}-${version}"; + + propagatedBuildInputs = with self; [ six html5lib_0_9999999 ]; + + preCheck = '' + sed -i 's,pytest==[0-9.]*,pytest,' setup.py + ''; + + src = fetchPypi { + inherit pname version; + sha256 = "0rdwb3piwwl30wfqg4ywm07276w7090xfq71lb5d6k5mk62pb3lp"; + }; + }; + blinker = buildPythonPackage rec { name = "blinker-${version}"; version = "1.4"; @@ -2571,6 +2606,15 @@ in { # https://github.com/celery/celery/pull/3736#issuecomment-274155454 from upstream patches = [ ../development/python-modules/celery/fix_endless_python3.6_loop_logger_isa.patch ]; + # make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox + preCheck = '' + export NIX_REDIRECTS=/etc/protocols=${pkgs.iana-etc}/etc/protocols \ + LD_PRELOAD=${pkgs.libredirect}/lib/libredirect.so + ''; + postCheck = '' + unset NIX_REDIRECTS LD_PRELOAD + ''; + buildInputs = with self; [ pytest case ]; propagatedBuildInputs = with self; [ kombu billiard pytz anyjson amqp eventlet ]; @@ -3251,6 +3295,8 @@ in { sha256 = "d04bb2425086c3fe86f7bc48915290b13e798497839fbb18ab7f6dffcf98cc3a"; }; + outputs = [ "out" "dev" ]; + buildInputs = [ pkgs.openssl self.cryptography_vectors ] ++ optional stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.Security; propagatedBuildInputs = with self; [ @@ -5814,17 +5860,9 @@ in { }; }; - google-compute-engine = buildPythonPackage rec { - version = "2.3.0"; - name = "google-compute-engine-${version}"; + google-cloud-sdk = callPackage ../tools/admin/google-cloud-sdk { }; - src = pkgs.fetchurl { - url = "mirror://pypi/g/google-compute-engine/google-compute-engine-${version}.tar.gz"; - sha256 = "1pjj95b3l61h8xz5kjfcgnql066cr8bq5wl480a6dxd2inw8mynf"; - }; - - propagatedBuildInputs = with self; [ boto ]; - }; + google-compute-engine = callPackage ../tools/virtualization/google-compute-engine { }; googlecl = buildPythonPackage rec { version = "0.9.14"; @@ -6027,6 +6065,8 @@ in { }; + hupper = callPackage ../development/python-modules/hupper {}; + hovercraft = buildPythonPackage rec { disabled = ! isPy3k; name = "hovercraft-${version}"; @@ -7015,6 +7055,10 @@ in { phpserialize = callPackage ../development/python-modules/phpserialize { }; + plaster = callPackage ../development/python-modules/plaster {}; + + plaster-pastedeploy = callPackage ../development/python-modules/plaster-pastedeploy {}; + plotly = callPackage ../development/python-modules/plotly { }; podcastparser = callPackage ../development/python-modules/podcastparser { }; @@ -7293,11 +7337,13 @@ in { }; pyramid = buildPythonPackage rec { - name = "pyramid-1.7"; + pname = "pyramid"; + version = "1.9.1"; + name = "${pname}-${version}"; - src = pkgs.fetchurl { - url = "mirror://pypi/p/pyramid/${name}.tar.gz"; - sha256 = "161qacv7qqln3q02kcqll0q2mmaypm701hn1llwdwnkaywkb3xi6"; + src = fetchPypi { + inherit pname version; + sha256 = "0dhbzc4q0vsnv3aihy728aczg56xs6h9s1rmvr096q4lb6yln3w4"; }; buildInputs = with self; [ @@ -7306,6 +7352,9 @@ in { webtest zope_component zope_interface + plaster + plaster-pastedeploy + hupper ] ++ optional isPy26 unittest2; propagatedBuildInputs = with self; [ @@ -8829,18 +8878,21 @@ in { }; eventlet = buildPythonPackage rec { - name = "eventlet-0.17.4"; + pname = "eventlet"; + version = "0.20.0"; + name = "${pname}-${version}"; - src = pkgs.fetchurl { - url = "mirror://pypi/e/eventlet/${name}.tar.gz"; - sha256 = "0vam0qfm8p5jkpp2cv12r5bnpnv902ld7q074h7x5y5g9rqyj8c7"; + src = fetchPypi { + inherit pname version; + sha256 = "15bq5ybbigxnp5xwkps53zyhlg15lmcnq3ny2dppj0r0bylcs5rf"; }; buildInputs = with self; [ nose httplib2 pyopenssl ]; doCheck = false; # too much transient errors to bother - propagatedBuildInputs = optionals (!isPyPy) [ self.greenlet ]; + propagatedBuildInputs = optionals (!isPyPy) [ self.greenlet ] ++ + (with self; [ enum-compat ]) ; meta = { homepage = http://pypi.python.org/pypi/eventlet/; @@ -10832,6 +10884,28 @@ in { keyring = callPackage ../development/python-modules/keyring { }; + keyutils = buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "keyutils"; + version = "0.5"; + + src = pkgs.fetchurl { + url = "mirror://pypi/k/${pname}/${name}.tar.gz"; + sha256 = "0dskys71vkn59vlsfs1ljli0qnzk7b10iv4pawxawnk2hvyjrf10"; + }; + + buildInputs = with self; [ pkgs.keyutils pytestrunner ]; + + doCheck = false; + + meta = { + description = "A set of python bindings for keyutils"; + homepage = https://github.com/sassoftware/python-keyutils; + license = licenses.asl20; + maintainers = with maintainers; [ primeos ]; + }; + }; + klaus = buildPythonPackage rec { version = "0.9.1"; name = "klaus-${version}"; @@ -12596,13 +12670,15 @@ in { }; monotonic = buildPythonPackage rec { - name = "monotonic-0.4"; + pname = "monotonic"; + version = "1.3"; + name = "${pname}-${version}"; __propagatedImpureHostDeps = stdenv.lib.optional stdenv.isDarwin "/usr/lib/libc.dylib"; - src = pkgs.fetchurl { - url = "mirror://pypi/m/monotonic/${name}.tar.gz"; - sha256 = "1diab6hfh3jpa1f0scpqaqrawk4g97ss4v7gkn2yw8znvdm6abw5"; + src = fetchPypi { + inherit pname version; + sha256 = "06vw7jwq96106plhlc5vz1v1xvjismdgw9wjyzvzf0ylglnrwiib"; }; patchPhase = optionalString stdenv.isLinux '' @@ -13819,12 +13895,13 @@ in { }; oslo-serialization = buildPythonPackage rec { - name = "oslo.serialization-${version}"; - version = "1.10.0"; + pname = "oslo.serialization"; + version = "2.20.0"; + name = "${pname}-${version}"; - src = pkgs.fetchurl { - url = "mirror://pypi/o/oslo.serialization/${name}.tar.gz"; - sha256 = "15k8aql2rx5jzv3hfvmd48vsyw172qa64bs3fmsyx25p37zyfy8a"; + src = fetchPypi { + inherit pname version; + sha256 = "00j8hn8f0shk4anzb6zwn8w1sfxcil9a3jgxljwalq6ma2rzp9pw"; }; patchPhase = '' @@ -13866,12 +13943,13 @@ in { oslo-utils = buildPythonPackage rec { - name = "oslo.utils-${version}"; - version = "2.6.0"; + pname = "oslo.utils"; + version = "3.29.0"; + name = "${pname}-${version}"; - src = pkgs.fetchurl { - url = "mirror://pypi/o/oslo.utils/${name}.tar.gz"; - sha256 = "1prgi03nxkcykyja821qkycsqlnpyzw17mpvj8qf3pjmgb9gv1fy"; + src = fetchPypi { + inherit pname version; + sha256 = "0l90ijw96czjd6z8bw88983rsnq5753iw86rhk1wi064w4rs19ig"; }; propagatedBuildInputs = with self; [ pbr Babel six iso8601 pytz netaddr netifaces @@ -14227,12 +14305,14 @@ in { oslo-service = buildPythonPackage rec { - name = "oslo.service-${version}"; - version = "0.10.0"; + pname = "oslo.service"; + version = "1.26.0"; - src = pkgs.fetchurl { - url = "mirror://pypi/o/oslo.service/oslo.service-0.10.0.tar.gz"; - sha256 = "1pcnimc2a50arcgq355ad9lramf6y1yv974swgfj6w90v5c6p9gz"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "083q7z6nrska5fq12vnd70blphxscd7ivca2d78jk84d99h0m5n5"; }; propagatedBuildInputs = with self; [ @@ -14240,16 +14320,15 @@ in { oslo-concurrency wrapt eventlet six oslo-serialization greenlet paste oslo-config monotonic iso8601 oslo-log pytz routes msgpack oslo-i18n argparse oslo-utils pbr enum34 netaddr stevedore netifaces - pyinotify webob retrying pyinotify ]; + pyinotify webob retrying pyinotify oslo-log ]; buildInputs = with self; [ oslosphinx oslotest pkgs.procps mock mox3 fixtures subunit testrepository testtools testscenarios ]; - # failing tests - preCheck = '' - rm oslo_service/tests/test_service.py - ''; + ## cannot import eventlet due to: + # _proto_tcp = socket.getprotobyname('tcp') + doCheck = false; meta = with stdenv.lib; { homepage = "http://wiki.openstack.org/wiki/Oslo#oslo.service"; @@ -14694,13 +14773,14 @@ in { oslo-concurrency = buildPythonPackage rec { - name = "oslo-concurrency-${version}"; - version = "2.7.0"; + pname = "oslo.concurrency"; + version = "3.22.0"; + name = "${pname}-${version}"; - src = pkgs.fetchurl { - url = "mirror://pypi/o/oslo.concurrency/oslo.concurrency-2.7.0.tar.gz"; - sha256 = "1yp8c87yi6fx1qbq4y1xkx47iiifg7jqzpcghivhxqra8vna185d"; - }; + src = fetchPypi { + inherit pname version; + sha256 = "0nh1ycc2s6w05g5w63bsmmda0gw7qsrwlax3as8a0piai99z4m51"; + }; propagatedBuildInputs = with self; [ oslo-i18n argparse six wrapt oslo-utils pbr enum34 Babel netaddr monotonic @@ -14708,8 +14788,8 @@ in { eventlet ]; buildInputs = with self; [ - oslosphinx fixtures futures coverage oslotest - ]; + oslosphinx fixtures coverage oslotest + ] ++ (optional (!isPy3k) futures); # too much magic in tests doCheck = false; @@ -14789,16 +14869,17 @@ in { olefile = callPackage ../development/python-modules/olefile { }; oslo-log = buildPythonPackage rec { - name = "oslo.log-${version}"; - version = "1.12.1"; + name = "${pname}-${version}"; + pname = "oslo.log"; + version = "3.31.0"; - src = pkgs.fetchurl { - url = "mirror://pypi/o/oslo.log/${name}.tar.gz"; - sha256 = "10x596r19zjla5n1bf04j5vncx0c9gpc5wc2jlmgjbl3cyx3vgsv"; + src = fetchPypi { + inherit pname version; + sha256 = "1w08cl98n8592pvb2gw01mqlwi8nnnpg1zy10mvj6xdpvfk2yqzz"; }; propagatedBuildInputs = with self; [ - pbr Babel six iso8601 debtcollector + pbr Babel six iso8601 debtcollector dateutil oslo-utils oslo-i18n oslo-config oslo-serialization oslo-context ] ++ stdenv.lib.optional stdenv.isLinux pyinotify; buildInputs = with self; [ oslotest oslosphinx ]; @@ -14808,12 +14889,13 @@ in { }; oslo-context = buildPythonPackage rec { - name = "oslo.context-${version}"; - version = "0.7.0"; + name = "${pname}-${version}"; + pname = "oslo.context"; + version = "2.18.1"; - src = pkgs.fetchurl { - url = "mirror://pypi/o/oslo.context/${name}.tar.gz"; - sha256 = "18fmg9dhgngshk63wfb3ddrgx5br8jxkk3x30z40741mslp1fdjy"; + src = fetchPypi { + inherit pname version; + sha256 = "1sc7qrwffsm15m91c17k0xiglv6bxh9sbksvxvrrgja82m57mgh6"; }; propagatedBuildInputs = with self; [ pbr Babel ]; @@ -14825,14 +14907,14 @@ in { oslo-i18n = buildPythonPackage rec { name = "oslo.i18n-${version}"; - version = "2.7.0"; + version = "3.18.0"; src = pkgs.fetchurl { url = "mirror://pypi/o/oslo.i18n/${name}.tar.gz"; - sha256 = "11jgcvj36g97awh7fpar4xxgwrvzfahq6rw7xxqac32ia790ylcz"; + sha256 = "19w6wil588fgppc7d42fqkrjs0y81ap62svzbij8hlb3w2d4a91n"; }; - propagatedBuildInputs = with self; [ pbr Babel six oslo-config ]; + propagatedBuildInputs = with self; [ pbr Babel six ]; buildInputs = with self; [ mock coverage oslotest ]; patchPhase = '' sed -i 's@python@${python.interpreter}@' .testr.conf @@ -14843,11 +14925,11 @@ in { oslotest = buildPythonPackage rec { name = "oslotest-${version}"; - version = "1.12.0"; + version = "2.18.0"; src = pkgs.fetchurl { url = "mirror://pypi/o/oslotest/${name}.tar.gz"; - sha256 = "17i92hymw1dwmmb5yv90m2gam2x21mc960q1pr7bly93x49h8666"; + sha256 = "0a0zhpb4yp7g6d290jk7a4pfci4ciwhsrqzhbwbl2szi50gp7km1"; }; patchPhase = '' @@ -14855,28 +14937,27 @@ in { ''; propagatedBuildInputs = with self; [ pbr fixtures subunit six testrepository - testscenarios testtools mock mox3 oslo-config os-client-config ]; + os-client-config debtcollector testscenarios testtools mock mox3 os-client-config ]; }; os-client-config = buildPythonPackage rec { name = "os-client-config-${version}"; - version = "1.8.1"; + version = "1.28.0"; src = pkgs.fetchurl { url = "mirror://pypi/o/os-client-config/${name}.tar.gz"; - sha256 = "10hz4yp594mi1p7v1pvgsmx5w2rnb9y8d0jvb2lfv03ljnwzv8jz"; + sha256 = "1f7q384b9drp3fqcg0w8aihv9k4idaay8vr3an187zjpgbx9rgp5"; }; - buildInputs = with self; [ pbr testtools testscenarios testrepository fixtures ]; - propagatedBuildInputs = with self; [ appdirs pyyaml keystoneauth1 ]; + # requires oslotest but is a dependency of that package ... + doCheck = false; + + buildInputs = with self; [ pbr testtools testscenarios testrepository fixtures jsonschema ]; + propagatedBuildInputs = with self; [ appdirs pyyaml keystoneauth1 requestsexceptions ]; patchPhase = '' sed -i 's@python@${python.interpreter}@' .testr.conf ''; - # TODO: circular import on oslotest - preCheck = '' - rm os_client_config/tests/{test_config,test_cloud_config,test_environ}.py - ''; }; keystoneauth1 = callPackage ../development/python-modules/keystoneauth1 {}; @@ -14900,38 +14981,42 @@ in { mox3 = buildPythonPackage rec { name = "mox3-${version}"; - version = "0.11.0"; + version = "0.23.0"; src = pkgs.fetchurl { url = "mirror://pypi/m/mox3/${name}.tar.gz"; - sha256 = "09dkgki21v5zqrx575h1aazxsq5akkv0a90z644bk1ry9a4zg1pn"; + sha256 = "0q26sg0jasday52a7y0cch13l0ssjvr4yqnvswqxsinj1lv5ld88"; }; patchPhase = '' sed -i 's@python@${python.interpreter}@' .testr.conf ''; + # FAIL: mox3.tests.test_mox.RegexTest.testReprWithFlags + # ValueError: cannot use LOCALE flag with a str pattern + doCheck = !isPy36; + buildInputs = with self; [ subunit testrepository testtools six ]; propagatedBuildInputs = with self; [ pbr fixtures ]; }; debtcollector = buildPythonPackage rec { name = "debtcollector-${version}"; - version = "0.9.0"; + version = "1.17.0"; src = pkgs.fetchurl { url = "mirror://pypi/d/debtcollector/${name}.tar.gz"; - sha256 = "1mvdxdrnwlgfqg26s5himkjq6f06r2khlrignx36kkbyaix6j9xb"; + sha256 = "0rh47fd5kgjcdv9dxr7xf0x308cvfic3h2zk03ifvb4pdc5kbqvi"; }; patchPhase = '' sed -i 's@python@${python.interpreter}@' .testr.conf ''; buildInputs = with self; [ pbr ]; - propagatedBuildInputs = with self; [ wrapt Babel six doc8 ]; + propagatedBuildInputs = with self; [ wrapt Babel six doc8 ] ++ + (optional (isPy26 || isPy27) funcsigs); checkInputs = with self; [ pbr Babel six wrapt testtools testscenarios - testrepository subunit coverage oslotest ]; - doCheck = false; # oslo is broken + testrepository subunit coverage ]; }; doc8 = callPackage ../development/python-modules/doc8 { }; @@ -16808,7 +16893,7 @@ in { }; disabled = !isPy3k; - + # No tests in archive doCheck = false; @@ -17734,6 +17819,8 @@ in { sha256 = "0d283g4zi0hr9papd24mjl70mi15gyzq6fx618rizi87dgipqqax"; }; + outputs = [ "out" "dev" ]; + preCheck = '' sed -i 's/test_set_default_verify_paths/noop/' tests/test_ssl.py # https://github.com/pyca/pyopenssl/issues/692 @@ -17797,17 +17884,25 @@ in { pyscss = buildPythonPackage rec { name = "pyScss-${version}"; - version = "1.3.4"; + version = "1.3.5"; - src = pkgs.fetchurl { - url = "mirror://pypi/p/pyScss/${name}.tar.gz"; - sha256 = "03lcp853kgr66aqrw2jd1q9jhs9h049w7zlwp7bfmly7xh832cnh"; + src = pkgs.fetchFromGitHub { + sha256 = "0lfsan74vcw6dypb196gmbprvlbran8p7w6czy8hyl2b1l728mhz"; + rev = "v1.3.5"; + repo = "pyScss"; + owner = "Kronuz"; }; + checkInputs = with self; [ pytest ]; + propagatedBuildInputs = with self; [ six ] ++ (optionals (pythonOlder "3.4") [ enum34 pathlib ]) ++ (optionals (pythonOlder "2.7") [ ordereddict ]); + checkPhase = '' + py.test + ''; + meta = { description = "A Scss compiler for Python"; homepage = http://pyscss.readthedocs.org/en/latest/; @@ -18328,6 +18423,8 @@ in { }; }; + requestsexceptions = callPackage ../development/python-modules/requestsexceptions {}; + requests_ntlm = callPackage ../development/python-modules/requests_ntlm { }; requests_oauthlib = callPackage ../development/python-modules/requests-oauthlib.nix { }; @@ -19010,14 +19107,16 @@ in { ropper = callPackage ../development/python-modules/ropper { }; routes = buildPythonPackage rec { - name = "routes-1.12.3"; + pname = "Routes"; + version = "2.4.1"; + name = "${pname}-${version}"; - src = pkgs.fetchurl { - url = mirror://pypi/R/Routes/Routes-1.12.3.tar.gz; - sha256 = "eacc0dfb7c883374e698cebaa01a740d8c78d364b6e7f3df0312de042f77aa36"; + src = fetchPypi { + inherit pname version; + sha256 = "1zamff3m0kc4vyfniyhxpkkcqv1rrgnmh37ykxv34nna1ws47vi6"; }; - propagatedBuildInputs = with self; [ paste webtest ]; + propagatedBuildInputs = with self; [ paste webtest repoze_lru ]; meta = { description = "A Python re-implementation of the Rails routes system for mapping URLs to application actions"; @@ -19527,6 +19626,8 @@ in { }; }; + simanneal = callPackage ../development/python-modules/simanneal { }; + simplebayes = buildPythonPackage rec { name = "simplebayes-${version}"; version = "1.5.8"; @@ -20529,33 +20630,7 @@ in { }; }; - subprocess32 = buildPythonPackage rec { - name = "subprocess32-3.2.6"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/subprocess32/${name}.tar.gz"; - sha256 = "ddf4d46ed2be2c7e7372dfd00c464cabb6b3e29ca4113d85e26f82b3d2c220f6"; - }; - - buildInputs = [ pkgs.bash ]; - - preConfigure = '' - substituteInPlace test_subprocess32.py \ - --replace '/usr/' '${pkgs.bash}/' - ''; - - doCheck = !isPyPy; - checkPhase = '' - ${python.interpreter} test_subprocess32.py - ''; - - meta = { - homepage = https://pypi.python.org/pypi/subprocess32; - description = "Backport of the subprocess module from Python 3.2.5 for use on 2.x"; - maintainers = with maintainers; [ garbas ]; - }; - }; + subprocess32 = callPackage ../development/python-modules/subprocess32 { }; spark_parser = buildPythonPackage (rec { name = "${pname}-${version}"; @@ -22476,15 +22551,16 @@ EOF }; webob = buildPythonPackage rec { - version = "1.4.1"; - name = "webob-${version}"; + pname = "WebOb"; + version = "1.7.3"; + name = "${pname}-${version}"; - src = pkgs.fetchurl { - url = "mirror://pypi/W/WebOb/WebOb-${version}.tar.gz"; - sha256 = "1nz9m6ijf46wfn33zfza13c0k1n4kjnmn3icdlrlgz5yj21vky0j"; + src = fetchPypi { + inherit pname version; + sha256 = "10vjp2rvqiyvw157fk3sy7yds1gknzw97z4gk0qv1raskx5s2p76"; }; - propagatedBuildInputs = with self; [ nose ]; + propagatedBuildInputs = with self; [ nose pytest ]; meta = { description = "WSGI request and response object"; @@ -26066,6 +26142,8 @@ EOF }; }; + tensorflow-tensorboard = callPackage ../development/python-modules/tensorflow-tensorboard { }; + tensorflow = self.tensorflowWithoutCuda; tensorflowWithoutCuda = callPackage ../development/python-modules/tensorflow { }; @@ -26073,7 +26151,7 @@ EOF tensorflowWithCuda = callPackage ../development/python-modules/tensorflow { cudaSupport = true; cudatoolkit = pkgs.cudatoolkit8; - cudnn = pkgs.cudnn51_cudatoolkit80; + cudnn = pkgs.cudnn60_cudatoolkit80; }; tflearn = buildPythonPackage rec { @@ -26544,7 +26622,9 @@ EOF ROPGadget = callPackage ../development/python-modules/ROPGadget { }; # We need "normal" libxml2 and not the python package by the same name. - pywbem = callPackage ../development/python-modules/pywbem { libxml2 = pkgs.libxml2; }; + pywbem = if !(isPy36) + then callPackage ../development/python-modules/pywbem { libxml2 = pkgs.libxml2; } + else throw "pywbem not supported for interpreter ${python.executable}"; unicorn = callPackage ../development/python-modules/unicorn { }; |