top-level: remove all extra pkgs
This commit is contained in:
Sandro Jäckel
parent
db93862a2c
commit
554495a75f
@ -19621,13 +19621,13 @@ with pkgs;
|
||||
sqlite-replication = sqlite.overrideAttrs (oldAttrs: rec {
|
||||
name = "sqlite-${version}";
|
||||
version = "3.27.2+replication3";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
src = fetchFromGitHub {
|
||||
owner = "CanonicalLtd";
|
||||
repo = "sqlite";
|
||||
rev = "version-${version}";
|
||||
sha256 = "1aw1naa5y25ial251f74h039pgcz92p4b3994jvfzqpjlz06qwvw";
|
||||
};
|
||||
nativeBuildInputs = [ pkgs.tcl ];
|
||||
nativeBuildInputs = [ tcl ];
|
||||
configureFlags = oldAttrs.configureFlags ++ [
|
||||
"--enable-replication"
|
||||
"--disable-amalgamation"
|
||||
@ -20423,7 +20423,7 @@ with pkgs;
|
||||
alerta-server = callPackage ../servers/monitoring/alerta { };
|
||||
|
||||
apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { };
|
||||
apacheHttpd = pkgs.apacheHttpd_2_4;
|
||||
apacheHttpd = apacheHttpd_2_4;
|
||||
|
||||
apacheHttpdPackagesFor = apacheHttpd: self: let callPackage = newScope self; in {
|
||||
inherit apacheHttpd;
|
||||
@ -20461,7 +20461,7 @@ with pkgs;
|
||||
subversion = pkgs.subversion.override { httpServer = true; inherit apacheHttpd; };
|
||||
};
|
||||
|
||||
apacheHttpdPackages_2_4 = recurseIntoAttrs (apacheHttpdPackagesFor pkgs.apacheHttpd_2_4 pkgs.apacheHttpdPackages_2_4);
|
||||
apacheHttpdPackages_2_4 = recurseIntoAttrs (apacheHttpdPackagesFor apacheHttpd_2_4 apacheHttpdPackages_2_4);
|
||||
apacheHttpdPackages = apacheHttpdPackages_2_4;
|
||||
|
||||
appdaemon = callPackage ../servers/home-assistant/appdaemon.nix { };
|
||||
@ -20805,18 +20805,18 @@ with pkgs;
|
||||
mkchromecast = libsForQt5.callPackage ../applications/networking/mkchromecast { };
|
||||
|
||||
# Backwards compatibility.
|
||||
mod_dnssd = pkgs.apacheHttpdPackages.mod_dnssd;
|
||||
mod_fastcgi = pkgs.apacheHttpdPackages.mod_fastcgi;
|
||||
mod_python = pkgs.apacheHttpdPackages.mod_python;
|
||||
mod_wsgi = pkgs.apacheHttpdPackages.mod_wsgi;
|
||||
mod_ca = pkgs.apacheHttpdPackages.mod_ca;
|
||||
mod_crl = pkgs.apacheHttpdPackages.mod_crl;
|
||||
mod_csr = pkgs.apacheHttpdPackages.mod_csr;
|
||||
mod_ocsp = pkgs.apacheHttpdPackages.mod_ocsp;
|
||||
mod_scep = pkgs.apacheHttpdPackages.mod_scep;
|
||||
mod_spkac = pkgs.apacheHttpdPackages.mod_spkac;
|
||||
mod_pkcs12 = pkgs.apacheHttpdPackages.mod_pkcs12;
|
||||
mod_timestamp = pkgs.apacheHttpdPackages.mod_timestamp;
|
||||
mod_dnssd = apacheHttpdPackages.mod_dnssd;
|
||||
mod_fastcgi = apacheHttpdPackages.mod_fastcgi;
|
||||
mod_python = apacheHttpdPackages.mod_python;
|
||||
mod_wsgi = apacheHttpdPackages.mod_wsgi;
|
||||
mod_ca = apacheHttpdPackages.mod_ca;
|
||||
mod_crl = apacheHttpdPackages.mod_crl;
|
||||
mod_csr = apacheHttpdPackages.mod_csr;
|
||||
mod_ocsp = apacheHttpdPackages.mod_ocsp;
|
||||
mod_scep = apacheHttpdPackages.mod_scep;
|
||||
mod_spkac = apacheHttpdPackages.mod_spkac;
|
||||
mod_pkcs12 = apacheHttpdPackages.mod_pkcs12;
|
||||
mod_timestamp = apacheHttpdPackages.mod_timestamp;
|
||||
|
||||
inherit (callPackages ../servers/mpd {
|
||||
stdenv = if stdenv.cc.isClang then llvmPackages_8.stdenv else stdenv;
|
||||
@ -21220,7 +21220,7 @@ with pkgs;
|
||||
postgresqlPackages = recurseIntoAttrs postgresql.pkgs;
|
||||
postgresql11Packages = recurseIntoAttrs postgresql_11.pkgs;
|
||||
postgresql12Packages = recurseIntoAttrs postgresql_12.pkgs;
|
||||
postgresql13Packages = pkgs.postgresqlPackages;
|
||||
postgresql13Packages = postgresqlPackages;
|
||||
postgresql14Packages = recurseIntoAttrs postgresql_14.pkgs;
|
||||
|
||||
postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { };
|
||||
@ -21376,7 +21376,7 @@ with pkgs;
|
||||
enableMDNS = true;
|
||||
enableDomainController = true;
|
||||
enableRegedit = true;
|
||||
enableCephFS = !pkgs.stdenv.hostPlatform.isAarch64;
|
||||
enableCephFS = !stdenv.hostPlatform.isAarch64;
|
||||
});
|
||||
|
||||
sambaFull = samba4Full;
|
||||
@ -21817,7 +21817,7 @@ with pkgs;
|
||||
fatrace = callPackage ../os-specific/linux/fatrace { };
|
||||
|
||||
ffado = libsForQt5.callPackage ../os-specific/linux/ffado {
|
||||
inherit (pkgs.linuxPackages) kernel;
|
||||
inherit (linuxPackages) kernel;
|
||||
};
|
||||
libffado = ffado;
|
||||
|
||||
@ -22029,11 +22029,11 @@ with pkgs;
|
||||
|
||||
# This serves as a test for linuxPackages_custom
|
||||
linuxPackages_custom_tinyconfig_kernel = let
|
||||
base = pkgs.linuxPackages.kernel;
|
||||
base = linuxPackages.kernel;
|
||||
tinyLinuxPackages = linuxKernel.customPackage {
|
||||
inherit (base) version src;
|
||||
allowImportFromDerivation = false;
|
||||
configfile = pkgs.linuxConfig {
|
||||
configfile = linuxConfig {
|
||||
makeTarget = "tinyconfig";
|
||||
src = base.src;
|
||||
};
|
||||
@ -22527,7 +22527,7 @@ with pkgs;
|
||||
|
||||
sysdig = callPackage ../os-specific/linux/sysdig {
|
||||
kernel = null;
|
||||
}; # pkgs.sysdig is a client, for a driver look at linuxPackagesFor
|
||||
}; # sysdig is a client, for a driver look at linuxPackagesFor
|
||||
|
||||
sysfsutils = callPackage ../os-specific/linux/sysfsutils { };
|
||||
|
||||
@ -24413,7 +24413,7 @@ with pkgs;
|
||||
djvu2pdf = callPackage ../tools/typesetting/djvu2pdf { };
|
||||
|
||||
djview = libsForQt5.callPackage ../applications/graphics/djview { };
|
||||
djview4 = pkgs.djview;
|
||||
djview4 = djview;
|
||||
|
||||
dmenu = callPackage ../applications/misc/dmenu { };
|
||||
dmenu-wayland = callPackage ../applications/misc/dmenu/wayland.nix { };
|
||||
@ -25054,7 +25054,7 @@ with pkgs;
|
||||
filezilla = callPackage ../applications/networking/ftp/filezilla { };
|
||||
|
||||
firefoxPackages = recurseIntoAttrs (callPackage ../applications/networking/browsers/firefox/packages.nix {
|
||||
callPackage = pkgs.newScope {
|
||||
callPackage = newScope {
|
||||
inherit (rustPackages) cargo rustc;
|
||||
libpng = libpng_apng;
|
||||
gnused = gnused_422;
|
||||
@ -26543,7 +26543,7 @@ with pkgs;
|
||||
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
|
||||
};
|
||||
|
||||
mercurialFull = appendToName "full" (pkgs.mercurial.override { fullBuild = true; });
|
||||
mercurialFull = appendToName "full" (mercurial.override { fullBuild = true; });
|
||||
|
||||
merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { };
|
||||
|
||||
@ -28160,7 +28160,7 @@ with pkgs;
|
||||
inherit (callPackages ../applications/version-management/subversion { sasl = cyrus_sasl; })
|
||||
subversion_1_10 subversion;
|
||||
|
||||
subversionClient = appendToName "client" (pkgs.subversion.override {
|
||||
subversionClient = appendToName "client" (subversion.override {
|
||||
bdbSupport = false;
|
||||
perlBindings = true;
|
||||
pythonBindings = true;
|
||||
@ -28345,7 +28345,7 @@ with pkgs;
|
||||
thonny = callPackage ../applications/editors/thonny { };
|
||||
|
||||
thunderbirdPackages = recurseIntoAttrs (callPackage ../applications/networking/mailreaders/thunderbird/packages.nix {
|
||||
callPackage = pkgs.newScope {
|
||||
callPackage = newScope {
|
||||
inherit (rustPackages) cargo rustc;
|
||||
libpng = libpng_apng;
|
||||
gnused = gnused_422;
|
||||
@ -28659,7 +28659,7 @@ with pkgs;
|
||||
neovim-qt = libsForQt5.callPackage ../applications/editors/neovim/qt.nix { };
|
||||
|
||||
gnvim-unwrapped = callPackage ../applications/editors/neovim/gnvim {
|
||||
gtk = pkgs.gtk3;
|
||||
gtk = gtk3;
|
||||
};
|
||||
|
||||
gnvim = callPackage ../applications/editors/neovim/gnvim/wrapper.nix { };
|
||||
@ -29813,9 +29813,9 @@ with pkgs;
|
||||
|
||||
chocolateDoom = callPackage ../games/chocolate-doom { };
|
||||
|
||||
clonehero-unwrapped = pkgs.callPackage ../games/clonehero { };
|
||||
clonehero-unwrapped = callPackage ../games/clonehero { };
|
||||
|
||||
clonehero = pkgs.callPackage ../games/clonehero/fhs-wrapper.nix { };
|
||||
clonehero = callPackage ../games/clonehero/fhs-wrapper.nix { };
|
||||
|
||||
crispyDoom = callPackage ../games/crispy-doom { };
|
||||
|
||||
@ -30792,7 +30792,7 @@ with pkgs;
|
||||
inherit (cinnamon) mint-x-icons mint-y-icons;
|
||||
|
||||
enlightenment = recurseIntoAttrs (callPackage ../desktops/enlightenment {
|
||||
callPackage = newScope pkgs.enlightenment;
|
||||
callPackage = newScope enlightenment;
|
||||
});
|
||||
|
||||
gnome2 = recurseIntoAttrs (callPackage ../desktops/gnome-2 { });
|
||||
@ -30849,7 +30849,7 @@ with pkgs;
|
||||
};
|
||||
|
||||
arcan = recurseIntoAttrs (callPackage ../desktops/arcan {
|
||||
callPackage = newScope pkgs.arcan;
|
||||
callPackage = newScope arcan;
|
||||
});
|
||||
|
||||
xfce = recurseIntoAttrs (callPackage ../desktops/xfce { });
|
||||
@ -32384,8 +32384,8 @@ with pkgs;
|
||||
nixos =
|
||||
configuration:
|
||||
let
|
||||
c = import (pkgs.path + "/nixos/lib/eval-config.nix") {
|
||||
inherit (pkgs.stdenv.hostPlatform) system;
|
||||
c = import (path + "/nixos/lib/eval-config.nix") {
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
modules =
|
||||
[(
|
||||
{ lib, ... }: {
|
||||
@ -32435,7 +32435,7 @@ with pkgs;
|
||||
*/
|
||||
nixosTesting =
|
||||
(import ../../nixos/lib/testing-python.nix {
|
||||
inherit (pkgs.stdenv.hostPlatform) system;
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
inherit pkgs;
|
||||
extraConfigurations = [(
|
||||
{ lib, ... }: {
|
||||
@ -32449,7 +32449,7 @@ with pkgs;
|
||||
loadedTest = if builtins.typeOf test == "path"
|
||||
then import test
|
||||
else test;
|
||||
calledTest = if pkgs.lib.isFunction loadedTest
|
||||
calledTest = if lib.isFunction loadedTest
|
||||
then callPackage loadedTest {}
|
||||
else loadedTest;
|
||||
in
|
||||
@ -32693,7 +32693,7 @@ with pkgs;
|
||||
|
||||
redprl = callPackage ../applications/science/logic/redprl { };
|
||||
|
||||
renderizer = pkgs.callPackage ../development/tools/renderizer {};
|
||||
renderizer = callPackage ../development/tools/renderizer {};
|
||||
|
||||
retroarchBare = callPackage ../misc/emulators/retroarch {
|
||||
inherit (darwin) libobjc;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user