Author: raskin
Date: Sat Aug 14 18:21:04 2010
New Revision: 23175
URL: https://svn.nixos.org/websvn/nix/?rev=23175&sc=1
Log:
Updates
Modified:
configurations/trunk/misc/raskin/kernel-options.nix
configurations/trunk/misc/raskin/package-groups.nix
configurations/trunk/misc/raskin/raskin.nix
Modified: configurations/trunk/misc/raskin/kernel-options.nix
==============================================================================
--- configurations/trunk/misc/raskin/kernel-options.nix Sat Aug 14 17:13:42
2010 (r23174)
+++ configurations/trunk/misc/raskin/kernel-options.nix Sat Aug 14 18:21:04
2010 (r23175)
@@ -1,4 +1,4 @@
{pkgs, ...}: rec {
#baseKernel = pkgs.kernel_2_6_33_zen1_bfs;
- baseKernel = pkgs.kernel_2_6_34;
+ baseKernel = pkgs.kernel_2_6_35;
}
Modified: configurations/trunk/misc/raskin/package-groups.nix
==============================================================================
--- configurations/trunk/misc/raskin/package-groups.nix Sat Aug 14 17:13:42
2010 (r23174)
+++ configurations/trunk/misc/raskin/package-groups.nix Sat Aug 14 18:21:04
2010 (r23175)
@@ -161,8 +161,8 @@
fsTools
= [
- btrfsProgs jfsutils jfsrec
- xfsprogs dosfstools
+ (btrfsProgs.override {src = "" +
/home/raskin/build/btrfs-progs-unstable +"/";})
+ jfsutils jfsrec xfsprogs dosfstools
];
sound
@@ -186,7 +186,8 @@
imagemagick gv djvulibre xpdf graphviz
ghostscript djview4
- evince /*pdf2djvu*/ fbida
+ evince pdf2djvu fbida
+ mupdf
];
utilsX = [
@@ -248,7 +249,7 @@
inetutils
/*(ikiwiki.override { extraUtils = [
"/var/run/current-system/sw" ] ;})*/
redstore rdf4store
- ppp
+ ppp nssTools kde44.kdenetwork
];
misc = [
Modified: configurations/trunk/misc/raskin/raskin.nix
==============================================================================
--- configurations/trunk/misc/raskin/raskin.nix Sat Aug 14 17:13:42 2010
(r23174)
+++ configurations/trunk/misc/raskin/raskin.nix Sat Aug 14 18:21:04 2010
(r23175)
@@ -55,7 +55,7 @@
};
#kernelToUse = (bootEntries kernels.testingKernel);
-kernelToUse = (bootEntries pkgs.linux_2_6_34);
+kernelToUse = (bootEntries pkgs.linux_2_6_35);
packageGroups = import
/etc/nixos/configurations/misc/raskin/package-groups.nix {
inherit pkgs myTexLive;
@@ -123,7 +123,7 @@
];
# I'd like to build ISO's and have them in profile
- pathsToLink = ["/bin" "/sbin" "/share" "/man" "/info" "/iso" "/lib"];
+ pathsToLink = ["/bin" "/sbin" "/share" "/man" "/info" "/iso" "/lib"
"/libexec"];
# Most typos leave needed option at default
# (mystically..), but create easy-to-find
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
