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

* Sync with the trunk.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=34028
This commit is contained in:
Eelco Dolstra
2012-05-09 11:49:52 +00:00
parent 32649ce94c 5930e47068
commit 24594b0fb3
59 changed files with 632 additions and 451 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1,14 @@
{ cabal, bitsAtomic }:
cabal.mkDerivation (self: {
pname = "IORefCAS";
version = "0.2";
sha256 = "18hyy3jqr9yky5r873816fqnywrwba90sq6zx61i2vkqlfbll1k9";
buildDepends = [ bitsAtomic ];
meta = {
description = "Atomic compare and swap for IORefs and STRefs";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

7
pkgs/development/libraries/haskell/MemoTrie/default.nix
View File

@@ -1,9 +1,10 @@
{ cabal }:
{ cabal, void }:
cabal.mkDerivation (self: {
pname = "MemoTrie";
version = "0.4.11";
sha256 = "0wlrsz9bsb7lkw1ja8x8jbm1v7558fg8npas1rnc5ikgfi0szzw4";
version = "0.4.12";
sha256 = "0wjpfy1vlk3fjbdj924viv1wji28kx3w9hsaz7hd0gfs77y9vjza";
buildDepends = [ void ];
meta = {
homepage = "http://haskell.org/haskellwiki/MemoTrie";
description = "Trie-based memo functions";

14
pkgs/development/libraries/haskell/abstract-deque/default.nix Normal file
View File

@@ -0,0 +1,14 @@
{ cabal, HUnit, IORefCAS }:
cabal.mkDerivation (self: {
pname = "abstract-deque";
version = "0.1.5";
sha256 = "1zp19kq3m72nx7rr00yyq8iwia4abg4x9kw4d5s5k0srp5f9fn3q";
buildDepends = [ HUnit IORefCAS ];
meta = {
description = "Abstract, parameterized interface to mutable Deques";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

15
pkgs/development/libraries/haskell/abstract-par/default.nix Normal file
View File

@@ -0,0 +1,15 @@
{ cabal, deepseq }:
cabal.mkDerivation (self: {
pname = "abstract-par";
version = "0.3.1";
sha256 = "0qzv520823b07hrr49rnpzayh96m6cjrmb1cn9l0dn80j6k9xayk";
buildDepends = [ deepseq ];
meta = {
homepage = "https://github.com/simonmar/monad-par";
description = "Type classes generalizing the functionality of the 'monad-par' library";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

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

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "attoparsec-conduit";
version = "0.4.0";
sha256 = "1vlgpa90sgaym754w5wr3jjqjra9yrn3yn4fhi148v25y4ijrrc0";
version = "0.4.0.1";
sha256 = "1r01xaaw439qpbfnanv2yfw9fz6id8cy17yqdm6x6vk35hmv59kc";
buildDepends = [ attoparsec conduit text transformers ];
meta = {
homepage = "http://github.com/snoyberg/conduit";

15
pkgs/development/libraries/haskell/bits-atomic/default.nix Normal file
View File

@@ -0,0 +1,15 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "bits-atomic";
version = "0.1.3";
sha256 = "13fbakkwcdk63dm7r0mcsanm5mijp73c7x1kxpay2f03rxb39b70";
isLibrary = true;
isExecutable = true;
meta = {
description = "Atomic bit operations on memory locations for low-level synchronization";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

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

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "blaze-builder-conduit";
version = "0.4.0.1";
sha256 = "059i7k49vpwsd7dlm4di4k5xhiparq71h8qagssw8a4nsk9jglvp";
version = "0.4.0.2";
sha256 = "0wblkvh1v7275n1i66xmm3kg57i21s8m2sfwfnjarwbcjqbgrjih";
buildDepends = [ blazeBuilder conduit text transformers ];
meta = {
homepage = "http://github.com/snoyberg/conduit";

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

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "conduit";
version = "0.4.1.1";
sha256 = "1y5bccjd3r1kakwiq0nlp3dk2jwrdsm3f8dncnfsmnlk093ajyxa";
version = "0.4.2";
sha256 = "1v8s80g8gyxb139dzqbbh4qv6ax08g5smrvx2zc5sd2773wwqwz0";
buildDepends = [
liftedBase monadControl resourcet text transformers
transformersBase void

6
pkgs/development/libraries/haskell/file-embed/default.nix
View File

@@ -2,10 +2,10 @@
cabal.mkDerivation (self: {
pname = "file-embed";
version = "0.0.4.2";
sha256 = "1nismycqm8shh6zgjjfysc0yhn5yrcdvw23k6adzizawsvr92bkw";
version = "0.0.4.3";
sha256 = "0iagibsab18czvam36si88swzf5sijm4phwy4za6gnn4z71nb9s6";
meta = {
homepage = "http://github.com/snoyberg/file-embed/tree/master";
homepage = "https://github.com/snoyberg/file-embed";
description = "Use Template Haskell to embed file contents directly";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;

17
pkgs/development/libraries/haskell/monad-par-extras/default.nix Normal file
View File

@@ -0,0 +1,17 @@
{ cabal, abstractPar, cereal, deepseq, mtl, random, transformers }:
cabal.mkDerivation (self: {
pname = "monad-par-extras";
version = "0.3";
sha256 = "1nrxzqswb265slxq4dhm6bav7zb4zglbrh99w5x6hwx6drgsw10d";
buildDepends = [
abstractPar cereal deepseq mtl random transformers
];
meta = {
homepage = "https://github.com/simonmar/monad-par";
description = "Combinators and extra features for Par monads";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

0
pkgs/development/libraries/haskell/monad-par/default.nix → pkgs/development/libraries/haskell/monad-par/0.1.0.3.nix
View File

20
pkgs/development/libraries/haskell/monad-par/0.3.nix Normal file
View File

@@ -0,0 +1,20 @@
{ cabal, abstractDeque, abstractPar, deepseq, monadParExtras, mtl
, mwcRandom, parallel
}:
cabal.mkDerivation (self: {
pname = "monad-par";
version = "0.3";
sha256 = "19vzz8qhv8z84grcb4myivmmaj0sn7rm956nqxv5dh2l8c279zsd";
buildDepends = [
abstractDeque abstractPar deepseq monadParExtras mtl mwcRandom
parallel
];
meta = {
homepage = "https://github.com/simonmar/monad-par";
description = "A library for parallel programming based on a monad";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

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

@@ -3,8 +3,8 @@
cabal.mkDerivation (self: {
pname = "network-conduit";
version = "0.4.0";
sha256 = "0h0s33nxihd4zy9mvy2vpdrpvjapacbl69ndsw5zrbqhwbpz3mzs";
version = "0.4.0.1";
sha256 = "0xmfhar4knyn01xyigrp4lymb1vcsahd9v12i6rrqzi10mdcz6bl";
buildDepends = [
conduit liftedBase monadControl network transformers
];

4
pkgs/development/libraries/haskell/persistent-sqlite/default.nix
View File

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "persistent-sqlite";
version = "0.9.0.1";
sha256 = "19bwkaazg3c822n3308awy70ml40jvncr4c3rvidq72zzdvql9c2";
version = "0.9.0.2";
sha256 = "19wmz13k3qbpam2siykczgacgaj48yw4p7iz3y6v8a2z8wha73zb";
buildDepends = [
aeson conduit monadControl persistent text transformers
];

16
pkgs/development/libraries/haskell/persistent/default.nix
View File

@@ -1,16 +1,16 @@
{ cabal, aeson, attoparsec, base64Bytestring, blazeHtml, conduit
, liftedBase, monadControl, pathPieces, poolConduit, resourcet
, sqlite, text, time, transformers, transformersBase
, unorderedContainers, vector
{ cabal, aeson, attoparsec, base64Bytestring, blazeHtml
, blazeMarkup, conduit, liftedBase, monadControl, pathPieces
, poolConduit, resourcet, sqlite, text, time, transformers
, transformersBase, unorderedContainers, vector
}:
cabal.mkDerivation (self: {
pname = "persistent";
version = "0.9.0.3";
sha256 = "07w2d5x4wlbs8smkq2mini4rkmdd38zmapwqcn59vna8cq9wslz6";
version = "0.9.0.4";
sha256 = "1igml2hmc8ga9871dfq4mxqvy639vvlgl3cs48j3b27ci3qwd9jr";
buildDepends = [
aeson attoparsec base64Bytestring blazeHtml conduit liftedBase
monadControl pathPieces poolConduit resourcet text time
aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit
liftedBase monadControl pathPieces poolConduit resourcet text time
transformers transformersBase unorderedContainers vector
];
extraLibraries = [ sqlite ];

4
pkgs/development/libraries/haskell/reactive-banana/default.nix
View File

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "reactive-banana";
version = "0.5.0.2";
sha256 = "10391b6vwgp5harzmiji66qs4zc5qipagak1mm2j8njhbqi8z0rb";
version = "0.5.0.3";
sha256 = "0j60g7k0xrq66m8g8fd9fdrpbnz2jbgqxnmbz1rfi5bvnrkhv10v";
buildDepends = [
fclabels hashable QuickCheck transformers unorderedContainers vault
];

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

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "repa";
version = "3.1.3.3";
sha256 = "108zifbgngwd5a3bkvkm4sh2nhds748wqk227mcsxcw9y085da0f";
version = "3.1.4.2";
sha256 = "08vrrhaqhk03mmc2zddj4mm9dci9q7wkxwc3ilrh1p9q4j6r53qs";
buildDepends = [ QuickCheck vector ];
meta = {
homepage = "http://repa.ouroborus.net";

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

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "semigroups";
version = "0.8.3";
sha256 = "179m5vvhf8rf01fnq8b2lg7v8i70yx6yq975jiazghm0qnsm32ji";
version = "0.8.3.1";
sha256 = "0gl2s6vd2cswb4qmkndfgnx9a747f4vhbx52lvixyq3sbgz1vain";
meta = {
homepage = "http://github.com/ekmett/semigroups/";
description = "Haskell 98 semigroups";

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

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "texmath";
version = "0.6.0.5";
sha256 = "08zryp5y2llhzwbp93wbm37c1lykqgrbq8h23bv39ql8idpym0wq";
version = "0.6.0.6";
sha256 = "0wxpz9vsgi4lfgjz5w96pn2r2jdflkvb4yd06nxshimxdr51974k";
isLibrary = true;
isExecutable = true;
buildDepends = [ parsec syb xml ];

9
pkgs/development/libraries/haskell/vault/default.nix
View File

@@ -1,12 +1,13 @@
{ cabal }:
{ cabal, hashable, unorderedContainers }:
cabal.mkDerivation (self: {
pname = "vault";
version = "0.1.0.0";
sha256 = "02gki0g9mwmvvizxhk6myfg3dmlqpcjjiz5c8693a060hkr0grqq";
version = "0.2.0.0";
sha256 = "1hv87kvi2bwf9ff8mhjzdf8rvqhk1xpschzs1x3swadj1kc9f1sv";
buildDepends = [ hashable unorderedContainers ];
meta = {
homepage = "https://github.com/HeinrichApfelmus/vault";
description = "a typed, persistent store for values of arbitrary types";
description = "a persistent store for values of arbitrary types";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];

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

@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "wai-app-static";
version = "1.2.0.2";
sha256 = "15rd2vlx3ag5bavrivscah7yqm9lv14v68wr3p9incg2ksf8h7d7";
version = "1.2.0.3";
sha256 = "1hn4k28aa15vwvvay62rvi796fma7p3j31z6bfa9im0dxdy7sf9l";
buildDepends = [
base64Bytestring blazeBuilder blazeHtml cryptohash fileEmbed
httpDate httpTypes text time transformers unixCompat wai

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

@@ -1,16 +1,16 @@
{ cabal, ansiTerminal, blazeBuilder, blazeBuilderConduit
, caseInsensitive, conduit, dataDefault, fastLogger, httpTypes
, network, text, time, transformers, wai, zlibConduit
, network, resourcet, text, time, transformers, wai, zlibConduit
}:
cabal.mkDerivation (self: {
pname = "wai-extra";
version = "1.2.0.3";
sha256 = "0iigswknh5w5zi6r99jks3bppylnw9hca9by2klwr2biw07nf09d";
version = "1.2.0.4";
sha256 = "10nd87bs6q1827ihwm13czflha2g8dhza443n55xpakba1sdgsaz";
buildDepends = [
ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive
conduit dataDefault fastLogger httpTypes network text time
transformers wai zlibConduit
conduit dataDefault fastLogger httpTypes network resourcet text
time transformers wai zlibConduit
];
meta = {
homepage = "http://github.com/yesodweb/wai";

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

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "wai";
version = "1.2.0.1";
sha256 = "00f95r1g2s689s1b0div28v7dnjiqz01d66acz77acp28cm0bnmc";
version = "1.2.0.2";
sha256 = "07h0znwlnfpikw9zxk7cxnyvsgqyix7lv8rylxzj259ylwfpk9fp";
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.2.0.1";
sha256 = "0lbyi6xchjkf6fx3d7dh5hg8gfq041hb0yls6vq8svd75dr0x5nv";
version = "1.2.0.2";
sha256 = "08gd0xzx3j47adl2pgvcc0dj7vvfj2igbvrgnl8rifz8r5gj17lq";
buildDepends = [
blazeBuilder blazeBuilderConduit caseInsensitive conduit httpTypes
liftedBase network networkConduit simpleSendfile transformers

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

@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "xml-conduit";
version = "0.7.0.1";
sha256 = "0ikkdgzvvadz7787jii8hwx8rls95jwvk7p4g2lw3ib8372hz4ly";
version = "0.7.0.2";
sha256 = "0qrfl946db56p2bfjrnmkl816fncn598g5jg1s1q4xq4jp7mm70k";
buildDepends = [
attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit
conduit dataDefault failure monadControl resourcet systemFilepath

20
pkgs/development/libraries/libdc1394/default.nix Normal file
View File

@@ -0,0 +1,20 @@
{ stdenv, fetchurl, libraw1394, libusb1 }:
stdenv.mkDerivation rec {
name = "libdc1394-2.2.0";
src = fetchurl {
url = "mirror://sourceforge/libdc1394/${name}.tar.gz";
sha256 = "0v7y8r8zxpkcw8fhwr6x08wkbpfzs5snw5s589fpqmn569f1grn6";
};
buildInputs = [ libraw1394 libusb1 ];
meta = {
homepage = http://sourceforge.net/projects/libdc1394/;
description = "Capture and control API for IIDC compliant cameras";
license = "LGPLv2.1+";
maintainers = [ stdenv.lib.maintainers.viric ];
platforms = stdenv.lib.platforms.linux;
};
}

28
pkgs/development/libraries/libdc1394avt/default.nix Normal file
View File

@@ -0,0 +1,28 @@
{ stdenv, fetchurl, libraw1394, libusb1, pkgconfig }:
stdenv.mkDerivation rec {
name = "libdc1394avt-2.1.2";
src = fetchurl {
url = http://www.alliedvisiontec.com/fileadmin/content/PDF/Software/AVT_software/zip_files/AVTFire4Linux3v0.src.tar;
sha256 = "13fz3apxcv2rkb34hxd48lbhss6vagp9h96f55148l4mlf5iyyfv";
};
unpackPhase = ''
tar xf $src
BIGTAR=`echo *`
tar xf */libdc1394*.tar.gz
rm -R $BIGTAR
cd libd*
'';
buildInputs = [ libraw1394 libusb1 pkgconfig ];
meta = {
homepage = http://www.alliedvisiontec.com/us/products/software/linux/avt-fire4linux.html;
description = "Capture and control API for IIDC cameras with AVT extensions";
license = "LGPLv2.1+";
maintainers = [ stdenv.lib.maintainers.viric ];
platforms = stdenv.lib.platforms.linux;
};
}

4
pkgs/development/libraries/libraw1394/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "libraw1394-2.0.7";
name = "libraw1394-2.0.8";
src = fetchurl {
url = "mirror://kernel/linux/libs/ieee1394/${name}.tar.gz";
sha256 = "1mq9yy73q85lzk288lbdzvzrs5ajh84pzfh7xdhd3d8dy9v53xca";
sha256 = "0cwd8xn7wsm7nddbz7xgynxcjb1m4v2vjw1ky4dd6r5cv454hslk";
};
meta = {

1
pkgs/development/libraries/libvirt/default.nix
View File

@@ -35,6 +35,7 @@ stdenv.mkDerivation {
'';
enableParallelBuilding = true;
NIX_CFLAGS_COMPILE = "-fno-stack-protector";
meta = {
homepage = http://libvirt.org/;