diff options
Diffstat (limited to 'pkgs')
219 files changed, 1197 insertions, 603 deletions
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index c062db9e254..0822e65c7c0 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -141,6 +141,7 @@ let kruler = callPackage ./kruler.nix {}; ksystemlog = callPackage ./ksystemlog.nix {}; ktnef = callPackage ./ktnef.nix {}; + ktouch = callPackage ./ktouch.nix {}; kwalletmanager = callPackage ./kwalletmanager.nix {}; libgravatar = callPackage ./libgravatar.nix {}; libkcddb = callPackage ./libkcddb.nix {}; diff --git a/pkgs/applications/kde/ktouch.nix b/pkgs/applications/kde/ktouch.nix new file mode 100644 index 00000000000..75e72c0ba18 --- /dev/null +++ b/pkgs/applications/kde/ktouch.nix @@ -0,0 +1,26 @@ +{ mkDerivation, lib +, extra-cmake-modules, kdoctools +, kconfig, kconfigwidgets, kcoreaddons, kdeclarative, ki18n +, kitemviews, kcmutils, kio, knewstuff, ktexteditor, kwidgetsaddons +, kwindowsystem, kxmlgui, qtscript, qtdeclarative, kqtquickcharts +, qtx11extras, qtgraphicaleffects, xorg +}: + + + mkDerivation { + name = "ktouch"; + meta = { + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.schmittlauch ]; + description = "A touch typing tutor from the KDE software collection"; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools qtdeclarative ]; + buildInputs = [ + kconfig kconfigwidgets kcoreaddons kdeclarative ki18n + kitemviews kcmutils kio knewstuff ktexteditor kwidgetsaddons + kwindowsystem kxmlgui qtscript qtdeclarative kqtquickcharts + qtx11extras qtgraphicaleffects xorg.libxkbfile xorg.libxcb + ]; + + enableParallelBuilding = true; +} diff --git a/pkgs/applications/misc/digitalbitbox/default.nix b/pkgs/applications/misc/digitalbitbox/default.nix index 939e2e9fc16..0272cfd52c0 100644 --- a/pkgs/applications/misc/digitalbitbox/default.nix +++ b/pkgs/applications/misc/digitalbitbox/default.nix @@ -68,8 +68,6 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - # TODO: remove libcap when pruneLibtoolFiles applies to pulseaudio. - libcap libevent libtool udev diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index f52215fa4a2..c47a8c2b2a6 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -7,16 +7,14 @@ , speechd, brltty, setproctitle, gst_all_1, gst-python }: -let +buildPythonApplication rec { pname = "orca"; version = "3.30.1"; -in buildPythonApplication rec { - name = "${pname}-${version}"; format = "other"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1b9s69frjmghjm1p9a4rrvknl9m0qlwr7mr4lsxkvjnblhsnw0g7"; }; diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index a9c828a3fb1..f05ec7efa21 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -10,11 +10,11 @@ let in stdenv.mkDerivation rec { pname = "msmtp"; name = "${pname}-${version}"; - version = "1.8.1"; + version = "1.8.2"; src = fetchurl { url = "https://marlam.de/msmtp/releases/${name}.tar.xz"; - sha256 = "1nm4vizrnrrnknc4mc8nr7grz9q76m1vraa0hsl5rfm34gnsg8ph"; + sha256 = "14w7lmw1jxlganfk089b0ib23y5917mxbg3xqpid007dd4cmq66i"; }; patches = [ diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 620ea530fc5..4122af898de 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -177,7 +177,7 @@ stdenv.mkDerivation { /**/ if targetPlatform.isAarch64 then endianPrefix + "aarch64" else if targetPlatform.isAarch32 then endianPrefix + "arm" else if targetPlatform.isx86_64 then "x86-64" - else if targetPlatform.isx86 then "i386" + else if targetPlatform.isx86_32 then "i386" else if targetPlatform.isMips then { "mips" = "btsmipn32"; # n32 variant "mipsel" = "ltsmipn32"; # n32 variant diff --git a/pkgs/build-support/setup-hooks/prune-libtool-files.sh b/pkgs/build-support/setup-hooks/prune-libtool-files.sh index d75812e05b6..5d7432e8f09 100644 --- a/pkgs/build-support/setup-hooks/prune-libtool-files.sh +++ b/pkgs/build-support/setup-hooks/prune-libtool-files.sh @@ -8,7 +8,7 @@ fixupOutputHooks+=(_pruneLibtoolFiles) _pruneLibtoolFiles() { - if [ "$dontPruneLibtoolFiles" ]; then + if [ "$dontPruneLibtoolFiles" ] || [ ! -e "$prefix" ]; then return fi @@ -16,7 +16,7 @@ _pruneLibtoolFiles() { # the "old_library" field for static libraries. We are processing only # those .la files that do not describe static libraries. find "$prefix" -type f -name '*.la' \ - -exec grep -q '^# Generated by libtool' {} \; \ + -exec grep -q '^# Generated by .*libtool' {} \; \ -exec grep -q "^old_library=''" {} \; \ -exec sed -i {} -e "/^dependency_libs='[^']/ c dependency_libs='' #pruned" \; } diff --git a/pkgs/data/misc/dns-root-data/default.nix b/pkgs/data/misc/dns-root-data/default.nix index e94b8eb898c..ee08c07f5a6 100644 --- a/pkgs/data/misc/dns-root-data/default.nix +++ b/pkgs/data/misc/dns-root-data/default.nix @@ -19,7 +19,7 @@ let in stdenv.mkDerivation { - name = "dns-root-data-2017-10-24"; + name = "dns-root-data-2019-01-11"; buildCommand = '' mkdir $out diff --git a/pkgs/data/misc/dns-root-data/root.ds b/pkgs/data/misc/dns-root-data/root.ds index 7578e0405d9..e292b5a7bf0 100644 --- a/pkgs/data/misc/dns-root-data/root.ds +++ b/pkgs/data/misc/dns-root-data/root.ds @@ -1,2 +1 @@ -. IN DS 19036 8 2 49AAC11D7B6F6446702E54A1607371607A1A41855200FD2CE1CDDE32F24E8FB5 . IN DS 20326 8 2 E06D44B80B8F1D39A95C0B0D7C65D08458E880409BBC683457104237C7F8EC8D diff --git a/pkgs/data/misc/dns-root-data/root.key b/pkgs/data/misc/dns-root-data/root.key index c0da7b3f60f..edfc762ad60 100644 --- a/pkgs/data/misc/dns-root-data/root.key +++ b/pkgs/data/misc/dns-root-data/root.key @@ -1,2 +1 @@ -. 172800 IN DNSKEY 257 3 8 AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjFFVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoXbfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaDX6RS6CXpoY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3LQpzW5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relSQageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulqQxA+Uk1ihz0= ;{id = 19036 (ksk), size = 2048b} . 172800 IN DNSKEY 257 3 8 AwEAAaz/tAm8yTn4Mfeh5eyI96WSVexTBAvkMgJzkKTOiW1vkIbzxeF3+/4RgWOq7HrxRixHlFlExOLAJr5emLvN7SWXgnLh4+B5xQlNVz8Og8kvArMtNROxVQuCaSnIDdD5LKyWbRd2n9WGe2R8PzgCmr3EgVLrjyBxWezF0jLHwVN8efS3rCj/EWgvIWgb9tarpVUDK/b58Da+sqqls3eNbuv7pr+eoZG+SrDK6nWeL3c6H5Apxz7LjVc1uTIdsIXxuOLYA4/ilBmSVIzuDWfdRUfhHdY6+cn8HFRm+2hM8AnXGXws9555KrUB5qihylGa8subX2Nn6UwNR1AkUTV74bU= ;{id = 20326 (ksk), size = 2048b} diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 6467cfc801d..b36529ecb3c 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -312,7 +312,7 @@ stdenv.mkDerivation ({ optional (!bootstrap) "--disable-bootstrap" ++ # Platform-specific flags - optional (targetPlatform == hostPlatform && targetPlatform.isi686) "--with-arch=i686" ++ + optional (targetPlatform == hostPlatform && targetPlatform.isx86_32) "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}" ++ optionals hostPlatform.isSunOS [ "--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit" # On Illumos/Solaris GNU as is preferred diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 1676668d911..ee00a3aee1e 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -325,7 +325,7 @@ stdenv.mkDerivation ({ optional (!bootstrap) "--disable-bootstrap" ++ # Platform-specific flags - optional (targetPlatform == hostPlatform && targetPlatform.isi686) "--with-arch=i686" ++ + optional (targetPlatform == hostPlatform && targetPlatform.isx86_32) "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}" ++ optionals hostPlatform.isSunOS [ "--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit" # On Illumos/Solaris GNU as is preferred diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index 6049cdcb6e8..15f95ef205e 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -324,7 +324,7 @@ stdenv.mkDerivation ({ optional (!bootstrap) "--disable-bootstrap" ++ # Platform-specific flags - optional (targetPlatform == hostPlatform && targetPlatform.isi686) "--with-arch=i686" ++ + optional (targetPlatform == hostPlatform && targetPlatform.isx86_32) "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}" ++ optionals hostPlatform.isSunOS [ "--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit" # On Illumos/Solaris GNU as is preferred diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index a467527c613..adaf4e36ce9 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -326,7 +326,7 @@ stdenv.mkDerivation ({ optional (!bootstrap) "--disable-bootstrap" ++ # Platform-specific flags - optional (targetPlatform == hostPlatform && targetPlatform.isi686) "--with-arch=i686" ++ + optional (targetPlatform == hostPlatform && targetPlatform.isx86_32) "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}" ++ optionals hostPlatform.isSunOS [ "--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit" # On Illumos/Solaris GNU as is preferred diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 41af804e551..956f357f84c 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -289,7 +289,7 @@ stdenv.mkDerivation ({ optional (!bootstrap) "--disable-bootstrap" ++ # Platform-specific flags - optional (targetPlatform == hostPlatform && targetPlatform.isi686) "--with-arch=i686" ++ + optional (targetPlatform == hostPlatform && targetPlatform.isx86_32) "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}" ++ optionals hostPlatform.isSunOS [ "--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit" # On Illumos/Solaris GNU as is preferred diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index 80d57c9d538..66b98cc6d64 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -277,7 +277,7 @@ stdenv.mkDerivation ({ optional (!bootstrap) "--disable-bootstrap" ++ # Platform-specific flags - optional (targetPlatform == hostPlatform && targetPlatform.isi686) "--with-arch=i686" ++ + optional (targetPlatform == hostPlatform && targetPlatform.isx86_32) "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}" ++ optionals hostPlatform.isSunOS [ "--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit" # On Illumos/Solaris GNU as is preferred diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix index 54617a07573..f16f3f72137 100644 --- a/pkgs/development/compilers/llvm/6/llvm.nix +++ b/pkgs/development/compilers/llvm/6/llvm.nix @@ -13,9 +13,10 @@ , fetchpatch , debugVersion ? false , enableManpages ? false -# Mesa requires AMDGPU target -, enableTargets ? [ stdenv.hostPlatform stdenv.targetPlatform "AMDGPU" ] , enableSharedLibraries ? true +# Mesa requires AMDGPU target +# BPF is used by bcc +, enableTargets ? [ stdenv.hostPlatform stdenv.targetPlatform "AMDGPU" "BPF" ] }: let @@ -27,10 +28,6 @@ let shortVersion = with stdenv.lib; concatStringsSep "." (take 2 (splitString "." release_version)); - inherit - (import ../common.nix { inherit (stdenv) lib; }) - llvmBackendList; - in stdenv.mkDerivation (rec { name = "llvm-${version}"; @@ -51,11 +48,16 @@ in stdenv.mkDerivation (rec { propagatedBuildInputs = [ ncurses zlib ]; patches = [ - # fixes tests, included in llvm_7 + # Patches to fix tests, included in llvm_7 (fetchpatch { url = "https://github.com/llvm-mirror/llvm/commit/737553be0c9c25c497b45a241689994f177d5a5d.patch"; sha256 = "0hnaxnkx7zy5yg98f1ggv8a9l0r6g19n6ygqsv26masrnlcbccli"; }) + (fetchpatch { + url = "https://github.com/llvm-mirror/llvm/commit/1c0dd31a7837c3e2f1c4ac14e4d5ac640688bd1f.patch"; + includes = [ "test/tools/gold/X86/common.ll" ]; + sha256 = "0fxgrxmfnjx17w3lcq19rk68b2xksh1bynz3ina784kma7hp4wdb"; + }) ]; postPatch = optionalString stdenv.isDarwin '' @@ -93,7 +95,6 @@ in stdenv.mkDerivation (rec { "-DLLVM_ENABLE_RTTI=ON" "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" - "-DLLVM_TARGETS_TO_BUILD=${llvmBackendList enableTargets}" "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly" "-DLLVM_ENABLE_DUMP=ON" ] ++ optionals enableSharedLibraries [ diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix index bff89812cae..0eb946a0a83 100644 --- a/pkgs/development/compilers/llvm/7/llvm.nix +++ b/pkgs/development/compilers/llvm/7/llvm.nix @@ -1,5 +1,6 @@ { stdenv , fetch +, fetchpatch , cmake , python , libffi @@ -14,8 +15,6 @@ , debugVersion ? false , enableManpages ? false , enableSharedLibraries ? true -# Mesa requires AMDGPU target -, enableTargets ? [ stdenv.hostPlatform stdenv.targetPlatform "AMDGPU" ] , enablePFM ? !stdenv.isDarwin }: @@ -28,9 +27,6 @@ let shortVersion = with stdenv.lib; concatStringsSep "." (take 1 (splitString "." release_version)); - inherit - (import ../common.nix { inherit (stdenv) lib; }) - llvmBackendList; in stdenv.mkDerivation (rec { name = "llvm-${version}"; @@ -51,6 +47,14 @@ in stdenv.mkDerivation (rec { propagatedBuildInputs = [ ncurses zlib ]; + patches = [ + # https://bugs.llvm.org/show_bug.cgi?id=39427 + (fetchpatch { + url = "https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/raw/5a7d283d4e00bc4822c7b0226e593c344c8f6050/debian/patches/pr39427-misscompile.diff"; + sha256 = "03mpydsaw0xvcp7kb4sgjzcl5v22620r5z78kv3mz5wp7sn76fg5"; + }) + ]; + postPatch = optionalString stdenv.isDarwin '' substituteInPlace cmake/modules/AddLLVM.cmake \ --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ @@ -88,7 +92,6 @@ in stdenv.mkDerivation (rec { "-DLLVM_ENABLE_RTTI=ON" "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" - "-DLLVM_TARGETS_TO_BUILD=${llvmBackendList enableTargets}" "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly" "-DLLVM_ENABLE_DUMP=ON" ] ++ optionals enableSharedLibraries [ @@ -134,7 +137,7 @@ in stdenv.mkDerivation (rec { ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib ''; - doCheck = stdenv.isLinux && (!stdenv.isi686); + doCheck = stdenv.isLinux && (!stdenv.isx86_32); checkTarget = "check-all"; diff --git a/pkgs/development/compilers/llvm/common.nix b/pkgs/development/compilers/llvm/common.nix deleted file mode 100644 index 27f48ff3f11..00000000000 --- a/pkgs/development/compilers/llvm/common.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib }: - -rec { - llvmBackend = platform: - if builtins.typeOf platform == "string" then - platform - else if platform.parsed.cpu.family == "x86" then - "X86" - else if platform.parsed.cpu.name == "aarch64" then - "AArch64" - else if platform.parsed.cpu.family == "arm" then - "ARM" - else if platform.parsed.cpu.family == "mips" then - "Mips" - else - throw "Unsupported system"; - - llvmBackendList = platforms: - lib.concatStringsSep ";" (map llvmBackend platforms); -} diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index f945a658109..5f21399229a 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -1,11 +1,46 @@ -{ stdenv, lib, fetchurl, pkgconfig, flex, bison, libxslt, autoconf, automake, graphviz -, glib, libiconv, libintl, libtool, expat +{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, flex, bison, libxslt, autoconf, automake, autoreconfHook +, graphviz, glib, libiconv, libintl, libtool, expat }: let - generic = { major, minor, sha256, extraNativeBuildInputs ? [], extraBuildInputs ? [] }: + generic = lib.makeOverridable ({ + major, minor, sha256, + extraNativeBuildInputs ? [], + extraBuildInputs ? [], + withGraphviz ? false + }: let atLeast = lib.versionAtLeast "${major}.${minor}"; + + # Patches from the openembedded-core project to build vala without graphviz + # support. We need to apply an additional patch to allow building when the + # header file isn't available at all, but that patch (./gvc-compat.patch) + # can be shared between all versions of Vala so far. + graphvizPatch = + let + fp = { commit, sha256 }: fetchpatch { + url = "https://github.com/openembedded/openembedded-core/raw/${commit}/meta/recipes-devtools/vala/vala/disable-graphviz.patch"; + inherit sha256; + }; + + in { + "0.38" = fp { + commit = "2c290f7253bba5ceb0d32e7d0b0ec0d0e81cc263"; + sha256 = "056ybapfx18d7xw1k8k85nsjrc26qk2q2d9v9nz2zrcwbq5brhkp"; + }; + + # NOTE: the openembedded-core project doesn't have a patch for 0.40.12 + # or 0.42.4 just yet; we've fixed the single merge conflict in the + # patches below and checked them in here. + # 0.40.12: https://github.com/openembedded/openembedded-core/raw/8553c52f174af4c8c433c543f806f5ed5c1ec48c/meta/recipes-devtools/vala/vala/disable-graphviz.patch + # 0.42.4: https://github.com/openembedded/openembedded-core/raw/dfbbff39cfd413510abbd60930232a9c6b35d765/meta/recipes-devtools/vala/vala/disable-graphviz.patch + "0.40" = ./disable-graphviz-0.40.12.patch; + "0.42" = ./disable-graphviz-0.42.4.patch; + + }.${major} or (throw "no graphviz patch for this version of vala"); + + disableGraphviz = atLeast "0.38" && !withGraphviz; + in stdenv.mkDerivation rec { name = "vala-${version}"; version = "${major}.${minor}"; @@ -19,16 +54,24 @@ let patchShebangs tests ''; + # If we're disabling graphviz, apply the patches and corresponding + # configure flag. We also need to override the path to the valac compiler + # so that it can be used to regenerate documentation. + patches = lib.optionals disableGraphviz [ graphvizPatch ./gvc-compat.patch ]; + configureFlags = lib.optional disableGraphviz "--disable-graphviz"; + preBuild = lib.optional disableGraphviz "buildFlagsArray+=(\"VALAC=$(pwd)/compiler/valac\")"; + outputs = [ "out" "devdoc" ]; nativeBuildInputs = [ pkgconfig flex bison libxslt ] ++ lib.optional (stdenv.isDarwin && (atLeast "0.38")) expat + ++ lib.optional disableGraphviz autoreconfHook # if we changed our ./configure script, need to reconfigure ++ extraNativeBuildInputs; buildInputs = [ glib libiconv libintl - ] ++ lib.optional (atLeast "0.38") graphviz + ] ++ lib.optional (atLeast "0.38" && withGraphviz) graphviz ++ extraBuildInputs; enableParallelBuilding = true; @@ -42,7 +85,7 @@ let platforms = platforms.unix; maintainers = with maintainers; [ antono jtojnar lethalman peterhoeg ]; }; - }; + }); in rec { vala_0_36 = generic { diff --git a/pkgs/development/compilers/vala/disable-graphviz-0.40.12.patch b/pkgs/development/compilers/vala/disable-graphviz-0.40.12.patch new file mode 100644 index 00000000000..fdc1eabf513 --- /dev/null +++ b/pkgs/development/compilers/vala/disable-graphviz-0.40.12.patch @@ -0,0 +1,208 @@ +diff --git i/configure.ac w/configure.ac +index 694ffd200..915062053 100644 +--- i/configure.ac ++++ w/configure.ac +@@ -112,34 +112,38 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED) + AC_SUBST(GMODULE_CFLAGS) + AC_SUBST(GMODULE_LIBS) + +-PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED) +-AC_MSG_CHECKING([for CGRAPH]) +-cgraph_tmp_LIBADD="$LIBADD" +-cgraph_tmp_CFLAGS="$CFLAGS" +-LIBADD="$LIBADD $LIBGVC_LIBS" +-CFLAGS="$CFLAGS $LIBGVC_CFLAGS" +-AC_RUN_IFELSE( +- [AC_LANG_SOURCE([ +- #include <gvc.h> +- +- int main(void) { +- #ifdef WITH_CGRAPH +- return 0; +- #else +- return -1; +- #endif +- } +- ])], [ +- AC_MSG_RESULT([yes]) +- VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH" +- have_cgraph=yes +- ], [ +- AC_MSG_RESULT([no]) +- have_cgraph=no +- ] +-) +-LIBADD="$cgraph_tmp_LIBADD" +-CFLAGS="$cgraph_tmp_CFLAGS" ++AC_ARG_ENABLE(graphviz, AS_HELP_STRING([--disable-graphviz], [Disable graphviz usage for valadoc]), enable_graphviz=$enableval, enable_graphviz=yes) ++if test x$enable_graphviz = xyes; then ++ PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED) ++ AC_MSG_CHECKING([for CGRAPH]) ++ VALAFLAGS="$VALAFLAGS -D HAVE_GRAPHVIZ" ++ cgraph_tmp_LIBADD="$LIBADD" ++ cgraph_tmp_CFLAGS="$CFLAGS" ++ LIBADD="$LIBADD $LIBGVC_LIBS" ++ CFLAGS="$CFLAGS $LIBGVC_CFLAGS" ++ AC_RUN_IFELSE( ++ [AC_LANG_SOURCE([ ++ #include <gvc.h> ++ int main(void) { ++ #ifdef WITH_CGRAPH ++ return 0; ++ #else ++ return -1; ++ #endif ++ } ++ ])], [ ++ AC_MSG_RESULT([yes]) ++ VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH" ++ have_cgraph=yes ++ ], [ ++ AC_MSG_RESULT([no]) ++ have_cgraph=no ++ ] ++ ) ++ LIBADD="$cgraph_tmp_LIBADD" ++ CFLAGS="$cgraph_tmp_CFLAGS" ++fi ++AM_CONDITIONAL(ENABLE_GRAPHVIZ, test x$enable_graphviz = xyes) + AM_CONDITIONAL(HAVE_CGRAPH, test "$have_cgraph" = "yes") + + AC_PATH_PROG([XSLTPROC], [xsltproc], :) +diff --git i/libvaladoc/Makefile.am w/libvaladoc/Makefile.am +index f3f790e76..3c5dc4c80 100644 +--- i/libvaladoc/Makefile.am ++++ w/libvaladoc/Makefile.am +@@ -128,10 +128,6 @@ libvaladoc_la_VALASOURCES = \ + content/tablerow.vala \ + content/taglet.vala \ + content/text.vala \ +- charts/chart.vala \ +- charts/chartfactory.vala \ +- charts/hierarchychart.vala \ +- charts/simplechartfactory.vala \ + parser/manyrule.vala \ + parser/oneofrule.vala \ + parser/optionalrule.vala \ +@@ -158,13 +154,24 @@ libvaladoc_la_VALASOURCES = \ + highlighter/codetoken.vala \ + highlighter/highlighter.vala \ + html/basicdoclet.vala \ +- html/htmlchartfactory.vala \ + html/linkhelper.vala \ + html/cssclassresolver.vala \ + html/htmlmarkupwriter.vala \ + html/htmlrenderer.vala \ + $(NULL) + ++if ENABLE_GRAPHVIZ ++libvaladoc_la_VALASOURCES += \ ++ charts/chart.vala \ ++ charts/chartfactory.vala \ ++ charts/hierarchychart.vala \ ++ charts/simplechartfactory.vala \ ++ html/htmlchartfactory.vala \ ++ $(NULL) ++ ++LIBGVC_PKG = --vapidir $(top_srcdir)/vapi --pkg libgvc ++endif ++ + libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \ + libvaladoc.vala.stamp \ + $(libvaladoc_la_VALASOURCES:.vala=.c) \ +@@ -184,11 +191,11 @@ libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES) + --library valadoc \ + --vapi valadoc@PACKAGE_SUFFIX@.vapi \ + --vapidir $(top_srcdir)/vapi --pkg gmodule-2.0 \ +- --vapidir $(top_srcdir)/vapi --pkg libgvc \ + --vapidir $(top_srcdir)/gee --pkg gee \ + --vapidir $(top_srcdir)/vala --pkg vala \ + --vapidir $(top_srcdir)/ccode --pkg ccode \ + --vapidir $(top_srcdir)/codegen --pkg codegen \ ++ $(LIBGVC_PKG) \ + --pkg config \ + $(filter %.vala %.c,$^) + touch $@ +@@ -217,6 +224,9 @@ nodist_pkgconfig_DATA = valadoc@PACKAGE_SUFFIX@.pc + + valadoc@PACKAGE_SUFFIX@.pc: valadoc.pc + cp $< $@ ++if !ENABLE_GRAPHVIZ ++ sed -i "s/libgvc //g" $@ ++endif + + vapidir = $(datadir)/vala/vapi + dist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.vapi +@@ -224,6 +234,9 @@ nodist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.deps + + valadoc@PACKAGE_SUFFIX@.deps: valadoc.deps + cp $< $@ ++if !ENABLE_GRAPHVIZ ++ sed -i "s/libgvc//g" $@ ++endif + + EXTRA_DIST = \ + $(libvaladoc_la_VALASOURCES) \ +diff --git i/libvaladoc/html/basicdoclet.vala w/libvaladoc/html/basicdoclet.vala +index 192e488cd..ec0960222 100644 +--- i/libvaladoc/html/basicdoclet.vala ++++ w/libvaladoc/html/basicdoclet.vala +@@ -46,7 +46,11 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { + protected HtmlRenderer _renderer; + protected Html.MarkupWriter writer; + protected Html.CssClassResolver cssresolver; ++#if HAVE_GRAPHVIZ + protected Charts.Factory image_factory; ++#else ++ protected void* image_factory; ++#endif + protected ErrorReporter reporter; + protected string package_list_link = "../index.html"; + +@@ -120,7 +124,9 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { + this.linker = new LinkHelper (); + + _renderer = new HtmlRenderer (settings, this.linker, this.cssresolver); ++#if HAVE_GRAPHVIZ + this.image_factory = new SimpleChartFactory (settings, linker); ++#endif + } + + +@@ -1026,6 +1032,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { + } + + protected void write_image_block (Api.Node element) { ++#if HAVE_GRAPHVIZ + if (element is Class || element is Interface || element is Struct) { + unowned string format = (settings.use_svg_images ? "svg" : "png"); + var chart = new Charts.Hierarchy (image_factory, element); +@@ -1045,6 +1052,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { + this.get_img_path_html (element, format)}); + writer.add_usemap (chart); + } ++#endif + } + + public void write_namespace_content (Namespace node, Api.Node? parent) { +diff --git i/libvaladoc/html/htmlmarkupwriter.vala w/libvaladoc/html/htmlmarkupwriter.vala +index dcc4dad76..cf9c860b8 100644 +--- i/libvaladoc/html/htmlmarkupwriter.vala ++++ w/libvaladoc/html/htmlmarkupwriter.vala +@@ -51,12 +51,16 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter { + } + } + ++#if HAVE_GRAPHVIZ + public MarkupWriter add_usemap (Charts.Chart chart) { + string? buf = (string?) chart.write_buffer ("cmapx"); + if (buf != null) { + raw_text ("\n"); + raw_text ((!) buf); + } ++#else ++ public MarkupWriter add_usemap (void* chart) { ++#endif + + return this; + } diff --git a/pkgs/development/compilers/vala/disable-graphviz-0.42.4.patch b/pkgs/development/compilers/vala/disable-graphviz-0.42.4.patch new file mode 100644 index 00000000000..77e7d6272af --- /dev/null +++ b/pkgs/development/compilers/vala/disable-graphviz-0.42.4.patch @@ -0,0 +1,208 @@ +diff --git i/configure.ac w/configure.ac +index 730c72d7b..af8198637 100644 +--- i/configure.ac ++++ w/configure.ac +@@ -119,34 +119,38 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED) + AC_SUBST(GMODULE_CFLAGS) + AC_SUBST(GMODULE_LIBS) + +-PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED) +-AC_MSG_CHECKING([for CGRAPH]) +-cgraph_tmp_LIBADD="$LIBADD" +-cgraph_tmp_CFLAGS="$CFLAGS" +-LIBADD="$LIBADD $LIBGVC_LIBS" +-CFLAGS="$CFLAGS $LIBGVC_CFLAGS" +-AC_RUN_IFELSE( +- [AC_LANG_SOURCE([ +- #include <gvc.h> +- +- int main(void) { +- #ifdef WITH_CGRAPH +- return 0; +- #else +- return -1; +- #endif +- } +- ])], [ +- AC_MSG_RESULT([yes]) +- VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH" +- have_cgraph=yes +- ], [ +- AC_MSG_RESULT([no]) +- have_cgraph=no +- ] +-) +-LIBADD="$cgraph_tmp_LIBADD" +-CFLAGS="$cgraph_tmp_CFLAGS" ++AC_ARG_ENABLE(graphviz, AS_HELP_STRING([--disable-graphviz], [Disable graphviz usage for valadoc]), enable_graphviz=$enableval, enable_graphviz=yes) ++if test x$enable_graphviz = xyes; then ++ PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED) ++ AC_MSG_CHECKING([for CGRAPH]) ++ VALAFLAGS="$VALAFLAGS -D HAVE_GRAPHVIZ" ++ cgraph_tmp_LIBADD="$LIBADD" ++ cgraph_tmp_CFLAGS="$CFLAGS" ++ LIBADD="$LIBADD $LIBGVC_LIBS" ++ CFLAGS="$CFLAGS $LIBGVC_CFLAGS" ++ AC_RUN_IFELSE( ++ [AC_LANG_SOURCE([ ++ #include <gvc.h> ++ int main(void) { ++ #ifdef WITH_CGRAPH ++ return 0; ++ #else ++ return -1; ++ #endif ++ } ++ ])], [ ++ AC_MSG_RESULT([yes]) ++ VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH" ++ have_cgraph=yes ++ ], [ ++ AC_MSG_RESULT([no]) ++ have_cgraph=no ++ ] ++ ) ++ LIBADD="$cgraph_tmp_LIBADD" ++ CFLAGS="$cgraph_tmp_CFLAGS" ++fi ++AM_CONDITIONAL(ENABLE_GRAPHVIZ, test x$enable_graphviz = xyes) + AM_CONDITIONAL(HAVE_CGRAPH, test "$have_cgraph" = "yes") + + AC_PATH_PROG([XSLTPROC], [xsltproc], :) +diff --git i/libvaladoc/Makefile.am w/libvaladoc/Makefile.am +index f3f790e76..3c5dc4c80 100644 +--- i/libvaladoc/Makefile.am ++++ w/libvaladoc/Makefile.am +@@ -128,10 +128,6 @@ libvaladoc_la_VALASOURCES = \ + content/tablerow.vala \ + content/taglet.vala \ + content/text.vala \ +- charts/chart.vala \ +- charts/chartfactory.vala \ +- charts/hierarchychart.vala \ +- charts/simplechartfactory.vala \ + parser/manyrule.vala \ + parser/oneofrule.vala \ + parser/optionalrule.vala \ +@@ -158,13 +154,24 @@ libvaladoc_la_VALASOURCES = \ + highlighter/codetoken.vala \ + highlighter/highlighter.vala \ + html/basicdoclet.vala \ +- html/htmlchartfactory.vala \ + html/linkhelper.vala \ + html/cssclassresolver.vala \ + html/htmlmarkupwriter.vala \ + html/htmlrenderer.vala \ + $(NULL) + ++if ENABLE_GRAPHVIZ ++libvaladoc_la_VALASOURCES += \ ++ charts/chart.vala \ ++ charts/chartfactory.vala \ ++ charts/hierarchychart.vala \ ++ charts/simplechartfactory.vala \ ++ html/htmlchartfactory.vala \ ++ $(NULL) ++ ++LIBGVC_PKG = --vapidir $(top_srcdir)/vapi --pkg libgvc ++endif ++ + libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \ + libvaladoc.vala.stamp \ + $(libvaladoc_la_VALASOURCES:.vala=.c) \ +@@ -184,11 +191,11 @@ libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES) + --library valadoc \ + --vapi valadoc@PACKAGE_SUFFIX@.vapi \ + --vapidir $(top_srcdir)/vapi --pkg gmodule-2.0 \ +- --vapidir $(top_srcdir)/vapi --pkg libgvc \ + --vapidir $(top_srcdir)/gee --pkg gee \ + --vapidir $(top_srcdir)/vala --pkg vala \ + --vapidir $(top_srcdir)/ccode --pkg ccode \ + --vapidir $(top_srcdir)/codegen --pkg codegen \ ++ $(LIBGVC_PKG) \ + --pkg config \ + $(filter %.vala %.c,$^) + touch $@ +@@ -217,6 +224,9 @@ nodist_pkgconfig_DATA = valadoc@PACKAGE_SUFFIX@.pc + + valadoc@PACKAGE_SUFFIX@.pc: valadoc.pc + cp $< $@ ++if !ENABLE_GRAPHVIZ ++ sed -i "s/libgvc //g" $@ ++endif + + vapidir = $(datadir)/vala/vapi + dist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.vapi +@@ -224,6 +234,9 @@ nodist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.deps + + valadoc@PACKAGE_SUFFIX@.deps: valadoc.deps + cp $< $@ ++if !ENABLE_GRAPHVIZ ++ sed -i "s/libgvc//g" $@ ++endif + + EXTRA_DIST = \ + $(libvaladoc_la_VALASOURCES) \ +diff --git i/libvaladoc/html/basicdoclet.vala w/libvaladoc/html/basicdoclet.vala +index 192e488cd..ec0960222 100644 +--- i/libvaladoc/html/basicdoclet.vala ++++ w/libvaladoc/html/basicdoclet.vala +@@ -46,7 +46,11 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { + protected HtmlRenderer _renderer; + protected Html.MarkupWriter writer; + protected Html.CssClassResolver cssresolver; ++#if HAVE_GRAPHVIZ + protected Charts.Factory image_factory; ++#else ++ protected void* image_factory; ++#endif + protected ErrorReporter reporter; + protected string package_list_link = "../index.html"; + +@@ -120,7 +124,9 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { + this.linker = new LinkHelper (); + + _renderer = new HtmlRenderer (settings, this.linker, this.cssresolver); ++#if HAVE_GRAPHVIZ + this.image_factory = new SimpleChartFactory (settings, linker); ++#endif + } + + +@@ -1026,6 +1032,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { + } + + protected void write_image_block (Api.Node element) { ++#if HAVE_GRAPHVIZ + if (element is Class || element is Interface || element is Struct) { + unowned string format = (settings.use_svg_images ? "svg" : "png"); + var chart = new Charts.Hierarchy (image_factory, element); +@@ -1045,6 +1052,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { + this.get_img_path_html (element, format)}); + writer.add_usemap (chart); + } ++#endif + } + + public void write_namespace_content (Namespace node, Api.Node? parent) { +diff --git i/libvaladoc/html/htmlmarkupwriter.vala w/libvaladoc/html/htmlmarkupwriter.vala +index 5aa4afdea..e79b0b8f5 100644 +--- i/libvaladoc/html/htmlmarkupwriter.vala ++++ w/libvaladoc/html/htmlmarkupwriter.vala +@@ -51,12 +51,16 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter { + } + } + ++#if HAVE_GRAPHVIZ + public unowned MarkupWriter add_usemap (Charts.Chart chart) { + string? buf = (string?) chart.write_buffer ("cmapx"); + if (buf != null) { + raw_text ("\n"); + raw_text ((!) buf); + } ++#else ++ public unowned MarkupWriter add_usemap (void* chart) { ++#endif + + return this; + } diff --git a/pkgs/development/compilers/vala/gvc-compat.patch b/pkgs/development/compilers/vala/gvc-compat.patch new file mode 100644 index 00000000000..8c0d25098f1 --- /dev/null +++ b/pkgs/development/compilers/vala/gvc-compat.patch @@ -0,0 +1,19 @@ +diff --git i/libvaladoc/Makefile.am w/libvaladoc/Makefile.am +index 8dc398cf1..a5d8a45b4 100644 +--- i/libvaladoc/Makefile.am ++++ w/libvaladoc/Makefile.am +@@ -176,9 +176,13 @@ endif + libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \ + libvaladoc.vala.stamp \ + $(libvaladoc_la_VALASOURCES:.vala=.c) \ +- gvc-compat.c \ + $(NULL) + ++if ENABLE_GRAPHVIZ ++libvaladoc@PACKAGE_SUFFIX@_la_SOURCES += \ ++ gvc-compat.c ++endif ++ + valadoc@PACKAGE_SUFFIX@.vapi valadoc.h: libvaladoc.vala.stamp + libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES) + $(VALA_V)$(VALAC) \ diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 7718bdfde5d..4951ae4499f 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -72,14 +72,17 @@ let self = toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attr name = namePrefix + name; - nativeBuildInputs = [ ensureNewerSourcesForZipFilesHook ] - ++ nativeBuildInputs; - - buildInputs = [ wrapPython ] - ++ lib.optional (lib.hasSuffix "zip" (attrs.src.name or "")) unzip + nativeBuildInputs = [ + python + wrapPython + ensureNewerSourcesForZipFilesHook + setuptools # ++ lib.optional catchConflicts setuptools # If we no longer propagate setuptools - ++ buildInputs - ++ pythonPath; + ] ++ lib.optionals (lib.hasSuffix "zip" (attrs.src.name or "")) [ + unzip + ] ++ nativeBuildInputs; + + buildInputs = buildInputs ++ pythonPath; # Propagate python and setuptools. We should stop propagating setuptools. propagatedBuildInputs = propagatedBuildInputs ++ [ python setuptools ]; diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index b31a0703a03..d82b25fb892 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, config, libGLSupported, fetchurl, pkgconfig, pruneLibtoolFiles +{ stdenv, config, libGLSupported, fetchurl, pkgconfig , openglSupport ? libGLSupported, libGL , alsaSupport ? stdenv.isLinux, alsaLib , x11Support ? !stdenv.isCygwin, libX11, xorgproto, libICE, libXi, libXScrnSaver, libXcursor, libXinerama, libXext, libXxf86vm, libXrandr @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { patches = [ ./find-headers.patch ]; - nativeBuildInputs = [ pkgconfig pruneLibtoolFiles ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = dlopenPropagatedBuildInputs; diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 59ffd47c310..76df9514cf4 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -14,7 +14,7 @@ let in stdenv.mkDerivation rec { name = "freetype-${version}"; - version = "2.9"; + version = "2.9.1"; meta = with stdenv.lib; { description = "A font rendering engine"; @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://savannah/freetype/${name}.tar.bz2"; - sha256 = "12jcdz1in20yaa55izxalg3hm1pf7nydfrzps5bzb4zgihybmzz6"; + sha256 = "0kg8w6qyiizlyzh4a8lpzslipcbv96hcg3rqqpnxba8ffbm8g3fv"; }; propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - configureFlags = [ "--disable-static" "--bindir=$(dev)/bin" ]; + configureFlags = [ "--disable-static" "--bindir=$(dev)/bin" "--enable-freetype-config" ]; # native compiler to generate building tool CC_BUILD = "${buildPackages.stdenv.cc}/bin/cc"; @@ -68,4 +68,5 @@ in stdenv.mkDerivation rec { wrapProgram "$dev/bin/freetype-config" \ --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig" ''; + } diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 024ccf2a453..62963283f93 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -72,6 +72,11 @@ stdenv.mkDerivation rec { url = https://gitlab.gnome.org/GNOME/glib/commit/85c4031696add9797e2334ced20678edcd96c869.patch; sha256 = "1hmyvhx89wip2a26gk1rvd87k0pjfia51s0ysybjyzf5f1pzw877"; }) + # https://gitlab.gnome.org/GNOME/glib/issues/1645 + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/glib/commit/e695ca9f310c393d8f39694f77471dbcb06daa9e.diff; + sha256 = "1jkb2bdnni0xdyn86xrx9z0fdwxrm7y08lagz8x5x01wglkwa26w"; + }) ]; outputs = [ "bin" "out" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/glib/setup-hook.sh b/pkgs/development/libraries/glib/setup-hook.sh index 5275529991f..a1cb1f40c58 100644 --- a/pkgs/development/libraries/glib/setup-hook.sh +++ b/pkgs/development/libraries/glib/setup-hook.sh @@ -15,9 +15,9 @@ preInstallPhases+=" glibPreInstallPhase" glibPreFixupPhase() { # Move gschemas in case the install flag didn't help - if [ -d "${!outputLib}/share/glib-2.0/schemas" ]; then + if [ -d "$prefix/share/glib-2.0/schemas" ]; then mkdir -p "${!outputLib}/share/gsettings-schemas/$name/glib-2.0" - mv "${!outputLib}/share/glib-2.0/schemas" "${!outputLib}/share/gsettings-schemas/$name/glib-2.0/" + mv "$prefix/share/glib-2.0/schemas" "${!outputLib}/share/gsettings-schemas/$name/glib-2.0/" fi addToSearchPath GSETTINGS_SCHEMAS_PATH "${!outputLib}/share/gsettings-schemas/$name" diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix index 3b9fbc35a76..00bfb55520d 100644 --- a/pkgs/development/libraries/gmp/5.1.x.nix +++ b/pkgs/development/libraries/gmp/5.1.x.nix @@ -29,17 +29,14 @@ let self = stdenv.mkDerivation rec { # # no darwin because gmp uses ASM that clang doesn't like (stdenv.lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat") + # The config.guess in GMP tries to runtime-detect various + # ARM optimization flags via /proc/cpuinfo (and is also + # broken on multicore CPUs). Avoid this impurity. + "--build=${stdenv.buildPlatform.config}" ] ++ optional (cxx && stdenv.isDarwin) "CPPFLAGS=-fexceptions" ++ optional (stdenv.isDarwin && stdenv.is64bit) "ABI=64" ; - # The config.guess in GMP tries to runtime-detect various - # ARM optimization flags via /proc/cpuinfo (and is also - # broken on multicore CPUs). Avoid this impurity. - preConfigure = optionalString stdenv.isAarch32 '' - configureFlagsArray+=("--build=$(./configfsf.guess)") - ''; - doCheck = true; dontDisableStatic = withStatic; diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index 23a69282b41..ce78f323088 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -30,18 +30,15 @@ let self = stdenv.mkDerivation rec { # # no darwin because gmp uses ASM that clang doesn't like (stdenv.lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat") + # The config.guess in GMP tries to runtime-detect various + # ARM optimization flags via /proc/cpuinfo (and is also + # broken on multicore CPUs). Avoid this impurity. + "--build=${stdenv.buildPlatform.config}" ] ++ optional (cxx && stdenv.isDarwin) "CPPFLAGS=-fexceptions" ++ optional (stdenv.isDarwin && stdenv.is64bit) "ABI=64" ++ optional (with stdenv.hostPlatform; useAndroidPrebuilt || useiOSPrebuilt) "--disable-assembly" ; - # The config.guess in GMP tries to runtime-detect various - # ARM optimization flags via /proc/cpuinfo (and is also - # broken on multicore CPUs). Avoid this impurity. - preConfigure = optionalString stdenv.isAarch32 '' - configureFlagsArray+=("--build=$(./configfsf.guess)") - ''; - doCheck = true; # not cross; dontDisableStatic = withStatic; diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 01133b92ee1..6a1fcf78cb3 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -13,14 +13,14 @@ assert cupsSupport -> cups != null; with stdenv.lib; let - version = "3.24.2"; + version = "3.24.3"; in stdenv.mkDerivation rec { name = "gtk+3-${version}"; src = fetchurl { url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - sha256 = "14l8mimdm44r3h5pn5hzigl1z25jna8jxvb16l88v4nc4zj0afsv"; + sha256 = "1g839289bxakq4nn3m3ihi1rl6ym563pa5cxlswiyjwn9m9zl22p"; }; outputs = [ "out" "dev" ]; @@ -35,16 +35,6 @@ stdenv.mkDerivation rec { url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123"; sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p"; }) - # 3.24.2: https://gitlab.gnome.org/GNOME/gtk/issues/1521 - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/gtk/commit/2905fc861acda3d134a198e56ef2f6c962ad3061.patch; - sha256 = "0y8ljny59kgdhrcfpimi2r082bax60d5kflw1qj9k1mnzjcvjjwl"; - }) - # 3.24.2: https://gitlab.gnome.org/GNOME/gtk/issues/1523 - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/gtk/commit/e3a1593a0984cc0156ec1892a46af8f256a64878.patch; - sha256 = "0akvp1r8xlzf5amk9gmk7b5sabr1wbmg3ak15rppsid7nf9f5dqf"; - }) ]; buildInputs = [ libxkbcommon epoxy json-glib isocodes ] diff --git a/pkgs/development/libraries/libheif/default.nix b/pkgs/development/libraries/libheif/default.nix index cdc03c01a02..25cee4ef8da 100644 --- a/pkgs/development/libraries/libheif/default.nix +++ b/pkgs/development/libraries/libheif/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, pruneLibtoolFiles, libde265, x265, libpng, libjpeg }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libde265, x265, libpng, libjpeg }: stdenv.mkDerivation rec { version = "1.3.2"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0hk8mzig2kp5f94j4jwqxzjrm7ffk16ffvxl92rf0afsh6vgnz7w"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig pruneLibtoolFiles ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libde265 x265 libpng libjpeg ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index a1563420630..ca30fe87396 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -27,11 +27,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "libinput-${version}"; - version = "1.12.4"; + version = "1.12.5"; src = fetchurl { url = "https://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "1riircgrj002w1sd1053aq9098s6ys99gya0k0crhb9f3ij2kwx4"; + sha256 = "08vid3q1la3qiv9d5xcgxznjahzs8w01fhabvxlvzwqf04qnhjvx"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 14b01cd9a84..ebcf51dfd03 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -13,11 +13,17 @@ stdenv.mkDerivation rec { stdenv.lib.optional (stdenv.hostPlatform.libc or null == "msvcrt") ./mingw-boolean.patch ++ [ + ./djpeg-rgb-islow-icc-cmp.patch # https://github.com/libjpeg-turbo/libjpeg-turbo/pull/321 (fetchpatch { name = "cve-2018-19664.diff"; url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/f8cca819a4fb.diff"; sha256 = "1kgfag62qmphlrq0mz15g17zw7zrg9nzaz7d2vg50m6m7m5aw4y5"; }) + (fetchpatch { + name = "CVE-2018-20330.patch"; + url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/3d9c64e9f8aa1ee954d1d0bb3390fc894bb84da3.diff"; + sha256 = "1jai8izw6xl05ihx24rpc96d1jcr9rp421cb02pbz3v53cxdasji"; + }) ]; outputs = [ "bin" "dev" "out" "man" "doc" ]; diff --git a/pkgs/development/libraries/libjpeg-turbo/djpeg-rgb-islow-icc-cmp.patch b/pkgs/development/libraries/libjpeg-turbo/djpeg-rgb-islow-icc-cmp.patch new file mode 100644 index 00000000000..c0f7fef4493 --- /dev/null +++ b/pkgs/development/libraries/libjpeg-turbo/djpeg-rgb-islow-icc-cmp.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -999,6 +999,8 @@ foreach(libtype ${TEST_LIBTYPES}) + + add_test(djpeg-${libtype}-rgb-islow-icc-cmp + ${MD5CMP} b06a39d730129122e85c1363ed1bbc9e testout_rgb_islow.icc) ++ set_tests_properties(djpeg-${libtype}-rgb-islow-icc-cmp PROPERTIES ++ DEPENDS djpeg-${libtype}-rgb-islow) + + add_bittest(jpegtran icc "-copy;all;-icc;${TESTIMAGES}/test2.icc" + testout_rgb_islow2.jpg testout_rgb_islow.jpg ${MD5_JPEG_RGB_ISLOW2}) diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 4fed33a4d35..10a2124199b 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -1,23 +1,16 @@ -{ stdenv, lib, fetchpatch, fetchFromGitHub, autoconf, automake, libtool, pkgconfig }: +{ stdenv, lib, fetchpatch, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.23.2"; + version = "1.24.1"; name = "libuv-${version}"; src = fetchFromGitHub { owner = "libuv"; repo = "libuv"; rev = "v${version}"; - sha256 = "1xfggj0mbbshj7zyccnfw7wyk42qfg4ng3l4aslw014mg8gaskv7"; + sha256 = "0lpq8anmy69pcmkhk8giyp78q8dadcy2562g4krqaq8a5xy825ab"; }; - patches = [ - (fetchpatch { - url = "https://github.com/libuv/libuv/commit/1a5d4f08238dd532c3718e210078de1186a5920d.patch"; - sha256 = "1s2692h4dvqnzwwicrkpj0zph1i2bhv39w31z5vh7ssgvykaradj"; - }) - ]; - postPatch = let toDisable = [ "getnameinfo_basic" "udp_send_hang_loop" # probably network-dependent @@ -52,6 +45,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices CoreServices ]; preConfigure = '' LIBTOOLIZE=libtoolize ./autogen.sh diff --git a/pkgs/development/libraries/qt-5/5.11/qtdeclarative.patch b/pkgs/development/libraries/qt-5/5.11/qtdeclarative.patch index 8f5b5d4790f..cfa68eb8102 100644 --- a/pkgs/development/libraries/qt-5/5.11/qtdeclarative.patch +++ b/pkgs/development/libraries/qt-5/5.11/qtdeclarative.patch @@ -18,6 +18,19 @@ index 005db4248..685c5b1b2 100644 // env import paths if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty("QML2_IMPORT_PATH"))) { const QString envImportPath = qEnvironmentVariable("QML2_IMPORT_PATH"); +diff --git a/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake b/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake +index 56cb3fb55..74509d601 100644 +--- a/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake ++++ b/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake +@@ -17,7 +17,7 @@ function(QTQUICK_COMPILER_ADD_RESOURCES outfiles) + + find_package(Qt5 COMPONENTS Qml Core) + +- set(compiler_path "${_qt5Core_install_prefix}/bin/qmlcachegen") ++ set(compiler_path "qmlcachegen") + + get_target_property(rcc_path ${Qt5Core_RCC_EXECUTABLE} IMPORTED_LOCATION) + diff --git a/tools/qmlcachegen/qmlcache.prf b/tools/qmlcachegen/qmlcache.prf index 537eaf62e..e21de58f6 100644 --- a/tools/qmlcachegen/qmlcache.prf diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 120fa25090a..3d516fb5d9d 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -3,6 +3,7 @@ # pointer width, but some expect to use 32-bit integers always # (for compatibility with reference BLAS). , blas64 ? null +, buildPackages }: with stdenv.lib; @@ -13,54 +14,46 @@ let # To add support for a new platform, add an element to this set. configs = { armv6l-linux = { - BINARY = "32"; + BINARY = 32; TARGET = "ARMV6"; - DYNAMIC_ARCH = "0"; - CC = "gcc"; - USE_OPENMP = "1"; + DYNAMIC_ARCH = false; + USE_OPENMP = true; }; armv7l-linux = { - BINARY = "32"; + BINARY = 32; TARGET = "ARMV7"; - DYNAMIC_ARCH = "0"; - CC = "gcc"; - USE_OPENMP = "1"; + DYNAMIC_ARCH = false; + USE_OPENMP = true; }; aarch64-linux = { - BINARY = "64"; + BINARY = 64; TARGET = "ARMV8"; - DYNAMIC_ARCH = "1"; - CC = "gcc"; - USE_OPENMP = "1"; + DYNAMIC_ARCH = true; + USE_OPENMP = true; }; i686-linux = { - BINARY = "32"; + BINARY = 32; TARGET = "P2"; - DYNAMIC_ARCH = "1"; - CC = "gcc"; - USE_OPENMP = "1"; + DYNAMIC_ARCH = true; + USE_OPENMP = true; }; x86_64-darwin = { - BINARY = "64"; + BINARY = 64; TARGET = "ATHLON"; - DYNAMIC_ARCH = "1"; - # Note that clang is available through the stdenv on OSX and - # thus is not an explicit dependency. - CC = "clang"; - USE_OPENMP = "0"; + DYNAMIC_ARCH = true; + USE_OPENMP = false; MACOSX_DEPLOYMENT_TARGET = "10.7"; }; x86_64-linux = { - BINARY = "64"; + BINARY = 64; TARGET = "ATHLON"; - DYNAMIC_ARCH = "1"; - CC = "gcc"; - USE_OPENMP = "1"; + DYNAMIC_ARCH = true; + USE_OPENMP = true; }; }; in @@ -79,25 +72,16 @@ let in stdenv.mkDerivation rec { name = "openblas-${version}"; - version = "0.3.4"; + version = "0.3.5"; src = fetchFromGitHub { owner = "xianyi"; repo = "OpenBLAS"; rev = "v${version}"; - sha256 = "1jdq4msfyg13pdmwwfqpixf4fshss68qzls820lmn0i6y7h4aix3"; + sha256 = "0hwfplr6ciqjvfqkya5vz92z2rx8bhdg5mkh923z246ylhs6d94k"; }; inherit blas64; - patches = [ - # Fixes build on x86_64-darwin. See: - # https://github.com/xianyi/OpenBLAS/issues/1926 - (fetchpatch { - url = https://github.com/xianyi/OpenBLAS/commit/701ea88347461e4c5d896765438dc870281b3834.patch; - sha256 = "18rcfgkjsijl9d2510jn961wqvz7zdlz2fgy1yjmax29kvv8fqd9"; - }) - ]; - # Some hardening features are disabled due to sporadic failures in # OpenBLAS-based programs. The problem may not be with OpenBLAS itself, but # with how these flags interact with hardening measures used downstream. @@ -113,19 +97,26 @@ stdenv.mkDerivation rec { "relro" "bindnow" ]; - nativeBuildInputs = - [gfortran perl which] - ++ optionals stdenv.isDarwin [coreutils]; - - makeFlags = - [ - "FC=gfortran" - ''PREFIX="''$(out)"'' - "NUM_THREADS=64" - "INTERFACE64=${if blas64 then "1" else "0"}" - "NO_STATIC=1" - ] ++ stdenv.lib.optional (stdenv.hostPlatform.libc == "musl") "NO_AFFINITY=1" - ++ mapAttrsToList (var: val: var + "=" + val) config; + nativeBuildInputs = [ + perl + which + buildPackages.gfortran + buildPackages.stdenv.cc + ] ++ optionals stdenv.isDarwin [ + coreutils + ]; + + makeFlags = mapAttrsToList (var: val: "${var}=${toString val}") (config // { + FC = "${stdenv.cc.targetPrefix}gfortran"; + CC = "${stdenv.cc.targetPrefix}cc"; + PREFIX = placeholder "out"; + NUM_THREADS = 64; + INTERFACE64 = blas64; + NO_STATIC = true; + CROSS = stdenv.hostPlatform != stdenv.buildPlatform; + HOSTCC = "${buildPackages.stdenv.cc.targetPrefix}cc"; + NO_BINARY_MODE = stdenv.hostPlatform != stdenv.buildPlatform; + }); doCheck = true; checkTarget = "tests"; diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix index 9030149fc8a..04758ace7fa 100644 --- a/pkgs/development/libraries/webkitgtk/2.4.nix +++ b/pkgs/development/libraries/webkitgtk/2.4.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, perl, python, ruby, bison, gperf, flex -, pkgconfig, which, gettext, gobject-introspection, pruneLibtoolFiles +, pkgconfig, which, gettext, gobject-introspection , gtk2, gtk3, wayland, libwebp, enchant, sqlite , libxml2, libsoup, libsecret, libxslt, harfbuzz, xorg , gst-plugins-base, libobjc @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl python ruby bison gperf flex - pkgconfig which gettext gobject-introspection pruneLibtoolFiles + pkgconfig which gettext gobject-introspection ]; buildInputs = [ diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index 223a519ec89..90a605063b0 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -26,11 +26,11 @@ let in buildPythonPackage rec { pname = "Cython"; - version = "0.29.1"; + version = "0.29.2"; src = fetchPypi { inherit pname version; - sha256 = "15zv9c4ami9hzya28wz1shqljbbk5sxdvqbjxqnf15ssk137daqq"; + sha256 = "2ac187ff998a95abb7fae452b5178f91e1a713698c9ced89836c94e6b1d3f41e"; }; nativeBuildInputs = [ @@ -50,7 +50,12 @@ in buildPythonPackage rec { ''--exclude="(${builtins.concatStringsSep "|" excludedTests})"''} ''; - doCheck = !stdenv.isDarwin; + # https://github.com/cython/cython/issues/2785 + # Temporary solution + doCheck = false; + +# doCheck = !stdenv.isDarwin; + meta = { description = "An optimising static compiler for both the Python programming language and the extended Cython programming language"; diff --git a/pkgs/development/python-modules/Logbook/default.nix b/pkgs/development/python-modules/Logbook/default.nix index 5b0e10340bd..866c0410929 100644 --- a/pkgs/development/python-modules/Logbook/default.nix +++ b/pkgs/development/python-modules/Logbook/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Logbook"; - version = "1.4.1"; + version = "1.4.3"; src = fetchPypi { inherit pname version; - sha256 = "1nsnz9qdcba85q57qbam6skfvq2k7savn64qdy44cjnh0vkmqdrj"; + sha256 = "a5a96792abd8172c80d61b7530e134524f20e2841981038031e602ed5920fef5"; }; checkInputs = [ pytest ] ++ lib.optionals (!isPy3k) [ mock ]; diff --git a/pkgs/development/python-modules/Theano/default.nix b/pkgs/development/python-modules/Theano/default.nix index a9799807a27..b2d0aaa5b6b 100644 --- a/pkgs/development/python-modules/Theano/default.nix +++ b/pkgs/development/python-modules/Theano/default.nix @@ -45,13 +45,13 @@ let in buildPythonPackage rec { pname = "Theano"; - version = "1.0.3"; + version = "1.0.4"; disabled = isPyPy || pythonOlder "2.6" || (isPy3k && pythonOlder "3.3"); src = fetchPypi { inherit pname version; - sha256 = "637f3b34d40ef5e0d54dd4c40618475aaa085c26d2491e925c98e2ad4bc2115a"; + sha256 = "35c9bbef56b61ffa299265a42a4e8f8cb5a07b2997dabaef0f8830b397086913"; }; postPatch = '' diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index cc12243ab40..b93843acea1 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "alembic"; - version = "1.0.3"; + version = "1.0.6"; src = fetchPypi { inherit pname version; - sha256 = "4b6ff7433247fe80b6ef522ef3763acb959cbdef027d03f76f4cd3c7118c1872"; + sha256 = "35660f7e6159288e2be111126be148ef04cbf7306da73c8b8bd4400837bb08e3"; }; buildInputs = [ pytest pytestcov mock coverage ]; diff --git a/pkgs/development/python-modules/allpairspy/default.nix b/pkgs/development/python-modules/allpairspy/default.nix index d1f97d8e7c7..e64a6004b78 100644 --- a/pkgs/development/python-modules/allpairspy/default.nix +++ b/pkgs/development/python-modules/allpairspy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "allpairspy"; - version = "2.4.1"; + version = "2.4.3"; src = fetchPypi { inherit pname version; - sha256 = "e8b35751f91692bf0318091b3f44cdf9bbbe3f37a2ff4786eaffc09dc7114fb3"; + sha256 = "8ce160db245375a5ccf0831be77cd98394f514c1b3501ddff5f8edb780ee1748"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index 24d74f1d44f..d02ffc4770c 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "awkward"; - version = "0.5.2"; + version = "0.5.6"; src = fetchPypi { inherit pname version; - sha256 = "bc824882f80ae07d442a011eb6d14a6fce581e022d4ff6c73d89d93c832ee3cc"; + sha256 = "c6b84d2356c8b1af955054bbef088c61bf87f68e062e866fa8d9ea5cb871389f"; }; buildInputs = [ pytestrunner h5py ]; diff --git a/pkgs/development/python-modules/azure-common/default.nix b/pkgs/development/python-modules/azure-common/default.nix index ad2ef52224b..5ea04cd19c8 100644 --- a/pkgs/development/python-modules/azure-common/default.nix +++ b/pkgs/development/python-modules/azure-common/default.nix @@ -7,14 +7,14 @@ }: buildPythonPackage rec { - version = "1.1.16"; + version = "1.1.17"; pname = "azure-common"; disabled = isPyPy; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "2606ae77ff81c0036965b92ec2efe03eaec02a66714140ca0f7aa401b8b9bbb0"; + sha256 = "e7cd5a8ee2ec0639454c1bd0f1ea5f609d83977376abfd304527ec7343fef1be"; }; propagatedBuildInputs = [ azure-nspkg ]; diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix index 4ea60f2f29a..462c9e615a1 100644 --- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "0.20.0"; + version = "0.20.1"; pname = "azure-mgmt-compute"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "12hr5vxdg2sk2fzr608a37f4i8nbchca7dgdmly2w5fc7x88jx2v"; + sha256 = "97298fc7f133f1d50a974ed6299151eda494a574b0f7fdf8192a388015c2215a"; }; preConfigure = '' diff --git a/pkgs/development/python-modules/bayespy/default.nix b/pkgs/development/python-modules/bayespy/default.nix index ff4b7fcb531..430e7c3da8a 100644 --- a/pkgs/development/python-modules/bayespy/default.nix +++ b/pkgs/development/python-modules/bayespy/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "bayespy"; - version = "0.5.17"; + version = "0.5.18"; # Python 2 not supported and not some old Python 3 because MPL doesn't support # them properly. @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "2e04cd9873eea6891ea8dfd5fc6d718727ea7cc416bc2ced50e00a741386925f"; + sha256 = "86c453d827b8d6c3574ec306f6fadfc5028614e1cd46676841336e6787a7496a"; }; checkInputs = [ pytest glibcLocales ]; diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix index ca22fab575c..28cd08fb0fc 100644 --- a/pkgs/development/python-modules/bcrypt/default.nix +++ b/pkgs/development/python-modules/bcrypt/default.nix @@ -4,12 +4,12 @@ with stdenv.lib; buildPythonPackage rec { - version = "3.1.4"; + version = "3.1.6"; pname = "bcrypt"; src = fetchPypi { inherit pname version; - sha256 = "67ed1a374c9155ec0840214ce804616de49c3df9c5bc66740687c1c9b1cd9e8d"; + sha256 = "44636759d222baa62806bbceb20e96f75a015a6381690d1bc2eda91c01ec02ea"; }; buildInputs = [ pycparser mock pytest py ]; propagatedBuildInputs = [ six ] ++ optional (!isPyPy) cffi; diff --git a/pkgs/development/python-modules/beautifulsoup4/default.nix b/pkgs/development/python-modules/beautifulsoup4/default.nix index 7cf4f36a2f0..f230d5e4c05 100644 --- a/pkgs/development/python-modules/beautifulsoup4/default.nix +++ b/pkgs/development/python-modules/beautifulsoup4/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "90f8e61121d6ae58362ce3bed8cd997efb00c914eae0ff3d363c32f9a9822d10"; }; - buildInputs = [ nose ]; + checkInputs = [ nose ]; checkPhase = '' nosetests build ''; diff --git a/pkgs/development/python-modules/bibtexparser/default.nix b/pkgs/development/python-modules/bibtexparser/default.nix index 05ee0ea9553..849b6e8b240 100644 --- a/pkgs/development/python-modules/bibtexparser/default.nix +++ b/pkgs/development/python-modules/bibtexparser/default.nix @@ -1,24 +1,24 @@ { lib , buildPythonPackage, fetchFromGitHub , future, pyparsing -, glibcLocales, nose +, glibcLocales, nose, unittest2 }: buildPythonPackage rec { pname = "bibtexparser"; - version = "1.0.1"; + version = "1.1.0"; # PyPI tarball does not ship tests src = fetchFromGitHub { owner = "sciunto-org"; repo = "python-${pname}"; rev = "v${version}"; - sha256 = "0lmlarkfbq2hp1wa04a62245jr2mqizqsdlgilj5aq6vy92gr6ai"; + sha256 = "1yj3hqnmkjh0sjjhmlm4097mmz98kna8rn0dd9g8zaw9g1a35h8c"; }; propagatedBuildInputs = [ future pyparsing ]; - checkInputs = [ nose glibcLocales ]; + checkInputs = [ nose unittest2 glibcLocales ]; checkPhase = '' LC_ALL="en_US.UTF-8" nosetests diff --git a/pkgs/development/python-modules/block-io/default.nix b/pkgs/development/python-modules/block-io/default.nix index c0df26143ec..da06b15f5b4 100644 --- a/pkgs/development/python-modules/block-io/default.nix +++ b/pkgs/development/python-modules/block-io/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "block-io"; - version = "1.1.8"; + version = "1.1.9"; src = fetchPypi { inherit pname version; - sha256 = "15468pvpcp41ly7kjpmikpyi4av57d9zhf5j1v01j78r1xqqk56g"; + sha256 = "4909d58b32ab7f93d3cd83fa4bbe4edef42ab7566f016bdb6a405a0d8b1907c9"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 0678d59ea81..158a3d31882 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -33,11 +33,11 @@ buildPythonPackage rec { pname = "bokeh"; - version = "1.0.3"; + version = "1.0.4"; src = fetchPypi { inherit pname version; - sha256 = "1s0gi4n8bn0ain3k6jz6xzbbpn1jpb7rkadmsri8dkcpwyfhacvs"; + sha256 = "ceeb6a75afc1b2de00c2b8b6da121dec3fb77031326897b80d4375a70e96aebf"; }; disabled = isPyPy; diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index acaa62a34ab..85b752409ea 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -9,9 +9,9 @@ let }; setuptools_source = fetchPypi { pname = "setuptools"; - version = "40.6.2"; + version = "40.6.3"; format = "wheel"; - sha256 = "88ee6bcd5decec9bd902252e02e641851d785c6e5e75677d2744a9d13fed0b0a"; + sha256 = "e2c1ce9a832f34cf7a31ed010aabcab5008eb65ce8f2aadc04622232c14bdd0b"; }; in stdenv.mkDerivation rec { diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index ff4d109d38f..ba7f4393dbd 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.9.75"; # N.B: if you change this, change botocore too + version = "1.9.80"; # N.B: if you change this, change botocore too src = fetchPypi { inherit pname version; - sha256 = "0l4ifnp7mnf8n7dpf5jf5gwcxccb4qrijqyf3izbz2pdlrv1pw73"; + sha256 = "99ec19dc4f0aa8a8354db7baebe1ff57bd18aeb6a539b28693b2e8ca8dc3d85b"; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index b7b0ebcfcdc..7eb9f3d44af 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.12.79"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.12.80"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "16ikl3lv9q4i8bwzvm11a5q3bds42p36i4ap01fm3r9w1kzxb1wd"; + sha256 = "76a2969278250e010253ddf514f4b54eaa7d2b1430f682874c3c2ab92f25a96d"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bottle/default.nix b/pkgs/development/python-modules/bottle/default.nix index 50df0d5842c..6e1eb5ced00 100644 --- a/pkgs/development/python-modules/bottle/default.nix +++ b/pkgs/development/python-modules/bottle/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bottle"; - version = "0.12.13"; + version = "0.12.16"; src = fetchPypi { inherit pname version; - sha256 = "39b751aee0b167be8dffb63ca81b735bbf1dd0905b3bc42761efedee8f123355"; + sha256 = "9c310da61e7df2b6ac257d8a90811899ccb3a9743e77e947101072a2e3186726"; }; propagatedBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/carbon/default.nix b/pkgs/development/python-modules/carbon/default.nix index 0398782900d..755f9211746 100644 --- a/pkgs/development/python-modules/carbon/default.nix +++ b/pkgs/development/python-modules/carbon/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "carbon"; - version = "1.1.4"; + version = "1.1.5"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1b70e34ac0f0bd32a03ee14eaf1ed2c857e208984fc9761f59a95c21c5264513"; + sha256 = "a88390553a9ea628fdb74b5b358ed83a657e058bcc811e5819d9db856b4fcf5b"; }; propagatedBuildInputs = [ twisted whisper txamqp cachetools urllib3 ]; diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index 13038c5803c..498729bb132 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -1,19 +1,8 @@ -{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, iana-etc, libredirect, +{ stdenv, buildPythonPackage, fetchPypi, isPy37, fetchpatch, iana-etc, libredirect, pytest, case, kombu, billiard, pytz, anyjson, amqp, eventlet }: -let - - # Needed for celery - pytest_32 = pytest.overridePythonAttrs( oldAttrs: rec { - version = "3.2.5"; - src = oldAttrs.src.override { - inherit version; - sha256 = "6d5bd4f7113b444c55a3bbb5c738a3dd80d43563d063fc42dcb0aaefbdd78b81"; - }; - }); - -in buildPythonPackage rec { +buildPythonPackage rec { pname = "celery"; version = "4.2.1"; @@ -22,12 +11,28 @@ in buildPythonPackage rec { sha256 = "0y66rz7z8dfcgs3s0qxmdddlaq57bzbgxgfz896nbp14grkv9nkp"; }; - # Skip test_RedisBackend.test_timeouts_in_url_coerced - # See https://github.com/celery/celery/pull/4847 - patches = fetchpatch { - url = https://github.com/celery/celery/commit/b2668607c909c61becd151905b4525190c19ff4a.patch; - sha256 = "11w0z2ycyh8kccj4y69zb7bxppiipcwwigg6jn1q9yrcsvz170jq"; - }; + # See https://github.com/celery/celery/issues/4500 + # TODO: Remove once upgraded to 4.3 + disabled = isPy37; + + patches = [ + # Skip test_RedisBackend.test_timeouts_in_url_coerced + # See https://github.com/celery/celery/pull/4847 + (fetchpatch { + url = https://github.com/celery/celery/commit/b2668607c909c61becd151905b4525190c19ff4a.patch; + sha256 = "11w0z2ycyh8kccj4y69zb7bxppiipcwwigg6jn1q9yrcsvz170jq"; + }) + # Allow usage of a newer pytest version + # See https://github.com/celery/celery/pull/4912 + (fetchpatch { + url = https://github.com/celery/celery/commit/16f56fe6f84cac9f92affac3ad06a1f168a19798.patch; + sha256 = "0vz68rl32m34k51nhs898jcfdbj5m7cszzxx0w0j3j1fhn1wq594"; + }) + ]; + + postPatch = '' + substituteInPlace requirements/test.txt --replace ",<3.9" "" + ''; # make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox preCheck = stdenv.lib.optionalString stdenv.isLinux '' @@ -38,7 +43,7 @@ in buildPythonPackage rec { unset NIX_REDIRECTS LD_PRELOAD ''; - checkInputs = [ pytest_32 case ]; + checkInputs = [ pytest case ]; propagatedBuildInputs = [ kombu billiard pytz anyjson amqp eventlet ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 18826d46b86..2f634bf21e5 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -12,7 +12,7 @@ if isPyPy then null else buildPythonPackage rec { outputs = [ "out" "dev" ]; propagatedBuildInputs = [ libffi pycparser ]; - buildInputs = [ pytest ]; + checkInputs = [ pytest ]; # On Darwin, the cffi tests want to hit libm a lot, and look for it in a global # impure search path. It's obnoxious how much repetition there is, and how difficult diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix index 70e9744058c..a3e945bc916 100644 --- a/pkgs/development/python-modules/chalice/default.nix +++ b/pkgs/development/python-modules/chalice/default.nix @@ -20,11 +20,11 @@ buildPythonPackage rec { pname = "chalice"; - version = "1.6.1"; + version = "1.6.2"; src = fetchPypi { inherit pname version; - sha256 = "783ba3c603b944ba32f0ee39f272dc192f2097cfc520692f4dcb718bebdf940e"; + sha256 = "96c22f95ccc91ed3e79cc4a9a88bf27f95a13a2caf5a55137ab081d371258f0f"; }; checkInputs = [ watchdog pytest hypothesis mock ]; @@ -46,7 +46,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace 'pip>=9,<=18' 'pip' \ + --replace 'pip>=9,<=18.1' 'pip' \ --replace 'typing==3.6.4' 'typing' \ --replace 'attrs==17.4.0' 'attrs' \ --replace 'click>=6.6,<7.0' 'click' diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index 81c38acfca3..66626cb76f4 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -6,11 +6,11 @@ }: buildPythonPackage rec { pname = "cmd2"; - version = "0.9.6"; + version = "0.9.7"; src = fetchPypi { inherit pname version; - sha256 = "0279p76n6yny6psys9fc6yjdrqiisbpmrl59a2vxy56hi7094kaw"; + sha256 = "b04a3421be2ae35e7e8347e29c2f3960eed38d0163e312845147d5d828a09379"; }; LC_ALL="en_US.UTF-8"; diff --git a/pkgs/development/python-modules/cornice/default.nix b/pkgs/development/python-modules/cornice/default.nix index 2c7660807d6..5a341168e8d 100644 --- a/pkgs/development/python-modules/cornice/default.nix +++ b/pkgs/development/python-modules/cornice/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "cornice"; - version = "3.4.2"; + version = "3.4.4"; src = fetchPypi { inherit pname version; - sha256 = "c88f246aa6a84a0cdbaa8231a062c60e18ad9c0a65dc178f536ce5eb3a831418"; + sha256 = "1355f998ac6af53bda985e13ed0695cd206b0a3f14657b83979b31bbc72f1acb"; }; propagatedBuildInputs = [ pyramid simplejson six venusian ]; diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 603f92336c0..8cfc14a2bee 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { # also bump cryptography_vectors pname = "cryptography"; - version = "2.3.1"; + version = "2.4.2"; src = fetchPypi { inherit pname version; - sha256 = "8d10113ca826a4c29d5b85b2c4e045ffa8bad74fb525ee0eceb1d38d4c70dfd6"; + sha256 = "1pc60dksi9w9mshl6cvn7gdjazbp3pmydy3qp9wgy5wzd8n0b9h5"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/cryptography_vectors/default.nix b/pkgs/development/python-modules/cryptography_vectors/default.nix index bcb60eb0d8d..d979f03c54d 100644 --- a/pkgs/development/python-modules/cryptography_vectors/default.nix +++ b/pkgs/development/python-modules/cryptography_vectors/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { # also bump cryptography pname = "cryptography_vectors"; - version = "2.3.1"; + version = "2.4.2"; src = fetchPypi { inherit pname version; - sha256 = "bf4d9b61dce69c49e830950aa36fad194706463b0b6dfe81425b9e0bc6644d46"; + sha256 = "013qx2hz0jv79yzfzpn0r2kk33i5qy3sdnzgwiv5779d18snblwi"; }; # No tests included doCheck = false; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/debian/default.nix b/pkgs/development/python-modules/debian/default.nix index f09195b6dc5..fc9b9017cc9 100644 --- a/pkgs/development/python-modules/debian/default.nix +++ b/pkgs/development/python-modules/debian/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "python-debian"; - version = "0.1.33"; + version = "0.1.34"; src = fetchPypi { inherit pname version; - sha256 = "06e91d45019fe5f2e111ba827ea77730d6ce2fea698ada4e5b0b70b5fdbc18c5"; + sha256 = "a02e073214e9f3a371f7ec0ff8b34dd82bd4941194dd69c49ad80b321b9d887e"; }; propagatedBuildInputs = [ chardet six ]; diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix index ec55fed377b..16a5088c33d 100644 --- a/pkgs/development/python-modules/dependency-injector/default.nix +++ b/pkgs/development/python-modules/dependency-injector/default.nix @@ -9,11 +9,11 @@ in buildPythonPackage rec { pname = "dependency-injector"; - version = "3.14.3"; + version = "3.14.4"; src = fetchPypi { inherit pname version; - sha256 = "07366palyav9bawyq2b1gi76iamjkq6r5akzzbqv8s930sxq6yim"; + sha256 = "ecac135cc4e5824b6bf8242679fc7225f44885877677701da6de7703f060f518"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix index 4029eb89139..e69b6366a80 100644 --- a/pkgs/development/python-modules/distro/default.nix +++ b/pkgs/development/python-modules/distro/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "distro"; version = "1.3.0"; - buildInputs = [ pytest pytestcov tox]; + checkInputs = [ pytest pytestcov tox]; checkPhase = '' touch tox.ini diff --git a/pkgs/development/python-modules/django/2_0.nix b/pkgs/development/python-modules/django/2_0.nix index bf04f5e6119..daabcefb6e9 100644 --- a/pkgs/development/python-modules/django/2_0.nix +++ b/pkgs/development/python-modules/django/2_0.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "2.0.9"; + version = "2.0.10"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0sgx548zp5xf8dajiamdskbrphssiyajhgbw8iza6b68mda4bnfn"; + sha256 = "0292a7ad7d8ffc9cfc6a77f043d2e81f5bbc360c0c4a1686e130ef3432437d23"; }; patches = stdenv.lib.optionals withGdal [ diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix index d75fc90eda7..f227ed99bc9 100644 --- a/pkgs/development/python-modules/djangorestframework/default.nix +++ b/pkgs/development/python-modules/djangorestframework/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi, django }: buildPythonPackage rec { - version = "3.9.0"; + version = "3.9.1"; pname = "djangorestframework"; src = fetchPypi { inherit pname version; - sha256 = "0dk1r2qiifws4bb2pq8xk5dbsrhli0fi14iqg59v360mpfq6ay30"; + sha256 = "79c6efbb2514bc50cf25906d7c0a5cfead714c7af667ff4bd110312cd380ae66"; }; # Test settings are missing diff --git a/pkgs/development/python-modules/docrep/default.nix b/pkgs/development/python-modules/docrep/default.nix index fb2f84cbfe4..46106971b6e 100644 --- a/pkgs/development/python-modules/docrep/default.nix +++ b/pkgs/development/python-modules/docrep/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "docrep"; - version = "0.2.4"; + version = "0.2.5"; src = fetchPypi { inherit pname version; - sha256 = "ec7598fc2497a50f2c6882803d78e3c3cc4f1a554645d2c43c58d53653a1be01"; + sha256 = "a67c34d3a44892d3e2a0af0ac55c02b949a37ced9d55c0d7ade76362ba6692d7"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/dogpile.cache/default.nix b/pkgs/development/python-modules/dogpile.cache/default.nix index b830d34589b..9f739aae4ba 100644 --- a/pkgs/development/python-modules/dogpile.cache/default.nix +++ b/pkgs/development/python-modules/dogpile.cache/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "dogpile.cache"; - version = "0.6.7"; + version = "0.6.8"; src = fetchPypi { inherit pname version; - sha256 = "fca7deb7c276b879b01c15c5d39b3c05701dc43b263ec3fef1e52cb851cf88ab"; + sha256 = "e2fbe5d95e6df3fcfff2b666c69f3c06a4a3f77296142ae2bca523a176f88fa0"; }; # Disable concurrency tests that often fail, diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index ca0c2b8e3d3..e852076d8a2 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -4,12 +4,12 @@ , git, glibcLocales }: buildPythonPackage rec { - version = "0.19.9"; + version = "0.19.10"; pname = "dulwich"; src = fetchPypi { inherit pname version; - sha256 = "5e1e39555f594939a8aff1ca08b3bdf6c7efd4b941c2850760983a0197240974"; + sha256 = "0330787f28c5252f12040b9a1c0f5990f19f806c12b3d510ee7ea1fa53a6f3b4"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/ecdsa/default.nix b/pkgs/development/python-modules/ecdsa/default.nix index e9fdc71cd64..9b12119b9e9 100644 --- a/pkgs/development/python-modules/ecdsa/default.nix +++ b/pkgs/development/python-modules/ecdsa/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { }; # Only needed for tests - buildInputs = [ pkgs.openssl ]; + checkInputs = [ pkgs.openssl ]; meta = with stdenv.lib; { description = "ECDSA cryptographic signature library"; diff --git a/pkgs/development/python-modules/et_xmlfile/default.nix b/pkgs/development/python-modules/et_xmlfile/default.nix index 619b0e0c77c..09475329c1b 100644 --- a/pkgs/development/python-modules/et_xmlfile/default.nix +++ b/pkgs/development/python-modules/et_xmlfile/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256="0nrkhcb6jdrlb6pwkvd4rycw34y3s931hjf409ij9xkjsli9fkb1"; }; - buildInputs = [ lxml pytest ]; + checkInputs = [ lxml pytest ]; checkPhase = '' py.test $out ''; diff --git a/pkgs/development/python-modules/execnet/default.nix b/pkgs/development/python-modules/execnet/default.nix index f38fbf25c59..6f97a2cb6bf 100644 --- a/pkgs/development/python-modules/execnet/default.nix +++ b/pkgs/development/python-modules/execnet/default.nix @@ -15,7 +15,8 @@ buildPythonPackage rec { sha256 = "a7a84d5fa07a089186a329528f127c9d73b9de57f1a1131b82bb5320ee651f6a"; }; - buildInputs = [ pytest setuptools_scm ]; + checkInputs = [ pytest ]; + nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ apipkg ]; # remove vbox tests diff --git a/pkgs/development/python-modules/eyed3/default.nix b/pkgs/development/python-modules/eyed3/default.nix index b2394f0a0c3..6f10e69c0ec 100644 --- a/pkgs/development/python-modules/eyed3/default.nix +++ b/pkgs/development/python-modules/eyed3/default.nix @@ -14,13 +14,13 @@ }: buildPythonPackage rec { - version = "0.8.8"; + version = "0.8.9"; pname = "eyeD3"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "197lszkyzm377ym5r0ssryfsiz20yjx8y4rii3wc81n92d1qzlaq"; + sha256 = "b6bb626566f2949da409d7a871576271e2d6254dfb3d416b21713dabc4b6b00f"; }; # https://github.com/nicfit/eyeD3/pull/284 diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index d7586fd9955..c5505efc168 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "Fiona"; - version = "1.8.2"; + version = "1.8.4"; src = fetchPypi { inherit pname version; - sha256 = "4c6419b7ac29136708029f6a44b4ccd458735a4d241016c7b1bab41685c08d8f"; + sha256 = "aec9ab2e3513c9503ec123b1a8573bee55fc6a66e2ac07088c3376bf6738a424"; }; CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11"; diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix index 5b120c6af37..1ab01cf7d89 100644 --- a/pkgs/development/python-modules/fs/default.nix +++ b/pkgs/development/python-modules/fs/default.nix @@ -1,4 +1,5 @@ -{ pkgs +{ lib +, glibcLocales , buildPythonPackage , fetchPypi , six @@ -18,31 +19,28 @@ buildPythonPackage rec { pname = "fs"; - version = "2.1.2"; + version = "2.1.3"; src = fetchPypi { inherit pname version; - sha256 = "6f7e36b6381f353339957784a67bd9d440482b7eaeaff7b1f97249ceb7223f63"; + sha256 = "87e8d4e93040779a407c92b7f2f27117038927b4b1da41bdce23ce226557327d"; }; - buildInputs = [ pkgs.glibcLocales ]; + buildInputs = [ glibcLocales ]; checkInputs = [ nose pyftpdlib mock psutil ]; propagatedBuildInputs = [ six appdirs pytz ] - ++ pkgs.lib.optionals (!isPy3k) [ backports_os ] - ++ pkgs.lib.optionals (!pythonAtLeast "3.6") [ typing ] - ++ pkgs.lib.optionals (!pythonAtLeast "3.5") [ scandir ] - ++ pkgs.lib.optionals (!pythonAtLeast "3.5") [ enum34 ]; - - postPatch = '' - # required for installation - touch LICENSE - # tests modify home directory results in (4 tests failing) / 1600 - rm tests/test_appfs.py tests/test_opener.py - ''; + ++ lib.optionals (!isPy3k) [ backports_os ] + ++ lib.optionals (!pythonAtLeast "3.6") [ typing ] + ++ lib.optionals (!pythonAtLeast "3.5") [ scandir ] + ++ lib.optionals (!pythonAtLeast "3.5") [ enum34 ]; LC_ALL="en_US.utf-8"; - meta = with pkgs.lib; { + checkPhase = '' + HOME=$(mktemp -d) nosetests tests [] + ''; + + meta = with lib; { description = "Filesystem abstraction"; homepage = https://github.com/PyFilesystem/pyfilesystem2; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/google_cloud_asset/default.nix b/pkgs/development/python-modules/google_cloud_asset/default.nix index f6ad7e60a5c..96ee38b3e44 100644 --- a/pkgs/development/python-modules/google_cloud_asset/default.nix +++ b/pkgs/development/python-modules/google_cloud_asset/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "0.1.1"; + version = "0.1.2"; src = fetchPypi { inherit pname version; - sha256 = "cec2f44a670371e24e6140c454fdac3ed06be0a021042c6756a3284b505335c7"; + sha256 = "233157c5d902a084477fb5fe6ca1f946d6fe7911577d4a36aee0227777db61b7"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/google_cloud_automl/default.nix b/pkgs/development/python-modules/google_cloud_automl/default.nix index c7775aac293..013e6369934 100644 --- a/pkgs/development/python-modules/google_cloud_automl/default.nix +++ b/pkgs/development/python-modules/google_cloud_automl/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-automl"; - version = "0.1.1"; + version = "0.1.2"; src = fetchPypi { inherit pname version; - sha256 = "793d463f78d22a822196cb3e34b247fbdba07eeae15ceadb911f5ccecd843f87"; + sha256 = "32890d1e043eb09a86ff1839096dfb49051cd436bdf1a1708299484cfd06db1a"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/google_cloud_bigquery/default.nix b/pkgs/development/python-modules/google_cloud_bigquery/default.nix index 18f2087df17..15220837a8c 100644 --- a/pkgs/development/python-modules/google_cloud_bigquery/default.nix +++ b/pkgs/development/python-modules/google_cloud_bigquery/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "1.6.0"; + version = "1.6.1"; src = fetchPypi { inherit pname version; - sha256 = "d559ba1e05cf6a960e09bb5aab3aeb4d50ad9e08c77a20a17c01c9b2bd8d6cb7"; + sha256 = "04f0a2bb53d779fc62927be92f8253c34774a1a9f95cccec3e45d000d1547ef9"; }; checkInputs = [ pytest mock ipython ]; diff --git a/pkgs/development/python-modules/google_cloud_bigtable/default.nix b/pkgs/development/python-modules/google_cloud_bigtable/default.nix index 7eeb41c56de..6cb1711843c 100644 --- a/pkgs/development/python-modules/google_cloud_bigtable/default.nix +++ b/pkgs/development/python-modules/google_cloud_bigtable/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "0.31.0"; + version = "0.31.1"; src = fetchPypi { inherit pname version; - sha256 = "b6c8572697b5fdc7fcb95d88f87b8c84cea5a7aef2d57d3de0d6a9e2b0e8424f"; + sha256 = "f0e66d7c9b37b0a7fc021f10ffaf848b10618a91060ac143ef7f615d682c97d5"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_datastore/default.nix b/pkgs/development/python-modules/google_cloud_datastore/default.nix index f0754b230f0..54d772d7e9c 100644 --- a/pkgs/development/python-modules/google_cloud_datastore/default.nix +++ b/pkgs/development/python-modules/google_cloud_datastore/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-datastore"; - version = "1.7.1"; + version = "1.7.3"; src = fetchPypi { inherit pname version; - sha256 = "03c1a06b0d94ac2f801513c9255bd5fc8773d036f0e59d63ffe1152cfe4320de"; + sha256 = "e00bddc03670be206ddcbc5c1cbda0acc51db963f0ff54189bd6710f8e93a4c9"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_dns/default.nix b/pkgs/development/python-modules/google_cloud_dns/default.nix index 48d0c742946..e9ff0b81ec7 100644 --- a/pkgs/development/python-modules/google_cloud_dns/default.nix +++ b/pkgs/development/python-modules/google_cloud_dns/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-dns"; - version = "0.29.0"; + version = "0.29.2"; src = fetchPypi { inherit pname version; - sha256 = "f6ea35676c59b6bfd4a2e6aa42670c6ed3505ba46f7117cdc953094e568f404e"; + sha256 = "d1476115c983094f124fe8b7a1350414072c048bf236336f3ab0816912e6e6bf"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_error_reporting/default.nix b/pkgs/development/python-modules/google_cloud_error_reporting/default.nix index 3ddf022d664..d6f89aefc5f 100644 --- a/pkgs/development/python-modules/google_cloud_error_reporting/default.nix +++ b/pkgs/development/python-modules/google_cloud_error_reporting/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-error-reporting"; - version = "0.30.0"; + version = "0.30.1"; src = fetchPypi { inherit pname version; - sha256 = "768a5c3ed7a96b60f051717c1138e561493ab0ef4dd4acbcf9e2b1cc2d09e06a"; + sha256 = "29d04cb6cc2053468addb78351b841df00cb56066e89b6aec0970cb003dd2fab"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_firestore/default.nix b/pkgs/development/python-modules/google_cloud_firestore/default.nix index 6cc42805d4e..d7574e4d5a4 100644 --- a/pkgs/development/python-modules/google_cloud_firestore/default.nix +++ b/pkgs/development/python-modules/google_cloud_firestore/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "0.30.0"; + version = "0.30.1"; src = fetchPypi { inherit pname version; - sha256 = "7f990572ace890867bbbc63c9d700c1d2635ba4c799e05f30b6fdca490021243"; + sha256 = "2e82481ff396e166f530c097a74670efab93466a70a6a2676081a3f30ef74b7f"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/google_cloud_kms/default.nix b/pkgs/development/python-modules/google_cloud_kms/default.nix index d5db318cef3..e04a9798e7a 100644 --- a/pkgs/development/python-modules/google_cloud_kms/default.nix +++ b/pkgs/development/python-modules/google_cloud_kms/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-kms"; - version = "0.2.0"; + version = "0.2.1"; src = fetchPypi { inherit pname version; - sha256 = "add648f9185a8724f8632b3a006ee0af4847a5ab4ca085954ff1d00a8cd2d54c"; + sha256 = "3e9d9e07af8651826db5997ca0f11f02401cef42eb822d416a19df05b17c5a45"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/google_cloud_language/default.nix b/pkgs/development/python-modules/google_cloud_language/default.nix index adf354f3bff..60ceb9b97ae 100644 --- a/pkgs/development/python-modules/google_cloud_language/default.nix +++ b/pkgs/development/python-modules/google_cloud_language/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-language"; - version = "1.1.0"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "2450e3265df129241cb21badb9d4ce2089d2652581df38e03c14a7ec85679ecb"; + sha256 = "e4742b98e2d69ca21864e3218805a9db7e04e06f0672f2385cf6b5361ee35605"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/google_cloud_redis/default.nix b/pkgs/development/python-modules/google_cloud_redis/default.nix index 85aff0b19de..2c2d022d142 100644 --- a/pkgs/development/python-modules/google_cloud_redis/default.nix +++ b/pkgs/development/python-modules/google_cloud_redis/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-redis"; - version = "0.2.0"; + version = "0.2.1"; src = fetchPypi { inherit pname version; - sha256 = "c0fa00cafbce3e9a0e35fb7f9d754ac70b450b6496c62c20bb3a1f500aeca9e4"; + sha256 = "449fd11699f9ae23ec2ccf1b06681bb90b4c1788f82fbbf1ce1c1d2e77833eb1"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/google_cloud_resource_manager/default.nix b/pkgs/development/python-modules/google_cloud_resource_manager/default.nix index a8182c5794d..fd67709dd37 100644 --- a/pkgs/development/python-modules/google_cloud_resource_manager/default.nix +++ b/pkgs/development/python-modules/google_cloud_resource_manager/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-resource-manager"; - version = "0.28.1"; + version = "0.28.3"; src = fetchPypi { inherit pname version; - sha256 = "fc29c11dcbe9208261d377185a1ae5331bab43f2a592222a25c8aca9c8031308"; + sha256 = "5999f327bfa6692679e82690c3e61f11097bbbe3ecee370210625676bac605e6"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix b/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix index ef95391ebe0..c52440e0ee1 100644 --- a/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix +++ b/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-runtimeconfig"; - version = "0.28.1"; + version = "0.28.3"; src = fetchPypi { inherit pname version; - sha256 = "f441fbc22e2d0871ecb390854aa352cf467d2751cbc0dac7578274ead813519e"; + sha256 = "8188a098c2c6603aa0cad50f8778a84a0f36a62062309a331a41271372fac798"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_securitycenter/default.nix b/pkgs/development/python-modules/google_cloud_securitycenter/default.nix index d1e03c40bce..23a1b5b287d 100644 --- a/pkgs/development/python-modules/google_cloud_securitycenter/default.nix +++ b/pkgs/development/python-modules/google_cloud_securitycenter/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "0.1.0"; + version = "0.1.1"; src = fetchPypi { inherit pname version; - sha256 = "6ef386ba065a167670ad1b67f15fb7ba9e21ce33579fa6d7fafafd5b970b3e8a"; + sha256 = "11d19052c84dd8e5bc936f5276443e14c2a5ccaae031b2a39415a9f3832a1029"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/google_cloud_spanner/default.nix b/pkgs/development/python-modules/google_cloud_spanner/default.nix index a4b72d0e496..a0bf55655c2 100644 --- a/pkgs/development/python-modules/google_cloud_spanner/default.nix +++ b/pkgs/development/python-modules/google_cloud_spanner/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "1.6.0"; + version = "1.6.1"; src = fetchPypi { inherit pname version; - sha256 = "f7140e1cb43fbf670521112f03822b63d15fbcbd2830c7cfa1b868836e04b6b4"; + sha256 = "28e56bd8aefa0837e59ba67974f446efda45e7691aea176d78b4ca1d2217dd86"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_speech/default.nix b/pkgs/development/python-modules/google_cloud_speech/default.nix index 3054f618784..b7b32a9ad0e 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.36.0"; + version = "0.36.2"; src = fetchPypi { inherit pname version; - sha256 = "1jjicvf5r20ibhkkay0p6av8jifvp2wkdd8bs9vmhm4rwvcnlxbf"; + sha256 = "afe0d69e5db64bd58bc5fd9d16aad90c1507556bf317fdeadcfc8ccbdaa1659a"; }; propagatedBuildInputs = [ google_api_core ]; diff --git a/pkgs/development/python-modules/google_cloud_storage/default.nix b/pkgs/development/python-modules/google_cloud_storage/default.nix index 5784a641290..d59f281c59a 100644 --- a/pkgs/development/python-modules/google_cloud_storage/default.nix +++ b/pkgs/development/python-modules/google_cloud_storage/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "1.13.0"; + version = "1.13.2"; src = fetchPypi { inherit pname version; - sha256 = "fc32b9be41a45016ba2387e3ad23e70ccba399d626ef596409316f7cee477956"; + sha256 = "f8884619fed4c77234c7293939be5a696869f61a5dc2ca47193cff630cee179f"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_translate/default.nix b/pkgs/development/python-modules/google_cloud_translate/default.nix index 842a145a3f4..01caeed4866 100644 --- a/pkgs/development/python-modules/google_cloud_translate/default.nix +++ b/pkgs/development/python-modules/google_cloud_translate/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-translate"; - version = "1.3.1"; + version = "1.3.3"; src = fetchPypi { inherit pname version; - sha256 = "4420f5b320145bf097ca9a12b18ec27c067886e2832d181f268c46c3bcb0d2e4"; + sha256 = "0f204a1cc95bcd708102ad86665da2dff53c1b9f47d490506e45cc96c93978ad"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_vision/default.nix b/pkgs/development/python-modules/google_cloud_vision/default.nix index da01147f645..aabc73f571c 100644 --- a/pkgs/development/python-modules/google_cloud_vision/default.nix +++ b/pkgs/development/python-modules/google_cloud_vision/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-vision"; - version = "0.35.1"; + version = "0.35.2"; src = fetchPypi { inherit pname version; - sha256 = "0hx80q8rcgs0kvhv0xix2dhr3n19abac4sj4k5pfqxh6qzdxm3d8"; + sha256 = "25b537d4b76305e9758fe2f57fd5929a04bf3a46cb4e8d0f731e984f46405be8"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix b/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix index 5a12be2ae55..80793059094 100644 --- a/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix +++ b/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "google-cloud-websecurityscanner"; - version = "0.1.0"; + version = "0.1.1"; src = fetchPypi { inherit pname version; - sha256 = "d41a9e1a093862aa1b181fa7fdc2a94e185eb4a8f290dbdb928bc9ebd253a95f"; + sha256 = "d965d986053b49e4005b6b6cdf035d7dd4a3b64dcfb6325050b70c97831f8d6f"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/google_resumable_media/default.nix b/pkgs/development/python-modules/google_resumable_media/default.nix index 430945e6dfd..096f93b017f 100644 --- a/pkgs/development/python-modules/google_resumable_media/default.nix +++ b/pkgs/development/python-modules/google_resumable_media/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-resumable-media"; - version = "0.3.1"; + version = "0.3.2"; src = fetchPypi { inherit pname version; - sha256 = "97de518f8166d442cc0b61fab308bcd319dbb970981e667ec8ded44f5ce49836"; + sha256 = "3e38923493ca0d7de0ad91c31acfefc393c78586db89364e91cb4f11990e51ba"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/googleapis_common_protos/default.nix b/pkgs/development/python-modules/googleapis_common_protos/default.nix index 51e3810cc7f..cc689acc48f 100644 --- a/pkgs/development/python-modules/googleapis_common_protos/default.nix +++ b/pkgs/development/python-modules/googleapis_common_protos/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "googleapis-common-protos"; - version = "1.5.5"; + version = "1.5.6"; src = fetchPypi { inherit pname version; - sha256 = "0946967c4c29b1339bb211949e1e17dbe0ae9ff8265fafa7bf4cf2164ef5a3b1"; + sha256 = "6de6de98e895f4266caefa768778533bdea98abbead6972d35c8a0f57409eea2"; }; propagatedBuildInputs = [ protobuf ]; diff --git a/pkgs/development/python-modules/graphite-web/default.nix b/pkgs/development/python-modules/graphite-web/default.nix index 229e35b6ca4..f49ebc3fb5d 100644 --- a/pkgs/development/python-modules/graphite-web/default.nix +++ b/pkgs/development/python-modules/graphite-web/default.nix @@ -6,13 +6,13 @@ if django.version != "1.8.19" then throw "graphite-web should be build with django_1_8 and django_tagging_0_4_3" else buildPythonPackage rec { pname = "graphite-web"; - version = "1.1.4"; + version = "1.1.5"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "4430929f954998d77aa0a61246c62d64a00a2f9464320f9a462294dd3448e522"; + sha256 = "d43945d190f2b3a6d18daa6ace9a1bd3695e93dc593f50cd72c2af420883b99d"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix index 6f07725520f..04dc793a717 100644 --- a/pkgs/development/python-modules/gsd/default.nix +++ b/pkgs/development/python-modules/gsd/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "1.5.4"; + version = "1.5.5"; pname = "gsd"; src = fetchPypi { inherit pname version; - sha256 = "1p1akwirxq809apxia6b9ndalpdfgv340ssnli78h74bkqnw1376"; + sha256 = "b80487a8269ba55201390353fd46d1904ec16f5488c8daaf7ff87154e09cca42"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/homeassistant-pyozw/default.nix b/pkgs/development/python-modules/homeassistant-pyozw/default.nix index a0861b0cffd..3292770a661 100644 --- a/pkgs/development/python-modules/homeassistant-pyozw/default.nix +++ b/pkgs/development/python-modules/homeassistant-pyozw/default.nix @@ -2,12 +2,12 @@ python_openzwave.overridePythonAttrs (oldAttrs: rec { pname = "homeassistant_pyozw"; - version = "0.1.1"; + version = "0.1.2"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "136582d1b948168991af8ba1011304684834a4a61a6588e1c1f70b439b6f2483"; + sha256 = "d64389f294b1fdee57adf78cd25ba45c9095facec3d80120182bbf8ba1fcdf05"; }; meta.homepage = https://github.com/home-assistant/python-openzwave; diff --git a/pkgs/development/python-modules/httpretty/default.nix b/pkgs/development/python-modules/httpretty/default.nix index 56898b3bf87..9d03c7528b6 100644 --- a/pkgs/development/python-modules/httpretty/default.nix +++ b/pkgs/development/python-modules/httpretty/default.nix @@ -11,6 +11,8 @@ , urllib3 , rednose , nose-randomly +, six +, mock }: buildPythonPackage rec { @@ -22,8 +24,11 @@ buildPythonPackage rec { sha256 = "01b52d45077e702eda491f4fe75328d3468fd886aed5dcc530003e7b2b5939dc"; }; - checkInputs = [ tornado requests httplib2 sure nose nose-randomly rednose coverage certifi ]; - propagatedBuildInputs = [ urllib3 ]; + checkInputs = [ nose sure coverage mock rednose + # Following not declared in setup.py + nose-randomly requests tornado httplib2 + ]; + propagatedBuildInputs = [ six ]; meta = with stdenv.lib; { homepage = "https://falcao.it/HTTPretty/"; diff --git a/pkgs/development/python-modules/hupper/default.nix b/pkgs/development/python-modules/hupper/default.nix index 1715e6eeb45..c0e4c4ec9e8 100644 --- a/pkgs/development/python-modules/hupper/default.nix +++ b/pkgs/development/python-modules/hupper/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "hupper"; - version = "1.4.1"; + version = "1.4.2"; src = fetchPypi { inherit pname version; - sha256 = "17dd6f59e7cd52166302b2a6a3112e03fb4612eaff9bb19cd0603cf67e03c5cf"; + sha256 = "eb3778398658a011c96e620adcd73175f306f880a6d86b2ebb6d2a15a74b6b9b"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/hvac/default.nix b/pkgs/development/python-modules/hvac/default.nix index 340ba83567c..4eda2d864c8 100644 --- a/pkgs/development/python-modules/hvac/default.nix +++ b/pkgs/development/python-modules/hvac/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "hvac"; - version = "0.7.0"; + version = "0.7.2"; src = fetchPypi { inherit pname version; - sha256 = "4fc3ca6b463200da5186a520ba7f6ce6d2873f9df0139e326665e9ea22514db3"; + sha256 = "773775fa827c74299abd96079eeeeb0cefbb23b484195c03cff27d04716539ba"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 1d6b1ed0b19..991edee90e5 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "identify"; - version = "1.1.7"; + version = "1.1.8"; src = fetchPypi { inherit pname version; - sha256 = "5e956558a9a1e3b3891d7c6609fc9709657a11878af288ace484d1a46a93922b"; + sha256 = "08826e68e39e7de53cc2ddd8f6228a4e463b4bacb20565e5301c3ec690e68d27"; }; # Tests not included in PyPI tarball diff --git a/pkgs/development/python-modules/imgaug/default.nix b/pkgs/development/python-modules/imgaug/default.nix index 08f1d49d8c6..678614912a8 100644 --- a/pkgs/development/python-modules/imgaug/default.nix +++ b/pkgs/development/python-modules/imgaug/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "imgaug"; - version = "0.2.6"; + version = "0.2.7"; src = fetchPypi { inherit pname version; - sha256 = "1wy8ydkqq0jrwxwdv04q89n3gwsr9pjaspsbw26ipg5a5lnhb9c2"; + sha256 = "7ca6bce4dcfd3e40330b593fe8e55018bf475983cc6777f8ebf5422c722fffb8"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/imutils/default.nix b/pkgs/development/python-modules/imutils/default.nix index 4afdb1a1dc9..c5530d7c1d0 100644 --- a/pkgs/development/python-modules/imutils/default.nix +++ b/pkgs/development/python-modules/imutils/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "0.5.1"; + version = "0.5.2"; pname = "imutils"; src = fetchPypi { inherit pname version; - sha256 = "37d17adc9e71386c59b28f4ef5972ef6fe0023714fa1a652b8edc83f7ce0654c"; + sha256 = "1d2bdf373e3e6cfbdc113d4e91547d3add3774d8722c8d4f225fa39586fb8076"; }; propagatedBuildInputs = [ opencv3 ]; diff --git a/pkgs/development/python-modules/j2cli/default.nix b/pkgs/development/python-modules/j2cli/default.nix index d8da0d8f129..13af20ba79b 100644 --- a/pkgs/development/python-modules/j2cli/default.nix +++ b/pkgs/development/python-modules/j2cli/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "j2cli"; - version = "0.3.1-0"; + version = "0.3.5.post1"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0y3w1x9935qzx8w6m2r6g4ghyjmxn33wryiif6xb56q7cj9w1433"; + sha256 = "c0439a79308aae320bfd01d82b56893b02fe461195d8b69b438ba9b333075642"; }; buildInputs = [ nose ]; diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index 1518bd1d902..4f713e212f4 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "jedi"; - version = "0.13.1"; + version = "0.13.2"; src = fetchPypi { inherit pname version; - sha256 = "b7493f73a2febe0dc33d51c99b474547f7f6c0b2c8fb2b21f453eef204c12148"; + sha256 = "571702b5bd167911fe9036e5039ba67f820d6502832285cde8c881ab2b2149fd"; }; postPatch = '' diff --git a/pkgs/development/python-modules/jenkinsapi/default.nix b/pkgs/development/python-modules/jenkinsapi/default.nix index c45612adc0e..70bf12a8f0c 100644 --- a/pkgs/development/python-modules/jenkinsapi/default.nix +++ b/pkgs/development/python-modules/jenkinsapi/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "jenkinsapi"; - version = "0.3.6"; + version = "0.3.8"; src = fetchPypi { inherit pname version; - sha256 = "c46d231111fd661b733d417976e30a69f4e7fe6a8499bd59b4b3ea2a2504898c"; + sha256 = "120adfc9cea83fb890744b5049c5bb7edc77699059f0da62db66354ec27c54e2"; }; propagatedBuildInputs = [ pytz requests ]; diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix index fb9e859e0e8..9b2d3a5b832 100644 --- a/pkgs/development/python-modules/jsbeautifier/default.nix +++ b/pkgs/development/python-modules/jsbeautifier/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "jsbeautifier"; - version = "1.8.8"; + version = "1.8.9"; propagatedBuildInputs = [ six ]; @@ -10,7 +10,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "98a29abef991f9f8f8fa67c32ccc07bee3d95ef7c8323e3560f6a5e83db7412a"; + sha256 = "7d02baa9b0459bf9c5407c1b99ad5566de04a3b664b18a58ac64f52832034204"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/jsonref/default.nix b/pkgs/development/python-modules/jsonref/default.nix index 03a2a63431b..c174a011b5f 100644 --- a/pkgs/development/python-modules/jsonref/default.nix +++ b/pkgs/development/python-modules/jsonref/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "15v69rg2lkcykb2spnq6vbbirv9sfq480fnwmfppw9gn3h95pi7k"; }; - buildInputs = [ pytest mock ]; + checkInputs = [ pytest mock ]; checkPhase = '' py.test tests.py diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix index 1d8eab79688..db6be9f9918 100644 --- a/pkgs/development/python-modules/jsonschema/default.nix +++ b/pkgs/development/python-modules/jsonschema/default.nix @@ -10,15 +10,17 @@ buildPythonPackage rec { sha256 = "00kf3zmpp9ya4sydffpifn0j0mzm342a2vzh82p6r0vh10cg7xbg"; }; - buildInputs = [ nose mock vcversioner ]; + checkInputs = [ nose mock vcversioner ]; propagatedBuildInputs = [ functools32 ]; - patchPhase = '' + postPatch = '' substituteInPlace jsonschema/tests/test_jsonschema_test_suite.py \ - --replace "python" "${python}/bin/${python.executable}" + --replace "python" "${python.pythonForBuild.interpreter}" ''; - checkPhase = "nosetests"; + checkPhase = '' + nosetests + ''; meta = with stdenv.lib; { homepage = https://github.com/Julian/jsonschema; diff --git a/pkgs/development/python-modules/jupyter_client/default.nix b/pkgs/development/python-modules/jupyter_client/default.nix index 5ee99d5071f..6d874b4bf9e 100644 --- a/pkgs/development/python-modules/jupyter_client/default.nix +++ b/pkgs/development/python-modules/jupyter_client/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "jupyter_client"; - version = "5.2.3"; + version = "5.2.4"; src = fetchPypi { inherit pname version; - sha256 = "27befcf0446b01e29853014d6a902dd101ad7d7f94e2252b1adca17c3466b761"; + sha256 = "b5f9cb06105c1d2d30719db5ffb3ea67da60919fb68deaefa583deccd8813551"; }; checkInputs = [ ipykernel ipython mock pytest ]; diff --git a/pkgs/development/python-modules/kaptan/default.nix b/pkgs/development/python-modules/kaptan/default.nix index 425a3b29f13..89f2c1ecaca 100644 --- a/pkgs/development/python-modules/kaptan/default.nix +++ b/pkgs/development/python-modules/kaptan/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "kaptan"; - version = "0.5.10"; + version = "0.5.11"; src = fetchPypi { inherit pname version; - sha256 = "44df200d030975650a3a832c13b48cafdeb1a237b23de181d6a2346107e39da3"; + sha256 = "8403d6e48200c3f49cb6d6b3dcb5898aa5ab9d820831655bf9a2403e00cd4207"; }; propagatedBuildInputs = [ pyyaml ]; diff --git a/pkgs/development/python-modules/kerberos/default.nix b/pkgs/development/python-modules/kerberos/default.nix index 455368e58d4..3d581d763a5 100644 --- a/pkgs/development/python-modules/kerberos/default.nix +++ b/pkgs/development/python-modules/kerberos/default.nix @@ -1,7 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi -, pkgs +, kerberos }: buildPythonPackage rec { @@ -13,7 +13,10 @@ buildPythonPackage rec { sha256 = "19663qxmma0i8bfbjc2iwy5hgq0g4pfb75r023v5dps68zfvffgh"; }; - buildInputs = [ pkgs.kerberos ]; + nativeBuildInputs = [ kerberos ]; + + # No tests in archive + doCheck = false; meta = with stdenv.lib; { description = "Kerberos high-level interface"; diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix index 7620ee94441..2a8c59be420 100644 --- a/pkgs/development/python-modules/kombu/default.nix +++ b/pkgs/development/python-modules/kombu/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "kombu"; - version = "4.2.1"; + version = "4.2.2.post1"; src = fetchPypi { inherit pname version; - sha256 = "86adec6c60f63124e2082ea8481bbe4ebe04fde8ebed32c177c7f0cd2c1c9082"; + sha256 = "3c9dca2338c5d893f30c151f5d29bfb81196748ab426d33c362ab51f1e8dbf78"; }; postPatch = '' diff --git a/pkgs/development/python-modules/ldap3/default.nix b/pkgs/development/python-modules/ldap3/default.nix index 73957df1d9d..6fe52f88574 100644 --- a/pkgs/development/python-modules/ldap3/default.nix +++ b/pkgs/development/python-modules/ldap3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, fetchFromGitHub, buildPythonPackage, gssapi, pyasn1 }: +{ stdenv, fetchPypi, fetchFromGitHub, buildPythonPackage, pyasn1 }: buildPythonPackage rec { version = "2.5.2"; @@ -17,8 +17,6 @@ buildPythonPackage rec { sha256 = "0p5l4bhy6j2nvvlxz5zvznbaqb72x791v9la2jr2wpwr60mzz9hw"; }; - buildInputs = [ gssapi ]; - propagatedBuildInputs = [ pyasn1 ]; doCheck = false; # requires network diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix index b0daaa0d110..f3e030084d2 100644 --- a/pkgs/development/python-modules/ledgerblue/default.nix +++ b/pkgs/development/python-modules/ledgerblue/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "ledgerblue"; - version = "0.1.21"; + version = "0.1.22"; src = fetchPypi { inherit pname version; - sha256 = "f4fa7d062dcc124f032238030223363c7d85812272cd30afd09d49bb6a3256dc"; + sha256 = "15206e92220d96512b357a9a740bc91b8b33b42b9164fe3b56c4c3aedf882cdc"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix index 78daa85ea80..21ea6de02f1 100644 --- a/pkgs/development/python-modules/llfuse/default.nix +++ b/pkgs/development/python-modules/llfuse/default.nix @@ -13,17 +13,15 @@ buildPythonPackage rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ pytest fuse attr which ]; + buildInputs = [ fuse ]; + checkInputs = [ pytest attr which ]; propagatedBuildInputs = [ contextlib2 ]; checkPhase = '' - py.test + py.test -k "not test_listdir" ''; - # FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin' - doCheck = false; - meta = with stdenv.lib; { description = "Python bindings for the low-level FUSE API"; homepage = https://code.google.com/p/python-llfuse/; diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix index b79527b8736..15e53dcffb2 100644 --- a/pkgs/development/python-modules/llvmlite/default.nix +++ b/pkgs/development/python-modules/llvmlite/default.nix @@ -19,7 +19,8 @@ buildPythonPackage rec { sha256 = "fd64def9a51dd7dc61913a7a08eeba5b9785522740bec5a7c5995b2a90525025"; }; - propagatedBuildInputs = [ llvm ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34; + nativeBuildInputs = [ llvm ]; + propagatedBuildInputs = [ ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34; # Disable static linking # https://github.com/numba/llvmlite/issues/93 diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix index 5672fce602e..a37a22318ec 100644 --- a/pkgs/development/python-modules/lxml/default.nix +++ b/pkgs/development/python-modules/lxml/default.nix @@ -7,13 +7,14 @@ buildPythonPackage rec { pname = "lxml"; - version = "4.2.5"; + version = "4.2.6"; src = fetchPypi { inherit pname version; - sha256 = "36720698c29e7a9626a0dc802ef8885f8f0239bfd1689628ecd459a061f2807f"; + sha256 = "7035d9361f3ceec9ccc1dd3482094d1174580e7e1bf6870b77ea758f7cad15d2"; }; + nativeBuildInputs = [ libxml2.dev libxslt.dev ]; buildInputs = [ libxml2 libxslt ]; hardeningDisable = stdenv.lib.optional stdenv.isDarwin "format"; diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix index 8b1618515c8..612e2fd76b2 100644 --- a/pkgs/development/python-modules/m2r/default.nix +++ b/pkgs/development/python-modules/m2r/default.nix @@ -2,11 +2,11 @@ mistune, docutils } : buildPythonPackage rec { pname = "m2r"; - version = "0.2.0"; + version = "0.2.1"; src = fetchPypi { inherit pname version; - sha256 = "b64ee5ac870311a69967fe787be8607df67b02a329f0fc76c8bf477336a99c78"; + sha256 = "bf90bad66cda1164b17e5ba4a037806d2443f2a4d5ddc9f6a5554a0322aaed99"; }; propagatedBuildInputs = [ mistune docutils ]; diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 718eb2de425..d4c8e970c50 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -35,13 +35,15 @@ buildPythonPackage rec { XDG_RUNTIME_DIR = "/tmp"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python which sphinx stdenv ] ++ stdenv.lib.optional enableGhostscript ghostscript ++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ]; propagatedBuildInputs = [ cycler dateutil nose numpy pyparsing tornado freetype kiwisolver - libpng pkgconfig mock pytz ] + libpng mock pytz ] ++ stdenv.lib.optional (pythonOlder "3.3") backports_functools_lru_cache ++ stdenv.lib.optional enableGtk2 pygtk ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ] diff --git a/pkgs/development/python-modules/minimock/default.nix b/pkgs/development/python-modules/minimock/default.nix index 71409785b77..856f7b45adf 100644 --- a/pkgs/development/python-modules/minimock/default.nix +++ b/pkgs/development/python-modules/minimock/default.nix @@ -13,9 +13,11 @@ buildPythonPackage rec { sha256 = "c88fa8a7120623f23990a7f086a9657f6ced09025a55e3be8649a30b4945441a"; }; - buildInputs = [ nose ]; + checkInputs = [ nose ]; - checkPhase = "./test"; + checkPhase = '' + ./test + ''; meta = with stdenv.lib; { description = "A minimalistic mocking library for python"; diff --git a/pkgs/development/python-modules/mwoauth/default.nix b/pkgs/development/python-modules/mwoauth/default.nix index e9d43e9e2b6..d22bd460f5f 100644 --- a/pkgs/development/python-modules/mwoauth/default.nix +++ b/pkgs/development/python-modules/mwoauth/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "mwoauth"; - version = "0.3.2"; + version = "0.3.3"; src = fetchPypi { inherit pname version; - sha256 = "1krqz755415z37z1znrc77vi4xyp5ys6fnq4zwcwixjjbzddpavj"; + sha256 = "8a57a315732733240e9522d3c4e370cbdf2c045d00fe0dab433d6119fa09038f"; }; # package has no tests diff --git a/pkgs/development/python-modules/nest-asyncio/default.nix b/pkgs/development/python-modules/nest-asyncio/default.nix index ad586d20fd6..e8fa0e5e409 100644 --- a/pkgs/development/python-modules/nest-asyncio/default.nix +++ b/pkgs/development/python-modules/nest-asyncio/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "0.9.7"; + version = "0.9.10"; pname = "nest_asyncio"; disabled = !(pythonAtLeast "3.5"); src = fetchPypi { inherit pname version; - sha256 = "309160419228c0291268164e33be2d15514c9364b95fac3c04e14fad2a1c008b"; + sha256 = "d952e21f4333166d79423db2eda6d772be7b30134381ee055d5177be0db68a57"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/netaddr/default.nix b/pkgs/development/python-modules/netaddr/default.nix index ac236a77554..ed56e6803f4 100644 --- a/pkgs/development/python-modules/netaddr/default.nix +++ b/pkgs/development/python-modules/netaddr/default.nix @@ -2,7 +2,8 @@ , buildPythonPackage , fetchPypi , pytest -, pkgs +, fetchpatch +, glibcLocales }: buildPythonPackage rec { @@ -15,7 +16,7 @@ buildPythonPackage rec { }; LC_ALL = "en_US.UTF-8"; - buildInputs = [ pkgs.glibcLocales pytest ]; + checkInputs = [ glibcLocales pytest ]; checkPhase = '' # fails on python3.7: https://github.com/drkjam/netaddr/issues/182 @@ -25,7 +26,7 @@ buildPythonPackage rec { ''; patches = [ - (pkgs.fetchpatch { + (fetchpatch { url = https://github.com/drkjam/netaddr/commit/2ab73f10be7069c9412e853d2d0caf29bd624012.patch; sha256 = "0s1cdn9v5alpviabhcjmzc0m2pnpq9dh2fnnk2x96dnry1pshg39"; }) diff --git a/pkgs/development/python-modules/netifaces/default.nix b/pkgs/development/python-modules/netifaces/default.nix index 3a33987c490..1f1cc3857e4 100644 --- a/pkgs/development/python-modules/netifaces/default.nix +++ b/pkgs/development/python-modules/netifaces/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "0.10.7"; + version = "0.10.9"; pname = "netifaces"; src = fetchPypi { inherit pname version; - sha256 = "bd590fcb75421537d4149825e1e63cca225fd47dad861710c46bd1cb329d8cbd"; + sha256 = "2dee9ffdd16292878336a58d04a20f0ffe95555465fee7c9bd23b3490ef2abf3"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix index 7491865057b..9c80301ce93 100644 --- a/pkgs/development/python-modules/nibabel/default.nix +++ b/pkgs/development/python-modules/nibabel/default.nix @@ -1,33 +1,43 @@ -{ stdenv +{ lib , buildPythonPackage , fetchPypi +, isPy3k , numpy -, nose , six +, bz2file +, nose +, mock }: buildPythonPackage rec { pname = "nibabel"; - version = "2.3.1"; + version = "2.3.3"; src = fetchPypi { inherit pname version; - sha256 = "1xb6wgc67c0l7csjdd0k5r2p783rlahknrhqqa13qwgxbybadr53"; + sha256 = "b6366634c65b04464e62f3a9a8df1faa172f780ed7f1af1c6818b3dc2f1202c3"; }; propagatedBuildInputs = [ numpy - nose six - ]; + ] ++ lib.optional (!isPy3k) bz2file; + + checkInputs = [ nose mock ]; - # Failing tests - # nibabel.tests.test_minc1.test_old_namespace - # nibabel.gifti.tests.test_parse_gifti_fast.test_parse_dataarrays - # nibabel.gifti.tests.test_giftiio.test_read_deprecated - doCheck = false; + checkPhase = let + excludeTests = lib.optionals isPy3k [ + # https://github.com/nipy/nibabel/issues/691 + "nibabel.gifti.tests.test_giftiio.test_read_deprecated" + "nibabel.gifti.tests.test_parse_gifti_fast.test_parse_dataarrays" + "nibabel.tests.test_minc1.test_old_namespace" + ]; + # TODO: Add --with-doctest once all doctests pass + in '' + nosetests ${lib.concatMapStrings (test: "-e '${test}' ") excludeTests} + ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = http://nipy.org/nibabel/; description = "Access a multitude of neuroimaging data formats"; license = licenses.mit; diff --git a/pkgs/development/python-modules/nose-randomly/default.nix b/pkgs/development/python-modules/nose-randomly/default.nix index a9e31016a1f..531994d9053 100644 --- a/pkgs/development/python-modules/nose-randomly/default.nix +++ b/pkgs/development/python-modules/nose-randomly/default.nix @@ -14,10 +14,7 @@ buildPythonPackage rec { sha256 = "361f4c2fbb090ec2bc8e5e4151e21409a09ac13f364e3448247cc01f326d89b3"; }; - checkInputs = [ numpy ]; - propagatedBuildInputs = [ - nose - ]; + checkInputs = [ numpy nose ]; checkPhase = '' nosetests diff --git a/pkgs/development/python-modules/nose_progressive/default.nix b/pkgs/development/python-modules/nose_progressive/default.nix index 98e34212cb8..a8962bcecc2 100644 --- a/pkgs/development/python-modules/nose_progressive/default.nix +++ b/pkgs/development/python-modules/nose_progressive/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "nose-progressive"; - version = "1.5.1"; + version = "1.5.2"; src = fetchPypi { inherit pname version; - sha256 = "0mfbjv3dcg23q0a130670g7xpfyvgza4wxkj991xxh8w9hs43ga4"; + sha256 = "3a6e2833e613c1c239baf05a19f66b5920915e62c07251d3ab3f3acb017ef5d7"; }; buildInputs = [ nose ]; diff --git a/pkgs/development/python-modules/nose_warnings_filters/default.nix b/pkgs/development/python-modules/nose_warnings_filters/default.nix index 34aed962eae..2b1ee207cfe 100644 --- a/pkgs/development/python-modules/nose_warnings_filters/default.nix +++ b/pkgs/development/python-modules/nose_warnings_filters/default.nix @@ -18,6 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ nose ]; + checkInputs = [ nose ]; checkPhase = '' nosetests -v ''; diff --git a/pkgs/development/python-modules/nosejs/default.nix b/pkgs/development/python-modules/nosejs/default.nix index 82c01e8643f..c2d3ee94c7b 100644 --- a/pkgs/development/python-modules/nosejs/default.nix +++ b/pkgs/development/python-modules/nosejs/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "0qrhkd3sga56qf6k0sqyhwfcladwi05gl6aqmr0xriiq1sgva5dy"; }; - buildInputs = [ nose ]; + checkInputs = [ nose ]; checkPhase = '' nosetests -v diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 69bf334110d..d4b4f14cd65 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -25,11 +25,11 @@ buildPythonPackage rec { pname = "notebook"; - version = "5.7.2"; + version = "5.7.4"; src = fetchPypi { inherit pname version; - sha256 = "91705b109fc785198faed892489cddb233265564d5e2dad5e4f7974af05ee8dd"; + sha256 = "d908673a4010787625c8952e91a22adf737db031f2aa0793ad92f6558918a74a"; }; LC_ALL = "en_US.utf8"; diff --git a/pkgs/development/python-modules/numexpr/default.nix b/pkgs/development/python-modules/numexpr/default.nix index 280b11706a1..78203b3571b 100644 --- a/pkgs/development/python-modules/numexpr/default.nix +++ b/pkgs/development/python-modules/numexpr/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "numexpr"; - version = "2.6.8"; + version = "2.6.9"; src = fetchPypi { inherit pname version; - sha256 = "ee8bc7201aa2f1962c67d27c326a11eef9df887d7b87b1278a1d4e722bf44375"; + sha256 = "fc218b777cdbb14fa8cff8f28175ee631bacabbdd41ca34e061325b6c44a6fa6"; }; # Remove existing site.cfg, use the one we built for numpy. diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index d66cbd77bbc..c9cd7f91833 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -16,12 +16,12 @@ let }; in buildPythonPackage rec { pname = "numpy"; - version = "1.15.4"; + version = "1.16.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "3d734559db35aa3697dadcea492a423118c5c55d176da2f3be9c98d4803fc2a7"; + sha256 = "cb189bd98b2e7ac02df389b6212846ab20661f4bafe16b5a70a6f1728c1cc7cb"; }; disabled = isPyPy; @@ -35,18 +35,6 @@ in buildPythonPackage rec { ./numpy-distutils-C++.patch ]; - postPatch = lib.optionalString stdenv.hostPlatform.isMusl '' - # Use fenv.h - sed -i \ - numpy/core/src/npymath/ieee754.c.src \ - numpy/core/include/numpy/ufuncobject.h \ - -e 's/__GLIBC__/__linux__/' - # Don't use various complex trig functions - substituteInPlace numpy/core/src/private/npy_config.h \ - --replace '#if defined(__GLIBC__)' "#if 1" \ - --replace '#if !__GLIBC_PREREQ(2, 18)' "#if 1" - ''; - preConfigure = '' sed -i 's/-faltivec//' numpy/distutils/system_info.py export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES diff --git a/pkgs/development/python-modules/ofxtools/default.nix b/pkgs/development/python-modules/ofxtools/default.nix index 450391ffeeb..615c1f68f29 100644 --- a/pkgs/development/python-modules/ofxtools/default.nix +++ b/pkgs/development/python-modules/ofxtools/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "ofxtools"; - version = "0.5.1"; + version = "0.5.2"; src = fetchPypi { inherit pname version; - sha256 = "16a6bdacadf1fcb3265fcfbe7e36002730fc8613b9490839fc0fa2e9e97a1ed7"; + sha256 = "520345d3b440447696b8f84a4e752573666ff8d1fe0300316cd07995ae05176f"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix index 32a0528fbc6..ca05cccd037 100644 --- a/pkgs/development/python-modules/openpyxl/default.nix +++ b/pkgs/development/python-modules/openpyxl/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "openpyxl"; - version = "2.5.10"; + version = "2.5.12"; src = fetchPypi { inherit pname version; - sha256 = "41eb21a5620343d715b38081536c4ed3c37249afb72e569fd2af93852ed4ddde"; + sha256 = "7bcf019a0be528673a8aec1e60b5c863342c3231962dbf7922fd4da42a49a91a"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/owslib/default.nix b/pkgs/development/python-modules/owslib/default.nix index 7331511568f..024c3b4c8ee 100644 --- a/pkgs/development/python-modules/owslib/default.nix +++ b/pkgs/development/python-modules/owslib/default.nix @@ -1,11 +1,11 @@ { lib, buildPythonPackage, fetchPypi, dateutil, requests, pytz, pyproj , pytest } : buildPythonPackage rec { pname = "OWSLib"; - version = "0.17.0"; + version = "0.17.1"; src = fetchPypi { inherit pname version; - sha256 = "1px2nmbpbpp556kjq0ym0a7j24nbvs4w829727b2gr4a4ff86hxc"; + sha256 = "b2e7fd694d3cffcee79317bad492d60c0aa887aea6916517c051c3247b33b5a5"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/paperspace/default.nix b/pkgs/development/python-modules/paperspace/default.nix index 46b16679350..2d4f6a9e9f4 100644 --- a/pkgs/development/python-modules/paperspace/default.nix +++ b/pkgs/development/python-modules/paperspace/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "paperspace"; - version = "0.0.12"; + version = "0.0.13"; src = fetchPypi { inherit pname version; - sha256 = "9e7192ee9270768c0dba44969d49730c17d2f955c201798706cdcbc407310d64"; + sha256 = "824ec2aeccc6ddaba82a28b4ab74b1c81fb94206fd89c2b083eae3a61e63c2bf"; }; propagatedBuildInputs = [ boto3 requests ]; diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix index c85b29eac85..7669e03cf6f 100644 --- a/pkgs/development/python-modules/pathlib2/default.nix +++ b/pkgs/development/python-modules/pathlib2/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pathlib2"; - version = "2.3.2"; + version = "2.3.3"; src = fetchPypi { inherit pname version; - sha256 = "8eb170f8d0d61825e09a95b38be068299ddeda82f35e96c3301a8a5e7604cb83"; + sha256 = "25199318e8cc3c25dcb45cbe084cc061051336d5a9ea2a12448d3d8cb748f742"; }; propagatedBuildInputs = [ six ] ++ lib.optional (pythonOlder "3.5") scandir; diff --git a/pkgs/development/python-modules/pep257/default.nix b/pkgs/development/python-modules/pep257/default.nix index 2c1250f34a3..fc1028a0d1c 100644 --- a/pkgs/development/python-modules/pep257/default.nix +++ b/pkgs/development/python-modules/pep257/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { sha256 = "1ldpgil0kaf6wz5gvl9xdx35a62vc6bmgi3wbh9320dj5v2qk4wh"; }; - buildInputs = [ pytest mock ]; + checkInputs = [ pytest mock ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index f5828bebbb3..a0e8d08a2c7 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pg8000"; - version = "1.12.3"; + version = "1.12.4"; src = fetchPypi { inherit pname version; - sha256 = "18192d90409a3037619ef17f1924e3fd9c7169c9c1b3277cec1982116ec2b6de"; + sha256 = "903a19158e9efda326908bb4b70a71d31f640b4326576774433ab11fd4e46f39"; }; propagatedBuildInputs = [ pytz six ]; diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index afa965ffc02..4e94c1a7140 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.10.2"; + version = "8.10.3"; src = fetchPypi { inherit pname version; - sha256 = "08cpjmvbm9aazdhlr6pm7msmazysfrdzf4pilnlq8w0ddw1szh7i"; + sha256 = "0d870906c6019b41bd4b3720f804aec85a21fd78a7676ac260dcbf218b4e7097"; }; meta = { diff --git a/pkgs/development/python-modules/pid/default.nix b/pkgs/development/python-modules/pid/default.nix index 5998ca6bd00..bbf2c687ce5 100644 --- a/pkgs/development/python-modules/pid/default.nix +++ b/pkgs/development/python-modules/pid/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pid"; - version = "2.2.0"; + version = "2.2.1"; src = fetchPypi { inherit pname version; - sha256 = "d8bb2ceec21a4ae84be6e9d320db1f56934b30e676e31c6f098ca7218b3d67d4"; + sha256 = "636cb4743a6e6fb1d89efcfd772e6deb5a058590f3531703595d776507098d7b"; }; buildInputs = [ nose ]; diff --git a/pkgs/development/python-modules/pkgconfig/default.nix b/pkgs/development/python-modules/pkgconfig/default.nix index 96c0ea56682..38098b432e4 100644 --- a/pkgs/development/python-modules/pkgconfig/default.nix +++ b/pkgs/development/python-modules/pkgconfig/default.nix @@ -11,12 +11,17 @@ buildPythonPackage rec { checkInputs = [ nose ]; - propagatedBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; checkPhase = '' nosetests ''; + patches = [ ./executable.patch ]; + postPatch = '' + substituteInPlace pkgconfig/pkgconfig.py --replace 'PKG_CONFIG_EXE = "pkg-config"' 'PKG_CONFIG_EXE = "${pkgconfig}/bin/pkg-config"' + ''; + meta = with lib; { description = "Interface Python with pkg-config"; homepage = https://github.com/matze/pkgconfig; diff --git a/pkgs/development/python-modules/pkgconfig/executable.patch b/pkgs/development/python-modules/pkgconfig/executable.patch new file mode 100644 index 00000000000..79fca7a44f1 --- /dev/null +++ b/pkgs/development/python-modules/pkgconfig/executable.patch @@ -0,0 +1,38 @@ +commit d8e0bac0c0d831510683939ec7a7b5bd72192423 +Author: Frederik Rietdijk <fridh@fridh.nl> +Date: Sat Jan 5 11:38:28 2019 +0100 + + Have a top-level attribute for the executable + +diff --git a/pkgconfig/pkgconfig.py b/pkgconfig/pkgconfig.py +index 3deb97f..e7c5561 100644 +--- a/pkgconfig/pkgconfig.py ++++ b/pkgconfig/pkgconfig.py +@@ -30,6 +30,9 @@ from functools import wraps + from subprocess import call, PIPE, Popen + + ++PKG_CONFIG_EXE = "pkg-config" ++ ++ + def _compare_versions(v1, v2): + """ + Compare two version strings and return -1, 0 or 1 depending on the equality +@@ -65,7 +68,7 @@ def _convert_error(func): + + @_convert_error + def _query(package, *options): +- pkg_config_exe = os.environ.get('PKG_CONFIG', None) or 'pkg-config' ++ pkg_config_exe = os.environ.get('PKG_CONFIG', None) or PKG_CONFIG_EXE + cmd = '{0} {1} {2}'.format(pkg_config_exe, ' '.join(options), package) + proc = Popen(shlex.split(cmd), stdout=PIPE, stderr=PIPE) + out, err = proc.communicate() +@@ -84,7 +87,7 @@ def exists(package): + + If ``pkg-config`` not on path, raises ``EnvironmentError``. + """ +- pkg_config_exe = os.environ.get('PKG_CONFIG', None) or 'pkg-config' ++ pkg_config_exe = os.environ.get('PKG_CONFIG', None) or PKG_CONFIG_EXE + cmd = '{0} --exists {1}'.format(pkg_config_exe, package).split() + return call(cmd) == 0 + diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index 58ad690ce2d..04931b7df7f 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "3.4.1"; + version = "3.4.2"; src = fetchPypi { inherit pname version; - sha256 = "5dc85bde91bc80fa05f0d89e9f3a8eaee735b2b404047266874e0ff9c104407f"; + sha256 = "c988d923e0b0627085b9700e2757003552ae9ccd7daa3a4b067ce60a0c7e642f"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pluggy/default.nix b/pkgs/development/python-modules/pluggy/default.nix index dd8a7fa6acb..6d7550763eb 100644 --- a/pkgs/development/python-modules/pluggy/default.nix +++ b/pkgs/development/python-modules/pluggy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pluggy"; - version = "0.8.0"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "447ba94990e8014ee25ec853339faf7b0fc8050cdc3289d4d71f7f410fb90095"; + sha256 = "8ddc32f03971bfdf900a81961a48ccf2fb677cf7715108f85295c67405798616"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/podcastparser/default.nix b/pkgs/development/python-modules/podcastparser/default.nix index 0cfe2dd1b60..d2fc1093844 100644 --- a/pkgs/development/python-modules/podcastparser/default.nix +++ b/pkgs/development/python-modules/podcastparser/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { sha256 = "10bk93fqsws360q1gkjvfzjda3351169zbr6v5lq9raa3mg1ln52"; }; - propagatedBuildInputs = [ ]; + checkInputs = [ nose ]; - buildInputs = [ nose ]; - - checkPhase = "nosetests test_*.py"; + checkPhase = '' + nosetests test_*.py + ''; meta = { description = "podcastparser is a simple, fast and efficient podcast parser written in Python."; diff --git a/pkgs/development/python-modules/process-tests/default.nix b/pkgs/development/python-modules/process-tests/default.nix index dd93ac40071..c986cc6b990 100644 --- a/pkgs/development/python-modules/process-tests/default.nix +++ b/pkgs/development/python-modules/process-tests/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "process-tests"; - version = "2.0.0"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "dd731906f8fc0b803ffe2dd5c5e4b103ec24b1f962a7b835d9533d7e9b2ca36c"; + sha256 = "f43f3540edd333bdc5d8741218e173b1dfdbce5b0a40066d75248911e5340a06"; }; # No tests diff --git a/pkgs/development/python-modules/pyasn1-modules/default.nix b/pkgs/development/python-modules/pyasn1-modules/default.nix index 8c23d2a3f30..96304606cdf 100644 --- a/pkgs/development/python-modules/pyasn1-modules/default.nix +++ b/pkgs/development/python-modules/pyasn1-modules/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyasn1-modules"; - version = "0.2.2"; + version = "0.2.3"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "a0cf3e1842e7c60fde97cb22d275eb6f9524f5c5250489e292529de841417547"; + sha256 = "d14fcb29dabecba3d7b360bf72327c26c385248a5d603cf6be5f566ce999b261"; }; propagatedBuildInputs = [ pyasn1 ]; diff --git a/pkgs/development/python-modules/pyasn1/default.nix b/pkgs/development/python-modules/pyasn1/default.nix index d7d266b23ff..f44cfef8a29 100644 --- a/pkgs/development/python-modules/pyasn1/default.nix +++ b/pkgs/development/python-modules/pyasn1/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyasn1"; - version = "0.4.4"; + version = "0.4.5"; src = fetchPypi { inherit pname version; - sha256 = "f58f2a3d12fd754aa123e9fa74fb7345333000a035f3921dbdaa08597aa53137"; + sha256 = "da2420fe13a9452d8ae97a0e478adde1dee153b11ba832a95b223a2ba01c10f7"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix index 539e16abe57..0405b979c8f 100644 --- a/pkgs/development/python-modules/pyatspi/default.nix +++ b/pkgs/development/python-modules/pyatspi/default.nix @@ -10,9 +10,10 @@ buildPythonPackage rec { sha256 = "11g7dx21brfmi5vrq289cw983rydalx0cy91afv5gigyadsmyam2"; }; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ at-spi2-core - pkgconfig pygobject3 ]; diff --git a/pkgs/development/python-modules/pybotvac/default.nix b/pkgs/development/python-modules/pybotvac/default.nix index 8bfd7668114..180b7c8d18f 100644 --- a/pkgs/development/python-modules/pybotvac/default.nix +++ b/pkgs/development/python-modules/pybotvac/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pybotvac"; - version = "0.0.12"; + version = "0.0.13"; src = fetchPypi { inherit pname version; - sha256 = "12qm4w883nb6fwff6sch5l133g3irqjcrgkjhh4mz1mmz7n6xzjh"; + sha256 = "f6f147694ee5cbab1dea494454c11bd254e1c214d96d057cba27894a87210f1b"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/pybtex/default.nix b/pkgs/development/python-modules/pybtex/default.nix index 70e41009716..dd258f42718 100644 --- a/pkgs/development/python-modules/pybtex/default.nix +++ b/pkgs/development/python-modules/pybtex/default.nix @@ -1,7 +1,7 @@ { stdenv, buildPythonPackage, fetchPypi, latexcodec, pyyaml }: buildPythonPackage rec { - version = "0.22.0"; + version = "0.22.2"; pname = "pybtex"; doCheck = false; @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version pname; - sha256 = "0rprg7h12pv9rb6bi950mz1disc265sg5qcg34637ns1z74hxdr6"; + sha256 = "00816e5f8570609d8ce3360cd23916bd3e50428a3508127578fdb4dc2b731c1c"; }; meta = { diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index 091ac809a9b..126ec15e053 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -1,35 +1,39 @@ -{ lib, fetchFromGitHub, python, buildPythonPackage, pytest, pkgconfig, cairo, xlibsWrapper, isPyPy }: +{ lib, fetchFromGitHub, meson, ninja, buildPythonPackage, pytest, pkgconfig, cairo, xlibsWrapper, isPy33, isPy3k }: buildPythonPackage rec { pname = "pycairo"; - version = "1.16.3"; + version = "1.18.0"; - disabled = isPyPy; + format = "other"; + + disabled = isPy33; src = fetchFromGitHub { owner = "pygobject"; repo = "pycairo"; rev = "v${version}"; - sha256 = "0clk6wrfls3fa1xrn844762qfaw6gs4ivwkrfysidbzmlbxhpngl"; + sha256 = "0k266cf477j74v7mv0d4jxaq3wx8b7qa85qgh68cn094gzaasqd9"; }; - # We need to create the pkgconfig file but it cannot be installed as a wheel since wheels - # are supposed to be relocatable and do not support --prefix option - buildPhase = '' - ${python.interpreter} setup.py build - ''; - - installPhase = '' - ${python.interpreter} setup.py install --skip-build --prefix="$out" --optimize=1 - ''; + nativeBuildInputs = [ + meson + ninja + pkgconfig + ]; - checkPhase = '' - ${python.interpreter} setup.py test - ''; + buildInputs = [ + cairo + xlibsWrapper + ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ python cairo xlibsWrapper ]; checkInputs = [ pytest ]; - meta.platforms = lib.platforms.linux ++ lib.platforms.darwin; + mesonFlags = [ "-Dpython=${if isPy3k then "python3" else "python"}" ]; + + meta = with lib; { + description = "Python 2/3 bindings for cairo"; + homepage = https://pycairo.readthedocs.io/; + license = with licenses; [ lgpl2 mpl11 ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; } diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix index 59446a4dc48..473d81c73bd 100644 --- a/pkgs/development/python-modules/pycryptodome/default.nix +++ b/pkgs/development/python-modules/pycryptodome/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchPypi, buildPythonPackage }: buildPythonPackage rec { - version = "3.7.0"; + version = "3.7.2"; pname = "pycryptodome"; src = fetchPypi { inherit pname version; - sha256 = "4444a26fc3830c0d438bca6975ff10d1eb9c0b88f747fdc25b5ab81fb46713d7"; + sha256 = "f5fc7e3b2d29552f0383063408ce2bd295e9d3c7ef13377599aa300a3d2baef7"; }; meta = { diff --git a/pkgs/development/python-modules/pycryptodomex/default.nix b/pkgs/development/python-modules/pycryptodomex/default.nix index 27dfd64648c..61a0df7accd 100644 --- a/pkgs/development/python-modules/pycryptodomex/default.nix +++ b/pkgs/development/python-modules/pycryptodomex/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pycryptodomex"; - version = "3.7.0"; + version = "3.7.2"; meta = { description = "A self-contained cryptographic library for Python"; @@ -12,6 +12,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "9f11823636128acbe4e17c35ff668f4d0a9f3133450753a0675525b6413aa1b0"; + sha256 = "5d4e10ad9ff7940da534119ef92a500dcf7c28351d15e12d74ef0ce025e37d5b"; }; } diff --git a/pkgs/development/python-modules/pydispatcher/default.nix b/pkgs/development/python-modules/pydispatcher/default.nix index 29d464587a0..68772cab306 100644 --- a/pkgs/development/python-modules/pydispatcher/default.nix +++ b/pkgs/development/python-modules/pydispatcher/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "1bswbmhlbqdxlgbxlb6xrlm4k253sg8nvpl1whgsys8p3fg0cw2m"; }; - buildInputs = [ pytest ]; + checkInputs = [ pytest ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index d1b2f075b91..43cb77e5831 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { "-Dpython=python${if isPy3k then "3" else "2" }" ]; - nativeBuildInputs = [ pkgconfig meson ninja ]; + nativeBuildInputs = [ pkgconfig meson ninja gobject-introspection ]; buildInputs = [ glib gobject-introspection ] ++ stdenv.lib.optionals stdenv.isDarwin [ which ncurses ]; propagatedBuildInputs = [ pycairo cairo ]; diff --git a/pkgs/development/python-modules/pygraphviz/default.nix b/pkgs/development/python-modules/pygraphviz/default.nix index 8ca84e9b7c0..1fcc0ef8ce4 100644 --- a/pkgs/development/python-modules/pygraphviz/default.nix +++ b/pkgs/development/python-modules/pygraphviz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, graphviz +{ stdenv, buildPythonPackage, fetchPypi, substituteAll, graphviz , pkgconfig, doctest-ignore-unicode, mock, nose }: buildPythonPackage rec { @@ -10,17 +10,18 @@ buildPythonPackage rec { sha256 = "7c294cbc9d88946be671cc0d8602aac176d8c56695c0a7d871eadea75a958408"; }; - buildInputs = [ doctest-ignore-unicode mock nose ]; - propagatedBuildInputs = [ graphviz pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ graphviz ]; + checkInputs = [ doctest-ignore-unicode mock nose ]; patches = [ # pygraphviz depends on graphviz being in PATH. This patch always prepends # graphviz to PATH. - ./graphviz-path.patch + (substituteAll { + src = ./graphviz-path.patch; + inherit graphviz; + }) ]; - postPatch = '' - substituteInPlace pygraphviz/agraph.py --subst-var-by graphvizPath '${graphviz}/bin' - ''; # The tests are currently failing because of a bug in graphviz 2.40.1. # Upstream does not want to skip the relevant tests: diff --git a/pkgs/development/python-modules/pygraphviz/graphviz-path.patch b/pkgs/development/python-modules/pygraphviz/graphviz-path.patch index dde6df967f0..e4ff925009d 100644 --- a/pkgs/development/python-modules/pygraphviz/graphviz-path.patch +++ b/pkgs/development/python-modules/pygraphviz/graphviz-path.patch @@ -7,7 +7,7 @@ index 8f72024..2d8358e 100644 import glob - paths = os.environ["PATH"] -+ paths = '@graphvizPath@:' + os.environ["PATH"] ++ paths = '@graphviz@/bin:' + os.environ["PATH"] if os.name == "nt": exe = ".exe" else: diff --git a/pkgs/development/python-modules/pyobjc/default.nix b/pkgs/development/python-modules/pyobjc/default.nix index 96a546e694c..8c7af06b743 100644 --- a/pkgs/development/python-modules/pyobjc/default.nix +++ b/pkgs/development/python-modules/pyobjc/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pyobjc"; - version = "5.1.1"; + version = "5.1.2"; # Gives "No matching distribution found for # pyobjc-framework-Collaboration==4.0b1 (from pyobjc==4.0b1)" @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "2b094596e8bd36be1f63c8c0501dc4ac7899299224111a5877648774a92eec45"; + sha256 = "ccfc96382bf04977c68a06733f1d7499a7ddeb1f74760e3f8de483f9a542e691"; }; meta = { diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index 5416e379562..274c72974fe 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyopencl"; - version = "2018.2.1"; + version = "2018.2.2"; checkInputs = [ pytest ]; buildInputs = [ opencl-headers ocl-icd ]; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "5ed40baccb493e8e9ac394f15c64871954d234fd6d9250c50bee1466d8bd8e48"; + sha256 = "419375fb794d97f9bd46f0dc24ce83b5cc83d316771ba82fac80de8bf883dcdc"; }; # py.test is not needed during runtime, so remove it from `install_requires` diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index d6b966b6df3..a6e8e94e094 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -68,7 +68,7 @@ buildPythonPackage rec { # for one example, but I've also seen ContextTests.test_set_verify_callback_exception fail. doCheck = !stdenv.isDarwin; - buildInputs = [ openssl ]; + nativeBuildInputs = [ openssl ]; propagatedBuildInputs = [ cryptography pyasn1 idna ]; checkInputs = [ pytest pretend flaky glibcLocales ]; diff --git a/pkgs/development/python-modules/pyparsing/default.nix b/pkgs/development/python-modules/pyparsing/default.nix index df94117bfe5..a6e8d620138 100644 --- a/pkgs/development/python-modules/pyparsing/default.nix +++ b/pkgs/development/python-modules/pyparsing/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "pyparsing"; - version = "2.3.0"; + version = "2.3.1"; src = fetchPypi { inherit pname version; - sha256 = "f353aab21fd474459d97b709e527b5571314ee5f067441dc9f88e33eecd96592"; + sha256 = "66c9268862641abcac4a96ba74506e594c884e3f57690a696d21ad8210ed667a"; }; # Not everything necessary to run the tests is included in the distribution diff --git a/pkgs/development/python-modules/pytest-cov/default.nix b/pkgs/development/python-modules/pytest-cov/default.nix index 9e7ffc3644d..1bb5d001ddb 100644 --- a/pkgs/development/python-modules/pytest-cov/default.nix +++ b/pkgs/development/python-modules/pytest-cov/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pytest-cov"; - version = "2.6.0"; + version = "2.6.1"; src = fetchPypi { inherit pname version; - sha256 = "e360f048b7dae3f2f2a9a4d067b2dd6b6a015d384d1577c994a43f3f7cbad762"; + sha256 = "0ab664b25c6aa9716cbf203b17ddb301932383046082c081b9848a0edf5add33"; }; buildInputs = [ pytest pytest_xdist virtualenv process-tests ]; diff --git a/pkgs/development/python-modules/pytest-cram/default.nix b/pkgs/development/python-modules/pytest-cram/default.nix index 3ca4f832c8c..9639bd7f778 100644 --- a/pkgs/development/python-modules/pytest-cram/default.nix +++ b/pkgs/development/python-modules/pytest-cram/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { version = "0.2.0"; pname = "pytest-cram"; - buildInputs = [ pytest ]; + checkInputs = [ pytest ]; propagatedBuildInputs = [ cram ]; src = fetchPypi { diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix index 35b2ac34cab..95395f98677 100644 --- a/pkgs/development/python-modules/pytest-django/default.nix +++ b/pkgs/development/python-modules/pytest-django/default.nix @@ -17,8 +17,8 @@ buildPythonPackage rec { sha256 = "0dh7jm1d37p54pgc7cx4izz6khsd860a6hw64gx74c8fjfz36p8s"; }; - buildInputs = [ pytest setuptools_scm ]; - checkInputs = [ django-configurations pytest_xdist six ]; + nativeBuildInputs = [ pytest setuptools_scm ]; + checkInputs = [ pytest django-configurations pytest_xdist six ]; propagatedBuildInputs = [ django ]; # Complicated. Requires Django setup. diff --git a/pkgs/development/python-modules/pytest-flake8/default.nix b/pkgs/development/python-modules/pytest-flake8/default.nix index 558fe32b909..eb8a2e3e117 100644 --- a/pkgs/development/python-modules/pytest-flake8/default.nix +++ b/pkgs/development/python-modules/pytest-flake8/default.nix @@ -2,17 +2,17 @@ buildPythonPackage rec { pname = "pytest-flake8"; - version = "1.0.2"; + version = "1.0.3"; # although pytest is a runtime dependency, do not add it as # propagatedBuildInputs in order to allow packages depend on another version # of pytest more easily - buildInputs = [ pytest ]; + checkInputs = [ pytest ]; propagatedBuildInputs = [ flake8 ]; src = fetchPypi { inherit pname version; - sha256 = "c740ad6aa19e3958947d2118f70bed218caf1d2097039fb7318573a2a72f89a1"; + sha256 = "b2c71fb6d469bae076a01c43d4a83485d740db6a8a00bad77e0657ed035e98d4"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/pytestrunner/default.nix b/pkgs/development/python-modules/pytestrunner/default.nix index 451ad789b31..78ad4d2abc8 100644 --- a/pkgs/development/python-modules/pytestrunner/default.nix +++ b/pkgs/development/python-modules/pytestrunner/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "d23f117be39919f00dd91bffeb4f15e031ec797501b717a245e377aee0f577be"; }; - buildInputs = [ setuptools_scm pytest ]; + nativeBuildInputs = [ setuptools_scm pytest ]; postPatch = '' rm pytest.ini diff --git a/pkgs/development/python-modules/python-docx/default.nix b/pkgs/development/python-modules/python-docx/default.nix index 1a85c5256d7..f86cdc665a1 100644 --- a/pkgs/development/python-modules/python-docx/default.nix +++ b/pkgs/development/python-modules/python-docx/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "python-docx"; - version = "0.8.7"; + version = "0.8.10"; src = fetchPypi { inherit pname version; - sha256 = "ba9f2a7ca391b78ab385d796b38af3f21bab23c727fc8e0c5e630448d1a11fe3"; + sha256 = "bc76ecac6b2d00ce6442a69d03a6f35c71cd72293cd8405a7472dfe317920024"; }; checkInputs = [ behave mock pyparsing pytest ]; diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index 274adb9d424..f58b42aa04c 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "python-socketio"; - version = "2.1.0"; + version = "2.1.2"; src = fetchPypi { inherit pname version; - sha256 = "10457ahvi16iyshmynr0j9palfsbnpzya8p1nmlhzrcr11fsnkb7"; + sha256 = "9e9d87d5f3cd6d39c42dd665e1fe3e12361637e28f5ad9a7aa8f73358b7a3dd5"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python_openzwave/default.nix b/pkgs/development/python-modules/python_openzwave/default.nix index 04348ed2ecb..981629d85c2 100644 --- a/pkgs/development/python-modules/python_openzwave/default.nix +++ b/pkgs/development/python-modules/python_openzwave/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "python_openzwave"; - version = "0.4.11"; + version = "0.4.18"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "2464c364929acaee5da39eda60976a3efa40bb1f7a5d9362531d53cfa5c3bd09"; + sha256 = "f7b6b4e34e2a64d0a0bd0556f5560ca6914ca72428c3fe5ac8c7f08b31335f3e"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/pyudev/default.nix b/pkgs/development/python-modules/pyudev/default.nix index b0a4505555a..fa5c371b9b1 100644 --- a/pkgs/development/python-modules/pyudev/default.nix +++ b/pkgs/development/python-modules/pyudev/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { --replace "find_library(name)" "'${systemd.lib}/lib/libudev.so'" ''; - buildInputs = [ pytest mock hypothesis docutils ]; + checkInputs = [ pytest mock hypothesis docutils ]; propagatedBuildInputs = [ systemd six ]; checkPhase = '' diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index 9ec1675f69f..f089d1cdba2 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "regex"; - version = "2018.11.07"; + version = "2018.11.22"; src = fetchPypi { inherit pname version; - sha256 = "7bfb6e13ed8195513160550c3a82c49da8bbc6df5d149089cd37f51f36eddd39"; + sha256 = "79a6a60ed1ee3b12eb0e828c01d75e3b743af6616d69add6c2fde1d425a4ba3f"; }; postCheck = '' diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix index ab0c3d4eacf..edb9b062f38 100644 --- a/pkgs/development/python-modules/reportlab/default.nix +++ b/pkgs/development/python-modules/reportlab/default.nix @@ -11,11 +11,11 @@ let ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; }); in buildPythonPackage rec { pname = "reportlab"; - version = "3.5.10"; + version = "3.5.13"; src = fetchPypi { inherit pname version; - sha256 = "9041d17556b9652cd9cf13b56a4efad7b51df6c567279ced26584cb4eb712b09"; + sha256 = "6116e750f98018febc08dfee6df20446cf954adbcfa378d2c703d56c8864aff3"; }; checkInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix index 37f72dde035..e69e7d8b84d 100644 --- a/pkgs/development/python-modules/responses/default.nix +++ b/pkgs/development/python-modules/responses/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "responses"; - version = "0.10.4"; + version = "0.10.5"; src = fetchPypi { inherit pname version; - sha256 = "16ad4a7a914f20792111157adf09c63a8dc37699c57d1ad20dbc281a4f5743fb"; + sha256 = "c85882d2dc608ce6b5713a4e1534120f4a0dc6ec79d1366570d2b0c909a50c87"; }; propagatedBuildInputs = [ cookies mock requests six ]; diff --git a/pkgs/development/python-modules/ruamel_yaml/default.nix b/pkgs/development/python-modules/ruamel_yaml/default.nix index e10005fc205..3e7cd4479eb 100644 --- a/pkgs/development/python-modules/ruamel_yaml/default.nix +++ b/pkgs/development/python-modules/ruamel_yaml/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "ruamel.yaml"; - version = "0.15.80"; + version = "0.15.86"; src = fetchPypi { inherit pname version; - sha256 = "1rhlshff9csjwn64x11b9a7gbxccs1vd7rdiqwlhifjxax8k682g"; + sha256 = "d98b3d421eebf7e10311ab12f41c5b0353e7cae1cc78f51312e24f569d593de0"; }; # Tests cannot load the module to test diff --git a/pkgs/development/python-modules/scikit-bio/default.nix b/pkgs/development/python-modules/scikit-bio/default.nix index 7a2ab097a71..cc83c31ca5d 100644 --- a/pkgs/development/python-modules/scikit-bio/default.nix +++ b/pkgs/development/python-modules/scikit-bio/default.nix @@ -20,13 +20,13 @@ }: buildPythonPackage rec { - version = "0.5.4"; + version = "0.5.5"; pname = "scikit-bio"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "3243f1995ef24643c09ff4d9391a79528aadd8232e5aa5d66c38d7b2e0c92f24"; + sha256 = "9fa813be66e88a994f7b7a68b8ba2216e205c525caa8585386ebdeebed6428df"; }; buildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 2663d6667e5..0a34c2b5429 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -8,13 +8,13 @@ # Should use buildPythonPackage here somehow stdenv.mkDerivation rec { pname = "setuptools"; - version = "40.6.2"; + version = "40.6.3"; name = "${python.libPrefix}-${pname}-${version}"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "86bb4d8e1b0fabad1f4642b64c335b673e53e7a381de03c9a89fe678152c4c64"; + sha256 = "3b474dad69c49f0d2d86696b68105f3a6f195f7ab655af12ef9a9c326d2b08f8"; }; nativeBuildInputs = [ unzip wrapPython python.pythonForBuild ]; diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 831c527af0e..4bea277a95b 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -26,11 +26,11 @@ buildPythonPackage rec { pname = "sphinx"; - version = "1.7.9"; + version = "1.8.3"; src = fetchPypi { pname = "Sphinx"; inherit version; - sha256 = "217a7705adcb573da5bbe1e0f5cab4fa0bd89fd9342c9159121746f593c2d5a4"; + sha256 = "c4cb17ba44acffae3d3209646b6baec1e215cad3065e852c68cc569d4df1b9f8"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix index 700a7fad4aa..2c8b91edc65 100644 --- a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix @@ -3,12 +3,12 @@ }: buildPythonPackage rec { - version = "0.4.1"; + version = "0.4.2"; pname = "sphinxcontrib-bibtex"; src = fetchPypi { inherit pname version; - sha256 = "0kx04bqjf9ilygrzpm2z9078nfnkmywpgwxl7idpzidkzirqsnsr"; + sha256 = "169afb3a3485775e5473934a0fdff1780e8bdcdd44db7ed286044a074331c729"; }; propagatedBuildInputs = [ oset pybtex pybtex-docutils sphinx ]; diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index 086fce2aac8..aa3bcc6ae7a 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.2.11"; + version = "1.2.12"; src = fetchPypi { inherit pname version; - sha256 = "8715529e823c6f4ed701d71f1daf8525583ed04b44e8c89d6781475c856eb2ba"; + sha256 = "7a099f42358731589851c38e5a90d997490dd6275b39e09f21bdd4df91a24413"; }; # No tests in archive diff --git a/pkgs/development/python-modules/sqlparse/default.nix b/pkgs/development/python-modules/sqlparse/default.nix index 506e9b9340b..5858779b86b 100644 --- a/pkgs/development/python-modules/sqlparse/default.nix +++ b/pkgs/development/python-modules/sqlparse/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "ce028444cfab83be538752a2ffdb56bc417b7784ff35bb9a3062413717807dec"; }; - buildInputs = [ pytest ]; + checkInputs = [ pytest ]; checkPhase = '' py.test ''; diff --git a/pkgs/development/python-modules/staticjinja/default.nix b/pkgs/development/python-modules/staticjinja/default.nix index a5b3b4fe8d4..32aecdc9191 100644 --- a/pkgs/development/python-modules/staticjinja/default.nix +++ b/pkgs/development/python-modules/staticjinja/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "staticjinja"; - version = "0.3.4"; + version = "0.3.5"; src = fetchPypi { inherit pname version; - sha256 = "1mxv7yy35657mfxx9xhbzihh10m5lb29fmscfh9q455zd4ikr032"; + sha256 = "fbd61cca1dad44b6891d1a1d72b11ae100e21b3909802e3ff1861ab55bf16603"; }; propagatedBuildInputs = [ jinja2 docopt easywatch ]; diff --git a/pkgs/development/python-modules/thespian/default.nix b/pkgs/development/python-modules/thespian/default.nix index c964a4ed2f1..d0d032b6217 100644 --- a/pkgs/development/python-modules/thespian/default.nix +++ b/pkgs/development/python-modules/thespian/default.nix @@ -1,13 +1,13 @@ { fetchPypi, buildPythonPackage, lib }: buildPythonPackage rec { - version = "3.9.4"; + version = "3.9.5"; pname = "thespian"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "98766eb304ef922133baca12a75eedd8d9b709c58bd9af50bfa5593dc3ffe0e1"; + sha256 = "4de3d599d898bf22a311248e749bb21920a8b0f6139f80489352bcb950835db2"; }; # Do not run the test suite: it takes a long time and uses diff --git a/pkgs/development/python-modules/tlsh/default.nix b/pkgs/development/python-modules/tlsh/default.nix index 893fe0240b6..1b144b4db8d 100644 --- a/pkgs/development/python-modules/tlsh/default.nix +++ b/pkgs/development/python-modules/tlsh/default.nix @@ -1,7 +1,7 @@ { stdenv , buildPythonPackage , fetchFromGitHub -, pkgs +, cmake }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "1ydliir308xn4ywy705mmsh7863ldlixdvpqwdhbipzq9vfpmvll"; }; - buildInputs = [ pkgs.cmake ]; + nativeBuildInputs = [ cmake ]; # no test data doCheck = false; diff --git a/pkgs/development/python-modules/typed-ast/default.nix b/pkgs/development/python-modules/typed-ast/default.nix index ead61eef363..f3f260cc1e8 100644 --- a/pkgs/development/python-modules/typed-ast/default.nix +++ b/pkgs/development/python-modules/typed-ast/default.nix @@ -1,10 +1,10 @@ { buildPythonPackage, fetchPypi, lib, pythonOlder }: buildPythonPackage rec { pname = "typed-ast"; - version = "1.1.1"; + version = "1.1.2"; src = fetchPypi{ inherit pname version; - sha256 = "1iml3lcw50bz1fyw7s9sa4mqzbmqs5w43k6bsv5ix4vqa34mvckc"; + sha256 = "4304399ff89452871348f6fb7a7112454cd508fbe3eb49b5ed711cce9b99fe9e"; }; # Only works with Python 3.3 and newer; disabled = pythonOlder "3.3"; diff --git a/pkgs/development/python-modules/uproot-methods/default.nix b/pkgs/development/python-modules/uproot-methods/default.nix index a3aaf048654..69442bafd09 100644 --- a/pkgs/development/python-modules/uproot-methods/default.nix +++ b/pkgs/development/python-modules/uproot-methods/default.nix @@ -6,12 +6,12 @@ }: buildPythonPackage rec { - version = "0.2.7"; + version = "0.2.11"; pname = "uproot-methods"; src = fetchPypi { inherit pname version; - sha256 = "0c9g7scq5nga6r2gn4j24xfs5rssn6z6aj4bhpk5ayzz8hhpss6w"; + sha256 = "289b9b4a58511f35ab4783bb37cdc922eba75d1886e0eb1be136cc861eff7b66"; }; propagatedBuildInputs = [ numpy awkward ]; diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index fd23824e2aa..097313b42f7 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -2,29 +2,30 @@ , fetchPypi , buildPythonPackage , numpy -, python-lz4 , uproot-methods , awkward , cachetools , pythonOlder , pytestrunner , pytest +, pkgconfig +, lz4 , backports_lzma }: buildPythonPackage rec { pname = "uproot"; - version = "3.2.12"; + version = "3.2.15"; src = fetchPypi { inherit pname version; - sha256 = "0jxsv0038glxz87skjxr58fafwyqilivkrygpvk4nkp866i5kz2k"; + sha256 = "a871f57529e3df170aa5556c1353a64077277644baecabb18d042954f2af9030"; }; buildInputs = [ pytestrunner ]; - checkInputs = [ pytest ] + checkInputs = [ pytest pkgconfig lz4 ] ++ lib.optionals (pythonOlder "3.3") [ backports_lzma ]; - propagatedBuildInputs = [ numpy python-lz4 cachetools uproot-methods awkward ]; + propagatedBuildInputs = [ numpy cachetools uproot-methods awkward ]; meta = with lib; { homepage = https://github.com/scikit-hep/uproot; diff --git a/pkgs/development/python-modules/vidstab/default.nix b/pkgs/development/python-modules/vidstab/default.nix index 34e8a1bd1c3..e01353b6238 100644 --- a/pkgs/development/python-modules/vidstab/default.nix +++ b/pkgs/development/python-modules/vidstab/default.nix @@ -10,12 +10,12 @@ }: buildPythonPackage rec { - version = "1.0.0"; + version = "1.0.1"; pname = "vidstab"; src = fetchPypi { inherit pname version; - sha256 = "fa7aa196ae40074cc2887f26472d1526d670715ab2dbbc032ca1fb1c68688392"; + sha256 = "31b45fa6c6c726ee05c4e106d95682f17258750d09e2e1c880bbccbf866f323e"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/webob/default.nix b/pkgs/development/python-modules/webob/default.nix index 2d30fc74830..bd2e0574a47 100644 --- a/pkgs/development/python-modules/webob/default.nix +++ b/pkgs/development/python-modules/webob/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "WebOb"; - version = "1.8.4"; + version = "1.8.5"; src = fetchPypi { inherit pname version; - sha256 = "a48315158db05df0c47fbdd061b57ba0ba85bdd0b6ea9dca87511b4b7c798e99"; + sha256 = "05aaab7975e0ee8af2026325d656e5ce14a71f1883c52276181821d6d5bf7086"; }; propagatedBuildInputs = [ nose pytest ]; diff --git a/pkgs/development/python-modules/whisper/default.nix b/pkgs/development/python-modules/whisper/default.nix index b48dba39439..f9565d8e6a0 100644 --- a/pkgs/development/python-modules/whisper/default.nix +++ b/pkgs/development/python-modules/whisper/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "whisper"; - version = "1.1.4"; + version = "1.1.5"; src = fetchPypi { inherit pname version; - sha256 = "ee9128873b5f9c97d258d35d0a32ef8e62c9da473fbbd056982df1f36f0b37aa"; + sha256 = "14013e7563102d808aae0cb5b3b2326979236d4bcd54c343ea636761629920cd"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/whoosh/default.nix b/pkgs/development/python-modules/whoosh/default.nix index cf3fce18c14..41d8530293d 100644 --- a/pkgs/development/python-modules/whoosh/default.nix +++ b/pkgs/development/python-modules/whoosh/default.nix @@ -7,7 +7,8 @@ buildPythonPackage rec { inherit pname version; sha256 = "10qsqdjpbc85fykc1vgcs8xwbgn4l2l52c8d83xf1q59pwyn79bw"; }; - buildInputs = [ pytest ]; + + checkInputs = [ pytest ]; # Wrong encoding postPatch = '' diff --git a/pkgs/development/python-modules/wxPython/4.0.nix b/pkgs/development/python-modules/wxPython/4.0.nix index 39e3d7fb3fa..c59e91ad3ea 100644 --- a/pkgs/development/python-modules/wxPython/4.0.nix +++ b/pkgs/development/python-modules/wxPython/4.0.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "wxPython"; - version = "4.0.3"; + version = "4.0.4"; src = fetchPypi { inherit pname version; - sha256 = "8d0dfc0146c24749ce00d575e35cc2826372e809d5bc4a57bde6c89031b59e75"; + sha256 = "0d9ef4260cb2f3e23ed9dcf6baa905ba585ac7d631613cddc299c4c83463ae29"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/xlrd/default.nix b/pkgs/development/python-modules/xlrd/default.nix index 3379433b04d..6307f630fcd 100644 --- a/pkgs/development/python-modules/xlrd/default.nix +++ b/pkgs/development/python-modules/xlrd/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "8a21885513e6d915fe33a8ee5fdfa675433b61405ba13e2a69e62ee36828d7e2"; }; - buildInputs = [ nose ]; + checkInputs = [ nose ]; checkPhase = '' nosetests -v diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/pkgs/development/python-modules/zope_testrunner/default.nix index 7cd78949168..25f167b2e94 100644 --- a/pkgs/development/python-modules/zope_testrunner/default.nix +++ b/pkgs/development/python-modules/zope_testrunner/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "zope.testrunner"; - version = "4.9"; + version = "4.9.2"; src = fetchPypi { inherit pname version; - sha256 = "f3856a79ab0e4ff74addc3e6c152b388dddee548345b440767b6361f635bd9b7"; + sha256 = "f2aa89531db6b7546e46be9d6113ac835a075f4dcb26e32c7276f4f30d4b14a5"; }; propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ]; diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix index bb08ae2f3af..e70291ce51a 100644 --- a/pkgs/development/tools/build-managers/ninja/default.nix +++ b/pkgs/development/tools/build-managers/ninja/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "16scq9hcq6c5ap6sy8j4qi75qps1zvrf3p79j1vbrvnqzp928i5f"; }; - nativeBuildInputs = [ python ] ++ optionals buildDocs [ asciidoc docbook_xml_dtd_45 docbook_xsl libxslt.bin re2c ]; + nativeBuildInputs = [ python re2c ] ++ optionals buildDocs [ asciidoc docbook_xml_dtd_45 docbook_xsl libxslt.bin ]; buildPhase = '' python configure.py --bootstrap diff --git a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix index 9b16d55d413..2df390c2f72 100644 --- a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix +++ b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix @@ -10,7 +10,7 @@ python2Packages.buildPythonApplication { sha256 = "19n4x25ndzngaciiyd8dd6s2mf9gv6nv3wv27ggns2smm7zkj1nb"; }; - nativeBuildInputs = [ intltool pkgconfig ]; + nativeBuildInputs = [ intltool pkgconfig libxslt.dev ]; buildInputs = [ libxslt ]; configureFlags = [ "--disable-scrollkeeper" ]; diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-lib/default.nix index 3d4e57f88dd..8e730058020 100644 --- a/pkgs/os-specific/linux/alsa-lib/default.nix +++ b/pkgs/os-specific/linux/alsa-lib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { name = "alsa-lib-1.1.7"; @@ -10,6 +10,11 @@ stdenv.mkDerivation rec { patches = [ ./alsa-plugin-conf-multilib.patch + (fetchpatch { # pcm interval fix needed for some programs with broken audio, remove when bumping version + name = "pcm-interval-fix.patch"; + url = "http://git.alsa-project.org/?p=alsa-lib.git;a=commitdiff_plain;h=b420056604f06117c967b65d43d01536c5ffcbc9"; + sha256 = "1vjfslzsypd6w15zvvrpdk825hm5j0gz16gw7kj290pkbsdgd435"; + }) ]; # Fix pcm.h file in order to prevent some compilation bugs diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index 4fd2b2a9124..506057085e0 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "iproute2-${version}"; - version = "4.19.0"; + version = "4.20.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/iproute2/${name}.tar.xz"; - sha256 = "114rlb3bvrf7q6yr03mn1rj6gl7mrg0psvm2dx0qb2kxyjhmrv6r"; + sha256 = "1a7xyvqjxfnm7rk21amm0xgxa38clg7q7cmc4dmlg27q81mambf8"; }; preConfigure = '' diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 72693696494..ec18c25ee66 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -5,14 +5,14 @@ let version = lib.concatStringsSep "." ([ majorVersion ] ++ lib.optional (patchVersion != "") patchVersion); majorVersion = "2.33"; - patchVersion = ""; + patchVersion = "1"; in stdenv.mkDerivation rec { name = "util-linux-${version}"; src = fetchurl { url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${name}.tar.xz"; - sha256 = "12k54fj1wz1193kq619vplvzj7gf8yn42sfj0kmfxgrm7kbvjqgj"; + sha256 = "08ggvgrb59m5jbq29950xxirsgv4xj3nwsc7vf82nyg1nvrxjjy1"; }; patches = [ diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index f77f43aea88..04117de3269 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -47,6 +47,7 @@ let ../../build-support/setup-hooks/compress-man-pages.sh ../../build-support/setup-hooks/strip.sh ../../build-support/setup-hooks/patch-shebangs.sh + ../../build-support/setup-hooks/prune-libtool-files.sh ] # FIXME this on Darwin; see # https://github.com/NixOS/nixpkgs/commit/94d164dd7#commitcomment-22030369 @@ -122,7 +123,9 @@ let # Utility flags to test the type of platform. inherit (hostPlatform) isDarwin isLinux isSunOS isCygwin isFreeBSD isOpenBSD - isi686 isx86_64 is64bit isAarch32 isAarch64 isMips isBigEndian; + isi686 isx86_32 isx86_64 + is32bit is64bit + isAarch32 isAarch64 isMips isBigEndian; isArm = lib.warn "`stdenv.isArm` is deprecated after 18.03. Please use `stdenv.isAarch32` instead" hostPlatform.isAarch32; diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index f3c4afb613e..88808a7b3f9 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -125,14 +125,14 @@ rec { (map (drv: drv.__spliced.buildBuild or drv) depsBuildBuild) (map (drv: drv.nativeDrv or drv) nativeBuildInputs ++ lib.optional separateDebugInfo' ../../build-support/setup-hooks/separate-debug-info.sh - ++ lib.optional stdenv.hostPlatform.isWindows ../../build-support/setup-hooks/win-dll-link.sh) + ++ lib.optional stdenv.hostPlatform.isWindows ../../build-support/setup-hooks/win-dll-link.sh + ++ lib.optionals doCheck checkInputs + ++ lib.optionals doInstallCheck' installCheckInputs) (map (drv: drv.__spliced.buildTarget or drv) depsBuildTarget) ] [ (map (drv: drv.__spliced.hostHost or drv) depsHostHost) - (map (drv: drv.crossDrv or drv) (buildInputs - ++ lib.optionals doCheck checkInputs - ++ lib.optionals doInstallCheck' installCheckInputs)) + (map (drv: drv.crossDrv or drv) buildInputs) ] [ (map (drv: drv.__spliced.targetTarget or drv) depsTargetTarget) diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 1f418ecf97f..663dfa40e23 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -19,11 +19,11 @@ let in py.pkgs.buildPythonApplication rec { pname = "awscli"; - version = "1.16.89"; # N.B: if you change this, change botocore to a matching version too + version = "1.16.90"; # N.B: if you change this, change botocore to a matching version too src = py.pkgs.fetchPypi { inherit pname version; - sha256 = "1i2f8nx8w6150jws0b732pvh8s5r6wq9yvv2m0a2k7cz1ihnzkxd"; + sha256 = "1e2c776ca47ca18ee5ad3d481c0410800b8155342fe73099bc702b17625d7a2d"; }; # No tests included diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index 5633a9fa152..a6f5052ad08 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gnutar-${version}"; - version = "1.30"; + version = "1.31"; src = fetchurl { url = "mirror://gnu/tar/tar-${version}.tar.xz"; - sha256 = "1lyjyk8z8hdddsxw0ikchrsfg3i0x3fsh7l63a8jgaz1n7dr5gzi"; + sha256 = "1h9dxhjhz1jnyhmh6jfhqw1g1sxqbg3cd32vpwg7x2xxxqffzwrp"; }; # avoid retaining reference to CF during stdenv bootstrap diff --git a/pkgs/tools/backup/tarsnapper/default.nix b/pkgs/tools/backup/tarsnapper/default.nix index 54d85343e2d..b02ce82291a 100644 --- a/pkgs/tools/backup/tarsnapper/default.nix +++ b/pkgs/tools/backup/tarsnapper/default.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { sha256 = "03db49188f4v1946c8mqqj30ah10x68hbg3a58js0syai32v12pm"; }; - buildInputs = with python3Packages; [ nose pytest ]; + checkInputs = with python3Packages; [ nose pytest ]; checkPhase = '' py.test . diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix index 6b1d123a066..dfd91bf37d3 100644 --- a/pkgs/tools/compression/lzip/default.nix +++ b/pkgs/tools/compression/lzip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "lzip-${version}"; - version = "1.20"; + version = "1.21"; nativeBuildInputs = [ texinfo ]; src = fetchurl { url = "mirror://savannah/lzip/${name}.tar.gz"; - sha256 = "0319q59kb8g324wnj7xzbr7vvlx5bcs13lr34j0zb3kqlyjq2fy9"; + sha256 = "12qdcw5k1cx77brv9yxi1h4dzwibhfmdpigrj43nfk8nscwm12z4"; }; configureFlags = [ diff --git a/pkgs/tools/misc/pubs/default.nix b/pkgs/tools/misc/pubs/default.nix index 393300ddd9e..fcf67870e87 100644 --- a/pkgs/tools/misc/pubs/default.nix +++ b/pkgs/tools/misc/pubs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages }: +{ stdenv, fetchFromGitHub, fetchpatch, python3Packages }: python3Packages.buildPythonApplication rec { pname = "pubs"; @@ -11,6 +11,12 @@ python3Packages.buildPythonApplication rec { sha256 = "16zwdqfbmlla6906g3a57a4nj8wnl11fq78r20qms717bzv211j0"; }; + # Fix for bibtexparser 1.1.0 + patches = fetchpatch { + url = https://github.com/pubs/pubs/pull/185/commits/e58ae98b93b8364a07fd5f5f452ba88ad332c948.patch; + sha256 = "1n7zrk119v395jj8wqg8wlymc9l9pq3v752yy3kam9kflc0aashp"; + }; + propagatedBuildInputs = with python3Packages; [ argcomplete dateutil configobj feedparser bibtexparser pyyaml requests six beautifulsoup4 ]; diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 56848af71f6..9714943b30d 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { - name = "sudo-1.8.26"; + name = "sudo-1.8.27"; src = fetchurl { urls = [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz" "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz" ]; - sha256 = "1qpyyfga8rs02p3186sns8qvh2bzwa48ka845nrcqh83dyd23nj0"; + sha256 = "1h1f7v9pv0rzp14cxzv8kaa8mdd717fbqv83l7c5dvvi8jwnisvv"; }; prePatch = '' diff --git a/pkgs/tools/system/honcho/default.nix b/pkgs/tools/system/honcho/default.nix index d42a6488c7f..fcdcc23961b 100644 --- a/pkgs/tools/system/honcho/default.nix +++ b/pkgs/tools/system/honcho/default.nix @@ -18,19 +18,19 @@ pythonPackages.buildPythonApplication rec { sha256 = "11bd87474qpif20xdcn0ra1idj5k16ka51i658wfpxwc6nzsn92b"; }; - buildInputs = with pythonPackages; [ jinja2 pytest mock coverage ]; + checkInputs = with pythonPackages; [ jinja2 pytest mock coverage ]; buildPhase = '' ${python.interpreter} setup.py build ''; installPhase = '' - mkdir -p "$out/lib/${python.libPrefix}/site-packages" + mkdir -p "$out/${python.sitePackages}" - export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" + export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" - ${python}/bin/${python.executable} setup.py install \ - --install-lib=$out/lib/${python.libPrefix}/site-packages \ + ${python.interpreter} setup.py install \ + --install-lib=$out/${python.sitePackages} \ --prefix="$out" ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d65dfadb826..adddd786359 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11472,7 +11472,9 @@ in then darwin.libunwind else callPackage ../development/libraries/libunwind { }; - libuv = callPackage ../development/libraries/libuv { }; + libuv = callPackage ../development/libraries/libuv { + inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreServices; + }; libv4l = lowPrio (v4l_utils.override { withUtils = false; @@ -17856,7 +17858,7 @@ in akonadi akregator ark dolphin dragon ffmpegthumbs filelight gwenview k3b kaddressbook kate kcachegrind kcalc kcharselect kcolorchooser kcontacts kdenlive kdf kdialog keditbookmarks kget kgpg khelpcenter kig kleopatra kmail kmix kolourpaint kompare konsole - kpkpass kitinerary kontact korganizer krdc krfb ksystemlog kwalletmanager marble minuet okular spectacle; + kpkpass kitinerary kontact korganizer krdc krfb ksystemlog ktouch kwalletmanager marble minuet okular spectacle; okteta = libsForQt5.callPackage ../applications/editors/okteta { }; @@ -18667,6 +18669,7 @@ in opera = callPackage ../applications/networking/browsers/opera {}; orca = python3Packages.callPackage ../applications/misc/orca { + inherit (pkgs) pkgconfig; inherit (gnome3) yelp-tools; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 279b22788a3..13f26103109 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -325,7 +325,7 @@ in { exchangelib = callPackage ../development/python-modules/exchangelib { }; dbus-python = callPackage ../development/python-modules/dbus { - dbus = pkgs.dbus; + inherit (pkgs) dbus pkgconfig; }; dftfit = callPackage ../development/python-modules/dftfit { }; @@ -364,7 +364,9 @@ in { fdint = callPackage ../development/python-modules/fdint { }; - fuse = callPackage ../development/python-modules/fuse-python { fuse = pkgs.fuse; }; + fuse = callPackage ../development/python-modules/fuse-python { + inherit (pkgs) fuse pkgconfig; + }; genanki = callPackage ../development/python-modules/genanki { }; @@ -534,11 +536,15 @@ in { pyannotate = callPackage ../development/python-modules/pyannotate { }; - pyatspi = callPackage ../development/python-modules/pyatspi { }; + pyatspi = callPackage ../development/python-modules/pyatspi { + inherit (pkgs) pkgconfig; + }; pyaxmlparser = callPackage ../development/python-modules/pyaxmlparser { }; - pycairo = callPackage ../development/python-modules/pycairo { }; + pycairo = callPackage ../development/python-modules/pycairo { + inherit (pkgs) pkgconfig; + }; pycangjie = disabledIf (!isPy3k) (callPackage ../development/python-modules/pycangjie { }); @@ -576,13 +582,20 @@ in { pygmo = callPackage ../development/python-modules/pygmo { }; - pygobject2 = callPackage ../development/python-modules/pygobject { }; + pygobject2 = callPackage ../development/python-modules/pygobject { + inherit (pkgs) pkgconfig; + }; - pygobject3 = callPackage ../development/python-modules/pygobject/3.nix { }; + pygobject3 = callPackage ../development/python-modules/pygobject/3.nix { + inherit (pkgs) pkgconfig; + }; pygtail = callPackage ../development/python-modules/pygtail { }; - pygtk = callPackage ../development/python-modules/pygtk { libglade = null; }; + pygtk = callPackage ../development/python-modules/pygtk { + inherit (pkgs) pkgconfig; + libglade = null; + }; pygtksourceview = callPackage ../development/python-modules/pygtksourceview { }; @@ -1805,6 +1818,7 @@ in { grip = callPackage ../development/python-modules/grip { }; gst-python = callPackage ../development/python-modules/gst-python { + inherit (pkgs) pkgconfig; gst-plugins-base = pkgs.gst_all_1.gst-plugins-base; }; @@ -2861,7 +2875,9 @@ in { jsonpath_rw = callPackage ../development/python-modules/jsonpath_rw { }; - kerberos = callPackage ../development/python-modules/kerberos { }; + kerberos = callPackage ../development/python-modules/kerberos { + inherit (pkgs) kerberos; + }; lazy-object-proxy = callPackage ../development/python-modules/lazy-object-proxy { }; @@ -2924,7 +2940,7 @@ in { livereload = callPackage ../development/python-modules/livereload { }; llfuse = callPackage ../development/python-modules/llfuse { - fuse = pkgs.fuse; # use "real" fuse, not the python module + inherit (pkgs) fuse pkgconfig; # use "real" fuse and pkgconfig, not the python modules }; locustio = callPackage ../development/python-modules/locustio { }; @@ -2997,6 +3013,7 @@ in { in callPackage path { stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv; inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; + inherit (pkgs) pkgconfig; }; matrix-client = callPackage ../development/python-modules/matrix-client { }; @@ -3140,7 +3157,7 @@ in { }; pygraphviz = callPackage ../development/python-modules/pygraphviz { - graphviz = pkgs.graphviz; # not the python package + inherit (pkgs) graphviz pkgconfig; # not the python package }; pymc3 = callPackage ../development/python-modules/pymc3 { }; @@ -4653,7 +4670,7 @@ in { }; libvirt = callPackage ../development/python-modules/libvirt { - inherit (pkgs) libvirt; + inherit (pkgs) libvirt pkgconfig; }; rpdb = callPackage ../development/python-modules/rpdb { }; |