various: convert some callPackage uses in all-packages.nix to overrides, migrate to pkgs/by-name (#519976)
This commit is contained in:
@@ -1426,9 +1426,7 @@ with pkgs;
|
||||
else
|
||||
throw "freshBootstrapTools: unknown hostPlatform ${stdenv.hostPlatform.config}";
|
||||
|
||||
crystfel = callPackage ../applications/science/physics/crystfel { };
|
||||
|
||||
crystfel-headless = callPackage ../applications/science/physics/crystfel { withGui = false; };
|
||||
crystfel-headless = crystfel.override { withGui = false; };
|
||||
|
||||
amule-daemon = amule.override {
|
||||
monolithic = false;
|
||||
@@ -1519,12 +1517,12 @@ with pkgs;
|
||||
|
||||
pass = callPackage ../tools/security/pass { };
|
||||
|
||||
pass-nodmenu = callPackage ../tools/security/pass {
|
||||
pass-nodmenu = pass.override {
|
||||
dmenuSupport = false;
|
||||
pass = pass-nodmenu;
|
||||
};
|
||||
|
||||
pass-wayland = callPackage ../tools/security/pass {
|
||||
pass-wayland = pass.override {
|
||||
waylandSupport = true;
|
||||
pass = pass-wayland;
|
||||
};
|
||||
@@ -2438,9 +2436,7 @@ with pkgs;
|
||||
callPackage ../tools/misc/graylog/plugins.nix { graylogPackage = graylog-6_0; }
|
||||
);
|
||||
|
||||
graphviz = callPackage ../tools/graphics/graphviz { };
|
||||
|
||||
graphviz-nox = callPackage ../tools/graphics/graphviz {
|
||||
graphviz-nox = graphviz.override {
|
||||
withXorg = false;
|
||||
};
|
||||
|
||||
@@ -2744,8 +2740,7 @@ with pkgs;
|
||||
;
|
||||
lerna = lerna_8;
|
||||
|
||||
libint = callPackage ../development/libraries/libint { };
|
||||
libintPsi4 = callPackage ../development/libraries/libint {
|
||||
libintPsi4 = libint.override {
|
||||
enableFortran = false;
|
||||
enableSSE = false;
|
||||
maxAm = 6;
|
||||
@@ -2817,9 +2812,7 @@ with pkgs;
|
||||
|
||||
mcstatus = with python3Packages; toPythonApplication mcstatus;
|
||||
|
||||
miniupnpd = callPackage ../tools/networking/miniupnpd { };
|
||||
|
||||
miniupnpd-nftables = callPackage ../tools/networking/miniupnpd { firewall = "nftables"; };
|
||||
miniupnpd-nftables = miniupnpd.override { firewall = "nftables"; };
|
||||
|
||||
mir-qualia = callPackage ../tools/text/mir-qualia {
|
||||
pythonPackages = python3Packages;
|
||||
@@ -2841,9 +2834,7 @@ with pkgs;
|
||||
|
||||
metasploit = callPackage ../tools/security/metasploit { };
|
||||
|
||||
mtr = callPackage ../tools/networking/mtr { };
|
||||
|
||||
mtr-gui = callPackage ../tools/networking/mtr { withGtk = true; };
|
||||
mtr-gui = mtr.override { withGtk = true; };
|
||||
|
||||
multitran = recurseIntoAttrs (
|
||||
let
|
||||
@@ -3330,9 +3321,7 @@ with pkgs;
|
||||
w3m = w3m-batch;
|
||||
};
|
||||
|
||||
tartube = callPackage ../applications/video/tartube { };
|
||||
|
||||
tartube-yt-dlp = callPackage ../applications/video/tartube {
|
||||
tartube-yt-dlp = tartube.override {
|
||||
youtube-dl = yt-dlp;
|
||||
};
|
||||
|
||||
@@ -4702,8 +4691,7 @@ with pkgs;
|
||||
|
||||
### DEVELOPMENT / INTERPRETERS
|
||||
|
||||
acl2 = callPackage ../development/interpreters/acl2 { };
|
||||
acl2-minimal = callPackage ../development/interpreters/acl2 { certifyBooks = false; };
|
||||
acl2-minimal = acl2.override { certifyBooks = false; };
|
||||
|
||||
uiua-unstable = callPackage ../by-name/ui/uiua/package.nix { uiua_versionType = "unstable"; };
|
||||
|
||||
@@ -5715,9 +5703,7 @@ with pkgs;
|
||||
_7zz = _7zz-rar;
|
||||
};
|
||||
|
||||
nwjs = callPackage ../development/tools/nwjs { };
|
||||
|
||||
nwjs-sdk = callPackage ../development/tools/nwjs {
|
||||
nwjs-sdk = nwjs.override {
|
||||
sdk = true;
|
||||
};
|
||||
|
||||
@@ -6652,11 +6638,11 @@ with pkgs;
|
||||
|
||||
libtorrent-rasterbar = libtorrent-rasterbar-2_0_x;
|
||||
|
||||
libubox-nossl = callPackage ../development/libraries/libubox { };
|
||||
libubox-nossl = libubox.override { with_ustream_ssl = false; };
|
||||
|
||||
libubox = callPackage ../development/libraries/libubox { with_ustream_ssl = true; };
|
||||
|
||||
libubox-mbedtls = callPackage ../development/libraries/libubox {
|
||||
libubox-mbedtls = libubox.override {
|
||||
with_ustream_ssl = true;
|
||||
ustream-ssl = ustream-ssl-mbedtls;
|
||||
};
|
||||
@@ -7087,9 +7073,7 @@ with pkgs;
|
||||
|
||||
qdjango = libsForQt5.callPackage ../development/libraries/qdjango { };
|
||||
|
||||
quarto = callPackage ../development/libraries/quarto { };
|
||||
|
||||
quartoMinimal = callPackage ../development/libraries/quarto {
|
||||
quartoMinimal = quarto.override {
|
||||
rWrapper = null;
|
||||
python3 = null;
|
||||
};
|
||||
@@ -8356,13 +8340,11 @@ with pkgs;
|
||||
|
||||
i7z = qt5.callPackage ../os-specific/linux/i7z { };
|
||||
|
||||
ipu6-camera-hal = callPackage ../development/libraries/ipu6-camera-hal { };
|
||||
|
||||
ipu6ep-camera-hal = callPackage ../development/libraries/ipu6-camera-hal {
|
||||
ipu6ep-camera-hal = ipu6-camera-hal.override {
|
||||
ipuVersion = "ipu6ep";
|
||||
};
|
||||
|
||||
ipu6epmtl-camera-hal = callPackage ../development/libraries/ipu6-camera-hal {
|
||||
ipu6epmtl-camera-hal = ipu6-camera-hal.override {
|
||||
ipuVersion = "ipu6epmtl";
|
||||
};
|
||||
|
||||
@@ -8443,17 +8425,15 @@ with pkgs;
|
||||
|
||||
cryptodev = linuxPackages.cryptodev;
|
||||
|
||||
librealsense = callPackage ../development/libraries/librealsense { };
|
||||
|
||||
librealsenseWithCuda = callPackage ../development/libraries/librealsense {
|
||||
librealsenseWithCuda = librealsense.override {
|
||||
cudaSupport = true;
|
||||
};
|
||||
|
||||
librealsenseWithoutCuda = callPackage ../development/libraries/librealsense {
|
||||
librealsenseWithoutCuda = librealsense.override {
|
||||
cudaSupport = false;
|
||||
};
|
||||
|
||||
librealsense-gui = callPackage ../development/libraries/librealsense {
|
||||
librealsense-gui = librealsense.override {
|
||||
enableGUI = true;
|
||||
};
|
||||
|
||||
@@ -9550,13 +9530,11 @@ with pkgs;
|
||||
callPackages ../applications/graphics/inkscape/extensions.nix { }
|
||||
);
|
||||
|
||||
jabcode = callPackage ../development/libraries/jabcode { };
|
||||
|
||||
jabcode-writer = callPackage ../development/libraries/jabcode {
|
||||
jabcode-writer = jabcode.override {
|
||||
subproject = "writer";
|
||||
};
|
||||
|
||||
jabcode-reader = callPackage ../development/libraries/jabcode {
|
||||
jabcode-reader = jabcode.override {
|
||||
subproject = "reader";
|
||||
};
|
||||
|
||||
@@ -9817,9 +9795,7 @@ with pkgs;
|
||||
|
||||
pijuice = with python3Packages; toPythonApplication pijuice;
|
||||
|
||||
pinegrow6 = callPackage ../applications/editors/pinegrow { pinegrowVersion = "6"; };
|
||||
|
||||
pinegrow = callPackage ../applications/editors/pinegrow { };
|
||||
pinegrow6 = pinegrow.override { pinegrowVersion = "6"; };
|
||||
|
||||
pipe-viewer = perlPackages.callPackage ../applications/video/pipe-viewer { };
|
||||
|
||||
@@ -9877,9 +9853,7 @@ with pkgs;
|
||||
|
||||
muchsync = callPackage ../applications/networking/mailreaders/notmuch/muchsync.nix { };
|
||||
|
||||
nufraw = callPackage ../applications/graphics/nufraw { };
|
||||
|
||||
nufraw-thumbnailer = callPackage ../applications/graphics/nufraw {
|
||||
nufraw-thumbnailer = nufraw.override {
|
||||
addThumbnailer = true;
|
||||
};
|
||||
|
||||
@@ -9925,9 +9899,7 @@ with pkgs;
|
||||
ocamlPackages = ocaml-ng.ocamlPackages_4_14;
|
||||
};
|
||||
|
||||
pantalaimon = callPackage ../applications/networking/instant-messengers/pantalaimon { };
|
||||
|
||||
pantalaimon-headless = callPackage ../applications/networking/instant-messengers/pantalaimon {
|
||||
pantalaimon-headless = pantalaimon.override {
|
||||
enableDbusUi = false;
|
||||
};
|
||||
|
||||
@@ -10086,7 +10058,7 @@ with pkgs;
|
||||
rke2 = rke2_stable;
|
||||
|
||||
rofi-pass = callPackage ../tools/security/pass/rofi-pass.nix { };
|
||||
rofi-pass-wayland = callPackage ../tools/security/pass/rofi-pass.nix {
|
||||
rofi-pass-wayland = rofi-pass.override {
|
||||
backend = "wayland";
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user