@@ -1,35 +1,27 @@
1−{ stdenv, fetchurl, fetchpatch, openssl, zlib, asciidoc, libxml2, libxslt
1+{ stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt
22, docbook_xsl, pkgconfig, luajit
33, coreutils, gnused, groff, docutils
4−, gzip, bzip2, xz
4+, gzip, bzip2, lzip, xz, zstd
55, python, wrapPython, pygments, markdown
66}:
77
88stdenv.mkDerivation rec {
99 pname = "cgit";
10− version = "1.2.1";
10+ version = "1.2.3";
1111
1212 src = fetchurl {
1313 url = "https://git.zx2c4.com/cgit/snapshot/${pname}-${version}.tar.xz";
14− sha256 = "1gw2j5xc5qdx2hwiwkr8h6kgya7v9d9ff9j32ga1dys0cca7qm1w";
14+ sha256 = "193d990ym10qlslk0p8mjwp2j6rhqa7fq0y1iff65lvbyv914pss";
1515 };
1616
1717 # cgit is tightly coupled with git and needs a git source tree to build.
1818 # IMPORTANT: Remember to check which git version cgit needs on every version
1919 # bump (look for "GIT_VER" in the top-level Makefile).
2020 gitSrc = fetchurl {
21− url = "mirror://kernel/software/scm/git/git-2.18.0.tar.xz";
22− sha256 = "14hfwfkrci829a9316hnvkglnqqw1p03cw9k56p4fcb078wbwh4b";
21+ url = "mirror://kernel/software/scm/git/git-2.25.1.tar.xz";
22+ sha256 = "09lzwa183nblr6l8ib35g2xrjf9wm9yhk3szfvyzkwivdv69c9r2";
2323 };
2424
25− patches = [
26− (fetchpatch {
27− name = "prevent-dos-limit-path-length.patch";
28− url = "https://git.zx2c4.com/cgit/patch/?id=54c407a74a35d4ee9ffae94cc5bc9096c9f7f54a";
29− sha256 = "1qlbpqsc293lmc9hzwf1j4jr5qlv8cm1r249v3yij5s4wki1595j";
30− })
31− ];
32−
3325 nativeBuildInputs = [ pkgconfig ] ++ [ python wrapPython ];
3426 buildInputs = [
3527 openssl zlib asciidoc libxml2 libxslt docbook_xsl luajit
@@ -39,7 +31,9 @@ stdenv.mkDerivation rec {
3931 postPatch = ''
4032 sed -e 's|"gzip"|"${gzip}/bin/gzip"|' \
4133 -e 's|"bzip2"|"${bzip2.bin}/bin/bzip2"|' \
34+ -e 's|"lzip"|"${lzip}/bin/lzip"|' \
4235 -e 's|"xz"|"${xz.bin}/bin/xz"|' \
36+ -e 's|"zstd"|"${zstd}/bin/zstd"|' \
4337 -i ui-snapshot.c
4438
4539 substituteInPlace filters/html-converters/man2html \