Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a097fa6870a4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1fc81e7b3afb
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 18, 2020

  1. ikiwiki: 3.20170111 -> 3.20190228

    @fgaz
    fgaz committed Jan 18, 2020
    Copy the full SHA
    33a12a2 View commit details

Commits on Jan 19, 2020

  1. Merge pull request #77987 from fgaz/ikiwiki/3.20190228 

    ikiwiki: 3.20170111 -> 3.20190228
    @peti
    peti authored Jan 19, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1fc81e7 View commit details
Showing with 45 additions and 5 deletions.
  1. +8 −5 pkgs/applications/misc/ikiwiki/default.nix
  2. +37 −0 pkgs/applications/misc/ikiwiki/remove-markdown-tests.patch
13 changes: 8 additions & 5 deletions pkgs/applications/misc/ikiwiki/default.nix
View file
Original file line number Diff line number Diff line change
@@ -19,16 +19,16 @@ assert mercurialSupport -> (mercurial != null);

let
name = "ikiwiki";
version = "3.20170111";
version = "3.20190228";

lib = stdenv.lib;
in
stdenv.mkDerivation {
name = "${name}-${version}";

src = fetchurl {
url = "mirror://debian/pool/main/i/ikiwiki/${name}_${version}.tar.xz";
sha256 = "00d7yzv426fvqbhvzyafddv7fa6b4j2647b0wi371wd5yjj9j3sz";
url = "mirror://debian/pool/main/i/ikiwiki/${name}_${version}.orig.tar.xz";
sha256 = "17pyblaqhkb61lxl63bzndiffism8k859p54k3k4sghclq6lsynh";
};

buildInputs = [ which ]
@@ -44,7 +44,11 @@ stdenv.mkDerivation {
++ lib.optionals subversionSupport [subversion]
++ lib.optionals mercurialSupport [mercurial];

patchPhase = ''
# A few markdown tests fail, but this is expected when using Text::Markdown
# instead of Text::Markdown::Discount.
patches = [ ./remove-markdown-tests.patch ];

postPatch = ''
sed -i s@/usr/bin/perl@${perlPackages.perl}/bin/perl@ pm_filter mdwn2man
sed -i s@/etc/ikiwiki@$out/etc@ Makefile.PL
sed -i /ENV{PATH}/d ikiwiki.in
@@ -83,6 +87,5 @@ stdenv.mkDerivation {
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.peti ];
broken = true; # https://ikiwiki.info/bugs/imagemagick_6.9.8_test_suite_failure/
};
}
37 changes: 37 additions & 0 deletions pkgs/applications/misc/ikiwiki/remove-markdown-tests.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
diff --git a/t/mdwn.t b/t/mdwn.t
index ca3180139..d64750403 100755
--- a/t/mdwn.t
+++ b/t/mdwn.t
@@ -16,32 +16,17 @@ is(IkiWiki::htmlize("foo", "foo", "mdwn",
"C. S. Lewis wrote books\n"),
"<p>C. S. Lewis wrote books</p>\n", "alphalist off by default");

-$config{mdwn_alpha_lists} = 1;
-like(IkiWiki::htmlize("foo", "foo", "mdwn",
- "A. One\n".
- "B. Two\n"),
- qr{<ol\W}, "alphalist can be enabled");
-
$config{mdwn_alpha_lists} = 0;
like(IkiWiki::htmlize("foo", "foo", "mdwn",
"A. One\n".
"B. Two\n"),
qr{<p>A. One\sB. Two</p>\n}, "alphalist can be disabled");

-like(IkiWiki::htmlize("foo", "foo", "mdwn",
- "This works[^1]\n\n[^1]: Sometimes it doesn't.\n"),
- qr{<p>This works<sup\W}, "footnotes on by default");
-
$config{mdwn_footnotes} = 0;
like(IkiWiki::htmlize("foo", "foo", "mdwn",
"An unusual link label: [^1]\n\n[^1]: http://example.com/\n"),
qr{<a href="http://example\.com/">\^1</a>}, "footnotes can be disabled");

-$config{mdwn_footnotes} = 1;
-like(IkiWiki::htmlize("foo", "foo", "mdwn",
- "This works[^1]\n\n[^1]: Sometimes it doesn't.\n"),
- qr{<p>This works<sup\W}, "footnotes can be enabled");
-
SKIP: {
skip 'set $IKIWIKI_TEST_ASSUME_MODERN_DISCOUNT if you have Discount 2.2.0+', 4
unless $ENV{IKIWIKI_TEST_ASSUME_MODERN_DISCOUNT};