From 3830862744aa34fdb73a4acb51e12b7ca110849a Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sun, 30 Jul 2006 18:29:23 +0000
Subject: [PATCH] add ncursesDiet, enable vimDiet, disable rpm

svn path=/nixpkgs/trunk/; revision=5994
---
 pkgs/top-level/all-packages.nix | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c19dd5619612..7e9d12da156b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1358,6 +1358,11 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  ncursesDiet = (import ../development/libraries/ncurses-diet) {
+    inherit fetchurl;
+    stdenv = overrideGCC stdenv dietgcc;
+  };
+
   fontconfig = import ../development/libraries/fontconfig {
     inherit fetchurl stdenv freetype expat;
   };
@@ -2028,9 +2033,9 @@ rec {
     };
   };
 
-  rpm = (import ../applications/package-management/rpm) {
-    inherit fetchurl stdenv python tcl readline file cpio beecrypt unzip neon gnupg libxml2 perl;
-  };
+  #rpm = (import ../applications/package-management/rpm) {
+  #  inherit fetchurl stdenv python tcl readline file cpio beecrypt unzip neon gnupg libxml2 perl;
+  #};
 
   cvs = (import ../applications/version-management/cvs) {
     inherit fetchurl stdenv vim;
@@ -2427,9 +2432,10 @@ rec {
     inherit fetchurl stdenv ncurses;
   };
 
-#  vimDiet = (import ../applications/editors/vim-diet) {
-#    inherit fetchurl stdenv ncurses dietgcc;
-#  };
+  vimDiet = (import ../applications/editors/vim-diet) {
+    inherit fetchurl stdenv dietgcc;
+    ncurses = ncursesDiet;
+  };
 
   nedit = import ../applications/editors/nedit {
     inherit fetchurl stdenv x11;