Merge pull request #32538 from vbgl/ott-0.27

ott: 0.25 -> 0.27

pkgs/applications/science/logic/ott/default.nix

@@ -1,18 +1,18 @@
-# - coqide compilation can be disabled by setting lablgtk to null;
-
-{stdenv, fetchurl, pkgconfig, ocaml, camlp5}:
+{ stdenv, fetchFromGitHub, pkgconfig, ocaml }:
 
 stdenv.mkDerivation rec {
   name = "ott-${version}";
-  version = "0.25";
+  version = "0.27";
 
-  src = fetchurl {
-    url = "http://www.cl.cam.ac.uk/~pes20/ott/ott_distro_${version}.tar.gz";
-    sha256 = "0i8ad1yrz9nrrgpi8db4z0aii5s0sy35mmzdfw5nq183mvbx8qqd";
+  src = fetchFromGitHub {
+    owner = "ott-lang";
+    repo = "ott";
+    rev = version;
+    sha256 = "12hzpyinswqaxwp6y793h7ywrv6289cw4911ah2yzq04ji095pfb";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ ocaml camlp5 ];
+  buildInputs = [ ocaml ];
 
   installPhase = ''
     mkdir -p $out/bin
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     ln -s $out/bin/ott.opt $out/bin/ott
 
     mkdir -p $out/share/emacs/site-lisp
-    cp emacs/ottmode.el $out/share/emacs/site-lisp
+    cp emacs/ott-mode.el $out/share/emacs/site-lisp
     '';
 
   meta = {

pkgs/top-level/all-packages.nix

@@ -18943,7 +18943,7 @@ with pkgs;
 
   opensmt = callPackage ../applications/science/logic/opensmt { };
 
-  inherit (ocamlPackages) ott;
+  ott = callPackage ../applications/science/logic/ott { };
 
   otter = callPackage ../applications/science/logic/otter {};
 

pkgs/top-level/ocaml-packages.nix

@@ -970,10 +970,6 @@ let
 
     matita_130312 = callPackage ../applications/science/logic/matita/130312.nix { };
 
-    ott = callPackage ../applications/science/logic/ott {
-      camlp5 = camlp5_transitional;
-    };
-
   };
     in (ocamlPackages.janeStreet // ocamlPackages);
     in lib.fix' (lib.extends overrides packageSet);