Adding fetchmtn, including fetchmtn and fetchgit in builder-defs, updating monotone-viz. Adding dadadodo.
svn path=/nixpkgs/trunk/; revision=16207
This commit is contained in:
parent
e9dddc50ab
commit
9da29ccf73
@ -158,7 +158,8 @@ let
|
|||||||
else x);
|
else x);
|
||||||
|
|
||||||
builderDefs = composedArgsAndFun (import ../build-support/builder-defs/builder-defs.nix) {
|
builderDefs = composedArgsAndFun (import ../build-support/builder-defs/builder-defs.nix) {
|
||||||
inherit stringsWithDeps lib stdenv writeScript fetchurl;
|
inherit stringsWithDeps lib stdenv writeScript
|
||||||
|
fetchurl fetchmtn fetchgit;
|
||||||
};
|
};
|
||||||
|
|
||||||
composedArgsAndFun = lib.composedArgsAndFun;
|
composedArgsAndFun = lib.composedArgsAndFun;
|
||||||
@ -254,6 +255,12 @@ let
|
|||||||
inherit stdenv git;
|
inherit stdenv git;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
fetchmtn = import ../build-support/fetchmtn {
|
||||||
|
inherit monotone stdenv;
|
||||||
|
cacheDB = getConfig ["fetchmtn" "cacheDB"] "";
|
||||||
|
defaultDBMirrors = getConfig ["fetchmtn" "defaultDBMirrors"] [];
|
||||||
|
};
|
||||||
|
|
||||||
fetchsvn = import ../build-support/fetchsvn {
|
fetchsvn = import ../build-support/fetchsvn {
|
||||||
inherit stdenv subversion openssh;
|
inherit stdenv subversion openssh;
|
||||||
sshSupport = true;
|
sshSupport = true;
|
||||||
@ -569,6 +576,9 @@ let
|
|||||||
inherit (gtkLibs) glib;
|
inherit (gtkLibs) glib;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
dadadodo = builderDefsPackage (import ../tools/text/dadadodo) {
|
||||||
|
};
|
||||||
|
|
||||||
dar = import ../tools/archivers/dar {
|
dar = import ../tools/archivers/dar {
|
||||||
inherit fetchurl stdenv zlib bzip2 openssl;
|
inherit fetchurl stdenv zlib bzip2 openssl;
|
||||||
};
|
};
|
||||||
@ -2036,8 +2046,8 @@ let
|
|||||||
lua = lua5;
|
lua = lua5;
|
||||||
};
|
};
|
||||||
|
|
||||||
monotoneViz = builderDefsPackage (selectVersion ../applications/version-management/monotone-viz "1.0.1") {
|
monotoneViz = builderDefsPackage (selectVersion ../applications/version-management/monotone-viz "mtn-head") {
|
||||||
inherit ocaml lablgtk graphviz pkgconfig;
|
inherit ocaml lablgtk graphviz pkgconfig autoconf automake libtool;
|
||||||
inherit (gnome) gtk libgnomecanvas glib;
|
inherit (gnome) gtk libgnomecanvas glib;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user