From ee69ee419bc9afdb9a398f4a53e910f292d3165e Mon Sep 17 00:00:00 2001 From: Marius Bergmann Date: Tue, 14 Mar 2017 22:02:43 +0100 Subject: [PATCH 1/2] liquid-dsp: init at 20170307 liquid-dsp is a dependency for the latest git version of inspectrum, therefore I added it in order to be able to upgrade inspectrum. --- .../libraries/liquid-dsp/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/libraries/liquid-dsp/default.nix diff --git a/pkgs/development/libraries/liquid-dsp/default.nix b/pkgs/development/libraries/liquid-dsp/default.nix new file mode 100644 index 00000000000..391606d59e6 --- /dev/null +++ b/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; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a73c033c4e..0294b367148 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8865,6 +8865,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 { }; From 2876cd7e98df572b900239539052badcfa44d438 Mon Sep 17 00:00:00 2001 From: Marius Bergmann Date: Tue, 14 Mar 2017 22:08:05 +0100 Subject: [PATCH 2/2] inspectrum: 20160403 -> 20170218 --- pkgs/applications/misc/inspectrum/default.nix | 29 +++++++++++++++---- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/inspectrum/default.nix b/pkgs/applications/misc/inspectrum/default.nix index 536582e4ee7..6ec968ecc94 100644 --- a/pkgs/applications/misc/inspectrum/default.nix +++ b/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;