From 6a2244e8f453ab6c66dff9411735c81cbad879fa Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 23 May 2016 09:07:02 +0200
Subject: [PATCH] Revert "Merge pull request #15595 from laMudri/agda-stdlib"

This reverts commit ce4f6c215f2f34435638113421dd291a57d16715, reversing
changes made to 7817d0901d44ba97e5862e94840098e2b97d8631.

See https://github.com/NixOS/nixpkgs/pull/15595/commits/68e1419cb8eca6e306ec0a75f37621ae7aefabed#r64175487
---
 .../haskell-modules/hackage-packages.nix            | 13 ++-----------
 .../libraries/agda/Agda-Sheaves/default.nix         |  3 +--
 .../agda/TotalParserCombinators/default.nix         |  1 -
 .../libraries/agda/agda-base/default.nix            |  1 -
 .../libraries/agda/agda-prelude/default.nix         |  6 +++---
 .../libraries/agda/agda-stdlib/default.nix          | 13 +++++++------
 .../libraries/agda/bitvector/default.nix            |  1 -
 7 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index d4a122cc7da..f143b72215d 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -847,22 +847,13 @@ self: {
        ];
        executableToolDepends = [ emacs ];
        postInstall = ''
-         # Separate loops to avoid internal error
-         files=($out/share/*-ghc-*/Agda-*/lib/prim/Agda/{Primitive.agda,Builtin/*.agda})
-         for f in "''${files[@]}"
-         do
-           $out/bin/agda $f
-         done
-         for f in "''${files[@]}"
-         do
-           $out/bin/agda -c --no-main $f
-         done
+         $out/bin/agda -c --no-main $(find $out/share -name Primitive.agda)
          $out/bin/agda-mode compile
        '';
        homepage = "http://wiki.portal.chalmers.se/agda/";
        description = "A dependently typed functional programming language and proof assistant";
        license = "unknown";
-       maintainers = with stdenv.lib.maintainers; [ abbradar mudri ];
+       maintainers = with stdenv.lib.maintainers; [ abbradar ];
      }) {inherit (pkgs) emacs;};
 
   "Agda-executable" = callPackage
diff --git a/pkgs/development/libraries/agda/Agda-Sheaves/default.nix b/pkgs/development/libraries/agda/Agda-Sheaves/default.nix
index b7634c36913..83066f5da63 100644
--- a/pkgs/development/libraries/agda/Agda-Sheaves/default.nix
+++ b/pkgs/development/libraries/agda/Agda-Sheaves/default.nix
@@ -19,6 +19,5 @@ agda.mkDerivation (self: rec {
     license = stdenv.lib.licenses.cc-by-40;
     platforms = stdenv.lib.platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
-    broken = true;  # replaced by constructive-sheaf-semantics
   };
-})
+})
\ No newline at end of file
diff --git a/pkgs/development/libraries/agda/TotalParserCombinators/default.nix b/pkgs/development/libraries/agda/TotalParserCombinators/default.nix
index 226a39890c2..8c299000065 100644
--- a/pkgs/development/libraries/agda/TotalParserCombinators/default.nix
+++ b/pkgs/development/libraries/agda/TotalParserCombinators/default.nix
@@ -21,6 +21,5 @@ agda.mkDerivation (self: rec {
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.unix;
     maintainers = with maintainers; [ fuuzetsu ];
-    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/agda/agda-base/default.nix b/pkgs/development/libraries/agda/agda-base/default.nix
index 40eef932822..cf73d7dea06 100644
--- a/pkgs/development/libraries/agda/agda-base/default.nix
+++ b/pkgs/development/libraries/agda/agda-base/default.nix
@@ -18,6 +18,5 @@ agda.mkDerivation (self: rec {
     license = stdenv.lib.licenses.bsd3;
     platforms = stdenv.lib.platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
-    broken = true;  # largely replaced by HoTT-Agda
   };
 })
diff --git a/pkgs/development/libraries/agda/agda-prelude/default.nix b/pkgs/development/libraries/agda/agda-prelude/default.nix
index a2d29ff08dc..9b67c5dbb5b 100644
--- a/pkgs/development/libraries/agda/agda-prelude/default.nix
+++ b/pkgs/development/libraries/agda/agda-prelude/default.nix
@@ -1,13 +1,13 @@
 { stdenv, agda, fetchgit }:
 
 agda.mkDerivation (self: rec {
-  version = "0dca24a81d417db2ae8fc871eccb7776f7eae952";
+  version = "d598f35d88596c5a63766a7188a0c0144e467c8c";
   name = "agda-prelude-${version}";
 
   src = fetchgit {
     url = "https://github.com/UlfNorell/agda-prelude.git";
     rev = version;
-    sha256 = "0gwfgvj96i1mx5v01bi46h567d1q1fbgvzv6z8zv91l2jhybwff5";
+    sha256 = "bdcffb675d0ad1bafa2b47f581b6a9b90347ae739b6218f89f365fda2cc4f8c8";
   };
 
   topSourceDirectories = [ "src" ];
@@ -18,6 +18,6 @@ agda.mkDerivation (self: rec {
     description = "Programming library for Agda";
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.unix;
-    maintainers = with maintainers; [ fuuzetsu mudri ];
+    maintainers = with maintainers; [ fuuzetsu ];
   };
 })
diff --git a/pkgs/development/libraries/agda/agda-stdlib/default.nix b/pkgs/development/libraries/agda/agda-stdlib/default.nix
index 47e426580ce..2a75b1fb700 100644
--- a/pkgs/development/libraries/agda/agda-stdlib/default.nix
+++ b/pkgs/development/libraries/agda/agda-stdlib/default.nix
@@ -1,12 +1,13 @@
-{ stdenv, agda, fetchurl, ghcWithPackages }:
+{ stdenv, agda, fetchgit, ghcWithPackages }:
 
 agda.mkDerivation (self: rec {
-  version = "v0.12";
+  version = "2.4.2.3";
   name = "agda-stdlib-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/agda/agda-stdlib/archive/${version}.tar.gz";
-    sha256 = "11qf87hxx3g0n8i6nkp4vqvh3i0gal6g812p0w2n4k7711nvrp9g";
+  src = fetchgit {
+    url = "git://github.com/agda/agda-stdlib";
+    rev = "9c9b3cb28f9a7d39a256890a1469c1a3f7fc4faf";
+    sha256 = "521899b820e70abbae7cb30008b87a2f8676bc6265b78865e42982fc2e5c972f";
   };
 
   nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ];
@@ -21,6 +22,6 @@ agda.mkDerivation (self: rec {
     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 mudri ];
+    maintainers = with maintainers; [ jwiegley fuuzetsu ];
   };
 })
diff --git a/pkgs/development/libraries/agda/bitvector/default.nix b/pkgs/development/libraries/agda/bitvector/default.nix
index faa9fa5203c..290a2f1206d 100644
--- a/pkgs/development/libraries/agda/bitvector/default.nix
+++ b/pkgs/development/libraries/agda/bitvector/default.nix
@@ -19,6 +19,5 @@ agda.mkDerivation (self: rec {
     license = stdenv.lib.licenses.bsd3;
     platforms = stdenv.lib.platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
-    broken = true;
   };
 })