Merge pull request #23903 from mbrgm/upgrade-inspectrum

inspectrum: 20160403 -> 20170218

pkgs/applications/misc/inspectrum/default.nix

@@ -1,18 +1,35 @@
-{ stdenv, fetchFromGitHub, pkgconfig, cmake, boost, fftwFloat, qt5, gnuradio }:
+{ stdenv
+, fetchFromGitHub
+, pkgconfig
+, cmake
+, boost
+, fftwFloat
+, qt5
+, gnuradio
+, liquid-dsp
+}:
 
 stdenv.mkDerivation rec {
   name = "inspectrum-${version}";
-  version = "20160403";
+  version = "20170218";
 
   src = fetchFromGitHub {
     owner = "miek";
     repo = "inspectrum";
-    rev = "27381dbb30f59267a429c04d17d792d3953a6b99";
-    sha256 = "0y4j62khq6fcv2qqlqi0kn2ix821m5gcqzg72nhc2zzfb3cdm9nm";
+    rev = "d8d1969a4cceeee0ebfd2f39e791fddd5155d4de";
+    sha256 = "05sarfin9wqkvgwn3fil1r4bay03cwzzhjwbdjslibc5chdrr2cn";
   };
 
-  buildInputs = [ pkgconfig cmake qt5.qtbase fftwFloat boost gnuradio ];
-  
+  buildInputs = [
+    pkgconfig
+    cmake
+    qt5.qtbase
+    fftwFloat
+    boost
+    gnuradio
+    liquid-dsp
+  ];
+
   meta = with stdenv.lib; {
     description = "Tool for analysing captured signals from sdr receivers";
     homepage = https://github.com/miek/inspectrum;

pkgs/development/libraries/liquid-dsp/default.nix

@@ -0,0 +1,23 @@
+{stdenv, fetchFromGitHub, autoreconfHook }:
+
+stdenv.mkDerivation rec {
+  name = "liquid-dsp-${version}";
+  version = "20170307";
+
+  src = fetchFromGitHub {
+    owner = "jgaeddert";
+    repo = "liquid-dsp";
+    rev = "8c1978fa4f5662b8849fe712be716958f29cec0e";
+    sha256 = "0zpxvdsrw0vzzp3iaag3wh4z8ygl7fkswgjppp2fz2zhhqh93k2w";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  meta = {
+    homepage = http://liquidsdr.org/;
+    description = "Digital signal processing library for software-defined radios";
+    license = stdenv.lib.licenses.mit;
+    platforms = stdenv.lib.platforms.unix;
+  };
+
+}

pkgs/top-level/all-packages.nix

@@ -8917,6 +8917,8 @@ with pkgs;
 
   lirc = callPackage ../development/libraries/lirc { };
 
+  liquid-dsp = callPackage ../development/libraries/liquid-dsp { };
+
   liquidfun = callPackage ../development/libraries/liquidfun { };
 
   live555 = callPackage ../development/libraries/live555 { };