alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

monotoneViz: refactor out of ocamlPackages

Browse source
This commit is contained in:
Vincent Laporte 2019-10-23 15:54:12 +00:00 committed by Vincent Laporte
parent 53feebb379
commit 7e51c79f17
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/version-management/monotone-viz/default.nix
View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, ocaml, lablgtk, libgnomecanvas, camlp4, glib, pkgconfig, makeWrapper
{ stdenv, fetchurl, ocamlPackages, gnome2, pkgconfig, makeWrapper
, libtool, libpng, yacc, expat, fontconfig, gd, pango, libjpeg, libwebp, xlibsWrapper, libXaw
}:
# We need an old version of Graphviz for format compatibility reasons.
@ -7,6 +7,8 @@ let graphviz_2_0 = import ./graphviz-2.0.nix {
inherit stdenv fetchurl pkgconfig xlibsWrapper libpng libjpeg expat libXaw
yacc libtool fontconfig pango gd libwebp;
}; in
let inherit (gnome2) libgnomecanvas glib; in
let inherit (ocamlPackages) ocaml lablgtk camlp4; in
stdenv.mkDerivation rec {
version = "1.0.2";
pname = "monotone-viz";

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

@ -19758,7 +19758,9 @@ in
lua = lua5;
};
inherit (ocaml-ng.ocamlPackages_4_01_0) monotoneViz;
monotoneViz = callPackage ../applications/version-management/monotone-viz {
ocamlPackages = ocaml-ng.ocamlPackages_4_01_0;
};
moolticute = libsForQt5.callPackage ../applications/misc/moolticute { };

5
pkgs/top-level/ocaml-packages.nix
View file

@ -1117,11 +1117,6 @@ let
google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { };
monotoneViz = callPackage ../applications/version-management/monotone-viz {
inherit (pkgs.gnome2) libgnomecanvas glib;
};
unison = callPackage ../applications/networking/sync/unison {
enableX11 = config.unison.enableX11 or true;
};