Fix merge, re-add hackrf and soapysdr-module-hackrf.

Author: ryanvolz

installer_specs/radioconda-linux-64.lock

@@ -86,6 +86,7 @@ dependencies:
 - gstreamer=1.18.5=h9f60fe5_3
 - gtk3=3.24.31=habab178_3
 - h5py=3.6.0=nompi_py310he751f51_100
+- hackrf=2021.03.1=h6c55b11_0
 - harfbuzz=3.4.0=hb4a5f5f_0
 - hdf5=1.12.1=nompi_h2750804_103
 - hicolor-icon-theme=0.17=ha770c72_2
@@ -239,6 +240,7 @@ dependencies:
 - six=1.16.0=pyh6c4a22f_0
 - soapysdr-module-airspy=0.2.0=hee64af1_0
 - soapysdr-module-airspyhf=0.2.0=hee64af1_0
+- soapysdr-module-hackrf=0.3.4=hee64af1_0
 - soapysdr-module-lms7=20.10.0=hbab49e3_1
 - soapysdr-module-plutosdr=0.2.1=h20c8c4b_3
 - soapysdr-module-remote=0.5.2=hee64af1_2

installer_specs/radioconda-linux-64.yml

@@ -19,6 +19,7 @@ specs:
 - gnuradio-satellites=4.5.0=py310hc3bba25_0
 - gnuradio=3.10.1.1=py310hf54aee5_0
 - gqrx=2.15.8=h2b095b5_2
+- hackrf=2021.03.1=h6c55b11_0
 - ipython=8.0.1=py310hff52083_2
 - libiio=0.23=ha770c72_0
 - libm2k=0.5.0=py310h5636882_3
@@ -33,6 +34,7 @@ specs:
 - scipy=1.8.0=py310hea5193d_1
 - soapysdr-module-airspy=0.2.0=hee64af1_0
 - soapysdr-module-airspyhf=0.2.0=hee64af1_0
+- soapysdr-module-hackrf=0.3.4=hee64af1_0
 - soapysdr-module-lms7=20.10.0=hbab49e3_1
 - soapysdr-module-plutosdr=0.2.1=h20c8c4b_3
 - soapysdr-module-remote=0.5.2=hee64af1_2

installer_specs/radioconda-linux-64/construct.yaml

@@ -80,6 +80,7 @@ dependencies:
 - gstreamer=1.18.5=h01406a2_3
 - gtk3=3.24.31=ha4297e9_3
 - h5py=3.6.0=nompi_py310hd005ad3_100
+- hackrf=2021.03.1=h4f2b1ef_0
 - harfbuzz=3.4.0=h046a1c0_0
 - hdf5=1.12.1=nompi_h774d4d8_103
 - hicolor-icon-theme=0.17=h8af1aa0_2
@@ -224,6 +225,7 @@ dependencies:
 - six=1.16.0=pyh6c4a22f_0
 - soapysdr-module-airspy=0.2.0=he88f3d8_0
 - soapysdr-module-airspyhf=0.2.0=he88f3d8_0
+- soapysdr-module-hackrf=0.3.4=he88f3d8_0
 - soapysdr-module-lms7=20.10.0=hd71efff_1
 - soapysdr-module-plutosdr=0.2.1=h872020c_3
 - soapysdr-module-remote=0.5.2=he88f3d8_2

installer_specs/radioconda-linux-aarch64.lock

@@ -17,6 +17,7 @@ specs:
 - gnuradio-osmosdr=0.2.3=py310hef37bb6_17
 - gnuradio-satellites=4.5.0=py310h10b79ae_0
 - gnuradio=3.10.1.1=py310h81c55d6_0
+- hackrf=2021.03.1=h4f2b1ef_0
 - ipython=8.0.1=py310h4c7bcd0_2
 - libiio=0.23=h8af1aa0_0
 - libm2k=0.5.0=py310h0c2382d_3
@@ -31,6 +32,7 @@ specs:
 - scipy=1.8.0=py310hc5918d8_1
 - soapysdr-module-airspy=0.2.0=he88f3d8_0
 - soapysdr-module-airspyhf=0.2.0=he88f3d8_0
+- soapysdr-module-hackrf=0.3.4=he88f3d8_0
 - soapysdr-module-lms7=20.10.0=hd71efff_1
 - soapysdr-module-plutosdr=0.2.1=h872020c_3
 - soapysdr-module-remote=0.5.2=he88f3d8_2

installer_specs/radioconda-linux-aarch64.yml

@@ -78,6 +78,7 @@ dependencies:
 - gstreamer-orc=0.4.32=h4e0d66e_1
 - gtk3=3.24.31=h8f3aad3_3
 - h5py=3.6.0=nompi_py310h32c68c9_100
+- hackrf=2021.03.1=h064770d_0
 - harfbuzz=3.4.0=h49b929e_0
 - hdf5=1.12.1=nompi_h437d42d_103
 - hicolor-icon-theme=0.17=ha3edaa6_2
@@ -207,6 +208,7 @@ dependencies:
 - six=1.16.0=pyh6c4a22f_0
 - soapysdr-module-airspy=0.2.0=h6f8e04d_0
 - soapysdr-module-airspyhf=0.2.0=h6f8e04d_0
+- soapysdr-module-hackrf=0.3.4=h6f8e04d_0
 - soapysdr-module-lms7=20.10.0=h32dcaff_1
 - soapysdr-module-plutosdr=0.2.1=h4a71477_3
 - soapysdr-module-remote=0.5.2=h6f8e04d_2

installer_specs/radioconda-linux-aarch64/construct.yaml

@@ -17,6 +17,7 @@ specs:
 - gnuradio-osmosdr=0.2.3=py310hdbc3197_17
 - gnuradio-satellites=4.5.0=py310h8ea9941_0
 - gnuradio=3.10.1.1=py310hcbf79fe_0
+- hackrf=2021.03.1=h064770d_0
 - ipython=8.0.1=py310h194a6c8_2
 - libiio=0.23=ha3edaa6_0
 - libm2k=0.5.0=py310he948909_3
@@ -31,6 +32,7 @@ specs:
 - scipy=1.8.0=py310h350f40a_1
 - soapysdr-module-airspy=0.2.0=h6f8e04d_0
 - soapysdr-module-airspyhf=0.2.0=h6f8e04d_0
+- soapysdr-module-hackrf=0.3.4=h6f8e04d_0
 - soapysdr-module-lms7=20.10.0=h32dcaff_1
 - soapysdr-module-plutosdr=0.2.1=h4a71477_3
 - soapysdr-module-remote=0.5.2=h6f8e04d_2