Updated Agda to 2.2.6.

svn path=/nixpkgs/trunk/; revision=19365
This commit is contained in:
Andres Löh 2010-01-12 10:18:00 +00:00
parent 662d29e61a
commit 55e2661690
4 changed files with 14 additions and 11 deletions

View file

@ -3,13 +3,14 @@
cabal.mkDerivation (self : { cabal.mkDerivation (self : {
pname = "Agda"; pname = "Agda";
version = "2.2.2"; version = "2.2.6";
sha256 = "265dbb5bc6d67bfeefa4a2a4ac9e5018d6d8b5c1a75816e05da2661c43a39bba"; sha256 = "e9268a61db30fc0f22f7e1fbc78673cd3e0d1bf2dd40ee5cf809635ca40fca78";
extraBuildInputs = [happy alex]; extraBuildInputs = [happy alex];
propagatedBuildInputs = propagatedBuildInputs =
[QuickCheck binary haskeline haskellSrc mtl utf8String xhtml zlib]; [QuickCheck binary haskeline haskellSrc mtl utf8String xhtml zlib];
meta = { meta = {
description = "A dependently typed functional language and proof assistant"; description = "A dependently typed functional language and proof assistant";
maintainers = [self.stdenv.lib.maintainers.andres];
}; };
}) })

View file

@ -2,12 +2,13 @@
cabal.mkDerivation (self : { cabal.mkDerivation (self : {
pname = "QuickCheck"; pname = "QuickCheck";
version = "2.1.0.1"; version = "2.1.0.2";
sha256 = "f99edf1a45315e90c9ec672d5d959d5878dcc1de65678c6aed85829a896b75f1"; sha256 = "1adeea5aa52cba7b8bcd27f9cdd9fe944e9a4a22d22fdf0570b526f580981e58";
propagatedBuildInputs = [mtl]; propagatedBuildInputs = [mtl];
configureFlags = ''--constraint=base<4'';
meta = { meta = {
description = "Automatic testing of Haskell programs"; description = "Automatic testing of Haskell programs";
license = "BSD";
maintainers = [self.stdenv.lib.maintainers.andres];
}; };
}) })

View file

@ -97,6 +97,10 @@ attrs :
eval "$postInstall" eval "$postInstall"
''; '';
# We inherit stdenv and ghc so that they can be used
# in Cabal derivations.
inherit (attrs) stdenv ghc;
}; };
in attrs.stdenv.mkDerivation ((rec { f = dtransform f // transform f; }).f); in attrs.stdenv.mkDerivation ((rec { f = dtransform f // transform f; }).f);
} }

View file

@ -27,11 +27,10 @@ rec {
# Haskell libraries. # Haskell libraries.
# Agda depends on a specific version of QuickCheck
Agda = import ../development/libraries/haskell/Agda { Agda = import ../development/libraries/haskell/Agda {
inherit cabal binary haskeline haskellSrc mtl utf8String xhtml zlib inherit cabal binary haskeline haskellSrc mtl utf8String xhtml zlib
happy alex; happy alex;
QuickCheck = QuickCheck2101; QuickCheck = QuickCheck2;
}; };
ansiTerminal = import ../development/libraries/haskell/ansi-terminal { ansiTerminal = import ../development/libraries/haskell/ansi-terminal {
@ -403,14 +402,12 @@ rec {
}; };
QuickCheck = QuickCheck1; QuickCheck = QuickCheck1;
QuickCheck1 = QuickCheck1200;
QuickCheck2 = QuickCheck2101;
QuickCheck1200 = import ../development/libraries/haskell/QuickCheck { QuickCheck1 = import ../development/libraries/haskell/QuickCheck {
inherit cabal; inherit cabal;
}; };
QuickCheck2101 = import ../development/libraries/haskell/QuickCheck/2.1.0.1.nix { QuickCheck2 = import ../development/libraries/haskell/QuickCheck/QuickCheck-2.nix {
inherit cabal mtl; inherit cabal mtl;
}; };