Author: raskin
Date: Sun Oct 2 11:55:35 2011
New Revision: 29561
URL: https://ssl.nixos.org/websvn/nix/?rev=29561&sc=1
Log:
Succesful rebuild after some troubles before it; nothing too special; some
package updates
Modified:
configurations/trunk/misc/raskin/custom-vim.nix
configurations/trunk/misc/raskin/filesystems-asus-n53j.nix
configurations/trunk/misc/raskin/package-groups.nix
configurations/trunk/misc/raskin/private-packages.nix
configurations/trunk/misc/raskin/raskin-asus-n53j.nix
configurations/trunk/misc/raskin/raskin-config.nix
configurations/trunk/misc/raskin/services-main.nix
Modified: configurations/trunk/misc/raskin/custom-vim.nix
==============================================================================
--- configurations/trunk/misc/raskin/custom-vim.nix Sun Oct 2 11:50:19
2011 (r29560)
+++ configurations/trunk/misc/raskin/custom-vim.nix Sun Oct 2 11:55:35
2011 (r29561)
@@ -3,7 +3,7 @@
name = "vim-huge-all";
features = "huge";
inherit gmp mpfr perl
- ruby pltScheme gettext;
+ ruby gettext;
ecl = pkgs.ecl.passthru.function {
noUnicode = true;
};
Modified: configurations/trunk/misc/raskin/filesystems-asus-n53j.nix
==============================================================================
--- configurations/trunk/misc/raskin/filesystems-asus-n53j.nix Sun Oct 2
11:50:19 2011 (r29560)
+++ configurations/trunk/misc/raskin/filesystems-asus-n53j.nix Sun Oct 2
11:55:35 2011 (r29561)
@@ -38,7 +38,7 @@
{
mountPoint="/tmp";
label="tmp";
- fsType="btrfs";
+ fsType="ext4";
neededForBoot=true;
options="noatime";
}
Modified: configurations/trunk/misc/raskin/package-groups.nix
==============================================================================
--- configurations/trunk/misc/raskin/package-groups.nix Sun Oct 2 11:50:19
2011 (r29560)
+++ configurations/trunk/misc/raskin/package-groups.nix Sun Oct 2 11:55:35
2011 (r29561)
@@ -18,14 +18,15 @@
zsh sbcl ecl tcl tk erlang m4 tcsh /*eql*/
flex2534 bison23 clang gfortran ruby /*gwrap*/
haskellPackages.ghc octave lazarus /*guile_lib*/
- rubygems pythonFull /*ccl*/ iprover kona
- bigloo racket spass opensmt
+ rubygems pythonFull ccl iprover kona
+ bigloo racket spass opensmt lua5 love
io falcon /*acl2*/ mono mitscheme scala
vala yap prover9 swiProlog
gambit gcl jre jdk spidermonkey
- coq eprover isabelle leo2 cvc3
+ coq eprover /*isabelle*/ leo2 cvc3
matita picolisp pure hol tptp
pythonPackages.setuptools satallax
+ avrgcclibc clojure
];
nonNative = [ wine dosbox (hiPrio qemu_kvm) (lowPrio qemu)];
@@ -38,7 +39,7 @@
xsane saneBackends saneFrontends gphoto2 gphoto2fs
- gpm setserial gnokii v4l_utils
+ gpm setserial gnokii v4l_utils avrdude
fbterm dd_rescue ddrescue baseKernel.kernelPackages.kernel
@@ -79,9 +80,9 @@
# relfs
sshfsFuse fuse fusesmb ntfs3g
- glusterfs smbnetfs
+ glusterfs smbnetfs xtreemfs
- #(pkgs.linuxPackagesFor baseKernel).aufs2_1_util
+ baseKernel.kernelPackages.aufs3_util
];
networkTools
@@ -90,14 +91,15 @@
iptables samba wget telnet nmap ntp nc6
socat2pre msf dhcp gvpe bridge_utils mtr
ndisc6 vlan wavemon openvpn iperf vde2
+ netboot nbd hyenae
];
browsers = [
opera chromeWrapper
mozplugger
- (wrapFirefox firefox50Pkgs.firefox "firefox" "5")
- (wrapFirefox firefox70b1Pkgs.firefox "firefox" "")
+ (wrapFirefox firefox70Pkgs.firefox "firefox" "7")
+ (wrapFirefox firefox80bPkgs.firefox "firefox" "")
];
graphicEdit = [
@@ -118,7 +120,7 @@
];
im = [
- psi twinkle gajim vacuum /*pidgin*/ /*ekiga*/
+ twinkle gajim vacuum
];
# ratpoison is a window manager inspired by 'screen'
@@ -223,7 +225,7 @@
xorg.xwd xorg.xmessage xorg.xbacklight
xscreensaver xorg.xev xorg.luit x11vnc
x2vnc xneur_0_8 xorg.xdpyinfo glxinfo xnee
- xorg.xprop /*xmacro*/ vncrec xorg.xinput
+ xorg.xprop xmacro vncrec xorg.xinput
xlsfonts xfontsel xorg.xinput xdaliclock
xdotool /*vnc2flv*/
];
@@ -233,7 +235,7 @@
# directory tree
gdmap xfig gnuplot freemind transfig xxdiff
- gqview pqiv webkit dia midori
+ gqview pqiv webkit dia midori vue
gnome.zenity xclip welkin
/*netsurfBrowser*/ geeqie
gosmore tulip merkaartor
@@ -262,11 +264,11 @@
mueller_enru_names
];
})
- squid dovecot_1_1_1 siege
+ squids.latest dovecot_1_1_1 siege
bitlbee mutt xinetd
lighttpd openssl ekiga
nginx /*mldonkey*/ bind postfix axel /*aria*/
- inetutils netkittftp nodejs
+ inetutils nodejs tftp_hpa
/*(ikiwiki.override { extraUtils = [
"/var/run/current-system/sw" ] ;})*/
redstore rdf4store joseki
ppp nssTools
@@ -282,6 +284,7 @@
cuneiform alsaLib opencv ocrad tesseract
asymptote cfdg myKDE.oxygen_icons
redland librdf_rasqal librdf_raptor
+ zbar
];
consoleEditors = [
Modified: configurations/trunk/misc/raskin/private-packages.nix
==============================================================================
--- configurations/trunk/misc/raskin/private-packages.nix Sun Oct 2
11:50:19 2011 (r29560)
+++ configurations/trunk/misc/raskin/private-packages.nix Sun Oct 2
11:55:35 2011 (r29561)
@@ -22,8 +22,11 @@
}));
drgeo = (drgeo.override {src="" + /var/repos/drgeo-1.1.0 + "/";});
btrfsProgs = (btrfsProgs.override {
- src = "" + /var/repos/btrfs-progs-unstable +"/";
+ src = "" + /var/repos/btrfs-progs-integration +"/";
patches = [];
+ buildInputs = btrfsProgs.buildInputs ++ [
+ attr libuuid
+ ];
});
uzbl = (uzbl.override { src = "" + /var/repos/uzbl + "/"; });
grub2Bzr = (stdenv.lib.overrideDerivation grub2 (x: {
@@ -38,4 +41,15 @@
${x.prePatch}
'';
}));
+ liquidwar = liquidwar.override {
+ src = ("" + /var/repos/liquidwar6 + "/");
+ goSrcDir = ''cd liquidwar6'';
+ };
+ vvTest = veracity.override {
+ runTests = true;
+ };
+ gettext_expat = lib.overrideDerivation gettext (x: {
+ buildInputs = x.buildInputs ++ [expat gnome.libglade];
+ configureFlags = x.configureFlags + " --with-libexpat-prefix=${expat}/ ";
+ });
}
Modified: configurations/trunk/misc/raskin/raskin-asus-n53j.nix
==============================================================================
--- configurations/trunk/misc/raskin/raskin-asus-n53j.nix Sun Oct 2
11:50:19 2011 (r29560)
+++ configurations/trunk/misc/raskin/raskin-asus-n53j.nix Sun Oct 2
11:55:35 2011 (r29561)
@@ -33,7 +33,7 @@
let
texLivePaths = with pkgs; [texLive texLiveExtra texLiveCMSuper
- texLiveBeamer lmodern texLiveContext];
+ texLiveBeamer lmodern texLiveContext texDisser];
myTexLive = pkgs.texLiveAggregationFun {
paths = texLivePaths;
};
@@ -76,6 +76,8 @@
"atkbd" "xtkbd" "bfq_iosched"
];
};
+ kernelParams = [
+ ];
kernelModules = [
"fbcon" "i915"
"usb-storage" "tun"
@@ -97,7 +99,7 @@
postBootCommands = ''
exec &> /var/log/post-boot-commands
/var/run/current-system/sw/bin/umount /tmp/
- /var/run/current-system/sw/bin/mkfs.btrfs -L tmp /dev/disk/by-label/tmp
+ /var/run/current-system/sw/sbin/mkfs.ext4 -L tmp /dev/disk/by-label/tmp
/var/run/current-system/sw/bin/mount /tmp/
/var/run/current-system/sw/bin/chmod a+rwxt /tmp
/var/run/current-system/sw/bin/mkdir -m 1777 /tmp/.ICE-unix/
Modified: configurations/trunk/misc/raskin/raskin-config.nix
==============================================================================
--- configurations/trunk/misc/raskin/raskin-config.nix Sun Oct 2 11:50:19
2011 (r29560)
+++ configurations/trunk/misc/raskin/raskin-config.nix Sun Oct 2 11:55:35
2011 (r29561)
@@ -31,6 +31,7 @@
allExtensions = true;
enableMPlayer = false;
enableGeckoMediaPlayer = false;
+ enableGoogleTalkPlugin = true;
};
icecat = {
enableMPlayer = false;
Modified: configurations/trunk/misc/raskin/services-main.nix
==============================================================================
--- configurations/trunk/misc/raskin/services-main.nix Sun Oct 2 11:50:19
2011 (r29560)
+++ configurations/trunk/misc/raskin/services-main.nix Sun Oct 2 11:55:35
2011 (r29561)
@@ -111,6 +111,8 @@
"0 0-23/6 * * * root rm /var/log/gw6c.*.log"
"0 5 * * * root cd /root && /home/raskin/script/mtn-pending-changes >
/root/.mtn-pending-changes"
"10 5 * * * raskin cd /home/raskin &&
/home/raskin/script/mtn-pending-changes > /home/raskin/.mtn-pending-changes"
+ "30 5 * * * root /var/run/current-system/sw/bin/nix-instantiate
/home/raskin/.nix-personal/personal.nix"
+ "45 5 * * * raskin cd /home/raskin && /home/raskin/script/dev-sync &&
/home/raskin/script/public-sync"
];
};
@@ -183,4 +185,12 @@
hostName = "401a0bf1";
};
+ nfsKernel = {
+ server = {
+ enable = true;
+ exports = ''
+ /var/nfs *(ro,insecure,all_squash)
+ '';
+ };
+ };
}
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
