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

Merge pull request #284482 from chuangzhu/gnuradio-disabled 

gnuradio: disabledForGRafter -> disabled
parents 5ef1851b ab34bb73

pkgs/applications/radio/gnuradio/shared.nix

+2 −0
Original line number Diff line number Diff line
@@ -104,6 +104,8 @@ in { 
      featuresInfo

      python

    ;

    gnuradioOlder = lib.versionOlder versionAttr.major;

    gnuradioAtLeast = lib.versionAtLeast versionAttr.major;

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

    inherit qt;

  } // lib.optionalAttrs (hasFeature "gnuradio-companion") {

pkgs/development/gnuradio-modules/ais/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
, icu

, gnuradio

, thrift

, gnuradioAtLeast

}:



mkDerivation rec {
@@ -25,7 +26,7 @@ mkDerivation rec { 
    rev = "2162103226f3dae43c8c2ab23b79483b84346665";

    sha256 = "1vackka34722d8pcspfwj0j6gc9ic7dqq64sgkrpjm94sh3bmb0b";

  };

  disabledForGRafter = "3.9";

  disabled = gnuradioAtLeast "3.9";



  nativeBuildInputs = [

    cmake

pkgs/development/gnuradio-modules/grnet/default.nix

+3 −2
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
, libpcap

, icu

, thrift

, gnuradioAtLeast

}:



let
@@ -53,7 +54,7 @@ mkDerivation { 
  pname = "gr-grnet";

  version = version.name;

  inherit src;

  disabledForGRafter = "3.10";

  disabled = gnuradioAtLeast "3.10";



  patches = [

    # Use cross platform struct ip instead of iphdr
@@ -73,7 +74,7 @@ mkDerivation { 
    gmp

    libpcap

    icu

  ] ++ (if lib.versionAtLeast gnuradio.versionAttr.major "3.9" then with python.pkgs; [

  ] ++ (if gnuradioAtLeast "3.9" then with python.pkgs; [

    pybind11

    numpy

  ] else [

pkgs/development/gnuradio-modules/gsm/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
, python

, libosmocore

, osmosdr

, gnuradioAtLeast

}:



mkDerivation {
@@ -21,7 +22,7 @@ mkDerivation { 
    rev = "3ca05e6914ef29eb536da5dbec323701fbc2050d";

    sha256 = "13nnq927kpf91iqccr8db9ripy5czjl5jiyivizn6bia0bam2pvx";

  };

  disabledForGRafter = "3.8";

  disabled = gnuradioAtLeast "3.8";



  nativeBuildInputs = [

    cmake

pkgs/development/gnuradio-modules/limesdr/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
, gmp

, icu

, limesuite

, gnuradioAtLeast

}:



let
@@ -33,7 +34,7 @@ let 
in mkDerivation {

  pname = "gr-limesdr";

  inherit version src;

  disabledForGRafter = "3.9";

  disabled = gnuradioAtLeast "3.9";



  nativeBuildInputs = [

    cmake