From e9ad37e231987d2834f4ba6c83375d424e574218 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 9 Aug 2015 16:54:50 +0200 Subject: [PATCH] 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 = [...]; } --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45fc09317d7..6d42fab6ad3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 ]; };