colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ocamlPackages.cairo2: 0.4.6 -> 0.5

Browse Source
This commit is contained in:
Vincent Laporte 2017-12-09 08:38:50 +00:00 committed by Vincent Laporte
parent 79ba686371
commit 12c5fe3e2d
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/science/logic/acgtk/default.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation {
}; };
buildInputs = with ocamlPackages; [ buildInputs = with ocamlPackages; [
ocaml findlib camlp4 ansiterminal biniou bolt ocaml_cairo2 dypgen easy-format ocf yojson ocaml findlib camlp4 ansiterminal biniou bolt cairo2 dypgen easy-format ocf yojson
]; ];
patches = [ ./install-emacs-to-site-lisp.patch patches = [ ./install-emacs-to-site-lisp.patch

11
pkgs/development/ocaml-modules/ocaml-cairo2/default.nix → pkgs/development/ocaml-modules/cairo2/default.nix
View File

@ -6,17 +6,16 @@
let let
inherit (stdenv.lib) optionals; inherit (stdenv.lib) optionals;
pname = "ocaml-cairo2"; version = "0.5";
version = "0.4.6";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "${pname}-${version}"; name = "ocaml${ocaml.version}-cairo2-${version}";
src = fetchurl { src = fetchurl {
url = "http://forge.ocamlcore.org/frs/download.php/1279/cairo2-0.4.6.tar.gz"; url = "https://github.com/Chris00/ocaml-cairo/releases/download/${version}/cairo2-${version}.tar.gz";
sha256 = "1lc1iv5yz49avbc0wbrw9nrx8dn0c35r7cykivjln1zc2fwscf7w"; sha256 = "1559df74rzh4v7c9hr6phymq1f5121s83q0xy3r83x4apj74dchj";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
@ -39,7 +38,7 @@ stdenv.mkDerivation {
installPhase = "ocaml setup.ml -install"; installPhase = "ocaml setup.ml -install";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://forge.ocamlcore.org/projects/cairo; homepage = "https://github.com/Chris00/ocaml-cairo";
description = "Binding to Cairo, a 2D Vector Graphics Library"; description = "Binding to Cairo, a 2D Vector Graphics Library";
longDescription = '' longDescription = ''
This is a binding to Cairo, a 2D graphics library with support for This is a binding to Cairo, a 2D graphics library with support for

2
pkgs/top-level/ocaml-packages.nix
View File

@ -128,7 +128,7 @@ let
ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { }; ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { };
ocaml_cairo2 = callPackage ../development/ocaml-modules/ocaml-cairo2 { }; cairo2 = callPackage ../development/ocaml-modules/cairo2 { };
cil = callPackage ../development/ocaml-modules/cil { }; cil = callPackage ../development/ocaml-modules/cil { };