Merge master into stdenv-updates

Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates)
	pkgs/misc/emulators/zsnes/default.nix (more complex, build tested)
	pkgs/top-level/all-packages.nix (auto-solved)

pkgs/development/compilers/elm/elm.nix

@@ -1,18 +1,18 @@
 { cabal, aeson, aesonPretty, binary, blazeHtml, blazeMarkup
 , cmdargs, filepath, HTF, indents, languageEcmascript, mtl, pandoc
-, parsec, text, transformers, unionFind, uniplate
+, parsec, text, transformers, unionFind, unorderedContainers
 }:
 
 cabal.mkDerivation (self: {
   pname = "Elm";
-  version = "0.10.0.2";
-  sha256 = "08aqz9lf754ygdwvjf4bs5ivnjyjx9rd43vrbzp0p4d3if6w6avz";
+  version = "0.10.1";
+  sha256 = "1y533vanhrxc14x304ig6q8ch6zih8yqgpfgw4h5vk5fpdmn09a2";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     aeson aesonPretty binary blazeHtml blazeMarkup cmdargs filepath
     indents languageEcmascript mtl pandoc parsec text transformers
-    unionFind uniplate
+    unionFind unorderedContainers
   ];
   testDepends = [ HTF ];
   doCheck = false;

pkgs/development/compilers/jdk/jdk7-linux.nix

@@ -29,10 +29,10 @@ let
       requireFile {
         name = "UnlimitedJCEPolicyJDK7.zip";
         url = http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html;
-        sha256 = "0qljzfxbikm8br5k7rkamibp1vkyjrf6blbxpx6hn4k46f62bhnh";
+        sha256 = "7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d";
       }
     else
-      null;
+      "";
 in
 
 stdenv.mkDerivation {
@@ -93,12 +93,13 @@ stdenv.mkDerivation {
       jrePath=$out/jre
     fi
 
-    if test -n "$jce"; then
-      unzip $jce
-      cp -v jce/*.jar $jrePath/lib/security
+    if test -n "${jce}"; then
+      unzip ${jce}
+      cp -v UnlimitedJCEPolicy/*.jar $jrePath/lib/security
     fi
 
     rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}/jli
+    rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}
 
     # set all the dynamic linkers
     find $out -type f -perm +100 \

pkgs/development/compilers/nasm/default.nix

@@ -11,5 +11,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.nasm.us/;
     description = "An 80x86 and x86-64 assembler designed for portability and modularity";
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/development/compilers/sbcl/default.nix

@@ -4,11 +4,11 @@ let
   s= # Generated upstream information
   rec {
     baseName="sbcl";
-    version="1.1.13";
+    version="1.1.14";
     name="${baseName}-${version}";
-    hash="1f4abgzfvb0f006vbykahqg7a11d6afnjrw332r54gj8753qj7x0";
-    url="mirror://sourceforge/project/sbcl/sbcl/1.1.13/sbcl-1.1.13-source.tar.bz2";
-    sha256="1f4abgzfvb0f006vbykahqg7a11d6afnjrw332r54gj8753qj7x0";
+    hash="0vqsq6q4xvz7vn1akvjwxp406mysak4h955pp8x32dfqc6ina7k7";
+    url="mirror://sourceforge/project/sbcl/sbcl/1.1.14/sbcl-1.1.14-source.tar.bz2";
+    sha256="0vqsq6q4xvz7vn1akvjwxp406mysak4h955pp8x32dfqc6ina7k7";
   };
   buildInputs = with a; [
     clisp makeWrapper

pkgs/development/compilers/sbcl/newglibc.patch

@@ -1,43 +0,0 @@
-Fixes for glibc 2.17.
-
-linux-os.c is just a missing header (for personality()).
-
-In x86-64-linux-os.c, __USE_GNU is a glibc-internal name that features.h
-defines; _GNU_SOURCE is what it should actually be using to get GNU extensions.
-
-diff -x config.log -x config.status -ru tmp/sbcl-1.1.2/src/runtime/linux-os.c work/sbcl-1.1.2/src/runtime/linux-os.c
---- tmp/sbcl-1.1.2/src/runtime/linux-os.c	2012-12-01 11:32:38.000000000 +0000
-+++ work/sbcl-1.1.2/src/runtime/linux-os.c	2012-12-31 01:20:37.619000000 +0000
-@@ -46,6 +46,7 @@
- #include <sys/stat.h>
- #include <unistd.h>
- #include <linux/version.h>
-+#include <sys/personality.h>
- 
- #include "validate.h"
- #include "thread.h"
-diff -x config.log -x config.status -ru tmp/sbcl-1.1.2/src/runtime/x86-64-linux-os.c work/sbcl-1.1.2/src/runtime/x86-64-linux-os.c
---- tmp/sbcl-1.1.2/src/runtime/x86-64-linux-os.c	2012-12-01 11:32:38.000000000 +0000
-+++ work/sbcl-1.1.2/src/runtime/x86-64-linux-os.c	2012-12-31 01:20:25.450000000 +0000
-@@ -14,6 +14,9 @@
-  * files for more information.
-  */
- 
-+/* This is to get REG_RAX etc. from sys/ucontext.h. */
-+#define _GNU_SOURCE
-+
- #include <stdio.h>
- #include <stddef.h>
- #include <sys/param.h>
-@@ -21,11 +24,7 @@
- #include <sys/types.h>
- #include <unistd.h>
- #include <errno.h>
--
--#define __USE_GNU
- #include <sys/ucontext.h>
--#undef __USE_GNU
--
- 
- #include "./signal.h"
- #include "os.h"

pkgs/development/compilers/sdcc/default.nix

@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
     homepage = http://sdcc.sourceforge.net/;
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainers = [maintainers.bjornfor];
+    maintainers = [ maintainers.bjornfor ];
   };
 }

pkgs/development/compilers/yasm/default.nix

@@ -12,5 +12,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.tortall.net/projects/yasm/;
     description = "Complete rewrite of the NASM assembler";
     license = "BSD";
+    platforms = stdenv.lib.platforms.linux;
   };
 }