diff --git a/pkgs/applications/radio/gnss-sdr/default.nix b/pkgs/applications/radio/gnss-sdr/default.nix index 383c5710808f..f6e834d53fb3 100644 --- a/pkgs/applications/radio/gnss-sdr/default.nix +++ b/pkgs/applications/radio/gnss-sdr/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchpatch , armadillo , cmake , gmp @@ -34,6 +35,11 @@ gnuradio.pkgs.mkDerivation rec { # cpu_features which is bundled in the source. NOTE: Perhaps this patch # should be sent upstream. ./fix_libcpu_features_install_path.patch + # Fixes a compilation issue, should be removed on next release. + (fetchpatch { + url = "https://github.com/gnss-sdr/gnss-sdr/commit/8a42967c854e575f2dd9ee7ca81a2522eebb864b.patch"; + sha256 = "sha256-W8BwC08QVtW0LUj5Q+j28aYG+713s+vQIzsWyrNUs1Q="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/applications/radio/gnuradio/3.9.nix b/pkgs/applications/radio/gnuradio/3.9.nix index 638064bbd072..989722fdc3ec 100644 --- a/pkgs/applications/radio/gnuradio/3.9.nix +++ b/pkgs/applications/radio/gnuradio/3.9.nix @@ -46,13 +46,13 @@ , pname ? "gnuradio" , versionAttr ? { major = "3.9"; - minor = "5"; + minor = "6"; patch = "0"; } }: let - sourceSha256 = "sha256-TWCXLoS+ImKNd2zkxMks4FXsQMvGKgcW5/MW8S1Y1TY="; + sourceSha256 = "sha256-0JODgv9MNOkHDQYTVCZMzjr/G542+NvGP9wlH9iwLeg="; featuresInfo = { # Needed always basic = { @@ -134,6 +134,12 @@ let ]; cmakeEnableFlag = "GRC"; }; + jsonyaml_blocks = { + pythonRuntime = [ + python.pkgs.jsonschema + ]; + cmakeEnableFlag = "JSONYAML_BLOCKS"; + }; gr-blocks = { cmakeEnableFlag = "GR_BLOCKS"; }; diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index eef1960ae1f4..14a4763259fa 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -48,13 +48,13 @@ , pname ? "gnuradio" , versionAttr ? { major = "3.10"; - minor = "1"; - patch = "1"; + minor = "2"; + patch = "0"; } }: let - sourceSha256 = "sha256-vsAK+GQzcpA9Vsa6q4RFEzVpbF7/+yZkMsemKn6VhIg="; + sourceSha256 = "sha256-WcfmW39wHhFdpbdBSjOfuDkxL8/fuMjjJoLUyCUud/o="; featuresInfo = { # Needed always basic = { @@ -136,6 +136,12 @@ let ]; cmakeEnableFlag = "GRC"; }; + jsonyaml_blocks = { + pythonRuntime = [ + python.pkgs.jsonschema + ]; + cmakeEnableFlag = "JSONYAML_BLOCKS"; + }; gr-blocks = { cmakeEnableFlag = "GR_BLOCKS"; }; @@ -221,6 +227,7 @@ let setuptools click click-plugins + pygccxml ]; cmakeEnableFlag = "GR_MODTOOL"; };