summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorDoron Behar <doron.behar@gmail.com>2021-03-13 17:27:40 +0000
committerGitHub <noreply@github.com>2021-03-13 17:27:40 +0000
commit5e367ecef917dadbe3e977b281a33c1fc9cf6e59 (patch)
tree0b5ab70c2e6fd57b2546a5f1b52409815555ed08 /nixos
parent4f6919dcc7d95682e1a7368e131b2dc8bd56e224 (diff)
parentfb024f50e5557e42b4bb8249d0298c244ff8082d (diff)
downloadnixpkgs-5e367ecef917dadbe3e977b281a33c1fc9cf6e59.tar
nixpkgs-5e367ecef917dadbe3e977b281a33c1fc9cf6e59.tar.gz
nixpkgs-5e367ecef917dadbe3e977b281a33c1fc9cf6e59.tar.bz2
nixpkgs-5e367ecef917dadbe3e977b281a33c1fc9cf6e59.tar.lz
nixpkgs-5e367ecef917dadbe3e977b281a33c1fc9cf6e59.tar.xz
nixpkgs-5e367ecef917dadbe3e977b281a33c1fc9cf6e59.tar.zst
nixpkgs-5e367ecef917dadbe3e977b281a33c1fc9cf6e59.zip
Merge pull request #106599 from doronbehar/pkg/gnuradio/pkgs
Diffstat (limited to 'nixos')
-rw-r--r--nixos/doc/manual/release-notes/rl-2105.xml12
1 files changed, 11 insertions, 1 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2105.xml b/nixos/doc/manual/release-notes/rl-2105.xml
index 20775144e27..218bb3ae309 100644
--- a/nixos/doc/manual/release-notes/rl-2105.xml
+++ b/nixos/doc/manual/release-notes/rl-2105.xml
@@ -36,7 +36,17 @@
      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
-     (<link xlink:href="https://github.com/NixOS/nixpkgs/issues/75478">#7547</link>).
+     (<link xlink:href="https://github.com/NixOS/nixpkgs/issues/75478">#75478</link>).
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <link xlink:href="https://www.gnuradio.org/">GNURadio</link> has a
+     <code>pkgs</code> attribute set, and there's a <code>gnuradio.callPackage</code>
+     function that extends <code>pkgs</code> with a <code>mkDerivation</code>, and a
+     <code>mkDerivationWith</code>, like Qt5. Now all <code>gnuradio.pkgs</code> are
+     defined with <code>gnuradio.callPackage</code> and some packages that depend
+     on gnuradio are defined with this as well.
     </para>
    </listitem>
    <listitem>