Author: raskin
Date: Thu Jul 15 10:27:30 2010
New Revision: 22604
URL: https://svn.nixos.org/websvn/nix/?rev=22604&sc=1
Log:
A loty of small updates to configuration - programs added/replaced, evaluation
bugs fixed
Modified:
configurations/trunk/misc/raskin/package-groups.nix
configurations/trunk/misc/raskin/raskin-config.nix
configurations/trunk/misc/raskin/raskin.nix
configurations/trunk/misc/raskin/services-main.nix
Modified: configurations/trunk/misc/raskin/package-groups.nix
==============================================================================
--- configurations/trunk/misc/raskin/package-groups.nix Wed Jul 14 23:21:36
2010 (r22603)
+++ configurations/trunk/misc/raskin/package-groups.nix Thu Jul 15 10:27:30
2010 (r22604)
@@ -14,14 +14,14 @@
programmingLanguages
= [
clisp guile fpc gcc ocaml php bc maxima
- zsh sbcl ecl jdk tcl tk erlang m4 tcsh
+ zsh sbcl ecl tcl tk erlang m4 tcsh
flex2534 bison23 /*llvm*/ /*llvmGCC*/ gfortran
haskellPackages.ghc octave lazarus guileLib gwrap ruby
rubygems ikarus python26Full ccl
eprover
stalin bigloo /*coq*/ pltScheme
io falcon acl2 mono mitscheme
- gambit
+ gambit gcl jre jdk
];
nonNative = [ wine qemu dosbox];
@@ -89,7 +89,7 @@
mozplugger gajim
/*blender*/ opera chromeWrapper
/*scribus*/ /*lyx*/
- pidgin psi kde44.kdeedu
+ pidgin psi kde44.kdeedu golly
];
# ratpoison is a window manager inspired by 'screen'
@@ -98,7 +98,7 @@
# stumpwm is more or less ratpoison in Common Lisp
# with all the benefits of Common Lisp for
# extensibility
- windowManagers = [ ratpoison xorg.twm icewm
+ windowManagers = [ xorg.twm icewm
(stumpwm.passthru.function (x: rec {
revision = (import /root/nix-sysconfig/vcs.nix).stumpwm.revision;
branch = (import /root/nix-sysconfig/vcs.nix).stumpwm.branch;
@@ -156,7 +156,7 @@
replace mpage ctags saxon ant groff
fbterm docutils dadadodo
suidChroot libxslt
- dmraid netpbm
+ dmraid netpbm parallel wdiff
] ++ (with aspellDicts; [en fr ru]);
fsTools
@@ -178,14 +178,14 @@
buildSupport = [
autoconf libtool gettext gnumake automake
- scons cmake
+ scons cmake maven2 ant
];
graphicView = [
# You probably underestimate ImageMagick..
imagemagick gv djvulibre xpdf graphviz
- ghostscript #djview4
+ ghostscript djview4
evince /*pdf2djvu*/ fbida
];
@@ -205,6 +205,7 @@
xscreensaver xorg.xev xorg.luit x11vnc
x2vnc xneur_0_8 xorg.xdpyinfo glxinfo xnee
xorg.xprop /*xmacro*/ vncrec xorg.xinput
+ xlsfonts xfontsel
];
widgets = [
@@ -215,11 +216,11 @@
gqview pqiv webkit dia midori /*xawtv*/
gnome.zenity uzbl xclip
/*netsurfBrowser*/ geeqie
- gosmore
+ gosmore tulip
];
clientServer = [
- irssi tightvnc bittornado postgresql
+ irssi /*tightvnc*/ tigervnc bittornado postgresql
ejabberd
# openfire
cups dict ldcpp mysql
@@ -246,6 +247,7 @@
nginx /*mldonkey*/ bind postfix axel /*aria*/
inetutils
/*(ikiwiki.override { extraUtils = [
"/var/run/current-system/sw" ] ;})*/
+ redstore rdf4store
];
misc = [
@@ -257,6 +259,7 @@
cuneiform
/*shared_mime_info*/
asymptote cfdg kde44.oxygen_icons
+ redland librdf_rasqal librdf_raptor
];
consoleEditors = [
Modified: configurations/trunk/misc/raskin/raskin-config.nix
==============================================================================
--- configurations/trunk/misc/raskin/raskin-config.nix Wed Jul 14 23:21:36
2010 (r22603)
+++ configurations/trunk/misc/raskin/raskin-config.nix Thu Jul 15 10:27:30
2010 (r22604)
@@ -3,6 +3,9 @@
qt4 = {
version = "trolltech";
};
+ doxygen = {
+ qt4 = true ;
+ };
subversion = {
perlBindings = true;
};
Modified: configurations/trunk/misc/raskin/raskin.nix
==============================================================================
--- configurations/trunk/misc/raskin/raskin.nix Wed Jul 14 23:21:36 2010
(r22603)
+++ configurations/trunk/misc/raskin/raskin.nix Thu Jul 15 10:27:30 2010
(r22604)
@@ -240,8 +240,7 @@
http://hydra.nixos.org/project/nixpkgs/channel/latest/MANIFEST
http://hydra.nixos.org/job/nix/trunk/build/channel/latest/MANIFEST
http://hydra.nixos.org/project/nixos/channel/latest/MANIFEST
-
#http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/MANIFEST
- #http://nixos.org/releases/nix/channels/nix-unstable/MANIFEST
+
http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/MANIFEST
];
repoTypes = {
Modified: configurations/trunk/misc/raskin/services-main.nix
==============================================================================
--- configurations/trunk/misc/raskin/services-main.nix Wed Jul 14 23:21:36
2010 (r22603)
+++ configurations/trunk/misc/raskin/services-main.nix Thu Jul 15 10:27:30
2010 (r22604)
@@ -167,4 +167,9 @@
nscd.enable = false;
nixosManual.enable = false;
ttyBackgrounds.enable = false;
+
+ avahi = {
+ enable = true;
+ hostName = "401a0bf1";
+ };
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
