JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

all-packages: normalize overrides

Browse Source 
Overrides should only be on the "default" package not the other way around.
This commit is contained in:
Matthew Bauer 2018-04-29 16:37:26 -05:00
parent 4654643266
commit 48a1345eaa
1 changed files with 35 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
pkgs/top-level/all-packages.nix
View File

@ -2700,11 +2700,11 @@ with pkgs;
grub2_full = callPackage ../tools/misc/grub/2.0x.nix { }; grub2_full = callPackage ../tools/misc/grub/2.0x.nix { };
grub2_efi = grub2_full.override { grub2_efi = grub2.override {
efiSupport = true; efiSupport = true;
}; };
grub2_light = grub2_full.override { grub2_light = grub2.override {
zfsSupport = false; zfsSupport = false;
}; };
@ -3721,12 +3721,14 @@ with pkgs;
mitmproxy = callPackage ../tools/networking/mitmproxy { }; mitmproxy = callPackage ../tools/networking/mitmproxy { };
mjpegtoolsFull = callPackage ../tools/video/mjpegtools { }; mjpegtools = callPackage ../tools/video/mjpegtools {
mjpegtools = self.mjpegtoolsFull.override {
withMinimal = true; withMinimal = true;
}; };
mjpegtoolsFull = mjpegtools.override {
withMinimal = false;
};
mkcue = callPackage ../tools/cd-dvd/mkcue { }; mkcue = callPackage ../tools/cd-dvd/mkcue { };
mkpasswd = hiPrio (callPackage ../tools/security/mkpasswd { }); mkpasswd = hiPrio (callPackage ../tools/security/mkpasswd { });
@ -4310,28 +4312,27 @@ with pkgs;
philter = callPackage ../tools/networking/philter { }; philter = callPackage ../tools/networking/philter { };
pinentry = pinentry_ncurses.override { pinentry = callPackage ../tools/security/pinentry {
inherit gtk2; libcap = if stdenv.isDarwin then null else libcap;
}; };
pinentry_ncurses = callPackage ../tools/security/pinentry { pinentry_ncurses = pinentry.override {
libcap = if stdenv.isDarwin then null else libcap;
gtk2 = null; gtk2 = null;
}; };
pinentry_emacs = pinentry_ncurses.override { pinentry_emacs = pinentry.override {
enableEmacs = true; enableEmacs = true;
}; };
pinentry_gnome = pinentry_ncurses.override { pinentry_gnome = pinentry.override {
gcr = gnome3.gcr; gcr = gnome3.gcr;
}; };
pinentry_qt4 = pinentry_ncurses.override { pinentry_qt4 = pinentry.override {
qt = qt4; qt = qt4;
}; };
pinentry_qt5 = pinentry_ncurses.override { pinentry_qt5 = pinentry.override {
qt = qt5.qtbase; qt = qt5.qtbase;
}; };
@ -4354,7 +4355,7 @@ with pkgs;
plan9port = callPackage ../tools/system/plan9port { }; plan9port = callPackage ../tools/system/plan9port { };
platformioPackages = callPackage ../development/arduino/platformio { }; platformioPackages = callPackage ../development/arduino/platformio { };
platformio = platformioPackages.platformio-chrootenv.override {}; platformio = platformioPackages.platformio-chrootenv;
platinum-searcher = callPackage ../tools/text/platinum-searcher { }; platinum-searcher = callPackage ../tools/text/platinum-searcher { };
@ -9293,7 +9294,7 @@ with pkgs;
libheimdal = heimdalFull.override { type = "lib"; }; libheimdal = heimdalFull.override { type = "lib"; };
harfbuzz = callPackage ../development/libraries/harfbuzz { }; harfbuzz = callPackage ../development/libraries/harfbuzz { };
harfbuzz-icu = callPackage ../development/libraries/harfbuzz { harfbuzz-icu = harfbuzz.override {
withIcu = true; withIcu = true;
withGraphite2 = true; withGraphite2 = true;
}; };
@ -9480,10 +9481,11 @@ with pkgs;
kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { }; kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { };
krb5Full = callPackage ../development/libraries/kerberos/krb5.nix { krb5 = callPackage ../development/libraries/kerberos/krb5.nix {
inherit (darwin) bootstrap_cmds; inherit (darwin) bootstrap_cmds;
}; };
libkrb5 = krb5Full.override { krb5Full = krb5;
libkrb5 = krb5.override {
fetchurl = fetchurlBoot; fetchurl = fetchurlBoot;
type = "lib"; type = "lib";
}; };
@ -9675,14 +9677,12 @@ with pkgs;
libdbi = callPackage ../development/libraries/libdbi { }; libdbi = callPackage ../development/libraries/libdbi { };
libdbiDriversBase = callPackage ../development/libraries/libdbi-drivers { libdbiDriversBase = libdbiDrivers.override {
mysql = null; mysql = null;
sqlite = null; sqlite = null;
}; };
libdbiDrivers = libdbiDriversBase.override { libdbiDrivers = callPackage ../development/libraries/libdbi-drivers { };
inherit sqlite mysql;
};
libdbusmenu-glib = callPackage ../development/libraries/libdbusmenu { }; libdbusmenu-glib = callPackage ../development/libraries/libdbusmenu { };
libdbusmenu-gtk2 = callPackage ../development/libraries/libdbusmenu { gtkVersion = "2"; }; libdbusmenu-gtk2 = callPackage ../development/libraries/libdbusmenu { gtkVersion = "2"; };
@ -15639,16 +15639,16 @@ with pkgs;
welle-io = libsForQt5.callPackage ../applications/misc/welle-io { }; welle-io = libsForQt5.callPackage ../applications/misc/welle-io { };
wireshark-cli = callPackage ../applications/networking/sniffers/wireshark { wireshark = callPackage ../applications/networking/sniffers/wireshark {
withQt = false; withQt = true;
withGtk = false; withGtk = false;
inherit (darwin.apple_sdk.frameworks) ApplicationServices SystemConfiguration; inherit (darwin.apple_sdk.frameworks) ApplicationServices SystemConfiguration;
}; };
wireshark-qt = wireshark;
# The GTK UI is deprecated by upstream. You probably want the QT version. # The GTK UI is deprecated by upstream. You probably want the QT version.
wireshark-gtk = wireshark-cli.override { withGtk = true; }; wireshark-gtk = wireshark.override { withGtk = true; };
wireshark-qt = wireshark-cli.override { withQt = true; }; wireshark-cli = wireshark.override { withGtk = false; withQt = false; };
wireshark = wireshark-qt;
fbida = callPackage ../applications/graphics/fbida { }; fbida = callPackage ../applications/graphics/fbida { };
@ -16166,13 +16166,12 @@ with pkgs;
libwebp = null; libwebp = null;
}; };
imagemagick = imagemagickBig.override { imagemagick = callPackage ../applications/graphics/ImageMagick {
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
ghostscript = null; ghostscript = null;
}; };
imagemagickBig = callPackage ../applications/graphics/ImageMagick { imagemagickBig = imagemagick.override { inherit ghostscript; };
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
};
imagemagick7_light = lowPrio (imagemagick7.override { imagemagick7_light = lowPrio (imagemagick7.override {
bzip2 = null; bzip2 = null;
@ -19750,12 +19749,12 @@ with pkgs;
# and with or without atlas as a dependency. The default `liblapack` is 3.4.1 # and with or without atlas as a dependency. The default `liblapack` is 3.4.1
# with atlas. Atlas, when built with liblapack as a dependency, uses 3.5.0 # with atlas. Atlas, when built with liblapack as a dependency, uses 3.5.0
# without atlas. Etc. # without atlas. Etc.
liblapackWithAtlas = callPackage ../development/libraries/science/math/liblapack {}; liblapack = callPackage ../development/libraries/science/math/liblapack {};
liblapackWithoutAtlas = liblapackWithAtlas.override { atlas = null; }; liblapackWithAtlas = liblapack;
liblapack_3_5_0WithAtlas = callPackage ../development/libraries/science/math/liblapack/3.5.0.nix {}; liblapackWithoutAtlas = liblapack.override { atlas = null; };
liblapack_3_5_0WithoutAtlas = liblapack_3_5_0WithAtlas.override { atlas = null; }; liblapack_3_5_0 = callPackage ../development/libraries/science/math/liblapack/3.5.0.nix {};
liblapack = liblapackWithAtlas; liblapack_3_5_0WithAtlas = liblapack_3_5_0;
liblapack_3_5_0 = liblapack_3_5_0WithAtlas; liblapack_3_5_0WithoutAtlas = liblapack_3_5_0.override { atlas = null; };
liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { }; liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { };