From 2e712b501c62b9ec11882421427591e80e48ccbc Mon Sep 17 00:00:00 2001 From: laMudri Date: Tue, 7 Jun 2016 10:52:55 +0100 Subject: [PATCH 1/3] agda-stdlib: 2.4.2.3 -> v0.12 (for Agda-2.5.1) --- .../libraries/agda/agda-stdlib/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/agda/agda-stdlib/default.nix b/pkgs/development/libraries/agda/agda-stdlib/default.nix index b25f14dbc9f..24ba50387a4 100644 --- a/pkgs/development/libraries/agda/agda-stdlib/default.nix +++ b/pkgs/development/libraries/agda/agda-stdlib/default.nix @@ -1,13 +1,14 @@ -{ stdenv, agda, fetchgit, ghcWithPackages }: +{ stdenv, agda, fetchFromGitHub, ghcWithPackages }: agda.mkDerivation (self: rec { - version = "2.4.2.3"; + version = "0.12"; name = "agda-stdlib-${version}"; - src = fetchgit { - url = "git://github.com/agda/agda-stdlib"; - rev = "9c9b3cb28f9a7d39a256890a1469c1a3f7fc4faf"; - sha256 = "1h64wzm4ysmq3gi33w3kp9h3f471sydpp453yf95bh5f713a8bxk"; + src = fetchFromGitHub { + repo = "agda-stdlib"; + owner = "agda"; + rev = "v${version}"; + sha256 = "1n5hn3xa0bqyq8rjvfsfmh6z3l8rr4z3s7gyfmf3kiv9f235bnd2"; }; nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ]; @@ -22,6 +23,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 ]; + maintainers = with maintainers; [ jwiegley fuuzetsu mudri ]; }; }) From 949ede3d2fa91315868801b542c26b76e5d3333b Mon Sep 17 00:00:00 2001 From: laMudri Date: Tue, 7 Jun 2016 10:54:32 +0100 Subject: [PATCH 2/3] agda-prelude: 2014-09-27 -> 2016-04-18 --- pkgs/development/libraries/agda/agda-prelude/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/agda/agda-prelude/default.nix b/pkgs/development/libraries/agda/agda-prelude/default.nix index 2ac71f341d6..a2d29ff08dc 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 = "d598f35d88596c5a63766a7188a0c0144e467c8c"; + version = "0dca24a81d417db2ae8fc871eccb7776f7eae952"; name = "agda-prelude-${version}"; src = fetchgit { url = "https://github.com/UlfNorell/agda-prelude.git"; rev = version; - sha256 = "10n8bsbn0c3hmyqdis7gvawn2ylzmzl8rkbscvh0bj03fbbna4d9"; + sha256 = "0gwfgvj96i1mx5v01bi46h567d1q1fbgvzv6z8zv91l2jhybwff5"; }; 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 ]; + maintainers = with maintainers; [ fuuzetsu mudri ]; }; }) From 28f4f157770bae0256ecf29c1058ac5336d54541 Mon Sep 17 00:00:00 2001 From: laMudri Date: Tue, 7 Jun 2016 10:58:28 +0100 Subject: [PATCH 3/3] Agda: marked some old packages as broken --- pkgs/development/libraries/agda/Agda-Sheaves/default.nix | 3 ++- .../libraries/agda/TotalParserCombinators/default.nix | 1 + pkgs/development/libraries/agda/agda-base/default.nix | 1 + pkgs/development/libraries/agda/bitvector/default.nix | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/agda/Agda-Sheaves/default.nix b/pkgs/development/libraries/agda/Agda-Sheaves/default.nix index 24d547ccd8b..a9c037edba7 100644 --- a/pkgs/development/libraries/agda/Agda-Sheaves/default.nix +++ b/pkgs/development/libraries/agda/Agda-Sheaves/default.nix @@ -19,5 +19,6 @@ 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 8c299000065..226a39890c2 100644 --- a/pkgs/development/libraries/agda/TotalParserCombinators/default.nix +++ b/pkgs/development/libraries/agda/TotalParserCombinators/default.nix @@ -21,5 +21,6 @@ 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 cf73d7dea06..40eef932822 100644 --- a/pkgs/development/libraries/agda/agda-base/default.nix +++ b/pkgs/development/libraries/agda/agda-base/default.nix @@ -18,5 +18,6 @@ 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/bitvector/default.nix b/pkgs/development/libraries/agda/bitvector/default.nix index 3f2c92e80ad..b3b3cb5bbfe 100644 --- a/pkgs/development/libraries/agda/bitvector/default.nix +++ b/pkgs/development/libraries/agda/bitvector/default.nix @@ -19,5 +19,6 @@ agda.mkDerivation (self: rec { license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + broken = true; }; })