diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-19 21:31:51 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-19 21:31:51 +0000 |
commit | 84c018503859be28aded86677c9dbc54c7067e11 (patch) | |
tree | 44896c72bb5eaddc3b9ebc5e4701f40560774ff0 /pkgs/development/libraries | |
parent | 3980444b2b918ef74ac7b9f1128f399767d06fa1 (diff) | |
parent | b94fef3cbad6b3b830f8f7c4a987c65c81c9e93d (diff) |
svn merge ^/nixpkgs/trunk, one simple conflict in jruby
svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
Diffstat (limited to 'pkgs/development/libraries')
21 files changed, 123 insertions, 67 deletions
diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index e998887f59120..243b4b0191d03 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -5,11 +5,11 @@ assert guileBindings -> guile != null; stdenv.mkDerivation rec { - name = "gnutls-3.0.8"; + name = "gnutls-3.0.11"; src = fetchurl { url = "mirror://gnu/gnutls/${name}.tar.xz"; - sha256 = "0qcp7jm8c2fyk5kdb4fgyrv9hb745mcf066vwmlb8dchx15ijkms"; + sha256 = "1l8k96hms7891zl43qjd7lngjh23kxdq22l6ahm1ham7fyhhrh9r"; }; configurePhase = '' diff --git a/pkgs/development/libraries/haskell/aeson-native/default.nix b/pkgs/development/libraries/haskell/aeson-native/default.nix index 4b3d8da7bf5c2..9f66298450912 100644 --- a/pkgs/development/libraries/haskell/aeson-native/default.nix +++ b/pkgs/development/libraries/haskell/aeson-native/default.nix @@ -4,15 +4,15 @@ cabal.mkDerivation (self: { pname = "aeson-native"; - version = "0.3.3.1"; - sha256 = "15733f5ivymkbwvqgbd8scynl9adva3fnid4bzlr9l4sb3yvcz9p"; + version = "0.3.3.2"; + sha256 = "1s5i88r8sdd7ayrpjw6f18273k6r0igk0sswb503hzvjagzmzffh"; buildDepends = [ attoparsec blazeBuilder blazeTextualNative deepseq hashable mtl syb text time unorderedContainers vector ]; meta = { homepage = "http://github.com/mailrank/aeson"; - description = "Fast JSON parsing and encoding"; + description = "Fast JSON parsing and encoding (deprecated)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ diff --git a/pkgs/development/libraries/haskell/blaze-textual-native/default.nix b/pkgs/development/libraries/haskell/blaze-textual-native/default.nix index 3f41a1769050e..602c5be935793 100644 --- a/pkgs/development/libraries/haskell/blaze-textual-native/default.nix +++ b/pkgs/development/libraries/haskell/blaze-textual-native/default.nix @@ -2,12 +2,12 @@ cabal.mkDerivation (self: { pname = "blaze-textual-native"; - version = "0.2.1"; - sha256 = "12cnl76qld19x6zlhxcsx2b27mfr9v7sc2xq6af9h77wqb98fkvn"; + version = "0.2.1.1"; + sha256 = "1q3gdf4ljc5xhw8f72qkvi6insk2nwdfk28a00y1b58jmk8003sd"; buildDepends = [ blazeBuilder text time vector ]; meta = { homepage = "http://github.com/mailrank/blaze-textual"; - description = "Fast rendering of common datatypes"; + description = "Fast rendering of common datatypes (deprecated)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ diff --git a/pkgs/development/libraries/haskell/control-monad-attempt/default.nix b/pkgs/development/libraries/haskell/control-monad-attempt/default.nix index 06571080b7bd8..0450373e8c652 100644 --- a/pkgs/development/libraries/haskell/control-monad-attempt/default.nix +++ b/pkgs/development/libraries/haskell/control-monad-attempt/default.nix @@ -2,12 +2,12 @@ cabal.mkDerivation (self: { pname = "control-monad-attempt"; - version = "0.3.0"; - sha256 = "1l0bqb5h2fs7vx2r8nd6kscyyrrqc0gshnxwdz9p6clfnknyqbqw"; + version = "0.3.0.1"; + sha256 = "140n27vdbyjz5qycrwlrmyd7s48fxcl6msl16g7czg40k5y23j5s"; buildDepends = [ attempt transformers ]; meta = { homepage = "http://github.com/snoyberg/control-monad-attempt"; - description = "Monad transformer for attempt"; + description = "Monad transformer for attempt. (deprecated)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ diff --git a/pkgs/development/libraries/haskell/convertible-text/default.nix b/pkgs/development/libraries/haskell/convertible-text/default.nix index b987c9e21e55b..7444583bd9f40 100644 --- a/pkgs/development/libraries/haskell/convertible-text/default.nix +++ b/pkgs/development/libraries/haskell/convertible-text/default.nix @@ -2,14 +2,14 @@ cabal.mkDerivation (self: { pname = "convertible-text"; - version = "0.4.0.1"; - sha256 = "0m252ml2zgw0jxfs678m1wp9ivy6gvi9w50qw7zi9ycxnzj9j6r2"; + version = "0.4.0.2"; + sha256 = "1wqpl9dms1rsd24d00f18l9sm601nm6kr7h4ig8y70jdzy8w73fz"; isLibrary = true; isExecutable = true; buildDepends = [ attempt text time ]; meta = { homepage = "http://github.com/snoyberg/convertible/tree/text"; - description = "Typeclasses and instances for converting between types"; + description = "Typeclasses and instances for converting between types (deprecated)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ diff --git a/pkgs/development/libraries/haskell/data-object/default.nix b/pkgs/development/libraries/haskell/data-object/default.nix index fb2c013da8d12..c1b12ab038fb9 100644 --- a/pkgs/development/libraries/haskell/data-object/default.nix +++ b/pkgs/development/libraries/haskell/data-object/default.nix @@ -2,12 +2,12 @@ cabal.mkDerivation (self: { pname = "data-object"; - version = "0.3.1.8"; - sha256 = "0v7kn6rv71fhf2l7ll7plzr90irm2fyp25lskv2zwazp4swhw52x"; + version = "0.3.1.9"; + sha256 = "0z8m23kw8mj6hhy1r8y1vvlxxpwl273dhanszig2673a1sw0l98l"; buildDepends = [ failure text time ]; meta = { homepage = "http://github.com/snoyberg/data-object/tree/master"; - description = "Represent hierachichal structures, called objects in JSON"; + description = "Represent hierachichal structures, called objects in JSON. (deprecated)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix new file mode 100644 index 0000000000000..3d4d8927a83c5 --- /dev/null +++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix @@ -0,0 +1,30 @@ +{ cabal, attoparsec, attoparsecEnumerator, ghcPaths, hlint, regexPosix, emacs, emacs23Packages }: + +cabal.mkDerivation (self: { + pname = "ghc-mod"; + version = "1.0.6"; + sha256 = "c075314de03209827a0e59ee3e63a4d21bc8edb024a1e36721eea248805b38ba"; + buildDepends = [ + attoparsec attoparsecEnumerator ghcPaths hlint regexPosix + ]; +# buildTools = [emacs emacs23]; + propagatedBuildInputs = [emacs emacs23Packages.haskellMode]; + isExecutable = true; + postInstall = '' + cd $out/share/$pname-$version + make + rm Makefile + cd .. + ensureDir "$out/share/emacs" + mv $pname-$version emacs/site-lisp + ''; + + meta = { + description = "Happy Haskell programming on Emacs"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.bluescreen303 + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix index 98132edfdb269..d0dc0afb35fa3 100644 --- a/pkgs/development/libraries/haskell/hamlet/default.nix +++ b/pkgs/development/libraries/haskell/hamlet/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hamlet"; - version = "0.10.6"; - sha256 = "0ai00jwbq5nnrgcfhz3sxm2jm2jvz7qbj56lr0wlc3z818a22ams"; + version = "0.10.7.1"; + sha256 = "0ll9pp0qnvw903ncpfgrc67jg385jzla3j9l0yfm9qqnn38sqhqv"; buildDepends = [ blazeBuilder blazeHtml failure parsec shakespeare text ]; diff --git a/pkgs/development/libraries/haskell/http-enumerator/default.nix b/pkgs/development/libraries/haskell/http-enumerator/default.nix index 7804b0d077a39..39e23b3253d22 100644 --- a/pkgs/development/libraries/haskell/http-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/http-enumerator/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "http-enumerator"; - version = "0.7.2.4"; - sha256 = "0gnbyhjs28rwdaypa9zhyja3bakr74if68cgivn1s56wbhrhc70s"; + version = "0.7.2.5"; + sha256 = "1sck3z1x73qbak6p11745bywxwz91nk635jvv4wmgq4ifyfkbabb"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/jsonEnumerator/default.nix b/pkgs/development/libraries/haskell/jsonEnumerator/default.nix index a400382128506..1e4629166fad9 100644 --- a/pkgs/development/libraries/haskell/jsonEnumerator/default.nix +++ b/pkgs/development/libraries/haskell/jsonEnumerator/default.nix @@ -4,15 +4,15 @@ cabal.mkDerivation (self: { pname = "json-enumerator"; - version = "0.0.1.1"; - sha256 = "0k94x9vwwaprqbc8gay5l0vg6hjmjpjp852yncncb8kr0r344z7l"; + 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"; + 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 = [ diff --git a/pkgs/development/libraries/haskell/neither/default.nix b/pkgs/development/libraries/haskell/neither/default.nix index 7d119b49e4406..d8a737019fc7e 100644 --- a/pkgs/development/libraries/haskell/neither/default.nix +++ b/pkgs/development/libraries/haskell/neither/default.nix @@ -2,12 +2,12 @@ cabal.mkDerivation (self: { pname = "neither"; - version = "0.3.0"; - sha256 = "0lak4y0k4cisr27vw2bnpd0pa1kkgv8r96z7vf19wg7brzarx71l"; + version = "0.3.0.1"; + sha256 = "1vr8zap3vp28dr48s510lfrbfhw5yz25vng6wyk20582lv4j2mz8"; buildDepends = [ failure transformers ]; meta = { homepage = "http://github.com/snoyberg/neither"; - description = "Provide versions of Either with good monad and applicative instances"; + description = "Provide versions of Either with good monad and applicative instances. (deprecated)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index b0d70a8fbfde3..fb23dbce0efea 100644 --- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-css"; - version = "0.10.5"; - sha256 = "1cnv9qgp1llrrvcqp64mq207wdsxpqza9yq5nzlsgrh6qlzvm4hs"; + version = "0.10.6"; + sha256 = "18hcrsmw7xg2cdzyb413rc1bg507y4kr6q1l3mbxgnzqnffik6d7"; buildDepends = [ parsec shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/templates"; diff --git a/pkgs/development/libraries/haskell/vault/default.nix b/pkgs/development/libraries/haskell/vault/default.nix new file mode 100644 index 0000000000000..2781de9ebe636 --- /dev/null +++ b/pkgs/development/libraries/haskell/vault/default.nix @@ -0,0 +1,17 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "vault"; + version = "0.1.0.0"; + sha256 = "02gki0g9mwmvvizxhk6myfg3dmlqpcjjiz5c8693a060hkr0grqq"; + meta = { + homepage = "https://github.com/HeinrichApfelmus/vault"; + description = "a typed, persistent store for values of arbitrary types"; + 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-quasi/default.nix b/pkgs/development/libraries/haskell/web-routes-quasi/default.nix index 1660809df1aa2..7ecc85742e1e7 100644 --- a/pkgs/development/libraries/haskell/web-routes-quasi/default.nix +++ b/pkgs/development/libraries/haskell/web-routes-quasi/default.nix @@ -2,14 +2,14 @@ cabal.mkDerivation (self: { pname = "web-routes-quasi"; - version = "0.7.1"; - sha256 = "0m5p21kbiawjpcs5c83aaypmpmx4avjcj0kzkn95zgdkqcz5kr12"; + 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"; + 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 = [ diff --git a/pkgs/development/libraries/haskell/web-routes/default.nix b/pkgs/development/libraries/haskell/web-routes/default.nix index 84ba6ed7fc622..a6ac919ba71db 100644 --- a/pkgs/development/libraries/haskell/web-routes/default.nix +++ b/pkgs/development/libraries/haskell/web-routes/default.nix @@ -1,10 +1,14 @@ -{ cabal, mtl, network, parsec, utf8String }: +{ cabal, blazeBuilder, httpTypes, mtl, network, parsec, text +, utf8String +}: cabal.mkDerivation (self: { pname = "web-routes"; - version = "0.25.3"; - sha256 = "09bqz7vn2050jr67m3rrqi0krfxa9n1fxm9rgi3c837g522nb4kk"; - buildDepends = [ mtl network parsec utf8String ]; + version = "0.26.2"; + sha256 = "0v7vkd53jf9zf2m0lbiq10qp39ghlnxwafs1hixbz2qfcgsns10j"; + 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; diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix index 8d696bae4dce2..bf20012aef2b1 100644 --- a/pkgs/development/libraries/haskell/xml-conduit/default.nix +++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "xml-conduit"; - version = "0.5.1.1"; - sha256 = "0md6fkjn8j1dsbhlwh64x2990kvsmks6plppa63v9nwc9142ajim"; + version = "0.5.1.2"; + sha256 = "0ww018aj4fy0hngjsj1lc5m7sw36kdc1z2p8nxp4pgsmhj0ccm36"; buildDepends = [ attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit conduit dataDefault failure systemFilepath text transformers diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix index c9b02d1cef2a8..362ecd403d2e5 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, pth, libgpgerror }: stdenv.mkDerivation rec { - name = "libassuan-2.0.2"; + name = "libassuan-2.0.3"; src = fetchurl { url = "mirror://gnupg/libassuan/${name}.tar.bz2"; - sha256 = "1n5lfpafq9sjb3r06lw7vrrjmbs3p035zfakx7ff5bfb7niwpq31"; + sha256 = "06xckkvxxlx7cj77803m8x58gxksap4k8yhspc5cqsy7fhinimds"; }; propagatedBuildInputs = [ pth libgpgerror ]; diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index 3c72382dea4ff..6da91d98d13ac 100644 --- a/pkgs/development/libraries/libidn/default.nix +++ b/pkgs/development/libraries/libidn/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "libidn-1.23"; + name = "libidn-1.24"; src = fetchurl { url = "mirror://gnu/libidn/${name}.tar.gz"; - sha256 = "0sjy1k35x3r5vfkd5j21gy0xdlzg9svm74wn3hpfbfhyhmsjvd15"; + sha256 = "1zrmbwxvgmv7d37sdnlfn4lf3pxc7vgng3lhl18pkjry0v30h5ys"; }; doCheck = ! stdenv.isDarwin; diff --git a/pkgs/development/libraries/libktorrent/default.nix b/pkgs/development/libraries/libktorrent/default.nix index e452097e50dcd..1f50f1b976bfb 100644 --- a/pkgs/development/libraries/libktorrent/default.nix +++ b/pkgs/development/libraries/libktorrent/default.nix @@ -1,18 +1,22 @@ { stdenv, fetchurl, kdelibs, cmake, gmp, qca2, boost, gettext, qt4, automoc4 , phonon, libgcrypt }: +let + mp_ = "1.3"; + version = "1.${mp_}"; + version4 = "4.${mp_}"; +in stdenv.mkDerivation rec { name = pname + "-" + version; pname = "libktorrent"; - version = "1.1.1"; src = fetchurl { - url = "http://ktorrent.org/downloads/4.1.1/${name}.tar.bz2"; - sha256 = "06d93xpshxawz49hqh6pvypir4ygm1f781hs7yim5k6b7shivfs1"; + url = "http://ktorrent.org/downloads/${version4}/${name}.tar.bz2"; + sha256 = "0mvvx6mdfy0pyhk6lwwmmbd3pd2ai6n2rf5kdjqhpkm9wbrck85n"; }; - buildInputs = - [ cmake kdelibs qt4 automoc4 phonon gmp qca2 boost libgcrypt gettext ]; + buildNativeInputs = [ cmake automoc4 gettext ]; + buildInputs = [ kdelibs phonon gmp qca2 boost libgcrypt ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix index cca5c5aaa9f4e..68d5eefa4537a 100644 --- a/pkgs/development/libraries/ucommon/default.nix +++ b/pkgs/development/libraries/ucommon/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, gnutls, pkgconfig, zlib, libgcrypt }: stdenv.mkDerivation rec { - name = "ucommon-5.0.7"; + name = "ucommon-5.1.2"; src = fetchurl { - url = mirror://gnu/commoncpp/ucommon-5.0.7.tar.gz; - sha256 = "0zr4zjwb62dpq7aa88vclhv2y8j7glkq693kwmb8agfx0fv8nkny"; + url = mirror://gnu/commoncpp/ucommon-5.1.2.tar.gz; + sha256 = "1a6wfvrqpkk4w3l33jx5bdj38ljlyr92041aakvwmajpkczjf2q3"; }; buildInputs = [ pkgconfig gnutls zlib ]; diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index b67b015e018db..8f9543b2bef99 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -1,35 +1,36 @@ -{ stdenv, fetchsvn, python, scons, makeWrapper }: +{ stdenv, fetchsvn, python, scons, readline, makeWrapper }: + +assert readline != null; let system = stdenv.system; - arch = if system == "i686-linux" then "ia32" else if system == "x86_64-linux" then "x64" else ""; + arch = if system == "i686-linux" then "ia32" else if system == "x86_64-linux" then "x64" else ""; + version = "3.6.6.17"; in assert system == "i686-linux" || system == "x86_64-linux"; stdenv.mkDerivation rec { - name = "v8-r${toString src.rev}"; + name = "v8-${version}"; src = fetchsvn { - url = http://v8.googlecode.com/svn/trunk ; - sha256 = "1p51zh1l9c2gq3g4qk713n6qki9by3llx4p46inncvqfrimgshxb"; - rev = 5865; + url = "http://v8.googlecode.com/svn/tags/${version}"; + sha256 = "7080d53b9d3aefc591c2e181dcf97d538ce36177284fc658eca6420ea36a926f"; }; - - buildInputs = [python scons makeWrapper]; - + + buildInputs = [python scons readline makeWrapper]; + buildPhase = '' export CXX=`type -p g++` - scons snapshot=on importenv=PATH arch=${arch} - scons snapshot=on library=shared importenv=PATH arch=${arch} - scons sample=shell snapshot=on importenv=PATH arch=${arch} + export CPPPATH=${readline}/include + export LIBPATH=${readline}/lib + scons snapshot=on console=readline library=shared importenv=PATH arch=${arch} library d8 ''; - + installPhase = '' mkdir -p $out/bin mkdir -p $out/lib - + cp -v libv8.* $out/lib - cp -v shell $out/bin/v8-shell + cp -v d8 $out/bin/d8 cp -vR include $out/ - wrapProgram $out/bin/v8-shell --set LD_LIBRARY_PATH $out/lib - + wrapProgram $out/bin/d8 --set LD_LIBRARY_PATH $out/lib ''; } |