diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 56 |
1 files changed, 17 insertions, 39 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 91d2d5aaa5659..598f3c009efe4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -700,9 +700,7 @@ with pkgs; xcodeenv = callPackage ../development/mobile/xcodeenv { }; - titaniumenv = callPackage ../development/mobile/titaniumenv { - pkgs_i686 = pkgsi686Linux; - }; + titaniumenv = callPackage ../development/mobile/titaniumenv { }; abootimg = callPackage ../development/mobile/abootimg {}; @@ -5167,7 +5165,7 @@ with pkgs; sourceHighlight = callPackage ../tools/text/source-highlight { }; - spaceFM = callPackage ../applications/misc/spacefm { adwaita-icon-theme = gnome3.adwaita-icon-theme; }; + spaceFM = callPackage ../applications/misc/spacefm { }; squashfsTools = callPackage ../tools/filesystems/squashfs { }; @@ -6756,9 +6754,8 @@ with pkgs; (if pluginSupport then appendToName "with-plugin" else x: x) (callPackage ../development/compilers/oraclejdk/jdk8psu-linux.nix { inherit installjdk pluginSupport; }); - oraclejdk10distro = packageType: pluginSupport: - (if pluginSupport then appendToName "with-plugin" else x: x) - (callPackage ../development/compilers/oraclejdk/jdk10-linux.nix { inherit packageType pluginSupport; }); + oraclejdk10distro = packageType: _: + (callPackage ../development/compilers/oraclejdk/jdk10-linux.nix { inherit packageType; }); jikes = callPackage ../development/compilers/jikes { }; @@ -8639,7 +8636,6 @@ with pkgs; xcodebuild = callPackage ../development/tools/xcbuild/wrapper.nix { inherit (darwin.apple_sdk.frameworks) CoreServices CoreGraphics ImageIO; - stdenv = buildPackages.clangStdenv; }; xcbuild = xcodebuild; xcbuildHook = makeSetupHook { @@ -11417,7 +11413,6 @@ with pkgs; # XXX: mariadb doesn't built on fbsd as of nov 2015 mysql = if (!stdenv.isFreeBSD) then mysql else null; - inherit libGL; inherit (pkgs.darwin) cf-private libobjc; inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices OpenGL Cocoa AGL; }; @@ -11438,7 +11433,7 @@ with pkgs; qt56 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.6) { inherit newScope; - inherit stdenv fetchurl makeSetupHook makeWrapper; + inherit stdenv fetchurl makeSetupHook; bison = bison2; # error: too few arguments to function 'int yylex(... inherit cups; harfbuzz = harfbuzz-icu; @@ -11452,7 +11447,7 @@ with pkgs; qt59 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.9) { inherit newScope; - inherit stdenv fetchurl makeSetupHook makeWrapper; + inherit stdenv fetchurl makeSetupHook; bison = bison2; # error: too few arguments to function 'int yylex(... inherit cups; harfbuzz = harfbuzz-icu; @@ -11467,7 +11462,7 @@ with pkgs; qt511 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.11) { inherit newScope; - inherit stdenv fetchurl fetchFromGitHub makeSetupHook makeWrapper; + inherit stdenv fetchurl fetchFromGitHub makeSetupHook; bison = bison2; # error: too few arguments to function 'int yylex(... inherit cups; harfbuzz = harfbuzz-icu; @@ -12167,13 +12162,9 @@ with pkgs; wavpack = callPackage ../development/libraries/wavpack { }; - wayland = callPackage ../development/libraries/wayland { - graphviz = graphviz-nox; - }; + wayland = callPackage ../development/libraries/wayland { }; - wayland_1_9 = callPackage ../development/libraries/wayland/1.9.nix { - graphviz = graphviz-nox; - }; + wayland_1_9 = callPackage ../development/libraries/wayland/1.9.nix { }; wayland-protocols = callPackage ../development/libraries/wayland/protocols.nix { }; @@ -12560,7 +12551,7 @@ with pkgs; openblas = openblasCompat; withRecommendedPackages = false; inherit (darwin.apple_sdk.frameworks) Cocoa Foundation; - inherit (darwin) cf-private libobjc; + inherit (darwin) libobjc; }; rWrapper = callPackage ../development/r-modules/wrapper.nix { @@ -12677,7 +12668,6 @@ with pkgs; couchdb = callPackage ../servers/http/couchdb { spidermonkey = spidermonkey_1_8_5; - python = python27; sphinx = python27Packages.sphinx; erlang = erlangR19; }; @@ -15751,7 +15741,7 @@ with pkgs; imagemagick = null; acl = null; gpm = null; - inherit (darwin.apple_sdk.frameworks) AppKit CoreWLAN GSS Kerberos ImageIO; + inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO; }; emacs26-nox = lowPrio (appendToName "nox" (emacs26.override { @@ -15769,7 +15759,7 @@ with pkgs; imagemagick = null; acl = null; gpm = null; - inherit (darwin.apple_sdk.frameworks) AppKit CoreWLAN GSS Kerberos ImageIO; + inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO; }; emacs25-nox = lowPrio (appendToName "nox" (emacs25.override { @@ -16369,9 +16359,7 @@ with pkgs; python = python27; }; - git-review = callPackage ../applications/version-management/git-review { - python = python27; - }; + git-review = callPackage ../applications/version-management/git-review { }; gitolite = callPackage ../applications/version-management/gitolite { }; @@ -16414,7 +16402,6 @@ with pkgs; jetbrains = (recurseIntoAttrs (callPackages ../applications/editors/jetbrains { jdk = jetbrains.jdk; - androidsdk = androidsdk_extras; }) // { jdk = callPackage ../development/compilers/jetbrains-jdk { }; }); @@ -16869,9 +16856,7 @@ with pkgs; let mkApplications = import ../applications/kde; attrs = { - inherit stdenv lib libsForQt5 fetchurl recurseIntoAttrs; - inherit plasma5; - inherit attica phonon; + inherit lib libsForQt5 fetchurl; inherit okteta; }; in @@ -17183,7 +17168,6 @@ with pkgs; mercurial = callPackage ../applications/version-management/mercurial { inherit (darwin.apple_sdk.frameworks) ApplicationServices; - inherit (darwin) cf-private; guiSupport = false; # use mercurialFull to get hgk GUI }; @@ -17502,7 +17486,6 @@ with pkgs; }; synfigstudio = callPackage ../applications/graphics/synfigstudio { - fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf ]; }; inherit (gnome3) defaultIconTheme; mlt-qt5 = libsForQt5.mlt; }; @@ -18816,9 +18799,6 @@ with pkgs; nvidia_x11_i686 = if system == "x86_64-linux" then pkgsi686Linux.linuxPackages.nvidia_x11.override { libsOnly = true; } else null; - primusLib_i686 = if system == "x86_64-linux" - then pkgsi686Linux.primusLib - else null; libglvnd_i686 = if system == "x86_64-linux" then pkgsi686Linux.libglvnd else null; @@ -19234,7 +19214,7 @@ with pkgs; libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { }; - xpra = callPackage ../tools/X11/xpra { inherit (texFunctions) fontsConf; }; + xpra = callPackage ../tools/X11/xpra { }; libfakeXinerama = callPackage ../tools/X11/xpra/libfakeXinerama.nix { }; #TODO: 'pil' is not available for python3, yet xpraGtk3 = callPackage ../tools/X11/xpra/gtk3.nix { inherit (texFunctions) fontsConf; inherit (python3Packages) buildPythonApplication python cython pygobject3 pycairo; }; @@ -19268,7 +19248,6 @@ with pkgs; finalterm = callPackage ../applications/misc/finalterm { }; roxterm = callPackage ../applications/misc/roxterm { - inherit (pythonPackages) lockfile; inherit (gnome3) gsettings-desktop-schemas vte; }; @@ -20176,7 +20155,7 @@ with pkgs; lumina = libsForQt5.callPackage ../desktops/lumina { }; lxqt = recurseIntoAttrs (import ../desktops/lxqt { - inherit pkgs libsForQt5 fetchFromGitHub; + inherit pkgs libsForQt5; inherit (lib) makeScope; }); @@ -21245,7 +21224,7 @@ with pkgs; kops = callPackage ../applications/networking/cluster/kops { }; lilypond = callPackage ../misc/lilypond { guile = guile_1_8; }; - lilypond-unstable = callPackage ../misc/lilypond/unstable.nix { guile = guile_1_8; }; + lilypond-unstable = callPackage ../misc/lilypond/unstable.nix { }; lilypond-with-fonts = callPackage ../misc/lilypond/with-fonts.nix { lilypond = lilypond-unstable; }; @@ -21684,7 +21663,6 @@ with pkgs; }; vice = callPackage ../misc/emulators/vice { - libX11 = xorg.libX11; giflib = giflib_4_1; }; |