Author: raskin
Date: Tue Apr 24 10:08:16 2012
New Revision: 33905
URL: https://nixos.org/websvn/nix/?rev=33905&sc=1
Log:
Package set updates
Modified:
configurations/trunk/misc/raskin/lesser-expressions/raskin-user.nix
Modified: configurations/trunk/misc/raskin/lesser-expressions/raskin-user.nix
==============================================================================
--- configurations/trunk/misc/raskin/lesser-expressions/raskin-user.nix Tue Apr
24 10:07:53 2012 (r33904)
+++ configurations/trunk/misc/raskin/lesser-expressions/raskin-user.nix Tue Apr
24 10:08:16 2012 (r33905)
@@ -3,7 +3,9 @@
pkgsPath = if NIXPKGS_env == "" then /etc/nixos/nixpkgs else NIXPKGS_env;
pkgs = import pkgsPath {}; in with pkgs;
let customVim = import /etc/nixos/configurations/misc/raskin/custom-vim.nix; in
+let pp = import /etc/nixos/configurations/misc/raskin/private-packages.nix
{inherit pkgs;}; in
let justUse = str: {name = str; path = builtins.getAttr str pkgs;}; in
+let ppUse = str: {name = str; path = builtins.getAttr str pp;}; in
linkFarm "raskin-packages" ([
{name="python"; path=pythonFull;}
@@ -18,19 +20,13 @@
{name="flash10"; path=flashplayer10;}
{name="mime"; path=shared_mime_info;}
{name="sgt-puzzles"; path=sgtpuzzles;}
- {name="gtk"; path=gtk;}
- {name="gtk3"; path=gtk3;}
- {name="atk"; path=gtkLibs.atk;}
- {name="glib"; path=gtkLibs.glib;}
{name="gtkglext"; path=gnome.gtkglext;}
- {name="pango"; path=gtkLibs.pango;}
{name="xkill"; path=xorg.xkill;}
{name="vim"; path=customVim pkgs;}
- {name="uzbl"; path=uzbl.passthru.function { src = ("" +
/home/repos/uzbl + "/"); };}
{name="ant+jdk-1.5"; path=symlinkJoin "ant+jdk-1.5" [jdk5
(apacheAnt.override {jdk=jdk5;})];}
] ++ (map justUse ["mesa" "freeglut" "cairo" "nss" "gsl"
"libev" "libuuid" "pyxml" "libxml2" "zlib"
- "libxslt"
+ "libxslt" "gtk" "gtk3" "atk" "glib" "pango"
"gmp" "mpfr" "libpng" "libtiff" "fuse" "sbcl" "sqlite"
"ncurses" "glibcLocales" "libffi"
"libreoffice" "allegro" "cgui"
@@ -43,7 +39,10 @@
"hicolor_icon_theme" "libfixposix"
# "plan9port"
"pygtk" "pygobject" "pycairo" "ruby18"
+ "webkit_gtk2" "webkit"
])
+ ++
+ (map ppUse ["julia" "uzbl"])
++
[
{name="dbus-services"; path=(symlinkJoin "dbus-services"
@@ -71,7 +70,7 @@
$glib/bin/glib-compile-schemas
"$out"/share/glib-2.0/schemas
'');
}
- {name="ruby-gems"; path=(symlinkJoin "ruby-gems"
+ /*{name="ruby-gems"; path=(symlinkJoin "ruby-gems"
(with rubyLibs.merge {
generated=(import "${builtins.getEnv
"HOME"}/.nix-personal/ruby-gems/generated.nix");};
lib.closePropagation [
@@ -85,7 +84,7 @@
gherkin cucumber cucumber_rails database_cleaner
builder postgresql
]));
- }
+ }*/
#{name="eql-env"; path=(symlinkJoin "eql-env" [eql ecl gmp mpfr
gcc glibc]);}
{name="java32"; path=pkgsi686Linux.jre;}
{name="mesa32"; path=pkgsi686Linux.mesa;}
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
