Merge pull request #5480 from lostdj/ltp/upstream-master/smartgit653

SmartGitHg: update from 6.0.6 to 6.5.3.

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,26 @@ 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 \
+    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;
   };