agda: migrate to haskell-ng, update and cleanup

Resolves https://github.com/NixOS/nixpkgs/pull/7172.

6 files changed, 93 insertions, 4 deletions

diff --git a/pkgs/development/libraries/agda/AgdaSheaves/default.nix b/pkgs/development/libraries/agda/Agda-Sheaves/default.nix
index 83066f5da63..83066f5da63 100644
--- a/pkgs/development/libraries/agda/AgdaSheaves/default.nix
+++ b/pkgs/development/libraries/agda/Agda-Sheaves/default.nix
diff --git a/pkgs/development/libraries/agda/TotalParserCombinators/contextfile b/pkgs/development/libraries/agda/TotalParserCombinators/contextfile
index 1c195ee97fa..46743cba3b6 100644
--- a/pkgs/development/libraries/agda/TotalParserCombinators/contextfile
+++ b/pkgs/development/libraries/agda/TotalParserCombinators/contextfile
@@ -1,6 +1,42 @@
 
 Context:
 
+[Updated the code in response to changes to Agda.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150319181310
+ Ignore-this: 52b9ff613d7f10b0c8f45591a0759d07
+] 
+
+[Rolled back most of "Updated the code in response to changes to Agda".
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150319101420
+ Ignore-this: c2ea7bdf79848235fa3ea64ebda116eb
+ * One of the Agda changes has been reverted.
+] 
+
+[Removed an outdated comment.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150217162945
+ Ignore-this: 3ff7732335750305fe220e65693f0cbf
+] 
+
+[Added the simplification "nonempty (return x) → fail".
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150217161718
+ Ignore-this: 56ad6a68c314446d8986a8c1b49655d0
+] 
+
+[Added Nonempty.nonempty-return.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150217161629
+ Ignore-this: 68829d3f9a248272c46848daa05ccfe3
+] 
+
+[Updated the copyright year range.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150212154744
+ Ignore-this: 3410a12ca1f9de825b00e692b136d500
+] 
+
+[Updated the code in response to changes to Agda.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150212152207
+ Ignore-this: 683b5eeca5fa9c8490bceaf68c23a204
+] 
+
 [Updated the copyright year range.
 Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20141128223227
  Ignore-this: 31d3f5e4fdd6fbfad9758d9bfd0d3a3e
diff --git a/pkgs/development/libraries/agda/TotalParserCombinators/default.nix b/pkgs/development/libraries/agda/TotalParserCombinators/default.nix
index 4a261e07cfd..8c299000065 100644
--- a/pkgs/development/libraries/agda/TotalParserCombinators/default.nix
+++ b/pkgs/development/libraries/agda/TotalParserCombinators/default.nix
@@ -1,13 +1,13 @@
 { stdenv, agda, fetchdarcs, AgdaStdlib }:
 
 agda.mkDerivation (self: rec {
-  version = "2014-11-28";
+  version = "2015-03-19";
   name = "TotalParserCombinators-${version}";
 
   src = fetchdarcs {
     url = "http://www.cse.chalmers.se/~nad/repos/parser-combinators.code/";
     context = ./contextfile;
-    sha256 = "03fjrgj0749929h5zz6yfz5x9h7fln95c8ydrm44550350n4xjvk";
+    sha256 = "0jlbz8yni6i7vb2qsd41bdkpchqirvc5pavckaf97z7p4gqi2mlj";
   };
 
   buildDepends = [ AgdaStdlib ];
diff --git a/pkgs/development/libraries/agda/agda-stdlib/default.nix b/pkgs/development/libraries/agda/agda-stdlib/default.nix
new file mode 100644
index 00000000000..8f3d298306b
--- /dev/null
+++ b/pkgs/development/libraries/agda/agda-stdlib/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, agda, fetchgit, ghcWithPackages }:
+
+agda.mkDerivation (self: rec {
+  version = "2.4.2.3";
+  name = "agda-stdlib-${version}";
+
+  src = fetchgit {
+    url = "git://github.com/agda/agda-stdlib";
+    rev = "451446c5d849b8c5d6d34363e3551169eb126cfb";
+    sha256 = "40a55d3c22fb3462b110859f4cd63e79e086b25f23964b465768397b93c57701";
+  };
+
+  nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ];
+  preConfigure = ''
+    runhaskell GenerateEverything.hs
+  '';
+
+  topSourceDirectories = [ "src" ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://wiki.portal.chalmers.se/agda/pmwiki.php?n=Libraries.StandardLibrary";
+    description = "A standard library for use with the Agda compiler";
+    license = stdenv.lib.licenses.mit;
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = with maintainers; [ jwiegley fuuzetsu ];
+  };
+})
diff --git a/pkgs/development/libraries/agda/pretty/contextfile b/pkgs/development/libraries/agda/pretty/contextfile
index 12079515f66..2ea20153bbc 100644
--- a/pkgs/development/libraries/agda/pretty/contextfile
+++ b/pkgs/development/libraries/agda/pretty/contextfile
@@ -1,6 +1,32 @@
 
 Context:
 
+[Updated the code in response to a change to Agda.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150319181428
+ Ignore-this: f83c3dccfe25a2a5b9d0437d1dce0ec0
+] 
+
+[Rolled back most of "Updated the code in response to changes to Agda".
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150319101413
+ Ignore-this: 5a26cf9cf83d0d146cca0c15c857d20c
+ * One of the Agda changes has been reverted.
+] 
+
+[Updated the code in response to changes to Agda.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150217101656
+ Ignore-this: a12921aebbe0fb575ef391ba5789a391
+] 
+
+[Modified the copyright year range.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20150213144338
+ Ignore-this: 1d1b22457dd6dadcb47f5d7f3eea062
+] 
+
+[Restored Grammar.Abstract and Grammar.Non-terminal.
+Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20130727225031
+ Ignore-this: ddccb15caa7a3c26e973997ffdb4eec1
+] 
+
 [Modified the copyright year range.
 Nils Anders Danielsson <nils.anders.danielsson@gmail.com>**20141128164015
  Ignore-this: b9c6dddc965738aa2a7670c4c18da67f
diff --git a/pkgs/development/libraries/agda/pretty/default.nix b/pkgs/development/libraries/agda/pretty/default.nix
index cab58b36978..6aaaa44b00f 100644
--- a/pkgs/development/libraries/agda/pretty/default.nix
+++ b/pkgs/development/libraries/agda/pretty/default.nix
@@ -1,13 +1,13 @@
 { stdenv, agda, fetchdarcs, AgdaStdlib }:
 
 agda.mkDerivation (self: rec {
-  version = "2014-11-28";
+  version = "2015-03-19";
   name = "pretty-${version}";
 
   src = fetchdarcs {
     url = "http://www.cse.chalmers.se/~nad/repos/pretty/";
     context = ./contextfile;
-    sha256 = "1y896qqlfjqvpd09cp0x9nhr60ii21f5cibl0v73xl3z2d0wn0xa";
+    sha256 = "0zmwh9kln7ykpmkx1qhqz64qm2arq62b17vs5fswnxk7mqxsmrf0";
   };
 
   buildDepends = [ AgdaStdlib ];