1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 20:21:14 +00:00
Commit graph

86 commits

Author SHA1 Message Date
Felix Buehler f3719756b5 treewide: use optionalString instead of 'then ""' 2023-06-24 20:19:19 +02:00
pennae 6957b8ed8b docbook-xsl: restore nixos-specific patch
This reverts commit 3e7649f01b.

turns out that home-manager depends on it, and restoring this patch for
now seems preferrable to breaking home-manager until they move away from
docbook for their manpage generation.
2023-06-19 14:28:12 -04:00
pennae 3e7649f01b docbook-xsl: remove nixos-specific patch
we're no longer using docbook to render the manpages, so we don't need
this patch for our manuals to be usable. remove it to reduce the diff
between nixos and other distros for this package.
2023-06-16 19:26:23 +02:00
Ferry Jérémie 65d7e87fdb treewide: replace http by https when https is a permanent redirection 2023-01-22 02:46:49 +01:00
Lassulus c274af4b7b
Merge pull request #166509 from jtojnar/man-opt-nodup
nixos/man: prevent duplication of options
2022-04-10 11:09:12 +01:00
Jan Tojnar 84d6565d52 nixos/man: prevent duplication of options
libxslt 1.1.35 fixed conflict resolution for templates to match the specification.
This uncovered a bug in docbook-xsl (https://github.com/docbook/xslt10-stylesheets/issues/240),
which causes option names to be duplicated into the option descriptions.

Let’s resolve the conflict by patching the stylesheets.

Fixes: https://github.com/NixOS/nixpkgs/issues/166304
2022-04-03 21:22:47 +02:00
Felix Buehler 94a6a28193 docbook_xml_dtd,docbook_xml_ebnf_dtd,xhtml1: replace name with pname&version 2022-03-08 13:03:45 +01:00
Renaud a543246db0 docbook-xsl: update homepage
and add license information
2022-02-06 15:10:25 +01:00
zowoq 932941b79c treewide: editorconfig fixes
- remove trailing whitespace
- use spaces for indentation
2021-01-21 13:29:54 +10:00
Ben Siraphob 4eb185bd6a pkgs/data: stdenv.lib -> lib 2021-01-15 14:29:18 +07:00
Michael Reilly 84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Jan Tojnar d8369edfcd docbook-xsl: Fix reproducibility when building docs
When building docs generate.consistent.ids was not respected for indexes.

https://github.com/docbook/xslt10-stylesheets/pull/88
https://sourceforge.net/p/docbook/bugs/1385/

This lead to r13y failures in udisks2.devdoc.
2020-01-06 11:56:01 +01:00
Vladimír Čunát 5e9f1bb343
docbook5: 5.0 -> 5.0.1
Main reason: the previous source would not unpack with patched unzip:
https://github.com/NixOS/nixpkgs/commit/0238946872c1
2019-07-20 12:39:16 +02:00
worldofpeace 3f4a353737 treewide: use dontUnpack 2019-07-01 04:23:51 -04:00
Jan Tojnar 013ddbebb1
docbook-xsl-nons: 1.79.1 → 1.79.2
Nothing much changed other than adding the suffix -nons to Docbook 4 styles,
making the Docbook 5 the variant without suffix:

https://github.com/docbook/xslt10-stylesheets/releases/tag/release%2F1.79.2

I have decided to make docbook_xsl an alias of docbook-xsl-nons for now,
to avoid confusion.

I also updated patch link that was broken to a newer version of the patch
and started sharing it between the two packages.
2019-04-30 20:59:16 +02:00
volth 52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Matthew Bauer e3239a266d docbook-xsl-ns: cleanup last patch
Doh.
2018-04-17 21:15:43 -05:00
Corey O'Connor 5ffdcd32ef docbook-xsl-ns: Add patch to avoid infinite recursion.
Fixes #39090
2018-04-17 20:59:51 -05:00
Ryan Mulligan b189247ba0 treewide: use more HTTPS URLs
Uses the HTTPS url for cases where the existing URL has a permanent
redirect. For each domain, at least one fixed derivation URL was
downloaded to test the domain is properly serving downloads.

Also fixes jbake source URL, which was broken.
2018-03-24 22:04:25 -07:00
Vladimír Čunát e851d53cea
docbook-xsl-ns: "revert" after parent commit
I didn't realize I was redefining two derivations at once.
2018-01-30 19:49:44 +01:00
Vladimír Čunát 15c471e444
docbook-xsl: apply Debian/Fedora patch to fix issues
Our samba now got hit by that bug: https://hydra.nixos.org/build/68373563
2018-01-29 21:25:07 +01:00
Tuomas Tynkkynen a506d0ac66 docbook_xsl_*: Remove builder.sh 2017-12-03 01:50:43 +02:00
Tuomas Tynkkynen f24d1b7c2c xhtml1: libxml2 is a nativeBuildInput 2017-12-03 01:50:43 +02:00
Tuomas Tynkkynen aeed0a9d17 docbook5: unzip is a nativeBuildInput 2017-12-03 01:50:42 +02:00
Ben Gamari ec405a1579 docbook_sgml_*: unzip is a nativeBuildInput 2017-12-03 01:50:42 +02:00
Ben Gamari 080164905c docbook_xml_dtd_*: unzip is a nativeBuildInput
[dezgeg resolved a merge conflict]

Conflicts:
	pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix
2017-12-03 01:50:42 +02:00
Shea Levy e0779e6aed
docbook-xsl: Expose dbtoepub in passthru. 2017-11-22 09:12:53 -05:00
Jan Tojnar 99af040ee1
docbook_{xml,xsl}*: propagate findXMLCatalogs 2017-10-07 23:37:29 +02:00
Eelco Dolstra 61764cbba4
Revert "docbook-xsl: Install dbtoepub"
This reverts commit 4e32f5bda3.

IMHO, it's not desirable to make docbook-xsl (and by extension a
gazillion packages that depend on it) pull in Ruby. (For example, I
just noticed that wget depends on ruby now...)
2017-07-26 11:35:03 +02:00
Shea Levy 4e32f5bda3 docbook-xsl: Install dbtoepub 2017-06-03 09:37:36 -04:00
Profpatsch bef6bef0d2
stdenv/stripHash: print to stdout, not to variable
`stripHash` documentation states that it prints out the stripped name to
the stdout, but the function stored the value in `strippedName`
instead.

Basically all usages did something like
`$(stripHash $foo | echo $strippedName)` which is just braindamaged.
Fixed the implementation and all invocations.
2016-10-11 18:34:36 +02:00
Chris Martin 2b7a9a8d73 docbook 4.3: md5->sha256 2016-09-10 13:47:23 -04:00
Chris Martin df3bd28097 docbook-ebnf: md5->sha256 2016-09-10 13:46:49 -04:00
Tuomas Tynkkynen ad371aaef9 docbook_xml_dtd_*: Add meta.platforms 2016-08-28 18:04:09 +03:00
Tuomas Tynkkynen 21f17d69f6 treewide: Add lots of meta.platforms
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Tuomas Tynkkynen 2258b21e4b treewide: Add lots of platforms to packages with no meta
Build-tested on x86_64 Linux and on Darwin.
2016-08-02 21:17:44 +03:00
Vladimír Čunát bd458e56b6 Merge #14356: docbook updates 2016-06-09 13:11:53 +02:00
Robin Gloster 9820cb1bf2 use dontBuild instead of hacks
changes:
 * buildPhase = "true"
 * buildPhase = ":"
2016-05-04 10:11:04 +00:00
José Romildo Malaquias fb893a8ad2 docbook-xsl: 1.78.1 -> 1.79.1 2016-04-01 03:19:38 +02:00
Graham Christensen 1b556f9f46 docbook: convert md5 to sha256 2016-03-11 15:54:55 -06:00
Eelco Dolstra 0ac4ad33fd Unify the docbook-xsl and docbook-xsl-ns expressions 2015-08-27 19:07:44 +02:00
Eelco Dolstra 97cd7cfea2 docbook-xsl: Remove cruft 2015-08-27 19:07:44 +02:00
Bjørn Forsman f64a24da5c docbook_xml_dtd: add version 4.4
We already have 4.3 and 4.5, but for the latest "moreutils" package
update we need version 4.4.
2015-07-29 15:44:36 +02:00
Eelco Dolstra 880616c353 docbook-xsl-ns: Cleanup 2014-11-25 16:23:49 +01:00
Eelco Dolstra 9adc6fe276 docbook5: Install a catalog.xml 2014-11-25 16:23:48 +01:00
Mateusz Kowalczyk 0c43a02e36 Attach a bunch of meta.branch info for the monitor
This should stop explicitly-versioned expressions from showing up in the
monitor as in need of update.
2014-11-17 18:04:59 +00:00
Peter Simons 715a61ad7a docbook5_xsl: update from 1.75.2 to 1.78.1 2014-04-09 12:41:10 +02:00
Jaka Hudoklin 9a68fd380f pkgs/docbook-xsl: update to 1.78.1 (close #1069) 2014-01-26 11:20:11 +01:00
Lluís Batlle i Rossell 4ae71ad19d Adding the sgml dtd for docbook 3.1
Required by iputils manpages.
2013-03-18 15:07:20 +01:00
Eelco Dolstra c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00