diff options
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools')
4 files changed, 58 insertions, 18 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 8aad853ca10e..994dcb38f805 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -45,6 +45,8 @@ rec { git-annex-remote-b2 = callPackage ./git-annex-remote-b2 { }; + git-annex-remote-rclone = callPackage ./git-annex-remote-rclone { }; + # support for bugzilla git-bz = callPackage ./git-bz { }; diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix new file mode 100644 index 000000000000..d1996b72154d --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, rclone, makeWrapper }: + +stdenv.mkDerivation rec { + name = "git-annex-remote-rclone-${version}"; + version = "0.4"; + rev = "v${version}"; + + src = fetchFromGitHub { + inherit rev; + owner = "DanielDent"; + repo = "git-annex-remote-rclone"; + sha256 = "1myk307hqm8dlxhkmwr347rdd28niv5h0gyrxm30y77zlly30ddk"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + + installPhase = '' + mkdir -p $out/bin + cp git-annex-remote-rclone $out/bin + wrapProgram "$out/bin/git-annex-remote-rclone" \ + --prefix PATH ":" "${stdenv.lib.makeBinPath [ rclone ]}" + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/DanielDent/git-annex-remote-rclone; + description = "Use rclone supported cloud storage providers with git-annex"; + license = licenses.gpl3; + maintainers = [ maintainers.montag451 ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix index 2ee34d3c6e3f..ba2b71138067 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix @@ -1,17 +1,20 @@ -{ stdenv, fetchgit, docutils }: +{ stdenv, fetchFromGitHub, docutils, makeWrapper, gnupg1compat, curl, rsync }: -stdenv.mkDerivation { - name = "git-remote-gcrypt-20140715"; +stdenv.mkDerivation rec { + name = "git-remote-gcrypt-${version}"; + version = "1.0.0"; + rev = version; - # Use joeyh's branch that works better with git-annex - src = fetchgit { - url = "https://github.com/joeyh/git-remote-gcrypt.git"; - rev = "5dcc77f507d497fe4023e94a47b6a7a1f1146bce"; - sha256 = "d509efde143cfec4898872b5bb423d52d5d1c940b6a1e21b8444c904bdb250c2"; + src = fetchFromGitHub { + inherit rev; + owner = "spwhitton"; + repo = "git-remote-gcrypt"; + sha256 = "0c8ig1pdqj7wjwldnf62pmm2x29ri62x6b24mbsl2nxzkqbwh379"; }; - # Required for rst2man.py - buildInputs = [ docutils ]; + outputs = [ "out" "man" ]; + + buildInputs = [ docutils makeWrapper ]; # The install.sh script expects rst2man, but here it's named rst2man.py patchPhase = '' @@ -20,13 +23,15 @@ stdenv.mkDerivation { installPhase = '' prefix="$out" ./install.sh + wrapProgram "$out/bin/git-remote-gcrypt" \ + --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg1compat curl rsync ]}" ''; - meta = { - homepage = "https://github.com/joeyh/git-remote-gcrypt"; - description = "GNU Privacy Guard-encrypted git remote"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ ellis ]; - platforms = with stdenv.lib.platforms; unix; + meta = with stdenv.lib; { + homepage = https://spwhitton.name/tech/code/git-remote-gcrypt; + description = "A git remote helper for GPG-encrypted remotes"; + license = licenses.gpl3; + maintainers = with maintainers; [ ellis montag451 ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index e432543df452..cd737cdf4e6b 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -11,7 +11,7 @@ }: let - version = "2.10.1"; + version = "2.10.2"; svn = subversionClient.override { perlBindings = true; }; in @@ -20,7 +20,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "1ijd1b6szvfw0dmqa3dz1m5g5hbkl9xkb86a9qcjrz0w0vwjvhx9"; + sha256 = "0wc64dzcxrzgi6kwcljz6y3cwm3ajdgf6aws7g58azbhvl1jk04l"; }; hardeningDisable = [ "format" ]; @@ -93,6 +93,7 @@ stdenv.mkDerivation { # Install contrib stuff. mkdir -p $out/share/git mv contrib $out/share/git/ + ln -s "$out/share/git/contrib/credential/netrc/git-credential-netrc" $out/bin/ mkdir -p $out/share/emacs/site-lisp ln -s "$out/share/git/contrib/emacs/"*.el $out/share/emacs/site-lisp/ mkdir -p $out/etc/bash_completion.d |