public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ikiwiki: 3.20190228 -> 3.20200202.3

Browse Source 
This fixes (among others) incompatibility with highlight from nixpkgs.
See http://source.ikiwiki.branchable.com/?p=source.git;a=commit;h=4d06df9583e6c4145f8c6fc2fd51d7894c0b85ce
This commit is contained in:
Michal Sojka 2020-10-08 14:48:22 +02:00
parent 8094b8a953
commit b06290ffd0
2 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/misc/ikiwiki/default.nix
View File

@ -19,7 +19,7 @@ assert mercurialSupport -> (mercurial != null);
let let
name = "ikiwiki"; name = "ikiwiki";
version = "3.20190228"; version = "3.20200202.3";
lib = stdenv.lib; lib = stdenv.lib;
in in
@ -28,7 +28,7 @@ stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "mirror://debian/pool/main/i/ikiwiki/${name}_${version}.orig.tar.xz"; url = "mirror://debian/pool/main/i/ikiwiki/${name}_${version}.orig.tar.xz";
sha256 = "17pyblaqhkb61lxl63bzndiffism8k859p54k3k4sghclq6lsynh"; sha256 = "0skrc8r4wh4mjfgw1c94awr5sacfb9nfsbm4frikanc9xsy16ksr";
}; };
buildInputs = [ which highlight ] buildInputs = [ which highlight ]

46
pkgs/applications/misc/ikiwiki/remove-markdown-tests.patch
View File

@ -1,10 +1,28 @@
diff --git a/t/mdwn.t b/t/mdwn.t diff --git a/t/mdwn.t b/t/mdwn.t
index ca3180139..d64750403 100755 index 966aad2..2756173 100755
--- a/t/mdwn.t --- a/t/mdwn.t
+++ b/t/mdwn.t +++ b/t/mdwn.t
@@ -16,32 +16,17 @@ is(IkiWiki::htmlize("foo", "foo", "mdwn", @@ -22,30 +22,13 @@ foreach my $multimarkdown (qw(1 0)) {
"C. S. Lewis wrote books\n"), "<p>C. S. Lewis wrote books</p>\n",
"<p>C. S. Lewis wrote books</p>\n", "alphalist off by default"); "alphalist off by default for multimarkdown = $multimarkdown");
- like(IkiWiki::htmlize("foo", "foo", "mdwn",
- "This works[^1]\n\n[^1]: Sometimes it doesn't.\n"),
- qr{<p>This works.*fnref:1.*},
- "footnotes on by default for multimarkdown = $multimarkdown");
-
$config{mdwn_footnotes} = 0;
unlike(IkiWiki::htmlize("foo", "foo", "mdwn",
"An unusual link label: [^1]\n\n[^1]: http://example.com/\n"),
qr{<p>An unusual link label: .*fnref:1.*},
"footnotes can be disabled for multimarkdown = $multimarkdown");
-
- $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.*fnref:1.*},
- "footnotes can be enabled for multimarkdown = $multimarkdown");
}
-$config{mdwn_alpha_lists} = 1; -$config{mdwn_alpha_lists} = 1;
-like(IkiWiki::htmlize("foo", "foo", "mdwn", -like(IkiWiki::htmlize("foo", "foo", "mdwn",
@ -15,23 +33,3 @@ index ca3180139..d64750403 100755
$config{mdwn_alpha_lists} = 0; $config{mdwn_alpha_lists} = 0;
like(IkiWiki::htmlize("foo", "foo", "mdwn", like(IkiWiki::htmlize("foo", "foo", "mdwn",
"A. One\n". "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};