Author: raskin
Date: Sat Mar 5 13:57:39 2011
New Revision: 26167
URL: https://svn.nixos.org/websvn/nix/?rev=26167&sc=1
Log:
Package set tuning
Modified:
configurations/trunk/misc/raskin/package-groups.nix
configurations/trunk/misc/raskin/raskin-asus-n53j.nix
Modified: configurations/trunk/misc/raskin/package-groups.nix
==============================================================================
--- configurations/trunk/misc/raskin/package-groups.nix Sat Mar 5 07:28:50
2011 (r26166)
+++ configurations/trunk/misc/raskin/package-groups.nix Sat Mar 5 13:57:39
2011 (r26167)
@@ -1,7 +1,7 @@
# I keep everything in configuration.nix for automated
# updates. But the list is rather big, so I split it.
# Division is relatively random.
- {myTexLive, pkgs, baseKernel, ...}: with pkgs; rec {
+ {myTexLive , myKDE, pkgs, baseKernel, ...}: with pkgs; rec {
extractors
@@ -15,8 +15,8 @@
= [
clisp guile fpc gcc ocaml php bc maxima
zsh sbcl ecl tcl tk erlang m4 tcsh /*eql*/
- flex2534 bison23 llvm gfortran ruby gwrap
- haskellPackages.ghc octave lazarus guile_lib
+ flex2534 bison23 llvm gfortran ruby /*gwrap*/
+ haskellPackages.ghc octave lazarus /*guile_lib*/
rubygems python26Full ccl iprover
bigloo pltScheme racket spass opensmt
io falcon acl2 mono mitscheme scala
@@ -63,8 +63,14 @@
'') ["minInit" "doUnpack"];
}))*/
bsdgames asc atanks gl117 crrcsim
- liquidwar kde45.kdegames
- extremetuxracer torcs
+ liquidwar myKDE.kdegames
+ extremetuxracer torcs
+ (warmux.override (let x = (warmux.function {}); in
+ {
+ src= ""+ /var/repos/warmux +"/";
+ phaseNames = ["doAutogen"] ++ x.phaseNames;
+ buildInputs = x.buildInputs ++ [automake autoconf libtool intltool
perl];
+ }))
(tbe.override {src = "" + /var/repos/tbe + "/";})
];
@@ -76,7 +82,7 @@
# relfs
sshfsFuse fuse fusesmb ntfs3g
- glusterfs
+ glusterfs smbnetfs
# (pkgs.linuxPackagesFor baseKernel).aufs2_util
];
@@ -96,10 +102,10 @@
];
graphicEdit = [
- inkscape gimp
+ inkscape gimp libjpeg
(drgeo.override {src="" + /var/repos/drgeo-1.1.0 + "/";})
- kde45.kdeedu
- pdftk imagemagick pdf2djvu barcode
+ myKDE.kdeedu
+ pdftk imagemagick pdf2djvu barcode
/*blender*/
];
@@ -157,7 +163,7 @@
pstree psmisc diffutils /*guileLint*/
gawk patchelf tmux xdelta
screen (lowPrio nixUnstable) ccache patch
- rlwrap gdb testdisk expect
+ rlwrap gdb testdisk expect valgrind
units aspell upstart
zip texinfo pinentry
powertop pv fdupes
@@ -260,13 +266,13 @@
];
})
squid dovecot_1_1_1
- bitlbee mutt
+ bitlbee mutt xinetd
lighttpd openssl
nginx /*mldonkey*/ bind postfix axel /*aria*/
- inetutils
+ inetutils netkittftp
/*(ikiwiki.override { extraUtils = [
"/var/run/current-system/sw" ] ;})*/
redstore rdf4store
- ppp nssTools kde45.kdenetwork
+ ppp nssTools myKDE.kdenetwork
tcpdump freeswitch
];
@@ -277,7 +283,7 @@
/*uml*/ umlutilities dmtx qrencode
qrdecode /*cryopid*/ pyxml lilypond
cuneiform alsaLib opencv ocrad
- asymptote cfdg kde45.oxygen_icons
+ asymptote cfdg myKDE.oxygen_icons
redland librdf_rasqal librdf_raptor
];
Modified: configurations/trunk/misc/raskin/raskin-asus-n53j.nix
==============================================================================
--- configurations/trunk/misc/raskin/raskin-asus-n53j.nix Sat Mar 5
07:28:50 2011 (r26166)
+++ configurations/trunk/misc/raskin/raskin-asus-n53j.nix Sat Mar 5
13:57:39 2011 (r26167)
@@ -37,12 +37,13 @@
myTexLive = pkgs.texLiveAggregationFun {
paths = texLivePaths;
};
+ myKDE = pkgs.kde45;
kernelToUse = rec {
kernelPackages = pkgs.linuxPackagesFor pkgs.linux_2_6_37 kernelPackages;
extraModulePackages = [kernelPackages.acpi_call];
};
packageGroups = import
/etc/nixos/configurations/misc/raskin/package-groups.nix {
- inherit pkgs myTexLive;
+ inherit pkgs myTexLive myKDE;
baseKernel = kernelToUse;
};
in
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
