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

svn merge ^/nixpkgs/trunk

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32713
This commit is contained in:
Yury G. Kudryashov
2012-03-01 07:04:39 +00:00
parent b14a737a4d 57b612cb05
commit 0210e20b5a
74 changed files with 833 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/development/libraries/haskell/HSH/default.nix Normal file
View File

@@ -0,0 +1,24 @@
{ cabal, filepath, hslogger, MissingH, mtl, regexBase, regexCompat
, regexPosix
}:
cabal.mkDerivation (self: {
pname = "HSH";
version = "2.0.4";
sha256 = "1ddpazmk82716hqd1riqs7vnl4aildgwkjgk80iam49df9p5b8v8";
isLibrary = true;
isExecutable = true;
buildDepends = [
filepath hslogger MissingH mtl regexBase regexCompat regexPosix
];
meta = {
homepage = "http://software.complete.org/hsh";
description = "Library to mix shell scripting with Haskell programs";
license = "LGPL";
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})

17
pkgs/development/libraries/haskell/IfElse/default.nix Normal file
View File

@@ -0,0 +1,17 @@
{ cabal, mtl }:
cabal.mkDerivation (self: {
pname = "IfElse";
version = "0.85";
sha256 = "1kfx1bwfjczj93a8yqz1n8snqiq5655qgzwv1lrycry8wb1vzlwa";
buildDepends = [ mtl ];
meta = {
description = "Anaphoric and miscellaneous useful control-flow";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})

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

@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "authenticate";
version = "1.0.0";
sha256 = "0a163dhi69gh6zmi43jidxlaknbk1y0frjlwijdf7fp073rh0p87";
version = "1.0.0.1";
sha256 = "0wrbr7kwd4g8idd6i4ghvpd5q7nq0b8zx5qphqvkbs128m0r308d";
buildDepends = [
aeson attoparsec blazeBuilder blazeBuilderConduit caseInsensitive
conduit httpConduit httpTypes network tagsoup text transformers

17
pkgs/development/libraries/haskell/base64-bytestring/0.1.0.3.nix Normal file
View File

@@ -0,0 +1,17 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "base64-bytestring";
version = "0.1.0.3";
sha256 = "0d4j8b1d8z9qr1y446bfkj764xgilk8gw2frj0wn0717y8knvmx3";
meta = {
homepage = "https://github.com/bos/base64-bytestring";
description = "Fast base64 encoding and deconding for ByteStrings";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})

0
pkgs/development/libraries/haskell/base64-bytestring/default.nix → pkgs/development/libraries/haskell/base64-bytestring/0.1.1.0.nix
View File

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

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "clientsession";
version = "0.7.4";
sha256 = "050mg3rzyld4v2b9v1pc1q563sp7sffiapvr8ks8f46ibl17lvss";
version = "0.7.4.1";
sha256 = "1fnrngbx86zcvh0ybv7ans132d216ayxdzlgw0x4qh0sw9r3w2ip";
buildDepends = [
base64Bytestring cereal cprngAes cryptoApi cryptocipher entropy
skein tagged

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

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "convertible";
version = "1.0.11.0";
sha256 = "0qkz760ddshmglmrf47a01978c9zhxfss44b6vmfkwwfcjb7da2b";
version = "1.0.11.1";
sha256 = "1r50a2rpfsx0s7dv8ww5xck33b1mhy73gfilffrbqd4hxjgnxlj6";
isLibrary = true;
isExecutable = true;
buildDepends = [ mtl text time ];

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

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "filestore";
version = "0.4.0.4";
sha256 = "14rp2689gjnk9pqk2xv4m3q3icgfvbik32c2d6gx4l2y7n78dsbx";
version = "0.4.1";
sha256 = "02ki6b4rbmk463qmmqia7igkrsr7h1kxal94k6pikkikylx2f8r7";
buildDepends = [ Diff filepath parsec split time utf8String xml ];
meta = {
homepage = "http://johnmacfarlane.net/repos/filestore";

23
pkgs/development/libraries/haskell/gitit/default.nix
View File

@@ -1,21 +1,22 @@
{ cabal, cgi, ConfigFile, feed, filepath, filestore, ghcPaths
, happstackServer, happstackUtil, highlightingKate, hslogger
, HStringTemplate, HTTP, json, mtl, network, pandoc, pandocTypes
, parsec, random, recaptcha, safe, SHA, syb, text, time, url
, utf8String, xhtml, xml, xssSanitize, zlib
{ cabal, blazeHtml, cgi, ConfigFile, feed, filepath, filestore
, ghcPaths, happstackServer, happstackUtil, highlightingKate
, hslogger, HStringTemplate, HTTP, json, mtl, network, pandoc
, pandocTypes, parsec, random, recaptcha, safe, SHA, syb, tagsoup
, text, time, url, utf8String, xhtml, xml, xssSanitize, zlib
}:
cabal.mkDerivation (self: {
pname = "gitit";
version = "0.8.1";
sha256 = "1b5i6fm68vwhlvgz0m7xxzklkxc2c6lrqyqfqyjs93p5j0aqgvfn";
version = "0.9";
sha256 = "00kjfmczj5m3b8r8djdpad8d27s44z7pf76yyc0sdja1f3bd4mlp";
isLibrary = true;
isExecutable = true;
buildDepends = [
cgi ConfigFile feed filepath filestore ghcPaths happstackServer
happstackUtil highlightingKate hslogger HStringTemplate HTTP json
mtl network pandoc pandocTypes parsec random recaptcha safe SHA syb
text time url utf8String xhtml xml xssSanitize zlib
blazeHtml cgi ConfigFile feed filepath filestore ghcPaths
happstackServer happstackUtil highlightingKate hslogger
HStringTemplate HTTP json mtl network pandoc pandocTypes parsec
random recaptcha safe SHA syb tagsoup text time url utf8String
xhtml xml xssSanitize zlib
];
meta = {
homepage = "http://gitit.net";

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

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hxt";
version = "9.2.1";
sha256 = "0172icb36wx4fb6q3xq7pcs85d2hnn4bznq3wjwhval10mayri8y";
version = "9.2.2";
sha256 = "0ichjpshq10b11dyfv1q7rs2m190x3gplx6k54amlxv45nwd1s6r";
buildDepends = [
binary deepseq filepath HUnit hxtCharproperties hxtRegexXmlschema
hxtUnicode mtl network parsec

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

@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "persistent";
version = "0.8.0";
sha256 = "0z70ibicfbfripp1x9csfvfhn7k26j78jvvig9ylsjwldhysr7qr";
version = "0.8.0.1";
sha256 = "1lsmsx0zxa3h83z29r6h3r94czg7c8apid9mah48f8hxlfynbqhi";
buildDepends = [
aeson attoparsec base64Bytestring blazeHtml conduit liftedBase
monadControl mtl pathPieces poolConduit text time transformers

16
pkgs/development/libraries/haskell/stm/2.3.nix Normal file
View File

@@ -0,0 +1,16 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "stm";
version = "2.3";
sha256 = "1321l1qkmvnqdw73i21jnh2b8c1iw1mxjbp23hmqdvljjb9mlzsm";
meta = {
description = "Software Transactional Memory";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})

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

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "testpack";
version = "2.1.1";
sha256 = "1z8g3xhvy901h7kr7q4wcms5b23xniskrgxfpq42w4b34acwvhmg";
version = "2.1.2";
sha256 = "12dhl8svy0wmdwlvkp0p0j6wr6vgv4hrjcpdv48kc5rcwjvh8xif";
buildDepends = [ HUnit mtl QuickCheck random ];
meta = {
homepage = "http://hackage.haskell.org/cgi-bin/hackage-scripts/package/testpack";

4
pkgs/development/libraries/haskell/utility-ht/default.nix
View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "utility-ht";
version = "0.0.7.1";
sha256 = "0k097kyv6rxjvg1drnphv2mg882xx2lk098hs557fcsr16w658ma";
version = "0.0.8";
sha256 = "02sm1xj5xa65hpkvl2yk89d9dlg3c2ap8qcviq9zj10asmsbzyd8";
meta = {
description = "Various small helper functions for Lists, Maybes, Tuples, Functions";
license = self.stdenv.lib.licenses.bsd3;

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

@@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "yesod";
version = "0.10.1";
sha256 = "1m4prrpxdcj7qn755as37kn66f7didparhar520anr9cryn0wfr9";
version = "0.10.1.1";
sha256 = "1d64kx0jfk1d1r4k8r57y5wz84pjxs481qdnzgjfv279y467fki6";
isLibrary = true;
isExecutable = true;
buildDepends = [

13
pkgs/development/libraries/itk/default.nix
View File

@@ -1,18 +1,19 @@
{stdenv, fetchurl, cmake, libX11, libuuid}:
{stdenv, fetchurl, cmake, libX11, libuuid, xz}:
stdenv.mkDerivation rec {
name = "itk-3.16.0";
name = "itk-4.0.0";
src = fetchurl {
url = mirror://sourceforge/itk/InsightToolkit-3.16.0.tar.gz;
sha256 = "18r021ib2g94qlajjsny0r6cpc61rmr0zrpb2l0mx1y7j9ckr6ks";
url = mirror://sourceforge/itk/InsightToolkit-4.0.0.tar.xz;
sha256 = "05z49sw612cbyiaghcsda0xylrkf06jh81ql79si5632w1hpgbd9";
};
cmakeFlags = [ "-DBUILD_TESTING=OFF" "-DBUILD_EXAMPLES=OFF" ];
# makeFlags = [ "VERBOSE=1" ];
enableParallelBuilding = true;
buildInputs = [ cmake libX11 libuuid ];
buildNativeInputs = [ cmake xz ];
buildInputs = [ libX11 libuuid ];
meta = {
description = "Insight Segmentation and Registration Toolkit";

6
pkgs/development/libraries/kerberos/krb5.nix
View File

@@ -2,7 +2,7 @@
let
pname = "krb5";
version = "1.6.3";
version = "1.10";
name = "${pname}-${version}";
webpage = http://web.mit.edu/kerberos/;
in
@@ -11,8 +11,8 @@ stdenv.mkDerivation (rec {
inherit name;
src = fetchurl {
url = "${webpage}/dist/krb5/1.6/${name}-signed.tar";
sha256 = "7a1bd7d4bd326828c8ee382ed2b69ccd6c58762601df897d6a32169d84583d2a";
url = "${webpage}/dist/krb5/1.10/${name}-signed.tar";
sha256 = "1pa4m6538drb51gsqxbbxlsnc9fm9ccid9m2s3pv3di5l0a7l8bg";
};
buildInputs = [ perl ncurses yacc ];

6
pkgs/development/libraries/libzip/default.nix
View File

@@ -10,6 +10,12 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ zlib ];
# At least mysqlWorkbench cannot find zipconf.h; I think also openoffice
# had this same problem. This links it somewhere that mysqlworkbench looks.
postInstall = ''
( cd $out/include ; ln -s ../lib/libzip/include/zipconf.h zipconf.h )
'';
meta = {
homepage = http://www.nih.at/libzip;
description = "A C library for reading, creating and modifying zip archives";

11
pkgs/development/libraries/zlib/latest.nix Normal file
View File

@@ -0,0 +1,11 @@
{stdenv, fetchurl}:
# To be removed in stdenv-updates, as default.nix is already right there.
stdenv.mkDerivation rec {
name = "zlib-1.2.6";
src = fetchurl {
url = "http://www.zlib.net/${name}.tar.gz";
sha256 = "06x6m33ls1606ni7275q5z392csvh18dgs55kshfnvrfal45w8r1";
};
}