From 09ecd173ec7e60275a8860da38f5e339ca823457 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 24 Jul 2024 16:59:42 +0300
Subject: [PATCH 1/5] gnuradio3_8: don't use confusing `with python.pkgs;` (in
 1 place)

---
 pkgs/applications/radio/gnuradio/3.8.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/radio/gnuradio/3.8.nix b/pkgs/applications/radio/gnuradio/3.8.nix
index 37533bb05d34..b8123d112003 100644
--- a/pkgs/applications/radio/gnuradio/3.8.nix
+++ b/pkgs/applications/radio/gnuradio/3.8.nix
@@ -103,11 +103,11 @@ let
       runtime = [
         thrift
       ];
-      pythonRuntime = with python.pkgs; [
+      pythonRuntime = [
         python.pkgs.thrift
         # For gr-perf-monitorx
-        matplotlib
-        networkx
+        python.pkgs.matplotlib
+        python.pkgs.networkx
       ];
     };
     gnuradio-companion = {

From 5b48a7c09a4bac4aa547bbaa1e54da4f49c59fc2 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 24 Jul 2024 16:59:49 +0300
Subject: [PATCH 2/5] gnuradio3_9: don't use confusing `with python.pkgs;` (in
 1 place)

---
 pkgs/applications/radio/gnuradio/3.9.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/radio/gnuradio/3.9.nix b/pkgs/applications/radio/gnuradio/3.9.nix
index b6a8ebd2dd8e..80be5b79c8aa 100644
--- a/pkgs/applications/radio/gnuradio/3.9.nix
+++ b/pkgs/applications/radio/gnuradio/3.9.nix
@@ -102,11 +102,11 @@ let
         libunwind
         thrift
       ];
-      pythonRuntime = with python.pkgs; [
+      pythonRuntime = [
         python.pkgs.thrift
         # For gr-perf-monitorx
-        matplotlib
-        networkx
+        python.pkgs.matplotlib
+        python.pkgs.networkx
       ];
       cmakeEnableFlag = "GR_CTRLPORT";
     };

From 573be242982f863718159ec2cb98444aaa46b142 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 24 Jul 2024 17:00:22 +0300
Subject: [PATCH 3/5] gnuradio: don't use confusing `with python.pkgs;` (in 1
 place)

---
 pkgs/applications/radio/gnuradio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix
index 9d05e1151bd8..964a4f0e2241 100644
--- a/pkgs/applications/radio/gnuradio/default.nix
+++ b/pkgs/applications/radio/gnuradio/default.nix
@@ -103,11 +103,11 @@ let
         libunwind
         thrift
       ];
-      pythonRuntime = with python.pkgs; [
+      pythonRuntime = [
         python.pkgs.thrift
         # For gr-perf-monitorx
-        matplotlib
-        networkx
+        python.pkgs.matplotlib
+        python.pkgs.networkx
       ];
       cmakeEnableFlag = "GR_CTRLPORT";
     };

From 381d63b9f856c7256d7a3b95bae8445be43dca78 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 24 Jul 2024 17:01:09 +0300
Subject: [PATCH 4/5] gnuradio{,3_9,3_8}: don't overuse with lib; in meta

---
 pkgs/applications/radio/gnuradio/shared.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/radio/gnuradio/shared.nix b/pkgs/applications/radio/gnuradio/shared.nix
index da3479777d4a..9cf8b22b4158 100644
--- a/pkgs/applications/radio/gnuradio/shared.nix
+++ b/pkgs/applications/radio/gnuradio/shared.nix
@@ -123,7 +123,7 @@ in {
     export QT_PLUGIN_PATH="${qt.qtbase.bin}/${qt.qtbase.qtPluginPrefix}"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Software Defined Radio (SDR) software";
     mainProgram = "gnuradio-config-info";
     longDescription = ''
@@ -136,8 +136,8 @@ in {
       real-world radio systems.
     '';
     homepage = "https://www.gnuradio.org";
-    license = licenses.gpl3;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ doronbehar bjornfor fpletz jiegec ];
+    license = lib.licenses.gpl3;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ doronbehar bjornfor fpletz jiegec ];
   };
 }

From 6282c8d0c66ff0304ed4fdeacffe9a899e24a497 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 24 Jul 2024 18:48:19 +0300
Subject: [PATCH 5/5] gnuradioMinimal: 3.10.10.0 -> 3.10.11.0

Diff: https://github.com/gnuradio/gnuradio/compare/v3.10.10.0...v3.10.11.0
---
 pkgs/applications/radio/gnuradio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix
index 964a4f0e2241..6a04491a5cee 100644
--- a/pkgs/applications/radio/gnuradio/default.nix
+++ b/pkgs/applications/radio/gnuradio/default.nix
@@ -44,11 +44,11 @@
 # If one wishes to use a different src or name for a very custom build
 , overrideSrc ? {}
 , pname ? "gnuradio"
-, version ? "3.10.10.0"
+, version ? "3.10.11.0"
 }:
 
 let
-  sourceSha256 = "sha256-pEVWhXDjOevrduDbZQbiDbODZY8PpsGY4O8yxrwlCcs=";
+  sourceSha256 = "sha256-QOZXUj+ZmfpazsrHEs8Gx3WSmoHG/zO43NEpyhIjpN8=";
   featuresInfo = {
     # Needed always
     basic = {