diff options
Diffstat (limited to 'pkgs/applications/version-management')
7 files changed, 50 insertions, 12 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index fd548296220e..4cabe3a4e2ab 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -98,4 +98,5 @@ rec { git-remote-hg = callPackage ./git-remote-hg { }; + gitRemoteGcrypt = callPackage ./git-remote-gcrypt { }; } 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 bf5b8d51c374..cbbdb6b7075d 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 @@ -17,8 +17,8 @@ cabal.mkDerivation (self: { pname = "git-annex"; - version = "5.20140915"; - sha256 = "0csd16vqmr4s6x627ikkl8dz6hvr2grqkzjxh0hbkqrirfsxj0kk"; + version = "5.20140927"; + sha256 = "02zmg8pcrdavfna2xy51n6chn6i5g0b8p20rba1vj29rlfj3cask"; isLibrary = false; isExecutable = true; buildDepends = [ 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 new file mode 100644 index 000000000000..0f4e143324cd --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchgit, docutils }: + +stdenv.mkDerivation { + name = "git-remote-gcrypt-20140715"; + + # 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"; + }; + + # Required for rst2man.py + buildInputs = [ docutils ]; + + # The install.sh script expects rst2man, but here it's named rst2man.py + patchPhase = '' + sed -i 's/rst2man/rst2man.py/g' install.sh + ''; + + installPhase = '' + prefix="$out" ./install.sh + ''; + + 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 ]; + }; +} 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 877c65afccf5..b21cd35b7016 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -10,7 +10,7 @@ let - version = "2.1.0"; + version = "2.1.2"; svn = subversionClient.override { perlBindings = true; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "19q1as2bjh4yifmgw6cciwfw0dswxppaf5iq8h8934i33bf15mwd"; + sha256 = "12x1qycc0rii6fqpiizp9v9ysdmj6lpi9imqqbrkdx6cifbwh9vv"; }; patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ./cert-path.patch ]; diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix index afe0ac71ea49..74eee4778472 100644 --- a/pkgs/applications/version-management/gource/default.nix +++ b/pkgs/applications/version-management/gource/default.nix @@ -12,10 +12,11 @@ stdenv.mkDerivation rec { }; buildInputs = [ - glew SDL ftgl pkgconfig libpng libjpeg pcre SDL_image mesa boost glm + glew SDL ftgl pkgconfig libpng libjpeg pcre SDL_image mesa + boost boost.lib glm ]; - configureFlags = "--with-boost-libdir=${boost}/lib"; + configureFlags = "--with-boost-libdir=${boost.lib}/lib"; NIX_CFLAGS_COMPILE = "-fpermissive"; # fix build with newer gcc versions diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 8237a5517c7e..7b309233ca90 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.1"; + version = "3.1.1"; name = "mercurial-${version}"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://mercurial.selenic.com/release/${name}.tar.gz"; - sha256 = "1r6hdxka867lpsq2jq3vz662m3ywflg4yylayc9g0s9gmiww5pgi"; + sha256 = "1ncqagvxcqa41ginmf0kpx2z6b2r2zrq7bdkza3nfba682c2is67"; }; 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 a3d4783d20d1..d729159316d2 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, lib, makeWrapper -, jdk +, jre , gtk, glib , libXtst , git, mercurial, subversion @@ -22,14 +22,14 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper - jdk + jre ]; buildCommand = let pkg_path = "$out/${name}"; bin_path = "$out/bin"; runtime_paths = lib.makeSearchPath "bin" [ - jdk + jre git mercurial subversion which ]; @@ -43,10 +43,15 @@ stdenv.mkDerivation rec { # unpacking should have produced a dir named ${name} cp -a ${name} $out mkdir -pv ${bin_path} + [ -d ${jre}/lib/openjdk ] \ + && jre=${jre}/lib/openjdk \ + || jre=${jre} makeWrapper ${pkg_path}/bin/smartgithg.sh ${bin_path}/smartgithg \ --prefix PATH : ${runtime_paths} \ --prefix LD_LIBRARY_PATH : ${runtime_lib_paths} \ - --prefix JDK_HOME : ${jdk}/lib/openjdk + --prefix JRE_HOME : ${jre} \ + --prefix JAVA_HOME : ${jre} \ + --prefix SMARTGITHG_JAVA_HOME : ${jre} patchShebangs $out ''; |