diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-13 16:42:48 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-13 16:42:55 +0200 |
| commit | 1a06373c0a9572791df7cbec9773aa79c620e2a5 (patch) | |
| tree | 10a02dd501b12a43a4824eb7d20ef714514b9ce4 /nixos/doc/manual | |
| parent | eb862c48ddc288243c5447e8decc623b10ef165c (diff) | |
| parent | 68052b56195715185efed7ccb91733cb4ae5d5f2 (diff) | |
| download | nixlib-1a06373c0a9572791df7cbec9773aa79c620e2a5.tar nixlib-1a06373c0a9572791df7cbec9773aa79c620e2a5.tar.gz nixlib-1a06373c0a9572791df7cbec9773aa79c620e2a5.tar.bz2 nixlib-1a06373c0a9572791df7cbec9773aa79c620e2a5.tar.lz nixlib-1a06373c0a9572791df7cbec9773aa79c620e2a5.tar.xz nixlib-1a06373c0a9572791df7cbec9773aa79c620e2a5.tar.zst nixlib-1a06373c0a9572791df7cbec9773aa79c620e2a5.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Conflicts: pkgs/development/libraries/libclc/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixos/doc/manual')
| -rw-r--r-- | nixos/doc/manual/default.nix | 9 | ||||
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-1803.xml | 10 |
2 files changed, 14 insertions, 5 deletions
diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 66fa4f0ba43c..bbe82066aa0c 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -63,18 +63,17 @@ let stripAnyPrefixes = lib.flip (lib.fold lib.removePrefix) prefixesToStrip; # Custom "less" that pushes up all the things ending in ".enable*" - # and ".package" - optionListLess = a: b: + # and ".package*" + optionLess = a: b: let - splt = lib.splitString "."; ise = lib.hasPrefix "enable"; isp = lib.hasPrefix "package"; cmp = lib.splitByAndCompare ise lib.compare (lib.splitByAndCompare isp lib.compare lib.compare); - in lib.compareLists cmp (splt a) (splt b) < 0; + in lib.compareLists cmp a.loc b.loc < 0; # Customly sort option list for the man page. - optionsList = lib.sort (a: b: optionListLess a.name b.name) optionsListDesc; + optionsList = lib.sort optionLess optionsListDesc; # Convert the list of options into an XML file. optionsXML = builtins.toFile "options.xml" (builtins.toXML optionsList); diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml index 9121c21a8690..f2a1bde19c76 100644 --- a/nixos/doc/manual/release-notes/rl-1803.xml +++ b/nixos/doc/manual/release-notes/rl-1803.xml @@ -38,6 +38,10 @@ has the following highlights: </para> </itemizedlist> </para> </listitem> + + <listitem> + <para>PHP now defaults to PHP 7.2</para> + </listitem> </itemizedlist> </section> @@ -207,6 +211,12 @@ following incompatible changes:</para> </listitem> </itemizedlist> </listitem> + <listitem> + <para> + The <literal>jid</literal> package has been removed, due to maintenance + overhead of a go package having non-versioned dependencies. + </para> + </listitem> </itemizedlist> </section> |