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-07 00:01:38 +0000
committerGitHub <noreply@github.com>2021-11-07 00:01:38 +0000
commit91662101760ff0a67ce38785a207ddd7c17019a4 (patch)
treeb88e38b28ebe59d809beb4bb5cc90387b657efc0 /nixos/doc
parent1a9f8594c51aebbfecfae6fca760a2ec38ed2292 (diff)
parentb405a8b2d457b5100992aabcfe9528f81911b87b (diff)
downloadnixpkgs-91662101760ff0a67ce38785a207ddd7c17019a4.tar
nixpkgs-91662101760ff0a67ce38785a207ddd7c17019a4.tar.gz
nixpkgs-91662101760ff0a67ce38785a207ddd7c17019a4.tar.bz2
nixpkgs-91662101760ff0a67ce38785a207ddd7c17019a4.tar.lz
nixpkgs-91662101760ff0a67ce38785a207ddd7c17019a4.tar.xz
nixpkgs-91662101760ff0a67ce38785a207ddd7c17019a4.tar.zst
nixpkgs-91662101760ff0a67ce38785a207ddd7c17019a4.zip
Merge master into staging-next
Diffstat (limited to 'nixos/doc')
-rw-r--r--nixos/doc/manual/from_md/release-notes/rl-2111.section.xml8
-rw-r--r--nixos/doc/manual/release-notes/rl-2111.section.md2
2 files changed, 10 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 eb14b22b22d..555e09600db 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
@@ -441,6 +441,14 @@
           <literal>code-server</literal>-module now available
         </para>
       </listitem>
+      <listitem>
+        <para>
+          <link xlink:href="https://github.com/xmrig/xmrig">xmrig</link>,
+          a high performance, open source, cross platform RandomX,
+          KawPow, CryptoNight and AstroBWT unified CPU/GPU miner and
+          RandomX benchmark.
+        </para>
+      </listitem>
     </itemizedlist>
   </section>
   <section xml:id="sec-release-21.11-incompatibilities">
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md
index 1fe2ae10f58..92a191ad509 100644
--- a/nixos/doc/manual/release-notes/rl-2111.section.md
+++ b/nixos/doc/manual/release-notes/rl-2111.section.md
@@ -131,6 +131,8 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 - `code-server`-module now available
 
+- [xmrig](https://github.com/xmrig/xmrig), a high performance, open source, cross platform RandomX, KawPow, CryptoNight and AstroBWT unified CPU/GPU miner and RandomX benchmark.
+
 ## Backward Incompatibilities {#sec-release-21.11-incompatibilities}
 
 - The NixOS VM test framework, `pkgs.nixosTest`/`make-test-python.nix`, now requires detaching commands such as `succeed("foo &")` and `succeed("foo | xclip -i")` to close stdout.