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
2015-01-20 20:21:03 -05:00
parent bd53746646 c55b5eb245
commit dfc225d143
823 changed files with 154029 additions and 7470 deletions
@@ -73,8 +73,8 @@ rec {
  };

  hub = import ./hub {
-    inherit buildRubyGem;
-    inherit stdenv fetchurl groff makeWrapper;
+    inherit go;
+    inherit stdenv fetchgit;
  };

  gitFastExport = import ./fast-export {
@@ -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 ];
  };
 }
@@ -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 = [
@@ -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
@@ -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
@@ -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 ];
+
+  phases = [ "unpackPhase" "buildPhase" "installPhase" ];
+
+  buildPhase = ''
+    sh script/build
+  '';

  installPhase = ''
-    rake install "prefix=$out"
+    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?
+# ?
  '';

-  fixupPhase = ''
-    wrapProgram $out/bin/hub --prefix PATH : ${groff}/bin
-  '';
+  meta = with stdenv.lib; {
+    description = "Command-line wrapper for git that makes you better at GitHub";

-  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 ];
+    license = licenses.mit;
+    homepage = https://hub.github.com/;
+    maintainers = with maintainers; [ the-kenny ];
  };
 }
@@ -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 ];
  };
 }