Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

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

SmartGitHg: update from 6.0.6 to 6.5.3.

Changed files
+10 -8
pkgs
applications
version-management
smartgithg
+10 -8
pkgs/applications/version-management/smartgithg/default.nix
··· 7 7 }: 8 8 9 9 let 10 - the_version = "6_0_6"; 10 + the_version = "6_5_3"; 11 11 12 12 in 13 13 ··· 15 15 name = "smartgithg-${the_version}"; 16 16 17 17 src = fetchurl { 18 - url = "http://www.syntevo.com/download/smartgithg/" + 19 - "smartgithg-generic-${the_version}.tar.gz"; 20 - sha256 = "13e41560138ef18395fbe0bf56d4d29e8614eee004d51d7dd03381080d8426e6"; 18 + url = "http://www.syntevo.com/download/smartgit/" + 19 + "smartgit-generic-${the_version}.tar.gz"; 20 + sha256 = "0hz1y29ipls58fizr27w6rbv7v7qbbc1h70xvjjd8c94k9ajmav9"; 21 21 }; 22 22 23 23 buildInputs = [ ··· 40 40 in '' 41 41 tar xvzf $src 42 42 mkdir -pv $out 43 - # unpacking should have produced a dir named ${name} 44 - cp -a ${name} $out 43 + mkdir -pv ${pkg_path} 44 + # unpacking should have produced a dir named 'smartgit' 45 + cp -a smartgit/* ${pkg_path} 45 46 mkdir -pv ${bin_path} 46 47 [ -d ${jre}/lib/openjdk ] \ 47 48 && jre=${jre}/lib/openjdk \ 48 49 || jre=${jre} 49 - makeWrapper ${pkg_path}/bin/smartgithg.sh ${bin_path}/smartgithg \ 50 + makeWrapper ${pkg_path}/bin/smartgit.sh ${bin_path}/smartgit \ 50 51 --prefix PATH : ${runtime_paths} \ 51 52 --prefix LD_LIBRARY_PATH : ${runtime_lib_paths} \ 52 53 --prefix JRE_HOME : ${jre} \ 53 54 --prefix JAVA_HOME : ${jre} \ 54 55 --prefix SMARTGITHG_JAVA_HOME : ${jre} 55 56 patchShebangs $out 57 + cp ${bin_path}/smartgit ${bin_path}/smartgithg 56 58 ''; 57 59 58 60 meta = with stdenv.lib; { 59 61 description = "GUI for Git, Mercurial, Subversion"; 60 - homepage = http://www.syntevo.com/smartgithg/; 62 + homepage = http://www.syntevo.com/smartgit/; 61 63 license = licenses.unfree; 62 64 platforms = platforms.linux; 63 65 };