Merge branch 'master' into x-updates

Silently merged badly the firefox 20/21 things. I got that, hopefully
there aren't more (my nixos-rebuild dry-run finds no more errors).

pkgs/development/compilers/idris/default.nix

@@ -0,0 +1,23 @@
+{ cabal, binary, Cabal, filepath, gmp, happy, haskeline
+, languageJava, libffi, mtl, parsec, split, text, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "idris";
+  version = "0.9.8";
+  sha256 = "1mxc6mic3d508ni9pqxw8q31f27shyaxs1rchfl2jg58i9w6iy7h";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [
+    binary Cabal filepath haskeline languageJava libffi mtl parsec
+    split text transformers
+  ];
+  buildTools = [ happy ];
+  extraLibraries = [ gmp ];
+  meta = {
+    homepage = "http://www.idris-lang.org/";
+    description = "Functional Programming Language with Dependent Types";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/compilers/mentor/default.nix

@@ -37,6 +37,11 @@ let
               *gdb) patchelf --set-rpath "${ncurses}/lib" "$file";;
             esac
         done
+
+        # Manpages
+        mkdir -p "$out/share/man"
+        ln -s "$out"/share/doc/*/man/man1 "$out/share/man/man1"
+        ln -s "$out"/share/doc/*/man/man7 "$out/share/man/man7"
       '';
 
       meta = with stdenv.lib; {