Author: raskin
Date: Tue Nov 23 19:22:19 2010
New Revision: 24826
URL: https://svn.nixos.org/websvn/nix/?rev=24826&sc=1
Log:
Trunk + Stdenv-updates succesful build
Modified:
configurations/trunk/misc/raskin/filesystems-asus-n53j.nix
configurations/trunk/misc/raskin/package-groups.nix
configurations/trunk/misc/raskin/raskin-asus-n53j.nix
configurations/trunk/misc/raskin/raskin-config.nix
Modified: configurations/trunk/misc/raskin/filesystems-asus-n53j.nix
==============================================================================
--- configurations/trunk/misc/raskin/filesystems-asus-n53j.nix Tue Nov 23
18:01:33 2010 (r24825)
+++ configurations/trunk/misc/raskin/filesystems-asus-n53j.nix Tue Nov 23
19:22:19 2010 (r24826)
@@ -64,4 +64,10 @@
device="debugfs";
fsType = "debugfs";
}
+ { mountPoint = "/dev/cgroup/cpu";
+ device = "cgroup";
+ fsType = "cgroup";
+ options = "cpu";
+ autocreate = true;
+ }
]
Modified: configurations/trunk/misc/raskin/package-groups.nix
==============================================================================
--- configurations/trunk/misc/raskin/package-groups.nix Tue Nov 23 18:01:33
2010 (r24825)
+++ configurations/trunk/misc/raskin/package-groups.nix Tue Nov 23 19:22:19
2010 (r24826)
@@ -19,13 +19,13 @@
haskellPackages.ghc octave lazarus guile_lib gwrap ruby
rubygems python26Full ccl
eprover
- bigloo /*coq*/ pltScheme racket
+ bigloo coq pltScheme racket
io falcon acl2 mono mitscheme
vala
gambit gcl jre jdk spidermonkey
];
- nonNative = [ wine qemu dosbox qemu_kvm];
+ nonNative = [ wine dosbox (hiPrio qemu_kvm) (lowPrio qemu)];
hwControl
= [
@@ -37,7 +37,7 @@
gpm setserial gnokii
- fbterm ddrescue baseKernel.kernelPackages.kernel
+ fbterm dd_rescue ddrescue baseKernel.kernelPackages.kernel
] ++ baseKernel.extraModulePackages;
toys = [ construo rogue fsg
@@ -166,7 +166,7 @@
suidChroot libxslt pmount
dmraid netpbm parallel wdiff
mdbtools_git
- logrotate
+ logrotate htop iotop untie
] ++ (with aspellDicts; [en fr ru]);
encryption = [
@@ -175,7 +175,10 @@
fsTools
= [
- (btrfsProgs.override {src = "" +
/var/repos/btrfs-progs-unstable +"/";})
+ (btrfsProgs.override {
+ src = "" + /var/repos/btrfs-progs-unstable +"/";
+ patches = [];
+ })
jfsutils jfsrec xfsprogs dosfstools nilfs_utils
];
@@ -278,7 +281,7 @@
consoleEditors = [
(import ./custom-vim.nix pkgs)
- emacs mc bvi radare
+ emacs mc bvi
];
GCPin = [
Modified: configurations/trunk/misc/raskin/raskin-asus-n53j.nix
==============================================================================
--- configurations/trunk/misc/raskin/raskin-asus-n53j.nix Tue Nov 23
18:01:33 2010 (r24825)
+++ configurations/trunk/misc/raskin/raskin-asus-n53j.nix Tue Nov 23
19:22:19 2010 (r24826)
@@ -105,6 +105,7 @@
done < /tmp/.dev-tty12 &> /tmp/.dev-tty12' &
/var/run/current-system/sw/bin/mount /sys
/var/run/current-system/sw/sbin/modprobe i915
+ /var/run/current-system/sw/bin/mkdir -p /dev/cgroup/cpu
'';
};
@@ -184,6 +185,14 @@
'';
respawn = false;
};
+ makeUserCgroup = {
+ name = "make-user-cgroup";
+ description = "Create cgroup where user can create subgroups";
+ startOn = "filesystems/started";
+ script = ''
+ mkdir -m 0777 /dev/cgroup/cpu/user
+ '';
+ };
networkInterfaces.startOn = "never";
nscd.startOn = "never";
dhclient.startOn = "never";
Modified: configurations/trunk/misc/raskin/raskin-config.nix
==============================================================================
--- configurations/trunk/misc/raskin/raskin-config.nix Tue Nov 23 18:01:33
2010 (r24825)
+++ configurations/trunk/misc/raskin/raskin-config.nix Tue Nov 23 19:22:19
2010 (r24826)
@@ -62,5 +62,10 @@
locales = ["en_US.UTF-8/UTF-8" "ru_RU.UTF-8/UTF-8"
"ru_RU.KOI8-R/KOI8-R" "ru_RU.CP1251/CP1251"];
allLocales = true;
};
+ patchelf06 = p.lib.overrideDerivation p.patchelf06 (x: {
+ src = "" + /etc/nixos/patchelf + "";
+ preConfigure = "./bootstrap.sh";
+ buildInputs = x.buildInputs ++ [p.autoconf p.automake p.libtool];
+ });
};
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
