agda-stdlib: make expression nicer, fix license

This commit is contained in:
Mateusz Kowalczyk 2014-09-11 20:17:45 +01:00
parent 39dabcafd6
commit ee31679bad
2 changed files with 6 additions and 7 deletions

View File

@ -1,8 +1,5 @@
{ stdenv, agda, fetchurl, ghcWithPackages }: { stdenv, agda, fetchurl, ghc, filemanip }:
let
ghc = ghcWithPackages (s: [ s.filemanip ]);
in
agda.mkDerivation (self: rec { agda.mkDerivation (self: rec {
name = "Agda-stdlib"; name = "Agda-stdlib";
version = "0.8.1"; version = "0.8.1";
@ -12,8 +9,9 @@ agda.mkDerivation (self: rec {
sha256 = "0ij4rg4lk0pq01ing285gbmnn23dcf2rhihdcs8bbdpjg52vl4gf"; sha256 = "0ij4rg4lk0pq01ing285gbmnn23dcf2rhihdcs8bbdpjg52vl4gf";
}; };
buildInputs = [ filemanip ghc ];
preConfigure = '' preConfigure = ''
${ghc}/bin/runhaskell GenerateEverything.hs runhaskell GenerateEverything.hs
''; '';
topSourceDirectories = [ "src" ]; topSourceDirectories = [ "src" ];
@ -21,7 +19,8 @@ agda.mkDerivation (self: rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "http://wiki.portal.chalmers.se/agda/pmwiki.php?n=Libraries.StandardLibrary"; homepage = "http://wiki.portal.chalmers.se/agda/pmwiki.php?n=Libraries.StandardLibrary";
description = "A standard library for use with the Agda compiler."; description = "A standard library for use with the Agda compiler.";
license = "unknown"; license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.unix;
maintainers = with maintainers; [ jwiegley ]; maintainers = with maintainers; [ jwiegley ];
}; };
}) })

View File

@ -6637,7 +6637,7 @@ let
}; };
AgdaStdlib = callPackage ../development/compilers/agda/stdlib.nix { AgdaStdlib = callPackage ../development/compilers/agda/stdlib.nix {
ghcWithPackages = haskellPackages.ghcWithPackages; inherit (haskellPackages) ghc filemanip;
}; };
AgdaSheaves = callPackage ../development/libraries/agda/AgdaSheaves {}; AgdaSheaves = callPackage ../development/libraries/agda/AgdaSheaves {};