MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 15:56:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #32538 from vbgl/ott-0.27

Browse source 
ott: 0.25 -> 0.27
This commit is contained in:
Pascal Wittmann 2017-12-14 09:07:46 +01:00 committed by GitHub
commit aacf756ed0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgs/applications/science/logic/ott/default.nix
View file

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

2
pkgs/top-level/all-packages.nix
View file

@ -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 {};

4
pkgs/top-level/ocaml-packages.nix
View file

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