diff options
Diffstat (limited to 'pkgs/development/libraries')
94 files changed, 942 insertions, 258 deletions
diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index 0983edbcdd2..8e6f6749533 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl}: let version = "7.1"; in -stdenv.mkDerivation { +stdenv.mkDerivation ({ name = "boehm-gc-${version}"; src = fetchurl { @@ -44,3 +44,10 @@ stdenv.mkDerivation { platforms = stdenv.lib.platforms.all; }; } + +// + +(if stdenv.system == "x86_64-darwin" + # Fix "#error ucontext routines are deprecated, and require _XOPEN_SOURCE to be defined". + then { configureFlags = "CPPFLAGS=-D_XOPEN_SOURCE"; } + else {})) diff --git a/pkgs/development/libraries/boost/1.41.0.nix b/pkgs/development/libraries/boost/1.42.0.nix index 1bd500e270a..4f71e7347a9 100644 --- a/pkgs/development/libraries/boost/1.41.0.nix +++ b/pkgs/development/libraries/boost/1.42.0.nix @@ -33,7 +33,7 @@ let in stdenv.mkDerivation { - name = "boost-1.41.0"; + name = "boost-1.42.0"; meta = { homepage = "http://boost.org/"; @@ -42,8 +42,8 @@ stdenv.mkDerivation { }; src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_41_0.tar.bz2"; - sha256 = "09n7bjac2nlp7c8khpml2mq4qm33w2dn4ksb50c37wga95klxy8y"; + url = "mirror://sourceforge/boost/boost_1_42_0.tar.bz2"; + sha256 = "02g6m6f7m11ig93p5sx7sfq75c15y9kn2pa3csn1bkjhs9dvj7jb"; }; buildInputs = [icu expat zlib bzip2 python]; diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/development/libraries/ccrtp/default.nix index d8b4793dcca..5424e7a73de 100644 --- a/pkgs/development/libraries/ccrtp/default.nix +++ b/pkgs/development/libraries/ccrtp/default.nix @@ -1,10 +1,10 @@ args: with args; stdenv.mkDerivation { - name = "ccrtp-1.7.0"; + name = "ccrtp-1.7.1"; src = fetchurl { - url = mirror://gnu/ccrtp/ccrtp-1.7.0.tar.gz; - sha256 = "1bjn5l476nk34gipz4jl2p83m735gzanzr046zrkx423zipx4g4j"; + url = mirror://gnu/ccrtp/ccrtp-1.7.1.tar.gz; + sha256 = "0psi91r0fgawpa5x4jiq7lkr180agdi25gi0mfriqcmykxg7r1jn"; }; buildInputs = [openssl pkgconfig libgcrypt commoncpp2]; diff --git a/pkgs/development/libraries/commoncpp2/default.nix b/pkgs/development/libraries/commoncpp2/default.nix index 28ba597e035..8f519a4b43c 100644 --- a/pkgs/development/libraries/commoncpp2/default.nix +++ b/pkgs/development/libraries/commoncpp2/default.nix @@ -1,20 +1,36 @@ -args: with args; -stdenv.mkDerivation { - name = "commoncpp2-2.0.8"; +{ fetchurl, stdenv }: + +stdenv.mkDerivation rec { + name = "commoncpp2-1.8.0"; src = fetchurl { - url = http://ftp.gnu.org/pub/gnu/commoncpp/ucommon-2.0.8.tar.gz; - sha256 = "09mk70kqwr1pmxa35x0is16g2sa60b3z8p4p5yccw59pp1hpxpq3"; + url = "mirror://gnu/commoncpp/${name}.tar.gz"; + sha256 = "0a7arpm9l3s5qics5m77lyx1yl7998lkypydqwx11nj730034nmc"; }; - buildInputs = []; + doCheck = true; + + meta = { + description = "GNU Common C++, a portable, highly optimized C++ class framework"; - meta = { - description = "highly portable application framework for threading,sockets, realtime network streaming, persistance, and file access"; + longDescription = + '' GNU Common C++ and GNU uCommon are very portable and highly + optimized class framework for writing C++ applications that need to + use threads and support concurrent sychronization, and that use + sockets, XML parsing, object serialization, thread-optimized String + and data structure classes, etc. This framework offers a class + foundation that hides platform differences from your C++ application + so that you need not write platform specific code. GNU Common C++ + has been ported to compile nativily on most platforms which support + either posix threads, or on maybe be used with Debian hosted mingw32 + to build native threading applications for Microsoft Windows. + ''; - homepage = http://sourceforge.net/projects/cplusplus/; - license = "LGPL"; - maintainers = [args.lib.maintainers.marcweber]; - platforms = args.lib.platforms.linux; + homepage = http://www.gnu.org/software/commoncpp/; + license = "GPLv2+"; + maintainers = [ stdenv.lib.maintainers.marcweber + stdenv.lib.maintainers.ludo + ]; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index c9b87ebb7d2..3552ad32346 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -1,5 +1,5 @@ -args: -with args; +{ stdenv, fetchurl, openssl, db4, gettext} : + stdenv.mkDerivation { name = "cyrus-sasl-2.1.23"; @@ -7,7 +7,9 @@ stdenv.mkDerivation { url = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-2.1.23.tar.gz; sha256 = "0dmi41hfy015pzks8n93qsshgvi0az7pv81nls4nxayb810crvr0"; }; - configureFlags="--with-openssl=${openssl} --with-plugindir=\${out}/lib/sasl2 --with-configdir=\${out}/lib/sasl2"; + preConfigure='' + configureFlags="--with-openssl=${openssl} --with-plugindir=$out/lib/sasl2 --with-configdir=$out/lib/sasl2" + ''; buildInputs = [ openssl db4 gettext ]; patches = [ ./cyrus-sasl-2.1.22-bad-elif.patch ]; } diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index a611a192d81..cdb9bb887e8 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -1,11 +1,11 @@ -{stdenv, fetchurl, faad2}: +{stdenv, fetchurl, faad2, libtheora, speex, libvorbis}: stdenv.mkDerivation { - name = "ffmpeg-0.5"; + name = "ffmpeg-0.5.1"; src = fetchurl { - url = http://www.ffmpeg.org/releases/ffmpeg-0.5.tar.bz2; - sha1 = "f930971bc0ac3d11a4ffbb1af439425c24f6f5b1"; + url = http://www.ffmpeg.org/releases/ffmpeg-0.5.1.tar.bz2; + sha256 = "0n68lihyy3jk4q7f22kv6nranfbafyl41hnzpa6cm0r0vf473gn2"; }; # `--enable-gpl' (as well as the `postproc' and `swscale') mean that @@ -19,9 +19,12 @@ stdenv.mkDerivation { --disable-ffplay --enable-libfaad --enable-shared + --enable-libtheora + --enable-libvorbis + --enable-libspeex ''; - buildInputs = [faad2]; + buildInputs = [faad2 libtheora speex libvorbis]; meta = { homepage = http://www.ffmpeg.org/; diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index d3a9f9ea3e8..1fb1cda3353 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -1,12 +1,12 @@ args: with args; let inherit (args.composableDerivation) composableDerivation edf; in -composableDerivation {} { +composableDerivation {} rec { - name = "fltk-2.0.x-r6483"; + name = "fltk-2.0.x-r6970"; src = args.fetchurl { - url = ftp://ftp.easysw.com/pub/fltk/snapshots/fltk-2.0.x-r6483.tar.bz2; - sha256 = "1n8b53r5p0zb4sbvr6pj8aasls4zjwksv1sdc3r3pzb20fikp5jb"; + url = "ftp://ftp.easysw.com/pub/fltk/snapshots/${name}.tar.bz2"; + sha256 = "0d88c16967ca40b26a70736b0d6874046c31a9e74816806816252e4eb72a84a3"; }; propagatedBuildInputs=[x11 inputproto libXi freeglut]; diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix index f13eadfa574..ec402b6bee0 100644 --- a/pkgs/development/libraries/freeimage/default.nix +++ b/pkgs/development/libraries/freeimage/default.nix @@ -1,9 +1,9 @@ {stdenv, fetchurl, unzip}: stdenv.mkDerivation { - name = "freeimage-3.13.0"; + name = "freeimage-3.13.1"; src = fetchurl { - url = mirror://sourceforge/freeimage/FreeImage3130.zip; - sha256 = "0hf642cb1bai1j4izvjnmili9ic335awa4jnn6nxa0bv6wfaa9x2"; + url = mirror://sourceforge/freeimage/FreeImage3131.zip; + sha256 = "1ilpfgyi3qhjra5hxvjcrq3bna909bgdl7rgmhkybmcpdq1x56rj"; }; buildInputs = [ unzip ]; patchPhase = '' diff --git a/pkgs/development/libraries/haskell/AspectAG/default.nix b/pkgs/development/libraries/haskell/AspectAG/default.nix new file mode 100644 index 00000000000..c9ede897ca0 --- /dev/null +++ b/pkgs/development/libraries/haskell/AspectAG/default.nix @@ -0,0 +1,14 @@ +{cabal, HList, mtl}: + +cabal.mkDerivation (self : { + pname = "AspectAG"; + version = "0.1.5"; + sha256 = "4cefc7e3404a723f0a75b29797bd9fe685c2a1b3150826b3ba09ade94565f6ff"; + propagatedBuildInputs = [HList mtl]; + meta = { + description = "Attribute Grammars in the form of an EDSL"; + license = "LGPL"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/ConfigFile/default.nix b/pkgs/development/libraries/haskell/ConfigFile/default.nix new file mode 100644 index 00000000000..3ad1f545067 --- /dev/null +++ b/pkgs/development/libraries/haskell/ConfigFile/default.nix @@ -0,0 +1,14 @@ +{cabal, mtl, parsec, MissingH}: + +cabal.mkDerivation (self : { + pname = "ConfigFile"; + version = "1.0.6"; + sha256 = "339722184b86d53d8b361933e572b6e1478824c7eba3fb66b67d0eb5245cd038"; + propagatedBuildInputs = [mtl parsec MissingH]; + meta = { + description = "Configuration file reading & writing"; + license = "LGPL"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix b/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix new file mode 100644 index 00000000000..9fa0690ad6b --- /dev/null +++ b/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix @@ -0,0 +1,12 @@ +{cabal, OpenGL, glut, libSM, libICE, libXmu, libXi, mesa}: + +cabal.mkDerivation (self : { + pname = "GLUT"; + version = "2.1.2.1"; # Haskell Platform 2010.1.0.0 + sha256 = "0230bfacbfb85c126f1fba45fcd8d02f20da9ee19180b5ada698224362d17264"; + propagatedBuildInputs = [OpenGL glut libSM libICE libXmu libXi mesa]; + meta = { + description = "A binding for the OpenGL Utility Toolkit"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/HStringTemplate/default.nix b/pkgs/development/libraries/haskell/HStringTemplate/default.nix index 0d2d723ef08..ddf5740d95a 100644 --- a/pkgs/development/libraries/haskell/HStringTemplate/default.nix +++ b/pkgs/development/libraries/haskell/HStringTemplate/default.nix @@ -1,10 +1,10 @@ -{cabal, parsec, time}: +{cabal, parsec, time, text, utf8String, parallel}: cabal.mkDerivation (self : { pname = "HStringTemplate"; - version = "0.5.1.3"; - sha256 = "1f9da3afcb2441d450051ea9836f25df69430eaf17593c39199ad686a828e044"; - propagatedBuildInputs = [parsec time]; + version = "0.6.2"; + sha256 = "1d8ae847cb2b92f6d083ee1ed5db00c719e51fe43017d4289dea61335a116103"; + propagatedBuildInputs = [parsec time text utf8String parallel]; meta = { description = "StringTemplate implementation in Haskell"; }; diff --git a/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix b/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix new file mode 100644 index 00000000000..0600a957883 --- /dev/null +++ b/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix @@ -0,0 +1,12 @@ +{cabal, mtl, network, parsec}: + +cabal.mkDerivation (self : { + pname = "HTTP"; + version = "4000.0.9"; # Haskell Platform 2010.1.0.0 + sha256 = "1e2b4a8b782ad1417c8755bb0d248851bc142b351366ed460e07f2945a5e95ba"; + propagatedBuildInputs = [mtl network parsec]; + meta = { + description = "a Haskell library for client-side HTTP"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix b/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix new file mode 100644 index 00000000000..9f52ed4048f --- /dev/null +++ b/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix @@ -0,0 +1,11 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "HUnit"; + version = "1.2.2.1"; # Haskell Platform 2010.1.0.0 + sha256 = "47235503b666658588181795540d29212283059b21edc42e1b4f1998e46ac853"; + meta = { + description = "A unit testing framework for Haskell"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/MaybeT-transformers/default.nix b/pkgs/development/libraries/haskell/MaybeT-transformers/default.nix new file mode 100644 index 00000000000..4b67f75ad25 --- /dev/null +++ b/pkgs/development/libraries/haskell/MaybeT-transformers/default.nix @@ -0,0 +1,14 @@ +{cabal, transformers, monadsFd}: + +cabal.mkDerivation (self : { + pname = "MaybeT-transformers"; + version = "0.1"; + sha256 = "b24b78e3a895587722c9ce899f9ef07b509db1a5b3b86f5b7b0e8bc986c8fb8f"; + propagatedBuildInputs = [transformers monadsFd]; + meta = { + description = "Support for computations with failures"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/MaybeT/default.nix b/pkgs/development/libraries/haskell/MaybeT/default.nix new file mode 100644 index 00000000000..783ff85d0c2 --- /dev/null +++ b/pkgs/development/libraries/haskell/MaybeT/default.nix @@ -0,0 +1,14 @@ +{cabal, mtl}: + +cabal.mkDerivation (self : { + pname = "MaybeT"; + version = "0.1.2"; + sha256 = "995e61165122656807d84174e5c1516340fd7ddeba6571c20751352a8476b632"; + propagatedBuildInputs = [mtl]; + meta = { + description = "MaybeT monad transformer"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/MissingH/default.nix b/pkgs/development/libraries/haskell/MissingH/default.nix new file mode 100644 index 00000000000..252eb88c929 --- /dev/null +++ b/pkgs/development/libraries/haskell/MissingH/default.nix @@ -0,0 +1,14 @@ +{cabal, HUnit, hslogger, network, parsec, regexCompat}: + +cabal.mkDerivation (self : { + pname = "MissingH"; + version = "1.1.0.3"; + sha256 = "2d566511e8a347189cf864188d97f8406c6958c6f0a6fcf8cb1593c6bae13dbf"; + propagatedBuildInputs = [HUnit hslogger network parsec regexCompat]; + meta = { + description = "Large utility library"; + license = "GPL"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix b/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix new file mode 100644 index 00000000000..e3cb4bdf4e6 --- /dev/null +++ b/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix @@ -0,0 +1,12 @@ +{cabal, mesa, libX11}: + +cabal.mkDerivation (self : { + pname = "OpenGL"; + version = "2.2.3.0"; # Haskell Platform 2010.1.0.0 + sha256 = "a75c3277bb20fda9a4ac1eb0e838fe4b5baf92f5539466b92bd255626afb0502"; + propagatedBuildInputs = [mesa libX11]; + meta = { + description = "A binding for the OpenGL graphics system"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/QuickCheck/QuickCheck-2.nix b/pkgs/development/libraries/haskell/QuickCheck/QuickCheck-2.nix index 4e9bdefc537..6ad15d15380 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/QuickCheck-2.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/QuickCheck-2.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "QuickCheck"; - version = "2.1.0.2"; - sha256 = "1adeea5aa52cba7b8bcd27f9cdd9fe944e9a4a22d22fdf0570b526f580981e58"; + version = "2.1.0.3"; # Haskell Platform 2010.1.0.0 + sha256 = "91a861233fe0a37a032d092dd5e8ec40c2c99fbbf0701081394eb244f23757b1"; propagatedBuildInputs = [mtl]; meta = { description = "Automatic testing of Haskell programs"; diff --git a/pkgs/development/libraries/haskell/SHA/default.nix b/pkgs/development/libraries/haskell/SHA/default.nix index 2d51cddca74..f958ec713a1 100644 --- a/pkgs/development/libraries/haskell/SHA/default.nix +++ b/pkgs/development/libraries/haskell/SHA/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "SHA"; - version = "1.4.0"; - sha256 = "7f08042fddadd8e3795d627a042d1884b33e066ab67d03b6de92551a4ad9fc7d"; + version = "1.4.1.1"; + sha256 = "8ecdc91679d1aa1d4050e1124cf5af79ae2ece66aee3b907e1078d71bf03169a"; propagatedBuildInputs = [binary]; meta = { description = "Implementations of the SHA suite of message digest functions"; diff --git a/pkgs/development/libraries/haskell/SMTPClient/default.nix b/pkgs/development/libraries/haskell/SMTPClient/default.nix new file mode 100644 index 00000000000..2da9beea525 --- /dev/null +++ b/pkgs/development/libraries/haskell/SMTPClient/default.nix @@ -0,0 +1,14 @@ +{cabal, hsemail, network}: + +cabal.mkDerivation (self : { + pname = "SMTPClient"; + version = "1.0.2"; + sha256 = "b835cebf22e9281778deeec3ceffeb95aa8ae9c0e1f97e8e9734cf5d87ecba5f"; + propagatedBuildInputs = [hsemail network]; + meta = { + description = "A simple SMTP client library"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/bimap/default.nix b/pkgs/development/libraries/haskell/bimap/default.nix new file mode 100644 index 00000000000..ec2dd1d3632 --- /dev/null +++ b/pkgs/development/libraries/haskell/bimap/default.nix @@ -0,0 +1,13 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "bimap"; + version = "0.2.4"; + sha256 = "d991ae393ade2191f42d8a0d659d2b9a749675735eb5b57872f577ede82565c5"; + meta = { + description = "Bidirectional mapping between two key types"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/cabal/cabal.nix b/pkgs/development/libraries/haskell/cabal/cabal.nix index 1bda5329c52..7ee0cfcccb9 100644 --- a/pkgs/development/libraries/haskell/cabal/cabal.nix +++ b/pkgs/development/libraries/haskell/cabal/cabal.nix @@ -93,7 +93,7 @@ attrs : fi ensureDir $out/nix-support - ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages + ln -s $out/nix-support/propagated-build-native-inputs $out/nix-support/propagated-user-env-packages eval "$postInstall" ''; diff --git a/pkgs/development/libraries/haskell/cautious-file/default.nix b/pkgs/development/libraries/haskell/cautious-file/default.nix new file mode 100644 index 00000000000..16fe6672bc7 --- /dev/null +++ b/pkgs/development/libraries/haskell/cautious-file/default.nix @@ -0,0 +1,13 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "cautious-file"; + version = "0.1.5"; + sha256 = "0d7b7bf530476b89ffc22bf6e586402b0fd6fd5571cc941df08838c5a890ad01"; + meta = { + description = "Ways to write a file cautiously"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix new file mode 100644 index 00000000000..89e6df5004c --- /dev/null +++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix @@ -0,0 +1,12 @@ +{cabal, mtl, network, parsec, xhtml}: + +cabal.mkDerivation (self : { + pname = "cgi"; + version = "3001.1.7.2"; # Haskell Platform 2010.1.0.0 + sha256 = "ad35971388fa1809a5cd71bb2f051d69d753e4153b43d843b431674cf79a1c39"; + propagatedBuildInputs = [mtl network parsec xhtml]; + meta = { + description = "A library for writing CGI programs"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/deepseq/default.nix b/pkgs/development/libraries/haskell/deepseq/default.nix new file mode 100644 index 00000000000..6658f86de75 --- /dev/null +++ b/pkgs/development/libraries/haskell/deepseq/default.nix @@ -0,0 +1,11 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "deepseq"; + version = "1.1.0.0"; # Haskell Platform 2010.1.0.0 + sha256 = "947c45e7ee862159f190fb8e905c1328f7672cb9e6bf3abd1d207bbcf1eee50a"; + meta = { + description = "Provides a deep version of seq, for fully evaluating data structures"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix new file mode 100644 index 00000000000..4c13955a77e --- /dev/null +++ b/pkgs/development/libraries/haskell/fclabels/default.nix @@ -0,0 +1,14 @@ +{cabal, monadsFd}: + +cabal.mkDerivation (self : { + pname = "fclabels"; + version = "0.4.2"; + sha256 = "d1abfd94f8970e55ed839645a58697b8beeacc5e5ea4a5861001539aa8fc28d7"; + propagatedBuildInputs = [monadsFd]; + meta = { + description = "First class accessor labels"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/feed/default.nix b/pkgs/development/libraries/haskell/feed/default.nix new file mode 100644 index 00000000000..7ba92613c5e --- /dev/null +++ b/pkgs/development/libraries/haskell/feed/default.nix @@ -0,0 +1,14 @@ +{cabal, utf8String, xml}: + +cabal.mkDerivation (self : { + pname = "feed"; + version = "0.3.7"; + sha256 = "c2d539f763cdce1b1498f1fd0707b12078337aff690f01e41db0b6e3569c08aa"; + propagatedBuildInputs = [utf8String xml]; + meta = { + description = "Interfacing with RSS and Atom feeds"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/fgl/default.nix b/pkgs/development/libraries/haskell/fgl/default.nix index 062e0a5ac59..f14031aec5f 100644 --- a/pkgs/development/libraries/haskell/fgl/default.nix +++ b/pkgs/development/libraries/haskell/fgl/default.nix @@ -2,7 +2,7 @@ cabal.mkDerivation (self : { pname = "fgl"; - version = "5.4.2.2"; + version = "5.4.2.2"; # Haskell Platform 2010.1.0.0 sha256 = "8232c337f0792854bf2a12a5fd1bc46726fff05d2f599053286ff873364cd7d2"; propagatedBuildInputs = [mtl]; meta = { diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix index db84d059782..2d3fc926857 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.3.1"; - sha256 = "f18baafb50367d8d0a0e8da2873fd97033bb763d8776473e594c84c079017aa0"; + version = "0.3.4.1"; + sha256 = "ad04333fae938ae7de747457a6bdee30c6e4b700733265dbd1f4f8ee363c8230"; propagatedBuildInputs = [datetime parsec regexPosix split time utf8String xml Diff]; meta = { description = "Interface for versioning file stores"; diff --git a/pkgs/development/libraries/haskell/gdiff/default.nix b/pkgs/development/libraries/haskell/gdiff/default.nix new file mode 100644 index 00000000000..3ea5e4877fa --- /dev/null +++ b/pkgs/development/libraries/haskell/gdiff/default.nix @@ -0,0 +1,13 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "gdiff"; + version = "1.0"; + sha256 = "35257b1090cf78f95d24c7a89920863c1d824652311fa5793693d7d06d96517b"; + meta = { + description = "Generic diff and patch"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/ghc-paths/0.1.0.6.nix b/pkgs/development/libraries/haskell/ghc-paths/0.1.0.6.nix new file mode 100644 index 00000000000..f8c4a29e5e1 --- /dev/null +++ b/pkgs/development/libraries/haskell/ghc-paths/0.1.0.6.nix @@ -0,0 +1,11 @@ +{ cabal } : + +cabal.mkDerivation (self : { + pname = "ghc-paths"; + version = "0.1.0.6"; + sha256 = "95d8c0e6ce2f182d792e910149b3c81c381b7d2c2052ffc6d96128b071c55243"; + meta = { + description = "Knowledge of GHC's installations directories"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix index bee6f3fb564..5bebdf7de35 100644 --- a/pkgs/development/libraries/haskell/gitit/default.nix +++ b/pkgs/development/libraries/haskell/gitit/default.nix @@ -1,17 +1,23 @@ -{cabal, HAppSServer, HStringTemplate, HTTP, SHA, cgi, datetime, - filestore, highlightingKate, mtl, network, pandoc, parsec, - recaptcha, utf8String, xhtml, zlib}: +{cabal, happstackServer, happstackUtil, HStringTemplate, HTTP, + SHA, cgi, datetime, + filestore, highlightingKate, safe, mtl, network, pandoc, parsec, + recaptcha, utf8String, xhtml, zlib, ConfigFile, url, + cautiousFile, feed}: cabal.mkDerivation (self : { pname = "gitit"; - version = "0.5.3"; - sha256 = "d8e1c319e52edc6f2e92d1d22b8995f38b31f6aa0b6649aa73877e889ff45851"; - propagatedBuildInputs = - [HAppSServer HStringTemplate HTTP SHA cgi datetime filestore - highlightingKate mtl network pandoc parsec recaptcha utf8String - xhtml zlib]; + version = "0.7.3.5"; + sha256 = "50cf6b853d439904e54884660eba6ffdc31b938e077fd0d9457fba972d4bde9f"; + propagatedBuildInputs = [ + HStringTemplate happstackServer happstackUtil HTTP SHA cgi datetime + filestore highlightingKate safe + mtl network pandoc parsec recaptcha utf8String xhtml zlib ConfigFile + url cautiousFile feed + ]; meta = { description = "Wiki using HAppS, git or darcs, and pandoc"; + license = "GPL"; + maintainers = [self.stdenv.lib.maintainers.andres]; }; }) diff --git a/pkgs/development/libraries/haskell/happstack/happstack-data.nix b/pkgs/development/libraries/haskell/happstack/happstack-data.nix new file mode 100644 index 00000000000..9b18652642f --- /dev/null +++ b/pkgs/development/libraries/haskell/happstack/happstack-data.nix @@ -0,0 +1,13 @@ +{cabal, mtl, sybWithClass, HaXml, happstackUtil, binary}: + +cabal.mkDerivation (self : { + pname = "happstack-data"; + version = "0.4.1"; + sha256 = "0d1f96472a4e13b9a5218bce8bf819a50d1773b7e110141ab235d1d7701e39f6"; + propagatedBuildInputs = [mtl sybWithClass HaXml happstackUtil binary]; + meta = { + description = "Happstack data manipulation libraries"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix new file mode 100644 index 00000000000..c1d66c0fabc --- /dev/null +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -0,0 +1,16 @@ +{cabal, HUnit, HaXml, MaybeT, parsec, sendfile, utf8String, mtl, network, hslogger, happstackData, happstackUtil, xhtml, html, zlib}: + +cabal.mkDerivation (self : { + pname = "happstack-server"; + version = "0.4.1"; + sha256 = "2a5d32b4e635160ffab8a90891d9c5ca0433969944ae4013ec8cebe25ba63658"; + propagatedBuildInputs = [ + HUnit HaXml MaybeT happstackData happstackUtil hslogger html + mtl network parsec sendfile utf8String xhtml zlib + ]; + meta = { + description = "Web related tools and services"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) diff --git a/pkgs/development/libraries/haskell/happstack/happstack-util.nix b/pkgs/development/libraries/haskell/happstack/happstack-util.nix new file mode 100644 index 00000000000..4ba0854d37a --- /dev/null +++ b/pkgs/development/libraries/haskell/happstack/happstack-util.nix @@ -0,0 +1,17 @@ +{cabal, mtl, hslogger, HUnit, QuickCheck, strictConcurrency, + unixCompat, SMTPClient}: + +cabal.mkDerivation (self : { + pname = "happstack-util"; + version = "0.4.1"; + sha256 = "bb254140c30c39c420bc5a649da645f59df950f0a712c2dac4de1cc6572f05f9"; + propagatedBuildInputs = [ + mtl hslogger HUnit QuickCheck strictConcurrency unixCompat + SMTPClient + ]; + meta = { + description = "Miscellaneous utilities for Happstack packages"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) diff --git a/pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix new file mode 100644 index 00000000000..8d34277d846 --- /dev/null +++ b/pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix @@ -0,0 +1,21 @@ +{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl, + haskellSrc, html, network, parallel, regexBase, regexCompat, regexPosix, + stm, xhtml, zlib, cabalInstall, alex, happy, haddock, ghc}: + +cabal.mkDerivation (self : { + pname = "haskell-platform"; + version = "2010.1.0.0"; + src = fetchurl { + url = "http://hackage.haskell.org/platform/${self.version}/cabal/${self.pname}-${self.version}.tar.gz"; + sha256 = "64c9fec5cdc4b6f515b7f296d59984d2dee05927b7e24ea67324ad5f4ac3e994"; + }; + propagatedBuildInputs = [ + GLUT HTTP HUnit OpenGL QuickCheck cgi fgl + haskellSrc html network parallel regexBase regexCompat regexPosix + stm xhtml zlib cabalInstall alex happy ghc haddock + ]; + meta = { + description = "Haskell Platform meta package"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix index f94f768febb..d6d69f398ba 100644 --- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix +++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "highlighting-kate"; - version = "0.2.5"; - sha256 = "0a11f29a61b9c907d3b79540e0b2ac3b6194bd4bc37b6405973cd9eeb7a9a868"; + version = "0.2.6.2"; + sha256 = "3ed163888d45d5bf5ee5c2931e894f6ca2eb167a79ac8274d7f57341c4c5dca7"; propagatedBuildInputs = [parsec pcreLight xhtml]; meta = { description = "Syntax highlighting"; diff --git a/pkgs/development/libraries/haskell/hsemail/default.nix b/pkgs/development/libraries/haskell/hsemail/default.nix new file mode 100644 index 00000000000..bce28aa71fa --- /dev/null +++ b/pkgs/development/libraries/haskell/hsemail/default.nix @@ -0,0 +1,14 @@ +{cabal, mtl, parsec}: + +cabal.mkDerivation (self : { + pname = "hsemail"; + version = "1.6"; + sha256 = "a8ba7e8cfb9213bb2ee61166bc8352e4353560d06f418a0c729aeb1d50b3a1fd"; + propagatedBuildInputs = [mtl parsec]; + meta = { + description = "Internet Message Parsers"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/jpeg/default.nix b/pkgs/development/libraries/haskell/jpeg/default.nix new file mode 100644 index 00000000000..f9d5b6efa8f --- /dev/null +++ b/pkgs/development/libraries/haskell/jpeg/default.nix @@ -0,0 +1,14 @@ +{cabal, mtl}: + +cabal.mkDerivation (self : { + pname = "jpeg"; + version = "0.0.1"; + sha256 = "848e047cfec5781a28f472e9cd27d016362211d88dd6adb4f826c37d29d8bba6"; + propagatedBuildInputs = [mtl]; + meta = { + description = "JPEG decompression library"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/monads-fd/default.nix b/pkgs/development/libraries/haskell/monads-fd/default.nix new file mode 100644 index 00000000000..d84d84975ae --- /dev/null +++ b/pkgs/development/libraries/haskell/monads-fd/default.nix @@ -0,0 +1,14 @@ +{cabal, transformers}: + +cabal.mkDerivation (self : { + pname = "monads-fd"; + version = "0.0.0.1"; + sha256 = "7eaac97b2c91a670171f18ebeb3f73b1a45e16576851279f73ea2e1f5ec63b25"; + propagatedBuildInputs = [transformers]; + meta = { + description = "Monad classes, using functional dependencies"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/mtl/default.nix b/pkgs/development/libraries/haskell/mtl/default.nix index 5881a2cd3df..6c8b1cf960d 100644 --- a/pkgs/development/libraries/haskell/mtl/default.nix +++ b/pkgs/development/libraries/haskell/mtl/default.nix @@ -2,7 +2,7 @@ cabal.mkDerivation (self : { pname = "mtl"; - version = "1.1.0.2"; # Haskell Platform 2009.0.0 + version = "1.1.0.2"; # Haskell Platform 2009.0.0 and 2010.1.0.0 sha256 = "a225aaf2b1e337f40c31e5c42f95eec9a4608322b0e4c135d2b31b8421a58d36"; meta = { description = "Monad transformer library"; diff --git a/pkgs/development/libraries/haskell/network/2.2.1.7.nix b/pkgs/development/libraries/haskell/network/2.2.1.7.nix new file mode 100644 index 00000000000..e04af7a932b --- /dev/null +++ b/pkgs/development/libraries/haskell/network/2.2.1.7.nix @@ -0,0 +1,12 @@ +{cabal, parsec}: + +cabal.mkDerivation (self : { + pname = "network"; + version = "2.2.1.7"; # Haskell Platform 2010.1.0.0 + sha256 = "0e65b28a60764245c1ab6661a3566f286feb36e0e6f0296d6cd2b84adcd45d58"; + propagatedBuildInputs = [parsec]; + meta = { + description = "Networking-related facilities"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index 1e7ab185bd7..de77d27c8b0 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -1,10 +1,13 @@ -{cabal, mtl, network, parsec, utf8String, xhtml, zipArchive}: +{cabal, mtl, network, parsec, utf8String, xhtml, zipArchive, HTTP, xml, + texmath}: cabal.mkDerivation (self : { pname = "pandoc"; - version = "1.2"; - sha256 = "e922c8f4765a8d105abf30dbe21a73961357929cd2fb8dfd323f0f62ca0723b4"; - propagatedBuildInputs = [mtl network parsec utf8String xhtml zipArchive]; + version = "1.5.1.1"; + sha256 = "6d2283cb618fcaea5ee5cb885ef6532bc34628b351f14a6bd85b098d7a4128d9"; + propagatedBuildInputs = [ + mtl network parsec utf8String xhtml zipArchive HTTP xml texmath + ]; meta = { description = "Conversion between markup formats"; }; diff --git a/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix b/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix new file mode 100644 index 00000000000..38ec8247076 --- /dev/null +++ b/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix @@ -0,0 +1,12 @@ +{cabal, deepseq}: + +cabal.mkDerivation (self : { + pname = "parallel"; + version = "2.2.0.1"; # Haskell Platform 2010.1.0.0 + sha256 = "255310023138ecf618c8b450203fa2fc65feb68cd08ee4d369ceae72054168fd"; + propagatedBuildInputs = [deepseq]; + meta = { + description = "parallel programming library"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/parsec/default.nix b/pkgs/development/libraries/haskell/parsec/default.nix index e0564d5720d..b0dcf5ef0e4 100644 --- a/pkgs/development/libraries/haskell/parsec/default.nix +++ b/pkgs/development/libraries/haskell/parsec/default.nix @@ -2,7 +2,7 @@ cabal.mkDerivation (self : { pname = "parsec"; - version = "2.1.0.1"; # Haskell Platform 2009.0.0 + version = "2.1.0.1"; # Haskell Platform 2009.0.0 and 2010.1.0.0 sha256 = "2d85e5b5c8b2b1f341037ce67e1db7fa47b31c083136796cfef9e5b945c656df"; meta = { description = "Monadic parser combinators"; diff --git a/pkgs/development/libraries/haskell/pureMD5/default.nix b/pkgs/development/libraries/haskell/pureMD5/default.nix new file mode 100644 index 00000000000..1e56df6d4bd --- /dev/null +++ b/pkgs/development/libraries/haskell/pureMD5/default.nix @@ -0,0 +1,14 @@ +{cabal, binary}: + +cabal.mkDerivation (self : { + pname = "pureMD5"; + version = "1.0.0.3"; + sha256 = "3698e5bc8a0e20bed91b52f976235e52f2c1dd876aa40e94d6c7be293d67d482"; + propagatedBuildInputs = [binary]; + meta = { + description = "An unrolled implementation of MD5 purely in Haskell"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/regex-base/0.93.1.nix b/pkgs/development/libraries/haskell/regex-base/0.93.1.nix new file mode 100644 index 00000000000..73d5afeedb2 --- /dev/null +++ b/pkgs/development/libraries/haskell/regex-base/0.93.1.nix @@ -0,0 +1,12 @@ +{cabal, mtl}: + +cabal.mkDerivation (self : { + pname = "regex-base"; + version = "0.93.1"; # Haskell Platform 2010.1.0.0 + sha256 = "24a0e76ab308517a53d2525e18744d9058835626ed4005599ecd8dd4e07f3bef"; + propagatedBuildInputs = [mtl]; + meta = { + description = "Replaces/Ehances Text.Regex"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/regex-compat/0.92.nix b/pkgs/development/libraries/haskell/regex-compat/0.92.nix new file mode 100644 index 00000000000..68e9d2321d0 --- /dev/null +++ b/pkgs/development/libraries/haskell/regex-compat/0.92.nix @@ -0,0 +1,12 @@ +{cabal, regexBase, regexPosix}: + +cabal.mkDerivation (self : { + pname = "regex-compat"; + version = "0.92"; # Haskell Platform 2010.1.0.0 + sha256 = "430d251bd704071fca1e38c9b250543f00d4e370382ed552ac3d7407d4f27936"; + propagatedBuildInputs = [regexBase regexPosix]; + meta = { + description = "Replaces/Enhances Text.Regex"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix b/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix new file mode 100644 index 00000000000..1e7db2ab0b1 --- /dev/null +++ b/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix @@ -0,0 +1,12 @@ +{cabal, regexBase}: + +cabal.mkDerivation (self : { + pname = "regex-posix"; + version = "0.94.1"; # Haskell Platform 2010.1.0.0 + sha256 = "63e76de0610d35f1b576ae65a25a38e04e758ed64b9b3512de95bdffd649485c"; + propagatedBuildInputs = [regexBase]; + meta = { + description = "Replaces/Enhances Text.Regex"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/safe/default.nix b/pkgs/development/libraries/haskell/safe/default.nix new file mode 100644 index 00000000000..0c41af7e1d3 --- /dev/null +++ b/pkgs/development/libraries/haskell/safe/default.nix @@ -0,0 +1,13 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "safe"; + version = "0.2"; + sha256 = "73b9a247c3ba8092236c8c912687399778ff31bf3df42d707563a1528a6fc0e0"; + meta = { + description = "Library for safe (pattern match free) functions"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/salvia-protocol/default.nix b/pkgs/development/libraries/haskell/salvia-protocol/default.nix new file mode 100644 index 00000000000..e1418423ae8 --- /dev/null +++ b/pkgs/development/libraries/haskell/salvia-protocol/default.nix @@ -0,0 +1,14 @@ +{cabal, fclabels, parsec, safe, split, utf8String, bimap}: + +cabal.mkDerivation (self : { + pname = "salvia-protocol"; + version = "1.0.1"; + sha256 = "6b2312e52efaa81feec7461b1a3db77e1f2a8dfd829ae878b614c206a5e48928"; + propagatedBuildInputs = [fclabels parsec safe split utf8String bimap]; + meta = { + description = "Salvia webserver protocol suite"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/salvia/default.nix b/pkgs/development/libraries/haskell/salvia/default.nix new file mode 100644 index 00000000000..658273ead31 --- /dev/null +++ b/pkgs/development/libraries/haskell/salvia/default.nix @@ -0,0 +1,19 @@ +{cabal, fclabels, MaybeTTransformers, monadsFd, pureMD5, safe, + salviaProtocol, split, text, threadmanager, transformers, utf8String, + network, stm, time}: + +cabal.mkDerivation (self : { + pname = "salvia"; + version = "1.0.0"; + sha256 = "d1be63e3eb7cb071e8e339d730692b3ce52576e513f718b89a194b17878496e1"; + propagatedBuildInputs = [ + fclabels MaybeTTransformers monadsFd pureMD5 safe salviaProtocol + split text threadmanager transformers utf8String network stm time + ]; + meta = { + description = "Modular web application framework"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/sendfile/default.nix b/pkgs/development/libraries/haskell/sendfile/default.nix new file mode 100644 index 00000000000..f35719d75f4 --- /dev/null +++ b/pkgs/development/libraries/haskell/sendfile/default.nix @@ -0,0 +1,14 @@ +{cabal, network}: + +cabal.mkDerivation (self : { + pname = "sendfile"; + version = "0.6.1"; + sha256 = "c21b7f0f9a03a5e6d9b0691f5f0be9969d175f0514becdc199f0fd49097e51a2"; + propagatedBuildInputs = [network]; + meta = { + description = "A portable sendfile library"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/stm/default.nix b/pkgs/development/libraries/haskell/stm/default.nix index 707fd980cbf..de3f7e3bc03 100644 --- a/pkgs/development/libraries/haskell/stm/default.nix +++ b/pkgs/development/libraries/haskell/stm/default.nix @@ -2,7 +2,7 @@ cabal.mkDerivation (self : { pname = "stm"; - version = "2.1.1.2"; # Haskell Platform 2009.0.0 + version = "2.1.1.2"; # Haskell Platform 2009.0.0 and 2010.1.0.0 sha256 = "68d550067ae180373142c51f3fa14bdf0a1516310aee9a37e28f9ac7cf3b8c6d"; meta = { description = "Software Transactional Memory"; diff --git a/pkgs/development/libraries/haskell/strictConcurrency/default.nix b/pkgs/development/libraries/haskell/strictConcurrency/default.nix index 6e43e157c37..5e90fd74e1a 100644 --- a/pkgs/development/libraries/haskell/strictConcurrency/default.nix +++ b/pkgs/development/libraries/haskell/strictConcurrency/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "strict-concurrency"; - version = "0.2.1"; - sha256 = "8838600033bde2ce7ca6bd95a3815412da67244b57dfc0e2246a8f2469f5fd9c"; + version = "0.2.3"; + sha256 = "21641b983b226e47727ff565184a5f2b312c7979ff487a5e478f5cfc82f78f18"; propagatedBuildInputs = [parallel]; meta = { description = "Strict concurrency abstractions"; diff --git a/pkgs/development/libraries/haskell/syb/syb-with-class.nix b/pkgs/development/libraries/haskell/syb/syb-with-class.nix index 5e9c4dff083..e6ea92a169e 100644 --- a/pkgs/development/libraries/haskell/syb/syb-with-class.nix +++ b/pkgs/development/libraries/haskell/syb/syb-with-class.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "syb-with-class"; - version = "0.5.1"; - sha256 = "71f8ada3f5c3a41cbbc73f11ba4d1ffd51509716657564f12856f94f041ecbd6"; + version = "0.6"; + sha256 = "8ee836b491b0f64ab0920d1a7314323439665a7b1afa78810cbbc95dc658bfdc"; meta = { description = "Scrap Your Boilerplate With Class"; }; diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix new file mode 100644 index 00000000000..66369cb60ba --- /dev/null +++ b/pkgs/development/libraries/haskell/texmath/default.nix @@ -0,0 +1,14 @@ +{cabal, cgi, json, parsec, xml}: + +cabal.mkDerivation (self : { + pname = "texmath"; + version = "0.2.0.3"; + sha256 = "d355a298d28b9f5356926c2d2942f28ed07afa9d944cadfa47d8cdec73725b55"; + propagatedBuildInputs = [cgi json parsec xml]; + meta = { + description = "Conversion of LaTeX math formulas to MathML"; + license = "GPL"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/text/default.nix b/pkgs/development/libraries/haskell/text/default.nix index 3fb02befcfa..e2c4b2f13d6 100644 --- a/pkgs/development/libraries/haskell/text/default.nix +++ b/pkgs/development/libraries/haskell/text/default.nix @@ -1,11 +1,14 @@ -{cabal}: +{cabal, deepseq}: cabal.mkDerivation (self : { pname = "text"; - version = "0.5"; - sha256 = "02c3b6a57e1250dc0945d909dffdc256c2e720e751b8a75d6117522c85100fc2"; + version = "0.7.1.0"; + sha256 = "a6daa0ee43ddede620363ab26614fef69361bd5b8f77aa6918b5a4ecb083f425"; + propagatedBuildInputs = [deepseq]; meta = { description = "An efficient package Unicode text type"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; }; }) diff --git a/pkgs/development/libraries/haskell/threadmanager/default.nix b/pkgs/development/libraries/haskell/threadmanager/default.nix new file mode 100644 index 00000000000..b80b374baa7 --- /dev/null +++ b/pkgs/development/libraries/haskell/threadmanager/default.nix @@ -0,0 +1,13 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "threadmanager"; + version = "0.1.3"; + sha256 = "22ca45d7e32518736abb9cde6d2d14163128888769fc02bbc2641fd97318a15a"; + meta = { + description = "Simple thread management"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/unix-compat/default.nix b/pkgs/development/libraries/haskell/unix-compat/default.nix new file mode 100644 index 00000000000..ae1c54ec973 --- /dev/null +++ b/pkgs/development/libraries/haskell/unix-compat/default.nix @@ -0,0 +1,13 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "unix-compat"; + version = "0.1.2.1"; + sha256 = "553326e140f71f09cedeec5f74666171c2ad2b3d9ba4312da97da02cbf8a2e85"; + meta = { + description = "Portable POSIX-compatibility layer"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/url/default.nix b/pkgs/development/libraries/haskell/url/default.nix new file mode 100644 index 00000000000..d82af144515 --- /dev/null +++ b/pkgs/development/libraries/haskell/url/default.nix @@ -0,0 +1,14 @@ +{cabal, utf8String}: + +cabal.mkDerivation (self : { + pname = "url"; + version = "2.1.2"; + sha256 = "2cf5c4296418afe3940ae4de66d867897b1382cc4d37a0b9a5ccffa16743ef91"; + propagatedBuildInputs = [utf8String]; + meta = { + description = "A library for working with URLs"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/uulib/default.nix b/pkgs/development/libraries/haskell/uulib/default.nix index 2514da38ad7..9b29afb1557 100644 --- a/pkgs/development/libraries/haskell/uulib/default.nix +++ b/pkgs/development/libraries/haskell/uulib/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "uulib"; - version = "0.9.11"; - sha256 = "f364ec14f249c9fc28ab341050c7e1cc1bde865fb787e4456c07c1df450815c8"; + version = "0.9.12"; + sha256 = "e2ea76db10e5ce94cf6282642754d0e65e5abadc620b3827aa2ab497b88e6747"; meta = { description = "Haskell Utecht Tools Library"; }; diff --git a/pkgs/development/libraries/haskell/xhtml/default.nix b/pkgs/development/libraries/haskell/xhtml/default.nix index 916b57e3263..c09ed444d3e 100644 --- a/pkgs/development/libraries/haskell/xhtml/default.nix +++ b/pkgs/development/libraries/haskell/xhtml/default.nix @@ -2,7 +2,7 @@ cabal.mkDerivation (self : { pname = "xhtml"; - version = "3000.2.0.1"; # Haskell Platform 2009.0.0 + version = "3000.2.0.1"; # Haskell Platform 2009.0.0 and 2010.1.0.0 sha256 = "60d7a44ae6d607475e2d60c5bf9909b8a3bd88850d52b08ff1532aa6d58bec96"; meta = { description = "An XHTML combinator library"; diff --git a/pkgs/development/libraries/haskell/xml/default.nix b/pkgs/development/libraries/haskell/xml/default.nix index 275f6e6d5b0..096934dfeae 100644 --- a/pkgs/development/libraries/haskell/xml/default.nix +++ b/pkgs/development/libraries/haskell/xml/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "xml"; - version = "1.3.4"; - sha256 = "87da09814e79d8d1f31eba4936b291d4522224187d44e1e085839726f0e7a0dd"; + version = "1.3.5"; + sha256 = "d61abd617e6e4d5b384e19403486ecc0e5dccf412a235acce2a7b7072e97c3ab"; meta = { description = "A simple XML library"; }; diff --git a/pkgs/development/libraries/haskell/zip-archive/default.nix b/pkgs/development/libraries/haskell/zip-archive/default.nix index 11a7675c0d2..23fb5045cd4 100644 --- a/pkgs/development/libraries/haskell/zip-archive/default.nix +++ b/pkgs/development/libraries/haskell/zip-archive/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "zip-archive"; - version = "0.1.1.3"; - sha256 = "2caa3e6020c394c740b942685306c71e91bebf6e499627dc20fdf0ac7925a57a"; + version = "0.1.1.6"; + sha256 = "16aafc5f74c880398413a7c2adaaf90cae86006dcda58f663c1e1d795add90aa"; propagatedBuildInputs = [binary mtl utf8String zlib digest]; meta = { description = "Library for creating and modifying zip archives"; diff --git a/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix b/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix new file mode 100644 index 00000000000..d97e18ccf23 --- /dev/null +++ b/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix @@ -0,0 +1,13 @@ +{cabal, zlib}: + +cabal.mkDerivation (self : { + pname = "zlib"; + version = "0.5.2.0"; # Haskell Platform 2010.1.0.0 + sha256 = "4119fb627e0adc2b129acd86fe5724cf05a49d8de5b64eb7a6e519d3befd3b8f"; + # TODO: find out exactly why propagated is needed here (to build other + # packages depending on zlib): + propagatedBuildInputs = [zlib]; + meta = { + description = "Compression and decompression in the gzip and zlib formats"; + }; +}) diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index 8dede02fb0a..53c33787da5 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -1,14 +1,19 @@ -{ stdenv, fetchurl, pkgconfig, cairo, expat }: +{ stdenv, fetchurl, pkgconfig, cairo, expat, ncurses +, autoconf, automake, libtool }: stdenv.mkDerivation rec { - name = "hwloc-0.9.2"; + name = "hwloc-1.0rc1"; src = fetchurl { - url = "http://www.open-mpi.org/software/hwloc/v0.9/downloads/${name}.tar.bz2"; - sha256 = "1smxvz2g05kci1ra78iqmgk02rym3qwh1mrm68rxv70fhqhvq741"; + url = "http://www.open-mpi.org/software/hwloc/v1.0/downloads/${name}.tar.bz2"; + sha256 = "0mgjlyfwp1pbl2312l9diwjw53yb9hb62slmvcb3xvhqdwvj0d7s"; }; - buildInputs = [ pkgconfig cairo expat ]; + patches = [ ./ncurses.patch ]; + + preConfigure = "autoreconf -vfi"; + + buildInputs = [ autoconf automake libtool pkgconfig cairo expat ncurses ]; doCheck = true; @@ -37,11 +42,6 @@ stdenv.mkDerivation rec { homepage = http://www.open-mpi.org/projects/hwloc/; maintainers = [ stdenv.lib.maintainers.ludo ]; - - # It doesn't support the BSDs. - platforms = stdenv.lib.platforms.linux - ++ stdenv.lib.platforms.darwin - ++ stdenv.lib.platforms.cygwin - /* ++ opensolaris */; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/hwloc/ncurses.patch b/pkgs/development/libraries/hwloc/ncurses.patch new file mode 100644 index 00000000000..58dffea5265 --- /dev/null +++ b/pkgs/development/libraries/hwloc/ncurses.patch @@ -0,0 +1,13 @@ +Help `configure' find `tparm' in libncurses. + +--- a/config/hwloc.m4 2010-04-19 14:25:53.000000000 +0200 ++++ b/config/hwloc.m4 2010-04-19 14:24:23.000000000 +0200 +@@ -285,7 +285,7 @@ EOF]) + LIBS= + AC_CHECK_HEADERS([curses.h], [ + AC_CHECK_HEADERS([term.h], [ +- AC_SEARCH_LIBS([tparm], [termcap curses], [ ++ AC_SEARCH_LIBS([tparm], [ncurses termcap curses], [ + AC_SUBST([HWLOC_TERMCAP_LIBS], ["$LIBS"]) + AC_DEFINE([HWLOC_HAVE_LIBTERMCAP], [1], + [Define to 1 if you have a library providing the termcap interface]) diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index 744554c338f..9782948ba53 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -1,14 +1,15 @@ -{fetchurl, stdenv, zlib, bzip2, e2fsprogs, sharutils}: +{fetchurl, stdenv, acl, openssl, libxml2, attr, zlib, bzip2, xz, e2fsprogs +, sharutils}: stdenv.mkDerivation rec { - name = "libarchive-2.4.12"; + name = "libarchive-2.8.3"; src = fetchurl { - url = "${meta.homepage}/src/${name}.tar.gz"; - sha256 = "133kxx1wfangrhy6rcpqlqib7i45qxj8pcp3i9n574cwfx41swy4"; + url = "http://libarchive.googlecode.com/files/${name}.tar.gz"; + sha256 = "16095d15334b3c8dbb02db5af3d415f12c1c3bdd4eb43af7bbc36ab7572c0b7a"; }; - propagatedBuildInputs = [zlib bzip2 e2fsprogs]; + propagatedBuildInputs = [acl libxml2 zlib bzip2 e2fsprogs xz attr openssl]; buildInputs = [sharutils]; diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix index 74254160edb..fc26fb9aca1 100644 --- a/pkgs/development/libraries/libcdio/default.nix +++ b/pkgs/development/libraries/libcdio/default.nix @@ -1,20 +1,20 @@ -{fetchurl, stdenv, libcddb, pkgconfig, ncurses, help2man}: +{ fetchurl, stdenv, libcddb, pkgconfig, ncurses, help2man }: stdenv.mkDerivation rec { - name = "libcdio-0.80"; + name = "libcdio-0.82"; src = fetchurl { url = "mirror://gnu/libcdio/${name}.tar.gz"; - sha256 = "0rnayw7gcq6jii2xrgg2n4wa8bsf5rw2hcww214lc0ssvcs1m95i"; + sha256 = "0fax1dzy84dzs20bmpq2gfw6hc1x2x9mhk53wynhcycjw3l3vjqs"; }; - buildInputs = [libcddb pkgconfig ncurses help2man]; + buildInputs = [ libcddb pkgconfig ncurses help2man ]; # Disabled because one test (check_paranoia.sh) fails. #doCheck = true; meta = { - description = "A library for OS-idependent CD-ROM and CD image access"; + description = "A library for OS-independent CD-ROM and CD image access"; longDescription = '' GNU libcdio is a library for OS-idependent CD-ROM and CD image access. It includes a library for working with diff --git a/pkgs/development/libraries/libcue/default.nix b/pkgs/development/libraries/libcue/default.nix new file mode 100644 index 00000000000..9f5127905c2 --- /dev/null +++ b/pkgs/development/libraries/libcue/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl }: +stdenv.mkDerivation rec { + name = "libcue-1.3.0"; + src = fetchurl { + url = "mirror://sourceforge/libcue/${name}.tar.bz2"; + sha256 = "0gcd9maxh82fc0qah0q8xh74sch0px3n7c0qx0298n2qbk2mkn12"; + }; + meta = { + description = "A library to parse a cue sheet"; + longDescription = '' + libcue is intended to parse a so called cue sheet from a char string or + a file pointer. For handling of the parsed data a convenient API is + available. + ''; + homepage = http://sourceforge.net/projects/libcue/; + license = "GPLv2"; + maintainers = with stdenv.lib.maintainers; [ astsmtl ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix index a023e1ceea9..2121449af5a 100644 --- a/pkgs/development/libraries/libedit/default.nix +++ b/pkgs/development/libraries/libedit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses }: +{ stdenv, fetchurl, ncurses}: stdenv.mkDerivation rec { name = "libedit-20090923-3.0"; @@ -8,6 +8,10 @@ stdenv.mkDerivation rec { sha256 = "02j66qbd1c9wfghpjb8dzshkcj4i0n9xanxy81552j3is9ilxjka"; }; + postInstall = '' + sed -i s/-lcurses/-lncurses/g $out/lib/pkgconfig/libedit.pc + ''; + propagatedBuildInputs = [ ncurses ]; meta = { diff --git a/pkgs/development/libraries/libftdi/default.nix b/pkgs/development/libraries/libftdi/default.nix index 4667f44b188..6805434dcec 100644 --- a/pkgs/development/libraries/libftdi/default.nix +++ b/pkgs/development/libraries/libftdi/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, libusb}: stdenv.mkDerivation rec { - name = "libftdi-0.16"; + name = "libftdi-0.17"; src = fetchurl { url = "http://www.intra2net.com/en/developer/libftdi/download/${name}.tar.gz"; - sha256 = "1n12lcvpzmkph12gmg7i7560s0yly2gjgwhxh2h2inq93agg1xv2"; + sha256 = "1w5bzq4h4v9qah9dx0wbz6w7ircr91ack0sh6wqs8s5b4m8jgh6m"; }; buildInputs = [ libusb ]; diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/development/libraries/libid3tag/default.nix index c29d3d29558..e137c939771 100644 --- a/pkgs/development/libraries/libid3tag/default.nix +++ b/pkgs/development/libraries/libid3tag/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151"; }; - buildInputs = [zlib]; + propagatedBuildInputs = [zlib]; meta = { description = "An ID3 tag manipulation library."; diff --git a/pkgs/development/libraries/libiodbc/default.nix b/pkgs/development/libraries/libiodbc/default.nix new file mode 100644 index 00000000000..fb3a2fd11d0 --- /dev/null +++ b/pkgs/development/libraries/libiodbc/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl, pkgconfig, gtk, useGTK ? false }: + +stdenv.mkDerivation rec { + name = "libiodbc-3.52.7"; + + src = fetchurl { + url = "${meta.homepage}/downloads/iODBC/${name}.tar.gz"; + sha256 = "d7002cc7e566785f1203f6096dcb49b0aad02a9d9946a8eca5d663ac1a85c0c7"; + }; + + buildInputs = stdenv.lib.optionals useGTK [ gtk pkgconfig ]; + + meta = { + description = "iODBC driver manager"; + homepage = http://www.iodbc.org; + }; +} diff --git a/pkgs/development/libraries/libmad/default.nix b/pkgs/development/libraries/libmad/default.nix index aa5c3526e85..83070b92ac6 100644 --- a/pkgs/development/libraries/libmad/default.nix +++ b/pkgs/development/libraries/libmad/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, autoconf}: stdenv.mkDerivation { name = "libmad-0.15.1b"; @@ -8,8 +8,11 @@ stdenv.mkDerivation { sha256 = "bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690"; }; + patches = [ ./pkgconfig.patch ]; + # The -fforce-mem flag has been removed in GCC 4.3. preConfigure = '' + ${autoconf}/bin/autoconf substituteInPlace configure --replace "-fforce-mem" "" ''; diff --git a/pkgs/development/libraries/libmad/pkgconfig.patch b/pkgs/development/libraries/libmad/pkgconfig.patch new file mode 100644 index 00000000000..0ac88acb841 --- /dev/null +++ b/pkgs/development/libraries/libmad/pkgconfig.patch @@ -0,0 +1,117 @@ +diff -ruN libmad-0.15.1b.orig/Makefile.am libmad-0.15.1b/Makefile.am +--- libmad-0.15.1b.orig/Makefile.am 2004-02-17 02:02:03.000000000 +0000 ++++ libmad-0.15.1b/Makefile.am 2005-08-25 12:08:04.000000000 +0000 +@@ -33,9 +33,12 @@ + minimad_INCLUDES = + minimad_LDADD = libmad.la + +-EXTRA_DIST = mad.h.sed \ ++EXTRA_DIST = mad.h.sed mad.pc.in \ + CHANGES COPYRIGHT CREDITS README TODO VERSION + ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA= mad.pc ++ + exported_headers = version.h fixed.h bit.h timer.h stream.h frame.h \ + synth.h decoder.h + +diff -ruN libmad-0.15.1b.orig/Makefile.in libmad-0.15.1b/Makefile.in +--- libmad-0.15.1b.orig/Makefile.in 2004-02-17 02:33:23.000000000 +0000 ++++ libmad-0.15.1b/Makefile.in 2005-08-25 12:09:34.000000000 +0000 +@@ -14,6 +14,8 @@ + + @SET_MAKE@ + ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = mad.pc + + SOURCES = $(libmad_la_SOURCES) $(EXTRA_libmad_la_SOURCES) $(minimad_SOURCES) + +@@ -43,7 +45,7 @@ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/config.h.in $(srcdir)/libmad.list.in \ + $(top_srcdir)/configure COPYING INSTALL TODO config.guess \ +- config.sub depcomp install-sh ltmain.sh missing mkinstalldirs ++ config.sub depcomp install-sh ltmain.sh missing mkinstalldirs mad.pc.in + subdir = . + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/configure.ac +@@ -53,7 +55,7 @@ + configure.lineno configure.status.lineno + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = config.h +-CONFIG_CLEAN_FILES = libmad.list ++CONFIG_CLEAN_FILES = libmad.list mad.pc + am__installdirs = $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) + libLTLIBRARIES_INSTALL = $(INSTALL) + LTLIBRARIES = $(lib_LTLIBRARIES) +@@ -218,7 +220,7 @@ + minimad_SOURCES = minimad.c + minimad_INCLUDES = + minimad_LDADD = libmad.la +-EXTRA_DIST = mad.h.sed \ ++EXTRA_DIST = mad.h.sed mad.pc.in \ + CHANGES COPYRIGHT CREDITS README TODO VERSION + + exported_headers = version.h fixed.h bit.h timer.h stream.h frame.h \ +@@ -298,6 +300,28 @@ + rm -f stamp-h1 + touch $@ + ++mad.pc: $(top_builddir)/config.status mad.pc.in ++ cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status ++ ++install-pkgconfigDATA: $(pkgconfig_DATA) ++ @$(NORMAL_INSTALL) ++ $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir) ++ @list='$(pkgconfig_DATA)'; for p in $$list; do \ ++ if test -f $(srcdir)/$$p; then \ ++ echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfigdir)/$$p"; \ ++ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfigdir)/$$p; \ ++ else if test -f $$p; then \ ++ echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfigdir)/$$p"; \ ++ $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfigdir)/$$p; \ ++ fi; fi; \ ++ done ++ ++uninstall-pkgconfigDATA: ++ @$(NORMAL_UNINSTALL) ++ list='$(pkgconfig_DATA)'; for p in $$list; do \ ++ rm -f $(DESTDIR)$(pkgconfigdir)/$$p; \ ++ done ++ + distclean-hdr: + -rm -f config.h stamp-h1 + libmad.list: $(top_builddir)/config.status $(srcdir)/libmad.list.in +@@ -726,7 +750,7 @@ + + info-am: + +-install-data-am: install-includeHEADERS ++install-data-am: install-includeHEADERS install-pkgconfigDATA + + install-exec-am: install-libLTLIBRARIES + +@@ -757,7 +781,7 @@ + ps-am: + + uninstall-am: uninstall-includeHEADERS uninstall-info-am \ +- uninstall-libLTLIBRARIES ++ uninstall-libLTLIBRARIES install-pkgconfigDATA + + uninstall-info: uninstall-info-recursive + +diff -ruN libmad-0.15.1b.orig/mad.pc.in libmad-0.15.1b/mad.pc.in +--- libmad-0.15.1b.orig/mad.pc.in 1970-01-01 00:00:00.000000000 +0000 ++++ libmad-0.15.1b/mad.pc.in 2005-08-25 12:08:04.000000000 +0000 +@@ -0,0 +1,10 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: MAD ++Description: libmad - MPEG audio decoder library ++Version: @VERSION@ ++Libs: -L${libdir} -lmad ++Cflags: diff --git a/pkgs/development/libraries/libmikmod/default.nix b/pkgs/development/libraries/libmikmod/default.nix new file mode 100644 index 00000000000..3d2a2635fbc --- /dev/null +++ b/pkgs/development/libraries/libmikmod/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, texinfo }: +stdenv.mkDerivation rec { + name = "libmikmod-3.1.12"; + src = fetchurl { + url = "mirror://sourceforge/mikmod/${name}.tar.gz"; + sha256 = "0cpwpl0iqd5zsdwshw69arzlwp883bkmkx41wf3fzrh60dw2n6l9"; + }; + buildInputs = [ texinfo ]; + meta = { + description = "A library for playing tracker music module files"; + longDescription = '' + A library for playing tracker music module files supporting many formats, + including MOD, S3M, IT and XM. + ''; + homepage = http://mikmod.raphnet.net/; + license = "LGPLv2+"; + maintainers = with stdenv.lib.maintainers; [ astsmtl ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index fbd73230d73..cb01c2b47db 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -1,18 +1,24 @@ { stdenv, fetchurl, flex, bison }: stdenv.mkDerivation rec { - name = "libpcap-1.0.0"; + name = "libpcap-1.1.1"; src = fetchurl { url = "http://www.tcpdump.org/release/${name}.tar.gz"; - sha256 = "1h3kmj485qz1i08xs4sc3a0bmhs1rvq0h7gycs7paap2szhw8552"; + sha256 = "11asds0r0vd9skbwfbgb1d2hqxr1d92kif4qhhqx2mbyahawm32h"; }; - buildInputs = [ flex bison ]; + buildNativeInputs = [ flex bison ]; configureFlags = "--with-pcap=linux"; preInstall = ''ensureDir $out/bin''; patches = [ ./libpcap_amd64.patch ]; + + crossAttrs = { + # Stripping hurts in static libraries + dontStrip = true; + configureFlags = [ "--with-pcap=linux" "ac_cv_linux_vers=2" ]; + }; } diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index e259c7b6e43..31ae886d2e4 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -1,13 +1,15 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libtasn1-2.4"; + name = "libtasn1-2.5"; src = fetchurl { url = "mirror://gnu/libtasn1/${name}.tar.gz"; - sha256 = "03qz9wnx3643wvy10603syx97mi634z6bhdwznzmqcsq6hwg5g69"; + sha256 = "0xr4hsrs7cjx5zy7nkm6a93gkx7dkynyycgk2ayhscf5n5z96pyz"; }; + doCheck = true; + meta = { homepage = http://www.gnu.org/software/libtasn1/; description = "GNU Libtasn1, an ASN.1 library"; diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 2e6de49958e..344db123801 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, unicode ? true}: -stdenv.mkDerivation rec { +stdenv.mkDerivation ( rec { name = "ncurses-5.7"; src = fetchurl { @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { license = "X11"; }; -} +} // ( if stdenv.isDarwin then { postFixup = "rm $out/lib/*.so"; } else { } ) ) diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 6ed8db7f10e..88dc9ffe696 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -1,13 +1,13 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: -let version = "4.8.3"; in +let version = "4.8.4"; in stdenv.mkDerivation { name = "nspr-${version}"; src = fetchurl { url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; - sha256 = "1n7vyjj8x8qaqf59slnxngn47gl5wpiq420bnsyc55hava1qgzxp"; + sha256 = "0ik73yimgfpj3lkqjnpf76b942j76i5yi1z8bn75dxxc08brl4cc"; }; preConfigure = "cd mozilla/nsprpub"; diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 473405c5951..a51c355b644 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, nspr, perl, zlib}: +{ stdenv, fetchurl, nspr, perl, zlib }: let @@ -10,11 +10,11 @@ let in stdenv.mkDerivation { - name = "nss-3.12.5"; + name = "nss-3.12.6"; src = fetchurl { - url = http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_5_RTM/src/nss-3.12.5.tar.gz; - sha1 = "ec12c6eddba5fb4609a174b079095b374935d37c"; + url = http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_6_RTM/src/nss-3.12.6.tar.gz; + sha1 = "461e81adbdef6c3f848fcfee0dc5ad8c2dbebd46"; }; buildInputs = [nspr perl zlib]; diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index 244c3886822..1a295f7da7d 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -2,11 +2,11 @@ xineLib, gstreamer }: stdenv.mkDerivation rec { - name = "opencv-2.0.0"; + name = "opencv-2.1.0"; src = fetchurl { - url = "mirror://sourceforge/opencvlibrary/OpenCV-2.0.0.tar.bz2"; - sha256 = "08h03qzawj6zwifrh8rq66y4cya1kxx9ixrbq7phlac79nbvjzf1"; + url = "mirror://sourceforge/opencvlibrary/OpenCV-2.1.0.tar.bz2"; + sha256 = "0zrr24hr64gz35qb95nsvvbmdf89biglpy9z14y5kaxh5baiy1i6"; }; buildInputs = [ cmake gtk glib libjpeg libpng libtiff jasper ffmpeg pkgconfig diff --git a/pkgs/development/libraries/qt-4.4/default.nix b/pkgs/development/libraries/qt-4.4/default.nix deleted file mode 100644 index a378a9dd94b..00000000000 --- a/pkgs/development/libraries/qt-4.4/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -args: with args; - -stdenv.mkDerivation { - name = "qt-4.4.3"; - - src = fetchurl { - url = ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.4.3.tar.bz2; - sha256 = "1nfdf1aj6vb7qyacsnjyjxrnaf44hz7vzykf6zra2znd87pglz51"; - }; - - setupHook = ./setup-hook.sh; - - propagatedBuildInputs = [ - libXft - libXrender - libXrandr - randrproto - xextproto - libXinerama - xineramaproto - libXcursor - zlib - libjpeg - mysql - libpng - which - mesa - libXmu - openssl - dbus.libs - cups - pkgconfig - libXext - freetype - fontconfig - inputproto - fixesproto - libXfixes - glib - libtiff - ]; - - prefixKey = "-prefix "; - - configureFlags = '' - -v -no-separate-debug-info -release - -system-zlib -system-libpng -system-libjpeg -fast - -qt-gif -confirm-license - -opengl -xrender -xrandr -xinerama -xcursor -qt-sql-mysql - -qdbus -cups -glib -xfixes -dbus-linked - -fontconfig -I${freetype}/include/freetype2 - ''; - - patchPhase = '' - substituteInPlace configure --replace /bin/pwd pwd - sed -e 's@/usr@/FOO@' -i config.tests/*/*.test -i mkspecs/*/*.conf - ''; - - # Remove the documentation: it takes up >= 130 MB, which is more - # than half of the installed size. Ideally we should put this in a - # separate package (as well as the Qt Designer). - postInstall = '' - rm -rf $out/doc - ''; - - meta = { - homepage = http://www.qtsoftware.com/downloads/opensource/appdev/linux-x11-cpp; - description = "A cross-platform application framework for C++"; - }; -} diff --git a/pkgs/development/libraries/qt-4.4/setup-hook.sh b/pkgs/development/libraries/qt-4.4/setup-hook.sh deleted file mode 100644 index f9ecacbbb7d..00000000000 --- a/pkgs/development/libraries/qt-4.4/setup-hook.sh +++ /dev/null @@ -1,9 +0,0 @@ -export QTDIR=@out@ - -if [ -n "$includeAllQtDirs" ]; then - # This helps for g++, but not for moc. And no qt4 package should expect - # having all qt4 header files dirs into -I. - for d in @out@/include/*; do - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$d" - done -fi diff --git a/pkgs/development/libraries/qt-4.6/default.nix b/pkgs/development/libraries/qt-4.6/default.nix index 8f0746a59cc..0a83cc9e4a5 100644 --- a/pkgs/development/libraries/qt-4.6/default.nix +++ b/pkgs/development/libraries/qt-4.6/default.nix @@ -47,6 +47,11 @@ stdenv.mkDerivation { glib libtiff ]; + + # libQtNetwork will call libQtCore for it to dlopen openssl. + NIX_LDFLAGS = "-rpath ${openssl}/lib"; + # Don't shrink the rpath, to keep ${openssl} in it. + dontPatchELF = 1; prefixKey = "-prefix "; diff --git a/pkgs/development/libraries/redland/1.0.10.nix b/pkgs/development/libraries/redland/1.0.10.nix index 141094a8160..959581d407e 100644 --- a/pkgs/development/libraries/redland/1.0.10.nix +++ b/pkgs/development/libraries/redland/1.0.10.nix @@ -22,14 +22,5 @@ stdenv.mkDerivation rec { [ "--with-threads" ] ++ stdenv.lib.optional (bdb != null) "--with-bdb=${bdb}"; - patchPhase = - '' - sed -e 1s@/usr@${perl}@ -i utils/touch-mtime.pl - - # Redland 1.0.9 uses an internal pre-processor symbol SQLITE_API - # that collides with a symbol of the same name in sqlite 3.6.19. - # This is a quick fix for the problem. A real solution needs to be - # implemented upstream, though. - find . -type f -exec sed -i -e 's/SQLITE_API/REDLAND_SQLITE_API/g' {} \; - ''; + patchPhase ="sed -e 1s@/usr@${perl}@ -i utils/touch-mtime.pl"; } diff --git a/pkgs/development/libraries/redland/1.0.8.nix b/pkgs/development/libraries/redland/1.0.8.nix deleted file mode 100644 index 6d0294ee394..00000000000 --- a/pkgs/development/libraries/redland/1.0.8.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, openssl, libxslt, perl -, curl, pcre, libxml2, librdf_rasqal, librdf_raptor -, mysql ? null, postgresql ? null, sqlite ? null, bdb ? null -}: - -stdenv.mkDerivation rec { - name = "redland-1.0.8"; - - src = fetchurl { - url = "mirror://sf/librdf/${name}.tar.gz"; - sha256 = "8a77fcfd20fea2c6e53761d6dcbbee3fdb35e5308de36c1daa0d2014e5a96afe"; - }; - - buildInputs = [ pkgconfig ]; - - propagatedBuildInputs = - [ bdb openssl libxslt perl mysql postgresql sqlite curl pcre libxml2 - librdf_rasqal librdf_raptor - ]; - - configureFlags = - [ "--with-threads" ] - ++ stdenv.lib.optional (bdb != null) "--with-bdb=${bdb}"; - - patchPhase = - '' - sed -e 1s@/usr@${perl}@ -i utils/touch-mtime.pl - - # Redland 1.0.9 uses an internal pre-processor symbol SQLITE_API - # that collides with a symbol of the same name in sqlite 3.6.19. - # This is a quick fix for the problem. A real solution needs to be - # implemented upstream, though. - find . -type f -exec sed -i -e 's/SQLITE_API/REDLAND_SQLITE_API/g' {} \; - ''; -} diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 3e9d2804ced..f700b862246 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -3,11 +3,11 @@ assert readline != null -> ncurses != null; stdenv.mkDerivation { - name = "sqlite-3.6.22"; + name = "sqlite-3.6.23"; src = fetchurl { - url = "http://www.sqlite.org/sqlite-amalgamation-3.6.22.tar.gz"; - sha256 = "1k5qyl0v2y4fpkh7vvxvb0irpnl71g0ffhfc3ksm40mrhcdq9qk8"; + url = "http://www.sqlite.org/sqlite-amalgamation-3.6.23.tar.gz"; + sha256 = "a5de9ec9273acabc6cb18235df802549c476410b09d58a206e02862b4dc303ae"; }; buildInputs = [readline ncurses]; diff --git a/pkgs/development/libraries/tapioca-qt/default.nix b/pkgs/development/libraries/tapioca-qt/default.nix deleted file mode 100644 index 5d5fad9d928..00000000000 --- a/pkgs/development/libraries/tapioca-qt/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{stdenv, fetchurl, cmake, qt4, telepathy_qt}: - -stdenv.mkDerivation { - name = "tapioca-qt-0.14.1"; - src = fetchurl { - url = mirror://sourceforge/tapioca-voip/tapioca-qt-0.14.1.tar.gz; - md5 = "169318705af6386057b537c5317d520d"; - }; - buildInputs = [ cmake qt4 telepathy_qt ]; -} diff --git a/pkgs/development/libraries/wvstreams/default.nix b/pkgs/development/libraries/wvstreams/default.nix new file mode 100644 index 00000000000..28bab029172 --- /dev/null +++ b/pkgs/development/libraries/wvstreams/default.nix @@ -0,0 +1,23 @@ +args: with args; +stdenv.mkDerivation { + name = "wvstreams-4.6.1"; + + src = fetchurl { + url = http://wvstreams.googlecode.com/files/wvstreams-4.6.1.tar.gz; + sha256 = "0cvnq3mvh886gmxh0km858aqhx30hpyrfpg1dh6ara9sz3xza0w4"; + }; + + preConfigure = '' + find -type f | xargs sed -i 's@/bin/bash@bash@g' + ''; + + buildInputs = [qt4 dbus zlib openssl readline perl]; + + meta = { + description = "network programming library in C++"; + homepage = http://alumnit.ca/wiki/index.php?page=WvStreams; + license = "LGPL"; + maintainers = [stdenv.lib.maintainers.marcweber]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index b4ae9e63ea0..95c891e9bc7 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -15,6 +15,10 @@ stdenv.mkDerivation { fi ''; + crossAttrs = { + dontStrip = if static then true else false; + }; + # zlib doesn't like the automatic --disable-shared from the Cygwin stdenv. cygwinConfigureEnableShared = true; } |