Author: raskin Date: Fri Mar 30 08:00:39 2012 New Revision: 33486 URL: https://nixos.org/websvn/nix/?rev=33486&sc=1
Log: Be able to instantiate my config at least Modified: configurations/trunk/misc/raskin/lesser-expressions/raskin-user.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/lesser-expressions/raskin-user.nix ============================================================================== --- configurations/trunk/misc/raskin/lesser-expressions/raskin-user.nix Fri Mar 30 07:32:54 2012 (r33485) +++ configurations/trunk/misc/raskin/lesser-expressions/raskin-user.nix Fri Mar 30 08:00:39 2012 (r33486) @@ -18,7 +18,8 @@ {name="flash10"; path=flashplayer10;} {name="mime"; path=shared_mime_info;} {name="sgt-puzzles"; path=sgtpuzzles;} - {name="gtk"; path=gtkLibs.gtk;} + {name="gtk"; path=gtk;} + {name="gtk3"; path=gtk3;} {name="atk"; path=gtkLibs.atk;} {name="glib"; path=gtkLibs.glib;} {name="gtkglext"; path=gnome.gtkglext;} @@ -32,14 +33,15 @@ "libxslt" "gmp" "mpfr" "libpng" "libtiff" "fuse" "sbcl" "sqlite" "ncurses" "glibcLocales" "libffi" - "openoffice" "allegro" "cgui" + "libreoffice" "allegro" "cgui" "openssl" "postgresql" "mysql" "intltool" "freetype" "jdkPlugin" "gajim" "pkgconfig" "fontconfig" "boost" "SDL" "SDL_mixer" - "SDL_ttf" "opencv" "expat" "graphviz_2_0" "graphviz_2_24" + "SDL_ttf" "opencv" "expat" "graphviz_2_0" "dejavu_fonts" "e2fsprogs" "dmtx" "qt4" #"empathy" - "hicolor_icon_theme" "libfixposix" "plan9port" + "hicolor_icon_theme" "libfixposix" + # "plan9port" "pygtk" "pygobject" "pycairo" "ruby18" ]) ++ @@ -49,11 +51,25 @@ #empathy.pkgs.gnome28.gnome_keyring empathy.pkgs.telepathy_logger empathy.pkgs.gnome28.GConf ]); } - {name="glib-schemas"; path=(symlinkJoin "glib-schemas" - [ - #empathy.pkgs.libmissioncontrol empathy.pkgs.libnotify empathy.pkgs.telepathy_gabble - #empathy.pkgs.gnome28.gnome_keyring empathy.pkgs.telepathy_logger - ]); + { + name="glib-schemas"; + path=(runCommand "glib-schemas" + { + inherit glib; + schemasFiles = + (symlinkJoin "glib-schemas-raw" + [ + #empathy.pkgs.libmissioncontrol empathy.pkgs.libnotify empathy.pkgs.telepathy_gabble + #empathy.pkgs.gnome28.gnome_keyring empathy.pkgs.telepathy_logger + pkgs.gtk3 + pkgs.gsettings_desktop_schemas + ]); + } + '' + mkdir -p "$out"/share/glib-2.0/schemas + ln -s "$schemasFiles"/share/glib-2.0/schemas/*.xml "$out"/share/glib-2.0/schemas + $glib/bin/glib-compile-schemas "$out"/share/glib-2.0/schemas + ''); } {name="ruby-gems"; path=(symlinkJoin "ruby-gems" (with rubyLibs.merge { Modified: configurations/trunk/misc/raskin/package-groups.nix ============================================================================== --- configurations/trunk/misc/raskin/package-groups.nix Fri Mar 30 07:32:54 2012 (r33485) +++ configurations/trunk/misc/raskin/package-groups.nix Fri Mar 30 08:00:39 2012 (r33486) @@ -26,7 +26,7 @@ vala yap prover9 swiProlog gambit gcl jre jdk spidermonkey coq eprover /*isabelle*/ leo2 cvc3 - matita picolisp hol tptp + matita picolisp hol tptp go pythonPackages.setuptools satallax avrgcclibc clojure rLang pure ]; @@ -102,8 +102,7 @@ opera chromeWrapper /*mozplugger*/ - (wrapFirefox { browser = firefox90Pkgs.firefox; nameSuffix="9"; }) - (wrapFirefox { browser = firefox90Pkgs.firefox; nameSuffix=""; }) + (wrapFirefox { browser = firefox11Pkgs.firefox; nameSuffix=""; }) ]; graphicEdit = [ @@ -116,7 +115,7 @@ fatXApps = [ - /*openoffice*/ go_oo + libreoffice /*go_oo*/ wireshark /*gnash*/ /*abiword*/ fontforgeX xchm /*scribus*/ lyx taskjuggler @@ -164,7 +163,7 @@ # acl and attr - access control list and extended # attributes support - which binutils utillinuxngCurses file mssys + which binutils utillinuxCurses file mssys xorg.lndir sqlite indent ltrace lsof pstree psmisc diffutils /*guileLint*/ gawk patchelf tmux xdelta gptfdisk @@ -326,7 +325,7 @@ xorg.libICE xorg.renderproto xorg.randrproto xorg.libXpm confuse libxdg_basedir freetype fontconfig - dbus dbus_glib gnome2.glib_networking + dbus dbus_glib glib_networking perlXMLParser ffmpeg gmp mpfr cminpack flann boehmgc libffi @@ -353,7 +352,7 @@ thunderbird openoffice gajim stumpwm ratpoison subversion mercurial monotone git - which binutils utillinuxngCurses file sqlite indent lsof psmisc diffutils screen (lowPrio nixUnstable) + which binutils utillinuxCurses file sqlite indent lsof psmisc diffutils screen (lowPrio nixUnstable) patch rlwrap gnupg pinentry btrfsProgs MPlayer Modified: configurations/trunk/misc/raskin/private-packages.nix ============================================================================== --- configurations/trunk/misc/raskin/private-packages.nix Fri Mar 30 07:32:54 2012 (r33485) +++ configurations/trunk/misc/raskin/private-packages.nix Fri Mar 30 08:00:39 2012 (r33486) @@ -1,4 +1,4 @@ -{pkgs ? (import /etc/nixos/nixpkgs {})} : +{pkgs ? (import <nixpkgs> {})} : with pkgs; let pp = { @@ -27,11 +27,11 @@ postInstall = x.fullDepEntry '' cd "$out/bin" mv tbe .tbe-wrapped - echo -e '#!/bin/sh\ncd "'"$out"'"\n./bin/.tbe-wrapped' > tbe + echo -e '#!/bin/sh\ncd "'"$out"'"\n./bin/.tbe-wrapped "$@"' > tbe chmod a+x tbe '' ["minInit"]; qt4 = qt48; - buildInputs = [qt48 cmake_2_8_7] ++ (lib.filter (y : y.outPath != qt48.outPath) x.buildInputs); + buildInputs = [qt48 cmake] ++ (lib.filter (y : y.outPath != qt48.outPath) x.buildInputs); })); drgeo = (drgeo.override {src="" + /home/repos/drgeo-1.1.0 + "/";}); btrfsProgs = (btrfsProgs.override { Modified: configurations/trunk/misc/raskin/raskin-asus-n53j.nix ============================================================================== --- configurations/trunk/misc/raskin/raskin-asus-n53j.nix Fri Mar 30 07:32:54 2012 (r33485) +++ configurations/trunk/misc/raskin/raskin-asus-n53j.nix Fri Mar 30 08:00:39 2012 (r33486) @@ -237,7 +237,7 @@ nixpkgs.config = import (builtins.getEnv "NIXPKGS_CONFIG"); security = { - extraSetuidPrograms = ["fusermount" + setuidPrograms = ["fusermount" "mount" "umount" "sudo" "xlaunch" "lsof" "suid-chroot" "fbterm" "pmount" "pumount" @@ -319,10 +319,6 @@ base // { nesting = { children = [ - (pkgs.lib.recursiveUpdate base { - boot.loader.grub.configurationName = "Linux 2.6.29 (stable kernel)"; - boot.kernelPackages = let a = (pkgs.linuxPackagesFor pkgs.linux_2_6_29 a); in a; - }) ]; }; } Modified: configurations/trunk/misc/raskin/raskin-config.nix ============================================================================== --- configurations/trunk/misc/raskin/raskin-config.nix Fri Mar 30 07:32:54 2012 (r33485) +++ configurations/trunk/misc/raskin/raskin-config.nix Fri Mar 30 08:00:39 2012 (r33486) @@ -77,6 +77,7 @@ xf86videointel = p.xorg.xf86videointel_2_14_901; }; grub2 = pp.grub2Bzr; + kexectools="/var/empty/"; }; libreoffice = { force = true; Modified: configurations/trunk/misc/raskin/services-main.nix ============================================================================== --- configurations/trunk/misc/raskin/services-main.nix Fri Mar 30 07:32:54 2012 (r33485) +++ configurations/trunk/misc/raskin/services-main.nix Fri Mar 30 08:00:39 2012 (r33486) @@ -22,7 +22,7 @@ writeable = true; }; }; - gw6c = { + gogoclient = { enable = true; # I failed to make tunnel really reliable with @@ -31,12 +31,8 @@ autorun = false; username = (import /root/nix-sysconfig/gw6c.nix).username; - password = (import /root/nix-sysconfig/gw6c.nix).password; + password = "/root/nix-sysconfig/gw6c.pass"; server = (import /root/nix-sysconfig/gw6c.nix).server; - - everPing = "4"; - - waitPingableBroker = false; }; ircdHybrid = { enable = true; @@ -185,7 +181,7 @@ hostName = "401a0bf1"; }; - nfsKernel = { + nfs = { server = { enable = true; exports = '' _______________________________________________ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits