diff options
Diffstat (limited to 'pkgs/development')
69 files changed, 598 insertions, 343 deletions
diff --git a/pkgs/development/compilers/epic/default.nix b/pkgs/development/compilers/epic/default.nix index 33087f23c9ae2..9060d313be5ad 100644 --- a/pkgs/development/compilers/epic/default.nix +++ b/pkgs/development/compilers/epic/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "epic"; - version = "0.9.2"; - sha256 = "1irvfk8xf627bfzsgbqa56816jkc99rrxpml9ycg2grq7razp9fw"; + version = "0.9.3"; + sha256 = "1x8y3ljha8r52pw83mjfv5i49dq0b7i1xbxg8j9hlvr2vwfa4237"; isLibrary = true; isExecutable = true; buildDepends = [ Cabal mtl ]; diff --git a/pkgs/development/compilers/gcc-4.6/default.nix b/pkgs/development/compilers/gcc-4.6/default.nix index 4a3689776330a..7160f530a0981 100644 --- a/pkgs/development/compilers/gcc-4.6/default.nix +++ b/pkgs/development/compilers/gcc-4.6/default.nix @@ -223,7 +223,7 @@ stdenv.mkDerivation ({ ++ (optional (cloog != null) cloog) ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) - ++ (optionals javaAwtGtk [ gtk libart_lgpl ] ++ xlibs) + ++ (optionals javaAwtGtk ([ gtk libart_lgpl ] ++ xlibs)) ++ (optionals (cross != null) [binutilsCross]) ++ (optionals langAda [gnatboot]) ++ (optionals langVhdl [gnat]) diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix index e030fee765836..f0fd33e439f05 100644 --- a/pkgs/development/compilers/idris/default.nix +++ b/pkgs/development/compilers/idris/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "idris"; - version = "0.9.1"; - sha256 = "1yvw15750mqrvq1kd7bsk3ldq3s0z947c4f93pv7008gq5im4cvr"; + version = "0.9.2"; + sha256 = "0n4dh3vxkjvw8rb5iqm8lvi21q2ljw2pzn453wfcisdadkpv4fh5"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix index 06f1d74382eec..d6b7d70100bf4 100644 --- a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix +++ b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { installPhase = '' for b in cgc cgfxcat cginfo do - patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-*.so.? "bin/$b" + patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux*.so.? "bin/$b" done # FIXME: cgfxcat and cginfo need more patchelf ensureDir "$out/bin/" @@ -33,10 +33,9 @@ stdenv.mkDerivation rec { ensureDir "$out/include/" cp -v -r include/Cg/ "$out/include/" ensureDir "$out/lib/" - [ "$system" = "x86_64-linux" ] && cp -v lib64/* "$out/lib/" - [ "$system" = "i686-linux" ] && cp -v lib/* "$out/lib/" - for mandir in man1 man3 \ - ${if stdenv.system == "x86_64-linux" then "manCg" else ""} manCgFX + [ "$system" == "x86_64-linux" ] && cp -v lib64/* "$out/lib/" + [ "$system" == "i686-linux" ] && cp -v lib/* "$out/lib/" + for mandir in man1 man3 manCg manCgFX do ensureDir "$out/share/man/$mandir/" cp -v share/man/$mandir/* "$out/share/man/$mandir/" diff --git a/pkgs/development/interpreters/angelscript/default.nix b/pkgs/development/interpreters/angelscript/default.nix index 65ff72bae56f8..fa53071d306af 100644 --- a/pkgs/development/interpreters/angelscript/default.nix +++ b/pkgs/development/interpreters/angelscript/default.nix @@ -11,10 +11,10 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="angelscript"; - version="2.20.2"; + version="2.22.1"; name="${baseName}-${version}"; url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip"; - hash="0s5d6av27dl6kxkzns011zwznj7r8zy5ypfhl6x9r1kzaqdkqz2a"; + hash="0fmw0cb7ymgyq31r4cfvsn4k86r20hj650fbzs9i7zl0p3lb6hpm"; }; in rec { diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix deleted file mode 100644 index 550edcc004aa1..0000000000000 --- a/pkgs/development/interpreters/ruby/default.nix +++ /dev/null @@ -1 +0,0 @@ -import ./ruby-19.nix diff --git a/pkgs/development/interpreters/ruby/gem.nix b/pkgs/development/interpreters/ruby/gem.nix index a64f10e268ccd..8ec80b785de0a 100644 --- a/pkgs/development/interpreters/ruby/gem.nix +++ b/pkgs/development/interpreters/ruby/gem.nix @@ -31,7 +31,8 @@ let wrapProgram "$prog" \ --prefix GEM_PATH : "$GEM_PATH" \ --prefix RUBYLIB : "${rubygems}/lib" \ - --set RUBYOPT 'rubygems' + --set RUBYOPT rubygems \ + $extraWrapperFlags ''${extraWrapperFlagsArray[@]} done for prog in $out/gems/*/bin/*; do diff --git a/pkgs/development/interpreters/ruby/patches.nix b/pkgs/development/interpreters/ruby/patches.nix index 37f103f7772d4..a2d2d753a4af8 100644 --- a/pkgs/development/interpreters/ruby/patches.nix +++ b/pkgs/development/interpreters/ruby/patches.nix @@ -61,4 +61,11 @@ in buildInputs = [ jdk ]; JAVA_HOME = jdk; }; + + buildr = { + # Many Buildfiles rely on RUBYLIB containing the current directory + # (as was the default in Ruby < 1.9.2). + extraWrapperFlags = "--prefix RUBYLIB : ."; + }; + } diff --git a/pkgs/development/libraries/boost/1.49.nix b/pkgs/development/libraries/boost/1.49.nix new file mode 100644 index 0000000000000..a86670927aad7 --- /dev/null +++ b/pkgs/development/libraries/boost/1.49.nix @@ -0,0 +1,91 @@ +{ stdenv, fetchurl, icu, expat, zlib, bzip2, python +, enableRelease ? true +, enableDebug ? false +, enableSingleThreaded ? false +, enableMultiThreaded ? true +, enableShared ? true +, enableStatic ? false +, enablePIC ? false +, enableExceptions ? false +}: + +let + + variant = stdenv.lib.concatStringsSep "," + (stdenv.lib.optional enableRelease "release" ++ + stdenv.lib.optional enableDebug "debug"); + + threading = stdenv.lib.concatStringsSep "," + (stdenv.lib.optional enableSingleThreaded "single" ++ + stdenv.lib.optional enableMultiThreaded "multi"); + + link = stdenv.lib.concatStringsSep "," + (stdenv.lib.optional enableShared "shared" ++ + stdenv.lib.optional enableStatic "static"); + + # To avoid library name collisions + finalLayout = if ((enableRelease && enableDebug) || + (enableSingleThreaded && enableMultiThreaded) || + (enableShared && enableStatic)) 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 + ""; +in + +stdenv.mkDerivation { + name = "boost-1.49.0"; + + meta = { + homepage = "http://boost.org/"; + description = "Boost C++ Library Collection"; + license = "boost-license"; + + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; + + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_49_0.tar.bz2"; + sha256 = "0g0d33942rm073jgqqvj3znm3rk45b2y2lplfjpyg9q7amzqlx6x"; + }; + + # See <http://svn.boost.org/trac/boost/ticket/4688>. + patches = [ ./boost_filesystem_post_1_49_0.patch ]; + + enableParallelBuilding = true; + + buildInputs = [icu expat zlib bzip2 python]; + + configureScript = "./bootstrap.sh"; + configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python"; + + buildPhase = "./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${finalLayout} variant=${variant} threading=${threading} link=${link} ${cflags} install"; + + installPhase = ":"; + + crossAttrs = rec { + buildInputs = [ expat.hostDrv zlib.hostDrv bzip2.hostDrv ]; + # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to + # override them. + propagatedBuildInputs = buildInputs; + # We want to substitute the contents of configureFlags, removing thus the + # usual --build and --host added on cross building. + preConfigure = '' + export configureFlags="--prefix=$out --without-icu" + ''; + buildPhase = '' + set -x + cat << EOF > user-config.jam + using gcc : cross : $crossConfig-g++ ; + EOF + ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.hostDrv}/include -sEXPAT_LIBPATH=${expat.hostDrv}/lib --layout=${finalLayout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install + ''; + }; +} diff --git a/pkgs/development/libraries/boost/boost_filesystem_post_1_49_0.patch b/pkgs/development/libraries/boost/boost_filesystem_post_1_49_0.patch new file mode 100644 index 0000000000000..334533d98a65c --- /dev/null +++ b/pkgs/development/libraries/boost/boost_filesystem_post_1_49_0.patch @@ -0,0 +1,12 @@ +diff -ubr boost_1_49_0/libs/filesystem/v2/src/v2_path.cpp boost_1_49_0-patched/libs/filesystem/v2/src/v2_path.cpp +--- boost_1_49_0/libs/filesystem/v2/src/v2_path.cpp 2011-01-11 22:39:33.000000000 +0100 ++++ boost_1_49_0-patched/libs/filesystem/v2/src/v2_path.cpp 2012-02-25 20:00:33.628767485 +0100 +@@ -45,7 +45,7 @@ + { + #if !defined(macintosh) && !defined(__APPLE__) && !defined(__APPLE_CC__) + // ISO C calls this "the locale-specific native environment": +- static std::locale lc(""); ++ static std::locale lc; + #else // Mac OS + // "All BSD system functions expect their string parameters to be in UTF-8 encoding + // and nothing else." diff --git a/pkgs/development/libraries/caelum/default.nix b/pkgs/development/libraries/caelum/default.nix new file mode 100644 index 0000000000000..75eb5109b4531 --- /dev/null +++ b/pkgs/development/libraries/caelum/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, cmake, pkgconfig, ois, ogre, boost }: + +stdenv.mkDerivation rec { + name = "caelum-0.6.1"; + + src = fetchurl { + url = "http://caelum.googlecode.com/files/${name}.tar.gz"; + sha256 = "1j995q1a88cikqrxdqsrwzm2asid51xbmkl7vn1grfrdadb15303"; + }; + + buildInputs = [ ois ogre boost ]; + buildNativeInputs = [ cmake pkgconfig ]; + + enableParallelBuilding = true; + + meta = { + description = "Add-on for the OGRE, aimed to render atmospheric effects"; + homepage = http://code.google.com/p/caelum/; + license = "LGPLv2.1+"; + }; +} diff --git a/pkgs/development/libraries/glibc-2.12/common.nix b/pkgs/development/libraries/glibc-2.12/common.nix index 8f0c092d35caa..6a68077ab348b 100644 --- a/pkgs/development/libraries/glibc-2.12/common.nix +++ b/pkgs/development/libraries/glibc-2.12/common.nix @@ -12,7 +12,7 @@ cross : let # For GNU/Hurd, see below. - version = if hurdHeaders != null then "20120221" else "2.12.2"; + version = if hurdHeaders != null then "20120223" else "2.12.2"; needsPortsNative = stdenv.isMips || stdenv.isArm; needsPortsCross = cross.arch == "mips" || cross.arch == "arm"; @@ -75,8 +75,7 @@ stdenv.mkDerivation ({ /* Allow nixos and nix handle the locale-archive. */ ./nix-locale-archive.patch - ] - ++ (stdenv.lib.optional (hurdHeaders != null) ./hurd-sigstate-functions.patch); + ]; postPatch = '' # Needed for glibc to build with the gnumake 3.82 @@ -144,8 +143,8 @@ stdenv.mkDerivation ({ # maintained by the Hurd folks, `tschwinge/Roger_Whittaker' branch. # See <http://www.gnu.org/software/hurd/source_repositories/glibc.html>. url = "git://git.sv.gnu.org/hurd/glibc.git"; - sha256 = "fbc053f23167059af414ae1ba9a65931a9d9afaf7d2efb9eba3e258757d12f7d"; - rev = "b29b3d0ae35be390cab59e4798cbaf9b45fb06e3"; + sha256 = "cecec9dd5a2bafc875c56b058b6d7628a22b250b53747513dec304f31ffdb82d"; + rev = "d3cdecf18e6550b0984a42b43ed48c5fb26501e1"; } else fetchurl { url = "mirror://gnu/glibc/glibc-${version}.tar.bz2"; diff --git a/pkgs/development/libraries/glibc-2.12/hurd-sigstate-functions.patch b/pkgs/development/libraries/glibc-2.12/hurd-sigstate-functions.patch deleted file mode 100644 index d46db7b6393de..0000000000000 --- a/pkgs/development/libraries/glibc-2.12/hurd-sigstate-functions.patch +++ /dev/null @@ -1,20 +0,0 @@ -This patch adds a GNU ld version script entry for the `_hurd_sigstate_*' -functions that were introduced to support SA_SIGINFO. A similar patch -should be applied upstream soon. - -diff --git a/hurd/Versions b/hurd/Versions -index 83c8ab1..295cfda 100644 ---- a/hurd/Versions -+++ b/hurd/Versions -@@ -156,6 +156,11 @@ libc { - # functions used in macros & inline functions - __errno_location; - } -+ GLIBC_2.13 { -+ # functions introduced for SA_SIGINFO support and referenced from -+ # <hurd/signal.h> -+ _hurd_sigstate_*; -+ } - - %if !SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2) - HURD_CTHREADS_0.3 { diff --git a/pkgs/development/libraries/haskell/HSH/default.nix b/pkgs/development/libraries/haskell/HSH/default.nix new file mode 100644 index 0000000000000..ad6ee08bffdff --- /dev/null +++ b/pkgs/development/libraries/haskell/HSH/default.nix @@ -0,0 +1,24 @@ +{ cabal, filepath, hslogger, MissingH, mtl, regexBase, regexCompat +, regexPosix +}: + +cabal.mkDerivation (self: { + pname = "HSH"; + version = "2.0.4"; + sha256 = "1ddpazmk82716hqd1riqs7vnl4aildgwkjgk80iam49df9p5b8v8"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + filepath hslogger MissingH mtl regexBase regexCompat regexPosix + ]; + meta = { + homepage = "http://software.complete.org/hsh"; + description = "Library to mix shell scripting with Haskell programs"; + license = "LGPL"; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/IfElse/default.nix b/pkgs/development/libraries/haskell/IfElse/default.nix new file mode 100644 index 0000000000000..632de1f30e5b5 --- /dev/null +++ b/pkgs/development/libraries/haskell/IfElse/default.nix @@ -0,0 +1,17 @@ +{ cabal, mtl }: + +cabal.mkDerivation (self: { + pname = "IfElse"; + version = "0.85"; + sha256 = "1kfx1bwfjczj93a8yqz1n8snqiq5655qgzwv1lrycry8wb1vzlwa"; + buildDepends = [ mtl ]; + meta = { + description = "Anaphoric and miscellaneous useful control-flow"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix index 9a17ef1356303..9f58a5af7488e 100644 --- a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix +++ b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "attoparsec-conduit"; - version = "0.2.0"; - sha256 = "11jcsqyqc33xn980rac7fmdgj99dg4bp75b5whqzpnr67ginjjv9"; + version = "0.2.0.1"; + sha256 = "1jxb2zanfmfqdmd5q770r4yz2s0giky9ify6fcsjwc8wiah4aji1"; buildDepends = [ attoparsec conduit text transformers ]; meta = { homepage = "http://github.com/snoyberg/conduit"; diff --git a/pkgs/development/libraries/haskell/authenticate/default.nix b/pkgs/development/libraries/haskell/authenticate/default.nix index 8818aa2d9727a..6aa1e4498402a 100644 --- a/pkgs/development/libraries/haskell/authenticate/default.nix +++ b/pkgs/development/libraries/haskell/authenticate/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "authenticate"; - version = "1.0.0"; - sha256 = "0a163dhi69gh6zmi43jidxlaknbk1y0frjlwijdf7fp073rh0p87"; + version = "1.0.0.1"; + sha256 = "0wrbr7kwd4g8idd6i4ghvpd5q7nq0b8zx5qphqvkbs128m0r308d"; buildDepends = [ aeson attoparsec blazeBuilder blazeBuilderConduit caseInsensitive conduit httpConduit httpTypes network tagsoup text transformers diff --git a/pkgs/development/libraries/haskell/base64-bytestring/0.1.0.3.nix b/pkgs/development/libraries/haskell/base64-bytestring/0.1.0.3.nix new file mode 100644 index 0000000000000..f974a72347fd3 --- /dev/null +++ b/pkgs/development/libraries/haskell/base64-bytestring/0.1.0.3.nix @@ -0,0 +1,17 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "base64-bytestring"; + version = "0.1.0.3"; + sha256 = "0d4j8b1d8z9qr1y446bfkj764xgilk8gw2frj0wn0717y8knvmx3"; + meta = { + homepage = "https://github.com/bos/base64-bytestring"; + description = "Fast base64 encoding and deconding for ByteStrings"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/base64-bytestring/default.nix b/pkgs/development/libraries/haskell/base64-bytestring/0.1.1.0.nix index 304889991f054..304889991f054 100644 --- a/pkgs/development/libraries/haskell/base64-bytestring/default.nix +++ b/pkgs/development/libraries/haskell/base64-bytestring/0.1.1.0.nix diff --git a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix index da3bd570e05d2..ff6f7429c799f 100644 --- a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix +++ b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "blaze-builder-conduit"; - version = "0.2.0"; - sha256 = "13fcxmzw4xz7y271vdf6w6fj6isninjcxnm7h7gbk4yf31wx831r"; + version = "0.2.0.1"; + sha256 = "0p6kq43avsf21biskjardv7k47bag16ki2gmwjpk8ram9mwlz0zg"; buildDepends = [ blazeBuilder conduit text transformers ]; meta = { homepage = "http://github.com/snoyberg/conduit"; diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix index a59b3b9ef0e42..d4a770d34b74e 100644 --- a/pkgs/development/libraries/haskell/clientsession/default.nix +++ b/pkgs/development/libraries/haskell/clientsession/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "clientsession"; - version = "0.7.4"; - sha256 = "050mg3rzyld4v2b9v1pc1q563sp7sffiapvr8ks8f46ibl17lvss"; + version = "0.7.4.1"; + sha256 = "1fnrngbx86zcvh0ybv7ans132d216ayxdzlgw0x4qh0sw9r3w2ip"; buildDepends = [ base64Bytestring cereal cprngAes cryptoApi cryptocipher entropy skein tagged diff --git a/pkgs/development/libraries/haskell/containers-deepseq/default.nix b/pkgs/development/libraries/haskell/containers-deepseq/default.nix deleted file mode 100644 index 1e7630a93e8cb..0000000000000 --- a/pkgs/development/libraries/haskell/containers-deepseq/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ cabal, deepseq }: - -cabal.mkDerivation (self: { - pname = "containers-deepseq"; - version = "0.1.0.1"; - sha256 = "0l9d7hj66fygpsbjw6wy4l11c9cw739lvkrypapwihav7jzva541"; - buildDepends = [ deepseq ]; - meta = { - description = "Provide orphan NFData instances for containers as needed. (deprecated)"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/control-monad-attempt/default.nix b/pkgs/development/libraries/haskell/control-monad-attempt/default.nix deleted file mode 100644 index 0450373e8c652..0000000000000 --- a/pkgs/development/libraries/haskell/control-monad-attempt/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ cabal, attempt, transformers }: - -cabal.mkDerivation (self: { - pname = "control-monad-attempt"; - version = "0.3.0.1"; - sha256 = "140n27vdbyjz5qycrwlrmyd7s48fxcl6msl16g7czg40k5y23j5s"; - buildDepends = [ attempt transformers ]; - meta = { - homepage = "http://github.com/snoyberg/control-monad-attempt"; - description = "Monad transformer for attempt. (deprecated)"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/convertible/default.nix b/pkgs/development/libraries/haskell/convertible/default.nix index 5497500c0a86d..a3fa0208e2d07 100644 --- a/pkgs/development/libraries/haskell/convertible/default.nix +++ b/pkgs/development/libraries/haskell/convertible/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "convertible"; - version = "1.0.11.0"; - sha256 = "0qkz760ddshmglmrf47a01978c9zhxfss44b6vmfkwwfcjb7da2b"; + version = "1.0.11.1"; + sha256 = "1r50a2rpfsx0s7dv8ww5xck33b1mhy73gfilffrbqd4hxjgnxlj6"; isLibrary = true; isExecutable = true; buildDepends = [ mtl text time ]; diff --git a/pkgs/development/libraries/haskell/data-object-yaml/default.nix b/pkgs/development/libraries/haskell/data-object-yaml/default.nix deleted file mode 100644 index 54c2a05f8f14f..0000000000000 --- a/pkgs/development/libraries/haskell/data-object-yaml/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ cabal, conduit, convertibleText, dataObject, failure, text -, transformers, yaml -}: - -cabal.mkDerivation (self: { - pname = "data-object-yaml"; - version = "0.3.4.2"; - sha256 = "18a9r4wfpb7icjb6nji9iy3abq6sxafmsnfwqpnm1nn2nn3fm1ap"; - isLibrary = true; - isExecutable = true; - buildDepends = [ - conduit convertibleText dataObject failure text transformers yaml - ]; - meta = { - homepage = "http://github.com/snoyberg/data-object-yaml"; - description = "Serialize data to and from Yaml files (deprecated)"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix index db4412238437d..0abd073c51c06 100644 --- a/pkgs/development/libraries/haskell/filestore/default.nix +++ b/pkgs/development/libraries/haskell/filestore/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "filestore"; - version = "0.4.0.4"; - sha256 = "14rp2689gjnk9pqk2xv4m3q3icgfvbik32c2d6gx4l2y7n78dsbx"; + version = "0.4.1"; + sha256 = "02ki6b4rbmk463qmmqia7igkrsr7h1kxal94k6pikkikylx2f8r7"; buildDepends = [ Diff filepath parsec split time utf8String xml ]; meta = { homepage = "http://johnmacfarlane.net/repos/filestore"; diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix index 65aab04f9147d..b9fc9fa3ae9c7 100644 --- a/pkgs/development/libraries/haskell/gitit/default.nix +++ b/pkgs/development/libraries/haskell/gitit/default.nix @@ -1,21 +1,22 @@ -{ cabal, cgi, ConfigFile, feed, filepath, filestore, ghcPaths -, happstackServer, happstackUtil, highlightingKate, hslogger -, HStringTemplate, HTTP, json, mtl, network, pandoc, pandocTypes -, parsec, random, recaptcha, safe, SHA, syb, text, time, url -, utf8String, xhtml, xml, xssSanitize, zlib +{ cabal, blazeHtml, cgi, ConfigFile, feed, filepath, filestore +, ghcPaths, happstackServer, happstackUtil, highlightingKate +, hslogger, HStringTemplate, HTTP, json, mtl, network, pandoc +, pandocTypes, parsec, random, recaptcha, safe, SHA, syb, tagsoup +, text, time, url, utf8String, xhtml, xml, xssSanitize, zlib }: cabal.mkDerivation (self: { pname = "gitit"; - version = "0.8.1"; - sha256 = "1b5i6fm68vwhlvgz0m7xxzklkxc2c6lrqyqfqyjs93p5j0aqgvfn"; + version = "0.9"; + sha256 = "00kjfmczj5m3b8r8djdpad8d27s44z7pf76yyc0sdja1f3bd4mlp"; isLibrary = true; isExecutable = true; buildDepends = [ - cgi ConfigFile feed filepath filestore ghcPaths happstackServer - happstackUtil highlightingKate hslogger HStringTemplate HTTP json - mtl network pandoc pandocTypes parsec random recaptcha safe SHA syb - text time url utf8String xhtml xml xssSanitize zlib + blazeHtml cgi ConfigFile feed filepath filestore ghcPaths + happstackServer happstackUtil highlightingKate hslogger + HStringTemplate HTTP json mtl network pandoc pandocTypes parsec + random recaptcha safe SHA syb tagsoup text time url utf8String + xhtml xml xssSanitize zlib ]; meta = { homepage = "http://gitit.net"; diff --git a/pkgs/development/libraries/haskell/hxt/default.nix b/pkgs/development/libraries/haskell/hxt/default.nix index cc1827ac34253..0e1668a58183b 100644 --- a/pkgs/development/libraries/haskell/hxt/default.nix +++ b/pkgs/development/libraries/haskell/hxt/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hxt"; - version = "9.2.1"; - sha256 = "0172icb36wx4fb6q3xq7pcs85d2hnn4bznq3wjwhval10mayri8y"; + version = "9.2.2"; + sha256 = "0ichjpshq10b11dyfv1q7rs2m190x3gplx6k54amlxv45nwd1s6r"; buildDepends = [ binary deepseq filepath HUnit hxtCharproperties hxtRegexXmlschema hxtUnicode mtl network parsec diff --git a/pkgs/development/libraries/haskell/jsonEnumerator/default.nix b/pkgs/development/libraries/haskell/jsonEnumerator/default.nix deleted file mode 100644 index 1e4629166fad9..0000000000000 --- a/pkgs/development/libraries/haskell/jsonEnumerator/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ cabal, blazeBuilder, blazeBuilderEnumerator, enumerator -, jsonTypes, text, transformers -}: - -cabal.mkDerivation (self: { - pname = "json-enumerator"; - version = "0.0.1.2"; - sha256 = "08gwrm15pvvhhrkrncy6wr4fi5v55fdhc8byfrw5zd62hmx8xm9d"; - buildDepends = [ - blazeBuilder blazeBuilderEnumerator enumerator jsonTypes text - transformers - ]; - meta = { - homepage = "http://github.com/snoyberg/json-enumerator"; - description = "Pure-Haskell utilities for dealing with JSON with the enumerator package. (deprecated)"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/data-object/default.nix b/pkgs/development/libraries/haskell/monads-tf/default.nix index c1b12ab038fb9..d61922dc508a3 100644 --- a/pkgs/development/libraries/haskell/data-object/default.nix +++ b/pkgs/development/libraries/haskell/monads-tf/default.nix @@ -1,13 +1,12 @@ -{ cabal, failure, text, time }: +{ cabal, transformers }: cabal.mkDerivation (self: { - pname = "data-object"; - version = "0.3.1.9"; - sha256 = "0z8m23kw8mj6hhy1r8y1vvlxxpwl273dhanszig2673a1sw0l98l"; - buildDepends = [ failure text time ]; + pname = "monads-tf"; + version = "0.1.0.0"; + sha256 = "1d38rddm9h8crs96zhzj87a3ygix0ipyxy0qcyas88k60fgavg5i"; + buildDepends = [ transformers ]; meta = { - homepage = "http://github.com/snoyberg/data-object/tree/master"; - description = "Represent hierachichal structures, called objects in JSON. (deprecated)"; + description = "Monad classes, using type families"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ diff --git a/pkgs/development/libraries/haskell/neither/default.nix b/pkgs/development/libraries/haskell/neither/default.nix deleted file mode 100644 index e5b3e6a8c487f..0000000000000 --- a/pkgs/development/libraries/haskell/neither/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ cabal, failure, transformers }: - -cabal.mkDerivation (self: { - pname = "neither"; - version = "0.3.1"; - sha256 = "1n00v2xs2ghm273barc3bbi67wgpvyihhgl1ij7qczyp9fhqlyfk"; - buildDepends = [ failure transformers ]; - meta = { - homepage = "http://github.com/snoyberg/neither"; - description = "Provide versions of Either with good monad and applicative instances. (deprecated)"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/pandoc-types/default.nix b/pkgs/development/libraries/haskell/pandoc-types/default.nix index 063fe6f45c564..b55c214bb7525 100644 --- a/pkgs/development/libraries/haskell/pandoc-types/default.nix +++ b/pkgs/development/libraries/haskell/pandoc-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "pandoc-types"; - version = "1.9.0.2"; - sha256 = "1rqqchxinjk3njgkp73i92q4iz1cl84p56i2fmgj2zn221r0zhyl"; + version = "1.9.1"; + sha256 = "1174nkaig0g71n3kqrhgqn7xmr9rni3l3dh1xpypc0ksjm0ym21i"; buildDepends = [ syb ]; meta = { homepage = "http://johnmacfarlane.net/pandoc"; diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index 51fdacfcf2b37..d498aa6edd0a1 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "persistent"; - version = "0.8.0"; - sha256 = "0z70ibicfbfripp1x9csfvfhn7k26j78jvvig9ylsjwldhysr7qr"; + version = "0.8.0.1"; + sha256 = "1lsmsx0zxa3h83z29r6h3r94czg7c8apid9mah48f8hxlfynbqhi"; buildDepends = [ aeson attoparsec base64Bytestring blazeHtml conduit liftedBase monadControl mtl pathPieces poolConduit text time transformers diff --git a/pkgs/development/libraries/haskell/pool/default.nix b/pkgs/development/libraries/haskell/pool/default.nix deleted file mode 100644 index fb417a3faf2ed..0000000000000 --- a/pkgs/development/libraries/haskell/pool/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ cabal, monadControl, transformers }: - -cabal.mkDerivation (self: { - pname = "pool"; - version = "0.1.2.1"; - sha256 = "1fwwnwxk3kprr2z9y7bwa1qwxfkzwcb2n5l6vkq1c5s8gjls581c"; - buildDepends = [ monadControl transformers ]; - meta = { - homepage = "http://www.yesodweb.com/book/persistent"; - description = "Thread-safe resource pools. (deprecated)"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/stm/2.3.nix b/pkgs/development/libraries/haskell/stm/2.3.nix new file mode 100644 index 0000000000000..7057ede7052e3 --- /dev/null +++ b/pkgs/development/libraries/haskell/stm/2.3.nix @@ -0,0 +1,16 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "stm"; + version = "2.3"; + sha256 = "1321l1qkmvnqdw73i21jnh2b8c1iw1mxjbp23hmqdvljjb9mlzsm"; + meta = { + description = "Software Transactional Memory"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/testpack/default.nix b/pkgs/development/libraries/haskell/testpack/default.nix index 35b619166a4f5..bb729ef312014 100644 --- a/pkgs/development/libraries/haskell/testpack/default.nix +++ b/pkgs/development/libraries/haskell/testpack/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "testpack"; - version = "2.1.1"; - sha256 = "1z8g3xhvy901h7kr7q4wcms5b23xniskrgxfpq42w4b34acwvhmg"; + version = "2.1.2"; + sha256 = "12dhl8svy0wmdwlvkp0p0j6wr6vgv4hrjcpdv48kc5rcwjvh8xif"; buildDepends = [ HUnit mtl QuickCheck random ]; meta = { homepage = "http://hackage.haskell.org/cgi-bin/hackage-scripts/package/testpack"; diff --git a/pkgs/development/libraries/haskell/utility-ht/default.nix b/pkgs/development/libraries/haskell/utility-ht/default.nix index 6b79e4cdda84e..9a90eb5dd9f80 100644 --- a/pkgs/development/libraries/haskell/utility-ht/default.nix +++ b/pkgs/development/libraries/haskell/utility-ht/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "utility-ht"; - version = "0.0.7.1"; - sha256 = "0k097kyv6rxjvg1drnphv2mg882xx2lk098hs557fcsr16w658ma"; + version = "0.0.8"; + sha256 = "02sm1xj5xa65hpkvl2yk89d9dlg3c2ap8qcviq9zj10asmsbzyd8"; meta = { description = "Various small helper functions for Lists, Maybes, Tuples, Functions"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index e7197e293f2a2..79baedeb23914 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "wai-app-static"; - version = "1.1.1"; - sha256 = "0i73rxgmng7grs8cgxw8769jg0cvpsb5gi4s0iwrdyh3xd1vj7iy"; + version = "1.1.2"; + sha256 = "1nvzqg3wk7i2p1kcpb9f9wdzbrfl6gxid44l94mmvc7xjcmdl6qw"; buildDepends = [ base64Bytestring blazeBuilder blazeHtml cryptohash fileEmbed httpDate httpTypes text time transformers unixCompat wai diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index e0a3687858240..734e8a6fe1c81 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -1,16 +1,16 @@ -{ cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive -, conduit, dataDefault, fastLogger, httpTypes, network, text, time -, transformers, wai, zlibConduit +{ cabal, ansiTerminal, blazeBuilder, blazeBuilderConduit +, caseInsensitive, conduit, dataDefault, fastLogger, httpTypes +, network, text, time, transformers, wai, zlibConduit }: cabal.mkDerivation (self: { pname = "wai-extra"; - version = "1.1.0"; - sha256 = "1mj2swb2bgsay9prpw6h0wmwsqyan53ndyczmhppdax4y5088f55"; + version = "1.1.0.1"; + sha256 = "0kavvbywkkwj9914y622wsziwfca9qjaqz798mjhl1ip5bfy73b0"; buildDepends = [ - blazeBuilder blazeBuilderConduit caseInsensitive conduit - dataDefault fastLogger httpTypes network text time transformers wai - zlibConduit + ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive + conduit dataDefault fastLogger httpTypes network text time + transformers wai zlibConduit ]; meta = { homepage = "http://github.com/yesodweb/wai"; diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix index f1d4210b667ea..4fb6227d2e8cf 100644 --- a/pkgs/development/libraries/haskell/wai/default.nix +++ b/pkgs/development/libraries/haskell/wai/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "wai"; - version = "1.1.0"; - sha256 = "1kmmivcak9v13rgivs2vhr543dfdx19wncwlpda453570ywam7vh"; + version = "1.1.0.1"; + sha256 = "0klyi3d4rivgvbasamxccvkz1w44ak0rcbx840ypdcjq8mbcb85f"; buildDepends = [ blazeBuilder conduit httpTypes network text transformers vault ]; diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index b6380981d00f5..03dee23b78ba3 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -1,15 +1,16 @@ -{ cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive -, conduit, httpTypes, liftedBase, network, simpleSendfile -, transformers, unixCompat, wai +{ cabal, blazeBuilder, blazeBuilderConduit, bytestringLexing +, caseInsensitive, conduit, httpTypes, liftedBase, network +, simpleSendfile, transformers, unixCompat, wai }: cabal.mkDerivation (self: { pname = "warp"; - version = "1.1.0"; - sha256 = "1an2j89422rcvrvrmhg1hwj8vpikjj5xdzb3h37rjsfj6qlqy5cf"; + version = "1.1.0.1"; + sha256 = "1bgjnnkqgcyj00jd4rgsnpmac0yfd1ydd6i61b252gyrr9dd0wm9"; buildDepends = [ - blazeBuilder blazeBuilderConduit caseInsensitive conduit httpTypes - liftedBase network simpleSendfile transformers unixCompat wai + blazeBuilder blazeBuilderConduit bytestringLexing caseInsensitive + conduit httpTypes liftedBase network simpleSendfile transformers + unixCompat wai ]; meta = { homepage = "http://github.com/yesodweb/wai"; diff --git a/pkgs/development/libraries/haskell/web-routes-quasi/default.nix b/pkgs/development/libraries/haskell/web-routes-quasi/default.nix deleted file mode 100644 index 7ecc85742e1e7..0000000000000 --- a/pkgs/development/libraries/haskell/web-routes-quasi/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ cabal, pathPieces, text }: - -cabal.mkDerivation (self: { - pname = "web-routes-quasi"; - version = "0.7.1.1"; - sha256 = "1rqbymi0n7kdhl272qfjhx9s3gspd5k0bjrhclj9l8mjf033vdmf"; - isLibrary = true; - isExecutable = true; - buildDepends = [ pathPieces text ]; - meta = { - homepage = "http://docs.yesodweb.com/web-routes-quasi/"; - description = "Define data types and parse/build functions for web-routes via a quasi-quoted DSL (deprecated)"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/web-routes/default.nix b/pkgs/development/libraries/haskell/web-routes/default.nix deleted file mode 100644 index 270328441e1a1..0000000000000 --- a/pkgs/development/libraries/haskell/web-routes/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ cabal, blazeBuilder, httpTypes, mtl, network, parsec, text -, utf8String -}: - -cabal.mkDerivation (self: { - pname = "web-routes"; - version = "0.27.1"; - sha256 = "0rbl57qnn908hwfhj14m8z11pscrv44rlg7c9y9rm6jvwy4v58qz"; - buildDepends = [ - blazeBuilder httpTypes mtl network parsec text utf8String - ]; - meta = { - description = "Library for maintaining correctness and composability of URLs within an application"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/xml-enumerator/default.nix b/pkgs/development/libraries/haskell/xml-enumerator/default.nix deleted file mode 100644 index c891096c20571..0000000000000 --- a/pkgs/development/libraries/haskell/xml-enumerator/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ cabal, attoparsec, attoparsecEnumerator, blazeBuilder -, blazeBuilderEnumerator, dataDefault, enumerator, failure, text -, transformers, xmlTypes -}: - -cabal.mkDerivation (self: { - pname = "xml-enumerator"; - version = "0.4.4.1"; - sha256 = "0vwn6s7x626970b8lgyhmngkqv5n5kvv0qikrvi9sjzq5rjyx1zj"; - buildDepends = [ - attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator - dataDefault enumerator failure text transformers xmlTypes - ]; - meta = { - homepage = "http://github.com/snoyberg/xml"; - description = "Pure-Haskell utilities for dealing with XML with the enumerator package. (deprecated)"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index 435aa7492bb3b..2ab9b56831342 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "0.10.1"; - sha256 = "1m4prrpxdcj7qn755as37kn66f7didparhar520anr9cryn0wfr9"; + version = "0.10.1.1"; + sha256 = "1d64kx0jfk1d1r4k8r57y5wz84pjxs481qdnzgjfv279y467fki6"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/zlib-conduit/default.nix b/pkgs/development/libraries/haskell/zlib-conduit/default.nix index decdd32676abf..1b8d40efe28b9 100644 --- a/pkgs/development/libraries/haskell/zlib-conduit/default.nix +++ b/pkgs/development/libraries/haskell/zlib-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "zlib-conduit"; - version = "0.2.0"; - sha256 = "1vwan9vglj7xdna3pfw71bcfcp10s4vn6fd6wwdz7wvxrbn52gsk"; + version = "0.2.0.1"; + sha256 = "0css7cr9jj6rn829bw8mlbdl0d6iz9ckhsbrlrdcppx8k4gzb4rg"; buildDepends = [ conduit transformers zlibBindings ]; meta = { homepage = "http://github.com/snoyberg/conduit"; diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix index c0088d7a8d609..6be998b691a53 100644 --- a/pkgs/development/libraries/itk/default.nix +++ b/pkgs/development/libraries/itk/default.nix @@ -1,18 +1,19 @@ -{stdenv, fetchurl, cmake, libX11, libuuid}: +{stdenv, fetchurl, cmake, libX11, libuuid, xz}: stdenv.mkDerivation rec { - name = "itk-3.16.0"; + name = "itk-4.0.0"; src = fetchurl { - url = mirror://sourceforge/itk/InsightToolkit-3.16.0.tar.gz; - sha256 = "18r021ib2g94qlajjsny0r6cpc61rmr0zrpb2l0mx1y7j9ckr6ks"; + url = mirror://sourceforge/itk/InsightToolkit-4.0.0.tar.xz; + sha256 = "05z49sw612cbyiaghcsda0xylrkf06jh81ql79si5632w1hpgbd9"; }; cmakeFlags = [ "-DBUILD_TESTING=OFF" "-DBUILD_EXAMPLES=OFF" ]; - # makeFlags = [ "VERBOSE=1" ]; + enableParallelBuilding = true; - buildInputs = [ cmake libX11 libuuid ]; + buildNativeInputs = [ cmake xz ]; + buildInputs = [ libX11 libuuid ]; meta = { description = "Insight Segmentation and Registration Toolkit"; diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index ae8165638d1a5..38272165a281a 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -2,7 +2,7 @@ let pname = "krb5"; - version = "1.6.3"; + version = "1.10"; name = "${pname}-${version}"; webpage = http://web.mit.edu/kerberos/; in @@ -11,8 +11,8 @@ stdenv.mkDerivation (rec { inherit name; src = fetchurl { - url = "${webpage}/dist/krb5/1.6/${name}-signed.tar"; - sha256 = "7a1bd7d4bd326828c8ee382ed2b69ccd6c58762601df897d6a32169d84583d2a"; + url = "${webpage}/dist/krb5/1.10/${name}-signed.tar"; + sha256 = "1pa4m6538drb51gsqxbbxlsnc9fm9ccid9m2s3pv3di5l0a7l8bg"; }; buildInputs = [ perl ncurses yacc ]; diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index 0c490c63411a2..48ef55892c8f7 100644 --- a/pkgs/development/libraries/libzip/default.nix +++ b/pkgs/development/libraries/libzip/default.nix @@ -10,6 +10,12 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ zlib ]; + # At least mysqlWorkbench cannot find zipconf.h; I think also openoffice + # had this same problem. This links it somewhere that mysqlworkbench looks. + postInstall = '' + ( cd $out/include ; ln -s ../lib/libzip/include/zipconf.h zipconf.h ) + ''; + meta = { homepage = http://www.nih.at/libzip; description = "A C library for reading, creating and modifying zip archives"; diff --git a/pkgs/development/libraries/mysocketw/default.nix b/pkgs/development/libraries/mysocketw/default.nix new file mode 100644 index 0000000000000..c1cada63abeed --- /dev/null +++ b/pkgs/development/libraries/mysocketw/default.nix @@ -0,0 +1,23 @@ +{stdenv, fetchurl, openssl}: + +stdenv.mkDerivation rec { + name = "mysocketw-031026"; + src = fetchurl { + url = http://www.digitalfanatics.org/cal/socketw/files/SocketW031026.tar.gz; + sha256 = "0crinikhdl7xihzmc3k3k41pgxy16d5ci8m9sza1lbibns7pdwj4"; + }; + + patches = [ ./gcc.patch ]; + + configurePhase = '' + sed -i s,/usr/local,$out, Makefile.conf + ''; + + buildInputs = [ openssl ]; + + meta = { + description = "Cross platform (Linux/FreeBSD/Unix/Win32) streaming socket C++"; + license = "LGPLv2.1+"; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/mysocketw/gcc.patch b/pkgs/development/libraries/mysocketw/gcc.patch new file mode 100644 index 0000000000000..7779a18fa528e --- /dev/null +++ b/pkgs/development/libraries/mysocketw/gcc.patch @@ -0,0 +1,13 @@ +I picked it up from: +http://www.rigsofrods.com/wiki/images/c/c0/Socketw.patch + +--- a/src/sw_base.cxx.old 2009-12-19 21:19:31.057051328 -0800 ++++ b/src/sw_base.cxx 2009-12-19 21:19:44.939551918 -0800 +@@ -19,6 +19,7 @@ + #include <time.h> + #include <stdio.h> + #include <string.h> ++#include <stdlib.h> + + #ifndef __WIN32__ + #include <netdb.h> diff --git a/pkgs/development/libraries/ogrepaged/default.nix b/pkgs/development/libraries/ogrepaged/default.nix new file mode 100644 index 0000000000000..6b2b9c9e4a654 --- /dev/null +++ b/pkgs/development/libraries/ogrepaged/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, cmake, pkgconfig, ois, ogre, libX11, boost }: + +stdenv.mkDerivation rec { + name = "ogre-paged-1.1.3"; + + src = fetchurl { + url = "http://ogre-paged.googlecode.com/files/${name}.tar.gz"; + sha256 = "1qqlkg17plk87dm3fsm34x8lkd5rxkhiz77ppcgc71a7z050vhjq"; + }; + + buildInputs = [ ois ogre libX11 boost ]; + buildNativeInputs = [ cmake pkgconfig ]; + + cmakeFlags = "-DPAGEDGEOMETRY_BUILD_SAMPLES=OFF"; + + enableParallelBuilding = true; + + meta = { + description = "Paged Geometry for Ogre3D"; + homepage = http://code.google.com/p/ogre-paged/; + license = "MIT"; + }; +} diff --git a/pkgs/development/libraries/zlib/latest.nix b/pkgs/development/libraries/zlib/latest.nix new file mode 100644 index 0000000000000..1333c9fdfdf31 --- /dev/null +++ b/pkgs/development/libraries/zlib/latest.nix @@ -0,0 +1,11 @@ +{stdenv, fetchurl}: + +# To be removed in stdenv-updates, as default.nix is already right there. +stdenv.mkDerivation rec { + name = "zlib-1.2.6"; + + src = fetchurl { + url = "http://www.zlib.net/${name}.tar.gz"; + sha256 = "06x6m33ls1606ni7275q5z392csvh18dgs55kshfnvrfal45w8r1"; + }; +} diff --git a/pkgs/development/ocaml-modules/ocamlmake/default.nix b/pkgs/development/ocaml-modules/ocamlmake/default.nix index 69386bd757874..23858576efd5d 100644 --- a/pkgs/development/ocaml-modules/ocamlmake/default.nix +++ b/pkgs/development/ocaml-modules/ocamlmake/default.nix @@ -1,16 +1,24 @@ {stdenv, fetchurl}: -stdenv.mkDerivation { - name = "ocaml-make-6.33.0"; +let + + version = "6.36.0"; + sha256 = "7c9a771d79bf945050dc7530957f4b61669976177818185e64c002cbfd75e3a2"; + +in stdenv.mkDerivation { + name = "ocaml-make-${version}"; src = fetchurl { - url = "http://www.ocaml.info/ocaml_sources/ocaml-make-6.33.0.tar.gz"; - sha256 = "3054303ba04e4bbbe038e08310fabc3e5a0e3899bbba33d9ac5ed7a1b9d1e05a"; + url = "http://hg.ocaml.info/release/ocaml-make/archive/release-${version}.tar.bz2"; + inherit sha256; }; - phases = [ "unpackPhase" "installPhase" ]; + installPhase = '' + ensureDir "$out/include/" + cp OCamlMakefile "$out/include/" + ''; - installPhase = "cp OCamlMakefile $out"; + setupHook = ./setup-hook.sh; meta = { homepage = "http://www.ocaml.info/home/ocaml_sources.html"; diff --git a/pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh b/pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh new file mode 100644 index 0000000000000..876556a7b9223 --- /dev/null +++ b/pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh @@ -0,0 +1,5 @@ +addOcamlMakefile () { + export OCAMLMAKEFILE="@out@/include/OCamlMakefile" +} + +envHooks=(${envHooks[@]} addOcamlMakefile) diff --git a/pkgs/development/ocaml-modules/pycaml/default.nix b/pkgs/development/ocaml-modules/pycaml/default.nix index af7207064baee..b6c0df5ac15b3 100644 --- a/pkgs/development/ocaml-modules/pycaml/default.nix +++ b/pkgs/development/ocaml-modules/pycaml/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { sha256 = "ff6d863c42b4ef798f50ff5eff77b47b77b5c0d28b6f65364e8a436a216dc591"; }; - buildInputs = [ocaml findlib python]; + buildInputs = [ocaml findlib python ocaml_make]; createFindlibDestdir = true; @@ -26,7 +26,7 @@ stdenv.mkDerivation { # fix some paths to the appropriate store paths. patchPhase = '' - sed -i "Makefile" -e's|/usr/include/OCamlMakefile|${ocaml_make}|g' + sed -i "Makefile" -e's|/usr/include/OCamlMakefile|${ocaml_make}/include/OCamlMakefile|g' sed -i "Makefile" -e's|/usr|${python}|g' ''; diff --git a/pkgs/development/tools/build-managers/cmake/2.8.7.nix b/pkgs/development/tools/build-managers/cmake/2.8.7.nix new file mode 100644 index 0000000000000..c440285671be7 --- /dev/null +++ b/pkgs/development/tools/build-managers/cmake/2.8.7.nix @@ -0,0 +1,61 @@ +{ fetchurl, stdenv, replace, curl, expat, zlib, bzip2, libarchive +, useNcurses ? false, ncurses, useQt4 ? false, qt4 +, darwinInstallNameToolUtility }: + +with stdenv.lib; + +let + os = stdenv.lib.optionalString; + majorVersion = "2.8"; + minorVersion = "7"; + version = "${majorVersion}.${minorVersion}"; +in + +# WARNING: Do NOT upgrade cmake in trunk: it fails to build on i686-linux +stdenv.mkDerivation rec { + name = "cmake-${os useNcurses "cursesUI-"}${os useQt4 "qt4UI-"}${version}"; + + inherit majorVersion; + + src = fetchurl { + url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz"; + sha256 = "130923053d8fe1a2ae032a3f09021f9024bf29d7a04ed10ae04647ff00ecf59f"; + }; + + patches = + # Don't search in non-Nix locations such as /usr, but do search in + # Nixpkgs' Glibc. + optional (stdenv ? glibc) ./search-path.patch; + + buildInputs = [ curl expat zlib bzip2 libarchive ] + ++ optional stdenv.isDarwin darwinInstallNameToolUtility + ++ optional useNcurses ncurses + ++ optional useQt4 qt4; + + CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs; + + configureFlags = + "--docdir=/share/doc/${name} --mandir=/share/man --system-libs" + + stdenv.lib.optionalString useQt4 " --qt-gui"; + + setupHook = ./setup-hook.sh; + + postUnpack = + '' + dontUseCmakeConfigure=1 + source $setupHook + fixCmakeFiles $sourceRoot + ''; + + preConfigure = optionalString (stdenv ? glibc) + '' + substituteInPlace Modules/Platform/UnixPaths.cmake --subst-var-by glibc ${stdenv.glibc} + ''; + + meta = { + homepage = http://www.cmake.org/; + description = "Cross-Platform Makefile Generator"; + platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.urkud ]; + }; +} diff --git a/pkgs/development/tools/build-managers/jam/default.nix b/pkgs/development/tools/build-managers/jam/default.nix index d2a002a70cf79..6e2d79c6400d8 100644 --- a/pkgs/development/tools/build-managers/jam/default.nix +++ b/pkgs/development/tools/build-managers/jam/default.nix @@ -1,5 +1,11 @@ {stdenv, fetchurl}: +let + bindir = if stdenv.system == "i686-linux" then "bin.linuxx86" + else if stdenv.system == "x86_64-linux" then "bin.linux" + else throw "Unsupported platform by now"; +in + stdenv.mkDerivation { name = "jam-2.5"; src = fetchurl { @@ -9,7 +15,7 @@ stdenv.mkDerivation { installPhase = '' ensureDir $out/bin - cp bin.linux/jam $out/bin + cp ${bindir}/jam $out/bin ''; meta = { diff --git a/pkgs/development/tools/build-managers/leiningen/builder.sh b/pkgs/development/tools/build-managers/leiningen/builder.sh index 65d318c8f1e4c..2ee86d86d77b6 100644 --- a/pkgs/development/tools/build-managers/leiningen/builder.sh +++ b/pkgs/development/tools/build-managers/leiningen/builder.sh @@ -15,6 +15,8 @@ cp -v $clojuresrc $out/lib patch --verbose $out_bin -p0 < $patches chmod -v 755 $out_bin +patchShebangs $out + echo "Testing out \"lein version\"..." $out_bin version echo "Success." diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index 61a0374bdad1f..efdb578a61b66 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { pname = "leiningen"; - version = "1.6.2"; + version = "1.7.0"; name = "${pname}-${version}"; src = fetchurl { - url = "https://raw.github.com/technomancy/leiningen/stable/bin/lein-pkg"; - sha256 = "e177a493ed0c4a7874f1391d5cc72cc1e541e55ed3d6e075feec87b5da6f8277"; + url = "https://raw.github.com/technomancy/leiningen/1.7.0/bin/lein-pkg"; + sha256 = "1339f6ffc7bae3171174fc9eae990f5b9710ff2804038e931d531632c57f189c"; }; jarsrc = fetchurl { - url = "https://github.com/downloads/technomancy/leiningen/leiningen-1.6.2-standalone.jar"; - sha256 = "e35272556ece82d9a6a54b86266626da1b5f990ff556639dd7dd1025d6ed4226"; + url = "https://github.com/downloads/technomancy/leiningen/leiningen-1.7.0-standalone.jar"; + sha256 = "501eaa1c2a19ca4ffc2fde1776552cb513d69ee874abb547c40cee92156e50bf"; }; clojuresrc = fetchurl { @@ -30,7 +30,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/technomancy/leiningen; description = "Project automation for Clojure"; license = "EPL"; - platforms = stdenv.lib.platforms.unix; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/build-managers/leiningen/lein.patch b/pkgs/development/tools/build-managers/leiningen/lein.patch index 1a7157568e432..2edf1370ff4b1 100644 --- a/pkgs/development/tools/build-managers/leiningen/lein.patch +++ b/pkgs/development/tools/build-managers/leiningen/lein.patch @@ -1,15 +1,14 @@ ---- lein-pkg 2012-01-09 20:47:44.000000000 -0800 -+++ lein-pkg-nix 2012-01-09 20:45:01.000000000 -0800 -@@ -70,7 +70,7 @@ +--- lein-pkg 2012-02-28 15:26:40.000000000 -0800 ++++ lein-pkg-nix 2012-02-28 17:17:02.000000000 -0800 +@@ -71,30 +71,14 @@ LEIN_PLUGIN_PATH="$(echo "$DEV_PLUGINS" | tr \\n :)" LEIN_USER_PLUGIN_PATH="$(echo "$(unique_user_plugins)" | tr \\n :)" CLASSPATH="$CLASSPATH:$LEIN_PLUGIN_PATH:$LEIN_USER_PLUGIN_PATH:test/:src/:resources/" -CLOJURE_JAR="/usr/share/java/clojure-1.2.jar:/usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar" +CLOJURE_JAR="$(dirname $0)/../lib/*clojure-1.2.1.jar" - NULL_DEVICE=/dev/null # apply context specific CLASSPATH entries -@@ -78,23 +78,7 @@ + if [ -f .lein-classpath ]; then CLASSPATH="`cat .lein-classpath`:$CLASSPATH" fi @@ -26,11 +25,8 @@ - -# Do not use installed leiningen jar during self-compilation -if ! { [ "$1" = "compile" ] && -- grep -qsE 'defproject leiningen[[:space:]]+"[[:digit:].]+"' \ -- project.clj ;}; then +- grep -qsE 'defproject leiningen[[:space:]]+"[[:digit:].]+"' \ +- project.clj ;}; then - CLASSPATH="$CLASSPATH":/usr/share/java/leiningen-$LEIN_VERSION.jar -fi +CLASSPATH="$CLASSPATH:$(dirname $0)/../lib/*" - - if [ $DEBUG ]; then - echo $CLASSPATH diff --git a/pkgs/development/tools/documentation/doxygen/1.7.nix b/pkgs/development/tools/documentation/doxygen/1.7.nix new file mode 100644 index 0000000000000..86f2e8cf2b2eb --- /dev/null +++ b/pkgs/development/tools/documentation/doxygen/1.7.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchurl, perl, flex, bison, qt4 }: + +let + name = "doxygen-1.7.4"; +in +stdenv.mkDerivation { + inherit name; + + src = fetchurl { + url = "ftp://ftp.stack.nl/pub/users/dimitri/${name}.src.tar.gz"; + sha256 = "0rnzyp5f8c454fdkgpg5hpxwmx642spgxcpw3blbvnyw8129jp44"; + }; + + patches = [ ./tmake.patch ]; + + buildInputs = + [ perl flex bison ] + ++ stdenv.lib.optional (qt4 != null) qt4; + + prefixKey = "--prefix "; + + configureFlags = + [ "--dot dot" ] + ++ stdenv.lib.optional (qt4 != null) "--with-doxywizard"; + + preConfigure = stdenv.lib.optionalString (qt4 != null) + '' + echo "using QTDIR=${qt4}..." + export QTDIR=${qt4} + ''; + + makeFlags = "MAN1DIR=share/man/man1"; + + enableParallelBuilding = true; + + meta = { + license = "GPLv2+"; + homepage = "http://doxygen.org/"; + description = "Doxygen, a source code documentation generator tool"; + + longDescription = '' + Doxygen is a documentation system for C++, C, Java, Objective-C, + Python, IDL (CORBA and Microsoft flavors), Fortran, VHDL, PHP, + C\#, and to some extent D. It can generate an on-line + documentation browser (in HTML) and/or an off-line reference + manual (in LaTeX) from a set of documented source files. + ''; + + maintainers = [stdenv.lib.maintainers.simons]; + platforms = if (qt4 != null) then stdenv.lib.platforms.linux else stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index 86f2e8cf2b2eb..776c0bf450c78 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, perl, flex, bison, qt4 }: let - name = "doxygen-1.7.4"; + name = "doxygen-1.8.0"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "ftp://ftp.stack.nl/pub/users/dimitri/${name}.src.tar.gz"; - sha256 = "0rnzyp5f8c454fdkgpg5hpxwmx642spgxcpw3blbvnyw8129jp44"; + sha256 = "0cymkk8wpws326aqpsixyzr4pk98xgpzrvxxjm76ar79pcs91ykh"; }; patches = [ ./tmake.patch ]; diff --git a/pkgs/development/tools/haskell/haskdogs/default.nix b/pkgs/development/tools/haskell/haskdogs/default.nix new file mode 100644 index 0000000000000..2e158abaf8980 --- /dev/null +++ b/pkgs/development/tools/haskell/haskdogs/default.nix @@ -0,0 +1,20 @@ +{ cabal, Cabal, filepath, HSH }: + +cabal.mkDerivation (self: { + pname = "haskdogs"; + version = "0.3"; + sha256 = "0aji59sazlhn5yardgrsdpf85fvb0mwn4bpslcjxr7mnmpa7j0kz"; + isLibrary = false; + isExecutable = true; + buildDepends = [ Cabal filepath HSH ]; + meta = { + homepage = "http://github.com/ierton/haskdogs"; + description = "Generate ctags file for haskell project directory and it's deps"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/tools/haskell/hasktags/default.nix b/pkgs/development/tools/haskell/hasktags/default.nix new file mode 100644 index 0000000000000..d3c373ae4df76 --- /dev/null +++ b/pkgs/development/tools/haskell/hasktags/default.nix @@ -0,0 +1,19 @@ +{ cabal, filepath }: + +cabal.mkDerivation (self: { + pname = "hasktags"; + version = "0.68.2"; + sha256 = "0lb28vj8mhaskw3n7wpjgbj0311ywh76yc0ajczzsiqa3p6mypss"; + isLibrary = false; + isExecutable = true; + buildDepends = [ filepath ]; + meta = { + description = "Produces ctags \"tags\" and etags \"TAGS\" files for Haskell programs"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/tools/parsing/frown/builder.sh b/pkgs/development/tools/parsing/frown/builder.sh deleted file mode 100644 index 82689b42d72d0..0000000000000 --- a/pkgs/development/tools/parsing/frown/builder.sh +++ /dev/null @@ -1,7 +0,0 @@ -source $stdenv/setup - -makeFlags="-e PREFIX=\"$out\"" - -ensureDir $out/bin - -genericBuild diff --git a/pkgs/development/tools/parsing/frown/default.nix b/pkgs/development/tools/parsing/frown/default.nix deleted file mode 100644 index f94a12e11d140..0000000000000 --- a/pkgs/development/tools/parsing/frown/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{stdenv, fetchurl, ghc}: - -stdenv.mkDerivation { - name = "frown-0.6.1"; - src = fetchurl { - url = http://www.informatik.uni-bonn.de/~ralf/frown/frown-0.6.1.tar.gz; - md5 = "b6fe9a8bf029c2a7c31b574be05816cf"; - }; - builder = ./builder.sh; - buildInputs = [ghc]; -} diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index 9f48627e39243..19785753b2db9 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, python, zlib, v8 }: +{ stdenv, fetchurl, openssl, python, zlib, v8, darwinInstallNameToolUtility }: stdenv.mkDerivation rec { version = "0.6.10"; @@ -17,11 +17,17 @@ stdenv.mkDerivation rec { "--shared-v8-libpath=${v8}/lib" ]; - patchPhase = '' + patches = stdenv.lib.optional stdenv.isDarwin ./no-arch-flag.patch; + + prePatch = '' sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i tools/{*.py,waf-light,node-waf} ''; - buildInputs = [ python openssl v8 zlib]; + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -change libv8.dylib ${v8}/lib/libv8.dylib $out/bin/node + ''; + + buildInputs = [ python openssl v8 zlib ] ++ stdenv.lib.optional stdenv.isDarwin darwinInstallNameToolUtility; meta = with stdenv.lib; { description = "Event-driven I/O framework for the V8 JavaScript engine"; diff --git a/pkgs/development/web/nodejs/no-arch-flag.patch b/pkgs/development/web/nodejs/no-arch-flag.patch new file mode 100644 index 0000000000000..bbe96c0c55270 --- /dev/null +++ b/pkgs/development/web/nodejs/no-arch-flag.patch @@ -0,0 +1,21 @@ +diff -Naur node-v0.6.10-orig/wscript node-v0.6.10/wscript +--- node-v0.6.10-orig/wscript 2012-02-02 19:56:42.000000000 -0500 ++++ node-v0.6.10/wscript 2012-02-25 14:18:50.000000000 -0500 +@@ -443,17 +443,6 @@ + if sys.platform.startswith("darwin"): + # used by platform_darwin_*.cc + conf.env.append_value('LINKFLAGS', ['-framework','Carbon']) +- # cross compile for architecture specified by DEST_CPU +- if 'DEST_CPU' in conf.env: +- arch = conf.env['DEST_CPU'] +- # map supported_archs to GCC names: +- arch_mappings = {'ia32': 'i386', 'x64': 'x86_64'} +- if arch in arch_mappings: +- arch = arch_mappings[arch] +- flags = ['-arch', arch] +- conf.env.append_value('CCFLAGS', flags) +- conf.env.append_value('CXXFLAGS', flags) +- conf.env.append_value('LINKFLAGS', flags) + if 'DEST_CPU' in conf.env: + arch = conf.env['DEST_CPU'] + # TODO: -m32 is only available on 64 bit machines, so check host type |