diff options
Diffstat (limited to 'pkgs')
117 files changed, 490 insertions, 407 deletions
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index c4158d280e2..34f0d16a7b4 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchgit, fetchpatch -, pkgconfig, gyp, cmake, gcc7, makeWrapper +, pkgconfig, gyp, cmake, makeWrapper , qtbase, qtimageformats, gtk3, libappindicator-gtk3 , dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 }: @@ -31,7 +31,7 @@ mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig gyp cmake gcc7 makeWrapper ]; + nativeBuildInputs = [ pkgconfig gyp cmake makeWrapper ]; buildInputs = [ qtbase qtimageformats gtk3 libappindicator-gtk3 diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 42ac766d2cc..bbf87eccac7 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -33,7 +33,6 @@ , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places , darwin ? null -, flex ? null , buildPlatform, hostPlatform, targetPlatform , buildPackages }: @@ -295,7 +294,7 @@ stdenv.mkDerivation ({ ]; buildInputs = [ - gmp mpfr libmpc libelf flex + gmp mpfr libmpc libelf targetPackages.stdenv.cc.bintools # For linking code at run-time ] ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) @@ -408,9 +407,8 @@ stdenv.mkDerivation ({ targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; - buildFlags = if bootstrap then - (if profiledCompiler then "profiledbootstrap" else "bootstrap") - else ""; + buildFlags = + optional bootstrap (if profiledCompiler then "profiledbootstrap" else "bootstrap"); installTargets = if stripped @@ -523,7 +521,7 @@ stdenv.mkDerivation ({ } # Strip kills static libs of other archs (hence targetPlatform != hostPlatform) -// optionalAttrs (!stripped || targetPlatform != hostPlatform) { dontStrip = true; NIX_STRIP_DEBUG = 0; } +// optionalAttrs (!stripped || targetPlatform != hostPlatform) { dontStrip = true; } // optionalAttrs (enableMultilib) { dontMoveLib64 = true; } ) diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index a66b2264f07..1cb28118ccb 100644 --- a/pkgs/development/compilers/hhvm/default.nix +++ b/pkgs/development/compilers/hhvm/default.nix @@ -53,6 +53,7 @@ stdenv.mkDerivation rec { hphp/runtime/ext/std/*.cpp \ hphp/runtime/ext_zend_compat/php-src/main/*.cpp \ hphp/runtime/ext_zend_compat/php-src/main/*.h + sed '1i#include <functional>' -i third-party/mcrouter/src/mcrouter/lib/cycles/Cycles.h patchShebangs . ''; diff --git a/pkgs/development/compilers/openjdk/7.nix b/pkgs/development/compilers/openjdk/7.nix index 372bb153269..13f8bcfdb1d 100644 --- a/pkgs/development/compilers/openjdk/7.nix +++ b/pkgs/development/compilers/openjdk/7.nix @@ -69,7 +69,10 @@ let fontconfig perl file bootjdk ]; - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=deprecated-declarations" + "-Wno-error=format-overflow" # newly detected by gcc7 + ]; NIX_LDFLAGS = if minimal then null else "-lfontconfig -lXcursor -lXinerama"; diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 576e42eb08a..dd15580c11b 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -14,7 +14,7 @@ let }; in rec { rustc = callPackage ./rustc.nix { - inherit llvm targets targetPatches targetToolchains rustPlatform version src; + inherit stdenv llvm targets targetPatches targetToolchains rustPlatform version src; forceBundledLLVM = true; @@ -31,6 +31,7 @@ in rec { cargo = callPackage ./cargo.nix rec { version = cargoVersion; inherit src; + inherit stdenv; inherit rustc; # the rustc that will be wrapped by cargo inherit rustPlatform; # used to build cargo }; diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix index 8e37dc76441..d93da8cb996 100644 --- a/pkgs/development/compilers/yap/default.nix +++ b/pkgs/development/compilers/yap/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { configureFlags = "--enable-tabling=yes"; + NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; + meta = { homepage = http://www.dcc.fc.up.pt/~vsc/Yap/; description = "A ISO-compatible high-performance Prolog compiler"; diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix index 4d38545a44f..2f5ce0e7635 100644 --- a/pkgs/development/interpreters/gnu-apl/default.nix +++ b/pkgs/development/interpreters/gnu-apl/default.nix @@ -12,6 +12,9 @@ stdenv.mkDerivation rec { buildInputs = [ readline gettext ncurses ]; + # Needed with GCC 7 + NIX_CFLAGS_COMPILE = "-Wno-error=int-in-bool-context"; + patchPhase = optionalString stdenv.isDarwin '' substituteInPlace src/LApack.cc --replace "malloc.h" "malloc/malloc.h" ''; diff --git a/pkgs/development/interpreters/spidermonkey/17.nix b/pkgs/development/interpreters/spidermonkey/17.nix index da5fc193a22..9c47ebe79b6 100644 --- a/pkgs/development/interpreters/spidermonkey/17.nix +++ b/pkgs/development/interpreters/spidermonkey/17.nix @@ -18,6 +18,16 @@ stdenv.mkDerivation rec { postUnpack = "sourceRoot=\${sourceRoot}/js/src"; + patches = [ + (fetchurl { + name = "jsoptparse-gcc7.patch"; + url = "https://src.fedoraproject.org/cgit/rpms/mozjs17.git/plain/" + + "mozjs17.0.0-gcc7.patch?id=43b846629a299f"; + sha256 = "17plyaq0jwf9wli4zlgvh4ri3zyk6nj1fiakh3wnd37nsl90raf9"; + }) + ]; + patchFlags = "-p3"; + postPatch = '' # Fixes an issue with version detection under perl 5.22.x sed -i 's/(defined\((@TEMPLATE_FILE)\))/\1/' config/milestone.pl diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix index cccd93e5d4d..d0e93337a39 100644 --- a/pkgs/development/libraries/aspell/default.nix +++ b/pkgs/development/libraries/aspell/default.nix @@ -1,5 +1,6 @@ -{stdenv, fetchurl, perl -, searchNixProfiles ? true}: +{ stdenv, fetchurl, fetchpatch, perl +, searchNixProfiles ? true +}: stdenv.mkDerivation rec { name = "aspell-0.60.6.1"; @@ -9,10 +10,16 @@ stdenv.mkDerivation rec { sha256 = "1qgn5psfyhbrnap275xjfrzppf5a83fb67gpql0kfqv37al869gm"; }; - patchPhase = '' + patches = [ + (fetchpatch { # remove in >= 0.60.7 + name = "gcc-7.patch"; + url = "https://github.com/GNUAspell/aspell/commit/8089fa02122fed0a.diff"; + sha256 = "1b3p1zy2lqr2fknddckm58hyk95hw4scf6hzjny1v9iaic2p37ix"; + }) + ] ++ stdenv.lib.optional searchNixProfiles ./data-dirs-from-nix-profiles.patch; + + postPatch = '' patch interfaces/cc/aspell.h < ${./clang.patch} - '' + stdenv.lib.optionalString searchNixProfiles '' - patch -p1 < ${./data-dirs-from-nix-profiles.patch} ''; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 1983aab0e32..cd42652e091 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -58,6 +58,8 @@ in stdenv.mkDerivation rec { rm aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp ''; + NIX_CFLAGS_COMPILE = [ "-Wno-error=noexcept-type" ]; + meta = { description = "A C++ interface for Amazon Web Services"; homepage = https://github.com/awslabs/aws-sdk-cpp; diff --git a/pkgs/development/libraries/dbus-cplusplus/default.nix b/pkgs/development/libraries/dbus-cplusplus/default.nix index ee7afbbf252..05140581143 100644 --- a/pkgs/development/libraries/dbus-cplusplus/default.nix +++ b/pkgs/development/libraries/dbus-cplusplus/default.nix @@ -10,11 +10,26 @@ stdenv.mkDerivation rec { sha256 = "0qafmy2i6dzx4n1dqp6pygyy6gjljnb7hwjcj2z11c1wgclsq4dw"; }; - patches = [( fetchurl { - url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/dbus-c%2B%2B/files/dbus-c%2B%2B-0.9.0-gcc-4.7.patch; - name = "gcc-4.7.patch"; - sha256 = "0rwcz9pvc13b3yfr0lkifnfz0vb5q6dg240bzgf37ni4s8rpc72g"; - })]; + patches = [ + (fetchurl { + name = "gcc-4.7.patch"; + url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/" + + "dbus-c%2B%2B/files/dbus-c%2B%2B-0.9.0-gcc-4.7.patch"; + sha256 = "0rwcz9pvc13b3yfr0lkifnfz0vb5q6dg240bzgf37ni4s8rpc72g"; + }) + (fetchurl { + name = "writechar.patch"; # since gcc7 + url = "https://src.fedoraproject.org/cgit/rpms/dbus-c++.git/plain/" + + "dbus-c++-writechar.patch?id=7f371172f5c"; + sha256 = "1kkg4gbpm4hp87l25zw2a3r9c58g7vvgzcqgiman734i66zsbb9l"; + }) + (fetchurl { + name = "threading.patch"; # since gcc7 + url = "https://src.fedoraproject.org/cgit/rpms/dbus-c++.git/plain/" + + "dbus-c++-threading.patch?id=7f371172f5c"; + sha256 = "1h362anx3wyxm5lq0v8girmip1jmkdbijrmbrq7k5pp47zkhwwrq"; + }) + ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ dbus glib expat ]; diff --git a/pkgs/development/libraries/json-c/0.11.nix b/pkgs/development/libraries/json-c/0.11.nix index 029921ee08c..8c4eab9ede6 100644 --- a/pkgs/development/libraries/json-c/0.11.nix +++ b/pkgs/development/libraries/json-c/0.11.nix @@ -6,6 +6,9 @@ stdenv.mkDerivation rec { url = "https://github.com/json-c/json-c/archive/json-c-0.11-20130402.tar.gz"; sha256 = "1m8fy7lbahv1r7yqbhw4pl057sxmmgjihm1fsvc3h66710s2i24r"; }; + + NIX_CFLAGS_COMPILE = [ "-Wno-error=implicit-fallthrough" ]; + meta = with stdenv.lib; { description = "A JSON implementation in C"; homepage = https://github.com/json-c/json-c/wiki; diff --git a/pkgs/development/libraries/json-c/default.nix b/pkgs/development/libraries/json-c/default.nix index b8c72d9669e..7317efc53f8 100644 --- a/pkgs/development/libraries/json-c/default.nix +++ b/pkgs/development/libraries/json-c/default.nix @@ -11,6 +11,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; # won't configure without it, no idea why + # probably OK after update: https://github.com/json-c/json-c/pull/365 + NIX_CFLAGS_COMPILE = [ "-Wno-error=implicit-fallthrough" ]; + # compatibility hack (for mypaint at least) postInstall = '' ln -s json-c.pc "$dev/lib/pkgconfig/json.pc" diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index 147d6bac2f9..54d669f1913 100644 --- a/pkgs/development/libraries/libidn/default.nix +++ b/pkgs/development/libraries/libidn/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "info" "devdoc" ]; - doCheck = !stdenv.isDarwin && !stdenv.hostPlatform.isMusl; + # broken with gcc-7 + #doCheck = !stdenv.isDarwin && !stdenv.hostPlatform.isMusl; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/libmemcached/default.nix b/pkgs/development/libraries/libmemcached/default.nix index 6d895290e2c..15e642832df 100644 --- a/pkgs/development/libraries/libmemcached/default.nix +++ b/pkgs/development/libraries/libmemcached/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { buildInputs = [ libevent ]; propagatedBuildInputs = [ cyrus_sasl ]; + NIX_CFLAGS_COMPILE = [ "-fpermissive"/*gcc7*/ ]; + meta = with stdenv.lib; { homepage = http://libmemcached.org; description = "Open source C/C++ client library and tools for the memcached server"; diff --git a/pkgs/development/libraries/libmwaw/default.nix b/pkgs/development/libraries/libmwaw/default.nix index e1ac659683c..35137a09cd9 100644 --- a/pkgs/development/libraries/libmwaw/default.nix +++ b/pkgs/development/libraries/libmwaw/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="libmwaw"; - version="0.3.10"; + version="0.3.13"; name="${baseName}-${version}"; - hash="087j6kx03ggvqwpl944nnf75qkvi9bag8b0z59phg66gbz0s0imj"; - url="https://netcologne.dl.sourceforge.net/project/libmwaw/libmwaw/libmwaw-0.3.10/libmwaw-0.3.10.tar.xz"; - sha256="087j6kx03ggvqwpl944nnf75qkvi9bag8b0z59phg66gbz0s0imj"; + hash="1sjs3nc39im232h5bf81w3il8ivd7w2bc2qssxf7k74g8hlcfmfv"; + url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.13/libmwaw-0.3.13.tar.xz"; + sha256="1sjs3nc39im232h5bf81w3il8ivd7w2bc2qssxf7k74g8hlcfmfv"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/librevenge/default.nix b/pkgs/development/libraries/librevenge/default.nix index 3523eb5c37b..2c6e792ae8c 100644 --- a/pkgs/development/libraries/librevenge/default.nix +++ b/pkgs/development/libraries/librevenge/default.nix @@ -21,11 +21,10 @@ stdenv.mkDerivation { inherit (s) url sha256; }; - # Clang generates warnings in Boost's header files + # Clang and gcc-7 generate warnings, and # -Werror causes these warnings to be interpreted as errors # Simplest solution: disable -Werror - configureFlags = if stdenv.cc.isClang - then [ "--disable-werror" ] else null; + configureFlags = [ "--disable-werror" ]; # Fix an issue with boost 1.59 # This is fixed upstream so please remove this when updating diff --git a/pkgs/development/libraries/libunique/default.nix b/pkgs/development/libraries/libunique/default.nix index a5adaa9ac17..1bef7683654 100644 --- a/pkgs/development/libraries/libunique/default.nix +++ b/pkgs/development/libraries/libunique/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { ./1.1.6-fix-test.patch ./1.1.6-G_CONST_RETURN.patch ./1.1.6-include-terminator.patch - ]; + ] + ++ [ ./gcc7-bug.patch ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib gtk2 dbus_glib ]; @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - homepage = http://live.gnome.org/LibUnique; + homepage = https://wiki.gnome.org/Attic/LibUnique; description = "A library for writing single instance applications"; license = stdenv.lib.licenses.lgpl21; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/libunique/gcc7-bug.patch b/pkgs/development/libraries/libunique/gcc7-bug.patch new file mode 100644 index 00000000000..2b0587510bc --- /dev/null +++ b/pkgs/development/libraries/libunique/gcc7-bug.patch @@ -0,0 +1,18 @@ +gcc-7 newly detects this class of bugs. +In this particular case it's clear that the inention was +to detect if the string is non-NULL *and* non-empty. + + +diff --git a/unique/uniqueapp.c b/unique/uniqueapp.c +index b40a86c..66a7226 100644 +--- a/unique/uniqueapp.c ++++ b/unique/uniqueapp.c +@@ -176,7 +176,7 @@ set_startup_id (UniqueBackend *backend, + { + gchar *id; + +- if (startup_id && startup_id != '\0') ++ if (startup_id && *startup_id != '\0') + id = g_strdup (startup_id); + else + { diff --git a/pkgs/development/libraries/libwps/default.nix b/pkgs/development/libraries/libwps/default.nix index 73fe5b55ab4..37ff9d098c5 100644 --- a/pkgs/development/libraries/libwps/default.nix +++ b/pkgs/development/libraries/libwps/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ boost librevenge zlib ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=implicit-fallthrough" ]; # newly detected by gcc-7 + meta = with stdenv.lib; { homepage = http://libwps.sourceforge.net/; description = "Microsoft Works document format import filter library"; diff --git a/pkgs/development/libraries/mp4v2/default.nix b/pkgs/development/libraries/mp4v2/default.nix index 736c31b442a..a5542ebb659 100644 --- a/pkgs/development/libraries/mp4v2/default.nix +++ b/pkgs/development/libraries/mp4v2/default.nix @@ -8,11 +8,19 @@ stdenv.mkDerivation rec { sha256 = "0f438bimimsvxjbdp4vsr8hjw2nwggmhaxgcw07g2z361fkbj683"; }; - # From Handbrake - # mp4v2 doesn't seem to be actively maintained any more :-/ patches = [ + # From Handbrake + # mp4v2 doesn't seem to be actively maintained any more :-/ ./A02-meaningful-4gb-warning.patch + + (fetchurl { + name = "gcc-7.patch"; + url = "https://src.fedoraproject.org/cgit/rpms/libmp4v2.git/plain/" + + "0004-Fix-GCC7-build.patch?id=d7aeedabb"; + sha256 = "0sbn0il7lmk77yrjyb4f0a3z3h8gsmdkscvz5n9hmrrrhrwf672w"; + }) ]; + # `faac' expects `mp4.h'. postInstall = "ln -s mp4v2/mp4v2.h $out/include/mp4.h"; diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 0dd7b37e1a6..308a916b0bd 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -11,23 +11,18 @@ }: stdenv.mkDerivation rec { - version = if abiVersion == "5" then "5.9" else "6.0-20171125"; - name = "ncurses-${version}"; + version = "6.0-20171125"; + name = "ncurses-${version}" + lib.optionalString (abiVersion == "5") "-abi5-compat"; - src = fetchurl (if abiVersion == "5" then { - url = "mirror://gnu/ncurses/${name}.tar.gz"; - sha256 = "0fsn7xis81za62afan0vvm38bvgzg5wfmv1m86flqcj0nj7jjilh"; - } else { + src = fetchurl { urls = [ - "ftp://ftp.invisible-island.net/ncurses/current/${name}.tgz" - "https://invisible-mirror.net/archives/ncurses/current/${name}.tgz" + "ftp://ftp.invisible-island.net/ncurses/current/ncurses-${version}.tgz" + "https://invisible-mirror.net/archives/ncurses/current/ncurses-${version}.tgz" ]; sha256 = "11adzj0k82nlgpfrflabvqn2m7fmhp2y6pd7ivmapynxqb9vvb92"; - }); + }; - # Unnecessarily complicated in order to avoid mass-rebuilds - patches = lib.optional (!stdenv.cc.isClang || abiVersion == "5") ./clang.patch - ++ lib.optional (stdenv.cc.isGNU && abiVersion == "5") ./gcc-5.patch; + patches = lib.optional (!stdenv.cc.isClang) ./clang.patch; outputs = [ "out" "dev" "man" ]; setOutputFlags = false; # some aren't supported @@ -37,7 +32,8 @@ stdenv.mkDerivation rec { "--without-debug" "--enable-pc-files" "--enable-symlinks" - ] ++ lib.optional unicode "--enable-widec"; + ] ++ lib.optional unicode "--enable-widec" + ++ lib.optional (abiVersion == "5") "--with-abi-version=5"; # Only the C compiler, and explicitly not C++ compiler needs this flag on solaris: CFLAGS = lib.optionalString stdenv.isSunOS "-D_XOPEN_SOURCE_EXTENDED"; diff --git a/pkgs/development/libraries/ncurses/gcc-5.patch b/pkgs/development/libraries/ncurses/gcc-5.patch deleted file mode 100644 index 2448229b88e..00000000000 --- a/pkgs/development/libraries/ncurses/gcc-5.patch +++ /dev/null @@ -1,46 +0,0 @@ -https://bugs.gentoo.org/545114 - -extracted from the upstream change (which had many unrelated commits in one) - -From 97bb4678dc03e753290b39bbff30ba2825df9517 Mon Sep 17 00:00:00 2001 -From: "Thomas E. Dickey" <dickey@invisible-island.net> -Date: Sun, 7 Dec 2014 03:10:09 +0000 -Subject: [PATCH] ncurses 5.9 - patch 20141206 - -+ modify MKlib_gen.sh to work around change in development version of - gcc introduced here: - https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html - https://gcc.gnu.org/ml/gcc-patches/2014-07/msg00236.html - (reports by Marcus Shawcroft, Maohui Lei). - -diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh -index d8cc3c9..b91398c 100755 ---- a/ncurses/base/MKlib_gen.sh -+++ b/ncurses/base/MKlib_gen.sh -@@ -474,11 +474,22 @@ sed -n -f $ED1 \ - -e 's/gen_$//' \ - -e 's/ / /g' >>$TMP - -+cat >$ED1 <<EOF -+s/ / /g -+s/^ // -+s/ $// -+s/P_NCURSES_BOOL/NCURSES_BOOL/g -+EOF -+ -+# A patch discussed here: -+# https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html -+# introduces spurious #line markers. Work around that by ignoring the system's -+# attempt to define "bool" and using our own symbol here. -+sed -e 's/bool/P_NCURSES_BOOL/g' $TMP > $ED2 -+cat $ED2 >$TMP -+ - $preprocessor $TMP 2>/dev/null \ --| sed \ -- -e 's/ / /g' \ -- -e 's/^ //' \ -- -e 's/_Bool/NCURSES_BOOL/g' \ -+| sed -f $ED1 \ - | $AWK -f $AW2 \ - | sed -f $ED3 \ - | sed \ diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 46f24a08b5e..8b3fd8c6678 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -176,13 +176,14 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; NIX_CFLAGS_COMPILE = - optionalString stdenv.isLinux "-std=gnu++98" # gnu++ in (Obj)C flags is no good on Darwin - + optionalString (stdenv.isFreeBSD || stdenv.isDarwin) - " -I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include" - + optionalString stdenv.isDarwin " -I${libcxx}/include/c++/v1"; - - NIX_LDFLAGS = optionalString (stdenv.isFreeBSD || stdenv.isDarwin) - "-lglib-2.0"; + # with gcc7 the warnings blow the log over Hydra's limit + [ "-Wno-expansion-to-defined" "-Wno-unused-local-typedefs" ] + ++ optional stdenv.isLinux "-std=gnu++98" # gnu++ in (Obj)C flags is no good on Darwin + ++ optionals (stdenv.isFreeBSD || stdenv.isDarwin) + [ "-I${glib.dev}/include/glib-2.0" "-I${glib.out}/lib/glib-2.0/include" ] + ++ optional stdenv.isDarwin "-I${libcxx}/include/c++/v1"; + + NIX_LDFLAGS = optionalString (stdenv.isFreeBSD || stdenv.isDarwin) "-lglib-2.0"; preBuild = optionalString stdenv.isDarwin '' # resolve "extra qualification on member" error diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index 4dce9c4e22e..6834b7ce87b 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -31,7 +31,8 @@ qtModule { ''; NIX_CFLAGS_COMPILE = - optionals flashplayerFix + [ "-Wno-expansion-to-defined" ] # with gcc7 this warning blows the log over Hydra's limit + ++ optionals flashplayerFix [ ''-DNIXPKGS_LIBGTK2="${getLib gtk2}/lib/libgtk-x11-2.0"'' ''-DNIXPKGS_LIBGDK2="${getLib gdk_pixbuf}/lib/libgdk-x11-2.0"'' diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix index 4735375de1f..507c494ea27 100644 --- a/pkgs/development/libraries/usbredir/default.nix +++ b/pkgs/development/libraries/usbredir/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { }; # Works around bunch of "format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'uint64_t {aka long long unsigned int}'" warnings - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.is64bit) "-Wno-error=format"; + NIX_CFLAGS_COMPILE = stdenv.lib.optional (!stdenv.is64bit) "-Wno-error=format" + ++ [ "-Wno-error=format-truncation" ]; # newly detected with gcc-7 nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libusb ]; diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix index 466c20e19ca..facf86c5898 100644 --- a/pkgs/development/python-modules/aenum/default.nix +++ b/pkgs/development/python-modules/aenum/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "aenum"; - version = "2.0.9"; + version = "2.1.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "d98bc55136d696fcf323760c3db0de489da9e41fd51283fa6f90205deb85bf6a"; + sha256 = "9eb1c8f48ae13c56d22a7227db0e4b1717131b284c6c0db6e4ccca6f5894df95"; }; # For Python 3, locale has to be set to en_US.UTF-8 for diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 54e1a753597..176805e57e5 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "alembic"; - version = "0.9.7"; + version = "0.9.8"; src = fetchPypi { inherit pname version; - sha256 = "46f4849c6dce69f54dd5001b3215b6a983dee6b17512efee10e237fa11f20cfa"; + sha256 = "13b8611788acf0d7b617775db5c2ae26554a6d4263c590ef628d448fd05aef56"; }; buildInputs = [ pytest pytestcov mock coverage ]; diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix index 37164cb4276..b13470b4c45 100644 --- a/pkgs/development/python-modules/argcomplete/default.nix +++ b/pkgs/development/python-modules/argcomplete/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "argcomplete"; - version = "1.9.3"; + version = "1.9.4"; src = fetchPypi { inherit pname version; - sha256 = "d97b7f3cfaa4e494ad59ed6d04c938fc5ed69b590bd8f53274e258fb1119bd1b"; + sha256 = "06c8a54ffaa6bfc9006314498742ec8843601206a3b94212f82657673662ecf1"; }; doCheck = false; # bash-completion test fails with "compgen: command not found". diff --git a/pkgs/development/python-modules/asana/default.nix b/pkgs/development/python-modules/asana/default.nix index 7990ece749b..91664f76ad1 100644 --- a/pkgs/development/python-modules/asana/default.nix +++ b/pkgs/development/python-modules/asana/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "asana"; - version = "0.6.7"; + version = "0.7.0"; name = "${pname}-${version}"; meta = { @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "d576601116764050c4cf63b417f1c24700b76cf6686f0e51e6b0b77d450e7973"; + sha256 = "a7ff4a78529257a5412e78cafd6b3025523364c0ab628d579f2771dd66b254bc"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/asgiref/default.nix b/pkgs/development/python-modules/asgiref/default.nix index a2815fc0c86..223f53698e9 100644 --- a/pkgs/development/python-modules/asgiref/default.nix +++ b/pkgs/development/python-modules/asgiref/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchurl, six }: buildPythonPackage rec { - version = "2.1.1"; + version = "2.1.5"; pname = "asgiref"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/a/asgiref/${name}.tar.gz"; - sha256 = "112828022d772925b47b22caf8108dadd3b26bb0af719eb01b2c3a807795429d"; + sha256 = "1a46196df28c67e046a54cc537ce5a8f6a59eb68649f54680d7e4fc3b113ab1b"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index 514762b7a37..ccf988fc56d 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "astropy"; - version = "2.0.3"; + version = "3.0"; name = "${pname}-${version}"; doCheck = false; #Some tests are failing. More importantly setup.py hangs on completion. Needs fixing with a proper shellhook. src = fetchPypi { inherit pname version; - sha256 = "fdfc0248f6250798ed6d1327be609cb901db89ae01fc768cfbc9e263bdf56f4f"; + sha256 = "9e0ad19b9d6d227bdf0932bbe64a8c5dd4a47d4ec078586cf24bf9f0c61d9ecf"; }; propagatedBuildInputs = [ pytest numpy ]; # yes it really has pytest in install_requires diff --git a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix index 0def8a2de2a..bcaa844720b 100644 --- a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix +++ b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix @@ -7,11 +7,11 @@ if !(pythonOlder "3.3") then null else buildPythonPackage rec { pname = "backports.functools_lru_cache"; - version = "1.4"; + version = "1.5"; src = fetchPypi { inherit pname version; - sha256 = "31f235852f88edc1558d428d890663c49eb4514ffec9f3650e7f3c9e4a12e36f"; + sha256 = "9d98697f088eb1b0fa451391f91afb5e3ebde16bbdb272819fd091151fda4f1a"; }; buildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/bibtexparser/default.nix b/pkgs/development/python-modules/bibtexparser/default.nix index 74b1062cea4..50e389a9e14 100644 --- a/pkgs/development/python-modules/bibtexparser/default.nix +++ b/pkgs/development/python-modules/bibtexparser/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "bibtexparser"; - version = "0.6.2"; + version = "1.0.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "5888219ac5db1c63ae0ad4db52ec7ad87fe7a32bd60e62ee87bceedb8ebf73b8"; + sha256 = "cc41cdd8332c2bf44b97daf1f135f4f267c3b744c33976655cd270b66f964c0a"; }; # No tests in archive diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index e3c77fa65cf..66a5a542bf1 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -34,11 +34,11 @@ buildPythonPackage rec { pname = "bokeh"; name = "${pname}${version}"; - version = "0.12.13"; + version = "0.12.14"; src = fetchPypi { inherit pname version; - sha256 = "6e28cbfd88de0c459435278b75f9982591ec0aaa3d37a195052645e1c62e89e3"; + sha256 = "42abada2e484d2d5b290d14a943e1c3cd7adabd39933b5f074f57b6cf7920a87"; }; disabled = isPyPy; diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 897e9c88407..e363136615e 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "botocore"; - version = "1.8.36"; + version = "1.8.45"; src = fetchPypi { inherit pname version; - sha256 = "b2c9e0fd6d14910f759a33c19f8315dddedbb3c5569472b7be7ceed4f001a675"; + sha256 = "8f91b648a216dc945783d1539c013fc08a9e65ecc4fc5aae017bdd5961fd3468"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bpython/default.nix b/pkgs/development/python-modules/bpython/default.nix index f9ab331a3f6..ad80e5647a4 100644 --- a/pkgs/development/python-modules/bpython/default.nix +++ b/pkgs/development/python-modules/bpython/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bpython"; - version = "0.17"; + version = "0.17.1"; src = fetchPypi { inherit pname version; - sha256 = "1mbah208jhd7bsfaa17fwpi55f7fvif0ghjwgrjmpmx8w1vqab9l"; + sha256 = "8907c510bca3c4d9bc0a157279bdc5e3b739cc68c0f247167279b6fe4becb02f"; }; propagatedBuildInputs = [ curtsies greenlet pygments requests urwid ]; diff --git a/pkgs/development/python-modules/channels/default.nix b/pkgs/development/python-modules/channels/default.nix index 36191b95479..46692999a49 100644 --- a/pkgs/development/python-modules/channels/default.nix +++ b/pkgs/development/python-modules/channels/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "channels"; name = "${pname}-${version}"; - version = "2.0.0"; + version = "2.0.2"; src = fetchPypi { inherit pname version; - sha256 = "c365492b90bd936c763e06cd76bda96cd3e70e5a5d2a196c25754e0c1d8da85a"; + sha256 = "5d41e0f2aa40f9755f36c2c1dd83748b6793732190d577922e06294a3b37fd92"; }; # Files are missing in the distribution diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 5711cdba2b5..5167cc44319 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "CherryPy"; - version = "13.1.0"; + version = "14.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0pb9mfmhns33jq4nrd38mv88ha74fj3q0y2mm8qsjh7ywphvk9ap"; + sha256 = "5f5ee020d6547a8d452b3560775ca2374ffe2ff8c0aec1b272e93b6af80d850e"; }; propagatedBuildInputs = [ cheroot portend routes six ]; diff --git a/pkgs/development/python-modules/configargparse/default.nix b/pkgs/development/python-modules/configargparse/default.nix index 9540b059931..6a52076252e 100644 --- a/pkgs/development/python-modules/configargparse/default.nix +++ b/pkgs/development/python-modules/configargparse/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ConfigArgParse"; - version = "0.12.0"; + version = "0.13.0"; src = fetchPypi { inherit pname version; - sha256 = "0fgkiqh6r3rbkdq3k8c48m85g52k96686rw3a6jg4lcncrkpvk98"; + sha256 = "e6441aa58e23d3d122055808e5e2220fd742dff6e1e51082d2a4e4ed145dd788"; }; # no tests in tarball diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix index 1c58ecb9aa6..8b85a0d94c5 100644 --- a/pkgs/development/python-modules/coverage/default.nix +++ b/pkgs/development/python-modules/coverage/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "coverage"; - version = "4.4.2"; + version = "4.5.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "309d91bd7a35063ec7a0e4d75645488bfab3f0b66373e7722f23da7f5b0f34cc"; + sha256 = "56e448f051a201c5ebbaa86a5efd0ca90d327204d8b059ab25ad0f35fbfd79f1"; }; # No tests in archive diff --git a/pkgs/development/python-modules/curtsies/default.nix b/pkgs/development/python-modules/curtsies/default.nix index d9505b384af..8d6052c5299 100644 --- a/pkgs/development/python-modules/curtsies/default.nix +++ b/pkgs/development/python-modules/curtsies/default.nix @@ -2,10 +2,10 @@ buildPythonPackage rec { pname = "curtsies"; - version = "0.2.11"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1vljmw3sy6lrqahhpyg4gk13mzcx3mwhvg8s41698ms3cpgkjipc"; + sha256 = "89c802ec051d01dec6fc983e9856a3706e4ea8265d2940b1f6d504a9e26ed3a9"; }; propagatedBuildInputs = [ blessings wcwidth pyte ]; diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix index 6fec8bf882c..86b00ca7408 100644 --- a/pkgs/development/python-modules/daphne/default.nix +++ b/pkgs/development/python-modules/daphne/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "daphne"; name = "${pname}-${version}"; - version = "2.0.0"; + version = "2.0.3"; src = fetchPypi { inherit pname version; - sha256 = "ecd43a2dd889fb74e16bf8b7f67c076c4ec1b36229ce782272e46c50d56174dd"; + sha256 = "bb2075ce35ca00f2e5440cc034dfebd5c00d346de62ea45f099db089b868c31f"; }; buildInputs = [ hypothesis ]; diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 79e423d4847..8a8437767d8 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "dask"; - version = "0.16.1"; + version = "0.17.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "07a0609ce053c8c2675037e6d5242899f90ecfb5262e1d0b2d7264fe8814099c"; + sha256 = "4d2b0754d16ddc3f87026c1fc4fa3b589d7604a41d3f6510268f172abc1d0a5e"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/django-polymorphic/default.nix b/pkgs/development/python-modules/django-polymorphic/default.nix index 1e3d60b765c..8cb68ed1e7d 100644 --- a/pkgs/development/python-modules/django-polymorphic/default.nix +++ b/pkgs/development/python-modules/django-polymorphic/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "django-polymorphic"; - version = "2.0"; + version = "2.0.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "78f666149ea10cdda08ac6c25ddf4b4e582ee380be87e7968bfed008ef39dfa5"; + sha256 = "e1821d7b5874509a158a0f22bebf544330e0944c481c5a3e6da6cac8887e4e88"; }; checkInputs = [ django ]; diff --git a/pkgs/development/python-modules/docker_compose/default.nix b/pkgs/development/python-modules/docker_compose/default.nix index e6be57c8b52..711babe9518 100644 --- a/pkgs/development/python-modules/docker_compose/default.nix +++ b/pkgs/development/python-modules/docker_compose/default.nix @@ -6,12 +6,12 @@ , enum34, functools32, }: buildPythonApplication rec { - version = "1.18.0"; + version = "1.19.0"; pname = "docker-compose"; src = fetchPypi { inherit pname version; - sha256 = "2930cbfe2685018fbb75377600ab6288861d9955717b3f14212f63950351d379"; + sha256 = "f227e0e4b7d88aaf8f892b03a2068942c56ea16bcf2a0fb9fe2a3a071c5fef0b"; }; # lots of networking and other fails diff --git a/pkgs/development/python-modules/eve/default.nix b/pkgs/development/python-modules/eve/default.nix index fe6daf73339..664322362b2 100644 --- a/pkgs/development/python-modules/eve/default.nix +++ b/pkgs/development/python-modules/eve/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "Eve"; - version = "0.7.6"; + version = "0.7.8"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1ba84ab471bc2203a728fe4707a9279c44420224180b418601778125f51577ff"; + sha256 = "af373ab7b9611990d39b090eed372a0860d4e12a1c8a6ef49fdee29e4626053f"; }; patches = [ diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index 1fc7ae5aa58..bd249dea5d2 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "Fiona"; - version = "1.7.11"; + version = "1.7.11.post1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "5e9c68ea71e9d79fcfb68c9a101c0b133301e233c9bcca7b7c65f33cc7636ef5"; + sha256 = "35df044fa805e6b420450f5d4281fc0edf96e1da0545c31032045cd3cfad3abf"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/flake8-debugger/default.nix b/pkgs/development/python-modules/flake8-debugger/default.nix index aab91433088..9d69c0389b6 100644 --- a/pkgs/development/python-modules/flake8-debugger/default.nix +++ b/pkgs/development/python-modules/flake8-debugger/default.nix @@ -3,10 +3,10 @@ buildPythonPackage rec { pname = "flake8-debugger"; name = "${pname}-${version}"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { url = "mirror://pypi/f/flake8-debugger/${name}.tar.gz"; - sha256 = "e5c8ac980d819db2f3fbb89fe0e43a2fe6c127edd6ce4984a3f7e0bbdac3d2d4"; + sha256 = "be4fb88de3ee8f6dd5053a2d347e2c0a2b54bab6733a2280bb20ebd3c4ca1d97"; }; buildInputs = [ nose ]; propagatedBuildInputs = [ flake8 ]; diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index 80fc3893f17..a8a89f0e8ca 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "fonttools"; - version = "3.21.2"; + version = "3.22.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "96b636793c806206b1925e21224f4ab2ce5bea8ae0990ed181b8ac8d30848f47"; + sha256 = "01640dfbc0ba752181b21fe74240b8a7bbf7af75581737245836ada5565bd549"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index 4f36a5c1b77..789cfaaea7a 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "1.4.1"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "1nwdhhn9ib5ln56q8h3g42dl93jl67xlxkgl1wqkh7pacg00r4vs"; + sha256 = "f3ee8294c11f0d1a4430ae7534236c6a6837312f1b4056adbb183a3af663d2be"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/google_auth/default.nix b/pkgs/development/python-modules/google_auth/default.nix index 2076f3c3444..ef101077eaa 100644 --- a/pkgs/development/python-modules/google_auth/default.nix +++ b/pkgs/development/python-modules/google_auth/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "google-auth"; - version = "1.3.0"; + version = "1.4.1"; src = fetchPypi { inherit pname version; - sha256 = "d119b5954393d81c4a986ab420cf2c8129fc95ff5c4c6bb8ab5c8f3e6446394f"; + sha256 = "9051802d3dae256036cca9e34633a32c0ed1427730d4ebc513dff91ec8b6dd45"; }; checkInputs = [ pytest mock oauth2client flask requests urllib3 pytest-localserver ]; diff --git a/pkgs/development/python-modules/google_cloud_speech/default.nix b/pkgs/development/python-modules/google_cloud_speech/default.nix index a388c0fa70c..c24e0d88067 100644 --- a/pkgs/development/python-modules/google_cloud_speech/default.nix +++ b/pkgs/development/python-modules/google_cloud_speech/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "0.31.0"; + version = "0.32.0"; src = fetchPypi { inherit pname version; - sha256 = "b0f6a542165750e42b1c92e6c465e8dc35c38d138ae7f08174971ab9b0df2a71"; + sha256 = "2513725e693c3a2fdf22cb3065f3fcb39de2ab962a0cbc5de11a3889834189e1"; }; propagatedBuildInputs = [ setuptools google_api_core google_gax google_cloud_core ]; diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index ea59bedc035..d1f0903238c 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "grpcio"; - version = "1.9.0"; + version = "1.9.1"; src = fetchPypi { inherit pname version; - sha256 = "b61d3a7c45aa08f15dfa735a6a8282b5097be91ff36ad347594d3945ffc12181"; + sha256 = "e7c43b5619deff48cc177c1b0618c4beeb2797f910f160e3c2035d5baf790a5d"; }; propagatedBuildInputs = [ six protobuf ] diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix index b075db5ae98..bab965b5a9c 100644 --- a/pkgs/development/python-modules/gssapi/default.nix +++ b/pkgs/development/python-modules/gssapi/default.nix @@ -3,12 +3,12 @@ nose, shouldbe, gss, krb5Full, which, darwin }: buildPythonPackage rec { pname = "gssapi"; - version = "1.3.0"; + version = "1.4.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "765205082a9490c8e8be88ac16a6249d124396a671665edeec9927a7f244d712"; + sha256 = "be8f37dd9da726db375b9c693e0a63b391d381d903516e79ecc2a2cc965580e4"; }; # It's used to locate headers diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index bdbdcdcc2e7..54cfb5dc93b 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, buildPythonPackage +{ stdenv, fetchPypi, fetchpatch, python, buildPythonPackage , numpy, hdf5, cython, six, pkgconfig , mpi4py ? null, openssh }: @@ -9,14 +9,12 @@ with stdenv.lib; let mpi = hdf5.mpi; mpiSupport = hdf5.mpiSupport; - in buildPythonPackage rec { version = "2.7.1"; pname = "h5py"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/h/h5py/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "180a688311e826ff6ae6d3bda9b5c292b90b28787525ddfcb10a29d5ddcae2cc"; }; @@ -34,11 +32,15 @@ in buildPythonPackage rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ hdf5 cython ] - ++ optional mpiSupport mpi - ; + ++ optional mpiSupport mpi; propagatedBuildInputs = [ numpy six] - ++ optionals mpiSupport [ mpi4py openssh ] - ; + ++ optionals mpiSupport [ mpi4py openssh ]; + + patches = [ + # Patch is based on upstream patch. The tox.ini hunk had to be removed. + # https://github.com/h5py/h5py/commit/5009e062a6f7d4e074cab0fcb42a780ac2b1d7d4.patch + ./numpy-1.14.patch + ]; meta = { description = diff --git a/pkgs/development/python-modules/h5py/numpy-1.14.patch b/pkgs/development/python-modules/h5py/numpy-1.14.patch new file mode 100644 index 00000000000..e1db7e05808 --- /dev/null +++ b/pkgs/development/python-modules/h5py/numpy-1.14.patch @@ -0,0 +1,94 @@ +From 5009e062a6f7d4e074cab0fcb42a780ac2b1d7d4 Mon Sep 17 00:00:00 2001 +From: James Tocknell <aragilar@gmail.com> +Date: Thu, 28 Dec 2017 20:55:55 +1100 +Subject: [PATCH] FIX: Don't reorder compound types, breaks on numpy 1.14 + +--- + h5py/h5t.pyx | 25 +++++++------------------ + setup.py | 2 +- + tox.ini | 4 ++-- + 3 files changed, 10 insertions(+), 21 deletions(-) + +diff --git a/h5py/h5t.pyx b/h5py/h5t.pyx +index cc2344e1..7445e9eb 100644 +--- a/h5py/h5t.pyx ++++ b/h5py/h5t.pyx +@@ -1136,12 +1136,6 @@ cdef class TypeCompoundID(TypeCompositeID): + else: + if sys.version[0] == '3': + field_names = [x.decode('utf8') for x in field_names] +- if len(field_names) > 0: +- collated_fields = zip(field_names, field_types, field_offsets) +- ordered_fields = sorted( +- collated_fields, key=operator.itemgetter(2)) +- field_names, field_types, field_offsets = \ +- map(list, zip(*ordered_fields)) + typeobj = dtype({ + 'names': field_names, + 'formats': field_types, +@@ -1458,8 +1452,7 @@ cdef TypeCompoundID _c_compound(dtype dt, int logical, int aligned): + cdef dtype member_dt + cdef size_t member_offset = 0 + +- cdef dict offsets = {} +- cdef list fields = [] ++ cdef dict fields = {} + + # The challenge with correctly converting a numpy/h5py dtype to a HDF5 type + # which is composed of subtypes has three aspects we must consider +@@ -1468,19 +1461,14 @@ cdef TypeCompoundID _c_compound(dtype dt, int logical, int aligned): + # 2. For correct round-tripping of aligned dtypes, we need to consider how + # much padding we need by looking at the field offsets + # 3. There is no requirement that the offsets be monotonically increasing +- # (so we start by sorting the names as a function of increasing offset) + # + # The code below tries to cover these aspects + +- # Get offsets for each compound member +- for name, field in dt.fields.items(): +- offsets[name] = field[1] +- + # Build list of names, offsets, and types, sorted by increasing offset + # (i.e. the position of the member in the struct) +- for name in sorted(dt.names, key=offsets.__getitem__): ++ for name in sorted(dt.names, key=(lambda n: dt.fields[n][1])): + field = dt.fields[name] +- name = name.encode('utf8') if isinstance(name, unicode) else name ++ h5_name = name.encode('utf8') if isinstance(name, unicode) else name + + # Get HDF5 data types and set the offset for each member + member_dt = field[0] +@@ -1489,7 +1477,7 @@ cdef TypeCompoundID _c_compound(dtype dt, int logical, int aligned): + if aligned and (member_offset > field[1] + or member_dt.itemsize != member_type.get_size()): + raise TypeError("Enforced alignment not compatible with HDF5 type") +- fields.append((name, member_offset, member_type)) ++ fields[name] = (h5_name, member_offset, member_type) + + # Update member offset based on the HDF5 type size + member_offset += member_type.get_size() +@@ -1500,8 +1488,9 @@ cdef TypeCompoundID _c_compound(dtype dt, int logical, int aligned): + + # Create compound with the necessary size, and insert its members + tid = H5Tcreate(H5T_COMPOUND, member_offset) +- for (name, member_offset, member_type) in fields: +- H5Tinsert(tid, name, member_offset, member_type.id) ++ for name in dt.names: ++ h5_name, member_offset, member_type = fields[name] ++ H5Tinsert(tid, h5_name, member_offset, member_type.id) + + return TypeCompoundID(tid) + +diff --git a/setup.py b/setup.py +index ec2a78a7..bbb086f6 100755 +--- a/setup.py ++++ b/setup.py +@@ -32,7 +32,7 @@ + # these are required to build h5py + # RUN_REQUIRES is included as setup.py test needs RUN_REQUIRES for testing + # RUN_REQUIRES can be removed when setup.py test is removed +-SETUP_REQUIRES = RUN_REQUIRES + [NUMPY_DEP, 'Cython>=0.19', 'pkgconfig'] ++SETUP_REQUIRES = RUN_REQUIRES + [NUMPY_DEP, 'Cython>=0.23', 'pkgconfig'] + + # Needed to avoid trying to install numpy/cython on pythons which the latest + # versions don't support diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index 91939d14688..d5ee59ac2d9 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -1,5 +1,5 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, python -, pythonOlder, pythonAtLeast, enum34 +{ lib, buildPythonPackage, fetchFromGitHub, python +, isPy3k, attrs, coverage, enum34 , doCheck ? true, pytest, pytest_xdist, flake8, flaky, mock }: buildPythonPackage rec { @@ -9,20 +9,19 @@ buildPythonPackage rec { # pytz fake_factory django numpy pytest # If you need these, you can just add them to your environment. - version = "3.27.0"; + version = "3.45.2"; pname = "hypothesis"; - name = "${pname}-${version}"; # Upstream prefers github tarballs src = fetchFromGitHub { owner = "HypothesisWorks"; repo = "hypothesis-python"; - rev = "${version}"; - sha256 = "1lvhd8jrwajyc5w1alb9vinsi97fjfqpkxkh8g8j527831lig0j0"; - }; + rev = version; + sha256 = "063sn5m1966gvm3wrlxczdq4vw0r94h3nd9xpr94qxahpg2r4bpb"; + }; - checkInputs = stdenv.lib.optionals doCheck [ pytest pytest_xdist flake8 flaky mock]; - propagatedBuildInputs = stdenv.lib.optionals (pythonOlder "3.4") [ enum34 ]; + checkInputs = [ pytest pytest_xdist flaky mock ]; + propagatedBuildInputs = [ attrs coverage ] ++ lib.optional (!isPy3k) [ enum34 ]; inherit doCheck; @@ -32,11 +31,7 @@ buildPythonPackage rec { py.test tests/cover ''; - # Unsupport by upstream on certain versions - # https://github.com/HypothesisWorks/hypothesis-python/issues/477 - disabled = pythonOlder "3.4" && pythonAtLeast "2.8"; - - meta = with stdenv.lib; { + meta = with lib; { description = "A Python library for property based testing"; homepage = https://github.com/HypothesisWorks/hypothesis; license = licenses.mpl20; diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index 330141fcd06..018a522a591 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "ipykernel"; - version = "4.8.0"; + version = "4.8.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "dedc199df6a38725c732986dfa606c245fb8fe0fe999b33a0c305b73d80c6774"; + sha256 = "fe2837622a4121cbe42b354db1e2ab46c91e807ffcb92f4c2cfd323a75f8737f"; }; buildInputs = [ nose ] ++ lib.optional isPy27 mock; diff --git a/pkgs/development/python-modules/ipyparallel/default.nix b/pkgs/development/python-modules/ipyparallel/default.nix index 3e8ea048920..e4765a29e83 100644 --- a/pkgs/development/python-modules/ipyparallel/default.nix +++ b/pkgs/development/python-modules/ipyparallel/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "ipyparallel"; - version = "6.0.2"; + version = "6.1.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "7eea4780266252fcc987b220a302d589fbb4d6b0569bd131115a20b31891103d"; + sha256 = "f1e03ebb8d17f67f03bafa5d85f220883462f7bd7a97fe904c7d56ffba8534a3"; }; buildInputs = [ nose ]; diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix index b41f70c073c..c504062cba6 100644 --- a/pkgs/development/python-modules/ipywidgets/default.nix +++ b/pkgs/development/python-modules/ipywidgets/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "ipywidgets"; - version = "7.1.1"; + version = "7.1.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "69e8c444e99601e6f9b9e9e596c87c19665fc73c2dd05cd507c94f35fba2959d"; + sha256 = "4263ce721a1e5b53a84c4595a5e296d270ae0dc534401b536f4dda64e0b0ca02"; }; # Tests are not distributed diff --git a/pkgs/development/python-modules/jsonpickle/default.nix b/pkgs/development/python-modules/jsonpickle/default.nix index 2d9f02a5aff..3a0f7237730 100644 --- a/pkgs/development/python-modules/jsonpickle/default.nix +++ b/pkgs/development/python-modules/jsonpickle/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "jsonpickle"; - version = "0.9.5"; + version = "0.9.6"; src = fetchPypi { inherit pname version; - sha256 = "cc25dc79571d4ad7db59d05ddb7de0d76a8d598cf6136e1dbeaa9361ebcfe749"; + sha256 = "545b3bee0d65e1abb4baa1818edcc9ec239aa9f2ffbfde8084d71c056180054f"; }; doCheck = false; diff --git a/pkgs/development/python-modules/kaitaistruct/default.nix b/pkgs/development/python-modules/kaitaistruct/default.nix index c9961956617..0863cd79f46 100644 --- a/pkgs/development/python-modules/kaitaistruct/default.nix +++ b/pkgs/development/python-modules/kaitaistruct/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "kaitaistruct"; - version = "0.7"; + version = "0.8"; src = fetchPypi { inherit pname version; - sha256 = "19j3snmr0qbd48f7yd3cc21ffv13dahf8ys591dnalbhvnkar71i"; + sha256 = "d1d17c7f6839b3d28fc22b21295f787974786c2201e8788975e72e2a1d109ff5"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index 8ef263cdfa8..4c42a4ebafe 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "Keras"; - version = "2.1.3"; + version = "2.1.4"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "7ca3a381523bad40a6922e88951a316664cb088fd01cea07e5ec8ada3327e3c7"; + sha256 = "7ee1fcc79072ac904a4f008d715bcb78c60250ae3cd41d99e268c60ade8d0d3a"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix index d6c96534d74..757a171d838 100644 --- a/pkgs/development/python-modules/libagent/default.nix +++ b/pkgs/development/python-modules/libagent/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "libagent"; - version = "0.9.7"; + version = "0.9.8"; src = fetchPypi{ inherit pname version; - sha256 = "3ae14dc14859f7b4b92583ab0d40884ac07f26dbe00c7b747df2d50f4b1af098"; + sha256 = "7e7d62cedef9d1291b8e77abc463d50b3d685dfd953611d55a0414c12276aa78"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix index e493596cfa5..c1a6721bb80 100644 --- a/pkgs/development/python-modules/m2r/default.nix +++ b/pkgs/development/python-modules/m2r/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "m2r"; name = "${pname}-${version}"; - version = "0.1.12"; + version = "0.1.13"; src = fetchPypi { inherit pname version; - sha256 = "adfb86ebb7ff3fcd3ebb27ce8cd6f795c409a13f0c03363e265f17419ce5b9ab"; + sha256 = "b19e3703a3a897859f01ff6a068ee9a0eea8e8fdf75e896e00e88b3476a12f87"; }; propagatedBuildInputs = [ mistune docutils ]; diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index 6afe4cba00d..9d2d80747a9 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "magic-wormhole"; - version = "0.10.4"; + version = "0.10.5"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "cd3105975e71bc6437848c7fc9f0b23ef0e0c625c8b19ec66a5ddc727c6d11ae"; + sha256 = "9558ea1f3551e535deec3462cd5c8391cb32ebb12ecd8b40b36861dbee4917ee"; }; checkInputs = [ mock ]; diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix index 8e81f923b91..a5940ed6c9f 100644 --- a/pkgs/development/python-modules/natsort/default.nix +++ b/pkgs/development/python-modules/natsort/default.nix @@ -16,9 +16,8 @@ }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "natsort"; - version = "5.1.1"; + version = "5.2.0"; buildInputs = [ hypothesis @@ -36,11 +35,9 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "9ffbfb74bf3fc3905be1b9b052ed865675651e38fcd972ed1ed5c64a02f93cbd"; + sha256 = "c960082d2145b04723041c4b85092546560538e29664dd197a1344d5b090bc91"; }; - patches = lib.optional (isPy35 || isPy36) ./python-3.6.3-test-failures.patch; - # testing based on project's tox.ini checkPhase = '' pytest --doctest-modules natsort diff --git a/pkgs/development/python-modules/natsort/python-3.6.3-test-failures.patch b/pkgs/development/python-modules/natsort/python-3.6.3-test-failures.patch deleted file mode 100644 index b304a1d11e5..00000000000 --- a/pkgs/development/python-modules/natsort/python-3.6.3-test-failures.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/test_natsort/test_string_component_transform_factory.py b/test_natsort/test_string_component_transform_factory.py -index 6790e51..8db4efb 100644 ---- a/test_natsort/test_string_component_transform_factory.py -+++ b/test_natsort/test_string_component_transform_factory.py -@@ -24,6 +24,8 @@ from hypothesis.strategies import ( - ) - from compat.locale import bad_uni_chars - -+import pytest -+ - - # Each test has an "example" version for demonstrative purposes, - # and a test that uses the hypothesis module. -@@ -77,6 +79,7 @@ def test_string_component_transform_factory_with_LOCALE_returns_fast_int_and_gro - assert _string_component_transform_factory(ns.LOCALE)(x) == fast_int(x, key=get_strxfrm()) - - -+@pytest.mark.xfail - @given(text()) - def test_string_component_transform_factory_with_LOCALE_returns_fast_int_and_groupletters(x): - assume(x) -@@ -89,6 +92,7 @@ def test_string_component_transform_factory_with_LOCALE_and_GROUPLETTERS_returns - assert _string_component_transform_factory(ns.GROUPLETTERS | ns.LOCALE)(x) == fast_int(x, key=lambda x: get_strxfrm()(_groupletters(x))) - - -+@pytest.mark.xfail - @given(text()) - def test_string_component_transform_factory_with_LOCALE_and_GROUPLETTERS_returns_fast_int_and_groupletters_and_locale_convert(x): - assume(x) -@@ -104,6 +108,7 @@ def test_string_component_transform_factory_with_LOCALE_and_DUMB_returns_fast_in - assert _string_component_transform_factory(ns._DUMB | ns.LOCALE)(x) == fast_int(x, key=lambda x: get_strxfrm()(_groupletters(x))) - - -+@pytest.mark.xfail - @given(text()) - def test_string_component_transform_factory_with_LOCALE_and_DUMB_returns_fast_int_and_groupletters_and_locale_convert(x): - assume(x) diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 2d575d8742a..f32f417c391 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "numpy"; - version = "1.13.3"; + version = "1.14.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "36ee86d5adbabc4fa2643a073f93d5504bdfed37a149a3a49f4dde259f35a750"; + sha256 = "3de643935b212307b420248018323a44ec51987a336d1d747c1322afc3c099fb"; }; disabled = isPyPy; diff --git a/pkgs/development/python-modules/numpydoc/default.nix b/pkgs/development/python-modules/numpydoc/default.nix new file mode 100644 index 00000000000..3af324c8765 --- /dev/null +++ b/pkgs/development/python-modules/numpydoc/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, sphinx +, jinja2 +}: + +buildPythonPackage rec { + pname = "numpydoc"; + version = "0.7.0"; + + src = fetchPypi { + inherit pname; + inherit version; + sha256 = "2dc7b2c4e3914745e38e370946fa4c109817331e6d450806285c08bce5cd575a"; + }; + + checkInputs = [ nose ]; + propagatedBuildInputs = [ sphinx jinja2 ]; + + meta = { + description = "Sphinx extension to support docstrings in Numpy format"; + homepage = "https://github.com/numpy/numpydoc"; + license = lib.licenses.free; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix index ecb21404a08..362554b9bb8 100644 --- a/pkgs/development/python-modules/oauthenticator/default.nix +++ b/pkgs/development/python-modules/oauthenticator/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "oauthenticator"; - version = "0.7.2"; + version = "0.7.3"; src = fetchPypi { inherit pname version; - sha256 = "0rlg63ii7sxj1xad2nx6wk1xgv3a8dm0az0q9g2v6hdv9cnc4b55"; + sha256 = "cb0b2564e46db28350693bc3e6457333c4ee21af5066ac743730e3f3173ea7ed"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/packaging/default.nix b/pkgs/development/python-modules/packaging/default.nix index 4ba93bb57f2..f335bfa135f 100644 --- a/pkgs/development/python-modules/packaging/default.nix +++ b/pkgs/development/python-modules/packaging/default.nix @@ -4,7 +4,6 @@ buildPythonPackage rec { pname = "packaging"; version = "16.8"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; @@ -13,7 +12,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyparsing six ]; - buildInputs = [ pytest pretend ]; + checkInputs = [ pytest pretend ]; + + checkPhase = '' + py.test tests + ''; meta = with stdenv.lib; { description = "Core utilities for Python packages"; diff --git a/pkgs/development/python-modules/pafy/default.nix b/pkgs/development/python-modules/pafy/default.nix index 77ed1d6c4c0..a1b5c77b2d1 100644 --- a/pkgs/development/python-modules/pafy/default.nix +++ b/pkgs/development/python-modules/pafy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "pafy"; - version = "0.5.3.1"; + version = "0.5.4"; src = fetchPypi { inherit pname version; - sha256 = "1a7dxi95m1043rxx1r5x3ngb66nwlq6aqcasyqqjzmmmjps4zrim"; + sha256 = "e842dc589a339a870b5869cc3802f2e95824edf347f65128223cd5ebdff21024"; }; # No tests included in archive diff --git a/pkgs/development/python-modules/path.py/default.nix b/pkgs/development/python-modules/path.py/default.nix index 2830477d3cf..53754fd3dc2 100644 --- a/pkgs/development/python-modules/path.py/default.nix +++ b/pkgs/development/python-modules/path.py/default.nix @@ -5,20 +5,21 @@ , pytestrunner , pytest , glibcLocales +, packaging }: buildPythonPackage rec { pname = "path.py"; - version = "10.5"; + version = "11.0"; name = pname + "-" + version; src = fetchPypi { inherit pname version; - sha256 = "63a7af08676668fd51750f111affbd38c1a13c61aba15c6665b16681771c79a8"; + sha256 = "16134e5b287aba4a4125a6722e7837cf2a149fccc5000c500ae6c71a5525488b"; }; - checkInputs = [ pytest pytestrunner ]; - buildInputs = [setuptools_scm glibcLocales ]; + checkInputs = [ pytest pytestrunner glibcLocales packaging ]; + buildInputs = [ setuptools_scm ]; LC_ALL="en_US.UTF-8"; diff --git a/pkgs/development/python-modules/pendulum/default.nix b/pkgs/development/python-modules/pendulum/default.nix index aa8e2d22b43..12d5c82d511 100644 --- a/pkgs/development/python-modules/pendulum/default.nix +++ b/pkgs/development/python-modules/pendulum/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pendulum"; - version = "1.4.0"; + version = "1.4.1"; src = fetchPypi { inherit pname version; - sha256 = "e996c34fb101c9c6d88a839c19af74d7c067b92ed3371274efcf4d4b6dc160a6"; + sha256 = "3f16fb759e6126dd89d49886f8100caa72e5ab36563bc148b4f7eddfa0099c0f"; }; propagatedBuildInputs = [ dateutil pytzdata tzlocal ]; diff --git a/pkgs/development/python-modules/pexpect/default.nix b/pkgs/development/python-modules/pexpect/default.nix index da8d5db359b..b064b9037e9 100644 --- a/pkgs/development/python-modules/pexpect/default.nix +++ b/pkgs/development/python-modules/pexpect/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pexpect"; - version = "4.3.1"; + version = "4.4.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "8e287b171dbaf249d0b06b5f2e88cb7e694651d2d0b8c15bccb83170d3c55575"; + sha256 = "67b85a1565968e3d5b5e7c9283caddc90c3947a2625bed1905be27bd5a03e47d"; }; # Wants to run pythonin a subprocess diff --git a/pkgs/development/python-modules/plone-testing/default.nix b/pkgs/development/python-modules/plone-testing/default.nix index 910fc034e36..6f18a74f073 100644 --- a/pkgs/development/python-modules/plone-testing/default.nix +++ b/pkgs/development/python-modules/plone-testing/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "plone.testing"; - version = "5.1.1"; + version = "6.0.0"; src = fetchPypi { inherit pname version; - sha256 = "2ca558a910b93355b760535b233518be3a06c58e46160487bf802b6f7cb1e511"; + sha256 = "8aa7c45237b883ea1d1c28fb465322f69310b084b9f9b6a79af64401b649dc4c"; }; propagatedBuildInputs = [ setuptools zope_testing ]; diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index bddff8e95f4..a202ef8b85a 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "plotly"; - version = "2.3.0"; + version = "2.4.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "95e72273699108f215886ab961dbf0890904d39583be39eabcd0788bc7ccf695"; + sha256 = "8e7ee039231fec52b0b38d45e7470f70b117f6527b08cc922d74992f4d082858"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/plumbum/default.nix b/pkgs/development/python-modules/plumbum/default.nix index a5881bb2e7c..cd4a79104eb 100644 --- a/pkgs/development/python-modules/plumbum/default.nix +++ b/pkgs/development/python-modules/plumbum/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "plumbum"; - version = "1.6.5"; + version = "1.6.6"; name = "${pname}-${version}"; checkInputs = [ pytest ]; @@ -16,6 +16,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "d8abb059bb62beb6c99db08d3598167abaeeab53eaf218f91e74bae471a24bee"; + sha256 = "d179b90a9927f91427a28c1bac2864c61342cb43ef39aa7324c7c9a96bcc23eb"; }; } \ No newline at end of file diff --git a/pkgs/development/python-modules/prov/default.nix b/pkgs/development/python-modules/prov/default.nix index 9dac8677c33..8866382ea8f 100644 --- a/pkgs/development/python-modules/prov/default.nix +++ b/pkgs/development/python-modules/prov/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "prov"; - version = "1.5.1"; + version = "1.5.2"; src = fetchPypi { inherit pname version; - sha256 = "7a2d72b0df43cd9c6e374d815c8ce3cd5ca371d54f98f837853ac9fcc98aee4c"; + sha256 = "640dc158d931403bc6c1a0ad80702caae71f810bac21f90ec605865c8444b7bb"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/py_scrypt/default.nix b/pkgs/development/python-modules/py_scrypt/default.nix index bf6300b8411..1b1f758d941 100644 --- a/pkgs/development/python-modules/py_scrypt/default.nix +++ b/pkgs/development/python-modules/py_scrypt/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "scrypt"; - version = "0.8.0"; + version = "0.8.6"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0830r3q8f8mc4738ngcvwhv9kih5c6zf87mzkdifzf2h6kss99fl"; + sha256 = "f8239b2d47fa1d40bc27efd231dc7083695d10c1c2ac51a99380360741e0362d"; }; buildInputs = [ openssl ]; diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix index 51243154b1a..8ac066500a4 100644 --- a/pkgs/development/python-modules/pyglet/default.nix +++ b/pkgs/development/python-modules/pyglet/default.nix @@ -2,12 +2,12 @@ , mesa, xorg, freetype, fontconfig, future}: buildPythonPackage rec { - version = "1.3.0"; + version = "1.3.1"; pname = "pyglet"; src = fetchPypi { inherit pname version; - sha256 = "640a8f8e3d7bf8dbb551fa707f14021f619932990ab1401c48ba9dbcc6c2242c"; + sha256 = "0a73280fa3949ea4890fee28f625c10b1e10a7cda390a08b6bce4740948167cd"; }; postPatch = let diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix index 7cb5224c60b..51ec2a1f4cb 100644 --- a/pkgs/development/python-modules/pytest-mock/default.nix +++ b/pkgs/development/python-modules/pytest-mock/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-mock"; - version = "1.6.3"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "920d1167af5c2c2ad3fa0717d0c6c52e97e97810160c15721ac895cac53abb1c"; + sha256 = "8ed6c9ac6b7565b226b4da2da48876c9198d76401ec8d9c5e4c69b45423e33f8"; }; propagatedBuildInputs = [ pytest ] ++ lib.optional (!isPy3k) mock; diff --git a/pkgs/development/python-modules/pytestrunner/default.nix b/pkgs/development/python-modules/pytestrunner/default.nix index 67af195b68a..4f15adcd90e 100644 --- a/pkgs/development/python-modules/pytestrunner/default.nix +++ b/pkgs/development/python-modules/pytestrunner/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-runner"; - version = "3.0"; + version = "4.0"; src = fetchPypi { inherit pname version; - sha256 = "00v7pi09q60yx0l1kzyklnmr5bp597mir85a9gsi7bdfyly3lz0g"; + sha256 = "183f3745561b1e00ea51cd97634ba5c540848ab4aa8016a81faba7fb7f33ec76"; }; buildInputs = [ setuptools_scm pytest ]; diff --git a/pkgs/development/python-modules/python-magic/default.nix b/pkgs/development/python-modules/python-magic/default.nix index 56be2e3448a..d48a6288a7d 100644 --- a/pkgs/development/python-modules/python-magic/default.nix +++ b/pkgs/development/python-modules/python-magic/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-magic"; - version = "0.4.13"; + version = "0.4.15"; src = fetchPypi { inherit pname version; - sha256 = "128j9y30zih6cyjyjnxhghnvpjm8vw40a1q7pgmrp035yvkaqkk0"; + sha256 = "f3765c0f582d2dfc72c15f3b5a82aecfae9498bd29ca840d72f37d7bd38bfcd5"; }; postPatch = '' diff --git a/pkgs/development/python-modules/pythonix/default.nix b/pkgs/development/python-modules/pythonix/default.nix index dacc27c53a0..6248ed7bf66 100644 --- a/pkgs/development/python-modules/pythonix/default.nix +++ b/pkgs/development/python-modules/pythonix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ninja, meson, pkgconfig, gcc7, nixUnstable, isPy3k }: +{ stdenv, fetchFromGitHub, ninja, meson, pkgconfig, nixUnstable, isPy3k }: assert isPy3k; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1piblysypyr442a6najk4mdh87xc377i2fdbfw6fr569z60mnnnj"; }; - nativeBuildInputs = [ meson pkgconfig ninja gcc7 ]; + nativeBuildInputs = [ meson pkgconfig ninja ]; buildInputs = [ nixUnstable ]; diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index c6279f5e7c4..65de0838223 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "regex"; - version = "2018.01.10"; + version = "2018.02.08"; src = fetchPypi { inherit pname version; - sha256 = "139678fc013b75e486e580c39b4c52d085ed7362e400960f8be1711a414f16b5"; + sha256 = "2353c0e983c4029caf32016f1dddef623c3117ac282a818468c6d2f5d541698d"; }; meta = { diff --git a/pkgs/development/python-modules/ropper/default.nix b/pkgs/development/python-modules/ropper/default.nix index b35145872dd..82b809a1e91 100644 --- a/pkgs/development/python-modules/ropper/default.nix +++ b/pkgs/development/python-modules/ropper/default.nix @@ -8,11 +8,11 @@ buildPythonApplication rec { pname = "ropper"; - version = "1.11.3"; + version = "1.11.6"; src = fetchPypi { inherit pname version; - sha256 = "77d9b03083d0a098261a1d2856cd330ea3db520511a78472e421a00526aa220c"; + sha256 = "33777d0c3ddd9ca7bc48f53dbe2c4a222a567f1125c43b1c34fb1b360d0b19dc"; }; # XXX tests rely on user-writeable /dev/shm to obtain process locks and return PermissionError otherwise # workaround: sudo chmod 777 /dev/shm diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/pkgs/development/python-modules/s3transfer/default.nix index 3311af5e886..9b74b9c8ba3 100644 --- a/pkgs/development/python-modules/s3transfer/default.nix +++ b/pkgs/development/python-modules/s3transfer/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "s3transfer"; - version = "0.1.12"; + version = "0.1.13"; src = fetchPypi { inherit pname version; - sha256 = "07hjj1cy62sc3rh5lhna9mhylp7h7aak4v6mf6809q4nc8j1p28h"; + sha256 = "90dc18e028989c609146e241ea153250be451e05ecc0c2832565231dacdf59c1"; }; foo = 1; diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 6f3d0b3c117..2256bcc7310 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -27,10 +27,10 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "Sphinx"; - version = "1.6.6"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "c39a6fa41bd3ec6fc10064329a664ed3a3ca2e27640a823dc520c682e4433cdb"; + sha256 = "278b7923f3f4ed2a1d1359f0ae94d89ac90ddd4189e8362f4b4d3baa2afe6b4a"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 51856ec0da0..18540cb63f8 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "SQLAlchemy"; name = "${pname}-${version}"; - version = "1.2.2"; + version = "1.2.3"; src = fetchPypi { inherit pname version; - sha256 = "64b4720f0a8e033db0154d3824f5bf677cf2797e11d44743cf0aebd2a0499d9d"; + sha256 = "9e9ec143e2e246f385cfb2de8daa89d2fa466279addcb7be9e102988fdf33d24"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index dd7fdc173e5..0fa889b88f2 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.2"; + version = "1.2.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "18ac6392a710f0cc106c28c4e27e43e8f1b25cb46fb8b6714836212607c07b10"; + sha256 = "6256e0d5ab6d465152c8a8a21bdb97b50e155255d6bedd586ce214ed7a1fb9d7"; }; # No tests in archive diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 22c047fc54e..7e7aa4756bb 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "stripe"; - version = "1.77.1"; + version = "1.77.2"; name = "${pname}-${version}"; # Tests require network connectivity and there's no easy way to disable @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "d1c638b417301849ff4ee0327332cfdec96edda83c79b08af307339138077d59"; + sha256 = "3bcd55108dd2c0e853a91147ee843bc375f35767e64d0f7680e5bd82ddb7fbf1"; }; buildInputs = [ unittest2 mock ]; diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index cb4b63ade81..d283465b43c 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "trezor"; - version = "0.7.16"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "6bdb69fc125ba705854e21163be6c7da3aa17c2a3a84f40b6d8a3f6e4a8cb314"; + sha256 = "2dd01e11d669cb8f5e40fcf1748bcabc41fb5f41edb010fc807dc3088f9bd7de"; }; propagatedBuildInputs = [ protobuf hidapi requests mnemonic ]; diff --git a/pkgs/development/python-modules/voluptuous/default.nix b/pkgs/development/python-modules/voluptuous/default.nix index 00c13cba066..0d4f250509f 100644 --- a/pkgs/development/python-modules/voluptuous/default.nix +++ b/pkgs/development/python-modules/voluptuous/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "voluptuous"; - version = "0.10.5"; + version = "0.11.1"; src = fetchPypi { inherit pname version; - sha256 = "15i3gaap8ilhpbah1ffc6q415wkvliqxilc6s69a4rinvkw6cx3s"; + sha256 = "af7315c9fa99e0bfd195a21106c82c81619b42f0bd9b6e287b797c6b6b6a9918"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/webcolors/default.nix b/pkgs/development/python-modules/webcolors/default.nix index c23bffaf142..d530eda39d9 100644 --- a/pkgs/development/python-modules/webcolors/default.nix +++ b/pkgs/development/python-modules/webcolors/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "webcolors"; - version = "1.7"; + version = "1.8.1"; src = fetchPypi { inherit pname version; - sha256 = "e47e68644d41c0b1f1e4d939cfe4039bdf1ab31234df63c7a4f59d4766487206"; + sha256 = "030562f624467a9901f0b455fef05486a88cfb5daa1e356bd4aacea043850b59"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix index e455f233411..3228e928e19 100644 --- a/pkgs/development/python-modules/widgetsnbextension/default.nix +++ b/pkgs/development/python-modules/widgetsnbextension/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "widgetsnbextension"; name = "${pname}-${version}"; - version = "3.1.3"; + version = "3.1.4"; src = fetchPypi { inherit pname version; - sha256 = "02edabcaeaa247721df8027f660f3384c20f30c4865a7ea5dd80685c368736df"; + sha256 = "79f164a644620abbe351440a70468ac3a5b22b392afa4577c8d5f91577a2669b"; }; propagatedBuildInputs = [ notebook ]; diff --git a/pkgs/development/python-modules/yapf/default.nix b/pkgs/development/python-modules/yapf/default.nix index 05913ab61c5..d257db70445 100644 --- a/pkgs/development/python-modules/yapf/default.nix +++ b/pkgs/development/python-modules/yapf/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "yapf"; - version = "0.20.1"; + version = "0.20.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "bd19f246be7193ad2acdc04702b92315f1ae28d49c82f6671afdeefe9d32f468"; + sha256 = "7f5efdb7edf0318b91e53721d934580a77153e24a222f52f6e1c3b7629aead43"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/zodbpickle/default.nix b/pkgs/development/python-modules/zodbpickle/default.nix index 53dd8680c31..108f5395ece 100644 --- a/pkgs/development/python-modules/zodbpickle/default.nix +++ b/pkgs/development/python-modules/zodbpickle/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "zodbpickle"; - version = "0.7.0"; + version = "1.0"; name = "${pname}-${version}"; disabled = isPyPy; # https://github.com/zopefoundation/zodbpickle/issues/10 src = fetchPypi { inherit pname version; - sha256 = "95a247fb17bce980af8d548af70ac5bd1bad22773f242eb8efa24428efa909a8"; + sha256 = "3af9169fb1d5901cf6693ab356b0dfda20ad2cacc5673fad59b4449ed50d5399"; }; # fails.. diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix index 2ab0dbd1b5f..73c5b762318 100644 --- a/pkgs/development/tools/misc/openocd/default.nix +++ b/pkgs/development/tools/misc/openocd/default.nix @@ -25,6 +25,12 @@ stdenv.mkDerivation rec { "--enable-remote-bitbang" ]; + NIX_CFLAGS_COMPILE = [ + "-Wno-implicit-fallthrough" + "-Wno-format-truncation" + "-Wno-format-overflow" + ]; + postInstall = '' mkdir -p "$out/etc/udev/rules.d" rules="$out/share/openocd/contrib/60-openocd.rules" diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix index aa273ec613e..4e2d2b38841 100644 --- a/pkgs/os-specific/linux/ffado/default.nix +++ b/pkgs/os-specific/linux/ffado/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { name = "${prefix}ffado-${version}"; - version = "2.3.0"; + version = "2.4.0"; src = fetchurl { url = "http://www.ffado.org/files/libffado-${version}.tgz"; - sha256 = "122z8gya60nyg47i738z2yr4qcjyk2xix4kwhf5ybkmp23kcgqqq"; + sha256 = "14rprlcd0gpvg9kljh0zzjzd2rc9hbqqpjidshxxjvvfh4r00f4f"; }; nativeBuildInputs = [ scons pkgconfig which makeWrapper python ]; @@ -41,12 +41,8 @@ stdenv.mkDerivation rec { optXdg_utils libxmlxx glibmm ]; - patches = [ - ./gcc6.patch - ./glibc226.patch - ]; - postPatch = '' + sed '1iimport sys' -i SConstruct # SConstruct checks cpuinfo and an objdump of /bin/mount to determine the appropriate arch # Let's just skip this and tell it which to build sed '/def is_userspace_32bit(cpuinfo):/a\ diff --git a/pkgs/os-specific/linux/ffado/gcc6.patch b/pkgs/os-specific/linux/ffado/gcc6.patch deleted file mode 100644 index f9cad9c88ab..00000000000 --- a/pkgs/os-specific/linux/ffado/gcc6.patch +++ /dev/null @@ -1,19 +0,0 @@ -Author: Adrian Knoth <adi@drcomp.erfurt.thur.de> -Forwarded: Yes -Applied-Upstream: 2.3.1 -Last-Update: 2016-08-11 -Description: Fix FTBFS with gcc6 - -Index: b/src/ffadotypes.h -=================================================================== ---- a/src/ffadotypes.h -+++ b/src/ffadotypes.h -@@ -51,6 +51,8 @@ struct ffado_handle { - }; - - -+#include <cmath> -+#include <algorithm> - #include <vector> - #include <string> - diff --git a/pkgs/os-specific/linux/ffado/glibc226.patch b/pkgs/os-specific/linux/ffado/glibc226.patch deleted file mode 100644 index e147ee9aa76..00000000000 --- a/pkgs/os-specific/linux/ffado/glibc226.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- libffado/src/libutil/PosixMessageQueue.cpp (revision 2705) -+++ libffado/src/libutil/PosixMessageQueue.cpp (revision 2706) -@@ -30,6 +30,7 @@ - #include <errno.h> - #include <string.h> - #include <poll.h> -+#include <signal.h> - - #define MQ_INVALID_ID ((mqd_t) -1) - // one second diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index b95013ab26d..8107f7d9657 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -55,12 +55,7 @@ let }; in { - linuxHeaders_4_4 = common { - version = "4.4.10"; - sha256 = "1kpjvvd9q9wwr3314q5ymvxii4dv2d27295bzly225wlc552xhja"; - }; - - linuxHeaders_4_15 = common { + linuxHeaders = common { version = "4.15"; sha256 = "0sd7l9n9h7vf9c6gd6ciji28hawda60yj0llh17my06m0s4lf9js"; }; diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 8aa813cb195..f69865cdc4d 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -4,15 +4,10 @@ , utillinux , writeTextFile, ubootTools , callPackage -, overrideCC, gcc7 }: { stdenv, buildPackages, perl, buildLinux -, # Allow really overriding even our gcc7 default. - # We want gcc >= 7.3 to enable the "retpoline" mitigation of security problems. - stdenvNoOverride ? overrideCC stdenv buildPackages.gcc7 - , # The kernel source tarball. src @@ -37,14 +32,12 @@ # optionally be compressed with gzip or bzip2. kernelPatches ? [] , ignoreConfigErrors ? hostPlatform.platform.name != "pc" || - hostPlatform != stdenvNoOverride.buildPlatform + hostPlatform != stdenv.buildPlatform , extraMeta ? {} , hostPlatform , ... } @ args: -let stdenv = stdenvNoOverride; in # finish the rename - assert stdenv.isLinux; let diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix index 0417bf59cfa..f7f393afb39 100644 --- a/pkgs/os-specific/linux/libsepol/default.nix +++ b/pkgs/os-specific/linux/libsepol/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { makeFlagsArray+=("DESTDIR=$out") ''; + NIX_CFLAGS_COMPILE = [ "-Wno-error=implicit-fallthrough" ]; + passthru = { inherit se_release se_url; }; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/reptyr/default.nix b/pkgs/os-specific/linux/reptyr/default.nix index 779337e85f8..4b83e478dd1 100644 --- a/pkgs/os-specific/linux/reptyr/default.nix +++ b/pkgs/os-specific/linux/reptyr/default.nix @@ -13,6 +13,9 @@ stdenv.mkDerivation rec { sed 1i'#include <sys/sysmacros.h>' -i platform/linux/linux.c ''; + # Needed with GCC 7 + NIX_CFLAGS_COMPILE = "-Wno-error=format-truncation"; + makeFlags = ["PREFIX=$(out)"]; meta = { platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index edc3539b0bd..cb9424ad5cf 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -28,6 +28,13 @@ let sha256 = "14zbnbn53yvrpv79ch6n02myq9b4winjkaykzi356sfqb7f3d16g"; }; }); + voluptuous = super.voluptuous.overridePythonAttrs (oldAttrs: rec { + version = "0.10.5"; + src = oldAttrs.src.override { + inherit version; + sha256 = "15i3gaap8ilhpbah1ffc6q415wkvliqxilc6s69a4rinvkw6cx3s"; + }; + }); hass-frontend = super.callPackage ./frontend.nix { }; }; }; diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index e4a77af199b..d7a4781448a 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -866,7 +866,7 @@ unpackPhase() { # necessary when sources have been copied from other store # locations. if [ "${dontMakeSourcesWritable:-0}" != 1 ]; then - chmod -R u+w "$sourceRoot" + chmod -R u+w -- "$sourceRoot" fi runHook postUnpack diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 249f788c17a..703800deb2a 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -248,9 +248,9 @@ in gmp = super.gmp.override { stdenv = self.makeStaticLibraries self.stdenv; }; mpfr = super.mpfr.override { stdenv = self.makeStaticLibraries self.stdenv; }; libmpc = super.libmpc.override { stdenv = self.makeStaticLibraries self.stdenv; }; - isl_0_14 = super.isl_0_14.override { stdenv = self.makeStaticLibraries self.stdenv; }; + isl_0_17 = super.isl_0_17.override { stdenv = self.makeStaticLibraries self.stdenv; }; gcc-unwrapped = super.gcc-unwrapped.override { - isl = isl_0_14; + isl = isl_0_17; }; }; extraNativeBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++ diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 71347ef8392..8033d47d5db 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -5,7 +5,6 @@ let pkgs = import ../../.. { inherit localSystem crossSystem; }; libc = pkgs.stdenv.cc.libc; - isl = with pkgs; if targetPlatform.isRiscV then isl_0_17 else isl_0_14; in with pkgs; rec { @@ -144,7 +143,7 @@ in with pkgs; rec { # These needed for cross but not native tools because the stdenv # GCC has certain things built in statically. See # pkgs/stdenv/linux/default.nix for the details. - cp -d ${isl.out}/lib/libisl*.so* $out/lib + cp -d ${isl_0_17.out}/lib/libisl*.so* $out/lib '' + '' cp -d ${bzip2.out}/lib/libbz2.so* $out/lib diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index ef5afb91766..4c6a91ec321 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -26,12 +26,12 @@ let in buildPythonPackage rec { pname = "awscli"; - version = "1.14.32"; + version = "1.14.41"; namePrefix = ""; src = fetchPypi { inherit pname version; - sha256 = "09i82nf43pv5v598wvbj4nk1bfc64wp7xzlx5ykaca5m40lkarz0"; + sha256 = "8cf2a52d56f26e22e2fbd7b72649ef1d3de8930df7a730d7f27418d129bb3a6a"; }; # No tests included diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix index e7a593ff830..1812e95dcbb 100644 --- a/pkgs/tools/networking/dhcp/default.nix +++ b/pkgs/tools/networking/dhcp/default.nix @@ -37,6 +37,8 @@ stdenv.mkDerivation rec { "--localstatedir=/var" ] ++ stdenv.lib.optionals (openldap != null) [ "--with-ldap" "--with-ldapcrypto" ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=pointer-compare" ]; + installFlags = [ "DESTDIR=\${out}" ]; postInstall = diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/tools/networking/ntopng/default.nix index d1a90d9d1aa..b307a8f6f13 100644 --- a/pkgs/tools/networking/ntopng/default.nix +++ b/pkgs/tools/networking/ntopng/default.nix @@ -53,6 +53,8 @@ stdenv.mkDerivation rec { sed 's|LIBS += -lstdc++.6||' -i Makefile ''; + NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; + meta = with stdenv.lib; { description = "High-speed web-based traffic analysis and flow collection tool"; homepage = http://www.ntop.org/products/ntop/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e48f097a13..0f42ad3f9e6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5792,12 +5792,8 @@ with pkgs; gambit = callPackage ../development/compilers/gambit { }; gerbil = callPackage ../development/compilers/gerbil { }; - # !!! When updating to gcc7 everywhere we can get rid of the - # isRiscV overrides here and in gccCrossStageStatic - gccFun6 = callPackage ../development/compilers/gcc/6; - gccFun7 = callPackage ../development/compilers/gcc/7; - gccFun = if targetPlatform.isRiscV then gccFun7 else gccFun6; - gcc = if targetPlatform.isRiscV then gcc7 else gcc6; + gccFun = callPackage ../development/compilers/gcc/7; + gcc = gcc7; gcc-unwrapped = gcc.cc; gccStdenv = if stdenv.cc.isGNU then stdenv else stdenv.override { @@ -5877,7 +5873,6 @@ with pkgs; bintools = binutils-unwrapped; libc = libcCross1; }; - isl = if targetPlatform.isRiscV then isl_0_17 else isl_0_14; in wrapCCWith { name = "gcc-cross-wrapper"; cc = gccFun { @@ -5885,7 +5880,7 @@ with pkgs; inherit noSysDirs; # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); - isl = if !stdenv.isDarwin then isl else null; + isl = if !stdenv.isDarwin then isl_0_17 else null; # just for stage static crossStageStatic = true; @@ -5990,7 +5985,7 @@ with pkgs; isl = isl_0_17; })); - gfortran = gfortran6; + gfortran = gfortran7; gfortran48 = wrapCC (gcc48.cc.override { name = "gfortran"; @@ -6453,6 +6448,8 @@ with pkgs; }; libxml2 = libxml2.override { pythonSupport = false; }; python2 = callPackage ../development/interpreters/python/cpython/2.7/boot.nix { inherit (darwin) CF configd; }; + } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' }); manticore = callPackage ../development/compilers/manticore { }; @@ -6574,7 +6571,10 @@ with pkgs; }; # For beta and nightly releases use the nixpkgs-mozilla overlay - rust = callPackage ../development/compilers/rust { }; + rust = callPackage ../development/compilers/rust + (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' + }); inherit (rust) cargo rustc; buildRustCrate = callPackage ../build-support/rust/build-rust-crate.nix { }; @@ -7082,12 +7082,7 @@ with pkgs; pyrex096 = callPackage ../development/interpreters/pyrex/0.9.6.nix { }; - racket = callPackage ../development/interpreters/racket { - # racket 6.11 doesn't build with gcc6 + recent glibc: - # https://github.com/racket/racket/pull/1886 - # https://github.com/NixOS/nixpkgs/pull/31017#issuecomment-343574769 - stdenv = overrideCC stdenv gcc7; - }; + racket = callPackage ../development/interpreters/racket { }; rakudo = callPackage ../development/interpreters/rakudo { inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; @@ -8828,7 +8823,9 @@ with pkgs; glibc32 = pkgsi686Linux.glibc; }; - glm = callPackage ../development/libraries/glm { }; + glm = callPackage ../development/libraries/glm + (lib.optionalAttrs stdenv.cc.isGNU { stdenv = overrideCC stdenv gcc6;/*maybe a hack*/ }); + glm_0954 = callPackage ../development/libraries/glm/0954.nix { }; globalplatform = callPackage ../development/libraries/globalplatform { }; @@ -9169,8 +9166,14 @@ with pkgs; hyena = callPackage ../development/libraries/hyena { }; - icu58 = callPackage ../development/libraries/icu/58.nix { }; - icu59 = callPackage ../development/libraries/icu/59.nix { }; + icu58 = callPackage ../development/libraries/icu/58.nix + (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' + }); + icu59 = callPackage ../development/libraries/icu/59.nix + (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' + }); icu = icu59; @@ -10436,8 +10439,12 @@ with pkgs; notify-sharp = callPackage ../development/libraries/notify-sharp { }; - ncurses5 = callPackage ../development/libraries/ncurses { abiVersion = "5"; }; - ncurses6 = callPackage ../development/libraries/ncurses { abiVersion = "6"; }; + ncurses5 = callPackage ../development/libraries/ncurses { + abiVersion = "5"; + }; + ncurses6 = callPackage ../development/libraries/ncurses { + abiVersion = "6"; + }; ncurses = ncurses6; neardal = callPackage ../development/libraries/neardal { }; @@ -11520,6 +11527,7 @@ with pkgs; webkitgtk218x = callPackage ../development/libraries/webkitgtk/2.18.nix { harfbuzz = harfbuzz-icu; inherit (gst_all_1) gst-plugins-base gst-plugins-bad; + stdenv = overrideCC stdenv gcc6; }; webkitgtk24x-gtk2 = webkitgtk24x-gtk3.override { @@ -12975,8 +12983,7 @@ with pkgs; lkl = callPackage ../applications/virtualization/lkl { }; inherit (callPackages ../os-specific/linux/kernel-headers { }) - linuxHeaders_4_4 linuxHeaders_4_15; - linuxHeaders = if hostPlatform.isMusl || hostPlatform.isRiscV then linuxHeaders_4_15 else linuxHeaders_4_4; + linuxHeaders; kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { }; @@ -14594,6 +14601,7 @@ with pkgs; blender = callPackage ../applications/misc/blender { cudaSupport = config.cudaSupport or false; python = python35; + stdenv = overrideCC stdenv gcc6; }; bluefish = callPackage ../applications/editors/bluefish { @@ -16004,6 +16012,7 @@ with pkgs; k3d = callPackage ../applications/graphics/k3d { inherit (pkgs.gnome2) gtkglext; + stdenv = overrideCC stdenv gcc6; }; k9copy = libsForQt5.callPackage ../applications/video/k9copy {}; @@ -16715,7 +16724,9 @@ with pkgs; openfx = callPackage ../development/libraries/openfx {}; - openimageio = callPackage ../applications/graphics/openimageio { }; + openimageio = callPackage ../applications/graphics/openimageio { + stdenv = overrideCC stdenv gcc6; + }; openjump = callPackage ../applications/misc/openjump { }; @@ -18389,7 +18400,9 @@ with pkgs; armagetronad = callPackage ../games/armagetronad { }; - arx-libertatis = callPackage ../games/arx-libertatis { }; + arx-libertatis = callPackage ../games/arx-libertatis { + stdenv = overrideCC stdenv gcc6; + }; asc = callPackage ../games/asc { lua = lua5_1; @@ -18741,9 +18754,7 @@ with pkgs; openmw = callPackage ../games/openmw { }; - openmw-tes3mp = libsForQt5.callPackage ../games/openmw/tes3mp.nix { - stdenv = overrideCC stdenv gcc7; - }; + openmw-tes3mp = libsForQt5.callPackage ../games/openmw/tes3mp.nix { }; openra = callPackage ../games/openra { lua = lua5_1; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0eebd578c3a..8efafc260c4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11430,25 +11430,7 @@ in { blas = pkgs.openblasCompat; }; - numpydoc = buildPythonPackage rec { - pname = "numpydoc"; - name = "${pname}-${version}"; - version = "0.6.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "1ec573e91f6d868a9940d90a6599f3e834a2d6c064030fbe078d922ee21dcfa1"; - }; - - buildInputs = [ self.nose ]; - propagatedBuildInputs = [ self.sphinx self.matplotlib ]; - - meta = { - description = "Sphinx extension to support docstrings in Numpy format"; - homepage = "https://github.com/numpy/numpydoc"; - license = licenses.free; - }; - }; + numpydoc = callPackage ../development/python-modules/numpydoc { }; numpy-stl = callPackage ../development/python-modules/numpy-stl { }; |