diff options
author | superherointj <5861043+superherointj@users.noreply.github.com> | 2021-06-24 03:26:49 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-24 08:26:49 +0200 |
commit | 955df801e838248711ff44c1a5e7b06e5e2836fd (patch) | |
tree | 0be3c3f49aaa99a437aa10b9dd9178123beeaf0b /pkgs/development/ocaml-modules | |
parent | 65db0350fe3962c41b8604046ec9166976f80793 (diff) | |
download | nixlib-955df801e838248711ff44c1a5e7b06e5e2836fd.tar nixlib-955df801e838248711ff44c1a5e7b06e5e2836fd.tar.gz nixlib-955df801e838248711ff44c1a5e7b06e5e2836fd.tar.bz2 nixlib-955df801e838248711ff44c1a5e7b06e5e2836fd.tar.lz nixlib-955df801e838248711ff44c1a5e7b06e5e2836fd.tar.xz nixlib-955df801e838248711ff44c1a5e7b06e5e2836fd.tar.zst nixlib-955df801e838248711ff44c1a5e7b06e5e2836fd.zip |
ocamlPackages.ocamlgraph: 1.8.8 -> 2.0.0 (#126703)
ocamlPackages.ocamlgraph: 1.8.8 -> 2.0.0 ocamlPackages.ocamlgraph_gtk: init 2.0.0 framac: fix for ocamlgraph 2.0.0
Diffstat (limited to 'pkgs/development/ocaml-modules')
-rw-r--r-- | pkgs/development/ocaml-modules/ocamlgraph/default.nix | 45 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/ocamlgraph/gtk.nix | 12 |
2 files changed, 28 insertions, 29 deletions
diff --git a/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/pkgs/development/ocaml-modules/ocamlgraph/default.nix index 5ae4f6ad3fa7..a7815d951cd3 100644 --- a/pkgs/development/ocaml-modules/ocamlgraph/default.nix +++ b/pkgs/development/ocaml-modules/ocamlgraph/default.nix @@ -1,39 +1,26 @@ -{ stdenv, lib, fetchurl, ocaml, findlib -, gtkSupport ? true -, lablgtk -}: +{ lib, fetchurl, buildDunePackage, stdlib-shims }: -stdenv.mkDerivation rec { +buildDunePackage rec { pname = "ocamlgraph"; - version = "1.8.8"; + version = "2.0.0"; src = fetchurl { - url = "http://ocamlgraph.lri.fr/download/ocamlgraph-${version}.tar.gz"; - sha256 = "0m9g16wrrr86gw4fz2fazrh8nkqms0n863w7ndcvrmyafgxvxsnr"; + url = "https://github.com/backtracking/ocamlgraph/releases/download/${version}/ocamlgraph-${version}.tbz"; + sha256 = "029692bvdz3hxpva9a2jg5w5381fkcw55ysdi8424lyyjxvjdzi0"; }; - buildInputs = [ ocaml findlib ] - ++ lib.optional gtkSupport lablgtk - ; + minimalOCamlVersion = "4.03"; + useDune2 = true; - createFindlibDestdir = true; + propagatedBuildInputs = [ + stdlib-shims + ]; - buildFlags = [ "all" ]; - installTargets = [ "install-findlib" ]; - - postInstall = lib.optionalString gtkSupport '' - mkdir -p $out/bin - cp dgraph/dgraph.opt $out/bin/graph-viewer - cp editor/editor.opt $out/bin/graph-editor - ''; - - meta = { - homepage = "http://ocamlgraph.lri.fr/"; - description = "Graph library for Objective Caml"; - license = lib.licenses.gpl2Oss; - platforms = ocaml.meta.platforms or []; - maintainers = [ - lib.maintainers.kkallio - ]; + meta = with lib; { + homepage = "http://ocamlgraph.lri.fr/"; + downloadPage = "https://github.com/backtracking/ocamlgraph"; + description = "Graph library for OCaml"; + license = licenses.gpl2Oss; + maintainers = with maintainers; [ kkallio superherointj ]; }; } diff --git a/pkgs/development/ocaml-modules/ocamlgraph/gtk.nix b/pkgs/development/ocaml-modules/ocamlgraph/gtk.nix new file mode 100644 index 000000000000..1aa438ffa448 --- /dev/null +++ b/pkgs/development/ocaml-modules/ocamlgraph/gtk.nix @@ -0,0 +1,12 @@ +{ buildDunePackage, lablgtk, ocamlgraph, stdlib-shims, ... }: + +buildDunePackage rec { + pname = "ocamlgraph_gtk"; + inherit (ocamlgraph) version src useDune2 meta; + + propagatedBuildInputs = [ + lablgtk + ocamlgraph + stdlib-shims + ]; +} |