Merge branch 'master' into x-updates

pkgs/development/compilers/avra/default.nix

@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, autoconf, automake }:
+stdenv.mkDerivation rec {
+  name = "avra-1.3.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/avra/${name}.tar.bz2";
+    sha256 = "04lp0k0h540l5pmnaai07637f0p4zi766v6sfm7cryfaca3byb56";
+  };
+
+  buildInputs = [ autoconf automake ];
+
+  preConfigure = ''
+    cd src/
+
+    aclocal
+    autoconf
+
+    touch NEWS README AUTHORS ChangeLog
+    automake -a
+  '';
+
+  meta = {
+    description = "Assember for the Atmel AVR microcontroller family";
+    homepage = http://avra.sourceforge.net/;
+    license = stdenv.lib.licenses.gpl2Plus;
+    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
+  };
+}

pkgs/development/compilers/elm/elm-server.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "elm-server";
-  version = "0.8";
-  sha256 = "0mnxayfg54f5mr27sd1zw3xrdijppgvrz2yzzmhp07qc1jiyfald";
+  version = "0.9.0.2";
+  sha256 = "0g362llb7jkwz8xhyhhsc8hz0vj7s7bgfz1az5qfh1cm4h8nynwr";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [

pkgs/development/compilers/elm/elm.nix

@@ -1,18 +1,18 @@
-{ cabal, blazeHtml, blazeMarkup, cmdargs, deepseq, filepath, hjsmin
-, indents, json, mtl, pandoc, parsec, shakespeare, text
-, transformers
+{ cabal, binary, blazeHtml, blazeMarkup, cmdargs, filepath, hjsmin
+, indents, mtl, pandoc, parsec, transformers, unionFind, uniplate
 }:
 
 cabal.mkDerivation (self: {
   pname = "Elm";
-  version = "0.8.0.3";
-  sha256 = "0zai8glmkiqramivgz405zh385cz166gpry2yl29g37dxpwxffzb";
+  version = "0.9.0.2";
+  sha256 = "0yr395wsj0spi6h9d6lm5hvdryybpf8i1qpv4gz9dk0bwlyc8iwh";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    blazeHtml blazeMarkup cmdargs deepseq filepath hjsmin indents json
-    mtl pandoc parsec shakespeare text transformers
+    binary blazeHtml blazeMarkup cmdargs filepath hjsmin indents mtl
+    pandoc parsec transformers unionFind uniplate
   ];
+  doCheck = false;
   meta = {
     homepage = "http://elm-lang.org";
     description = "The Elm language module";

pkgs/development/compilers/gcc/4.3/default.nix

@@ -135,7 +135,7 @@ stdenv.mkDerivation ({
     homepage = "http://gcc.gnu.org/";
     license = "GPL/LGPL";
     description = "GNU Compiler Collection, 4.3.x";
-    maintainers = with stdenv.lib.maintainers; [viric ludo];
+    maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux;
   };
 

pkgs/development/compilers/ghc/head.nix

@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ghc, perl, gmp, ncurses }:
 
 stdenv.mkDerivation rec {
-  version = "7.7";
+  version = "7.7.20130816";
   name = "ghc-${version}";
 
   src = fetchurl {
-    url = "http://haskell.org/ghc/dist/current/dist/${name}-src.tar.bz2";
-    sha256 = "1f4grj1lw25vb5drn4sn8fc1as3hwhk8dl659spi5fnbrs5k4wgb";
+    url = "http://darcs.haskell.org/ghcBuilder/uploads/tn23/${name}-src.tar.bz2";
+    sha256 = "0w636gfjn3xigrlj31z4hy9kv44svyifsqcshrq95qxijx396j5m";
   };
 
   buildInputs = [ ghc perl gmp ncurses ];
@@ -19,24 +19,16 @@ stdenv.mkDerivation rec {
     DYNAMIC_BY_DEFAULT = NO
   '';
 
-  # The tarball errorneously contains an executable that doesn't work in
-  # Nix. Deleting it will cause the program to be re-built locally.
-  postUnpack = ''
-    rm -v $sourceRoot/libraries/integer-gmp/cbits/mkGmpDerivedConstants
-  '';
-
   preConfigure = ''
     echo "${buildMK}" > mk/build.mk
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
   '';
 
-  configureFlags=[
-    "--with-gcc=${stdenv.gcc}/bin/gcc"
-  ];
+  configureFlags = "--with-gcc=${stdenv.gcc}/bin/gcc";
 
   # required, because otherwise all symbols from HSffi.o are stripped, and
   # that in turn causes GHCi to abort
-  stripDebugFlags=["-S" "--keep-file-symbols"];
+  stripDebugFlags = [ "-S" "--keep-file-symbols" ];
 
   meta = {
     homepage = "http://haskell.org/ghc";

pkgs/development/compilers/ghc/with-packages.nix

@@ -76,6 +76,11 @@ stdenv.mkDerivation rec {
           ln -s $f $out/share/emacs/site-lisp/
           echo -n .
         done
+        for f in "$currentPath/share/ghci/"*; do
+          mkdir -p $out/share/ghci
+          ln -s $f $out/share/ghci/
+          echo -n .
+        done
         for f in "$currentPkgDir/"*.conf; do
           ln -s $f $linkedPkgDir
           echo -n .

pkgs/development/compilers/orc/default.nix

@@ -0,0 +1,20 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "orc-0.4.17";
+
+  src = fetchurl {
+    url = "http://code.entropywave.com/download/orc/${name}.tar.gz";
+    sha256 = "1s6psp8phrd1jmxz9j01cksh3q5xrm1bd3z7zqxg5zsrijjcrisg";
+  };
+
+  meta = {
+    description = "The Oil Runtime Compiler";
+    homepage = "http://code.entropywave.com/orc/";
+    # The source code implementing the Marsenne Twister algorithm is licensed
+    # under the 3-clause BSD license. The rest is 2-clause BSD license.
+    license = stdenv.lib.licenses.bsd3;
+    platform = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.iyzsong ];
+  };
+}

pkgs/development/compilers/stalin/default.nix

@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     license = "GPLv2+";
     description = "Stalin, an optimizing Scheme compiler";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
   };
 }

pkgs/development/compilers/tinycc/default.nix

@@ -58,6 +58,6 @@ stdenv.mkDerivation rec {
     license = "LGPLv2+";
 
     platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }