diff options
Diffstat (limited to 'pkgs/applications/version-management')
3 files changed, 42 insertions, 6 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 3cdf200d581..76a8015cb15 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { - name = "git-1.7.1"; + name = "git-1.7.2.1"; src = fetchurl { url = "mirror://kernel/software/scm/git/${name}.tar.bz2"; - sha256 = "bcf008ec9639480a3ebfdc4708743b6c0978a8bd3103a2dda587ea9473b9dde2"; + sha256 = "5446b4ece3b8d81b1fcbcd6c4b91f1961b6f4047a3f6173e3200bee368724921"; }; patches = [ ./docbook2texi.patch ]; diff --git a/pkgs/applications/version-management/monotone-viz/graphviz.patch b/pkgs/applications/version-management/monotone-viz/graphviz.patch new file mode 100644 index 00000000000..e1f9bfc5f7f --- /dev/null +++ b/pkgs/applications/version-management/monotone-viz/graphviz.patch @@ -0,0 +1,34 @@ +# patch "agraph.ml" +# from [8ae6c9bb70bbf9fd80e4e62d9f162ac581619b9e] +# to [05aa88921481ac9bfe238daeb4374fbc9993caaa] +# +============================================================ +--- a/agraph.ml 8ae6c9bb70bbf9fd80e4e62d9f162ac581619b9e ++++ b/agraph.ml 05aa88921481ac9bfe238daeb4374fbc9993caaa +@@ -50,8 +50,9 @@ let dot_format params agraph = + agraph.nodes in + + !+ "digraph \"monotone-viz\"\n{\n" ; +- if params.lr_layout then +- !+ " graph [rankdir=LR] ;\n" ; ++ if params.lr_layout ++ then !+ " graph [rankdir=LR] ;\n" ++ else !+ " graph [rankdir=BT] ;\n" ; + !+ " graph [ranksep=\"0.25\"] ;\n" ; + !+ " node [label=\"\"] ;\n" ; + +@@ -222,11 +223,11 @@ let spawn_dot graph status done_cb = + let dot_prg = graph.layout_params.dot_program in + let cmd = + if Viz_misc.debug "dot" +- then [ "/bin/sh" ; "-c" ; ++ then [ "/bin/sh" ; "-c" ; + Printf.sprintf + "set -o pipefail ; \ +- tee agraph.in.dot | %s -q -y -s%.0f | tee agraph.out.dot" dot_prg ppi ] +- else [ dot_prg ; "-q" ; "-y" ; Printf.sprintf "-s%.0f" ppi ] in ++ tee agraph.in.dot | %s -q -s%.0f | tee agraph.out.dot" dot_prg ppi ] ++ else [ dot_prg ; "-q" ; Printf.sprintf "-s%.0f" ppi ] in + let error fmt = + Printf.kprintf (fun s -> done_cb (`LAYOUT_ERROR s)) fmt in + try diff --git a/pkgs/applications/version-management/monotone-viz/mtn-head.nix b/pkgs/applications/version-management/monotone-viz/mtn-head.nix index eb5228e09fd..9d9eb3a55bc 100644 --- a/pkgs/applications/version-management/monotone-viz/mtn-head.nix +++ b/pkgs/applications/version-management/monotone-viz/mtn-head.nix @@ -3,9 +3,9 @@ rec { src = fetchmtn { name = "monotone-viz-mtn-checkout"; dbs = ["monotone.ca"]; - selector = "0e9194c89eb87e62ac7d54c7b88b10b94b07fa41"; - branch = "net.venge.monotone-viz.automate"; - sha256 = "d7980c9729b0a58f0dd27768b8eae46b45462fe72a88534b8aa159d889b4d624"; + selector = "b34ff2e695b53c2d73d533a3ffa7cb081b48eefb"; + branch = "net.venge.monotone-viz.new-stdio"; + sha256 = "06263564bc111d865b50b4a9587a86f8d97fff47625a3c1cb98d90b79faf7889"; } + "/"; buildInputs = [ocaml lablgtk libgnomecanvas gtk graphviz glib @@ -13,12 +13,14 @@ rec { configureFlags = ["--with-lablgtk-dir=${lablgtk}/lib/ocaml/lablgtk2"]; /* doConfigure should be specified separately */ - phaseNames = ["doAutoconf" "doConfigure" "doMakeInstall"]; + phaseNames = ["doAutoconf" "doPatch" "doConfigure" "doMakeInstall"]; doAutoconf = fullDepEntry('' aclocal -I . autoconf -I . '') ["minInit" "addInputs" "doUnpack"]; + + patches = [ ./graphviz.patch ]; name = "monotone-viz-mtn-head"; meta = { |