diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-17 13:44:40 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-17 13:45:21 +0200 |
| commit | cbabebcc2e3b884296fedf8591e04f59240b3939 (patch) | |
| tree | 54f637fbb59548753ac613ec3e4f56aae97a5e6e /pkgs/applications/version-management | |
| parent | 7a22083e1271869294a074cbe7a971f2d8abb4f4 (diff) | |
| parent | 93147d737d24f55d8da7257e24d840c9f9b1fe6c (diff) | |
| download | nixlib-cbabebcc2e3b884296fedf8591e04f59240b3939.tar nixlib-cbabebcc2e3b884296fedf8591e04f59240b3939.tar.gz nixlib-cbabebcc2e3b884296fedf8591e04f59240b3939.tar.bz2 nixlib-cbabebcc2e3b884296fedf8591e04f59240b3939.tar.lz nixlib-cbabebcc2e3b884296fedf8591e04f59240b3939.tar.xz nixlib-cbabebcc2e3b884296fedf8591e04f59240b3939.tar.zst nixlib-cbabebcc2e3b884296fedf8591e04f59240b3939.zip | |
Merge branch 'master' into staging-next
Hydra: ?compare=1473892
Diffstat (limited to 'pkgs/applications/version-management')
3 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix index 71fb7612b339..2063149dd784 100644 --- a/pkgs/applications/version-management/cvs/default.nix +++ b/pkgs/applications/version-management/cvs/default.nix @@ -32,9 +32,10 @@ stdenv.mkDerivation { doCheck = false; # fails 1 of 1 tests - meta = { + meta = with stdenv.lib; { homepage = http://cvs.nongnu.org; description = "Concurrent Versions System - a source control system"; - platforms = stdenv.lib.platforms.all; + license = licenses.gpl2; # library is GPLv2, main is GPLv1 + platforms = platforms.all; }; } diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index 5b0ba0aba7d9..6d2753e45437 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "tig"; - version = "2.4.0"; + version = "2.4.1"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "jonas"; repo = pname; rev = name; - sha256 = "1d5clkdgj0ip1j0k335pr4dabcnap6jr016q90i49p1jxixy96pb"; + sha256 = "0i26yfn2vjgsg1kdvhhv55jwzds7ih7cnad1xqvilqm83zh47ksd"; }; nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkgconfig ]; diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 9a7609684b58..80f0786af4d2 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { name = "gitkraken-${version}"; - version = "3.6.6"; + version = "4.0.1"; src = fetchurl { url = "https://release.gitkraken.com/linux/v${version}.deb"; - sha256 = "01ir325ls1fb6ml79c02c7dyi910lxw0avlwc0nzv8fy4aqavl6p"; + sha256 = "0y4r5d21mxwnwla9ggy9c4pm3zbz67yi9z06znkdz9x2chv1ci3n"; }; libPath = makeLibraryPath [ |