1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 13:41:26 +00:00
Commit graph

360 commits

Author SHA1 Message Date
Eric Sagnes de78fe8f2d manual: add chapter on input methods 2016-04-12 19:50:16 +09:00
aszlig 1d77dcaed3
nixos/doc: Allow refs from options to the manual
My first attempt to do this was to just use a conditional <refsection/>
in order to not create exact references in the manpage but create the
reference in the HTML manual, as suggested by @edolstra on IRC.

Later I went on to use <olink/> to reference sections of the manual, but
in order to do that, we need to overhaul how we generate the manual and
manpages.

So, that's where we are now:

There is a new derivation called "manual-olinkdb", which is the olinkdb
for the HTML manual, which in turn creates the olinkdb.xml file and the
manual.db. The former contains the targetdoc references and the latter
the specific targetptr elements.

The reason why I included the olinkdb.xml verbatim is that first of all
the DTD is dependent on the Docbook XSL sources and the references
within the olinkdb.xml entities are relative to the current directory.

So using a store path for that would end up searching for the manual.db
directly in /nix/store/manual.db.

Unfortunately, the <olinks/> that end up in the output file are
relative, so for example if you're clicking on one of these within the
PDF, the URL is searched in the current directory.

However, the sections from the olink's text are still valid, so we could
use an alternative URL for that in the future.

The manual doesn't contain any links, so even referencing the relative
URL shouldn't do any harm.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @edolstra
2016-04-11 18:38:04 +02:00
Vladimír Čunát 30f14243c3 Merge branch 'master' into closure-size
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
2016-04-10 11:17:52 +02:00
Joachim Fasting 678e1955b1 manual: delete dangling pointer to real-world NixOS configs
At some point we probably want to replace this with a curated list
of configurations or even an upstreamed repository of examples, but
for now this is just noise.

Fixes NixOS/nixpkgs#14522
2016-04-08 19:34:57 +02:00
Vladimír Čunát d1df28f8e5 Merge 'staging' into closure-size
This is mainly to get the update of bootstrap tools.
Otherwise there were mysterious segfaults:
https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
2016-04-07 14:40:51 +02:00
aszlig 64e566a49c
nixos/taskserver: Add module documentation
It's not by any means exhaustive, but we're still going to change the
implementation, so let's just use this as a starting point.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-07 14:26:12 +02:00
joachifm f09854c379 Merge pull request #14426 from nbp/fix-rl1603-typo
Fix typo in service.syncthing.dataDir description.
2016-04-04 12:41:35 +02:00
Nicolas B. Pierron 411408f74c Fix typo in service.syncthing.dataDir description. 2016-04-03 17:36:38 +00:00
Rastus Vernon d6998b0674 nixos manual: recommend use of dd for writing the image
Unetbootin works by altering the image and placing a boot loader on it.
For this reason, it cannot work with UEFI and the installation guides
for other distributions (incl. Debian and Fedora) recommend against
using it.

Since dd writes the image verbatim to the drive, and not just the files,
it is not necessary to change the label after using it for UEFI
installations.

vcunat: tiny changes to the PR. Close #14139.
2016-04-02 17:41:38 +02:00
Vladimír Čunát ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Domen Kožar d8abfc87c6 changelog: correct path to gitit nixos module 2016-03-31 23:49:38 +01:00
Domen Kožar cc25628212 changelog: note binutils upgrade
(cherry picked from commit 216c840ca8)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-03-31 23:47:38 +01:00
Domen Kožar 9dfc6829fe changelog: note release date
(cherry picked from commit 279557e6d2)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-03-31 23:47:34 +01:00
Domen Kožar b357ee9a6f changelog: add all new NixOS modules
(cherry picked from commit d231868990)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-03-31 23:47:31 +01:00
Eelco Dolstra e60be0923b NixOS manual: Add some release notes 2016-03-31 12:32:33 +02:00
Vladimír Čunát d9b98b6b50 manual rl-16.03: document broadcom issue #12595 2016-03-29 16:32:50 +02:00
Pascal Wittmann 8ddfab0cf2 nixos/manpages: enable linebreaking after slashes
Allow linbreaks after slashes in long URLs. The option used
is documented at

   http://docbook.sourceforge.net/release/xsl/current/doc/manpages/man.break.after.slash.html

This commit fixes #4538.
2016-03-19 17:16:59 +01:00
Peter Simons 9a2ee42f52 Document the fact that the firewall allows pings by default in rl-1603.xml. 2016-03-18 12:00:39 +01:00
Rok Garbas d014088c95 nixos/doc: adding line about the change in service.syncthing 2016-03-09 12:23:27 +01:00
Vladimír Čunát 09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Profpatsch af4e8a4d3b manual/installing: add loadkeys hint
Closes #13702 and fixes #3132.
(Tiny changes by vcunat.)
2016-03-06 11:05:39 +01:00
Eelco Dolstra f3d94cfc23 Revert "Add the tool "nixos-typecheck" that can check an option declaration to:"
This reverts commit cad8957eab. It
breaks NixOps, but more importantly, such major changes to the module
system really need to be reviewed.
2016-03-01 20:52:06 +01:00
Eelco Dolstra 56e68d4d5f Manual: rl-unstable.xml -> rl-1603.xml 2016-02-29 11:39:46 +01:00
Thomas Strobel cad8957eab Add the tool "nixos-typecheck" that can check an option declaration to:
- Enforce that an option declaration has a "defaultText" if and only if the
   type of the option derives from "package", "packageSet" or "nixpkgsConfig"
   and if a "default" attribute is defined.

 - Enforce that the value of the "example" attribute is wrapped with "literalExample"
   if the type of the option derives from "package", "packageSet" or "nixpkgsConfig".

 - Warn if a "defaultText" is defined in an option declaration if the type of
   the option does not derive from "package", "packageSet" or "nixpkgsConfig".

 - Warn if no "type" is defined in an option declaration.
2016-02-29 01:09:00 +01:00
Nicolas B. Pierron 73630b8986 nsd service: add non-backward compatible release note entry 2016-02-28 09:18:39 +01:00
Eelco Dolstra d4636fa254 Revert "Add a way to pin a NixOS version within the module system."
This reverts commit a5992ad61b. Motivation:

a5992ad61b (commitcomment-14986820)
2016-02-27 20:48:12 +01:00
Franz Pletz cd0f14f23e gitlab: Add documentation
Fixes #13303.
2016-02-26 08:56:39 +01:00
Eelco Dolstra cacf2d063e Merge pull request #13059 from abbradar/udev-local-priority
Make local udev rules higher prioritized
2016-02-23 16:41:47 +01:00
Nikolay Amiantov 32df5ed4c2 udev service: make local rules apply after all others 2016-02-23 15:17:24 +03:00
Eric Sagnes dc6bd61187 added input method related changelog 2016-02-20 13:04:02 +09:00
Vladimír Čunát e9520e81b3 Merge branch 'master' into staging 2016-02-17 10:06:31 +01:00
Vladimír Čunát d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Jinjing Wang 73b9a9662d pdnsd service: init 2016-02-12 19:53:41 +08:00
Vladimír Čunát a115bff08c Merge branch 'master' into staging 2016-02-07 13:52:42 +01:00
Aneesh Agrawal 3c5fca9618 filesystems: use list of strings for fs options
Allow usage of list of strings instead of a comma-separated string
for filesystem options. Deprecate the comma-separated string style
with a warning message; convert this to a hard error after 16.09.
15.09 was just released, so this provides a deprecation period during
the 16.03 release.

closes #10518

Signed-off-by: Robin Gloster <mail@glob.in>
2016-02-06 19:48:30 +00:00
Robin Gloster f7aa921773 Merge pull request #12560 from tvestelind/haka
Haka: new package
2016-02-06 20:32:39 +01:00
Vladimír Čunát ae74c356d9 Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Tomas Vestelind de2d609317 haka in unstable release notes 2016-02-01 09:47:23 +01:00
aszlig 6fec28e043
nixos-manual: Further simplify stripAnyPrefixes
First of all this fixes an evaluation error I introduced in ae466ba,
which wasn't triggered by any of my own tests against the change because
there are usually no NixOS options that are declared outside of the
<nixpkgs> tree. I renamed the attribute name from "fn" to "fileName"
first and later to "fullPath" but forgot one still occuring "filename".

Thanks to @vcunat for noticing this.

Another thing that he pointed out was that the "stripPrefix" function
can be factored away entirely, because it's very similar to
"removePrefix" in <nixpkgs/lib>.

Unfortunately we can't use "removePrefix" as is, because we need to
account for the final shlash.

So instead of removing it twice and/or retaining "stripPrefix", let's
append a shlash on every "prefixesToStrip" and we can use "removePrefix"
as is.

Tested with:

taalo-build nixos/release.nix -A tests.installer.simple.x86_64-linux

And:

w3m -dump "$(
  nix-build nixos/release.nix -A manual.x86_64-linux
)/share/doc/nixos/options.html"

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @vcunat
2016-01-29 20:14:11 +01:00
aszlig ae466ba15c
nixos-manual: Simplify stripping prefixes
Let's use a simple (unflipped) fold and break out the actual core
stripPrefix function from stripAnyPrefixes (I personally love
point-less^H^H^H^Hfree style but if I'd be anal I'd even go further and
factor away the "fn:").

Also, let's use path as a better name for "fn" (filename), because
that's what it is and also cannot be confused with "fn" meaning
"function".

We now toString all of the prefixes, so there shouldn't be any need to
implicily toString the extraSources anymore.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-01-29 16:33:19 +01:00
aszlig a581f72f22
nixos-manual: Fix stripping declaration prefixes
Regression introduced by e6cd147ae7.

This broke all of the installer tests, because they needed to rebuild
the manual within the test machine, while it only has a closure of the
already pre-built system in place.

The problem here was just that the order of the arguments got mixed up
in stripAnyPrefixes, so it was actually trying to strip the path off the
prefix, not the other way around.

So in the end no prefix was stripped at all, so we ended up having full
store paths in the manual, which in turn caused the build within the VM
to fail, because the prefixes differed.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-01-29 16:33:19 +01:00
Vladimír Čunát de0af30716 Merge branch 'master' into staging 2016-01-29 10:19:48 +01:00
Nikolay Amiantov b52acfdf01 nixos xserver: remove vaapiDrivers
Use hardware.opengl.extraPackages instead.
2016-01-26 13:42:40 +03:00
Eelco Dolstra 310aadc48b Merge pull request #12557 from ryanartecona/nixos-manual-custom-options
NixOS manual: allow options from nix packages
2016-01-25 10:43:39 +01:00
Vladimír Čunát 2af19df364 Merge branch 'master' into staging 2016-01-25 10:02:25 +01:00
Dan Peebles e409d0fed3 nixos: update-locatedb - harden via systemd (#7220)
Also, use systemd timers.

Most of the work is by @thoughtpolice but I changed enough of it to warrant changing commit author.
2016-01-23 20:44:30 +00:00
Ryan Artecona e6cd147ae7 nixos manual: allow options from nix packages 2016-01-22 14:22:12 -05:00
Nikolay Amiantov 3ade072aad nixos changelog: mention CUPS changes 2016-01-21 20:02:50 +03:00
Nikolay Amiantov 9fe72b34ed nixos changelog: mention postfix changes 2016-01-21 12:48:30 +03:00
Nikolay Amiantov 15ea50733d nixos changelog: mention ejabberd fixes 2016-01-21 12:48:30 +03:00
Joachim Schiele 2a88417f03 nixos/doc: fix to: ~/.nix-defexpr wasn't created, fixes #6606 2016-01-20 04:59:16 +01:00
Vladimír Čunát 716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Vladimír Čunát 98218971c2 Merge #12299: make firefox-like browsers wrapped by default 2016-01-15 08:53:58 +01:00
Vladimír Čunát 5fe68602cc release notes: document renames of firefox-like browsers 2016-01-15 08:37:02 +01:00
Domen Kožar 8525936f80 nixos: Document "jobs" option removal 2016-01-14 13:08:56 +01:00
Vladimír Čunát 22184c4cfa release-notes: document $NIX_AUTO_RUN from #12000 2016-01-10 10:15:44 +01:00
Robin Gloster 246f0e91cd wpa_supplicant service: Warn about plaintext keys in docs 2016-01-06 03:58:39 +00:00
Robin Gloster d03b35f881 wpa_supplicant module: add networks option 2016-01-06 03:58:39 +00:00
Peter Simons 49d18bdfcb Revert "Basic Declaritive Network Configuration in wpa_supplicant Service" 2016-01-05 19:32:41 +01:00
Peter Simons 94e6323de0 Merge pull request #12015 from mayflower/wpa_supplicant-service
Basic Declaritive Network Configuration in wpa_supplicant Service
2016-01-05 10:53:13 +01:00
Rickard Nilsson 448a2af041 nixos-rebuild: Document --build-host and --target-host options 2016-01-01 18:22:11 +01:00
Vladimír Čunát f9f6f41bff Merge branch 'master' into closure-size
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Robin Gloster 56a53ff458 wpa_supplicant module: add networks option 2015-12-29 18:49:39 +00:00
Rodney Lorrimar 5d682e515e release-notes: add pump.io as a new service 2015-12-27 13:32:44 +00:00
Drew Carey Buglione 0f52d33f96 nixos/manual: typo 2015-12-26 12:36:19 -06:00
Thomas Tuegel dd89ee1c3b release-notes: note addition of ELPA and MELPA packages 2015-12-19 09:32:21 -06:00
Vladimír Čunát acf320f691 nixos release notes: mention enableCtrlAltBackspace
/cc #11228.
2015-12-17 12:31:34 +01:00
Aristid Breitkreuz 10b8c8496a Merge pull request #11575 from rvlander/fix_container_manual
nixos-manual: fix incomplete container doc
2015-12-13 23:02:54 +01:00
Franz Pletz 1685b9d06e nixos/acme: Add module documentation 2015-12-12 16:06:53 +01:00
Luca Bruno 5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Gaëtan André 94ad6e4444 nixos-manual: fix grammar 2015-12-10 19:17:33 +01:00
Gaëtan André b8495e4a04 nixos-manual: develop autoStart option for containers 2015-12-09 21:02:38 +01:00
Gaëtan André 099712f78d nixos-manual: fix incomplete container doc 2015-12-09 17:06:27 +01:00
Nikolay Amiantov ca3b47cccc release-notes: mention bumblebee changes 2015-12-08 18:54:02 +03:00
Luca Bruno 920b1d3591 Merge branch 'master' into closure-size 2015-11-29 16:50:26 +01:00
Vladimír Čunát 8d62b2b8fa nixos/release notes: explain removal of tidy-html5
This belongs to 81b9cc6f54.
2015-11-29 13:50:55 +01:00
Rodney Lorrimar 27e621a60e release-notes: add longview as a new service 2015-11-26 21:43:11 +00:00
Luca Bruno a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +01:00
zimbatm ad2a4ab24c ruby: remove insecure 1.8.7, fixes #11194
1.8.x is unsupported and is probably insecure.

This also simplifies things a little bit
2015-11-25 12:10:03 +01:00
zimbatm e7cd9077a8 s3sync: delete dead project
According to http://s3sync.net/wiki.html, https://github.com/ms4720/s3sync was
supposed to take over the development but nothing has happened in 4 years.

The project is unfortunately dead and is our only dependency to ruby 1.8.
2015-11-25 11:51:09 +01:00
Vladimír Čunát 333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
Nicolas B. Pierron a5992ad61b Add a way to pin a NixOS version within the module system.
This modification add a way to re-evaluate the module system with a
different version of NixOS, or with a different set of arguments.
2015-11-19 20:58:45 +00:00
Hajo Möller f1ac7bf80a nixos manual: point to NixOps' homepage, not Github 2015-11-14 17:17:29 +01:00
Nikolay Amiantov 7487aba1a8 manual: document nginx changes 2015-11-02 01:15:48 +03:00
Vladimír Čunát 91dced6ba0 nixos/manual: installation iso logs in automatically 2015-10-11 13:37:19 +02:00
Vladimír Čunát 38313d5d87 libxml2,libxslt: split into multiple outputs
Fixed all references, hopefully.
libxml2Python is slightly hacky now, but it seems to work.
2015-10-05 13:44:16 +02:00
Luca Bruno e9b3a4f7c4 rl-1509.xml: Gnome -> GNOME 2015-10-01 12:53:27 +02:00
Domen Kožar aca373c6b2 typos 2015-09-30 21:26:41 +02:00
Nicolas B. Pierron 50146ce815 Add pkgs module argument documentation for #6794 incompatible change. 2015-09-30 21:13:42 +02:00
Eelco Dolstra 5374c07c15 Tweak release notes 2015-09-30 19:30:07 +02:00
Domen Kožar 187854fced update release notes for 15.09
(cherry picked from commit e13b657670)
2015-09-30 19:28:16 +02:00
Peter Simons ece50d57ce rl-1509.xml: update Haskell-related release notes
- Update the link to the manual to refer to the proper place.
 - Mention LTS Haskell and Stackage Nightly.
 - Minor cosmetic to improve readability.
2015-09-30 16:17:05 +02:00
Vladimír Čunát 6070cd09fc haskell: make ghc, cabal-install, and stack visible
Thanks to @peti. Close #10035.
2015-09-27 17:18:44 +02:00
aszlig 39a03b679a
release-notes/15.09: Document changes for vboxsf.
Since 74209a4 we have initial support for the "vboxsf" (VirtualBox
shared folder) file system support. This will be cherry-picked to
release-15.09 so we need to notice people about the change.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-09-26 11:02:05 +02:00
aszlig 02c2500195
release-notes/15.09: Use <option/> for options.
There were quite a few configuration options which were tagged via
<literal/>, so in order to keep consistency with other docbook manuals
in the source tree, let's use <option/> here.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-09-26 11:01:37 +02:00
Vladimír Čunát 48200a96e0 doc/release notes (15.09): mention texlive 2015-09-25 14:24:47 +02:00
Eelco Dolstra 5b8dae8ef3 Prevent future store path references in the manual 2015-09-24 11:51:26 +02:00
Vladimír Čunát 9bd0bac311 nixos/manualPDF: use new texlive instead of tetex
This includes updating dblatex and crafting ~100 MB TeX package set
to make our manual compile.
2015-09-23 21:14:16 +02:00
Eelco Dolstra ddb39be324 Update 15.09 release notes 2015-09-21 11:17:25 +02:00
Eelco Dolstra 9c146220a9 Style / typo fixes 2015-09-21 11:17:25 +02:00