Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby

Conflicts:
	pkgs/applications/version-management/git-and-tools/default.nix
	pkgs/applications/version-management/git-and-tools/hub/default.nix
	pkgs/tools/audio/mpdcron/default.nix

10 files changed, 71 insertions, 51 deletions

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 2ea93ebb2bf..891c947e85b 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -73,8 +73,8 @@ rec {
   };
 
   hub = import ./hub {
-    inherit buildRubyGem;
-    inherit stdenv fetchurl groff makeWrapper;
+    inherit go;
+    inherit stdenv fetchgit;
   };
 
   gitFastExport = import ./fast-export {
diff --git a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix
index 562917ec073..5bd6995d204 100644
--- a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix
@@ -1,12 +1,13 @@
 {stdenv, fetchgit, mercurial, coreutils, git, makeWrapper, subversion}:
 
+with stdenv.lib;
 stdenv.mkDerivation {
   name = "fast-export";
 
   src = fetchgit {
-    url = "git://repo.or.cz/fast-export.git";
-    rev = "aaccfba";
-    sha256 = "c9d1498e31d32b8271c1e651175794718611f93b4843dea569d831005de0a750";
+    url = git://repo.or.cz/fast-export.git;
+    rev = "d202200fd9daa75cdb37d4cf067d4ca00e269535";
+    sha256 = "1ci0jbprs7hqqzq4mqi5b9vlc43lmk2bn2kjx49bdjkqajvlicd7";
   };
 
   buildInputs = [mercurial.python mercurial makeWrapper subversion];
@@ -30,10 +31,10 @@ stdenv.mkDerivation {
     done
   '';
 
-  # usage:
   meta = {
-      description = "import svn, mercurial into git";
-      homepage = "http://repo.or.cz/w/fast-export.git";
-      license = stdenv.lib.licenses.gpl2;
+    description = "Import svn, mercurial into git";
+    homepage = http://repo.or.cz/w/fast-export.git;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.koral ];
   };
 }
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
index 3982eff71b5..d4d627d6154 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
@@ -18,8 +18,8 @@
 
 cabal.mkDerivation (self: {
   pname = "git-annex";
-  version = "5.20141219";
-  sha256 = "1qxvsvys5hrpc5sm6s2ygr7hyrgfjc4qaycp1b0kkwjj4bl4cbvz";
+  version = "5.20141231";
+  sha256 = "0rrwaclc3mpn39087fs5pgn0axjp5mki0nhj9a3fjjchdwd8wzyf";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix
index 4c4ff62901e..4015867b0eb 100644
--- a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
       git-bz is a tool for integrating the Git command line with the
       Bugzilla bug-tracking system. Operations such as attaching patches to
       bugs, applying patches in bugs to your current tree, and closing bugs
-      once you've pushed the fixes publically can be done completely from
+      once you've pushed the fixes publicly can be done completely from
       the command line without having to go to your web browser.
 
       Authentication for git-bz is done by reading the cookies for the
diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
index ffeb299f49b..a60d7d2a49b 100644
--- a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
@@ -3,14 +3,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  rev = "185852eac44c25ae2e8d3b3fb6c9630e754e6363";
-  version = "v0.2-185852eac44c25ae2e8d3b3fb6c9630e754e6363";
+  rev = "e716a9e1a9e460a45663694ba4e9e8894a8452b2";
+  version = "v0.2-e716a9e1a9e460a45663694ba4e9e8894a8452b2";
   name = "git-remote-hg-${version}";
 
   src = fetchgit {
     inherit rev;
-    url = "git://github.com/felipec/git-remote-hg.git";
-    sha256 = "1hc65nvxq7if1imwffyxia0i6vnkbax09gfcl9vq9yffzi8xzzfy";
+    url = "git://github.com/fingolfin/git-remote-hg.git";
+    sha256 = "7c61c8f2be47d96c4244f0f8a3c8f9b994994b15dbe1754581f746888d705463";
   };
 
   buildInputs = [ mercurial.python mercurial makeWrapper
diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix
index abb2db5f1a7..be53a429e7b 100644
--- a/pkgs/applications/version-management/git-and-tools/hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix
@@ -1,32 +1,46 @@
-{ stdenv, fetchurl, groff, buildRubyGem, makeWrapper }:
+{ stdenv, fetchgit, go }:
 
-let rake = buildRubyGem {
-  name = "rake-10.3.2";
-  sha256 = "0nvpkjrpsk8xxnij2wd1cdn6arja9q11sxx4aq4fz18bc6fss15m";
-}; in
 stdenv.mkDerivation rec {
   name = "hub-${version}";
-  version = "1.12.2";
+  version = "2.2.0-rc1";
 
-  src = fetchurl {
-    url = "https://github.com/github/hub/archive/v${version}.tar.gz";
-    sha256 = "112yfv9xklsmwv859kypv7hz0a6dj5hkrmjp7z1h40nrljc9mi79";
+  src = fetchgit {
+    url = https://github.com/github/hub.git;
+    rev = "refs/tags/v${version}";
+    sha256 = "1f6r8vlwnmqmr85drfv24vhqx1aacz6s83c2i804v9997n0wrwfm";
   };
 
-  buildInputs = [ rake makeWrapper ];
+  buildInputs = [ go ];
 
-  installPhase = ''
-    rake install "prefix=$out"
+  phases = [ "unpackPhase" "buildPhase" "installPhase" ];
+
+  buildPhase = ''
+    sh script/build
   '';
 
-  fixupPhase = ''
-    wrapProgram $out/bin/hub --prefix PATH : ${groff}/bin
+  installPhase = ''
+    mkdir -p "$out/bin"
+    cp hub "$out/bin/"
+
+    mkdir -p "$out/share/man/man1"
+    cp "man/hub.1" "$out/share/man/man1/"
+
+    mkdir -p "$out/share/zsh/site-functions"
+    cp "etc/hub.zsh_completion" "$out/share/zsh/site-functions/_hub"
+
+# Broken: https://github.com/github/hub/issues/592
+#    mkdir -p "$out/etc/bash_completion.d"
+#    cp "etc/hub.bash_completion.sh" "$out/etc/bash_completion.d/"
+
+# Should we also install provided git-hooks?
+# ?
   '';
 
-  meta = {
-    description = "A GitHub specific wrapper for git";
-    homepage = "http://defunkt.io/hub/";
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
+  meta = with stdenv.lib; {
+    description = "Command-line wrapper for git that makes you better at GitHub";
+
+    license = licenses.mit;
+    homepage = https://hub.github.com/;
+    maintainers = with maintainers; [ the-kenny ];
   };
 }
diff --git a/pkgs/applications/version-management/git-and-tools/topgit/default.nix b/pkgs/applications/version-management/git-and-tools/topgit/default.nix
index 195f6f3a463..6ffcad27dc7 100644
--- a/pkgs/applications/version-management/git-and-tools/topgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/topgit/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
     description = "TopGit manages large amount of interdependent topic branches";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ marcweber ludo simons ];
+    maintainers = with stdenv.lib.maintainers; [ marcweber simons ];
   };
 }
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 8cb34a7f9fa..c97e9c762a5 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -2,7 +2,7 @@
 , guiSupport ? false, tk ? null, curses }:
 
 let
-  version = "3.2.2";
+  version = "3.2.4";
   name = "mercurial-${version}";
 in
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://mercurial.selenic.com/release/${name}.tar.gz";
-    sha256 = "1311ba2cgdc17ap8sl7pswzngc702pnkr4cd2rx6znb0w9jzgpmg";
+    sha256 = "1g7nfvapxj5k44dyp0p08v37s0zmrj2vl0rjgfd8297x0afidm08";
   };
 
   inherit python; # pass it so that the same version can be used in hg2git
diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix
index d729159316d..5bb201b60d0 100644
--- a/pkgs/applications/version-management/smartgithg/default.nix
+++ b/pkgs/applications/version-management/smartgithg/default.nix
@@ -7,7 +7,7 @@
 }:
 
 let
-  the_version = "6_0_6";
+  the_version = "6_5_3";
 
 in
 
@@ -15,9 +15,9 @@ stdenv.mkDerivation rec {
   name = "smartgithg-${the_version}";
 
   src = fetchurl {
-    url = "http://www.syntevo.com/download/smartgithg/" +
-          "smartgithg-generic-${the_version}.tar.gz";
-    sha256 = "13e41560138ef18395fbe0bf56d4d29e8614eee004d51d7dd03381080d8426e6";
+    url = "http://www.syntevo.com/download/smartgit/" +
+          "smartgit-generic-${the_version}.tar.gz";
+    sha256 = "0hz1y29ipls58fizr27w6rbv7v7qbbc1h70xvjjd8c94k9ajmav9";
   };
 
   buildInputs = [
@@ -40,24 +40,24 @@ stdenv.mkDerivation rec {
   in ''
     tar xvzf $src
     mkdir -pv $out
-    # unpacking should have produced a dir named ${name}
-    cp -a ${name} $out
+    mkdir -pv ${pkg_path}
+    # unpacking should have produced a dir named 'smartgit'
+    cp -a smartgit/* ${pkg_path}
     mkdir -pv ${bin_path}
-    [ -d ${jre}/lib/openjdk ] \
-      && jre=${jre}/lib/openjdk \
-      || jre=${jre}
-    makeWrapper ${pkg_path}/bin/smartgithg.sh ${bin_path}/smartgithg \
+    jre=${jre.home}
+    makeWrapper ${pkg_path}/bin/smartgit.sh ${bin_path}/smartgit \
       --prefix PATH : ${runtime_paths} \
       --prefix LD_LIBRARY_PATH : ${runtime_lib_paths} \
       --prefix JRE_HOME : ${jre} \
       --prefix JAVA_HOME : ${jre} \
       --prefix SMARTGITHG_JAVA_HOME : ${jre}
     patchShebangs $out
+    cp ${bin_path}/smartgit ${bin_path}/smartgithg
   '';
 
   meta = with stdenv.lib; {
     description = "GUI for Git, Mercurial, Subversion";
-    homepage = http://www.syntevo.com/smartgithg/;
+    homepage = http://www.syntevo.com/smartgit/;
     license = licenses.unfree;
     platforms = platforms.linux;
   };
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index 6e329ebdf71..a49e5e1033e 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -15,7 +15,7 @@ assert httpServer -> apacheHttpd != null;
 assert pythonBindings -> swig != null && python != null;
 assert javahlBindings -> jdk != null && perl != null;
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (rec {
 
   version = "1.8.11";
 
@@ -77,4 +77,9 @@ stdenv.mkDerivation rec {
     maintainers = with stdenv.lib.maintainers; [ eelco lovek323 ];
     hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
   };
-}
+} // stdenv.lib.optionalAttrs stdenv.isDarwin {
+  CXX = "clang++";
+  CC = "clang";
+  CPP = "clang -E";
+  CXXCPP = "clang++ -E";
+})