diff options
Diffstat (limited to 'pkgs/applications/version-management')
-rw-r--r-- | pkgs/applications/version-management/git-and-tools/cgit/default.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/version-management/subversion/default.nix | 7 |
2 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index 284a1cc649a..3fb22790904 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -6,19 +6,19 @@ stdenv.mkDerivation rec { name = "cgit-${version}"; - version = "1.1"; + version = "1.2.1"; src = fetchurl { url = "https://git.zx2c4.com/cgit/snapshot/${name}.tar.xz"; - sha256 = "142qcgs8dwnzhymn0a7xx47p9fc2z5wrb86ah4a9iz0mpqlsz288"; + sha256 = "1gw2j5xc5qdx2hwiwkr8h6kgya7v9d9ff9j32ga1dys0cca7qm1w"; }; # cgit is tightly coupled with git and needs a git source tree to build. # IMPORTANT: Remember to check which git version cgit needs on every version # bump (look for "GIT_VER" in the top-level Makefile). gitSrc = fetchurl { - url = "mirror://kernel/software/scm/git/git-2.10.2.tar.xz"; - sha256 = "0wc64dzcxrzgi6kwcljz6y3cwm3ajdgf6aws7g58azbhvl1jk04l"; + url = "mirror://kernel/software/scm/git/git-2.18.0.tar.xz"; + sha256 = "14hfwfkrci829a9316hnvkglnqqw1p03cw9k56p4fcb078wbwh4b"; }; nativeBuildInputs = [ pkgconfig ] ++ [ python wrapPython ]; diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index f5bdb0ae62a..981f25f00f8 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -93,11 +93,12 @@ let doCheck = false; # fails 10 out of ~2300 tests - meta = { + meta = with stdenv.lib; { description = "A version control system intended to be a compelling replacement for CVS in the open source community"; + license = licenses.asl20; homepage = http://subversion.apache.org/; - maintainers = with stdenv.lib.maintainers; [ eelco lovek323 ]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + maintainers = with maintainers; [ eelco lovek323 ]; + platforms = platforms.linux ++ platforms.darwin; }; } // stdenv.lib.optionalAttrs stdenv.isDarwin { |