diff options
Diffstat (limited to 'pkgs/applications/version-management')
4 files changed, 31 insertions, 26 deletions
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 9259cabc28e..3982eff71b5 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 @@ -10,15 +10,16 @@ , networkProtocolXmpp, networkUri, openssh, optparseApplicative , pathPieces, perl, QuickCheck, random, regexTdfa, resourcet, rsync , SafeSemaphore, securemem, SHA, shakespeare, stm, tasty -, tastyHunit, tastyQuickcheck, tastyRerun, text, time, transformers -, unixCompat, utf8String, uuid, wai, waiExtra, warp, warpTls, which -, xmlTypes, yesod, yesodCore, yesodDefault, yesodForm, yesodStatic +, tastyHunit, tastyQuickcheck, tastyRerun, text, time, torrent +, transformers, unixCompat, utf8String, uuid, wai, waiExtra, warp +, warpTls, wget, which, xmlTypes, yesod, yesodCore, yesodDefault +, yesodForm, yesodStatic }: cabal.mkDerivation (self: { pname = "git-annex"; - version = "5.20141203"; - sha256 = "01gifds86925vg7mh363i7qsii2wrgf3vpk3wgjff9rbb7z0fvfk"; + version = "5.20141219"; + sha256 = "1qxvsvys5hrpc5sm6s2ygr7hyrgfjc4qaycp1b0kkwjj4bl4cbvz"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -30,11 +31,13 @@ cabal.mkDerivation (self: { networkMulticast networkProtocolXmpp networkUri optparseApplicative pathPieces QuickCheck random regexTdfa resourcet SafeSemaphore securemem SHA shakespeare stm tasty tastyHunit tastyQuickcheck - tastyRerun text time transformers unixCompat utf8String uuid wai - waiExtra warp warpTls xmlTypes yesod yesodCore yesodDefault - yesodForm yesodStatic + tastyRerun text time torrent transformers unixCompat utf8String + uuid wai waiExtra warp warpTls xmlTypes yesod yesodCore + yesodDefault yesodForm yesodStatic + ]; + buildTools = [ + bup curl git gnupg1 lsof openssh perl rsync wget which ]; - buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ]; configureFlags = "-fAssistant -fProduction"; preConfigure = "export HOME=$TEMPDIR"; installPhase = "./Setup install"; diff --git a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix index 4c4ff62901e..4015867b0eb 100644 --- a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { git-bz is a tool for integrating the Git command line with the Bugzilla bug-tracking system. Operations such as attaching patches to bugs, applying patches in bugs to your current tree, and closing bugs - once you've pushed the fixes publically can be done completely from + once you've pushed the fixes publicly can be done completely from the command line without having to go to your web browser. Authentication for git-bz is done by reading the cookies for the diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index d729159316d..2ddb1b5773f 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/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; }; diff --git a/pkgs/applications/version-management/vcsh/default.nix b/pkgs/applications/version-management/vcsh/default.nix index d438cb1bc6c..e9a8f48b7aa 100644 --- a/pkgs/applications/version-management/vcsh/default.nix +++ b/pkgs/applications/version-management/vcsh/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchgit}: stdenv.mkDerivation rec { - rev = "75c4c554eefbefb714fabd356933858edbce3b1e"; - version = "1.20131229"; - name = "vcsh-${version}_${rev}"; + rev = "ef15aeeb0553efb698e3d4261e79eff77a136ee7"; + version = "1.20141026"; + name = "vcsh-${version}_${builtins.substring 0 7 rev}"; src = fetchgit { inherit rev; url = "https://github.com/RichiH/vcsh"; - sha256 = "0rc82a8vnnk9q6q88z9s10873gqgdpppbpwy2yw8a7hydqrpn0hs"; + sha256 = "1dg6ina2wpy406s5x0x4r7khx6gc42hfak0gjwy0i53ivkckl1nd"; }; phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { cp vcsh $out/bin ''; - meta = { + meta = with stdenv.lib; { description = "Version Control System for $HOME"; homepage = https://github.com/RichiH/vcsh; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.garbas ]; - platforms = stdenv.lib.platforms.unix; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ garbas ttuegel ]; + platforms = platforms.unix; }; } |