diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-06-30 13:44:37 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-06-30 13:44:37 +0000 |
commit | 16f676d6bbd4f930b0017ccb20cebe5a29e17545 (patch) | |
tree | 0d554b4f16bdef502035b743457fc29ffcc5e7f7 /nixpkgs/pkgs/development/ocaml-modules/ocamlgraph/default.nix | |
parent | e7caacc4c122b7641bb66a4c2595289347a4996c (diff) | |
parent | 3a8d7958a610cd3fec3a6f424480f91a1b259185 (diff) | |
download | nixlib-16f676d6bbd4f930b0017ccb20cebe5a29e17545.tar nixlib-16f676d6bbd4f930b0017ccb20cebe5a29e17545.tar.gz nixlib-16f676d6bbd4f930b0017ccb20cebe5a29e17545.tar.bz2 nixlib-16f676d6bbd4f930b0017ccb20cebe5a29e17545.tar.lz nixlib-16f676d6bbd4f930b0017ccb20cebe5a29e17545.tar.xz nixlib-16f676d6bbd4f930b0017ccb20cebe5a29e17545.tar.zst nixlib-16f676d6bbd4f930b0017ccb20cebe5a29e17545.zip |
Merge commit '3a8d7958a610cd3fec3a6f424480f91a1b259185'
Diffstat (limited to 'nixpkgs/pkgs/development/ocaml-modules/ocamlgraph/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/ocaml-modules/ocamlgraph/default.nix | 45 |
1 files changed, 16 insertions, 29 deletions
diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocamlgraph/default.nix index 5ae4f6ad3fa7..a7815d951cd3 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ocamlgraph/default.nix +++ b/nixpkgs/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 ]; }; } |