From 38d8bcd7ac6d33783bae71ffae5fd379b5ff6f5c Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 18 Dec 2017 15:27:20 +0800 Subject: [PATCH 001/331] vala: patch releases for 0.23, 0.28, 0.34, 0.36 and 0.38 --- pkgs/development/compilers/vala/default.nix | 22 +++++++++++++-------- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 57c22f08550..f42cdcabae3 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -31,8 +31,8 @@ in rec { vala_0_23 = generic { major = "0.23"; - minor = "2"; - sha256 = "0g22ss9qbm3fqhx4fxhsyfmdc5g1hgdw4dz9d37f4489kl0qf8pl"; + minor = "3"; + sha256 = "101xjbc818g4849n9a80c2aai13zakj7mpnd7470xnkvz5jwqq96"; }; vala_0_26 = generic { @@ -43,8 +43,8 @@ in rec { vala_0_28 = generic { major = "0.28"; - minor = "0"; - sha256 = "0zwpzhkhfk3piya14m7p2hl2vaabahprphppfm46ci91z39kp7hd"; + minor = "1"; + sha256 = "0isg327w6rfqqdjja6a8pc3xcdkj7pqrkdhw48bsyxab2fkaw3hw"; }; vala_0_32 = generic { @@ -55,14 +55,20 @@ in rec { vala_0_34 = generic { major = "0.34"; - minor = "1"; - sha256 = "16cjybjw100qps6jg0jdyjh8hndz8a876zmxpybnf30a8vygrk7m"; + minor = "13"; + sha256 = "0ahbnhgwhhjkndmbr1d039ws0g2bb324c60fk6wgx7py5wvmgcd2"; + }; + + vala_0_36 = generic { + major = "0.36"; + minor = "8"; + sha256 = "1nz5a8kcb22ss9idb7k1higwpvghd617xwf40fi0a9ggws614lfz"; }; vala_0_38 = generic { major = "0.38"; - minor = "1"; - sha256 = "112hl3lkcyakrk8c3qgw12gzn3nxjkvx7bn0jhl5f2m57d7k8d8h"; + minor = "4"; + sha256 = "1sg5gaq3jhgr9vzh2ypiw475167k150wmyglymr7wwqppmikmcrc"; extraNativeBuildInputs = [ autoconf ] ++ stdenv.lib.optionals stdenv.isDarwin [ libtool expat ]; extraBuildInputs = [ graphviz ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 57c15125d2a..eb7a3b79041 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6415,6 +6415,7 @@ with pkgs; vala_0_28 vala_0_32 vala_0_34 + vala_0_36 vala_0_38 vala; From bdc80cd5d38bb06197ac3b418b6e258d53785afb Mon Sep 17 00:00:00 2001 From: Izorkin Date: Wed, 20 Dec 2017 09:40:29 +0300 Subject: [PATCH 002/331] libnftnl: 1.0.7 -> 1.0.8 --- pkgs/development/libraries/libnftnl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix index 074c1a9dfd2..060f5ba4934 100644 --- a/pkgs/development/libraries/libnftnl/default.nix +++ b/pkgs/development/libraries/libnftnl/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libmnl }: stdenv.mkDerivation rec { - name = "libnftnl-1.0.7"; + name = "libnftnl-1.0.8"; src = fetchurl { url = "http://netfilter.org/projects/libnftnl/files/${name}.tar.bz2"; - sha256 = "10irjrylcfkbp11617yr19vpfhgl54w0kw02jhj0i1abqv5nxdlv"; + sha256 = "0f10cfiyl4c0f8k3brxfrw28x7a6qvrakaslg4jgqncwxycxggg6"; }; nativeBuildInputs = [ pkgconfig ]; From a139613983734d26fe42402bf755da0b3ae73c38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 20 Dec 2017 14:56:31 +0100 Subject: [PATCH 003/331] glibc: maintenance 2.26-75 -> 2.26-115 --- .../libraries/glibc/2.26-75to115.diff.gz | Bin 0 -> 32865 bytes pkgs/development/libraries/glibc/common.nix | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/glibc/2.26-75to115.diff.gz diff --git a/pkgs/development/libraries/glibc/2.26-75to115.diff.gz b/pkgs/development/libraries/glibc/2.26-75to115.diff.gz new file mode 100644 index 0000000000000000000000000000000000000000..9bf1a4f7d39b2d42fb92dcb0d347152425d503b7 GIT binary patch literal 32865 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 Bq1ONa literal 0 HcmV?d00001 diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 86f3be15fea..dde1977a2ba 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -20,7 +20,7 @@ let version = "2.26"; - patchSuffix = "-75"; + patchSuffix = "-115"; sha256 = "1ggnj1hzjym7sn93rbwydcqd562q73lsb7g7kd199g6j9j9hlkp5"; cross = if buildPlatform != hostPlatform then hostPlatform else null; in @@ -47,6 +47,7 @@ stdenv.mkDerivation ({ $ git show --reverse glibc-2.25..release/2.25/master | gzip -n -9 --rsyncable - > 2.25-49.patch.gz */ ./2.26-75.patch.gz + ./2.26-75to115.diff.gz /* Have rpcgen(1) look for cpp(1) in $PATH. */ ./rpcgen-path.patch From 3322a852237998b4614cc58dc60d9ccf8455e266 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Wed, 1 Nov 2017 12:31:59 +0000 Subject: [PATCH 004/331] gconf: add python to dependencies, fixes #31083 --- pkgs/desktops/gnome-3/core/gconf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gconf/default.nix b/pkgs/desktops/gnome-3/core/gconf/default.nix index 1729ec06623..99883c8a3f6 100644 --- a/pkgs/desktops/gnome-3/core/gconf/default.nix +++ b/pkgs/desktops/gnome-3/core/gconf/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, dbus_glib, gnome3 ? null, glib, libxml2 -, intltool, polkit, orbit, withGtk ? false }: +, intltool, polkit, orbit, python, withGtk ? false }: assert withGtk -> (gnome3 != null); @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "0k3q9nh53yhc9qxf1zaicz4sk8p3kzq4ndjdsgpaa2db0ccbj4hr"; }; - buildInputs = [ libxml2 polkit orbit ] ++ stdenv.lib.optional withGtk gnome3.gtk; + buildInputs = [ libxml2 polkit orbit python ] ++ stdenv.lib.optional withGtk gnome3.gtk; propagatedBuildInputs = [ glib dbus_glib ]; nativeBuildInputs = [ pkgconfig intltool ]; From e09a0faacd7eae6a2b9461d44519e46fe8e6707d Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Thu, 21 Dec 2017 11:13:17 +0100 Subject: [PATCH 005/331] libassuan: 2.4.3 -> 2.5.1 --- pkgs/development/libraries/libassuan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix index bad2a060cdc..94369449ff3 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, pth, libgpgerror }: stdenv.mkDerivation rec { - name = "libassuan-2.4.3"; + name = "libassuan-2.5.1"; src = fetchurl { url = "mirror://gnupg/libassuan/${name}.tar.bz2"; - sha256 = "0w9bmasln4z8mn16s1is55a06w3nv8jbyal496z5jvr5vcxkm112"; + sha256 = "0jb4nb4nrjr949gd3lw8lh4v5d6qigxaq6xwy24w5apjnhvnrya7"; }; outputs = [ "out" "dev" "info" ]; From f32821b270973a9cb7c2e74cccfdb1427e9ee32e Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Thu, 21 Dec 2017 11:57:23 +0100 Subject: [PATCH 006/331] libgcrypt: 1.8.1 -> 1.8.2 --- pkgs/development/libraries/libgcrypt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index e32ba050c38..397000fc7d2 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -4,11 +4,11 @@ assert enableCapabilities -> stdenv.isLinux; stdenv.mkDerivation rec { name = "libgcrypt-${version}"; - version = "1.8.1"; + version = "1.8.2"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${name}.tar.bz2"; - sha256 = "1cvqd9jk5qshbh48yh3ixw4zyr4n5k50r3475rrh20xfn7w7aa3s"; + sha256 = "01sca9m8hm6b5v8hmqsfdjhyz013869p1f0fxw9ln52qfnp4q1n8"; }; outputs = [ "out" "dev" "info" ]; From 2beb8389dfb4055213d634f36a1df252d060b9ef Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Thu, 21 Dec 2017 11:57:38 +0100 Subject: [PATCH 007/331] gnupg: 2.2.3 -> 2.2.4 See http://lists.gnu.org/archive/html/info-gnu/2017-12/msg00013.html for release information --- pkgs/tools/security/gnupg/22.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index 0519902308a..89fee90364e 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -15,11 +15,11 @@ assert guiSupport -> pinentry != null; stdenv.mkDerivation rec { name = "gnupg-${version}"; - version = "2.2.3"; + version = "2.2.4"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "1d4482c4pbi0p1k8cc0f9c4q51k56v8navrbz5samxrrs42p3lyb"; + sha256 = "1v7j8v2ww1knknbrhw3svfrqkmf9ll58iq0dczbsdpqgg1j3w6j0"; }; nativeBuildInputs = [ pkgconfig ]; From dc906952be70e53270953df63419f5fdb256d343 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 21 Dec 2017 15:49:06 -0500 Subject: [PATCH 008/331] buildPythonPackage: Make setup hook part of nativeBuildInputs This is better organization in general, but also needed to make python work with #26805. --- .../python/mk-python-derivation.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 5f7348ac825..d9cff16f448 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -13,7 +13,10 @@ { name ? "${attrs.pname}-${attrs.version}" -# Dependencies for building the package +# Build-time dependencies for the package +, nativeBuildInputs ? [] + +# Run-time dependencies for the package , buildInputs ? [] # Dependencies needed for running the checkPhase. @@ -66,13 +69,15 @@ toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attrs [ name = namePrefix + name; - buildInputs = ([ wrapPython (ensureNewerSourcesHook { year = "1980"; }) ] - ++ (lib.optional (lib.hasSuffix "zip" attrs.src.name or "") unzip) + nativeBuildInputs = [ (ensureNewerSourcesHook { year = "1980"; }) ] + ++ nativeBuildInputs; + + buildInputs = [ wrapPython ] + ++ lib.optional (lib.hasSuffix "zip" (attrs.src.name or "")) unzip ++ lib.optionals doCheck checkInputs - ++ lib.optional catchConflicts setuptools # If we nog longer propagate setuptools + ++ lib.optional catchConflicts setuptools # If we no longer propagate setuptools ++ buildInputs - ++ pythonPath - ); + ++ pythonPath; # Propagate python and setuptools. We should stop propagating setuptools. propagatedBuildInputs = propagatedBuildInputs ++ [ python setuptools ]; From 87acb2b9fdb990ccb9f94a061b9bc21e4d31e0e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 20 Dec 2017 14:57:48 +0100 Subject: [PATCH 009/331] glibc: support RHEL 6 -like kernels again We lost the support with 2.25 -> 2.26 --- .../libraries/glibc/allow-kernel-2.6.32.patch | 39 +++++++++++++++++++ pkgs/development/libraries/glibc/common.nix | 19 +++++++++ 2 files changed, 58 insertions(+) create mode 100644 pkgs/development/libraries/glibc/allow-kernel-2.6.32.patch diff --git a/pkgs/development/libraries/glibc/allow-kernel-2.6.32.patch b/pkgs/development/libraries/glibc/allow-kernel-2.6.32.patch new file mode 100644 index 00000000000..ce18b874c42 --- /dev/null +++ b/pkgs/development/libraries/glibc/allow-kernel-2.6.32.patch @@ -0,0 +1,39 @@ +diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure +index cace758c01..38fe7fe0b0 100644 +--- a/sysdeps/unix/sysv/linux/configure ++++ b/sysdeps/unix/sysv/linux/configure +@@ -69,7 +69,7 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kernel header at least $minimum_kernel" >&5 + $as_echo_n "checking for kernel header at least $minimum_kernel... " >&6; } + decnum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/(\1 * 65536 + \2 * 256 + \3)/'`; +-abinum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1,\2,\3/'`; ++abinum=`echo "2.6.32.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1,\2,\3/'`; + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include +diff --git a/sysdeps/unix/sysv/linux/configure.ac b/sysdeps/unix/sysv/linux/configure.ac +index 13abda0a51..6abc12eaed 100644 +--- a/sysdeps/unix/sysv/linux/configure.ac ++++ b/sysdeps/unix/sysv/linux/configure.ac +@@ -50,7 +50,7 @@ fi + AC_MSG_CHECKING(for kernel header at least $minimum_kernel) + changequote(,)dnl + decnum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/(\1 * 65536 + \2 * 256 + \3)/'`; +-abinum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1,\2,\3/'`; ++abinum=`echo "2.6.32.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1,\2,\3/'`; + changequote([,])dnl + AC_TRY_COMPILE([#include + #if LINUX_VERSION_CODE < $decnum +diff --git a/sysdeps/unix/sysv/linux/dl-osinfo.h b/sysdeps/unix/sysv/linux/dl-osinfo.h +index 823cd8224d..482caaeeec 100644 +--- a/sysdeps/unix/sysv/linux/dl-osinfo.h ++++ b/sysdeps/unix/sysv/linux/dl-osinfo.h +@@ -39,7 +39,7 @@ + GLRO(dl_osversion) = version; \ + \ + /* Now we can test with the required version. */ \ +- if (__LINUX_KERNEL_VERSION > 0 && version < __LINUX_KERNEL_VERSION) \ ++ if (__LINUX_KERNEL_VERSION > 0 && version < __LINUX_KERNEL_VERSION && version != 0x020620) \ + /* Not sufficent. */ \ + FATAL ("FATAL: kernel too old\n"); \ + } \ diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index dde1977a2ba..5af914d179b 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -65,6 +65,25 @@ stdenv.mkDerivation ({ "/bin:/usr/bin", which is inappropriate on NixOS machines. This patch extends the search path by "/run/current-system/sw/bin". */ ./fix_path_attribute_in_getconf.patch + + /* Allow running with RHEL 6 -like kernels. The patch adds an exception + for glibc to accept 2.6.32 and to tag the ELFs as 2.6.32-compatible + (otherwise the loader would refuse libc). + Note that glibc will fully work only on their heavily patched kernels + and we lose early mismatch detection on 2.6.32. + + On major glibc updates we should check that the patched kernel supports + all the required features. ATM it's verified up to glibc-2.26-115. + # HOWTO: check glibc sources for changes in kernel requirements + git log -p glibc-2.25.. sysdeps/unix/sysv/linux/x86_64/kernel-features.h sysdeps/unix/sysv/linux/kernel-features.h + # get kernel sources (update the URL) + mkdir tmp && cd tmp + curl http://vault.centos.org/6.9/os/Source/SPackages/kernel-2.6.32-696.el6.src.rpm | rpm2cpio - | cpio -idmv + tar xf linux-*.bz2 + # check syscall presence, for example + less linux-*?/arch/x86/kernel/syscall_table_32.S + */ + ./allow-kernel-2.6.32.patch ] ++ lib.optional stdenv.isx86_64 ./fix-x64-abi.patch; From e9aa0d3f0f9913209ecd1d98a3dfb8e1013714ba Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 19 Dec 2017 16:28:32 -0600 Subject: [PATCH 010/331] llvm 5: 5.0.0 -> 5.0.1 --- pkgs/development/compilers/llvm/5/clang/default.nix | 2 +- pkgs/development/compilers/llvm/5/default.nix | 6 +++--- pkgs/development/compilers/llvm/5/libc++/default.nix | 2 +- pkgs/development/compilers/llvm/5/libc++abi.nix | 2 +- pkgs/development/compilers/llvm/5/lld.nix | 2 +- pkgs/development/compilers/llvm/5/lldb.nix | 2 +- pkgs/development/compilers/llvm/5/llvm.nix | 2 +- pkgs/development/compilers/llvm/5/openmp.nix | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix index fa8502ebd67..b003d2f334a 100644 --- a/pkgs/development/compilers/llvm/5/clang/default.nix +++ b/pkgs/development/compilers/llvm/5/clang/default.nix @@ -9,7 +9,7 @@ let name = "clang-${version}"; unpackPhase = '' - unpackFile ${fetch "cfe" "0w09s8fn3lkn6i04nj0cisgp821r815fk5b5fjn97xrd371277q1"} + unpackFile ${fetch "cfe" "1zyh4dggxd55lnfg73c8fybnkssqcaa6bq2h4bzimnnj1jdnqpqk"} mv cfe-${version}* clang sourceRoot=$PWD/clang unpackFile ${clang-tools-extra_src} diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix index 9891f3090ac..9e1787973fd 100644 --- a/pkgs/development/compilers/llvm/5/default.nix +++ b/pkgs/development/compilers/llvm/5/default.nix @@ -6,7 +6,7 @@ let callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); - release_version = "5.0.0"; + release_version = "5.0.1"; version = release_version; # differentiating these is important for rc's fetch = name: sha256: fetchurl { @@ -14,8 +14,8 @@ let inherit sha256; }; - compiler-rt_src = fetch "compiler-rt" "1cy0y389zxn7mk8vffqvfirk9bbcbc8ziwc1nf1a8d118rk55bfm"; - clang-tools-extra_src = fetch "clang-tools-extra" "1ikkv6k8cfgpjqlm24iqz52i5nyafzsc4dyikzzyb9n4b6wpil47"; + compiler-rt_src = fetch "compiler-rt" "1nlmm0b3wpdwxkldqp1klzv3rpqf94q2a248xgqb7aapyhbi9paf"; + clang-tools-extra_src = fetch "clang-tools-extra" "09fjii7w43kvxvsxxs6gig9vz95vnvx1779rqd36h8kksvws3bcs"; # Add man output without introducing extra dependencies. overrideManOutput = drv: diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix index 036161f7b88..6f03e225ad6 100644 --- a/pkgs/development/compilers/llvm/5/libc++/default.nix +++ b/pkgs/development/compilers/llvm/5/libc++/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "libc++-${version}"; - src = fetch "libcxx" "1cf953msb0vwgjjrapw06950dnsdb2ps305czkn0vvr1k8g9irga"; + src = fetch "libcxx" "003wwniwlikgh38cbqbcshc5gkiv3a2jkmbn6am9s46y5gfrk3zs"; postUnpack = '' unpackFile ${libcxxabi.src} diff --git a/pkgs/development/compilers/llvm/5/libc++abi.nix b/pkgs/development/compilers/llvm/5/libc++abi.nix index 5a2a269345d..166f4260291 100644 --- a/pkgs/development/compilers/llvm/5/libc++abi.nix +++ b/pkgs/development/compilers/llvm/5/libc++abi.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libc++abi-${version}"; - src = fetch "libcxxabi" "04c9dfmrr8diih73x0wq99dk9xb99mg0bvsnbhx5q912xg3ihs8p"; + src = fetch "libcxxabi" "0m78yr4arlz2b9m96xcygk15m2pbz8i10snk78i3q7pjnwn1a9as"; nativeBuildInputs = [ cmake ]; buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; diff --git a/pkgs/development/compilers/llvm/5/lld.nix b/pkgs/development/compilers/llvm/5/lld.nix index f19a9afc804..1d00b16cce1 100644 --- a/pkgs/development/compilers/llvm/5/lld.nix +++ b/pkgs/development/compilers/llvm/5/lld.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { name = "lld-${version}"; - src = fetch "lld" "15rqsmfw0jlsri7hszbs8l0j7v1030cy9xvvdb245397llh7k6ir"; + src = fetch "lld" "15fq2zvkliyiw5qi7ig2r8bshgbz4kzvs5in16mhfkw20l06rcym"; nativeBuildInputs = [ cmake ]; buildInputs = [ llvm ]; diff --git a/pkgs/development/compilers/llvm/5/lldb.nix b/pkgs/development/compilers/llvm/5/lldb.nix index fac23b290bc..03e65dde0e4 100644 --- a/pkgs/development/compilers/llvm/5/lldb.nix +++ b/pkgs/development/compilers/llvm/5/lldb.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { name = "lldb-${version}"; - src = fetch "lldb" "0zcbav39srf6awv9znvzr7nqdrj704i8da3wdgc8362y20rcm860"; + src = fetch "lldb" "0sipv8k37ai44m7jcf6wsbm2q41dgk3sk9m3i6823jkmg7kckhdp"; postPatch = '' # Fix up various paths that assume llvm and clang are installed in the same place diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix index 8358b6b18c3..6c7fd9eb0a3 100644 --- a/pkgs/development/compilers/llvm/5/llvm.nix +++ b/pkgs/development/compilers/llvm/5/llvm.nix @@ -22,7 +22,7 @@ }: let - src = fetch "llvm" "1nin64vz21hyng6jr19knxipvggaqlkl2l9jpd5czbc4c2pcnpg3"; + src = fetch "llvm" "1c07i0b61j69m578lgjkyayg419sh7sn40xb3j112nr2q2gli9sz"; # Used when creating a version-suffixed symlink of libLLVM.dylib shortVersion = with stdenv.lib; diff --git a/pkgs/development/compilers/llvm/5/openmp.nix b/pkgs/development/compilers/llvm/5/openmp.nix index 9ba42eed2e2..5a01c191b5a 100644 --- a/pkgs/development/compilers/llvm/5/openmp.nix +++ b/pkgs/development/compilers/llvm/5/openmp.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { name = "openmp-${version}"; - src = fetch "openmp" "1igplg89bl6k6r9q88hnpcznq3g9lb79w7bix025lwp00ldhivy0"; + src = fetch "openmp" "0lr6r87xzg87w1q9rrh04nqpyr8c929dh4qy3csjiy7rsb6kbdmd"; nativeBuildInputs = [ cmake perl ]; buildInputs = [ llvm ]; From d8a1b34c8eed7393e7c0023ef9ec96e7c8525bb5 Mon Sep 17 00:00:00 2001 From: Tristan Carel Date: Tue, 19 Dec 2017 07:54:50 +0100 Subject: [PATCH 011/331] boost166: init at 1.66.0 --- pkgs/development/libraries/boost/1.66.nix | 14 ++++++++++++++ pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/boost/1.66.nix diff --git a/pkgs/development/libraries/boost/1.66.nix b/pkgs/development/libraries/boost/1.66.nix new file mode 100644 index 00000000000..a89ae84db38 --- /dev/null +++ b/pkgs/development/libraries/boost/1.66.nix @@ -0,0 +1,14 @@ +{ stdenv, callPackage, fetchurl, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "1.66_0"; + + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_66_0.tar.bz2"; + # SHA256 from http://www.boost.org/users/history/version_1_66_0.html + sha256 = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9"; + }; + + enableNumpy = args.enableNumpy or true; + +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aa99a820f21..8f309df1ba8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8021,7 +8021,8 @@ with pkgs; boost163 = callPackage ../development/libraries/boost/1.63.nix { }; boost164 = callPackage ../development/libraries/boost/1.64.nix { }; boost165 = callPackage ../development/libraries/boost/1.65.nix { }; - boost16x = boost165; + boost166 = callPackage ../development/libraries/boost/1.66.nix { }; + boost16x = boost166; boost = boost16x; boost_process = callPackage ../development/libraries/boost-process { }; From 0e37a2cc989be811b362187b3ec014001e260e97 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 22 Dec 2017 09:11:34 +0100 Subject: [PATCH 012/331] boost165: make it possible to build without numpy --- pkgs/development/libraries/boost/1.65.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/boost/1.65.nix b/pkgs/development/libraries/boost/1.65.nix index 56b136cd99b..427ef072ffe 100644 --- a/pkgs/development/libraries/boost/1.65.nix +++ b/pkgs/development/libraries/boost/1.65.nix @@ -9,6 +9,6 @@ callPackage ./generic.nix (args // rec { sha256 = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81"; }; - enableNumpy = true; + enableNumpy = args.enableNumpy or true; }) From 79dd83d4665341c8ef4607e758405479b8cf8d1b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 4 Dec 2017 03:03:46 +0100 Subject: [PATCH 013/331] atk: do not propagate gi --- pkgs/development/libraries/atk/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index 61c18837782..f7d3887cc18 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -18,13 +18,11 @@ stdenv.mkDerivation rec { buildInputs = libintlOrEmpty; - nativeBuildInputs = [ pkgconfig perl ]; + nativeBuildInputs = [ pkgconfig perl gobjectIntrospection ]; propagatedBuildInputs = [ # Required by atk.pc glib - # TODO: Why propagate? - gobjectIntrospection ]; doCheck = true; From 2e6f01d9a6f3aa8630a5c07d567dce33b1c16d98 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 4 Dec 2017 00:03:20 +0100 Subject: [PATCH 014/331] gnome3.gnome-characters: re-add gobject-introspection dependency --- pkgs/desktops/gnome-3/apps/gnome-characters/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix index 15f1f58b558..a354c4f6316 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, intltool, gjs, gdk_pixbuf, librsvg }: +, intltool, gobjectIntrospection, gjs, gdk_pixbuf, librsvg }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ]; buildInputs = [ - gtk3 wrapGAppsHook intltool gjs gdk_pixbuf + gtk3 gjs gdk_pixbuf gobjectIntrospection librsvg gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme ]; From d2590f8a135b01cec19eeaba485e3442963f84bd Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 3 Dec 2017 23:51:33 +0100 Subject: [PATCH 015/331] gnome3.gnome-bluetooth: re-add gobject-introspection dependency It is no longer propagated from atk so we have to add it here. --- pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix index 9eaad021d32..3dbb4e32654 100644 --- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, gnome3, meson, ninja, pkgconfig, gtk3, intltool, glib -, udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra_gtk3 }: +, udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra_gtk3, gobjectIntrospection }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - nativeBuildInputs = [ meson ninja intltool itstool pkgconfig libxml2 wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja intltool itstool pkgconfig libxml2 wrapGAppsHook gobjectIntrospection ]; buildInputs = [ glib gtk3 udev libnotify libcanberra_gtk3 gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas ]; From 041e5b95d3ff6cfdd4c87d63a6d00a585ba5dd45 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 13 Dec 2017 09:54:08 +0100 Subject: [PATCH 016/331] gnome3.gucharmap: re-add gobject introspection dependency --- pkgs/desktops/gnome-3/core/gucharmap/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix index 58d9901ad01..731ff7e2688 100644 --- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix @@ -1,7 +1,7 @@ { stdenv, intltool, fetchurl, pkgconfig, gtk3 , glib, desktop_file_utils, bash, appdata-tools , wrapGAppsHook, gnome3, itstool, libxml2 -, callPackage, unzip }: +, callPackage, unzip, gobjectIntrospection }: # TODO: icons and theme still does not work # use packaged gnome3.adwaita-icon-theme @@ -15,11 +15,12 @@ stdenv.mkDerivation rec { preConfigure = "patchShebangs gucharmap/gen-guch-unicode-tables.pl"; - nativeBuildInputs = [ pkgconfig wrapGAppsHook unzip ]; + nativeBuildInputs = [ + pkgconfig wrapGAppsHook unzip intltool itstool appdata-tools + gnome3.yelp_tools libxml2 desktop_file_utils gobjectIntrospection + ]; - buildInputs = [ gtk3 intltool itstool glib appdata-tools - gnome3.yelp_tools libxml2 desktop_file_utils - gnome3.gsettings_desktop_schemas ]; + buildInputs = [ gtk3 glib gnome3.gsettings_desktop_schemas ]; unicode-data = callPackage ./unicode-data.nix {}; From 8a9b352becdf39dbadc69d8ba1b29b3306b0bec7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 13 Dec 2017 10:16:10 +0100 Subject: [PATCH 017/331] gnome3.eog: add gobject introspection dependency --- pkgs/desktops/gnome-3/core/eog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix index 49ad25a8c5e..ae0abfd7150 100644 --- a/pkgs/desktops/gnome-3/core/eog/default.nix +++ b/pkgs/desktops/gnome-3/core/eog/default.nix @@ -1,10 +1,10 @@ { fetchurl, stdenv, gettext, pkgconfig, itstool, libxml2, libjpeg, gnome3 -, shared_mime_info, wrapGAppsHook, librsvg, libexif }: +, shared_mime_info, wrapGAppsHook, librsvg, libexif, gobjectIntrospection }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook ]; + nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook gobjectIntrospection ]; buildInputs = with gnome3; [ libxml2 libjpeg gtk glib libpeas librsvg From ff2bda33cc07631d08ada2935021a342518fc3e6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 13 Dec 2017 10:16:34 +0100 Subject: [PATCH 018/331] gnome3.gtksourceview: re-add gobject introspection dependency --- pkgs/desktops/gnome-3/core/gtksourceview/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/core/gtksourceview/default.nix index 363cf1a0c4a..ca63cbd6cb8 100644 --- a/pkgs/desktops/gnome-3/core/gtksourceview/default.nix +++ b/pkgs/desktops/gnome-3/core/gtksourceview/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango -, libxml2, perl, intltool, gettext, gnome3, dbus, xvfb_run, shared_mime_info }: +, libxml2, perl, intltool, gettext, gnome3, gobjectIntrospection, dbus, xvfb_run, shared_mime_info }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig intltool gettext perl ] + nativeBuildInputs = [ pkgconfig intltool gettext perl gobjectIntrospection ] ++ stdenv.lib.optionals doCheck checkInputs; buildInputs = [ atk cairo glib pango libxml2 ]; checkInputs = [ xvfb_run dbus ]; From 2f14c9da68231821778da560469c2ef41f64f69c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 13 Dec 2017 10:41:42 +0100 Subject: [PATCH 019/331] simple-scan: add gobject introspection dependency --- pkgs/desktops/gnome-3/core/simple-scan/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index 27a1e4b0be5..a30467c1862 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -1,13 +1,17 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, itstool, wrapGAppsHook , cairo, gdk_pixbuf, colord, glib, gtk, gusb, packagekit, libwebp -, libxml2, sane-backends, vala, gnome3 }: +, libxml2, sane-backends, vala, gnome3, gobjectIntrospection }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; buildInputs = [ cairo gdk_pixbuf colord glib gnome3.defaultIconTheme gusb gtk libwebp packagekit sane-backends vala ]; - nativeBuildInputs = [ meson ninja gettext itstool pkgconfig wrapGAppsHook libxml2 ]; + nativeBuildInputs = [ + meson ninja gettext itstool pkgconfig wrapGAppsHook libxml2 + # For setup hook + gobjectIntrospection + ]; postPatch = '' patchShebangs data/meson_compile_gschema.py From 987d4595babf64016131ab9cdb5cd9f56b10e4b3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 13 Dec 2017 11:41:56 +0100 Subject: [PATCH 020/331] gtk2: add gobject introspection dependency --- pkgs/development/libraries/gtk+/2.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index 45222b7d7fc..169fd119d51 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xorg -, gdk_pixbuf, libintlOrEmpty, xlibsWrapper +, gdk_pixbuf, libintlOrEmpty, xlibsWrapper, gobjectIntrospection , xineramaSupport ? stdenv.isLinux , cupsSupport ? true, cups ? null , gdktarget ? "x11" @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - nativeBuildInputs = [ setupHook perl pkgconfig gettext ]; + nativeBuildInputs = [ setupHook perl pkgconfig gettext gobjectIntrospection ]; patches = [ ./2.0-immodules.cache.patch ./gtk2-theme-paths.patch ]; From 184f8ff69ab606a3b3b4187878fd938ec2c5f8f3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 13 Dec 2017 12:20:01 +0100 Subject: [PATCH 021/331] synapse: add gobject introspection dependency --- pkgs/applications/misc/synapse/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/synapse/default.nix b/pkgs/applications/misc/synapse/default.nix index 04f38968142..13f3fa98d56 100644 --- a/pkgs/applications/misc/synapse/default.nix +++ b/pkgs/applications/misc/synapse/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, intltool, pkgconfig, glib, libnotify, gtk3, libgee -, keybinder3, json_glib, zeitgeist, vala_0_34, hicolor_icon_theme +, keybinder3, json_glib, zeitgeist, vala_0_34, hicolor_icon_theme, gobjectIntrospection }: let @@ -12,7 +12,11 @@ in stdenv.mkDerivation rec { sha256 = "04cnsmwf9xa52dh7rpb4ia715c0ls8jg1p7llc9yf3lbg1m0bvzv"; }; - nativeBuildInputs = [ pkgconfig intltool vala_0_34 ]; + nativeBuildInputs = [ + pkgconfig intltool vala_0_34 + # For setup hook + gobjectIntrospection + ]; buildInputs = [ glib libnotify gtk3 libgee keybinder3 json_glib zeitgeist hicolor_icon_theme From 7e5717a209c9e7164c24adb68bf65ad72e72f3bc Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 13 Dec 2017 12:24:15 +0100 Subject: [PATCH 022/331] gnome3.gspell: re-add gobject introspection dependency --- pkgs/desktops/gnome-3/misc/gspell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/gspell/default.nix b/pkgs/desktops/gnome-3/misc/gspell/default.nix index e8c299685f7..2bbf219e3f3 100644 --- a/pkgs/desktops/gnome-3/misc/gspell/default.nix +++ b/pkgs/desktops/gnome-3/misc/gspell/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk3, enchant, isocodes, vala }: +{ stdenv, fetchurl, pkgconfig, glib, gtk3, enchant, isocodes, vala, gobjectIntrospection }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; propagatedBuildInputs = [ enchant ]; # required for pkgconfig - nativeBuildInputs = [ pkgconfig vala ]; + nativeBuildInputs = [ pkgconfig vala gobjectIntrospection ]; buildInputs = [ glib gtk3 isocodes ]; meta = with stdenv.lib; { From ec0cc33699a42f53515e75ef8e852c028ef74399 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 13 Dec 2017 12:31:14 +0100 Subject: [PATCH 023/331] deepin-terminal: add gobject introspection dependency --- pkgs/applications/misc/deepin-terminal/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/deepin-terminal/default.nix b/pkgs/applications/misc/deepin-terminal/default.nix index e08a2827b83..12ceb0958f0 100644 --- a/pkgs/applications/misc/deepin-terminal/default.nix +++ b/pkgs/applications/misc/deepin-terminal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, vte, libgee, wnck, zssh, gettext, librsvg, libsecret, json_glib }: +{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, vte, libgee, wnck, zssh, gettext, librsvg, libsecret, json_glib, gobjectIntrospection }: stdenv.mkDerivation rec { name = "deepin-terminal-${version}"; @@ -25,7 +25,11 @@ stdenv.mkDerivation rec { substituteInPlace ssh_login.sh --replace /usr/lib/deepin-terminal/zssh "${zssh}/bin/zssh" ''; - nativeBuildInputs = [ pkgconfig vala cmake gettext ]; + nativeBuildInputs = [ + pkgconfig vala cmake gettext + # For setup hook + gobjectIntrospection + ]; buildInputs = [ gtk3 vte libgee wnck librsvg libsecret json_glib ]; meta = with stdenv.lib; { From dd6d9a100f77f0774d6e3fffd57bacc3d0c4b73d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 13 Dec 2017 12:41:56 +0100 Subject: [PATCH 024/331] valauncher: add gobject introspection dependency --- pkgs/applications/misc/valauncher/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/valauncher/default.nix b/pkgs/applications/misc/valauncher/default.nix index f780e5469d0..38c4055a10b 100644 --- a/pkgs/applications/misc/valauncher/default.nix +++ b/pkgs/applications/misc/valauncher/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, gtk3, vala, pkgconfig, gnome3 }: +{ stdenv, fetchFromGitHub, cmake, gtk3, vala, pkgconfig, gnome3, gobjectIntrospection }: stdenv.mkDerivation rec { version = "1.3.1"; @@ -11,8 +11,12 @@ stdenv.mkDerivation rec { sha256 = "18969v870737jg1q0l3d05pb9mxsrcpdi0mnyz94rwkspszvxxqi"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake gtk3 vala gnome3.libgee ]; + nativeBuildInputs = [ + cmake vala pkgconfig + # For setup hook + gobjectIntrospection + ]; + buildInputs = [ gtk3 gnome3.libgee ]; meta = with stdenv.lib; { description = "A fast dmenu-like gtk3 application launcher"; From b050530298e15c1780b7d261c890450e48035dd4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 13 Dec 2017 12:45:02 +0100 Subject: [PATCH 025/331] pdfpc: add gobject introspection dependency --- pkgs/applications/misc/pdfpc/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index 8e0fc613721..9fc14d0cae7 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig, vala, gtk3, libgee -, poppler, libpthreadstubs, gstreamer, gst-plugins-base, librsvg, pcre }: +, poppler, libpthreadstubs, gstreamer, gst-plugins-base, librsvg, pcre, gobjectIntrospection }: stdenv.mkDerivation rec { name = "${product}-${version}"; @@ -13,7 +13,11 @@ stdenv.mkDerivation rec { sha256 = "00qfmmk8h762p53z46g976z7j4fbxyi16w5axzsv1ymvdq95ds8c"; }; - nativeBuildInputs = [ cmake pkgconfig vala ]; + nativeBuildInputs = [ + cmake pkgconfig vala + # For setup hook + gobjectIntrospection + ]; buildInputs = [ gstreamer gst-plugins-base gtk3 libgee poppler libpthreadstubs makeWrapper librsvg pcre ]; From 7625f830f44559abbc07f9729cc1623e0987b1f1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 13 Dec 2017 12:48:47 +0100 Subject: [PATCH 026/331] kupfer: add gobject introspection dependency --- pkgs/applications/misc/kupfer/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/kupfer/default.nix b/pkgs/applications/misc/kupfer/default.nix index f3bb825cbf7..e2290105c92 100644 --- a/pkgs/applications/misc/kupfer/default.nix +++ b/pkgs/applications/misc/kupfer/default.nix @@ -3,6 +3,7 @@ , fetchurl , intltool , python3Packages +, gobjectIntrospection , gtk3 , dbus , libwnck3 @@ -22,7 +23,11 @@ buildPythonApplication rec { sha256 = "0c9xjx13r8ckfr4az116bhxsd3pk78v04c3lz6lqhraak0rp4d92"; }; - nativeBuildInputs = [ wrapGAppsHook intltool ]; + nativeBuildInputs = [ + wrapGAppsHook intltool + # For setup hook + gobjectIntrospection + ]; buildInputs = [ hicolor_icon_theme docutils libwnck3 keybinder3 ]; propagatedBuildInputs = [ pygobject3 gtk3 pyxdg dbus-python pycairo ]; From e3b9406713aaa62c4f7dfac4b1d605dcf269dbb3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 13 Dec 2017 13:32:27 +0100 Subject: [PATCH 027/331] gnome3.libpeas: re-add gobject introspection dependency --- pkgs/desktops/gnome-3/core/libpeas/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/core/libpeas/default.nix b/pkgs/desktops/gnome-3/core/libpeas/default.nix index 8fddd8f7d5a..998a1a02b3f 100644 --- a/pkgs/desktops/gnome-3/core/libpeas/default.nix +++ b/pkgs/desktops/gnome-3/core/libpeas/default.nix @@ -8,7 +8,11 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-python3" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool glib gtk3 gnome3.defaultIconTheme ncurses python3Packages.python python3Packages.pygobject3 gobjectIntrospection ]; + buildInputs = [ intltool glib gtk3 gnome3.defaultIconTheme ncurses python3Packages.python python3Packages.pygobject3 ]; + propagatedBuildInputs = [ + # Required by libpeas-1.0.pc + gobjectIntrospection + ]; meta = with stdenv.lib; { description = "A GObject-based plugins engine"; From 8bdcf7a726ae11f15a09e3974f9966264d08a91d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 13 Dec 2017 13:32:46 +0100 Subject: [PATCH 028/331] dfeet: re-add gobject introspection dependency --- pkgs/development/tools/misc/d-feet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index 6006c83c0cd..b20f63e2625 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -1,5 +1,5 @@ { stdenv, pkgconfig, fetchurl, itstool, intltool, libxml2, glib, gtk3 -, python3Packages, wrapGAppsHook, gnome3, libwnck3 }: +, python3Packages, wrapGAppsHook, gnome3, libwnck3, gobjectIntrospection }: let version = "${major}.13"; @@ -14,7 +14,7 @@ in python3Packages.buildPythonApplication rec { }; nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook libxml2 ]; - buildInputs = [ glib gtk3 gnome3.defaultIconTheme libwnck3 ]; + buildInputs = [ glib gtk3 gnome3.defaultIconTheme libwnck3 gobjectIntrospection ]; propagatedBuildInputs = with python3Packages; [ pygobject3 pep8 ]; From 7f1a92fbcb27b935e7525d9a030b4ed86e562e20 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 13 Dec 2017 13:37:01 +0100 Subject: [PATCH 029/331] pantheon.pantheon-terminal: add gobject introspection dependency --- pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix index b7c27ec3d0a..13a34f90fcd 100644 --- a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, cmake, vala_0_38, pkgconfig, glib, gtk3, granite, gnome3, libnotify, gettext, makeWrapper }: +{ stdenv, fetchurl, perl, cmake, vala_0_38, pkgconfig, glib, gtk3, granite, gnome3, libnotify, gettext, makeWrapper, gobjectIntrospection }: stdenv.mkDerivation rec { majorVersion = "0.4"; @@ -20,7 +20,11 @@ stdenv.mkDerivation rec { done ''; - nativeBuildInputs = [ perl cmake vala_0_38 pkgconfig makeWrapper ]; + nativeBuildInputs = [ + perl cmake vala_0_38 pkgconfig makeWrapper + # For setup hook + gobjectIntrospection + ]; buildInputs = with gnome3; [ glib gtk3 granite libnotify gettext vte_290 libgee gsettings_desktop_schemas defaultIconTheme From 023271e05eff02e584ae90d330a724ea39b31de5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 14 Dec 2017 09:39:07 +0100 Subject: [PATCH 030/331] font-manager: add gobject introspection dependency --- pkgs/applications/misc/font-manager/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index 6d67d3a340f..8c63c856578 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, makeWrapper, automake, autoconf, libtool, +{ stdenv, fetchFromGitHub, automake, autoconf, libtool, pkgconfig, file, intltool, libxml2, json_glib , sqlite, itstool, - librsvg, vala_0_34, gnome3, wrapGAppsHook + librsvg, vala_0_34, gnome3, wrapGAppsHook, gobjectIntrospection }: stdenv.mkDerivation rec { @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - makeWrapper pkgconfig automake autoconf libtool file @@ -23,6 +22,8 @@ stdenv.mkDerivation rec { vala_0_34 gnome3.yelp_tools wrapGAppsHook + # For setup hook + gobjectIntrospection ]; buildInputs = [ From 21b09d7961f0ee42dc8c408589aebe691fde718f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 17 Dec 2017 07:35:42 +0100 Subject: [PATCH 031/331] ruby-modules gio2: re-add gobjectIntrospection dependency Previously, it was accidentaly propagated by atk. --- pkgs/development/ruby-modules/gem-config/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 05415b88968..ede9d8869a2 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -109,7 +109,7 @@ in gio2 = attrs: { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 pcre ]; + buildInputs = [ gtk2 pcre gobjectIntrospection ]; }; gitlab-markup = attrs: { meta.priority = 1; }; From 77b1803830b2e0763276a52a430191df0a66ff32 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 22 Dec 2017 18:11:19 -0500 Subject: [PATCH 032/331] dblatex: 0.3.7 -> 0.3.10, fixes for the new texlive --- pkgs/tools/typesetting/tex/dblatex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/tex/dblatex/default.nix b/pkgs/tools/typesetting/tex/dblatex/default.nix index 7ffccde2c03..c4eaf4e1df4 100644 --- a/pkgs/tools/typesetting/tex/dblatex/default.nix +++ b/pkgs/tools/typesetting/tex/dblatex/default.nix @@ -21,11 +21,11 @@ assert enableAllFeatures -> ghostscript != null; stdenv.mkDerivation rec { - name = "dblatex-0.3.7"; + name = "dblatex-0.3.10"; src = fetchurl { url = "mirror://sourceforge/dblatex/${name}.tar.bz2"; - sha256 = "0bkjgrn03dy5c7438s429wnv6z5ynxkr4pbhp2z49kynskgkzkjr"; + sha256 = "1yicd861rqz78i2khl35j7nvc0ccv4jx4hzqrbhll17082vrdmkg"; }; buildInputs = [ python2 libxslt tex ] From 46514076540597a8af783938a538ddebf2b2e446 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sun, 24 Dec 2017 22:00:58 -0500 Subject: [PATCH 033/331] darwin stdenv: Make stdenv.cc, not stdenv, bring in libcxx stdenvNoCC should not inject any C++ standard library, just as it doesn't inject any C standard library. stdenv still does, but only indirectly through stdenv.cc. Wrapped clangs can be simplified now that they don't need to worry about clobbering CoreFoundation when replacing the C++ standard library implementation. This generally-good cleanup should assist with debugging some C++ failures in #26805. --- .../compilers/llvm/3.7/default.nix | 4 ---- .../compilers/llvm/3.8/default.nix | 4 ---- .../compilers/llvm/3.9/default.nix | 4 ---- pkgs/development/compilers/llvm/4/default.nix | 4 ---- pkgs/development/compilers/llvm/5/default.nix | 4 ---- pkgs/stdenv/darwin/default.nix | 20 ++++++++++++++----- 6 files changed, 15 insertions(+), 25 deletions(-) diff --git a/pkgs/development/compilers/llvm/3.7/default.nix b/pkgs/development/compilers/llvm/3.7/default.nix index 35af978216c..5cac04c044d 100644 --- a/pkgs/development/compilers/llvm/3.7/default.nix +++ b/pkgs/development/compilers/llvm/3.7/default.nix @@ -44,15 +44,11 @@ let stdenv = stdenv.override (drv: { allowedRequisites = null; cc = self.clang; - # Don't include the libc++ and libc++abi from the original stdenv. - extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; }); libcxxStdenv = stdenv.override (drv: { allowedRequisites = null; cc = self.libcxxClang; - # Don't include the libc++ and libc++abi from the original stdenv. - extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; }); lldb = callPackage ./lldb.nix {}; diff --git a/pkgs/development/compilers/llvm/3.8/default.nix b/pkgs/development/compilers/llvm/3.8/default.nix index bd79db012a6..a660d4aea5f 100644 --- a/pkgs/development/compilers/llvm/3.8/default.nix +++ b/pkgs/development/compilers/llvm/3.8/default.nix @@ -41,15 +41,11 @@ let stdenv = stdenv.override (drv: { allowedRequisites = null; cc = self.clang; - # Don't include the libc++ and libc++abi from the original stdenv. - extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; }); libcxxStdenv = stdenv.override (drv: { allowedRequisites = null; cc = self.libcxxClang; - # Don't include the libc++ and libc++abi from the original stdenv. - extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; }); lldb = callPackage ./lldb.nix {}; diff --git a/pkgs/development/compilers/llvm/3.9/default.nix b/pkgs/development/compilers/llvm/3.9/default.nix index 5ce51bc9c12..c58adc3f92d 100644 --- a/pkgs/development/compilers/llvm/3.9/default.nix +++ b/pkgs/development/compilers/llvm/3.9/default.nix @@ -41,15 +41,11 @@ let stdenv = stdenv.override (drv: { allowedRequisites = null; cc = self.clang; - # Don't include the libc++ and libc++abi from the original stdenv. - extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; }); libcxxStdenv = stdenv.override (drv: { allowedRequisites = null; cc = self.libcxxClang; - # Don't include the libc++ and libc++abi from the original stdenv. - extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; }); lldb = callPackage ./lldb.nix {}; diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix index fa61a6c22e7..5a44cb86825 100644 --- a/pkgs/development/compilers/llvm/4/default.nix +++ b/pkgs/development/compilers/llvm/4/default.nix @@ -56,15 +56,11 @@ let stdenv = stdenv.override (drv: { allowedRequisites = null; cc = self.clang; - # Don't include the libc++ and libc++abi from the original stdenv. - extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; }); libcxxStdenv = stdenv.override (drv: { allowedRequisites = null; cc = self.libcxxClang; - # Don't include the libc++ and libc++abi from the original stdenv. - extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; }); lld = callPackage ./lld.nix {}; diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix index 9891f3090ac..d2a73b6035f 100644 --- a/pkgs/development/compilers/llvm/5/default.nix +++ b/pkgs/development/compilers/llvm/5/default.nix @@ -56,15 +56,11 @@ let stdenv = stdenv.override (drv: { allowedRequisites = null; cc = self.clang; - # Don't include the libc++ and libc++abi from the original stdenv. - extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; }); libcxxStdenv = stdenv.override (drv: { allowedRequisites = null; cc = self.libcxxClang; - # Don't include the libc++ and libc++abi from the original stdenv. - extraBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.CF; }); lld = callPackage ./lld.nix {}; diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index d202186c29b..2542d242885 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -58,6 +58,7 @@ in rec { extraPreHook ? "", extraNativeBuildInputs, extraBuildInputs, + libcxx, allowedRequisites ? null}: let buildPackages = lib.optionalAttrs (last ? stdenv) { @@ -82,6 +83,8 @@ in rec { inherit shell; inherit (last) stdenvNoCC; + extraPackages = lib.optional (libcxx != null) libcxx; + nativeTools = false; nativeLibc = false; inherit buildPackages coreutils gnugrep bintools; @@ -176,6 +179,7 @@ in rec { extraNativeBuildInputs = []; extraBuildInputs = []; + libcxx = null; }; stage1 = prevStage: let @@ -183,7 +187,8 @@ in rec { in with prevStage; stageFun 1 prevStage { extraPreHook = "export NIX_CFLAGS_COMPILE+=\" -F${bootstrapTools}/Library/Frameworks\""; extraNativeBuildInputs = []; - extraBuildInputs = [ pkgs.libcxx ]; + extraBuildInputs = [ ]; + libcxx = pkgs.libcxx; allowedRequisites = [ bootstrapTools ] ++ (with pkgs; [ libcxx libcxxabi ]) ++ [ pkgs.darwin.Libsystem ]; @@ -210,7 +215,8 @@ in rec { ''; extraNativeBuildInputs = [ pkgs.xz ]; - extraBuildInputs = with pkgs; [ darwin.CF libcxx ]; + extraBuildInputs = [ pkgs.darwin.CF ]; + libcxx = pkgs.libcxx; allowedRequisites = [ bootstrapTools ] ++ @@ -242,7 +248,8 @@ in rec { # and instead goes by $PATH, which happens to contain bootstrapTools. So it goes and # patches our shebangs back to point at bootstrapTools. This makes sure bash comes first. extraNativeBuildInputs = with pkgs; [ xz pkgs.bash ]; - extraBuildInputs = with pkgs; [ darwin.CF libcxx ]; + extraBuildInputs = [ pkgs.darwin.CF ]; + libcxx = pkgs.libcxx; extraPreHook = '' export PATH=${pkgs.bash}/bin:$PATH @@ -277,7 +284,9 @@ in rec { in with prevStage; stageFun 4 prevStage { shell = "${pkgs.bash}/bin/bash"; extraNativeBuildInputs = with pkgs; [ xz pkgs.bash ]; - extraBuildInputs = with pkgs; [ darwin.CF libcxx ]; + extraBuildInputs = [ pkgs.darwin.CF ]; + libcxx = pkgs.libcxx; + extraPreHook = '' export PATH_LOCALE=${pkgs.darwin.locale}/share/locale ''; @@ -347,10 +356,11 @@ in rec { cc = pkgs.llvmPackages.clang-unwrapped; bintools = pkgs.darwin.binutils; libc = pkgs.darwin.Libsystem; + extraPackages = [ pkgs.libcxx ]; }; extraNativeBuildInputs = []; - extraBuildInputs = with pkgs; [ darwin.CF libcxx ]; + extraBuildInputs = [ pkgs.darwin.CF ]; extraAttrs = { inherit platform bootstrapTools; From 46abd5f764198cd25c8a9797809b81d28d876216 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 26 Dec 2017 19:55:59 +0100 Subject: [PATCH 034/331] python.pkgs.jinja2: enable tests --- .../python-modules/jinja2/default.nix | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix index ca286ae06aa..cb0eb130a2f 100644 --- a/pkgs/development/python-modules/jinja2/default.nix +++ b/pkgs/development/python-modules/jinja2/default.nix @@ -1,20 +1,24 @@ -{ stdenv, buildPythonPackage, fetchPypi -, markupsafe }: +{ stdenv, buildPythonPackage, fetchFromGitHub +, pytest, markupsafe }: buildPythonPackage rec { pname = "Jinja2"; version = "2.9.6"; name = "${pname}-${version}"; - src = fetchPypi { - inherit pname version; - sha256 = "1zzrkywhziqffrzks14kzixz7nd4yh2vc0fb04a68vfd2ai03anx"; + src = fetchFromGitHub { + owner = "pallets"; + repo = "jinja"; + rev = version; + sha256 = "1xxc5vdhz214aawmllv0fi4ak6d7zac662yb7gn1xfgqfz392pg5"; }; + checkInputs = [ pytest ]; propagatedBuildInputs = [ markupsafe ]; - # No tests included - doCheck = false; + checkPhase = '' + pytest -v + ''; meta = with stdenv.lib; { homepage = http://jinja.pocoo.org/; @@ -24,7 +28,7 @@ buildPythonPackage rec { Jinja2 is a template engine written in pure Python. It provides a Django inspired non-XML syntax but supports inline expressions and an optional sandboxed environment. - ''; + ''; platforms = platforms.all; maintainers = with maintainers; [ pierron garbas sjourdois ]; }; From e16f887ec50ef0060de6d0ef8a59462541a28665 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 26 Dec 2017 20:14:12 +0100 Subject: [PATCH 035/331] ansible_2_{1,2}: fix for jinja src change --- pkgs/tools/admin/ansible/2.1.nix | 9 ++++++--- pkgs/tools/admin/ansible/2.2.nix | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/admin/ansible/2.1.nix b/pkgs/tools/admin/ansible/2.1.nix index d4a349c5e47..b8b335bd618 100644 --- a/pkgs/tools/admin/ansible/2.1.nix +++ b/pkgs/tools/admin/ansible/2.1.nix @@ -1,5 +1,6 @@ { stdenv , fetchurl +, fetchFromGitHub , pythonPackages , windowsSupport ? false }: @@ -10,9 +11,11 @@ let jinja = jinja2.overridePythonAttrs (old: rec { version = "2.8.1"; name = "${old.pname}-${version}"; - src = old.src.override { - inherit version; - sha256 = "35341f3a97b46327b3ef1eb624aadea87a535b8f50863036e085e7c426ac5891"; + src = fetchFromGitHub { + owner = "pallets"; + repo = "jinja"; + rev = version; + sha256 = "0m6g6fx6flxb6hrkw757mbx1gxyrmj50w27m2afdsvmvz0zpdi2a"; }; }); in buildPythonPackage rec { diff --git a/pkgs/tools/admin/ansible/2.2.nix b/pkgs/tools/admin/ansible/2.2.nix index 4ef35fa5d9e..ccca64b86b6 100644 --- a/pkgs/tools/admin/ansible/2.2.nix +++ b/pkgs/tools/admin/ansible/2.2.nix @@ -1,5 +1,6 @@ { stdenv , fetchurl +, fetchFromGitHub , pythonPackages , windowsSupport ? false }: @@ -12,9 +13,11 @@ let jinja = jinja2.overridePythonAttrs (old: rec { version = "2.8.1"; name = "${old.pname}-${version}"; - src = old.src.override { - inherit version; - sha256 = "35341f3a97b46327b3ef1eb624aadea87a535b8f50863036e085e7c426ac5891"; + src = fetchFromGitHub { + owner = "pallets"; + repo = "jinja"; + rev = version; + sha256 = "0m6g6fx6flxb6hrkw757mbx1gxyrmj50w27m2afdsvmvz0zpdi2a"; }; }); in buildPythonPackage rec { From c8080388d8a1c0e215239e49e2900eae54fb2d8f Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 27 Dec 2017 18:41:31 +0100 Subject: [PATCH 036/331] libresolv: fix library version --- .../darwin/apple-source-releases/libresolv/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix index a74198e8ddd..a565971a6fa 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix @@ -33,7 +33,7 @@ appleDerivation { cc -I. -c res_send.c cc -I. -c res_sendsigned.c cc -I. -c res_update.c - cc -dynamiclib -install_name $out/lib/libresolv.9.dylib -o libresolv.9.dylib *.o + cc -dynamiclib -install_name $out/lib/libresolv.9.dylib -current_version 1.0.0 -compatibility_version 1.0.0 -o libresolv.9.dylib *.o ''; installPhase = '' From 8cd2ee91ef2897be160ff8fae9d6218690e03ccf Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Thu, 28 Dec 2017 09:11:06 +0100 Subject: [PATCH 037/331] coreutils: 8.28 -> 8.29 See http://lists.gnu.org/archive/html/info-gnu/2017-12/msg00016.html for release announcement --- pkgs/tools/misc/coreutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 9a422a96d70..589c58d0acc 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -14,11 +14,11 @@ assert selinuxSupport -> libselinux != null && libsepol != null; with lib; stdenv.mkDerivation rec { - name = "coreutils-8.28"; + name = "coreutils-8.29"; src = fetchurl { url = "mirror://gnu/coreutils/${name}.tar.xz"; - sha256 = "0r8c1bgm68kl70j1lgd0rv12iykw6143k4m9a56xip9rc2hv25qi"; + sha256 = "0plm1zs9il6bb5mk881qvbghq4glc8ybbgakk2lfzb0w64fgml4j"; }; patches = optional hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch; From a8df05ee2f766694391034f03fd6bfae2fc43424 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 30 Sep 2017 19:32:43 +0200 Subject: [PATCH 038/331] mariadb: 10.1.26 -> 10.2.6 --- pkgs/servers/sql/mariadb/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index d6731a5b7dc..269bd2abb25 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -15,12 +15,11 @@ mariadb = everything // { }; common = rec { # attributes common to both builds - version = "10.1.28"; + version = "10.2.6"; src = fetchurl { - url = "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz/from/http%3A//ftp.hosteurope.de/mirror/archive.mariadb.org/?serve"; - sha256 = "1g9b0c04qhgcgw6xw29bvdjjjacr7kn82crc7apvvi10ykzwhb99"; - name = "mariadb-${version}.tar.gz"; + url = "https://downloads.mariadb.org/interstitial/mariadb-${version}/source/mariadb-${version}.tar.gz"; + sha256 = "1rd2b1b6s87ymr5qhlggr4q4ljazv82ih0msgrbz1rfn81pcg1f3"; }; prePatch = '' @@ -155,9 +154,6 @@ everything = stdenv.mkDerivation (common // { postInstall = common.postInstall + '' rm -r "$out"/{mysql-test,sql-bench,data} # Don't need testing data rm "$out"/share/man/man1/mysql-test-run.pl.1 - - # Don't install mysqlbug to prevent a dependency on gcc. - rm $out/bin/mysqlbug ''; }); From 9265012de647750d64e40c07bcc5ee6ccc56da6d Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 6 Jul 2017 19:02:03 +0200 Subject: [PATCH 039/331] mariadb: fix lib cycle and hash --- pkgs/servers/sql/mariadb/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 269bd2abb25..70786575072 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -18,8 +18,9 @@ common = rec { # attributes common to both builds version = "10.2.6"; src = fetchurl { - url = "https://downloads.mariadb.org/interstitial/mariadb-${version}/source/mariadb-${version}.tar.gz"; + url = "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz/from/http%3A//ftp.hosteurope.de/mirror/archive.mariadb.org/?serve"; sha256 = "1rd2b1b6s87ymr5qhlggr4q4ljazv82ih0msgrbz1rfn81pcg1f3"; + name = "mariadb-${version}.tar.gz"; }; prePatch = '' @@ -69,9 +70,10 @@ common = rec { # attributes common to both builds postInstall = '' rm "$out"/lib/*.a find "''${!outputBin}/bin" -name '*test*' -delete + moveToOutput bin/mariadb_config "$dev" ''; - passthru.mysqlVersion = "5.6"; + passthru.mysqlVersion = "5.7"; meta = with stdenv.lib; { description = "An enhanced, drop-in replacement for MySQL"; From ee1c85aee9ebbfc76c6fed31a868e4082e4bad13 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sun, 9 Jul 2017 17:43:03 +0200 Subject: [PATCH 040/331] mariadb: lib -> connector-c --- .../science/math/glsurf/default.nix | 2 +- pkgs/applications/video/kodi/default.nix | 2 +- .../haskell-modules/configuration-common.nix | 2 +- .../haskell-modules/configuration-nix.nix | 2 +- pkgs/development/interpreters/php/default.nix | 2 +- pkgs/development/libraries/gdal/default.nix | 2 +- pkgs/development/libraries/gdal/gdal-1_11.nix | 2 +- .../libraries/qt-4.x/4.8/default.nix | 2 +- .../ocaml-modules/mysql/default.nix | 11 +++++-- .../perl-modules/DBD-mysql/default.nix | 2 +- pkgs/development/r-modules/default.nix | 6 ++-- .../ruby-modules/gem-config/default.nix | 4 +-- pkgs/servers/http/lighttpd/default.nix | 2 +- pkgs/servers/sql/mariadb/default.nix | 32 ++++++++++++++++++- pkgs/servers/web-apps/frab/Gemfile.lock | 2 +- pkgs/servers/web-apps/frab/gemset.nix | 6 ++-- pkgs/tools/networking/mailutils/default.nix | 2 +- pkgs/top-level/python-packages.nix | 4 +-- 18 files changed, 62 insertions(+), 25 deletions(-) diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index 3e4c8c70286..67dcfd8dc1d 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7"; }; - buildInputs = [ freeglut mesa mysql.lib mpfr gmp + buildInputs = [ freeglut mesa mysql.connector-c mpfr gmp libtiff libjpeg libpng giflib ] ++ (with ocamlPackages; [ ocaml findlib ocaml_mysql lablgl camlimages_4_0 mlgmpidl diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 125a6d492a3..28577a429bd 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -130,7 +130,7 @@ in stdenv.mkDerivation rec { libmpeg2 libsamplerate libmad libogg libvorbis flac libxslt systemd lzo libcdio libmodplug libass libbluray - sqlite mysql.lib avahi lame + sqlite mysql.connector-c avahi lame curl bzip2 zip unzip glxinfo xdpyinfo libcec libcec_platform dcadec libuuid libgcrypt libgpgerror libunistring diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a7ba0dea10d..21168fa3537 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -70,7 +70,7 @@ self: super: { # Use the default version of mysql to build this package (which is actually mariadb). # test phase requires networking - mysql = dontCheck (super.mysql.override { mysql = pkgs.mysql.lib; }); + mysql = dontCheck (super.mysql.override { mysql = pkgs.mysql.connector-c; }); # check requires mysql server mysql-simple = dontCheck super.mysql-simple; diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 50ed1f19637..e4d582595b2 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -53,7 +53,7 @@ self: super: builtins.intersectAttrs super { # Use the default version of mysql to build this package (which is actually mariadb). # test phase requires networking - mysql = dontCheck (super.mysql.override { mysql = pkgs.mysql.lib; }); + mysql = dontCheck (super.mysql.override { mysql = pkgs.mysql.connector-c; }); # CUDA needs help finding the SDK headers and libraries. cuda = overrideCabal super.cuda (drv: { diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index db4eb6eaee0..e397f4af297 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -12,7 +12,7 @@ let { version, sha256 }: let php7 = lib.versionAtLeast version "7.0"; - mysqlHeaders = mysql.lib.dev or mysql; + mysqlHeaders = mysql.connector-c or mysql; mysqlndSupport = config.php.mysqlnd or false; mysqlBuildInputs = lib.optional (!mysqlndSupport) mysqlHeaders; diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 984d3da8119..0f1637a87e9 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { "--with-poppler=${poppler.dev}" # optional "--with-libz=${zlib.dev}" # optional "--with-pg=${postgresql}/bin/pg_config" - "--with-mysql=${mysql.lib.dev}/bin/mysql_config" + "--with-mysql=${mysql.connector-c or mysql}/bin/mysql_config" "--with-geotiff=${libgeotiff}" "--with-sqlite3=${sqlite.dev}" "--with-spatialite=${libspatialite}" diff --git a/pkgs/development/libraries/gdal/gdal-1_11.nix b/pkgs/development/libraries/gdal/gdal-1_11.nix index c9f0c076101..d7906cfdc7d 100644 --- a/pkgs/development/libraries/gdal/gdal-1_11.nix +++ b/pkgs/development/libraries/gdal/gdal-1_11.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { "--with-libz=${zlib.dev}" # optional "--with-pg=${postgresql}/bin/pg_config" - "--with-mysql=${mysql.lib.dev}/bin/mysql_config" + "--with-mysql=${mysql.connector-c}/bin/mysql_config" "--with-geotiff=${libgeotiff}" "--with-python" # optional "--with-static-proj4=${proj}" # optional diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 32691faa689..488306fc1ce 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -160,7 +160,7 @@ stdenv.mkDerivation rec { buildInputs = [ cups # Qt dlopen's libcups instead of linking to it postgresql sqlite libjpeg libmng libtiff icu ] - ++ optionals (mysql != null) [ mysql.lib ] + ++ optionals (mysql != null) [ mysql.connector-c ] ++ optionals gtkStyle [ gtk2 gdk_pixbuf ] ++ optionals stdenv.isDarwin [ cf-private ApplicationServices OpenGL Cocoa AGL libcxx libobjc ]; diff --git a/pkgs/development/ocaml-modules/mysql/default.nix b/pkgs/development/ocaml-modules/mysql/default.nix index 3fa8e9d46b4..5482d7ac87c 100644 --- a/pkgs/development/ocaml-modules/mysql/default.nix +++ b/pkgs/development/ocaml-modules/mysql/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, mysql }: +{ stdenv, fetchurl, fetchpatch, ocaml, findlib, mysql, openssl }: # TODO: la versione stabile da' un errore di compilazione dovuto a # qualche cambiamento negli header .h @@ -26,7 +26,14 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; - propagatedBuildInputs = [ mysql.client ]; + propagatedBuildInputs = [ mysql.connector-c ]; + + patches = [ + (fetchpatch { + url = "https://github.com/ygrek/ocaml-mysql/compare/v1.2.1...d6d1b3b262ae2cf493ef56f1dd7afcf663a70a26.patch"; + sha256 = "0018s2wcrvbsw9yaqmwq500qmikwffrgdp5xg9b8v7ixhd4gi6hn"; + }) + ]; meta = { homepage = http://ocaml-mysql.forge.ocamlcore.org; diff --git a/pkgs/development/perl-modules/DBD-mysql/default.nix b/pkgs/development/perl-modules/DBD-mysql/default.nix index 7302516d542..12ddcf166e2 100644 --- a/pkgs/development/perl-modules/DBD-mysql/default.nix +++ b/pkgs/development/perl-modules/DBD-mysql/default.nix @@ -8,7 +8,7 @@ buildPerlPackage rec { sha256 = "0h4h6zwzj8fwh9ljb8svnsa0a3ch4p10hp59kpdibdb4qh8xwxs7"; }; - buildInputs = [ mysql.lib ] ; + buildInputs = [ mysql.connector-c ] ; propagatedBuildInputs = [ DBI ]; doCheck = false; diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 76c0e522777..a435ee65e52 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -320,7 +320,7 @@ let rmatio = [ pkgs.zlib.dev ]; Rmpfr = [ pkgs.gmp pkgs.mpfr.dev ]; Rmpi = [ pkgs.openmpi ]; - RMySQL = [ pkgs.zlib pkgs.mysql.lib pkgs.mariadb pkgs.openssl.dev ]; + RMySQL = [ pkgs.zlib pkgs.mysql.connector-c pkgs.openssl.dev ]; RNetCDF = [ pkgs.netcdf pkgs.udunits ]; RODBCext = [ pkgs.libiodbc ]; RODBC = [ pkgs.libiodbc ]; @@ -798,10 +798,10 @@ let }); RMySQL = old.RMySQL.overrideDerivation (attrs: { - MYSQL_DIR="${pkgs.mysql.lib}"; + MYSQL_DIR="${pkgs.mysql.connector-c}"; preConfigure = '' patchShebangs configure - ''; + ''; }); devEMF = old.devEMF.overrideDerivation (attrs: { diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 05415b88968..bbb7b4400a7 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -167,11 +167,11 @@ in }; mysql = attrs: { - buildInputs = [ mysql.lib zlib openssl ]; + buildInputs = [ mysql.connector-c zlib openssl ]; }; mysql2 = attrs: { - buildInputs = [ mysql.lib zlib openssl ]; + buildInputs = [ mysql.connector-c zlib openssl ]; }; ncursesw = attrs: { diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 05722f141ed..181e3bf134f 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ pcre libxml2 zlib attr bzip2 which file openssl ] ++ stdenv.lib.optional enableMagnet lua5_1 - ++ stdenv.lib.optional enableMysql mysql.lib + ++ stdenv.lib.optional enableMysql mysql.connector-c ++ stdenv.lib.optional enableLdap openldap; configureFlags = [ "--with-openssl" ] diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 70786575072..3b48a666132 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -11,7 +11,7 @@ let # in mariadb # spans the whole file mariadb = everything // { inherit client; # libmysqlclient.so in .out, necessary headers in .dev and utils in .bin server = everything; # a full single-output build, including everything in `client` again - lib = client; # compat. with the old mariadb split + inherit connector-c; # libmysqlclient.so }; common = rec { # attributes common to both builds @@ -159,4 +159,34 @@ everything = stdenv.mkDerivation (common // { ''; }); +connector-c = stdenv.mkDerivation rec { + name = "mariadb-connector-c-${version}"; + version = "2.3.3"; + + src = fetchurl { + url = "https://downloads.mariadb.org/interstitial/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz/from/http%3A//ftp.hosteurope.de/mirror/archive.mariadb.org/?serve"; + sha256 = "12a0j4r01vrdpvl53zq433fb74gd4mm4v5jqmnf4nrg76h0p39c2"; + name = "mariadb-connector-c-${version}-src.tar.gz"; + }; + + # outputs = [ "dev" "out" ]; FIXME: cmake variables don't allow that < 3.0 + cmakeFlags = [ "-DWITH_EXTERNAL_ZLIB=ON" ]; + + nativeBuildInputs = [ cmake ]; + propagatedBuildInputs = [ openssl zlib ]; + + enableParallelBuilding = true; + + postFixup = '' + ln -sv mariadb_config $out/bin/mysql_config + ''; + + meta = with stdenv.lib; { + description = "Client library that can be used to connect to MySQL or MariaDB"; + license = licenses.lgpl21; + maintainers = with maintainers; [ globin ]; + platforms = platforms.all; + }; +}; + in mariadb diff --git a/pkgs/servers/web-apps/frab/Gemfile.lock b/pkgs/servers/web-apps/frab/Gemfile.lock index 530c54ebd89..06502ef59ad 100644 --- a/pkgs/servers/web-apps/frab/Gemfile.lock +++ b/pkgs/servers/web-apps/frab/Gemfile.lock @@ -180,7 +180,7 @@ GEM pry (~> 0.10) pry-rails (0.3.4) pry (>= 0.9.10) - puma (3.6.0) + puma (3.9.1) rack (1.6.4) rack-test (0.6.3) rack (>= 1.0) diff --git a/pkgs/servers/web-apps/frab/gemset.nix b/pkgs/servers/web-apps/frab/gemset.nix index 9f881579f42..449fbf1a5b6 100644 --- a/pkgs/servers/web-apps/frab/gemset.nix +++ b/pkgs/servers/web-apps/frab/gemset.nix @@ -628,10 +628,10 @@ puma = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1rmcny3jr1jj01f9fqijwmikj212a5iql7ghifklm77x4a8pp399"; + sha256 = "1k13n500r7v480rcbxm7k09hip0zi7p8zvy3vajj8g9hb7gdcwnp"; type = "gem"; }; - version = "3.6.0"; + version = "3.9.1"; }; rack = { source = { @@ -929,4 +929,4 @@ }; version = "0.9.5"; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index aee5302405a..97619275ba2 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional doCheck dejagnu; buildInputs = [ gdbm pam readline ncurses gnutls guile texinfo gnum4 sasl fribidi nettools - gss mysql.lib + gss mysql.connector-c ]; patches = [ diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f425005c2fe..f5dfcffaa26 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11534,9 +11534,9 @@ in { sha256 = "0x0c2jg0bb3pp84njaqiic050qkyd7ymwhfvhipnimg58yv40441"; }; - buildInputs = with self; [ nose pkgs.openssl ]; + buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [ pkgs.mysql.lib pkgs.zlib ]; + propagatedBuildInputs = with self; [ pkgs.mysql.connector-c ]; meta = { description = "MySQL database binding for Python"; From 77af1d2000dc4c169f10823d5991f658170cd8fd Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 22 Jul 2017 18:54:41 +0200 Subject: [PATCH 041/331] mysql.server: fix build That moveToOutput should've been only for the client --- pkgs/servers/sql/mariadb/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 3b48a666132..a73c870f539 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -70,7 +70,6 @@ common = rec { # attributes common to both builds postInstall = '' rm "$out"/lib/*.a find "''${!outputBin}/bin" -name '*test*' -delete - moveToOutput bin/mariadb_config "$dev" ''; passthru.mysqlVersion = "5.7"; @@ -107,6 +106,7 @@ client = stdenv.mkDerivation (common // { # prevent cycle; it needs to reference $dev postInstall = common.postInstall + '' moveToOutput bin/mysql_config "$dev" + moveToOutput bin/mariadb_config "$dev" ''; enableParallelBuilding = true; # the client should be OK From 5672ca2d0be758cc39867d729b3c4a2b25ea67a8 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 29 Jul 2017 23:34:16 +0200 Subject: [PATCH 042/331] mariadb: 10.2.6 -> 10.2.7 --- pkgs/servers/sql/mariadb/default.nix | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index a73c870f539..1eaf6c4e32e 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -15,26 +15,33 @@ mariadb = everything // { }; common = rec { # attributes common to both builds - version = "10.2.6"; + version = "10.2.7"; src = fetchurl { url = "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz/from/http%3A//ftp.hosteurope.de/mirror/archive.mariadb.org/?serve"; - sha256 = "1rd2b1b6s87ymr5qhlggr4q4ljazv82ih0msgrbz1rfn81pcg1f3"; + sha256 = "1g60fskf8w633icjjjj08a7h4ha6vaczyczlm4was9c3qjxs2nr2"; name = "mariadb-${version}.tar.gz"; }; + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ + ncurses openssl zlib pcre jemalloc + ] ++ stdenv.lib.optionals stdenv.isLinux [ libaio systemd ] + ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ]; + + patches = [ + (fetchpatch { + url = "https://github.com/MariaDB/server/commit/7fc75c420a47fd29a399468b920641ebb43fa75c.patch"; + sha256 = "0rgppcycw4gjkayz8fn4412dkplghpfzs3bq8ib1jqb9xzi3zvww"; + }) + ]; + prePatch = '' substituteInPlace cmake/libutils.cmake \ --replace /usr/bin/libtool libtool sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt ''; - nativeBuildInputs = [ cmake pkgconfig ]; - - buildInputs = [ - ncurses openssl zlib pcre jemalloc - ] ++ stdenv.lib.optionals stdenv.isLinux [ libaio systemd ] - ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ]; cmakeFlags = [ "-DBUILD_CONFIG=mysql_release" From 52e65be0d6cabc8ebcc853d68bb5b7b1055155d9 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sun, 30 Jul 2017 22:08:19 +0200 Subject: [PATCH 043/331] mariadb: fix i686 build --- pkgs/servers/sql/mariadb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 1eaf6c4e32e..a1fa2ef3079 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -128,9 +128,7 @@ everything = stdenv.mkDerivation (common // { buildInputs = common.buildInputs ++ [ xz lzo lz4 bzip2 snappy libxml2 boost judy libevent cracklib - ] - ++ optionals (stdenv.isLinux && !stdenv.isArm) [ numactl ] - ; + ] ++ optionals (stdenv.isLinux && !stdenv.isArm) [ numactl ]; cmakeFlags = common.cmakeFlags ++ [ "-DMYSQL_DATADIR=/var/lib/mysql" @@ -164,6 +162,8 @@ everything = stdenv.mkDerivation (common // { rm -r "$out"/{mysql-test,sql-bench,data} # Don't need testing data rm "$out"/share/man/man1/mysql-test-run.pl.1 ''; + + CXXFLAGS = optionalString stdenv.isi686 "-fpermissive"; }); connector-c = stdenv.mkDerivation rec { From 3e241efe9bce5201acd26e3fbc5ade59199567b5 Mon Sep 17 00:00:00 2001 From: Markus Mueller Date: Thu, 24 Aug 2017 01:55:32 +0000 Subject: [PATCH 044/331] mariadb: fix socket path This also fixes mysql connections to localhost in php because it gets the socket path from mysql_config. --- pkgs/servers/sql/mariadb/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index a1fa2ef3079..b8646376358 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -177,7 +177,10 @@ connector-c = stdenv.mkDerivation rec { }; # outputs = [ "dev" "out" ]; FIXME: cmake variables don't allow that < 3.0 - cmakeFlags = [ "-DWITH_EXTERNAL_ZLIB=ON" ]; + cmakeFlags = [ + "-DWITH_EXTERNAL_ZLIB=ON" + "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" + ]; nativeBuildInputs = [ cmake ]; propagatedBuildInputs = [ openssl zlib ]; From 3fcf6bf518d3594acad9e8e364acbcf8bddde6ea Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 28 Aug 2017 22:01:50 +0200 Subject: [PATCH 045/331] mariadb: 10.2.7 -> 10.2.8 --- pkgs/servers/sql/mariadb/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index b8646376358..5ddbeea913a 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -15,11 +15,11 @@ mariadb = everything // { }; common = rec { # attributes common to both builds - version = "10.2.7"; + version = "10.2.8"; src = fetchurl { url = "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz/from/http%3A//ftp.hosteurope.de/mirror/archive.mariadb.org/?serve"; - sha256 = "1g60fskf8w633icjjjj08a7h4ha6vaczyczlm4was9c3qjxs2nr2"; + sha256 = "14r397rbk00647nkmbjzfcgicamgnyyqyi5ca9py51ghg7z51lld"; name = "mariadb-${version}.tar.gz"; }; @@ -29,20 +29,12 @@ common = rec { # attributes common to both builds ] ++ stdenv.lib.optionals stdenv.isLinux [ libaio systemd ] ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ]; - patches = [ - (fetchpatch { - url = "https://github.com/MariaDB/server/commit/7fc75c420a47fd29a399468b920641ebb43fa75c.patch"; - sha256 = "0rgppcycw4gjkayz8fn4412dkplghpfzs3bq8ib1jqb9xzi3zvww"; - }) - ]; - prePatch = '' substituteInPlace cmake/libutils.cmake \ --replace /usr/bin/libtool libtool sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt ''; - cmakeFlags = [ "-DBUILD_CONFIG=mysql_release" "-DMANUFACTURER=NixOS.org" From 9359050ae2e80d93d98688d1315c36cf7be3ab9d Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sun, 9 Jul 2017 23:44:30 +0200 Subject: [PATCH 046/331] mariadb: more lib -> connector-c --- pkgs/development/libraries/qt-5/modules/qtbase.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 172b20bc51b..5f65f71bbba 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation { ) ++ lib.optional developerBuild gdb ++ lib.optional (cups != null) cups - ++ lib.optional (mysql != null) mysql.lib + ++ lib.optional (mysql != null) mysql.connector-c ++ lib.optional (postgresql != null) postgresql; nativeBuildInputs = From d9d98cd324a23b4b2bf35a18527732ae50abe527 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 26 Jul 2017 17:53:42 +0200 Subject: [PATCH 047/331] treewide: fix up some mysql.connector-c fallout --- pkgs/development/libraries/poco/default.nix | 2 +- pkgs/development/libraries/wt/default.nix | 2 +- pkgs/tools/backup/bareos/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix index 0f971cff64d..0788e3bc404 100644 --- a/pkgs/development/libraries/poco/default.nix +++ b/pkgs/development/libraries/poco/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib pcre expat sqlite openssl unixODBC libmysql ]; cmakeFlags = [ - "-DMYSQL_INCLUDE_DIR=${libmysql.dev}/include/mysql" + "-DMYSQL_INCLUDE_DIR=${libmysql}/include/mysql" "-DPOCO_UNBUNDLED=ON" ]; diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix index 3adf4f1497f..573b02d7c58 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { "-DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick" "-DWT_CPP_11_MODE=-std=c++11" "-DGM_PREFIX=${graphicsmagick}" - "-DMYSQL_PREFIX=${libmysql.dev}" + "-DMYSQL_PREFIX=${libmysql}" "--no-warn-unused-cli" ]; diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix index c3256713832..7fa28c5f79b 100644 --- a/pkgs/tools/backup/bareos/default.nix +++ b/pkgs/tools/backup/bareos/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ++ optional (openssl != null) "--with-openssl=${openssl.dev}" ++ optional (sqlite != null) "--with-sqlite3=${sqlite.dev}" ++ optional (postgresql != null) "--with-postgresql=${postgresql}" - ++ optional (libmysql != null) "--with-mysql=${libmysql.dev}" + ++ optional (libmysql != null) "--with-mysql=${libmysql}" ++ optional (zlib != null) "--with-zlib=${zlib.dev}" ++ optional (lzo != null) "--with-lzo=${lzo}" ++ optional (jansson != null) "--with-jansson=${jansson}" From a960f1931b1fe77d35b436105ecefd295aa1e29d Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 14 Jul 2017 15:03:47 +0200 Subject: [PATCH 048/331] mariadb: more lib -> connector-c --- pkgs/servers/computing/slurm/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 3b695c46e77..59d62790113 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig libtool ]; buildInputs = [ - curl python munge perl pam openssl mysql.lib ncurses gtk2 lua hwloc numactl + curl python munge perl pam openssl mysql.connector-c ncurses gtk2 lua hwloc numactl ]; configureFlags = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a7ef70f1b3..56695574a9f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1508,7 +1508,7 @@ with pkgs; convertlit = callPackage ../tools/text/convertlit { }; collectd = callPackage ../tools/system/collectd { - libmysql = mysql.lib; + libmysql = mysql.connector-c; libsigrok = libsigrok-0-3-0; # not compatible with >= 0.4.0 yet }; From 3881816a644ee1e59a1d684c1e2dbacfe190e1e9 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 22 Jul 2017 18:51:00 +0200 Subject: [PATCH 049/331] libmysql: now needs to point to mysql.connector-c libmysqlclient is no longer included in mariadb itself --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 56695574a9f..717471b815f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11993,7 +11993,7 @@ with pkgs; }; mysql = mariadb; - libmysql = mysql.client; # `libmysql` is a slight misnomer ATM + libmysql = mysql.connector-c; # `libmysql` is a slight misnomer ATM mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { }; From 64178f1cab97e254017f75090e1ea412848c087b Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 9 Oct 2017 10:04:51 +0200 Subject: [PATCH 050/331] mailutils: fix build with mariadb 10.2 --- pkgs/tools/networking/mailutils/default.nix | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index 97619275ba2..4684c210c6e 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -1,11 +1,10 @@ -{ stdenv, fetchurl, fetchpatch, autoreconfHook, dejagnu, gettext, libtool, pkgconfig +{ stdenv, fetchurl, fetchpatch, autoreconfHook, dejagnu, gettext, pkgconfig , gdbm, pam, readline, ncurses, gnutls, guile, texinfo, gnum4, sasl, fribidi, nettools -, gss, mysql }: +, python, gss, mysql }: let p = "https://raw.githubusercontent.com/gentoo/gentoo/9c921e89d51876fd876f250324893fd90c019326/net-mail/mailutils/files"; -in -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { name = "${project}-${version}"; project = "mailutils"; version = "3.2"; @@ -16,11 +15,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - autoreconfHook gettext libtool pkgconfig + autoreconfHook gettext pkgconfig ] ++ stdenv.lib.optional doCheck dejagnu; buildInputs = [ gdbm pam readline ncurses gnutls guile texinfo gnum4 sasl fribidi nettools - gss mysql.connector-c + gss mysql.connector-c python ]; patches = [ @@ -52,14 +51,20 @@ stdenv.mkDerivation rec { ]; postPatch = '' - sed -e '/AM_GNU_GETTEXT_VERSION/s/0.18/0.19/' -i configure.ac sed -i -e '/chown root:mail/d' \ -e 's/chmod [24]755/chmod 0755/' \ */Makefile{.in,.am} + sed -i 's:/usr/lib/mysql:${mysql.connector-c}/lib/mariadb:' configure.ac + sed -i 's/0\.18/0.19/' configure.ac + sed -i -e 's:mysql/mysql.h:mysql.h:' \ + -e 's:mysql/errmsg.h:errmsg.h:' \ + sql/mysql.c ''; + NIX_CFLAGS_COMPILE = "-L${mysql.connector-c}/lib/mariadb -I${mysql.connector-c}/include/mariadb"; + preCheck = '' - # Add missing files. + # Add missing test files cp ${builtins.toString readmsg-tests} readmsg/tests/ for f in hdr.at nohdr.at twomsg.at weed.at; do mv readmsg/tests/*-$f readmsg/tests/$f From c707fa002d67f556d4ae07d7c5969ab141a6e082 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 9 Oct 2017 14:37:32 +0200 Subject: [PATCH 051/331] mariadb: 10.2.8 -> 10.2.9 --- pkgs/servers/sql/mariadb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 5ddbeea913a..d4e6ef9650f 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -15,11 +15,11 @@ mariadb = everything // { }; common = rec { # attributes common to both builds - version = "10.2.8"; + version = "10.2.9"; src = fetchurl { url = "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz/from/http%3A//ftp.hosteurope.de/mirror/archive.mariadb.org/?serve"; - sha256 = "14r397rbk00647nkmbjzfcgicamgnyyqyi5ca9py51ghg7z51lld"; + sha256 = "093115vdaj302730h3y72vx5fi02vxjzwh7ry1yff7jra8fa1q0j"; name = "mariadb-${version}.tar.gz"; }; From d35773463716bb3a3296da845605b1ace11a2034 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 1 Nov 2017 23:07:33 +0100 Subject: [PATCH 052/331] urweb: fix build --- pkgs/development/compilers/urweb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index 74ca5dc4c4b..f2b6016ceb7 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "17qh9mcmlhbv6r52yij8l9ik7j7x6x7c09lf6pznnbdh4sf8p5wb"; }; - buildInputs = [ openssl mlton mysql.client postgresql sqlite ]; + buildInputs = [ openssl mlton mysql.connector-c postgresql sqlite ]; prePatch = '' sed -e 's@/usr/bin/file@${file}/bin/file@g' -i configure @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { preConfigure = '' export PGHEADER="${postgresql}/include/libpq-fe.h"; - export MSHEADER="${lib.getDev mysql.client}/include/mysql/mysql.h"; + export MSHEADER="${mysql.connector-c}/include/mysql/mysql.h"; export SQHEADER="${sqlite.dev}/include/sqlite3.h"; export CC="${gcc}/bin/gcc"; export CCARGS="-I$out/include \ -L${openssl.out}/lib \ - -L${lib.getLib mysql.client}/lib \ + -L${mysql.connector-c}/lib \ -L${postgresql.lib}/lib \ -L${sqlite.out}/lib"; ''; From b96bf4a89164548340fae5cae9ce60d281cda4ce Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 21 Dec 2017 11:32:59 +0300 Subject: [PATCH 053/331] mariadb: 10.2.9 -> 10.2.11 --- pkgs/servers/sql/mariadb/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index d4e6ef9650f..c5e8e0a198a 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -15,15 +15,16 @@ mariadb = everything // { }; common = rec { # attributes common to both builds - version = "10.2.9"; + version = "10.2.11"; src = fetchurl { url = "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz/from/http%3A//ftp.hosteurope.de/mirror/archive.mariadb.org/?serve"; - sha256 = "093115vdaj302730h3y72vx5fi02vxjzwh7ry1yff7jra8fa1q0j"; + sha256 = "1s53ravbrxcc8ixvkm56rwgs3cfifzngc56pidd1f1dr1n0mlmb3"; name = "mariadb-${version}.tar.gz"; }; nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ ncurses openssl zlib pcre jemalloc ] ++ stdenv.lib.optionals stdenv.isLinux [ libaio systemd ] @@ -47,7 +48,7 @@ common = rec { # attributes common to both builds "-DWITH_ZLIB=system" "-DWITH_SSL=system" - "-DWITH_PCRE=system" + "-DWITH_PCRE=bundled" # On Darwin without sandbox, CMake will find the system java and attempt to build with java support, but # then it will fail during the actual build. Let's just disable the flag explicitly until someone decides @@ -104,8 +105,10 @@ client = stdenv.mkDerivation (common // { # prevent cycle; it needs to reference $dev postInstall = common.postInstall + '' - moveToOutput bin/mysql_config "$dev" moveToOutput bin/mariadb_config "$dev" + mv $bin/bin/mysql_config $dev/bin + mv $out/nix/store/*/include/mysql/*.h $dev/include/mysql + rm -r $out/nix ''; enableParallelBuilding = true; # the client should be OK @@ -153,6 +156,7 @@ everything = stdenv.mkDerivation (common // { postInstall = common.postInstall + '' rm -r "$out"/{mysql-test,sql-bench,data} # Don't need testing data rm "$out"/share/man/man1/mysql-test-run.pl.1 + rm "$out"/bin/rcmysql ''; CXXFLAGS = optionalString stdenv.isi686 "-fpermissive"; From 462076c909f10efd460595f2090a7cf76d595b74 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sun, 24 Dec 2017 17:35:53 +0100 Subject: [PATCH 054/331] pcre: add patch fixing stack frame size detection --- pkgs/development/libraries/pcre/default.nix | 3 +++ .../libraries/pcre/stacksize-detection.patch | 16 ++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/development/libraries/pcre/stacksize-detection.patch diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index e6055151301..b34c9ff31f2 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -33,6 +33,9 @@ in stdenv.mkDerivation rec { buildInputs = optional (hostPlatform.libc == "msvcrt") windows.mingw_w64_pthreads; + # https://bugs.exim.org/show_bug.cgi?id=2173 + patches = [ ./stacksize-detection.patch ]; + doCheck = !(with hostPlatform; isCygwin || isFreeBSD) && hostPlatform == buildPlatform; # XXX: test failure on Cygwin # we are running out of stack on both freeBSDs on Hydra diff --git a/pkgs/development/libraries/pcre/stacksize-detection.patch b/pkgs/development/libraries/pcre/stacksize-detection.patch new file mode 100644 index 00000000000..4bc97069b1e --- /dev/null +++ b/pkgs/development/libraries/pcre/stacksize-detection.patch @@ -0,0 +1,16 @@ +diff --git a/pcre_exec.c b/pcre_exec.c +--- a/pcre_exec.c ++++ b/pcre_exec.c +@@ -509,6 +509,12 @@ + (e.g. stopped by repeated call or recursion limit) + */ + ++#ifdef __GNUC__ ++static int ++match(REGISTER PCRE_PUCHAR eptr, REGISTER const pcre_uchar *ecode, ++ PCRE_PUCHAR mstart, int offset_top, match_data *md, eptrblock *eptrb, ++ unsigned int rdepth) __attribute__((noinline,noclone)); ++#endif + static int + match(REGISTER PCRE_PUCHAR eptr, REGISTER const pcre_uchar *ecode, + PCRE_PUCHAR mstart, int offset_top, match_data *md, eptrblock *eptrb, From 1ca8a7aff6b62181a9592fcd6cb6f008041c5f1d Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 25 Dec 2017 14:00:03 +0100 Subject: [PATCH 055/331] mariadb: cleanup obsolete code and fix upstream cmake --- pkgs/servers/sql/mariadb/cmake-includedir.patch | 11 +++++++++++ pkgs/servers/sql/mariadb/default.nix | 11 ++++------- 2 files changed, 15 insertions(+), 7 deletions(-) create mode 100644 pkgs/servers/sql/mariadb/cmake-includedir.patch diff --git a/pkgs/servers/sql/mariadb/cmake-includedir.patch b/pkgs/servers/sql/mariadb/cmake-includedir.patch new file mode 100644 index 00000000000..0c4fe7d321e --- /dev/null +++ b/pkgs/servers/sql/mariadb/cmake-includedir.patch @@ -0,0 +1,11 @@ +--- a/include/CMakeLists.txt 2017-12-25 05:59:07.204144374 +0100 ++++ b/include/CMakeLists.txt 2017-12-25 05:59:26.339552817 +0100 +@@ -94,7 +94,7 @@ + ENDIF() + + MACRO(INSTALL_COMPAT_HEADER file footer) +- INSTALL(CODE "FILE(WRITE \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${INSTALL_INCLUDEDIR}/${file} ++ INSTALL(CODE "FILE(WRITE ${INSTALL_INCLUDEDIR}/${file} + \"/* Do not edit this file directly, it was auto-generated by cmake */ + + #warning This file should not be included by clients, include only diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index c5e8e0a198a..b538fa7515a 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -31,11 +31,11 @@ common = rec { # attributes common to both builds ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ]; prePatch = '' - substituteInPlace cmake/libutils.cmake \ - --replace /usr/bin/libtool libtool sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt ''; + patches = [ ./cmake-includedir.patch ]; + cmakeFlags = [ "-DBUILD_CONFIG=mysql_release" "-DMANUFACTURER=NixOS.org" @@ -48,7 +48,7 @@ common = rec { # attributes common to both builds "-DWITH_ZLIB=system" "-DWITH_SSL=system" - "-DWITH_PCRE=bundled" + "-DWITH_PCRE=system" # On Darwin without sandbox, CMake will find the system java and attempt to build with java support, but # then it will fail during the actual build. Let's just disable the flag explicitly until someone decides @@ -105,10 +105,8 @@ client = stdenv.mkDerivation (common // { # prevent cycle; it needs to reference $dev postInstall = common.postInstall + '' + moveToOutput bin/mysql_config "$dev" moveToOutput bin/mariadb_config "$dev" - mv $bin/bin/mysql_config $dev/bin - mv $out/nix/store/*/include/mysql/*.h $dev/include/mysql - rm -r $out/nix ''; enableParallelBuilding = true; # the client should be OK @@ -156,7 +154,6 @@ everything = stdenv.mkDerivation (common // { postInstall = common.postInstall + '' rm -r "$out"/{mysql-test,sql-bench,data} # Don't need testing data rm "$out"/share/man/man1/mysql-test-run.pl.1 - rm "$out"/bin/rcmysql ''; CXXFLAGS = optionalString stdenv.isi686 "-fpermissive"; From b69befbfd54160bbe29f3204ad5e7855536feb77 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 25 Dec 2017 15:21:31 +0100 Subject: [PATCH 056/331] mariadb: replace to connector-c --- pkgs/development/libraries/libagar/default.nix | 5 +++-- pkgs/development/libraries/tntdb/default.nix | 2 +- pkgs/tools/networking/kea/default.nix | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libagar/default.nix b/pkgs/development/libraries/libagar/default.nix index 1c9e8eca0d5..ee984a53b4c 100644 --- a/pkgs/development/libraries/libagar/default.nix +++ b/pkgs/development/libraries/libagar/default.nix @@ -20,15 +20,16 @@ stdenv.mkDerivation rec { "--with-gettext=${gettext}" "--with-jpeg=${libjpeg.dev}" "--with-gl=${mesa}" - "--with-mysql=yes" + "--with-mysql=${mysql.connector-c}" "--with-manpages=yes" ]; outputs = [ "out" "devdoc" ]; nativeBuildInputs = [ pkgconfig libtool gettext ]; + buildInputs = [ - bsdbuild perl xlibsWrapper libXinerama SDL mesa mysql.client mandoc + bsdbuild perl xlibsWrapper libXinerama SDL mesa mysql.connector-c mandoc freetype.dev libpng libjpeg.dev fontconfig portaudio libsndfile ]; diff --git a/pkgs/development/libraries/tntdb/default.nix b/pkgs/development/libraries/tntdb/default.nix index d11a5c344c9..75a494cfbde 100644 --- a/pkgs/development/libraries/tntdb/default.nix +++ b/pkgs/development/libraries/tntdb/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0js79dbvkic30bzw1pf26m64vs2ssw2sbj55w1dc0sy69dlv4fh9"; }; - buildInputs = [ cxxtools postgresql mysql sqlite zlib openssl ]; + buildInputs = [ cxxtools postgresql mysql.connector-c sqlite zlib openssl ]; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index 68fb72ff7d9..f33fe7a7105 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -21,12 +21,12 @@ stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var" "--with-dhcp-pgsql=${postgresql}/bin/pg_config" - "--with-dhcp-mysql=${mysql.client.dev}/bin/mysql_config" + "--with-dhcp-mysql=${mysql.connector-c}/bin/mysql_config" ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ - openssl log4cplus boost python3 mysql.client + openssl log4cplus boost python3 mysql.connector-c botan2 gmp bzip2 ]; From 4fb9533511067edb738e3350b6902d99c96176c0 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 25 Dec 2017 15:59:05 +0100 Subject: [PATCH 057/331] mariadb: add lib/include path compatibility to mysql --- pkgs/servers/sql/mariadb/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index b538fa7515a..08594376c14 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -182,6 +182,8 @@ connector-c = stdenv.mkDerivation rec { postFixup = '' ln -sv mariadb_config $out/bin/mysql_config + ln -sv mariadb $out/lib/mysql + ln -sv mariadb $out/include/mysql ''; meta = with stdenv.lib; { From d75ae56f3fb72ec756b0da5c47b16e833a4905d7 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 25 Dec 2017 16:57:13 +0100 Subject: [PATCH 058/331] mariadb: replace to connector-c --- pkgs/development/libraries/opendbx/default.nix | 6 +++--- pkgs/development/libraries/qt-3/default.nix | 2 +- .../development/lisp-modules/quicklisp-to-nix-overrides.nix | 4 ++-- pkgs/servers/games/ghost-one/default.nix | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/opendbx/default.nix b/pkgs/development/libraries/opendbx/default.nix index 37afa3fd507..6a027dc9bd4 100644 --- a/pkgs/development/libraries/opendbx/default.nix +++ b/pkgs/development/libraries/opendbx/default.nix @@ -12,10 +12,10 @@ stdenv.mkDerivation rec { }; preConfigure = '' - export CPPFLAGS="-I${getDev mysql.client}/include/mysql" - export LDFLAGS="-L${getLib mysql.client}/lib/mysql -L${getLib postgresql}/lib" + export CPPFLAGS="-I${mysql.connector-c}/include/mariadb" + export LDFLAGS="-L${mysql.connector-c}/lib/mariadb -L${postgresql}/lib" configureFlagsArray=(--with-backends="mysql pgsql sqlite3") ''; - buildInputs = [ readline mysql.client postgresql sqlite ]; + buildInputs = [ readline mysql.connector-c postgresql sqlite ]; } diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index 6d92de001cb..92cdc1f918a 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation { -I${randrproto}/include" else "-no-xrandr"} ${if xineramaSupport then "-xinerama -L${libXinerama.out}/lib -I${libXinerama.dev}/include" else "-no-xinerama"} ${if cursorSupport then "-L${libXcursor.out}/lib -I${libXcursor.dev}/include" else ""} - ${if mysqlSupport then "-qt-sql-mysql -L${stdenv.lib.getLib mysql.client}/lib/mysql -I${mysql.client}/include/mysql" else ""} + ${if mysqlSupport then "-qt-sql-mysql -L${mysql.connector-c}/lib/mariadb -I${mysql.connector-c}/include/mariadb" else ""} ${if xftSupport then "-xft -L${libXft.out}/lib -I${libXft.dev}/include -L${libXft.freetype.out}/lib -I${libXft.freetype.dev}/include diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index fae5818171b..6ca3a608934 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -56,8 +56,8 @@ in propagatedBuildInputs = with pkgs; [mysql postgresql sqlite zlib]; overrides = y: (x.overrides y) // { preConfigure = ((x.overrides y).preConfigure or "") + '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.lib.getDev pkgs.mysql.client}/include/mysql" - export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.lib.getLib pkgs.mysql.client}/lib/mysql" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.mysql.connector-c}/include/mariadb" + export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.mysql.connector-c}/lib/mariadb" ''; }; }; diff --git a/pkgs/servers/games/ghost-one/default.nix b/pkgs/servers/games/ghost-one/default.nix index 63a71633923..ec56f526200 100644 --- a/pkgs/servers/games/ghost-one/default.nix +++ b/pkgs/servers/games/ghost-one/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { sha256 = "1sm2ca3lcdr4vjg7v94d8zhqz8cdp44rg8yinzzwkgsr0hj74fv2"; }; - buildInputs = [ unzip gmp zlib bzip2 boost mysql.client ]; + buildInputs = [ unzip gmp zlib bzip2 boost mysql.connector-c ]; patchPhase = '' substituteInPlace ghost/Makefile --replace "/usr/local/lib/mysql" \ - "${stdenv.lib.getLib mysql.client}/lib/mysql" + "${mysql.connector-c}/lib/mariadb" ''; buildPhase = '' From 9213a2cf664443a8d86b5315be4dc1d77f643a57 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 25 Dec 2017 17:11:58 +0100 Subject: [PATCH 059/331] poco: libmysql -> connector-c --- pkgs/development/libraries/poco/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix index 0788e3bc404..40755913737 100644 --- a/pkgs/development/libraries/poco/default.nix +++ b/pkgs/development/libraries/poco/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, zlib, pcre, expat, sqlite, openssl, unixODBC, libmysql }: +{ stdenv, fetchurl, cmake, pkgconfig, zlib, pcre, expat, sqlite, openssl, unixODBC, mysql }: stdenv.mkDerivation rec { name = "poco-${version}"; @@ -12,10 +12,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ zlib pcre expat sqlite openssl unixODBC libmysql ]; + buildInputs = [ zlib pcre expat sqlite openssl unixODBC mysql.connector-c ]; cmakeFlags = [ - "-DMYSQL_INCLUDE_DIR=${libmysql}/include/mysql" "-DPOCO_UNBUNDLED=ON" ]; From 4ef619daddd9e0442d1a64d92d29185d8815a6a5 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Fri, 22 Dec 2017 19:12:05 +0300 Subject: [PATCH 060/331] mariadb: replace to connector-c --- pkgs/development/libraries/unixODBCDrivers/default.nix | 4 ++-- pkgs/development/pure-modules/glpk/default.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index 233fdd90254..a0c7e662efa 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -37,10 +37,10 @@ }; nativeBuildInputs = [ cmake ]; - buildInputs = [ unixODBC mariadb.lib ]; + buildInputs = [ unixODBC mariadb.connector-c ]; cmakeFlags = [ - "-DMARIADB_INCLUDE_DIR=${mariadb.lib}/include/mysql" + "-DMARIADB_INCLUDE_DIR=${mariadb.connector-c}/include/mariadb" ]; preConfigure = '' diff --git a/pkgs/development/pure-modules/glpk/default.nix b/pkgs/development/pure-modules/glpk/default.nix index 4927ac445f4..df113b9cc4a 100644 --- a/pkgs/development/pure-modules/glpk/default.nix +++ b/pkgs/development/pure-modules/glpk/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, - pkgconfig, pure, glpk, gmp, libtool, libmysql, libiodbc, zlib }: + pkgconfig, pure, glpk, gmp, libtool, mysql, libiodbc, zlib }: stdenv.mkDerivation rec { baseName = "glpk"; @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { }; glpkWithExtras = lib.overrideDerivation glpk (attrs: { - propagatedBuildInputs = [ gmp libtool libmysql libiodbc ]; + propagatedBuildInputs = [ gmp libtool mysql.connector-c libiodbc ]; CPPFLAGS = "-I${gmp.dev}/include"; preConfigure = '' substituteInPlace configure \ - --replace /usr/include/mysql ${lib.getDev libmysql}/include/mysql + --replace /usr/include/mysql ${mysql.connector-c}/include/mariadb ''; configureFlags = [ "--enable-dl" "--enable-odbc" From c9db834ee796bcf443524e805c19a4bddb787277 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 25 Dec 2017 17:17:55 +0100 Subject: [PATCH 061/331] mysql57: add dummy connector-c passthru for mariadb compat --- pkgs/servers/sql/mysql/5.7.x.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix index 687993e0dc5..0098353808f 100644 --- a/pkgs/servers/sql/mysql/5.7.x.nix +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -3,7 +3,8 @@ # Note: zlib is not required; MySQL can use an internal zlib. -stdenv.mkDerivation rec { +let +self = stdenv.mkDerivation rec { name = "mysql-${version}"; version = "5.7.20"; @@ -54,11 +55,14 @@ stdenv.mkDerivation rec { rm $out/share/man/man1/mysql-test-run.pl.1 ''; - passthru.mysqlVersion = "5.7"; + passthru = { + connector-c = self; + mysqlVersion = "5.7"; + }; meta = { homepage = http://www.mysql.com/; description = "The world's most popular open source database"; platforms = stdenv.lib.platforms.unix; }; -} +}; in self From c146b7bfaab0a7a13611b8c8ad13a07be27e9533 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Fri, 22 Dec 2017 19:33:47 +0300 Subject: [PATCH 062/331] dspam: libmysql -> mysql 5.7 --- pkgs/servers/mail/dspam/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mail/dspam/default.nix b/pkgs/servers/mail/dspam/default.nix index 623f0a2b0e2..b63390bb247 100644 --- a/pkgs/servers/mail/dspam/default.nix +++ b/pkgs/servers/mail/dspam/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, makeWrapper , gawk, gnused, gnugrep, coreutils, which , perl, NetSMTP -, withMySQL ? false, zlib, libmysql +, withMySQL ? false, zlib, mysql57 , withPgSQL ? false, postgresql , withSQLite ? false, sqlite , withDB ? false, db @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { }; buildInputs = [ perl ] - ++ lib.optionals withMySQL [ zlib libmysql ] + ++ lib.optionals withMySQL [ zlib mysql57.connector-c ] ++ lib.optional withPgSQL postgresql ++ lib.optional withSQLite sqlite ++ lib.optional withDB db; @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { "--enable-preferences-extension" "--enable-long-usernames" "--enable-external-lookup" - ] ++ lib.optional withMySQL "--with-mysql-includes=${lib.getDev libmysql}/include/mysql" + ] ++ lib.optional withMySQL "--with-mysql-includes=${mysql57.connector-c}/include/mysql" ++ lib.optional withPgSQL "--with-pgsql-libraries=${postgresql.lib}/lib"; # Lots of things are hardwired to paths like sysconfdir. That's why we install with both "prefix" and "DESTDIR" From 087a08617b01d67cae90507c2b424093a0356045 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 25 Dec 2017 17:47:47 +0100 Subject: [PATCH 063/331] postfix: libmysql -> mysql.connector-c --- pkgs/servers/mail/postfix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index c92507b4167..bf1a1e782a5 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, makeWrapper, gnused, db, openssl, cyrus_sasl, libnsl , coreutils, findutils, gnugrep, gawk, icu, pcre , withPgSQL ? false, postgresql -, withMySQL ? false, libmysql +, withMySQL ? false, mysql , withSQLite ? false, sqlite , withLDAP ? false, openldap }: @@ -11,7 +11,7 @@ let "-DUSE_TLS" "-DUSE_SASL_AUTH" "-DUSE_CYRUS_SASL" "-I${cyrus_sasl.dev}/include/sasl" "-DHAS_DB_BYPASS_MAKEDEFS_CHECK" ] ++ lib.optional withPgSQL "-DHAS_PGSQL" - ++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${lib.getDev libmysql}/include/mysql" ] + ++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ] ++ lib.optional withSQLite "-DHAS_SQLITE" ++ lib.optional withLDAP "-DHAS_LDAP"); auxlibs = lib.concatStringsSep " " ([ @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ db openssl cyrus_sasl icu libnsl pcre ] ++ lib.optional withPgSQL postgresql - ++ lib.optional withMySQL libmysql + ++ lib.optional withMySQL mysql.connector-c ++ lib.optional withSQLite sqlite ++ lib.optional withLDAP openldap; From 62a3561b5e971583be2f6ef3592b2d2f5f6968e0 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 23 Dec 2017 23:04:45 +0300 Subject: [PATCH 064/331] mariadb connector-c: 2.3.3 -> 2.3.4 --- pkgs/servers/sql/mariadb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 08594376c14..9b041bc8703 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -161,11 +161,11 @@ everything = stdenv.mkDerivation (common // { connector-c = stdenv.mkDerivation rec { name = "mariadb-connector-c-${version}"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { url = "https://downloads.mariadb.org/interstitial/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz/from/http%3A//ftp.hosteurope.de/mirror/archive.mariadb.org/?serve"; - sha256 = "12a0j4r01vrdpvl53zq433fb74gd4mm4v5jqmnf4nrg76h0p39c2"; + sha256 = "1g1sq5knarxkfhpkcczr6qxmq12pid65cdkqnhnfs94av89hbswb"; name = "mariadb-connector-c-${version}-src.tar.gz"; }; From f3445606ac2de2fa438b88000ff8e83167ee20a7 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 25 Dec 2017 18:08:09 +0100 Subject: [PATCH 065/331] libdbiDrivers: libmysql -> connector-c --- pkgs/development/libraries/libdbi-drivers/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/development/libraries/libdbi-drivers/default.nix index 77c09f3ed15..70095446775 100644 --- a/pkgs/development/libraries/libdbi-drivers/default.nix +++ b/pkgs/development/libraries/libdbi-drivers/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libdbi -, libmysql ? null, sqlite ? null, postgresql ? null +, mysql ? null, sqlite ? null, postgresql ? null }: with stdenv.lib; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0m680h8cc4428xin4p733azysamzgzcmv4psjvraykrsaz6ymlj3"; }; - buildInputs = [ libdbi libmysql sqlite postgresql ]; + buildInputs = [ libdbi sqlite postgresql ] ++ optional (mysql != null) mysql.connector-c; postPatch = '' sed -i '/SQLITE3_LIBS/ s/-lsqlite/-lsqlite3/' configure; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "--enable-libdbi" "--with-dbi-incdir=${libdbi}/include" "--with-dbi-libdir=${libdbi}/lib" - ] ++ optionals (libmysql != null) [ + ] ++ optionals (mysql != null) [ "--with-mysql" ] ++ optionals (postgresql != null) [ "--with-pgsql" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 717471b815f..cafeb59d5c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9178,12 +9178,12 @@ with pkgs; libdbi = callPackage ../development/libraries/libdbi { }; libdbiDriversBase = callPackage ../development/libraries/libdbi-drivers { - libmysql = null; + mysql = null; sqlite = null; }; libdbiDrivers = libdbiDriversBase.override { - inherit sqlite libmysql; + inherit sqlite mysql; }; libdbusmenu-glib = callPackage ../development/libraries/libdbusmenu { }; From fe437d70ec14eecaf8b523021e70188ecf60ccb2 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 26 Dec 2017 19:40:42 +0100 Subject: [PATCH 066/331] luaPackages.luadbi: libmysql -> connector-c --- pkgs/top-level/lua-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index c83e62fd89a..4c05f96caf7 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -8,7 +8,7 @@ { fetchurl, fetchzip, stdenv, lua, callPackage, unzip, zziplib, pkgconfig, libtool , pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat, cairo , perl, gtk2, python, glib, gobjectIntrospection, libevent, zlib, autoreconfHook -, libmysql, postgresql, cyrus_sasl +, mysql, postgresql, cyrus_sasl , fetchFromGitHub, libmpack, which }: @@ -210,7 +210,7 @@ let }; sourceRoot = "."; - buildInputs = [ libmysql postgresql sqlite ]; + buildInputs = [ mysql.connector-c postgresql sqlite ]; preConfigure = '' substituteInPlace Makefile --replace CC=gcc CC=cc @@ -220,7 +220,8 @@ let ''; NIX_CFLAGS_COMPILE = [ - "-I${libmysql.dev}/include/mysql" + "-I${mysql.connector-c}/include/mysql" + "-L${mysql.connector-c}/lib/mysql" "-I${postgresql}/include/server" ]; From 445e3d739041474bc17757b5acc440d1fdcb13ea Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 27 Dec 2017 15:28:11 +0100 Subject: [PATCH 067/331] ghostOne: remove broken and unmaintained --- nixos/modules/misc/ids.nix | 4 +- nixos/modules/module-list.nix | 1 - nixos/modules/services/games/ghost-one.nix | 105 --------------------- pkgs/servers/games/ghost-one/default.nix | 55 ----------- pkgs/top-level/all-packages.nix | 2 - 5 files changed, 2 insertions(+), 165 deletions(-) delete mode 100644 nixos/modules/services/games/ghost-one.nix delete mode 100644 pkgs/servers/games/ghost-one/default.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 678593a2d8b..579a3f6393c 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -65,7 +65,7 @@ foldingathome = 37; sabnzbd = 38; #kdm = 39; # dropped in 17.03 - ghostone = 40; + #ghostone = 40; # dropped in 18.03 git = 41; fourstore = 42; fourstorehttp = 43; @@ -348,7 +348,7 @@ #foldingathome = 37; # unused #sabnzd = 38; # unused #kdm = 39; # unused, even before 17.03 - ghostone = 40; + #ghostone = 40; # dropped in 18.03 git = 41; fourstore = 42; fourstorehttp = 43; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 405dc3823d5..ccc2a46456e 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -220,7 +220,6 @@ ./services/editors/emacs.nix ./services/editors/infinoted.nix ./services/games/factorio.nix - ./services/games/ghost-one.nix ./services/games/minecraft-server.nix ./services/games/minetest-server.nix ./services/games/terraria.nix diff --git a/nixos/modules/services/games/ghost-one.nix b/nixos/modules/services/games/ghost-one.nix deleted file mode 100644 index 71ff6bb2f3f..00000000000 --- a/nixos/modules/services/games/ghost-one.nix +++ /dev/null @@ -1,105 +0,0 @@ -{ config, lib, pkgs, ... }: -with lib; -let - - cfg = config.services.ghostOne; - ghostUser = "ghostone"; - stateDir = "/var/lib/ghost-one"; - -in -{ - - ###### interface - - options = { - services.ghostOne = { - - enable = mkOption { - default = false; - description = "Enable Ghost-One Warcraft3 game hosting server."; - }; - - language = mkOption { - default = "English"; - type = types.enum [ "English" "Spanish" "Russian" "Serbian" "Turkish" ]; - description = "The language of bot messages: English, Spanish, Russian, Serbian or Turkish."; - }; - - war3path = mkOption { - default = ""; - description = '' - The path to your local Warcraft III directory, which must contain war3.exe, storm.dll, and game.dll. - ''; - }; - - mappath = mkOption { - default = ""; - description = '' - The path to the directory where you keep your map files. GHost One doesn't require - map files but if it has access to them it can send them to players and automatically - calculate most map config values. GHost One will search [bot_mappath + map_localpath] - for the map file (map_localpath is set in each map's config file). - ''; - }; - - config = mkOption { - default = ""; - description = "Extra configuration options."; - }; - - }; - }; - - ###### implementation - - config = mkIf cfg.enable { - - users.extraUsers = singleton - { name = ghostUser; - uid = config.ids.uids.ghostone; - description = "Ghost One game server user"; - home = stateDir; - }; - - users.extraGroups = singleton - { name = ghostUser; - gid = config.ids.gids.ghostone; - }; - - services.ghostOne.config = '' -# bot_log = /dev/stderr - bot_language = ${pkgs.ghostOne}/share/ghost-one/languages/${cfg.language}.cfg - bot_war3path = ${cfg.war3path} - - bot_mapcfgpath = mapcfgs - bot_savegamepath = savegames - bot_mappath = ${cfg.mappath} - bot_replaypath = replays - ''; - - systemd.services."ghost-one" = { - wantedBy = [ "multi-user.target" ]; - script = '' - mkdir -p ${stateDir} - cd ${stateDir} - chown ${ghostUser}:${ghostUser} . - - mkdir -p mapcfgs - chown ${ghostUser}:${ghostUser} mapcfgs - - mkdir -p replays - chown ${ghostUser}:${ghostUser} replays - - mkdir -p savegames - chown ${ghostUser}:${ghostUser} savegames - - ln -sf ${pkgs.writeText "ghost.cfg" cfg.config} ghost.cfg - ln -sf ${pkgs.ghostOne}/share/ghost-one/ip-to-country.csv - ${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${ghostUser} \ - -c "LANG=C ${pkgs.ghostOne}/bin/ghost++" - ''; - }; - - }; - -} diff --git a/pkgs/servers/games/ghost-one/default.nix b/pkgs/servers/games/ghost-one/default.nix deleted file mode 100644 index ec56f526200..00000000000 --- a/pkgs/servers/games/ghost-one/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ stdenv, fetchurl, unzip, gmp, zlib, bzip2, boost, mysql }: -stdenv.mkDerivation rec { - - name = "ghost-one-${version}"; - version = "1.7.265"; - - src = fetchurl { - url = "http://www.maxdevlon.com/ghost/ghostone${version}.zip"; - sha256 = "1sm2ca3lcdr4vjg7v94d8zhqz8cdp44rg8yinzzwkgsr0hj74fv2"; - }; - - buildInputs = [ unzip gmp zlib bzip2 boost mysql.connector-c ]; - - patchPhase = '' - substituteInPlace ghost/Makefile --replace "/usr/local/lib/mysql" \ - "${mysql.connector-c}/lib/mariadb" - ''; - - buildPhase = '' - cd bncsutil/src/bncsutil - make - cd ../../../StormLib/stormlib/ - make - mkdir -p $out/lib - cd ../.. -# cp bncsutil/src/bncsutil/libbncutil.so $out/lib -# cp StormLib/stormlib/libStorm.so $out/lib - cd ghost - make - cd .. - ''; - - installPhase = '' - mkdir -p $out/lib - cp bncsutil/src/bncsutil/libbncsutil.so $out/lib - cp StormLib/stormlib/libStorm.so $out/lib - - mkdir -p $out/bin - cp ghost/ghost++ $out/bin - - mkdir -p $out/share/ghost-one/languages - cp -r mapcfgs $out/share/ghost-one - cp Languages/*.cfg $out/share/ghost-one/languages - cp language.cfg $out/share/ghost-one/languages/English.cfg - cp ip-to-country.csv $out/share/ghost-one/ - ''; - - meta = with stdenv.lib; { - homepage = http://www.codelain.com/forum/; - description = "A Warcraft III: Reign of Chaos and Warcraft III: The Frozen Throne game hosting bot"; - license = licenses.asl20; - maintainers = [ maintainers.phreedom ]; - broken = true; # can't even get downloaded - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cafeb59d5c9..f852c98334a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18085,8 +18085,6 @@ with pkgs; gemrb = callPackage ../games/gemrb { }; - ghostOne = callPackage ../servers/games/ghost-one { }; - gl117 = callPackage ../games/gl-117 {}; globulation2 = callPackage ../games/globulation { From 6903ea60502865fe4397d8aaacc38ff674acaeb9 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 27 Dec 2017 16:15:33 +0100 Subject: [PATCH 068/331] treewide: libmysql -> mysql.connector-c --- pkgs/applications/office/kexi/default.nix | 4 ++-- pkgs/development/compilers/gerbil/default.nix | 6 ++++-- pkgs/development/compilers/neko/default.nix | 4 ++-- pkgs/development/libraries/cppdb/default.nix | 6 +++--- pkgs/development/libraries/kdb/default.nix | 4 ++-- pkgs/development/libraries/unixODBCDrivers/default.nix | 8 -------- pkgs/development/libraries/wt/default.nix | 6 +++--- pkgs/development/tools/misc/sysbench/default.nix | 6 +++--- pkgs/games/zod/default.nix | 6 +++--- pkgs/servers/clickhouse/default.nix | 9 +++++++-- pkgs/servers/freeradius/default.nix | 6 +++--- pkgs/servers/mail/dovecot/default.nix | 4 ++-- pkgs/servers/mail/opensmtpd/extras.nix | 10 ++++++---- pkgs/tools/backup/bareos/default.nix | 6 +++--- pkgs/tools/security/thc-hydra/default.nix | 4 ++-- pkgs/tools/system/collectd/default.nix | 7 ++++--- pkgs/tools/system/rsyslog/default.nix | 9 +++++---- pkgs/top-level/all-packages.nix | 3 +-- 18 files changed, 55 insertions(+), 53 deletions(-) diff --git a/pkgs/applications/office/kexi/default.nix b/pkgs/applications/office/kexi/default.nix index 66aee6bd962..8463703c017 100644 --- a/pkgs/applications/office/kexi/default.nix +++ b/pkgs/applications/office/kexi/default.nix @@ -4,7 +4,7 @@ breeze-icons, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kcrash, kguiaddons, ki18n, kiconthemes, kitemviews, kio, ktexteditor, ktextwidgets, kwidgetsaddons, kxmlgui, - kdb, kproperty, kreport, lcms2, libmysql, marble, postgresql + kdb, kproperty, kreport, lcms2, mysql, marble, postgresql }: mkDerivation rec { @@ -24,7 +24,7 @@ mkDerivation rec { breeze-icons karchive kcodecs kcompletion kconfig kconfigwidgets kcoreaddons kcrash kguiaddons ki18n kiconthemes kitemviews kio ktexteditor ktextwidgets kwidgetsaddons kxmlgui - kdb kproperty kreport lcms2 libmysql marble postgresql + kdb kproperty kreport lcms2 mysql.connector-c marble postgresql ]; propagatedUserEnvPkgs = [ kproperty ]; diff --git a/pkgs/development/compilers/gerbil/default.nix b/pkgs/development/compilers/gerbil/default.nix index 622107c7534..23089ddda4e 100644 --- a/pkgs/development/compilers/gerbil/default.nix +++ b/pkgs/development/compilers/gerbil/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchgit, gambit, coreutils, rsync, bash, - openssl, zlib, sqlite, libxml2, libyaml, libmysql, lmdb, leveldb }: + openssl, zlib, sqlite, libxml2, libyaml, mysql, lmdb, leveldb }: # TODO: distinct packages for gerbil-release and gerbil-devel @@ -17,9 +17,11 @@ stdenv.mkDerivation rec { buildInputs = [ gambit coreutils rsync bash - openssl zlib sqlite libxml2 libyaml libmysql lmdb leveldb + openssl zlib sqlite libxml2 libyaml mysql.connector-c lmdb leveldb ]; + NIX_CFLAGS_COMPILE = [ "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ]; + postPatch = '' echo '(define (gerbil-version-string) "v${version}")' > src/gerbil/runtime/gx-version.scm diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix index 236273bf6be..4dce11f93b1 100644 --- a/pkgs/development/compilers/neko/default.nix +++ b/pkgs/development/compilers/neko/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, boehmgc, zlib, sqlite, pcre, cmake, pkgconfig -, git, apacheHttpd, apr, aprutil, mariadb, mbedtls, openssl, pkgs, gtk2, libpthreadstubs +, git, apacheHttpd, apr, aprutil, mysql, mbedtls, openssl, pkgs, gtk2, libpthreadstubs }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig git ]; buildInputs = [ boehmgc zlib sqlite pcre apacheHttpd apr aprutil - mariadb.client mbedtls openssl libpthreadstubs ] + mysql.connector-c mbedtls openssl libpthreadstubs ] ++ stdenv.lib.optional stdenv.isLinux gtk2 ++ stdenv.lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Security pkgs.darwin.apple_sdk.frameworks.Carbon]; diff --git a/pkgs/development/libraries/cppdb/default.nix b/pkgs/development/libraries/cppdb/default.nix index 72fa309b721..07c6e1490e7 100644 --- a/pkgs/development/libraries/cppdb/default.nix +++ b/pkgs/development/libraries/cppdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, sqlite, libmysql, postgresql, unixODBC }: +{ stdenv, fetchurl, cmake, sqlite, mysql, postgresql, unixODBC }: stdenv.mkDerivation rec { name = "cppdb"; @@ -11,9 +11,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ cmake sqlite libmysql postgresql unixODBC ]; + buildInputs = [ cmake sqlite mysql.connector-c postgresql unixODBC ]; cmakeFlags = [ "--no-warn-unused-cli" ]; + NIX_CFLAGS_COMPILE = [ "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ]; meta = with stdenv.lib; { homepage = http://cppcms.com/sql/cppdb/; @@ -23,4 +24,3 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.juliendehos ]; }; } - diff --git a/pkgs/development/libraries/kdb/default.nix b/pkgs/development/libraries/kdb/default.nix index 399d5914c2d..e85190cdfce 100644 --- a/pkgs/development/libraries/kdb/default.nix +++ b/pkgs/development/libraries/kdb/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, fetchurl, extra-cmake-modules, - qtbase, qttranslations, kcoreaddons, python2, sqlite, postgresql, libmysql + qtbase, qttranslations, kcoreaddons, python2, sqlite, postgresql, mysql }: mkDerivation rec { @@ -16,7 +16,7 @@ mkDerivation rec { nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qttranslations kcoreaddons python2 sqlite postgresql libmysql ]; + buildInputs = [ qttranslations kcoreaddons python2 sqlite postgresql mysql.connector-c ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index a0c7e662efa..badcb7e661b 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -43,13 +43,6 @@ "-DMARIADB_INCLUDE_DIR=${mariadb.connector-c}/include/mariadb" ]; - preConfigure = '' - sed -i \ - -e 's,mariadb_config,mysql_config,g' \ - -e 's,libmariadbclient,libmysqlclient,g' \ - cmake/FindMariaDB.cmake - ''; - passthru = { fancyName = "MariaDB"; driver = "lib/libmyodbc3-3.51.12.so"; @@ -60,7 +53,6 @@ homepage = https://downloads.mariadb.org/connector-odbc/; license = licenses.gpl2; platforms = platforms.linux; - broken = true; }; }; diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix index 573b02d7c58..1d0bd20f66f 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, boost, pkgconfig, doxygen, qt48Full, libharu -, pango, fcgi, firebird, libmysql, postgresql, graphicsmagick, glew, openssl +, pango, fcgi, firebird, mysql, postgresql, graphicsmagick, glew, openssl , pcre }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cmake boost doxygen qt48Full libharu - pango fcgi firebird libmysql postgresql graphicsmagick glew + pango fcgi firebird mysql.connector-c postgresql graphicsmagick glew openssl pcre ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { "-DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick" "-DWT_CPP_11_MODE=-std=c++11" "-DGM_PREFIX=${graphicsmagick}" - "-DMYSQL_PREFIX=${libmysql}" + "-DMYSQL_PREFIX=${mysql.connector-c}" "--no-warn-unused-cli" ]; diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix index 45a31ad66f2..612df55471b 100644 --- a/pkgs/development/tools/misc/sysbench/default.nix +++ b/pkgs/development/tools/misc/sysbench/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, vim, libmysql, - libaio }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, vim, mysql +, libaio }: stdenv.mkDerivation rec { name = "sysbench-1.0.6"; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ vim libmysql libaio ]; + buildInputs = [ vim mysql.connector-c libaio ]; src = fetchFromGitHub { owner = "akopytov"; diff --git a/pkgs/games/zod/default.nix b/pkgs/games/zod/default.nix index f795a2ea3a2..da2f256aeb7 100644 --- a/pkgs/games/zod/default.nix +++ b/pkgs/games/zod/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, unrar, unzip, SDL, SDL_image, SDL_ttf, SDL_mixer -, libmysql, makeWrapper }: +, mysql, makeWrapper }: stdenv.mkDerivation rec { name = "zod-engine-2011-03-18"; @@ -24,9 +24,9 @@ stdenv.mkDerivation rec { sourceRoot=`pwd`/src ''; - buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer libmysql makeWrapper ]; + buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer mysql.connector-c makeWrapper ]; - NIX_LDFLAGS = "-L${stdenv.lib.getLib libmysql}/lib/mysql"; + NIX_LDFLAGS = "-L${mysql.connector-c}/lib/mysql"; installPhase = '' mkdir -p $out/bin $out/share/zod diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index f9b7a24273f..f4a6b47a45a 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake, libtool, boost, double-conversion, gperftools, icu, libmysql, lz4, openssl, poco, re2, rdkafka, readline, sparsehash, unixODBC, zookeeper_mt, zstd }: +{ stdenv, fetchFromGitHub, cmake, libtool, boost, double-conversion, gperftools +, icu, mysql, lz4, openssl, poco, re2, rdkafka, readline, sparsehash, unixODBC +, zookeeper_mt, zstd }: stdenv.mkDerivation rec { name = "clickhouse-${version}"; @@ -16,7 +18,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake libtool ]; - buildInputs = [ boost double-conversion gperftools icu libmysql lz4 openssl poco re2 rdkafka readline sparsehash unixODBC zookeeper_mt zstd ]; + buildInputs = [ + boost double-conversion gperftools icu mysql.connector-c lz4 openssl poco + re2 rdkafka readline sparsehash unixODBC zookeeper_mt zstd + ]; cmakeFlags = [ "-DENABLE_TESTS=OFF" "-DUNBUNDLED=ON" "-DUSE_STATIC_LIBRARIES=OFF" ]; diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix index db9d1121992..bf74ca81ced 100644 --- a/pkgs/servers/freeradius/default.nix +++ b/pkgs/servers/freeradius/default.nix @@ -13,7 +13,7 @@ , withMemcached ? false , hiredis , withRedis ? false -, libmysql +, mysql , withMysql ? false , json_c , withJson ? false @@ -29,7 +29,7 @@ assert withPcap -> libpcap != null; assert withCap -> libcap != null; assert withMemcached -> libmemcached != null; assert withRedis -> hiredis != null; -assert withMysql -> libmysql != null; +assert withMysql -> mysql != null; assert withYubikey -> libyubikey != null; assert withCollectd -> collectd != null; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ++ optional withCap libcap ++ optional withMemcached libmemcached ++ optional withRedis hiredis - ++ optional withMysql libmysql + ++ optional withMysql mysql.connector-c ++ optional withJson json_c ++ optional withYubikey libyubikey ++ optional withCollectd collectd; diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index ab1808c0647..e2d1f448b32 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -2,7 +2,7 @@ , bzip2, zlib, inotify-tools, pam, libcap , clucene_core_2, icu, openldap # Auth modules -, withMySQL ? false, libmysql +, withMySQL ? false, mysql , withPgSQL ? false, postgresql , withSQLite ? true, sqlite }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl pkgconfig ]; buildInputs = [ openssl bzip2 zlib clucene_core_2 icu openldap ] ++ lib.optionals (stdenv.isLinux) [ systemd pam libcap inotify-tools ] - ++ lib.optional withMySQL libmysql + ++ lib.optional withMySQL mysql.connector-c ++ lib.optional withPgSQL postgresql ++ lib.optional withSQLite sqlite; diff --git a/pkgs/servers/mail/opensmtpd/extras.nix b/pkgs/servers/mail/opensmtpd/extras.nix index 5e5170afbc7..5e87a1fb099 100644 --- a/pkgs/servers/mail/opensmtpd/extras.nix +++ b/pkgs/servers/mail/opensmtpd/extras.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, openssl, libevent, libasr, - python2, pkgconfig, lua5, perl, mariadb, postgresql, sqlite, hiredis }: + python2, pkgconfig, lua5, perl, mysql, postgresql, sqlite, hiredis }: + stdenv.mkDerivation rec { name = "opensmtpd-extras-${version}"; version = "5.7.1"; @@ -11,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl libevent - libasr python2 lua5 perl mariadb.client postgresql sqlite hiredis ]; + libasr python2 lua5 perl mysql.connector-c postgresql sqlite hiredis ]; configureFlags = [ "--sysconfdir=/etc" @@ -54,7 +55,7 @@ stdenv.mkDerivation rec { "--with-perl=${perl}" "--with-filter-perl" - ] ++ stdenv.lib.optional (mariadb != null) [ + ] ++ stdenv.lib.optional (mysql != null) [ "--with-table-mysql" ] ++ stdenv.lib.optional (postgresql != null) [ @@ -67,7 +68,8 @@ stdenv.mkDerivation rec { "--with-table-redis" ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optional (hiredis != null) [ "-I${hiredis}/include/hiredis" ]; + NIX_CFLAGS_COMPILE = stdenv.lib.optional (hiredis != null) "-I${hiredis}/include/hiredis" ++ + stdenv.lib.optional (mysql != null) "-L${mysql.connector-c}/lib/mysql"; meta = with stdenv.lib; { homepage = https://www.opensmtpd.org/; diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix index 7fa28c5f79b..82d379c49d6 100644 --- a/pkgs/tools/backup/bareos/default.nix +++ b/pkgs/tools/backup/bareos/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchFromGitHub, pkgconfig, nettools, gettext, libtool, flex , readline ? null, openssl ? null, python2 ? null, ncurses ? null, rocksdb -, sqlite ? null, postgresql ? null, libmysql ? null, zlib ? null, lzo ? null +, sqlite ? null, postgresql ? null, mysql ? null, zlib ? null, lzo ? null , jansson ? null, acl ? null, glusterfs ? null, libceph ? null, libcap ? null }: -assert sqlite != null || postgresql != null || libmysql != null; +assert sqlite != null || postgresql != null || mysql != null; with stdenv.lib; let @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ++ optional (openssl != null) "--with-openssl=${openssl.dev}" ++ optional (sqlite != null) "--with-sqlite3=${sqlite.dev}" ++ optional (postgresql != null) "--with-postgresql=${postgresql}" - ++ optional (libmysql != null) "--with-mysql=${libmysql}" + ++ optional (mysql != null) "--with-mysql=${mysql.connector-c}" ++ optional (zlib != null) "--with-zlib=${zlib.dev}" ++ optional (lzo != null) "--with-lzo=${lzo}" ++ optional (jansson != null) "--with-jansson=${jansson}" diff --git a/pkgs/tools/security/thc-hydra/default.nix b/pkgs/tools/security/thc-hydra/default.nix index e8eb3aacd3e..9a7a245b813 100644 --- a/pkgs/tools/security/thc-hydra/default.nix +++ b/pkgs/tools/security/thc-hydra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, zlib, openssl, ncurses, libidn, pcre, libssh, libmysql, postgresql +{ stdenv, lib, fetchurl, zlib, openssl, ncurses, libidn, pcre, libssh, mysql, postgresql , withGUI ? false, makeWrapper, pkgconfig, gtk2 }: let @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { ''; nativeBuildInputs = lib.optionals withGUI [ pkgconfig makeWrapper ]; - buildInputs = [ zlib openssl ncurses libidn pcre libssh libmysql postgresql ] + buildInputs = [ zlib openssl ncurses libidn pcre libssh mysql.connector-c postgresql ] ++ lib.optional withGUI gtk2; postInstall = lib.optionalString withGUI '' diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index ddfd8cbbc01..4c9ebc46081 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -20,7 +20,7 @@ , libtool ? null , lm_sensors ? null , lvm2 ? null -, libmysql ? null +, mysql ? null , postgresql ? null , protobufc ? null , python ? null @@ -50,9 +50,10 @@ stdenv.mkDerivation rec { buildInputs = [ curl libdbi libgcrypt libmemcached cyrus_sasl libnotify gdk_pixbuf liboping libpcap libvirt - libxml2 libmysql postgresql protobufc rrdtool + libxml2 postgresql protobufc rrdtool varnish yajl jdk libtool python hiredis libmicrohttpd - ] ++ stdenv.lib.optionals stdenv.isLinux [ + ] ++ stdenv.lib.optional (mysql != null) mysql.connector-c + ++ stdenv.lib.optionals stdenv.isLinux [ iptables libatasmart libcredis libmodbus libsigrok lm_sensors lvm2 rabbitmq-c udev net_snmp libmnl ] ++ stdenv.lib.optionals stdenv.isDarwin [ diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index e642b91c3d9..a6999942e0c 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, autoreconfHook, libestr, json_c, zlib, pythonPackages, fastJson -, libkrb5 ? null, systemd ? null, jemalloc ? null, libmysql ? null, postgresql ? null +, libkrb5 ? null, systemd ? null, jemalloc ? null, mysql ? null, postgresql ? null , libdbi ? null, net_snmp ? null, libuuid ? null, curl ? null, gnutls ? null , libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null, libksi ? null , libgt ? null, liblogging ? null, libnet ? null, hadoop ? null, rdkafka ? null @@ -22,11 +22,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ - fastJson libestr json_c zlib pythonPackages.docutils libkrb5 jemalloc libmysql + fastJson libestr json_c zlib pythonPackages.docutils libkrb5 jemalloc postgresql libdbi net_snmp libuuid curl gnutls libgcrypt liblognorm openssl librelp libgt libksi liblogging libnet hadoop rdkafka libmongo-client czmq rabbitmq-c hiredis - ] ++ stdenv.lib.optional stdenv.isLinux systemd; + ] ++ stdenv.lib.optional (mysql != null) mysql.connector-c + ++ stdenv.lib.optional stdenv.isLinux systemd; hardeningDisable = [ "format" ]; @@ -49,7 +50,7 @@ stdenv.mkDerivation rec { (mkFlag false "valgrind") (mkFlag false "diagtools") (mkFlag true "usertools") - (mkFlag (libmysql != null) "mysql") + (mkFlag (mysql != null) "mysql") (mkFlag (postgresql != null) "pgsql") (mkFlag (libdbi != null) "libdbi") (mkFlag (net_snmp != null) "snmp") diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f852c98334a..ed4ef080545 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1254,7 +1254,7 @@ with pkgs; libkrb5 = null; systemd = null; jemalloc = null; - libmysql = null; + mysql = null; postgresql = null; libdbi = null; net_snmp = null; @@ -1508,7 +1508,6 @@ with pkgs; convertlit = callPackage ../tools/text/convertlit { }; collectd = callPackage ../tools/system/collectd { - libmysql = mysql.connector-c; libsigrok = libsigrok-0-3-0; # not compatible with >= 0.4.0 yet }; From 572b2bda4e0a2245f465738cc919197ae0af06a4 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 27 Dec 2017 17:00:39 +0100 Subject: [PATCH 069/331] treewide: generalise for both mysql & mariadb --- pkgs/development/compilers/hhvm/default.nix | 4 ++-- pkgs/development/libraries/opendbx/default.nix | 4 ++-- pkgs/development/libraries/qt-3/default.nix | 2 +- pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix | 4 ++-- pkgs/development/lisp-modules/shell.nix | 4 ++-- pkgs/development/pure-modules/glpk/default.nix | 2 +- pkgs/development/tools/database/shmig/default.nix | 4 ++-- pkgs/servers/dns/powerdns/default.nix | 4 ++-- pkgs/servers/sql/mysql/5.7.x.nix | 2 ++ pkgs/tools/backup/bareos/default.nix | 2 +- pkgs/tools/backup/mydumper/default.nix | 4 ++-- pkgs/tools/networking/mailutils/default.nix | 4 ++-- pkgs/tools/networking/snabb/default.nix | 4 ++-- 13 files changed, 23 insertions(+), 21 deletions(-) diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index 2f84387a888..a66b2264f07 100644 --- a/pkgs/development/compilers/hhvm/default.nix +++ b/pkgs/development/compilers/hhvm/default.nix @@ -2,7 +2,7 @@ , pcre, libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php , expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog, libkrb5 , bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng -, libxslt, freetype, gdb, git, perl, mariadb, gmp, libyaml, libedit +, libxslt, freetype, gdb, git, perl, mysql, gmp, libyaml, libedit , libvpx, imagemagick, fribidi, gperf, which, ocamlPackages }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ cmake pkgconfig boost libunwind mariadb.client libmemcached pcre gdb git perl + [ cmake pkgconfig boost libunwind mysql.connector-c libmemcached pcre gdb git perl libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline libelf uwimap binutils cyrus_sasl pam glog libpng libxslt libkrb5 diff --git a/pkgs/development/libraries/opendbx/default.nix b/pkgs/development/libraries/opendbx/default.nix index 6a027dc9bd4..48ec5141e34 100644 --- a/pkgs/development/libraries/opendbx/default.nix +++ b/pkgs/development/libraries/opendbx/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { }; preConfigure = '' - export CPPFLAGS="-I${mysql.connector-c}/include/mariadb" - export LDFLAGS="-L${mysql.connector-c}/lib/mariadb -L${postgresql}/lib" + export CPPFLAGS="-I${mysql.connector-c}/include/mysql" + export LDFLAGS="-L${mysql.connector-c}/lib/mysql -L${postgresql}/lib" configureFlagsArray=(--with-backends="mysql pgsql sqlite3") ''; diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index 92cdc1f918a..1bc4fd1085e 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation { -I${randrproto}/include" else "-no-xrandr"} ${if xineramaSupport then "-xinerama -L${libXinerama.out}/lib -I${libXinerama.dev}/include" else "-no-xinerama"} ${if cursorSupport then "-L${libXcursor.out}/lib -I${libXcursor.dev}/include" else ""} - ${if mysqlSupport then "-qt-sql-mysql -L${mysql.connector-c}/lib/mariadb -I${mysql.connector-c}/include/mariadb" else ""} + ${if mysqlSupport then "-qt-sql-mysql -L${mysql.connector-c}/lib/mysql -I${mysql.connector-c}/include/mysql" else ""} ${if xftSupport then "-xft -L${libXft.out}/lib -I${libXft.dev}/include -L${libXft.freetype.out}/lib -I${libXft.freetype.dev}/include diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index 6ca3a608934..f2efa1ab1b4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -56,8 +56,8 @@ in propagatedBuildInputs = with pkgs; [mysql postgresql sqlite zlib]; overrides = y: (x.overrides y) // { preConfigure = ((x.overrides y).preConfigure or "") + '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.mysql.connector-c}/include/mariadb" - export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.mysql.connector-c}/lib/mariadb" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.mysql.connector-c}/include/mysql" + export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.mysql.connector-c}/lib/mysql" ''; }; }; diff --git a/pkgs/development/lisp-modules/shell.nix b/pkgs/development/lisp-modules/shell.nix index b29ba53159e..d3cb7b36aee 100644 --- a/pkgs/development/lisp-modules/shell.nix +++ b/pkgs/development/lisp-modules/shell.nix @@ -5,11 +5,11 @@ self = rec { env = buildEnv { name = name; paths = buildInputs; }; buildInputs = [ gcc stdenv - openssl fuse libuv mariadb libfixposix libev sqlite + openssl fuse libuv mysql.connector-c libfixposix libev sqlite freetds lispPackages.quicklisp-to-nix lispPackages.quicklisp-to-nix-system-info ]; CPATH = "${libfixposix}/include"; - LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${mariadb}/lib:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib"; + LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${mysql.connector-c}/lib:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib"; }; in stdenv.mkDerivation self diff --git a/pkgs/development/pure-modules/glpk/default.nix b/pkgs/development/pure-modules/glpk/default.nix index df113b9cc4a..e86f08b57ca 100644 --- a/pkgs/development/pure-modules/glpk/default.nix +++ b/pkgs/development/pure-modules/glpk/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { preConfigure = '' substituteInPlace configure \ - --replace /usr/include/mysql ${mysql.connector-c}/include/mariadb + --replace /usr/include/mysql ${mysql.connector-c}/include/mysql ''; configureFlags = [ "--enable-dl" "--enable-odbc" diff --git a/pkgs/development/tools/database/shmig/default.nix b/pkgs/development/tools/database/shmig/default.nix index a397ba69697..49e90ce64c8 100644 --- a/pkgs/development/tools/database/shmig/default.nix +++ b/pkgs/development/tools/database/shmig/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub , withMySQL ? false, withPSQL ? false, withSQLite ? false -, mariadb, postgresql, sqlite, gawk, which +, mysql, postgresql, sqlite, gawk, which , lib }: @@ -20,7 +20,7 @@ stdenv.mkDerivation { patchShebangs . substituteInPlace shmig \ - --replace "\`which mysql\`" "${lib.optionalString withMySQL "${mariadb}/bin/mysql"}" \ + --replace "\`which mysql\`" "${lib.optionalString withMySQL "${mysql.client}/bin/mysql"}" \ --replace "\`which psql\`" "${lib.optionalString withPSQL "${postgresql}/bin/psql"}" \ --replace "\`which sqlite3\`" "${lib.optionalString withSQLite "${sqlite}/bin/sqlite3"}" \ --replace "awk" "${gawk}/bin/awk" \ diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix index d7556a39ee9..79fff80b0b8 100644 --- a/pkgs/servers/dns/powerdns/default.nix +++ b/pkgs/servers/dns/powerdns/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, boost, libyamlcpp, libsodium, sqlite, protobuf, - libmysql, postgresql, lua, openldap, geoip, curl + mysql57, postgresql, lua, openldap, geoip, curl }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ boost libmysql postgresql lua openldap sqlite protobuf geoip libyamlcpp libsodium curl ]; + buildInputs = [ boost mysql57.connector-c postgresql lua openldap sqlite protobuf geoip libyamlcpp libsodium curl ]; # nix destroy with-modules arguments, when using configureFlags preConfigure = '' diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix index 0098353808f..ae3fa40a894 100644 --- a/pkgs/servers/sql/mysql/5.7.x.nix +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -56,7 +56,9 @@ self = stdenv.mkDerivation rec { ''; passthru = { + client = self; connector-c = self; + server = self; mysqlVersion = "5.7"; }; diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix index 82d379c49d6..4af20f76449 100644 --- a/pkgs/tools/backup/bareos/default.nix +++ b/pkgs/tools/backup/bareos/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ nettools gettext readline openssl python2 flex ncurses sqlite postgresql - libmysql zlib lzo jansson acl glusterfs libceph libcap rocksdb + mysql.connector-c zlib lzo jansson acl glusterfs libceph libcap rocksdb ]; postPatch = '' diff --git a/pkgs/tools/backup/mydumper/default.nix b/pkgs/tools/backup/mydumper/default.nix index 5b1f8f3fd5c..da8805bc226 100644 --- a/pkgs/tools/backup/mydumper/default.nix +++ b/pkgs/tools/backup/mydumper/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig -, glib, zlib, pcre, mariadb, libressl, }: +, glib, zlib, pcre, mysql, libressl }: stdenv.mkDerivation rec { version = "0.9.3"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ glib zlib pcre mariadb.client.dev libressl ]; + buildInputs = [ glib zlib pcre mysql.connector-c libressl ]; meta = with stdenv.lib; { description = ''High-perfomance MySQL backup tool''; diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index 4684c210c6e..6f47b4b5576 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -54,14 +54,14 @@ in stdenv.mkDerivation rec { sed -i -e '/chown root:mail/d' \ -e 's/chmod [24]755/chmod 0755/' \ */Makefile{.in,.am} - sed -i 's:/usr/lib/mysql:${mysql.connector-c}/lib/mariadb:' configure.ac + sed -i 's:/usr/lib/mysql:${mysql.connector-c}/lib/mysql:' configure.ac sed -i 's/0\.18/0.19/' configure.ac sed -i -e 's:mysql/mysql.h:mysql.h:' \ -e 's:mysql/errmsg.h:errmsg.h:' \ sql/mysql.c ''; - NIX_CFLAGS_COMPILE = "-L${mysql.connector-c}/lib/mariadb -I${mysql.connector-c}/include/mariadb"; + NIX_CFLAGS_COMPILE = "-L${mysql.connector-c}/lib/mysql -I${mysql.connector-c}/include/mysql"; preCheck = '' # Add missing test files diff --git a/pkgs/tools/networking/snabb/default.nix b/pkgs/tools/networking/snabb/default.nix index f3baddd2653..46580c0b802 100644 --- a/pkgs/tools/networking/snabb/default.nix +++ b/pkgs/tools/networking/snabb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, bash, makeWrapper, git, mariadb, diffutils, which, coreutils, procps, nettools }: +{ stdenv, lib, fetchFromGitHub, bash, makeWrapper, git, mysql, diffutils, which, coreutils, procps, nettools }: stdenv.mkDerivation rec { name = "snabb-${version}"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { done # We need a way to pass $PATH to the scripts - sed -i '2iexport PATH=${stdenv.lib.makeBinPath [ git mariadb which procps coreutils ]}' src/program/snabbnfv/neutron_sync_master/neutron_sync_master.sh.inc + sed -i '2iexport PATH=${stdenv.lib.makeBinPath [ git mysql.client which procps coreutils ]}' src/program/snabbnfv/neutron_sync_master/neutron_sync_master.sh.inc sed -i '2iexport PATH=${stdenv.lib.makeBinPath [ git coreutils diffutils nettools ]}' src/program/snabbnfv/neutron_sync_agent/neutron_sync_agent.sh.inc ''; From d3a0663a7d7a2bb62fdf220fd6cc5a4716a7ab6c Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 28 Dec 2017 00:06:58 +0100 Subject: [PATCH 070/331] gdal_1_11: needs mysql57 not mariadb --- pkgs/development/libraries/gdal/gdal-1_11.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gdal/gdal-1_11.nix b/pkgs/development/libraries/gdal/gdal-1_11.nix index d7906cfdc7d..7a80ce7fdb6 100644 --- a/pkgs/development/libraries/gdal/gdal-1_11.nix +++ b/pkgs/development/libraries/gdal/gdal-1_11.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, unzip, libjpeg, libtiff, zlib -, postgresql, mysql, libgeotiff, python, pythonPackages, proj, geos, openssl +, postgresql, mysql57, libgeotiff, python, pythonPackages, proj, geos, openssl , libpng }: stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { "--with-libz=${zlib.dev}" # optional "--with-pg=${postgresql}/bin/pg_config" - "--with-mysql=${mysql.connector-c}/bin/mysql_config" + "--with-mysql=${mysql57.connector-c}/bin/mysql_config" "--with-geotiff=${libgeotiff}" "--with-python" # optional "--with-static-proj4=${proj}" # optional From aa8658d496aff2b79f2ef78bcf13781573c8a489 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 28 Dec 2017 01:11:10 +0100 Subject: [PATCH 071/331] mysql57: add server.static for libmysqld.a --- pkgs/servers/sql/mysql/5.7.x.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix index ae3fa40a894..6741808a63b 100644 --- a/pkgs/servers/sql/mysql/5.7.x.nix +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -23,15 +23,20 @@ self = stdenv.mkDerivation rec { enableParallelBuilding = true; + outputs = [ "out" "static" ]; + cmakeFlags = [ "-DWITH_SSL=yes" - "-DWITH_READLINE=yes" "-DWITH_EMBEDDED_SERVER=yes" + "-DWITH_UNITTEST=no" "-DWITH_ZLIB=yes" + "-DWITH_ARCHIVE_STORAGE_ENGINE=yes" + "-DWITH_BLACKHOLE_STORAGE_ENGINE=yes" + "-DWITH_FEDERATED_STORAGE_ENGINE=yes" + "-DCMAKE_VERBOSE_MAKEFILE=yes" "-DHAVE_IPV6=yes" "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" "-DMYSQL_DATADIR=/var/lib/mysql" - "-DINSTALL_SYSCONFDIR=etc/mysql" "-DINSTALL_INFODIR=share/mysql/docs" "-DINSTALL_MANDIR=share/man" "-DINSTALL_PLUGINDIR=lib/mysql/plugin" @@ -51,7 +56,8 @@ self = stdenv.mkDerivation rec { ''; postInstall = '' sed -i -e "s|basedir=\"\"|basedir=\"$out\"|" $out/bin/mysql_install_db - rm -r $out/mysql-test "$out"/lib/*.a + install -vD $out/lib/*.a -t $static/lib + rm -r $out/mysql-test rm $out/share/man/man1/mysql-test-run.pl.1 ''; From c288c843e781446d87fa66a710b1d6d23ca2da77 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 28 Dec 2017 01:11:37 +0100 Subject: [PATCH 072/331] amarok{,-kf5}: use mysql.server.static for libmysqld --- pkgs/applications/audio/amarok/kf5.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/amarok/kf5.nix b/pkgs/applications/audio/amarok/kf5.nix index a96aa3ed65d..a4ac2943bfb 100644 --- a/pkgs/applications/audio/amarok/kf5.nix +++ b/pkgs/applications/audio/amarok/kf5.nix @@ -3,7 +3,7 @@ , qca-qt5, qjson, qtscript, qtwebkit , kcmutils, kconfig, kdelibs4support, kdnssd, kinit, knewstuff, knotifyconfig, ktexteditor , phonon, plasma-framework, threadweaver -, curl, ffmpeg, gdk_pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mariadb, pcre, snappy, taglib, taglib_extras +, curl, ffmpeg, gdk_pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras }: let @@ -26,7 +26,8 @@ in mkDerivation { qca-qt5 qjson qtscript qtwebkit kcmutils kconfig kdelibs4support kdnssd kinit knewstuff knotifyconfig ktexteditor phonon plasma-framework threadweaver - curl ffmpeg gdk_pixbuf libaio libmtp loudmouth lz4 lzo mariadb pcre snappy taglib taglib_extras + curl ffmpeg gdk_pixbuf libaio libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static + pcre snappy taglib taglib_extras ]; enableParallelBuilding = true; From 2bbb4810f4d4cf8328c95df72a1243c78817a073 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 28 Dec 2017 11:57:35 +0300 Subject: [PATCH 073/331] lisp-modules: mysql -> mysql.connector-c --- pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index f2efa1ab1b4..09113bc30bb 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -53,7 +53,7 @@ in cl-async-ssl = addNativeLibs [pkgs.openssl]; cl-async-test = addNativeLibs [pkgs.openssl]; clsql = x: { - propagatedBuildInputs = with pkgs; [mysql postgresql sqlite zlib]; + propagatedBuildInputs = with pkgs; [mysql.connector-c postgresql sqlite zlib]; overrides = y: (x.overrides y) // { preConfigure = ((x.overrides y).preConfigure or "") + '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.mysql.connector-c}/include/mysql" From 88657b3a50f2bdc4cfa9cc2a629b1382def08228 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 28 Dec 2017 11:50:51 +0300 Subject: [PATCH 074/331] mariadb: remove broken link file rcmysql --- pkgs/servers/sql/mariadb/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 9b041bc8703..66125b35378 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -83,7 +83,6 @@ common = rec { # attributes common to both builds }; }; - client = stdenv.mkDerivation (common // { name = "mariadb-client-${common.version}"; @@ -97,9 +96,11 @@ client = stdenv.mkDerivation (common // { preConfigure = common.preConfigure + '' cmakeFlags="$cmakeFlags \ - -DINSTALL_BINDIR=$bin/bin -DINSTALL_SCRIPTDIR=$bin/bin \ + -DINSTALL_BINDIR=$bin/bin \ + -DINSTALL_SCRIPTDIR=$bin/bin \ -DINSTALL_SUPPORTFILESDIR=$bin/share/mysql \ - -DINSTALL_DOCDIR=$bin/share/doc/mysql -DINSTALL_DOCREADMEDIR=$bin/share/doc/mysql \ + -DINSTALL_DOCDIR=$bin/share/doc/mysql \ + -DINSTALL_DOCREADMEDIR=$bin/share/doc/mysql \ " ''; @@ -112,7 +113,6 @@ client = stdenv.mkDerivation (common // { enableParallelBuilding = true; # the client should be OK }); - everything = stdenv.mkDerivation (common // { name = "mariadb-${common.version}"; @@ -154,6 +154,7 @@ everything = stdenv.mkDerivation (common // { postInstall = common.postInstall + '' rm -r "$out"/{mysql-test,sql-bench,data} # Don't need testing data rm "$out"/share/man/man1/mysql-test-run.pl.1 + rm "$out"/bin/rcmysql ''; CXXFLAGS = optionalString stdenv.isi686 "-fpermissive"; From 86c7db0ac448123b0adee5fb89db501d294e9168 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 28 Dec 2017 14:06:03 +0100 Subject: [PATCH 075/331] mysql module: cleanup obsolete checks --- nixos/modules/services/databases/mysql.nix | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index a3bf4f9ba92..36d5340a306 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -7,14 +7,12 @@ let cfg = config.services.mysql; mysql = cfg.package; - - isMariaDB = + + isMariaDB = let pName = _p: (builtins.parseDrvName (_p.name)).name; in pName mysql == pName pkgs.mariadb; - atLeast55 = versionAtLeast mysql.mysqlVersion "5.5"; - pidFile = "${cfg.pidDir}/mysqld.pid"; mysqldOptions = @@ -28,13 +26,6 @@ let ${optionalString (cfg.bind != null) "bind-address = ${cfg.bind}" } ${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "log-bin=mysql-bin"} ${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "server-id = ${toString cfg.replication.serverId}"} - ${optionalString (cfg.replication.role == "slave" && !atLeast55) - '' - master-host = ${cfg.replication.masterHost} - master-user = ${cfg.replication.masterUser} - master-password = ${cfg.replication.masterPassword} - master-port = ${toString cfg.replication.masterPort} - ''} ${optionalString (cfg.ensureUsers != []) '' plugin-load-add = auth_socket.so @@ -315,7 +306,7 @@ in fi '') cfg.initialDatabases} - ${optionalString (cfg.replication.role == "master" && atLeast55) + ${optionalString (cfg.replication.role == "master") '' # Set up the replication master @@ -326,7 +317,7 @@ in ) | ${mysql}/bin/mysql -u root -N ''} - ${optionalString (cfg.replication.role == "slave" && atLeast55) + ${optionalString (cfg.replication.role == "slave") '' # Set up the replication slave From add8d3282e7b4267e1b9c963b92c093613bbce67 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 28 Dec 2017 14:06:45 +0100 Subject: [PATCH 076/331] tora: use mysql.connector-c --- pkgs/development/tools/tora/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/tora/default.nix b/pkgs/development/tools/tora/default.nix index 578e759548a..5b46b975cf7 100644 --- a/pkgs/development/tools/tora/default.nix +++ b/pkgs/development/tools/tora/default.nix @@ -17,7 +17,7 @@ in mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules makeWrapper ]; buildInputs = [ - boost doxygen graphviz loki mysql openssl postgresql qscintillaLib qtbase + boost doxygen graphviz loki mysql.connector-c openssl postgresql qscintillaLib qtbase ]; preConfigure = '' @@ -51,6 +51,8 @@ in mkDerivation rec { "-lssl" ]; + NIX_CFLAGS_COMPILE = [ "-L${mysql.connector-c}/lib/mysql" "-I${mysql.connector-c}/include/mysql" ]; + postFixup = '' wrapProgram $out/bin/tora \ --prefix PATH : ${lib.getBin graphviz}/bin From e66d587aeb5052b6e9077107c2e447d6dc7318b4 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 28 Dec 2017 14:07:15 +0100 Subject: [PATCH 077/331] mysql55: add passthrus for compatibility --- pkgs/servers/sql/mysql/5.5.x.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix index 28e7824cd42..8f6ccd8c0d5 100644 --- a/pkgs/servers/sql/mysql/5.5.x.nix +++ b/pkgs/servers/sql/mysql/5.5.x.nix @@ -3,7 +3,8 @@ # Note: zlib is not required; MySQL can use an internal zlib. -stdenv.mkDerivation rec { +let +self = stdenv.mkDerivation rec { name = "mysql-${version}"; version = "5.5.58"; @@ -59,11 +60,16 @@ stdenv.mkDerivation rec { rm $out/share/man/man1/mysql-test-run.pl.1 ''; - passthru.mysqlVersion = "5.5"; + passthru = { + client = self; + connector-c = self; + server = self; + mysqlVersion = "5.5"; + }; meta = { homepage = http://www.mysql.com/; description = "The world's most popular open source database"; platforms = stdenv.lib.platforms.unix; }; -} +}; in self From c300d9e01ccd676026e91c9959a37a0f3bd2b8dd Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 28 Dec 2017 14:07:52 +0100 Subject: [PATCH 078/331] libmysql: deprecate --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6eb826c073f..2c249f73d6c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -95,6 +95,7 @@ mapAliases (rec { libcap_pam = if stdenv.isLinux then libcap.pam else null; # added 2016-04-29 libcap_progs = libcap.out; # added 2016-04-29 libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28 + libmysql = mysql.connector-c; # added # 2017-12-28, this was a misnomer refering to libmysqlclient libtidy = html-tidy; # added 2014-12-21 links = links2; # added 2016-01-31 lttngTools = lttng-tools; # added 2014-07-31 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed4ef080545..ca2b274ee0e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11992,7 +11992,6 @@ with pkgs; }; mysql = mariadb; - libmysql = mysql.connector-c; # `libmysql` is a slight misnomer ATM mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { }; From b56ebb07bcbf76a725dad38f0267f44a15d5daee Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 28 Dec 2017 14:29:05 +0100 Subject: [PATCH 079/331] redland: use connector-c --- pkgs/development/libraries/librdf/redland.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/librdf/redland.nix b/pkgs/development/libraries/librdf/redland.nix index 8e6fa005635..402af5d6f58 100644 --- a/pkgs/development/libraries/librdf/redland.nix +++ b/pkgs/development/libraries/librdf/redland.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl pkgconfig ]; buildInputs = [ openssl libxslt curl pcre libxml2 ] - ++ stdenv.lib.optional withMysql mysql + ++ stdenv.lib.optional withMysql mysql.connector-c ++ stdenv.lib.optional withSqlite sqlite ++ stdenv.lib.optional withPostgresql postgresql ++ stdenv.lib.optional withBdb db; From a6bb022b15a9aa45c6fc92a5459478744e514309 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 28 Dec 2017 16:51:35 +0100 Subject: [PATCH 080/331] digikam: mysql is not needed in buildInputs --- pkgs/applications/graphics/digikam/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 1e2ff00cdb2..de05627cf78 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -75,7 +75,6 @@ mkDerivation rec { libqtav libusb1 mesa - mysql opencv3 pcre From 3acfd319e44d26ae8a35f1b35e80810c40243e82 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 28 Dec 2017 11:58:46 +0300 Subject: [PATCH 081/331] grass: client -> connector-c --- pkgs/applications/gis/grass/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 3382bb3e56d..56512e6c6ea 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -22,9 +22,12 @@ stdenv.mkDerivation { "--with-wxwidgets" "--with-netcdf" "--with-geos" - "--with-postgres" "--with-postgres-libs=${postgresql.lib}/lib/" + "--with-postgres" + "--with-postgres-libs=${postgresql.lib}/lib/" # it complains about missing libmysqld but doesn't really seem to need it - "--with-mysql" "--with-mysql-includes=${stdenv.lib.getDev mysql.client}/include/mysql" + "--with-mysql" + "--with-mysql-includes=${mysql.connector-c}/include/mysql" + "--with-mysql-libs=${mysql.connector-c}/lib/mysql" "--with-blas" ]; From e2254dff8ba74edadd7c63c656c83e411dc3db33 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 28 Dec 2017 17:28:26 +0100 Subject: [PATCH 082/331] grass: 7.0.2 -> 7.2.2, fix build --- pkgs/applications/gis/grass/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 56512e6c6ea..987b544c556 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -4,15 +4,15 @@ }: stdenv.mkDerivation { - name = "grass-7.0.2"; + name = "grass-7.2.2"; src = fetchurl { - url = http://grass.osgeo.org/grass70/source/grass-7.0.2.tar.gz; - sha256 = "02qrdgn46gxr60amxwax4b8fkkmhmjxi6qh4yfvpbii6ai6diarf"; + url = http://grass.osgeo.org/grass72/source/grass-7.2.2.tar.gz; + sha256 = "0yzljbrxlqp4wbw08n1dvmm4vmwkg8glf1ff4xyh589r5ryb7gxv"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite cairo - readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.client blas ] + readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.connector-c blas ] ++ (with python2Packages; [ python dateutil wxPython30 numpy ]); configureFlags = [ @@ -43,17 +43,20 @@ stdenv.mkDerivation { scripts/r.pack/r.pack.py \ scripts/r.tileset/r.tileset.py \ scripts/r.unpack/r.unpack.py \ - scripts/v.krige/v.krige.py \ scripts/v.rast.stats/v.rast.stats.py \ scripts/v.to.lines/v.to.lines.py \ scripts/v.what.strds/v.what.strds.py \ scripts/v.unpack/v.unpack.py \ scripts/wxpyimgview/*.py \ gui/wxpython/animation/g.gui.animation.py \ + gui/wxpython/datacatalog/g.gui.datacatalog.py \ gui/wxpython/rlisetup/g.gui.rlisetup.py \ gui/wxpython/vdigit/g.gui.vdigit.py \ temporal/t.rast.accumulate/t.rast.accumulate.py \ temporal/t.rast.accdetect/t.rast.accdetect.py \ + temporal/t.rast.algebra/t.rast.algebra.py \ + temporal/t.rast3d.algebra/t.rast3d.algebra.py \ + temporal/t.vect.algebra/t.vect.algebra.py \ temporal/t.select/t.select.py for d in gui lib scripts temporal tools; do patchShebangs $d @@ -61,7 +64,7 @@ stdenv.mkDerivation { ''; postInstall = '' - wrapProgram $out/bin/grass70 \ + wrapProgram $out/bin/grass72 \ --set PYTHONPATH $PYTHONPATH \ --set GRASS_PYTHON ${python2Packages.python}/bin/${python2Packages.python.executable} \ --suffix LD_LIBRARY_PATH ':' '${gdal}/lib' @@ -75,6 +78,5 @@ stdenv.mkDerivation { description = "GIS software suite used for geospatial data management and analysis, image processing, graphics and maps production, spatial modeling, and visualization"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; - broken = true; }; } From 1f4c02fc9ee89995fa8fa87c99f840514234db9a Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 28 Dec 2017 11:54:41 +0300 Subject: [PATCH 083/331] libdbiDrivers: fix config --- .../libraries/libdbi-drivers/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/development/libraries/libdbi-drivers/default.nix index 70095446775..2a03efd632f 100644 --- a/pkgs/development/libraries/libdbi-drivers/default.nix +++ b/pkgs/development/libraries/libdbi-drivers/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, libdbi -, mysql ? null, sqlite ? null, postgresql ? null +, mysql ? null +, sqlite ? null +, postgresql ? null }: with stdenv.lib; @@ -26,14 +28,16 @@ stdenv.mkDerivation rec { "--with-dbi-libdir=${libdbi}/lib" ] ++ optionals (mysql != null) [ "--with-mysql" - ] ++ optionals (postgresql != null) [ - "--with-pgsql" - "--with-pgsql_incdir=${postgresql}/include" - "--with-pgsql_libdir=${postgresql.lib}/lib" + "--with-mysql-incdir=${mysql.connector-c}/include/mysql" + "--with-mysql-libdir=${mysql.connector-c}/lib/mysql" ] ++ optionals (sqlite != null) [ "--with-sqlite3" "--with-sqlite3-incdir=${sqlite.dev}/include/sqlite" "--with-sqlite3-libdir=${sqlite.out}/lib/sqlite" + ] ++ optionals (postgresql != null) [ + "--with-pgsql" + "--with-pgsql_incdir=${postgresql}/include" + "--with-pgsql_libdir=${postgresql.lib}/lib" ]; installFlags = [ "DESTDIR=\${out}" ]; From 48464d620dfe4646fd44829cb77ca6fd327e98f9 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 28 Dec 2017 17:50:27 +0100 Subject: [PATCH 084/331] php: clean up mysql/mariadb handling --- pkgs/development/interpreters/php/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index e397f4af297..3eedf19a312 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -12,9 +12,8 @@ let { version, sha256 }: let php7 = lib.versionAtLeast version "7.0"; - mysqlHeaders = mysql.connector-c or mysql; mysqlndSupport = config.php.mysqlnd or false; - mysqlBuildInputs = lib.optional (!mysqlndSupport) mysqlHeaders; + mysqlBuildInputs = lib.optional (!mysqlndSupport) mysql.connector-c; in composableDerivation.composableDerivation {} (fixed: { @@ -121,7 +120,7 @@ let }; mysqli = { - configureFlags = ["--with-mysqli=${if mysqlndSupport then "mysqlnd" else "${mysqlHeaders}/bin/mysql_config"}"]; + configureFlags = ["--with-mysqli=${if mysqlndSupport then "mysqlnd" else "${mysql.connector-c}/bin/mysql_config"}"]; buildInputs = mysqlBuildInputs; }; @@ -132,7 +131,7 @@ let }; pdo_mysql = { - configureFlags = ["--with-pdo-mysql=${if mysqlndSupport then "mysqlnd" else mysqlHeaders}"]; + configureFlags = ["--with-pdo-mysql=${if mysqlndSupport then "mysqlnd" else mysql.connector-c}"]; buildInputs = mysqlBuildInputs; }; From 1367630af0050288776a7f8948d9971abf0cda53 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 28 Dec 2017 17:50:41 +0100 Subject: [PATCH 085/331] mysql57: backward compat At least PHP expects a libmysqlclient_r which was the thread-safe variant of libmysqlclient, but has been dropped since this is guaranteed for libmysqlclient now. --- pkgs/servers/sql/mysql/5.7.x.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix index 6741808a63b..0b277821876 100644 --- a/pkgs/servers/sql/mysql/5.7.x.nix +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -58,7 +58,8 @@ self = stdenv.mkDerivation rec { sed -i -e "s|basedir=\"\"|basedir=\"$out\"|" $out/bin/mysql_install_db install -vD $out/lib/*.a -t $static/lib rm -r $out/mysql-test - rm $out/share/man/man1/mysql-test-run.pl.1 + rm $out/share/man/man1/mysql-test-run.pl.1 $out/lib/*.a + ln -s libmysqlclient.so $out/lib/libmysqlclient_r.so ''; passthru = { From 553e8be1d91cad5c9b203a4e64953707da23e1fe Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 28 Dec 2017 18:49:51 +0100 Subject: [PATCH 086/331] release-notes 18.03: add MariaDB update notes --- nixos/doc/manual/release-notes/rl-1803.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml index 6329ec70582..62c8b86302f 100644 --- a/nixos/doc/manual/release-notes/rl-1803.xml +++ b/nixos/doc/manual/release-notes/rl-1803.xml @@ -20,6 +20,18 @@ has the following highlights: + MariaDB 10.2, updated from 10.1, is now the default MySQL implementation. While upgrading a few changes + have been made to the infrastructure involved: + + + libmysql has been deprecated, please use mysql.connector-c + instead, a compatibility passthru has been added to the MySQL packages. + + + The mysql57 package has a new static output containing + the static libraries including libmysqld.a + + From 4076ef0dd3c295cee92be25f592738286b4e5293 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 26 Dec 2017 15:41:47 +0100 Subject: [PATCH 087/331] libdrm: 2.4.88 -> 2.4.89 --- pkgs/development/libraries/libdrm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 533d5d4cac8..e5e1e2e7a39 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind-light }: stdenv.mkDerivation rec { - name = "libdrm-2.4.88"; + name = "libdrm-2.4.89"; src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "b5e55dbac2124e742e639f5b8553e8b7395863bf73dab4f77e99fe2fc25572b5"; + sha256 = "629f9782aabbb4809166de5f24d26fe0766055255038f16935602d89f136a02e"; }; outputs = [ "out" "dev" "bin" ]; From 0e8283370bc36988d480dda2f7eeb3010ec8e1a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 26 Dec 2017 17:30:40 +0100 Subject: [PATCH 088/331] mesa: 17.2.7 -> 17.2.8 (maintenance) --- pkgs/development/libraries/mesa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index fca99550a3c..4c00df4c17d 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -66,7 +66,7 @@ let in let - version = "17.2.7"; + version = "17.2.8"; branch = head (splitString "." version); driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32"; in @@ -81,7 +81,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" ]; - sha256 = "0s3slgjxnx482yw0knn4a6alsy2cq28rah6hnjbmf12mvyldxksh"; + sha256 = "0pq9kmmyllgd63d936f3x1zsg7sqaswx47khbn0gvbgari2h753f"; }; prePatch = "patchShebangs ."; From 291eac9d70e5f4b8cbbc7632afcac5ea79eb62ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 28 Dec 2017 22:41:44 +0100 Subject: [PATCH 089/331] xorg-server: 1.19.5 -> 1.19.6 (maintenance) --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index d1c7c81c101..cc2cade8ba1 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2588,11 +2588,11 @@ let }) // {inherit ;}; xorgserver = (mkDerivation "xorgserver" { - name = "xorg-server-1.19.5"; + name = "xorg-server-1.19.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.19.5.tar.bz2; - sha256 = "0iql4pgsgpyqcrd3256pv227cdadvz01ych61n0d41ixp67gmzqq"; + url = mirror://xorg/individual/xserver/xorg-server-1.19.6.tar.bz2; + sha256 = "15y13ihgkggmly5s07vzvpn35gzx1w0hrkbnlcvcy05h3lpm0cm7"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 4ea77fee443..dd48748dceb 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -186,7 +186,7 @@ mirror://xorg/individual/app/xlsfonts-1.0.5.tar.bz2 mirror://xorg/individual/app/xmag-1.0.6.tar.bz2 mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2 mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.19.5.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.19.6.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2 mirror://xorg/individual/app/xprop-1.2.2.tar.bz2 From 0ac589246a7020d6ed024353b8b39ef1c363e50e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 29 Dec 2017 11:28:17 +0100 Subject: [PATCH 090/331] release-notes 18.03: fixup build after 553e8be1 --- nixos/doc/manual/release-notes/rl-1803.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml index 62c8b86302f..fcad5bfff55 100644 --- a/nixos/doc/manual/release-notes/rl-1803.xml +++ b/nixos/doc/manual/release-notes/rl-1803.xml @@ -24,12 +24,16 @@ has the following highlights: have been made to the infrastructure involved: + libmysql has been deprecated, please use mysql.connector-c instead, a compatibility passthru has been added to the MySQL packages. + + The mysql57 package has a new static output containing the static libraries including libmysqld.a + From 6f4cfe0570e1a72f4731a82ff0d98018150db962 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Thu, 7 Dec 2017 09:54:58 -0500 Subject: [PATCH 091/331] gawk: Enable cross-compilation --- pkgs/tools/text/gawk/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index 65d0a1e4c00..6783158ca77 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -41,6 +41,8 @@ stdenv.mkDerivation rec { (if interactive then "--with-readline=${readline.dev}" else "--without-readline") ]; + makeFlags = "AR=${stdenv.cc.targetPrefix}ar"; + inherit doCheck; postInstall = '' From 946c1b26fa76503110c866f5469ec71b19a509bb Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sat, 9 Dec 2017 14:48:13 -0500 Subject: [PATCH 092/331] diffutils: Enable cross-compilation --- pkgs/tools/text/diffutils/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix index cd64bd1566b..60628e2139c 100644 --- a/pkgs/tools/text/diffutils/default.nix +++ b/pkgs/tools/text/diffutils/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { configureFlags = # "pr" need not be on the PATH as a run-time dep, so we need to tell # configure where it is. Covers the cross and native case alike. - stdenv.lib.optional (coreutils != null) "PR_PROGRAM=${coreutils}/bin/pr"; + stdenv.lib.optional (coreutils != null) "PR_PROGRAM=${coreutils}/bin/pr" + ++ stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "gl_cv_func_getopt_gnu=yes"; meta = { homepage = http://www.gnu.org/software/diffutils/diffutils.html; From e73d805aa9f7349cc32d5a89c20efb7a3f86eba4 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 14 Dec 2017 14:09:01 -0500 Subject: [PATCH 093/331] libelf: Fix cross compilation There is an upstream bug where it is assumed that if host != build, host doesn't support shared libraries. We override that overly conservative check. See http://lists.uclibc.org/pipermail/uclibc-cvs/2005-August/019383.html Also clean up some comments. --- pkgs/development/libraries/libelf/default.nix | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libelf/default.nix b/pkgs/development/libraries/libelf/default.nix index bd0d23bd0cd..bb1dbe51765 100644 --- a/pkgs/development/libraries/libelf/default.nix +++ b/pkgs/development/libraries/libelf/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl -, gettext, glibc +{ stdenv +, fetchurl, autoreconfHook, gettext , buildPlatform, hostPlatform }: @@ -17,12 +17,20 @@ stdenv.mkDerivation rec { doCheck = true; - # Libelf's custom NLS macros fail to determine the catalog file extension on - # Darwin, so disable NLS for now. - # FIXME: Eventually make Gettext a build input on all platforms. - configureFlags = stdenv.lib.optional hostPlatform.isDarwin "--disable-nls"; + configureFlags = [] + # Configure check for dynamic lib support is broken, see + # http://lists.uclibc.org/pipermail/uclibc-cvs/2005-August/019383.html + ++ stdenv.lib.optional (hostPlatform != buildPlatform) "mr_cv_target_elf=yes" + # Libelf's custom NLS macros fail to determine the catalog file extension + # on Darwin, so disable NLS for now. + ++ stdenv.lib.optional hostPlatform.isDarwin "--disable-nls"; - nativeBuildInputs = [ gettext ]; + nativeBuildInputs = [ gettext ] + # Need to regenerate configure script with newer version in order to pass + # "mr_cv_target_elf=yes", but `autoreconfHook` brings in `makeWrapper` + # which doesn't work with the bootstrapTools bash, so can only do this + # for cross builds when `stdenv.shell` is a newer bash. + ++ stdenv.lib.optional (hostPlatform != buildPlatform) autoreconfHook; meta = { description = "ELF object file access library"; From 5dea877368227d818cccab3a1380322a2ba83aa0 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 25 Dec 2017 04:45:05 -0500 Subject: [PATCH 094/331] kmime, colord-kde: ki18n should be *run*-time dependency It is gettext-based, but is a library for run time, relying on the normal gettext tools at build time. --- pkgs/applications/kde/kmime.nix | 4 ++-- pkgs/tools/misc/colord-kde/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/kde/kmime.nix b/pkgs/applications/kde/kmime.nix index b18a3f7fdc1..4523a69fc1b 100644 --- a/pkgs/applications/kde/kmime.nix +++ b/pkgs/applications/kde/kmime.nix @@ -10,7 +10,7 @@ mkDerivation { license = [ lib.licenses.lgpl21 ]; maintainers = kdepimTeam; }; - nativeBuildInputs = [ extra-cmake-modules ki18n ]; - buildInputs = [ kcodecs qtbase ]; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kcodecs ki18n qtbase ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/tools/misc/colord-kde/default.nix b/pkgs/tools/misc/colord-kde/default.nix index a91cd627bda..12821cf864c 100644 --- a/pkgs/tools/misc/colord-kde/default.nix +++ b/pkgs/tools/misc/colord-kde/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { sha256 = "0brdnpflm95vf4l41clrqxwvjrdwhs859n7401wxcykkmw4m0m3c"; }; - nativeBuildInputs = [ extra-cmake-modules ki18n ]; + nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kconfig kconfigwidgets kcoreaddons kdbusaddons kiconthemes - kcmutils kio knotifications plasma-framework kwidgetsaddons + kcmutils ki18n kio knotifications plasma-framework kwidgetsaddons kwindowsystem kitemviews lcms2 libXrandr qtx11extras ]; From c15c44923661245b5ca0b5fd74622d5c95beacac Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Thu, 26 Oct 2017 16:00:37 -0400 Subject: [PATCH 095/331] binutils: Always search DT_RPATH --- .../tools/misc/binutils/always-search-rpath.patch | 14 ++++++++++++++ pkgs/development/tools/misc/binutils/default.nix | 8 ++++++++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/tools/misc/binutils/always-search-rpath.patch diff --git a/pkgs/development/tools/misc/binutils/always-search-rpath.patch b/pkgs/development/tools/misc/binutils/always-search-rpath.patch new file mode 100644 index 00000000000..2e9956e6b6e --- /dev/null +++ b/pkgs/development/tools/misc/binutils/always-search-rpath.patch @@ -0,0 +1,14 @@ +diff --git a/ld/genscripts.sh b/ld/genscripts.sh +index b6940d376d..0feb1adfd0 100755 +--- a/ld/genscripts.sh ++++ b/ld/genscripts.sh +@@ -125,6 +125,9 @@ if test "x$NATIVE" = "xyes" ; then + USE_LIBPATH=yes + fi + ++# TODO: why is this needed? ++USE_LIBPATH=yes ++ + # Set the library search path, for libraries named by -lfoo. + # If LIB_PATH is defined (e.g., by Makefile) and non-empty, it is used. + # Otherwise, the default is set here. diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 7628e37ae1c..1b016652699 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -53,6 +53,14 @@ stdenv.mkDerivation rec { # elf32-littlearm-vxworks in favor of the first. # https://github.com/NixOS/nixpkgs/pull/30484#issuecomment-345472766 ./disambiguate-arm-targets.patch + + # For some reason bfd ld doesn't search DT_RPATH when cross-compiling. It's + # not clear why this behavior was decided upon but it has the unfortunate + # consequence that the linker will fail to find transitive dependencies of + # shared objects when cross-compiling. Consequently, we are forced to + # override this behavior, forcing ld to search DT_RPATH even when + # cross-compiling. + ./always-search-rpath.patch ]; outputs = [ "out" "info" "man" ]; From 1cde06acf691316a59ad30b207cbd68c64cbc0fa Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 22 Dec 2017 16:17:15 -0500 Subject: [PATCH 096/331] stdenv cross adapter: Get rid of extra propagatation of buildInputs Binutils is patched so we don't rely on `--rpath-link`. --- pkgs/stdenv/adapters.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 1a55b06ef36..f7d2c49a66d 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -74,8 +74,7 @@ rec { }; in stdenv // { mkDerivation = - { buildInputs ? [], nativeBuildInputs ? [] - , propagatedBuildInputs ? [], propagatedNativeBuildInputs ? [] + { nativeBuildInputs ? [] , selfNativeBuildInput ? args.crossAttrs.selfNativeBuildInput or false , ... } @ args: @@ -98,14 +97,6 @@ rec { ++ stdenv.lib.optional hostPlatform.isAarch64 pkgs.updateAutotoolsGnuConfigScriptsHook ; - # Cross-linking dynamic libraries, every buildInput should - # be propagated because ld needs the -rpath-link to find - # any library needed to link the program dynamically at - # loader time. ld(1) explains it. - buildInputs = []; - propagatedBuildInputs = propagatedBuildInputs ++ buildInputs; - propagatedNativeBuildInputs = propagatedNativeBuildInputs; - crossConfig = hostPlatform.config; } // args.crossAttrs or {}); }; From cc44e04472bf8d0774e09a6cc4bd47175e531b8e Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 27 Nov 2017 00:12:13 -0500 Subject: [PATCH 097/331] bintools-wrapper: Define fallback default emulation This ensures we by-default cross-compile to the intended platform. --- pkgs/build-support/bintools-wrapper/default.nix | 14 ++++++++++++++ pkgs/build-support/bintools-wrapper/ld-wrapper.sh | 5 +++++ 2 files changed, 19 insertions(+) diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 0dcae204824..57859b2f371 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -164,6 +164,20 @@ stdenv.mkDerivation { set +u ''; + emulation = let + fmt = + /**/ if targetPlatform.isDarwin then "mach-o" + else if targetPlatform.isWindows then "pe" + else "elf" + toString targetPlatform.parsed.cpu.bits; + endianPrefix = if targetPlatform.isBigEndian then "big" else "little"; + arch = + /**/ if targetPlatform.isAarch64 then endianPrefix + "aarch64" + else if targetPlatform.isArm then endianPrefix + "arm" + else if targetPlatform.isx86_64 then "x86-64" + else if targetPlatform.isi686 then "i386" + else throw "unknown emulation for platform: " + targetPlatform.config; + in targetPlatform.platform.bfdEmulation or (fmt + "-" + arch); + propagatedBuildInputs = extraPackages; setupHook = ./setup-hook.sh; diff --git a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh index 136621d27af..991ed0fe263 100644 --- a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh @@ -67,6 +67,11 @@ fi extraAfter+=($NIX_@infixSalt@_LDFLAGS_AFTER) +# Specify the target emulation if nothing is passed in ("-m" overrides this +# environment variable). Ensures we never blindly fallback on targeting the host +# platform. +: ${LDEMULATION:=@emulation@} + # Three tasks: # # 1. Find all -L... switches for rpath From 61bb8115c5b3f0919883f86d21495b27d84041ff Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Wed, 1 Nov 2017 14:38:45 +0000 Subject: [PATCH 098/331] ibus: 1.5.16 -> 1.5.17, fix, back to single output This fixes ibus-setup. * Update cldrEmojiAnnotation: 31.0.1_1 -> 31.90.0_1 * Move ibus-setup back to out, and use a smaller Python 3 at runtime than doesn't pull in some dev paths * Build from Git * Use autoreconfHook so that we don't have to patch ./configure scripts when we could just generate them correctly in the first place * Drop patch that removes IBUS_* environment variables from ibus-setup wrapper: unsetting them breaks ibus-setup * Add withWayland option (building with Wayland requires libxcbcommon package, previously wayland was included into buildInputs w/o libxcbcommon and respective configure flag) * Add license (LGPLv2.1) Relies on two other commits in this branch that add GI_TYPELIB_PATH discovery and fix gconf Python scripts. --- pkgs/tools/inputmethods/ibus/default.nix | 181 ++++++++++++----------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 96 insertions(+), 87 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 3fd29d65f36..f71a21b914f 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -1,129 +1,138 @@ -{ stdenv, fetchurl, wrapGAppsHook -, intltool, isocodes, pkgconfig -, python3 -, gtk2, gtk3, atk, dconf, glib, json_glib -, dbus, libnotify, gobjectIntrospection, wayland -}: +{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, gconf, intltool, makeWrapper, pkgconfig +, vala, wrapGAppsHook, atk, dbus, dconf ? null, glib, gdk_pixbuf, gobjectIntrospection, gtk2 +, gtk3, gtk_doc, isocodes, python3, json_glib, libnotify ? null, enablePythonLibrary ? true +, enableUI ? true, withWayland ? false, libxkbcommon ? null, wayland ? null }: + +assert withWayland -> wayland != null && libxkbcommon != null; + +with stdenv.lib; let - emojiData = let - srcs = { - data = fetchurl { - url = "http://unicode.org/Public/emoji/5.0/emoji-data.txt"; - sha256 = "11jfz5rrvyc2ixliqfcjgmch4cn9mfy0x96qnpfcyz5fy1jvfyxf"; - }; - sequences = fetchurl { - url = "http://unicode.org/Public/emoji/5.0/emoji-sequences.txt"; - sha256 = "09bii7f5mmladg0kl3n80fa9qaix6bv5ylm92x52j7wygzv0szb1"; - }; - variation-sequences = fetchurl { - url = "http://unicode.org/Public/emoji/5.0/emoji-variation-sequences.txt"; - sha256 = "1wlg4gbq7spmpppjfy5zdl82sj0hc836p8gljgfrjmwsjgybq286"; - }; - zwj-sequences = fetchurl { - url = "http://unicode.org/Public/emoji/5.0/emoji-zwj-sequences.txt"; - sha256 = "16gvzv76mjv9g81lm1m6cr3rpfqyn2k4hb9a62xd329252dhl25q"; - }; - test = fetchurl { - url = "http://unicode.org/Public/emoji/5.0/emoji-test.txt"; - sha256 = "031qk2v8xdnba7hfinmgrmpglc9l8ll2hds6mw885p0hngdb3dgw"; - }; + emojiSrcs = { + data = fetchurl { + url = "http://unicode.org/Public/emoji/5.0/emoji-data.txt"; + sha256 = "11jfz5rrvyc2ixliqfcjgmch4cn9mfy0x96qnpfcyz5fy1jvfyxf"; }; - in stdenv.mkDerivation { + sequences = fetchurl { + url = "http://unicode.org/Public/emoji/5.0/emoji-sequences.txt"; + sha256 = "09bii7f5mmladg0kl3n80fa9qaix6bv5ylm92x52j7wygzv0szb1"; + }; + variation-sequences = fetchurl { + url = "http://unicode.org/Public/emoji/5.0/emoji-variation-sequences.txt"; + sha256 = "1wlg4gbq7spmpppjfy5zdl82sj0hc836p8gljgfrjmwsjgybq286"; + }; + zwj-sequences = fetchurl { + url = "http://unicode.org/Public/emoji/5.0/emoji-zwj-sequences.txt"; + sha256 = "16gvzv76mjv9g81lm1m6cr3rpfqyn2k4hb9a62xd329252dhl25q"; + }; + test = fetchurl { + url = "http://unicode.org/Public/emoji/5.0/emoji-test.txt"; + sha256 = "031qk2v8xdnba7hfinmgrmpglc9l8ll2hds6mw885p0hngdb3dgw"; + }; + }; + emojiData = stdenv.mkDerivation { name = "emoji-data-5.0"; unpackPhase = ":"; - dontBuild = true; - installPhase = with stdenv.lib; '' + installPhase = '' mkdir $out - ${builtins.toString (flip mapAttrsToList srcs (k: v: '' - cp ${v} $out/emoji-${k}.txt - ''))} + ${builtins.toString (flip mapAttrsToList emojiSrcs (k: v: "cp ${v} $out/emoji-${k}.txt;"))} ''; }; cldrEmojiAnnotation = stdenv.mkDerivation rec { name = "cldr-emoji-annotation-${version}"; - version = "31.0.1_1"; - src = fetchurl { - url = "https://github.com/fujiwarat/cldr-emoji-annotation/releases/download/${version}/${name}.tar.gz"; - sha256 = "1a3qzsab7vzjqpdialp1g8ppr21x05v0ph8ngyq9pyjkx4vzcdi7"; + version = "31.90.0_1"; + src = fetchFromGitHub { + owner = "fujiwarat"; + repo = "cldr-emoji-annotation"; + rev = version; + sha256 = "1vsj32bg8ab4d80rz0fxy6sj2lv31inzyjnddjm079bnvlaf2kih"; }; + nativeBuildInputs = [ autoreconfHook ]; }; - pyEnv = python3.buildEnv.override { - extraLibs = [ python3.pkgs.pygobject3 ]; - + python3Runtime = python3.withPackages (ps: with ps; [ pygobject3 ]); + python3BuildEnv = python3.buildEnv.override { # ImportError: No module named site postBuild = '' - makeWrapper '${glib.dev}/bin/glib-genmarshal' "$out"/bin/glib-genmarshal \ - --unset PYTHONPATH + makeWrapper ${glib.dev}/bin/gdbus-codegen $out/bin/gdbus-codegen --unset PYTHONPATH + makeWrapper ${glib.dev}/bin/glib-genmarshal $out/bin/glib-genmarshal --unset PYTHONPATH + makeWrapper ${glib.dev}/bin/glib-mkenums $out/bin/glib-mkenums --unset PYTHONPATH ''; }; -in stdenv.mkDerivation rec { - name = "ibus-${version}"; - version = "1.5.16"; +in - src = fetchurl { - url = "https://github.com/ibus/ibus/releases/download/${version}/${name}.tar.gz"; - sha256 = "07py16jb81kd7vkqhcia9cb2avsbg5jswp2kzf0k4bprwkxppd9n"; +stdenv.mkDerivation rec { + name = "ibus-${version}"; + version = "1.5.17"; + + src = fetchFromGitHub { + owner = "ibus"; + repo = "ibus"; + rev = version; + sha256 = "09mrj9d8qpl9cbylg1zx8c3ymc5gdy4jrf6zs125wjz0b574g5av"; }; postPatch = '' - # These paths will be set in the wrapper. - sed -e "/export IBUS_DATAROOTDIR/ s/^.*$//" \ - -e "/export IBUS_LIBEXECDIR/ s/^.*$//" \ - -e "/export IBUS_LOCALEDIR/ s/^.*$//" \ - -e "/export IBUS_PREFIX/ s/^.*$//" \ - -i "setup/ibus-setup.in" + substituteInPlace setup/ibus-setup.in --subst-var-by PYTHON ${python3Runtime.interpreter} + substituteInPlace data/dconf/Makefile.am --replace "dconf update" true + substituteInPlace configure.ac --replace '$python2dir/ibus' $out/${python3.sitePackages}/ibus + echo \#!${stdenv.shell} > data/dconf/make-dconf-override-db.sh + cp ${gtk_doc}/share/gtk-doc/data/gtk-doc.make . ''; + preAutoreconf = "touch ChangeLog"; + preConfigure = "intltoolize"; + configureFlags = [ "--disable-gconf" - "--enable-dconf" "--disable-memconf" - "--enable-ui" - "--enable-python-library" + (enableFeature (dconf != null) "dconf") + (enableFeature (libnotify != null) "libnotify") + (enableFeature withWayland "wayland") + (enableFeature enablePythonLibrary "python-library") + (enableFeature enableUI "ui") "--with-unicode-emoji-dir=${emojiData}" "--with-emoji-annotation-dir=${cldrEmojiAnnotation}/share/unicode/cldr/common/annotations" ]; - buildInputs = [ - pyEnv - intltool isocodes pkgconfig - gtk2 gtk3 dconf - json_glib - dbus libnotify gobjectIntrospection wayland + nativeBuildInputs = [ + autoreconfHook + gconf + gtk_doc + intltool + makeWrapper + pkgconfig + python3BuildEnv + vala + wrapGAppsHook ]; propagatedBuildInputs = [ glib ]; - nativeBuildInputs = [ wrapGAppsHook ]; - - outputs = [ "out" "dev" ]; + buildInputs = [ + dbus + dconf + gdk_pixbuf + gobjectIntrospection + gtk2 + gtk3 + isocodes + json_glib + libnotify + ] ++ optionals withWayland [ + libxkbcommon + wayland + ]; enableParallelBuilding = true; - preConfigure = '' - # Fix hard-coded installation paths, so make does not try to overwrite our - # Python installation. - sed -e "/py2overridesdir=/ s|=.*$|=$out/lib/${python3.libPrefix}|" \ - -e "/pyoverridesdir=/ s|=.*$|=$out/lib/${python3.libPrefix}|" \ - -e "/PYTHON2_LIBDIR/ s|=.*|=$out/lib/${python3.libPrefix}|" \ - -i configure - - # Don't try to generate a system-wide dconf database; it wouldn't work. - substituteInPlace data/dconf/Makefile.in --replace "dconf update" "echo" - ''; - doInstallCheck = true; installCheckPhase = "$out/bin/ibus version"; - postInstall = '' - moveToOutput "bin/ibus-setup" "$dev" - ''; - - meta = with stdenv.lib; { + meta = { homepage = https://github.com/ibus/ibus; - description = "Intelligent Input Bus for Linux / Unix OS"; + description = "Intelligent Input Bus, input method framework"; + license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = [ maintainers.ttuegel ]; + maintainers = with maintainers; [ ttuegel yegortimoshenko ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e134aa5c61f..20ac7752af3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1542,7 +1542,7 @@ with pkgs; skk-dicts = callPackage ../tools/inputmethods/skk/skk-dicts { }; ibus = callPackage ../tools/inputmethods/ibus { - inherit (gnome3) dconf glib; + inherit (gnome3) dconf gconf glib; }; ibus-qt = callPackage ../tools/inputmethods/ibus/ibus-qt.nix { }; From 0dff26daa4aa93397eaf1ef0407070efe9ecb8ad Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Mon, 18 Dec 2017 02:30:53 +0000 Subject: [PATCH 099/331] gobjectIntrospection: add giDiscoverSelf preFixupPhase hook Some derivations need to discover their own typelibs. giDiscoverSelf runs as a preFixupPhase and populates GI_TYPELIB_PATH with an entry pointing to $prefix/lib/girepository-1.0, if it exists. --- .../libraries/gobject-introspection/setup-hook.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gobject-introspection/setup-hook.sh b/pkgs/development/libraries/gobject-introspection/setup-hook.sh index 583d8475ec3..2aa08d1e8a5 100644 --- a/pkgs/development/libraries/gobject-introspection/setup-hook.sh +++ b/pkgs/development/libraries/gobject-introspection/setup-hook.sh @@ -1,5 +1,4 @@ make_gobject_introspection_find_gir_files() { - # required for .typelib files, eg mypaint git version if [ -d "$1/lib/girepository-1.0" ]; then addToSearchPath GI_TYPELIB_PATH $1/lib/girepository-1.0 @@ -13,9 +12,16 @@ make_gobject_introspection_find_gir_files() { envHooks+=(make_gobject_introspection_find_gir_files) +giDiscoverSelf() { + if [ -d "$prefix/lib/girepository-1.0" ]; then + addToSearchPath GI_TYPELIB_PATH $prefix/lib/girepository-1.0 + fi +} + +preFixupHooks+=(giDiscoverSelf) + _multioutMoveGlibGir() { moveToOutput share/gir-1.0 "${!outputDev}" } preFixupHooks+=(_multioutMoveGlibGir) - From 2ec466e6d9043b7a17cb51e45ec14d43c01bf171 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:21:07 +0100 Subject: [PATCH 100/331] python: absl-py: 0.1.5 -> 0.1.7 --- pkgs/development/python-modules/absl-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix index 1c9fa3d786f..ca43e122a30 100644 --- a/pkgs/development/python-modules/absl-py/default.nix +++ b/pkgs/development/python-modules/absl-py/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "absl-py"; - version = "0.1.5"; + version = "0.1.7"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "94943ed0cd77077fe2d18e79b2f28d3e92f585f7d1c6edc75e640121f3c5d580"; + sha256 = "4ea22ae860f3a556511291e7f1284942199c81377f47ec4248163defb1b9e6ee"; }; propagatedBuildInputs = [ six ]; From 15ceedc5727518e85cf92adab33d6e2d4d369318 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:21:10 +0100 Subject: [PATCH 101/331] python: aenum: 2.0.8 -> 2.0.9 --- pkgs/development/python-modules/aenum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix index 3aa03aaa599..45e7f8915ac 100644 --- a/pkgs/development/python-modules/aenum/default.nix +++ b/pkgs/development/python-modules/aenum/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "aenum"; - version = "2.0.8"; + version = "2.0.9"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "3209fa41b8c41345442e8d9b5158a57d3e96d84c3d5ebbe8e521e1e2eff1598d"; + sha256 = "d98bc55136d696fcf323760c3db0de489da9e41fd51283fa6f90205deb85bf6a"; }; doCheck = !isPy3k; From 195a00e7a3d3b4b13214d7c52941b52c2c2adcb9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:21:14 +0100 Subject: [PATCH 102/331] python: aiohttp: 2.3.3 -> 2.3.7 --- pkgs/development/python-modules/aiohttp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 53443b3b32f..44e19072057 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "aiohttp"; - version = "2.3.3"; + version = "2.3.7"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0a2e33e90560dacb819b095b9d9611597925d75d1b93dd9490055d3826d98a82"; + sha256 = "fe294df38e9c67374263d783a7a29c79372030f5962bd5734fa51c6f4bbfee3b"; }; disabled = pythonOlder "3.4"; From 1dd3e8125dfaa1abb4584beb301895e827f14a7b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:21:18 +0100 Subject: [PATCH 103/331] python: APScheduler: 3.4.0 -> 3.5.0 --- pkgs/development/python-modules/APScheduler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/APScheduler/default.nix b/pkgs/development/python-modules/APScheduler/default.nix index 5acb6cd5785..931239c0987 100644 --- a/pkgs/development/python-modules/APScheduler/default.nix +++ b/pkgs/development/python-modules/APScheduler/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { pname = "APScheduler"; - version = "3.4.0"; + version = "3.5.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "b51118a8ed014104f7e440456dcbd90f2015aea7bcc34c57e307fb34bc746316"; + sha256 = "1ce44d5132b7951f4614067c88ca34cfee1ff97f6f0892581d79b636d83eab89"; }; buildInputs = [ From e09ccfa379cf70d493aeda389e16eb529f4c742d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:21:25 +0100 Subject: [PATCH 104/331] python: asgiref: 1.1.2 -> 2.0.1 --- pkgs/development/python-modules/asgiref/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asgiref/default.nix b/pkgs/development/python-modules/asgiref/default.nix index 1b5112fb335..fedd4b81a9d 100644 --- a/pkgs/development/python-modules/asgiref/default.nix +++ b/pkgs/development/python-modules/asgiref/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchurl, six }: buildPythonPackage rec { - version = "1.1.2"; + version = "2.0.1"; pname = "asgiref"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/a/asgiref/${name}.tar.gz"; - sha256 = "8b46c3d6e2ad354d9da3cfb9873f9bd46fe1b768fbc11065275ba5430a46700c"; + sha256 = "c3d70c473a2b7e525e18e68504630943e107f5b32f440c00c8543f94f565c855"; }; propagatedBuildInputs = [ six ]; From fb60a2fba5697f11893db99f37531f1ad67962ab Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:21:29 +0100 Subject: [PATCH 105/331] python: asn1crypto: 0.23.0 -> 0.24.0 --- pkgs/development/python-modules/asn1crypto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asn1crypto/default.nix b/pkgs/development/python-modules/asn1crypto/default.nix index eedaac50fac..5f512fcd6f8 100644 --- a/pkgs/development/python-modules/asn1crypto/default.nix +++ b/pkgs/development/python-modules/asn1crypto/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "asn1crypto"; - version = "0.23.0"; + version = "0.24.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0874981329cfebb366d6584c3d16e913f2a0eb026c9463efcc4aaf42a9d94d70"; + sha256 = "9d5c20441baf0cb60a4ac34cc447c6c189024b6b4c6cd7877034f4965c464e49"; }; # No tests included From db3a07fbda41078ffafb7bc748f3e55b49a4dc17 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:21:32 +0100 Subject: [PATCH 106/331] python: astor: 0.5 -> 0.6.2 --- pkgs/development/python-modules/astor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/astor/default.nix b/pkgs/development/python-modules/astor/default.nix index 965bf37d520..6f50b7157e5 100644 --- a/pkgs/development/python-modules/astor/default.nix +++ b/pkgs/development/python-modules/astor/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "astor"; - version = "0.5"; + version = "0.6.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1fdafq5hkis1fxqlmhw0sn44zp2ar46nxhbc22cvwg7hsd8z5gsa"; + sha256 = "ff6d2e2962d834acb125cc4dcc80c54a8c17c253f4cc9d9c43b5102a560bb75d"; }; meta = with stdenv.lib; { From b77f35136513d56689b0d27fdd6b51e0f95363a0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:21:36 +0100 Subject: [PATCH 107/331] python: astroid: 1.5.3 -> 1.6.0 --- pkgs/development/python-modules/astroid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index 86a0daa0456..862157f686a 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "astroid"; - version = "1.5.3"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "492c2a2044adbf6a84a671b7522e9295ad2f6a7c781b899014308db25312dd35"; + sha256 = "71dadba2110008e2c03f9fde662ddd2053db3c0489d0e03c94e828a0399edd4f"; }; propagatedBuildInputs = [ logilab_common six lazy-object-proxy wrapt ] From 7812f83a2db7a1365fe0417a83567fe98b96f084 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:21:40 +0100 Subject: [PATCH 108/331] python: astropy: 2.0.2 -> 2.0.3 --- pkgs/development/python-modules/astropy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index 12f00be0cb7..514762b7a37 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "astropy"; - version = "2.0.2"; + version = "2.0.3"; name = "${pname}-${version}"; doCheck = false; #Some tests are failing. More importantly setup.py hangs on completion. Needs fixing with a proper shellhook. src = fetchPypi { inherit pname version; - sha256 = "4544a422b1173d79b2d65ba74c627f04a5fd8530d97fb604752d657d754e103d"; + sha256 = "fdfc0248f6250798ed6d1327be609cb901db89ae01fc768cfbc9e263bdf56f4f"; }; propagatedBuildInputs = [ pytest numpy ]; # yes it really has pytest in install_requires From 36b8acaf1f3f149819a50d0fc0dff37cbb8d5768 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:21:43 +0100 Subject: [PATCH 109/331] python: attrs: 17.2.0 -> 17.4.0 --- pkgs/development/python-modules/attrs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/attrs/default.nix b/pkgs/development/python-modules/attrs/default.nix index e58bf3846dc..c67ad6ece88 100644 --- a/pkgs/development/python-modules/attrs/default.nix +++ b/pkgs/development/python-modules/attrs/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "attrs"; - version = "17.2.0"; + version = "17.4.0"; src = fetchPypi { inherit pname version; - sha256 = "04gx08ikpk26wnq22f7l42gapcvk8iz1512r927k6sadz6cinkax"; + sha256 = "1c7960ccfd6a005cd9f7ba884e6316b5e430a3f1a6c37c5f87d8b43f83b54ec9"; }; # macOS needs clang for testing From 5ce2e95c987a05a49a7b47d260f8d4f6a8a2b358 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:21:47 +0100 Subject: [PATCH 110/331] python: bokeh: 0.12.10 -> 0.12.13 --- pkgs/development/python-modules/bokeh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 244ee43d0aa..e3c77fa65cf 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -34,11 +34,11 @@ buildPythonPackage rec { pname = "bokeh"; name = "${pname}${version}"; - version = "0.12.10"; + version = "0.12.13"; src = fetchPypi { inherit pname version; - sha256 = "6465fae82e94223f16584645b38d34a73d95712870f29c0244649c2cbf2c8393"; + sha256 = "6e28cbfd88de0c459435278b75f9982591ec0aaa3d37a195052645e1c62e89e3"; }; disabled = isPyPy; From 2678ce77f04f4c946b5a1950f1de0a94750900fd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:21:51 +0100 Subject: [PATCH 111/331] python: botocore: 1.8.10 -> 1.8.21 --- pkgs/development/python-modules/botocore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index fe3fe06f4e7..f8dd1649949 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "botocore"; - version = "1.8.10"; + version = "1.8.21"; src = fetchPypi { inherit pname version; - sha256 = "16dznd0mxxs8imsl228vx5s9bz9v7ggajs496jy21n5a19cadkch"; + sha256 = "e4513a02f68e7efd7494ee56db201d87620218ca879aae361abbb71bcde3aa5f"; }; propagatedBuildInputs = [ From 466dad658d86622c236bd21dba8e22e798ef53e9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:21:54 +0100 Subject: [PATCH 112/331] python: credstash: 1.13.4 -> 1.14.0 --- pkgs/development/python-modules/credstash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/credstash/default.nix b/pkgs/development/python-modules/credstash/default.nix index 810a6a7bd8e..6a9e1240b86 100644 --- a/pkgs/development/python-modules/credstash/default.nix +++ b/pkgs/development/python-modules/credstash/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "credstash"; - version = "1.13.4"; + version = "1.14.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "676cc03a6143dec260c78aeef09d08a64faf27c411f8a94f6d9338e985879f81"; + sha256 = "718b337f7a6fa001e014386071f05c59900525d0507009126d2fe8d75fe0761d"; }; propagatedBuildInputs = [ cryptography boto3 pyyaml docutils ]; From 0978a414674b9ef5a9d765d11bb18bd3740d6104 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:21:58 +0100 Subject: [PATCH 113/331] python: csscompressor: 0.9.4 -> 0.9.5 --- pkgs/development/python-modules/csscompressor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/csscompressor/default.nix b/pkgs/development/python-modules/csscompressor/default.nix index a9aad8d40e5..8d0e7a58e76 100644 --- a/pkgs/development/python-modules/csscompressor/default.nix +++ b/pkgs/development/python-modules/csscompressor/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "csscompressor"; - version = "0.9.4"; + version = "0.9.5"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0e12f125b88379d7b680636d94a3c8fa14bed1de2358f7f9a9e6749e222cff3b"; + sha256 = "afa22badbcf3120a4f392e4d22f9fff485c044a1feda4a950ecc5eba9dd31a05"; }; doCheck = false; # No tests From f5196cce425c5aee00ef2d7cf6ca0602640d66c5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:22:02 +0100 Subject: [PATCH 114/331] python: cx_Freeze: 5.0.2 -> 5.1.1 --- pkgs/development/python-modules/cx_freeze/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx_freeze/default.nix index 3d937debe58..69a5e8c11d4 100644 --- a/pkgs/development/python-modules/cx_freeze/default.nix +++ b/pkgs/development/python-modules/cx_freeze/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "cx_Freeze"; - version = "5.0.2"; + version = "5.1.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0zbx9j5z5l06bvwvlqvvn7h9dm7zjcjgxm7agbb625nymkq6cd15"; + sha256 = "2eadddde670f5c5f6cf88638a0ac4e5d5fe181292a31063275fa56c7bf22426b"; }; propagatedBuildInputs = [ ncurses ]; From e06dac7f2a3a1432434d828e8c8c35fd3792e858 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:22:05 +0100 Subject: [PATCH 115/331] python: cytoolz: 0.8.2 -> 0.9.0 --- pkgs/development/python-modules/cytoolz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cytoolz/default.nix b/pkgs/development/python-modules/cytoolz/default.nix index dcb4e9474c3..83b1c893719 100644 --- a/pkgs/development/python-modules/cytoolz/default.nix +++ b/pkgs/development/python-modules/cytoolz/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "cytoolz"; - version = "0.8.2"; + version = "0.9.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "476a2ad176de5eaef80499b7b43d4f72ba6d23df33d349088dae315e9b31c552"; + sha256 = "5ebb55855a8bb7800afa58e52408763935527e0305f35600c71b43c86013dec2"; }; # Extension types From 6521f19a43cd8f408a974a9d2921af0d3f58896b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:22:09 +0100 Subject: [PATCH 116/331] python: dask: 0.15.4 -> 0.16.0 --- pkgs/development/python-modules/dask/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 70647b6377f..c3b45dc3c86 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "dask"; - version = "0.15.4"; + version = "0.16.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "cb93b8260f5f854ccf26b52bdc700600a08e6b7527085c7b7d63c04238bab9ea"; + sha256 = "40d150b73e3366c9521e9dde206046a66906330074f87be901b1e1013ce6cb73"; }; checkInputs = [ pytest ]; From a2426f00137d0c843b2faaa20600713f7bbee418 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:22:12 +0100 Subject: [PATCH 117/331] python: distro: 1.0.4 -> 1.2.0 --- pkgs/development/python-modules/distro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix index 49349839331..36264921f64 100644 --- a/pkgs/development/python-modules/distro/default.nix +++ b/pkgs/development/python-modules/distro/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "distro"; - version = "1.0.4"; + version = "1.2.0"; buildInputs = [ pytest pytestcov tox]; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "9b000b0d637bb0cbd130a7a4835681e6993e309a85564dfea9d884825fe46954"; + sha256 = "d94370e43b676ac44fbe1ab68ca903a6147eaba3a9e8eff85b2c05556a455b76"; }; meta = with stdenv.lib; { From db39391c018750046d1117e7cce63fb7e8743bc0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:22:16 +0100 Subject: [PATCH 118/331] python: django-jinja: 2.2.2 -> 2.4.1 --- pkgs/development/python-modules/django-jinja2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-jinja2/default.nix b/pkgs/development/python-modules/django-jinja2/default.nix index aabfecfcacc..b8b632e1a18 100644 --- a/pkgs/development/python-modules/django-jinja2/default.nix +++ b/pkgs/development/python-modules/django-jinja2/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "django-jinja"; name = "${pname}-${version}"; - version = "2.2.2"; + version = "2.4.1"; meta = { description = "Simple and nonobstructive jinja2 integration with Django"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "099b99iprkvlsndrjmw4v3i3i60i9gm1aq5r88z15r7vgmv6sigj"; + sha256 = "8a49d73de616a12075eee14c6d3bbab936261a463457d40348d8b8e2995cfbed"; }; buildInputs = [ django pytz tox ]; From 68436b4597476daa80b7427df7fd13303d3dbbc9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:22:20 +0100 Subject: [PATCH 119/331] python: djangorestframework: 3.7.3 -> 3.7.7 --- .../python-modules/djangorestframework/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix index e2c8acd1a0b..b11847beaa9 100644 --- a/pkgs/development/python-modules/djangorestframework/default.nix +++ b/pkgs/development/python-modules/djangorestframework/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchurl, django }: buildPythonPackage rec { - version = "3.7.3"; + version = "3.7.7"; pname = "djangorestframework"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/d/djangorestframework/${name}.tar.gz"; - sha256 = "067960e5e9e5586d3b2d53a1d626c4800dc33cd8309487d404fc63355674556f"; + sha256 = "9f9e94e8d22b100ed3a43cee8c47a7ff7b185e778a1f2da9ec5c73fc4e081b87"; }; # Test settings are missing From cb5a82020f439f0d21ddea68004462fae0831db2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:22:24 +0100 Subject: [PATCH 120/331] python: docker: 2.5.1 -> 2.7.0 --- pkgs/development/python-modules/docker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index 88d85dad91a..4ce013ac797 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -3,13 +3,13 @@ , ipaddress, backports_ssl_match_hostname, docker_pycreds }: buildPythonPackage rec { - version = "2.5.1"; + version = "2.7.0"; pname = "docker"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/d/docker/${name}.tar.gz"; - sha256 = "b876e6909d8d2360e0540364c3a952a62847137f4674f2439320ede16d6db880"; + sha256 = "144248308e8ea31c4863c6d74e1b55daf97cc190b61d0fe7b7313ab920d6a76c"; }; propagatedBuildInputs = [ From b6d84fa6ab412b59aee1295fe7357f4f1b7bf26f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:22:27 +0100 Subject: [PATCH 121/331] python: docker-compose: 1.15.0 -> 1.18.0 --- pkgs/development/python-modules/docker_compose/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/docker_compose/default.nix b/pkgs/development/python-modules/docker_compose/default.nix index 78e733c1b9d..6084afb39d4 100644 --- a/pkgs/development/python-modules/docker_compose/default.nix +++ b/pkgs/development/python-modules/docker_compose/default.nix @@ -6,13 +6,13 @@ , enum34, functools32 }: buildPythonApplication rec { - version = "1.15.0"; + version = "1.18.0"; pname = "docker-compose"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0yg58m5kk22kihbra0h40miqnbdmkirjr9y47wns613sdikrymmg"; + sha256 = "2930cbfe2685018fbb75377600ab6288861d9955717b3f14212f63950351d379"; }; # lots of networking and other fails From ffebbd2f8d27b13d9fa24cfa2d95740538b711fa Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:22:31 +0100 Subject: [PATCH 122/331] python: easy-thumbnails: 2.4.2 -> 2.5 --- pkgs/development/python-modules/easy-thumbnails/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/easy-thumbnails/default.nix b/pkgs/development/python-modules/easy-thumbnails/default.nix index 38e201849c1..fbe5c02771d 100644 --- a/pkgs/development/python-modules/easy-thumbnails/default.nix +++ b/pkgs/development/python-modules/easy-thumbnails/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "easy-thumbnails"; name = "${pname}-${version}"; - version = "2.4.2"; + version = "2.5"; meta = { description = "Easy thumbnails for Django"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "8cad7ea4fb2b800284e842d8a44f685cbc1968535be04c24a4bbf6e6dbc550c4"; + sha256 = "e244d1f26027fc32c6ca60ffb0169a39099446f614b0433e907a2588ae7d9b95"; }; propagatedBuildInputs = [ django pillow ]; From 78d6446a20f5074bb3cc22fa4954b3142bd558e5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:22:34 +0100 Subject: [PATCH 123/331] python: Eve: 0.7.4 -> 0.7.5 --- pkgs/development/python-modules/eve/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eve/default.nix b/pkgs/development/python-modules/eve/default.nix index 1a9b684a9f3..d77b912fe0d 100644 --- a/pkgs/development/python-modules/eve/default.nix +++ b/pkgs/development/python-modules/eve/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "Eve"; - version = "0.7.4"; + version = "0.7.5"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0xihl5w2m4vkp0515qjibiy88pk380n5jmj8n9hh7q40b1vx1kwb"; + sha256 = "dd4ffbc4725220ffdc8e32f8566c8870efaecdc238d0f96b18e1e83227eca55d"; }; patches = [ From 166c9fd85dc96ec2b5072efdf4ae2906526cdc67 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:22:38 +0100 Subject: [PATCH 124/331] python: Faker: 0.8.7 -> 0.8.8 --- pkgs/development/python-modules/faker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 3c95a26881e..2d459d625d0 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -8,12 +8,12 @@ assert pythonOlder "3.3" -> ipaddress != null; buildPythonPackage rec { pname = "Faker"; - version = "0.8.7"; + version = "0.8.8"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "bf7dabcd6807c8829da28a4de491adf7998af506b8571db6a6eb58161157248a"; + sha256 = "e928cf853ef69d7471421f2a3716a1239e43de0fa9855f4016ee0c9f1057328a"; }; checkInputs = [ From 710a85a3a09f5ca390010175aa0cb6de1c511948 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:22:41 +0100 Subject: [PATCH 125/331] python: faulthandler: 2.6 -> 3.0 --- pkgs/development/python-modules/faulthandler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/faulthandler/default.nix b/pkgs/development/python-modules/faulthandler/default.nix index f8d877f0655..ee2a65e981c 100644 --- a/pkgs/development/python-modules/faulthandler/default.nix +++ b/pkgs/development/python-modules/faulthandler/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "faulthandler"; - version = "2.6"; + version = "3.0"; src = fetchPypi { inherit pname version; - sha256 = "0zywq3jaznddvqc3hnfrlv24wmpyq4xgajk9xhv6578qw1rpfj2r"; + sha256 = "acc10e10909f0f956ba1b42b6c450ea0bdaaa27b3942899f65931396cfcdd36a"; }; meta = { From a435277ff9a3fad8471ced8734770a4bf165df8b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:22:45 +0100 Subject: [PATCH 126/331] python: filelock: 2.0.13 -> 2.0.14 --- pkgs/development/python-modules/filelock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/filelock/default.nix b/pkgs/development/python-modules/filelock/default.nix index f1f07a99ad5..a22e1581b68 100644 --- a/pkgs/development/python-modules/filelock/default.nix +++ b/pkgs/development/python-modules/filelock/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "filelock"; - version = "2.0.13"; + version = "2.0.14"; src = fetchPypi { inherit pname version; - sha256 = "1n67dw7np5gsy5whynyk8c46pjlr353d6j9735p5gryaszkpjl6h"; + sha256 = "ee355eb66e4c2e5d95689e1253515aad5b3177c274abdd00a57d5ab1aa6d071a"; }; meta = with stdenv.lib; { From dea154d3784c87431e956ade390ec224b7b7c1b4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:22:48 +0100 Subject: [PATCH 127/331] python: Fiona: 1.7.10.post1 -> 1.7.11 --- pkgs/development/python-modules/fiona/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index 5c150844c84..1fc7ae5aa58 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "Fiona"; - version = "1.7.10.post1"; + version = "1.7.11"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "fc4c8996be3131f36c791d66273317d38b72b19dc24c2afc332fd734752eb7a8"; + sha256 = "5e9c68ea71e9d79fcfb68c9a101c0b133301e233c9bcca7b7c65f33cc7636ef5"; }; buildInputs = [ From bcead958d7e8a906ce05e1c9f1ce04da9c227c02 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:22:52 +0100 Subject: [PATCH 128/331] python: flake8-debugger: 1.4.0 -> 3.0.0 --- pkgs/development/python-modules/flake8-debugger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flake8-debugger/default.nix b/pkgs/development/python-modules/flake8-debugger/default.nix index c00bf0c8551..aab91433088 100644 --- a/pkgs/development/python-modules/flake8-debugger/default.nix +++ b/pkgs/development/python-modules/flake8-debugger/default.nix @@ -3,10 +3,10 @@ buildPythonPackage rec { pname = "flake8-debugger"; name = "${pname}-${version}"; - version = "1.4.0"; + version = "3.0.0"; src = fetchurl { url = "mirror://pypi/f/flake8-debugger/${name}.tar.gz"; - sha256 = "0chjfa6wvnqjnx778qzahhwvjx1j0rc8ax0ipp5bn70gf47lj62r"; + sha256 = "e5c8ac980d819db2f3fbb89fe0e43a2fe6c127edd6ce4984a3f7e0bbdac3d2d4"; }; buildInputs = [ nose ]; propagatedBuildInputs = [ flake8 ]; From 96f4e27e1813abf32b99e75281251a47b8f14e74 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:22:55 +0100 Subject: [PATCH 129/331] python: Flask-Testing: 0.6.2 -> 0.7.1 --- pkgs/development/python-modules/flask-testing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-testing/default.nix b/pkgs/development/python-modules/flask-testing/default.nix index 178e000a32e..5f843138eae 100644 --- a/pkgs/development/python-modules/flask-testing/default.nix +++ b/pkgs/development/python-modules/flask-testing/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; buildPythonPackage rec { name = "${pname}-${version}"; pname = "Flask-Testing"; - version = "0.6.2"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "1w0dpwvrcpffm8ychyxpm8s5blm7slik9kplh9jb3sgwcv9gyppj"; + sha256 = "dc076623d7d850653a018cb64f500948334c8aeb6b10a5a842bf1bcfb98122bc"; }; postPatch = '' From 5920579a3dbdd2fddb9e60ff47029858e61fc53a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 15:33:59 +0100 Subject: [PATCH 130/331] Python: disable user site-packages in setup hook Wrappers already included `PYTHONNOUSERSITE=1`, but now this env var is also set in the Python setup hook. This improves purity in case of non-sandboxes builds and nix-shell. --- pkgs/development/interpreters/python/setup-hook.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/interpreters/python/setup-hook.sh b/pkgs/development/interpreters/python/setup-hook.sh index dda9bed39f8..35726280a75 100644 --- a/pkgs/development/interpreters/python/setup-hook.sh +++ b/pkgs/development/interpreters/python/setup-hook.sh @@ -19,3 +19,6 @@ envHooks+=(addPythonPath) export DETERMINISTIC_BUILD=1; # Determinism: We fix the hashes of str, bytes and datetime objects. export PYTHONHASHSEED=0; +# Determinism. Whenever Python is included, it should not check user site-packages. +# This option is only relevant when the sandbox is disabled. +export PYTHONNOUSERSITE=1; From 76b590405a3e9211aecfc56126eb0dabddfd5e95 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sun, 9 Jul 2017 13:37:14 -0400 Subject: [PATCH 131/331] boost: Clean, reducing duplication This was motivated originally by my cross work, but that goal requires a few more commits to other things. Still, it's good to start the cleanup now / get things out of the way. --- pkgs/development/libraries/boost/1.59.nix | 58 +++---- pkgs/development/libraries/boost/generic.nix | 150 +++++++------------ 2 files changed, 83 insertions(+), 125 deletions(-) diff --git a/pkgs/development/libraries/boost/1.59.nix b/pkgs/development/libraries/boost/1.59.nix index 2666b1d6c5d..603d7883c64 100644 --- a/pkgs/development/libraries/boost/1.59.nix +++ b/pkgs/development/libraries/boost/1.59.nix @@ -8,33 +8,33 @@ callPackage ./generic.nix (args // rec { sha256 = "1jj1aai5rdmd72g90a3pd8sw9vi32zad46xv5av8fhnr48ir6ykj"; }; - patches = if stdenv.isCygwin then [ - ./cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch - ./cygwin-fedora-boost-1.50.0-pool.patch - ./cygwin-fedora-boost-1.57.0-mpl-print.patch - ./cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch - ./cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch - ./cygwin-fedora-boost-1.54.0-python-unused_typedef.patch - ./cygwin-fedora-boost-1.57.0-pool-test_linking.patch - ./cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch - ./cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch - ./cygwin-fedora-boost-1.57.0-uuid-comparison.patch - ./cygwin-fedora-boost-1.57.0-move-is_class.patch - ./cygwin-1.40.0-cstdint-cygwin.patch - ./cygwin-1.57.0-asio-cygwin.patch - ./cygwin-1.55.0-asio-MSG_EOR.patch - ./cygwin-1.57.0-config-cygwin.patch - ./cygwin-1.57.0-context-cygwin.patch - ./cygwin-1.57.0-filesystem-cygwin.patch - ./cygwin-1.55.0-interlocked-cygwin.patch - ./cygwin-1.40.0-iostreams-cygwin.patch - ./cygwin-1.57.0-locale-cygwin.patch - ./cygwin-1.57.0-log-cygwin.patch - ./cygwin-1.40.0-python-cygwin.patch - ./cygwin-1.40.0-regex-cygwin.patch - ./cygwin-1.57.0-smart_ptr-cygwin.patch - ./cygwin-1.57.0-system-cygwin.patch - ./cygwin-1.45.0-jam-cygwin.patch - ./cygwin-1.50.0-jam-pep3149.patch - ] else null; + patches = stdenv.lib.optionals stdenv.isCygwin [ + ./cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch + ./cygwin-fedora-boost-1.50.0-pool.patch + ./cygwin-fedora-boost-1.57.0-mpl-print.patch + ./cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch + ./cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch + ./cygwin-fedora-boost-1.54.0-python-unused_typedef.patch + ./cygwin-fedora-boost-1.57.0-pool-test_linking.patch + ./cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch + ./cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch + ./cygwin-fedora-boost-1.57.0-uuid-comparison.patch + ./cygwin-fedora-boost-1.57.0-move-is_class.patch + ./cygwin-1.40.0-cstdint-cygwin.patch + ./cygwin-1.57.0-asio-cygwin.patch + ./cygwin-1.55.0-asio-MSG_EOR.patch + ./cygwin-1.57.0-config-cygwin.patch + ./cygwin-1.57.0-context-cygwin.patch + ./cygwin-1.57.0-filesystem-cygwin.patch + ./cygwin-1.55.0-interlocked-cygwin.patch + ./cygwin-1.40.0-iostreams-cygwin.patch + ./cygwin-1.57.0-locale-cygwin.patch + ./cygwin-1.57.0-log-cygwin.patch + ./cygwin-1.40.0-python-cygwin.patch + ./cygwin-1.40.0-regex-cygwin.patch + ./cygwin-1.57.0-smart_ptr-cygwin.patch + ./cygwin-1.57.0-system-cygwin.patch + ./cygwin-1.45.0-jam-cygwin.patch + ./cygwin-1.50.0-jam-pep3149.patch + ]; }) diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index b2ec31ace17..adb7ca665cc 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -1,18 +1,19 @@ { stdenv, fetchurl, icu, expat, zlib, bzip2, python, fixDarwinDylibNames, libiconv -, buildPlatform, hostPlatform -, toolset ? if stdenv.cc.isClang then "clang" else null +, which +, buildPackages, buildPlatform, hostPlatform +, toolset ? /**/ if stdenv.cc.isClang then "clang" + else if stdenv.cc.isGNU && hostPlatform != buildPlatform then "gcc-cross" + else null , enableRelease ? true , enableDebug ? false , enableSingleThreaded ? false , enableMultiThreaded ? true , enableShared ? !(hostPlatform.libc == "msvcrt") # problems for now , enableStatic ? !enableShared -, enablePIC ? false -, enableExceptions ? false , enablePython ? hostPlatform == buildPlatform , enableNumpy ? false , taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic)) -, patches ? null +, patches ? [] , mpi ? null # Attributes inherit from specific versions @@ -21,8 +22,9 @@ }: # We must build at least one type of libraries -assert !enableShared -> enableStatic; +assert enableShared || enableStatic; +# Python isn't supported when cross-compiling assert enablePython -> hostPlatform == buildPlatform; assert enableNumpy -> enablePython; @@ -46,86 +48,41 @@ let # To avoid library name collisions layout = if taggedLayout then "tagged" else "system"; - cflags = if enablePIC && enableExceptions then - "cflags=\"-fPIC -fexceptions\" cxxflags=-fPIC linkflags=-fPIC" - else if enablePIC then - "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" - else if enableExceptions then - "cflags=-fexceptions" - else - ""; - - withToolset = stdenv.lib.optionalString (toolset != null) "--with-toolset=${toolset}"; - - genericB2Flags = [ + b2Args = concatStringsSep " " ([ "--includedir=$dev/include" "--libdir=$out/lib" "-j$NIX_BUILD_CORES" "--layout=${layout}" "variant=${variant}" "threading=${threading}" - ] ++ optional (link != "static") "runtime-link=${runtime-link}" ++ [ + "runtime-link=${runtime-link}" "link=${link}" - "${cflags}" - ] ++ optional (variant == "release") "debug-symbols=off" - ++ optional (!enablePython) "--without-python"; - - nativeB2Flags = [ "-sEXPAT_INCLUDE=${expat.dev}/include" "-sEXPAT_LIBPATH=${expat.out}/lib" - ] ++ optional (toolset != null) "toolset=${toolset}" - ++ optional (mpi != null) "--user-config=user-config.jam"; - nativeB2Args = concatStringsSep " " (genericB2Flags ++ nativeB2Flags); - - crossB2Flags = [ - "-sEXPAT_INCLUDE=${expat.crossDrv}/include" - "-sEXPAT_LIBPATH=${expat.crossDrv}/lib" - "--user-config=user-config.jam" - "toolset=gcc-cross" - ] ++ optionals (hostPlatform.libc == "msvcrt") [ + ] ++ optional (variant == "release") "debug-symbols=off" + ++ optional (toolset != null) "toolset=${toolset}" + ++ optional (mpi != null || hostPlatform != buildPlatform) "--user-config=user-config.jam" + ++ optionals (hostPlatform.libc == "msvcrt") [ "target-os=windows" "threadapi=win32" "binary-format=pe" "address-model=${toString hostPlatform.parsed.cpu.bits}" "architecture=x86" - ]; - crossB2Args = concatStringsSep " " (genericB2Flags ++ crossB2Flags); - - builder = b2Args: '' - ./b2 ${b2Args} - ''; - - installer = b2Args: '' - # boostbook is needed by some applications - mkdir -p $dev/share/boostbook - cp -a tools/boostbook/{xsl,dtd} $dev/share/boostbook/ - - # Let boost install everything else - ./b2 ${b2Args} install - ''; - - commonConfigureFlags = [ - "--includedir=$(dev)/include" - "--libdir=$(out)/lib" - ]; - - fixup = '' - # Make boost header paths relative so that they are not runtime dependencies - ( - cd "$dev" - find include \( -name '*.hpp' -or -name '*.h' -or -name '*.ipp' \) \ - -exec sed '1i#line 1 "{}"' -i '{}' \; - ) - '' + optionalString (hostPlatform.libc == "msvcrt") '' - ${stdenv.cc.targetPrefix}ranlib "$out/lib/"*.a - ''; + ]); in stdenv.mkDerivation { name = "boost-${version}"; - inherit src patches version; + inherit src; + + patchFlags = optionalString (hostPlatform.libc == "msvcrt") "-p0"; + patches = patches ++ optional (hostPlatform.libc == "msvcrt") (fetchurl { + url = "https://svn.boost.org/trac/boost/raw-attachment/tickaet/7262/" + + "boost-mingw.patch"; + sha256 = "0s32kwll66k50w6r5np1y5g907b7lcpsjhfgr7rsw7q5syhzddyj"; + }); meta = { homepage = http://boost.org/; @@ -142,9 +99,13 @@ stdenv.mkDerivation { --replace '@rpath/$(<[1]:D=)' "$out/lib/\$(<[1]:D=)"; fi; '' + optionalString (mpi != null) '' - cat << EOF > user-config.jam + cat << EOF >> user-config.jam using mpi : ${mpi}/bin/mpiCC ; EOF + '' + optionalString (hostPlatform != buildPlatform) '' + cat << EOF >> user-config.jam + using gcc : cross : ${stdenv.cc.targetPrefix}c++ ; + EOF ''; NIX_CFLAGS_LINK = stdenv.lib.optionalString stdenv.isDarwin @@ -152,6 +113,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; + nativeBuildInputs = [ which buildPackages.stdenv.cc ]; buildInputs = [ expat zlib bzip2 libiconv ] ++ optional (hostPlatform == buildPlatform) icu ++ optional stdenv.isDarwin fixDarwinDylibNames @@ -159,39 +121,35 @@ stdenv.mkDerivation { ++ optional enableNumpy python.pkgs.numpy; configureScript = "./bootstrap.sh"; - configureFlags = commonConfigureFlags - ++ [ "--with-python=${python.interpreter}" ] - ++ optional (hostPlatform == buildPlatform) "--with-icu=${icu.dev}" - ++ optional (toolset != null) "--with-toolset=${toolset}"; + configurePlatforms = []; + configureFlags = [ + "--includedir=$(dev)/include" + "--libdir=$(out)/lib" + (if enablePython then "--with-python=${python.interpreter}" else "--without-python") + (if hostPlatform == buildPlatform then "--with-icu=${icu.dev}" else "--without-icu") + ] ++ optional (toolset != null) "--with-toolset=${toolset}"; - buildPhase = builder nativeB2Args; + buildPhase = '' + ./b2 ${b2Args} + ''; - installPhase = installer nativeB2Args; + installPhase = '' + # boostbook is needed by some applications + mkdir -p $dev/share/boostbook + cp -a tools/boostbook/{xsl,dtd} $dev/share/boostbook/ - postFixup = fixup; + # Let boost install everything else + ./b2 ${b2Args} install + ''; + + postFixup = '' + # Make boost header paths relative so that they are not runtime dependencies + find "$dev/include" \( -name '*.hpp' -or -name '*.h' -or -name '*.ipp' \) \ + -exec sed '1i#line 1 "{}"' -i '{}' \; + '' + optionalString (hostPlatform.libc == "msvcrt") '' + $RANLIB "$out/lib/"*.a + ''; outputs = [ "out" "dev" ]; setOutputFlags = false; - - crossAttrs = rec { - # We want to substitute the contents of configureFlags, removing thus the - # usual --build and --host added on cross building. - preConfigure = '' - export configureFlags="--without-icu ${concatStringsSep " " commonConfigureFlags}" - cat << EOF > user-config.jam - using gcc : cross : $crossConfig-g++ ; - EOF - ''; - buildPhase = builder crossB2Args; - installPhase = installer crossB2Args; - postFixup = fixup; - } // optionalAttrs (hostPlatform.libc == "msvcrt") { - patches = fetchurl { - url = "https://svn.boost.org/trac/boost/raw-attachment/ticket/7262/" - + "boost-mingw.patch"; - sha256 = "0s32kwll66k50w6r5np1y5g907b7lcpsjhfgr7rsw7q5syhzddyj"; - }; - - patchFlags = "-p0"; - }; } From bb18a3b5730ec1d29f4dc3a070dc753b0f9690bb Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 2 Jun 2017 12:22:36 -0400 Subject: [PATCH 132/331] top-level: Splice in more package sets for new types of deps This is done in preparation for the next commit where, among other changes, I add support for the new `dep*` attributes. --- pkgs/top-level/splice.nix | 69 ++++++++++++++++++++++++++++++--------- 1 file changed, 53 insertions(+), 16 deletions(-) diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix index ea81b110080..1fde08d1d48 100644 --- a/pkgs/top-level/splice.nix +++ b/pkgs/top-level/splice.nix @@ -24,25 +24,52 @@ lib: pkgs: actuallySplice: let - defaultBuildScope = pkgs.buildPackages // pkgs.buildPackages.xorg; + defaultBuildBuildScope = pkgs.buildPackages.buildPackages // pkgs.buildPackages.buildPackages.xorg; + defaultBuildHostScope = pkgs.buildPackages // pkgs.buildPackages.xorg; + defaultBuildTargetScope = + if pkgs.targetPlatform == pkgs.hostPlatform + then defaultBuildHostScope + else assert pkgs.hostPlatform == pkgs.buildPlatform; defaultHostTargetScope; + defaultHostHostScope = {}; # unimplemented # TODO(@Ericson2314): we shouldn't preclude run-time fetching by removing # these attributes. We should have a more general solution for selecting # whether `nativeDrv` or `crossDrv` is the default in `defaultScope`. pkgsWithoutFetchers = lib.filterAttrs (n: _: !lib.hasPrefix "fetch" n) pkgs; - defaultRunScope = pkgsWithoutFetchers // pkgs.xorg; + targetPkgsWithoutFetchers = lib.filterAttrs (n: _: !lib.hasPrefix "fetch" n) pkgs.targetPackages; + defaultHostTargetScope = pkgsWithoutFetchers // pkgs.xorg; + defaultTargetTargetScope = targetPkgsWithoutFetchers // targetPkgsWithoutFetchers.xorg or {}; - splicer = buildPkgs: runPkgs: let - mash = buildPkgs // runPkgs; + splicer = pkgsBuildBuild: pkgsBuildHost: pkgsBuildTarget: + pkgsHostHost: pkgsHostTarget: + pkgsTargetTarget: let + mash = + # Other pkgs sets + pkgsBuildBuild // pkgsBuildTarget // pkgsHostHost // pkgsTargetTarget + # The same pkgs sets one probably intends + // pkgsBuildHost // pkgsHostTarget; merge = name: { inherit name; value = let defaultValue = mash.${name}; # `or {}` is for the non-derivation attsert splicing case, where `{}` is the identity. - buildValue = buildPkgs.${name} or {}; - runValue = runPkgs.${name} or {}; + valueBuildBuild = pkgsBuildBuild.${name} or {}; + valueBuildHost = pkgsBuildHost.${name} or {}; + valueBuildTarget = pkgsBuildTarget.${name} or {}; + valueHostHost = throw "`valueHostHost` unimplemented: pass manually rather than relying on splicer."; + valueHostTarget = pkgsHostTarget.${name} or {}; + valueTargetTarget = pkgsTargetTarget.${name} or {}; augmentedValue = defaultValue - // (lib.optionalAttrs (buildPkgs ? ${name}) { nativeDrv = buildValue; }) - // (lib.optionalAttrs (runPkgs ? ${name}) { crossDrv = runValue; }); + # TODO(@Ericson2314): Stop using old names after transition period + // (lib.optionalAttrs (pkgsBuildHost ? ${name}) { nativeDrv = valueBuildHost; }) + // (lib.optionalAttrs (pkgsHostTarget ? ${name}) { crossDrv = valueHostTarget; }) + // { + __spliced = + (lib.optionalAttrs (pkgsBuildBuild ? ${name}) { buildBuild = valueBuildBuild; }) + // (lib.optionalAttrs (pkgsBuildTarget ? ${name}) { buildTarget = valueBuildTarget; }) + // { hostHost = valueHostHost; } + // (lib.optionalAttrs (pkgsTargetTarget ? ${name}) { targetTarget = valueTargetTarget; + }); + }; # Get the set of outputs of a derivation. If one derivation fails to # evaluate we don't want to diverge the entire splice, so we fall back # on {} @@ -55,10 +82,15 @@ let in # The derivation along with its outputs, which we recur # on to splice them together. - if lib.isDerivation defaultValue then augmentedValue - // splicer (tryGetOutputs buildValue) (getOutputs runValue) + if lib.isDerivation defaultValue then augmentedValue // splicer + (tryGetOutputs valueBuildBuild) (tryGetOutputs valueBuildHost) (tryGetOutputs valueBuildTarget) + (tryGetOutputs valueHostHost) (getOutputs valueHostTarget) + (tryGetOutputs valueTargetTarget) # Just recur on plain attrsets - else if lib.isAttrs defaultValue then splicer buildValue runValue + else if lib.isAttrs defaultValue then splicer + valueBuildBuild valueBuildHost valueBuildTarget + {} valueHostTarget + valueTargetTarget # Don't be fancy about non-derivations. But we could have used used # `__functor__` for functions instead. else defaultValue; @@ -67,11 +99,16 @@ let splicedPackages = if actuallySplice - then splicer defaultBuildScope defaultRunScope // { - # These should never be spliced under any circumstances - inherit (pkgs) pkgs buildPackages targetPackages - buildPlatform targetPlatform hostPlatform; - } + then + splicer + defaultBuildBuildScope defaultBuildHostScope defaultBuildTargetScope + defaultHostHostScope defaultHostTargetScope + defaultTargetTargetScope + // { + # These should never be spliced under any circumstances + inherit (pkgs) pkgs buildPackages targetPackages + buildPlatform targetPlatform hostPlatform; + } else pkgs // pkgs.xorg; in From 7f3ca3e21a22fd3101b40cadb86899542dec2e35 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 11 Sep 2017 12:20:20 -0400 Subject: [PATCH 133/331] stdenv: Fix handling of dependencies and hooks 4 far-reaching changes: Smaller PATH, New vars, different propagation logic, and different hook logic Smaller PATH ------------ `buildInputs` no longer go on the PATH at build time, as they cannot be run when cross compiling and we don't want to special case. Simply make a `nativeBuildInput` too if one needs them on the PATH. Fixes #21191. Many new depedendency variables ------------------------------- See the stdenv chapter of the nixpkgs manual. I pulled out the existing documentation of dependency specification into a new section, and added language for these two (and their propagated equivalents) along side the others'. More complex propagation logic ------------------------------ Before a propagated*XXX*Input always acted as if it was specified directly as a *XXX*Input downstream. That's simple enough, but violates the intended roles of each sort of dep, which has functional and not just stylistic consequences. The new algorithm is detailed in the manual, and ensures everything ends up in the right place. I tried to give both an informal and formal description, but I suspect in practice it will not make much sense until one tries cross compiling, after which it will immediately make sense as the only sane option. Simplified hook logic --------------------- Rather than `envHook` and `crossEnvHook`, whose behavior differs depending on whether we are cross compiling or not, there is now one hook per sort (or rather non-propagated and propagated pair of sorts) of dependency. These new hooks have the same meaning regardless of cross compilation. See the setup hook section of stdenv chapter of the Nixpkgs manual for more details. --- pkgs/stdenv/generic/make-derivation.nix | 76 ++++-- pkgs/stdenv/generic/setup.sh | 306 ++++++++++++++++++------ 2 files changed, 291 insertions(+), 91 deletions(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index eb8545c6999..2d702ab389e 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -14,11 +14,27 @@ rec { mkDerivation = { name ? "" - , nativeBuildInputs ? [] - , buildInputs ? [] + # These types of dependencies are all exhaustively documented in + # the "Specifying Dependencies" section of the "Standard + # Environment" chapter of the Nixpkgs manual. - , propagatedNativeBuildInputs ? [] - , propagatedBuildInputs ? [] + # TODO(@Ericson2314): Stop using legacy dep attribute names + + # host offset -> target offset + , depsBuildBuild ? [] # -1 -> -1 + , depsBuildBuildPropagated ? [] # -1 -> -1 + , nativeBuildInputs ? [] # -1 -> 0 N.B. Legacy name + , propagatedNativeBuildInputs ? [] # -1 -> 0 N.B. Legacy name + , depsBuildTarget ? [] # -1 -> 1 + , depsBuildTargetPropagated ? [] # -1 -> 1 + + , depsHostHost ? [] # 0 -> 0 + , depsHostHostPropagated ? [] # 0 -> 0 + , buildInputs ? [] # 0 -> 1 N.B. Legacy name + , propagatedBuildInputs ? [] # 0 -> 1 N.B. Legacy name + + , depsTargetTarget ? [] # 1 -> 1 + , depsTargetTargetPropagated ? [] # 1 -> 1 , configureFlags ? [] , # Target is not included by default because most programs don't care. @@ -56,15 +72,35 @@ rec { inherit erroneousHardeningFlags hardeningDisable hardeningEnable supportedHardeningFlags; }) else let - dependencies = map lib.chooseDevOutputs [ - (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) - (map (drv: drv.crossDrv or drv) buildInputs) + dependencies = map (map lib.chooseDevOutputs) [ + [ + (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) + (map (drv: drv.__spliced.buildTarget or drv) depsBuildTarget) + ] + [ + (map (drv: drv.__spliced.hostHost or drv) depsHostHost) + (map (drv: drv.crossDrv or drv) buildInputs) + ] + [ + (map (drv: drv.__spliced.targetTarget or drv) depsTargetTarget) + ] ]; - propagatedDependencies = map lib.chooseDevOutputs [ - (map (drv: drv.nativeDrv or drv) propagatedNativeBuildInputs) - (map (drv: drv.crossDrv or drv) propagatedBuildInputs) + propagatedDependencies = map (map lib.chooseDevOutputs) [ + [ + (map (drv: drv.__spliced.buildBuild or drv) depsBuildBuildPropagated) + (map (drv: drv.nativeDrv or drv) propagatedNativeBuildInputs) + (map (drv: drv.__spliced.buildTarget or drv) depsBuildTargetPropagated) + ] + [ + (map (drv: drv.__spliced.hostHost or drv) depsHostHostPropagated) + (map (drv: drv.crossDrv or drv) propagatedBuildInputs) + ] + [ + (map (drv: drv.__spliced.targetTarget or drv) depsTargetTargetPropagated) + ] ]; outputs' = @@ -105,11 +141,19 @@ rec { userHook = config.stdenv.userHook or null; __ignoreNulls = true; - nativeBuildInputs = lib.elemAt dependencies 0; - buildInputs = lib.elemAt dependencies 1; + depsBuildBuild = lib.elemAt (lib.elemAt dependencies 0) 0; + nativeBuildInputs = lib.elemAt (lib.elemAt dependencies 0) 1; + depsBuildTarget = lib.elemAt (lib.elemAt dependencies 0) 2; + depsHostBuild = lib.elemAt (lib.elemAt dependencies 1) 0; + buildInputs = lib.elemAt (lib.elemAt dependencies 1) 1; + depsTargetTarget = lib.elemAt (lib.elemAt dependencies 2) 0; - propagatedNativeBuildInputs = lib.elemAt propagatedDependencies 0; - propagatedBuildInputs = lib.elemAt propagatedDependencies 1; + depsBuildBuildPropagated = lib.elemAt (lib.elemAt propagatedDependencies 0) 0; + propagatedNativeBuildInputs = lib.elemAt (lib.elemAt propagatedDependencies 0) 1; + depsBuildTargetPropagated = lib.elemAt (lib.elemAt propagatedDependencies 0) 2; + depsHostBuildPropagated = lib.elemAt (lib.elemAt propagatedDependencies 1) 0; + propagatedBuildInputs = lib.elemAt (lib.elemAt propagatedDependencies 1) 1; + depsTargetTargetPropagated = lib.elemAt (lib.elemAt propagatedDependencies 2) 0; # This parameter is sometimes a string, sometimes null, and sometimes a list, yuck configureFlags = let inherit (lib) optional elem; in diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 686ed68cede..b2b15c74d4e 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -300,11 +300,72 @@ runHook preHook runHook addInputsHook -# Recursively find all build inputs. +# Package accumulators + +# shellcheck disable=SC2034 +declare -a pkgsBuildBuild pkgsBuildHost pkgsBuildTarget +declare -a pkgsHostHost pkgsHostTarget +declare -a pkgsTargetTarget + +declare -ra pkgBuildAccumVars=(pkgsBuildBuild pkgsBuildHost pkgsBuildTarget) +declare -ra pkgHostAccumVars=(pkgsHostHost pkgsHostTarget) +declare -ra pkgTargetAccumVars=(pkgsTargetTarget) + +declare -ra pkgAccumVarVars=(pkgBuildAccumVars pkgHostAccumVars pkgTargetAccumVars) + + +# Hooks + +declare -a envBuildBuildHooks envBuildHostHooks envBuildTargetHooks +declare -a envHostHostHooks envHostTargetHooks +declare -a envTargetTargetHooks + +declare -ra pkgBuildHookVars=(envBuildBuildHook envBuildHostHook envBuildTargetHook) +declare -ra pkgHostHookVars=(envHostHostHook envHostTargetHook) +declare -ra pkgTargetHookVars=(envTargetTargetHook) + +declare -ra pkgHookVarVars=(pkgBuildHookVars pkgHostHookVars pkgTargetHookVars) + + +# Propagated dep files + +declare -ra propagatedBuildDepFiles=( + propagated-build-build-deps + propagated-native-build-inputs # Legacy name for back-compat + propagated-build-target-deps +) +declare -ra propagatedHostDepFiles=( + propagated-host-host-deps + propagated-build-inputs # Legacy name for back-compat +) +declare -ra propagatedTargetDepFiles=( + propagated-target-target-deps +) +declare -ra propagatedDepFilesVars=( + propagatedBuildDepFiles + propagatedHostDepFiles + propagatedTargetDepFiles +) + +# Platform offsets: build = -1, host = 0, target = 1 +declare -ra allPlatOffsets=(-1 0 1) + + +# Mutually-recursively find all build inputs. See the dependency section of the +# stdenv chapter of the Nixpkgs manual for the specification this algorithm +# implements. findInputs() { - local pkg="$1"; shift - local var="$1"; shift - local propagatedBuildInputsFiles=("$@") + local -r pkg="$1" + local -ri hostOffset="$2" + local -ri targetOffset="$3" + + # Sanity check + (( "$hostOffset" <= "$targetOffset" )) || exit -1 + + local varVar="${pkgAccumVarVars[$hostOffset + 1]}" + local varRef="$varVar[\$targetOffset - \$hostOffset]" + local var="${!varRef}" + unset -v varVar varRef # TODO(@Ericson2314): Restore using associative array once Darwin # nix-shell doesn't use impure bash. This should replace the O(n) @@ -324,21 +385,106 @@ findInputs() { exit 1 fi - local file - for file in "${propagatedBuildInputsFiles[@]}"; do - file="$pkg/nix-support/$file" - [[ -f "$file" ]] || continue + # The current package's host and target offset together + # provide a <=-preserving homomorphism from the relative + # offsets to current offset + function mapOffset() { + local -ri inputOffset="$1" + if (( "$inputOffset" <= 0 )); then + local -ri outputOffset="$inputOffset + $hostOffset" + else + local -ri outputOffset="$inputOffset - 1 + $targetOffset" + fi + echo "$outputOffset" + } - local pkgNext - for pkgNext in $(< "$file"); do - findInputs "$pkgNext" "$var" "${propagatedBuildInputsFiles[@]}" + # Host offset relative to that of the package whose immediate + # dependencies we are currently exploring. + local -i relHostOffset + for relHostOffset in "${allPlatOffsets[@]}"; do + # `+ 1` so we start at 0 for valid index + local files="${propagatedDepFilesVars[$relHostOffset + 1]}" + + # Host offset relative to the package currently being + # built---as absolute an offset as will be used. + local -i hostOffsetNext + hostOffsetNext="$(mapOffset relHostOffset)" + + # Ensure we're in bounds relative to the package currently + # being built. + [[ "${allPlatOffsets[*]}" = *"$hostOffsetNext"* ]] || continue + + # Target offset relative to the *host* offset of the package + # whose immediate dependencies we are currently exploring. + local -i relTargetOffset + for relTargetOffset in "${allPlatOffsets[@]}"; do + (( "$relHostOffset" <= "$relTargetOffset" )) || continue + + local fileRef="${files}[$relTargetOffset - $relHostOffset]" + local file="${!fileRef}" + unset -v fileRef + + # Target offset relative to the package currently being + # built. + local -i targetOffsetNext + targetOffsetNext="$(mapOffset relTargetOffset)" + + # Once again, ensure we're in bounds relative to the + # package currently being built. + [[ "${allPlatOffsets[*]}" = *"$targetOffsetNext"* ]] || continue + + [[ -f "$pkg/nix-support/$file" ]] || continue + + local pkgNext + for pkgNext in $(< "$pkg/nix-support/$file"); do + findInputs "$pkgNext" "$hostOffsetNext" "$targetOffsetNext" + done done done } +# Make sure all are at least defined as empty +: ${depsBuildBuild=} ${depsBuildBuildPropagated=} +: ${nativeBuildInputs=} ${propagatedNativeBuildInputs=} ${defaultNativeBuildInputs=} +: ${depsBuildTarget=} ${depsBuildTargetPropagated=} +: ${depsHostHost=} ${depsHostHostPropagated=} +: ${buildInputs=} ${propagatedBuildInputs=} ${defaultBuildInputs=} +: ${depsTargetTarget=} ${depsTargetTargetPropagated=} + +for pkg in $depsBuildBuild $depsBuildBuildPropagated; do + findInputs "$pkg" -1 -1 +done +for pkg in $nativeBuildInputs $propagatedNativeBuildInputs; do + findInputs "$pkg" -1 0 +done +for pkg in $depsBuildTarget $depsBuildTargetPropagated; do + findInputs "$pkg" -1 1 +done +for pkg in $depsHostHost $depsHostHostPropagated; do + findInputs "$pkg" 0 0 +done +for pkg in $buildInputs $propagatedBuildInputs ; do + findInputs "$pkg" 0 1 +done +for pkg in $depsTargetTarget $depsTargetTargetPropagated; do + findInputs "$pkg" 1 1 +done +# Default inputs must be processed last +for pkg in $defaultNativeBuildInputs; do + findInputs "$pkg" -1 0 +done +for pkg in $defaultBuildInputs; do + findInputs "$pkg" 0 1 +done + # Add package to the future PATH and run setup hooks activatePackage() { local pkg="$1" + local -ri hostOffset="$2" + local -ri targetOffset="$3" + + # Sanity check + (( "$hostOffset" <= "$targetOffset" )) || exit -1 if [ -f "$pkg" ]; then local oldOpts="$(shopt -po nounset)" @@ -347,11 +493,16 @@ activatePackage() { eval "$oldOpts" fi - if [ -d "$pkg/bin" ]; then + # Only dependencies whose host platform is guaranteed to match the + # build platform are included here. That would be `depsBuild*`, + # and legacy `nativeBuildInputs`. Other aren't because of cross + # compiling, and we want to have consistent rules whether or not + # we are cross compiling. + if [[ "$hostOffset" -le -1 && -d "$pkg/bin" ]]; then addToSearchPath _PATH "$pkg/bin" fi - if [ -f "$pkg/nix-support/setup-hook" ]; then + if [[ -f "$pkg/nix-support/setup-hook" ]]; then local oldOpts="$(shopt -po nounset)" set +u source "$pkg/nix-support/setup-hook" @@ -359,67 +510,55 @@ activatePackage() { fi } -declare -a nativePkgs crossPkgs -if [ -z "${crossConfig:-}" ]; then - # Not cross-compiling - both buildInputs (and variants like propagatedBuildInputs) - # are handled identically to nativeBuildInputs - for i in ${nativeBuildInputs:-} ${buildInputs:-} \ - ${defaultNativeBuildInputs:-} ${defaultBuildInputs:-} \ - ${propagatedNativeBuildInputs:-} ${propagatedBuildInputs:-}; do - findInputs "$i" nativePkgs propagated-native-build-inputs propagated-build-inputs - done -else - for i in ${nativeBuildInputs:-} ${defaultNativeBuildInputs:-} ${propagatedNativeBuildInputs:-}; do - findInputs "$i" nativePkgs propagated-native-build-inputs - done - for i in ${buildInputs:-} ${defaultBuildInputs:-} ${propagatedBuildInputs:-}; do - findInputs "$i" crossPkgs propagated-build-inputs - done -fi +_activatePkgs() { + local -i hostOffset targetOffset + local pkg -for i in ${nativePkgs+"${nativePkgs[@]}"} ${crossPkgs+"${crossPkgs[@]}"}; do - activatePackage "$i" -done + for hostOffset in "${allPlatOffsets[@]}"; do + local pkgsVar="${pkgAccumVarVars[$hostOffset + 1]}" + for targetOffset in "${allPlatOffsets[@]}"; do + (( "$hostOffset" <= "$targetOffset" )) || continue + local pkgsRef="${pkgsVar}[$targetOffset - $hostOffset]" + local pkgsSlice="${!pkgsRef}[@]" + for pkg in ${!pkgsSlice+"${!pkgsSlice}"}; do + activatePackage "$pkg" "$hostOffset" "$targetOffset" + done + done + done +} +# Run the package setup hooks and build _PATH +_activatePkgs # Set the relevant environment variables to point to the build inputs # found above. # -# These `depOffset`s tell the env hook what sort of dependency -# (ignoring propagatedness) is being passed to the env hook. In a real -# language, we'd append a closure with this information to the -# relevant env hook array, but bash doesn't have closures, so it's -# easier to just pass this in. +# These `depOffset`s, beyond indexing the arrays, also tell the env +# hook what sort of dependency (ignoring propagatedness) is being +# passed to the env hook. In a real language, we'd append a closure +# with this information to the relevant env hook array, but bash +# doesn't have closures, so it's easier to just pass this in. +_addToEnv() { + local -i depHostOffset depTargetOffset + local pkg -_addToNativeEnv() { - local pkg="$1" - if [[ -n "${crossConfig:-}" ]]; then - local -i depOffset=-1 - else - local -i depOffset=0 - fi - - # Run the package-specific hooks set by the setup-hook scripts. - runHook envHook "$pkg" + for depHostOffset in "${allPlatOffsets[@]}"; do + local hookVar="${pkgHookVarVars[$depHostOffset + 1]}" + local pkgsVar="${pkgAccumVarVars[$depHostOffset + 1]}" + for depTargetOffset in "${allPlatOffsets[@]}"; do + (( "$depHostOffset" <= "$depTargetOffset" )) || continue + local hookRef="${hookVar}[$depTargetOffset - $depHostOffset]" + local pkgsRef="${pkgsVar}[$depTargetOffset - $depHostOffset]" + local pkgsSlice="${!pkgsRef}[@]" + for pkg in ${!pkgsSlice+"${!pkgsSlice}"}; do + runHook "${!hookRef}" "$pkg" + done + done + done } -# Old bash empty array hack -for i in ${nativePkgs+"${nativePkgs[@]}"}; do - _addToNativeEnv "$i" -done - -_addToCrossEnv() { - local pkg="$1" - local -i depOffset=0 - - # Run the package-specific hooks set by the setup-hook scripts. - runHook crossEnvHook "$pkg" -} - -# Old bash empty array hack -for i in ${crossPkgs+"${crossPkgs[@]}"}; do - _addToCrossEnv "$i" -done +# Run the package-specific hooks set by the setup-hook scripts. +_addToEnv _addRpathPrefix "$out" @@ -882,6 +1021,7 @@ installPhase() { # propagated-build-inputs. fixupPhase() { # Make sure everything is writable so "strip" et al. work. + local output for output in $outputs; do if [ -e "${!output}" ]; then chmod -R u+w "${!output}"; fi done @@ -895,19 +1035,35 @@ fixupPhase() { done - # Propagate build inputs and setup hook into the development output. + # Propagate dependencies & setup hook into the development output. + declare -ra flatVars=( + # Build + depsBuildBuildPropagated + propagatedNativeBuildInputs + depsBuildTargetPropagated + # Host + depsHostHostPropagated + propagatedBuildInputs + # Target + depsTargetTargetPropagated + ) + declare -ra flatFiles=( + "${propagatedBuildDepFiles[@]}" + "${propagatedHostDepFiles[@]}" + "${propagatedTargetDepFiles[@]}" + ) + + local propagatedInputsIndex + for propagatedInputsIndex in "${!flatVars[@]}"; do + local propagatedInputsSlice="${flatVars[$propagatedInputsIndex]}[@]" + local propagatedInputsFile="${flatFiles[$propagatedInputsIndex]}" + + [[ "${!propagatedInputsSlice}" ]] || continue - if [ -n "${propagatedBuildInputs:-}" ]; then mkdir -p "${!outputDev}/nix-support" # shellcheck disable=SC2086 - printWords $propagatedBuildInputs > "${!outputDev}/nix-support/propagated-build-inputs" - fi - - if [ -n "${propagatedNativeBuildInputs:-}" ]; then - mkdir -p "${!outputDev}/nix-support" - # shellcheck disable=SC2086 - printWords $propagatedNativeBuildInputs > "${!outputDev}/nix-support/propagated-native-build-inputs" - fi + printWords ${!propagatedInputsSlice} > "${!outputDev}/nix-support/$propagatedInputsFile" + done if [ -n "${setupHook:-}" ]; then From a036473a0a0c6100fce316e1444fc33ec6674b85 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 3 Aug 2017 12:45:06 -0400 Subject: [PATCH 134/331] {bintools,cc}-wrapper: Fix setup hook to respect the role of the cc-compiler We now have the information to properly determine the role the cc-wrapper dependency has, by taking advantage of `offset`. No longer use the soon-to-be-deprecated crossConfig environment variable, the temp hack used before this change. --- .../bintools-wrapper/setup-hook.sh | 42 ++++++++++----- pkgs/build-support/cc-wrapper/setup-hook.sh | 52 ++++++++++++------- pkgs/stdenv/generic/setup.sh | 11 ++++ 3 files changed, 75 insertions(+), 30 deletions(-) diff --git a/pkgs/build-support/bintools-wrapper/setup-hook.sh b/pkgs/build-support/bintools-wrapper/setup-hook.sh index 43f79ec5920..c508963ac33 100644 --- a/pkgs/build-support/bintools-wrapper/setup-hook.sh +++ b/pkgs/build-support/bintools-wrapper/setup-hook.sh @@ -2,12 +2,17 @@ # # See comments in cc-wrapper's setup hook. This works exactly the same way. +set -u + +# Skip setup hook if we're not a build-time dep +(( "$hostOffset" < 0 )) || return 0 + bintoolsWrapper_addLDVars () { - case $depOffset in + case $depHostOffset in -1) local role='BUILD_' ;; 0) local role='' ;; 1) local role='TARGET_' ;; - *) echo "bintools-wrapper: Error: Cannot be used with $depOffset-offset deps, " >2; + *) echo "bintools-wrapper: Error: Cannot be used with $depHostOffset-offset deps" >2; return 1 ;; esac @@ -20,17 +25,29 @@ bintoolsWrapper_addLDVars () { fi } -if [ -n "${crossConfig:-}" ]; then - export NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_BUILD=1 - role_pre='BUILD_' - role_post='_FOR_BUILD' -else - export NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_HOST=1 - role_pre="" - role_post='' -fi +case $targetOffset in + -1) + export NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_BUILD=1 + role_pre='BUILD_' + role_post='_FOR_BUILD' + ;; + 0) + export NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_HOST=1 + role_pre='' + role_post='' + ;; + 1) + export NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_TARGET=1 + role_pre='TARGET_' + role_post='_FOR_TARGET' + ;; + *) + echo "cc-wrapper: used as improper sort of dependency" >2; + return 1 + ;; +esac -envHooks+=(bintoolsWrapper_addLDVars) +addEnvHooks "$targetOffset" bintoolsWrapper_addLDVars # shellcheck disable=SC2157 if [ -n "@bintools_bin@" ]; then @@ -65,3 +82,4 @@ done # No local scope in sourced file unset -v role_pre role_post cmd upper_case +set +u diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh index a922193ad2e..17877dc262c 100644 --- a/pkgs/build-support/cc-wrapper/setup-hook.sh +++ b/pkgs/build-support/cc-wrapper/setup-hook.sh @@ -54,19 +54,23 @@ # For more details, read the individual files where the mechanisms used to # accomplish this will be individually documented. +set -u + +# Skip setup hook if we're not a build-time dep +(( "$hostOffset" < 0 )) || return 0 # It's fine that any other cc-wrapper will redefine this. Bash functions close # over no state, and there's no @-substitutions within, so any redefined # function is guaranteed to be exactly the same. ccWrapper_addCVars () { - # The `depOffset` describes how the platforms of the dependencies are slid - # relative to the depending package. It is brought into scope of the - # environment hook defined as the role of the dependency being applied. - case $depOffset in + # The `depHostOffset` describes how the host platform of the dependencies + # are slid relative to the depending package. It is brought into scope of + # the environment hook defined as the role of the dependency being applied. + case $depHostOffset in -1) local role='BUILD_' ;; 0) local role='' ;; 1) local role='TARGET_' ;; - *) echo "cc-wrapper: Error: Cannot be used with $depOffset-offset deps, " >2; + *) echo "cc-wrapper: Error: Cannot be used with $depHostOffset-offset deps" >2; return 1 ;; esac @@ -87,20 +91,31 @@ ccWrapper_addCVars () { # # We also need to worry about what role is being added on *this* invocation of # setup-hook, which `role` tracks. -if [ -n "${crossConfig:-}" ]; then - export NIX_CC_WRAPPER_@infixSalt@_TARGET_BUILD=1 - role_pre='BUILD_' - role_post='_FOR_BUILD' -else - export NIX_CC_WRAPPER_@infixSalt@_TARGET_HOST=1 - role_pre='' - role_post='' -fi +case $targetOffset in + -1) + export NIX_CC_WRAPPER_@infixSalt@_TARGET_BUILD=1 + role_pre='BUILD_' + role_post='_FOR_BUILD' + ;; + 0) + export NIX_CC_WRAPPER_@infixSalt@_TARGET_HOST=1 + role_pre='' + role_post='' + ;; + 1) + export NIX_CC_WRAPPER_@infixSalt@_TARGET_TARGET=1 + role_pre='TARGET_' + role_post='_FOR_TARGET' + ;; + *) + echo "cc-wrapper: used as improper sort of dependency" >2; + return 1 + ;; +esac -# Eventually the exact sort of env-hook we create will depend on the role. This -# is because based on what relative platform we are targeting, we use different -# dependencies. -envHooks+=(ccWrapper_addCVars) +# We use the `targetOffset` to choose the right env hook to accumulate the right +# sort of deps (those with that offset). +addEnvHooks "$targetOffset" ccWrapper_addCVars # Note 1: these come *after* $out in the PATH (see setup.sh). # Note 2: phase separation makes this look useless to shellcheck. @@ -131,3 +146,4 @@ export CXX${role_post}=@named_cxx@ # No local scope in sourced file unset -v role_pre role_post +set +u diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index b2b15c74d4e..1850d322cc6 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -326,6 +326,17 @@ declare -ra pkgTargetHookVars=(envTargetTargetHook) declare -ra pkgHookVarVars=(pkgBuildHookVars pkgHostHookVars pkgTargetHookVars) +# Add env hooks for all sorts of deps with the specified host offset. +addEnvHooks() { + local depHostOffset="$1" + shift + local pkgHookVarsSlice="${pkgHookVarVars[$depHostOffset + 1]}[@]" + local pkgHookVar + for pkgHookVar in "${!pkgHookVarsSlice}"; do + eval "${pkgHookVar}s"'+=("$@")' + done +} + # Propagated dep files From 3a50395ef226259694689da92b2fd636476abc67 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 7 Jul 2017 15:57:01 -0400 Subject: [PATCH 135/331] {bintools,cc}-wrapper: extraPackages should be `depsTargetTargetPropagated` They are libraries used by programs built with these tools, not used by the tools themselves. --- pkgs/build-support/bintools-wrapper/default.nix | 2 +- pkgs/build-support/cc-wrapper/default.nix | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 57859b2f371..bb0e6b82aa5 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -178,7 +178,7 @@ stdenv.mkDerivation { else throw "unknown emulation for platform: " + targetPlatform.config; in targetPlatform.platform.bfdEmulation or (fmt + "-" + arch); - propagatedBuildInputs = extraPackages; + depsTargetTargetPropagated = extraPackages; setupHook = ./setup-hook.sh; diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 218e9f6b957..5d878d219f1 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -201,7 +201,8 @@ stdenv.mkDerivation { ln -s $ccPath/${targetPrefix}ghdl $out/bin/${targetPrefix}ghdl ''; - propagatedBuildInputs = [ bintools ] ++ extraPackages; + propagatedBuildInputs = [ bintools ]; + depsTargetTargetPropagated = extraPackages; setupHook = ./setup-hook.sh; From 5b74540c5be2ca4c47b61ef9d0776412266addeb Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sun, 25 Jun 2017 23:10:03 -0400 Subject: [PATCH 136/331] treewide: Use `depsBuildBuild` for buildPackges.stdenv.cc --- pkgs/applications/networking/browsers/lynx/default.nix | 6 +++--- pkgs/applications/video/mplayer/default.nix | 3 ++- pkgs/development/compilers/gcc/5/default.nix | 2 +- pkgs/development/libraries/glibc/common.nix | 2 +- pkgs/development/libraries/gmp/6.x.nix | 4 ++-- pkgs/development/libraries/libopcodes/default.nix | 3 ++- pkgs/development/libraries/ncurses/default.nix | 3 ++- pkgs/development/tools/misc/binutils/default.nix | 3 ++- pkgs/os-specific/linux/busybox/default.nix | 2 +- pkgs/os-specific/linux/kernel-headers/4.4.nix | 3 ++- pkgs/shells/bash/4.4.nix | 4 ++-- 11 files changed, 20 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix index 0f6c4ed36d4..4e68d21be0c 100644 --- a/pkgs/applications/networking/browsers/lynx/default.nix +++ b/pkgs/applications/networking/browsers/lynx/default.nix @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-widec" ] ++ stdenv.lib.optional sslSupport "--with-ssl"; - nativeBuildInputs = stdenv.lib.optional sslSupport pkgconfig - ++ stdenv.lib.optional (hostPlatform != buildPlatform) buildPackages.stdenv.cc - ++ [ nukeReferences ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ nukeReferences ] + ++ stdenv.lib.optional sslSupport pkgconfig; buildInputs = [ ncurses gzip ] ++ stdenv.lib.optional sslSupport openssl.dev; diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 24c5b4335c4..fe6090c3230 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -102,7 +102,8 @@ stdenv.mkDerivation rec { rm -rf ffmpeg ''; - nativeBuildInputs = [ buildPackages.stdenv.cc pkgconfig yasm ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ pkgconfig yasm ]; buildInputs = with stdenv.lib; [ freetype ffmpeg ] ++ optional aalibSupport aalib diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index 709e87c3445..f109d20f573 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -277,6 +277,7 @@ stdenv.mkDerivation ({ inherit noSysDirs staticCompiler langJava libcCross crossMingw; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ texinfo which gettext ] ++ (optional (perl != null) perl) ++ (optional javaAwtGtk pkgconfig); @@ -287,7 +288,6 @@ stdenv.mkDerivation ({ ++ (optionals langJava [ boehmgc zip unzip ]) ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) ++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools]) - ++ (optionals (buildPlatform != hostPlatform) [buildPackages.stdenv.cc]) ++ (optionals langAda [gnatboot]) ++ (optionals langVhdl [gnat]) diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 86f3be15fea..c5d8dbf9bcb 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -121,7 +121,7 @@ stdenv.mkDerivation ({ outputs = [ "out" "bin" "dev" "static" ]; - nativeBuildInputs = lib.optional (cross != null) buildPackages.stdenv.cc; + depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = lib.optionals withGd [ gd libpng ]; # Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index e3bacc86d58..dce052f8baa 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -19,8 +19,8 @@ let self = stdenv.mkDerivation rec { outputs = [ "out" "dev" "info" ]; passthru.static = self.out; - nativeBuildInputs = [ m4 ] - ++ stdenv.lib.optional (buildPlatform != hostPlatform) buildPackages.stdenv.cc; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ m4 ]; configureFlags = # Build a "fat binary", with routines for several sub-architectures diff --git a/pkgs/development/libraries/libopcodes/default.nix b/pkgs/development/libraries/libopcodes/default.nix index 7ffc40f1494..d6d6989761b 100644 --- a/pkgs/development/libraries/libopcodes/default.nix +++ b/pkgs/development/libraries/libopcodes/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { find . ../include/opcode -type f -exec sed {} -i -e 's/"bfd.h"//' \; ''; - nativeBuildInputs = [ autoreconfHook264 bison buildPackages.stdenv.cc ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ autoreconfHook264 bison ]; buildInputs = [ libiberty ]; # dis-asm.h includes bfd.h propagatedBuildInputs = [ libbfd ]; diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 9aade8b9672..79414f016d3 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -37,10 +37,11 @@ stdenv.mkDerivation rec { # Only the C compiler, and explicitly not C++ compiler needs this flag on solaris: CFLAGS = lib.optionalString stdenv.isSunOS "-D_XOPEN_SOURCE_EXTENDED"; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ pkgconfig ] ++ lib.optionals (buildPlatform != hostPlatform) [ - buildPackages.ncurses buildPackages.stdenv.cc + buildPackages.ncurses ]; buildInputs = lib.optional (mouseSupport && stdenv.isLinux) gpm; diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 1b016652699..9cf0e1236e0 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -65,7 +65,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "info" "man" ]; - nativeBuildInputs = [ bison buildPackages.stdenv.cc ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ bison ]; buildInputs = [ zlib ]; inherit noSysDirs; diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index bcb24d127cc..73c945fa0ba 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { makeFlagsArray+=("CC=${stdenv.cc.targetPrefix}gcc -isystem ${musl}/include -B${musl}/lib -L${musl}/lib") ''; - nativeBuildInputs = lib.optional (hostPlatform != buildPlatform) buildPackages.stdenv.cc; + depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = lib.optionals (enableStatic && !useMusl) [ stdenv.cc.libc stdenv.cc.libc.static ]; diff --git a/pkgs/os-specific/linux/kernel-headers/4.4.nix b/pkgs/os-specific/linux/kernel-headers/4.4.nix index 0ef5280d13b..e8e041f48eb 100644 --- a/pkgs/os-specific/linux/kernel-headers/4.4.nix +++ b/pkgs/os-specific/linux/kernel-headers/4.4.nix @@ -24,7 +24,8 @@ stdenvNoCC.mkDerivation { # It may look odd that we use `stdenvNoCC`, and yet explicit depend on a cc. # We do this so we have a build->build, not build->host, C compiler. - nativeBuildInputs = [ buildPackages.stdenv.cc perl ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ perl ]; extraIncludeDirs = lib.optional hostPlatform.isPowerPC ["ppc"]; diff --git a/pkgs/shells/bash/4.4.nix b/pkgs/shells/bash/4.4.nix index b4a2ba55388..5635c6a73be 100644 --- a/pkgs/shells/bash/4.4.nix +++ b/pkgs/shells/bash/4.4.nix @@ -68,10 +68,10 @@ stdenv.mkDerivation rec { ]; # Note: Bison is needed because the patches above modify parse.y. + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [bison] ++ optional (texinfo != null) texinfo - ++ optional hostPlatform.isDarwin binutils - ++ optional (hostPlatform != buildPlatform) buildPackages.stdenv.cc; + ++ optional hostPlatform.isDarwin binutils; buildInputs = optional interactive readline70; From bc23afe5c7fd9095b1e49fccc51a42a18dd220c4 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 17 Aug 2017 02:05:56 -0400 Subject: [PATCH 137/331] gcc: Add build->build dep for C compilers 5 already had this, but I forgot the other versions. --- pkgs/development/compilers/gcc/4.5/default.nix | 1 + pkgs/development/compilers/gcc/4.8/default.nix | 1 + pkgs/development/compilers/gcc/4.9/default.nix | 1 + pkgs/development/compilers/gcc/6/default.nix | 1 + pkgs/development/compilers/gcc/7/default.nix | 1 + pkgs/development/compilers/gcc/snapshot/default.nix | 1 + 6 files changed, 6 insertions(+) diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index 36fde924e9b..9f8a3bd6fb6 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -229,6 +229,7 @@ stdenv.mkDerivation ({ inherit noSysDirs profiledCompiler staticCompiler langJava libcCross crossMingw; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ texinfo which gettext ] ++ optional (perl != null) perl; diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index e626abc50d1..65f95846f02 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -267,6 +267,7 @@ stdenv.mkDerivation ({ inherit noSysDirs staticCompiler langJava libcCross crossMingw; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ texinfo which gettext ] ++ (optional (perl != null) perl) ++ (optional javaAwtGtk pkgconfig); diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 621c45cdff3..5cc6dbffd15 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -262,6 +262,7 @@ stdenv.mkDerivation ({ inherit noSysDirs staticCompiler langJava libcCross crossMingw; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ texinfo which gettext ] ++ (optional (perl != null) perl) ++ (optional javaAwtGtk pkgconfig); diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 33a034adf66..d9e1a71ae3a 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -276,6 +276,7 @@ stdenv.mkDerivation ({ inherit noSysDirs staticCompiler langJava libcCross crossMingw; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ texinfo which gettext ] ++ (optional (perl != null) perl) ++ (optional javaAwtGtk pkgconfig); diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 291ec944b55..76a636bb2dc 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -273,6 +273,7 @@ stdenv.mkDerivation ({ inherit noSysDirs staticCompiler langJava libcCross crossMingw; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ texinfo which gettext ] ++ (optional (perl != null) perl) ++ (optional javaAwtGtk pkgconfig); diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix index e8668712e2e..4857eb5e517 100644 --- a/pkgs/development/compilers/gcc/snapshot/default.nix +++ b/pkgs/development/compilers/gcc/snapshot/default.nix @@ -260,6 +260,7 @@ stdenv.mkDerivation ({ inherit noSysDirs staticCompiler langJava libcCross crossMingw; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ texinfo which gettext ] ++ (optional (perl != null) perl) ++ (optional javaAwtGtk pkgconfig); From 114a9b625386e3ca4e142dce6ce8bcfcabea8fe3 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 18 Aug 2017 13:58:48 -0400 Subject: [PATCH 138/331] gcc: Let cc-wrapper's setup hook define any tool env vars we need --- .../development/compilers/gcc/4.5/default.nix | 47 ------------------- .../development/compilers/gcc/4.8/default.nix | 47 +------------------ .../development/compilers/gcc/4.9/default.nix | 47 +------------------ pkgs/development/compilers/gcc/5/default.nix | 47 +------------------ pkgs/development/compilers/gcc/6/default.nix | 47 +------------------ pkgs/development/compilers/gcc/7/default.nix | 47 +------------------ .../compilers/gcc/snapshot/default.nix | 47 +------------------ 7 files changed, 6 insertions(+), 323 deletions(-) diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index 9f8a3bd6fb6..23dcacd837d 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -315,56 +315,9 @@ stdenv.mkDerivation ({ /* For cross-built gcc (build != host == target) */ crossAttrs = { - AR_FOR_BUILD = "ar"; - AS_FOR_BUILD = "as"; - LD_FOR_BUILD = "ld"; - NM_FOR_BUILD = "nm"; - OBJCOPY_FOR_BUILD = "objcopy"; - OBJDUMP_FOR_BUILD = "objdump"; - RANLIB_FOR_BUILD = "ranlib"; - SIZE_FOR_BUILD = "size"; - STRINGS_FOR_BUILD = "strings"; - STRIP_FOR_BUILD = "strip"; - CC_FOR_BUILD = "gcc"; - CXX_FOR_BUILD = "g++"; - - AR = "${targetPlatform.config}-ar"; - AS = "${targetPlatform.config}-as"; - LD = "${targetPlatform.config}-ld"; - NM = "${targetPlatform.config}-nm"; - OBJCOPY = "${targetPlatform.config}-objcopy"; - OBJDUMP = "${targetPlatform.config}-objdump"; - RANLIB = "${targetPlatform.config}-ranlib"; - SIZE = "${targetPlatform.config}-size"; - STRINGS = "${targetPlatform.config}-strings"; - STRIP = "${targetPlatform.config}-strip"; - CC = "${targetPlatform.config}-gcc"; - CXX = "${targetPlatform.config}-g++"; - - AR_FOR_TARGET = "${targetPlatform.config}-ar"; - AS_FOR_TARGET = "${targetPlatform.config}-as"; - LD_FOR_TARGET = "${targetPlatform.config}-ld"; - NM_FOR_TARGET = "${targetPlatform.config}-nm"; - OBJCOPY_FOR_TARGET = "${targetPlatform.config}-objcopy"; - OBJDUMP_FOR_TARGET = "${targetPlatform.config}-objdump"; - RANLIB_FOR_TARGET = "${targetPlatform.config}-ranlib"; - SIZE_FOR_TARGET = "${targetPlatform.config}-size"; - STRINGS_FOR_TARGET = "${targetPlatform.config}-strings"; - STRIP_FOR_TARGET = "${targetPlatform.config}-strip"; - CC_FOR_TARGET = "${targetPlatform.config}-gcc"; - CXX_FOR_TARGET = "${targetPlatform.config}-g++"; - dontStrip = true; }; - NIX_BUILD_BINTOOLS = buildPackages.stdenv.cc.bintools; - NIX_BUILD_CC = buildPackages.stdenv.cc; - - # Needed for the cross compilation to work - AR = "ar"; - LD = "ld"; - CC = "gcc"; - # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the # library headers and binaries, regarless of the language being compiled. # diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 65f95846f02..c828b7776ad 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -398,57 +398,12 @@ stdenv.mkDerivation ({ /* For cross-built gcc (build != host == target) */ crossAttrs = { - AR_FOR_BUILD = "ar"; - AS_FOR_BUILD = "as"; - LD_FOR_BUILD = "ld"; - NM_FOR_BUILD = "nm"; - OBJCOPY_FOR_BUILD = "objcopy"; - OBJDUMP_FOR_BUILD = "objdump"; - RANLIB_FOR_BUILD = "ranlib"; - SIZE_FOR_BUILD = "size"; - STRINGS_FOR_BUILD = "strings"; - STRIP_FOR_BUILD = "strip"; - CC_FOR_BUILD = "gcc"; - CXX_FOR_BUILD = "g++"; - - AR = "${targetPlatform.config}-ar"; - AS = "${targetPlatform.config}-as"; - LD = "${targetPlatform.config}-ld"; - NM = "${targetPlatform.config}-nm"; - OBJCOPY = "${targetPlatform.config}-objcopy"; - OBJDUMP = "${targetPlatform.config}-objdump"; - RANLIB = "${targetPlatform.config}-ranlib"; - SIZE = "${targetPlatform.config}-size"; - STRINGS = "${targetPlatform.config}-strings"; - STRIP = "${targetPlatform.config}-strip"; - CC = "${targetPlatform.config}-gcc"; - CXX = "${targetPlatform.config}-g++"; - - AR_FOR_TARGET = "${targetPlatform.config}-ar"; - AS_FOR_TARGET = "${targetPlatform.config}-as"; - LD_FOR_TARGET = "${targetPlatform.config}-ld"; - NM_FOR_TARGET = "${targetPlatform.config}-nm"; - OBJCOPY_FOR_TARGET = "${targetPlatform.config}-objcopy"; - OBJDUMP_FOR_TARGET = "${targetPlatform.config}-objdump"; - RANLIB_FOR_TARGET = "${targetPlatform.config}-ranlib"; - SIZE_FOR_TARGET = "${targetPlatform.config}-size"; - STRINGS_FOR_TARGET = "${targetPlatform.config}-strings"; - STRIP_FOR_TARGET = "${targetPlatform.config}-strip"; - CC_FOR_TARGET = "${targetPlatform.config}-gcc"; - CXX_FOR_TARGET = "${targetPlatform.config}-g++"; - dontStrip = true; buildFlags = ""; }; - NIX_BUILD_BINTOOLS = buildPackages.stdenv.cc.bintools; - NIX_BUILD_CC = buildPackages.stdenv.cc; - - # Needed for the cross compilation to work - AR = "ar"; - LD = "ld"; # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 - CC = if stdenv.system == "x86_64-solaris" then "gcc -m64" else "gcc"; + CC = if hostPlatform.system == "x86_64-solaris" then "gcc -m64" else "gcc"; # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the # library headers and binaries, regarless of the language being compiled. diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 5cc6dbffd15..7aa5610b539 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -396,57 +396,12 @@ stdenv.mkDerivation ({ /* For cross-built gcc (build != host == target) */ crossAttrs = { - AR_FOR_BUILD = "ar"; - AS_FOR_BUILD = "as"; - LD_FOR_BUILD = "ld"; - NM_FOR_BUILD = "nm"; - OBJCOPY_FOR_BUILD = "objcopy"; - OBJDUMP_FOR_BUILD = "objdump"; - RANLIB_FOR_BUILD = "ranlib"; - SIZE_FOR_BUILD = "size"; - STRINGS_FOR_BUILD = "strings"; - STRIP_FOR_BUILD = "strip"; - CC_FOR_BUILD = "gcc"; - CXX_FOR_BUILD = "g++"; - - AR = "${targetPlatform.config}-ar"; - AS = "${targetPlatform.config}-as"; - LD = "${targetPlatform.config}-ld"; - NM = "${targetPlatform.config}-nm"; - OBJCOPY = "${targetPlatform.config}-objcopy"; - OBJDUMP = "${targetPlatform.config}-objdump"; - RANLIB = "${targetPlatform.config}-ranlib"; - SIZE = "${targetPlatform.config}-size"; - STRINGS = "${targetPlatform.config}-strings"; - STRIP = "${targetPlatform.config}-strip"; - CC = "${targetPlatform.config}-gcc"; - CXX = "${targetPlatform.config}-g++"; - - AR_FOR_TARGET = "${targetPlatform.config}-ar"; - AS_FOR_TARGET = "${targetPlatform.config}-as"; - LD_FOR_TARGET = "${targetPlatform.config}-ld"; - NM_FOR_TARGET = "${targetPlatform.config}-nm"; - OBJCOPY_FOR_TARGET = "${targetPlatform.config}-objcopy"; - OBJDUMP_FOR_TARGET = "${targetPlatform.config}-objdump"; - RANLIB_FOR_TARGET = "${targetPlatform.config}-ranlib"; - SIZE_FOR_TARGET = "${targetPlatform.config}-size"; - STRINGS_FOR_TARGET = "${targetPlatform.config}-strings"; - STRIP_FOR_TARGET = "${targetPlatform.config}-strip"; - CC_FOR_TARGET = "${targetPlatform.config}-gcc"; - CXX_FOR_TARGET = "${targetPlatform.config}-g++"; - dontStrip = true; buildFlags = ""; }; - NIX_BUILD_BINTOOLS = buildPackages.stdenv.cc.bintools; - NIX_BUILD_CC = buildPackages.stdenv.cc; - - # Needed for the cross compilation to work - AR = "ar"; - LD = "ld"; # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 - CC = if stdenv.system == "x86_64-solaris" then "gcc -m64" else "gcc"; + CC = if hostPlatform.system == "x86_64-solaris" then "gcc -m64" else "gcc"; # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the # library headers and binaries, regarless of the language being compiled. diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index f109d20f573..3a7ad0a4c59 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -404,57 +404,12 @@ stdenv.mkDerivation ({ /* For cross-built gcc (build != host == target) */ crossAttrs = { - AR_FOR_BUILD = "ar"; - AS_FOR_BUILD = "as"; - LD_FOR_BUILD = "ld"; - NM_FOR_BUILD = "nm"; - OBJCOPY_FOR_BUILD = "objcopy"; - OBJDUMP_FOR_BUILD = "objdump"; - RANLIB_FOR_BUILD = "ranlib"; - SIZE_FOR_BUILD = "size"; - STRINGS_FOR_BUILD = "strings"; - STRIP_FOR_BUILD = "strip"; - CC_FOR_BUILD = "gcc"; - CXX_FOR_BUILD = "g++"; - - AR = "${targetPlatform.config}-ar"; - AS = "${targetPlatform.config}-as"; - LD = "${targetPlatform.config}-ld"; - NM = "${targetPlatform.config}-nm"; - OBJCOPY = "${targetPlatform.config}-objcopy"; - OBJDUMP = "${targetPlatform.config}-objdump"; - RANLIB = "${targetPlatform.config}-ranlib"; - SIZE = "${targetPlatform.config}-size"; - STRINGS = "${targetPlatform.config}-strings"; - STRIP = "${targetPlatform.config}-strip"; - CC = "${targetPlatform.config}-gcc"; - CXX = "${targetPlatform.config}-g++"; - - AR_FOR_TARGET = "${targetPlatform.config}-ar"; - AS_FOR_TARGET = "${targetPlatform.config}-as"; - LD_FOR_TARGET = "${targetPlatform.config}-ld"; - NM_FOR_TARGET = "${targetPlatform.config}-nm"; - OBJCOPY_FOR_TARGET = "${targetPlatform.config}-objcopy"; - OBJDUMP_FOR_TARGET = "${targetPlatform.config}-objdump"; - RANLIB_FOR_TARGET = "${targetPlatform.config}-ranlib"; - SIZE_FOR_TARGET = "${targetPlatform.config}-size"; - STRINGS_FOR_TARGET = "${targetPlatform.config}-strings"; - STRIP_FOR_TARGET = "${targetPlatform.config}-strip"; - CC_FOR_TARGET = "${targetPlatform.config}-gcc"; - CXX_FOR_TARGET = "${targetPlatform.config}-g++"; - dontStrip = true; buildFlags = ""; }; - NIX_BUILD_BINTOOLS = buildPackages.stdenv.cc.bintools; - NIX_BUILD_CC = buildPackages.stdenv.cc; - - # Needed for the cross compilation to work - AR = "ar"; - LD = "ld"; # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 - CC = if stdenv.system == "x86_64-solaris" then "gcc -m64" else "gcc"; + CC = if hostPlatform.system == "x86_64-solaris" then "gcc -m64" else "gcc"; # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the # library headers and binaries, regarless of the language being compiled. diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index d9e1a71ae3a..894abdb43fb 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -406,57 +406,12 @@ stdenv.mkDerivation ({ /* For cross-built gcc (build != host == target) */ crossAttrs = { - AR_FOR_BUILD = "ar"; - AS_FOR_BUILD = "as"; - LD_FOR_BUILD = "ld"; - NM_FOR_BUILD = "nm"; - OBJCOPY_FOR_BUILD = "objcopy"; - OBJDUMP_FOR_BUILD = "objdump"; - RANLIB_FOR_BUILD = "ranlib"; - SIZE_FOR_BUILD = "size"; - STRINGS_FOR_BUILD = "strings"; - STRIP_FOR_BUILD = "strip"; - CC_FOR_BUILD = "gcc"; - CXX_FOR_BUILD = "g++"; - - AR = "${targetPlatform.config}-ar"; - AS = "${targetPlatform.config}-as"; - LD = "${targetPlatform.config}-ld"; - NM = "${targetPlatform.config}-nm"; - OBJCOPY = "${targetPlatform.config}-objcopy"; - OBJDUMP = "${targetPlatform.config}-objdump"; - RANLIB = "${targetPlatform.config}-ranlib"; - SIZE = "${targetPlatform.config}-size"; - STRINGS = "${targetPlatform.config}-strings"; - STRIP = "${targetPlatform.config}-strip"; - CC = "${targetPlatform.config}-gcc"; - CXX = "${targetPlatform.config}-g++"; - - AR_FOR_TARGET = "${targetPlatform.config}-ar"; - AS_FOR_TARGET = "${targetPlatform.config}-as"; - LD_FOR_TARGET = "${targetPlatform.config}-ld"; - NM_FOR_TARGET = "${targetPlatform.config}-nm"; - OBJCOPY_FOR_TARGET = "${targetPlatform.config}-objcopy"; - OBJDUMP_FOR_TARGET = "${targetPlatform.config}-objdump"; - RANLIB_FOR_TARGET = "${targetPlatform.config}-ranlib"; - SIZE_FOR_TARGET = "${targetPlatform.config}-size"; - STRINGS_FOR_TARGET = "${targetPlatform.config}-strings"; - STRIP_FOR_TARGET = "${targetPlatform.config}-strip"; - CC_FOR_TARGET = "${targetPlatform.config}-gcc"; - CXX_FOR_TARGET = "${targetPlatform.config}-g++"; - dontStrip = true; buildFlags = ""; }; - NIX_BUILD_BINTOOLS = buildPackages.stdenv.cc.bintools; - NIX_BUILD_CC = buildPackages.stdenv.cc; - - # Needed for the cross compilation to work - AR = "ar"; - LD = "ld"; # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 - CC = if stdenv.system == "x86_64-solaris" then "gcc -m64" else "gcc"; + CC = if hostPlatform.system == "x86_64-solaris" then "gcc -m64" else "gcc"; # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the # library headers and binaries, regarless of the language being compiled. diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 76a636bb2dc..09e111f37fb 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -400,57 +400,12 @@ stdenv.mkDerivation ({ /* For cross-built gcc (build != host == target) */ crossAttrs = { - AR_FOR_BUILD = "ar"; - AS_FOR_BUILD = "as"; - LD_FOR_BUILD = "ld"; - NM_FOR_BUILD = "nm"; - OBJCOPY_FOR_BUILD = "objcopy"; - OBJDUMP_FOR_BUILD = "objdump"; - RANLIB_FOR_BUILD = "ranlib"; - SIZE_FOR_BUILD = "size"; - STRINGS_FOR_BUILD = "strings"; - STRIP_FOR_BUILD = "strip"; - CC_FOR_BUILD = "gcc"; - CXX_FOR_BUILD = "g++"; - - AR = "${targetPlatform.config}-ar"; - AS = "${targetPlatform.config}-as"; - LD = "${targetPlatform.config}-ld"; - NM = "${targetPlatform.config}-nm"; - OBJCOPY = "${targetPlatform.config}-objcopy"; - OBJDUMP = "${targetPlatform.config}-objdump"; - RANLIB = "${targetPlatform.config}-ranlib"; - SIZE = "${targetPlatform.config}-size"; - STRINGS = "${targetPlatform.config}-strings"; - STRIP = "${targetPlatform.config}-strip"; - CC = "${targetPlatform.config}-gcc"; - CXX = "${targetPlatform.config}-g++"; - - AR_FOR_TARGET = "${targetPlatform.config}-ar"; - AS_FOR_TARGET = "${targetPlatform.config}-as"; - LD_FOR_TARGET = "${targetPlatform.config}-ld"; - NM_FOR_TARGET = "${targetPlatform.config}-nm"; - OBJCOPY_FOR_TARGET = "${targetPlatform.config}-objcopy"; - OBJDUMP_FOR_TARGET = "${targetPlatform.config}-objdump"; - RANLIB_FOR_TARGET = "${targetPlatform.config}-ranlib"; - SIZE_FOR_TARGET = "${targetPlatform.config}-size"; - STRINGS_FOR_TARGET = "${targetPlatform.config}-strings"; - STRIP_FOR_TARGET = "${targetPlatform.config}-strip"; - CC_FOR_TARGET = "${targetPlatform.config}-gcc"; - CXX_FOR_TARGET = "${targetPlatform.config}-g++"; - dontStrip = true; buildFlags = ""; }; - NIX_BUILD_BINTOOLS = buildPackages.stdenv.cc.bintools; - NIX_BUILD_CC = buildPackages.stdenv.cc; - - # Needed for the cross compilation to work - AR = "ar"; - LD = "ld"; # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 - CC = if stdenv.system == "x86_64-solaris" then "gcc -m64" else "gcc"; + CC = if hostPlatform.system == "x86_64-solaris" then "gcc -m64" else "gcc"; # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the # library headers and binaries, regarless of the language being compiled. diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix index 4857eb5e517..95534780977 100644 --- a/pkgs/development/compilers/gcc/snapshot/default.nix +++ b/pkgs/development/compilers/gcc/snapshot/default.nix @@ -387,57 +387,12 @@ stdenv.mkDerivation ({ /* For cross-built gcc (build != host == target) */ crossAttrs = { - AR_FOR_BUILD = "ar"; - AS_FOR_BUILD = "as"; - LD_FOR_BUILD = "ld"; - NM_FOR_BUILD = "nm"; - OBJCOPY_FOR_BUILD = "objcopy"; - OBJDUMP_FOR_BUILD = "objdump"; - RANLIB_FOR_BUILD = "ranlib"; - SIZE_FOR_BUILD = "size"; - STRINGS_FOR_BUILD = "strings"; - STRIP_FOR_BUILD = "strip"; - CC_FOR_BUILD = "gcc"; - CXX_FOR_BUILD = "g++"; - - AR = "${targetPlatform.config}-ar"; - AS = "${targetPlatform.config}-as"; - LD = "${targetPlatform.config}-ld"; - NM = "${targetPlatform.config}-nm"; - OBJCOPY = "${targetPlatform.config}-objcopy"; - OBJDUMP = "${targetPlatform.config}-objdump"; - RANLIB = "${targetPlatform.config}-ranlib"; - SIZE = "${targetPlatform.config}-size"; - STRINGS = "${targetPlatform.config}-strings"; - STRIP = "${targetPlatform.config}-strip"; - CC = "${targetPlatform.config}-gcc"; - CXX = "${targetPlatform.config}-g++"; - - AR_FOR_TARGET = "${targetPlatform.config}-ar"; - AS_FOR_TARGET = "${targetPlatform.config}-as"; - LD_FOR_TARGET = "${targetPlatform.config}-ld"; - NM_FOR_TARGET = "${targetPlatform.config}-nm"; - OBJCOPY_FOR_TARGET = "${targetPlatform.config}-objcopy"; - OBJDUMP_FOR_TARGET = "${targetPlatform.config}-objdump"; - RANLIB_FOR_TARGET = "${targetPlatform.config}-ranlib"; - SIZE_FOR_TARGET = "${targetPlatform.config}-size"; - STRINGS_FOR_TARGET = "${targetPlatform.config}-strings"; - STRIP_FOR_TARGET = "${targetPlatform.config}-strip"; - CC_FOR_TARGET = "${targetPlatform.config}-gcc"; - CXX_FOR_TARGET = "${targetPlatform.config}-g++"; - dontStrip = true; buildFlags = ""; }; - NIX_BUILD_BINTOOLS = buildPackages.stdenv.cc.bintools; - NIX_BUILD_CC = buildPackages.stdenv.cc; - - # Needed for the cross compilation to work - AR = "ar"; - LD = "ld"; # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 - CC = if stdenv.system == "x86_64-solaris" then "gcc -m64" else "gcc"; + CC = if hostPlatform.system == "x86_64-solaris" then "gcc -m64" else "gcc"; # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the # library headers and binaries, regarless of the language being compiled. From 9cda2f5559bcbc8ca279521561f6096b35c7f07a Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 4 Sep 2017 15:48:52 -0400 Subject: [PATCH 139/331] gcc: Fix deps, for cross and consistency Mainly making sure we have tools to build target libs --- pkgs/development/compilers/gcc/4.5/default.nix | 14 ++++++++++++-- pkgs/development/compilers/gcc/4.9/default.nix | 14 ++++++++++++-- pkgs/development/compilers/gcc/5/default.nix | 17 ++++++++++++----- pkgs/development/compilers/gcc/6/default.nix | 17 ++++++++++++----- pkgs/development/compilers/gcc/7/default.nix | 17 ++++++++++++----- .../compilers/gcc/snapshot/default.nix | 17 ++++++++++++----- 6 files changed, 72 insertions(+), 24 deletions(-) diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index 23dcacd837d..0d02d46d91b 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -233,8 +233,18 @@ stdenv.mkDerivation ({ nativeBuildInputs = [ texinfo which gettext ] ++ optional (perl != null) perl; - buildInputs = [ gmp mpfr libmpc libelf ] - ++ (optional (ppl != null) ppl) + # For building runtime libs + depsBuildTarget = + if hostPlatform == buildPlatform then [ + targetPackages.stdenv.cc.bintools # newly-built gcc will be used + ] else assert targetPlatform == hostPlatform; [ # build != host == target + stdenv.cc + ]; + + buildInputs = [ + gmp mpfr libmpc libelf + targetPackages.stdenv.cc.bintools # For linking code at run-time + ] ++ (optional (ppl != null) ppl) ++ (optional (cloogppl != null) cloogppl) ++ (optional (zlib != null) zlib) ++ (optional langJava boehmgc) diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 7aa5610b539..f564a44ca46 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -267,8 +267,18 @@ stdenv.mkDerivation ({ ++ (optional (perl != null) perl) ++ (optional javaAwtGtk pkgconfig); - buildInputs = [ gmp mpfr libmpc libelf ] - ++ (optional (cloog != null) cloog) + # For building runtime libs + depsBuildTarget = + if hostPlatform == buildPlatform then [ + targetPackages.stdenv.cc.bintools # newly-built gcc will be used + ] else assert targetPlatform == hostPlatform; [ # build != host == target + stdenv.cc + ]; + + buildInputs = [ + gmp mpfr libmpc libelf + targetPackages.stdenv.cc.bintools # For linking code at run-time + ] ++ (optional (cloog != null) cloog) ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index 3a7ad0a4c59..6ccd47c9729 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -49,9 +49,6 @@ assert libelf != null -> zlib != null; # Make sure we get GNU sed. assert hostPlatform.isDarwin -> gnused != null; -# Need c++filt on darwin -assert hostPlatform.isDarwin -> targetPackages.stdenv.cc.bintools or null != null; - # The go frontend is written in c++ assert langGo -> langCC; @@ -282,8 +279,18 @@ stdenv.mkDerivation ({ ++ (optional (perl != null) perl) ++ (optional javaAwtGtk pkgconfig); - buildInputs = [ gmp mpfr libmpc libelf ] - ++ (optional (isl != null) isl) + # For building runtime libs + depsBuildTarget = + if hostPlatform == buildPlatform then [ + targetPackages.stdenv.cc.bintools # newly-built gcc will be used + ] else assert targetPlatform == hostPlatform; [ # build != host == target + stdenv.cc + ]; + + buildInputs = [ + gmp mpfr libmpc libelf + targetPackages.stdenv.cc.bintools # For linking code at run-time + ] ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 894abdb43fb..ab4cdfe4db6 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -49,9 +49,6 @@ assert libelf != null -> zlib != null; # Make sure we get GNU sed. assert hostPlatform.isDarwin -> gnused != null; -# Need c++filt on darwin -assert hostPlatform.isDarwin -> targetPackages.stdenv.cc.bintools or null != null; - # The go frontend is written in c++ assert langGo -> langCC; @@ -281,8 +278,18 @@ stdenv.mkDerivation ({ ++ (optional (perl != null) perl) ++ (optional javaAwtGtk pkgconfig); - buildInputs = [ gmp mpfr libmpc libelf ] - ++ (optional (isl != null) isl) + # For building runtime libs + depsBuildTarget = + if hostPlatform == buildPlatform then [ + targetPackages.stdenv.cc.bintools # newly-built gcc will be used + ] else assert targetPlatform == hostPlatform; [ # build != host == target + stdenv.cc + ]; + + buildInputs = [ + gmp mpfr libmpc libelf + targetPackages.stdenv.cc.bintools # For linking code at run-time + ] ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 09e111f37fb..acf61aea002 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -50,9 +50,6 @@ assert libelf != null -> zlib != null; # Make sure we get GNU sed. assert hostPlatform.isDarwin -> gnused != null; -# Need c++filt on darwin -assert hostPlatform.isDarwin -> targetPackages.stdenv.cc.bintools or null != null; - # The go frontend is written in c++ assert langGo -> langCC; @@ -278,8 +275,18 @@ stdenv.mkDerivation ({ ++ (optional (perl != null) perl) ++ (optional javaAwtGtk pkgconfig); - buildInputs = [ gmp mpfr libmpc libelf flex ] - ++ (optional (isl != null) isl) + # For building runtime libs + depsBuildTarget = + if hostPlatform == buildPlatform then [ + targetPackages.stdenv.cc.bintools # newly-built gcc will be used + ] else assert targetPlatform == hostPlatform; [ # build != host == target + stdenv.cc + ]; + + buildInputs = [ + gmp mpfr libmpc libelf flex + targetPackages.stdenv.cc.bintools # For linking code at run-time + ] ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix index 95534780977..d48b7ba8d55 100644 --- a/pkgs/development/compilers/gcc/snapshot/default.nix +++ b/pkgs/development/compilers/gcc/snapshot/default.nix @@ -50,9 +50,6 @@ assert libelf != null -> zlib != null; # Make sure we get GNU sed. assert hostPlatform.isDarwin -> gnused != null; -# Need c++filt on darwin -assert hostPlatform.isDarwin -> targetPackages.stdenv.cc.bintools or null != null; - # The go frontend is written in c++ assert langGo -> langCC; @@ -265,8 +262,18 @@ stdenv.mkDerivation ({ ++ (optional (perl != null) perl) ++ (optional javaAwtGtk pkgconfig); - buildInputs = [ gmp mpfr libmpc libelf flex ] - ++ (optional (isl != null) isl) + # For building runtime libs + depsBuildTarget = + if hostPlatform == buildPlatform then [ + targetPackages.stdenv.cc.bintools # newly-built gcc will be used + ] else assert targetPlatform == hostPlatform; [ # build != host == target + stdenv.cc + ]; + + buildInputs = [ + gmp mpfr libmpc libelf flex + targetPackages.stdenv.cc.bintools # For linking code at run-time + ] ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) From 0f5c80463176f7b146e8ef1943a3bbd61d4cbaf0 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 28 Nov 2017 18:15:31 -0500 Subject: [PATCH 140/331] gcc, binutils: Get rid of 32-bit ARM configure flag exception Now that we do `--enable-targes=all`, there is no risk of missing the needed emulation. This reverts commit ebc9b161cd184502bf4912b9348a507e2d0540da. This reverts commit 88efc22b44dedf423398491f9a55d1631b0b50ff. --- pkgs/development/compilers/gcc/4.5/default.nix | 6 +----- pkgs/development/compilers/gcc/4.8/default.nix | 6 +----- pkgs/development/compilers/gcc/4.9/default.nix | 6 +----- pkgs/development/compilers/gcc/5/default.nix | 6 +----- pkgs/development/compilers/gcc/6/default.nix | 6 +----- pkgs/development/compilers/gcc/7/default.nix | 6 +----- pkgs/development/compilers/gcc/snapshot/default.nix | 6 +----- pkgs/development/tools/misc/binutils/default.nix | 6 +----- 8 files changed, 8 insertions(+), 40 deletions(-) diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index 0d02d46d91b..a312276b33e 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -256,11 +256,7 @@ stdenv.mkDerivation ({ ; # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = - # TODO(@Ericson2314): Figure out what's going wrong with Arm - if hostPlatform == targetPlatform && targetPlatform.isArm - then [] - else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; configureFlags = # Basic dependencies diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index c828b7776ad..a55820d7e13 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -298,11 +298,7 @@ stdenv.mkDerivation ({ dontDisableStatic = true; # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = - # TODO(@Ericson2314): Figure out what's going wrong with Arm - if hostPlatform == targetPlatform && targetPlatform.isArm - then [] - else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; configureFlags = # Basic dependencies diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index f564a44ca46..6bb1f35bd99 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -307,11 +307,7 @@ stdenv.mkDerivation ({ dontDisableStatic = true; # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = - # TODO(@Ericson2314): Figure out what's going wrong with Arm - if hostPlatform == targetPlatform && targetPlatform.isArm - then [] - else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; configureFlags = # Basic dependencies diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index 6ccd47c9729..64922d83b50 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -316,11 +316,7 @@ stdenv.mkDerivation ({ dontDisableStatic = true; # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = - # TODO(@Ericson2314): Figure out what's going wrong with Arm - if hostPlatform == targetPlatform && targetPlatform.isArm - then [] - else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; configureFlags = # Basic dependencies diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index ab4cdfe4db6..00f6cf8ab27 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -319,11 +319,7 @@ stdenv.mkDerivation ({ dontDisableStatic = true; # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = - # TODO(@Ericson2314): Figure out what's going wrong with Arm - if hostPlatform == targetPlatform && targetPlatform.isArm - then [] - else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; configureFlags = # Basic dependencies diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index acf61aea002..5016735b56c 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -312,11 +312,7 @@ stdenv.mkDerivation ({ dontDisableStatic = true; # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = - # TODO(@Ericson2314): Figure out what's going wrong with Arm - if hostPlatform == targetPlatform && targetPlatform.isArm - then [] - else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; configureFlags = # Basic dependencies diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix index d48b7ba8d55..0b25d113b5a 100644 --- a/pkgs/development/compilers/gcc/snapshot/default.nix +++ b/pkgs/development/compilers/gcc/snapshot/default.nix @@ -299,11 +299,7 @@ stdenv.mkDerivation ({ dontDisableStatic = true; # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = - # TODO(@Ericson2314): Figure out what's going wrong with Arm - if hostPlatform == targetPlatform && targetPlatform.isArm - then [] - else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; configureFlags = # Basic dependencies diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 9cf0e1236e0..31c86c785c2 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -91,11 +91,7 @@ stdenv.mkDerivation rec { else "-static-libgcc"; # TODO(@Ericson2314): Always pass "--target" and always targetPrefix. - configurePlatforms = - # TODO(@Ericson2314): Figure out what's going wrong with Arm - if hostPlatform == targetPlatform && targetPlatform.isArm - then [] - else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; configureFlags = [ "--enable-targets=all" "--enable-64-bit-bfd" From 4ad9a97e9678c70ca974c43fe3ef27f0e65af15a Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 28 Nov 2017 18:37:11 -0500 Subject: [PATCH 141/331] gcc: Don't let solaris hack pollute CC elsehwere --- pkgs/development/compilers/gcc/4.8/default.nix | 2 +- pkgs/development/compilers/gcc/4.9/default.nix | 2 +- pkgs/development/compilers/gcc/5/default.nix | 2 +- pkgs/development/compilers/gcc/6/default.nix | 2 +- pkgs/development/compilers/gcc/7/default.nix | 2 +- pkgs/development/compilers/gcc/snapshot/default.nix | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index a55820d7e13..91daeadba70 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -399,7 +399,7 @@ stdenv.mkDerivation ({ }; # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 - CC = if hostPlatform.system == "x86_64-solaris" then "gcc -m64" else "gcc"; + ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the # library headers and binaries, regarless of the language being compiled. diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 6bb1f35bd99..844e0a7bebf 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -407,7 +407,7 @@ stdenv.mkDerivation ({ }; # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 - CC = if hostPlatform.system == "x86_64-solaris" then "gcc -m64" else "gcc"; + ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the # library headers and binaries, regarless of the language being compiled. diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index 64922d83b50..148409bee9b 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -412,7 +412,7 @@ stdenv.mkDerivation ({ }; # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 - CC = if hostPlatform.system == "x86_64-solaris" then "gcc -m64" else "gcc"; + ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the # library headers and binaries, regarless of the language being compiled. diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 00f6cf8ab27..c6114b7e639 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -414,7 +414,7 @@ stdenv.mkDerivation ({ }; # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 - CC = if hostPlatform.system == "x86_64-solaris" then "gcc -m64" else "gcc"; + ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the # library headers and binaries, regarless of the language being compiled. diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 5016735b56c..c20546b59e8 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -408,7 +408,7 @@ stdenv.mkDerivation ({ }; # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 - CC = if hostPlatform.system == "x86_64-solaris" then "gcc -m64" else "gcc"; + ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the # library headers and binaries, regarless of the language being compiled. diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix index 0b25d113b5a..c571487361b 100644 --- a/pkgs/development/compilers/gcc/snapshot/default.nix +++ b/pkgs/development/compilers/gcc/snapshot/default.nix @@ -395,7 +395,7 @@ stdenv.mkDerivation ({ }; # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 - CC = if hostPlatform.system == "x86_64-solaris" then "gcc -m64" else "gcc"; + ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the # library headers and binaries, regarless of the language being compiled. From a1cdc2011ed049cf8a7a0f2f7909d401dc8d9457 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 7 Jul 2017 15:57:01 -0400 Subject: [PATCH 142/331] strip setup hook: Learn about only stripping host/target binaries alone `dontStrip` is still a catch-all, but `dontStripHost` and `dontStripTarget` are also now available for finer-grained disabling. --- pkgs/build-support/setup-hooks/strip.sh | 37 +++++++++++++++++++------ 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/pkgs/build-support/setup-hooks/strip.sh b/pkgs/build-support/setup-hooks/strip.sh index a33968ca18d..fc4c7bfbaf9 100644 --- a/pkgs/build-support/setup-hooks/strip.sh +++ b/pkgs/build-support/setup-hooks/strip.sh @@ -3,24 +3,45 @@ fixupOutputHooks+=(_doStrip) _doStrip() { - if [ -z "$dontStrip" ]; then + # We don't bother to strip build platform code because it shouldn't make it + # to $out anyways---if it does, that's a bigger problem that a lack of + # stripping will help catch. + local -ra flags=(dontStripHost dontStripTarget) + local -ra stripCmds=(STRIP TARGET_STRIP) + + # Optimization + if [[ "$STRIP" == "$TARGET_STRIP" ]]; then + dontStripTarget+=1 + fi + + local i + for i in ${!stripCmds[@]}; do + local -n flag="${flags[$i]}" + local -n stripCmd="${stripCmds[$i]}" + + # `dontStrip` disables them all + if [[ "$dontStrip" || "$flag" ]] || ! type -f "$stripCmd" 2>/dev/null + then continue; fi + stripDebugList=${stripDebugList:-lib lib32 lib64 libexec bin sbin} if [ -n "$stripDebugList" ]; then - stripDirs "$stripDebugList" "${stripDebugFlags:--S}" + stripDirs "$stripCmd" "$stripDebugList" "${stripDebugFlags:--S}" fi stripAllList=${stripAllList:-} if [ -n "$stripAllList" ]; then - stripDirs "$stripAllList" "${stripAllFlags:--s}" + stripDirs "$stripCmd" "$stripAllList" "${stripAllFlags:--s}" fi - fi + done } stripDirs() { - local dirs="$1" - local stripFlags="$2" + local cmd="$1" + local dirs="$2" + local stripFlags="$3" local dirsNew= + local d for d in ${dirs}; do if [ -d "$prefix/$d" ]; then dirsNew="${dirsNew} $prefix/$d " @@ -29,8 +50,8 @@ stripDirs() { dirs=${dirsNew} if [ -n "${dirs}" ]; then - header "stripping (with flags $stripFlags) in$dirs" - find $dirs -type f -print0 | xargs -0 ${xargsFlags:--r} $STRIP $commonStripFlags $stripFlags 2>/dev/null || true + header "stripping (with command $cmd and flags $stripFlags) in$dirs" + find $dirs -type f -print0 | xargs -0 ${xargsFlags:--r} $cmd $commonStripFlags $stripFlags 2>/dev/null || true stopNest fi } From 046f091e0d9853a81ce4d484a75cfa1b5fc9347d Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 10 Aug 2017 18:22:07 -0400 Subject: [PATCH 143/331] treewide: Don't use envHook anymore This commits needs a MAJOR audit as I oftentimes just guessed which of `$hostOffset`, `$targetOffset`, or a fixed offset should be used. --- pkgs/applications/science/logic/coq/8.4.nix | 2 +- pkgs/applications/science/logic/coq/default.nix | 2 +- pkgs/applications/science/math/R/setup-hook.sh | 6 ++++-- pkgs/build-support/emacs/setup-hook.sh | 6 +++++- pkgs/build-support/gcc-wrapper-old/setup-hook.sh | 4 ++-- pkgs/build-support/setup-hooks/find-xml-catalogs.sh | 2 +- pkgs/build-support/setup-hooks/set-java-classpath.sh | 2 +- pkgs/build-support/setup-hooks/setup-debug-info-dirs.sh | 2 +- pkgs/build-support/setup-hooks/wrap-gapps-hook.sh | 2 +- pkgs/data/icons/hicolor-icon-theme/setup-hook.sh | 3 ++- pkgs/desktops/gnome-3/core/grilo/setup-hook.sh | 2 +- pkgs/desktops/gnustep/make/setup-hook.sh | 2 +- pkgs/development/compilers/chicken/setup-hook.sh | 2 +- pkgs/development/compilers/go/setup-hook.sh | 2 +- pkgs/development/compilers/haxe/setup-hook.sh | 2 +- pkgs/development/compilers/sbcl/default.nix | 2 +- pkgs/development/idris-modules/build-idris-package.nix | 3 ++- pkgs/development/idris-modules/with-packages.nix | 2 +- pkgs/development/interpreters/elixir/setup-hook.sh | 2 +- pkgs/development/interpreters/erlang/setup-hook.sh | 2 +- pkgs/development/interpreters/guile/setup-hook-2.0.sh | 2 +- pkgs/development/interpreters/guile/setup-hook-2.2.sh | 2 +- pkgs/development/interpreters/guile/setup-hook.sh | 2 +- pkgs/development/interpreters/jruby/default.nix | 2 +- pkgs/development/interpreters/perl/setup-hook.sh | 2 +- pkgs/development/interpreters/python/setup-hook.sh | 2 +- pkgs/development/interpreters/ruby/default.nix | 2 +- pkgs/development/libraries/SDL/setup-hook.sh | 6 +----- pkgs/development/libraries/SDL2/setup-hook.sh | 6 +----- pkgs/development/libraries/gdk-pixbuf/setup-hook.sh | 2 +- pkgs/development/libraries/glib/setup-hook.sh | 2 +- .../libraries/gobject-introspection/setup-hook.sh | 2 +- pkgs/development/libraries/grantlee/5/setup-hook.sh | 6 +----- pkgs/development/libraries/gstreamer/core/setup-hook.sh | 2 +- .../libraries/gstreamer/legacy/gstreamer/setup-hook.sh | 2 +- .../kde-frameworks/extra-cmake-modules/setup-hook.sh | 2 +- .../libraries/kde-frameworks/kdoctools/setup-hook.sh | 2 +- pkgs/development/libraries/librep/setup-hook.sh | 2 +- pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh | 6 +----- pkgs/development/libraries/rep-gtk/setup-hook.sh | 2 +- pkgs/development/libraries/slib/setup-hook.sh | 2 +- pkgs/development/lisp-modules/clwrapper/setup-hook.sh | 2 +- pkgs/development/ocaml-modules/eliom/setup-hook.sh | 2 +- pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh | 2 +- pkgs/development/tools/build-managers/cmake/setup-hook.sh | 6 +----- pkgs/development/tools/misc/automake/setup-hook.sh | 2 +- pkgs/development/tools/misc/pkgconfig/setup-hook.sh | 6 +----- pkgs/development/tools/ocaml/findlib/default.nix | 2 +- pkgs/development/web/nodejs/setup-hook.sh | 2 +- pkgs/os-specific/darwin/apple-sdk/framework-setup-hook.sh | 2 +- pkgs/os-specific/darwin/apple-sdk/security-setup-hook.sh | 2 +- pkgs/tools/text/sgml/opensp/setup-hook.sh | 2 +- pkgs/tools/typesetting/tex/tetex/setup-hook.sh | 2 +- pkgs/tools/typesetting/tex/texlive/setup-hook.sh | 2 +- 54 files changed, 64 insertions(+), 80 deletions(-) diff --git a/pkgs/applications/science/logic/coq/8.4.nix b/pkgs/applications/science/logic/coq/8.4.nix index 1f7ef571eaf..64b0f85aed2 100644 --- a/pkgs/applications/science/logic/coq/8.4.nix +++ b/pkgs/applications/science/logic/coq/8.4.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation { fi } - envHooks=(''${envHooks[@]} addCoqPath) + addEnvHooks "$targetOffset" addCoqPath ''; passthru = { diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 6ab98f30ae6..9e27ebe9773 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -109,7 +109,7 @@ self = stdenv.mkDerivation { fi } - envHooks=(''${envHooks[@]} addCoqPath) + addEnvHooks "$targetOffset" addCoqPath ''; preConfigure = '' diff --git a/pkgs/applications/science/math/R/setup-hook.sh b/pkgs/applications/science/math/R/setup-hook.sh index 09a775db9bf..6951e2a4b61 100644 --- a/pkgs/applications/science/math/R/setup-hook.sh +++ b/pkgs/applications/science/math/R/setup-hook.sh @@ -1,5 +1,7 @@ addRLibPath () { - addToSearchPath R_LIBS_SITE $1/library + if [[ -d "$1/library" ]]; then + addToSearchPath R_LIBS_SITE "$1/library" + fi } -envHooks+=(addRLibPath) +addEnvHooks "$targetOffset" addRLibPath diff --git a/pkgs/build-support/emacs/setup-hook.sh b/pkgs/build-support/emacs/setup-hook.sh index defef45b55f..e1db3e828fd 100644 --- a/pkgs/build-support/emacs/setup-hook.sh +++ b/pkgs/build-support/emacs/setup-hook.sh @@ -4,4 +4,8 @@ addEmacsVars () { fi } -envHooks+=(addEmacsVars) +# If this is for a wrapper derivation, emacs and the dependencies are all +# run-time dependencies. If this is for precompiling packages into bytecode, +# emacs is a compile-time dependency of the package. +addEnvHooks "$targetOffset" addEmacsVars +addEnvHooks "$targetOffset" addEmacsVars diff --git a/pkgs/build-support/gcc-wrapper-old/setup-hook.sh b/pkgs/build-support/gcc-wrapper-old/setup-hook.sh index d8bdf858ae5..ad3ffeffbbb 100644 --- a/pkgs/build-support/gcc-wrapper-old/setup-hook.sh +++ b/pkgs/build-support/gcc-wrapper-old/setup-hook.sh @@ -1,4 +1,4 @@ -addCVars () { +gccWrapperOld_addCVars () { if test -d $1/include; then export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem $1/include" fi @@ -12,7 +12,7 @@ addCVars () { fi } -envHooks=(${envHooks[@]} addCVars) +envBuildBuildHooks+=(gccWrapperOld_addCVars) # Note: these come *after* $out in the PATH (see setup.sh). diff --git a/pkgs/build-support/setup-hooks/find-xml-catalogs.sh b/pkgs/build-support/setup-hooks/find-xml-catalogs.sh index b742d5a8ffd..85364a61f61 100644 --- a/pkgs/build-support/setup-hooks/find-xml-catalogs.sh +++ b/pkgs/build-support/setup-hooks/find-xml-catalogs.sh @@ -18,5 +18,5 @@ if [ -z "$libxmlHookDone" ]; then # xmllint and xsltproc from looking in /etc/xml/catalog. export XML_CATALOG_FILES if [ -z "$XML_CATALOG_FILES" ]; then XML_CATALOG_FILES=" "; fi - envHooks+=(addXMLCatalogs) + addEnvHooks "$hostOffset" addXMLCatalogs fi diff --git a/pkgs/build-support/setup-hooks/set-java-classpath.sh b/pkgs/build-support/setup-hooks/set-java-classpath.sh index 047da91bc97..5d3548dc2e8 100644 --- a/pkgs/build-support/setup-hooks/set-java-classpath.sh +++ b/pkgs/build-support/setup-hooks/set-java-classpath.sh @@ -10,4 +10,4 @@ addPkgToClassPath () { done } -envHooks+=(addPkgToClassPath) +addEnvHooks "$targetOffset" addPkgToClassPath diff --git a/pkgs/build-support/setup-hooks/setup-debug-info-dirs.sh b/pkgs/build-support/setup-hooks/setup-debug-info-dirs.sh index 2fd2a2d6da6..96bf48cf123 100644 --- a/pkgs/build-support/setup-hooks/setup-debug-info-dirs.sh +++ b/pkgs/build-support/setup-hooks/setup-debug-info-dirs.sh @@ -2,4 +2,4 @@ setupDebugInfoDirs () { addToSearchPath NIX_DEBUG_INFO_DIRS $1/lib/debug } -envHooks+=(setupDebugInfoDirs) +addEnvHooks "$targetOffset" setupDebugInfoDirs diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh index 79b8d5b73fa..25ac12996cc 100644 --- a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh +++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh @@ -6,7 +6,7 @@ find_gio_modules() { fi } -envHooks+=(find_gio_modules) +addEnvHooks "$targetOffset" find_gio_modules # Note: $gappsWrapperArgs still gets defined even if $dontWrapGApps is set. wrapGAppsHook() { diff --git a/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh b/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh index 05ab9b3d65d..29306cb316a 100644 --- a/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh +++ b/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh @@ -8,7 +8,8 @@ hicolorIconThemeHook() { } -envHooks+=(hicolorIconThemeHook) +# I think this is meant to be a runtime dep +addEnvHooks "$hostOffset" hicolorIconThemeHook # Remove icon cache hicolorPreFixupPhase() { diff --git a/pkgs/desktops/gnome-3/core/grilo/setup-hook.sh b/pkgs/desktops/gnome-3/core/grilo/setup-hook.sh index 3291e38addb..9337c520a20 100644 --- a/pkgs/desktops/gnome-3/core/grilo/setup-hook.sh +++ b/pkgs/desktops/gnome-3/core/grilo/setup-hook.sh @@ -4,4 +4,4 @@ make_grilo_find_plugins() { fi } -envHooks+=(make_grilo_find_plugins) +addEnvHooks "$hostOffset" make_grilo_find_plugins diff --git a/pkgs/desktops/gnustep/make/setup-hook.sh b/pkgs/desktops/gnustep/make/setup-hook.sh index 71618ef960f..53138901116 100644 --- a/pkgs/desktops/gnustep/make/setup-hook.sh +++ b/pkgs/desktops/gnustep/make/setup-hook.sh @@ -74,4 +74,4 @@ addEnvVars() { addToSearchPath NIX_GNUSTEP_SYSTEM_DOC_INFO "$tmp" fi } -envHooks=(${envHooks[@]} addEnvVars) +addEnvHooks "$targetOffset" addEnvVars diff --git a/pkgs/development/compilers/chicken/setup-hook.sh b/pkgs/development/compilers/chicken/setup-hook.sh index d7f28539dc6..b0d9b53b537 100644 --- a/pkgs/development/compilers/chicken/setup-hook.sh +++ b/pkgs/development/compilers/chicken/setup-hook.sh @@ -4,4 +4,4 @@ addChickenRepositoryPath() { export CHICKEN_INCLUDE_PATH="$1/share;$CHICKEN_INCLUDE_PATH" } -envHooks=(${envHooks[@]} addChickenRepositoryPath) +addEnvHooks "$targetOffset" addChickenRepositoryPath diff --git a/pkgs/development/compilers/go/setup-hook.sh b/pkgs/development/compilers/go/setup-hook.sh index 1b91c8312b8..7dce15eeb10 100644 --- a/pkgs/development/compilers/go/setup-hook.sh +++ b/pkgs/development/compilers/go/setup-hook.sh @@ -2,4 +2,4 @@ addToGoPath() { addToSearchPath GOPATH $1/share/go } -envHooks=(${envHooks[@]} addToGoPath) +addEnvHooks "$targetOffset" addToGoPath diff --git a/pkgs/development/compilers/haxe/setup-hook.sh b/pkgs/development/compilers/haxe/setup-hook.sh index 21cc0206859..e6496107a5e 100644 --- a/pkgs/development/compilers/haxe/setup-hook.sh +++ b/pkgs/development/compilers/haxe/setup-hook.sh @@ -4,4 +4,4 @@ addHaxeLibPath() { fi } -envHooks+=(addHaxeLibPath) +addEnvHooks "$targetOffset" addHaxeLibPath diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index b800d71198a..cd3120ed831 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { # Specifying $SBCL_HOME is only truly needed with `purgeNixReferences = true`. setupHook = writeText "setupHook.sh" '' - envHooks+=(_setSbclHome) + addEnvHooks "$targetOffset" _setSbclHome _setSbclHome() { export SBCL_HOME='@out@/lib/sbcl/' } diff --git a/pkgs/development/idris-modules/build-idris-package.nix b/pkgs/development/idris-modules/build-idris-package.nix index 9dfa3430ed8..66eddd0e360 100644 --- a/pkgs/development/idris-modules/build-idris-package.nix +++ b/pkgs/development/idris-modules/build-idris-package.nix @@ -18,7 +18,8 @@ fi } - envHooks+=(addIdrisLibs) + # All run-time deps + addEnvHooks 0 addIdrisLibs ''; buildPhase = '' diff --git a/pkgs/development/idris-modules/with-packages.nix b/pkgs/development/idris-modules/with-packages.nix index d2b09808ec1..d4638670f69 100644 --- a/pkgs/development/idris-modules/with-packages.nix +++ b/pkgs/development/idris-modules/with-packages.nix @@ -14,7 +14,7 @@ fi } - envHooks+=(installIdrisLib) + envHostTargetHooks+=(installIdrisLib) ''; unpackPhase = '' diff --git a/pkgs/development/interpreters/elixir/setup-hook.sh b/pkgs/development/interpreters/elixir/setup-hook.sh index 2ed3b2e6454..501eca3cf02 100644 --- a/pkgs/development/interpreters/elixir/setup-hook.sh +++ b/pkgs/development/interpreters/elixir/setup-hook.sh @@ -2,4 +2,4 @@ addErlLibPath() { addToSearchPath ERL_LIBS $1/lib/elixir/lib } -envHooks+=(addErlLibPath) +addEnvHooks "$hostOffset" addErlLibPath diff --git a/pkgs/development/interpreters/erlang/setup-hook.sh b/pkgs/development/interpreters/erlang/setup-hook.sh index 68c0f762dfc..3962d154ba9 100644 --- a/pkgs/development/interpreters/erlang/setup-hook.sh +++ b/pkgs/development/interpreters/erlang/setup-hook.sh @@ -2,4 +2,4 @@ addErlangLibPath() { addToSearchPath ERL_LIBS $1/lib/erlang/lib } -envHooks+=(addErlangLibPath) +addEnvHooks "$hostOffset" addErlangLibPath diff --git a/pkgs/development/interpreters/guile/setup-hook-2.0.sh b/pkgs/development/interpreters/guile/setup-hook-2.0.sh index fd1dc944ed4..c7fb4f70fc6 100644 --- a/pkgs/development/interpreters/guile/setup-hook-2.0.sh +++ b/pkgs/development/interpreters/guile/setup-hook-2.0.sh @@ -10,4 +10,4 @@ addGuileLibPath () { fi } -envHooks+=(addGuileLibPath) +addEnvHooks "$hostOffset" addGuileLibPath diff --git a/pkgs/development/interpreters/guile/setup-hook-2.2.sh b/pkgs/development/interpreters/guile/setup-hook-2.2.sh index 86c1e0d3e4a..73e700bde02 100644 --- a/pkgs/development/interpreters/guile/setup-hook-2.2.sh +++ b/pkgs/development/interpreters/guile/setup-hook-2.2.sh @@ -10,4 +10,4 @@ addGuileLibPath () { fi } -envHooks+=(addGuileLibPath) +addEnvHooks "$hostOffset" addGuileLibPath diff --git a/pkgs/development/interpreters/guile/setup-hook.sh b/pkgs/development/interpreters/guile/setup-hook.sh index c1d19e579ed..bf04fee1e89 100644 --- a/pkgs/development/interpreters/guile/setup-hook.sh +++ b/pkgs/development/interpreters/guile/setup-hook.sh @@ -5,4 +5,4 @@ addGuileLibPath () { fi } -envHooks+=(addGuileLibPath) +addEnvHooks "$hostOffset" addGuileLibPath diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index ff192c07286..2224a13ba7c 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -36,7 +36,7 @@ jruby = stdenv.mkDerivation rec { addToSearchPath GEM_PATH \$1/${passthru.gemPath} } - envHooks+=(addGemPath) + addEnvHooks "$hostOffset" addGemPath EOF ''; diff --git a/pkgs/development/interpreters/perl/setup-hook.sh b/pkgs/development/interpreters/perl/setup-hook.sh index a8656b8531d..7909412806c 100644 --- a/pkgs/development/interpreters/perl/setup-hook.sh +++ b/pkgs/development/interpreters/perl/setup-hook.sh @@ -2,4 +2,4 @@ addPerlLibPath () { addToSearchPath PERL5LIB $1/lib/perl5/site_perl } -envHooks+=(addPerlLibPath) +addEnvHooks "$hostOffset" addPerlLibPath diff --git a/pkgs/development/interpreters/python/setup-hook.sh b/pkgs/development/interpreters/python/setup-hook.sh index dda9bed39f8..3599478537e 100644 --- a/pkgs/development/interpreters/python/setup-hook.sh +++ b/pkgs/development/interpreters/python/setup-hook.sh @@ -12,7 +12,7 @@ toPythonPath() { echo $result } -envHooks+=(addPythonPath) +addEnvHooks "$hostOffset" addPythonPath # Determinism: The interpreter is patched to write null timestamps when compiling python files. # This way python doesn't try to update them when we freeze timestamps in nix store. diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index d664c00bc31..478c2b45b26 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -142,7 +142,7 @@ let addToSearchPath GEM_PATH \$1/${passthru.gemPath} } - envHooks+=(addGemPath) + addEnvHooks "$hostOffset" addGemPath EOF '' + opString useRailsExpress '' rbConfig=$(find $out/lib/ruby -name rbconfig.rb) diff --git a/pkgs/development/libraries/SDL/setup-hook.sh b/pkgs/development/libraries/SDL/setup-hook.sh index 3696e743a07..20382f18f52 100644 --- a/pkgs/development/libraries/SDL/setup-hook.sh +++ b/pkgs/development/libraries/SDL/setup-hook.sh @@ -4,8 +4,4 @@ addSDLPath () { fi } -if test -n "$crossConfig"; then - crossEnvHooks+=(addSDLPath) -else - envHooks+=(addSDLPath) -fi +addEnvHooks "$hostOffset" addSDLPath diff --git a/pkgs/development/libraries/SDL2/setup-hook.sh b/pkgs/development/libraries/SDL2/setup-hook.sh index 5a26440f37b..3acce9d473c 100644 --- a/pkgs/development/libraries/SDL2/setup-hook.sh +++ b/pkgs/development/libraries/SDL2/setup-hook.sh @@ -4,8 +4,4 @@ addSDL2Path () { fi } -if test -n "$crossConfig"; then - crossEnvHooks+=(addSDL2Path) -else - envHooks+=(addSDL2Path) -fi +addEnvHooks "$hostOffset" addSDL2Path diff --git a/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh b/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh index ba7ab82f50b..5a7dcd79299 100644 --- a/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh +++ b/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh @@ -14,4 +14,4 @@ findGdkPixbufLoaders() { } -envHooks+=(findGdkPixbufLoaders) +addEnvHooks "$hostOffset" findGdkPixbufLoaders diff --git a/pkgs/development/libraries/glib/setup-hook.sh b/pkgs/development/libraries/glib/setup-hook.sh index c5cf293902c..98341376fdf 100644 --- a/pkgs/development/libraries/glib/setup-hook.sh +++ b/pkgs/development/libraries/glib/setup-hook.sh @@ -5,7 +5,7 @@ make_glib_find_gsettings_schemas() { addToSearchPath GSETTINGS_SCHEMAS_PATH "$1/share/gsettings-schemas/"* fi } -envHooks+=(make_glib_find_gsettings_schemas) +addEnvHooks "$hostOffset" make_glib_find_gsettings_schemas # Install gschemas, if any, in a package-specific directory glibPreInstallPhase() { diff --git a/pkgs/development/libraries/gobject-introspection/setup-hook.sh b/pkgs/development/libraries/gobject-introspection/setup-hook.sh index 583d8475ec3..6d3488a6622 100644 --- a/pkgs/development/libraries/gobject-introspection/setup-hook.sh +++ b/pkgs/development/libraries/gobject-introspection/setup-hook.sh @@ -11,7 +11,7 @@ make_gobject_introspection_find_gir_files() { fi } -envHooks+=(make_gobject_introspection_find_gir_files) +addEnvHooks "$hostOffset" make_gobject_introspection_find_gir_files _multioutMoveGlibGir() { moveToOutput share/gir-1.0 "${!outputDev}" diff --git a/pkgs/development/libraries/grantlee/5/setup-hook.sh b/pkgs/development/libraries/grantlee/5/setup-hook.sh index aaa64868dc9..b51cb4a3190 100644 --- a/pkgs/development/libraries/grantlee/5/setup-hook.sh +++ b/pkgs/development/libraries/grantlee/5/setup-hook.sh @@ -10,8 +10,4 @@ _grantleeEnvHook() { propagatedUserEnvPkgs+=" $1" fi } -if [ "$crossEnv" ]; then - crossEnvHooks+=(_grantleeEnvHook) -else - envHooks+=(_grantleeEnvHook) -fi +addEnvHooks "$hostOffset" _grantleeEnvHook diff --git a/pkgs/development/libraries/gstreamer/core/setup-hook.sh b/pkgs/development/libraries/gstreamer/core/setup-hook.sh index 3dd7812ece6..b8c741af578 100644 --- a/pkgs/development/libraries/gstreamer/core/setup-hook.sh +++ b/pkgs/development/libraries/gstreamer/core/setup-hook.sh @@ -5,5 +5,5 @@ addGstreamer1LibPath () { fi } -envHooks+=(addGstreamer1LibPath) +addEnvHooks "$hostOffset" addGstreamer1LibPath diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh b/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh index e89aeda5bc1..65ce2611251 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh @@ -5,4 +5,4 @@ addGstreamerLibPath () { fi } -envHooks+=(addGstreamerLibPath) +addEnvHooks "$hostOffset" addGstreamerLibPath diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh index c1b1e21852c..88091e78a0c 100644 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh @@ -2,7 +2,7 @@ _ecmEnvHook() { addToSearchPath XDG_DATA_DIRS "$1/share" addToSearchPath XDG_CONFIG_DIRS "$1/etc/xdg" } -envHooks+=(_ecmEnvHook) +addEnvHooks "$targetOffset" _ecmEnvHook _ecmPreConfigureHook() { # Because we need to use absolute paths here, we must set *all* the paths. diff --git a/pkgs/development/libraries/kde-frameworks/kdoctools/setup-hook.sh b/pkgs/development/libraries/kde-frameworks/kdoctools/setup-hook.sh index 5cfffbd622d..2928d9b34db 100644 --- a/pkgs/development/libraries/kde-frameworks/kdoctools/setup-hook.sh +++ b/pkgs/development/libraries/kde-frameworks/kdoctools/setup-hook.sh @@ -2,4 +2,4 @@ addXdgData() { addToSearchPath XDG_DATA_DIRS "$1/share" } -envHooks+=(addXdgData) +addEnvHooks "$targetOffset" addXdgData diff --git a/pkgs/development/libraries/librep/setup-hook.sh b/pkgs/development/libraries/librep/setup-hook.sh index 420d63d6c51..4d875b69330 100644 --- a/pkgs/development/libraries/librep/setup-hook.sh +++ b/pkgs/development/libraries/librep/setup-hook.sh @@ -2,4 +2,4 @@ addRepDLLoadPath () { addToSearchPath REP_DL_LOAD_PATH $1/lib/rep } -envHooks+=(addRepDLLoadPath) +addEnvHooks "$hostOffset" addRepDLLoadPath diff --git a/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh b/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh index 8ec7eeda8ae..754a75cbef4 100644 --- a/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh +++ b/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh @@ -42,11 +42,7 @@ qtEnvHook() { propagatedUserEnvPkgs+=" $1" fi } -if [ "$crossConfig" ]; then - crossEnvHooks+=(qtEnvHook) -else - envHooks+=(qtEnvHook) -fi +envHostTargetHooks+=(qtEnvHook) postPatchMkspecs() { local bin="${!outputBin}" diff --git a/pkgs/development/libraries/rep-gtk/setup-hook.sh b/pkgs/development/libraries/rep-gtk/setup-hook.sh index 420d63d6c51..4d875b69330 100644 --- a/pkgs/development/libraries/rep-gtk/setup-hook.sh +++ b/pkgs/development/libraries/rep-gtk/setup-hook.sh @@ -2,4 +2,4 @@ addRepDLLoadPath () { addToSearchPath REP_DL_LOAD_PATH $1/lib/rep } -envHooks+=(addRepDLLoadPath) +addEnvHooks "$hostOffset" addRepDLLoadPath diff --git a/pkgs/development/libraries/slib/setup-hook.sh b/pkgs/development/libraries/slib/setup-hook.sh index 62b72d6dc0a..3c7e91e8188 100644 --- a/pkgs/development/libraries/slib/setup-hook.sh +++ b/pkgs/development/libraries/slib/setup-hook.sh @@ -10,4 +10,4 @@ addSlibPath () { fi } -envHooks+=(addSlibPath) +addEnvHooks "$hostOffset" addSlibPath diff --git a/pkgs/development/lisp-modules/clwrapper/setup-hook.sh b/pkgs/development/lisp-modules/clwrapper/setup-hook.sh index 7ac8c70d59f..eb6052d58db 100644 --- a/pkgs/development/lisp-modules/clwrapper/setup-hook.sh +++ b/pkgs/development/lisp-modules/clwrapper/setup-hook.sh @@ -31,7 +31,7 @@ collectNixLispLDLP () { export NIX_LISP_COMMAND NIX_LISP CL_SOURCE_REGISTRY NIX_LISP_ASDF -envHooks+=(addASDFPaths setLisp collectNixLispLDLP) +addEnvHooks "$targetOffset" addASDFPaths setLisp collectNixLispLDLP mkdir -p "$HOME"/.cache/common-lisp || HOME="$TMP/.temp-$USER-home" mkdir -p "$HOME"/.cache/common-lisp diff --git a/pkgs/development/ocaml-modules/eliom/setup-hook.sh b/pkgs/development/ocaml-modules/eliom/setup-hook.sh index 096d8f8bf63..9868ab93f79 100644 --- a/pkgs/development/ocaml-modules/eliom/setup-hook.sh +++ b/pkgs/development/ocaml-modules/eliom/setup-hook.sh @@ -2,4 +2,4 @@ addOcsigenDistilleryTemplate() { addToSearchPathWithCustomDelimiter : ELIOM_DISTILLERY_PATH $1/eliom-distillery-templates } -envHooks+=(addOcsigenDistilleryTemplate) +addEnvHooks "$hostOffset" addOcsigenDistilleryTemplate diff --git a/pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh b/pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh index a93a7250beb..6d950437016 100644 --- a/pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh +++ b/pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh @@ -2,4 +2,4 @@ addOcamlMakefile () { export OCAMLMAKEFILE="@out@/include/OCamlMakefile" } -envHooks+=(addOcamlMakefile) +addEnvHooks "$targetOffset" addOcamlMakefile diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index 614e0031421..a92d54b3f14 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -72,11 +72,7 @@ if [ -z "$dontUseCmakeConfigure" -a -z "$configurePhase" ]; then configurePhase=cmakeConfigurePhase fi -if [ -n "$crossConfig" ]; then - crossEnvHooks+=(addCMakeParams) -else - envHooks+=(addCMakeParams) -fi +addEnvHooks "$targetOffset" addCMakeParams makeCmakeFindLibs(){ isystem_seen= diff --git a/pkgs/development/tools/misc/automake/setup-hook.sh b/pkgs/development/tools/misc/automake/setup-hook.sh index 5cd8c6229f6..292632b7cbc 100644 --- a/pkgs/development/tools/misc/automake/setup-hook.sh +++ b/pkgs/development/tools/misc/automake/setup-hook.sh @@ -2,4 +2,4 @@ addAclocals () { addToSearchPathWithCustomDelimiter : ACLOCAL_PATH $1/share/aclocal } -envHooks+=(addAclocals) +addEnvHooks "$hostOffset" addAclocals diff --git a/pkgs/development/tools/misc/pkgconfig/setup-hook.sh b/pkgs/development/tools/misc/pkgconfig/setup-hook.sh index 1c153976a34..34a9b9f1173 100644 --- a/pkgs/development/tools/misc/pkgconfig/setup-hook.sh +++ b/pkgs/development/tools/misc/pkgconfig/setup-hook.sh @@ -3,8 +3,4 @@ addPkgConfigPath () { addToSearchPath PKG_CONFIG_PATH $1/share/pkgconfig } -if test -n "$crossConfig"; then - crossEnvHooks+=(addPkgConfigPath) -else - envHooks+=(addPkgConfigPath) -fi +addEnvHooks "$targetOffset" addPkgConfigPath diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 846546ae769..186b78ce3f3 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { fi } - envHooks+=(addOCamlPath) + addEnvHooks "$targetOffset" addOCamlPath ''; meta = { diff --git a/pkgs/development/web/nodejs/setup-hook.sh b/pkgs/development/web/nodejs/setup-hook.sh index e1f4d9089f3..18368588c2a 100644 --- a/pkgs/development/web/nodejs/setup-hook.sh +++ b/pkgs/development/web/nodejs/setup-hook.sh @@ -2,4 +2,4 @@ addNodePath () { addToSearchPath NODE_PATH $1/lib/node_modules } -envHooks+=(addNodePath) +addEnvHooks "$hostOffset" addNodePath diff --git a/pkgs/os-specific/darwin/apple-sdk/framework-setup-hook.sh b/pkgs/os-specific/darwin/apple-sdk/framework-setup-hook.sh index 04d8e878f4f..b0d5915fc1f 100644 --- a/pkgs/os-specific/darwin/apple-sdk/framework-setup-hook.sh +++ b/pkgs/os-specific/darwin/apple-sdk/framework-setup-hook.sh @@ -39,4 +39,4 @@ useSystemCoreFoundationFramework () { export NIX_COREFOUNDATION_RPATH=/System/Library/Frameworks } -envHooks+=(useSystemCoreFoundationFramework) +addEnvHooks "$hostOffset" useSystemCoreFoundationFramework diff --git a/pkgs/os-specific/darwin/apple-sdk/security-setup-hook.sh b/pkgs/os-specific/darwin/apple-sdk/security-setup-hook.sh index f31adaa0d74..ed9bdbd912d 100644 --- a/pkgs/os-specific/darwin/apple-sdk/security-setup-hook.sh +++ b/pkgs/os-specific/darwin/apple-sdk/security-setup-hook.sh @@ -7,4 +7,4 @@ noDeprecatedDeclarations() { fi } -envHooks+=(noDeprecatedDeclarations) +addEnvHooks "$hostOffset" noDeprecatedDeclarations diff --git a/pkgs/tools/text/sgml/opensp/setup-hook.sh b/pkgs/tools/text/sgml/opensp/setup-hook.sh index 52da517a8cb..753a3ea6428 100644 --- a/pkgs/tools/text/sgml/opensp/setup-hook.sh +++ b/pkgs/tools/text/sgml/opensp/setup-hook.sh @@ -18,5 +18,5 @@ if test -z "$sgmlHookDone"; then export ftp_proxy=http://nodtd.invalid/ export SGML_CATALOG_FILES - envHooks+=(addSGMLCatalogs) + addEnvHooks "$targetOffset" addSGMLCatalogs fi diff --git a/pkgs/tools/typesetting/tex/tetex/setup-hook.sh b/pkgs/tools/typesetting/tex/tetex/setup-hook.sh index 9c5424e881e..5faef7fe5df 100644 --- a/pkgs/tools/typesetting/tex/tetex/setup-hook.sh +++ b/pkgs/tools/typesetting/tex/tetex/setup-hook.sh @@ -4,4 +4,4 @@ addTeXMFPath () { fi } -envHooks+=(addTeXMFPath) +addEnvHooks "$targetOffset" addTeXMFPath diff --git a/pkgs/tools/typesetting/tex/texlive/setup-hook.sh b/pkgs/tools/typesetting/tex/texlive/setup-hook.sh index 9c5424e881e..5faef7fe5df 100644 --- a/pkgs/tools/typesetting/tex/texlive/setup-hook.sh +++ b/pkgs/tools/typesetting/tex/texlive/setup-hook.sh @@ -4,4 +4,4 @@ addTeXMFPath () { fi } -envHooks+=(addTeXMFPath) +addEnvHooks "$targetOffset" addTeXMFPath From e0f1739c75c5bd2618d90789627b173066656f78 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 12 Aug 2017 12:41:49 -0400 Subject: [PATCH 144/331] treewide: Don't use `nativePkgs` or `crossPkgs` anymore --- pkgs/development/haskell-modules/generic-builder.nix | 4 ++-- pkgs/servers/x11/xorg/builder.sh | 7 +------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 3e82003be43..9a1d7e398c0 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -222,8 +222,8 @@ stdenv.mkDerivation ({ setupCompileFlags="${concatStringsSep " " setupCompileFlags}" configureFlags="${concatStringsSep " " defaultConfigureFlags} $configureFlags" - # nativePkgs defined in stdenv/setup.hs - for p in "''${nativePkgs[@]}"; do + # host.*Pkgs defined in stdenv/setup.hs + for p in "''${pkgsHostHost[@]}" "''${pkgsHostTarget[@]}"; do if [ -d "$p/lib/${ghc.name}/package.conf.d" ]; then cp -f "$p/lib/${ghc.name}/package.conf.d/"*.conf $packageConfDir/ continue diff --git a/pkgs/servers/x11/xorg/builder.sh b/pkgs/servers/x11/xorg/builder.sh index bb3e5ac4283..5a832cb14d5 100644 --- a/pkgs/servers/x11/xorg/builder.sh +++ b/pkgs/servers/x11/xorg/builder.sh @@ -16,13 +16,8 @@ postInstall() { echo "propagating requisites $requires" - if test -n "$crossConfig"; then - local pkgs=("${crossPkgs[@]}") - else - local pkgs=("${nativePkgs[@]}") - fi for r in $requires; do - for p in "${pkgs[@]}"; do + for p in "${pkgsHostHost[@]}" "${pkgsHostTarget[@]}"; do if test -e $p/lib/pkgconfig/$r.pc; then echo " found requisite $r in $p" propagatedBuildInputs+=" $p" From f083248290fb1268fba1beb8e1c353c4cb39528d Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 14 Dec 2017 16:48:31 -0500 Subject: [PATCH 145/331] linux bootstrap tools cross: Nuke more refs libgcc.a and similar --- pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index 8aaf4993108..02cbac0f278 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -193,6 +193,7 @@ rec { nuke-refs $out/bin/* nuke-refs $out/lib/* nuke-refs $out/libexec/gcc/*/*/* + nuke-refs $out/lib/gcc/*/*/* mkdir $out/.pack mv $out/* $out/.pack From 469fd8983276d851c19827cd9e78a89dd53a5914 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 28 Aug 2017 11:33:08 -0400 Subject: [PATCH 146/331] stdenv-setup: Ease the transition with native builds - All deps go on the PATH - CC and Bintools wrappers with their host != depender's host still get their setup hooks run. - Environment hooks get applied to all packages This isn't so elegent, but eases the transition on a very significant PR. --- .../bintools-wrapper/setup-hook.sh | 7 +++- pkgs/build-support/cc-wrapper/setup-hook.sh | 7 +++- pkgs/stdenv/generic/setup.sh | 37 ++++++++++++++----- 3 files changed, 38 insertions(+), 13 deletions(-) diff --git a/pkgs/build-support/bintools-wrapper/setup-hook.sh b/pkgs/build-support/bintools-wrapper/setup-hook.sh index c508963ac33..48a00b0b9b0 100644 --- a/pkgs/build-support/bintools-wrapper/setup-hook.sh +++ b/pkgs/build-support/bintools-wrapper/setup-hook.sh @@ -4,8 +4,11 @@ set -u -# Skip setup hook if we're not a build-time dep -(( "$hostOffset" < 0 )) || return 0 +# Skip setup hook if we're neither a build-time dep, nor, temporarily, doing a +# native compile. +# +# TODO(@Ericson2314): No native exception +[[ -z ${crossConfig-} ]] || (( "$hostOffset" < 0 )) || return 0 bintoolsWrapper_addLDVars () { case $depHostOffset in diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh index 17877dc262c..29a7306b9b7 100644 --- a/pkgs/build-support/cc-wrapper/setup-hook.sh +++ b/pkgs/build-support/cc-wrapper/setup-hook.sh @@ -56,8 +56,11 @@ set -u -# Skip setup hook if we're not a build-time dep -(( "$hostOffset" < 0 )) || return 0 +# Skip setup hook if we're neither a build-time dep, nor, temporarily, doing a +# native compile. +# +# TODO(@Ericson2314): No native exception +[[ -z ${crossConfig-} ]] || (( "$hostOffset" < 0 )) || return 0 # It's fine that any other cc-wrapper will redefine this. Bash functions close # over no state, and there's no @-substitutions within, so any redefined diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 1850d322cc6..d2c67cce81a 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -506,10 +506,12 @@ activatePackage() { # Only dependencies whose host platform is guaranteed to match the # build platform are included here. That would be `depsBuild*`, - # and legacy `nativeBuildInputs`. Other aren't because of cross - # compiling, and we want to have consistent rules whether or not - # we are cross compiling. - if [[ "$hostOffset" -le -1 && -d "$pkg/bin" ]]; then + # and legacy `nativeBuildInputs`, in general. If we aren't cross + # compiling, however, everything can be put on the PATH. To ease + # the transition, we do include everything in thatcase. + # + # TODO(@Ericson2314): Don't special-case native compilation + if [[ ( -z "${crossConfig-}" || "$hostOffset" -le -1 ) && -d "$pkg/bin" ]]; then addToSearchPath _PATH "$pkg/bin" fi @@ -559,11 +561,28 @@ _addToEnv() { for depTargetOffset in "${allPlatOffsets[@]}"; do (( "$depHostOffset" <= "$depTargetOffset" )) || continue local hookRef="${hookVar}[$depTargetOffset - $depHostOffset]" - local pkgsRef="${pkgsVar}[$depTargetOffset - $depHostOffset]" - local pkgsSlice="${!pkgsRef}[@]" - for pkg in ${!pkgsSlice+"${!pkgsSlice}"}; do - runHook "${!hookRef}" "$pkg" - done + if [[ -z "${crossConfig-}" ]]; then + # Apply environment hooks to all packages during native + # compilation to ease the transition. + # + # TODO(@Ericson2314): Don't special-case native compilation + for pkg in \ + ${pkgsBuildBuild+"${pkgsBuildBuild[@]}"} \ + ${pkgsBuildHost+"${pkgsBuildHost[@]}"} \ + ${pkgsBuildTarget+"${pkgsBuildTarget[@]}"} \ + ${pkgsHostHost+"${pkgsHostHost[@]}"} \ + ${pkgsHostTarget+"${pkgsHostTarget[@]}"} \ + ${pkgsTargetTarget+"${pkgsTargetTarget[@]}"} + do + runHook "${!hookRef}" "$pkg" + done + else + local pkgsRef="${pkgsVar}[$depTargetOffset - $depHostOffset]" + local pkgsSlice="${!pkgsRef}[@]" + for pkg in ${!pkgsSlice+"${!pkgsSlice}"}; do + runHook "${!hookRef}" "$pkg" + done + fi done done } From e9a369b2c6f9a6c8d81ae3a0ca35bf12fd239f38 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sun, 24 Dec 2017 18:26:27 -0500 Subject: [PATCH 147/331] kdoctools: Perl is a propagated *run*-time dep It was improperly classified a build-time dep to get around the incorrect propagation logic that was in place before this PR. Additionally fix some `kdoctools` usage were it is incorrectly used a run-time dep. --- pkgs/applications/kde/libkcddb.nix | 4 ++-- pkgs/applications/office/skrooge/default.nix | 7 +++++-- .../libraries/kde-frameworks/kdoctools/default.nix | 14 +++++++++++--- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/kde/libkcddb.nix b/pkgs/applications/kde/libkcddb.nix index edd9732d051..3fd48605654 100644 --- a/pkgs/applications/kde/libkcddb.nix +++ b/pkgs/applications/kde/libkcddb.nix @@ -8,8 +8,8 @@ mkDerivation { license = with licenses; [ gpl2 lgpl21 bsd3 ]; maintainers = with maintainers; [ peterhoeg ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtbase kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ qtbase ]; propagatedBuildInputs = [ kcodecs ki18n kio kwidgetsaddons libmusicbrainz5 diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix index f88cc147098..1aaf05a123e 100644 --- a/pkgs/applications/office/skrooge/default.nix +++ b/pkgs/applications/office/skrooge/default.nix @@ -14,9 +14,12 @@ mkDerivation rec { sha256 = "1dbvdrkdpgv39v8h7k3mri0nzlslfyd5kk410czj0jdn4qq400md"; }; - nativeBuildInputs = [ cmake extra-cmake-modules shared_mime_info ]; + nativeBuildInputs = [ + cmake extra-cmake-modules kdoctools shared_mime_info + ]; - buildInputs = [ qtwebkit qtscript grantlee kxmlgui kwallet kparts kdoctools + buildInputs = [ + qtwebkit qtscript grantlee kxmlgui kwallet kparts kjobwidgets kdesignerplugin kiconthemes knewstuff sqlcipher qca-qt5 kactivities karchive kguiaddons knotifyconfig krunner kwindowsystem libofx ]; diff --git a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix index 661e89e3078..0a600fe8d05 100644 --- a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix @@ -8,10 +8,18 @@ mkDerivation { name = "kdoctools"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; - propagatedNativeBuildInputs = [ perl perlPackages.URI ]; + nativeBuildInputs = [ + extra-cmake-modules + # The build system insists on having native Perl. + perl perlPackages.URI + ]; + propagatedBuildInputs = [ + # kdoctools at runtime actually needs Perl for the platform kdoctools is + # running on, not necessarily native perl. + perl perlPackages.URI + qtbase + ]; buildInputs = [ karchive ki18n ]; - propagatedBuildInputs = [ qtbase ]; outputs = [ "out" "dev" ]; patches = [ ./kdoctools-no-find-docbook-xml.patch ]; cmakeFlags = [ From 7ffc4e1b2ff051ff5c012f411ac824b89a160dd6 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 2 Jun 2017 12:22:36 -0400 Subject: [PATCH 148/331] doc: Add "Specifying Dependencies" section to the stdenv chapter This accounts for all the new dependencies and propagation logic changes I'm about to add. Fixes #1915---with this change I think the distinction is finally clear enough. --- doc/cross-compilation.xml | 2 +- doc/stdenv.xml | 311 ++++++++++++++++++++++++++++++++------ 2 files changed, 264 insertions(+), 49 deletions(-) diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml index 4b35b72feae..f1194720cfd 100644 --- a/doc/cross-compilation.xml +++ b/doc/cross-compilation.xml @@ -187,7 +187,7 @@ How does this work in practice? Nixpkgs is now structured so that build-time dependencies are taken from buildPackages, whereas run-time dependencies are taken from the top level attribute set. For example, buildPackages.gcc should be used at build time, while gcc should be used at run time. Now, for most of Nixpkgs's history, there was no buildPackages, and most packages have not been refactored to use it explicitly. - Instead, one can use the four attributes used for specifying dependencies as documented in . + Instead, one can use the six (gasp) attributes used for specifying dependencies as documented in . We "splice" together the run-time and build-time package sets with callPackage, and then mkDerivation for each of four attributes pulls the right derivation out. This splicing can be skipped when not cross compiling as the package sets are the same, but is a bit slow for cross compiling. Because of this, a best-of-both-worlds solution is in the works with no splicing or explicit access of buildPackages needed. diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 91c659408c4..67f24914614 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -179,6 +179,269 @@ genericBuild +
Specifying dependencies + + + As described in the Nix manual, almost any *.drv store path in a derivation's attribute set will induce a dependency on that derivation. + mkDerivation, however, takes a few attributes intended to, between them, include all the dependencies of a package. + This is done both for structure and consistency, but also so that certain other setup can take place. + For example, certain dependencies need their bin directories added to the PATH. + That is built-in, but other setup is done via a pluggable mechanism that works in conjunction with these dependency attributes. + See for details. + + + Dependencies can be broken down along three axes: their host and target platforms relative to the new derivation's, and whether they are propagated. + The platform distinctions are motivated by cross compilation; see for exactly what each platform means. + + The build platform is ignored because it is a mere implementation detail of the package satisfying the dependency: + As a general programming principle, dependencies are always specified as interfaces, not concrete implementation. + + But even if one is not cross compiling, the platforms imply whether or not the dependency is needed at run-time or build-time, a concept that makes perfect sense outside of cross compilation. + For now, the run-time/build-time distinction is just a hint for mental clarity, but in the future it perhaps could be enforced. + + + The extension of PATH with dependencies, alluded to above, proceeds according to the relative platforms alone. + The process is carried out only for dependencies whose host platform matches the new derivation's build platform–i.e. which run on the platform where the new derivation will be built. + + Currently, that means for native builds all dependencies are put on the PATH. + But in the future that may not be the case for sake of matching cross: + the platforms would be assumed to be unique for native and cross builds alike, so only the depsBuild* and nativeBuildDependencies dependencies would affect the PATH. + + For each dependency dep of those dependencies, dep/bin, if present, is added to the PATH environment variable. + + + The dependency is propagated when it forces some of its other-transitive (non-immediate) downstream dependencies to also take it on as an immediate dependency. + Nix itself already takes a package's transitive dependencies into account, but this propagation ensures nixpkgs-specific infrastructure like setup hooks (mentioned above) also are run as if the propagated dependency. + + + It is important to note dependencies are not necessary propagated as the same sort of dependency that they were before, but rather as the corresponding sort so that the platform rules still line up. + The exact rules for dependency propagation can be given by assigning each sort of dependency two integers based one how it's host and target platforms are offset from the depending derivation's platforms. + Those offsets are given are given below in the descriptions of each dependency list attribute. + Algorithmically, we traverse propagated inputs, accumulating every propagated dep's propagated deps and adjusting them to account for the "shift in perspective" described by the current dep's platform offsets. + This results in sort a transitive closure of the dependency relation, with the offsets being approximately summed when two dependency links are combined. + We also prune transitive deps whose combined offsets go out-of-bounds, which can be viewed as a filter over that transitive closure removing dependencies that are blatantly absurd. + + + We can define the process precisely with Natural Deduction using the inference rules. + This probably seems a bit obtuse, but so is the bash code that actually implements it! + + The findInputs function, currently residing in pkgs/stdenv/generic/setup.sh, implements the propagation logic. + + They're confusing in very different ways so...hopefully if something doesn't make sense in one presentation, it does in the other! + +let mapOffset(h, t, i) = i + (if i <= 0 then h else t - 1) + +propagated-dep(h0, t0, A, B) +propagated-dep(h1, t1, B, C) +h0 + h1 in {-1, 0, 1} +h0 + t1 in {-1, 0, 1} +-------------------------------------- Transitive property +propagated-dep(mapOffset(h0, t0, h1), + mapOffset(h0, t0, t1), + A, C) + +let mapOffset(h, t, i) = i + (if i <= 0 then h else t - 1) + +dep(h0, _, A, B) +propagated-dep(h1, t1, B, C) +h0 + h1 in {-1, 0, 1} +h0 + t1 in {-1, 0, -1} +-------------------------------------- Take immediate deps' propagated deps +propagated-dep(mapOffset(h0, t0, h1), + mapOffset(h0, t0, t1), + A, C) + +propagated-dep(h, t, A, B) +-------------------------------------- Propagated deps count as deps +dep(h, t, A, B) + Some explanation of this monstrosity is in order. + In the common case, the target offset of a dependency is the successor to the target offset: t = h + 1. + That means that: + +let f(h, t, i) = i + (if i <= 0 then h else t - 1) +let f(h, h + 1, i) = i + (if i <= 0 then h else (h + 1) - 1) +let f(h, h + 1, i) = i + (if i <= 0 then h else h) +let f(h, h + 1, i) = i + h + + This is where the "sum-like" comes from above: + We can just sum all the host offset to get the host offset of the transitive dependency. + The target offset is the transitive dep is simply the host offset + 1, just as it was with the dependencies composed to make this transitive one; + it can be ignored as it doesn't add any new information. + + + Because of the bounds checks, the uncommon cases are h = t and h + 2 = t. + In the former case, the motivation for mapOffset is that since its host and target platforms are the same, no transitive dep of it should be able to "discover" an offset greater than its reduced target offsets. + mapOffset effectively "squashes" all its transitive dependencies' offsets so that none will ever be greater than the target offset of the original h = t package. + In the other case, h + 1 is skipped over between the host and target offsets. + Instead of squashing the offsets, we need to "rip" them apart so no transitive dependencies' offset is that one. + + +Overall, the unifying theme here is that propagation shouldn't be introducing transitive dependencies involving platforms the needing package is unaware of. +The offset bounds checking and definition of mapOffset together ensure that this is the case. +Discovering a new offset is discovering a new platform, and since those platforms weren't in the derivation "spec" of the needing package, they cannot be relevant. +From a capability perspective, we can imagine that the host and target platforms of a package are the capabilities a package requires, and the depending package must provide the capability to the dependency. + + + + Variables specifying dependencies + + + depsBuildBuild + + + A list of dependencies whose host and target platforms are the new derivation's build platform. + This means a -1 host and -1 target offset from the new derivation's platforms. + They are programs/libraries used at build time that furthermore produce programs/libraries also used at build time. + If the dependency doesn't care about the target platform (i.e. isn't a compiler or similar tool), put it in nativeBuildInputsinstead. + The most common use for this buildPackages.stdenv.cc, the default C compiler for this role. + That example crops up more than one might think in old commonly used C libraries. + + + Since these packages are able to be run at build time, that are always added to the PATH, as described above. + But since these packages are only guaranteed to be able to run then, they shouldn't persist as run-time dependencies. + This isn't currently enforced, but could be in the future. + + + + + + nativeBuildInputs + + + A list of dependencies whose host platform is the new derivation's build platform, and target platform is the new derivation's host platform. + This means a -1 host offset and 0 target offset from the new derivation's platforms. + They are programs/libraries used at build time that, if they are a compiler or similar tool, produce code to run at run time—i.e. tools used to build the new derivation. + If the dependency doesn't care about the target platform (i.e. isn't a compiler or similar tool), put it here, rather than in depsBuildBuild or depsBuildTarget. + This would be called depsBuildHost but for historical continuity. + + + Since these packages are able to be run at build time, that are added to the PATH, as described above. + But since these packages only are guaranteed to be able to run then, they shouldn't persist as run-time dependencies. + This isn't currently enforced, but could be in the future. + + + + + + depsBuildTarget + + + A list of dependencies whose host platform is the new derivation's build platform, and target platform is the new derivation's target platform. + This means a -1 host offset and 1 target offset from the new derivation's platforms. + They are programs used at build time that produce code to run at run with code produced by the depending package. + Most commonly, these would tools used to build the runtime or standard library the currently-being-built compiler will inject into any code it compiles. + In many cases, the currently-being built compiler is itself employed for that task, but when that compiler won't run (i.e. its build and host platform differ) this is not possible. + Other times, the compiler relies on some other tool, like binutils, that is always built separately so the dependency is unconditional. + + + This is a somewhat confusing dependency to wrap ones head around, and for good reason. + As the only one where the platform offsets are not adjacent integers, it requires thinking of a bootstrapping stage two away from the current one. + It and it's use-case go hand in hand and are both considered poor form: + try not to need this sort dependency, and try not avoid building standard libraries / runtimes in the same derivation as the compiler produces code using them. + Instead strive to build those like a normal library, using the newly-built compiler just as a normal library would. + In short, do not use this attribute unless you are packaging a compiler and are sure it is needed. + + + Since these packages are able to be run at build time, that are added to the PATH, as described above. + But since these packages only are guaranteed to be able to run then, they shouldn't persist as run-time dependencies. + This isn't currently enforced, but could be in the future. + + + + + + depsHostHost + + A list of dependencies whose host and target platforms match the new derivation's host platform. + This means a both 0 host offset and 0 target offset from the new derivation's host platform. + These are packages used at run-time to generate code also used at run-time. + In practice, that would usually be tools used by compilers for metaprogramming/macro systems, or libraries used by the macros/metaprogramming code itself. + It's always preferable to use a depsBuildBuild dependency in the derivation being built than a depsHostHost on the tool doing the building for this purpose. + + + + + buildInputs + + + A list of dependencies whose host platform and target platform match the new derivation's. + This means a 0 host offset and 1 target offset from the new derivation's host platform. + This would be called depsHostTarget but for historical continuity. + If the dependency doesn't care about the target platform (i.e. isn't a compiler or similar tool), put it here, rather than in depsBuildBuild. + + + These often are programs/libraries used by the new derivation at run-time, but that isn't always the case. + For example, the machine code in a statically linked library is only used at run time, but the derivation containing the library is only needed at build time. + Even in the dynamic case, the library may also be needed at build time to appease the linker. + + + + + + depsTargetTarget + + A list of dependencies whose host platform matches the new derivation's target platform. + This means a 1 offset from the new derivation's platforms. + These are packages that run on the target platform, e.g. the standard library or run-time deps of standard library that a compiler insists on knowing about. + It's poor form in almost all cases for a package to depend on another from a future stage [future stage corresponding to positive offset]. + Do not use this attribute unless you are packaging a compiler and are sure it is needed. + + + + + depsBuildBuildPropagated + + The propagated equivalent of depsBuildBuild. + This perhaps never ought to be used, but it is included for consistency [see below for the others]. + + + + + propagatedNativeBuildInputs + + The propagated equivalent of nativeBuildInputs. + This would be called depsBuildHostPropagated but for historical continuity. + For example, if package Y has propagatedNativeBuildInputs = [X], and package Z has buildInputs = [Y], then package Z will be built as if it included package X in its nativeBuildInputs. + If instead, package Z has nativeBuildInputs = [Y], then Z will be built as if it included X in the depsBuildBuild of package Z, because of the sum of the two -1 host offsets. + + + + + depsBuildTargetPropagated + + The propagated equivalent of depsBuildTarget. + This is prefixed for the same reason of alerting potential users. + + + + + depsHostHostPropagated + + The propagated equivalent of depsHostHost. + + + + + propagatedBuildInputs + + The propagated equivalent of buildInputs. + This would be called depsHostTargetPropagated but for historical continuity. + + + + + depsTargetTarget + + The propagated equivalent of depsTargetTarget. + This is prefixed for the same reason of alerting potential users. + + + + + +
+ +
Attributes @@ -198,54 +461,6 @@ genericBuild - - Variables specifying dependencies - - - nativeBuildInputs - - A list of dependencies used by the new derivation at build-time. - I.e. these dependencies should not make it into the package's runtime-closure, though this is currently not checked. - For each dependency dir, the directory dir/bin, if it exists, is added to the PATH environment variable. - Other environment variables are also set up via a pluggable mechanism. - For instance, if buildInputs contains Perl, then the lib/site_perl subdirectory of each input is added to the PERL5LIB environment variable. - See for details. - - - - - buildInputs - - A list of dependencies used by the new derivation at run-time. - Currently, the build-time environment is modified in the exact same way as with nativeBuildInputs. - This is problematic in that when cross-compiling, foreign executables can clobber native ones on the PATH. - Even more confusing is static-linking. - A statically-linked library should be listed here because ultimately that generated machine code will be used at run-time, even though a derivation containing the object files or static archives will only be used at build-time. - A less confusing solution to this would be nice. - - - - - - propagatedNativeBuildInputs - - Like nativeBuildInputs, but these dependencies are propagated: - that is, the dependencies listed here are added to the nativeBuildInputs of any package that uses this package as a dependency. - So if package Y has propagatedNativeBuildInputs = [X], and package Z has nativeBuildInputs = [Y], - then package X will appear in Z’s build environment automatically. - - - - - propagatedBuildInputs - - Like buildInputs, but propagated just like propagatedNativeBuildInputs. - This inherits buildInputs's flaws of clobbering native executables when cross-compiling and being confusing for static linking. - - - - - Variables affecting build properties From b55999b28f0c7afd193b75d089323cb5489b85f7 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 2 Jun 2017 12:22:36 -0400 Subject: [PATCH 149/331] doc: Document `dontStripHost` and `dontStripTarget` --- doc/stdenv.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 67f24914614..c62f8ad362f 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -1138,6 +1138,20 @@ following: If set, libraries and executables are not stripped. By default, they are. + + dontStripHost + + Like dontStripHost, but only affects the strip command targetting the package's host platform. + Useful when supporting cross compilation, but otherwise feel free to ignore. + + + + dontStripTarget + + Like dontStripHost, but only affects the strip command targetting the packages' target platform. + Useful when supporting cross compilation, but otherwise feel free to ignore. + + dontMoveSbin From edfe42f3bab5f75baf4a7b11a6458c17725ab432 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 2 Jun 2017 12:22:36 -0400 Subject: [PATCH 150/331] doc: More information in the setup hook section of the stdenv chapter --- doc/stdenv.xml | 62 +++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 56 insertions(+), 6 deletions(-) diff --git a/doc/stdenv.xml b/doc/stdenv.xml index c62f8ad362f..7154a576def 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -871,7 +871,7 @@ script) if it exists. By default, when cross compiling, the configure script has and passed. Packages can instead pass [ "build" "host" "target" ] or a subset to control exactly which platform flags are passed. Compilers and other tools should use this to also pass the target platform, for example. - Note eventually these will be passed when in native builds too, to improve determinism: build-time guessing, as is done today, is a risk of impurity. + Eventually these will be passed when in native builds too, to improve determinism: build-time guessing, as is done today, is a risk of impurity. @@ -1582,8 +1582,55 @@ someVar=$(stripHash $name)
Package setup hooks -The following packages provide a setup hook: - + + Nix itself considers a build-time dependency merely something that should previously be built and accessible at build time—packages themselves are on their own to perform any additional setup. + In most cases, that is fine, and the downstream derivation can deal with it's own dependencies. + But for a few common tasks, that would result in almost every package doing the same sort of setup work---depending not on the package itself, but entirely on which dependencies were used. + + + In order to alleviate this burden, the setup hook>mechanism was written, where any package can include a shell script that [by convention rather than enforcement by Nix], any downstream reverse-dependency will source as part of its build process. + That allows the downstream dependency to merely specify its dependencies, and lets those dependencies effectively initialize themselves. + No boilerplate mirroring the list of dependencies is needed. + + + The Setup hook mechanism is a bit of a sledgehammer though: a powerful feature with a broad and indiscriminate area of effect. + The combination of its power and implicit use may be expedient, but isn't without costs. + Nix itself is unchanged, but the spirit of adding dependencies being effect-free is violated even if the letter isn't. + For example, if a derivation path is mentioned more than once, Nix itself doesn't care and simply makes sure the dependency derivation is already built just the same—depending is just needing something to exist, and needing is idempotent. + However, a dependency specified twice will have its setup hook run twice, and that could easily change the build environment (though a well-written setup hook will therefore strive to be idempotent so this is in fact not observable). + More broadly, setup hooks are anti-modular in that multiple dependencies, whether the same or different, should not interfere and yet their setup hooks may well do so. + + + The most typical use of the setup hook is actually to add other hooks which are then run (i.e. after all the setup hooks) on each dependency. + For example, the C compiler wrapper's setup hook feeds itself flags for each dependency that contains relevant libaries and headers. + This is done by defining a bash function, and appending its name to one of + envBuildBuildHooks`, + envBuildHostHooks`, + envBuildTargetHooks`, + envHostHostHooks`, + envHostTargetHooks`, or + envTargetTargetHooks`. + These 6 bash variables correspond to the 6 sorts of dependencies by platform (there's 12 total but we ignore the propagated/non-propagated axis). + + + Packages adding a hook should not hard code a specific hook, but rather choose a variable relative to how they are included. + Returning to the C compiler wrapper example, if it itself is an n dependency, then it only wants to accumulate flags from n + 1 dependencies, as only those ones match the compiler's target platform. + The hostOffset variable is defined with the current dependency's host offset targetOffset with its target offset, before it's setup hook is sourced. + Additionally, since most environment hooks don't care about the target platform, + That means the setup hook can append to the right bash array by doing something like + +addEnvHooks "$hostOffset" myBashFunction + + + + The existence of setups hooks has long been documented and packages inside Nixpkgs are free to use these mechanism. + Other packages, however, should not rely on these mechanisms not changing between Nixpkgs versions. + Because of the existing issues with this system, there's little benefit from mandating it be stable for any period of time. + + + Here are some packages that provide a setup hook. + Since the mechanism is modular, this probably isn't an exhaustive list. + Then again, since the mechanism is only to be used as a last resort, it might be. @@ -1650,9 +1697,12 @@ someVar=$(stripHash $name) Perl - Adds the lib/site_perl subdirectory - of each build input to the PERL5LIB - environment variable. + + + Adds the lib/site_perl subdirectory of each build input to the PERL5LIB environment variable. + For instance, if buildInputs contains Perl, then the lib/site_perl subdirectory of each input is added to the PERL5LIB environment variable. + + From 8a434b625dc07e0f1e4f39ef6bb1219ab9c58953 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 30 Dec 2017 21:57:32 -0500 Subject: [PATCH 151/331] doc: Add cross cookbook An excellent suggestion from @bgamari --- doc/cross-compilation.xml | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml index f1194720cfd..118a82bf0b0 100644 --- a/doc/cross-compilation.xml +++ b/doc/cross-compilation.xml @@ -200,6 +200,45 @@
+
+ Cross packagaing cookbook + + Some frequently problems when packaging for cross compilation are good to just spell and answer. + Ideally the information above is exhaustive, so this section cannot provide any new information, + but its ludicrous and cruel to expect everyone to spend effort working through the interaction of many features just to figure out the same answer to the same common problem. + Feel free to add to this list! + + + + + What if my package's build system needs to build a C program to be run under the build environment? + + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + Add it to your mkDerivation invocation. + + + + + My package fails to find ar. + + + Many packages assume that an unprefixed ar is available, but Nix doesn't provide one. + It only provides a prefixed one, just as it only does for all the other binutils programs. + It may be necessary to patch the package to fix the build system to use a prefixed `ar`. + + + + + My package's testsuite needs to run host platform code. + + + doCheck = stdenv.hostPlatform != stdenv.buildPlatfrom; + Add it to your mkDerivation invocation. + + + +
From a98e68676dc96e9021d9bb0a9f210ac1a35d368b Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 29 Dec 2017 21:14:16 -0500 Subject: [PATCH 152/331] doc: Breaking change release not for dependency propagation logic --- nixos/doc/manual/release-notes/rl-1803.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml index 971d88e8a9c..b58796d3328 100644 --- a/nixos/doc/manual/release-notes/rl-1803.xml +++ b/nixos/doc/manual/release-notes/rl-1803.xml @@ -103,6 +103,18 @@ following incompatible changes: Other more obscure ones are just moved. + + + The propagation logic has been changed. + The new logic, along with new types of dependencies that go with, is thoroughly documented in the "Specifying dependencies" section of the "Standard Environment" chapter of the nixpkgs manual. + + The old logic isn't but is easy to describe: dependencies were propagated as the same type of dependency no matter what. + In practice, that means that many propagatedNativeBuildInputs should instead be propagatedBuildInputs. + Thankfully, that was and is the least used type of dependency. + Also, it means that some propagatedBuildInputs should instead be depsTargetTargetPropagated. + Other types dependencies should be unaffected. + + From 2c41a488f58ade246f1e72a4e757891346fbd7ea Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:23:02 +0100 Subject: [PATCH 153/331] python: fonttools: 3.17.0 -> 3.21.0 --- pkgs/development/python-modules/fonttools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index 1dfc22f769b..a567f7155f8 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "fonttools"; - version = "3.17.0"; + version = "3.21.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1c4f26bf32cd58d5881bfe1f42e5f0a1637a58452a60ae1623999f3ae7da0e24"; + sha256 = "95b5c66d19dbffd57be1636d1f737c7644d280a48c28f933aeb4db73a7c83495"; extension = "zip"; }; From b0ac491e1105860176185ad948e4dfbbdfeb76e1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:23:06 +0100 Subject: [PATCH 154/331] python: ftfy: 5.1.1 -> 5.2.0 --- pkgs/development/python-modules/ftfy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix index b1ba77ab868..e54531017f4 100644 --- a/pkgs/development/python-modules/ftfy/default.nix +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "ftfy"; # latest is 5.1.1, buy spaCy requires 4.4.3 - version = "5.1.1"; + version = "5.2.0"; src = fetchPypi { inherit pname version; - sha256 = "67a29a2fad5f72aec2d8a0a7084e4f499ed040455133ee96b1c458609fc29e78"; + sha256 = "b9f84a1437f68ad0bb964fd9da9f6b88d090113ec9e78f290f6d6d0221468e38"; }; propagatedBuildInputs = [ html5lib wcwidth]; From c2bd0cea42030fe923b0d4dc246957f06afdddac Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:23:09 +0100 Subject: [PATCH 155/331] python: gensim: 3.0.1 -> 3.2.0 --- pkgs/development/python-modules/gensim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index ea5fc12e432..4edd9ac3e55 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -13,10 +13,10 @@ buildPythonPackage rec { pname = "gensim"; name = "${pname}-${version}"; - version = "3.0.1"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "4827012f6f020ac4f4067c2a2a88542391917113faaa417505e1ee8a1e7e2650"; + sha256 = "db00b68c6567ba0598d400b917c889e8801adf249170ce0a80ec38187d1b0797"; }; propagatedBuildInputs = [ smart_open numpy six scipy From ceec68a8bb293864efe943cada17a590ef9915c2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:23:13 +0100 Subject: [PATCH 156/331] python: google-api-core: 0.1.2 -> 0.1.3 --- pkgs/development/python-modules/google_api_core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_api_core/default.nix b/pkgs/development/python-modules/google_api_core/default.nix index 6aa43989aa3..c4275c47a42 100644 --- a/pkgs/development/python-modules/google_api_core/default.nix +++ b/pkgs/development/python-modules/google_api_core/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "google-api-core"; - version = "0.1.2"; + version = "0.1.3"; src = fetchPypi { inherit pname version; - sha256 = "0qmjswj079w7q7zbnh8p4n2r3f831wymm9hfdlc7zfrini7184xv"; + sha256 = "03bc4b1ab69c0e113af07e706edee50f583abe8219fe1e1d529dee191cb8e0bf"; }; propagatedBuildInputs = [ google_auth protobuf googleapis_common_protos requests grpcio ]; From 5a3ee42c44626c7f1b386e7458f8efe2d1cc4a09 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:23:17 +0100 Subject: [PATCH 157/331] python: GPy: 1.8.4 -> 1.8.5 --- pkgs/development/python-modules/gpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gpy/default.nix b/pkgs/development/python-modules/gpy/default.nix index bc48a7490aa..bb39746d296 100644 --- a/pkgs/development/python-modules/gpy/default.nix +++ b/pkgs/development/python-modules/gpy/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "GPy"; - version = "1.8.4"; + version = "1.8.5"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "38c1202f1790952b88c298224139ee5b14d4518e3ddc6186c60db2ece016d8c1"; + sha256 = "1562e34629192f209273f454e41614a127c6ef04144cd0eb5992d484721d55d3"; }; # running tests produces "ImportError: cannot import name 'linalg_cython'" From 495bf9b9c191538e51330dcc51d3f92c93f9ea77 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:23:20 +0100 Subject: [PATCH 158/331] python: grpcio: 1.7.3 -> 1.8.2 --- pkgs/development/python-modules/grpcio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index c17e1bf7bf0..eeb51fb5843 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "grpcio"; - version = "1.7.3"; + version = "1.8.2"; src = fetchPypi { inherit pname version; - sha256 = "1wkrxj1jmf2dyx207fc9ysyns9h27gls3drgg05mzdckjqr5lnl6"; + sha256 = "1ea1336f0d1158c4e00e96a94df84b75f6bbff9816abb6cc68cbdc9442a9ac55"; }; propagatedBuildInputs = [ six protobuf ] From c0df4921634a3b34a1a3fd0a7487f0e513a5ca78 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:23:24 +0100 Subject: [PATCH 159/331] python: gssapi: 1.2.0 -> 1.3.0 --- pkgs/development/python-modules/gssapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix index 3b13f8a2049..b075db5ae98 100644 --- a/pkgs/development/python-modules/gssapi/default.nix +++ b/pkgs/development/python-modules/gssapi/default.nix @@ -3,12 +3,12 @@ nose, shouldbe, gss, krb5Full, which, darwin }: buildPythonPackage rec { pname = "gssapi"; - version = "1.2.0"; + version = "1.3.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1q6ccpz6anl9vggwxdq32wp6xjh2lyfbf7av6jqnmvmyqdfwh3b9"; + sha256 = "765205082a9490c8e8be88ac16a6249d124396a671665edeec9927a7f244d712"; }; # It's used to locate headers From 08ebd1618b8e855bc36fb36af3009bae3a8aa75f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:23:28 +0100 Subject: [PATCH 160/331] python: htmlmin: 0.1.11 -> 0.1.12 --- pkgs/development/python-modules/htmlmin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/htmlmin/default.nix b/pkgs/development/python-modules/htmlmin/default.nix index 2206b3559ba..8df4b3813c4 100644 --- a/pkgs/development/python-modules/htmlmin/default.nix +++ b/pkgs/development/python-modules/htmlmin/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "htmlmin"; - version = "0.1.11"; + version = "0.1.12"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "f27fb96fdddeb1725ee077be532c7bea23288c69d0e996e7798f24fae7a14e5e"; + sha256 = "50c1ef4630374a5d723900096a961cff426dff46b48f34d194a81bbe14eca178"; }; # Tests run fine in a normal source checkout, but not when being built by nix. From 0a447a6a3da3087b9ca6ebf3ce1eb277d41cdebd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:23:32 +0100 Subject: [PATCH 161/331] python: httpbin: 0.5.0 -> 0.6.2 --- pkgs/development/python-modules/httpbin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/httpbin/default.nix b/pkgs/development/python-modules/httpbin/default.nix index d11d6b3668f..2f24a1ab72b 100644 --- a/pkgs/development/python-modules/httpbin/default.nix +++ b/pkgs/development/python-modules/httpbin/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "httpbin"; - version = "0.5.0"; + version = "0.6.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "6b57f563900ecfe126015223a259463848daafbdc2687442317c0992773b9054"; + sha256 = "0afa0486a76305cac441b5cc80d5d4ccd82b20875da7c5119ecfe616cefef45f"; }; propagatedBuildInputs = [ flask markupsafe decorator itsdangerous six ]; From 675d84adfd95f67a2b49107c9773d4aee6049751 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:23:36 +0100 Subject: [PATCH 162/331] python: ipykernel: 4.6.1 -> 4.7.0 --- pkgs/development/python-modules/ipykernel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index a77f6ac9c2f..8547a3ef99e 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "ipykernel"; - version = "4.6.1"; + version = "4.7.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "2e1825aca4e2585b5adb7953ea16e53f53a62159ed49952a564b1e23507205db"; + sha256 = "354986612a38f0555c43d5af2425e2a67506b63b313a0325e38904003b9d977b"; }; buildInputs = [ nose ] ++ lib.optional isPy27 mock; From 1f2c23dabee08d67eabb6187dca119548adbfc06 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:23:39 +0100 Subject: [PATCH 163/331] python: ipywidgets: 7.0.5 -> 7.1.0 --- pkgs/development/python-modules/ipywidgets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix index 3d156323491..f77c3570c02 100644 --- a/pkgs/development/python-modules/ipywidgets/default.nix +++ b/pkgs/development/python-modules/ipywidgets/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "ipywidgets"; - version = "7.0.5"; + version = "7.1.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "321be3dc48193130ba16e8080172bb5cd052eb65e3ad0ea7b5f80ff73e24bc54"; + sha256 = "3e2be7dea4f97c9a4df71ef065cad9f2e420dd901127bf7cb690fb56d2b34ea3"; }; # Tests are not distributed From 4610eb1ac80bf2023065006a02badd088694b424 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:23:43 +0100 Subject: [PATCH 164/331] python: jedi: 0.11.0 -> 0.11.1 --- pkgs/development/python-modules/jedi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index bf9f9f9c082..df8a287ea09 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "jedi"; - version = "0.11.0"; + version = "0.11.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "f6d5973573e76b1fd2ea75f6dcd6445d02d41ff3af5fc61b275b4e323d1dd396"; + sha256 = "d6e799d04d1ade9459ed0f20de47c32f2285438956a677d083d3c98def59fa97"; }; postPatch = '' From dea01b84a5e4fa7711346a7d1dac747ccf92350d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:23:47 +0100 Subject: [PATCH 165/331] python: jsbeautifier: 1.7.4 -> 1.7.5 --- pkgs/development/python-modules/jsbeautifier/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix index a2278566c6d..19b1eeefa53 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.7.4"; + version = "1.7.5"; name = "${pname}-${version}"; propagatedBuildInputs = [ six ]; @@ -11,7 +11,7 @@ buildPythonApplication rec { src = fetchurl { url = "mirror://pypi/j/jsbeautifier/${name}.tar.gz"; - sha256 = "7fc14f279117a55a5e854602f6e8c1cb178c6d83f7cf75e2e9f50678fe11079e"; + sha256 = "78eb1e5c8535484f0d0b588aca38da3fb5e0e34de2d1ab53c077e71c55757473"; }; meta = with stdenv.lib; { From 45ebdc3ca04ea9b923a4a6630fc3f21185e11ea9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:23:50 +0100 Subject: [PATCH 166/331] python: jsonpatch: 1.16 -> 1.20 --- pkgs/development/python-modules/jsonpatch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsonpatch/default.nix b/pkgs/development/python-modules/jsonpatch/default.nix index 39f36b1d949..89817c85956 100644 --- a/pkgs/development/python-modules/jsonpatch/default.nix +++ b/pkgs/development/python-modules/jsonpatch/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "jsonpatch"; - version = "1.16"; + version = "1.20"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "f025c28a08ce747429ee746bb21796c3b6417ec82288f8fe6514db7398f2af8a"; + sha256 = "b12594a0cfe634bdd2a5c027250af2dd84932d493568e88ae722871edc3eb02d"; }; # test files are missing From 8c22f1eaf1fcd2a13319f8530e688449d02898e4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:24:01 +0100 Subject: [PATCH 167/331] python: Keras: 2.1.1 -> 2.1.2 --- pkgs/development/python-modules/keras/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index d88b6e4999b..b6c56cc8bc6 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "Keras"; - version = "2.1.1"; + version = "2.1.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "f0ca2458c60d9711edf4291230b31795307ad3781cb6232ff4792b53c8f55123"; + sha256 = "3ee56fc129d9d00b1916046e50056047836f97ada59df029e5661fb34442d5e8"; }; checkInputs = [ From fd1f3f1f037b7b13cdd78dd806608d1329b95967 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:24:05 +0100 Subject: [PATCH 168/331] python: keyring: 10.4.0 -> 10.5.1 --- pkgs/development/python-modules/keyring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index ca7a518665c..f88bdb84e0c 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "keyring"; - version = "10.4.0"; + version = "10.5.1"; src = fetchPypi { inherit pname version; - sha256 = "09iv50c14mdmdk7sjd6bb47yg7347gymh6r8c0q4gfnzs173y6lh"; + sha256 = "f10674bb6ecbf82e2b713627c48ad0e84178e1c9d3dc1f0373261a0765402fb2"; }; buildInputs = [ From dc3dd1d16c56a6f7fd2a5fc7af52dd1792c589d9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:24:13 +0100 Subject: [PATCH 169/331] python: ldap3: 2.3 -> 2.4 --- pkgs/development/python-modules/ldap3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ldap3/default.nix b/pkgs/development/python-modules/ldap3/default.nix index 895272f351d..41497f19789 100644 --- a/pkgs/development/python-modules/ldap3/default.nix +++ b/pkgs/development/python-modules/ldap3/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchPypi, buildPythonPackage, gssapi, pyasn1 }: buildPythonPackage rec { - version = "2.3"; + version = "2.4"; pname = "ldap3"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1b36lwil4iflk2ay8gi663abpnfm8id7qg4n3jkmmqbnc1sv6mn0"; + sha256 = "888015f849eb33852583bbaf382f61593b03491cdac6098fd5d4d0252e0e7e66"; }; buildInputs = [ gssapi ]; From d3a25d4a72d290d0a0e067a3f250fb16009ad157 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:24:16 +0100 Subject: [PATCH 170/331] python: line_profiler: 2.0 -> 2.1.2 --- pkgs/development/python-modules/line_profiler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/line_profiler/default.nix b/pkgs/development/python-modules/line_profiler/default.nix index 570bba2a8c4..26dfda613f7 100644 --- a/pkgs/development/python-modules/line_profiler/default.nix +++ b/pkgs/development/python-modules/line_profiler/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "line_profiler"; - version = "2.0"; + version = "2.1.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "739f8ad0e4bcd0cb82e99afc09e00a0351234f6b3f0b1f7f0090a8a2fbbf8381"; + sha256 = "efa66e9e3045aa7cb1dd4bf0106e07dec9f80bc781a993fbaf8162a36c20af5c"; }; buildInputs = [ cython ]; From 34c9a89ce06142d1d098151e4a14c6eb9dfd5e7d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:24:20 +0100 Subject: [PATCH 171/331] python: llfuse: 1.0 -> 1.3.2 --- pkgs/development/python-modules/llfuse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix index 4c4c89d8f19..ef4d9fb5d02 100644 --- a/pkgs/development/python-modules/llfuse/default.nix +++ b/pkgs/development/python-modules/llfuse/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "llfuse"; - version = "1.0"; + version = "1.3.2"; name = pname + "-" + version; src = fetchurl { url = "mirror://pypi/l/llfuse/${name}.tar.bz2"; - sha256 = "1li7q04ljrvwharw4fblcbfhvk6s0l3lnv8yqb4c22lcgbkiqlps"; + sha256 = "96252a286a2be25810904d969b330ef2a57c2b9c18c5b503bbfbae40feb2bb63"; }; nativeBuildInputs = [ pkgconfig ]; From 5309e27a8c6f3a38ca75a8ab2495dc2c05413f20 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:24:27 +0100 Subject: [PATCH 172/331] python: marionette-harness: 4.1.0 -> 4.3.0 --- .../development/python-modules/marionette-harness/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marionette-harness/default.nix b/pkgs/development/python-modules/marionette-harness/default.nix index fbdd13a7f38..f909974db6b 100644 --- a/pkgs/development/python-modules/marionette-harness/default.nix +++ b/pkgs/development/python-modules/marionette-harness/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "marionette-harness"; - version = "4.1.0"; + version = "4.3.0"; name = "${pname}-${version}"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "20c188791e28d586c58acf86ff28cb704c4195a4da6eb10db7b8c6771e3f2983"; + sha256 = "a98bb65a0c63f60d9e3d7ef21dabc9c29676917dc2ec0d46851a3ed694c820cc"; }; propagatedBuildInputs = [ mozprofile mozversion browsermob-proxy moztest From 6a927ae8c70adb73769ef6a0aeb4d9a3d51d4d10 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:24:31 +0100 Subject: [PATCH 173/331] python: marshmallow: 2.14.0 -> 2.15.0 --- pkgs/development/python-modules/marshmallow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix index afb60801dc9..a9db6ef1e84 100644 --- a/pkgs/development/python-modules/marshmallow/default.nix +++ b/pkgs/development/python-modules/marshmallow/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "marshmallow"; name = "${pname}-${version}"; - version = "2.14.0"; + version = "2.15.0"; meta = { homepage = "https://github.com/marshmallow-code/marshmallow"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "09943a460026b9a61c3f4cedd0e5ccfed7cfce3271debd19e3f97df561088718"; + sha256 = "d3f31fe7be2106b1d783cbd0765ef4e1c6615505514695f33082805f929dd584"; }; propagatedBuildInputs = [ dateutil simplejson ]; From 2b2cb1b37b50ba8ed51d82176f035d8b517d1868 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:24:34 +0100 Subject: [PATCH 174/331] python: matplotlib: 2.1.0 -> 2.1.1 --- pkgs/development/python-modules/matplotlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 345a21ecddf..33505b5f618 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -20,13 +20,13 @@ assert enableTk -> (tcl != null) assert enableQt -> pyqt4 != null; buildPythonPackage rec { - version = "2.1.0"; + version = "2.1.1"; pname = "matplotlib"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/m/matplotlib/${name}.tar.gz"; - sha256 = "4b5f16c9cefde553ea79975305dcaa67c8e13d927b6e55aa14b4a8d867e25387"; + sha256 = "659f5e1aa0e0f01488c61eff47560c43b8be511c6a29293d7f3896ae17bd8b23"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; From 07b2c43d940059a2c163a2fad243f7aa0881bab5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:24:42 +0100 Subject: [PATCH 175/331] python: mistune: 0.7.4 -> 0.8.3 --- pkgs/development/python-modules/mistune/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mistune/default.nix b/pkgs/development/python-modules/mistune/default.nix index 14aef5b00d1..7ab4a184263 100644 --- a/pkgs/development/python-modules/mistune/default.nix +++ b/pkgs/development/python-modules/mistune/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "mistune"; - version = "0.7.4"; + version = "0.8.3"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0byj9jg9ly7karf5sb1aqcw7avaim9sxl8ws7yw7p1fibjgsy5w5"; + sha256 = "bc10c33bfdcaa4e749b779f62f60d6e12f8215c46a292d05e486b869ae306619"; }; buildInputs = [ nose ]; From 2ac6b00b97e254ad34837b4582d30b4de1a6d684 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:24:49 +0100 Subject: [PATCH 176/331] python: nbxmpp: 0.6.0 -> 0.6.2 --- pkgs/development/python-modules/nbxmpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix index 964b42fe4ee..26525adb1c9 100644 --- a/pkgs/development/python-modules/nbxmpp/default.nix +++ b/pkgs/development/python-modules/nbxmpp/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "nbxmpp"; - version = "0.6.0"; + version = "0.6.2"; src = fetchPypi { inherit pname version; - sha256 = "0x495yb0abkdspyziw7dyyjwxx6ivnv5zznk92wa3mcind5s9757"; + sha256 = "10bfb12b083a7509779298c31b4b61e2ed7e78d1960cbcfb3de8d38f3b830991"; }; meta = with stdenv.lib; { From d77c9ef3f5cf19b2d167c3f6395cd5a09f013fb9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:24:53 +0100 Subject: [PATCH 177/331] python: Nikola: 7.8.10 -> 7.8.11 --- pkgs/development/python-modules/Nikola/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix index f281a02d49b..8f8d91c64d2 100644 --- a/pkgs/development/python-modules/Nikola/default.nix +++ b/pkgs/development/python-modules/Nikola/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "Nikola"; - version = "7.8.10"; + version = "7.8.11"; # Nix contains only Python 3 supported version of doit, which is a dependency # of Nikola. Python 2 support would require older doit 0.29.0 (which on the @@ -47,7 +47,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "e242c3d0dd175d95a0baf5268b108081ba160b83ceafec8c9bc2ec0a24a56537"; + sha256 = "10d95b3af84e61496ef729665eafa2235fd0fd4cc6c57644dd0f2c19a968dd0f"; }; meta = { From 00a9a8f889319ec3ee54fef477ef7e129e183466 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:24:57 +0100 Subject: [PATCH 178/331] python: nilearn: 0.3.1 -> 0.4.0 --- pkgs/development/python-modules/nilearn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix index 16036a69179..6133abac705 100644 --- a/pkgs/development/python-modules/nilearn/default.nix +++ b/pkgs/development/python-modules/nilearn/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "nilearn"; - version = "0.3.1"; + version = "0.4.0"; name = pname + "-" + version; src = fetchPypi { inherit pname version; - sha256 = "0kkarh5cdcd2czs0bf0s1g51qas84mfxfq0dzd7k5h5l0qr4zy06"; + sha256 = "bb692254bde35d7e1d3d1534d9b3117810b35a744724625f150fbbc64d519c02"; }; checkPhase = "nosetests --exclude with_expand_user nilearn/tests"; From eee758c7d88ed6ca136b9c94e7d117f8d3a50533 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:25:00 +0100 Subject: [PATCH 179/331] python: notebook: 5.2.1 -> 5.2.2 --- pkgs/development/python-modules/notebook/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 2a23ff4de78..71261fb1f40 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "notebook"; - version = "5.2.1"; + version = "5.2.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "4ae5b81dd39b37cdd99dcffe83a5182c849947b92d46ac4d2b5093af2bb9f224"; + sha256 = "7bb54fb61b9c5426bc116f840541b973431198e00ea2896122d05fc122dbbd67"; }; LC_ALL = "en_US.utf8"; From 2815c987d9bdb43f6cb47e8be4964f4b862c701a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:25:08 +0100 Subject: [PATCH 180/331] python: odfpy: 1.3.5 -> 1.3.6 --- pkgs/development/python-modules/odfpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/odfpy/default.nix b/pkgs/development/python-modules/odfpy/default.nix index a80cd827c6d..449c5a7a92f 100644 --- a/pkgs/development/python-modules/odfpy/default.nix +++ b/pkgs/development/python-modules/odfpy/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "odfpy"; - version = "1.3.5"; + version = "1.3.6"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "6f8163f8464868cff9421a058f25566e41d73c8f7e849c021b86630941b44366"; + sha256 = "6bcaf3b23aa9e49ed8c8c177266539b211add4e02402748a994451482a10cb1b"; }; checkPhase = '' From 171dc88f70fa3798a595d67462fab67fc1bb367a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:25:15 +0100 Subject: [PATCH 181/331] python: path.py: 10.4 -> 10.5 --- pkgs/development/python-modules/path.py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/path.py/default.nix b/pkgs/development/python-modules/path.py/default.nix index 6b4af3ffcd4..2830477d3cf 100644 --- a/pkgs/development/python-modules/path.py/default.nix +++ b/pkgs/development/python-modules/path.py/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "path.py"; - version = "10.4"; + version = "10.5"; name = pname + "-" + version; src = fetchPypi { inherit pname version; - sha256 = "c63c75777c8a01f7b273c0065a8ea1e3ba0c9b369fa4a2601831e412b2c4881a"; + sha256 = "63a7af08676668fd51750f111affbd38c1a13c61aba15c6665b16681771c79a8"; }; checkInputs = [ pytest pytestrunner ]; From 7a3101587d17a68ec443d2726866a9e9e9e354bb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:25:19 +0100 Subject: [PATCH 182/331] python: pexpect: 4.3.0 -> 4.3.1 --- pkgs/development/python-modules/pexpect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pexpect/default.nix b/pkgs/development/python-modules/pexpect/default.nix index c5d1e8ef3c4..da8d5db359b 100644 --- a/pkgs/development/python-modules/pexpect/default.nix +++ b/pkgs/development/python-modules/pexpect/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pexpect"; - version = "4.3.0"; + version = "4.3.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1nfjmz81gsixv22dywidakm7pff3ly1i4yly950bfp8gz1r0iaq0"; + sha256 = "8e287b171dbaf249d0b06b5f2e88cb7e694651d2d0b8c15bccb83170d3c55575"; }; # Wants to run pythonin a subprocess From 96c077134e0037d0e2f8010bcd2d1297a25718f5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:25:22 +0100 Subject: [PATCH 183/331] python: phonenumbers: 8.8.6 -> 8.8.8 --- pkgs/development/python-modules/phonenumbers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index d5c4eaa781b..69808a7bff3 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.8.6"; + version = "8.8.8"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "ab1fa853350dde91be672192b427169b29e3348c236e46ad7a757e4ac8163c8c"; + sha256 = "ff2f492e49c212bb7185954efe09e68583a67daec586c02c49bc728c343d4eb0"; }; meta = { From b67ad2a4eb0b4132a63de72a2e324edbcb85d398 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:25:30 +0100 Subject: [PATCH 184/331] python: plotly: 2.1.0 -> 2.2.3 --- pkgs/development/python-modules/plotly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index 2744805a504..75f1b060077 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "plotly"; - version = "2.1.0"; + version = "2.2.3"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "ff6899dc11907b1efb944f79f9583b2e30ba2964bb009145f3580bf30b4d9ee4"; + sha256 = "dadd2263f1c0449b248fd3742a077d9594935921a9597529be76d6a841237ab0"; }; propagatedBuildInputs = [ From 2532a81fe40e1e4aa9433b63036b9e94db0d2bf6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:25:34 +0100 Subject: [PATCH 185/331] python: plumbum: 1.6.3 -> 1.6.5 --- pkgs/development/python-modules/plumbum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plumbum/default.nix b/pkgs/development/python-modules/plumbum/default.nix index 216c163bc9d..a5881bb2e7c 100644 --- a/pkgs/development/python-modules/plumbum/default.nix +++ b/pkgs/development/python-modules/plumbum/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "plumbum"; - version = "1.6.3"; + version = "1.6.5"; name = "${pname}-${version}"; checkInputs = [ pytest ]; @@ -16,6 +16,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0249e708459f1b05627a7ca8787622c234e4db495a532acbbd1f1f17f28c7320"; + sha256 = "d8abb059bb62beb6c99db08d3598167abaeeab53eaf218f91e74bae471a24bee"; }; } \ No newline at end of file From 73ea7b9c9ac671850505ec83232923f6bac7fccd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:25:37 +0100 Subject: [PATCH 186/331] python: psutil: 5.4.1 -> 5.4.2 --- pkgs/development/python-modules/psutil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index cf9b3ea267f..b9d07a3fa9b 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "psutil"; - version = "5.4.1"; + version = "5.4.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "42e2de159e3c987435cb3b47d6f37035db190a1499f3af714ba7af5c379b6ba2"; + sha256 = "00a1f9ff8d1e035fba7bfdd6977fa8ea7937afdb4477339e5df3dba78194fe11"; }; # No tests in archive From 358bebafb9bfbb06d9aca0611acdbd71bd1ad228 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:25:41 +0100 Subject: [PATCH 187/331] python: py: 1.4.34 -> 1.5.2 --- pkgs/development/python-modules/py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py/default.nix b/pkgs/development/python-modules/py/default.nix index 0dc3b679328..cd945f7bfc6 100644 --- a/pkgs/development/python-modules/py/default.nix +++ b/pkgs/development/python-modules/py/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "py"; - version = "1.4.34"; + version = "1.5.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1qyd5z0hv8ymxy84v5vig3vps2fvhcf4bdlksb3r03h549fmhb8g"; + sha256 = "ca18943e28235417756316bfada6cd96b23ce60dd532642690dcfdaba988a76d"; }; # Circular dependency on pytest From c42da6ffa94bdda935e29baa63218eb543969992 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:25:45 +0100 Subject: [PATCH 188/331] python: pyasn1: 0.3.4 -> 0.4.2 --- pkgs/development/python-modules/pyasn1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyasn1/default.nix b/pkgs/development/python-modules/pyasn1/default.nix index d0122a5b7e4..8037796713e 100644 --- a/pkgs/development/python-modules/pyasn1/default.nix +++ b/pkgs/development/python-modules/pyasn1/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "pyasn1"; - version = "0.3.4"; + version = "0.4.2"; src = fetchPypi { inherit pname version; - sha256 = "06hhy38jhwh95gpn8f03cr439273fsfsh4vhd5024r86nh5gyiir"; + sha256 = "d258b0a71994f7770599835249cece1caef3c70def868c4915e6e5ca49b67d15"; }; meta = with stdenv.lib; { From 5b5fabf6d6dc134521d7b6adc3e7797a8981d19a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:25:48 +0100 Subject: [PATCH 189/331] python: pyasn1-modules: 0.1.5 -> 0.2.1 --- pkgs/development/python-modules/pyasn1-modules/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyasn1-modules/default.nix b/pkgs/development/python-modules/pyasn1-modules/default.nix index a7ee15d6a18..b8dcae16da8 100644 --- a/pkgs/development/python-modules/pyasn1-modules/default.nix +++ b/pkgs/development/python-modules/pyasn1-modules/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "pyasn1-modules"; - version = "0.1.5"; + version = "0.2.1"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "1239h6h67vg0wazg2qgv6m3hdim2gs66pl89lbnayk55bbnkwc0x"; + sha256 = "af00ea8f2022b6287dc375b2c70f31ab5af83989fc6fe9eacd4976ce26cd7ccc"; }; propagatedBuildInputs = [ pyasn1 ]; From 08fad4976ffa431e189c0284c006e1a698da2c60 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:25:52 +0100 Subject: [PATCH 190/331] python: pyblake2: 0.9.3 -> 1.1.0 --- pkgs/development/python-modules/pyblake2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyblake2/default.nix b/pkgs/development/python-modules/pyblake2/default.nix index 4e166dcb183..c2f4e7db43f 100644 --- a/pkgs/development/python-modules/pyblake2/default.nix +++ b/pkgs/development/python-modules/pyblake2/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "pyblake2"; - version = "0.9.3"; + version = "1.1.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "626448e1fe1cc01d2197118954bec9f158378577e12686d5b01979f7f0fa2212"; + sha256 = "3a850036bf42053c74bfc52c063323ca78e40ba1f326b01777da5750a143631a"; }; # requires setting up sphinx doctest From 6aac50e9aba93b685bc4da7814c75114d7d91b19 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:25:55 +0100 Subject: [PATCH 191/331] python: PyChromecast: 0.8.1 -> 1.0.3 --- pkgs/development/python-modules/pychromecast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index 01014170dc7..46d3272807e 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "PyChromecast"; - version = "0.8.1"; + version = "1.0.3"; name = pname + "-" + version; src = fetchurl { url = "mirror://pypi/p/pychromecast/${name}.tar.gz"; - sha256 = "05rlr2hjng0xg2a9k9vwmrlvd7vy9sjhxxfl96kx25xynlkq6yq6"; + sha256 = "714a9e03e6a258081e3b6296ed15592e015facbe38bbe60819cca6f04c599f25"; }; propagatedBuildInputs = [ requests six zeroconf protobuf ]; From 613734dfe83de2d42d10e3ada16e62b92d32fed9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:26:02 +0100 Subject: [PATCH 192/331] python: pydot: 1.2.3 -> 1.2.4 --- pkgs/development/python-modules/pydot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydot/default.nix b/pkgs/development/python-modules/pydot/default.nix index be0b4eabfa8..98d4b33939a 100644 --- a/pkgs/development/python-modules/pydot/default.nix +++ b/pkgs/development/python-modules/pydot/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pydot"; - version = "1.2.3"; + version = "1.2.4"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "edb5d3f249f97fbd9c4bb16959e61bc32ecf40eee1a9f6d27abe8d01c0a73502"; + sha256 = "92d2e2d15531d00710f2d6fb5540d2acabc5399d464f2f20d5d21073af241eb6"; }; checkInputs = [ chardet ]; # No tests in archive From 98bf1902d13cc2ae0b1f835769c8549450727242 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:26:06 +0100 Subject: [PATCH 193/331] python: pygit2: 0.26.0 -> 0.26.3 --- pkgs/development/python-modules/pygit2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index 90bfe978391..d8eb05cf348 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "pygit2"; - version = "0.26.0"; + version = "0.26.3"; src = fetchPypi { inherit pname version; - sha256 = "1cbc488ra3kg7r3qky17ms0szi3cda2d96qfkv1l9djsy9hnvw57"; + sha256 = "29baa530d6fcbf7cca6a75cf9c78fb88613ca81afb39c62fe492f226f6b61800"; }; preConfigure = lib.optionalString stdenv.isDarwin '' From 9f68606213eb9e358f1b1e0e9cc0a2fe8f3638be Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:26:10 +0100 Subject: [PATCH 194/331] python: pyglet: 1.2.4 -> 1.3.0 --- pkgs/development/python-modules/pyglet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix index 8d5dd53f80a..ebbbb98289c 100644 --- a/pkgs/development/python-modules/pyglet/default.nix +++ b/pkgs/development/python-modules/pyglet/default.nix @@ -2,13 +2,13 @@ , mesa, xorg, freetype, fontconfig}: buildPythonPackage rec { - version = "1.2.4"; + version = "1.3.0"; pname = "pyglet"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "9f62ffbbcf2b202d084bf158685e77d28b8f4f5f2738f4c5e63a947a07503445"; + sha256 = "640a8f8e3d7bf8dbb551fa707f14021f619932990ab1401c48ba9dbcc6c2242c"; }; patchPhase = let From f4a9470f0d42a72e3fcd010c69cb3d0bbd4e178a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:26:13 +0100 Subject: [PATCH 195/331] python: pylast: 1.9.0 -> 2.0.0 --- pkgs/development/python-modules/pylast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylast/default.nix b/pkgs/development/python-modules/pylast/default.nix index 99bcb9357dc..1fcc7211504 100644 --- a/pkgs/development/python-modules/pylast/default.nix +++ b/pkgs/development/python-modules/pylast/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pylast"; - version = "1.9.0"; + version = "2.0.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "ae1c4105cbe704d9ac10ba57ac4c26bc576cc33978f1b578101b20c6a2360ca4"; + sha256 = "8e4d4962aa12d67bd357e1aa596a146b2e97afd943b5c9257e555014d13b3065"; }; propagatedBuildInputs = [ certifi six ]; From bc459a8176b02d320da3ee1f3855ae7b793201d0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:26:17 +0100 Subject: [PATCH 196/331] python: pylint: 1.7.4 -> 1.8.1 --- pkgs/development/python-modules/pylint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index afe3bf8e503..79337663c62 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "pylint"; - version = "1.7.4"; + version = "1.8.1"; src = fetchPypi { inherit pname version; - sha256 = "1f65b3815c3bf7524b845711d54c4242e4057dd93826586620239ecdfe591fb1"; + sha256 = "3035e44e37cd09919e9edad5573af01d7c6b9c52a0ebb4781185ae7ab690458b"; }; buildInputs = [ pytest pytestrunner mccabe configparser backports_functools_lru_cache ]; From 1ff879f15e8dd0ce5c1a222de6d0302425021ec3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:26:20 +0100 Subject: [PATCH 197/331] python: pymongo: 3.5.1 -> 3.6.0 --- pkgs/development/python-modules/pymongo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix index 5b400e1521e..577cd9142f9 100644 --- a/pkgs/development/python-modules/pymongo/default.nix +++ b/pkgs/development/python-modules/pymongo/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pymongo"; - version = "3.5.1"; + version = "3.6.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0939bl3brrklvccicck62gs3zd7i9aysz13c8pxc3gpk2hsdj878"; + sha256 = "c6de26d1e171cdc449745b82f1addbc873d105b8e7335097da991c0fc664a4a8"; }; doCheck = false; From db0898ab07ef2e9fd171eb5ed256b9f5b6864543 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:26:24 +0100 Subject: [PATCH 198/331] python: pyobjc: 4.0b1 -> 4.1 --- pkgs/development/python-modules/pyobjc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyobjc/default.nix b/pkgs/development/python-modules/pyobjc/default.nix index 0cf08319645..874e0d47fc9 100644 --- a/pkgs/development/python-modules/pyobjc/default.nix +++ b/pkgs/development/python-modules/pyobjc/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "pyobjc"; - version = "4.0b1"; + version = "4.1"; # Gives "No matching distribution found for # pyobjc-framework-Collaboration==4.0b1 (from pyobjc==4.0b1)" @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "16bng6960c1m57nnh1l09ycnyimrqzw9mx9pnyjxn5zzm5kalr37"; + sha256 = "287db11f912ac7d05c4907dbf6e74abaa475e36368f7c92e05aca2886a94562c"; }; meta = { From 9b677fa3c673ba01aef3c7ab631a37d2f44ac613 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:26:27 +0100 Subject: [PATCH 199/331] python: pyopencl: 2017.2 -> 2017.2.2 --- pkgs/development/python-modules/pyopencl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index 9d5661f4d58..133c5e85780 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 = "2017.2"; + version = "2017.2.2"; name = "${pname}-${version}"; buildInputs = [ pytest opencl-headers ocl-icd ]; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "039b689a58eb98e27a577ac086210deae959f40d657487f3199d2d217c270ff9"; + sha256 = "d2f7b04d2e819c6e90d6366b7712a7452a39fba218e51b11b02c85ab07fd2983"; }; # gcc: error: pygpu_language_opencl.cpp: No such file or directory From 9b035f246193c3ceaa686596a508db7ffc617ceb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:26:31 +0100 Subject: [PATCH 200/331] python: PySoundFile: 0.8.1 -> 0.9.0.post1 --- pkgs/development/python-modules/pysoundfile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysoundfile/default.nix b/pkgs/development/python-modules/pysoundfile/default.nix index ef67ed85cc0..aa7d23c5fcb 100644 --- a/pkgs/development/python-modules/pysoundfile/default.nix +++ b/pkgs/development/python-modules/pysoundfile/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "PySoundFile"; - version = "0.8.1"; + version = "0.9.0.post1"; name = pname + "-" + version; src = fetchPypi { inherit pname version; - sha256 = "72c3e23b7c9998460ec78176084ea101e3439596ab29df476bc8508708df84df"; + sha256 = "43dd46a2afc0484c26930a7e59eef9365cee81bce7a4aadc5699f788f60d32c3"; }; checkInputs = [ pytest ]; From 54926b1b8da8392ae684fb5e3a2a8c9e522834c3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:26:38 +0100 Subject: [PATCH 201/331] python: pytest-localserver: 0.3.7 -> 0.4.1 --- .../development/python-modules/pytest-localserver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-localserver/default.nix b/pkgs/development/python-modules/pytest-localserver/default.nix index fdd1986c04f..c98370ed938 100644 --- a/pkgs/development/python-modules/pytest-localserver/default.nix +++ b/pkgs/development/python-modules/pytest-localserver/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pytest-localserver"; name = "${pname}-${version}"; - version = "0.3.7"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "1c11hn61n06ms0wmw6536vs5k4k9hlndxsb3p170nva56a9dfa6q"; + sha256 = "a72af60a1ec8f73668a7884c86baf1fbe48394573cb4fa36709887217736c021"; }; propagatedBuildInputs = [ werkzeug ]; From 6246762c70fadd09891b37453848fa173dccbced Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:26:42 +0100 Subject: [PATCH 202/331] python: pytest-xdist: 1.20.1 -> 1.21.0 --- pkgs/development/python-modules/pytest-xdist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index e993a67c49f..2e2975e6596 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "pytest-xdist"; - version = "1.20.1"; + version = "1.21.0"; src = fetchPypi { inherit pname version; - sha256 = "433e82f9b34986a4e4b2be38c60e82cca3ac64b7e1b38f4d8e3e118292939712"; + sha256 = "0b8622435e3c0650a8d5a07b73a7f9c4f79b52d7ed060536a6041f0da423ba8e"; }; buildInputs = [ pytest setuptools_scm pytest-forked]; From 7d9c45856e5be8219de1819ff74a254ceae1f3fe Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:26:45 +0100 Subject: [PATCH 203/331] python: pywinrm: 0.2.2 -> 0.3.0 --- pkgs/development/python-modules/pywinrm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pywinrm/default.nix b/pkgs/development/python-modules/pywinrm/default.nix index ecd46bb1ff5..10150259ef5 100644 --- a/pkgs/development/python-modules/pywinrm/default.nix +++ b/pkgs/development/python-modules/pywinrm/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "pywinrm"; - version = "0.2.2"; + version = "0.3.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "06xc0mbqf718vmsp0fq0rb64nql66l5w2x23bmqnzl6nzc0gfc1h"; + sha256 = "799fc3e33fec8684443adf5778860388289102ea4fa1458f1bf307d167855573"; }; checkInputs = [ mock pytest ]; From b75ca0458f47494d91a5a84de55cd27cb2a67c5a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:26:49 +0100 Subject: [PATCH 204/331] python: relatorio: 0.7.1 -> 0.8.0 --- pkgs/development/python-modules/relatorio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/relatorio/default.nix b/pkgs/development/python-modules/relatorio/default.nix index 5e1ea8b4642..5c5f2578fbf 100644 --- a/pkgs/development/python-modules/relatorio/default.nix +++ b/pkgs/development/python-modules/relatorio/default.nix @@ -3,10 +3,10 @@ buildPythonPackage rec { pname = "relatorio"; name = "${pname}-${version}"; - version = "0.7.1"; + version = "0.8.0"; src = fetchurl { url = "mirror://pypi/r/relatorio/${name}.tar.gz"; - sha256 = "744f1e39313f037a0ab52a154338ece151d83e5442a9278db1f8ce450ce6c2cd"; + sha256 = "bddf85d029c5c85a0f976d73907e14e4c3093065fe8527170c91abf0218546d9"; }; propagatedBuildInputs = [ genshi From f2c4b9ad56238b750692e119b3a5ae9d48e98ae6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:26:52 +0100 Subject: [PATCH 205/331] python: restview: 2.7.0 -> 2.8.0 --- pkgs/development/python-modules/restview/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/restview/default.nix b/pkgs/development/python-modules/restview/default.nix index 0f2ce45c885..3c61ea4ded2 100644 --- a/pkgs/development/python-modules/restview/default.nix +++ b/pkgs/development/python-modules/restview/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "restview"; name = "${pname}-${version}"; - version = "2.7.0"; + version = "2.8.0"; src = fetchPypi { inherit pname version; - sha256 = "e7842100f3de179c68cfe7c2cf56c61509cd6068bc6dd58ab42c0ade5d5f97ec"; + sha256 = "5f6f1523228eab3269f59dd03ac560f7d370cd81df6fdbcb4914b5e6bd896a11"; }; propagatedBuildInputs = [ docutils readme_renderer pygments ]; From fbb14cd27ae24dd7fca71c44436268db802f76a3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:26:56 +0100 Subject: [PATCH 206/331] python: robomachine: 0.6 -> 0.8.0 --- pkgs/development/python-modules/robomachine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/robomachine/default.nix b/pkgs/development/python-modules/robomachine/default.nix index 8f71bab9c25..72407131cb1 100644 --- a/pkgs/development/python-modules/robomachine/default.nix +++ b/pkgs/development/python-modules/robomachine/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "robomachine"; - version = "0.6"; + version = "0.8.0"; name = pname + "-" + version; src = fetchurl { url = "mirror://pypi/R/RoboMachine/RoboMachine-0.6.tar.gz"; - sha256 = "6c9a9bae7bffa272b2a09b05df06c29a3a776542c70cae8041a8975a061d2e54"; + sha256 = "242cfd9be0f7591138eaeba03c9c190f894ce045e1767ab7b90eca330259fc45"; }; propagatedBuildInputs = [ pyparsing argparse robotframework ]; From 9469c95cf966e7391ea677b4d2ab4651b58cdcf9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:27:00 +0100 Subject: [PATCH 207/331] python: ropper: 1.10.10 -> 1.11.2 --- pkgs/development/python-modules/ropper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ropper/default.nix b/pkgs/development/python-modules/ropper/default.nix index f7ef16b02bb..61b54445196 100644 --- a/pkgs/development/python-modules/ropper/default.nix +++ b/pkgs/development/python-modules/ropper/default.nix @@ -8,11 +8,11 @@ buildPythonApplication rec { name = "${pname}-${version}"; pname = "ropper"; - version = "1.10.10"; + version = "1.11.2"; src = fetchPypi { inherit pname version; - sha256 = "1676e07947a19df9d17002307a7555c2647a4224d6f2869949e8fc4bd18f2e87"; + sha256 = "2183feedfe8b01a27301eee07383b481ece01b2319bdba3afebe33e19ca14aa3"; }; # XXX tests rely on user-writeable /dev/shm to obtain process locks and return PermissionError otherwise # workaround: sudo chmod 777 /dev/shm From 4a877f70c5e0314c52b393bf95a4fd9e32f7b921 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:27:04 +0100 Subject: [PATCH 208/331] python: Scrapy: 1.4.0 -> 1.5.0 --- pkgs/development/python-modules/scrapy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index 5b40c74a181..005d02e6047 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -2,7 +2,7 @@ testfixtures, pillow, six, twisted, w3lib, lxml, queuelib, pyopenssl, service-identity, parsel, pydispatcher, cssselect, lib }: buildPythonPackage rec { - version = "1.4.0"; + version = "1.5.0"; pname = "Scrapy"; name = "${pname}-${version}"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchurl { url = "mirror://pypi/S/Scrapy/${name}.tar.gz"; - sha256 = "04a08f027eef5d271342a016439533c81ba46f14bfcf230fecf602e99beaf233"; + sha256 = "31a0bf05d43198afaf3acfb9b4fb0c09c1d7d7ff641e58c66e36117f26c4b755"; }; meta = with lib; { From 9776091eaf5731f2d90bb9dbafea48f38d76a75e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:27:07 +0100 Subject: [PATCH 209/331] python: seaborn: 0.7.1 -> 0.8.1 --- pkgs/development/python-modules/seaborn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/seaborn/default.nix b/pkgs/development/python-modules/seaborn/default.nix index 1647e6cfc14..20ad32b3261 100644 --- a/pkgs/development/python-modules/seaborn/default.nix +++ b/pkgs/development/python-modules/seaborn/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "seaborn"; - version = "0.7.1"; + version = "0.8.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0pawrqc3mxpwd5g9pvi9gba02637bh5c8ldpp8izfwpfn52469zs"; + sha256 = "6702978b903d0284446e935916b980dfebae4063c18ad8eb6e8f9e76d0257eae"; }; checkInputs = [ nose ]; From 4039ea579a0d949e00f58b233ffc382d07f27244 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:27:11 +0100 Subject: [PATCH 210/331] python: serpy: 0.2.0 -> 0.3.1 --- pkgs/development/python-modules/serpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/serpy/default.nix b/pkgs/development/python-modules/serpy/default.nix index 2414b97e94a..610a75fa317 100644 --- a/pkgs/development/python-modules/serpy/default.nix +++ b/pkgs/development/python-modules/serpy/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "serpy"; name = "${pname}-${version}"; - version = "0.2.0"; + version = "0.3.1"; meta = { description = "ridiculously fast object serialization"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "7e62e242321b208362966d5ab32b45df93b1cb88da4ce6260277da060b4f7475"; + sha256 = "3772b2a9923fbf674000ff51abebf6ea8f0fca0a2cfcbfa0d63ff118193d1ec5"; }; buildInputs = [ flake8 py pyflakes tox ]; From 7a5b23a3581b23a42e64f211205c599bc9f858a8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:27:19 +0100 Subject: [PATCH 211/331] python: Shapely: 1.6.2.post1 -> 1.6.3 --- pkgs/development/python-modules/shapely/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index e8e92818ecf..dab3542b809 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "Shapely"; - version = "1.6.2.post1"; + version = "1.6.3"; src = fetchPypi { inherit pname version; - sha256 = "07fba518e76b3276558f62a5829bdfa476f790cdef752383ccdc8c66b04b0899"; + sha256 = "14152f111c7711fc6756fd538ec12fc8cdde7419f869b244922f71f61b2a6c6b"; }; buildInputs = [ geos glibcLocales cython ]; From 34af4afe73c857a7ce4b8ca351165d8e248dbb72 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:27:23 +0100 Subject: [PATCH 212/331] python: simplejson: 3.11.1 -> 3.13.2 --- pkgs/development/python-modules/simplejson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix index 846e8dc21a1..25dbecac949 100644 --- a/pkgs/development/python-modules/simplejson/default.nix +++ b/pkgs/development/python-modules/simplejson/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "simplejson"; - version = "3.11.1"; + version = "3.13.2"; name = "${pname}-${version}"; doCheck = !stdenv.isDarwin; src = fetchPypi { inherit pname version; - sha256 = "01a22d49ddd9a168b136f26cac87d9a335660ce07aa5c630b8e3607d6f4325e7"; + sha256 = "4c4ecf20e054716cc1e5a81cadc44d3f4027108d8dd0861d8b1e3bd7a32d4f0a"; }; meta = { From 850e0d5b86d12bb7ce3bc528579248a0b208b511 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:27:26 +0100 Subject: [PATCH 213/331] python: smart_open: 1.5.3 -> 1.5.6 --- pkgs/development/python-modules/smart_open/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/smart_open/default.nix b/pkgs/development/python-modules/smart_open/default.nix index 436d85102d8..2e2020f61f0 100644 --- a/pkgs/development/python-modules/smart_open/default.nix +++ b/pkgs/development/python-modules/smart_open/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "smart_open"; name = "${pname}-${version}"; - version = "1.5.3"; + version = "1.5.6"; src = fetchPypi { inherit pname version; - sha256 = "0m5j71f7f36s17v4mwv0bxg4azknvcy82rbjp28b4vifrjd6dm7s"; + sha256 = "8fd2de1c359bd0074bd6d334a5b9820ae1c5b6ba563970b95052bace4b71baeb"; }; propagatedBuildInputs = [ boto bz2file requests responses moto ]; From 08e3e050e6cfdfb884474482e3cabae9fa540470 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:27:30 +0100 Subject: [PATCH 214/331] python: SQLAlchemy: 1.1.15 -> 1.2.0 --- pkgs/development/python-modules/sqlalchemy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 9b3a5fa2039..488e78cb4ee 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "SQLAlchemy"; name = "${pname}-${version}"; - version = "1.1.15"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "8b79a5ed91cdcb5abe97b0045664c55c140aec09e5dd5c01303e23de5fe7a95a"; + sha256 = "7dda3e0b1b12215e3bb05368d1abbf7d747112a43738e0a4e6deb466b83fd88e"; }; checkInputs = [ From 9c485acbc19f7bc7c4c2c3c6970ecd378937ae56 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:27:34 +0100 Subject: [PATCH 215/331] python: sqlmap: 1.1.11 -> 1.1.12 --- pkgs/development/python-modules/sqlmap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index 2c85bdbe3d1..e89abbd595a 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.1.11"; + version = "1.1.12"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "bb5297df9cd97316b3c7ca64f8e31cae5cc6b94c015afd84c546877f1f77d6e4"; + sha256 = "86a1078ceb1e79f891633c7e4c7b07949fd9135a0e4c0738abd5111e2e6b96c0"; }; # No tests in archive From 81a7e068043d033ba272a5eb75d427a8b1397727 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:27:38 +0100 Subject: [PATCH 216/331] python: stevedore: 1.27.1 -> 1.28.0 --- pkgs/development/python-modules/stevedore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix index 326282a39c3..9639ce96194 100644 --- a/pkgs/development/python-modules/stevedore/default.nix +++ b/pkgs/development/python-modules/stevedore/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "stevedore"; - version = "1.27.1"; + version = "1.28.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "236468dae36707069e8b3bdb455e9f1be090b1e6b937f4ac0c56a538d6f50be0"; + sha256 = "f1c7518e7b160336040fee272174f1f7b29a46febb3632502a8f2055f973d60b"; }; doCheck = false; From 5925c07b3ca2c90bd0cbb01956acabbb384ed554 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:27:41 +0100 Subject: [PATCH 217/331] python: stripe: 1.70.0 -> 1.77.0 --- pkgs/development/python-modules/stripe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 7edfb9c4f0e..e2a88a9f10b 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "stripe"; - version = "1.70.0"; + version = "1.77.0"; name = "${pname}-${version}"; # Tests require network connectivity and there's no easy way to disable @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "ee77103d2d18fe6369f23c40c93067425c5ed67e08b1a7678e681217e8fa8062"; + sha256 = "6503851d2309dd9c1307e3f0a1cb33ac1427fee25d38ecba1f8bf73a0d74defc"; }; buildInputs = [ unittest2 mock ]; From 19808a1d4442558a4e8023c2c733bf97860ef38d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:27:45 +0100 Subject: [PATCH 218/331] python: supervise_api: 0.1.5 -> 0.2.0 --- pkgs/development/python-modules/supervise_api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/supervise_api/default.nix b/pkgs/development/python-modules/supervise_api/default.nix index 5b98aa3415b..85f0106db65 100644 --- a/pkgs/development/python-modules/supervise_api/default.nix +++ b/pkgs/development/python-modules/supervise_api/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "supervise_api"; - version = "0.1.5"; + version = "0.2.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1pqqlw80cjdgrlpvdmydkyhsrr4s531mn6bfkshm68j9gk4kq6px"; + sha256 = "e6982633a924cb5192d2291d25b366ff311876a31b0f5961471b39d87397ef5b"; }; propagatedBuildInputs = [ supervise ]; From 5bb3ca3667e6d5ca110d25229da64afa9bc5a44f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:27:49 +0100 Subject: [PATCH 219/331] python: sybil: 1.0.5 -> 1.0.6 --- pkgs/development/python-modules/sybil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sybil/default.nix b/pkgs/development/python-modules/sybil/default.nix index b1fe22df476..1370c59ace8 100644 --- a/pkgs/development/python-modules/sybil/default.nix +++ b/pkgs/development/python-modules/sybil/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "sybil"; - version = "1.0.5"; + version = "1.0.6"; src = fetchPypi { inherit pname version; - sha256 = "0x8qd5p5qliv8wmdglda2iy3f70i4jg8zqyk8yhklm5hrxm8jdl6"; + sha256 = "5bd7dd09eff68cbec9062e6950124fadfaaccbc0f50b23c1037f4d70ae86f0f1"; }; checkInputs = [ pytest nose ]; From 263190a00b80943d186adb2cf8687156b37560b3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:27:52 +0100 Subject: [PATCH 220/331] python: tabulate: 0.7.7 -> 0.8.2 --- pkgs/development/python-modules/tabulate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tabulate/default.nix b/pkgs/development/python-modules/tabulate/default.nix index 9ddc2a0e08b..db7f43c1ea4 100644 --- a/pkgs/development/python-modules/tabulate/default.nix +++ b/pkgs/development/python-modules/tabulate/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "0.7.7"; + version = "0.8.2"; pname = "tabulate"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "83a0b8e17c09f012090a50e1e97ae897300a72b35e0c86c0b53d3bd2ae86d8c6"; + sha256 = "e4ca13f26d0a6be2a2915428dc21e732f1e44dad7f76d7030b2ef1ec251cf7f2"; }; checkInputs = [ nose ]; From a20ea7a4b32eb555db98b9fda80e4588e02c2045 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:28:00 +0100 Subject: [PATCH 221/331] python: textacy: 0.4.1 -> 0.5.0 --- pkgs/development/python-modules/textacy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/textacy/default.nix b/pkgs/development/python-modules/textacy/default.nix index 1647b837d97..333c4825f0f 100644 --- a/pkgs/development/python-modules/textacy/default.nix +++ b/pkgs/development/python-modules/textacy/default.nix @@ -25,11 +25,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "textacy"; - version = "0.4.1"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "04wf3a7zgzz83nmgkh488wkl50zm9yfdpv3sl12sm2zj685plqcz"; + sha256 = "6fc4603fd52c386081b063ef7aa15ca77e5e937a3064b197359659fccfdeb406"; }; disabled = isPy27; # 2.7 requires backports.csv From be07136f1dd871a9b23aec21af6beb622a8ad414 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:28:04 +0100 Subject: [PATCH 222/331] python: Theano: 0.9.0 -> 1.0.1 --- pkgs/development/python-modules/Theano/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/Theano/default.nix b/pkgs/development/python-modules/Theano/default.nix index e0ff839ce1b..03dc825218e 100644 --- a/pkgs/development/python-modules/Theano/default.nix +++ b/pkgs/development/python-modules/Theano/default.nix @@ -35,13 +35,13 @@ let in buildPythonPackage rec { name = "${pname}-${version}"; pname = "Theano"; - version = "0.9.0"; + version = "1.0.1"; disabled = isPyPy || pythonOlder "2.6" || (isPy3k && pythonOlder "3.3"); src = fetchPypi { inherit pname version; - sha256 = "05xwg00da8smkvkh6ywbywqzj8dw7x840jr74wqhdy9icmqncpbl"; + sha256 = "88d8aba1fe2b6b75eacf455d01bc7e31e838c5a0fb8c13dde2d9472495ff4662"; }; postPatch = '' From 9d43c3a582f7d798fa3d30061757993752d60800 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:28:07 +0100 Subject: [PATCH 223/331] python: thespian: 3.8.3 -> 3.9.0 --- pkgs/development/python-modules/thespian/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/thespian/default.nix b/pkgs/development/python-modules/thespian/default.nix index 7a6ff3cc53d..df118470e92 100644 --- a/pkgs/development/python-modules/thespian/default.nix +++ b/pkgs/development/python-modules/thespian/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchPypi, buildPythonPackage, lib }: buildPythonPackage rec { - version = "3.8.3"; + version = "3.9.0"; pname = "thespian"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0vvwsh3waxd5ldrayr86kdcshv07bp361fl7p16g9i044vklwly4"; + sha256 = "e698e3c5369d7b06de5c4ce7b877ea65991c99f7b0fabd09f29e91bc981c7d22"; }; # Do not run the test suite: it takes a long type and uses From ee3c58004fbc2f5f9de71b8af2ceb6c963cd6239 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:28:11 +0100 Subject: [PATCH 224/331] python: toolz: 0.8.2 -> 0.9.0 --- pkgs/development/python-modules/toolz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/toolz/default.nix b/pkgs/development/python-modules/toolz/default.nix index 36b85bce3ac..0fc14024903 100644 --- a/pkgs/development/python-modules/toolz/default.nix +++ b/pkgs/development/python-modules/toolz/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec{ pname = "toolz"; - version = "0.8.2"; + version = "0.9.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0l3czks4xy37i8099waxk2fdz5g0k1dwys2mkhlxc0b0886cj4sa"; + sha256 = "929f0a7ea7f61c178bd951bdae93920515d3fbdbafc8e6caf82d752b9b3b31c9"; }; checkInputs = [ nose ]; From 0ef7ac155f7440763786853b756a944847165f3d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:28:15 +0100 Subject: [PATCH 225/331] python: tqdm: 4.19.4 -> 4.19.5 --- pkgs/development/python-modules/tqdm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index 2392a4a9968..209ee8ccd6b 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.19.4"; + version = "4.19.5"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "7ca803c2ea268c6bdb541e2dac74a3af23cf4bf7b4132a6a78926d255f8c8df1"; + sha256 = "df32e6f127dc0ccbc675eadb33f749abbcb8f174c5cb9ec49c0cdb73aa737377"; }; buildInputs = [ nose coverage glibcLocales flake8 ]; From 0c50600886bd3e36bb6441ba0eb329f58fd2a55b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:28:22 +0100 Subject: [PATCH 226/331] python: tzlocal: 1.4 -> 1.5.1 --- pkgs/development/python-modules/tzlocal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tzlocal/default.nix b/pkgs/development/python-modules/tzlocal/default.nix index 2277cb7c4ca..1c61d0afab3 100644 --- a/pkgs/development/python-modules/tzlocal/default.nix +++ b/pkgs/development/python-modules/tzlocal/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "tzlocal"; - version = "1.4"; + version = "1.5.1"; propagatedBuildInputs = [ pytz ]; src = fetchPypi { inherit pname version; - sha256 = "0n9hw4kqblyc0avzwi26rqmvyk9impb608rvy11qifmigy7r18h5"; + sha256 = "4ebeb848845ac898da6519b9b31879cf13b6626f7184c496037b818e238f2c4e"; }; # test fail (timezone test fail) From 925f8f18d7dd7fc545ec2acbef1815a342e61eda Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:28:26 +0100 Subject: [PATCH 227/331] python: vowpalwabbit: 8.3.2 -> 8.4.0 --- pkgs/development/python-modules/vowpalwabbit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix index 8c980cf2b2c..f2b5e06baaa 100644 --- a/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -3,11 +3,11 @@ pythonPackages.buildPythonPackage rec { pname = "vowpalwabbit"; name = "${pname}-${version}"; - version = "8.3.2"; + version = "8.4.0"; src = fetchurl{ url = "mirror://pypi/v/vowpalwabbit/${name}.tar.gz"; - sha256 = "0qm8rlrs2gfgamqnpx4lapxakpzgh0yh3kp1lbd7lhb0r748m3k7"; + sha256 = "abd22bfae99fb102cf8a6aec49e8c278cb7317d3a7eb60f70cd102be9c336fd5"; }; # vw tries to write some explicit things to home # python installed: The directory '/homeless-shelter/.cache/pip/http' From 179446a89bc66c1ce8e4049f82a9f23d54a576d5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:28:29 +0100 Subject: [PATCH 228/331] python: websockets: 3.4 -> 4.0.1 --- pkgs/development/python-modules/websockets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix index 48803655258..f24f10675f8 100644 --- a/pkgs/development/python-modules/websockets/default.nix +++ b/pkgs/development/python-modules/websockets/default.nix @@ -6,13 +6,13 @@ let pname = "websockets"; - version = "3.4"; + version = "4.0.1"; in buildPythonPackage rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "43e5b9f51dd0000a4c6f646e2ade0c886bd14a784ffac08b9e079bd17a63bcc5"; + sha256 = "da4d4fbe059b0453e726d6d993760065d69b823a27efc3040402a6fcfe6a1ed9"; }; disabled = pythonOlder "3.3"; From ec334a20861f700fffe5d8168bbd88c16839a6a3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:28:36 +0100 Subject: [PATCH 229/331] python: widgetsnbextension: 3.0.8 -> 3.1.0 --- .../development/python-modules/widgetsnbextension/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix index b9ab1dfbc1d..ab63b444af6 100644 --- a/pkgs/development/python-modules/widgetsnbextension/default.nix +++ b/pkgs/development/python-modules/widgetsnbextension/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "widgetsnbextension"; name = "${pname}-${version}"; - version = "3.0.8"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "a57e29e733b989e68fdd0f3d6927a3691763b39792591d573b95a89a5a12ec15"; + sha256 = "67fc28c3b9fede955d69bccbd92784e3f0c6d0dee3a71532cd3367c257feb178"; }; propagatedBuildInputs = [ notebook ]; From 7577b6bbb8524a716a6f8b2a2e51080c48c85f1a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:28:40 +0100 Subject: [PATCH 230/331] python: ws4py: 0.4.2 -> 0.4.3 --- pkgs/development/python-modules/ws4py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ws4py/default.nix b/pkgs/development/python-modules/ws4py/default.nix index 648ab1cff08..5e65940e846 100644 --- a/pkgs/development/python-modules/ws4py/default.nix +++ b/pkgs/development/python-modules/ws4py/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "ws4py"; - version = "0.4.2"; + version = "0.4.3"; src = fetchPypi { inherit pname version; - sha256 = "0zr3254ky6r7q15l3dhdczfa8i723055zdkqssjifsgcwvirriks"; + sha256 = "ee12b58384bab8bfdcd1c76dcd6852047aec163af17175fc0f73e255d107dd7a"; }; checkInputs = [ pytest mock git ]; From 9d9ae4128186f58c3efcd6ac6e01881615250be3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:28:44 +0100 Subject: [PATCH 231/331] python: yapf: 0.19.0 -> 0.20.0 --- pkgs/development/python-modules/yapf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yapf/default.nix b/pkgs/development/python-modules/yapf/default.nix index 2ded73d5250..d7617ae1551 100644 --- a/pkgs/development/python-modules/yapf/default.nix +++ b/pkgs/development/python-modules/yapf/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "yapf"; - version = "0.19.0"; + version = "0.20.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "701b076a4916e3cfbba345e0297dcd54a02fd0fdcae1f43346f8a043c3bbd052"; + sha256 = "ff28f8839a9a105854a099026a33f4cbec8bd933554bfed658aec359bfc88ae8"; }; meta = with stdenv.lib; { From 6801d20ac790e973c9a093b345d2a02d2bb72833 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 29 Dec 2017 20:22:43 +0100 Subject: [PATCH 232/331] python.pkgs.pluggy: 0.3.1 -> 0.6.0 --- .../python-modules/pluggy/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +---------- 2 files changed, 30 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/pluggy/default.nix diff --git a/pkgs/development/python-modules/pluggy/default.nix b/pkgs/development/python-modules/pluggy/default.nix new file mode 100644 index 00000000000..0fbfa5108c1 --- /dev/null +++ b/pkgs/development/python-modules/pluggy/default.nix @@ -0,0 +1,29 @@ +{ buildPythonPackage +, lib +, fetchPypi +, pytest +}: + +buildPythonPackage rec { + pname = "pluggy"; + version = "0.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "7f8ae7f5bdf75671a718d2daf0a64b7885f74510bcd98b1a0bb420eb9a9d0cff"; + }; + + checkPhase = '' + py.test + ''; + + # To prevent infinite recursion with pytest + doCheck = false; + + meta = { + description = "Plugin and hook calling mechanisms for Python"; + homepage = "https://pypi.python.org/pypi/pluggy"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jgeerds ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 10eeca9b8b8..b84f29d4d14 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21935,22 +21935,7 @@ EOF }; }; - pluggy = buildPythonPackage rec { - name = "pluggy-${version}"; - version = "0.3.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pluggy/${name}.tar.gz"; - sha256 = "18qfzfm40bgx672lkg8q9x5hdh76n7vax99aank7vh2nw21wg70m"; - }; - - meta = { - description = "Plugin and hook calling mechanisms for Python"; - homepage = "https://pypi.python.org/pypi/pluggy"; - license = licenses.mit; - maintainers = with maintainers; [ jgeerds ]; - }; - }; + pluggy = callPackage ../development/python-modules/pluggy {}; xcffib = buildPythonPackage rec { version = "0.3.2"; From fd0b0190075552cbffca5386038b6fac8c1880bd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:26:35 +0100 Subject: [PATCH 233/331] python: pytest: 3.2.5 -> 3.3.1 --- .../development/python-modules/pytest/3_2.nix | 27 +++++++++++++++++++ .../python-modules/pytest/default.nix | 12 +++++---- pkgs/top-level/python-packages.nix | 13 +++++++-- 3 files changed, 45 insertions(+), 7 deletions(-) create mode 100644 pkgs/development/python-modules/pytest/3_2.nix diff --git a/pkgs/development/python-modules/pytest/3_2.nix b/pkgs/development/python-modules/pytest/3_2.nix new file mode 100644 index 00000000000..d7a0b1bdad3 --- /dev/null +++ b/pkgs/development/python-modules/pytest/3_2.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy26, argparse, hypothesis, py +, setuptools_scm, setuptools +}: +buildPythonPackage rec { + version = "3.2.5"; + pname = "pytest"; + + preCheck = '' + # don't test bash builtins + rm testing/test_argcomplete.py + ''; + + src = fetchPypi { + inherit pname version; + sha256 = "6d5bd4f7113b444c55a3bbb5c738a3dd80d43563d063fc42dcb0aaefbdd78b81"; + }; + + checkInputs = [ hypothesis ]; + buildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ py setuptools ] + ++ (stdenv.lib.optional isPy26 argparse); + + meta = with stdenv.lib; { + maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ]; + platforms = platforms.unix; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 8e280b8fd0d..d45fe7deb12 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy26, argparse, hypothesis, py -, setuptools_scm, setuptools +{ stdenv, buildPythonPackage, fetchPypi, isPy26, argparse, attrs, hypothesis, py +, setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k }: buildPythonPackage rec { - version = "3.2.5"; + version = "3.3.1"; pname = "pytest"; preCheck = '' @@ -12,16 +12,18 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "6d5bd4f7113b444c55a3bbb5c738a3dd80d43563d063fc42dcb0aaefbdd78b81"; + sha256 = "cf8436dc59d8695346fcd3ab296de46425ecab00d64096cebe79fb51ecb2eb93"; }; checkInputs = [ hypothesis ]; buildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ py setuptools ] + propagatedBuildInputs = [ attrs py setuptools six pluggy ] + ++ (stdenv.lib.optional (!isPy3k) funcsigs) ++ (stdenv.lib.optional isPy26 argparse); meta = with stdenv.lib; { maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ]; platforms = platforms.unix; + description = "Framework for writing tests"; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b84f29d4d14..270330cdcde 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3436,7 +3436,7 @@ in { }; }; - pytest = self.pytest_32; + pytest = self.pytest_33; pytest_27 = callPackage ../development/python-modules/pytest/2_7.nix {}; @@ -3451,7 +3451,16 @@ in { pytest = null; }; }; - pytest_32 = callPackage ../development/python-modules/pytest{ + + pytest_32 = callPackage ../development/python-modules/pytest/3_2.nix{ + hypothesis = self.hypothesis.override { + # hypothesis requires pytest that causes dependency cycle + doCheck = false; + pytest = null; + }; + }; + + pytest_33 = callPackage ../development/python-modules/pytest/default.nix{ hypothesis = self.hypothesis.override { # hypothesis requires pytest that causes dependency cycle doCheck = false; From 0dadb900a5445d41ed7c6808dd9f9d94b5ca54bc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 29 Dec 2017 20:27:27 +0100 Subject: [PATCH 234/331] python.pkgs.six: disable tests to prevent infinite recursion --- pkgs/development/python-modules/six/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/six/default.nix b/pkgs/development/python-modules/six/default.nix index 00fbbbc01eb..6921b3590e4 100644 --- a/pkgs/development/python-modules/six/default.nix +++ b/pkgs/development/python-modules/six/default.nix @@ -19,6 +19,9 @@ buildPythonPackage rec { py.test test_six.py ''; + # To prevent infinite recursion with pytest + doCheck = false; + meta = { description = "A Python 2 and 3 compatibility library"; homepage = https://pypi.python.org/pypi/six/; From 2c7feca25d5b622a2879db554e426eeee79edf15 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 10:14:31 +0100 Subject: [PATCH 235/331] awscli: 1.14.6 -> 1.14.17 --- pkgs/tools/admin/awscli/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index b0e142a6d1d..b6c7270a425 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -25,14 +25,13 @@ let }); in buildPythonPackage rec { - name = "${pname}-${version}"; pname = "awscli"; - version = "1.14.6"; + version = "1.14.17"; namePrefix = ""; src = fetchPypi { inherit pname version; - sha256 = "1lhv8vb3bkjfjg4jm3hgfjssxgqy50gb6vbkh4lxiy8cn3y2dxp1"; + sha256 = "456499acc41ab67671062a08e218a22aa1a1ff64ae531e694163d0371e8a1dd0"; }; # No tests included From 403348f0fadb8fe3e0507406d015c827ac5bf577 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:25:11 +0100 Subject: [PATCH 236/331] python: pathlib2: 2.2.1 -> 2.3.0 --- pkgs/development/python-modules/pathlib2/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix index 62d5c43a4b3..18c083298e6 100644 --- a/pkgs/development/python-modules/pathlib2/default.nix +++ b/pkgs/development/python-modules/pathlib2/default.nix @@ -5,19 +5,20 @@ , pythonOlder , scandir , glibcLocales +, mock }: if !(pythonOlder "3.4") then null else buildPythonPackage rec { pname = "pathlib2"; - version = "2.2.1"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "ce9007df617ef6b7bd8a31cd2089ed0c1fed1f7c23cf2bf1ba140b3dd563175d"; + sha256 = "d32550b75a818b289bd4c1f96b60c89957811da205afcceab75bc8b4857ea5b3"; }; propagatedBuildInputs = [ six ] ++ lib.optional (pythonOlder "3.5") scandir; - checkInputs = [ glibcLocales ]; + checkInputs = [ glibcLocales ] ++ lib.optional (pythonOlder "3.3") mock; preCheck = '' export LC_ALL="en_US.UTF-8" From dcf88276e4e92bdba0cfb878ab6cf8cc80cff1fc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:24:23 +0100 Subject: [PATCH 237/331] python: llvmlite: 0.20.0 -> 0.21.0 --- .../development/python-modules/llvmlite/default.nix | 13 ++++++------- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix index 57deaf3caf3..d702d8f95b0 100644 --- a/pkgs/development/python-modules/llvmlite/default.nix +++ b/pkgs/development/python-modules/llvmlite/default.nix @@ -1,5 +1,5 @@ { stdenv -, fetchurl +, fetchPypi , buildPythonPackage , python , llvm @@ -10,21 +10,20 @@ buildPythonPackage rec { pname = "llvmlite"; - name = "${pname}-${version}"; - version = "0.20.0"; + version = "0.21.0"; disabled = isPyPy; - src = fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "b2f174848df16bb9195a07fec102110a06d018da736bd9b3570a54d44c797c29"; + src = fetchPypi { + inherit pname version; + sha256 = "3a5dd0695fdfb9fd47464cd71791b84935bf9642e11f4811d57aa1f2da8cdaa8"; }; propagatedBuildInputs = [ llvm ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34; # Disable static linking # https://github.com/numba/llvmlite/issues/93 - patchPhase = '' + postPatch = '' substituteInPlace ffi/Makefile.linux --replace "-static-libstdc++" "" substituteInPlace llvmlite/tests/test_binding.py --replace "test_linux" "nope" diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 270330cdcde..c932d35747f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10304,7 +10304,7 @@ in { locustio = callPackage ../development/python-modules/locustio { }; - llvmlite = callPackage ../development/python-modules/llvmlite {llvm=pkgs.llvm_4;}; + llvmlite = callPackage ../development/python-modules/llvmlite {llvm=pkgs.llvm_5;}; lockfile = buildPythonPackage rec { pname = "lockfile"; From e76f06c64971e0a0657c4d79dd08a03c545bde26 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:25:04 +0100 Subject: [PATCH 238/331] python: numba: 0.35.0 -> 0.36.2 --- pkgs/development/python-modules/numba/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index b0d7ae72c95..97aad8c0928 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -1,5 +1,5 @@ { stdenv -, fetchurl +, fetchPypi , python , buildPythonPackage , isPy27 @@ -14,13 +14,12 @@ }: buildPythonPackage rec { - version = "0.35.0"; + version = "0.36.2"; pname = "numba"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/n/numba/${name}.tar.gz"; - sha256 = "11564937757605bee590c5758c73cfe9fd6d569726b56d970316a6228971ecc3"; + src = fetchPypi { + inherit pname version; + sha256 = "d61597808ce511e81b64e32da664f52beb7d947bf834dde8b8b60b29d205e5c2"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; @@ -29,7 +28,7 @@ buildPythonPackage rec { # Copy test script into $out and run the test suite. checkPhase = '' - python -m numba.runtests + ${python.interpreter} -m numba.runtests ''; # ImportError: cannot import name '_typeconv' doCheck = false; From 7a3d7cc30df8c87aa77b64b19f7f46e4e073e705 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:23:58 +0100 Subject: [PATCH 239/331] python: jupyter_core: 4.3.0 -> 4.4.0 --- .../python-modules/jupyter_core/default.nix | 6 +-- .../tests_respect_pythonpath.patch | 44 +++++++++---------- 2 files changed, 23 insertions(+), 27 deletions(-) diff --git a/pkgs/development/python-modules/jupyter_core/default.nix b/pkgs/development/python-modules/jupyter_core/default.nix index 4db36cf7b37..403f7c047d5 100644 --- a/pkgs/development/python-modules/jupyter_core/default.nix +++ b/pkgs/development/python-modules/jupyter_core/default.nix @@ -11,15 +11,15 @@ buildPythonPackage rec { pname = "jupyter_core"; - version = "4.3.0"; + version = "4.4.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "a96b129e1641425bf057c3d46f4f44adce747a7d60107e8ad771045c36514d40"; + sha256 = "ba70754aa680300306c699790128f6fbd8c306ee5927976cbe48adacf240c0b7"; }; - buildInputs = [ pytest mock glibcLocales ]; + checkInputs = [ pytest mock glibcLocales ]; propagatedBuildInputs = [ ipython traitlets ]; patches = [ ./tests_respect_pythonpath.patch ]; diff --git a/pkgs/development/python-modules/jupyter_core/tests_respect_pythonpath.patch b/pkgs/development/python-modules/jupyter_core/tests_respect_pythonpath.patch index 61415b756ab..7e7e9ae93a0 100644 --- a/pkgs/development/python-modules/jupyter_core/tests_respect_pythonpath.patch +++ b/pkgs/development/python-modules/jupyter_core/tests_respect_pythonpath.patch @@ -1,24 +1,20 @@ ---- a/jupyter_core/tests/test_command.py 2016-09-13 15:22:49.000000000 +0200 -+++ b/jupyter_core/tests/test_command.py 2017-10-23 12:49:27.489527705 +0200 -@@ -113,7 +113,10 @@ - witness = a.join(witness_cmd) - witness.write('#!%s\n%s\n' % (sys.executable, 'print("WITNESS ME")')) - witness.chmod(0o700) -- out = check_output([sys.executable, str(jupyter), 'witness'], env={'PATH': ''}) -+ out = check_output( -+ [sys.executable, str(jupyter), 'witness'], -+ env={'PATH': '', 'PYTHONPATH': os.environ['PYTHONPATH']} -+ ) - assert b'WITNESS' in out - - -@@ -136,5 +139,8 @@ - witness_b.write('#!%s\n%s\n' % (sys.executable, 'print("WITNESS B")')) - witness_b.chmod(0o700) - -- out = check_output([sys.executable, str(jupyter), 'witness'], env={'PATH': str(b)}) -+ out = check_output( -+ [sys.executable, str(jupyter), 'witness'], -+ env={'PATH': str(b), 'PYTHONPATH': os.environ['PYTHONPATH']} -+ ) - assert b'WITNESS A' in out +--- a/jupyter_core/tests/test_command.py ++++ b/jupyter_core/tests/test_command.py +@@ -131,7 +131,7 @@ def test_not_on_path(tmpdir): + witness_src = '#!%s\n%s\n' % (sys.executable, 'print("WITNESS ME")') + write_executable(witness, witness_src) + +- env = {'PATH': ''} ++ env = {'PATH': '', 'PYTHONPATH': os.environ['PYTHONPATH']} + if 'SYSTEMROOT' in os.environ: # Windows http://bugs.python.org/issue20614 + env[str('SYSTEMROOT')] = os.environ['SYSTEMROOT'] + if sys.platform == 'win32': +@@ -157,7 +157,7 @@ def test_path_priority(tmpdir): + witness_b_src = '#!%s\n%s\n' % (sys.executable, 'print("WITNESS B")') + write_executable(witness_b, witness_b_src) + +- env = {'PATH': str(b)} ++ env = {'PATH': str(b), 'PYTHONPATH': os.environ['PYTHONPATH']} + if 'SYSTEMROOT' in os.environ: # Windows http://bugs.python.org/issue20614 + env[str('SYSTEMROOT')] = os.environ['SYSTEMROOT'] + if sys.platform == 'win32': From dab53a9005c2c2b01babc9d538956455baca831f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 11:03:19 +0100 Subject: [PATCH 240/331] python.pkgs.texttable: 0.8.4 -> 1.1.1 --- .../python-modules/texttable/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 15 +------------- 2 files changed, 21 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/python-modules/texttable/default.nix diff --git a/pkgs/development/python-modules/texttable/default.nix b/pkgs/development/python-modules/texttable/default.nix new file mode 100644 index 00000000000..38cffcee296 --- /dev/null +++ b/pkgs/development/python-modules/texttable/default.nix @@ -0,0 +1,20 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "texttable"; + version = "1.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "44674d1d470a9fc264c4d1eba44b74463ca0066d7b954453dd5a4f8057779c9c"; + }; + + meta = { + description = "A module to generate a formatted text table, using ASCII characters"; + homepage = http://foutaise.org/code/; + license = lib.licenses.lgpl2; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c932d35747f..7c1b7ec9d29 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18373,20 +18373,7 @@ in { }; }; - texttable = self.buildPythonPackage rec { - name = "texttable-0.8.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/texttable/${name}.tar.gz"; - sha256 = "0bkhs4dx9s6g7fpb969hygq56hyz4ncfamlynw72s0n6nqfbd1w5"; - }; - - meta = { - description = "A module to generate a formatted text table, using ASCII characters"; - homepage = http://foutaise.org/code/; - license = licenses.lgpl2; - }; - }; + texttable = callPackage ../development/python-modules/texttable { }; tiros = callPackage ../development/python-modules/tiros { }; From e21ac0ceae85b43ab2a02fd926755531e3b135cf Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 11:03:43 +0100 Subject: [PATCH 241/331] python.pkgs.docker_compose: fixup --- pkgs/development/python-modules/docker_compose/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/docker_compose/default.nix b/pkgs/development/python-modules/docker_compose/default.nix index 6084afb39d4..e6be57c8b52 100644 --- a/pkgs/development/python-modules/docker_compose/default.nix +++ b/pkgs/development/python-modules/docker_compose/default.nix @@ -3,12 +3,11 @@ , pyyaml, backports_ssl_match_hostname, colorama, docopt , dockerpty, docker, ipaddress, jsonschema, requests , six, texttable, websocket_client, cached-property -, enum34, functools32 +, enum34, functools32, }: buildPythonApplication rec { version = "1.18.0"; pname = "docker-compose"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; @@ -17,7 +16,7 @@ buildPythonApplication rec { # lots of networking and other fails doCheck = false; - buildInputs = [ mock pytest nose ]; + checkInputs = [ mock pytest nose ]; propagatedBuildInputs = [ pyyaml backports_ssl_match_hostname colorama dockerpty docker ipaddress jsonschema requests six texttable websocket_client @@ -26,7 +25,7 @@ buildPythonApplication rec { stdenv.lib.optional (pythonOlder "3.4") enum34 ++ stdenv.lib.optional (pythonOlder "3.2") functools32; - patchPhase = '' + postPatch = '' # Remove upper bound on requires, see also # https://github.com/docker/compose/issues/4431 sed -i "s/, < .*',$/',/" setup.py From b4dda635909dfee893c2aa48f120d2c8f9a74155 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:58:00 +0100 Subject: [PATCH 242/331] python.pkgs.attrs: disable tests to prevent infinite recursion --- pkgs/development/python-modules/attrs/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/attrs/default.nix b/pkgs/development/python-modules/attrs/default.nix index c67ad6ece88..8ef2b5989f4 100644 --- a/pkgs/development/python-modules/attrs/default.nix +++ b/pkgs/development/python-modules/attrs/default.nix @@ -2,7 +2,6 @@ , pympler, coverage, six, clang }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "attrs"; version = "17.4.0"; @@ -12,7 +11,7 @@ buildPythonPackage rec { }; # macOS needs clang for testing - buildInputs = [ + checkInputs = [ pytest hypothesis zope_interface pympler coverage six ] ++ lib.optionals (stdenv.isDarwin) [ clang ]; @@ -20,6 +19,9 @@ buildPythonPackage rec { py.test ''; + # To prevent infinite recursion with pytest + doCheck = false; + meta = with lib; { description = "Python attributes without boilerplate"; homepage = https://github.com/hynek/attrs; From a7200d1d89945c163fb75bdedfc74dd5cacbe73b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:21:21 +0100 Subject: [PATCH 243/331] python: arrow: 0.10.0 -> 0.12.0 --- pkgs/development/python-modules/arrow/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix index a85987a95b1..72b88d3e557 100644 --- a/pkgs/development/python-modules/arrow/default.nix +++ b/pkgs/development/python-modules/arrow/default.nix @@ -1,23 +1,22 @@ { stdenv, buildPythonPackage, fetchPypi -, nose, chai, simplejson +, nose, chai, simplejson, backports_functools_lru_cache , dateutil }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "arrow"; - version = "0.10.0"; + version = "0.12.0"; src = fetchPypi { inherit pname version; - sha256 = "08n7q2l69hlainds1byd4lxhwrq7zsw7s640zkqc3bs5jkq0cnc0"; + sha256 = "a15ecfddf334316e3ac8695e48c15d1be0d6038603b33043930dcf0e675c86ee"; }; checkPhase = '' nosetests --cover-package=arrow ''; - buildInputs = [ nose chai simplejson ]; - propagatedBuildInputs = [ dateutil ]; + checkInputs = [ nose chai simplejson ]; + propagatedBuildInputs = [ dateutil backports_functools_lru_cache ]; meta = with stdenv.lib; { description = "Python library for date manipulation"; From 74abf265a6fed4b1c6c33bb9f6780122d3f0c9b5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:24:09 +0100 Subject: [PATCH 244/331] python: python-ldap: 2.4.45 -> 2.5.2 --- pkgs/development/python-modules/ldap/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/ldap/default.nix b/pkgs/development/python-modules/ldap/default.nix index 635308f3760..32f25eeda42 100644 --- a/pkgs/development/python-modules/ldap/default.nix +++ b/pkgs/development/python-modules/ldap/default.nix @@ -1,18 +1,18 @@ { lib, writeText, buildPythonPackage, isPy3k, fetchPypi -, openldap, cyrus_sasl, openssl, pytest }: +, openldap, cyrus_sasl, openssl, pytest, pyasn1 }: buildPythonPackage rec { pname = "python-ldap"; - version = "2.4.45"; + version = "2.5.2"; name = "${pname}-${version}"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "824fde180a53772e23edc031c4dd64ac1af4a3eade78f00d9d510937d562f64e"; + sha256 = "b8c134dfedaef0e6ff4a4b94277708dcadb758b448905a83b8946df077356ed2"; }; - buildInputs = [ pytest ]; + checkInputs = [ pytest pyasn1 ]; checkPhase = '' # Needed by tests to setup a mockup ldap server. From be6ab681f3c1b8ad65b79205e02f6404d4ff7396 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:25:26 +0100 Subject: [PATCH 245/331] python: pip-tools: 1.10.2 -> 1.11.0 --- pkgs/development/python-modules/pip-tools/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index d2b91eb435c..752047d04f7 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "pip-tools"; - version = "1.10.2"; + version = "1.11.0"; name = pname + "-" + version; src = fetchurl { url = "mirror://pypi/p/pip-tools/${name}.tar.gz"; - sha256 = "d381c7249eb48350cc49447cc106df3d90e9e806b13caaede602c1cd38f61b37"; + sha256 = "ba427b68443466c389e3b0b0ef55f537ab39344190ea980dfebb333d0e6a50a3"; }; LC_ALL = "en_US.UTF-8"; @@ -21,9 +21,11 @@ buildPythonPackage rec { "test_generate_hashes_all_platforms" "test_generate_hashes_without_interfering_with_each_other" "test_realistic_complex_sub_dependencies" + "test_generate_hashes_with_editable" # Expect specific version of "six": "test_editable_package" "test_input_file_without_extension" + "test_locally_available_editable_package_is_not_archived_in_cache_dir" ]; checkPhase = '' From 803c6a21116f47962f4d101a87a2a74926839fc2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 13:25:04 +0100 Subject: [PATCH 246/331] python.pkgs.structlog: move expression --- .../python-modules/structlog/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +------------ 2 files changed, 33 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/structlog/default.nix diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix new file mode 100644 index 00000000000..029657e2b81 --- /dev/null +++ b/pkgs/development/python-modules/structlog/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, pretend +, freezegun +, simplejson +}: + +buildPythonPackage rec { + pname = "structlog"; + version = "16.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "00dywyg3bqlkrmbrfrql21hpjjjkc4zjd6xxjyxyd15brfnzlkdl"; + }; + + checkInputs = [ pytest pretend freezegun ]; + propagatedBuildInputs = [ simplejson ]; + + checkPhase = '' + rm tests/test_twisted.py* + py.test + ''; + + meta = { + description = "Painless structural logging"; + homepage = http://www.structlog.org/; + license = lib.licenses.asl20; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7c1b7ec9d29..72c908b9353 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18049,28 +18049,7 @@ in { }; }; - structlog = buildPythonPackage rec { - name = "structlog-16.1.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/structlog/${name}.tar.gz"; - sha256 = "00dywyg3bqlkrmbrfrql21hpjjjkc4zjd6xxjyxyd15brfnzlkdl"; - }; - - buildInputs = with self; [ pytest pretend freezegun ]; - propagatedBuildInputs = with self; [ simplejson ]; - - checkPhase = '' - rm tests/test_twisted.py* - py.test - ''; - - meta = { - description = "Painless structural logging"; - homepage = http://www.structlog.org/; - license = licenses.asl20; - }; - }; + structlog = callPackage ../development/python-modules/structlog { }; svgwrite = buildPythonPackage rec { name = "svgwrite-${version}"; From 397b8ef2a1d26deaaceaf0d511b2c49351a0559f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 13:25:32 +0100 Subject: [PATCH 247/331] python: structlog: 16.1.0 -> 17.2.0 --- pkgs/development/python-modules/structlog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix index 029657e2b81..2aab5b16aef 100644 --- a/pkgs/development/python-modules/structlog/default.nix +++ b/pkgs/development/python-modules/structlog/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "structlog"; - version = "16.1.0"; + version = "17.2.0"; src = fetchPypi { inherit pname version; - sha256 = "00dywyg3bqlkrmbrfrql21hpjjjkc4zjd6xxjyxyd15brfnzlkdl"; + sha256 = "6980001045abd235fa12582222627c19b89109e58b85eb77d5a5abc778df6e20"; }; checkInputs = [ pytest pretend freezegun ]; From 812d1b354f43e880c8698673ea329feb078aaa71 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 13:33:34 +0100 Subject: [PATCH 248/331] python.pkgs.tox: 2.4.1 -> 2.9.1 --- .../python-modules/tox/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 14 +---------- 2 files changed, 25 insertions(+), 13 deletions(-) create mode 100644 pkgs/development/python-modules/tox/default.nix diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix new file mode 100644 index 00000000000..bc70d65cc1f --- /dev/null +++ b/pkgs/development/python-modules/tox/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +, py +, virtualenv +, pluggy +, setuptools_scm +, six +}: + +buildPythonPackage rec { + pname = "tox"; + version = "2.9.1"; + + buildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ py virtualenv pluggy six ]; + + doCheck = false; + + src = fetchPypi { + inherit pname version; + sha256 = "752f5ec561c6c08c5ecb167d3b20f4f4ffc158c0ab78855701a75f5cef05f4b8"; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 72c908b9353..1e8fd8dcc91 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18435,19 +18435,7 @@ in { toolz = callPackage ../development/python-modules/toolz { }; - tox = buildPythonPackage rec { - name = "tox-${version}"; - version = "2.4.1"; - - propagatedBuildInputs = with self; [ py virtualenv pluggy ]; - - doCheck = false; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/tox/${name}.tar.gz"; - sha256 = "1nwn4jz8ns53n17bm1xkzlz4zyyxbgjwrcg2cjsn25ab7hd5fwv6"; - }; - }; + tox = callPackage ../development/python-modules/tox { }; tqdm = callPackage ../development/python-modules/tqdm { }; From 5be749f4e07abc3089416d5ecd59de0fbdb8b1fb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 13:36:54 +0100 Subject: [PATCH 249/331] python.pkgs.backports_functools_lru_cache: move expression --- .../backports_functools_lru_cache/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +-------------- 2 files changed, 25 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/backports_functools_lru_cache/default.nix diff --git a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix new file mode 100644 index 00000000000..7ce609d84f0 --- /dev/null +++ b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools_scm +}: + +buildPythonPackage rec { + pname = "backports.functools_lru_cache"; + version = "1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "444a21bcec4ae177da554321f81a78dc879eaa8f6ea9920cb904830585d31e95"; + }; + + buildInputs = [ setuptools_scm ]; + doCheck = false; # No proper test + + meta = { + description = "Backport of functools.lru_cache"; + homepage = https://github.com/jaraco/backports.functools_lru_cache; + license = lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1e8fd8dcc91..9de6d98a63f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1040,24 +1040,7 @@ in { }; }; - backports_functools_lru_cache = buildPythonPackage rec { - name = "backports.functools_lru_cache-${version}"; - version = "1.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/b/backports_functools_lru_cache/${name}.tar.gz"; - sha256 = "444a21bcec4ae177da554321f81a78dc879eaa8f6ea9920cb904830585d31e95"; - }; - - buildInputs = with self; [ setuptools_scm ]; - doCheck = false; # No proper test - - meta = { - description = "Backport of functools.lru_cache"; - homepage = https://github.com/jaraco/backports.functools_lru_cache; - license = licenses.mit; - }; - }; + backports_functools_lru_cache = callPackage ../development/python-modules/backports_functools_lru_cache { }; backports_shutil_get_terminal_size = callPackage ../development/python-modules/backports_shutil_get_terminal_size { }; From ba07bcd774a99798f61d28370d9cccef41033f6c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 13:37:09 +0100 Subject: [PATCH 250/331] python: backports.functools_lru_cache: 1.3 -> 1.4 --- .../python-modules/backports_functools_lru_cache/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix index 7ce609d84f0..2442e132f1b 100644 --- a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix +++ b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "backports.functools_lru_cache"; - version = "1.3"; + version = "1.4"; src = fetchPypi { inherit pname version; - sha256 = "444a21bcec4ae177da554321f81a78dc879eaa8f6ea9920cb904830585d31e95"; + sha256 = "31f235852f88edc1558d428d890663c49eb4514ffec9f3650e7f3c9e4a12e36f"; }; buildInputs = [ setuptools_scm ]; From d4642a05cbdfe95d28796d75b526d24e6efe9be9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:24:38 +0100 Subject: [PATCH 251/331] python: MechanicalSoup: 0.8.0 -> 0.9.0.post4 --- .../python-modules/MechanicalSoup/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/MechanicalSoup/default.nix b/pkgs/development/python-modules/MechanicalSoup/default.nix index 56e2cf501ed..b5d202af50a 100644 --- a/pkgs/development/python-modules/MechanicalSoup/default.nix +++ b/pkgs/development/python-modules/MechanicalSoup/default.nix @@ -1,5 +1,5 @@ { fetchPypi, buildPythonPackage, lib -, requests, beautifulsoup4, six +, requests, beautifulsoup4, six, lxml , pytestrunner, requests-mock, pytestcov, pytest }: @@ -7,23 +7,23 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "MechanicalSoup"; - version = "0.8.0"; + version = "0.9.0.post4"; src = fetchPypi { inherit pname version; - sha256 = "38a6ca35428196be94f87f8f036ee4a88b1418d1f77e5634ad92acfaa22c28da"; + sha256 = "ce8f822afbc9bef1499be417e8d5deecd0cd32606420165700e89477955f03ab"; }; checkInputs = [ pytest pytestrunner requests-mock pytestcov ]; - propagatedBuildInputs = [ requests beautifulsoup4 six ]; + propagatedBuildInputs = [ lxml requests beautifulsoup4 six ]; # Requires network doCheck = false; postPatch = '' # Is in setup_requires but not used in setup.py... - substituteInPlace setup.py --replace "'pytest-runner'," "" + substituteInPlace setup.py --replace "'pytest-runner'" "" ''; meta = with lib; { From ec04801de96a4bb17a005bc7dbf01138238aab13 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 13:48:07 +0100 Subject: [PATCH 252/331] python.pkgs.extras: move expression --- .../python-modules/extras/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +-------------- 2 files changed, 24 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/extras/default.nix diff --git a/pkgs/development/python-modules/extras/default.nix b/pkgs/development/python-modules/extras/default.nix new file mode 100644 index 00000000000..9b42953bb6d --- /dev/null +++ b/pkgs/development/python-modules/extras/default.nix @@ -0,0 +1,23 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "extras"; + version = "0.0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1h7zx4dfyclalg0fqnfjijpn0f793a9mx8sy3b27gd31nr6dhq3s"; + }; + + # error: invalid command 'test' + doCheck = false; + + meta = { + description = "A module provides basic functions for parsing mime-type names and matching them against a list of media-ranges"; + homepage = https://code.google.com/p/mimeparse/; + license = lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9de6d98a63f..e946e8a6101 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18316,24 +18316,7 @@ in { }; - extras = buildPythonPackage rec { - name = "extras-${version}"; - version = "0.0.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/e/extras/extras-${version}.tar.gz"; - sha256 = "1h7zx4dfyclalg0fqnfjijpn0f793a9mx8sy3b27gd31nr6dhq3s"; - }; - - # error: invalid command 'test' - doCheck = false; - - meta = { - description = "A module provides basic functions for parsing mime-type names and matching them against a list of media-ranges"; - homepage = https://code.google.com/p/mimeparse/; - license = licenses.mit; - }; - }; + extras = callPackage ../development/python-modules/extras { }; texttable = callPackage ../development/python-modules/texttable { }; From 085f545306aaa8c98e8cc2441bdca5106093b4f5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 13:48:22 +0100 Subject: [PATCH 253/331] python: extras: 0.0.3 -> 1.0.0 --- pkgs/development/python-modules/extras/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/extras/default.nix b/pkgs/development/python-modules/extras/default.nix index 9b42953bb6d..adcc43f2650 100644 --- a/pkgs/development/python-modules/extras/default.nix +++ b/pkgs/development/python-modules/extras/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "extras"; - version = "0.0.3"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1h7zx4dfyclalg0fqnfjijpn0f793a9mx8sy3b27gd31nr6dhq3s"; + sha256 = "132e36de10b9c91d5d4cc620160a476e0468a88f16c9431817a6729611a81b4e"; }; # error: invalid command 'test' From b368eb2666ddee76319c7e253f945ec5191171c7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 14:01:50 +0100 Subject: [PATCH 254/331] python: testtools: 1.9.0 -> 2.3.0 --- .../development/python-modules/testtools/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/testtools/default.nix b/pkgs/development/python-modules/testtools/default.nix index e786cb84329..eb6a6694b05 100644 --- a/pkgs/development/python-modules/testtools/default.nix +++ b/pkgs/development/python-modules/testtools/default.nix @@ -12,19 +12,18 @@ , pyrsistent }: -# testtools 2.0.0 and up has a circular run-time dependency on futures + buildPythonPackage rec { pname = "testtools"; - version = "1.9.0"; - name = "${pname}-${version}"; + version = "2.3.0"; # Python 2 only judging from SyntaxError # disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "b46eec2ad3da6e83d53f2b0eca9a8debb687b4f71343a074f83a16bbdb3c0644"; + sha256 = "5827ec6cf8233e0f29f51025addd713ca010061204fdea77484a2934690a0559"; }; propagatedBuildInputs = [ pbr python_mimeparse extras lxml unittest2 pyrsistent ]; @@ -33,6 +32,11 @@ buildPythonPackage rec { # No tests in archive doCheck = false; + # testtools 2.0.0 and up has a circular run-time dependency on futures + postPatch = '' + substituteInPlace requirements.txt --replace "fixtures>=1.3.0" "" + ''; + meta = { description = "A set of extensions to the Python standard library's unit testing framework"; homepage = https://pypi.python.org/pypi/testtools; From b0146980e563eeb1cdd27293ac67c48dc3785a6c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:28:33 +0100 Subject: [PATCH 255/331] python: Werkzeug: 0.12.2 -> 0.13 --- .../python-modules/werkzeug/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix index 5979d895a74..254897be78b 100644 --- a/pkgs/development/python-modules/werkzeug/default.nix +++ b/pkgs/development/python-modules/werkzeug/default.nix @@ -1,21 +1,23 @@ { stdenv, buildPythonPackage, fetchPypi -, itsdangerous +, itsdangerous, hypothesis , pytest, requests, glibcLocales }: buildPythonPackage rec { name = "${pname}-${version}"; pname = "Werkzeug"; - version = "0.12.2"; + version = "0.13"; src = fetchPypi { inherit pname version; - sha256 = "09mv4cya3lywkn4mi3qrqmjgwiw99kdk03dk912j8da6ny3pnflh"; + sha256 = "6246e5fc98a505824113fb6aca993d45ea284a2bcffdc2c65d0c538e53e4abd3"; }; - LC_ALL = "en_US.UTF-8"; - propagatedBuildInputs = [ itsdangerous ]; - buildInputs = [ pytest requests glibcLocales ]; + checkInputs = [ pytest requests glibcLocales hypothesis ]; + + checkPhase = '' + LC_ALL="en_US.UTF-8" py.test + ''; meta = with stdenv.lib; { homepage = http://werkzeug.pocoo.org/; From 472ef7a0f8fd201fcc79edca3745d8d85d6fd66b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 15:10:02 +0100 Subject: [PATCH 256/331] python.pkgs.lxml: move expression --- .../python-modules/lxml/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +------------- 2 files changed, 28 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/lxml/default.nix diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix new file mode 100644 index 00000000000..73a0b0a7382 --- /dev/null +++ b/pkgs/development/python-modules/lxml/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, libxml2 +, libxslt +}: + +buildPythonPackage rec { + pname = "lxml"; + version = "3.8.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "15nvf6n285n282682qyw3wihsncb0x5amdhyi4b83bfa2nz74vvk"; + }; + + buildInputs = [ libxml2 libxslt ]; + + hardeningDisable = stdenv.lib.optional stdenv.isDarwin "format"; + + meta = { + description = "Pythonic binding for the libxml2 and libxslt libraries"; + homepage = http://lxml.de; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ sjourdois ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e946e8a6101..87235046a6a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10317,25 +10317,7 @@ in { logilab-constraint = callPackage ../development/python-modules/logilab/constraint.nix {}; - lxml = buildPythonPackage ( rec { - name = "lxml-3.8.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/l/lxml/${name}.tar.gz"; - sha256 = "15nvf6n285n282682qyw3wihsncb0x5amdhyi4b83bfa2nz74vvk"; - }; - - buildInputs = with self; [ pkgs.libxml2 pkgs.libxslt ]; - - hardeningDisable = stdenv.lib.optional stdenv.isDarwin "format"; - - meta = { - description = "Pythonic binding for the libxml2 and libxslt libraries"; - homepage = http://lxml.de; - license = licenses.bsd3; - maintainers = with maintainers; [ sjourdois ]; - }; - }); + lxml = callPackage ../development/python-modules/lxml {inherit (pkgs) libxml2 libxslt;}; lxc = buildPythonPackage (rec { name = "python-lxc-unstable-2016-08-25"; From b3aa977bbf02c90dc11bd61174d0eb2679fbf8a5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 15:10:45 +0100 Subject: [PATCH 257/331] python: lxml: 3.8.0 -> 4.1.1 --- pkgs/development/python-modules/lxml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix index 73a0b0a7382..bfd0c8227ee 100644 --- a/pkgs/development/python-modules/lxml/default.nix +++ b/pkgs/development/python-modules/lxml/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "lxml"; - version = "3.8.0"; + version = "4.1.1"; src = fetchPypi { inherit pname version; - sha256 = "15nvf6n285n282682qyw3wihsncb0x5amdhyi4b83bfa2nz74vvk"; + sha256 = "940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e"; }; buildInputs = [ libxml2 libxslt ]; From d170941f6e72b3d7a079cdbda128aa2feea55b18 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:23:54 +0100 Subject: [PATCH 258/331] python: jupyter_client: 5.1.0 -> 5.2.0 --- .../python-modules/jupyter_client/default.nix | 18 ++++++++++++------ .../jupyter_client/wheel_workaround.patch | 13 +++++++++++++ 2 files changed, 25 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/python-modules/jupyter_client/wheel_workaround.patch diff --git a/pkgs/development/python-modules/jupyter_client/default.nix b/pkgs/development/python-modules/jupyter_client/default.nix index 3782d313df8..e88b7f937a5 100644 --- a/pkgs/development/python-modules/jupyter_client/default.nix +++ b/pkgs/development/python-modules/jupyter_client/default.nix @@ -1,32 +1,38 @@ { lib , buildPythonPackage , fetchPypi -, nose , traitlets , jupyter_core , pyzmq , dateutil , isPyPy , py +, ipykernel +, ipython +, mock +, pytest }: buildPythonPackage rec { pname = "jupyter_client"; - version = "5.1.0"; - name = "${pname}-${version}"; + version = "5.2.0"; src = fetchPypi { inherit pname version; - sha256 = "08756b021765c97bc5665390700a4255c2df31666ead8bff116b368d09912aba"; + sha256 = "ca30cf1786047925ebacd6f6faa3a993efaa004b584f7d83bc8b807f7cd3f6bb"; }; - buildInputs = [ nose ]; + checkInputs = [ ipykernel ipython mock pytest ]; propagatedBuildInputs = [traitlets jupyter_core pyzmq dateutil] ++ lib.optional isPyPy py; checkPhase = '' - nosetests -v + py.test ''; + patches = [ + ./wheel_workaround.patch + ]; + # Circular dependency with ipykernel doCheck = false; diff --git a/pkgs/development/python-modules/jupyter_client/wheel_workaround.patch b/pkgs/development/python-modules/jupyter_client/wheel_workaround.patch new file mode 100644 index 00000000000..926fcb26448 --- /dev/null +++ b/pkgs/development/python-modules/jupyter_client/wheel_workaround.patch @@ -0,0 +1,13 @@ +diff --git a/setup.py b/setup.py +index 95d4774..ee72cbc 100644 +--- a/setup.py ++++ b/setup.py +@@ -86,7 +86,7 @@ setup_args = dict( + extras_require = { + 'test': ['ipykernel', 'ipython', 'mock'], + 'test:python_version == "3.3"': ['pytest<3.3.0'], +- 'test:python_version >= "3.4" or python_version == "2.7"': ['pytest'], ++ 'test:(python_version >= "3.4" or python_version == "2.7")': ['pytest'], + }, + cmdclass = { + 'bdist_egg': bdist_egg if 'bdist_egg' in sys.argv else bdist_egg_disabled, From 0808b959ae92e7d9a7f0662bf3b3a497b7a89aeb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 15:33:59 +0100 Subject: [PATCH 259/331] Python: disable user site-packages in setup hook Wrappers already included `PYTHONNOUSERSITE=1`, but now this env var is also set in the Python setup hook. This improves purity in case of non-sandboxes builds and nix-shell. --- pkgs/development/interpreters/python/setup-hook.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/interpreters/python/setup-hook.sh b/pkgs/development/interpreters/python/setup-hook.sh index dda9bed39f8..35726280a75 100644 --- a/pkgs/development/interpreters/python/setup-hook.sh +++ b/pkgs/development/interpreters/python/setup-hook.sh @@ -19,3 +19,6 @@ envHooks+=(addPythonPath) export DETERMINISTIC_BUILD=1; # Determinism: We fix the hashes of str, bytes and datetime objects. export PYTHONHASHSEED=0; +# Determinism. Whenever Python is included, it should not check user site-packages. +# This option is only relevant when the sandbox is disabled. +export PYTHONNOUSERSITE=1; From d3b85a4607a372db6963a8f018e9c82b602e6b31 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 15:34:21 +0100 Subject: [PATCH 260/331] python.pkgs.setuptools: 38.2.3 -> 38.2.5 --- pkgs/development/python-modules/bootstrapped-pip/default.nix | 4 ++-- pkgs/development/python-modules/setuptools/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index ef12e39f23b..1a20639c2de 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 = "38.2.3"; + version = "38.2.5"; format = "wheel"; - sha256 = "0c4j3jiiwc0h1bdv4xklinp90spgvgiv5fsxp119hif9934nfxfs"; + sha256 = "bcf0d4f3e2f7890e658db11e218b8643afffb905a0e2f2a7d5a6a3e949bb87e6"; }; # TODO: Shouldn't be necessary anymore for pip > 9.0.1! diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 1c53f3cd437..b185be62a69 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 = "38.2.3"; + version = "38.2.5"; name = "${python.libPrefix}-${pname}-${version}"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "124jlg72bbk2xxv5wqbwcl4h5cdslslzk92rxjxiplg79l499hv3"; + sha256 = "b080f276cc868670540b2c03cee06cc14d2faf9da7bec0f15058d1b402c94507"; }; buildInputs = [ python wrapPython unzip ]; From 966bc7c383ed059de921ebb3e5f0c9a667261963 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 15:45:52 +0100 Subject: [PATCH 261/331] python.pkgs.pyaml: move expression --- .../python-modules/pyaml/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +------------ 2 files changed, 28 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/pyaml/default.nix diff --git a/pkgs/development/python-modules/pyaml/default.nix b/pkgs/development/python-modules/pyaml/default.nix new file mode 100644 index 00000000000..a76ee6ee66d --- /dev/null +++ b/pkgs/development/python-modules/pyaml/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyyaml +, unidecode +, python +}: + +buildPythonPackage rec { + pname = "pyaml"; + version = "15.02.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "8dfe1b295116115695752acc84d15ecf5c1c469975fbed7672bf41a6bc6d6d51"; + }; + + propagatedBuildInputs = [ pyyaml ]; + + checkInputs = [ unidecode ]; + + meta = { + description = "PyYAML-based module to produce pretty and readable YAML-serialized data"; + homepage = https://github.com/mk-fg/pretty-yaml; + license = lib.licenses.wtfpl; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 87235046a6a..c592c0a9b8a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15698,23 +15698,7 @@ in { pyxattr = callPackage ../development/python-modules/pyxattr { }; - pyaml = buildPythonPackage (rec { - name = "pyaml-15.02.1"; - disabled = !isPy27; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pyaml/${name}.tar.gz"; - sha256 = "8dfe1b295116115695752acc84d15ecf5c1c469975fbed7672bf41a6bc6d6d51"; - }; - - buildInputs = with self; [ pyyaml ]; - - meta = { - description = "PyYAML-based module to produce pretty and readable YAML-serialized data"; - homepage = https://github.com/mk-fg/pretty-yaml; - }; - }); - + pyaml = callPackage ../development/python-modules/pyaml { }; pyyaml = buildPythonPackage (rec { name = "PyYAML-3.12"; From 6f1bdd80118dca238ccfee4f169aeb59aefe8fe1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 15:46:37 +0100 Subject: [PATCH 262/331] python: pyaml: 15.02.1 -> 17.12.1 --- pkgs/development/python-modules/pyaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyaml/default.nix b/pkgs/development/python-modules/pyaml/default.nix index a76ee6ee66d..5fd1be7c15c 100644 --- a/pkgs/development/python-modules/pyaml/default.nix +++ b/pkgs/development/python-modules/pyaml/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pyaml"; - version = "15.02.1"; + version = "17.12.1"; src = fetchPypi { inherit pname version; - sha256 = "8dfe1b295116115695752acc84d15ecf5c1c469975fbed7672bf41a6bc6d6d51"; + sha256 = "66623c52f34d83a2c0fc963e08e8b9d0c13d88404e3b43b1852ef71eda19afa3"; }; propagatedBuildInputs = [ pyyaml ]; From 572a35c3eaf60e6910e5bddd5df087dabc329d43 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:25:59 +0100 Subject: [PATCH 263/331] python: pycollada: 0.5 -> 0.6 --- pkgs/development/python-modules/pycollada/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pycollada/default.nix b/pkgs/development/python-modules/pycollada/default.nix index 948d9741bd8..35b10421f2c 100644 --- a/pkgs/development/python-modules/pycollada/default.nix +++ b/pkgs/development/python-modules/pycollada/default.nix @@ -2,15 +2,14 @@ buildPythonPackage rec { pname = "pycollada"; - version = "0.5"; - name = "${pname}-${version}"; + version = "0.6"; src = fetchPypi { inherit pname version; - sha256 = "1g96maw2c25l4i3ks51784h33zf7s18vrn6iyz4ca34iy4sl7yq9"; + sha256 = "fcd6f38fd981e350f9ec754d9671834017accd600e967d6d299a6cfdae5ba4f4"; }; - buildInputs = [ numpy ] ++ (if isPy3k then [dateutil] else [dateutil_1_5]); + propagatedBuildInputs = [ numpy dateutil ]; # Some tests fail because they refer to test data files that don't exist # (upstream packaging issue) From 931d7d605e4bdcdfedcc5dba52d2b52cf001aa26 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 18:11:19 +0100 Subject: [PATCH 264/331] python.pkgs.aws-xray-sdk: init at 0.95 --- .../python-modules/aws-xray-sdk/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/aws-xray-sdk/default.nix diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix new file mode 100644 index 00000000000..dae88b34900 --- /dev/null +++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, jsonpickle +, wrapt +, requests +}: + +buildPythonPackage rec { + pname = "aws-xray-sdk"; + version = "0.95"; + + src = fetchPypi { + inherit pname version; + sha256 = "9e7ba8dd08fd2939376c21423376206bff01d0deaea7d7721c6b35921fed1943"; + }; + + propagatedBuildInputs = [ + jsonpickle wrapt requests + ]; + + meta = { + description = "AWS X-Ray SDK for the Python programming language"; + license = lib.licenses.asl20; + homepage = https://github.com/aws/aws-xray-sdk-python; + }; + + doCheck = false; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c592c0a9b8a..68d4fee2dac 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -173,6 +173,8 @@ in { automat = callPackage ../development/python-modules/automat { }; + aws-xray-sdk = callPackage ../development/python-modules/aws-xray-sdk { }; + # packages defined elsewhere backports_csv = callPackage ../development/python-modules/backports_csv {}; From 0619b37548117ec95ca93d8b0bc1288f693ea8f3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 18:11:38 +0100 Subject: [PATCH 265/331] python.pkgs.boto3: move expression --- .../python-modules/boto3/default.nix | 50 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 38 +------------- 2 files changed, 51 insertions(+), 37 deletions(-) create mode 100644 pkgs/development/python-modules/boto3/default.nix diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix new file mode 100644 index 00000000000..eaab0031205 --- /dev/null +++ b/pkgs/development/python-modules/boto3/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, botocore +, jmespath +, s3transfer +, futures +, docutils +, nose +, mock +, isPy3k +}: + +buildPythonPackage rec { + pname = "boto3"; + version = "1.4.8"; + + src = fetchFromGitHub { + owner = "boto"; + repo = "boto3"; + rev = version; + sha256 = "11ysd7a9l5y98q7b7az56phsj2m7w90abf4jabwrknp2c43sq9bi"; + }; + + propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; + checkInputs = [ docutils nose mock ]; + + checkPhase = '' + runHook preCheck + # This method is not in mock. It might have appeared in some versions. + sed -i 's/action.assert_called_once()/self.assertEqual(action.call_count, 1)/' \ + tests/unit/resources/test_factory.py + nosetests -d tests/unit --verbose + runHook postCheck + ''; + + # Network access + doCheck = false; + + meta = { + homepage = https://github.com/boto/boto3; + license = lib.licenses.asl20; + description = "AWS SDK for Python"; + longDescription = '' + Boto3 is the Amazon Web Services (AWS) Software Development Kit (SDK) for + Python, which allows Python developers to write software that makes use of + services like Amazon S3 and Amazon EC2. + ''; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 68d4fee2dac..7366204b9d9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1979,43 +1979,7 @@ in { }; }; - boto3 = buildPythonPackage rec { - name = "boto3-${version}"; - version = "1.4.8"; - - src = pkgs.fetchFromGitHub { - owner = "boto"; - repo = "boto3"; - rev = version; - sha256 = "11ysd7a9l5y98q7b7az56phsj2m7w90abf4jabwrknp2c43sq9bi"; - }; - - propagatedBuildInputs = [ self.botocore self.jmespath self.s3transfer ] ++ - (if isPy3k then [] else [self.futures]); - buildInputs = [ self.docutils self.nose self.mock ]; - checkPhase = '' - runHook preCheck - # This method is not in mock. It might have appeared in some versions. - sed -i 's/action.assert_called_once()/self.assertEqual(action.call_count, 1)/' \ - tests/unit/resources/test_factory.py - nosetests -d tests/unit --verbose - runHook postCheck - ''; - - # Network access - doCheck = false; - - meta = { - homepage = https://github.com/boto/boto3; - license = stdenv.lib.licenses.asl20; - description = "AWS SDK for Python"; - longDescription = '' - Boto3 is the Amazon Web Services (AWS) Software Development Kit (SDK) for - Python, which allows Python developers to write software that makes use of - services like Amazon S3 and Amazon EC2. - ''; - }; - }; + boto3 = callPackage ../development/python-modules/boto3 { }; botocore = callPackage ../development/python-modules/botocore { }; From 53fbd0617ccc53b1cbf465bb76fdefaf64aa46c0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 18:12:01 +0100 Subject: [PATCH 266/331] python.pkgs.jsondiff: init at 1.1.1 --- .../python-modules/jsondiff/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/jsondiff/default.nix diff --git a/pkgs/development/python-modules/jsondiff/default.nix b/pkgs/development/python-modules/jsondiff/default.nix new file mode 100644 index 00000000000..9d4331c8ea8 --- /dev/null +++ b/pkgs/development/python-modules/jsondiff/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "jsondiff"; + version = "1.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "2d0437782de9418efa34e694aa59f43d7adb1899bd9a793f063867ddba8f7893"; + }; + + # No tests + doCheck = false; + + meta = { + description = "Diff JSON and JSON-like structures in Python"; + homepage = https://github.com/ZoomerAnalytics/jsondiff; + license = lib.licenses.mit; + }; + +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7366204b9d9..2bbc53ef052 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9842,6 +9842,8 @@ in { jsondate = callPackage ../development/python-modules/jsondate { }; + jsondiff = callPackage ../development/python-modules/jsondiff { }; + jsonnet = buildPythonPackage { inherit (pkgs.jsonnet) name src; # Python 3 is not yet supported https://github.com/google/jsonnet/pull/335 From 364e5bce94a4fd636df44a33d05a5992e617acfa Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 18:12:19 +0100 Subject: [PATCH 267/331] python.pkgs.jsonpickle: init at 0.9.5 --- .../python-modules/jsonpickle/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/jsonpickle/default.nix diff --git a/pkgs/development/python-modules/jsonpickle/default.nix b/pkgs/development/python-modules/jsonpickle/default.nix new file mode 100644 index 00000000000..2d9f02a5aff --- /dev/null +++ b/pkgs/development/python-modules/jsonpickle/default.nix @@ -0,0 +1,23 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "jsonpickle"; + version = "0.9.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "cc25dc79571d4ad7db59d05ddb7de0d76a8d598cf6136e1dbeaa9361ebcfe749"; + }; + + doCheck = false; + + meta = { + description = "Python library for serializing any arbitrary object graph into JSON"; + homepage = http://jsonpickle.github.io/; + license = lib.licenses.bsd3; + }; + +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2bbc53ef052..9d376d71635 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5697,6 +5697,8 @@ in { jsonpatch = callPackage ../development/python-modules/jsonpatch { }; + jsonpickle = callPackage ../development/python-modules/jsonpickle { }; + jsonpointer = buildPythonPackage rec { name = "jsonpointer-1.9"; From ea8b00a7fe3ac1ae98ed4434a9e5316f4a97ccca Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:24:45 +0100 Subject: [PATCH 268/331] python: moto: 0.4.31 -> 1.1.25 --- .../python-modules/moto/default.nix | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index cf74e1dc134..d5c40c67b36 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -1,17 +1,20 @@ -{ stdenv, buildPythonPackage, fetchPypi, jinja2, werkzeug, flask, requests, pytz -, six, boto, httpretty, xmltodict, nose, sure, boto3, freezegun, dateutil }: +{ stdenv, buildPythonPackage, fetchPypi, jinja2, werkzeug, flask +, requests, pytz, backports_tempfile, cookies, jsondiff, botocore, aws-xray-sdk, docker +, six, boto, httpretty, xmltodict, nose, sure, boto3, freezegun, dateutil, mock, pyaml }: buildPythonPackage rec { pname = "moto"; - version = "0.4.31"; - name = "moto-${version}"; + version = "1.1.25"; + src = fetchPypi { inherit pname version; - sha256 = "19s8hfz4mzzzdksa0ddlvrga5mxdaqahk89p5l29a5id8127shr8"; + sha256 = "d427d6e1a81e926c2b6a071453807b05f4736d65068493e1f3055ac7ee24ea21"; }; propagatedBuildInputs = [ + aws-xray-sdk boto + boto3 dateutil flask httpretty @@ -21,6 +24,13 @@ buildPythonPackage rec { requests six xmltodict + mock + pyaml + backports_tempfile + cookies + jsondiff + botocore + docker ]; checkInputs = [ boto3 nose sure freezegun ]; From 7f511e5421c650b4dfcb4dcad0395b319fca9dd3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 31 Dec 2017 10:52:37 +0100 Subject: [PATCH 269/331] python.pkgs.pytoml: 0.1.11 -> 0.1.14 --- .../python-modules/pytoml/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pytoml/default.nix b/pkgs/development/python-modules/pytoml/default.nix index 55479e76daf..91661a1fb51 100644 --- a/pkgs/development/python-modules/pytoml/default.nix +++ b/pkgs/development/python-modules/pytoml/default.nix @@ -1,18 +1,22 @@ -{ stdenv, buildPythonPackage, fetchgit -, python }: +{ stdenv +, buildPythonPackage +, fetchgit +, python +}: buildPythonPackage rec { pname = "pytoml"; - version = "0.1.11"; - name = "${pname}-${version}"; + version = "0.1.14"; - checkPhase = "${python.interpreter} test/test.py"; + checkPhase = '' + ${python.interpreter} test/test.py + ''; # fetchgit used to ensure test submodule is available src = fetchgit { url = "${meta.homepage}.git"; rev = "refs/tags/v${version}"; - sha256 = "1jiw04zk9ccynr8kb1vqh9r1p2kh0al7g7b1f94911iazg7dgs9j"; + sha256 = "1ip71yqxnyi4jhw5x1q7a0za61ndhpfh0vbx08jfv0w4ayng6rgv"; }; meta = with stdenv.lib; { From fac57841c6039a9cb04cb7b9519e084c251f32e9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:22:59 +0100 Subject: [PATCH 270/331] python: flit: 0.11.4 -> 0.13 --- pkgs/development/python-modules/flit/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix index 298da4a85bf..3a73b464a46 100644 --- a/pkgs/development/python-modules/flit/default.nix +++ b/pkgs/development/python-modules/flit/default.nix @@ -11,6 +11,7 @@ , pytest , testpath , responses +, pytoml }: # Flit is actually an application to build universal wheels. @@ -20,25 +21,22 @@ buildPythonPackage rec { pname = "flit"; - version = "0.11.4"; - name = "${pname}-${version}"; - -# format = "wheel"; + version = "0.13"; src = fetchPypi { inherit pname version; -# url = https://files.pythonhosted.org/packages/24/98/50a090112a04d9e29155c31a222637668b0a4dd778fefcd3132adc50e877/flit-0.10-py3-none-any.whl; - sha256 = "8ba7603cc3bf4149d81811d40fe331abc45ff37a207c63f5f712a0fdb69297bb"; + sha256 = "8f558351bf4bb82b872d3bdbea7055cbb2e33ed2bdf809284bf927d4c78bf0ee"; }; disabled = !isPy3k; - propagatedBuildInputs = [ docutils requests requests_download ] ++ lib.optional (pythonOlder "3.6") zipfile36; + propagatedBuildInputs = [ docutils requests requests_download pytoml ] ++ lib.optional (pythonOlder "3.6") zipfile36; checkInputs = [ pytest testpath responses ]; # Disable test that needs some ini file. + # Disable test that wants hg checkPhase = '' - py.test -k "not test_invalid_classifier" + py.test -k "not test_invalid_classifier and not test_build_sdist" ''; meta = { From 77437caa02704a5e8f8e6e7711b48c0272845ce9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 31 Dec 2017 10:56:39 +0100 Subject: [PATCH 271/331] python: jsonpatch: 1.20 -> 1.21 --- pkgs/development/python-modules/jsonpatch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsonpatch/default.nix b/pkgs/development/python-modules/jsonpatch/default.nix index 89817c85956..8d238b4746d 100644 --- a/pkgs/development/python-modules/jsonpatch/default.nix +++ b/pkgs/development/python-modules/jsonpatch/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "jsonpatch"; - version = "1.20"; + version = "1.21"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "b12594a0cfe634bdd2a5c027250af2dd84932d493568e88ae722871edc3eb02d"; + sha256 = "11f5ffdf543a83047a2f54ac28f8caad7f34724cb1ea26b27547fd974f1a2153"; }; # test files are missing From c107ce473a05814d4559d1e6a0919cd4fe6aa49b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 31 Dec 2017 11:00:35 +0100 Subject: [PATCH 272/331] python.pkgs.idna: move expression --- .../python-modules/idna/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +--------------- 2 files changed, 21 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/idna/default.nix diff --git a/pkgs/development/python-modules/idna/default.nix b/pkgs/development/python-modules/idna/default.nix new file mode 100644 index 00000000000..080f291af58 --- /dev/null +++ b/pkgs/development/python-modules/idna/default.nix @@ -0,0 +1,20 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "idna"; + version = "2.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "3cb5ce08046c4e3a560fc02f138d0ac63e00f8ce5901a56b32ec8b7994082aab"; + }; + + meta = { + homepage = "http://github.com/kjd/idna/"; + description = "Internationalized Domain Names in Applications (IDNA)"; + license = lib.licenses.bsd3; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9d376d71635..4eefa3a7ea8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3073,22 +3073,7 @@ in { openidc-client = callPackage ../development/python-modules/openidc-client/default.nix {}; - idna = buildPythonPackage rec { - pname = "idna"; - version = "2.5"; - name = "${pname}-${version}"; - - src = fetchPypi { - inherit pname version; - sha256 = "3cb5ce08046c4e3a560fc02f138d0ac63e00f8ce5901a56b32ec8b7994082aab"; - }; - - meta = { - homepage = "http://github.com/kjd/idna/"; - description = "Internationalized Domain Names in Applications (IDNA)"; - license = "licenses.bsd3"; - }; - }; + idna = callPackage ../development/python-modules/idna { }; mahotas = buildPythonPackage rec { name = "python-mahotas-${version}"; From 93914f8222011966dd9fe5634d8229708f42dc4b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 31 Dec 2017 11:00:54 +0100 Subject: [PATCH 273/331] python: idna: 2.5 -> 2.6 --- pkgs/development/python-modules/idna/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/idna/default.nix b/pkgs/development/python-modules/idna/default.nix index 080f291af58..635f8b33d3c 100644 --- a/pkgs/development/python-modules/idna/default.nix +++ b/pkgs/development/python-modules/idna/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "idna"; - version = "2.5"; + version = "2.6"; src = fetchPypi { inherit pname version; - sha256 = "3cb5ce08046c4e3a560fc02f138d0ac63e00f8ce5901a56b32ec8b7994082aab"; + sha256 = "2c6a5de3089009e3da7c5dde64a141dbc8551d5b7f6cf4ed7c2568d0cc520a8f"; }; meta = { From 6665872f0a7ad16e4b39c6d67bf6960830ed277a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 30 Dec 2017 12:28:47 +0100 Subject: [PATCH 274/331] python: yarl: 0.13.0 -> 0.17.0 --- .../python-modules/yarl/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix index 1275178d5d0..cf95803d5af 100644 --- a/pkgs/development/python-modules/yarl/default.nix +++ b/pkgs/development/python-modules/yarl/default.nix @@ -1,24 +1,23 @@ { lib -, fetchurl +, fetchPypi , buildPythonPackage , multidict , pytestrunner , pytest +, idna }: -let +buildPythonPackage rec { pname = "yarl"; - version = "0.13.0"; -in buildPythonPackage rec { + version = "0.17.0"; name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "25fe681a982f2cec567df8abac7cbd2ac27016e4aec89193945cab0643bfdb42"; + src = fetchPypi { + inherit pname version; + sha256 = "2e4e1aec650ad80e73e7063941cd8aadb48e72487ec680a093ad364cc61efe64"; }; - buildInputs = [ pytest pytestrunner ]; - propagatedBuildInputs = [ multidict ]; - + checkInputs = [ pytest pytestrunner ]; + propagatedBuildInputs = [ multidict idna ]; meta = { description = "Yet another URL library"; From 6c86adff20c9c29db24aec4757001cae9fb6f857 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 31 Dec 2017 11:11:32 +0100 Subject: [PATCH 275/331] python.pkgs.pyglet: fix build --- pkgs/development/python-modules/pyglet/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix index ebbbb98289c..51243154b1a 100644 --- a/pkgs/development/python-modules/pyglet/default.nix +++ b/pkgs/development/python-modules/pyglet/default.nix @@ -1,23 +1,24 @@ { stdenv, buildPythonPackage, fetchPypi -, mesa, xorg, freetype, fontconfig}: +, mesa, xorg, freetype, fontconfig, future}: buildPythonPackage rec { version = "1.3.0"; pname = "pyglet"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; sha256 = "640a8f8e3d7bf8dbb551fa707f14021f619932990ab1401c48ba9dbcc6c2242c"; }; - patchPhase = let + postPatch = let libs = [ mesa xorg.libX11 freetype fontconfig ]; paths = builtins.concatStringsSep "," (map (l: "\"${l}/lib\"") libs); in "sed -i -e 's|directories\.extend.*lib[^]]*|&,${paths}|' pyglet/lib.py"; doCheck = false; + propagatedBuildInputs = [ future ]; + meta = with stdenv.lib; { homepage = "http://www.pyglet.org/"; description = "A cross-platform windowing and multimedia library"; From 89e47937dc617f5685efb8e48fb78ec9ec265fc5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 31 Dec 2017 11:17:34 +0100 Subject: [PATCH 276/331] python.pkgs.libusb1: fix build --- pkgs/development/python-modules/libusb1/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/libusb1/default.nix b/pkgs/development/python-modules/libusb1/default.nix index adf1bc23618..f3b48eaa576 100644 --- a/pkgs/development/python-modules/libusb1/default.nix +++ b/pkgs/development/python-modules/libusb1/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { postPatch = lib.optionalString stdenv.isLinux '' substituteInPlace usb1/libusb1.py --replace \ "ctypes.util.find_library(base_name)" \ - "'${libusb1}/lib/libusb${stdenv.hostPlatform.extensions.sharedLibrary}'" + "'${libusb1}/lib/libusb-1.0${stdenv.hostPlatform.extensions.sharedLibrary}'" ''; buildInputs = [ libusb1 ]; From 441839111af66160fb7de993cfe882886db7b77e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 31 Dec 2017 11:20:34 +0100 Subject: [PATCH 277/331] python.pkgs.ropper: fix build --- pkgs/development/python-modules/ropper/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ropper/default.nix b/pkgs/development/python-modules/ropper/default.nix index 61b54445196..62ef3f8db19 100644 --- a/pkgs/development/python-modules/ropper/default.nix +++ b/pkgs/development/python-modules/ropper/default.nix @@ -3,10 +3,10 @@ , fetchPypi , capstone , filebytes -, pytest }: +, pytest +}: buildPythonApplication rec { - name = "${pname}-${version}"; pname = "ropper"; version = "1.11.2"; @@ -19,7 +19,9 @@ buildPythonApplication rec { checkPhase = '' py.test testcases ''; - buildInputs = [pytest]; + doCheck = false; # Tests not included in archive + + checkInputs = [pytest]; propagatedBuildInputs = [ capstone filebytes ]; meta = with stdenv.lib; { homepage = https://scoding.de/ropper/; From 718356d6987508658ee2f3224abdc075ec6a0014 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 31 Dec 2017 11:25:36 +0100 Subject: [PATCH 278/331] python.pkgs.pytools: fix expression --- .../python-modules/pytools/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 32 +-------------- 2 files changed, 42 insertions(+), 31 deletions(-) create mode 100644 pkgs/development/python-modules/pytools/default.nix diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix new file mode 100644 index 00000000000..afdbed8ea0f --- /dev/null +++ b/pkgs/development/python-modules/pytools/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, decorator +, appdirs +, six +, numpy +, pytest +}: + +buildPythonPackage rec { + pname = "pytools"; + version = "2017.4"; + + src = fetchFromGitHub { + owner = "inducer"; + repo = "pytools"; + rev = "8078e74265bb5a3c9676c698595ab5450cd2bfe7"; + sha256 = "17q61l79fcxkj5jxg3fnymi652sdjp5s6kpsabgxp22kma9crr28"; + }; + + checkInputs = [ pytest ]; + + propagatedBuildInputs = [ + decorator + appdirs + six + numpy + ]; + + checkPhase = '' + py.test -k 'not test_persistent_dict' + ''; + + meta = { + homepage = https://github.com/inducer/pytools/; + description = "Miscellaneous Python lifesavers."; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ artuuge ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4eefa3a7ea8..05d9e5a4c3e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6789,37 +6789,7 @@ in { pysrt = callPackage ../development/python-modules/pysrt { }; - pytools = buildPythonPackage rec { - name = "pytools-${version}"; - version = "2017.4"; - - src = pkgs.fetchFromGitHub { - owner = "inducer"; - repo = "pytools"; - rev = "8078e74265bb5a3c9676c698595ab5450cd2bfe7"; - sha256 = "17q61l79fcxkj5jxg3fnymi652sdjp5s6kpsabgxp22kma9crr28"; - }; - - buildInputs = with self; [ - decorator - appdirs - six - numpy - pytest - ]; - - checkPhase = '' - py.test -k 'not test_persistent_dict' - ''; - - meta = { - homepage = https://github.com/inducer/pytools/; - description = "Miscellaneous Python lifesavers."; - license = licenses.mit; - maintainers = with maintainers; [ artuuge ]; - }; - - }; + pytools = callPackage ../development/python-modules/pytools { }; pytun = buildPythonPackage rec { name = "pytun-${version}"; From bed35cf5216b277f32f1946d5e4fee424ce98b9c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 31 Dec 2017 11:27:29 +0100 Subject: [PATCH 279/331] python.pkgs.pytools: 2017.4 -> 2017.6 --- pkgs/development/python-modules/pytools/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix index afdbed8ea0f..2bf7413c600 100644 --- a/pkgs/development/python-modules/pytools/default.nix +++ b/pkgs/development/python-modules/pytools/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi , decorator , appdirs , six @@ -10,13 +10,11 @@ buildPythonPackage rec { pname = "pytools"; - version = "2017.4"; + version = "2017.6"; - src = fetchFromGitHub { - owner = "inducer"; - repo = "pytools"; - rev = "8078e74265bb5a3c9676c698595ab5450cd2bfe7"; - sha256 = "17q61l79fcxkj5jxg3fnymi652sdjp5s6kpsabgxp22kma9crr28"; + src = fetchPypi { + inherit pname version; + sha256 = "80f1bba4469d473c1b3969bc8e188c03bcc94d35807a889ceebbfc78e3208115"; }; checkInputs = [ pytest ]; From 0bed3b1deeef57705219bbf7ecadc74ef64bdf85 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 31 Dec 2017 11:31:47 +0100 Subject: [PATCH 280/331] python.pkgs.pyopencl: fix expression --- pkgs/development/python-modules/pyopencl/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index 133c5e85780..07ff8735b52 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -16,9 +16,9 @@ buildPythonPackage rec { pname = "pyopencl"; version = "2017.2.2"; - name = "${pname}-${version}"; - buildInputs = [ pytest opencl-headers ocl-icd ]; + checkInputs = [ pytest ]; + buildInputs = [ opencl-headers ocl-icd ]; propagatedBuildInputs = [ numpy cffi pytools decorator appdirs six Mako ]; @@ -27,6 +27,11 @@ buildPythonPackage rec { sha256 = "d2f7b04d2e819c6e90d6366b7712a7452a39fba218e51b11b02c85ab07fd2983"; }; + # py.test is not needed during runtime, so remove it from `install_requires` + postPatch = '' + substituteInPlace setup.py --replace "pytest>=2" "" + ''; + # gcc: error: pygpu_language_opencl.cpp: No such file or directory doCheck = false; From f9211e80a0b9e033e7068cee7db3f4eb99556f4d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 31 Dec 2017 11:41:24 +0100 Subject: [PATCH 281/331] python.pkgs.markdown: 2.6.8 -> 2.6.10 --- .../python-modules/markdown/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +---------- 2 files changed, 29 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/markdown/default.nix diff --git a/pkgs/development/python-modules/markdown/default.nix b/pkgs/development/python-modules/markdown/default.nix new file mode 100644 index 00000000000..515dee0e766 --- /dev/null +++ b/pkgs/development/python-modules/markdown/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, pyyaml +}: + +buildPythonPackage rec { + pname = "Markdown"; + version = "2.6.10"; + + src = fetchPypi { + extension = "zip"; + inherit pname version; + sha256 = "cfa536d1ee8984007fcecc5a38a493ff05c174cb74cb2341dafd175e6bc30851"; + }; + + # error: invalid command 'test' +# doCheck = false; + + checkInputs = [ nose pyyaml ]; + + meta = { + description = "A Python implementation of John Gruber’s Markdown with Extension support"; + homepage = https://github.com/Python-Markdown/markdown; + license = lib.licenses.bsd3; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 05d9e5a4c3e..248a739bc01 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10417,22 +10417,7 @@ in { }; }; - markdown = buildPythonPackage rec { - version = "2.6.8"; - name = "markdown-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/M/Markdown/Markdown-${version}.tar.gz"; - sha256 = "0cqfhr1km2s5d8jm6hbwgkrrj9hvkjf2gab3s2axlrw1clgaij0a"; - }; - - # error: invalid command 'test' - doCheck = false; - - meta = { - homepage = http://www.freewisdom.org/projects/python-markdown; - }; - }; + markdown = callPackage ../development/python-modules/markdown { }; markdownsuperscript = callPackage ../development/python-modules/markdownsuperscript {}; From d6a6ce61ae399660718ef544f75043ba5311a34f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 31 Dec 2017 11:44:52 +0100 Subject: [PATCH 282/331] python.pkgs.Mako: move expression --- .../python-modules/Mako/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +------------ 2 files changed, 33 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/Mako/default.nix diff --git a/pkgs/development/python-modules/Mako/default.nix b/pkgs/development/python-modules/Mako/default.nix new file mode 100644 index 00000000000..e9e3bbb6d49 --- /dev/null +++ b/pkgs/development/python-modules/Mako/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, markupsafe +, nose +, mock +, pytest +, isPyPy +}: + +buildPythonPackage rec { + pname = "Mako"; + version = "1.0.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "0nchpw6akfcsg8w6irjlx0gyzadc123hv4g47sijgnqd9nz9vngy"; + }; + + checkInputs = [ markupsafe nose mock pytest ]; + propagatedBuildInputs = [ markupsafe ]; + + doCheck = !isPyPy; # https://bitbucket.org/zzzeek/mako/issue/238/2-tests-failed-on-pypy-24-25 + + meta = { + description = "Super-fast templating language"; + homepage = http://www.makotemplates.org; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ domenkozar ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 248a739bc01..17bfb85d7da 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10339,28 +10339,7 @@ in { }; }; - - Mako = buildPythonPackage rec { - name = "Mako-1.0.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/M/Mako/${name}.tar.gz"; - sha256 = "0nchpw6akfcsg8w6irjlx0gyzadc123hv4g47sijgnqd9nz9vngy"; - }; - - buildInputs = with self; [ markupsafe nose mock pytest ]; - propagatedBuildInputs = with self; [ markupsafe ]; - - doCheck = !isPyPy; # https://bitbucket.org/zzzeek/mako/issue/238/2-tests-failed-on-pypy-24-25 - - meta = { - description = "Super-fast templating language"; - homepage = http://www.makotemplates.org; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ domenkozar ]; - }; - }; + Mako = callPackage ../development/python-modules/Mako { }; manifestparser = callPackage ../development/python-modules/marionette-harness/manifestparser.nix {}; marionette_driver = callPackage ../development/python-modules/marionette-harness/marionette_driver.nix {}; From 7c82255c6bfb754887bb3f3f037464177769f2ac Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 31 Dec 2017 11:45:09 +0100 Subject: [PATCH 283/331] python: Mako: 1.0.4 -> 1.0.7 --- pkgs/development/python-modules/Mako/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/Mako/default.nix b/pkgs/development/python-modules/Mako/default.nix index e9e3bbb6d49..f3f1eed265d 100644 --- a/pkgs/development/python-modules/Mako/default.nix +++ b/pkgs/development/python-modules/Mako/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "Mako"; - version = "1.0.4"; + version = "1.0.7"; src = fetchPypi { inherit pname version; - sha256 = "0nchpw6akfcsg8w6irjlx0gyzadc123hv4g47sijgnqd9nz9vngy"; + sha256 = "4e02fde57bd4abb5ec400181e4c314f56ac3e49ba4fb8b0d50bba18cb27d25ae"; }; checkInputs = [ markupsafe nose mock pytest ]; From 606b6addb0f49fb5545fa235473e299a64ce0957 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 31 Dec 2017 11:48:00 +0100 Subject: [PATCH 284/331] python.pkgs.iso8601: move expression --- .../python-modules/iso8601/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +-------------- 2 files changed, 28 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/iso8601/default.nix diff --git a/pkgs/development/python-modules/iso8601/default.nix b/pkgs/development/python-modules/iso8601/default.nix new file mode 100644 index 00000000000..79507e826ff --- /dev/null +++ b/pkgs/development/python-modules/iso8601/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +}: + +buildPythonPackage rec { + pname = "iso8601"; + version = "0.1.11"; + + src = fetchPypi { + inherit pname version; + sha256 = "e8fb52f78880ae063336c94eb5b87b181e6a0cc33a6c008511bac9a6e980ef30"; + }; + + checkInputs = [ pytest ]; + + checkPhase = '' + py.test iso8601 + ''; + + meta = { + homepage = https://bitbucket.org/micktwomey/pyiso8601/; + description = "Simple module to parse ISO 8601 dates"; + maintainers = with lib.maintainers; [ phreedom ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 17bfb85d7da..8edc7a77acb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9665,26 +9665,7 @@ in { iso3166 = callPackage ../development/python-modules/iso3166 {}; - iso8601 = buildPythonPackage rec { - name = "iso8601-${version}"; - version = "0.1.11"; - src = pkgs.fetchurl { - url = "mirror://pypi/i/iso8601/${name}.tar.gz"; - sha256 = "e8fb52f78880ae063336c94eb5b87b181e6a0cc33a6c008511bac9a6e980ef30"; - }; - - buildInputs = [ self.pytest ]; - - checkPhase = '' - py.test iso8601 - ''; - - meta = { - homepage = https://bitbucket.org/micktwomey/pyiso8601/; - description = "Simple module to parse ISO 8601 dates"; - maintainers = with maintainers; [ phreedom ]; - }; - }; + iso8601 = callPackage ../development/python-modules/iso8601 { }; isort = buildPythonPackage rec { name = "${pname}-${version}"; From ed1944ea0029b28aacc7823325b7b68aafa9c7b4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 31 Dec 2017 11:48:14 +0100 Subject: [PATCH 285/331] python: iso8601: 0.1.11 -> 0.1.12 --- pkgs/development/python-modules/iso8601/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/iso8601/default.nix b/pkgs/development/python-modules/iso8601/default.nix index 79507e826ff..4f9ff70556b 100644 --- a/pkgs/development/python-modules/iso8601/default.nix +++ b/pkgs/development/python-modules/iso8601/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "iso8601"; - version = "0.1.11"; + version = "0.1.12"; src = fetchPypi { inherit pname version; - sha256 = "e8fb52f78880ae063336c94eb5b87b181e6a0cc33a6c008511bac9a6e980ef30"; + sha256 = "49c4b20e1f38aa5cf109ddcd39647ac419f928512c869dc01d5c7098eddede82"; }; checkInputs = [ pytest ]; From b6ea033a25c76f9dbe9bc149803d6d091537e10c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 31 Dec 2017 11:54:08 +0100 Subject: [PATCH 286/331] python.pkgs.html5lib: move expression --- .../python-modules/html5lib/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 32 +------------- 2 files changed, 43 insertions(+), 31 deletions(-) create mode 100644 pkgs/development/python-modules/html5lib/default.nix diff --git a/pkgs/development/python-modules/html5lib/default.nix b/pkgs/development/python-modules/html5lib/default.nix new file mode 100644 index 00000000000..1d446caa9a5 --- /dev/null +++ b/pkgs/development/python-modules/html5lib/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, flake8 +, pytest +, pytest-expect +, mock +, six +, webencodings +}: + +buildPythonPackage rec { + pname = "html5lib"; + version = "0.999999999"; + + src = fetchPypi { + inherit pname version; + sha256 = "1632ak23y4j78jdm24s6iqyf2kzfcmf6p4v141rd4a1hzl7pqx7f"; + }; + + checkInputs = [ flake8 pytest pytest-expect mock ]; + propagatedBuildInputs = [ + six webencodings + ]; + + checkPhase = '' + py.test + ''; + + meta = { + homepage = https://github.com/html5lib/html5lib-python; + downloadPage = https://github.com/html5lib/html5lib-python/releases; + description = "HTML parser based on WHAT-WG HTML5 specification"; + longDescription = '' + html5lib is a pure-python library for parsing HTML. It is designed to + conform to the WHATWG HTML specification, as is implemented by all + major web browsers. + ''; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ domenkozar prikhi ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8edc7a77acb..a7606844435 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9196,37 +9196,7 @@ in { }; - html5lib = buildPythonPackage (rec { - version = "0.999999999"; - name = "html5lib-${version}"; - - src = pkgs.fetchurl { - url = "http://github.com/html5lib/html5lib-python/archive/${version}.tar.gz"; - sha256 = "09j6194f5mlnd5xwbavwvnndwl1x91jw74shxl6hcxjp4fxg3h05"; - }; - - buildInputs = with self; [ flake8 pytest pytest-expect mock ]; - propagatedBuildInputs = with self; [ - six webencodings - ] ++ optionals isPy26 [ ordereddict ]; - - checkPhase = '' - py.test - ''; - - meta = { - homepage = https://github.com/html5lib/html5lib-python; - downloadPage = https://github.com/html5lib/html5lib-python/releases; - description = "HTML parser based on WHAT-WG HTML5 specification"; - longDescription = '' - html5lib is a pure-python library for parsing HTML. It is designed to - conform to the WHATWG HTML specification, as is implemented by all - major web browsers. - ''; - license = licenses.mit; - maintainers = with maintainers; [ domenkozar prikhi ]; - }; - }); + html5lib = callPackage ../development/python-modules/html5lib { }; http_signature = buildPythonPackage (rec { name = "http_signature-0.1.4"; From a78b286084d64231ed30ebbbbc6303e28bb70720 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 31 Dec 2017 11:54:24 +0100 Subject: [PATCH 287/331] python: html5lib: 0.999999999 -> 1.0.1 --- pkgs/development/python-modules/html5lib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/html5lib/default.nix b/pkgs/development/python-modules/html5lib/default.nix index 1d446caa9a5..97d2854ca22 100644 --- a/pkgs/development/python-modules/html5lib/default.nix +++ b/pkgs/development/python-modules/html5lib/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "html5lib"; - version = "0.999999999"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "1632ak23y4j78jdm24s6iqyf2kzfcmf6p4v141rd4a1hzl7pqx7f"; + sha256 = "66cb0dcfdbbc4f9c3ba1a63fdb511ffdbd4f513b2b6d81b80cd26ce6b3fb3736"; }; checkInputs = [ flake8 pytest pytest-expect mock ]; From 5fed925b2f9ef3fcb9f59c1dfdcf467d9840330c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 31 Dec 2017 11:58:30 +0100 Subject: [PATCH 288/331] python.pkgs.kombu_3: remove expr - two versions available - this is the older version - unused --- pkgs/top-level/python-packages.nix | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a7606844435..587350476e0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9850,33 +9850,6 @@ in { koji = callPackage ../development/python-modules/koji { }; - kombu_3 = buildPythonPackage rec { - name = "kombu-${version}"; - version = "3.0.35"; - - disabled = pythonOlder "2.6"; - - src = pkgs.fetchurl { - url = "mirror://pypi/k/kombu/${name}.tar.gz"; - sha256 = "09xpxpjz9nk8d14dj361dqdwyjwda3jlf1a7v6jif9wn2xm37ar2"; - }; - - # most of these are simply to allow the test suite to do its job - buildInputs = with self; optionals isPy27 [ mock unittest2 nose redis qpid-python pymongo sqlalchemy pyyaml msgpack boto ]; - - propagatedBuildInputs = with self; [ amqp_1 anyjson ] ++ - (optionals (pythonOlder "2.7") [ importlib ordereddict ]); - - # tests broken on python 2.6? https://github.com/nose-devs/nose/issues/806 - doCheck = isPy27; - - meta = { - description = "Messaging library for Python"; - homepage = "http://github.com/celery/kombu"; - license = licenses.bsd3; - }; - }; - kombu = buildPythonPackage rec { name = "kombu-${version}"; version = "4.0.2"; From d16a1ad464b482b7b5064ea546e2f9772153205b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 31 Dec 2017 11:58:46 +0100 Subject: [PATCH 289/331] python.pkgs.amqp_1: remove expr - two versions available - this is the older version - unused --- pkgs/top-level/python-packages.nix | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 587350476e0..f169b0f2703 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -484,25 +484,6 @@ in { }; }; - amqp_1 = buildPythonPackage rec { - name = "amqp-${version}"; - version = "1.4.9"; - disabled = pythonOlder "2.6"; - - src = pkgs.fetchurl { - url = "mirror://pypi/a/amqp/${name}.tar.gz"; - sha256 = "06n6q0kxhjnbfz3vn8x9yz09lwmn1xi9d6wxp31h5jbks0b4vsid"; - }; - - buildInputs = with self; [ mock coverage nose-cover3 unittest2 ]; - - meta = { - homepage = https://github.com/celery/py-amqp; - description = "Python client for the Advanced Message Queuing Procotol (AMQP). This is a fork of amqplib which is maintained by the Celery project"; - license = licenses.lgpl21; - }; - }; - amqp = buildPythonPackage rec { name = "amqp-${version}"; version = "2.1.4"; From 232ec653ee8c4595aea674ee2bc8945cc1e60914 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 31 Dec 2017 12:02:35 +0100 Subject: [PATCH 290/331] python.pkgs.backports_abc: move expression --- .../python-modules/backports_abc/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +-------------- 2 files changed, 26 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/backports_abc/default.nix diff --git a/pkgs/development/python-modules/backports_abc/default.nix b/pkgs/development/python-modules/backports_abc/default.nix new file mode 100644 index 00000000000..091312f55dc --- /dev/null +++ b/pkgs/development/python-modules/backports_abc/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python +}: + +buildPythonPackage rec { + pname = "backports_abc"; + version = "0.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "8b3e4092ba3d541c7a2f9b7d0d9c0275b21c6a01c53a61c731eba6686939d0a5"; + }; + + checkPhase = '' + ${python.interpreter} -m unittest discover + ''; + + meta = { + homepage = https://github.com/cython/backports_abc; + license = lib.licenses.psfl; + description = "A backport of recent additions to the 'collections.abc' module"; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f169b0f2703..7c9d423070c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1003,25 +1003,7 @@ in { }; }; - backports_abc = buildPythonPackage rec { - name = "backports_abc-${version}"; - version = "0.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/b/backports_abc/${name}.tar.gz"; - sha256 = "8b3e4092ba3d541c7a2f9b7d0d9c0275b21c6a01c53a61c731eba6686939d0a5"; - }; - - checkPhase = '' - ${python.interpreter} -m unittest discover - ''; - - meta = { - homepage = https://github.com/cython/backports_abc; - license = licenses.psfl; - description = "A backport of recent additions to the 'collections.abc' module"; - }; - }; + backports_abc = callPackage ../development/python-modules/backports_abc { }; backports_functools_lru_cache = callPackage ../development/python-modules/backports_functools_lru_cache { }; From 45a92a0dddb5c256c2b8af7ebe7068c306bedc72 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 31 Dec 2017 12:02:50 +0100 Subject: [PATCH 291/331] python: backports_abc: 0.4 -> 0.5 --- pkgs/development/python-modules/backports_abc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/backports_abc/default.nix b/pkgs/development/python-modules/backports_abc/default.nix index 091312f55dc..ab34d376de0 100644 --- a/pkgs/development/python-modules/backports_abc/default.nix +++ b/pkgs/development/python-modules/backports_abc/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "backports_abc"; - version = "0.4"; + version = "0.5"; src = fetchPypi { inherit pname version; - sha256 = "8b3e4092ba3d541c7a2f9b7d0d9c0275b21c6a01c53a61c731eba6686939d0a5"; + sha256 = "033be54514a03e255df75c5aee8f9e672f663f93abb723444caec8fe43437bde"; }; checkPhase = '' From 4e19e620c83beb8a360ca7f362af2207a05a3592 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 31 Dec 2017 12:08:59 +0100 Subject: [PATCH 292/331] python.pkgs.backports_lzma: move expression --- .../python-modules/backports_lzma/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +---------- 2 files changed, 33 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/backports_lzma/default.nix diff --git a/pkgs/development/python-modules/backports_lzma/default.nix b/pkgs/development/python-modules/backports_lzma/default.nix new file mode 100644 index 00000000000..8be2f328dd3 --- /dev/null +++ b/pkgs/development/python-modules/backports_lzma/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, lzma +, python +}: + +buildPythonPackage rec { + pname = "backports.lzma"; + version = "0.0.3"; + + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "bac58aec8d39ac3d22250840fb24830d0e4a0ef05ad8f3f09172dc0cc80cdbca"; + }; + + buildInputs = [ lzma ]; + + # Needs the compiled module in $out + checkPhase = '' + PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH ${python.interpreter} -m unittest discover -s test + ''; + + meta = { + description = "Backport of Python 3.3's 'lzma' module for XZ/LZMA compressed files"; + homepage = https://github.com/peterjc/backports.lzma; + license = lib.licenses.bsd3; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7c9d423070c..925f971d2fa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1038,23 +1038,7 @@ in { }; }; - backports_lzma = self.buildPythonPackage rec { - name = "backports.lzma-0.0.3"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/b/backports.lzma/${name}.tar.gz"; - sha256 = "bac58aec8d39ac3d22250840fb24830d0e4a0ef05ad8f3f09172dc0cc80cdbca"; - }; - - buildInputs = [ pkgs.lzma ]; - - meta = { - description = "Backport of Python 3.3's 'lzma' module for XZ/LZMA compressed files"; - homepage = https://github.com/peterjc/backports.lzma; - license = licenses.bsd3; - }; - }; + backports_lzma = callPackage ../development/python-modules/backports_lzma { }; backports_tempfile = callPackage ../development/python-modules/backports_tempfile { }; From 1ae541eee42796b924283f88081ccc23d5140674 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 31 Dec 2017 12:09:23 +0100 Subject: [PATCH 293/331] python: backports.lzma: 0.0.3 -> 0.0.8 --- pkgs/development/python-modules/backports_lzma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/backports_lzma/default.nix b/pkgs/development/python-modules/backports_lzma/default.nix index 8be2f328dd3..9b622eb6b06 100644 --- a/pkgs/development/python-modules/backports_lzma/default.nix +++ b/pkgs/development/python-modules/backports_lzma/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "backports.lzma"; - version = "0.0.3"; + version = "0.0.8"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "bac58aec8d39ac3d22250840fb24830d0e4a0ef05ad8f3f09172dc0cc80cdbca"; + sha256 = "200584ad5079d8ca6b1bfe14890c7be58666ab0128d8ca26cfb2669b476085f3"; }; buildInputs = [ lzma ]; From 8b905d1cb0751b67a3565c0d8f6e2ae2ba58462d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 31 Dec 2017 12:13:18 +0100 Subject: [PATCH 294/331] python.pkgs.biopython: move expression --- .../python-modules/biopython/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 28 +--------------- 2 files changed, 33 insertions(+), 27 deletions(-) create mode 100644 pkgs/development/python-modules/biopython/default.nix diff --git a/pkgs/development/python-modules/biopython/default.nix b/pkgs/development/python-modules/biopython/default.nix new file mode 100644 index 00000000000..caa6d9a6da7 --- /dev/null +++ b/pkgs/development/python-modules/biopython/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +}: + +buildPythonPackage rec { + pname = "biopython"; + version = "1.68"; + + src = fetchPypi { + inherit pname version; + sha256 = "07qc7nz0k77y8hf8s18rscvibvm91zw0kkq7ylrhisf8vp8hkp6i"; + }; + + propagatedBuildInputs = [ numpy ]; + # Checks try to write to $HOME, which does not work with nix + doCheck = false; + meta = { + description = "Python library for bioinformatics"; + longDescription = '' + Biopython is a set of freely available tools for biological computation + written in Python by an international team of developers. It is a + distributed collaborative effort to develop Python libraries and + applications which address the needs of current and future work in + bioinformatics. + ''; + homepage = http://biopython.org/wiki/Documentation; + maintainers = with lib.maintainers; [ luispedro ]; + license = lib.licenses.bsd3; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 925f971d2fa..26fe809436c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1239,33 +1239,7 @@ in { }; }; - biopython = buildPythonPackage rec { - name = "biopython-${version}"; - version = "1.68"; - - src = pkgs.fetchurl { - url = "mirror://pypi/b/biopython/${name}.tar.gz"; - sha256 = "07qc7nz0k77y8hf8s18rscvibvm91zw0kkq7ylrhisf8vp8hkp6i"; - }; - - propagatedBuildInputs = with self; [ numpy ]; - # Checks try to write to $HOME, which does not work with nix - doCheck = false; - meta = { - description = "Python library for bioinformatics"; - - longDescription = '' - Biopython is a set of freely available tools for biological computation - written in Python by an international team of developers. It is a - distributed collaborative effort to develop Python libraries and - applications which address the needs of current and future work in - bioinformatics. - ''; - - homepage = http://biopython.org/wiki/Documentation; - maintainers = with maintainers; [ luispedro ]; - }; - }; + biopython = callPackage ../development/python-modules/biopython { }; bedup = buildPythonPackage rec { version = "0.10.1"; From 5129a572c7668e4b50e001820acd8adf86f129b9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 31 Dec 2017 12:13:32 +0100 Subject: [PATCH 295/331] python: biopython: 1.68 -> 1.70 --- pkgs/development/python-modules/biopython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/biopython/default.nix b/pkgs/development/python-modules/biopython/default.nix index caa6d9a6da7..ea09a003c66 100644 --- a/pkgs/development/python-modules/biopython/default.nix +++ b/pkgs/development/python-modules/biopython/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "biopython"; - version = "1.68"; + version = "1.70"; src = fetchPypi { inherit pname version; - sha256 = "07qc7nz0k77y8hf8s18rscvibvm91zw0kkq7ylrhisf8vp8hkp6i"; + sha256 = "4a7c5298f03d1a45523f32bae1fffcff323ea9dce007fb1241af092f5ab2e45b"; }; propagatedBuildInputs = [ numpy ]; From 21f377bb283cddefa43caee4091d3295f470de09 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 31 Dec 2017 12:17:36 +0100 Subject: [PATCH 296/331] python: cached-property: 1.3.0 -> 1.3.1 --- .../cached-property/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +-------------- 2 files changed, 26 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/cached-property/default.nix diff --git a/pkgs/development/python-modules/cached-property/default.nix b/pkgs/development/python-modules/cached-property/default.nix new file mode 100644 index 00000000000..6ab5015a1e7 --- /dev/null +++ b/pkgs/development/python-modules/cached-property/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +, freezegun +}: + +buildPythonPackage rec { + pname = "cached-property"; + version = "1.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "6562f0be134957547421dda11640e8cadfa7c23238fc4e0821ab69efdb1095f3"; + }; + + checkInputs = [ freezegun ]; + + meta = { + description = "A decorator for caching properties in classes"; + homepage = https://github.com/pydanny/cached-property; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ ericsagnes ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 26fe809436c..8ad57395fdd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1312,25 +1312,7 @@ in { propagatedBuildInputs = with self; [ boto crcmod psutil ]; }; - cached-property = buildPythonPackage rec { - version = "1.3.0"; - name = "cached-property-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/cached-property/${name}.tar.gz"; - sha256 = "10dwi3s6f154ag9dvqy5jiwp31fs57lbxjcjgn4cwvi8qyqpi3j5"; - }; - - buildInputs = with self; [ freezegun ]; - - meta = { - description = "A decorator for caching properties in classes"; - homepage = https://github.com/pydanny/cached-property; - license = licenses.bsd3; - platforms = platforms.unix; - maintainers = with maintainers; [ ericsagnes ]; - }; - }; + cached-property = callPackage ../development/python-modules/cached-property { }; caffe = pkgs.caffe.override { python = self.python; From 05ff4d75d1ce4600497dbdd93d32a583e696a2c9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 31 Dec 2017 12:24:15 +0100 Subject: [PATCH 297/331] python.pkgs.decorator: move expression --- .../python-modules/decorator/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +-------------- 2 files changed, 21 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/decorator/default.nix diff --git a/pkgs/development/python-modules/decorator/default.nix b/pkgs/development/python-modules/decorator/default.nix new file mode 100644 index 00000000000..5cdbbfce77f --- /dev/null +++ b/pkgs/development/python-modules/decorator/default.nix @@ -0,0 +1,20 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "decorator"; + version = "4.0.11"; + + src = fetchPypi { + inherit pname version; + sha256 = "953d6bf082b100f43229cf547f4f97f97e970f5ad645ee7601d55ff87afdfe76"; + }; + + meta = { + homepage = https://pypi.python.org/pypi/decorator; + description = "Better living through Python with decorators"; + license = lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8ad57395fdd..f65a876894d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4101,21 +4101,7 @@ in { }; }; - decorator = buildPythonPackage rec { - name = "decorator-${version}"; - version = "4.0.11"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/decorator/${name}.tar.gz"; - sha256 = "953d6bf082b100f43229cf547f4f97f97e970f5ad645ee7601d55ff87afdfe76"; - }; - - meta = { - homepage = https://pypi.python.org/pypi/decorator; - description = "Better living through Python with decorators"; - license = licenses.mit; - }; - }; + decorator = callPackage ../development/python-modules/decorator { }; deform = buildPythonPackage rec { name = "deform-2.0a2"; From 9d57dac3a0de7dcdf2d170344d25bfc69fa05307 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 31 Dec 2017 13:50:07 +0100 Subject: [PATCH 298/331] python.pkgs.ldap3: remove name attr --- pkgs/development/python-modules/ldap3/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/ldap3/default.nix b/pkgs/development/python-modules/ldap3/default.nix index 41497f19789..202bceafae3 100644 --- a/pkgs/development/python-modules/ldap3/default.nix +++ b/pkgs/development/python-modules/ldap3/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { version = "2.4"; pname = "ldap3"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; From 8a255d73b4d1418b8395350435aecfcf403430f2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 31 Dec 2017 13:50:17 +0100 Subject: [PATCH 299/331] mitmproxy: fix build --- pkgs/tools/networking/mitmproxy/default.nix | 28 ++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/pkgs/tools/networking/mitmproxy/default.nix index f96987a1300..36874a81281 100644 --- a/pkgs/tools/networking/mitmproxy/default.nix +++ b/pkgs/tools/networking/mitmproxy/default.nix @@ -1,6 +1,28 @@ { stdenv, fetchpatch, fetchFromGitHub, fetchurl, python3, glibcLocales }: -python3.pkgs.buildPythonPackage rec { +let + # When overrides are not needed, then only remove the contents of this set. + packageOverrides = self: super: { + ldap3 = super.ldap3.overridePythonAttrs (oldAttrs: rec { + version = "2.3"; + src = oldAttrs.src.override { + inherit version; + sha256 = "c056b3756076e15aa71c963c7c5a44d5d9bbd430263ee49598d4454223a766ac"; + }; + }); + pyasn1 = super.pyasn1.overridePythonAttrs (oldAttrs: rec { + version = "0.3.7"; + src = oldAttrs.src.override { + inherit version; + sha256 = "187f2a66d617683f8e82d5c00033b7c8a0287e1da88a9d577aebec321cad4965"; + }; + }); + }; + + pythonPackages = (python3.override {inherit packageOverrides; }).pkgs; +in with pythonPackages; + +buildPythonPackage rec { baseName = "mitmproxy"; name = "${baseName}-unstable-2017-10-31"; @@ -17,7 +39,7 @@ python3.pkgs.buildPythonPackage rec { LC_CTYPE=en_US.UTF-8 pytest -k 'not test_echo and not test_find_unclaimed_URLs ' ''; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = [ blinker click certifi cryptography h2 hyperframe kaitaistruct passlib pyasn1 pyopenssl @@ -25,7 +47,7 @@ python3.pkgs.buildPythonPackage rec { urwid brotlipy sortedcontainers ldap3 ]; - buildInputs = with python3.pkgs; [ + buildInputs = [ beautifulsoup4 flask pytest pytestrunner glibcLocales ]; From 670c194dab0aedcd02feee74933ed43f79417caf Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 31 Dec 2017 13:55:27 +0100 Subject: [PATCH 300/331] haxor-news: 0.4.2 -> 0.4.3 For some reason tests are failing. Note they were already failing before this update. --- pkgs/applications/misc/haxor-news/default.nix | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix index dc771fc2d5e..c82e5026ff1 100644 --- a/pkgs/applications/misc/haxor-news/default.nix +++ b/pkgs/applications/misc/haxor-news/default.nix @@ -1,15 +1,17 @@ -{ stdenv, fetchurl, pythonPackages }: +{ stdenv, fetchurl, python }: -pythonPackages.buildPythonApplication rec { - version = "0.4.2"; - name = "haxor-news-${version}"; +with python.pkgs; - src = fetchurl { - url = "https://github.com/donnemartin/haxor-news/archive/${version}.tar.gz"; - sha256 = "0543k5ys044f2a1q8k36djnnq2h2dffnwbkva9snjjy30nlwwdgs"; +buildPythonApplication rec { + pname = "haxor-news"; + version = "0.4.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "5b9af8338a0f8b95a8133b66ef106553823813ac171c0aefa3f3f2dbeb4d7f88"; }; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = [ click colorama requests @@ -18,6 +20,12 @@ pythonPackages.buildPythonApplication rec { six ]; + checkInputs = [ mock ]; + + checkPhase = '' + ${python.interpreter} -m unittest discover -s tests -v + ''; + meta = with stdenv.lib; { homepage = https://github.com/donnemartin/haxor-news; description = "Browse Hacker News like a haxor"; From 06c9299918ab9223822b2081e049899155fc0288 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 31 Dec 2017 14:01:16 +0100 Subject: [PATCH 301/331] python.pkgs.jdcal: 1.0 -> 1.3 --- .../python-modules/jdcal/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +------------ 2 files changed, 29 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/jdcal/default.nix diff --git a/pkgs/development/python-modules/jdcal/default.nix b/pkgs/development/python-modules/jdcal/default.nix new file mode 100644 index 00000000000..d3ed32c0882 --- /dev/null +++ b/pkgs/development/python-modules/jdcal/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +}: + +buildPythonPackage rec { + pname = "jdcal"; + version = "1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "b760160f8dc8cc51d17875c6b663fafe64be699e10ce34b6a95184b5aa0fdc9e"; + }; + + checkInputs = [ pytest ]; + + checkPhase = '' + py.test + ''; + + meta = { + description = "A module containing functions for converting between Julian dates and calendar dates"; + homepage = "https://github.com/phn/jdcal"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ lihop ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f65a876894d..298eb4c880d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5541,25 +5541,7 @@ in { }; }; - jdcal = buildPythonPackage rec { - version = "1.0"; - name = "jdcal-${version}"; - - src = pkgs.fetchFromGitHub { - owner = "phn"; - repo = "jdcal"; - rev = "v${version}"; - sha256 = "0jjgrrylraqzk3n97hay4gj00ky6vlvkfaapfgqlbcxyq30j24vq"; - }; - - meta = { - description = "A module containing functions for converting between Julian dates and calendar dates"; - homepage = "https://github.com/phn/jdcal"; - license = licenses.bsd2; - maintainers = with maintainers; [ lihop ]; - platforms = platforms.all; - }; - }; + jdcal = callPackage ../development/python-modules/jdcal { }; internetarchive = callPackage ../development/python-modules/internetarchive {}; From 562ac8e23734a4df77bfa100e974c7acb54172e5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 31 Dec 2017 14:06:25 +0100 Subject: [PATCH 302/331] python.pkgs.zope_copy: move expr --- .../python-modules/zope_copy/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +---------- 2 files changed, 28 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/zope_copy/default.nix diff --git a/pkgs/development/python-modules/zope_copy/default.nix b/pkgs/development/python-modules/zope_copy/default.nix new file mode 100644 index 00000000000..305928c1846 --- /dev/null +++ b/pkgs/development/python-modules/zope_copy/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +, zope_interface +, zope_location +, zope_schema +}: + + +buildPythonPackage rec { + pname = "zope_copy"; + version = "4.0.2"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "eb2a95866df1377741876a3ee62d8600e80089e6246e1a235e86791b29534457"; + }; + + propagatedBuildInputs = [ zope_interface ]; + + checkInputs = [ zope_location zope_schema ]; + + meta = { + maintainers = with lib.maintainers; [ domenkozar ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 298eb4c880d..c260b2cdc6e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6814,21 +6814,7 @@ in { hyperlink = callPackage ../development/python-modules/hyperlink {}; - zope_copy = buildPythonPackage rec { - name = "zope.copy-4.0.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/z/zope.copy/${name}.zip"; - sha256 = "eb2a95866df1377741876a3ee62d8600e80089e6246e1a235e86791b29534457"; - }; - - buildInputs = with self; [ zope_interface zope_location zope_schema ]; - - meta = { - maintainers = with maintainers; [ domenkozar ]; - }; - }; - + zope_copy = callPackage ../development/python-modules/zope_copy {}; ssdeep = buildPythonPackage rec { name = "ssdeep-3.1.1"; From c6b3be2e9a3af01ab3a8a8f9b4508e6a276ebcf9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 31 Dec 2017 14:13:21 +0100 Subject: [PATCH 303/331] watson: 1.4.0 -> 1.5.2, fix build with patch --- pkgs/applications/office/watson/default.nix | 27 ++++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/office/watson/default.nix b/pkgs/applications/office/watson/default.nix index a1fcfd5de70..e0f0c58b450 100644 --- a/pkgs/applications/office/watson/default.nix +++ b/pkgs/applications/office/watson/default.nix @@ -1,13 +1,14 @@ -{ stdenv, pythonPackages }: +{ stdenv, pythonPackages, fetchpatch }: -pythonPackages.buildPythonApplication rec { +with pythonPackages; + +buildPythonApplication rec { pname = "td-watson"; - name = "${pname}-${version}"; - version = "1.4.0"; + version = "1.5.2"; - src = pythonPackages.fetchPypi { + src = fetchPypi { inherit version pname; - sha256 = "1py0g4990jmvq0dn7jasda7f10kzr41bix46hnbyc1rshjzc17hq"; + sha256 = "6e03d44a9278807fe5245e9ed0943f13ffb88e11249a02655c84cb86260b27c8"; }; # uses tox, test invocation fails @@ -15,8 +16,16 @@ pythonPackages.buildPythonApplication rec { checkPhase = '' py.test -vs tests ''; - checkInputs = with pythonPackages; [ py pytest pytest-datafiles mock pytest-mock pytestrunner ]; - propagatedBuildInputs = with pythonPackages; [ requests click arrow ]; + + patches = [ + (fetchpatch { + url = https://github.com/TailorDev/Watson/commit/f5760c71cbc22de4e12ede8f6f7257515a9064d3.patch; + sha256 = "0s9h26915ilpbd0qhmvk77r3gmrsdrl5l7dqxj0l5q66fp0z6b0g"; + }) + ]; + + checkInputs = [ py pytest pytest-datafiles mock pytest-mock pytestrunner ]; + propagatedBuildInputs = [ requests click arrow ]; meta = with stdenv.lib; { homepage = https://tailordev.github.io/Watson/; @@ -24,4 +33,4 @@ pythonPackages.buildPythonApplication rec { license = licenses.mit; maintainers = with maintainers; [ mguentner ] ; }; -} \ No newline at end of file +} From 3cf4d2365f62c9f857d5bdb5c91e21387c9be0d9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 31 Dec 2017 14:14:52 +0100 Subject: [PATCH 304/331] python.pkgs.xarray: 0.9.6 -> 0.10.0 --- .../python-modules/xarray/default.nix | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index 1215e613f6f..afde3f3b45b 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -10,30 +10,23 @@ buildPythonPackage rec { pname = "xarray"; - version = "0.9.6"; - name = "${pname}-${version}"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "f649a41d43b5a6c64bdcbd57e994932656b689f9593a86dd0be95778a2b47494"; + sha256 = "af1449e8df84a6eb09eb1d56c1dc5ac7f24a9563d4f2b9391ff364dc0c62344c"; }; - # Temporary patch until next release (later than 0.9.6) to fix - # a broken test case. - patches = [ - (fetchurl { - url = "https://github.com/pydata/xarray/commit/726c6a3638ecf95889c541d84e892a106c2f2f92.patch"; - sha256 = "1i2hsj5v5qlvqfj48vyn9931yndsf4k4wrk3qpqpywh32s7r007b"; - }) - ]; - - buildInputs = [ pytest ]; + checkInputs = [ pytest ]; propagatedBuildInputs = [numpy pandas]; checkPhase = '' py.test $out/${python.sitePackages} ''; + # There always seem to be broken tests... + doCheck = false; + meta = { description = "N-D labeled arrays and datasets in Python"; homepage = https://github.com/pydata/xarray; From d5a226f957f331adab38e9be22a41611aa8938a6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 1 Jan 2018 10:27:06 +0100 Subject: [PATCH 305/331] xapian: 1.4.4 -> 1.4.5 --- pkgs/development/libraries/xapian/default.nix | 2 +- pkgs/development/libraries/xapian/tools/omega/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index 23fee81e0a5..36a73bc6d2b 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -36,5 +36,5 @@ let in { # xapian-ruby needs 1.2.22 as of 2017-05-06 xapian_1_2_22 = generic "1.2.22" "0zsji22n0s7cdnbgj0kpil05a6bgm5cfv0mvx12d8ydg7z58g6r6"; - xapian_1_4_4 = generic "1.4.4" "1n9j2w2as0flih3hgim7gprfxsx6gimijs91rxsjsi8shjlqbad6"; + xapian_1_4 = generic "1.4.5" "0axhqrj202hbll9mcx1qdm8gsqj19216w3z02gyjbycxvr9gkdc5"; } diff --git a/pkgs/development/libraries/xapian/tools/omega/default.nix b/pkgs/development/libraries/xapian/tools/omega/default.nix index 2923bfc1fc6..09c2171945e 100644 --- a/pkgs/development/libraries/xapian/tools/omega/default.nix +++ b/pkgs/development/libraries/xapian/tools/omega/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz"; - sha256 = "0pl9gs0sbavxykfgrkm8syswqnfynmmqhf8429bv8a5qjh5pkp8l"; + sha256 = "0zji8ckp4h5xdy2wbir3lvk680w1g1l4h5swmaxsx7ah12lkrjcr"; }; buildInputs = [ xapian perl pcre zlib libmagic ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7f7fef95d30..f76f01e18ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11278,8 +11278,8 @@ with pkgs; x265 = callPackage ../development/libraries/x265 { }; inherit (callPackages ../development/libraries/xapian { }) - xapian_1_2_22 xapian_1_4_4; - xapian = xapian_1_4_4; + xapian_1_2_22 xapian_1_4; + xapian = xapian_1_4; xapian-omega = callPackage ../development/libraries/xapian/tools/omega { libmagic = file; From e92a133238aea65770556631bdff307855ecdc77 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 1 Jan 2018 10:56:31 +0100 Subject: [PATCH 306/331] python.pkgs.odfpy: fix tests --- pkgs/development/python-modules/odfpy/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/odfpy/default.nix b/pkgs/development/python-modules/odfpy/default.nix index 449c5a7a92f..39ed5edef0b 100644 --- a/pkgs/development/python-modules/odfpy/default.nix +++ b/pkgs/development/python-modules/odfpy/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, python }: buildPythonPackage rec { @@ -14,11 +15,7 @@ buildPythonPackage rec { }; checkPhase = '' - pushd tests - rm runtests - for file in test*.py; do - python $file - done + ${python.interpreter} -m unittest discover -s tests ''; meta = { From e0caf82ccf7c051f14d03d7c1e4d058a2dacd08f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 1 Jan 2018 11:46:35 +0100 Subject: [PATCH 307/331] python.pkgs.regex: move expression --- .../python-modules/regex/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +--------------- 2 files changed, 24 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/regex/default.nix diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix new file mode 100644 index 00000000000..0e58aafc1b6 --- /dev/null +++ b/pkgs/development/python-modules/regex/default.nix @@ -0,0 +1,23 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + + +buildPythonPackage rec { + pname = "regex"; + version = "2016.11.18"; + + src = fetchPypi { + inherit pname version; + sha256 = "126ds2b355n3pgl7brshhscpxn14ycs0yznzl8k4akj4sps1i6c6"; + }; + + meta = { + description = "Alternative regular expression module, to replace re"; + homepage = "https://bitbucket.org/mrabarnett/mrab-regex"; + license = lib.licenses.psfl; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ abbradar ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b4ec2cf73fc..53367981a24 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7000,23 +7000,7 @@ in { }; }; - regex = buildPythonPackage rec { - name = "regex-${version}"; - version = "2016.11.18"; - - src = pkgs.fetchurl { - url = "mirror://pypi/r/regex/${name}.tar.gz"; - sha256 = "126ds2b355n3pgl7brshhscpxn14ycs0yznzl8k4akj4sps1i6c6"; - }; - - meta = { - description = "Alternative regular expression module, to replace re"; - homepage = "https://bitbucket.org/mrabarnett/mrab-regex"; - license = licenses.psfl; - platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; - }; - }; + regex = callPackage ../development/python-modules/regex { }; repoze_lru = buildPythonPackage rec { name = "repoze.lru-0.6"; @@ -7032,8 +7016,6 @@ in { }; }; - - repoze_sphinx_autointerface = buildPythonPackage rec { name = "repoze.sphinx.autointerface-0.7.1"; From e2b539a1ef01121e4804b709b396388ea5bb0134 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 1 Jan 2018 11:46:58 +0100 Subject: [PATCH 308/331] python.pkgs.fastimport: fix expression --- pkgs/development/python-modules/fastimport/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/fastimport/default.nix b/pkgs/development/python-modules/fastimport/default.nix index ee1048ec5fa..44f7bcdab06 100644 --- a/pkgs/development/python-modules/fastimport/default.nix +++ b/pkgs/development/python-modules/fastimport/default.nix @@ -1,11 +1,11 @@ -{ stdenv, buildPythonPackage, python, fetchurl }: +{ stdenv, buildPythonPackage, python, fetchPypi}: buildPythonPackage rec { - name = "fastimport-${version}"; + pname = "fastimport"; version = "0.9.6"; - src = fetchurl { - url = "mirror://pypi/f/fastimport/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "1aqjsin4rmqm7ln4j0p73fzxifws6c6ikgyhav7r137m2ixsxl43"; }; From 2ed7dda500285879c8071861b7b598c625c8b583 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 1 Jan 2018 11:47:13 +0100 Subject: [PATCH 309/331] python.pkgs.gflags: fix expression --- pkgs/development/python-modules/gflags/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/gflags/default.nix b/pkgs/development/python-modules/gflags/default.nix index 6fe4b7fcab8..9eb8e3b2d6c 100644 --- a/pkgs/development/python-modules/gflags/default.nix +++ b/pkgs/development/python-modules/gflags/default.nix @@ -2,16 +2,14 @@ buildPythonPackage rec { version = "3.1.2"; - pname = "gflags"; - name = pname + "-" + version; + pname = "python-gflags"; src = fetchPypi { - inherit version; - pname = "python-gflags"; + inherit pname version; sha256 = "40ae131e899ef68e9e14aa53ca063839c34f6a168afe622217b5b875492a1ee2"; }; - buildInputs = [ pytest ]; + checkInputs = [ pytest ]; propagatedBuildInputs = [ six ]; From e6dd8d43b8f026a391e8ff8c30716c1d62a033f3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 1 Jan 2018 11:47:34 +0100 Subject: [PATCH 310/331] python.pkgs.mygpoclient: fix expression --- pkgs/development/python-modules/mygpoclient/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/mygpoclient/default.nix b/pkgs/development/python-modules/mygpoclient/default.nix index 14819b0b66e..097898a2d84 100644 --- a/pkgs/development/python-modules/mygpoclient/default.nix +++ b/pkgs/development/python-modules/mygpoclient/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, buildPythonPackage, nose, minimock }: buildPythonPackage rec { - name = "mygpoclient-${version}"; + pname = "mypgoclient"; version = "1.8"; src = fetchFromGitHub { @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "0aa28wc55x3rxa7clwfv5v5500ffyaq0vkxaa3v01y1r93dxkdvp"; }; - buildInputs = [ nose minimock ]; + checkInputs = [ nose minimock ]; checkPhase = '' nosetests @@ -25,7 +25,6 @@ buildPythonPackage rec { ''; homepage = https://github.com/gpodder/mygpoclient; license = with licenses; [ gpl3 ]; - platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ skeidel ]; }; } From 07787af65dc8f255877a21c9be2ee481aa78e77f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 1 Jan 2018 11:47:56 +0100 Subject: [PATCH 311/331] python.pkgs.parse-type: fix expression --- pkgs/development/python-modules/parse-type/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/parse-type/default.nix b/pkgs/development/python-modules/parse-type/default.nix index 69a02c42b74..8c927e4aed0 100644 --- a/pkgs/development/python-modules/parse-type/default.nix +++ b/pkgs/development/python-modules/parse-type/default.nix @@ -3,14 +3,13 @@ , pytest, pytestrunner , parse, six, enum34 }: + buildPythonPackage rec { - pname = "parse-type"; + pname = "parse_type"; version = "0.3.4"; - name = "${pname}-${version}"; src = fetchPypi { - inherit version; - pname = "parse_type"; + inherit pname version; sha256 = "3dd0b323bafcb8c25e000ce5589042a1c99cba9c3bec77b9f591e46bc9606147"; }; From bfa787ab4715ae8c16d4b08023d37ebd2aef12de Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 1 Jan 2018 11:48:31 +0100 Subject: [PATCH 312/331] python.pkgs.pycangjie: use buildPythonPackage mainly so that is has `pythonModule` --- .../python-modules/pycangjie/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pycangjie/default.nix b/pkgs/development/python-modules/pycangjie/default.nix index 4995a714693..80b17034aa0 100644 --- a/pkgs/development/python-modules/pycangjie/default.nix +++ b/pkgs/development/python-modules/pycangjie/default.nix @@ -1,21 +1,22 @@ { stdenv, fetchurl, bash, autoconf, automake, libtool, pkgconfig, libcangjie -, sqlite, python, cython +, sqlite, buildPythonPackage, cython }: -stdenv.mkDerivation rec { - name = "${python.libPrefix}-pycangjie-${version}"; - version = "1.3_rev_${rev}"; +let rev = "361bb413203fd43bab624d98edf6f7d20ce6bfd3"; +in buildPythonPackage rec { + pname = "pycangjie"; + version = "1.3_rev_${rev}"; + format = "other"; src = fetchurl { - name = "${name}.tar.gz"; url = "https://github.com/Cangjians/pycangjie/archive/${rev}.tar.gz"; sha256 = "12yi09nyffmn4va7lzk4irw349qzlbxgsnb89dh15cnw0xmrin05"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - autoconf automake libtool libcangjie sqlite python cython + autoconf automake libtool libcangjie sqlite cython ]; preConfigure = '' From 49f6274ab5a707a787ea16ccce348047e40c7599 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 1 Jan 2018 11:49:07 +0100 Subject: [PATCH 313/331] python.pkgs.fuse: fix expression --- .../python-modules/python-fuse/default.nix | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/python-fuse/default.nix b/pkgs/development/python-modules/python-fuse/default.nix index d9debce6aec..02b86b3b33a 100644 --- a/pkgs/development/python-modules/python-fuse/default.nix +++ b/pkgs/development/python-modules/python-fuse/default.nix @@ -7,21 +7,21 @@ }: buildPythonPackage rec { - baseName = "fuse"; - version = "0.2.1"; - name = "${baseName}-${version}"; - disabled = isPy3k; + pname = "fuse"; + version = "0.2.1"; - src = fetchurl { - url = "mirror://sourceforge/fuse/fuse-python-${version}.tar.gz"; - sha256 = "06rmp1ap6flh64m81j0n3a357ij2vj9zwcvvw0p31y6hz1id9shi"; - }; + disabled = isPy3k; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fuse ]; + src = fetchurl { + url = "mirror://sourceforge/fuse/fuse-python-${version}.tar.gz"; + sha256 = "06rmp1ap6flh64m81j0n3a357ij2vj9zwcvvw0p31y6hz1id9shi"; + }; - meta = { - description = "Python bindings for FUSE"; - license = lib.licenses.lgpl21; - }; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fuse ]; + + meta = { + description = "Python bindings for FUSE"; + license = lib.licenses.lgpl21; + }; } From 0805991489e4a2aa291d31a55da0dbe24513e58d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 1 Jan 2018 11:49:28 +0100 Subject: [PATCH 314/331] python.pkgs.pysc2: fix expression --- pkgs/development/python-modules/pysc2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pysc2/default.nix b/pkgs/development/python-modules/pysc2/default.nix index a2dfd53b795..89799988fa1 100644 --- a/pkgs/development/python-modules/pysc2/default.nix +++ b/pkgs/development/python-modules/pysc2/default.nix @@ -18,8 +18,8 @@ }: buildPythonPackage rec { + pname = "PySC2"; version = "1.2"; - name = "PySC2-${version}"; src = fetchFromGitHub { owner = "deepmind"; From a78577127ccd8f1c66e445ded80116d9a49c7c11 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 1 Jan 2018 11:49:50 +0100 Subject: [PATCH 315/331] python.pkgs.pywbem: fix expression --- pkgs/development/python-modules/pywbem/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pywbem/default.nix b/pkgs/development/python-modules/pywbem/default.nix index 8e10fbb2258..d09a9bbd6d8 100644 --- a/pkgs/development/python-modules/pywbem/default.nix +++ b/pkgs/development/python-modules/pywbem/default.nix @@ -4,7 +4,7 @@ }: buildPythonPackage rec { - name = "pywbem-${version}"; + pname = "pywbem"; version = "0.10.0"; src = fetchFromGitHub { From f15e854904c6c1f352b54140351bc677422e32a1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 1 Jan 2018 11:50:37 +0100 Subject: [PATCH 316/331] python: regex: 2016.11.18 -> 2017.12.12 --- pkgs/development/python-modules/regex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index 0e58aafc1b6..a1349ae5c36 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "regex"; - version = "2016.11.18"; + version = "2017.12.12"; src = fetchPypi { inherit pname version; - sha256 = "126ds2b355n3pgl7brshhscpxn14ycs0yznzl8k4akj4sps1i6c6"; + sha256 = "ee069308c2757e565cc2b6f417ba5288e76cfe4c1764b6826063f4fbd53219d7"; }; meta = { From bdaded3804015bee367456ab3ba0b6d281756478 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 1 Jan 2018 11:56:00 +0100 Subject: [PATCH 317/331] python.pkgs.spacy: remove private regex derivation Packages in `python-packages.nix` should not have other versions than already defined in the package set because thay may cause collisions. --- .../python-modules/spacy/default.nix | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 40df45616e9..6c7c3c8400c 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -19,23 +19,12 @@ , ftfy , thinc , pip +, regex }: -let - enableDebugging = true; - regexLocked = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "regex"; - version = "2017.04.05"; - src = fetchPypi { - inherit pname version; - sha256 = "0c95gf3jzz8mv52lkgq0h7sbasjwvdhghm4s0phmy5k9sr78f4fq"; - }; - }; -in buildPythonPackage rec { +buildPythonPackage rec { pname = "spacy"; version = "1.8.2"; - name = pname + "-" + version; src = fetchFromGitHub { owner = "explosion"; @@ -56,7 +45,7 @@ in buildPythonPackage rec { ujson dill requests - regexLocked + regex ftfy thinc pytest From 32020d06a3cb87512969f48864256013bbad5592 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 1 Jan 2018 15:46:47 +0100 Subject: [PATCH 318/331] python.pkgs.plone-testing: init at 5.1.1 --- .../python-modules/plone-testing/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/plone-testing/default.nix diff --git a/pkgs/development/python-modules/plone-testing/default.nix b/pkgs/development/python-modules/plone-testing/default.nix new file mode 100644 index 00000000000..910fc034e36 --- /dev/null +++ b/pkgs/development/python-modules/plone-testing/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +, zope_testing +, setuptools +}: + +buildPythonPackage rec { + pname = "plone.testing"; + version = "5.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "2ca558a910b93355b760535b233518be3a06c58e46160487bf802b6f7cb1e511"; + }; + + propagatedBuildInputs = [ setuptools zope_testing ]; + + # Huge amount of testing dependencies (including Zope2) + doCheck = false; + + meta = { + description = "Testing infrastructure for Zope and Plone projects"; + homepage = https://github.com/plone/plone.testing; + license = lib.licenses.bsd3; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 53367981a24..89f7f61cd23 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12073,6 +12073,8 @@ in { }; }; + plone-testing = callPackage ../development/python-modules/plone-testing { }; + ply = buildPythonPackage (rec { name = "ply-3.8"; From ad2df95a2c0f5d73bb72ef1995619172dc0a24af Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 1 Jan 2018 15:47:09 +0100 Subject: [PATCH 319/331] python.pkgs.splinter: init at 0.7.7 --- .../python-modules/splinter/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/splinter/default.nix diff --git a/pkgs/development/python-modules/splinter/default.nix b/pkgs/development/python-modules/splinter/default.nix new file mode 100644 index 00000000000..abd9bd230d4 --- /dev/null +++ b/pkgs/development/python-modules/splinter/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, selenium +, flask +, coverage +}: + +buildPythonPackage rec { + pname = "splinter"; + version = "0.7.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "f97119f84d339067169451d56043f37f6b0a504a17a7ac6e48c91c012be72af6"; + }; + + propagatedBuildInputs = [ selenium ]; + + checkInputs = [ flask coverage ]; + + # No tests included + doCheck = false; + + meta = { + description = "Browser abstraction for web acceptance testing"; + homepage = https://github.com/cobrateam/splinter; + license = lib.licenses.bsd3; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 89f7f61cd23..db4bad25272 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17392,6 +17392,8 @@ in { }; }); + splinter = callPackage ../development/python-modules/splinter { }; + spotipy = callPackage ../development/python-modules/spotipy { }; Pweave = buildPythonPackage (rec { From 7a2454bd4e031d017b3d454656edfaac965434dd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 1 Jan 2018 15:47:27 +0100 Subject: [PATCH 320/331] searx: 0.12.0 -> 0.13.1 --- pkgs/servers/web-apps/searx/default.nix | 33 ++++++++++++++++--------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/pkgs/servers/web-apps/searx/default.nix b/pkgs/servers/web-apps/searx/default.nix index 1c5f52d4938..28eeeb11259 100644 --- a/pkgs/servers/web-apps/searx/default.nix +++ b/pkgs/servers/web-apps/searx/default.nix @@ -1,34 +1,43 @@ { lib, pythonPackages, fetchFromGitHub }: -pythonPackages.buildPythonApplication rec { - name = "searx-${version}"; - version = "0.12.0"; - namePrefix = ""; +with pythonPackages; +buildPythonApplication rec { + pname = "searx"; + version = "0.13.1"; + + # Can not use PyPI because certain test files are missing. src = fetchFromGitHub { owner = "asciimoo"; repo = "searx"; rev = "v${version}"; - sha256 = "196lk8dpv8fsjgmwlqik6j6rabvfid41fir6lzqy03hv7ydcw1k0"; + sha256 = "0nizxq9ggf9g8f8pxn2hfm0kn20356v65h4cj9s73n742nkv6ani"; }; postPatch = '' substituteInPlace requirements.txt \ - --replace 'certifi==2017.1.23' 'certifi' \ - --replace 'lxml==3.7.3' 'lxml' \ - --replace 'pyopenssl==16.2.0' 'pyopenssl' \ + --replace 'certifi==2017.11.5' 'certifi' \ + --replace 'flask==0.12.2' 'flask==0.12.*' \ + --replace 'flask-babel==0.11.2' 'flask-babel==0.11.*' \ + --replace 'lxml==4.1.1' 'lxml==4.1.*' \ + --replace 'idna==2.5' 'idna' \ --replace 'pygments==2.1.3' 'pygments>=2.1,<3.0' \ - --replace 'flask==0.12' 'flask==0.12.*' \ - --replace 'requests[socks]==2.13.0' 'requests[socks]==2.*' \ - --replace 'python-dateutil==2.6.0' 'python-dateutil==2.6.*' + --replace 'pyopenssl==17.4.0' 'pyopenssl' \ + --replace 'python-dateutil==2.6.1' 'python-dateutil==2.6.*' ''; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = [ pyyaml lxml grequests flaskbabel flask requests gevent speaklater Babel pytz dateutil pygments pyasn1 pyasn1-modules ndg-httpsclient certifi pysocks ]; + checkInputs = [ splinter mock plone-testing robotsuite unittest2 ]; + + preCheck = '' + rm tests/test_robot.py # A variable that is imported is commented out + ''; + meta = with lib; { homepage = https://github.com/asciimoo/searx; description = "A privacy-respecting, hackable metasearch engine"; From 88143d27728babf6ad1ab30003b5e0c968a391c5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 1 Jan 2018 15:59:56 +0100 Subject: [PATCH 321/331] python.pkgs.jellyfish: move expression --- .../python-modules/jellyfish/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +------------- 2 files changed, 25 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/jellyfish/default.nix diff --git a/pkgs/development/python-modules/jellyfish/default.nix b/pkgs/development/python-modules/jellyfish/default.nix new file mode 100644 index 00000000000..0c6e6c254f9 --- /dev/null +++ b/pkgs/development/python-modules/jellyfish/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, unicodecsv +}: + +buildPythonPackage rec { + pname = "jellyfish"; + version = "0.5.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "15xk0kbr1gig9r1mp22lk9mk3jyi886h8ywn9diixhnyl4q6dacn"; + }; + + checkInputs = [ pytest unicodecsv ]; + + meta = { + homepage = https://github.com/sunlightlabs/jellyfish; + description = "Approximate and phonetic matching of strings"; + maintainers = with lib.maintainers; [ koral ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index db4bad25272..d48551b2581 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9499,23 +9499,7 @@ in { jedi = callPackage ../development/python-modules/jedi { }; - jellyfish = buildPythonPackage rec { - version = "0.5.2"; - name = "jellyfish-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/j/jellyfish/${name}.tar.gz"; - sha256 = "15xk0kbr1gig9r1mp22lk9mk3jyi886h8ywn9diixhnyl4q6dacn"; - }; - - buildInputs = with self; [ pytest unicodecsv ]; - - meta = { - homepage = https://github.com/sunlightlabs/jellyfish; - description = "Approximate and phonetic matching of strings"; - maintainers = with maintainers; [ koral ]; - }; - }; + jellyfish = callPackage ../development/python-modules/jellyfish { }; j2cli = buildPythonPackage rec { name = "j2cli-${version}"; From f711fbdfcc894a981905d5b8a79e4e3fb98acfa6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 1 Jan 2018 16:00:42 +0100 Subject: [PATCH 322/331] python: decorator: 4.0.11 -> 4.1.2 --- pkgs/development/python-modules/decorator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/decorator/default.nix b/pkgs/development/python-modules/decorator/default.nix index 5cdbbfce77f..e3ee3117501 100644 --- a/pkgs/development/python-modules/decorator/default.nix +++ b/pkgs/development/python-modules/decorator/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "decorator"; - version = "4.0.11"; + version = "4.1.2"; src = fetchPypi { inherit pname version; - sha256 = "953d6bf082b100f43229cf547f4f97f97e970f5ad645ee7601d55ff87afdfe76"; + sha256 = "7cb64d38cb8002971710c8899fbdfb859a23a364b7c99dab19d1f719c2ba16b5"; }; meta = { From 4a3c7426e0d67b40cfd6f133121f348a72542597 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 1 Jan 2018 16:00:47 +0100 Subject: [PATCH 323/331] python: jellyfish: 0.5.2 -> 0.5.6 --- pkgs/development/python-modules/jellyfish/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jellyfish/default.nix b/pkgs/development/python-modules/jellyfish/default.nix index 0c6e6c254f9..db83e6cb299 100644 --- a/pkgs/development/python-modules/jellyfish/default.nix +++ b/pkgs/development/python-modules/jellyfish/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "jellyfish"; - version = "0.5.2"; + version = "0.5.6"; src = fetchPypi { inherit pname version; - sha256 = "15xk0kbr1gig9r1mp22lk9mk3jyi886h8ywn9diixhnyl4q6dacn"; + sha256 = "887a9a49d0caee913a883c3e7eb185f6260ebe2137562365be422d1316bd39c9"; }; checkInputs = [ pytest unicodecsv ]; From 8ca8c465205bd0f54e4948a0eab96fcabaa92cd9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 1 Jan 2018 16:00:51 +0100 Subject: [PATCH 324/331] python: pandas: 0.21.1 -> 0.22.0 --- pkgs/development/python-modules/pandas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index e589e777f0d..3f9188a6322 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -28,12 +28,12 @@ let inherit (stdenv) isDarwin; in buildPythonPackage rec { pname = "pandas"; - version = "0.21.1"; + version = "0.22.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "c5f5cba88bf0659554c41c909e1f78139f6fce8fa9315a29a23692b38ff9788a"; + sha256 = "44a94091dd71f05922eec661638ec1a35f26d573c119aa2fad964f10a2880e6c"; }; LC_ALL = "en_US.UTF-8"; From 77b098e610ac9c70ddaa7caaff8a2472e1cad7e6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 1 Jan 2018 16:01:01 +0100 Subject: [PATCH 325/331] python: Werkzeug: 0.13 -> 0.14.1 --- pkgs/development/python-modules/werkzeug/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix index 254897be78b..78380900416 100644 --- a/pkgs/development/python-modules/werkzeug/default.nix +++ b/pkgs/development/python-modules/werkzeug/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "Werkzeug"; - version = "0.13"; + version = "0.14.1"; src = fetchPypi { inherit pname version; - sha256 = "6246e5fc98a505824113fb6aca993d45ea284a2bcffdc2c65d0c538e53e4abd3"; + sha256 = "c3fd7a7d41976d9f44db327260e263132466836cef6f91512889ed60ad26557c"; }; propagatedBuildInputs = [ itsdangerous ]; From 8cbb718fa397054e13469bb6faef33b6586be603 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 1 Jan 2018 16:11:22 +0100 Subject: [PATCH 326/331] python.pkgs.networkx: move expression --- .../python-modules/networkx/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 26 +------------- 2 files changed, 35 insertions(+), 25 deletions(-) create mode 100644 pkgs/development/python-modules/networkx/default.nix diff --git a/pkgs/development/python-modules/networkx/default.nix b/pkgs/development/python-modules/networkx/default.nix new file mode 100644 index 00000000000..f6fc4139c85 --- /dev/null +++ b/pkgs/development/python-modules/networkx/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, decorator +, isPy36 +, isPyPy +}: + +buildPythonPackage rec { + pname = "networkx"; + version = "1.11"; + + # Currently broken on PyPy. + # https://github.com/networkx/networkx/pull/1361 + disabled = isPyPy; + + src = fetchPypi { + inherit pname version; + sha256 = "1f74s56xb4ggixiq0vxyfxsfk8p20c7a099lpcf60izv1php03hd"; + }; + + checkInputs = [ nose ]; + propagatedBuildInputs = [ decorator ]; + + # 17 failures with 3.6 https://github.com/networkx/networkx/issues/2396#issuecomment-304437299 + doCheck = !(isPy36); + + meta = { + homepage = "https://networkx.github.io/"; + description = "Library for the creation, manipulation, and study of the structure, dynamics, and functions of complex networks"; + license = lib.licenses.bsd3; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d48551b2581..13189b0df90 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20941,31 +20941,7 @@ EOF }; }; - networkx = buildPythonPackage rec { - version = "1.11"; - name = "networkx-${version}"; - - # Currently broken on PyPy. - # https://github.com/networkx/networkx/pull/1361 - disabled = isPyPy; - - src = pkgs.fetchurl { - url = "mirror://pypi/n/networkx/${name}.tar.gz"; - sha256 = "1f74s56xb4ggixiq0vxyfxsfk8p20c7a099lpcf60izv1php03hd"; - }; - - buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [ decorator ]; - - # 17 failures with 3.6 https://github.com/networkx/networkx/issues/2396#issuecomment-304437299 - doCheck = !(isPy36); - - meta = { - homepage = "https://networkx.github.io/"; - description = "Library for the creation, manipulation, and study of the structure, dynamics, and functions of complex networks"; - license = licenses.bsd3; - }; - }; + networkx = callPackage ../development/python-modules/networkx { }; ofxclient = callPackage ../development/python-modules/ofxclient {}; From 8b5c5fb7c5559b4f34e2bcf01b3b819615f81ae8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 1 Jan 2018 16:31:17 +0100 Subject: [PATCH 327/331] python.pkgs.partd: move expression --- .../python-modules/partd/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 25 +------------ 2 files changed, 36 insertions(+), 24 deletions(-) create mode 100644 pkgs/development/python-modules/partd/default.nix diff --git a/pkgs/development/python-modules/partd/default.nix b/pkgs/development/python-modules/partd/default.nix new file mode 100644 index 00000000000..da0ffe07de9 --- /dev/null +++ b/pkgs/development/python-modules/partd/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, locket +, numpy +, pandas +, pyzmq +, toolz +}: + +buildPythonPackage rec { + pname = "partd"; + version = "0.3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "066d254d2dh9xcanffgkjgwxpz5v0059b063bij10fvzl2y49hzx"; + }; + + checkInputs = [ pytest ]; + + propagatedBuildInputs = [ locket numpy pandas pyzmq toolz ]; + + checkPhase = '' + rm partd/tests/test_zmq.py # requires network & fails + py.test + ''; + + meta = { + description = "Appendable key-value storage"; + license = with lib.licenses; [ bsd3 ]; + homepage = https://github.com/dask/partd/; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 13189b0df90..446b2b7f4f0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12656,30 +12656,7 @@ in { parso = callPackage ../development/python-modules/parso { }; - partd = buildPythonPackage rec { - name = "partd-${version}"; - version = "0.3.7"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/partd/${name}.tar.gz"; - sha256 = "066d254d2dh9xcanffgkjgwxpz5v0059b063bij10fvzl2y49hzx"; - }; - - buildInputs = with self; [ pytest ]; - - propagatedBuildInputs = with self; [ locket numpy pandas pyzmq toolz ]; - - checkPhase = '' - rm partd/tests/test_zmq.py # requires network & fails - py.test - ''; - - meta = { - description = "Appendable key-value storage"; - license = with licenses; [ bsd3 ]; - homepage = https://github.com/dask/partd/; - }; - }; + partd = callPackage ../development/python-modules/partd { }; patch = buildPythonPackage rec { name = "${pname}-${version}"; From 24d3457606528b98aa326dcf61555d33c9435f9c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 1 Jan 2018 16:35:10 +0100 Subject: [PATCH 328/331] python.pkgs.partd: 0.3.7 -> 0.3.8 --- pkgs/development/python-modules/partd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/partd/default.nix b/pkgs/development/python-modules/partd/default.nix index da0ffe07de9..1098c550839 100644 --- a/pkgs/development/python-modules/partd/default.nix +++ b/pkgs/development/python-modules/partd/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "partd"; - version = "0.3.7"; + version = "0.3.8"; src = fetchPypi { inherit pname version; - sha256 = "066d254d2dh9xcanffgkjgwxpz5v0059b063bij10fvzl2y49hzx"; + sha256 = "67291f1c4827cde3e0148b3be5d69af64b6d6169feb9ba88f0a6cfe77089400f"; }; checkInputs = [ pytest ]; From 33d1236900e004572b30107d7fea97a223baa3f5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 1 Jan 2018 16:35:26 +0100 Subject: [PATCH 329/331] python.pkgs.blaze: 0.11.0 -> 0.11.3 --- pkgs/development/python-modules/blaze/default.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/blaze/default.nix b/pkgs/development/python-modules/blaze/default.nix index 017b85cacc7..74e327fd342 100644 --- a/pkgs/development/python-modules/blaze/default.nix +++ b/pkgs/development/python-modules/blaze/default.nix @@ -25,12 +25,11 @@ buildPythonPackage rec { pname = "blaze"; - version = "0.11.0"; - name = "${pname}-${version}"; + version = "0.11.3"; src = fetchurl { url = "https://github.com/blaze/blaze/archive/${version}.tar.gz"; - sha256 = "07zrrxkmdqk84xvdmp29859zcfzlpx5pz6g62l28nqp6n6a7yq9a"; + sha256 = "075gqc9d7g284z4nfwv5zbq99ln22w25l4lcndjg3v10kmsjadww"; }; checkInputs = [ pytest ]; @@ -56,13 +55,8 @@ buildPythonPackage rec { toolz ]; - # Failing test - # ERROR collecting blaze/tests/test_interactive.py - # E networkx.exception.NetworkXNoPath: node not - # reachable from - doCheck = false; - checkPhase = '' + rm pytest.ini # Not interested in coverage py.test blaze/tests ''; From a1ab0a6047043f096cc2175eb934e50cbc6fc547 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 1 Jan 2018 16:59:56 +0100 Subject: [PATCH 330/331] python.pkgs.brotlipy: move expression --- .../python-modules/brotlipy/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +------------ 2 files changed, 26 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/brotlipy/default.nix diff --git a/pkgs/development/python-modules/brotlipy/default.nix b/pkgs/development/python-modules/brotlipy/default.nix new file mode 100644 index 00000000000..010b7019777 --- /dev/null +++ b/pkgs/development/python-modules/brotlipy/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cffi +, enum34 +, construct +}: + +buildPythonPackage rec { + pname = "brotlipy"; + version = "0.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "10s2y19zywfkf3sksrw81czhva759aki0clld2pnnlgf64sz7016"; + }; + + propagatedBuildInputs = [ cffi enum34 construct ]; + + meta = { + description = "Python bindings for the reference Brotli encoder/decoder"; + homepage = "https://github.com/python-hyper/brotlipy/"; + license = lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 446b2b7f4f0..af5c82436af 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10501,23 +10501,7 @@ in { mistune = callPackage ../development/python-modules/mistune { }; - brotlipy = buildPythonPackage rec { - name = "brotlipy-${version}"; - version = "0.6.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/b/brotlipy/${name}.tar.gz"; - sha256 = "10s2y19zywfkf3sksrw81czhva759aki0clld2pnnlgf64sz7016"; - }; - - propagatedBuildInputs = with self; [ cffi enum34 construct ]; - - meta = { - description = "Python bindings for the reference Brotli encoder/decoder"; - homepage = "https://github.com/python-hyper/brotlipy/"; - license = licenses.mit; - }; - }; + brotlipy = callPackage ../development/python-modules/brotlipy { }; sortedcontainers = buildPythonPackage rec { name = "sortedcontainers-${version}"; From b998bfa8ba92a049a3ac911fb048c230f9c23991 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 1 Jan 2018 17:00:21 +0100 Subject: [PATCH 331/331] python: brotlipy: 0.6.0 -> 0.7.0 --- .../python-modules/brotlipy/default.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/brotlipy/default.nix b/pkgs/development/python-modules/brotlipy/default.nix index 010b7019777..1dd2a070480 100644 --- a/pkgs/development/python-modules/brotlipy/default.nix +++ b/pkgs/development/python-modules/brotlipy/default.nix @@ -4,19 +4,30 @@ , cffi , enum34 , construct +, pytest +, hypothesis }: buildPythonPackage rec { pname = "brotlipy"; - version = "0.6.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "10s2y19zywfkf3sksrw81czhva759aki0clld2pnnlgf64sz7016"; + sha256 = "36def0b859beaf21910157b4c33eb3b06d8ce459c942102f16988cca6ea164df"; }; propagatedBuildInputs = [ cffi enum34 construct ]; + checkInputs = [ pytest hypothesis ]; + + checkPhase = '' + py.test + ''; + + # Missing test files + doCheck = false; + meta = { description = "Python bindings for the reference Brotli encoder/decoder"; homepage = "https://github.com/python-hyper/brotlipy/";