public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into x-updates

Browse Source 
Conflicts (both messed with mesa):
	pkgs/top-level/all-packages.nix
This commit is contained in:
Vladimír Čunát
2013-02-02 21:11:00 +01:00
parent 97a39c3b54 ac1d2a1221
commit 35a927149f
121 changed files with 1216 additions and 1764 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
pkgs/development/libraries/arts/default.nix
View File

@@ -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
'';
buildNativeInputs = [ pkgconfig perl ];
buildInputs =
[glib kdelibs libX11 libXext zlib libjpeg libpng qt3];
meta = {
homepage = http://www.arts-project.org/;
};
}

18
pkgs/development/libraries/directfb/default.nix
View File

@@ -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 ];
buildNativeInputs = [ 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 [

25
pkgs/development/libraries/directfb/ftbfs.patch
View File

@@ -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;

4
pkgs/development/libraries/ffmpeg/1.1.nix
View File

@@ -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 ];

9
pkgs/development/libraries/gnu-efi/default.nix
View File

@@ -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 = {

4
pkgs/development/libraries/haskell/HTTP/4000.2.6.nix → pkgs/development/libraries/haskell/HTTP/4000.2.7.nix
View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "HTTP";
version = "4000.2.6";
sha256 = "0rycwrn9cq9mrsgxkbx373zjvmzg4hd8hzclya6ipd3jda1w5r92";
version = "4000.2.7";
sha256 = "0a5zjhrbdp8hwmkc709i2qwnxx4lafrp6wssdms6g5l97a52bdc2";
buildDepends = [ mtl network parsec ];
meta = {
homepage = "https://github.com/haskell/HTTP";

6
pkgs/development/libraries/haskell/attoparsec/default.nix
View File

@@ -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 ];

4
pkgs/development/libraries/haskell/authenticate/default.nix
View File

@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "authenticate";
version = "1.3.2";
sha256 = "1bvgfri0c2nyz06r59rm3slpvm1b0s242s4mznmndpdclgg33d9m";
version = "1.3.2.1";
sha256 = "1r53mnj4b4x0prcqqf6y3gdia2j1l3155iw79jzlx0cnxbdsfnc7";
buildDepends = [
aeson attoparsec blazeBuilder blazeBuilderConduit caseInsensitive
conduit httpConduit httpTypes monadControl network resourcet

8
pkgs/development/libraries/haskell/bifunctors/default.nix
View File

@@ -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";

8
pkgs/development/libraries/haskell/case-insensitive/default.nix
View File

@@ -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";

4
pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix
View File

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "classy-prelude-conduit";
version = "0.4.3";
sha256 = "0ny4si6z6i6g6khcg9d3m9wks42sqh8i8kpgghhdwd37v32l3f34";
version = "0.4.4";
sha256 = "1xsqdifqm68mlrmpmj04nqd5r83psq5ffis2pm8k8vwl1n1jv8kn";
buildDepends = [
classyPrelude conduit monadControl resourcet transformers void
xmlConduit

10
pkgs/development/libraries/haskell/classy-prelude/default.nix
View File

@@ -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.4.4";
sha256 = "0f49b07r5isz57wjmgpfvq4hg9m5q59ad918rk1v24xdvn4y3all";
buildDepends = [
basicPrelude hashable systemFilepath text transformers
basicPrelude hashable liftedBase systemFilepath text transformers
unorderedContainers vector
];
meta = {

4
pkgs/development/libraries/haskell/diagrams/contrib.nix
View File

@@ -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
];

1
pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
View File

@@ -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";

4
pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix
View File

@@ -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 = [

4
pkgs/development/libraries/haskell/distributed-process/default.nix
View File

@@ -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 = [

4
pkgs/development/libraries/haskell/edit-distance/default.nix
View File

@@ -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 ];

13
pkgs/development/libraries/haskell/either/default.nix
View File

@@ -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.1";
sha256 = "1paglfhd2xjr32sh5npl3kvamv4nps9fpy0wk9ya0l26w4c3bdsm";
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;
};

14
pkgs/development/libraries/haskell/ghc-heap-view/default.nix Normal file
View File

@@ -0,0 +1,14 @@
{ cabal, transformers }:
cabal.mkDerivation (self: {
pname = "ghc-heap-view";
version = "0.4.1.0";
sha256 = "1icq5620j37n85d08yfpln75f9944flbqyqhjqsf0qr72zsm3w11";
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 ];
};
})

20
pkgs/development/libraries/haskell/ghc-vis/default.nix Normal file
View File

@@ -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 ];
};
})

5
pkgs/development/libraries/haskell/hakyll/default.nix
View File

@@ -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";

4
pkgs/development/libraries/haskell/hamlet/default.nix
View File

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hamlet";
version = "1.1.3.1";
sha256 = "04qqsjrn0fh9y4z7gjf3g60w69gqxhzq7dqkraq97p3w45fijm1i";
version = "1.1.5";
sha256 = "18rv53bqf07w0y1qs96v3krimvjx5salq9mn168l01vl98blwhvv";
buildDepends = [
blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text
];

4
pkgs/development/libraries/haskell/heist/default.nix
View File

@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "heist";
version = "0.10.2.1";
sha256 = "14lp27vlzv6qqv325x2vqqvphw5ads5ywjqpjramv3hhd275fn3d";
version = "0.11.0";
sha256 = "1zbwbgabdj6x0vi7l8wfq7rx77p8b4zxz5wv43nr67irszyz1k7w";
buildDepends = [
aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors
filepath hashable MonadCatchIOTransformers mtl random text time

4
pkgs/development/libraries/haskell/hoogle/default.nix
View File

@@ -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 = [

4
pkgs/development/libraries/haskell/hsemail/default.nix
View File

@@ -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";

5
pkgs/development/libraries/haskell/hspec/default.nix
View File

@@ -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";

4
pkgs/development/libraries/haskell/http-conduit/default.nix
View File

@@ -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

4
pkgs/development/libraries/haskell/http-types/default.nix
View File

@@ -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";

8
pkgs/development/libraries/haskell/language-haskell-extract/default.nix
View File

@@ -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";

4
pkgs/development/libraries/haskell/lens/default.nix
View File

@@ -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

4
pkgs/development/libraries/haskell/mime-types/default.nix
View File

@@ -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";

4
pkgs/development/libraries/haskell/pandoc/default.nix
View File

@@ -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 = [

4
pkgs/development/libraries/haskell/postgresql-libpq/default.nix
View File

@@ -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";

4
pkgs/development/libraries/haskell/shakespeare-js/default.nix
View File

@@ -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";

4
pkgs/development/libraries/haskell/shakespeare/default.nix
View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "shakespeare";
version = "1.0.2";
sha256 = "1n7qymrn2f83a11zdh2950pf8rsqnc52blwi02amjxsvy2piidzm";
version = "1.0.3";
sha256 = "0js56njy5rbviavga5qlp8d989wdpqf7lcyhwrjf1clf3k4f8anl";
buildDepends = [ parsec text ];
meta = {
homepage = "http://www.yesodweb.com/book/shakespearean-templates";

1
pkgs/development/libraries/haskell/snap/core.nix
View File

@@ -15,6 +15,7 @@ cabal.mkDerivation (self: {
MonadCatchIOTransformers mtl random regexPosix text time unixCompat
unorderedContainers vector zlibEnum
];
jailbreak = true;
meta = {
homepage = "http://snapframework.com/";
description = "Snap: A Haskell Web Framework (core interfaces and types)";

1
pkgs/development/libraries/haskell/snap/server.nix
View File

@@ -13,6 +13,7 @@ cabal.mkDerivation (self: {
caseInsensitive enumerator MonadCatchIOTransformers mtl network
snapCore text time unixCompat
];
jailbreak = true;
meta = {
homepage = "http://snapframework.com/";
description = "A fast, iteratee-based, epoll-enabled web server for the Snap Framework";

20
pkgs/development/libraries/haskell/snap/snap.nix
View File

@@ -1,22 +1,22 @@
{ cabal, aeson, attoparsec, cereal, clientsession, comonad
, configurator, directoryTree, dlist, errors, filepath, hashable
, heist, lens, logict, MonadCatchIOTransformers, mtl, mwcRandom
, pwstoreFast, regexPosix, snapCore, snapServer, stm, syb, text
, time, transformers, unorderedContainers, vector, vectorAlgorithms
, xmlhtml
, configurator, directoryTree, dlist, either, errors, filepath
, hashable, heist, lens, logict, MonadCatchIOTransformers, mtl
, mwcRandom, pwstoreFast, regexPosix, snapCore, snapServer, stm
, syb, text, time, transformers, unorderedContainers, vector
, vectorAlgorithms, xmlhtml
}:
cabal.mkDerivation (self: {
pname = "snap";
version = "0.10.0.1";
sha256 = "14j9lgcdyxh7n4yidfvn1r94nziljiqz6nsqgq114v34bnn6l2yn";
version = "0.11.0";
sha256 = "0mw1fxjijd3z9bz1znrc5vfxa4mc1by481gxfmk2hdlcsib9sp7n";
isLibrary = true;
isExecutable = true;
buildDepends = [
aeson attoparsec cereal clientsession comonad configurator
directoryTree dlist errors filepath hashable heist lens logict
MonadCatchIOTransformers mtl mwcRandom pwstoreFast regexPosix
snapCore snapServer stm syb text time transformers
directoryTree dlist either errors filepath hashable heist lens
logict MonadCatchIOTransformers mtl mwcRandom pwstoreFast
regexPosix snapCore snapServer stm syb text time transformers
unorderedContainers vector vectorAlgorithms xmlhtml
];
jailbreak = true;

13
pkgs/development/libraries/haskell/split/0.2.1.2.nix Normal file
View File

@@ -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 ];
};
})

12
pkgs/development/libraries/haskell/string-qq/default.nix Normal file
View File

@@ -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;
};
})

4
pkgs/development/libraries/haskell/texmath/default.nix
View File

@@ -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 ];

4
pkgs/development/libraries/haskell/tls/default.nix
View File

@@ -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

4
pkgs/development/libraries/haskell/wai-extra/default.nix
View File

@@ -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

4
pkgs/development/libraries/haskell/wai-test/default.nix
View File

@@ -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

4
pkgs/development/libraries/haskell/wai/default.nix
View File

@@ -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
];

4
pkgs/development/libraries/haskell/warp/default.nix
View File

@@ -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

14
pkgs/development/libraries/haskell/xdot/default.nix Normal file
View File

@@ -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 ];
};
})

10
pkgs/development/libraries/haskell/yesod-auth/default.nix
View File

@@ -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";
sha256 = "060548zbjsvf6zvixiyic729fd9862z3qwz349ric60jfa20cdpx";
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
];

4
pkgs/development/libraries/haskell/yesod-core/default.nix
View File

@@ -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

4
pkgs/development/libraries/haskell/yesod-form/default.nix
View File

@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "yesod-form";
version = "1.2.0.2";
sha256 = "0a3172rgvma420l98hkgvl17ks2a2jkys3rh4qd2bbm9p7qknv3y";
version = "1.2.1";
sha256 = "10xjpky7dglqbhc6i49q9ckkhq23wyyqd7karlp0byhprmspnifq";
buildDepends = [
aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi
dataDefault emailValidate hamlet network persistent shakespeareCss

4
pkgs/development/libraries/haskell/yesod-routes/default.nix
View File

@@ -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/";

4
pkgs/development/libraries/haskell/yesod-static/default.nix
View File

@@ -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

4
pkgs/development/libraries/haskell/yesod-test/default.nix
View File

@@ -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

4
pkgs/development/libraries/haskell/yesod/default.nix
View File

@@ -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 = [

11
pkgs/development/libraries/liboil/default.nix
View File

@@ -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";
};
}

38
pkgs/development/libraries/liboil/x86_64-cpuid.patch Normal file
View File

@@ -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

15
pkgs/development/libraries/libva/default.nix
View File

@@ -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;

23
pkgs/development/libraries/stlport/default.nix
View File

@@ -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
};
}

24
pkgs/development/libraries/vaapi-intel/default.nix Normal file
View File

@@ -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";
};
}

22
pkgs/development/libraries/vaapi-vdpau/default.nix Normal file
View File

@@ -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";
};
}