gitolite: fix aborted build due to non-deterministic fetchgit

1 files changed, 12 insertions, 14 deletions

diff --git a/pkgs/applications/version-management/gitolite/default.nix b/pkgs/applications/version-management/gitolite/default.nix
index 2dcb13e5db5..67e3cba70ca 100644
--- a/pkgs/applications/version-management/gitolite/default.nix
+++ b/pkgs/applications/version-management/gitolite/default.nix
@@ -1,14 +1,12 @@
-{ stdenv, fetchurl, perl, git, fetchgit }:
+{ stdenv, fetchurl, perl, git }:
 
 stdenv.mkDerivation rec {
   name = "gitolite-${version}";
   version = "3.6.1";
 
-  src = fetchgit {
-    url    = "git://github.com/sitaramc/gitolite";
-    rev    = "refs/tags/v${version}";
-    sha256 = "47e0e9c3137b05af96c091494ba918d61d1d3396749a04d63e7949ebcc6c6dca";
-    leaveDotGit = true;
+  src = fetchurl {
+    url = "https://github.com/sitaramc/gitolite/archive/v${version}.tar.gz";
+    sha256 = "0sizzv705aypasi9vf9kmdbzcl3gmyfxg9dwdl5prn64biqkvq3y";
   };
 
   buildInputs = [ perl git ];
@@ -17,21 +15,21 @@ stdenv.mkDerivation rec {
   patchPhase = ''
     substituteInPlace ./install --replace " 2>/dev/null" ""
     substituteInPlace src/lib/Gitolite/Hooks/PostUpdate.pm \
-      --replace /usr/bin/perl "/usr/bin/env perl"
+      --replace /usr/bin/perl "${perl}/bin/perl"
     substituteInPlace src/lib/Gitolite/Hooks/Update.pm \
-      --replace /usr/bin/perl "/usr/bin/env perl"
+      --replace /usr/bin/perl "${perl}/bin/perl"
   '';
+
   installPhase = ''
     mkdir -p $out/bin
-    git tag v${version} # Gitolite requires a tag for the version information :/
     perl ./install -to $out/bin
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Finely-grained git repository hosting";
-    homepage    = "http://gitolite.com/gitolite/index.html";
-    license     = stdenv.lib.licenses.gpl2;
-    platforms   = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+    homepage    = http://gitolite.com/gitolite/index.html;
+    license     = licenses.gpl2;
+    platforms   = platforms.unix;
+    maintainers = [ maintainers.thoughtpolice ];
   };
 }