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.

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

gnuradio: 3.7.11.1 -> 3.7.13.3 #41431

Merged
merged 6 commits into from Jun 29, 2018
Merged

gnuradio: 3.7.11.1 -> 3.7.13.3 #41431

merged 6 commits into from Jun 29, 2018

Conversation

lukeadams
Copy link
Contributor

@lukeadams lukeadams commented Jun 3, 2018

Motivation for this change
  • gnuradio: version bump and use ninja
  • rtl-sdr: fix weird linker error
  • libbladerf: disable fortify to fix build, enable it on darwin
  • uhd: 3.11.0.0 -> 3.12.0.0 (fixes Darwin build with newer Boost)
    nox-review completed successfully
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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.

# => python wrappers
# May be able to upgrade to swig3
, python, swig2, numpy, scipy, matplotlib
# => grc - the gnu radio companion
, cheetah, pygtk
, Mako, cheetah, pygtk # Note: GR is migrating to Mako. Cheetah shoul dbe removed for GR3.8
Copy link
Member

Choose a reason for hiding this comment

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

Typo s/shoul d/should /

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oops. Fixed!

@@ -26,7 +26,13 @@ stdenv.mkDerivation rec {
grep -q "Requires:" "$pcfile" && { echo "Upstream has added 'Requires:' in $(basename "$pcfile"); update nix expression."; exit 1; }
echo "Requires: libusb-1.0" >> "$pcfile"
'';

patches = lib.optionals stdenv.isDarwin [
Copy link
Member

Choose a reason for hiding this comment

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

Would it be possible/pertinent to open an upstream issue?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Considering that the version didn't change, I assume the error is due to some Nix oddity. I can dig into it a bit more

@lukeadams lukeadams changed the title gnuradio: 3.7.11.1 -> 3.7.13.2 gnuradio: 3.7.11.1 -> 3.7.13.3 Jun 26, 2018
Luke Adams added 6 commits June 26, 2018 17:04
* fixes build on Darwin.
* fetch images from GH releases page (uniform versioning scheme)
* also add mako input (cheetah will be removed in GR3.8)
@lukeadams
Copy link
Contributor Author

@matthewbauer It seems the changes I made to the src fetch broke the GR build. I'm also seeing the cmake/clang argument list issue again on master.

I'll open a pr to fix the src but until the cmake -L explosion is fixed, I'll mark it as WIP since it won't build.

Sorry about that :/

@lukeadams lukeadams deleted the gr-update branch May 26, 2021 21:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants