Unverified Commit aefcf164 authored by Doron Behar's avatar Doron Behar Committed by GitHub
Browse files

Merge pull request #329693 from doronbehar/pkg/gnuradio 

gnuradioMinimal: 3.10.10.0 -> 3.10.11.0
parents a9d164fe 6282c8d0

pkgs/applications/radio/gnuradio/3.8.nix

+3 −3
Original line number Diff line number Diff line
@@ -103,11 +103,11 @@ let 
      runtime = [

        thrift

      ];

      pythonRuntime = with python.pkgs; [

      pythonRuntime = [

        python.pkgs.thrift

        # For gr-perf-monitorx

        matplotlib

        networkx

        python.pkgs.matplotlib

        python.pkgs.networkx

      ];

    };

    gnuradio-companion = {

pkgs/applications/radio/gnuradio/3.9.nix

+3 −3
Original line number Diff line number Diff line
@@ -102,11 +102,11 @@ let 
        libunwind

        thrift

      ];

      pythonRuntime = with python.pkgs; [

      pythonRuntime = [

        python.pkgs.thrift

        # For gr-perf-monitorx

        matplotlib

        networkx

        python.pkgs.matplotlib

        python.pkgs.networkx

      ];

      cmakeEnableFlag = "GR_CTRLPORT";

    };

pkgs/applications/radio/gnuradio/default.nix

+5 −5
Original line number Diff line number Diff line
@@ -44,11 +44,11 @@ 
# If one wishes to use a different src or name for a very custom build

, overrideSrc ? {}

, pname ? "gnuradio"

, version ? "3.10.10.0"

, version ? "3.10.11.0"

}:



let

  sourceSha256 = "sha256-pEVWhXDjOevrduDbZQbiDbODZY8PpsGY4O8yxrwlCcs=";

  sourceSha256 = "sha256-QOZXUj+ZmfpazsrHEs8Gx3WSmoHG/zO43NEpyhIjpN8=";

  featuresInfo = {

    # Needed always

    basic = {
@@ -103,11 +103,11 @@ let 
        libunwind

        thrift

      ];

      pythonRuntime = with python.pkgs; [

      pythonRuntime = [

        python.pkgs.thrift

        # For gr-perf-monitorx

        matplotlib

        networkx

        python.pkgs.matplotlib

        python.pkgs.networkx

      ];

      cmakeEnableFlag = "GR_CTRLPORT";

    };

pkgs/applications/radio/gnuradio/shared.nix

+4 −4
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ in { 
    export QT_PLUGIN_PATH="${qt.qtbase.bin}/${qt.qtbase.qtPluginPrefix}"

  '';



  meta = with lib; {

  meta = {

    description = "Software Defined Radio (SDR) software";

    mainProgram = "gnuradio-config-info";

    longDescription = ''
@@ -136,8 +136,8 @@ in { 
      real-world radio systems.

    '';

    homepage = "https://www.gnuradio.org";

    license = licenses.gpl3;

    platforms = platforms.unix;

    maintainers = with maintainers; [ doronbehar bjornfor fpletz jiegec ];

    license = lib.licenses.gpl3;

    platforms = lib.platforms.unix;

    maintainers = with lib.maintainers; [ doronbehar bjornfor fpletz jiegec ];

  };

}