From cc1f954bc417fb6f9a100539d36f2f78f75c8bb9 Mon Sep 17 00:00:00 2001
From: Cyril Cohen <CohenCyril@users.noreply.github.com>
Date: Thu, 4 Jun 2020 10:25:19 +0200
Subject: ocamlPackages.elpi: 1.10.2 -> 1.11.0

coqPackages.coq-elpi: 1.3.1 -> 1.4.0
coqPackages.hierarchy-builder: 0.9.0 -> 0.9.1
---
 pkgs/development/coq-modules/coq-elpi/default.nix      |  9 ++-------
 .../coq-modules/hierarchy-builder/default.nix          |  9 ++++-----
 pkgs/development/ocaml-modules/elpi/default.nix        | 18 +++++++++---------
 3 files changed, 15 insertions(+), 21 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix
index 0dd8817ab3f..333b89d0fad 100644
--- a/pkgs/development/coq-modules/coq-elpi/default.nix
+++ b/pkgs/development/coq-modules/coq-elpi/default.nix
@@ -1,15 +1,10 @@
 { stdenv, fetchFromGitHub, which, coq }:
 
 let params = {
-  "8.10" = rec {
-    version = "1.3.0";
-    rev = "v${version}";
-    sha256 = "1bbadh4qmsm0c5qw41apf4k8va6d44rpw294mc6pg556nmma87ra";
-  };
   "8.11" = rec {
-    version = "1.3.1";
+    version = "1.4.0";
     rev = "v${version}";
-    sha256 = "06dg0i1jay9anhx68jfki5qs2g481n3s4q3m124qniyadlx80bh3";
+    sha256 = "1pzmjgvvdwki59rfsha3c1ik4gii39j44ijyb9m9as1cyfpxx906";
   };
 };
   param = params.${coq.coq-version};
diff --git a/pkgs/development/coq-modules/hierarchy-builder/default.nix b/pkgs/development/coq-modules/hierarchy-builder/default.nix
index ee9c6cb75cf..ed14217d4f3 100644
--- a/pkgs/development/coq-modules/hierarchy-builder/default.nix
+++ b/pkgs/development/coq-modules/hierarchy-builder/default.nix
@@ -2,15 +2,14 @@
 
 let
   versions = {
-      "0.9.0" =  {
-        rev = "v0.9.0";
-        sha256 = "1yss9f732r7bjaswgn46vd1rr3688ir0vz37wxkmy598xhrnd2ak";
+      "0.9.1" =  {
+        rev = "v0.9.1";
+        sha256 = "00fibahkmvisr16ffaxfrc00gcijsv9rgk4v8ibmy1jv0iyk875b";
       };
   };
   version = x: versions.${x} // {version = x;};
   params = {
-   "8.10" = version "0.9.0";
-   "8.11" = version "0.9.0";
+   "8.11" = version "0.9.1";
   };
   param = params.${coq.coq-version};
 in
diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix
index 1c71f7fceb7..93e29d3d34a 100644
--- a/pkgs/development/ocaml-modules/elpi/default.nix
+++ b/pkgs/development/ocaml-modules/elpi/default.nix
@@ -1,17 +1,15 @@
-{ lib, fetchFromGitHub, buildDunePackage, camlp5
+{ lib, fetchzip, buildDunePackage, camlp5
 , ppx_tools_versioned, ppx_deriving, re
 }:
 
 buildDunePackage rec {
   pname = "elpi";
-  version = "1.10.2";
+  version = "1.11.2";
 
-  src = fetchFromGitHub {
-    owner = "LPCIC";
-    repo = "elpi";
-    rev = "v${version}";
-    sha256 = "0w5z0pxyshqawq7w5rw3nqii49y88rizvwqf202pl11xqi14icsn";
-  };
+   src = fetchzip {
+     url = "https://github.com/LPCIC/elpi/releases/download/v${version}/elpi-v${version}.tbz";
+     sha256 = "15hamy9ifr05kczadwh3yj2gmr12a9z1jwppmp5yrns0vykjbj76";
+   };
 
   minimumOCamlVersion = "4.04";
 
@@ -23,6 +21,8 @@ buildDunePackage rec {
     description = "Embeddable λProlog Interpreter";
     license = lib.licenses.lgpl21Plus;
     maintainers = [ lib.maintainers.vbgl ];
-    inherit (src.meta) homepage;
+    homepage = "https://github.com/LPCIC/elpi";
   };
+
+  useDune2 = true;
 }
-- 
cgit 1.4.1