From c328738a06211e3098084ab852eea45a07e1c1e5 Mon Sep 17 00:00:00 2001 From: Luke Adams Date: Fri, 29 Jun 2018 19:55:24 -0500 Subject: [PATCH 1/2] gnuradio: fix hash for 3.7.13.3 --- pkgs/applications/misc/gnuradio/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix index 2710850759b..2ab704ec98c 100644 --- a/pkgs/applications/misc/gnuradio/default.nix +++ b/pkgs/applications/misc/gnuradio/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { owner = "gnuradio"; repo = "gnuradio"; rev = "v${version}"; - sha256 = "0fqxn1k41xqd52i5z528zdhkn52i9z5hl6cc75ggdx9iqxhvb3jj"; + sha256 = "1qpa53axqavdv2ykby7rwh7xmhvv964xq1d7rcvbwkry7dngrbib"; fetchSubmodules = true; }; From 408bc4bf96128b15e5e28c9437ab1400997c614a Mon Sep 17 00:00:00 2001 From: Luke Adams Date: Fri, 29 Jun 2018 20:21:06 -0500 Subject: [PATCH 2/2] gnuradio: undo ninja (revert to unix make) * ninja generator fails to create response file See https://gitlab.kitware.com/cmake/cmake/issues/17877 --- pkgs/applications/misc/gnuradio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix index 2ab704ec98c..0224d5fd68c 100644 --- a/pkgs/applications/misc/gnuradio/default.nix +++ b/pkgs/applications/misc/gnuradio/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, writeText, makeWrapper # Dependencies documented @ https://gnuradio.org/doc/doxygen/build_guide.html # => core dependencies -, ninja, cmake, pkgconfig, git, boost, cppunit, fftw +, cmake, pkgconfig, git, boost, cppunit, fftw # => python wrappers # May be able to upgrade to swig3 , python, swig2, numpy, scipy, matplotlib @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - cmake pkgconfig git makeWrapper cppunit orc ninja + cmake pkgconfig git makeWrapper cppunit orc ]; buildInputs = [