diff options
Diffstat (limited to 'pkgs/development/libraries')
17 files changed, 188 insertions, 44 deletions
diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index d8e69fbf603e..cea207f27bc5 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, perl, glib }: +{ stdenv, fetchurl, pkgconfig, perl, glib, libintlOrEmpty }: stdenv.mkDerivation rec { name = "atk-2.8.0"; @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1x3dd3hg9l1j9dq70xwph13vxdp6a9wbfcnryryf1wr6c8bij9dj"; }; + buildInputs = libintlOrEmpty; + nativeBuildInputs = [ pkgconfig perl ]; propagatedBuildInputs = [ glib ]; diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index a957a84c6a70..55a746890262 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -30,8 +30,11 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-tee" ] ++ optional xcbSupport "--enable-xcb" ++ optional glSupport "--enable-gl" + ++ optional pdfSupport "--enable-pdf" ; + NIX_CFLAGS_COMPILE = "-I${pixman}/include/pixman-1"; + preConfigure = # On FreeBSD, `-ldl' doesn't exist. (stdenv.lib.optionalString stdenv.isFreeBSD @@ -40,7 +43,14 @@ stdenv.mkDerivation rec { cat "$i" | sed -es/-ldl//g > t mv t "$i" done - ''); + '') + + + '' + # Work around broken `Requires.private' that prevents Freetype + # `-I' flags to be propagated. + sed -i "src/cairo.pc.in" \ + -es'|^Cflags:\(.*\)$|Cflags: \1 -I${freetype}/include/freetype2 -I${freetype}/include|g' + ''; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index c466905e4917..3a22bb4c3c1a 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, xz -, jasper }: +, jasper, libintlOrEmpty }: stdenv.mkDerivation rec { name = "gdk-pixbuf-2.28.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; # !!! We might want to factor out the gdk-pixbuf-xlib subpackage. - buildInputs = [ libX11 ]; + buildInputs = [ libX11 libintlOrEmpty ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index 2135c4ae52b5..b7c7841bf58c 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xlibs -, gdk_pixbuf +, gdk_pixbuf, xz, libintlOrEmpty , xineramaSupport ? true , cupsSupport ? true, cups ? null }: @@ -17,12 +17,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + NIX_CFLAGS_COMPILE = "-I${cairo}/include/cairo"; + nativeBuildInputs = [ perl pkgconfig gettext ]; propagatedBuildInputs = with xlibs; [ glib cairo pango gdk_pixbuf atk libXrandr libXrender libXcomposite libXi libXcursor ] + ++ libintlOrEmpty ++ stdenv.lib.optional xineramaSupport libXinerama ++ stdenv.lib.optionals cupsSupport [ cups ]; diff --git a/pkgs/development/libraries/haskell/Agda/default.nix b/pkgs/development/libraries/haskell/Agda/default.nix index f6589dc53be2..64c9d9d51e58 100644 --- a/pkgs/development/libraries/haskell/Agda/default.nix +++ b/pkgs/development/libraries/haskell/Agda/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "Agda"; - version = "2.3.2"; - sha256 = "1xp0qvag6wx6zjwhmb7nm13hp63vlh8h4a2rkc85rsh610m0nynl"; + version = "2.3.2.1"; + sha256 = "1dlf0cs913ma8wjvra8x6p0lwi1pk7ynbdq4lxgbdfgqkbnh43kr"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/ListLike/default.nix b/pkgs/development/libraries/haskell/ListLike/default.nix index 2fa427b1f57e..b24e81300b62 100644 --- a/pkgs/development/libraries/haskell/ListLike/default.nix +++ b/pkgs/development/libraries/haskell/ListLike/default.nix @@ -1,11 +1,11 @@ -{ cabal }: +{ cabal, HUnit, QuickCheck, random, text, vector }: cabal.mkDerivation (self: { pname = "ListLike"; - version = "3.1.7.1"; - sha256 = "1g3i8iz71x3j41ji9xsbh84v5hj3mxls0zqnx27sb31mx6bic4w1"; - isLibrary = true; - isExecutable = true; + version = "4.0.0"; + sha256 = "13dw8pkj8dwxb81gbcm7gn221zyr3ck9s9s1iv7v1b69chv0zyxk"; + buildDepends = [ text vector ]; + testDepends = [ HUnit QuickCheck random text vector ]; meta = { homepage = "http://software.complete.org/listlike"; description = "Generic support for list-like structures"; diff --git a/pkgs/development/libraries/haskell/acid-state/default.nix b/pkgs/development/libraries/haskell/acid-state/default.nix index 10f222cfe105..dcd6698a5a25 100644 --- a/pkgs/development/libraries/haskell/acid-state/default.nix +++ b/pkgs/development/libraries/haskell/acid-state/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "acid-state"; - version = "0.8.3"; - sha256 = "1n7vafw3jz7kmlp5jqn1wv0ip2rcbyfx0cdi2m1a2lvpi6dh97gc"; + version = "0.10.0"; + sha256 = "0jjjh8l6ka8kawgp1gm75is4ajavl7nd6b2l717wjs8sy93qnzsc"; buildDepends = [ cereal extensibleExceptions filepath mtl network safecopy stm ]; diff --git a/pkgs/development/libraries/haskell/concurrent-extra/default.nix b/pkgs/development/libraries/haskell/concurrent-extra/default.nix index db380f03b5bd..9f97f7304724 100644 --- a/pkgs/development/libraries/haskell/concurrent-extra/default.nix +++ b/pkgs/development/libraries/haskell/concurrent-extra/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "concurrent-extra"; - version = "0.7.0.5"; - sha256 = "0g1ckrwgdyrlp1m352ivplajqzqhw5ymlkb4miiv7c5i9xyyyqnc"; + version = "0.7.0.6"; + sha256 = "12wq86hkgy22qydkj4fw6vb7crzv3010c2mkhsph4rdynr0v588i"; buildDepends = [ baseUnicodeSymbols stm unboundedDelays ]; testDepends = [ baseUnicodeSymbols HUnit stm testFramework testFrameworkHunit diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 4f50ab449508..9575bc7b4bba 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -1,34 +1,31 @@ { cabal, binary, blazeHtml, blazeMarkup, citeprocHs, cmdargs -, cryptohash, dataDefault, deepseq, filepath, httpConduit +, cryptohash, dataDefault, deepseq, filepath, fsnotify, httpConduit , httpTypes, HUnit, lrucache, mtl, pandoc, parsec, QuickCheck -, random, regexBase, regexTdfa, snapCore, snapServer, tagsoup -, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text -, time +, random, regexBase, regexTdfa, snapCore, snapServer +, systemFilepath, tagsoup, testFramework, testFrameworkHunit +, testFrameworkQuickcheck2, text, time }: cabal.mkDerivation (self: { pname = "hakyll"; - version = "4.2.2.0"; - sha256 = "0kz8v2ip0hmvqnrxgv44g2863z1dql88razl7aa3fw01q56ihz0y"; + version = "4.3.0.0"; + sha256 = "188j3spdi2mivx5a10whpb09fm8yhg54ddfwc6x0k040c7q3aq0q"; isLibrary = true; isExecutable = true; buildDepends = [ binary blazeHtml blazeMarkup citeprocHs cmdargs cryptohash - dataDefault deepseq filepath httpConduit httpTypes lrucache mtl - pandoc parsec random regexBase regexTdfa snapCore snapServer - tagsoup text time + dataDefault deepseq filepath fsnotify httpConduit httpTypes + lrucache mtl pandoc parsec random regexBase regexTdfa snapCore + snapServer systemFilepath tagsoup text time ]; testDepends = [ binary blazeHtml blazeMarkup citeprocHs cmdargs cryptohash - dataDefault deepseq filepath httpConduit httpTypes HUnit lrucache - mtl pandoc parsec QuickCheck random regexBase regexTdfa snapCore - snapServer tagsoup testFramework testFrameworkHunit - testFrameworkQuickcheck2 text time + dataDefault deepseq filepath fsnotify httpConduit httpTypes HUnit + lrucache mtl pandoc parsec QuickCheck random regexBase regexTdfa + snapCore snapServer systemFilepath tagsoup testFramework + testFrameworkHunit testFrameworkQuickcheck2 text time ]; doCheck = false; - patchPhase = '' - sed -i -e 's|cryptohash .*,|cryptohash,|' hakyll.cabal - ''; meta = { homepage = "http://jaspervdj.be/hakyll"; description = "A static website compiler library"; diff --git a/pkgs/development/libraries/haskell/hflags/default.nix b/pkgs/development/libraries/haskell/hflags/default.nix new file mode 100644 index 000000000000..17c01f9a6599 --- /dev/null +++ b/pkgs/development/libraries/haskell/hflags/default.nix @@ -0,0 +1,14 @@ +{ cabal, text }: + +cabal.mkDerivation (self: { + pname = "hflags"; + version = "0.1.3"; + sha256 = "0nn08xqn0hvdlblnaad3nsdfkc0ssab6kvhi4qbrcq9jmjmspld3"; + buildDepends = [ text ]; + meta = { + homepage = "http://github.com/errge/hflags"; + description = "Command line flag parser, very similar to Google's gflags"; + license = "Apache-2.0"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/iteratee/default.nix b/pkgs/development/libraries/haskell/iteratee/default.nix index ee9026bae493..c4438d973644 100644 --- a/pkgs/development/libraries/haskell/iteratee/default.nix +++ b/pkgs/development/libraries/haskell/iteratee/default.nix @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { ListLike MonadCatchIOTransformers monadControl parallel transformers transformersBase ]; + jailbreak = true; meta = { homepage = "http://www.tiresiaspress.us/haskell/iteratee"; description = "Iteratee-based I/O"; diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index 79fd1f6f781a..57bb615800b4 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "persistent"; - version = "1.2.0.1"; - sha256 = "1bs74g1fkwq4wvz18lp0ial6z58vpslgv0rqdn91ka6gw8k4fvlb"; + version = "1.2.0.2"; + sha256 = "026zdfccy57dbsacg8227jzcdyq50nb1bkcr56ryxi91ymlyf50k"; buildDepends = [ aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit liftedBase monadControl monadLogger pathPieces poolConduit diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix index a20ec8e7ca5a..f2440ef250f9 100644 --- a/pkgs/development/libraries/haskell/snap/core.nix +++ b/pkgs/development/libraries/haskell/snap/core.nix @@ -1,19 +1,19 @@ { cabal, attoparsec, attoparsecEnumerator, blazeBuilder , blazeBuilderEnumerator, bytestringMmap, caseInsensitive, deepseq -, enumerator, filepath, HUnit, MonadCatchIOTransformers, mtl -, random, regexPosix, text, time, unixCompat, unorderedContainers -, vector, zlibEnum +, enumerator, filepath, hashable, HUnit, MonadCatchIOTransformers +, mtl, random, regexPosix, text, time, unixCompat +, unorderedContainers, vector, zlibEnum }: cabal.mkDerivation (self: { pname = "snap-core"; - version = "0.9.3.1"; - sha256 = "1q2lk70l0hk4l6ksjnal1bfkby0i08gdzvj9cscvxs4njxmgdapq"; + version = "0.9.4.0"; + sha256 = "08afaj4ln4nl7ymdixijzjx8hc7nnr70gz7avpzaanq5nrw0k054"; buildDepends = [ attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator - bytestringMmap caseInsensitive deepseq enumerator filepath HUnit - MonadCatchIOTransformers mtl random regexPosix text time unixCompat - unorderedContainers vector zlibEnum + bytestringMmap caseInsensitive deepseq enumerator filepath hashable + HUnit MonadCatchIOTransformers mtl random regexPosix text time + unixCompat unorderedContainers vector zlibEnum ]; meta = { homepage = "http://snapframework.com/"; diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index c262535a1f7d..cb60355ef558 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, libgpgerror }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "libgcrypt-1.5.2"; src = fetchurl { @@ -34,4 +34,8 @@ stdenv.mkDerivation rec { homepage = http://gnupg.org/; platforms = stdenv.lib.platforms.all; }; -} +} # old "as" problem, see #616 and http://gnupg.10057.n7.nabble.com/Fail-to-build-on-freebsd-7-3-td30245.html + // stdenv.lib.optionalAttrs (stdenv.isFreeBSD && stdenv.isi686) + { configureFlags = [ "--disable-aesni-support" ]; } +) + diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 418a2acb0b77..8d3efe490251 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "08aqis6j8nd1lb4f2h4h9d9kjvp54iwf8zvqzss0qn4v7nfcjyvx"; }; + NIX_CFLAGS_COMPILE = "-I${cairo}/include/cairo"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ gettext fontconfig ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/ruby_gpgme/default.nix b/pkgs/development/libraries/ruby_gpgme/default.nix new file mode 100644 index 000000000000..c5f2366bfa1c --- /dev/null +++ b/pkgs/development/libraries/ruby_gpgme/default.nix @@ -0,0 +1,64 @@ +{ stdenv, fetchurl, gpgme, ruby, rubygems, hoe }: + +stdenv.mkDerivation { + name = "ruby-gpgme-1.0.8"; + + src = fetchurl { + url = "https://github.com/ueno/ruby-gpgme/archive/1.0.8.tar.gz"; + sha256 = "1j7jkl9s8iqcmxf3x6c9kljm19hw1jg6yvwbndmkw43qacdr9nxb"; + }; + + meta = { + description = '' + Ruby-GPGME is a Ruby language binding of GPGME (GnuPG Made + Easy) + ''; + homepage = "http://rubyforge.org/projects/ruby-gpgme/"; + longDescription = '' + Ruby-GPGME is a Ruby language binding of GPGME (GnuPG Made Easy). + + GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG + easier for applications. It provides a High-Level Crypto API for + encryption, decryption, signing, signature verification and key + management. + ''; + }; + + buildInputs = [ gpgme rubygems hoe ruby ]; + + buildPhase = '' + ${ruby}/bin/ruby extconf.rb + rake gem + ''; + + installPhase = '' + export HOME=$TMP/home; mkdir -pv "$HOME" + + # For some reason, the installation phase doesn't work with the default + # make install command run by gem (we'll fix it and do it ourselves later) + gem install --no-verbose --install-dir "$out/${ruby.gemPath}" \ + --bindir "$out/bin" --no-rdoc --no-ri pkg/gpgme-1.0.8.gem || true + + # Create a bare-bones gemspec file so that ruby will recognise the gem + cat <<EOF >"$out/${ruby.gemPath}/specifications/gpgme.gemspec" + Gem::Specification.new do |s| + s.name = 'gpgme' + s.version = '1.0.8' + s.files = Dir['{lib,examples}/**/*'] + s.rubyforge_project = 'ruby-gpgme' + s.require_paths = ['lib'] + end + EOF + + cd "$out/${ruby.gemPath}/gems/gpgme-1.0.8" + mkdir src + mv lib src + sed -i "s/srcdir = ./srcdir = src/" Makefile + make install + + mv lib lib.bak + mv src/lib lib + rmdir src + ''; +} + diff --git a/pkgs/development/libraries/ruby_ncursesw_sup/default.nix b/pkgs/development/libraries/ruby_ncursesw_sup/default.nix new file mode 100644 index 000000000000..67041ad06078 --- /dev/null +++ b/pkgs/development/libraries/ruby_ncursesw_sup/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, ncurses, ruby, rubygems }: + +stdenv.mkDerivation rec { + name = ''ncursesw-sup-afd962b9c06108ff0643e98593c5605314d76917''; + + src = fetchurl { + url = "https://github.com/sup-heliotrope/ncursesw-ruby/archive/afd962b9c06108ff0643e98593c5605314d76917.tar.gz"; + sha256 = "13i286p4bm8zqg9xh96a1dg7wkywj9m6975gbh3w43d3rmfc1h6a"; + }; + + meta = { + description = '' + Hacked up version of ncurses gem that supports wide characters for + supmua.org + ''; + homepage = ''http://github.com/sup-heliotrope/ncursesw-ruby''; + longDescription = '' + This wrapper provides access to the functions, macros, global variables + and constants of the ncurses library. These are mapped to a Ruby Module + named "Ncurses": Functions and external variables are implemented as + singleton functions of the Module Ncurses. + ''; + }; + + buildInputs = [ ncurses rubygems ]; + + buildPhase = "gem build ncursesw.gemspec"; + + installPhase = '' + export HOME=$TMP/home; mkdir -pv "$HOME" + + # For some reason, the installation phase doesn't work with the default + # make install command run by gem (we'll fix it and do it ourselves later) + gem install --no-verbose --install-dir "$out/${ruby.gemPath}" \ + --bindir "$out/bin" --no-rdoc --no-ri ncursesw-sup-1.3.1.2.gem || true + + # Needed for ruby to recognise the gem + cp ncursesw.gemspec "$out/${ruby.gemPath}/specifications" + + cd "$out/${ruby.gemPath}/gems/ncursesw-sup-1.3.1.2" + mkdir src + mv lib src + sed -i "s/srcdir = ./srcdir = src/" Makefile + make install + ''; +} + |