Merge pull request #2992 from bluescreen303/agda

Agda: upgrade stdlib to 0.8, change defaults to latest version
This commit is contained in:
Austin Seipp 2014-06-18 16:22:33 -05:00
commit b9fc9bd760
2 changed files with 9 additions and 9 deletions

View File

@ -1,12 +1,12 @@
{ cabal, fetchurl, filemanip, Agda }:
cabal.mkDerivation (self: {
pname = "Agda-lib-ffi";
version = "2.4.0";
cabal.mkDerivation (self: rec {
pname = "Agda-stdlib";
version = "0.8";
src = fetchurl {
url = "https://github.com/agda/agda-stdlib/archive/v2.4.0.tar.gz";
sha256 = "1rz0jrkm1b8d8aj9hbj3yl2k219c57r0cizfx98qqf1b9mwixzbf";
url = "https://github.com/agda/agda-stdlib/archive/v${version}.tar.gz";
sha256 = "03gdcy2gar46qlmd6w91y05cm1x304ig6bda90ryww9qn05kif78";
};
buildDepends = [ filemanip Agda ];
@ -18,7 +18,7 @@ cabal.mkDerivation (self: {
mkdir -p $out/share
cd ..
runhaskell GenerateEverything
${Agda}/bin/agda -i . -i src Everything.agda
agda -i . -i src Everything.agda
cp -pR src $out/share/agda
'';

View File

@ -2604,15 +2604,15 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
Agda_2_3_2_2 = callPackage ../development/compilers/agda/2.3.2.2.nix {};
Agda_2_4_0_1 = callPackage ../development/compilers/agda/2.4.0.1.nix {};
Agda = self.Agda_2_3_2_2;
Agda = self.Agda_2_4_0_1;
AgdaStdlib_0_7 = callPackage ../development/compilers/agda/stdlib-0.7.nix {
Agda = self.Agda_2_3_2_2;
};
AgdaStdlib_2_4_0 = callPackage ../development/compilers/agda/stdlib-2.4.0.nix {
AgdaStdlib_0_8 = callPackage ../development/compilers/agda/stdlib-0.8.nix {
Agda = self.Agda_2_4_0_1;
};
AgdaStdlib = self.AgdaStdlib_0_7;
AgdaStdlib = self.AgdaStdlib_0_8;
uhc = callPackage ../development/compilers/uhc {};