Merge branch 'master' into x-updates

Conflicts (a little tricky, I did some cleanup of interacting changes):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/libpng/default.nix
	pkgs/tools/package-management/nixops/default.nix
	pkgs/top-level/all-packages.nix

pkgs/development/compilers/aldor/default.nix

@@ -0,0 +1,51 @@
+{ fetchgit, stdenv, gmp, which, flex, bison, makeWrapper
+, autoconf, automake, libtool, openjdk, perl }:
+
+stdenv.mkDerivation {
+  name = "aldor-1.1.0";
+
+  src = fetchgit {
+    url = "https://github.com/pippijn/aldor";
+    sha256 = "14xv3jl15ib2knsdz0bd7jx64zg1qrr33q5zcr8gli860ps8gkg3";
+    rev = "f7b95835cf709654744441ddb1c515bfc2bec998";
+  };
+
+  buildInputs = [ gmp which flex bison makeWrapper autoconf automake libtool
+                  openjdk perl ];
+
+  preConfigure = ''
+    cd aldor ;
+    ./autogen.sh ;
+  '';
+
+  postInstall = ''
+    for prog in aldor unicl javagen ;
+    do
+      wrapProgram $out/bin/$prog --set ALDORROOT $out \
+        --prefix PATH : ${openjdk}/bin \
+        --prefix PATH : ${stdenv.gcc}/bin ;
+    done
+  '';
+
+  meta = {
+    homepage = "http://www.aldor.org/";
+    description = "Aldor is a programming language with an expressive type system";
+    license = stdenv.lib.licenses.asl20;
+
+    longDescription = ''
+      Aldor is a programming language with an expressive type system well-suited
+      for mathematical computing and which has been used to develop a number of
+      computer algebra libraries. Originally known as A#, Aldor was conceived as
+      an extension language for the Axiom system, but is now used more in other settings.
+      In Aldor, types and functions are first class values that can be constructed
+      and manipulated within programs. Pervasive support for dependent types allows
+      static checking of dynamic objects. What does this mean for a normal user? Aldor
+      solves many difficulties encountered in widely-used object-oriented programming
+      languages. It allows programs to use a natural style, combining the more attractive
+      and powerful properties of functional, object-oriented and aspect-oriented styles.
+    '';
+
+    maintainers = [ stdenv.lib.maintainers.simons ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}

pkgs/development/compilers/closure/default.nix

@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, jre, gnutar, bash }:
+
+stdenv.mkDerivation rec {
+  name = "closure-compiler-${version}";
+  version = "20130603";
+
+  src = fetchurl {
+    url = "http://dl.google.com/closure-compiler/compiler-${version}.tar.gz";
+    sha256 = "0bk0s8p9r9an5m0l8y23wjlx490k15i4zah0a384a2akzji8y095";
+  };
+
+  phases = [ "installPhase" ];
+
+  buildInputs = [ gnutar ];
+
+  installPhase = ''
+    mkdir -p $out/lib/java $out/bin
+    tar -xzf $src
+    cp -r compiler.jar $out/lib/java/
+    echo "#!${bash}/bin/bash" > $out/bin/closure-compiler
+    echo "${jre}/bin/java -jar $out/lib/java/compiler.jar \"\$@\"" >> $out/bin/closure-compiler
+    chmod +x $out/bin/closure-compiler
+  '';
+
+  meta = {
+    description = "A tool for making JavaScript download and run faster";
+    homepage = https://developers.google.com/closure/compiler/;
+    license = stdenv.lib.licenses.asl20;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}

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

@@ -0,0 +1,22 @@
+{ cabal, blazeHtml, deepseq, Elm, filepath, happstackServer, HTTP
+, mtl, parsec, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "elm-server";
+  version = "0.8";
+  sha256 = "0mnxayfg54f5mr27sd1zw3xrdijppgvrz2yzzmhp07qc1jiyfald";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [
+    blazeHtml deepseq Elm filepath happstackServer HTTP mtl parsec
+    transformers
+  ];
+  jailbreak = true;
+  meta = {
+    homepage = "http://elm-lang.org";
+    description = "The Elm language server";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/compilers/elm/elm.nix

@@ -0,0 +1,22 @@
+{ cabal, blazeHtml, blazeMarkup, cmdargs, deepseq, filepath, hjsmin
+, indents, json, mtl, pandoc, parsec, shakespeare, text
+, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "Elm";
+  version = "0.8.0.3";
+  sha256 = "0zai8glmkiqramivgz405zh385cz166gpry2yl29g37dxpwxffzb";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    blazeHtml blazeMarkup cmdargs deepseq filepath hjsmin indents json
+    mtl pandoc parsec shakespeare text transformers
+  ];
+  meta = {
+    homepage = "http://elm-lang.org";
+    description = "The Elm language module";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/compilers/fpc/default.nix

@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   name = "fpc-${version}";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/sourceforge/freepascal/Source/${version}/fpcbuild-${version}.tar.gz";
+    url = "mirror://sourceforge/freepascal/fpcbuild-${version}.tar.gz";
     sha256 = "1vxy2y8pm0ribhpdhqlwwz696ncnz4rk2dafbn1mjgipm97qb26p";
   };
 

pkgs/development/compilers/ghc/6.4.2-binary.nix

@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   src =
     if stdenv.system == "i686-linux" then
       fetchurl {
-        url = http://nixos.org/tarballs/ghc-6.4.2-i386-unknown-linux.tar.bz2;
+        url = http://tarballs.nixos.org/ghc-6.4.2-i386-unknown-linux.tar.bz2;
         md5 = "092fe2e25dab22b926babe97cc77db1f";
       }
     else if stdenv.system == "x86_64-linux" then

pkgs/development/compilers/go/1.1.nix

@@ -7,11 +7,11 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "go-1.1";
+  name = "go-1.1.1";
 
   src = fetchurl {
-    url = http://go.googlecode.com/files/go1.1.src.tar.gz;
-    sha1 = "a464704ebbbdd552a39b5f9429b059c117d165b3";
+    url = http://go.googlecode.com/files/go1.1.1.src.tar.gz;
+    sha1 = "f365aed8183e487a48a66ace7bf36e5974dffbb3";
   };
 
   buildInputs = [ bison glibc bash makeWrapper ];

pkgs/development/compilers/lessc/default.nix

@@ -0,0 +1,28 @@
+{ stdenv, fetchgit, nodejs }:
+
+stdenv.mkDerivation rec {
+  name = "lessc-${version}";
+  version = "1.4.0";
+
+  src = fetchgit {
+    url = https://github.com/less/less.js.git;
+    rev = "refs/tags/v${version}";
+    sha256 = "12nzaz7v1bnqzylh4zm1srrj7w7f45fqj4sihxyg0bknfvfwdc56";
+  };
+
+  phases = [ "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/bin $out/lib
+    cp -r $src/bin/* $out/bin/
+    cp -r $src/lib/* $out/lib/
+    substituteInPlace $out/bin/lessc --replace "/usr/bin/env node" ${nodejs}/bin/node
+  '';
+
+  meta = {
+    description = "LESS to CSS compiler";
+    homepage = http://lesscss.org/;
+    license = stdenv.lib.licenses.asl20;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}

pkgs/development/compilers/llvm/default.nix

@@ -17,20 +17,22 @@ stdenv.mkDerivation {
   # unless something needs it just an input is fine.
   buildInputs = [ perl groff cmake python libffi ]; # ToDo: polly, libc++; enable cxx11?
 
-  # created binaries need to be run before installation... I coudn't find a better way
-  preBuild = ''export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:"`pwd`/lib'';
+  # hacky fix: created binaries need to be run before installation
+  preBuild = let LD = if stdenv.isDarwin then "DYLD" else "LD";
+    in "export ${LD}_LIBRARY_PATH='$$${LD}_LIBRARY_PATH:'`pwd`/lib";
 
-  cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DBUILD_SHARED_LIBS=ON" "-DLLVM_ENABLE_FFI=ON" ];
+  cmakeFlags = with stdenv; [ "-DCMAKE_BUILD_TYPE=Release" "-DLLVM_ENABLE_FFI=ON" ]
+    ++ lib.optional (!isDarwin) [ "-DBUILD_SHARED_LIBS=ON" ];
 
   enableParallelBuilding = true;
 
   doCheck = true;
 
-  meta = {
-    homepage = http://llvm.org/;
+  meta = with stdenv.lib; {
     description = "Collection of modular and reusable compiler and toolchain technologies";
-    license = "BSD";
-    maintainers = with stdenv.lib.maintainers; [viric shlevy raskin];
-    platforms = with stdenv.lib.platforms; all;
+    homepage    = http://llvm.org/;
+    license     = licenses.bsd3;
+    maintainers = with maintainers; [ lovek323 raskin shlevy viric ];
+    platforms   = platforms.all;
   };
 }

pkgs/development/compilers/ocaml/3.08.0.nix

@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "ocaml-3.08.0";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nixos.org/tarballs/ocaml-3.08.0.tar.gz;
+    url = http://tarballs.nixos.org/ocaml-3.08.0.tar.gz;
     md5 = "c6ef478362295c150101cdd2efcd38e0";
   };
   configureScript = ./configure-3.08.0;

pkgs/development/compilers/openjdk/bootstrap.nix

@@ -4,12 +4,12 @@ let
   # !!! These should be on nixos.org
   src = if glibc.system == "x86_64-linux" then
     fetchurl {
-      url = http://nixos.org/tarballs/openjdk-bootstrap-x86_64-linux-2012-08-24.tar.xz;
+      url = http://tarballs.nixos.org/openjdk-bootstrap-x86_64-linux-2012-08-24.tar.xz;
       sha256 = "0gla9dxrfq2w1hvgsnn8jg8a60k27im6z43a6iidi0qmwa0wah32";
     }
   else if glibc.system == "i686-linux" then
     fetchurl {
-      url = http://nixos.org/tarballs/openjdk-bootstrap-i686-linux-2012-08-24.tar.xz;
+      url = http://tarballs.nixos.org/openjdk-bootstrap-i686-linux-2012-08-24.tar.xz;
       sha256 = "184wq212bycwbbq4ix8cc6jwjxkrqw9b01zb86q95kqpa8zy5206";
     }
   else throw "No bootstrap for system";

pkgs/development/compilers/qcmm/default.nix

@@ -2,7 +2,7 @@
 stdenv.mkDerivation {
   name = "qcmm-2006-01-31";
   src = fetchurl {
-    url = http://nixos.org/tarballs/qc--20060131.tar.gz;
+    url = http://tarballs.nixos.org/qc--20060131.tar.gz;
     md5 = "9097830775bcf22c9bad54f389f5db23";
   };
   buildInputs = [ mk ocaml noweb groff ];

pkgs/development/compilers/strategoxt/0.17.nix

@@ -82,7 +82,7 @@ rec {
 
 
   dryad = stdenv.mkDerivation rec {
-    name = "dryad-0.2pre1835518355";
+    name = "dryad-0.2pre18355";
 
     src = fetchurl {
       url = "http://releases.strategoxt.org/dryad/${name}-zbqfh1rm/dryad-0.2pre18355.tar.gz";

pkgs/development/compilers/strategoxt/0.18.nix

@@ -59,7 +59,7 @@ rec {
   };
 
   javafront = stdenv.mkDerivation (rec {
-    name = "java-front-0.9.1";
+    name = "java-front-0.9.1pre20122";
 
     src = fetchurl {
       url = "http://hydra.nixos.org/build/766286/download/1/java-front-0.9.1pre20122.tar.gz";
@@ -92,7 +92,7 @@ rec {
   } // ( if stdenv.system == "i686-cygwin" then { CFLAGS = "-O2"; } else {} ) ) ;
 
   dryad = stdenv.mkDerivation rec {
-    name = "dryad-0.2pre1835518355";
+    name = "dryad-0.2pre18355";
 
     src = fetchurl {
       url = "http://releases.strategoxt.org/dryad/${name}-zbqfh1rm/dryad-0.2pre18355.tar.gz";

pkgs/development/compilers/yap/default.nix

@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "yap-5.1.1";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/yap/Yap-5.1.1.tar.gz";
+    url = "mirror://sourceforge/yap/Yap-5.1.1.tar.gz";
     sha256 = "0bajxmlla9gay4m4l7y7x6qldxzi0jcq2ykgpjk9liky7g5kbnya";
   };