Unverified Commit 369d626c authored by jopejoe1's avatar jopejoe1 Committed by GitHub
Browse files

uhd: 4.6.0.0 -> 4.7.0.0 (#349079)

parents a35398ff 331482ee

pkgs/applications/radio/gnuradio/3.8.nix

+8 −21
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
, pkg-config

, volk

, cppunit

, swig

, swig3

, orc

, boost

, log4cpp
@@ -83,7 +83,7 @@ let 
    python-support = {

      pythonRuntime = [ python.pkgs.six ];

      native = [

        swig

        swig3

        python

      ];

      cmakeEnableFlag = "PYTHON";
@@ -98,7 +98,7 @@ let 
    gr-ctrlport = {

      cmakeEnableFlag = "GR_CTRLPORT";

      native = [

        swig

        swig3

      ];

      runtime = [

        thrift
@@ -159,7 +159,7 @@ let 
      cmakeEnableFlag = "GR_CHANNELS";

    };

    gr-qtgui = {

      runtime = [ qt5.qtbase libsForQt5.qwt ];

      runtime = [ qt5.qtbase libsForQt5.qwt6_1 ];

      pythonRuntime = [ python.pkgs.pyqt5 ];

      cmakeEnableFlag = "GR_QTGUI";

    };
@@ -231,22 +231,9 @@ stdenv.mkDerivation (finalAttrs: (shared // { 
  # Will still evaluate correctly if not used here. It only helps nix-update

  # find the right file in which version is defined.

  inherit (shared) src;

  # Remove failing tests

  preConfigure = (shared.preConfigure or "") + ''

    # https://github.com/gnuradio/gnuradio/issues/3801

    rm gr-blocks/python/blocks/qa_cpp_py_binding.py

    rm gr-blocks/python/blocks/qa_cpp_py_binding_set.py

    rm gr-blocks/python/blocks/qa_ctrlport_probes.py

    # Tests that fail due to numpy deprecations upstream hasn't accomodated to yet.

    rm gr-fec/python/fec/qa_polar_decoder_sc.py

    rm gr-fec/python/fec/qa_polar_decoder_sc_list.py

    rm gr-fec/python/fec/qa_polar_decoder_sc_systematic.py

    rm gr-fec/python/fec/qa_polar_encoder.py

    rm gr-fec/python/fec/qa_polar_encoder_systematic.py

    rm gr-filter/python/filter/qa_freq_xlating_fft_filter.py

    # Failed with libstdc++ from GCC 13

    rm gr-filter/python/filter/qa_filterbank.py

  '';

  # Some of the tests we know why they fail, but others simply hang-out and

  # timeout...

  doCheck = false;

  patches = [

    # Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227

    ./modtool-newmod-permissions.3_8.patch
@@ -268,7 +255,7 @@ stdenv.mkDerivation (finalAttrs: (shared // { 
  } // lib.optionalAttrs (hasFeature "gr-uhd") {

    inherit uhd;

  } // lib.optionalAttrs (hasFeature "gr-qtgui") {

    inherit (libsForQt5) qwt;

    qwt = libsForQt5.qwt6_1;

  };

  cmakeFlags = shared.cmakeFlags

    # From some reason, if these are not set, libcodec2 and gsm are not

pkgs/applications/radio/gnuradio/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
, orc

, boost

, spdlog

, swig

, mpir

, doxygen

, python

pkgs/applications/radio/uhd/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { 
  #

  #     nix-shell maintainers/scripts/update.nix --argstr package uhd --argstr commit true

  #

  version = "4.6.0.0";

  version = "4.7.0.0";



  outputs = [ "out" "dev" ];
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { 
    rev = "v${finalAttrs.version}";

    # The updateScript relies on the `src` using `hash`, and not `sha256. To

    # update the correct hash for the `src` vs the `uhdImagesSrc`

    hash = "sha256-9ZGt0ZrGbprCmpAuOue6pg2gliu4MvlRFHGxyMJeKAc=";

    hash = "sha256-TX1iLs941z8sZY0yQEXuy9jGgsn6HU4uqIdxJmNNahU=";

  };

  # Firmware images are downloaded (pre-built) from the respective release on Github

  uhdImagesSrc = fetchurl {

pkgs/applications/radio/uhd/no-adapter-tests.patch

+8 −8
Original line number Diff line number Diff line 
diff --git i/host/tests/CMakeLists.txt w/host/tests/CMakeLists.txt

index f40c252ad..b8a07d341 100644

--- i/host/tests/CMakeLists.txt

+++ w/host/tests/CMakeLists.txt

@@ -453,12 +453,6 @@ UHD_ADD_NONAPI_TEST(

index bac599811..267f8e602 100644

--- a/host/tests/CMakeLists.txt

+++ b/host/tests/CMakeLists.txt

@@ -517,12 +517,6 @@ UHD_ADD_NONAPI_TEST(

     ${UHD_SOURCE_DIR}/lib/utils/compat_check.cpp

 )
@@ -12,6 +12,6 @@ index f40c252ad..b8a07d341 100644 
-    ${UHD_SOURCE_DIR}/lib/usrp/cores/xport_adapter_ctrl.cpp

-)

-

 ########################################################################

 # demo of a loadable module

 ########################################################################
 
 UHD_ADD_NONAPI_TEST(

     TARGET "custom_reg_test.cpp"

     EXTRA_SOURCES

pkgs/by-name/sw/swig3/package.nix

0 → 100644
+56 −0
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  fetchFromGitHub,

  autoconf,

  automake,

  libtool,

  bison,

  pcre,

}:



stdenv.mkDerivation (finalAttrs: {

  pname = "swig";

  version = "3.0.12";



  src = fetchFromGitHub {

    owner = "swig";

    repo = "swig";

    rev = "rel-${finalAttrs.version}";

    sha256 = "1wyffskbkzj5zyhjnnpip80xzsjcr3p0q5486z3wdwabnysnhn8n";

  };



  # Not using autoreconfHook because it fails due to missing macros, contrary

  # to this script

  preConfigure = ''

    ./autogen.sh

  '';



  nativeBuildInputs = [

    autoconf

    automake

    libtool

    bison

  ];

  buildInputs = [

    pcre

  ];



  configureFlags = [

    "--without-tcl"

  ];



  # Disable ccache documentation as it needs yodl

  postPatch = ''

    sed -i '/man1/d' CCache/Makefile.in

  '';



  meta = {

    description = "Interface compiler that connects C/C++ code to higher-level languages";

    homepage = "https://swig.org/";

    # Different types of licenses available: http://www.swig.org/Release/LICENSE .

    license = lib.licenses.gpl3Plus;

    platforms = lib.platforms.unix;

    maintainers = with lib.maintainers; [ doronbehar ];

  };

})