swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 21:09:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #145649 from SuperSandro2000/top-level-pkgs

Browse source 
top-level: remove all extra pkgs
This commit is contained in:
Dmitry Kalinkin 2021-11-12 13:45:23 -05:00 committed by GitHub
parent 2416e88cba 554495a75f
commit f153da3507
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 37 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
pkgs/top-level/all-packages.nix
View file

@ -19624,13 +19624,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"
@ -20424,7 +20424,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;
@ -20462,7 +20462,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 { };
@ -20806,18 +20806,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;
@ -21221,7 +21221,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 { };
@ -21377,7 +21377,7 @@ with pkgs;
enableMDNS = true;
enableDomainController = true;
enableRegedit = true;
enableCephFS = !pkgs.stdenv.hostPlatform.isAarch64;
enableCephFS = !stdenv.hostPlatform.isAarch64;
});
sambaFull = samba4Full;
@ -21818,7 +21818,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;
@ -22030,11 +22030,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;
};
@ -22528,7 +22528,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 { };
@ -24414,7 +24414,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 { };
@ -25055,7 +25055,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;
@ -26544,7 +26544,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 { };
@ -28161,7 +28161,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;
@ -28346,7 +28346,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;
@ -28660,7 +28660,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 { };
@ -29814,9 +29814,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 { };
@ -30793,7 +30793,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 { });
@ -30850,7 +30850,7 @@ with pkgs;
};
arcan = recurseIntoAttrs (callPackage ../desktops/arcan {
callPackage = newScope pkgs.arcan;
callPackage = newScope arcan;
});
xfce = recurseIntoAttrs (callPackage ../desktops/xfce { });
@ -32385,8 +32385,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, ... }: {
@ -32436,7 +32436,7 @@ with pkgs;
*/
nixosTesting =
(import ../../nixos/lib/testing-python.nix {
inherit (pkgs.stdenv.hostPlatform) system;
inherit (stdenv.hostPlatform) system;
inherit pkgs;
extraConfigurations = [(
{ lib, ... }: {
@ -32450,7 +32450,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
@ -32694,7 +32694,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;