Author: raskin
Date: Fri Jul 1 13:42:17 2011
New Revision: 27576
URL: https://svn.nixos.org/websvn/nix/?rev=27576&sc=1
Log:
Package set updates
Modified:
configurations/trunk/misc/raskin/httpd.nix
configurations/trunk/misc/raskin/lesser-expressions/raskin-user.nix
configurations/trunk/misc/raskin/package-groups.nix
configurations/trunk/misc/raskin/services-main.nix
Modified: configurations/trunk/misc/raskin/httpd.nix
==============================================================================
--- configurations/trunk/misc/raskin/httpd.nix Fri Jul 1 13:40:45 2011
(r27575)
+++ configurations/trunk/misc/raskin/httpd.nix Fri Jul 1 13:42:17 2011
(r27576)
@@ -45,4 +45,6 @@
++ (optionalSSL (raskinSubDomain // homeDirTune // {hostName =
"raskin";}))
++ (optionalSSL (raskinSubDomain // homeDirTune // {hostName =
"raskin-ipv4";}))
;
+
+ extraSubservices = [ ];
}
Modified: configurations/trunk/misc/raskin/lesser-expressions/raskin-user.nix
==============================================================================
--- configurations/trunk/misc/raskin/lesser-expressions/raskin-user.nix Fri Jul
1 13:40:45 2011 (r27575)
+++ configurations/trunk/misc/raskin/lesser-expressions/raskin-user.nix Fri Jul
1 13:42:17 2011 (r27576)
@@ -7,6 +7,7 @@
linkFarm "raskin-packages" ([
{name="python"; path=pythonFull;}
+ {name="libusb-32bit"; path=pkgsi686Linux.libusb;}
{name="libxml2-python"; path=libxml2Python;}
{name="libX11"; path=xlibs.libX11;}
{name="xproto"; path=xlibs.xproto;}
@@ -34,7 +35,7 @@
"openssl" "postgresql" "mysql"
"intltool" "freetype" "jdkPlugin" "gajim"
"pkgconfig" "fontconfig" "boost" "SDL" "SDL_mixer"
- "SDL_ttf" "opencv" "expat" "graphviz_2_0"
+ "SDL_ttf" "opencv" "expat" "graphviz_2_0"
"graphviz_2_24"
"dejavu_fonts" "e2fsprogs" "dmtx" "qt4"
#"empathy"
"hicolor_icon_theme" "libfixposix" "plan9port"
Modified: configurations/trunk/misc/raskin/package-groups.nix
==============================================================================
--- configurations/trunk/misc/raskin/package-groups.nix Fri Jul 1 13:40:45
2011 (r27575)
+++ configurations/trunk/misc/raskin/package-groups.nix Fri Jul 1 13:42:17
2011 (r27576)
@@ -24,7 +24,8 @@
vala yap prover9 swiProlog
gambit gcl jre jdk spidermonkey
coq eprover isabelle leo2 cvc3
- matita picolisp pure hol
+ matita picolisp pure hol tptp
+ pythonPackages.setuptools
];
nonNative = [ wine dosbox (hiPrio qemu_kvm) (lowPrio qemu)];
@@ -88,14 +89,15 @@
iputils ncat wpa_supplicant iproute lftp
iptables samba wget telnet nmap ntp nc6
socat2pre msf dhcp gvpe bridge_utils mtr
- ndisc6 vlan
+ ndisc6 vlan wavemon
];
browsers = [
opera chromeWrapper
#firefox36Wrapper
mozplugger firefox40Pkgs.xulrunner
- (wrapFirefox firefox40Pkgs.firefox "firefox" "")
+ (wrapFirefox firefox40Pkgs.firefox "firefox" "4")
+ (wrapFirefox firefox50Pkgs.firefox "firefox" "")
];
graphicEdit = [
@@ -168,7 +170,7 @@
docutils dadadodo
suidChroot libxslt pmount fakeroot
dmraid netpbm parallel wdiff
- colordiff
+ colordiff libcap_progs
mdbtools_git ised remind
logrotate htop iotop untie iftop ioping
] ++ (with aspellDicts; [en fr ru]);
@@ -232,9 +234,9 @@
gdmap xfig gnuplot /*freemind*/ transfig xxdiff
gqview pqiv webkit dia midori /*xawtv*/
- gnome.zenity xclip
+ gnome.zenity xclip welkin
/*netsurfBrowser*/ geeqie
- gosmore /*tulip*/ merkaartor
+ gosmore tulip merkaartor
pp.uzbl sonicVisualiser
];
@@ -268,7 +270,7 @@
/*(ikiwiki.override { extraUtils = [
"/var/run/current-system/sw" ] ;})*/
redstore rdf4store joseki
ppp nssTools myKDE.kdenetwork
- tcpdump freeswitch
+ tcpdump freeswitch wvdial
];
misc = [
@@ -319,7 +321,7 @@
perlXMLParser
gmp mpfr cminpack flann
boehmgc libffi
- pythonDBus
+ pythonDBus libusb
(pkgsi686Linux.glibc)
];
Modified: configurations/trunk/misc/raskin/services-main.nix
==============================================================================
--- configurations/trunk/misc/raskin/services-main.nix Fri Jul 1 13:40:45
2011 (r27575)
+++ configurations/trunk/misc/raskin/services-main.nix Fri Jul 1 13:42:17
2011 (r27576)
@@ -51,8 +51,8 @@
enable = true;
};
postgresql = {
+ enableTCPIP = true;
enable = true;
-
};
mysql = {
enable=true;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
