mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-27 17:33:09 +00:00
Merge pull request #200687 from wentasah/ikiwiki-git-fix
ikiwiki: fix git support
This commit is contained in:
commit
6c98e560bc
@ -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";
|
||||
|
@ -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.
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user