From 3ce0b979388c89586b4d47de78c9119cde730d6a Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 18 Nov 2024 15:22:33 +0200
Subject: [PATCH 01/16] gnuradio: remove unused swig argument

---
 pkgs/applications/radio/gnuradio/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix
index 8b6d319d65789..826dbeae7d0cf 100644
--- a/pkgs/applications/radio/gnuradio/default.nix
+++ b/pkgs/applications/radio/gnuradio/default.nix
@@ -10,7 +10,6 @@
 , orc
 , boost
 , spdlog
-, swig
 , mpir
 , doxygen
 , python

From 9fb5c8cec93ab4150f59c20b1e672fbbe6f1e6e7 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 18 Nov 2024 16:55:19 +0200
Subject: [PATCH 02/16] gnuradio: use new apple-sdk pattern

---
 pkgs/applications/radio/gnuradio/default.nix          | 2 --
 pkgs/development/gnuradio-modules/osmosdr/default.nix | 4 ----
 pkgs/top-level/all-packages.nix                       | 1 -
 3 files changed, 7 deletions(-)

diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix
index 826dbeae7d0cf..1dbf1a3d691f8 100644
--- a/pkgs/applications/radio/gnuradio/default.nix
+++ b/pkgs/applications/radio/gnuradio/default.nix
@@ -20,7 +20,6 @@
 , libjack2
 , libiio
 , libad9361
-, CoreAudio
 , uhd
 , SDL
 , gsl
@@ -172,7 +171,6 @@ let
     gr-audio = {
       runtime = []
         ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libjack2 ]
-        ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreAudio ]
       ;
       cmakeEnableFlag = "GR_AUDIO";
     };
diff --git a/pkgs/development/gnuradio-modules/osmosdr/default.nix b/pkgs/development/gnuradio-modules/osmosdr/default.nix
index aae85f02ab74a..588adb32fe057 100644
--- a/pkgs/development/gnuradio-modules/osmosdr/default.nix
+++ b/pkgs/development/gnuradio-modules/osmosdr/default.nix
@@ -1,6 +1,5 @@
 { lib
 , stdenv
-, darwin
 , mkDerivation
 , fetchgit
 , gnuradio
@@ -71,9 +70,6 @@ in mkDerivation {
   ] ++ lib.optionals (gnuradio.hasFeature "python-support") [
       python.pkgs.numpy
       python.pkgs.pybind11
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    darwin.apple_sdk.frameworks.IOKit
-    darwin.apple_sdk.frameworks.Security
   ];
   cmakeFlags = [
     (if (gnuradio.hasFeature "python-support") then
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b826bf356e79c..0c2d0e0c5d0c1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13637,7 +13637,6 @@ with pkgs;
 
   gnuradio = callPackage ../applications/radio/gnuradio/wrapper.nix {
     unwrapped = callPackage ../applications/radio/gnuradio {
-      inherit (darwin.apple_sdk.frameworks) CoreAudio;
       python = python311;
     };
   };

From 6d55129551f7340fbdb349eae41fecb8c6ad0e18 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 18 Nov 2024 17:00:31 +0200
Subject: [PATCH 03/16] gnuradioPackages.osmosdr: don't use with lib; in meta

---
 pkgs/development/gnuradio-modules/osmosdr/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/gnuradio-modules/osmosdr/default.nix b/pkgs/development/gnuradio-modules/osmosdr/default.nix
index 588adb32fe057..82acd2554d388 100644
--- a/pkgs/development/gnuradio-modules/osmosdr/default.nix
+++ b/pkgs/development/gnuradio-modules/osmosdr/default.nix
@@ -92,11 +92,11 @@ in mkDerivation {
     ]
   ;
 
-  meta = with lib; {
+  meta = {
     description = "Gnuradio block for OsmoSDR and rtl-sdr";
     homepage = "https://sdr.osmocom.org/trac/wiki/GrOsmoSDR";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ bjornfor ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ bjornfor ];
+    platforms = lib.platforms.unix;
   };
 }

From 592ebbfbf1b601395294614e826237c41164efcf Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 18 Nov 2024 15:30:04 +0200
Subject: [PATCH 04/16] gnuradioMinimal: move to pkgs/by-name

---
 pkgs/by-name/gn/gnuradioMinimal/package.nix | 31 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             | 26 -----------------
 2 files changed, 31 insertions(+), 26 deletions(-)
 create mode 100644 pkgs/by-name/gn/gnuradioMinimal/package.nix

diff --git a/pkgs/by-name/gn/gnuradioMinimal/package.nix b/pkgs/by-name/gn/gnuradioMinimal/package.nix
new file mode 100644
index 0000000000000..7d52dd744c967
--- /dev/null
+++ b/pkgs/by-name/gn/gnuradioMinimal/package.nix
@@ -0,0 +1,31 @@
+{
+  gnuradio,
+  volk,
+  uhdMinimal,
+}:
+# A build without gui components and other utilites not needed for end user
+# libraries
+gnuradio.override {
+  doWrap = false;
+  unwrapped = gnuradio.unwrapped.override {
+    volk = volk.override {
+      # So it will not reference python
+      enableModTool = false;
+    };
+    uhd = uhdMinimal;
+    features = {
+      gnuradio-companion = false;
+      python-support = false;
+      examples = false;
+      gr-qtgui = false;
+      gr-utils = false;
+      gr-modtool = false;
+      gr-blocktool = false;
+      sphinx = false;
+      doxygen = false;
+      # Doesn't make it reference python eventually, but makes reverse
+      # depdendencies require python to use cmake files of GR.
+      gr-ctrlport = false;
+    };
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0c2d0e0c5d0c1..e55e7941845d2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13641,32 +13641,6 @@ with pkgs;
     };
   };
   gnuradioPackages = lib.recurseIntoAttrs gnuradio.pkgs;
-  # A build without gui components and other utilites not needed for end user
-  # libraries
-  gnuradioMinimal = gnuradio.override {
-    doWrap = false;
-    unwrapped = gnuradio.unwrapped.override {
-      volk = volk.override {
-        # So it will not reference python
-        enableModTool = false;
-      };
-      uhd = uhdMinimal;
-      features = {
-        gnuradio-companion = false;
-        python-support = false;
-        examples = false;
-        gr-qtgui = false;
-        gr-utils = false;
-        gr-modtool = false;
-        gr-blocktool = false;
-        sphinx = false;
-        doxygen = false;
-        # Doesn't make it reference python eventually, but makes reverse
-        # depdendencies require python to use cmake files of GR.
-        gr-ctrlport = false;
-      };
-    };
-  };
   gnuradio3_8 = callPackage ../applications/radio/gnuradio/wrapper.nix {
     unwrapped = callPackage ../applications/radio/gnuradio/3.8.nix ({
       inherit (darwin.apple_sdk.frameworks) CoreAudio;

From d8be53aeab8c6a0c9cbb220557bf1860a329fc7f Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 18 Nov 2024 16:17:41 +0200
Subject: [PATCH 05/16] inspectrum: switch to GR 3.10

---
 pkgs/by-name/in/inspectrum/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/in/inspectrum/package.nix b/pkgs/by-name/in/inspectrum/package.nix
index afdf80ede1a0c..7cc74eb82b9c9 100644
--- a/pkgs/by-name/in/inspectrum/package.nix
+++ b/pkgs/by-name/in/inspectrum/package.nix
@@ -1,5 +1,5 @@
 { lib
-, gnuradio3_8Minimal
+, gnuradioMinimal
 , thrift
 , fetchFromGitHub
 , pkg-config
@@ -9,7 +9,7 @@
 , liquid-dsp
 }:
 
-gnuradio3_8Minimal.pkgs.mkDerivation rec {
+gnuradioMinimal.pkgs.mkDerivation rec {
   pname = "inspectrum";
   version = "0.3.1";
 
@@ -29,9 +29,9 @@ gnuradio3_8Minimal.pkgs.mkDerivation rec {
     fftwFloat
     liquid-dsp
     qt5.qtbase
-  ] ++ lib.optionals (gnuradio3_8Minimal.hasFeature "gr-ctrlport") [
+  ] ++ lib.optionals (gnuradioMinimal.hasFeature "gr-ctrlport") [
     thrift
-    gnuradio3_8Minimal.unwrapped.python.pkgs.thrift
+    gnuradioMinimal.unwrapped.python.pkgs.thrift
   ];
 
   meta = with lib; {

From d79a8896cb4a73c31a6ba9d3ab25f216ea3f8068 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 18 Nov 2024 16:21:15 +0200
Subject: [PATCH 06/16] gnuradio3_8: remove

---
 pkgs/applications/radio/gnuradio/3.8.nix | 289 -----------------------
 pkgs/top-level/aliases.nix               |   3 +
 pkgs/top-level/all-packages.nix          |  34 ---
 3 files changed, 3 insertions(+), 323 deletions(-)
 delete mode 100644 pkgs/applications/radio/gnuradio/3.8.nix

diff --git a/pkgs/applications/radio/gnuradio/3.8.nix b/pkgs/applications/radio/gnuradio/3.8.nix
deleted file mode 100644
index 3379ba4c1df9b..0000000000000
--- a/pkgs/applications/radio/gnuradio/3.8.nix
+++ /dev/null
@@ -1,289 +0,0 @@
-{ lib, stdenv
-, fetchFromGitHub
-, fetchpatch
-, cmake
-# Remove gcc and python references
-, removeReferencesTo
-, pkg-config
-, volk
-, cppunit
-, swig3
-, orc
-, boost
-, log4cpp
-, mpir
-, doxygen
-, python
-, codec2
-, gsm
-, thrift
-, fftwFloat
-, alsa-lib
-, libjack2
-, CoreAudio
-, uhd
-, SDL
-, gsl
-, cppzmq
-# Needed only if qt-gui is disabled, from some reason
-, icu
-# GUI related
-, gtk3
-, pango
-, gobject-introspection
-, cairo
-, qt5
-, libsForQt5
-# Features available to override, the list of them is in featuresInfo. They
-# are all turned on by default.
-, features ? {}
-# If one wishes to use a different src or name for a very custom build
-, overrideSrc ? {}
-, pname ? "gnuradio"
-, version ? "3.8.5.0"
-}:
-
-let
-  sourceSha256 = "sha256-p4VFjTE0GXmdA7QGhWSUzO/WxJ+8Dq3JEnOABtQtJUU=";
-  featuresInfo = {
-    # Needed always
-    basic = {
-      native = [
-        cmake
-        pkg-config
-        orc
-      ];
-      runtime = [
-        boost
-        log4cpp
-        mpir
-      ]
-        # when gr-qtgui is disabled, icu needs to be included, otherwise
-        # building with boost 1.7x fails
-        ++ lib.optionals (!(hasFeature "gr-qtgui")) [ icu ];
-      pythonNative = with python.pkgs; [
-        mako
-        six
-      ];
-    };
-    volk = {
-      cmakeEnableFlag = "VOLK";
-      runtime = [
-        volk
-      ];
-    };
-    doxygen = {
-      native = [ doxygen ];
-      cmakeEnableFlag = "DOXYGEN";
-    };
-    sphinx = {
-      pythonNative = with python.pkgs; [ sphinx ];
-      cmakeEnableFlag = "SPHINX";
-    };
-    python-support = {
-      pythonRuntime = [ python.pkgs.six ];
-      native = [
-        swig3
-        python
-      ];
-      cmakeEnableFlag = "PYTHON";
-    };
-    testing-support = {
-      native = [ cppunit ];
-      cmakeEnableFlag = "TESTING";
-    };
-    gnuradio-runtime = {
-      cmakeEnableFlag = "GNURADIO_RUNTIME";
-    };
-    gr-ctrlport = {
-      cmakeEnableFlag = "GR_CTRLPORT";
-      native = [
-        swig3
-      ];
-      runtime = [
-        thrift
-      ];
-      pythonRuntime = [
-        python.pkgs.thrift
-        # For gr-perf-monitorx
-        python.pkgs.matplotlib
-        python.pkgs.networkx
-      ];
-    };
-    gnuradio-companion = {
-      pythonRuntime = with python.pkgs; [
-        pyyaml
-        mako
-        numpy
-        pygobject3
-      ];
-      runtime = [
-        gtk3
-        pango
-        gobject-introspection
-        cairo
-      ];
-      cmakeEnableFlag = "GRC";
-    };
-    gr-blocks = {
-      cmakeEnableFlag = "GR_BLOCKS";
-    };
-    gr-fec = {
-      cmakeEnableFlag = "GR_FEC";
-    };
-    gr-fft = {
-      runtime = [ fftwFloat ];
-      cmakeEnableFlag = "GR_FFT";
-    };
-    gr-filter = {
-      runtime = [ fftwFloat ];
-      cmakeEnableFlag = "GR_FILTER";
-    };
-    gr-analog = {
-      cmakeEnableFlag = "GR_ANALOG";
-    };
-    gr-digital = {
-      cmakeEnableFlag = "GR_DIGITAL";
-    };
-    gr-dtv = {
-      cmakeEnableFlag = "GR_DTV";
-    };
-    gr-audio = {
-      runtime = []
-        ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libjack2 ]
-        ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreAudio ]
-      ;
-      cmakeEnableFlag = "GR_AUDIO";
-    };
-    gr-channels = {
-      cmakeEnableFlag = "GR_CHANNELS";
-    };
-    gr-qtgui = {
-      runtime = [ qt5.qtbase libsForQt5.qwt6_1 ];
-      pythonRuntime = [ python.pkgs.pyqt5 ];
-      cmakeEnableFlag = "GR_QTGUI";
-    };
-    gr-trellis = {
-      cmakeEnableFlag = "GR_TRELLIS";
-    };
-    gr-uhd = {
-      runtime = [ uhd ];
-      cmakeEnableFlag = "GR_UHD";
-    };
-    gr-utils = {
-      cmakeEnableFlag = "GR_UTILS";
-      pythonRuntime = with python.pkgs; [
-        # For gr_plot
-        matplotlib
-      ];
-    };
-    gr-modtool = {
-      pythonRuntime = with python.pkgs; [
-        setuptools
-        click
-        click-plugins
-      ];
-      cmakeEnableFlag = "GR_MODTOOL";
-    };
-    gr-video-sdl = {
-      runtime = [ SDL ];
-      cmakeEnableFlag = "GR_VIDEO_SDL";
-    };
-    gr-vocoder = {
-      runtime = [ codec2 gsm ];
-      cmakeEnableFlag = "GR_VOCODER";
-    };
-    gr-wavelet = {
-      cmakeEnableFlag = "GR_WAVELET";
-      runtime = [ gsl ];
-    };
-    gr-zeromq = {
-      runtime = [ cppzmq ];
-      cmakeEnableFlag = "GR_ZEROMQ";
-      pythonRuntime = [
-        # Will compile without this, but it is required by tests, and by some
-        # gr blocks.
-        python.pkgs.pyzmq
-      ];
-    };
-  };
-  shared = (import ./shared.nix {
-    inherit
-      stdenv
-      lib
-      python
-      removeReferencesTo
-      featuresInfo
-      features
-      version
-      sourceSha256
-      overrideSrc
-      fetchFromGitHub
-    ;
-    qt = qt5;
-    gtk = gtk3;
-  });
-  inherit (shared.passthru) hasFeature; # function
-in
-
-stdenv.mkDerivation (finalAttrs: (shared // {
-  inherit pname version;
-  # Will still evaluate correctly if not used here. It only helps nix-update
-  # find the right file in which version is defined.
-  inherit (shared) src;
-  # Some of the tests we know why they fail, but others simply hang-out and
-  # timeout...
-  doCheck = false;
-  patches = [
-    # Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227
-    ./modtool-newmod-permissions.3_8.patch
-    # Fix compilation with boost 177
-    (fetchpatch {
-      url = "https://github.com/gnuradio/gnuradio/commit/2c767bb260a25b415e8c9c4b3ea37280b2127cec.patch";
-      sha256 = "sha256-l4dSzkXb5s3vcCeuKMMwiKfv83hFI9Yg+EMEX+sl+Uo=";
-    })
-  ];
-  passthru = shared.passthru // {
-    # Deps that are potentially overridden and are used inside GR plugins - the same version must
-    inherit
-      boost
-      volk
-    ;
-    # Used by many gnuradio modules, the same attribute is present in
-    # gnuradio3.10 where there it's spdlog.
-    logLib = log4cpp;
-  } // lib.optionalAttrs (hasFeature "gr-uhd") {
-    inherit uhd;
-  } // lib.optionalAttrs (hasFeature "gr-qtgui") {
-    qwt = libsForQt5.qwt6_1;
-  };
-  cmakeFlags = shared.cmakeFlags
-    # From some reason, if these are not set, libcodec2 and gsm are not
-    # detected properly. The issue is reported upstream:
-    # https://github.com/gnuradio/gnuradio/issues/4278
-    # The above issue was fixed for GR3.9 without a backporting patch.
-    #
-    # NOTE: qradiolink needs libcodec2 to be detected in
-    # order to build, see https://github.com/qradiolink/qradiolink/issues/67
-    ++ lib.optionals (hasFeature "gr-vocoder") [
-      "-DLIBCODEC2_FOUND=TRUE"
-      "-DLIBCODEC2_LIBRARIES=${codec2}/lib/libcodec2${stdenv.hostPlatform.extensions.sharedLibrary}"
-      "-DLIBCODEC2_INCLUDE_DIRS=${codec2}/include"
-      "-DLIBCODEC2_HAS_FREEDV_API=ON"
-      "-DLIBGSM_FOUND=TRUE"
-      "-DLIBGSM_LIBRARIES=${gsm}/lib/libgsm${stdenv.hostPlatform.extensions.sharedLibrary}"
-      "-DLIBGSM_INCLUDE_DIRS=${gsm}/include/gsm"
-    ]
-    ++ lib.optionals (hasFeature "volk" && volk != null) [
-      "-DENABLE_INTERNAL_VOLK=OFF"
-    ]
-  ;
-
-  postInstall = shared.postInstall
-    # This is the only python reference worth removing, if needed (3.7 doesn't
-    # set that reference).
-    + lib.optionalString (!hasFeature "python-support") ''
-      remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake
-    ''
-  ;
-}))
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 2b5d5afbf31f3..9b9124c71c464 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -503,6 +503,9 @@ mapAliases {
   gnuradio3_9 = throw "gnuradio3_9 has been removed because it is not compatible with the latest volk and it had no dependent packages which justified it's distribution"; # Added 2024-07-28
   gnuradio3_9Minimal = throw "gnuradio3_9Minimal has been removed because it is not compatible with the latest volk and it had no dependent packages which justified it's distribution"; # Added 2024-07-28
   gnuradio3_9Packages = throw "gnuradio3_9Minimal has been removed because it is not compatible with the latest volk and it had no dependent packages which justified it's distribution"; # Added 2024-07-28
+  gnuradio3_8 = throw "gnuradio3_8 has been removed because it was too old and incompatible with a not EOL swig"; # Added 2024-11-18
+  gnuradio3_8Minimal = throw "gnuradio3_8Minimal has been removed because it was too old and incompatible with a not EOL swig"; # Added 2024-11-18
+  gnuradio3_8Packages = throw "gnuradio3_8Minimal has been removed because it was too old and incompatible with a not EOL swig"; # Added 2024-11-18
   gn1924 = throw "gn1924 has been removed because it was broken and no longer used by envoy."; # Added 2024-11-03
   gobby5 = throw "'gobby5' has been renamed to/replaced by 'gobby'"; # Converted to throw 2024-10-17
   gradle_6 = throw "Gradle 6 has been removed, as it is end-of-life (https://endoflife.date/gradle) and has many vulnerabilities that are not resolved until Gradle 7."; # Added 2024-10-30
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e55e7941845d2..66eee789b1681 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13641,40 +13641,6 @@ with pkgs;
     };
   };
   gnuradioPackages = lib.recurseIntoAttrs gnuradio.pkgs;
-  gnuradio3_8 = callPackage ../applications/radio/gnuradio/wrapper.nix {
-    unwrapped = callPackage ../applications/radio/gnuradio/3.8.nix ({
-      inherit (darwin.apple_sdk.frameworks) CoreAudio;
-      python = python311;
-      volk = volk_2;
-    } // lib.optionalAttrs stdenv.hostPlatform.isLinux {
-      stdenv = pkgs.stdenvAdapters.useLibsFrom stdenv pkgs.gcc12Stdenv;
-    });
-  };
-  gnuradio3_8Packages = lib.recurseIntoAttrs gnuradio3_8.pkgs;
-  # A build without gui components and other utilites not needed if gnuradio is
-  # used as a c++ library.
-  gnuradio3_8Minimal = gnuradio3_8.override {
-    doWrap = false;
-    unwrapped = gnuradio3_8.unwrapped.override {
-      volk = volk_2.override {
-        enableModTool = false;
-      };
-      uhd = uhdMinimal;
-      features = {
-        gnuradio-companion = false;
-        python-support = false;
-        examples = false;
-        gr-qtgui = false;
-        gr-utils = false;
-        gr-modtool = false;
-        sphinx = false;
-        doxygen = false;
-        # Doesn't make it reference python eventually, but makes reverse
-        # depdendencies require python to use cmake files of GR.
-        gr-ctrlport = false;
-      };
-    };
-  };
 
   grandorgue = callPackage ../applications/audio/grandorgue {
     inherit (darwin.apple_sdk.frameworks) Cocoa;

From 7c046c1e241c59473f27db817cc780eda2bc8b7b Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 23 Dec 2024 19:30:16 +0200
Subject: [PATCH 07/16] kodi: add patch for swig 4.3.0

---
 pkgs/applications/video/kodi/unwrapped.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix
index 495e8f398b37e..4866a2b9f23e8 100644
--- a/pkgs/applications/video/kodi/unwrapped.nix
+++ b/pkgs/applications/video/kodi/unwrapped.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, fetchzip
+{ stdenv, lib, fetchFromGitHub, fetchpatch, fetchzip
 , autoconf, automake, libtool, makeWrapper
 , pkg-config, cmake, yasm, python3Packages
 , libxcrypt, libgcrypt, libgpg-error, libunistring
@@ -99,6 +99,10 @@ in stdenv.mkDerivation (finalAttrs: {
 
     patches = [
       ./no-python-lib.patch
+      (fetchpatch {
+        url = "https://github.com/xbmc/xbmc/commit/32b04718c65a90f87e409674c4ef984b087b8657.patch";
+        hash = "sha256-I79thepzDOfw55r9gfaOp/Ri2FA0gouc+RgTc2Zh1Sw=";
+      })
     ];
 
     # make  derivations declared in the let binding available here, so
@@ -190,7 +194,7 @@ in stdenv.mkDerivation (finalAttrs: {
       "-DENABLE_OPTICAL=${if opticalSupport then "ON" else "OFF"}"
       "-DENABLE_VDPAU=${if vdpauSupport then "ON" else "OFF"}"
       "-DLIRC_DEVICE=/run/lirc/lircd"
-      "-DSWIG_EXECUTABLE=${buildPackages.swig3}/bin/swig"
+      "-DSWIG_EXECUTABLE=${buildPackages.swig}/bin/swig"
       "-DFLATBUFFERS_FLATC_EXECUTABLE=${buildPackages.flatbuffers}/bin/flatc"
       "-DPYTHON_EXECUTABLE=${buildPackages.python3Packages.python}/bin/python"
       "-DPYTHON_LIB_PATH=${python3Packages.python.sitePackages}"

From 4a9dcde80bb58678ebbfe6967f4b0e144d9635b5 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 18 Nov 2024 16:39:48 +0200
Subject: [PATCH 08/16] swig3: remove

---
 pkgs/by-name/sw/swig3/package.nix | 56 -------------------------------
 pkgs/top-level/aliases.nix        |  1 +
 2 files changed, 1 insertion(+), 56 deletions(-)
 delete mode 100644 pkgs/by-name/sw/swig3/package.nix

diff --git a/pkgs/by-name/sw/swig3/package.nix b/pkgs/by-name/sw/swig3/package.nix
deleted file mode 100644
index 44848c13582cc..0000000000000
--- a/pkgs/by-name/sw/swig3/package.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  autoconf,
-  automake,
-  libtool,
-  bison,
-  pcre,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "swig";
-  version = "3.0.12";
-
-  src = fetchFromGitHub {
-    owner = "swig";
-    repo = "swig";
-    rev = "rel-${finalAttrs.version}";
-    sha256 = "1wyffskbkzj5zyhjnnpip80xzsjcr3p0q5486z3wdwabnysnhn8n";
-  };
-
-  # Not using autoreconfHook because it fails due to missing macros, contrary
-  # to this script
-  preConfigure = ''
-    ./autogen.sh
-  '';
-
-  nativeBuildInputs = [
-    autoconf
-    automake
-    libtool
-    bison
-  ];
-  buildInputs = [
-    pcre
-  ];
-
-  configureFlags = [
-    "--without-tcl"
-  ];
-
-  # Disable ccache documentation as it needs yodl
-  postPatch = ''
-    sed -i '/man1/d' CCache/Makefile.in
-  '';
-
-  meta = {
-    description = "Interface compiler that connects C/C++ code to higher-level languages";
-    homepage = "https://swig.org/";
-    # Different types of licenses available: http://www.swig.org/Release/LICENSE .
-    license = lib.licenses.gpl3Plus;
-    platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ doronbehar ];
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 9b9124c71c464..89f848224644f 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1254,6 +1254,7 @@ mapAliases {
   swiPrologWithGui = lib.warnOnInstantiate "swiPrologWithGui has been renamed to swi-prolog-gui" swi-prolog-gui; # Added 2024-09-07
   swig1 = throw "swig1 has been removed as it is obsolete"; # Added 2024-08-23
   swig2 = throw "swig2 has been removed as it is obsolete"; # Added 2024-08-23
+  swig3 = throw "swig3 has been removed as it is obsolete"; # Added 2024-11-18
   swig4 = swig; # Added 2024-09-12
   swigWithJava = throw "swigWithJava has been removed as the main swig package has supported Java since 2009"; # Added 2024-09-12
   swtpm-tpm2 = throw "'swtpm-tpm2' has been renamed to/replaced by 'swtpm'"; # Converted to throw 2024-10-17

From c405f45fc0a1136e3044d9791ede7db1246fb517 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 18 Nov 2024 17:01:00 +0200
Subject: [PATCH 09/16] gnuradioPackages.osmosdr: simplify expression for a
 single GR version

Remove unused swig3 dependency - was really needed only for GR 3.8 that
is now removed.
---
 .../gnuradio-modules/osmosdr/default.nix      | 30 +++++--------------
 1 file changed, 7 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/gnuradio-modules/osmosdr/default.nix b/pkgs/development/gnuradio-modules/osmosdr/default.nix
index 82acd2554d388..5fe07a0d5d2f6 100644
--- a/pkgs/development/gnuradio-modules/osmosdr/default.nix
+++ b/pkgs/development/gnuradio-modules/osmosdr/default.nix
@@ -13,7 +13,6 @@
 , thrift
 , fftwFloat
 , python
-, swig3
 , uhd
 , icu
 , airspy
@@ -24,26 +23,16 @@
 , gnuradioAtLeast
 }:
 
-let
-  version = {
-    "3.7" = "0.1.5";
-    "3.8" = "0.2.3";
-    "3.9" = "0.2.6";
-    "3.10" = "0.2.6";
-  }.${gnuradio.versionAttr.major};
+mkDerivation rec {
+  pname = "gr-osmosdr";
+  version = "0.2.6";
+
   src = fetchgit {
     url = "https://gitea.osmocom.org/sdr/gr-osmosdr";
     rev = "v${version}";
-    sha256 = {
-      "3.7" = "0bf9bnc1c3c4yqqqgmg3nhygj6rcfmyk6pybi27f7461d2cw1drv";
-      "3.8" = "sha256-ZfI8MshhZOdJ1U5FlnZKXsg2Rsvb6oKg943ZVYd/IWo=";
-      "3.9" = "sha256-jCUzBY1pYiEtcRQ97t9F6uEMVYw2NU0eoB5Xc2H6pGQ=";
-      "3.10" = "sha256-jCUzBY1pYiEtcRQ97t9F6uEMVYw2NU0eoB5Xc2H6pGQ=";
-    }.${gnuradio.versionAttr.major};
+    hash = "sha256-jCUzBY1pYiEtcRQ97t9F6uEMVYw2NU0eoB5Xc2H6pGQ=";
   };
-in mkDerivation {
-  pname = "gr-osmosdr";
-  inherit version src;
+
   disabled = gnuradioAtLeast "3.11";
 
   outputs = [ "out" "dev" ];
@@ -81,13 +70,8 @@ in mkDerivation {
   nativeBuildInputs = [
     cmake
     pkg-config
-    swig3
   ] ++ lib.optionals (gnuradio.hasFeature "python-support") [
-      (if (gnuradio.versionAttr.major == "3.7") then
-        python.pkgs.cheetah
-      else
-        python.pkgs.mako
-      )
+      python.pkgs.mako
       python
     ]
   ;

From 90639458999c66bc2d8d85eea67dfcf818baa62f Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 18 Nov 2024 17:10:53 +0200
Subject: [PATCH 10/16] gnuradioPackages.ais: remove

Cannot be used anymore by any modern GR version.
---
 .../gnuradio-modules/ais/default.nix          | 66 -------------------
 pkgs/top-level/gnuradio-packages.nix          |  2 -
 2 files changed, 68 deletions(-)
 delete mode 100644 pkgs/development/gnuradio-modules/ais/default.nix

diff --git a/pkgs/development/gnuradio-modules/ais/default.nix b/pkgs/development/gnuradio-modules/ais/default.nix
deleted file mode 100644
index a86fce043d97a..0000000000000
--- a/pkgs/development/gnuradio-modules/ais/default.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-{ lib
-, stdenv
-, mkDerivation
-, fetchFromGitHub
-, cmake
-, pkg-config
-, python
-, boost
-, cppunit
-, logLib
-, osmosdr
-, gmp
-, mpir
-, fftwFloat
-, icu
-, gnuradio
-, thrift
-, gnuradioAtLeast
-}:
-
-mkDerivation rec {
-  pname = "gr-ais";
-  version = "2020-08-13";
-  src = fetchFromGitHub {
-    owner = "bistromath";
-    repo = "gr-ais";
-    rev = "2162103226f3dae43c8c2ab23b79483b84346665";
-    sha256 = "1vackka34722d8pcspfwj0j6gc9ic7dqq64sgkrpjm94sh3bmb0b";
-  };
-  disabled = gnuradioAtLeast "3.9";
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    python
-  ];
-
-  cmakeFlags = [
-    "-DCMAKE_EXE_LINKER_FLAGS=-pthread"
-  ];
-
-  buildInputs = [
-    cppunit
-    osmosdr
-    boost
-    logLib
-    gmp
-    mpir
-    fftwFloat
-    icu
-    thrift
-    gnuradio.python.pkgs.thrift
-  ];
-
-  meta = with lib; {
-    description = "Gnuradio block for ais";
-    mainProgram = "ais_rx";
-    homepage = "https://github.com/bistromath/gr-ais";
-    license = licenses.gpl3Plus;
-    platforms = platforms.unix;
-    # rpcserver_aggregator.h:111:54: error: no template named 'unary_function'
-    # in namespace 'std'; did you mean '__unary_function'?
-    broken = stdenv.hostPlatform.isDarwin;
-    maintainers = with maintainers; [ mog ];
-  };
-}
diff --git a/pkgs/top-level/gnuradio-packages.nix b/pkgs/top-level/gnuradio-packages.nix
index d2bcb572ac0b0..2d772e79a3015 100644
--- a/pkgs/top-level/gnuradio-packages.nix
+++ b/pkgs/top-level/gnuradio-packages.nix
@@ -37,8 +37,6 @@ in {
 
   osmosdr = callPackage ../development/gnuradio-modules/osmosdr/default.nix { };
 
-  ais = callPackage ../development/gnuradio-modules/ais/default.nix { };
-
   fosphor = callPackage ../development/gnuradio-modules/fosphor/default.nix { };
 
   grnet = callPackage ../development/gnuradio-modules/grnet/default.nix { };

From 19f71524c2f2818b1ed7c873a5901ab39f267b9d Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 18 Nov 2024 17:14:12 +0200
Subject: [PATCH 11/16] gnuradioPackages.limesdr: remove

Cannot be used anymore by any modern GR version.
---
 .../gnuradio-modules/limesdr/default.nix      | 63 -------------------
 pkgs/top-level/gnuradio-packages.nix          |  2 -
 2 files changed, 65 deletions(-)
 delete mode 100644 pkgs/development/gnuradio-modules/limesdr/default.nix

diff --git a/pkgs/development/gnuradio-modules/limesdr/default.nix b/pkgs/development/gnuradio-modules/limesdr/default.nix
deleted file mode 100644
index 27c846c44af59..0000000000000
--- a/pkgs/development/gnuradio-modules/limesdr/default.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{ lib
-, mkDerivation
-, fetchFromGitHub
-, gnuradio
-, thrift
-, cmake
-, pkg-config
-, swig3
-, python
-, logLib
-, mpir
-, boost
-, gmp
-, icu
-, limesuite
-, gnuradioAtLeast
-}:
-
-let
-  version = {
-    "3.7" = "2.0.0";
-    "3.8" = "3.0.1";
-  }.${gnuradio.versionAttr.major};
-  src = fetchFromGitHub {
-    owner = "myriadrf";
-    repo = "gr-limesdr";
-    rev = "v${version}";
-    sha256 = {
-      "3.7" = "0ldqvfwl0gil89l9s31fjf9d7ki0dk572i8vna336igfaz348ypq";
-      "3.8" = "ffs+8TU0yr6IW1xZJ/abQ1CQWGZM+zYqPRJxy3ZvM9U=";
-    }.${gnuradio.versionAttr.major};
-  };
-in mkDerivation {
-  pname = "gr-limesdr";
-  inherit version src;
-  disabled = gnuradioAtLeast "3.9";
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    swig3
-    python
-  ];
-  buildInputs = [
-    logLib
-    mpir
-    boost
-    gmp
-    icu
-    limesuite
-  ] ++ lib.optionals (gnuradio.hasFeature "gr-ctrlport") [
-    thrift
-    python.pkgs.thrift
-  ];
-
-  meta = with lib; {
-    description = "Gnuradio source and sink blocks for LimeSDR";
-    homepage = "https://wiki.myriadrf.org/Gr-limesdr_Plugin_for_GNURadio";
-    license = licenses.mit;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.markuskowa ];
-  };
-}
diff --git a/pkgs/top-level/gnuradio-packages.nix b/pkgs/top-level/gnuradio-packages.nix
index 2d772e79a3015..2cb25194ddb3f 100644
--- a/pkgs/top-level/gnuradio-packages.nix
+++ b/pkgs/top-level/gnuradio-packages.nix
@@ -47,6 +47,4 @@ in {
 
   rds = callPackage ../development/gnuradio-modules/rds/default.nix { };
 
-  limesdr = callPackage ../development/gnuradio-modules/limesdr/default.nix { };
-
 })

From f3426f874e3d4d3502701c9383bf8c3afe0a16e2 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 18 Nov 2024 17:14:31 +0200
Subject: [PATCH 12/16] gnuradioPackages.rds: remove

Cannot be used anymore by any modern GR version.
---
 .../gnuradio-modules/rds/default.nix          | 64 -------------------
 pkgs/top-level/gnuradio-packages.nix          |  2 -
 2 files changed, 66 deletions(-)
 delete mode 100644 pkgs/development/gnuradio-modules/rds/default.nix

diff --git a/pkgs/development/gnuradio-modules/rds/default.nix b/pkgs/development/gnuradio-modules/rds/default.nix
deleted file mode 100644
index 5b9a20042cb9f..0000000000000
--- a/pkgs/development/gnuradio-modules/rds/default.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{ lib
-, mkDerivation
-, fetchFromGitHub
-, gnuradio
-, cmake
-, pkg-config
-, swig3
-, python
-, logLib
-, mpir
-, thrift
-, boost
-, gmp
-, icu
-, gnuradioAtLeast
-}:
-
-let
-  version = {
-    "3.7" = "1.1.0";
-    "3.8" = "3.8.0";
-    "3.9" = null;
-  }.${gnuradio.versionAttr.major};
-  src = fetchFromGitHub {
-    owner = "bastibl";
-    repo = "gr-rds";
-    rev = "v${version}";
-    sha256 = {
-      "3.7" = "0jkzchvw0ivcxsjhi1h0mf7k13araxf5m4wi5v9xdgqxvipjzqfy";
-      "3.8" = "+yKLJu2bo7I2jkAiOdjvdhZwxFz9NFgTmzcLthH9Y5o=";
-      "3.9" = null;
-    }.${gnuradio.versionAttr.major};
-  };
-in mkDerivation {
-  pname = "gr-rds";
-  inherit version src;
-  disabled = gnuradioAtLeast "3.9";
-
-  buildInputs = [
-    logLib
-    mpir
-    boost
-    gmp
-    icu
-  ] ++ lib.optionals (gnuradio.hasFeature "gr-ctrlport") [
-    thrift
-    python.pkgs.thrift
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    swig3
-    python
-  ];
-
-  meta = with lib; {
-    description = "Gnuradio block for radio data system";
-    homepage = "https://github.com/bastibl/gr-rds";
-    license = licenses.gpl2Plus;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ mog ];
-  };
-}
diff --git a/pkgs/top-level/gnuradio-packages.nix b/pkgs/top-level/gnuradio-packages.nix
index 2cb25194ddb3f..d067aef6d457f 100644
--- a/pkgs/top-level/gnuradio-packages.nix
+++ b/pkgs/top-level/gnuradio-packages.nix
@@ -45,6 +45,4 @@ in {
 
   nacl = callPackage ../development/gnuradio-modules/nacl/default.nix { };
 
-  rds = callPackage ../development/gnuradio-modules/rds/default.nix { };
-
 })

From 25e5103b8e0eaa074543c9d821743b7dfe72297a Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 18 Nov 2024 17:14:50 +0200
Subject: [PATCH 13/16] gnuradioPackages.nacl: remove

Cannot be used anymore by any modern GR version.
---
 .../gnuradio-modules/nacl/default.nix         | 47 -------------------
 pkgs/top-level/gnuradio-packages.nix          |  2 -
 2 files changed, 49 deletions(-)
 delete mode 100644 pkgs/development/gnuradio-modules/nacl/default.nix

diff --git a/pkgs/development/gnuradio-modules/nacl/default.nix b/pkgs/development/gnuradio-modules/nacl/default.nix
deleted file mode 100644
index 34cd04aff4ead..0000000000000
--- a/pkgs/development/gnuradio-modules/nacl/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ lib
-, mkDerivation
-, fetchFromGitHub
-, cmake
-, pkg-config
-, cppunit
-, swig3
-, boost
-, logLib
-, python
-, libsodium
-, gnuradioAtLeast
-}:
-
-mkDerivation {
-  pname = "gr-nacl";
-  version = "2017-04-10";
-  src = fetchFromGitHub {
-    owner = "stwunsch";
-    repo = "gr-nacl";
-    rev = "15276bb0fcabf5fe4de4e58df3d579b5be0e9765";
-    sha256 = "018np0qlk61l7mlv3xxx5cj1rax8f1vqrsrch3higsl25yydbv7v";
-  };
-  disabled = gnuradioAtLeast "3.8";
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    swig3
-    python
-  ];
-
-  buildInputs = [
-    cppunit
-    logLib
-    boost
-    libsodium
-  ];
-
-  meta = with lib; {
-    description = "Gnuradio block for encryption";
-    homepage = "https://github.com/stwunsch/gr-nacl";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux ++ platforms.darwin;
-    maintainers = with maintainers; [ mog ];
-  };
-}
diff --git a/pkgs/top-level/gnuradio-packages.nix b/pkgs/top-level/gnuradio-packages.nix
index d067aef6d457f..e7663ea55645d 100644
--- a/pkgs/top-level/gnuradio-packages.nix
+++ b/pkgs/top-level/gnuradio-packages.nix
@@ -43,6 +43,4 @@ in {
 
   gsm = callPackage ../development/gnuradio-modules/gsm/default.nix { };
 
-  nacl = callPackage ../development/gnuradio-modules/nacl/default.nix { };
-
 })

From 1d884e1e5acbe86f8e87cdba0c104bd179f1aab0 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 18 Nov 2024 17:16:00 +0200
Subject: [PATCH 14/16] gnuradioPackages.gsm: remove

Cannot be used anymore by any modern GR version.
---
 .../gnuradio-modules/gsm/default.nix          | 49 -------------------
 pkgs/top-level/gnuradio-packages.nix          |  2 -
 2 files changed, 51 deletions(-)
 delete mode 100644 pkgs/development/gnuradio-modules/gsm/default.nix

diff --git a/pkgs/development/gnuradio-modules/gsm/default.nix b/pkgs/development/gnuradio-modules/gsm/default.nix
deleted file mode 100644
index af7a018f4798d..0000000000000
--- a/pkgs/development/gnuradio-modules/gsm/default.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{ lib
-, mkDerivation
-, fetchFromGitHub
-, cmake
-, pkg-config
-, cppunit
-, swig3
-, boost
-, logLib
-, python
-, libosmocore
-, osmosdr
-, gnuradioAtLeast
-}:
-
-mkDerivation {
-  pname = "gr-gsm";
-  version = "2016-08-25";
-  src = fetchFromGitHub {
-    owner = "ptrkrysik";
-    repo = "gr-gsm";
-    rev = "3ca05e6914ef29eb536da5dbec323701fbc2050d";
-    sha256 = "13nnq927kpf91iqccr8db9ripy5czjl5jiyivizn6bia0bam2pvx";
-  };
-  disabled = gnuradioAtLeast "3.8";
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    swig3
-    python
-  ];
-
-  buildInputs = [
-    cppunit
-    logLib
-    boost
-    libosmocore
-    osmosdr
-  ];
-
-  meta = with lib; {
-    description = "Gnuradio block for gsm";
-    homepage = "https://github.com/ptrkrysik/gr-gsm";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ mog ];
-  };
-}
diff --git a/pkgs/top-level/gnuradio-packages.nix b/pkgs/top-level/gnuradio-packages.nix
index e7663ea55645d..101c38c9659b3 100644
--- a/pkgs/top-level/gnuradio-packages.nix
+++ b/pkgs/top-level/gnuradio-packages.nix
@@ -41,6 +41,4 @@ in {
 
   grnet = callPackage ../development/gnuradio-modules/grnet/default.nix { };
 
-  gsm = callPackage ../development/gnuradio-modules/gsm/default.nix { };
-
 })

From d8fb383b5189fd7df55084c11075f903d088d93c Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 18 Nov 2024 17:11:37 +0200
Subject: [PATCH 15/16] gnuradioPackages.grnet: remove

Cannot be used anymore by any modern GR version.
---
 .../gnuradio-modules/grnet/default.nix        | 97 -------------------
 pkgs/top-level/gnuradio-packages.nix          |  2 -
 2 files changed, 99 deletions(-)
 delete mode 100644 pkgs/development/gnuradio-modules/grnet/default.nix

diff --git a/pkgs/development/gnuradio-modules/grnet/default.nix b/pkgs/development/gnuradio-modules/grnet/default.nix
deleted file mode 100644
index 7fb8d10997e1c..0000000000000
--- a/pkgs/development/gnuradio-modules/grnet/default.nix
+++ /dev/null
@@ -1,97 +0,0 @@
-{ lib
-, mkDerivation
-, fetchFromGitHub
-, fetchpatch
-, gnuradio
-, cmake
-, pkg-config
-, boost
-, logLib
-, python
-, swig3
-, mpir
-, gmp
-, doxygen
-, libpcap
-, icu
-, thrift
-, gnuradioAtLeast
-}:
-
-let
-  # Each GR major version requires us to pull a specific git revision of the repository
-  version = {
-    "3.7" = {
-      # Last git revision from the `maint-3.7` branch:
-      # https://github.com/ghostop14/gr-grnet/tree/maint-3.7
-      name = "unstable-2019-08-06";
-      gitHash = "beb1cd75d006a982c0a9536e923800c5a0575451";
-    };
-    "3.8" = {
-      # Last git revision from the `maint-3.8` branch:
-      # https://github.com/ghostop14/gr-grnet/tree/maint-3.8
-      name = "unstable-2020-11-20";
-      gitHash = "b02016043b67a15f27134a4f0b0d43f5d1b9ed6d";
-    };
-    "3.9" = {
-      # This revision is taken from the `master` branch.
-      name = "unstable-2020-12-30";
-      gitHash = "e6dfd140cfda715de9bcef4c1116fcacfeb0c606";
-    };
-  }.${gnuradio.versionAttr.major};
-  src = fetchFromGitHub {
-    owner = "ghostop14";
-    repo = "gr-grnet";
-    rev = "${version.gitHash}";
-    sha256 = {
-      "3.7" = "LLQ0Jf0Oapecu9gj4IgxOdK7O/OSbHnwNk000GlODxk=";
-      "3.8" = "vO8l8nV1/yEQf7pKqBbzIg4KkyCyWu+OkKgISyI3PaQ=";
-      "3.9" = "NsL7HCOQmGyexzpH2qbzv8Bq4bsfiDTNEUi96QDOA/g=";
-    }.${gnuradio.versionAttr.major};
-  };
-in
-mkDerivation {
-  pname = "gr-grnet";
-  version = version.name;
-  inherit src;
-  disabled = gnuradioAtLeast "3.10";
-
-  patches = [
-    # Use cross platform struct ip instead of iphdr
-    # https://github.com/ghostop14/gr-grnet/pull/19
-    (fetchpatch {
-      name = "fix-compilation-on-darwin.patch";
-      url = "https://github.com/ghostop14/gr-grnet/commit/52c07daa9ba595b76ffa5dd90c0c96694d95d140.patch";
-      sha256 = "sha256-1gJaYLIn09blOhALMfBPROt5YBXaosG41Vsd3+5h518=";
-    })
-  ];
-
-  buildInputs = [
-    boost
-    logLib
-    doxygen
-    mpir
-    gmp
-    libpcap
-    icu
-  ] ++ (if gnuradioAtLeast "3.9" then with python.pkgs; [
-    pybind11
-    numpy
-  ] else [
-    swig3
-    thrift
-    python.pkgs.thrift
-  ]);
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-  ];
-
-  meta = with lib; {
-    description = "GNURadio TCP/UDP source and sink blocks rewritten in C++/Boost";
-    homepage = "https://github.com/ghostop14/gr-grnet";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ chuangzhu ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/gnuradio-packages.nix b/pkgs/top-level/gnuradio-packages.nix
index 101c38c9659b3..a2099ea4054b2 100644
--- a/pkgs/top-level/gnuradio-packages.nix
+++ b/pkgs/top-level/gnuradio-packages.nix
@@ -39,6 +39,4 @@ in {
 
   fosphor = callPackage ../development/gnuradio-modules/fosphor/default.nix { };
 
-  grnet = callPackage ../development/gnuradio-modules/grnet/default.nix { };
-
 })

From d50107f081e8b864aab09117074ade7202d1295d Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 18 Nov 2024 16:17:31 +0200
Subject: [PATCH 16/16] qradiolink: switch to GR 3.10

---
 .../applications/radio/qradiolink/default.nix | 37 +++++++++++--------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/radio/qradiolink/default.nix b/pkgs/applications/radio/qradiolink/default.nix
index 035f97fd19152..6d60329d717c2 100644
--- a/pkgs/applications/radio/qradiolink/default.nix
+++ b/pkgs/applications/radio/qradiolink/default.nix
@@ -3,7 +3,8 @@
 , libpulseaudio
 , libconfig
 # Needs a gnuradio built with qt gui support
-, gnuradio3_8
+, gnuradio
+, log4cpp
 , thrift
 # Not gnuradioPackages'
 , codec2
@@ -22,15 +23,16 @@
 , uhd
 }:
 
-gnuradio3_8.pkgs.mkDerivation rec {
+gnuradio.pkgs.mkDerivation rec {
   pname = "qradiolink";
-  version = "0.9.0-1";
+  # https://github.com/qradiolink/qradiolink/tree/gr_3.10
+  version = "0.9.0-1-unstable-2024-08-29";
 
   src = fetchFromGitHub {
     owner = "qradiolink";
     repo = "qradiolink";
-    rev = version;
-    sha256 = "sha256-Js6DzmUG8O9c9VvjE6hc7JGuFmgc1Wq41zVJb8Us/yI=";
+    rev = "f1006a20e0a642d0ac20aab18b19fa97567f2621";
+    sha256 = "sha256-9AYFO+mmwLAH8gEpZn6qcENabc/KBMcg/0wCTKsInNY=";
   };
 
   preBuild = ''
@@ -48,35 +50,40 @@ gnuradio3_8.pkgs.mkDerivation rec {
   '';
 
   buildInputs = [
-    gnuradio3_8.unwrapped.boost
+    gnuradio.unwrapped.boost
     codec2
-    gnuradio3_8.unwrapped.logLib
+    gnuradio.unwrapped.logLib
+    # gnuradio uses it's own log library (spdlog), and qradiolink is still
+    # using the old gnuradio log library log4cpp. Perhaps this won't be needed
+    # once the gr_3.10 branch will mature enough to be merged into qradiolink's
+    # master branch.
+    log4cpp
     gmp
     libpulseaudio
     libconfig
     gsm
-    gnuradio3_8.pkgs.osmosdr
+    gnuradio.pkgs.osmosdr
     libopus
     libjpeg
     limesuite
     soapysdr-with-plugins
     speex
     speexdsp
-    gnuradio3_8.qt.qtbase
-    gnuradio3_8.qt.qtmultimedia
+    gnuradio.qt.qtbase
+    gnuradio.qt.qtmultimedia
     libftdi
     libsndfile
     cppzmq
-    gnuradio3_8.qwt
+    gnuradio.qwt
     uhd
-  ] ++ lib.optionals (gnuradio3_8.hasFeature "gr-ctrlport") [
+  ] ++ lib.optionals (gnuradio.hasFeature "gr-ctrlport") [
     thrift
-    gnuradio3_8.unwrapped.python.pkgs.thrift
+    gnuradio.unwrapped.python.pkgs.thrift
   ];
   nativeBuildInputs = [
     protobuf
-    gnuradio3_8.qt.qmake
-    gnuradio3_8.qt.wrapQtAppsHook
+    gnuradio.qt.qmake
+    gnuradio.qt.wrapQtAppsHook
   ];
 
   meta = with lib; {