ocamlPackages.cairo2: 0.4.6 -> 0.5

NixOS · Dec 16, 2017 · 12c5fe3 · 12c5fe3
1 parent 79ba686
commit 12c5fe3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/pkgs/applications/science/logic/acgtk/default.nix b/pkgs/applications/science/logic/acgtk/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   };
 
   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

diff --git a/...nt/ocaml-modules/ocaml-cairo2/default.nix → ...elopment/ocaml-modules/cairo2/default.nix b/...nt/ocaml-modules/ocaml-cairo2/default.nix → ...elopment/ocaml-modules/cairo2/default.nix
@@ -6,17 +6,16 @@
 
 let
   inherit (stdenv.lib) optionals;
-  pname = "ocaml-cairo2";
-  version = "0.4.6";
+  version = "0.5";
 in
 
 stdenv.mkDerivation {
 
-  name = "${pname}-${version}";
+  name = "ocaml${ocaml.version}-cairo2-${version}";
 
   src = fetchurl {
-    url = "http://forge.ocamlcore.org/frs/download.php/1279/cairo2-0.4.6.tar.gz";
-    sha256 = "1lc1iv5yz49avbc0wbrw9nrx8dn0c35r7cykivjln1zc2fwscf7w";
+    url = "https://github.com/Chris00/ocaml-cairo/releases/download/${version}/cairo2-${version}.tar.gz";
+    sha256 = "1559df74rzh4v7c9hr6phymq1f5121s83q0xy3r83x4apj74dchj";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -39,7 +38,7 @@ stdenv.mkDerivation {
   installPhase = "ocaml setup.ml -install";
 
   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";
     longDescription = ''
       This is a binding to Cairo, a 2D graphics library with support for

diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
@@ -128,7 +128,7 @@ let
 
     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 { };