gnuradio: rename *-wrapper and *-full attributes to *-with-packages

Having both *-wrapper and *-full attribute names is rather confusing
(what's the difference?). And further, both packages are named
gnuradio-with-packages:

  $ nix-env -f. -qaP ".*gnuradio.*"
  gnuradio          gnuradio-3.7.7.1
  gnuradio-osmosdr  gnuradio-osmosdr-0.1.4
  gnuradio-full     gnuradio-with-packages-3.7.7.1
  gnuradio-wrapper  gnuradio-with-packages-3.7.7.1

Get rid of *-wrapper and rename *-full to *-with-packages, to align it
with the package name.

Now:

  $ nix-env -f. -qaP ".*gnuradio.*"
  gnuradio                gnuradio-3.7.7.1
  gnuradio-osmosdr        gnuradio-osmosdr-0.1.4
  gnuradio-with-packages  gnuradio-with-packages-3.7.7.1

And you can customize the *-with-packages variant like this:

  gnuradio-with-packages.override { extraPackages = [...]; }
This commit is contained in:
Bjørn Forsman 2015-08-09 16:54:50 +02:00 committed by Moritz Ulrich
parent 5d57d8244a
commit e9ad37e231

View file

@ -11407,9 +11407,7 @@ let
fftw = fftwFloat;
};
gnuradio-wrapper = callPackage ../applications/misc/gnuradio/wrapper.nix { };
gnuradio-full = gnuradio-wrapper.override {
gnuradio-with-packages = callPackage ../applications/misc/gnuradio/wrapper.nix {
extraPackages = [ gnuradio-osmosdr ];
};