From 6602f49495c94e8533c8b482698bcf570a8d8933 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 14 Nov 2015 12:32:51 -0800 Subject: Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06"" This reverts commit 741bf840dad05cd1728481045466811ae8ae8281. This reverts the fallout from reverting the major changes. --- .../ruby/bundler-env/default-gem-config.nix | 7 ++++++- pkgs/development/libraries/glpk/default.nix | 4 ++-- pkgs/development/libraries/libdnet/default.nix | 4 ++-- pkgs/development/libraries/libunwind/native.nix | 17 --------------- pkgs/development/libraries/neon/default.nix | 5 +++-- pkgs/development/web/nodejs/default-arch.patch | 24 ++++++++++++++++++++++ pkgs/development/web/nodejs/default.nix | 7 ++++--- pkgs/development/web/nodejs/no-xcode.patch | 21 ------------------- pkgs/development/web/nodejs/pkg-libpath.patch | 13 ++++++++++++ pkgs/development/web/nodejs/v0_10.nix | 2 +- 10 files changed, 55 insertions(+), 49 deletions(-) delete mode 100644 pkgs/development/libraries/libunwind/native.nix create mode 100644 pkgs/development/web/nodejs/default-arch.patch create mode 100644 pkgs/development/web/nodejs/pkg-libpath.patch (limited to 'pkgs/development') diff --git a/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix b/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix index b4e04f6ec904..3ae74057a54f 100644 --- a/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix +++ b/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix @@ -20,7 +20,7 @@ { lib, fetchurl, writeScript, ruby, libxml2, libxslt, python, stdenv, which , libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick , pkgconfig , ncurses, xapian, gpgme, utillinux, fetchpatch, tzdata, icu, libffi -, cmake, libssh2, openssl, mysql +, cmake, libssh2, openssl, mysql, darwin }: let @@ -70,6 +70,7 @@ in "--with-exslt-lib=${libxslt}/lib" "--with-exslt-include=${libxslt}/include" ] ++ lib.optional stdenv.isDarwin "--with-iconv-dir=${libiconv}"; + buildInputs = lib.optional stdenv.isDarwin darwin.libobjc; }; pg = attrs: { @@ -119,6 +120,10 @@ in ''; }; + unf_ext = attrs: { + buildInputs = lib.optional stdenv.isDarwin darwin.libobjc; + }; + xapian-ruby = attrs: { # use the system xapian buildInputs = [ xapian pkgconfig zlib ]; diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix index 2b1a5b571ef0..d4ff7d9603f6 100644 --- a/pkgs/development/libraries/glpk/default.nix +++ b/pkgs/development/libraries/glpk/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "glpk-4.52.1"; + name = "glpk-4.56"; src = fetchurl { url = "mirror://gnu/glpk/${name}.tar.gz"; - sha256 = "0nz9ngmx23c8gbjr8l8ygnfaanxj2mwbl8awpg630bgrkxdnhc9j"; + sha256 = "0syzix6qvpn0fzp08c84c8snansf1cam5vd0dk2w91mz2c85d18h"; }; doCheck = true; diff --git a/pkgs/development/libraries/libdnet/default.nix b/pkgs/development/libraries/libdnet/default.nix index 2bdeffb204d8..8911539d7b02 100644 --- a/pkgs/development/libraries/libdnet/default.nix +++ b/pkgs/development/libraries/libdnet/default.nix @@ -10,10 +10,10 @@ stdenv.mkDerivation { sha1 = "71302be302e84fc19b559e811951b5d600d976f8"; }; - configureFlags = [ "--enable-shared" ]; # shared libs required by hyenae - buildInputs = [ automake autoconf libtool ]; + CFLAGS="-fPIC"; + # .so endings are missing (quick and dirty fix) postInstall = '' for i in $out/lib/*; do diff --git a/pkgs/development/libraries/libunwind/native.nix b/pkgs/development/libraries/libunwind/native.nix deleted file mode 100644 index 6ce485ecaec0..000000000000 --- a/pkgs/development/libraries/libunwind/native.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv }: - -assert stdenv.isDarwin; - -stdenv.mkDerivation { - name = "libunwind-native"; - - unpackPhase = ":"; - dontBuild = true; - - installPhase = '' - mkdir -p $out/lib - cat /usr/lib/system/libunwind.dylib > $out/lib/libunwind.dylib - ''; - - meta.platforms = stdenv.lib.platforms.darwin; -} diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix index ffc409d271e0..0ca64c9bb076 100644 --- a/pkgs/development/libraries/neon/default.nix +++ b/pkgs/development/libraries/neon/default.nix @@ -14,11 +14,12 @@ let in stdenv.mkDerivation rec { - name = "neon-0.29.6"; + version = "0.30.1"; + name = "neon-${version}"; src = fetchurl { url = "http://www.webdav.org/neon/${name}.tar.gz"; - sha256 = "0hzbjqdx1z8zw0vmbknf159wjsxbcq8ii0wgwkqhxj3dimr0nr4w"; + sha256 = "1pawhk02x728xn396a1kcivy9gqm94srmgad6ymr9l0qvk02dih0"; }; patches = optionals stdenv.isDarwin [ ./0.29.6-darwin-fix-configure.patch ]; diff --git a/pkgs/development/web/nodejs/default-arch.patch b/pkgs/development/web/nodejs/default-arch.patch new file mode 100644 index 000000000000..3c7eb1014dee --- /dev/null +++ b/pkgs/development/web/nodejs/default-arch.patch @@ -0,0 +1,24 @@ +diff -Naur a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_emulation.py +--- a/tools/gyp/pylib/gyp/xcode_emulation.py 2014-01-23 06:05:51.000000000 +0100 ++++ b/tools/gyp/pylib/gyp/xcode_emulation.py 2014-02-04 17:49:48.000000000 +0100 +@@ -1018,12 +1033,16 @@ + # Since the value returned by this function is only used when ARCHS is not + # set, then on iOS we return "i386", as the default xcode project generator + # does not set ARCHS if it is not set in the .gyp file. +- if self.isIOS: ++ ++ try: ++ if self.isIOS: ++ return 'i386' ++ version, build = self._XcodeVersion() ++ if version >= '0500': ++ return 'x86_64' + return 'i386' +- version, build = self._XcodeVersion() +- if version >= '0500': ++ except: + return 'x86_64' +- return 'i386' + + class MacPrefixHeader(object): + """A class that helps with emulating Xcode's GCC_PREFIX_HEADER feature. diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index 1bd8dbec1e6c..2a4a7244d4d6 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -38,12 +38,13 @@ in stdenv.mkDerivation { dontDisableStatic = true; prePatch = '' patchShebangs . + sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' tools/gyp/pylib/gyp/xcode_emulation.py ''; - patches = stdenv.lib.optional stdenv.isDarwin ./no-xcode.patch; + patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode.patch ./pkg-libpath.patch ]; - buildInputs = [ python which http-parser zlib libuv openssl python ] - ++ (optional stdenv.isLinux utillinux) + buildInputs = [ python which zlib libuv openssl python ] + ++ optionals stdenv.isLinux [ utillinux http-parser ] ++ optionals stdenv.isDarwin [ pkgconfig openssl libtool ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/web/nodejs/no-xcode.patch b/pkgs/development/web/nodejs/no-xcode.patch index e88168b68a77..244a55e9aebb 100644 --- a/pkgs/development/web/nodejs/no-xcode.patch +++ b/pkgs/development/web/nodejs/no-xcode.patch @@ -70,24 +70,3 @@ diff -Naur a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_ def AdjustLibraries(self, libraries, config_name=None): """Transforms entries like 'Cocoa.framework' in libraries into entries like -@@ -1018,12 +1033,16 @@ - # Since the value returned by this function is only used when ARCHS is not - # set, then on iOS we return "i386", as the default xcode project generator - # does not set ARCHS if it is not set in the .gyp file. -- if self.isIOS: -+ -+ try: -+ if self.isIOS: -+ return 'i386' -+ version, build = self._XcodeVersion() -+ if version >= '0500': -+ return 'x86_64' - return 'i386' -- version, build = self._XcodeVersion() -- if version >= '0500': -+ except: - return 'x86_64' -- return 'i386' - - class MacPrefixHeader(object): - """A class that helps with emulating Xcode's GCC_PREFIX_HEADER feature. diff --git a/pkgs/development/web/nodejs/pkg-libpath.patch b/pkgs/development/web/nodejs/pkg-libpath.patch new file mode 100644 index 000000000000..8ad94c0e3e2f --- /dev/null +++ b/pkgs/development/web/nodejs/pkg-libpath.patch @@ -0,0 +1,13 @@ +diff --git a/configure b/configure +index d199975..66d903b 100755 +--- a/configure ++++ b/configure +@@ -734,7 +734,7 @@ def configure_library(lib, output): + # libpath needs to be provided ahead libraries + if pkg_libpath: + output['libraries'] += ( +- filter(None, map(str.strip, pkg_cflags.split('-L')))) ++ pkg_libpath.split()) + + default_libs = getattr(options, shared_lib + '_libname') + default_libs = map('-l{0}'.format, default_libs.split(',')) diff --git a/pkgs/development/web/nodejs/v0_10.nix b/pkgs/development/web/nodejs/v0_10.nix index 838f1419f2cc..a5ee621de34a 100644 --- a/pkgs/development/web/nodejs/v0_10.nix +++ b/pkgs/development/web/nodejs/v0_10.nix @@ -42,7 +42,7 @@ in stdenv.mkDerivation { patchShebangs . ''; - patches = stdenv.lib.optional stdenv.isDarwin ./no-xcode.patch; + patches = stdenv.lib.optionals stdenv.isDarwin [ ./default-arch.patch ./no-xcode.patch ]; postPatch = stdenv.lib.optionalString stdenv.isDarwin '' (cd tools/gyp; patch -Np1 -i ${../../python-modules/gyp/no-darwin-cflags.patch}) -- cgit 1.4.1