Unverified Commit 6c98e560 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

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

ikiwiki: fix git support
parents 58dd24ee 0675daec

pkgs/applications/misc/ikiwiki/default.nix

+5 −0
Original line number Diff line number Diff line
@@ -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";

pkgs/top-level/all-packages.nix

+10 −0
Original line number Diff line number Diff line
@@ -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.















  };