Merge branch 'master' into staging

7 files changed, 53 insertions, 100 deletions

diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix
index 0e43972fab6a..e9de202a8092 100644
--- a/pkgs/applications/version-management/cvs/default.nix
+++ b/pkgs/applications/version-management/cvs/default.nix
@@ -11,9 +11,6 @@ stdenv.mkDerivation {
   patches = [ ./getcwd-chroot.patch ];
 
   preConfigure = ''
-    # Fix location of info and man directories.
-    configureFlags="--infodir=$out/share/info --mandir=$out/share/man"
-
     # Apply the Debian patches.
     for p in "debian/patches/"*; do
       echo "applying \`$p' ..."
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 0557b8a2c55e..d69291293204 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, python, makeWrapper, docutils, unzip, hg-git, dulwich
-, guiSupport ? false, tk ? null, hg-crecord ? null, curses
+, guiSupport ? false, tk ? null, curses
 , ApplicationServices, cf-private }:
 
 let
@@ -37,13 +37,6 @@ stdenv.mkDerivation {
       WRAP_TK=" --set TK_LIBRARY \"${tk}/lib/${tk.libPrefix}\"
                 --set HG \"$out/bin/hg\"
                 --prefix PATH : \"${tk}/bin\" "
-    '') + (stdenv.lib.optionalString (hg-crecord != null)
-    ''
-      mkdir -p $out/etc/mercurial
-      cat >> $out/etc/mercurial/hgrc << EOF
-      [extensions]
-      crecord=${hg-crecord}/${python.sitePackages}/crecord
-      EOF
     '') +
     ''
       for i in $(cd $out/bin && ls); do
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/applications/version-management/monotone-viz/mtn-head.nix b/pkgs/applications/version-management/monotone-viz/mtn-head.nix
deleted file mode 100644
index eb75b45128e3..000000000000
--- a/pkgs/applications/version-management/monotone-viz/mtn-head.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-args @ { graphviz, pkgconfig, autoconf, automake, libtool, glib, gtk, ... }: with args;
-rec {
-  srcDrv = fetchmtn {
-    name = "monotone-viz-mtn-checkout";
-    dbs = ["monotone.mtn-host.prjek.net"];
-    selector = "c3fdb3af1c7c89989c7da8062bb62203f2aaccf0";
-    branch = "net.venge.monotone-viz.new-stdio";
-    sha256 = "661c6a49d442b7e5a7ba455bb9a892e7e12b3968c2ddd69375e7bd0cd0b3ecb9";
-  };
-  src = srcDrv + "/";
-
-  buildInputs = [ocaml lablgtk libgnomecanvas gtk graphviz glib
-    pkgconfig autoconf automake libtool];
-  configureFlags = ["--with-lablgtk-dir=$(echo ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2)"];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["doAutoconf" "doPatch" "doConfigure" "doMakeInstall"];
-
-  doAutoconf = fullDepEntry(''
-    aclocal -I .
-    autoconf -I .
-  '') ["minInit" "addInputs" "doUnpack"];
-
-  name = "monotone-viz-mtn-head";
-  meta = {
-    description = "Monotone commit tree visualizer";
-    maintainers = [args.lib.maintainers.raskin];
-  };
-  passthru = {
-    inherit srcDrv;
-  };
-}
-
diff --git a/pkgs/applications/version-management/mr/default.nix b/pkgs/applications/version-management/mr/default.nix
index 68bef621bc28..551a5795d11b 100644
--- a/pkgs/applications/version-management/mr/default.nix
+++ b/pkgs/applications/version-management/mr/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  version = "1.20150503";
+  version = "1.20160123";
   name = "mr-${version}";
 
   src = fetchurl {
     url = "https://github.com/joeyh/myrepos/archive/${version}.tar.gz";
-    sha256 = "12cf8kmn13446rszmah5wws5p2k2gjp6y4505sy1r14qnahf4qbf";
+    sha256 = "1723cg5haplz2w9dwdzp6ds1ip33cx3awmj4wnb0h4yq171v5lqk";
   };
 
   buildInputs = [ perl ];
diff --git a/pkgs/applications/version-management/tailor/default.nix b/pkgs/applications/version-management/tailor/default.nix
index 5164ed6a9b44..ebc0906fc6bb 100644
--- a/pkgs/applications/version-management/tailor/default.nix
+++ b/pkgs/applications/version-management/tailor/default.nix
@@ -1,6 +1,9 @@
-args @ { makeWrapper, python, ... }: with args;
-let version = if args ? version then args.version else "0.9.35"; in
-rec {
+{ stdenv, fetchurl, pythonPackages }:
+
+pythonPackages.buildPythonPackage rec {
+  name = "tailor-${version}";
+  version = "0.9.35";
+
   src = fetchurl {
     urls = [
       "http://darcs.arstecnica.it/tailor/tailor-${version}.tar.gz"
@@ -9,13 +12,6 @@ rec {
     sha256 = "061acapxxn5ab3ipb5nd3nm8pk2xj67bi83jrfd6lqq3273fmdjh";
   };
 
-  buildInputs = [python makeWrapper];
-  configureFlags = [];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["installPythonPackage" "wrapBinContentsPython"];
-
-  name = "tailor-" + version;
   meta = {
     description = "Version control tools integration tool";
   };
diff --git a/pkgs/applications/version-management/viewmtn/0.10.nix b/pkgs/applications/version-management/viewmtn/0.10.nix
deleted file mode 100644
index be8cc83c3008..000000000000
--- a/pkgs/applications/version-management/viewmtn/0.10.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-args @ { monotone, cheetahTemplate, highlight, ctags, makeWrapper, graphviz, which, python, ... }: with args;
-rec {
-  src = fetchurl {
-    url = http://viewmtn.1erlei.de/downloads/viewmtn-0.10.tgz;
-    sha256 = "1c6y708xaf6pds1r6l00q7vpgfagfbnf95kqj168vw3xr3l8a4yx";
-  };
-
-  buildInputs = [python flup highlight monotone 
-    cheetahTemplate makeWrapper graphviz which];
-  configureFlags = [];
-  makeFlags = ["PREFIX=$out"];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["doInstall" 
-    (doPatchShebangs "$out/bin")
-    (makeManyWrappers "$out/bin/*" 
-      (pythonWrapperArguments + preservePathWrapperArguments)) 
-  ];
-      
-  doInstall = fullDepEntry (''
-    for i in dot mtn highlight; do 
-        sed -e "s@/usr/bin/$i@$(which $i)@" -i config.py.example
-    done
-    sed -e "s@'templates/'@'$out/share/viewmtn/templates/'@" -i config.py.example
-
-    fullOut=$(toPythonPath $out)
-    
-    mkdir -p $fullOut
-    mkdir -p $out/bin
-    mkdir -p $out/share/viewmtn
-    
-    cp -r * $fullOut
-    cp $fullOut/viewmtn.py $out/bin
-    
-    ln -s $fullOut/{AUTHORS,ChangeLog,INSTALL,LICENSE,README,TODO,config.py.example} $out/share/viewmtn
-    ln -s $fullOut/templates $out/share/viewmtn/
-    ln -s $fullOut/static $out/share/viewmtn/
-  '') ["minInit" "defEnsureDir" "addInputs" "doUnpack"];
-
-  name = "viewmtn-0.10";
-  meta = {
-    description = "Monotone web interface";
-  };
-}