Merge pull request #200687 from wentasah/ikiwiki-git-fix

ikiwiki: fix git support
This commit is contained in:
Sandro 2023-02-14 13:40:43 +01:00 committed by GitHub
commit 6c98e560bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 0 deletions

View File

@ -57,6 +57,11 @@ stdenv.mkDerivation rec {
# Without patched plugin shebangs, some tests like t/rst.t fail
# (with docutilsSupport enabled)
patchShebangs plugins/*
# Creating shared git repo fails when running tests in Nix sandbox.
# The error is: "fatal: Could not make /tmp/ikiwiki-test-git.2043/repo/branches/ writable by group".
# Hopefully, not many people use `ikiwiki-makerepo` to create locally shared repositories these days.
substituteInPlace ikiwiki-makerepo --replace "git --bare init --shared" "git --bare init"
'';
configurePhase = "perl Makefile.PL PREFIX=$out";

View File

@ -30412,6 +30412,16 @@ with pkgs;
inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) ImageMagick;
};
ikiwiki-full = ikiwiki.override {
bazaarSupport = false; # tests broken
cvsSupport = true;
docutilsSupport = true;
gitSupport = true;
mercurialSupport = true;
monotoneSupport = true;
subversionSupport = true;
};
iksemel = callPackage ../development/libraries/iksemel {
texinfo = texinfo6_7; # Uses @setcontentsaftertitlepage, removed in 6.8.
};