pyrox.dev
ikiwiki: 3.20190228 -> 3.20200202.3
This fixes (among others) incompatibility with highlight from nixpkgs.
See http://source.ikiwiki.branchable.com/?p=source.git;a=commit;h=4d06df9583e6c4145f8c6fc2fd51d7894c0b85ce
+2
-2
pkgs/applications/misc/ikiwiki/default.nix
+2
-2
pkgs/applications/misc/ikiwiki/default.nix
···
19
19
20
20
let
21
21
name = "ikiwiki";
22
-
version = "3.20190228";
22
+
version = "3.20200202.3";
23
23
24
24
lib = stdenv.lib;
25
25
in
···
28
28
29
29
src = fetchurl {
30
30
url = "mirror://debian/pool/main/i/ikiwiki/${name}_${version}.orig.tar.xz";
31
-
sha256 = "17pyblaqhkb61lxl63bzndiffism8k859p54k3k4sghclq6lsynh";
31
+
sha256 = "0skrc8r4wh4mjfgw1c94awr5sacfb9nfsbm4frikanc9xsy16ksr";
32
32
};
33
33
34
34
buildInputs = [ which highlight ]
+22
-24
pkgs/applications/misc/ikiwiki/remove-markdown-tests.patch
+22
-24
pkgs/applications/misc/ikiwiki/remove-markdown-tests.patch
···
1
1
diff --git a/t/mdwn.t b/t/mdwn.t
2
-
index ca3180139..d64750403 100755
2
+
index 966aad2..2756173 100755
3
3
--- a/t/mdwn.t
4
4
+++ b/t/mdwn.t
5
-
@@ -16,32 +16,17 @@ is(IkiWiki::htmlize("foo", "foo", "mdwn",
6
-
"C. S. Lewis wrote books\n"),
7
-
"<p>C. S. Lewis wrote books</p>\n", "alphalist off by default");
5
+
@@ -22,30 +22,13 @@ foreach my $multimarkdown (qw(1 0)) {
6
+
"<p>C. S. Lewis wrote books</p>\n",
7
+
"alphalist off by default for multimarkdown = $multimarkdown");
8
+
9
+
- like(IkiWiki::htmlize("foo", "foo", "mdwn",
10
+
- "This works[^1]\n\n[^1]: Sometimes it doesn't.\n"),
11
+
- qr{<p>This works.*fnref:1.*},
12
+
- "footnotes on by default for multimarkdown = $multimarkdown");
13
+
-
14
+
$config{mdwn_footnotes} = 0;
15
+
unlike(IkiWiki::htmlize("foo", "foo", "mdwn",
16
+
"An unusual link label: [^1]\n\n[^1]: http://example.com/\n"),
17
+
qr{<p>An unusual link label: .*fnref:1.*},
18
+
"footnotes can be disabled for multimarkdown = $multimarkdown");
19
+
-
20
+
- $config{mdwn_footnotes} = 1;
21
+
- like(IkiWiki::htmlize("foo", "foo", "mdwn",
22
+
- "This works[^1]\n\n[^1]: Sometimes it doesn't.\n"),
23
+
- qr{<p>This works.*fnref:1.*},
24
+
- "footnotes can be enabled for multimarkdown = $multimarkdown");
25
+
}
8
26
9
27
-$config{mdwn_alpha_lists} = 1;
10
28
-like(IkiWiki::htmlize("foo", "foo", "mdwn",
···
15
33
$config{mdwn_alpha_lists} = 0;
16
34
like(IkiWiki::htmlize("foo", "foo", "mdwn",
17
35
"A. One\n".
18
-
"B. Two\n"),
19
-
qr{<p>A. One\sB. Two</p>\n}, "alphalist can be disabled");
20
-
21
-
-like(IkiWiki::htmlize("foo", "foo", "mdwn",
22
-
- "This works[^1]\n\n[^1]: Sometimes it doesn't.\n"),
23
-
- qr{<p>This works<sup\W}, "footnotes on by default");
24
-
-
25
-
$config{mdwn_footnotes} = 0;
26
-
like(IkiWiki::htmlize("foo", "foo", "mdwn",
27
-
"An unusual link label: [^1]\n\n[^1]: http://example.com/\n"),
28
-
qr{<a href="http://example\.com/">\^1</a>}, "footnotes can be disabled");
29
-
30
-
-$config{mdwn_footnotes} = 1;
31
-
-like(IkiWiki::htmlize("foo", "foo", "mdwn",
32
-
- "This works[^1]\n\n[^1]: Sometimes it doesn't.\n"),
33
-
- qr{<p>This works<sup\W}, "footnotes can be enabled");
34
-
-
35
-
SKIP: {
36
-
skip 'set $IKIWIKI_TEST_ASSUME_MODERN_DISCOUNT if you have Discount 2.2.0+', 4
37
-
unless $ENV{IKIWIKI_TEST_ASSUME_MODERN_DISCOUNT};