Author: raskin
Date: Sat Aug 7 12:46:18 2010
New Revision: 23023
URL: https://svn.nixos.org/websvn/nix/?rev=23023&sc=1
Log:
A lot of compatibility updates. Also, add fossil and ppp
Modified:
configurations/trunk/misc/raskin/custom-vim.nix
configurations/trunk/misc/raskin/package-groups.nix
configurations/trunk/misc/raskin/raskin.nix
configurations/trunk/misc/raskin/xserver-ati-wxga.nix
Modified: configurations/trunk/misc/raskin/custom-vim.nix
==============================================================================
--- configurations/trunk/misc/raskin/custom-vim.nix Sat Aug 7 11:38:03
2010 (r23022)
+++ configurations/trunk/misc/raskin/custom-vim.nix Sat Aug 7 12:46:18
2010 (r23023)
@@ -1,19 +1,32 @@
pkgs: with pkgs;
-vimHugeX.override {
+vimHugeX.merge rec {
+ name = "vim-huge-all";
+ features = "huge";
inherit gmp mpfr perl
ruby pltScheme gettext;
- eclSupport = true;
- ecl = ecl.passthru.function {
+ ecl = pkgs.ecl.passthru.function {
noUnicode = true;
};
+ flags = composableDerivation.edf ({name = "ecl"; feat = "eclinterp"; enable
= {buildNativeInputs = [ecl gmp mpfr];};});
lua = lua5;
- perlSupport = true;
- rubySupport = true;
- sniffSupport = true;
- #mzSchemeSupport = true;
- luaSupport = true;
- #hangulSupport = true;
- gettextSupport = true;
src = "" + /var/repos/vim_extended;
#src = "" + /home/raskin/build/limp/vim-ecl/vim;
+ cfg = {
+ pythonSupport = true;
+ tclSupport = true;
+ cscopeSupport = true;
+ xsmpSupport = true;
+ multibyteSupport = true;
+ ximSupport = true;
+ nlsSupport = true;
+
+ perlSupport = true;
+ rubySupport = true;
+ sniffSupport = true;
+ #mzSchemeSupport = true;
+ luaSupport = true;
+ #hangulSupport = true;
+ gettextSupport = true;
+ eclSupport = true;
+ };
}
Modified: configurations/trunk/misc/raskin/package-groups.nix
==============================================================================
--- configurations/trunk/misc/raskin/package-groups.nix Sat Aug 7 11:38:03
2010 (r23022)
+++ configurations/trunk/misc/raskin/package-groups.nix Sat Aug 7 12:46:18
2010 (r23023)
@@ -38,7 +38,7 @@
];
- toys = [ construo rogue fsgAltBuild
+ toys = [ construo rogue fsg
lincity chipmunk xmoto sgtpuzzles
xboard xaos nethack zangband
/*(xsokoban.passthru.function (x: {
@@ -64,7 +64,7 @@
# (relfs.passthru.function { src = "" +
/home/raskin/build/relfs.tar.bz2; })
# relfs
- sshfsFuse fuse smbfsFuse ntfs3g
+ sshfsFuse fuse fusesmb ntfs3g
glusterfs
#(pkgs.linuxPackagesFor baseKernel).aufs2_util
@@ -132,8 +132,8 @@
version = "darcs-head";
})
tla darcs bazaarTools
- monotoneViz
- viewMtn
+ monotoneViz viewMtn
+ fossil
];
consoleTools
@@ -147,7 +147,7 @@
which binutils utillinuxngCurses file mssys
xorg.lndir sqlite indent ltrace lsof
pstree psmisc diffutils /*guileLint*/
- upstartJobControl gawk bvi patchelf bmrsa
+ gawk bvi patchelf bmrsa
screen (lowPrio nixUnstable) ccache patch
rlwrap gdb testdisk expect radare
units gnupg ssss ttmkfdir aspell
@@ -205,7 +205,7 @@
xscreensaver xorg.xev xorg.luit x11vnc
x2vnc xneur_0_8 xorg.xdpyinfo glxinfo xnee
xorg.xprop /*xmacro*/ vncrec xorg.xinput
- xlsfonts xfontsel
+ xlsfonts xfontsel xorg.xinput
];
widgets = [
@@ -248,6 +248,7 @@
inetutils
/*(ikiwiki.override { extraUtils = [
"/var/run/current-system/sw" ] ;})*/
redstore rdf4store
+ ppp
];
misc = [
@@ -273,7 +274,7 @@
xorg.xf86videointel xorg.xf86videovesa xorg.xf86videoati
xorg.xf86videonv
- (ncurses.passthru.function {unicode=false;})
+ (ncurses.override {unicode=false;})
memtest86 /*linuxPackages_2_6_32.nvidia_x11*/
(fetchurl {
url =
http://www.kde-look.org/CONTENT/content-files/58501-green.tar.gz;
Modified: configurations/trunk/misc/raskin/raskin.nix
==============================================================================
--- configurations/trunk/misc/raskin/raskin.nix Sat Aug 7 11:38:03 2010
(r23022)
+++ configurations/trunk/misc/raskin/raskin.nix Sat Aug 7 12:46:18 2010
(r23023)
@@ -32,7 +32,7 @@
# };
# };
- kernelPackages = pkgs.linuxPackagesFor baseKernel;
+ kernelPackages = pkgs.linuxPackagesFor baseKernel kernelPackages;
extraModulePackages = [
/*(kernelPackages.kqemu.passthru.function (x : {
Modified: configurations/trunk/misc/raskin/xserver-ati-wxga.nix
==============================================================================
--- configurations/trunk/misc/raskin/xserver-ati-wxga.nix Sat Aug 7
11:38:03 2010 (r23022)
+++ configurations/trunk/misc/raskin/xserver-ati-wxga.nix Sat Aug 7
12:46:18 2010 (r23023)
@@ -29,6 +29,7 @@
synaptics = {
enable = true;
+ dev = null;
};
# I get Caps-toggle between Latin/Cyrillic/Greek
@@ -36,7 +37,7 @@
# or accents (using deadkeys in level 3)
# Look xkeyboard_config package source.
layout = "us(altgr-intl-rich),ru(common),gr(basic)";
- xkbOptions = "grp:caps_toggle, grp_led:scroll, lv3:lwin_switch";
+ xkbOptions = "grp:caps_toggle, grp_led:caps, lv3:lwin_switch,
terminate:ctrl_alt_bksp";
useXFS = "unix/:7100";
driSupport = false;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
