BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #137115 from siraben/all-packages-redundant-pkgs

Browse source
This commit is contained in:
Ben Siraphob 2021-09-08 19:21:18 -05:00 committed by GitHub
commit 4b775423a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 36 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -628,7 +628,7 @@ with pkgs;
mkShell = callPackage ../build-support/mkshell { };
mkShellNoCC = mkShell.override { stdenv = stdenvNoCC; };
nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit (pkgs) lib writeText; inherit (emacs.pkgs) inherit-local; };
nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit lib writeText; inherit (emacs.pkgs) inherit-local; };
nix-gitignore = callPackage ../build-support/nix-gitignore { };
@ -692,7 +692,7 @@ with pkgs;
enableGCOVInstrumentation = makeSetupHook { } ../build-support/setup-hooks/enable-coverage-instrumentation.sh;
makeGCOVReport = makeSetupHook
{ deps = [ pkgs.lcov pkgs.enableGCOVInstrumentation ]; }
{ deps = [ lcov enableGCOVInstrumentation ]; }
../build-support/setup-hooks/make-coverage-analysis-report.sh;
# intended to be used like nix-build -E 'with import <nixpkgs> {}; enableDebugging fooPackage'
@ -2197,7 +2197,7 @@ with pkgs;
calamares = libsForQt515.callPackage ../tools/misc/calamares {
python = python3;
boost = pkgs.boost.override { enablePython = true; python = python3; };
boost = boost.override { enablePython = true; python = python3; };
};
calendar-cli = callPackage ../tools/networking/calendar-cli { };
@ -3134,7 +3134,7 @@ with pkgs;
moonraker = callPackage ../servers/moonraker { };
mousetweaks = callPackage ../applications/accessibility/mousetweaks {
inherit (pkgs.xorg) libX11 libXtst libXfixes;
inherit (xorg) libX11 libXtst libXfixes;
};
mp3blaster = callPackage ../applications/audio/mp3blaster { };
@ -4696,7 +4696,7 @@ with pkgs;
entr = callPackage ../tools/misc/entr { };
envchain = callPackage ../tools/misc/envchain { inherit (pkgs.darwin.apple_sdk.frameworks) Security; };
envchain = callPackage ../tools/misc/envchain { inherit (darwin.apple_sdk.frameworks) Security; };
eot_utilities = callPackage ../tools/misc/eot-utilities { };
@ -5281,7 +5281,7 @@ with pkgs;
git-cinnabar = callPackage ../applications/version-management/git-and-tools/git-cinnabar { };
git-cliff = callPackage ../applications/version-management/git-and-tools/git-cliff {
inherit (pkgs.darwin.apple_sdk.frameworks) Security;
inherit (darwin.apple_sdk.frameworks) Security;
};
git-codeowners = callPackage ../applications/version-management/git-and-tools/git-codeowners { };
@ -5979,7 +5979,7 @@ with pkgs;
html-proofer = callPackage ../tools/misc/html-proofer { };
htmlq = callPackage ../development/tools/htmlq {
inherit (pkgs.darwin.apple_sdk.frameworks) Security;
inherit (darwin.apple_sdk.frameworks) Security;
};
htpdate = callPackage ../tools/networking/htpdate { };
@ -6759,11 +6759,11 @@ with pkgs;
nodejs-slim_latest = nodejs-slim-16_x;
nodePackages_latest = dontRecurseIntoAttrs (callPackage ../development/node-packages/default.nix {
nodejs = pkgs.nodejs_latest;
nodejs = nodejs_latest;
});
nodePackages = dontRecurseIntoAttrs (callPackage ../development/node-packages/default.nix {
nodejs = pkgs.nodejs;
inherit nodejs;
});
np2kai = callPackage ../misc/emulators/np2kai { };
@ -11784,17 +11784,17 @@ with pkgs;
openspin = callPackage ../development/compilers/openspin { };
oraclejdk = pkgs.jdkdistro true false;
oraclejdk = jdkdistro true false;
oraclejdk8 = pkgs.oraclejdk8distro true false;
oraclejdk8 = oraclejdk8distro true false;
oraclejre = lowPrio (pkgs.jdkdistro false false);
oraclejre = lowPrio (jdkdistro false false);
oraclejre8 = lowPrio (pkgs.oraclejdk8distro false false);
oraclejre8 = lowPrio (oraclejdk8distro false false);
jrePlugin = jre8Plugin;
jre8Plugin = lowPrio (pkgs.oraclejdk8distro false true);
jre8Plugin = lowPrio (oraclejdk8distro false true);
jdkdistro = oraclejdk8distro;
@ -12492,7 +12492,7 @@ with pkgs;
});
thrust = callPackage ../development/tools/thrust {
gconf = pkgs.gnome2.GConf;
gconf = gnome2.GConf;
};
tinycc = callPackage ../development/compilers/tinycc { };
@ -13468,7 +13468,7 @@ with pkgs;
bison = callPackage ../development/tools/parsing/bison { };
# Ruby fails to build with current bison
bison_3_5 = pkgs.bison.overrideAttrs (oldAttrs: rec {
bison_3_5 = bison.overrideAttrs (oldAttrs: rec {
version = "3.5.4";
src = fetchurl {
url = "mirror://gnu/${oldAttrs.pname}/${oldAttrs.pname}-${version}.tar.gz";
@ -13637,7 +13637,7 @@ with pkgs;
cmake-format = python3Packages.callPackage ../development/tools/cmake-format { };
cmake-language-server = python3Packages.callPackage ../development/tools/cmake-language-server {
inherit (pkgs) cmake;
inherit cmake;
};
# Does not actually depend on Qt 5
@ -14271,17 +14271,17 @@ with pkgs;
};
nwjs = callPackage ../development/tools/nwjs {
gconf = pkgs.gnome2.GConf;
gconf = gnome2.GConf;
};
nwjs-sdk = callPackage ../development/tools/nwjs {
gconf = pkgs.gnome2.GConf;
gconf = gnome2.GConf;
sdk = true;
};
# only kept for nixui, see https://github.com/matejc/nixui/issues/27
nwjs_0_12 = callPackage ../development/tools/node-webkit/nw12.nix {
gconf = pkgs.gnome2.GConf;
gconf = gnome2.GConf;
};
# NOTE: Override and set useIcon = false to use Awk instead of Icon.
@ -15390,7 +15390,7 @@ with pkgs;
faad2 = callPackage ../development/libraries/faad2 { };
factor-lang = callPackage ../development/compilers/factor-lang {
inherit (pkgs.gnome2) gtkglext;
inherit (gnome2) gtkglext;
};
far2l = callPackage ../applications/misc/far2l {
@ -18394,14 +18394,14 @@ with pkgs;
qt48 = callPackage ../development/libraries/qt-4.x/4.8 {
# GNOME dependencies are not used unless gtkStyle == true
inherit (pkgs.gnome2) libgnomeui GConf gnome_vfs;
inherit (gnome2) libgnomeui GConf gnome_vfs;
cups = if stdenv.isLinux then cups else null;
# XXX: mariadb doesn't built on fbsd as of nov 2015
libmysqlclient = if (!stdenv.isFreeBSD) then libmysqlclient else null;
inherit (pkgs.darwin) libobjc;
inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices OpenGL Cocoa AGL;
inherit (darwin) libobjc;
inherit (darwin.apple_sdk.frameworks) ApplicationServices OpenGL Cocoa AGL;
};
qmake48Hook = makeSetupHook
@ -20295,7 +20295,7 @@ with pkgs;
mariadb = callPackage ../servers/sql/mariadb {
inherit (darwin) cctools;
inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
mongodb = hiPrio mongodb-3_4;
@ -21195,7 +21195,7 @@ with pkgs;
open-isns = callPackage ../os-specific/linux/open-isns { };
osx-cpu-temp = callPackage ../os-specific/darwin/osx-cpu-temp {
inherit (pkgs.darwin.apple_sdk.frameworks) IOKit;
inherit (darwin.apple_sdk.frameworks) IOKit;
};
macfuse-stubs = callPackage ../os-specific/darwin/macfuse {
@ -23646,7 +23646,7 @@ with pkgs;
libxkbcommon = libxkbcommon_7;
};
bitwig-studio2 = callPackage ../applications/audio/bitwig-studio/bitwig-studio2.nix {
inherit (pkgs) bitwig-studio1;
inherit bitwig-studio1;
};
bitwig-studio3 = callPackage ../applications/audio/bitwig-studio/bitwig-studio3.nix { };
bitwig-studio4 = callPackage ../applications/audio/bitwig-studio/bitwig-studio4.nix { };
@ -24017,7 +24017,7 @@ with pkgs;
dfilemanager = libsForQt5.callPackage ../applications/misc/dfilemanager { };
dia = callPackage ../applications/graphics/dia {
inherit (pkgs.gnome2) libart_lgpl libgnomeui;
inherit (gnome2) libart_lgpl libgnomeui;
};
direwolf = callPackage ../applications/radio/direwolf {
@ -25570,7 +25570,7 @@ with pkgs;
jwm-settings-manager = callPackage ../applications/window-managers/jwm/jwm-settings-manager.nix { };
k3d = callPackage ../applications/graphics/k3d {
inherit (pkgs.gnome2) gtkglext;
inherit (gnome2) gtkglext;
stdenv = gcc6Stdenv;
boost = boost155.override {
enablePython = true;
@ -26059,7 +26059,7 @@ with pkgs;
# Needs qtwebkit which is broken on qt5.15
mendeley = libsForQt514.callPackage ../applications/office/mendeley {
gconf = pkgs.gnome2.GConf;
gconf = gnome2.GConf;
};
menumaker = callPackage ../applications/misc/menumaker { };
@ -26739,7 +26739,7 @@ with pkgs;
opera = callPackage ../applications/networking/browsers/opera {};
orca = python3Packages.callPackage ../applications/misc/orca {
inherit (pkgs) pkg-config;
inherit pkg-config;
};
orca-c = callPackage ../applications/audio/orca-c {};
@ -31225,7 +31225,7 @@ with pkgs;
celestia = callPackage ../applications/science/astronomy/celestia {
autoreconfHook = buildPackages.autoreconfHook269;
inherit (pkgs.gnome2) gtkglext;
inherit (gnome2) gtkglext;
};
convertall = qt5.callPackage ../applications/science/misc/convertall { };
@ -31481,7 +31481,7 @@ with pkgs;
depotdownloader = callPackage ../tools/misc/depotdownloader { };
desmume = callPackage ../misc/emulators/desmume { inherit (pkgs.gnome2) gtkglext libglade; };
desmume = callPackage ../misc/emulators/desmume { inherit (gnome2) gtkglext libglade; };
dbacl = callPackage ../tools/misc/dbacl { };
@ -32136,7 +32136,7 @@ with pkgs;
rfc-bibtex = python3Packages.callPackage ../development/python-modules/rfc-bibtex { };
pick-colour-picker = python3Packages.callPackage ../applications/graphics/pick-colour-picker {
inherit (pkgs) glib gtk3 gobject-introspection wrapGAppsHook;
inherit glib gtk3 gobject-introspection wrapGAppsHook;
};
rpl = callPackage ../tools/text/rpl {
@ -32639,11 +32639,11 @@ with pkgs;
yuzu-mainline = import ../misc/emulators/yuzu {
branch = "mainline";
inherit (pkgs) libsForQt5 fetchFromGitHub;
inherit libsForQt5 fetchFromGitHub;
};
yuzu-ea = import ../misc/emulators/yuzu {
branch = "early-access";
inherit (pkgs) libsForQt5 fetchFromGitHub;
inherit libsForQt5 fetchFromGitHub;
};
zap = callPackage ../tools/networking/zap { };