Commit Graph

151692 Commits

Author SHA1 Message Date
aszlig
f865d0feab
nixos: Split paras by \n\n in option descriptions
What annoyed me for a long time was the fact, that in order to break
into a new paragraph, you need to insert </para><para> in the
description attribute of an option.

Now we will automatically create <para/> elements for every block that
is separated by two consecutive newlines.

I first tried to do this within options-to-docbook.xsl, but it turns
out[1] that this isn't directly possible with XSLT 1.0, so I added
another XSLT file that postprocesses the option descriptions that are
now enclosed in <nixos:option-description/> by options-to-docbook.xsl.

The splitting itself is a bit more involved, because we can't simply
split on every \n\n because we'd also split text nodes of elements, for
example:

  <screen><![CDATA[

    one line

    another one

  ]]></screen>

This would create one <para/> element for "one line" and another for
"another line", which we obviously don't want because <screen/> is used
to display verbatim contents of what a user is seeing on the screen.

So what we do instead is splitting *only* the top-level text nodes
within the outermost <para/> and leave all elements as-is. If there are
more than one <para/> elements at the top-level, we simply don't process
it at all, because the description then already contains </para><para>.

https://www.mhonarc.org/archive/html/xsl-list/2012-09/msg00319.html

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @edolstra, @domenkozar
2018-09-02 08:10:37 +02:00
jD91mZM2
61e7b1cfff
cargo-tree: 0.19.0 -> 0.20.0 2018-09-02 07:15:36 +02:00
Florian Klink
953b77f07b bird: set reloadIfChanged to true ()
This will trigger the reload instead of restart command if a definition
changes, which is much more desireable for a routing daemon.
2018-09-02 06:51:32 +02:00
José Romildo Malaquias
5357e6d26e deepin-gettext-tools: init at 1.0.8 () 2018-09-02 06:46:45 +02:00
Samuel Dionne-Riel
ca47cc90c2
Merge pull request from teto/nm_dispatchers
[RDY] networkmanager: enrich dispatcher PATH
2018-09-01 23:26:36 -04:00
John Ericson
4a8a80d9b0
Merge pull request from obsidiansystems/androidndk-fix-eval
androidndk: fix eval
2018-09-01 23:05:58 -04:00
Graham Christensen
121a7d743a
Merge pull request from Ralith/vulkan
vulkan: 1.1.77.0 -> 1.1.82.1
2018-09-01 21:35:06 -04:00
Graham Christensen
2d5f599b35
Merge pull request from zhangyoufu/patch-28620
fix vlan interface bring up on boot
2018-09-01 21:28:31 -04:00
Graham Christensen
b5035a808a
Merge pull request from colemickens/packet
packet: v20161215 -> v2.2.2
2018-09-01 20:40:30 -04:00
Tim Steinbach
2b71201708
travis: 1.8.8 -> 1.8.9 2018-09-01 20:29:30 -04:00
Cole Mickens
2c7ba962a8 packet: v20161215 -> v2.2.2 2018-09-01 17:22:27 -07:00
Uli Baum
7e9bd2dae1 nixos/tests/flatpak: explicitly disable gdm to fix eval
The switch to lightdm as default display manager in 
broke eval of the flatpak test. Since the test uses the
auto display manager (lightdm), gdm must now be explicitly disabled.
2018-09-02 01:57:20 +02:00
Markus Kowalewski
31725ed5f1
gtkimageview: update homepage 2018-09-02 01:46:29 +02:00
Markus Kowalewski
13c2b67018
clipper: update homepage 2018-09-02 01:46:29 +02:00
Markus Kowalewski
e8ba17ffa8
bwidget: update homepage 2018-09-02 01:46:28 +02:00
Markus Kowalewski
ede37f98e2
qnial: update homepage 2018-09-02 01:46:28 +02:00
Markus Kowalewski
d75cfa03ec
orc: update homepage 2018-09-02 01:46:28 +02:00
Markus Kowalewski
36587f639a
numix-cursor-theme: update homepage 2018-09-02 01:46:27 +02:00
Markus Kowalewski
fffe9a2581
larswm: update homepage 2018-09-02 01:46:27 +02:00
Markus Kowalewski
8fb523ab7d
containerd: update homepage 2018-09-02 01:46:26 +02:00
Markus Kowalewski
13a97da2d4
uvccapture: remove dead homepage link 2018-09-02 01:46:26 +02:00
Markus Kowalewski
cd748ba94a
tkcvs: update homepage 2018-09-02 01:46:26 +02:00
Markus Kowalewski
ee54f1f817
plm: remove dead homepage link, mark as broken 2018-09-02 01:46:25 +02:00
Markus Kowalewski
5cf25dded7
symmetrica: update homepage 2018-09-02 01:46:25 +02:00
Markus Kowalewski
c184150a22
jags: update homepage + fix license 2018-09-02 01:46:18 +02:00
Luigy Leon
c759f7a9b7 androidndk: fix eval
fixup from https://github.com/NixOS/nixpkgs/pull/45820

/cc @Ericson2314
2018-09-01 19:40:52 -04:00
Uli Baum
15e6e1ff6f nixos/nginx: fix type of sslTrustedCertificate option
The option was added in 1251b34b5b
with type `types.path` but default `null`, so eval failed with
the default setting. This broke the acme and certmgr tests.

cc: @vincentbernat @fpletz
2018-09-02 01:35:59 +02:00
Joseph Lukasik
314d1fcdcb Add gx-go to nativeBuildInputs for ipfs-cluster 2018-09-01 16:01:43 -07:00
Markus Kowalewski
e5974ddaec
jonprl: update homepage 2018-09-02 00:36:01 +02:00
Markus Kowalewski
b9bd5519c5
keepnote: update homepage 2018-09-02 00:33:29 +02:00
Markus Kowalewski
b4c8d6c37b
sup: update homepage 2018-09-02 00:31:08 +02:00
Markus Kowalewski
c6e31608d7
tox-prpl: update homepage 2018-09-02 00:28:54 +02:00
Markus Kowalewski
e9d904af55
timewarrior: update homepage 2018-09-02 00:23:23 +02:00
Markus Kowalewski
de43e1346f
pinfo: remove dead homepage link 2018-09-02 00:19:38 +02:00
Markus Kowalewski
8dbe16b523
pdfshuffler: update homepage 2018-09-02 00:15:39 +02:00
Markus Kowalewski
bb6263af72
orpie: update homepage 2018-09-02 00:13:21 +02:00
Markus Kowalewski
7bc523c492
jamomacore: update homepage 2018-09-02 00:09:28 +02:00
Markus Kowalewski
3cbd6c559e
grafx2: update homepage 2018-09-02 00:05:49 +02:00
Markus Kowalewski
ebc1854726
flpsed: fix homepage 2018-09-02 00:04:23 +02:00
Markus Kowalewski
57a5cd4d96
dfutil: update homepage 2018-09-02 00:01:06 +02:00
Markus Kowalewski
ce4cf418b9
laszip: update homepage 2018-09-02 00:00:40 +02:00
greydot
028b64ab08 qcomicbook: init at 0.9.1. () 2018-09-01 23:39:38 +02:00
R. RyanTM
25176c8812 libircclient: 1.9 -> 1.10 ()
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
libircclient
2018-09-01 23:32:47 +02:00
R. RyanTM
42971e1068 powerdns: 4.1.3 -> 4.1.4 ()
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
powerdns
2018-09-01 23:20:01 +02:00
Will Dietz
33668b6edd Revert "psmisc: 23.1 -> 23.2 ()" ()
23.2 isn't an actual release yet
(for example, not listed here:
https://gitlab.com/psmisc/psmisc/tags )

and 23.2 apparently has caused problems elsewhere,
https://github.com/void-linux/void-packages/issues/2288

If this doesn't make branch-off might need to be picked over.

I have not experienced problems with this yet AFAIK.

This reverts commit b4411ab479.
2018-09-01 23:10:47 +02:00
Jan Tojnar
92a5bb680c
gnome3.tracker-miners: 2.1.1 → 2.1.3 2018-09-01 23:03:03 +02:00
Jan Tojnar
39db436709
gnome3.gnome-font-viewer: 3.28.0 → 3.30.0 2018-09-01 22:41:50 +02:00
Graham Christensen
367c484b64
Merge pull request from grahamc/nixos-section-ids
Nixos docs: section ids
2018-09-01 16:38:44 -04:00
Graham Christensen
53c77e64fe
nixos docs: footnotes: give IDs 2018-09-01 16:24:37 -04:00
Graham Christensen
73bff467d2
makefile: auto-format xml docs outside of the doc subdir 2018-09-01 16:20:49 -04:00