diff options
author | Cyril Cohen <cohen@crans.org> | 2019-08-06 11:15:37 +0200 |
---|---|---|
committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2019-08-09 08:47:52 +0000 |
commit | 52f3c28df2300c60ca015fc39d48c10f09b8c5ef (patch) | |
tree | 20eb8fd858e77a35c46ceb17e876d05a9210141c /pkgs/development | |
parent | 380b127658197ce249d508048d5faea169e9f67d (diff) | |
download | nixpkgs-52f3c28df2300c60ca015fc39d48c10f09b8c5ef.tar nixpkgs-52f3c28df2300c60ca015fc39d48c10f09b8c5ef.tar.gz nixpkgs-52f3c28df2300c60ca015fc39d48c10f09b8c5ef.tar.bz2 nixpkgs-52f3c28df2300c60ca015fc39d48c10f09b8c5ef.tar.lz nixpkgs-52f3c28df2300c60ca015fc39d48c10f09b8c5ef.tar.xz nixpkgs-52f3c28df2300c60ca015fc39d48c10f09b8c5ef.tar.zst nixpkgs-52f3c28df2300c60ca015fc39d48c10f09b8c5ef.zip |
elpi: 1.4.1 -> 1.6.0, and coq-elpi
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/coq-modules/coq-elpi/default.nix | 38 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/elpi/default.nix | 4 |
2 files changed, 40 insertions, 2 deletions
diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix new file mode 100644 index 00000000000..04fc428b409 --- /dev/null +++ b/pkgs/development/coq-modules/coq-elpi/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, which, coq }: + +let params = { + "8.10" = { + version = "master"; + rev = "bc7134deba1aacc7ecd2f5d1032bdf05b125c568"; + sha256 = "188avk9irwjsbs5ya4ka01mpk3vw4397kv2rmsncqrrrsa1pdddk"; + }; +}; + param = params."${coq.coq-version}"; +in + +stdenv.mkDerivation rec { + name = "coq${coq.coq-version}-elpi-${param.version}"; + + src = fetchFromGitHub { + owner = "LPCIC"; + repo = "coq-elpi"; + inherit (param) rev sha256; + }; + + nativeBuildInputs = [ which ]; + buildInputs = [ coq coq.ocaml ] ++ (with coq.ocamlPackages; [ findlib elpi ]); + + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + + meta = { + description = "Coq plugin embedding ELPI."; + maintainers = [ stdenv.lib.maintainers.cohencyril ]; + license = stdenv.lib.licenses.lgpl21; + inherit (coq.meta) platforms; + inherit (src.meta) homepage; + }; + + passthru = { + compatibleCoqVersions = stdenv.lib.flip builtins.hasAttr params; + }; +} diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix index c00af00b859..2542b5dd913 100644 --- a/pkgs/development/ocaml-modules/elpi/default.nix +++ b/pkgs/development/ocaml-modules/elpi/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "elpi"; - version = "1.4.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "LPCIC"; repo = "elpi"; rev = "v${version}"; - sha256 = "0sj2jbimg3jqwz4bsfcdqbrh45bb1dbgxj5g234pg1xjy9kxzl2w"; + sha256 = "0740a9bg33g7r3injpalmn2jd0h586481vrrkdw46nsaspwcjhza"; }; minimumOCamlVersion = "4.04"; |