From 5ca9576f49b76d51260405623384b8b6c5f3e36e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 3 Jul 2021 18:18:51 +0200 Subject: [PATCH] doc: point out that nixos-21.05 has gnuradio 3.9 Logically re-apply 64c70a8c4c ("doc: point out that nixos-21.05 has gnuradio 3.9"), because it was lost in the conversion from docbook to markdown, in commit 32c2dd304d ("docs: nixos release notes to CommonMark (2105)"). (Apparently we have both .md and .xml release notes now, and CI fails unless they have the same content (after .md processing), so update the .xml file to match...) (cherry picked from commit cfe8c3a75eaa427f48bc93b15c65b826c00d7401) --- .../from_md/release-notes/rl-2105.section.xml | 14 ++++++++------ nixos/doc/manual/release-notes/rl-2105.section.md | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml index e043bee7761..3d039da8d54 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml @@ -101,16 +101,18 @@ GNURadio - 3.8 was + 3.8 and 3.9 were finally packaged, along with a rewrite to the Nix expressions, allowing users to override the features upstream supports selecting to compile or not to. Additionally, the attribute - gnuradio and gnuradio3_7 - now point to an externally wrapped by default derivations, - that allow you to also add `extraPythonPackages` to the Python - interpreter used by GNURadio. Missing environmental variables - needed for operational GUI were also added + gnuradio (3.9), + gnuradio3_8 and + gnuradio3_7 now point to an externally + wrapped by default derivations, that allow you to also add + `extraPythonPackages` to the Python interpreter used by + GNURadio. Missing environmental variables needed for + operational GUI were also added (#75478). diff --git a/nixos/doc/manual/release-notes/rl-2105.section.md b/nixos/doc/manual/release-notes/rl-2105.section.md index e4565b8ca60..6af6218fbc6 100644 --- a/nixos/doc/manual/release-notes/rl-2105.section.md +++ b/nixos/doc/manual/release-notes/rl-2105.section.md @@ -36,7 +36,7 @@ In addition to numerous new and upgraded packages, this release has the followin The following new services were added since the last release: -- [GNURadio](https://www.gnuradio.org/) 3.8 was [finally](https://github.com/NixOS/nixpkgs/issues/82263) packaged, along with a rewrite to the Nix expressions, allowing users to override the features upstream supports selecting to compile or not to. Additionally, the attribute `gnuradio` and `gnuradio3_7` now point to an externally wrapped by default derivations, that allow you to also add \`extraPythonPackages\` to the Python interpreter used by GNURadio. Missing environmental variables needed for operational GUI were also added ([\#75478](https://github.com/NixOS/nixpkgs/issues/75478)). +- [GNURadio](https://www.gnuradio.org/) 3.8 and 3.9 were [finally](https://github.com/NixOS/nixpkgs/issues/82263) packaged, along with a rewrite to the Nix expressions, allowing users to override the features upstream supports selecting to compile or not to. Additionally, the attribute `gnuradio` (3.9), `gnuradio3_8` and `gnuradio3_7` now point to an externally wrapped by default derivations, that allow you to also add \`extraPythonPackages\` to the Python interpreter used by GNURadio. Missing environmental variables needed for operational GUI were also added ([\#75478](https://github.com/NixOS/nixpkgs/issues/75478)). - [Keycloak](https://www.keycloak.org/), an open source identity and access management server with support for [OpenID Connect](https://openid.net/connect/), [OAUTH 2.0](https://oauth.net/2/) and [SAML 2.0](https://en.wikipedia.org/wiki/SAML_2.0).