From 7524e06e28e588e507b559fc94c0c91aab56f4f6 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 9 Feb 2019 15:44:49 +0100 Subject: [PATCH] gnuradio: Move from misc to radio --- .../{misc => radio}/gnuradio/ais.nix | 0 .../{misc => radio}/gnuradio/default.nix | 0 .../{misc => radio}/gnuradio/gsm.nix | 0 .../{misc => radio}/gnuradio/limesdr.nix | 0 .../{misc => radio}/gnuradio/nacl.nix | 0 .../{misc => radio}/gnuradio/osmosdr.nix | 0 .../{misc => radio}/gnuradio/rds.nix | 0 .../{misc => radio}/gnuradio/wrapper.nix | 0 pkgs/top-level/all-packages.nix | 16 ++++++++-------- 9 files changed, 8 insertions(+), 8 deletions(-) rename pkgs/applications/{misc => radio}/gnuradio/ais.nix (100%) rename pkgs/applications/{misc => radio}/gnuradio/default.nix (100%) rename pkgs/applications/{misc => radio}/gnuradio/gsm.nix (100%) rename pkgs/applications/{misc => radio}/gnuradio/limesdr.nix (100%) rename pkgs/applications/{misc => radio}/gnuradio/nacl.nix (100%) rename pkgs/applications/{misc => radio}/gnuradio/osmosdr.nix (100%) rename pkgs/applications/{misc => radio}/gnuradio/rds.nix (100%) rename pkgs/applications/{misc => radio}/gnuradio/wrapper.nix (100%) diff --git a/pkgs/applications/misc/gnuradio/ais.nix b/pkgs/applications/radio/gnuradio/ais.nix similarity index 100% rename from pkgs/applications/misc/gnuradio/ais.nix rename to pkgs/applications/radio/gnuradio/ais.nix diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix similarity index 100% rename from pkgs/applications/misc/gnuradio/default.nix rename to pkgs/applications/radio/gnuradio/default.nix diff --git a/pkgs/applications/misc/gnuradio/gsm.nix b/pkgs/applications/radio/gnuradio/gsm.nix similarity index 100% rename from pkgs/applications/misc/gnuradio/gsm.nix rename to pkgs/applications/radio/gnuradio/gsm.nix diff --git a/pkgs/applications/misc/gnuradio/limesdr.nix b/pkgs/applications/radio/gnuradio/limesdr.nix similarity index 100% rename from pkgs/applications/misc/gnuradio/limesdr.nix rename to pkgs/applications/radio/gnuradio/limesdr.nix diff --git a/pkgs/applications/misc/gnuradio/nacl.nix b/pkgs/applications/radio/gnuradio/nacl.nix similarity index 100% rename from pkgs/applications/misc/gnuradio/nacl.nix rename to pkgs/applications/radio/gnuradio/nacl.nix diff --git a/pkgs/applications/misc/gnuradio/osmosdr.nix b/pkgs/applications/radio/gnuradio/osmosdr.nix similarity index 100% rename from pkgs/applications/misc/gnuradio/osmosdr.nix rename to pkgs/applications/radio/gnuradio/osmosdr.nix diff --git a/pkgs/applications/misc/gnuradio/rds.nix b/pkgs/applications/radio/gnuradio/rds.nix similarity index 100% rename from pkgs/applications/misc/gnuradio/rds.nix rename to pkgs/applications/radio/gnuradio/rds.nix diff --git a/pkgs/applications/misc/gnuradio/wrapper.nix b/pkgs/applications/radio/gnuradio/wrapper.nix similarity index 100% rename from pkgs/applications/misc/gnuradio/wrapper.nix rename to pkgs/applications/radio/gnuradio/wrapper.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f207bbb8d81..745bb2c1c8e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17074,30 +17074,30 @@ in gnss-sdr = callPackage ../applications/misc/gnss-sdr { boost=boost166; }; - gnuradio = callPackage ../applications/misc/gnuradio { + gnuradio = callPackage ../applications/radio/gnuradio { inherit (python2Packages) cheetah lxml Mako matplotlib numpy python pyopengl pyqt4 scipy wxPython pygtk; inherit (darwin.apple_sdk.frameworks) CoreAudio; fftw = fftwFloat; qwt = qwt6_qt4; }; - gnuradio-with-packages = callPackage ../applications/misc/gnuradio/wrapper.nix { + gnuradio-with-packages = callPackage ../applications/radio/gnuradio/wrapper.nix { inherit (python2Packages) python; extraPackages = [ gnuradio-nacl gnuradio-osmosdr gnuradio-ais gnuradio-rds ] ++ lib.optionals stdenv.isLinux [ gnuradio-gsm gnuradio-limesdr ]; }; - gnuradio-nacl = callPackage ../applications/misc/gnuradio/nacl.nix { }; + gnuradio-nacl = callPackage ../applications/radio/gnuradio/nacl.nix { }; - gnuradio-gsm = callPackage ../applications/misc/gnuradio/gsm.nix { }; + gnuradio-gsm = callPackage ../applications/radio/gnuradio/gsm.nix { }; - gnuradio-ais = callPackage ../applications/misc/gnuradio/ais.nix { }; + gnuradio-ais = callPackage ../applications/radio/gnuradio/ais.nix { }; - gnuradio-limesdr = callPackage ../applications/misc/gnuradio/limesdr.nix { }; + gnuradio-limesdr = callPackage ../applications/radio/gnuradio/limesdr.nix { }; - gnuradio-rds = callPackage ../applications/misc/gnuradio/rds.nix { }; + gnuradio-rds = callPackage ../applications/radio/gnuradio/rds.nix { }; - gnuradio-osmosdr = callPackage ../applications/misc/gnuradio/osmosdr.nix { }; + gnuradio-osmosdr = callPackage ../applications/radio/gnuradio/osmosdr.nix { }; goldendict = libsForQt5.callPackage ../applications/misc/goldendict { };