JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

agda: migrate to haskell-ng, update and cleanup

Browse Source 
Resolves https://github.com/NixOS/nixpkgs/pull/7172.
This commit is contained in:
Nikolay Amiantov 2015-04-05 04:49:07 +03:00 committed by Peter Simons
parent 434f129c62
commit 25618c3670
8 changed files with 87 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/build-support/agda/default.nix
View File

@ -92,4 +92,4 @@ in
(postprocess (let super = defaults self // args self;
self = super // extension self super;
in self));
}
}

0
pkgs/development/libraries/agda/AgdaSheaves/default.nix → pkgs/development/libraries/agda/Agda-Sheaves/default.nix
View File

36
pkgs/development/libraries/agda/TotalParserCombinators/contextfile
View File

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

4
pkgs/development/libraries/agda/TotalParserCombinators/default.nix
View File

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

15
pkgs/development/compilers/agda/stdlib.nix → pkgs/development/libraries/agda/agda-stdlib/default.nix
View File

@ -1,15 +1,16 @@
{ stdenv, agda, fetchurl, ghc, filemanip }:
{ stdenv, agda, fetchgit, ghcWithPackages }:
agda.mkDerivation (self: rec {
version = "0.9";
name = "Agda-stdlib-${version}";
version = "2.4.2.3";
name = "agda-stdlib-${version}";
src = fetchurl {
url = "https://github.com/agda/agda-stdlib/archive/v${version}.tar.gz";
sha256 = "05rpmd2xra8wygq33mahdmijcjwq132l1akqyzj66n13frw4hfwj";
src = fetchgit {
url = "git://github.com/agda/agda-stdlib";
rev = "451446c5d849b8c5d6d34363e3551169eb126cfb";
sha256 = "40a55d3c22fb3462b110859f4cd63e79e086b25f23964b465768397b93c57701";
};
buildInputs = [ filemanip ghc ];
nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ];
preConfigure = ''
runhaskell GenerateEverything.hs
'';

26
pkgs/development/libraries/agda/pretty/contextfile
View File

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

4
pkgs/development/libraries/agda/pretty/default.nix
View File

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

24
pkgs/top-level/all-packages.nix
View File

@ -7846,30 +7846,30 @@ let
agda = callPackage ../build-support/agda {
glibcLocales = if pkgs.stdenv.isLinux then pkgs.glibcLocales else null;
extension = self : super : {};
Agda = haskellPackages.Agda;
extension = self : super : { };
inherit (haskellngPackages) Agda;
inherit writeScriptBin;
};
agdaBase = callPackage ../development/libraries/agda/agda-base {};
agdaBase = callPackage ../development/libraries/agda/agda-base { };
agdaIowaStdlib = callPackage ../development/libraries/agda/agda-iowa-stdlib {};
agdaIowaStdlib = callPackage ../development/libraries/agda/agda-iowa-stdlib { };
agdaPrelude = callPackage ../development/libraries/agda/agda-prelude {};
agdaPrelude = callPackage ../development/libraries/agda/agda-prelude { };
AgdaStdlib = callPackage ../development/compilers/agda/stdlib.nix {
inherit (haskellPackages) ghc filemanip;
AgdaStdlib = callPackage ../development/libraries/agda/agda-stdlib {
inherit (haskellngPackages) ghcWithPackages;
};
AgdaSheaves = callPackage ../development/libraries/agda/AgdaSheaves {};
AgdaSheaves = callPackage ../development/libraries/agda/Agda-Sheaves { };
bitvector = callPackage ../development/libraries/agda/bitvector {};
bitvector = callPackage ../development/libraries/agda/bitvector { };
categories = callPackage ../development/libraries/agda/categories {};
categories = callPackage ../development/libraries/agda/categories { };
pretty = callPackage ../development/libraries/agda/pretty {};
pretty = callPackage ../development/libraries/agda/pretty { };
TotalParserCombinators = callPackage ../development/libraries/agda/TotalParserCombinators {};
TotalParserCombinators = callPackage ../development/libraries/agda/TotalParserCombinators { };
### DEVELOPMENT / LIBRARIES / JAVA