diff options
Diffstat (limited to 'pkgs/development/libraries')
114 files changed, 573 insertions, 665 deletions
diff --git a/pkgs/development/libraries/arts/default.nix b/pkgs/development/libraries/arts/default.nix deleted file mode 100644 index 8af92cf5eea5..000000000000 --- a/pkgs/development/libraries/arts/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{stdenv, fetchurl, pkgconfig, glib, kdelibs, libX11, libXext, zlib, libjpeg -, libpng, perl, qt3}: - -stdenv.mkDerivation { - name = "arts-1.5.10"; - - src = fetchurl { - url = mirror://kde/stable/3.5.10/src/arts-1.5.10.tar.bz2; - sha256 = "0ffcm24lkgg3sm89q4zsj8za5h5d9j1195pmbjhx4hj0xcwkiqlj"; - }; - - KDEDIR = kdelibs; - - configureFlags = '' - --with-extra-includes=${libjpeg}/include - --with-extra-libs=${libjpeg}/lib - --x-includes=${libX11}/include - --x-libraries=${libX11}/lib - --disable-dependency-tracking - --enable-final - ''; - - nativeBuildInputs = [ pkgconfig perl ]; - - buildInputs = - [glib kdelibs libX11 libXext zlib libjpeg libpng qt3]; - - meta = { - homepage = http://www.arts-project.org/; - }; -} diff --git a/pkgs/development/libraries/boost/1.47.nix b/pkgs/development/libraries/boost/1.47.nix index c63ee94fa9bd..195cb469051f 100644 --- a/pkgs/development/libraries/boost/1.47.nix +++ b/pkgs/development/libraries/boost/1.47.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation { }; # See <http://svn.boost.org/trac/boost/ticket/4688>. - patches = [ ./boost_filesystem.patch ]; + patches = [ ./boost_filesystem_1_47_0.patch ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/boost/1.49-headers.nix b/pkgs/development/libraries/boost/1.49-headers.nix deleted file mode 100644 index afb094a3cad5..000000000000 --- a/pkgs/development/libraries/boost/1.49-headers.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation { - name = "boost-headers-1.49.0"; - - src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_49_0.tar.bz2"; - sha256 = "0g0d33942rm073jgqqvj3znm3rk45b2y2lplfjpyg9q7amzqlx6x"; - }; - - phases = [ "installPhase" ]; - - installPhase = '' - mkdir -p $out/include - tar xvf $src -C $out/include --strip-components=1 boost_1_49_0/boost - ''; - - meta = { - homepage = "http://boost.org/"; - description = "Boost C++ Library Collection"; - license = "boost-license"; - - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.viric ]; - }; -} diff --git a/pkgs/development/libraries/boost/1.52-headers.nix b/pkgs/development/libraries/boost/1.53-headers.nix index b9e594cf5f91..04bad16bd70b 100644 --- a/pkgs/development/libraries/boost/1.52-headers.nix +++ b/pkgs/development/libraries/boost/1.53-headers.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "boost-headers-1.52.0"; + name = "boost-headers-1.53.0"; src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_52_0.tar.bz2"; - sha256 = "14mc7gsnnahdjaxbbslzk79rc0d12h1i681cd3srdwr3fzynlar2"; + url = "mirror://sourceforge/boost/boost_1_53_0.tar.bz2"; + sha256 = "15livg6y1l3gdsg6ybvp3y4gp0w3xh1rdcq5bjf0qaw804dh92pq"; }; phases = [ "installPhase" ]; installPhase = '' mkdir -p $out/include - tar xf $src -C $out/include --strip-components=1 boost_1_52_0/boost + tar xf $src -C $out/include --strip-components=1 boost_1_53_0/boost ''; meta = { diff --git a/pkgs/development/libraries/boost/1.52.nix b/pkgs/development/libraries/boost/1.53.nix index 352a2d4aac96..c3272e98a144 100644 --- a/pkgs/development/libraries/boost/1.52.nix +++ b/pkgs/development/libraries/boost/1.53.nix @@ -38,7 +38,7 @@ let in stdenv.mkDerivation { - name = "boost-1.52.0"; + name = "boost-1.53.0"; meta = { homepage = "http://boost.org/"; @@ -50,8 +50,8 @@ stdenv.mkDerivation { }; src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_52_0.tar.bz2"; - sha256 = "14mc7gsnnahdjaxbbslzk79rc0d12h1i681cd3srdwr3fzynlar2"; + url = "mirror://sourceforge/boost/boost_1_53_0.tar.bz2"; + sha256 = "15livg6y1l3gdsg6ybvp3y4gp0w3xh1rdcq5bjf0qaw804dh92pq"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/boost/boost_filesystem.patch b/pkgs/development/libraries/boost/boost_filesystem_1_47_0.patch index f32e9ed572d3..f32e9ed572d3 100644 --- a/pkgs/development/libraries/boost/boost_filesystem.patch +++ b/pkgs/development/libraries/boost/boost_filesystem_1_47_0.patch diff --git a/pkgs/development/libraries/directfb/default.nix b/pkgs/development/libraries/directfb/default.nix index 7092e08ec606..cdc54ef66916 100644 --- a/pkgs/development/libraries/directfb/default.nix +++ b/pkgs/development/libraries/directfb/default.nix @@ -1,5 +1,5 @@ -{stdenv, fetchurl, perl, zlib, libjpeg, freetype, libpng, giflib -, enableX11 ? true, libX11, xproto, xextproto, libXext, renderproto, libXrender +{ stdenv, fetchurl, pkgconfig, perl, zlib, libjpeg, freetype, libpng, giflib +, enableX11 ? true, xlibs , enableSDL ? true, SDL }: let s = import ./src-for-default.nix; in @@ -10,16 +10,14 @@ stdenv.mkDerivation { sha256 = s.hash; }; - patches = [ ./ftbfs.patch ]; - nativeBuildInputs = [ perl ]; - buildInputs = [ zlib libjpeg freetype giflib libpng ] + buildInputs = [ pkgconfig zlib libjpeg freetype giflib libpng ] ++ stdenv.lib.optional enableSDL SDL - ++ stdenv.lib.optionals enableX11 [ - xproto libX11 libXext xextproto - renderproto libXrender - ]; + ++ stdenv.lib.optionals enableX11 (with xlibs; [ + xproto libX11 libXext #xextproto + #renderproto libXrender + ]); NIX_LDFLAGS="-lgcc_s"; @@ -31,7 +29,7 @@ stdenv.mkDerivation { "--enable-fbdev" "--enable-mmx" "--enable-sse" - "--enable-sysfs" + #"--enable-sysfs" # not recognized "--with-software" "--with-smooth-scaling" ] ++ stdenv.lib.optionals enableX11 [ diff --git a/pkgs/development/libraries/directfb/ftbfs.patch b/pkgs/development/libraries/directfb/ftbfs.patch deleted file mode 100644 index b6907e70be77..000000000000 --- a/pkgs/development/libraries/directfb/ftbfs.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: André Draszik <andre.draszik@st.com> -Date: Wed, 28 Sep 2011 17:36:00 +0000 (+0100) -Subject: generic_stretch_blit: fix compilation due to undefined reference to DSPF_ARGBF88871 -X-Git-Url: http://git.directfb.org/?p=core%2FDirectFB.git;a=commitdiff_plain;h=ef5e1398fe4037b63d6513e450f107fcfe91047f - -generic_stretch_blit: fix compilation due to undefined reference to DSPF_ARGBF88871 - -../../../../DirectFB/src/gfx/generic/generic_stretch_blit.c: In function 'stretch_hvx': -../../../../DirectFB/src/gfx/generic/generic_stretch_blit.c:444:21: error: 'DSPF_ARGBF88871' undeclared (first use in this function) -../../../../DirectFB/src/gfx/generic/generic_stretch_blit.c:444:21: note: each undeclared identifier is reported only once for each function it appears in ---- - -diff --git a/src/gfx/generic/generic_stretch_blit.c b/src/gfx/generic/generic_stretch_blit.c -index 65076f4..6dd987b 100644 ---- a/src/gfx/generic/generic_stretch_blit.c -+++ b/src/gfx/generic/generic_stretch_blit.c -@@ -441,7 +441,7 @@ stretch_hvx( CardState *state, DFBRectangle *srect, DFBRectangle *drect ) - } - break; - -- case DSPF_ARGBF88871: -+ case DSPF_RGBAF88871: - if (state->blittingflags & DSBLIT_SRC_PREMULTIPLY) { - for (i=0; i<gfxs->Blut->num_entries; i++) { - int alpha = entries[i].a + 1; diff --git a/pkgs/development/libraries/ffmpeg/1.1.nix b/pkgs/development/libraries/ffmpeg/1.1.nix index 6651f1783f80..7cb83db5e8d3 100644 --- a/pkgs/development/libraries/ffmpeg/1.1.nix +++ b/pkgs/development/libraries/ffmpeg/1.1.nix @@ -7,6 +7,7 @@ , x264Support ? true, x264 ? null , xvidSupport ? true, xvidcore ? null , vdpauSupport ? true, libvdpau ? null +, vaapiSupport ? true, libva ? null , faacSupport ? false, faac ? null , dc1394Support ? false, libdc1394 ? null , x11grabSupport ? false, libXext ? null, libXfixes ? null @@ -19,6 +20,7 @@ assert vpxSupport -> libvpx != null; assert x264Support -> x264 != null; assert xvidSupport -> xvidcore != null; assert vdpauSupport -> libvdpau != null; +assert vaapiSupport -> libva != null; assert faacSupport -> faac != null; assert x11grabSupport -> libXext != null && libXfixes != null; @@ -39,6 +41,7 @@ stdenv.mkDerivation rec { "--enable-swscale" "--disable-ffplay" "--enable-shared" + "--enable-avresample" "--enable-runtime-cpudetect" ] ++ stdenv.lib.optional mp3Support "--enable-libmp3lame" @@ -62,6 +65,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional x264Support x264 ++ stdenv.lib.optional xvidSupport xvidcore ++ stdenv.lib.optional vdpauSupport libvdpau + ++ stdenv.lib.optional vaapiSupport libva ++ stdenv.lib.optional faacSupport faac ++ stdenv.lib.optional dc1394Support libdc1394 ++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ]; diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix index 731b44aa0ecd..ca24db94cd05 100644 --- a/pkgs/development/libraries/gnu-efi/default.nix +++ b/pkgs/development/libraries/gnu-efi/default.nix @@ -2,12 +2,13 @@ , fetchurl }: -stdenv.mkDerivation { - name = "gnu-efi-3.0r"; +let version = "3.0s"; in stdenv.mkDerivation { + + name = "gnu-efi-${version}"; src = fetchurl { - url = "mirror://sourceforge/gnu-efi/gnu-efi_3.0r.orig.tar.gz"; - sha256 = "1zi298wsg8v29xj4azcawqfjbxqi2w7l60agf7x2ph2lnqlga2v5"; + url = "mirror://sourceforge/gnu-efi/gnu-efi_${version}.orig.tar.gz"; + sha256 = "18bpswzkj81dadq1b7n2s9g0cz60l34ggzxlq21mb8va10j9zmhh"; }; meta = { diff --git a/pkgs/development/libraries/goffice/0.9.nix b/pkgs/development/libraries/goffice/0.10.nix index 23b65b1c712c..793704be255c 100644 --- a/pkgs/development/libraries/goffice/0.9.nix +++ b/pkgs/development/libraries/goffice/0.10.nix @@ -3,11 +3,11 @@ , cairo, gconf, libgnomeui }: stdenv.mkDerivation rec { - name = "goffice-0.9.3"; + name = "goffice-0.10.0"; src = fetchurl { - url = "mirror://gnome/sources/goffice/0.9/${name}.tar.xz"; - sha256 = "0l9achvmbmhn2p5qd0nl7vxn5c3nf1ndzlyknczzyiaa6d5zj91h"; + url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz"; + sha256 = "7e7577f69203b03c4966906bcaabc6e87a629efb1684630c2bee7907bed08439"; }; buildInputs = [ diff --git a/pkgs/development/libraries/haskell/Agda/default.nix b/pkgs/development/libraries/haskell/Agda/default.nix index a9d05596495c..ea32e6358987 100644 --- a/pkgs/development/libraries/haskell/Agda/default.nix +++ b/pkgs/development/libraries/haskell/Agda/default.nix @@ -15,6 +15,7 @@ cabal.mkDerivation (self: { xhtml zlib ]; buildTools = [ alex happy ]; + jailbreak = true; meta = { homepage = "http://wiki.portal.chalmers.se/agda/"; description = "A dependently typed functional programming language and proof assistant"; diff --git a/pkgs/development/libraries/haskell/Diff/default.nix b/pkgs/development/libraries/haskell/Diff/default.nix index 86e219ac91d2..04149400ff8c 100644 --- a/pkgs/development/libraries/haskell/Diff/default.nix +++ b/pkgs/development/libraries/haskell/Diff/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "Diff"; - version = "0.2.0"; - sha256 = "15hdkrzwajnfcx8bj4jdcy4jli115g9v20msw1xyc9wnwrmbz97k"; + version = "0.3.0"; + sha256 = "0k7fj4icnh25x21cmrnbqq0sjgxrr2ffhn8bz89qmy5h9dznvy98"; meta = { description = "O(ND) diff algorithm in haskell"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/HSH/default.nix b/pkgs/development/libraries/haskell/HSH/default.nix index 40620901839d..f80f74a3dc2b 100644 --- a/pkgs/development/libraries/haskell/HSH/default.nix +++ b/pkgs/development/libraries/haskell/HSH/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "HSH"; - version = "2.0.4"; - sha256 = "1ddpazmk82716hqd1riqs7vnl4aildgwkjgk80iam49df9p5b8v8"; + version = "2.1.0"; + sha256 = "0gz2hzdvf0gqv33jihn67bvry38c6hkjapb1prxmb3w12lisr4l5"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/HStringTemplate/default.nix b/pkgs/development/libraries/haskell/HStringTemplate/default.nix index c2c4f70b47ee..3011f3a44466 100644 --- a/pkgs/development/libraries/haskell/HStringTemplate/default.nix +++ b/pkgs/development/libraries/haskell/HStringTemplate/default.nix @@ -1,14 +1,14 @@ -{ cabal, blazeBuilder, deepseq, filepath, mtl, parsec, syb -, sybWithClass, text, time, utf8String +{ cabal, blazeBuilder, deepseq, filepath, mtl, parsec, syb, text +, time, utf8String, void }: cabal.mkDerivation (self: { pname = "HStringTemplate"; - version = "0.6.12"; - sha256 = "02jx02qbs4jxpf1s8nzc9lbaz0flkfcy6xj475v77i45xc1hc71p"; + version = "0.7.0"; + sha256 = "0xxxikgjw1dhx7kx3mjyvgh70m9avcd1kbp2bpig6gjwswk0mmai"; buildDepends = [ - blazeBuilder deepseq filepath mtl parsec syb sybWithClass text time - utf8String + blazeBuilder deepseq filepath mtl parsec syb text time utf8String + void ]; meta = { description = "StringTemplate implementation in Haskell"; diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.6.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix index 2c85ec7cd9e6..6cb7ed57b4c4 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.6.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "HTTP"; - version = "4000.2.6"; - sha256 = "0rycwrn9cq9mrsgxkbx373zjvmzg4hd8hzclya6ipd3jda1w5r92"; + version = "4000.2.8"; + sha256 = "0p0cwzjw2102bsyfaga6m8b53s6qnhd6byg2j2qla653f6kjlsh8"; buildDepends = [ mtl network parsec ]; meta = { homepage = "https://github.com/haskell/HTTP"; diff --git a/pkgs/development/libraries/haskell/SDL-ttf/default.nix b/pkgs/development/libraries/haskell/SDL-ttf/default.nix index f58674f25200..f1a0489167e5 100644 --- a/pkgs/development/libraries/haskell/SDL-ttf/default.nix +++ b/pkgs/development/libraries/haskell/SDL-ttf/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "SDL-ttf"; - version = "0.6.1"; - sha256 = "0n6vbigkjfvvk98bp7ys14snpd1zmbz69ndhhpnrn02h363vwkal"; + version = "0.6.2"; + sha256 = "0jajnbqnhdd4i8pj8j27m53zwgfs1v06kiwy0s0zml02fdkq8j4a"; buildDepends = [ SDL ]; extraLibraries = [ SDL_ttf ]; meta = { diff --git a/pkgs/development/libraries/haskell/SMTPClient/default.nix b/pkgs/development/libraries/haskell/SMTPClient/default.nix index 1e2dee4fcdcc..91c128756f42 100644 --- a/pkgs/development/libraries/haskell/SMTPClient/default.nix +++ b/pkgs/development/libraries/haskell/SMTPClient/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "SMTPClient"; - version = "1.0.4"; - sha256 = "12m0qv8bf0s52yz07sipxlvas8k3xvi1d4lw6960q0nxr40ijyy2"; + version = "1.1.0"; + sha256 = "07njj24c43iz33c641d5ish62h13lhpvn2mx5pv5i6s3fm3bxsfk"; buildDepends = [ extensibleExceptions hsemail network ]; meta = { description = "A simple SMTP client library"; diff --git a/pkgs/development/libraries/haskell/attoparsec/default.nix b/pkgs/development/libraries/haskell/attoparsec/default.nix index e7bb666e677e..fda3ae1474b2 100644 --- a/pkgs/development/libraries/haskell/attoparsec/default.nix +++ b/pkgs/development/libraries/haskell/attoparsec/default.nix @@ -2,12 +2,12 @@ cabal.mkDerivation (self: { pname = "attoparsec"; - version = "0.10.3.0"; - sha256 = "1l4cnfgnynrprfvx0p3n6kca8arsmvb1yxb9ir782rrk537jci50"; + version = "0.10.4.0"; + sha256 = "0inkcrl40j9kgcmmi0xkcszayqjd5yn7i9fyvv0ywfqwpl6lxf5n"; buildDepends = [ deepseq text ]; meta = { homepage = "https://github.com/bos/attoparsec"; - description = "Fast combinator parsing for bytestrings"; + description = "Fast combinator parsing for bytestrings and text"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; diff --git a/pkgs/development/libraries/haskell/authenticate/default.nix b/pkgs/development/libraries/haskell/authenticate/default.nix index b336a632b9dd..c6624208048a 100644 --- a/pkgs/development/libraries/haskell/authenticate/default.nix +++ b/pkgs/development/libraries/haskell/authenticate/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "authenticate"; - version = "1.3.2"; - sha256 = "1bvgfri0c2nyz06r59rm3slpvm1b0s242s4mznmndpdclgg33d9m"; + version = "1.3.2.4"; + sha256 = "1xakp54g5dyppzpm1q3bbx6g4pvs7p2903pyq6bya1n82zsk7yg7"; buildDepends = [ aeson attoparsec blazeBuilder blazeBuilderConduit caseInsensitive conduit httpConduit httpTypes monadControl network resourcet diff --git a/pkgs/development/libraries/haskell/base64-bytestring/default.nix b/pkgs/development/libraries/haskell/base64-bytestring/default.nix index bc3eca3050df..5891131d7e85 100644 --- a/pkgs/development/libraries/haskell/base64-bytestring/default.nix +++ b/pkgs/development/libraries/haskell/base64-bytestring/default.nix @@ -2,11 +2,11 @@ cabal.mkDerivation (self: { pname = "base64-bytestring"; - version = "1.0.0.0"; - sha256 = "0z0r0lrpka3qrq45ajzyxsjc2as7zp6bq7z7sd56rwiziw7vp7vm"; + version = "1.0.0.1"; + sha256 = "0l1v4ddjdsgi9nqzyzcxxj76rwar3lzx8gmwf2r54bqan3san9db"; meta = { homepage = "https://github.com/bos/base64-bytestring"; - description = "Fast base64 encoding and deconding for ByteStrings"; + description = "Fast base64 encoding and decoding for ByteStrings"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; diff --git a/pkgs/development/libraries/haskell/bifunctors/default.nix b/pkgs/development/libraries/haskell/bifunctors/default.nix index b4de19104659..09287600323d 100644 --- a/pkgs/development/libraries/haskell/bifunctors/default.nix +++ b/pkgs/development/libraries/haskell/bifunctors/default.nix @@ -1,10 +1,10 @@ -{ cabal, semigroupoids, semigroups }: +{ cabal, semigroupoids, semigroups, tagged }: cabal.mkDerivation (self: { pname = "bifunctors"; - version = "3.0.3"; - sha256 = "1nmrwc9n9qkj9w9c38ja0had32isr6v35j1v19fhqdwk5ddbpxp4"; - buildDepends = [ semigroupoids semigroups ]; + version = "3.2"; + sha256 = "03bszf1127iw5kimjbag5gmgzz7h2qzcd9f7jb53jpiadfhjfx0a"; + buildDepends = [ semigroupoids semigroups tagged ]; meta = { homepage = "http://github.com/ekmett/bifunctors/"; description = "Haskell 98 bifunctors"; diff --git a/pkgs/development/libraries/haskell/bmp/1.2.3.4.nix b/pkgs/development/libraries/haskell/bmp/1.2.4.1.nix index 404229cf7636..a3de1d11830c 100644 --- a/pkgs/development/libraries/haskell/bmp/1.2.3.4.nix +++ b/pkgs/development/libraries/haskell/bmp/1.2.4.1.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "bmp"; - version = "1.2.3.4"; - sha256 = "134nfchsw4q1k3kr09i5w8jxbr659as4523gs5m2dch15wrmrhf6"; + version = "1.2.4.1"; + sha256 = "1ipy8v5n5dmajnai2cf7591chklxcbhpvwjdgvdwglipds2hjpap"; buildDepends = [ binary ]; meta = { homepage = "http://code.ouroborus.net/bmp"; diff --git a/pkgs/development/libraries/haskell/case-insensitive/default.nix b/pkgs/development/libraries/haskell/case-insensitive/default.nix index 7f972dfd6551..58e0ebbbe000 100644 --- a/pkgs/development/libraries/haskell/case-insensitive/default.nix +++ b/pkgs/development/libraries/haskell/case-insensitive/default.nix @@ -1,10 +1,10 @@ -{ cabal, hashable, text }: +{ cabal, deepseq, hashable, text }: cabal.mkDerivation (self: { pname = "case-insensitive"; - version = "0.4.0.4"; - sha256 = "1xzpri688vbd6fvvxczqx8bv53009ygzws7vbjmj2q97wcm8nmwd"; - buildDepends = [ hashable text ]; + version = "1.0"; + sha256 = "1x437b5yyh930a5dr642lvfdgpx12w4ms70whiw1ffjjhssb88zk"; + buildDepends = [ deepseq hashable text ]; meta = { homepage = "https://github.com/basvandijk/case-insensitive"; description = "Case insensitive string comparison"; diff --git a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix index c167f191d4d3..0b4ae85c73a1 100644 --- a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "classy-prelude-conduit"; - version = "0.4.3"; - sha256 = "0ny4si6z6i6g6khcg9d3m9wks42sqh8i8kpgghhdwd37v32l3f34"; + version = "0.5.0"; + sha256 = "1c1j9cxj08nz1pkrdxhphk6zyn1dxf3wbl8phcrzi8qk6q1vi0bi"; buildDepends = [ classyPrelude conduit monadControl resourcet transformers void xmlConduit diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix index 9f8893bf72fa..4033c3827669 100644 --- a/pkgs/development/libraries/haskell/classy-prelude/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix @@ -1,13 +1,13 @@ -{ cabal, basicPrelude, hashable, systemFilepath, text, transformers -, unorderedContainers, vector +{ cabal, basicPrelude, hashable, liftedBase, systemFilepath, text +, transformers, unorderedContainers, vector }: cabal.mkDerivation (self: { pname = "classy-prelude"; - version = "0.4.3"; - sha256 = "1k2iszja03s8azypl8lpkdjvvqsgzg73cl1wp4jl2fqp1psqv36q"; + version = "0.5.0"; + sha256 = "187a1p2x7jw53iramdq3v2m8h451k5nrjrmnv5sz4c8x9jmj04dp"; buildDepends = [ - basicPrelude hashable systemFilepath text transformers + basicPrelude hashable liftedBase systemFilepath text transformers unorderedContainers vector ]; meta = { diff --git a/pkgs/development/libraries/haskell/contravariant/default.nix b/pkgs/development/libraries/haskell/contravariant/default.nix index 526b9e1f9973..2c967d26085a 100644 --- a/pkgs/development/libraries/haskell/contravariant/default.nix +++ b/pkgs/development/libraries/haskell/contravariant/default.nix @@ -1,10 +1,10 @@ -{ cabal, transformers }: +{ cabal, tagged, transformers, transformersCompat }: cabal.mkDerivation (self: { pname = "contravariant"; - version = "0.2.0.2"; - sha256 = "0142s1c914zbfnvysvcc9s3bv8qs6wimnqcmxca1gxaxqvyfkf3p"; - buildDepends = [ transformers ]; + version = "0.4"; + sha256 = "1nqslc9vcx6v6c33fn7mvb1xhr33yl3ja92p788zx8z1drx9cqc3"; + buildDepends = [ tagged transformers transformersCompat ]; meta = { homepage = "http://github.com/ekmett/contravariant/"; description = "Haskell 98 contravariant functors"; diff --git a/pkgs/development/libraries/haskell/criterion/default.nix b/pkgs/development/libraries/haskell/criterion/default.nix index 64f03d4dccae..004f74cd7e7f 100644 --- a/pkgs/development/libraries/haskell/criterion/default.nix +++ b/pkgs/development/libraries/haskell/criterion/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "criterion"; - version = "0.6.2.0"; - sha256 = "1xd90qb026niq2sn7ks8bn92ifb6255saic68bzg6kzj7ydwwdmx"; + version = "0.6.2.1"; + sha256 = "08gbs61qqsq0kh2r33kzm9mmbs3ar5krmp1a0cf21c012k6k55z5"; buildDepends = [ aeson deepseq filepath hastache mtl mwcRandom parsec statistics time transformers vector vectorAlgorithms diff --git a/pkgs/development/libraries/haskell/diagrams/contrib.nix b/pkgs/development/libraries/haskell/diagrams/contrib.nix index 85b1360c3662..a25603453a75 100644 --- a/pkgs/development/libraries/haskell/diagrams/contrib.nix +++ b/pkgs/development/libraries/haskell/diagrams/contrib.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "diagrams-contrib"; - version = "0.6.0.2"; - sha256 = "1lj99a46r12zjwmpkn7vj04wapfgdlmw05jwb5lnhy9hxqgcsgng"; + version = "0.6.0.3"; + sha256 = "0j0wmf2nksqh3rqmzyw468bp25zikc5icif5f3rfi1v06ghsk0i5"; buildDepends = [ colour dataDefault diagramsLib forceLayout lens mtl vectorSpace ]; diff --git a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix index 08a9f09be3ad..0b7eb1e88de3 100644 --- a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.6.0.0"; sha256 = "17qndqsk09fvnvyhhw3xbbjjhfyyp4sivc898vqllyyky0wqmrdk"; buildDepends = [ digestiveFunctors heist mtl text xmlhtml ]; + jailbreak = true; meta = { homepage = "http://github.com/jaspervdj/digestive-functors"; description = "Heist frontend for the digestive-functors library"; diff --git a/pkgs/development/libraries/haskell/digestive-functors/default.nix b/pkgs/development/libraries/haskell/digestive-functors/default.nix index df474e632719..4ba8b16ec46e 100644 --- a/pkgs/development/libraries/haskell/digestive-functors/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "digestive-functors"; - version = "0.6.0.0"; - sha256 = "1h56nl1rszm098gwrdhm5w63mrnfjp1brfrk5hlj238nmj0djgcd"; + version = "0.6.0.1"; + sha256 = "1ni1hfmpz14yvgjphwz64hqhg7xbhvvqbdnapspipplvnl0rcmhi"; buildDepends = [ mtl text ]; meta = { homepage = "http://github.com/jaspervdj/digestive-functors"; diff --git a/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix b/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix index 86fa71221954..aaca850c0d7a 100644 --- a/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix +++ b/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "distributed-process-simplelocalnet"; - version = "0.2.0.8"; - sha256 = "01kzqfbrkl9zzknw0gbdh1c1lss911lphagn2sw6nzl9xpnhjqk0"; + version = "0.2.0.9"; + sha256 = "0bkb26bfpmyhh26hgznnw073kvk78ws6lqi86pxrgnnm9sx5mi21"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/distributed-process/default.nix b/pkgs/development/libraries/haskell/distributed-process/default.nix index 6ecd5d578838..1e83cbaa8d95 100644 --- a/pkgs/development/libraries/haskell/distributed-process/default.nix +++ b/pkgs/development/libraries/haskell/distributed-process/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "distributed-process"; - version = "0.4.1"; - sha256 = "1ysm2rq7ldxb5w6m04vf5q3zrgvg99z7kszjqj17r17ps61v898f"; + version = "0.4.2"; + sha256 = "16w8jp66903vn089ysqdn534v0744cr2m6wkqd77zri6a0caaa6c"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/dyre/default.nix b/pkgs/development/libraries/haskell/dyre/default.nix new file mode 100644 index 000000000000..8b3d2cab677a --- /dev/null +++ b/pkgs/development/libraries/haskell/dyre/default.nix @@ -0,0 +1,18 @@ +{ cabal, binary, executablePath, filepath, ghcPaths, ioStorage +, time, xdgBasedir +}: + +cabal.mkDerivation (self: { + pname = "dyre"; + version = "0.8.11"; + sha256 = "0sg5csshznbbyvq72s4sps7bkjlkfxiwcy4i3ip83lrxjw1msvr8"; + buildDepends = [ + binary executablePath filepath ghcPaths ioStorage time xdgBasedir + ]; + meta = { + homepage = "http://github.com/willdonnelly/dyre"; + description = "Dynamic reconfiguration in Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/edit-distance/default.nix b/pkgs/development/libraries/haskell/edit-distance/default.nix index b6d0b4668f8e..22f5953b7e04 100644 --- a/pkgs/development/libraries/haskell/edit-distance/default.nix +++ b/pkgs/development/libraries/haskell/edit-distance/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "edit-distance"; - version = "0.2.1.1"; - sha256 = "1d8h38cn3azvsp2dp5gycglm5bwwd8plbag8ypi38yj6c35a82yn"; + version = "0.2.1.2"; + sha256 = "08dxsp1ar8mr4xrjy37lzl0s1rjnqsdq30p09nclip5pyhcw7g44"; isLibrary = true; isExecutable = true; buildDepends = [ random ]; diff --git a/pkgs/development/libraries/haskell/either/default.nix b/pkgs/development/libraries/haskell/either/default.nix index cbfa53b6d001..4730af585697 100644 --- a/pkgs/development/libraries/haskell/either/default.nix +++ b/pkgs/development/libraries/haskell/either/default.nix @@ -1,13 +1,16 @@ -{ cabal, semigroupoids, semigroups, transformers }: +{ cabal, MonadRandom, mtl, semigroupoids, semigroups, transformers +}: cabal.mkDerivation (self: { pname = "either"; - version = "3.0.3"; - sha256 = "02kpb8xd19n00ll61haqr6k3hy8qmbdf73gr4zs59q9xh0739qxc"; - buildDepends = [ semigroupoids semigroups transformers ]; + version = "3.4"; + sha256 = "05nbp8gp50wq592k6dsrpzp6wmqjn9pz6mkizqfb65z1wvd1xiz2"; + buildDepends = [ + MonadRandom mtl semigroupoids semigroups transformers + ]; meta = { homepage = "http://github.com/ekmett/either/"; - description = "Haskell 98 either monad transformer"; + description = "An either monad transformer"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; diff --git a/pkgs/development/libraries/haskell/email-validate/default.nix b/pkgs/development/libraries/haskell/email-validate/default.nix index 1b1b4b7348ed..482fd766487f 100644 --- a/pkgs/development/libraries/haskell/email-validate/default.nix +++ b/pkgs/development/libraries/haskell/email-validate/default.nix @@ -1,10 +1,10 @@ -{ cabal, parsec, ranges }: +{ cabal, attoparsec }: cabal.mkDerivation (self: { pname = "email-validate"; - version = "0.3.2"; - sha256 = "0cshrl0if1ivn7c0ggm21r58pzsyp7l5wk3dgl86n6zla9dwdmhq"; - buildDepends = [ parsec ranges ]; + version = "1.0.0"; + sha256 = "0sj1cvn9ap0m8d4cg4cqavvmkd74vp86lyyra9g6f17815sxdbsg"; + buildDepends = [ attoparsec ]; meta = { homepage = "http://porg.es/blog/email-address-validation-simpler-faster-more-correct"; description = "Validating an email address string against RFC 5322"; diff --git a/pkgs/development/libraries/haskell/errors/default.nix b/pkgs/development/libraries/haskell/errors/default.nix index d2e68670eb0e..7ed890c513c5 100644 --- a/pkgs/development/libraries/haskell/errors/default.nix +++ b/pkgs/development/libraries/haskell/errors/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "errors"; - version = "1.3.1"; - sha256 = "0vfpnpkiz362bvjyaf35spfk3h6vw7xi1x3f8agzs7kmxrdvrfik"; + version = "1.4.1"; + sha256 = "18npfwr6byh0aib9qxpynr2gf0v92c0xbxky4a733jbdrwli5c40"; buildDepends = [ either safe transformers ]; meta = { description = "Simplified error-handling"; diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix index 43492d73fae5..d114a5aa3afd 100644 --- a/pkgs/development/libraries/haskell/filestore/default.nix +++ b/pkgs/development/libraries/haskell/filestore/default.nix @@ -11,6 +11,7 @@ cabal.mkDerivation (self: { buildDepends = [ Diff filepath HUnit mtl parsec split time utf8String xml ]; + jailbreak = true; meta = { description = "Interface for versioning file stores"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix new file mode 100644 index 000000000000..6e0cd15c248a --- /dev/null +++ b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix @@ -0,0 +1,14 @@ +{ cabal, transformers }: + +cabal.mkDerivation (self: { + pname = "ghc-heap-view"; + version = "0.4.2.0"; + sha256 = "0c9yz47j0ddy0l04dabglc99hl7n9wwnz4xj9r8ljafag6l221gp"; + buildDepends = [ transformers ]; + meta = { + description = "Extract the heap representation of Haskell values and thunks"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/ghc-vis/default.nix b/pkgs/development/libraries/haskell/ghc-vis/default.nix new file mode 100644 index 000000000000..4b606e8b73b9 --- /dev/null +++ b/pkgs/development/libraries/haskell/ghc-vis/default.nix @@ -0,0 +1,20 @@ +{ cabal, cairo, deepseq, fgl, ghcHeapView, graphviz, gtk, mtl +, svgcairo, text, transformers, xdot +}: + +cabal.mkDerivation (self: { + pname = "ghc-vis"; + version = "0.6"; + sha256 = "0gvfs0f6fjg4bzq9q6rrhin6gk1pbyw9qbigi90cz1fg10nq7nzi"; + buildDepends = [ + cairo deepseq fgl ghcHeapView graphviz gtk mtl svgcairo text + transformers xdot + ]; + meta = { + homepage = "http://felsin9.de/nnis/ghc-vis"; + description = "Live visualization of data structures in GHCi"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix index aa06d0178bed..db1b3c6c4671 100644 --- a/pkgs/development/libraries/haskell/gitit/default.nix +++ b/pkgs/development/libraries/haskell/gitit/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "gitit"; - version = "0.10.1.2"; - sha256 = "1dy1wdnld6cxx5xqfszywi4f7xv143ar2dq4nb0dnd1dgd5hgmak"; + version = "0.10.2"; + sha256 = "07zdc1qx429rmisb39gdamwn9b1jblvjg7py4fcxx3qj01b6mvxx"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix index a0fb693acbba..ededea21fcc1 100644 --- a/pkgs/development/libraries/haskell/gloss/default.nix +++ b/pkgs/development/libraries/haskell/gloss/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "gloss"; - version = "1.7.8.1"; - sha256 = "0bi60zprgq1dd6prshvgqyyp13l6n5f171aryxg254kjagvrm3lf"; + version = "1.7.8.2"; + sha256 = "0jf49vdms8jzygkwch5k8s611pay0xqwq1lc0p476d37rzb8qpn4"; buildDepends = [ bmp GLUT OpenGL ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/graphviz/default.nix b/pkgs/development/libraries/haskell/graphviz/default.nix index 637bb5ba45ac..609863e808fa 100644 --- a/pkgs/development/libraries/haskell/graphviz/default.nix +++ b/pkgs/development/libraries/haskell/graphviz/default.nix @@ -1,13 +1,14 @@ -{ cabal, colour, dlist, fgl, filepath, polyparse, text +{ cabal, colour, dlist, fgl, filepath, polyparse, temporary, text , transformers, wlPprintText }: cabal.mkDerivation (self: { pname = "graphviz"; - version = "2999.15.0.1"; - sha256 = "137d8n20fbpdz7az79gqharsfl293pl3xn444338i6blfi47ssdy"; + version = "2999.16.0.0"; + sha256 = "1g4q4wyj5amz9xvgnqn143p5nq6m4a0lggxz7jn9l2hwp41bx1g8"; buildDepends = [ - colour dlist fgl filepath polyparse text transformers wlPprintText + colour dlist fgl filepath polyparse temporary text transformers + wlPprintText ]; meta = { homepage = "http://projects.haskell.org/graphviz/"; diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index c8b2117c1286..68b79bdcc3b5 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hakyll"; - version = "4.1.2.1"; - sha256 = "1d9bbqy1dix60w72zc3g4y7454avngfyl2i8gj99bdqin2wwcgp8"; + version = "4.1.4.0"; + sha256 = "0nhr7ai03hx2qjxlqml0js43iwxhcbpdqkwdvw8pqs396yrjwxdj"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -15,6 +15,7 @@ cabal.mkDerivation (self: { filepath httpConduit httpTypes lrucache mtl pandoc parsec random regexBase regexTdfa snapCore snapServer tagsoup text time ]; + jailbreak = true; meta = { homepage = "http://jaspervdj.be/hakyll"; description = "A static website compiler library"; diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix index 906a8e2759aa..40c6f44739c7 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 = "1.1.3.1"; - sha256 = "04qqsjrn0fh9y4z7gjf3g60w69gqxhzq7dqkraq97p3w45fijm1i"; + version = "1.1.6.2"; + sha256 = "00asrmyb4k9xpsbwwafm3rj1lisssrc3hj3dsr827w9x86xxargy"; buildDepends = [ blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text ]; diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix index b2311bde6ca9..2d50deeef651 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "happstack-server"; - version = "7.1.1"; - sha256 = "0q12l93kq5ixvam682ys3a6i3q59amz9cyr1bb06f2zf8qr57b7a"; + version = "7.1.4"; + sha256 = "0vnawm2m7lr7yvpd30divczxl90fayjvsysr7l1lq76qgxjsd576"; buildDepends = [ base64Bytestring blazeHtml extensibleExceptions filepath hslogger html monadControl mtl network parsec sendfile syb systemFilepath diff --git a/pkgs/development/libraries/haskell/hashtables/default.nix b/pkgs/development/libraries/haskell/hashtables/default.nix index 8b8616fce208..ae62c051ec5e 100644 --- a/pkgs/development/libraries/haskell/hashtables/default.nix +++ b/pkgs/development/libraries/haskell/hashtables/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hashtables"; - version = "1.0.1.8"; - sha256 = "0skrzvzasm0hg4631nhfppsb7mn60pnxk4v31gipzz780sbx9zi8"; + version = "1.1.0.2"; + sha256 = "0d103cvr168hgyghm6fp67r4lz1p592x45igwld6xq3nyxjxnbp9"; buildDepends = [ hashable primitive vector ]; meta = { homepage = "http://github.com/gregorycollins/hashtables"; diff --git a/pkgs/development/libraries/haskell/hastache/default.nix b/pkgs/development/libraries/haskell/hastache/default.nix index f37badde96da..ff8aa25bd2d2 100644 --- a/pkgs/development/libraries/haskell/hastache/default.nix +++ b/pkgs/development/libraries/haskell/hastache/default.nix @@ -1,13 +1,13 @@ { cabal, blazeBuilder, filepath, ieee754, mtl, syb, text -, utf8String +, transformers, utf8String }: cabal.mkDerivation (self: { pname = "hastache"; - version = "0.4.2"; - sha256 = "1ad691qxnnx0a6ik0cjdzd8aw7z88p06zckbb3cb1r8pk6m0g7vi"; + version = "0.5.0"; + sha256 = "1c1pphw7qx5l5fdfqchihvp2yrwwb0ln8dfshkvd1giv8cjmbyn8"; buildDepends = [ - blazeBuilder filepath ieee754 mtl syb text utf8String + blazeBuilder filepath ieee754 mtl syb text transformers utf8String ]; meta = { homepage = "http://github.com/lymar/hastache"; diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix index a2251f696731..c1d357fdb9ef 100644 --- a/pkgs/development/libraries/haskell/heist/default.nix +++ b/pkgs/development/libraries/haskell/heist/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "heist"; - version = "0.10.2.1"; - sha256 = "14lp27vlzv6qqv325x2vqqvphw5ads5ywjqpjramv3hhd275fn3d"; + version = "0.11.0.1"; + sha256 = "0d5nn0kfs7hbgs4b77i8c8pq2q5hldqk08dacva7xlxvjrlxsyn6"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors filepath hashable MonadCatchIOTransformers mtl random text time diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix index 8ebc698892ff..153cee7db75a 100644 --- a/pkgs/development/libraries/haskell/hoogle/default.nix +++ b/pkgs/development/libraries/haskell/hoogle/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hoogle"; - version = "4.2.14"; - sha256 = "1ymmf8zxp2nbygnavhr3ay0fidhd3vhrdqb7mg0qgk8y9kx25brj"; + version = "4.2.15"; + sha256 = "0mhxdbbzq7hl5zxz3dhxyrs5q08y8hxwsm19ba0gx47qvg3znzki"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/hsdns/default.nix b/pkgs/development/libraries/haskell/hsdns/default.nix index 2a83df47f090..b72f4d947c48 100644 --- a/pkgs/development/libraries/haskell/hsdns/default.nix +++ b/pkgs/development/libraries/haskell/hsdns/default.nix @@ -2,15 +2,15 @@ cabal.mkDerivation (self: { pname = "hsdns"; - version = "1.5"; - sha256 = "2788d1ad5ef07ae5f356a460fb92316118f3a4d9c779ec27fb8243602bcf6399"; + version = "1.6"; + sha256 = "1vf3crkhs7z572bqdf7p2hfcqkjxvnyg0w0cf8b7kyfxzn8bj3fa"; buildDepends = [ network ]; extraLibraries = [ adns ]; noHaddock = true; meta = { - homepage = "http://gitorious.org/hsdns"; + homepage = "http://github.com/peti/hsdns"; description = "Asynchronous DNS Resolver"; - license = "LGPL"; + license = self.stdenv.lib.licenses.gpl3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres diff --git a/pkgs/development/libraries/haskell/hsemail/default.nix b/pkgs/development/libraries/haskell/hsemail/default.nix index e8c0c9e4da86..bffe1ad58096 100644 --- a/pkgs/development/libraries/haskell/hsemail/default.nix +++ b/pkgs/development/libraries/haskell/hsemail/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hsemail"; - version = "1.7.4"; - sha256 = "0nigv0zbkm90m5jskfc5a4zx2d3gyqj1y472jplrgd76s15alsmw"; + version = "1.7.5"; + sha256 = "0ls6y48bndwgb7ng29wxim4h36rs6b07dqi6ic4hqgbb7lg6fma4"; buildDepends = [ mtl parsec ]; meta = { homepage = "http://gitorious.org/hsemail"; diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix index bc194108d337..4c897f20ef7e 100644 --- a/pkgs/development/libraries/haskell/hspec/default.nix +++ b/pkgs/development/libraries/haskell/hspec/default.nix @@ -4,15 +4,14 @@ cabal.mkDerivation (self: { pname = "hspec"; - version = "1.4.3"; - sha256 = "0i963fxamyyi3afac67rkw4340i3xqs1q3lvcy69mq0czbdvgjmc"; + version = "1.4.4"; + sha256 = "09wrvdlqzpa3vjcnirnzpj8nsvqnn5xbilnxaqmjm2agbl8xfj5r"; isLibrary = true; isExecutable = true; buildDepends = [ ansiTerminal filepath hspecExpectations HUnit QuickCheck setenv silently time transformers ]; - jailbreak = true; meta = { homepage = "http://hspec.github.com/"; description = "Behavior-Driven Development for Haskell"; diff --git a/pkgs/development/libraries/haskell/hsyslog/default.nix b/pkgs/development/libraries/haskell/hsyslog/default.nix index d5043024fd63..e26a9d9e02a3 100644 --- a/pkgs/development/libraries/haskell/hsyslog/default.nix +++ b/pkgs/development/libraries/haskell/hsyslog/default.nix @@ -2,10 +2,10 @@ cabal.mkDerivation (self: { pname = "hsyslog"; - version = "1.4"; - sha256 = "f3bf4bf47565cb0245afb0e8ffa3f79635b02f0032081845a5999964d828f4db"; + version = "1.5"; + sha256 = "1dpcawnl3a5lw2w8gc9920sjrw43qmq1k2zws8rx2q0r6ps7nhgp"; meta = { - homepage = "http://gitorious.org/hsyslog"; + homepage = "http://github.com/peti/hsyslog"; description = "FFI interface to syslog(3) from POSIX.1-2001."; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index b9f47b440068..544f6c0d6747 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.8.7"; - sha256 = "12v5rxp4dx6glyijygpp7r7b5b6mscclgfp2cbii78m3hgld097i"; + version = "1.8.7.1"; + sha256 = "1m0f9snc2zxj8hvxw3ngw0h78ckvdlxxfjvrryk93blfwbamssi5"; buildDepends = [ asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix index e30a30fc7aa3..05e97291f378 100644 --- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix +++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix @@ -1,15 +1,15 @@ -{ cabal, blazeBuilder, caseInsensitive, classyPreludeConduit -, conduit, dataDefault, httpConduit, httpTypes, liftedBase -, monadControl, network, networkConduit, text, wai, warp, word8 +{ cabal, blazeBuilder, caseInsensitive, classyPrelude, conduit +, dataDefault, httpConduit, httpTypes, liftedBase, monadControl +, network, networkConduit, text, wai, warp, word8 }: cabal.mkDerivation (self: { pname = "http-reverse-proxy"; - version = "0.1.1.1"; - sha256 = "0xg6xw0j61db75smys2fgjn0nzv2dy8c1ha4m828ssnxlic98lk2"; + version = "0.1.1.2"; + sha256 = "179j6zfmx3g6gc7mzhzhl7ymxkijg9vahjvwjwm0wm15vna52iqa"; buildDepends = [ - blazeBuilder caseInsensitive classyPreludeConduit conduit - dataDefault httpConduit httpTypes liftedBase monadControl network + blazeBuilder caseInsensitive classyPrelude conduit dataDefault + httpConduit httpTypes liftedBase monadControl network networkConduit text wai warp word8 ]; meta = { diff --git a/pkgs/development/libraries/haskell/http-types/default.nix b/pkgs/development/libraries/haskell/http-types/default.nix index 242f73e9b21a..d0837d21bff4 100644 --- a/pkgs/development/libraries/haskell/http-types/default.nix +++ b/pkgs/development/libraries/haskell/http-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "http-types"; - version = "0.7.3.0.1"; - sha256 = "1s2dh75jpf2yllw503hjw0x2anhc4c71vz5yylri8nxzx1zs18rq"; + version = "0.8.0"; + sha256 = "14d1gzgwhinkwx3lmc6hvqj6ivjrvy4m6fm2walnyk1zv24zli75"; buildDepends = [ blazeBuilder caseInsensitive text ]; meta = { homepage = "https://github.com/aristidb/http-types"; diff --git a/pkgs/development/libraries/haskell/language-haskell-extract/default.nix b/pkgs/development/libraries/haskell/language-haskell-extract/default.nix index 461c790c88b3..a77040a5578c 100644 --- a/pkgs/development/libraries/haskell/language-haskell-extract/default.nix +++ b/pkgs/development/libraries/haskell/language-haskell-extract/default.nix @@ -1,10 +1,10 @@ -{ cabal, haskellSrcExts, regexPosix }: +{ cabal, regexPosix }: cabal.mkDerivation (self: { pname = "language-haskell-extract"; - version = "0.2.3"; - sha256 = "0fz1nin596ihlh77pafzpdf46br1k3pxcxyml2rvly6g0h3yjgpr"; - buildDepends = [ haskellSrcExts regexPosix ]; + version = "0.2.4"; + sha256 = "1nxcs7g8a1sp91bzpy4cj6s31k5pvc3gvig04cbrggv5cvjidnhl"; + buildDepends = [ regexPosix ]; meta = { homepage = "http://github.com/finnsson/template-helper"; description = "Module to automatically extract functions from the local code"; diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix index e815d654b612..e7e40312af3e 100644 --- a/pkgs/development/libraries/haskell/lens/default.nix +++ b/pkgs/development/libraries/haskell/lens/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "lens"; - version = "3.8.2"; - sha256 = "1spz4nyv1f7kf4bnw8qgqaks5kc4m0slzw0czj1wh1232w2sz15m"; + version = "3.8.5"; + sha256 = "09z2izh7mqj75yh9f0pb8ky9vnzs9zx2z2mz1ik7l8wid43gm6vn"; buildDepends = [ bifunctors comonad comonadsFd comonadTransformers contravariant distributive filepath genericDeriving hashable diff --git a/pkgs/development/libraries/haskell/math-functions/default.nix b/pkgs/development/libraries/haskell/math-functions/default.nix index 127e888d1104..158feeee18a7 100644 --- a/pkgs/development/libraries/haskell/math-functions/default.nix +++ b/pkgs/development/libraries/haskell/math-functions/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "math-functions"; - version = "0.1.1.2"; - sha256 = "09q9647zxvvg7wi81r14qhhy64d1mwgy8kg0zkhdvg4rzw9j669v"; + version = "0.1.3.0"; + sha256 = "06wxr8fbhmsgkpyx2vimx9l6apk0p27mwrxrvbjk0b7m9vsg3ay5"; buildDepends = [ erf vector ]; meta = { homepage = "https://github.com/bos/math-functions"; diff --git a/pkgs/development/libraries/haskell/mime-types/default.nix b/pkgs/development/libraries/haskell/mime-types/default.nix index 1bde4861b3ac..5dd5f65c9e74 100644 --- a/pkgs/development/libraries/haskell/mime-types/default.nix +++ b/pkgs/development/libraries/haskell/mime-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "mime-types"; - version = "0.1.0.2"; - sha256 = "1pkhr8k23386qwa1wmlrcilz75di2l8n5kc4n8pnia05p49akfcs"; + version = "0.1.0.3"; + sha256 = "0mzhkqcjlnrs9mwn2crsr1m2mf6pgygs1s3ks8akz1618v6jm6y1"; buildDepends = [ text ]; meta = { homepage = "https://github.com/yesodweb/wai"; diff --git a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix index b702f10354cd..df63e3ec6591 100644 --- a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix +++ b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "monadcryptorandom"; - version = "0.5"; - sha256 = "19sb9mgfvmmmx1sn0aiq6dn5nl0201xwgs6xqakn7pz5vsqcww2b"; + version = "0.5.1"; + sha256 = "10waxc0i7hcqlgb9iwcdz0xqkym4ihavgwq466xlaqzzhcpp38d6"; buildDepends = [ cryptoApi mtl tagged transformers ]; meta = { homepage = "https://github.com/TomMD/monadcryptorandom"; diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index ed6600626734..d53ddf7ad308 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "pandoc"; - version = "1.10.0.5"; - sha256 = "05mjgvxk3wxfssf4aviigdm6jb73a6bp8lwz86aabdgkgh2i6n54"; + version = "1.10.1"; + sha256 = "127pxs1w99nr6hdancaajm20w3vgmch4xlj0v7221y7i9qcr1y1y"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix index 040c931d1f61..90a92019f0e1 100644 --- a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix +++ b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "postgresql-libpq"; - version = "0.8.2.1"; - sha256 = "0fjy451gc9lg3kcglq4s5s3hja8ni3adh4jmxd01kfyvyhwggv4d"; + version = "0.8.2.2"; + sha256 = "1mmsfgia318p34l8jx8hihb160sx2wpg2h5r741akcs50v6p5878"; extraLibraries = [ postgresql ]; meta = { homepage = "http://github.com/lpsmith/postgresql-libpq"; diff --git a/pkgs/development/libraries/haskell/profunctors/default.nix b/pkgs/development/libraries/haskell/profunctors/default.nix index 7146359eda40..e2194bf90597 100644 --- a/pkgs/development/libraries/haskell/profunctors/default.nix +++ b/pkgs/development/libraries/haskell/profunctors/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "profunctors"; - version = "3.2"; - sha256 = "0c7242pk5hfz67cwjy0l7skqyz20akw9j2w7cb8iggcbbb27bgyc"; + version = "3.3"; + sha256 = "0cvar0qr2yf0lmqwhiy2ibajiq9cmqy2ikwn8l5mdxxh5q5rwgjj"; buildDepends = [ comonad tagged ]; meta = { homepage = "http://github.com/ekmett/profunctors/"; diff --git a/pkgs/development/libraries/haskell/project-template/default.nix b/pkgs/development/libraries/haskell/project-template/default.nix index 04b0de35465c..541fa2026d98 100644 --- a/pkgs/development/libraries/haskell/project-template/default.nix +++ b/pkgs/development/libraries/haskell/project-template/default.nix @@ -1,15 +1,14 @@ -{ cabal, base64Bytestring, base64Conduit, classyPreludeConduit -, conduit, mtl, resourcet, systemFileio, systemFilepath, text -, transformers +{ cabal, base64Bytestring, base64Conduit, classyPrelude, conduit +, mtl, resourcet, systemFileio, systemFilepath, text, transformers }: cabal.mkDerivation (self: { pname = "project-template"; - version = "0.1.1"; - sha256 = "186hqfhhl77yq9gqiw59jbnkk7xmpljqfwwilzjkjknf3ifhs5na"; + version = "0.1.3"; + sha256 = "1nsc4i3s9a7d0nysswhylvnr79z0ax9biiwr7b6jn7jzx0f2bdmm"; buildDepends = [ - base64Bytestring base64Conduit classyPreludeConduit conduit mtl - resourcet systemFileio systemFilepath text transformers + base64Bytestring base64Conduit classyPrelude conduit mtl resourcet + systemFileio systemFilepath text transformers ]; meta = { homepage = "https://github.com/fpco/haskell-ide"; diff --git a/pkgs/development/libraries/haskell/reflection/default.nix b/pkgs/development/libraries/haskell/reflection/default.nix index fbcaa58d777e..1819b3d217df 100644 --- a/pkgs/development/libraries/haskell/reflection/default.nix +++ b/pkgs/development/libraries/haskell/reflection/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "reflection"; - version = "1.1.6"; - sha256 = "1ihyx1a8pk1czam0qm1znl851dn4y6jip6s30girgghrvvxmblkw"; + version = "1.1.7"; + sha256 = "073v9y09fvh7nsfqp1jp2ncrq0xkcv5fvikl769ghv2ycgkfxl4z"; buildDepends = [ tagged ]; meta = { homepage = "http://github.com/ekmett/reflection"; diff --git a/pkgs/development/libraries/haskell/repa-io/default.nix b/pkgs/development/libraries/haskell/repa-io/default.nix index 7b15b2bbb929..046fafca43a7 100644 --- a/pkgs/development/libraries/haskell/repa-io/default.nix +++ b/pkgs/development/libraries/haskell/repa-io/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "repa-io"; - version = "3.2.3.1"; - sha256 = "19dnz8xa18yydprnwzgdcbrndi6akwc53rs1104z0awffh83iynm"; + version = "3.2.3.2"; + sha256 = "116qxq0jsq3hbj0hxjxfr9sl29vzj1rpfbzfxgc243v1hh4rdjfr"; buildDepends = [ binary bmp repa vector ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/semigroupoids/default.nix b/pkgs/development/libraries/haskell/semigroupoids/default.nix index 7e25fa5913e2..4f1367dd559d 100644 --- a/pkgs/development/libraries/haskell/semigroupoids/default.nix +++ b/pkgs/development/libraries/haskell/semigroupoids/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "semigroupoids"; - version = "3.0.1"; - sha256 = "12k2yryr31lxhwq42cx05kswljmbli8p8c2wknigzkkam63d8k5h"; + version = "3.0.2"; + sha256 = "0k137iafw0srgmy4qwx3cbx00519c0h91nmszdbx6pzpvf6m5fwm"; buildDepends = [ comonad contravariant semigroups transformers ]; meta = { homepage = "http://github.com/ekmett/semigroupoids"; diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index 61c783c6727b..6ed553516b60 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 = "1.0.2"; - sha256 = "02sk9ql357ybj1h5a4xjn06di5zdafibabhy32j5vs9kpyamvck3"; + version = "1.0.2.1"; + sha256 = "1ik0128gwziv1dajz2g73rk1yac0ymd1w59q3g8c9g8ibwxn9hca"; buildDepends = [ parsec shakespeare text transformers ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix index a7238ba52eb3..01bf73fd5013 100644 --- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-js"; - version = "1.1.1"; - sha256 = "1xzhb3ipax2489311hmiaxp9i44099bsbclcj3ds0rhdfa62xarg"; + version = "1.1.2"; + sha256 = "0iwajn0d0yngzp10j9qbb2gpq1g7r390yqd7pj5dri35rjc6mr8n"; buildDepends = [ aeson shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix index 11a03eaa9b28..0e04ff4fd448 100644 --- a/pkgs/development/libraries/haskell/shakespeare/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare"; - version = "1.0.2"; - sha256 = "1n7qymrn2f83a11zdh2950pf8rsqnc52blwi02amjxsvy2piidzm"; + version = "1.0.3.1"; + sha256 = "08w1g19k9v9dvdy45j32kdic8vjhc10ad4g20q5ya0id4cd13qfs"; buildDepends = [ parsec text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix index 16df3f347563..a20ec8e7ca5a 100644 --- a/pkgs/development/libraries/haskell/snap/core.nix +++ b/pkgs/development/libraries/haskell/snap/core.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "snap-core"; - version = "0.9.2.2"; - sha256 = "0svahih2piaj87xfysgjvqqh11gmwz9icrh2g819h68kzh10imlf"; + version = "0.9.3.1"; + sha256 = "1q2lk70l0hk4l6ksjnal1bfkby0i08gdzvj9cscvxs4njxmgdapq"; buildDepends = [ attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator bytestringMmap caseInsensitive deepseq enumerator filepath HUnit diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix index 7f8dc8780243..3d25c6c215f4 100644 --- a/pkgs/development/libraries/haskell/snap/server.nix +++ b/pkgs/development/libraries/haskell/snap/server.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "snap-server"; - version = "0.9.2.4"; - sha256 = "1kwmrlk9dr033h6q05afnr916wnw5wlxrr87z1myv0a6nzqmdhzl"; + version = "0.9.3.1"; + sha256 = "0wagx1zy52fi4fldbzpsvk5hpdrma9lwsip9zrrbszxf446amd53"; buildDepends = [ attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator caseInsensitive enumerator MonadCatchIOTransformers mtl network diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index 30a2d34a99ef..7316e519d65e 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "snap"; - version = "0.10.0.1"; - sha256 = "14j9lgcdyxh7n4yidfvn1r94nziljiqz6nsqgq114v34bnn6l2yn"; + version = "0.11.1"; + sha256 = "0dd66496fjfp80i6whl356sqk7n03rx4ycsah7x11fc9rvplmr3q"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -19,7 +19,6 @@ cabal.mkDerivation (self: { snapCore snapServer stm syb text time transformers unorderedContainers vector vectorAlgorithms xmlhtml ]; - jailbreak = true; meta = { homepage = "http://snapframework.com/"; description = "Top-level package for the Snap Web Framework"; diff --git a/pkgs/development/libraries/haskell/split/0.2.1.2.nix b/pkgs/development/libraries/haskell/split/0.2.1.2.nix new file mode 100644 index 000000000000..e88f478f9762 --- /dev/null +++ b/pkgs/development/libraries/haskell/split/0.2.1.2.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "split"; + version = "0.2.1.2"; + sha256 = "0wjw4j9wgk66h7filzfh0py9b0wwmaynvwqvd6kinxgms86fpvyi"; + meta = { + description = "Combinator library for splitting lists"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/string-qq/default.nix b/pkgs/development/libraries/haskell/string-qq/default.nix new file mode 100644 index 000000000000..78fe1c3930f7 --- /dev/null +++ b/pkgs/development/libraries/haskell/string-qq/default.nix @@ -0,0 +1,12 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "string-qq"; + version = "0.0.2"; + sha256 = "0662m3i5xrdrr95w829bszkhp88mj9iy1zya54vk2sl5hz9wlmwp"; + meta = { + description = "QuasiQuoter for non-interpolated strings, texts and bytestrings"; + license = self.stdenv.lib.licenses.publicDomain; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/stylish-haskell/default.nix b/pkgs/development/libraries/haskell/stylish-haskell/default.nix index 03ab9a2b84de..1ca325cbf172 100644 --- a/pkgs/development/libraries/haskell/stylish-haskell/default.nix +++ b/pkgs/development/libraries/haskell/stylish-haskell/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "stylish-haskell"; - version = "0.5.5.2"; - sha256 = "1whl8qdqyw2saic70kav8srg4f6bcn77mc86m0vk8i8n5mb3q4ny"; + version = "0.5.6.0"; + sha256 = "1cy40b7csna3fwq0bm5mx9d09x52vj517mf38yn8ymd0afff67sb"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix index 78ec99da8db5..581cede2e879 100644 --- a/pkgs/development/libraries/haskell/texmath/default.nix +++ b/pkgs/development/libraries/haskell/texmath/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "texmath"; - version = "0.6.1.2"; - sha256 = "1izsjy30saz2il16dwx8sh2s30b1pfgcpq6023v135w1bdrzrnmq"; + version = "0.6.1.3"; + sha256 = "1f2hka9jwlrm9dvw7z3896yfpdzxs2vaw0vbcmj5p401mvzc8w05"; isLibrary = true; isExecutable = true; buildDepends = [ parsec syb xml ]; diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix index 29b6b11d7913..af7b4c57bb76 100644 --- a/pkgs/development/libraries/haskell/tls/default.nix +++ b/pkgs/development/libraries/haskell/tls/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tls"; - version = "1.1.1"; - sha256 = "0ji83b5z3v6f6a6rgyj5xkjh9vvsqckr7ymzjnhb4zqf0mgymypq"; + version = "1.1.2"; + sha256 = "1vg1mnz6cxxgs48pbpjp4hwyvsysxyzvjfy4p1vd23lwc32cdjqg"; buildDepends = [ cereal certificate cryptohash cryptoPubkey cryptoRandomApi mtl network diff --git a/pkgs/development/libraries/haskell/vty-ui/default.nix b/pkgs/development/libraries/haskell/vty-ui/default.nix new file mode 100644 index 000000000000..5d0c9ffd91a8 --- /dev/null +++ b/pkgs/development/libraries/haskell/vty-ui/default.nix @@ -0,0 +1,20 @@ +{ cabal, filepath, mtl, QuickCheck, random, regexBase, stm, text +, time, vector, vty +}: + +cabal.mkDerivation (self: { + pname = "vty-ui"; + version = "1.6"; + sha256 = "0chwgzzk2pl9kppd9r6h2azbqc668xpdrrk5y415yi8wcw61s0bc"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + filepath mtl QuickCheck random regexBase stm text time vector vty + ]; + meta = { + homepage = "http://jtdaugherty.github.com/vty-ui/"; + description = "An interactive terminal user interface library for Vty"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/vty/default.nix b/pkgs/development/libraries/haskell/vty/default.nix index 2642af7457e7..e475ca7e8560 100644 --- a/pkgs/development/libraries/haskell/vty/default.nix +++ b/pkgs/development/libraries/haskell/vty/default.nix @@ -1,13 +1,15 @@ -{ cabal, deepseq, mtl, parallel, parsec, terminfo, utf8String -, vector +{ cabal, deepseq, mtl, parallel, parsec, stringQq, terminfo +, utf8String, vector }: cabal.mkDerivation (self: { pname = "vty"; - version = "4.7.0.20"; - sha256 = "15slw4zpvfkx9qwj2g5ndcxwbw0kkhyq8frvh9kharqd0zqzgqzb"; + version = "4.7.3"; + sha256 = "0x059mzw6v2xf92fdhy0ilyqbics2as6dqrdr6njpp0m6qykkybb"; + isLibrary = true; + isExecutable = true; buildDepends = [ - deepseq mtl parallel parsec terminfo utf8String vector + deepseq mtl parallel parsec stringQq terminfo utf8String vector ]; meta = { homepage = "https://github.com/coreyoconnor/vty"; diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 1f08f3f1fd4f..9cebbde00090 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "wai-extra"; - version = "1.3.2"; - sha256 = "1089sfb4jyi17rw6nivpy96gbc90nyawr35jzwlzl41gzxxmv503"; + version = "1.3.2.1"; + sha256 = "13w3nhz59h4j25fsy95221y71k300plhs4vjqz2wxaigpv9sc2y7"; buildDepends = [ ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive conduit dataDefault dateCache fastLogger httpTypes network diff --git a/pkgs/development/libraries/haskell/wai-test/default.nix b/pkgs/development/libraries/haskell/wai-test/default.nix index 0c9b8eb2eb81..cff2cb318502 100644 --- a/pkgs/development/libraries/haskell/wai-test/default.nix +++ b/pkgs/development/libraries/haskell/wai-test/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "wai-test"; - version = "1.3.0"; - sha256 = "15y0aw5c4sh1mns4ss39l0wsxrd1b6yq6m5r638x23zl6y7d9j40"; + version = "1.3.0.1"; + sha256 = "0yy0bvkrny4kj77wvn0cflwha6yijfxvnj530ps7xnzv1qm8qn1l"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit cookie httpTypes HUnit text transformers wai diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix index 56421b213d5b..ee6eb2885654 100644 --- a/pkgs/development/libraries/haskell/wai/default.nix +++ b/pkgs/development/libraries/haskell/wai/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "wai"; - version = "1.3.0.1"; - sha256 = "0z6byx71awhjb7fycz1ixsyzzlsrv1i69qwjrfzh9y5wnbchj9yl"; + version = "1.3.0.2"; + sha256 = "1ijxdnl76kkm2qck5qiwdwqvwkbpw8zbilfaz67sfbz3ccwls2fc"; buildDepends = [ blazeBuilder conduit httpTypes network text transformers vault ]; diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index 6a36e873ca69..dd6bf66b676b 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "1.3.7.1"; - sha256 = "0kabcxzjc686iayhxln2cmnxm3vk3h0685n4d4ybprv5h1nc6ghl"; + version = "1.3.7.2"; + sha256 = "06cwc0lmzgna939svdw7v5s822safkfy3wd4n21f9ml20iskzqm6"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable httpTypes liftedBase network networkConduit simpleSendfile diff --git a/pkgs/development/libraries/haskell/xdg-basedir/default.nix b/pkgs/development/libraries/haskell/xdg-basedir/default.nix new file mode 100644 index 000000000000..3a12faf07c9e --- /dev/null +++ b/pkgs/development/libraries/haskell/xdg-basedir/default.nix @@ -0,0 +1,14 @@ +{ cabal, filepath }: + +cabal.mkDerivation (self: { + pname = "xdg-basedir"; + version = "0.2.2"; + sha256 = "0azlzaxp2dn4l1nr7shsxah2magk1szf6fx0mv75az00qsjw6qg4"; + buildDepends = [ filepath ]; + meta = { + homepage = "http://github.com/willdonnelly/xdg-basedir"; + description = "A basic implementation of the XDG Base Directory specification"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/xdot/default.nix b/pkgs/development/libraries/haskell/xdot/default.nix new file mode 100644 index 000000000000..73cc5c6e7640 --- /dev/null +++ b/pkgs/development/libraries/haskell/xdot/default.nix @@ -0,0 +1,14 @@ +{ cabal, cairo, graphviz, gtk, mtl, polyparse, text }: + +cabal.mkDerivation (self: { + pname = "xdot"; + version = "0.2.2"; + sha256 = "1n7lwshfn5rzbk4fxlkn02fxki2xh5m0304hnb1d5mchxyzhfdan"; + buildDepends = [ cairo graphviz gtk mtl polyparse text ]; + meta = { + description = "Parse Graphviz xdot files and interactively view them using GTK and Cairo"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index dfa96bf2b13e..e0bd834f1ea4 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -1,5 +1,5 @@ { cabal, aeson, authenticate, blazeHtml, blazeMarkup, hamlet -, httpConduit, liftedBase, mimeMail, network, persistent +, httpConduit, httpTypes, liftedBase, mimeMail, network, persistent , persistentTemplate, pureMD5, pwstoreFast, random, SHA , shakespeareCss, shakespeareJs, text, transformers , unorderedContainers, wai, yesodCore, yesodForm, yesodJson @@ -8,12 +8,12 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "1.1.3"; - sha256 = "0rlp56jsb0cwm1z303b7l9iy5hbip18vlm7fisna4agbf4rj2k0z"; + version = "1.1.4.1"; + sha256 = "18x2m1clk3nqaap51c6ayxbh5q6v0i4srcphgyf26lrxq514pvad"; buildDepends = [ aeson authenticate blazeHtml blazeMarkup hamlet httpConduit - liftedBase mimeMail network persistent persistentTemplate pureMD5 - pwstoreFast random SHA shakespeareCss shakespeareJs text + httpTypes liftedBase mimeMail network persistent persistentTemplate + pureMD5 pwstoreFast random SHA shakespeareCss shakespeareJs text transformers unorderedContainers wai yesodCore yesodForm yesodJson yesodPersistent ]; diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 65b24a4534ca..bf13f7da1741 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.1.7.1"; - sha256 = "07rh6yy8hz660hxz60gvminm166cb5was8qb1l24lrmzchigbf3r"; + version = "1.1.8"; + sha256 = "03yk9ypd314830bk3jjwkzi87bn04lqkh6hq91izn1prvijjiqjm"; buildDepends = [ aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit cookie failure fastLogger hamlet httpTypes diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 2d0a099002cb..9ce33159d8f1 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.2.0.2"; - sha256 = "0a3172rgvma420l98hkgvl17ks2a2jkys3rh4qd2bbm9p7qknv3y"; + version = "1.2.1.1"; + sha256 = "1nb0sxg8ln6yiw1a7f896nfqhbrmywhcxcv658g21h8y26jhiizm"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi dataDefault emailValidate hamlet network persistent shakespeareCss diff --git a/pkgs/development/libraries/haskell/yesod-routes/default.nix b/pkgs/development/libraries/haskell/yesod-routes/default.nix index ec09a68e32c7..c1dd27e377d7 100644 --- a/pkgs/development/libraries/haskell/yesod-routes/default.nix +++ b/pkgs/development/libraries/haskell/yesod-routes/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "yesod-routes"; - version = "1.1.1.1"; - sha256 = "10cy50dnhbhwi0yspq0x06gzqpmhkalqq1sww2wjpv13hp53pq3m"; + version = "1.1.2"; + sha256 = "17yv2z7k1s958xyn552wpk0cwpivsnkvia8477yhgbp4n2d1i5jv"; buildDepends = [ pathPieces text vector ]; meta = { homepage = "http://www.yesodweb.com/"; diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index 7923b6e9e8e3..a47cc59ecc5b 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "yesod-static"; - version = "1.1.1.2"; - sha256 = "0x3vrzqqddi4fmbivmy5pi66jmnc5fh68j5fjfxn5nyhp4n6z0sw"; + version = "1.1.2"; + sha256 = "0rh5vdpiq1ryw7isyaqqw3sif833k8j32m47lvr0dj46lj2jz0a0"; buildDepends = [ base64Bytestring cereal conduit cryptoConduit cryptohash fileEmbed httpTypes systemFilepath text transformers unixCompat wai diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix index b03274902e67..2d7496b3c1c5 100644 --- a/pkgs/development/libraries/haskell/yesod-test/default.nix +++ b/pkgs/development/libraries/haskell/yesod-test/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yesod-test"; - version = "0.3.3"; - sha256 = "1jb410r905wd26swh2rk59nbyy389gcfz261adhb69awmsyql5x3"; + version = "0.3.3.1"; + sha256 = "052dc68r2k56jzl9yh72kwcgdp35rm9w9vyj6xprqk506i43x7m1"; buildDepends = [ attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive cookie hspec htmlConduit httpTypes HUnit monadControl network diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index 50365296270d..c4f865d3e85f 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -12,8 +12,8 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "1.1.7.2"; - sha256 = "0mxxzcmp63sdn7g30ilp40dsj2iccajc9gpxycnqxqabdzhqkbm0"; + version = "1.1.8"; + sha256 = "0ygcsrq8nf1jvksig72r3i13qz1d3hgh5476fy6l4wl33idk6jb1"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/libeatmydata/default.nix b/pkgs/development/libraries/libeatmydata/default.nix new file mode 100644 index 000000000000..48a0423653d6 --- /dev/null +++ b/pkgs/development/libraries/libeatmydata/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libeatmydata-65"; + + src = fetchurl { + url = "http://www.flamingspork.com/projects/libeatmydata/${name}.tar.gz"; + sha256 = "1hfmd24ps5661zbbw1qqgqs6hcwx6ll2fxz2j4cfvkmf0kzw25la"; + }; + + meta = { + homepage = http://www.flamingspork.com/projects/libeatmydata/; + license = "GPLv3+"; + description = "Small LD_PRELOAD library to disable fsync and friends"; + }; +} diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 147ea283ddac..56f6242c09e8 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -7,11 +7,11 @@ assert gnomeSupport -> gdk_pixbuf != null && gnome_vfs != null && libbonobo != n && glib != null; stdenv.mkDerivation rec { - name = "libgsf-1.14.23"; + name = "libgsf-1.14.25"; src = fetchurl { url = "mirror://gnome/sources/libgsf/1.14/${name}.tar.xz"; - sha256 = "05zvaazf0d584nfirwsz7889lbsl4v781hslv3kda6akiwbwdhdz"; + sha256 = "127548f07e07951984fb139c3f89d65b9e471aefe6555387de03e1113944d1a2"; }; nativeBuildInputs = [ intltool pkgconfig ]; @@ -24,8 +24,6 @@ stdenv.mkDerivation rec { doCheck = true; - patches = [ ./syscall-name-clash.patch ]; - meta = { homepage = http://www.gnome.org/projects/libgsf; license = "LGPLv2"; diff --git a/pkgs/development/libraries/libgsf/syscall-name-clash.patch b/pkgs/development/libraries/libgsf/syscall-name-clash.patch deleted file mode 100644 index 01543ade4fdd..000000000000 --- a/pkgs/development/libraries/libgsf/syscall-name-clash.patch +++ /dev/null @@ -1,120 +0,0 @@ -diff -Naur libgsf-1.14.23-orig/tests/test-cp-msole.c libgsf-1.14.23/tests/test-cp-msole.c ---- libgsf-1.14.23-orig/tests/test-cp-msole.c 2009-05-18 21:55:48.000000000 -0400 -+++ libgsf-1.14.23/tests/test-cp-msole.c 2012-07-15 03:52:03.858382670 -0400 -@@ -34,7 +34,7 @@ - static void clone_dir (GsfInfile *in, GsfOutfile *out); - - static void --clone (GsfInput *input, GsfOutput *output) -+clone_is_a_stupid_name_for_a_function_compiled_on_linux (GsfInput *input, GsfOutput *output) - { - if (gsf_input_size (input) > 0) { - guint8 const *data; -@@ -87,7 +87,7 @@ - gsf_infile_name_by_index (in, i), - is_dir); - -- clone (new_input, new_output); -+ clone_is_a_stupid_name_for_a_function_compiled_on_linux (new_input, new_output); - } - /* An observation: when you think about the explanation to is_dir - * above, you realize that clone_dir is called even for regular files. -@@ -137,7 +137,7 @@ - - outfile = gsf_outfile_msole_new (output); - g_object_unref (G_OBJECT (output)); -- clone (GSF_INPUT (infile), GSF_OUTPUT (outfile)); -+ clone_is_a_stupid_name_for_a_function_compiled_on_linux (GSF_INPUT (infile), GSF_OUTPUT (outfile)); - - return 0; - } -diff -Naur libgsf-1.14.23-orig/tests/test-cp-zip.c libgsf-1.14.23/tests/test-cp-zip.c ---- libgsf-1.14.23-orig/tests/test-cp-zip.c 2009-05-18 21:55:48.000000000 -0400 -+++ libgsf-1.14.23/tests/test-cp-zip.c 2012-07-15 03:54:53.719198559 -0400 -@@ -32,7 +32,7 @@ - #include <stdio.h> - - static void --clone (GsfInfile *in, GsfOutfile *out) -+clone_is_a_stupid_name_for_a_function_compiled_on_linux (GsfInfile *in, GsfOutfile *out) - { - GsfInput *input = GSF_INPUT (in); - GsfOutput *output = GSF_OUTPUT (out); -@@ -85,7 +85,7 @@ - output = gsf_outfile_new_child_full (out, name, is_dir, - "compression-level", level, - NULL); -- clone (GSF_INFILE (input), GSF_OUTFILE (output)); -+ clone_is_a_stupid_name_for_a_function_compiled_on_linux (GSF_INFILE (input), GSF_OUTFILE (output)); - } - } - gsf_output_close (GSF_OUTPUT (out)); -@@ -137,7 +137,7 @@ - - outfile = gsf_outfile_zip_new (output, &err); - g_object_unref (G_OBJECT (output)); -- clone (infile, outfile); -+ clone_is_a_stupid_name_for_a_function_compiled_on_linux (infile, outfile); - - return 0; - } -diff -Naur libgsf-1.14.23-orig/tests/test-dump-msole.c libgsf-1.14.23/tests/test-dump-msole.c ---- libgsf-1.14.23-orig/tests/test-dump-msole.c 2011-12-07 18:05:18.000000000 -0500 -+++ libgsf-1.14.23/tests/test-dump-msole.c 2012-07-15 03:56:15.581110536 -0400 -@@ -32,7 +32,7 @@ - #include <stdio.h> - - static void --clone (GsfInput *input, GsfOutput *output) -+clone_is_a_stupid_name_for_a_function_compiled_on_linux (GsfInput *input, GsfOutput *output) - { - guint8 const *data; - size_t len; -@@ -72,7 +72,7 @@ - dst = gsf_outfile_new_child (out, - gsf_infile_name_by_index (in, i), - is_dir); -- clone (src, dst); -+ clone_is_a_stupid_name_for_a_function_compiled_on_linux (src, dst); - } - } - -@@ -118,7 +118,7 @@ - g_error_free (err); - return 1; - } -- clone (GSF_INPUT (infile), GSF_OUTPUT (outfile)); -+ clone_is_a_stupid_name_for_a_function_compiled_on_linux (GSF_INPUT (infile), GSF_OUTPUT (outfile)); - - return 0; - } -diff -Naur libgsf-1.14.23-orig/tests/test-restore-msole.c libgsf-1.14.23/tests/test-restore-msole.c ---- libgsf-1.14.23-orig/tests/test-restore-msole.c 2011-12-07 18:05:18.000000000 -0500 -+++ libgsf-1.14.23/tests/test-restore-msole.c 2012-07-15 03:57:39.972017963 -0400 -@@ -32,7 +32,7 @@ - #include <stdio.h> - - static void --clone (GsfInput *input, GsfOutput *output) -+clone_is_a_stupid_name_for_a_function_compiled_on_linux (GsfInput *input, GsfOutput *output) - { - guint8 const *data; - size_t len; -@@ -72,7 +72,7 @@ - dst = gsf_outfile_new_child (out, - gsf_infile_name_by_index (in, i), - is_dir); -- clone (src, dst); -+ clone_is_a_stupid_name_for_a_function_compiled_on_linux (src, dst); - } - } - -@@ -111,7 +111,7 @@ - - outfile = gsf_outfile_msole_new (output); - g_object_unref (G_OBJECT (output)); -- clone (GSF_INPUT (infile), GSF_OUTPUT (outfile)); -+ clone_is_a_stupid_name_for_a_function_compiled_on_linux (GSF_INPUT (infile), GSF_OUTPUT (outfile)); - - return 0; - } diff --git a/pkgs/development/libraries/liboil/default.nix b/pkgs/development/libraries/liboil/default.nix index 05cafecff279..45f75b4f8052 100644 --- a/pkgs/development/libraries/liboil/default.nix +++ b/pkgs/development/libraries/liboil/default.nix @@ -1,17 +1,20 @@ -{stdenv, fetchurl, pkgconfig, glib }: +{stdenv, fetchurl, pkgconfig }: stdenv.mkDerivation rec { - name = "liboil-0.3.15"; + name = "liboil-0.3.17"; src = fetchurl { url = "${meta.homepage}/download/${name}.tar.gz"; - sha256 = "1m3zcl54sf21cf2ckzny16ihymz8whi60ymyrhmd3m1dlw1knpmf"; + sha256 = "0sgwic99hxlb1av8cm0albzh8myb7r3lpcwxfm606l0bkc3h4pqh"; }; - buildInputs = [pkgconfig glib]; + buildInputs = [ pkgconfig ]; + + patches = [ ./x86_64-cpuid.patch ]; meta = { homepage = http://liboil.freedesktop.org; description = "A library of simple functions that are optimized for various CPUs"; + license = "BSD-2"; }; } diff --git a/pkgs/development/libraries/liboil/x86_64-cpuid.patch b/pkgs/development/libraries/liboil/x86_64-cpuid.patch new file mode 100644 index 000000000000..d86dd79c3bcb --- /dev/null +++ b/pkgs/development/libraries/liboil/x86_64-cpuid.patch @@ -0,0 +1,38 @@ +From 705916007fba0a845229a02dc6474cb523eff150 Mon Sep 17 00:00:00 2001 +From: David Schleef <ds@schleef.org> +Date: Tue, 20 Jul 2010 21:05:26 +0000 +Subject: x86: Fix cpuid function on x86-64 + +Fixes: #28956. +--- +diff --git a/liboil/liboilcpu-x86.c b/liboil/liboilcpu-x86.c +index e7a1978..ef4d3f2 100644 +--- a/liboil/liboilcpu-x86.c ++++ b/liboil/liboilcpu-x86.c +@@ -162,13 +162,10 @@ get_cpuid (uint32_t op, uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d) + static void + get_cpuid (uint32_t op, uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d) + { ++ *a = op; + __asm__ ( +- " pushq %%rbx\n" + " cpuid\n" +- " mov %%ebx, %%esi\n" +- " popq %%rbx\n" +- : "=a" (*a), "=S" (*b), "=c" (*c), "=d" (*d) +- : "0" (op)); ++ : "+a" (*a), "=b" (*b), "=c" (*c), "=d" (*d)); + } + #endif + +@@ -185,7 +182,7 @@ oil_cpu_detect_cpuid (void) + { + uint32_t eax, ebx, ecx, edx; + uint32_t level; +- char vendor[13] = { 0 }; ++ char vendor[13+4] = { 0 }; + int ret; + + oil_fault_check_enable (); +-- +cgit v0.9.0.2-2-gbebe diff --git a/pkgs/development/libraries/librdf/default.nix b/pkgs/development/libraries/librdf/default.nix index e02cedeeab3c..1f3e5b409378 100644 --- a/pkgs/development/libraries/librdf/default.nix +++ b/pkgs/development/libraries/librdf/default.nix @@ -8,7 +8,9 @@ stdenv.mkDerivation { sha256 = "015jv7pp0a0qxgljgdvf7d01nj4fx0zgzg0wayjp7v86pa38xscm"; }; - buildInputs = [ pkgconfig librdf_raptor ladspaH openssl zlib ]; + buildInputs = [ pkgconfig ladspaH openssl zlib ]; + + propagatedBuildInputs = [ librdf_raptor ]; meta = { description = "A lightweight RDF library with special support for LADSPA plugins."; diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 08784a0f2574..3e829dc421a0 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -1,23 +1,29 @@ -{ stdenv, fetchurl, glib, libxml2, pkgconfig +{ stdenv, fetchurl, glib, libxml2, pkgconfig, intltool, python , gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking }: stdenv.mkDerivation { - name = "libsoup-2.38.1"; + name = "libsoup-2.40.3"; src = fetchurl { - url = mirror://gnome/sources/libsoup/2.38/libsoup-2.38.1.tar.xz; - sha256 = "16iza4y8pmc4sn90iid88fgminvgcqypy3s2qnmzkzm5qwzr5f3i"; + url = mirror://gnome/sources/libsoup/2.40/libsoup-2.40.3.tar.xz; + sha256 = "82c92f1f6f4cbfd501df783ed87e7de9410b4a12a3bb0b19c64722e185d2bbc9"; }; + nativeBuildInputs = [ pkgconfig intltool python ]; - nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib libxml2 ] ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring sqlite ]; + passthru.propagatedUserEnvPackages = [ glib_networking ]; # glib_networking is a runtime dependency, not a compile-time dependency configureFlags = "--disable-tls-check"; + preConfigure = '' + substituteInPlace libsoup/tld-parser.py \ + --replace "/usr/bin/env python" ${python}/bin/python + ''; + meta = { inherit (glib.meta) maintainers platforms; }; diff --git a/pkgs/development/libraries/libspectre/0001-Fix-a-crash-with-documents-containing-an-invalid-Pag.patch b/pkgs/development/libraries/libspectre/0001-Fix-a-crash-with-documents-containing-an-invalid-Pag.patch deleted file mode 100644 index 3e232ee5ac50..000000000000 --- a/pkgs/development/libraries/libspectre/0001-Fix-a-crash-with-documents-containing-an-invalid-Pag.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 7500e4d1ae85ecf9f61b1446e07ebb887118757c Mon Sep 17 00:00:00 2001 -From: Carlos Garcia Campos <carlosgc@gnome.org> -Date: Sat, 30 Oct 2010 15:55:18 +0200 -Subject: [PATCH 1/2] Fix a crash with documents containing an invalid - %%Pages: comment - -When failed to allocate memory for pages because of invalid %%Pages: -comment, set maxpages to 0 to ignore the comment. Problem spotted -by Marek Kasik. Fixes bug #30867. ---- - libspectre/ps.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libspectre/ps.c b/libspectre/ps.c -index 6c7cfce..4578cec 100644 ---- a/libspectre/ps.c -+++ b/libspectre/ps.c -@@ -597,6 +597,8 @@ psscan(const char *filename, int scanstyle) - if (maxpages > 0) { - doc->pages = (struct page *) PS_calloc(maxpages, - sizeof(struct page)); -+ if (!doc->pages) -+ maxpages = 0; - CHECK_MALLOCED(doc->pages); - } - } --- -1.7.11 - diff --git a/pkgs/development/libraries/libspectre/0002-Allocate-at-least-1-page-in-doc-pages.patch b/pkgs/development/libraries/libspectre/0002-Allocate-at-least-1-page-in-doc-pages.patch deleted file mode 100644 index 09ab9e11c16f..000000000000 --- a/pkgs/development/libraries/libspectre/0002-Allocate-at-least-1-page-in-doc-pages.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 8ffd9185f81cb8337cece4c8e3672d0e6a97e935 Mon Sep 17 00:00:00 2001 -From: Marek Kasik <mkasik@redhat.com> -Date: Wed, 24 Nov 2010 15:54:14 +0100 -Subject: [PATCH 2/2] Allocate at least 1 page in doc->pages - -Allocate at least 1 page if there are no %%Pages: or %%Page: comments -in the PS file (#31512). ---- - libspectre/ps.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/libspectre/ps.c b/libspectre/ps.c -index 4578cec..0130fb4 100644 ---- a/libspectre/ps.c -+++ b/libspectre/ps.c -@@ -1004,14 +1004,14 @@ psscan(const char *filename, int scanstyle) - section_len += line_len; - } - -+ if (maxpages == 0) { -+ maxpages = 1; -+ doc->pages = (struct page *) PS_calloc(maxpages, sizeof(struct page)); -+ CHECK_MALLOCED(doc->pages); -+ } - - newpage: - while (DSCcomment(line) && iscomment(line+2, "Page:")) { -- if (maxpages == 0) { -- maxpages = 1; -- doc->pages = (struct page *) PS_calloc(maxpages, sizeof(struct page)); -- CHECK_MALLOCED(doc->pages); -- } - label = ps_gettext(line+length("%%Page:"), &next_char); - if (sscanf(next_char, "%u", &thispage) != 1) thispage = 0; - if (nextpage == 1) { --- -1.7.11 - diff --git a/pkgs/development/libraries/libspectre/default.nix b/pkgs/development/libraries/libspectre/default.nix index 379727aec5c9..a819e0cef6f3 100644 --- a/pkgs/development/libraries/libspectre/default.nix +++ b/pkgs/development/libraries/libspectre/default.nix @@ -1,20 +1,18 @@ -{ fetchurl, stdenv, ghostscript }: +{ fetchurl, stdenv, pkgconfig, ghostscript, cairo }: stdenv.mkDerivation rec { - name = "libspectre-0.2.6"; + name = "libspectre-0.2.7"; src = fetchurl { url = "http://libspectre.freedesktop.org/releases/${name}.tar.gz"; - sha256 = "1lqdmi7vx497pbigpp77064a4463lmihzh44898l101c69i7qqrg"; + sha256 = "1v63lqc6bhhxwkpa43qmz8phqs8ci4dhzizyy16d3vkb20m846z8"; }; buildInputs = [ # Need `libgs.so'. - ghostscript + pkgconfig ghostscript cairo /*for tests*/ ]; - patches = [ ./0001-Fix-a-crash-with-documents-containing-an-invalid-Pag.patch ./0002-Allocate-at-least-1-page-in-doc-pages.patch ]; - doCheck = true; meta = { diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 9b2eb19bab4d..5caea5ba6109 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -1,19 +1,16 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, libX11, pkgconfig, libXext, mesa, libdrm, libXfixes, intelgen4asm }: +{ stdenv, fetchurl, libX11, pkgconfig, libXext, mesa, libdrm, libXfixes }: stdenv.mkDerivation rec { - name = "libva-1.0.12"; + name = "libva-1.1.0"; src = fetchurl { - url = "http://cgit.freedesktop.org/libva/snapshot/${name}.tar.bz2"; - sha256 = "1xg8zvmh75w63sc8ykagzrbzswph6g9jardy8v83glkqzilaw2p8"; + url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2"; + sha256 = "1a7g7i96ww8hmim2pq2a3xc89073lzacxn1xh9526bzhlqjdqsnv"; }; - buildInputs = [ autoconf automake libtool libX11 libXext pkgconfig mesa libdrm - libXfixes intelgen4asm ]; + buildInputs = [ libX11 libXext pkgconfig mesa libdrm libXfixes ]; - configureFlags = [ "--enable-i965-driver" "--enable-glx" ]; - - preConfigure = "sh autogen.sh"; + configureFlags = [ "--enable-glx" ]; meta = { homepage = http://www.freedesktop.org/wiki/Software/vaapi; diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 640bc7edc32e..4e4790bd2a0b 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "mlt-${version}"; - version = "0.8.0"; + version = "0.8.8"; src = fetchurl { url = "mirror://sourceforge/mlt/${name}.tar.gz"; - sha256 = "1pf61imb5xzgzf65g54kybjr67235rxi20691023mcv34qwppl3v"; + sha256 = "0m4nzxli1pl8w59m4iwwhpmr1xdz7xfknmbl3a0mkkd1jzdiq3nc"; }; buildInputs = diff --git a/pkgs/development/libraries/qt-4.x/4.7/default.nix b/pkgs/development/libraries/qt-4.x/4.7/default.nix deleted file mode 100644 index 47832a114b45..000000000000 --- a/pkgs/development/libraries/qt-4.x/4.7/default.nix +++ /dev/null @@ -1,114 +0,0 @@ -{ stdenv, fetchurl -, alsaLib, pulseaudio -, libXft, libXrender, randrproto, xextproto, libXinerama, xineramaproto, libXcursor, libXmu -, libXv, libXext, libXfixes, inputproto, fixesproto, libXrandr, freetype, fontconfig -, zlib, libjpeg, libpng, libmng, which, mesa, openssl, dbus, cups, pkgconfig, libtiff, glib -, mysql, postgresql, sqlite -, perl, coreutils, libXi -, buildDemos ? false, buildExamples ? false, useDocs ? false -}: - -let - v = "4.7.4"; -in - -stdenv.mkDerivation rec { - name = "qt-${v}"; - - src = fetchurl { - url = "ftp://ftp.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${v}.tar.gz"; - sha256 = "07i283si8rckdsg3h9a4sp213l16hgjrl7cpzclrjvx4x2y5w6cp"; - }; - - preConfigure = - '' - export LD_LIBRARY_PATH="`pwd`/lib:$LD_LIBRARY_PATH" - configureFlags+=" - -docdir $out/share/doc/${name} - -plugindir $out/lib/qt4/plugins - -importdir $out/lib/qt4/imports - -examplesdir $out/share/doc/${name}/examples - -demosdir $out/share/doc/${name}/demos - -datadir $out/share/${name} - -translationdir $out/share/${name}/translations - " - ''; - - configureFlags = - '' - -v -no-separate-debug-info -release -fast -confirm-license -opensource - -system-zlib -system-libpng -system-libjpeg -qt-gif -system-libmng - -opengl -xrender -xrandr -xinerama -xcursor - -plugin-sql-mysql -system-sqlite - -qdbus -cups -glib -xfixes -dbus-linked -openssl-linked - -fontconfig -I${freetype}/include/freetype2 - -exceptions -xmlpatterns - -multimedia -audio-backend -no-phonon - -webkit -javascript-jit - -make libs -make tools -make translations - ${if buildDemos == true then "-make demos" else "-nomake demos"} - ${if buildExamples == true then "-make examples" else "-nomake examples"} - ${if useDocs then "-make docs" else "-nomake docs"} - ''; - - propagatedBuildInputs = [ - alsaLib - sqlite - libXft - libXrender - libXrandr - libXi - randrproto - xextproto - libXinerama - xineramaproto - libXcursor - zlib - libjpeg - libmng - mysql - postgresql - libpng - which - mesa - libXmu - libXv - openssl - dbus.libs - cups - pkgconfig - libXext - freetype - fontconfig - inputproto - fixesproto - libXfixes - glib - libtiff - pulseaudio - ]; - - buildInputs = [ perl ]; - - prefixKey = "-prefix "; - - prePatch = '' - substituteInPlace configure --replace /bin/pwd pwd - substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls - sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i mkspecs/*/*.conf - ''; - - postInstall = '' - ${if useDocs then "rm -rfv $out/share/doc/${name}/{html,src}" else ""} - ''; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = http://qt.nokia.com/products; - description = "A cross-platform application framework for C++"; - license = "GPL/LGPL"; - maintainers = with maintainers; [ urkud sander ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix index 75f9de5e96a2..9aab09094a0c 100644 --- a/pkgs/development/libraries/science/math/atlas/default.nix +++ b/pkgs/development/libraries/science/math/atlas/default.nix @@ -1,50 +1,65 @@ -{ stdenv, fetchurl, gfortran, tolerateCpuTimingInaccuracy ? true, shared ? false }: +{ stdenv, fetchurl, gfortran, tolerateCpuTimingInaccuracy ? true, shared ? false +, cpuConfig ? if stdenv.isi686 then "-b 32 -A 18 -V 1" else "-b 64 -A 31 -V 192" +}: + +# Atlas detects the CPU and optimizes its build accordingly. This is great when +# the code is run on the same machine that built the binary, but in case of a +# central build farm like Hydra, this feature is dangerous because the code may +# be generated utilizing fancy features that users who download the binary +# cannot execute. +# +# To avoid these issues, the build is configured using the 'cpuConfig' +# parameter as follows: +# +# | x86 CPU | x86_64 CPU | +# |---------------------------------------------+------------------------| +# | -b 32 | -b 64 | +# | -A 18 (Pentium II) | -A 31 (Athlon K7) | +# | -V 1 (No SIMD: Pentium II doesn't have SSE) | -V 192 (SSE1 and SSE2) | +# +# Users who want to compile a highly optimized version of ATLAS that's suitable +# for their local machine can override these settings accordingly. let + version = "3.10.1"; + optionalString = stdenv.lib.optionalString; + optional = stdenv.lib.optional; in stdenv.mkDerivation { - name = "atlas-3.9.67"; + name = "atlas-${version}"; src = fetchurl { - url = mirror://sourceforge/math-atlas/atlas3.9.67.tar.bz2; - sha256 = "06xxlv440z8a3qmfrh17p28girv71c6awvpw5vhpspr0pcsgk1pa"; + url = "mirror://sourceforge/math-atlas/atlas${version}.tar.bz2"; + sha256 = "11ncgdc7kzb2y2gqb3sgarm5saj9fr07r3h2yh2h5bja429b85d2"; }; + buildInputs = [ gfortran ]; + + # Atlas aborts the build if it detects that some kind of CPU frequency + # scaling is active on the build machine because that feature offsets the + # performance timings. We ignore that check, however, because with binaries + # being pre-built on Hydra those timings aren't accurate for the local + # machine in the first place. + patches = optional tolerateCpuTimingInaccuracy ./disable-timing-accuracy-check.patch; + # Configure outside of the source directory. preConfigure = '' mkdir build; cd build; configureScript=../configure; ''; - # * -fPIC allows to build atlas inside shared objects, as octave does. + # * -fPIC is passed even in non-shared builds so that the ATLAS code can be + # used to inside of shared libraries, like Octave does. # - # * Atlas aborts the build if it detects that some kind of CPU frequency - # scaling is active on the build machine because that feature offsets the - # performance timings. We ignore that check, however, because with binaries - # being pre-built on Hydra those timings aren't accurate for the local - # machine in the first place. - # * Atlas detects the cpu and does some tricks. For example, notices the - # hydra AMD Family 10h computer, and uses a SSE trick for it (bit 17 of MXCSR) - # available, for what I know, only in that family. So we hardcode K7 - # -A 31 = Athlon K7 - # -A 18 = Pentium II - # -V 192 = SSE1|SSE2 (Or it takes SSE3 somehow in my machine without SSE3) - # -V 1 = No SIMD (Pentium II does not have any SSE) - # -t 0 = No threading - configureFlags = "-Fa alg -fPIC -t 0" - + optionalString stdenv.isi686 " -b 32 -A 18 -V 1" - + optionalString stdenv.isx86_64 " -A 31 -V 192" - + optionalString tolerateCpuTimingInaccuracy " -Si cputhrchk 0" - + optionalString shared " --shared " - ; - - buildInputs = [ gfortran ]; + # * -t 0 disables use of multi-threading. It's not quite clear what the + # consequences of that setting are and whether it's necessary or not. + configureFlags = "-Fa alg -fPIC -t 0 ${cpuConfig}" + optionalString shared " --shared"; doCheck = true; meta = { homepage = "http://math-atlas.sourceforge.net/"; description = "Automatically Tuned Linear Algebra Software (ATLAS)"; - license = "GPL"; + license = stdenv.lib.licenses.bsd3; longDescription = '' The ATLAS (Automatically Tuned Linear Algebra Software) project is an ongoing diff --git a/pkgs/development/libraries/science/math/atlas/disable-timing-accuracy-check.patch b/pkgs/development/libraries/science/math/atlas/disable-timing-accuracy-check.patch new file mode 100644 index 000000000000..ddacc742d142 --- /dev/null +++ b/pkgs/development/libraries/science/math/atlas/disable-timing-accuracy-check.patch @@ -0,0 +1,22 @@ +diff -ubr ATLAS-orig/CONFIG/src/config.c ATLAS/CONFIG/src/config.c +--- ATLAS-orig/CONFIG/src/config.c 2013-02-06 11:23:47.078036878 +0100 ++++ ATLAS/CONFIG/src/config.c 2013-02-06 11:24:16.481120888 +0100 +@@ -711,17 +711,7 @@ + + int ProbeCPUThrottle(int verb, char *targarg, enum OSTYPE OS, enum ASMDIA asmb) + { +- int i, iret; +- char *ln; +- i = strlen(targarg) + 22 + 12; +- ln = malloc(i*sizeof(char)); +- assert(ln); +- sprintf(ln, "%s -O %d -s %d -t", targarg, OS, asmb); +- iret = GetIntProbe(verb, ln, "arch", "CPU THROTTLE", 0); +- free(ln); +- if (iret) printf("CPU Throttling apparently enabled!\n"); +- else printf("Cannot detect CPU throttling.\n"); +- return(iret); ++ return 0; + } + + char *NewAppendedString_SFLAG(char *old, char *flag, char *str) diff --git a/pkgs/development/libraries/stlport/default.nix b/pkgs/development/libraries/stlport/default.nix index 040395ecf8a1..f1c8a84fee26 100644 --- a/pkgs/development/libraries/stlport/default.nix +++ b/pkgs/development/libraries/stlport/default.nix @@ -1,10 +1,25 @@ {stdenv, fetchurl}: -stdenv.mkDerivation { - name = "STLport-5.2.0"; +stdenv.mkDerivation rec { + name = "STLport-5.2.1"; src = fetchurl { - url = mirror://sourceforge/stlport/STLport-5.2.0.tar.bz2; - md5 = "448d74859407912c0087adcf51bf109a"; + url = "mirror://sourceforge/stlport/${name}.tar.bz2"; + sha256 = "1jbgak1m1qk7d4gyn1p2grbws2icsf7grbs3dh44ai9ck1xh0nvm"; + }; + + # fix hardcoded /usr/bin; not recognizing the standard --disable-static flag + configurePhase = '' + echo Preconf: build/Makefiles/gmake/*/sys.mak + for f in build/Makefiles/gmake/*/sys.mak; do + substituteInPlace "$f" --replace /usr/bin/ "" + done + ./configure --prefix=$out + ''; + + meta = { + description = "An implementation of the C++ Standard Library"; + homepage = http://sourceforge.net/projects/stlport/; + license = "free"; # seems BSD-like }; } diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix new file mode 100644 index 000000000000..548aeb8a2de6 --- /dev/null +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, autoconf, automake, libtool, mesa, libva, libdrm, libX11, pkgconfig +, intelgen4asm }: + +stdenv.mkDerivation rec { + name = "libva-intel-driver-1.0.19"; + + src = fetchurl { + url = "http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${name}.tar.bz2"; + sha256 = "14m7krah3ajkwj190q431lqqa84hdljcdmrcrqkbgaffyjlqvdid"; + }; + + buildInputs = [ autoconf automake libtool mesa libva pkgconfig libdrm libX11 intelgen4asm ]; + + preConfigure = '' + sh autogen.sh + sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure + ''; + + meta = { + homepage = http://cgit.freedesktop.org/vaapi/intel-driver/; + license = "MIT"; + description = "Intel driver for the VAAPI library"; + }; +} diff --git a/pkgs/development/libraries/vaapi-vdpau/default.nix b/pkgs/development/libraries/vaapi-vdpau/default.nix new file mode 100644 index 000000000000..a3d51217ead8 --- /dev/null +++ b/pkgs/development/libraries/vaapi-vdpau/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, libvdpau, mesa, libva, pkgconfig }: + +stdenv.mkDerivation rec { + name = "libva-vdpau-driver-0.7.4"; + + src = fetchurl { + url = "http://www.freedesktop.org/software/vaapi/releases/libva-vdpau-driver/${name}.tar.bz2"; + sha256 = "1fcvgshzyc50yb8qqm6v6wn23ghimay23ci0p8sm8gxcy211jp0m"; + }; + + buildInputs = [ libvdpau mesa libva pkgconfig ]; + + preConfigure = '' + sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure + ''; + + meta = { + homepage = http://cgit.freedesktop.org/vaapi/vdpau-driver/; + license = "GPLv2+"; + description = "VDPAU driver for the VAAPI library"; + }; +} |