summary refs log tree commit diff
path: root/nixos/doc
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-11-10 18:01:21 +0000
committerGitHub <noreply@github.com>2021-11-10 18:01:21 +0000
commit259e08cd22b7329471473e43f387647f7b288605 (patch)
tree5e639af11bd2a688528744790414f8a2dd0370dd /nixos/doc
parent84d856a651004949bacd679bdbbb66a1191a5586 (diff)
parent063dd314197c5f67f06f8b51755e65030fd2c8aa (diff)
downloadnixpkgs-259e08cd22b7329471473e43f387647f7b288605.tar
nixpkgs-259e08cd22b7329471473e43f387647f7b288605.tar.gz
nixpkgs-259e08cd22b7329471473e43f387647f7b288605.tar.bz2
nixpkgs-259e08cd22b7329471473e43f387647f7b288605.tar.lz
nixpkgs-259e08cd22b7329471473e43f387647f7b288605.tar.xz
nixpkgs-259e08cd22b7329471473e43f387647f7b288605.tar.zst
nixpkgs-259e08cd22b7329471473e43f387647f7b288605.zip
Merge master into staging-next
Diffstat (limited to 'nixos/doc')
-rw-r--r--nixos/doc/manual/from_md/release-notes/rl-2111.section.xml9
-rw-r--r--nixos/doc/manual/release-notes/rl-2111.section.md2
2 files changed, 11 insertions, 0 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
index 0fa7c0bf80f..f740827d11f 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
@@ -1925,6 +1925,15 @@ Superuser created successfully.
           upgrade guide</link>.
         </para>
       </listitem>
+      <listitem>
+        <para>
+          <literal>julia</literal> now refers to
+          <literal>julia-stable</literal> instead of
+          <literal>julia-lts</literal>. In practice this means it has
+          been upgraded from <literal>1.0.4</literal> to
+          <literal>1.5.4</literal>.
+        </para>
+      </listitem>
     </itemizedlist>
   </section>
 </section>
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md
index 9f0d52c4175..9bb7108fc05 100644
--- a/nixos/doc/manual/release-notes/rl-2111.section.md
+++ b/nixos/doc/manual/release-notes/rl-2111.section.md
@@ -530,3 +530,5 @@ In addition to numerous new and upgraded packages, this release has the followin
 - `security.pam.services.<name>.makeHomeDir` now uses `umask=0077` instead of `umask=0022` when creating the home directory.
 
 - Loki has had another release. Some default values have been changed for the configuration and some configuration options have been renamed. For more details, please check [the upgrade guide](https://grafana.com/docs/loki/latest/upgrading/#240).
+
+- `julia` now refers to `julia-stable` instead of `julia-lts`. In practice this means it has been upgraded from `1.0.4` to `1.5.4`.