From a73c3a96e6d15aa929abcb09b1e42587c3242625 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 29 Aug 2010 10:37:58 +0000
Subject: [PATCH 001/181] Correct patch for AUFS2 2.6.35.*

svn path=/nixpkgs/trunk/; revision=23498
---
 pkgs/os-specific/linux/kernel/aufs2-35.patch | 164 +++++++++----------
 1 file changed, 78 insertions(+), 86 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/aufs2-35.patch b/pkgs/os-specific/linux/kernel/aufs2-35.patch
index 57e1889e2bb..30776e64106 100644
--- a/pkgs/os-specific/linux/kernel/aufs2-35.patch
+++ b/pkgs/os-specific/linux/kernel/aufs2-35.patch
@@ -1,7 +1,3 @@
-From:
-http://git.c3sl.ufpr.br/gitweb?p=aufs/aufs2-standalone.git;a=blob;f=aufs2-base.patch;h=d90958dc45a6beb48836e9bf37847abbabed6854;hb=aufs2-35
-http://git.c3sl.ufpr.br/gitweb?p=aufs/aufs2-standalone.git;a=blob;f=aufs2-standalone.patch;h=e1ae93d5f2073505e15739cf195d016880b064e6;hb=aufs2-35
-
 aufs2 base patch for linux-2.6.35
 
 diff --git a/fs/namei.c b/fs/namei.c
@@ -15,17 +11,15 @@ index 868d0cb..6e92c81 100644
 -static struct dentry *lookup_hash(struct nameidata *nd)
 +struct dentry *lookup_hash(struct nameidata *nd)
  {
-        int err;
+ 	int err;
  
-@@ -1188,7 +1188,7 @@ static struct dentry *lookup_hash(struct nameidata *nd)
-        return __lookup_hash(&nd->last, nd->path.dentry, nd);
- }
+@@ -1190,5 +1190,5 @@
  
 -static int __lookup_one_len(const char *name, struct qstr *this,
 +int __lookup_one_len(const char *name, struct qstr *this,
-                struct dentry *base, int len)
+ 		struct dentry *base, int len)
  {
-        unsigned long hash;
+ 	unsigned long hash;
 diff --git a/fs/splice.c b/fs/splice.c
 index efdbfec..e01a51e 100644
 --- a/fs/splice.c
@@ -35,36 +29,36 @@ index efdbfec..e01a51e 100644
   * Attempt to initiate a splice from pipe to file.
   */
 -static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
--                          loff_t *ppos, size_t len, unsigned int flags)
+-			   loff_t *ppos, size_t len, unsigned int flags)
 +long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
-+                   loff_t *ppos, size_t len, unsigned int flags)
++		    loff_t *ppos, size_t len, unsigned int flags)
  {
-        ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
-                                loff_t *, size_t, unsigned int);
+ 	ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
+ 				loff_t *, size_t, unsigned int);
 @@ -1132,9 +1132,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
  /*
   * Attempt to initiate a splice from a file to a pipe.
   */
 -static long do_splice_to(struct file *in, loff_t *ppos,
--                        struct pipe_inode_info *pipe, size_t len,
--                        unsigned int flags)
+-			 struct pipe_inode_info *pipe, size_t len,
+-			 unsigned int flags)
 +long do_splice_to(struct file *in, loff_t *ppos,
-+                 struct pipe_inode_info *pipe, size_t len,
-+                 unsigned int flags)
++		  struct pipe_inode_info *pipe, size_t len,
++		  unsigned int flags)
  {
-        ssize_t (*splice_read)(struct file *, loff_t *,
-                               struct pipe_inode_info *, size_t, unsigned int);
+ 	ssize_t (*splice_read)(struct file *, loff_t *,
+ 			       struct pipe_inode_info *, size_t, unsigned int);
 diff --git a/include/linux/namei.h b/include/linux/namei.h
 index 05b441d..91bc74e 100644
 --- a/include/linux/namei.h
 +++ b/include/linux/namei.h
 @@ -73,6 +73,9 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
  extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry,
-                int (*open)(struct inode *, struct file *));
+ 		int (*open)(struct inode *, struct file *));
  
 +extern struct dentry *lookup_hash(struct nameidata *nd);
 +extern int __lookup_one_len(const char *name, struct qstr *this,
-+                           struct dentry *base, int len);
++			    struct dentry *base, int len);
  extern struct dentry *lookup_one_len(const char *, struct dentry *, int);
  
  extern int follow_down(struct path *);
@@ -74,16 +68,15 @@ index 997c3b4..be9a153 100644
 +++ b/include/linux/splice.h
 @@ -89,4 +89,10 @@ extern int splice_grow_spd(struct pipe_inode_info *, struct splice_pipe_desc *);
  extern void splice_shrink_spd(struct pipe_inode_info *,
-                                struct splice_pipe_desc *);
+ 				struct splice_pipe_desc *);
  
 +extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
-+                          loff_t *ppos, size_t len, unsigned int flags);
++			   loff_t *ppos, size_t len, unsigned int flags);
 +extern long do_splice_to(struct file *in, loff_t *ppos,
-+                        struct pipe_inode_info *pipe, size_t len,
-+                        unsigned int flags);
++			 struct pipe_inode_info *pipe, size_t len,
++			 unsigned int flags);
 +
  #endif
-
 aufs2 standalone patch for linux-2.6.35
 
 diff --git a/fs/namei.c b/fs/namei.c
@@ -92,23 +85,23 @@ index 6e92c81..334130e 100644
 +++ b/fs/namei.c
 @@ -348,6 +348,7 @@ int deny_write_access(struct file * file)
  
-        return 0;
+ 	return 0;
  }
 +EXPORT_SYMBOL(deny_write_access);
  
  /**
   * path_get - get a reference to a path
 @@ -1187,6 +1188,7 @@ struct dentry *lookup_hash(struct nameidata *nd)
-                return ERR_PTR(err);
-        return __lookup_hash(&nd->last, nd->path.dentry, nd);
+ 		return ERR_PTR(err);
+ 	return __lookup_hash(&nd->last, nd->path.dentry, nd);
  }
 +EXPORT_SYMBOL(lookup_hash);
  
  int __lookup_one_len(const char *name, struct qstr *this,
-                struct dentry *base, int len)
+ 		struct dentry *base, int len)
 @@ -1209,6 +1211,7 @@ int __lookup_one_len(const char *name, struct qstr *this,
-        this->hash = end_name_hash(hash);
-        return 0;
+ 	this->hash = end_name_hash(hash);
+ 	return 0;
  }
 +EXPORT_SYMBOL(__lookup_one_len);
  
@@ -119,8 +112,8 @@ index 88058de..397afcc 100644
 --- a/fs/namespace.c
 +++ b/fs/namespace.c
 @@ -1279,6 +1279,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
-        }
-        return 0;
+ 	}
+ 	return 0;
  }
 +EXPORT_SYMBOL(iterate_mounts);
  
@@ -139,8 +132,8 @@ index 0e16771..3fab10a 100644
  #include <linux/fsnotify_backend.h>
  #include "fsnotify.h"
 @@ -169,6 +170,7 @@ void fsnotify_put_group(struct fsnotify_group *group)
-        fsnotify_recalc_global_mask();
-        fsnotify_destroy_group(group);
+ 	fsnotify_recalc_global_mask();
+ 	fsnotify_destroy_group(group);
  }
 +EXPORT_SYMBOL(fsnotify_put_group);
  
@@ -148,7 +141,7 @@ index 0e16771..3fab10a 100644
   * Simply run the fsnotify_groups list and find a group which matches
 @@ -252,3 +254,4 @@ struct fsnotify_group *fsnotify_obtain_group(unsigned int group_num, __u32 mask,
  
-        return group;
+ 	return group;
  }
 +EXPORT_SYMBOL(fsnotify_obtain_group);
 diff --git a/fs/notify/inode_mark.c b/fs/notify/inode_mark.c
@@ -156,32 +149,32 @@ index 0399bcb..74cdc13 100644
 --- a/fs/notify/inode_mark.c
 +++ b/fs/notify/inode_mark.c
 @@ -105,6 +105,7 @@ void fsnotify_put_mark(struct fsnotify_mark_entry *entry)
-        if (atomic_dec_and_test(&entry->refcnt))
-                entry->free_mark(entry);
+ 	if (atomic_dec_and_test(&entry->refcnt))
+ 		entry->free_mark(entry);
  }
 +EXPORT_SYMBOL(fsnotify_put_mark);
  
  /*
   * Recalculate the mask of events relevant to a given inode locked.
 @@ -215,6 +216,7 @@ void fsnotify_destroy_mark_by_entry(struct fsnotify_mark_entry *entry)
-        if (unlikely(atomic_dec_and_test(&group->num_marks)))
-                fsnotify_final_destroy_group(group);
+ 	if (unlikely(atomic_dec_and_test(&group->num_marks)))
+ 		fsnotify_final_destroy_group(group);
  }
 +EXPORT_SYMBOL(fsnotify_destroy_mark_by_entry);
  
  /*
   * Given a group, destroy all of the marks associated with that group.
 @@ -281,6 +283,7 @@ struct fsnotify_mark_entry *fsnotify_find_mark_entry(struct fsnotify_group *grou
-        }
-        return NULL;
+ 	}
+ 	return NULL;
  }
 +EXPORT_SYMBOL(fsnotify_find_mark_entry);
  
  /*
   * Nothing fancy, just initialize lists and locks and counters.
 @@ -297,6 +300,7 @@ void fsnotify_init_mark(struct fsnotify_mark_entry *entry,
-        entry->inode = NULL;
-        entry->free_mark = free_mark;
+ 	entry->inode = NULL;
+ 	entry->free_mark = free_mark;
  }
 +EXPORT_SYMBOL(fsnotify_init_mark);
  
@@ -189,7 +182,7 @@ index 0399bcb..74cdc13 100644
   * Attach an initialized mark entry to a given group and inode.
 @@ -352,6 +356,7 @@ int fsnotify_add_mark(struct fsnotify_mark_entry *entry,
  
-        return ret;
+ 	return ret;
  }
 +EXPORT_SYMBOL(fsnotify_add_mark);
  
@@ -200,8 +193,8 @@ index 5463266..d248ead 100644
 --- a/fs/open.c
 +++ b/fs/open.c
 @@ -59,6 +59,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
-        mutex_unlock(&dentry->d_inode->i_mutex);
-        return ret;
+ 	mutex_unlock(&dentry->d_inode->i_mutex);
+ 	return ret;
  }
 +EXPORT_SYMBOL(do_truncate);
  
@@ -213,7 +206,7 @@ index e01a51e..4806358 100644
 +++ b/fs/splice.c
 @@ -1128,6 +1128,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
  
-        return splice_write(pipe, out, ppos, len, flags);
+ 	return splice_write(pipe, out, ppos, len, flags);
  }
 +EXPORT_SYMBOL(do_splice_from);
  
@@ -221,7 +214,7 @@ index e01a51e..4806358 100644
   * Attempt to initiate a splice from a file to a pipe.
 @@ -1154,6 +1155,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
  
-        return splice_read(in, ppos, pipe, len, flags);
+ 	return splice_read(in, ppos, pipe, len, flags);
  }
 +EXPORT_SYMBOL(do_splice_to);
  
@@ -232,8 +225,8 @@ index 4e01599..3611e1b 100644
 --- a/security/commoncap.c
 +++ b/security/commoncap.c
 @@ -951,3 +951,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot,
-        }
-        return ret;
+ 	}
+ 	return ret;
  }
 +EXPORT_SYMBOL(cap_file_mmap);
 diff --git a/security/device_cgroup.c b/security/device_cgroup.c
@@ -242,7 +235,7 @@ index 8d9c48f..29108aa 100644
 +++ b/security/device_cgroup.c
 @@ -515,6 +515,7 @@ found:
  
-        return -EPERM;
+ 	return -EPERM;
  }
 +EXPORT_SYMBOL(devcgroup_inode_permission);
  
@@ -253,88 +246,88 @@ index 351942a..6ba84a8 100644
 --- a/security/security.c
 +++ b/security/security.c
 @@ -376,6 +376,7 @@ int security_path_mkdir(struct path *dir, struct dentry *dentry, int mode)
-                return 0;
-        return security_ops->path_mkdir(dir, dentry, mode);
+ 		return 0;
+ 	return security_ops->path_mkdir(dir, dentry, mode);
  }
 +EXPORT_SYMBOL(security_path_mkdir);
  
  int security_path_rmdir(struct path *dir, struct dentry *dentry)
  {
 @@ -383,6 +384,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry)
-                return 0;
-        return security_ops->path_rmdir(dir, dentry);
+ 		return 0;
+ 	return security_ops->path_rmdir(dir, dentry);
  }
 +EXPORT_SYMBOL(security_path_rmdir);
  
  int security_path_unlink(struct path *dir, struct dentry *dentry)
  {
 @@ -390,6 +392,7 @@ int security_path_unlink(struct path *dir, struct dentry *dentry)
-                return 0;
-        return security_ops->path_unlink(dir, dentry);
+ 		return 0;
+ 	return security_ops->path_unlink(dir, dentry);
  }
 +EXPORT_SYMBOL(security_path_unlink);
  
  int security_path_symlink(struct path *dir, struct dentry *dentry,
-                          const char *old_name)
+ 			  const char *old_name)
 @@ -398,6 +401,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry,
-                return 0;
-        return security_ops->path_symlink(dir, dentry, old_name);
+ 		return 0;
+ 	return security_ops->path_symlink(dir, dentry, old_name);
  }
 +EXPORT_SYMBOL(security_path_symlink);
  
  int security_path_link(struct dentry *old_dentry, struct path *new_dir,
-                       struct dentry *new_dentry)
+ 		       struct dentry *new_dentry)
 @@ -406,6 +410,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir,
-                return 0;
-        return security_ops->path_link(old_dentry, new_dir, new_dentry);
+ 		return 0;
+ 	return security_ops->path_link(old_dentry, new_dir, new_dentry);
  }
 +EXPORT_SYMBOL(security_path_link);
  
  int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
-                         struct path *new_dir, struct dentry *new_dentry)
+ 			 struct path *new_dir, struct dentry *new_dentry)
 @@ -416,6 +421,7 @@ int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
-        return security_ops->path_rename(old_dir, old_dentry, new_dir,
-                                         new_dentry);
+ 	return security_ops->path_rename(old_dir, old_dentry, new_dir,
+ 					 new_dentry);
  }
 +EXPORT_SYMBOL(security_path_rename);
  
  int security_path_truncate(struct path *path, loff_t length,
-                           unsigned int time_attrs)
+ 			   unsigned int time_attrs)
 @@ -424,6 +430,7 @@ int security_path_truncate(struct path *path, loff_t length,
-                return 0;
-        return security_ops->path_truncate(path, length, time_attrs);
+ 		return 0;
+ 	return security_ops->path_truncate(path, length, time_attrs);
  }
 +EXPORT_SYMBOL(security_path_truncate);
  
  int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
-                        mode_t mode)
+ 			mode_t mode)
 @@ -432,6 +439,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
-                return 0;
-        return security_ops->path_chmod(dentry, mnt, mode);
+ 		return 0;
+ 	return security_ops->path_chmod(dentry, mnt, mode);
  }
 +EXPORT_SYMBOL(security_path_chmod);
  
  int security_path_chown(struct path *path, uid_t uid, gid_t gid)
  {
 @@ -439,6 +447,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid)
-                return 0;
-        return security_ops->path_chown(path, uid, gid);
+ 		return 0;
+ 	return security_ops->path_chown(path, uid, gid);
  }
 +EXPORT_SYMBOL(security_path_chown);
  
  int security_path_chroot(struct path *path)
  {
 @@ -515,6 +524,7 @@ int security_inode_readlink(struct dentry *dentry)
-                return 0;
-        return security_ops->inode_readlink(dentry);
+ 		return 0;
+ 	return security_ops->inode_readlink(dentry);
  }
 +EXPORT_SYMBOL(security_inode_readlink);
  
  int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd)
  {
 @@ -529,6 +539,7 @@ int security_inode_permission(struct inode *inode, int mask)
-                return 0;
-        return security_ops->inode_permission(inode, mask);
+ 		return 0;
+ 	return security_ops->inode_permission(inode, mask);
  }
 +EXPORT_SYMBOL(security_inode_permission);
  
@@ -342,18 +335,17 @@ index 351942a..6ba84a8 100644
  {
 @@ -622,6 +633,7 @@ int security_file_permission(struct file *file, int mask)
  {
-        return security_ops->file_permission(file, mask);
+ 	return security_ops->file_permission(file, mask);
  }
 +EXPORT_SYMBOL(security_file_permission);
  
  int security_file_alloc(struct file *file)
  {
 @@ -649,6 +661,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot,
-                return ret;
-        return ima_file_mmap(file, prot);
+ 		return ret;
+ 	return ima_file_mmap(file, prot);
  }
 +EXPORT_SYMBOL(security_file_mmap);
  
  int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot,
-                            unsigned long prot)
-
+ 			    unsigned long prot)

From d5f6f7234217cd2d14e3966628ac3a7e0082f51c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 29 Aug 2010 10:38:39 +0000
Subject: [PATCH 002/181] Enable AUFS2 patch

svn path=/nixpkgs/trunk/; revision=23499
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7a4996dca8d..9e91f77c4d0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4550,7 +4550,7 @@ let
     kernelPatches =
       [ #kernelPatches.fbcondecor_2_6_35
         kernelPatches.sec_perm_2_6_24
-        # kernelPatches.aufs2_2_6_35
+        kernelPatches.aufs2_2_6_35
       ];
   };
 

From 66004ecba765ad7093a69529a92f816a1026d313 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 29 Aug 2010 12:27:41 +0000
Subject: [PATCH 003/181] Update fuse and make wdfs build with the latest neon.
 neon026 does not build with the current SSL. We should either remove neon026
 or fix it.

svn path=/nixpkgs/trunk/; revision=23505
---
 pkgs/os-specific/linux/fuse/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix         | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix
index ae21134c2c0..c15cd3e0042 100644
--- a/pkgs/os-specific/linux/fuse/default.nix
+++ b/pkgs/os-specific/linux/fuse/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, utillinux }:
 
 stdenv.mkDerivation rec {
-  name = "fuse-2.8.3";
+  name = "fuse-2.8.4";
   
   builder = ./builder.sh;
   
   src = fetchurl {
     url = "mirror://sourceforge/fuse/${name}.tar.gz";
-    sha256 = "5edf7f73676976126893c528578c1bf0a264cc34ca8bad7e341e0664157ff2b9";
+    sha256 = "076y4n9ppmqlfarvm219694cn78qms7k2vh1b4454kkcgg9jmrh4";
   };
   
   configureFlags = "--disable-kernel-module";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9e91f77c4d0..9c0eaf14382 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1264,9 +1264,7 @@ let
     tomcat = tomcat6;
   };
 
-  wdfs = callPackage ../tools/filesystems/wdfs {
-    neon = neon026;
-  };
+  wdfs = callPackage ../tools/filesystems/wdfs { };
 
   wdiff = callPackage ../tools/text/wdiff { };
 

From 733b2893a747074b4a4e1f409181b2a158f4a08c Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sun, 29 Aug 2010 13:40:02 +0000
Subject: [PATCH 004/181] update to 2.4.10.1, add correct license

svn path=/nixpkgs/trunk/; revision=23506
---
 pkgs/development/libraries/libgphoto2/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix
index d91aa398746..7ea9eb4db87 100644
--- a/pkgs/development/libraries/libgphoto2/default.nix
+++ b/pkgs/development/libraries/libgphoto2/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, pkgconfig, libusb, libtool, libexif, libjpeg, gettext}:
 
 stdenv.mkDerivation rec {
-  name = "libgphoto2-2.4.5";
+  name = "libgphoto2-2.4.10.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
-    sha256 = "1pipdwjxbjg7y9n5ldz6qlpiiiqyba6jx315277ams5d8jxg2bfk";
+    sha256 = "12m99hcak59ppq1ijnfsrcm09mdj102f1xjmz4myggwjdymwc3lq";
   };
   
   buildInputs = [pkgconfig libtool libjpeg gettext];
@@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.gphoto.org/proj/libgphoto2/;
     description = "A library for accessing digital cameras";
-    license = "LGPL-2";
+    license = "LGPL 2.1";
   };
 }

From fe7e41324c73ee0ffee4835cf1f62b3ff8b95db5 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sun, 29 Aug 2010 13:47:59 +0000
Subject: [PATCH 005/181] update to 0.6.19, add meta information

svn path=/nixpkgs/trunk/; revision=23507
---
 pkgs/development/libraries/libexif/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libexif/default.nix b/pkgs/development/libraries/libexif/default.nix
index 7c2c9129c26..e88a1332455 100644
--- a/pkgs/development/libraries/libexif/default.nix
+++ b/pkgs/development/libraries/libexif/default.nix
@@ -1,12 +1,19 @@
 { stdenv, fetchurl, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "libexif-0.6.16";
+  name = "libexif-0.6.19";
 
   src = fetchurl {
     url = "mirror://sourceforge/libexif/${name}.tar.bz2";
-    sha256 = "0hxc3aik3sn8xq4mbmxxb8ycx2lwffmhi5xvz0zjffhfwkaqas6v";
+    sha256 = "1gfa07bzs2lk0n887f1lvz5b9a7abyc3f5zaf39w4sf23hk9axpr";
   };
 
   buildInputs = [ gettext ];
+
+  meta = {
+    homepage = http://libexif.sourceforge.net/;
+    description = "A library to read and manipulate EXIF data in digital photographs;
+    license = "LGPL 2.1";
+  };
+
 }

From ccf724b8a822a72ff197adce9ac42587c358b8e7 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sun, 29 Aug 2010 13:49:58 +0000
Subject: [PATCH 006/181] d'oh! forgot "

svn path=/nixpkgs/trunk/; revision=23508
---
 pkgs/development/libraries/libexif/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libexif/default.nix b/pkgs/development/libraries/libexif/default.nix
index e88a1332455..ca7e611e57b 100644
--- a/pkgs/development/libraries/libexif/default.nix
+++ b/pkgs/development/libraries/libexif/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://libexif.sourceforge.net/;
-    description = "A library to read and manipulate EXIF data in digital photographs;
+    description = "A library to read and manipulate EXIF data in digital photographs";
     license = "LGPL 2.1";
   };
 

From 89c3aed22edd22bcb70f24ad3f3e5dc33ad25934 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 29 Aug 2010 14:39:35 +0000
Subject: [PATCH 007/181] Update AUFS2 to latest git for 2.6.35 - old version
 does not work with newer kernels

svn path=/nixpkgs/trunk/; revision=23511
---
 pkgs/os-specific/linux/aufs2/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/aufs2/default.nix b/pkgs/os-specific/linux/aufs2/default.nix
index 0b10962b7f7..0cf3f4bd782 100644
--- a/pkgs/os-specific/linux/aufs2/default.nix
+++ b/pkgs/os-specific/linux/aufs2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, kernel, perl }:
+{ stdenv, fetchurl, kernel, perl, fetchgit }:
 
 assert kernel.features ? aufsBase;
 
@@ -7,9 +7,10 @@ let version = "20100522"; in
 stdenv.mkDerivation {
   name = "aufs2-${version}";
 
-  src = fetchurl {
-    url = "http://nixos.org/tarballs/aufs2-standalone-git-${version}.tar.bz2";
-    sha256 = "1g4mw4qx2xzpygdwjiw36bkhfz1hi7wxx7w79n2h0lr5grzzdnd6";
+  src = fetchgit {
+    url = "http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-standalone.git";
+    rev = "d950eef373ff1e0448ad3945b734da6ab050571d";
+    sha256 = "816145b0341bd7862df50c058144cf6ebc25c05d2976f781ff0fe10d4559b853";
   };
 
   buildInputs = [ perl ];

From 65e7754f51f4fde4100d49e2291e5c05daa0b8a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 29 Aug 2010 15:53:42 +0000
Subject: [PATCH 008/181] Allowing abcde to make mp3. I had to add id3v2, and
 fix the id3lib build.

svn path=/nixpkgs/trunk/; revision=23513
---
 pkgs/applications/audio/abcde/default.nix     |   6 +-
 pkgs/development/libraries/id3lib/default.nix |   2 +
 .../id3lib/id3lib-3.8.3-gcc43-1.patch         | 104 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 4 files changed, 111 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/libraries/id3lib/id3lib-3.8.3-gcc43-1.patch

diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix
index 2b581f7e532..e7da594e4bc 100644
--- a/pkgs/applications/audio/abcde/default.nix
+++ b/pkgs/applications/audio/abcde/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libcdio, cddiscid, wget, bash, vorbisTools
+{ stdenv, fetchurl, libcdio, cddiscid, wget, bash, vorbisTools, id3v2, lame
 , makeWrapper }:
 
 let version = "2.3.99.6";
@@ -40,7 +40,7 @@ in
          --replace '#!/bin/bash' '#!${bash}/bin/bash'
 
       wrapProgram "$out/bin/abcde" --prefix PATH ":" \
-        "$out/bin:${libcdio}/bin:${cddiscid}/bin:${wget}/bin:${vorbisTools}/bin"
+        "$out/bin:${libcdio}/bin:${cddiscid}/bin:${wget}/bin:${vorbisTools}/bin:${id3v2}/bin:${lame}/bin"
 
       wrapProgram "$out/bin/cddb-tool" --prefix PATH ":" \
         "${wget}/bin"
@@ -58,4 +58,4 @@ in
         format, and tags them, all in one go.
       '';
     };
-  }
\ No newline at end of file
+  }
diff --git a/pkgs/development/libraries/id3lib/default.nix b/pkgs/development/libraries/id3lib/default.nix
index edbf23d516e..df8add774a1 100644
--- a/pkgs/development/libraries/id3lib/default.nix
+++ b/pkgs/development/libraries/id3lib/default.nix
@@ -2,6 +2,8 @@
 
 stdenv.mkDerivation {
   name = "id3lib-3.8.3";
+
+  patches = [ ./id3lib-3.8.3-gcc43-1.patch ];
   
   src = fetchurl {
     url = mirror://sourceforge/id3lib/id3lib-3.8.3.tar.gz;
diff --git a/pkgs/development/libraries/id3lib/id3lib-3.8.3-gcc43-1.patch b/pkgs/development/libraries/id3lib/id3lib-3.8.3-gcc43-1.patch
new file mode 100644
index 00000000000..2b7457d54c7
--- /dev/null
+++ b/pkgs/development/libraries/id3lib/id3lib-3.8.3-gcc43-1.patch
@@ -0,0 +1,104 @@
+http://www.linuxfromscratch.org/patches/downloads/id3lib/id3lib-3.8.3-gcc43-1.patch 
+
+Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
+Date: 2008-11-21
+Initial Package Version: 3.8.3
+Upstream Status: unknown
+Origin: fedora
+Description: Allows it to compile with gcc-4.3.
+
+diff -up id3lib-3.8.3/include/id3/id3lib_strings.h~ id3lib-3.8.3/include/id3/id3lib_strings.h
+--- id3lib-3.8.3/include/id3/id3lib_strings.h~	2003-03-02 02:23:00.000000000 +0200
++++ id3lib-3.8.3/include/id3/id3lib_strings.h	2008-01-04 01:30:52.000000000 +0200
+@@ -29,6 +29,7 @@
+ #ifndef _ID3LIB_STRINGS_H_
+ #define _ID3LIB_STRINGS_H_
+ 
++#include <cstring>
+ #include <string>
+ 
+ #if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000))
+diff -up id3lib-3.8.3/configure.in~ id3lib-3.8.3/configure.in
+--- id3lib-3.8.3/configure.in~	2008-01-04 11:39:01.000000000 +0100
++++ id3lib-3.8.3/configure.in	2008-01-04 11:39:01.000000000 +0100
+@@ -227,7 +227,6 @@ AC_CHECK_HEADERS(fstream iostream iomani
+ )
+ AC_CHECK_HEADERS(               \
+   string                        \
+-  iomanip.h                     \
+   ,,AC_MSG_ERROR([Missing a vital header file for id3lib])
+ )
+ 
+diff -up id3lib-3.8.3/configure~ id3lib-3.8.3/configure
+--- id3lib-3.8.3/configure~	2008-01-04 11:39:10.000000000 +0100
++++ id3lib-3.8.3/configure	2008-01-04 11:39:10.000000000 +0100
+@@ -22976,7 +22976,6 @@ done
+ 
+ for ac_header in \
+   string                        \
+-  iomanip.h                     \
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+diff -up id3lib-3.8.3/include/id3/writers.h~ id3lib-3.8.3/include/id3/writers.h
+--- id3lib-3.8.3/include/id3/writers.h~	2008-01-04 11:59:39.000000000 +0100
++++ id3lib-3.8.3/include/id3/writers.h	2008-01-04 11:59:39.000000000 +0100
+@@ -28,9 +28,9 @@
+ #ifndef _ID3LIB_WRITERS_H_
+ #define _ID3LIB_WRITERS_H_
+ 
++#include <cstring>
+ #include "id3/writer.h"
+ #include "id3/id3lib_streams.h"
+-//#include <string.h>
+ 
+ class ID3_CPP_EXPORT ID3_OStreamWriter : public ID3_Writer
+ {
+diff -up id3lib-3.8.3/examples/demo_info.cpp~ id3lib-3.8.3/examples/demo_info.cpp
+--- id3lib-3.8.3/examples/demo_info.cpp~	2008-01-04 12:00:56.000000000 +0100
++++ id3lib-3.8.3/examples/demo_info.cpp	2008-01-04 12:00:56.000000000 +0100
+@@ -309,7 +309,7 @@ void PrintInformation(const ID3_Tag &myT
+ 
+ #define DEBUG
+ 
+-int main( unsigned int argc, char * const argv[])
++int main(int argc, char * const argv[])
+ {
+   ID3D_INIT_DOUT();
+ 
+diff -up id3lib-3.8.3/examples/demo_copy.cpp~ id3lib-3.8.3/examples/demo_copy.cpp
+--- id3lib-3.8.3/examples/demo_copy.cpp~	2008-01-04 12:01:26.000000000 +0100
++++ id3lib-3.8.3/examples/demo_copy.cpp	2008-01-04 12:01:26.000000000 +0100
+@@ -81,7 +81,7 @@ void DisplayTags(ostream &os, luint nTag
+   }
+ }
+ 
+-int main( unsigned int argc, char * const argv[])
++int main(int argc, char * const argv[])
+ {
+   int ulFlag = ID3TT_ID3;
+   ID3D_INIT_DOUT();
+diff -up id3lib-3.8.3/examples/demo_convert.cpp~ id3lib-3.8.3/examples/demo_convert.cpp
+--- id3lib-3.8.3/examples/demo_convert.cpp~	2008-01-04 12:01:20.000000000 +0100
++++ id3lib-3.8.3/examples/demo_convert.cpp	2008-01-04 12:01:20.000000000 +0100
+@@ -84,7 +84,7 @@ void DisplayTags(ostream &os, luint nTag
+   }
+ }
+ 
+-int main( unsigned int argc, char * const argv[])
++int main(int argc, char * const argv[])
+ {
+   flags_t ulFlag = ID3TT_ALL;
+   gengetopt_args_info args;
+diff -up id3lib-3.8.3/examples/demo_tag.cpp~ id3lib-3.8.3/examples/demo_tag.cpp
+--- id3lib-3.8.3/examples/demo_tag.cpp~	2008-01-04 12:01:41.000000000 +0100
++++ id3lib-3.8.3/examples/demo_tag.cpp	2008-01-04 12:01:41.000000000 +0100
+@@ -46,7 +46,7 @@ void DisplayTags(ostream &os, luint nTag
+     os << "v2";
+ }
+ 
+-int main( unsigned int argc, char * const argv[])
++int main(int argc, char * const argv[])
+ {
+   int ulFlag = ID3TT_ID3;
+   ID3D_INIT_DOUT();
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c0eaf14382..83050c5455d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5686,6 +5686,8 @@ let
 
   icewm = callPackage ../applications/window-managers/icewm { };
 
+  id3v2 = callPackage ../applications/audio/id3v2 { };
+
   ikiwiki = callPackage ../applications/misc/ikiwiki {
     inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber
       HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder LocaleGettext

From d570082ad77fa09c6b9f9f3126ee6b44adf046ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 29 Aug 2010 15:56:11 +0000
Subject: [PATCH 009/181] Fixing id3v2 runtime error (allocation/free error)

svn path=/nixpkgs/trunk/; revision=23514
---
 .../audio/id3v2/id3v2-0.1.11-track-bad-free.patch  | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 pkgs/applications/audio/id3v2/id3v2-0.1.11-track-bad-free.patch

diff --git a/pkgs/applications/audio/id3v2/id3v2-0.1.11-track-bad-free.patch b/pkgs/applications/audio/id3v2/id3v2-0.1.11-track-bad-free.patch
new file mode 100644
index 00000000000..3222fc7f41c
--- /dev/null
+++ b/pkgs/applications/audio/id3v2/id3v2-0.1.11-track-bad-free.patch
@@ -0,0 +1,14 @@
+http://sourceforge.net/tracker/index.php?func=detail&aid=1252035&group_id=4193&atid=304193
+
+diff -up id3v2-0.1.11/id3v2.cpp~ id3v2-0.1.11/id3v2.cpp
+--- id3v2-0.1.11/id3v2.cpp~	2004-05-04 21:30:15.000000000 +0300
++++ id3v2-0.1.11/id3v2.cpp	2008-01-03 21:22:02.000000000 +0200
+@@ -423,7 +423,7 @@ int main( int argc, char *argv[])
+         {
+           // check if there is a total track number and if we only have 
+           // the track number for this file.  In this case combine them.
+-          char *currentTrackNum, *newTrackNum;
++          char *currentTrackNum, *newTrackNum = NULL;
+ 
+           if (pFrame != NULL) 
+           {

From faf4d8ca8d2a44d89c651505680a775f17ba5955 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 29 Aug 2010 18:31:51 +0000
Subject: [PATCH 010/181] Now AUFS2 has proper source for 2.6.35 and 2.6.32

svn path=/nixpkgs/trunk/; revision=23515
---
 pkgs/os-specific/linux/aufs2/default.nix | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/aufs2/default.nix b/pkgs/os-specific/linux/aufs2/default.nix
index 0cf3f4bd782..c755b993ec8 100644
--- a/pkgs/os-specific/linux/aufs2/default.nix
+++ b/pkgs/os-specific/linux/aufs2/default.nix
@@ -7,11 +7,18 @@ let version = "20100522"; in
 stdenv.mkDerivation {
   name = "aufs2-${version}";
 
-  src = fetchgit {
-    url = "http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-standalone.git";
-    rev = "d950eef373ff1e0448ad3945b734da6ab050571d";
-    sha256 = "816145b0341bd7862df50c058144cf6ebc25c05d2976f781ff0fe10d4559b853";
-  };
+  src = 
+  if (builtins.lessThan (builtins.compareVersions kernel.version "2.6.35") 0) then
+    fetchurl {
+      url = "http://nixos.org/tarballs/aufs2-standalone-git-${version}.tar.bz2";
+      sha256 = "1g4mw4qx2xzpygdwjiw36bkhfz1hi7wxx7w79n2h0lr5grzzdnd6";
+    }
+  else
+    fetchgit {
+      url = "http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-standalone.git";
+      rev = "d950eef373ff1e0448ad3945b734da6ab050571d";
+      sha256 = "816145b0341bd7862df50c058144cf6ebc25c05d2976f781ff0fe10d4559b853";
+    };
 
   buildInputs = [ perl ];
 
@@ -29,7 +36,8 @@ stdenv.mkDerivation {
   meta = {
     description = "Another Unionfs implementation for Linux (second generation)";
     homepage = http://aufs.sourceforge.net/;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
+    maintainers = [ stdenv.lib.maintainers.eelco
+                    stdenv.lib.maintainers.raskin ];
     platforms = stdenv.lib.platforms.linux;
   };
 }

From 3a0bf4d42dbcdf970610e6626442e4bfa5af8109 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 29 Aug 2010 19:17:00 +0000
Subject: [PATCH 011/181] Update wireshark

svn path=/nixpkgs/trunk/; revision=23516
---
 pkgs/applications/networking/sniffers/wireshark/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index 38270f33ba2..b0e9347a764 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, perl, pkgconfig, gtk, libpcap, flex, bison}:
 
 stdenv.mkDerivation {
-  name = "wireshark-1.3.4";
+  name = "wireshark-1.4.0rc2";
   src = fetchurl {
-    url = http://media-2.cacetech.com/wireshark/src/wireshark-1.3.4.tar.bz2;
-    sha256 = "00pyr3izg5dg8kr4sayp0fq8q360syfhs2nvj6b4ff1mdal7ra3x";
+    url = "http://www.wireshark.org/download/src/wireshark-1.4.0rc2.tar.bz2";
+    sha256 = "16fd00e1e120c7f57a8c5c8532f26d77a14ca254c2cb2c4816ec9a0499744f79";
   };
   configureFlags = "--with-pcap=${libpcap}";
   buildInputs = [perl pkgconfig gtk libpcap flex bison];

From 59942791045fbeb5c01f909498884d6f7a0fc96c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 29 Aug 2010 19:27:44 +0000
Subject: [PATCH 012/181] The main id3v2 default.nix! I forgot it.

svn path=/nixpkgs/trunk/; revision=23518
---
 pkgs/applications/audio/id3v2/default.nix | 28 +++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 pkgs/applications/audio/id3v2/default.nix

diff --git a/pkgs/applications/audio/id3v2/default.nix b/pkgs/applications/audio/id3v2/default.nix
new file mode 100644
index 00000000000..7f062b1799f
--- /dev/null
+++ b/pkgs/applications/audio/id3v2/default.nix
@@ -0,0 +1,28 @@
+{stdenv, fetchurl, id3lib, groff}:
+
+stdenv.mkDerivation rec {
+  name = "id3v2-0.1.11";
+  src = fetchurl {
+    url = "mirror://sourceforge/id3v2/${name}.tar.gz";
+    sha256 = "00r6f9yzmkrqa62dnkm8njg5cjzhmy0l17nj1ba15nrrm0mnand4";
+  };
+
+  patches = [ ./id3v2-0.1.11-track-bad-free.patch ];
+
+  buildNativeInputs = [ groff ];
+  buildInputs = [ id3lib ];
+
+  configurePhase = ''
+    export makeFlags=PREFIX=$out
+  '';
+
+  preInstall = ''
+    ensureDir $out/bin $out/man/man1
+  '';
+
+  meta = {
+    description = "A command line editor for id3v2 tags";
+    homepage = http://id3v2.sourceforge.net/;
+    license = "GPLv2+";
+  };
+}

From 0a28239504e1d919d6697eb9e23a697a203bb260 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sun, 29 Aug 2010 19:36:54 +0000
Subject: [PATCH 013/181] Make pyqt-dbus work

svn path=/nixpkgs/trunk/; revision=23519
---
 .../python-modules/pyqt/default.nix           | 29 +++++++++++++++++--
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pyqt/default.nix b/pkgs/development/python-modules/pyqt/default.nix
index e9d9ee76064..94c5b99e4db 100644
--- a/pkgs/development/python-modules/pyqt/default.nix
+++ b/pkgs/development/python-modules/pyqt/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, python, sip, qt4}:
+{stdenv, fetchurl, python, sip, qt4, pythonDBus, pkgconfig, lndir, makeWrapper }:
 
 stdenv.mkDerivation {
   name = "pyqt-x11-gpl-4.7.4";
@@ -8,9 +8,32 @@ stdenv.mkDerivation {
     sha256 = "0a7iqzp75hd29rvwhyqfmaj5ymd49wq8scysjkivhc5qkx5rh00r";
   };
   
-  configurePhase = "python ./configure.py --confirm-license -b $out/bin -d $out/lib/${python.libPrefix}/site-packages -v $out/share/sip -p $out/plugins";
+  preConfigure = ''
+    ensureDir $out
+    lndir ${pythonDBus} $out
+    export PYTHONPATH=$PYTHONPATH:$out/lib/${python.libPrefix}/site-packages
+    configureFlagsArray=( \
+      --confirm-license --bindir $out/bin \
+      --destdir $out/lib/${python.libPrefix}/site-packages \
+      --plugin-destdir $out/lib/qt4/plugins --sipdir $out/share/sip \
+      --dbus=$out/include/dbus-1.0 --verbose)
+    '';
+
+  configureScript="./configure.py";
+
+  configurePhase = ''
+    runHook preConfigure
+    python configure.py $configureFlags "''${configureFlagsArray[@]}"
+    runHook postConfigure'';
   
-  buildInputs = [ python sip qt4 ];
+  propagatedBuildInputs = [ python sip qt4 ]
+    ++ pythonDBus.propagatedBuildNativeInputs;
+  buildInputs = [ pkgconfig makeWrapper lndir ];
+
+  postInstall = ''
+    for i in $out/bin/*; do
+      wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH"
+    done'';
   
   meta = {
     description = "Python bindings for Qt";

From aaeac7d5d7b198e80da5474f20440fe4fe15fbdf Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sun, 29 Aug 2010 19:37:02 +0000
Subject: [PATCH 014/181] Upgrade to system-config-printer-1.2.4

TODO: make it work with udev (add helpers to udev PATH etc.)

svn path=/nixpkgs/trunk/; revision=23520
---
 .../misc/system-config-printer/default.nix    | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix
index 54f9bc57f0c..4191ffd6f80 100644
--- a/pkgs/tools/misc/system-config-printer/default.nix
+++ b/pkgs/tools/misc/system-config-printer/default.nix
@@ -1,15 +1,20 @@
-{stdenv, fetchurl, perl, perlXMLParser, desktop_file_utils}:
+{stdenv, fetchurl, udev, intltool, python, pkgconfig, glib, xmlto,
+  docbook_xml_dtd_412, docbook_xsl, libxml2, desktop_file_utils, libusb, cups}:
+
+stdenv.mkDerivation rec {
+  name = "${meta.name}-${meta.version}";
 
-stdenv.mkDerivation {
-  name = "system-config-printer-0.9.93";
   src = fetchurl {
-    url = http://cyberelk.net/tim/data/system-config-printer/system-config-printer-0.9.93.tar.bz2;
-    md5 = "b97deae648bc1c5825874d250a9c140c";
+    url = "http://cyberelk.net/tim/data/${meta.name}/1.2/${name}.tar.bz2";
+    sha256 = "16xjvahmdkkix7281gx7ac9zqaxgfb7pjjlgcc6kmw52cifk86ww";
+  };
+  buildInputs = [ udev intltool python pkgconfig glib xmlto docbook_xml_dtd_412
+    libxml2 docbook_xsl desktop_file_utils libusb cups];
+
+  configureFlags = "--with-udev-rules";
+
+  meta = {
+    name = "system-config-printer";
+    version = "1.2.4";
   };
-  preConfigure = ''
-    sed -i -e "s/xmlto/echo xmlto/" Makefile.in # Disable building manual pages
-    echo > man/system-config-printer.1
-    echo > man/system-config-printer-applet.1
-  ''; 
-  buildInputs = [ perl perlXMLParser desktop_file_utils ];
 }

From d53af6407c8f3b7a988700634ee19465068d166e Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 29 Aug 2010 20:10:39 +0000
Subject: [PATCH 015/181] Fix changed patch hash (checked new page)

svn path=/nixpkgs/trunk/; revision=23522
---
 pkgs/applications/window-managers/ratpoison/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix
index a13ceddbdbf..cec59ab6f6b 100644
--- a/pkgs/applications/window-managers/ratpoison/default.nix
+++ b/pkgs/applications/window-managers/ratpoison/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   patches =
     [ (fetchurl {
          url = "http://git.savannah.gnu.org/cgit/ratpoison.git/patch/?id=4ad0b38fb53506d613c4b4f7268dadfcedae9b8e";
-         sha256 = "09aa5l7qicld1prfsql6znlz3z8j67rlznw1vj7aja435rxm4lq9";
+         sha256 = "118c5b481fa22b8fefbe34e3dbb157f621a3bf5de0c7beb540001c99ff403a5f";
        })
     ];
 

From 5e19006c1e48601800bbce1fbe87bb78ccbcb5e8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 29 Aug 2010 20:50:38 +0000
Subject: [PATCH 016/181] * Add mountall to the channel.

svn path=/nixpkgs/trunk/; revision=23523
---
 pkgs/os-specific/linux/mountall/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/mountall/default.nix b/pkgs/os-specific/linux/mountall/default.nix
index 530ff250802..360a7d80c12 100644
--- a/pkgs/os-specific/linux/mountall/default.nix
+++ b/pkgs/os-specific/linux/mountall/default.nix
@@ -17,5 +17,6 @@ stdenv.mkDerivation {
   meta = {
     homepage = https://launchpad.net/ubuntu/+source/mountall;
     description = "Utility to mount all filesystems and emit Upstart events";
+    platforms = stdenv.lib.platforms.linux;    
   };
 }

From 6473176133c37cb8521e889f9be2262ffcaf2ea3 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sun, 29 Aug 2010 21:20:38 +0000
Subject: [PATCH 017/181] Split kdeutils, adopt kdePackage

Also migrate existing kdePackage users to new API

svn path=/nixpkgs/trunk/; revision=23525
---
 .../kde-4.5/accessibility/default.nix         | 11 +--
 pkgs/desktops/kde-4.5/admin/default.nix       | 10 ++-
 pkgs/desktops/kde-4.5/artwork/default.nix     | 10 ++-
 .../desktops/kde-4.5/base-runtime/default.nix | 10 ++-
 .../kde-4.5/base-workspace/default.nix        | 10 ++-
 pkgs/desktops/kde-4.5/base/default.nix        | 11 +--
 pkgs/desktops/kde-4.5/bindings/default.nix    | 13 ++--
 pkgs/desktops/kde-4.5/default.nix             | 20 ++++-
 pkgs/desktops/kde-4.5/edu/default.nix         | 10 ++-
 pkgs/desktops/kde-4.5/games/default.nix       | 10 ++-
 pkgs/desktops/kde-4.5/graphics/default.nix    | 10 ++-
 pkgs/desktops/kde-4.5/kde-package/default.nix | 77 +++++++++++++++----
 pkgs/desktops/kde-4.5/libs/default.nix        | 20 ++---
 pkgs/desktops/kde-4.5/multimedia/default.nix  | 10 ++-
 pkgs/desktops/kde-4.5/network/default.nix     | 10 ++-
 pkgs/desktops/kde-4.5/pim-runtime/default.nix | 12 +--
 pkgs/desktops/kde-4.5/pimlibs/default.nix     | 10 ++-
 .../kde-4.5/plasma-addons/default.nix         | 10 ++-
 pkgs/desktops/kde-4.5/sdk/default.nix         | 10 ++-
 .../kde-4.5/support/oxygen-icons/default.nix  | 11 +--
 .../kde-4.5/support/polkit-qt-1/default.nix   | 15 ++--
 pkgs/desktops/kde-4.5/toys/default.nix        | 10 ++-
 pkgs/desktops/kde-4.5/utils/ark.nix           | 20 +++++
 pkgs/desktops/kde-4.5/utils/default.nix       | 44 +++++------
 pkgs/desktops/kde-4.5/utils/kcalc.nix         | 15 ++++
 pkgs/desktops/kde-4.5/utils/kcharselect.nix   | 15 ++++
 pkgs/desktops/kde-4.5/utils/kdf.nix           | 15 ++++
 pkgs/desktops/kde-4.5/utils/kfloppy.nix       | 15 ++++
 pkgs/desktops/kde-4.5/utils/kgpg.nix          | 15 ++++
 .../desktops/kde-4.5/utils/kremotecontrol.nix | 15 ++++
 pkgs/desktops/kde-4.5/utils/ktimer.nix        | 15 ++++
 pkgs/desktops/kde-4.5/utils/kwallet.nix       | 15 ++++
 pkgs/desktops/kde-4.5/utils/okteta.nix        | 15 ++++
 .../desktops/kde-4.5/utils/printer-applet.nix | 21 +++++
 pkgs/desktops/kde-4.5/utils/superkaramba.nix  | 17 ++++
 pkgs/desktops/kde-4.5/utils/sweeper.nix       | 15 ++++
 pkgs/desktops/kde-4.5/webdev/default.nix      | 10 ++-
 37 files changed, 444 insertions(+), 138 deletions(-)
 create mode 100644 pkgs/desktops/kde-4.5/utils/ark.nix
 create mode 100644 pkgs/desktops/kde-4.5/utils/kcalc.nix
 create mode 100644 pkgs/desktops/kde-4.5/utils/kcharselect.nix
 create mode 100644 pkgs/desktops/kde-4.5/utils/kdf.nix
 create mode 100644 pkgs/desktops/kde-4.5/utils/kfloppy.nix
 create mode 100644 pkgs/desktops/kde-4.5/utils/kgpg.nix
 create mode 100644 pkgs/desktops/kde-4.5/utils/kremotecontrol.nix
 create mode 100644 pkgs/desktops/kde-4.5/utils/ktimer.nix
 create mode 100644 pkgs/desktops/kde-4.5/utils/kwallet.nix
 create mode 100644 pkgs/desktops/kde-4.5/utils/okteta.nix
 create mode 100644 pkgs/desktops/kde-4.5/utils/printer-applet.nix
 create mode 100644 pkgs/desktops/kde-4.5/utils/superkaramba.nix
 create mode 100644 pkgs/desktops/kde-4.5/utils/sweeper.nix

diff --git a/pkgs/desktops/kde-4.5/accessibility/default.nix b/pkgs/desktops/kde-4.5/accessibility/default.nix
index 048111389bf..3e4c65a1922 100644
--- a/pkgs/desktops/kde-4.5/accessibility/default.nix
+++ b/pkgs/desktops/kde-4.5/accessibility/default.nix
@@ -1,14 +1,15 @@
-{kdePackage, cmake, qt4, perl, alsaLib, libXi, libXtst, kdelibs, automoc4 }:
-
-kdePackage {
-  pn = "kdeaccessibility";
-  v = "4.5.0";
+{kde, cmake, qt4, perl, alsaLib, libXi, libXtst, kdelibs, automoc4 }:
 
+kde.package {
   # TODO: speech dispatcher and/or freetts
   buildInputs = [ cmake qt4 perl alsaLib libXi libXtst kdelibs automoc4 ];
 
   meta = {
     description = "KDE accessibility tools";
     license = "GPL";
+    kde = {
+      name = "kdeaccessibility";
+      version = "4.5.0";
+    };
   };
 }
diff --git a/pkgs/desktops/kde-4.5/admin/default.nix b/pkgs/desktops/kde-4.5/admin/default.nix
index 61f5b018a7b..cd360e4dab1 100644
--- a/pkgs/desktops/kde-4.5/admin/default.nix
+++ b/pkgs/desktops/kde-4.5/admin/default.nix
@@ -1,10 +1,8 @@
-{ kdePackage, cmake, qt4, pkgconfig, perl, python
+{ kde, cmake, qt4, pkgconfig, perl, python
 , sip, pyqt4, pycups, rhpl, system_config_printer
 , kdelibs, kdepimlibs, kdebindings, automoc4}:
 
-kdePackage {
-  pn = "kdeadmin";
-  v = "4.5.0";
+kde.package {
 
   builder = ./builder.sh;
 
@@ -18,5 +16,9 @@ kdePackage {
   meta = {
     description = "KDE Administration Utilities";
     license = "GPL";
+    kde = {
+      name = "kdeadmin";
+      version = "4.5.0";
+    };
   };
 }
diff --git a/pkgs/desktops/kde-4.5/artwork/default.nix b/pkgs/desktops/kde-4.5/artwork/default.nix
index ca036322f48..15fbb4b202a 100644
--- a/pkgs/desktops/kde-4.5/artwork/default.nix
+++ b/pkgs/desktops/kde-4.5/artwork/default.nix
@@ -1,9 +1,7 @@
-{ kdePackage, cmake, qt4, perl, xscreensaver
+{ kde, cmake, qt4, perl, xscreensaver
 , kdelibs, kdebase_workspace, automoc4, strigi, eigen}:
 
-kdePackage {
-  pn = "kdeartwork";
-  v = "4.5.0";
+kde.package {
 
   buildInputs = [ cmake qt4 perl xscreensaver kdelibs kdebase_workspace automoc4
     strigi eigen ];
@@ -16,5 +14,9 @@ kdePackage {
     description = "KDE artwork";
     longDescription = "Contains various artwork for KDE such as backgrounds, icons and screensavers";
     license = "LGPL";
+    kde = {
+      name = "kdeartwork";
+      version = "4.5.0";
+    };
   };
 }
diff --git a/pkgs/desktops/kde-4.5/base-runtime/default.nix b/pkgs/desktops/kde-4.5/base-runtime/default.nix
index c4a3b9bd6f7..95e15a76061 100644
--- a/pkgs/desktops/kde-4.5/base-runtime/default.nix
+++ b/pkgs/desktops/kde-4.5/base-runtime/default.nix
@@ -1,10 +1,8 @@
-{ kdePackage, cmake, perl, bzip2, xz, qt4, alsaLib, xineLib, samba,
+{ kde, cmake, perl, bzip2, xz, qt4, alsaLib, xineLib, samba,
   shared_mime_info, exiv2, libssh , kdelibs, automoc4, strigi, soprano,
   cluceneCore, attica, virtuoso, makeWrapper, oxygen_icons }:
 
-kdePackage {
-  pn = "kdebase-runtime";
-  v = "4.5.0";
+kde.package {
 
   buildInputs = [ cmake perl bzip2 xz qt4 alsaLib xineLib samba shared_mime_info
     exiv2 libssh kdelibs automoc4 strigi soprano cluceneCore attica
@@ -24,5 +22,9 @@ kdePackage {
     description = "KDE runtime";
     longDescription = "Libraries and tools which supports running KDE desktop applications";
     license = "LGPL";
+    kde = {
+      name = "kdebase-runtime";
+      version = "4.5.0";
+    };
   };
 }
diff --git a/pkgs/desktops/kde-4.5/base-workspace/default.nix b/pkgs/desktops/kde-4.5/base-workspace/default.nix
index d861d8f1ea8..169eb87f953 100644
--- a/pkgs/desktops/kde-4.5/base-workspace/default.nix
+++ b/pkgs/desktops/kde-4.5/base-workspace/default.nix
@@ -1,4 +1,4 @@
-{ kdePackage, cmake, perl, python, pam, consolekit
+{ kde, cmake, perl, python, pam, consolekit
 , qt4, sip, pyqt4, kdelibs, kdepimlibs, kdebindings
 , libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage, libXScrnSaver
 , lm_sensors, libxklavier, libusb, libpthreadstubs, boost
@@ -6,9 +6,7 @@
 , libdbusmenu_qt, libqalculate, pciutils, libraw1394, bluez
 }:
 
-kdePackage {
-  pn = "kdebase-workspace";
-  v = "4.5.0";
+kde.package {
 
 # TODO: qedje, qzion, ggadgets, libgps
   buildInputs = [ cmake perl python qt4 pam consolekit sip pyqt4 kdelibs libXtst
@@ -21,5 +19,9 @@ kdePackage {
     description = "KDE Workspace";
     longDescription = "KDE base components that are only required to work with X11 such KDM and KWin";
     license = "GPL";
+    kde = {
+      name = "kdebase-workspace";
+      version = "4.5.0";
+    };
   };
 }
diff --git a/pkgs/desktops/kde-4.5/base/default.nix b/pkgs/desktops/kde-4.5/base/default.nix
index 02c38bacede..bb3518fe300 100644
--- a/pkgs/desktops/kde-4.5/base/default.nix
+++ b/pkgs/desktops/kde-4.5/base/default.nix
@@ -1,10 +1,7 @@
-{ kdePackage, cmake, perl, qt4, kdelibs, pciutils, libraw1394
+{ kde, cmake, perl, qt4, kdelibs, pciutils, libraw1394
 , automoc4, strigi, qimageblitz, soprano}:
 
-kdePackage {
-  pn = "kdebase";
-  v = "4.5.0";
-
+kde.package {
   preConfigure = "cd apps";
 
   buildInputs = [ cmake perl qt4 kdelibs pciutils libraw1394 automoc4
@@ -14,5 +11,9 @@ kdePackage {
     description = "KDE Base components";
     longDescription = "Applications that form the KDE desktop, like Plasma, System Settings, Konqueror, Dolphin, Kate, and Konsole";
     license = "GPL";
+    kde = {
+      name = "kdebase";
+      version = "4.5.0";
+    };
   };
 }
diff --git a/pkgs/desktops/kde-4.5/bindings/default.nix b/pkgs/desktops/kde-4.5/bindings/default.nix
index 232dcaa2b12..4d0567a2d4c 100644
--- a/pkgs/desktops/kde-4.5/bindings/default.nix
+++ b/pkgs/desktops/kde-4.5/bindings/default.nix
@@ -1,21 +1,18 @@
-{ kdePackage, lib, cmake, perl, python, sip, pyqt4, zlib, libpng, freetype, fontconfig, qt4, boost
+{ kde, lib, cmake, perl, python, sip, pyqt4, zlib, libpng, freetype, fontconfig, qt4, boost
 , kdelibs, kdepimlibs, automoc4, soprano, akonadi, attica, polkit_qt_1, ruby
 }:
 
 # This function will only build the pykde4 module. I don't need the other bindings and
 # some bindings are even broken.
 
-kdePackage rec {
-  pn = "kdebindings";
-  v = "4.5.0";
-
+kde.package rec {
   patches = [ ./python-site-packages-install-dir.diff ];
 
   preConfigure = ''
     CUSTOM_RUBY_SITE_ARCH_DIR=$(ruby -r rbconfig -e "print Config::CONFIG['sitearchdir']" | sed -e "s@${ruby}@$out@")
     CUSTOM_RUBY_SITE_LIB_DIR=$(ruby -r rbconfig -e "print Config::CONFIG['sitelibdir']" | sed -e "s@${ruby}@$out@")
     CUSTOM_PERL_SITE_ARCH_DIR=$(perl -MConfig -e 'print $Config{sitearch}' | sed -e "s@${perl}@$out@")
-    cmakeFlagsArray=(
+    cmakeFlagsArray+=(
       -DSIP_DEFAULT_SIP_DIR=$out/share/sip
       -DCUSTOM_RUBY_SITE_ARCH_DIR=$CUSTOM_RUBY_SITE_ARCH_DIR
       -DCUSTOM_RUBY_SITE_LIB_DIR=$CUSTOM_RUBY_SITE_LIB_DIR
@@ -31,6 +28,10 @@ kdePackage rec {
     description = "KDE bindings";
     longDescription = "Provides KDE bindings for several languages such as Java, Smoke and Python";
     license = "LGPL";
+    kde = {
+      name = "kdebindings";
+      version = "4.5.0";
+    };
   };
 }
 
diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix
index 1d2abb5284a..116801495cc 100644
--- a/pkgs/desktops/kde-4.5/default.nix
+++ b/pkgs/desktops/kde-4.5/default.nix
@@ -3,11 +3,13 @@
 {
   recurseForRelease = true;
 
+  inherit callPackage;
+
   qt4 = qt47;
 
   phonon = null;
 
-  kdePackage = import ./kde-package {
+  kde = import ./kde-package {
     inherit stdenv fetchurl;
   };
 
@@ -58,7 +60,21 @@
   kdeplasma_addons = callPackage ./plasma-addons { };
   kdesdk = callPackage ./sdk { };
   kdetoys = callPackage ./toys { };
-  kdeutils = callPackage ./utils { };
+
+  ark = callPackage ./utils/ark.nix { };
+  kcalc = callPackage ./utils/kcalc.nix { };
+  kcharselect = callPackage ./utils/kcharselect.nix { };
+  kdf = callPackage ./utils/kdf.nix { };
+  kfloppy = callPackage ./utils/kfloppy.nix { };
+  kgpg = callPackage ./utils/kgpg.nix { };
+  kremotecontrol = callPackage ./utils/kremotecontrol.nix { };
+  ktimer = callPackage ./utils/ktimer.nix { };
+  kwallet = callPackage ./utils/kwallet.nix { };
+  okteta = callPackage ./utils/okteta.nix { };
+  printer_applet = callPackage ./utils/printer-applet.nix { };
+  superkaramba = callPackage ./utils/superkaramba.nix { };
+  sweeper = callPackage ./utils/sweeper.nix { };
+
   kdewebdev = callPackage ./webdev { };
 
   #kdepim_runtime = callPackage ../kde-4.4/pim-runtime { };
diff --git a/pkgs/desktops/kde-4.5/edu/default.nix b/pkgs/desktops/kde-4.5/edu/default.nix
index 2b9fe044dfd..8fa979be78f 100644
--- a/pkgs/desktops/kde-4.5/edu/default.nix
+++ b/pkgs/desktops/kde-4.5/edu/default.nix
@@ -1,10 +1,8 @@
-{ kdePackage, cmake, qt4, perl, libxml2, libxslt, openbabel, boost, readline, gmm, gsl
+{ kde, cmake, qt4, perl, libxml2, libxslt, openbabel, boost, readline, gmm, gsl
 , xplanet, libspectre, pkgconfig, libqalculate
 , kdelibs, automoc4, eigen, attica}:
 
-kdePackage {
-  pn = "kdeedu";
-  v = "4.5.0";
+kde.package {
 
 #TODO:
 #* Boost.Python (1.31 or higher)  <http://www.boost.org/> - fails to find
@@ -23,5 +21,9 @@ kdePackage {
   meta = {
     description = "KDE Educative software";
     license = "GPL";
+    kde = {
+      name = "kdeedu";
+      version = "4.5.0";
+    };
   };
 }
diff --git a/pkgs/desktops/kde-4.5/games/default.nix b/pkgs/desktops/kde-4.5/games/default.nix
index 662813ce86e..a770612c478 100644
--- a/pkgs/desktops/kde-4.5/games/default.nix
+++ b/pkgs/desktops/kde-4.5/games/default.nix
@@ -1,9 +1,7 @@
-{kdePackage, cmake, qt4, perl, shared_mime_info, kdelibs, automoc4, qca2
+{kde, cmake, qt4, perl, shared_mime_info, kdelibs, automoc4, qca2
 , kdebindings, twisted, python, pyqt4, sip, makeWrapper }:
 
-kdePackage {
-  pn = "kdegames";
-  v = "4.5.0";
+kde.package {
 
 # TODO: ggz
   buildInputs = [ cmake qt4 perl shared_mime_info kdelibs automoc4 qca2
@@ -16,5 +14,9 @@ kdePackage {
   meta = {
     description = "KDE Games";
     license = "GPL";
+    kde = {
+      name = "kdegames";
+      version = "4.5.0";
+    };
   };
 }
diff --git a/pkgs/desktops/kde-4.5/graphics/default.nix b/pkgs/desktops/kde-4.5/graphics/default.nix
index 555f5ef32e3..6a69641b3bd 100644
--- a/pkgs/desktops/kde-4.5/graphics/default.nix
+++ b/pkgs/desktops/kde-4.5/graphics/default.nix
@@ -1,10 +1,8 @@
-{ kdePackage, cmake, lib, perl, qt4, exiv2, lcms, saneBackends, libgphoto2
+{ kde, cmake, lib, perl, qt4, exiv2, lcms, saneBackends, libgphoto2
 , libspectre, popplerQt4, djvulibre, chmlib, shared_mime_info, libXxf86vm
 , kdelibs, automoc4, strigi, qimageblitz, soprano, qca2, ebook_tools }:
 
-kdePackage {
-  pn = "kdegraphics";
-  v = "4.5.0";
+kde.package {
 
   buildInputs = [ cmake perl qt4 exiv2 lcms saneBackends libgphoto2 libspectre
     (popplerQt4.override { inherit qt4; }) chmlib shared_mime_info libXxf86vm
@@ -17,5 +15,9 @@ kdePackage {
       Okular  document reader.
     '';
     license = "GPL";
+    kde = {
+      name = "kdegraphics";
+      version = "4.5.0";
+    };
   };
 }
diff --git a/pkgs/desktops/kde-4.5/kde-package/default.nix b/pkgs/desktops/kde-4.5/kde-package/default.nix
index 9e1ef5006fd..9e20b983e19 100644
--- a/pkgs/desktops/kde-4.5/kde-package/default.nix
+++ b/pkgs/desktops/kde-4.5/kde-package/default.nix
@@ -1,21 +1,64 @@
 { stdenv, fetchurl }:
 
-let
+rec {
   manifest = import ./manifest.nix;
-in
 
-a@{ pn, v, stable ? true, subdir ? null, ... }:
-stdenv.mkDerivation ({
-  name = "${pn}-${v}";
-  src = fetchurl {
-    url = "mirror://kde/" + (if stable then "" else "un") + "stable/" +
-      (if subdir == null then "${v}/src" else subdir) + "/${pn}-${v}.tar.bz2";
-    sha256 = builtins.getAttr "${pn}-${v}.tar.bz2" manifest;
-  };
-  meta = {
-    maintainers = with stdenv.lib.maintainers; [ sander urkud ];
-    platforms = stdenv.lib.platforms.linux;
-    inherit stable;
-    homepage = http://www.kde.org;
-  } // ( if a ? meta then a.meta else { } );
-} // (removeAttrs a [ "meta" "pn" "v" "stable" "subdir" ]))
+  kdeSrc = { stable ? true, subdir ? null, module, release, sha256 ? null } :
+    fetchurl {
+      url = "mirror://kde/" + (if stable then "" else "un") + "stable/"
+        + (if subdir == null then "${release}/src" else subdir)
+        + "/${module}-${release}.tar.bz2";
+      sha256 =
+        if sha256 != null then sha256
+        else builtins.getAttr "${module}-${release}.tar.bz2" manifest;
+    };
+
+  defaultArgs = {name, stable ? true, subdir ? null, version,
+    module ? name, release ? version, ... }:
+
+    assert (name == module) -> (release == version);
+
+    (
+      {
+        name = "${name}-${version}";
+
+        src = kdeSrc { inherit stable subdir module release; };
+
+        meta = {
+          maintainers = with stdenv.lib.maintainers; [ sander urkud ];
+          platforms = stdenv.lib.platforms.linux;
+          homepage = if name == module
+            then http://www.kde.org
+            else assert builtins.substring 0 3 module == "kde";
+              "http://"
+              + builtins.substring 3
+                (builtins.sub (builtins.stringLength module) 3) module
+              + ".kde.org/projects/${name}";
+        };
+      } // (if module == name then { } else {
+        cmakeFlags = ''
+          -DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE
+          -DBUILD_doc=TRUE -DBUILD_${name}=TRUE'';
+      })
+    );
+
+  package = a@{meta, ...}:
+    assert a.meta ? kde;
+    let
+      default = defaultArgs a.meta.kde;
+    in
+# hand-written merge
+    stdenv.mkDerivation (
+      default
+        // removeAttrs a [ "meta" "cmakeFlags" ]
+        // {
+          meta = default.meta // a.meta;
+        }
+        // (if default ? cmakeFlags || a ? cmakeFlags then {
+          cmakeFlags =
+            (if default ? cmakeFlags then "${default.cmakeFlags}" else "")
+            + (if default ? cmakeFlags && a ? cmakeFlags then " " else "")
+            + (if a ? cmakeFlags then a.cmakeFlags else "");
+        } else { }
+      ));
+}
diff --git a/pkgs/desktops/kde-4.5/libs/default.nix b/pkgs/desktops/kde-4.5/libs/default.nix
index 959a0eddd66..b5f1a6e3758 100644
--- a/pkgs/desktops/kde-4.5/libs/default.nix
+++ b/pkgs/desktops/kde-4.5/libs/default.nix
@@ -1,13 +1,11 @@
-{ kdePackage, gcc, cmake, perl
+{ kde, gcc, cmake, perl
 , qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper
 , xz, flex, bison, openexr, aspell, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver
 , automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt
 , docbook_xml_dtd_42, docbook_xsl, polkit_qt_1
 }:
 
-kdePackage {
-  pn = "kdelibs";
-  v = "4.5.0";
+kde.package {
 
   buildInputs = [
     cmake perl qt4 xz flex bison bzip2 pcre fam libxml2 libxslt
@@ -22,14 +20,18 @@ kdePackage {
 
   # cmake fails to find acl.h because of C++-style comment
   # TODO: OpenEXR, hspell
-  cmakeFlags = [
-    "-DHAVE_ACL_LIBACL_H=ON" "-DHAVE_SYS_ACL_H=ON"
-    "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"
-    "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"
-    ];
+  cmakeFlags = ''
+    -DHAVE_ACL_LIBACL_H=ON -DHAVE_SYS_ACL_H=ON
+    -DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook
+    -DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook
+    '';
 
   meta = {
     description = "KDE libraries";
     license = "LGPL";
+    kde = {
+      name = "kdelibs";
+      version = "4.5.0";
+    };
   };
 }
diff --git a/pkgs/desktops/kde-4.5/multimedia/default.nix b/pkgs/desktops/kde-4.5/multimedia/default.nix
index 9a020970c5d..888dc3812de 100644
--- a/pkgs/desktops/kde-4.5/multimedia/default.nix
+++ b/pkgs/desktops/kde-4.5/multimedia/default.nix
@@ -1,9 +1,7 @@
-{ kdePackage, cmake, perl, qt4, alsaLib, libvorbis, xineLib, taglib, flac,
+{ kde, cmake, perl, qt4, alsaLib, libvorbis, xineLib, taglib, flac,
 cdparanoia, lame , kdelibs, automoc4, ffmpeg}:
 
-kdePackage {
-  pn = "kdemultimedia";
-  v = "4.5.0";
+kde.package {
 
   buildInputs = [ cmake perl qt4 alsaLib libvorbis xineLib flac taglib
     cdparanoia lame kdelibs automoc4 ffmpeg ];
@@ -14,5 +12,9 @@ kdePackage {
       Contains various Multimedia utilties for KDE such as a movie player and sound volume mixer.
     '';
     license = "GPL";
+    kde = {
+      name = "kdemultimedia";
+      version = "4.5.0";
+    };
   };
 }
diff --git a/pkgs/desktops/kde-4.5/network/default.nix b/pkgs/desktops/kde-4.5/network/default.nix
index e7e4a8cd561..4bbdf50dd55 100644
--- a/pkgs/desktops/kde-4.5/network/default.nix
+++ b/pkgs/desktops/kde-4.5/network/default.nix
@@ -1,12 +1,10 @@
-{ kdePackage, cmake, qt4, perl, speex, gmp, libxml2, libxslt, sqlite, alsaLib, libidn
+{ kde, cmake, qt4, perl, speex, gmp, libxml2, libxslt, sqlite, alsaLib, libidn
 , libvncserver, libmsn, giflib, gpgme, boost, libv4l, libotr
 , libXi, libXtst, libXdamage, libXxf86vm, libktorrent, kdebase
 , kdebase_workspace
 , kdelibs, kdepimlibs, automoc4, qca2, soprano, qimageblitz, strigi}:
 
-kdePackage {
-  pn = "kdenetwork";
-  v = "4.5.0";
+kde.package {
 
   buildInputs = [ cmake qt4 perl speex gmp libxml2 libxslt sqlite alsaLib libidn
     libvncserver libmsn giflib gpgme boost libv4l libotr libXi libXtst
@@ -30,5 +28,9 @@ kdePackage {
     description = "KDE network utilities";
     longDescription = "Various network utilities for KDE such as a messenger client and network configuration interface";
     license = "GPL";
+    kde = {
+      name = "kdenetwork";
+      version = "4.5.0";
+    };
   };
 }
diff --git a/pkgs/desktops/kde-4.5/pim-runtime/default.nix b/pkgs/desktops/kde-4.5/pim-runtime/default.nix
index 2d1787f62a7..f4f0aac0a79 100644
--- a/pkgs/desktops/kde-4.5/pim-runtime/default.nix
+++ b/pkgs/desktops/kde-4.5/pim-runtime/default.nix
@@ -1,14 +1,16 @@
-{ kdePackage, cmake, kdelibs, qt4, kdepimlibs, akonadi, pkgconfig, boost, shared_mime_info, libxml2, shared_desktop_ontologies, soprano, strigi, automoc4, libxslt }:
+{ kde, cmake, kdelibs, qt4, kdepimlibs, akonadi, pkgconfig, boost, shared_mime_info, libxml2, shared_desktop_ontologies, soprano, strigi, automoc4, libxslt }:
 
-kdePackage rec {
-	pn = "kdepim-runtime";
-	v = "4.4.92";
+kde.package rec {
 	stable = false;
-	subdir = "kdepim/${v}/src";
+	subdir = "kdepim/${meta.kde.version}/src";
 
 	buildInputs = [ automoc4 cmake kdelibs qt4 kdepimlibs akonadi pkgconfig boost shared_mime_info shared_desktop_ontologies libxml2 soprano strigi libxslt ];
 
   meta = {
     description = "Runtime files for KDE PIM: akonadi agents etc.";
+    kde = {
+      name = "kdepim-runtime";
+      version = "4.4.92";
+    };
   };
 }
diff --git a/pkgs/desktops/kde-4.5/pimlibs/default.nix b/pkgs/desktops/kde-4.5/pimlibs/default.nix
index b548ad66ecd..55a5ef29adf 100644
--- a/pkgs/desktops/kde-4.5/pimlibs/default.nix
+++ b/pkgs/desktops/kde-4.5/pimlibs/default.nix
@@ -1,9 +1,7 @@
-{ kdePackage, cmake, qt4, perl, boost, cyrus_sasl, gpgme, libical, openldap, shared_mime_info
+{ kde, cmake, qt4, perl, boost, cyrus_sasl, gpgme, libical, openldap, shared_mime_info
 , kdelibs, automoc4, akonadi, soprano}:
 
-kdePackage {
-  pn = "kdepimlibs";
-  v = "4.5.0";
+kde.package {
 
   buildInputs = [ cmake qt4 perl boost cyrus_sasl gpgme libical openldap
     shared_mime_info kdelibs automoc4 akonadi soprano ];
@@ -11,5 +9,9 @@ kdePackage {
   meta = {
     description = "KDE PIM libraries";
     license = "LGPL";
+    kde = {
+      name = "kdepimlibs";
+      version = "4.5.0";
+    };
   };
 }
diff --git a/pkgs/desktops/kde-4.5/plasma-addons/default.nix b/pkgs/desktops/kde-4.5/plasma-addons/default.nix
index b6a2182c2e2..494fd0aa764 100644
--- a/pkgs/desktops/kde-4.5/plasma-addons/default.nix
+++ b/pkgs/desktops/kde-4.5/plasma-addons/default.nix
@@ -1,11 +1,9 @@
-{ kdePackage, cmake, qt4, perl, automoc4, kdelibs, soprano, kdeedu
+{ kde, cmake, qt4, perl, automoc4, kdelibs, soprano, kdeedu
 , boost, eigen, kdebase_workspace, attica, python, qca2, qimageblitz
 , shared_mime_info, kdepimlibs, kdegraphics, libqalculate, libXtst }:
 # TODO: qwt, scim, MARBLE!!
 
-kdePackage {
-  pn = "kdeplasma-addons";
-  v = "4.5.0";
+kde.package {
 
   buildInputs = [ cmake qt4 perl automoc4 kdelibs boost eigen kdebase_workspace
     attica python qca2 qimageblitz shared_mime_info kdepimlibs kdegraphics
@@ -14,5 +12,9 @@ kdePackage {
   meta = {
     description = "KDE Plasma Addons";
     license = "GPL";
+    kde = {
+      name = "kdeplasma-addons";
+      version = "4.5.0";
+    };
   };
 }
diff --git a/pkgs/desktops/kde-4.5/sdk/default.nix b/pkgs/desktops/kde-4.5/sdk/default.nix
index b03a1d88595..8b07442d9d9 100644
--- a/pkgs/desktops/kde-4.5/sdk/default.nix
+++ b/pkgs/desktops/kde-4.5/sdk/default.nix
@@ -1,10 +1,8 @@
-{ kdePackage, binutils, cmake, qt4, perl, libxml2, libxslt, boost, subversion, apr,
+{ kde, binutils, cmake, qt4, perl, libxml2, libxslt, boost, subversion, apr,
   aprutil , shared_mime_info, hunspell , kdelibs, kdepimlibs, automoc4,
   kdebindings, strigi, kdebase, libtool, antlr}:
 
-kdePackage {
-  pn = "kdesdk";
-  v = "4.5.0";
+kde.package {
 
   buildInputs = [ cmake qt4 perl libxml2 libxslt boost subversion aprutil apr
     shared_mime_info kdelibs kdepimlibs automoc4 strigi hunspell kdebindings
@@ -17,5 +15,9 @@ kdePackage {
     description = "KDE SDK";
     longDescription = "Contains various development utilities such as the Umbrello UML modeler and Cerivisia CVS front-end";
     license = "GPL";
+    kde = {
+      name = "kdesdk";
+      version = "4.5.0";
+    };
   };
 }
diff --git a/pkgs/desktops/kde-4.5/support/oxygen-icons/default.nix b/pkgs/desktops/kde-4.5/support/oxygen-icons/default.nix
index ffd7fb819e8..07bec190eb2 100644
--- a/pkgs/desktops/kde-4.5/support/oxygen-icons/default.nix
+++ b/pkgs/desktops/kde-4.5/support/oxygen-icons/default.nix
@@ -1,9 +1,6 @@
-{kdePackage, cmake}:
-
-kdePackage {
-  pn = "oxygen-icons";
-  v = "4.5.0";
+{kde, cmake}:
 
+kde.package {
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
   outputHash = "1fil2rbvy4j47gqpn4xcjvjwxy4yq5mvpwcd5lhp8fdzgsc0jmdn";
@@ -13,5 +10,9 @@ kdePackage {
     description = "KDE Oxygen theme icons";
     longDescription = "Contains icons for the KDE Oxygen theme, which is the default icon theme since KDE 4.3";
     license = "GPL";
+    kde = {
+      name = "oxygen-icons";
+      version = "4.5.0";
+    };
   };
 }
diff --git a/pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix b/pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix
index 6d0de598313..17d8b1363ac 100644
--- a/pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix
+++ b/pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix
@@ -1,10 +1,13 @@
-{ kdePackage, cmake, qt4, pkgconfig, polkit, automoc4, glib }:
-
-kdePackage {
-  pn = "polkit-qt-1";
-  v = "0.96.1";
-  subdir = "apps/KDE4.x/admin";
+{ kde, cmake, qt4, pkgconfig, polkit, automoc4, glib }:
 
+kde.package {
   buildInputs = [ cmake qt4 automoc4 ];
   propagatedBuildInputs = [ polkit glib ];
+  meta.kde = {
+    name = "polkit-qt-1";
+    module = "polkit-qt-1";
+    version = "0.96.1";
+    release = "0.96.1";
+    subdir = "apps/KDE4.x/admin";
+  };
 }
diff --git a/pkgs/desktops/kde-4.5/toys/default.nix b/pkgs/desktops/kde-4.5/toys/default.nix
index 17986600536..d3f9298c877 100644
--- a/pkgs/desktops/kde-4.5/toys/default.nix
+++ b/pkgs/desktops/kde-4.5/toys/default.nix
@@ -1,12 +1,14 @@
-{kdePackage, cmake, qt4, perl, kdelibs, kdebase_workspace, automoc4}:
+{kde, cmake, qt4, perl, kdelibs, kdebase_workspace, automoc4}:
 
-kdePackage {
-  pn = "kdetoys";
-  v = "4.5.0";
+kde.package {
 
   buildInputs = [ cmake qt4 perl kdelibs kdebase_workspace automoc4 ];
   meta = {
     description = "KDE Toys";
     license = "GPL";
+    kde = {
+      name = "kdetoys";
+      version = "4.5.0";
+    };
   };
 }
diff --git a/pkgs/desktops/kde-4.5/utils/ark.nix b/pkgs/desktops/kde-4.5/utils/ark.nix
new file mode 100644
index 00000000000..eaddd0a51ca
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/utils/ark.nix
@@ -0,0 +1,20 @@
+{ kde, cmake, kdelibs, qt4, perl, libarchive, xz, automoc4, qjson,
+  kdebase }:
+
+kde.package {
+  patchPhase = "cp -vn ${qjson}/share/apps/cmake/modules/FindQJSON.cmake cmake/modules";
+
+  buildInputs = [ cmake qt4 perl libarchive xz kdelibs automoc4 qjson
+    kdebase # for libkonq
+    ];
+
+  meta = {
+    description = "KDE Archiving Tool";
+    kde = {
+      name = "ark";
+      module = "kdeutils";
+      version = "2.15";
+      release = "4.5.0";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/utils/default.nix b/pkgs/desktops/kde-4.5/utils/default.nix
index fb038179daf..57ec64c2458 100644
--- a/pkgs/desktops/kde-4.5/utils/default.nix
+++ b/pkgs/desktops/kde-4.5/utils/default.nix
@@ -1,28 +1,28 @@
-{ kdePackage, cmake, qt4, perl, gmp, python, libzip, libarchive, xz
+{ stdenv, fetchurl, cmake, qt4, perl, gmp, python, libarchive, xz
 , sip, pyqt4, pycups, rhpl, system_config_printer, qjson, shared_mime_info
 , kdebase_workspace
 , kdelibs, kdepimlibs, kdebase, kdebindings, automoc4, qimageblitz, qca2}:
 
-kdePackage {
-  pn = "kdeutils";
-  v = "4.5.0";
-  
-  postPatch = ''
-    cp -vn ${qjson}/share/apps/cmake/modules/FindQJSON.cmake cmake/modules
-    sed -e "s@/usr\(/share/system-config-printer\)@${system_config_printer}\1@" -i \
-      printer-applet/cmake-modules/FindSystemConfigPrinter.py \
-      printer-applet/printer-applet.py
-    sed -i -e "s|import cupshelpers.ppds, cupshelpers.cupshelpers|import ppds, cupshelpers|" printer-applet/cmake-modules/FindSystemConfigPrinter.py
-    '';
-
-  buildInputs = [ cmake qt4 perl gmp python libzip libarchive xz sip pyqt4
-    pycups rhpl system_config_printer kdelibs kdepimlibs kdebase kdebindings
-    automoc4 qimageblitz qca2 qjson shared_mime_info kdebase_workspace ];
-
-  patches = [ ./log-feature.diff ];
-                  
-  meta = {
-    description = "KDE Utilities";
-    license = "GPL";
+let
+  src = fetchurl {
+    url = mirror://kde/stable/src/kdeutils-4.5.0.tar.bz2;
+    sha256 = "1x4dwc193gsfcnryhkv2v3xafjr1a87ls0zfi56i1w2aj38b36l7";
   };
+in
+{
+  ark = kdeSplitPackage
+ {
+  name = "ark-2.15";
+
+  inherit src;
+
+  patchPhase = "cp -vn ${qjson}/share/apps/cmake/modules/FindQJSON.cmake cmake/modules";
+
+  buildInputs = [ cmake qt4 perl libarchive xz kdelibs automoc4 qjson
+    kdebase # for libkonq
+    ];
+
+  cmakeFlags = "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE -DBUILD_doc=TRUE -DBUILD_ark=TRUE";
+}
+  kcalc = callPackage ./kcalc.nix { inherit src; };
 }
diff --git a/pkgs/desktops/kde-4.5/utils/kcalc.nix b/pkgs/desktops/kde-4.5/utils/kcalc.nix
new file mode 100644
index 00000000000..cc4c2d8e8d8
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/utils/kcalc.nix
@@ -0,0 +1,15 @@
+{ kde, cmake, perl, kdelibs, qt4, automoc4, gmp }:
+
+kde.package {
+  buildInputs = [ cmake qt4 perl kdelibs automoc4 gmp ];
+
+  meta = {
+    description = "KDE Calculator";
+    kde = {
+      name = "kcalc";
+      module = "kdeutils";
+      version = "2.7";
+      release = "4.5.0";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/utils/kcharselect.nix b/pkgs/desktops/kde-4.5/utils/kcharselect.nix
new file mode 100644
index 00000000000..86a49287606
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/utils/kcharselect.nix
@@ -0,0 +1,15 @@
+{ kde, cmake, kdelibs, qt4, perl, automoc4 }:
+
+kde.package {
+  buildInputs = [ cmake qt4 perl kdelibs automoc4 ];
+
+  meta = {
+    description = "KDE character selection utility";
+    kde = {
+      name = "kcharselect";
+      module = "kdeutils";
+      version = "1.7";
+      release = "4.5.0";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/utils/kdf.nix b/pkgs/desktops/kde-4.5/utils/kdf.nix
new file mode 100644
index 00000000000..78c4d6ef6e5
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/utils/kdf.nix
@@ -0,0 +1,15 @@
+{ kde, cmake, kdelibs, qt4, perl, automoc4 }:
+
+kde.package {
+  buildInputs = [ cmake qt4 perl kdelibs automoc4 ];
+
+  meta = {
+    description = "KDE free disk space utility";
+    kde = {
+      name = "kdf";
+      module = "kdeutils";
+      version = "0.11";
+      release = "4.5.0";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/utils/kfloppy.nix b/pkgs/desktops/kde-4.5/utils/kfloppy.nix
new file mode 100644
index 00000000000..9a165262000
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/utils/kfloppy.nix
@@ -0,0 +1,15 @@
+{ kde, cmake, kdelibs, qt4, perl, automoc4 }:
+
+kde.package {
+  buildInputs = [ cmake qt4 perl kdelibs automoc4 ];
+
+  meta = {
+    description = "Helps you format floppies with the filesystem of your choice";
+    kde = {
+      name = "kfloppy";
+      module = "kdeutils";
+      version = "4.5.0";
+      release = "4.5.0";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/utils/kgpg.nix b/pkgs/desktops/kde-4.5/utils/kgpg.nix
new file mode 100644
index 00000000000..fc233e62a9a
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/utils/kgpg.nix
@@ -0,0 +1,15 @@
+{ kde, cmake, kdelibs, qt4, perl, automoc4, kdepimlibs }:
+
+kde.package {
+  buildInputs = [ cmake qt4 perl kdelibs automoc4 kdepimlibs ];
+
+  meta = {
+    description = "Simple KDE GUI for gpg";
+    kde = {
+      name = "kgpg";
+      module = "kdeutils";
+      version = "2.4.0";
+      release = "4.5.0";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/utils/kremotecontrol.nix b/pkgs/desktops/kde-4.5/utils/kremotecontrol.nix
new file mode 100644
index 00000000000..9a2101934ec
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/utils/kremotecontrol.nix
@@ -0,0 +1,15 @@
+{ kde, cmake, kdelibs, qt4, perl, automoc4, kdebase_workspace }:
+
+kde.package {
+  buildInputs = [ cmake qt4 perl kdelibs automoc4 kdebase_workspace ];
+
+  meta = {
+    description = "";
+    kde = {
+      name = "kremotecontrol";
+      module = "kdeutils";
+      version = "4.5.0";
+      release = "4.5.0";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/utils/ktimer.nix b/pkgs/desktops/kde-4.5/utils/ktimer.nix
new file mode 100644
index 00000000000..89a184ba648
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/utils/ktimer.nix
@@ -0,0 +1,15 @@
+{ kde, cmake, kdelibs, qt4, perl, automoc4 }:
+
+kde.package {
+  buildInputs = [ cmake qt4 perl kdelibs automoc4 ];
+
+  meta = {
+    description = "KDE Timer";
+    kde = {
+      name = "ktimer";
+      module = "kdeutils";
+      version = "0.6";
+      release = "4.5.0";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/utils/kwallet.nix b/pkgs/desktops/kde-4.5/utils/kwallet.nix
new file mode 100644
index 00000000000..6c1d8735611
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/utils/kwallet.nix
@@ -0,0 +1,15 @@
+{ kde, cmake, kdelibs, qt4, perl, automoc4 }:
+
+kde.package {
+  buildInputs = [ cmake qt4 perl kdelibs automoc4 ];
+
+  meta = {
+    description = "KDE Wallet (password storage) management tool";
+    kde = {
+      name = "kwallet";
+      module = "kdeutils";
+      version = "1.6";
+      release = "4.5.0";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/utils/okteta.nix b/pkgs/desktops/kde-4.5/utils/okteta.nix
new file mode 100644
index 00000000000..c00ab9b13ba
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/utils/okteta.nix
@@ -0,0 +1,15 @@
+{ kde, cmake, kdelibs, qt4, perl, automoc4, shared_mime_info, qca2 }:
+
+kde.package {
+  buildInputs = [ cmake qt4 perl kdelibs automoc4 shared_mime_info qca2 ];
+
+  meta = {
+    description = "KDE byte editor";
+    kde = {
+      name = "okteta";
+      module = "kdeutils";
+      version = "0.5.0";
+      release = "4.5.0";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/utils/printer-applet.nix b/pkgs/desktops/kde-4.5/utils/printer-applet.nix
new file mode 100644
index 00000000000..ec4ee970240
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/utils/printer-applet.nix
@@ -0,0 +1,21 @@
+{ kde, cmake, kdelibs, qt4, perl, automoc4
+, python, sip, pyqt4, pycups, rhpl, system_config_printer, kdebindings,
+  pythonDBus, makeWrapper }:
+
+kde.package {
+  buildInputs = [ cmake qt4 perl kdelibs automoc4 python sip pyqt4 pycups rhpl
+    system_config_printer kdebindings makeWrapper pythonDBus ];
+
+  postInstall="wrapProgram $out/bin/printer-applet --set PYTHONPATH $PYTHONPATH";
+
+  meta = {
+    description = "KDE printer applet";
+    longDescription = "Applet to view current print jobs and configure new printers";
+    kde = {
+      name = "printer-applet";
+      module = "kdeutils";
+      version = "1.5";
+      release = "4.5.0";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/utils/superkaramba.nix b/pkgs/desktops/kde-4.5/utils/superkaramba.nix
new file mode 100644
index 00000000000..fd69c83ca3c
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/utils/superkaramba.nix
@@ -0,0 +1,17 @@
+{ kde, cmake, perl, kdelibs, qt4, automoc4, qimageblitz, python }:
+
+kde.package {
+  buildInputs = [ cmake qt4 perl kdelibs automoc4 qimageblitz python ];
+
+  cmakeFlags = "-DBUILD_icons=TRUE -DBULD_plasma=TRUE";
+
+  meta = {
+    description = "A KDE Eye-candy Application";
+    kde = {
+      name = "superkaramba";
+      module = "kdeutils";
+      version = "0.55";
+      release = "4.5.0";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/utils/sweeper.nix b/pkgs/desktops/kde-4.5/utils/sweeper.nix
new file mode 100644
index 00000000000..9c97477161d
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/utils/sweeper.nix
@@ -0,0 +1,15 @@
+{ kde, cmake, perl, kdelibs, qt4, automoc4 }:
+
+kde.package {
+  buildInputs = [ cmake qt4 perl kdelibs automoc4 ];
+
+  meta = {
+    description = "Helps clean unwanted traces the user leaves on the system";
+    kde = {
+      name = "sweeper";
+      module = "kdeutils";
+      version = "1.5";
+      release = "4.5.0";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/webdev/default.nix b/pkgs/desktops/kde-4.5/webdev/default.nix
index 24d1f49bd6c..db55fd84323 100644
--- a/pkgs/desktops/kde-4.5/webdev/default.nix
+++ b/pkgs/desktops/kde-4.5/webdev/default.nix
@@ -1,14 +1,16 @@
-{ kdePackage, cmake, qt4, perl, libxml2, libxslt, boost
+{ kde, cmake, qt4, perl, libxml2, libxslt, boost
 , kdelibs, kdepimlibs, automoc4, ruby, htmlTidy, zlib }:
 
-kdePackage {
-  pn = "kdewebdev";
-  v = "4.5.0";
+kde.package {
 
   buildInputs = [ cmake qt4 perl libxml2 libxslt boost kdelibs kdepimlibs
     automoc4 htmlTidy ruby zlib ];
   meta = {
     description = "KDE Web development utilities";
     license = "GPL";
+    kde = {
+      name = "kdewebdev";
+      version = "4.5.0";
+    };
   };
 }

From 3cdc3c4abe820380ed0f66a87123d58589f67cf1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 29 Aug 2010 21:27:06 +0000
Subject: [PATCH 018/181] * Mark the VM builds as requiring KVM support.

svn path=/nixpkgs/trunk/; revision=23526
---
 pkgs/build-support/vm/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index ca0c5f38fb7..7333582b7f5 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -334,6 +334,7 @@ rec {
      that allows you to boot into the VM and debug it interactively. */
      
   runInLinuxVM = drv: lib.overrideDerivation drv (attrs: {
+    requiredSystemFeatures = [ "kvm" ];
     builder = "${bash}/bin/sh";
     args = ["-e" (vmRunCommand qemuCommandLinux)];
     origArgs = attrs.args;
@@ -369,6 +370,7 @@ rec {
   */
   runInGenericVM = drv: lib.overrideDerivation drv (attrs: {
     system = "i686-linux";
+    requiredSystemFeatures = [ "kvm" ];
     builder = "${bash}/bin/sh";
     args = ["-e" (vmRunCommand qemuCommandGeneric)];
     QEMU_OPTS = "-m ${toString (if attrs ? memSize then attrs.memSize else 256)}";

From 25555b48e07ee81f859eaa077838ba65209314d0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 29 Aug 2010 22:00:33 +0000
Subject: [PATCH 019/181] svn path=/nixpkgs/trunk/; revision=23531

---
 pkgs/os-specific/linux/cifs-utils/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix
index d49fe20f1ad..8595b6cf6a8 100644
--- a/pkgs/os-specific/linux/cifs-utils/default.nix
+++ b/pkgs/os-specific/linux/cifs-utils/default.nix
@@ -13,5 +13,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.samba.org/linux-cifs/cifs-utils/;
     description = "Tools for managing Linux CIFS client filesystems";
+    platforms = stdenv.lib.platforms.linux;    
   };
 }

From 73eb2ce265dea08803b8d69e03c9cd86f5fc4a8d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 29 Aug 2010 22:45:14 +0000
Subject: [PATCH 020/181] svn path=/nixpkgs/trunk/; revision=23535

---
 pkgs/tools/misc/psmisc/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/misc/psmisc/default.nix b/pkgs/tools/misc/psmisc/default.nix
index 436bbd52a90..b2a2d17ad80 100644
--- a/pkgs/tools/misc/psmisc/default.nix
+++ b/pkgs/tools/misc/psmisc/default.nix
@@ -13,5 +13,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://psmisc.sourceforge.net/;
     description = "A set of small useful utilities that use the proc filesystem (such as fuser, killall and pstree)";
+    platforms = stdenv.lib.platforms.linux;    
   };
 }

From 43ac966abb1cf2932645fbc37a82692ac235dba4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 29 Aug 2010 23:22:26 +0000
Subject: [PATCH 021/181] * lsof 4.84, psmisc 22.12.

svn path=/nixpkgs/trunk/; revision=23537
---
 pkgs/development/tools/misc/lsof/default.nix | 6 +++---
 pkgs/tools/misc/psmisc/default.nix           | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix
index 08539d2aa94..628546e47a7 100644
--- a/pkgs/development/tools/misc/lsof/default.nix
+++ b/pkgs/development/tools/misc/lsof/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "lsof-4.83";
+  name = "lsof-4.84";
 
   src = fetchurl {
-    url = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.83.tar.bz2;
-    sha256 = "0i7mn4ygmrf0rvxz5vgzhmr8q7bhxrh9h2q7rpip1f9npq5r77xq";
+    url = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.84.tar.bz2;
+    sha256 = "09f71lrwav31nay3c4nwyslm887psn95dw02jr8vlgs4kcnkm290";
   };
 
   unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=$( echo lsof_*/); ";
diff --git a/pkgs/tools/misc/psmisc/default.nix b/pkgs/tools/misc/psmisc/default.nix
index b2a2d17ad80..4ee3da48f92 100644
--- a/pkgs/tools/misc/psmisc/default.nix
+++ b/pkgs/tools/misc/psmisc/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, ncurses}:
 
 stdenv.mkDerivation rec {
-  name = "psmisc-22.7";
+  name = "psmisc-22.12";
   
   src = fetchurl {
     url = "mirror://sourceforge/psmisc/${name}.tar.gz";
-    sha256 = "1b8xs4sqf8wljbxn7y1nqdf8mgbn0d2yip93jbz8lyak6d68g704";
+    sha256 = "0ykak6gf835xj0wksqbw2rjny958prayhm2fv6r3fqfs06jl2bxs";
   };
   
   buildInputs = [ncurses];
@@ -13,6 +13,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://psmisc.sourceforge.net/;
     description = "A set of small useful utilities that use the proc filesystem (such as fuser, killall and pstree)";
-    platforms = stdenv.lib.platforms.linux;    
+    platforms = stdenv.lib.platforms.linux;
   };
 }

From f6e0a38226f7a35dab198e8238e2b9b68d7d1de6 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 30 Aug 2010 09:15:27 +0000
Subject: [PATCH 022/181] added iscsitarget

svn path=/nixpkgs/trunk/; revision=23540
---
 .../os-specific/linux/iscsitarget/default.nix | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/os-specific/linux/iscsitarget/default.nix

diff --git a/pkgs/os-specific/linux/iscsitarget/default.nix b/pkgs/os-specific/linux/iscsitarget/default.nix
new file mode 100644
index 00000000000..03d01db2785
--- /dev/null
+++ b/pkgs/os-specific/linux/iscsitarget/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, kernel, module_init_tools}:
+
+stdenv.mkDerivation rec {
+  name = "iscsitarget-1.4.20.2";
+  src = fetchurl {
+    url = "mirror://sourceforge/iscsitarget/iscsitarget/1.4.20.2/${name}.tar.gz";
+    sha256 = "126kp0yc7vmvdbaw2xfav89340b0h91dvvyib5qbvyrq40n8wg0g";
+  };
+  
+  KSRC = "${kernel}/lib/modules/*/build";
+  DESTDIR="$(out)";
+  
+  preConfigure = ''
+    export PATH=$PATH:${module_init_tools}/sbin
+    sed -i 's|/usr/|/|' Makefile
+  '';
+  
+  buildInputs = [ module_init_tools ];
+  
+  meta = {
+    description = "iSCSI Enterprise Target (IET) software is for building an iSCSI storage system on Linux.";
+    license = "GPLv2+";
+    homepage = http://iscsitarget.sourceforge.net ;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 83050c5455d..6dd77b7b476 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4589,6 +4589,8 @@ let
       inherit (gtkLibs) gtkmm;
     };
 
+    iscsitarget = callPackage ../os-specific/linux/iscsitarget { };
+
     iwlwifi = callPackage ../os-specific/linux/iwlwifi { };
 
     iwlwifi4965ucode =

From 1776b95afe6a2e9bc39aa3b715a9f0ea409c96a8 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 30 Aug 2010 09:40:44 +0000
Subject: [PATCH 023/181] added open-iscsi

svn path=/nixpkgs/trunk/; revision=23541
---
 pkgs/os-specific/linux/open-iscsi/default.nix | 24 +++++++++++++++++++
 .../os-specific/linux/open-iscsi/kernel.patch | 12 ++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 38 insertions(+)
 create mode 100644 pkgs/os-specific/linux/open-iscsi/default.nix
 create mode 100644 pkgs/os-specific/linux/open-iscsi/kernel.patch

diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix
new file mode 100644
index 00000000000..80703990778
--- /dev/null
+++ b/pkgs/os-specific/linux/open-iscsi/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, kernel}:
+
+stdenv.mkDerivation rec {
+  name = "open-iscsi-2.0-871";
+  src = fetchurl {
+    url = "http://www.open-iscsi.org/bits/${name}.tar.gz";
+    sha256 = "1jvx1agybaj4czhz41bz37as076spicsmlh5pjksvwl2mr38gsmw";
+  };
+  
+  KSRC = "${kernel}/lib/modules/*/build";
+  DESTDIR="$(out)";
+  
+  preConfigure = ''
+    sed -i 's|/usr/|/|' Makefile
+  '';
+  
+  patches = [./kernel.patch];
+  
+  meta = {
+    description = "Open-iSCSI project is a high performance, transport independent, multi-platform implementation of RFC3720.";
+    license = "GPLv2+";
+    homepage = http://www.open-iscsi.org ;
+  };
+}
diff --git a/pkgs/os-specific/linux/open-iscsi/kernel.patch b/pkgs/os-specific/linux/open-iscsi/kernel.patch
new file mode 100644
index 00000000000..48dfa195400
--- /dev/null
+++ b/pkgs/os-specific/linux/open-iscsi/kernel.patch
@@ -0,0 +1,12 @@
+*** open-iscsi-2.0-871/kernel/Makefile	2009-07-11 05:55:58.000000000 +0200
+--- open-iscsi-2.0-871-new/kernel/Makefile	2010-08-30 11:37:56.000000000 +0200
+***************
+*** 101,106 ****
+--- 101,107 ----
+  linux_2_6_29: $(unpatch_code)
+  
+  linux_2_6_30: $(unpatch_code)
++ linux_2_6_32: $(unpatch_code)
+  
+  
+  do_unpatch_code:
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6dd77b7b476..c396792f9a4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4607,6 +4607,8 @@ let
     nvidia_x11_legacy173 = callPackage ../os-specific/linux/nvidia-x11/legacy173.nix { };
 
     openafsClient = callPackage ../servers/openafs-client { };
+    
+    openiscsi = callPackage ../os-specific/linux/open-iscsi { };
 
     wis_go7007 = callPackage ../os-specific/linux/wis-go7007 { };
 

From d58a372ca2e52813c26a603ef1f422ed6bf03e12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Mon, 30 Aug 2010 10:31:39 +0000
Subject: [PATCH 024/181] Version bump for Haskell text library.

svn path=/nixpkgs/trunk/; revision=23542
---
 pkgs/development/libraries/haskell/text/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/text/default.nix b/pkgs/development/libraries/haskell/text/default.nix
index e2c4b2f13d6..c146af8bb62 100644
--- a/pkgs/development/libraries/haskell/text/default.nix
+++ b/pkgs/development/libraries/haskell/text/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "text";
-  version = "0.7.1.0";
-  sha256 = "a6daa0ee43ddede620363ab26614fef69361bd5b8f77aa6918b5a4ecb083f425";
+  version = "0.7.2.1";
+  sha256 = "13b00db1363219e263a4af5b1318d2a296d67c975883cd7e17265fcd8fb1381c";
   propagatedBuildInputs = [deepseq];
   meta = {
     description = "An efficient package Unicode text type";

From e94147754c8694221de528c9d7b3d2a8c3418f08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Mon, 30 Aug 2010 17:10:21 +0000
Subject: [PATCH 025/181] Switching haskell-packages.nix to callPackage ...

svn path=/nixpkgs/trunk/; revision=23551
---
 .../libraries/haskell/AspectAG/default.nix    |    4 +-
 .../libraries/haskell/HList/default.nix       |    4 +-
 .../libraries/haskell/benchpress/default.nix  |    4 +-
 .../libraries/haskell/polyparse/default.nix   |    4 +-
 pkgs/top-level/all-packages.nix               |    4 +-
 pkgs/top-level/haskell-packages.nix           | 1337 ++++++-----------
 6 files changed, 457 insertions(+), 900 deletions(-)

diff --git a/pkgs/development/libraries/haskell/AspectAG/default.nix b/pkgs/development/libraries/haskell/AspectAG/default.nix
index c9ede897ca0..1f9737664a5 100644
--- a/pkgs/development/libraries/haskell/AspectAG/default.nix
+++ b/pkgs/development/libraries/haskell/AspectAG/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "AspectAG";
-  version = "0.1.5";
-  sha256 = "4cefc7e3404a723f0a75b29797bd9fe685c2a1b3150826b3ba09ade94565f6ff";
+  version = "0.2";
+  sha256 = "5184ba55bc89d4afd12d1fe5f20e5d62b3b7306e771a7418db805afb70638ce7";
   propagatedBuildInputs = [HList mtl];
   meta = {
     description = "Attribute Grammars in the form of an EDSL";
diff --git a/pkgs/development/libraries/haskell/HList/default.nix b/pkgs/development/libraries/haskell/HList/default.nix
index 69ff44ee6b5..0e95d1771e5 100644
--- a/pkgs/development/libraries/haskell/HList/default.nix
+++ b/pkgs/development/libraries/haskell/HList/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "HList";
-  version = "0.2";
-  sha256 = "410a77f8815cb873aff03896622e00918aaf99813bb55822942af4cc8c1a01b5";
+  version = "0.2.3";
+  sha256 = "1efbe0c2cb361ab0a9d864a09f9c58075132cb50094207260cb1363fe73c2908";
   meta = {
     description = "Heterogeneous lists";
   };
diff --git a/pkgs/development/libraries/haskell/benchpress/default.nix b/pkgs/development/libraries/haskell/benchpress/default.nix
index ce41f4d5ee8..6ccc033f02e 100644
--- a/pkgs/development/libraries/haskell/benchpress/default.nix
+++ b/pkgs/development/libraries/haskell/benchpress/default.nix
@@ -1,12 +1,12 @@
-{cabal}:
+{cabal, mtl}:
 
 cabal.mkDerivation (self : {
   pname = "benchpress";
   version = "0.2.2";
   sha256 = "185j2viimr1vbbgh9havdj2nskim8apih1fyvwln76jfrwypy194";
+  propagatedBuildInputs = [mtl];
   meta = {
     description = "Benchmarks actions and produces statistics such as min, mean, and median execution time.";
   };
-  propagatedBuildInputs = [];
 })
 
diff --git a/pkgs/development/libraries/haskell/polyparse/default.nix b/pkgs/development/libraries/haskell/polyparse/default.nix
index f5664152c65..3c9055f1680 100644
--- a/pkgs/development/libraries/haskell/polyparse/default.nix
+++ b/pkgs/development/libraries/haskell/polyparse/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "polyparse";
-  version = "1.3";
-  sha256 = "6d82f08634f0856c7919c9413199f4d5f91e753a6d796a0b61e46d7cd1ce4a24";
+  version = "1.4";
+  sha256 = "6e599fb0771e8ce2e1d3a3bbe5eddc2d77b2b4bbb54602f01005dc55dc039d44";
   meta = {
     description = "A variety of alternative parser combinator libraries";
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c396792f9a4..0695c4270ed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1759,14 +1759,14 @@ let
 
   # Helper functions to abstract away from repetitive instantiations.
   haskellPackagesFun610 = ghcPath : profDefault : recurseIntoAttrs (import ./haskell-packages.nix {
-    inherit pkgs;
+    inherit pkgs newScope;
     enableLibraryProfiling = getConfig [ "cabal" "libraryProfiling" ] profDefault;
     ghc = callPackage ghcPath {
       ghc = ghc6101Binary;    };
   });
 
   haskellPackagesFun612 = ghcPath : profDefault : recurseIntoAttrs (import ./haskell-packages.nix {
-    inherit pkgs;
+    inherit pkgs newScope;
     enableLibraryProfiling = getConfig [ "cabal" "libraryProfiling" ] profDefault;
     ghc = callPackage ghcPath {
       ghc = ghc6101Binary;    };
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 11547e6286d..3d83173b33d 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1,7 +1,14 @@
-{pkgs, ghc, enableLibraryProfiling ? false}:
+{pkgs, newScope, ghc, enableLibraryProfiling ? false}:
 
 let ghcReal = pkgs.lowPrio ghc; in
 
+let result = rec {
+
+      x = let callPackage = newScope x; in
+
+# Indentation deliberately broken at this point to keep the bulk
+# of this file at a low indentation level.
+
 rec {
 
   # ==> You're looking for a package but can't find it? Get hack-nix.
@@ -14,1177 +21,727 @@ rec {
   # it's never useful to use the wrapped GHC (`ghcReal'), as the
   # wrapper provides essential functionality: the ability to find
   # Haskell packages in the buildInputs automatically.
-  ghc = import ../development/compilers/ghc/wrapper.nix {
-    inherit (pkgs) stdenv makeWrapper;
+  ghc = callPackage ../development/compilers/ghc/wrapper.nix {
     ghc = ghcReal;
   };
 
-  cabal = import ../development/libraries/haskell/cabal/cabal.nix {
-    inherit (pkgs) stdenv fetchurl lib;
-    inherit ghc enableLibraryProfiling;
-  };
+  cabal = callPackage ../development/libraries/haskell/cabal/cabal.nix {};
 
 
   # Haskell libraries.
 
-  Agda = import ../development/libraries/haskell/Agda {
-    inherit cabal binary haskeline haskellSrc mtl utf8String xhtml zlib
-      happy alex;
-    QuickCheck = QuickCheck2;
+  Agda = callPackage ../development/libraries/haskell/Agda {
+    QuickCheck = QuickCheck_2;
   };
 
-  ansiTerminal = import ../development/libraries/haskell/ansi-terminal {
-    inherit cabal;
+  ansiTerminal = callPackage ../development/libraries/haskell/ansi-terminal {};
+
+  ansiWLPprint = callPackage ../development/libraries/haskell/ansi-wl-pprint {};
+
+  AspectAG = callPackage ../development/libraries/haskell/AspectAG {};
+
+  benchpress = callPackage ../development/libraries/haskell/benchpress {};
+
+  bimap = callPackage ../development/libraries/haskell/bimap {};
+
+  binary = callPackage ../development/libraries/haskell/binary {};
+
+  bitmap = callPackage ../development/libraries/haskell/bitmap {};
+
+  blazeHtml = callPackage ../development/libraries/haskell/blaze-html {};
+
+  bytestring = callPackage ../development/libraries/haskell/bytestring {};
+
+  networkBytestring = callPackage ../development/libraries/haskell/network-bytestring {};
+
+  cairo = callPackage ../development/libraries/haskell/cairo {
+    inherit (pkgs) cairo zlib;
   };
 
-  ansiWLPprint = import ../development/libraries/haskell/ansi-wl-pprint {
-    inherit cabal ansiTerminal;
+  cautiousFile = callPackage ../development/libraries/haskell/cautious-file {};
+
+  cereal = callPackage ../development/libraries/haskell/cereal {};
+
+  cgi_3001_1_7_2 = callPackage ../development/libraries/haskell/cgi/3001.1.7.2.nix {
+    network = network_2_2_1_7;
   };
 
-  AspectAG = import ../development/libraries/haskell/AspectAG {
-    inherit cabal HList mtl;
+  cgi_3001_1_7_3 = callPackage ../development/libraries/haskell/cgi/3001.1.7.3.nix {
+    network = network_2_2_1_7;
   };
 
-  benchpress = import ../development/libraries/haskell/benchpress {
-    inherit cabal;
+  cgi = callPackage ../development/libraries/haskell/cgi {};
+
+  cmdargs = callPackage ../development/libraries/haskell/cmdargs {};
+
+  colorizeHaskell = callPackage ../development/libraries/haskell/colorize-haskell {};
+
+  ConfigFile = callPackage ../development/libraries/haskell/ConfigFile {};
+
+  convertible = callPackage ../development/libraries/haskell/convertible {
+    time = time_1_1_3;
   };
 
-  bimap = import ../development/libraries/haskell/bimap {
-    inherit cabal;
+  Crypto = callPackage ../development/libraries/haskell/Crypto {};
+
+  CS173Tourney = callPackage ../development/libraries/haskell/CS173Tourney {
+    inherit (pkgs) fetchgit;
+    json = json_0_3_6;
   };
 
-  binary = import ../development/libraries/haskell/binary {
-    inherit cabal;
-  };
+  csv = callPackage ../development/libraries/haskell/csv {};
 
-  bitmap = import ../development/libraries/haskell/bitmap {
-    inherit cabal;
-  };
+  dataenc = callPackage ../development/libraries/haskell/dataenc {};
 
-  blazeHtml = import ../development/libraries/haskell/blaze-html {
-    inherit cabal text;
-  };
+  dataReify = callPackage ../development/libraries/haskell/data-reify {};
 
-  bytestring = import ../development/libraries/haskell/bytestring {
-    inherit cabal;
-  };
+  datetime = callPackage ../development/libraries/haskell/datetime {};
 
-  networkBytestring = import ../development/libraries/haskell/network-bytestring {
-    inherit cabal bytestring network;
-  };
+  deepseq = callPackage ../development/libraries/haskell/deepseq {};
 
-  cairo = import ../development/libraries/haskell/cairo {
-    inherit cabal gtk2hsBuildtools mtl;
-    inherit (pkgs) pkgconfig glibc cairo zlib;
-  };
+  Diff = callPackage ../development/libraries/haskell/Diff {};
 
-  cautiousFile = import ../development/libraries/haskell/cautious-file {
-    inherit cabal;
-  };
-
-  cereal = import ../development/libraries/haskell/cereal {
-    inherit cabal;
-  };
-
-  cgi3001172 = import ../development/libraries/haskell/cgi/3001.1.7.2.nix {
-    inherit cabal mtl parsec xhtml;
-    network = network2217;
-  };
-
-  cgi3001173 = import ../development/libraries/haskell/cgi/3001.1.7.3.nix {
-    inherit cabal mtl parsec xhtml;
-    network = network2217;
-  };
-
-  cgi = import ../development/libraries/haskell/cgi {
-    inherit cabal mtl network parsec xhtml;
-  };
-
-  cmdargs = import ../development/libraries/haskell/cmdargs {
-    inherit cabal filepath mtl;
-  };
-
-  colorizeHaskell = import ../development/libraries/haskell/colorize-haskell {
-    inherit cabal ansiTerminal haskellLexer;
-  };
-
-  ConfigFile = import ../development/libraries/haskell/ConfigFile {
-    inherit cabal mtl parsec MissingH;
-  };
-
-  convertible = import ../development/libraries/haskell/convertible {
-    inherit cabal mtl;
-    time = time113;
-  };
-
-  Crypto = import ../development/libraries/haskell/Crypto {
-    inherit cabal HUnit QuickCheck;
-  };
-
-  CS173Tourney = import ../development/libraries/haskell/CS173Tourney {
-    inherit cabal ;
-    inherit (pkgs) fetchgit ;
-    inherit time hslogger Crypto base64string CouchDB WebServer WebServerExtras;
-    json = json_036;
-  };
-
-  csv = import ../development/libraries/haskell/csv {
-    inherit cabal parsec;
-  };
-
-  dataenc = import ../development/libraries/haskell/dataenc {
-    inherit cabal;
-  };
-
-  dataReify = import ../development/libraries/haskell/data-reify {
-    inherit cabal;
-  };
-
-  datetime = import ../development/libraries/haskell/datetime {
-    inherit cabal QuickCheck time;
-  };
-
-  deepseq = import ../development/libraries/haskell/deepseq {
-    inherit cabal;
-  };
-
-  Diff = import ../development/libraries/haskell/Diff {
-    inherit cabal;
-  };
-
-  digest = import ../development/libraries/haskell/digest {
-    inherit cabal;
+  digest = callPackage ../development/libraries/haskell/digest {
     inherit (pkgs) zlib;
   };
 
-  dotgen = import ../development/libraries/haskell/dotgen {
-    inherit cabal;
-  };
+  dotgen = callPackage ../development/libraries/haskell/dotgen {};
 
-  editline = import ../development/libraries/haskell/editline {
+  editline = callPackage ../development/libraries/haskell/editline {
     inherit (pkgs) libedit;
-    inherit cabal;
   };
 
-  filepath = import ../development/libraries/haskell/filepath {
-    inherit cabal;
+  filepath = callPackage ../development/libraries/haskell/filepath {};
+
+  emgm = callPackage ../development/libraries/haskell/emgm {};
+
+  extensibleExceptions = callPackage ../development/libraries/haskell/extensible-exceptions {};
+
+  fclabels = callPackage ../development/libraries/haskell/fclabels {};
+
+  feed = callPackage ../development/libraries/haskell/feed {};
+
+  filestore = callPackage ../development/libraries/haskell/filestore {};
+
+  fgl = callPackage ../development/libraries/haskell/fgl {};
+
+  fgl_5_4_2_3 = callPackage ../development/libraries/haskell/fgl/5.4.2.3.nix {};
+
+  fingertree = callPackage ../development/libraries/haskell/fingertree {};
+
+  gdiff = callPackage ../development/libraries/haskell/gdiff {};
+
+  getOptions = callPackage ../development/libraries/haskell/get-options {};
+
+  ghcCore = callPackage ../development/libraries/haskell/ghc-core {};
+
+  ghcMtl = callPackage ../development/libraries/haskell/ghc-mtl {};
+
+  ghcPaths_0_1_0_6 = callPackage ../development/libraries/haskell/ghc-paths/0.1.0.6.nix {};
+
+  ghcPaths = callPackage ../development/libraries/haskell/ghc-paths {};
+
+  ghcSyb = callPackage ../development/libraries/haskell/ghc-syb {};
+
+  gitit = callPackage ../development/libraries/haskell/gitit {
+    cgi = cgi_3001_1_7_2;
+    HTTP = HTTP_4000_0_9;
+    network = network_2_2_1_7;
   };
 
-  emgm = import ../development/libraries/haskell/emgm {
-    inherit cabal;
-  };
+  GlomeVec = callPackage ../development/libraries/haskell/GlomeVec {};
 
-  extensibleExceptions = import ../development/libraries/haskell/extensible-exceptions {
-    inherit cabal;
-  };
-
-  fclabels = import ../development/libraries/haskell/fclabels {
-    inherit cabal monadsFd;
-  };
-
-  feed = import ../development/libraries/haskell/feed {
-    inherit cabal utf8String xml;
-  };
-
-  filestore = import ../development/libraries/haskell/filestore {
-    inherit cabal datetime parsec regexPosix split time utf8String xml Diff;
-  };
-
-  fgl = import ../development/libraries/haskell/fgl {
-    inherit cabal mtl;
-  };
-
-  fgl5423 = import ../development/libraries/haskell/fgl/5.4.2.3.nix {
-    inherit cabal mtl;
-  };
-
-  fingertree = import ../development/libraries/haskell/fingertree {
-    inherit cabal;
-  };
-
-  gdiff = import ../development/libraries/haskell/gdiff {
-    inherit cabal;
-  };
-
-  getOptions = import ../development/libraries/haskell/get-options {
-    inherit (pkgs) fetchurl sourceFromHead;
-    inherit cabal mtl;
-  };
-
-  ghcCore = import ../development/libraries/haskell/ghc-core {
-    inherit cabal pcreLight colorizeHaskell;
-  };
-
-  ghcMtl = import ../development/libraries/haskell/ghc-mtl {
-    inherit cabal mtl MonadCatchIOMtl;
-  };
-
-  ghcPaths0106 = import ../development/libraries/haskell/ghc-paths/0.1.0.6.nix {
-    inherit cabal;
-  };
-
-  ghcPaths = import ../development/libraries/haskell/ghc-paths {
-    inherit cabal;
-  };
-
-  ghcSyb = import ../development/libraries/haskell/ghc-syb {
-    inherit (pkgs) fetchurl sourceFromHead;
-    inherit cabal syb;
-  };
-
-  gitit = import ../development/libraries/haskell/gitit {
-    inherit cabal happstackServer happstackUtil
-      HStringTemplate SHA datetime
-      filestore highlightingKate safe
-      mtl pandoc parsec recaptcha
-      utf8String xhtml zlib ConfigFile url
-      cautiousFile feed;
-    cgi = cgi3001172;
-    HTTP = HTTP400009;
-    network = network2217;
-  };
-
-  GlomeVec = import ../development/libraries/haskell/GlomeVec {
-    inherit cabal;
-  };
-
-  GLUT2121 = import ../development/libraries/haskell/GLUT/2.1.2.1.nix {
-    inherit cabal;
-    OpenGL = OpenGL2230;
+  GLUT2121 = callPackage ../development/libraries/haskell/GLUT/2.1.2.1.nix {
+    OpenGL = OpenGL_2_2_3_0;
     glut = pkgs.freeglut;
     inherit (pkgs) mesa;
     inherit (pkgs.xlibs) libSM libICE libXmu libXi;
   };
 
-  GLUT = import ../development/libraries/haskell/GLUT {
-    inherit cabal OpenGL;
+  GLUT = callPackage ../development/libraries/haskell/GLUT {
     glut = pkgs.freeglut;
     inherit (pkgs) mesa;
     inherit (pkgs.xlibs) libSM libICE libXmu libXi;
   };
 
-  gtk2hs = import ../development/libraries/haskell/gtk2hs {
-    inherit ghc mtl;
-    inherit (pkgs) stdenv fetchurl pkgconfig gnome cairo;
+  gtk2hs = callPackage ../development/libraries/haskell/gtk2hs {
+    inherit (pkgs) pkgconfig gnome cairo;
   };
 
-  gtk2hsBuildtools = import ../development/libraries/haskell/gtk2hs-buildtools {
-    inherit cabal;
-    alex = alex233;
-    happy = happy1185;
+  gtk2hsBuildtools = callPackage ../development/libraries/haskell/gtk2hs-buildtools {
+    alex = alex_2_3_3;
+    happy = happy_1_18_5;
   };
 
-  hamlet = import ../development/libraries/haskell/hamlet {
-    inherit cabal blazeHtml parsec utf8String;
-  };
+  hamlet = callPackage ../development/libraries/haskell/hamlet {};
 
-  HAppSData = import ../development/libraries/haskell/HAppS/HAppS-Data.nix {
-    inherit cabal mtl sybWithClass HaXml HAppSUtil bytestring binary;
-  };
+  HAppSData = callPackage ../development/libraries/haskell/HAppS/HAppS-Data.nix {};
 
-  HAppSIxSet = import ../development/libraries/haskell/HAppS/HAppS-IxSet.nix {
-    inherit cabal mtl hslogger HAppSUtil HAppSState HAppSData sybWithClass;
-  };
+  HAppSIxSet = callPackage ../development/libraries/haskell/HAppS/HAppS-IxSet.nix {};
 
-  HAppSUtil = import ../development/libraries/haskell/HAppS/HAppS-Util.nix {
-    inherit cabal mtl hslogger bytestring;
-  };
+  HAppSUtil = callPackage ../development/libraries/haskell/HAppS/HAppS-Util.nix {};
 
-  HAppSServer = import ../development/libraries/haskell/HAppS/HAppS-Server.nix {
-    inherit cabal HaXml parsec mtl network hslogger HAppSData HAppSUtil HAppSState HAppSIxSet HTTP xhtml html bytestring;
-  };
+  HAppSServer = callPackage ../development/libraries/haskell/HAppS/HAppS-Server.nix {};
 
-  HAppSState = import ../development/libraries/haskell/HAppS/HAppS-State.nix {
-    inherit cabal HaXml mtl network stm hslogger HAppSUtil HAppSData bytestring binary hspread;
-  };
+  HAppSState = callPackage ../development/libraries/haskell/HAppS/HAppS-State.nix {};
 
   /* cannot yet get this to work with 6.12.1 */
-  happstackData = import ../development/libraries/haskell/happstack/happstack-data.nix {
-    inherit cabal mtl sybWithClass HaXml happstackUtil binary;
+  happstackData = callPackage ../development/libraries/haskell/happstack/happstack-data.nix {};
+
+  happstackUtil = callPackage ../development/libraries/haskell/happstack/happstack-util.nix {};
+
+  happstackServer = callPackage ../development/libraries/haskell/happstack/happstack-server.nix {
+    network = network_2_2_1_7;
   };
 
-  happstackUtil = import ../development/libraries/haskell/happstack/happstack-util.nix {
-    inherit cabal mtl hslogger QuickCheck HUnit strictConcurrency unixCompat SMTPClient;
+  hashedStorage = callPackage ../development/libraries/haskell/hashed-storage {};
+
+  haskeline = callPackage ../development/libraries/haskell/haskeline {};
+
+  haskelineClass = callPackage ../development/libraries/haskell/haskeline-class {};
+
+  haskellLexer = callPackage ../development/libraries/haskell/haskell-lexer {};
+
+  haskellSrc = callPackage ../development/libraries/haskell/haskell-src {};
+
+  haskellSrc_P = callPackage ../development/libraries/haskell/haskell-src {
+    happy = happy_1_18_5;
   };
 
-  happstackServer = import ../development/libraries/haskell/happstack/happstack-server.nix {
-    inherit cabal HUnit HaXml MaybeT parsec sendfile utf8String mtl hslogger happstackData happstackUtil xhtml html zlib;
-    network = network2217;
-  };
+  haskellSrcExts = callPackage ../development/libraries/haskell/haskell-src-exts {};
 
-  hashedStorage = import ../development/libraries/haskell/hashed-storage {
-    inherit cabal mtl zlib mmap binary dataenc;
-  };
+  haskellSrcMeta = callPackage ../development/libraries/haskell/haskell-src-meta {};
 
-  haskeline = import ../development/libraries/haskell/haskeline {
-    inherit cabal extensibleExceptions mtl utf8String;
-  };
+  haskellPlatform = haskellPlatform_2010_2_0_0;
 
-  haskelineClass = import ../development/libraries/haskell/haskeline-class {
-    inherit cabal haskeline mtl;
-  };
-
-  haskellLexer = import ../development/libraries/haskell/haskell-lexer {
-    inherit cabal;
-  };
-
-  haskellSrc = import ../development/libraries/haskell/haskell-src {
-    inherit cabal happy;
-  };
-
-  haskellSrcP = import ../development/libraries/haskell/haskell-src {
-    inherit cabal;
-    happy = happy1185;
-  };
-
-  haskellSrcExts = import ../development/libraries/haskell/haskell-src-exts {
-    inherit cabal cpphs happy;
-  };
-
-  haskellSrcMeta = import ../development/libraries/haskell/haskell-src-meta {
-    inherit cabal haskellSrcExts;
-  };
-
-  haskellPlatform = haskellPlatform2010200;
-
-  haskellPlatform2010200 = import ../development/libraries/haskell/haskell-platform/2010.2.0.0.nix {
+  haskellPlatform_2010_2_0_0 = import ../development/libraries/haskell/haskell-platform/2010.2.0.0.nix {
     inherit cabal ghc
       html xhtml;
-    haskellSrc = haskellSrcP;
-    fgl = fgl5423;
-    cabalInstall = cabalInstall082;
+    haskellSrc = haskellSrc_P;
+    fgl = fgl_5_4_2_3;
+    cabalInstall = cabalInstall_0_8_2;
     GLUT = GLUT2121;
-    OpenGL = OpenGL2230;
-    zlib = zlib0520;
-    alex = alex233;
-    cgi = cgi3001173;
-    QuickCheck = QuickCheck2;
-    HTTP = HTTP400009;
-    HUnit = HUnit1221;
-    network = network2217;
-    parallel = parallel2201;
-    regexBase = regexBase0932;
-    regexCompat = regexCompat0931;
-    regexPosix = regexPosix0942;
-    stm = stm2121;
-    haddock = haddock272P;
-    happy = happy1185;
+    OpenGL = OpenGL_2_2_3_0;
+    zlib = zlib_0_5_2_0;
+    alex = alex_2_3_3;
+    cgi = cgi_3001_1_7_3;
+    QuickCheck = QuickCheck_2;
+    HTTP = HTTP_4000_0_9;
+    HUnit = HUnit_1_2_2_1;
+    network = network_2_2_1_7;
+    parallel = parallel_2_2_0_1;
+    regexBase = regexBase_0_93_2;
+    regexCompat = regexCompat_0_93_1;
+    regexPosix = regexPosix_0_94_2;
+    stm = stm_2_1_2_1;
+    haddock = haddock_2_7_2_P;
+    happy = happy_1_18_5;
     inherit (pkgs) fetchurl;
   };
 
-  haskellPlatform2010100 = pkgs.lowPrio (import ../development/libraries/haskell/haskell-platform/2010.1.0.0.nix {
+  haskellPlatform_2010_1_0_0 = pkgs.lowPrio (import ../development/libraries/haskell/haskell-platform/2010.1.0.0.nix {
     inherit cabal ghc fgl
       haskellSrc html
       stm xhtml;
-    cabalInstall = cabalInstall080;
+    cabalInstall = cabalInstall_0_8_0;
     GLUT = GLUT2121;
-    OpenGL = OpenGL2230;
-    zlib = zlib0520;
-    alex = alex232;
-    cgi = cgi3001172;
-    QuickCheck = QuickCheck2103;
-    HTTP = HTTP400009;
-    HUnit = HUnit1221;
-    network = network2217;
-    parallel = parallel2201;
-    regexBase = regexBase0931;
-    regexCompat = regexCompat092;
-    regexPosix = regexPosix0941;
-    haddock = haddock272;
-    happy = happy1184;
+    OpenGL = OpenGL_2_2_3_0;
+    zlib = zlib_0_5_2_0;
+    alex = alex_2_3_2;
+    cgi = cgi_3001_1_7_2;
+    QuickCheck = QuickCheck_2_1_0_3;
+    HTTP = HTTP_4000_0_9;
+    HUnit = HUnit_1_2_2_1;
+    network = network_2_2_1_7;
+    parallel = parallel_2_2_0_1;
+    regexBase = regexBase_0_93_1;
+    regexCompat = regexCompat_0_92;
+    regexPosix = regexPosix_0_94_1;
+    haddock = haddock_2_7_2;
+    happy = happy_1_18_4;
     inherit (pkgs) fetchurl;
   });
 
-  haskellPlatform2009202 = import ../development/libraries/haskell/haskell-platform/2009.2.0.2.nix {
+  haskellPlatform_2009_2_0_2 = import ../development/libraries/haskell/haskell-platform/2009.2.0.2.nix {
     inherit cabal ghc GLUT HTTP HUnit OpenGL QuickCheck cgi fgl editline
       haskellSrc html parallel regexBase regexCompat regexPosix
       stm time xhtml zlib cabalInstall alex happy haddock;
     inherit (pkgs) fetchurl;
   };
 
-  HTTP400009 = import ../development/libraries/haskell/HTTP/4000.0.9.nix {
-    inherit cabal mtl parsec;
-    network = network2217;
+  HTTP_4000_0_9 = callPackage ../development/libraries/haskell/HTTP/4000.0.9.nix {
+    network = network_2_2_1_7;
   };
 
-  HTTP = import ../development/libraries/haskell/HTTP {
-    inherit cabal mtl network parsec;
-  };
+  HTTP = callPackage ../development/libraries/haskell/HTTP {};
 
-  HTTP_3001 = import ../development/libraries/haskell/HTTP/3001.nix {
-    inherit cabal mtl network parsec;
-  };
+  HTTP_3001 = callPackage ../development/libraries/haskell/HTTP/3001.nix {};
 
-  haxr = import ../development/libraries/haskell/haxr {
-    inherit cabal HaXml HTTP dataenc time;
-  };
+  haxr = callPackage ../development/libraries/haskell/haxr {};
 
-  haxr_th = import ../development/libraries/haskell/haxr-th {
-    inherit cabal haxr HaXml HTTP;
-  };
+  haxr_th = callPackage ../development/libraries/haskell/haxr-th {};
 
-  HaXml = import ../development/libraries/haskell/HaXml {
-    inherit cabal;
-  };
+  HaXml = callPackage ../development/libraries/haskell/HaXml {};
 
-  HDBC = import ../development/libraries/haskell/HDBC/HDBC.nix {
-    inherit cabal HUnit QuickCheck mtl time utf8String convertible testpack;
-  };
+  HDBC = callPackage ../development/libraries/haskell/HDBC/HDBC.nix {};
 
-  HDBCPostgresql = import ../development/libraries/haskell/HDBC/HDBC-postgresql.nix {
-    inherit cabal HDBC parsec;
+  HDBCPostgresql = callPackage ../development/libraries/haskell/HDBC/HDBC-postgresql.nix {
     inherit (pkgs) postgresql;
   };
 
-  HDBCSqlite = import ../development/libraries/haskell/HDBC/HDBC-sqlite3.nix {
-    inherit cabal HDBC;
+  HDBCSqlite = callPackage ../development/libraries/haskell/HDBC/HDBC-sqlite3.nix {
     inherit (pkgs) sqlite;
   };
 
-  HGL = import ../development/libraries/haskell/HGL {
-    inherit cabal X11;
+  HGL = callPackage ../development/libraries/haskell/HGL {};
+
+  highlightingKate = callPackage ../development/libraries/haskell/highlighting-kate {};
+
+  hint = callPackage ../development/libraries/haskell/hint {
+    ghcPaths = ghcPaths_0_1_0_6;
   };
 
-  highlightingKate = import ../development/libraries/haskell/highlighting-kate {
-    inherit cabal parsec pcreLight xhtml;
-  };
+  Hipmunk = callPackage ../development/libraries/haskell/Hipmunk {};
 
-  hint = import ../development/libraries/haskell/hint {
-    inherit cabal extensibleExceptions filepath ghcMtl haskellSrc
-      MonadCatchIOMtl mtl utf8String;
-    ghcPaths = ghcPaths0106;
-  };
+  HList = callPackage ../development/libraries/haskell/HList {};
 
-  Hipmunk = import ../development/libraries/haskell/Hipmunk {
-    inherit cabal;
-  };
-
-  HList = import ../development/libraries/haskell/HList {
-    inherit cabal ;
-  };
-
-  hmatrix = import ../development/libraries/haskell/hmatrix {
-    inherit cabal QuickCheck HUnit storableComplex vector;
+  hmatrix = callPackage ../development/libraries/haskell/hmatrix {
     inherit (pkgs) gsl liblapack/* lapack library */ blas;
   };
 
-  hscolour = import ../development/libraries/haskell/hscolour {
-    inherit cabal;
+  hscolour = callPackage ../development/libraries/haskell/hscolour {};
+
+  hsemail = callPackage ../development/libraries/haskell/hsemail {};
+
+  HStringTemplate = callPackage ../development/libraries/haskell/HStringTemplate {};
+
+  hspread = callPackage ../development/libraries/haskell/hspread {};
+
+  hsloggerTemplate = callPackage ../development/libraries/haskell/hslogger-template {};
+
+  html = callPackage ../development/libraries/haskell/html {};
+
+  httpdShed = callPackage ../development/libraries/haskell/httpd-shed {
+    network = network_2_2_1_7;
   };
 
-  hsemail = import ../development/libraries/haskell/hsemail {
-    inherit cabal mtl parsec;
+  HUnit_1_2_2_1 = callPackage ../development/libraries/haskell/HUnit/1.2.2.1.nix {};
+
+  HUnit = callPackage ../development/libraries/haskell/HUnit {};
+
+  ivor = callPackage ../development/libraries/haskell/ivor {};
+
+  jpeg = callPackage ../development/libraries/haskell/jpeg {};
+
+  json = callPackage ../development/libraries/haskell/json {};
+
+  json_0_3_6 = callPackage ../development/libraries/haskell/json/0.3.6.nix {};
+
+  maybench = callPackage ../development/libraries/haskell/maybench {};
+
+  MaybeT = callPackage ../development/libraries/haskell/MaybeT {};
+
+  MaybeTTransformers = callPackage ../development/libraries/haskell/MaybeT-transformers {};
+
+  MissingH = callPackage ../development/libraries/haskell/MissingH {
+    network = network_2_2_1_7;
   };
 
-  HStringTemplate = import ../development/libraries/haskell/HStringTemplate {
-    inherit cabal parsec time text utf8String parallel;
-  };
+  mmap = callPackage ../development/libraries/haskell/mmap {};
 
-  hspread = import ../development/libraries/haskell/hspread {
-    inherit cabal binary network;
-  };
+  MonadCatchIOMtl = callPackage ../development/libraries/haskell/MonadCatchIO-mtl {};
 
-  hsloggerTemplate = import ../development/libraries/haskell/hslogger-template {
-    inherit cabal hslogger mtl;
-  };
+  MonadCatchIOTransformers = callPackage ../development/libraries/haskell/MonadCatchIO-transformers {};
 
-  html = import ../development/libraries/haskell/html {
-    inherit cabal;
-  };
+  monadlab = callPackage ../development/libraries/haskell/monadlab {};
 
-  httpdShed = import ../development/libraries/haskell/httpd-shed {
-    inherit cabal;
-    network = network2217;
-  };
+  MonadRandom = callPackage ../development/libraries/haskell/MonadRandom {};
 
-  HUnit1221 = import ../development/libraries/haskell/HUnit/1.2.2.1.nix {
-    inherit cabal;
-  };
+  monadsFd = callPackage ../development/libraries/haskell/monads-fd {};
 
-  HUnit = import ../development/libraries/haskell/HUnit {
-    inherit cabal;
-  };
+  mpppc = callPackage ../development/libraries/haskell/mpppc {};
 
-  ivor = import ../development/libraries/haskell/ivor {
-    inherit cabal mtl parsec;
-  };
+  mtl = callPackage ../development/libraries/haskell/mtl {};
 
-  jpeg = import ../development/libraries/haskell/jpeg {
-    inherit cabal mtl;
-  };
+  multirec = callPackage ../development/libraries/haskell/multirec {};
 
-  json = import ../development/libraries/haskell/json {
-    inherit cabal mtl;
-  };
+  multiset = callPackage ../development/libraries/haskell/multiset {};
 
-  json_036 = import ../development/libraries/haskell/json/0.3.6.nix {
-    inherit cabal mtl;
-  };
+  network_2_2_1_7 = callPackage ../development/libraries/haskell/network/2.2.1.7.nix {};
 
-  maybench = import ../development/libraries/haskell/maybench {
-    inherit cabal benchpress;
-  };
+  network = callPackage ../development/libraries/haskell/network {};
 
-  MaybeT = import ../development/libraries/haskell/MaybeT {
-    inherit cabal mtl;
-  };
+  nonNegative = callPackage ../development/libraries/haskell/non-negative {};
 
-  MaybeTTransformers = import ../development/libraries/haskell/MaybeT-transformers {
-    inherit cabal transformers monadsFd;
-  };
+  numericPrelude = callPackage ../development/libraries/haskell/numeric-prelude {};
 
-  MissingH = import ../development/libraries/haskell/MissingH {
-    inherit cabal HUnit hslogger parsec regexCompat;
-    network = network2217;
-  };
-
-  mmap = import ../development/libraries/haskell/mmap {
-    inherit cabal;
-  };
-
-  MonadCatchIOMtl = import ../development/libraries/haskell/MonadCatchIO-mtl {
-    inherit cabal mtl extensibleExceptions;
-  };
-
-  MonadCatchIOTransformers = import ../development/libraries/haskell/MonadCatchIO-transformers {
-    inherit cabal transformers extensibleExceptions;
-  };
-
-  monadlab = import ../development/libraries/haskell/monadlab {
-    inherit cabal parsec;
-  };
-
-  MonadRandom = import ../development/libraries/haskell/MonadRandom {
-    inherit cabal mtl;
-  };
-
-  monadsFd = import ../development/libraries/haskell/monads-fd {
-    inherit cabal transformers;
-  };
-
-  mpppc = import ../development/libraries/haskell/mpppc {
-    inherit cabal ansiTerminal split text;
-  };
-
-  mtl = import ../development/libraries/haskell/mtl {
-    inherit cabal;
-  };
-
-  multirec = import ../development/libraries/haskell/multirec {
-    inherit cabal;
-  };
-
-  multiset = import ../development/libraries/haskell/multiset {
-    inherit cabal syb;
-  };
-
-  network2217 = import ../development/libraries/haskell/network/2.2.1.7.nix {
-    inherit cabal parsec;
-  };
-
-  network = import ../development/libraries/haskell/network {
-    inherit cabal parsec;
-  };
-
-  nonNegative = import ../development/libraries/haskell/non-negative {
-    inherit cabal QuickCheck;
-  };
-
-  numericPrelude = import ../development/libraries/haskell/numeric-prelude {
-    inherit cabal HUnit QuickCheck parsec nonNegative utilityHt;
-  };
-
-  OpenAL = import ../development/libraries/haskell/OpenAL {
-    inherit cabal OpenGL;
+  OpenAL = callPackage ../development/libraries/haskell/OpenAL {
     inherit (pkgs) openal;
   };
 
-  OpenGL2230 = import ../development/libraries/haskell/OpenGL/2.2.3.0.nix {
-    inherit cabal;
+  OpenGL_2_2_3_0 = callPackage ../development/libraries/haskell/OpenGL/2.2.3.0.nix {
     inherit (pkgs) mesa;
     inherit (pkgs.xlibs) libX11;
   };
 
-  OpenGL = import ../development/libraries/haskell/OpenGL {
-    inherit cabal;
+  OpenGL = callPackage ../development/libraries/haskell/OpenGL {
     inherit (pkgs) mesa;
     inherit (pkgs.xlibs) libX11;
   };
 
-  pandoc = import ../development/libraries/haskell/pandoc {
-    inherit cabal mtl parsec utf8String xhtml zipArchive
-      xml texmath;
-    HTTP = HTTP400009;
-    network = network2217;
+  pandoc = callPackage ../development/libraries/haskell/pandoc {
+    HTTP = HTTP_4000_0_9;
+    network = network_2_2_1_7;
   };
 
-  parallel2201 = import ../development/libraries/haskell/parallel/2.2.0.1.nix {
-    inherit cabal deepseq;
-  };
+  parallel_2_2_0_1 = callPackage ../development/libraries/haskell/parallel/2.2.0.1.nix {};
 
-  parallel = import ../development/libraries/haskell/parallel {
-    inherit cabal;
-  };
+  parallel = callPackage ../development/libraries/haskell/parallel {};
 
-  parseargs = import ../development/libraries/haskell/parseargs {
-    inherit cabal;
-  };
+  parseargs = callPackage ../development/libraries/haskell/parseargs {};
 
-  parsec = import ../development/libraries/haskell/parsec {
-    inherit cabal;
-  };
+  parsec = callPackage ../development/libraries/haskell/parsec {};
 
-  parsec3 = import ../development/libraries/haskell/parsec/3.nix {
-    inherit cabal mtl;
-  };
+  parsec_3 = callPackage ../development/libraries/haskell/parsec/3.nix {};
 
-  parsimony = import ../development/libraries/haskell/parsimony {
-    inherit cabal utf8String;
-  };
+  parsimony = callPackage ../development/libraries/haskell/parsimony {};
 
-  pcreLight = import ../development/libraries/haskell/pcre-light {
-    inherit cabal;
+  pcreLight = callPackage ../development/libraries/haskell/pcre-light {
     inherit (pkgs) pcre;
   };
 
-  persistent = import ../development/libraries/haskell/persistent {
-    inherit cabal blazeHtml MonadCatchIOTransformers parsec text
-      transformers utf8String webRoutesQuasi;
-  };
+  persistent = callPackage ../development/libraries/haskell/persistent {};
 
-  polyparse = import ../development/libraries/haskell/polyparse {
-    inherit cabal;
-  };
+  polyparse = callPackage ../development/libraries/haskell/polyparse {};
 
-  ppm = import ../development/libraries/haskell/ppm {
-    inherit cabal mtl;
-  };
+  ppm = callPackage ../development/libraries/haskell/ppm {};
 
-  pureMD5 = import ../development/libraries/haskell/pureMD5 {
-    inherit cabal binary;
-  };
+  pureMD5 = callPackage ../development/libraries/haskell/pureMD5 {};
 
-  primitive = import ../development/libraries/haskell/primitive {
-    inherit cabal;
-  };
+  primitive = callPackage ../development/libraries/haskell/primitive {};
 
-  QuickCheck  = QuickCheck1;
+  QuickCheck  = QuickCheck_1;
 
-  QuickCheck1 = import ../development/libraries/haskell/QuickCheck {
-    inherit cabal;
-  };
+  QuickCheck_1 = callPackage ../development/libraries/haskell/QuickCheck {};
 
-  QuickCheck2103 = import ../development/libraries/haskell/QuickCheck/2.1.0.3.nix {
-    inherit cabal mtl;
-  };
+  QuickCheck_2_1_0_3 = callPackage ../development/libraries/haskell/QuickCheck/2.1.0.3.nix {};
 
-  QuickCheck2 = import ../development/libraries/haskell/QuickCheck/QuickCheck-2.nix {
-    inherit cabal mtl;
-  };
+  QuickCheck_2 = callPackage ../development/libraries/haskell/QuickCheck/QuickCheck-2.nix {};
 
-  RangedSets = import ../development/libraries/haskell/Ranged-sets {
-    inherit cabal HUnit QuickCheck;
-  };
+  RangedSets = callPackage ../development/libraries/haskell/Ranged-sets {};
 
-  readline = import ../development/libraries/haskell/readline {
-    inherit cabal;
+  readline = callPackage ../development/libraries/haskell/readline {
     inherit (pkgs) readline ncurses;
   };
 
-  recaptcha = import ../development/libraries/haskell/recaptcha {
-    inherit cabal xhtml;
-    HTTP = HTTP400009;
-    network = network2217;
+  recaptcha = callPackage ../development/libraries/haskell/recaptcha {
+    HTTP = HTTP_4000_0_9;
+    network = network_2_2_1_7;
   };
 
-  regexBase0931 = import ../development/libraries/haskell/regex-base/0.93.1.nix {
-    inherit cabal mtl;
+  regexBase_0_93_1 = callPackage ../development/libraries/haskell/regex-base/0.93.1.nix {};
+
+  regexBase_0_93_2 = callPackage ../development/libraries/haskell/regex-base/0.93.2.nix {};
+
+  regexBase = callPackage ../development/libraries/haskell/regex-base {};
+
+  regexCompat_0_92 = callPackage ../development/libraries/haskell/regex-compat/0.92.nix {
+    regexBase = regexBase_0_93_1;
+    regexPosix = regexPosix_0_94_1;
   };
 
-  regexBase0932 = import ../development/libraries/haskell/regex-base/0.93.2.nix {
-    inherit cabal mtl;
+  regexCompat_0_93_1 = callPackage ../development/libraries/haskell/regex-compat/0.93.1.nix {
+    regexBase = regexBase_0_93_2;
+    regexPosix = regexPosix_0_94_2;
   };
 
-  regexBase = import ../development/libraries/haskell/regex-base {
-    inherit cabal mtl;
+  regexCompat = callPackage ../development/libraries/haskell/regex-compat {};
+
+  regexPosix_0_94_1 = callPackage ../development/libraries/haskell/regex-posix/0.94.1.nix {
+    regexBase = regexBase_0_93_1;
   };
 
-  regexCompat092 = import ../development/libraries/haskell/regex-compat/0.92.nix {
-    inherit cabal;
-    regexBase = regexBase0931;
-    regexPosix = regexPosix0941;
+  regexPosix_0_94_2 = callPackage ../development/libraries/haskell/regex-posix/0.94.2.nix {
+    regexBase = regexBase_0_93_2;
   };
 
-  regexCompat0931 = import ../development/libraries/haskell/regex-compat/0.93.1.nix {
-    inherit cabal;
-    regexBase = regexBase0932;
-    regexPosix = regexPosix0942;
-  };
-
-  regexCompat = import ../development/libraries/haskell/regex-compat {
-    inherit cabal regexBase regexPosix;
-  };
-
-  regexPosix0941 = import ../development/libraries/haskell/regex-posix/0.94.1.nix {
-    inherit cabal;
-    regexBase = regexBase0931;
-  };
-
-  regexPosix0942 = import ../development/libraries/haskell/regex-posix/0.94.2.nix {
-    inherit cabal;
-    regexBase = regexBase0932;
-  };
-
-  regexPosix = import ../development/libraries/haskell/regex-posix {
+  regexPosix = callPackage ../development/libraries/haskell/regex-posix {
     inherit cabal regexBase;
   };
 
-  regular = import ../development/libraries/haskell/regular {
-    inherit cabal;
+  regular = callPackage ../development/libraries/haskell/regular {};
+
+  safe = callPackage ../development/libraries/haskell/safe {};
+
+  salvia = callPackage ../development/libraries/haskell/salvia {
+    network = network_2_2_1_7;
   };
 
-  safe = import ../development/libraries/haskell/safe {
-    inherit cabal;
+  salviaProtocol = callPackage ../development/libraries/haskell/salvia-protocol {};
+
+  scion = callPackage ../development/libraries/haskell/scion {};
+
+  sendfile = callPackage ../development/libraries/haskell/sendfile {
+    network = network_2_2_1_7;
   };
 
-  salvia = import ../development/libraries/haskell/salvia {
-    inherit cabal fclabels MaybeTTransformers monadsFd pureMD5
-      safe salviaProtocol split text threadmanager transformers
-      utf8String stm time;
-    network = network2217;
-  };
+  syb = callPackage ../development/libraries/haskell/syb {};
 
-  salviaProtocol = import ../development/libraries/haskell/salvia-protocol {
-    inherit cabal fclabels parsec safe split utf8String bimap;
-  };
+  sybWithClass = callPackage ../development/libraries/haskell/syb/syb-with-class.nix {};
 
-  scion = import ../development/libraries/haskell/scion {
-    inherit cabal ghcPaths ghcSyb hslogger json multiset time uniplate;
-  };
-
-  sendfile = import ../development/libraries/haskell/sendfile {
-    inherit cabal;
-    network = network2217;
-  };
-
-  syb = import ../development/libraries/haskell/syb {
-    inherit cabal;
-  };
-
-  sybWithClass = import ../development/libraries/haskell/syb/syb-with-class.nix {
-    inherit cabal;
-  };
-
-  SDLImage = import ../development/libraries/haskell/SDL-image {
-    inherit cabal SDL;
+  SDLImage = callPackage ../development/libraries/haskell/SDL-image {
     inherit (pkgs) SDL_image;
   };
 
-  SDLMixer = import ../development/libraries/haskell/SDL-mixer {
-    inherit cabal SDL;
+  SDLMixer = callPackage ../development/libraries/haskell/SDL-mixer {
     inherit (pkgs) SDL_mixer;
   };
 
-  SDLTtf = import ../development/libraries/haskell/SDL-ttf {
-    inherit cabal SDL;
+  SDLTtf = callPackage ../development/libraries/haskell/SDL-ttf {
     inherit (pkgs) SDL_ttf;
   };
 
-  SDL = import ../development/libraries/haskell/SDL {
-    inherit cabal;
+  SDL = callPackage ../development/libraries/haskell/SDL {
     inherit (pkgs) SDL;
   };
 
-  SHA = import ../development/libraries/haskell/SHA {
-    inherit cabal binary;
+  SHA = callPackage ../development/libraries/haskell/SHA {};
+
+  Shellac = callPackage ../development/libraries/haskell/Shellac/Shellac.nix {};
+
+  ShellacHaskeline = callPackage ../development/libraries/haskell/Shellac/Shellac-haskeline.nix {};
+
+  ShellacReadline = callPackage ../development/libraries/haskell/Shellac/Shellac-readline.nix {};
+
+  SMTPClient = callPackage ../development/libraries/haskell/SMTPClient {
+    network = network_2_2_1_7;
   };
 
-  Shellac = import ../development/libraries/haskell/Shellac/Shellac.nix {
-    inherit cabal mtl;
-  };
+  split = callPackage ../development/libraries/haskell/split {};
 
-  ShellacHaskeline = import ../development/libraries/haskell/Shellac/Shellac-haskeline.nix {
-    inherit cabal Shellac haskeline;
-  };
+  stbImage = callPackage ../development/libraries/haskell/stb-image {};
 
-  ShellacReadline = import ../development/libraries/haskell/Shellac/Shellac-readline.nix {
-    inherit cabal Shellac readline;
-  };
+  stm = callPackage ../development/libraries/haskell/stm {};
 
-  SMTPClient = import ../development/libraries/haskell/SMTPClient {
-    inherit cabal hsemail;
-    network = network2217;
-  };
+  stm_2_1_2_1 = callPackage ../development/libraries/haskell/stm/2.1.2.1.nix {};
 
-  split = import ../development/libraries/haskell/split {
-    inherit cabal;
-  };
+  storableComplex = callPackage ../development/libraries/haskell/storable-complex {};
 
-  stbImage = import ../development/libraries/haskell/stb-image {
-    inherit cabal bitmap;
-  };
+  strictConcurrency = callPackage ../development/libraries/haskell/strictConcurrency {};
 
-  stm = import ../development/libraries/haskell/stm {
-    inherit cabal;
-  };
-
-  stm2121 = import ../development/libraries/haskell/stm/2.1.2.1.nix {
-    inherit cabal;
-  };
-
-  storableComplex = import ../development/libraries/haskell/storable-complex {
-    inherit cabal;
-  };
-
-  strictConcurrency = import ../development/libraries/haskell/strictConcurrency {
-    inherit cabal parallel;
-  };
-
-  terminfo = import ../development/libraries/haskell/terminfo {
-    inherit cabal extensibleExceptions /* only required for <= ghc6102  ?*/;
+  terminfo = callPackage ../development/libraries/haskell/terminfo {
+    inherit extensibleExceptions /* only required for <= ghc6102  ?*/;
     inherit (pkgs) ncurses;
   };
 
-  testpack = import ../development/libraries/haskell/testpack {
-    inherit cabal HUnit QuickCheck mtl;
+  testpack = callPackage ../development/libraries/haskell/testpack {};
+
+  texmath = callPackage ../development/libraries/haskell/texmath {
+    cgi = cgi_3001_1_7_2;
   };
 
-  texmath = import ../development/libraries/haskell/texmath {
-    inherit cabal json parsec xml;
-    cgi = cgi3001172;
+  text = callPackage ../development/libraries/haskell/text {};
+
+  threadmanager = callPackage ../development/libraries/haskell/threadmanager {};
+
+  /* time is Haskell Platform default, time_1_1_3 is more recent but incompatible */
+  time = callPackage ../development/libraries/haskell/time {};
+
+  time_1_1_3 = callPackage ../development/libraries/haskell/time/1.1.3.nix {};
+
+  transformers = callPackage ../development/libraries/haskell/transformers {};
+
+  uniplate = callPackage ../development/libraries/haskell/uniplate {};
+
+  uniqueid = callPackage ../development/libraries/haskell/uniqueid {};
+
+  unixCompat = callPackage ../development/libraries/haskell/unix-compat {};
+
+  url = callPackage ../development/libraries/haskell/url {};
+
+  utf8String = callPackage ../development/libraries/haskell/utf8-string {};
+
+  utilityHt = callPackage ../development/libraries/haskell/utility-ht {};
+
+  uulib = callPackage ../development/libraries/haskell/uulib {};
+
+  uuParsingLib = callPackage ../development/libraries/haskell/uu-parsinglib {};
+
+  vacuum = callPackage ../development/libraries/haskell/vacuum {
+    ghcPaths = ghcPaths_0_1_0_6;
   };
 
-  text = import ../development/libraries/haskell/text {
-    inherit cabal deepseq;
+  vacuumCairo = callPackage ../development/libraries/haskell/vacuum-cairo {};
+
+  Vec = callPackage ../development/libraries/haskell/Vec {};
+
+  vector = callPackage ../development/libraries/haskell/vector {};
+
+  vty = callPackage ../development/libraries/haskell/vty {};
+
+  webRoutes = callPackage ../development/libraries/haskell/web-routes {
+    network = network_2_2_1_7;
   };
 
-  threadmanager = import ../development/libraries/haskell/threadmanager {
-    inherit cabal;
-  };
+  webRoutesQuasi = callPackage ../development/libraries/haskell/web-routes-quasi {};
 
-  /* time is Haskell Platform default, time113 is more recent but incompatible */
-  time = import ../development/libraries/haskell/time {
-    inherit cabal;
-  };
-
-  time113 = import ../development/libraries/haskell/time/1.1.3.nix {
-    inherit cabal;
-  };
-
-  transformers = import ../development/libraries/haskell/transformers {
-    inherit cabal;
-  };
-
-  uniplate = import ../development/libraries/haskell/uniplate {
-    inherit cabal mtl;
-  };
-
-  uniqueid = import ../development/libraries/haskell/uniqueid {
-    inherit cabal;
-  };
-
-  unixCompat = import ../development/libraries/haskell/unix-compat {
-    inherit cabal;
-  };
-
-  url = import ../development/libraries/haskell/url {
-    inherit cabal utf8String;
-  };
-
-  utf8String = import ../development/libraries/haskell/utf8-string {
-    inherit cabal;
-  };
-
-  utilityHt = import ../development/libraries/haskell/utility-ht {
-    inherit cabal;
-  };
-
-  uulib = import ../development/libraries/haskell/uulib {
-    inherit cabal;
-  };
-
-  uuParsingLib = import ../development/libraries/haskell/uu-parsinglib {
-    inherit cabal;
-  };
-
-  vacuum = import ../development/libraries/haskell/vacuum {
-    inherit cabal;
-    ghcPaths = ghcPaths0106;
-  };
-
-  vacuumCairo = import ../development/libraries/haskell/vacuum-cairo {
-    inherit cabal vacuum gtk2hs parallel strictConcurrency;
-  };
-
-  Vec = import ../development/libraries/haskell/Vec {
-    inherit cabal QuickCheck;
-  };
-
-  vector = import ../development/libraries/haskell/vector {
-    inherit cabal primitive;
-  };
-
-  vty = import ../development/libraries/haskell/vty {
-    inherit cabal utf8String terminfo;
-  };
-
-  webRoutes = import ../development/libraries/haskell/web-routes {
-    inherit cabal utf8String parsec;
-    network = network2217;
-  };
-
-  webRoutesQuasi = import ../development/libraries/haskell/web-routes-quasi {
-    inherit cabal webRoutes;
-  };
-
-  WebServer = import ../development/libraries/haskell/WebServer {
-    inherit cabal network mtl parsec;
+  WebServer = callPackage ../development/libraries/haskell/WebServer {
     inherit (pkgs) fetchgit;
   };
 
-  WebServerExtras = import ../development/libraries/haskell/WebServer-Extras {
-    inherit cabal Crypto WebServer base64string hslogger mtl;
-    json = json_036;
+  WebServerExtras = callPackage ../development/libraries/haskell/WebServer-Extras {
+    json = json_0_3_6;
     inherit (pkgs) fetchgit;
   };
 
-  CouchDB = import ../development/libraries/haskell/CouchDB {
-    inherit cabal network mtl ;
+  CouchDB = callPackage ../development/libraries/haskell/CouchDB {
     HTTP = HTTP_3001;
-    json = json_036;
+    json = json_0_3_6;
   };
 
-  base64string = import ../development/libraries/haskell/base64-string {
-    inherit cabal;
-  };
+  base64string = callPackage ../development/libraries/haskell/base64-string {};
 
-  wx = import ../development/libraries/haskell/wxHaskell/wx.nix {
-    inherit cabal stm wxcore;
-  };
+  wx = callPackage ../development/libraries/haskell/wxHaskell/wx.nix {};
 
-  wxcore = import ../development/libraries/haskell/wxHaskell/wxcore.nix {
-    inherit cabal time parsec stm;
+  wxcore = callPackage ../development/libraries/haskell/wxHaskell/wxcore.nix {
     wxGTK = pkgs.wxGTK28;
     inherit (pkgs) mesa;
     inherit (pkgs.xlibs) libX11;
   };
 
-  X11 = import ../development/libraries/haskell/X11 {
-    inherit cabal;
+  X11 = callPackage ../development/libraries/haskell/X11 {
     inherit (pkgs.xlibs) libX11 libXinerama libXext;
     xineramaSupport = true;
   };
 
-  X11_xft = import ../development/libraries/haskell/X11-xft {
-    inherit ghc cabal X11 utf8String;
+  X11Xft = callPackage ../development/libraries/haskell/X11-xft {
     inherit (pkgs) pkgconfig;
     inherit (pkgs.xlibs) libXft;
   };
 
-  xhtml = import ../development/libraries/haskell/xhtml {
-    inherit cabal;
-  };
+  xhtml = callPackage ../development/libraries/haskell/xhtml {};
 
-  xml = import ../development/libraries/haskell/xml {
-    inherit cabal;
-  };
+  xml = callPackage ../development/libraries/haskell/xml {};
 
-  zipArchive = import ../development/libraries/haskell/zip-archive {
-    inherit cabal binary mtl utf8String zlib digest;
-  };
+  zipArchive = callPackage ../development/libraries/haskell/zip-archive {};
 
-  zipper = import ../development/libraries/haskell/zipper {
-    inherit cabal multirec;
-  };
+  zipper = callPackage ../development/libraries/haskell/zipper {};
 
-  zlib = import ../development/libraries/haskell/zlib {
-    inherit cabal;
+  zlib = callPackage ../development/libraries/haskell/zlib {
     inherit (pkgs) zlib;
   };
 
-  zlib0520 = import ../development/libraries/haskell/zlib/0.5.2.0.nix {
-    inherit cabal;
+  zlib_0_5_2_0 = callPackage ../development/libraries/haskell/zlib/0.5.2.0.nix {
     inherit (pkgs) zlib;
   };
 
   # Compilers.
 
-  ehc = import ../development/compilers/ehc {
-    inherit ghc uulib uuagc mtl network binary fgl;
+  ehc = callPackage ../development/compilers/ehc {
     inherit (pkgs) fetchsvn stdenv coreutils glibc m4 libtool llvm;
   };
 
-  helium = import ../development/compilers/helium {
-    inherit ghc;
-    inherit (pkgs) fetchurl stdenv;
-  };
-
-  idris = import ../development/compilers/idris {
-    inherit cabal mtl parsec readline ivor happy;
-    inherit (pkgs) fetchdarcs;
-  };
+  helium = callPackage ../development/compilers/helium {};
 
+  idris = callPackage ../development/compilers/idris {};
 
   # Development tools.
 
-  alex = import ../development/tools/parsing/alex {
-    inherit cabal;
-    inherit (pkgs) perl;
+  alex = callPackage ../development/tools/parsing/alex {};
+
+  alex_2_3_2 = callPackage ../development/tools/parsing/alex/2.3.2.nix {};
+
+  alex_2_3_3 = callPackage ../development/tools/parsing/alex/2.3.3.nix {};
+
+  cpphs = callPackage ../development/tools/misc/cpphs {};
+
+  frown = callPackage ../development/tools/parsing/frown {};
+
+  haddock = haddock_2_4_2;
+
+  haddock_2_4_2 = callPackage ../development/tools/documentation/haddock/haddock-2.4.2.nix {};
+
+  haddock_2_7_2 = callPackage ../development/tools/documentation/haddock/haddock-2.7.2.nix {
+    alex = alex_2_3_2;
+    happy = happy_1_18_4;
+    ghcPaths = ghcPaths_0_1_0_6;
   };
 
-  alex232 = import ../development/tools/parsing/alex/2.3.2.nix {
-    inherit cabal;
-    inherit (pkgs) perl;
+  haddock_2_7_2_P = callPackage ../development/tools/documentation/haddock/haddock-2.7.2.nix {
+    alex = alex_2_3_3;
+    happy = happy_1_18_5;
+    ghcPaths = ghcPaths_0_1_0_6;
   };
 
-  alex233 = import ../development/tools/parsing/alex/2.3.3.nix {
-    inherit cabal;
-    inherit (pkgs) perl;
+  happy = happy_1_18_4;
+
+  happy_1_17 = callPackage ../development/tools/parsing/happy/happy-1.17.nix {};
+
+  happy_1_18_4 = callPackage ../development/tools/parsing/happy/happy-1.18.4.nix {};
+
+  happy_1_18_5 = callPackage ../development/tools/parsing/happy/happy-1.18.5.nix {};
+
+  hlint = callPackage ../development/tools/haskell/hlint {};
+
+  hslogger = callPackage ../development/tools/haskell/hslogger {
+    network = network_2_2_1_7;
   };
 
-  cpphs = import ../development/tools/misc/cpphs {
-    inherit cabal;
-  };
+  mkcabal = callPackage ../development/tools/haskell/mkcabal {};
 
-  frown = import ../development/tools/parsing/frown {
-    inherit ghc;
-    inherit (pkgs) fetchurl stdenv;
-  };
+  tar = callPackage ../development/tools/haskell/tar {};
 
-  haddock = haddock242;
-
-  # old version of haddock, still more stable than 2.0
-  haddock09 = import ../development/tools/documentation/haddock/haddock-0.9.nix {
-    inherit cabal;
-  };
-
-  # does not compile with ghc-6.8.3
-  haddock210 = pkgs.lowPrio (import ../development/tools/documentation/haddock/haddock-2.1.0.nix {
-    inherit cabal;
-  });
-
-  haddock242 = import ../development/tools/documentation/haddock/haddock-2.4.2.nix {
-    inherit cabal ghcPaths;
-    inherit (pkgs) libedit;
-  };
-
-  haddock272 = import ../development/tools/documentation/haddock/haddock-2.7.2.nix {
-    inherit cabal;
-    alex = alex232;
-    happy = happy1184;
-    ghcPaths = ghcPaths0106;
-  };
-
-  haddock272P = import ../development/tools/documentation/haddock/haddock-2.7.2.nix {
-    inherit cabal;
-    alex = alex233;
-    happy = happy1185;
-    ghcPaths = ghcPaths0106;
-  };
-
-  happy = happy1184;
-
-  happy117 = import ../development/tools/parsing/happy/happy-1.17.nix {
-    inherit cabal;
-    inherit (pkgs) perl;
-  };
-
-  happy1184 = import ../development/tools/parsing/happy/happy-1.18.4.nix {
-    inherit cabal mtl;
-    inherit (pkgs) perl;
-  };
-
-  happy1185 = import ../development/tools/parsing/happy/happy-1.18.5.nix {
-    inherit cabal mtl;
-    inherit (pkgs) perl;
-  };
-
-  hlint = import ../development/tools/haskell/hlint {
-    inherit cabal haskellSrcExts mtl uniplate hscolour parallel;
-  };
-
-  hslogger = import ../development/tools/haskell/hslogger {
-    inherit cabal mtl time;
-    network = network2217;
-  };
-
-  mkcabal = import ../development/tools/haskell/mkcabal {
-    inherit cabal mtl pcreLight readline;
-  };
-
-  tar = import ../development/tools/haskell/tar {
-    inherit cabal binary;
-  };
-
-  uuagc = import ../development/tools/haskell/uuagc {
-    inherit cabal uulib;
-  };
+  uuagc = callPackage ../development/tools/haskell/uuagc {};
 
   # Applications.
 
-  darcs = import ../applications/version-management/darcs/darcs-2.nix {
-    inherit cabal html mtl parsec regexCompat haskeline hashedStorage;
-    zlib = zlib0520;
+  darcs = callPackage ../applications/version-management/darcs/darcs-2.nix {
+    zlib = zlib_0_5_2_0;
     inherit (pkgs) curl;
   };
 
-  leksah = import ../applications/editors/leksah {
-    inherit cabal gtk2hs binary parsec regexPosix regexCompat utf8String;
+  leksah = callPackage ../applications/editors/leksah {
     inherit (pkgs) libedit makeWrapper;
   };
 
-  xmobar = import ../applications/misc/xmobar {
-    inherit cabal X11 mtl parsec stm utf8String X11_xft;
-  };
+  xmobar = callPackage ../applications/misc/xmobar {};
 
-  xmonad = import ../applications/window-managers/xmonad {
-    inherit cabal X11 mtl;
+  xmonad = callPackage ../applications/window-managers/xmonad {
     inherit (pkgs.xlibs) xmessage;
   };
 
-  xmonadContrib = import ../applications/window-managers/xmonad/xmonad-contrib.nix {
-    inherit cabal xmonad X11 utf8String;
-  };
-
+  xmonadContrib = callPackage ../applications/window-managers/xmonad/xmonad-contrib.nix {};
 
   # Tools.
 
-  cabalInstall082 = import ../tools/package-management/cabal-install/0.8.2.nix {
-    inherit cabal;
-    HTTP = HTTP400009;
-    network = network2217;
-    zlib = zlib0520;
+  cabalInstall_0_8_2 = callPackage ../tools/package-management/cabal-install/0.8.2.nix {
+    HTTP = HTTP_4000_0_9;
+    network = network_2_2_1_7;
+    zlib = zlib_0_5_2_0;
   };
 
-  cabalInstall080 = import ../tools/package-management/cabal-install/0.8.0.nix {
-    inherit cabal;
-    HTTP = HTTP400009;
-    network = network2217;
-    zlib = zlib0520;
+  cabalInstall_0_8_0 = callPackage ../tools/package-management/cabal-install/0.8.0.nix {
+    HTTP = HTTP_4000_0_9;
+    network = network_2_2_1_7;
+    zlib = zlib_0_5_2_0;
   };
 
-  cabalInstall = import ../tools/package-management/cabal-install {
-    inherit cabal HTTP network zlib;
-  };
+  cabalInstall = callPackage ../tools/package-management/cabal-install {};
 
-  lhs2tex = import ../tools/typesetting/lhs2tex {
-    inherit cabal regexCompat;
+  lhs2tex = callPackage ../tools/typesetting/lhs2tex {
     inherit (pkgs) tetex polytable;
   };
 
-  myhasktags = import ../tools/misc/myhasktags {
-    inherit ghcReal;
-    inherit (pkgs) stdenv fetchurl;
-  };
+  myhasktags = callPackage ../tools/misc/myhasktags {};
 
   # Games.
 
-  LambdaHack = import ../games/LambdaHack {
-    inherit cabal binary mtl zlib vty;
-  };
+  LambdaHack = callPackage ../games/LambdaHack {};
 
-  MazesOfMonad = import ../games/MazesOfMonad {
-    inherit cabal HUnit mtl regexPosix time;
-  };
+  MazesOfMonad = callPackage ../games/MazesOfMonad {};
 
-}
+# End of the main part of the file.
+
+}; };
+
+in result.x

From aa86a0c4a26dfb22dc62048ae4923ece0be08c96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 31 Aug 2010 08:19:28 +0000
Subject: [PATCH 026/181] Fixing kicad so it not only builds, but it also runs
 and finds the library of components.

svn path=/nixpkgs/trunk/; revision=23552
---
 .../science/electronics/kicad/default.nix     | 34 +++++++++++++++----
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix
index 8ce0b363264..a4c2482018f 100644
--- a/pkgs/applications/science/electronics/kicad/default.nix
+++ b/pkgs/applications/science/electronics/kicad/default.nix
@@ -1,14 +1,36 @@
-{stdenv, fetchurl, unzip, cmake, mesa, wxGTK, zlib, libX11}:
+{stdenv, fetchsvn, unzip, cmake, mesa, wxGTK, zlib, libX11}:
 
 stdenv.mkDerivation rec {
-  name = "kicad-2010-05-05";
+  name = "kicad-svn-2518";
 
-  src = fetchurl {
-    url = http://iut-tice.ujf-grenoble.fr/cao/sources/kicad-sources-2010-05-05-BZR2356-stable.zip;
-    sha256 = "05w2d7gpafs5xz532agyym5wnf5lw3lawpgncar7clgk1czcha7m";
+  src = fetchsvn {
+    url = https://kicad.svn.sourceforge.net/svnroot/kicad/trunk/kicad;
+    rev = 2518;
+    sha256 = "05z4fnkvvy91d0krf72q8xyislwh3zg8k0gy9w18caizbla5sih5";
   };
 
-  buildInputs = [ unzip cmake mesa wxGTK zlib libX11];
+  srcLibrary = fetchsvn {
+    url = https://kicad.svn.sourceforge.net/svnroot/kicad/trunk/kicad-library;
+    rev = 2518;
+    sha256 = "05sfmbp1z3hjxzcspj4vpprww5bxc6hq4alcjlc1vg6cvx2qgb9s";
+  };
+
+  # They say they only support installs to /usr or /usr/local,
+  # so we have to handle this.
+  patchPhase = ''
+    sed -i -e 's,/usr/local/kicad,'$out,g common/gestfich.cpp
+  '';
+
+  enableParallelBuilding = true;
+
+  buildInputs = [ unzip cmake mesa wxGTK zlib libX11 ];
+
+  postInstall = ''
+    mkdir library
+    cd library
+    cmake -DCMAKE_INSTALL_PREFIX=$out $srcLibrary
+    make install
+  '';
 
   meta = {
     description = "Free Software EDA Suite";

From 6acc186e0e0ec2b0cd47a6e9b303547e6967c8d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 31 Aug 2010 09:24:49 +0000
Subject: [PATCH 027/181] Fixing the catalan locale for kicad (it had the wrong
 encoding written)

svn path=/nixpkgs/trunk/; revision=23554
---
 pkgs/applications/science/electronics/kicad/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix
index a4c2482018f..c2200841ee1 100644
--- a/pkgs/applications/science/electronics/kicad/default.nix
+++ b/pkgs/applications/science/electronics/kicad/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchsvn, unzip, cmake, mesa, wxGTK, zlib, libX11}:
+{stdenv, fetchsvn, unzip, cmake, mesa, wxGTK, zlib, libX11, gettext}:
 
 stdenv.mkDerivation rec {
   name = "kicad-svn-2518";
@@ -19,11 +19,15 @@ stdenv.mkDerivation rec {
   # so we have to handle this.
   patchPhase = ''
     sed -i -e 's,/usr/local/kicad,'$out,g common/gestfich.cpp
+    pushd internat/ca
+    sed -i -e s/iso-8859-1/utf-8/ kicad.po
+    msgfmt -o kicad.mo kicad.po
+    popd
   '';
 
   enableParallelBuilding = true;
 
-  buildInputs = [ unzip cmake mesa wxGTK zlib libX11 ];
+  buildInputs = [ unzip cmake mesa wxGTK zlib libX11 gettext ];
 
   postInstall = ''
     mkdir library

From b7a15bae9f9e67a265f2b2e8ed6c81a9e04eaddc Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 31 Aug 2010 09:58:09 +0000
Subject: [PATCH 028/181] Adding libosip - GNU SIP library

svn path=/nixpkgs/trunk/; revision=23555
---
 pkgs/development/libraries/osip/default.nix | 20 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  4 +++-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/osip/default.nix

diff --git a/pkgs/development/libraries/osip/default.nix b/pkgs/development/libraries/osip/default.nix
new file mode 100644
index 00000000000..e63bbbb151d
--- /dev/null
+++ b/pkgs/development/libraries/osip/default.nix
@@ -0,0 +1,20 @@
+{stdenv, fetchurl}:
+stdenv.mkDerivation rec {
+  version = "3.3.0";
+  src = fetchurl {
+    url = "mirror://gnu/osip/libosip2-${version}.tar.gz";
+    sha256 = "08gqll8c7y9hzzs80cal7paxn6knnhbfkvzdaxs2sssrmbg2hpnl";
+  };
+  name = "libosip2-${version}";
+      
+  meta = {
+    license = "LGPLv2.1+";
+    description = "GNU oSIP library ";
+    maintainers = with stdenv.lib.maintainers;
+    [
+      raskin
+    ];
+    platforms = with stdenv.lib.platforms;
+      linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0695c4270ed..748a49e5d8f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3317,6 +3317,8 @@ let
 
   liboop = callPackage ../development/libraries/liboop { };
 
+  libosip = callPackage ../development/libraries/osip {};
+
   libotr = callPackage ../development/libraries/libotr { };
 
   libp11 = callPackage ../development/libraries/libp11 { };
@@ -6965,7 +6967,7 @@ let
 
   polytable = callPackage ../misc/tex/polytable { };
 
-  psi = callPackage ../applications/networking/instant-messengers/psi {
+  psi = makeOverridable (callPackage ../applications/networking/instant-messengers/psi) {
     qca2 = kde45.qca2;
     qca2_ossl = kde45.qca2_ossl;
     qt4 = qt47;

From fec59669329d148a1a46a0f7d19bbe6a4d71774c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Tue, 31 Aug 2010 10:40:28 +0000
Subject: [PATCH 029/181] Fix renamed argument problem.

svn path=/nixpkgs/trunk/; revision=23556
---
 pkgs/applications/misc/xmobar/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix
index ca7178fa13b..6bf91529a2b 100644
--- a/pkgs/applications/misc/xmobar/default.nix
+++ b/pkgs/applications/misc/xmobar/default.nix
@@ -1,11 +1,11 @@
-{cabal, X11, mtl, parsec, stm, utf8String, X11_xft}:
+{cabal, X11, mtl, parsec, stm, utf8String, X11Xft}:
 
 cabal.mkDerivation (self : {
   pname = "xmobar";
   name = "${self.fname}";
   version = "0.9.2";
   sha256 = "361295f5dc912512a2eb644ecd331562a271243192be6215cb071e44f50c7c66";
-  extraBuildInputs = [X11 mtl parsec stm utf8String X11_xft];
+  extraBuildInputs = [X11 mtl parsec stm utf8String X11Xft];
   meta = {
     description = "xmobar is a minimalistic text based status bar";
   };

From ca75f024abc043a57c492cab950ad749a328d671 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 31 Aug 2010 11:51:40 +0000
Subject: [PATCH 030/181] Update WebKit

svn path=/nixpkgs/trunk/; revision=23558
---
 pkgs/development/libraries/webkit/src-for-default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/webkit/src-for-default.nix b/pkgs/development/libraries/webkit/src-for-default.nix
index dc9371cbe68..20fa0cbe4cd 100644
--- a/pkgs/development/libraries/webkit/src-for-default.nix
+++ b/pkgs/development/libraries/webkit/src-for-default.nix
@@ -1,9 +1,9 @@
 rec {
-   version="r65398";
-   name="webkit-r65398";
-   hash="0y9pfhff1nyc818li8lqdkq906yi1r9n9zzmgymx8zpqxg8kcmk8";
-   url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r65398.tar.bz2";
-   advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r65398.tar.bz2";
+   version="r66356";
+   name="webkit-r66356";
+   hash="046xbmzxxhigsc2jwnkvgfvf11n54hi92i8nskcznwbbs1ra282i";
+   url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r66356.tar.bz2";
+   advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r66356.tar.bz2";
   
   
 }

From 1d236b4dcce9223144d3228be80d6220a9da5115 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 31 Aug 2010 13:18:12 +0000
Subject: [PATCH 031/181] svn path=/nixpkgs/trunk/; revision=23562

---
 pkgs/tools/package-management/nix/sqlite.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix/sqlite.nix b/pkgs/tools/package-management/nix/sqlite.nix
index b39c3c886c0..be9dfeec6c4 100644
--- a/pkgs/tools/package-management/nix/sqlite.nix
+++ b/pkgs/tools/package-management/nix/sqlite.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.0pre23431";
+  name = "nix-1.0pre23559";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/605509/download/4/${name}.tar.bz2";
-    sha256 = "63999912e1e139333f658cf1dd8fb80c8d894d127888067695b37e44e5d0ac07";
+    url = "http://hydra.nixos.org/build/614186/download/4/${name}.tar.bz2";
+    sha256 = "5c7fd783effc9c570f6feb5631f94e369a37de6b4fb2f51459964e48c465dcfa";
   };
 
   buildInputs = [ perl curl openssl ];

From ed7f0ddfc3e83fa69c87126fa1185446234debfb Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 31 Aug 2010 14:20:44 +0000
Subject: [PATCH 032/181] Step back WebKit upgrade

svn path=/nixpkgs/trunk/; revision=23565
---
 pkgs/development/libraries/webkit/src-for-default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/webkit/src-for-default.nix b/pkgs/development/libraries/webkit/src-for-default.nix
index 20fa0cbe4cd..6364dd2b5e7 100644
--- a/pkgs/development/libraries/webkit/src-for-default.nix
+++ b/pkgs/development/libraries/webkit/src-for-default.nix
@@ -1,9 +1,9 @@
 rec {
-   version="r66356";
-   name="webkit-r66356";
-   hash="046xbmzxxhigsc2jwnkvgfvf11n54hi92i8nskcznwbbs1ra282i";
-   url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r66356.tar.bz2";
-   advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r66356.tar.bz2";
+   version="r66329";
+   name="webkit-r66329";
+   hash="1kfigk95lyfgjjks9c62gnb334zxnz44zcirxlx23sq3vrkqgs84";
+   url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r66329.tar.bz2";
+   advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r66329.tar.bz2";
   
   
 }

From 6609f91e613c6530cc39f2ddb8c20ecc521a6964 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Tue, 31 Aug 2010 15:54:08 +0000
Subject: [PATCH 033/181] Fixing Haskell Platform attribute names in
 release.nix.

svn path=/nixpkgs/trunk/; revision=23569
---
 pkgs/top-level/release.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 869e669779f..22b8ee6a4fd 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -413,26 +413,26 @@ with (import ./release-lib.nix);
     gitit = linux;
     gtk2hs = linux;
     leksah = linux;
-    haskellPlatform2009202 = ghcSupported;
+    haskellPlatform_2009_2_0_2 = ghcSupported;
     xmonad = linux;
   };
 
   haskellPackages_ghc6121 = {
     darcs = ghcSupported;
     ghc = ghcSupported;
-    haskellPlatform2010100 = ghcSupported;
+    haskellPlatform_2010_1_0_0 = ghcSupported;
   };
 
   haskellPackages_ghc6122 = {
     darcs = ghcSupported;
     ghc = ghcSupported;
-    haskellPlatform2010100 = ghcSupported;
+    haskellPlatform_2010_1_0_0 = ghcSupported;
   };
 
   haskellPackages_ghc6123 = {
     darcs = ghcSupported;
     ghc = ghcSupported;
-    haskellPlatform2010200 = ghcSupported;
+    haskellPlatform_2010_2_0_0 = ghcSupported;
     lhs2tex = ghcSupported;
     xmonad = linux;
   };

From a33c1d27881aba13338e1c706f7764d41af0c81d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 31 Aug 2010 18:47:07 +0000
Subject: [PATCH 034/181] Stepping back roughly halfway to our previous version
 of Webkit

svn path=/nixpkgs/trunk/; revision=23572
---
 pkgs/development/libraries/webkit/src-for-default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/webkit/src-for-default.nix b/pkgs/development/libraries/webkit/src-for-default.nix
index 6364dd2b5e7..e757cbdb79c 100644
--- a/pkgs/development/libraries/webkit/src-for-default.nix
+++ b/pkgs/development/libraries/webkit/src-for-default.nix
@@ -1,9 +1,9 @@
 rec {
-   version="r66329";
-   name="webkit-r66329";
-   hash="1kfigk95lyfgjjks9c62gnb334zxnz44zcirxlx23sq3vrkqgs84";
-   url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r66329.tar.bz2";
-   advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r66329.tar.bz2";
+   version="r66052";
+   name="webkit-r66052";
+   hash="1c8wmdiq8y38isfyb1dxx6qbi8bs3kmws5vxm0q22gy171rmkjai";
+   url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r66052.tar.bz2";
+   advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r66052.tar.bz2";
   
   
 }

From 26b3c63e32272a7bc3c03fc5e442ba658aba35a8 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 1 Sep 2010 08:32:59 +0000
Subject: [PATCH 035/181] Going further back with WebKit

svn path=/nixpkgs/trunk/; revision=23573
---
 pkgs/development/libraries/webkit/src-for-default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/webkit/src-for-default.nix b/pkgs/development/libraries/webkit/src-for-default.nix
index e757cbdb79c..1a381077933 100644
--- a/pkgs/development/libraries/webkit/src-for-default.nix
+++ b/pkgs/development/libraries/webkit/src-for-default.nix
@@ -1,9 +1,9 @@
 rec {
-   version="r66052";
-   name="webkit-r66052";
-   hash="1c8wmdiq8y38isfyb1dxx6qbi8bs3kmws5vxm0q22gy171rmkjai";
-   url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r66052.tar.bz2";
-   advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r66052.tar.bz2";
+   version="r65727";
+   name="webkit-r65727";
+   hash="1cpwcivzdl9phladzn8sfpavz5l0hwdy0ssnxrpi2rpi15nfy5zd";
+   url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r65727.tar.bz2";
+   advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r65727.tar.bz2";
   
   
 }

From ee731b9a4dcbb9db28b6924eab9d493691de0f87 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 1 Sep 2010 10:12:56 +0000
Subject: [PATCH 036/181] Updating veracity

svn path=/nixpkgs/trunk/; revision=23590
---
 .../version-management/veracity/default.nix   | 27 ++++++++++++++++---
 .../veracity/src-for-default.nix              | 11 ++++----
 .../veracity/src-info-for-default.nix         |  3 ++-
 3 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/version-management/veracity/default.nix b/pkgs/applications/version-management/veracity/default.nix
index c8cb08eef28..731514056c6 100644
--- a/pkgs/applications/version-management/veracity/default.nix
+++ b/pkgs/applications/version-management/veracity/default.nix
@@ -18,15 +18,36 @@ rec {
   inherit (s) name;
   inherit buildInputs;
 
-  phaseNames = ["prepareMakefiles" "doMake" "doDeploy"];
+  phaseNames = ["prepare_sgneeds" "dump0" "prepareMakefiles" "doMake" "doDeploy"];
+
+  dump0 = (a.doDump "0");
+
+  prepare_sgneeds = a.fullDepEntry (''
+    for d in bin include lib; do 
+      ensureDir "$out/sgneeds/$d"
+      for p in "${spidermonkey_1_8_0rc1}"; do
+        for f in "$p"/"$d"/*; do
+	  ln -sf "$f" "$out"/sgneeds/"$d"
+	done
+      done
+    done
+
+    ensureDir "$out/sgneeds/include/sgbrings"
+    ln -s "$out/sgneeds/include/js" "$out/sgneeds/include/sgbrings/js"
+    for f in "$out/sgneeds/lib/"libjs*; do
+      bn="$(basename "$f")"
+      ln -s "$f" "$out/sgneeds/lib/''${bn/libjs/libsgbrings_js}"
+    done
+
+    export SGNEEDS_DIR="$out"/sgneeds/
+  '') ["minInit" "defEnsureDir"];
 
   prepareMakefiles = a.fullDepEntry ''
-    find src -type f -exec sed -e 's@#include \([<"]\)sgbrings/js/js@#include \1js/js@g' -i '{}' ';'
     cd ..
     mkdir build
     cd build
     export NIX_LDFLAGS="$NIX_LDFLAGS -lssl"
-    cmake -G "Unix Makefiles" -D SGBRINGS_JS_INCDIR="${spidermonkey_1_8_0rc1}/include" -D SGBRINGS_JS_LIB="${spidermonkey_1_8_0rc1}/lib/libjs.a" ../veracity*
+    cmake -G "Unix Makefiles" -D SGNEEDS_DIR="$SGNEEDS_DIR" ../veracity*
   '' ["minInit" "addInputs" "doUnpack"];
 
   doDeploy = a.fullDepEntry ''
diff --git a/pkgs/applications/version-management/veracity/src-for-default.nix b/pkgs/applications/version-management/veracity/src-for-default.nix
index 48a6678071c..f909ac23568 100644
--- a/pkgs/applications/version-management/veracity/src-for-default.nix
+++ b/pkgs/applications/version-management/veracity/src-for-default.nix
@@ -1,8 +1,9 @@
 rec {
-   version="0.3.0.10246";
-   name="veracity-0.3.0.10246";
-   hash="03wn6dzbjv5p50xmiznynza5c1nk38v95mzv6rk6km1ykqprnlw0";
-   url="http://download-us.sourcegear.com/Veracity/0.3.0.10246/veracity-source-${version}.tar.gz";
-   advertisedUrl="http://download-us.sourcegear.com/Veracity/0.3.0.10246/veracity-source-0.3.0.10246.tar.gz";
+   version="0.3.1.10276";
+   name="veracity-0.3.1.10276";
+   hash="1qihrn243dlvvdg5w1vfv3g8bvpy7v0q3xc4d72k85xv8vkljkxw";
+   url="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-${version}.tar.gz";
+   advertisedUrl="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-0.3.1.10276.tar.gz";
+  
   
 }
diff --git a/pkgs/applications/version-management/veracity/src-info-for-default.nix b/pkgs/applications/version-management/veracity/src-info-for-default.nix
index f597a59bbaf..dac6c65e85c 100644
--- a/pkgs/applications/version-management/veracity/src-info-for-default.nix
+++ b/pkgs/applications/version-management/veracity/src-info-for-default.nix
@@ -1,4 +1,5 @@
 {
-  downloadPage = "http://sourcegear.com/veracity/downloads.html";
+  #downloadPage = "http://sourcegear.com/veracity/downloads.html";
+  downloadPage = "http://download-us.sourcegear.com/Veracity/nightly/index.html";
   baseName = "veracity";
 }

From 797263abb97138362529b3ffe18004e34a3445cb Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 1 Sep 2010 11:18:39 +0000
Subject: [PATCH 037/181] Rolling back to latest known-good WebKit to check
 whether the build errors are because of other changes

svn path=/nixpkgs/trunk/; revision=23593
---
 pkgs/development/libraries/webkit/src-for-default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/webkit/src-for-default.nix b/pkgs/development/libraries/webkit/src-for-default.nix
index 1a381077933..dc9371cbe68 100644
--- a/pkgs/development/libraries/webkit/src-for-default.nix
+++ b/pkgs/development/libraries/webkit/src-for-default.nix
@@ -1,9 +1,9 @@
 rec {
-   version="r65727";
-   name="webkit-r65727";
-   hash="1cpwcivzdl9phladzn8sfpavz5l0hwdy0ssnxrpi2rpi15nfy5zd";
-   url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r65727.tar.bz2";
-   advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r65727.tar.bz2";
+   version="r65398";
+   name="webkit-r65398";
+   hash="0y9pfhff1nyc818li8lqdkq906yi1r9n9zzmgymx8zpqxg8kcmk8";
+   url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r65398.tar.bz2";
+   advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r65398.tar.bz2";
   
   
 }

From 5e4adf0e4b17ad039bf03cf1892c22186eb1e886 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Wed, 1 Sep 2010 17:40:37 +0000
Subject: [PATCH 038/181] Update oRTP (0.13.1 -> 0.16.3)

svn path=/nixpkgs/trunk/; revision=23595
---
 pkgs/development/libraries/ortp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix
index 67d93152c2b..a561018e157 100644
--- a/pkgs/development/libraries/ortp/default.nix
+++ b/pkgs/development/libraries/ortp/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "ortp-0.13.1";
+  name = "ortp-0.16.3";
 
   src = fetchurl {
     url = "mirror://savannah/linphone/ortp/sources/${name}.tar.gz";
-    sha256 = "0k2963v4b15xnf4cpkpgjhsb8ckxpf6vdr8dnw7z3mzilji7391b";
+    sha256 = "13805ec34ee818408aa1b4571915ef8f9e544c838a0fca9dff8d2308de6574eb";
   };
 
   meta = {

From e208e8ae762f56db907e8f3bf5964db80fd97937 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Thu, 2 Sep 2010 10:02:26 +0000
Subject: [PATCH 039/181] Added HaRe, the Haskell Refactorer.

svn path=/nixpkgs/trunk/; revision=23599
---
 pkgs/development/tools/haskell/HaRe/default.nix | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix             |  4 ++++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/development/tools/haskell/HaRe/default.nix

diff --git a/pkgs/development/tools/haskell/HaRe/default.nix b/pkgs/development/tools/haskell/HaRe/default.nix
new file mode 100644
index 00000000000..ac04831fef9
--- /dev/null
+++ b/pkgs/development/tools/haskell/HaRe/default.nix
@@ -0,0 +1,14 @@
+{cabal, hint, mtl, network}:
+
+cabal.mkDerivation (self : {
+  pname = "HaRe";
+  version = "0.6.0.1";
+  sha256 = "cd3fa312c7fa6a5f761bbc3ebdbc6300e83ba9e285047acded6269d2164d67f8";
+  propagatedBuildInputs = [hint mtl network];
+  meta = {
+    description = "The Haskell Refactorer";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 3d83173b33d..cb74f03d6c1 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -681,6 +681,10 @@ rec {
 
   happy_1_18_5 = callPackage ../development/tools/parsing/happy/happy-1.18.5.nix {};
 
+  HaRe = callPackage ../development/tools/haskell/HaRe {
+    network = network_2_2_1_7;
+  };
+
   hlint = callPackage ../development/tools/haskell/hlint {};
 
   hslogger = callPackage ../development/tools/haskell/hslogger {

From c51b2a8beb736da2ab886396d604d37ecd29bce0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Fri, 3 Sep 2010 07:16:57 +0000
Subject: [PATCH 040/181] Minor syntactic simplification.

svn path=/nixpkgs/trunk/; revision=23607
---
 pkgs/top-level/haskell-packages.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index cb74f03d6c1..71faca5480a 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2,9 +2,7 @@
 
 let ghcReal = pkgs.lowPrio ghc; in
 
-let result = rec {
-
-      x = let callPackage = newScope x; in
+let result = let callPackage = newScope result; in
 
 # Indentation deliberately broken at this point to keep the bulk
 # of this file at a low indentation level.
@@ -746,6 +744,6 @@ rec {
 
 # End of the main part of the file.
 
-}; };
+};
 
-in result.x
+in result

From 3cfc942bdc9fcf78620ea34152a8749904bc25dd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 3 Sep 2010 10:46:18 +0000
Subject: [PATCH 041/181] * Added a function `applyGlobalOverrides' to return
 Nixpkgs with the   specified overrides applied.  This does the same as the  
 `packageOverrides' attribute in ~/.nixpkgs/config.nix, but can be   used
 within all-packages.nix to do a "deep" override for some   specific package. 
 For instance, to build Thunderbird with an older   version of Glib, you can
 say:

    thunderbird3 =
      let
        pkgs = applyGlobalOverrides (pkgsOrig:
          { gtkLibs220 = pkgsOrig.gtkLibs220 //
              { glib = pkgsOrig.gtkLibs218.glib; };
          });
      in
        pkgs.callPackage .../thunderbird/3.x.nix {
          inherit (pkgs.gnome) libIDL;
        };

  Note that `pkgsFun' now has an argument `pkgs' to refer to its own
  result.

* Moved callPackage etc. into pkgsFun so that it uses the right
  overriden packages, if applicable.  `defaultScope' isn't in the
  result set because that causes nix-env to go into an apparently
  infinite recursion.

* Dropped the optional pkgsOrig argument to ~/.nixpkgs/config.nix,
  because it's probably not useful or used.

svn path=/nixpkgs/trunk/; revision=23613
---
 pkgs/top-level/all-packages.nix | 62 ++++++++++++++++++++-------------
 1 file changed, 38 insertions(+), 24 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 748a49e5d8f..afbb99d36d7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -65,9 +65,9 @@ let
     in
       # allow both:
       # { /* the config */ } and
-      # { pkgsOrig, pkgs, ... } : { /* the config */ }
+      # { pkgs, ... } : { /* the config */ }
       if builtins.isFunction configExpr
-        then configExpr { inherit pkgs pkgsOrig; }
+        then configExpr { inherit pkgs; }
         else configExpr;
 
   # Return an attribute from the Nixpkgs configuration file, or
@@ -87,21 +87,42 @@ let
   # Allow packages to be overriden globally via the `packageOverrides'
   # configuration option, which must be a function that takes `pkgs'
   # as an argument and returns a set of new or overriden packages.
-  # `__overrides' is a magic attribute that causes the attributes in
-  # its value to be added to the surrounding `rec'.  The
-  # `packageOverrides' function is called with the *original*
+  # The `packageOverrides' function is called with the *original*
   # (un-overriden) set of packages, allowing packageOverrides
   # attributes to refer to the original attributes (e.g. "foo =
   # ... pkgs.foo ...").
-  # We don't want stdenv overrides in the case of cross-building, or
-  # otherwise the basic overrided packages will not be built with the
-  # crossStdenv adapter.
-  overrides = (getConfig ["packageOverrides"] (pkgs: {})) pkgsOrig //
-    (if pkgsOrig.stdenv ? overrides && crossSystem == null
-     then pkgsOrig.stdenv.overrides else { });
+  pkgs = applyGlobalOverrides (getConfig ["packageOverrides"] (pkgs: {}));
 
-  pkgsOrig = pkgsFun { }; # the un-overriden packages, passed to packageOverrides
-  pkgs = pkgsFun overrides; # the overriden, final packages
+
+  # Return the complete set of packages, after applying the overrides
+  # returned by the `overrider' function (see above).
+  applyGlobalOverrides = overrider:
+    let
+      # Call the overrider function.  We don't want stdenv overrides
+      # in the case of cross-building, or otherwise the basic
+      # overrided packages will not be built with the crossStdenv
+      # adapter.
+      overrides = overrider pkgsOrig //
+        (lib.optionalAttrs (pkgsOrig.stdenv ? overrides && crossSystem == null) pkgsOrig.stdenv.overrides);
+
+      # The un-overriden packages, passed to `overrider'.
+      pkgsOrig = pkgsFun pkgs {}; 
+
+      # The overriden, final packages.
+      pkgs = pkgsFun pkgs overrides; 
+    in pkgs;
+
+
+  # The package compositions.  Yes, this isn't properly indented.
+  pkgsFun = pkgs: __overrides:
+    with helperFunctions;
+    let defaultScope = pkgs // pkgs.xorg; in
+    helperFunctions // rec {
+
+  # `__overrides' is a magic attribute that causes the attributes in
+  # its value to be added to the surrounding `rec'.  We'll remove this
+  # eventually.
+  inherit __overrides;
 
 
   # We use `callPackage' to be able to omit function arguments that
@@ -112,26 +133,19 @@ let
 
   newScope = extra: lib.callPackageWith (defaultScope // extra);
 
-  defaultScope = pkgs // pkgs.xorg;
-
-
-  # The package compositions.  Yes, this isn't properly indented.
-  pkgsFun = __overrides: with helperFunctions; helperFunctions // rec {
-
-
+  
   # Override system. This is useful to build i686 packages on x86_64-linux.
   forceSystem = system: (import ./all-packages.nix) {
     inherit system;
     inherit bootStdenv noSysDirs gccWithCC gccWithProfiling config;
   };
 
+  
   # Used by wine, firefox with debugging version of Flash, ...
   pkgsi686Linux = forceSystem "i686-linux";
 
   callPackage_i686 = lib.callPackageWith (pkgsi686Linux // pkgsi686Linux.xorg);
 
-  inherit __overrides;
-
 
   # For convenience, allow callers to get the path to Nixpkgs.
   path = ../..;
@@ -853,7 +867,7 @@ let
   nbd = callPackage ../tools/networking/nbd {
     glib = gtkLibs.glib.override {
       stdenv = makeStaticBinaries stdenv;
-  };
+    };
   };
 
   nc6 = callPackage ../tools/networking/nc6 { };
@@ -2082,7 +2096,7 @@ let
   python24 = lowPrio (callPackage ../development/interpreters/python/2.4 { });
 
   python26Base = lowPrio (makeOverridable (import ../development/interpreters/python/2.6) {
-    inherit fetchurl stdenv zlib bzip2 gdbm;
+    inherit (pkgs) fetchurl stdenv zlib bzip2 gdbm;
     arch = if stdenv.isDarwin then darwinArchUtility else null;
     sw_vers = if stdenv.isDarwin then darwinSwVersUtility else null;
   });

From 4be79671b4c5a8480ea7ca952c3bb92e99c8418f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 3 Sep 2010 13:18:38 +0000
Subject: [PATCH 042/181] pkgs/development/python-modules/pygobject: ensure
 that python code can be found

svn path=/nixpkgs/trunk/; revision=23616
---
 .../development/python-modules/pygobject/default.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix
index 4007b721011..bb60ec66291 100644
--- a/pkgs/development/python-modules/pygobject/default.nix
+++ b/pkgs/development/python-modules/pygobject/default.nix
@@ -8,4 +8,16 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [python pkgconfig glib];
+
+  postInstall = ''
+    # All python code is installed into a "gtk-2.0" sub-directory. That
+    # sub-directory may be useful on systems which share several library
+    # versions in the same prefix, i.e. /usr/local, but on Nix that directory
+    # is useless. Furthermore, its existence makes it very hard to guess a
+    # proper $PYTHONPATH that allows "import gtk" to succeed.
+    cd $(toPythonPath $out)/gtk-2.0
+    for n in *; do
+      ln -s "gtk-2.0/$n" "../$n"
+    done
+  '';
 }

From 2c424208f9cd72b63b720c01ecffe6c664b40f2f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 3 Sep 2010 13:21:38 +0000
Subject: [PATCH 043/181] * man-pages 3.25.

svn path=/nixpkgs/trunk/; revision=23617
---
 pkgs/data/documentation/man-pages/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index b305ab8bbac..6fba5e429e7 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "man-pages-3.24";
+  name = "man-pages-3.25";
   
   src = fetchurl {
     url = "mirror://kernel/linux/docs/man-pages/Archive/${name}.tar.bz2";
-    sha256 = "0038v3ddg0mpg2iakdhgd5bg69xw4625si91nf1b0vrh9791fiz4";
+    sha256 = "1cq3zijmbsnjshkm78kffgqrdsxgg7ypvcf2digdyy0s9himnvwc";
   };
 
   preBuild =

From b508e9445b67e58e5251b45cc9fbd18975eb8d90 Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Fri, 3 Sep 2010 13:48:35 +0000
Subject: [PATCH 044/181] Include directory for OCaml's C headers.

Make an include directory and symlinks ocaml's C header files into
that directory.  By having an include directory it is automatically
propogated as to NIX_CFLAGS_COMPILE for anyone who uses ocaml as a
build input.

(Proposed on the mailing list by Russell O'Connor.)

svn path=/nixpkgs/trunk/; revision=23618
---
 pkgs/development/compilers/ocaml/3.10.0.nix | 4 ++++
 pkgs/development/compilers/ocaml/3.11.1.nix | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/pkgs/development/compilers/ocaml/3.10.0.nix b/pkgs/development/compilers/ocaml/3.10.0.nix
index a77e5fdd0ac..fdd95db5440 100644
--- a/pkgs/development/compilers/ocaml/3.10.0.nix
+++ b/pkgs/development/compilers/ocaml/3.10.0.nix
@@ -18,6 +18,10 @@ stdenv.mkDerivation (rec {
     CAT=$(type -tp cat)
     sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
   '';
+  postBuild = ''
+    ensureDir $out/include
+    ln -sv $out/lib/ocaml/caml $out/include/caml
+  '';
 
   meta = {
     homepage = http://caml.inria.fr/ocaml;
diff --git a/pkgs/development/compilers/ocaml/3.11.1.nix b/pkgs/development/compilers/ocaml/3.11.1.nix
index e22db680577..66c8319600f 100644
--- a/pkgs/development/compilers/ocaml/3.11.1.nix
+++ b/pkgs/development/compilers/ocaml/3.11.1.nix
@@ -24,6 +24,10 @@ stdenv.mkDerivation rec {
     CAT=$(type -tp cat)
     sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
   '';
+  postBuild = ''
+    ensureDir $out/include
+    ln -sv $out/lib/ocaml/caml $out/include/caml
+  '';
 
   meta = {
     homepage = http://caml.inria.fr/ocaml;

From 1df4ff6aaec60f3c564091fc4e51c39d79987bc4 Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Fri, 3 Sep 2010 14:05:49 +0000
Subject: [PATCH 045/181] Remove configure file for OCaml 3.09.1 which is not
 used anymore.

svn path=/nixpkgs/trunk/; revision=23619
---
 .../compilers/ocaml/configure-3.09.1          | 1431 -----------------
 1 file changed, 1431 deletions(-)
 delete mode 100755 pkgs/development/compilers/ocaml/configure-3.09.1

diff --git a/pkgs/development/compilers/ocaml/configure-3.09.1 b/pkgs/development/compilers/ocaml/configure-3.09.1
deleted file mode 100755
index ecfdc90e672..00000000000
--- a/pkgs/development/compilers/ocaml/configure-3.09.1
+++ /dev/null
@@ -1,1431 +0,0 @@
-#! /bin/sh
-
-#########################################################################
-#                                                                       #
-#                            Objective Caml                             #
-#                                                                       #
-#            Xavier Leroy, projet Cristal, INRIA Rocquencourt           #
-#                                                                       #
-#   Copyright 1999 Institut National de Recherche en Informatique et    #
-#   en Automatique.  All rights reserved.  This file is distributed     #
-#   under the terms of the GNU Library General Public License, with     #
-#   the special exception on linking described in file LICENSE.         #
-#                                                                       #
-#########################################################################
-
-# $Id: configure,v 1.228.2.3 2006/01/04 09:26:42 xleroy Exp $
-
-configure_options="$*"
-prefix=/usr/local
-bindir=''
-libdir=''
-mandir=''
-manext=1
-host_type=unknown
-ccoption=''
-cclibs=''
-curseslibs=''
-mathlib='-lm'
-dllib=''
-x11_include_dir=''
-x11_lib_dir=''
-tk_wanted=yes
-pthread_wanted=yes
-tk_defs=''
-tk_libs=''
-tk_x11=yes
-dl_defs=''
-verbose=no
-withcurses=yes
-withsharedlibs=yes
-gcc_warnings="-Wall"
-
-# Try to turn internationalization off, can cause config.guess to malfunction!
-unset LANG
-unset LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME 
-
-# Turn off some MacOS X debugging stuff, same reason
-unset RC_TRACE_ARCHIVES RC_TRACE_DYLIBS RC_TRACE_PREBINDING_DISABLED
-
-# Parse command-line arguments
-
-while : ; do
-  case "$1" in
-    "") break;;
-    -prefix|--prefix)
-        prefix=$2; shift;;
-    -bindir|--bindir)
-        bindir=$2; shift;;
-    -libdir|--libdir)
-        libdir=$2; shift;;
-    -mandir|--mandir)
-        case "$2" in
-          */man[1-9ln])
-            mandir=`echo $2 | sed -e 's|^\(.*\)/man.$|\1|'`
-            manext=`echo $2 | sed -e 's/^.*\(.\)$/\1/'`;;
-          *)
-            mandir=$2
-            manext=1;;
-        esac
-        shift;;
-    -host*|--host*)
-        host_type=$2; shift;;
-    -cc*)
-        ccoption="$2"; shift;;
-    -lib*)
-        cclibs="$2 $cclibs"; shift;;
-    -no-curses)
-        withcurses=no;;
-    -no-shared-libs)
-        withsharedlibs=no;;
-    -x11include*|--x11include*)
-        x11_include_dir=$2; shift;;
-    -x11lib*|--x11lib*)
-        x11_lib_dir=$2; shift;;
-    -with-pthread*|--with-pthread*)
-        ;; # Ignored for backward compatibility
-    -no-pthread*|--no-pthread*)
-        pthread_wanted=no;;
-    -no-tk|--no-tk)
-        tk_wanted=no;;
-    -tkdefs*|--tkdefs*)
-        tk_defs=$2; shift;;
-    -tklibs*|--tklibs*)
-        tk_libs=$2; shift;;
-    -tk-no-x11|--tk-no-x11)
-        tk_x11=no;;
-    -dldefs*|--dldefs*)
-        dl_defs="$2"; shift;;
-    -dllibs*|--dllibs*)
-        dllib="$2"; shift;;
-    -verbose|--verbose)
-        verbose=yes;;
-    *) echo "Unknown option \"$1\"." 1>&2; exit 2;;
-  esac
-  shift
-done
-
-# Sanity checks
-
-case "$prefix" in
-  /*) ;;
-   *) echo "The -prefix directory must be absolute." 1>&2; exit 2;;
-esac
-case "$bindir" in
-  /*) ;;
-  "") ;;
-   *) echo "The -bindir directory must be absolute." 1>&2; exit 2;;
-esac
-case "$libdir" in
-  /*) ;;
-  "") ;;
-   *) echo "The -libdir directory must be absolute." 1>&2; exit 2;;
-esac
-case "$mandir" in
-  /*) ;;
-  "") ;;
-   *) echo "The -mandir directory must be absolute." 1>&2; exit 2;;
-esac
-
-# Generate the files
-
-cd config/auto-aux
-rm -f s.h m.h Makefile
-touch s.h m.h Makefile
-
-# Write options to Makefile
-
-echo "# generated by ./configure $configure_options" >> Makefile
-
-# Where to install
-
-echo "PREFIX=$prefix" >> Makefile
-case "$bindir" in
-  "") echo 'BINDIR=$(PREFIX)/bin' >> Makefile
-      bindir="$prefix/bin";;
-   *) echo "BINDIR=$bindir" >> Makefile;;
-esac
-case "$libdir" in
-  "") echo 'LIBDIR=$(PREFIX)/lib/ocaml' >> Makefile
-      libdir="$prefix/lib/ocaml";;
-   *) echo "LIBDIR=$libdir" >> Makefile;;
-esac
-echo 'STUBLIBDIR=$(LIBDIR)/stublibs' >> Makefile
-case "$mandir" in
-  "") echo 'MANDIR=$(PREFIX)/man' >> Makefile
-      mandir="$prefix/man";;
-   *) echo "MANDIR=$mandir" >> Makefile;;
-esac
-echo "MANEXT=$manext" >> Makefile
-
-# Determine the system type
-
-if test "$host_type" = "unknown"; then
-  if host_type=`../gnu/config.guess`; then :; else
-    echo "Cannot guess host type"
-    echo "You must specify one with the -host option"
-    exit 2
-  fi
-fi
-if host=`../gnu/config.sub $host_type`; then :; else
-  echo "Please specify the correct host type with the -host option"
-  exit 2
-fi
-echo "Configuring for a $host ..."
-
-# Do we have gcc?
-
-if test -z "$ccoption"; then
-  if sh ./searchpath gcc; then
-    echo "gcc found"
-    cc=gcc
-  else
-    cc=cc
-  fi
-else
-  cc="$ccoption"
-fi
-
-# Check for buggy versions of GCC
-
-buggycc="no"
-
-case "$host,$cc" in
-  i[3456]86-*-*,gcc*)
-    case `$cc --version` in
-      2.7.2.1) cat <<'EOF'
-
-WARNING: you are using gcc version 2.7.2.1 on an Intel x86 processor.
-This version of gcc is known to generate incorrect code for the
-Objective Caml runtime system on some Intel x86 machines. (The symptom
-is a crash of boot/ocamlc when compiling stdlib/pervasives.mli.)
-In particular, the version of gcc 2.7.2.1 that comes with
-Linux RedHat 4.x / Intel is affected by this problem.
-Other Linux distributions might also be affected.
-If you are using one of these configurations, you are strongly advised
-to use another version of gcc, such as 2.95, which are
-known to work well with Objective Caml.
-
-Press <enter> to proceed or <interrupt> to stop.
-EOF
-        read reply;;
-      2.96*) cat <<'EOF'
-
-WARNING: you are using gcc version 2.96 on an Intel x86 processor.
-Certain patched versions of gcc 2.96 are known to generate incorrect
-code for the Objective Caml runtime system.  (The symptom is a segmentation
-violation on boot/ocamlc.)  Those incorrectly patched versions can be found
-in RedHat 7.2 and Mandrake 8.0 and 8.1; other Linux distributions
-might also be affected.  (See bug #57760 on bugzilla.redhat.com)
-
-Auto-configuration will now select gcc compiler flags that work around
-the problem.  Still, if you observe segmentation faults while running
-ocamlc or ocamlopt, you are advised to try another version of gcc,
-such as 2.95.3 or 3.2.
-
-EOF
-        buggycc="gcc.2.96";;
-
-            esac;;
-esac
-
-# Configure the bytecode compiler
-
-bytecc="$cc"
-bytecccompopts=""
-bytecclinkopts=""
-ostype="Unix"
-exe=""
-
-case "$bytecc,$host" in
-  cc,*-*-nextstep*)
-    # GNU C extensions disabled, but __GNUC__ still defined!
-    bytecccompopts="-fno-defer-pop $gcc_warnings -U__GNUC__ -posix"
-    bytecclinkopts="-posix";;
-  *,*-*-rhapsody*)
-    # Almost the same as NeXTStep
-    bytecccompopts="-fno-defer-pop $gcc_warnings -DSHRINKED_GNUC"
-    mathlib="";;
-  *,*-*-darwin*)
-    # Almost the same as rhapsody
-    bytecccompopts="-fno-defer-pop -no-cpp-precomp $gcc_warnings"
-    mathlib="";;
-  *,*-*-beos*)
-    bytecccompopts="-fno-defer-pop $gcc_warnings"
-    # No -lm library
-    mathlib="";;
-  gcc,alpha*-*-osf*)
-    bytecccompopts="-fno-defer-pop $gcc_warnings"
-    if cc="$bytecc" sh ./hasgot -mieee; then
-      bytecccompopts="-mieee $bytecccompopts";
-    fi
-    # Put code and static data in lower 4GB
-    bytecclinkopts="-Wl,-T,12000000 -Wl,-D,14000000"
-    # Tell gcc that we can use 32-bit code addresses for threaded code
-    echo "#define ARCH_CODE32" >> m.h;;
-  cc,alpha*-*-osf*)
-    bytecccompopts="-std1 -ieee";;
-  gcc,alpha*-*-linux*)
-    if cc="$bytecc" sh ./hasgot -mieee; then
-      bytecccompopts="-mieee $bytecccompopts";
-    fi;;
-  cc,mips-*-irix6*)
-    # Add -n32 flag to ensure compatibility with native-code compiler
-    bytecccompopts="-n32"
-    # Turn off warning "unused library"
-    bytecclinkopts="-n32 -Wl,-woff,84";;
-  cc*,mips-*-irix6*)
-    # (For those who want to force "cc -64")
-    # Turn off warning "unused library"
-    bytecclinkopts="-Wl,-woff,84";;
-  *,alpha*-*-unicos*)
-    # For the Cray T3E
-    bytecccompopts="-DUMK";;
-  gcc*,powerpc-*-aix*)
-    # Avoid name-space pollution by requiring Unix98-conformant includes
-    bytecccompopts="-fno-defer-pop $gcc_warnings -D_XOPEN_SOURCE=500";;
-  *,powerpc-*-aix*)
-    bytecccompopts="-D_XOPEN_SOURCE=500";;
-  gcc*,*-*-cygwin*)
-    bytecccompopts="-fno-defer-pop $gcc_warnings -U_WIN32"
-    exe=".exe"
-    ostype="Cygwin";;
-  gcc*,x86_64-*-linux*)
-    bytecccompopts="-fno-defer-pop $gcc_warnings"
-    # Tell gcc that we can use 32-bit code addresses for threaded code
-    # unless we are compiled for a shared library (-fPIC option)
-    echo "#ifndef __PIC__" >> m.h
-    echo "#  define ARCH_CODE32" >> m.h
-    echo "#endif" >> m.h;;
-  gcc*)
-    bytecccompopts="-fno-defer-pop $gcc_warnings";;
-esac
-
-# Configure compiler to use in further tests
-
-cc="$bytecc -O $bytecclinkopts"
-export cc cclibs verbose
-
-# Check C compiler
-
-sh ./runtest ansi.c
-case $? in
-  0) echo "The C compiler is ANSI-compliant.";;
-  1) echo "The C compiler $cc is not ANSI-compliant."
-     echo "You need an ANSI C compiler to build Objective Caml."
-     exit 2;;
-  *) echo "Unable to compile the test program."
-     echo "Make sure the C compiler $cc is properly installed."
-     exit 2;;
-esac
-
-# Check the sizes of data types
-
-echo "Checking the sizes of integers and pointers..."
-set `sh ./runtest sizes.c`
-case "$2,$3" in
-  4,4) echo "OK, this is a regular 32 bit architecture."
-       echo "#undef ARCH_SIXTYFOUR" >> m.h;;
-  *,8) echo "Wow! A 64 bit architecture!"
-       echo "#define ARCH_SIXTYFOUR" >> m.h;;
-  *,*) echo "This architecture seems to be neither 32 bits nor 64 bits."
-       echo "Objective Caml won't run on this architecture."
-       exit 2;;
-    *) echo "Unable to compile the test program."
-       echo "Make sure the C compiler $cc is properly installed."
-       exit 2;;
-esac
-if test $1 != 4 && test $2 != 4 && test $4 != 4; then
-  echo "Sorry, we can't find a 32-bit integer type"
-  echo "(sizeof(short) = $4, sizeof(int) = $1, sizeof(long) = $2)"
-  echo "Objective Caml won't run on this architecture."
-  exit 2
-fi
-
-echo "#define SIZEOF_INT $1" >> m.h
-echo "#define SIZEOF_LONG $2" >> m.h
-echo "#define SIZEOF_PTR $3" >> m.h
-echo "#define SIZEOF_SHORT $4" >> m.h
-
-if test $2 = 8; then
-     echo "#define ARCH_INT64_TYPE long" >> m.h
-     echo "#define ARCH_UINT64_TYPE unsigned long" >> m.h
-     echo '#define ARCH_INT64_PRINTF_FORMAT "l"' >> m.h
-     int64_native=true
-else
-  sh ./runtest longlong.c
-  case $? in
-  0) echo "64-bit \"long long\" integer type found (printf with \"%ll\")."
-     echo "#define ARCH_INT64_TYPE long long" >> m.h
-     echo "#define ARCH_UINT64_TYPE unsigned long long" >> m.h
-     echo '#define ARCH_INT64_PRINTF_FORMAT "ll"' >> m.h
-     int64_native=true;;
-  1) echo "64-bit \"long long\" integer type found (printf with \"%q\")."
-     echo "#define ARCH_INT64_TYPE long long" >> m.h
-     echo "#define ARCH_UINT64_TYPE unsigned long long" >> m.h
-     echo '#define ARCH_INT64_PRINTF_FORMAT "q"' >> m.h
-     int64_native=true;;
-  2) echo "64-bit \"long long\" integer type found (but no printf)."
-     echo "#define ARCH_INT64_TYPE long long" >> m.h
-     echo "#define ARCH_UINT64_TYPE unsigned long long" >> m.h
-     echo '#undef ARCH_INT64_PRINTF_FORMAT' >> m.h
-     int64_native=true;;
-  *) echo "No suitable 64-bit integer type found, will use software emulation."
-     echo "#undef ARCH_INT64_TYPE" >> m.h
-     echo "#undef ARCH_UINT64_TYPE" >> m.h
-     echo '#undef ARCH_INT64_PRINTF_FORMAT' >> m.h
-     int64_native=false;;
-  esac
-fi
-
-if test $3 = 8 && test $int64_native = false; then
-  echo "This architecture has 64-bit pointers but no 64-bit integer type."
-  echo "Objective Caml won't run on this architecture."
-  exit 2
-fi
-
-# Determine endianness
-
-sh ./runtest endian.c
-case $? in
-  0) echo "This is a big-endian architecture."
-     echo "#define ARCH_BIG_ENDIAN" >> m.h;;
-  1) echo "This is a little-endian architecture."
-     echo "#undef ARCH_BIG_ENDIAN" >> m.h;;
-  2) echo "This architecture seems to be neither big endian nor little endian."
-     echo "Objective Caml won't run on this architecture."
-     exit 2;;
-  *) echo "Something went wrong during endianness determination."
-     echo "You'll have to figure out endianness yourself"
-     echo "(option ARCH_BIG_ENDIAN in m.h).";;
-esac
-
-# Determine alignment constraints
-
-case "$host" in
-  sparc*-*-*|hppa*-*-*)
-    # On Sparc V9 with certain versions of gcc, determination of double
-    # alignment is not reliable (PR#1521), hence force it.
-    # Same goes for hppa.
-    # But there's a knack (PR#2572):
-    # if we're in 64-bit mode (sizeof(long) == 8), 
-    # we must not doubleword-align floats...
-    if test $2 = 8; then
-      echo "Doubles can be word-aligned."
-      echo "#undef ARCH_ALIGN_DOUBLE" >> m.h
-    else
-      echo "Doubles must be doubleword-aligned."
-      echo "#define ARCH_ALIGN_DOUBLE" >> m.h
-    fi;;
-  *)
-    sh ./runtest dblalign.c
-    case $? in
-      0) echo "Doubles can be word-aligned."
-         echo "#undef ARCH_ALIGN_DOUBLE" >> m.h;;
-      1) echo "Doubles must be doubleword-aligned."
-         echo "#define ARCH_ALIGN_DOUBLE" >> m.h;;
-      *) echo "Something went wrong during alignment determination for doubles."
-         echo "I'm going to assume this architecture has alignment constraints over doubles."
-         echo "That's a safe bet: Objective Caml will work even if"
-         echo "this architecture has actually no alignment constraints."
-         echo "#define ARCH_ALIGN_DOUBLE" >> m.h;;
-    esac;;
-esac
-
-if $int64_native; then
-  case "$host" in
-    sparc*-*-*|hppa*-*-*)
-      if test $2 = 8; then
-        echo "64-bit integers can be word-aligned."
-        echo "#undef ARCH_ALIGN_INT64" >> m.h
-      else
-        echo "64-bit integers must be doubleword-aligned."
-        echo "#define ARCH_ALIGN_INT64" >> m.h
-      fi;;
-    *)
-      sh ./runtest int64align.c
-      case $? in
-        0) echo "64-bit integers can be word-aligned."
-           echo "#undef ARCH_ALIGN_INT64" >> m.h;;
-        1) echo "64-bit integers must be doubleword-aligned."
-           echo "#define ARCH_ALIGN_INT64" >> m.h;;
-        *) echo "Something went wrong during alignment determination for 64-bit integers."
-           echo "I'm going to assume this architecture has alignment constraints."
-           echo "That's a safe bet: Objective Caml will work even if"
-           echo "this architecture has actually no alignment constraints."
-           echo "#define ARCH_ALIGN_INT64" >> m.h;;
-      esac
-  esac
-else
-  echo "#undef ARCH_ALIGN_INT64" >> m.h
-fi
-
-# Check semantics of division and modulus
-
-sh ./runtest divmod.c
-case $? in
-  0) echo "Native division and modulus have round-towards-zero semantics, will use them."
-     echo "#undef NONSTANDARD_DIV_MOD" >> m.h;;
-  1) echo "Native division and modulus do not have round-towards-zero semantics, will use software emulation."
-     echo "#define NONSTANDARD_DIV_MOD" >> m.h;;
-  *) echo "Something went wrong while checking native division and modulus, please report it."
-     echo "#define NONSTANDARD_DIV_MOD" >> m.h;;
-esac
-
-# Shared library support
-
-shared_libraries_supported=false
-dl_needs_underscore=false
-sharedcccompopts=''
-mksharedlib=''
-byteccrpath=''
-mksharedlibrpath=''
-
-if test $withsharedlibs = "yes"; then
-  case "$host" in
-    *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*)
-      sharedcccompopts="-fPIC"
-      mksharedlib="$bytecc -shared -o"
-      bytecclinkopts="$bytecclinkopts -Wl,-E"
-      byteccrpath="-Wl,-rpath,"
-      mksharedlibrpath="-Wl,-rpath,"
-      shared_libraries_supported=true;;
-    alpha*-*-osf*)
-      case "$bytecc" in
-        gcc*)
-          sharedcccompopts="-fPIC"
-          mksharedlib="$bytecc -shared -o"
-          byteccrpath="-Wl,-rpath,"
-          mksharedlibrpath="-Wl,-rpath,"
-          shared_libraries_supported=true;;
-        cc*)
-          sharedcccompopts=""
-          mksharedlib="ld -shared -expect_unresolved '*' -o"
-          byteccrpath="-Wl,-rpath,"
-          mksharedlibrpath="-rpath "
-          shared_libraries_supported=true;;
-      esac;;
-    *-*-solaris2*)
-      case "$bytecc" in
-        gcc*)
-          sharedcccompopts="-fPIC"
-          if sh ./solaris-ld; then
-            mksharedlib="$bytecc -shared -o"
-            byteccrpath="-R"
-            mksharedlibrpath="-R"
-          else
-            mksharedlib="$bytecc -shared -o"
-            bytecclinkopts="$bytecclinkopts -Wl,-E"
-            byteccrpath="-Wl,-rpath,"
-            mksharedlibrpath="-Wl,-rpath,"
-          fi
-          shared_libraries_supported=true;;
-        *)
-          sharedcccompopts="-KPIC"
-          byteccrpath="-R"
-          mksharedlibrpath="-R"
-          mksharedlib="/usr/ccs/bin/ld -G -o"
-          shared_libraries_supported=true;;
-      esac;;
-    mips*-*-irix[56]*)
-      case "$bytecc" in
-        cc*) sharedcccompopts="";;
-        gcc*) sharedcccompopts="-fPIC";;
-      esac
-      mksharedlib="ld -shared -rdata_shared -o"
-      byteccrpath="-Wl,-rpath,"
-      mksharedlibrpath="-rpath "
-      shared_libraries_supported=true;;
-    powerpc-apple-darwin*)
-      mksharedlib="cc -bundle -flat_namespace -undefined suppress -o"
-      bytecccompopts="$dl_defs $bytecccompopts"
-      #sharedcccompopts="-fnocommon"
-      dl_needs_underscore=true
-      shared_libraries_supported=true;;
-  esac
-fi
-
-# Further machine-specific hacks
-
-case "$host" in
-  ia64-*-linux*|alpha*-*-linux*|x86_64-*-linux*)
-    echo "Will use mmap() instead of malloc() for allocation of major heap chunks."
-    echo "#define USE_MMAP_INSTEAD_OF_MALLOC" >> s.h;;
-esac
-
-# Configure the native-code compiler
-
-arch=none
-model=default
-system=unknown
-
-case "$host" in
-  alpha*-*-osf*)                arch=alpha; system=digital;;
-  alpha*-*-linux*)              arch=alpha; system=linux;;
-  alpha*-*-freebsd*)            arch=alpha; system=freebsd;;
-  alpha*-*-netbsd*)             arch=alpha; system=netbsd;;
-  alpha*-*-openbsd*)            arch=alpha; system=openbsd;;
-  sparc*-*-sunos4.*)            arch=sparc; system=sunos;;
-  sparc*-*-solaris2.*)          arch=sparc; system=solaris;;
-  sparc*-*-*bsd*)               arch=sparc; system=bsd;;
-  sparc*-*-linux*)              arch=sparc; system=linux;;
-  i[3456]86-*-linux*)           arch=i386; system=linux_`sh ./runtest elf.c`;;
-  i[3456]86-*-*bsd*)            arch=i386; system=bsd_`sh ./runtest elf.c`;;
-  i[3456]86-*-nextstep*)        arch=i386; system=nextstep;;
-  i[3456]86-*-solaris*)         arch=i386; system=solaris;;
-  i[3456]86-*-beos*)            arch=i386; system=beos;;
-  i[3456]86-*-cygwin*)          arch=i386; system=cygwin;;
-  mips-*-irix6*)                arch=mips; system=irix;;
-  hppa1.1-*-hpux*)              arch=hppa; system=hpux;;
-  hppa2.0*-*-hpux*)             arch=hppa; system=hpux;;
-  hppa*-*-linux*)		arch=hppa; system=linux;;
-  powerpc-*-linux*)             arch=power; model=ppc; system=elf;;
-  powerpc-*-netbsd*)            arch=power; model=ppc; system=bsd;;
-  powerpc-*-rhapsody*)          arch=power; model=ppc; system=rhapsody;;
-  powerpc-*-darwin*)            arch=power; model=ppc; system=rhapsody;;
-  arm*-*-linux*)                arch=arm; system=linux;;
-  ia64-*-linux*)                arch=ia64; system=linux;;
-  ia64-*-freebsd*)              arch=ia64; system=freebsd;;
-  x86_64-*-linux*)              arch=amd64; system=linux;;
-  x86_64-*-freebsd*)            arch=amd64; system=freebsd;;
-  x86_64-*-openbsd*)            arch=amd64; system=openbsd;;
-esac
-
-if test -z "$ccoption"; then
-  case "$arch,$system,$cc" in
-    alpha,digital,gcc*) nativecc=cc;;
-    mips,*,gcc*) nativecc=cc;;
-    *) nativecc="$bytecc";;
-  esac
-else
-  nativecc="$ccoption"
-fi
-
-nativecccompopts=''
-nativecclinkopts=''
-nativeccrpath="$byteccrpath"
-
-case "$arch,$nativecc,$system,$host_type" in
-  alpha,cc*,digital,*) nativecccompopts=-std1;;
-  mips,cc*,irix,*)     nativecccompopts=-n32
-                       nativecclinkopts="-n32 -Wl,-woff,84";;
-  *,*,nextstep,*)      nativecccompopts="$gcc_warnings -U__GNUC__ -posix"
-                       nativecclinkopts="-posix";;
-  *,*,rhapsody,*darwin[1-5].*)
-                       nativecccompopts="$gcc_warnings -DSHRINKED_GNUC";;
-  *,*,rhapsody,*)
-                 nativecccompopts="$gcc_warnings -DDARWIN_VERSION_6 $dl_defs";;
-  *,gcc*,cygwin,*)     nativecccompopts="$gcc_warnings -U_WIN32";;
-  *,gcc*,*,*)          nativecccompopts="$gcc_warnings";;
-esac
-
-asflags=''
-aspp='$(AS)'
-asppflags=''
-asppprofflags='-DPROFILING'
-
-case "$arch,$model,$system" in
-  alpha,*,digital)  asflags='-O2'; asppflags='-O2 -DSYS_$(SYSTEM)';
-                    asppprofflags='-pg -DPROFILING';;
-  alpha,*,linux)    aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';;
-  alpha,*,freebsd)  aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';;
-  alpha,*,netbsd)   aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';;
-  alpha,*,openbsd)  aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';;
-  mips,*,irix)      asflags='-n32 -O2'; asppflags="$asflags";;
-  sparc,*,bsd)      aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';;
-  sparc,*,linux)    aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';;
-  sparc,*,*)        case "$cc" in
-                      gcc*) aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';;
-                         *) asppflags='-P -DSYS_$(SYSTEM)';;
-                    esac;;
-  i386,*,solaris)   aspp='/usr/ccs/bin/as'; asppflags='-P -DSYS_$(SYSTEM)';;
-  i386,*,*)         aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';;
-  hppa,*,*)         aspp="$cc"; asppflags='-traditional -c -DSYS_$(SYSTEM)';;
-  power,*,elf)      aspp='gcc'; asppflags='-c';;
-  power,*,bsd)      aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';;
-  power,*,rhapsody) ;;
-  arm,*,linux)      aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';;
-  ia64,*,*)         asflags=-xexplicit
-                    aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM) -Wa,-xexplicit';;
-  amd64,*,*)        aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';;
-esac
-
-cc_profile='-pg'
-case "$arch,$model,$system" in
-  alpha,*,digital) profiling='prof';;
-  i386,*,linux_elf) profiling='prof';;
-  i386,*,bsd_elf) profiling='prof';;
-  sparc,*,solaris)
-    profiling='prof'
-    case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;;
-  amd64,*,linux) profiling='prof';;
-  *) profiling='noprof';;
-esac
-
-# Where is ranlib?
-
-if sh ./searchpath ranlib; then
-  echo "ranlib found"
-  echo "RANLIB=ranlib" >> Makefile
-  echo "RANLIBCMD=ranlib" >> Makefile
-else
-  echo "ranlib not used"
-  echo "RANLIB=ar rs" >> Makefile
-  echo "RANLIBCMD=" >> Makefile
-fi
-
-# Do #! scripts work?
-
-# BRAVO: check disabled for NixOS
-# if (SHELL=/bin/sh; export SHELL; (./sharpbang || ./sharpbang2) >/dev/null); then
-#   echo "#! appears to work in shell scripts"
-  case "$host" in
-    *-*-sunos*|*-*-unicos*)
-      echo "We won't use it, though, because under SunOS and Unicos it breaks"
-      echo "on pathnames longer than 30 characters"
-      echo "SHARPBANGSCRIPTS=false" >> Makefile;;
-    *-*-cygwin*)
-      echo "We won't use it, though, because of conflicts with .exe extension"
-      echo "under Cygwin"
-      echo "SHARPBANGSCRIPTS=false" >> Makefile;;
-    *)
-      echo "SHARPBANGSCRIPTS=true" >> Makefile;;
-  esac
-# else
-#   echo "No support for #! in shell scripts"
-#   echo "SHARPBANGSCRIPTS=false" >> Makefile
-# fi
-
-# Write the OS type (Unix or Cygwin)
-
-echo "#define OCAML_OS_TYPE \"$ostype\"" >> s.h
-echo "#define OCAML_STDLIB_DIR \"$libdir\"" >> s.h
-
-# Use 64-bit file offset if possible
-
-bytecccompopts="$bytecccompopts -D_FILE_OFFSET_BITS=64"
-nativecccompopts="$nativecccompopts -D_FILE_OFFSET_BITS=64"
-
-# Check the semantics of signal handlers
-
-if sh ./hasgot sigaction sigprocmask; then
-  echo "POSIX signal handling found."
-  echo "#define POSIX_SIGNALS" >> s.h
-else
-  if sh ./runtest signals.c; then
-    echo "Signals have the BSD semantics."
-    echo "#define BSD_SIGNALS" >> s.h
-  else
-    echo "Signals have the System V semantics."
-  fi
-  if sh ./hasgot sigsetmask; then
-    echo "sigsetmask() found"
-    echo "#define HAS_SIGSETMASK" >> s.h
-  fi
-fi
-
-# For the sys module
-
-if sh ./hasgot getrusage; then
-  echo "getrusage() found."
-  echo "#define HAS_GETRUSAGE" >> s.h
-fi
-
-if sh ./hasgot times; then
-  echo "times() found."
-  echo "#define HAS_TIMES" >> s.h
-fi
-
-# For the terminfo module
-
-if test "$withcurses" = "yes"; then
-  for libs in "" "-lcurses" "-ltermcap" "-lcurses -ltermcap" "-lncurses"; do
-    if sh ./hasgot $libs tgetent tgetstr tgetnum tputs; then
-      echo "termcap functions found (with libraries '$libs')"
-      echo "#define HAS_TERMCAP" >> s.h
-      curseslibs="${libs}"
-      break
-    fi
-  done
-fi
-
-# Configuration for the libraries
-
-otherlibraries="unix str num dynlink bigarray"
-
-# For the Unix library
-
-has_sockets=no
-if sh ./hasgot socket socketpair bind listen accept connect; then
-  echo "You have BSD sockets."
-  echo "#define HAS_SOCKETS" >> s.h
-  has_sockets=yes
-elif sh ./hasgot -lnsl -lsocket socket socketpair bind listen accept connect; then
-  echo "You have BSD sockets (with libraries '-lnsl -lsocket')"
-  cclibs="$cclibs -lnsl -lsocket"
-  echo "#define HAS_SOCKETS" >> s.h
-  has_sockets=yes
-fi
-
-if sh ./hasgot -i sys/socket.h -t socklen_t; then
-  echo "socklen_t is defined in <sys/socket.h>"
-  echo "#define HAS_SOCKLEN_T" >> s.h
-fi
-
-if sh ./hasgot inet_aton; then
-  echo "inet_aton() found."
-  echo "#define HAS_INET_ATON" >> s.h
-fi
-
-if sh ./hasgot -i sys/types.h -i sys/socket.h -i netinet/in.h \
-               -t 'struct sockaddr_in6' \
-&& sh ./hasgot getaddrinfo getnameinfo inet_pton inet_ntop; then
-  echo "IPv6 is supported."
-  echo "#define HAS_IPV6" >> s.h
-fi
-
-if sh ./hasgot -i unistd.h; then
-  echo "unistd.h found."
-  echo "#define HAS_UNISTD" >> s.h
-fi
-
-if sh ./hasgot -i sys/types.h -t off_t; then
-  echo "off_t is defined in <sys/types.h>"
-  echo "#define HAS_OFF_T" >> s.h
-fi
-
-if sh ./hasgot -i sys/types.h -i dirent.h; then
-  echo "dirent.h found."
-  echo "#define HAS_DIRENT" >> s.h
-fi
-
-if sh ./hasgot rewinddir; then
-  echo "rewinddir() found."
-  echo "#define HAS_REWINDDIR" >> s.h
-fi
-
-if sh ./hasgot lockf; then
-  echo "lockf() found."
-  echo "#define HAS_LOCKF" >> s.h
-fi
-
-if sh ./hasgot mkfifo; then
-  echo "mkfifo() found."
-  echo "#define HAS_MKFIFO" >> s.h
-fi
-
-if sh ./hasgot getcwd; then
-  echo "getcwd() found."
-  echo "#define HAS_GETCWD" >> s.h
-fi
-
-if sh ./hasgot getwd; then
-  echo "getwd() found."
-  echo "#define HAS_GETWD" >> s.h
-fi
-
-if sh ./hasgot getpriority setpriority; then
-  echo "getpriority() found."
-  echo "#define HAS_GETPRIORITY" >> s.h
-fi
-
-if sh ./hasgot -i sys/types.h -i utime.h && sh ./hasgot utime; then
-  echo "utime() found."
-  echo "#define HAS_UTIME" >> s.h
-fi
-
-if sh ./hasgot utimes; then
-  echo "utimes() found."
-  echo "#define HAS_UTIMES" >> s.h
-fi
-
-if sh ./hasgot dup2; then
-  echo "dup2() found."
-  echo "#define HAS_DUP2" >> s.h
-fi
-
-if sh ./hasgot fchmod fchown; then
-  echo "fchmod() found."
-  echo "#define HAS_FCHMOD" >> s.h
-fi
-
-if sh ./hasgot truncate ftruncate; then
-  echo "truncate() found."
-  echo "#define HAS_TRUNCATE" >> s.h
-fi
-
-select_include=''
-if sh ./hasgot -i sys/types.h -i sys/select.h; then
-  echo "sys/select.h found."
-  echo "#define HAS_SYS_SELECT_H" >> s.h
-  select_include='-i sys/select.h'
-fi
-
-has_select=no
-if sh ./hasgot select && \
-   sh ./hasgot -i sys/types.h $select_include -t fd_set ; then
-  echo "select() found."
-  echo "#define HAS_SELECT" >> s.h
-  has_select=yes
-fi
-
-if sh ./hasgot symlink readlink lstat;  then
-  echo "symlink() found."
-  echo "#define HAS_SYMLINK" >> s.h
-fi
-
-has_wait=no
-if sh ./hasgot waitpid;  then
-  echo "waitpid() found."
-  echo "#define HAS_WAITPID" >> s.h
-  has_wait=yes
-fi
-
-if sh ./hasgot wait4;  then
-  echo "wait4() found."
-  echo "#define HAS_WAIT4" >> s.h
-  has_wait=yes
-fi
-
-if sh ./hasgot -i limits.h && sh ./runtest getgroups.c; then
-  echo "getgroups() found."
-  echo "#define HAS_GETGROUPS" >> s.h
-fi
-
-if sh ./hasgot -i termios.h &&
-   sh ./hasgot tcgetattr tcsetattr tcsendbreak tcflush tcflow; then
-  echo "POSIX termios found."
-  echo "#define HAS_TERMIOS" >> s.h
-fi
-
-# Async I/O under OSF1 3.x are so buggy that the test program hangs...
-testasyncio=true
-if test -f /usr/bin/uname; then
-  case "`/usr/bin/uname -s -r`" in
-    "OSF1 V3."*) testasyncio=false;;
-  esac
-fi
-if $testasyncio && sh ./runtest async_io.c; then
-  echo "Asynchronous I/O are supported."
-  echo "#define HAS_ASYNC_IO" >> s.h
-fi
-
-has_setitimer=no
-if sh ./hasgot setitimer; then
-  echo "setitimer() found."
-  echo "#define HAS_SETITIMER" >> s.h
-  has_setitimer="yes"
-fi
-
-if sh ./hasgot gethostname; then
-  echo "gethostname() found."
-  echo "#define HAS_GETHOSTNAME" >> s.h
-fi
-
-if sh ./hasgot -i sys/utsname.h && sh ./hasgot uname; then
-  echo "uname() found."
-  echo "#define HAS_UNAME" >> s.h
-fi
-
-has_gettimeofday=no
-if sh ./hasgot gettimeofday; then
-  echo "gettimeofday() found."
-  echo "#define HAS_GETTIMEOFDAY" >> s.h
-  has_gettimeofday="yes"
-fi
-
-if sh ./hasgot mktime; then
-  echo "mktime() found."
-  echo "#define HAS_MKTIME" >> s.h
-fi
-
-case "$host" in
-  *-*-cygwin*) ;;  # setsid emulation under Cygwin breaks the debugger
-  *) if sh ./hasgot setsid; then
-       echo "setsid() found."
-       echo "#define HAS_SETSID" >> s.h
-     fi;;
-esac
-
-if sh ./hasgot putenv; then
-  echo "putenv() found."
-  echo "#define HAS_PUTENV" >> s.h
-fi
-
-if sh ./hasgot -i locale.h && sh ./hasgot setlocale; then
-  echo "setlocale() and <locale.h> found."
-  echo "#define HAS_LOCALE" >> s.h
-fi
-
-if sh ./hasgot -i mach-o/dyld.h && sh ./hasgot NSLinkModule; then
-  echo "NSLinkModule() found. Using darwin dynamic loading."
-  echo "#define HAS_NSLINKMODULE" >> s.h
-elif sh ./hasgot $dllib dlopen; then
-  echo "dlopen() found."
-elif sh ./hasgot $dllib -ldl dlopen; then
-  echo "dlopen() found in -ldl."
-  dllib="$dllib -ldl"
-else
-  shared_libraries_supported=no
-fi
-
-if $shared_libraries_supported; then
-  echo "Dynamic loading of shared libraries is supported."
-  echo "#define SUPPORT_DYNAMIC_LINKING" >> s.h
-  if $dl_needs_underscore; then
-    echo '#define DL_NEEDS_UNDERSCORE' >>s.h
-  fi
-fi
-
-if sh ./hasgot -i sys/types.h -i sys/mman.h && sh ./hasgot mmap munmap; then
-  echo "mmap() found."
-  echo "#define HAS_MMAP" >> s.h
-fi
-
-nargs=none
-for i in 5 6; do
-  if sh ./trycompile -DNUM_ARGS=${i} gethostbyname.c; then nargs=$i; break; fi
-done
-if test $nargs != "none"; then
-  echo "gethostbyname_r() found (with ${nargs} arguments)."
-  echo "#define HAS_GETHOSTBYNAME_R $nargs" >> s.h
-fi
-
-nargs=none
-for i in 7 8; do
-  if sh ./trycompile -DNUM_ARGS=${i} gethostbyaddr.c; then nargs=$i; break; fi
-done
-if test $nargs != "none"; then
-  echo "gethostbyaddr_r() found (with ${nargs} arguments)."
-  echo "#define HAS_GETHOSTBYADDR_R $nargs" >> s.h
-fi
-
-# Determine if the debugger is supported
-
-if test "$has_sockets" = "yes"; then
-  echo "Replay debugger supported."
-  debugger="ocamldebugger"
-else
-  echo "No replay debugger (missing system calls)"
-  debugger=""
-fi
-
-
-# Determine if system stack overflows can be detected
-
-case "$arch,$system" in
-  i386,linux_elf|amd64,linux)
-    echo "System stack overflow can be detected."
-    echo "#define HAS_STACK_OVERFLOW_DETECTION" >> s.h;;
-  *)
-    echo "Cannot detect system stack overflow.";;
-esac
-
-# Determine the target architecture for the "num" library
-
-case "$host" in
-  alpha*-*-*)    bng_arch=alpha; bng_asm_level=1;;
-  i[3456]86-*-*) bng_arch=ia32
-                 if sh ./trycompile ia32sse2.c
-                 then bng_asm_level=2
-                 else bng_asm_level=1
-                 fi;;
-  mips-*-*)      bng_arch=mips; bng_asm_level=1;;
-  powerpc-*-*)   bng_arch=ppc; bng_asm_level=1;;
-  sparc*-*-*)    bng_arch=sparc; bng_asm_level=1;;
-  x86_64-*-*)    bng_arch=amd64; bng_asm_level=1;;
-  *)             bng_arch=generic; bng_asm_level=0;;
-esac
-
-echo "BNG_ARCH=$bng_arch" >> Makefile
-echo "BNG_ASM_LEVEL=$bng_asm_level" >> Makefile
-
-# Determine if the POSIX threads library is supported
-
-systhread_support=false
-
-if test "$pthread_wanted" = "yes"; then
-  case "$host" in
-    *-*-solaris*)  pthread_link="-lpthread -lposix4";;
-    *-*-freebsd*)  pthread_link="-pthread";;
-    *-*-openbsd*)  pthread_link="-pthread";;
-    *)             pthread_link="-lpthread";;
-  esac
-  if ./hasgot -i pthread.h $pthread_link pthread_self; then
-    echo "POSIX threads library supported."
-    systhread_support=true
-    otherlibraries="$otherlibraries systhreads"
-    bytecccompopts="$bytecccompopts -D_REENTRANT"
-    nativecccompopts="$nativecccompopts -D_REENTRANT"
-    case "$host" in
-      *-*-freebsd*)
-          bytecccompopts="$bytecccompopts -D_THREAD_SAFE"
-          nativecccompopts="$nativecccompopts -D_THREAD_SAFE";;
-      *-*-openbsd*)
-          bytecccompopts="$bytecccompopts -pthread"
-          asppflags="$asppflags -pthread"
-          nativecccompopts="$nativecccompopts -pthread";;
-    esac
-    echo "Options for linking with POSIX threads: $pthread_link"
-    echo "PTHREAD_LINK=$pthread_link" >> Makefile
-    if sh ./hasgot $pthread_link sigwait; then
-      echo "sigwait() found"
-      echo "#define HAS_SIGWAIT" >> s.h
-    fi
-  else
-    echo "POSIX threads not found."
-    pthread_link=""
-  fi
-fi
-
-# Determine if the bytecode thread library is supported
-
-if test "$has_select" = "yes" \
-&& test "$has_setitimer" = "yes" \
-&& test "$has_gettimeofday" = "yes" \
-&& test "$has_wait" = "yes"; then
-  echo "Bytecode threads library supported."
-  otherlibraries="$otherlibraries threads"
-else
-  echo "Bytecode threads library not supported (missing system calls)"
-fi
-
-# Determine the location of X include files and libraries
-
-x11_include="not found"
-x11_link="not found"
-
-for dir in \
-    $x11_include_dir          \
-    ; \
-do
-  if test -f $dir/X11/X.h; then
-    x11_include=$dir
-    break
-  fi
-done
-
-if test "$x11_include" = "not found"; then
-  x11_try_lib_dir=''
-else
-  x11_try_lib_dir=`echo $x11_include | sed -e 's|include|lib|'`
-fi
-
-for dir in \
-    $x11_lib_dir          \
-    $x11_try_lib_dir      \
-    ; \
-do
-  if test -f $dir/libX11.a || \
-     test -f $dir/libX11.so || \
-     test -f $dir/libX11.dll.a || \
-     test -f $dir/libX11.sa; then
-    if test $dir = /usr/lib; then
-      x11_link="-lX11"
-    else
-      x11_link="-L$dir -lX11"
-      x11_libs="-L$dir"
-    fi
-    break
-  fi
-done
-
-
-if test "$x11_include" = "not found" || test "$x11_link" = "not found"
-then
-  echo "X11 not found, the \"graph\" library will not be supported."
-  x11_include=""
-else
-  echo "Location of X11 include files: $x11_include/X11"
-  echo "Options for linking with X11: $x11_link"
-  otherlibraries="$otherlibraries graph"
-  if test "$x11_include" = "/usr/include"; then
-    x11_include=""
-  else
-    x11_include="-I$x11_include"
-  fi
-  echo "X11_INCLUDES=$x11_include" >> Makefile
-  echo "X11_LINK=$x11_link" >> Makefile
-fi
-
-# See if we can compile the dbm library
-
-dbm_include="not found"
-dbm_link="not found"
-use_gdbm_ndbm=no
-
-for dir in /usr/include /usr/include/db1 /usr/include/gdbm; do
-  if test -f $dir/ndbm.h; then
-    dbm_include=$dir
-    if sh ./hasgot dbm_open; then
-      dbm_link=""
-    elif sh ./hasgot -lndbm dbm_open; then
-      dbm_link="-lndbm"
-    elif sh ./hasgot -ldb1 dbm_open; then
-      dbm_link="-ldb1"
-    elif sh ./hasgot -lgdbm dbm_open; then
-      dbm_link="-lgdbm"
-    elif sh ./hasgot -lgdbm_compat -lgdbm dbm_open; then
-      dbm_link="-lgdbm_compat -lgdbm" 
-    fi
-    break
-  fi
-  if test -f $dir/gdbm-ndbm.h; then
-    dbm_include=$dir
-    use_gdbm_ndbm=yes
-    if sh ./hasgot -lgdbm_compat -lgdbm dbm_open; then
-      dbm_link="-lgdbm_compat -lgdbm"
-    fi
-    break   
-  fi
-done
-if test "$dbm_include" = "not found" || test "$dbm_link" = "not found"; then
-  echo "NDBM not found, the \"dbm\" library will not be supported."
-else
-  echo "NDBM found (in $dbm_include)"
-  if test "$dbm_include" = "/usr/include"; then
-    dbm_include=""
-  else
-    dbm_include="-I$dbm_include"
-  fi
-  echo "DBM_INCLUDES=$dbm_include" >> Makefile
-  echo "DBM_LINK=$dbm_link" >> Makefile
-  if test "$use_gdbm_ndbm" = "yes"; then
-    echo "#define DBM_USES_GDBM_NDBM" >> s.h
-  fi
-  otherlibraries="$otherlibraries dbm"
-fi
-
-# Look for tcl/tk
-
-echo "Configuring LablTk..."
-
-if test $tk_wanted = no; then
-  has_tk=false
-elif test $tk_x11 = no; then
-  has_tk=true
-elif test "$x11_include" = "not found" || test "$x11_link" = "not found"; then
-  echo "X11 not found."
-  has_tk=false
-else
-  tk_x11_include="$x11_include"
-  tk_x11_libs="$x11_libs -lX11"
-  has_tk=true
-fi
-
-if test $has_tk = true; then
-  tcl_version=''
-  tcl_version=`sh ./runtest $tk_defs $tk_x11_include tclversion.c`
-  for tk_incs in \
-    ;
-  do if test -z "$tcl_version"; then
-    tk_defs="$tk_incs"
-    tcl_version=`sh ./runtest $tk_defs $tk_x11_include tclversion.c`
-  fi; done
-  if test -n "$tcl_version" && test "x$tcl_version" != "xnone"; then
-    echo "tcl.h and tk.h version $tcl_version found with \"$tk_defs\"."
-    case $tcl_version in
-    7.5) tclmaj=7 tclmin=5 tkmaj=4 tkmin=1 ;;
-    7.6) tclmaj=7 tclmin=6 tkmaj=4 tkmin=2 ;;
-    8.0) tclmaj=8 tclmin=0 tkmaj=8 tkmin=0 ;;
-    8.1) tclmaj=8 tclmin=1 tkmaj=8 tkmin=1 ;;
-    8.2) tclmaj=8 tclmin=2 tkmaj=8 tkmin=2 ;;
-    8.3) tclmaj=8 tclmin=3 tkmaj=8 tkmin=3 ;;
-    8.4) tclmaj=8 tclmin=4 tkmaj=8 tkmin=4 ;;
-    *) echo "This version is not known."; has_tk=false ;;
-    esac
-  else
-    echo "tcl.h and/or tk.h not found."
-    has_tk=false
-  fi
-fi
-
-tkauxlibs="$mathlib $dllib"
-tcllib=''
-tklib=''
-if test $has_tk = true; then
-  if test -n "$tk_libs" && \
-     sh ./hasgot $tk_libs $tk_x11_libs $tkauxlibs Tcl_DoOneEvent
-  then tk_libs="$tk_libs $dllib"
-  elif sh ./hasgot $tk_libs -ltcl$tclmaj.$tclmin $tkauxlibs Tcl_DoOneEvent
-  then
-    tk_libs="$tk_libs -ltk$tkmaj.$tkmin -ltcl$tclmaj.$tclmin $dllib"
-  elif sh ./hasgot $tk_libs -ltcl$tclmaj$tclmin $tkauxlibs Tcl_DoOneEvent
-  then
-    tk_libs="$tk_libs -ltk$tkmaj$tkmin -ltcl$tclmaj$tclmin $dllib"
-  elif test -z "$tk_libs" && tk_libs=-L/usr/local/lib && \
-    sh ./hasgot $tk_libs -ltcl$tclmaj.$tclmin $tkauxlibs Tcl_DoOneEvent
-  then
-    tk_libs="$tk_libs -ltk$tkmaj.$tkmin -ltcl$tclmaj.$tclmin $dllib"
-  elif sh ./hasgot $tk_libs -ltcl$tclmaj$tclmin $tkauxlibs Tcl_DoOneEvent
-  then
-    tk_libs="$tk_libs -ltk$tkmaj$tkmin -ltcl$tclmaj$tclmin $dllib"
-  elif sh ./hasgot -L/sw/lib $tk_libs -ltcl$tclmaj.$tclmin $tkauxlibs \
-                   Tcl_DoOneEvent
-  then tk_libs="-L/sw/lib -ltk$tkmaj.$tkmin -ltcl$tclmaj.$tclmin $dllib"
-  else
-    echo "Tcl library not found."
-    has_tk=false
-  fi
-fi
-if test $has_tk = true; then
-  if sh ./hasgot $tk_libs $tk_x11_libs $tkauxlibs Tk_SetGrid; then
-    echo "Tcl/Tk libraries found."
-  elif sh ./hasgot -L/sw/lib $tk_libs $tk_x11_libs $tkauxlibs Tk_SetGrid; then
-    tk_libs="-L/sw/lib $tk_libs"
-    echo "Tcl/Tk libraries found."
-  else
-    echo "Tcl library found."
-    echo "Tk library not found."
-    has_tk=false
-  fi
-fi
-
-if test $has_tk = true; then
-  if test $tk_x11 = yes; then
-    echo "TK_DEFS=$tk_defs "'$(X11_INCLUDES)' >> Makefile
-    echo "TK_LINK=$tk_libs "'$(X11_LINK)' >> Makefile
-  else
-    echo "TK_DEFS=$tk_defs" >> Makefile
-    echo "TK_LINK=$tk_libs" >> Makefile
-  fi
-  otherlibraries="$otherlibraries labltk"
-else
-  echo "Configuration failed, LablTk will not be built."
-fi
-
-# Begin Camlp4
-(
-cd ../../camlp4/config
-EXE=$exe ./configure_batch -prefix "$prefix" -bindir "$bindir" -libdir "$libdir" -mandir "$mandir" -ocaml-top ../.. > /dev/null
-)
-
-case $? in
-    0) echo "Camlp4 correctly configured.";;
-    *) echo "Warning: Camlp4 configuration terminated with error code $?";;
-esac
-# End Camlp4
-
-# Final twiddling of compiler options to work around known bugs
-
-nativeccprofopts="$nativecccompopts"
-case "$buggycc" in
-  gcc.2.96)
-    bytecccompopts="$bytecccompopts -fomit-frame-pointer"
-    nativecccompopts="$nativecccompopts -fomit-frame-pointer";;
-esac
-
-# Finish generated files
-
-cclibs="$cclibs $mathlib"
-
-echo "BYTECC=$bytecc" >> Makefile
-echo "BYTECCCOMPOPTS=$bytecccompopts" >> Makefile
-echo "BYTECCLINKOPTS=$bytecclinkopts" >> Makefile
-echo "BYTECCLIBS=$cclibs $dllib $curseslibs $pthread_link" >> Makefile
-echo "BYTECCRPATH=$byteccrpath" >> Makefile
-echo "EXE=$exe" >> Makefile
-echo "SUPPORTS_SHARED_LIBRARIES=$shared_libraries_supported" >> Makefile
-echo "SHAREDCCCOMPOPTS=$sharedcccompopts" >> Makefile
-echo "MKSHAREDLIB=$mksharedlib" >> Makefile
-echo "MKSHAREDLIBRPATH=$mksharedlibrpath" >> Makefile
-echo "ARCH=$arch" >> Makefile
-echo "MODEL=$model" >> Makefile
-echo "SYSTEM=$system" >> Makefile
-echo "NATIVECC=$nativecc" >> Makefile
-echo "NATIVECCCOMPOPTS=$nativecccompopts" >> Makefile
-echo "NATIVECCPROFOPTS=$nativeccprofopts" >> Makefile
-echo "NATIVECCLINKOPTS=$nativecclinkopts" >> Makefile
-echo "NATIVECCRPATH=$nativeccrpath" >> Makefile
-echo "NATIVECCLIBS=$cclibs $dllib" >> Makefile
-echo "ASFLAGS=$asflags" >> Makefile
-echo "ASPP=$aspp" >> Makefile
-echo "ASPPFLAGS=$asppflags" >> Makefile
-echo "ASPPPROFFLAGS=$asppprofflags" >> Makefile
-echo "PROFILING=$profiling" >> Makefile
-echo "DYNLINKOPTS=$dllib" >> Makefile
-echo "OTHERLIBRARIES=$otherlibraries" >> Makefile
-echo "DEBUGGER=$debugger" >> Makefile
-echo "CC_PROFILE=$cc_profile" >> Makefile
-echo "SYSTHREAD_SUPPORT=$systhread_support" >>Makefile
-
-rm -f tst hasgot.c
-rm -f ../m.h ../s.h ../Makefile
-mv m.h s.h Makefile ..
-
-# Print a summary
-
-echo
-echo "** Configuration summary **"
-echo
-echo "Directories where Objective Caml will be installed:"
-echo "        binaries.................. $bindir"
-echo "        standard library.......... $libdir"
-echo "        manual pages.............. $mandir (with extension .$manext)"
-
-echo "Configuration for the bytecode compiler:"
-echo "        C compiler used........... $bytecc"
-echo "        options for compiling..... $bytecccompopts"
-echo "        options for linking....... $bytecclinkopts $cclibs $dllib $curseslibs $pthread_link"
-if $shared_libraries_supported; then
-echo "        shared libraries are supported"
-echo "        options for compiling..... $sharedcccompopts $bytecccompopts"
-echo "        command for building...... $mksharedlib lib.so $mksharedlibrpath/a/path objs"
-else
-echo "        shared libraries not supported"
-fi
-
-echo "Configuration for the native-code compiler:"
-if test "$arch" = "none"; then
-  echo "        (not supported on this platform)"
-else
-  if test "$model" = "default"; then
-    echo "        hardware architecture..... $arch"
-  else
-    echo "        hardware architecture..... $arch ($model)"
-  fi
-  if test "$system" = "unknown"; then : ; else
-  echo "        OS variant................ $system"
-  fi
-  echo "        C compiler used........... $nativecc"
-  echo "        options for compiling..... $nativecccompopts"
-  echo "        options for linking....... $nativecclinkopts $cclibs"
-  echo "        assembler ................ \$(AS) $asflags"
-  echo "        preprocessed assembler ... $aspp $asppflags"
-  if test "$profiling" = "prof"; then
-  echo "        profiling with gprof ..... supported"
-  else
-  echo "        profiling with gprof ..... not supported"
-  fi
-fi
-
-if test "$debugger" = "ocamldebugger"; then
-  echo "Source-level replay debugger: supported"
-else
-  echo "Source-level replay debugger: not supported"
-fi
-
-echo "Additional libraries supported:"
-echo "        $otherlibraries"
-
-echo "Configuration for the \"num\" library:"
-echo "        target architecture ...... $bng_arch (asm level $bng_asm_level)"
-
-if test "$x11_include" != "not found" && test "$x11_lib" != "not found"; then
-echo "Configuration for the \"graph\" library:"
-echo "        options for compiling .... $x11_include"
-echo "        options for linking ...... $x11_link"
-fi
-
-if test $has_tk = true; then
-echo "Configuration for the \"labltk\" library:"
-echo "        use tcl/tk version ....... $tcl_version"
-echo "        options for compiling .... $tk_defs"
-echo "        options for linking ...... $tk_libs"
-else
-echo "The \"labltk\" library: not supported"
-fi
-
-echo
-echo "** Objective Caml configuration completed successfully **"
-echo

From 9b22cac3069f36e32cbc0aad14b14f41dab13bd6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 3 Sep 2010 15:32:40 +0000
Subject: [PATCH 046/181] * Fix the nvi URL.

svn path=/nixpkgs/trunk/; revision=23621
---
 pkgs/applications/editors/nvi/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/nvi/default.nix b/pkgs/applications/editors/nvi/default.nix
index db99b1ba676..f14ffe51f2b 100644
--- a/pkgs/applications/editors/nvi/default.nix
+++ b/pkgs/applications/editors/nvi/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "nvi-1.79";
 
   src = fetchurl {
-    url = ftp://ftp.bostic.com/pub/nvi-1.79.tar.gz;
+    url = "https://sites.google.com/a/bostic.com/external/files/nvi-1.79.tar.gz?attredirects=0";
     sha256 = "0cvf56rbylz7ksny6g2256sjg8yrsxrmbpk82r64rhi53sm8fnvm";
   };
 

From b11040eb38fd93a28b92caa816a4c695089b65be Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 3 Sep 2010 17:40:29 +0000
Subject: [PATCH 047/181] oxygen-icons-4.5.1

svn path=/nixpkgs/trunk/; revision=23622
---
 pkgs/desktops/kde-4.5/kde-package/manifest.nix         | 4 ++++
 pkgs/desktops/kde-4.5/support/oxygen-icons/default.nix | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/kde-4.5/kde-package/manifest.nix b/pkgs/desktops/kde-4.5/kde-package/manifest.nix
index d33a365a19c..cec77a711a6 100644
--- a/pkgs/desktops/kde-4.5/kde-package/manifest.nix
+++ b/pkgs/desktops/kde-4.5/kde-package/manifest.nix
@@ -92,4 +92,8 @@ builtins.listToAttrs
   name = "polkit-qt-1-0.96.1.tar.bz2";
   value = "1ng5bi1gmr5lg49c5kyqyjzbjhs4w90c2zlnfcyviv9p3wzfgzbr";
 }
+{
+  name = "oxygen-icons-4.5.1.tar.bz2";
+  value = "1gnz8jrdccw91p2n52my0609h7g9ws55gal3jan2jylz6b0zq6dm";
+}
 ]
diff --git a/pkgs/desktops/kde-4.5/support/oxygen-icons/default.nix b/pkgs/desktops/kde-4.5/support/oxygen-icons/default.nix
index 07bec190eb2..5719d2c2084 100644
--- a/pkgs/desktops/kde-4.5/support/oxygen-icons/default.nix
+++ b/pkgs/desktops/kde-4.5/support/oxygen-icons/default.nix
@@ -3,7 +3,7 @@
 kde.package {
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = "1fil2rbvy4j47gqpn4xcjvjwxy4yq5mvpwcd5lhp8fdzgsc0jmdn";
+  outputHash = "04j1csjjji5ffahbcjkcv17agjq5z84czmlpbicv4hnj3rby11nx";
 
   buildInputs = [ cmake ];
   meta = {
@@ -12,7 +12,7 @@ kde.package {
     license = "GPL";
     kde = {
       name = "oxygen-icons";
-      version = "4.5.0";
+      version = "4.5.1";
     };
   };
 }

From 2c31d81cdb506d4bbae005d00fb27e5611c9d190 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 3 Sep 2010 17:40:45 +0000
Subject: [PATCH 048/181] kdelibs-4.5.1

svn path=/nixpkgs/trunk/; revision=23623
---
 pkgs/desktops/kde-4.5/kde-package/manifest.nix | 4 ++++
 pkgs/desktops/kde-4.5/libs/default.nix         | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/kde-4.5/kde-package/manifest.nix b/pkgs/desktops/kde-4.5/kde-package/manifest.nix
index cec77a711a6..ca572b86035 100644
--- a/pkgs/desktops/kde-4.5/kde-package/manifest.nix
+++ b/pkgs/desktops/kde-4.5/kde-package/manifest.nix
@@ -96,4 +96,8 @@ builtins.listToAttrs
   name = "oxygen-icons-4.5.1.tar.bz2";
   value = "1gnz8jrdccw91p2n52my0609h7g9ws55gal3jan2jylz6b0zq6dm";
 }
+{
+  name = "kdelibs-4.5.1.tar.bz2";
+  value = "1xqvrrbwz5i4m6lipg1j97l2yq3kmxsl5j62jkhvp56q7dh85i0d";
+}
 ]
diff --git a/pkgs/desktops/kde-4.5/libs/default.nix b/pkgs/desktops/kde-4.5/libs/default.nix
index b5f1a6e3758..6373450b866 100644
--- a/pkgs/desktops/kde-4.5/libs/default.nix
+++ b/pkgs/desktops/kde-4.5/libs/default.nix
@@ -31,7 +31,7 @@ kde.package {
     license = "LGPL";
     kde = {
       name = "kdelibs";
-      version = "4.5.0";
+      version = "4.5.1";
     };
   };
 }

From 83dac52cc986ad323fbf6af5bf77ea717d1f7251 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 3 Sep 2010 17:40:49 +0000
Subject: [PATCH 049/181] qt-4.7.0-rc1

svn path=/nixpkgs/trunk/; revision=23624
---
 pkgs/development/libraries/qt-4.x/4.7/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/qt-4.x/4.7/default.nix b/pkgs/development/libraries/qt-4.x/4.7/default.nix
index b0fb326f002..5de15d2f71c 100644
--- a/pkgs/development/libraries/qt-4.x/4.7/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.7/default.nix
@@ -8,7 +8,7 @@
 , buildDemos ? false, buildExamples ? false, useDocs ? true}:
 
 let
-  v = "4.7.0-beta2";
+  v = "4.7.0-rc1";
 in
 
 stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "ftp://ftp.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${v}.tar.gz";
-    sha256 = "1gxckb5pxybnj5413dxk7dm8hm945ymm4ppqwg14wfk83zhnw6g0";
+    sha256 = "1bfvd42sdabb86m823yzbzgcy1sibd4ypz2wqaazd77ji768dn2r";
   };
 
   preConfigure = ''
@@ -27,7 +27,8 @@ stdenv.mkDerivation rec {
       -importdir $out/lib/qt4/imports
       -examplesdir $out/share/doc/${name}/examples
       -demosdir $out/share/doc/${name}/demos
-      -datadir $out/share/qt4
+      -datadir $out/share/${name}
+      -translationdir $out/share/${name}/translations
     "
   '';
 

From aa7164d7defa1851e0c5cf8ff90c816dd20807a2 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 3 Sep 2010 17:40:55 +0000
Subject: [PATCH 050/181] Add grantlee

svn path=/nixpkgs/trunk/; revision=23625
---
 .../libraries/grantlee/default.nix            | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/libraries/grantlee/default.nix

diff --git a/pkgs/development/libraries/grantlee/default.nix b/pkgs/development/libraries/grantlee/default.nix
new file mode 100644
index 00000000000..577e8d15667
--- /dev/null
+++ b/pkgs/development/libraries/grantlee/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, qt4, cmake }:
+
+stdenv.mkDerivation rec {
+  name = "grantlee-0.1.5";
+
+# Upstream download server has country code firewall, so I made a mirror. The
+# URL of the mirror may change in the future, so don't publish it yet.
+  src = fetchurl {
+    urls = [
+      "http://downloads.grantlee.org/${name}.tar.gz"
+      "http://www.loegria.net/grantlee/${name}.tar.gz"
+    ];
+    sha256 = "040slr4kpi62vwkwnsxhvnq2m15wqn40knh69ci6kskmb3i8iv1a";
+  };
+
+  buildInputs = [ cmake qt4 ];
+
+  meta = {
+    description = "Qt4 port of Django template system";
+    longDescription = ''
+      Grantlee is a plugin based String Template system written using the Qt
+      framework. The goals of the project are to make it easier for application
+      developers to separate the structure of documents from the data they
+      contain, opening the door for theming.
+
+      The syntax is intended to follow the syntax of the Django template system,
+      and the design of Django is reused in Grantlee.''
+
+    homepage = http://gitorious.org/grantlee;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index afbb99d36d7..78e4a0c6a72 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2947,6 +2947,8 @@ let
 
   gpgme = callPackage ../development/libraries/gpgme { };
 
+  grantlee = callPackage ../development/libraries/grantlee { };
+
   gsasl = callPackage ../development/libraries/gsasl { };
 
   gsl = callPackage ../development/libraries/gsl { };

From 8312b2e5b918e03eb0e04ddf5ae6c94b005fd965 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 3 Sep 2010 17:41:00 +0000
Subject: [PATCH 051/181] Move kdeutils components into kdeutils. prefix

Now one can use lib.attrValues kde45.kdeutils to install full kdeutils.

svn path=/nixpkgs/trunk/; revision=23626
---
 pkgs/desktops/kde-4.5/default.nix | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix
index 116801495cc..39acbb43e3a 100644
--- a/pkgs/desktops/kde-4.5/default.nix
+++ b/pkgs/desktops/kde-4.5/default.nix
@@ -61,19 +61,22 @@
   kdesdk = callPackage ./sdk { };
   kdetoys = callPackage ./toys { };
 
-  ark = callPackage ./utils/ark.nix { };
-  kcalc = callPackage ./utils/kcalc.nix { };
-  kcharselect = callPackage ./utils/kcharselect.nix { };
-  kdf = callPackage ./utils/kdf.nix { };
-  kfloppy = callPackage ./utils/kfloppy.nix { };
-  kgpg = callPackage ./utils/kgpg.nix { };
-  kremotecontrol = callPackage ./utils/kremotecontrol.nix { };
-  ktimer = callPackage ./utils/ktimer.nix { };
-  kwallet = callPackage ./utils/kwallet.nix { };
-  okteta = callPackage ./utils/okteta.nix { };
-  printer_applet = callPackage ./utils/printer-applet.nix { };
-  superkaramba = callPackage ./utils/superkaramba.nix { };
-  sweeper = callPackage ./utils/sweeper.nix { };
+  kdeutils = {
+    ark = callPackage ./utils/ark.nix { };
+    kcalc = callPackage ./utils/kcalc.nix { };
+    kcharselect = callPackage ./utils/kcharselect.nix { };
+    kdf = callPackage ./utils/kdf.nix { };
+    kfloppy = callPackage ./utils/kfloppy.nix { };
+    kgpg = callPackage ./utils/kgpg.nix { };
+    kremotecontrol = callPackage ./utils/kremotecontrol.nix { };
+    ktimer = callPackage ./utils/ktimer.nix { };
+    kwallet = callPackage ./utils/kwallet.nix { };
+    okteta = callPackage ./utils/okteta.nix { };
+    printer_applet = callPackage ./utils/printer-applet.nix { };
+    superkaramba = callPackage ./utils/superkaramba.nix { };
+    sweeper = callPackage ./utils/sweeper.nix { };
+    recurseForRelease = true;
+  };
 
   kdewebdev = callPackage ./webdev { };
 

From 6ee7628a19fb1d25b90dc56759060b7caf4f16a4 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 3 Sep 2010 18:55:36 +0000
Subject: [PATCH 052/181] Oops.. Forgotten ';'

svn path=/nixpkgs/trunk/; revision=23627
---
 pkgs/development/libraries/grantlee/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/grantlee/default.nix b/pkgs/development/libraries/grantlee/default.nix
index 577e8d15667..bf5898a5355 100644
--- a/pkgs/development/libraries/grantlee/default.nix
+++ b/pkgs/development/libraries/grantlee/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
       contain, opening the door for theming.
 
       The syntax is intended to follow the syntax of the Django template system,
-      and the design of Django is reused in Grantlee.''
+      and the design of Django is reused in Grantlee.'';
 
     homepage = http://gitorious.org/grantlee;
   };

From cc616fbadad9399963543873f7aa3c16b8d1f840 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 3 Sep 2010 19:59:51 +0000
Subject: [PATCH 053/181] Update Veraity nightly version

svn path=/nixpkgs/trunk/; revision=23633
---
 .../version-management/veracity/src-for-default.nix       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/veracity/src-for-default.nix b/pkgs/applications/version-management/veracity/src-for-default.nix
index f909ac23568..6da58b7d85b 100644
--- a/pkgs/applications/version-management/veracity/src-for-default.nix
+++ b/pkgs/applications/version-management/veracity/src-for-default.nix
@@ -1,9 +1,9 @@
 rec {
-   version="0.3.1.10276";
-   name="veracity-0.3.1.10276";
-   hash="1qihrn243dlvvdg5w1vfv3g8bvpy7v0q3xc4d72k85xv8vkljkxw";
+   version="0.3.1.10278";
+   name="veracity-0.3.1.10278";
+   hash="0gb6441jmycvbx76rmpfyiqhn9qnwgfz1if1nlbyvqm5llj4ylrs";
    url="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-${version}.tar.gz";
-   advertisedUrl="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-0.3.1.10276.tar.gz";
+   advertisedUrl="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-0.3.1.10278.tar.gz";
   
   
 }

From 2878beff40266b3cc12dde0b1e1afc8e0163f45a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 3 Sep 2010 20:52:32 +0000
Subject: [PATCH 054/181] Minicom 2.4.

svn path=/nixpkgs/trunk/; revision=23634
---
 pkgs/tools/misc/minicom/default.nix | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/misc/minicom/default.nix b/pkgs/tools/misc/minicom/default.nix
index 2cd383bd698..ef735bf4384 100644
--- a/pkgs/tools/misc/minicom/default.nix
+++ b/pkgs/tools/misc/minicom/default.nix
@@ -1,18 +1,32 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "minicom-2.3";
-  
+  name = "minicom-2.4";
+
   src = fetchurl {
-    url = "http://alioth.debian.org/frs/download.php/2332/${name}.tar.gz";
-    sha256 = "1ysn0crdhvwyvdlbw0ms5nq06xy2pd2glwjs53p384byl3ac7jra";
+    url = "http://alioth.debian.org/frs/download.php/3195/${name}.tar.gz";
+    sha256 = "0j0ayimh3389pciqs60fsfafn87p9gnmmmqz15xq9fkkn10g4ykb";
   };
 
   buildInputs = [ncurses];
-  
-  configureFlags = [ "--sysconfdir=/etc" ];
+
+  configureFlags = [ "--sysconfdir=/etc" "--enable-lock-dir=/var/lock" ];
+
+  preConfigure =
+    # Have `configure' assume that the lock directory exists.
+    '' sed -i "configure" -e's/test -d \$UUCPLOCK/true/g'
+    '';
 
   meta = {
-    description = "Serial console";
+    description = "Minicom, a modem control and terminal emulation program";
+    homepage = http://alioth.debian.org/projects/minicom/;
+
+    longDescription =
+      '' Minicom is a menu driven communications program.  It emulates ANSI
+         and VT102 terminals.  It has a dialing directory and auto zmodem
+         download.
+      '';
+
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
   };
 }

From ac1823a3b43a5eccfe1f4e12310137505c3808e1 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 4 Sep 2010 19:53:32 +0000
Subject: [PATCH 055/181] grantlee.meta

svn path=/nixpkgs/trunk/; revision=23636
---
 pkgs/development/libraries/grantlee/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/grantlee/default.nix b/pkgs/development/libraries/grantlee/default.nix
index bf5898a5355..dea6a7e6f3c 100644
--- a/pkgs/development/libraries/grantlee/default.nix
+++ b/pkgs/development/libraries/grantlee/default.nix
@@ -27,5 +27,7 @@ stdenv.mkDerivation rec {
       and the design of Django is reused in Grantlee.'';
 
     homepage = http://gitorious.org/grantlee;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+    inherit (qt4.meta) platforms;
   };
 }

From 99015c8de7dced1bb351f484fc53f94b27791de8 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 4 Sep 2010 19:53:39 +0000
Subject: [PATCH 056/181] kdeaccessibility-4.5.1, splitted

svn path=/nixpkgs/trunk/; revision=23637
---
 .../kde-4.5/accessibility/color-schemes.nix     | 14 ++++++++++++++
 pkgs/desktops/kde-4.5/accessibility/default.nix | 15 ---------------
 .../kde-4.5/accessibility/icon-themes.nix       | 15 +++++++++++++++
 pkgs/desktops/kde-4.5/accessibility/jovie.nix   | 17 +++++++++++++++++
 pkgs/desktops/kde-4.5/accessibility/kmag.nix    | 16 ++++++++++++++++
 .../kde-4.5/accessibility/kmousetool.nix        | 16 ++++++++++++++++
 pkgs/desktops/kde-4.5/accessibility/kmouth.nix  | 16 ++++++++++++++++
 pkgs/desktops/kde-4.5/default.nix               | 11 ++++++++++-
 pkgs/desktops/kde-4.5/kde-package/manifest.nix  |  4 ++++
 9 files changed, 108 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/desktops/kde-4.5/accessibility/color-schemes.nix
 delete mode 100644 pkgs/desktops/kde-4.5/accessibility/default.nix
 create mode 100644 pkgs/desktops/kde-4.5/accessibility/icon-themes.nix
 create mode 100644 pkgs/desktops/kde-4.5/accessibility/jovie.nix
 create mode 100644 pkgs/desktops/kde-4.5/accessibility/kmag.nix
 create mode 100644 pkgs/desktops/kde-4.5/accessibility/kmousetool.nix
 create mode 100644 pkgs/desktops/kde-4.5/accessibility/kmouth.nix

diff --git a/pkgs/desktops/kde-4.5/accessibility/color-schemes.nix b/pkgs/desktops/kde-4.5/accessibility/color-schemes.nix
new file mode 100644
index 00000000000..b82ac5624a3
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/accessibility/color-schemes.nix
@@ -0,0 +1,14 @@
+{ kde, cmake, qt4, perl, automoc4, kdelibs }:
+
+kde.package {
+  buildInputs = [ cmake qt4 perl kdelibs automoc4 ];
+
+  meta = {
+    description = "KDE Accessibility color schemes";
+    kde = {
+      name = "ColorSchemes";
+      module = "kdeaccessibility";
+      version = "4.5.1";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/accessibility/default.nix b/pkgs/desktops/kde-4.5/accessibility/default.nix
deleted file mode 100644
index 3e4c65a1922..00000000000
--- a/pkgs/desktops/kde-4.5/accessibility/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{kde, cmake, qt4, perl, alsaLib, libXi, libXtst, kdelibs, automoc4 }:
-
-kde.package {
-  # TODO: speech dispatcher and/or freetts
-  buildInputs = [ cmake qt4 perl alsaLib libXi libXtst kdelibs automoc4 ];
-
-  meta = {
-    description = "KDE accessibility tools";
-    license = "GPL";
-    kde = {
-      name = "kdeaccessibility";
-      version = "4.5.0";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.5/accessibility/icon-themes.nix b/pkgs/desktops/kde-4.5/accessibility/icon-themes.nix
new file mode 100644
index 00000000000..d9f4b64baad
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/accessibility/icon-themes.nix
@@ -0,0 +1,15 @@
+{ kde, cmake, qt4, perl, automoc4, kdelibs }:
+
+kde.package {
+  buildInputs = [ cmake qt4 perl kdelibs automoc4 ];
+
+  meta = {
+    description = "KDE mono icon theme";
+    kde = {
+      name = "IconThemes";
+      module = "kdeaccessibility";
+      version = "4.5.1";
+    };
+  };
+}
+
diff --git a/pkgs/desktops/kde-4.5/accessibility/jovie.nix b/pkgs/desktops/kde-4.5/accessibility/jovie.nix
new file mode 100644
index 00000000000..194532365b3
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/accessibility/jovie.nix
@@ -0,0 +1,17 @@
+{ kde, cmake, qt4, perl, automoc4, kdelibs }:
+
+kde.package {
+  buildInputs = [ cmake qt4 perl kdelibs automoc4 ];
+
+#TODO: working backend: speechd or opentts
+  meta = {
+    description = "Text-to-speech synthesis daemon";
+    kde = {
+      name = "jovie";
+      module = "kdeaccessibility";
+      version = "0.6.0";
+      release = "4.5.1";
+    };
+  };
+}
+
diff --git a/pkgs/desktops/kde-4.5/accessibility/kmag.nix b/pkgs/desktops/kde-4.5/accessibility/kmag.nix
new file mode 100644
index 00000000000..f97799a178e
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/accessibility/kmag.nix
@@ -0,0 +1,16 @@
+{ kde, cmake, qt4, perl, automoc4, kdelibs }:
+
+kde.package {
+  buildInputs = [ cmake qt4 perl kdelibs automoc4 ];
+
+  meta = {
+    description = "Screen magnifier for KDE";
+    kde = {
+      name = "kmag";
+      module = "kdeaccessibility";
+      version = "1.0";
+      release = "4.5.1";
+    };
+  };
+}
+
diff --git a/pkgs/desktops/kde-4.5/accessibility/kmousetool.nix b/pkgs/desktops/kde-4.5/accessibility/kmousetool.nix
new file mode 100644
index 00000000000..df978c37e3b
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/accessibility/kmousetool.nix
@@ -0,0 +1,16 @@
+{ kde, cmake, qt4, perl, automoc4, kdelibs, libXtst }:
+
+kde.package {
+  buildInputs = [ cmake qt4 perl kdelibs automoc4 libXtst ];
+
+  meta = {
+    description = "A program that clicks the mouse for you";
+    kde = {
+      name = "kmousetool";
+      module = "kdeaccessibility";
+      version = "1.12";
+      release = "4.5.1";
+    };
+  };
+}
+
diff --git a/pkgs/desktops/kde-4.5/accessibility/kmouth.nix b/pkgs/desktops/kde-4.5/accessibility/kmouth.nix
new file mode 100644
index 00000000000..8677f802034
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/accessibility/kmouth.nix
@@ -0,0 +1,16 @@
+{ kde, cmake, qt4, perl, automoc4, kdelibs }:
+
+kde.package {
+  buildInputs = [ cmake qt4 perl kdelibs automoc4 ];
+
+  meta = {
+    description = "A type-and-say front end for speech synthesizers";
+    kde = {
+      name = "kmouth";
+      module = "kdeaccessibility";
+      version = "1.1.1";
+      release = "4.5.1";
+    };
+  };
+}
+
diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix
index 39acbb43e3a..da3a53406d3 100644
--- a/pkgs/desktops/kde-4.5/default.nix
+++ b/pkgs/desktops/kde-4.5/default.nix
@@ -49,7 +49,16 @@
   kdebase_runtime = callPackage ./base-runtime { };
 
 ### OTHER MODULES
-  kdeaccessibility = callPackage ./accessibility { };
+  kdeaccessibility = {
+    recurseForDerivations = true;
+    colorSchemes = callPackage ./accessibility/color-schemes.nix { };
+    iconThemes = callPackage ./accessibility/icon-themes.nix { };
+    jovie = callPackage ./accessibility/jovie.nix { };
+    kmag = callPackage ./accessibility/kmag.nix { };
+    kmousetool = callPackage ./accessibility/kmousetool.nix { };
+    kmouth = callPackage ./accessibility/kmouth.nix { };
+  };
+
   kdeadmin = callPackage ./admin { };
   kdeartwork = callPackage ./artwork { };
   kdeedu = callPackage ./edu { };
diff --git a/pkgs/desktops/kde-4.5/kde-package/manifest.nix b/pkgs/desktops/kde-4.5/kde-package/manifest.nix
index ca572b86035..45c154efe42 100644
--- a/pkgs/desktops/kde-4.5/kde-package/manifest.nix
+++ b/pkgs/desktops/kde-4.5/kde-package/manifest.nix
@@ -100,4 +100,8 @@ builtins.listToAttrs
   name = "kdelibs-4.5.1.tar.bz2";
   value = "1xqvrrbwz5i4m6lipg1j97l2yq3kmxsl5j62jkhvp56q7dh85i0d";
 }
+{
+  name = "kdeaccessibility-4.5.1.tar.bz2";
+  value = "0jdd3n61lhabzs2dv6rfv6ksp7cqn5wpj6f2d8z33c354y9lqw24";
+}
 ]

From 9090138f5ecacc1aa0495f9848ce3df197091fd0 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 5 Sep 2010 12:29:44 +0000
Subject: [PATCH 057/181] Updating Gajim

svn path=/nixpkgs/trunk/; revision=23642
---
 .../networking/instant-messengers/gajim/default.nix         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index 6b9d7b4d24b..2d0b8fa0105 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -2,7 +2,7 @@ a :
 let 
   fetchurl = a.fetchurl;
 
-  version = a.lib.attrByPath ["version"] "0.13.4" a; 
+  version = a.lib.attrByPath ["version"] "0.14" a; 
   buildInputs = with a; [
     python pyGtkGlade gtk perl intltool dbus gettext
     pkgconfig makeWrapper libglade pyopenssl libXScrnSaver
@@ -13,8 +13,8 @@ let
 in
 rec {
   src = fetchurl {
-    url = "http://www.gajim.org/downloads/0.13/gajim-${version}.tar.gz";
-    sha256 = "0w7ddimwbapz51k76agqac5lwaqrsacl01zgq3jngrkgpfjlvxym";
+    url = "http://www.gajim.org/downloads/0.14/gajim-${version}.tar.gz";
+    sha256 = "3dc31b76f5e019515947b81685ec0e62ca20318b13cb80df4f4d7a045242d5bd";
   };
 
   inherit buildInputs;

From 7ad068644e1c1810717e5620a56f90e9415b447c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 5 Sep 2010 12:48:39 +0000
Subject: [PATCH 058/181] Adding GNOME rarian - scrollkeeper replacement

svn path=/nixpkgs/trunk/; revision=23643
---
 pkgs/desktops/gnome-2.28/default.nix                |  5 +++++
 pkgs/desktops/gnome-2.28/desktop/rarian/default.nix | 11 +++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/desktops/gnome-2.28/desktop/rarian/default.nix

diff --git a/pkgs/desktops/gnome-2.28/default.nix b/pkgs/desktops/gnome-2.28/default.nix
index 1c358b591a6..2f237f13daf 100644
--- a/pkgs/desktops/gnome-2.28/default.nix
+++ b/pkgs/desktops/gnome-2.28/default.nix
@@ -230,6 +230,11 @@ rec {
     inherit (pkgs) stdenv fetchurl pkgconfig perl perlXMLParser libxml2 libxslt docbook_xml_dtd_42;
   };
 
+  # scrollkeeper replacement
+  rarian = import ./desktop/rarian {
+    inherit (pkgs) stdenv fetchurl pkgconfig perl perlXMLParser libxml2 libxslt docbook_xml_dtd_42;
+  };
+
   gnome_doc_utils = import ./desktop/gnome-doc-utils {
     inherit (pkgs) stdenv fetchurl python pkgconfig libxslt
       makeWrapper;
diff --git a/pkgs/desktops/gnome-2.28/desktop/rarian/default.nix b/pkgs/desktops/gnome-2.28/desktop/rarian/default.nix
new file mode 100644
index 00000000000..77a2b710f44
--- /dev/null
+++ b/pkgs/desktops/gnome-2.28/desktop/rarian/default.nix
@@ -0,0 +1,11 @@
+{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42}:
+
+stdenv.mkDerivation rec {
+  name = "rarian-0.8.1";
+  src = fetchurl {
+    url = "mirror://gnome/sources/rarian/0.8/${name}.tar.bz2";
+    sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577";
+  };
+  buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt];
+  configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat";
+}

From c23a9903fe884586abca82d4957b994b7b9ae2f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 5 Sep 2010 15:18:57 +0000
Subject: [PATCH 059/181] GNU Sharutils 4.10.

svn path=/nixpkgs/trunk/; revision=23645
---
 pkgs/tools/archivers/sharutils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix
index 1748cae8e26..88f4592b34c 100644
--- a/pkgs/tools/archivers/sharutils/default.nix
+++ b/pkgs/tools/archivers/sharutils/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "sharutils-4.9";
+  name = "sharutils-4.10";
 
   src = fetchurl {
     url = "mirror://gnu/sharutils/${name}.tar.bz2";
-    sha256 = "0rmnx4xi6nkifb3pgn769yg5ffdk51hw52xmc51xjdfnpm5byqfm";
+    sha256 = "0q9g8ywsd5vwzzzvrgq3hzfqsdln9rhsqq0dhiwv2sr974c4xz5h";
   };
 
   # GNU Gettext is needed on non-GNU platforms.

From 95486795ad4788ae894fccc8f0e8c9f9951c782e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 5 Sep 2010 15:19:02 +0000
Subject: [PATCH 060/181] GNU Parallel 20100822.

svn path=/nixpkgs/trunk/; revision=23646
---
 pkgs/tools/misc/parallel/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index 2e8bb49f236..f1a91b970c1 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,15 +1,17 @@
 { fetchurl, stdenv, perl }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20100722";
+  name = "parallel-20100822";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "1dq2icd6xigi4pf66178pdim6dmpw7vkfndwady5r93kymz7m399";
+    sha256 = "1fs4ps4nw2zx0hcrqh52fmnmz14pnwia0in08r7gmc0mn6zr0zf1";
   };
 
   patchPhase =
     '' sed -i "src/parallel" -e's|/usr/bin/perl|${perl}/bin/perl|g'
+
+       rm -vf src/sem
     '';
 
   buildInputs = [ perl ];

From e9dc9a374abbe609ac2d1297e58d9222b8e5eb72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 5 Sep 2010 15:19:07 +0000
Subject: [PATCH 061/181] GDB 7.2.

svn path=/nixpkgs/trunk/; revision=23647
---
 pkgs/development/tools/misc/gdb/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index f44411e77d7..e14baf79153 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -1,8 +1,8 @@
 { fetchurl, stdenv, ncurses, readline, gmp, mpfr, expat, texinfo
-, target ? null }:
+, dejagnu, target ? null }:
 
 let
-    basename = "gdb-7.1";
+    basename = "gdb-7.2";
 in
 stdenv.mkDerivation rec {
   name = basename + stdenv.lib.optionalString (target != null)
@@ -10,11 +10,12 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnu/gdb/${basename}.tar.bz2";
-    sha256 = "0ljkv3xkpqg4x38mrmzx4b7h1bkpfy41vmi5q8nnakhajzbjfb0l";
+    sha256 = "1w0h6hya0bl46xddd57mdzwmffplwglhnh9x9hv46ll4mf44ni5z";
   };
 
   # TODO: Add optional support for Python scripting.
-  buildInputs = [ ncurses readline gmp mpfr expat texinfo ];
+  buildInputs = [ ncurses readline gmp mpfr expat texinfo ]
+    ++ stdenv.lib.optional doCheck dejagnu;
 
   configureFlags =
     '' --with-gmp=${gmp} --with-mpfr=${mpfr} --with-system-readline
@@ -27,6 +28,9 @@ stdenv.mkDerivation rec {
        rm -v $out/share/info/{standards,configure,bfd}.info
     '';
 
+  # TODO: Investigate & fix the test failures.
+  doCheck = false;
+
   meta = {
     description = "GDB, the GNU Project debugger";
 

From db61930195ccb0837c1a94484aa4761dba166eeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 5 Sep 2010 15:19:12 +0000
Subject: [PATCH 062/181] GNU ddrescue 1.13.

svn path=/nixpkgs/trunk/; revision=23648
---
 pkgs/tools/system/ddrescue/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix
index 3b008ef8889..ea169b82e89 100644
--- a/pkgs/tools/system/ddrescue/default.nix
+++ b/pkgs/tools/system/ddrescue/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "ddrescue-1.12";
+  name = "ddrescue-1.13";
 
   src = fetchurl {
     url = "mirror://gnu/ddrescue/${name}.tar.gz";
-    sha256 = "0ld176lg7dpkv9vcywh3w1cv3iqafq86yi0jwjafls38n65jhnsq";
+    sha256 = "1fh3lim8nvy6984vbvyvc3w3mb6bdksdsln8an1l9k6im6b507cc";
   };
 
   doCheck = true;

From 1ecee338e8c3d066671c087559e5fe196acab771 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 5 Sep 2010 15:19:17 +0000
Subject: [PATCH 063/181] GNU Guile 1.9.12.

svn path=/nixpkgs/trunk/; revision=23649
---
 pkgs/development/interpreters/guile/1.9.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/guile/1.9.nix b/pkgs/development/interpreters/guile/1.9.nix
index 1e029c28dc4..97650c554ce 100644
--- a/pkgs/development/interpreters/guile/1.9.nix
+++ b/pkgs/development/interpreters/guile/1.9.nix
@@ -7,11 +7,11 @@
  else stdenv.mkDerivation)
 
 rec {
-  name = "guile-1.9.11";  # This is a beta release!
+  name = "guile-1.9.12";  # This is a beta release!
 
   src = fetchurl {
     url = "ftp://alpha.gnu.org/gnu/guile/${name}.tar.gz";
-    sha256 = "13wff9944brzhi2afs4pzwndqcwhi4gg61qwahycr1d72v0wzmjp";
+    sha256 = "098p940fs6jmjpdp4jb2wjqrr0l2cgf8yhy3nf9s444pxwlyvn2g";
   };
 
   buildInputs =

From 895ba33eb453de67b407323e0e0efbf42c4dbbec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 5 Sep 2010 15:19:23 +0000
Subject: [PATCH 064/181] Guile-Lib 0.1.9.

svn path=/nixpkgs/trunk/; revision=23650
---
 .../guile-modules/guile-lib/default.nix       | 26 +++++++------------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix
index f94bc747811..eb69acdef64 100644
--- a/pkgs/development/guile-modules/guile-lib/default.nix
+++ b/pkgs/development/guile-modules/guile-lib/default.nix
@@ -1,31 +1,23 @@
 {stdenv, fetchurl, guile, texinfo}:
 
 stdenv.mkDerivation rec {
-  name = "guile-lib-0.1.6";
+  name = "guile-lib-0.1.9";
+
   src = fetchurl {
-    url = "http://download.gna.org/guile-lib/" + name + ".tar.gz";
-    sha256 = "827744c7954078f1f37e0bf70252ec70b4d60c1482a3542a49bd09723cf65d12";
+    url = "mirror://savannah/guile-lib/${name}.tar.gz";
+    sha256 = "13sc2x9x0rmfgfa69wabyhajc70yiywih9ibszjmkhxcm2zx0gan";
   };
 
   buildInputs = [guile texinfo];
 
-  postInstall = ''
-    # Remove modules already provided by Guile.
-    if "${guile}/bin/guile" -c '(use-modules (srfi srfi-34))'
-    then
-	rm -f "$out/share/guile/site/srfi/srfi-34.scm"
-    fi
-    if "${guile}/bin/guile" -c '(use-modules (srfi srfi-35))'
-    then
-	rm -f "$out/share/guile/site/srfi/srfi-35.scm"
-    fi
-  '';
-
   doCheck = true;
 
   meta = {
     description = "Guile-Library, a collection of useful Guile Scheme modules";
-    homepage = http://home.gna.org/guile-lib/;
-    license = "GPL";
+    homepage = http://www.nongnu.org/guile-lib/;
+    license = "GPLv3+";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 78e4a0c6a72..176c88dd5fc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2210,7 +2210,7 @@ let
       libgnomeui pango;
   };
 
-  guileLib = callPackage ../development/guile-modules/guile-lib { };
+  guile_lib = callPackage ../development/guile-modules/guile-lib { };
 
   windowssdk = (
     import ../development/misc/windows-sdk {

From 4926bd72566e3d20d8fd6816c62eef3a158204f7 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 5 Sep 2010 18:10:16 +0000
Subject: [PATCH 065/181] Update PyGTK

svn path=/nixpkgs/trunk/; revision=23651
---
 pkgs/development/python-modules/pygtk/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pygtk/default.nix b/pkgs/development/python-modules/pygtk/default.nix
index d4dd1237094..b976c8e0626 100644
--- a/pkgs/development/python-modules/pygtk/default.nix
+++ b/pkgs/development/python-modules/pygtk/default.nix
@@ -2,11 +2,11 @@
   , libglade ? null}:
 
 stdenv.mkDerivation {
-  name = "pygtk-2.16.0";
+  name = "pygtk-2.21.0";
 
   src = fetchurl {
-    url = http://ftp.gnome.org/pub/GNOME/sources/pygtk/2.16/pygtk-2.16.0.tar.bz2;
-    sha256 = "1a24fkxslir8zb800hs4ix9iyvgqsy5c6hdfirrh2yi1mw0mxbkz";
+    url = http://ftp.gnome.org/pub/GNOME/sources/pygtk/2.21/pygtk-2.21.0.tar.bz2;
+    sha256 = "1zfzq5zwldaha2ivga8f2ydyslf0fs8j601yyqcqsqb3y1dk8vbj";
   };
 
   buildInputs = [python pkgconfig glib gtk]

From 84795126263e303c3a5ccf488cc5c114b8fdd14e Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 5 Sep 2010 18:57:43 +0000
Subject: [PATCH 066/181] Step back PyGTK from the update requiring a lot of
 too-new code

svn path=/nixpkgs/trunk/; revision=23652
---
 pkgs/development/python-modules/pygtk/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pygtk/default.nix b/pkgs/development/python-modules/pygtk/default.nix
index b976c8e0626..48c8ebfa87a 100644
--- a/pkgs/development/python-modules/pygtk/default.nix
+++ b/pkgs/development/python-modules/pygtk/default.nix
@@ -2,11 +2,11 @@
   , libglade ? null}:
 
 stdenv.mkDerivation {
-  name = "pygtk-2.21.0";
+  name = "pygtk-2.17.0";
 
   src = fetchurl {
-    url = http://ftp.gnome.org/pub/GNOME/sources/pygtk/2.21/pygtk-2.21.0.tar.bz2;
-    sha256 = "1zfzq5zwldaha2ivga8f2ydyslf0fs8j601yyqcqsqb3y1dk8vbj";
+    url = http://ftp.gnome.org/pub/GNOME/sources/pygtk/2.17/pygtk-2.17.0.tar.bz2;
+    sha256 = "000l3wrcj0ghid045n6ipqg4q4zci51z9k9fqw4n4p3n5rx82qba";
   };
 
   buildInputs = [python pkgconfig glib gtk]

From 29db2ca0c9457131c8bf190c4a2ac4caae5d0433 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 5 Sep 2010 23:37:54 +0000
Subject: [PATCH 067/181] Adding Ekiga

svn path=/nixpkgs/trunk/; revision=23653
---
 .../applications/networking/ekiga/default.nix | 71 +++++++++++++++++++
 pkgs/development/libraries/opal/default.nix   | 56 +++++++++++++++
 pkgs/development/libraries/ptlib/default.nix  | 50 +++++++++++++
 pkgs/development/libraries/srtp/default.nix   | 47 ++++++++++++
 .../servers/evolution-data-server/default.nix | 56 +++++++++++++++
 pkgs/top-level/all-packages.nix               | 13 ++++
 6 files changed, 293 insertions(+)
 create mode 100644 pkgs/applications/networking/ekiga/default.nix
 create mode 100644 pkgs/development/libraries/opal/default.nix
 create mode 100644 pkgs/development/libraries/ptlib/default.nix
 create mode 100644 pkgs/development/libraries/srtp/default.nix
 create mode 100644 pkgs/servers/evolution-data-server/default.nix

diff --git a/pkgs/applications/networking/ekiga/default.nix b/pkgs/applications/networking/ekiga/default.nix
new file mode 100644
index 00000000000..46af2275c37
--- /dev/null
+++ b/pkgs/applications/networking/ekiga/default.nix
@@ -0,0 +1,71 @@
+x@{builderDefsPackage
+  , cyrus_sasl, gettext, openldap, ptlib, opal, GConf, libXv, rarian, intltool
+  , perl, perlXMLParser, evolution_data_server, gnome_doc_utils, avahi
+  , libsigcxx, gtk, dbus_glib, libnotify, libXext, xextproto, automake
+  , autoconf, pkgconfig, libxml2, videoproto, unixODBC, db4, nspr, nss, zlib
+  , libXrandr, randrproto, which, libxslt
+  , ...}:
+builderDefsPackage
+(a :  
+let 
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+    [];
+
+  buildInputs = map (n: builtins.getAttr n x)
+    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+  sourceInfo = rec {
+    baseName="ekiga";
+    baseVersion="3.2";
+    patchlevel="7";
+    version="${baseVersion}.${patchlevel}";
+    name="${baseName}-${version}";
+    url="mirror://gnome/sources/${baseName}/${baseVersion}/${name}.tar.bz2";
+    hash="13zxwfqhp7pisadx0hq50qwnj6d8r4dldvbs1ngydbwfnq4i6npj";
+  };
+in
+rec {
+  src = a.fetchurl {
+    url = sourceInfo.url;
+    sha256 = sourceInfo.hash;
+  };
+
+  inherit (sourceInfo) name version;
+  inherit buildInputs;
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["setVars" "doConfigure" "doMakeInstall"];
+  configureFlags = [
+    "--with-ldap-dir=${openldap}"
+    "--with-libsasl2-dir=${cyrus_sasl}"
+  ];
+
+  setVars = a.noDepEntry (''
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${opal}/include/opal"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${evolution_data_server}/include/evolution-*)"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${GConf}/include/gconf/2"
+
+    export NIX_LDFLAGS="$NIX_LDFLAGS -lopal"
+    for i in ${evolution_data_server}/lib/lib*.so; do
+      file="$(basename "$i" .so)"
+      bn="''${file#lib}"
+      export NIX_LDFLAGS="$NIX_LDFLAGS -l$bn"
+    done
+  '');
+
+  meta = {
+    description = "Ekiga SIP client";
+    maintainers = with a.lib.maintainers;
+    [
+      raskin
+    ];
+    platforms = with a.lib.platforms;
+      linux;
+  };
+  passthru = {
+    updateInfo = {
+      downloadPage = "mirror://gnome/sources/ekiga";
+    };
+  };
+}) x
+
diff --git a/pkgs/development/libraries/opal/default.nix b/pkgs/development/libraries/opal/default.nix
new file mode 100644
index 00000000000..23615d6646d
--- /dev/null
+++ b/pkgs/development/libraries/opal/default.nix
@@ -0,0 +1,56 @@
+x@{builderDefsPackage
+  , doxygen, pkgconfig, ptlib, srtp, libtheora, speex
+  , ffmpeg, x264, cyrus_sasl, openldap, openssl, expat, unixODBC
+  , ...}:
+builderDefsPackage
+(a :  
+let 
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+    [];
+
+  buildInputs = map (n: builtins.getAttr n x)
+    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+  sourceInfo = rec {
+    baseName="opal";
+    baseVersion="3.6";
+    patchlevel="8";
+    version="${baseVersion}.${patchlevel}";
+    name="${baseName}-${version}";
+    url="mirror://gnome/sources/${baseName}/${baseVersion}/${name}.tar.bz2";
+    hash="0359wqmrxqajd94sw3q2dn6n6y3caggavwdcmzyn6maw7srspgwc";
+  };
+in
+rec {
+  src = a.fetchurl {
+    url = sourceInfo.url;
+    sha256 = sourceInfo.hash;
+  };
+
+  inherit (sourceInfo) name version;
+  inherit buildInputs;
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["setVars" "doConfigure" "doMakeInstall"];
+  configureFlags = [
+    "--enable-h323"
+  ];
+  setVars = a.noDepEntry (''
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -D__STDC_CONSTANT_MACROS=1"
+  '');
+      
+  meta = {
+    description = "OPAL VoIP library";
+    maintainers = with a.lib.maintainers;
+    [
+      raskin
+    ];
+    platforms = with a.lib.platforms;
+      linux;
+  };
+  passthru = {
+    updateInfo = {
+      downloadPage = "http://ftp.gnome.org/pub/GNOME/sources/opal";
+    };
+  };
+}) x
+
diff --git a/pkgs/development/libraries/ptlib/default.nix b/pkgs/development/libraries/ptlib/default.nix
new file mode 100644
index 00000000000..be1e6fdb4a5
--- /dev/null
+++ b/pkgs/development/libraries/ptlib/default.nix
@@ -0,0 +1,50 @@
+x@{builderDefsPackage
+  , autoconf, automake, libtool, doxygen, pkgconfig, bison, flex, unixODBC
+  , openssl, openldap, cyrus_sasl, krb5, expat, SDL, libdv, libv4l, alsaLib
+  , ...}:
+builderDefsPackage
+(a :  
+let 
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+    [];
+
+  buildInputs = map (n: builtins.getAttr n x)
+    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+  sourceInfo = rec {
+    baseName="ptlib";
+    baseVersion="2.6";
+    patchlevel="7";
+    version="${baseVersion}.${patchlevel}";
+    name="${baseName}-${version}";
+    url="mirror://gnome/sources/${baseName}/${baseVersion}/${name}.tar.bz2";
+    hash="0zxrygl2ivbciqf97yd9n67ch9vd9gp236w96i6ia8fxzqjq5lkx";
+  };
+in
+rec {
+  src = a.fetchurl {
+    url = sourceInfo.url;
+    sha256 = sourceInfo.hash;
+  };
+
+  inherit (sourceInfo) name version;
+  inherit buildInputs;
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["doConfigure" "doMakeInstall"];
+      
+  meta = {
+    description = "Portable Tools from OPAL VoIP";
+    maintainers = with a.lib.maintainers;
+    [
+      raskin
+    ];
+    platforms = with a.lib.platforms;
+      linux;
+  };
+  passthru = {
+    updateInfo = {
+      downloadPage = "http://ftp.gnome.org/sources/ptlib/";
+    };
+  };
+}) x
+
diff --git a/pkgs/development/libraries/srtp/default.nix b/pkgs/development/libraries/srtp/default.nix
new file mode 100644
index 00000000000..887c0c7c1a3
--- /dev/null
+++ b/pkgs/development/libraries/srtp/default.nix
@@ -0,0 +1,47 @@
+x@{builderDefsPackage
+  , autoconf, automake, libtool, doxygen, procps
+  , ...}:
+builderDefsPackage
+(a :  
+let 
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+    [];
+
+  buildInputs = map (n: builtins.getAttr n x)
+    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+  sourceInfo = rec {
+    baseName="srtp";
+    version="1.4.2";
+    name="${baseName}-${version}";
+    url="http://srtp.sourceforge.net/${name}.tgz";
+    hash="1497mcxharnhiccjhny30g4wlv28ckdxhj14jrwvdnnvhl80jf43";
+  };
+in
+rec {
+  src = a.fetchurl {
+    url = sourceInfo.url;
+    sha256 = sourceInfo.hash;
+  };
+
+  inherit (sourceInfo) name version;
+  inherit buildInputs;
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["doConfigure" "doMakeInstall"];
+      
+  meta = {
+    description = "Secure RTP";
+    maintainers = with a.lib.maintainers;
+    [
+      raskin
+    ];
+    platforms = with a.lib.platforms;
+      linux;
+  };
+  passthru = {
+    updateInfo = {
+      downloadPage = "http://srtp.sourceforge.net/download.html";
+    };
+  };
+}) x
+
diff --git a/pkgs/servers/evolution-data-server/default.nix b/pkgs/servers/evolution-data-server/default.nix
new file mode 100644
index 00000000000..d313da9f2f9
--- /dev/null
+++ b/pkgs/servers/evolution-data-server/default.nix
@@ -0,0 +1,56 @@
+x@{builderDefsPackage
+  , pkgconfig, flex, bison, libtool, intltool, perl
+  , db4, krb5, openldap, glib, libxml2, GConf
+  , nss, gtk, libgnome, libsoup, gnome_keyring
+  , gtkdoc, sqlite, libgweather, libical, icu
+  , dbus_glib, gperf, nspr, gdk_pixbuf ? null
+  , ...}:
+builderDefsPackage
+(a :  
+let 
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+    [];
+
+  buildInputs = map (n: builtins.getAttr n x)
+    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+  sourceInfo = rec {
+    url = "mirror://gnome/sources/evolution-data-server/2.30/evolution-data-server-2.30.3.tar.bz2";
+    hash = "147qkpiafrlq220qg2pmp9lbvh8bn339wh1699bgb7rvmdvycwrp";
+    version = "2.30.3";
+    name = "evolution-data-server-${version}";
+  };
+in
+rec {
+  src = a.fetchurl {
+    url = sourceInfo.url;
+    sha256 = sourceInfo.hash;
+  };
+
+  inherit (sourceInfo) name version;
+  inherit buildInputs;
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["doConfigure" "doMakeInstall"];
+
+  configureFlags = [
+    "--with-nspr-includes=${nspr}/include/nspr"
+    "--with-nss-includes=${nss}/include/nss"
+  ];
+      
+  meta = {
+    description = "Evolution Data Server";
+    maintainers = with a.lib.maintainers;
+    [
+      /* I am only interested in it for libebook... */
+      raskin
+    ];
+    platforms = with a.lib.platforms;
+      linux;
+  };
+  passthru = {
+    updateInfo = {
+      downloadPage = "http://projects.gnome.org/evolution/download.shtml";
+    };
+  };
+}) x
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 176c88dd5fc..3110971c8d0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3589,6 +3589,8 @@ let
     opensc = opensc_0_11_7;
   };
 
+  opal = callPackage ../development/libraries/opal {};
+
   openjpeg = callPackage ../development/libraries/openjpeg { };
 
   openssl = callPackage ../development/libraries/openssl {
@@ -3640,6 +3642,8 @@ let
 
   pth = callPackage ../development/libraries/pth { };
 
+  ptlib = callPackage ../development/libraries/ptlib {};
+
   qjson = callPackage ../development/libraries/qjson { };
 
   qt3 = callPackage ../development/libraries/qt-3 {
@@ -3738,6 +3742,8 @@ let
 
   speex = callPackage ../development/libraries/speex { };
 
+  srtp = callPackage ../development/libraries/srtp {};
+
   sqlite = callPackage ../development/libraries/sqlite {
     readline = null;
     ncurses = null;
@@ -5455,6 +5461,10 @@ let
       libgnomeui libglade glib gtk scrollkeeper gnome_keyring;
   };
 
+  evolution_data_server = (newScope (gnome // gtkLibs))
+  ../servers/evolution-data-server {
+  };
+
   exrdisplay = callPackage ../applications/graphics/exrdisplay {
     fltk = fltk20;
   };
@@ -6869,6 +6879,9 @@ let
 
   dpkg = callPackage ../tools/package-management/dpkg { };
 
+  ekiga = lib.callPackageWith (pkgs // pkgs.xorg // pkgs.gtkLibs // pkgs.gnome)
+    ../applications/networking/ekiga {};
+
   electricsheep = callPackage ../misc/screensavers/electricsheep { };
 
   foldingathome = callPackage ../misc/foldingathome { };

From f01245ee4a116f010915eee0d1c7e8c7e3236df2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 6 Sep 2010 07:17:20 +0000
Subject: [PATCH 068/181] Improving a bit the configure options for mutt:
 Enable debug Fix a copy and paste error in --without-sasl

svn path=/nixpkgs/trunk/; revision=23654
---
 pkgs/applications/networking/mailreaders/mutt/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix
index fbc9a08bd68..ffe4ca32712 100644
--- a/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/mutt/default.nix
@@ -31,6 +31,10 @@ stdenv.mkDerivation {
   
   configureFlags = [
     "--with-mailpath=" "--enable-smtp"
+
+    # This allows calls with "-d N", that output debug info into ~/.muttdebug*
+    "--enable-debug"
+
     # The next allows building mutt without having anything setgid
     # set by the installer, and removing the need for the group 'mail'
     # I set the value 'mailbox' because it is a default in the configure script
@@ -38,7 +42,7 @@ stdenv.mkDerivation {
     (if headerCache then "--enable-hcache" else "--disable-hcache")
     (if sslSupport then "--with-ssl" else "--without-ssl")
     (if imapSupport then "--enable-imap" else "--disable-imap")
-    (if saslSupport then "--with-sasl" else "--without-imap")
+    (if saslSupport then "--with-sasl" else "--without-sasl")
   ];
 
   meta = {

From 7e27052bd6963600d892aca200030b15ef5dacf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 6 Sep 2010 07:21:08 +0000
Subject: [PATCH 069/181] Applying the patch adding 'detox' from Tom Ridge and
 Karn Kallio.

svn path=/nixpkgs/trunk/; revision=23655
---
 pkgs/tools/misc/detox/default.nix | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/tools/misc/detox/default.nix

diff --git a/pkgs/tools/misc/detox/default.nix b/pkgs/tools/misc/detox/default.nix
new file mode 100644
index 00000000000..ade13382033
--- /dev/null
+++ b/pkgs/tools/misc/detox/default.nix
@@ -0,0 +1,24 @@
+{stdenv, fetchurl, flex}:
+
+stdenv.mkDerivation {
+  name = "detox-1.2.0";
+
+  src = fetchurl {
+    url = mirror://sourceforge/detox/1.2.0/detox-1.2.0.tar.gz;
+    sha256 = "02cfkf3yhw64xg8mksln8w24gdwgm2x9g3vps7gn6jbjbfd8mh45";
+  };
+
+  buildInputs = [flex];
+
+  meta = {
+    description = "Detox is a utility designed to clean up filenames.";
+    longDescription = ''
+      Detox is a utility designed to clean up filenames. It replaces
+      difficult to work with characters, such as spaces, with standard
+      equivalents. It will also clean up filenames with UTF-8 or Latin-1
+      (or CP-1252) characters in them.
+    '';
+    homepage = "http://detox.sourceforge.net/";
+    license = "bsd";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3110971c8d0..e8d229b4ba1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -517,6 +517,8 @@ let
 
   debootstrap = callPackage ../tools/misc/debootstrap { };
 
+  detox = callPackage ../tools/misc/detox { };
+
   ddclient = callPackage ../tools/networking/ddclient { };
 
   ddrescue = callPackage ../tools/system/ddrescue { };

From b7240750634340ef9006307167c15d5dd285aee0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 6 Sep 2010 07:29:18 +0000
Subject: [PATCH 070/181] * Audacious 2.4.0.

svn path=/nixpkgs/trunk/; revision=23656
---
 pkgs/applications/audio/audacious/default.nix | 8 ++++----
 pkgs/top-level/all-packages.nix               | 4 +---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix
index 08548aa8b57..66db7efa3e6 100644
--- a/pkgs/applications/audio/audacious/default.nix
+++ b/pkgs/applications/audio/audacious/default.nix
@@ -4,16 +4,16 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "audacious-2.3";
+  name = "audacious-2.4.0";
   
   src = fetchurl {
     url = "http://distfiles.atheme.org/${name}.tgz";
-    sha256 = "0vs16y1vrlkzcbaw8imc36b9lncva69zkdkp38ikbidssiskm6xi";
+    sha256 = "1n6mfy2j7lqv5d9r92n1frbs7acplfip5vssqp0j9z5qkidx98pj";
   };
 
   pluginsSrc = fetchurl {
-    url = "http://distfiles.atheme.org/audacious-plugins-2.3.tgz";
-    sha256 = "0hdami52qpiyim3nz3qnml85wgjzpmx6g2wahfnsdvncmhm4v93x";
+    url = "http://distfiles.atheme.org/audacious-plugins-2.4.0.tgz";
+    sha256 = "04rsfh7c54ffz6qavl3li5haa7jnaa42m4p1w0s4qpiiw3pvbaf5";
   };
   
   # `--enable-amidiplug' is to prevent configure from looking in /proc/asound.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8d229b4ba1..110f039b58e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4810,7 +4810,6 @@ let
   pam_usb = callPackage ../os-specific/linux/pam_usb { };
 
   pcmciaUtils = callPackage ../os-specific/linux/pcmciautils {
-
     firmware = getConfig ["pcmciaUtils" "firmware"] [];
     config = getConfig ["pcmciaUtils" "config"] null;
   };
@@ -4841,8 +4840,7 @@ let
 
   splashutils = callPackage ../os-specific/linux/splashutils/default.nix { };
 
-  statifier = builderDefsPackage (import ../os-specific/linux/statifier) {
-  };
+  statifier = builderDefsPackage (import ../os-specific/linux/statifier) { };
 
   sysfsutils = callPackage ../os-specific/linux/sysfsutils { };
 

From 78adb9fbf15e0d7c48b8f625e46dfa0125936c49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 6 Sep 2010 07:58:13 +0000
Subject: [PATCH 071/181] org-mode: Pass the full path to `which'; use
 `callPackage'.

svn path=/nixpkgs/trunk/; revision=23657
---
 pkgs/applications/editors/emacs-modes/org/default.nix | 6 +++++-
 pkgs/top-level/all-packages.nix                       | 4 +---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix
index 31efaf8de23..559bc957f07 100644
--- a/pkgs/applications/editors/emacs-modes/org/default.nix
+++ b/pkgs/applications/editors/emacs-modes/org/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, emacs, texinfo }:
+{ fetchurl, stdenv, emacs, texinfo, which }:
 
 stdenv.mkDerivation rec {
   name = "org-7.01f";
@@ -10,6 +10,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ emacs texinfo ];
 
+  patchPhase =
+    '' sed -i "lisp/org-clock.el" -e's|"which"|"${which}/bin/which"|g'
+    '';
+
   configurePhase =
     '' sed -i Makefile \
            -e "s|^prefix=.*$|prefix=$out|g"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 110f039b58e..b66156a449f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5430,9 +5430,7 @@ let
 
     # This is usually a newer version of Org-Mode than that found in GNU Emacs, so
     # we want it to have higher precedence.
-    org = hiPrio (import ../applications/editors/emacs-modes/org {
-      inherit fetchurl stdenv emacs texinfo;
-    });
+    org = hiPrio (callPackage ../applications/editors/emacs-modes/org { });
 
     prologMode = callPackage ../applications/editors/emacs-modes/prolog { };
 

From f2b9328a31a6c959d8372f88a9a8a57e2af4aa22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 6 Sep 2010 07:58:17 +0000
Subject: [PATCH 072/181] Fix references to the `guileLib' attribute, now
 `guile_lib'.

svn path=/nixpkgs/trunk/; revision=23658
---
 pkgs/development/guile-modules/guile-cairo/default.nix | 4 ++--
 pkgs/development/guile-modules/guile-gnome/default.nix | 4 ++--
 pkgs/development/tools/guile/g-wrap/default.nix        | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/development/guile-modules/guile-cairo/default.nix
index d4deea047ef..f8ff52e5ab8 100644
--- a/pkgs/development/guile-modules/guile-cairo/default.nix
+++ b/pkgs/development/guile-modules/guile-cairo/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, guile, pkgconfig, cairo, guileLib }:
+{ fetchurl, stdenv, guile, pkgconfig, cairo, guile_lib }:
 
 stdenv.mkDerivation rec {
   name = "guile-cairo-1.4.0";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ guile pkgconfig cairo ]
-    ++ stdenv.lib.optional doCheck guileLib;
+    ++ stdenv.lib.optional doCheck guile_lib;
 
   doCheck = true;
 
diff --git a/pkgs/development/guile-modules/guile-gnome/default.nix b/pkgs/development/guile-modules/guile-gnome/default.nix
index 40074e743b1..b6a7a43297c 100644
--- a/pkgs/development/guile-modules/guile-gnome/default.nix
+++ b/pkgs/development/guile-modules/guile-gnome/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, guile, guileLib, gwrap
+{ fetchurl, stdenv, guile, guile_lib, gwrap
 , pkgconfig, gconf, glib, gnomevfs, gtk
 , libglade, libgnome, libgnomecanvas, libgnomeui, pango, guileCairo }:
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
       pkgconfig gconf glib gnomevfs gtk libglade libgnome libgnomecanvas
       libgnomeui pango guileCairo
     ]
-    ++ stdenv.lib.optional doCheck guileLib;
+    ++ stdenv.lib.optional doCheck guile_lib;
 
   # The test suite tries to open an X display, which fails.
   doCheck = false;
diff --git a/pkgs/development/tools/guile/g-wrap/default.nix b/pkgs/development/tools/guile/g-wrap/default.nix
index fe926e8ace5..8698dc27b40 100644
--- a/pkgs/development/tools/guile/g-wrap/default.nix
+++ b/pkgs/development/tools/guile/g-wrap/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, guile, libffi, pkgconfig, glib
-, guileLib }:
+, guile_lib }:
 
 stdenv.mkDerivation rec {
   name = "g-wrap-1.9.13";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   # Note: Glib support is optional, but it's quite useful (e.g., it's
   # used by Guile-GNOME).
   buildInputs = [ guile pkgconfig glib ]
-    ++ stdenv.lib.optional doCheck guileLib;
+    ++ stdenv.lib.optional doCheck guile_lib;
 
   propagatedBuildInputs = [ libffi ];
 

From 420adcd3540c3a614f1b83d8e46416adce2b72dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 6 Sep 2010 08:45:24 +0000
Subject: [PATCH 073/181] Remove another reference to attribute `guileLib'.

svn path=/nixpkgs/trunk/; revision=23659
---
 pkgs/top-level/release.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 22b8ee6a4fd..180a4edca8e 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -137,7 +137,6 @@ with (import ./release-lib.nix);
   grub2 = linux;
   gsl = linux;
   guile = linux;  # tests fail on Cygwin
-  guileLib = linux;
   gv = linux;
   gw6c = linux;
   gzip = all;

From e4ef870382892f822037ebcd3c16470db63af3f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 6 Sep 2010 15:36:41 +0000
Subject: [PATCH 074/181] Remove another reference to attribute `guileLib'.

svn path=/nixpkgs/trunk/; revision=23660
---
 pkgs/top-level/guile-2-test.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/guile-2-test.nix b/pkgs/top-level/guile-2-test.nix
index 004b75254a0..6341c82da73 100644
--- a/pkgs/top-level/guile-2-test.nix
+++ b/pkgs/top-level/guile-2-test.nix
@@ -62,7 +62,7 @@ in (mapTestOn {
   texmacs = linux;
   guileCairo = linux;
   guileGnome = linux;
-  guileLib = linux;
+  guile_lib = linux;
   guileLint = linux;
   gwrap = linux;
   swig = linux;

From d460ffc55493adb8a6907e27c1cee7ff5b2f3e3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 7 Sep 2010 08:02:36 +0000
Subject: [PATCH 075/181] uucp: Fetch from mirror://gnu; add `meta'.

svn path=/nixpkgs/trunk/; revision=23661
---
 pkgs/tools/misc/uucp/default.nix | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/uucp/default.nix b/pkgs/tools/misc/uucp/default.nix
index b0741311dff..661f1ae46eb 100644
--- a/pkgs/tools/misc/uucp/default.nix
+++ b/pkgs/tools/misc/uucp/default.nix
@@ -1,14 +1,30 @@
 { stdenv, fetchurl }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "uucp-1.07";
 
   src = fetchurl {
-    url = http://ftp.de.debian.org/debian/pool/main/u/uucp/uucp_1.07.orig.tar.gz;
+    url = "mirror://gnu/uucp/${name}.tar.gz";
     sha256 = "0b5nhl9vvif1w3wdipjsk8ckw49jj1w85xw1mmqi3zbcpazia306";
   };
 
+  doCheck = true;
+
   meta = {
     description = "Unix-unix cp over serial line, also includes cu program";
+
+    longDescription =
+      '' Taylor UUCP is a free implementation of UUCP and is the standard
+         UUCP used on the GNU system.  If you don't know what UUCP is chances
+         are, nowadays, that you won't need it.  If you do need it, you've
+         just found one of the finest UUCP implementations available.
+      '';
+
+    homepage = http://www.gnu.org/software/uucp/uucp.html;
+
+    license = "GPLv2+";
+
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.ludo ];
   };
 }

From 919ae70e01d6fc4a221955a04b2b6b5bb94458f4 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Tue, 7 Sep 2010 09:54:11 +0000
Subject: [PATCH 076/181] Make hydra compile QGit

svn path=/nixpkgs/trunk/; revision=23662
---
 .../version-management/git-and-tools/qgit/default.nix            | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/version-management/git-and-tools/qgit/default.nix b/pkgs/applications/version-management/git-and-tools/qgit/default.nix
index 0c74bc51cbd..71abaa67dea 100644
--- a/pkgs/applications/version-management/git-and-tools/qgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/qgit/default.nix
@@ -7,6 +7,7 @@ stdenv.mkDerivation rec {
     license = "GPLv2";
     homepage = "http://digilander.libero.it/mcostalba/";
     description = "Graphical front-end to Git";
+    platforms = stdenv.lib.platforms.all;
   };
   src = fetchurl
   {

From 8d1cc5fcc209998994a47a08c0c11da98fa19cc7 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Tue, 7 Sep 2010 12:08:24 +0000
Subject: [PATCH 077/181] Upgraded VirtualBox guest additions to version 3.2.8
 and fixed it to make it work with xorg-server-1.8.x again. The RandR support
 still doesn't work properly, however

svn path=/nixpkgs/trunk/; revision=23664
---
 .../virtualbox/guest-additions/default.nix         | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 6e099ef5df7..bb9b8eea08c 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, lib, patchelf, cdrkit, kernel
-, libX11, libXt, libXext, libXmu, libXcomposite, libXfixes}:
+, libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor}:
 
 stdenv.mkDerivation {
-  name = "VirtualBox-GuestAdditions-3.1.8";
+  name = "VirtualBox-GuestAdditions-3.2.8";
   src = fetchurl {
-    url = http://download.virtualbox.org/virtualbox/3.1.8/VBoxGuestAdditions_3.1.8.iso;
-    sha256 = "11fn49zxmd7nxmqn9pcakmzj6j9f8kfb38czpl8fhbnl2k4ggj5q";
+    url = http://download.virtualbox.org/virtualbox/3.2.8/VBoxGuestAdditions_3.2.8.iso;
+    sha256 = "1pyfgrcdmw6zf3yxgzcd8c5qzqqn62bz4085ka453gfmi9d65lys";
   };
   KERN_DIR = "${kernel}/lib/modules/*/build";
   buildInputs = [ patchelf cdrkit ];
@@ -53,7 +53,7 @@ stdenv.mkDerivation {
     done
 
     # Change rpath for various binaries and libraries
-    patchelf --set-rpath ${stdenv.gcc.gcc}/lib:${libX11}/lib:${libXt}/lib:${libXext}/lib:${libXmu}/lib:${libXfixes}/lib bin/VBoxClient
+    patchelf --set-rpath ${stdenv.gcc.gcc}/lib:${libX11}/lib:${libXt}/lib:${libXext}/lib:${libXmu}/lib:${libXfixes}/lib:${libXrandr}/lib:${libXcursor}/lib bin/VBoxClient
 
     for i in lib/VBoxOGL*.so
     do
@@ -89,8 +89,8 @@ stdenv.mkDerivation {
     
     # Install Xorg drivers
     ensureDir $out/lib/xorg/modules/{drivers,input}
-    install -m 644 lib/VBoxGuestAdditions/vboxvideo_drv_17.so $out/lib/xorg/modules/drivers/vboxvideo_drv.so
-    install -m 644 lib/VBoxGuestAdditions/vboxmouse_drv_17.so $out/lib/xorg/modules/input/vboxmouse_drv.so
+    install -m 644 lib/VBoxGuestAdditions/vboxvideo_drv_18.so $out/lib/xorg/modules/drivers/vboxvideo_drv.so
+    install -m 644 lib/VBoxGuestAdditions/vboxmouse_drv_18.so $out/lib/xorg/modules/input/vboxmouse_drv.so
     
     # Install kernel modules
     cd src

From 08a4373125a1307a72b15a59847af55ccc482cfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 7 Sep 2010 12:52:30 +0000
Subject: [PATCH 078/181] Bump awesome.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(patch by Carles Pagès)

svn path=/nixpkgs/trunk/; revision=23667
---
 pkgs/applications/window-managers/awesome/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index 8d7cd7da9a1..741fcfd14c2 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -4,11 +4,11 @@
 , docbook_xml_dtd_45, libxslt, coreutils}:
 
 stdenv.mkDerivation rec {
-  name = "awesome-3.4.6";
+  name = "awesome-3.4.7";
  
   src = fetchurl {
-    url = http://awesome.naquadah.org/download/awesome-3.4.6.tar.xz;
-    sha256 = "1bxym326pl32q5jsaqa7p785k8yviinzj0q1l42pdhiiq717zbwi";
+    url = http://awesome.naquadah.org/download/awesome-3.4.7.tar.xz;
+    sha256 = "1l5c730y17wxqm6p9fybjg84nk01jpg30wg14qjpc7xs5pd11993";
   };
  
   buildInputs = [ xz cmake gperf imagemagick pkgconfig lua glib cairo pango

From d9f435106c84cfa69a2e944be30b7ced26e1aedf Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 7 Sep 2010 12:56:49 +0000
Subject: [PATCH 079/181] lua5: re-enable -fPIC for lua5

svn path=/nixpkgs/trunk/; revision=23668
---
 pkgs/development/interpreters/lua-5/default.nix | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix
index c1651e806b2..160f2827003 100644
--- a/pkgs/development/interpreters/lua-5/default.nix
+++ b/pkgs/development/interpreters/lua-5/default.nix
@@ -8,14 +8,7 @@ stdenv.mkDerivation {
     sha256 = "0fmgk100ficm1jbm4ga9xy484v4cm89wsdfckdybb9gjx8jy4f5h";
   };
 
-  # Disabled: -fPIC cannot be passed this way, because setting CFLAGS
-  #           breaks lua's internal mechanism for passing flags from the
-  #           top-level Makefile to src/Makefile. The desired effect
-  #           could probably be achieved by modifying the Makefile with
-  #           sed(1), etc. I didn't add that, though, because it's not
-  #           clear to me why -fPIC is required in the first place.
-  #
-  # makeFlags = "CFLAGS=-fPIC";
+  NIX_CFLAGS_COMPILE = "-fPIC";
   buildFlags = if stdenv.isLinux then "linux" else
 	       if stdenv.isDarwin then "macosx" else
 	       if stdenv.isFreeBSD then "freebsd" else

From b936683cc45c1b9e0cae3966639e180708548828 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Tue, 7 Sep 2010 12:58:01 +0000
Subject: [PATCH 080/181] Small refactoring to prepare for future changes.

svn path=/nixpkgs/trunk/; revision=23669
---
 pkgs/top-level/haskell-packages.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 71faca5480a..0bba75bb71d 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -212,9 +212,8 @@ rec {
 
   haskellPlatform = haskellPlatform_2010_2_0_0;
 
-  haskellPlatform_2010_2_0_0 = import ../development/libraries/haskell/haskell-platform/2010.2.0.0.nix {
-    inherit cabal ghc
-      html xhtml;
+  haskellPlatformArgs_2010_2_0_0 = {
+    inherit cabal ghc html xhtml;
     haskellSrc = haskellSrc_P;
     fgl = fgl_5_4_2_3;
     cabalInstall = cabalInstall_0_8_2;
@@ -234,9 +233,14 @@ rec {
     stm = stm_2_1_2_1;
     haddock = haddock_2_7_2_P;
     happy = happy_1_18_5;
-    inherit (pkgs) fetchurl;
   };
 
+  haskellPlatformDefaults_2010_2_0_0 = haskellPlatformArgs_2010_2_0_0 // {
+    haskellPlatform = haskellPlatform_2010_2_0_0;
+  };
+
+  haskellPlatform_2010_2_0_0 = callPackage ../development/libraries/haskell/haskell-platform/2010.2.0.0.nix haskellPlatformArgs_2010_2_0_0;
+
   haskellPlatform_2010_1_0_0 = pkgs.lowPrio (import ../development/libraries/haskell/haskell-platform/2010.1.0.0.nix {
     inherit cabal ghc fgl
       haskellSrc html

From 923d30959f55b30a56c76f6b1e9bdd799f75901c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Tue, 7 Sep 2010 12:58:07 +0000
Subject: [PATCH 081/181] Added yst; updated happstack, pandoc, gitit and
 dependencies.

svn path=/nixpkgs/trunk/; revision=23670
---
 .../libraries/haskell/HStringTemplate/default.nix  |  4 ++--
 .../libraries/haskell/HsSyck/default.nix           | 10 ++++++++++
 .../libraries/haskell/SMTPClient/default.nix       |  4 ++--
 .../libraries/haskell/gitit/default.nix            |  4 ++--
 .../libraries/haskell/happstack/happstack-data.nix | 12 ++++++++----
 .../haskell/happstack/happstack-server.nix         |  4 ++--
 .../libraries/haskell/happstack/happstack-util.nix |  4 ++--
 .../haskell/highlighting-kate/default.nix          |  4 ++--
 .../libraries/haskell/pandoc/default.nix           |  7 +++----
 .../libraries/haskell/sendfile/default.nix         |  4 ++--
 .../haskell/strictConcurrency/default.nix          |  8 ++++----
 .../haskell/syb/syb-with-class-instances-text.nix  | 11 +++++++++++
 .../libraries/haskell/syb/syb-with-class.nix       |  4 ++--
 .../libraries/haskell/texmath/default.nix          |  4 ++--
 pkgs/development/libraries/haskell/yst/default.nix | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  6 ++++++
 16 files changed, 74 insertions(+), 30 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/HsSyck/default.nix
 create mode 100644 pkgs/development/libraries/haskell/syb/syb-with-class-instances-text.nix
 create mode 100644 pkgs/development/libraries/haskell/yst/default.nix

diff --git a/pkgs/development/libraries/haskell/HStringTemplate/default.nix b/pkgs/development/libraries/haskell/HStringTemplate/default.nix
index ddf5740d95a..0d9c34b890e 100644
--- a/pkgs/development/libraries/haskell/HStringTemplate/default.nix
+++ b/pkgs/development/libraries/haskell/HStringTemplate/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "HStringTemplate";
-  version = "0.6.2";
-  sha256 = "1d8ae847cb2b92f6d083ee1ed5db00c719e51fe43017d4289dea61335a116103";
+  version = "0.6.5";
+  sha256 = "e40b69e22900f381ca7fb080ea6e70d623e52e909bd7b896bc24e15c8e43252c";
   propagatedBuildInputs = [parsec time text utf8String parallel];
   meta = {
     description = "StringTemplate implementation in Haskell";
diff --git a/pkgs/development/libraries/haskell/HsSyck/default.nix b/pkgs/development/libraries/haskell/HsSyck/default.nix
new file mode 100644
index 00000000000..6b1681c6b37
--- /dev/null
+++ b/pkgs/development/libraries/haskell/HsSyck/default.nix
@@ -0,0 +1,10 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "HsSyck";
+  version = "0.45";
+  sha256 = "67d02a892cd4535a02cc3ebf7b6e9f898a64428ec6783488875ac694d7fafb79";
+  meta = {
+    description = "Fast, lightweight YAML loader and dumper";
+  };
+})
diff --git a/pkgs/development/libraries/haskell/SMTPClient/default.nix b/pkgs/development/libraries/haskell/SMTPClient/default.nix
index 2da9beea525..45c8d4aeaee 100644
--- a/pkgs/development/libraries/haskell/SMTPClient/default.nix
+++ b/pkgs/development/libraries/haskell/SMTPClient/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "SMTPClient";
-  version = "1.0.2";
-  sha256 = "b835cebf22e9281778deeec3ceffeb95aa8ae9c0e1f97e8e9734cf5d87ecba5f";
+  version = "1.0.3";
+  sha256 = "c9907834565b5b712d50c50823513675b982c8b51e7b95680a3495eccb73ce66";
   propagatedBuildInputs = [hsemail network];
   meta = {
     description = "A simple SMTP client library";
diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix
index 5bebdf7de35..4859a2ca0ee 100644
--- a/pkgs/development/libraries/haskell/gitit/default.nix
+++ b/pkgs/development/libraries/haskell/gitit/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self : {
   pname = "gitit";
-  version = "0.7.3.5";
-  sha256 = "50cf6b853d439904e54884660eba6ffdc31b938e077fd0d9457fba972d4bde9f";
+  version = "0.7.3.8";
+  sha256 = "356c82604dcfe2eec4faeb36ee46546ea3e26738780723f457366b2e35f6211a";
   propagatedBuildInputs = [
     HStringTemplate happstackServer happstackUtil HTTP SHA cgi datetime
     filestore highlightingKate safe
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-data.nix b/pkgs/development/libraries/haskell/happstack/happstack-data.nix
index 9b18652642f..de54b3ccac3 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-data.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-data.nix
@@ -1,10 +1,14 @@
-{cabal, mtl, sybWithClass, HaXml, happstackUtil, binary}:
+{cabal, mtl, sybWithClass, sybWithClassInstancesText, HaXml,
+ happstackUtil, binary, text}:
 
 cabal.mkDerivation (self : {
     pname = "happstack-data";
-    version = "0.4.1";
-    sha256 = "0d1f96472a4e13b9a5218bce8bf819a50d1773b7e110141ab235d1d7701e39f6";
-    propagatedBuildInputs = [mtl sybWithClass HaXml happstackUtil binary];
+    version = "0.5.0.2";
+    sha256 = "03795c24acc2268f39d38f18dd6cbfb92893f7de88b0443219d582a1eabdacd5";
+    propagatedBuildInputs = [
+        mtl sybWithClass sybWithClassInstancesText HaXml
+        happstackUtil binary text
+    ];
     meta = {
         description = "Happstack data manipulation libraries";
         license = "BSD";
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
index c1d66c0fabc..461137c933d 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
     pname = "happstack-server";
-    version = "0.4.1";
-    sha256 = "2a5d32b4e635160ffab8a90891d9c5ca0433969944ae4013ec8cebe25ba63658";
+    version = "0.5.0.2";
+    sha256 = "0184c835958bf9f29009a5aedd2c913bb1ad6ab60b80d9750849381c172dd6b6";
     propagatedBuildInputs = [
       HUnit HaXml MaybeT happstackData happstackUtil hslogger html
       mtl network parsec sendfile utf8String xhtml zlib
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-util.nix b/pkgs/development/libraries/haskell/happstack/happstack-util.nix
index 4ba0854d37a..cab41882514 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-util.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-util.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self : {
     pname = "happstack-util";
-    version = "0.4.1";
-    sha256 = "bb254140c30c39c420bc5a649da645f59df950f0a712c2dac4de1cc6572f05f9";
+    version = "0.5.0.2";
+    sha256 = "b6a84a55d6f7aec51095121a240bd6096b0df3c61c6fd25963d91190fcca4657";
     propagatedBuildInputs = [
       mtl hslogger HUnit QuickCheck strictConcurrency unixCompat
       SMTPClient
diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
index d6d69f398ba..48de0348609 100644
--- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix
+++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "highlighting-kate";
-  version = "0.2.6.2";
-  sha256 = "3ed163888d45d5bf5ee5c2931e894f6ca2eb167a79ac8274d7f57341c4c5dca7";
+  version = "0.2.7.1";
+  sha256 = "330c5fdc6b5dae62c12ee2455892319df12723346aa75401aea05ea0b24cf5ed";
   propagatedBuildInputs = [parsec pcreLight xhtml];
   meta = {
     description = "Syntax highlighting";
diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix
index de77d27c8b0..57b6cec24b5 100644
--- a/pkgs/development/libraries/haskell/pandoc/default.nix
+++ b/pkgs/development/libraries/haskell/pandoc/default.nix
@@ -3,13 +3,12 @@
 
 cabal.mkDerivation (self : {
   pname = "pandoc";
-  version = "1.5.1.1";
-  sha256 = "6d2283cb618fcaea5ee5cb885ef6532bc34628b351f14a6bd85b098d7a4128d9";
+  version = "1.6";
+  sha256 = "9b825233293edf1ea414b0e7ea821d6a914711dc2c60546566ab5a97512b079b";
   propagatedBuildInputs = [
     mtl network parsec utf8String xhtml zipArchive HTTP xml texmath
   ];
   meta = {
     description = "Conversion between markup formats";
   };
-})  
-
+})
diff --git a/pkgs/development/libraries/haskell/sendfile/default.nix b/pkgs/development/libraries/haskell/sendfile/default.nix
index f35719d75f4..801257cc4e5 100644
--- a/pkgs/development/libraries/haskell/sendfile/default.nix
+++ b/pkgs/development/libraries/haskell/sendfile/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "sendfile";
-  version = "0.6.1";
-  sha256 = "c21b7f0f9a03a5e6d9b0691f5f0be9969d175f0514becdc199f0fd49097e51a2";
+  version = "0.6.2";
+  sha256 = "2d7bf7fdcae7e2ffa24bf70bc1bdc7ea4e6b1726f6cee63cd14c2eeb5545749a";
   propagatedBuildInputs = [network];
   meta = {
     description = "A portable sendfile library";
diff --git a/pkgs/development/libraries/haskell/strictConcurrency/default.nix b/pkgs/development/libraries/haskell/strictConcurrency/default.nix
index 5e90fd74e1a..91ba2d94886 100644
--- a/pkgs/development/libraries/haskell/strictConcurrency/default.nix
+++ b/pkgs/development/libraries/haskell/strictConcurrency/default.nix
@@ -1,10 +1,10 @@
-{cabal, parallel}:
+{cabal, parallel, deepseq}:
 
 cabal.mkDerivation (self : {
   pname = "strict-concurrency";
-  version = "0.2.3";
-  sha256 = "21641b983b226e47727ff565184a5f2b312c7979ff487a5e478f5cfc82f78f18";
-  propagatedBuildInputs = [parallel];
+  version = "0.2.4.1";
+  sha256 = "0939212dd0cc3b9bd228dfbb233d9eccad22ca626752d9bad8026ceb0a5c1a89";
+  propagatedBuildInputs = [parallel deepseq];
   meta = {
     description = "Strict concurrency abstractions";
   };
diff --git a/pkgs/development/libraries/haskell/syb/syb-with-class-instances-text.nix b/pkgs/development/libraries/haskell/syb/syb-with-class-instances-text.nix
new file mode 100644
index 00000000000..f295e489402
--- /dev/null
+++ b/pkgs/development/libraries/haskell/syb/syb-with-class-instances-text.nix
@@ -0,0 +1,11 @@
+{cabal, sybWithClass, text}:
+
+cabal.mkDerivation (self : {
+  pname = "syb-with-class-instances-text";
+  version = "0.0.1";
+  sha256 = "0e0aa90c02cbe76380274830be51e04cb3cc13d5ea5761ba5540779bd0c4d76e";
+  propagatedBuildInputs = [sybWithClass text];
+  meta = {
+    description = "Scrap Your Boilerplate With Class";
+  };
+})
diff --git a/pkgs/development/libraries/haskell/syb/syb-with-class.nix b/pkgs/development/libraries/haskell/syb/syb-with-class.nix
index e6ea92a169e..dfd7d194635 100644
--- a/pkgs/development/libraries/haskell/syb/syb-with-class.nix
+++ b/pkgs/development/libraries/haskell/syb/syb-with-class.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "syb-with-class";
-  version = "0.6";
-  sha256 = "8ee836b491b0f64ab0920d1a7314323439665a7b1afa78810cbbc95dc658bfdc";
+  version = "0.6.1";
+  sha256 = "72cf0a98862181fea81b77c11f35efd22eafa29107f3acd624fd08be68ed850b";
   meta = {
     description = "Scrap Your Boilerplate With Class";
   };
diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix
index 66369cb60ba..623f86ee3fd 100644
--- a/pkgs/development/libraries/haskell/texmath/default.nix
+++ b/pkgs/development/libraries/haskell/texmath/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "texmath";
-  version = "0.2.0.3";
-  sha256 = "d355a298d28b9f5356926c2d2942f28ed07afa9d944cadfa47d8cdec73725b55";
+  version = "0.3.0.2";
+  sha256 = "8d2bb26fc5aab09ae92d2c194ec39acb4e04c054ad2caf1a1db0dc9b53b4b1d4";
   propagatedBuildInputs = [cgi json parsec xml];
   meta = {
     description = "Conversion of LaTeX math formulas to MathML";
diff --git a/pkgs/development/libraries/haskell/yst/default.nix b/pkgs/development/libraries/haskell/yst/default.nix
new file mode 100644
index 00000000000..30fa46b0ffb
--- /dev/null
+++ b/pkgs/development/libraries/haskell/yst/default.nix
@@ -0,0 +1,14 @@
+{cabal, HStringTemplate, csv, pandoc, parsec, split, utf8String, xhtml, HsSyck}:
+
+cabal.mkDerivation (self : {
+  pname = "yst";
+  version = "0.2.3.2";
+  sha256 = "b857e70db67d708e2edb61a1d6bc4eaff3abd2bc252b3605f66bf1760da4da4b";
+  propagatedBuildInputs = [
+    HStringTemplate csv pandoc parsec split utf8String xhtml HsSyck
+  ];
+  meta = {
+    description =
+      "Builds a static website from templates and data in YAML or CSV files";
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 0bba75bb71d..b33b842c964 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -315,6 +315,8 @@ rec {
 
   hsemail = callPackage ../development/libraries/haskell/hsemail {};
 
+  HsSyck = callPackage ../development/libraries/haskell/HsSyck {};
+
   HStringTemplate = callPackage ../development/libraries/haskell/HStringTemplate {};
 
   hspread = callPackage ../development/libraries/haskell/hspread {};
@@ -491,6 +493,8 @@ rec {
 
   sybWithClass = callPackage ../development/libraries/haskell/syb/syb-with-class.nix {};
 
+  sybWithClassInstancesText = callPackage ../development/libraries/haskell/syb/syb-with-class-instances-text.nix {};
+
   SDLImage = callPackage ../development/libraries/haskell/SDL-image {
     inherit (pkgs) SDL_image;
   };
@@ -625,6 +629,8 @@ rec {
 
   xml = callPackage ../development/libraries/haskell/xml {};
 
+  yst = callPackage ../development/libraries/haskell/yst {};
+
   zipArchive = callPackage ../development/libraries/haskell/zip-archive {};
 
   zipper = callPackage ../development/libraries/haskell/zipper {};

From 9534550af581466736a6f15a2c1f91460b071935 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Tue, 7 Sep 2010 13:11:21 +0000
Subject: [PATCH 082/181] gitit should now work with ghc-6.12.3

svn path=/nixpkgs/trunk/; revision=23671
---
 pkgs/top-level/release.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 180a4edca8e..3b73414f878 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -409,7 +409,7 @@ with (import ./release-lib.nix);
   haskellPackages_ghc6104 = {
     darcs = ghcSupported;
     ghc = ghcSupported;
-    gitit = linux;
+    # gitit = linux;
     gtk2hs = linux;
     leksah = linux;
     haskellPlatform_2009_2_0_2 = ghcSupported;
@@ -431,6 +431,7 @@ with (import ./release-lib.nix);
   haskellPackages_ghc6123 = {
     darcs = ghcSupported;
     ghc = ghcSupported;
+    gitit = linux;
     haskellPlatform_2010_2_0_0 = ghcSupported;
     lhs2tex = ghcSupported;
     xmonad = linux;

From 07cabc717b60b6ad8a92f3f6e4d783c8dc29ad0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Tue, 7 Sep 2010 13:40:02 +0000
Subject: [PATCH 083/181] Version bump for uu-parsinglib.

svn path=/nixpkgs/trunk/; revision=23673
---
 pkgs/development/libraries/haskell/uu-parsinglib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix
index 1967bec9e07..26b6176fc6d 100644
--- a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix
+++ b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "uu-parsinglib";
-  version = "2.5.4.2";
-  sha256 = "94f8f3f7e64dd87a4930190f922a07014e21e3cc320ba1ffefdae7db4401bfcd";
+  version = "2.5.5";
+  sha256 = "132f73b11f87a41aad7331b27d0aa5caa7b931381a88d114c91b700096d6c3f4";
   meta = {
     description = "New version of the Utrecht University parser combinator library";
   };

From a074da499cb3d1165184f3e10ac32f34ce29cfc7 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 7 Sep 2010 14:33:46 +0000
Subject: [PATCH 084/181] vm/default.nix: updating debian lenny hashes

svn path=/nixpkgs/trunk/; revision=23674
---
 pkgs/build-support/vm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 7333582b7f5..b626a61ac68 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -1117,7 +1117,7 @@ rec {
       fullName = "Debian 5.0.5 Lenny (i386)";
       packagesList = fetchurl {
         url = mirror://debian/dists/lenny/main/binary-i386/Packages.bz2;
-        sha256 = "cd8158a16c1d3990d35116dfe88005fe685102f591268f8588d3222a02a11339";
+        sha256 = "df450198f1597b526281e507e858f614ceafbd1b4f047c8ed994648f3e2ece19";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;
@@ -1128,7 +1128,7 @@ rec {
       fullName = "Debian 5.0.5 Lenny (amd64)";
       packagesList = fetchurl {
         url = mirror://debian/dists/lenny/main/binary-amd64/Packages.bz2;
-        sha256 = "aceb161a534a641c205fca7eabb27d60180c0616104be49562a0997a44571c42";
+        sha256 = "1817h2ag6fmrlifh1b9kv3zjr5ghknf53f38s1rqwfq6vh0avsig";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;

From 14a8df0615f669a5f9a9641b86c0aadf3125b4bf Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 8 Sep 2010 09:56:40 +0000
Subject: [PATCH 085/181] kdepimlibs-4.5.1

svn path=/nixpkgs/trunk/; revision=23680
---
 pkgs/desktops/kde-4.5/kde-package/manifest.nix | 4 ++++
 pkgs/desktops/kde-4.5/pimlibs/default.nix      | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/kde-4.5/kde-package/manifest.nix b/pkgs/desktops/kde-4.5/kde-package/manifest.nix
index 45c154efe42..294f14dab5b 100644
--- a/pkgs/desktops/kde-4.5/kde-package/manifest.nix
+++ b/pkgs/desktops/kde-4.5/kde-package/manifest.nix
@@ -104,4 +104,8 @@ builtins.listToAttrs
   name = "kdeaccessibility-4.5.1.tar.bz2";
   value = "0jdd3n61lhabzs2dv6rfv6ksp7cqn5wpj6f2d8z33c354y9lqw24";
 }
+{
+  name = "kdepimlibs-4.5.1.tar.bz2";
+  value = "1dlxnxxay6wbwgcfbkq0xak9z0h1bkh6rvysjx3djmawmwi5aw6b";
+}
 ]
diff --git a/pkgs/desktops/kde-4.5/pimlibs/default.nix b/pkgs/desktops/kde-4.5/pimlibs/default.nix
index 55a5ef29adf..6fd40b85af7 100644
--- a/pkgs/desktops/kde-4.5/pimlibs/default.nix
+++ b/pkgs/desktops/kde-4.5/pimlibs/default.nix
@@ -11,7 +11,7 @@ kde.package {
     license = "LGPL";
     kde = {
       name = "kdepimlibs";
-      version = "4.5.0";
+      version = "4.5.1";
     };
   };
 }

From 40a7243ed3f5d8cef6af2b0450bffdd31326dd2c Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 8 Sep 2010 09:56:46 +0000
Subject: [PATCH 086/181] ruby: upgrade, optional docs

svn path=/nixpkgs/trunk/; revision=23681
---
 .../development/interpreters/ruby/default.nix | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 43d0915c1f0..12f4759f85d 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -1,27 +1,35 @@
-{ stdenv, fetchurl, ncurses, readline
-, zlib ? null
-, openssl ? null
-, gdbm ? null
+{ stdenv, fetchurl
+, zlib, zlibSupport ? true
+, openssl, opensslSupport ? true
+, gdbm, gdbmSupport ? true
+, ncurses, readline, cursesSupport ? false
+, groff, docSupport ? false
 }:
 
+let
+  op = stdenv.lib.optional;
+  ops = stdenv.lib.optionals;
+in
+
 stdenv.mkDerivation rec {
-  version = "1.8.7-p299";
+  version = "1.8.7-p302";
   
   name = "ruby-${version}";
   
   src = fetchurl {
     url = "ftp://ftp.ruby-lang.org/pub/ruby/1.8/${name}.tar.gz";
-    sha256 = "0ys2lpri2w3174axhi96vq17lrvk2ngj7f2m42a9008a7n79rj9j";
+    sha256 = "18a4w0n1n0sij7gkb3196dnqav5zr0c5p26f08k7cw6y0i9dz0sq";
   };
 
-  buildInputs = [ncurses readline]
-    ++ (stdenv.lib.optional (zlib != null) zlib)
-    ++ (stdenv.lib.optional (openssl != null) openssl)
-    ++ (stdenv.lib.optional (gdbm != null) gdbm);
+  buildInputs = (ops cursesSupport [ ncurses readline ] )
+    ++ (op docSupport groff )
+    ++ (op zlibSupport zlib)
+    ++ (op opensslSupport openssl)
+    ++ (op gdbmSupport gdbm);
     
   configureFlags = ["--enable-shared" "--enable-pthread"];
 
-  # NIX_LDFLAGS = "-lpthread -lutil";
+  installFlags = stdenv.lib.optionalString docSupport "install-doc";
 
   meta = {
     license = "Ruby";

From 17c70d3efdf63c7ca70286b2cdce72846f4ddce1 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 8 Sep 2010 09:56:53 +0000
Subject: [PATCH 087/181] Mass rubygems update

* Upgrade to rubygems-1.3.7
* Upgrade all gems
* Add rails3

svn path=/nixpkgs/trunk/; revision=23682
---
 pkgs/development/interpreters/ruby/gems.nix |   6 +-
 pkgs/development/interpreters/ruby/libs.nix | 722 ++++++++++++++++----
 2 files changed, 589 insertions(+), 139 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/gems.nix b/pkgs/development/interpreters/ruby/gems.nix
index cf8232d5ffe..d979fbe2d19 100644
--- a/pkgs/development/interpreters/ruby/gems.nix
+++ b/pkgs/development/interpreters/ruby/gems.nix
@@ -4,10 +4,10 @@ rec {
   # some packages (eg ruby-debug) still require 1.8. So let's stick to that for
   # now if nobody has different requirements
 
-  version = "1.3.5";
+  version = "1.3.7";
   src = fetchurl {
-    url = "http://rubyforge.org/frs/download.php/60718/rubygems-1.3.5.tgz";
-    sha256 = "1b26fn9kmyd6394m1gqppi10xyf1hac85lvsynsxzpjlmv0qr4n0";
+    url = "http://production.cf.rubygems.org/rubygems/${name}.tgz";
+    sha256 = "17bwlqxqrjrial111rn395yjx9wyxrmvmj0hgd85bxkkcap912rq";
   };
 
 
diff --git a/pkgs/development/interpreters/ruby/libs.nix b/pkgs/development/interpreters/ruby/libs.nix
index 7f128c4322c..e2a0d635d75 100644
--- a/pkgs/development/interpreters/ruby/libs.nix
+++ b/pkgs/development/interpreters/ruby/libs.nix
@@ -35,6 +35,11 @@ let libs =
       sup = {
         buildInputs = [ pkgs.ncurses pkgs.xapianBindings libs.ncursesw ];
       };
+      sqlite3_ruby = { propagatedBuildInputs = [ pkgs.sqlite ]; };
+      rails = {
+        gemFlags = "--no-ri --no-rdoc";
+        propagatedBuildInputs = [ libs.mime_types libs.rake ];
+      };
       ncurses = { buildInputs = [ pkgs.ncurses ]; };
       ncursesw = { buildInputs = [ pkgs.ncurses ]; };
       nokogiri = {
@@ -42,38 +47,20 @@ let libs =
                     "--with-xslt-dir=${pkgs.libxslt}" ];
       };
 
-      gemcutter = {
-        propagatedBuildInputs = [ libs.rubygems_update ];
-      };
-
       ffi = {
         postUnpack = "onetuh";
-        propagatedBuildInputs = [ libs.rake  libs.rubygems_update ];
+        propagatedBuildInputs = [ libs.rake ];
         buildFlags=["--with-ffi-dir=${pkgs.libffi}"];
         NIX_POST_EXTRACT_FILES_HOOK = patchUsrBinEnv;
       };
 
-      rake = {
-        propagatedBuildInputs = [ libs.rubygems_update ];
-      };
- 
-      rubygems_update = {
-        # gems is using --env-shebang by default
-        # replace env lines by $out/../bin/env
-        postInstall = ''
-          cd $out/gems/*;
-          patch -p 1 < ${./gem_nix_command.patch}; echo
-          find $out -type f -name "*.rb" | xargs sed -i "s@/usr/bin/env@$(type -p env)@g"
-        '';
-      };
-
       xrefresh_server =
       let patch = fetchurl {
           url = "http://mawercer.de/~nix/xrefresh.diff.gz";
           sha256 = "1f7bnmn1pgkmkml0ms15m5lx880hq2sxy7vsddb3sbzm7n1yyicq";
         };
       in {
-        propagatedBuildInputs = [ libs.rb_inotify libs.rubygems_update ];
+        propagatedBuildInputs = [ libs.rb_inotify ];
 
         # monitor implementation for Linux
         postInstall = ''
@@ -100,7 +87,7 @@ let libs =
               ensureDir "$out/nix-support"
               export HOME=$TMP/home; mkdir "$HOME"
 
-              gem install --ignore-dependencies --env-shebang -E -i "$out" "$src" -- $buildFlags
+              gem install -V --ignore-dependencies -E -i "$out" "$src" $gemFlags -- $buildFlags
               rm -fr $out/cache # don't keep the .gem file here
 
               THIS_RUBY_LIB=$(echo $out/gems/*/lib)
@@ -110,7 +97,9 @@ let libs =
                 declare -A RUBYLIB_HASH # using bash4 hashs
                 declare -A GEM_PATH_HASH # using bash4 hashs
 
-                RUBYLIB_HASH["$THIS_RUBY_LIB"]=
+                if [ -n "$THIS_RUBY_LIB" ]; then
+                  RUBYLIB_HASH["$THIS_RUBY_LIB"]=
+                fi
                 for path in \''${!RUBYLIB_HASH[@]}; do
                   export RUBYLIB=\''${RUBYLIB}\''${RUBYLIB:+:}\$path
                 done
@@ -141,7 +130,6 @@ let libs =
                 chmod +x "$t"
               done
 
-
               runHook postInstall
             '';
 
@@ -155,22 +143,38 @@ let libs =
 
   # ================ START automatically generated code ================
          # WARNING: automatically generated CODE
-         # This section has been generated by gem nix sup chronic rubygems-update xrefresh-server rb-inotify jeweler ncursesw
+         # This section has been generated by gem nix sup chronic rubygems-update xrefresh-server rb-inotify jeweler ncursesw sqlite3-ruby rails haml bundler rake rails3-generators
          # the gem nix command has been added by a nix patch to ruby gems
       
-  json_pure_1_2_4 = rubyDerivation {
-     name = "ruby-json_pure-1.2.4"; # full_name
-     nameNoVersion = "json_pure";
+  rails3_generators_0_13_0 = rubyDerivation {
+     name = "ruby-rails3-generators-0.13.0"; # full_name
+     nameNoVersion = "rails3_generators";
      propagatedBuildInputs = [  ];
      src = fetchurl {
-       url = "http://gems.rubyforge.org/gems/json_pure-1.2.4.gem";
-       sha256 = "1j3lwa20659qb5rvsnzxd6qlr0m56fyppgdhxc7v4phdsw3im4bp";
+       url = "http://gems.rubyforge.org/gems/rails3-generators-0.13.0.gem";
+       sha256 = "0g7qylily8dkllyy201kgyczm303dmg5r64zy49isccq63iq6k3c";
      };
      meta = {
-       homepage = "http://flori.github.com/json";
+       homepage = "http://github.com/indirect/rails3-generators";
        license = []; # one of ?
-       description = "This is a JSON implementation in pure Ruby[...]";
-       longDescription = "This is a JSON implementation in pure Ruby.";
+       description = "Rails 3 compatible generators for DataMapper, Factory-girl, Authlogic, Mongomapper, Mongoid, Shoulda, Formtastic and Simp"; # cut to 120 chars
+       longDescription = "Rails 3 compatible generators for DataMapper, Factory-girl, Authlogic, Mongomapper, Mongoid, Shoulda, Formtastic and SimpleForm";
+     };
+  };
+
+  builder_2_1_2 = rubyDerivation {
+     name = "ruby-builder-2.1.2"; # full_name
+     nameNoVersion = "builder";
+     propagatedBuildInputs = [  ];
+     src = fetchurl {
+       url = "http://gems.rubyforge.org/gems/builder-2.1.2.gem";
+       sha256 = "0hp5gsvp63mqqvi7dl95zwci916vj6l1slgz4crip1rijk3v2806";
+     };
+     meta = {
+       homepage = "http://onestepback.org";
+       license = []; # one of ?
+       description = "Builder provides a number of builder objects that make creating structured data simple to do[...]";
+       longDescription = "Builder provides a number of builder objects that make creating structured data simple to do.  Currently the following builder objects are supported:  * XML Markup * XML Events";
      };
   };
 
@@ -190,6 +194,101 @@ let libs =
      };
   };
 
+  haml_3_0_18 = rubyDerivation {
+     name = "ruby-haml-3.0.18"; # full_name
+     nameNoVersion = "haml";
+     propagatedBuildInputs = [  ];
+     src = fetchurl {
+       url = "http://gems.rubyforge.org/gems/haml-3.0.18.gem";
+       sha256 = "1bi951vk6fkxcc4dakwmcgbqf72zhr5bna9p8a4q4ajn3arvnq7y";
+     };
+     meta = {
+       homepage = "http://haml-lang.com/";
+       license = []; # one of ?
+       description = "      Haml (HTML Abstraction Markup Language) is a layer on top of XHTML or XML       that's designed to express the stru"; # cut to 120 chars
+       longDescription = "      Haml (HTML Abstraction Markup Language) is a layer on top of XHTML or XML
+      that's designed to express the structure of XHTML or XML documents
+      in a non-repetitive, elegant, easy way,
+      using indentation rather than closing tags
+      and allowing Ruby to be embedded with ease.
+      It was originally envisioned as a plugin for Ruby on Rails,
+      but it can function as a stand-alone templating engine.
+";
+     };
+  };
+
+  polyglot_0_3_1 = rubyDerivation {
+     name = "ruby-polyglot-0.3.1"; # full_name
+     nameNoVersion = "polyglot";
+     propagatedBuildInputs = [  ];
+     src = fetchurl {
+       url = "http://gems.rubyforge.org/gems/polyglot-0.3.1.gem";
+       sha256 = "1shk5hqnz7hg14y2ms16mcwd2p546wq57pci5m26qg64m28gz4xg";
+     };
+     meta = {
+       homepage = "http://polyglot.rubyforge.org";
+       license = []; # one of ?
+       description = "Allows custom language loaders for specified file extensions to be hooked into require[...]";
+       longDescription = "Allows custom language loaders for specified file extensions to be hooked into require";
+     };
+  };
+
+  arel_1_0_1 = rubyDerivation {
+     name = "ruby-arel-1.0.1"; # full_name
+     nameNoVersion = "arel";
+     propagatedBuildInputs = [  ];
+     src = fetchurl {
+       url = "http://gems.rubyforge.org/gems/arel-1.0.1.gem";
+       sha256 = "117j8z0clq8001jqk4aajq3whxzn5fan4ivdsbjvcdba2wfhd7z0";
+     };
+     meta = {
+       homepage = "http://github.com/brynary/arel";
+       license = []; # one of ?
+       description = "Arel is a Relational Algebra for Ruby of SQL queries and it 2) adapts to various RDBMS systems. It is intended to be a fr"; # cut to 120 chars
+       longDescription = "Arel is a Relational Algebra for Ruby. It 1) simplifies the generation complex
+of SQL queries and it 2) adapts to various RDBMS systems. It is intended to be
+a framework framework; that is, you can build your own ORM with it, focusing on
+innovative object and collection modeling as opposed to database compatibility
+and query generation.";
+     };
+  };
+
+  abstract_1_0_0 = rubyDerivation {
+     name = "ruby-abstract-1.0.0"; # full_name
+     nameNoVersion = "abstract";
+     propagatedBuildInputs = [  ];
+     src = fetchurl {
+       url = "http://gems.rubyforge.org/gems/abstract-1.0.0.gem";
+       sha256 = "1gizb9kzwf3c6xip7fwa818b98c72x4jlhbm808s5pwdjbqw3h9k";
+     };
+     meta = {
+       homepage = "http://rubyforge.org/projects/abstract";
+       license = []; # one of ?
+       description = "'abstract[...]";
+       longDescription = "'abstract.rb' is a library which enable you to define abstract method in Ruby.";
+     };
+  };
+
+  sqlite3_ruby_1_3_1 = rubyDerivation {
+     name = "ruby-sqlite3-ruby-1.3.1"; # full_name
+     nameNoVersion = "sqlite3_ruby";
+     propagatedBuildInputs = [  ];
+     src = fetchurl {
+       url = "http://gems.rubyforge.org/gems/sqlite3-ruby-1.3.1.gem";
+       sha256 = "17ci8jgnzda091my53x0qnapy673fx55fd1agf5xdkylzwb00v9q";
+     };
+     meta = {
+       homepage = "http://github.com/luislavena/sqlite3-ruby";
+       license = []; # one of ?
+       description = "This module allows Ruby programs to interface with the SQLite3 database engine (http://www SQLite engine installed in ord"; # cut to 120 chars
+       longDescription = "This module allows Ruby programs to interface with the SQLite3
+database engine (http://www.sqlite.org).  You must have the
+SQLite engine installed in order to build this module.
+
+Note that this module is NOT compatible with SQLite 2.x.";
+     };
+  };
+
   git_1_2_5 = rubyDerivation {
      name = "ruby-git-1.2.5"; # full_name
      nameNoVersion = "git";
@@ -206,65 +305,54 @@ let libs =
      };
   };
 
-  json_1_2_4 = rubyDerivation {
-     name = "ruby-json-1.2.4"; # full_name
-     nameNoVersion = "json";
-     propagatedBuildInputs = [  ];
+  rails_3_0_0 = rubyDerivation {
+     name = "ruby-rails-3.0.0"; # full_name
+     nameNoVersion = "rails";
+     propagatedBuildInputs = [ activesupport_3_0_0 actionpack_3_0_0 activerecord_3_0_0 activeresource_3_0_0 actionmailer_3_0_0 railties_3_0_0 bundler_1_0_0 ];
      src = fetchurl {
-       url = "http://gems.rubyforge.org/gems/json-1.2.4.gem";
-       sha256 = "1wdj91bl7xabgkwpz285b8086v5898x72h4lxl11n750652mrrax";
+       url = "http://gems.rubyforge.org/gems/rails-3.0.0.gem";
+       sha256 = "1zjyijz5814vv1l5j4si66fcvf17jkfh6336mr4xh9vx0wa2r6js";
      };
      meta = {
-       homepage = "http://flori.github.com/json";
+       homepage = "http://www.rubyonrails.org";
        license = []; # one of ?
-       description = "This is a JSON implementation as a Ruby extension in C[...]";
-       longDescription = "This is a JSON implementation as a Ruby extension in C.";
+       description = "Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity[...]";
+       longDescription = "Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.";
      };
   };
 
-  rubygems_update_1_3_6 = rubyDerivation {
-     name = "ruby-rubygems-update-1.3.6"; # full_name
-     nameNoVersion = "rubygems_update";
-     propagatedBuildInputs = [  ];
+  treetop_1_4_8 = rubyDerivation {
+     name = "ruby-treetop-1.4.8"; # full_name
+     nameNoVersion = "treetop";
+     propagatedBuildInputs = [ polyglot_0_3_1 ];
      src = fetchurl {
-       url = "http://gems.rubyforge.org/gems/rubygems-update-1.3.6.gem";
-       sha256 = "1fqbm9hmy3skj9s98v8k0qghdmli7kv84wlm0m4grsrdn26xw14l";
+       url = "http://gems.rubyforge.org/gems/treetop-1.4.8.gem";
+       sha256 = "10cg8dp4ljm6gfsdx9x20kk5c2vrmw5y25dfsy7s0pxn60f3s6qg";
      };
      meta = {
-       homepage = "http://rubygems.org/";
+       homepage = "http://functionalform.blogspot.com";
        license = []; # one of ?
-       description = "RubyGems is a package management framework for Ruby  This gem is an update for the RubyGems software. You must have an in"; # cut to 120 chars
-       longDescription = "RubyGems is a package management framework for Ruby.
+       description = "[...]";
+       longDescription = "";
+     };
+  };
 
-This gem is an update for the RubyGems software. You must have an
-installation of RubyGems before this update can be applied.
-
-See Gem for information on RubyGems (or `ri Gem`)
-
-To upgrade to the latest RubyGems, run:
-
-  $ gem update --system  # you might need to be an administrator or root
-
-NOTE:  RubyGems 1.1 and 1.2 have problems upgrading when there is no
-rubygems-update installed.  You will need to use the following instructions
-if you see \"Nothing to update\".
-
-If you have an older version of RubyGems installed, then you can still
-do it in two steps:
-
-  $ gem install rubygems-update  # again, might need to be admin/root
-  $ update_rubygems              # ... here too
-
-If you don't have any RubyGems install, there is still the pre-gem approach to
-getting software, doing it manually:
-
-1. Download from: http://rubyforge.org/frs/?group_id=126
-2. Unpack into a directory and cd there
-3. Install with: ruby setup.rb  # you may need admin/root privilege
-
-For more details and other options, see:
-
-  ruby setup.rb --help";
+  rack_test_0_5_4 = rubyDerivation {
+     name = "ruby-rack-test-0.5.4"; # full_name
+     nameNoVersion = "rack_test";
+     propagatedBuildInputs = [  ];
+     src = fetchurl {
+       url = "http://gems.rubyforge.org/gems/rack-test-0.5.4.gem";
+       sha256 = "0afkvjq45v61j2y3k9dfi4r6fnj26b4ky1ggn7sdk5asq7v6dmzx";
+     };
+     meta = {
+       homepage = "http://github.com/brynary/rack-test";
+       license = []; # one of ?
+       description = "Rack::Test is a small, simple testing API for Rack apps own or as a reusable starting point for Web frameworks and testin"; # cut to 120 chars
+       longDescription = "Rack::Test is a small, simple testing API for Rack apps. It can be used on its
+own or as a reusable starting point for Web frameworks and testing libraries
+to build on. Most of its initial functionality is an extraction of Merb 1.0's
+request helpers feature.";
      };
   };
 
@@ -316,6 +404,38 @@ For more details and other options, see:
      };
   };
 
+  i18n_0_4_1 = rubyDerivation {
+     name = "ruby-i18n-0.4.1"; # full_name
+     nameNoVersion = "i18n";
+     propagatedBuildInputs = [  ];
+     src = fetchurl {
+       url = "http://gems.rubyforge.org/gems/i18n-0.4.1.gem";
+       sha256 = "0haw8102610j2vydr52y64w2dqav6amda0ddwy6vp09rr6prazkq";
+     };
+     meta = {
+       homepage = "http://github.com/svenfuchs/i18n";
+       license = []; # one of ?
+       description = "New wave Internationalization support for Ruby[...]";
+       longDescription = "New wave Internationalization support for Ruby.";
+     };
+  };
+
+  ncursesw_1_2_4_1 = rubyDerivation {
+     name = "ruby-ncursesw-1.2.4.1"; # full_name
+     nameNoVersion = "ncursesw";
+     propagatedBuildInputs = [  ];
+     src = fetchurl {
+       url = "http://gems.rubyforge.org/gems/ncursesw-1.2.4.1.gem";
+       sha256 = "0cn13h14pk8yds8aklpdcpzl0z6rqifpmaz4lw29g10lgwvfv409";
+     };
+     meta = {
+       homepage = "http://ncurses-ruby.berlios.de/";
+       license = []; # one of ?
+       description = "Hacked up version of ncurses gem that supports wide characters and ruby1[...]";
+       longDescription = "Hacked up version of ncurses gem that supports wide characters and ruby1.9.1. Original ncurses gem by t-peters@users.berlios.de.";
+     };
+  };
+
   ffi_0_6_3 = rubyDerivation {
      name = "ruby-ffi-0.6.3"; # full_name
      nameNoVersion = "ffi";
@@ -352,6 +472,52 @@ using Ruby-FFI here[http://wiki.github.com/ffi/ffi/why-use-ffi].";
      };
   };
 
+  rubygems_update_1_3_7 = rubyDerivation {
+     name = "ruby-rubygems-update-1.3.7"; # full_name
+     nameNoVersion = "rubygems_update";
+     propagatedBuildInputs = [  ];
+     src = fetchurl {
+       url = "http://gems.rubyforge.org/gems/rubygems-update-1.3.7.gem";
+       sha256 = "0378s1nvxmmwrl8l7yx9xglm5ks1lsdjr0ms3wx127q5hm07szdg";
+     };
+     meta = {
+       homepage = "http://rubygems.org/";
+       license = []; # one of ?
+       description = "RubyGems is a package management framework for Ruby  This gem is an update for the RubyGems software. You must have an in"; # cut to 120 chars
+       longDescription = "RubyGems is a package management framework for Ruby.
+
+This gem is an update for the RubyGems software. You must have an
+installation of RubyGems before this update can be applied.
+
+See Gem for information on RubyGems (or `ri Gem`)
+
+To upgrade to the latest RubyGems, run:
+
+  $ gem update --system  # you might need to be an administrator or root
+
+NOTE:  RubyGems 1.1 and 1.2 have problems upgrading when there is no
+rubygems-update installed.  You will need to use the following instructions
+if you see \"Nothing to update\".
+
+If you have an older version of RubyGems installed, then you can still
+do it in two steps:
+
+  $ gem install rubygems-update  # again, might need to be admin/root
+  $ update_rubygems              # ... here too
+
+If you don't have any RubyGems install, there is still the pre-gem approach to
+getting software, doing it manually:
+
+1. Download from: http://rubyforge.org/frs/?group_id=126
+2. Unpack into a directory and cd there
+3. Install with: ruby setup.rb  # you may need admin/root privilege
+
+For more details and other options, see:
+
+  ruby setup.rb --help";
+     };
+  };
+
   trollop_1_16_2 = rubyDerivation {
      name = "ruby-trollop-1.16.2"; # full_name
      nameNoVersion = "trollop";
@@ -372,6 +538,54 @@ specify.";
      };
   };
 
+  railties_3_0_0 = rubyDerivation {
+     name = "ruby-railties-3.0.0"; # full_name
+     nameNoVersion = "railties";
+     propagatedBuildInputs = [  thor_0_14_0   ];
+     src = fetchurl {
+       url = "http://gems.rubyforge.org/gems/railties-3.0.0.gem";
+       sha256 = "0zj216hvs7yjlhjk0066d5rlm1csf2rarxx6c9bpxrmabnw1rb93";
+     };
+     meta = {
+       homepage = "http://www.rubyonrails.org";
+       license = []; # one of ?
+       description = "Rails internals: application bootup, plugins, generators, and rake tasks[...]";
+       longDescription = "Rails internals: application bootup, plugins, generators, and rake tasks.";
+     };
+  };
+
+  rack_mount_0_6_13 = rubyDerivation {
+     name = "ruby-rack-mount-0.6.13"; # full_name
+     nameNoVersion = "rack_mount";
+     propagatedBuildInputs = [  ];
+     src = fetchurl {
+       url = "http://gems.rubyforge.org/gems/rack-mount-0.6.13.gem";
+       sha256 = "133dwla6hq6a75m0la7cm26d5hvlsi02vm4lvph73d6kqazry0y6";
+     };
+     meta = {
+       homepage = "http://github.com/josh/rack-mount";
+       license = []; # one of ?
+       description = "Stackable dynamic tree based Rack router[...]";
+       longDescription = "Stackable dynamic tree based Rack router";
+     };
+  };
+
+  activemodel_3_0_0 = rubyDerivation {
+     name = "ruby-activemodel-3.0.0"; # full_name
+     nameNoVersion = "activemodel";
+     propagatedBuildInputs = [  builder_2_1_2 i18n_0_4_1 ];
+     src = fetchurl {
+       url = "http://gems.rubyforge.org/gems/activemodel-3.0.0.gem";
+       sha256 = "1dp18ifh658pgdkq8fd32yw3hi99wk5in2c7pb3mjyabg4zg5mv6";
+     };
+     meta = {
+       homepage = "http://www.rubyonrails.org";
+       license = []; # one of ?
+       description = "A toolkit for building modeling frameworks like Active Record and Active Resource[...]";
+       longDescription = "A toolkit for building modeling frameworks like Active Record and Active Resource. Rich support for attributes, callbacks, validations, observers, serialization, internationalization, and testing.";
+     };
+  };
+
   gettext_2_1_0 = rubyDerivation {
      name = "ruby-gettext-2.1.0"; # full_name
      nameNoVersion = "gettext";
@@ -407,10 +621,102 @@ specify.";
      };
   };
 
+  thor_0_14_0 = rubyDerivation {
+     name = "ruby-thor-0.14.0"; # full_name
+     nameNoVersion = "thor";
+     propagatedBuildInputs = [  ];
+     src = fetchurl {
+       url = "http://gems.rubyforge.org/gems/thor-0.14.0.gem";
+       sha256 = "115zxz418hmmsjk1sc2f19xzd74ap066qb7p1lh539q6zkalzrj1";
+     };
+     meta = {
+       homepage = "http://yehudakatz.com";
+       license = []; # one of ?
+       description = "A scripting framework that replaces rake, sake and rubigen[...]";
+       longDescription = "A scripting framework that replaces rake, sake and rubigen";
+     };
+  };
+
+  activerecord_3_0_0 = rubyDerivation {
+     name = "ruby-activerecord-3.0.0"; # full_name
+     nameNoVersion = "activerecord";
+     propagatedBuildInputs = [   arel_1_0_1  ];
+     src = fetchurl {
+       url = "http://gems.rubyforge.org/gems/activerecord-3.0.0.gem";
+       sha256 = "1l2662myqbay37xpssna149rgqjq0fq670f1hpagmh1nr0fziwlr";
+     };
+     meta = {
+       homepage = "http://www.rubyonrails.org";
+       license = []; # one of ?
+       description = "Databases on Rails[...]";
+       longDescription = "Databases on Rails. Build a persistent domain model by mapping database tables to Ruby classes. Strong conventions for associations, validations, aggregations, migrations, and testing come baked-in.";
+     };
+  };
+
+  actionpack_3_0_0 = rubyDerivation {
+     name = "ruby-actionpack-3.0.0"; # full_name
+     nameNoVersion = "actionpack";
+     propagatedBuildInputs = [  activemodel_3_0_0   rack_1_2_1 rack_test_0_5_4 rack_mount_0_6_13 tzinfo_0_3_23 erubis_2_6_6 ];
+     src = fetchurl {
+       url = "http://gems.rubyforge.org/gems/actionpack-3.0.0.gem";
+       sha256 = "1qjmx3alkinnfi9mdvzz3cfsfj20kf6iqvhwia167l45wqd14s7z";
+     };
+     meta = {
+       homepage = "http://www.rubyonrails.org";
+       license = []; # one of ?
+       description = "Web apps on Rails[...]";
+       longDescription = "Web apps on Rails. Simple, battle-tested conventions for building and testing MVC web applications. Works with any Rack-compatible server.";
+     };
+  };
+
+  erubis_2_6_6 = rubyDerivation {
+     name = "ruby-erubis-2.6.6"; # full_name
+     nameNoVersion = "erubis";
+     propagatedBuildInputs = [ abstract_1_0_0 ];
+     src = fetchurl {
+       url = "http://gems.rubyforge.org/gems/erubis-2.6.6.gem";
+       sha256 = "19yd2a4zb371b8vi11hv4p4s4s9yzp6924frc0ar9hv5kbw3nxvm";
+     };
+     meta = {
+       homepage = "http://www.kuwata-lab.com/erubis/";
+       license = []; # one of ?
+       description = "  Erubis is an implementation of eRuby and has the following features:    * Very fast, almost three times faster than ERB"; # cut to 120 chars
+       longDescription = "  Erubis is an implementation of eRuby and has the following features:
+
+  * Very fast, almost three times faster than ERB and about 10% faster than eruby.
+  * Multi-language support (Ruby/PHP/C/Java/Scheme/Perl/Javascript)
+  * Auto escaping support
+  * Auto trimming spaces around '&lt;% %&gt;'
+  * Embedded pattern changeable (default '&lt;% %&gt;')
+  * Enable to handle Processing Instructions (PI) as embedded pattern (ex. '&lt;?rb ... ?&gt;')
+  * Context object available and easy to combine eRuby template with YAML datafile
+  * Print statement available
+  * Easy to extend and customize in subclass
+  * Ruby on Rails support
+";
+     };
+  };
+
+  json_pure_1_4_6 = rubyDerivation {
+     name = "ruby-json_pure-1.4.6"; # full_name
+     nameNoVersion = "json_pure";
+     propagatedBuildInputs = [  ];
+     src = fetchurl {
+       url = "http://gems.rubyforge.org/gems/json_pure-1.4.6.gem";
+       sha256 = "0cd6a97nk8m7yqm0lxbgs63yxlnk4mhbmpgjjfzdw01n1gm95kfv";
+     };
+     meta = {
+       homepage = "http://flori.github.com/json";
+       license = []; # one of ?
+       description = "This is a JSON implementation in pure Ruby[...]";
+       longDescription = "This is a JSON implementation in pure Ruby.";
+     };
+  };
+
   xrefresh_server_0_3_0 = rubyDerivation {
      name = "ruby-xrefresh-server-0.3.0"; # full_name
      nameNoVersion = "xrefresh_server";
-     propagatedBuildInputs = [ json_1_2_4 term_ansicolor_1_0_5 ];
+     propagatedBuildInputs = [ json_1_4_6 term_ansicolor_1_0_5 ];
      src = fetchurl {
        url = "http://gems.rubyforge.org/gems/xrefresh-server-0.3.0.gem";
        sha256 = "1k80hadnmaxi8q8fw879xaj0ragy4bmqjqm7zjkv9bq8njb3i0c5";
@@ -423,42 +729,65 @@ specify.";
      };
   };
 
-  net_ssh_2_0_21 = rubyDerivation {
-     name = "ruby-net-ssh-2.0.21"; # full_name
-     nameNoVersion = "net_ssh";
+  bundler_1_0_0 = rubyDerivation {
+     name = "ruby-bundler-1.0.0"; # full_name
+     nameNoVersion = "bundler";
      propagatedBuildInputs = [  ];
      src = fetchurl {
-       url = "http://gems.rubyforge.org/gems/net-ssh-2.0.21.gem";
-       sha256 = "0wjfv68gn297vhb0r9qhlij9p7qnkn4afav0nylr6avrsd8mgdc4";
+       url = "http://gems.rubyforge.org/gems/bundler-1.0.0.gem";
+       sha256 = "0x1gsm8gqfa3czndm3v0b8v5sh08wjz1cr7xi383ipmnziimaq30";
      };
      meta = {
-       homepage = "http://github.com/net-ssh/net-ssh";
+       homepage = "http://gembundler.com";
        license = []; # one of ?
-       description = "Net::SSH: a pure-Ruby implementation of the SSH2 client protocol[...]";
-       longDescription = "Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.";
+       description = "Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatabl"; # cut to 120 chars
+       longDescription = "Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably";
      };
   };
 
-  gemcutter_0_5_0 = rubyDerivation {
-     name = "ruby-gemcutter-0.5.0"; # full_name
-     nameNoVersion = "gemcutter";
-     propagatedBuildInputs = [  ];
+  actionmailer_3_0_0 = rubyDerivation {
+     name = "ruby-actionmailer-3.0.0"; # full_name
+     nameNoVersion = "actionmailer";
+     propagatedBuildInputs = [  mail_2_2_5 ];
      src = fetchurl {
-       url = "http://gems.rubyforge.org/gems/gemcutter-0.5.0.gem";
-       sha256 = "16pf64d0mj320llars6x1zl0vhv2x8vh7pwgqj0k48pyh5426iim";
+       url = "http://gems.rubyforge.org/gems/actionmailer-3.0.0.gem";
+       sha256 = "15a7ikp7b76mlnrd78cprm6p7qj2vf1zj6x8an0zwnpxy95fqn3q";
      };
      meta = {
-       homepage = "http://rubygems.org";
+       homepage = "http://www.rubyonrails.org";
        license = []; # one of ?
-       description = "Adds several commands to RubyGems for managing gems and more on RubyGems[...]";
-       longDescription = "Adds several commands to RubyGems for managing gems and more on RubyGems.org.";
+       description = "Email on Rails[...]";
+       longDescription = "Email on Rails. Compose, deliver, receive, and test emails using the familiar controller/view pattern. First-class support for multipart email and attachments.";
+     };
+  };
+
+  rack_1_2_1 = rubyDerivation {
+     name = "ruby-rack-1.2.1"; # full_name
+     nameNoVersion = "rack";
+     propagatedBuildInputs = [  ];
+     src = fetchurl {
+       url = "http://gems.rubyforge.org/gems/rack-1.2.1.gem";
+       sha256 = "0bwsfiprvnwxgwwbr2cwv3aca5d707bfcm2zff4d0nsnbfgll0bj";
+     };
+     meta = {
+       homepage = "http://rack.rubyforge.org";
+       license = []; # one of ?
+       description = "Rack provides minimal, modular and adaptable interface for developing web applications in Ruby the simplest way possible,"; # cut to 120 chars
+       longDescription = "Rack provides minimal, modular and adaptable interface for developing
+web applications in Ruby.  By wrapping HTTP requests and responses in
+the simplest way possible, it unifies and distills the API for web
+servers, web frameworks, and software in between (the so-called
+middleware) into a single method call.
+
+Also see http://rack.rubyforge.org.
+";
      };
   };
 
   rubyforge_2_0_4 = rubyDerivation {
      name = "ruby-rubyforge-2.0.4"; # full_name
      nameNoVersion = "rubyforge";
-     propagatedBuildInputs = [ json_pure_1_2_4 ];
+     propagatedBuildInputs = [ json_pure_1_4_6 ];
      src = fetchurl {
        url = "http://gems.rubyforge.org/gems/rubyforge-2.0.4.gem";
        sha256 = "1wdaa4nzy39yzy848fa1rybi72qlyf9vhi1ra9wpx9rpi810fwh1";
@@ -478,19 +807,19 @@ specify.";
      };
   };
 
-  rb_inotify_0_7_1 = rubyDerivation {
-     name = "ruby-rb-inotify-0.7.1"; # full_name
-     nameNoVersion = "rb_inotify";
-     propagatedBuildInputs = [ ffi_0_6_3 ];
+  json_1_4_6 = rubyDerivation {
+     name = "ruby-json-1.4.6"; # full_name
+     nameNoVersion = "json";
+     propagatedBuildInputs = [  ];
      src = fetchurl {
-       url = "http://gems.rubyforge.org/gems/rb-inotify-0.7.1.gem";
-       sha256 = "00q2zl9361ji5z7blgipphsjvnysyw016vbb0vh6f5i5v6fz5bzh";
+       url = "http://gems.rubyforge.org/gems/json-1.4.6.gem";
+       sha256 = "1ibyw6hiclircn2f9f4kcznff4rdhcfsjxdzb4z9d9bd3ha1l96k";
      };
      meta = {
-       homepage = "http://github.com/nex3/rb-notify";
+       homepage = "http://flori.github.com/json";
        license = []; # one of ?
-       description = "A Ruby wrapper for Linux's inotify, using FFI[...]";
-       longDescription = "A Ruby wrapper for Linux's inotify, using FFI";
+       description = "This is a JSON implementation as a Ruby extension in C[...]";
+       longDescription = "This is a JSON implementation as a Ruby extension in C.";
      };
   };
 
@@ -527,13 +856,45 @@ specify.";
      };
   };
 
-  highline_1_5_2 = rubyDerivation {
-     name = "ruby-highline-1.5.2"; # full_name
+  rb_inotify_0_8_1 = rubyDerivation {
+     name = "ruby-rb-inotify-0.8.1"; # full_name
+     nameNoVersion = "rb_inotify";
+     propagatedBuildInputs = [ ffi_0_6_3 ];
+     src = fetchurl {
+       url = "http://gems.rubyforge.org/gems/rb-inotify-0.8.1.gem";
+       sha256 = "1z67kvhb8g8cgvlcfsh2gqhzqjijg8x02nafmifz9n9md5nvscar";
+     };
+     meta = {
+       homepage = "http://github.com/nex3/rb-notify";
+       license = []; # one of ?
+       description = "A Ruby wrapper for Linux's inotify, using FFI[...]";
+       longDescription = "A Ruby wrapper for Linux's inotify, using FFI";
+     };
+  };
+
+  net_ssh_2_0_23 = rubyDerivation {
+     name = "ruby-net-ssh-2.0.23"; # full_name
+     nameNoVersion = "net_ssh";
+     propagatedBuildInputs = [  ];
+     src = fetchurl {
+       url = "http://gems.rubyforge.org/gems/net-ssh-2.0.23.gem";
+       sha256 = "1fllf6mgwc213m5mn266qwhl65zc84wl8rq9m3lvbggw9mh5ynrr";
+     };
+     meta = {
+       homepage = "http://github.com/net-ssh/net-ssh";
+       license = []; # one of ?
+       description = "Net::SSH: a pure-Ruby implementation of the SSH2 client protocol[...]";
+       longDescription = "Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.";
+     };
+  };
+
+  highline_1_6_1 = rubyDerivation {
+     name = "ruby-highline-1.6.1"; # full_name
      nameNoVersion = "highline";
      propagatedBuildInputs = [  ];
      src = fetchurl {
-       url = "http://gems.rubyforge.org/gems/highline-1.5.2.gem";
-       sha256 = "0l25zris20drrwkhxx9hplq7g353xh960y5i19fdb7g84jl4bp19";
+       url = "http://gems.rubyforge.org/gems/highline-1.6.1.gem";
+       sha256 = "1dxlw2jcr4k1vv3sdaqi37kkh9v6cn3dq32ksz6k4yalcv6fhk7d";
      };
      meta = {
        homepage = "http://highline.rubyforge.org";
@@ -547,10 +908,26 @@ minutes of work.
      };
   };
 
+  activeresource_3_0_0 = rubyDerivation {
+     name = "ruby-activeresource-3.0.0"; # full_name
+     nameNoVersion = "activeresource";
+     propagatedBuildInputs = [   ];
+     src = fetchurl {
+       url = "http://gems.rubyforge.org/gems/activeresource-3.0.0.gem";
+       sha256 = "0c5dflwbhl397kifz9i0g63p72xc3jyhk7q8sswp95ijg5smyx2y";
+     };
+     meta = {
+       homepage = "http://www.rubyonrails.org";
+       license = []; # one of ?
+       description = "REST on Rails[...]";
+       longDescription = "REST on Rails. Wrap your RESTful web app with Ruby classes and work with them like Active Record models.";
+     };
+  };
+
   jeweler_1_4_0 = rubyDerivation {
      name = "ruby-jeweler-1.4.0"; # full_name
      nameNoVersion = "jeweler";
-     propagatedBuildInputs = [ git_1_2_5 rubyforge_2_0_4 gemcutter_0_5_0 ];
+     propagatedBuildInputs = [ git_1_2_5 rubyforge_2_0_4 gemcutter_0_6_1 ];
      src = fetchurl {
        url = "http://gems.rubyforge.org/gems/jeweler-1.4.0.gem";
        sha256 = "0hsz38wc37k1zzmy1jjvsqj6am14n410bbxk1dhq55cgapnwm3kb";
@@ -563,10 +940,42 @@ minutes of work.
      };
   };
 
+  gemcutter_0_6_1 = rubyDerivation {
+     name = "ruby-gemcutter-0.6.1"; # full_name
+     nameNoVersion = "gemcutter";
+     propagatedBuildInputs = [  ];
+     src = fetchurl {
+       url = "http://gems.rubyforge.org/gems/gemcutter-0.6.1.gem";
+       sha256 = "01ydbsz4ys6rkaghiibf7y7sbicnc5bppb2ay3agq1rqjvgprcr0";
+     };
+     meta = {
+       homepage = "http://rubygems.org";
+       license = []; # one of ?
+       description = "Adds several commands to RubyGems for managing gems and more on RubyGems[...]";
+       longDescription = "Adds several commands to RubyGems for managing gems and more on RubyGems.org.";
+     };
+  };
+
+  mail_2_2_5 = rubyDerivation {
+     name = "ruby-mail-2.2.5"; # full_name
+     nameNoVersion = "mail";
+     propagatedBuildInputs = [   treetop_1_4_8 ];
+     src = fetchurl {
+       url = "http://gems.rubyforge.org/gems/mail-2.2.5.gem";
+       sha256 = "0f6qwhwkc9hdqq5qkwzwjsqlwpvy7rcbra7pbl87l6q0mfaqiciv";
+     };
+     meta = {
+       homepage = "http://github.com/mikel/mail";
+       license = []; # one of ?
+       description = "A really Ruby Mail handler[...]";
+       longDescription = "A really Ruby Mail handler.";
+     };
+  };
+
   sup_0_11 = rubyDerivation {
      name = "ruby-sup-0.11"; # full_name
      nameNoVersion = "sup";
-     propagatedBuildInputs = [ xapian_full_1_1_3_4 ncurses_0_9_1 rmail_1_0_0 highline_1_5_2 net_ssh_2_0_21 trollop_1_16_2 lockfile_1_4_3 mime_types_1_16 gettext_2_1_0 ];
+     propagatedBuildInputs = [ xapian_full_1_1_3_4 ncurses_0_9_1 rmail_1_0_0 highline_1_6_1 net_ssh_2_0_23 trollop_1_16_2 lockfile_1_4_3 mime_types_1_16 gettext_2_1_0 ];
      src = fetchurl {
        url = "http://gems.rubyforge.org/gems/sup-0.11.gem";
        sha256 = "0dijz1vl1kk4axfnry71bnl2585y1hw0n6sizg9aag7r9m13194q";
@@ -579,6 +988,38 @@ minutes of work.
      };
   };
 
+  tzinfo_0_3_23 = rubyDerivation {
+     name = "ruby-tzinfo-0.3.23"; # full_name
+     nameNoVersion = "tzinfo";
+     propagatedBuildInputs = [  ];
+     src = fetchurl {
+       url = "http://gems.rubyforge.org/gems/tzinfo-0.3.23.gem";
+       sha256 = "020qk9yfc4s5mi624isn9r7hbncgk3l3ri783y7mn4ac6y4jkpgd";
+     };
+     meta = {
+       homepage = "http://tzinfo.rubyforge.org/";
+       license = []; # one of ?
+       description = "TZInfo is a Ruby library that uses the standard tz (Olson) database to provide daylight savings aware transformations bet"; # cut to 120 chars
+       longDescription = "TZInfo is a Ruby library that uses the standard tz (Olson) database to provide daylight savings aware transformations between times in different time zones.";
+     };
+  };
+
+  activesupport_3_0_0 = rubyDerivation {
+     name = "ruby-activesupport-3.0.0"; # full_name
+     nameNoVersion = "activesupport";
+     propagatedBuildInputs = [  ];
+     src = fetchurl {
+       url = "http://gems.rubyforge.org/gems/activesupport-3.0.0.gem";
+       sha256 = "0bad6iqqajlzy61ky4his0d4cfzq4f77qihyn6yygq9pn1ma6mvx";
+     };
+     meta = {
+       homepage = "http://www.rubyonrails.org";
+       license = []; # one of ?
+       description = "A toolkit of support libraries and Ruby core extensions extracted from the Rails framework[...]";
+       longDescription = "A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.";
+     };
+  };
+
   rmail_1_0_0 = rubyDerivation {
      name = "ruby-rmail-1.0.0"; # full_name
      nameNoVersion = "rmail";
@@ -595,47 +1036,56 @@ minutes of work.
      };
   };
 
-  ncursesw_1_2_4_1 = rubyDerivation {
-     name = "ruby-ncursesw-1.2.4.1"; # full_name
-     nameNoVersion = "ncursesw";
-     propagatedBuildInputs = [  ];
-     src = fetchurl {
-       url = "http://gems.rubyforge.org/gems/ncursesw-1.2.4.1.gem";
-       sha256 = "0cn13h14pk8yds8aklpdcpzl0z6rqifpmaz4lw29g10lgwvfv409";
-     };
-     meta = {
-       homepage = "http://ncurses-ruby.berlios.de/";
-       license = []; # one of ?
-       description = "Hacked up version of ncurses gem that supports wide characters and ruby1[...]";
-       longDescription = "Hacked up version of ncurses gem that supports wide characters and ruby1.9.1. Original ncurses gem by t-peters@users.berlios.de.";
-     };
-  };
-
 # aliases
 rmail=rmail_1_0_0;
+tzinfo=tzinfo_0_3_23;
+activeresource=activeresource_3_0_0;
 term_ansicolor=term_ansicolor_1_0_5;
-rb_inotify=rb_inotify_0_7_1;
-highline=highline_1_5_2;
-rubygems_update=rubygems_update_1_3_6;
+rb_inotify=rb_inotify_0_8_1;
+activerecord=activerecord_3_0_0;
+rails=rails_3_0_0;
+highline=highline_1_6_1;
+rubygems_update=rubygems_update_1_3_7;
+sqlite3_ruby=sqlite3_ruby_1_3_1;
+polyglot=polyglot_0_3_1;
+haml=haml_3_0_18;
 rake=rake_0_8_7;
 sup=sup_0_11;
+thor=thor_0_14_0;
+railties=railties_3_0_0;
+treetop=treetop_1_4_8;
 mime_types=mime_types_1_16;
 rubyforge=rubyforge_2_0_4;
-gemcutter=gemcutter_0_5_0;
-net_ssh=net_ssh_2_0_21;
+abstract=abstract_1_0_0;
+mail=mail_2_2_5;
+gemcutter=gemcutter_0_6_1;
+rack=rack_1_2_1;
+activemodel=activemodel_3_0_0;
+rack_mount=rack_mount_0_6_13;
+rails3_generators=rails3_generators_0_13_0;
+net_ssh=net_ssh_2_0_23;
+json=json_1_4_6;
 xrefresh_server=xrefresh_server_0_3_0;
+erubis=erubis_2_6_6;
 xapian_full=xapian_full_1_1_3_4;
 ncurses=ncurses_0_9_1;
-json=json_1_2_4;
+arel=arel_1_0_1;
 jeweler=jeweler_1_4_0;
+bundler=bundler_1_0_0;
 gettext=gettext_2_1_0;
 trollop=trollop_1_16_2;
 git=git_1_2_5;
 locale=locale_2_0_5;
+actionmailer=actionmailer_3_0_0;
+json_pure=json_pure_1_4_6;
+actionpack=actionpack_3_0_0;
+i18n=i18n_0_4_1;
 chronic=chronic_0_2_3;
-json_pure=json_pure_1_2_4;
+rack_test=rack_test_0_5_4;
+activesupport=activesupport_3_0_0;
 lockfile=lockfile_1_4_3;
 ffi=ffi_0_6_3;
+builder=builder_2_1_2;
 ncursesw=ncursesw_1_2_4_1;
   # ================ END automatically generated code ================
   }; in libs

From f802a70d8780a76a31bc5a74b1e71c6db1f181ce Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 8 Sep 2010 09:56:59 +0000
Subject: [PATCH 088/181] Update gem-nix patch to use ''...'' instead of "..."

Also update ruby libs

svn path=/nixpkgs/trunk/; revision=23683
---
 .../interpreters/ruby/gem_nix_command.patch   |  23 +-
 pkgs/development/interpreters/ruby/libs.nix   | 299 +++++++++++-------
 2 files changed, 195 insertions(+), 127 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/gem_nix_command.patch b/pkgs/development/interpreters/ruby/gem_nix_command.patch
index 4a751ab9828..98894960840 100644
--- a/pkgs/development/interpreters/ruby/gem_nix_command.patch
+++ b/pkgs/development/interpreters/ruby/gem_nix_command.patch
@@ -16,7 +16,7 @@ new file mode 100644
 index 0000000..24f3479
 --- /dev/null
 +++ b/lib/rubygems/commands/nix_command.rb
-@@ -0,0 +1,229 @@
+@@ -0,0 +1,228 @@
 +require 'net/http'
 +require 'rubygems/command'
 +require 'rubygems/doc_manager'
@@ -39,9 +39,9 @@ index 0000000..24f3479
 +  desc_from_spec = spec.description
 +  desc = desc_from_spec.sub(/[.].*/,'') # only keep first sentence
 +  desc = desc.length > 120 \
-+    ? "description = \"#{ desc[0..120] }\"; # cut to 120 chars" \
-+    : "description = \"#{ desc }\";"
-+  desc = desc.sub(/";$/,"[...]\";") if desc != desc_from_spec
++    ? "description = ''#{ desc[0..120] }''; # cut to 120 chars" \
++    : "description = ''#{ desc }'';"
++  desc = desc.sub(/'';$/,"[...]'';") if desc != desc_from_spec
 +  desc.gsub("\n"," ") # no \ns in description
 +end
 +
@@ -103,12 +103,12 @@ index 0000000..24f3479
 +          raise Gem::CommandLineError, "could'nt parse arg. expected: name or name-version"
 +        end
 +
-+        puts "adding #{gem_name}\n"
++        warn "adding #{gem_name}\n"
 +
 +        adddep(Gem::Dependency.new gem_name, version)
 +      }
 +
-+      print " total: #{@gems_with_deps.length}\n"
++      warn " total: #{@gems_with_deps.length}"
 +
 +
 +      out = "
@@ -139,8 +139,7 @@ index 0000000..24f3479
 +
 +         #raise Gem::DependencyError("src_url is nil, 302 redirection failed?") if src_url.nil?
 +
-+         out = "
-+         #{out}
++         out += "
 +  #{nixname spec} = rubyDerivation {
 +     name = \"ruby-#{spec.full_name}\"; # full_name
 +     nameNoVersion = \"#{nixname spec.name}\";
@@ -153,14 +152,14 @@ index 0000000..24f3479
 +       homepage = \"#{spec.homepage}\";
 +       license = [#{spec.licenses.map{|l| "\"#{l}\""}.join(" ") }]; # one of ?
 +       #{nixdescription spec}
-+       longDescription = \"#{ spec.description }\";
++       longDescription = ''#{ spec.description }'';
 +     };
 +  };\n"
 +      }
 +
-+      out = "#{out}\n# aliases\n"
++      out += "\n# aliases\n"
 +      aliases.each { |key, spec |
-+        out = "#{out}#{nixname key}=#{nixname spec};\n"
++        out += "#{nixname key}=#{nixname spec};\n"
 +      }
 +
 +      print out
@@ -187,7 +186,7 @@ index 0000000..24f3479
 +    # development deps can't be found. Some are old. Thus only add rutime dependencies
 +    deps = gem[0].dependencies.find_all { |d| d.type == :runtime }
 +
-+    print " total deps of #{full_name}: #{deps.length}\n"
++    warn " total deps of #{full_name}: #{deps.length}"
 +
 +    dep_specs = []
 +    # recurse while collecting deps
diff --git a/pkgs/development/interpreters/ruby/libs.nix b/pkgs/development/interpreters/ruby/libs.nix
index e2a0d635d75..9bd5bbaf096 100644
--- a/pkgs/development/interpreters/ruby/libs.nix
+++ b/pkgs/development/interpreters/ruby/libs.nix
@@ -142,8 +142,9 @@ let libs =
   rec {
 
   # ================ START automatically generated code ================
+
          # WARNING: automatically generated CODE
-         # This section has been generated by gem nix sup chronic rubygems-update xrefresh-server rb-inotify jeweler ncursesw sqlite3-ruby rails haml bundler rake rails3-generators
+         # This section has been generated by gem nix sup chronic rubygems-update xrefresh-server rb-inotify jeweler ncursesw sqlite3-ruby rails haml bundler rake rails3-generators enumerated_attribute haml-rails jquery-rails
          # the gem nix command has been added by a nix patch to ruby gems
       
   rails3_generators_0_13_0 = rubyDerivation {
@@ -157,8 +158,8 @@ let libs =
      meta = {
        homepage = "http://github.com/indirect/rails3-generators";
        license = []; # one of ?
-       description = "Rails 3 compatible generators for DataMapper, Factory-girl, Authlogic, Mongomapper, Mongoid, Shoulda, Formtastic and Simp"; # cut to 120 chars
-       longDescription = "Rails 3 compatible generators for DataMapper, Factory-girl, Authlogic, Mongomapper, Mongoid, Shoulda, Formtastic and SimpleForm";
+       description = ''Rails 3 compatible generators for DataMapper, Factory-girl, Authlogic, Mongomapper, Mongoid, Shoulda, Formtastic and Simp''; # cut to 120 chars
+       longDescription = ''Rails 3 compatible generators for DataMapper, Factory-girl, Authlogic, Mongomapper, Mongoid, Shoulda, Formtastic and SimpleForm'';
      };
   };
 
@@ -173,8 +174,8 @@ let libs =
      meta = {
        homepage = "http://onestepback.org";
        license = []; # one of ?
-       description = "Builder provides a number of builder objects that make creating structured data simple to do[...]";
-       longDescription = "Builder provides a number of builder objects that make creating structured data simple to do.  Currently the following builder objects are supported:  * XML Markup * XML Events";
+       description = ''Builder provides a number of builder objects that make creating structured data simple to do[...]'';
+       longDescription = ''Builder provides a number of builder objects that make creating structured data simple to do.  Currently the following builder objects are supported:  * XML Markup * XML Events'';
      };
   };
 
@@ -189,8 +190,40 @@ let libs =
      meta = {
        homepage = "http://rake.rubyforge.org";
        license = []; # one of ?
-       description = "Rake is a Make-like program implemented in Ruby[...]";
-       longDescription = "Rake is a Make-like program implemented in Ruby. Tasks and dependencies are specified in standard Ruby syntax.";
+       description = ''Rake is a Make-like program implemented in Ruby[...]'';
+       longDescription = ''Rake is a Make-like program implemented in Ruby. Tasks and dependencies are specified in standard Ruby syntax.'';
+     };
+  };
+
+  haml_rails_0_2 = rubyDerivation {
+     name = "ruby-haml-rails-0.2"; # full_name
+     nameNoVersion = "haml_rails";
+     propagatedBuildInputs = [   ];
+     src = fetchurl {
+       url = "http://gems.rubyforge.org/gems/haml-rails-0.2.gem";
+       sha256 = "132lfx6vqiphbbhxfzss5qny92yzfbpyj0qk7dn3q5y7irvp5wha";
+     };
+     meta = {
+       homepage = "http://github.com/indirect/haml-rails";
+       license = []; # one of ?
+       description = ''Haml-rails provides Haml generators for Rails 3[...]'';
+       longDescription = ''Haml-rails provides Haml generators for Rails 3. It also enables Haml as the templating engine for you, so you don't have to screw around in your own application.rb when your Gemfile already clearly indicated what templating engine you have installed. Hurrah.'';
+     };
+  };
+
+  meta_programming_0_2_2 = rubyDerivation {
+     name = "ruby-meta_programming-0.2.2"; # full_name
+     nameNoVersion = "meta_programming";
+     propagatedBuildInputs = [  ];
+     src = fetchurl {
+       url = "http://gems.rubyforge.org/gems/meta_programming-0.2.2.gem";
+       sha256 = "0k32z7ndfpravrz3hihg96x3wcdfrzsdj2pg48zkcb3gb428f2av";
+     };
+     meta = {
+       homepage = "http://github.com/jeffp/meta_programming/tree/master";
+       license = []; # one of ?
+       description = ''Collection of meta-programming methods for Ruby[...]'';
+       longDescription = ''Collection of meta-programming methods for Ruby'';
      };
   };
 
@@ -205,15 +238,15 @@ let libs =
      meta = {
        homepage = "http://haml-lang.com/";
        license = []; # one of ?
-       description = "      Haml (HTML Abstraction Markup Language) is a layer on top of XHTML or XML       that's designed to express the stru"; # cut to 120 chars
-       longDescription = "      Haml (HTML Abstraction Markup Language) is a layer on top of XHTML or XML
+       description = ''      Haml (HTML Abstraction Markup Language) is a layer on top of XHTML or XML       that's designed to express the stru''; # cut to 120 chars
+       longDescription = ''      Haml (HTML Abstraction Markup Language) is a layer on top of XHTML or XML
       that's designed to express the structure of XHTML or XML documents
       in a non-repetitive, elegant, easy way,
       using indentation rather than closing tags
       and allowing Ruby to be embedded with ease.
       It was originally envisioned as a plugin for Ruby on Rails,
       but it can function as a stand-alone templating engine.
-";
+'';
      };
   };
 
@@ -228,8 +261,8 @@ let libs =
      meta = {
        homepage = "http://polyglot.rubyforge.org";
        license = []; # one of ?
-       description = "Allows custom language loaders for specified file extensions to be hooked into require[...]";
-       longDescription = "Allows custom language loaders for specified file extensions to be hooked into require";
+       description = ''Allows custom language loaders for specified file extensions to be hooked into require[...]'';
+       longDescription = ''Allows custom language loaders for specified file extensions to be hooked into require'';
      };
   };
 
@@ -244,12 +277,12 @@ let libs =
      meta = {
        homepage = "http://github.com/brynary/arel";
        license = []; # one of ?
-       description = "Arel is a Relational Algebra for Ruby of SQL queries and it 2) adapts to various RDBMS systems. It is intended to be a fr"; # cut to 120 chars
-       longDescription = "Arel is a Relational Algebra for Ruby. It 1) simplifies the generation complex
+       description = ''Arel is a Relational Algebra for Ruby of SQL queries and it 2) adapts to various RDBMS systems. It is intended to be a fr''; # cut to 120 chars
+       longDescription = ''Arel is a Relational Algebra for Ruby. It 1) simplifies the generation complex
 of SQL queries and it 2) adapts to various RDBMS systems. It is intended to be
 a framework framework; that is, you can build your own ORM with it, focusing on
 innovative object and collection modeling as opposed to database compatibility
-and query generation.";
+and query generation.'';
      };
   };
 
@@ -264,8 +297,8 @@ and query generation.";
      meta = {
        homepage = "http://rubyforge.org/projects/abstract";
        license = []; # one of ?
-       description = "'abstract[...]";
-       longDescription = "'abstract.rb' is a library which enable you to define abstract method in Ruby.";
+       description = '''abstract[...]'';
+       longDescription = '''abstract.rb' is a library which enable you to define abstract method in Ruby.'';
      };
   };
 
@@ -280,12 +313,12 @@ and query generation.";
      meta = {
        homepage = "http://github.com/luislavena/sqlite3-ruby";
        license = []; # one of ?
-       description = "This module allows Ruby programs to interface with the SQLite3 database engine (http://www SQLite engine installed in ord"; # cut to 120 chars
-       longDescription = "This module allows Ruby programs to interface with the SQLite3
+       description = ''This module allows Ruby programs to interface with the SQLite3 database engine (http://www SQLite engine installed in ord''; # cut to 120 chars
+       longDescription = ''This module allows Ruby programs to interface with the SQLite3
 database engine (http://www.sqlite.org).  You must have the
 SQLite engine installed in order to build this module.
 
-Note that this module is NOT compatible with SQLite 2.x.";
+Note that this module is NOT compatible with SQLite 2.x.'';
      };
   };
 
@@ -300,8 +333,8 @@ Note that this module is NOT compatible with SQLite 2.x.";
      meta = {
        homepage = "http://github.com/schacon/ruby-git";
        license = []; # one of ?
-       description = "[...]";
-       longDescription = "";
+       description = ''[...]'';
+       longDescription = '''';
      };
   };
 
@@ -316,8 +349,8 @@ Note that this module is NOT compatible with SQLite 2.x.";
      meta = {
        homepage = "http://www.rubyonrails.org";
        license = []; # one of ?
-       description = "Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity[...]";
-       longDescription = "Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.";
+       description = ''Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity[...]'';
+       longDescription = ''Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.'';
      };
   };
 
@@ -332,8 +365,8 @@ Note that this module is NOT compatible with SQLite 2.x.";
      meta = {
        homepage = "http://functionalform.blogspot.com";
        license = []; # one of ?
-       description = "[...]";
-       longDescription = "";
+       description = ''[...]'';
+       longDescription = '''';
      };
   };
 
@@ -348,11 +381,11 @@ Note that this module is NOT compatible with SQLite 2.x.";
      meta = {
        homepage = "http://github.com/brynary/rack-test";
        license = []; # one of ?
-       description = "Rack::Test is a small, simple testing API for Rack apps own or as a reusable starting point for Web frameworks and testin"; # cut to 120 chars
-       longDescription = "Rack::Test is a small, simple testing API for Rack apps. It can be used on its
+       description = ''Rack::Test is a small, simple testing API for Rack apps own or as a reusable starting point for Web frameworks and testin''; # cut to 120 chars
+       longDescription = ''Rack::Test is a small, simple testing API for Rack apps. It can be used on its
 own or as a reusable starting point for Web frameworks and testing libraries
 to build on. Most of its initial functionality is an extraction of Merb 1.0's
-request helpers feature.";
+request helpers feature.'';
      };
   };
 
@@ -367,8 +400,8 @@ request helpers feature.";
      meta = {
        homepage = "	http://chronic.rubyforge.org/";
        license = []; # one of ?
-       description = "Chronic is a natural language date/time parser written in pure Ruby[...]";
-       longDescription = "Chronic is a natural language date/time parser written in pure Ruby. See below for the wide variety of formats Chronic will parse.";
+       description = ''Chronic is a natural language date/time parser written in pure Ruby[...]'';
+       longDescription = ''Chronic is a natural language date/time parser written in pure Ruby. See below for the wide variety of formats Chronic will parse.'';
      };
   };
 
@@ -383,8 +416,8 @@ request helpers feature.";
      meta = {
        homepage = "http://ncurses-ruby.berlios.de/";
        license = []; # one of ?
-       description = "[...]";
-       longDescription = "";
+       description = ''[...]'';
+       longDescription = '''';
      };
   };
 
@@ -399,8 +432,8 @@ request helpers feature.";
      meta = {
        homepage = "";
        license = []; # one of ?
-       description = "Xapian bindings for Ruby without dependency on system Xapian library[...]";
-       longDescription = "Xapian bindings for Ruby without dependency on system Xapian library";
+       description = ''Xapian bindings for Ruby without dependency on system Xapian library[...]'';
+       longDescription = ''Xapian bindings for Ruby without dependency on system Xapian library'';
      };
   };
 
@@ -415,8 +448,8 @@ request helpers feature.";
      meta = {
        homepage = "http://github.com/svenfuchs/i18n";
        license = []; # one of ?
-       description = "New wave Internationalization support for Ruby[...]";
-       longDescription = "New wave Internationalization support for Ruby.";
+       description = ''New wave Internationalization support for Ruby[...]'';
+       longDescription = ''New wave Internationalization support for Ruby.'';
      };
   };
 
@@ -431,8 +464,8 @@ request helpers feature.";
      meta = {
        homepage = "http://ncurses-ruby.berlios.de/";
        license = []; # one of ?
-       description = "Hacked up version of ncurses gem that supports wide characters and ruby1[...]";
-       longDescription = "Hacked up version of ncurses gem that supports wide characters and ruby1.9.1. Original ncurses gem by t-peters@users.berlios.de.";
+       description = ''Hacked up version of ncurses gem that supports wide characters and ruby1[...]'';
+       longDescription = ''Hacked up version of ncurses gem that supports wide characters and ruby1.9.1. Original ncurses gem by t-peters@users.berlios.de.'';
      };
   };
 
@@ -447,12 +480,12 @@ request helpers feature.";
      meta = {
        homepage = "http://wiki.github.com/ffi/ffi";
        license = []; # one of ?
-       description = "Ruby-FFI is a ruby extension for programmatically loading dynamic libraries, binding functions within them, and calling t"; # cut to 120 chars
-       longDescription = "Ruby-FFI is a ruby extension for programmatically loading dynamic
+       description = ''Ruby-FFI is a ruby extension for programmatically loading dynamic libraries, binding functions within them, and calling t''; # cut to 120 chars
+       longDescription = ''Ruby-FFI is a ruby extension for programmatically loading dynamic
 libraries, binding functions within them, and calling those functions
 from Ruby code. Moreover, a Ruby-FFI extension works without changes
 on Ruby and JRuby. Discover why should you write your next extension
-using Ruby-FFI here[http://wiki.github.com/ffi/ffi/why-use-ffi].";
+using Ruby-FFI here[http://wiki.github.com/ffi/ffi/why-use-ffi].'';
      };
   };
 
@@ -467,8 +500,8 @@ using Ruby-FFI here[http://wiki.github.com/ffi/ffi/why-use-ffi].";
      meta = {
        homepage = "http://flori.github.com/term-ansicolor";
        license = []; # one of ?
-       description = "[...]";
-       longDescription = "";
+       description = ''[...]'';
+       longDescription = '''';
      };
   };
 
@@ -483,8 +516,8 @@ using Ruby-FFI here[http://wiki.github.com/ffi/ffi/why-use-ffi].";
      meta = {
        homepage = "http://rubygems.org/";
        license = []; # one of ?
-       description = "RubyGems is a package management framework for Ruby  This gem is an update for the RubyGems software. You must have an in"; # cut to 120 chars
-       longDescription = "RubyGems is a package management framework for Ruby.
+       description = ''RubyGems is a package management framework for Ruby  This gem is an update for the RubyGems software. You must have an in''; # cut to 120 chars
+       longDescription = ''RubyGems is a package management framework for Ruby.
 
 This gem is an update for the RubyGems software. You must have an
 installation of RubyGems before this update can be applied.
@@ -497,7 +530,7 @@ To upgrade to the latest RubyGems, run:
 
 NOTE:  RubyGems 1.1 and 1.2 have problems upgrading when there is no
 rubygems-update installed.  You will need to use the following instructions
-if you see \"Nothing to update\".
+if you see "Nothing to update".
 
 If you have an older version of RubyGems installed, then you can still
 do it in two steps:
@@ -514,7 +547,7 @@ getting software, doing it manually:
 
 For more details and other options, see:
 
-  ruby setup.rb --help";
+  ruby setup.rb --help'';
      };
   };
 
@@ -529,12 +562,28 @@ For more details and other options, see:
      meta = {
        homepage = "http://trollop.rubyforge.org";
        license = []; # one of ?
-       description = "Trollop is a commandline option parser for Ruby that just gets out of your way For that, you get a nice automatically-gen"; # cut to 120 chars
-       longDescription = "Trollop is a commandline option parser for Ruby that just
+       description = ''Trollop is a commandline option parser for Ruby that just gets out of your way For that, you get a nice automatically-gen''; # cut to 120 chars
+       longDescription = ''Trollop is a commandline option parser for Ruby that just
 gets out of your way. One line of code per option is all you need to write.
 For that, you get a nice automatically-generated help page, robust option
 parsing, command subcompletion, and sensible defaults for everything you don't
-specify.";
+specify.'';
+     };
+  };
+
+  enumerated_attribute_0_2_16 = rubyDerivation {
+     name = "ruby-enumerated_attribute-0.2.16"; # full_name
+     nameNoVersion = "enumerated_attribute";
+     propagatedBuildInputs = [ meta_programming_0_2_2 ];
+     src = fetchurl {
+       url = "http://gems.rubyforge.org/gems/enumerated_attribute-0.2.16.gem";
+       sha256 = "01m9jmim5dcyayv3pznrm1y152dd4jrp2jj89m18inbn5446dzqi";
+     };
+     meta = {
+       homepage = "http://github.com/jeffp/enumerated_attribute/tree/master";
+       license = []; # one of ?
+       description = ''Enumerated model attributes and view helpers[...]'';
+       longDescription = ''Enumerated model attributes and view helpers'';
      };
   };
 
@@ -549,8 +598,8 @@ specify.";
      meta = {
        homepage = "http://www.rubyonrails.org";
        license = []; # one of ?
-       description = "Rails internals: application bootup, plugins, generators, and rake tasks[...]";
-       longDescription = "Rails internals: application bootup, plugins, generators, and rake tasks.";
+       description = ''Rails internals: application bootup, plugins, generators, and rake tasks[...]'';
+       longDescription = ''Rails internals: application bootup, plugins, generators, and rake tasks.'';
      };
   };
 
@@ -565,8 +614,8 @@ specify.";
      meta = {
        homepage = "http://github.com/josh/rack-mount";
        license = []; # one of ?
-       description = "Stackable dynamic tree based Rack router[...]";
-       longDescription = "Stackable dynamic tree based Rack router";
+       description = ''Stackable dynamic tree based Rack router[...]'';
+       longDescription = ''Stackable dynamic tree based Rack router'';
      };
   };
 
@@ -581,8 +630,8 @@ specify.";
      meta = {
        homepage = "http://www.rubyonrails.org";
        license = []; # one of ?
-       description = "A toolkit for building modeling frameworks like Active Record and Active Resource[...]";
-       longDescription = "A toolkit for building modeling frameworks like Active Record and Active Resource. Rich support for attributes, callbacks, validations, observers, serialization, internationalization, and testing.";
+       description = ''A toolkit for building modeling frameworks like Active Record and Active Resource[...]'';
+       longDescription = ''A toolkit for building modeling frameworks like Active Record and Active Resource. Rich support for attributes, callbacks, validations, observers, serialization, internationalization, and testing.'';
      };
   };
 
@@ -597,11 +646,11 @@ specify.";
      meta = {
        homepage = "http://gettext.rubyforge.org/";
        license = []; # one of ?
-       description = "        Ruby-GetText-Package is a GNU GetText-like program for Ruby         The catalog file(po-file) is same format with"; # cut to 120 chars
-       longDescription = "        Ruby-GetText-Package is a GNU GetText-like program for Ruby.
+       description = ''        Ruby-GetText-Package is a GNU GetText-like program for Ruby         The catalog file(po-file) is same format with''; # cut to 120 chars
+       longDescription = ''        Ruby-GetText-Package is a GNU GetText-like program for Ruby.
         The catalog file(po-file) is same format with GNU GetText.
         So you can use GNU GetText tools for maintaining.
-";
+'';
      };
   };
 
@@ -616,8 +665,8 @@ specify.";
      meta = {
        homepage = "http://codeforpeople.com/lib/ruby/lockfile/";
        license = []; # one of ?
-       description = "[...]";
-       longDescription = "";
+       description = ''[...]'';
+       longDescription = '''';
      };
   };
 
@@ -632,8 +681,8 @@ specify.";
      meta = {
        homepage = "http://yehudakatz.com";
        license = []; # one of ?
-       description = "A scripting framework that replaces rake, sake and rubigen[...]";
-       longDescription = "A scripting framework that replaces rake, sake and rubigen";
+       description = ''A scripting framework that replaces rake, sake and rubigen[...]'';
+       longDescription = ''A scripting framework that replaces rake, sake and rubigen'';
      };
   };
 
@@ -648,8 +697,8 @@ specify.";
      meta = {
        homepage = "http://www.rubyonrails.org";
        license = []; # one of ?
-       description = "Databases on Rails[...]";
-       longDescription = "Databases on Rails. Build a persistent domain model by mapping database tables to Ruby classes. Strong conventions for associations, validations, aggregations, migrations, and testing come baked-in.";
+       description = ''Databases on Rails[...]'';
+       longDescription = ''Databases on Rails. Build a persistent domain model by mapping database tables to Ruby classes. Strong conventions for associations, validations, aggregations, migrations, and testing come baked-in.'';
      };
   };
 
@@ -664,8 +713,8 @@ specify.";
      meta = {
        homepage = "http://www.rubyonrails.org";
        license = []; # one of ?
-       description = "Web apps on Rails[...]";
-       longDescription = "Web apps on Rails. Simple, battle-tested conventions for building and testing MVC web applications. Works with any Rack-compatible server.";
+       description = ''Web apps on Rails[...]'';
+       longDescription = ''Web apps on Rails. Simple, battle-tested conventions for building and testing MVC web applications. Works with any Rack-compatible server.'';
      };
   };
 
@@ -680,8 +729,8 @@ specify.";
      meta = {
        homepage = "http://www.kuwata-lab.com/erubis/";
        license = []; # one of ?
-       description = "  Erubis is an implementation of eRuby and has the following features:    * Very fast, almost three times faster than ERB"; # cut to 120 chars
-       longDescription = "  Erubis is an implementation of eRuby and has the following features:
+       description = ''  Erubis is an implementation of eRuby and has the following features:    * Very fast, almost three times faster than ERB''; # cut to 120 chars
+       longDescription = ''  Erubis is an implementation of eRuby and has the following features:
 
   * Very fast, almost three times faster than ERB and about 10% faster than eruby.
   * Multi-language support (Ruby/PHP/C/Java/Scheme/Perl/Javascript)
@@ -693,7 +742,7 @@ specify.";
   * Print statement available
   * Easy to extend and customize in subclass
   * Ruby on Rails support
-";
+'';
      };
   };
 
@@ -708,8 +757,8 @@ specify.";
      meta = {
        homepage = "http://flori.github.com/json";
        license = []; # one of ?
-       description = "This is a JSON implementation in pure Ruby[...]";
-       longDescription = "This is a JSON implementation in pure Ruby.";
+       description = ''This is a JSON implementation in pure Ruby[...]'';
+       longDescription = ''This is a JSON implementation in pure Ruby.'';
      };
   };
 
@@ -724,8 +773,8 @@ specify.";
      meta = {
        homepage = "http://github.com/darwin/xrefresh-server";
        license = []; # one of ?
-       description = "XRefresh is browser refresh automation for web developers[...]";
-       longDescription = "XRefresh is browser refresh automation for web developers";
+       description = ''XRefresh is browser refresh automation for web developers[...]'';
+       longDescription = ''XRefresh is browser refresh automation for web developers'';
      };
   };
 
@@ -740,8 +789,8 @@ specify.";
      meta = {
        homepage = "http://gembundler.com";
        license = []; # one of ?
-       description = "Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatabl"; # cut to 120 chars
-       longDescription = "Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably";
+       description = ''Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatabl''; # cut to 120 chars
+       longDescription = ''Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably'';
      };
   };
 
@@ -756,8 +805,8 @@ specify.";
      meta = {
        homepage = "http://www.rubyonrails.org";
        license = []; # one of ?
-       description = "Email on Rails[...]";
-       longDescription = "Email on Rails. Compose, deliver, receive, and test emails using the familiar controller/view pattern. First-class support for multipart email and attachments.";
+       description = ''Email on Rails[...]'';
+       longDescription = ''Email on Rails. Compose, deliver, receive, and test emails using the familiar controller/view pattern. First-class support for multipart email and attachments.'';
      };
   };
 
@@ -772,15 +821,15 @@ specify.";
      meta = {
        homepage = "http://rack.rubyforge.org";
        license = []; # one of ?
-       description = "Rack provides minimal, modular and adaptable interface for developing web applications in Ruby the simplest way possible,"; # cut to 120 chars
-       longDescription = "Rack provides minimal, modular and adaptable interface for developing
+       description = ''Rack provides minimal, modular and adaptable interface for developing web applications in Ruby the simplest way possible,''; # cut to 120 chars
+       longDescription = ''Rack provides minimal, modular and adaptable interface for developing
 web applications in Ruby.  By wrapping HTTP requests and responses in
 the simplest way possible, it unifies and distills the API for web
 servers, web frameworks, and software in between (the so-called
 middleware) into a single method call.
 
 Also see http://rack.rubyforge.org.
-";
+'';
      };
   };
 
@@ -795,15 +844,15 @@ Also see http://rack.rubyforge.org.
      meta = {
        homepage = "http://codeforpeople.rubyforge.org/rubyforge/";
        license = []; # one of ?
-       description = "A script which automates a limited set of rubyforge operations  * Run 'rubyforge help' for complete usage. * Setup: For f"; # cut to 120 chars
-       longDescription = "A script which automates a limited set of rubyforge operations.
+       description = ''A script which automates a limited set of rubyforge operations  * Run 'rubyforge help' for complete usage. * Setup: For f''; # cut to 120 chars
+       longDescription = ''A script which automates a limited set of rubyforge operations.
 
 * Run 'rubyforge help' for complete usage.
 * Setup: For first time users AND upgrades to 0.4.0:
   * rubyforge setup (deletes your username and password, so run sparingly!)
   * edit ~/.rubyforge/user-config.yml
   * rubyforge config
-* For all rubyforge upgrades, run 'rubyforge config' to ensure you have latest.";
+* For all rubyforge upgrades, run 'rubyforge config' to ensure you have latest.'';
      };
   };
 
@@ -818,8 +867,8 @@ Also see http://rack.rubyforge.org.
      meta = {
        homepage = "http://flori.github.com/json";
        license = []; # one of ?
-       description = "This is a JSON implementation as a Ruby extension in C[...]";
-       longDescription = "This is a JSON implementation as a Ruby extension in C.";
+       description = ''This is a JSON implementation as a Ruby extension in C[...]'';
+       longDescription = ''This is a JSON implementation as a Ruby extension in C.'';
      };
   };
 
@@ -834,9 +883,9 @@ Also see http://rack.rubyforge.org.
      meta = {
        homepage = "http://locale.rubyforge.org/";
        license = []; # one of ?
-       description = "    Ruby-Locale is the pure ruby library which provides basic APIs for localization [...]";
-       longDescription = "    Ruby-Locale is the pure ruby library which provides basic APIs for localization.
-";
+       description = ''    Ruby-Locale is the pure ruby library which provides basic APIs for localization [...]'';
+       longDescription = ''    Ruby-Locale is the pure ruby library which provides basic APIs for localization.
+'';
      };
   };
 
@@ -851,8 +900,8 @@ Also see http://rack.rubyforge.org.
      meta = {
        homepage = "http://mime-types.rubyforge.org/";
        license = []; # one of ?
-       description = "MIME::Types for Ruby originally based on and synchronized with MIME::Types for Perl by Mark Overmeer, copyright 2001 - 20"; # cut to 120 chars
-       longDescription = "MIME::Types for Ruby originally based on and synchronized with MIME::Types for Perl by Mark Overmeer, copyright 2001 - 2009. As of version 1.15, the data format for the MIME::Type list has changed and the synchronization will no longer happen.";
+       description = ''MIME::Types for Ruby originally based on and synchronized with MIME::Types for Perl by Mark Overmeer, copyright 2001 - 20''; # cut to 120 chars
+       longDescription = ''MIME::Types for Ruby originally based on and synchronized with MIME::Types for Perl by Mark Overmeer, copyright 2001 - 2009. As of version 1.15, the data format for the MIME::Type list has changed and the synchronization will no longer happen.'';
      };
   };
 
@@ -867,8 +916,8 @@ Also see http://rack.rubyforge.org.
      meta = {
        homepage = "http://github.com/nex3/rb-notify";
        license = []; # one of ?
-       description = "A Ruby wrapper for Linux's inotify, using FFI[...]";
-       longDescription = "A Ruby wrapper for Linux's inotify, using FFI";
+       description = ''A Ruby wrapper for Linux's inotify, using FFI[...]'';
+       longDescription = ''A Ruby wrapper for Linux's inotify, using FFI'';
      };
   };
 
@@ -883,8 +932,8 @@ Also see http://rack.rubyforge.org.
      meta = {
        homepage = "http://github.com/net-ssh/net-ssh";
        license = []; # one of ?
-       description = "Net::SSH: a pure-Ruby implementation of the SSH2 client protocol[...]";
-       longDescription = "Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.";
+       description = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol[...]'';
+       longDescription = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.'';
      };
   };
 
@@ -899,12 +948,12 @@ Also see http://rack.rubyforge.org.
      meta = {
        homepage = "http://highline.rubyforge.org";
        license = []; # one of ?
-       description = "A high-level IO library that provides validation, type conversion, and more for command-line interfaces crank out anythin"; # cut to 120 chars
-       longDescription = "A high-level IO library that provides validation, type conversion, and more for
+       description = ''A high-level IO library that provides validation, type conversion, and more for command-line interfaces crank out anythin''; # cut to 120 chars
+       longDescription = ''A high-level IO library that provides validation, type conversion, and more for
 command-line interfaces. HighLine also includes a complete menu system that can
 crank out anything from simple list selection to complete shells with just
 minutes of work.
-";
+'';
      };
   };
 
@@ -919,8 +968,8 @@ minutes of work.
      meta = {
        homepage = "http://www.rubyonrails.org";
        license = []; # one of ?
-       description = "REST on Rails[...]";
-       longDescription = "REST on Rails. Wrap your RESTful web app with Ruby classes and work with them like Active Record models.";
+       description = ''REST on Rails[...]'';
+       longDescription = ''REST on Rails. Wrap your RESTful web app with Ruby classes and work with them like Active Record models.'';
      };
   };
 
@@ -935,8 +984,8 @@ minutes of work.
      meta = {
        homepage = "http://github.com/technicalpickles/jeweler";
        license = []; # one of ?
-       description = "Simple and opinionated helper for creating Rubygem projects on GitHub[...]";
-       longDescription = "Simple and opinionated helper for creating Rubygem projects on GitHub";
+       description = ''Simple and opinionated helper for creating Rubygem projects on GitHub[...]'';
+       longDescription = ''Simple and opinionated helper for creating Rubygem projects on GitHub'';
      };
   };
 
@@ -951,8 +1000,8 @@ minutes of work.
      meta = {
        homepage = "http://rubygems.org";
        license = []; # one of ?
-       description = "Adds several commands to RubyGems for managing gems and more on RubyGems[...]";
-       longDescription = "Adds several commands to RubyGems for managing gems and more on RubyGems.org.";
+       description = ''Adds several commands to RubyGems for managing gems and more on RubyGems[...]'';
+       longDescription = ''Adds several commands to RubyGems for managing gems and more on RubyGems.org.'';
      };
   };
 
@@ -967,8 +1016,8 @@ minutes of work.
      meta = {
        homepage = "http://github.com/mikel/mail";
        license = []; # one of ?
-       description = "A really Ruby Mail handler[...]";
-       longDescription = "A really Ruby Mail handler.";
+       description = ''A really Ruby Mail handler[...]'';
+       longDescription = ''A really Ruby Mail handler.'';
      };
   };
 
@@ -983,8 +1032,24 @@ minutes of work.
      meta = {
        homepage = "http://sup.rubyforge.org/";
        license = []; # one of ?
-       description = "Sup is a console-based email client for people with a lot of email[...]";
-       longDescription = "Sup is a console-based email client for people with a lot of email. It supports tagging, very fast full-text search, automatic contact-list management, and more. If you're the type of person who treats email as an extension of your long-term memory, Sup is for you.  Sup makes it easy to: - Handle massive amounts of email.  - Mix email from different sources: mbox files (even across different machines), Maildir directories, IMAP folders, POP accounts, and GMail accounts.  - Instantaneously search over your entire email collection. Search over body text, or use a query language to combine search predicates in any way.  - Handle multiple accounts. Replying to email sent to a particular account will use the correct SMTP server, signature, and from address.  - Add custom code to handle certain types of messages or to handle certain types of text within messages.  - Organize email with user-defined labels, automatically track recent contacts, and much more!  The goal of Sup is to become the email client of choice for nerds everywhere.";
+       description = ''Sup is a console-based email client for people with a lot of email[...]'';
+       longDescription = ''Sup is a console-based email client for people with a lot of email. It supports tagging, very fast full-text search, automatic contact-list management, and more. If you're the type of person who treats email as an extension of your long-term memory, Sup is for you.  Sup makes it easy to: - Handle massive amounts of email.  - Mix email from different sources: mbox files (even across different machines), Maildir directories, IMAP folders, POP accounts, and GMail accounts.  - Instantaneously search over your entire email collection. Search over body text, or use a query language to combine search predicates in any way.  - Handle multiple accounts. Replying to email sent to a particular account will use the correct SMTP server, signature, and from address.  - Add custom code to handle certain types of messages or to handle certain types of text within messages.  - Organize email with user-defined labels, automatically track recent contacts, and much more!  The goal of Sup is to become the email client of choice for nerds everywhere.'';
+     };
+  };
+
+  jquery_rails_0_1_2 = rubyDerivation {
+     name = "ruby-jquery-rails-0.1.2"; # full_name
+     nameNoVersion = "jquery_rails";
+     propagatedBuildInputs = [  ];
+     src = fetchurl {
+       url = "http://gems.rubyforge.org/gems/jquery-rails-0.1.2.gem";
+       sha256 = "1z2qw5nmvjpgx5b79kxvi4gl102aq8brp32fpbysmzv2ghsqgvqn";
+     };
+     meta = {
+       homepage = "http://rubygems.org/gems/jquery-rails";
+       license = []; # one of ?
+       description = ''This gem provides a Rails generator to install jQuery and the jQuery-ujs driver into your Rails 3 application, and then h''; # cut to 120 chars
+       longDescription = ''This gem provides a Rails generator to install jQuery and the jQuery-ujs driver into your Rails 3 application, and then have them included automatically instead of Prototype.'';
      };
   };
 
@@ -999,8 +1064,8 @@ minutes of work.
      meta = {
        homepage = "http://tzinfo.rubyforge.org/";
        license = []; # one of ?
-       description = "TZInfo is a Ruby library that uses the standard tz (Olson) database to provide daylight savings aware transformations bet"; # cut to 120 chars
-       longDescription = "TZInfo is a Ruby library that uses the standard tz (Olson) database to provide daylight savings aware transformations between times in different time zones.";
+       description = ''TZInfo is a Ruby library that uses the standard tz (Olson) database to provide daylight savings aware transformations bet''; # cut to 120 chars
+       longDescription = ''TZInfo is a Ruby library that uses the standard tz (Olson) database to provide daylight savings aware transformations between times in different time zones.'';
      };
   };
 
@@ -1015,8 +1080,8 @@ minutes of work.
      meta = {
        homepage = "http://www.rubyonrails.org";
        license = []; # one of ?
-       description = "A toolkit of support libraries and Ruby core extensions extracted from the Rails framework[...]";
-       longDescription = "A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.";
+       description = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework[...]'';
+       longDescription = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.'';
      };
   };
 
@@ -1031,14 +1096,15 @@ minutes of work.
      meta = {
        homepage = "http://www.rfc20.org/rubymail";
        license = []; # one of ?
-       description = "RMail is a lightweight mail library containing various utility classes and modules that allow ruby scripts to parse, modi"; # cut to 120 chars
-       longDescription = "RMail is a lightweight mail library containing various utility classes and modules that allow ruby scripts to parse, modify, and generate MIME mail messages.";
+       description = ''RMail is a lightweight mail library containing various utility classes and modules that allow ruby scripts to parse, modi''; # cut to 120 chars
+       longDescription = ''RMail is a lightweight mail library containing various utility classes and modules that allow ruby scripts to parse, modify, and generate MIME mail messages.'';
      };
   };
 
 # aliases
 rmail=rmail_1_0_0;
 tzinfo=tzinfo_0_3_23;
+jquery_rails=jquery_rails_0_1_2;
 activeresource=activeresource_3_0_0;
 term_ansicolor=term_ansicolor_1_0_5;
 rb_inotify=rb_inotify_0_8_1;
@@ -1062,6 +1128,7 @@ gemcutter=gemcutter_0_6_1;
 rack=rack_1_2_1;
 activemodel=activemodel_3_0_0;
 rack_mount=rack_mount_0_6_13;
+haml_rails=haml_rails_0_2;
 rails3_generators=rails3_generators_0_13_0;
 net_ssh=net_ssh_2_0_23;
 json=json_1_4_6;
@@ -1084,7 +1151,9 @@ chronic=chronic_0_2_3;
 rack_test=rack_test_0_5_4;
 activesupport=activesupport_3_0_0;
 lockfile=lockfile_1_4_3;
+enumerated_attribute=enumerated_attribute_0_2_16;
 ffi=ffi_0_6_3;
+meta_programming=meta_programming_0_2_2;
 builder=builder_2_1_2;
 ncursesw=ncursesw_1_2_4_1;
   # ================ END automatically generated code ================

From a280a31f56b34235678fcdc19ab304d142136d5a Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Wed, 8 Sep 2010 11:40:32 +0000
Subject: [PATCH 089/181] Add a patch to dmtcp to allow the restart of
 checkpointed programs with a different uid. (This is required in order to
 generate hol_light_binaries).

Also do a bit of cleanup.

svn path=/nixpkgs/trunk/; revision=23684
---
 pkgs/os-specific/linux/dmtcp/default.nix      | 26 +++++++-------
 .../linux/dmtcp/dont_check_uid.patch          | 35 +++++++++++++++++++
 2 files changed, 47 insertions(+), 14 deletions(-)
 create mode 100644 pkgs/os-specific/linux/dmtcp/dont_check_uid.patch

diff --git a/pkgs/os-specific/linux/dmtcp/default.nix b/pkgs/os-specific/linux/dmtcp/default.nix
index ee32654cf8a..39759b03496 100644
--- a/pkgs/os-specific/linux/dmtcp/default.nix
+++ b/pkgs/os-specific/linux/dmtcp/default.nix
@@ -1,25 +1,21 @@
 {stdenv, fetchurl, perl, python}:
+# Perl and Python required by the test suite.
 
-# Perl and python are needed in order to run the test suite.
+stdenv.mkDerivation rec {
+  name = "dmtcp-${version}";
 
-let
-  pname = "dmtcp";
   version = "1.1.8";
-in
-
-stdenv.mkDerivation {
-  name = "${pname}-${version}";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/${pname}/${pname}_${version}.tar.gz";
-    sha256 = "05klyml5maw3f5rxl3i20fqyvpmx69bh09h7a48y19q3r4nqd8f2";
-  };
 
   buildInputs = [ perl python ];
 
-  doCheck = true;
+  src = fetchurl {
+    url = "mirror://sourceforge/dmtcp/dmtcp_${version}.tar.gz";
+    sha256 = "05klyml5maw3f5rxl3i20fqyvpmx69bh09h7a48y19q3r4nqd8f2";
+  };
 
-  preCheck = ''
+  patches = [ ./dont_check_uid.patch ];
+
+  postPatch = ''
     substituteInPlace dmtcp/src/dmtcp_coordinator.cpp \
       --replace /bin/bash /bin/sh
     substituteInPlace utils/gdb-add-symbol-file \
@@ -31,6 +27,8 @@ stdenv.mkDerivation {
       --replace /usr/bin/python $(type -p python)
   '';
 
+  doCheck = true;
+
   meta = {
     description = "Distributed MultiThreaded Checkpointing";
     longDescription = ''
diff --git a/pkgs/os-specific/linux/dmtcp/dont_check_uid.patch b/pkgs/os-specific/linux/dmtcp/dont_check_uid.patch
new file mode 100644
index 00000000000..23f4a254037
--- /dev/null
+++ b/pkgs/os-specific/linux/dmtcp/dont_check_uid.patch
@@ -0,0 +1,35 @@
+diff -Nuar dmtcp_1.1.8/dmtcp/src/dmtcp_restart.cpp dmtcp_1.1.8.dont_check_uid/dmtcp/src/dmtcp_restart.cpp
+--- dmtcp_1.1.8/dmtcp/src/dmtcp_restart.cpp	2010-07-01 06:42:54.000000000 +0200
++++ dmtcp_1.1.8.dont_check_uid/dmtcp/src/dmtcp_restart.cpp	2010-09-06 23:50:51.000000000 +0200
+@@ -662,14 +662,6 @@
+       sprintf(error_msg, "\ndmtcp_restart: ckpt image %s", restorename);
+       perror(error_msg);
+       doAbort = true;
+-    } else if (buf.st_uid != getuid()) { /*Could also run if geteuid() matches*/
+-      printf("\nProcess uid (%d) doesn't match uid (%d) of\n" \
+-             "checkpoint image (%s).\n" \
+-	     "This is dangerous.  Aborting for security reasons.\n" \
+-           "If you still want to do this (at your own risk),\n" \
+-           "  then modify dmtcp/src/%s:%d and re-compile.\n",
+-           getuid(), buf.st_uid, restorename, __FILE__, __LINE__ - 6);
+-      doAbort = true;
+     }
+     if (doAbort)
+       abort();
+diff -Nuar dmtcp_1.1.8/mtcp/mtcp_restart.c dmtcp_1.1.8.dont_check_uid/mtcp/mtcp_restart.c
+--- dmtcp_1.1.8/mtcp/mtcp_restart.c	2010-07-01 06:42:53.000000000 +0200
++++ dmtcp_1.1.8.dont_check_uid/mtcp/mtcp_restart.c	2010-09-07 01:49:20.000000000 +0200
+@@ -157,13 +157,6 @@
+       sprintf(error_msg, "\nmtcp_restart: ckpt image %s", restorename);
+       perror(error_msg);
+       abort();
+-    } else if (buf.st_uid != getuid()) { /*Could also run if geteuid() matches*/
+-      mtcp_printf("\nProcess uid (%d) doesn't match uid (%d) of\n" \
+-	          "checkpoint image (%s).\n" \
+-		  "This is dangerous.  Aborting for security reasons.\n" \
+-	   "If you still want to do this, modify mtcp/%s:%d and re-compile.\n",
+-	   getuid(), buf.st_uid, restorename, __FILE__, __LINE__ - 5);
+-      abort();
+     }
+   }
+ 

From df21c86e082f75935871e6b5105d35646fb0587e Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Wed, 8 Sep 2010 13:07:45 +0000
Subject: [PATCH 090/181] Improve hol_light:

  *   Upgrade hol_light to the latest svn version on google code (r57).

  *   Improve and semplify the mechanism for the generation of checkpointed binaries.

  *   Make hol to work with camlp5 and thus with recent version of ocaml (>=3.10, <=3.11).

  *   Remove ocaml_with_sources which is not needed anymore.

svn path=/nixpkgs/trunk/; revision=23685
---
 .../science/logic/hol_light/binaries.nix      |   81 +-
 .../science/logic/hol_light/configure-3.09.3  | 1444 -----------------
 .../science/logic/hol_light/default.nix       |   69 +-
 .../logic/hol_light/ocaml-with-sources.nix    |   33 -
 .../science/logic/hol_light/restart_hol_light |    3 +
 .../logic/hol_light/selfcheckpoint_complex.ml |   29 -
 .../logic/hol_light/selfcheckpoint_core.ml    |   28 -
 .../hol_light/selfcheckpoint_multivariate.ml  |   29 -
 .../science/logic/hol_light/start_hol.ml      |   37 +
 .../science/logic/hol_light/start_hol_light   |    3 +
 pkgs/top-level/all-packages.nix               |    5 -
 11 files changed, 113 insertions(+), 1648 deletions(-)
 delete mode 100755 pkgs/applications/science/logic/hol_light/configure-3.09.3
 delete mode 100644 pkgs/applications/science/logic/hol_light/ocaml-with-sources.nix
 create mode 100644 pkgs/applications/science/logic/hol_light/restart_hol_light
 delete mode 100644 pkgs/applications/science/logic/hol_light/selfcheckpoint_complex.ml
 delete mode 100644 pkgs/applications/science/logic/hol_light/selfcheckpoint_core.ml
 delete mode 100644 pkgs/applications/science/logic/hol_light/selfcheckpoint_multivariate.ml
 create mode 100644 pkgs/applications/science/logic/hol_light/start_hol.ml
 create mode 100644 pkgs/applications/science/logic/hol_light/start_hol_light

diff --git a/pkgs/applications/science/logic/hol_light/binaries.nix b/pkgs/applications/science/logic/hol_light/binaries.nix
index 41d2f8237be..de89a7a5d4e 100644
--- a/pkgs/applications/science/logic/hol_light/binaries.nix
+++ b/pkgs/applications/science/logic/hol_light/binaries.nix
@@ -1,55 +1,60 @@
-{stdenv, ocaml_with_sources, hol_light, dmtcp, nettools, openssh}:
-# nettools and openssh needed for dmtcp restarting script.
+{stdenv, hol_light, dmtcp}:
 
 let
-  selfcheckpoint_core_ml = ./selfcheckpoint_core.ml;
-  selfcheckpoint_multivariate_ml = ./selfcheckpoint_multivariate.ml;
-  selfcheckpoint_complex_ml = ./selfcheckpoint_complex.ml;
+  cmd_core = ''
+    #use "${./start_hol.ml}";;
+    dmtcp_selfdestruct "";;
+  '';
+  cmd_multivariate = ''
+    loadt "Multivariate/make.ml";;
+    dmtcp_checkpoint "Preloaded with multivariate analysis";;
+  '';
+  cmd_complex = ''
+    loadt "Multivariate/complexes.ml";;
+    loadt "Multivariate/canal.ml";;
+    loadt "Multivariate/transcendentals.ml";;
+    loadt "Multivariate/realanalysis.ml";;
+    loadt "Multivariate/cauchy.ml";;
+    loadt "Multivariate/complex_database.ml";;
+    loadt "update_database.ml";;
+    dmtcp_checkpoint "Preloaded with multivariate-based complex analysis";;
+  '';
 in
 
 stdenv.mkDerivation {
   name = "hol_light_binaries-${hol_light.version}";
 
-  buildInputs = [ dmtcp ocaml_with_sources nettools openssh];
+  buildInputs = [ dmtcp hol_light hol_light.ocaml ];
 
   buildCommand = ''
-    HOL_DIR=${hol_light}/src/hol_light
-    BIN_DIR=$out/bin
-    ensureDir $BIN_DIR
+    HOL_DIR="${hol_light}/src/hol_light"
+    BIN_DIR="$out/bin"
+    ensureDir "$BIN_DIR"
 
     # HOL Light Core
-    dmtcp_coordinator --background
-    echo 'Unix.system "dmtcp_command -k";;\n' |
-      dmtcp_checkpoint -q -c "$BIN_DIR" \
-        ocaml -I "$HOL_DIR" -init ${selfcheckpoint_core_ml}
-    substituteInPlace dmtcp_restart_script.sh \
-      --replace dmtcp_restart "dmtcp_restart --quiet"
-    mv dmtcp_restart_script.sh $BIN_DIR/hol_light
-    dmtcp_command -q
+    (echo '${cmd_core}' | dmtcp_checkpoint --quiet ${hol_light}/bin/start_hol_light) || exit 0
+    mv ckpt* "$BIN_DIR/hol_light.ckpt"
+    substitute "${./restart_hol_light}" "$BIN_DIR/hol_light" \
+      --subst-var-by DMTCP_RESTART `type -p dmtcp_restart` \
+      --subst-var-by CKPT_FILE "$BIN_DIR/hol_light.ckpt"
+    chmod +x "$BIN_DIR/hol_light"
 
     # HOL Light Multivariate
-    dmtcp_coordinator --background
-    echo 'Unix.system "dmtcp_command -k";;\n' |
-      dmtcp_checkpoint -q -c "$BIN_DIR" \
-        ocaml -I "$HOL_DIR" -init ${selfcheckpoint_multivariate_ml}
-    substituteInPlace dmtcp_restart_script.sh \
-      --replace dmtcp_restart "dmtcp_restart --quiet"
-    mv dmtcp_restart_script.sh $BIN_DIR/hol_light_multivariate
-    dmtcp_command -q
+    cp "$BIN_DIR/hol_light.ckpt" .
+    (echo '${cmd_multivariate}' | dmtcp_restart --quiet hol_light.ckpt) || exit 0
+    mv hol_light.ckpt "$BIN_DIR/hol_light_multivariate.ckpt"
+    substitute "${./restart_hol_light}" "$BIN_DIR/hol_light_multivariate" \
+      --subst-var-by DMTCP_RESTART `type -p dmtcp_restart` \
+      --subst-var-by CKPT_FILE "$BIN_DIR/hol_light_multivariate.ckpt"
+    chmod +x "$BIN_DIR/hol_light_multivariate"
 
     # HOL Light Complex
-    dmtcp_coordinator --background
-    echo 'Unix.system "dmtcp_command -k";;\n' |
-      dmtcp_checkpoint -q -c "$BIN_DIR" \
-        ocaml -I "$HOL_DIR" -init ${selfcheckpoint_complex_ml}
-    substituteInPlace dmtcp_restart_script.sh \
-      --replace dmtcp_restart "dmtcp_restart --quiet"
-    mv dmtcp_restart_script.sh $BIN_DIR/hol_light_complex
-    dmtcp_command -q
+    cp "$BIN_DIR/hol_light_multivariate.ckpt" .
+    (echo '${cmd_complex}' | dmtcp_restart --quiet hol_light_multivariate.ckpt) || exit 0
+    mv hol_light_multivariate.ckpt "$BIN_DIR/hol_light_complex.ckpt"
+    substitute "${./restart_hol_light}" "$BIN_DIR/hol_light_complex" \
+      --subst-var-by DMTCP_RESTART `type -p dmtcp_restart` \
+      --subst-var-by CKPT_FILE "$BIN_DIR/hol_light_complex.ckpt"
+    chmod +x "$BIN_DIR/hol_light_complex"
   '';
-
-  meta = {
-    description = "Preload binaries for HOL Light.";
-    license = "BSD";
-  };
 }
diff --git a/pkgs/applications/science/logic/hol_light/configure-3.09.3 b/pkgs/applications/science/logic/hol_light/configure-3.09.3
deleted file mode 100755
index c5277689459..00000000000
--- a/pkgs/applications/science/logic/hol_light/configure-3.09.3
+++ /dev/null
@@ -1,1444 +0,0 @@
-#! /bin/sh
-
-#########################################################################
-#                                                                       #
-#                            Objective Caml                             #
-#                                                                       #
-#            Xavier Leroy, projet Cristal, INRIA Rocquencourt           #
-#                                                                       #
-#   Copyright 1999 Institut National de Recherche en Informatique et    #
-#   en Automatique.  All rights reserved.  This file is distributed     #
-#   under the terms of the GNU Library General Public License, with     #
-#   the special exception on linking described in file LICENSE.         #
-#                                                                       #
-#########################################################################
-
-# $Id: configure,v 1.228.2.5 2006/03/30 10:00:19 doligez Exp $
-
-configure_options="$*"
-prefix=/usr/local
-bindir=''
-libdir=''
-mandir=''
-manext=1
-host_type=unknown
-ccoption=''
-cclibs=''
-curseslibs=''
-mathlib='-lm'
-dllib=''
-x11_include_dir=''
-x11_lib_dir=''
-tk_wanted=yes
-pthread_wanted=yes
-tk_defs=''
-tk_libs=''
-tk_x11=yes
-dl_defs=''
-verbose=no
-withcurses=yes
-withsharedlibs=yes
-gcc_warnings="-Wall"
-
-# Try to turn internationalization off, can cause config.guess to malfunction!
-unset LANG
-unset LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME
-
-# Turn off some MacOS X debugging stuff, same reason
-unset RC_TRACE_ARCHIVES RC_TRACE_DYLIBS RC_TRACE_PREBINDING_DISABLED
-
-# Parse command-line arguments
-
-while : ; do
-  case "$1" in
-    "") break;;
-    -prefix|--prefix)
-        prefix=$2; shift;;
-    -bindir|--bindir)
-        bindir=$2; shift;;
-    -libdir|--libdir)
-        libdir=$2; shift;;
-    -mandir|--mandir)
-        case "$2" in
-          */man[1-9ln])
-            mandir=`echo $2 | sed -e 's|^\(.*\)/man.$|\1|'`
-            manext=`echo $2 | sed -e 's/^.*\(.\)$/\1/'`;;
-          *)
-            mandir=$2
-            manext=1;;
-        esac
-        shift;;
-    -host*|--host*)
-        host_type=$2; shift;;
-    -cc*)
-        ccoption="$2"; shift;;
-    -lib*)
-        cclibs="$2 $cclibs"; shift;;
-    -no-curses)
-        withcurses=no;;
-    -no-shared-libs)
-        withsharedlibs=no;;
-    -x11include*|--x11include*)
-        x11_include_dir=$2; shift;;
-    -x11lib*|--x11lib*)
-        x11_lib_dir=$2; shift;;
-    -with-pthread*|--with-pthread*)
-        ;; # Ignored for backward compatibility
-    -no-pthread*|--no-pthread*)
-        pthread_wanted=no;;
-    -no-tk|--no-tk)
-        tk_wanted=no;;
-    -tkdefs*|--tkdefs*)
-        tk_defs=$2; shift;;
-    -tklibs*|--tklibs*)
-        tk_libs=$2; shift;;
-    -tk-no-x11|--tk-no-x11)
-        tk_x11=no;;
-    -dldefs*|--dldefs*)
-        dl_defs="$2"; shift;;
-    -dllibs*|--dllibs*)
-        dllib="$2"; shift;;
-    -verbose|--verbose)
-        verbose=yes;;
-    *) echo "Unknown option \"$1\"." 1>&2; exit 2;;
-  esac
-  shift
-done
-
-# Sanity checks
-
-case "$prefix" in
-  /*) ;;
-   *) echo "The -prefix directory must be absolute." 1>&2; exit 2;;
-esac
-case "$bindir" in
-  /*) ;;
-  "") ;;
-   *) echo "The -bindir directory must be absolute." 1>&2; exit 2;;
-esac
-case "$libdir" in
-  /*) ;;
-  "") ;;
-   *) echo "The -libdir directory must be absolute." 1>&2; exit 2;;
-esac
-case "$mandir" in
-  /*) ;;
-  "") ;;
-   *) echo "The -mandir directory must be absolute." 1>&2; exit 2;;
-esac
-
-# Generate the files
-
-cd config/auto-aux
-rm -f s.h m.h Makefile
-touch s.h m.h Makefile
-
-# Write options to Makefile
-
-echo "# generated by ./configure $configure_options" >> Makefile
-
-# Where to install
-
-echo "PREFIX=$prefix" >> Makefile
-case "$bindir" in
-  "") echo 'BINDIR=$(PREFIX)/bin' >> Makefile
-      bindir="$prefix/bin";;
-   *) echo "BINDIR=$bindir" >> Makefile;;
-esac
-case "$libdir" in
-  "") echo 'LIBDIR=$(PREFIX)/lib/ocaml' >> Makefile
-      libdir="$prefix/lib/ocaml";;
-   *) echo "LIBDIR=$libdir" >> Makefile;;
-esac
-echo 'STUBLIBDIR=$(LIBDIR)/stublibs' >> Makefile
-case "$mandir" in
-  "") echo 'MANDIR=$(PREFIX)/man' >> Makefile
-      mandir="$prefix/man";;
-   *) echo "MANDIR=$mandir" >> Makefile;;
-esac
-echo "MANEXT=$manext" >> Makefile
-
-# Determine the system type
-
-if test "$host_type" = "unknown"; then
-  if host_type=`../gnu/config.guess`; then :; else
-    echo "Cannot guess host type"
-    echo "You must specify one with the -host option"
-    exit 2
-  fi
-fi
-if host=`../gnu/config.sub $host_type`; then :; else
-  echo "Please specify the correct host type with the -host option"
-  exit 2
-fi
-echo "Configuring for a $host ..."
-
-# Do we have gcc?
-
-if test -z "$ccoption"; then
-  if sh ./searchpath gcc; then
-    echo "gcc found"
-    cc=gcc
-  else
-    cc=cc
-  fi
-else
-  cc="$ccoption"
-fi
-
-# Check for buggy versions of GCC
-
-buggycc="no"
-
-case "$host,$cc" in
-  i[3456]86-*-*,gcc*)
-    case `$cc --version` in
-      2.7.2.1) cat <<'EOF'
-
-WARNING: you are using gcc version 2.7.2.1 on an Intel x86 processor.
-This version of gcc is known to generate incorrect code for the
-Objective Caml runtime system on some Intel x86 machines. (The symptom
-is a crash of boot/ocamlc when compiling stdlib/pervasives.mli.)
-In particular, the version of gcc 2.7.2.1 that comes with
-Linux RedHat 4.x / Intel is affected by this problem.
-Other Linux distributions might also be affected.
-If you are using one of these configurations, you are strongly advised
-to use another version of gcc, such as 2.95, which are
-known to work well with Objective Caml.
-
-Press <enter> to proceed or <interrupt> to stop.
-EOF
-        read reply;;
-      2.96*) cat <<'EOF'
-
-WARNING: you are using gcc version 2.96 on an Intel x86 processor.
-Certain patched versions of gcc 2.96 are known to generate incorrect
-code for the Objective Caml runtime system.  (The symptom is a segmentation
-violation on boot/ocamlc.)  Those incorrectly patched versions can be found
-in RedHat 7.2 and Mandrake 8.0 and 8.1; other Linux distributions
-might also be affected.  (See bug #57760 on bugzilla.redhat.com)
-
-Auto-configuration will now select gcc compiler flags that work around
-the problem.  Still, if you observe segmentation faults while running
-ocamlc or ocamlopt, you are advised to try another version of gcc,
-such as 2.95.3 or 3.2.
-
-EOF
-        buggycc="gcc.2.96";;
-
-            esac;;
-esac
-
-# Configure the bytecode compiler
-
-bytecc="$cc"
-bytecccompopts=""
-bytecclinkopts=""
-ostype="Unix"
-exe=""
-
-case "$bytecc,$host" in
-  cc,*-*-nextstep*)
-    # GNU C extensions disabled, but __GNUC__ still defined!
-    bytecccompopts="-fno-defer-pop $gcc_warnings -U__GNUC__ -posix"
-    bytecclinkopts="-posix";;
-  *,*-*-rhapsody*)
-    # Almost the same as NeXTStep
-    bytecccompopts="-fno-defer-pop $gcc_warnings -DSHRINKED_GNUC"
-    mathlib="";;
-  *,*-*-darwin*)
-    # Almost the same as rhapsody
-    bytecccompopts="-fno-defer-pop -no-cpp-precomp $gcc_warnings"
-    mathlib="";;
-  *,*-*-beos*)
-    bytecccompopts="-fno-defer-pop $gcc_warnings"
-    # No -lm library
-    mathlib="";;
-  gcc,alpha*-*-osf*)
-    bytecccompopts="-fno-defer-pop $gcc_warnings"
-    if cc="$bytecc" sh ./hasgot -mieee; then
-      bytecccompopts="-mieee $bytecccompopts";
-    fi
-    # Put code and static data in lower 4GB
-    bytecclinkopts="-Wl,-T,12000000 -Wl,-D,14000000"
-    # Tell gcc that we can use 32-bit code addresses for threaded code
-    echo "#define ARCH_CODE32" >> m.h;;
-  cc,alpha*-*-osf*)
-    bytecccompopts="-std1 -ieee";;
-  gcc,alpha*-*-linux*)
-    if cc="$bytecc" sh ./hasgot -mieee; then
-      bytecccompopts="-mieee $bytecccompopts";
-    fi;;
-  cc,mips-*-irix6*)
-    # Add -n32 flag to ensure compatibility with native-code compiler
-    bytecccompopts="-n32"
-    # Turn off warning "unused library"
-    bytecclinkopts="-n32 -Wl,-woff,84";;
-  cc*,mips-*-irix6*)
-    # (For those who want to force "cc -64")
-    # Turn off warning "unused library"
-    bytecclinkopts="-Wl,-woff,84";;
-  *,alpha*-*-unicos*)
-    # For the Cray T3E
-    bytecccompopts="-DUMK";;
-  gcc*,powerpc-*-aix*)
-    # Avoid name-space pollution by requiring Unix98-conformant includes
-    bytecccompopts="-fno-defer-pop $gcc_warnings -D_XOPEN_SOURCE=500";;
-  *,powerpc-*-aix*)
-    bytecccompopts="-D_XOPEN_SOURCE=500";;
-  gcc*,*-*-cygwin*)
-    bytecccompopts="-fno-defer-pop $gcc_warnings -U_WIN32"
-    exe=".exe"
-    ostype="Cygwin";;
-  gcc*,x86_64-*-linux*)
-    bytecccompopts="-fno-defer-pop $gcc_warnings"
-    # Tell gcc that we can use 32-bit code addresses for threaded code
-    # unless we are compiled for a shared library (-fPIC option)
-    echo "#ifndef __PIC__" >> m.h
-    echo "#  define ARCH_CODE32" >> m.h
-    echo "#endif" >> m.h;;
-  gcc*)
-    bytecccompopts="-fno-defer-pop $gcc_warnings";;
-esac
-
-# Configure compiler to use in further tests
-
-cc="$bytecc -O $bytecclinkopts"
-export cc cclibs verbose
-
-# Check C compiler
-
-sh ./runtest ansi.c
-case $? in
-  0) echo "The C compiler is ANSI-compliant.";;
-  1) echo "The C compiler $cc is not ANSI-compliant."
-     echo "You need an ANSI C compiler to build Objective Caml."
-     exit 2;;
-  *) echo "Unable to compile the test program."
-     echo "Make sure the C compiler $cc is properly installed."
-     exit 2;;
-esac
-
-# Check the sizes of data types
-
-echo "Checking the sizes of integers and pointers..."
-set `sh ./runtest sizes.c`
-case "$2,$3" in
-  4,4) echo "OK, this is a regular 32 bit architecture."
-       echo "#undef ARCH_SIXTYFOUR" >> m.h;;
-  *,8) echo "Wow! A 64 bit architecture!"
-       echo "#define ARCH_SIXTYFOUR" >> m.h;;
-  *,*) echo "This architecture seems to be neither 32 bits nor 64 bits."
-       echo "Objective Caml won't run on this architecture."
-       exit 2;;
-    *) echo "Unable to compile the test program."
-       echo "Make sure the C compiler $cc is properly installed."
-       exit 2;;
-esac
-if test $1 != 4 && test $2 != 4 && test $4 != 4; then
-  echo "Sorry, we can't find a 32-bit integer type"
-  echo "(sizeof(short) = $4, sizeof(int) = $1, sizeof(long) = $2)"
-  echo "Objective Caml won't run on this architecture."
-  exit 2
-fi
-
-echo "#define SIZEOF_INT $1" >> m.h
-echo "#define SIZEOF_LONG $2" >> m.h
-echo "#define SIZEOF_PTR $3" >> m.h
-echo "#define SIZEOF_SHORT $4" >> m.h
-
-if test $2 = 8; then
-     echo "#define ARCH_INT64_TYPE long" >> m.h
-     echo "#define ARCH_UINT64_TYPE unsigned long" >> m.h
-     echo '#define ARCH_INT64_PRINTF_FORMAT "l"' >> m.h
-     int64_native=true
-else
-  sh ./runtest longlong.c
-  case $? in
-  0) echo "64-bit \"long long\" integer type found (printf with \"%ll\")."
-     echo "#define ARCH_INT64_TYPE long long" >> m.h
-     echo "#define ARCH_UINT64_TYPE unsigned long long" >> m.h
-     echo '#define ARCH_INT64_PRINTF_FORMAT "ll"' >> m.h
-     int64_native=true;;
-  1) echo "64-bit \"long long\" integer type found (printf with \"%q\")."
-     echo "#define ARCH_INT64_TYPE long long" >> m.h
-     echo "#define ARCH_UINT64_TYPE unsigned long long" >> m.h
-     echo '#define ARCH_INT64_PRINTF_FORMAT "q"' >> m.h
-     int64_native=true;;
-  2) echo "64-bit \"long long\" integer type found (but no printf)."
-     echo "#define ARCH_INT64_TYPE long long" >> m.h
-     echo "#define ARCH_UINT64_TYPE unsigned long long" >> m.h
-     echo '#undef ARCH_INT64_PRINTF_FORMAT' >> m.h
-     int64_native=true;;
-  *) echo "No suitable 64-bit integer type found, will use software emulation."
-     echo "#undef ARCH_INT64_TYPE" >> m.h
-     echo "#undef ARCH_UINT64_TYPE" >> m.h
-     echo '#undef ARCH_INT64_PRINTF_FORMAT' >> m.h
-     int64_native=false;;
-  esac
-fi
-
-if test $3 = 8 && test $int64_native = false; then
-  echo "This architecture has 64-bit pointers but no 64-bit integer type."
-  echo "Objective Caml won't run on this architecture."
-  exit 2
-fi
-
-# Determine endianness
-
-sh ./runtest endian.c
-case $? in
-  0) echo "This is a big-endian architecture."
-     echo "#define ARCH_BIG_ENDIAN" >> m.h;;
-  1) echo "This is a little-endian architecture."
-     echo "#undef ARCH_BIG_ENDIAN" >> m.h;;
-  2) echo "This architecture seems to be neither big endian nor little endian."
-     echo "Objective Caml won't run on this architecture."
-     exit 2;;
-  *) echo "Something went wrong during endianness determination."
-     echo "You'll have to figure out endianness yourself"
-     echo "(option ARCH_BIG_ENDIAN in m.h).";;
-esac
-
-# Determine alignment constraints
-
-case "$host" in
-  sparc*-*-*|hppa*-*-*)
-    # On Sparc V9 with certain versions of gcc, determination of double
-    # alignment is not reliable (PR#1521), hence force it.
-    # Same goes for hppa.
-    # But there's a knack (PR#2572):
-    # if we're in 64-bit mode (sizeof(long) == 8),
-    # we must not doubleword-align floats...
-    if test $2 = 8; then
-      echo "Doubles can be word-aligned."
-      echo "#undef ARCH_ALIGN_DOUBLE" >> m.h
-    else
-      echo "Doubles must be doubleword-aligned."
-      echo "#define ARCH_ALIGN_DOUBLE" >> m.h
-    fi;;
-  *)
-    sh ./runtest dblalign.c
-    case $? in
-      0) echo "Doubles can be word-aligned."
-         echo "#undef ARCH_ALIGN_DOUBLE" >> m.h;;
-      1) echo "Doubles must be doubleword-aligned."
-         echo "#define ARCH_ALIGN_DOUBLE" >> m.h;;
-      *) echo "Something went wrong during alignment determination for doubles."
-         echo "I'm going to assume this architecture has alignment constraints over doubles."
-         echo "That's a safe bet: Objective Caml will work even if"
-         echo "this architecture has actually no alignment constraints."
-         echo "#define ARCH_ALIGN_DOUBLE" >> m.h;;
-    esac;;
-esac
-
-if $int64_native; then
-  case "$host" in
-    sparc*-*-*|hppa*-*-*)
-      if test $2 = 8; then
-        echo "64-bit integers can be word-aligned."
-        echo "#undef ARCH_ALIGN_INT64" >> m.h
-      else
-        echo "64-bit integers must be doubleword-aligned."
-        echo "#define ARCH_ALIGN_INT64" >> m.h
-      fi;;
-    *)
-      sh ./runtest int64align.c
-      case $? in
-        0) echo "64-bit integers can be word-aligned."
-           echo "#undef ARCH_ALIGN_INT64" >> m.h;;
-        1) echo "64-bit integers must be doubleword-aligned."
-           echo "#define ARCH_ALIGN_INT64" >> m.h;;
-        *) echo "Something went wrong during alignment determination for 64-bit integers."
-           echo "I'm going to assume this architecture has alignment constraints."
-           echo "That's a safe bet: Objective Caml will work even if"
-           echo "this architecture has actually no alignment constraints."
-           echo "#define ARCH_ALIGN_INT64" >> m.h;;
-      esac
-  esac
-else
-  echo "#undef ARCH_ALIGN_INT64" >> m.h
-fi
-
-# Check semantics of division and modulus
-
-sh ./runtest divmod.c
-case $? in
-  0) echo "Native division and modulus have round-towards-zero semantics, will use them."
-     echo "#undef NONSTANDARD_DIV_MOD" >> m.h;;
-  1) echo "Native division and modulus do not have round-towards-zero semantics, will use software emulation."
-     echo "#define NONSTANDARD_DIV_MOD" >> m.h;;
-  *) echo "Something went wrong while checking native division and modulus, please report it."
-     echo "#define NONSTANDARD_DIV_MOD" >> m.h;;
-esac
-
-# Shared library support
-
-shared_libraries_supported=false
-dl_needs_underscore=false
-sharedcccompopts=''
-mksharedlib=''
-byteccrpath=''
-mksharedlibrpath=''
-
-if test $withsharedlibs = "yes"; then
-  case "$host" in
-    *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-gnu*)
-      sharedcccompopts="-fPIC"
-      mksharedlib="$bytecc -shared -o"
-      bytecclinkopts="$bytecclinkopts -Wl,-E"
-      byteccrpath="-Wl,-rpath,"
-      mksharedlibrpath="-Wl,-rpath,"
-      shared_libraries_supported=true;;
-    alpha*-*-osf*)
-      case "$bytecc" in
-        gcc*)
-          sharedcccompopts="-fPIC"
-          mksharedlib="$bytecc -shared -o"
-          byteccrpath="-Wl,-rpath,"
-          mksharedlibrpath="-Wl,-rpath,"
-          shared_libraries_supported=true;;
-        cc*)
-          sharedcccompopts=""
-          mksharedlib="ld -shared -expect_unresolved '*' -o"
-          byteccrpath="-Wl,-rpath,"
-          mksharedlibrpath="-rpath "
-          shared_libraries_supported=true;;
-      esac;;
-    *-*-solaris2*)
-      case "$bytecc" in
-        gcc*)
-          sharedcccompopts="-fPIC"
-          if sh ./solaris-ld; then
-            mksharedlib="$bytecc -shared -o"
-            byteccrpath="-R"
-            mksharedlibrpath="-R"
-          else
-            mksharedlib="$bytecc -shared -o"
-            bytecclinkopts="$bytecclinkopts -Wl,-E"
-            byteccrpath="-Wl,-rpath,"
-            mksharedlibrpath="-Wl,-rpath,"
-          fi
-          shared_libraries_supported=true;;
-        *)
-          sharedcccompopts="-KPIC"
-          byteccrpath="-R"
-          mksharedlibrpath="-R"
-          mksharedlib="/usr/ccs/bin/ld -G -o"
-          shared_libraries_supported=true;;
-      esac;;
-    mips*-*-irix[56]*)
-      case "$bytecc" in
-        cc*) sharedcccompopts="";;
-        gcc*) sharedcccompopts="-fPIC";;
-      esac
-      mksharedlib="ld -shared -rdata_shared -o"
-      byteccrpath="-Wl,-rpath,"
-      mksharedlibrpath="-rpath "
-      shared_libraries_supported=true;;
-    powerpc-apple-darwin*)
-      mksharedlib="cc -bundle -flat_namespace -undefined suppress -o"
-      bytecccompopts="$dl_defs $bytecccompopts"
-      #sharedcccompopts="-fnocommon"
-      dl_needs_underscore=true
-      shared_libraries_supported=true;;
-  esac
-fi
-
-# Further machine-specific hacks
-
-case "$host" in
-  ia64-*-linux*|alpha*-*-linux*|x86_64-*-linux*)
-    echo "Will use mmap() instead of malloc() for allocation of major heap chunks."
-    echo "#define USE_MMAP_INSTEAD_OF_MALLOC" >> s.h;;
-esac
-
-# Configure the native-code compiler
-
-arch=none
-model=default
-system=unknown
-
-case "$host" in
-  alpha*-*-osf*)                arch=alpha; system=digital;;
-  alpha*-*-linux*)              arch=alpha; system=linux;;
-  alpha*-*-gnu*)                arch=alpha; system=gnu;;
-  alpha*-*-freebsd*)            arch=alpha; system=freebsd;;
-  alpha*-*-netbsd*)             arch=alpha; system=netbsd;;
-  alpha*-*-openbsd*)            arch=alpha; system=openbsd;;
-  sparc*-*-sunos4.*)            arch=sparc; system=sunos;;
-  sparc*-*-solaris2.*)          arch=sparc; system=solaris;;
-  sparc*-*-*bsd*)               arch=sparc; system=bsd;;
-  sparc*-*-linux*)              arch=sparc; system=linux;;
-  sparc*-*-gnu*)                arch=sparc; system=gnu;;
-  i[3456]86-*-linux*)           arch=i386; system=linux_`sh ./runtest elf.c`;;
-  i[3456]86-*-*bsd*)            arch=i386; system=bsd_`sh ./runtest elf.c`;;
-  i[3456]86-*-nextstep*)        arch=i386; system=nextstep;;
-  i[3456]86-*-solaris*)         arch=i386; system=solaris;;
-  i[3456]86-*-beos*)            arch=i386; system=beos;;
-  i[3456]86-*-cygwin*)          arch=i386; system=cygwin;;
-  i[3456]86-*-darwin*)          arch=i386; system=macosx;;
-  i[3456]86-*-gnu*)             arch=i386; system=gnu;;
-  mips-*-irix6*)                arch=mips; system=irix;;
-  hppa1.1-*-hpux*)              arch=hppa; system=hpux;;
-  hppa2.0*-*-hpux*)             arch=hppa; system=hpux;;
-  hppa*-*-linux*)               arch=hppa; system=linux;;
-  hppa*-*-gnu*)                 arch=hppa; system=gnu;;
-  powerpc-*-linux*)             arch=power; model=ppc; system=elf;;
-  powerpc-*-netbsd*)            arch=power; model=ppc; system=bsd;;
-  powerpc-*-rhapsody*)          arch=power; model=ppc; system=rhapsody;;
-  powerpc-*-darwin*)            arch=power; model=ppc; system=rhapsody;;
-  arm*-*-linux*)                arch=arm; system=linux;;
-  arm*-*-gnu*)                  arch=arm; system=gnu;;
-  ia64-*-linux*)                arch=ia64; system=linux;;
-  ia64-*-gnu*)                  arch=ia64; system=gnu;;
-  ia64-*-freebsd*)              arch=ia64; system=freebsd;;
-  x86_64-*-linux*)              arch=amd64; system=linux;;
-  x86_64-*-gnu*)                arch=amd64; system=gnu;;
-  x86_64-*-freebsd*)            arch=amd64; system=freebsd;;
-  x86_64-*-openbsd*)            arch=amd64; system=openbsd;;
-esac
-
-if test -z "$ccoption"; then
-  case "$arch,$system,$cc" in
-    alpha,digital,gcc*) nativecc=cc;;
-    mips,*,gcc*) nativecc=cc;;
-    *) nativecc="$bytecc";;
-  esac
-else
-  nativecc="$ccoption"
-fi
-
-nativecccompopts=''
-nativecclinkopts=''
-nativeccrpath="$byteccrpath"
-
-case "$arch,$nativecc,$system,$host_type" in
-  alpha,cc*,digital,*) nativecccompopts=-std1;;
-  mips,cc*,irix,*)     nativecccompopts=-n32
-                       nativecclinkopts="-n32 -Wl,-woff,84";;
-  *,*,nextstep,*)      nativecccompopts="$gcc_warnings -U__GNUC__ -posix"
-                       nativecclinkopts="-posix";;
-  *,*,rhapsody,*darwin[1-5].*)
-                       nativecccompopts="$gcc_warnings -DSHRINKED_GNUC";;
-  *,*,rhapsody,*)
-                 nativecccompopts="$gcc_warnings -DDARWIN_VERSION_6 $dl_defs";;
-  *,gcc*,cygwin,*)     nativecccompopts="$gcc_warnings -U_WIN32";;
-  *,gcc*,*,*)          nativecccompopts="$gcc_warnings";;
-esac
-
-asflags=''
-aspp='$(AS)'
-asppflags=''
-asppprofflags='-DPROFILING'
-
-case "$arch,$model,$system" in
-  alpha,*,digital)  asflags='-O2'; asppflags='-O2 -DSYS_$(SYSTEM)';
-                    asppprofflags='-pg -DPROFILING';;
-  alpha,*,linux)    aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';;
-  alpha,*,gnu)      aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';;
-  alpha,*,freebsd)  aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';;
-  alpha,*,netbsd)   aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';;
-  alpha,*,openbsd)  aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';;
-  mips,*,irix)      asflags='-n32 -O2'; asppflags="$asflags";;
-  sparc,*,bsd)      aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';;
-  sparc,*,linux)    aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';;
-  sparc,*,gnu)      aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';;
-  sparc,*,*)        case "$cc" in
-                      gcc*) aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';;
-                         *) asppflags='-P -DSYS_$(SYSTEM)';;
-                    esac;;
-  i386,*,solaris)   aspp='/usr/ccs/bin/as'; asppflags='-P -DSYS_$(SYSTEM)';;
-  i386,*,*)         aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';;
-  hppa,*,*)         aspp="$cc"; asppflags='-traditional -c -DSYS_$(SYSTEM)';;
-  power,*,elf)      aspp='gcc'; asppflags='-c';;
-  power,*,bsd)      aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';;
-  power,*,rhapsody) ;;
-  arm,*,linux)      aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';;
-  arm,*,gnu)        aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';;
-  ia64,*,*)         asflags=-xexplicit
-                    aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM) -Wa,-xexplicit';;
-  amd64,*,*)        aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';;
-esac
-
-cc_profile='-pg'
-case "$arch,$model,$system" in
-  alpha,*,digital) profiling='prof';;
-  i386,*,linux_elf) profiling='prof';;
-  i386,*,gnu) profiling='prof';;
-  i386,*,bsd_elf) profiling='prof';;
-  sparc,*,solaris)
-    profiling='prof'
-    case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;;
-  amd64,*,linux) profiling='prof';;
-  amd64,*,gnu) profiling='prof';;
-  *) profiling='noprof';;
-esac
-
-# Where is ranlib?
-
-if sh ./searchpath ranlib; then
-  echo "ranlib found"
-  echo "RANLIB=ranlib" >> Makefile
-  echo "RANLIBCMD=ranlib" >> Makefile
-else
-  echo "ranlib not used"
-  echo "RANLIB=ar rs" >> Makefile
-  echo "RANLIBCMD=" >> Makefile
-fi
-
-# Do #! scripts work?
-
-# BRAVO: check disabled for NixOS
-# if (SHELL=/bin/sh; export SHELL; (./sharpbang || ./sharpbang2) >/dev/null); then
-#   echo "#! appears to work in shell scripts"
-  case "$host" in
-    *-*-sunos*|*-*-unicos*)
-      echo "We won't use it, though, because under SunOS and Unicos it breaks"
-      echo "on pathnames longer than 30 characters"
-      echo "SHARPBANGSCRIPTS=false" >> Makefile;;
-    *-*-cygwin*)
-      echo "We won't use it, though, because of conflicts with .exe extension"
-      echo "under Cygwin"
-      echo "SHARPBANGSCRIPTS=false" >> Makefile;;
-    *)
-      echo "SHARPBANGSCRIPTS=true" >> Makefile;;
-  esac
-# else
-#   echo "No support for #! in shell scripts"
-#   echo "SHARPBANGSCRIPTS=false" >> Makefile
-# fi
-
-# Write the OS type (Unix or Cygwin)
-
-echo "#define OCAML_OS_TYPE \"$ostype\"" >> s.h
-echo "#define OCAML_STDLIB_DIR \"$libdir\"" >> s.h
-
-# Use 64-bit file offset if possible
-
-bytecccompopts="$bytecccompopts -D_FILE_OFFSET_BITS=64"
-nativecccompopts="$nativecccompopts -D_FILE_OFFSET_BITS=64"
-
-# Check the semantics of signal handlers
-
-if sh ./hasgot sigaction sigprocmask; then
-  echo "POSIX signal handling found."
-  echo "#define POSIX_SIGNALS" >> s.h
-else
-  if sh ./runtest signals.c; then
-    echo "Signals have the BSD semantics."
-    echo "#define BSD_SIGNALS" >> s.h
-  else
-    echo "Signals have the System V semantics."
-  fi
-  if sh ./hasgot sigsetmask; then
-    echo "sigsetmask() found"
-    echo "#define HAS_SIGSETMASK" >> s.h
-  fi
-fi
-
-# For the sys module
-
-if sh ./hasgot getrusage; then
-  echo "getrusage() found."
-  echo "#define HAS_GETRUSAGE" >> s.h
-fi
-
-if sh ./hasgot times; then
-  echo "times() found."
-  echo "#define HAS_TIMES" >> s.h
-fi
-
-# For the terminfo module
-
-if test "$withcurses" = "yes"; then
-  for libs in "" "-lcurses" "-ltermcap" "-lcurses -ltermcap" "-lncurses"; do
-    if sh ./hasgot $libs tgetent tgetstr tgetnum tputs; then
-      echo "termcap functions found (with libraries '$libs')"
-      echo "#define HAS_TERMCAP" >> s.h
-      curseslibs="${libs}"
-      break
-    fi
-  done
-fi
-
-# Configuration for the libraries
-
-otherlibraries="unix str num dynlink bigarray"
-
-# For the Unix library
-
-has_sockets=no
-if sh ./hasgot socket socketpair bind listen accept connect; then
-  echo "You have BSD sockets."
-  echo "#define HAS_SOCKETS" >> s.h
-  has_sockets=yes
-elif sh ./hasgot -lnsl -lsocket socket socketpair bind listen accept connect; then
-  echo "You have BSD sockets (with libraries '-lnsl -lsocket')"
-  cclibs="$cclibs -lnsl -lsocket"
-  echo "#define HAS_SOCKETS" >> s.h
-  has_sockets=yes
-fi
-
-if sh ./hasgot -i sys/socket.h -t socklen_t; then
-  echo "socklen_t is defined in <sys/socket.h>"
-  echo "#define HAS_SOCKLEN_T" >> s.h
-fi
-
-if sh ./hasgot inet_aton; then
-  echo "inet_aton() found."
-  echo "#define HAS_INET_ATON" >> s.h
-fi
-
-if sh ./hasgot -i sys/types.h -i sys/socket.h -i netinet/in.h \
-               -t 'struct sockaddr_in6' \
-&& sh ./hasgot getaddrinfo getnameinfo inet_pton inet_ntop; then
-  echo "IPv6 is supported."
-  echo "#define HAS_IPV6" >> s.h
-fi
-
-if sh ./hasgot -i unistd.h; then
-  echo "unistd.h found."
-  echo "#define HAS_UNISTD" >> s.h
-fi
-
-if sh ./hasgot -i sys/types.h -t off_t; then
-  echo "off_t is defined in <sys/types.h>"
-  echo "#define HAS_OFF_T" >> s.h
-fi
-
-if sh ./hasgot -i sys/types.h -i dirent.h; then
-  echo "dirent.h found."
-  echo "#define HAS_DIRENT" >> s.h
-fi
-
-if sh ./hasgot rewinddir; then
-  echo "rewinddir() found."
-  echo "#define HAS_REWINDDIR" >> s.h
-fi
-
-if sh ./hasgot lockf; then
-  echo "lockf() found."
-  echo "#define HAS_LOCKF" >> s.h
-fi
-
-if sh ./hasgot mkfifo; then
-  echo "mkfifo() found."
-  echo "#define HAS_MKFIFO" >> s.h
-fi
-
-if sh ./hasgot getcwd; then
-  echo "getcwd() found."
-  echo "#define HAS_GETCWD" >> s.h
-fi
-
-if sh ./hasgot getwd; then
-  echo "getwd() found."
-  echo "#define HAS_GETWD" >> s.h
-fi
-
-if sh ./hasgot getpriority setpriority; then
-  echo "getpriority() found."
-  echo "#define HAS_GETPRIORITY" >> s.h
-fi
-
-if sh ./hasgot -i sys/types.h -i utime.h && sh ./hasgot utime; then
-  echo "utime() found."
-  echo "#define HAS_UTIME" >> s.h
-fi
-
-if sh ./hasgot utimes; then
-  echo "utimes() found."
-  echo "#define HAS_UTIMES" >> s.h
-fi
-
-if sh ./hasgot dup2; then
-  echo "dup2() found."
-  echo "#define HAS_DUP2" >> s.h
-fi
-
-if sh ./hasgot fchmod fchown; then
-  echo "fchmod() found."
-  echo "#define HAS_FCHMOD" >> s.h
-fi
-
-if sh ./hasgot truncate ftruncate; then
-  echo "truncate() found."
-  echo "#define HAS_TRUNCATE" >> s.h
-fi
-
-select_include=''
-if sh ./hasgot -i sys/types.h -i sys/select.h; then
-  echo "sys/select.h found."
-  echo "#define HAS_SYS_SELECT_H" >> s.h
-  select_include='-i sys/select.h'
-fi
-
-has_select=no
-if sh ./hasgot select && \
-   sh ./hasgot -i sys/types.h $select_include -t fd_set ; then
-  echo "select() found."
-  echo "#define HAS_SELECT" >> s.h
-  has_select=yes
-fi
-
-if sh ./hasgot symlink readlink lstat;  then
-  echo "symlink() found."
-  echo "#define HAS_SYMLINK" >> s.h
-fi
-
-has_wait=no
-if sh ./hasgot waitpid;  then
-  echo "waitpid() found."
-  echo "#define HAS_WAITPID" >> s.h
-  has_wait=yes
-fi
-
-if sh ./hasgot wait4;  then
-  echo "wait4() found."
-  echo "#define HAS_WAIT4" >> s.h
-  has_wait=yes
-fi
-
-if sh ./hasgot -i limits.h && sh ./runtest getgroups.c; then
-  echo "getgroups() found."
-  echo "#define HAS_GETGROUPS" >> s.h
-fi
-
-if sh ./hasgot -i termios.h &&
-   sh ./hasgot tcgetattr tcsetattr tcsendbreak tcflush tcflow; then
-  echo "POSIX termios found."
-  echo "#define HAS_TERMIOS" >> s.h
-fi
-
-# Async I/O under OSF1 3.x are so buggy that the test program hangs...
-testasyncio=true
-if test -f /usr/bin/uname; then
-  case "`/usr/bin/uname -s -r`" in
-    "OSF1 V3."*) testasyncio=false;;
-  esac
-fi
-if $testasyncio && sh ./runtest async_io.c; then
-  echo "Asynchronous I/O are supported."
-  echo "#define HAS_ASYNC_IO" >> s.h
-fi
-
-has_setitimer=no
-if sh ./hasgot setitimer; then
-  echo "setitimer() found."
-  echo "#define HAS_SETITIMER" >> s.h
-  has_setitimer="yes"
-fi
-
-if sh ./hasgot gethostname; then
-  echo "gethostname() found."
-  echo "#define HAS_GETHOSTNAME" >> s.h
-fi
-
-if sh ./hasgot -i sys/utsname.h && sh ./hasgot uname; then
-  echo "uname() found."
-  echo "#define HAS_UNAME" >> s.h
-fi
-
-has_gettimeofday=no
-if sh ./hasgot gettimeofday; then
-  echo "gettimeofday() found."
-  echo "#define HAS_GETTIMEOFDAY" >> s.h
-  has_gettimeofday="yes"
-fi
-
-if sh ./hasgot mktime; then
-  echo "mktime() found."
-  echo "#define HAS_MKTIME" >> s.h
-fi
-
-case "$host" in
-  *-*-cygwin*) ;;  # setsid emulation under Cygwin breaks the debugger
-  *) if sh ./hasgot setsid; then
-       echo "setsid() found."
-       echo "#define HAS_SETSID" >> s.h
-     fi;;
-esac
-
-if sh ./hasgot putenv; then
-  echo "putenv() found."
-  echo "#define HAS_PUTENV" >> s.h
-fi
-
-if sh ./hasgot -i locale.h && sh ./hasgot setlocale; then
-  echo "setlocale() and <locale.h> found."
-  echo "#define HAS_LOCALE" >> s.h
-fi
-
-if sh ./hasgot -i mach-o/dyld.h && sh ./hasgot NSLinkModule; then
-  echo "NSLinkModule() found. Using darwin dynamic loading."
-  echo "#define HAS_NSLINKMODULE" >> s.h
-elif sh ./hasgot $dllib dlopen; then
-  echo "dlopen() found."
-elif sh ./hasgot $dllib -ldl dlopen; then
-  echo "dlopen() found in -ldl."
-  dllib="$dllib -ldl"
-else
-  shared_libraries_supported=no
-fi
-
-if $shared_libraries_supported; then
-  echo "Dynamic loading of shared libraries is supported."
-  echo "#define SUPPORT_DYNAMIC_LINKING" >> s.h
-  if $dl_needs_underscore; then
-    echo '#define DL_NEEDS_UNDERSCORE' >>s.h
-  fi
-fi
-
-if sh ./hasgot -i sys/types.h -i sys/mman.h && sh ./hasgot mmap munmap; then
-  echo "mmap() found."
-  echo "#define HAS_MMAP" >> s.h
-fi
-
-nargs=none
-for i in 5 6; do
-  if sh ./trycompile -DNUM_ARGS=${i} gethostbyname.c; then nargs=$i; break; fi
-done
-if test $nargs != "none"; then
-  echo "gethostbyname_r() found (with ${nargs} arguments)."
-  echo "#define HAS_GETHOSTBYNAME_R $nargs" >> s.h
-fi
-
-nargs=none
-for i in 7 8; do
-  if sh ./trycompile -DNUM_ARGS=${i} gethostbyaddr.c; then nargs=$i; break; fi
-done
-if test $nargs != "none"; then
-  echo "gethostbyaddr_r() found (with ${nargs} arguments)."
-  echo "#define HAS_GETHOSTBYADDR_R $nargs" >> s.h
-fi
-
-# Determine if the debugger is supported
-
-if test "$has_sockets" = "yes"; then
-  echo "Replay debugger supported."
-  debugger="ocamldebugger"
-else
-  echo "No replay debugger (missing system calls)"
-  debugger=""
-fi
-
-
-# Determine if system stack overflows can be detected
-
-case "$arch,$system" in
-  i386,linux_elf|amd64,linux)
-    echo "System stack overflow can be detected."
-    echo "#define HAS_STACK_OVERFLOW_DETECTION" >> s.h;;
-  *)
-    echo "Cannot detect system stack overflow.";;
-esac
-
-# Determine the target architecture for the "num" library
-
-case "$host" in
-  alpha*-*-*)    bng_arch=alpha; bng_asm_level=1;;
-  i[3456]86-*-*) bng_arch=ia32
-                 if sh ./trycompile ia32sse2.c
-                 then bng_asm_level=2
-                 else bng_asm_level=1
-                 fi;;
-  mips-*-*)      bng_arch=mips; bng_asm_level=1;;
-  powerpc-*-*)   bng_arch=ppc; bng_asm_level=1;;
-  sparc*-*-*)    bng_arch=sparc; bng_asm_level=1;;
-  x86_64-*-*)    bng_arch=amd64; bng_asm_level=1;;
-  *)             bng_arch=generic; bng_asm_level=0;;
-esac
-
-echo "BNG_ARCH=$bng_arch" >> Makefile
-echo "BNG_ASM_LEVEL=$bng_asm_level" >> Makefile
-
-# Determine if the POSIX threads library is supported
-
-systhread_support=false
-
-if test "$pthread_wanted" = "yes"; then
-  case "$host" in
-    *-*-solaris*)  pthread_link="-lpthread -lposix4";;
-    *-*-freebsd*)  pthread_link="-pthread";;
-    *-*-openbsd*)  pthread_link="-pthread";;
-    *)             pthread_link="-lpthread";;
-  esac
-  if ./hasgot -i pthread.h $pthread_link pthread_self; then
-    echo "POSIX threads library supported."
-    systhread_support=true
-    otherlibraries="$otherlibraries systhreads"
-    bytecccompopts="$bytecccompopts -D_REENTRANT"
-    nativecccompopts="$nativecccompopts -D_REENTRANT"
-    case "$host" in
-      *-*-freebsd*)
-          bytecccompopts="$bytecccompopts -D_THREAD_SAFE"
-          nativecccompopts="$nativecccompopts -D_THREAD_SAFE";;
-      *-*-openbsd*)
-          bytecccompopts="$bytecccompopts -pthread"
-          asppflags="$asppflags -pthread"
-          nativecccompopts="$nativecccompopts -pthread";;
-    esac
-    echo "Options for linking with POSIX threads: $pthread_link"
-    echo "PTHREAD_LINK=$pthread_link" >> Makefile
-    if sh ./hasgot $pthread_link sigwait; then
-      echo "sigwait() found"
-      echo "#define HAS_SIGWAIT" >> s.h
-    fi
-  else
-    echo "POSIX threads not found."
-    pthread_link=""
-  fi
-fi
-
-# Determine if the bytecode thread library is supported
-
-if test "$has_select" = "yes" \
-&& test "$has_setitimer" = "yes" \
-&& test "$has_gettimeofday" = "yes" \
-&& test "$has_wait" = "yes"; then
-  echo "Bytecode threads library supported."
-  otherlibraries="$otherlibraries threads"
-else
-  echo "Bytecode threads library not supported (missing system calls)"
-fi
-
-# Determine the location of X include files and libraries
-
-x11_include="not found"
-x11_link="not found"
-
-for dir in \
-    $x11_include_dir          \
-    ; \
-do
-  if test -f $dir/X11/X.h; then
-    x11_include=$dir
-    break
-  fi
-done
-
-if test "$x11_include" = "not found"; then
-  x11_try_lib_dir=''
-else
-  x11_try_lib_dir=`echo $x11_include | sed -e 's|include|lib|'`
-fi
-
-for dir in \
-    $x11_lib_dir          \
-    $x11_try_lib_dir      \
-    ; \
-do
-  if test -f $dir/libX11.a || \
-     test -f $dir/libX11.so || \
-     test -f $dir/libX11.dll.a || \
-     test -f $dir/libX11.sa; then
-    if test $dir = /usr/lib; then
-      x11_link="-lX11"
-    else
-      x11_link="-L$dir -lX11"
-      x11_libs="-L$dir"
-    fi
-    break
-  fi
-done
-
-
-if test "$x11_include" = "not found" || test "$x11_link" = "not found"
-then
-  echo "X11 not found, the \"graph\" library will not be supported."
-  x11_include=""
-else
-  echo "Location of X11 include files: $x11_include/X11"
-  echo "Options for linking with X11: $x11_link"
-  otherlibraries="$otherlibraries graph"
-  if test "$x11_include" = "/usr/include"; then
-    x11_include=""
-  else
-    x11_include="-I$x11_include"
-  fi
-  echo "X11_INCLUDES=$x11_include" >> Makefile
-  echo "X11_LINK=$x11_link" >> Makefile
-fi
-
-# See if we can compile the dbm library
-
-dbm_include="not found"
-dbm_link="not found"
-use_gdbm_ndbm=no
-
-for dir in /usr/include /usr/include/db1 /usr/include/gdbm; do
-  if test -f $dir/ndbm.h; then
-    dbm_include=$dir
-    if sh ./hasgot dbm_open; then
-      dbm_link=""
-    elif sh ./hasgot -lndbm dbm_open; then
-      dbm_link="-lndbm"
-    elif sh ./hasgot -ldb1 dbm_open; then
-      dbm_link="-ldb1"
-    elif sh ./hasgot -lgdbm dbm_open; then
-      dbm_link="-lgdbm"
-    elif sh ./hasgot -lgdbm_compat -lgdbm dbm_open; then
-      dbm_link="-lgdbm_compat -lgdbm"
-    fi
-    break
-  fi
-  if test -f $dir/gdbm-ndbm.h; then
-    dbm_include=$dir
-    use_gdbm_ndbm=yes
-    if sh ./hasgot -lgdbm_compat -lgdbm dbm_open; then
-      dbm_link="-lgdbm_compat -lgdbm"
-    fi
-    break
-  fi
-done
-if test "$dbm_include" = "not found" || test "$dbm_link" = "not found"; then
-  echo "NDBM not found, the \"dbm\" library will not be supported."
-else
-  echo "NDBM found (in $dbm_include)"
-  if test "$dbm_include" = "/usr/include"; then
-    dbm_include=""
-  else
-    dbm_include="-I$dbm_include"
-  fi
-  echo "DBM_INCLUDES=$dbm_include" >> Makefile
-  echo "DBM_LINK=$dbm_link" >> Makefile
-  if test "$use_gdbm_ndbm" = "yes"; then
-    echo "#define DBM_USES_GDBM_NDBM" >> s.h
-  fi
-  otherlibraries="$otherlibraries dbm"
-fi
-
-# Look for tcl/tk
-
-echo "Configuring LablTk..."
-
-if test $tk_wanted = no; then
-  has_tk=false
-elif test $tk_x11 = no; then
-  has_tk=true
-elif test "$x11_include" = "not found" || test "$x11_link" = "not found"; then
-  echo "X11 not found."
-  has_tk=false
-else
-  tk_x11_include="$x11_include"
-  tk_x11_libs="$x11_libs -lX11"
-  has_tk=true
-fi
-
-if test $has_tk = true; then
-  tcl_version=''
-  tcl_version=`sh ./runtest $tk_defs $tk_x11_include tclversion.c`
-  for tk_incs in \
-    ;
-  do if test -z "$tcl_version"; then
-    tk_defs="$tk_incs"
-    tcl_version=`sh ./runtest $tk_defs $tk_x11_include tclversion.c`
-  fi; done
-  if test -n "$tcl_version" && test "x$tcl_version" != "xnone"; then
-    echo "tcl.h and tk.h version $tcl_version found with \"$tk_defs\"."
-    case $tcl_version in
-    7.5) tclmaj=7 tclmin=5 tkmaj=4 tkmin=1 ;;
-    7.6) tclmaj=7 tclmin=6 tkmaj=4 tkmin=2 ;;
-    8.0) tclmaj=8 tclmin=0 tkmaj=8 tkmin=0 ;;
-    8.1) tclmaj=8 tclmin=1 tkmaj=8 tkmin=1 ;;
-    8.2) tclmaj=8 tclmin=2 tkmaj=8 tkmin=2 ;;
-    8.3) tclmaj=8 tclmin=3 tkmaj=8 tkmin=3 ;;
-    8.4) tclmaj=8 tclmin=4 tkmaj=8 tkmin=4 ;;
-    *) echo "This version is not known."; has_tk=false ;;
-    esac
-  else
-    echo "tcl.h and/or tk.h not found."
-    has_tk=false
-  fi
-fi
-
-tkauxlibs="$mathlib $dllib"
-tcllib=''
-tklib=''
-if test $has_tk = true; then
-  if test -n "$tk_libs" && \
-     sh ./hasgot $tk_libs $tk_x11_libs $tkauxlibs Tcl_DoOneEvent
-  then tk_libs="$tk_libs $dllib"
-  elif sh ./hasgot $tk_libs -ltcl$tclmaj.$tclmin $tkauxlibs Tcl_DoOneEvent
-  then
-    tk_libs="$tk_libs -ltk$tkmaj.$tkmin -ltcl$tclmaj.$tclmin $dllib"
-  elif sh ./hasgot $tk_libs -ltcl$tclmaj$tclmin $tkauxlibs Tcl_DoOneEvent
-  then
-    tk_libs="$tk_libs -ltk$tkmaj$tkmin -ltcl$tclmaj$tclmin $dllib"
-  elif test -z "$tk_libs" && tk_libs=-L/usr/local/lib && \
-    sh ./hasgot $tk_libs -ltcl$tclmaj.$tclmin $tkauxlibs Tcl_DoOneEvent
-  then
-    tk_libs="$tk_libs -ltk$tkmaj.$tkmin -ltcl$tclmaj.$tclmin $dllib"
-  elif sh ./hasgot $tk_libs -ltcl$tclmaj$tclmin $tkauxlibs Tcl_DoOneEvent
-  then
-    tk_libs="$tk_libs -ltk$tkmaj$tkmin -ltcl$tclmaj$tclmin $dllib"
-  elif sh ./hasgot -L/sw/lib $tk_libs -ltcl$tclmaj.$tclmin $tkauxlibs \
-                   Tcl_DoOneEvent
-  then tk_libs="-L/sw/lib -ltk$tkmaj.$tkmin -ltcl$tclmaj.$tclmin $dllib"
-  else
-    echo "Tcl library not found."
-    has_tk=false
-  fi
-fi
-if test $has_tk = true; then
-  if sh ./hasgot $tk_libs $tk_x11_libs $tkauxlibs Tk_SetGrid; then
-    echo "Tcl/Tk libraries found."
-  elif sh ./hasgot -L/sw/lib $tk_libs $tk_x11_libs $tkauxlibs Tk_SetGrid; then
-    tk_libs="-L/sw/lib $tk_libs"
-    echo "Tcl/Tk libraries found."
-  else
-    echo "Tcl library found."
-    echo "Tk library not found."
-    has_tk=false
-  fi
-fi
-
-if test $has_tk = true; then
-  if test $tk_x11 = yes; then
-    echo "TK_DEFS=$tk_defs "'$(X11_INCLUDES)' >> Makefile
-    echo "TK_LINK=$tk_libs "'$(X11_LINK)' >> Makefile
-  else
-    echo "TK_DEFS=$tk_defs" >> Makefile
-    echo "TK_LINK=$tk_libs" >> Makefile
-  fi
-  otherlibraries="$otherlibraries labltk"
-else
-  echo "Configuration failed, LablTk will not be built."
-fi
-
-# Begin Camlp4
-(
-cd ../../camlp4/config
-EXE=$exe ./configure_batch -prefix "$prefix" -bindir "$bindir" -libdir "$libdir" -mandir "$mandir" -ocaml-top ../.. > /dev/null
-)
-
-case $? in
-    0) echo "Camlp4 correctly configured.";;
-    *) echo "Warning: Camlp4 configuration terminated with error code $?";;
-esac
-# End Camlp4
-
-# Final twiddling of compiler options to work around known bugs
-
-nativeccprofopts="$nativecccompopts"
-case "$buggycc" in
-  gcc.2.96)
-    bytecccompopts="$bytecccompopts -fomit-frame-pointer"
-    nativecccompopts="$nativecccompopts -fomit-frame-pointer";;
-esac
-
-# Finish generated files
-
-cclibs="$cclibs $mathlib"
-
-echo "BYTECC=$bytecc" >> Makefile
-echo "BYTECCCOMPOPTS=$bytecccompopts" >> Makefile
-echo "BYTECCLINKOPTS=$bytecclinkopts" >> Makefile
-echo "BYTECCLIBS=$cclibs $dllib $curseslibs $pthread_link" >> Makefile
-echo "BYTECCRPATH=$byteccrpath" >> Makefile
-echo "EXE=$exe" >> Makefile
-echo "SUPPORTS_SHARED_LIBRARIES=$shared_libraries_supported" >> Makefile
-echo "SHAREDCCCOMPOPTS=$sharedcccompopts" >> Makefile
-echo "MKSHAREDLIB=$mksharedlib" >> Makefile
-echo "MKSHAREDLIBRPATH=$mksharedlibrpath" >> Makefile
-echo "ARCH=$arch" >> Makefile
-echo "MODEL=$model" >> Makefile
-echo "SYSTEM=$system" >> Makefile
-echo "NATIVECC=$nativecc" >> Makefile
-echo "NATIVECCCOMPOPTS=$nativecccompopts" >> Makefile
-echo "NATIVECCPROFOPTS=$nativeccprofopts" >> Makefile
-echo "NATIVECCLINKOPTS=$nativecclinkopts" >> Makefile
-echo "NATIVECCRPATH=$nativeccrpath" >> Makefile
-echo "NATIVECCLIBS=$cclibs $dllib" >> Makefile
-echo "ASFLAGS=$asflags" >> Makefile
-echo "ASPP=$aspp" >> Makefile
-echo "ASPPFLAGS=$asppflags" >> Makefile
-echo "ASPPPROFFLAGS=$asppprofflags" >> Makefile
-echo "PROFILING=$profiling" >> Makefile
-echo "DYNLINKOPTS=$dllib" >> Makefile
-echo "OTHERLIBRARIES=$otherlibraries" >> Makefile
-echo "DEBUGGER=$debugger" >> Makefile
-echo "CC_PROFILE=$cc_profile" >> Makefile
-echo "SYSTHREAD_SUPPORT=$systhread_support" >>Makefile
-
-rm -f tst hasgot.c
-rm -f ../m.h ../s.h ../Makefile
-mv m.h s.h Makefile ..
-
-# Print a summary
-
-echo
-echo "** Configuration summary **"
-echo
-echo "Directories where Objective Caml will be installed:"
-echo "        binaries.................. $bindir"
-echo "        standard library.......... $libdir"
-echo "        manual pages.............. $mandir (with extension .$manext)"
-
-echo "Configuration for the bytecode compiler:"
-echo "        C compiler used........... $bytecc"
-echo "        options for compiling..... $bytecccompopts"
-echo "        options for linking....... $bytecclinkopts $cclibs $dllib $curseslibs $pthread_link"
-if $shared_libraries_supported; then
-echo "        shared libraries are supported"
-echo "        options for compiling..... $sharedcccompopts $bytecccompopts"
-echo "        command for building...... $mksharedlib lib.so $mksharedlibrpath/a/path objs"
-else
-echo "        shared libraries not supported"
-fi
-
-echo "Configuration for the native-code compiler:"
-if test "$arch" = "none"; then
-  echo "        (not supported on this platform)"
-else
-  if test "$model" = "default"; then
-    echo "        hardware architecture..... $arch"
-  else
-    echo "        hardware architecture..... $arch ($model)"
-  fi
-  if test "$system" = "unknown"; then : ; else
-  echo "        OS variant................ $system"
-  fi
-  echo "        C compiler used........... $nativecc"
-  echo "        options for compiling..... $nativecccompopts"
-  echo "        options for linking....... $nativecclinkopts $cclibs"
-  echo "        assembler ................ \$(AS) $asflags"
-  echo "        preprocessed assembler ... $aspp $asppflags"
-  if test "$profiling" = "prof"; then
-  echo "        profiling with gprof ..... supported"
-  else
-  echo "        profiling with gprof ..... not supported"
-  fi
-fi
-
-if test "$debugger" = "ocamldebugger"; then
-  echo "Source-level replay debugger: supported"
-else
-  echo "Source-level replay debugger: not supported"
-fi
-
-echo "Additional libraries supported:"
-echo "        $otherlibraries"
-
-echo "Configuration for the \"num\" library:"
-echo "        target architecture ...... $bng_arch (asm level $bng_asm_level)"
-
-if test "$x11_include" != "not found" && test "$x11_lib" != "not found"; then
-echo "Configuration for the \"graph\" library:"
-echo "        options for compiling .... $x11_include"
-echo "        options for linking ...... $x11_link"
-fi
-
-if test $has_tk = true; then
-echo "Configuration for the \"labltk\" library:"
-echo "        use tcl/tk version ....... $tcl_version"
-echo "        options for compiling .... $tk_defs"
-echo "        options for linking ...... $tk_libs"
-else
-echo "The \"labltk\" library: not supported"
-fi
-
-echo
-echo "** Objective Caml configuration completed successfully **"
-echo
diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix
index 61b9ba585b8..48ed8526d25 100644
--- a/pkgs/applications/science/logic/hol_light/default.nix
+++ b/pkgs/applications/science/logic/hol_light/default.nix
@@ -1,56 +1,40 @@
-{stdenv, fetchurl, ocaml_with_sources}:
+{stdenv, fetchsvn, ocaml, camlp5_transitional}:
 
-let
-  pname = "hol_light";
-  version = "100110";
-  webpage = http://www.cl.cam.ac.uk/~jrh13/hol-light/;
+stdenv.mkDerivation rec {
+  name = "hol_light-${version}";
+  version = "20100820svn57";
 
-  dmtcp_checkpoint = ''
+  inherit ocaml;
+  camlp5 = camlp5_transitional;
 
-(* ------------------------------------------------------------------------- *)
-(* Non-destructive checkpoint using DMTCP.                                   *)
-(* ------------------------------------------------------------------------- *)
-
-let dmtcp_checkpoint bannerstring =
-  let longer_banner = startup_banner ^ " with DMTCP" in
-  let complete_banner =
-    if bannerstring = "" then longer_banner
-    else longer_banner^"\n        "^bannerstring in
-  (Gc.compact(); Unix.sleep 1;
-   try ignore(Unix.system ("dmtcp_command -bc")) with _ -> ();
-   Format.print_string complete_banner;
-   Format.print_newline(); Format.print_newline());;
-  '';
-
-in
-
-stdenv.mkDerivation {
-  name = "${pname}-${version}";
-  inherit version;
-
-  src = fetchurl {
-    url = "${webpage}${pname}_${version}.tgz";
-    sha256 = "1jkn9vpl3n9dgb96zwmly32h1p3f9mcf34pg6vm0fyvqp9kbx3ac";
+  src = fetchsvn {
+    url = http://hol-light.googlecode.com/svn/trunk;
+    rev = "57";
+    sha256 = "d1372744abca6c9978673850977d3e1577fd8cfd8298826eb713b3681c10cccd";
   };
 
-  buildInputs = [ ocaml_with_sources ];
+  buildInputs = [ ocaml camlp5 ];
 
   buildCommand = ''
-    ensureDir "$out/src"
-    cd "$out/src"
-
-    tar -xzf "$src"
-    cd hol_light
+    export HOL_DIR="$out/src/hol_light"
+    ensureDir `dirname $HOL_DIR` "$out/bin"
+    cp -a "${src}" "$HOL_DIR"
+    cd "$HOL_DIR"
+    chmod -R u+rwX .
 
     substituteInPlace hol.ml --replace \
       "(try Sys.getenv \"HOLLIGHT_DIR\" with Not_found -> Sys.getcwd())" \
-      "\"$out/src/hol_light\""
+      "\"$HOL_DIR\""
 
-    substituteInPlace Examples/update_database.ml --replace \
-      "Filename.concat ocaml_source_dir" \
-      "Filename.concat \"${ocaml_with_sources}/src/ocaml\""
+    substituteInPlace Makefile --replace \
+      "+camlp5" \
+      "${camlp5}/lib/ocaml/camlp5"
 
-    echo '${dmtcp_checkpoint}' >> make.ml
+    substitute ${./start_hol_light} "$out/bin/start_hol_light" \
+      --subst-var-by OCAML "${ocaml}" \
+      --subst-var-by CAMLP5 "${camlp5_transitional}" \
+      --subst-var HOL_DIR
+    chmod +x "$out/bin/start_hol_light"
 
     make
   '';
@@ -66,7 +50,8 @@ real analysis) to save the user work.  It is also fully programmable, so users
 can extend it with new theorems and inference rules without compromising its
 soundness.
     '';
-    homepage = webpage;
+    homepage = http://www.cl.cam.ac.uk/~jrh13/hol-light/;
     license = "BSD";
+    ocamlVersions = [ "3.10.0" "3.11.1" ];
   };
 }
diff --git a/pkgs/applications/science/logic/hol_light/ocaml-with-sources.nix b/pkgs/applications/science/logic/hol_light/ocaml-with-sources.nix
deleted file mode 100644
index 7e6d8becc9d..00000000000
--- a/pkgs/applications/science/logic/hol_light/ocaml-with-sources.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "ocaml-with-sources-3.09.3";
-  src = fetchurl {
-    url = http://caml.inria.fr/pub/distrib/ocaml-3.09/ocaml-3.09.3.tar.bz2;
-    sha256 = "607842b4f4917a759f19541a421370a834f5b948855ca54cef40d22b19a0934f";
-  };
-
-  configureScript = ./configure-3.09.3;
-
-  builder = builtins.toFile "builder.sh" ''
-    source $stdenv/setup
-    ensureDir $out/src; cd $out/src
-    tar -xjf $src
-    mv ocaml-* ocaml
-    cd ocaml
-    CAT=$(type -tp cat)
-    sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
-    $configureScript -no-tk -no-curses -prefix $out
-    make opt.opt
-    make install
-  '';
-
-  meta = {
-    description = "ocaml compiler with compiled sources retained.";
-    longDescription = ''
-      TODO
-    '';
-    homepage = http://caml.inria.fr/;
-    license = "LGP with linking exceptions";
-  };
-}
diff --git a/pkgs/applications/science/logic/hol_light/restart_hol_light b/pkgs/applications/science/logic/hol_light/restart_hol_light
new file mode 100644
index 00000000000..d4fe70368d9
--- /dev/null
+++ b/pkgs/applications/science/logic/hol_light/restart_hol_light
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec @DMTCP_RESTART@ --quiet @CKPT_FILE@
diff --git a/pkgs/applications/science/logic/hol_light/selfcheckpoint_complex.ml b/pkgs/applications/science/logic/hol_light/selfcheckpoint_complex.ml
deleted file mode 100644
index d522f4919c2..00000000000
--- a/pkgs/applications/science/logic/hol_light/selfcheckpoint_complex.ml
+++ /dev/null
@@ -1,29 +0,0 @@
-(* ========================================================================= *)
-(* Create a standalone HOL image. Assumes that we are running under Linux    *)
-(* and have the program "dmtcp" available to create checkpoints.             *)
-(*                                                                           *)
-(*              (c) Copyright, John Harrison 1998-2007                       *)
-(*              (c) Copyright, Marco Maggesi 2010                            *)
-(* ========================================================================= *)
-
-#use "make.ml";;
-
-(* ------------------------------------------------------------------------- *)
-(* Non-destructive checkpoint using DMTCP.                                   *)
-(* ------------------------------------------------------------------------- *)
-
-let checkpoint bannerstring =
-  let longer_banner = startup_banner ^ " with DMTCP" in
-  let complete_banner =
-    if bannerstring = "" then longer_banner
-    else longer_banner^"\n        "^bannerstring in
-  (Gc.compact();
-   loadt "Examples/update_database.ml";
-   print_newline ();
-   Unix.sleep 1;
-   try ignore(Unix.system ("dmtcp_command -bc")) with _ -> ();
-   Format.print_string complete_banner;
-   Format.print_newline(); Format.print_newline());;
-
-loadt "Multivariate/make_complex.ml";;
-dmtcp_checkpoint "Preloaded with multivariate-based complex analysis";;
diff --git a/pkgs/applications/science/logic/hol_light/selfcheckpoint_core.ml b/pkgs/applications/science/logic/hol_light/selfcheckpoint_core.ml
deleted file mode 100644
index 432b676ba2f..00000000000
--- a/pkgs/applications/science/logic/hol_light/selfcheckpoint_core.ml
+++ /dev/null
@@ -1,28 +0,0 @@
-(* ========================================================================= *)
-(* Create a standalone HOL image. Assumes that we are running under Linux    *)
-(* and have the program "dmtcp" available to create checkpoints.             *)
-(*                                                                           *)
-(*              (c) Copyright, John Harrison 1998-2007                       *)
-(*              (c) Copyright, Marco Maggesi 2010                            *)
-(* ========================================================================= *)
-
-#use "make.ml";;
-
-(* ------------------------------------------------------------------------- *)
-(* Non-destructive checkpoint using DMTCP.                                   *)
-(* ------------------------------------------------------------------------- *)
-
-let checkpoint bannerstring =
-  let longer_banner = startup_banner ^ " with DMTCP" in
-  let complete_banner =
-    if bannerstring = "" then longer_banner
-    else longer_banner^"\n        "^bannerstring in
-  (Gc.compact();
-   loadt "Examples/update_database.ml";
-   print_newline ();
-   Unix.sleep 1;
-   try ignore(Unix.system ("dmtcp_command -bc")) with _ -> ();
-   Format.print_string complete_banner;
-   Format.print_newline(); Format.print_newline());;
-
-dmtcp_checkpoint "";;
\ No newline at end of file
diff --git a/pkgs/applications/science/logic/hol_light/selfcheckpoint_multivariate.ml b/pkgs/applications/science/logic/hol_light/selfcheckpoint_multivariate.ml
deleted file mode 100644
index d805b4af234..00000000000
--- a/pkgs/applications/science/logic/hol_light/selfcheckpoint_multivariate.ml
+++ /dev/null
@@ -1,29 +0,0 @@
-(* ========================================================================= *)
-(* Create a standalone HOL image. Assumes that we are running under Linux    *)
-(* and have the program "dmtcp" available to create checkpoints.             *)
-(*                                                                           *)
-(*              (c) Copyright, John Harrison 1998-2007                       *)
-(*              (c) Copyright, Marco Maggesi 2010                            *)
-(* ========================================================================= *)
-
-#use "make.ml";;
-
-(* ------------------------------------------------------------------------- *)
-(* Non-destructive checkpoint using DMTCP.                                   *)
-(* ------------------------------------------------------------------------- *)
-
-let checkpoint bannerstring =
-  let longer_banner = startup_banner ^ " with DMTCP" in
-  let complete_banner =
-    if bannerstring = "" then longer_banner
-    else longer_banner^"\n        "^bannerstring in
-  (Gc.compact();
-   loadt "Examples/update_database.ml";
-   print_newline ();
-   Unix.sleep 1;
-   try ignore(Unix.system ("dmtcp_command -bc")) with _ -> ();
-   Format.print_string complete_banner;
-   Format.print_newline(); Format.print_newline());;
-
-loadt "Multivariate/make.ml";;
-dmtcp_checkpoint "Preloaded with multivariate analysis";;
diff --git a/pkgs/applications/science/logic/hol_light/start_hol.ml b/pkgs/applications/science/logic/hol_light/start_hol.ml
new file mode 100644
index 00000000000..c8f4b2279df
--- /dev/null
+++ b/pkgs/applications/science/logic/hol_light/start_hol.ml
@@ -0,0 +1,37 @@
+(* ========================================================================= *)
+(* Create a standalone HOL image. Assumes that we are running under Linux    *)
+(* and have the program "dmtcp" available to create checkpoints.             *)
+(*                                                                           *)
+(*              (c) Copyright, John Harrison 1998-2007                       *)
+(*              (c) Copyright, Marco Maggesi 2010                            *)
+(* ========================================================================= *)
+
+(* Use this instead of #use "make.ml";; for quick tests. *)
+(*
+let a = 1;
+#load "unix.cma";;
+let startup_banner = "Bogus banner\n";;
+Format.print_string "Hello!"; Format.print_newline();;
+*)
+
+#use "make.ml";;
+
+(* ------------------------------------------------------------------------- *)
+(* Checkpoint using DMTCP.                                                   *)
+(* dmtcp_selfdestruct is similar to dmtcp_checkpoint but terminates          *)
+(* HOL Light and shuts down the dmtcp coordinator.                           *)
+(* ------------------------------------------------------------------------- *)
+
+let dmtcp_checkpoint, dmtcp_selfdestruct =
+  let call_dmtcp opts bannerstring =
+    let longer_banner = startup_banner ^ " with DMTCP" in
+    let complete_banner =
+      if bannerstring = "" then longer_banner
+      else longer_banner^"\n        "^bannerstring in
+    (Gc.compact(); Unix.sleep 4;
+     Format.print_string "Checkpointing..."; Format.print_newline();
+     try ignore(Unix.system ("dmtcp_command -bc " ^ opts)) with _ -> ();
+     Format.print_string complete_banner;
+     Format.print_newline(); Format.print_newline())
+  in
+  call_dmtcp "", call_dmtcp "-q";;
diff --git a/pkgs/applications/science/logic/hol_light/start_hol_light b/pkgs/applications/science/logic/hol_light/start_hol_light
new file mode 100644
index 00000000000..638cf8d3e77
--- /dev/null
+++ b/pkgs/applications/science/logic/hol_light/start_hol_light
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec @OCAML@/bin/ocaml -I @CAMLP5@/lib/ocaml/camlp5 -I @HOL_DIR@ "$@"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b66156a449f..ead85f07f0d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6783,11 +6783,6 @@ let
 
   hol_light_binaries = callPackage ../applications/science/logic/hol_light/binaries.nix { };
 
-  # This is a special version of OCaml handcrafted especially for
-  # hol_light it should be merged with the current expresion for ocaml
-  # one day.
-  ocaml_with_sources = callPackage ../applications/science/logic/hol_light/ocaml-with-sources.nix { };
-
   isabelle = import ../applications/science/logic/isabelle {
     inherit (pkgs) stdenv fetchurl nettools perl polyml;
     inherit (pkgs.emacs23Packages) proofgeneral;

From 7b4678b6d807e45cab7b6260b873e644dc4a57b4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 8 Sep 2010 13:28:05 +0000
Subject: [PATCH 091/181] pkgs/tools/misc/syslog-ng: updated to version 3.1.2

svn path=/nixpkgs/trunk/; revision=23686
---
 pkgs/tools/misc/syslog-ng/default.nix | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/misc/syslog-ng/default.nix b/pkgs/tools/misc/syslog-ng/default.nix
index fa920120bd3..584da1559b8 100644
--- a/pkgs/tools/misc/syslog-ng/default.nix
+++ b/pkgs/tools/misc/syslog-ng/default.nix
@@ -1,16 +1,22 @@
 {stdenv, fetchurl, eventlog, pkgconfig, glib}:
 
-stdenv.mkDerivation rec {
-  name = "syslog-ng-2.1.3";
+stdenv.mkDerivation {
+  name = "syslog-ng-3.1.2";
+
+  src = fetchurl {
+    url = "http://www.balabit.com/downloads/files?path=/syslog-ng/sources/3.1.2/source/syslog-ng_3.1.2.tar.gz";
+    sha256 = "0a508l4j11336jn5kg65l70rf7xbpdxi2n477rvp5p48cc1adcg2";
+  };
+
+  buildInputs = [eventlog pkgconfig glib];
+  configureFlags = "--enable-dynamic-linking";
+
   meta = {
     homepage = "http://www.balabit.com/network-security/syslog-ng/";
     description = "Next-generation syslogd with advanced networking and filtering capabilities.";
     license = "GPLv2";
+
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.simons ];
   };
-  src = fetchurl {
-    url = "http://www.balabit.com/downloads/files/syslog-ng/sources/2.1/src/${name}.tar.gz";
-    sha256 = "1m6djxhmihmg09a90gg6mp1ghgk2zm8rcp04shh458433rbzfjb0";
-  };
-  buildInputs = [eventlog pkgconfig glib];
-  configureFlags = "--enable-dynamic-linking";
 }

From b601947bcb1fce96dba1eae8ffa2271872d7b1bf Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 9 Sep 2010 07:19:12 +0000
Subject: [PATCH 092/181] maven-build: copy whole site dir and adapted
 hydra-build-products

svn path=/nixpkgs/trunk/; revision=23691
---
 pkgs/build-support/release/maven-build.nix | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/pkgs/build-support/release/maven-build.nix b/pkgs/build-support/release/maven-build.nix
index 90596b76942..5a470a72672 100644
--- a/pkgs/build-support/release/maven-build.nix
+++ b/pkgs/build-support/release/maven-build.nix
@@ -46,30 +46,23 @@ stdenv.mkDerivation ( rec {
     mvn test ${mvnFlags}
 
     if [ -d target/site/cobertura ] ; then
-      cp -R target/site/cobertura $out/cobertura
-      echo "report coverage $out/cobertura" >> $out/nix-support/hydra-build-products
+      echo "report coverage $out/site/cobertura" >> $out/nix-support/hydra-build-products
     fi
 
     if [ -d target/surefire-reports ] ; then
       mvn surefire-report:report-only
-      cp -vR target/surefire-reports $out/surefire
-      cp -v target/site/surefire-report.html $out/surefire/index.html
-      echo "report coverage $out/surefire/index.html" >> $out/nix-support/hydra-build-products
+      echo "report coverage $out/site/surefire-report.html" >> $out/nix-support/hydra-build-products
     fi
   '';  
 
   mvnJavadoc = ''
     mvn javadoc:javadoc ${mvnFlags}
-    cp -R target/site/apidocs $out/apidocs
-    echo "report javadoc $out/apidocs" >> $out/nix-support/hydra-build-products
+    echo "report javadoc $out/site/apidocs" >> $out/nix-support/hydra-build-products
   '';  
 
   mvnCheckstyle = ''
     mvn checkstyle:checkstyle ${mvnFlags}
-    ensureDir $out/checkstyle
-    cp -R target/site/checkstyle.* $out/checkstyle/
-    cp -R target/site/images $out/checkstyle/images
-    echo "report checkstyle $out/checkstyle/checkstyle.html" >> $out/nix-support/hydra-build-products
+    echo "report checkstyle $out/site/checkstyle.html" >> $out/nix-support/hydra-build-products
   '';  
 
   mvnJar = ''
@@ -82,7 +75,7 @@ stdenv.mkDerivation ( rec {
 
   mvnRelease = ''
     ensureDir $out/release
-ls -l target/
+
     zip=$(ls target/*.zip| head -1)
     releaseName=$(basename $zip .zip)
     releaseName="$releaseName-r${toString src.rev}"
@@ -96,8 +89,7 @@ ls -l target/
   '';  
 
   finalPhase = ''
-    ensureDir $out/site
-    cp -R src/test/site/* $out/site
+    cp -R target/site $out/
   '';
 } // args 
 )

From 62eb8741ceec5ee5ec1f5cf194ce78a63b7e66eb Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 9 Sep 2010 07:22:45 +0000
Subject: [PATCH 093/181] maven-build: only copy site dir if it exists

svn path=/nixpkgs/trunk/; revision=23692
---
 pkgs/build-support/release/maven-build.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/release/maven-build.nix b/pkgs/build-support/release/maven-build.nix
index 5a470a72672..0f0633febfb 100644
--- a/pkgs/build-support/release/maven-build.nix
+++ b/pkgs/build-support/release/maven-build.nix
@@ -89,7 +89,9 @@ stdenv.mkDerivation ( rec {
   '';  
 
   finalPhase = ''
-    cp -R target/site $out/
+    if [ -d target/site ] ; then
+      cp -R target/site $out/
+    fi
   '';
 } // args 
 )

From 3bb0a18f0c76570da44b7c5c2c37e598cba84ada Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 9 Sep 2010 09:43:33 +0000
Subject: [PATCH 094/181] pkgs/development/libraries/t1lib: updated to version
 5.1.2

svn path=/nixpkgs/trunk/; revision=23693
---
 pkgs/development/libraries/t1lib/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/t1lib/default.nix b/pkgs/development/libraries/t1lib/default.nix
index a3ebe5e27ca..9a4ba00e1d3 100644
--- a/pkgs/development/libraries/t1lib/default.nix
+++ b/pkgs/development/libraries/t1lib/default.nix
@@ -1,11 +1,13 @@
 {stdenv, fetchurl, x11, libXaw, libXpm}:
 
 stdenv.mkDerivation {
-  name = "t1lib-5.1.0";
+  name = "t1lib-5.1.2";
+
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/metalab/libs/graphics/t1lib-5.1.1.tar.gz;
-    sha256 = "0r1wb94kjd8jwym9na2k2snikizrnyc4cf4mf92v89r4yy0apph8";
+    url = "ftp://ftp.nluug.nl/pub/metalab/libs/graphics/t1lib-5.1.2.tar.gz";
+    sha256 = "0nbvjpnmcznib1nlgg8xckrmsw3haa154byds2h90y2g0nsjh4w2";
   };
+
   buildInputs = [x11 libXaw libXpm];
   buildFlags = "without_doc";
 }

From 03706558a9e5e5a741557ee0bc34e30efa62c97c Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 9 Sep 2010 10:47:54 +0000
Subject: [PATCH 095/181] maven-build: do full assembly without tests, add site
 to build products

svn path=/nixpkgs/trunk/; revision=23694
---
 pkgs/build-support/release/maven-build.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/release/maven-build.nix b/pkgs/build-support/release/maven-build.nix
index 0f0633febfb..66dd10005f2 100644
--- a/pkgs/build-support/release/maven-build.nix
+++ b/pkgs/build-support/release/maven-build.nix
@@ -70,7 +70,7 @@ stdenv.mkDerivation ( rec {
   '';  
 
   mvnAssembly = ''
-    mvn assembly:single ${mvnFlags}
+    mvn assembly:assembly -Dmaven.test.skip.exec=true ${mvnFlags}
   '';
 
   mvnRelease = ''
@@ -91,6 +91,7 @@ stdenv.mkDerivation ( rec {
   finalPhase = ''
     if [ -d target/site ] ; then
       cp -R target/site $out/
+      echo "report site $out/site" >> $out/nix-support/hydra-build-products
     fi
   '';
 } // args 

From 9b8a491a73de196d0fa2b40429e30c17c958ea6e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 9 Sep 2010 16:06:26 +0000
Subject: [PATCH 096/181] 
 pkgs/applications/version-management/git-and-tools/git: updated to version
 1.7.2.3

svn path=/nixpkgs/trunk/; revision=23695
---
 .../version-management/git-and-tools/git/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 41da12cdf30..116b6ff5231 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -12,11 +12,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "git-1.7.2.1";
+  name = "git-1.7.2.3";
 
   src = fetchurl {
     url = "mirror://kernel/software/scm/git/${name}.tar.bz2";
-    sha256 = "5446b4ece3b8d81b1fcbcd6c4b91f1961b6f4047a3f6173e3200bee368724921";
+    sha256 = "6139ec31d0a79cae04f469e73cc1f912162bb8f84ef7621ecc8630989fc81ba1";
   };
 
   patches = [ ./docbook2texi.patch ];

From 220025a6ec6ebab71bd642ef2544687e477a5982 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 9 Sep 2010 16:06:31 +0000
Subject: [PATCH 097/181] pkgs/development/libraries/eventlog: updated to
 version 0.2.12

svn path=/nixpkgs/trunk/; revision=23696
---
 pkgs/development/libraries/eventlog/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/eventlog/default.nix b/pkgs/development/libraries/eventlog/default.nix
index bed565a0437..b1239d6f4cf 100644
--- a/pkgs/development/libraries/eventlog/default.nix
+++ b/pkgs/development/libraries/eventlog/default.nix
@@ -1,10 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "eventlog-0.2.9";
+  name = "eventlog-0.2.12";
+
   src = fetchurl {
-    url = "http://www.balabit.com/downloads/files/eventlog/0.2/eventlog_0.2.9.tar.gz";
-    sha256 = "1cairmv47b66blrxwrgf4qwabfflak9b1dwkiyxnc9rj5svnq50m";
+    url = "http://www.balabit.com/downloads/files/eventlog/0.2/eventlog_0.2.12.tar.gz";
+    sha256 = "494dac8e01dc5ce323df2ad554d94874938dab51aa025987677b2bc6906a9c66";
   };
 
   meta = {

From c66aa309be055eaababe3babd4c719b280c58fd3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 9 Sep 2010 16:06:34 +0000
Subject: [PATCH 098/181] pkgs/applications/editors/emacs-modes/magit: updated
 to version 0.8.2

svn path=/nixpkgs/trunk/; revision=23697
---
 pkgs/applications/editors/emacs-modes/magit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/magit/default.nix b/pkgs/applications/editors/emacs-modes/magit/default.nix
index 45de918a472..dcd0b9c5ba4 100644
--- a/pkgs/applications/editors/emacs-modes/magit/default.nix
+++ b/pkgs/applications/editors/emacs-modes/magit/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, emacs, texinfo }:
 
 let
-  version = "0.8";
+  version = "0.8.2";
 in
 stdenv.mkDerivation {
   name = "magit-${version}";
 
   src = fetchurl {
     url = "http://github.com/downloads/philjackson/magit/magit-${version}.tar.gz";
-    sha256 = "4d1b55dcb118e506c6b8838acd4a50dbdd5348b1d12edd9789a3109a582e2954";
+    sha256 = "fc02c23e3e8994e9c3e3299d560d0cbfed888dcc66088f06b8cea3bc89cd6ae8";
   };
 
   buildInputs = [emacs texinfo];

From c1867fe704d209d286f7257e140896ba9a7d88be Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 9 Sep 2010 16:45:18 +0000
Subject: [PATCH 099/181] * Get Xen to build.  It's not tested yet and doesn't
 include a Dom0   kernel.

svn path=/nixpkgs/trunk/; revision=23698
---
 .../virtualization/xen/default.nix            | 55 ++++++++++---------
 .../virtualization/xen/has-header.patch       | 40 ++++++++++++++
 pkgs/top-level/all-packages.nix               | 10 +---
 3 files changed, 70 insertions(+), 35 deletions(-)
 create mode 100644 pkgs/applications/virtualization/xen/has-header.patch

diff --git a/pkgs/applications/virtualization/xen/default.nix b/pkgs/applications/virtualization/xen/default.nix
index 46625436798..b7c9c1c3d5b 100644
--- a/pkgs/applications/virtualization/xen/default.nix
+++ b/pkgs/applications/virtualization/xen/default.nix
@@ -1,36 +1,39 @@
-args :  
-let 
-  lib = args.lib;
-  fetchurl = args.fetchurl;
-  fullDepEntry = args.fullDepEntry;
+{ stdenv, fetchurl, which, zlib, pkgconfig, SDL, openssl, python
+, libuuid, gettext, ncurses, dev86, iasl, pciutils, bzip2, xz }:
+
+let version = "4.0.1"; in 
+
+stdenv.mkDerivation {
+  name = "xen-${version}";
 
-  version = lib.attrByPath ["version"] "3.3.0" args; 
-  _buildInputs = with args; [
-    python e2fsprogs gnutls pkgconfig libjpeg 
-    ncurses SDL libvncserver zlib graphviz ghostscript 
-    texLive
-  ];
-in
-rec {
   src = fetchurl {
     url = "http://bits.xensource.com/oss-xen/release/${version}/xen-${version}.tar.gz";
-    sha256 = "0vghm31pqq8sc6x81jass2h5s22jlvv582xb8aq4j4cbcc5qixc9";
+    sha256 = "0ww8j5fa2jxg0zyx7d7z9jyv2j47m8w420sy16w3rf8d80lisvbf";
   };
 
-  buildInputs = lib.filter (x: x != null) _buildInputs;
-  configureFlags = [];
+  patches =
+    [ # Xen looks for headers in /usr/include and for libraries using
+      # ldconfig.  Don't do that.
+      ./has-header.patch
+    ];
 
-  /* doConfigure should be specified separately */
-  phaseNames = ["makeTools" "makeXen"];
+  buildInputs =
+    [ which zlib pkgconfig SDL openssl python libuuid gettext ncurses
+      dev86 iasl pciutils bzip2 xz
+    ];
+
+  makeFlags = "PREFIX=$(out)";
+
+  buildFlags = "xen tools";
+
+  installPhase =
+    ''
+      cp -prvd dist/install/nix/store/* $out
+      cp -prvd dist/install/boot $out/boot
+    ''; # */
 
-  makeTools = fullDepEntry (''make -C tools install PREFIX=$out '') 
-    ["minInit" "addInputs" "doUnpack"];
-      
-  makeXen = fullDepEntry (''make -C xen install PREFIX=$out '') 
-    ["minInit" "addInputs" "doUnpack"];
-      
-  name = "xen-" + version;
   meta = {
-    description = "Xen paravirtualization tools";
+    homepage = http://www.xen.org/;
+    description = "Xen hypervisor and management tools for Dom0";
   };
 }
diff --git a/pkgs/applications/virtualization/xen/has-header.patch b/pkgs/applications/virtualization/xen/has-header.patch
new file mode 100644
index 00000000000..b59dd7ea5af
--- /dev/null
+++ b/pkgs/applications/virtualization/xen/has-header.patch
@@ -0,0 +1,40 @@
+diff -ru --exclude '*~' xen-4.0.1-orig/tools/check/funcs.sh xen-4.0.1/tools/check/funcs.sh
+--- xen-4.0.1-orig/tools/check/funcs.sh	2010-08-25 12:22:07.000000000 +0200
++++ xen-4.0.1/tools/check/funcs.sh	2010-09-09 17:47:20.000000000 +0200
+@@ -25,33 +25,13 @@
+ }
+ 
+ has_header() {
+-	case $1 in
+-		/*) ;;
+-		*) set -- "/usr/include/$1" ;;
+-	esac
+-
+-	check_sys_root || return 1
+-
+-	test -r "$CROSS_SYS_ROOT$1"
+-	return $?
++	echo "#include <$1>" | gcc -E - > /dev/null && return 0
++	return 1
+ }
+ 
+ has_lib() {
+ 	check_sys_root || return 1
+-
+-	# subshell to prevent pollution of caller's environment
+-	(
+-	PATH=/sbin:$PATH        # for ldconfig
+-
+-	# This relatively common in a sys-root; libs are installed but
+-	# ldconfig hasn't run there, so ldconfig -p won't work.
+-	if [ "$OS" = Linux -a ! -f "$CROSS_SYS_ROOT/etc/ld.so.cache" ]; then
+-	    echo "Please run ldconfig -r \"$CROSS_SYS_ROOT\" to generate ld.so.cache"
+-	    # fall through; ldconfig test below should fail
+-	fi
+-	ldconfig -p ${CROSS_SYS_ROOT+-r "$CROSS_SYS_ROOT"} | grep -Fq "$1"
+-	return $?
+-	)
++	return 0
+ }
+ 
+ test_link() {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ead85f07f0d..1c57f9b84f4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6314,15 +6314,7 @@ let
 
   xdg_utils = callPackage ../tools/X11/xdg-utils { };
 
-  /* Doesn't work yet
-
-  xen = builderDefsPackage (import ../applications/virtualization/xen) {
-    inherit python e2fsprogs gnutls pkgconfig libjpeg
-      ncurses SDL libvncserver zlib;
-    texLive = if (getConfig ["xen" "texLive"] false) then texLive else null;
-    graphviz = if (getConfig ["xen" "graphviz"] false) then graphviz else null;
-    ghostscript = if (getConfig ["xen" "ghostscript"] false) then ghostscript else null;
-  }; */
+  xen = callPackage ../applications/virtualization/xen { };
 
   xfig = callPackage ../applications/graphics/xfig {
     stdenv = overrideGCC stdenv gcc34;

From d4c75386480cb94b5a39172cd8c18b56f67f35b6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 9 Sep 2010 16:48:13 +0000
Subject: [PATCH 100/181] * Add "gtk" to the top-level scope (just like "glib")
 and remove all   those "inherit (gtkLibs) gtk" lines.

svn path=/nixpkgs/trunk/; revision=23699
---
 pkgs/top-level/all-packages.nix | 233 +++++++-------------------------
 1 file changed, 48 insertions(+), 185 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1c57f9b84f4..9b900b635d3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -428,7 +428,6 @@ let
 
   blueman = callPackage ../tools/bluetooth/blueman {
     inherit (pythonPackages) notify;
-    inherit (gtkLibs) glib gtk;
   };
 
   bmrsa = builderDefsPackage (import ../tools/security/bmrsa/11.nix) {
@@ -620,9 +619,7 @@ let
 
   getopt = callPackage ../tools/misc/getopt { };
 
-  gftp = callPackage ../tools/networking/gftp {
-    inherit (gtkLibs) gtk;
-  };
+  gftp = callPackage ../tools/networking/gftp { };
 
   gifsicle = callPackage ../tools/graphics/gifsicle { };
 
@@ -636,7 +633,7 @@ let
 
   gnokii = builderDefsPackage (import ../tools/misc/gnokii) {
     inherit intltool perl gettext libusb pkgconfig;
-    inherit (gtkLibs) glib;
+    inherit (gtkLibs) gtk glib;
   };
 
   gnugrep = callPackage ../tools/text/gnugrep { };
@@ -677,7 +674,8 @@ let
    * objections before removal.
    */
   graphviz_2_0 = callPackage ../tools/graphics/graphviz/2.0.nix {
-    inherit (gtkLibs) pango;  };
+    inherit (gtkLibs) pango;
+  };
 
   groff = callPackage ../tools/text/groff {
     ghostscript = null;
@@ -697,16 +695,13 @@ let
 
   gt5 = callPackage ../tools/system/gt5 { };
 
-  gtkgnutella = callPackage ../tools/networking/p2p/gtk-gnutella {
-    inherit (gtkLibs) glib gtk;
-  };
+  gtkgnutella = callPackage ../tools/networking/p2p/gtk-gnutella { };
 
   gupnp = callPackage ../development/libraries/gupnp {
     inherit (gnome) libsoup;
   };
 
   gupnptools = callPackage ../tools/networking/gupnp-tools {
-    inherit (gtkLibs) gtk glib;
     inherit (gnome) libsoup libglade gnomeicontheme;
   };
 
@@ -892,7 +887,6 @@ let
 
   nmap = callPackage ../tools/security/nmap {
     inherit (pythonPackages) pysqlite;
-    inherit (gtkLibs) gtk;
   };
 
   ntfs3g = callPackage ../tools/filesystems/ntfs-3g { };
@@ -905,9 +899,7 @@ let
 
   nylon = callPackage ../tools/networking/nylon { };
 
-  obex_data_server = callPackage ../tools/bluetooth/obex-data-server {
-    inherit (gtkLibs) glib;
-  };
+  obex_data_server = callPackage ../tools/bluetooth/obex-data-server { };
 
   obexd = callPackage ../tools/bluetooth/obexd { };
 
@@ -959,9 +951,7 @@ let
 
   p7zip = callPackage ../tools/archivers/p7zip { };
 
-  pal = callPackage ../tools/misc/pal {
-    inherit (gtkLibs) glib;
-  };
+  pal = callPackage ../tools/misc/pal { };
 
   panomatic = callPackage ../tools/graphics/panomatic { };
 
@@ -1211,9 +1201,7 @@ let
     inherit pciutils libx86 zlib;
   };
 
-  viking = callPackage ../applications/misc/viking {
-    inherit (gtkLibs) gtk;
-  };
+  viking = callPackage ../applications/misc/viking { };
 
   vncrec = builderDefsPackage ../tools/video/vncrec {
     inherit (xlibs) imake libX11 xproto gccmakedep libXt
@@ -1902,9 +1890,7 @@ let
 
   mozart = callPackage ../development/compilers/mozart { };
 
-  neko = callPackage ../development/compilers/neko {
-    inherit (gtkLibs) gtk;
-  };
+  neko = callPackage ../development/compilers/neko { };
 
   nasm = callPackage ../development/compilers/nasm { };
 
@@ -2315,7 +2301,6 @@ let
   ddd = callPackage ../development/tools/misc/ddd { };
 
   distcc = callPackage ../development/tools/misc/distcc {
-    inherit (gtkLibs) gtk;
     static = false;
   };
 
@@ -2371,9 +2356,7 @@ let
 
   gperf = callPackage ../development/tools/misc/gperf { };
 
-  gtkdialog = callPackage ../development/tools/misc/gtkdialog {
-    inherit (gtkLibs) gtk;
-  };
+  gtkdialog = callPackage ../development/tools/misc/gtkdialog { };
 
   guileLint = callPackage ../development/tools/guile/guile-lint { };
 
@@ -2444,7 +2427,6 @@ let
   pkgconfig = forceBuildDrv (callPackage ../development/tools/misc/pkgconfig { });
 
   radare = callPackage ../development/tools/analysis/radare {
-    inherit (gtkLibs) gtk;
     inherit (gnome) vte;
     lua = lua5;
     useX11 = getConfig ["radare" "useX11"] false;
@@ -2615,7 +2597,6 @@ let
   classpath = callPackage ../development/libraries/java/classpath {
     javac = gcj;
     jvm = gcj;
-    inherit (gtkLibs) gtk;
     gconf = gnome.GConf;
   };
 
@@ -2966,6 +2947,7 @@ let
   gtkLibs = gtkLibs220;
 
   glib = gtkLibs.glib;
+  gtk = gtkLibs.gtk;
 
   gtkLibs1x = recurseIntoAttrs (let callPackage = newScope pkgs.gtkLibs1x; in rec {
 
@@ -3055,9 +3037,7 @@ let
     gtksharp = gtksharp2;
   };
 
-  gtkspell = callPackage ../development/libraries/gtkspell {
-    inherit (gtkLibs) gtk;
-  };
+  gtkspell = callPackage ../development/libraries/gtkspell { };
 
   # TODO : Add MIT Kerberos and let admin choose.
   kerberos = heimdal;
@@ -3111,7 +3091,6 @@ let
   krb5 = callPackage ../development/libraries/kerberos/krb5.nix { };
 
   lablgtk = callPackage ../development/libraries/lablgtk {
-    inherit (gtkLibs) gtk;
     inherit (gnome) libgnomecanvas;
   };
 
@@ -3150,7 +3129,6 @@ let
   libcaca = callPackage ../development/libraries/libcaca { };
 
   libcanberra = callPackage ../development/libraries/libcanberra {
-    inherit (gtkLibs) gtk;
     gstreamer = gst_all.gstreamer;
   };
 
@@ -3240,7 +3218,6 @@ let
   libical = callPackage ../development/libraries/libical { };
 
   libiodbc = callPackage ../development/libraries/libiodbc {
-    inherit (gtkLibs) gtk;
     useGTK = getPkgConfig "libiodbc" "gtk" false;
   };
 
@@ -3277,7 +3254,6 @@ let
   libiec61883 = callPackage ../development/libraries/libiec61883 { };
 
   libinfinity = callPackage ../development/libraries/libinfinity {
-    inherit (gtkLibs) gtk glib;
     inherit (gnome) gtkdoc;
   };
 
@@ -3568,9 +3544,8 @@ let
   openct = callPackage ../development/libraries/openct { };
 
   opencv = callPackage ../development/libraries/opencv {
-      inherit (gtkLibs) gtk glib;
-      inherit (gst_all) gstreamer;
-      stdenv = stdenv2;
+    inherit (gst_all) gstreamer;
+    stdenv = stdenv2;
   };
 
   # this ctl version is needed by openexr_viewers
@@ -3587,7 +3562,6 @@ let
   };
 
   libopensc_dnie = callPackage ../development/libraries/libopensc-dnie {
-    inherit (gtkLibs) glib;
     opensc = opensc_0_11_7;
   };
 
@@ -3625,7 +3599,6 @@ let
   policykit = callPackage ../development/libraries/policykit { };
 
   poppler = callPackage ../development/libraries/poppler {
-    inherit (gtkLibs) glib gtk;
     qt4Support = false;
   };
 
@@ -3936,9 +3909,7 @@ let
 
   smack = callPackage ../development/libraries/java/smack { };
 
-  swt = callPackage ../development/libraries/java/swt {
-    inherit (gtkLibs) gtk;
-  };
+  swt = callPackage ../development/libraries/java/swt { };
 
   xalanj = xalanJava;
   xalanJava = callPackage ../development/libraries/java/xalanj {
@@ -4021,12 +3992,9 @@ let
 
   pygobject = callPackage ../development/python-modules/pygobject { };
 
-  pygtk = callPackage ../development/python-modules/pygtk {
-    inherit (gtkLibs) glib gtk;
-  };
+  pygtk = callPackage ../development/python-modules/pygtk { };
 
   pyGtkGlade = callPackage ../development/python-modules/pygtk {
-    inherit (gtkLibs) glib gtk;
     inherit (gnome) libglade;
   };
 
@@ -4066,9 +4034,7 @@ let
 
   ### SERVERS
 
-  rdf4store = callPackage ../servers/http/4store {
-    inherit (gtkLibs) glib;
-  };
+  rdf4store = callPackage ../servers/http/4store { };
 
   apacheHttpd = callPackage ../servers/http/apache-httpd {
     sslSupport = true;
@@ -4134,7 +4100,6 @@ let
   postfix = callPackage ../servers/mail/postfix { };
 
   pulseaudio = callPackage ../servers/pulseaudio {
-    inherit (gtkLibs) gtk glib;    # Needs ALSA >= 1.0.17.
     gconf = gnome.GConf;
   };
 
@@ -4265,9 +4230,7 @@ let
 
   cifs_utils = callPackage ../os-specific/linux/cifs-utils { };
 
-  conky = callPackage ../os-specific/linux/conky {
-    inherit (gtkLibs) glib;
-  };
+  conky = callPackage ../os-specific/linux/conky { };
 
   cpufrequtils = (
     import ../os-specific/linux/cpufrequtils {
@@ -4733,9 +4696,7 @@ let
 
   libnscd = callPackage ../os-specific/linux/libnscd { };
 
-  libnotify = callPackage ../development/libraries/libnotify {
-    inherit (gtkLibs) gtk glib;
-  };
+  libnotify = callPackage ../development/libraries/libnotify { };
 
   libvolume_id = callPackage ../os-specific/linux/libvolume_id { };
 
@@ -5103,7 +5064,6 @@ let
   abcde = callPackage ../applications/audio/abcde { };
 
   abiword = callPackage ../applications/office/abiword {
-    inherit (gtkLibs) gtk;
     inherit (gnome) libglade libgnomecanvas;
   };
 
@@ -5120,23 +5080,17 @@ let
     inherit (gnome) libgnomecanvas;
   };
 
-  audacious = callPackage ../applications/audio/audacious {
-    inherit (gtkLibs) glib gtk;
-  };
+  audacious = callPackage ../applications/audio/audacious { };
 
-  audacity = callPackage ../applications/audio/audacity {
-    inherit (gtkLibs) gtk glib;
-  };
+  audacity = callPackage ../applications/audio/audacity { };
 
   aumix = callPackage ../applications/audio/aumix {
-    inherit (gtkLibs) gtk;
     gtkGUI = false;
   };
 
   autopanosiftc = callPackage ../applications/graphics/autopanosiftc { };
 
   avidemux = callPackage ../applications/video/avidemux {
-    inherit (gtkLibs) gtk;
     stdenv = stdenv2;
   };
 
@@ -5159,8 +5113,6 @@ let
   };
 
   beast = callPackage ../applications/audio/beast {
-    # stdenv = overrideGCC stdenv gcc34;
-    inherit (gtkLibs) gtk glib;
     inherit (gnome) libgnomecanvas libart_lgpl;
   };
 
@@ -5193,7 +5145,6 @@ let
 
   bmp = callPackage ../applications/audio/bmp {
     inherit (gnome) esound libglade;
-    inherit (gtkLibs) glib gtk;
   };
 
   bmp_plugin_musepack = callPackage ../applications/audio/bmp-plugins/musepack { };
@@ -5272,7 +5223,6 @@ let
   compizFusion = callPackage ../applications/window-managers/compiz-fusion {
     version = getConfig ["compizFusion" "version"] "0.7.8";
     inherit (gnome) startupnotification libwnck GConf;
-    inherit (gtkLibs) gtk;
     inherit (gnome) libgnome libgnomeui metacity
       glib pango libglade libgtkhtml gtkhtml
       libgnomecanvas libgnomeprint
@@ -5283,11 +5233,9 @@ let
 
   compizExtra = callPackage ../applications/window-managers/compiz/extra.nix {
     inherit (gnome) GConf;
-    inherit (gtkLibs) gtk;
   };
 
   cinepaint = callPackage ../applications/graphics/cinepaint {
-    inherit (gtkLibs) gtk glib;
     fltk = fltk11;
   };
 
@@ -5316,15 +5264,11 @@ let
 
   cvs2svn = callPackage ../applications/version-management/cvs2svn { };
 
-  d4x = callPackage ../applications/misc/d4x {
-    inherit (gtkLibs) gtk glib;
-  };
+  d4x = callPackage ../applications/misc/d4x { };
 
   darcs = haskellPackages.darcs;
 
-  dia = callPackage ../applications/graphics/dia {
-    inherit (gtkLibs) gtk glib;
-  };
+  dia = callPackage ../applications/graphics/dia { };
 
   djvulibre = callPackage ../applications/misc/djvulibre { };
 
@@ -5363,7 +5307,6 @@ let
   emacs = emacs23;
 
   emacs22 = callPackage ../applications/editors/emacs-22 {
-    inherit (gtkLibs) gtk;
     xaw3dSupport = getPkgConfig "emacs" "xaw3dSupport" false;
     gtkGUI = getPkgConfig "emacs" "gtkSupport" true;
   };
@@ -5378,12 +5321,7 @@ let
     librsvg = if stdenv.isDarwin then null else librsvg;
   };
 
-  emacsSnapshot = lowPrio (import ../applications/editors/emacs-snapshot {
-    inherit fetchcvs stdenv ncurses pkgconfig x11 Xaw3d
-      libpng libjpeg libungif libtiff texinfo dbus
-      autoconf automake;
-    inherit (xlibs) libXaw libXpm libXft;
-    inherit (gtkLibs) gtk;
+  emacsSnapshot = lowPrio (callPackage ../applications/editors/emacs-snapshot {
     xawSupport = getPkgConfig "emacs" "xawSupport" false;
     xaw3dSupport = getPkgConfig "emacs" "xaw3dSupport" false;
     gtkGUI = getPkgConfig "emacs" "gtkSupport" true;
@@ -5448,9 +5386,7 @@ let
   emacs22Packages = emacsPackages emacs22 pkgs.emacs22Packages;
   emacs23Packages = recurseIntoAttrs (emacsPackages emacs23 pkgs.emacs23Packages);
 
-  epdfview = callPackage ../applications/misc/epdfview {
-    inherit (gtkLibs) gtk;
-  };
+  epdfview = callPackage ../applications/misc/epdfview { };
 
   espeak = callPackage ../applications/audio/espeak { };
 
@@ -5467,9 +5403,7 @@ let
     fltk = fltk20;
   };
 
-  fbpanel = callPackage ../applications/window-managers/fbpanel {
-    inherit (gtkLibs) gtk;
-  };
+  fbpanel = callPackage ../applications/window-managers/fbpanel { };
 
   fetchmail = import ../applications/misc/fetchmail {
     inherit stdenv fetchurl openssl;
@@ -5492,15 +5426,12 @@ let
   };
 
   grip = callPackage ../applications/misc/grip {
-    inherit (gtkLibs) gtk glib;
     inherit (gnome) libgnome libgnomeui vte;
   };
 
   wavesurfer = callPackage ../applications/misc/audio/wavesurfer { };
 
-  wireshark = callPackage ../applications/networking/sniffers/wireshark {
-    inherit (gtkLibs) gtk;
-  };
+  wireshark = callPackage ../applications/networking/sniffers/wireshark { };
 
   wvdial = callPackage ../os-specific/linux/wvdial { };
 
@@ -5593,18 +5524,14 @@ let
     qt4 = qt4;
   };
 
-  gkrellm = callPackage ../applications/misc/gkrellm {
-    inherit (gtkLibs) glib gtk;
-  };
+  gkrellm = callPackage ../applications/misc/gkrellm { };
 
   gnash = callPackage ../applications/video/gnash {
-    inherit (gtkLibs) glib gtk;
     inherit (gnome) gtkglext;
     inherit (gst_all) gstreamer gstPluginsBase gstPluginsGood gstFfmpeg;
   };
 
   gnome_mplayer = callPackage ../applications/video/gnome-mplayer {
-    inherit (gtkLibs) glib gtk;
     inherit (gnome) GConf;
   };
 
@@ -5626,7 +5553,6 @@ let
   graphicsmagick137 = callPackage ../applications/graphics/graphicsmagick/1.3.7.nix { };
 
   gtkpod = callPackage ../applications/audio/gtkpod {
-    inherit (gtkLibs) gtk glib;
     inherit (gnome) libglade;
   };
 
@@ -5643,13 +5569,9 @@ let
     browser = firefox;
   };
 
-  geeqie = callPackage ../applications/graphics/geeqie {
-    inherit (gtkLibs) gtk;
-  };
+  geeqie = callPackage ../applications/graphics/geeqie { };
 
-  gqview = callPackage ../applications/graphics/gqview {
-    inherit (gtkLibs) gtk;
-  };
+  gqview = callPackage ../applications/graphics/gqview { };
 
   googleearth = callPackage_i686 ../applications/misc/googleearth { };
 
@@ -5660,12 +5582,9 @@ let
 
   gpsbabel = callPackage ../applications/misc/gpsbabel { };
 
-  gpscorrelate = callPackage ../applications/misc/gpscorrelate {
-    inherit (gtkLibs) gtk;
-  };
+  gpscorrelate = callPackage ../applications/misc/gpscorrelate { };
 
   gpsd = callPackage ../servers/gpsd {
-
     # We need a Python with NCurses bindings.
     python = pythonFull;
   };
@@ -5674,9 +5593,7 @@ let
 
   hello = callPackage ../applications/misc/hello/ex-2 { };
 
-  homebank = callPackage ../applications/office/homebank {
-    inherit (gtkLibs) gtk;
-  };
+  homebank = callPackage ../applications/office/homebank { };
 
   htmldoc = callPackage ../applications/misc/htmldoc {
     fltk = fltk11;
@@ -5758,9 +5675,7 @@ let
 
   jedit = callPackage ../applications/editors/jedit { };
 
-  jigdo = callPackage ../applications/misc/jigdo {
-    inherit (gtkLibs) gtk;
-  };
+  jigdo = callPackage ../applications/misc/jigdo { };
 
   joe = callPackage ../applications/editors/joe { };
 
@@ -5774,9 +5689,6 @@ let
     inherit libsamplerate ffmpeg;
     inherit (gnome) libglade gtk glib;
     inherit (xlibs) libXv libX11;
-    inherit (gtkLibs) pango;
-    # #  optional
-    #  inherit ffmpeg2theora sox, vorbis-tools lame mjpegtools dvdauthor 'Q'dvdauthor growisofs mencoder;
   };
 
   konversation = newScope pkgs.kde4 ../applications/networking/irc/konversation { };
@@ -5792,7 +5704,6 @@ let
   };
 
   ldcpp = callPackage ../applications/networking/p2p/ldcpp {
-    inherit (gtkLibs) gtk;
     inherit (gnome) libglade;
   };
 
@@ -5869,7 +5780,6 @@ let
   };
 
   mozilla = callPackage ../applications/networking/browsers/mozilla {
-    inherit (gtkLibs) gtk;
     inherit (gnome) libIDL;
   };
 
@@ -5914,9 +5824,7 @@ let
   navipowm = callPackage ../applications/misc/navipowm {
   };
 
-  navit = callPackage ../applications/misc/navit {
-    inherit (gtkLibs) gtk;
-  };
+  navit = callPackage ../applications/misc/navit { };
 
   nedit = callPackage ../applications/editors/nedit {
       motif = lesstif;
@@ -5930,7 +5838,6 @@ let
   openjump = callPackage ../applications/misc/openjump { };
 
   openoffice = callPackage ../applications/office/openoffice {
-    inherit (gtkLibs) gtk;
     inherit (perlPackages) ArchiveZip CompressZlib;
     inherit (gnome) GConf ORBit2;
     neon = neon029;
@@ -5938,7 +5845,6 @@ let
   };
 
   go_oo = callPackage ../applications/office/openoffice/go-oo.nix {
-    inherit (gtkLibs) gtk;
     inherit (perlPackages) ArchiveZip CompressZlib;
     inherit (gnome) GConf ORBit2;
     neon = neon029;
@@ -5950,7 +5856,6 @@ let
   };
 
   pan = callPackage ../applications/networking/newsreaders/pan {
-    inherit (gtkLibs) gtk;
     gmime = gmime_2_2;
     spellChecking = false;
   };
@@ -5984,7 +5889,6 @@ let
 
   pidginlatex = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-latex {
     imagemagick = imagemagickBig;
-    inherit (gtkLibs) glib gtk;
   };
 
   pidginlatexSF = builderDefsPackage
@@ -6006,9 +5910,7 @@ let
     gtksharp = gtksharp2;
   };
 
-  pqiv = callPackage ../applications/graphics/pqiv {
-    inherit (gtkLibs) gtk;
-  };
+  pqiv = callPackage ../applications/graphics/pqiv { };
 
   # perhaps there are better apps for this task? It's how I had configured my preivous system.
   # And I don't want to rewrite all rules
@@ -6043,9 +5945,7 @@ let
       libstdcpp5 = gcc33.gcc;
   };
 
-  rekonq = newScope pkgs.kde4 ../applications/networking/browsers/rekonq {
-    inherit (gtkLibs) gtk;
-  };
+  rekonq = newScope pkgs.kde4 ../applications/networking/browsers/rekonq { };
 
   rsibreak = newScope pkgs.kde4 ../applications/misc/rsibreak { };
 
@@ -6060,7 +5960,6 @@ let
     perlSupport = false;  };
 
   sakura = callPackage ../applications/misc/sakura {
-    inherit (gtkLibs) gtk;
     inherit (gnome) vte;
   };
 
@@ -6124,7 +6023,6 @@ let
   svk = perlPackages.SVK;
 
   sylpheed = callPackage ../applications/networking/mailreaders/sylpheed {
-    inherit (gtkLibs) gtk;
     sslSupport = true;
     gpgSupport = true;
   };
@@ -6144,7 +6042,6 @@ let
   };
 
   tangogps = callPackage ../applications/misc/tangogps {
-    inherit (gtkLibs) gtk;
     gconf = gnome.GConf;
   };
 
@@ -6165,12 +6062,10 @@ let
   thunderbird = thunderbird3;
 
   thunderbird2 = callPackage ../applications/networking/mailreaders/thunderbird/2.x.nix {
-    inherit (gtkLibs) gtk;
     inherit (gnome) libIDL;
   };
 
   thunderbird3 = callPackage ../applications/networking/mailreaders/thunderbird/3.x.nix {
-    inherit (gtkLibs) gtk;
     inherit (gnome) libIDL;
   };
 
@@ -6180,9 +6075,7 @@ let
 
   tla = callPackage ../applications/version-management/arch { };
 
-  transmission = callPackage ../applications/networking/p2p/transmission {
-    inherit (gtkLibs) gtk;
-  };
+  transmission = callPackage ../applications/networking/p2p/transmission { };
 
   twinkle = callPackage ../applications/networking/twinkle {
     qt = qt3;
@@ -6298,15 +6191,12 @@ let
   };
 
   xara = callPackage ../applications/graphics/xara {
-    inherit (gtkLibs) gtk;
     wxGTK = wxGTK26;
   };
 
   xawtv = callPackage ../applications/video/xawtv { };
 
-  xchat = callPackage ../applications/networking/irc/xchat {
-    inherit (gtkLibs) gtk;
-  };
+  xchat = callPackage ../applications/networking/irc/xchat { };
 
   xchm = callPackage ../applications/misc/xchm { };
 
@@ -6352,12 +6242,10 @@ let
   };
 
   xpra = callPackage ../tools/X11/xpra {
-    inherit (gtkLibs) gtk;
     pyrex = pyrex095;
   };
 
   xscreensaver = callPackage ../applications/graphics/xscreensaver {
-    inherit (gtkLibs) gtk;
     inherit (gnome) libglade;
   };
 
@@ -6379,7 +6267,6 @@ let
   };
 
   xvidcap = callPackage ../applications/video/xvidcap {
-    inherit (gtkLibs) gtk;
     inherit (gnome) scrollkeeper libglade;
   };
 
@@ -6418,9 +6305,7 @@ let
     recordingSupport = true;
   };
 
-  zathura = callPackage ../applications/misc/zathura {
-    inherit (gtkLibs) gtk;
-  };
+  zathura = callPackage ../applications/misc/zathura { };
 
   ### GAMES
 
@@ -6448,9 +6333,7 @@ let
     inherit mesa freeglut;
   };
 
-  eduke32 = callPackage ../games/eduke32 {
-    inherit (gtkLibs) gtk;
-  };
+  eduke32 = callPackage ../games/eduke32 { };
 
   egoboo = callPackage ../games/egoboo { };
 
@@ -6468,9 +6351,7 @@ let
   freedink = callPackage ../games/freedink { };
 
   fsg = callPackage ../games/fsg {
-    inherit (gtkLibs) glib gtk;
-    wxGTK = wxGTK28.override {unicode = false;
-  };
+    wxGTK = wxGTK28.override { unicode = false; };
   };
 
   gemrb = callPackage ../games/gemrb { };
@@ -6504,10 +6385,7 @@ let
     zlib = zlibStatic;
   };
 
-  pioneers = import ../games/pioneers {
-    inherit stdenv fetchurl pkgconfig intltool;
-    inherit (gtkLibs) gtk /*glib gtkmm*/;
-  };
+  pioneers = callPackage ../games/pioneers { };
 
   quake3demo = callPackage ../games/quake3/wrapper {
     name = "quake3-demo-${quake3game.name}";
@@ -6564,7 +6442,6 @@ let
   };
 
   ufoai = callPackage ../games/ufoai {
-    inherit (gtkLibs) glib gtk;
     inherit (gnome) gtksourceview gtkglext;
   };
 
@@ -6794,13 +6671,9 @@ let
 
   ngspice = callPackage ../applications/science/electronics/ngspice { };
 
-  gtkwave = callPackage ../applications/science/electronics/gtkwave {
-    inherit (gtkLibs) gtk;
-  };
+  gtkwave = callPackage ../applications/science/electronics/gtkwave { };
 
-  xoscope = callPackage ../applications/science/electronics/xoscope {
-    inherit (gtkLibs) gtk;
-  };
+  xoscope = callPackage ../applications/science/electronics/xoscope { };
 
 
   ### SCIENCE / MATH
@@ -6810,8 +6683,6 @@ let
   wxmaxima = callPackage ../applications/science/math/wxmaxima { };
 
   scilab = callPackage ../applications/science/math/scilab {
-    inherit (gtkLibs) gtk;
-
     withXaw3d = false;
     withTk = true;
     withGtk = false;
@@ -6987,9 +6858,7 @@ let
     qt4 = qt47;
   };
 
-  putty = callPackage ../applications/networking/remote/putty {
-    inherit (gtkLibs) gtk;
-  };
+  putty = callPackage ../applications/networking/remote/putty { };
 
   rssglx = callPackage ../misc/screensavers/rss-glx { };
 
@@ -7001,9 +6870,7 @@ let
     gt68xxFirmware = getConfig ["sane" "gt68xxFirmware"] null;
   };
 
-  saneFrontends = callPackage ../misc/sane-front {
-    inherit (gtkLibs) gtk;
-  };
+  saneFrontends = callPackage ../misc/sane-front { };
 
   sourceAndTags = import ../misc/source-and-tags {
     inherit pkgs stdenv unzip lib ctags;
@@ -7071,9 +6938,7 @@ let
     inherit (pythonPackages) pysqlite;
   };
 
-  vice = callPackage ../misc/emulators/vice {
-    inherit (gtkLibs) gtk;
-  };
+  vice = callPackage ../misc/emulators/vice { };
 
   # Wine cannot be built in 64-bit; use a 32-bit build instead.
   wine = callPackage_i686 ../misc/emulators/wine {
@@ -7084,9 +6949,7 @@ let
 
   xosd = callPackage ../misc/xosd { };
 
-  xsane = callPackage ../misc/xsane {
-    inherit (gtkLibs) gtk;
-  };
+  xsane = callPackage ../misc/xsane { };
 
   yafc = callPackage ../applications/networking/yafc { };
 

From e7ca8b0d84e73c262dfdd5393134e0bdce788ffa Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 9 Sep 2010 20:04:50 +0000
Subject: [PATCH 101/181] (un)propagate some buildInputs

svn path=/nixpkgs/trunk/; revision=23706
---
 pkgs/desktops/kde-4.5/libs/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/kde-4.5/libs/default.nix b/pkgs/desktops/kde-4.5/libs/default.nix
index 6373450b866..f5ab788492e 100644
--- a/pkgs/desktops/kde-4.5/libs/default.nix
+++ b/pkgs/desktops/kde-4.5/libs/default.nix
@@ -8,13 +8,13 @@
 kde.package {
 
   buildInputs = [
-    cmake perl qt4 xz flex bison bzip2 pcre fam libxml2 libxslt
-    shared_mime_info giflib jasper /*openexr*/ aspell avahi kerberos acl attr
-    libXScrnSaver enchant libdbusmenu_qt polkit_qt_1
-    automoc4 strigi soprano qca2 attica
+    cmake perl xz flex bison bzip2 pcre fam libxml2 libxslt shared_mime_info
+    giflib jasper /*openexr*/ aspell avahi kerberos acl attr libXScrnSaver
+    enchant libdbusmenu_qt polkit_qt_1 automoc4
   ];
 
-  propagatedBuildInputs = [ shared_desktop_ontologies gcc.libc ];
+  propagatedBuildInputs = [ qt4 gcc.libc strigi soprano attica qca2
+    shared_desktop_ontologies ];
 
   patches = [ ./polkit-install.patch ];
 

From e7c7d6a00de4b4074037f23a7b818312b5c419f2 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 9 Sep 2010 20:04:56 +0000
Subject: [PATCH 102/181] kdepim, kdepim-runtime, kdebase upgrade

svn path=/nixpkgs/trunk/; revision=23707
---
 pkgs/desktops/kde-4.5/base/default.nix        |  8 ++++----
 pkgs/desktops/kde-4.5/default.nix             |  2 +-
 .../desktops/kde-4.5/kde-package/manifest.nix | 20 +++++++++++--------
 pkgs/desktops/kde-4.5/pim-runtime/default.nix |  9 ++++-----
 pkgs/desktops/kde-4.5/pim/boost-1.44.diff     | 12 +++++++++++
 pkgs/desktops/kde-4.5/pim/default.nix         | 18 +++++++++++++++++
 pkgs/desktops/kde-4.5/pimlibs/default.nix     |  5 +++--
 7 files changed, 54 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/desktops/kde-4.5/pim/boost-1.44.diff
 create mode 100644 pkgs/desktops/kde-4.5/pim/default.nix

diff --git a/pkgs/desktops/kde-4.5/base/default.nix b/pkgs/desktops/kde-4.5/base/default.nix
index bb3518fe300..6c60bbcebbb 100644
--- a/pkgs/desktops/kde-4.5/base/default.nix
+++ b/pkgs/desktops/kde-4.5/base/default.nix
@@ -1,11 +1,11 @@
-{ kde, cmake, perl, qt4, kdelibs, pciutils, libraw1394
-, automoc4, strigi, qimageblitz, soprano}:
+{ kde, cmake, perl, qt4, kdelibs, pciutils, libraw1394 , automoc4, strigi
+, qimageblitz, soprano}:
 
 kde.package {
   preConfigure = "cd apps";
 
   buildInputs = [ cmake perl qt4 kdelibs pciutils libraw1394 automoc4
-    strigi qimageblitz soprano ];
+    strigi qimageblitz ];
 
   meta = {
     description = "KDE Base components";
@@ -13,7 +13,7 @@ kde.package {
     license = "GPL";
     kde = {
       name = "kdebase";
-      version = "4.5.0";
+      version = "4.5.1";
     };
   };
 }
diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix
index da3a53406d3..95a3cef19d9 100644
--- a/pkgs/desktops/kde-4.5/default.nix
+++ b/pkgs/desktops/kde-4.5/default.nix
@@ -91,7 +91,7 @@
 
   #kdepim_runtime = callPackage ../kde-4.4/pim-runtime { };
   kdepim_runtime = callPackage ./pim-runtime { };
-  kdepim = callPackage ../kde-4.4/pim { };
+  kdepim = callPackage ./pim { };
 ### DEVELOPMENT
 
   kdebindings = callPackage ./bindings { };
diff --git a/pkgs/desktops/kde-4.5/kde-package/manifest.nix b/pkgs/desktops/kde-4.5/kde-package/manifest.nix
index 294f14dab5b..8c26b159dd5 100644
--- a/pkgs/desktops/kde-4.5/kde-package/manifest.nix
+++ b/pkgs/desktops/kde-4.5/kde-package/manifest.nix
@@ -1,13 +1,5 @@
 builtins.listToAttrs
 [
-{
-  name = "kdepim-runtime-4.4.92.tar.bz2";
-  value = "1gshcnra3fcbj6ww7rfaw6ny1x9mf4l7pxwlrppv2slgwg141msy";
-}
-{
-  name = "kdepim-4.4.92.tar.bz2";
-  value = "0mhpifynnypg81nhwfvr28hbpr7c6w488afasprqhxbs4q57lin6";
-}
 {
   name = "kdegraphics-4.5.0.tar.bz2";
   value = "13ms1z26sb2pfadhagkykgnw0p7inrn36p4s9qr04qisy2b2vd6l";
@@ -108,4 +100,16 @@ builtins.listToAttrs
   name = "kdepimlibs-4.5.1.tar.bz2";
   value = "1dlxnxxay6wbwgcfbkq0xak9z0h1bkh6rvysjx3djmawmwi5aw6b";
 }
+{
+  name = "kdepim-4.4.93.tar.bz2";
+  value = "1xrqmsgbgqpa8qzqadp1hikhn8c1snh5k323kc6a5yqdpnsf2qa0";
+}
+{
+  name = "kdepim-runtime-4.4.93.tar.bz2";
+  value = "18g8dz57pflmri7v013lsn2g4552c35lawcr7jxgig2x05zrwgf7";
+}
+{
+  name = "kdebase-4.5.1.tar.bz2";
+  value = "06g8s3r153hdmxh24s2x98a0fb4lr6d00d4307ibgp7r29w6dklb";
+}
 ]
diff --git a/pkgs/desktops/kde-4.5/pim-runtime/default.nix b/pkgs/desktops/kde-4.5/pim-runtime/default.nix
index f4f0aac0a79..c5952120628 100644
--- a/pkgs/desktops/kde-4.5/pim-runtime/default.nix
+++ b/pkgs/desktops/kde-4.5/pim-runtime/default.nix
@@ -1,16 +1,15 @@
 { kde, cmake, kdelibs, qt4, kdepimlibs, akonadi, pkgconfig, boost, shared_mime_info, libxml2, shared_desktop_ontologies, soprano, strigi, automoc4, libxslt }:
 
 kde.package rec {
-	stable = false;
-	subdir = "kdepim/${meta.kde.version}/src";
-
 	buildInputs = [ automoc4 cmake kdelibs qt4 kdepimlibs akonadi pkgconfig boost shared_mime_info shared_desktop_ontologies libxml2 soprano strigi libxslt ];
 
   meta = {
     description = "Runtime files for KDE PIM: akonadi agents etc.";
-    kde = {
+    kde = rec {
       name = "kdepim-runtime";
-      version = "4.4.92";
+      version = "4.4.93";
+      subdir = "kdepim/${version}/src/src";
+      stable = false;
     };
   };
 }
diff --git a/pkgs/desktops/kde-4.5/pim/boost-1.44.diff b/pkgs/desktops/kde-4.5/pim/boost-1.44.diff
new file mode 100644
index 00000000000..7c5ab9ef31b
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/pim/boost-1.44.diff
@@ -0,0 +1,12 @@
+diff --git a/kleopatra/crypto/gui/newresultpage.cpp b/kleopatra/crypto/gui/newresultpage.cpp
+index 96d1cb2..5c7281a 100644
+--- a/kleopatra/crypto/gui/newresultpage.cpp
++++ b/kleopatra/crypto/gui/newresultpage.cpp
+@@ -40,6 +40,7 @@
+ #include <crypto/taskcollection.h>
+ 
+ #include <utils/stl_util.h>
++#include <boost/mem_fn.hpp>
+ 
+ #include <KLocalizedString>
+ 
diff --git a/pkgs/desktops/kde-4.5/pim/default.nix b/pkgs/desktops/kde-4.5/pim/default.nix
new file mode 100644
index 00000000000..821c03fe7e1
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/pim/default.nix
@@ -0,0 +1,18 @@
+{ kde, automoc4, cmake, kdelibs, akonadi, kdepimlibs, boost, zlib, strigi,
+  shared_desktop_ontologies, soprano, grantlee, libassuan, perl, libxslt }:
+
+kde.package {
+  buildInputs = [ automoc4 cmake kdelibs akonadi kdepimlibs boost zlib strigi
+    shared_desktop_ontologies soprano grantlee libassuan perl libxslt ];
+
+  patches = [ ./boost-1.44.diff ];
+
+  meta = {
+    kde = rec {
+      name = "kdepim";
+      version = "4.4.93";
+      subdir = "kdepim/${version}/src/src";
+      stable = false;
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/pimlibs/default.nix b/pkgs/desktops/kde-4.5/pimlibs/default.nix
index 6fd40b85af7..a46b3431e37 100644
--- a/pkgs/desktops/kde-4.5/pimlibs/default.nix
+++ b/pkgs/desktops/kde-4.5/pimlibs/default.nix
@@ -3,8 +3,9 @@
 
 kde.package {
 
-  buildInputs = [ cmake qt4 perl boost cyrus_sasl gpgme libical openldap
-    shared_mime_info kdelibs automoc4 akonadi soprano ];
+  buildInputs = [ cmake automoc4 perl shared_mime_info ];
+  propagatedBuildInputs = [ qt4 boost cyrus_sasl gpgme libical openldap kdelibs
+    akonadi soprano ];
 
   meta = {
     description = "KDE PIM libraries";

From fb8e2ed6be442df4369fa109b4c0a86b1dcaa46b Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 9 Sep 2010 20:05:00 +0000
Subject: [PATCH 103/181] Verbose copy, use pkg-config to find dependencies

svn path=/nixpkgs/trunk/; revision=23708
---
 .../version-management/monotone/default.nix        | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix
index e0d462fad29..091f1075084 100644
--- a/pkgs/applications/version-management/monotone/default.nix
+++ b/pkgs/applications/version-management/monotone/default.nix
@@ -1,5 +1,5 @@
 {stdenv, fetchurl, boost, zlib, botan, libidn,
-  lua, pcre, sqlite, perl, lib}:
+  lua, pcre, sqlite, perl, pkgconfig}:
 
 let 
   version = "0.48";
@@ -10,18 +10,14 @@ in stdenv.mkDerivation rec {
     url = "http://monotone.ca/downloads/${version}/monotone-${version}.tar.gz";
     sha256 = "3149abf0e4433a0e14c5da805a04dbbc45b16086bc267d473b17e933407d839d";
   };
-  buildInputs = [boost zlib botan libidn lua pcre sqlite];
-  preConfigure = ''
-    export sqlite_LIBS=-lsqlite3
-    export NIX_LDFLAGS="$NIX_LDFLAGS -ldl"
-  '';
+  buildInputs = [boost zlib botan libidn lua pcre sqlite pkgconfig];
   postInstall = ''
     ensureDir $out/share/${name}
-    cp -r contrib/ $out/share/${name}/contrib
+    cp -rv contrib/ $out/share/${name}/contrib
     ensureDir $out/lib/perl5/site_perl/''${perl##*-perl-}
-    cp contrib/Monotone.pm $out/lib/perl5/site_perl/''${perl##*-perl-}
+    cp -v contrib/Monotone.pm $out/lib/perl5/site_perl/''${perl##*-perl-}
   '';
   meta = {
-    maintainers = [lib.maintainers.raskin];
+    maintainers = [stdenv.lib.maintainers.raskin];
   };
 }

From df1d0752ebf91603f792c42080c2233cae548973 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 10 Sep 2010 09:31:31 +0000
Subject: [PATCH 104/181] * Get rid of the template argument in mkOverride.

svn path=/nixpkgs/trunk/; revision=23709
---
 pkgs/lib/properties.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/lib/properties.nix b/pkgs/lib/properties.nix
index 592dc9c4bcb..4fa1b00a411 100644
--- a/pkgs/lib/properties.nix
+++ b/pkgs/lib/properties.nix
@@ -304,13 +304,12 @@ rec {
     inherit content;
   };
 
-  # Currently an alias, but sooner or later the template argument should be
-  # removed.
-  mkOverride = mkOverrideTemplate;
+  # Like mkOverrideTemplate, but without the template argument.
+  mkOverride = priority: content: mkOverrideTemplate priority {} content;
 
   # Sugar to override the default value of the option by making a new
   # default value based on the configuration.
-  mkDefaultValue = content: mkOverride 1000 {} content;
+  mkDefaultValue = content: mkOverride 1000 content;
 
   # Make the template traversal in function of the property traversal.  If
   # the template define a non-empty attribute set, then the property is

From cea083bec96ec96710a226abc2e07b1c154aec76 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 10 Sep 2010 10:53:17 +0000
Subject: [PATCH 105/181] * Set the Python search path for Xen's Python
 scripts.  As an   experiment, do this by patching a line setting sys.path
 into the   script, rather than using makeWrapper. * Xen requires pythonFull
 because it needs https/ssl support.

svn path=/nixpkgs/trunk/; revision=23710
---
 pkgs/applications/virtualization/xen/default.nix | 8 ++++++++
 pkgs/top-level/all-packages.nix                  | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/xen/default.nix b/pkgs/applications/virtualization/xen/default.nix
index b7c9c1c3d5b..12d16b7f229 100644
--- a/pkgs/applications/virtualization/xen/default.nix
+++ b/pkgs/applications/virtualization/xen/default.nix
@@ -32,6 +32,14 @@ stdenv.mkDerivation {
       cp -prvd dist/install/boot $out/boot
     ''; # */
 
+  # Set the Python search path in all Python scripts.
+  postFixup =
+    ''
+      for fn in $(grep -l '#!.*python' $out/bin/* $out/sbin/*); do
+          sed -i "$fn" -e "1 a import sys\nsys.path = ['$out/lib/python2.6/site-packages'] + sys.path"
+      done
+    ''; # */
+
   meta = {
     homepage = http://www.xen.org/;
     description = "Xen hypervisor and management tools for Dom0";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9b900b635d3..177e3995fa0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6204,7 +6204,9 @@ let
 
   xdg_utils = callPackage ../tools/X11/xdg-utils { };
 
-  xen = callPackage ../applications/virtualization/xen { };
+  xen = callPackage ../applications/virtualization/xen {
+    python = pythonFull;
+  };
 
   xfig = callPackage ../applications/graphics/xfig {
     stdenv = overrideGCC stdenv gcc34;

From 6d1f24764610dc4fc5ac72f8a4ec4d51a40641b9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 10 Sep 2010 10:56:44 +0000
Subject: [PATCH 106/181] * Firefox 3.6.9.

svn path=/nixpkgs/trunk/; revision=23711
---
 pkgs/applications/networking/browsers/firefox/3.6.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/3.6.nix b/pkgs/applications/networking/browsers/firefox/3.6.nix
index 324fcda25ad..2f17e0dcf7b 100644
--- a/pkgs/applications/networking/browsers/firefox/3.6.nix
+++ b/pkgs/applications/networking/browsers/firefox/3.6.nix
@@ -12,14 +12,14 @@
 
 rec {
 
-  firefoxVersion = "3.6.8";
+  firefoxVersion = "3.6.9";
   
-  xulVersion = "1.9.2.8"; # this attribute is used by other packages
+  xulVersion = "1.9.2.9"; # this attribute is used by other packages
 
   
   src = fetchurl {
     url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
-    sha1 = "4936e543f6c7492c5954cbd5b30ddda6b20e3797";
+    sha1 = "2429154c8d50bb5eeef80233b56fb26dcf727ea3";
   };
 
 

From 7ff37213b777c9185b13918b9b976400f7bc1373 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 10 Sep 2010 11:50:06 +0000
Subject: [PATCH 107/181] gnupdate: Update to new FFI.

* maintainers/scripts/gnu/gnupdate (pointer->procedure): New procedure.

svn path=/nixpkgs/trunk/; revision=23712
---
 maintainers/scripts/gnu/gnupdate | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/maintainers/scripts/gnu/gnupdate b/maintainers/scripts/gnu/gnupdate
index b9f34a2750e..159e45fce10 100755
--- a/maintainers/scripts/gnu/gnupdate
+++ b/maintainers/scripts/gnu/gnupdate
@@ -619,11 +619,17 @@ exec ${GUILE-guile} -L "$PWD" -l "$0"    \
               project message args)
       '())))
 
+(define pointer->procedure
+  ;; Compatibility hack for Guile up to 1.9.12 included.
+  (if (defined? 'pointer->procedure)
+      pointer->procedure
+      make-foreign-function))
+
 (define version-string>?
   (let ((strverscmp
          (let ((sym (or (dynamic-func "strverscmp" (dynamic-link))
                         (error "could not find `strverscmp' (from GNU libc)"))))
-           (make-foreign-function int sym (list '* '*)))))
+           (pointer->procedure int sym (list '* '*)))))
     (lambda (a b)
       (> (strverscmp (string->pointer a) (string->pointer b)) 0))))
 

From 9fd0fdebd928a4f4b388b3e69e0154f1294a3c14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 10 Sep 2010 11:50:11 +0000
Subject: [PATCH 108/181] GNU Mailutils 2.2.

svn path=/nixpkgs/trunk/; revision=23713
---
 pkgs/tools/networking/mailutils/default.nix      | 16 +++++++++-------
 .../tools/networking/mailutils/path-to-cat.patch | 13 +++++++++++++
 2 files changed, 22 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/tools/networking/mailutils/path-to-cat.patch

diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix
index 262150e5174..43293b79578 100644
--- a/pkgs/tools/networking/mailutils/default.nix
+++ b/pkgs/tools/networking/mailutils/default.nix
@@ -1,20 +1,22 @@
 { fetchurl, stdenv, gettext, gdbm, libtool, pam, readline
-, ncurses, gnutls, mysql, guile, texinfo, gnum4 }:
+, ncurses, gnutls, mysql, guile, texinfo, gnum4, dejagnu }:
 
 /* TODO: Add GNU SASL, GNU GSSAPI, and FreeBidi.  */
 
 stdenv.mkDerivation rec {
-  name = "mailutils-2.1";
+  name = "mailutils-2.2";
 
   src = fetchurl {
     url = "mirror://gnu/mailutils/${name}.tar.bz2";
-    sha256 = "09c4cb7w8z0gaxsqg1wgn2w8kgmqcqpahv7mw3ygw3nagcfh84cs";
+    sha256 = "0szbqa12zqzldqyw97lxqax3ja2adis83i7brdfsxmrfw68iaf65";
   };
 
-  buildInputs = [
-    gettext gdbm libtool pam readline ncurses
-    gnutls mysql guile texinfo gnum4
-  ];
+  patches = [ ./path-to-cat.patch ];
+
+  buildInputs =
+   [ gettext gdbm libtool pam readline ncurses
+     gnutls mysql guile texinfo gnum4 ]
+   ++ stdenv.lib.optional doCheck dejagnu;
 
   doCheck = true;
 
diff --git a/pkgs/tools/networking/mailutils/path-to-cat.patch b/pkgs/tools/networking/mailutils/path-to-cat.patch
new file mode 100644
index 00000000000..a9ae7c5366d
--- /dev/null
+++ b/pkgs/tools/networking/mailutils/path-to-cat.patch
@@ -0,0 +1,13 @@
+Fix absolute path to `cat'.
+
+--- mailutils-2.2/testsuite/lib/mailutils.exp	2010-09-10 13:39:58.000000000 +0200
++++ mailutils-2.2/testsuite/lib/mailutils.exp	2010-09-10 13:40:00.000000000 +0200
+@@ -719,7 +719,7 @@ proc mu_test_file {args} {
+         set pattern [lrange $args 1 end]
+     }
+     
+-    set res [remote_spawn host "/bin/cat $filename"]
++    set res [remote_spawn host "cat $filename"]
+     if { $res < 0 || $res == "" } {
+ 	perror "Reading $filename failed."
+ 	return 1;

From 582c02b1c05885a93823927c37458a88bd2308e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 10 Sep 2010 11:50:17 +0000
Subject: [PATCH 109/181] GNU Parallel 20100906.

svn path=/nixpkgs/trunk/; revision=23714
---
 pkgs/tools/misc/parallel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index f1a91b970c1..7b60bc3f583 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20100822";
+  name = "parallel-20100906";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "1fs4ps4nw2zx0hcrqh52fmnmz14pnwia0in08r7gmc0mn6zr0zf1";
+    sha256 = "1h27ffq0hk2dlnffsk377lpp65l2zmvija7r831lpvdfssklmxvw";
   };
 
   patchPhase =

From 6021bcf0dc8b636a1706556dd51fcb9e5fc6e190 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 10 Sep 2010 12:21:43 +0000
Subject: [PATCH 110/181] * Updated the GRUB 0.97 patchset from Gentoo to 1.10.

svn path=/nixpkgs/trunk/; revision=23715
---
 pkgs/tools/misc/grub/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix
index 13bdaf0339a..cce2adf5ce5 100644
--- a/pkgs/tools/misc/grub/default.nix
+++ b/pkgs/tools/misc/grub/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, autoconf, automake, buggyBiosCDSupport ? true}:
 
 stdenv.mkDerivation {
-  name = "grub-0.97-patch-1.9";
+  name = "grub-0.97-patch-1.10";
   
   src = fetchurl {
     url = ftp://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz;
@@ -13,8 +13,8 @@ stdenv.mkDerivation {
   # failures on systems with more than 2 GiB RAM, and for booting from
   # ext3 filesystems with 256-byte inodes as well as ext4 filesystems.
   gentooPatches = fetchurl {
-    url = mirror://gentoo/distfiles/grub-0.97-patches-1.9.tar.bz2;
-    sha256 = "0a20bi2njqdgi0993g9dzjcn9vjzlisp9ghw0dcz00q84v4lb13b";
+    url = mirror://gentoo/distfiles/grub-0.97-patches-1.10.tar.bz2;
+    sha256 = "015hkmb2jd6jfzkfr13cdh16frvva04rwr4yahzyw5xhl634d1h9";
   };
 
   patches = [

From 193799ec3d52993f0e38155fc67c067c3b4623d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 10 Sep 2010 12:39:57 +0000
Subject: [PATCH 111/181] nixBuild: Add `buildOutOfSourceTree' option.

svn path=/nixpkgs/trunk/; revision=23717
---
 pkgs/build-support/release/nix-build.nix | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix
index d0acce96113..3a0d3a034ef 100644
--- a/pkgs/build-support/release/nix-build.nix
+++ b/pkgs/build-support/release/nix-build.nix
@@ -5,7 +5,9 @@
 # it turns on GCC's coverage analysis feature.  It then runs `make
 # check' and produces a coverage analysis report using `lcov'.
 
-{ doCoverageAnalysis ? false
+{ buildOutOfSourceTree ? false
+, preConfigure ? null
+, doCoverageAnalysis ? false
 , lcovFilter ? []
 , lcovExtraTraceFiles ? []
 , src, stdenv
@@ -94,4 +96,24 @@ stdenv.mkDerivation (
     };
 
   }
+
+  //
+
+  (if buildOutOfSourceTree
+   then {
+     preConfigure =
+       # Build out of source tree and make the source tree read-only.  This
+       # helps catch violations of the GNU Coding Standards (info
+       # "(standards) Configuration"), like `make distcheck' does.
+       '' mkdir "../build"
+          cd "../build"
+          configureScript="../$sourceRoot/configure"
+          chmod -R a-w "../$sourceRoot"
+
+          echo "building out of source tree, from \`$PWD'..."
+
+          ${if preConfigure != null then preConfigure else ""}
+       '';
+   }
+   else {})
 )

From 9ff5c12798927cf72d3b6e33bf08ca3d8c3b0431 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 10 Sep 2010 14:06:56 +0000
Subject: [PATCH 112/181] * Remove the systemtap option from linux-2.6.32.nix
 and use   extraConfig instead.

svn path=/nixpkgs/trunk/; revision=23720
---
 pkgs/os-specific/linux/kernel/linux-2.6.32.nix | 16 ++++------------
 pkgs/top-level/all-packages.nix                |  9 ++++++++-
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
index 5ba06e98727..adda4b4be8c 100644
--- a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
+++ b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
@@ -1,11 +1,10 @@
-{ stdenv, fetchurl, userModeLinux ? false, systemtap ? false
-, extraConfig ? "", ... } @ args:
+{ stdenv, fetchurl, extraConfig ? "", ... } @ args:
 
 let
-  configWithPlatform = kernelPlatform :
+  configWithPlatform = kernelPlatform:
     ''
       # Don't include any debug features.
-      DEBUG_KERNEL ${if systemtap then "y" else "n"}
+      DEBUG_KERNEL n
 
       # Support drivers that need external firmware.
       STANDALONE n
@@ -25,6 +24,7 @@ let
 
       # Disable some expensive (?) features.
       FTRACE n
+      KPROBES n
       NUMA? n
       PM_TRACE_RTC n
 
@@ -190,14 +190,6 @@ let
       X86_CHECK_BIOS_CORRUPTION y
       X86_MCE y
 
-      ${if systemtap then ''
-        # SystemTap support.
-        KPROBES y    # kernel probes (needs `utrace' for process probes)
-        DEBUG_INFO y
-        RELAY y
-        DEBUG_FS y
-      '' else ""}
-
       ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
       ${extraConfig}
     '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 177e3995fa0..fbfe4a3db36 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4473,7 +4473,14 @@ let
 
   linux_2_6_32_systemtap = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.32.nix) {
     inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
-    systemtap = true;
+    extraConfig =
+      ''
+        DEBUG_KERNEL y
+        KPROBES y # kernel probes (needs `utrace' for process probes)
+        DEBUG_INFO y
+        RELAY y
+        DEBUG_FS y
+      '';
     dontStrip = true;
     kernelPatches =
       [ kernelPatches.fbcondecor_2_6_31

From ead1b8bc5c85378f3a8f678fb4e93738dd0cc83a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 10 Sep 2010 14:07:22 +0000
Subject: [PATCH 113/181] * Move config-blocks.nix to zen-kernel where it's
 used.

svn path=/nixpkgs/trunk/; revision=23721
---
 pkgs/os-specific/linux/zen-kernel/2.6.32-zen4.nix               | 2 +-
 pkgs/os-specific/linux/zen-kernel/2.6.33-zen1.nix               | 2 +-
 pkgs/os-specific/linux/{kernel => zen-kernel}/config-blocks.nix | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename pkgs/os-specific/linux/{kernel => zen-kernel}/config-blocks.nix (100%)

diff --git a/pkgs/os-specific/linux/zen-kernel/2.6.32-zen4.nix b/pkgs/os-specific/linux/zen-kernel/2.6.32-zen4.nix
index ec52d701df5..78a36c73ca5 100644
--- a/pkgs/os-specific/linux/zen-kernel/2.6.32-zen4.nix
+++ b/pkgs/os-specific/linux/zen-kernel/2.6.32-zen4.nix
@@ -4,7 +4,7 @@ args @ {stdenv, fetchurl, xz, runCommand, userModeLinux ? false, extraConfig ? "
   ...}:
 
 let 
-  conf = import ../kernel/config-blocks.nix; 
+  conf = import ./config-blocks.nix; 
 
 in
 
diff --git a/pkgs/os-specific/linux/zen-kernel/2.6.33-zen1.nix b/pkgs/os-specific/linux/zen-kernel/2.6.33-zen1.nix
index a3824a4fb15..5c1a315cb38 100644
--- a/pkgs/os-specific/linux/zen-kernel/2.6.33-zen1.nix
+++ b/pkgs/os-specific/linux/zen-kernel/2.6.33-zen1.nix
@@ -4,7 +4,7 @@ args @ {stdenv, fetchurl, xz, runCommand, userModeLinux ? false, extraConfig ? "
   ...}:
 
 let 
-  conf = import ../kernel/config-blocks.nix; 
+  conf = import ./config-blocks.nix; 
 
   baseKernelVersion = "2.6.33";
   ZenSuffix = "zen1";
diff --git a/pkgs/os-specific/linux/kernel/config-blocks.nix b/pkgs/os-specific/linux/zen-kernel/config-blocks.nix
similarity index 100%
rename from pkgs/os-specific/linux/kernel/config-blocks.nix
rename to pkgs/os-specific/linux/zen-kernel/config-blocks.nix

From 3b4c29781bbd17060fc2b7596256e9bfe1a977e6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 10 Sep 2010 14:12:15 +0000
Subject: [PATCH 114/181] * Turn off obsolete kernels.

svn path=/nixpkgs/trunk/; revision=23722
---
 pkgs/top-level/release.nix | 29 -----------------------------
 1 file changed, 29 deletions(-)

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 3b73414f878..28daa90a716 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -461,11 +461,6 @@ with (import ./release-lib.nix);
     l10n.ru = linux;
   };
 
-  linuxPackages_2_6_25 = {
-    aufs = linux;
-    kernel = linux;
-  };
-
   linuxPackages_2_6_27 = {
     aufs = linux;
     kernel = linux;
@@ -473,36 +468,12 @@ with (import ./release-lib.nix);
     virtualboxGuestAdditions = linux;
   };
 
-  linuxPackages_2_6_28 = {
-    kernel = linux;
-    virtualbox = linux;
-    virtualboxGuestAdditions = linux;
-  };
-
-  linuxPackages_2_6_29 = {
-    kernel = linux;
-    virtualbox = linux;
-    virtualboxGuestAdditions = linux;
-  };
-
   linuxPackages_2_6_32 = {
     kernel = linux;
     virtualbox = linux;
     virtualboxGuestAdditions = linux;
   };
 
-  linuxPackages_2_6_33 = {
-    kernel = linux;
-    virtualbox = linux;
-    virtualboxGuestAdditions = linux;
-  };
-
-  linuxPackages_2_6_34 = {
-    kernel = linux;
-    virtualbox = linux;
-    virtualboxGuestAdditions = linux;
-  };
-
   linuxPackages_2_6_35 = {
     kernel = linux;
     virtualbox = linux;

From 13f346058cf6fd1c37db29dadb1279c60fd97d0e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 10 Sep 2010 16:27:39 +0000
Subject: [PATCH 115/181] * Add a branch of the Linux kernel that can be used
 in Xen's Dom0.   From
 http://git.kernel.org/?p=linux/kernel/git/jeremy/xen.git;a=shortlog;h=refs/heads/xen/stable-2.6.32.x

svn path=/nixpkgs/trunk/; revision=23729
---
 pkgs/os-specific/linux/kernel/generic.nix     |   4 -
 .../linux/kernel/linux-2.6.32-xen.nix         | 221 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  14 ++
 3 files changed, 235 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/os-specific/linux/kernel/linux-2.6.32-xen.nix

diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 40860384122..da3f6862a10 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -27,9 +27,6 @@
 , # Whether to build a User-Mode Linux kernel.
   userModeLinux ? false
 
-, # Whether to build a Xen kernel.
-  xen ? false
-
 , # Allows you to set your own kernel version suffix (e.g.,
   # "-my-kernel").
   localVersion ? ""
@@ -93,7 +90,6 @@ stdenv.mkDerivation {
   # Should we trust platform.kernelArch? We can only do
   # that once we differentiate i686/x86_64 in platforms.
   arch =
-    if xen then "xen" else
     if userModeLinux then "um" else
     if stdenv.system == "i686-linux" then "i386" else
     if stdenv.system == "x86_64-linux" then "x86_64" else
diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.32-xen.nix b/pkgs/os-specific/linux/kernel/linux-2.6.32-xen.nix
new file mode 100644
index 00000000000..d77297b2475
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-2.6.32-xen.nix
@@ -0,0 +1,221 @@
+{ stdenv, fetchurl, extraConfig ? "", ... } @ args:
+
+let
+  configWithPlatform = kernelPlatform:
+    ''
+      # Don't include any debug features.
+      DEBUG_KERNEL n
+
+      # Support drivers that need external firmware.
+      STANDALONE n
+
+      # Make /proc/config.gz available.
+      IKCONFIG_PROC y
+
+      # Optimize with -O2, not -Os.
+      CC_OPTIMIZE_FOR_SIZE n
+
+      # Enable the kernel's built-in memory tester.
+      MEMTEST y
+
+      # Include the CFQ I/O scheduler in the kernel, rather than as a
+      # module, so that the initrd gets a good I/O scheduler.
+      IOSCHED_CFQ y
+
+      # Disable some expensive (?) features.
+      FTRACE n
+      KPROBES n
+      NUMA? n
+      PM_TRACE_RTC n
+
+      # Enable various subsystems.
+      ACCESSIBILITY y # Accessibility support
+      AUXDISPLAY y # Auxiliary Display support
+      DONGLE y # Serial dongle support
+      HIPPI y
+      MTD_COMPLEX_MAPPINGS y # needed for many devices
+      NET_POCKET y # enable pocket and portable adapters
+      SCSI_LOWLEVEL y # enable lots of SCSI devices
+      SCSI_LOWLEVEL_PCMCIA y
+      SPI y # needed for many devices
+      SPI_MASTER y
+      WAN y
+
+      # Networking options.
+      IP_PNP n
+      IPV6_PRIVACY y
+      NETFILTER_ADVANCED y
+      IP_VS_PROTO_TCP y
+      IP_VS_PROTO_UDP y
+      IP_VS_PROTO_ESP y
+      IP_VS_PROTO_AH y
+      IP_DCCP_CCID3 n # experimental
+      CLS_U32_PERF y
+      CLS_U32_MARK y
+
+      # Wireless networking.
+      IPW2100_MONITOR y # support promiscuous mode
+      IPW2200_MONITOR y # support promiscuous mode
+      IWLWIFI_LEDS? y
+      IWLWIFI_SPECTRUM_MEASUREMENT y
+      IWL3945_SPECTRUM_MEASUREMENT y
+      IWL4965 y # Intel Wireless WiFi 4965AGN
+      IWL5000 y # Intel Wireless WiFi 5000AGN
+      HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver
+      HOSTAP_FIRMWARE_NVRAM y
+
+      # Some settings to make sure that fbcondecor works - in particular,
+      # disable tileblitting and the drivers that need it.
+
+      # Enable various FB devices.
+      FB y
+      FB_EFI y
+      FB_NVIDIA_I2C y # Enable DDC Support
+      FB_RIVA_I2C y
+      FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support
+      FB_ATY_GX y # Mach64 GX support
+      FB_SAVAGE_I2C y
+      FB_SAVAGE_ACCEL y
+      FB_SIS_300 y
+      FB_SIS_315 y
+      FB_3DFX_ACCEL y
+      FB_GEODE y
+
+      # Video configuration
+      # The intel drivers already require KMS
+      DRM_I915_KMS y
+
+      # Sound.
+      SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode
+      SND_HDA_INPUT_BEEP y # Support digital beep via input layer
+      SND_USB_CAIAQ_INPUT y
+      PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible)
+
+      # USB serial devices.
+      USB_SERIAL_GENERIC y # USB Generic Serial Driver
+      USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices
+      USB_SERIAL_KEYSPAN_USA28 y
+      USB_SERIAL_KEYSPAN_USA28X y
+      USB_SERIAL_KEYSPAN_USA28XA y
+      USB_SERIAL_KEYSPAN_USA28XB y
+      USB_SERIAL_KEYSPAN_USA19 y
+      USB_SERIAL_KEYSPAN_USA18X y
+      USB_SERIAL_KEYSPAN_USA19W y
+      USB_SERIAL_KEYSPAN_USA19QW y
+      USB_SERIAL_KEYSPAN_USA19QI y
+      USB_SERIAL_KEYSPAN_USA49W y
+      USB_SERIAL_KEYSPAN_USA49WLC y
+
+      # Filesystem options - in particular, enable extended attributes and
+      # ACLs for all filesystems that support them.
+      EXT2_FS_XATTR y # Ext2 extended attributes
+      EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists
+      EXT2_FS_SECURITY y # Ext2 Security Labels
+      EXT2_FS_XIP y # Ext2 execute in place support
+      EXT4_FS_POSIX_ACL y
+      EXT4_FS_SECURITY y
+      REISERFS_FS_XATTR y
+      REISERFS_FS_POSIX_ACL y
+      REISERFS_FS_SECURITY y
+      JFS_POSIX_ACL y
+      JFS_SECURITY y
+      XFS_QUOTA y
+      XFS_POSIX_ACL y
+      XFS_RT y # XFS Realtime subvolume support
+      OCFS2_DEBUG_MASKLOG n
+      OCFS2_FS_POSIX_ACL y
+      BTRFS_FS_POSIX_ACL y
+      UBIFS_FS_XATTR y
+      UBIFS_FS_ADVANCED_COMPR y
+      NFSD_V2_ACL y
+      NFSD_V3 y
+      NFSD_V3_ACL y
+      NFSD_V4 y
+      CIFS_XATTR y
+      CIFS_POSIX y
+
+      # Security related features.
+      STRICT_DEVMEM y # Filter access to /dev/mem
+      SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default
+
+      # Misc. options.
+      8139TOO_8129 y
+      8139TOO_PIO n # PIO is slower
+      AIC79XX_DEBUG_ENABLE n
+      AIC7XXX_DEBUG_ENABLE n
+      AIC94XX_DEBUG n
+      B43_PCMCIA y
+      BLK_DEV_BSG n
+      BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support
+      BLK_DEV_IDEACPI y # IDE ACPI support
+      BLK_DEV_INTEGRITY y
+      BSD_PROCESS_ACCT_V3 y
+      BT_HCIUART_BCSP y
+      BT_HCIUART_H4 y # UART (H4) protocol support
+      BT_HCIUART_LL y
+      BT_RFCOMM_TTY y # RFCOMM TTY support
+      CPU_FREQ_DEBUG n
+      CRASH_DUMP n
+      DMAR? n # experimental
+      DVB_DYNAMIC_MINORS y # we use udev
+      FUSION y # Fusion MPT device support
+      IDE_GD_ATAPI y # ATAPI floppy support
+      IRDA_ULTRA y # Ultra (connectionless) protocol
+      JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels
+      JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels
+      JOYSTICK_XPAD_FF y # X-Box gamepad rumble support
+      JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED
+      KALLSYMS_EXTRA_PASS n
+      LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support
+      LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger
+      LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback
+      LOGO n # not needed
+      MEDIA_ATTACH y
+      MEGARAID_NEWGEN y
+      MICROCODE_AMD y
+      MODVERSIONS y
+      MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension
+      MTRR_SANITIZER y
+      NET_FC y # Fibre Channel driver support
+      PCI_LEGACY y
+      PPP_MULTILINK y # PPP multilink support
+      REGULATOR y # Voltage and Current Regulator Support
+      SCSI_LOGGING y # SCSI logging facility
+      SERIAL_8250 y # 8250/16550 and compatible serial support
+      SLIP_COMPRESSED y # CSLIP compressed headers
+      SLIP_SMART y
+      THERMAL_HWMON y # Hardware monitoring support
+      USB_DEBUG n
+      USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators
+      X86_CHECK_BIOS_CORRUPTION y
+      X86_MCE y
+
+      # Enable Xen Dom0 support.
+      XEN_DOM0 y
+      XEN_PCI_PASSTHROUGH y
+
+      ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
+      ${extraConfig}
+    '';
+in
+
+import ./generic.nix (
+
+  rec {
+    version = "2.6.32.21-xen-2968b25";
+  
+    src = fetchurl {
+      url = "http://nixos.org/tarballs/linux-${version}.tar.bz2";
+      sha256 = "06dxwchyxvfwg35y78bs0bm91ah6jlb6pjkqwgdnsgfjnxhibfx9";
+    };
+
+    config = configWithPlatform stdenv.platform;
+    configCross = configWithPlatform stdenv.cross.platform;
+
+    features.iwlwifi = true;
+
+    meta.description = "Linux kernel suitable for Xen Domain 0";
+  }
+
+  // removeAttrs args ["extraConfig"]
+)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fbfe4a3db36..9493c68fa8d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4471,6 +4471,18 @@ let
       ];
   };
 
+  linux_2_6_32_xen = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.32-xen.nix) {
+    inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
+    kernelPatches =
+      [ kernelPatches.fbcondecor_2_6_31
+        kernelPatches.sec_perm_2_6_24
+        kernelPatches.aufs2_2_6_32
+        kernelPatches.cifs_timeout
+        kernelPatches.no_xsave
+        kernelPatches.dell_rfkill
+      ];
+  };
+
   linux_2_6_32_systemtap = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.32.nix) {
     inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
     extraConfig =
@@ -4663,6 +4675,8 @@ let
   linuxPackages_2_6_32 = recurseIntoAttrs (linuxPackagesFor linux_2_6_32 pkgs.linuxPackages_2_6_32);
   linuxPackages_2_6_32_systemtap =
     recurseIntoAttrs (linuxPackagesFor linux_2_6_32_systemtap pkgs.linuxPackages_2_6_32_systemtap);
+  linuxPackages_2_6_32_xen =
+    recurseIntoAttrs (linuxPackagesFor linux_2_6_32_xen pkgs.linuxPackages_2_6_32_systemtap);
   linuxPackages_2_6_33 = recurseIntoAttrs (linuxPackagesFor linux_2_6_33 pkgs.linuxPackages_2_6_33);
   linuxPackages_2_6_34 = recurseIntoAttrs (linuxPackagesFor linux_2_6_34 pkgs.linuxPackages_2_6_34);
   linuxPackages_2_6_35 = recurseIntoAttrs (linuxPackagesFor linux_2_6_35 pkgs.linuxPackages_2_6_35);

From 7f8037cfd79c0fadf3ac5958b553ce0609fa3190 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Fri, 10 Sep 2010 18:03:16 +0000
Subject: [PATCH 116/181] Add additional shortcuts frequently used in NixOS.

svn path=/nixpkgs/trunk/; revision=23733
---
 pkgs/lib/properties.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/lib/properties.nix b/pkgs/lib/properties.nix
index 4fa1b00a411..46854d0e143 100644
--- a/pkgs/lib/properties.nix
+++ b/pkgs/lib/properties.nix
@@ -309,7 +309,10 @@ rec {
 
   # Sugar to override the default value of the option by making a new
   # default value based on the configuration.
-  mkDefaultValue = content: mkOverride 1000 content;
+  mkDefaultValue = mkOverride 1000;
+  mkDefault = mkOverride 1000;
+  mkForce = mkOverride 50;
+  mkStrict = mkOverride 0;
 
   # Make the template traversal in function of the property traversal.  If
   # the template define a non-empty attribute set, then the property is

From bf7c353ad1d116453a64f856e2764e0b45a85342 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 11 Sep 2010 14:20:46 +0000
Subject: [PATCH 117/181] * Updated Chromium.

svn path=/nixpkgs/trunk/; revision=23736
---
 .../networking/browsers/chromium/default.nix     | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index d5496399144..95fef4ddbdd 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -34,22 +34,24 @@
 assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" ;
 
 stdenv.mkDerivation rec {
-  name = "chrome-${version}";
-  version = "55366";
+  name = "chrome-${version}"; # !!! Shouldn't this be "chromium"?
+  version = "59187";
+
+  # TODO: Use a stable release that doesn't disappear every few days.  
   src = 
     if stdenv.system == "x86_64-linux" then 
       fetchurl {
         url = "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux-64/${version}/chrome-linux.zip";
-        sha256 = "1dazdfpnl278wwh03hs0x184ql5zh0yhpfiaw75j437dp3668hnj";
+        sha256 = "14dk0c5fgh1q2iy4srfvc6nr8grpk5k5zgnx13464bkadr9s32gx";
       } 
     else if stdenv.system == "i686-linux" then 
       fetchurl {
         url = "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux/${version}/chrome-linux.zip";
-        sha256 = "1x5ykvp2hxc56p4bb1lykahkk1nzkqi2kkm474spplqcfnmd6j2b";
+        sha256 = "0ls2vl01psp25rhy0bjhfzjayw00rrnqmvcki8sl5kv9m581bn8s";
       } 
-    else null;
+    else throw "Chromium is not supported on this platform.";
 
-  phases="unpackPhase installPhase";
+  phases = "unpackPhase installPhase";
 
   buildInputs = [makeWrapper unzip];
 
@@ -77,6 +79,6 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "";
+    description = "Chromium, an open source web browser";
   };
 }

From b63de97e4cedd5722949c25e187b4222274a04a3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 11 Sep 2010 17:16:42 +0000
Subject: [PATCH 118/181] * Updated gecko-mediaplayer and gnome-mplayer.

svn path=/nixpkgs/trunk/; revision=23737
---
 .../mozilla-plugins/gecko-mediaplayer/default.nix    | 12 +++++-------
 pkgs/applications/video/gnome-mplayer/default.nix    |  4 ++--
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix
index 6c08f127818..d50486cd742 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix
@@ -3,19 +3,19 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gecko-mediaplayer-0.9.6";
+  name = "gecko-mediaplayer-0.9.99.rc1";
 
   src = fetchurl {
     url = "http://gecko-mediaplayer.googlecode.com/files/${name}.tar.gz";
-    sha256 = "1847jv1v9r4xzmvksvjvl2fmp8j5s22hx922hywdflzzq7jsgyr7";
+    sha256 = "1ddp8z2a40wxdj7v20wqph9l4z4a47bjqzac7wlmmzjq7a9pbij2";
   };
 
-  buildInputs = [pkgconfig glib dbus dbus_glib browser x11 GConf];
+  buildInputs = [pkgconfig glib dbus dbus_glib browser x11 GConf browser.xulrunner];
 
   # !!! fix this
   preBuild =
     ''
-      export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${browser.xulrunner}/include/xulrunner-*/stable) -I${browser.nspr}/include/nspr"
+      export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${browser.xulrunner}/include/xulrunner-*) -I${browser.nspr}/include/nspr"
       echo $NIX_CFLAGS_COMPILE
     '';
 
@@ -26,9 +26,7 @@ stdenv.mkDerivation rec {
       echo "${gnome_mplayer}/bin:${MPlayer}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path
     '';
 
-  passthru = {
-    mozillaPlugin = "/lib/mozilla/plugins";
-  };
+  passthru.mozillaPlugin = "/lib/mozilla/plugins";
 
   meta = {
     description = "A browser plugin that uses GNOME MPlayer to play media in a browser";
diff --git a/pkgs/applications/video/gnome-mplayer/default.nix b/pkgs/applications/video/gnome-mplayer/default.nix
index c80ba1d3b89..0d86e902efd 100644
--- a/pkgs/applications/video/gnome-mplayer/default.nix
+++ b/pkgs/applications/video/gnome-mplayer/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, pkgconfig, glib, gtk, dbus, dbus_glib, GConf}:
 
 stdenv.mkDerivation rec {
-  name = "gnome-mplayer-0.9.6";
+  name = "gnome-mplayer-0.9.99.rc1";
 
   src = fetchurl {
     url = "http://gnome-mplayer.googlecode.com/files/${name}.tar.gz";
-    sha256 = "0gvciiy50y4vc9r6nlmw1q2fgwkywk0cq8rviswd6wbrxvz2gv2x";
+    sha256 = "00fbcjpashrld8bpvm63q9ms17kjnj3rrn1ghsfyqi2swpwzk2k1";
   };
 
   buildInputs = [pkgconfig glib gtk dbus dbus_glib GConf];

From ae49a474ff795ac0c6a9e0b5ba43831d018d94fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Mon, 13 Sep 2010 10:30:54 +0000
Subject: [PATCH 119/181] Added Hakyll and dependencies.

svn path=/nixpkgs/trunk/; revision=23742
---
 .../haskell/blaze-builder/default.nix         | 13 +++++++++
 .../libraries/haskell/failure/default.nix     | 12 +++++++++
 .../libraries/haskell/hakyll/default.nix      | 13 +++++++++
 .../libraries/haskell/hamlet/default.nix      | 10 ++++---
 .../libraries/haskell/neither/default.nix     | 15 +++++++++++
 .../libraries/haskell/pandoc/default.nix      |  4 +--
 .../libraries/haskell/random/default.nix      | 13 +++++++++
 .../libraries/haskell/regex-tdfa/default.nix  | 13 +++++++++
 .../libraries/haskell/time/1.2.0.3.nix        | 11 ++++++++
 pkgs/top-level/haskell-packages.nix           | 27 ++++++++++++++++---
 10 files changed, 122 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/blaze-builder/default.nix
 create mode 100644 pkgs/development/libraries/haskell/failure/default.nix
 create mode 100644 pkgs/development/libraries/haskell/hakyll/default.nix
 create mode 100644 pkgs/development/libraries/haskell/neither/default.nix
 create mode 100644 pkgs/development/libraries/haskell/random/default.nix
 create mode 100644 pkgs/development/libraries/haskell/regex-tdfa/default.nix
 create mode 100644 pkgs/development/libraries/haskell/time/1.2.0.3.nix

diff --git a/pkgs/development/libraries/haskell/blaze-builder/default.nix b/pkgs/development/libraries/haskell/blaze-builder/default.nix
new file mode 100644
index 00000000000..3a9e8b8e4cb
--- /dev/null
+++ b/pkgs/development/libraries/haskell/blaze-builder/default.nix
@@ -0,0 +1,13 @@
+{cabal, text}:
+
+cabal.mkDerivation (self : {
+  pname = "blaze-builder";
+  version = "0.1";
+  sha256 = "dc4c542a39cf9e82b6a7ca99d6f460d6fa8dc4c8f648224368eac3fe054127c5";
+  propagatedBuildInputs = [text];
+  meta = {
+    description = "Builder to efficiently append text";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/failure/default.nix b/pkgs/development/libraries/haskell/failure/default.nix
new file mode 100644
index 00000000000..74f9f0c4626
--- /dev/null
+++ b/pkgs/development/libraries/haskell/failure/default.nix
@@ -0,0 +1,12 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "failure";
+  version = "0.1.0";
+  sha256 = "08c4e51dbbc0852836ff5bf791e9c62dca748aed8554bb6271618ab3d6a04b2c";
+  meta = {
+    description = "A simple type class for success/failure computations";
+    license = "Public Domain";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix
new file mode 100644
index 00000000000..c5b0339fae7
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hakyll/default.nix
@@ -0,0 +1,13 @@
+{cabal, binary, hamlet, mtl, network, pandoc, regexBase, regexTDFA, time}:
+
+cabal.mkDerivation (self : {
+  pname = "hakyll";
+  version = "2.3";
+  sha256 = "40e57c5cf5be3c6fdc270d00ff765a2b3e11ba7e302f40146d83048aa4436116";
+  propagatedBuildInputs = [hamlet mtl network pandoc regexBase regexTDFA time];
+  meta = {
+    description = "A simple static site generator library";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix
index 08f7fd7b6a2..90bbb999d18 100644
--- a/pkgs/development/libraries/haskell/hamlet/default.nix
+++ b/pkgs/development/libraries/haskell/hamlet/default.nix
@@ -1,10 +1,12 @@
-{cabal, blazeHtml, parsec, utf8String}:
+{cabal, blazeHtml, blazeBuilder, parsec, utf8String, failure, neither}:
 
 cabal.mkDerivation (self : {
   pname = "hamlet";
-  version = "0.4.0";
-  sha256 = "5e05879e734fc193acc48eda48dadbf53659e937543068bcc77dc7c394f6adcd";
-  propagatedBuildInputs = [blazeHtml parsec utf8String];
+  version = "0.5.0";
+  sha256 = "92d8e099fa63fe218e2c8c4da56ac86b0b0bb49139467b8f12595c4436d1ad0b";
+  propagatedBuildInputs = [
+    blazeHtml blazeBuilder parsec utf8String failure neither
+  ];
   meta = {
     description = "Haml-like template files that are compile-time checked";
     license = "BSD";
diff --git a/pkgs/development/libraries/haskell/neither/default.nix b/pkgs/development/libraries/haskell/neither/default.nix
new file mode 100644
index 00000000000..1dfd1ca533d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/neither/default.nix
@@ -0,0 +1,15 @@
+{cabal, failure, mtl, transformers, MonadCatchIOMtl, MonadCatchIOTransformers}:
+
+cabal.mkDerivation (self : {
+  pname = "neither";
+  version = "0.0.2";
+  sha256 = "1e1b934d9d1918bd762bb8d6cde35c56883543c2d0c165a661f096c2ce5ab139";
+  propagatedBuildInputs = [
+    failure mtl transformers MonadCatchIOMtl MonadCatchIOTransformers
+  ];
+  meta = {
+    description = "A simple type class for success/failure computations";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix
index 57b6cec24b5..3f0b7b09d72 100644
--- a/pkgs/development/libraries/haskell/pandoc/default.nix
+++ b/pkgs/development/libraries/haskell/pandoc/default.nix
@@ -1,12 +1,12 @@
 {cabal, mtl, network, parsec, utf8String, xhtml, zipArchive, HTTP, xml,
- texmath}:
+ texmath, random}:
 
 cabal.mkDerivation (self : {
   pname = "pandoc";
   version = "1.6";
   sha256 = "9b825233293edf1ea414b0e7ea821d6a914711dc2c60546566ab5a97512b079b";
   propagatedBuildInputs = [
-    mtl network parsec utf8String xhtml zipArchive HTTP xml texmath
+    mtl network parsec utf8String xhtml zipArchive HTTP xml texmath random
   ];
   meta = {
     description = "Conversion between markup formats";
diff --git a/pkgs/development/libraries/haskell/random/default.nix b/pkgs/development/libraries/haskell/random/default.nix
new file mode 100644
index 00000000000..370f054dc1e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/random/default.nix
@@ -0,0 +1,13 @@
+{cabal, time}:
+
+cabal.mkDerivation (self : {
+  pname = "random";
+  version = "1.0.0.2";
+  sha256 = "5433aebb4bbfb999f1d02410c8ca3769c63cd8b02109d2771a37c12918f92dd5";
+  propagatedBuildInputs = [time];
+  meta = {
+    description = "random number library";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/regex-tdfa/default.nix b/pkgs/development/libraries/haskell/regex-tdfa/default.nix
new file mode 100644
index 00000000000..76b30404495
--- /dev/null
+++ b/pkgs/development/libraries/haskell/regex-tdfa/default.nix
@@ -0,0 +1,13 @@
+{cabal, mtl, parsec, regexBase}:
+
+cabal.mkDerivation (self : {
+  pname = "regex-tdfa";
+  version = "1.1.4";
+  sha256 = "382c7ed1ee75448574b42e9ecb9228b25f55143f3008ecd6f5d3a30471337b39";
+  propagatedBuildInputs = [mtl parsec regexBase];
+  meta = {
+    description = "Replaces/Enhances Text.Regex";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/time/1.2.0.3.nix b/pkgs/development/libraries/haskell/time/1.2.0.3.nix
new file mode 100644
index 00000000000..7ddbdcc2fa9
--- /dev/null
+++ b/pkgs/development/libraries/haskell/time/1.2.0.3.nix
@@ -0,0 +1,11 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "time";
+  version = "1.2.0.3";
+  sha256 = "acb1e3cf2b98a73632d35b0665808b05df6c03fcefd62796fe291f5b2ef4348e";
+  meta = {
+    description = "A time library";
+  };
+})  
+
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index b33b842c964..d6a803c436e 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -46,6 +46,8 @@ rec {
 
   bitmap = callPackage ../development/libraries/haskell/bitmap {};
 
+  blazeBuilder = callPackage ../development/libraries/haskell/blaze-builder {};
+
   blazeHtml = callPackage ../development/libraries/haskell/blaze-html {};
 
   bytestring = callPackage ../development/libraries/haskell/bytestring {};
@@ -115,6 +117,8 @@ rec {
 
   extensibleExceptions = callPackage ../development/libraries/haskell/extensible-exceptions {};
 
+  failure = callPackage ../development/libraries/haskell/failure {};
+
   fclabels = callPackage ../development/libraries/haskell/fclabels {};
 
   feed = callPackage ../development/libraries/haskell/feed {};
@@ -171,6 +175,12 @@ rec {
     happy = happy_1_18_5;
   };
 
+  hakyll = callPackage ../development/libraries/haskell/hakyll {
+    regexBase = regexBase_0_93_2;
+    network = network_2_2_1_7;
+    time = time_1_2_0_3;
+  };
+
   hamlet = callPackage ../development/libraries/haskell/hamlet {};
 
   HAppSData = callPackage ../development/libraries/haskell/HAppS/HAppS-Data.nix {};
@@ -371,6 +381,8 @@ rec {
 
   multiset = callPackage ../development/libraries/haskell/multiset {};
 
+  neither = callPackage ../development/libraries/haskell/neither {};
+
   network_2_2_1_7 = callPackage ../development/libraries/haskell/network/2.2.1.7.nix {};
 
   network = callPackage ../development/libraries/haskell/network {};
@@ -396,6 +408,7 @@ rec {
   pandoc = callPackage ../development/libraries/haskell/pandoc {
     HTTP = HTTP_4000_0_9;
     network = network_2_2_1_7;
+    random = random_newtime;
   };
 
   parallel_2_2_0_1 = callPackage ../development/libraries/haskell/parallel/2.2.0.1.nix {};
@@ -434,6 +447,10 @@ rec {
 
   RangedSets = callPackage ../development/libraries/haskell/Ranged-sets {};
 
+  random_newtime = callPackage ../development/libraries/haskell/random {
+    time = time_1_2_0_3;
+  };
+
   readline = callPackage ../development/libraries/haskell/readline {
     inherit (pkgs) readline ncurses;
   };
@@ -469,8 +486,10 @@ rec {
     regexBase = regexBase_0_93_2;
   };
 
-  regexPosix = callPackage ../development/libraries/haskell/regex-posix {
-    inherit cabal regexBase;
+  regexPosix = callPackage ../development/libraries/haskell/regex-posix {};
+
+  regexTDFA = callPackage ../development/libraries/haskell/regex-tdfa {
+    regexBase = regexBase_0_93_2;
   };
 
   regular = callPackage ../development/libraries/haskell/regular {};
@@ -550,11 +569,13 @@ rec {
 
   threadmanager = callPackage ../development/libraries/haskell/threadmanager {};
 
-  /* time is Haskell Platform default, time_1_1_3 is more recent but incompatible */
+  /* time is Haskell Platform default, other time versions are more recent but incompatible */
   time = callPackage ../development/libraries/haskell/time {};
 
   time_1_1_3 = callPackage ../development/libraries/haskell/time/1.1.3.nix {};
 
+  time_1_2_0_3 = callPackage ../development/libraries/haskell/time/1.2.0.3.nix {};
+
   transformers = callPackage ../development/libraries/haskell/transformers {};
 
   uniplate = callPackage ../development/libraries/haskell/uniplate {};

From 58722fa3931cec55ee26cef1053f186578964016 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 13 Sep 2010 11:54:30 +0000
Subject: [PATCH 120/181] Update veracity

svn path=/nixpkgs/trunk/; revision=23745
---
 .../version-management/veracity/src-for-default.nix       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/veracity/src-for-default.nix b/pkgs/applications/version-management/veracity/src-for-default.nix
index 6da58b7d85b..61cec35e7bc 100644
--- a/pkgs/applications/version-management/veracity/src-for-default.nix
+++ b/pkgs/applications/version-management/veracity/src-for-default.nix
@@ -1,9 +1,9 @@
 rec {
-   version="0.3.1.10278";
-   name="veracity-0.3.1.10278";
-   hash="0gb6441jmycvbx76rmpfyiqhn9qnwgfz1if1nlbyvqm5llj4ylrs";
+   version="0.3.1.10285";
+   name="veracity-0.3.1.10285";
+   hash="1r13wsnzfd35cq045kgx6is2j83snh1pny4dapirsjs9awlr4shf";
    url="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-${version}.tar.gz";
-   advertisedUrl="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-0.3.1.10278.tar.gz";
+   advertisedUrl="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-0.3.1.10285.tar.gz";
   
   
 }

From c7f570b473fb7a4ece56237d4554137b4ac88b2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Mon, 13 Sep 2010 12:07:14 +0000
Subject: [PATCH 121/181] Addressing problem with conflicting versions of
 Haskell's time library.

svn path=/nixpkgs/trunk/; revision=23746
---
 pkgs/development/libraries/haskell/yst/default.nix | 4 ++--
 pkgs/top-level/haskell-packages.nix                | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yst/default.nix b/pkgs/development/libraries/haskell/yst/default.nix
index 30fa46b0ffb..ac65ef9d917 100644
--- a/pkgs/development/libraries/haskell/yst/default.nix
+++ b/pkgs/development/libraries/haskell/yst/default.nix
@@ -1,11 +1,11 @@
-{cabal, HStringTemplate, csv, pandoc, parsec, split, utf8String, xhtml, HsSyck}:
+{cabal, HStringTemplate, csv, pandoc, parsec, split, utf8String, xhtml, HsSyck, time}:
 
 cabal.mkDerivation (self : {
   pname = "yst";
   version = "0.2.3.2";
   sha256 = "b857e70db67d708e2edb61a1d6bc4eaff3abd2bc252b3605f66bf1760da4da4b";
   propagatedBuildInputs = [
-    HStringTemplate csv pandoc parsec split utf8String xhtml HsSyck
+    HStringTemplate csv pandoc parsec split utf8String xhtml HsSyck time
   ];
   meta = {
     description =
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index d6a803c436e..3ab7c57e489 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -179,6 +179,7 @@ rec {
     regexBase = regexBase_0_93_2;
     network = network_2_2_1_7;
     time = time_1_2_0_3;
+    pandoc = pandoc_newtime;
   };
 
   hamlet = callPackage ../development/libraries/haskell/hamlet {};
@@ -408,6 +409,11 @@ rec {
   pandoc = callPackage ../development/libraries/haskell/pandoc {
     HTTP = HTTP_4000_0_9;
     network = network_2_2_1_7;
+  };
+
+  pandoc_newtime = callPackage ../development/libraries/haskell/pandoc {
+    HTTP = HTTP_4000_0_9;
+    network = network_2_2_1_7;
     random = random_newtime;
   };
 
@@ -447,6 +453,8 @@ rec {
 
   RangedSets = callPackage ../development/libraries/haskell/Ranged-sets {};
 
+  random = callPackage ../development/libraries/haskell/random {};
+
   random_newtime = callPackage ../development/libraries/haskell/random {
     time = time_1_2_0_3;
   };

From 255acffe147bad87ef54bac13967f2416471a5b3 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 13 Sep 2010 14:22:37 +0000
Subject: [PATCH 122/181] ebook-tools-0.2.0

svn path=/nixpkgs/trunk/; revision=23750
---
 pkgs/tools/text/ebook-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/ebook-tools/default.nix b/pkgs/tools/text/ebook-tools/default.nix
index 57e5b21582b..2ced27edc2a 100644
--- a/pkgs/tools/text/ebook-tools/default.nix
+++ b/pkgs/tools/text/ebook-tools/default.nix
@@ -5,11 +5,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "${pn}-0.1.1";
+  name = "${pn}-0.2.0";
 
   src = fetchurl {
     url = "mirror://sf/${pn}/${name}.tar.gz";
-    sha256 = "07flqm0c252jklggjmg998qzyvwlw67c3db2jbg734figngrjh79";
+    sha256 = "18jb6v20pzk0kxv2dgjqgzzrcg7qid569apr63phfq1as1h09x67";
   };
 
   buildInputs = [ cmake libxml2 libzip ];

From 20a0469f1c727950270dff5fee46eb2898bf82ad Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 13 Sep 2010 14:22:43 +0000
Subject: [PATCH 123/181] kdebase-{runtime,workspace}, kdebindings

svn path=/nixpkgs/trunk/; revision=23751
---
 .../desktops/kde-4.5/base-runtime/default.nix |  5 +--
 .../desktops/kde-4.5/base-runtime/freeze.diff | 37 -------------------
 .../kde-4.5/base-workspace/default.nix        |  4 +-
 pkgs/desktops/kde-4.5/bindings/default.nix    |  2 +-
 .../desktops/kde-4.5/kde-package/manifest.nix | 12 ++++++
 5 files changed, 16 insertions(+), 44 deletions(-)
 delete mode 100644 pkgs/desktops/kde-4.5/base-runtime/freeze.diff

diff --git a/pkgs/desktops/kde-4.5/base-runtime/default.nix b/pkgs/desktops/kde-4.5/base-runtime/default.nix
index 95e15a76061..02fa06e2961 100644
--- a/pkgs/desktops/kde-4.5/base-runtime/default.nix
+++ b/pkgs/desktops/kde-4.5/base-runtime/default.nix
@@ -8,12 +8,9 @@ kde.package {
     exiv2 libssh kdelibs automoc4 strigi soprano cluceneCore attica
     makeWrapper];
 
-  patches = [ ./freeze.diff ];
-
 # TODO: OpenSLP, OpenEXR
   postInstall = ''
     rm -v $out/share/icons/default.kde4
-    ln -s ${oxygen_icons}/share/icons/oxygen $out/share/icons/default.kde4
     wrapProgram "$out/bin/nepomukservicestub" --prefix LD_LIBRARY_PATH : "${virtuoso}/lib" \
         --prefix PATH : "${virtuoso}/bin"
   '';
@@ -24,7 +21,7 @@ kde.package {
     license = "LGPL";
     kde = {
       name = "kdebase-runtime";
-      version = "4.5.0";
+      version = "4.5.1";
     };
   };
 }
diff --git a/pkgs/desktops/kde-4.5/base-runtime/freeze.diff b/pkgs/desktops/kde-4.5/base-runtime/freeze.diff
deleted file mode 100644
index 62079f6e8ce..00000000000
--- a/pkgs/desktops/kde-4.5/base-runtime/freeze.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: kioslave/network/network/builder/upnp/upnpnetworkbuilder.cpp
-===================================================================
---- a/kioslave/network/network/builder/upnp/upnpnetworkbuilder.cpp	(revision 1160390)
-+++ b/kioslave/network/network/builder/upnp/upnpnetworkbuilder.cpp	(revision 1160391)
-@@ -36,6 +36,7 @@
- #include <QtDBus/QDBusConnection>
- #include <QtDBus/QDBusInterface>
- #include <QtDBus/QDBusPendingCallWatcher>
-+#include <QtCore/QTimer>
- #include <QtCore/QStringList>
- 
- #include <KDebug>
-@@ -60,6 +61,11 @@
- 
- void UpnpNetworkBuilder::start()
- {
-+    QTimer::singleShot(0, this, SLOT(startBrowse()));
-+}
-+
-+void UpnpNetworkBuilder::startBrowse()
-+{
-     qDBusRegisterMetaType<DeviceTypeMap>();
-     qDBusRegisterMetaType<Cagibi::Device>();
- 
-Index: kioslave/network/network/builder/upnp/upnpnetworkbuilder.h
-===================================================================
---- a/kioslave/network/network/builder/upnp/upnpnetworkbuilder.h	(revision 1160390)
-+++ b/kioslave/network/network/builder/upnp/upnpnetworkbuilder.h	(revision 1160391)
-@@ -63,6 +63,8 @@
-     void removeUPnPDevices( const QList<Cagibi::Device>& devices );
- 
-   private Q_SLOTS:
-+    void startBrowse();
-+
-     void onDevicesAdded( const DeviceTypeMap& deviceTypeMap );
-     void onDevicesRemoved( const DeviceTypeMap& deviceTypeMap );
-     void onAddedDeviceDetails( const Cagibi::Device& device );
diff --git a/pkgs/desktops/kde-4.5/base-workspace/default.nix b/pkgs/desktops/kde-4.5/base-workspace/default.nix
index 169eb87f953..6bd2393753c 100644
--- a/pkgs/desktops/kde-4.5/base-workspace/default.nix
+++ b/pkgs/desktops/kde-4.5/base-workspace/default.nix
@@ -16,12 +16,12 @@ kde.package {
     pciutils bluez ];
 
   meta = {
-    description = "KDE Workspace";
+    description = "KDE base platform-specific components";
     longDescription = "KDE base components that are only required to work with X11 such KDM and KWin";
     license = "GPL";
     kde = {
       name = "kdebase-workspace";
-      version = "4.5.0";
+      version = "4.5.1";
     };
   };
 }
diff --git a/pkgs/desktops/kde-4.5/bindings/default.nix b/pkgs/desktops/kde-4.5/bindings/default.nix
index 4d0567a2d4c..678bef352f1 100644
--- a/pkgs/desktops/kde-4.5/bindings/default.nix
+++ b/pkgs/desktops/kde-4.5/bindings/default.nix
@@ -30,7 +30,7 @@ kde.package rec {
     license = "LGPL";
     kde = {
       name = "kdebindings";
-      version = "4.5.0";
+      version = "4.5.1";
     };
   };
 }
diff --git a/pkgs/desktops/kde-4.5/kde-package/manifest.nix b/pkgs/desktops/kde-4.5/kde-package/manifest.nix
index 8c26b159dd5..a7291b581cf 100644
--- a/pkgs/desktops/kde-4.5/kde-package/manifest.nix
+++ b/pkgs/desktops/kde-4.5/kde-package/manifest.nix
@@ -112,4 +112,16 @@ builtins.listToAttrs
   name = "kdebase-4.5.1.tar.bz2";
   value = "06g8s3r153hdmxh24s2x98a0fb4lr6d00d4307ibgp7r29w6dklb";
 }
+{
+  name = "kdebase-runtime-4.5.1.tar.bz2";
+  value = "1fjpyxzffl0ravyicgb56sqaw5zkwky98lj9ad6z4rdiysq5v5rz";
+}
+{
+  name = "kdebase-workspace-4.5.1.tar.bz2";
+  value = "0mrx03bsb9qj78k0l04q28gc8l7ky0y0rqdshv4spbmrjfsa03fd";
+}
+{
+  name = "kdebindings-4.5.1.tar.bz2";
+  value = "1j8bf7lwb70jc0m8d2hh6c1z6vgpxbqf47w5pkq58kgan8y3zcsw";
+}
 ]

From d611b0aedbd0af5851dc14a2b2deb89f513f5274 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 13 Sep 2010 14:22:51 +0000
Subject: [PATCH 124/181] Upgrade&split kdeartwork

svn path=/nixpkgs/trunk/; revision=23752
---
 pkgs/desktops/kde-4.5/artwork/aurorae.nix     | 14 ++++++++++++
 .../kde-4.5/artwork/color-schemes.nix         | 15 +++++++++++++
 pkgs/desktops/kde-4.5/artwork/default.nix     | 22 -------------------
 .../kde-4.5/artwork/desktop-themes.nix        | 15 +++++++++++++
 pkgs/desktops/kde-4.5/artwork/emoticons.nix   | 15 +++++++++++++
 .../artwork/high-resolution-wallpapers.nix    | 15 +++++++++++++
 .../desktops/kde-4.5/artwork/kscreensaver.nix | 14 ++++++++++++
 .../kde-4.5/artwork/nuvola-icon-theme.nix     | 16 ++++++++++++++
 pkgs/desktops/kde-4.5/artwork/phase-style.nix | 15 +++++++++++++
 pkgs/desktops/kde-4.5/artwork/sounds.nix      | 15 +++++++++++++
 pkgs/desktops/kde-4.5/artwork/wallpapers.nix  | 15 +++++++++++++
 .../kde-4.5/artwork/weather-wallpapers.nix    | 15 +++++++++++++
 pkgs/desktops/kde-4.5/default.nix             | 15 ++++++++++++-
 .../desktops/kde-4.5/kde-package/manifest.nix |  4 ++++
 14 files changed, 182 insertions(+), 23 deletions(-)
 create mode 100644 pkgs/desktops/kde-4.5/artwork/aurorae.nix
 create mode 100644 pkgs/desktops/kde-4.5/artwork/color-schemes.nix
 delete mode 100644 pkgs/desktops/kde-4.5/artwork/default.nix
 create mode 100644 pkgs/desktops/kde-4.5/artwork/desktop-themes.nix
 create mode 100644 pkgs/desktops/kde-4.5/artwork/emoticons.nix
 create mode 100644 pkgs/desktops/kde-4.5/artwork/high-resolution-wallpapers.nix
 create mode 100644 pkgs/desktops/kde-4.5/artwork/kscreensaver.nix
 create mode 100644 pkgs/desktops/kde-4.5/artwork/nuvola-icon-theme.nix
 create mode 100644 pkgs/desktops/kde-4.5/artwork/phase-style.nix
 create mode 100644 pkgs/desktops/kde-4.5/artwork/sounds.nix
 create mode 100644 pkgs/desktops/kde-4.5/artwork/wallpapers.nix
 create mode 100644 pkgs/desktops/kde-4.5/artwork/weather-wallpapers.nix

diff --git a/pkgs/desktops/kde-4.5/artwork/aurorae.nix b/pkgs/desktops/kde-4.5/artwork/aurorae.nix
new file mode 100644
index 00000000000..6727a0fda5a
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/artwork/aurorae.nix
@@ -0,0 +1,14 @@
+{ cmake, kde, automoc4, kdelibs }:
+
+kde.package rec {
+  name = "aurorae-themes-${meta.kde.version}";
+
+  buildInputs = [ cmake automoc4 kdelibs ];
+  meta = {
+    kde = {
+      name = "aurorae";
+      module = "kdeartwork";
+      version = "4.5.1";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/artwork/color-schemes.nix b/pkgs/desktops/kde-4.5/artwork/color-schemes.nix
new file mode 100644
index 00000000000..b4cf5d0f07b
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/artwork/color-schemes.nix
@@ -0,0 +1,15 @@
+{ cmake, kde, automoc4, kdelibs }:
+
+kde.package rec {
+  name = "kde-color-schemes-${meta.kde.version}";
+
+  buildInputs = [ cmake automoc4 kdelibs ];
+  meta = {
+    description = "Additional KDE color schemes";
+    kde = {
+      name = "ColorSchemes";
+      module = "kdeartwork";
+      version = "4.5.1";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/artwork/default.nix b/pkgs/desktops/kde-4.5/artwork/default.nix
deleted file mode 100644
index 15fbb4b202a..00000000000
--- a/pkgs/desktops/kde-4.5/artwork/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ kde, cmake, qt4, perl, xscreensaver
-, kdelibs, kdebase_workspace, automoc4, strigi, eigen}:
-
-kde.package {
-
-  buildInputs = [ cmake qt4 perl xscreensaver kdelibs kdebase_workspace automoc4
-    strigi eigen ];
-
-  preConfigure = ''
-    cp -v ${./FindXscreensaver.cmake} cmake/modules/FindXscreensaver.cmake
-    '';
-
-  meta = {
-    description = "KDE artwork";
-    longDescription = "Contains various artwork for KDE such as backgrounds, icons and screensavers";
-    license = "LGPL";
-    kde = {
-      name = "kdeartwork";
-      version = "4.5.0";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.5/artwork/desktop-themes.nix b/pkgs/desktops/kde-4.5/artwork/desktop-themes.nix
new file mode 100644
index 00000000000..b762dec1f1c
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/artwork/desktop-themes.nix
@@ -0,0 +1,15 @@
+{ cmake, kde, automoc4, kdelibs }:
+
+kde.package rec {
+  name = "kde-desktop-themes-${meta.kde.version}";
+
+  buildInputs = [ cmake automoc4 kdelibs ];
+  meta = {
+    description = "Additional KDE desktop themes";
+    kde = {
+      name = "desktopthemes";
+      module = "kdeartwork";
+      version = "4.5.1";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/artwork/emoticons.nix b/pkgs/desktops/kde-4.5/artwork/emoticons.nix
new file mode 100644
index 00000000000..a9d2a226835
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/artwork/emoticons.nix
@@ -0,0 +1,15 @@
+{ cmake, kde, automoc4, kdelibs }:
+
+kde.package rec {
+  name = "kde-emotion-icons-${meta.kde.version}";
+
+  buildInputs = [ cmake automoc4 kdelibs ];
+  meta = {
+    description = "Additional KDE emotion icons (smiles)";
+    kde = {
+      name = "emoticons";
+      module = "kdeartwork";
+      version = "4.5.1";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/artwork/high-resolution-wallpapers.nix b/pkgs/desktops/kde-4.5/artwork/high-resolution-wallpapers.nix
new file mode 100644
index 00000000000..ad6353d1b02
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/artwork/high-resolution-wallpapers.nix
@@ -0,0 +1,15 @@
+{ cmake, kde, automoc4, kdelibs }:
+
+kde.package rec {
+  name = "kde-wallpapers-high-resolution-${meta.kde.version}";
+
+  buildInputs = [ cmake automoc4 kdelibs ];
+  meta = {
+    description = "KDE wallpapers in high resolution";
+    kde = {
+      name = "HighResolutionWallpapers";
+      module = "kdeartwork";
+      version = "4.5.1";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/artwork/kscreensaver.nix b/pkgs/desktops/kde-4.5/artwork/kscreensaver.nix
new file mode 100644
index 00000000000..9fb4b24b107
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/artwork/kscreensaver.nix
@@ -0,0 +1,14 @@
+{ cmake, kde, automoc4, kdelibs, xscreensaver, kdebase_workspace, eigen }:
+
+kde.package rec {
+  buildInputs = [ cmake automoc4 kdelibs xscreensaver kdebase_workspace ];
+  meta = {
+    description = "KDE screen saver and savers";
+    kde = {
+      name = "kscreensaver";
+      module = "kdeartwork";
+      version = "1.0";
+      release = "4.5.1";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/artwork/nuvola-icon-theme.nix b/pkgs/desktops/kde-4.5/artwork/nuvola-icon-theme.nix
new file mode 100644
index 00000000000..34f50b90269
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/artwork/nuvola-icon-theme.nix
@@ -0,0 +1,16 @@
+{ cmake, kde, automoc4, kdelibs }:
+
+kde.package rec {
+  name = "nuvola-icon-theme-${meta.kde.version}";
+# Sources contain primary and kdeclassic as well but they're not installed
+
+  buildInputs = [ cmake automoc4 kdelibs ];
+  meta = {
+    description = "KDE nuvola icon theme";
+    kde = {
+      name = "IconThemes";
+      module = "kdeartwork";
+      version = "4.5.1";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/artwork/phase-style.nix b/pkgs/desktops/kde-4.5/artwork/phase-style.nix
new file mode 100644
index 00000000000..5443d808ce9
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/artwork/phase-style.nix
@@ -0,0 +1,15 @@
+{ cmake, kde, automoc4, kdelibs }:
+
+kde.package rec {
+  name = "kde-style-phase-${meta.kde.version}";
+
+  buildInputs = [ cmake automoc4 kdelibs ];
+  meta = {
+    description = "KDE phase style. Clean classical look";
+    kde = {
+      name = "styles";
+      module = "kdeartwork";
+      version = "4.5.1";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/artwork/sounds.nix b/pkgs/desktops/kde-4.5/artwork/sounds.nix
new file mode 100644
index 00000000000..02cbf00c027
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/artwork/sounds.nix
@@ -0,0 +1,15 @@
+{ cmake, kde, automoc4, kdelibs }:
+
+kde.package rec {
+  name = "kde-sounds-${meta.kde.version}";
+
+  buildInputs = [ cmake automoc4 kdelibs ];
+  meta = {
+    description = "New login/logout sounds";
+    kde = {
+      name = "sounds";
+      module = "kdeartwork";
+      version = "4.5.1";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/artwork/wallpapers.nix b/pkgs/desktops/kde-4.5/artwork/wallpapers.nix
new file mode 100644
index 00000000000..54f0165e1ad
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/artwork/wallpapers.nix
@@ -0,0 +1,15 @@
+{ cmake, kde, automoc4, kdelibs }:
+
+kde.package rec {
+  name = "kde-wallpapers-${meta.kde.version}";
+
+  buildInputs = [ cmake automoc4 kdelibs ];
+  meta = {
+    description = "Additional KDE wallpapers";
+    kde = {
+      name = "wallpapers";
+      module = "kdeartwork";
+      version = "4.5.1";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/artwork/weather-wallpapers.nix b/pkgs/desktops/kde-4.5/artwork/weather-wallpapers.nix
new file mode 100644
index 00000000000..98f68a7cfdb
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/artwork/weather-wallpapers.nix
@@ -0,0 +1,15 @@
+{ cmake, kde, automoc4, kdelibs }:
+
+kde.package rec {
+  name = "kde-weather-wallpapers-${meta.kde.version}";
+
+  buildInputs = [ cmake automoc4 kdelibs ];
+  meta = {
+    description = "Additional KDE wallpapers (weather)";
+    kde = {
+      name = "WeatherWallpapers";
+      module = "kdeartwork";
+      version = "4.5.1";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix
index 95a3cef19d9..17cddee4e81 100644
--- a/pkgs/desktops/kde-4.5/default.nix
+++ b/pkgs/desktops/kde-4.5/default.nix
@@ -60,7 +60,20 @@
   };
 
   kdeadmin = callPackage ./admin { };
-  kdeartwork = callPackage ./artwork { };
+  kdeartwork = {
+    recurseForDerivations = true;
+    aurorae = callPackage ./artwork/aurorae.nix { };
+    colorSchemes = callPackage ./artwork/color-schemes.nix { };
+    desktop_themes = callPackage ./artwork/desktop-themes.nix { };
+    emoticons = callPackage ./artwork/emoticons.nix { };
+    high_resolution_wallpapers = callPackage ./artwork/high-resolution-wallpapers.nix { };
+    wallpapers = callPackage ./artwork/wallpapers.nix { };
+    nuvola_icon_theme = callPackage ./artwork/nuvola-icon-theme.nix { };
+    sounds = callPackage ./artwork/sounds.nix { };
+    weather_wallpapers = callPackage ./artwork/weather-wallpapers.nix { };
+    phase_style = callPackage ./artwork/phase-style.nix { };
+    kscreensaver = callPackage ./artwork/kscreensaver.nix { };
+  };
   kdeedu = callPackage ./edu { };
   kdegames = callPackage ./games { };
   kdegraphics = callPackage ./graphics { };
diff --git a/pkgs/desktops/kde-4.5/kde-package/manifest.nix b/pkgs/desktops/kde-4.5/kde-package/manifest.nix
index a7291b581cf..aab661ce190 100644
--- a/pkgs/desktops/kde-4.5/kde-package/manifest.nix
+++ b/pkgs/desktops/kde-4.5/kde-package/manifest.nix
@@ -124,4 +124,8 @@ builtins.listToAttrs
   name = "kdebindings-4.5.1.tar.bz2";
   value = "1j8bf7lwb70jc0m8d2hh6c1z6vgpxbqf47w5pkq58kgan8y3zcsw";
 }
+{
+  name = "kdeartwork-4.5.1.tar.bz2";
+  value = "0fjcx6wwgzxl64s62wv2sf15plx49fck86nwzfbgbmdha1ra2gmi";
+}
 ]

From 61dd03faa803a96e1b21adcc95b87f1c3aee502f Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 13 Sep 2010 14:22:56 +0000
Subject: [PATCH 125/181] Upgrade libktorrent

svn path=/nixpkgs/trunk/; revision=23753
---
 pkgs/development/libraries/libktorrent/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libktorrent/default.nix b/pkgs/development/libraries/libktorrent/default.nix
index f048e5043de..d80d9da4f7e 100644
--- a/pkgs/development/libraries/libktorrent/default.nix
+++ b/pkgs/development/libraries/libktorrent/default.nix
@@ -2,15 +2,19 @@
   perl }:
 
 stdenv.mkDerivation rec {
-  name = "libktorrent-1.0.2";
+  name = pname + "-" + version;
+  pname = "libktorrent";
+  version = "1.0.3";
 
   src = fetchurl {
-    url = "${meta.homepage}/downloads/4.0.2/${name}.tar.bz2";
-    sha256 = "11kh1mcijwzr2kf7hpxadggh346kdb5jy8rnmawhi9nc0i7wyjlw";
+    url = "${meta.homepage}/downloads/4${builtins.substring 1
+      (builtins.stringLength version) version}/${name}.tar.bz2";
+    sha256 = "1yfayzbmi7im0pf4g7awn8lqianpr55xwbsldz7lyj9lc1a3xcgs";
   };
 
 # TODO: xfs.h
-  buildInputs = [ cmake kdelibs gmp qca2 boost gettext qt4 automoc4 perl ];
+  propagatedBuildInputs = [ kdelibs gmp boost qt4 ];
+  buildInputs = [ cmake automoc4 qca2 gettext perl ];
 
   meta = {
     description = "A bittorrent library used in ktorrent";

From 38dec40ddcc2605b15ff1d92dcc90049b75b8bcd Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 13 Sep 2010 14:23:02 +0000
Subject: [PATCH 126/181] Upgrade ktorrent

svn path=/nixpkgs/trunk/; revision=23754
---
 .../networking/ktorrent/default.nix           | 27 ++++++++++++
 .../networking/ktorrent/find-workspace.diff   | 44 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +-
 3 files changed, 73 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/applications/networking/ktorrent/default.nix
 create mode 100644 pkgs/applications/networking/ktorrent/find-workspace.diff

diff --git a/pkgs/applications/networking/ktorrent/default.nix b/pkgs/applications/networking/ktorrent/default.nix
new file mode 100644
index 00000000000..c4917c2b8fb
--- /dev/null
+++ b/pkgs/applications/networking/ktorrent/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, cmake, automoc4, libktorrent, taglib, kdepimlibs, boost,
+  gettext, kdebase_workspace }:
+
+stdenv.mkDerivation rec {
+  name = pname + "-" + version;
+
+  pname = "ktorrent";
+  version = "4.0.3";
+
+  src = fetchurl {
+    url = "${meta.homepage}/downloads/${version}/${name}.tar.bz2";
+    sha256 = "02hp52333w75mdywgsln28samf9ybr9yldg1jsw0b93lj44pfxli";
+  };
+
+  patches = [ ./find-workspace.diff ];
+
+  KDEDIRS = libktorrent;
+
+  buildInputs = [ automoc4 cmake libktorrent taglib kdepimlibs boost gettext
+    kdebase_workspace ];
+
+  meta = {
+    description = "KDE integrated BtTorrent client";
+    homepage = http://ktorrent.org;
+    maintainers = with stdenv.lib.maintainers; [ sander urkud ];
+  };
+}
diff --git a/pkgs/applications/networking/ktorrent/find-workspace.diff b/pkgs/applications/networking/ktorrent/find-workspace.diff
new file mode 100644
index 00000000000..472ceff490e
--- /dev/null
+++ b/pkgs/applications/networking/ktorrent/find-workspace.diff
@@ -0,0 +1,44 @@
+Fix finding taskmanager.h and kworkspace.h
+diff --git a/plasma/applet/CMakeLists.txt b/plasma/applet/CMakeLists.txt
+index 3a72241..69b1205 100644
+--- a/plasma/applet/CMakeLists.txt
++++ b/plasma/applet/CMakeLists.txt
+@@ -6,7 +6,9 @@ if(NOT QT_VERSION_OK)
+ else(NOT QT_VERSION_OK)
+ 	
+ 	set(TASKMANAGER_FOUND FALSE)
+-	FIND_PATH(TASKMANAGER_INCLUDE_DIR NAMES taskmanager.h  PATHS ${KDE4_INCLUDE_DIR}/taskmanager ${INCLUDE_INSTALL_DIR}/taskmanager.h)
++	FIND_PATH(TASKMANAGER_INCLUDE_DIR
++		NAMES taskmanager/taskmanager.h
++		HINTS ${KDE4_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR})
+ 	FIND_LIBRARY(TASKMANAGER_LIBRARY NAMES taskmanager PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR})
+ 
+ 	if(TASKMANAGER_INCLUDE_DIR AND TASKMANAGER_LIBRARY)
+diff --git a/plugins/shutdown/CMakeLists.txt b/plugins/shutdown/CMakeLists.txt
+index 59e5470..5b932ff 100644
+--- a/plugins/shutdown/CMakeLists.txt
++++ b/plugins/shutdown/CMakeLists.txt
+@@ -1,6 +1,8 @@
+ set(KWORKSPACE_FOUND FALSE)
+-FIND_PATH(KWORKSPACE_INCLUDE_DIR NAMES kworkspace.h  PATHS ${KDE4_INCLUDE_DIR}/kworkspace ${INCLUDE_INSTALL_DIR}/kworkspace.h)
+-FIND_LIBRARY(KWORKSPACE_LIBRARY NAMES kworkspace PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR})
++FIND_PATH(KWORKSPACE_INCLUDE_DIR
++	NAMES kworkspace/kworkspace.h
++	HINTS ${KDE4_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR})
++FIND_LIBRARY(KWORKSPACE_LIBRARY NAMES kworkspace HINTS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR})
+ 
+ if(KWORKSPACE_INCLUDE_DIR AND KWORKSPACE_LIBRARY)
+ 	set(KWORKSPACE_FOUND TRUE)
+diff --git a/plugins/shutdown/shutdownplugin.cpp b/plugins/shutdown/shutdownplugin.cpp
+index e233353..1efc20b 100644
+--- a/plugins/shutdown/shutdownplugin.cpp
++++ b/plugins/shutdown/shutdownplugin.cpp
+@@ -19,7 +19,7 @@
+ ***************************************************************************/
+ #include <kjob.h>
+ #include <kgenericfactory.h>
+-#include <kworkspace.h>
++#include <kworkspace/kworkspace.h>
+ #include <ktoggleaction.h>
+ #include <kactioncollection.h>
+ #include <kmessagebox.h>
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9493c68fa8d..1b1d20bb022 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -769,8 +769,6 @@ let
 
   kismet = callPackage ../applications/networking/sniffers/kismet { };
 
-  ktorrent = kde4.ktorrent;
-
   less = callPackage ../tools/misc/less { };
 
   most = callPackage ../tools/misc/most { };
@@ -5714,6 +5712,8 @@ let
 
   konversation = newScope pkgs.kde4 ../applications/networking/irc/konversation { };
 
+  ktorrent = newScope pkgs.kde4 ../applications/networking/ktorrent { };
+
   lame = callPackage ../applications/audio/lame { };
 
   larswm = callPackage ../applications/window-managers/larswm { };

From e723e53699eb78451448d939c3e1b0b102088c6d Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 13 Sep 2010 14:23:08 +0000
Subject: [PATCH 127/181] Use new ktorrent in kde44

svn path=/nixpkgs/trunk/; revision=23755
---
 pkgs/desktops/kde-4.4/default.nix             |  8 +-------
 .../kde-4.4/extragear/ktorrent/default.nix    | 19 -------------------
 2 files changed, 1 insertion(+), 26 deletions(-)
 delete mode 100644 pkgs/desktops/kde-4.4/extragear/ktorrent/default.nix

diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix
index 59238f5e700..43ce2fff731 100644
--- a/pkgs/desktops/kde-4.4/default.nix
+++ b/pkgs/desktops/kde-4.4/default.nix
@@ -290,13 +290,7 @@ pkgs.recurseIntoAttrs (rec {
     poppler = pkgs.popplerQt4;
   };
   
-  ktorrent = import ./extragear/ktorrent {
-    inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gmp taglib boost gettext;
-    inherit kdelibs kdepimlibs kdebase_workspace;
-    inherit automoc4 phonon qca2;
-  };
-  
-  inherit (pkgs) konversation yakuake;
+  inherit (pkgs) konversation yakuake ktorrent;
   
   gtk_qt_engine = import ./extragear/gtk-qt-engine {
     inherit (pkgs) stdenv fetchurl cmake qt4 perl gettext;
diff --git a/pkgs/desktops/kde-4.4/extragear/ktorrent/default.nix b/pkgs/desktops/kde-4.4/extragear/ktorrent/default.nix
deleted file mode 100644
index 0f83c8764ca..00000000000
--- a/pkgs/desktops/kde-4.4/extragear/ktorrent/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{stdenv, fetchurl, lib, cmake, qt4, perl, gmp, taglib, boost, gettext,
- kdelibs, kdepimlibs, kdebase_workspace, automoc4, phonon, qca2}:
-
-stdenv.mkDerivation {
-  name = "ktorrent-3.3.4";
-  src = fetchurl {
-    url = http://ktorrent.org/downloads/3.3.4/ktorrent-3.3.4.tar.bz2;
-    sha256 = "09lq5140135v9919k4wfmqww5jm17yvyqny8hlk10zyzd42vh7zk";
-  };
-  cmakeFlags = "-DTASKMANAGER_INCLUDE_DIR=${kdebase_workspace}/include";
-  buildInputs = [ cmake qt4 perl gmp taglib boost gettext stdenv.gcc.libc
-                  kdelibs kdepimlibs kdebase_workspace automoc4 phonon qca2 ];
-  meta = {
-    description = "KDE integrated BitTorrent client";
-    license = "GPL";
-    homepage = http://ktorrent.org;
-    maintainers = [ lib.maintainers.sander ];
-  };
-}

From 84040e15cce2f3830474f5161efc430fc4375c5d Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 13 Sep 2010 14:23:16 +0000
Subject: [PATCH 128/181] kdenetwork-4.5.1, kdeedu-4.5.1

svn path=/nixpkgs/trunk/; revision=23756
---
 pkgs/desktops/kde-4.5/edu/default.nix          | 2 +-
 pkgs/desktops/kde-4.5/kde-package/manifest.nix | 8 ++++++++
 pkgs/desktops/kde-4.5/network/default.nix      | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/kde-4.5/edu/default.nix b/pkgs/desktops/kde-4.5/edu/default.nix
index 8fa979be78f..ac8e37e79f5 100644
--- a/pkgs/desktops/kde-4.5/edu/default.nix
+++ b/pkgs/desktops/kde-4.5/edu/default.nix
@@ -23,7 +23,7 @@ kde.package {
     license = "GPL";
     kde = {
       name = "kdeedu";
-      version = "4.5.0";
+      version = "4.5.1";
     };
   };
 }
diff --git a/pkgs/desktops/kde-4.5/kde-package/manifest.nix b/pkgs/desktops/kde-4.5/kde-package/manifest.nix
index aab661ce190..36d1946d9c8 100644
--- a/pkgs/desktops/kde-4.5/kde-package/manifest.nix
+++ b/pkgs/desktops/kde-4.5/kde-package/manifest.nix
@@ -128,4 +128,12 @@ builtins.listToAttrs
   name = "kdeartwork-4.5.1.tar.bz2";
   value = "0fjcx6wwgzxl64s62wv2sf15plx49fck86nwzfbgbmdha1ra2gmi";
 }
+{
+  name = "kdenetwork-4.5.1.tar.bz2";
+  value = "0wzbrhj4bzd4d432qqf5jwfagvxsv3flzdq7jzc449w6ybdgqw6n";
+}
+{
+  name = "kdeedu-4.5.1.tar.bz2";
+  value = "026gdb6q06l9d8v3a0dcynxkdnv9cal1gnnxwdawvc5rky2vp07j";
+}
 ]
diff --git a/pkgs/desktops/kde-4.5/network/default.nix b/pkgs/desktops/kde-4.5/network/default.nix
index 4bbdf50dd55..e2a1a468eac 100644
--- a/pkgs/desktops/kde-4.5/network/default.nix
+++ b/pkgs/desktops/kde-4.5/network/default.nix
@@ -30,7 +30,7 @@ kde.package {
     license = "GPL";
     kde = {
       name = "kdenetwork";
-      version = "4.5.0";
+      version = "4.5.1";
     };
   };
 }

From c4beccaf1a65a5e36a2d20b96bac8e7784bbc419 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 13 Sep 2010 14:23:21 +0000
Subject: [PATCH 129/181] Remove unused patch

svn path=/nixpkgs/trunk/; revision=23757
---
 pkgs/desktops/kde-4.5/utils/cmake-module-path.diff | 10 ----------
 1 file changed, 10 deletions(-)
 delete mode 100644 pkgs/desktops/kde-4.5/utils/cmake-module-path.diff

diff --git a/pkgs/desktops/kde-4.5/utils/cmake-module-path.diff b/pkgs/desktops/kde-4.5/utils/cmake-module-path.diff
deleted file mode 100644
index 4564d0318d4..00000000000
--- a/pkgs/desktops/kde-4.5/utils/cmake-module-path.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/CMakeLists.txt	2010-04-15 12:58:25.000000000 +0400
-+++ b/CMakeLists.txt.new	2010-08-14 03:30:16.000000000 +0400
-@@ -1,6 +1,6 @@
- project( kdeutils )
- 
--set( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )
-+set( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH} )
- 
- # search packages used by KDE
- find_package( KDE4 REQUIRED )

From 20b190b58231ff4ea7f726c83a548a030f86a4d7 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 13 Sep 2010 14:23:29 +0000
Subject: [PATCH 130/181] kdesdk-4.5.1, splitted

svn path=/nixpkgs/trunk/; revision=23758
---
 pkgs/desktops/kde-4.5/default.nix             | 24 +++++++++++-
 .../desktops/kde-4.5/kde-package/manifest.nix |  4 ++
 pkgs/desktops/kde-4.5/sdk/cervisia.nix        | 17 ++++++++
 pkgs/desktops/kde-4.5/sdk/default.nix         | 23 -----------
 pkgs/desktops/kde-4.5/sdk/dolphin-plugins.nix | 18 +++++++++
 pkgs/desktops/kde-4.5/sdk/kapptemplate.nix    | 17 ++++++++
 pkgs/desktops/kde-4.5/sdk/kate.nix            | 17 ++++++++
 pkgs/desktops/kde-4.5/sdk/kbugbuster.nix      | 17 ++++++++
 pkgs/desktops/kde-4.5/sdk/kcachegrind.nix     | 17 ++++++++
 .../kde-4.5/sdk/kdeaccounts-plugin.nix        | 16 ++++++++
 .../desktops/kde-4.5/sdk/kioslave-perldoc.nix | 18 +++++++++
 pkgs/desktops/kde-4.5/sdk/kioslave-svn.nix    | 17 ++++++++
 pkgs/desktops/kde-4.5/sdk/kmtrace.nix         | 17 ++++++++
 pkgs/desktops/kde-4.5/sdk/kompare.nix         | 17 ++++++++
 pkgs/desktops/kde-4.5/sdk/kpartloader.nix     | 17 ++++++++
 pkgs/desktops/kde-4.5/sdk/kprofilemethod.nix  | 17 ++++++++
 pkgs/desktops/kde-4.5/sdk/kstartperf.nix      | 17 ++++++++
 pkgs/desktops/kde-4.5/sdk/kuiviewer.nix       | 17 ++++++++
 pkgs/desktops/kde-4.5/sdk/lokalize.nix        | 20 ++++++++++
 pkgs/desktops/kde-4.5/sdk/optional-docs.diff  | 39 +++++++++++++++++++
 pkgs/desktops/kde-4.5/sdk/poxml.nix           | 16 ++++++++
 pkgs/desktops/kde-4.5/sdk/scripts.nix         | 16 ++++++++
 pkgs/desktops/kde-4.5/sdk/strigi-analyzer.nix | 16 ++++++++
 pkgs/desktops/kde-4.5/sdk/umbrello.nix        | 17 ++++++++
 24 files changed, 407 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/desktops/kde-4.5/sdk/cervisia.nix
 delete mode 100644 pkgs/desktops/kde-4.5/sdk/default.nix
 create mode 100644 pkgs/desktops/kde-4.5/sdk/dolphin-plugins.nix
 create mode 100644 pkgs/desktops/kde-4.5/sdk/kapptemplate.nix
 create mode 100644 pkgs/desktops/kde-4.5/sdk/kate.nix
 create mode 100644 pkgs/desktops/kde-4.5/sdk/kbugbuster.nix
 create mode 100644 pkgs/desktops/kde-4.5/sdk/kcachegrind.nix
 create mode 100644 pkgs/desktops/kde-4.5/sdk/kdeaccounts-plugin.nix
 create mode 100644 pkgs/desktops/kde-4.5/sdk/kioslave-perldoc.nix
 create mode 100644 pkgs/desktops/kde-4.5/sdk/kioslave-svn.nix
 create mode 100644 pkgs/desktops/kde-4.5/sdk/kmtrace.nix
 create mode 100644 pkgs/desktops/kde-4.5/sdk/kompare.nix
 create mode 100644 pkgs/desktops/kde-4.5/sdk/kpartloader.nix
 create mode 100644 pkgs/desktops/kde-4.5/sdk/kprofilemethod.nix
 create mode 100644 pkgs/desktops/kde-4.5/sdk/kstartperf.nix
 create mode 100644 pkgs/desktops/kde-4.5/sdk/kuiviewer.nix
 create mode 100644 pkgs/desktops/kde-4.5/sdk/lokalize.nix
 create mode 100644 pkgs/desktops/kde-4.5/sdk/optional-docs.diff
 create mode 100644 pkgs/desktops/kde-4.5/sdk/poxml.nix
 create mode 100644 pkgs/desktops/kde-4.5/sdk/scripts.nix
 create mode 100644 pkgs/desktops/kde-4.5/sdk/strigi-analyzer.nix
 create mode 100644 pkgs/desktops/kde-4.5/sdk/umbrello.nix

diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix
index 17cddee4e81..0b4dd97cff1 100644
--- a/pkgs/desktops/kde-4.5/default.nix
+++ b/pkgs/desktops/kde-4.5/default.nix
@@ -80,7 +80,29 @@
   kdemultimedia = callPackage ./multimedia { };
   kdenetwork = callPackage ./network { };
   kdeplasma_addons = callPackage ./plasma-addons { };
-  kdesdk = callPackage ./sdk { };
+  kdesdk = {
+    recurseForDerivations = true;
+    cervisia = callPackage ./sdk/cervisia.nix { };
+    kapptemplate = callPackage ./sdk/kapptemplate.nix { };
+    kate = callPackage ./sdk/kate.nix { };
+    kcachegrind = callPackage ./sdk/kcachegrind.nix { };
+    kdeaccounts_plugin = callPackage ./sdk/kdeaccounts-plugin.nix { };
+    dolphin_plugins = callPackage ./sdk/dolphin-plugins.nix { };
+    kioslave_perldoc = callPackage ./sdk/kioslave-perldoc.nix { };
+    kioslave_svn = callPackage ./sdk/kioslave-svn.nix { };
+    strigi_analyzer = callPackage ./sdk/strigi-analyzer.nix { };
+    kbugbuster = callPackage ./sdk/kbugbuster.nix { };
+    kmtrace = callPackage ./sdk/kmtrace.nix { };
+    kompare = callPackage ./sdk/kompare.nix { };
+    kpartloader = callPackage ./sdk/kpartloader.nix { };
+    kprofilemethod = callPackage ./sdk/kprofilemethod.nix { };
+    kstartperf = callPackage ./sdk/kstartperf.nix { };
+    kuiviewer = callPackage ./sdk/kuiviewer.nix { };
+    lokalize = callPackage ./sdk/lokalize.nix { };
+    poxml = callPackage ./sdk/poxml.nix { };
+    scripts = callPackage ./sdk/scripts.nix { };
+    umbrello = callPackage ./sdk/umbrello.nix { };
+  };
   kdetoys = callPackage ./toys { };
 
   kdeutils = {
diff --git a/pkgs/desktops/kde-4.5/kde-package/manifest.nix b/pkgs/desktops/kde-4.5/kde-package/manifest.nix
index 36d1946d9c8..e90437b6cff 100644
--- a/pkgs/desktops/kde-4.5/kde-package/manifest.nix
+++ b/pkgs/desktops/kde-4.5/kde-package/manifest.nix
@@ -136,4 +136,8 @@ builtins.listToAttrs
   name = "kdeedu-4.5.1.tar.bz2";
   value = "026gdb6q06l9d8v3a0dcynxkdnv9cal1gnnxwdawvc5rky2vp07j";
 }
+{
+  name = "kdesdk-4.5.1.tar.bz2";
+  value = "0kwgd3hxc6jwk7qk67z1jaks9jg04hgh5aywyfs2dc8w2ns1xyhp";
+}
 ]
diff --git a/pkgs/desktops/kde-4.5/sdk/cervisia.nix b/pkgs/desktops/kde-4.5/sdk/cervisia.nix
new file mode 100644
index 00000000000..bad00d3e507
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/sdk/cervisia.nix
@@ -0,0 +1,17 @@
+{ kde, cmake, kdelibs, automoc4 }:
+
+kde.package {
+  buildInputs = [ cmake kdelibs automoc4 ];
+
+  patches = [ ./optional-docs.diff ];
+
+  meta = {
+    description = "A KDE CVS frontend";
+    kde = {
+      name = "cervisia";
+      module = "kdesdk";
+      version = "3.5.0";
+      release = "4.5.1";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/sdk/default.nix b/pkgs/desktops/kde-4.5/sdk/default.nix
deleted file mode 100644
index 8b07442d9d9..00000000000
--- a/pkgs/desktops/kde-4.5/sdk/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ kde, binutils, cmake, qt4, perl, libxml2, libxslt, boost, subversion, apr,
-  aprutil , shared_mime_info, hunspell , kdelibs, kdepimlibs, automoc4,
-  kdebindings, strigi, kdebase, libtool, antlr}:
-
-kde.package {
-
-  buildInputs = [ cmake qt4 perl libxml2 libxslt boost subversion aprutil apr
-    shared_mime_info kdelibs kdepimlibs automoc4 strigi hunspell kdebindings
-    kdebase libtool binutils antlr ];
-
-  patches = [ ./find-svn.patch ];
-
-#cmakeFlags = "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=ON -DBUILD_kioslave=ON";
-  meta = {
-    description = "KDE SDK";
-    longDescription = "Contains various development utilities such as the Umbrello UML modeler and Cerivisia CVS front-end";
-    license = "GPL";
-    kde = {
-      name = "kdesdk";
-      version = "4.5.0";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.5/sdk/dolphin-plugins.nix b/pkgs/desktops/kde-4.5/sdk/dolphin-plugins.nix
new file mode 100644
index 00000000000..249cf580b6f
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/sdk/dolphin-plugins.nix
@@ -0,0 +1,18 @@
+{ kde, cmake, kdelibs, automoc4, kdebase }:
+
+kde.package {
+  # Needs kdebase for libkonq
+  buildInputs = [ cmake kdelibs automoc4 kdebase ];
+
+  patches = [ ./optional-docs.diff ];
+
+  meta = {
+    description = "Git and Svn plugins for dolphin";
+    kde = {
+      name = "dolphin-plugins";
+      module = "kdesdk";
+      version = "3.5.0";
+      release = "4.5.1";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/sdk/kapptemplate.nix b/pkgs/desktops/kde-4.5/sdk/kapptemplate.nix
new file mode 100644
index 00000000000..2b371036358
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/sdk/kapptemplate.nix
@@ -0,0 +1,17 @@
+{ kde, cmake, kdelibs, automoc4 }:
+
+kde.package {
+  buildInputs = [ cmake kdelibs automoc4 ];
+
+  patches = [ ./optional-docs.diff ];
+
+  meta = {
+    description = "A KDE 4 project template generator";
+    kde = {
+      name = "cervisia";
+      module = "kdesdk";
+      version = "0.1";
+      release = "4.5.1";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/sdk/kate.nix b/pkgs/desktops/kde-4.5/sdk/kate.nix
new file mode 100644
index 00000000000..8ede3f0780a
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/sdk/kate.nix
@@ -0,0 +1,17 @@
+{ kde, cmake, kdelibs, automoc4, shared_mime_info }:
+
+kde.package {
+  buildInputs = [ cmake kdelibs automoc4 shared_mime_info ];
+
+  patches = [ ./optional-docs.diff ];
+
+  meta = {
+    description = "Kate - Advanced Text Editor";
+    kde = {
+      name = "kate";
+      module = "kdesdk";
+      version = "3.5.1";
+      release = "4.5.1";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/sdk/kbugbuster.nix b/pkgs/desktops/kde-4.5/sdk/kbugbuster.nix
new file mode 100644
index 00000000000..e82a58ee942
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/sdk/kbugbuster.nix
@@ -0,0 +1,17 @@
+{ kde, cmake, kdelibs, automoc4, kdepimlibs }:
+
+kde.package {
+  buildInputs = [ cmake kdelibs automoc4 kdepimlibs ];
+
+  patches = [ ./optional-docs.diff ];
+
+  meta = {
+    description = "KDE bugzilla client";
+    kde = {
+      name = "kbugbuster";
+      module = "kdesdk";
+      version = "3.80.3";
+      release = "4.5.1";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/sdk/kcachegrind.nix b/pkgs/desktops/kde-4.5/sdk/kcachegrind.nix
new file mode 100644
index 00000000000..c5095343f74
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/sdk/kcachegrind.nix
@@ -0,0 +1,17 @@
+{ kde, cmake, kdelibs, automoc4 }:
+
+kde.package {
+  buildInputs = [ cmake kdelibs automoc4 ];
+
+  patches = [ ./optional-docs.diff ];
+
+  meta = {
+    description = "KDE Frontend for Callgrind/Cachegrind";
+    kde = {
+      name = "kcachegrind";
+      module = "kdesdk";
+      version = "0.6";
+      release = "4.5.1";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/sdk/kdeaccounts-plugin.nix b/pkgs/desktops/kde-4.5/sdk/kdeaccounts-plugin.nix
new file mode 100644
index 00000000000..eedccffc1da
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/sdk/kdeaccounts-plugin.nix
@@ -0,0 +1,16 @@
+{ kde, cmake, kdelibs, automoc4, kdepimlibs }:
+
+kde.package {
+  buildInputs = [ cmake kdelibs automoc4 kdepimlibs ];
+
+  patches = [ ./optional-docs.diff ];
+
+  meta = {
+    description = "KDE accounts akonadi agent";
+    kde = {
+      name = "kdeaccounts-plugin";
+      module = "kdesdk";
+      version = "4.5.1";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/sdk/kioslave-perldoc.nix b/pkgs/desktops/kde-4.5/sdk/kioslave-perldoc.nix
new file mode 100644
index 00000000000..10b1db77d9e
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/sdk/kioslave-perldoc.nix
@@ -0,0 +1,18 @@
+{ kde, cmake, kdelibs, automoc4, perl }:
+
+kde.package {
+  buildInputs = [ cmake kdelibs automoc4 perl ];
+
+  patches = [ ./optional-docs.diff ];
+  cmakeFlags = "-DBUILD_kioslave=ON -DBUILD_perldoc=ON";
+
+  meta = {
+    description = "perldoc: kioslave";
+    kde = {
+      name = "kioslave-perldoc";
+      module = "kdesdk";
+      version = "0.9.1";
+      release = "4.5.1";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/sdk/kioslave-svn.nix b/pkgs/desktops/kde-4.5/sdk/kioslave-svn.nix
new file mode 100644
index 00000000000..29668ba889d
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/sdk/kioslave-svn.nix
@@ -0,0 +1,17 @@
+{ kde, cmake, kdelibs, automoc4, subversion, apr, aprutil }:
+
+kde.package {
+  buildInputs = [ cmake kdelibs automoc4 subversion apr aprutil ];
+
+  patches = [ ./optional-docs.diff ./find-svn.patch ];
+  cmakeFlags = "-DBUILD_kioslave=ON";
+
+  meta = {
+    description = "svn:/ kioslave";
+    kde = {
+      name = "kioslave-svn";
+      module = "kdesdk";
+      version = "4.5.1";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/sdk/kmtrace.nix b/pkgs/desktops/kde-4.5/sdk/kmtrace.nix
new file mode 100644
index 00000000000..4ef3b3e932b
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/sdk/kmtrace.nix
@@ -0,0 +1,17 @@
+{ kde, cmake, kdelibs, automoc4, gcc }:
+
+kde.package {
+  buildInputs = [ cmake kdelibs automoc4 ];
+
+  preConfigure="export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:${gcc}:${gcc.gcc}";
+  patches = [ ./optional-docs.diff ];
+
+  meta = {
+    description = "KDE mtrace-based malloc debuger";
+    kde = {
+      name = "kmtrace";
+      module = "kdesdk";
+      version = "4.5.1";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/sdk/kompare.nix b/pkgs/desktops/kde-4.5/sdk/kompare.nix
new file mode 100644
index 00000000000..d51149074fd
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/sdk/kompare.nix
@@ -0,0 +1,17 @@
+{ kde, cmake, kdelibs, automoc4 }:
+
+kde.package {
+  buildInputs = [ cmake kdelibs automoc4 ];
+
+  patches = [ ./optional-docs.diff ];
+
+  meta = {
+    description = "A program to view the differences between files and optionally generate a diff";
+    kde = {
+      name = "kompare";
+      module = "kdesdk";
+      version = "4.0.0";
+      release = "4.5.1";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/sdk/kpartloader.nix b/pkgs/desktops/kde-4.5/sdk/kpartloader.nix
new file mode 100644
index 00000000000..14ccfe2860f
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/sdk/kpartloader.nix
@@ -0,0 +1,17 @@
+{ kde, cmake, kdelibs, automoc4 }:
+
+kde.package {
+  buildInputs = [ cmake kdelibs automoc4 ];
+
+  patches = [ ./optional-docs.diff ];
+
+  meta = {
+    description = "A test application for KParts";
+    kde = {
+      name = "kpartloader";
+      module = "kdesdk";
+      version = "1.0";
+      release = "4.5.1";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/sdk/kprofilemethod.nix b/pkgs/desktops/kde-4.5/sdk/kprofilemethod.nix
new file mode 100644
index 00000000000..87fa775b0e0
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/sdk/kprofilemethod.nix
@@ -0,0 +1,17 @@
+{ kde, cmake, kdelibs, automoc4 }:
+
+kde.package {
+  buildInputs = [ cmake kdelibs automoc4 ];
+
+  patches = [ ./optional-docs.diff ];
+
+  meta = {
+    description = "A macros for profiling using QTime";
+    longDescription = "Don't commit any code using kprofilemethod.h to KDE repositories.";
+    kde = {
+      name = "kprofilemethod";
+      module = "kdesdk";
+      version = "4.5.1";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/sdk/kstartperf.nix b/pkgs/desktops/kde-4.5/sdk/kstartperf.nix
new file mode 100644
index 00000000000..c5c4352a097
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/sdk/kstartperf.nix
@@ -0,0 +1,17 @@
+{ kde, cmake, kdelibs, automoc4, libtool }:
+
+kde.package {
+  buildInputs = [ cmake kdelibs automoc4 libtool ];
+
+  patches = [ ./optional-docs.diff ];
+
+  meta = {
+    description = "Measures start up time of a KDE application";
+    kde = {
+      name = "kstartperf";
+      module = "kdesdk";
+      version = "1.0";
+      release = "4.5.1";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/sdk/kuiviewer.nix b/pkgs/desktops/kde-4.5/sdk/kuiviewer.nix
new file mode 100644
index 00000000000..cf6edbed023
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/sdk/kuiviewer.nix
@@ -0,0 +1,17 @@
+{ kde, cmake, kdelibs, automoc4 }:
+
+kde.package {
+  buildInputs = [ cmake kdelibs automoc4 ];
+
+  patches = [ ./optional-docs.diff ];
+
+  meta = {
+    description = "Displays Qt Designer's UI files";
+    kde = {
+      name = "kuiviewer";
+      module = "kdesdk";
+      version = "0.1";
+      release = "4.5.1";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/sdk/lokalize.nix b/pkgs/desktops/kde-4.5/sdk/lokalize.nix
new file mode 100644
index 00000000000..f1d1462f42a
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/sdk/lokalize.nix
@@ -0,0 +1,20 @@
+{ kde, cmake, kdelibs, automoc4, hunspell }:
+
+kde.package {
+  buildInputs = [ cmake kdelibs automoc4 hunspell ];
+
+  patches = [ ./optional-docs.diff ];
+
+  meta = {
+    description = "KDE 4 Computer-aided translation system";
+    longDescription = ''
+      Computer-aided translation system.
+      Do not translate what had already been translated.'';
+    kde = {
+      name = "lokalize";
+      module = "kdesdk";
+      version = "1.1";
+      release = "4.5.1";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/sdk/optional-docs.diff b/pkgs/desktops/kde-4.5/sdk/optional-docs.diff
new file mode 100644
index 00000000000..f67e1f4cdd8
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/sdk/optional-docs.diff
@@ -0,0 +1,39 @@
+diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
+index 63cdef8..0c5b50a 100644
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -3,22 +3,30 @@ if( UNIX )
+     add_subdirectory(cervisia)
+   endif()
+ endif( UNIX )
+-add_subdirectory(kapptemplate)
++if(BUILD_kapptemplate)
++  add_subdirectory(kapptemplate)
++endif()
+ if(BUILD_kbugbuster)
+   add_subdirectory(kbugbuster)
+ endif()
+ if(BUILD_kcachegrind)
+   add_subdirectory(kcachegrind)
+ endif()
+-add_subdirectory(kmtrace)
++if(BUILD_kmtrace)
++  add_subdirectory(kmtrace)
++endif()
+ if(BUILD_kompare)
+   add_subdirectory(kompare)
+ endif()
+ if(BUILD_lokalize)
+   add_subdirectory(lokalize)
+ endif()
+-add_subdirectory(poxml)
+-add_subdirectory(scripts)
++if(BUILD_poxml)
++  add_subdirectory(poxml)
++endif()
++if(BUILD_scripts)
++  add_subdirectory(scripts)
++endif()
+ 
+ if(LIBXSLT_FOUND AND LIBXML2_FOUND)
+   if(BUILD_umbrello)
diff --git a/pkgs/desktops/kde-4.5/sdk/poxml.nix b/pkgs/desktops/kde-4.5/sdk/poxml.nix
new file mode 100644
index 00000000000..f6f55be25fc
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/sdk/poxml.nix
@@ -0,0 +1,16 @@
+{ kde, cmake, kdelibs, automoc4, antlr }:
+
+kde.package {
+  buildInputs = [ cmake kdelibs automoc4 antlr ];
+
+  patches = [ ./optional-docs.diff ];
+
+  meta = {
+    description = "Po<->xml tools";
+    kde = {
+      name = "poxml";
+      module = "kdesdk";
+      version = "4.5.1";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/sdk/scripts.nix b/pkgs/desktops/kde-4.5/sdk/scripts.nix
new file mode 100644
index 00000000000..ab98c08dd3f
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/sdk/scripts.nix
@@ -0,0 +1,16 @@
+{ kde, cmake, kdelibs, automoc4 }:
+
+kde.package {
+  buildInputs = [ cmake kdelibs automoc4 ];
+
+  patches = [ ./optional-docs.diff ];
+
+  meta = {
+    description = "Various scripts to ease KDE development";
+    kde = {
+      name = "scripts";
+      module = "kdesdk";
+      version = "4.5.1";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/sdk/strigi-analyzer.nix b/pkgs/desktops/kde-4.5/sdk/strigi-analyzer.nix
new file mode 100644
index 00000000000..c05d25a8293
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/sdk/strigi-analyzer.nix
@@ -0,0 +1,16 @@
+{ kde, cmake, kdelibs, automoc4 }:
+
+kde.package {
+  buildInputs = [ cmake kdelibs automoc4 ];
+
+  patches = [ ./optional-docs.diff ];
+
+  meta = {
+    description = "Strigi analyzers for diff, po and ts";
+    kde = {
+      name = "strigi-analyzer";
+      module = "kdesdk";
+      version = "4.5.1";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/sdk/umbrello.nix b/pkgs/desktops/kde-4.5/sdk/umbrello.nix
new file mode 100644
index 00000000000..5cb77e0a052
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/sdk/umbrello.nix
@@ -0,0 +1,17 @@
+{ kde, cmake, kdelibs, automoc4, libxml2, libxslt, boost }:
+
+kde.package {
+  buildInputs = [ cmake kdelibs automoc4 libxml2 libxslt boost ];
+
+  patches = [ ./optional-docs.diff ];
+
+  meta = {
+    description = "Umbrello UML modeller";
+    kde = {
+      name = "umbrello";
+      module = "kdesdk";
+      version = "2.5.1";
+      release = "4.5.1";
+    };
+  };
+}

From ea18f17f8ccfcfec8d7f8ad639508e4f57c0292a Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 13 Sep 2010 14:23:36 +0000
Subject: [PATCH 131/181] kdetoys-4.5.1, splitted

svn path=/nixpkgs/trunk/; revision=23759
---
 pkgs/desktops/kde-4.5/default.nix              |  7 ++++++-
 pkgs/desktops/kde-4.5/kde-package/manifest.nix |  4 ++++
 pkgs/desktops/kde-4.5/toys/amor.nix            | 15 +++++++++++++++
 pkgs/desktops/kde-4.5/toys/default.nix         | 14 --------------
 pkgs/desktops/kde-4.5/toys/kteatime.nix        | 15 +++++++++++++++
 pkgs/desktops/kde-4.5/toys/ktux.nix            | 15 +++++++++++++++
 6 files changed, 55 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/desktops/kde-4.5/toys/amor.nix
 delete mode 100644 pkgs/desktops/kde-4.5/toys/default.nix
 create mode 100644 pkgs/desktops/kde-4.5/toys/kteatime.nix
 create mode 100644 pkgs/desktops/kde-4.5/toys/ktux.nix

diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix
index 0b4dd97cff1..68885b1af6a 100644
--- a/pkgs/desktops/kde-4.5/default.nix
+++ b/pkgs/desktops/kde-4.5/default.nix
@@ -103,7 +103,12 @@
     scripts = callPackage ./sdk/scripts.nix { };
     umbrello = callPackage ./sdk/umbrello.nix { };
   };
-  kdetoys = callPackage ./toys { };
+  kdetoys = {
+    recurseForDerivations = true;
+    amor = callPackage ./toys/amor.nix { };
+    kteatime = callPackage ./toys/kteatime.nix { };
+    ktux = callPackage ./toys/ktux.nix { };
+  };
 
   kdeutils = {
     ark = callPackage ./utils/ark.nix { };
diff --git a/pkgs/desktops/kde-4.5/kde-package/manifest.nix b/pkgs/desktops/kde-4.5/kde-package/manifest.nix
index e90437b6cff..c2f9848d9ad 100644
--- a/pkgs/desktops/kde-4.5/kde-package/manifest.nix
+++ b/pkgs/desktops/kde-4.5/kde-package/manifest.nix
@@ -140,4 +140,8 @@ builtins.listToAttrs
   name = "kdesdk-4.5.1.tar.bz2";
   value = "0kwgd3hxc6jwk7qk67z1jaks9jg04hgh5aywyfs2dc8w2ns1xyhp";
 }
+{
+  name = "kdetoys-4.5.1.tar.bz2";
+  value = "194a6ylxi5jrfh3w3cy6jhdissshswdrv9pnir72z67ca13dvd9s";
+}
 ]
diff --git a/pkgs/desktops/kde-4.5/toys/amor.nix b/pkgs/desktops/kde-4.5/toys/amor.nix
new file mode 100644
index 00000000000..966953269e9
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/toys/amor.nix
@@ -0,0 +1,15 @@
+{ kde, cmake, kdelibs, automoc4 }:
+
+kde.package {
+  buildInputs = [ cmake kdelibs automoc4 ];
+
+  meta = {
+    description = "KDE creature for your desktop";
+    kde = {
+      name = "amor";
+      module = "kdetoys";
+      version = "2.4.0";
+      release = "4.5.1";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/toys/default.nix b/pkgs/desktops/kde-4.5/toys/default.nix
deleted file mode 100644
index d3f9298c877..00000000000
--- a/pkgs/desktops/kde-4.5/toys/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{kde, cmake, qt4, perl, kdelibs, kdebase_workspace, automoc4}:
-
-kde.package {
-
-  buildInputs = [ cmake qt4 perl kdelibs kdebase_workspace automoc4 ];
-  meta = {
-    description = "KDE Toys";
-    license = "GPL";
-    kde = {
-      name = "kdetoys";
-      version = "4.5.0";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.5/toys/kteatime.nix b/pkgs/desktops/kde-4.5/toys/kteatime.nix
new file mode 100644
index 00000000000..5883d50b2b3
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/toys/kteatime.nix
@@ -0,0 +1,15 @@
+{ kde, cmake, kdelibs, automoc4 }:
+
+kde.package {
+  buildInputs = [ cmake kdelibs automoc4 ];
+
+  meta = {
+    description = "KDE utility for making a fine cup of tea";
+    kde = {
+      name = "kteatime";
+      module = "kdetoys";
+      version = "1.2.1";
+      release = "4.5.1";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/toys/ktux.nix b/pkgs/desktops/kde-4.5/toys/ktux.nix
new file mode 100644
index 00000000000..d1193181a89
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/toys/ktux.nix
@@ -0,0 +1,15 @@
+{ kde, cmake, kdelibs, automoc4, kdebase_workspace }:
+
+kde.package {
+  buildInputs = [ cmake kdelibs automoc4 kdebase_workspace ];
+
+  meta = {
+    description = "Tux Screen Saver";
+    kde = {
+      name = "ktux";
+      module = "kdetoys";
+      version = "1.0.1";
+      release = "4.5.1";
+    };
+  };
+}

From 2202d32006ee256ebc6f0199581094714dd29850 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 13 Sep 2010 15:31:06 +0000
Subject: [PATCH 132/181] * Add `stringAfter' as a synonym of `fullDepEntry',
 with the arguments   flipped to denote what it actually does (i.e., a string
 fragment   that comes *after* the named fragments).  One day we can have  
 `stringBefore'.

svn path=/nixpkgs/trunk/; revision=23761
---
 pkgs/lib/strings-with-deps.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/lib/strings-with-deps.nix b/pkgs/lib/strings-with-deps.nix
index 7543beddb52..3ad3e599150 100644
--- a/pkgs/lib/strings-with-deps.nix
+++ b/pkgs/lib/strings-with-deps.nix
@@ -73,8 +73,6 @@ rec {
   fullDepEntry = text: deps: {inherit text deps;};
   packEntry = deps: {inherit deps; text="";};
 
-  # Old names - don't use. Will be removed soon. There are no more occurences in nixpkgs/nixos
-  FullDepEntry = fullDepEntry;
-  PackEntry = packEntry;
-  
+  stringAfter = deps: text: { inherit text deps; };
+
 }

From 772abcfaaa8cf669b26a7d6104aeb5bb7d892355 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Mon, 13 Sep 2010 16:01:33 +0000
Subject: [PATCH 133/181] bugfix

svn path=/nixpkgs/trunk/; revision=23763
---
 pkgs/development/libraries/haskell/pandoc/default.nix | 6 +++---
 pkgs/top-level/haskell-packages.nix                   | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix
index 3f0b7b09d72..7bc1d0fc7fd 100644
--- a/pkgs/development/libraries/haskell/pandoc/default.nix
+++ b/pkgs/development/libraries/haskell/pandoc/default.nix
@@ -1,13 +1,13 @@
 {cabal, mtl, network, parsec, utf8String, xhtml, zipArchive, HTTP, xml,
- texmath, random}:
+ texmath, random ? null}:
 
 cabal.mkDerivation (self : {
   pname = "pandoc";
   version = "1.6";
   sha256 = "9b825233293edf1ea414b0e7ea821d6a914711dc2c60546566ab5a97512b079b";
   propagatedBuildInputs = [
-    mtl network parsec utf8String xhtml zipArchive HTTP xml texmath random
-  ];
+    mtl network parsec utf8String xhtml zipArchive HTTP xml texmath
+  ] ++ (if random != null then [random] else []);
   meta = {
     description = "Conversion between markup formats";
   };
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 3ab7c57e489..c79b41ddd6f 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -453,8 +453,6 @@ rec {
 
   RangedSets = callPackage ../development/libraries/haskell/Ranged-sets {};
 
-  random = callPackage ../development/libraries/haskell/random {};
-
   random_newtime = callPackage ../development/libraries/haskell/random {
     time = time_1_2_0_3;
   };

From 82d07ebaa2930d7a37ac2b80cfc2d2af31410264 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 13 Sep 2010 17:34:14 +0000
Subject: [PATCH 134/181] Fix libktorrent compilation with kde-4.4

svn path=/nixpkgs/trunk/; revision=23767
---
 pkgs/development/libraries/libktorrent/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libktorrent/default.nix b/pkgs/development/libraries/libktorrent/default.nix
index d80d9da4f7e..2ccfbf499b8 100644
--- a/pkgs/development/libraries/libktorrent/default.nix
+++ b/pkgs/development/libraries/libktorrent/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, kdelibs, cmake, gmp, qca2, boost, gettext, qt4, automoc4,
-  perl }:
+  perl, phonon }:
 
 stdenv.mkDerivation rec {
   name = pname + "-" + version;
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
 # TODO: xfs.h
-  propagatedBuildInputs = [ kdelibs gmp boost qt4 ];
+  propagatedBuildInputs = [ kdelibs gmp boost qt4 phonon ];
   buildInputs = [ cmake automoc4 qca2 gettext perl ];
 
   meta = {

From ddce0423d96261588d05121a0e61fd44b60de048 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 13 Sep 2010 17:34:19 +0000
Subject: [PATCH 135/181] Fix kde-4.5 kscreensaver

svn path=/nixpkgs/trunk/; revision=23768
---
 .../kde-4.5/artwork/FindXscreensaver.cmake    | 38 +++++++------------
 .../desktops/kde-4.5/artwork/kscreensaver.nix |  3 +-
 2 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/pkgs/desktops/kde-4.5/artwork/FindXscreensaver.cmake b/pkgs/desktops/kde-4.5/artwork/FindXscreensaver.cmake
index caa5ddd9254..499ed75268e 100644
--- a/pkgs/desktops/kde-4.5/artwork/FindXscreensaver.cmake
+++ b/pkgs/desktops/kde-4.5/artwork/FindXscreensaver.cmake
@@ -9,7 +9,7 @@ if (NOT XSCREENSAVER_FOUND)
   FIND_PATH(XSCREENSAVER_DIR deco
     HINTS
       ${KDE4_INCLUDE_DIR}
-	PATHS
+    PATHS
       /usr
       /usr/local
       /opt/local
@@ -21,18 +21,18 @@ if (NOT XSCREENSAVER_FOUND)
       /usr/local/xscreensaver
       /usr/openwin/lib/xscreensaver
       /etc
-	PATH_SUFFIXES
+    PATH_SUFFIXES
       lib${LIB_SUFFIX}/xscreensaver
+      lib${LIB_SUFFIX}/misc/xscreensaver
       lib/xscreensaver
-	  lib${LIB_SUFFIX}/misc/xscreensaver
-	  lib/misc/xscreensaver
-	  libexec/xscreensaver
-	  bin/xscreensaver-hacks
-	  hacks)
-  message(XSCREENSAVER_DIR ${XSCREENSAVER_DIR})
+      lib64/xscreensaver
+      lib/misc/xscreensaver
+      libexec/xscreensaver
+      bin/xscreensaver-hacks
+      hacks)
+  message(STATUS "XSCREENSAVER_DIR <${XSCREENSAVER_DIR}>")
 
-  set(XSCREENSAVER_CONFIG_DIR)
-  FIND_PATH(XSCREENSAVER_CONFIG_DECO config/deco.xml
+  FIND_PATH(XSCREENSAVER_CONFIG_DIR deco.xml
     PATHS
     ${KDE4_INCLUDE_DIR}
     /usr/
@@ -45,22 +45,10 @@ if (NOT XSCREENSAVER_FOUND)
     /usr/local/kde/
     /usr/openwin/lib/xscreensaver/
     /etc/
-    PATH_SUFFIXES xscreensaver share/xscreensaver
+    PATH_SUFFIXES xscreensaver xscreensaver/config share/xscreensaver/config
   )
-  #MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>")
+  MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>")
 
-  if(XSCREENSAVER_CONFIG_DECO)
-	set(XSCREENSAVER_CONFIG_DIR "${XSCREENSAVER_CONFIG_DECO}/config/")
-	#MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR <${XSCREENSAVER_CONFIG_DIR}>")
-  endif(XSCREENSAVER_CONFIG_DECO)
-
-
-  # Try and locate XScreenSaver config when path doesn't include config
-  if(NOT XSCREENSAVER_CONFIG_DIR)
-    FIND_PATH(XSCREENSAVER_CONFIG_DIR deco.xml
-      /etc/xscreensaver
-      )
-  endif(NOT XSCREENSAVER_CONFIG_DIR)
 endif(NOT XSCREENSAVER_FOUND)
 
 #MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>")
@@ -68,7 +56,7 @@ endif(NOT XSCREENSAVER_FOUND)
 
 # Need to fix hack
 if(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR)
-	set(XSCREENSAVER_FOUND TRUE)
+    set(XSCREENSAVER_FOUND TRUE)
 endif(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR)
 
 if (XSCREENSAVER_FOUND)
diff --git a/pkgs/desktops/kde-4.5/artwork/kscreensaver.nix b/pkgs/desktops/kde-4.5/artwork/kscreensaver.nix
index 9fb4b24b107..f87527e71ab 100644
--- a/pkgs/desktops/kde-4.5/artwork/kscreensaver.nix
+++ b/pkgs/desktops/kde-4.5/artwork/kscreensaver.nix
@@ -1,7 +1,8 @@
 { cmake, kde, automoc4, kdelibs, xscreensaver, kdebase_workspace, eigen }:
 
 kde.package rec {
-  buildInputs = [ cmake automoc4 kdelibs xscreensaver kdebase_workspace ];
+  buildInputs = [ cmake automoc4 kdelibs xscreensaver kdebase_workspace eigen ];
+  preConfigure = "cp -v ${./FindXscreensaver.cmake} cmake/modules/FindXscreensaver.cmake";
   meta = {
     description = "KDE screen saver and savers";
     kde = {

From 75f08dffa6866d538a8bc73a6ec4396dcd2cbe55 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 13 Sep 2010 20:14:45 +0000
Subject: [PATCH 136/181] kdewebdev-4.5.1, splitted

svn path=/nixpkgs/trunk/; revision=23771
---
 pkgs/desktops/kde-4.5/default.nix              |  8 +++++++-
 pkgs/desktops/kde-4.5/kde-package/manifest.nix |  4 ++++
 pkgs/desktops/kde-4.5/webdev/default.nix       | 16 ----------------
 pkgs/desktops/kde-4.5/webdev/kfilereplace.nix  | 16 ++++++++++++++++
 .../kde-4.5/webdev/kimagemapeditor.nix         | 16 ++++++++++++++++
 pkgs/desktops/kde-4.5/webdev/klinkstatus.nix   | 18 ++++++++++++++++++
 pkgs/desktops/kde-4.5/webdev/kommander.nix     | 15 +++++++++++++++
 7 files changed, 76 insertions(+), 17 deletions(-)
 delete mode 100644 pkgs/desktops/kde-4.5/webdev/default.nix
 create mode 100644 pkgs/desktops/kde-4.5/webdev/kfilereplace.nix
 create mode 100644 pkgs/desktops/kde-4.5/webdev/kimagemapeditor.nix
 create mode 100644 pkgs/desktops/kde-4.5/webdev/klinkstatus.nix
 create mode 100644 pkgs/desktops/kde-4.5/webdev/kommander.nix

diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix
index 68885b1af6a..fc15d1f54bb 100644
--- a/pkgs/desktops/kde-4.5/default.nix
+++ b/pkgs/desktops/kde-4.5/default.nix
@@ -127,7 +127,13 @@
     recurseForRelease = true;
   };
 
-  kdewebdev = callPackage ./webdev { };
+  kdewebdev = {
+    recurseForDerivations = true;
+    klinkstatus = callPackage ./webdev/klinkstatus.nix { };
+    kommander = callPackage ./webdev/kommander.nix { };
+    kfilereplace = callPackage ./webdev/kfilereplace.nix { };
+    kimagemapeditor = callPackage ./webdev/kimagemapeditor.nix { };
+  };
 
   #kdepim_runtime = callPackage ../kde-4.4/pim-runtime { };
   kdepim_runtime = callPackage ./pim-runtime { };
diff --git a/pkgs/desktops/kde-4.5/kde-package/manifest.nix b/pkgs/desktops/kde-4.5/kde-package/manifest.nix
index c2f9848d9ad..ef33cc41453 100644
--- a/pkgs/desktops/kde-4.5/kde-package/manifest.nix
+++ b/pkgs/desktops/kde-4.5/kde-package/manifest.nix
@@ -144,4 +144,8 @@ builtins.listToAttrs
   name = "kdetoys-4.5.1.tar.bz2";
   value = "194a6ylxi5jrfh3w3cy6jhdissshswdrv9pnir72z67ca13dvd9s";
 }
+{
+  name = "kdewebdev-4.5.1.tar.bz2";
+  value = "0kgk3wwskvxw0hmzpify5by3mbnyprmy1c0nx44iw85xrk6riss0";
+}
 ]
diff --git a/pkgs/desktops/kde-4.5/webdev/default.nix b/pkgs/desktops/kde-4.5/webdev/default.nix
deleted file mode 100644
index db55fd84323..00000000000
--- a/pkgs/desktops/kde-4.5/webdev/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kde, cmake, qt4, perl, libxml2, libxslt, boost
-, kdelibs, kdepimlibs, automoc4, ruby, htmlTidy, zlib }:
-
-kde.package {
-
-  buildInputs = [ cmake qt4 perl libxml2 libxslt boost kdelibs kdepimlibs
-    automoc4 htmlTidy ruby zlib ];
-  meta = {
-    description = "KDE Web development utilities";
-    license = "GPL";
-    kde = {
-      name = "kdewebdev";
-      version = "4.5.0";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.5/webdev/kfilereplace.nix b/pkgs/desktops/kde-4.5/webdev/kfilereplace.nix
new file mode 100644
index 00000000000..99434987b05
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/webdev/kfilereplace.nix
@@ -0,0 +1,16 @@
+{ kde, cmake, kdelibs, automoc4, libxml2, libxslt }:
+
+kde.package {
+  buildInputs = [ cmake kdelibs automoc4 libxml2 libxslt ];
+
+  meta = {
+    description = "Batch search and replace tool";
+    homepage = http://www.kdewebdev.org;
+    kde = {
+      name = "kfilereplace";
+      module = "kdewebdev";
+      version = "0.1";
+      release = "4.5.1";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/webdev/kimagemapeditor.nix b/pkgs/desktops/kde-4.5/webdev/kimagemapeditor.nix
new file mode 100644
index 00000000000..4337706ea9a
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/webdev/kimagemapeditor.nix
@@ -0,0 +1,16 @@
+{ kde, cmake, kdelibs, automoc4, libxml2, libxslt }:
+
+kde.package {
+  buildInputs = [ cmake kdelibs automoc4 libxml2 libxslt ];
+
+  meta = {
+    description = "An HTML imagemap editor";
+    homepage = http://www.nongnu.org/kimagemap/;
+    kde = {
+      name = "kimagemapeditor";
+      module = "kdewebdev";
+      version = "3.9.0";
+      release = "4.5.1";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/webdev/klinkstatus.nix b/pkgs/desktops/kde-4.5/webdev/klinkstatus.nix
new file mode 100644
index 00000000000..2f55bc3a5be
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/webdev/klinkstatus.nix
@@ -0,0 +1,18 @@
+{ kde, cmake, kdelibs, automoc4, libxml2, libxslt, kdepimlibs, boost, htmlTidy,
+  ruby }:
+
+kde.package {
+  buildInputs = [ cmake kdelibs automoc4 libxml2 libxslt kdepimlibs boost
+    htmlTidy ruby ];
+
+  meta = {
+    description = "A KDE link checker";
+    homepage = http://klinkstatus.kdewebdev.org;
+    kde = {
+      name = "klinkstatus";
+      module = "kdewebdev";
+      version = "0.7.0";
+      release = "4.5.1";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/webdev/kommander.nix b/pkgs/desktops/kde-4.5/webdev/kommander.nix
new file mode 100644
index 00000000000..e1ea1b33306
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/webdev/kommander.nix
@@ -0,0 +1,15 @@
+{ kde, cmake, kdelibs, automoc4, libxml2, libxslt }:
+
+kde.package {
+  buildInputs = [ cmake kdelibs automoc4 libxml2 libxslt ];
+
+  meta = {
+    description = "A graphical editor of scripted dialogs";
+    kde = {
+      name = "kommander";
+      module = "kdewebdev";
+      version = "1.91";
+      release = "4.5.1";
+    };
+  };
+}

From b49a2d16b28b31d2a1037313ef46ba7df0e85542 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 13 Sep 2010 20:54:46 +0000
Subject: [PATCH 137/181] Add overridability to gnome

svn path=/nixpkgs/trunk/; revision=23773
---
 pkgs/desktops/gnome-2.28/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-2.28/default.nix b/pkgs/desktops/gnome-2.28/default.nix
index 2f237f13daf..0efd9d20dfa 100644
--- a/pkgs/desktops/gnome-2.28/default.nix
+++ b/pkgs/desktops/gnome-2.28/default.nix
@@ -1,6 +1,7 @@
 pkgs:
-
-rec {
+pkgs.makeOverridable
+(__overrides: rec {
+  inherit __overrides;
 
   inherit (pkgs.gtkLibs) glib pango atk gtk gtkmm;
 
@@ -331,4 +332,4 @@ rec {
     inherit gtkmm libglade;
   };
 
-}
+}) {}

From daea455d15e024a440e6fe3fbb98c7ccb6eea4b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 13 Sep 2010 21:16:10 +0000
Subject: [PATCH 138/181] Removing coreutils_real from release-cross.

It had to be 'coreutils' instead, but I don't think they cross-build. They
cross-build only in stdenv-updates I tihnk.

svn path=/nixpkgs/trunk/; revision=23774
---
 pkgs/top-level/release-cross.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index 91d7b7a5adf..b2dc475e12a 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -6,7 +6,6 @@ let
   basicHostDrv = {
     bison.hostDrv = nativePlatforms;
     busybox.hostDrv = nativePlatforms;
-    coreutils_real.hostDrv = nativePlatforms;
     dropbear.hostDrv = nativePlatforms;
     tightvnc.hostDrv = nativePlatforms;
     #openoffice.hostDrv = nativePlatforms;

From 9dbbae2c0c0e1d151ee02b218ec20dd9329ffbb5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 14 Sep 2010 10:54:50 +0000
Subject: [PATCH 139/181] * bridge-utils updated to 1.4.

svn path=/nixpkgs/trunk/; revision=23778
---
 .../linux/{bridge_utils => bridge-utils}/default.nix      | 8 ++++----
 pkgs/top-level/all-packages.nix                           | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename pkgs/os-specific/linux/{bridge_utils => bridge-utils}/default.nix (65%)

diff --git a/pkgs/os-specific/linux/bridge_utils/default.nix b/pkgs/os-specific/linux/bridge-utils/default.nix
similarity index 65%
rename from pkgs/os-specific/linux/bridge_utils/default.nix
rename to pkgs/os-specific/linux/bridge-utils/default.nix
index cb8b033c1e3..b3285ce3343 100644
--- a/pkgs/os-specific/linux/bridge_utils/default.nix
+++ b/pkgs/os-specific/linux/bridge-utils/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoconf, automake }:
 
-stdenv.mkDerivation {
-  name = "bridge-utils-1.2";
+stdenv.mkDerivation rec {
+  name = "bridge-utils-1.4";
 
   src = fetchurl {
-    url = mirror://sourceforge/bridge/bridge-utils-1.2.tar.gz;
-    sha256 = "0jg3z51c2c34byg4zi39j9g4b66js5kanjhid77hpa0jdfmryfy9";
+    url = "mirror://sourceforge/bridge/${name}.tar.gz";
+    sha256 = "0csrvpjx1n5fzscdrc0xky3rnaxi90rylqciha5sl0n3pklpasc7";
   };
 
   buildInputs = [ autoconf automake ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1b1d20bb022..8b5e3df2398 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4224,7 +4224,7 @@ let
 
   bluez = callPackage ../os-specific/linux/bluez { };
 
-  bridge_utils = callPackage ../os-specific/linux/bridge_utils { };
+  bridge_utils = callPackage ../os-specific/linux/bridge-utils { };
 
   cifs_utils = callPackage ../os-specific/linux/cifs-utils { };
 

From 7f2af6acfd500810cc13ddcabad2883528492fc1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 14 Sep 2010 12:15:06 +0000
Subject: [PATCH 140/181] svn path=/nixpkgs/trunk/; revision=23784

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8b5e3df2398..aa6c27f9783 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4674,7 +4674,7 @@ let
   linuxPackages_2_6_32_systemtap =
     recurseIntoAttrs (linuxPackagesFor linux_2_6_32_systemtap pkgs.linuxPackages_2_6_32_systemtap);
   linuxPackages_2_6_32_xen =
-    recurseIntoAttrs (linuxPackagesFor linux_2_6_32_xen pkgs.linuxPackages_2_6_32_systemtap);
+    recurseIntoAttrs (linuxPackagesFor linux_2_6_32_xen pkgs.linuxPackages_2_6_32_xen);
   linuxPackages_2_6_33 = recurseIntoAttrs (linuxPackagesFor linux_2_6_33 pkgs.linuxPackages_2_6_33);
   linuxPackages_2_6_34 = recurseIntoAttrs (linuxPackagesFor linux_2_6_34 pkgs.linuxPackages_2_6_34);
   linuxPackages_2_6_35 = recurseIntoAttrs (linuxPackagesFor linux_2_6_35 pkgs.linuxPackages_2_6_35);

From cdecced3b09ed825415e7a3d34637ac0384db1c7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 14 Sep 2010 13:50:32 +0000
Subject: [PATCH 141/181] * Fix various references to /usr.

svn path=/nixpkgs/trunk/; revision=23788
---
 .../virtualization/xen/default.nix            | 34 +++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/xen/default.nix b/pkgs/applications/virtualization/xen/default.nix
index 12d16b7f229..87ee66ba6e9 100644
--- a/pkgs/applications/virtualization/xen/default.nix
+++ b/pkgs/applications/virtualization/xen/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, which, zlib, pkgconfig, SDL, openssl, python
-, libuuid, gettext, ncurses, dev86, iasl, pciutils, bzip2, xz }:
+, libuuid, gettext, ncurses, dev86, iasl, pciutils, bzip2, xz
+, lvm2, utillinux, procps }:
 
 let version = "4.0.1"; in 
 
@@ -26,18 +27,47 @@ stdenv.mkDerivation {
 
   buildFlags = "xen tools";
 
+  preBuild =
+    ''
+      substituteInPlace tools/libfsimage/common/fsimage_plugin.c \
+        --replace /usr $out
+
+      substituteInPlace tools/blktap2/lvm/lvm-util.c \
+        --replace /usr/sbin/vgs ${lvm2}/sbin/vgs \
+        --replace /usr/sbin/lvs ${lvm2}/sbin/lvs
+
+      substituteInPlace tools/hotplug/Linux/network-bridge \
+        --replace /usr/bin/logger ${utillinux}/bin/logger
+
+      substituteInPlace tools/xenmon/xenmon.py \
+        --replace /usr/bin/pkill ${procps}/bin/pkill
+
+      substituteInPlace tools/xenstat/Makefile \
+        --replace /usr/include/curses.h ${ncurses}/include/curses.h
+
+      # Work around a bug in our GCC wrapper: `gcc -MF foo -v' doesn't
+      # print the GCC version number properly.
+      substituteInPlace xen/Makefile \
+        --replace '$(CC) $(CFLAGS) -v' '$(CC) -v'
+    '';
+
   installPhase =
     ''
       cp -prvd dist/install/nix/store/* $out
       cp -prvd dist/install/boot $out/boot
     ''; # */
 
-  # Set the Python search path in all Python scripts.
   postFixup =
     ''
+      # Set the Python search path in all Python scripts.
       for fn in $(grep -l '#!.*python' $out/bin/* $out/sbin/*); do
           sed -i "$fn" -e "1 a import sys\nsys.path = ['$out/lib/python2.6/site-packages'] + sys.path"
       done
+
+      # Remove calls to `env'.
+      for fn in $(grep -l '#!.*/env.*python' $out/bin/* $out/sbin/*); do
+          sed -i "$fn" -e "1 s^/nix/store/.*/env.*python^${python}/bin/python^"
+      done
     ''; # */
 
   meta = {

From bb568e746762a694e20e0b7cf982b3e6b66e85a6 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 14 Sep 2010 14:28:55 +0000
Subject: [PATCH 142/181] Delete unused files

svn path=/nixpkgs/trunk/; revision=23789
---
 pkgs/desktops/kde-4.5/utils/default.nix      | 28 --------------------
 pkgs/desktops/kde-4.5/utils/log-feature.diff | 10 -------
 2 files changed, 38 deletions(-)
 delete mode 100644 pkgs/desktops/kde-4.5/utils/default.nix
 delete mode 100644 pkgs/desktops/kde-4.5/utils/log-feature.diff

diff --git a/pkgs/desktops/kde-4.5/utils/default.nix b/pkgs/desktops/kde-4.5/utils/default.nix
deleted file mode 100644
index 57ec64c2458..00000000000
--- a/pkgs/desktops/kde-4.5/utils/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, cmake, qt4, perl, gmp, python, libarchive, xz
-, sip, pyqt4, pycups, rhpl, system_config_printer, qjson, shared_mime_info
-, kdebase_workspace
-, kdelibs, kdepimlibs, kdebase, kdebindings, automoc4, qimageblitz, qca2}:
-
-let
-  src = fetchurl {
-    url = mirror://kde/stable/src/kdeutils-4.5.0.tar.bz2;
-    sha256 = "1x4dwc193gsfcnryhkv2v3xafjr1a87ls0zfi56i1w2aj38b36l7";
-  };
-in
-{
-  ark = kdeSplitPackage
- {
-  name = "ark-2.15";
-
-  inherit src;
-
-  patchPhase = "cp -vn ${qjson}/share/apps/cmake/modules/FindQJSON.cmake cmake/modules";
-
-  buildInputs = [ cmake qt4 perl libarchive xz kdelibs automoc4 qjson
-    kdebase # for libkonq
-    ];
-
-  cmakeFlags = "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE -DBUILD_doc=TRUE -DBUILD_ark=TRUE";
-}
-  kcalc = callPackage ./kcalc.nix { inherit src; };
-}
diff --git a/pkgs/desktops/kde-4.5/utils/log-feature.diff b/pkgs/desktops/kde-4.5/utils/log-feature.diff
deleted file mode 100644
index 050f06fd397..00000000000
--- a/pkgs/desktops/kde-4.5/utils/log-feature.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- kdeutils-4.5.0.orig/CMakeLists.txt.orig	2010-08-16 18:21:33.000000000 +0400
-+++ kdeutils-4.5.0/CMakeLists.txt	2010-08-16 18:27:05.000000000 +0400
-@@ -36,6 +36,7 @@
- endif( GMP_FOUND )
- if( UNIX )
-     find_package( KDE4Workspace )
-+    macro_log_feature( KDE4Workspace_FOUND "KDE4Workspace" "KDE workscpace library, part of kdebase-workspace" "http://www.kde.org" FALSE "" "Required to build kremotecontrol." )
-     if( KDE4Workspace_FOUND AND QT_QTXMLPATTERNS_FOUND )
-         macro_optional_add_subdirectory( kremotecontrol )
-     endif( KDE4Workspace_FOUND AND QT_QTXMLPATTERNS_FOUND )

From 76a3eb02d387e216ad4dffdbeea483bfd8b83553 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 14 Sep 2010 14:29:01 +0000
Subject: [PATCH 143/181] kdeutils-4.5.1

svn path=/nixpkgs/trunk/; revision=23790
---
 pkgs/desktops/kde-4.5/kde-package/manifest.nix | 4 ++++
 pkgs/desktops/kde-4.5/utils/ark.nix            | 2 +-
 pkgs/desktops/kde-4.5/utils/kcalc.nix          | 2 +-
 pkgs/desktops/kde-4.5/utils/kcharselect.nix    | 2 +-
 pkgs/desktops/kde-4.5/utils/kdf.nix            | 2 +-
 pkgs/desktops/kde-4.5/utils/kfloppy.nix        | 3 +--
 pkgs/desktops/kde-4.5/utils/kgpg.nix           | 4 ++--
 pkgs/desktops/kde-4.5/utils/kremotecontrol.nix | 3 +--
 pkgs/desktops/kde-4.5/utils/ktimer.nix         | 2 +-
 pkgs/desktops/kde-4.5/utils/kwallet.nix        | 2 +-
 pkgs/desktops/kde-4.5/utils/okteta.nix         | 4 ++--
 pkgs/desktops/kde-4.5/utils/printer-applet.nix | 2 +-
 pkgs/desktops/kde-4.5/utils/superkaramba.nix   | 2 +-
 pkgs/desktops/kde-4.5/utils/sweeper.nix        | 2 +-
 14 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/pkgs/desktops/kde-4.5/kde-package/manifest.nix b/pkgs/desktops/kde-4.5/kde-package/manifest.nix
index ef33cc41453..121df4b8322 100644
--- a/pkgs/desktops/kde-4.5/kde-package/manifest.nix
+++ b/pkgs/desktops/kde-4.5/kde-package/manifest.nix
@@ -148,4 +148,8 @@ builtins.listToAttrs
   name = "kdewebdev-4.5.1.tar.bz2";
   value = "0kgk3wwskvxw0hmzpify5by3mbnyprmy1c0nx44iw85xrk6riss0";
 }
+{
+  name = "kdeutils-4.5.1.tar.bz2";
+  value = "13i13pga3dlhg6bwz6p3wrr8qa0vzhwqg809a0r5yn0kz4icaasq";
+}
 ]
diff --git a/pkgs/desktops/kde-4.5/utils/ark.nix b/pkgs/desktops/kde-4.5/utils/ark.nix
index eaddd0a51ca..55b87f802b1 100644
--- a/pkgs/desktops/kde-4.5/utils/ark.nix
+++ b/pkgs/desktops/kde-4.5/utils/ark.nix
@@ -14,7 +14,7 @@ kde.package {
       name = "ark";
       module = "kdeutils";
       version = "2.15";
-      release = "4.5.0";
+      release = "4.5.1";
     };
   };
 }
diff --git a/pkgs/desktops/kde-4.5/utils/kcalc.nix b/pkgs/desktops/kde-4.5/utils/kcalc.nix
index cc4c2d8e8d8..b405b59ac82 100644
--- a/pkgs/desktops/kde-4.5/utils/kcalc.nix
+++ b/pkgs/desktops/kde-4.5/utils/kcalc.nix
@@ -9,7 +9,7 @@ kde.package {
       name = "kcalc";
       module = "kdeutils";
       version = "2.7";
-      release = "4.5.0";
+      release = "4.5.1";
     };
   };
 }
diff --git a/pkgs/desktops/kde-4.5/utils/kcharselect.nix b/pkgs/desktops/kde-4.5/utils/kcharselect.nix
index 86a49287606..3caef9a31ef 100644
--- a/pkgs/desktops/kde-4.5/utils/kcharselect.nix
+++ b/pkgs/desktops/kde-4.5/utils/kcharselect.nix
@@ -9,7 +9,7 @@ kde.package {
       name = "kcharselect";
       module = "kdeutils";
       version = "1.7";
-      release = "4.5.0";
+      release = "4.5.1";
     };
   };
 }
diff --git a/pkgs/desktops/kde-4.5/utils/kdf.nix b/pkgs/desktops/kde-4.5/utils/kdf.nix
index 78c4d6ef6e5..7f76a62a7ba 100644
--- a/pkgs/desktops/kde-4.5/utils/kdf.nix
+++ b/pkgs/desktops/kde-4.5/utils/kdf.nix
@@ -9,7 +9,7 @@ kde.package {
       name = "kdf";
       module = "kdeutils";
       version = "0.11";
-      release = "4.5.0";
+      release = "4.5.1";
     };
   };
 }
diff --git a/pkgs/desktops/kde-4.5/utils/kfloppy.nix b/pkgs/desktops/kde-4.5/utils/kfloppy.nix
index 9a165262000..cabc445b9bd 100644
--- a/pkgs/desktops/kde-4.5/utils/kfloppy.nix
+++ b/pkgs/desktops/kde-4.5/utils/kfloppy.nix
@@ -8,8 +8,7 @@ kde.package {
     kde = {
       name = "kfloppy";
       module = "kdeutils";
-      version = "4.5.0";
-      release = "4.5.0";
+      version = "4.5.1";
     };
   };
 }
diff --git a/pkgs/desktops/kde-4.5/utils/kgpg.nix b/pkgs/desktops/kde-4.5/utils/kgpg.nix
index fc233e62a9a..28c8bafe99d 100644
--- a/pkgs/desktops/kde-4.5/utils/kgpg.nix
+++ b/pkgs/desktops/kde-4.5/utils/kgpg.nix
@@ -8,8 +8,8 @@ kde.package {
     kde = {
       name = "kgpg";
       module = "kdeutils";
-      version = "2.4.0";
-      release = "4.5.0";
+      version = "2.4.1";
+      release = "4.5.1";
     };
   };
 }
diff --git a/pkgs/desktops/kde-4.5/utils/kremotecontrol.nix b/pkgs/desktops/kde-4.5/utils/kremotecontrol.nix
index 9a2101934ec..6962578ab54 100644
--- a/pkgs/desktops/kde-4.5/utils/kremotecontrol.nix
+++ b/pkgs/desktops/kde-4.5/utils/kremotecontrol.nix
@@ -8,8 +8,7 @@ kde.package {
     kde = {
       name = "kremotecontrol";
       module = "kdeutils";
-      version = "4.5.0";
-      release = "4.5.0";
+      version = "4.5.1";
     };
   };
 }
diff --git a/pkgs/desktops/kde-4.5/utils/ktimer.nix b/pkgs/desktops/kde-4.5/utils/ktimer.nix
index 89a184ba648..d7eaefaa265 100644
--- a/pkgs/desktops/kde-4.5/utils/ktimer.nix
+++ b/pkgs/desktops/kde-4.5/utils/ktimer.nix
@@ -9,7 +9,7 @@ kde.package {
       name = "ktimer";
       module = "kdeutils";
       version = "0.6";
-      release = "4.5.0";
+      release = "4.5.1";
     };
   };
 }
diff --git a/pkgs/desktops/kde-4.5/utils/kwallet.nix b/pkgs/desktops/kde-4.5/utils/kwallet.nix
index 6c1d8735611..64d37a3f5c0 100644
--- a/pkgs/desktops/kde-4.5/utils/kwallet.nix
+++ b/pkgs/desktops/kde-4.5/utils/kwallet.nix
@@ -9,7 +9,7 @@ kde.package {
       name = "kwallet";
       module = "kdeutils";
       version = "1.6";
-      release = "4.5.0";
+      release = "4.5.1";
     };
   };
 }
diff --git a/pkgs/desktops/kde-4.5/utils/okteta.nix b/pkgs/desktops/kde-4.5/utils/okteta.nix
index c00ab9b13ba..6cafc21c4f8 100644
--- a/pkgs/desktops/kde-4.5/utils/okteta.nix
+++ b/pkgs/desktops/kde-4.5/utils/okteta.nix
@@ -8,8 +8,8 @@ kde.package {
     kde = {
       name = "okteta";
       module = "kdeutils";
-      version = "0.5.0";
-      release = "4.5.0";
+      version = "0.5.1";
+      release = "4.5.1";
     };
   };
 }
diff --git a/pkgs/desktops/kde-4.5/utils/printer-applet.nix b/pkgs/desktops/kde-4.5/utils/printer-applet.nix
index ec4ee970240..22b351da778 100644
--- a/pkgs/desktops/kde-4.5/utils/printer-applet.nix
+++ b/pkgs/desktops/kde-4.5/utils/printer-applet.nix
@@ -15,7 +15,7 @@ kde.package {
       name = "printer-applet";
       module = "kdeutils";
       version = "1.5";
-      release = "4.5.0";
+      release = "4.5.1";
     };
   };
 }
diff --git a/pkgs/desktops/kde-4.5/utils/superkaramba.nix b/pkgs/desktops/kde-4.5/utils/superkaramba.nix
index fd69c83ca3c..db47d26fcef 100644
--- a/pkgs/desktops/kde-4.5/utils/superkaramba.nix
+++ b/pkgs/desktops/kde-4.5/utils/superkaramba.nix
@@ -11,7 +11,7 @@ kde.package {
       name = "superkaramba";
       module = "kdeutils";
       version = "0.55";
-      release = "4.5.0";
+      release = "4.5.1";
     };
   };
 }
diff --git a/pkgs/desktops/kde-4.5/utils/sweeper.nix b/pkgs/desktops/kde-4.5/utils/sweeper.nix
index 9c97477161d..a0a97966643 100644
--- a/pkgs/desktops/kde-4.5/utils/sweeper.nix
+++ b/pkgs/desktops/kde-4.5/utils/sweeper.nix
@@ -9,7 +9,7 @@ kde.package {
       name = "sweeper";
       module = "kdeutils";
       version = "1.5";
-      release = "4.5.0";
+      release = "4.5.1";
     };
   };
 }

From 95b08e53816cd1298f68b7c3821b83c64fd59bc6 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 14 Sep 2010 14:29:08 +0000
Subject: [PATCH 144/181] kdegraphics-4.5.1

svn path=/nixpkgs/trunk/; revision=23791
---
 pkgs/desktops/kde-4.5/graphics/default.nix     | 2 +-
 pkgs/desktops/kde-4.5/kde-package/manifest.nix | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/kde-4.5/graphics/default.nix b/pkgs/desktops/kde-4.5/graphics/default.nix
index 6a69641b3bd..c8de3c61633 100644
--- a/pkgs/desktops/kde-4.5/graphics/default.nix
+++ b/pkgs/desktops/kde-4.5/graphics/default.nix
@@ -17,7 +17,7 @@ kde.package {
     license = "GPL";
     kde = {
       name = "kdegraphics";
-      version = "4.5.0";
+      version = "4.5.1";
     };
   };
 }
diff --git a/pkgs/desktops/kde-4.5/kde-package/manifest.nix b/pkgs/desktops/kde-4.5/kde-package/manifest.nix
index 121df4b8322..23a210e6941 100644
--- a/pkgs/desktops/kde-4.5/kde-package/manifest.nix
+++ b/pkgs/desktops/kde-4.5/kde-package/manifest.nix
@@ -152,4 +152,8 @@ builtins.listToAttrs
   name = "kdeutils-4.5.1.tar.bz2";
   value = "13i13pga3dlhg6bwz6p3wrr8qa0vzhwqg809a0r5yn0kz4icaasq";
 }
+{
+  name = "kdegraphics-4.5.1.tar.bz2";
+  value = "0z0fqqb868ywvdxvd94vp15drkizh59m4arblsx9cj19d157nbwd";
+}
 ]

From 359b360fc2e958540d685ae014e66be85948dc60 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 14 Sep 2010 14:29:13 +0000
Subject: [PATCH 145/181] Add libdiscid

svn path=/nixpkgs/trunk/; revision=23792
---
 .../libraries/libdiscid/default.nix            | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix                |  2 ++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/development/libraries/libdiscid/default.nix

diff --git a/pkgs/development/libraries/libdiscid/default.nix b/pkgs/development/libraries/libdiscid/default.nix
new file mode 100644
index 00000000000..bd39ea9464c
--- /dev/null
+++ b/pkgs/development/libraries/libdiscid/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, cmake }:
+
+stdenv.mkDerivation rec {
+  name = "libdiscid-0.2.2";
+
+  buildInputs = [ cmake ];
+
+  src = fetchurl {
+    url = "http://users.musicbrainz.org/~matt/${name}.tar.gz";
+    sha256 = "00l4ln9rk0vqf67iccwqrgc9qx1al92i05zylh85kd1zn9d5sjwp";
+  };
+
+  meta = {
+    description = "A C library for creating MusicBrainz DiscIDs from audio CDs";
+    homepage = http://musicbrainz.org/doc/libdiscid;
+    license = "LGPL-2.1";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aa6c27f9783..3a534d884db 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3162,6 +3162,8 @@ let
     inherit sqlite mysql;
   };
 
+  libdiscid = callPackage ../development/libraries/libdiscid { };
+
   libdv = callPackage ../development/libraries/libdv { };
 
   libdrm = if stdenv.isDarwin then null else (import ../development/libraries/libdrm {

From 09c85666cd4bd89a36283c6de3c8849e7cc46dde Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 14 Sep 2010 14:29:19 +0000
Subject: [PATCH 146/181] Add libmusicbrainz 2.x and 3.x

svn path=/nixpkgs/trunk/; revision=23793
---
 .../libraries/libmusicbrainz/2.x.nix          | 16 +++++
 .../libraries/libmusicbrainz/default.nix      | 14 +++++
 .../libraries/libmusicbrainz/find-neon.patch  | 52 ++++++++++++++++
 .../libraries/libmusicbrainz/gcc-4.x.patch    | 60 +++++++++++++++++++
 .../libmusicbrainz/missing-include.patch      | 12 ++++
 pkgs/top-level/all-packages.nix               |  6 ++
 6 files changed, 160 insertions(+)
 create mode 100644 pkgs/development/libraries/libmusicbrainz/2.x.nix
 create mode 100644 pkgs/development/libraries/libmusicbrainz/default.nix
 create mode 100644 pkgs/development/libraries/libmusicbrainz/find-neon.patch
 create mode 100644 pkgs/development/libraries/libmusicbrainz/gcc-4.x.patch
 create mode 100644 pkgs/development/libraries/libmusicbrainz/missing-include.patch

diff --git a/pkgs/development/libraries/libmusicbrainz/2.x.nix b/pkgs/development/libraries/libmusicbrainz/2.x.nix
new file mode 100644
index 00000000000..383cdf3291a
--- /dev/null
+++ b/pkgs/development/libraries/libmusicbrainz/2.x.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl, expat }:
+
+stdenv.mkDerivation rec {
+  name = "libmusicbrainz-2.1.5";
+
+  configureFlags = "--enable-cpp-headers";
+
+  buildInputs = [ expat ];
+
+  patches = [ ./gcc-4.x.patch ];
+
+  src = fetchurl {
+    url = "ftp://ftp.musicbrainz.org/pub/musicbrainz/${name}.tar.gz";
+    sha256 = "183i4c109r5qx3mk4r986sx5xw4n5mdhdz4yz3rrv3s2xm5rqqn6";
+  };
+}
diff --git a/pkgs/development/libraries/libmusicbrainz/default.nix b/pkgs/development/libraries/libmusicbrainz/default.nix
new file mode 100644
index 00000000000..f39a3793eec
--- /dev/null
+++ b/pkgs/development/libraries/libmusicbrainz/default.nix
@@ -0,0 +1,14 @@
+{ stdenv, fetchurl, cmake, neon, libdiscid }:
+
+stdenv.mkDerivation rec {
+  name = "libmusicbrainz-3.0.2";
+
+  buildInputs = [ cmake neon libdiscid ];
+
+  patches = [ ./find-neon.patch ];
+
+  src = fetchurl {
+    url = "ftp://ftp.musicbrainz.org/pub/musicbrainz/${name}.tar.gz";
+    sha256 = "1nhyl9kalvcn0r86y3kps6id84y3rc43226g67bssfb2h9b5x8xr";
+  };
+}
diff --git a/pkgs/development/libraries/libmusicbrainz/find-neon.patch b/pkgs/development/libraries/libmusicbrainz/find-neon.patch
new file mode 100644
index 00000000000..2230c46018e
--- /dev/null
+++ b/pkgs/development/libraries/libmusicbrainz/find-neon.patch
@@ -0,0 +1,52 @@
+diff --git a/cmake/modules/FindNeon.cmake b/cmake/modules/FindNeon.cmake
+index 0a6b300..dbd6194 100644
+--- a/cmake/modules/FindNeon.cmake
++++ b/cmake/modules/FindNeon.cmake
+@@ -1,10 +1,10 @@
+ INCLUDE(UsePkgConfig)
+ PKGCONFIG(neon _NeonIncDir _NeonLinkDir _NeonLinkFlags _NeonCflags)
+ 
+-FIND_PATH(NEON_INCLUDE_DIR ne_request.h
++FIND_PATH(NEON_INCLUDE_DIR neon/ne_request.h
+     ${_NeonIncDir}
+-    /usr/include/neon
+-    /usr/local/include/neon
++    /usr/include
++    /usr/local/include
+ )
+ 
+ FIND_LIBRARY(NEON_LIBRARIES neon
+diff --git a/src/utils_private.cpp b/src/utils_private.cpp
+index 751b4a7..5a06eca 100644
+--- a/src/utils_private.cpp
++++ b/src/utils_private.cpp
+@@ -26,7 +26,7 @@
+ #include <cstdarg>
+ #include <iostream>
+ #include <map>
+-#include <ne_uri.h> 
++#include <neon/ne_uri.h> 
+ #include "utils_private.h"
+ 
+ using namespace std;
+diff --git a/src/webservice.cpp b/src/webservice.cpp
+index cd483f9..483f486 100644
+--- a/src/webservice.cpp
++++ b/src/webservice.cpp
+@@ -26,11 +26,11 @@
+ #include <iostream>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <ne_session.h>
+-#include <ne_request.h>
+-#include <ne_utils.h>
+-#include <ne_auth.h>
+-#include <ne_uri.h> 
++#include <neon/ne_session.h>
++#include <neon/ne_request.h>
++#include <neon/ne_utils.h>
++#include <neon/ne_auth.h>
++#include <neon/ne_uri.h> 
+ #include <musicbrainz3/webservice.h>
+ #include <musicbrainz3/artist.h>
+ #include "utils_private.h"
diff --git a/pkgs/development/libraries/libmusicbrainz/gcc-4.x.patch b/pkgs/development/libraries/libmusicbrainz/gcc-4.x.patch
new file mode 100644
index 00000000000..f55c4f2cd41
--- /dev/null
+++ b/pkgs/development/libraries/libmusicbrainz/gcc-4.x.patch
@@ -0,0 +1,60 @@
+diff --git a/lib/c_wrapper.cpp b/lib/c_wrapper.cpp
+index deae11d..ebc7854 100644
+--- a/lib/c_wrapper.cpp
++++ b/lib/c_wrapper.cpp
+@@ -24,6 +24,7 @@
+ #include "musicbrainz.h"
+ #include "trm.h"
+ #include "mb_c.h"
++#include <string.h>
+ 
+ extern "C"
+ {
+diff --git a/lib/comhttpsocket.cpp b/lib/comhttpsocket.cpp
+index 067313b..4371772 100644
+--- a/lib/comhttpsocket.cpp
++++ b/lib/comhttpsocket.cpp
+@@ -20,6 +20,7 @@
+ #endif
+ #include <stdlib.h>
+ #include <assert.h>
++#include <string.h>
+ 
+ const char* g_strCOMVer = "libmusicbrainz/"VERSION;
+ 
+diff --git a/lib/comsocket.cpp b/lib/comsocket.cpp
+index 01a94be..7bfc4dd 100644
+--- a/lib/comsocket.cpp
++++ b/lib/comsocket.cpp
+@@ -44,6 +44,7 @@ ____________________________________________________________________________*/
+ #include <net/if.h>
+ #include <sys/ioctl.h>
+ #endif
++#include <string.h>
+ 
+ #define mb_socklen_t ACCEPT_ARG3
+ 
+diff --git a/lib/http.cpp b/lib/http.cpp
+index 85390a3..e63713c 100644
+--- a/lib/http.cpp
++++ b/lib/http.cpp
+@@ -67,6 +67,7 @@
+ #ifdef __QNX__
+ #include <strings.h>
+ #endif
++#include <string.h>
+ 
+ using namespace std;
+ 
+diff --git a/lib/sigclient.cpp b/lib/sigclient.cpp
+index 9f76008..4bbbaae 100644
+--- a/lib/sigclient.cpp
++++ b/lib/sigclient.cpp
+@@ -32,6 +32,7 @@ email                : ijr@relatable.com
+ #ifdef WIN32
+ #pragma warning(disable:4786)
+ #endif
++#include <string.h>
+ 
+ #include "sigclient.h"
+ #include "comhttpsocket.h"
diff --git a/pkgs/development/libraries/libmusicbrainz/missing-include.patch b/pkgs/development/libraries/libmusicbrainz/missing-include.patch
new file mode 100644
index 00000000000..2a1d2b38cae
--- /dev/null
+++ b/pkgs/development/libraries/libmusicbrainz/missing-include.patch
@@ -0,0 +1,12 @@
+diff --git a/src/utils_private.cpp b/src/utils_private.cpp
+index 2abe857..751b4a7 100644
+--- a/src/utils_private.cpp
++++ b/src/utils_private.cpp
+@@ -21,6 +21,7 @@
+  */
+  
+ #include <cstdlib>
++#include <cstdio>
+ #include <cstring>
+ #include <cstdarg>
+ #include <iostream>
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3a534d884db..3373cd4e781 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3299,6 +3299,12 @@ let
 
   libmusclecard = callPackage ../development/libraries/libmusclecard { };
 
+  libmusicbrainz2 = callPackage ../development/libraries/libmusicbrainz/2.x.nix { };
+
+  libmusicbrainz3 = callPackage ../development/libraries/libmusicbrainz { };
+
+  libmusicbrainz = libmusicbrainz3;
+
   libnih = callPackage ../development/libraries/libnih { };
 
   libnova = callPackage ../development/libraries/libnova { };

From 5f4795b5f10fb4fbd86cb4b7bf273b916cdf8c05 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 14 Sep 2010 14:29:25 +0000
Subject: [PATCH 147/181] Add libofa

svn path=/nixpkgs/trunk/; revision=23794
---
 pkgs/development/libraries/libofa/default.nix | 14 +++++++
 .../libraries/libofa/gcc-4.x.patch            | 12 ++++++
 .../libofa/libofa-0.9.3-gcc-4.3.patch         | 36 +++++++++++++++++
 .../libraries/libofa/libofa-0.9.3-gcc-4.patch | 39 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 5 files changed, 103 insertions(+)
 create mode 100644 pkgs/development/libraries/libofa/default.nix
 create mode 100644 pkgs/development/libraries/libofa/gcc-4.x.patch
 create mode 100644 pkgs/development/libraries/libofa/libofa-0.9.3-gcc-4.3.patch
 create mode 100644 pkgs/development/libraries/libofa/libofa-0.9.3-gcc-4.patch

diff --git a/pkgs/development/libraries/libofa/default.nix b/pkgs/development/libraries/libofa/default.nix
new file mode 100644
index 00000000000..b3c69646452
--- /dev/null
+++ b/pkgs/development/libraries/libofa/default.nix
@@ -0,0 +1,14 @@
+{ stdenv, fetchurl, expat, curl, fftw }:
+
+stdenv.mkDerivation rec {
+  name = "libofa-0.9.3";
+
+  propagatedBuildInputs = [ expat curl fftw ];
+
+  patches = [ ./libofa-0.9.3-gcc-4.patch ./libofa-0.9.3-gcc-4.3.patch ./gcc-4.x.patch ];
+
+  src = fetchurl {
+    url = "http://musicip-libofa.googlecode.com/files/${name}.tar.gz";
+    sha256 = "184ham039l7lwhfgg0xr2vch2xnw1lwh7sid432mh879adhlc5h2";
+  };
+}
diff --git a/pkgs/development/libraries/libofa/gcc-4.x.patch b/pkgs/development/libraries/libofa/gcc-4.x.patch
new file mode 100644
index 00000000000..50f72bb428c
--- /dev/null
+++ b/pkgs/development/libraries/libofa/gcc-4.x.patch
@@ -0,0 +1,12 @@
+diff --git a/examples/example.cpp b/examples/example.cpp
+index ef978d5..7d58a0f 100644
+--- a/examples/example.cpp
++++ b/examples/example.cpp
+@@ -10,6 +10,7 @@
+ #include "protocol.h"
+ 
+ #include <string.h>
++#include <stdio.h>
+  
+ AudioData* loadWaveFile(char *file);
+ AudioData* loadDataUsingLAME(char *file);
diff --git a/pkgs/development/libraries/libofa/libofa-0.9.3-gcc-4.3.patch b/pkgs/development/libraries/libofa/libofa-0.9.3-gcc-4.3.patch
new file mode 100644
index 00000000000..7682e371051
--- /dev/null
+++ b/pkgs/development/libraries/libofa/libofa-0.9.3-gcc-4.3.patch
@@ -0,0 +1,36 @@
+Fix build with gcc >=4.3
+diff -ur libofa-0.9.3.orig/examples/example.cpp libofa-0.9.3/examples/example.cpp
+--- libofa-0.9.3.orig/examples/example.cpp	2006-05-10 21:05:37.000000000 +0300
++++ libofa-0.9.3/examples/example.cpp	2008-04-16 15:51:49.000000000 +0300
+@@ -9,6 +9,8 @@
+ 
+ #include "protocol.h"
+ 
++#include <string.h>
++ 
+ AudioData* loadWaveFile(char *file);
+ AudioData* loadDataUsingLAME(char *file);
+ 
+Vain hakemistossa libofa-0.9.3/examples: example.cpp.orig
+diff -ur libofa-0.9.3.orig/examples/protocol.cpp libofa-0.9.3/examples/protocol.cpp
+--- libofa-0.9.3.orig/examples/protocol.cpp	2006-05-10 21:05:42.000000000 +0300
++++ libofa-0.9.3/examples/protocol.cpp	2008-04-16 15:51:49.000000000 +0300
+@@ -8,6 +8,7 @@
+ -------------------------------------------------------------------*/
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <cstring>
+ #include <string>
+ #include <map>
+ #include <expat.h>
+diff -ur libofa-0.9.3.orig/lib/signal_op.cpp libofa-0.9.3/lib/signal_op.cpp
+--- libofa-0.9.3.orig/lib/signal_op.cpp	2006-05-10 21:01:12.000000000 +0300
++++ libofa-0.9.3/lib/signal_op.cpp	2008-04-16 15:51:49.000000000 +0300
+@@ -12,6 +12,7 @@
+ // DATE CREATED: 1/12/06
+ 
+ 
++#include <cstdlib>
+ #include <math.h>
+ #include "signal_op.h"
+ #include "AFLIB/aflibConverter.h"
diff --git a/pkgs/development/libraries/libofa/libofa-0.9.3-gcc-4.patch b/pkgs/development/libraries/libofa/libofa-0.9.3-gcc-4.patch
new file mode 100644
index 00000000000..920c383c657
--- /dev/null
+++ b/pkgs/development/libraries/libofa/libofa-0.9.3-gcc-4.patch
@@ -0,0 +1,39 @@
+--- a/lib/JAMA/tnt_math_utils.h	2006-06-17 01:46:22.000000000 +0300
++++ b/lib/JAMA/tnt_math_utils.h	2006-06-17 01:47:02.000000000 +0300
+@@ -20,11 +20,20 @@
+ namespace TNT
+ {
+ /**
++	@returns the absolute value of a real (no-complex) scalar.
++*/
++template <class Real>
++Real abs(const Real &a)
++{
++	return  (a > 0 ? a : -a);
++}
++/**
+ 	@returns hypotenuse of real (non-complex) scalars a and b by 
+ 	avoiding underflow/overflow
+ 	using (a * sqrt( 1 + (b/a) * (b/a))), rather than
+ 	sqrt(a*a + b*b).
+ */
++
+ template <class Real>
+ Real hypot(const Real &a, const Real &b)
+ {
+@@ -56,15 +65,6 @@
+ }
+ */
+ 
+-/**
+-	@returns the absolute value of a real (no-complex) scalar.
+-*/
+-template <class Real>
+-Real abs(const Real &a)
+-{
+-	return  (a > 0 ? a : -a);
+-}
+-
+ }
+ #endif
+ /* MATH_UTILS_H */
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3373cd4e781..551812977b4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3309,6 +3309,8 @@ let
 
   libnova = callPackage ../development/libraries/libnova { };
 
+  libofa = callPackage ../development/libraries/libofa { };
+
   libofx = callPackage ../development/libraries/libofx { };
 
   libogg = callPackage ../development/libraries/libogg { };

From 163e453e10e0dccc7b4296caeb2d36ddb695a8b1 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 14 Sep 2010 14:29:31 +0000
Subject: [PATCH 148/181] Add mp4v2

svn path=/nixpkgs/trunk/; revision=23795
---
 pkgs/development/libraries/mp4v2/default.nix | 11 +++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 13 insertions(+)
 create mode 100644 pkgs/development/libraries/mp4v2/default.nix

diff --git a/pkgs/development/libraries/mp4v2/default.nix b/pkgs/development/libraries/mp4v2/default.nix
new file mode 100644
index 00000000000..8376762ed76
--- /dev/null
+++ b/pkgs/development/libraries/mp4v2/default.nix
@@ -0,0 +1,11 @@
+{ stdenv, fetchurl, help2man }:
+
+stdenv.mkDerivation rec {
+  name = "mp4v2-1.9.1";
+
+  buildInputs = [ help2man ];
+  src = fetchurl {
+    url = "http://mp4v2.googlecode.com/files/${name}.tar.bz2";
+    sha256 = "1d73qbi0faqad3bpmjfr4kk0mfmqpl1f43ysrx4gq9i3mfp1qf2w";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 551812977b4..9504bc1eaf6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3493,6 +3493,8 @@ let
 
   msilbc = callPackage ../development/libraries/msilbc { };
 
+  mp4v2 = callPackage ../development/libraries/mp4v2 { };
+
   mpc = callPackage ../development/libraries/mpc { };
 
   mpich2 = callPackage ../development/libraries/mpich2 { };

From 2ecfb5cd9d6de54f3b27ef81b2fa03f1f7fc413a Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 14 Sep 2010 14:29:37 +0000
Subject: [PATCH 149/181] Add libtunepimp

svn path=/nixpkgs/trunk/; revision=23796
---
 .../libraries/libtunepimp/default.nix         |  16 ++
 .../libraries/libtunepimp/gcc-4.x.patch       | 177 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 3 files changed, 195 insertions(+)
 create mode 100644 pkgs/development/libraries/libtunepimp/default.nix
 create mode 100644 pkgs/development/libraries/libtunepimp/gcc-4.x.patch

diff --git a/pkgs/development/libraries/libtunepimp/default.nix b/pkgs/development/libraries/libtunepimp/default.nix
new file mode 100644
index 00000000000..e1279a56667
--- /dev/null
+++ b/pkgs/development/libraries/libtunepimp/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl, zlib, expat, curl, libmusicbrainz2, taglib, libmpcdec,
+  libmad, libogg, libvorbis, flac, mp4v2, libofa, libtool }:
+
+stdenv.mkDerivation rec {
+  name = "libtunepimp-0.5.3";
+
+  propagatedBuildInputs = [ zlib expat curl libmusicbrainz2 taglib libmpcdec
+    libmad libogg libvorbis flac libofa libtool ];
+
+  patches = [ ./gcc-4.x.patch ];
+
+  src = fetchurl {
+    url = "ftp://ftp.musicbrainz.org/pub/musicbrainz/${name}.tar.gz";
+    sha256 = "0s141zmsxv8xlivcgcmy6xhk9cyjjxmr1fy45xiqfqrqpsh485rl";
+  };
+}
diff --git a/pkgs/development/libraries/libtunepimp/gcc-4.x.patch b/pkgs/development/libraries/libtunepimp/gcc-4.x.patch
new file mode 100644
index 00000000000..92219ea6f9b
--- /dev/null
+++ b/pkgs/development/libraries/libtunepimp/gcc-4.x.patch
@@ -0,0 +1,177 @@
+diff --git a/include/tunepimp-0.5/metadata.h b/include/tunepimp-0.5/metadata.h
+index f9bab5d..ea08cf5 100644
+--- a/include/tunepimp-0.5/metadata.h
++++ b/include/tunepimp-0.5/metadata.h
+@@ -29,6 +29,7 @@
+ 
+ #include <string>
+ #include <cstdio>
++#include <cstring>
+ 
+ #include "defs.h"
+ #include "tp_c.h"
+diff --git a/lib/c_wrapper.cpp b/lib/c_wrapper.cpp
+index 760cc08..66c6111 100644
+--- a/lib/c_wrapper.cpp
++++ b/lib/c_wrapper.cpp
+@@ -43,6 +43,7 @@
+                          if (obj == NULL) return;
+ 
+ #include <deque>
++#include <cstdlib>
+ 
+ class NotifyData
+ {
+diff --git a/lib/fileio.cpp b/lib/fileio.cpp
+index a1602da..abe2b24 100644
+--- a/lib/fileio.cpp
++++ b/lib/fileio.cpp
+@@ -27,6 +27,8 @@
+ 
+ #include <assert.h>
+ #include <errno.h>
++#include <string.h>
++#include <stdlib.h>
+ #include <string>
+ #ifndef WIN32
+ #include <unistd.h>
+@@ -122,7 +124,8 @@ int taccess(const char *pathname, int mode, const char *encoding)
+ 
+ void tmktempname(const char *path, char *newPath, int newPathLen)
+ {
+-    char *ptr, *temp;
++    char *temp;
++	const char *ptr;
+ 
+     temp = (char *)malloc(strlen(path) + 32);
+     ptr = strrchr(path, dirSepChar);
+diff --git a/lib/metadata.cpp b/lib/metadata.cpp
+index 0a1a70a..dcd0aa1 100644
+--- a/lib/metadata.cpp
++++ b/lib/metadata.cpp
+@@ -24,8 +24,9 @@
+    $Id: metadata.cpp 8359 2006-08-07 20:34:50Z luks $
+ 
+ ----------------------------------------------------------------------------*/
+-#include <math.h>
+-#include <stdio.h>
++#include <cmath>
++#include <cstdio>
++#include <cstdlib>
+ #include "metadata.h"
+ #include "../config.h"
+ using namespace std;
+diff --git a/lib/protocol.cpp b/lib/protocol.cpp
+index 83e8b33..3436f80 100644
+--- a/lib/protocol.cpp
++++ b/lib/protocol.cpp
+@@ -8,6 +8,7 @@
+ -------------------------------------------------------------------*/
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <string>
+ #include <map>
+ #include <expat.h>
+diff --git a/lib/readmeta.cpp b/lib/readmeta.cpp
+index 7f325de..5e5513a 100644
+--- a/lib/readmeta.cpp
++++ b/lib/readmeta.cpp
+@@ -30,7 +30,8 @@
+ #endif
+ #endif
+ 
+-#include <stdio.h>
++#include <cstdio>
++#include <cstdlib>
+ #ifndef WIN32
+ #include <unistd.h>
+ #endif
+diff --git a/lib/tunepimp.cpp b/lib/tunepimp.cpp
+index bf09383..f1b9b56 100644
+--- a/lib/tunepimp.cpp
++++ b/lib/tunepimp.cpp
+@@ -30,7 +30,8 @@
+ #endif
+ #endif
+ 
+-#include <stdio.h>
++#include <cstdio>
++#include <cstdlib>
+ #include <map>
+ using namespace std;
+ 
+diff --git a/lib/utf8/utf8util.cpp b/lib/utf8/utf8util.cpp
+index a066956..6ea86e4 100644
+--- a/lib/utf8/utf8util.cpp
++++ b/lib/utf8/utf8util.cpp
+@@ -26,6 +26,7 @@
+ ----------------------------------------------------------------------------*/
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "utf8util.h"
+ #include "utf8.h"
+ #ifdef WIN32
+diff --git a/plugins/mp3/id3_2_3_meta.cpp b/plugins/mp3/id3_2_3_meta.cpp
+index fa9a7e0..efac1c9 100644
+--- a/plugins/mp3/id3_2_3_meta.cpp
++++ b/plugins/mp3/id3_2_3_meta.cpp
+@@ -26,6 +26,7 @@
+ ----------------------------------------------------------------------------*/
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <assert.h>
+ #include <ctype.h>
+ #include <musicbrainz/mb_c.h>
+diff --git a/plugins/mp3/id3_meta.cpp b/plugins/mp3/id3_meta.cpp
+index d860bf6..804ca5c 100644
+--- a/plugins/mp3/id3_meta.cpp
++++ b/plugins/mp3/id3_meta.cpp
+@@ -26,6 +26,7 @@
+ ----------------------------------------------------------------------------*/
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <time.h>
+ #include <ctype.h>
+ #include <musicbrainz/mb_c.h>
+diff --git a/plugins/mp4/mp4.cpp b/plugins/mp4/mp4.cpp
+index 9f741e3..dcc7ec9 100644
+--- a/plugins/mp4/mp4.cpp
++++ b/plugins/mp4/mp4.cpp
+@@ -27,7 +27,8 @@
+ 
+ #include <string.h>
+ #include <stdio.h>
+-#include <mp4.h>
++#include <stdlib.h>
++#include <mp4v2/mp4v2.h>
+ #include "metadata.h"
+ #include "plugin.h"
+ #ifndef WIN32
+diff --git a/plugins/wma/wma.cpp b/plugins/wma/wma.cpp
+index 3d7a50a..a28901c 100644
+--- a/plugins/wma/wma.cpp
++++ b/plugins/wma/wma.cpp
+@@ -27,6 +27,7 @@
+ 
+ #include <string.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <wmafile.h>
+ #include "metadata.h"
+ #include "plugin.h"
+diff --git a/plugins/wma/wmafile.cpp b/plugins/wma/wmafile.cpp
+index 1b38af8..31fa150 100644
+--- a/plugins/wma/wmafile.cpp
++++ b/plugins/wma/wmafile.cpp
+@@ -19,6 +19,7 @@
+  *   USA                                                                   *
+  ***************************************************************************/
+ 
++#include <string.h>
+ #include <tstring.h>
+ #include <wmafile.h>
+ #include <wmatag.h>
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9504bc1eaf6..ec327360b43 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3362,6 +3362,8 @@ let
 
   libtommath = callPackage ../development/libraries/libtommath { };
 
+  libtunepimp = callPackage ../development/libraries/libtunepimp { };
+
   libgeotiff = callPackage ../development/libraries/libgeotiff { };
 
   libunistring = callPackage ../development/libraries/libunistring { };

From 647ccb48ad17ae1f1289c4613b134740deaac13d Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 14 Sep 2010 14:29:43 +0000
Subject: [PATCH 150/181] Forgotten to add patch to patches array

svn path=/nixpkgs/trunk/; revision=23797
---
 pkgs/development/libraries/libmusicbrainz/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libmusicbrainz/default.nix b/pkgs/development/libraries/libmusicbrainz/default.nix
index f39a3793eec..707f3655f89 100644
--- a/pkgs/development/libraries/libmusicbrainz/default.nix
+++ b/pkgs/development/libraries/libmusicbrainz/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ cmake neon libdiscid ];
 
-  patches = [ ./find-neon.patch ];
+  patches = [ ./find-neon.patch ./missing-include.patch ];
 
   src = fetchurl {
     url = "ftp://ftp.musicbrainz.org/pub/musicbrainz/${name}.tar.gz";

From ecc9b176b0ba16439c8cf29ca13c47ddda72b88c Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 14 Sep 2010 14:29:49 +0000
Subject: [PATCH 151/181] kdemultimedia: tunepimp, musicbrainz

svn path=/nixpkgs/trunk/; revision=23798
---
 pkgs/desktops/kde-4.5/kde-package/manifest.nix | 5 ++++-
 pkgs/desktops/kde-4.5/multimedia/default.nix   | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/kde-4.5/kde-package/manifest.nix b/pkgs/desktops/kde-4.5/kde-package/manifest.nix
index 23a210e6941..d67ba2fde72 100644
--- a/pkgs/desktops/kde-4.5/kde-package/manifest.nix
+++ b/pkgs/desktops/kde-4.5/kde-package/manifest.nix
@@ -156,4 +156,7 @@ builtins.listToAttrs
   name = "kdegraphics-4.5.1.tar.bz2";
   value = "0z0fqqb868ywvdxvd94vp15drkizh59m4arblsx9cj19d157nbwd";
 }
-]
+{
+  name = "kdemultimedia-4.5.1.tar.bz2";
+  value = "1a5rgvznvykislif7igsb3b6xwps2g8s5ifkfj8dbkdvsmavlmjf";
+}]
diff --git a/pkgs/desktops/kde-4.5/multimedia/default.nix b/pkgs/desktops/kde-4.5/multimedia/default.nix
index 888dc3812de..f18839f6d51 100644
--- a/pkgs/desktops/kde-4.5/multimedia/default.nix
+++ b/pkgs/desktops/kde-4.5/multimedia/default.nix
@@ -1,10 +1,10 @@
 { kde, cmake, perl, qt4, alsaLib, libvorbis, xineLib, taglib, flac,
-cdparanoia, lame , kdelibs, automoc4, ffmpeg}:
+cdparanoia, lame , kdelibs, automoc4, ffmpeg, libmusicbrainz2, libtunepimp }:
 
 kde.package {
 
   buildInputs = [ cmake perl qt4 alsaLib libvorbis xineLib flac taglib
-    cdparanoia lame kdelibs automoc4 ffmpeg ];
+    cdparanoia lame kdelibs automoc4 ffmpeg libmusicbrainz2 libtunepimp ];
 
   meta = {
     description = "KDE Multimedia";
@@ -14,7 +14,7 @@ kde.package {
     license = "GPL";
     kde = {
       name = "kdemultimedia";
-      version = "4.5.0";
+      version = "4.5.1";
     };
   };
 }

From 7471ffb76d6c29814ff109adf92c931d7e075509 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 14 Sep 2010 14:47:12 +0000
Subject: [PATCH 152/181] Fixing the plugin directory for the jdk6 i686-linux

svn path=/nixpkgs/trunk/; revision=23799
---
 pkgs/development/compilers/jdk/jdk6-linux.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/jdk/jdk6-linux.nix b/pkgs/development/compilers/jdk/jdk6-linux.nix
index ddada14008b..e61affa5e86 100644
--- a/pkgs/development/compilers/jdk/jdk6-linux.nix
+++ b/pkgs/development/compilers/jdk/jdk6-linux.nix
@@ -72,7 +72,7 @@ stdenv.mkDerivation ({
   ( if stdenv.system == "i686-linux" then
       {
         mozillaPlugin =
-         if installjdk then "/jre/plugin/i386/ns7" else "/plugin/i386/ns7";
+         if installjdk then "/jre/lib/i386" else "/lib/i386";
       }
     else
       {}

From 76a02e762a6c5119835926abf93fcc8829d22fc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 14 Sep 2010 14:47:16 +0000
Subject: [PATCH 153/181] Allowing boost build enabling parallelBuilds

svn path=/nixpkgs/trunk/; revision=23800
---
 pkgs/development/libraries/boost/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/boost/default.nix b/pkgs/development/libraries/boost/default.nix
index fdccb83dd97..026ca1e356d 100644
--- a/pkgs/development/libraries/boost/default.nix
+++ b/pkgs/development/libraries/boost/default.nix
@@ -48,6 +48,8 @@ stdenv.mkDerivation {
     sha256 = "1nvq36mvzr1fr85q0jh86rk3bk65s1y55jgqgzfg3lcpkl12ihs5";
   };
 
+  enableParallelBuilding = true;
+
   buildInputs = [icu expat zlib bzip2 python];
 
   configureScript = "./bootstrap.sh";

From d0b42b29270889ffea7a28908f7a5377735260eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 14 Sep 2010 15:14:18 +0000
Subject: [PATCH 154/181] Making the firefox java plugin work in i686-linux and
 x86_64-linux.

It should work for both firefox 3.6 and firefox 3.5 (said roconnor on irc).

Thanks to the wiki page http://wiki.nixos.org/wiki/Java_in_Firefox which explained
why what we had did not work.

svn path=/nixpkgs/trunk/; revision=23801
---
 .../compilers/jdk/dlj-bundle-builder.sh       |  3 ++
 pkgs/development/compilers/jdk/jdk6-linux.nix | 48 ++++++++-----------
 2 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/pkgs/development/compilers/jdk/dlj-bundle-builder.sh b/pkgs/development/compilers/jdk/dlj-bundle-builder.sh
index c08a5237f51..ee58ce9127c 100644
--- a/pkgs/development/compilers/jdk/dlj-bundle-builder.sh
+++ b/pkgs/development/compilers/jdk/dlj-bundle-builder.sh
@@ -50,5 +50,8 @@ if test -z "$pluginSupport"; then
     rm -f $out/bin/javaws
 fi
 
+mkdir $jrePath/lib/$architecture/plugins
+ln -s $jrePath/lib/$architecture/libnpjp2.so $jrePath/lib/$architecture/plugins
+
 # Workaround for assertions in xlib, see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6532373.
 substituteInPlace $jrePath/lib/*/xawt/libmawt.so --replace XINERAMA FAKEEXTN
diff --git a/pkgs/development/compilers/jdk/jdk6-linux.nix b/pkgs/development/compilers/jdk/jdk6-linux.nix
index e61affa5e86..8a11e85ed98 100644
--- a/pkgs/development/compilers/jdk/jdk6-linux.nix
+++ b/pkgs/development/compilers/jdk/jdk6-linux.nix
@@ -11,7 +11,22 @@
 assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
 assert swingSupport -> xlibs != null;
 
-stdenv.mkDerivation ({
+let
+
+  /**
+   * The JRE libraries are in directories that depend on the CPU.
+   */
+  architecture =
+    if stdenv.system == "i686-linux" then
+      "i386"
+    else if stdenv.system == "x86_64-linux" then
+      "amd64"
+    else
+      abort "jdk requires i686-linux or x86_64 linux";
+
+in
+
+stdenv.mkDerivation {
   name =
     if installjdk then "jdk-1.6.0_20" else "jre-1.6.0_20";
 
@@ -39,17 +54,6 @@ stdenv.mkDerivation ({
   construct = ./jdk6-construct.sh;
   inherit installjdk;
 
-  /**
-   * The JRE libraries are in directories that depend on the CPU.
-   */
-  architecture =
-    if stdenv.system == "i686-linux" then
-      "i386"
-    else if stdenv.system == "x86_64-linux" then
-      "amd64"
-    else
-      abort "jdk requires i686-linux or x86_64 linux";
-
   buildInputs = [unzip makeWrapper];
   
   /**
@@ -59,22 +63,8 @@ stdenv.mkDerivation ({
     [stdenv.gcc.libc] ++
     (if swingSupport then [xlibs.libX11 xlibs.libXext xlibs.libXtst xlibs.libXi xlibs.libXp xlibs.libXt] else []);
 
-  inherit swingSupport pluginSupport;
+  inherit swingSupport pluginSupport architecture;
   inherit (xlibs) libX11;
 
-} // 
-  /**
-   * comment: there is a plugin for amd64 since 0_13. However it's located in 
-   * JRE_STORE_PATH/lib/amd64/libnpjp2.so. I don't know yet how to add it to
-   * MOZ_PLUGIN_PATH so that it's found. Put a symlink into ~/.mozilla/plugins
-   * instead.
-   */
-  ( if stdenv.system == "i686-linux" then
-      {
-        mozillaPlugin =
-         if installjdk then "/jre/lib/i386" else "/lib/i386";
-      }
-    else
-      {}
-  )
-)
+  mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins";
+}

From 11a446272aa7a24a4315d5e62e5e6f47be99d49c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 14 Sep 2010 16:39:42 +0000
Subject: [PATCH 155/181] GNU IceCat 3.6.9.

svn path=/nixpkgs/trunk/; revision=23802
---
 pkgs/applications/networking/browsers/icecat-3/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/icecat-3/default.nix b/pkgs/applications/networking/browsers/icecat-3/default.nix
index fbaf893701e..6be0ce4b4f3 100644
--- a/pkgs/applications/networking/browsers/icecat-3/default.nix
+++ b/pkgs/applications/networking/browsers/icecat-3/default.nix
@@ -9,13 +9,13 @@
 # http://thread.gmane.org/gmane.comp.gnu.gnuzilla/1376 .
 #assert stdenv.isLinux -> (wirelesstools != null);
 
-let version = "3.6.7"; in
+let version = "3.6.9"; in
 stdenv.mkDerivation {
   name = "icecat-${version}";
 
   src = fetchurl {
     url = "mirror://gnu/gnuzilla/${version}/icecat-${version}.tar.xz";
-    sha256 = "0nm0py3kd55pgyx1yv44v1acq5d1rgka3p6msfbgqx60yd38rwsm";
+    sha256 = "041rdhhcaak0w0lg0wd1fdl9vlk9a466sh6y17dfz389nswyy8wr";
   };
 
   buildInputs =
@@ -88,6 +88,8 @@ stdenv.mkDerivation {
     ln -s ../../../icons/default.xpm  "$out/lib/$libDir/chrome/icons/default/"
   '';
 
+  enableParallelBuilding = true;
+
   meta = {
     description = "GNU IceCat, a free web browser based on Mozilla Firefox";
 

From 8ab6f9861c56415c0fc04aa060e074a77ff2b8c7 Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Tue, 14 Sep 2010 21:15:58 +0000
Subject: [PATCH 156/181] Add coq-8.3rc1

Note: In this version we introduce a new schema for the name of the coq
derivations where the coq version is included in the name (i.e.,
"coq8.3-8.3pre1" instead of "coq-8.3pre1").  The reason for this is that often
coq releases introduce several incompatibilities.  Thus I argue that, in
general, users do not want nix-env to upgrade automatically form one release to
another.  Also version string "8.3pre1" is used instead of "8.3-rc1" to trigger
the nix mechanism for versions comparison.


svn path=/nixpkgs/trunk/; revision=23803
---
 .../applications/science/logic/coq/8.3rc1.nix | 53 +++++++++++++++++++
 .../logic/coq/coq-8.3-rc1_configure.patch     | 20 +++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 3 files changed, 77 insertions(+)
 create mode 100644 pkgs/applications/science/logic/coq/8.3rc1.nix
 create mode 100644 pkgs/applications/science/logic/coq/coq-8.3-rc1_configure.patch

diff --git a/pkgs/applications/science/logic/coq/8.3rc1.nix b/pkgs/applications/science/logic/coq/8.3rc1.nix
new file mode 100644
index 00000000000..4a549e5e93e
--- /dev/null
+++ b/pkgs/applications/science/logic/coq/8.3rc1.nix
@@ -0,0 +1,53 @@
+# TODO:
+# - coqide compilation should be optional or (better) separate;
+# - coqide libraries are not installed;
+
+{stdenv, fetchurl, ocaml, camlp5, lablgtk, ncurses}:
+
+stdenv.mkDerivation {
+  name = "coq8.3-8.3pre1";
+
+  src = fetchurl {
+    url = http://coq.inria.fr/distrib/V8.3-rc1/files/coq-8.3-rc1.tar.gz;
+    sha256 = "0r43dqr7nzjfkxlz4963sj18gvjni6x3lhrlgh4l8k0cjspi62sj";
+  };
+
+  buildInputs = [ ocaml camlp5 ncurses lablgtk ];
+
+  patches = [ ./coq-8.3-rc1_configure.patch ];
+
+  postPatch = ''
+    substituteInPlace scripts/coqmktop.ml --replace \
+      "\"-I\"; \"+lablgtk2\"" \
+      "\"-I\"; \"${lablgtk}/lib/ocaml/lablgtk2\"; \"-I\"; \"${lablgtk}/lib/ocaml/stublibs\""
+  '';
+
+  prefixKey = "-prefix ";
+
+  preConfigure = ''
+    ARCH=`uname -s`
+    CAMLDIR=`type -p ocamlc`
+  '';
+
+  configureFlags =
+    "-arch $ARCH " +
+    "-camldir $CAMLDIR " +
+    "-camldir ${ocaml}/bin " +
+    "-camlp5dir ${camlp5}/lib/ocaml/camlp5 " +
+    "-lablgtkdir ${lablgtk}/lib/ocaml/lablgtk2 " +
+    "-opt -coqide opt";
+
+  buildFlags = "world"; # Debug with "world VERBOSE=1";
+
+  meta = {
+    description = "Coq proof assistant";
+    longDescription = ''
+      Coq is a formal proof management system.  It provides a formal language
+      to write mathematical definitions, executable algorithms and theorems
+      together with an environment for semi-interactive development of
+      machine-checked proofs.
+    '';
+    homepage = "http://coq.inria.fr";
+    license = "LGPL";
+  };
+}
diff --git a/pkgs/applications/science/logic/coq/coq-8.3-rc1_configure.patch b/pkgs/applications/science/logic/coq/coq-8.3-rc1_configure.patch
new file mode 100644
index 00000000000..9ae5d2d688a
--- /dev/null
+++ b/pkgs/applications/science/logic/coq/coq-8.3-rc1_configure.patch
@@ -0,0 +1,20 @@
+diff -Nuar coq-8.3-rc1/configure coq-8.3-rc1.nixos/configure
+--- coq-8.3-rc1/configure	2010-08-06 10:36:16.000000000 +0200
++++ coq-8.3-rc1.nixos/configure	2010-09-14 20:30:02.000000000 +0200
+@@ -399,7 +399,6 @@
+ 	 ocamlyaccexec=$CAMLBIN/ocamlyacc
+ 	 ocamlmktopexec=$CAMLBIN/ocamlmktop
+ 	 ocamlmklibexec=$CAMLBIN/ocamlmklib
+-	 camlp4oexec=$CAMLBIN/camlp4o
+ esac
+ 
+ if test ! -f "$CAMLC" ; then
+@@ -647,7 +646,7 @@
+             no)  LABLGTKLIB=+lablgtk2                   # Pour le message
+                  LABLGTKINCLUDES="-I $LABLGTKLIB";;     # Pour le makefile
+             yes) LABLGTKLIB="$lablgtkdir"               # Pour le message
+-                 LABLGTKINCLUDES="-I \"$LABLGTKLIB\"";; # Pour le makefile
++                 LABLGTKINCLUDES="-I $LABLGTKLIB";; # Pour le makefile
+         esac;;
+     no) LABLGTKINCLUDES="";;
+ esac
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ec327360b43..ff6959e4b79 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6671,6 +6671,10 @@ let
     camlp5 = camlp5_transitional;
   };
 
+  coq8_3 = callPackage ../applications/science/logic/coq/8.3rc1.nix {
+    camlp5 = camlp5_transitional;
+  };
+
   coq_beta = callPackage ../applications/science/logic/coq/beta.nix {
     camlp5 = camlp5_transitional;
   };

From f0418c74b6378cba59b91b484e59d245fc74ed6f Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 15 Sep 2010 05:19:35 +0000
Subject: [PATCH 157/181] kdegames-4.5.1

svn path=/nixpkgs/trunk/; revision=23804
---
 pkgs/desktops/kde-4.5/games/default.nix        | 2 +-
 pkgs/desktops/kde-4.5/kde-package/manifest.nix | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/kde-4.5/games/default.nix b/pkgs/desktops/kde-4.5/games/default.nix
index a770612c478..88d5e1ce33b 100644
--- a/pkgs/desktops/kde-4.5/games/default.nix
+++ b/pkgs/desktops/kde-4.5/games/default.nix
@@ -16,7 +16,7 @@ kde.package {
     license = "GPL";
     kde = {
       name = "kdegames";
-      version = "4.5.0";
+      version = "4.5.1";
     };
   };
 }
diff --git a/pkgs/desktops/kde-4.5/kde-package/manifest.nix b/pkgs/desktops/kde-4.5/kde-package/manifest.nix
index d67ba2fde72..be95d24cf2d 100644
--- a/pkgs/desktops/kde-4.5/kde-package/manifest.nix
+++ b/pkgs/desktops/kde-4.5/kde-package/manifest.nix
@@ -159,4 +159,9 @@ builtins.listToAttrs
 {
   name = "kdemultimedia-4.5.1.tar.bz2";
   value = "1a5rgvznvykislif7igsb3b6xwps2g8s5ifkfj8dbkdvsmavlmjf";
-}]
+}
+{
+  name = "kdegames-4.5.1.tar.bz2";
+  value = "1d158z2hqc7i7mh43ajhmsqixdazhjm7pxs6rjala0fcgmqk1lj1";
+}
+]

From dd37d34e5f20355dc7178f32ecb15ab2f11c7f9b Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 15 Sep 2010 05:19:44 +0000
Subject: [PATCH 158/181] kdeadmin-4.5.1, kdeplasma-addons-4.5.1. Have no time
 to split

svn path=/nixpkgs/trunk/; revision=23805
---
 pkgs/desktops/kde-4.5/admin/default.nix         | 4 +++-
 pkgs/desktops/kde-4.5/kde-package/manifest.nix  | 8 ++++++++
 pkgs/desktops/kde-4.5/plasma-addons/default.nix | 5 ++++-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/kde-4.5/admin/default.nix b/pkgs/desktops/kde-4.5/admin/default.nix
index cd360e4dab1..e758c3e2eae 100644
--- a/pkgs/desktops/kde-4.5/admin/default.nix
+++ b/pkgs/desktops/kde-4.5/admin/default.nix
@@ -8,6 +8,8 @@ kde.package {
 
   inherit system_config_printer;
 
+  # TODO: split, check which packages work on nixos
+
   PYTHONPATH = "${pycups}/lib/python${python.majorVersion}/site-packages";
 
   buildInputs = [ cmake qt4 pkgconfig perl python sip pyqt4 pycups rhpl system_config_printer
@@ -18,7 +20,7 @@ kde.package {
     license = "GPL";
     kde = {
       name = "kdeadmin";
-      version = "4.5.0";
+      version = "4.5.1";
     };
   };
 }
diff --git a/pkgs/desktops/kde-4.5/kde-package/manifest.nix b/pkgs/desktops/kde-4.5/kde-package/manifest.nix
index be95d24cf2d..edb8c8b77ee 100644
--- a/pkgs/desktops/kde-4.5/kde-package/manifest.nix
+++ b/pkgs/desktops/kde-4.5/kde-package/manifest.nix
@@ -164,4 +164,12 @@ builtins.listToAttrs
   name = "kdegames-4.5.1.tar.bz2";
   value = "1d158z2hqc7i7mh43ajhmsqixdazhjm7pxs6rjala0fcgmqk1lj1";
 }
+{
+  name = "kdeplasma-addons-4.5.1.tar.bz2";
+  value = "17mjk2qdfgcz2l9f00q08dzxkqib8li5bjxawsb7fwzj93jc7lp5";
+}
+{
+  name = "kdeadmin-4.5.1.tar.bz2";
+  value = "011ajsma8s9ay0dsjx383jn8yynkyshlzx6gjw68caxzjhpc0ib2";
+}
 ]
diff --git a/pkgs/desktops/kde-4.5/plasma-addons/default.nix b/pkgs/desktops/kde-4.5/plasma-addons/default.nix
index 494fd0aa764..cb3dbdf2cc7 100644
--- a/pkgs/desktops/kde-4.5/plasma-addons/default.nix
+++ b/pkgs/desktops/kde-4.5/plasma-addons/default.nix
@@ -5,6 +5,9 @@
 
 kde.package {
 
+  preConfigure =
+    "cp -v ${kdeedu}/share/apps/cmake/modules/FindMarble.cmake cmake";
+
   buildInputs = [ cmake qt4 perl automoc4 kdelibs boost eigen kdebase_workspace
     attica python qca2 qimageblitz shared_mime_info kdepimlibs kdegraphics
     libqalculate soprano libXtst kdeedu ];
@@ -14,7 +17,7 @@ kde.package {
     license = "GPL";
     kde = {
       name = "kdeplasma-addons";
-      version = "4.5.0";
+      version = "4.5.1";
     };
   };
 }

From 6babe5dea4135ee9cca45b2f0c3e8bd422a89c29 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 15 Sep 2010 08:42:46 +0000
Subject: [PATCH 159/181] Update Veracity

svn path=/nixpkgs/trunk/; revision=23806
---
 .../version-management/veracity/src-for-default.nix       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/veracity/src-for-default.nix b/pkgs/applications/version-management/veracity/src-for-default.nix
index 61cec35e7bc..fcf12cac94e 100644
--- a/pkgs/applications/version-management/veracity/src-for-default.nix
+++ b/pkgs/applications/version-management/veracity/src-for-default.nix
@@ -1,9 +1,9 @@
 rec {
-   version="0.3.1.10285";
-   name="veracity-0.3.1.10285";
-   hash="1r13wsnzfd35cq045kgx6is2j83snh1pny4dapirsjs9awlr4shf";
+   version="0.3.1.10286";
+   name="veracity-0.3.1.10286";
+   hash="0cihzf2m4bxwf8z1va550q8yqpjwc2rs013rx0q8azl0idx0akah";
    url="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-${version}.tar.gz";
-   advertisedUrl="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-0.3.1.10285.tar.gz";
+   advertisedUrl="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-0.3.1.10286.tar.gz";
   
   
 }

From e6a787f44a39a49dae8a0d399c26fcb64501dd59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 15 Sep 2010 09:56:06 +0000
Subject: [PATCH 160/181] Making lua and boost cross-build.

svn path=/nixpkgs/trunk/; revision=23807
---
 .../interpreters/lua-5/default.nix            |  9 +++++++++
 pkgs/development/libraries/boost/default.nix  | 19 +++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix
index 160f2827003..19a5599347f 100644
--- a/pkgs/development/interpreters/lua-5/default.nix
+++ b/pkgs/development/interpreters/lua-5/default.nix
@@ -23,6 +23,15 @@ stdenv.mkDerivation {
   '';
   buildInputs = [ ncurses readline ];
 
+  crossAttrs = {
+    preBuild = ''
+      sed -i -e "s/ gcc/$crossConfig-gcc/" \
+        -e "s/ ar/$crossConfig-ar/" \
+        -e "s/ ranlib/$crossConfig-ranlib/" \
+        src/Makefile
+    '';
+  };
+
   meta = {
     homepage = "http://www.lua.org";
     description = "Lua is a powerful, fast, lightweight, embeddable scripting language.";
diff --git a/pkgs/development/libraries/boost/default.nix b/pkgs/development/libraries/boost/default.nix
index 026ca1e356d..c4b9f23bb23 100644
--- a/pkgs/development/libraries/boost/default.nix
+++ b/pkgs/development/libraries/boost/default.nix
@@ -58,4 +58,23 @@ stdenv.mkDerivation {
   buildPhase = "./bjam -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${finalLayout} variant=${variant} threading=${threading} link=${link} ${cflags} install";
 
   installPhase = ":";
+
+  crossAttrs = rec {
+    buildInputs = [ expat.hostDrv zlib.hostDrv bzip2.hostDrv ];
+    # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to
+    # override them.
+    propagatedBuildInputs = buildInputs;
+    # We want to substitute the contents of configureFlags, removing thus the
+    # usual --build and --host added on cross building.
+    preConfigure = ''
+      export configureFlags="--prefix=$out --without-icu"
+    '';
+    buildPhase = ''
+      set -x
+      cat << EOF > user-config.jam
+      using gcc : cross : $crossConfig-g++ ;
+      EOF
+      ./bjam -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.hostDrv}/include -sEXPAT_LIBPATH=${expat.hostDrv}/lib --layout=${finalLayout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install
+    '';
+  };
 }

From 10376e7ba1b3d55c539ac15e5ceb59b4912f4039 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 15 Sep 2010 12:57:49 +0000
Subject: [PATCH 161/181] More metadata

svn path=/nixpkgs/trunk/; revision=23808
---
 pkgs/development/libraries/libmusicbrainz/2.x.nix    | 11 +++++++++++
 .../development/libraries/libmusicbrainz/default.nix | 11 +++++++++++
 pkgs/development/libraries/libnice/default.nix       |  8 ++++++++
 pkgs/development/libraries/libofa/default.nix        |  8 ++++++++
 pkgs/development/libraries/libpcap/default.nix       |  5 +++++
 pkgs/development/libraries/mp4v2/default.nix         |  6 ++++++
 pkgs/development/libraries/muparser/default.nix      | 12 +++++++++---
 7 files changed, 58 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libmusicbrainz/2.x.nix b/pkgs/development/libraries/libmusicbrainz/2.x.nix
index 383cdf3291a..bff49dcf76f 100644
--- a/pkgs/development/libraries/libmusicbrainz/2.x.nix
+++ b/pkgs/development/libraries/libmusicbrainz/2.x.nix
@@ -13,4 +13,15 @@ stdenv.mkDerivation rec {
     url = "ftp://ftp.musicbrainz.org/pub/musicbrainz/${name}.tar.gz";
     sha256 = "183i4c109r5qx3mk4r986sx5xw4n5mdhdz4yz3rrv3s2xm5rqqn6";
   };
+
+  meta = {
+    homepage = http://musicbrainz.org/doc/libmusicbrainz;
+    description = "MusicBrainz Client Library (deprecated 2.x version)";
+    longDescription = ''
+      The libmusicbrainz (also known as mb_client or MusicBrainz Client
+      Library) is a development library geared towards developers who wish to
+      add MusicBrainz lookup capabilities to their applications.'';
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+    platforms = stdenv.lib.platforms.all;
+  };
 }
diff --git a/pkgs/development/libraries/libmusicbrainz/default.nix b/pkgs/development/libraries/libmusicbrainz/default.nix
index 707f3655f89..08bcd2ff4b1 100644
--- a/pkgs/development/libraries/libmusicbrainz/default.nix
+++ b/pkgs/development/libraries/libmusicbrainz/default.nix
@@ -11,4 +11,15 @@ stdenv.mkDerivation rec {
     url = "ftp://ftp.musicbrainz.org/pub/musicbrainz/${name}.tar.gz";
     sha256 = "1nhyl9kalvcn0r86y3kps6id84y3rc43226g67bssfb2h9b5x8xr";
   };
+
+  meta = {
+    homepage = http://musicbrainz.org/doc/libmusicbrainz;
+    description = "MusicBrainz Client Library (3.x version)";
+    longDescription = ''
+      The libmusicbrainz (also known as mb_client or MusicBrainz Client
+      Library) is a development library geared towards developers who wish to
+      add MusicBrainz lookup capabilities to their applications.'';
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+    platforms = stdenv.lib.platforms.all;
+  };
 }
diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix
index 58e59e7621f..1f3134b3cfb 100644
--- a/pkgs/development/libraries/libnice/default.nix
+++ b/pkgs/development/libraries/libnice/default.nix
@@ -12,5 +12,13 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = http://nice.freedesktop.org/wiki/;
+    description = "The GLib ICE implementation";
+    longDescription = ''
+      Libnice is an implementation of the IETF's Interactice Connectivity
+      Establishment (ICE) standard (RFC 5245) and the Session Traversal
+      Utilities for NAT (STUN) standard (RFC 5389).
+
+      It provides a GLib-based library, libnice and a Glib-free library,
+      libstun as well as GStreamer elements.'';
   };
 }
diff --git a/pkgs/development/libraries/libofa/default.nix b/pkgs/development/libraries/libofa/default.nix
index b3c69646452..437726d6976 100644
--- a/pkgs/development/libraries/libofa/default.nix
+++ b/pkgs/development/libraries/libofa/default.nix
@@ -11,4 +11,12 @@ stdenv.mkDerivation rec {
     url = "http://musicip-libofa.googlecode.com/files/${name}.tar.gz";
     sha256 = "184ham039l7lwhfgg0xr2vch2xnw1lwh7sid432mh879adhlc5h2";
   };
+
+  meta = {
+    homepage = http://code.google.com/musicip-libofa/;
+    description = "LibOFA - Library Open Fingerprint Architecture";
+    longDescription = ''
+      LibOFA (Library Open Fingerprint Architecture) is an open-source audio
+      fingerprint created and provided by MusicIP'';
+  };
 }
diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix
index cb01c2b47db..7ec95f03eff 100644
--- a/pkgs/development/libraries/libpcap/default.nix
+++ b/pkgs/development/libraries/libpcap/default.nix
@@ -21,4 +21,9 @@ stdenv.mkDerivation rec {
     dontStrip = true;
     configureFlags = [ "--with-pcap=linux" "ac_cv_linux_vers=2" ];
   };
+
+  meta = {
+    homepage = http://www.tcpdump.org;
+    description = "Packet Capture Library";
+  };
 }
diff --git a/pkgs/development/libraries/mp4v2/default.nix b/pkgs/development/libraries/mp4v2/default.nix
index 8376762ed76..d681713f516 100644
--- a/pkgs/development/libraries/mp4v2/default.nix
+++ b/pkgs/development/libraries/mp4v2/default.nix
@@ -8,4 +8,10 @@ stdenv.mkDerivation rec {
     url = "http://mp4v2.googlecode.com/files/${name}.tar.bz2";
     sha256 = "1d73qbi0faqad3bpmjfr4kk0mfmqpl1f43ysrx4gq9i3mfp1qf2w";
   };
+
+  meta = {
+    homepage = http://code.google.com/p/mp4v2;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+    platforms = stdenv.lib.platforms.all;
+  };
 }
diff --git a/pkgs/development/libraries/muparser/default.nix b/pkgs/development/libraries/muparser/default.nix
index 5ba196542d0..009b6c9ddfe 100644
--- a/pkgs/development/libraries/muparser/default.nix
+++ b/pkgs/development/libraries/muparser/default.nix
@@ -1,9 +1,15 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-	name = "muparser-1.30";
+	name = "muparser-1.34";
 	src = fetchurl {
-		url = mirror://sourceforge/muparser/muparser_v130.tar.gz;
-		sha256 = "164wak2sva6z9vq3anrciz1npyk2x3wqkz6xwp9ld3gmdqbdn8s4";
+		url = mirror://sourceforge/muparser/muparser_v134.tar.gz;
+		sha256 = "0xi27xjj7bwwf5nw3n2lynpr76al3vp204zwh71wkfnhwbzksg8f";
 	};
+
+  meta = {
+    homepage = http://muparser.sourceforge.net;
+    description = "An extensible high performance math expression parser library written in C++";
+    license = "MIT";
+  };
 }

From 48c13f4096df5d0e76bbe5c235c39df820ac060d Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 15 Sep 2010 18:37:21 +0000
Subject: [PATCH 162/181] Update cmake

Use system libraries, make curses optional, add optional qt4 gui etc.

svn path=/nixpkgs/trunk/; revision=23810
---
 .../tools/build-managers/cmake/default.nix    | 34 +++++++++++--------
 .../tools/build-managers/cmake/setup-hook.sh  |  6 ++--
 pkgs/top-level/all-packages.nix               |  4 +++
 3 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index d6cbcccc517..587b7dce220 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -1,31 +1,37 @@
-{fetchurl, stdenv, replace, ncurses}:
+{fetchurl, stdenv, replace, curl, expat, zlib
+, useNcurses ? false, ncurses, useQt4 ? false, qt4}:
 
 stdenv.mkDerivation rec {
-  name = "cmake-2.8.1";
+  name = "cmake-${majorVersion}.1";
 
-  # We look for cmake modules in .../share/cmake-${majorVersion}/Modules.
   majorVersion = "2.8";
 
-  setupHook = ./setup-hook.sh;
-
-  meta = {
-    homepage = http://www.cmake.org/;
-    description = "Cross-Platform Makefile Generator";
-  };
-
   src = fetchurl {
     url = "http://www.cmake.org/files/v${majorVersion}/${name}.tar.gz";
     sha256 = "0hi28blqxvir0dkhln90sgr0m3ri9n2i3hlmwdl4m5vkfsmp9bky";
   };
 
+  buildInputs = [ curl expat zlib ]
+    ++ stdenv.lib.optional useNcurses ncurses
+    ++ stdenv.lib.optional useQt4 qt4;
+
+  CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs;
+  configureFlags =
+    "--docdir=/share/doc/${name} --mandir=/share/man --system-libs"
+    + stdenv.lib.optionalString useQt4 " --qt-gui";
+
+  setupHook = ./setup-hook.sh;
+
   postUnpack = ''
     dontUseCmakeConfigure=1
     source $setupHook
     fixCmakeFiles $sourceRoot
-    echo 'SET (CMAKE_SYSTEM_PREFIX_PATH "'${ncurses}'" CACHE FILEPATH "Root for libs for cmake" FORCE)' > $sourceRoot/cmakeInit.txt
   '';
 
-  configureFlags= [ " --init=cmakeInit.txt " ];
-
-  postInstall = "fixCmakeFiles $out/share";
+  meta = {
+    homepage = http://www.cmake.org/;
+    description = "Cross-Platform Makefile Generator";
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+  };
 }
diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh
index 71afcefe3cb..21d71628c07 100755
--- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh
+++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh
@@ -1,15 +1,15 @@
 addCMakeParams()
 {
     addToSearchPath CMAKE_PREFIX_PATH $1
-    addToSearchPath CMAKE_MODULE_PATH $1/share/cmake-@majorVersion@/Modules
 }
 
 fixCmakeFiles()
 {
     local replaceArgs
     echo "fixing cmake files"
-    replaceArgs="-e -f -L -T /usr /FOO"
-    find $1 -type f -name "*.cmake" -print0 | xargs -0 replace-literal ${replaceArgs}
+    replaceArgs="-e -f -L -T /usr /var/empty -a /opt /var/empty"
+    find $1 -type f -name "*.cmake" -o -name "*.cmake.in" -o -name CMakeLists.txt -print0 |
+        xargs -0 replace-literal ${replaceArgs}
 }
 
 cmakeConfigurePhase()
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ff6959e4b79..96d79712280 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2284,6 +2284,10 @@ let
 
   cmake = callPackage ../development/tools/build-managers/cmake { };
 
+  cmakeCurses = cmake.override { useNcurses = true; };
+
+  cmakeWithGui = cmakeCurses.override { useQt4 = true; };
+
   coccinelle = callPackage ../development/tools/misc/coccinelle { };
 
   cppi = callPackage ../development/tools/misc/cppi { };

From f1392366666fd13948799c2873735e0a49edc17b Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 15 Sep 2010 18:37:38 +0000
Subject: [PATCH 163/181] podofo-0.8.2, metainfo

svn path=/nixpkgs/trunk/; revision=23811
---
 pkgs/development/libraries/podofo/default.nix | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix
index 270d4da23de..99765f933b6 100644
--- a/pkgs/development/libraries/podofo/default.nix
+++ b/pkgs/development/libraries/podofo/default.nix
@@ -1,12 +1,20 @@
 {stdenv, fetchurl, cmake, zlib, freetype, libjpeg, libtiff, fontconfig,
-openssl}:
+openssl, libpng, lua5}:
 
 stdenv.mkDerivation rec {
-  name = "podofo-0.7.0";
+  name = "podofo-0.8.2";
   src = fetchurl {
     url = "mirror://sourceforge/podofo/${name}.tar.gz";
-    sha256 = "1hpd5ldjv013041rmcfrkbk8v6wdpxcg60i3aklik583q2rf0mqy";
+    sha256 = "064cgrvjvy57n5i25d4j7yx5wd3wgkdks448bzc3a8nsmyl08skq";
   };
-  buildInputs = [ cmake zlib freetype libjpeg libtiff fontconfig openssl ];
+  buildInputs = [ cmake zlib freetype libjpeg libtiff fontconfig openssl libpng
+    lua5 stdenv.gcc.libc ];
   cmakeFlags = "-DPODOFO_BUILD_SHARED=ON -DPODOFO_BUILD_STATIC=OFF";
+
+  meta = {
+    homepage = http://podofo.sourceforge.net;
+    description = "A library to work with the PDF file format";
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+  };
 }

From 139de1ea2f66b6fc1e8bda062265170242bf4cb0 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 15 Sep 2010 18:52:07 +0000
Subject: [PATCH 164/181] Don't try to build Qt guis if qt is unsupported on
 the platform

svn path=/nixpkgs/trunk/; revision=23812
---
 .../version-management/git-and-tools/qgit/default.nix           | 2 +-
 pkgs/development/tools/build-managers/cmake/default.nix         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/qgit/default.nix b/pkgs/applications/version-management/git-and-tools/qgit/default.nix
index 71abaa67dea..963f4dd295b 100644
--- a/pkgs/applications/version-management/git-and-tools/qgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/qgit/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
     license = "GPLv2";
     homepage = "http://digilander.libero.it/mcostalba/";
     description = "Graphical front-end to Git";
-    platforms = stdenv.lib.platforms.all;
+    inherit (qt.meta) platforms;
   };
   src = fetchurl
   {
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 587b7dce220..cc5fce60e72 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.cmake.org/;
     description = "Cross-Platform Makefile Generator";
-    platforms = stdenv.lib.platforms.all;
+    platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.all;
     maintainers = [ stdenv.lib.maintainers.urkud ];
   };
 }

From 44f2d4439ff9a26b5f2ccf35fe198a2df5f0cbbc Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Wed, 15 Sep 2010 19:39:48 +0000
Subject: [PATCH 165/181] Change the name of the coq derivation to
 coq-devel-8.3pre1 i.e., remove the version from the name.  Nix has its own
 mechanism to prevent a packages to be upgraded.  Instead we distinguish
 development version (coq-dev-VERSION) from stable versions (coq-VERSION).

Also remove derivation for coq-8.3-beta0-1 which is now superseded by
coq-devel-8.3pre1.


svn path=/nixpkgs/trunk/; revision=23813
---
 .../applications/science/logic/coq/8.3rc1.nix |  4 +-
 pkgs/applications/science/logic/coq/beta.nix  | 53 -------------------
 .../science/logic/coq/coq-8.3-beta0-1.patch   | 20 -------
 pkgs/top-level/all-packages.nix               |  6 +--
 4 files changed, 3 insertions(+), 80 deletions(-)
 delete mode 100644 pkgs/applications/science/logic/coq/beta.nix
 delete mode 100644 pkgs/applications/science/logic/coq/coq-8.3-beta0-1.patch

diff --git a/pkgs/applications/science/logic/coq/8.3rc1.nix b/pkgs/applications/science/logic/coq/8.3rc1.nix
index 4a549e5e93e..66eb4de833e 100644
--- a/pkgs/applications/science/logic/coq/8.3rc1.nix
+++ b/pkgs/applications/science/logic/coq/8.3rc1.nix
@@ -5,7 +5,7 @@
 {stdenv, fetchurl, ocaml, camlp5, lablgtk, ncurses}:
 
 stdenv.mkDerivation {
-  name = "coq8.3-8.3pre1";
+  name = "coq-devel-8.3pre1";
 
   src = fetchurl {
     url = http://coq.inria.fr/distrib/V8.3-rc1/files/coq-8.3-rc1.tar.gz;
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
   buildFlags = "world"; # Debug with "world VERBOSE=1";
 
   meta = {
-    description = "Coq proof assistant";
+    description = "Coq proof assistant (development version)";
     longDescription = ''
       Coq is a formal proof management system.  It provides a formal language
       to write mathematical definitions, executable algorithms and theorems
diff --git a/pkgs/applications/science/logic/coq/beta.nix b/pkgs/applications/science/logic/coq/beta.nix
deleted file mode 100644
index c5c4221ac1e..00000000000
--- a/pkgs/applications/science/logic/coq/beta.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-# TODO:
-# - coqide compilation should be optional or (better) separate;
-# - coqide libraries are not installed;
-
-{stdenv, fetchurl, ocaml, camlp5, lablgtk, ncurses}:
-
-stdenv.mkDerivation {
-  name = "coq-8.3-beta0-1";
-
-  src = fetchurl {
-    url = http://coq.inria.fr/distrib/V8.3-beta0/files/coq-8.3-beta0-1.tar.gz;
-    sha256 = "01m1x0gpzfsiybyqanm82ls8q63q0g2d9vvfs99zf4z1nny7vlf1";
-  };
-
-  buildInputs = [ ocaml camlp5 ncurses lablgtk ];
-
-  prefixKey = "-prefix ";
-
-  preConfigure = ''
-    ARCH=`uname -s`
-    CAMLDIR=`type -p ocamlc`
-  '';
-
-  configureFlags =
-    "-arch $ARCH " +
-    "-camldir $CAMLDIR " +
-    "-camldir ${ocaml}/bin " +
-    "-camlp5dir ${camlp5}/lib/ocaml/camlp5 " +
-    "-lablgtkdir ${lablgtk}/lib/ocaml/lablgtk2 " +
-    "-opt -coqide opt";
-
-  buildFlags = "world"; # Debug with "world VERBOSE=1";
-
-  patches = [ ./coq-8.3-beta0-1.patch ];
-
-  postPatch = ''
-    substituteInPlace scripts/coqmktop.ml --replace \
-      "\"-I\"; \"+lablgtk2\"" \
-      "\"-I\"; \"${lablgtk}/lib/ocaml/lablgtk2\"; \"-I\"; \"${lablgtk}/lib/ocaml/stublibs\""
-  '';
-
-  meta = {
-    description = "Coq proof assistant";
-    longDescription = ''
-      Coq is a formal proof management system.  It provides a formal language
-      to write mathematical definitions, executable algorithms and theorems
-      together with an environment for semi-interactive development of
-      machine-checked proofs.
-    '';
-    homepage = "http://coq.inria.fr";
-    license = "LGPL";
-  };
-}
diff --git a/pkgs/applications/science/logic/coq/coq-8.3-beta0-1.patch b/pkgs/applications/science/logic/coq/coq-8.3-beta0-1.patch
deleted file mode 100644
index a5259eb43c0..00000000000
--- a/pkgs/applications/science/logic/coq/coq-8.3-beta0-1.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Nurp coq-8.3-beta0-1/configure coq-8.3-beta0-1-nix/configure
---- coq-8.3-beta0-1/configure	2010-02-16 12:37:58.000000000 +0100
-+++ coq-8.3-beta0-1-nix/configure	2010-05-11 17:47:44.000000000 +0200
-@@ -394,7 +394,6 @@ case $camldir_spec in
- 	 ocamlyaccexec=$CAMLBIN/ocamlyacc
- 	 ocamlmktopexec=$CAMLBIN/ocamlmktop
- 	 ocamlmklibexec=$CAMLBIN/ocamlmklib
--	 camlp4oexec=$CAMLBIN/camlp4o
- esac
- 
- if test ! -f "$CAMLC" ; then
-@@ -626,7 +625,7 @@ case $COQIDE in
-             no)  LABLGTKLIB=+lablgtk2                   # Pour le message
-                  LABLGTKINCLUDES="-I $LABLGTKLIB";;     # Pour le makefile
-             yes) LABLGTKLIB="$lablgtkdir"               # Pour le message
--                 LABLGTKINCLUDES="-I \"$LABLGTKLIB\"";; # Pour le makefile
-+                 LABLGTKINCLUDES="-I $LABLGTKLIB";; # Pour le makefile
-         esac;;
-     no) LABLGTKINCLUDES="";;
- esac
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 96d79712280..67cb13952a8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6675,11 +6675,7 @@ let
     camlp5 = camlp5_transitional;
   };
 
-  coq8_3 = callPackage ../applications/science/logic/coq/8.3rc1.nix {
-    camlp5 = camlp5_transitional;
-  };
-
-  coq_beta = callPackage ../applications/science/logic/coq/beta.nix {
+  coq_devel = callPackage ../applications/science/logic/coq/8.3rc1.nix {
     camlp5 = camlp5_transitional;
   };
 

From 4e5db40581ed97ec8b7c6d61187f47e5948a3226 Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Wed, 15 Sep 2010 21:41:18 +0000
Subject: [PATCH 166/181] Update HOL Light to version 20100820 (rev57 on google
 code).

Also replace the monolitic derivation hol_light_binaries with smaller
derivations.  Now the installation works as follows:

# Install the base system and a script "start_hol_light"
$ nix-env -i hol_light_sources hol_light

# Install a checkpointed executable with the core library preloaded
$ nix-env -i hol_light_core_dmtcp

# Install HOL Light binaries preloaded with other specific libraries:
$ nix-env -i hol_light_multivariate_dmtcp
$ nix-env -i hol_light_complex_dmtcp
$ nix-env -i hol_light_sosa_dmtcp
$ nix-env -i hol_light_card_dmtcp


svn path=/nixpkgs/trunk/; revision=23815
---
 .../science/logic/hol_light/binaries.nix      | 60 -----------
 .../science/logic/hol_light/default.nix       | 68 +++++++------
 .../logic/hol_light/dmtcp_checkpoint.nix      | 99 +++++++++++++++++++
 .../logic/hol_light/dmtcp_selfdestruct.ml     | 19 ++++
 .../logic/hol_light/parser_setup.patch        | 35 +++++++
 .../science/logic/hol_light/restart_hol_light |  3 -
 .../science/logic/hol_light/sources.nix       | 28 ++++++
 .../science/logic/hol_light/start_hol.ml      | 37 -------
 .../science/logic/hol_light/start_hol_light   |  3 -
 pkgs/top-level/all-packages.nix               |  5 +-
 10 files changed, 218 insertions(+), 139 deletions(-)
 delete mode 100644 pkgs/applications/science/logic/hol_light/binaries.nix
 create mode 100644 pkgs/applications/science/logic/hol_light/dmtcp_checkpoint.nix
 create mode 100644 pkgs/applications/science/logic/hol_light/dmtcp_selfdestruct.ml
 create mode 100644 pkgs/applications/science/logic/hol_light/parser_setup.patch
 delete mode 100644 pkgs/applications/science/logic/hol_light/restart_hol_light
 create mode 100644 pkgs/applications/science/logic/hol_light/sources.nix
 delete mode 100644 pkgs/applications/science/logic/hol_light/start_hol.ml
 delete mode 100644 pkgs/applications/science/logic/hol_light/start_hol_light

diff --git a/pkgs/applications/science/logic/hol_light/binaries.nix b/pkgs/applications/science/logic/hol_light/binaries.nix
deleted file mode 100644
index de89a7a5d4e..00000000000
--- a/pkgs/applications/science/logic/hol_light/binaries.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{stdenv, hol_light, dmtcp}:
-
-let
-  cmd_core = ''
-    #use "${./start_hol.ml}";;
-    dmtcp_selfdestruct "";;
-  '';
-  cmd_multivariate = ''
-    loadt "Multivariate/make.ml";;
-    dmtcp_checkpoint "Preloaded with multivariate analysis";;
-  '';
-  cmd_complex = ''
-    loadt "Multivariate/complexes.ml";;
-    loadt "Multivariate/canal.ml";;
-    loadt "Multivariate/transcendentals.ml";;
-    loadt "Multivariate/realanalysis.ml";;
-    loadt "Multivariate/cauchy.ml";;
-    loadt "Multivariate/complex_database.ml";;
-    loadt "update_database.ml";;
-    dmtcp_checkpoint "Preloaded with multivariate-based complex analysis";;
-  '';
-in
-
-stdenv.mkDerivation {
-  name = "hol_light_binaries-${hol_light.version}";
-
-  buildInputs = [ dmtcp hol_light hol_light.ocaml ];
-
-  buildCommand = ''
-    HOL_DIR="${hol_light}/src/hol_light"
-    BIN_DIR="$out/bin"
-    ensureDir "$BIN_DIR"
-
-    # HOL Light Core
-    (echo '${cmd_core}' | dmtcp_checkpoint --quiet ${hol_light}/bin/start_hol_light) || exit 0
-    mv ckpt* "$BIN_DIR/hol_light.ckpt"
-    substitute "${./restart_hol_light}" "$BIN_DIR/hol_light" \
-      --subst-var-by DMTCP_RESTART `type -p dmtcp_restart` \
-      --subst-var-by CKPT_FILE "$BIN_DIR/hol_light.ckpt"
-    chmod +x "$BIN_DIR/hol_light"
-
-    # HOL Light Multivariate
-    cp "$BIN_DIR/hol_light.ckpt" .
-    (echo '${cmd_multivariate}' | dmtcp_restart --quiet hol_light.ckpt) || exit 0
-    mv hol_light.ckpt "$BIN_DIR/hol_light_multivariate.ckpt"
-    substitute "${./restart_hol_light}" "$BIN_DIR/hol_light_multivariate" \
-      --subst-var-by DMTCP_RESTART `type -p dmtcp_restart` \
-      --subst-var-by CKPT_FILE "$BIN_DIR/hol_light_multivariate.ckpt"
-    chmod +x "$BIN_DIR/hol_light_multivariate"
-
-    # HOL Light Complex
-    cp "$BIN_DIR/hol_light_multivariate.ckpt" .
-    (echo '${cmd_complex}' | dmtcp_restart --quiet hol_light_multivariate.ckpt) || exit 0
-    mv hol_light_multivariate.ckpt "$BIN_DIR/hol_light_complex.ckpt"
-    substitute "${./restart_hol_light}" "$BIN_DIR/hol_light_complex" \
-      --subst-var-by DMTCP_RESTART `type -p dmtcp_restart` \
-      --subst-var-by CKPT_FILE "$BIN_DIR/hol_light_complex.ckpt"
-    chmod +x "$BIN_DIR/hol_light_complex"
-  '';
-}
diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix
index 48ed8526d25..932412daf75 100644
--- a/pkgs/applications/science/logic/hol_light/default.nix
+++ b/pkgs/applications/science/logic/hol_light/default.nix
@@ -1,44 +1,43 @@
-{stdenv, fetchsvn, ocaml, camlp5_transitional}:
+{stdenv, writeText, writeTextFile, ocaml, camlp5_transitional, hol_light_sources}:
 
-stdenv.mkDerivation rec {
-  name = "hol_light-${version}";
-  version = "20100820svn57";
+let
+  version = hol_light_sources.version;
 
-  inherit ocaml;
   camlp5 = camlp5_transitional;
 
-  src = fetchsvn {
-    url = http://hol-light.googlecode.com/svn/trunk;
-    rev = "57";
-    sha256 = "d1372744abca6c9978673850977d3e1577fd8cfd8298826eb713b3681c10cccd";
-  };
+  hol_light_src_dir = "${hol_light_sources}/lib/hol_light/src";
 
-  buildInputs = [ ocaml camlp5 ];
+  pa_j_cmo = stdenv.mkDerivation {
+    name = "pa_j.cmo";
+    inherit ocaml camlp5; 
+    buildInputs = [ ocaml camlp5 ];
+    buildCommand = ''
+      ocamlc -c \
+        -pp "camlp5r pa_lexer.cmo pa_extend.cmo q_MLast.cmo" \
+        -I "${camlp5}/lib/ocaml/camlp5" \
+        -o $out \
+        "${hol_light_src_dir}/pa_j_`ocamlc -version | cut -c1-4`.ml"
+      '';
+    };
 
-  buildCommand = ''
-    export HOL_DIR="$out/src/hol_light"
-    ensureDir `dirname $HOL_DIR` "$out/bin"
-    cp -a "${src}" "$HOL_DIR"
-    cd "$HOL_DIR"
-    chmod -R u+rwX .
-
-    substituteInPlace hol.ml --replace \
-      "(try Sys.getenv \"HOLLIGHT_DIR\" with Not_found -> Sys.getcwd())" \
-      "\"$HOL_DIR\""
-
-    substituteInPlace Makefile --replace \
-      "+camlp5" \
-      "${camlp5}/lib/ocaml/camlp5"
-
-    substitute ${./start_hol_light} "$out/bin/start_hol_light" \
-      --subst-var-by OCAML "${ocaml}" \
-      --subst-var-by CAMLP5 "${camlp5_transitional}" \
-      --subst-var HOL_DIR
-    chmod +x "$out/bin/start_hol_light"
-
-    make
+  start_ml = writeText "start.ml" ''
+    Topdirs.dir_directory "${hol_light_src_dir}";;
+    Topdirs.dir_directory "${camlp5}/lib/ocaml/camlp5";;
+    Topdirs.dir_load Format.std_formatter "camlp5o.cma";;
+    Topdirs.dir_load Format.std_formatter "${pa_j_cmo}";;
+    #use "${hol_light_src_dir}/make.ml";;
   '';
-
+in
+writeTextFile {
+  name = "hol_light-${version}";
+  destination = "/bin/start_hol_light";
+  executable = true;
+  text = ''
+      #!/bin/sh
+      exec ${ocaml}/bin/ocaml -init ${start_ml}
+    '';
+} // {
+  inherit (hol_light_sources) version src;
   meta = {
     description = "An interactive theorem prover based on Higher-Order Logic.";
     longDescription = ''
@@ -52,6 +51,5 @@ soundness.
     '';
     homepage = http://www.cl.cam.ac.uk/~jrh13/hol-light/;
     license = "BSD";
-    ocamlVersions = [ "3.10.0" "3.11.1" ];
   };
 }
diff --git a/pkgs/applications/science/logic/hol_light/dmtcp_checkpoint.nix b/pkgs/applications/science/logic/hol_light/dmtcp_checkpoint.nix
new file mode 100644
index 00000000000..9071d63c298
--- /dev/null
+++ b/pkgs/applications/science/logic/hol_light/dmtcp_checkpoint.nix
@@ -0,0 +1,99 @@
+{stdenv, writeTextFile, hol_light, dmtcp}:
+let
+  mkRestartScript = checkpointFile:
+    let filename = "hol_light_${checkpointFile.variant}_dmtcp"; in
+    writeTextFile {
+      name = "${filename}-${hol_light.version}";
+      destination = "/bin/${filename}";
+      executable = true;
+      text = ''
+        #!/bin/sh
+	exec ${dmtcp}/bin/dmtcp_restart --quiet ${checkpointFile}
+      '';
+    };
+
+  mkCkptFile =
+    { variant
+    , banner
+    , loads
+    , startCkpt ? null
+    , buildCommand ? ''
+        cp ${startCkpt} hol_light_restart.ckpt
+        (echo "$loadScript" | dmtcp_restart --quiet hol_light_restart.ckpt) || exit 0
+        cp hol_light_restart.ckpt $out
+      ''
+    }:
+    stdenv.mkDerivation rec {
+      name = "hol_light_${variant}_dmtcp.checkpoint-${hol_light.version}";
+      inherit variant banner buildCommand;
+      buildInputs = [ dmtcp hol_light ];
+      loadScript = ''
+        ${loads}
+        dmtcp_checkpoint "${banner}";;
+      '';
+    };
+in
+rec {
+  hol_light_core_dmtcp = mkRestartScript hol_light_core_dmtcp_ckpt;
+  hol_light_sosa_dmtcp = mkRestartScript hol_light_sosa_dmtcp_ckpt;
+  hol_light_card_dmtcp = mkRestartScript hol_light_card_dmtcp_ckpt;
+  hol_light_multivariate_dmtcp = mkRestartScript hol_light_multivariate_dmtcp_ckpt;
+  hol_light_complex_dmtcp = mkRestartScript hol_light_complex_dmtcp_ckpt;
+
+  hol_light_core_dmtcp_ckpt = mkCkptFile rec {
+    variant = "core";
+    banner = "";
+    loads = ''
+      #use "${./dmtcp_selfdestruct.ml}";;
+    '';
+    buildCommand = ''
+      (echo "$loadScript" | dmtcp_checkpoint --quiet ${hol_light}/bin/start_hol_light) || exit 0
+      mv ckpt* $out
+    '';
+  };
+
+  hol_light_multivariate_dmtcp_ckpt = mkCkptFile {
+    variant = "multivariate";
+    banner = "Preloaded with multivariate analysis";
+    loads = ''
+      loadt "Multivariate/make.ml";;
+    '';
+    startCkpt = hol_light_core_dmtcp_ckpt;
+  };
+
+  hol_light_sosa_dmtcp_ckpt = mkCkptFile {
+    variant = "sosa";
+    banner = "Preloaded with analysis and SOS";
+    loads = ''
+      loadt "Library/analysis.ml";;
+      loadt "Library/transc.ml";;
+      loadt "Examples/sos.ml";;
+      loadt "update_database.ml";;
+    '';
+    startCkpt = hol_light_core_dmtcp_ckpt;
+  };
+
+  hol_light_card_dmtcp_ckpt = mkCkptFile {
+    variant = "card";
+    banner = "Preloaded with cardinal arithmetic";
+    loads = ''
+      loadt "Library/card.ml";;
+      loadt "update_database.ml";;
+    '';
+    startCkpt = hol_light_core_dmtcp_ckpt;
+  };
+
+  hol_light_complex_dmtcp_ckpt = mkCkptFile {
+    variant = "complex";
+    banner = "Preloaded with multivariate-based complex analysis";
+    loads = ''
+      loadt "Multivariate/complexes.ml";;
+      loadt "Multivariate/canal.ml";;
+      loadt "Multivariate/transcendentals.ml";;
+      loadt "Multivariate/realanalysis.ml";;
+      loadt "Multivariate/cauchy.ml";;
+      loadt "Multivariate/complex_database.ml";;
+    '';
+    startCkpt = hol_light_multivariate_dmtcp_ckpt;
+  };
+}
diff --git a/pkgs/applications/science/logic/hol_light/dmtcp_selfdestruct.ml b/pkgs/applications/science/logic/hol_light/dmtcp_selfdestruct.ml
new file mode 100644
index 00000000000..f85a7a6c5fd
--- /dev/null
+++ b/pkgs/applications/science/logic/hol_light/dmtcp_selfdestruct.ml
@@ -0,0 +1,19 @@
+(* ------------------------------------------------------------------------- *)
+(* Create a standalone HOL image. Assumes that we are running under Linux    *)
+(* and have the program "dmtcp" available to create checkpoints.             *)
+(* ------------------------------------------------------------------------- *)
+
+let dmtcp_checkpoint, dmtcp_selfdestruct =
+  let call_dmtcp opts bannerstring =
+    let longer_banner = startup_banner ^ " with DMTCP" in
+    let complete_banner =
+      if bannerstring = "" then longer_banner
+      else longer_banner^"\n        "^bannerstring in
+    (Gc.compact(); Unix.sleep 1;
+     Format.print_string "Checkpointing..."; Format.print_newline();
+     try ignore(Unix.system ("dmtcp_command -bc " ^ opts))
+     with Unix.Unix_error _ -> ();
+     Format.print_string complete_banner;
+     Format.print_newline(); Format.print_newline())
+  in
+  call_dmtcp "", call_dmtcp "-q";;
diff --git a/pkgs/applications/science/logic/hol_light/parser_setup.patch b/pkgs/applications/science/logic/hol_light/parser_setup.patch
new file mode 100644
index 00000000000..e327527882d
--- /dev/null
+++ b/pkgs/applications/science/logic/hol_light/parser_setup.patch
@@ -0,0 +1,35 @@
+diff -Nuar hol_light/hol.ml hol_light.nixos/hol.ml
+--- hol_light/hol.ml	2010-09-12 18:57:28.000000000 +0200
++++ hol_light.nixos/hol.ml	2010-09-12 19:09:09.000000000 +0200
+@@ -11,8 +11,8 @@
+ 
+ let hol_version = "2.20++";;
+ 
+-let hol_dir = ref
+-  (try Sys.getenv "HOLLIGHT_DIR" with Not_found -> Sys.getcwd());;
++let hol_dir = ref "@HOL_LIGHT_SRC_DIR@";;
++Topdirs.dir_directory "@HOL_LIGHT_SRC_DIR@";;
+ 
+ (* ------------------------------------------------------------------------- *)
+ (* Should eventually change to "ref(Filename.temp_dir_name)".                *)
+@@ -23,20 +23,6 @@
+ let temp_path = ref "/tmp";;
+ 
+ (* ------------------------------------------------------------------------- *)
+-(* Load in parsing extensions.                                               *)
+-(* For Ocaml < 3.10, use the built-in camlp4                                 *)
+-(* and for Ocaml >= 3.10, use camlp5 instead.                                *)
+-(* ------------------------------------------------------------------------- *)
+-
+-if let v = String.sub Sys.ocaml_version 0 4 in
+-   v = "3.10" or v = "3.11"
+-then (Topdirs.dir_directory "+camlp5";
+-      Topdirs.dir_load Format.std_formatter "camlp5o.cma")
+-else (Topdirs.dir_load Format.std_formatter "camlp4o.cma");;
+-
+-Topdirs.dir_load Format.std_formatter (Filename.concat (!hol_dir) "pa_j.cmo");;
+-
+-(* ------------------------------------------------------------------------- *)
+ (* Load files from system and/or user-settable directories.                  *)
+ (* Paths map initial "$/" to !hol_dir dynamically; use $$ to get the actual  *)
+ (* $ character at the start of a directory.                                  *)
diff --git a/pkgs/applications/science/logic/hol_light/restart_hol_light b/pkgs/applications/science/logic/hol_light/restart_hol_light
deleted file mode 100644
index d4fe70368d9..00000000000
--- a/pkgs/applications/science/logic/hol_light/restart_hol_light
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec @DMTCP_RESTART@ --quiet @CKPT_FILE@
diff --git a/pkgs/applications/science/logic/hol_light/sources.nix b/pkgs/applications/science/logic/hol_light/sources.nix
new file mode 100644
index 00000000000..497c3d8ff5f
--- /dev/null
+++ b/pkgs/applications/science/logic/hol_light/sources.nix
@@ -0,0 +1,28 @@
+{stdenv, fetchsvn}:
+
+stdenv.mkDerivation rec {
+  name = "hol_light_sources-${version}";
+  version = "20100820";
+
+  src = fetchsvn {
+    url = http://hol-light.googlecode.com/svn/trunk;
+    rev = "57";
+    sha256 = "d1372744abca6c9978673850977d3e1577fd8cfd8298826eb713b3681c10cccd";
+  };
+
+  buildCommand = ''
+    export HOL_DIR="$out/lib/hol_light"
+    ensureDir "$HOL_DIR"
+    cp -a "${src}" "$HOL_DIR/src"
+    cd "$HOL_DIR/src"
+    chmod +wX -R .
+    patch -p1 < ${./parser_setup.patch}
+    substituteInPlace hol.ml --subst-var-by HOL_LIGHT_SRC_DIR "$HOL_DIR/src"
+  '';
+
+  meta = {
+    description = "Sources for the HOL Light theorem prover";
+    homepage = http://www.cl.cam.ac.uk/~jrh13/hol-light/;
+    license = "BSD";
+  };
+}
diff --git a/pkgs/applications/science/logic/hol_light/start_hol.ml b/pkgs/applications/science/logic/hol_light/start_hol.ml
deleted file mode 100644
index c8f4b2279df..00000000000
--- a/pkgs/applications/science/logic/hol_light/start_hol.ml
+++ /dev/null
@@ -1,37 +0,0 @@
-(* ========================================================================= *)
-(* Create a standalone HOL image. Assumes that we are running under Linux    *)
-(* and have the program "dmtcp" available to create checkpoints.             *)
-(*                                                                           *)
-(*              (c) Copyright, John Harrison 1998-2007                       *)
-(*              (c) Copyright, Marco Maggesi 2010                            *)
-(* ========================================================================= *)
-
-(* Use this instead of #use "make.ml";; for quick tests. *)
-(*
-let a = 1;
-#load "unix.cma";;
-let startup_banner = "Bogus banner\n";;
-Format.print_string "Hello!"; Format.print_newline();;
-*)
-
-#use "make.ml";;
-
-(* ------------------------------------------------------------------------- *)
-(* Checkpoint using DMTCP.                                                   *)
-(* dmtcp_selfdestruct is similar to dmtcp_checkpoint but terminates          *)
-(* HOL Light and shuts down the dmtcp coordinator.                           *)
-(* ------------------------------------------------------------------------- *)
-
-let dmtcp_checkpoint, dmtcp_selfdestruct =
-  let call_dmtcp opts bannerstring =
-    let longer_banner = startup_banner ^ " with DMTCP" in
-    let complete_banner =
-      if bannerstring = "" then longer_banner
-      else longer_banner^"\n        "^bannerstring in
-    (Gc.compact(); Unix.sleep 4;
-     Format.print_string "Checkpointing..."; Format.print_newline();
-     try ignore(Unix.system ("dmtcp_command -bc " ^ opts)) with _ -> ();
-     Format.print_string complete_banner;
-     Format.print_newline(); Format.print_newline())
-  in
-  call_dmtcp "", call_dmtcp "-q";;
diff --git a/pkgs/applications/science/logic/hol_light/start_hol_light b/pkgs/applications/science/logic/hol_light/start_hol_light
deleted file mode 100644
index 638cf8d3e77..00000000000
--- a/pkgs/applications/science/logic/hol_light/start_hol_light
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec @OCAML@/bin/ocaml -I @CAMLP5@/lib/ocaml/camlp5 -I @HOL_DIR@ "$@"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 67cb13952a8..4abe8821d41 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6691,7 +6691,10 @@ let
 
   hol_light = callPackage ../applications/science/logic/hol_light { };
 
-  hol_light_binaries = callPackage ../applications/science/logic/hol_light/binaries.nix { };
+  hol_light_sources = callPackage ../applications/science/logic/hol_light/sources.nix { };
+
+  hol_light_checkpoint_dmtcp =
+     recurseIntoAttrs (callPackage ../applications/science/logic/hol_light/dmtcp_checkpoint.nix { });
 
   isabelle = import ../applications/science/logic/isabelle {
     inherit (pkgs) stdenv fetchurl nettools perl polyml;

From bd6da9f5f3e7799bc39e3f01b8b4081663971d34 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 16 Sep 2010 08:40:47 +0000
Subject: [PATCH 167/181] Use stdenv2 in podofo

svn path=/nixpkgs/trunk/; revision=23817
---
 pkgs/development/libraries/podofo/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix               | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix
index 99765f933b6..0d18c37987e 100644
--- a/pkgs/development/libraries/podofo/default.nix
+++ b/pkgs/development/libraries/podofo/default.nix
@@ -7,8 +7,8 @@ stdenv.mkDerivation rec {
     url = "mirror://sourceforge/podofo/${name}.tar.gz";
     sha256 = "064cgrvjvy57n5i25d4j7yx5wd3wgkdks448bzc3a8nsmyl08skq";
   };
-  buildInputs = [ cmake zlib freetype libjpeg libtiff fontconfig openssl libpng
-    lua5 stdenv.gcc.libc ];
+  propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng ];
+  buildInputs = [ cmake lua5 stdenv.gcc.libc ];
   cmakeFlags = "-DPODOFO_BUILD_SHARED=ON -DPODOFO_BUILD_STATIC=OFF";
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4abe8821d41..7352846bb55 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3608,7 +3608,9 @@ let
 
   plib = callPackage ../development/libraries/plib { };
 
-  podofo = callPackage ../development/libraries/podofo { };
+  podofo = callPackage ../development/libraries/podofo {
+    stdenv = stdenv2;
+  };
 
   polkit = callPackage ../development/libraries/polkit { };
 

From 69032f3d1dc184219df6932eae4ed010aa5f9321 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 16 Sep 2010 08:40:56 +0000
Subject: [PATCH 168/181] Add krename

svn path=/nixpkgs/trunk/; revision=23818
---
 pkgs/applications/misc/krename/default.nix | 12 ++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/applications/misc/krename/default.nix

diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/default.nix
new file mode 100644
index 00000000000..70e130b8c4c
--- /dev/null
+++ b/pkgs/applications/misc/krename/default.nix
@@ -0,0 +1,12 @@
+{ stdenv, fetchurl, cmake, automoc4, kdelibs, taglib, exiv2, podofo, gettext}:
+
+stdenv.mkDerivation rec {
+  name = "krename-4.0.4";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/krename/${name}.tar.bz2";
+    sha256 = "12qhclw1vbg5bv6619qd4408y8d1w26499gcr8gwhgfzk0v83hic";
+  };
+
+  buildInputs = [ cmake automoc4 kdelibs taglib exiv2 podofo gettext ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7352846bb55..0c112d444d4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5732,6 +5732,8 @@ let
 
   konversation = newScope pkgs.kde4 ../applications/networking/irc/konversation { };
 
+  krename = newScope pkgs.kde4 ../applications/misc/krename { };
+
   ktorrent = newScope pkgs.kde4 ../applications/networking/ktorrent { };
 
   lame = callPackage ../applications/audio/lame { };

From 72ab62e8f517cc751dbef3c4e6e843620590c515 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 16 Sep 2010 08:41:03 +0000
Subject: [PATCH 169/181] krename meta

svn path=/nixpkgs/trunk/; revision=23819
---
 pkgs/applications/misc/krename/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/default.nix
index 70e130b8c4c..af0ad61e669 100644
--- a/pkgs/applications/misc/krename/default.nix
+++ b/pkgs/applications/misc/krename/default.nix
@@ -9,4 +9,11 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ cmake automoc4 kdelibs taglib exiv2 podofo gettext ];
+
+  meta = {
+    homepage = http://www.krename.net;
+    description = "KRename is a powerful batch renamer for KDE";
+    inherit (kdelibs.meta) platforms;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+  };
 }

From fac8ff8d7140fd105076c3e1b9f26c2579425854 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 16 Sep 2010 11:44:48 +0000
Subject: [PATCH 170/181] * Firefox 3.6.10.

svn path=/nixpkgs/trunk/; revision=23820
---
 pkgs/applications/networking/browsers/firefox/3.6.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/3.6.nix b/pkgs/applications/networking/browsers/firefox/3.6.nix
index 2f17e0dcf7b..06f303d1c74 100644
--- a/pkgs/applications/networking/browsers/firefox/3.6.nix
+++ b/pkgs/applications/networking/browsers/firefox/3.6.nix
@@ -12,14 +12,14 @@
 
 rec {
 
-  firefoxVersion = "3.6.9";
+  firefoxVersion = "3.6.10";
   
-  xulVersion = "1.9.2.9"; # this attribute is used by other packages
+  xulVersion = "1.9.2.10"; # this attribute is used by other packages
 
   
   src = fetchurl {
     url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
-    sha1 = "2429154c8d50bb5eeef80233b56fb26dcf727ea3";
+    sha1 = "0fa17f4ebd4bafe18c789961bdfe064d1b521ac6";
   };
 
 

From fd538ef53d5d329031236634b1b77cbe0561b0a8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 16 Sep 2010 15:21:28 +0000
Subject: [PATCH 171/181] * Fix some more paths in Xen, and make it use
 /etc/xen for its   configuration files.

svn path=/nixpkgs/trunk/; revision=23821
---
 pkgs/applications/virtualization/xen/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/xen/default.nix b/pkgs/applications/virtualization/xen/default.nix
index 87ee66ba6e9..0a0bf9d431d 100644
--- a/pkgs/applications/virtualization/xen/default.nix
+++ b/pkgs/applications/virtualization/xen/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
       dev86 iasl pciutils bzip2 xz
     ];
 
-  makeFlags = "PREFIX=$(out)";
+  makeFlags = "PREFIX=$(out) CONFIG_DIR=/etc";
 
   buildFlags = "xen tools";
 
@@ -49,12 +49,19 @@ stdenv.mkDerivation {
       # print the GCC version number properly.
       substituteInPlace xen/Makefile \
         --replace '$(CC) $(CFLAGS) -v' '$(CC) -v'
+
+      substituteInPlace tools/python/xen/xend/server/BlktapController.py \
+        --replace /usr/sbin/tapdisk2 $out/sbin/tapdisk2
+
+      substituteInPlace tools/python/xen/xend/XendQCoWStorageRepo.py \
+        --replace /usr/sbin/qcow-create $out/sbin/qcow-create
     '';
 
   installPhase =
     ''
       cp -prvd dist/install/nix/store/* $out
       cp -prvd dist/install/boot $out/boot
+      cp -prvd dist/install/etc $out/etc
     ''; # */
 
   postFixup =

From 96405922651dc4a3491d63c2dfd21fbbc1585f6b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 17 Sep 2010 14:46:49 +0000
Subject: [PATCH 172/181] pkgs/misc/ghostscript/default.nix: strip trailing
 white space, no functional change

svn path=/nixpkgs/trunk/; revision=23828
---
 pkgs/misc/ghostscript/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index 14eaa66627d..599f25c1a73 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -8,11 +8,11 @@ assert cupsSupport -> cups != null;
 
 stdenv.mkDerivation rec {
   name = "ghostscript-8.64.0";
-  
+
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = "mirror://gnu/ghostscript/gnu-${name}.tar.bz2"; 
+    url = "mirror://gnu/ghostscript/gnu-${name}.tar.bz2";
     sha256 = "0b94vlf03saa8vm9drz1kishh527g0brw2cg3jcy9mgpp764x2v1";
   };
 

From c8fbebe6b6e0f3b5e5ffc18ab565ebcae8363871 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 17 Sep 2010 14:46:55 +0000
Subject: [PATCH 173/181] pkgs/top-level/all-packages.nix: removed lowPrio
 modifier from ghostscriptX

By default, "nix-env -i ghostscript" used to install a version of Ghostscript
that didn't support X11. IMHO, this was the wrong choice for a user profile.

svn path=/nixpkgs/trunk/; revision=23829
---
 pkgs/top-level/all-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0c112d444d4..98b9fbf3f97 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6816,9 +6816,9 @@ let
     cupsSupport = getPkgConfig "ghostscript" "cups" true;
   };
 
-  ghostscriptX = lowPrio (appendToName "with-X" (ghostscript.override {
+  ghostscriptX = appendToName "with-X" (ghostscript.override {
     x11Support = true;
-  }));
+  });
 
   gxemul = callPackage ../misc/gxemul { };
 

From 84302a3554bd16261954bcd13e3eaf73885c0076 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 17 Sep 2010 14:47:02 +0000
Subject: [PATCH 174/181] pkgs/top-level/all-packages.nix: strip trailing white
 space, no functional change

svn path=/nixpkgs/trunk/; revision=23830
---
 pkgs/top-level/all-packages.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 98b9fbf3f97..724b46898e1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -106,10 +106,10 @@ let
         (lib.optionalAttrs (pkgsOrig.stdenv ? overrides && crossSystem == null) pkgsOrig.stdenv.overrides);
 
       # The un-overriden packages, passed to `overrider'.
-      pkgsOrig = pkgsFun pkgs {}; 
+      pkgsOrig = pkgsFun pkgs {};
 
       # The overriden, final packages.
-      pkgs = pkgsFun pkgs overrides; 
+      pkgs = pkgsFun pkgs overrides;
     in pkgs;
 
 
@@ -133,14 +133,14 @@ let
 
   newScope = extra: lib.callPackageWith (defaultScope // extra);
 
-  
+
   # Override system. This is useful to build i686 packages on x86_64-linux.
   forceSystem = system: (import ./all-packages.nix) {
     inherit system;
     inherit bootStdenv noSysDirs gccWithCC gccWithProfiling config;
   };
 
-  
+
   # Used by wine, firefox with debugging version of Flash, ...
   pkgsi686Linux = forceSystem "i686-linux";
 
@@ -4633,7 +4633,7 @@ let
     nvidia_x11_legacy173 = callPackage ../os-specific/linux/nvidia-x11/legacy173.nix { };
 
     openafsClient = callPackage ../servers/openafs-client { };
-    
+
     openiscsi = callPackage ../os-specific/linux/open-iscsi { };
 
     wis_go7007 = callPackage ../os-specific/linux/wis-go7007 { };

From 2739c3aa1e175d6669e84b66808ae205756823c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 17 Sep 2010 15:56:15 +0000
Subject: [PATCH 175/181] Update Nix unstable.

svn path=/nixpkgs/trunk/; revision=23832
---
 pkgs/tools/package-management/nix/unstable.nix | 6 +++---
 pkgs/top-level/all-packages.nix                | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index ffc91922688..1e98bb44ee2 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-0.16pre22611";
+  name = "nix-1.0pre23787";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/486717/download/4/${name}.tar.bz2";
-    sha256 = "1dazafq1flfyha9j5v31n46wh2bwg0iq59bwwgdk7n2xa8y7dz93";
+    url = "http://hydra.nixos.org/build/632513/download/4/${name}.tar.bz2";
+    sha256 = "01zn61ak6glyqpjxkzj8a7qw1vrfml1axky1jh1axkw6j35c34d7";
   };
 
   buildNativeInputs = [ perl ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 724b46898e1..d82fe06c06c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6853,13 +6853,11 @@ let
     stateDir = getPkgConfig "nix" "stateDir" "/nix/var";
   };
 
-  nixUnstable = nixStable;
-  /*
   nixUnstable = callPackage ../tools/package-management/nix/unstable.nix {
     storeDir = getPkgConfig "nix" "storeDir" "/nix/store";
     stateDir = getPkgConfig "nix" "stateDir" "/nix/var";
   };
-  */
+
 
   # The SQLite branch.
   nixSqlite = lowPrio (makeOverridable (import ../tools/package-management/nix/sqlite.nix) {

From 078353fc1596e1d59be28f8be865e4835a43752b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 17 Sep 2010 15:56:42 +0000
Subject: [PATCH 176/181] Linux: Add GuruPlug-related patches.

svn path=/nixpkgs/trunk/; revision=23833
---
 .../linux/kernel/guruplug-defconfig.patch     | 2714 +++++++++++++++++
 .../linux/kernel/guruplug-mach-type.patch     |   15 +
 pkgs/os-specific/linux/kernel/patches.nix     |   19 +-
 3 files changed, 2747 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/linux/kernel/guruplug-defconfig.patch
 create mode 100644 pkgs/os-specific/linux/kernel/guruplug-mach-type.patch

diff --git a/pkgs/os-specific/linux/kernel/guruplug-defconfig.patch b/pkgs/os-specific/linux/kernel/guruplug-defconfig.patch
new file mode 100644
index 00000000000..add982951ad
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/guruplug-defconfig.patch
@@ -0,0 +1,2714 @@
+From 4b82fc0ee759b81c92d33ba4e3dd7bd5f66cc0d6 Mon Sep 17 00:00:00 2001
+From: Siddarth Gore <gores@marvell.com>
+Date: Mon, 29 Mar 2010 11:00:06 +0530
+Subject: [PATCH] Initial defconfig
+
+Signed-off-by: Siddarth Gore <gores@marvell.com>
+---
+ arch/arm/configs/guruplug_defconfig | 2694 +++++++++++++++++++++++++++++++++++
+ 1 files changed, 2694 insertions(+), 0 deletions(-)
+ create mode 100644 arch/arm/configs/guruplug_defconfig
+
+diff --git a/arch/arm/configs/guruplug_defconfig b/arch/arm/configs/guruplug_defconfig
+new file mode 100644
+index 0000000..5c164ce
+--- /dev/null
++++ b/arch/arm/configs/guruplug_defconfig
+@@ -0,0 +1,2694 @@
++#
++# Automatically generated make config: don't edit
++# Linux kernel version: 2.6.33.2
++# Thu Apr 22 14:31:17 2010
++#
++CONFIG_ARM=y
++CONFIG_SYS_SUPPORTS_APM_EMULATION=y
++CONFIG_GENERIC_GPIO=y
++CONFIG_GENERIC_TIME=y
++CONFIG_GENERIC_CLOCKEVENTS=y
++CONFIG_GENERIC_HARDIRQS=y
++CONFIG_STACKTRACE_SUPPORT=y
++CONFIG_HAVE_LATENCYTOP_SUPPORT=y
++CONFIG_LOCKDEP_SUPPORT=y
++CONFIG_TRACE_IRQFLAGS_SUPPORT=y
++CONFIG_HARDIRQS_SW_RESEND=y
++CONFIG_GENERIC_IRQ_PROBE=y
++CONFIG_RWSEM_GENERIC_SPINLOCK=y
++CONFIG_GENERIC_HWEIGHT=y
++CONFIG_GENERIC_CALIBRATE_DELAY=y
++CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
++CONFIG_VECTORS_BASE=0xffff0000
++CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
++CONFIG_CONSTRUCTORS=y
++
++#
++# General setup
++#
++CONFIG_EXPERIMENTAL=y
++CONFIG_BROKEN_ON_SMP=y
++CONFIG_LOCK_KERNEL=y
++CONFIG_INIT_ENV_ARG_LIMIT=32
++CONFIG_LOCALVERSION=""
++CONFIG_LOCALVERSION_AUTO=y
++CONFIG_HAVE_KERNEL_GZIP=y
++CONFIG_HAVE_KERNEL_LZO=y
++CONFIG_KERNEL_GZIP=y
++# CONFIG_KERNEL_BZIP2 is not set
++# CONFIG_KERNEL_LZMA is not set
++# CONFIG_KERNEL_LZO is not set
++CONFIG_SWAP=y
++CONFIG_SYSVIPC=y
++CONFIG_SYSVIPC_SYSCTL=y
++# CONFIG_POSIX_MQUEUE is not set
++# CONFIG_BSD_PROCESS_ACCT is not set
++# CONFIG_TASKSTATS is not set
++# CONFIG_AUDIT is not set
++
++#
++# RCU Subsystem
++#
++CONFIG_TREE_RCU=y
++# CONFIG_TREE_PREEMPT_RCU is not set
++# CONFIG_TINY_RCU is not set
++# CONFIG_RCU_TRACE is not set
++CONFIG_RCU_FANOUT=32
++# CONFIG_RCU_FANOUT_EXACT is not set
++# CONFIG_TREE_RCU_TRACE is not set
++CONFIG_IKCONFIG=y
++CONFIG_IKCONFIG_PROC=y
++CONFIG_LOG_BUF_SHIFT=19
++# CONFIG_GROUP_SCHED is not set
++# CONFIG_CGROUPS is not set
++# CONFIG_SYSFS_DEPRECATED_V2 is not set
++# CONFIG_RELAY is not set
++CONFIG_NAMESPACES=y
++# CONFIG_UTS_NS is not set
++# CONFIG_IPC_NS is not set
++# CONFIG_USER_NS is not set
++# CONFIG_PID_NS is not set
++# CONFIG_NET_NS is not set
++CONFIG_BLK_DEV_INITRD=y
++CONFIG_INITRAMFS_SOURCE=""
++CONFIG_RD_GZIP=y
++CONFIG_RD_BZIP2=y
++CONFIG_RD_LZMA=y
++CONFIG_RD_LZO=y
++CONFIG_CC_OPTIMIZE_FOR_SIZE=y
++CONFIG_SYSCTL=y
++CONFIG_ANON_INODES=y
++# CONFIG_EMBEDDED is not set
++CONFIG_UID16=y
++CONFIG_SYSCTL_SYSCALL=y
++CONFIG_KALLSYMS=y
++# CONFIG_KALLSYMS_ALL is not set
++# CONFIG_KALLSYMS_EXTRA_PASS is not set
++CONFIG_HOTPLUG=y
++CONFIG_PRINTK=y
++CONFIG_BUG=y
++CONFIG_ELF_CORE=y
++CONFIG_BASE_FULL=y
++CONFIG_FUTEX=y
++CONFIG_EPOLL=y
++CONFIG_SIGNALFD=y
++CONFIG_TIMERFD=y
++CONFIG_EVENTFD=y
++CONFIG_SHMEM=y
++CONFIG_AIO=y
++
++#
++# Kernel Performance Events And Counters
++#
++CONFIG_VM_EVENT_COUNTERS=y
++CONFIG_PCI_QUIRKS=y
++CONFIG_SLUB_DEBUG=y
++CONFIG_COMPAT_BRK=y
++# CONFIG_SLAB is not set
++CONFIG_SLUB=y
++# CONFIG_SLOB is not set
++CONFIG_PROFILING=y
++CONFIG_OPROFILE=y
++CONFIG_HAVE_OPROFILE=y
++CONFIG_KPROBES=y
++CONFIG_KRETPROBES=y
++CONFIG_HAVE_KPROBES=y
++CONFIG_HAVE_KRETPROBES=y
++
++#
++# GCOV-based kernel profiling
++#
++# CONFIG_GCOV_KERNEL is not set
++CONFIG_SLOW_WORK=y
++# CONFIG_SLOW_WORK_DEBUG is not set
++CONFIG_HAVE_GENERIC_DMA_COHERENT=y
++CONFIG_SLABINFO=y
++CONFIG_RT_MUTEXES=y
++CONFIG_BASE_SMALL=0
++CONFIG_MODULES=y
++# CONFIG_MODULE_FORCE_LOAD is not set
++CONFIG_MODULE_UNLOAD=y
++# CONFIG_MODULE_FORCE_UNLOAD is not set
++# CONFIG_MODVERSIONS is not set
++# CONFIG_MODULE_SRCVERSION_ALL is not set
++CONFIG_BLOCK=y
++CONFIG_LBDAF=y
++# CONFIG_BLK_DEV_BSG is not set
++# CONFIG_BLK_DEV_INTEGRITY is not set
++
++#
++# IO Schedulers
++#
++CONFIG_IOSCHED_NOOP=y
++CONFIG_IOSCHED_DEADLINE=y
++CONFIG_IOSCHED_CFQ=y
++# CONFIG_DEFAULT_DEADLINE is not set
++CONFIG_DEFAULT_CFQ=y
++# CONFIG_DEFAULT_NOOP is not set
++CONFIG_DEFAULT_IOSCHED="cfq"
++# CONFIG_INLINE_SPIN_TRYLOCK is not set
++# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
++# CONFIG_INLINE_SPIN_LOCK is not set
++# CONFIG_INLINE_SPIN_LOCK_BH is not set
++# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
++# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
++# CONFIG_INLINE_SPIN_UNLOCK is not set
++# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
++# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
++# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
++# CONFIG_INLINE_READ_TRYLOCK is not set
++# CONFIG_INLINE_READ_LOCK is not set
++# CONFIG_INLINE_READ_LOCK_BH is not set
++# CONFIG_INLINE_READ_LOCK_IRQ is not set
++# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
++# CONFIG_INLINE_READ_UNLOCK is not set
++# CONFIG_INLINE_READ_UNLOCK_BH is not set
++# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
++# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
++# CONFIG_INLINE_WRITE_TRYLOCK is not set
++# CONFIG_INLINE_WRITE_LOCK is not set
++# CONFIG_INLINE_WRITE_LOCK_BH is not set
++# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
++# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
++# CONFIG_INLINE_WRITE_UNLOCK is not set
++# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
++# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
++# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
++# CONFIG_MUTEX_SPIN_ON_OWNER is not set
++CONFIG_FREEZER=y
++
++#
++# System Type
++#
++CONFIG_MMU=y
++# CONFIG_ARCH_AAEC2000 is not set
++# CONFIG_ARCH_INTEGRATOR is not set
++# CONFIG_ARCH_REALVIEW is not set
++# CONFIG_ARCH_VERSATILE is not set
++# CONFIG_ARCH_AT91 is not set
++# CONFIG_ARCH_CLPS711X is not set
++# CONFIG_ARCH_GEMINI is not set
++# CONFIG_ARCH_EBSA110 is not set
++# CONFIG_ARCH_EP93XX is not set
++# CONFIG_ARCH_FOOTBRIDGE is not set
++# CONFIG_ARCH_MXC is not set
++# CONFIG_ARCH_STMP3XXX is not set
++# CONFIG_ARCH_NETX is not set
++# CONFIG_ARCH_H720X is not set
++# CONFIG_ARCH_NOMADIK is not set
++# CONFIG_ARCH_IOP13XX is not set
++# CONFIG_ARCH_IOP32X is not set
++# CONFIG_ARCH_IOP33X is not set
++# CONFIG_ARCH_IXP23XX is not set
++# CONFIG_ARCH_IXP2000 is not set
++# CONFIG_ARCH_IXP4XX is not set
++# CONFIG_ARCH_L7200 is not set
++# CONFIG_ARCH_DOVE is not set
++CONFIG_ARCH_KIRKWOOD=y
++# CONFIG_ARCH_LOKI is not set
++# CONFIG_ARCH_MV78XX0 is not set
++# CONFIG_ARCH_ORION5X is not set
++# CONFIG_ARCH_MMP is not set
++# CONFIG_ARCH_KS8695 is not set
++# CONFIG_ARCH_NS9XXX is not set
++# CONFIG_ARCH_W90X900 is not set
++# CONFIG_ARCH_PNX4008 is not set
++# CONFIG_ARCH_PXA is not set
++# CONFIG_ARCH_MSM is not set
++# CONFIG_ARCH_RPC is not set
++# CONFIG_ARCH_SA1100 is not set
++# CONFIG_ARCH_S3C2410 is not set
++# CONFIG_ARCH_S3C64XX is not set
++# CONFIG_ARCH_S5PC1XX is not set
++# CONFIG_ARCH_SHARK is not set
++# CONFIG_ARCH_LH7A40X is not set
++# CONFIG_ARCH_U300 is not set
++# CONFIG_ARCH_DAVINCI is not set
++# CONFIG_ARCH_OMAP is not set
++# CONFIG_ARCH_BCMRING is not set
++# CONFIG_ARCH_U8500 is not set
++
++#
++# Marvell Kirkwood Implementations
++#
++CONFIG_MACH_DB88F6281_BP=y
++CONFIG_MACH_RD88F6192_NAS=y
++CONFIG_MACH_RD88F6281=y
++# CONFIG_MACH_MV88F6281GTW_GE is not set
++CONFIG_MACH_SHEEVAPLUG=y
++CONFIG_MACH_GURUPLUG=y
++CONFIG_MACH_TS219=y
++CONFIG_MACH_TS41X=y
++CONFIG_MACH_OPENRD_BASE=y
++# CONFIG_MACH_NETSPACE_V2 is not set
++CONFIG_PLAT_ORION=y
++
++#
++# Processor Type
++#
++CONFIG_CPU_FEROCEON=y
++# CONFIG_CPU_FEROCEON_OLD_ID is not set
++CONFIG_CPU_32v5=y
++CONFIG_CPU_ABRT_EV5T=y
++CONFIG_CPU_PABRT_LEGACY=y
++CONFIG_CPU_CACHE_VIVT=y
++CONFIG_CPU_COPY_FEROCEON=y
++CONFIG_CPU_TLB_FEROCEON=y
++CONFIG_CPU_CP15=y
++CONFIG_CPU_CP15_MMU=y
++
++#
++# Processor Features
++#
++CONFIG_ARM_THUMB=y
++# CONFIG_CPU_ICACHE_DISABLE is not set
++# CONFIG_CPU_DCACHE_DISABLE is not set
++CONFIG_OUTER_CACHE=y
++CONFIG_CACHE_FEROCEON_L2=y
++# CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set
++CONFIG_ARM_L1_CACHE_SHIFT=5
++
++#
++# Bus support
++#
++CONFIG_PCI=y
++CONFIG_PCI_SYSCALL=y
++# CONFIG_ARCH_SUPPORTS_MSI is not set
++CONFIG_PCI_LEGACY=y
++# CONFIG_PCI_DEBUG is not set
++# CONFIG_PCI_STUB is not set
++# CONFIG_PCI_IOV is not set
++# CONFIG_PCCARD is not set
++
++#
++# Kernel Features
++#
++CONFIG_TICK_ONESHOT=y
++CONFIG_NO_HZ=y
++CONFIG_HIGH_RES_TIMERS=y
++CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
++CONFIG_VMSPLIT_3G=y
++# CONFIG_VMSPLIT_2G is not set
++# CONFIG_VMSPLIT_1G is not set
++CONFIG_PAGE_OFFSET=0xC0000000
++# CONFIG_PREEMPT_NONE is not set
++# CONFIG_PREEMPT_VOLUNTARY is not set
++CONFIG_PREEMPT=y
++CONFIG_HZ=100
++CONFIG_AEABI=y
++# CONFIG_OABI_COMPAT is not set
++# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
++# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
++# CONFIG_HIGHMEM is not set
++CONFIG_SELECT_MEMORY_MODEL=y
++CONFIG_FLATMEM_MANUAL=y
++# CONFIG_DISCONTIGMEM_MANUAL is not set
++# CONFIG_SPARSEMEM_MANUAL is not set
++CONFIG_FLATMEM=y
++CONFIG_FLAT_NODE_MEM_MAP=y
++CONFIG_PAGEFLAGS_EXTENDED=y
++CONFIG_SPLIT_PTLOCK_CPUS=999999
++# CONFIG_PHYS_ADDR_T_64BIT is not set
++CONFIG_ZONE_DMA_FLAG=0
++CONFIG_VIRT_TO_BUS=y
++# CONFIG_KSM is not set
++CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
++CONFIG_ALIGNMENT_TRAP=y
++CONFIG_UACCESS_WITH_MEMCPY=y
++
++#
++# Boot options
++#
++CONFIG_ZBOOT_ROM_TEXT=0x0
++CONFIG_ZBOOT_ROM_BSS=0x0
++CONFIG_CMDLINE=""
++# CONFIG_XIP_KERNEL is not set
++# CONFIG_KEXEC is not set
++
++#
++# CPU Power Management
++#
++CONFIG_CPU_IDLE=y
++CONFIG_CPU_IDLE_GOV_LADDER=y
++CONFIG_CPU_IDLE_GOV_MENU=y
++
++#
++# Floating point emulation
++#
++
++#
++# At least one emulation must be selected
++#
++# CONFIG_VFP is not set
++
++#
++# Userspace binary formats
++#
++CONFIG_BINFMT_ELF=y
++# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
++CONFIG_HAVE_AOUT=y
++# CONFIG_BINFMT_AOUT is not set
++# CONFIG_BINFMT_MISC is not set
++
++#
++# Power management options
++#
++CONFIG_PM=y
++# CONFIG_PM_DEBUG is not set
++CONFIG_PM_SLEEP=y
++CONFIG_SUSPEND=y
++CONFIG_SUSPEND_FREEZER=y
++# CONFIG_APM_EMULATION is not set
++# CONFIG_PM_RUNTIME is not set
++CONFIG_ARCH_SUSPEND_POSSIBLE=y
++CONFIG_NET=y
++
++#
++# Networking options
++#
++CONFIG_PACKET=y
++CONFIG_PACKET_MMAP=y
++CONFIG_UNIX=y
++CONFIG_XFRM=y
++CONFIG_XFRM_USER=m
++# CONFIG_XFRM_SUB_POLICY is not set
++# CONFIG_XFRM_MIGRATE is not set
++# CONFIG_XFRM_STATISTICS is not set
++CONFIG_XFRM_IPCOMP=m
++CONFIG_NET_KEY=m
++# CONFIG_NET_KEY_MIGRATE is not set
++CONFIG_INET=y
++CONFIG_IP_MULTICAST=y
++CONFIG_IP_ADVANCED_ROUTER=y
++CONFIG_ASK_IP_FIB_HASH=y
++# CONFIG_IP_FIB_TRIE is not set
++CONFIG_IP_FIB_HASH=y
++# CONFIG_IP_MULTIPLE_TABLES is not set
++# CONFIG_IP_ROUTE_MULTIPATH is not set
++# CONFIG_IP_ROUTE_VERBOSE is not set
++CONFIG_IP_PNP=y
++CONFIG_IP_PNP_DHCP=y
++CONFIG_IP_PNP_BOOTP=y
++# CONFIG_IP_PNP_RARP is not set
++CONFIG_NET_IPIP=m
++CONFIG_NET_IPGRE=m
++# CONFIG_NET_IPGRE_BROADCAST is not set
++# CONFIG_IP_MROUTE is not set
++# CONFIG_ARPD is not set
++CONFIG_SYN_COOKIES=y
++CONFIG_INET_AH=m
++CONFIG_INET_ESP=m
++CONFIG_INET_IPCOMP=m
++CONFIG_INET_XFRM_TUNNEL=m
++CONFIG_INET_TUNNEL=m
++CONFIG_INET_XFRM_MODE_TRANSPORT=m
++CONFIG_INET_XFRM_MODE_TUNNEL=m
++CONFIG_INET_XFRM_MODE_BEET=m
++CONFIG_INET_LRO=y
++CONFIG_INET_DIAG=y
++CONFIG_INET_TCP_DIAG=y
++# CONFIG_TCP_CONG_ADVANCED is not set
++CONFIG_TCP_CONG_CUBIC=y
++CONFIG_DEFAULT_TCP_CONG="cubic"
++# CONFIG_TCP_MD5SIG is not set
++CONFIG_IPV6=m
++# CONFIG_IPV6_PRIVACY is not set
++# CONFIG_IPV6_ROUTER_PREF is not set
++# CONFIG_IPV6_OPTIMISTIC_DAD is not set
++CONFIG_INET6_AH=m
++CONFIG_INET6_ESP=m
++CONFIG_INET6_IPCOMP=m
++# CONFIG_IPV6_MIP6 is not set
++CONFIG_INET6_XFRM_TUNNEL=m
++CONFIG_INET6_TUNNEL=m
++CONFIG_INET6_XFRM_MODE_TRANSPORT=m
++CONFIG_INET6_XFRM_MODE_TUNNEL=m
++CONFIG_INET6_XFRM_MODE_BEET=m
++# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
++CONFIG_IPV6_SIT=m
++# CONFIG_IPV6_SIT_6RD is not set
++CONFIG_IPV6_NDISC_NODETYPE=y
++# CONFIG_IPV6_TUNNEL is not set
++# CONFIG_IPV6_MULTIPLE_TABLES is not set
++# CONFIG_IPV6_MROUTE is not set
++# CONFIG_NETWORK_SECMARK is not set
++CONFIG_NETFILTER=y
++# CONFIG_NETFILTER_DEBUG is not set
++CONFIG_NETFILTER_ADVANCED=y
++CONFIG_BRIDGE_NETFILTER=y
++
++#
++# Core Netfilter Configuration
++#
++CONFIG_NETFILTER_NETLINK=m
++# CONFIG_NETFILTER_NETLINK_QUEUE is not set
++CONFIG_NETFILTER_NETLINK_LOG=m
++CONFIG_NF_CONNTRACK=m
++CONFIG_NF_CT_ACCT=y
++CONFIG_NF_CONNTRACK_MARK=y
++# CONFIG_NF_CONNTRACK_EVENTS is not set
++CONFIG_NF_CT_PROTO_DCCP=m
++CONFIG_NF_CT_PROTO_GRE=m
++CONFIG_NF_CT_PROTO_SCTP=m
++CONFIG_NF_CT_PROTO_UDPLITE=m
++CONFIG_NF_CONNTRACK_AMANDA=m
++CONFIG_NF_CONNTRACK_FTP=m
++CONFIG_NF_CONNTRACK_H323=m
++CONFIG_NF_CONNTRACK_IRC=m
++CONFIG_NF_CONNTRACK_NETBIOS_NS=m
++CONFIG_NF_CONNTRACK_PPTP=m
++CONFIG_NF_CONNTRACK_SANE=m
++CONFIG_NF_CONNTRACK_SIP=m
++CONFIG_NF_CONNTRACK_TFTP=m
++# CONFIG_NF_CT_NETLINK is not set
++CONFIG_NETFILTER_TPROXY=m
++CONFIG_NETFILTER_XTABLES=m
++CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
++# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
++CONFIG_NETFILTER_XT_TARGET_DSCP=m
++CONFIG_NETFILTER_XT_TARGET_HL=m
++CONFIG_NETFILTER_XT_TARGET_LED=m
++CONFIG_NETFILTER_XT_TARGET_MARK=m
++CONFIG_NETFILTER_XT_TARGET_NFLOG=m
++CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
++CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
++CONFIG_NETFILTER_XT_TARGET_RATEEST=m
++CONFIG_NETFILTER_XT_TARGET_TPROXY=m
++CONFIG_NETFILTER_XT_TARGET_TRACE=m
++CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
++CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
++CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
++CONFIG_NETFILTER_XT_MATCH_COMMENT=m
++CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
++CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
++CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
++CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
++CONFIG_NETFILTER_XT_MATCH_DCCP=m
++CONFIG_NETFILTER_XT_MATCH_DSCP=m
++CONFIG_NETFILTER_XT_MATCH_ESP=m
++CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
++CONFIG_NETFILTER_XT_MATCH_HELPER=m
++CONFIG_NETFILTER_XT_MATCH_HL=m
++CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
++CONFIG_NETFILTER_XT_MATCH_LENGTH=m
++CONFIG_NETFILTER_XT_MATCH_LIMIT=m
++CONFIG_NETFILTER_XT_MATCH_MAC=m
++CONFIG_NETFILTER_XT_MATCH_MARK=m
++CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
++CONFIG_NETFILTER_XT_MATCH_OWNER=m
++CONFIG_NETFILTER_XT_MATCH_POLICY=m
++# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
++CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
++CONFIG_NETFILTER_XT_MATCH_QUOTA=m
++CONFIG_NETFILTER_XT_MATCH_RATEEST=m
++CONFIG_NETFILTER_XT_MATCH_REALM=m
++CONFIG_NETFILTER_XT_MATCH_RECENT=m
++CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT=y
++CONFIG_NETFILTER_XT_MATCH_SCTP=m
++CONFIG_NETFILTER_XT_MATCH_SOCKET=m
++CONFIG_NETFILTER_XT_MATCH_STATE=m
++CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
++CONFIG_NETFILTER_XT_MATCH_STRING=m
++CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
++CONFIG_NETFILTER_XT_MATCH_TIME=m
++CONFIG_NETFILTER_XT_MATCH_U32=m
++CONFIG_NETFILTER_XT_MATCH_OSF=m
++# CONFIG_IP_VS is not set
++
++#
++# IP: Netfilter Configuration
++#
++CONFIG_NF_DEFRAG_IPV4=m
++CONFIG_NF_CONNTRACK_IPV4=m
++CONFIG_NF_CONNTRACK_PROC_COMPAT=y
++# CONFIG_IP_NF_QUEUE is not set
++CONFIG_IP_NF_IPTABLES=m
++CONFIG_IP_NF_MATCH_ADDRTYPE=m
++CONFIG_IP_NF_MATCH_AH=m
++CONFIG_IP_NF_MATCH_ECN=m
++CONFIG_IP_NF_MATCH_TTL=m
++CONFIG_IP_NF_FILTER=m
++CONFIG_IP_NF_TARGET_REJECT=m
++CONFIG_IP_NF_TARGET_LOG=m
++CONFIG_IP_NF_TARGET_ULOG=m
++CONFIG_NF_NAT=m
++CONFIG_NF_NAT_NEEDED=y
++CONFIG_IP_NF_TARGET_MASQUERADE=m
++CONFIG_IP_NF_TARGET_NETMAP=m
++CONFIG_IP_NF_TARGET_REDIRECT=m
++CONFIG_NF_NAT_SNMP_BASIC=m
++CONFIG_NF_NAT_PROTO_DCCP=m
++CONFIG_NF_NAT_PROTO_GRE=m
++CONFIG_NF_NAT_PROTO_UDPLITE=m
++CONFIG_NF_NAT_PROTO_SCTP=m
++CONFIG_NF_NAT_FTP=m
++CONFIG_NF_NAT_IRC=m
++CONFIG_NF_NAT_TFTP=m
++CONFIG_NF_NAT_AMANDA=m
++CONFIG_NF_NAT_PPTP=m
++CONFIG_NF_NAT_H323=m
++CONFIG_NF_NAT_SIP=m
++CONFIG_IP_NF_MANGLE=m
++# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
++CONFIG_IP_NF_TARGET_ECN=m
++CONFIG_IP_NF_TARGET_TTL=m
++CONFIG_IP_NF_RAW=m
++CONFIG_IP_NF_ARPTABLES=m
++CONFIG_IP_NF_ARPFILTER=m
++CONFIG_IP_NF_ARP_MANGLE=m
++
++#
++# IPv6: Netfilter Configuration
++#
++CONFIG_NF_CONNTRACK_IPV6=m
++# CONFIG_IP6_NF_QUEUE is not set
++CONFIG_IP6_NF_IPTABLES=m
++CONFIG_IP6_NF_MATCH_AH=m
++CONFIG_IP6_NF_MATCH_EUI64=m
++CONFIG_IP6_NF_MATCH_FRAG=m
++CONFIG_IP6_NF_MATCH_OPTS=m
++CONFIG_IP6_NF_MATCH_HL=m
++CONFIG_IP6_NF_MATCH_IPV6HEADER=m
++CONFIG_IP6_NF_MATCH_MH=m
++CONFIG_IP6_NF_MATCH_RT=m
++CONFIG_IP6_NF_TARGET_HL=m
++CONFIG_IP6_NF_TARGET_LOG=m
++CONFIG_IP6_NF_FILTER=m
++CONFIG_IP6_NF_TARGET_REJECT=m
++CONFIG_IP6_NF_MANGLE=m
++CONFIG_IP6_NF_RAW=m
++CONFIG_BRIDGE_NF_EBTABLES=m
++CONFIG_BRIDGE_EBT_BROUTE=m
++CONFIG_BRIDGE_EBT_T_FILTER=m
++CONFIG_BRIDGE_EBT_T_NAT=m
++CONFIG_BRIDGE_EBT_802_3=m
++CONFIG_BRIDGE_EBT_AMONG=m
++CONFIG_BRIDGE_EBT_ARP=m
++CONFIG_BRIDGE_EBT_IP=m
++CONFIG_BRIDGE_EBT_IP6=m
++CONFIG_BRIDGE_EBT_LIMIT=m
++CONFIG_BRIDGE_EBT_MARK=m
++CONFIG_BRIDGE_EBT_PKTTYPE=m
++CONFIG_BRIDGE_EBT_STP=m
++CONFIG_BRIDGE_EBT_VLAN=m
++CONFIG_BRIDGE_EBT_ARPREPLY=m
++CONFIG_BRIDGE_EBT_DNAT=m
++CONFIG_BRIDGE_EBT_MARK_T=m
++CONFIG_BRIDGE_EBT_REDIRECT=m
++CONFIG_BRIDGE_EBT_SNAT=m
++CONFIG_BRIDGE_EBT_LOG=m
++CONFIG_BRIDGE_EBT_ULOG=m
++CONFIG_BRIDGE_EBT_NFLOG=m
++# CONFIG_IP_DCCP is not set
++# CONFIG_IP_SCTP is not set
++# CONFIG_RDS is not set
++# CONFIG_TIPC is not set
++# CONFIG_ATM is not set
++CONFIG_STP=m
++CONFIG_BRIDGE=m
++CONFIG_NET_DSA=y
++# CONFIG_NET_DSA_TAG_DSA is not set
++CONFIG_NET_DSA_TAG_EDSA=y
++# CONFIG_NET_DSA_TAG_TRAILER is not set
++CONFIG_NET_DSA_MV88E6XXX=y
++# CONFIG_NET_DSA_MV88E6060 is not set
++# CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set
++# CONFIG_NET_DSA_MV88E6131 is not set
++CONFIG_NET_DSA_MV88E6123_61_65=y
++CONFIG_VLAN_8021Q=m
++# CONFIG_VLAN_8021Q_GVRP is not set
++# CONFIG_DECNET is not set
++CONFIG_LLC=m
++# CONFIG_LLC2 is not set
++# CONFIG_IPX is not set
++CONFIG_ATALK=m
++CONFIG_DEV_APPLETALK=m
++# CONFIG_IPDDP is not set
++# CONFIG_X25 is not set
++# CONFIG_LAPB is not set
++# CONFIG_ECONET is not set
++# CONFIG_WAN_ROUTER is not set
++# CONFIG_PHONET is not set
++# CONFIG_IEEE802154 is not set
++CONFIG_NET_SCHED=y
++
++#
++# Queueing/Scheduling
++#
++CONFIG_NET_SCH_CBQ=m
++CONFIG_NET_SCH_HTB=m
++CONFIG_NET_SCH_HFSC=m
++CONFIG_NET_SCH_PRIO=m
++CONFIG_NET_SCH_MULTIQ=m
++CONFIG_NET_SCH_RED=m
++CONFIG_NET_SCH_SFQ=m
++CONFIG_NET_SCH_TEQL=m
++CONFIG_NET_SCH_TBF=m
++CONFIG_NET_SCH_GRED=m
++CONFIG_NET_SCH_DSMARK=m
++CONFIG_NET_SCH_NETEM=m
++CONFIG_NET_SCH_DRR=m
++# CONFIG_NET_SCH_INGRESS is not set
++
++#
++# Classification
++#
++CONFIG_NET_CLS=y
++CONFIG_NET_CLS_BASIC=m
++CONFIG_NET_CLS_TCINDEX=m
++CONFIG_NET_CLS_ROUTE4=m
++CONFIG_NET_CLS_ROUTE=y
++CONFIG_NET_CLS_FW=m
++CONFIG_NET_CLS_U32=m
++CONFIG_CLS_U32_PERF=y
++CONFIG_CLS_U32_MARK=y
++CONFIG_NET_CLS_RSVP=m
++CONFIG_NET_CLS_RSVP6=m
++CONFIG_NET_CLS_FLOW=m
++CONFIG_NET_EMATCH=y
++CONFIG_NET_EMATCH_STACK=32
++CONFIG_NET_EMATCH_CMP=m
++CONFIG_NET_EMATCH_NBYTE=m
++CONFIG_NET_EMATCH_U32=m
++CONFIG_NET_EMATCH_META=m
++CONFIG_NET_EMATCH_TEXT=m
++CONFIG_NET_CLS_ACT=y
++# CONFIG_NET_ACT_POLICE is not set
++# CONFIG_NET_ACT_GACT is not set
++# CONFIG_NET_ACT_MIRRED is not set
++# CONFIG_NET_ACT_IPT is not set
++# CONFIG_NET_ACT_NAT is not set
++# CONFIG_NET_ACT_PEDIT is not set
++# CONFIG_NET_ACT_SIMP is not set
++# CONFIG_NET_ACT_SKBEDIT is not set
++# CONFIG_NET_CLS_IND is not set
++CONFIG_NET_SCH_FIFO=y
++# CONFIG_DCB is not set
++
++#
++# Network testing
++#
++CONFIG_NET_PKTGEN=m
++# CONFIG_NET_TCPPROBE is not set
++# CONFIG_HAMRADIO is not set
++# CONFIG_CAN is not set
++# CONFIG_IRDA is not set
++CONFIG_BT=m
++CONFIG_BT_L2CAP=m
++CONFIG_BT_SCO=m
++CONFIG_BT_RFCOMM=m
++CONFIG_BT_RFCOMM_TTY=y
++CONFIG_BT_BNEP=m
++# CONFIG_BT_BNEP_MC_FILTER is not set
++# CONFIG_BT_BNEP_PROTO_FILTER is not set
++CONFIG_BT_HIDP=m
++
++#
++# Bluetooth device drivers
++#
++CONFIG_BT_HCIBTUSB=m
++CONFIG_BT_HCIBTSDIO=m
++# CONFIG_BT_HCIUART is not set
++CONFIG_BT_HCIBCM203X=m
++CONFIG_BT_HCIBPA10X=m
++CONFIG_BT_HCIBFUSB=m
++CONFIG_BT_HCIVHCI=m
++CONFIG_BT_MRVL=m
++CONFIG_BT_MRVL_SDIO=m
++# CONFIG_BT_ATH3K is not set
++# CONFIG_AF_RXRPC is not set
++CONFIG_WIRELESS=y
++CONFIG_WIRELESS_EXT=y
++CONFIG_WEXT_CORE=y
++CONFIG_WEXT_PROC=y
++CONFIG_WEXT_SPY=y
++CONFIG_CFG80211=y
++# CONFIG_NL80211_TESTMODE is not set
++# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
++# CONFIG_CFG80211_REG_DEBUG is not set
++CONFIG_CFG80211_DEFAULT_PS=y
++# CONFIG_CFG80211_DEBUGFS is not set
++CONFIG_WIRELESS_OLD_REGULATORY=y
++CONFIG_CFG80211_WEXT=y
++CONFIG_WIRELESS_EXT_SYSFS=y
++CONFIG_LIB80211=y
++# CONFIG_LIB80211_DEBUG is not set
++CONFIG_MAC80211=y
++CONFIG_MAC80211_RC_MINSTREL=y
++# CONFIG_MAC80211_RC_DEFAULT_PID is not set
++CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
++CONFIG_MAC80211_RC_DEFAULT="minstrel"
++# CONFIG_MAC80211_MESH is not set
++# CONFIG_MAC80211_LEDS is not set
++# CONFIG_MAC80211_DEBUGFS is not set
++# CONFIG_MAC80211_DEBUG_MENU is not set
++# CONFIG_WIMAX is not set
++# CONFIG_RFKILL is not set
++# CONFIG_NET_9P is not set
++
++#
++# Device Drivers
++#
++
++#
++# Generic Driver Options
++#
++CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
++# CONFIG_DEVTMPFS is not set
++CONFIG_STANDALONE=y
++CONFIG_PREVENT_FIRMWARE_BUILD=y
++CONFIG_FW_LOADER=y
++CONFIG_FIRMWARE_IN_KERNEL=y
++CONFIG_EXTRA_FIRMWARE=""
++# CONFIG_DEBUG_DRIVER is not set
++# CONFIG_DEBUG_DEVRES is not set
++# CONFIG_SYS_HYPERVISOR is not set
++# CONFIG_CONNECTOR is not set
++CONFIG_MTD=y
++# CONFIG_MTD_DEBUG is not set
++# CONFIG_MTD_TESTS is not set
++# CONFIG_MTD_CONCAT is not set
++CONFIG_MTD_PARTITIONS=y
++# CONFIG_MTD_REDBOOT_PARTS is not set
++CONFIG_MTD_CMDLINE_PARTS=y
++# CONFIG_MTD_AFS_PARTS is not set
++# CONFIG_MTD_AR7_PARTS is not set
++
++#
++# User Modules And Translation Layers
++#
++CONFIG_MTD_CHAR=y
++CONFIG_MTD_BLKDEVS=y
++CONFIG_MTD_BLOCK=y
++# CONFIG_FTL is not set
++# CONFIG_NFTL is not set
++# CONFIG_INFTL is not set
++# CONFIG_RFD_FTL is not set
++# CONFIG_SSFDC is not set
++# CONFIG_MTD_OOPS is not set
++
++#
++# RAM/ROM/Flash chip drivers
++#
++CONFIG_MTD_CFI=y
++CONFIG_MTD_JEDECPROBE=y
++CONFIG_MTD_GEN_PROBE=y
++CONFIG_MTD_CFI_ADV_OPTIONS=y
++CONFIG_MTD_CFI_NOSWAP=y
++# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
++# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
++CONFIG_MTD_CFI_GEOMETRY=y
++CONFIG_MTD_MAP_BANK_WIDTH_1=y
++CONFIG_MTD_MAP_BANK_WIDTH_2=y
++# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set
++# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
++# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
++# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
++CONFIG_MTD_CFI_I1=y
++CONFIG_MTD_CFI_I2=y
++# CONFIG_MTD_CFI_I4 is not set
++# CONFIG_MTD_CFI_I8 is not set
++# CONFIG_MTD_OTP is not set
++CONFIG_MTD_CFI_INTELEXT=y
++# CONFIG_MTD_CFI_AMDSTD is not set
++CONFIG_MTD_CFI_STAA=y
++CONFIG_MTD_CFI_UTIL=y
++# CONFIG_MTD_RAM is not set
++# CONFIG_MTD_ROM is not set
++# CONFIG_MTD_ABSENT is not set
++
++#
++# Mapping drivers for chip access
++#
++# CONFIG_MTD_COMPLEX_MAPPINGS is not set
++CONFIG_MTD_PHYSMAP=y
++# CONFIG_MTD_PHYSMAP_COMPAT is not set
++# CONFIG_MTD_ARM_INTEGRATOR is not set
++# CONFIG_MTD_IMPA7 is not set
++# CONFIG_MTD_INTEL_VR_NOR is not set
++# CONFIG_MTD_PLATRAM is not set
++
++#
++# Self-contained MTD device drivers
++#
++# CONFIG_MTD_PMC551 is not set
++# CONFIG_MTD_DATAFLASH is not set
++CONFIG_MTD_M25P80=y
++CONFIG_M25PXX_USE_FAST_READ=y
++# CONFIG_MTD_SST25L is not set
++# CONFIG_MTD_SLRAM is not set
++# CONFIG_MTD_PHRAM is not set
++# CONFIG_MTD_MTDRAM is not set
++# CONFIG_MTD_BLOCK2MTD is not set
++
++#
++# Disk-On-Chip Device Drivers
++#
++# CONFIG_MTD_DOC2000 is not set
++# CONFIG_MTD_DOC2001 is not set
++# CONFIG_MTD_DOC2001PLUS is not set
++CONFIG_MTD_NAND=y
++# CONFIG_MTD_NAND_VERIFY_WRITE is not set
++# CONFIG_MTD_NAND_ECC_SMC is not set
++# CONFIG_MTD_NAND_MUSEUM_IDS is not set
++# CONFIG_MTD_NAND_GPIO is not set
++CONFIG_MTD_NAND_IDS=y
++# CONFIG_MTD_NAND_DISKONCHIP is not set
++# CONFIG_MTD_NAND_CAFE is not set
++# CONFIG_MTD_NAND_NANDSIM is not set
++# CONFIG_MTD_NAND_PLATFORM is not set
++# CONFIG_MTD_ALAUDA is not set
++CONFIG_MTD_NAND_ORION=y
++# CONFIG_MTD_ONENAND is not set
++
++#
++# LPDDR flash memory drivers
++#
++# CONFIG_MTD_LPDDR is not set
++
++#
++# UBI - Unsorted block images
++#
++CONFIG_MTD_UBI=y
++CONFIG_MTD_UBI_WL_THRESHOLD=4096
++CONFIG_MTD_UBI_BEB_RESERVE=1
++# CONFIG_MTD_UBI_GLUEBI is not set
++
++#
++# UBI debugging options
++#
++# CONFIG_MTD_UBI_DEBUG is not set
++# CONFIG_PARPORT is not set
++CONFIG_BLK_DEV=y
++# CONFIG_BLK_CPQ_DA is not set
++# CONFIG_BLK_CPQ_CISS_DA is not set
++# CONFIG_BLK_DEV_DAC960 is not set
++# CONFIG_BLK_DEV_UMEM is not set
++# CONFIG_BLK_DEV_COW_COMMON is not set
++CONFIG_BLK_DEV_LOOP=y
++# CONFIG_BLK_DEV_CRYPTOLOOP is not set
++
++#
++# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
++#
++# CONFIG_BLK_DEV_NBD is not set
++# CONFIG_BLK_DEV_SX8 is not set
++# CONFIG_BLK_DEV_UB is not set
++CONFIG_BLK_DEV_RAM=y
++CONFIG_BLK_DEV_RAM_COUNT=16
++CONFIG_BLK_DEV_RAM_SIZE=8192
++# CONFIG_BLK_DEV_XIP is not set
++# CONFIG_CDROM_PKTCDVD is not set
++CONFIG_ATA_OVER_ETH=m
++# CONFIG_MG_DISK is not set
++# CONFIG_MISC_DEVICES is not set
++CONFIG_EEPROM_93CX6=m
++CONFIG_HAVE_IDE=y
++# CONFIG_IDE is not set
++
++#
++# SCSI device support
++#
++# CONFIG_RAID_ATTRS is not set
++CONFIG_SCSI=y
++CONFIG_SCSI_DMA=y
++# CONFIG_SCSI_TGT is not set
++# CONFIG_SCSI_NETLINK is not set
++# CONFIG_SCSI_PROC_FS is not set
++
++#
++# SCSI support type (disk, tape, CD-ROM)
++#
++CONFIG_BLK_DEV_SD=y
++# CONFIG_CHR_DEV_ST is not set
++# CONFIG_CHR_DEV_OSST is not set
++CONFIG_BLK_DEV_SR=m
++# CONFIG_BLK_DEV_SR_VENDOR is not set
++CONFIG_CHR_DEV_SG=y
++# CONFIG_CHR_DEV_SCH is not set
++CONFIG_SCSI_MULTI_LUN=y
++# CONFIG_SCSI_CONSTANTS is not set
++# CONFIG_SCSI_LOGGING is not set
++# CONFIG_SCSI_SCAN_ASYNC is not set
++CONFIG_SCSI_WAIT_SCAN=m
++
++#
++# SCSI Transports
++#
++# CONFIG_SCSI_SPI_ATTRS is not set
++# CONFIG_SCSI_FC_ATTRS is not set
++# CONFIG_SCSI_ISCSI_ATTRS is not set
++# CONFIG_SCSI_SAS_LIBSAS is not set
++# CONFIG_SCSI_SRP_ATTRS is not set
++CONFIG_SCSI_LOWLEVEL=y
++# CONFIG_ISCSI_TCP is not set
++# CONFIG_SCSI_BNX2_ISCSI is not set
++# CONFIG_BE2ISCSI is not set
++# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
++# CONFIG_SCSI_HPSA is not set
++# CONFIG_SCSI_3W_9XXX is not set
++# CONFIG_SCSI_3W_SAS is not set
++# CONFIG_SCSI_ACARD is not set
++# CONFIG_SCSI_AACRAID is not set
++# CONFIG_SCSI_AIC7XXX is not set
++# CONFIG_SCSI_AIC7XXX_OLD is not set
++# CONFIG_SCSI_AIC79XX is not set
++# CONFIG_SCSI_AIC94XX is not set
++# CONFIG_SCSI_MVSAS is not set
++# CONFIG_SCSI_DPT_I2O is not set
++# CONFIG_SCSI_ADVANSYS is not set
++# CONFIG_SCSI_ARCMSR is not set
++# CONFIG_MEGARAID_NEWGEN is not set
++# CONFIG_MEGARAID_LEGACY is not set
++# CONFIG_MEGARAID_SAS is not set
++# CONFIG_SCSI_MPT2SAS is not set
++# CONFIG_SCSI_HPTIOP is not set
++# CONFIG_LIBFC is not set
++# CONFIG_LIBFCOE is not set
++# CONFIG_FCOE is not set
++# CONFIG_SCSI_DMX3191D is not set
++# CONFIG_SCSI_FUTURE_DOMAIN is not set
++# CONFIG_SCSI_IPS is not set
++# CONFIG_SCSI_INITIO is not set
++# CONFIG_SCSI_INIA100 is not set
++# CONFIG_SCSI_STEX is not set
++# CONFIG_SCSI_SYM53C8XX_2 is not set
++# CONFIG_SCSI_IPR is not set
++# CONFIG_SCSI_QLOGIC_1280 is not set
++# CONFIG_SCSI_QLA_FC is not set
++# CONFIG_SCSI_QLA_ISCSI is not set
++# CONFIG_SCSI_LPFC is not set
++# CONFIG_SCSI_DC395x is not set
++# CONFIG_SCSI_DC390T is not set
++# CONFIG_SCSI_NSP32 is not set
++# CONFIG_SCSI_DEBUG is not set
++# CONFIG_SCSI_PMCRAID is not set
++# CONFIG_SCSI_PM8001 is not set
++# CONFIG_SCSI_SRP is not set
++# CONFIG_SCSI_BFA_FC is not set
++# CONFIG_SCSI_DH is not set
++# CONFIG_SCSI_OSD_INITIATOR is not set
++CONFIG_ATA=y
++# CONFIG_ATA_NONSTANDARD is not set
++CONFIG_ATA_VERBOSE_ERROR=y
++CONFIG_SATA_PMP=y
++# CONFIG_SATA_AHCI is not set
++# CONFIG_SATA_SIL24 is not set
++CONFIG_ATA_SFF=y
++# CONFIG_SATA_SVW is not set
++# CONFIG_ATA_PIIX is not set
++CONFIG_SATA_MV=m
++# CONFIG_SATA_NV is not set
++# CONFIG_PDC_ADMA is not set
++# CONFIG_SATA_QSTOR is not set
++# CONFIG_SATA_PROMISE is not set
++# CONFIG_SATA_SX4 is not set
++# CONFIG_SATA_SIL is not set
++# CONFIG_SATA_SIS is not set
++# CONFIG_SATA_ULI is not set
++# CONFIG_SATA_VIA is not set
++# CONFIG_SATA_VITESSE is not set
++# CONFIG_SATA_INIC162X is not set
++# CONFIG_PATA_ALI is not set
++# CONFIG_PATA_AMD is not set
++# CONFIG_PATA_ARTOP is not set
++# CONFIG_PATA_ATP867X is not set
++# CONFIG_PATA_ATIIXP is not set
++# CONFIG_PATA_CMD640_PCI is not set
++# CONFIG_PATA_CMD64X is not set
++# CONFIG_PATA_CS5520 is not set
++# CONFIG_PATA_CS5530 is not set
++# CONFIG_PATA_CYPRESS is not set
++# CONFIG_PATA_EFAR is not set
++# CONFIG_ATA_GENERIC is not set
++# CONFIG_PATA_HPT366 is not set
++# CONFIG_PATA_HPT37X is not set
++# CONFIG_PATA_HPT3X2N is not set
++# CONFIG_PATA_HPT3X3 is not set
++# CONFIG_PATA_IT821X is not set
++# CONFIG_PATA_IT8213 is not set
++# CONFIG_PATA_JMICRON is not set
++# CONFIG_PATA_TRIFLEX is not set
++# CONFIG_PATA_MARVELL is not set
++# CONFIG_PATA_MPIIX is not set
++# CONFIG_PATA_OLDPIIX is not set
++# CONFIG_PATA_NETCELL is not set
++# CONFIG_PATA_NINJA32 is not set
++# CONFIG_PATA_NS87410 is not set
++# CONFIG_PATA_NS87415 is not set
++# CONFIG_PATA_OPTI is not set
++# CONFIG_PATA_OPTIDMA is not set
++# CONFIG_PATA_PDC2027X is not set
++# CONFIG_PATA_PDC_OLD is not set
++# CONFIG_PATA_RADISYS is not set
++# CONFIG_PATA_RDC is not set
++# CONFIG_PATA_RZ1000 is not set
++# CONFIG_PATA_SC1200 is not set
++# CONFIG_PATA_SERVERWORKS is not set
++# CONFIG_PATA_SIL680 is not set
++# CONFIG_PATA_SIS is not set
++# CONFIG_PATA_TOSHIBA is not set
++# CONFIG_PATA_VIA is not set
++# CONFIG_PATA_WINBOND is not set
++# CONFIG_PATA_SCH is not set
++CONFIG_MD=y
++CONFIG_BLK_DEV_MD=m
++CONFIG_MD_LINEAR=m
++CONFIG_MD_RAID0=m
++CONFIG_MD_RAID1=m
++CONFIG_MD_RAID10=m
++CONFIG_MD_RAID456=m
++CONFIG_MD_RAID6_PQ=m
++# CONFIG_ASYNC_RAID6_TEST is not set
++# CONFIG_MD_MULTIPATH is not set
++# CONFIG_MD_FAULTY is not set
++CONFIG_BLK_DEV_DM=m
++# CONFIG_DM_DEBUG is not set
++CONFIG_DM_CRYPT=m
++CONFIG_DM_SNAPSHOT=m
++CONFIG_DM_MIRROR=m
++# CONFIG_DM_LOG_USERSPACE is not set
++CONFIG_DM_ZERO=m
++CONFIG_DM_MULTIPATH=m
++# CONFIG_DM_MULTIPATH_QL is not set
++# CONFIG_DM_MULTIPATH_ST is not set
++# CONFIG_DM_DELAY is not set
++# CONFIG_DM_UEVENT is not set
++# CONFIG_FUSION is not set
++
++#
++# IEEE 1394 (FireWire) support
++#
++
++#
++# You can enable one or both FireWire driver stacks.
++#
++
++#
++# The newer stack is recommended.
++#
++# CONFIG_FIREWIRE is not set
++# CONFIG_IEEE1394 is not set
++# CONFIG_I2O is not set
++CONFIG_NETDEVICES=y
++# CONFIG_IFB is not set
++# CONFIG_DUMMY is not set
++# CONFIG_BONDING is not set
++# CONFIG_MACVLAN is not set
++# CONFIG_EQUALIZER is not set
++CONFIG_TUN=m
++# CONFIG_VETH is not set
++# CONFIG_ARCNET is not set
++CONFIG_PHYLIB=y
++
++#
++# MII PHY device drivers
++#
++CONFIG_MARVELL_PHY=y
++# CONFIG_DAVICOM_PHY is not set
++# CONFIG_QSEMI_PHY is not set
++# CONFIG_LXT_PHY is not set
++# CONFIG_CICADA_PHY is not set
++# CONFIG_VITESSE_PHY is not set
++# CONFIG_SMSC_PHY is not set
++# CONFIG_BROADCOM_PHY is not set
++# CONFIG_ICPLUS_PHY is not set
++# CONFIG_REALTEK_PHY is not set
++# CONFIG_NATIONAL_PHY is not set
++# CONFIG_STE10XP is not set
++# CONFIG_LSI_ET1011C_PHY is not set
++# CONFIG_FIXED_PHY is not set
++# CONFIG_MDIO_BITBANG is not set
++CONFIG_NET_ETHERNET=y
++CONFIG_MII=y
++# CONFIG_AX88796 is not set
++# CONFIG_HAPPYMEAL is not set
++# CONFIG_SUNGEM is not set
++# CONFIG_CASSINI is not set
++# CONFIG_NET_VENDOR_3COM is not set
++# CONFIG_SMC91X is not set
++# CONFIG_DM9000 is not set
++# CONFIG_ENC28J60 is not set
++# CONFIG_ETHOC is not set
++# CONFIG_SMC911X is not set
++# CONFIG_SMSC911X is not set
++# CONFIG_DNET is not set
++# CONFIG_NET_TULIP is not set
++# CONFIG_HP100 is not set
++# CONFIG_IBM_NEW_EMAC_ZMII is not set
++# CONFIG_IBM_NEW_EMAC_RGMII is not set
++# CONFIG_IBM_NEW_EMAC_TAH is not set
++# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
++# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
++# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
++# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
++CONFIG_NET_PCI=y
++# CONFIG_PCNET32 is not set
++# CONFIG_AMD8111_ETH is not set
++# CONFIG_ADAPTEC_STARFIRE is not set
++# CONFIG_B44 is not set
++# CONFIG_FORCEDETH is not set
++# CONFIG_E100 is not set
++# CONFIG_FEALNX is not set
++# CONFIG_NATSEMI is not set
++# CONFIG_NE2K_PCI is not set
++# CONFIG_8139CP is not set
++# CONFIG_8139TOO is not set
++# CONFIG_R6040 is not set
++# CONFIG_SIS900 is not set
++# CONFIG_EPIC100 is not set
++# CONFIG_SMSC9420 is not set
++# CONFIG_SUNDANCE is not set
++# CONFIG_TLAN is not set
++# CONFIG_KS8842 is not set
++# CONFIG_KS8851 is not set
++# CONFIG_KS8851_MLL is not set
++# CONFIG_VIA_RHINE is not set
++# CONFIG_SC92031 is not set
++# CONFIG_ATL2 is not set
++CONFIG_NETDEV_1000=y
++# CONFIG_ACENIC is not set
++# CONFIG_DL2K is not set
++# CONFIG_E1000 is not set
++# CONFIG_E1000E is not set
++# CONFIG_IP1000 is not set
++# CONFIG_IGB is not set
++# CONFIG_IGBVF is not set
++# CONFIG_NS83820 is not set
++# CONFIG_HAMACHI is not set
++# CONFIG_YELLOWFIN is not set
++# CONFIG_R8169 is not set
++# CONFIG_SIS190 is not set
++# CONFIG_SKGE is not set
++# CONFIG_SKY2 is not set
++# CONFIG_VIA_VELOCITY is not set
++# CONFIG_TIGON3 is not set
++# CONFIG_BNX2 is not set
++# CONFIG_CNIC is not set
++CONFIG_MV643XX_ETH=y
++# CONFIG_QLA3XXX is not set
++# CONFIG_ATL1 is not set
++# CONFIG_ATL1E is not set
++# CONFIG_ATL1C is not set
++# CONFIG_JME is not set
++# CONFIG_NETDEV_10000 is not set
++# CONFIG_TR is not set
++CONFIG_WLAN=y
++# CONFIG_LIBERTAS_THINFIRM is not set
++CONFIG_LIBERTAS_UAP=m
++# CONFIG_ATMEL is not set
++# CONFIG_AT76C50X_USB is not set
++# CONFIG_PRISM54 is not set
++# CONFIG_USB_ZD1201 is not set
++CONFIG_USB_NET_RNDIS_WLAN=m
++# CONFIG_RTL8180 is not set
++CONFIG_RTL8187=m
++# CONFIG_ADM8211 is not set
++# CONFIG_MAC80211_HWSIM is not set
++# CONFIG_MWL8K is not set
++# CONFIG_ATH_COMMON is not set
++# CONFIG_B43 is not set
++# CONFIG_B43LEGACY is not set
++# CONFIG_HOSTAP is not set
++# CONFIG_IPW2100 is not set
++# CONFIG_IPW2200 is not set
++# CONFIG_IWLWIFI is not set
++# CONFIG_IWM is not set
++CONFIG_LIBERTAS=m
++# CONFIG_LIBERTAS_USB is not set
++CONFIG_LIBERTAS_SDIO=m
++# CONFIG_LIBERTAS_SPI is not set
++# CONFIG_LIBERTAS_DEBUG is not set
++# CONFIG_HERMES is not set
++# CONFIG_P54_COMMON is not set
++# CONFIG_RT2X00 is not set
++# CONFIG_WL12XX is not set
++# CONFIG_ZD1211RW is not set
++
++#
++# Enable WiMAX (Networking options) to see the WiMAX drivers
++#
++
++#
++# USB Network Adapters
++#
++CONFIG_USB_CATC=m
++CONFIG_USB_KAWETH=m
++CONFIG_USB_PEGASUS=m
++CONFIG_USB_RTL8150=m
++CONFIG_USB_USBNET=m
++CONFIG_USB_NET_AX8817X=m
++CONFIG_USB_NET_CDCETHER=m
++# CONFIG_USB_NET_CDC_EEM is not set
++CONFIG_USB_NET_DM9601=m
++# CONFIG_USB_NET_SMSC95XX is not set
++# CONFIG_USB_NET_GL620A is not set
++CONFIG_USB_NET_NET1080=m
++# CONFIG_USB_NET_PLUSB is not set
++# CONFIG_USB_NET_MCS7830 is not set
++CONFIG_USB_NET_RNDIS_HOST=m
++CONFIG_USB_NET_CDC_SUBSET=m
++# CONFIG_USB_ALI_M5632 is not set
++# CONFIG_USB_AN2720 is not set
++CONFIG_USB_BELKIN=y
++CONFIG_USB_ARMLINUX=y
++# CONFIG_USB_EPSON2888 is not set
++# CONFIG_USB_KC2190 is not set
++CONFIG_USB_NET_ZAURUS=m
++# CONFIG_USB_NET_INT51X1 is not set
++# CONFIG_WAN is not set
++# CONFIG_FDDI is not set
++# CONFIG_HIPPI is not set
++CONFIG_PPP=m
++CONFIG_PPP_MULTILINK=y
++CONFIG_PPP_FILTER=y
++CONFIG_PPP_ASYNC=m
++CONFIG_PPP_SYNC_TTY=m
++CONFIG_PPP_DEFLATE=m
++CONFIG_PPP_BSDCOMP=m
++CONFIG_PPP_MPPE=m
++CONFIG_PPPOE=m
++CONFIG_PPPOL2TP=m
++# CONFIG_SLIP is not set
++CONFIG_SLHC=m
++# CONFIG_NET_FC is not set
++# CONFIG_NETCONSOLE is not set
++# CONFIG_NETPOLL is not set
++# CONFIG_NET_POLL_CONTROLLER is not set
++# CONFIG_VMXNET3 is not set
++# CONFIG_ISDN is not set
++# CONFIG_PHONE is not set
++
++#
++# Input device support
++#
++CONFIG_INPUT=y
++# CONFIG_INPUT_FF_MEMLESS is not set
++# CONFIG_INPUT_POLLDEV is not set
++# CONFIG_INPUT_SPARSEKMAP is not set
++
++#
++# Userland interfaces
++#
++CONFIG_INPUT_MOUSEDEV=y
++CONFIG_INPUT_MOUSEDEV_PSAUX=y
++CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
++CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
++# CONFIG_INPUT_JOYDEV is not set
++CONFIG_INPUT_EVDEV=y
++# CONFIG_INPUT_EVBUG is not set
++
++#
++# Input Device Drivers
++#
++CONFIG_INPUT_KEYBOARD=y
++# CONFIG_KEYBOARD_ADP5588 is not set
++CONFIG_KEYBOARD_ATKBD=y
++# CONFIG_QT2160 is not set
++# CONFIG_KEYBOARD_LKKBD is not set
++CONFIG_KEYBOARD_GPIO=y
++# CONFIG_KEYBOARD_MATRIX is not set
++# CONFIG_KEYBOARD_LM8323 is not set
++# CONFIG_KEYBOARD_MAX7359 is not set
++# CONFIG_KEYBOARD_NEWTON is not set
++# CONFIG_KEYBOARD_OPENCORES is not set
++# CONFIG_KEYBOARD_STOWAWAY is not set
++# CONFIG_KEYBOARD_SUNKBD is not set
++# CONFIG_KEYBOARD_XTKBD is not set
++# CONFIG_INPUT_MOUSE is not set
++# CONFIG_INPUT_JOYSTICK is not set
++# CONFIG_INPUT_TABLET is not set
++# CONFIG_INPUT_TOUCHSCREEN is not set
++# CONFIG_INPUT_MISC is not set
++
++#
++# Hardware I/O ports
++#
++CONFIG_SERIO=y
++CONFIG_SERIO_SERPORT=y
++# CONFIG_SERIO_PCIPS2 is not set
++CONFIG_SERIO_LIBPS2=y
++# CONFIG_SERIO_RAW is not set
++# CONFIG_SERIO_ALTERA_PS2 is not set
++# CONFIG_GAMEPORT is not set
++
++#
++# Character devices
++#
++CONFIG_VT=y
++CONFIG_CONSOLE_TRANSLATIONS=y
++CONFIG_VT_CONSOLE=y
++CONFIG_HW_CONSOLE=y
++# CONFIG_VT_HW_CONSOLE_BINDING is not set
++# CONFIG_DEVKMEM is not set
++# CONFIG_SERIAL_NONSTANDARD is not set
++# CONFIG_NOZOMI is not set
++
++#
++# Serial drivers
++#
++CONFIG_SERIAL_8250=y
++CONFIG_SERIAL_8250_CONSOLE=y
++CONFIG_SERIAL_8250_PCI=y
++CONFIG_SERIAL_8250_NR_UARTS=4
++CONFIG_SERIAL_8250_RUNTIME_UARTS=2
++# CONFIG_SERIAL_8250_EXTENDED is not set
++
++#
++# Non-8250 serial port support
++#
++# CONFIG_SERIAL_MAX3100 is not set
++CONFIG_SERIAL_CORE=y
++CONFIG_SERIAL_CORE_CONSOLE=y
++# CONFIG_SERIAL_JSM is not set
++CONFIG_UNIX98_PTYS=y
++# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
++CONFIG_LEGACY_PTYS=y
++CONFIG_LEGACY_PTY_COUNT=16
++# CONFIG_IPMI_HANDLER is not set
++# CONFIG_HW_RANDOM is not set
++# CONFIG_R3964 is not set
++# CONFIG_APPLICOM is not set
++# CONFIG_RAW_DRIVER is not set
++# CONFIG_TCG_TPM is not set
++CONFIG_DEVPORT=y
++CONFIG_I2C=y
++CONFIG_I2C_BOARDINFO=y
++CONFIG_I2C_COMPAT=y
++CONFIG_I2C_CHARDEV=y
++CONFIG_I2C_HELPER_AUTO=y
++CONFIG_I2C_ALGOBIT=m
++
++#
++# I2C Hardware Bus support
++#
++
++#
++# PC SMBus host controller drivers
++#
++# CONFIG_I2C_ALI1535 is not set
++# CONFIG_I2C_ALI1563 is not set
++# CONFIG_I2C_ALI15X3 is not set
++# CONFIG_I2C_AMD756 is not set
++# CONFIG_I2C_AMD8111 is not set
++# CONFIG_I2C_I801 is not set
++# CONFIG_I2C_ISCH is not set
++# CONFIG_I2C_PIIX4 is not set
++# CONFIG_I2C_NFORCE2 is not set
++# CONFIG_I2C_SIS5595 is not set
++# CONFIG_I2C_SIS630 is not set
++# CONFIG_I2C_SIS96X is not set
++# CONFIG_I2C_VIA is not set
++# CONFIG_I2C_VIAPRO is not set
++
++#
++# I2C system bus drivers (mostly embedded / system-on-chip)
++#
++# CONFIG_I2C_GPIO is not set
++CONFIG_I2C_MV64XXX=y
++# CONFIG_I2C_OCORES is not set
++# CONFIG_I2C_SIMTEC is not set
++
++#
++# External I2C/SMBus adapter drivers
++#
++# CONFIG_I2C_PARPORT_LIGHT is not set
++# CONFIG_I2C_TAOS_EVM is not set
++# CONFIG_I2C_TINY_USB is not set
++
++#
++# Other I2C/SMBus bus drivers
++#
++# CONFIG_I2C_PCA_PLATFORM is not set
++# CONFIG_I2C_STUB is not set
++
++#
++# Miscellaneous I2C Chip support
++#
++# CONFIG_SENSORS_TSL2550 is not set
++# CONFIG_I2C_DEBUG_CORE is not set
++# CONFIG_I2C_DEBUG_ALGO is not set
++# CONFIG_I2C_DEBUG_BUS is not set
++# CONFIG_I2C_DEBUG_CHIP is not set
++CONFIG_SPI=y
++# CONFIG_SPI_DEBUG is not set
++CONFIG_SPI_MASTER=y
++
++#
++# SPI Master Controller Drivers
++#
++# CONFIG_SPI_BITBANG is not set
++# CONFIG_SPI_GPIO is not set
++CONFIG_SPI_ORION=y
++# CONFIG_SPI_XILINX is not set
++# CONFIG_SPI_DESIGNWARE is not set
++
++#
++# SPI Protocol Masters
++#
++# CONFIG_SPI_SPIDEV is not set
++# CONFIG_SPI_TLE62X0 is not set
++
++#
++# PPS support
++#
++# CONFIG_PPS is not set
++CONFIG_ARCH_REQUIRE_GPIOLIB=y
++CONFIG_GPIOLIB=y
++# CONFIG_DEBUG_GPIO is not set
++# CONFIG_GPIO_SYSFS is not set
++
++#
++# Memory mapped GPIO expanders:
++#
++
++#
++# I2C GPIO expanders:
++#
++# CONFIG_GPIO_MAX732X is not set
++# CONFIG_GPIO_PCA953X is not set
++# CONFIG_GPIO_PCF857X is not set
++# CONFIG_GPIO_ADP5588 is not set
++
++#
++# PCI GPIO expanders:
++#
++# CONFIG_GPIO_CS5535 is not set
++# CONFIG_GPIO_BT8XX is not set
++# CONFIG_GPIO_LANGWELL is not set
++
++#
++# SPI GPIO expanders:
++#
++# CONFIG_GPIO_MAX7301 is not set
++# CONFIG_GPIO_MCP23S08 is not set
++# CONFIG_GPIO_MC33880 is not set
++
++#
++# AC97 GPIO expanders:
++#
++# CONFIG_W1 is not set
++# CONFIG_POWER_SUPPLY is not set
++# CONFIG_HWMON is not set
++# CONFIG_THERMAL is not set
++CONFIG_WATCHDOG=y
++# CONFIG_WATCHDOG_NOWAYOUT is not set
++
++#
++# Watchdog Device Drivers
++#
++CONFIG_SOFT_WATCHDOG=m
++CONFIG_ORION_WATCHDOG=m
++# CONFIG_ALIM7101_WDT is not set
++
++#
++# PCI-based Watchdog Cards
++#
++# CONFIG_PCIPCWATCHDOG is not set
++# CONFIG_WDTPCI is not set
++
++#
++# USB-based Watchdog Cards
++#
++# CONFIG_USBPCWATCHDOG is not set
++CONFIG_SSB_POSSIBLE=y
++
++#
++# Sonics Silicon Backplane
++#
++# CONFIG_SSB is not set
++
++#
++# Multifunction device drivers
++#
++# CONFIG_MFD_CORE is not set
++# CONFIG_MFD_SM501 is not set
++# CONFIG_MFD_ASIC3 is not set
++# CONFIG_HTC_EGPIO is not set
++# CONFIG_HTC_PASIC3 is not set
++# CONFIG_TPS65010 is not set
++# CONFIG_TWL4030_CORE is not set
++# CONFIG_MFD_TMIO is not set
++# CONFIG_MFD_TC6393XB is not set
++# CONFIG_PMIC_DA903X is not set
++# CONFIG_PMIC_ADP5520 is not set
++# CONFIG_MFD_WM8400 is not set
++# CONFIG_MFD_WM831X is not set
++# CONFIG_MFD_WM8350_I2C is not set
++# CONFIG_MFD_PCF50633 is not set
++# CONFIG_MFD_MC13783 is not set
++# CONFIG_AB3100_CORE is not set
++# CONFIG_EZX_PCAP is not set
++# CONFIG_MFD_88PM8607 is not set
++# CONFIG_AB4500_CORE is not set
++# CONFIG_REGULATOR is not set
++CONFIG_MEDIA_SUPPORT=m
++
++#
++# Multimedia core support
++#
++CONFIG_VIDEO_DEV=m
++CONFIG_VIDEO_V4L2_COMMON=m
++CONFIG_VIDEO_ALLOW_V4L1=y
++CONFIG_VIDEO_V4L1_COMPAT=y
++CONFIG_DVB_CORE=m
++CONFIG_VIDEO_MEDIA=m
++
++#
++# Multimedia drivers
++#
++CONFIG_IR_CORE=m
++CONFIG_VIDEO_IR=m
++CONFIG_MEDIA_ATTACH=y
++CONFIG_MEDIA_TUNER=m
++CONFIG_MEDIA_TUNER_CUSTOMISE=y
++CONFIG_MEDIA_TUNER_SIMPLE=m
++CONFIG_MEDIA_TUNER_TDA8290=m
++CONFIG_MEDIA_TUNER_TDA827X=m
++CONFIG_MEDIA_TUNER_TDA18271=m
++CONFIG_MEDIA_TUNER_TDA9887=m
++CONFIG_MEDIA_TUNER_TEA5761=m
++CONFIG_MEDIA_TUNER_TEA5767=m
++CONFIG_MEDIA_TUNER_MT20XX=m
++CONFIG_MEDIA_TUNER_MT2060=m
++CONFIG_MEDIA_TUNER_MT2266=m
++CONFIG_MEDIA_TUNER_MT2131=m
++CONFIG_MEDIA_TUNER_QT1010=m
++CONFIG_MEDIA_TUNER_XC2028=m
++CONFIG_MEDIA_TUNER_XC5000=m
++CONFIG_MEDIA_TUNER_MXL5005S=m
++CONFIG_MEDIA_TUNER_MXL5007T=m
++CONFIG_MEDIA_TUNER_MC44S803=m
++CONFIG_MEDIA_TUNER_MAX2165=m
++CONFIG_VIDEO_V4L2=m
++CONFIG_VIDEO_V4L1=m
++CONFIG_VIDEOBUF_GEN=m
++CONFIG_VIDEOBUF_VMALLOC=m
++CONFIG_VIDEOBUF_DVB=m
++CONFIG_VIDEO_TVEEPROM=m
++CONFIG_VIDEO_TUNER=m
++CONFIG_VIDEO_CAPTURE_DRIVERS=y
++# CONFIG_VIDEO_ADV_DEBUG is not set
++# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
++CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
++CONFIG_VIDEO_IR_I2C=m
++CONFIG_VIDEO_MSP3400=m
++CONFIG_VIDEO_CS53L32A=m
++CONFIG_VIDEO_M52790=m
++CONFIG_VIDEO_WM8775=m
++CONFIG_VIDEO_WM8739=m
++CONFIG_VIDEO_VP27SMPX=m
++CONFIG_VIDEO_MT9V011=m
++CONFIG_VIDEO_SAA711X=m
++CONFIG_VIDEO_SAA717X=m
++CONFIG_VIDEO_TVP5150=m
++CONFIG_VIDEO_CX25840=m
++CONFIG_VIDEO_CX2341X=m
++CONFIG_VIDEO_SAA7127=m
++CONFIG_VIDEO_UPD64031A=m
++CONFIG_VIDEO_UPD64083=m
++# CONFIG_VIDEO_VIVI is not set
++# CONFIG_VIDEO_BT848 is not set
++# CONFIG_VIDEO_CPIA is not set
++# CONFIG_VIDEO_CPIA2 is not set
++# CONFIG_VIDEO_SAA5246A is not set
++# CONFIG_VIDEO_SAA5249 is not set
++# CONFIG_VIDEO_STRADIS is not set
++# CONFIG_VIDEO_ZORAN is not set
++# CONFIG_VIDEO_SAA7134 is not set
++# CONFIG_VIDEO_MXB is not set
++# CONFIG_VIDEO_HEXIUM_ORION is not set
++# CONFIG_VIDEO_HEXIUM_GEMINI is not set
++# CONFIG_VIDEO_CX88 is not set
++# CONFIG_VIDEO_CX23885 is not set
++# CONFIG_VIDEO_AU0828 is not set
++CONFIG_VIDEO_IVTV=m
++# CONFIG_VIDEO_FB_IVTV is not set
++# CONFIG_VIDEO_CX18 is not set
++# CONFIG_VIDEO_SAA7164 is not set
++# CONFIG_VIDEO_CAFE_CCIC is not set
++# CONFIG_SOC_CAMERA is not set
++CONFIG_V4L_USB_DRIVERS=y
++CONFIG_USB_VIDEO_CLASS=m
++CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
++CONFIG_USB_GSPCA=m
++CONFIG_USB_M5602=m
++CONFIG_USB_STV06XX=m
++CONFIG_USB_GL860=m
++CONFIG_USB_GSPCA_CONEX=m
++CONFIG_USB_GSPCA_ETOMS=m
++CONFIG_USB_GSPCA_FINEPIX=m
++CONFIG_USB_GSPCA_JEILINJ=m
++CONFIG_USB_GSPCA_MARS=m
++CONFIG_USB_GSPCA_MR97310A=m
++CONFIG_USB_GSPCA_OV519=m
++CONFIG_USB_GSPCA_OV534=m
++CONFIG_USB_GSPCA_PAC207=m
++CONFIG_USB_GSPCA_PAC7302=m
++CONFIG_USB_GSPCA_PAC7311=m
++CONFIG_USB_GSPCA_SN9C20X=m
++# CONFIG_USB_GSPCA_SN9C20X_EVDEV is not set
++CONFIG_USB_GSPCA_SONIXB=m
++CONFIG_USB_GSPCA_SONIXJ=m
++CONFIG_USB_GSPCA_SPCA500=m
++CONFIG_USB_GSPCA_SPCA501=m
++CONFIG_USB_GSPCA_SPCA505=m
++CONFIG_USB_GSPCA_SPCA506=m
++CONFIG_USB_GSPCA_SPCA508=m
++CONFIG_USB_GSPCA_SPCA561=m
++CONFIG_USB_GSPCA_SQ905=m
++CONFIG_USB_GSPCA_SQ905C=m
++CONFIG_USB_GSPCA_STK014=m
++CONFIG_USB_GSPCA_STV0680=m
++CONFIG_USB_GSPCA_SUNPLUS=m
++CONFIG_USB_GSPCA_T613=m
++CONFIG_USB_GSPCA_TV8532=m
++CONFIG_USB_GSPCA_VC032X=m
++CONFIG_USB_GSPCA_ZC3XX=m
++CONFIG_VIDEO_PVRUSB2=m
++CONFIG_VIDEO_PVRUSB2_SYSFS=y
++CONFIG_VIDEO_PVRUSB2_DVB=y
++# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
++# CONFIG_VIDEO_HDPVR is not set
++CONFIG_VIDEO_EM28XX=m
++CONFIG_VIDEO_EM28XX_ALSA=m
++CONFIG_VIDEO_EM28XX_DVB=m
++# CONFIG_VIDEO_CX231XX is not set
++# CONFIG_VIDEO_USBVISION is not set
++CONFIG_VIDEO_USBVIDEO=m
++# CONFIG_USB_VICAM is not set
++CONFIG_USB_IBMCAM=m
++# CONFIG_USB_KONICAWC is not set
++# CONFIG_USB_QUICKCAM_MESSENGER is not set
++# CONFIG_USB_ET61X251 is not set
++# CONFIG_VIDEO_OVCAMCHIP is not set
++# CONFIG_USB_OV511 is not set
++# CONFIG_USB_SE401 is not set
++# CONFIG_USB_SN9C102 is not set
++# CONFIG_USB_STV680 is not set
++# CONFIG_USB_ZC0301 is not set
++# CONFIG_USB_PWC is not set
++CONFIG_USB_PWC_INPUT_EVDEV=y
++# CONFIG_USB_ZR364XX is not set
++# CONFIG_USB_STKWEBCAM is not set
++# CONFIG_USB_S2255 is not set
++# CONFIG_RADIO_ADAPTERS is not set
++CONFIG_DVB_MAX_ADAPTERS=8
++# CONFIG_DVB_DYNAMIC_MINORS is not set
++CONFIG_DVB_CAPTURE_DRIVERS=y
++
++#
++# Supported SAA7146 based PCI Adapters
++#
++# CONFIG_TTPCI_EEPROM is not set
++# CONFIG_DVB_AV7110 is not set
++# CONFIG_DVB_BUDGET_CORE is not set
++
++#
++# Supported USB Adapters
++#
++# CONFIG_DVB_USB is not set
++# CONFIG_DVB_TTUSB_BUDGET is not set
++# CONFIG_DVB_TTUSB_DEC is not set
++# CONFIG_SMS_SIANO_MDTV is not set
++
++#
++# Supported FlexCopII (B2C2) Adapters
++#
++# CONFIG_DVB_B2C2_FLEXCOP is not set
++
++#
++# Supported BT878 Adapters
++#
++
++#
++# Supported Pluto2 Adapters
++#
++# CONFIG_DVB_PLUTO2 is not set
++
++#
++# Supported SDMC DM1105 Adapters
++#
++# CONFIG_DVB_DM1105 is not set
++
++#
++# Supported Earthsoft PT1 Adapters
++#
++# CONFIG_DVB_PT1 is not set
++
++#
++# Supported Mantis Adapters
++#
++# CONFIG_MANTIS_CORE is not set
++
++#
++# Supported DVB Frontends
++#
++# CONFIG_DVB_FE_CUSTOMISE is not set
++CONFIG_DVB_ZL10353=m
++CONFIG_DVB_TDA10048=m
++CONFIG_DVB_TDA10023=m
++CONFIG_DVB_LGDT330X=m
++CONFIG_DVB_S5H1409=m
++CONFIG_DVB_S5H1411=m
++# CONFIG_DAB is not set
++
++#
++# Graphics support
++#
++CONFIG_VGA_ARB=y
++# CONFIG_DRM is not set
++# CONFIG_VGASTATE is not set
++# CONFIG_VIDEO_OUTPUT_CONTROL is not set
++CONFIG_FB=m
++# CONFIG_FIRMWARE_EDID is not set
++# CONFIG_FB_DDC is not set
++# CONFIG_FB_BOOT_VESA_SUPPORT is not set
++# CONFIG_FB_CFB_FILLRECT is not set
++# CONFIG_FB_CFB_COPYAREA is not set
++# CONFIG_FB_CFB_IMAGEBLIT is not set
++# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
++# CONFIG_FB_SYS_FILLRECT is not set
++# CONFIG_FB_SYS_COPYAREA is not set
++# CONFIG_FB_SYS_IMAGEBLIT is not set
++# CONFIG_FB_FOREIGN_ENDIAN is not set
++# CONFIG_FB_SYS_FOPS is not set
++# CONFIG_FB_SVGALIB is not set
++# CONFIG_FB_MACMODES is not set
++# CONFIG_FB_BACKLIGHT is not set
++# CONFIG_FB_MODE_HELPERS is not set
++# CONFIG_FB_TILEBLITTING is not set
++
++#
++# Frame buffer hardware drivers
++#
++# CONFIG_FB_CIRRUS is not set
++# CONFIG_FB_PM2 is not set
++# CONFIG_FB_CYBER2000 is not set
++# CONFIG_FB_S1D13XXX is not set
++# CONFIG_FB_NVIDIA is not set
++# CONFIG_FB_RIVA is not set
++# CONFIG_FB_MATROX is not set
++# CONFIG_FB_RADEON is not set
++# CONFIG_FB_ATY128 is not set
++# CONFIG_FB_ATY is not set
++# CONFIG_FB_S3 is not set
++# CONFIG_FB_SAVAGE is not set
++# CONFIG_FB_SIS is not set
++# CONFIG_FB_VIA is not set
++# CONFIG_FB_NEOMAGIC is not set
++# CONFIG_FB_KYRO is not set
++# CONFIG_FB_3DFX is not set
++# CONFIG_FB_VOODOO1 is not set
++# CONFIG_FB_VT8623 is not set
++# CONFIG_FB_TRIDENT is not set
++# CONFIG_FB_ARK is not set
++# CONFIG_FB_PM3 is not set
++# CONFIG_FB_CARMINE is not set
++# CONFIG_FB_VIRTUAL is not set
++# CONFIG_FB_METRONOME is not set
++# CONFIG_FB_MB862XX is not set
++# CONFIG_FB_BROADSHEET is not set
++# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
++
++#
++# Display device support
++#
++# CONFIG_DISPLAY_SUPPORT is not set
++
++#
++# Console display driver support
++#
++# CONFIG_VGA_CONSOLE is not set
++CONFIG_DUMMY_CONSOLE=y
++CONFIG_FRAMEBUFFER_CONSOLE=m
++# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
++# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
++# CONFIG_FONTS is not set
++CONFIG_FONT_8x8=y
++CONFIG_FONT_8x16=y
++# CONFIG_LOGO is not set
++CONFIG_SOUND=m
++# CONFIG_SOUND_OSS_CORE is not set
++CONFIG_SND=m
++CONFIG_SND_TIMER=m
++CONFIG_SND_PCM=m
++CONFIG_SND_HWDEP=m
++CONFIG_SND_RAWMIDI=m
++CONFIG_SND_SEQUENCER=m
++# CONFIG_SND_SEQ_DUMMY is not set
++# CONFIG_SND_MIXER_OSS is not set
++# CONFIG_SND_PCM_OSS is not set
++# CONFIG_SND_SEQUENCER_OSS is not set
++CONFIG_SND_HRTIMER=m
++CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
++# CONFIG_SND_DYNAMIC_MINORS is not set
++CONFIG_SND_SUPPORT_OLD_API=y
++CONFIG_SND_VERBOSE_PROCFS=y
++# CONFIG_SND_VERBOSE_PRINTK is not set
++# CONFIG_SND_DEBUG is not set
++CONFIG_SND_RAWMIDI_SEQ=m
++# CONFIG_SND_OPL3_LIB_SEQ is not set
++# CONFIG_SND_OPL4_LIB_SEQ is not set
++# CONFIG_SND_SBAWE_SEQ is not set
++# CONFIG_SND_EMU10K1_SEQ is not set
++CONFIG_SND_DRIVERS=y
++# CONFIG_SND_DUMMY is not set
++# CONFIG_SND_VIRMIDI is not set
++# CONFIG_SND_MTPAV is not set
++# CONFIG_SND_SERIAL_U16550 is not set
++# CONFIG_SND_MPU401 is not set
++# CONFIG_SND_PCI is not set
++CONFIG_SND_ARM=y
++CONFIG_SND_SPI=y
++CONFIG_SND_USB=y
++CONFIG_SND_USB_AUDIO=m
++CONFIG_SND_USB_CAIAQ=m
++# CONFIG_SND_USB_CAIAQ_INPUT is not set
++# CONFIG_SND_SOC is not set
++# CONFIG_SOUND_PRIME is not set
++CONFIG_HID_SUPPORT=y
++CONFIG_HID=y
++# CONFIG_HIDRAW is not set
++
++#
++# USB Input Devices
++#
++CONFIG_USB_HID=y
++# CONFIG_HID_PID is not set
++CONFIG_USB_HIDDEV=y
++
++#
++# Special HID drivers
++#
++CONFIG_HID_A4TECH=y
++CONFIG_HID_APPLE=y
++CONFIG_HID_BELKIN=y
++CONFIG_HID_CHERRY=y
++CONFIG_HID_CHICONY=y
++CONFIG_HID_CYPRESS=y
++CONFIG_HID_DRAGONRISE=y
++# CONFIG_DRAGONRISE_FF is not set
++CONFIG_HID_EZKEY=y
++CONFIG_HID_KYE=y
++CONFIG_HID_GYRATION=y
++CONFIG_HID_TWINHAN=y
++CONFIG_HID_KENSINGTON=y
++CONFIG_HID_LOGITECH=y
++# CONFIG_LOGITECH_FF is not set
++# CONFIG_LOGIRUMBLEPAD2_FF is not set
++CONFIG_HID_MICROSOFT=y
++CONFIG_HID_MONTEREY=y
++CONFIG_HID_NTRIG=y
++CONFIG_HID_PANTHERLORD=y
++# CONFIG_PANTHERLORD_FF is not set
++CONFIG_HID_PETALYNX=y
++CONFIG_HID_SAMSUNG=y
++CONFIG_HID_SONY=y
++CONFIG_HID_SUNPLUS=y
++CONFIG_HID_GREENASIA=y
++# CONFIG_GREENASIA_FF is not set
++CONFIG_HID_SMARTJOYPLUS=y
++# CONFIG_SMARTJOYPLUS_FF is not set
++CONFIG_HID_TOPSEED=y
++CONFIG_HID_THRUSTMASTER=y
++# CONFIG_THRUSTMASTER_FF is not set
++CONFIG_HID_WACOM=m
++CONFIG_HID_ZEROPLUS=y
++# CONFIG_ZEROPLUS_FF is not set
++CONFIG_USB_SUPPORT=y
++CONFIG_USB_ARCH_HAS_HCD=y
++CONFIG_USB_ARCH_HAS_OHCI=y
++CONFIG_USB_ARCH_HAS_EHCI=y
++CONFIG_USB=y
++# CONFIG_USB_DEBUG is not set
++# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
++
++#
++# Miscellaneous USB options
++#
++CONFIG_USB_DEVICEFS=y
++CONFIG_USB_DEVICE_CLASS=y
++# CONFIG_USB_DYNAMIC_MINORS is not set
++CONFIG_USB_SUSPEND=y
++# CONFIG_USB_OTG is not set
++# CONFIG_USB_MON is not set
++# CONFIG_USB_WUSB is not set
++# CONFIG_USB_WUSB_CBAF is not set
++
++#
++# USB Host Controller Drivers
++#
++# CONFIG_USB_C67X00_HCD is not set
++# CONFIG_USB_XHCI_HCD is not set
++CONFIG_USB_EHCI_HCD=y
++CONFIG_USB_EHCI_ROOT_HUB_TT=y
++CONFIG_USB_EHCI_TT_NEWSCHED=y
++# CONFIG_USB_OXU210HP_HCD is not set
++# CONFIG_USB_ISP116X_HCD is not set
++# CONFIG_USB_ISP1760_HCD is not set
++# CONFIG_USB_ISP1362_HCD is not set
++# CONFIG_USB_OHCI_HCD is not set
++# CONFIG_USB_UHCI_HCD is not set
++# CONFIG_USB_SL811_HCD is not set
++# CONFIG_USB_R8A66597_HCD is not set
++# CONFIG_USB_WHCI_HCD is not set
++# CONFIG_USB_HWA_HCD is not set
++# CONFIG_USB_MUSB_HDRC is not set
++
++#
++# USB Device Class drivers
++#
++CONFIG_USB_ACM=m
++CONFIG_USB_PRINTER=m
++CONFIG_USB_WDM=m
++# CONFIG_USB_TMC is not set
++
++#
++# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
++#
++
++#
++# also be needed; see USB_STORAGE Help for more info
++#
++CONFIG_USB_STORAGE=y
++# CONFIG_USB_STORAGE_DEBUG is not set
++CONFIG_USB_STORAGE_DATAFAB=y
++CONFIG_USB_STORAGE_FREECOM=y
++# CONFIG_USB_STORAGE_ISD200 is not set
++# CONFIG_USB_STORAGE_USBAT is not set
++CONFIG_USB_STORAGE_SDDR09=y
++CONFIG_USB_STORAGE_SDDR55=y
++CONFIG_USB_STORAGE_JUMPSHOT=y
++# CONFIG_USB_STORAGE_ALAUDA is not set
++# CONFIG_USB_STORAGE_ONETOUCH is not set
++# CONFIG_USB_STORAGE_KARMA is not set
++# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
++# CONFIG_USB_LIBUSUAL is not set
++
++#
++# USB Imaging devices
++#
++# CONFIG_USB_MDC800 is not set
++# CONFIG_USB_MICROTEK is not set
++
++#
++# USB port drivers
++#
++CONFIG_USB_SERIAL=m
++CONFIG_USB_EZUSB=y
++CONFIG_USB_SERIAL_GENERIC=y
++CONFIG_USB_SERIAL_AIRCABLE=m
++CONFIG_USB_SERIAL_ARK3116=m
++CONFIG_USB_SERIAL_BELKIN=m
++CONFIG_USB_SERIAL_CH341=m
++CONFIG_USB_SERIAL_WHITEHEAT=m
++CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
++CONFIG_USB_SERIAL_CP210X=m
++CONFIG_USB_SERIAL_CYPRESS_M8=m
++CONFIG_USB_SERIAL_EMPEG=m
++CONFIG_USB_SERIAL_FTDI_SIO=m
++CONFIG_USB_SERIAL_FUNSOFT=m
++CONFIG_USB_SERIAL_VISOR=m
++CONFIG_USB_SERIAL_IPAQ=m
++CONFIG_USB_SERIAL_IR=m
++CONFIG_USB_SERIAL_EDGEPORT=m
++CONFIG_USB_SERIAL_EDGEPORT_TI=m
++CONFIG_USB_SERIAL_GARMIN=m
++CONFIG_USB_SERIAL_IPW=m
++CONFIG_USB_SERIAL_IUU=m
++CONFIG_USB_SERIAL_KEYSPAN_PDA=m
++CONFIG_USB_SERIAL_KEYSPAN=m
++# CONFIG_USB_SERIAL_KEYSPAN_MPR is not set
++# CONFIG_USB_SERIAL_KEYSPAN_USA28 is not set
++# CONFIG_USB_SERIAL_KEYSPAN_USA28X is not set
++# CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set
++# CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set
++# CONFIG_USB_SERIAL_KEYSPAN_USA19 is not set
++# CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set
++# CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set
++# CONFIG_USB_SERIAL_KEYSPAN_USA19QW is not set
++# CONFIG_USB_SERIAL_KEYSPAN_USA19QI is not set
++# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set
++# CONFIG_USB_SERIAL_KEYSPAN_USA49WLC is not set
++CONFIG_USB_SERIAL_KLSI=m
++CONFIG_USB_SERIAL_KOBIL_SCT=m
++CONFIG_USB_SERIAL_MCT_U232=m
++CONFIG_USB_SERIAL_MOS7720=m
++CONFIG_USB_SERIAL_MOS7840=m
++CONFIG_USB_SERIAL_MOTOROLA=m
++CONFIG_USB_SERIAL_NAVMAN=m
++CONFIG_USB_SERIAL_PL2303=m
++CONFIG_USB_SERIAL_OTI6858=m
++CONFIG_USB_SERIAL_QUALCOMM=m
++CONFIG_USB_SERIAL_SPCP8X5=m
++CONFIG_USB_SERIAL_HP4X=m
++CONFIG_USB_SERIAL_SAFE=m
++# CONFIG_USB_SERIAL_SAFE_PADDED is not set
++CONFIG_USB_SERIAL_SIEMENS_MPI=m
++CONFIG_USB_SERIAL_SIERRAWIRELESS=m
++CONFIG_USB_SERIAL_SYMBOL=m
++CONFIG_USB_SERIAL_TI=m
++CONFIG_USB_SERIAL_CYBERJACK=m
++CONFIG_USB_SERIAL_XIRCOM=m
++CONFIG_USB_SERIAL_OPTION=m
++CONFIG_USB_SERIAL_OMNINET=m
++CONFIG_USB_SERIAL_OPTICON=m
++CONFIG_USB_SERIAL_DEBUG=m
++
++#
++# USB Miscellaneous drivers
++#
++CONFIG_USB_EMI62=m
++CONFIG_USB_EMI26=m
++# CONFIG_USB_ADUTUX is not set
++# CONFIG_USB_SEVSEG is not set
++# CONFIG_USB_RIO500 is not set
++# CONFIG_USB_LEGOTOWER is not set
++# CONFIG_USB_LCD is not set
++# CONFIG_USB_BERRY_CHARGE is not set
++# CONFIG_USB_LED is not set
++# CONFIG_USB_CYPRESS_CY7C63 is not set
++# CONFIG_USB_CYTHERM is not set
++# CONFIG_USB_IDMOUSE is not set
++# CONFIG_USB_FTDI_ELAN is not set
++# CONFIG_USB_APPLEDISPLAY is not set
++CONFIG_USB_SISUSBVGA=m
++CONFIG_USB_SISUSBVGA_CON=y
++# CONFIG_USB_LD is not set
++# CONFIG_USB_TRANCEVIBRATOR is not set
++# CONFIG_USB_IOWARRIOR is not set
++# CONFIG_USB_TEST is not set
++# CONFIG_USB_ISIGHTFW is not set
++# CONFIG_USB_VST is not set
++# CONFIG_USB_GADGET is not set
++
++#
++# OTG and related infrastructure
++#
++# CONFIG_USB_GPIO_VBUS is not set
++# CONFIG_USB_ULPI is not set
++# CONFIG_NOP_USB_XCEIV is not set
++# CONFIG_UWB is not set
++CONFIG_MMC=y
++# CONFIG_MMC_DEBUG is not set
++# CONFIG_MMC_UNSAFE_RESUME is not set
++
++#
++# MMC/SD/SDIO Card Drivers
++#
++CONFIG_MMC_BLOCK=y
++CONFIG_MMC_BLOCK_BOUNCE=y
++CONFIG_SDIO_UART=y
++# CONFIG_MMC_TEST is not set
++
++#
++# MMC/SD/SDIO Host Controller Drivers
++#
++CONFIG_MMC_SDHCI=y
++# CONFIG_MMC_SDHCI_PCI is not set
++CONFIG_MMC_SDHCI_PLTFM=y
++# CONFIG_MMC_AT91 is not set
++# CONFIG_MMC_ATMELMCI is not set
++# CONFIG_MMC_TIFM_SD is not set
++CONFIG_MMC_MVSDIO=y
++# CONFIG_MMC_SPI is not set
++# CONFIG_MMC_CB710 is not set
++# CONFIG_MMC_VIA_SDMMC is not set
++# CONFIG_MEMSTICK is not set
++CONFIG_NEW_LEDS=y
++CONFIG_LEDS_CLASS=y
++
++#
++# LED drivers
++#
++# CONFIG_LEDS_PCA9532 is not set
++CONFIG_LEDS_GPIO=y
++CONFIG_LEDS_GPIO_PLATFORM=y
++# CONFIG_LEDS_LP3944 is not set
++# CONFIG_LEDS_PCA955X is not set
++# CONFIG_LEDS_DAC124S085 is not set
++# CONFIG_LEDS_BD2802 is not set
++# CONFIG_LEDS_LT3593 is not set
++
++#
++# LED Triggers
++#
++CONFIG_LEDS_TRIGGERS=y
++CONFIG_LEDS_TRIGGER_TIMER=y
++CONFIG_LEDS_TRIGGER_HEARTBEAT=y
++# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
++CONFIG_LEDS_TRIGGER_GPIO=m
++CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
++
++#
++# iptables trigger is under Netfilter config (LED target)
++#
++# CONFIG_ACCESSIBILITY is not set
++# CONFIG_INFINIBAND is not set
++CONFIG_RTC_LIB=y
++CONFIG_RTC_CLASS=y
++CONFIG_RTC_HCTOSYS=y
++CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
++# CONFIG_RTC_DEBUG is not set
++
++#
++# RTC interfaces
++#
++CONFIG_RTC_INTF_SYSFS=y
++CONFIG_RTC_INTF_PROC=y
++CONFIG_RTC_INTF_DEV=y
++# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
++# CONFIG_RTC_DRV_TEST is not set
++
++#
++# I2C RTC drivers
++#
++# CONFIG_RTC_DRV_DS1307 is not set
++# CONFIG_RTC_DRV_DS1374 is not set
++# CONFIG_RTC_DRV_DS1672 is not set
++# CONFIG_RTC_DRV_MAX6900 is not set
++# CONFIG_RTC_DRV_RS5C372 is not set
++# CONFIG_RTC_DRV_ISL1208 is not set
++# CONFIG_RTC_DRV_X1205 is not set
++# CONFIG_RTC_DRV_PCF8563 is not set
++# CONFIG_RTC_DRV_PCF8583 is not set
++# CONFIG_RTC_DRV_M41T80 is not set
++# CONFIG_RTC_DRV_BQ32K is not set
++CONFIG_RTC_DRV_S35390A=y
++# CONFIG_RTC_DRV_FM3130 is not set
++# CONFIG_RTC_DRV_RX8581 is not set
++# CONFIG_RTC_DRV_RX8025 is not set
++
++#
++# SPI RTC drivers
++#
++# CONFIG_RTC_DRV_M41T94 is not set
++# CONFIG_RTC_DRV_DS1305 is not set
++# CONFIG_RTC_DRV_DS1390 is not set
++# CONFIG_RTC_DRV_MAX6902 is not set
++# CONFIG_RTC_DRV_R9701 is not set
++# CONFIG_RTC_DRV_RS5C348 is not set
++# CONFIG_RTC_DRV_DS3234 is not set
++# CONFIG_RTC_DRV_PCF2123 is not set
++
++#
++# Platform RTC drivers
++#
++# CONFIG_RTC_DRV_CMOS is not set
++# CONFIG_RTC_DRV_DS1286 is not set
++# CONFIG_RTC_DRV_DS1511 is not set
++# CONFIG_RTC_DRV_DS1553 is not set
++# CONFIG_RTC_DRV_DS1742 is not set
++# CONFIG_RTC_DRV_STK17TA8 is not set
++# CONFIG_RTC_DRV_M48T86 is not set
++# CONFIG_RTC_DRV_M48T35 is not set
++# CONFIG_RTC_DRV_M48T59 is not set
++# CONFIG_RTC_DRV_MSM6242 is not set
++# CONFIG_RTC_DRV_BQ4802 is not set
++# CONFIG_RTC_DRV_RP5C01 is not set
++# CONFIG_RTC_DRV_V3020 is not set
++
++#
++# on-CPU RTC drivers
++#
++CONFIG_RTC_DRV_MV=y
++CONFIG_DMADEVICES=y
++
++#
++# DMA Devices
++#
++CONFIG_MV_XOR=y
++CONFIG_DMA_ENGINE=y
++
++#
++# DMA Clients
++#
++# CONFIG_NET_DMA is not set
++# CONFIG_ASYNC_TX_DMA is not set
++# CONFIG_DMATEST is not set
++# CONFIG_AUXDISPLAY is not set
++# CONFIG_UIO is not set
++
++#
++# TI VLYNQ
++#
++# CONFIG_STAGING is not set
++
++#
++# File systems
++#
++CONFIG_EXT2_FS=y
++# CONFIG_EXT2_FS_XATTR is not set
++# CONFIG_EXT2_FS_XIP is not set
++CONFIG_EXT3_FS=y
++# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
++CONFIG_EXT3_FS_XATTR=y
++CONFIG_EXT3_FS_POSIX_ACL=y
++# CONFIG_EXT3_FS_SECURITY is not set
++CONFIG_EXT4_FS=y
++CONFIG_EXT4_FS_XATTR=y
++CONFIG_EXT4_FS_POSIX_ACL=y
++# CONFIG_EXT4_FS_SECURITY is not set
++# CONFIG_EXT4_DEBUG is not set
++CONFIG_JBD=y
++# CONFIG_JBD_DEBUG is not set
++CONFIG_JBD2=y
++# CONFIG_JBD2_DEBUG is not set
++CONFIG_FS_MBCACHE=y
++CONFIG_REISERFS_FS=m
++# CONFIG_REISERFS_CHECK is not set
++# CONFIG_REISERFS_PROC_INFO is not set
++# CONFIG_REISERFS_FS_XATTR is not set
++CONFIG_JFS_FS=y
++CONFIG_JFS_POSIX_ACL=y
++# CONFIG_JFS_SECURITY is not set
++# CONFIG_JFS_DEBUG is not set
++# CONFIG_JFS_STATISTICS is not set
++CONFIG_FS_POSIX_ACL=y
++CONFIG_XFS_FS=m
++# CONFIG_XFS_QUOTA is not set
++CONFIG_XFS_POSIX_ACL=y
++# CONFIG_XFS_RT is not set
++# CONFIG_XFS_DEBUG is not set
++# CONFIG_GFS2_FS is not set
++# CONFIG_OCFS2_FS is not set
++CONFIG_BTRFS_FS=m
++# CONFIG_BTRFS_FS_POSIX_ACL is not set
++# CONFIG_NILFS2_FS is not set
++CONFIG_FILE_LOCKING=y
++CONFIG_FSNOTIFY=y
++CONFIG_DNOTIFY=y
++CONFIG_INOTIFY=y
++CONFIG_INOTIFY_USER=y
++# CONFIG_QUOTA is not set
++CONFIG_AUTOFS_FS=m
++CONFIG_AUTOFS4_FS=m
++CONFIG_FUSE_FS=m
++# CONFIG_CUSE is not set
++
++#
++# Caches
++#
++# CONFIG_FSCACHE is not set
++
++#
++# CD-ROM/DVD Filesystems
++#
++CONFIG_ISO9660_FS=m
++CONFIG_JOLIET=y
++# CONFIG_ZISOFS is not set
++CONFIG_UDF_FS=m
++CONFIG_UDF_NLS=y
++
++#
++# DOS/FAT/NT Filesystems
++#
++CONFIG_FAT_FS=y
++CONFIG_MSDOS_FS=y
++CONFIG_VFAT_FS=y
++CONFIG_FAT_DEFAULT_CODEPAGE=437
++CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
++CONFIG_NTFS_FS=m
++# CONFIG_NTFS_DEBUG is not set
++# CONFIG_NTFS_RW is not set
++
++#
++# Pseudo filesystems
++#
++CONFIG_PROC_FS=y
++CONFIG_PROC_SYSCTL=y
++CONFIG_PROC_PAGE_MONITOR=y
++CONFIG_SYSFS=y
++CONFIG_TMPFS=y
++# CONFIG_TMPFS_POSIX_ACL is not set
++# CONFIG_HUGETLB_PAGE is not set
++# CONFIG_CONFIGFS_FS is not set
++CONFIG_MISC_FILESYSTEMS=y
++# CONFIG_ADFS_FS is not set
++# CONFIG_AFFS_FS is not set
++CONFIG_HFS_FS=m
++CONFIG_HFSPLUS_FS=m
++# CONFIG_BEFS_FS is not set
++# CONFIG_BFS_FS is not set
++# CONFIG_EFS_FS is not set
++CONFIG_JFFS2_FS=y
++CONFIG_JFFS2_FS_DEBUG=0
++CONFIG_JFFS2_FS_WRITEBUFFER=y
++# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
++# CONFIG_JFFS2_SUMMARY is not set
++# CONFIG_JFFS2_FS_XATTR is not set
++# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
++CONFIG_JFFS2_ZLIB=y
++# CONFIG_JFFS2_LZO is not set
++CONFIG_JFFS2_RTIME=y
++# CONFIG_JFFS2_RUBIN is not set
++CONFIG_UBIFS_FS=y
++# CONFIG_UBIFS_FS_XATTR is not set
++# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
++CONFIG_UBIFS_FS_LZO=y
++CONFIG_UBIFS_FS_ZLIB=y
++# CONFIG_UBIFS_FS_DEBUG is not set
++CONFIG_CRAMFS=y
++# CONFIG_SQUASHFS is not set
++# CONFIG_VXFS_FS is not set
++# CONFIG_MINIX_FS is not set
++# CONFIG_OMFS_FS is not set
++# CONFIG_HPFS_FS is not set
++# CONFIG_QNX4FS_FS is not set
++# CONFIG_ROMFS_FS is not set
++# CONFIG_SYSV_FS is not set
++# CONFIG_UFS_FS is not set
++CONFIG_NETWORK_FILESYSTEMS=y
++CONFIG_NFS_FS=y
++CONFIG_NFS_V3=y
++# CONFIG_NFS_V3_ACL is not set
++CONFIG_NFS_V4=y
++# CONFIG_NFS_V4_1 is not set
++CONFIG_ROOT_NFS=y
++CONFIG_NFSD=m
++CONFIG_NFSD_V3=y
++# CONFIG_NFSD_V3_ACL is not set
++CONFIG_NFSD_V4=y
++CONFIG_LOCKD=y
++CONFIG_LOCKD_V4=y
++CONFIG_EXPORTFS=m
++CONFIG_NFS_COMMON=y
++CONFIG_SUNRPC=y
++CONFIG_SUNRPC_GSS=y
++CONFIG_RPCSEC_GSS_KRB5=y
++# CONFIG_RPCSEC_GSS_SPKM3 is not set
++# CONFIG_SMB_FS is not set
++CONFIG_CIFS=m
++# CONFIG_CIFS_STATS is not set
++# CONFIG_CIFS_WEAK_PW_HASH is not set
++CONFIG_CIFS_XATTR=y
++CONFIG_CIFS_POSIX=y
++# CONFIG_CIFS_DEBUG2 is not set
++# CONFIG_CIFS_EXPERIMENTAL is not set
++# CONFIG_NCP_FS is not set
++# CONFIG_CODA_FS is not set
++# CONFIG_AFS_FS is not set
++
++#
++# Partition Types
++#
++CONFIG_PARTITION_ADVANCED=y
++# CONFIG_ACORN_PARTITION is not set
++# CONFIG_OSF_PARTITION is not set
++# CONFIG_AMIGA_PARTITION is not set
++# CONFIG_ATARI_PARTITION is not set
++CONFIG_MAC_PARTITION=y
++CONFIG_MSDOS_PARTITION=y
++# CONFIG_BSD_DISKLABEL is not set
++# CONFIG_MINIX_SUBPARTITION is not set
++# CONFIG_SOLARIS_X86_PARTITION is not set
++# CONFIG_UNIXWARE_DISKLABEL is not set
++# CONFIG_LDM_PARTITION is not set
++# CONFIG_SGI_PARTITION is not set
++# CONFIG_ULTRIX_PARTITION is not set
++# CONFIG_SUN_PARTITION is not set
++# CONFIG_KARMA_PARTITION is not set
++CONFIG_EFI_PARTITION=y
++# CONFIG_SYSV68_PARTITION is not set
++CONFIG_NLS=y
++CONFIG_NLS_DEFAULT="iso8859-1"
++CONFIG_NLS_CODEPAGE_437=y
++# CONFIG_NLS_CODEPAGE_737 is not set
++# CONFIG_NLS_CODEPAGE_775 is not set
++CONFIG_NLS_CODEPAGE_850=y
++# CONFIG_NLS_CODEPAGE_852 is not set
++# CONFIG_NLS_CODEPAGE_855 is not set
++# CONFIG_NLS_CODEPAGE_857 is not set
++# CONFIG_NLS_CODEPAGE_860 is not set
++# CONFIG_NLS_CODEPAGE_861 is not set
++# CONFIG_NLS_CODEPAGE_862 is not set
++# CONFIG_NLS_CODEPAGE_863 is not set
++# CONFIG_NLS_CODEPAGE_864 is not set
++# CONFIG_NLS_CODEPAGE_865 is not set
++# CONFIG_NLS_CODEPAGE_866 is not set
++# CONFIG_NLS_CODEPAGE_869 is not set
++# CONFIG_NLS_CODEPAGE_936 is not set
++# CONFIG_NLS_CODEPAGE_950 is not set
++# CONFIG_NLS_CODEPAGE_932 is not set
++# CONFIG_NLS_CODEPAGE_949 is not set
++# CONFIG_NLS_CODEPAGE_874 is not set
++# CONFIG_NLS_ISO8859_8 is not set
++# CONFIG_NLS_CODEPAGE_1250 is not set
++# CONFIG_NLS_CODEPAGE_1251 is not set
++# CONFIG_NLS_ASCII is not set
++CONFIG_NLS_ISO8859_1=y
++CONFIG_NLS_ISO8859_2=y
++# CONFIG_NLS_ISO8859_3 is not set
++# CONFIG_NLS_ISO8859_4 is not set
++# CONFIG_NLS_ISO8859_5 is not set
++# CONFIG_NLS_ISO8859_6 is not set
++# CONFIG_NLS_ISO8859_7 is not set
++# CONFIG_NLS_ISO8859_9 is not set
++# CONFIG_NLS_ISO8859_13 is not set
++# CONFIG_NLS_ISO8859_14 is not set
++# CONFIG_NLS_ISO8859_15 is not set
++# CONFIG_NLS_KOI8_R is not set
++# CONFIG_NLS_KOI8_U is not set
++CONFIG_NLS_UTF8=y
++# CONFIG_DLM is not set
++
++#
++# Kernel hacking
++#
++# CONFIG_PRINTK_TIME is not set
++CONFIG_ENABLE_WARN_DEPRECATED=y
++CONFIG_ENABLE_MUST_CHECK=y
++CONFIG_FRAME_WARN=1024
++CONFIG_MAGIC_SYSRQ=y
++# CONFIG_STRIP_ASM_SYMS is not set
++# CONFIG_UNUSED_SYMBOLS is not set
++CONFIG_DEBUG_FS=y
++# CONFIG_HEADERS_CHECK is not set
++CONFIG_DEBUG_KERNEL=y
++# CONFIG_DEBUG_SHIRQ is not set
++CONFIG_DETECT_SOFTLOCKUP=y
++# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
++CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
++CONFIG_DETECT_HUNG_TASK=y
++# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
++CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
++CONFIG_SCHED_DEBUG=y
++# CONFIG_SCHEDSTATS is not set
++CONFIG_TIMER_STATS=y
++# CONFIG_DEBUG_OBJECTS is not set
++# CONFIG_SLUB_DEBUG_ON is not set
++# CONFIG_SLUB_STATS is not set
++# CONFIG_DEBUG_KMEMLEAK is not set
++CONFIG_DEBUG_PREEMPT=y
++# CONFIG_DEBUG_RT_MUTEXES is not set
++# CONFIG_RT_MUTEX_TESTER is not set
++# CONFIG_DEBUG_SPINLOCK is not set
++# CONFIG_DEBUG_MUTEXES is not set
++# CONFIG_DEBUG_LOCK_ALLOC is not set
++# CONFIG_PROVE_LOCKING is not set
++# CONFIG_LOCK_STAT is not set
++# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
++# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
++# CONFIG_DEBUG_KOBJECT is not set
++CONFIG_DEBUG_BUGVERBOSE=y
++# CONFIG_DEBUG_INFO is not set
++# CONFIG_DEBUG_VM is not set
++# CONFIG_DEBUG_WRITECOUNT is not set
++CONFIG_DEBUG_MEMORY_INIT=y
++# CONFIG_DEBUG_LIST is not set
++# CONFIG_DEBUG_SG is not set
++# CONFIG_DEBUG_NOTIFIERS is not set
++# CONFIG_DEBUG_CREDENTIALS is not set
++# CONFIG_BOOT_PRINTK_DELAY is not set
++# CONFIG_RCU_TORTURE_TEST is not set
++# CONFIG_RCU_CPU_STALL_DETECTOR is not set
++# CONFIG_KPROBES_SANITY_TEST is not set
++# CONFIG_BACKTRACE_SELF_TEST is not set
++# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
++# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
++# CONFIG_LKDTM is not set
++# CONFIG_FAULT_INJECTION is not set
++# CONFIG_LATENCYTOP is not set
++CONFIG_SYSCTL_SYSCALL_CHECK=y
++# CONFIG_PAGE_POISONING is not set
++CONFIG_HAVE_FUNCTION_TRACER=y
++CONFIG_RING_BUFFER=y
++CONFIG_RING_BUFFER_ALLOW_SWAP=y
++CONFIG_TRACING_SUPPORT=y
++CONFIG_FTRACE=y
++# CONFIG_FUNCTION_TRACER is not set
++# CONFIG_IRQSOFF_TRACER is not set
++# CONFIG_PREEMPT_TRACER is not set
++# CONFIG_SCHED_TRACER is not set
++# CONFIG_ENABLE_DEFAULT_TRACERS is not set
++# CONFIG_BOOT_TRACER is not set
++CONFIG_BRANCH_PROFILE_NONE=y
++# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
++# CONFIG_PROFILE_ALL_BRANCHES is not set
++# CONFIG_STACK_TRACER is not set
++# CONFIG_KMEMTRACE is not set
++# CONFIG_WORKQUEUE_TRACER is not set
++# CONFIG_BLK_DEV_IO_TRACE is not set
++# CONFIG_RING_BUFFER_BENCHMARK is not set
++# CONFIG_DYNAMIC_DEBUG is not set
++# CONFIG_SAMPLES is not set
++CONFIG_HAVE_ARCH_KGDB=y
++# CONFIG_KGDB is not set
++CONFIG_ARM_UNWIND=y
++CONFIG_DEBUG_USER=y
++# CONFIG_DEBUG_ERRORS is not set
++# CONFIG_DEBUG_STACK_USAGE is not set
++# CONFIG_DEBUG_LL is not set
++# CONFIG_OC_ETM is not set
++
++#
++# Security options
++#
++# CONFIG_KEYS is not set
++# CONFIG_SECURITY is not set
++# CONFIG_SECURITYFS is not set
++# CONFIG_DEFAULT_SECURITY_SELINUX is not set
++# CONFIG_DEFAULT_SECURITY_SMACK is not set
++# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
++CONFIG_DEFAULT_SECURITY_DAC=y
++CONFIG_DEFAULT_SECURITY=""
++CONFIG_XOR_BLOCKS=m
++CONFIG_ASYNC_CORE=m
++CONFIG_ASYNC_MEMCPY=m
++CONFIG_ASYNC_XOR=m
++CONFIG_ASYNC_PQ=m
++CONFIG_ASYNC_RAID6_RECOV=m
++CONFIG_CRYPTO=y
++
++#
++# Crypto core or helper
++#
++CONFIG_CRYPTO_FIPS=y
++CONFIG_CRYPTO_ALGAPI=y
++CONFIG_CRYPTO_ALGAPI2=y
++CONFIG_CRYPTO_AEAD=m
++CONFIG_CRYPTO_AEAD2=y
++CONFIG_CRYPTO_BLKCIPHER=y
++CONFIG_CRYPTO_BLKCIPHER2=y
++CONFIG_CRYPTO_HASH=y
++CONFIG_CRYPTO_HASH2=y
++CONFIG_CRYPTO_RNG=m
++CONFIG_CRYPTO_RNG2=y
++CONFIG_CRYPTO_PCOMP=y
++CONFIG_CRYPTO_MANAGER=y
++CONFIG_CRYPTO_MANAGER2=y
++CONFIG_CRYPTO_GF128MUL=m
++CONFIG_CRYPTO_NULL=m
++CONFIG_CRYPTO_WORKQUEUE=y
++CONFIG_CRYPTO_CRYPTD=m
++CONFIG_CRYPTO_AUTHENC=m
++CONFIG_CRYPTO_TEST=m
++
++#
++# Authenticated Encryption with Associated Data
++#
++CONFIG_CRYPTO_CCM=m
++CONFIG_CRYPTO_GCM=m
++CONFIG_CRYPTO_SEQIV=m
++
++#
++# Block modes
++#
++CONFIG_CRYPTO_CBC=y
++CONFIG_CRYPTO_CTR=m
++CONFIG_CRYPTO_CTS=m
++CONFIG_CRYPTO_ECB=y
++CONFIG_CRYPTO_LRW=m
++CONFIG_CRYPTO_PCBC=m
++CONFIG_CRYPTO_XTS=m
++
++#
++# Hash modes
++#
++CONFIG_CRYPTO_HMAC=m
++CONFIG_CRYPTO_XCBC=m
++CONFIG_CRYPTO_VMAC=m
++
++#
++# Digest
++#
++CONFIG_CRYPTO_CRC32C=y
++CONFIG_CRYPTO_GHASH=m
++CONFIG_CRYPTO_MD4=m
++CONFIG_CRYPTO_MD5=y
++CONFIG_CRYPTO_MICHAEL_MIC=m
++CONFIG_CRYPTO_RMD128=m
++CONFIG_CRYPTO_RMD160=m
++CONFIG_CRYPTO_RMD256=m
++CONFIG_CRYPTO_RMD320=m
++CONFIG_CRYPTO_SHA1=m
++CONFIG_CRYPTO_SHA256=m
++CONFIG_CRYPTO_SHA512=m
++CONFIG_CRYPTO_TGR192=m
++CONFIG_CRYPTO_WP512=m
++
++#
++# Ciphers
++#
++CONFIG_CRYPTO_AES=y
++CONFIG_CRYPTO_ANUBIS=m
++CONFIG_CRYPTO_ARC4=y
++CONFIG_CRYPTO_BLOWFISH=m
++CONFIG_CRYPTO_CAMELLIA=m
++CONFIG_CRYPTO_CAST5=m
++CONFIG_CRYPTO_CAST6=m
++CONFIG_CRYPTO_DES=y
++CONFIG_CRYPTO_FCRYPT=m
++CONFIG_CRYPTO_KHAZAD=m
++CONFIG_CRYPTO_SALSA20=m
++CONFIG_CRYPTO_SEED=m
++CONFIG_CRYPTO_SERPENT=m
++CONFIG_CRYPTO_TEA=m
++CONFIG_CRYPTO_TWOFISH=m
++CONFIG_CRYPTO_TWOFISH_COMMON=m
++
++#
++# Compression
++#
++CONFIG_CRYPTO_DEFLATE=y
++CONFIG_CRYPTO_ZLIB=m
++CONFIG_CRYPTO_LZO=y
++
++#
++# Random Number Generation
++#
++CONFIG_CRYPTO_ANSI_CPRNG=m
++CONFIG_CRYPTO_HW=y
++CONFIG_CRYPTO_DEV_MV_CESA=m
++# CONFIG_CRYPTO_DEV_HIFN_795X is not set
++# CONFIG_BINARY_PRINTF is not set
++
++#
++# Library routines
++#
++CONFIG_BITREVERSE=y
++CONFIG_GENERIC_FIND_LAST_BIT=y
++CONFIG_CRC_CCITT=y
++CONFIG_CRC16=y
++# CONFIG_CRC_T10DIF is not set
++CONFIG_CRC_ITU_T=m
++CONFIG_CRC32=y
++# CONFIG_CRC7 is not set
++CONFIG_LIBCRC32C=y
++CONFIG_ZLIB_INFLATE=y
++CONFIG_ZLIB_DEFLATE=y
++CONFIG_LZO_COMPRESS=y
++CONFIG_LZO_DECOMPRESS=y
++CONFIG_DECOMPRESS_GZIP=y
++CONFIG_DECOMPRESS_BZIP2=y
++CONFIG_DECOMPRESS_LZMA=y
++CONFIG_DECOMPRESS_LZO=y
++CONFIG_TEXTSEARCH=y
++CONFIG_TEXTSEARCH_KMP=m
++CONFIG_TEXTSEARCH_BM=m
++CONFIG_TEXTSEARCH_FSM=m
++CONFIG_HAS_IOMEM=y
++CONFIG_HAS_IOPORT=y
++CONFIG_HAS_DMA=y
++CONFIG_NLATTR=y
+-- 
+1.6.0.3
+
diff --git a/pkgs/os-specific/linux/kernel/guruplug-mach-type.patch b/pkgs/os-specific/linux/kernel/guruplug-mach-type.patch
new file mode 100644
index 00000000000..bfcbcf44aa4
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/guruplug-mach-type.patch
@@ -0,0 +1,15 @@
+The GuruPlug's u-boot is configured with the wrong `arch_number', so
+change Linux so that it matches u-boot's expectations.  See
+<http://www.plugcomputer.org/plugwiki/index.php/Compiling_Linux_Kernel_for_the_Plug_Computer>.
+
+--- linux-2.6.35.3/arch/arm/tools/mach-types	2010-08-20 20:55:55.000000000 +0200
++++ linux-2.6.35.3/arch/arm/tools/mach-types	2010-09-13 22:49:41.000000000 +0200
+@@ -2643,7 +2643,7 @@ rfp43			MACH_RFP43		RFP43			2655
+ sk86r0301		MACH_SK86R0301		SK86R0301		2656
+ ctpxa			MACH_CTPXA		CTPXA			2657
+ epb_arm9_a		MACH_EPB_ARM9_A		EPB_ARM9_A		2658
+-guruplug		MACH_GURUPLUG		GURUPLUG		2659
++guruplug		MACH_GURUPLUG		GURUPLUG		2601
+ spear310		MACH_SPEAR310		SPEAR310		2660
+ spear320		MACH_SPEAR320		SPEAR320		2661
+ robotx			MACH_ROBOTX		ROBOTX			2662
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 63581e6b4ca..694f6699b4f 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -197,5 +197,22 @@ in
     { name = "dell-rfkill";
       patch = ./dell-rfkill.patch;
     };
-  
+
+  guruplug_defconfig =
+    {
+      # Default configuration for the GuruPlug.  From
+      # <http://www.openplug.org/plugwiki/images/c/c6/Guruplug-patchset-2.6.33.2.tar.bz2>.
+      name = "guruplug-defconfig";
+      patch = ./guruplug-defconfig.patch;
+    };
+
+  guruplug_arch_number =
+    {
+      # Hack to match the `arch_number' of the U-Boot that ships with the
+      # GuruPlug.  This is only needed when using this specific U-Boot
+      # binary.  See
+      # <http://www.plugcomputer.org/plugwiki/index.php/Compiling_Linux_Kernel_for_the_Plug_Computer>.
+      name = "guruplug-arch-number";
+      patch = ./guruplug-mach-type.patch;
+    };
 }

From 50e1e6147e6f120c7efbc158fb50a0e48a1b6e09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 17 Sep 2010 15:56:47 +0000
Subject: [PATCH 177/181] Add `guruplug' platform.

svn path=/nixpkgs/trunk/; revision=23834
---
 pkgs/top-level/platforms.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix
index cb35db579b7..7bd27ebf4f9 100644
--- a/pkgs/top-level/platforms.nix
+++ b/pkgs/top-level/platforms.nix
@@ -79,6 +79,16 @@ rec {
     ubootConfig = "sheevaplug_config";
   };
 
+  guruplug = sheevaplug // {
+    # Define `CONFIG_MACH_GURUPLUG' (see
+    # <http://kerneltrap.org/mailarchive/git-commits-head/2010/5/19/33618>)
+    # and other GuruPlug-specific things.  Requires the `guruplug-defconfig'
+    # patch.
+
+    kernelBaseConfig = "guruplug_defconfig";
+    #kernelHeadersBaseConfig = "guruplug_defconfig";
+  };
+
   versatileARM = {
     name = "versatileARM";
     kernelMajor = "2.6";

From cb8654eba6f07c8fa886a8f148fc3c01f3c06fb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 17 Sep 2010 17:21:56 +0000
Subject: [PATCH 178/181] Updating asciidoc (hoping it will run faster)

svn path=/nixpkgs/trunk/; revision=23835
---
 pkgs/tools/typesetting/asciidoc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix
index f0cfab00d42..598cbff11f2 100644
--- a/pkgs/tools/typesetting/asciidoc/default.nix
+++ b/pkgs/tools/typesetting/asciidoc/default.nix
@@ -1,10 +1,10 @@
 { fetchurl, stdenv, python }:
 
 stdenv.mkDerivation rec {
-  name = "asciidoc-8.5.1";
+  name = "asciidoc-8.6.1";
   src = fetchurl {
     url = "mirror://sourceforge/asciidoc/${name}.tar.gz";
-    sha256 = "ccb02db04e6e6eff2149435516e88557ca30c85bc4467420f40c895e25f17a20";
+    sha256 = "1c844ahv4naghfv1jabyr8gnv2fsx4k7366vh63zx0h0w2x7ylaq";
   };
 
   patchPhase = ''

From c6f9d17b9a37f24a05ee85543994cf69cef40af4 Mon Sep 17 00:00:00 2001
From: David Guibert <david.guibert@gmail.com>
Date: Fri, 17 Sep 2010 17:34:03 +0000
Subject: [PATCH 179/181] update msmtp up to version 1.4.21

svn path=/nixpkgs/trunk/; revision=23837
---
 pkgs/applications/networking/msmtp/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix
index 983862773d4..098d06bd077 100644
--- a/pkgs/applications/networking/msmtp/default.nix
+++ b/pkgs/applications/networking/msmtp/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, openssl}:
 stdenv.mkDerivation {
-  name = "msmtp-1.4.13";
+  name = "msmtp-1.4.21";
 
   src = fetchurl {
-    url = http://dfn.dl.sourceforge.net/sourceforge/msmtp/msmtp-1.4.13.tar.bz2;
-    sha256 = "1x8q8dhcpnjym3icz6070l13hz98fvdvgc5j5psj4pmxbswx0r4p";
+    url = mirror://sourceforge/msmtp/msmtp-1.4.21.tar.bz2;
+    sha256 = "1yjgy56n02qs25728psg296amhbdkxq2pv1q3l484f3r9pjrpcrg";
   };
 
   buildInputs = [ openssl ];

From 8ee5697147ebbb0a0cbc2a1a750f8401796d4c06 Mon Sep 17 00:00:00 2001
From: David Guibert <david.guibert@gmail.com>
Date: Fri, 17 Sep 2010 17:34:08 +0000
Subject: [PATCH 180/181] add cherrypy, a pythonic, object-oriented HTTP
 framework

svn path=/nixpkgs/trunk/; revision=23838
---
 pkgs/top-level/python-packages.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1b478a908d2..a8e96cdce5c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -77,6 +77,22 @@ rec {
     };
   });
 
+  cherrypy = buildPythonPackage (rec {
+    name = "cherrypy-3.1.2";
+
+    src = fetchurl {
+      url = "http://download.cherrypy.org/cherrypy/3.1.2/CherryPy-3.1.2.tar.gz";
+      sha256 = "1xlvanhnxgvwd7vvypbafyl6yqfkpnwa9rs9k3058z84gd86bz8d";
+    };
+
+    doCheck = false;
+
+    meta = {
+      homepage = "http://www.cherrypy.org";
+      description = "A pythonic, object-oriented HTTP framework";
+    };
+  });
+
   clientform = buildPythonPackage (rec {
     name = "clientform-0.2.10";
 

From 83bfd425349459898b1cf16330518c9a330b32ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 17 Sep 2010 18:57:38 +0000
Subject: [PATCH 181/181] Fixing the mtdutils package (install to proper LSB
 like directories, and remove 'v' in front of the version, which annoyed
 nix-env name matching)

svn path=/nixpkgs/trunk/; revision=23839
---
 pkgs/tools/filesystems/mtdutils/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/filesystems/mtdutils/default.nix b/pkgs/tools/filesystems/mtdutils/default.nix
index 521c1452e1c..4dbd9fe4439 100644
--- a/pkgs/tools/filesystems/mtdutils/default.nix
+++ b/pkgs/tools/filesystems/mtdutils/default.nix
@@ -1,19 +1,19 @@
 {stdenv, fetchgit, libuuid, lzo, zlib, acl}:
 
 let
-  version = "v1.3.1";
+  version = "1.3.1";
 in
 stdenv.mkDerivation {
   name = "mtd-utils-${version}";
 
   src = fetchgit {
     url = git://git.infradead.org/mtd-utils.git;
-    rev = version;
+    rev = "v" + version;
     sha256 = "0pjjs9x03bgvphqwlw99c2cpkpjsx0vkqi79vjl7fcb9pyrghgd1";
   };
 
-  preBuild = ''
-    makeFlags="DESTDIR=$out"
+  patchPhase = ''
+    sed -i -e s,/usr/local,, -e s,/usr,$out, common.mk
   '';
 
   buildInputs = [ libuuid lzo zlib acl ];