diff options
author | William A. Kennington III <william@wkennington.com> | 2015-06-22 10:57:36 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-06-22 10:57:36 -0700 |
commit | 282d03befa69b7b60a08a40200ad8218f3eadfa7 (patch) | |
tree | 59885694c8827979da3d9b29eec74205cd49e8a4 /pkgs/applications/version-management/git-and-tools | |
parent | ad779acd3be0a29bcda55f760eee6de35cfedef5 (diff) | |
parent | 22172b8e43dfac3486d108a085b5911d7e2d8c5a (diff) | |
download | nixlib-282d03befa69b7b60a08a40200ad8218f3eadfa7.tar nixlib-282d03befa69b7b60a08a40200ad8218f3eadfa7.tar.gz nixlib-282d03befa69b7b60a08a40200ad8218f3eadfa7.tar.bz2 nixlib-282d03befa69b7b60a08a40200ad8218f3eadfa7.tar.lz nixlib-282d03befa69b7b60a08a40200ad8218f3eadfa7.tar.xz nixlib-282d03befa69b7b60a08a40200ad8218f3eadfa7.tar.zst nixlib-282d03befa69b7b60a08a40200ad8218f3eadfa7.zip |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools')
-rw-r--r-- | pkgs/applications/version-management/git-and-tools/git-cola/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/version-management/git-and-tools/gitflow/default.nix | 14 |
2 files changed, 12 insertions, 6 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix index a43bd8d3a373..c10ab14f6398 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonPackage rec { name = "git-cola-${version}"; - version = "2.1.1"; + version = "2.2.1"; src = fetchurl { url = "https://github.com/git-cola/git-cola/archive/v${version}.tar.gz"; - sha256 = "0fpi5nvhyqkx67ak5pfcpgxbc3m19dqlvdh2c9igv2j0vp5rzkj1"; + sha256 = "1v1s9gx16xihdcck4qp92bdci8zc6pb5a3z3y8k9jqj97hfkw2nz"; }; buildInputs = [ makeWrapper gettext ]; diff --git a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix index 0898345c30b6..99c1db20fb2a 100644 --- a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gitflow-${version}"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { url = "https://github.com/petervanderdoes/gitflow/archive/${version}.tar.gz"; - sha256 = "0rppgyqgk0drip6852bdm2479zks16cb3mj1jdw6jq80givrqnjx"; + sha256 = "1vxdawx4sinl19g59ifmrdalmr2dl5pkgawyj9z0s5mcildi6fc2"; }; preBuild = '' @@ -15,9 +15,15 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/petervanderdoes/gitflow; - description = "A collection of Git extensions to provide high-level repository operations for Vincent Driessen's branching model"; + description = "Extend git with the Gitflow branching model"; + longDescription = '' + A set of scripts that provide high-level repository operations + for managing feature/release/hotfix branches in a Git repository, + particularly suited to be utilised to follow Vincent Driessen's + branching model. + ''; license = licenses.bsd2; platforms = platforms.all; - maintainers = [ maintainers.offline ]; + maintainers = with maintainers; [ offline jgeerds ]; }; } |