From 87ad942793d07174b621c0ddd68e90bf20b1319a Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Sun, 14 Jul 2013 07:54:31 +1000
Subject: [PATCH 01/84] fix pangomm build: use cairo 1.12.2

---
 pkgs/top-level/all-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a656cdf1c419..df82b2f61781 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4230,7 +4230,9 @@ let
   cairomm = callPackage ../development/libraries/cairomm { };
 
   pango = callPackage ../development/libraries/pango { };
-  pangomm = callPackage ../development/libraries/pangomm/2.28.x.nix { };
+  pangomm = callPackage ../development/libraries/pangomm/2.28.x.nix {
+    cairo = cairo_1_12_2;
+  };
 
   pangox_compat = callPackage ../development/libraries/pangox-compat { };
 

From 2238a233523b8608dd607fe9d6460e58144d55c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 31 Jul 2013 21:54:09 +0200
Subject: [PATCH 02/84] wicd: wrapper env vars prefix -> postfix

Change PATH=$PATH:deps to PATH=deps:$PATH in the wicd wrappers, because
the latter is more deterministic; it prevents possibly wrong versions of
dependencies to sneak in from the environment.

Do the same for PYTHONPATH.
---
 pkgs/tools/networking/wicd/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix
index 47e417ffd8a2..524c93d218a1 100644
--- a/pkgs/tools/networking/wicd/default.nix
+++ b/pkgs/tools/networking/wicd/default.nix
@@ -33,14 +33,14 @@ stdenv.mkDerivation rec {
     
     substituteInPlace in/scripts=wicd.in --subst-var-by TEMPLATE-DEFAULT $out/share/other/dhclient.conf.template.default
 
-    sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin:${wpa_supplicant}/sbin:${dhcpcd}/sbin:${dhcp}/sbin:${wirelesstools}/sbin:${nettools}/sbin:${nettools}/bin:${iputils}/bin:${openresolv}/sbin:${iproute}/sbin" in/scripts=wicd.in
-    sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pygobject}):$(toPythonPath ${pythonDBus})" in/scripts=wicd.in
-    sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-client.in
-    sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-client.in
-    sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-gtk.in
-    sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-gtk.in
-    sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-cli.in
-    sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-cli.in
+    sed -i "2iexport PATH=${python}/bin:${wpa_supplicant}/sbin:${dhcpcd}/sbin:${dhcp}/sbin:${wirelesstools}/sbin:${nettools}/sbin:${nettools}/bin:${iputils}/bin:${openresolv}/sbin:${iproute}/sbin\$\{PATH:+:\}\$PATH" in/scripts=wicd.in
+    sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pygobject}):$(toPythonPath ${pythonDBus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd.in
+    sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-client.in
+    sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-client.in
+    sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-gtk.in
+    sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-gtk.in
+    sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-cli.in
+    sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-cli.in
     rm po/ast.po
   '';
 

From dccbdcf52091fe1ceff19912342896b9f94ff064 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 31 Jul 2013 16:54:29 +0200
Subject: [PATCH 03/84] linux: Don't put the kernel version in meta

---
 pkgs/os-specific/linux/kernel/generic.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 50469eb53839..85f916de1a35 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation {
   passthru = {
     inherit version modDirVersion kernelPatches;
     # Combine the `features' attribute sets of all the kernel patches.
-    features = lib.fold (x: y: (if x ? features then x.features else {}) // y) features kernelPatches;
+    features = lib.fold (x: y: (x.features or {}) // y) features kernelPatches;
   };
 
   builder = ./builder.sh;
@@ -133,7 +133,6 @@ stdenv.mkDerivation {
         " (with patches: "
         + lib.concatStrings (lib.intersperse ", " (map (x: x.name) kernelPatches))
         + ")");
-    inherit version;
     license = "GPLv2";
     homepage = http://www.kernel.org/;
     maintainers = [

From 7ce325f3e042b4072298021868aa3bd8c72997e4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 31 Jul 2013 23:56:48 +0200
Subject: [PATCH 04/84] Unify the Linux kernel configurations

Having N different copies of the NixOS kernel configuration is bad
because these copies tend to diverge.  For instance, our 3.10 config
lacked some modules that were enabled in older configs, probably
because the 3.10 config had been copied off an earlier version of some
older kernel config.

So now there is a single kernel config in common-config.nix.  It has a
few conditionals to deal with new/removed kernel options, but
otherwise it's pretty straightforward.

Also, a lot of cut&paste boilerplate between the kernel Nix
expressions is gone (such as preConfigure).
---
 pkgs/os-specific/linux/kernel/builder.sh      |  10 +-
 .../linux/kernel/common-config.nix            | 288 +++++++++++++++++
 pkgs/os-specific/linux/kernel/generic.nix     |  20 +-
 pkgs/os-specific/linux/kernel/linux-3.0.nix   | 258 +--------------
 pkgs/os-specific/linux/kernel/linux-3.10.nix  | 297 +-----------------
 pkgs/os-specific/linux/kernel/linux-3.2.nix   | 269 +---------------
 pkgs/os-specific/linux/kernel/linux-3.4.nix   | 280 +----------------
 pkgs/os-specific/linux/kernel/linux-3.8.nix   | 293 +----------------
 pkgs/os-specific/linux/kernel/linux-3.9.nix   | 296 +----------------
 .../linux/kernel/linux-rpi-3.6.nix            |  51 +--
 pkgs/top-level/all-packages.nix               |  10 +-
 11 files changed, 390 insertions(+), 1682 deletions(-)
 create mode 100644 pkgs/os-specific/linux/kernel/common-config.nix

diff --git a/pkgs/os-specific/linux/kernel/builder.sh b/pkgs/os-specific/linux/kernel/builder.sh
index 47c7a22c177a..bea53e9c4dda 100644
--- a/pkgs/os-specific/linux/kernel/builder.sh
+++ b/pkgs/os-specific/linux/kernel/builder.sh
@@ -10,19 +10,20 @@ postPatch() {
     # Makefiles are full of /bin/pwd, /bin/false, /bin/bash, etc.
     # Patch these away, assuming the tools are in $PATH.
     for mf in $(find -name Makefile); do
-	echo "stripping FHS paths in \`$mf'..."
-	sed -i "$mf" -e 's|/usr/bin/||g ; s|/bin/||g'
+        echo "stripping FHS paths in \`$mf'..."
+        sed -i "$mf" -e 's|/usr/bin/||g ; s|/bin/||g'
     done
 }
 
 configurePhase() {
     if test -n "$preConfigure"; then
-        eval "$preConfigure";
+        eval "$preConfigure"
     fi
 
     export INSTALL_PATH=$out
     export INSTALL_MOD_PATH=$out
 
+    substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
 
     # Set our own localversion, if specified.
     rm -f localversion*
@@ -30,7 +31,6 @@ configurePhase() {
         echo "$localVersion" > localversion-nix
     fi
 
-
     # Patch kconfig to print "###" after every question so that
     # generate-config.pl can answer them.
     sed -e '/fflush(stdout);/i\printf("###");' -i scripts/kconfig/conf.c
@@ -112,7 +112,7 @@ installPhase() {
 
         if test "$dontStrip" = "1"; then
             # copy any debugging info that can be found
-            cp --parents -rv `find -name \*.debug -o -name debug.a`	\
+            cp --parents -rv `find -name \*.debug -o -name debug.a`     \
                "$out/lib/modules/$version/build"
         fi
 
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
new file mode 100644
index 000000000000..4b19cd2aa2a7
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -0,0 +1,288 @@
+{ stdenv, version, kernelPlatform, extraConfig }:
+
+with stdenv.lib;
+
+''
+  # Power management and debugging.
+  DEBUG_KERNEL y
+  PM_ADVANCED_DEBUG y
+  PM_RUNTIME y
+  TIMER_STATS y
+  ${optionalString (versionOlder version "3.10") ''
+    USB_SUSPEND y
+  ''}
+  BACKTRACE_SELF_TEST n
+  CPU_NOTIFIER_ERROR_INJECT? n
+  DEBUG_DEVRES n
+  DEBUG_NX_TEST n
+  DEBUG_STACK_USAGE n
+  DEBUG_STACKOVERFLOW n
+  RCU_TORTURE_TEST n
+  SCHEDSTATS 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
+  BLK_CGROUP y # required by CFQ
+
+  # Enable NUMA.
+  NUMA? y
+
+  # Disable some expensive (?) features.
+  FTRACE n
+  KPROBES 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
+  ${optionalString (versionOlder version "3.2") ''
+    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.
+  CFG80211_WEXT y # Without it, ipw2200 drivers don't build
+  IPW2100_MONITOR y # support promiscuous mode
+  IPW2200_MONITOR y # support promiscuous mode
+  HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver
+  HOSTAP_FIRMWARE_NVRAM y
+  ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus
+  ATH9K_AHB y # Ditto, AHB bus
+  ${optionalString (versionAtLeast version "3.2") ''
+    B43_PHY_HT y
+  ''}
+  BCMA_HOST_PCI 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.
+  # Enable KMS for devices whose X.org driver supports it.
+  DRM_I915_KMS y
+  ${optionalString (versionOlder version "3.9") ''
+    DRM_RADEON_KMS y
+  ''}
+  # Hybrid graphics support
+  VGA_SWITCHEROO 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_FS_POSIX_ACL y
+  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
+  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
+  NFS_FSCACHE y
+  CIFS_XATTR y
+  CIFS_POSIX y
+  CIFS_FSCACHE 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
+  ${optionalString (versionAtLeast version "3.3") ''
+    AUDIT_LOGINUID_IMMUTABLE y
+  ''}
+  B43_PCMCIA y
+  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
+  CRASH_DUMP n
+  ${optionalString (versionOlder version "3.1") ''
+    DMAR? n # experimental
+  ''}
+  DVB_DYNAMIC_MINORS? y # we use udev
+  ${optionalString (versionAtLeast version "3.3") ''
+    EFI_STUB y # EFI bootloader in the bzImage itself
+  ''}
+  FHANDLE y # used by systemd
+  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
+  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
+  PPP_MULTILINK y # PPP multilink support
+  REGULATOR y # Voltage and Current Regulator Support
+  ${optionalString (versionAtLeast version "3.6") ''
+    RC_DEVICES? y # Enable IR devices
+  ''}
+  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
+  USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling
+  X86_CHECK_BIOS_CORRUPTION y
+  X86_MCE y
+
+  # Linux containers.
+  RT_GROUP_SCHED? y
+  CGROUP_DEVICE? y
+  ${if versionAtLeast version "3.6" then ''
+    MEMCG y
+    MEMCG_SWAP y
+  '' else ''
+    CGROUP_MEM_RES_CTLR y
+    CGROUP_MEM_RES_CTLR_SWAP y
+  ''}
+  DEVPTS_MULTIPLE_INSTANCES y
+
+  # Enable staging drivers.  These are somewhat experimental, but
+  # they generally don't hurt.
+  STAGING y
+
+  # PROC_EVENTS requires that the netlink connector is not built
+  # as a module.  This is required by libcgroup's cgrulesengd.
+  CONNECTOR y
+  PROC_EVENTS y
+
+  # Tracing.
+  FTRACE y
+  FUNCTION_TRACER y
+  FTRACE_SYSCALLS y
+  SCHED_TRACER y
+
+  # Devtmpfs support.
+  DEVTMPFS y
+
+  # Easier debugging of NFS issues.
+  ${optionalString (versionAtLeast version "3.4") ''
+    SUNRPC_DEBUG y
+  ''}
+
+  # Virtualisation.
+  XEN_DOM0? y
+
+  # Media support.
+  ${optionalString (versionAtLeast version "3.6") ''
+    MEDIA_DIGITAL_TV_SUPPORT y
+    MEDIA_CAMERA_SUPPORT y
+    MEDIA_RC_SUPPORT y
+  ''}
+  ${optionalString (versionAtLeast version "3.7") ''
+    MEDIA_USB_SUPPORT y
+  ''}
+
+  # Our initrd init uses shebang scripts, so can't be modular.
+  ${optionalString (versionAtLeast version "3.10") ''
+    BINFMT_SCRIPT y
+  ''}
+
+  # Enable the 9P cache to speed up NixOS VM tests.
+  9P_FSCACHE y
+  9P_FS_POSIX_ACL y
+
+  ${kernelPlatform.kernelExtraConfig or ""}
+  ${extraConfig}
+''
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 85f916de1a35..ad243ae5b7c1 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, mktemp, module_init_tools
+{ stdenv, fetchurl, perl, mktemp, module_init_tools, bc
 
 , # The kernel source tarball.
   src
@@ -6,15 +6,12 @@
 , # The kernel version.
   version
 
+, # Overrides to the kernel config.
+  extraConfig ? ""
+
 , # The version number used for the module directory
   modDirVersion ? version
 
-, # The kernel configuration.
-  config
-
-, # The kernel configuration when cross building.
-  configCross ? {}
-
 , # An attribute set whose attributes express the availability of
   # certain features in this kernel.  E.g. `{iwlwifi = true;}'
   # indicates a kernel that provides Intel wireless support.  Used in
@@ -40,7 +37,6 @@
   # we force building the target asked: bzImage/zImage/uImage/...
   postBuild ? "make $makeFlags $kernelTarget; make $makeFlags -C scripts unifdef"
 
-, extraNativeBuildInputs ? []
 , ...
 }:
 
@@ -59,6 +55,12 @@ let
         map ({extraConfig ? "", ...}: extraConfig) kernelPatches;
     in lib.concatStringsSep "\n" ([baseConfig] ++ configFromPatches);
 
+  configWithPlatform = kernelPlatform:
+    import ./common-config.nix { inherit stdenv version kernelPlatform extraConfig; };
+
+  config = configWithPlatform stdenv.platform;
+  configCross = configWithPlatform stdenv.cross.platform;
+
 in
 
 stdenv.mkDerivation {
@@ -85,7 +87,7 @@ stdenv.mkDerivation {
   # For UML and non-PC, just ignore all options that don't apply (We are lazy).
   ignoreConfigErrors = stdenv.platform.name != "pc";
 
-  nativeBuildInputs = [ perl mktemp ] ++ extraNativeBuildInputs;
+  nativeBuildInputs = [ perl mktemp bc ];
 
   buildInputs = lib.optional (stdenv.platform.uboot != null)
     (ubootChooser stdenv.platform.uboot);
diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix
index 9f1a36db7dd7..48197ae14ca5 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.0.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix
@@ -1,252 +1,12 @@
-args @ { stdenv, fetchurl, extraConfig ? ""
-, perl, mktemp, module_init_tools
-, ... }:
+{ stdenv, fetchurl, ... } @ args:
 
-let
-  configWithPlatform = kernelPlatform :
-    ''
-      # Power management and debugging for powertop.
-      DEBUG_KERNEL y
-      PM_ADVANCED_DEBUG y
-      PM_RUNTIME y
-      TIMER_STATS y
-      USB_SUSPEND y
-      BACKTRACE_SELF_TEST n
-      CPU_NOTIFIER_ERROR_INJECT n
-      DEBUG_DEVRES n
-      DEBUG_NX_TEST n
-      DEBUG_STACK_USAGE n
-      DEBUG_STACKOVERFLOW n
-      RCU_TORTURE_TEST n
-      SCHEDSTATS n
+import ./generic.nix (args // rec {
+  version = "3.0.88";
 
-      # Support drivers that need external firmware.
-      STANDALONE n
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
+    sha256 = "1icfkbn9a5cpwiax1xklvpqyjcvqij3dwib009fipp53z4pn5bz4";
+  };
 
-      # 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
-      BLK_CGROUP y # required by CFQ
-
-      # 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
-      HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver
-      HOSTAP_FIRMWARE_NVRAM y
-      ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus
-      ATH9K_AHB y # Ditto, AHB bus
-
-      # 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
-      # Enable KMS for devices whose X.org driver supports it.
-      DRM_I915_KMS y
-      DRM_RADEON_KMS y
-      # Hybrid graphics support
-      VGA_SWITCHEROO 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
-      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_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_L2CAP y
-      BT_SCO y # audio support
-      BT_RFCOMM m
-      BT_RFCOMM_TTY y # RFCOMM TTY support
-      CRASH_DUMP n
-      DMAR? n # experimental
-      DVB_DYNAMIC_MINORS y # we use udev
-      FHANDLE y # used by systemd
-      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
-      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
-      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
-
-      # Linux Containers
-      RT_GROUP_SCHED? y
-      CGROUP_DEVICE? y
-      CGROUP_MEM_RES_CTLR? y
-      CGROUP_MEM_RES_CTLR_SWAP? y
-      DEVPTS_MULTIPLE_INSTANCES? y
-
-      # Enable staging drivers.  These are somewhat experimental, but
-      # they generally don't hurt.
-      STAGING y
-
-      # PROC_EVENTS requires that the netlink connector is not built
-      # as a module.  This is required by libcgroup's cgrulesengd.
-      CONNECTOR y
-      PROC_EVENTS y
-
-      # Devtmpfs support.
-      DEVTMPFS y
-
-      ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
-      ${extraConfig}
-    '';
-in
-
-import ./generic.nix (
-
-  rec {
-    version = "3.0.80";
-
-    preConfigure = ''
-      substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
-    '';
-
-    src = fetchurl {
-      url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-      sha256 = "0f3md117bh8n5izkhjd2jp096jqmwz6wpxn7rf8x2x9cz4jz0cqx";
-    };
-
-    config = configWithPlatform stdenv.platform;
-    configCross = configWithPlatform stdenv.cross.platform;
-
-    features.iwlwifi = true;
-  }
-
-  // removeAttrs args ["extraConfig"]
-)
+  features.iwlwifi = true;
+})
diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
index 7de8aa85392b..4b5e4d001a64 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix
@@ -1,287 +1,16 @@
-args @ { stdenv, fetchurl, extraConfig ? ""
-, perl, mktemp, module_init_tools, bc
-, ... }:
+{ stdenv, fetchurl, ... } @ args:
 
-let
-  configWithPlatform = kernelPlatform :
-    ''
-      # Power management and debugging for powertop.
-      DEBUG_KERNEL y
-      PM_ADVANCED_DEBUG y
-      PM_RUNTIME y
-      TIMER_STATS y
-      BACKTRACE_SELF_TEST n
-      CPU_NOTIFIER_ERROR_INJECT? n
-      DEBUG_DEVRES n
-      DEBUG_NX_TEST n
-      DEBUG_STACK_USAGE n
-      DEBUG_STACKOVERFLOW n
-      RCU_TORTURE_TEST n
-      SCHEDSTATS n
+import ./generic.nix (args // rec {
+  version = "3.10.4";
 
-      # Support drivers that need external firmware.
-      STANDALONE n
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
+    sha256 = "1f0ynk37bhkllx2ahzp587yr8cvn809v2ad0sn7z92yv48vl4nly";
+  };
 
-      # 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
-      BLK_CGROUP y # required by CFQ
-
-      # Enable NUMA.
-      NUMA? y
-
-      # Disable some expensive (?) features.
-      FTRACE n
-      KPROBES 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
-      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
-      HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver
-      HOSTAP_FIRMWARE_NVRAM y
-      ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus
-      ATH9K_AHB y # Ditto, AHB bus
-      B43_PHY_HT y
-      BCMA_HOST_PCI y
-      CFG80211_WEXT y # Without it, ipw2200 drivers don't build
-
-      # 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
-      # Enable KMS for devices whose X.org driver supports it.
-      DRM_I915_KMS y
-      DRM_RADEON_KMS? y
-      # Hybrid graphics support
-      VGA_SWITCHEROO 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
-      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
-      NFS_FSCACHE y
-      CIFS_XATTR y
-      CIFS_POSIX y
-      CIFS_FSCACHE 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
-      AUDIT_LOGINUID_IMMUTABLE y
-      B43_PCMCIA y
-      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 m
-      BT_RFCOMM_TTY y # RFCOMM TTY support
-      CRASH_DUMP n
-      DMAR? n # experimental
-      DVB_DYNAMIC_MINORS? y # we use udev
-      EFI_STUB y # EFI bootloader in the bzImage itself
-      FHANDLE y # used by systemd
-      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
-      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
-      PPP_MULTILINK y # PPP multilink support
-      REGULATOR y # Voltage and Current Regulator Support
-      RC_DEVICES y # Enable IR devices
-      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
-      USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling
-      X86_CHECK_BIOS_CORRUPTION y
-      X86_MCE y
-
-      # Linux Containers
-      RT_GROUP_SCHED? y
-      CGROUP_DEVICE? y
-      MEMCG? y
-      MEMCG_SWAP? y
-      DEVPTS_MULTIPLE_INSTANCES? y
-
-      # Enable staging drivers.  These are somewhat experimental, but
-      # they generally don't hurt.
-      STAGING y
-
-      # PROC_EVENTS requires that the netlink connector is not built
-      # as a module.  This is required by libcgroup's cgrulesengd.
-      CONNECTOR y
-      PROC_EVENTS y
-
-      # Tracing
-      FTRACE y
-      FUNCTION_TRACER y
-      FTRACE_SYSCALLS y
-      SCHED_TRACER y
-
-      # Devtmpfs support.
-      DEVTMPFS y
-
-      # Media support
-      MEDIA_CAMERA_SUPPORT? y
-      MEDIA_RC_SUPPORT? y
-      MEDIA_USB_SUPPORT y
-
-      # Easier debug of NFS issues
-      SUNRPC_DEBUG y
-
-      # Our initrd init uses shebang scripts, so can't be modular
-      BINFMT_SCRIPT y
-
-      # Enable the 9P cache to speed up NixOS VM tests.
-      9P_FSCACHE y
-      9P_FS_POSIX_ACL y
-
-      ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
-      ${extraConfig}
-    '';
-in
-
-import ./generic.nix (
-
-  rec {
-    version = "3.10.4";
-    testing = false;
-
-    preConfigure = ''
-      substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
-    '';
-
-    src = fetchurl {
-      url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
-      sha256 = "1f0ynk37bhkllx2ahzp587yr8cvn809v2ad0sn7z92yv48vl4nly";
-    };
-
-    config = configWithPlatform stdenv.platform;
-    configCross = configWithPlatform stdenv.cross.platform;
-
-    features.iwlwifi = true;
-    features.efiBootStub = true;
-    features.needsCifsUtils = true;
-    features.canDisableNetfilterConntrackHelpers = true;
-    features.netfilterRPFilter = true;
-
-    extraNativeBuildInputs = [bc];
-  }
-
-  // removeAttrs args ["extraConfig"]
-)
+  features.iwlwifi = true;
+  features.efiBootStub = true;
+  features.needsCifsUtils = true;
+  features.canDisableNetfilterConntrackHelpers = true;
+  features.netfilterRPFilter = true;
+})
diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix
index 1e1e41a360a9..9b1d1bcf6c1c 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix
@@ -1,263 +1,12 @@
-args @ { stdenv, fetchurl, extraConfig ? ""
-, perl, mktemp, module_init_tools
-, ... }:
+{ stdenv, fetchurl, ... } @ args:
 
-let
-  configWithPlatform = kernelPlatform :
-    ''
-      # Power management and debugging for powertop.
-      DEBUG_KERNEL y
-      PM_ADVANCED_DEBUG y
-      PM_RUNTIME y
-      TIMER_STATS y
-      USB_SUSPEND y
-      BACKTRACE_SELF_TEST n
-      CPU_NOTIFIER_ERROR_INJECT n
-      DEBUG_DEVRES n
-      DEBUG_NX_TEST n
-      DEBUG_STACK_USAGE n
-      DEBUG_STACKOVERFLOW n
-      RCU_TORTURE_TEST n
-      SCHEDSTATS n
+import ./generic.nix (args // rec {
+  version = "3.2.49";
 
-      # Support drivers that need external firmware.
-      STANDALONE n
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
+    sha256 = "06xiwcgk6hbcp6g1dpmxb95dzx94s29vzmh1pz4lsglcj1yfrkry";
+  };
 
-      # 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
-      BLK_CGROUP y # required by CFQ
-
-      # Enable NUMA.
-      NUMA? y
-
-      # Disable some expensive (?) features.
-      FTRACE n
-      KPROBES 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
-      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
-      HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver
-      HOSTAP_FIRMWARE_NVRAM y
-      ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus
-      ATH9K_AHB y # Ditto, AHB bus
-
-      # 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
-      # Enable KMS for devices whose X.org driver supports it.
-      DRM_I915_KMS y
-      DRM_RADEON_KMS y
-      # Hybrid graphics support
-      VGA_SWITCHEROO 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
-      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
-      NFS_FSCACHE y
-      CIFS_XATTR y
-      CIFS_POSIX y
-      CIFS_FSCACHE 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_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_L2CAP y
-      BT_SCO y # audio support
-      BT_RFCOMM m
-      BT_RFCOMM_TTY y # RFCOMM TTY support
-      CRASH_DUMP n
-      DMAR? n # experimental
-      DVB_DYNAMIC_MINORS y # we use udev
-      FHANDLE y # used by systemd
-      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
-      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
-      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
-
-      # Linux Containers
-      RT_GROUP_SCHED? y
-      CGROUP_DEVICE? y
-      CGROUP_MEM_RES_CTLR? y
-      CGROUP_MEM_RES_CTLR_SWAP? y
-      DEVPTS_MULTIPLE_INSTANCES? y
-
-      # Enable staging drivers.  These are somewhat experimental, but
-      # they generally don't hurt.
-      STAGING y
-
-      # PROC_EVENTS requires that the netlink connector is not built
-      # as a module.  This is required by libcgroup's cgrulesengd.
-      CONNECTOR y
-      PROC_EVENTS y
-
-      # Tracing
-      FTRACE y
-      FUNCTION_TRACER y
-      FTRACE_SYSCALLS y
-      SCHED_TRACER y
-
-      # Devtmpfs support.
-      DEVTMPFS y
-
-      ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
-      ${extraConfig}
-    '';
-in
-
-import ./generic.nix (
-
-  rec {
-    version = "3.2.49";
-
-    modDirVersion = version;
-
-    preConfigure = ''
-      substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
-    '';
-
-    src = fetchurl {
-      url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-      sha256 = "06xiwcgk6hbcp6g1dpmxb95dzx94s29vzmh1pz4lsglcj1yfrkry";
-    };
-
-    config = configWithPlatform stdenv.platform;
-    configCross = configWithPlatform stdenv.cross.platform;
-
-    features.iwlwifi = true;
-  }
-
-  // removeAttrs args ["extraConfig"]
-)
+  features.iwlwifi = true;
+})
diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix
index e02f9bd5b7b3..2cb37987ff45 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix
@@ -1,271 +1,15 @@
-args @ { stdenv, fetchurl, extraConfig ? ""
-, perl, mktemp, module_init_tools
-, ... }:
+{ stdenv, fetchurl, ... } @ args:
 
-let
-  configWithPlatform = kernelPlatform :
-    ''
-      # Power management and debugging for powertop.
-      DEBUG_KERNEL y
-      PM_ADVANCED_DEBUG y
-      PM_RUNTIME y
-      TIMER_STATS y
-      USB_SUSPEND y
-      BACKTRACE_SELF_TEST n
-      CPU_NOTIFIER_ERROR_INJECT? n
-      DEBUG_DEVRES n
-      DEBUG_NX_TEST n
-      DEBUG_STACK_USAGE n
-      DEBUG_STACKOVERFLOW n
-      RCU_TORTURE_TEST n
-      SCHEDSTATS n
+import ./generic.nix (args // rec {
+  version = "3.4.55";
 
-      # Support drivers that need external firmware.
-      STANDALONE n
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
+    sha256 = "1sbb6qa2nb1zwihkdn51q5ac3kn7hrssabn5whx8965hga7yw1dx";
+  };
 
-      # 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
-      BLK_CGROUP y # required by CFQ
-
-      # Enable NUMA.
-      NUMA? y
-
-      # Disable some expensive (?) features.
-      FTRACE n
-      KPROBES 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
-      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
-      HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver
-      HOSTAP_FIRMWARE_NVRAM y
-      ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus
-      ATH9K_AHB y # Ditto, AHB bus
-      B43_PHY_HT y
-      BCMA_HOST_PCI 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
-      # Enable KMS for devices whose X.org driver supports it.
-      DRM_I915_KMS y
-      DRM_RADEON_KMS y
-      # Hybrid graphics support
-      VGA_SWITCHEROO 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
-      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
-      NFS_FSCACHE y
-      CIFS_XATTR y
-      CIFS_POSIX y
-      CIFS_FSCACHE 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
-      AUDIT_LOGINUID_IMMUTABLE y
-      B43_PCMCIA y
-      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 m
-      BT_RFCOMM_TTY y # RFCOMM TTY support
-      CRASH_DUMP n
-      DMAR? n # experimental
-      DVB_DYNAMIC_MINORS y # we use udev
-      EFI_STUB y # EFI bootloader in the bzImage itself
-      FHANDLE y # used by systemd
-      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
-      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
-      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
-      USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling
-      X86_CHECK_BIOS_CORRUPTION y
-      X86_MCE y
-
-      # Linux Containers
-      RT_GROUP_SCHED? y
-      CGROUP_DEVICE? y
-      CGROUP_MEM_RES_CTLR? y
-      CGROUP_MEM_RES_CTLR_SWAP? y
-      DEVPTS_MULTIPLE_INSTANCES? y
-
-      # Enable staging drivers.  These are somewhat experimental, but
-      # they generally don't hurt.
-      STAGING y
-
-      # PROC_EVENTS requires that the netlink connector is not built
-      # as a module.  This is required by libcgroup's cgrulesengd.
-      CONNECTOR y
-      PROC_EVENTS y
-
-      # Tracing
-      FTRACE y
-      FUNCTION_TRACER y
-      FTRACE_SYSCALLS y
-      SCHED_TRACER y
-
-      # Devtmpfs support.
-      DEVTMPFS y
-
-      # Easier debug of NFS issues
-      SUNRPC_DEBUG y
-
-      ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
-      ${extraConfig}
-    '';
-in
-
-import ./generic.nix (
-
-  rec {
-    version = "3.4.55";
-    testing = false;
-
-    preConfigure = ''
-      substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
-    '';
-
-    src = fetchurl {
-      url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
-      sha256 = "1sbb6qa2nb1zwihkdn51q5ac3kn7hrssabn5whx8965hga7yw1dx";
-    };
-
-    config = configWithPlatform stdenv.platform;
-    configCross = configWithPlatform stdenv.cross.platform;
-
-    features.iwlwifi = true;
-    features.efiBootStub = true;
-    features.needsCifsUtils = true;
-    features.netfilterRPFilter = true;
-  }
-
-  // removeAttrs args ["extraConfig"]
-)
+  features.iwlwifi = true;
+  features.efiBootStub = true;
+  features.needsCifsUtils = true;
+  features.netfilterRPFilter = true;
+})
diff --git a/pkgs/os-specific/linux/kernel/linux-3.8.nix b/pkgs/os-specific/linux/kernel/linux-3.8.nix
index 1516f97521de..f455f4ee7f88 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.8.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.8.nix
@@ -1,283 +1,16 @@
-args @ { stdenv, fetchurl, extraConfig ? ""
-, perl, mktemp, module_init_tools
-, ... }:
+{ stdenv, fetchurl, ... } @ args:
 
-let
-  configWithPlatform = kernelPlatform :
-    ''
-      # Power management and debugging for powertop.
-      DEBUG_KERNEL y
-      PM_ADVANCED_DEBUG y
-      PM_RUNTIME y
-      TIMER_STATS y
-      USB_SUSPEND y
-      BACKTRACE_SELF_TEST n
-      CPU_NOTIFIER_ERROR_INJECT? n
-      DEBUG_DEVRES n
-      DEBUG_NX_TEST n
-      DEBUG_STACK_USAGE n
-      DEBUG_STACKOVERFLOW n
-      RCU_TORTURE_TEST n
-      SCHEDSTATS n
+import ./generic.nix (args // rec {
+  version = "3.8.13";
 
-      # Support drivers that need external firmware.
-      STANDALONE n
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
+    sha256 = "0pznsj89020fjl8dhcyf7r5bh95b27727gs0ri9has4i2z63blbw";
+  };
 
-      # 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
-      BLK_CGROUP y # required by CFQ
-
-      # Enable NUMA.
-      NUMA? y
-
-      # Disable some expensive (?) features.
-      FTRACE n
-      KPROBES 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
-      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
-      HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver
-      HOSTAP_FIRMWARE_NVRAM y
-      ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus
-      ATH9K_AHB y # Ditto, AHB bus
-      B43_PHY_HT y
-      BCMA_HOST_PCI y
-      CFG80211_WEXT y # Without it, ipw2200 drivers don't build
-
-      # 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
-      # Enable KMS for devices whose X.org driver supports it.
-      DRM_I915_KMS y
-      DRM_RADEON_KMS y
-      # Hybrid graphics support
-      VGA_SWITCHEROO 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
-      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
-      NFS_FSCACHE y
-      CIFS_XATTR y
-      CIFS_POSIX y
-      CIFS_FSCACHE 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
-      AUDIT_LOGINUID_IMMUTABLE y
-      B43_PCMCIA y
-      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 m
-      BT_RFCOMM_TTY y # RFCOMM TTY support
-      CRASH_DUMP n
-      DMAR? n # experimental
-      DVB_DYNAMIC_MINORS? y # we use udev
-      EFI_STUB y # EFI bootloader in the bzImage itself
-      FHANDLE y # used by systemd
-      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
-      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
-      PPP_MULTILINK y # PPP multilink support
-      REGULATOR y # Voltage and Current Regulator Support
-      RC_DEVICES y # Enable IR devices
-      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
-      USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling
-      X86_CHECK_BIOS_CORRUPTION y
-      X86_MCE y
-      XEN_DOM0 y
-
-      # Linux Containers
-      RT_GROUP_SCHED? y
-      CGROUP_DEVICE? y
-      MEMCG? y
-      MEMCG_SWAP? y
-      DEVPTS_MULTIPLE_INSTANCES? y
-
-      # Enable staging drivers.  These are somewhat experimental, but
-      # they generally don't hurt.
-      STAGING y
-
-      # PROC_EVENTS requires that the netlink connector is not built
-      # as a module.  This is required by libcgroup's cgrulesengd.
-      CONNECTOR y
-      PROC_EVENTS y
-
-      # Tracing
-      FTRACE y
-      FUNCTION_TRACER y
-      FTRACE_SYSCALLS y
-      SCHED_TRACER y
-
-      # Devtmpfs support.
-      DEVTMPFS y
-
-      # Media support
-      MEDIA_SUPPORT y
-      MEDIA_DIGITAL_TV_SUPPORT y
-
-      MEDIA_CAMERA_SUPPORT? y
-      MEDIA_RC_SUPPORT? y
-      MEDIA_USB_SUPPORT y
-
-      # Easier debug of NFS issues
-      SUNRPC_DEBUG y
-
-      ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
-      ${extraConfig}
-    '';
-in
-
-import ./generic.nix (
-
-  rec {
-    version = "3.8.13";
-    testing = false;
-
-    preConfigure = ''
-      substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
-    '';
-
-    src = fetchurl {
-      url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
-      sha256 = "0pznsj89020fjl8dhcyf7r5bh95b27727gs0ri9has4i2z63blbw";
-    };
-
-    config = configWithPlatform stdenv.platform;
-    configCross = configWithPlatform stdenv.cross.platform;
-
-    features.iwlwifi = true;
-    features.efiBootStub = true;
-    features.needsCifsUtils = true;
-    features.canDisableNetfilterConntrackHelpers = true;
-    features.netfilterRPFilter = true;
-  }
-
-  // removeAttrs args ["extraConfig"]
-)
+  features.iwlwifi = true;
+  features.efiBootStub = true;
+  features.needsCifsUtils = true;
+  features.canDisableNetfilterConntrackHelpers = true;
+  features.netfilterRPFilter = true;
+})
diff --git a/pkgs/os-specific/linux/kernel/linux-3.9.nix b/pkgs/os-specific/linux/kernel/linux-3.9.nix
index b3909900c66a..51bcf35b3fe8 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.9.nix
@@ -1,286 +1,16 @@
-args @ { stdenv, fetchurl, extraConfig ? ""
-, perl, mktemp, module_init_tools, bc
-, ... }:
+{ stdenv, fetchurl, ... } @ args:
 
-let
-  configWithPlatform = kernelPlatform :
-    ''
-      # Power management and debugging for powertop.
-      DEBUG_KERNEL y
-      PM_ADVANCED_DEBUG y
-      PM_RUNTIME y
-      TIMER_STATS y
-      USB_SUSPEND y
-      BACKTRACE_SELF_TEST n
-      CPU_NOTIFIER_ERROR_INJECT? n
-      DEBUG_DEVRES n
-      DEBUG_NX_TEST n
-      DEBUG_STACK_USAGE n
-      DEBUG_STACKOVERFLOW n
-      RCU_TORTURE_TEST n
-      SCHEDSTATS n
+import ./generic.nix (args // rec {
+  version = "3.9.11";
 
-      # Support drivers that need external firmware.
-      STANDALONE n
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
+    sha256 = "0d5j7kg1ifzwipicbi4g26plzbzn1rlvgj1hs4zip6sxj8ifbffl";
+  };
 
-      # 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
-      BLK_CGROUP y # required by CFQ
-
-      # Enable NUMA.
-      NUMA? y
-
-      # Disable some expensive (?) features.
-      FTRACE n
-      KPROBES 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
-      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
-      HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver
-      HOSTAP_FIRMWARE_NVRAM y
-      ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus
-      ATH9K_AHB y # Ditto, AHB bus
-      B43_PHY_HT y
-      BCMA_HOST_PCI y
-      CFG80211_WEXT y # Without it, ipw2200 drivers don't build
-
-      # 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
-      # Enable KMS for devices whose X.org driver supports it.
-      DRM_I915_KMS y
-      DRM_RADEON_KMS? y
-      # Hybrid graphics support
-      VGA_SWITCHEROO 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
-      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
-      NFS_FSCACHE y
-      CIFS_XATTR y
-      CIFS_POSIX y
-      CIFS_FSCACHE 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
-      AUDIT_LOGINUID_IMMUTABLE y
-      B43_PCMCIA y
-      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 m
-      BT_RFCOMM_TTY y # RFCOMM TTY support
-      CRASH_DUMP n
-      DMAR? n # experimental
-      DVB_DYNAMIC_MINORS? y # we use udev
-      EFI_STUB y # EFI bootloader in the bzImage itself
-      FHANDLE y # used by systemd
-      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
-      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
-      PPP_MULTILINK y # PPP multilink support
-      REGULATOR y # Voltage and Current Regulator Support
-      RC_DEVICES y # Enable IR devices
-      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
-      USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling
-      X86_CHECK_BIOS_CORRUPTION y
-      X86_MCE y
-      XEN_DOM0 y
-
-      # Linux Containers
-      RT_GROUP_SCHED? y
-      CGROUP_DEVICE? y
-      MEMCG? y
-      MEMCG_SWAP? y
-      DEVPTS_MULTIPLE_INSTANCES? y
-
-      # Enable staging drivers.  These are somewhat experimental, but
-      # they generally don't hurt.
-      STAGING y
-
-      # PROC_EVENTS requires that the netlink connector is not built
-      # as a module.  This is required by libcgroup's cgrulesengd.
-      CONNECTOR y
-      PROC_EVENTS y
-
-      # Tracing
-      FTRACE y
-      FUNCTION_TRACER y
-      FTRACE_SYSCALLS y
-      SCHED_TRACER y
-
-      # Devtmpfs support.
-      DEVTMPFS y
-
-      # Media support
-      MEDIA_CAMERA_SUPPORT? y
-      MEDIA_RC_SUPPORT? y
-      MEDIA_USB_SUPPORT y
-
-      # Easier debug of NFS issues
-      SUNRPC_DEBUG y
-
-      # Enable the 9P cache to speed up NixOS VM tests.
-      9P_FSCACHE y
-      9P_FS_POSIX_ACL y
-
-      ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
-      ${extraConfig}
-    '';
-in
-
-import ./generic.nix (
-
-  rec {
-    version = "3.9.10";
-    testing = false;
-
-    preConfigure = ''
-      substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
-    '';
-
-    src = fetchurl {
-      url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
-      sha256 = "1c187jmdkz6nqfgf4sz9f4da6wzbn2mf99qcjr56nz8sr2zmk2wv";
-    };
-
-    config = configWithPlatform stdenv.platform;
-    configCross = configWithPlatform stdenv.cross.platform;
-
-    features.iwlwifi = true;
-    features.efiBootStub = true;
-    features.needsCifsUtils = true;
-    features.canDisableNetfilterConntrackHelpers = true;
-    features.netfilterRPFilter = true;
-
-    extraNativeBuildInputs = [bc];
-  }
-
-  // removeAttrs args ["extraConfig"]
-)
+  features.iwlwifi = true;
+  features.efiBootStub = true;
+  features.needsCifsUtils = true;
+  features.canDisableNetfilterConntrackHelpers = true;
+  features.netfilterRPFilter = true;
+})
diff --git a/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix b/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix
index cf88544abd5a..319c2ba42b49 100644
--- a/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix
@@ -1,44 +1,17 @@
-args @ {
-  stdenv, fetchurl, extraConfig ? "" , perl, mktemp, module_init_tools, ...
-}:
+{ stdenv, fetchurl, ... } @ args:
 
-let
-  configWithPlatform = kernelPlatform :
-    ''
-      ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
-      ${extraConfig}
-    '';
+let rev = "91a3be5b2b"; in
 
-  rev = "91a3be5b2b";
-in
+import ./generic.nix (args // rec {
+  version = "3.6.y-${rev}";
 
-import ./generic.nix (
+  src = fetchurl {
+    url = "https://api.github.com/repos/raspberrypi/linux/tarball/${rev}";
+    name = "linux-raspberrypi-${version}.tar.gz";
+    sha256 = "04370b1da7610622372940decdc13ddbba2a58c9da3c3bd3e7df930a399f140d";
+  };
 
-  rec {
-    version = "3.6.y-${rev}";
-    testing = false;
+  features.iwlwifi = true;
 
-    preConfigure = ''
-      substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
-    '';
-
-    src = fetchurl {
-      url = "https://api.github.com/repos/raspberrypi/linux/tarball/${rev}";
-      name = "linux-raspberrypi-${version}.tar.gz";
-      sha256 = "04370b1da7610622372940decdc13ddbba2a58c9da3c3bd3e7df930a399f140d";
-    };
-
-    config = configWithPlatform stdenv.platform;
-    configCross = configWithPlatform stdenv.cross.platform;
-
-    features.iwlwifi = true;
-    #features.efiBootStub = true;
-    #features.needsCifsUtils = true;
-    #features.canDisableNetfilterConntrackHelpers = true;
-    #features.netfilterRPFilter = true;
-
-    extraMeta.platforms = [];
-  }
-
-  // removeAttrs args ["extraConfig"]
-)
+  extraMeta.platforms = [];
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 54f4dbf72abf..8e599a83a118 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6370,7 +6370,7 @@ let
   kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { };
 
   linux_3_0 = makeOverridable (import ../os-specific/linux/kernel/linux-3.0.nix) {
-    inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
+    inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser;
     kernelPatches =
       [ kernelPatches.sec_perm_2_6_24
         # kernelPatches.aufs3_0
@@ -6378,7 +6378,7 @@ let
   };
 
   linux_3_2 = makeOverridable (import ../os-specific/linux/kernel/linux-3.2.nix) {
-    inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
+    inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser;
     kernelPatches =
       [ kernelPatches.sec_perm_2_6_24
         # kernelPatches.aufs3_2
@@ -6405,7 +6405,7 @@ let
   });
 
   linux_3_4 = makeOverridable (import ../os-specific/linux/kernel/linux-3.4.nix) {
-    inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
+    inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser;
     kernelPatches =
       [ kernelPatches.sec_perm_2_6_24
         # kernelPatches.aufs3_4
@@ -6424,11 +6424,11 @@ let
   });
 
   linux_3_6_rpi = makeOverridable (import ../os-specific/linux/kernel/linux-rpi-3.6.nix) {
-    inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
+    inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser;
   };
 
   linux_3_8 = makeOverridable (import ../os-specific/linux/kernel/linux-3.8.nix) {
-    inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
+    inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser;
     kernelPatches =
       [
         kernelPatches.sec_perm_2_6_24

From e1a7be4294f2bac112fa918a2cbf1dd5f0956c6c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 1 Aug 2013 00:02:00 +0200
Subject: [PATCH 05/84] iwlwifi4965ucodeV1: Remove

This is verrrry obsolete.
---
 .../firmware/iwlwifi-4965-ucode/default.nix   | 36 -------------------
 pkgs/top-level/all-packages.nix               |  8 +----
 2 files changed, 1 insertion(+), 43 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix

diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix
deleted file mode 100644
index 266c7795d230..000000000000
--- a/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation rec {
-  name = "iwlwifi-4965-ucode-228.57.1.21";
-  
-  src = fetchurl {
-    url = "wireless.kernel.org/en/users/Drivers/iwlegacy?action=AttachFile&do=get&target=${name}.tgz";
-    name = "${name}.tgz";
-    sha256 = "1rry0kpzszxk60h5gb94advzi009010xb332iyvfpaiwbj6aiyas";
-  };
-  
-  buildPhase = "true";
-
-  installPhase = ''
-    mkdir -p "$out"
-    chmod -x *
-    cp * "$out"
-
-    # The driver expects the `-1' in the file name.
-    cd "$out"
-    ln -s iwlwifi-4965.ucode iwlwifi-4965-1.ucode
-  '';
-  
-  meta = {
-    description = "Firmware for the Intel 4965ABG wireless card";
-
-    longDescription = ''
-      This package provides version 2 of the Intel wireless card
-      firmware, for Linux up to 2.6.26.  It contains the
-      `iwlwifi-4965-1.ucode' file, which is loaded by the `iw4965'
-      driver found in recent kernels.
-    '';
-
-    homepage = http://intellinuxwireless.org/;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8e599a83a118..f3ced7dbc397 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6313,8 +6313,6 @@ let
 
   iwlwifi3945ucode = callPackage ../os-specific/linux/firmware/iwlwifi-3945-ucode { };
 
-  iwlwifi4965ucodeV1 = callPackage ../os-specific/linux/firmware/iwlwifi-4965-ucode { };
-
   iwlwifi4965ucodeV2 = callPackage ../os-specific/linux/firmware/iwlwifi-4965-ucode/version-2.nix { };
 
   iwlwifi5000ucode = callPackage ../os-specific/linux/firmware/iwlwifi-5000-ucode { };
@@ -6510,11 +6508,7 @@ let
 
     iwlwifi = callPackage ../os-specific/linux/iwlwifi { };
 
-    iwlwifi4965ucode =
-      if builtins.compareVersions self.kernel.version "2.6.27" == 0
-         || builtins.compareVersions self.kernel.version "2.6.27" == 1
-      then iwlwifi4965ucodeV2
-      else iwlwifi4965ucodeV1;
+    iwlwifi4965ucode = iwlwifi4965ucodeV2;
 
     atheros = callPackage ../os-specific/linux/atheros/0.9.4.nix { };
 

From bc8186be1e02f7f63916a8d158890f9e21a0773b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 1 Aug 2013 00:08:44 +0200
Subject: [PATCH 06/84] linux: Disable /dev/kmem

See e.g.
  https://wiki.ubuntu.com/Security/Features#A.2BAC8-dev.2BAC8-kmem_disabled
---
 pkgs/os-specific/linux/kernel/common-config.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 4b19cd2aa2a7..2e64dae23fe1 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -163,7 +163,8 @@ with stdenv.lib;
 
   # Security related features.
   STRICT_DEVMEM y # Filter access to /dev/mem
-  SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default
+  SECURITY_SELINUX_BOOTPARAM_VALUE 0 # Disable SELinux by default
+  DEVKMEM n # Disable /dev/kmem
 
   # Misc. options.
   8139TOO_8129 y

From 956d71f8432f9f7b073aaf19d51cf6e3d02ed691 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 1 Aug 2013 00:14:07 +0200
Subject: [PATCH 07/84] linux: Remove some unused patches

---
 .../linux/kernel/guruplug-defconfig.patch     | 2714 -----------------
 .../linux/kernel/guruplug-mach-type.patch     |   15 -
 pkgs/os-specific/linux/kernel/patches.nix     |   15 -
 3 files changed, 2744 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel/guruplug-defconfig.patch
 delete 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
deleted file mode 100644
index add982951ad5..000000000000
--- a/pkgs/os-specific/linux/kernel/guruplug-defconfig.patch
+++ /dev/null
@@ -1,2714 +0,0 @@
-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
deleted file mode 100644
index bfcbcf44aa49..000000000000
--- a/pkgs/os-specific/linux/kernel/guruplug-mach-type.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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 37c5f926e87a..d9bd6f2c9342 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -163,19 +163,4 @@ rec {
          });
     };
 
-  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 ff99631753002a8e4c8125d50d1e1eb53e0a0b28 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 1 Aug 2013 00:15:31 +0200
Subject: [PATCH 08/84] linux: Remove CIFS timeout patch

We longer use CIFS in the VM tests so we don't need this anymore.
---
 .../linux/kernel/cifs-timeout-2.6.38.patch          | 13 -------------
 pkgs/os-specific/linux/kernel/patches.nix           |  8 --------
 pkgs/top-level/all-packages.nix                     |  1 -
 3 files changed, 22 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel/cifs-timeout-2.6.38.patch

diff --git a/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.38.patch b/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.38.patch
deleted file mode 100644
index 8168ffb5a1af..000000000000
--- a/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.38.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- /tmp/linux-2.6.32.14/fs/cifs/transport.c	2011-03-27 20:37:20.000000000 +0200
-+++ linux-2.6.32.14/fs/cifs/transport.c	2011-04-01 11:07:17.700305670 +0200
-@@ -182,8 +182,8 @@
- 			   after the retries we will kill the socket and
- 			   reconnect which may clear the network problem.
- 			*/
--			if ((i >= 14) || (!server->noblocksnd && (i > 2))) {
--				cERROR(1, "sends on sock %p stuck for 15 seconds",
-+			if ((i >= 119) || (!server->noblocksnd && (i > 2))) {
-+				cERROR(1, "sends on sock %p stuck for 119 seconds",
- 				    ssocket);
- 				rc = -EAGAIN;
- 				break;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index d9bd6f2c9342..42f1be071f9d 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -125,14 +125,6 @@ rec {
     features.aufs3 = true;
   };
 
-  # Increase the timeout on CIFS requests from 15 to 120 seconds to
-  # make CIFS more resilient to high load on the CIFS server.
-  cifs_timeout_2_6_38 =
-    { name = "cifs-timeout";
-      patch = ./cifs-timeout-2.6.38.patch;
-      features.cifsTimeout = true;
-    };
-
   no_xsave =
     { name = "no-xsave";
       patch = ./no-xsave.patch;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f3ced7dbc397..bc212974836c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6380,7 +6380,6 @@ let
     kernelPatches =
       [ kernelPatches.sec_perm_2_6_24
         # kernelPatches.aufs3_2
-        kernelPatches.cifs_timeout_2_6_38
       ];
   };
 

From b976e00ff27068d73d4e7bb891956c42e5220de6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 1 Aug 2013 00:16:45 +0200
Subject: [PATCH 09/84] linux: Remove obsolete AUFS 3.7 patch

---
 pkgs/os-specific/linux/kernel/patches.nix | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 42f1be071f9d..7bd8c6f94edc 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -110,21 +110,6 @@ rec {
     features.aufs3 = true;
   };
 
-  # not officially released yet, but 3.x seems to work fine
-  aufs3_7 = rec {
-    name = "aufs3.7";
-    version = "3.x.20121210";
-    utilRev = "91af15f977d12e02165759620005f6ce1a4d7602";
-    utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996";
-    patch = makeAufs3StandalonePatch {
-      inherit version;
-      rev = "8d24d728c7eb54dd624bccd8e87afa826670142c";
-      sha256 = "02dcb46e02b2a6b90c1601b5747614276074488c9308625c3a52ab74cad997a5";
-    };
-    features.aufsBase = true;
-    features.aufs3 = true;
-  };
-
   no_xsave =
     { name = "no-xsave";
       patch = ./no-xsave.patch;

From c564d012f8237b5d667a7bebfd782efff9a78ec5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 1 Aug 2013 00:20:20 +0200
Subject: [PATCH 10/84] Style fix

---
 pkgs/os-specific/linux/kernel/patches.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 7bd8c6f94edc..c77785167cc1 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -133,11 +133,10 @@ rec {
 
   grsecurity_2_9_1_3_2_48 =
     { name = "grsecurity-2.9.1-3.2.48";
-      patch =
-        (fetchurl {
-           url = http://grsecurity.net/stable/grsecurity-2.9.1-3.2.48-201307212241.patch;
-           sha256 = "1llgrcd7ynxx60dn05bcbysd6a1091wwxkck4d15gvp71s9r6scm";
-         });
+      patch = fetchurl {
+        url = http://grsecurity.net/stable/grsecurity-2.9.1-3.2.48-201307212241.patch;
+        sha256 = "1llgrcd7ynxx60dn05bcbysd6a1091wwxkck4d15gvp71s9r6scm";
+      };
     };
 
 }

From f2f00c56e4e54e6df6393035b73796ab5d8cc48a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 1 Aug 2013 00:38:54 +0200
Subject: [PATCH 11/84] linux: Enable stack protector

This may prevent exploitation of buffer overflows.
---
 pkgs/os-specific/linux/kernel/common-config.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 2e64dae23fe1..83417787f0d4 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -165,6 +165,7 @@ with stdenv.lib;
   STRICT_DEVMEM y # Filter access to /dev/mem
   SECURITY_SELINUX_BOOTPARAM_VALUE 0 # Disable SELinux by default
   DEVKMEM n # Disable /dev/kmem
+  CC_STACKPROTECTOR y # Detect buffer overflows on the stack
 
   # Misc. options.
   8139TOO_8129 y

From d1de0e2d6db53134b142c692bed538fe6db18631 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 1 Aug 2013 00:50:48 +0200
Subject: [PATCH 12/84] linux: Enable detection of hung tasks

---
 pkgs/os-specific/linux/kernel/common-config.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 83417787f0d4..cc9be98c838f 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -19,6 +19,7 @@ with stdenv.lib;
   DEBUG_STACKOVERFLOW n
   RCU_TORTURE_TEST n
   SCHEDSTATS n
+  DETECT_HUNG_TASK y
 
   # Support drivers that need external firmware.
   STANDALONE n

From 14ca9c0bf1480ded542ceb64e754b630294eaba7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 1 Aug 2013 01:39:59 +0200
Subject: [PATCH 13/84] linux: Include "NixOS" in "uname -v"

---
 pkgs/os-specific/linux/kernel/builder.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/builder.sh b/pkgs/os-specific/linux/kernel/builder.sh
index bea53e9c4dda..621237fa9a3f 100644
--- a/pkgs/os-specific/linux/kernel/builder.sh
+++ b/pkgs/os-specific/linux/kernel/builder.sh
@@ -1,7 +1,7 @@
 source $stdenv/setup
 
 
-makeFlags="ARCH=$arch SHELL=/bin/sh $makeFlags"
+makeFlags="ARCH=$arch SHELL=/bin/sh KBUILD_BUILD_VERSION=1-NixOS $makeFlags"
 if [ -n "$crossConfig" ]; then
   makeFlags="$makeFlags CROSS_COMPILE=$crossConfig-"
 fi

From 77dd343e1e729a19cc471992515b6538130d46f0 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Thu, 1 Aug 2013 11:21:54 +0200
Subject: [PATCH 14/84] - System images are not required for building.
 Disabling them makes building faster. - Make ant flags configurable

---
 pkgs/development/mobile/androidenv/build-app.nix | 7 ++++---
 pkgs/development/mobile/androidenv/default.nix   | 6 ++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/build-app.nix b/pkgs/development/mobile/androidenv/build-app.nix
index b5aa82cced71..2792d364f15c 100644
--- a/pkgs/development/mobile/androidenv/build-app.nix
+++ b/pkgs/development/mobile/androidenv/build-app.nix
@@ -1,5 +1,5 @@
 { stdenv, androidsdk, jdk, ant }:
-{ name, src, platformVersions ? [ "8" ], abiVersions ? [ "armeabi-v7a" ], useGoogleAPIs ? false
+{ name, src, platformVersions ? [ "8" ], useGoogleAPIs ? false, antFlags ? ""
 , release ? false, keyStore ? null, keyAlias ? null, keyStorePassword ? null, keyAliasPassword ? null
 }:
 
@@ -11,7 +11,8 @@ let
     else throw "Platform: ${stdenv.system} is not supported!";
 
   androidsdkComposition = androidsdk {
-    inherit platformVersions abiVersions useGoogleAPIs;
+    inherit platformVersions useGoogleAPIs;
+    abiVersions = [];
   };
 in
 stdenv.mkDerivation {
@@ -34,7 +35,7 @@ stdenv.mkDerivation {
     ''}
   
     export ANDROID_SDK_HOME=`pwd` # Key files cannot be stored in the user's home directory. This overrides it.
-    ant ${if release then "release" else "debug"}
+    ant ${antFlags} ${if release then "release" else "debug"}
   '';
   
   installPhase = ''
diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix
index d7d8d92a66ef..6e410d4c5db9 100644
--- a/pkgs/development/mobile/androidenv/default.nix
+++ b/pkgs/development/mobile/androidenv/default.nix
@@ -57,6 +57,12 @@ rec {
     useGoogleAPIs = true;
   };
   
+  androidsdk_4_2 = androidsdk {
+    platformVersions = [ "17" ];
+    abiVersions = [ "armeabi-v7a" ];
+    useGoogleAPIs = true;
+  };
+  
   buildApp = import ./build-app.nix {
     inherit (pkgs) stdenv jdk ant;
     inherit androidsdk;

From c81e70fc305b8714101479bb884da0c60cdd7d69 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Thu, 1 Aug 2013 11:32:57 +0200
Subject: [PATCH 15/84] Shut up annoying question to configure hardware
 profiles

---
 pkgs/development/mobile/androidenv/emulate-app.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/mobile/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix
index 97d73bffded1..eb39d854d1fb 100644
--- a/pkgs/development/mobile/androidenv/emulate-app.nix
+++ b/pkgs/development/mobile/androidenv/emulate-app.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation {
     export ANDROID_SERIAL="emulator-$port"
     
     # Create a virtual android device
-    ${androidsdkComposition}/libexec/android-sdk-*/tools/android create avd -n device -t ${if useGoogleAPIs then "'Google Inc.:Google APIs:"+platformVersion+"'" else "android-"+platformVersion}
+    yes "" | ${androidsdkComposition}/libexec/android-sdk-*/tools/android create avd -n device -t ${if useGoogleAPIs then "'Google Inc.:Google APIs:"+platformVersion+"'" else "android-"+platformVersion}
     
     # Enable GPU acceleration
     ${stdenv.lib.optionalString enableGPU ''

From 9a2b9ba6b30ed233851f1941030e06f07b3fae9a Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Thu, 1 Aug 2013 12:43:33 +0200
Subject: [PATCH 16/84] Turn LD_LIBRARY_PATH into a suffix to allow NVIDIA's
 OpenGL driver to be used

---
 pkgs/development/mobile/androidenv/androidsdk.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix
index 34cc07adf35e..1573de63e096 100644
--- a/pkgs/development/mobile/androidenv/androidsdk.nix
+++ b/pkgs/development/mobile/androidenv/androidsdk.nix
@@ -61,14 +61,14 @@ stdenv.mkDerivation {
       for i in emulator emulator-arm emulator-mips emulator-x86
       do
           wrapProgram `pwd`/$i \
-            --prefix LD_LIBRARY_PATH : `pwd`/lib:${libX11_32bit}/lib:${libxcb_32bit}/lib:${libXau_32bit}/lib:${libXdmcp_32bit}/lib:${libXext_32bit}/lib:${mesa_32bit}/lib
+            --suffix LD_LIBRARY_PATH : `pwd`/lib:${libX11_32bit}/lib:${libxcb_32bit}/lib:${libXau_32bit}/lib:${libXdmcp_32bit}/lib:${libXext_32bit}/lib:${mesa_32bit}/lib
       done
       
       ${stdenv.lib.optionalString (stdenv.system == "x86_64-linux") ''
         for i in emulator64-arm emulator64-mips emulator64-x86
         do
             wrapProgram `pwd`/$i \
-            --prefix LD_LIBRARY_PATH : `pwd`/lib:${libX11}/lib:${libxcb}/lib:${libXau}/lib:${libXdmcp}/lib:${libXext}/lib:${mesa}/lib
+            --suffix LD_LIBRARY_PATH : `pwd`/lib:${libX11}/lib:${libxcb}/lib:${libXau}/lib:${libXdmcp}/lib:${libXext}/lib:${mesa}/lib
         done
       ''}
     ''}

From f155a35d7d8562b1da40a7e0b4265829d54455bd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 1 Aug 2013 14:01:59 +0200
Subject: [PATCH 17/84] Move kernelExtraConfig to common-config.nix (for x86)

It's bad to have the kernel config scattered across two places.  (This
should also be done for the other architectures.)

Also, restore Xen and KVM guest support in Linux 3.10.
---
 pkgs/os-specific/linux/kernel/common-config.nix | 15 +++++++++++++++
 pkgs/top-level/platforms.nix                    | 13 -------------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index cc9be98c838f..0c3aca17e4e0 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -265,7 +265,22 @@ with stdenv.lib;
   ''}
 
   # Virtualisation.
+  PARAVIRT y
+  ${if versionAtLeast version "3.10" then ''
+    HYPERVISOR_GUEST y
+  '' else ''
+    PARAVIRT_GUEST y
+  ''}
+  KVM_GUEST y
+  ${optionalString (versionOlder version "3.7") ''
+    KVM_CLOCK y
+  ''}
+  XEN y
   XEN_DOM0? y
+  KSM y
+  ${optionalString (!stdenv.is64bit) ''
+    HIGHMEM64G? y # We need 64 GB (PAE) support for Xen guest support.
+  ''}
 
   # Media support.
   ${optionalString (versionAtLeast version "3.6") ''
diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix
index ec047efecb02..d6408286581d 100644
--- a/pkgs/top-level/platforms.nix
+++ b/pkgs/top-level/platforms.nix
@@ -10,19 +10,6 @@ rec {
     # Currently ignored - it should be set according to 'system' once it is
     # not ignored. This is for stdenv-updates.
     kernelArch = "i386";
-    kernelExtraConfig =
-      ''
-        # Virtualisation (KVM, Xen...).
-        HYPERVISOR_GUEST? y #3.10 version of the paravirt options
-        PARAVIRT_GUEST? y #Doesn't exist in 3.10
-        KVM_CLOCK? y #Part of KVM_GUEST since linux 3.7
-        KVM_GUEST? y #Doesn't exist in 3.10
-        XEN? y #Doesn't exist in 3.10
-        KSM y
-
-        # We need 64 GB (PAE) support for Xen guest support.
-        HIGHMEM64G? y
-      '';
   };
 
   pc_simplekernel = pc // {

From d077851b7d4c3728811237d6d105b6f9622ae244 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 1 Aug 2013 14:30:18 +0200
Subject: [PATCH 18/84] VM builds: Use the default kernel

---
 pkgs/build-support/vm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 2821fc0a099d..b0911fd99c34 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -1,5 +1,5 @@
 { pkgs
-, kernel ? pkgs.linux_3_9
+, kernel ? pkgs.linux
 , img ? "bzImage"
 , rootModules ?
     [ "virtio_pci" "virtio_blk" "virtio_balloon" "ext4" "unix" "9p" "9pnet_virtio" ]
@@ -114,14 +114,14 @@ rec {
 
     echo "mounting Nix store..."
     mkdir -p /fs/nix/store
-    mount -t 9p store /fs/nix/store -o trans=virtio,version=9p2000.L,msize=262144,cache=fscache
+    mount -t 9p store /fs/nix/store -o trans=virtio,version=9p2000.L,msize=262144,cache=loose
 
     mkdir -p /fs/tmp
     mount -t tmpfs -o "mode=755" none /fs/tmp
 
     echo "mounting host's temporary directory..."
     mkdir -p /fs/tmp/xchg
-    mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L,msize=262144,cache=fscache
+    mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L,msize=262144,cache=loose
 
     mkdir -p /fs/proc
     mount -t proc none /fs/proc

From 4342a32debf7d3961581e500b7e445e7ca466c33 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 1 Aug 2013 14:35:04 +0200
Subject: [PATCH 19/84] VM builds: Reduce kernel verbosity

---
 pkgs/build-support/vm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index b0911fd99c34..5f9381cd00cf 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -91,8 +91,8 @@ rec {
       esac
     done
 
+    echo "loading kernel modules..."
     for i in $(cat ${modulesClosure}/insmod-list); do
-      echo "loading module $(basename $i .ko)"
       insmod $i
     done
 
@@ -133,7 +133,7 @@ rec {
     ln -sf /proc/mounts /fs/etc/mtab
     echo "127.0.0.1 localhost" > /fs/etc/hosts
 
-    echo "Now running: $command"
+    echo "starting stage 2 ($command)"
     test -n "$command"
 
     set +e
@@ -195,7 +195,7 @@ rec {
       -drive file=$diskImage,if=virtio,cache=writeback,werror=report \
       -kernel ${kernel}/${img} \
       -initrd ${initrd}/initrd \
-      -append "console=ttyS0 panic=1 command=${stage2Init} out=$out mountDisk=$mountDisk" \
+      -append "console=ttyS0 panic=1 command=${stage2Init} out=$out mountDisk=$mountDisk loglevel=4" \
       $QEMU_OPTS
   '';
 

From 4ec1f8b68aa4902fb577a988d25c712245be7cf1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 1 Aug 2013 16:26:02 +0200
Subject: [PATCH 20/84] git: Update to 1.8.3.4

---
 .../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 dd603e755627..074bcd6c289a 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -10,7 +10,7 @@
 
 let
 
-  version = "1.8.3.2";
+  version = "1.8.3.4";
 
   svn = subversionClient.override { perlBindings = true; };
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://git-core.googlecode.com/files/git-${version}.tar.gz";
-    sha256 = "0mfylhcdrh8prxkbs0gc877rmra2ks48bchg4hhaf2vpw9hpdf63";
+    sha256 = "1nfr4hgqs3b6k9wanqcix0wlw71q61h5irxiavlspd4jvzrcv8nz";
   };
 
   patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ];

From 80a82a2858fd767384d974798b36f0555618fca1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 1 Aug 2013 16:36:54 +0200
Subject: [PATCH 21/84] git: Install git-subtree

---
 .../version-management/git-and-tools/git/default.nix       | 7 +++++++
 1 file changed, 7 insertions(+)

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 074bcd6c289a..c22b358189da 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -50,6 +50,13 @@ stdenv.mkDerivation {
         chmod +x $1
       }
 
+      # Install git-subtree.
+      pushd contrib/subtree
+      make
+      make install install-doc
+      popd
+      rm -rf contrib/subtree
+
       # Install contrib stuff.
       mkdir -p $out/share/git
       mv contrib $out/share/git/

From 65ad55c425ddd3f6dea06f1b6a1c51e076179965 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 1 Aug 2013 16:37:36 +0200
Subject: [PATCH 22/84] git-subtree: Remove

This package is obsolete because it's now part of git (see
https://github.com/apenwarr/git-subtree/blob/master/THIS-REPO-IS-OBSOLETE).
---
 .../git-and-tools/default.nix                 |  4 ---
 .../git-and-tools/git-subtree/default.nix     | 27 -------------------
 2 files changed, 31 deletions(-)
 delete mode 100644 pkgs/applications/version-management/git-and-tools/git-subtree/default.nix

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 69aeba92fd8a..b5b3d4044c52 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -89,9 +89,5 @@ rec {
 
   svn2git_kde = callPackage ./svn2git-kde { };
 
-  gitSubtree = import ./git-subtree {
-    inherit stdenv fetchurl git asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt;
-  };
-
   darcsToGit = callPackage ./darcs-to-git { };
 }
diff --git a/pkgs/applications/version-management/git-and-tools/git-subtree/default.nix b/pkgs/applications/version-management/git-and-tools/git-subtree/default.nix
deleted file mode 100644
index dd00572b150c..000000000000
--- a/pkgs/applications/version-management/git-and-tools/git-subtree/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl, git, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt }:
-
-stdenv.mkDerivation {
-  name = "git-subtree-0.4-2-g2793ee6";
-
-  src = fetchurl {
-    url = "http://github.com/apenwarr/git-subtree/tarball/2793ee6ba6da57d97e9c313741041f7eb2e88974";
-    sha256 = "33fdba315cf8846f45dff7622c1099c386db960c7b43d5d8fbb382fd4d1acff6";
-    name = "git-subtree-0.4-2-g2793ee6.tar.gz";
-  };
-
-  buildInputs = [ git asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt ];
-
-  configurePhase = "export prefix=$out";
-
-  buildPhase = "true";
-
-  installPhase = "make install prefix=$out gitdir=$out/bin";
-
-  meta= {
-    description = "experimental alternative to the git-submodule command";
-    homepage = http://github.com/apenwarr/git-subtree;
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.gnu;
-    maintainers = [ stdenv.lib.maintainers.simons ];
-  };
-}

From 35333935d6a620177bfe8e02aad836b830175be8 Mon Sep 17 00:00:00 2001
From: Evan Danaher <github@edanaher.net>
Date: Thu, 1 Aug 2013 20:12:44 +0200
Subject: [PATCH 23/84] Add simple hsetroot package.

---
 pkgs/tools/X11/hsetroot/default.nix | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/tools/X11/hsetroot/default.nix

diff --git a/pkgs/tools/X11/hsetroot/default.nix b/pkgs/tools/X11/hsetroot/default.nix
new file mode 100644
index 000000000000..96241bd02cdf
--- /dev/null
+++ b/pkgs/tools/X11/hsetroot/default.nix
@@ -0,0 +1,19 @@
+{stdenv, fetchurl, imlib2, libX11, libXext }:
+
+stdenv.mkDerivation {
+  name = "hsetroot-1.0.2";
+
+  # The primary download site seems to no longer exist; use Gentoo's mirror for now.
+  src = fetchurl {
+    url = "http://mirror.datapipe.net/gentoo/distfiles/hsetroot-1.0.2.tar.gz";
+    sha256 = "d6712d330b31122c077bfc712ec4e213abe1fe71ab24b9150ae2774ca3154fd7";
+  };
+
+  buildInputs = [ imlib2 libX11 libXext ];
+
+  meta = {
+    description = "hsetroot allows you to compose wallpapers ('root pixmaps') for X";
+    homepage = http://thegraveyard.org/hsetroot.html;
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bc212974836c..5f71de146538 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9153,6 +9153,8 @@ let
 
   gnome = recurseIntoAttrs gnome2;
 
+  hsetroot = callPackage ../tools/X11/hsetroot { };
+
   kde4 = recurseIntoAttrs pkgs.kde410;
 
   kde48 = kdePackagesFor (pkgs.kde48 // {

From bfbbb12e353bcd367acfc9bfde6b9bb22f55f34d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 2 Aug 2013 09:39:20 +0400
Subject: [PATCH 24/84] Adding CL-Launch. CL-Launch is a wrapper for unified
 launching of various Lisp implementations

---
 .../tools/misc/cl-launch/default.nix          | 34 +++++++++++++++++++
 .../tools/misc/cl-launch/default.upstream     |  2 ++
 pkgs/lib/licenses.nix                         |  6 ++++
 pkgs/top-level/all-packages.nix               |  2 ++
 4 files changed, 44 insertions(+)
 create mode 100644 pkgs/development/tools/misc/cl-launch/default.nix
 create mode 100644 pkgs/development/tools/misc/cl-launch/default.upstream

diff --git a/pkgs/development/tools/misc/cl-launch/default.nix b/pkgs/development/tools/misc/cl-launch/default.nix
new file mode 100644
index 000000000000..63c585b00a95
--- /dev/null
+++ b/pkgs/development/tools/misc/cl-launch/default.nix
@@ -0,0 +1,34 @@
+{stdenv, fetchurl}:
+let
+  s = # Generated upstream information
+  rec {
+    baseName="cl-launch";
+    version="3.21.1";
+    name="${baseName}-${version}";
+    hash="1241lyn2a3ry06ii9zlns0cj462bi7rih41vlbbmra1chj4c21ij";
+    url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-3.21.1.tar.gz";
+    sha256="1241lyn2a3ry06ii9zlns0cj462bi7rih41vlbbmra1chj4c21ij";
+  };
+  buildInputs = [
+  ];
+in
+stdenv.mkDerivation {
+  inherit (s) name version;
+  inherit buildInputs;
+  src = fetchurl {
+    inherit (s) url sha256;
+  };
+
+  preConfigure = ''
+    export makeFlags="$makeFlags PREFIX='$out'"
+    mkdir -p "$out/bin"
+  '';
+
+  meta = {
+    inherit (s) version;
+    description = ''Common Lisp launcher script'';
+    license = stdenv.lib.licenses.llgpl21 ;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/tools/misc/cl-launch/default.upstream b/pkgs/development/tools/misc/cl-launch/default.upstream
new file mode 100644
index 000000000000..1ff5daca02c5
--- /dev/null
+++ b/pkgs/development/tools/misc/cl-launch/default.upstream
@@ -0,0 +1,2 @@
+url http://common-lisp.net/project/xcvb/cl-launch/
+version_link '.-[0-9].*[0-9][.]tar[.].*'
diff --git a/pkgs/lib/licenses.nix b/pkgs/lib/licenses.nix
index 0dcdff0bee45..fcf7420e425d 100644
--- a/pkgs/lib/licenses.nix
+++ b/pkgs/lib/licenses.nix
@@ -148,6 +148,12 @@
     url = http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html;
   };
 
+  llgpl21 = {
+    shortName = "LLGPLv2.1";
+    fullName = "Lisp LGPL; GNU Lesser General Public License version 2.1 with Franz Inc. preamble for clarification of LGPL terms in context of Lisp";
+    url = http://opensource.franz.com/preamble.html;
+  };
+
   lgpl3 = {
     shortName = "LGPLv3";
     fullName = "GNU Lesser General Public License version 3 only";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bc212974836c..808def18abdb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3360,6 +3360,8 @@ let
 
   chromedriver = callPackage ../development/tools/selenium/chromedriver { gconf = gnome.GConf; };
 
+  "cl-launch" = callPackage ../development/tools/misc/cl-launch {};
+
   complexity = callPackage ../development/tools/misc/complexity { };
 
   ctags = callPackage ../development/tools/misc/ctags { };

From 1362d479cbc13517d160a9a5e2a821aab94f23cf Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 2 Aug 2013 07:33:20 +0200
Subject: [PATCH 25/84] nixpart: Update to bugfix version 0.4.1.

Contains the following fix:

  - Fix mounting btrfs when mount_only (-m) is used.

I would like to update blivet as well, but at the moment it breaks for
nixpart, so let's retry later when we're at 0.5.x or even 1.x :-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/tools/filesystems/nixpart/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/nixpart/default.nix b/pkgs/tools/filesystems/nixpart/default.nix
index 36972573b358..2cd40bb08675 100644
--- a/pkgs/tools/filesystems/nixpart/default.nix
+++ b/pkgs/tools/filesystems/nixpart/default.nix
@@ -9,11 +9,11 @@ let
   };
 in buildPythonPackage rec {
   name = "nixpart-${version}";
-  version = "0.4.0";
+  version = "0.4.1";
 
   src = fetchurl {
     url = "https://github.com/aszlig/nixpart/archive/v${version}.tar.gz";
-    sha256 = "1kgiyqh7gndr0zs3qgi6r0dpy5p71d32c2k9kbd8pjf2xyyb6fk6";
+    sha256 = "0avwd8p47xy9cydlbjxk8pj8q75zyl68gw2w6fnkk78dcb1a3swp";
   };
 
   propagatedBuildInputs = [ (blivet.override blivetOverrides) ];

From 9b9fa35ebd30a9b86c6124be31fb1244a4207ead Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 2 Aug 2013 10:49:39 +0200
Subject: [PATCH 26/84] blivet: Update sha256, as it changed upstream.

The sha256 was magically changed upstream with the same contents but
different timestamps, so let's update it. Thanks to @rbvermaa for
noticing.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/python-modules/blivet/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix
index 564b89347b59..403bb264892f 100644
--- a/pkgs/development/python-modules/blivet/default.nix
+++ b/pkgs/development/python-modules/blivet/default.nix
@@ -18,7 +18,7 @@ in buildPythonPackage rec {
   src = fetchurl {
     url = "https://git.fedorahosted.org/cgit/blivet.git/snapshot/"
         + "${name}.tar.bz2";
-    sha256 = "0b28q539657mqif0mn5dfqcpqv7gbyszg83gf2fv6z7q6206rnx5";
+    sha256 = "1k3mws2q0ryb7422mml6idmaasz2i2v6ngyvg6d976dx090qnmci";
   };
 
   postPatch = ''

From a672551d448ff45ad55301e25bd8fe9f56362f3e Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 3 Aug 2013 07:27:12 +0200
Subject: [PATCH 27/84] python-paramiko: Update to version 0.11.0.

This also now uses the md5 istead of the sha256, because pypi actually
directly provides MD5 sums.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/top-level/python-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d6bf93b394ae..fa8e24861c79 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3267,11 +3267,11 @@ pythonPackages = modules // rec {
   };
 
   paramiko = buildPythonPackage rec {
-    name = "paramiko-1.10.1";
+    name = "paramiko-1.11.0";
 
     src = fetchurl {
-      url = https://pypi.python.org/packages/source/p/paramiko/paramiko-1.10.1.tar.gz;
-      sha256 = "1g5sbzfxdhps61z3vm30wa87m5xq1j9ar3qvgr5bz63l7nxhvb2z";
+      url = "http://pypi.python.org/packages/source/p/paramiko/${name}.tar.gz";
+      md5 = "a2c55dc04904bd08d984533703177084";
     };
 
     buildInputs = [ pycrypto ];

From 4489dc729ead712c73fb558d7b9b54f2e62576a3 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 3 Aug 2013 07:28:05 +0200
Subject: [PATCH 28/84] python-paramiko: Propagate pycrypto dependency.

Leaving this just in buildInputs won't help here, because the project
using Paramiko will need pycrypto in any case.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fa8e24861c79..2bc2ed7a6fb6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3274,7 +3274,7 @@ pythonPackages = modules // rec {
       md5 = "a2c55dc04904bd08d984533703177084";
     };
 
-    buildInputs = [ pycrypto ];
+    propagatedBuildInputs = [ pycrypto ];
 
     meta = {
       homepage = "http://www.lag.net/paramiko/";

From bcb9417c0e3966644d1e622c2b9bb40e310cb6aa Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 3 Aug 2013 09:05:37 +0200
Subject: [PATCH 29/84] chromium: Update stable and dev release channels.

This introduces the following new versions:

stable: 28.0.1500.71 -> 28.0.1500.95 (builds fine, tested)
dev:    30.0.1573.2  -> 30.0.1581.2  (builds fine, tested)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../networking/browsers/chromium/sources.nix         | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix
index 31d9ed10b4cd..c2a5518c6ca5 100644
--- a/pkgs/applications/networking/browsers/chromium/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/sources.nix
@@ -1,9 +1,9 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   dev = {
-    version = "30.0.1573.2";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-30.0.1573.2.tar.xz";
-    sha256 = "1pbph4jz0svaawk06zajq73x0xm73f9kdiflhad2709f4y23gzjz";
+    version = "30.0.1581.2";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-30.0.1581.2.tar.xz";
+    sha256 = "16l0gprinxbhdsx67yaq6qwy45018v6vww0hnyji4wdzd5drkf9r";
   };
   beta = {
     version = "29.0.1547.32";
@@ -11,8 +11,8 @@
     sha256 = "14p5s1xn15mdrlf87hv4y9kczw5r8s461a56kkdzb5xzyq25ph8w";
   };
   stable = {
-    version = "28.0.1500.71";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1500.71.tar.xz";
-    sha256 = "1w8hkbb17bwq9myhj7fig27pn50qlwdfrqs04xjvam4ah3w6qb0r";
+    version = "28.0.1500.95";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1500.95.tar.xz";
+    sha256 = "0d6pj57nyx7wfgxws98f6ly749flcyv7zg5sc3w16ggdxf5qhf1w";
   };
 }

From 41126666a62756784617a11e41a0dd2002956692 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 3 Aug 2013 10:39:07 +0200
Subject: [PATCH 30/84] bison: add version 3.0

---
 .../parsing/bison/{default.nix => 2.x.nix}    |  0
 pkgs/development/tools/parsing/bison/3.x.nix  | 40 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +-
 3 files changed, 43 insertions(+), 1 deletion(-)
 rename pkgs/development/tools/parsing/bison/{default.nix => 2.x.nix} (100%)
 create mode 100644 pkgs/development/tools/parsing/bison/3.x.nix

diff --git a/pkgs/development/tools/parsing/bison/default.nix b/pkgs/development/tools/parsing/bison/2.x.nix
similarity index 100%
rename from pkgs/development/tools/parsing/bison/default.nix
rename to pkgs/development/tools/parsing/bison/2.x.nix
diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix
new file mode 100644
index 000000000000..63ceb7d6b6a0
--- /dev/null
+++ b/pkgs/development/tools/parsing/bison/3.x.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, m4, perl }:
+
+stdenv.mkDerivation rec {
+  name = "bison-3.0";
+
+  src = fetchurl {
+    url = "mirror://gnu/bison/${name}.tar.xz";
+    sha256 = "1j14fqgi9wzqgsy4fhkcdrv4hv6rrvhvn84axs520w9b022mbb79";
+  };
+
+  nativeBuildInputs = [ m4 ] ++ stdenv.lib.optional doCheck perl;
+  propagatedBuildInputs = [ m4 ];
+
+  doCheck = true;
+
+  meta = {
+    homepage = "http://www.gnu.org/software/bison/";
+    description = "GNU Bison, a Yacc-compatible parser generator";
+    license = "GPLv3+";
+
+    longDescription = ''
+      Bison is a general-purpose parser generator that converts an
+      annotated context-free grammar into an LALR(1) or GLR parser for
+      that grammar.  Once you are proficient with Bison, you can use
+      it to develop a wide range of language parsers, from those used
+      in simple desk calculators to complex programming languages.
+
+      Bison is upward compatible with Yacc: all properly-written Yacc
+      grammars ought to work with Bison with no change.  Anyone
+      familiar with Yacc should be able to use Bison with little
+      trouble.  You need to be fluent in C or C++ programming in order
+      to use Bison.
+    '';
+
+    maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ];
+    platforms = stdenv.lib.platforms.unix;
+  };
+
+  passthru = { glrSupport = true; };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4758e7e6d2d6..7fc37fc87901 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3319,7 +3319,9 @@ let
     cross = assert crossSystem != null; crossSystem;
   }));
 
-  bison = callPackage ../development/tools/parsing/bison { };
+  bison2 = callPackage ../development/tools/parsing/bison/2.x.nix { };
+  bison3 = callPackage ../development/tools/parsing/bison/3.x.nix { };
+  bison = bison2;
 
   buildbot = callPackage ../development/tools/build-managers/buildbot {
     inherit (pythonPackages) twisted jinja2 sqlalchemy sqlalchemy_migrate;

From 61c880d5582c9bfd91a4ddb9c27973e31aed8c12 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 2 Aug 2013 16:19:49 +0200
Subject: [PATCH 31/84] haskell-idris: update to version 0.9.9

---
 pkgs/development/compilers/idris/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix
index 225f8afcd82d..804c48383178 100644
--- a/pkgs/development/compilers/idris/default.nix
+++ b/pkgs/development/compilers/idris/default.nix
@@ -1,19 +1,20 @@
-{ cabal, binary, Cabal, filepath, gmp, happy, haskeline
-, languageJava, libffi, mtl, parsec, split, text, transformers
+{ cabal, binary, boehmgc, Cabal, filepath, gmp, happy, haskeline
+, languageJava, libffi, llvmGeneral, mtl, parsec, split, text
+, transformers, vector, vectorBinaryInstances
 }:
 
 cabal.mkDerivation (self: {
   pname = "idris";
-  version = "0.9.8";
-  sha256 = "1mxc6mic3d508ni9pqxw8q31f27shyaxs1rchfl2jg58i9w6iy7h";
+  version = "0.9.9";
+  sha256 = "0wwssgpiyn7akyfrpi1khvqxx1k8753kk7151zvvymz0zkks643m";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-    binary Cabal filepath haskeline languageJava libffi mtl parsec
-    split text transformers
+    binary Cabal filepath haskeline languageJava libffi llvmGeneral mtl
+    parsec split text transformers vector vectorBinaryInstances
   ];
   buildTools = [ happy ];
-  extraLibraries = [ gmp ];
+  extraLibraries = [ boehmgc gmp ];
   meta = {
     homepage = "http://www.idris-lang.org/";
     description = "Functional Programming Language with Dependent Types";

From bf1ce4f47b15894f22fbfa40f8be8c08f3dcb57e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 2 Aug 2013 16:19:50 +0200
Subject: [PATCH 32/84] haskell-MonadRandom: update to version 0.1.11

---
 pkgs/development/libraries/haskell/MonadRandom/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/MonadRandom/default.nix b/pkgs/development/libraries/haskell/MonadRandom/default.nix
index 2dead8de40d4..9018bc603cf4 100644
--- a/pkgs/development/libraries/haskell/MonadRandom/default.nix
+++ b/pkgs/development/libraries/haskell/MonadRandom/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "MonadRandom";
-  version = "0.1.10";
-  sha256 = "0acx8vm43pd3wn5gp4rx9h24y08fcdy4bpack1sd0pxx2wmhi5qs";
+  version = "0.1.11";
+  sha256 = "107f3ch84riagxa9x6yk4gxq2vq5dsk63rd0780g1fdplnf1sky3";
   buildDepends = [ mtl random transformers ];
   meta = {
     description = "Random-number generation monad";

From bcd9344f9b3edfff1068d8d0ef47c70fa0a79462 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 2 Aug 2013 16:19:50 +0200
Subject: [PATCH 33/84] haskell-fast-logger: update to version 0.3.3

---
 pkgs/development/libraries/haskell/fast-logger/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/fast-logger/default.nix b/pkgs/development/libraries/haskell/fast-logger/default.nix
index b192c1e0c61e..fb8714f3e854 100644
--- a/pkgs/development/libraries/haskell/fast-logger/default.nix
+++ b/pkgs/development/libraries/haskell/fast-logger/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "fast-logger";
-  version = "0.3.2";
-  sha256 = "0bx8yjg7bf18i7j7fnhidnms5a3v6hiwqqvr249fk03c86v20rla";
+  version = "0.3.3";
+  sha256 = "0ya9dn9j2nddpclj00w6jgmiq2xx500sws056fa2s4bdsl8vn5rh";
   buildDepends = [ blazeBuilder dateCache filepath text unixTime ];
   testDepends = [ hspec ];
   meta = {

From dd0031cbadaa4577372ebc8a7fd35820dcd88ee8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 2 Aug 2013 16:19:50 +0200
Subject: [PATCH 34/84] haskell-feed: update to version 0.3.9.1

---
 pkgs/development/libraries/haskell/feed/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/feed/default.nix b/pkgs/development/libraries/haskell/feed/default.nix
index bafe23aed0c0..a2c1ccde86bc 100644
--- a/pkgs/development/libraries/haskell/feed/default.nix
+++ b/pkgs/development/libraries/haskell/feed/default.nix
@@ -2,10 +2,11 @@
 
 cabal.mkDerivation (self: {
   pname = "feed";
-  version = "0.3.9";
-  sha256 = "0waqy8ssmbfpqy21svvbnm0igrjxbgd2i093hbl5chim6yraapv2";
+  version = "0.3.9.1";
+  sha256 = "1c7dj9w9qj8408qql1kfq8m28fwvfd7bpgkj32lmk5x9qm5iz04k";
   buildDepends = [ utf8String xml ];
   meta = {
+    homepage = "https://github.com/sof/feed";
     description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;

From 5fd7636a2e9d52bd9c6a8262e81f2c50ea93e04f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 2 Aug 2013 16:19:50 +0200
Subject: [PATCH 35/84] haskell-generic-deriving: update to version 1.6.1

---
 .../libraries/haskell/generic-deriving/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/generic-deriving/default.nix b/pkgs/development/libraries/haskell/generic-deriving/default.nix
index 043156ab5e1f..f1a1ec837fd4 100644
--- a/pkgs/development/libraries/haskell/generic-deriving/default.nix
+++ b/pkgs/development/libraries/haskell/generic-deriving/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "generic-deriving";
-  version = "1.5.0";
-  sha256 = "1m3hckwpzmarlvm2xq22za3386ady6p89kg7nd8cnjkifnnbz20r";
+  version = "1.6.1";
+  sha256 = "0c3b3xkjdfp14w48gfk3f6aqz4cgk6i3bl5mci23mbb3f33jcx1j";
   meta = {
     description = "Generic programming library for generalised deriving";
     license = self.stdenv.lib.licenses.bsd3;

From cb8f500a17b735556c6b9c5934c0daf06bac7d51 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 2 Aug 2013 16:19:50 +0200
Subject: [PATCH 36/84] haskell-profunctor-extras: update to version 3.3.3.1

---
 .../libraries/haskell/profunctor-extras/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/profunctor-extras/default.nix b/pkgs/development/libraries/haskell/profunctor-extras/default.nix
index 0094ec5a340d..6844bcc369a6 100644
--- a/pkgs/development/libraries/haskell/profunctor-extras/default.nix
+++ b/pkgs/development/libraries/haskell/profunctor-extras/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "profunctor-extras";
-  version = "3.3.1";
-  sha256 = "0z3lip0mjw0xyf516shdrnkkp9h53wglz6sjjqagpjj2viyqkprb";
+  version = "3.3.3.1";
+  sha256 = "16naa6ksgwy6fh8vwflcc9s0rpamn886as8qhjqrkpjlc8s83h7g";
   buildDepends = [
     comonad profunctors semigroupoidExtras semigroupoids tagged
     transformers

From e6239c406f27819becaf3034ef83fe7b3658a1a0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 2 Aug 2013 16:19:50 +0200
Subject: [PATCH 37/84] haskell-reactive-banana: update to version 0.7.1.3

---
 .../development/libraries/haskell/reactive-banana/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/reactive-banana/default.nix b/pkgs/development/libraries/haskell/reactive-banana/default.nix
index 8d1ee0ffc959..0bf7747d46bf 100644
--- a/pkgs/development/libraries/haskell/reactive-banana/default.nix
+++ b/pkgs/development/libraries/haskell/reactive-banana/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "reactive-banana";
-  version = "0.7.1.2";
-  sha256 = "1x4ln3dr937va0ii7lr86d6wsrh2qd1sxany4y9dkpcrsvb3db0l";
+  version = "0.7.1.3";
+  sha256 = "117y1sk97kpiq0cippq0ydl2zqb99q49y2m2m6pgg2nh6gz6a3zb";
   buildDepends = [ hashable transformers unorderedContainers vault ];
   testDepends = [
     hashable HUnit testFramework testFrameworkHunit transformers

From 30135c6b508889aa6d7887c595cab02673bcf601 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 2 Aug 2013 16:19:50 +0200
Subject: [PATCH 38/84] haskell-stm-conduit: update to version 2.1.1

---
 .../libraries/haskell/stm-conduit/default.nix      | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/stm-conduit/default.nix b/pkgs/development/libraries/haskell/stm-conduit/default.nix
index 79171aefb9f8..24af3f8b7347 100644
--- a/pkgs/development/libraries/haskell/stm-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/stm-conduit/default.nix
@@ -1,13 +1,15 @@
-{ cabal, conduit, HUnit, QuickCheck, resourcet, stm, stmChans
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
-, transformers
+{ cabal, async, conduit, HUnit, monadControl, QuickCheck, resourcet
+, stm, stmChans, testFramework, testFrameworkHunit
+, testFrameworkQuickcheck2, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "stm-conduit";
-  version = "2.1.0";
-  sha256 = "0rxnw7kpxvhwmpbn2v9ps0b2hw9321817nyywjjq3x8fadg8w99l";
-  buildDepends = [ conduit resourcet stm stmChans transformers ];
+  version = "2.1.1";
+  sha256 = "06frli37jz9xag249q1gmvnpnsaic1xa304d8d8bjz08980dbmpr";
+  buildDepends = [
+    async conduit monadControl resourcet stm stmChans transformers
+  ];
   testDepends = [
     conduit HUnit QuickCheck stm stmChans testFramework
     testFrameworkHunit testFrameworkQuickcheck2 transformers

From 02db4b9f7026346f9005cc2d30560acb68cbcd02 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 2 Aug 2013 16:19:50 +0200
Subject: [PATCH 39/84] haskell-unix-process-conduit: update to version 0.2.2

---
 .../libraries/haskell/unix-process-conduit/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/unix-process-conduit/default.nix b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix
index 8dc93c21363b..1f04d939d9c1 100644
--- a/pkgs/development/libraries/haskell/unix-process-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "unix-process-conduit";
-  version = "0.2.1.2";
-  sha256 = "1gg1ynqd8hka5ynpmpsj8qw0lqsyg7l1m1py05iw3bd3cldwflx1";
+  version = "0.2.2";
+  sha256 = "15n6n925avv51kr2avwkp8sq8mfl287i0445vl9iy6hyxjjgpgr6";
   buildDepends = [ conduit filepath stm time transformers ];
   testDepends = [ conduit hspec transformers ];
   meta = {

From 1d0659202548ff335da9c02948371d7042e9b4ea Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 2 Aug 2013 16:19:51 +0200
Subject: [PATCH 40/84] haskell-unix-time: update to version 0.2.0

---
 pkgs/development/libraries/haskell/unix-time/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/unix-time/default.nix b/pkgs/development/libraries/haskell/unix-time/default.nix
index 691787e7f87c..846e3d888837 100644
--- a/pkgs/development/libraries/haskell/unix-time/default.nix
+++ b/pkgs/development/libraries/haskell/unix-time/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "unix-time";
-  version = "0.1.10";
-  sha256 = "0z8i02j295fi0y512bwhxfk2dr2s4i0xlgi80pnq680zdrahgwlf";
+  version = "0.2.0";
+  sha256 = "1gmchi6crbd3lpnw1j0zaaj7y0gib8dbqd8ip2s5p3f50qqlsxj8";
   testDepends = [ doctest hspec QuickCheck time ];
   meta = {
     description = "Unix time parser/formatter and utilities";

From cc691d95f5c94e7402aa14511511603a13952566 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 3 Aug 2013 10:32:39 +0200
Subject: [PATCH 41/84] haskell-lens: jailbreak to fix build with latest
 version of generic-deriving

---
 pkgs/development/libraries/haskell/lens/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix
index 4531603214e0..8bc221f14933 100644
--- a/pkgs/development/libraries/haskell/lens/default.nix
+++ b/pkgs/development/libraries/haskell/lens/default.nix
@@ -26,6 +26,9 @@ cabal.mkDerivation (self: {
     transformers unorderedContainers vector
   ];
   doCheck = false;
+  patchPhase = ''
+    sed -i -e 's|generic-deriving.*,|generic-deriving,|' lens.cabal
+  '';
   meta = {
     homepage = "http://github.com/ekmett/lens/";
     description = "Lenses, Folds and Traversals";

From 0c331a4a421ba0571991e029451e35bf275a8db5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 3 Aug 2013 12:10:39 +0200
Subject: [PATCH 42/84] haskell-idris: revert update to version 0.9.9

This reverts commit 61c880d5582c9bfd91a4ddb9c27973e31aed8c12. The new
Idris version depends on a version of LLVM that we don't have in master
yet: it's only in x-updates.
---
 pkgs/development/compilers/idris/default.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix
index 804c48383178..225f8afcd82d 100644
--- a/pkgs/development/compilers/idris/default.nix
+++ b/pkgs/development/compilers/idris/default.nix
@@ -1,20 +1,19 @@
-{ cabal, binary, boehmgc, Cabal, filepath, gmp, happy, haskeline
-, languageJava, libffi, llvmGeneral, mtl, parsec, split, text
-, transformers, vector, vectorBinaryInstances
+{ cabal, binary, Cabal, filepath, gmp, happy, haskeline
+, languageJava, libffi, mtl, parsec, split, text, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "idris";
-  version = "0.9.9";
-  sha256 = "0wwssgpiyn7akyfrpi1khvqxx1k8753kk7151zvvymz0zkks643m";
+  version = "0.9.8";
+  sha256 = "1mxc6mic3d508ni9pqxw8q31f27shyaxs1rchfl2jg58i9w6iy7h";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-    binary Cabal filepath haskeline languageJava libffi llvmGeneral mtl
-    parsec split text transformers vector vectorBinaryInstances
+    binary Cabal filepath haskeline languageJava libffi mtl parsec
+    split text transformers
   ];
   buildTools = [ happy ];
-  extraLibraries = [ boehmgc gmp ];
+  extraLibraries = [ gmp ];
   meta = {
     homepage = "http://www.idris-lang.org/";
     description = "Functional Programming Language with Dependent Types";

From d5cad473f95d448fc76d73a8f107d42964361dc2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 3 Aug 2013 12:14:03 +0200
Subject: [PATCH 43/84] bison3: mark low-prio until the check phase is fixed

---
 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 7fc37fc87901..effaf77680c3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3320,7 +3320,7 @@ let
   }));
 
   bison2 = callPackage ../development/tools/parsing/bison/2.x.nix { };
-  bison3 = callPackage ../development/tools/parsing/bison/3.x.nix { };
+  bison3 = lowPrio (callPackage ../development/tools/parsing/bison/3.x.nix { });
   bison = bison2;
 
   buildbot = callPackage ../development/tools/build-managers/buildbot {

From cd531d70f6151d1c582ef8f62559c6dd712d1051 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 28 Jul 2013 22:38:32 +0200
Subject: [PATCH 44/84] lightdm updates (merge #574)

Also fixes the situation where some session stuff is written to nix store.
---
 .../lightdm-gtk-greeter/default.nix           | 42 ++++++++++++++-----
 .../display-managers/lightdm/default.nix      | 34 ++++++++-------
 2 files changed, 51 insertions(+), 25 deletions(-)

diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
index 501826b82df2..0b8863752d2a 100644
--- a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
+++ b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
@@ -1,23 +1,43 @@
-{ stdenv, fetchurl, lightdm, pkgconfig, gtk3, intltool }:
+{ stdenv, fetchurl, lightdm, pkgconfig, intltool
+, hicolor_icon_theme, makeWrapper
+, useGTK2 ? false, gtk2, gtk3 # gtk3 seems better supported
+}:
 
-stdenv.mkDerivation {
-  name = "lightdm-gtk-greeter";
+#ToDo: bad icons with gtk2;
+#  avatar icon is missing in standard hicolor theme, I don't know where gtk3 takes it from
+
+#ToDo: Failed to open sessions directory: Error opening directory '${lightdm}/share/lightdm/remote-sessions': No such file or directory
+
+let
+  ver_branch = "1.6";
+  version = "1.5.1"; # 1.5.2 and 1.6.0 result into infinite cycling of X in restarts
+in
+stdenv.mkDerivation rec {
+  name = "lightdm-gtk-greeter-${version}";
 
   src = fetchurl {
-    url = "https://launchpad.net/lightdm-gtk-greeter/1.6/1.5.1/+download/lightdm-gtk-greeter-1.5.1.tar.gz";
-    sha256 = "ecce7e917a79fa8f2126c3fafb6337f81f2198892159a4ef695016afecd2d621";
+    url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.gz";
+    sha256 = "08fnsbnay5jhd7ps8n91i6c227zq6xizpyn34qhqzykrga8pxkpc";
   };
 
-  buildInputs = [ pkgconfig gtk3 lightdm intltool ];
-
-  patches =
-    [ ./lightdm-gtk-greeter.patch
-    ];
-
+  patches = [ ./lightdm-gtk-greeter.patch ];
   patchFlags = "-p0";
 
+  buildInputs = [ pkgconfig lightdm intltool ]
+    ++ (if useGTK2 then [ gtk2 makeWrapper ] else [ gtk3 ]);
+
+  configureFlags = stdenv.lib.optional useGTK2 "--with-gtk2";
+
   postInstall = ''
       substituteInPlace "$out/share/xgreeters/lightdm-gtk-greeter.desktop" \
         --replace "Exec=lightdm-gtk-greeter" "Exec=$out/sbin/lightdm-gtk-greeter"
+    '' + stdenv.lib.optionalString useGTK2 ''
+      wrapProgram "$out/sbin/lightdm-gtk-greeter" \
+        --prefix XDG_DATA_DIRS ":" "${hicolor_icon_theme}/share"
     '';
+
+  meta = {
+    homepage = http://launchpad.net/lightdm-gtk-greeter;
+    platforms = stdenv.lib.platforms.linux;
+  };
 }
diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix
index ce1f4400b271..598c42199bec 100644
--- a/pkgs/applications/display-managers/lightdm/default.nix
+++ b/pkgs/applications/display-managers/lightdm/default.nix
@@ -1,25 +1,31 @@
-{ stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2, intltool, x11, libxklavier, libgcrypt, makeWrapper }:
+{ stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2
+, intltool, x11, libxklavier, libgcrypt, dbus/*for tests*/ }:
 
-stdenv.mkDerivation {
-  name = "lightdm-1.5.1";
+let
+  ver_branch = "1.8";
+  version = "1.7.0";
+in
+stdenv.mkDerivation rec {
+  name = "lightdm-${version}";
 
   src = fetchurl {
-    url = https://launchpad.net/lightdm/1.6/1.5.1/+download/lightdm-1.5.1.tar.xz;
-    sha256 = "645db2d763cc514d6aecb1838f4a9c33c3dcf0c94567a7ef36c6b23d8aa56c86";
+    url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz";
+    sha256 = "0nwwjgc9xvwili6714ag88wsrf0lr5hv1i6z9f0xvin4ym18cbs5";
   };
 
-  buildInputs = [ pkgconfig pam libxcb glib libXdmcp itstool libxml2 intltool libxklavier libgcrypt makeWrapper ];
-
-  configureFlags = [ "--enable-liblightdm-gobject" ];
-
-  patches =
-    [ ./lightdm.patch
-    ];
-
+  patches = [ ./lightdm.patch ];
   patchFlags = "-p0";
 
+  buildInputs = [
+    pkgconfig pam libxcb glib libXdmcp itstool libxml2 intltool libxklavier libgcrypt
+  ] ++ stdenv.lib.optional doCheck dbus.daemon;
+
+  configureFlags = [ "--enable-liblightdm-gobject" "--localstatedir=/var" ];
+
+  doCheck = false; # some tests fail, don't know why
+
   meta = {
     homepage = http://launchpad.net/lightdm;
     platforms = stdenv.lib.platforms.linux;
   };
-}
\ No newline at end of file
+}

From 018b39d28bd550f0a6ca15b507a27448d76d0d2c Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Mon, 5 Aug 2013 01:00:34 +0200
Subject: [PATCH 45/84] iodined: Fix iptables and route path to bin instead of
 sbin

---
 pkgs/tools/networking/iodine/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/iodine/default.nix b/pkgs/tools/networking/iodine/default.nix
index 33cc53d55110..f6be163bb839 100644
--- a/pkgs/tools/networking/iodine/default.nix
+++ b/pkgs/tools/networking/iodine/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ zlib ];
 
-  patchPhase = ''sed -i "s,/sbin/ifconfig,${nettools}/sbin/ifconfig,; s,/sbin/route,${nettools}/sbin/route," src/tun.c'';
+  patchPhase = ''sed -i "s,/sbin/ifconfig,${nettools}/bin/ifconfig,; s,/sbin/route,${nettools}/bin/route," src/tun.c'';
 
   installFlags = "prefix=\${out}";
 

From 60a6e6802f591cfb0c1b1c4868ef5c0956ca3edb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 5 Aug 2013 10:19:57 +0200
Subject: [PATCH 46/84] haskell-git-annex: update to version 4.20130802

---
 .../git-and-tools/git-annex/default.nix                | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
index e53f60c9be0f..f7b0129da90f 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
@@ -1,7 +1,7 @@
 { cabal, aeson, async, blazeBuilder, bloomfilter, bup
 , caseInsensitive, clientsession, cryptoApi, curl, dataDefault
 , dataenc, DAV, dbus, dlist, dns, editDistance
-, extensibleExceptions, filepath, git, gnupg1, gnutls, hamlet
+, extensibleExceptions, feed, filepath, git, gnupg1, gnutls, hamlet
 , hinotify, hS3, hslogger, HTTP, httpConduit, httpTypes, HUnit
 , IfElse, json, lsof, MissingH, MonadCatchIOTransformers
 , monadControl, mtl, network, networkInfo, networkMulticast
@@ -14,15 +14,15 @@
 
 cabal.mkDerivation (self: {
   pname = "git-annex";
-  version = "4.20130723";
-  sha256 = "1fc8kz4n2g4x9fzvdx4bz4d8gkbajdnqphldcglwl23g97vyrn6i";
+  version = "4.20130802";
+  sha256 = "12dvmz88sbcvhyf7aldhpkrf4aqs0x39hky0hikmfd9zcqs6vbih";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
     aeson async blazeBuilder bloomfilter caseInsensitive clientsession
     cryptoApi dataDefault dataenc DAV dbus dlist dns editDistance
-    extensibleExceptions filepath gnutls hamlet hinotify hS3 hslogger
-    HTTP httpConduit httpTypes HUnit IfElse json MissingH
+    extensibleExceptions feed filepath gnutls hamlet hinotify hS3
+    hslogger HTTP httpConduit httpTypes HUnit IfElse json MissingH
     MonadCatchIOTransformers monadControl mtl network networkInfo
     networkMulticast networkProtocolXmpp QuickCheck random regexTdfa
     SafeSemaphore SHA stm text time transformers unixCompat utf8String

From d65b81b36bec9fb066c63ad5e0529864a2d9ccee Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 5 Aug 2013 10:19:57 +0200
Subject: [PATCH 47/84] haskell-MissingH: update to version 1.2.0.1

Don't run the check phase to avoid depending on the obsolete testpack package.
---
 .../libraries/haskell/MissingH/default.nix        | 15 +++++++++------
 pkgs/top-level/haskell-packages.nix               |  4 +++-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/haskell/MissingH/default.nix b/pkgs/development/libraries/haskell/MissingH/default.nix
index 659a1158d0f3..b87c47f04bed 100644
--- a/pkgs/development/libraries/haskell/MissingH/default.nix
+++ b/pkgs/development/libraries/haskell/MissingH/default.nix
@@ -1,16 +1,19 @@
-{ cabal, filepath, hslogger, HUnit, mtl, network, parsec, random
-, regexCompat, time
+{ cabal, filepath, hslogger, HUnit, mtl, network, parsec
+, QuickCheck, random, regexCompat, testpack, time
 }:
 
 cabal.mkDerivation (self: {
   pname = "MissingH";
-  version = "1.2.0.0";
-  sha256 = "0bqg1j2pvm0ixrbnsxrr5kgibhbp191irhcavqlwfwgaxhrpqnm1";
-  isLibrary = true;
-  isExecutable = true;
+  version = "1.2.0.1";
+  sha256 = "0hxyf82g2rz36ks6n136p6brgs0r9cnxfkh4xgl6iw11wbq2rb5m";
   buildDepends = [
     filepath hslogger HUnit mtl network parsec random regexCompat time
   ];
+  testDepends = [
+    filepath hslogger HUnit mtl network parsec QuickCheck random
+    regexCompat testpack time
+  ];
+  doCheck = false;
   meta = {
     homepage = "http://software.complete.org/missingh";
     description = "Large utility library";
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index adc86c6d00c8..569973820549 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1390,7 +1390,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   misfortune = callPackage ../development/libraries/haskell/misfortune {};
 
-  MissingH = callPackage ../development/libraries/haskell/MissingH {};
+  MissingH = callPackage ../development/libraries/haskell/MissingH {
+    testpack = null;
+  };
 
   mmap = callPackage ../development/libraries/haskell/mmap {};
 

From 0979e4a832557c360b50fe47199fa9ffaae25d4e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 5 Aug 2013 10:19:57 +0200
Subject: [PATCH 48/84] haskell-numeric-prelude: update to version 0.4.0.3

---
 .../libraries/haskell/numeric-prelude/default.nix           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/numeric-prelude/default.nix b/pkgs/development/libraries/haskell/numeric-prelude/default.nix
index f6f4d420e2ab..9fb5d334a4d5 100644
--- a/pkgs/development/libraries/haskell/numeric-prelude/default.nix
+++ b/pkgs/development/libraries/haskell/numeric-prelude/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "numeric-prelude";
-  version = "0.4.0.1";
-  sha256 = "1j361gj7cw31x31vnjhxmy7a62ldvyyqfm7irhff7sf5gv4kr5wh";
+  version = "0.4.0.3";
+  sha256 = "0lgjnkvbz14cqsm5fjafl8g5mkclcdvpwa3kpz9radmg2x09rsnl";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -15,7 +15,7 @@ cabal.mkDerivation (self: {
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/Numeric_Prelude";
     description = "An experimental alternative hierarchy of numeric type classes";
-    license = "GPL";
+    license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
   };

From 0b93f032305f3579cc46fe2139a75621710995e0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 5 Aug 2013 10:19:57 +0200
Subject: [PATCH 49/84] haskell-shakespeare: update to version 1.0.5.1

---
 pkgs/development/libraries/haskell/shakespeare/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix
index 16ad7ffa44a6..4864adfe83a8 100644
--- a/pkgs/development/libraries/haskell/shakespeare/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare";
-  version = "1.0.5";
-  sha256 = "1dc1yg35pxh45fv20fvnlpas0svqi18h6bdalpjaqjb164s114vf";
+  version = "1.0.5.1";
+  sha256 = "1qsg23jqv6lzwqk42yapqydx3fn6crkrzim8wr7ds55z6iblxbq6";
   buildDepends = [ parsec systemFileio systemFilepath text time ];
   testDepends = [
     hspec parsec systemFileio systemFilepath text time

From d766bb6f32c1b2eac4ebc5b8b8ea81ddd952abe8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 5 Aug 2013 10:19:57 +0200
Subject: [PATCH 50/84] haskell-stylish-haskell: update to version 0.5.7.0

---
 .../development/libraries/haskell/stylish-haskell/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/stylish-haskell/default.nix b/pkgs/development/libraries/haskell/stylish-haskell/default.nix
index 1d2cea756ffb..5c1059e634c8 100644
--- a/pkgs/development/libraries/haskell/stylish-haskell/default.nix
+++ b/pkgs/development/libraries/haskell/stylish-haskell/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "stylish-haskell";
-  version = "0.5.6.1";
-  sha256 = "0fxncnl9bvb7qjha3r06qli9qlzfljism6k688hrr9y6l06jdc2c";
+  version = "0.5.7.0";
+  sha256 = "12ka5lyp28fy8gablhymxdldl792ycr8d51lsknhldb54pmklf73";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From a82fcea437387b0bbf6446c94a9d1e9651b530d9 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <sander@conference-compass.com>
Date: Mon, 5 Aug 2013 12:47:57 +0200
Subject: [PATCH 51/84] Make iPhone simulator SDKs configurable

---
 pkgs/development/mobile/xcodeenv/simulate-app.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/mobile/xcodeenv/simulate-app.nix b/pkgs/development/mobile/xcodeenv/simulate-app.nix
index 96f70ea38325..03ed90c40d5b 100644
--- a/pkgs/development/mobile/xcodeenv/simulate-app.nix
+++ b/pkgs/development/mobile/xcodeenv/simulate-app.nix
@@ -1,5 +1,9 @@
 {stdenv, xcodewrapper}:
-{name, appName ? null, app, device ? "iPhone", baseDir ? ""}:
+{ name, appName ? null, app
+, device ? "iPhone", baseDir ? ""
+, sdkRoot ? "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs"
+, sdkVersion ? "6.1"
+}:
 
 let
   _appName = if appName == null then name else appName;
@@ -12,7 +16,7 @@ stdenv.mkDerivation {
     #! ${stdenv.shell} -e
 
     cd "${app}/${baseDir}/${_appName}.app"
-    "$(readlink "${xcodewrapper}/bin/iPhone Simulator")" -SimulateApplication './${_appName}' -SimulateDevice '${device}'
+    "$(readlink "${xcodewrapper}/bin/iPhone Simulator")" -SimulateApplication './${_appName}' -SimulateDevice '${device}' -currentSDKRoot '${sdkRoot}/iPhoneSimulator${sdkVersion}.sdk'
     EOF
     chmod +x $out/bin/run-test-simulator
   '';

From 2a294a582b49816d1a7e3bc385226f37beb36a29 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 5 Aug 2013 11:50:14 +0200
Subject: [PATCH 52/84] Statistics::Descriptive: Update to 3.0605

---
 pkgs/top-level/perl-packages.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c20f4efd9fc9..3bc5865b922e 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6040,11 +6040,16 @@ rec {
     };
   };
 
-  StatisticsDescriptive = buildPerlPackage rec {
-    name = "Statistics-Descriptive-3.0202";
+  StatisticsDescriptive = buildPerlPackage {
+    name = "Statistics-Descriptive-3.0605";
     src = fetchurl {
-      url = "mirror://cpan/modules/by-module/Statistics/${name}.tar.gz";
-      sha256 = "0y8l3dkhfc2gqwfigrg363ac7pxcyshdna66afpdvs8r1gd53a1i";
+      url = mirror://cpan/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0605.tar.gz;
+      sha256 = "8e7dae184444e27ee959e33b3ae161cc83115d11da189ed5003b004450e04b48";
+    };
+    meta = {
+      homepage = http://web-cpan.berlios.de/modules/Statistics-Descriptive/;
+      description = "Module of basic descriptive statistical functions";
+      license = "perl";
     };
   };
 

From 7019b685de75b7cec5454d7901744cd92328d271 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Mon, 5 Aug 2013 19:08:58 +0200
Subject: [PATCH 53/84] Make the emulator flags configurable at runtime and
 unimportant messages should go the stderr

---
 .../mobile/androidenv/emulate-app.nix         | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix
index eb39d854d1fb..ae8b7f8d1efb 100644
--- a/pkgs/development/mobile/androidenv/emulate-app.nix
+++ b/pkgs/development/mobile/androidenv/emulate-app.nix
@@ -1,5 +1,7 @@
 {stdenv, androidsdk}:
-{name, app, platformVersion ? "8", abiVersion ? "armeabi-v7a", useGoogleAPIs ? false, enableGPU ? false, package, activity}:
+{name, app ? null, platformVersion ? "8", abiVersion ? "armeabi-v7a", useGoogleAPIs ? false, enableGPU ? false, package ? null, activity ? null}:
+
+assert app != null -> package != null && activity != null;
 
 let
   androidsdkComposition = androidsdk {
@@ -28,7 +30,7 @@ stdenv.mkDerivation {
     
     # We have to look for a free TCP port
     
-    echo "Looking for a free TCP port in range 5554-5584"
+    echo "Looking for a free TCP port in range 5554-5584" >&2
     
     for i in $(seq 5554 2 5584)
     do
@@ -41,10 +43,10 @@ stdenv.mkDerivation {
     
     if [ -z "$port" ]
     then
-        echo "Unfortunately, the emulator port space is exhausted!"
+        echo "Unfortunately, the emulator port space is exhausted!" >&2
         exit 1
     else
-        echo "We have a free TCP port: $port"
+        echo "We have a free TCP port: $port" >&2
     fi
     
     export ANDROID_SERIAL="emulator-$port"
@@ -58,39 +60,40 @@ stdenv.mkDerivation {
     ''}
     
     # Launch the emulator
-    ${androidsdkComposition}/libexec/android-sdk-*/tools/emulator -avd device -no-boot-anim -port $port &
+    ${androidsdkComposition}/libexec/android-sdk-*/tools/emulator -avd device -no-boot-anim -port $port $NIX_ANDROID_EMULATOR_FLAGS &
 
     # Wait until the device has completely booted
     
-    echo "Waiting until the emulator has booted the device and the package manager is ready..."
+    echo "Waiting until the emulator has booted the device and the package manager is ready..." >&2
     
     ${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port wait-for-device
     
-    echo "Device state has been reached"
+    echo "Device state has been reached" >&2
     
     while [ -z "$(${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port shell getprop dev.bootcomplete | grep 1)" ]
     do
         sleep 5
     done
     
-    echo "dev.bootcomplete property is 1"
+    echo "dev.bootcomplete property is 1" >&2
     
     #while [ -z "$(${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port shell getprop sys.boot_completed | grep 1)" ]
     #do
         #sleep 5
     #done
     
-    #echo "sys.boot_completed property is 1"
+    #echo "sys.boot_completed property is 1" >&2
     
-    echo "ready"
+    echo "ready" >&2
     
-    # Install the App through the debugger
-    ${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port install ${app}/*.apk
+    ${stdenv.lib.optionalString (app != null) ''
+      # Install the App through the debugger
+      ${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port install ${app}/*.apk
     
-    # Start the application
-    ${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port shell am start -a android.intent.action.MAIN -n ${package}/.${activity}
+      # Start the application
+      ${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port shell am start -a android.intent.action.MAIN -n ${package}/.${activity}
+    ''}
     EOF
-    
     chmod +x $out/bin/run-test-emulator
   '';
 }

From f5f5f69ef0de289b817e552311bad988c209c0f9 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Mon, 5 Aug 2013 22:18:56 +0200
Subject: [PATCH 54/84] The emulator needs file in its PATH and alsaLib

---
 pkgs/development/mobile/androidenv/androidsdk.nix | 10 ++++++----
 pkgs/development/mobile/androidenv/default.nix    |  3 ++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix
index 1573de63e096..11e6b0c45a2a 100644
--- a/pkgs/development/mobile/androidenv/androidsdk.nix
+++ b/pkgs/development/mobile/androidenv/androidsdk.nix
@@ -1,9 +1,9 @@
 { stdenv, stdenv_32bit, fetchurl, unzip, makeWrapper
 , platformTools, buildTools, support, platforms, sysimages, addons
 , zlib_32bit
-, libX11_32bit, libxcb_32bit, libXau_32bit, libXdmcp_32bit, libXext_32bit, mesa_32bit
-, libX11, libXext, libXrender, libxcb, libXau, libXdmcp, mesa
-, freetype, fontconfig, gtk, atk
+, libX11_32bit, libxcb_32bit, libXau_32bit, libXdmcp_32bit, libXext_32bit, mesa_32bit, alsaLib_32bit
+, libX11, libXext, libXrender, libxcb, libXau, libXdmcp, mesa, alsaLib
+, freetype, fontconfig, gtk, atk, file
 }:
 {platformVersions, abiVersions, useGoogleAPIs}:
 
@@ -61,6 +61,7 @@ stdenv.mkDerivation {
       for i in emulator emulator-arm emulator-mips emulator-x86
       do
           wrapProgram `pwd`/$i \
+            --prefix PATH : ${file}/bin \
             --suffix LD_LIBRARY_PATH : `pwd`/lib:${libX11_32bit}/lib:${libxcb_32bit}/lib:${libXau_32bit}/lib:${libXdmcp_32bit}/lib:${libXext_32bit}/lib:${mesa_32bit}/lib
       done
       
@@ -68,7 +69,8 @@ stdenv.mkDerivation {
         for i in emulator64-arm emulator64-mips emulator64-x86
         do
             wrapProgram `pwd`/$i \
-            --suffix LD_LIBRARY_PATH : `pwd`/lib:${libX11}/lib:${libxcb}/lib:${libXau}/lib:${libXdmcp}/lib:${libXext}/lib:${mesa}/lib
+              --prefix PATH : ${file}/bin \
+              --suffix LD_LIBRARY_PATH : `pwd`/lib:${libX11}/lib:${libxcb}/lib:${libXau}/lib:${libXdmcp}/lib:${libXext}/lib:${mesa}/lib:${alsaLib}/lib
         done
       ''}
     ''}
diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix
index 6e410d4c5db9..9fec70da9403 100644
--- a/pkgs/development/mobile/androidenv/default.nix
+++ b/pkgs/development/mobile/androidenv/default.nix
@@ -36,7 +36,7 @@ rec {
 
   androidsdk = import ./androidsdk.nix {
     inherit (pkgs) stdenv fetchurl unzip makeWrapper;
-    inherit (pkgs) freetype fontconfig gtk atk mesa;
+    inherit (pkgs) freetype fontconfig gtk atk mesa file alsaLib;
     inherit (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp;
     
     inherit platformTools buildTools support platforms sysimages addons;
@@ -49,6 +49,7 @@ rec {
     libXdmcp_32bit = pkgs_i686.xorg.libXdmcp;
     libXext_32bit = pkgs_i686.xorg.libXext;
     mesa_32bit = pkgs_i686.mesa;
+    alsaLib_32bit = pkgs_i686.alsaLib;
   };
   
   androidsdk_4_1 = androidsdk {

From 0237aa136fdc5d7805f0f87dced992dec5578f26 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 6 Aug 2013 00:44:10 +0200
Subject: [PATCH 55/84] R: ensure that run-time dependencies can be found

---
 pkgs/applications/science/math/R/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index fd391b988c9a..4c8204b37ee3 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -36,9 +36,15 @@ stdenv.mkDerivation rec {
       --with-system-pcre
       --with-system-xz
       --with-ICU
-      R_SHELL="${stdenv.shell}"
+      AR=$(type -p ar)
+      AWK=$(type -p gawk)
+      CC=$(type -p gcc)
+      CXX=$(type -p g++)
+      FC="${gfortran}/bin/gfortran" F77="${gfortran}/bin/gfortran"
       JAVA_HOME="${jdk}"
       LDFLAGS="-L${gfortran.gcc}/lib"
+      RANLIB=$(type -p ranlib)
+      R_SHELL="${stdenv.shell}"
     )
     echo "TCLLIBPATH=${tk}/lib" >>etc/Renviron.in
   '';

From f3aedccfd4c6dfcf8d01efe310f7f7a5416dc8c9 Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Wed, 31 Jul 2013 14:11:31 +1000
Subject: [PATCH 56/84] grc: add expression

---
 pkgs/tools/misc/grc/default.nix | 32 ++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/tools/misc/grc/default.nix

diff --git a/pkgs/tools/misc/grc/default.nix b/pkgs/tools/misc/grc/default.nix
new file mode 100644
index 000000000000..ea54ab4a543d
--- /dev/null
+++ b/pkgs/tools/misc/grc/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, python }:
+
+stdenv.mkDerivation rec {
+  version = "1.4";
+  name    = "grc_${version}";
+
+  src = fetchurl {
+    url    = "http://korpus.juls.savba.sk/~garabik/software/grc/${name}.tar.gz";
+    sha256 = "1l7lskxfjk32kkv4aaqw5qcxvh972nab3x2jzy67m1aa0zpcbzdv";
+  };
+
+  installPhase = ''
+    sed -i s%/usr%% install.sh
+    sed -i "s% /usr/bin/python%${python}/bin/python%" grc
+    sed -i "s% /usr/bin/python%${python}/bin/python%" grc
+    ./install.sh "$out"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Yet another colouriser for beautifying your logfiles or output of commands.";
+    homepage    = http://korpus.juls.savba.sk/~garabik/software/grc.html;
+    license     = licenses.gpl2;
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.unix;
+
+    longDescription = ''
+      Generic Colouriser is yet another colouriser (written in Python) for
+      beautifying your logfiles or output of commands.
+    '';
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c10e737ba97f..310a9b9dd6c2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -446,6 +446,8 @@ let
 
   apg = callPackage ../tools/security/apg { };
 
+  grc = callPackage ../tools/misc/grc { };
+
   otool = callPackage ../os-specific/darwin/otool { };
 
   setfile = callPackage ../os-specific/darwin/setfile { };

From d4ba4769b6f6db42c01c5eb31b0f6ab27d13648e Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Sat, 3 Aug 2013 19:25:13 +1000
Subject: [PATCH 57/84] password-store: add expression

---
 pkgs/tools/security/pass/default.nix | 48 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/tools/security/pass/default.nix

diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix
new file mode 100644
index 000000000000..ba86b0b1d9ce
--- /dev/null
+++ b/pkgs/tools/security/pass/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchurl, getopt }:
+
+stdenv.mkDerivation rec {
+  version = "1.4.2";
+  name    = "password-store-${version}";
+
+  src = fetchurl {
+    url    = "http://git.zx2c4.com/password-store/snapshot/${name}.tar.xz";
+    sha256 = "00m3q6dihrhw8cxsrham3bdqg5841an8ch4s3a4k5fynlcb802m1";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Stores, retrieves, generates, and synchronizes passwords securely.";
+    homepage    = http://zx2c4.com/projects/password-store/;
+    license     = licenses.gpl2Plus;
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.unix;
+
+    longDescription = ''
+      pass is a very simple password store that keeps passwords inside gpg2
+      encrypted files inside a simple directory tree residing at
+      ~/.password-store. The pass utility provides a series of commands for
+      manipulating the password store, allowing the user to add, remove, edit,
+      synchronize, generate, and manipulate passwords.
+    '';
+  };
+
+  propagatedBuildInputs = [ getopt ];
+
+  installPhase = ''
+    # link zsh and fish completions
+    sed -ie '22s/^#//' Makefile
+    sed -ie '25s/^#//' Makefile
+    sed -i 's/find /find -L /' contrib/pass.zsh-completion
+    mkdir -p "$out/share/zsh/site-functions"
+    mkdir -p "$out/share/fish/completions"
+
+    # use gnused
+    sed -i 's/sed -i ""/sed -i /' Makefile
+
+    SYSCONFDIR="$out/etc" PREFIX="$out" make install
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    # use nix-supplied getopt
+    sed -ie '34c GETOPT="${getopt}/bin/getopt"' \
+      "$out/lib/password-store.platform.sh"
+  '';
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7fc37fc87901..5a84d3d5fbd3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -450,6 +450,8 @@ let
 
   otool = callPackage ../os-specific/darwin/otool { };
 
+  pass = callPackage ../tools/security/pass { };
+
   setfile = callPackage ../os-specific/darwin/setfile { };
 
   install_name_tool = callPackage ../os-specific/darwin/install_name_tool { };

From db6155fa541d001b3d9c848bae8ac2c8a46a7d90 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Tue, 6 Aug 2013 03:56:21 +0300
Subject: [PATCH 58/84] xrestop: package 0.4

---
 pkgs/tools/X11/xrestop/default.nix | 13 +++++++++++++
 pkgs/top-level/all-packages.nix    |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/tools/X11/xrestop/default.nix

diff --git a/pkgs/tools/X11/xrestop/default.nix b/pkgs/tools/X11/xrestop/default.nix
new file mode 100644
index 000000000000..5158963258c2
--- /dev/null
+++ b/pkgs/tools/X11/xrestop/default.nix
@@ -0,0 +1,13 @@
+{ stdenv, fetchurl, xlibs, pkgconfig, ncurses }:
+stdenv.mkDerivation rec {
+
+  name = "xrestop-${version}";
+  version = "0.4";
+
+  src = fetchurl {
+    url = mirror://gentoo/distfiles/xrestop-0.4.tar.gz;
+    sha256 = "0mz27jpij8am1s32i63mdm58znfijcpfhdqq1npbmvgclyagrhk7";
+  };
+
+  buildInputs = [ pkgconfig xlibs.libX11 xlibs.libXres xlibs.libXext ncurses ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index effaf77680c3..4eea44cfdf0e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8794,6 +8794,8 @@ let
 
   xpra = callPackage ../tools/X11/xpra { };
 
+  xrestop = callPackage ../tools/X11/xrestop { };
+
   xscreensaver = callPackage ../misc/screensavers/xscreensaver {
     inherit (gnome) libglade;
   };

From 02c67c3b017480f4207d44377733b47c36b16127 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Tue, 6 Aug 2013 04:13:33 +0300
Subject: [PATCH 59/84] Amarok: update to 2.7.1

---
 pkgs/applications/audio/amarok/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix
index 8a330800b9e1..6e20acab5239 100644
--- a/pkgs/applications/audio/amarok/default.nix
+++ b/pkgs/applications/audio/amarok/default.nix
@@ -7,11 +7,11 @@ stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   pname = "amarok";
-  version = "2.6.0";
+  version = "2.7.1";
 
   src = fetchurl {
     url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2";
-    sha256 = "1h6jzl0jnn8g05pz4mw01kz20wjjxwwz6iki7lvgj70qi3jq04m9";
+    sha256 = "12dvqnx6jniykbi6sz94xxlnxzafjsaxlf0mppk9w5wn61jwc3cy";
   };
 
   QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins";

From ed70cc9830fa4edbdbd223517896a2132e8c88dc Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 6 Aug 2013 10:41:13 +0200
Subject: [PATCH 60/84] We must also take Android's ABI version into account

---
 pkgs/development/mobile/titaniumenv/build-app.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix
index 24bb1d2d93a0..4dbf6c5e82ef 100644
--- a/pkgs/development/mobile/titaniumenv/build-app.nix
+++ b/pkgs/development/mobile/titaniumenv/build-app.nix
@@ -1,5 +1,5 @@
 {stdenv, androidsdk, titaniumsdk, xcodewrapper}:
-{ appId, name, appName ? null, src, target, androidPlatformVersions ? [ "8" ]
+{ appId, name, appName ? null, src, target, androidPlatformVersions ? [ "8" ], androidAbiVersions ? [ "armeabi" "armeabi-v7a" ]
 , release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null
 , iosKeyFile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosDistribute ? false
 }:
@@ -10,6 +10,7 @@ assert (release && target == "iphone") -> iosKeyFile != null && iosCertificateNa
 let
   androidsdkComposition = androidsdk {
     platformVersions = androidPlatformVersions;
+    abiVersions = androidAbiVersions;
     useGoogleAPIs = true;
   };
   

From dbcb178ef2619661d6f99cc6532cb353d6ec99c0 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 6 Aug 2013 11:16:51 +0200
Subject: [PATCH 61/84] Added extraAVDFiles parameter to support custom system
 images

---
 pkgs/development/mobile/androidenv/emulate-app.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix
index ae8b7f8d1efb..0ae934b572ac 100644
--- a/pkgs/development/mobile/androidenv/emulate-app.nix
+++ b/pkgs/development/mobile/androidenv/emulate-app.nix
@@ -1,5 +1,8 @@
 {stdenv, androidsdk}:
-{name, app ? null, platformVersion ? "8", abiVersion ? "armeabi-v7a", useGoogleAPIs ? false, enableGPU ? false, package ? null, activity ? null}:
+{ name, app ? null
+, platformVersion ? "8", abiVersion ? "armeabi-v7a", useGoogleAPIs ? false
+, enableGPU ? false, extraAVDFiles ? []
+, package ? null, activity ? null}:
 
 assert app != null -> package != null && activity != null;
 
@@ -54,11 +57,15 @@ stdenv.mkDerivation {
     # Create a virtual android device
     yes "" | ${androidsdkComposition}/libexec/android-sdk-*/tools/android create avd -n device -t ${if useGoogleAPIs then "'Google Inc.:Google APIs:"+platformVersion+"'" else "android-"+platformVersion}
     
-    # Enable GPU acceleration
     ${stdenv.lib.optionalString enableGPU ''
+      # Enable GPU acceleration
       echo "hw.gpu.enabled=yes" >> $ANDROID_SDK_HOME/.android/avd/device.avd/config.ini
     ''}
     
+    ${stdenv.lib.concatMapStrings (extraAVDFile: ''
+      ln -sf ${extraAVDFile} $ANDROID_SDK_HOME/.android/avd/device.avd
+    '') extraAVDFiles}
+    
     # Launch the emulator
     ${androidsdkComposition}/libexec/android-sdk-*/tools/emulator -avd device -no-boot-anim -port $port $NIX_ANDROID_EMULATOR_FLAGS &
 

From 3e8812d23b26a29aee7cd3db1c2f9ad4c168b040 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 6 Aug 2013 12:32:10 +0200
Subject: [PATCH 62/84] Add Unix::Getrusage

---
 pkgs/top-level/perl-packages.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 3bc5865b922e..d74d734d2c6b 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7400,6 +7400,14 @@ rec {
     buildInputs = [ pkgs.icu ];
   };
 
+  UnixGetrusage = buildPerlPackage {
+    name = "Unix-Getrusage-0.03";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/T/TA/TAFFY/Unix-Getrusage-0.03.tar.gz;
+      sha256 = "76cde1cee2453260b85abbddc27cdc9875f01d2457e176e03dcabf05fb444d12";
+    };
+  };
+
   URI = buildPerlPackage {
     name = "URI-1.60";
     src = fetchurl {

From 3a4ef263970c4032805d6963faa0c87755b00c75 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 6 Aug 2013 12:39:50 +0200
Subject: [PATCH 63/84] Remove Linux 3.8 (EOL)

---
 pkgs/os-specific/linux/kernel/linux-3.8.nix | 16 ----------------
 pkgs/top-level/all-packages.nix             | 13 -------------
 2 files changed, 29 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel/linux-3.8.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-3.8.nix b/pkgs/os-specific/linux/kernel/linux-3.8.nix
deleted file mode 100644
index f455f4ee7f88..000000000000
--- a/pkgs/os-specific/linux/kernel/linux-3.8.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ stdenv, fetchurl, ... } @ args:
-
-import ./generic.nix (args // rec {
-  version = "3.8.13";
-
-  src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0pznsj89020fjl8dhcyf7r5bh95b27727gs0ri9has4i2z63blbw";
-  };
-
-  features.iwlwifi = true;
-  features.efiBootStub = true;
-  features.needsCifsUtils = true;
-  features.canDisableNetfilterConntrackHelpers = true;
-  features.netfilterRPFilter = true;
-})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4eea44cfdf0e..cf6afd79be29 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6428,18 +6428,6 @@ let
     inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser;
   };
 
-  linux_3_8 = makeOverridable (import ../os-specific/linux/kernel/linux-3.8.nix) {
-    inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser;
-    kernelPatches =
-      [
-        kernelPatches.sec_perm_2_6_24
-      ] ++ lib.optionals (platform.kernelArch == "mips")
-      [ kernelPatches.mips_fpureg_emu
-        kernelPatches.mips_fpu_sigill
-        kernelPatches.mips_ext3_n32
-      ];
-  };
-
   linux_3_9 = makeOverridable (import ../os-specific/linux/kernel/linux-3.9.nix) {
     inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser;
     kernelPatches =
@@ -6583,7 +6571,6 @@ let
   linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 linuxPackages_3_4);
   linuxPackages_3_4_apparmor = linuxPackagesFor pkgs.linux_3_4_apparmor linuxPackages_3_4_apparmor;
   linuxPackages_3_6_rpi = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_6_rpi linuxPackages_3_6_rpi);
-  linuxPackages_3_8 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_8 linuxPackages_3_8);
   linuxPackages_3_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_9 linuxPackages_3_9);
   linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10 linuxPackages_3_10);
   # Update this when adding a new version!

From 912146d7649891e5665fcee3a0f962f1fcff5878 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 6 Aug 2013 12:40:48 +0200
Subject: [PATCH 64/84] linux: Update to 3.4.56, 3.10.5

---
 pkgs/os-specific/linux/kernel/linux-3.10.nix | 4 ++--
 pkgs/os-specific/linux/kernel/linux-3.4.nix  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
index 4b5e4d001a64..ef36e63fa07f 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.10.4";
+  version = "3.10.5";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1f0ynk37bhkllx2ahzp587yr8cvn809v2ad0sn7z92yv48vl4nly";
+    sha256 = "0p1nmk5mikvqi2b6wzlbb0fnrv30p5qazgnqlxgifsf4pmh1x279";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix
index 2cb37987ff45..1300f74f2162 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.4.55";
+  version = "3.4.56";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1sbb6qa2nb1zwihkdn51q5ac3kn7hrssabn5whx8965hga7yw1dx";
+    sha256 = "1br23nmfrd8r13ad5n79qlndl8s0db89hjp8zrhdz8nzf9jabsjp";
   };
 
   features.iwlwifi = true;

From d435b392014678f6d95951730a8db51203708486 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 6 Aug 2013 14:11:34 +0200
Subject: [PATCH 65/84] Make AVD creating configurable at runtime

---
 pkgs/development/mobile/androidenv/emulate-app.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/mobile/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix
index 0ae934b572ac..9c843fa8c373 100644
--- a/pkgs/development/mobile/androidenv/emulate-app.nix
+++ b/pkgs/development/mobile/androidenv/emulate-app.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation {
     export ANDROID_SERIAL="emulator-$port"
     
     # Create a virtual android device
-    yes "" | ${androidsdkComposition}/libexec/android-sdk-*/tools/android create avd -n device -t ${if useGoogleAPIs then "'Google Inc.:Google APIs:"+platformVersion+"'" else "android-"+platformVersion}
+    yes "" | ${androidsdkComposition}/libexec/android-sdk-*/tools/android create avd -n device -t ${if useGoogleAPIs then "'Google Inc.:Google APIs:"+platformVersion+"'" else "android-"+platformVersion} $NIX_ANDROID_AVD_FLAGS
     
     ${stdenv.lib.optionalString enableGPU ''
       # Enable GPU acceleration

From d0748afc5ea9f66b77563293f8cf31e25e8a53be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 6 Aug 2013 21:20:47 +0200
Subject: [PATCH 66/84] splint: improve meta attributes

- don't repeat package name in description
- prefer licenses.gpl2Plus over free form "GPLv2+" license name
- add platform attribute so that splint will be available in the channel
---
 pkgs/development/tools/analysis/splint/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/analysis/splint/default.nix b/pkgs/development/tools/analysis/splint/default.nix
index cb804b9e6b0d..e8a056bca5a7 100644
--- a/pkgs/development/tools/analysis/splint/default.nix
+++ b/pkgs/development/tools/analysis/splint/default.nix
@@ -14,9 +14,9 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://splint.org/;
-    description = "Splint, an annotation-assisted lightweight static analyzer for C";
+    description = "Annotation-assisted lightweight static analyzer for C";
 
     longDescription = ''
       Splint is a tool for statically checking C programs for security
@@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
       checking than can be done by any standard lint.
     '';
 
-    license = "GPLv2+";
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
   };
-}
\ No newline at end of file
+}

From 61a1867c5dc715a73e5c4bfa933b182a7097e4ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 6 Aug 2013 23:43:51 +0200
Subject: [PATCH 67/84] strace: 4.7 -> 4.8

Also, update meta.license and add meta.platforms.
---
 pkgs/development/tools/misc/strace/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix
index d5bb2b06e12c..bdf3a7d05616 100644
--- a/pkgs/development/tools/misc/strace/default.nix
+++ b/pkgs/development/tools/misc/strace/default.nix
@@ -1,18 +1,19 @@
 { stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "strace-4.7";
+  name = "strace-4.8";
 
   src = fetchurl {
     url = "mirror://sourceforge/strace/${name}.tar.xz";
-    sha256 = "158iwk0pl2mfw93m1843xb7a2zb8p6lh0qim07rca6f1ff4dk764";
+    sha256 = "1y6pw4aj4rw5470lqks1ml0n8jh5xbhwr5c3gb00bj570wgjk4pl";
   };
 
   nativeBuildInputs = [ perl ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://strace.sourceforge.net/;
     description = "A system call tracer for Linux";
-    license = "bsd";
+    license = licenses.bsd3;
+    platforms = platforms.linux;
   };
 }

From 12cc79f8449f52eacc7f9be2e3ca41dc9ea3ef03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 7 Aug 2013 14:08:05 +0200
Subject: [PATCH 68/84] dunst: upgrade to git version to fix 100% CPU problems

---
 pkgs/applications/misc/dunst/default.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix
index 1eb0949aeb41..cb594e494dba 100644
--- a/pkgs/applications/misc/dunst/default.nix
+++ b/pkgs/applications/misc/dunst/default.nix
@@ -1,15 +1,18 @@
-{ stdenv, fetchurl, coreutils , unzip, which, pkgconfig , dbus
+{ stdenv, fetchgit, coreutils , unzip, which, pkgconfig , dbus
 , freetype, xdg_utils , libXext, glib, pango , cairo, libX11, libnotify
 , libxdg_basedir , libXScrnSaver, xproto, libXinerama , perl, gdk_pixbuf
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.0";
-  name = "dunst-${version}";
+  rev = "6a3a855b48a3db64821d1cf8a91c5ee2815a2b2d";
+  name = "dunst-${rev}";
 
-  src = fetchurl {
-    url = "https://github.com/knopwob/dunst/archive/v${version}.zip";
-    sha256 = "1x6k6jrf219v8hmhqhnnfjycldvsnp7ag8a2y8adp5rhfmgyn671";
+  # 1.0.0 release doesn't include 100% CPU fix
+  # https://github.com/knopwob/dunst/issues/98
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/knopwob/dunst.git";
+    sha256 = "0m7yki16d72xm9n2m2fjszd8phqpn5b95q894cz75pmd0sv1j6bj";
   };
 
   patchPhase = ''
@@ -23,7 +26,7 @@ stdenv.mkDerivation rec {
     libXScrnSaver xproto libXinerama perl];
 
   buildPhase = ''
-    export VERSION=${version};
+    export VERSION=${rev};
     export PREFIX=$out;
     make dunst;
   '';

From d10d50132a1f456149d6585f044775cfc3b86752 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 7 Aug 2013 14:09:21 +0200
Subject: [PATCH 69/84] upower: 0.9.19 -> 0.9.21

---
 pkgs/os-specific/linux/upower/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix
index 8f244c3d6454..049bd75adeda 100644
--- a/pkgs/os-specific/linux/upower/default.nix
+++ b/pkgs/os-specific/linux/upower/default.nix
@@ -6,11 +6,11 @@
 assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
-  name = "upower-0.9.19";
+  name = "upower-0.9.21";
 
   src = fetchurl {
     url = "http://upower.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "053yahks5c7nwdxwx8q6nqp3mxbqldmc844mzyvc3ws9635zmisl";
+    sha256 = "1qmjvfdsm6fnmwmdz0mb8nc8i5fnvzz98j37w0ia7482f058xhhk";
   };
 
   buildInputs =
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
     [ "--enable-systemd"
       "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
       "--with-systemdutildir=$(out)/lib/systemd/system-sleep"
+      "--with-udevrulesdir=$(out)/lib/udev/rules.d"
     ];
 
   preConfigure =

From d846e976564350b247600b87cd065b3e42440846 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 7 Aug 2013 14:48:22 +0200
Subject: [PATCH 70/84] VM builds: Use Linux 3.10

3.4 apparently gives corrupt 9pfs data on x86.  See e.g.

  http://hydra.nixos.org/build/5661036

where reading /nix/store/kfldnrrsq0lbbv13gjxdfb3vb1sbaz88-vm-run-stage2
gives garbage.  Strangely it doesn't happen here:

  http://hydra.nixos.org/build/5658978

Ah well.
---
 pkgs/build-support/vm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 5f9381cd00cf..996770d2fcc2 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -1,5 +1,5 @@
 { pkgs
-, kernel ? pkgs.linux
+, kernel ? pkgs.linux_3_10
 , img ? "bzImage"
 , rootModules ?
     [ "virtio_pci" "virtio_blk" "virtio_balloon" "ext4" "unix" "9p" "9pnet_virtio" ]

From d3d92c7b6df6bbae703d549edfa99d552afee0c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 7 Aug 2013 16:31:04 +0200
Subject: [PATCH 71/84] supervisor: 3.0b2 -> 3.0

---
 pkgs/top-level/python-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2bc2ed7a6fb6..53128c6bb2a8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4908,11 +4908,11 @@ pythonPackages = modules // rec {
 
 
   supervisor = buildPythonPackage rec {
-    name = "supervisor-3.0b2";
+    name = "supervisor-3.0";
 
     src = fetchurl {
-      url = https://pypi.python.org/packages/source/s/supervisor/supervisor-3.0b2.tar.gz;
-      md5 = "e2557853239ee69955f993091b0eddc4";
+      url = "https://pypi.python.org/packages/source/s/supervisor/${name}.tar.gz";
+      md5 = "94ff3cf09618c36889425a8e002cd51a";
     };
 
     buildInputs = [ mock ];

From 774634a248abe621e3d9687f9ef1b5ef0dde1a33 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 7 Aug 2013 15:20:01 +0200
Subject: [PATCH 72/84] man-pages: Update to 3.53

---
 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 f1bc98c26cc4..15b49a2a99e2 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.50";
+  name = "man-pages-3.53";
 
   src = fetchurl {
     url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
-    sha256 = "04fn7zzi75y79rkg57nkync3hf14m8708iw33s03f0x8ays6fajz";
+    sha256 = "0kzkjfrw65f7bv6laz3jism4yqajmfh3vdq2jb5d6gyp4n14sxnl";
   };
 
   preBuild =

From d17f7d2fdf7f7c7e9822c1440d19f99abb8c42ef Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 7 Aug 2013 16:17:58 +0200
Subject: [PATCH 73/84] nss: Update to 3.15.1

---
 pkgs/development/libraries/nss/default.nix    |  59 ++-
 .../libraries/nss/nix_secload_fixup.patch     |  40 +-
 ...-r1.patch => nss-3.15-gentoo-fixups.patch} |  59 ++-
 ...ync-up-with-upstream-softokn-changes.patch | 406 ------------------
 4 files changed, 73 insertions(+), 491 deletions(-)
 rename pkgs/development/libraries/nss/{nss-3.14.1-gentoo-fixups-r1.patch => nss-3.15-gentoo-fixups.patch} (70%)
 delete mode 100644 pkgs/development/libraries/nss/sync-up-with-upstream-softokn-changes.patch

diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index d38fc19f40e1..de980d718f33 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -1,68 +1,58 @@
-{ stdenv, fetchurl, fetchgit, nspr, perl, zlib, sqlite
+{ stdenv, fetchurl, nspr, perl, zlib, sqlite
 , includeTools ? false
 }:
 
 let
 
-  nssPEM = fetchgit {
-    url = "git://git.fedorahosted.org/git/nss-pem.git";
-    rev = "07a683505d4a0a1113c4085c1ce117425d0afd80";
-    sha256 = "e4a9396d90e50e8b3cceff45f312eda9aaf356423f4eddd354a0e1afbbfd4cf8";
+  nssPEM = fetchurl {
+    url = http://dev.gentoo.org/~anarchy/patches/nss-3.15-pem-support-20130617.patch.xz;
+    sha256 = "1k1m8lsgqwxx251943hks1dd13hz1adpqqb0hxwn011by5vmi201";
   };
 
   secLoadPatch = fetchurl {
     name = "security_load.patch";
-    urls = [
-      # "http://patch-tracker.debian.org/patch/series/dl/nss/2:3.13.6-1/85_security_load.patch"
-      # "http://anonscm.debian.org/gitweb/?p=pkg-mozilla/nss.git;a=blob_plain;f=debian/patches/85_security_load.patch;hb=HEAD"
-      "http://www.parsix.org/export/7797/pkg/security/raul/main/nss/trunk/debian/patches/85_security_load.patch"
-    ];
-    sha256 = "8a8d0ae4ebbd7c389973fa5d26d8bc5f473046c6cb1d8283cb9a3c1f4c565c47";
+    urls = http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.1-1/85_security_load.patch;
+    sha256 = "041c6v4cxwsy14qr5m9qs0gkv3w24g632cwpz27kacxpa886r1ds";
   };
 
 in stdenv.mkDerivation rec {
   name = "nss-${version}";
-  version = "3.14.3";
+  version = "3.15.1";
 
   src = fetchurl {
-    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_14_3_RTM/src/${name}.tar.gz";
-    sha1 = "94d8781d1fa29cfbd37453dda3e9488709b82c4c";
+    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_15_1_RTM/src/${name}.tar.gz";
+    sha1 = "1aa7c0ff8af7fb2c8b6e4886ae2291f4bfe0d5c0";
   };
 
   buildInputs = [ nspr perl zlib sqlite ];
 
-  postUnpack = ''
-    cp -rdv "${nssPEM}/mozilla/security/nss/lib/ckfw/pem" \
-            "$sourceRoot/mozilla/security/nss/lib/ckfw/"
-    chmod -R u+w "$sourceRoot/mozilla/security/nss/lib/ckfw/pem"
+  prePatch = ''
+    xz -d < ${nssPEM} | patch -p1
   '';
 
-  patches = [
-    ./nss-3.14.1-gentoo-fixups-r1.patch
-    secLoadPatch
-    ./nix_secload_fixup.patch
-    ./sync-up-with-upstream-softokn-changes.patch
-  ];
+  patches =
+    [ ./nss-3.15-gentoo-fixups.patch
+      secLoadPatch
+      ./nix_secload_fixup.patch
+    ];
 
   postPatch = ''
-    sed -i -e 's/^DIRS.*$/& pem/' mozilla/security/nss/lib/ckfw/manifest.mn
-
-    # Fix up the patch from Gentoo
+    # Fix up the patch from Gentoo.
     sed -i \
       -e "/^PREFIX =/s|= /usr|= $out|" \
       -e '/@libdir@/s|gentoo/nss|lib|' \
       -e '/ln -sf/d' \
-      mozilla/security/nss/config/Makefile
+      nss/config/Makefile
 
     # Note for spacing/tab nazis: The TAB characters are intentional!
-    cat >> mozilla/security/nss/config/Makefile <<INSTALL_TARGET
+    cat >> nss/config/Makefile <<INSTALL_TARGET
     install:
     	mkdir -p \$(DIST)/lib/pkgconfig
     	cp nss.pc \$(DIST)/lib/pkgconfig
     INSTALL_TARGET
   '';
 
-  preConfigure = "cd mozilla/security/nss";
+  preConfigure = "cd nss";
 
   makeFlags = [
     "NSPR_INCLUDE_DIR=${nspr}/include/nspr"
@@ -74,8 +64,6 @@ in stdenv.mkDerivation rec {
     "NSS_USE_SYSTEM_SQLITE=1"
   ] ++ stdenv.lib.optional stdenv.is64bit "USE_64=1";
 
-  buildFlags = [ "build_coreconf" "build_dbm" "all" ];
-
   postInstall = ''
     rm -rf $out/private
     mv $out/public $out/include
@@ -83,6 +71,8 @@ in stdenv.mkDerivation rec {
     rmdir $out/*.OBJ
 
     cp -av config/nss-config $out/bin/nss-config
+
+    ln -s lib $out/lib64
   '';
 
   postFixup = ''
@@ -94,4 +84,9 @@ in stdenv.mkDerivation rec {
   '' + stdenv.lib.optionalString (!includeTools) ''
     find $out/bin -type f \( -name nss-config -o -delete \)
   '';
+
+  meta = {
+    homepage = https://developer.mozilla.org/en-US/docs/NSS;
+    description = "A set of libraries for development of security-enabled client and server applications";
+  };
 }
diff --git a/pkgs/development/libraries/nss/nix_secload_fixup.patch b/pkgs/development/libraries/nss/nix_secload_fixup.patch
index 960fe0ef7a75..89c82f1b87d4 100644
--- a/pkgs/development/libraries/nss/nix_secload_fixup.patch
+++ b/pkgs/development/libraries/nss/nix_secload_fixup.patch
@@ -1,18 +1,7 @@
-diff --git a/mozilla/security/coreconf/config.mk b/mozilla/security/coreconf/config.mk
-index 72557c6..bdcbf88 100644
---- a/mozilla/security/coreconf/config.mk
-+++ b/mozilla/security/coreconf/config.mk
-@@ -207,3 +207,5 @@ endif
- DEFINES += -DUSE_UTIL_DIRECTLY
- USE_UTIL_DIRECTLY = 1
- 
-+# nix specific stuff:
-+DEFINES += -DNIX_NSS_LIBDIR=\"$(out)/lib/\"
-diff --git a/mozilla/security/nss/cmd/shlibsign/shlibsign.c b/mozilla/security/nss/cmd/shlibsign/shlibsign.c
-index 5ce626e..e1e8039 100644
---- a/mozilla/security/nss/cmd/shlibsign/shlibsign.c
-+++ b/mozilla/security/nss/cmd/shlibsign/shlibsign.c
-@@ -770,7 +770,7 @@ int main(int argc, char **argv)
+diff -ru -x '*~' nss-3.15.1-orig/nss/cmd/shlibsign/shlibsign.c nss-3.15.1/nss/cmd/shlibsign/shlibsign.c
+--- nss-3.15.1-orig/nss/cmd/shlibsign/shlibsign.c	2013-08-07 16:03:40.013256377 +0200
++++ nss-3.15.1/nss/cmd/shlibsign/shlibsign.c	2013-08-07 16:04:21.128410153 +0200
+@@ -853,7 +853,7 @@
      assert(libname != NULL);
      lib = PR_LoadLibrary(libname);
      if (!lib)
@@ -21,11 +10,20 @@ index 5ce626e..e1e8039 100644
      assert(lib != NULL);
      PR_FreeLibraryName(libname);
  
-diff --git a/mozilla/security/nss/lib/util/secload.c b/mozilla/security/nss/lib/util/secload.c
-index 7d6fc22..0b7759b 100644
---- a/mozilla/security/nss/lib/util/secload.c
-+++ b/mozilla/security/nss/lib/util/secload.c
-@@ -105,9 +105,9 @@ loader_LoadLibInReferenceDir(const char *referencePath, const char *name)
+diff -ru -x '*~' nss-3.15.1-orig/nss/coreconf/config.mk nss-3.15.1/nss/coreconf/config.mk
+--- nss-3.15.1-orig/nss/coreconf/config.mk	2013-06-27 19:58:08.000000000 +0200
++++ nss-3.15.1/nss/coreconf/config.mk	2013-08-07 16:11:27.364608802 +0200
+@@ -181,3 +181,6 @@
+ 
+ # Build with NO_NSPR_10_SUPPORT to avoid using obsolete NSPR features
+ DEFINES += -DNO_NSPR_10_SUPPORT
++
++# Nix specific stuff.
++DEFINES += -DNIX_NSS_LIBDIR=\"$(out)/lib/\"
+diff -ru -x '*~' nss-3.15.1-orig/nss/lib/util/secload.c nss-3.15.1/nss/lib/util/secload.c
+--- nss-3.15.1-orig/nss/lib/util/secload.c	2013-08-07 16:03:40.014256381 +0200
++++ nss-3.15.1/nss/lib/util/secload.c	2013-08-07 16:05:02.453563064 +0200
+@@ -70,9 +70,9 @@
      /* Remove the trailing filename from referencePath and add the new one */
      c = strrchr(referencePath, PR_GetDirectorySeparator());
      if (!c) { /* referencePath doesn't contain a / means that dladdr gave us argv[0]
@@ -38,7 +36,7 @@ index 7d6fc22..0b7759b 100644
      }
      if (c) {
          size_t referencePathSize = 1 + c - referencePath;
-@@ -125,8 +125,7 @@ loader_LoadLibInReferenceDir(const char *referencePath, const char *name)
+@@ -90,8 +90,7 @@
                  (strncmp(fullName + referencePathSize - 4, "bin", 3) == 0)) {
                  memcpy(fullName + referencePathSize -4, "lib", 3);
              }
diff --git a/pkgs/development/libraries/nss/nss-3.14.1-gentoo-fixups-r1.patch b/pkgs/development/libraries/nss/nss-3.15-gentoo-fixups.patch
similarity index 70%
rename from pkgs/development/libraries/nss/nss-3.14.1-gentoo-fixups-r1.patch
rename to pkgs/development/libraries/nss/nss-3.15-gentoo-fixups.patch
index bc3a98ec1438..b3e35b1d2d19 100644
--- a/pkgs/development/libraries/nss/nss-3.14.1-gentoo-fixups-r1.patch
+++ b/pkgs/development/libraries/nss/nss-3.15-gentoo-fixups.patch
@@ -1,9 +1,8 @@
-diff -urN a/mozilla/security/nss/config/Makefile b/mozilla/security/nss/config/Makefile
---- a/mozilla/security/nss/config/Makefile	1969-12-31 18:00:00.000000000 -0600
-+++ b/mozilla/security/nss/config/Makefile	2012-12-15 07:27:20.650148987 -0600
+--- a/nss/config/Makefile
++++ b/nss/config/Makefile
 @@ -0,0 +1,40 @@
-+CORE_DEPTH = ../..
-+DEPTH      = ../..
++CORE_DEPTH = ..
++DEPTH      = ..
 +
 +include $(CORE_DEPTH)/coreconf/config.mk
 +
@@ -19,14 +18,14 @@ diff -urN a/mozilla/security/nss/config/Makefile b/mozilla/security/nss/config/M
 +	mkdir -p $(DIST)/lib/pkgconfig
 +	sed -e "s,@prefix@,$(PREFIX)," \
 +	    -e "s,@exec_prefix@,\$${prefix}," \
-+	    -e "s,@libdir@,\$${prefix}/gentoo/nss," \
++	    -e "s,@libdir@,\$${prefix}/lib64," \
 +	    -e "s,@includedir@,\$${prefix}/include/nss," \
 +	    -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
 +	    -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
 +	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
 +	    nss.pc.in > nss.pc
 +	chmod 0644 nss.pc
-+	ln -sf ../../../../../security/nss/config/nss.pc $(DIST)/lib/pkgconfig
++	ln -sf ../../../../config/nss.pc $(DIST)/lib/pkgconfig
 +
 +	# Create the nss-config script
 +	mkdir -p $(DIST)/bin
@@ -36,15 +35,14 @@ diff -urN a/mozilla/security/nss/config/Makefile b/mozilla/security/nss/config/M
 +	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
 +	    nss-config.in > nss-config
 +	chmod 0755 nss-config
-+	ln -sf ../../../../security/nss/config/nss-config $(DIST)/bin
++	ln -sf ../../../config/nss-config $(DIST)/bin
 +
 +libs:
 +
 +dummy: all export libs
 +
-diff -urN a/mozilla/security/nss/config/nss-config.in b/mozilla/security/nss/config/nss-config.in
---- a/mozilla/security/nss/config/nss-config.in	1969-12-31 18:00:00.000000000 -0600
-+++ b/mozilla/security/nss/config/nss-config.in	2012-12-15 07:27:20.651148959 -0600
+--- a/nss/config/nss-config.in
++++ b/nss/config/nss-config.in
 @@ -0,0 +1,145 @@
 +#!/bin/sh
 +
@@ -191,9 +189,8 @@ diff -urN a/mozilla/security/nss/config/nss-config.in b/mozilla/security/nss/con
 +      echo $libdirs
 +fi      
 +
-diff -urN a/mozilla/security/nss/config/nss.pc.in b/mozilla/security/nss/config/nss.pc.in
---- a/mozilla/security/nss/config/nss.pc.in	1969-12-31 18:00:00.000000000 -0600
-+++ b/mozilla/security/nss/config/nss.pc.in	2012-12-15 07:27:20.651148959 -0600
+--- a/nss/config/nss.pc.in
++++ b/nss/config/nss.pc.in
 @@ -0,0 +1,12 @@
 +prefix=@prefix@
 +exec_prefix=@exec_prefix@
@@ -207,37 +204,35 @@ diff -urN a/mozilla/security/nss/config/nss.pc.in b/mozilla/security/nss/config/
 +Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3
 +Cflags: -I${includedir}
 +
-diff -urN a/mozilla/security/nss/Makefile b/mozilla/security/nss/Makefile
---- a/mozilla/security/nss/Makefile	2012-11-13 19:14:07.000000000 -0600
-+++ b/mozilla/security/nss/Makefile	2012-12-15 07:27:57.235162137 -0600
+--- a/nss/Makefile
++++ b/nss/Makefile
 @@ -44,7 +44,7 @@
  # (7) Execute "local" rules. (OPTIONAL).                              #
  #######################################################################
  
--nss_build_all: build_coreconf build_nspr build_dbm all
-+nss_build_all: build_coreconf build_dbm all
+-nss_build_all: build_nspr all
++nss_build_all: all
  
- nss_clean_all: clobber_coreconf clobber_nspr clobber_dbm clobber
+ nss_clean_all: clobber_nspr clobber
  
-@@ -106,12 +106,6 @@
+@@ -103,12 +103,6 @@
  	--with-dist-prefix='$(NSPR_PREFIX)' \
  	--with-dist-includedir='$(NSPR_PREFIX)/include'
  
 -build_nspr: $(NSPR_CONFIG_STATUS)
--	$(MAKE) -C $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME)
+-	$(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)
 -
 -clobber_nspr: $(NSPR_CONFIG_STATUS)
--	$(MAKE) -C $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) clobber
+-	$(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) clobber
 -
- build_dbm:
- ifdef NSS_DISABLE_DBM
- 	@echo "skipping the build of DBM"
-diff -urN a/mozilla/security/nss/manifest.mn b/mozilla/security/nss/manifest.mn
---- a/mozilla/security/nss/manifest.mn	2012-03-20 09:46:49.000000000 -0500
-+++ b/mozilla/security/nss/manifest.mn	2012-12-15 07:27:20.652148933 -0600
-@@ -10,6 +10,6 @@
+ build_docs:
+ 	$(MAKE) -C $(CORE_DEPTH)/doc
+ 
+--- a/nss/manifest.mn
++++ b/nss/manifest.mn
+@@ -10,4 +10,4 @@
  
  RELEASE = nss
  
--DIRS = lib cmd
-+DIRS = lib cmd config
+-DIRS = coreconf lib cmd
++DIRS = coreconf lib cmd config
diff --git a/pkgs/development/libraries/nss/sync-up-with-upstream-softokn-changes.patch b/pkgs/development/libraries/nss/sync-up-with-upstream-softokn-changes.patch
deleted file mode 100644
index 4942debcd302..000000000000
--- a/pkgs/development/libraries/nss/sync-up-with-upstream-softokn-changes.patch
+++ /dev/null
@@ -1,406 +0,0 @@
-From d6dbecfea317a468be12423595e584f43d84d8ec Mon Sep 17 00:00:00 2001
-From: Elio Maldonado <emaldona@redhat.com>
-Date: Sat, 9 Feb 2013 17:11:00 -0500
-Subject: [PATCH] Sync up with upstream softokn changes
-
-- Disable RSA OEP case in FormatBlock, RSA_OAEP support is experimental and in a state of flux
-- Numerous change upstream due to the work for TLS/DTLS 'Lucky 13' vulnerability CVE-2013-0169
-- It now compiles with the NSS_3_14_3_BETA1 source
----
- mozilla/security/nss/lib/ckfw/pem/rsawrapr.c |  338 +++++++-------------------
- 1 files changed, 82 insertions(+), 256 deletions(-)
-
-diff --git a/mozilla/security/nss/lib/ckfw/pem/rsawrapr.c b/mozilla/security/nss/lib/ckfw/pem/rsawrapr.c
-index 5ac4f39..3780d30 100644
---- a/mozilla/security/nss/lib/ckfw/pem/rsawrapr.c
-+++ b/mozilla/security/nss/lib/ckfw/pem/rsawrapr.c
-@@ -46,6 +46,7 @@
- #include "sechash.h"
- #include "base.h"
- 
-+#include "lowkeyi.h"
- #include "secerr.h"
- 
- #define RSA_BLOCK_MIN_PAD_LEN		8
-@@ -54,9 +55,8 @@
- #define RSA_BLOCK_PRIVATE_PAD_OCTET	0xff
- #define RSA_BLOCK_AFTER_PAD_OCTET	0x00
- 
--#define OAEP_SALT_LEN		8
--#define OAEP_PAD_LEN		8
--#define OAEP_PAD_OCTET		0x00
-+/* Needed for RSA-PSS functions */
-+static const unsigned char eightZeros[] = { 0, 0, 0, 0, 0, 0, 0, 0 };
- 
- #define FLAT_BUFSIZE 512        /* bytes to hold flattened SHA1Context. */
- 
-@@ -78,127 +78,39 @@ pem_PublicModulusLen(NSSLOWKEYPublicKey *pubk)
-     return 0;
- }
- 
--static SHA1Context *SHA1_CloneContext(SHA1Context * original)
--{
--    SHA1Context *clone = NULL;
--    unsigned char *pBuf;
--    int sha1ContextSize = SHA1_FlattenSize(original);
--    SECStatus frv;
--    unsigned char buf[FLAT_BUFSIZE];
--
--    PORT_Assert(sizeof buf >= sha1ContextSize);
--    if (sizeof buf >= sha1ContextSize) {
--        pBuf = buf;
--    } else {
--        pBuf = nss_ZAlloc(NULL, sha1ContextSize);
--        if (!pBuf)
--            goto done;
--    }
--
--    frv = SHA1_Flatten(original, pBuf);
--    if (frv == SECSuccess) {
--        clone = SHA1_Resurrect(pBuf, NULL);
--        memset(pBuf, 0, sha1ContextSize);
--    }
--  done:
--    if (pBuf != buf)
--        nss_ZFreeIf(pBuf);
--    return clone;
-+/* Constant time comparison of a single byte.
-+ * Returns 1 iff a == b, otherwise returns 0.
-+ * Note: For ranges of bytes, use constantTimeCompare.
-+ */
-+static unsigned char constantTimeEQ8(unsigned char a, unsigned char b) {
-+    unsigned char c = ~(a - b | b - a);
-+    c >>= 7;
-+    return c;
- }
- 
--/*
-- * Modify data by XORing it with a special hash of salt.
-+/* Constant time comparison of a range of bytes.
-+ * Returns 1 iff len bytes of a are identical to len bytes of b, otherwise
-+ * returns 0.
-  */
--static SECStatus
--oaep_xor_with_h1(unsigned char *data, unsigned int datalen,
--                 unsigned char *salt, unsigned int saltlen)
--{
--    SHA1Context *sha1cx;
--    unsigned char *dp, *dataend;
--    unsigned char end_octet;
--
--    sha1cx = SHA1_NewContext();
--    if (sha1cx == NULL) {
--        return SECFailure;
--    }
--
--    /*
--     * Get a hash of salt started; we will use it several times,
--     * adding in a different end octet (x00, x01, x02, ...).
--     */
--    SHA1_Begin(sha1cx);
--    SHA1_Update(sha1cx, salt, saltlen);
--    end_octet = 0;
--
--    dp = data;
--    dataend = data + datalen;
--
--    while (dp < dataend) {
--        SHA1Context *sha1cx_h1;
--        unsigned int sha1len, sha1off;
--        unsigned char sha1[SHA1_LENGTH];
--
--        /*
--         * Create hash of (salt || end_octet)
--         */
--        sha1cx_h1 = SHA1_CloneContext(sha1cx);
--        SHA1_Update(sha1cx_h1, &end_octet, 1);
--        SHA1_End(sha1cx_h1, sha1, &sha1len, sizeof(sha1));
--        SHA1_DestroyContext(sha1cx_h1, PR_TRUE);
--        PORT_Assert(sha1len == SHA1_LENGTH);
--
--        /*
--         * XOR that hash with the data.
--         * When we have fewer than SHA1_LENGTH octets of data
--         * left to xor, use just the low-order ones of the hash.
--         */
--        sha1off = 0;
--        if ((dataend - dp) < SHA1_LENGTH)
--            sha1off = SHA1_LENGTH - (dataend - dp);
--        while (sha1off < SHA1_LENGTH)
--            *dp++ ^= sha1[sha1off++];
--
--        /*
--         * Bump for next hash chunk.
--         */
--        end_octet++;
--    }
--
--    SHA1_DestroyContext(sha1cx, PR_TRUE);
--    return SECSuccess;
-+static unsigned char constantTimeCompare(const unsigned char *a,
-+                                         const unsigned char *b,
-+                                         unsigned int len) {
-+    unsigned char tmp = 0;
-+    unsigned int i;
-+    for (i = 0; i < len; ++i, ++a, ++b)
-+        tmp |= *a ^ *b;
-+    return constantTimeEQ8(0x00, tmp);
- }
- 
--/*
-- * Modify salt by XORing it with a special hash of data.
-+/* Constant time conditional.
-+ * Returns a if c is 1, or b if c is 0. The result is undefined if c is
-+ * not 0 or 1.
-  */
--static SECStatus
--oaep_xor_with_h2(unsigned char *salt, unsigned int saltlen,
--                 unsigned char *data, unsigned int datalen)
-+static unsigned int constantTimeCondition(unsigned int c,
-+                                          unsigned int a,
-+                                          unsigned int b)
- {
--    unsigned char sha1[SHA1_LENGTH];
--    unsigned char *psalt, *psha1, *saltend;
--    SECStatus rv;
--
--    /*
--     * Create a hash of data.
--     */
--    rv = SHA1_HashBuf(sha1, data, datalen);
--    if (rv != SECSuccess) {
--        return rv;
--    }
--
--    /*
--     * XOR the low-order octets of that hash with salt.
--     */
--    PORT_Assert(saltlen <= SHA1_LENGTH);
--    saltend = salt + saltlen;
--    psalt = salt;
--    psha1 = sha1 + SHA1_LENGTH - saltlen;
--    while (psalt < saltend) {
--        *psalt++ ^= *psha1++;
--    }
--
--    return SECSuccess;
-+    return (~(c - 1) & a) | ((c - 1) & b);
- }
- 
- /*
-@@ -212,7 +124,7 @@ static unsigned char *rsa_FormatOneBlock(unsigned modulusLen,
-     unsigned char *block;
-     unsigned char *bp;
-     int padLen;
--    int i;
-+    int i, j;
-     SECStatus rv;
- 
-     block = (unsigned char *) nss_ZAlloc(NULL, modulusLen);
-@@ -260,124 +172,58 @@ static unsigned char *rsa_FormatOneBlock(unsigned modulusLen,
-          */
-     case RSA_BlockPublic:
- 
--        /*
--         * 0x00 || BT || Pad || 0x00 || ActualData
--         *   1      1   padLen    1      data->len
--         * Pad is all non-zero random bytes.
--         */
--        padLen = modulusLen - data->len - 3;
--        PORT_Assert(padLen >= RSA_BLOCK_MIN_PAD_LEN);
--        if (padLen < RSA_BLOCK_MIN_PAD_LEN) {
--            nss_ZFreeIf(block);
--            return NULL;
--        }
--        for (i = 0; i < padLen; i++) {
--            /* Pad with non-zero random data. */
--            do {
--                rv = RNG_GenerateGlobalRandomBytes(bp + i, 1);
--            } while (rv == SECSuccess
--                     && bp[i] == RSA_BLOCK_AFTER_PAD_OCTET);
--            if (rv != SECSuccess) {
--                nss_ZFreeIf(block);
--                return NULL;
--            }
--        }
--        bp += padLen;
--        *bp++ = RSA_BLOCK_AFTER_PAD_OCTET;
--        nsslibc_memcpy(bp, data->data, data->len);
--
--        break;
--
--        /*
--         * Blocks intended for public-key operation, using
--         * Optimal Asymmetric Encryption Padding (OAEP).
--         */
--    case RSA_BlockOAEP:
--        /*
--         * 0x00 || BT || Modified2(Salt) || Modified1(PaddedData)
--         *   1      1     OAEP_SALT_LEN     OAEP_PAD_LEN + data->len [+ N]
--         *
--         * where:
--         *   PaddedData is "Pad1 || ActualData [|| Pad2]"
--         *   Salt is random data.
--         *   Pad1 is all zeros.
--         *   Pad2, if present, is random data.
--         *   (The "modified" fields are all the same length as the original
--         * unmodified values; they are just xor'd with other values.)
--         *
--         *   Modified1 is an XOR of PaddedData with a special octet
--         * string constructed of iterated hashing of Salt (see below).
--         *   Modified2 is an XOR of Salt with the low-order octets of
--         * the hash of Modified1 (see farther below ;-).
--         *
--         * Whew!
--         */
--
--
--        /*
--         * Salt
--         */
--        rv = RNG_GenerateGlobalRandomBytes(bp, OAEP_SALT_LEN);
--        if (rv != SECSuccess) {
--            nss_ZFreeIf(block);
--            return NULL;
--        }
--        bp += OAEP_SALT_LEN;
--
--        /*
--         * Pad1
--         */
--        nsslibc_memset(bp, OAEP_PAD_OCTET, OAEP_PAD_LEN);
--        bp += OAEP_PAD_LEN;
--
--        /*
--         * Data
--         */
--        nsslibc_memcpy(bp, data->data, data->len);
--        bp += data->len;
--
--        /*
--         * Pad2
--         */
--        if (bp < (block + modulusLen)) {
--            rv = RNG_GenerateGlobalRandomBytes(bp,
--                                               block - bp + modulusLen);
--            if (rv != SECSuccess) {
--                nss_ZFreeIf(block);
--                return NULL;
--            }
--        }
--
--        /*
--         * Now we have the following:
--         * 0x00 || BT || Salt || PaddedData
--         * (From this point on, "Pad1 || Data [|| Pad2]" is treated
--         * as the one entity PaddedData.)
--         *
--         * We need to turn PaddedData into Modified1.
--         */
--        if (oaep_xor_with_h1(block + 2 + OAEP_SALT_LEN,
--                             modulusLen - 2 - OAEP_SALT_LEN,
--                             block + 2, OAEP_SALT_LEN) != SECSuccess) {
--            nss_ZFreeIf(block);
--            return NULL;
--        }
--
--        /*
--         * Now we have:
--         * 0x00 || BT || Salt || Modified1(PaddedData)
--         *
--         * The remaining task is to turn Salt into Modified2.
--         */
--        if (oaep_xor_with_h2(block + 2, OAEP_SALT_LEN,
--                             block + 2 + OAEP_SALT_LEN,
--                             modulusLen - 2 - OAEP_SALT_LEN) !=
--            SECSuccess) {
--            nss_ZFreeIf(block);
--            return NULL;
--        }
--
--        break;
-+	/*
-+	 * 0x00 || BT || Pad || 0x00 || ActualData
-+	 *   1      1   padLen    1      data->len
-+	 * Pad is all non-zero random bytes.
-+	 *
-+	 * Build the block left to right.
-+	 * Fill the entire block from Pad to the end with random bytes.
-+	 * Use the bytes after Pad as a supply of extra random bytes from 
-+	 * which to find replacements for the zero bytes in Pad.
-+	 * If we need more than that, refill the bytes after Pad with 
-+	 * new random bytes as necessary.
-+	 */
-+	padLen = modulusLen - (data->len + 3);
-+	PORT_Assert (padLen >= RSA_BLOCK_MIN_PAD_LEN);
-+	if (padLen < RSA_BLOCK_MIN_PAD_LEN) {
-+	    nss_ZFreeIf (block);
-+	    return NULL;
-+	}
-+	j = modulusLen - 2;
-+	rv = RNG_GenerateGlobalRandomBytes(bp, j);
-+	if (rv == SECSuccess) {
-+	    for (i = 0; i < padLen; ) {
-+		unsigned char repl;
-+		/* Pad with non-zero random data. */
-+		if (bp[i] != RSA_BLOCK_AFTER_PAD_OCTET) {
-+		    ++i;
-+		    continue;
-+		}
-+		if (j <= padLen) {
-+		    rv = RNG_GenerateGlobalRandomBytes(bp + padLen,
-+					  modulusLen - (2 + padLen));
-+		    if (rv != SECSuccess)
-+		    	break;
-+		    j = modulusLen - 2;
-+		}
-+		do {
-+		    repl = bp[--j];
-+		} while (repl == RSA_BLOCK_AFTER_PAD_OCTET && j > padLen);
-+		if (repl != RSA_BLOCK_AFTER_PAD_OCTET) {
-+		    bp[i++] = repl;
-+		}
-+	    }
-+	}
-+	if (rv != SECSuccess) {
-+	    /*sftk_fatalError = PR_TRUE;*/
-+	    nss_ZFreeIf (block);
-+	    return NULL;
-+	}
-+	bp += padLen;
-+	*bp++ = RSA_BLOCK_AFTER_PAD_OCTET;
-+	nsslibc_memcpy(bp, data->data, data->len);
-+	break;
- 
-     default:
-         PORT_Assert(0);
-@@ -427,26 +273,6 @@ rsa_FormatBlock(SECItem * result, unsigned modulusLen,
- 
-         break;
- 
--    case RSA_BlockOAEP:
--        /*
--         * 0x00 || BT || M1(Salt) || M2(Pad1||ActualData[||Pad2])
--         *
--         * The "2" below is the first octet + the second octet.
--         * (The other fields do not contain the clear values, but are
--         * the same length as the clear values.)
--         */
--        PORT_Assert(data->len <= (modulusLen - (2 + OAEP_SALT_LEN
--                                                + OAEP_PAD_LEN)));
--
--        result->data = rsa_FormatOneBlock(modulusLen, blockType, data);
--        if (result->data == NULL) {
--            result->len = 0;
--            return SECFailure;
--        }
--        result->len = modulusLen;
--
--        break;
--
-     case RSA_BlockRaw:
-         /*
-          * Pad || ActualData
--- 
-1.7.1
-

From 09fc99710762c5b32b89acd63334263cda83cae3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 7 Aug 2013 16:36:36 +0200
Subject: [PATCH 74/84] subversion: Update to 1.7.11

CVE-2013-4131
---
 pkgs/applications/version-management/subversion/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index c5a740425908..95b244e7d91e 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -21,13 +21,13 @@ assert compressionSupport -> neon.compressionSupport;
 
 stdenv.mkDerivation rec {
 
-  version = "1.7.10";
+  version = "1.7.11";
 
   name = "subversion-${version}";
 
   src = fetchurl {
     url = "mirror://apache/subversion//${name}.tar.bz2";
-    sha1 = "a4f3de0a13b034b0eab4d35512c6c91a4abcf4f5";
+    sha1 = "d82e187803043b74c072cd5a861ac02e4a027684";
   };
 
   buildInputs = [ zlib apr aprutil sqlite ]

From 288811f5e147f9c4da9028ed49e9542c9f96174b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 7 Aug 2013 16:59:11 +0200
Subject: [PATCH 75/84] firefox: Update to 23.0

---
 pkgs/applications/networking/browsers/firefox/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 912a193eec9a..b780152905d9 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -19,9 +19,9 @@ assert useSystemCairo -> cairo != null;
 let optional = stdenv.lib.optional;
 in rec {
 
-  firefoxVersion = "22.0";
+  firefoxVersion = "23.0";
 
-  xulVersion = "22.0"; # this attribute is used by other packages
+  xulVersion = "23.0"; # this attribute is used by other packages
 
 
   src = fetchurl {
@@ -31,7 +31,7 @@ in rec {
         # Fall back to this url for versions not available at releases.mozilla.org.
         "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
     ];
-    sha1 = "db2d5b028b6ea95b5f006b46e153f50f7a52bf80";
+    sha1 = "31936d2ddb727640c96a3ae697bf145c42a2a20e";
   };
 
   commonConfigureFlags =

From e7e4551baad3bc3877a04258cdefc2c021a1201b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 7 Aug 2013 17:02:00 +0200
Subject: [PATCH 76/84] flashplayer: Update to 11.2.202.297

---
 .../browsers/mozilla-plugins/flashplayer-11/default.nix   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
index 10faa983cc1c..0363176257fd 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
@@ -44,9 +44,9 @@ let
         throw "no x86_64 debugging version available"
       else rec {
         # -> http://labs.adobe.com/downloads/flashplayer10.html
-        version = "11.2.202.273";
+        version = "11.2.202.297";
         url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz";
-        sha256 = "0c15nszgg7zsv00n2qxha5zf8hmyf8i6byvhalnh5x46mr0rkbv9";
+        sha256 = "0jfigq56p6zp61pmc4jl12p8gv2jhfmim18j1b30iikw3iv26lh8";
       }
     else if stdenv.system == "i686-linux" then
       if debug then {
@@ -55,9 +55,9 @@ let
         url = http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_plugin_debug.i386.tar.gz;
         sha256 = "1z3649lv9sh7jnwl8d90a293nkaswagj2ynhsr4xmwiy7c0jz2lk";
       } else rec {
-        version = "11.2.202.273";
+        version = "11.2.202.297";
         url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz";
-        sha256 = "1gb14xv7gbq57qg1hxmrnryaw6xgmkg54ql5hr7q6szplj65wvmd";
+        sha256 = "0mpj25b2ar7gccqmw5lffdzlr3yyfalphpgwnl18s05wy1fx484y";
       }
     else throw "Flash Player is not supported on this platform";
 

From a9b4851b7476e92acb82b22c5bb57f03e672db41 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Wed, 7 Aug 2013 22:12:44 +0200
Subject: [PATCH 77/84] The android utility's GUI should work and wrapper
 scripts in bin/ are replaced by symlinks

---
 .../mobile/androidenv/androidsdk.nix          | 26 +++++++++----------
 .../development/mobile/androidenv/default.nix |  4 +--
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix
index 11e6b0c45a2a..d6c751049d4b 100644
--- a/pkgs/development/mobile/androidenv/androidsdk.nix
+++ b/pkgs/development/mobile/androidenv/androidsdk.nix
@@ -2,8 +2,8 @@
 , platformTools, buildTools, support, platforms, sysimages, addons
 , zlib_32bit
 , libX11_32bit, libxcb_32bit, libXau_32bit, libXdmcp_32bit, libXext_32bit, mesa_32bit, alsaLib_32bit
-, libX11, libXext, libXrender, libxcb, libXau, libXdmcp, mesa, alsaLib
-, freetype, fontconfig, gtk, atk, file
+, libX11, libXext, libXrender, libxcb, libXau, libXdmcp, libXtst, mesa, alsaLib
+, freetype, fontconfig, glib, gtk, atk, file
 }:
 {platformVersions, abiVersions, useGoogleAPIs}:
 
@@ -56,7 +56,15 @@ stdenv.mkDerivation {
           patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib:${zlib_32bit}/lib $i
       done
     
-      # The emulators need additional libraries, which are not in the RPATH => let's wrap them
+      # The android script has a hardcoded reference to /bin/ls that must be patched
+      sed -i -e "s|/bin/ls|ls|" android
+      
+      # The android script used SWT and wants to dynamically load some GTK+ stuff.
+      # The following wrapper ensures that they can be found:
+      wrapProgram `pwd`/android \
+        --prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk}/lib:${libXtst}/lib
+    
+      # The emulators need additional libraries, which are dynamically loaded => let's wrap them
     
       for i in emulator emulator-arm emulator-mips emulator-x86
       do
@@ -174,11 +182,7 @@ stdenv.mkDerivation {
     do
         if [ ! -d $i ] && [ -x $i ]
         then
-            ( echo '#! ${stdenv.shell} -e'
-              echo "cd $out/libexec/android-sdk-*/tools"
-              echo "exec ./$(basename $i) \"\$@\"" ) > $out/bin/$(basename $i)
-          
-              chmod +x $out/bin/$(basename $i)
+            ln -sf $i $out/bin/$(basename $i)
         fi
     done
     
@@ -186,11 +190,7 @@ stdenv.mkDerivation {
     do
         if [ ! -d $i ] && [ -x $i ]
         then
-            ( echo '#! ${stdenv.shell} -e'
-              echo "cd $out/libexec/android-sdk-*/platform-tools"
-              echo "exec ./$(basename $i) \"\$@\"") > $out/bin/$(basename $i)
-          
-              chmod +x $out/bin/$(basename $i)
+            ln -sf $i $out/bin/$(basename $i)
         fi
     done
   '';
diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix
index 9fec70da9403..e12f9096994d 100644
--- a/pkgs/development/mobile/androidenv/default.nix
+++ b/pkgs/development/mobile/androidenv/default.nix
@@ -36,8 +36,8 @@ rec {
 
   androidsdk = import ./androidsdk.nix {
     inherit (pkgs) stdenv fetchurl unzip makeWrapper;
-    inherit (pkgs) freetype fontconfig gtk atk mesa file alsaLib;
-    inherit (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp;
+    inherit (pkgs) freetype fontconfig glib gtk atk mesa file alsaLib;
+    inherit (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp libXtst;
     
     inherit platformTools buildTools support platforms sysimages addons;
     

From 4c77c6e2323dec41cab49e2a9662e9bd748c423b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 7 Aug 2013 22:41:51 +0200
Subject: [PATCH 78/84] makeModulesClosure: Use kmod instead of
 module-init-tools

---
 pkgs/build-support/kernel/modules-closure.nix |  4 ++--
 pkgs/build-support/kernel/modules-closure.sh  | 12 ++++--------
 pkgs/top-level/all-packages.nix               |  5 ++---
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/pkgs/build-support/kernel/modules-closure.nix b/pkgs/build-support/kernel/modules-closure.nix
index cc197edbef19..cad0c7a21f94 100644
--- a/pkgs/build-support/kernel/modules-closure.nix
+++ b/pkgs/build-support/kernel/modules-closure.nix
@@ -4,12 +4,12 @@
 # Also generate an appropriate modules.dep.
 
 { stdenv, kernel, nukeReferences, rootModules
-, module_init_tools, allowMissing ? false }:
+, kmod, allowMissing ? false }:
 
 stdenv.mkDerivation {
   name = kernel.name + "-shrunk";
   builder = ./modules-closure.sh;
   buildInputs = [nukeReferences];
-  inherit kernel rootModules module_init_tools allowMissing;
+  inherit kernel rootModules kmod allowMissing;
   allowedReferences = ["out"];
 }
diff --git a/pkgs/build-support/kernel/modules-closure.sh b/pkgs/build-support/kernel/modules-closure.sh
index aa2615eb578d..d0ac88f69247 100644
--- a/pkgs/build-support/kernel/modules-closure.sh
+++ b/pkgs/build-support/kernel/modules-closure.sh
@@ -2,24 +2,20 @@ source $stdenv/setup
 
 set -o pipefail
 
-PATH=$module_init_tools/sbin:$PATH
+PATH=$kmod/sbin:$PATH
 
 version=$(cd $kernel/lib/modules && ls -d *)
 
 echo "kernel version is $version"
 
-export MODULE_DIR=$(readlink -f $kernel/lib/modules/)
-
 # Determine the dependencies of each root module.
 closure=
 for module in $rootModules; do
     echo "root module: $module"
-    deps=$(modprobe --config /dev/null --set-version "$version" --show-depends "$module" \
+    deps=$(modprobe --config no-config -d $kernel --set-version "$version" --show-depends "$module" \
         | sed 's/^insmod //') \
         || if test -z "$allowMissing"; then exit 1; fi
-    #for i in $deps; do echo $i; done
-    if [[ "$deps" != builtin* ]]
-    then
+    if [[ "$deps" != builtin* ]]; then
         closure="$closure $deps"
     fi
 done
@@ -41,4 +37,4 @@ for module in $closure; do
     echo $target >> $out/insmod-list
 done
 
-MODULE_DIR=$out/lib/modules/ depmod -a $version
+depmod -b $out -a $version
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2565ef2d87dc..8b36b2f1595f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -348,10 +348,9 @@ let
 
   makeWrapper = makeSetupHook { } ../build-support/setup-hooks/make-wrapper.sh;
 
-  makeModulesClosure = {kernel, rootModules, allowMissing ? false}:
+  makeModulesClosure = { kernel, rootModules, allowMissing ? false }:
     import ../build-support/kernel/modules-closure.nix {
-      inherit stdenv module_init_tools kernel nukeReferences
-        rootModules allowMissing;
+      inherit stdenv kmod kernel nukeReferences rootModules allowMissing;
     };
 
   pathsFromGraph = ../build-support/kernel/paths-from-graph.pl;

From 9040af06e3fdd6dd8a4d3833ff8b04e6752b4060 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 7 Aug 2013 10:36:38 +0200
Subject: [PATCH 79/84] nixpart: Add an alias called nixpart0.

The reason behind this is to avoid breaking NixOps while releasing
version 1.0 of nixpart. We could also use nixpart and nixpart1, but the
goal is to have nixpart as a generic part of NixOS instead of being only
used specifically for the Hetzner backend of NixOps.

Which essentially means: The partition syntax will change to be based on
attribute sets and we no longer need to use Kickstart syntax. And that's
the main reason why it will break in version 1.0.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/top-level/python-packages.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 53128c6bb2a8..3dd07824c151 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -68,6 +68,10 @@ pythonPackages = modules // rec {
 
   nixpart = callPackage ../tools/filesystems/nixpart { };
 
+  # This is used for NixOps to make sure we won't break it with the next major
+  # version of nixpart.
+  nixpart0 = nixpart;
+
   pil = import ../development/python-modules/pil {
     inherit (pkgs) fetchurl stdenv libjpeg zlib freetype;
     inherit python buildPythonPackage;

From a1b384783e3d20689a0328fce4f7ae69a35b1090 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 8 Aug 2013 03:14:00 +0200
Subject: [PATCH 80/84] chromium: Fix build for version 28 and NSS 3.15.

Build failure details:

http://hydra.nixos.org/build/5663358

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/networking/browsers/chromium/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 8188d5279a75..d2c48bc5c7c6 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -135,6 +135,9 @@ in stdenv.mkDerivation rec {
     sed -i -e 's|/usr/bin/gcc|gcc|' third_party/WebKit/Source/core/core.gypi
   '' + optionalString useOpenSSL ''
     cat $opensslPatches | patch -p1 -d third_party/openssl/openssl
+  '' + optionalString (versionOlder sourceInfo.version "29.0.0.0") ''
+    sed -i -e '/struct SECItemArray/,/^};/d' \
+      net/third_party/nss/ssl/bodge/secitem_array.c
   '';
 
   gypFlags = mkGypFlags (gypFlagsUseSystemLibs // {

From bccba58c3263248ef2d2289fb102c8d492fecaa6 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 7 Aug 2013 12:32:59 +0200
Subject: [PATCH 81/84] chromium: Update beta channel to v29.0.1547.41.

Builds fine on my machine and tested with a bunch of web sites.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/networking/browsers/chromium/sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix
index c2a5518c6ca5..d99d131def42 100644
--- a/pkgs/applications/networking/browsers/chromium/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/sources.nix
@@ -6,9 +6,9 @@
     sha256 = "16l0gprinxbhdsx67yaq6qwy45018v6vww0hnyji4wdzd5drkf9r";
   };
   beta = {
-    version = "29.0.1547.32";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1547.32.tar.xz";
-    sha256 = "14p5s1xn15mdrlf87hv4y9kczw5r8s461a56kkdzb5xzyq25ph8w";
+    version = "29.0.1547.41";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1547.41.tar.xz";
+    sha256 = "0xb2y7n3qyakg08606zdaw6wf60ypx9p61g56sqhxamgd5byfsg1";
   };
   stable = {
     version = "28.0.1500.95";

From 0e91a58bbe54970eb1b825deaa9de99103405c30 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Thu, 8 Aug 2013 10:40:09 +0200
Subject: [PATCH 82/84] The android GUI does not work if Oracle's JDK is
 installed. This patch forces it to use OpenJDK

---
 pkgs/development/mobile/androidenv/androidsdk.nix | 3 ++-
 pkgs/development/mobile/androidenv/default.nix    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix
index d6c751049d4b..38377cf8bbb4 100644
--- a/pkgs/development/mobile/androidenv/androidsdk.nix
+++ b/pkgs/development/mobile/androidenv/androidsdk.nix
@@ -3,7 +3,7 @@
 , zlib_32bit
 , libX11_32bit, libxcb_32bit, libXau_32bit, libXdmcp_32bit, libXext_32bit, mesa_32bit, alsaLib_32bit
 , libX11, libXext, libXrender, libxcb, libXau, libXdmcp, libXtst, mesa, alsaLib
-, freetype, fontconfig, glib, gtk, atk, file
+, freetype, fontconfig, glib, gtk, atk, file, jdk
 }:
 {platformVersions, abiVersions, useGoogleAPIs}:
 
@@ -62,6 +62,7 @@ stdenv.mkDerivation {
       # The android script used SWT and wants to dynamically load some GTK+ stuff.
       # The following wrapper ensures that they can be found:
       wrapProgram `pwd`/android \
+        --prefix PATH : ${jdk}/bin \
         --prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk}/lib:${libXtst}/lib
     
       # The emulators need additional libraries, which are dynamically loaded => let's wrap them
diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix
index e12f9096994d..3339a065e2ae 100644
--- a/pkgs/development/mobile/androidenv/default.nix
+++ b/pkgs/development/mobile/androidenv/default.nix
@@ -36,7 +36,7 @@ rec {
 
   androidsdk = import ./androidsdk.nix {
     inherit (pkgs) stdenv fetchurl unzip makeWrapper;
-    inherit (pkgs) freetype fontconfig glib gtk atk mesa file alsaLib;
+    inherit (pkgs) freetype fontconfig glib gtk atk mesa file alsaLib jdk;
     inherit (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp libXtst;
     
     inherit platformTools buildTools support platforms sysimages addons;

From 6ad9ad616094132de978cccd79fa9163f5f93ef5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 8 Aug 2013 16:49:26 +0200
Subject: [PATCH 83/84] pgadmin: 1.10.0 -> 1.16.1, add to channel

---
 pkgs/applications/misc/pgadmin/default.nix | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix
index 6d4fa97c8cb7..aac15789a2db 100644
--- a/pkgs/applications/misc/pgadmin/default.nix
+++ b/pkgs/applications/misc/pgadmin/default.nix
@@ -1,18 +1,25 @@
 { stdenv, fetchurl, postgresql, wxGTK, libxml2, libxslt, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "pgadmin3-1.10.0";
+  name = "pgadmin3-${version}";
+  version = "1.16.1";
 
   src = fetchurl {
-    url = "http://ftp3.de.postgresql.org/pub/Mirrors/ftp.postgresql.org/pgadmin3/release/v1.10.0/src/pgadmin3-1.10.0.tar.gz";
-    sha256 = "1ndi951da3jw5800fjdgkbvl8n6k71x7x16ghihi1l88bilf2a16";
+    url = "http://ftp.postgresql.org/pub/pgadmin3/release/v${version}/src/pgadmin3-${version}.tar.gz";
+    sha256 = "13n2nyjnbmjbz9n0xp6627n3pavkqfp4n45l1mnqxhjdq8yj9fnl";
   };
 
   buildInputs = [ postgresql wxGTK libxml2 libxslt openssl ];
 
-  meta = { 
+  preConfigure = ''
+    substituteInPlace pgadmin/ver_svn.sh --replace "bin/bash" "$shell"
+  '';
+
+  meta = with stdenv.lib; { 
     description = "PostgreSQL administration GUI tool";
     homepage = http://www.pgadmin.org;
-    license = "GPL2";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.iElectric ];
+    platforms = platforms.unix;
   };
 }

From 4be1055c40d77a87ebc052b1670c3f15772e5a16 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Fri, 9 Aug 2013 13:37:27 +0200
Subject: [PATCH 84/84] Upgraded nodejs packages

---
 pkgs/top-level/node-packages-generated.nix | 444 +++++++++++----------
 1 file changed, 226 insertions(+), 218 deletions(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index 3751aa6c4d3c..bab2d932a123 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -47,24 +47,24 @@
   {
     name = "amdefine";
     spec = "*";
-    version = "0.0.5";
+    version = "0.0.8";
     topLevel = true;
     dependencies = [
     ];
     patchLatest = false;
-    sha1 = "86b6e9470f8cde955ef7daa3cf5d544ba81aa3db";
-    tarball = "http://registry.npmjs.org/amdefine/-/amdefine-0.0.5.tgz";
+    sha1 = "34dc8c981e6acb3be1853bef8f0ec94a39d55ba0";
+    tarball = "http://registry.npmjs.org/amdefine/-/amdefine-0.0.8.tgz";
   }
   {
     name = "amdefine";
     spec = ">=0.0.4";
-    version = "0.0.5";
+    version = "0.0.8";
     topLevel = false;
     dependencies = [
     ];
     patchLatest = false;
-    sha1 = "86b6e9470f8cde955ef7daa3cf5d544ba81aa3db";
-    tarball = "http://registry.npmjs.org/amdefine/-/amdefine-0.0.5.tgz";
+    sha1 = "34dc8c981e6acb3be1853bef8f0ec94a39d55ba0";
+    tarball = "http://registry.npmjs.org/amdefine/-/amdefine-0.0.8.tgz";
   }
   {
     name = "ansi";
@@ -447,7 +447,7 @@
   {
     name = "browserchannel";
     spec = "*";
-    version = "1.0.4";
+    version = "1.0.5";
     topLevel = true;
     dependencies = [
       { name = "hat"; spec = "*"; }
@@ -455,8 +455,8 @@
       { name = "request"; spec = "~2"; }
     ];
     patchLatest = false;
-    sha1 = "077c1d59d7872d84932172d373c5f8f45698e975";
-    tarball = "http://registry.npmjs.org/browserchannel/-/browserchannel-1.0.4.tgz";
+    sha1 = "e36bc8536cf5a16873087867622cb5028ba33957";
+    tarball = "http://registry.npmjs.org/browserchannel/-/browserchannel-1.0.5.tgz";
   }
   {
     name = "bson";
@@ -471,14 +471,14 @@
   }
   {
     name = "bson";
-    spec = "0.1.9";
-    version = "0.1.9";
+    spec = "0.2.2";
+    version = "0.2.2";
     topLevel = false;
     dependencies = [
     ];
     patchLatest = false;
-    sha1 = "7528f81ed770e6d630ca8c2ccdf5394a4096db14";
-    tarball = "http://registry.npmjs.org/bson/-/bson-0.1.9.tgz";
+    sha1 = "3dbf984acb9d33a6878b46e6fb7afbd611856a60";
+    tarball = "http://registry.npmjs.org/bson/-/bson-0.2.2.tgz";
   }
   {
     name = "buffer-crc32";
@@ -653,14 +653,14 @@
   {
     name = "cli";
     spec = "0.4.x";
-    version = "0.4.4";
+    version = "0.4.5";
     topLevel = false;
     dependencies = [
       { name = "glob"; spec = ">= 3.1.4"; }
     ];
     patchLatest = false;
-    sha1 = "13ceb30872e7c9addc383e5519fb2949ab61ba43";
-    tarball = "http://registry.npmjs.org/cli/-/cli-0.4.4.tgz";
+    sha1 = "78f9485cd161b566e9a6c72d7170c4270e81db61";
+    tarball = "http://registry.npmjs.org/cli/-/cli-0.4.5.tgz";
   }
   {
     name = "cliff";
@@ -1109,14 +1109,26 @@
   {
     name = "couch-login";
     spec = "~0.1.15";
-    version = "0.1.17";
+    version = "0.1.18";
     topLevel = false;
     dependencies = [
-      { name = "request"; spec = "2 >=2.14"; }
+      { name = "request"; spec = "2 >=2.25.0"; }
     ];
     patchLatest = false;
-    sha1 = "ab3ac31dd56e1061ea5f7faa838c7bda32a2b2ed";
-    tarball = "http://registry.npmjs.org/couch-login/-/couch-login-0.1.17.tgz";
+    sha1 = "a69fa40dd43d1f98d97e560f18187a578a116056";
+    tarball = "http://registry.npmjs.org/couch-login/-/couch-login-0.1.18.tgz";
+  }
+  {
+    name = "couch-login";
+    spec = "~0.1.18";
+    version = "0.1.18";
+    topLevel = false;
+    dependencies = [
+      { name = "request"; spec = "2 >=2.25.0"; }
+    ];
+    patchLatest = false;
+    sha1 = "a69fa40dd43d1f98d97e560f18187a578a116056";
+    tarball = "http://registry.npmjs.org/couch-login/-/couch-login-0.1.18.tgz";
   }
   {
     name = "cryptiles";
@@ -1232,6 +1244,17 @@
     sha1 = "056692c86670977f115de82917918b8e8b9a10f0";
     tarball = "http://registry.npmjs.org/debug/-/debug-0.7.2.tgz";
   }
+  {
+    name = "debug";
+    spec = "0.7.0";
+    version = "0.7.0";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "f5be05ec0434c992d79940e50b2695cfb2e01b08";
+    tarball = "http://registry.npmjs.org/debug/-/debug-0.7.0.tgz";
+  }
   {
     name = "debug";
     spec = "~0.7.0";
@@ -1757,20 +1780,6 @@
     sha1 = "c1ad6c6ab837a89fa2d47bb439727ca968235684";
     tarball = "http://registry.npmjs.org/forever-monitor/-/forever-monitor-1.2.2.tgz";
   }
-  {
-    name = "form-data";
-    spec = "0.0.8";
-    version = "0.0.8";
-    topLevel = false;
-    dependencies = [
-      { name = "combined-stream"; spec = "~0.0.4"; }
-      { name = "mime"; spec = "~1.2.2"; }
-      { name = "async"; spec = "~0.2.7"; }
-    ];
-    patchLatest = false;
-    sha1 = "0890cd1005c5ccecc0b9d24a88052c92442d0db5";
-    tarball = "http://registry.npmjs.org/form-data/-/form-data-0.0.8.tgz";
-  }
   {
     name = "form-data";
     spec = "~0.0.3";
@@ -2019,7 +2028,7 @@
   }
   {
     name = "glob";
-    spec = "~3.2.3";
+    spec = "~3.2.6";
     version = "3.2.6";
     topLevel = false;
     dependencies = [
@@ -2161,21 +2170,6 @@
     sha1 = "9b361dee95a931640e6d504e05609a8fc3ac45d2";
     tarball = "http://registry.npmjs.org/hawk/-/hawk-0.10.2.tgz";
   }
-  {
-    name = "hawk";
-    spec = "~0.13.0";
-    version = "0.13.1";
-    topLevel = false;
-    dependencies = [
-      { name = "hoek"; spec = "0.8.x"; }
-      { name = "boom"; spec = "0.4.x"; }
-      { name = "cryptiles"; spec = "0.2.x"; }
-      { name = "sntp"; spec = "0.2.x"; }
-    ];
-    patchLatest = false;
-    sha1 = "3617958821f58311e4d7f6de291fca662b412ef4";
-    tarball = "http://registry.npmjs.org/hawk/-/hawk-0.13.1.tgz";
-  }
   {
     name = "hawk";
     spec = "~1.0.0";
@@ -2214,17 +2208,6 @@
     sha1 = "60fbd904557541cd2b8795abf308a1b3770e155a";
     tarball = "http://registry.npmjs.org/hoek/-/hoek-0.7.6.tgz";
   }
-  {
-    name = "hoek";
-    spec = "0.8.x";
-    version = "0.8.5";
-    topLevel = false;
-    dependencies = [
-    ];
-    patchLatest = false;
-    sha1 = "1e9fd770ef7ebe0274adfcb5b0806a025a5e4e9f";
-    tarball = "http://registry.npmjs.org/hoek/-/hoek-0.8.5.tgz";
-  }
   {
     name = "hoek";
     spec = "0.9.x";
@@ -2313,20 +2296,6 @@
     sha1 = "1494e4f5000a83c0f11bcc12d6007c530cb99582";
     tarball = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz";
   }
-  {
-    name = "http-signature";
-    spec = "~0.9.11";
-    version = "0.9.11";
-    topLevel = false;
-    dependencies = [
-      { name = "assert-plus"; spec = "0.1.2"; }
-      { name = "asn1"; spec = "0.1.11"; }
-      { name = "ctype"; spec = "0.5.2"; }
-    ];
-    patchLatest = false;
-    sha1 = "9e882714572315e6790a5d0a7955efff1f19e653";
-    tarball = "http://registry.npmjs.org/http-signature/-/http-signature-0.9.11.tgz";
-  }
   {
     name = "i";
     spec = "0.3.x";
@@ -2462,8 +2431,8 @@
   }
   {
     name = "init-package-json";
-    spec = "0.0.10";
-    version = "0.0.10";
+    spec = "0.0.11";
+    version = "0.0.11";
     topLevel = false;
     dependencies = [
       { name = "promzard"; spec = "~0.2.0"; }
@@ -2472,22 +2441,34 @@
       { name = "semver"; spec = "2.x"; }
     ];
     patchLatest = false;
-    sha1 = "7baf10535227e0878105a04e44b78f132475da6a";
-    tarball = "http://registry.npmjs.org/init-package-json/-/init-package-json-0.0.10.tgz";
+    sha1 = "71914631d091bb1f73a4bddbe6d7985e929859ce";
+    tarball = "http://registry.npmjs.org/init-package-json/-/init-package-json-0.0.11.tgz";
   }
   {
     name = "ironhorse";
     spec = "*";
-    version = "0.0.5";
+    version = "0.0.6";
     topLevel = true;
     dependencies = [
       { name = "winston"; spec = "*"; }
       { name = "nconf"; spec = "*"; }
       { name = "fs-walk"; spec = "*"; }
+      { name = "async"; spec = "*"; }
+      { name = "express"; spec = "*"; }
+      { name = "jade"; spec = "*"; }
+      { name = "passport"; spec = "*"; }
+      { name = "passport-http"; spec = "*"; }
+      { name = "libyaml"; spec = "*"; }
+      { name = "mongoose"; spec = "*"; }
+      { name = "gridfs-stream"; spec = "*"; }
+      { name = "temp"; spec = "*"; }
+      { name = "kue"; spec = "*"; }
+      { name = "redis"; spec = "*"; }
+      { name = "hiredis"; spec = "*"; }
     ];
     patchLatest = false;
-    sha1 = "d7b15b73e7da814b272e580243cc2239e7b021e6";
-    tarball = "http://registry.npmjs.org/ironhorse/-/ironhorse-0.0.5.tgz";
+    sha1 = "de774f72022630a258158acdcb590e1542a09b58";
+    tarball = "http://registry.npmjs.org/ironhorse/-/ironhorse-0.0.6.tgz";
   }
   {
     name = "is-promise";
@@ -2588,7 +2569,7 @@
   {
     name = "jshint";
     spec = "*";
-    version = "2.1.7";
+    version = "2.1.9";
     topLevel = true;
     dependencies = [
       { name = "shelljs"; spec = "0.1.x"; }
@@ -2598,8 +2579,8 @@
       { name = "console-browserify"; spec = "0.1.x"; }
     ];
     patchLatest = false;
-    sha1 = "11f4214333a0cd2df88057b88c4d751d0c0658a0";
-    tarball = "http://registry.npmjs.org/jshint/-/jshint-2.1.7.tgz";
+    sha1 = "65cdbb2302cbf27e45db0066669b5d5e74f66465";
+    tarball = "http://registry.npmjs.org/jshint/-/jshint-2.1.9.tgz";
   }
   {
     name = "json-schema";
@@ -2623,17 +2604,6 @@
     sha1 = "9db7b0e530c7f289c5e8c8432af191c2ff75a5b3";
     tarball = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-3.0.0.tgz";
   }
-  {
-    name = "json-stringify-safe";
-    spec = "~4.0.0";
-    version = "4.0.0";
-    topLevel = false;
-    dependencies = [
-    ];
-    patchLatest = false;
-    sha1 = "77c271aaea54302e68efeaccb56abbf06a9b1a54";
-    tarball = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-4.0.0.tgz";
-  }
   {
     name = "json-stringify-safe";
     spec = "~5.0.0";
@@ -2642,7 +2612,7 @@
     dependencies = [
     ];
     patchLatest = false;
-    sha1 = "156515f55e62ed4cd912ec13bfc79d5013dfd1e7";
+    sha1 = "4c1f228b5050837eba9d21f50c2e6e320624566e";
     tarball = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz";
   }
   {
@@ -2706,7 +2676,7 @@
   {
     name = "knox";
     spec = "*";
-    version = "0.8.5";
+    version = "0.8.6";
     topLevel = true;
     dependencies = [
       { name = "mime"; spec = "*"; }
@@ -2715,8 +2685,8 @@
       { name = "stream-counter"; spec = "~0.1.0"; }
     ];
     patchLatest = false;
-    sha1 = "86f227fcd22db2b7699106b9b6e5ce29fcbf78de";
-    tarball = "http://registry.npmjs.org/knox/-/knox-0.8.5.tgz";
+    sha1 = "244e7c643c4c9ea2eb37e215dd02b07c8e138e3a";
+    tarball = "http://registry.npmjs.org/knox/-/knox-0.8.6.tgz";
   }
   {
     name = "kue";
@@ -3204,35 +3174,36 @@
   }
   {
     name = "mongodb";
-    spec = "1.3.11";
-    version = "1.3.11";
+    spec = "1.3.15";
+    version = "1.3.15";
     topLevel = false;
     dependencies = [
-      { name = "bson"; spec = "0.1.9"; }
+      { name = "bson"; spec = "0.2.2"; }
       { name = "kerberos"; spec = "0.0.3"; }
     ];
     patchLatest = false;
-    sha1 = "dba6f669dd30612b3d07fc13e2181b9d2b105da2";
-    tarball = "http://registry.npmjs.org/mongodb/-/mongodb-1.3.11.tgz";
+    sha1 = "d612597344b6a1b6d07375698fd7ee06cbaea009";
+    tarball = "http://registry.npmjs.org/mongodb/-/mongodb-1.3.15.tgz";
   }
   {
     name = "mongoose";
     spec = "*";
-    version = "3.6.15";
+    version = "3.7.0";
     topLevel = true;
     dependencies = [
       { name = "hooks"; spec = "0.2.1"; }
-      { name = "mongodb"; spec = "1.3.11"; }
+      { name = "mongodb"; spec = "1.3.15"; }
       { name = "ms"; spec = "0.1.0"; }
-      { name = "sliced"; spec = "0.0.3"; }
+      { name = "sliced"; spec = "0.0.5"; }
       { name = "muri"; spec = "0.3.1"; }
-      { name = "mpromise"; spec = "0.2.1"; }
+      { name = "mpromise"; spec = "0.3.0"; }
       { name = "mpath"; spec = "0.1.1"; }
       { name = "regexp-clone"; spec = "0.0.1"; }
+      { name = "mquery"; spec = "0.2.4"; }
     ];
     patchLatest = false;
-    sha1 = "272f1575da3b48ec31467abdf15baa61854ba5f1";
-    tarball = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.15.tgz";
+    sha1 = "ffad3ac81293bffe5b02f886592685675c7a0d99";
+    tarball = "http://registry.npmjs.org/mongoose/-/mongoose-3.7.0.tgz";
   }
   {
     name = "mongoose";
@@ -3310,6 +3281,32 @@
     sha1 = "fbbdc28cb0207e49b8a4eb1a4c0cea6c2de794c8";
     tarball = "http://registry.npmjs.org/mpromise/-/mpromise-0.2.1.tgz";
   }
+  {
+    name = "mpromise";
+    spec = "0.3.0";
+    version = "0.3.0";
+    topLevel = false;
+    dependencies = [
+      { name = "sliced"; spec = "0.0.5"; }
+    ];
+    patchLatest = false;
+    sha1 = "cb864c2f642eb2192765087e3692e1dc152afe4b";
+    tarball = "http://registry.npmjs.org/mpromise/-/mpromise-0.3.0.tgz";
+  }
+  {
+    name = "mquery";
+    spec = "0.2.4";
+    version = "0.2.4";
+    topLevel = false;
+    dependencies = [
+      { name = "sliced"; spec = "0.0.5"; }
+      { name = "debug"; spec = "0.7.0"; }
+      { name = "regexp-clone"; spec = "0.0.1"; }
+    ];
+    patchLatest = false;
+    sha1 = "5d6e7f7f5129aa334e7e754d3f6a93cf304b7778";
+    tarball = "http://registry.npmjs.org/mquery/-/mquery-0.2.4.tgz";
+  }
   {
     name = "ms";
     spec = "0.1.0";
@@ -3492,7 +3489,7 @@
   {
     name = "node-gyp";
     spec = "*";
-    version = "0.10.6";
+    version = "0.10.9";
     topLevel = true;
     dependencies = [
       { name = "glob"; spec = "3"; }
@@ -3505,18 +3502,18 @@
       { name = "osenv"; spec = "0"; }
       { name = "request"; spec = "2"; }
       { name = "rimraf"; spec = "2"; }
-      { name = "semver"; spec = "~2.0.7"; }
+      { name = "semver"; spec = "~2.1"; }
       { name = "tar"; spec = "0"; }
       { name = "which"; spec = "1"; }
     ];
     patchLatest = false;
-    sha1 = "2b81f9c1b9cd3cc8fd56fe776744814e394d3427";
-    tarball = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.10.6.tgz";
+    sha1 = "de5e20f75ee291975d67c105a5653b981bf8974f";
+    tarball = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.10.9.tgz";
   }
   {
     name = "node-gyp";
-    spec = "~0.10.6";
-    version = "0.10.6";
+    spec = "~0.10.9";
+    version = "0.10.9";
     topLevel = false;
     dependencies = [
       { name = "glob"; spec = "3"; }
@@ -3529,13 +3526,13 @@
       { name = "osenv"; spec = "0"; }
       { name = "request"; spec = "2"; }
       { name = "rimraf"; spec = "2"; }
-      { name = "semver"; spec = "~2.0.7"; }
+      { name = "semver"; spec = "~2.1"; }
       { name = "tar"; spec = "0"; }
       { name = "which"; spec = "1"; }
     ];
     patchLatest = false;
-    sha1 = "2b81f9c1b9cd3cc8fd56fe776744814e394d3427";
-    tarball = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.10.6.tgz";
+    sha1 = "de5e20f75ee291975d67c105a5653b981bf8974f";
+    tarball = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.10.9.tgz";
   }
   {
     name = "node-uptime";
@@ -3634,13 +3631,13 @@
   {
     name = "nodemon";
     spec = "*";
-    version = "0.7.8";
+    version = "0.7.10";
     topLevel = true;
     dependencies = [
     ];
     patchLatest = false;
-    sha1 = "c0667a000f208dbf6a4dad08a5186595a9889590";
-    tarball = "http://registry.npmjs.org/nodemon/-/nodemon-0.7.8.tgz";
+    sha1 = "695a01b9458b115b03bbe01696d361bd50b4fb9b";
+    tarball = "http://registry.npmjs.org/nodemon/-/nodemon-0.7.10.tgz";
   }
   {
     name = "nodeunit";
@@ -3718,10 +3715,10 @@
   {
     name = "npm";
     spec = "*";
-    version = "1.3.6";
+    version = "1.3.7";
     topLevel = true;
     dependencies = [
-      { name = "semver"; spec = "~2.0.8"; }
+      { name = "semver"; spec = "~2.1.0"; }
       { name = "ini"; spec = "~1.1.0"; }
       { name = "slide"; spec = "~1.1.4"; }
       { name = "abbrev"; spec = "~1.0.4"; }
@@ -3729,7 +3726,7 @@
       { name = "minimatch"; spec = "~0.2.12"; }
       { name = "nopt"; spec = "~2.1.2"; }
       { name = "rimraf"; spec = "~2.2.0"; }
-      { name = "request"; spec = "~2.21.0"; }
+      { name = "request"; spec = "~2.25.0"; }
       { name = "which"; spec = "1"; }
       { name = "tar"; spec = "~0.1.18"; }
       { name = "fstream"; spec = "~0.1.23"; }
@@ -3737,18 +3734,18 @@
       { name = "mkdirp"; spec = "~0.3.3"; }
       { name = "read"; spec = "~1.0.4"; }
       { name = "lru-cache"; spec = "~2.3.0"; }
-      { name = "node-gyp"; spec = "~0.10.6"; }
+      { name = "node-gyp"; spec = "~0.10.9"; }
       { name = "fstream-npm"; spec = "~0.1.3"; }
       { name = "uid-number"; spec = "0"; }
       { name = "archy"; spec = "0"; }
       { name = "chownr"; spec = "0"; }
       { name = "npmlog"; spec = "0.0.4"; }
       { name = "ansi"; spec = "~0.1.2"; }
-      { name = "npm-registry-client"; spec = "~0.2.27"; }
+      { name = "npm-registry-client"; spec = "~0.2.28"; }
       { name = "read-package-json"; spec = "~1.1.0"; }
       { name = "read-installed"; spec = "~0.2.2"; }
-      { name = "glob"; spec = "~3.2.3"; }
-      { name = "init-package-json"; spec = "0.0.10"; }
+      { name = "glob"; spec = "~3.2.6"; }
+      { name = "init-package-json"; spec = "0.0.11"; }
       { name = "osenv"; spec = "0"; }
       { name = "lockfile"; spec = "~0.4.0"; }
       { name = "retry"; spec = "~0.6.0"; }
@@ -3763,8 +3760,8 @@
       { name = "npm-user-validate"; spec = "0.0.3"; }
     ];
     patchLatest = false;
-    sha1 = "7c317871955f8427529c78e9b1ec21239dcd222a";
-    tarball = "http://registry.npmjs.org/npm/-/npm-1.3.6.tgz";
+    sha1 = "689bb2093521369ce80ec229fcbbefc32c4bc668";
+    tarball = "http://registry.npmjs.org/npm/-/npm-1.3.7.tgz";
   }
   {
     name = "npm-registry-client";
@@ -3789,24 +3786,24 @@
   }
   {
     name = "npm-registry-client";
-    spec = "~0.2.27";
-    version = "0.2.27";
+    spec = "~0.2.28";
+    version = "0.2.28";
     topLevel = false;
     dependencies = [
-      { name = "request"; spec = "2 >=2.20.0"; }
+      { name = "request"; spec = "2 >=2.25.0"; }
       { name = "graceful-fs"; spec = "~2.0.0"; }
-      { name = "semver"; spec = "~2.0.5"; }
+      { name = "semver"; spec = "~2.1.0"; }
       { name = "slide"; spec = "~1.1.3"; }
       { name = "chownr"; spec = "0"; }
       { name = "mkdirp"; spec = "~0.3.3"; }
       { name = "rimraf"; spec = "~2"; }
       { name = "retry"; spec = "0.6.0"; }
-      { name = "couch-login"; spec = "~0.1.15"; }
+      { name = "couch-login"; spec = "~0.1.18"; }
       { name = "npmlog"; spec = ""; }
     ];
     patchLatest = false;
-    sha1 = "8f338189d32769267886a07ad7b7fd2267446adf";
-    tarball = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.2.27.tgz";
+    sha1 = "959141fc0180d7b1ad089e87015a8a2142a8bffc";
+    tarball = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.2.28.tgz";
   }
   {
     name = "npm-user-validate";
@@ -4543,24 +4540,24 @@
   {
     name = "readable-stream";
     spec = "1.0";
-    version = "1.0.2";
+    version = "1.0.15";
     topLevel = false;
     dependencies = [
     ];
     patchLatest = false;
-    sha1 = "213ce36864fc1f0d4e98e03b9eb92c64042299d4";
-    tarball = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.2.tgz";
+    sha1 = "a2c160237235951da985a1572d0a3af585e4be95";
+    tarball = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.15.tgz";
   }
   {
     name = "readable-stream";
     spec = "~1.0.2";
-    version = "1.0.2";
+    version = "1.0.15";
     topLevel = false;
     dependencies = [
     ];
     patchLatest = false;
-    sha1 = "213ce36864fc1f0d4e98e03b9eb92c64042299d4";
-    tarball = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.2.tgz";
+    sha1 = "a2c160237235951da985a1572d0a3af585e4be95";
+    tarball = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.15.tgz";
   }
   {
     name = "readdirp";
@@ -4646,7 +4643,7 @@
   {
     name = "request";
     spec = "2";
-    version = "2.25.0";
+    version = "2.26.0";
     topLevel = false;
     dependencies = [
       { name = "qs"; spec = "~0.6.0"; }
@@ -4663,36 +4660,13 @@
       { name = "form-data"; spec = "~0.1.0"; }
     ];
     patchLatest = false;
-    sha1 = "dac1673181887fe0b2ce6bd7e12f46d554a02ce9";
-    tarball = "http://registry.npmjs.org/request/-/request-2.25.0.tgz";
-  }
-  {
-    name = "request";
-    spec = "2 >=2.14";
-    version = "2.25.0";
-    topLevel = false;
-    dependencies = [
-      { name = "qs"; spec = "~0.6.0"; }
-      { name = "json-stringify-safe"; spec = "~5.0.0"; }
-      { name = "forever-agent"; spec = "~0.5.0"; }
-      { name = "tunnel-agent"; spec = "~0.3.0"; }
-      { name = "http-signature"; spec = "~0.10.0"; }
-      { name = "hawk"; spec = "~1.0.0"; }
-      { name = "aws-sign"; spec = "~0.3.0"; }
-      { name = "oauth-sign"; spec = "~0.3.0"; }
-      { name = "cookie-jar"; spec = "~0.3.0"; }
-      { name = "node-uuid"; spec = "~1.4.0"; }
-      { name = "mime"; spec = "~1.2.9"; }
-      { name = "form-data"; spec = "~0.1.0"; }
-    ];
-    patchLatest = false;
-    sha1 = "dac1673181887fe0b2ce6bd7e12f46d554a02ce9";
-    tarball = "http://registry.npmjs.org/request/-/request-2.25.0.tgz";
+    sha1 = "79b03075cbac2e22ebe41aa7fca884e869c1c212";
+    tarball = "http://registry.npmjs.org/request/-/request-2.26.0.tgz";
   }
   {
     name = "request";
     spec = "2 >=2.20.0";
-    version = "2.25.0";
+    version = "2.26.0";
     topLevel = false;
     dependencies = [
       { name = "qs"; spec = "~0.6.0"; }
@@ -4709,8 +4683,31 @@
       { name = "form-data"; spec = "~0.1.0"; }
     ];
     patchLatest = false;
-    sha1 = "dac1673181887fe0b2ce6bd7e12f46d554a02ce9";
-    tarball = "http://registry.npmjs.org/request/-/request-2.25.0.tgz";
+    sha1 = "79b03075cbac2e22ebe41aa7fca884e869c1c212";
+    tarball = "http://registry.npmjs.org/request/-/request-2.26.0.tgz";
+  }
+  {
+    name = "request";
+    spec = "2 >=2.25.0";
+    version = "2.26.0";
+    topLevel = false;
+    dependencies = [
+      { name = "qs"; spec = "~0.6.0"; }
+      { name = "json-stringify-safe"; spec = "~5.0.0"; }
+      { name = "forever-agent"; spec = "~0.5.0"; }
+      { name = "tunnel-agent"; spec = "~0.3.0"; }
+      { name = "http-signature"; spec = "~0.10.0"; }
+      { name = "hawk"; spec = "~1.0.0"; }
+      { name = "aws-sign"; spec = "~0.3.0"; }
+      { name = "oauth-sign"; spec = "~0.3.0"; }
+      { name = "cookie-jar"; spec = "~0.3.0"; }
+      { name = "node-uuid"; spec = "~1.4.0"; }
+      { name = "mime"; spec = "~1.2.9"; }
+      { name = "form-data"; spec = "~0.1.0"; }
+    ];
+    patchLatest = false;
+    sha1 = "79b03075cbac2e22ebe41aa7fca884e869c1c212";
+    tarball = "http://registry.npmjs.org/request/-/request-2.26.0.tgz";
   }
   {
     name = "request";
@@ -4748,6 +4745,29 @@
   {
     name = "request";
     spec = "~2";
+    version = "2.26.0";
+    topLevel = false;
+    dependencies = [
+      { name = "qs"; spec = "~0.6.0"; }
+      { name = "json-stringify-safe"; spec = "~5.0.0"; }
+      { name = "forever-agent"; spec = "~0.5.0"; }
+      { name = "tunnel-agent"; spec = "~0.3.0"; }
+      { name = "http-signature"; spec = "~0.10.0"; }
+      { name = "hawk"; spec = "~1.0.0"; }
+      { name = "aws-sign"; spec = "~0.3.0"; }
+      { name = "oauth-sign"; spec = "~0.3.0"; }
+      { name = "cookie-jar"; spec = "~0.3.0"; }
+      { name = "node-uuid"; spec = "~1.4.0"; }
+      { name = "mime"; spec = "~1.2.9"; }
+      { name = "form-data"; spec = "~0.1.0"; }
+    ];
+    patchLatest = false;
+    sha1 = "79b03075cbac2e22ebe41aa7fca884e869c1c212";
+    tarball = "http://registry.npmjs.org/request/-/request-2.26.0.tgz";
+  }
+  {
+    name = "request";
+    spec = "~2.25.0";
     version = "2.25.0";
     topLevel = false;
     dependencies = [
@@ -4768,29 +4788,6 @@
     sha1 = "dac1673181887fe0b2ce6bd7e12f46d554a02ce9";
     tarball = "http://registry.npmjs.org/request/-/request-2.25.0.tgz";
   }
-  {
-    name = "request";
-    spec = "~2.21.0";
-    version = "2.21.0";
-    topLevel = false;
-    dependencies = [
-      { name = "qs"; spec = "~0.6.0"; }
-      { name = "json-stringify-safe"; spec = "~4.0.0"; }
-      { name = "forever-agent"; spec = "~0.5.0"; }
-      { name = "tunnel-agent"; spec = "~0.3.0"; }
-      { name = "http-signature"; spec = "~0.9.11"; }
-      { name = "hawk"; spec = "~0.13.0"; }
-      { name = "aws-sign"; spec = "~0.3.0"; }
-      { name = "oauth-sign"; spec = "~0.3.0"; }
-      { name = "cookie-jar"; spec = "~0.3.0"; }
-      { name = "node-uuid"; spec = "~1.4.0"; }
-      { name = "mime"; spec = "~1.2.9"; }
-      { name = "form-data"; spec = "0.0.8"; }
-    ];
-    patchLatest = false;
-    sha1 = "5728ab9c45e5a87c99daccd530298b6673a868d7";
-    tarball = "http://registry.npmjs.org/request/-/request-2.21.0.tgz";
-  }
   {
     name = "restify";
     spec = "2.4.1";
@@ -4979,7 +4976,7 @@
     dependencies = [
     ];
     patchLatest = false;
-    sha1 = "64d135ad53ae000fef91190177620442bd996e03";
+    sha1 = "356294a90690b698774d62cf35d7c91f983e728a";
     tarball = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz";
   }
   {
@@ -5012,7 +5009,7 @@
     dependencies = [
     ];
     patchLatest = false;
-    sha1 = "64d135ad53ae000fef91190177620442bd996e03";
+    sha1 = "356294a90690b698774d62cf35d7c91f983e728a";
     tarball = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz";
   }
   {
@@ -5023,7 +5020,7 @@
     dependencies = [
     ];
     patchLatest = false;
-    sha1 = "64d135ad53ae000fef91190177620442bd996e03";
+    sha1 = "356294a90690b698774d62cf35d7c91f983e728a";
     tarball = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz";
   }
   {
@@ -5034,7 +5031,7 @@
     dependencies = [
     ];
     patchLatest = false;
-    sha1 = "64d135ad53ae000fef91190177620442bd996e03";
+    sha1 = "356294a90690b698774d62cf35d7c91f983e728a";
     tarball = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz";
   }
   {
@@ -5050,25 +5047,25 @@
   }
   {
     name = "semver";
-    spec = "~2.0.7";
-    version = "2.0.11";
+    spec = "~2.1";
+    version = "2.1.0";
     topLevel = false;
     dependencies = [
     ];
     patchLatest = false;
-    sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced";
-    tarball = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz";
+    sha1 = "356294a90690b698774d62cf35d7c91f983e728a";
+    tarball = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz";
   }
   {
     name = "semver";
-    spec = "~2.0.8";
-    version = "2.0.11";
+    spec = "~2.1.0";
+    version = "2.1.0";
     topLevel = false;
     dependencies = [
     ];
     patchLatest = false;
-    sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced";
-    tarball = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz";
+    sha1 = "356294a90690b698774d62cf35d7c91f983e728a";
+    tarball = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz";
   }
   {
     name = "send";
@@ -5175,15 +5172,15 @@
   {
     name = "simplesmtp";
     spec = ">= 0.1.22";
-    version = "0.3.5";
+    version = "0.3.6";
     topLevel = false;
     dependencies = [
       { name = "rai"; spec = "~0.1"; }
       { name = "xoauth2"; spec = "~0.1"; }
     ];
     patchLatest = false;
-    sha1 = "3f8d43e7885c926037ab3aa5026b563543a67e5b";
-    tarball = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.5.tgz";
+    sha1 = "a6921eb3d38f31f2abd442d0d612ec2d8a1ed08d";
+    tarball = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.6.tgz";
   }
   {
     name = "sliced";
@@ -5207,6 +5204,17 @@
     sha1 = "34f89a6db1f31fa525f5a570f5bcf877cf0955ee";
     tarball = "http://registry.npmjs.org/sliced/-/sliced-0.0.4.tgz";
   }
+  {
+    name = "sliced";
+    spec = "0.0.5";
+    version = "0.0.5";
+    topLevel = false;
+    dependencies = [
+    ];
+    patchLatest = false;
+    sha1 = "5edc044ca4eb6f7816d50ba2fc63e25d8fe4707f";
+    tarball = "http://registry.npmjs.org/sliced/-/sliced-0.0.5.tgz";
+  }
   {
     name = "slide";
     spec = "*";
@@ -5427,7 +5435,7 @@
   {
     name = "stylus";
     spec = "*";
-    version = "0.35.1";
+    version = "0.36.1";
     topLevel = true;
     dependencies = [
       { name = "cssom"; spec = "0.2.x"; }
@@ -5436,8 +5444,8 @@
       { name = "sax"; spec = "0.5.x"; }
     ];
     patchLatest = false;
-    sha1 = "ed4f4cf378c2f883b04633f01e5c76ffe976084f";
-    tarball = "http://registry.npmjs.org/stylus/-/stylus-0.35.1.tgz";
+    sha1 = "64e493933eb5f7347e941b37046f5ba533d3d262";
+    tarball = "http://registry.npmjs.org/stylus/-/stylus-0.36.1.tgz";
   }
   {
     name = "stylus";
@@ -5621,13 +5629,13 @@
   {
     name = "timezone";
     spec = "*";
-    version = "0.0.22";
+    version = "0.0.23";
     topLevel = true;
     dependencies = [
     ];
     patchLatest = false;
-    sha1 = "933c3d1950224957a349183e124147dd99e182f5";
-    tarball = "http://registry.npmjs.org/timezone/-/timezone-0.0.22.tgz";
+    sha1 = "5e89359e0c01c92b495c725e81ecce6ddbdb9bac";
+    tarball = "http://registry.npmjs.org/timezone/-/timezone-0.0.23.tgz";
   }
   {
     name = "tinycolor";