From b384e3d4745cbd0f5cbecde6301467f8e1ddfabb Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 9 Feb 2019 19:33:23 +0100 Subject: soapybladerf: Move from misc to radio --- pkgs/applications/misc/soapybladerf/default.nix | 31 ------------------------ pkgs/applications/radio/soapybladerf/default.nix | 31 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 32 insertions(+), 32 deletions(-) delete mode 100644 pkgs/applications/misc/soapybladerf/default.nix create mode 100644 pkgs/applications/radio/soapybladerf/default.nix diff --git a/pkgs/applications/misc/soapybladerf/default.nix b/pkgs/applications/misc/soapybladerf/default.nix deleted file mode 100644 index bab829e05e3a..000000000000 --- a/pkgs/applications/misc/soapybladerf/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig -, libbladeRF, soapysdr -} : - -let - version = "0.4.0"; - -in stdenv.mkDerivation { - name = "soapybladerf-${version}"; - - src = fetchFromGitHub { - owner = "pothosware"; - repo = "SoapyBladeRF"; - rev = "soapy-bladerf-${version}"; - sha256 = "1gf1azfydw033nlg2bgs9cbsbp9npjdrgjwlsffn0d9x0qbgxjqp"; - }; - - nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ libbladeRF soapysdr ]; - - cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; - - - meta = with stdenv.lib; { - homepage = https://github.com/pothosware/SoapyBladeRF; - description = "SoapySDR plugin for BladeRF devices"; - license = licenses.lgpl21; - maintainers = with maintainers; [ markuskowa ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/radio/soapybladerf/default.nix b/pkgs/applications/radio/soapybladerf/default.nix new file mode 100644 index 000000000000..bab829e05e3a --- /dev/null +++ b/pkgs/applications/radio/soapybladerf/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig +, libbladeRF, soapysdr +} : + +let + version = "0.4.0"; + +in stdenv.mkDerivation { + name = "soapybladerf-${version}"; + + src = fetchFromGitHub { + owner = "pothosware"; + repo = "SoapyBladeRF"; + rev = "soapy-bladerf-${version}"; + sha256 = "1gf1azfydw033nlg2bgs9cbsbp9npjdrgjwlsffn0d9x0qbgxjqp"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ libbladeRF soapysdr ]; + + cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; + + + meta = with stdenv.lib; { + homepage = https://github.com/pothosware/SoapyBladeRF; + description = "SoapySDR plugin for BladeRF devices"; + license = licenses.lgpl21; + maintainers = with maintainers; [ markuskowa ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3fe7398124b2..8e0db70790dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12556,7 +12556,7 @@ in soapyairspy = callPackage ../applications/radio/soapyairspy { }; - soapybladerf = callPackage ../applications/misc/soapybladerf { }; + soapybladerf = callPackage ../applications/radio/soapybladerf { }; soapyhackrf = callPackage ../applications/misc/soapyhackrf { }; -- cgit 1.4.1