diff options
author | Samuel Leathers <samuel.leathers@iohk.io> | 2019-09-09 11:24:15 -0400 |
---|---|---|
committer | Samuel Leathers <samuel.leathers@iohk.io> | 2019-09-09 11:26:58 -0400 |
commit | 01268fda85b7eee4e462c873d8654f975067731f (patch) | |
tree | f4cebf9ea232db9016b58635ed2c64d0f49b9d29 | |
parent | d5c5847652819f97f8a04f4544c85cf8fc118f28 (diff) | |
download | nixpkgs-01268fda85b7eee4e462c873d8654f975067731f.tar nixpkgs-01268fda85b7eee4e462c873d8654f975067731f.tar.gz nixpkgs-01268fda85b7eee4e462c873d8654f975067731f.tar.bz2 nixpkgs-01268fda85b7eee4e462c873d8654f975067731f.tar.lz nixpkgs-01268fda85b7eee4e462c873d8654f975067731f.tar.xz nixpkgs-01268fda85b7eee4e462c873d8654f975067731f.tar.zst nixpkgs-01268fda85b7eee4e462c873d8654f975067731f.zip |
20.03 is Markhor
* Markhor is a spiral horned animal that is on the endangered species list * https://en.wikipedia.org/wiki/Markhor
-rw-r--r-- | .version | 2 | ||||
-rw-r--r-- | lib/trivial.nix | 2 | ||||
-rw-r--r-- | nixos/doc/manual/release-notes/release-notes.xml | 1 | ||||
-rw-r--r-- | nixos/doc/manual/release-notes/rl-2003.xml | 80 |
4 files changed, 83 insertions, 2 deletions
diff --git a/.version b/.version index ba19dc3bb41..88b8320330d 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -19.09 \ No newline at end of file +20.03 \ No newline at end of file diff --git a/lib/trivial.nix b/lib/trivial.nix index f2710a6f033..54c66cfce7b 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -134,7 +134,7 @@ rec { On each release the first letter is bumped and a new animal is chosen starting with that new letter. */ - codeName = "Loris"; + codeName = "Markhor"; /* Returns the current nixpkgs version suffix as string. */ versionSuffix = diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixos/doc/manual/release-notes/release-notes.xml index 02b59147721..444862c5739 100644 --- a/nixos/doc/manual/release-notes/release-notes.xml +++ b/nixos/doc/manual/release-notes/release-notes.xml @@ -8,6 +8,7 @@ This section lists the release notes for each stable version of NixOS and current unstable revision. </para> + <xi:include href="rl-2003.xml" /> <xi:include href="rl-1909.xml" /> <xi:include href="rl-1903.xml" /> <xi:include href="rl-1809.xml" /> diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml new file mode 100644 index 00000000000..c84bc8dbb37 --- /dev/null +++ b/nixos/doc/manual/release-notes/rl-2003.xml @@ -0,0 +1,80 @@ +<section xmlns="http://docbook.org/ns/docbook" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:xi="http://www.w3.org/2001/XInclude" + version="5.0" + xml:id="sec-release-20.03"> + <title>Release 20.03 (“Markhor”, 2020.03/??)</title> + + <section xmlns="http://docbook.org/ns/docbook" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:xi="http://www.w3.org/2001/XInclude" + version="5.0" + xml:id="sec-release-20.03-highlights"> + <title>Highlights</title> + + <para> + In addition to numerous new and upgraded packages, this release has the + following highlights: + </para> + + <itemizedlist> + <listitem> + <para> + Support is planned until the end of October 2020, handing over to 20.09. + </para> + </listitem> + </itemizedlist> + </section> + + <section xmlns="http://docbook.org/ns/docbook" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:xi="http://www.w3.org/2001/XInclude" + version="5.0" + xml:id="sec-release-20.03-new-services"> + <title>New Services</title> + + <para> + The following new services were added since the last release: + </para> + + <itemizedlist> + <listitem> + <para /> + </listitem> + </itemizedlist> + + </section> + + <section xmlns="http://docbook.org/ns/docbook" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:xi="http://www.w3.org/2001/XInclude" + version="5.0" + xml:id="sec-release-20.03-incompatibilities"> + <title>Backward Incompatibilities</title> + + <para> + When upgrading from a previous release, please be aware of the following + incompatible changes: + </para> + + <itemizedlist> + <listitem> + <para /> + </listitem> + </itemizedlist> + </section> + + <section xmlns="http://docbook.org/ns/docbook" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:xi="http://www.w3.org/2001/XInclude" + version="5.0" + xml:id="sec-release-20.03-notable-changes"> + <title>Other Notable Changes</title> + + <itemizedlist> + <listitem> + <para /> + </listitem> + </itemizedlist> + </section> +</section> |