Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

soapysdr+plugins: init at 0.6.1 #39504

Merged
merged 6 commits into from May 7, 2018
Merged

soapysdr+plugins: init at 0.6.1 #39504

merged 6 commits into from May 7, 2018

Conversation

markuskowa
Copy link
Member

@markuskowa markuskowa commented Apr 25, 2018 •
edited

Motivation for this change

This the first step to integrate the soapysdr driver, which provides a unified SDR driver library.
Includes the following components:

  • soapysdr library
  • SDR plugins for: airspy, hackrf, bladerf, uhd, limesdr
  • Remote plugin
  • Integration with welle-io

See also: #37020
@roosemberth Does this implementation work for you?

Thanks to @ck3d for some valuable feedback on integrating the plugin system

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

Mic92
Mic92 reviewed Apr 25, 2018
View reviewed changes
pkgs/applications/misc/limesuite/default.nix Outdated
libX11
];

cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is the default.

@Mic92
Copy link
Member

Mic92 commented Apr 25, 2018

@GrahamcOfBorg build soapysdr-with-plugins soapysdr soapyuhd soapybladerf soapyairspy welle-io soapyremote soapyhackrf limesuite

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: soapysdr-with-plugins, soapysdr, soapyuhd, soapybladerf, soapyairspy, welle-io, soapyremote, soapyhackrf, limesuite

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: soapysdr-with-plugins, soapysdr, soapyuhd, soapybladerf, soapyairspy, welle-io, soapyremote, soapyhackrf, limesuite

Partial log (click to expand)

                 from /build/source/build/welle-io_autogen/UVLADIE3JM/../../../src/CRadioController.h:39,
                 from /build/source/build/welle-io_autogen/UVLADIE3JM/moc_CRadioController.cpp:9,
                 from /build/source/build/welle-io_autogen/mocs_compilation.cpp:2:
/build/source/src/DabConstants.h:54:17: note: #pragma message: Git hash is not defined! Set it to "unknown"
 #pragma message "Git hash is not defined! Set it to \"unknown\""
                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
make[1]: *** [CMakeFiles/Makefile2:100: CMakeFiles/welle-io.dir/all] Error 2
make: *** [Makefile:130: all] Error 2
builder for '/nix/store/0qz0kdi8z772rp3ggkncx9wp5www3l2r-welle-io-1.0-rc2.drv' failed with exit code 2
�[31;1merror:�[0m build of '/nix/store/0qz0kdi8z772rp3ggkncx9wp5www3l2r-welle-io-1.0-rc2.drv' failed

@Mic92
Copy link
Member

Mic92 commented Apr 26, 2018 •
edited

It is weird that this error on aarch64 does not come up on x86_64.

@markuskowa
Copy link
Member Author

I guess this line causes the error on aarch64:
/build/source/src/backend/viterbi_spiral.c:23:10: fatal error: emmintrin.h: No such file or directory #include <emmintrin.h>
According to hydra welle-io never built successfully on aarch64. I'll just remove the architecture from the meta tags.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: soapysdr-with-plugins, soapysdr, soapyuhd, soapybladerf, soapyairspy, welle-io, soapyremote, soapyhackrf, limesuite

Partial log (click to expand)

postPatchMkspecs
/nix/store/xqy7knhcffinr8j2yg9wxiqx4bfglkgg-soapysdr-0.6.1
/nix/store/xrlkyldj68c0k17q1x7miq82bi8qnjmy-soapysdr-0.6.1
/nix/store/nldziy5gjvkbcf0m7zbl3lc2w68sj4pq-soapyuhd-0.3.4
/nix/store/i2rxy7fkdv2k5d60ym0hzgs8z4sjjq75-soapybladerf-0.3.5
/nix/store/ql2lizr04rc1qspf93l884m2zd54zwjw-soapyairspy-0.1.1
/nix/store/pfmbbzyfvikjf24gq26w61cmi711rza9-welle-io-1.0-rc2
/nix/store/zwgdz7s33y3m4c1fhnfzq3j067jq3a92-soapyremote-0.4.3
/nix/store/zwrjpsp6v17zdzjbjvi8sxapqfa9825y-soapyhackrf-0.3.2
/nix/store/ymd2rzl5gpc4fp9npb86q5v8fj1vqkxl-limesuite-18.04.1

@markuskowa
Copy link
Member Author

Should be good now?

@roosemberth
Copy link
Contributor

Sidenote: this works for me, closing #37020 in favor of this one.

@markuskowa
Copy link
Member Author

@Mic92 I would be good to go. Do we need any other refinements?

@Mic92 Mic92 merged commit 4c41c18 into NixOS:master May 7, 2018
@Mic92
Copy link
Member

Mic92 commented May 7, 2018

Thanks!

@markuskowa markuskowa deleted the soapysdr-pr branch May 7, 2018 21:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Mic92 left review comments

Assignees
No one assigned
Labels
8.has: clean-up 8.has: package (new) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@markuskowa @Mic92 @GrahamcOfBorg @roosemberth