diff options
author | Shea Levy <shea@shealevy.com> | 2012-02-25 19:57:34 +0000 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2012-02-25 19:57:34 +0000 |
commit | ea195b2507b9068d966009d27c0e90b57d88f30d (patch) | |
tree | 287b4453ffa21139715bb1c1c57e6d01d1045295 /pkgs/development | |
parent | 38e3d7bc86d2a48dd4d653fd3f142f422c075563 (diff) | |
parent | 385f242a400749b3923d51fff5a86403e6dab0dc (diff) |
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32564
Diffstat (limited to 'pkgs/development')
31 files changed, 260 insertions, 246 deletions
diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix index 69596ed66f41a..23b5883c0098d 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 mkdir -p "$out/bin/" @@ -33,10 +33,9 @@ stdenv.mkDerivation rec { mkdir -p "$out/include/" cp -v -r include/Cg/ "$out/include/" mkdir -p "$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 mkdir -p "$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 24edb2ec4df50..a092172c8ca78 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/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/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/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/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/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/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/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/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/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/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/tools/build-managers/jam/default.nix b/pkgs/development/tools/build-managers/jam/default.nix index 6324fa92cbd92..434e23d9b9901 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 = '' mkdir -p $out/bin - cp bin.linux/jam $out/bin + cp ${bindir}/jam $out/bin ''; meta = { diff --git a/pkgs/development/tools/parsing/frown/builder.sh b/pkgs/development/tools/parsing/frown/builder.sh deleted file mode 100644 index 075d2bc758c5b..0000000000000 --- a/pkgs/development/tools/parsing/frown/builder.sh +++ /dev/null @@ -1,7 +0,0 @@ -source $stdenv/setup - -makeFlags="-e PREFIX=\"$out\"" - -mkdir -p $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 |