Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 00617447b268
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: a5e44038df94
Choose a head ref
  • 8 commits
  • 15 files changed
  • 2 contributors

Commits on Dec 5, 2020

  1. gnuradio: rewrite 

    Write (similar) expressions for GNURadio 3.7 and 3.8 and make 3.8
available as `gnuradio`, and `gnuradio3_7` point to the 3.7 build.

Teach both 3.7 & 3.8 expressions accept a `features` attribute set, that
tells them what features to compile. There are dependencies within the
different features, and we rely on upstream's cmake scripts to make sure
the `configurePhase` will fail if a feature is not enabled and needed by
another feature.  All features are enabled by default.

Put shared Nix functions and attributes for both 3.7 and 3.8 in:
pkgs/applications/radio/gnuradio/shared.nix

Add 2 patches accepted upstream, that don't install some python related
examples if python-support is not enabled.

Remove cmake python reference in 3.8 with removeReferencesTo, if
python-support is turned off.

Update gqrx (reverse dependency) to use a build of gnuradio3_7 without
gui components and for it's gr-osmosdr as well.

Write an external, `wrapper.nix` (shared for both 3.7 and 3.8). Teach it
to handle extra `gr-` packages via `GRC_BLOCKS_PATH`. Likely enable it
to accept extra python packages. Wrap the executables with env vars
wrapGAppsHook and wrapQtAppsHook would have likely given them (hence,
fix #87510). Point `gnuradio` to the wrapped 3.8 derivation.

Add @doronbehar to maintainers of both 3.8 and 3.7.

dirty: use upstreamed patches
    @doronbehar
    doronbehar committed Dec 5, 2020
    Copy the full SHA
    3becac0 View commit details
    Browse the repository at this point in the history

  2. treewide/(gnuradio plugins): Add log4cpp as it's needed now. 

    Since gnuradio-runtime is compiled with log4cpp, all plugins that need
gnuradio-runtime (which is all of them probably) need log4cpp as well.

Add python.pkgs.cheetah to inputs of gr-osmosdr as it somehow started to
be needed.
    @doronbehar
    doronbehar committed Dec 5, 2020
    Copy the full SHA
    ed44b46 View commit details
    Browse the repository at this point in the history

  3. gnss-sdr: Fix build by adding python six

    @doronbehar
    doronbehar committed Dec 5, 2020
    Copy the full SHA
    0809304 View commit details
    Browse the repository at this point in the history

  4. rl-2103: Mention gnuradio expressions changes. 

    Mention 3.8 and that it's now possible to override it and 3.7 to compile
only certain features.
    @doronbehar
    doronbehar committed Dec 5, 2020
    Copy the full SHA
    44d0417 View commit details
    Browse the repository at this point in the history

  5. comedilib: 0.11.0 -> 0.12.0

    @r-ryantm @doronbehar
    r-ryantm authored and doronbehar committed Dec 5, 2020
    Copy the full SHA
    3d55b9a View commit details
    Browse the repository at this point in the history

  6. fixup! gnuradio: rewrite

    @doronbehar
    doronbehar committed Dec 5, 2020
    Copy the full SHA
    d3b3bf7 View commit details
    Browse the repository at this point in the history

  7. fixup! gnuradio: rewrite

    @doronbehar
    doronbehar committed Dec 5, 2020
    Copy the full SHA
    0f615e8 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #99685 from doronbehar/pkg/gnuradio 

    gnuradio: rewrite
    @doronbehar
    doronbehar committed Dec 5, 2020
    Copy the full SHA
    a5e4403 View commit details
    Browse the repository at this point in the history