Merge remote-tracking branch 'origin/master' into stdenv-updates.

This commit is contained in:
Peter Simons
2013-02-24 19:27:08 +01:00
57 changed files with 474 additions and 224 deletions

View File

@@ -1,15 +1,19 @@
{ cabal, Cabal, cabalInstall, filepath, HTTP, mtl, network, tar
, transformers, zlib
{ cabal, fetchurl, Cabal, cabalInstall, filepath, HTTP, mtl, network, tar
, transformers, zlib, setenv
}:
cabal.mkDerivation (self: {
pname = "cabal-dev";
version = "0.9.1";
sha256 = "1brz0nw959jdyjrhjqy9sixsb316hjmw4pxxsybfl8vixsivdfh6";
version = "0.9.1-git";
src = fetchurl {
url = "https://github.com/creswick/cabal-dev/archive/54e7d93d5b309c56192c146c7a807ac3591bc464.tar.gz";
sha256 = "1isi02jik0vrg48l7r2mj4cf9ms6hpxxz1mmhl7s3kkxx775cxj9";
name = "${self.name}.tar.gz";
};
isLibrary = false;
isExecutable = true;
buildDepends = [
Cabal filepath HTTP mtl network tar transformers zlib
Cabal filepath HTTP mtl network tar transformers zlib setenv
];
buildTools = [ cabalInstall ];
meta = {

View File

@@ -0,0 +1,20 @@
{ cabal, Cabal, cmdargs, stylishHaskell, systemFileio
, systemFilepath, text, unorderedContainers, yaml
}:
cabal.mkDerivation (self: {
pname = "cabal2ghci";
version = "0.0.1.0";
sha256 = "0l5225gwm6j25694cp94d4z31i1p68pq6js3psbr7m204q409dr5";
isLibrary = false;
isExecutable = true;
buildDepends = [
Cabal cmdargs stylishHaskell systemFileio systemFilepath text
unorderedContainers yaml
];
meta = {
description = "A tool to generate .ghci file from .cabal";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View File

@@ -1,14 +0,0 @@
{ cabal, filepath }:
cabal.mkDerivation (self: {
pname = "tar";
version = "0.3.2.0";
sha256 = "0yplrfai8bwihyn18whi0jiz1qzll9hgbc37xcy2jkr28480jba9";
buildDepends = [ filepath ];
meta = {
description = "Reading, writing and manipulating \".tar\" archive files.";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

View File

@@ -1,14 +0,0 @@
{ cabal, filepath, time }:
cabal.mkDerivation (self: {
pname = "tar";
version = "0.4.0.1";
sha256 = "0vbsv7h3zgp30mlgsw156jkv1rqy5zbm98as9haf7x15hd6jf254";
buildDepends = [ filepath time ];
meta = {
description = "Reading, writing and manipulating \".tar\" archive files.";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})