diff --git a/pkgs/applications/radio/cubicsdr/default.nix b/pkgs/applications/radio/cubicsdr/default.nix index 7e346bcbf848..23b64e124c55 100644 --- a/pkgs/applications/radio/cubicsdr/default.nix +++ b/pkgs/applications/radio/cubicsdr/default.nix @@ -1,34 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, fftw, hamlib, libpulseaudio, libGL, libX11, liquid-dsp, +{ lib, stdenv, fetchFromGitHub, cmake, fftw, hamlib, libpulseaudio, libGL, libX11, liquid-dsp, pkg-config, soapysdr-with-plugins, wxGTK31-gtk3, enableDigitalLab ? false }: stdenv.mkDerivation rec { pname = "cubicsdr"; - version = "0.2.5"; + version = "0.2.7"; src = fetchFromGitHub { owner = "cjcliffe"; repo = "CubicSDR"; rev = version; - sha256 = "1ihbn18bzdcdvwpa4hnb55ns38bj4b8xy53hkmra809f9qpbcjhn"; + sha256 = "0cyv1vk97x4i3h3hhh7dx8mv6d1ad0fypdbx5fl26bz661sr8j2n"; }; - # Allow cubicsdr 0.2.5 to build with wxGTK 3.1.3 - # these come from cubicsdr's master branch, subsequent releases may include them - patches = [ - (fetchpatch { - url = "https://github.com/cjcliffe/CubicSDR/commit/65a160fa356ce9665dfe05c6bfc6754535e16743.patch"; - sha256 = "0vbr5x9fnm09bws5crqcm6kkhr1bg5r0bc1pxnwwjyc6jpvqi6ad"; - }) - (fetchpatch { - url = "https://github.com/cjcliffe/CubicSDR/commit/f449a65457e35bf8260d0b16b8a47b6bc0ea2c7e.patch"; - sha256 = "1zjvjmhm8ybi6i9pq7by3fj3mvx37dy7gj4gk23d79yrnl9mk25p"; - }) - (fetchpatch { - url = "https://github.com/cjcliffe/CubicSDR/commit/0540d08c2dea79b668b32b1a6d58f235d65ce9d2.patch"; - sha256 = "07l7b82f779sbcj0jza0mg463ac1153bs9hn6ai388j7dm3lvasn"; - }) - ]; - nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ fftw hamlib libpulseaudio libGL libX11 liquid-dsp soapysdr-with-plugins wxGTK31-gtk3 ]; @@ -44,4 +27,3 @@ stdenv.mkDerivation rec { platforms = platforms.linux; }; } - diff --git a/pkgs/development/libraries/liquid-dsp/default.nix b/pkgs/development/libraries/liquid-dsp/default.nix index 746771f44fe4..76b9648ef468 100644 --- a/pkgs/development/libraries/liquid-dsp/default.nix +++ b/pkgs/development/libraries/liquid-dsp/default.nix @@ -1,14 +1,14 @@ {lib, stdenv, fetchFromGitHub, autoreconfHook }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "liquid-dsp"; - version = "20170307"; + version = "1.4.0"; src = fetchFromGitHub { owner = "jgaeddert"; repo = "liquid-dsp"; - rev = "8c1978fa4f5662b8849fe712be716958f29cec0e"; - sha256 = "0zpxvdsrw0vzzp3iaag3wh4z8ygl7fkswgjppp2fz2zhhqh93k2w"; + rev = "v${version}"; + sha256 = "0mr86z37yycrqwbrmsiayi1vqrgpjq0pn1c3p1qrngipkw45jnn0"; }; nativeBuildInputs = [ autoreconfHook ]; @@ -19,5 +19,4 @@ stdenv.mkDerivation { license = lib.licenses.mit; platforms = lib.platforms.unix; }; - }