diff options
author | Andres Löh <mail@andres-loeh.de> | 2009-12-29 11:57:27 +0000 |
---|---|---|
committer | Andres Löh <mail@andres-loeh.de> | 2009-12-29 11:57:27 +0000 |
commit | 3886310b7b663c2789c0a46d310f652ee909390f (patch) | |
tree | 19eadd7873b592ad41eb656779e7463333cf7212 /pkgs/top-level | |
parent | d993cf0f5f8bb1ace728fed24ecc8d5c7aa308d6 (diff) | |
download | nixlib-3886310b7b663c2789c0a46d310f652ee909390f.tar nixlib-3886310b7b663c2789c0a46d310f652ee909390f.tar.gz nixlib-3886310b7b663c2789c0a46d310f652ee909390f.tar.bz2 nixlib-3886310b7b663c2789c0a46d310f652ee909390f.tar.lz nixlib-3886310b7b663c2789c0a46d310f652ee909390f.tar.xz nixlib-3886310b7b663c2789c0a46d310f652ee909390f.tar.zst nixlib-3886310b7b663c2789c0a46d310f652ee909390f.zip |
Moved monotone packages to a more appropriate position within all-packages.nix
svn path=/nixpkgs/trunk/; revision=19144
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f90f0318a39..614412ee384b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2096,23 +2096,6 @@ let inherit stdenv perl; }; - monotone = import ../applications/version-management/monotone { - inherit stdenv fetchurl boost zlib botan libidn pcre - sqlite lib perl; - lua = lua5; - }; - - monotoneViz = builderDefsPackage (import ../applications/version-management/monotone-viz/mtn-head.nix) { - inherit ocaml lablgtk graphviz pkgconfig autoconf automake libtool; - inherit (gnome) gtk libgnomecanvas glib; - }; - - viewMtn = builderDefsPackage (import ../applications/version-management/viewmtn/0.10.nix) - { - inherit monotone flup cheetahTemplate highlight ctags - makeWrapper graphviz which python; - }; - neko = import ../development/compilers/neko { inherit sourceFromHead fetchurl stdenv lib pkgconfig composableDerivation boehmgc apacheHttpd mysql zlib sqlite pcre apr makeWrapper; @@ -7145,6 +7128,17 @@ let gtksharp = gtksharp1; }; + monotone = import ../applications/version-management/monotone { + inherit stdenv fetchurl boost zlib botan libidn pcre + sqlite lib perl; + lua = lua5; + }; + + monotoneViz = builderDefsPackage (import ../applications/version-management/monotone-viz/mtn-head.nix) { + inherit ocaml lablgtk graphviz pkgconfig autoconf automake libtool; + inherit (gnome) gtk libgnomecanvas glib; + }; + mozilla = import ../applications/networking/browsers/mozilla { inherit fetchurl pkgconfig stdenv perl zip; inherit (gtkLibs) gtk; @@ -7587,6 +7581,12 @@ let qt = qt3; }; + viewMtn = builderDefsPackage (import ../applications/version-management/viewmtn/0.10.nix) + { + inherit monotone flup cheetahTemplate highlight ctags + makeWrapper graphviz which python; + }; + vim = import ../applications/editors/vim { inherit fetchurl stdenv ncurses lib; }; |