From 0d1a188c5d5846e215a097af5214812be472f838 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 4 Feb 2016 20:13:49 +0100 Subject: [PATCH] Re-add Monotone-Viz with Fedora as a source --- .../monotone-viz/default.nix | 44 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +++ 2 files changed, 49 insertions(+) create mode 100644 pkgs/applications/version-management/monotone-viz/default.nix diff --git a/pkgs/applications/version-management/monotone-viz/default.nix b/pkgs/applications/version-management/monotone-viz/default.nix new file mode 100644 index 000000000000..154d6442a2f2 --- /dev/null +++ b/pkgs/applications/version-management/monotone-viz/default.nix @@ -0,0 +1,44 @@ +{stdenv, fetchurl, ocaml, lablgtk, libgnomecanvas, camlp4, glib, pkgconfig, graphviz_2_0, makeWrapper}: +stdenv.mkDerivation rec { + version = "1.0.2"; + name = "monotone-viz-${version}"; + + buildInputs = [ocaml lablgtk libgnomecanvas glib pkgconfig graphviz_2_0 makeWrapper]; + src = fetchurl { + url = "http://oandrieu.nerim.net/monotone-viz/${name}-nolablgtk.tar.gz"; + sha256 = "1l5x4xqz5g1aaqbc1x80mg0yzkiah9ma9k9mivmn08alkjlakkdk"; + }; + + prePatch="ln -s . a; ln -s . b"; + patchFlags = ["-p0"]; + patches = [ + (fetchurl { + url = "http://pkgs.fedoraproject.org/cgit/rpms/monotone-viz.git/plain/monotone-viz-1.0.2-dot.patch"; + sha256 = "0risfy8iqmkr209hmnvpv57ywbd3rvchzzd0jy2lfyqrrrm6zknw"; + }) + (fetchurl { + url = "http://pkgs.fedoraproject.org/cgit/rpms/monotone-viz.git/plain/monotone-viz-1.0.2-new-stdio.patch"; + sha256 = "16bj0ppzqd45an154dr7sifjra7lv4m9anxfw3c56y763jq7fafa"; + }) + (fetchurl { + url = "http://pkgs.fedoraproject.org/cgit/rpms/monotone-viz.git/plain/monotone-viz-1.0.2-typefix.patch"; + sha256 = "1gfp82rc7pawb5x4hh2wf7xh1l1l54ib75930xgd1y437la4703r"; + }) + ]; + + preConfigure = '' + configureFlags="$configureFlags --with-lablgtk-dir=$(echo ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2)" + ''; + + postInstall = '' + wrapProgram "$out/bin/monotone-viz" --prefix PATH : "${graphviz_2_0}/bin/" + ''; + + meta = { + inherit version; + description = ''Monotone ancestry visualiser''; + license = stdenv.lib.licenses.gpl2Plus ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 17cd638ada6f..b944b9128b85 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12675,6 +12675,11 @@ let lua = lua5; }; + monotoneViz = callPackage ../applications/version-management/monotone-viz { + inherit (ocamlPackages_4_01_0) lablgtk ocaml camlp4; + inherit (gnome) libgnomecanvas glib; + }; + mopidy = callPackage ../applications/audio/mopidy { }; mopidy-gmusic = callPackage ../applications/audio/mopidy-gmusic { };