Skip to content

Commit

Permalink
cgit: 1.1 -> 1.2.1
Browse files Browse the repository at this point in the history
Fixes CVE-2018-14912.

(cherry picked from commit 970d5ef)

Trivial conflict from commit 57bccb3
("treewide: http -> https sources (#42676)") on master branch.
  • Loading branch information
bjornfor committed Aug 8, 2018
1 parent 26c469f commit 0689d27
Showing 1 changed file with 4 additions and 4 deletions.
Expand Up @@ -6,19 +6,19 @@

stdenv.mkDerivation rec {
name = "cgit-${version}";
version = "1.1";
version = "1.2.1";

src = fetchurl {
url = "http://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 ];
Expand Down

0 comments on commit 0689d27

Please sign in to comment.