Author: raskin Date: 2010-06-08 10:11:20 +0000 (Tue, 08 Jun 2010) New Revision: 22180
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22180&view=rev Modified: configurations/trunk/misc/raskin/kernel-options.nix 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 Log: One more rebuild - no Zen-kernel for now (upstream have not released 2.6.34-zen yet) Changes: Modified: configurations/trunk/misc/raskin/kernel-options.nix =================================================================== --- configurations/trunk/misc/raskin/kernel-options.nix 2010-06-08 10:06:00 UTC (rev 22179) +++ configurations/trunk/misc/raskin/kernel-options.nix 2010-06-08 10:11:20 UTC (rev 22180) @@ -1,3 +1,4 @@ {pkgs, ...}: rec { - baseKernel = pkgs.kernel_2_6_33_zen1_bfs; + #baseKernel = pkgs.kernel_2_6_33_zen1_bfs; + baseKernel = pkgs.kernel_2_6_34; } Modified: configurations/trunk/misc/raskin/package-groups.nix =================================================================== --- configurations/trunk/misc/raskin/package-groups.nix 2010-06-08 10:06:00 UTC (rev 22179) +++ configurations/trunk/misc/raskin/package-groups.nix 2010-06-08 10:11:20 UTC (rev 22180) @@ -21,6 +21,7 @@ eprover stalin bigloo /*coq*/ pltScheme io falcon acl2 mono mitscheme + gambit ]; nonNative = [ wine qemu dosbox]; @@ -61,12 +62,12 @@ # I sometimes change relfs code, so I want to test latest # version # (relfs.passthru.function { src = "" + /home/raskin/build/relfs.tar.bz2; }) - relfs + # relfs sshfsFuse fuse smbfsFuse ntfs3g glusterfs - (pkgs.linuxPackagesFor baseKernel).aufs2Utils + #(pkgs.linuxPackagesFor baseKernel).aufs2_util ]; networkTools @@ -150,11 +151,11 @@ rlwrap gdb testdisk expect radare units gnupg ssss ttmkfdir aspell seccure zip texinfo pinentry - powertop ddrescue gnupg2 pv + powertop ddrescue pv replace mpage ctags saxon ant groff fbterm docutils dadadodo suidChroot libxslt - dmraid + dmraid netpbm ] ++ (with aspellDicts; [en fr ru]); fsTools @@ -242,9 +243,7 @@ lighttpd openssl nginx /*mldonkey*/ bind postfix axel /*aria*/ inetutils - (ikiwiki.override {inherit monotone; extraUtils = [ - "/var/run/current-system/sw" - ] ;}) + /*(ikiwiki.override { extraUtils = [ "/var/run/current-system/sw" ] ;})*/ ]; misc = [ @@ -254,7 +253,7 @@ /*uml*/ umlutilities dmtx qrencode qrdecode /*cryopid*/ pyxml cuneiform - shared_mime_info + /*shared_mime_info*/ asymptote cfdg ]; @@ -314,7 +313,7 @@ version = "darcs-head"; }) which binutils utillinuxngCurses file sqlite indent lsof psmisc diffutils screen (lowPrio nixUnstable) - patch rlwrap gnupg gnupg2 pinentry + patch rlwrap gnupg pinentry btrfsProgs MPlayer autoconf libtool gettext gnumake automake Modified: configurations/trunk/misc/raskin/raskin-config.nix =================================================================== --- configurations/trunk/misc/raskin/raskin-config.nix 2010-06-08 10:06:00 UTC (rev 22179) +++ configurations/trunk/misc/raskin/raskin-config.nix 2010-06-08 10:11:20 UTC (rev 22180) @@ -46,6 +46,11 @@ wxGtk = true; }; + ikiwiki = { + git = true; + monotone = true; + }; + packageOverrides = p: { glibcLocales = p.glibcLocales.override { locales = ["en_US.UTF-8/UTF-8" "ru_RU.UTF-8/UTF-8" "ru_RU.KOI8-R/KOI8-R" "ru_RU.CP1251/CP1251"]; Modified: configurations/trunk/misc/raskin/raskin.nix =================================================================== --- configurations/trunk/misc/raskin/raskin.nix 2010-06-08 10:06:00 UTC (rev 22179) +++ configurations/trunk/misc/raskin/raskin.nix 2010-06-08 10:11:20 UTC (rev 22180) @@ -54,7 +54,7 @@ }; #kernelToUse = (bootEntries kernels.testingKernel); -kernelToUse = (bootEntries pkgs.linux_2_6_33_zen1_bfs); +kernelToUse = (bootEntries pkgs.linux_2_6_34); packageGroups = import /etc/nixos/configurations/misc/raskin/package-groups.nix { inherit pkgs myTexLive; @@ -167,7 +167,7 @@ # S3 is broken for now, # TuxOnIce works (not in latest kernel yet) - extraKernelParams = ["resume=/dev/sda8" "acpi_sleep=s3_bios"]; + extraKernelParams = ["resume=/dev/sda8" "acpi_sleep=s3_bios"]; kernelPackages = kernelToUse.kernelPackages; extraModulePackages = kernelToUse.extraModulePackages; @@ -180,19 +180,8 @@ "ext3" "lzf" "crc32c" "btrfs" "libcrc32c" "zlib_deflate" "unix" "usbhid" "uhci_hcd" "ehci_hcd" "ohci_hcd" "atkbd" "xtkbd" "bfq_iosched" - ]; - availableKernelModules = [ "tuxonice_core" "tuxonice_swap" "tuxonice_userui" - ]; - postDeviceCommands = '' - modprobe tuxonice_core - modprobe tuxonice_swap - modprobe tuxonice_userui - - mknod /dev/sda8 b 8 8 - - echo > /sys/power/tuxonice/do_resume || true - ''; + ]; }; kernelParams = [ @@ -372,7 +361,7 @@ }; }; })*/ - (base // { + /*(base // { boot = base.boot // { loader = base.boot.loader // { grub = base.boot.loader.grub // { @@ -393,7 +382,7 @@ kernelPackages = pkgs.linuxPackagesFor pkgs.linux_2_6_33_zen1_bfs; extraModulePackages = (bootEntries pkgs.linux_2_6_33_zen1_bfs).extraModulePackages; }; - }) + })*/ /*(base // { boot = base.boot // { loader = base.boot.loader // { @@ -405,20 +394,6 @@ extraModulePackages = (bootEntries pkgs.linux_2_6_32).extraModulePackages; }; })*/ - /*(base // { - boot = base.boot // { - configurationName = "With testing kernel"; - kernelPackages = (bootEntries kernels.testingKernel).kernelPackages; - extraModulePackages = (bootEntries kernels.testingKernel).extraModulePackages; - }; - }) - (base // { - boot = base.boot // { - configurationName = "With non-testing kernel"; - kernelPackages = (bootEntries kernels.baseKernel).kernelPackages; - extraModulePackages = (bootEntries kernels.baseKernel).extraModulePackages; - }; - })*/ ]; }; Modified: configurations/trunk/misc/raskin/services-main.nix =================================================================== --- configurations/trunk/misc/raskin/services-main.nix 2010-06-08 10:06:00 UTC (rev 22179) +++ configurations/trunk/misc/raskin/services-main.nix 2010-06-08 10:11:20 UTC (rev 22180) @@ -165,4 +165,6 @@ }; nscd.enable = false; + nixosManual.enable = false; + ttyBackgrounds.enable = false; } _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
