Merge branch 'master' into staging

2015-06-01 11:00:51 +02:00
parent 867d2c5c46 5afa4f18d6
commit dc3316268e
115 changed files with 2064 additions and 1025 deletions
@@ -46,7 +46,8 @@ rec {
    sendEmailSupport = !stdenv.isDarwin;
  };

-  gitAnnex = pkgs.haskell-ng.packages.ghc784.git-annex;
+  inherit (pkgs.haskellPackages) git-annex;
+  gitAnnex = git-annex;

  qgit = import ./qgit {
    inherit fetchurl stdenv;