Revert "Merge pull request #15595 from laMudri/agda-stdlib"

This reverts commit ce4f6c215f, reversing
changes made to 7817d0901d.

See 68e1419cb8 (r64175487)
This commit is contained in:
Joachim Fasting 2016-05-23 09:07:02 +02:00
parent 89d50c4341
commit 6a2244e8f4
No known key found for this signature in database
GPG Key ID: 4330820E1E04DCF4
7 changed files with 13 additions and 25 deletions

View File

@ -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

View File

@ -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
};
})
})

View File

@ -21,6 +21,5 @@ agda.mkDerivation (self: rec {
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.unix;
maintainers = with maintainers; [ fuuzetsu ];
broken = true;
};
})

View File

@ -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
};
})

View File

@ -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 ];
};
})

View File

@ -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 ];
};
})

View File

@ -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;
};
})