summaryrefslogtreecommitdiffstats
path: root/pkgs/top-level
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix56
-rw-r--r--pkgs/top-level/beam-packages.nix2
-rw-r--r--pkgs/top-level/dotnet-packages.nix1
-rw-r--r--pkgs/top-level/emacs-packages.nix6
-rw-r--r--pkgs/top-level/haskell-packages.nix2
-rw-r--r--pkgs/top-level/haxe-packages.nix2
-rw-r--r--pkgs/top-level/java-packages.nix2
-rw-r--r--pkgs/top-level/lua-packages.nix6
-rw-r--r--pkgs/top-level/ocaml-packages.nix6
-rw-r--r--pkgs/top-level/perl-packages.nix2
-rw-r--r--pkgs/top-level/python-packages.nix2
-rw-r--r--pkgs/top-level/release-python.nix4
-rw-r--r--pkgs/top-level/unix-tools.nix3
13 files changed, 33 insertions, 61 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 91d2d5aaa565..598f3c009efe 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;
};
diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix
index 8f8caf755edf..3440bfafb110 100644
--- a/pkgs/top-level/beam-packages.nix
+++ b/pkgs/top-level/beam-packages.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv, callPackage, wxGTK30, darwin }:
+{ callPackage, wxGTK30 }:
rec {
lib = callPackage ../development/beam-modules/lib.nix {};
diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index 4527451d71a4..3782fc33d6a6 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -6,7 +6,6 @@
, fetchNuGet
, pkgconfig
, mono
-, monodevelop
, fsharp
, unzip
, overrides ? {}
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index f6c992d5bd5f..f1b0aa997ece 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -50,16 +50,14 @@ let
};
melpaStablePackages = import ../applications/editors/emacs-modes/melpa-stable-packages.nix {
- inherit external lib;
+ inherit external;
};
melpaPackages = import ../applications/editors/emacs-modes/melpa-packages.nix {
inherit external lib;
};
- orgPackages = import ../applications/editors/emacs-modes/org-packages.nix {
- inherit fetchurl lib stdenv texinfo;
- };
+ orgPackages = import ../applications/editors/emacs-modes/org-packages.nix { };
emacsWithPackages = import ../build-support/emacs/wrapper.nix {
inherit lib lndir makeWrapper stdenv runCommand;
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 5fef4872db21..bef3c2d0a219 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1,5 +1,5 @@
{ buildPackages, pkgs
-, newScope, stdenv
+, newScope
, buildPlatform, targetPlatform
}:
diff --git a/pkgs/top-level/haxe-packages.nix b/pkgs/top-level/haxe-packages.nix
index 3ac8d5f164d5..35b0b42da3fe 100644
--- a/pkgs/top-level/haxe-packages.nix
+++ b/pkgs/top-level/haxe-packages.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, fetchFromGitHub, newScope, haxe, neko, nodejs, wine, php, python3, jdk, mono, haskellPackages, fetchpatch }:
+{ stdenv, fetchzip, fetchFromGitHub, haxe, neko, jdk, mono }:
let
self = haxePackages;
diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix
index 77cd5b0eba53..73ed6bf9162c 100644
--- a/pkgs/top-level/java-packages.nix
+++ b/pkgs/top-level/java-packages.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv, maven }:
+{ pkgs }:
with pkgs;
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 520db16d3661..cb9df4382463 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -5,9 +5,9 @@
for each package in a separate file: the call to the function would
be almost as must code as the function itself. */
-{ fetchurl, fetchzip, stdenv, lua, callPackage, unzip, zziplib, pkgconfig, libtool
-, pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat, cairo
-, perl, gtk2, python, glib, gobjectIntrospection, libevent, zlib, autoreconfHook
+{ fetchurl, stdenv, lua, callPackage, unzip, zziplib, pkgconfig
+, pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat
+, glib, gobjectIntrospection, libevent, zlib, autoreconfHook
, mysql, postgresql, cyrus_sasl
, fetchFromGitHub, libmpack, which, fetchpatch, writeText
}:
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index a49d638dc47e..eb76c323dde4 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -748,14 +748,14 @@ let
# Jane Street
janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage.nix {};
-
+
janeStreet = import ../development/ocaml-modules/janestreet {
- inherit lib janePackage ocaml ocamlbuild angstrom ctypes cryptokit;
+ inherit janePackage ocamlbuild angstrom ctypes cryptokit;
inherit magic-mime num ocaml-migrate-parsetree octavius ounit;
inherit ppx_deriving re zarith ppxlib;
inherit (pkgs) stdenv openssl;
};
-
+
janeStreet_0_9_0 = import ../development/ocaml-modules/janestreet/old.nix {
janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage.nix { defaultVersion = "0.9.0"; };
inherit lib ocaml ocamlbuild ctypes cryptokit;
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index b5df07148d94..255ea6d4ffda 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5,7 +5,7 @@
for each package in a separate file: the call to the function would
be almost as much code as the function itself. */
-{config, pkgs, fetchurl, fetchFromGitHub, stdenv, fetchsvn, gnused, perl, overrides}:
+{config, pkgs, fetchurl, fetchFromGitHub, stdenv, gnused, perl, overrides}:
let self = _self // overrides; _self = with self; {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 81d38de4f388..d1c0ac374896 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9650,7 +9650,7 @@ in {
fixtures = callPackage ../development/python-modules/fixtures { };
pelican = callPackage ../development/python-modules/pelican {
- inherit (pkgs) glibcLocales pandoc git;
+ inherit (pkgs) glibcLocales git;
};
pep8 = buildPythonPackage rec {
diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix
index 3bc252e440f7..8b7240e21a33 100644
--- a/pkgs/top-level/release-python.nix
+++ b/pkgs/top-level/release-python.nix
@@ -3,9 +3,7 @@
$ hydra-eval-jobs pkgs/top-level/release-python.nix
*/
-{ nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
-, officialRelease ? false
-, # The platforms for which we build Nixpkgs.
+{ # The platforms for which we build Nixpkgs.
supportedSystems ? [ "x86_64-linux" ]
}:
diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix
index cc6a8e0592a8..1dface338a39 100644
--- a/pkgs/top-level/unix-tools.nix
+++ b/pkgs/top-level/unix-tools.nix
@@ -1,5 +1,4 @@
-{ pkgs, buildEnv, runCommand, hostPlatform, lib
-, stdenv }:
+{ pkgs, buildEnv, runCommand, hostPlatform, lib }:
# These are some unix tools that are commonly included in the /usr/bin
# and /usr/sbin directory under more normal distributions. Along with
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-28 08:58:52 +0000