mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Code Issues Wiki Activity

Merge pull request #4133 from vbgl/coq-8-3

Browse source 
Fixes coq-8.3: requires OCaml 3.12 and lablgtk 2.14
This commit is contained in:
roconnor 2014-09-20 16:24:10 -04:00
parent 1cbcd2baae 40e79043b0
commit bbd58db13a
3 changed files with 49 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
pkgs/development/ocaml-modules/lablgtk/2.14.0.nix Normal file
View file

@ -0,0 +1,37 @@
{stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk, libgnomecanvas, libglade, gtksourceview}:
let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
pname = "lablgtk";
version = "2.14.0";
in
stdenv.mkDerivation (rec {
name = "${pname}-${version}";
src = fetchurl {
url = "https://forge.ocamlcore.org/frs/download.php/561/${name}.tar.gz";
sha256 = "1fnh0amm7lwgyjdhmlqgsp62gwlar1140425yc1j6inwmgnsp0a9";
};
buildInputs = [ocaml findlib pkgconfig gtk libgnomecanvas libglade gtksourceview];
configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml_version}/site-lib";
buildFlags = "world";
preInstall = ''
mkdir -p $out/lib/ocaml/${ocaml_version}/site-lib
export OCAMLPATH=$out/lib/ocaml/${ocaml_version}/site-lib/:$OCAMLPATH
'';
meta = {
platforms = ocaml.meta.platforms;
maintainers = [
stdenv.lib.maintainers.z77z
stdenv.lib.maintainers.roconnor
];
homepage = http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgtk.html;
description = "LablGTK is is an Objective Caml interface to gtk+";
license = stdenv.lib.licenses.lgpl21Plus;
};
})

2
pkgs/development/ocaml-modules/lablgtk/default.nix
View file

@ -6,6 +6,8 @@ let
version = "2.16.0";
in
assert stdenv.lib.versionAtLeast ocaml_version "3.12";
stdenv.mkDerivation (rec {
name = "${pname}-${version}";
src = fetchurl {

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

@ -3390,6 +3390,9 @@ let
lablgl = callPackage ../development/ocaml-modules/lablgl { };
lablgtk_2_14 = callPackage ../development/ocaml-modules/lablgtk/2.14.0.nix {
inherit (gnome) libgnomecanvas libglade gtksourceview;
};
lablgtk = callPackage ../development/ocaml-modules/lablgtk {
inherit (gnome) libgnomecanvas libglade gtksourceview;
};
@ -3515,8 +3518,10 @@ let
};
ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0;
ocamlPackages_3_10_0 = mkOcamlPackages ocaml_3_10_0 pkgs.ocamlPackages_3_10_0;
ocamlPackages_3_11_2 = mkOcamlPackages ocaml_3_11_2 pkgs.ocamlPackages_3_11_2;
ocamlPackages_3_10_0 = (mkOcamlPackages ocaml_3_10_0 pkgs.ocamlPackages_3_10_0)
// { lablgtk = ocamlPackages_3_10_0.lablgtk_2_14; };
ocamlPackages_3_11_2 = (mkOcamlPackages ocaml_3_11_2 pkgs.ocamlPackages_3_11_2)
// { lablgtk = ocamlPackages_3_11_2.lablgtk_2_14; };
ocamlPackages_3_12_1 = mkOcamlPackages ocaml_3_12_1 pkgs.ocamlPackages_3_12_1;
ocamlPackages_4_00_1 = mkOcamlPackages ocaml_4_00_1 pkgs.ocamlPackages_4_00_1;
ocamlPackages_4_01_0 = mkOcamlPackages ocaml_4_01_0 pkgs.ocamlPackages_4_01_0;
@ -11299,8 +11304,9 @@ let
};
coq_8_3 = callPackage ../applications/science/logic/coq/8.3.nix {
inherit (ocamlPackages) findlib lablgtk;
camlp5 = ocamlPackages.camlp5_transitional;
inherit (ocamlPackages_3_12_1) ocaml findlib;
camlp5 = ocamlPackages_3_12_1.camlp5_transitional;
lablgtk = ocamlPackages_3_12_1.lablgtk_2_14;
};
cvc3 = callPackage ../applications/science/logic/cvc3 {};