public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #55129 from oxij/tree/move-defaults-to-package-files

Browse Source 
all-packages.nix: move defaults to package files
This commit is contained in:
Michael Raskin 2019-02-13 20:04:08 +00:00 committed by GitHub
commit 8384cfe455
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
28 changed files with 84 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/customisation.nix
View File

@ -121,7 +121,7 @@ rec {
auto = builtins.intersectAttrs (lib.functionArgs f) autoArgs; auto = builtins.intersectAttrs (lib.functionArgs f) autoArgs;
origArgs = auto // args; origArgs = auto // args;
pkgs = f origArgs; pkgs = f origArgs;
mkAttrOverridable = name: pkg: makeOverridable (newArgs: (f newArgs).${name}) origArgs; mkAttrOverridable = name: _: makeOverridable (newArgs: (f newArgs).${name}) origArgs;
in lib.mapAttrs mkAttrOverridable pkgs; in lib.mapAttrs mkAttrOverridable pkgs;

2
pkgs/applications/misc/evilvte/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchgit, makeWrapper, pkgconfig, { stdenv, fetchgit, makeWrapper, pkgconfig,
gnome2, glib, pango, cairo, gdk_pixbuf, atk, freetype, xorg, gnome2, glib, pango, cairo, gdk_pixbuf, atk, freetype, xorg,
configH configH ? ""
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

4
pkgs/applications/misc/rxvt_unicode/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, makeDesktopItem, perlSupport, libX11, libXt, libXft, { stdenv, fetchurl, makeDesktopItem, perlSupport ? true, libX11, libXt, libXft,
ncurses, perl, fontconfig, freetype, pkgconfig, libXrender, ncurses, perl, fontconfig, freetype, pkgconfig, libXrender,
gdkPixbufSupport, gdk_pixbuf, unicode3Support }: gdkPixbufSupport ? true, gdk_pixbuf, unicode3Support ? true }:
let let
pname = "rxvt-unicode"; pname = "rxvt-unicode";

2
pkgs/applications/networking/browsers/w3m/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fetchpatch { stdenv, fetchFromGitHub, fetchpatch
, ncurses, boehmgc, gettext, zlib , ncurses, boehmgc, gettext, zlib
, sslSupport ? true, openssl ? null , sslSupport ? true, openssl ? null
, graphicsSupport ? true, imlib2 ? null , graphicsSupport ? !stdenv.isDarwin, imlib2 ? null
, x11Support ? graphicsSupport, libX11 ? null , x11Support ? graphicsSupport, libX11 ? null
, mouseSupport ? !stdenv.isDarwin, gpm-ncurses ? null , mouseSupport ? !stdenv.isDarwin, gpm-ncurses ? null
, perl, man, pkgconfig, buildPackages, w3m , perl, man, pkgconfig, buildPackages, w3m

6
pkgs/applications/networking/instant-messengers/profanity/default.nix
View File

@ -2,9 +2,9 @@
, glibcLocales, expect, ncurses, libotr, curl, readline, libuuid , glibcLocales, expect, ncurses, libotr, curl, readline, libuuid
, cmocka, libmicrohttpd, stabber, expat, libmesode , cmocka, libmicrohttpd, stabber, expat, libmesode
, autoAwaySupport ? false, libXScrnSaver ? null, libX11 ? null , autoAwaySupport ? true, libXScrnSaver ? null, libX11 ? null
, notifySupport ? false, libnotify ? null, gdk_pixbuf ? null , notifySupport ? true, libnotify ? null, gdk_pixbuf ? null
, traySupport ? false, gnome2 ? null , traySupport ? true, gnome2 ? null
, pgpSupport ? true, gpgme ? null , pgpSupport ? true, gpgme ? null
, pythonPluginSupport ? true, python ? null , pythonPluginSupport ? true, python ? null
}: }:

4
pkgs/applications/networking/irc/quassel/default.nix
View File

@ -1,14 +1,14 @@
{ monolithic ? true # build monolithic Quassel { monolithic ? true # build monolithic Quassel
, daemon ? false # build Quassel daemon , daemon ? false # build Quassel daemon
, client ? false # build Quassel client , client ? false # build Quassel client
, tag ? "" # tag added to the package name , tag ? "-kf5" # tag added to the package name
, static ? false # link statically , static ? false # link statically
, stdenv, fetchFromGitHub, cmake, makeWrapper, dconf , stdenv, fetchFromGitHub, cmake, makeWrapper, dconf
, qtbase, qtscript , qtbase, qtscript
, phonon, libdbusmenu, qca-qt5 , phonon, libdbusmenu, qca-qt5
, withKDE ? stdenv.isLinux # enable KDE integration , withKDE ? true # enable KDE integration
, extra-cmake-modules , extra-cmake-modules
, kconfigwidgets , kconfigwidgets
, kcoreaddons , kcoreaddons

2
pkgs/applications/networking/sniffers/wireshark/default.nix
View File

@ -2,7 +2,7 @@
, gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, python, libcap, glib , gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, python, libcap, glib
, libssh, zlib, cmake, extra-cmake-modules, fetchpatch, makeWrapper , libssh, zlib, cmake, extra-cmake-modules, fetchpatch, makeWrapper
, withGtk ? false, gtk3 ? null, librsvg ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null , withGtk ? false, gtk3 ? null, librsvg ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null
, withQt ? false, qt5 ? null , withQt ? true, qt5 ? null
, ApplicationServices, SystemConfiguration, gmp , ApplicationServices, SystemConfiguration, gmp
}: }:

2
pkgs/applications/networking/sync/rsync/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, perl, libiconv, zlib, popt { stdenv, fetchurl, perl, libiconv, zlib, popt
, enableACLs ? true, acl ? null , enableACLs ? !(stdenv.isDarwin || stdenv.isSunOS || stdenv.isFreeBSD), acl ? null
, enableCopyDevicesPatch ? false , enableCopyDevicesPatch ? false
}: }:

2
pkgs/applications/science/math/cplex/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, makeWrapper, openjdk, gtk2, xorg, glibcLocales, releasePath }: { stdenv, makeWrapper, openjdk, gtk2, xorg, glibcLocales, releasePath ? null }:
# To use this package, you need to download your own cplex installer from IBM # To use this package, you need to download your own cplex installer from IBM
# and override the releasePath attribute to point to the location of the file. # and override the releasePath attribute to point to the location of the file.

6
pkgs/applications/science/math/scilab/default.nix
View File

@ -2,13 +2,13 @@
, ncurses , ncurses
, withXaw3d ? false , withXaw3d ? false
#, withPVMlib ? false #, withPVMlib ? false
, tcl, tk, withTk ? false , tcl, tk, withTk ? true
, gtk2, withGtk ? false # working ? , gtk2, withGtk ? false # working ?
#, withF2c ? false #, withF2c ? false
, ocaml, withOCaml ? false , ocaml, withOCaml ? true
#, withJava ? false #, withJava ? false
#, atlasMath, withAtlas ? false #, atlasMath, withAtlas ? false
, xlibsWrapper, withX ? false , xlibsWrapper, withX ? true
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

4
pkgs/applications/version-management/subversion/default.nix
View File

@ -1,6 +1,6 @@
{ bdbSupport ? false # build support for Berkeley DB repositories { bdbSupport ? true # build support for Berkeley DB repositories
, httpServer ? false # build Apache DAV module , httpServer ? false # build Apache DAV module
, httpSupport ? false # client must support http , httpSupport ? true # client must support http
, pythonBindings ? false , pythonBindings ? false
, perlBindings ? false , perlBindings ? false
, javahlBindings ? false , javahlBindings ? false

2
pkgs/build-support/fetchsvnssh/default.nix
View File

@ -1,4 +1,4 @@
{stdenvNoCC, subversion, sshSupport ? false, openssh ? null, expect}: {stdenvNoCC, subversion, sshSupport ? true, openssh ? null, expect}:
{username, password, url, rev ? "HEAD", md5 ? "", sha256 ? ""}: {username, password, url, rev ? "HEAD", md5 ? "", sha256 ? ""}:

2
pkgs/development/libraries/apr-util/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, makeWrapper, apr, expat, gnused { stdenv, fetchurl, makeWrapper, apr, expat, gnused
, sslSupport ? true, openssl , sslSupport ? true, openssl
, bdbSupport ? false, db , bdbSupport ? true, db
, ldapSupport ? !stdenv.isCygwin, openldap , ldapSupport ? !stdenv.isCygwin, openldap
, libiconv , libiconv
, cyrus_sasl, autoreconfHook , cyrus_sasl, autoreconfHook

2
pkgs/development/libraries/libgpod/default.nix
View File

@ -1,7 +1,7 @@
{stdenv, lib, fetchurl, gettext, perlPackages, intltool, pkgconfig, glib, {stdenv, lib, fetchurl, gettext, perlPackages, intltool, pkgconfig, glib,
libxml2, sqlite, zlib, sg3_utils, gdk_pixbuf, taglib, libxml2, sqlite, zlib, sg3_utils, gdk_pixbuf, taglib,
libimobiledevice, pythonPackages, mutagen, libimobiledevice, pythonPackages, mutagen,
monoSupport ? true, mono, gtk-sharp-2_0 monoSupport ? false, mono, gtk-sharp-2_0
}: }:
let let

2
pkgs/development/libraries/libspotify/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libspotify, alsaLib, readline, pkgconfig, apiKey, unzip, gnused }: { stdenv, fetchurl, libspotify, alsaLib, readline, pkgconfig, apiKey ? null, unzip, gnused }:
let let
version = "12.1.51"; version = "12.1.51";

3
pkgs/games/residualvm/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsaLib { stdenv, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsaLib
, openglSupport ? false, libGLU_combined ? null , libGLSupported
, openglSupport ? libGLSupported, libGLU_combined ? null
}: }:
assert openglSupport -> libGLU_combined != null; assert openglSupport -> libGLU_combined != null;

7
pkgs/misc/ghostscript/default.nix
View File

@ -1,12 +1,13 @@
{ stdenv, lib, fetchurl, pkgconfig, zlib, expat, openssl, autoconf { config, stdenv, lib, fetchurl, pkgconfig, zlib, expat, openssl, autoconf
, libjpeg, libpng, libtiff, freetype, fontconfig, libpaper, jbig2dec , libjpeg, libpng, libtiff, freetype, fontconfig, libpaper, jbig2dec
, libiconv, ijs , libiconv, ijs
, x11Support ? false, xlibsWrapper ? null , cupsSupport ? config.ghostscript.cups or (!stdenv.isDarwin), cups ? null
, cupsSupport ? false, cups ? null , x11Support ? cupsSupport, xlibsWrapper ? null # with CUPS, X11 only adds very little
}: }:
assert x11Support -> xlibsWrapper != null; assert x11Support -> xlibsWrapper != null;
assert cupsSupport -> cups != null; assert cupsSupport -> cups != null;
let let
version = "9.${ver_min}"; version = "9.${ver_min}";
ver_min = "26"; ver_min = "26";

6
pkgs/servers/uwsgi/default.nix
View File

@ -1,8 +1,8 @@
{ stdenv, lib, fetchurl, pkgconfig, jansson, pcre { stdenv, lib, fetchurl, pkgconfig, jansson, pcre
# plugins: list of strings, eg. [ "python2" "python3" ] # plugins: list of strings, eg. [ "python2" "python3" ]
, plugins , plugins ? []
, pam, withPAM ? false , pam, withPAM ? stdenv.isLinux
, systemd, withSystemd ? false , systemd, withSystemd ? stdenv.isLinux
, python2, python3, ncurses , python2, python3, ncurses
, ruby, php-embed, mysql , ruby, php-embed, mysql
}: }:

2
pkgs/tools/inputmethods/ibus/wrapper.nix
View File

@ -1,5 +1,5 @@
{ stdenv, runCommand, makeWrapper, lndir { stdenv, runCommand, makeWrapper, lndir
, dconf, hicolor-icon-theme, ibus, librsvg, plugins , dconf, hicolor-icon-theme, ibus, librsvg, plugins ? []
}: }:
let let

2
pkgs/tools/misc/gams/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, unzip, file, licenseFile, optgamsFile}: { stdenv, fetchurl, unzip, file, licenseFile ? null, optgamsFile ? null}:
assert licenseFile != null; assert licenseFile != null;

8
pkgs/tools/misc/urjtag/default.nix
View File

@ -1,10 +1,10 @@
{ stdenv, autoconf, automake, pkgconfig, gettext, libtool, bison { stdenv, autoconf, automake, pkgconfig, gettext, libtool, bison
, flex, which, subversion, fetchsvn, makeWrapper, libftdi, libusb, readline , flex, which, subversion, fetchsvn, makeWrapper, libftdi, libusb, readline
, python3 , python3
, svfSupport ? false , svfSupport ? true
, bsdlSupport ? false , bsdlSupport ? true
, staplSupport ? false , staplSupport ? true
, jedecSupport ? false , jedecSupport ? true
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

2
pkgs/tools/networking/ssmtp/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, tlsSupport ? false, openssl ? null}: {stdenv, fetchurl, tlsSupport ? true, openssl ? null}:
assert tlsSupport -> openssl != null; assert tlsSupport -> openssl != null;

2
pkgs/tools/video/mjpegtools/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, gtk2, libdv, libjpeg, libpng, libX11, pkgconfig, SDL, SDL_gfx { stdenv, lib, fetchurl, gtk2, libdv, libjpeg, libpng, libX11, pkgconfig, SDL, SDL_gfx
, withMinimal ? false , withMinimal ? true
}: }:
# TODO: # TODO:

168
pkgs/top-level/all-packages.nix
View File

@ -230,9 +230,7 @@ in
fetchsvnrevision = import ../build-support/fetchsvnrevision runCommand subversion; fetchsvnrevision = import ../build-support/fetchsvnrevision runCommand subversion;
fetchsvnssh = callPackage ../build-support/fetchsvnssh { fetchsvnssh = callPackage ../build-support/fetchsvnssh { };
sshSupport = true;
};
fetchhg = callPackage ../build-support/fetchhg { }; fetchhg = callPackage ../build-support/fetchhg { };
@ -511,10 +509,7 @@ in
arduino = arduino-core.override { withGui = true; }; arduino = arduino-core.override { withGui = true; };
arduino-core = callPackage ../development/arduino/arduino-core { arduino-core = callPackage ../development/arduino/arduino-core { };
jdk = jdk;
withGui = false;
};
arduino-mk = callPackage ../development/arduino/arduino-mk {}; arduino-mk = callPackage ../development/arduino/arduino-mk {};
@ -692,10 +687,7 @@ in
gamecube-tools = callPackage ../development/tools/gamecube-tools { }; gamecube-tools = callPackage ../development/tools/gamecube-tools { };
gams = callPackage ../tools/misc/gams { gams = callPackage ../tools/misc/gams (config.gams or {});
licenseFile = config.gams.licenseFile or null;
optgamsFile = config.gams.optgamsFile or null;
};
git-fire = callPackage ../tools/misc/git-fire { }; git-fire = callPackage ../tools/misc/git-fire { };
@ -837,9 +829,7 @@ in
autorandr = callPackage ../tools/misc/autorandr {}; autorandr = callPackage ../tools/misc/autorandr {};
avahi = callPackage ../development/libraries/avahi { avahi = callPackage ../development/libraries/avahi (config.avahi or {});
qt4Support = config.avahi.qt4Support or false;
};
avro-c = callPackage ../development/libraries/avro-c { }; avro-c = callPackage ../development/libraries/avro-c { };
@ -1183,7 +1173,7 @@ in
coprthr = callPackage ../development/libraries/coprthr { }; coprthr = callPackage ../development/libraries/coprthr { };
cplex = callPackage ../applications/science/math/cplex { releasePath = config.cplex.releasePath or null; }; cplex = callPackage ../applications/science/math/cplex (config.cplex or {});
cpulimit = callPackage ../tools/misc/cpulimit { }; cpulimit = callPackage ../tools/misc/cpulimit { };
@ -2032,7 +2022,6 @@ in
ibus-with-plugins = callPackage ../tools/inputmethods/ibus/wrapper.nix { ibus-with-plugins = callPackage ../tools/inputmethods/ibus/wrapper.nix {
inherit (gnome3) dconf; inherit (gnome3) dconf;
plugins = [ ];
}; };
interception-tools = callPackage ../tools/inputmethods/interception-tools { }; interception-tools = callPackage ../tools/inputmethods/interception-tools { };
@ -3091,10 +3080,9 @@ in
grpcurl = callPackage ../tools/networking/grpcurl { }; grpcurl = callPackage ../tools/networking/grpcurl { };
grub = pkgsi686Linux.callPackage ../tools/misc/grub { grub = pkgsi686Linux.callPackage ../tools/misc/grub ({
buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true;
stdenv = overrideCC stdenv pkgsi686Linux.gcc6; stdenv = overrideCC stdenv pkgsi686Linux.gcc6;
}; } // (config.grub or {}));
trustedGrub = pkgsi686Linux.callPackage ../tools/misc/grub/trusted.nix { }; trustedGrub = pkgsi686Linux.callPackage ../tools/misc/grub/trusted.nix { };
@ -4211,9 +4199,7 @@ in
mitmproxy = callPackage ../tools/networking/mitmproxy { }; mitmproxy = callPackage ../tools/networking/mitmproxy { };
mjpegtools = callPackage ../tools/video/mjpegtools { mjpegtools = callPackage ../tools/video/mjpegtools { };
withMinimal = true;
};
mjpegtoolsFull = mjpegtools.override { mjpegtoolsFull = mjpegtools.override {
withMinimal = false; withMinimal = false;
@ -5586,9 +5572,7 @@ in
sslmate = callPackage ../development/tools/sslmate { }; sslmate = callPackage ../development/tools/sslmate { };
ssmtp = callPackage ../tools/networking/ssmtp { ssmtp = callPackage ../tools/networking/ssmtp { };
tlsSupport = true;
};
ssocr = callPackage ../applications/misc/ssocr { }; ssocr = callPackage ../applications/misc/ssocr { };
@ -5600,9 +5584,7 @@ in
stress-ng = callPackage ../tools/system/stress-ng { }; stress-ng = callPackage ../tools/system/stress-ng { };
stoken = callPackage ../tools/security/stoken { stoken = callPackage ../tools/security/stoken (config.stoken or {});
withGTK3 = config.stoken.withGTK3 or true;
};
storeBackup = callPackage ../tools/backup/store-backup { }; storeBackup = callPackage ../tools/backup/store-backup { };
@ -5961,11 +5943,7 @@ in
usync = callPackage ../applications/misc/usync { }; usync = callPackage ../applications/misc/usync { };
uwsgi = callPackage ../servers/uwsgi { uwsgi = callPackage ../servers/uwsgi { };
plugins = [];
withPAM = stdenv.isLinux;
withSystemd = stdenv.isLinux;
};
vacuum = callPackage ../applications/networking/instant-messengers/vacuum {}; vacuum = callPackage ../applications/networking/instant-messengers/vacuum {};
@ -6234,12 +6212,7 @@ in
uptimed = callPackage ../tools/system/uptimed { }; uptimed = callPackage ../tools/system/uptimed { };
urjtag = callPackage ../tools/misc/urjtag { urjtag = callPackage ../tools/misc/urjtag { };
svfSupport = true;
bsdlSupport = true;
staplSupport = true;
jedecSupport = true;
};
urlwatch = callPackage ../tools/networking/urlwatch { }; urlwatch = callPackage ../tools/networking/urlwatch { };
@ -9319,7 +9292,6 @@ in
apr = callPackage ../development/libraries/apr { }; apr = callPackage ../development/libraries/apr { };
aprutil = callPackage ../development/libraries/apr-util { aprutil = callPackage ../development/libraries/apr-util {
bdbSupport = true;
db = if stdenv.isFreeBSD then db4 else db; db = if stdenv.isFreeBSD then db4 else db;
# XXX: only the db_185 interface was available through # XXX: only the db_185 interface was available through
# apr with db58 on freebsd (nov 2015), for unknown reasons # apr with db58 on freebsd (nov 2015), for unknown reasons
@ -10943,7 +10915,6 @@ in
libgpod = callPackage ../development/libraries/libgpod { libgpod = callPackage ../development/libraries/libgpod {
inherit (pkgs.pythonPackages) mutagen; inherit (pkgs.pythonPackages) mutagen;
monoSupport = false;
}; };
libgssglue = callPackage ../development/libraries/libgssglue { }; libgssglue = callPackage ../development/libraries/libgssglue { };
@ -13662,13 +13633,7 @@ in
mod_python = pkgs.apacheHttpdPackages.mod_python; mod_python = pkgs.apacheHttpdPackages.mod_python;
mod_wsgi = pkgs.apacheHttpdPackages.mod_wsgi; mod_wsgi = pkgs.apacheHttpdPackages.mod_wsgi;
mpd = callPackage ../servers/mpd { mpd = callPackage ../servers/mpd (config.mpd or {});
aacSupport = config.mpd.aacSupport or true;
clientSupport = config.mpd.clientSupport or true;
ffmpegSupport = config.mpd.ffmpegSupport or true;
opusSupport = config.mpd.opusSupport or true;
};
mpd_clientlib = callPackage ../servers/mpd/clientlib.nix { }; mpd_clientlib = callPackage ../servers/mpd/clientlib.nix { };
@ -13781,13 +13746,11 @@ in
bluetoothSupport = true; bluetoothSupport = true;
remoteControlSupport = true; remoteControlSupport = true;
zeroconfSupport = true; zeroconfSupport = true;
inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa;
}; };
# libpulse implementations # libpulse implementations
libpulseaudio-vanilla = pulseaudio.override { libpulseaudio-vanilla = pulseaudio.override {
libOnly = true; libOnly = true;
inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa;
}; };
apulse = callPackage ../misc/apulse { }; apulse = callPackage ../misc/apulse { };
@ -16983,9 +16946,7 @@ in
etherape = callPackage ../applications/networking/sniffers/etherape { }; etherape = callPackage ../applications/networking/sniffers/etherape { };
evilvte = callPackage ../applications/misc/evilvte { evilvte = callPackage ../applications/misc/evilvte (config.evilvte or {});
configH = config.evilvte.config or "";
};
evopedia = callPackage ../applications/misc/evopedia { }; evopedia = callPackage ../applications/misc/evopedia { };
@ -17202,9 +17163,7 @@ in
welle-io = libsForQt5.callPackage ../applications/radio/welle-io { }; welle-io = libsForQt5.callPackage ../applications/radio/welle-io { };
wireshark = callPackage ../applications/networking/sniffers/wireshark { wireshark = callPackage ../applications/networking/sniffers/wireshark {
withQt = true;
qt5 = qt59; qt5 = qt59;
withGtk = false;
inherit (darwin.apple_sdk.frameworks) ApplicationServices SystemConfiguration; inherit (darwin.apple_sdk.frameworks) ApplicationServices SystemConfiguration;
}; };
wireshark-qt = wireshark; wireshark-qt = wireshark;
@ -17304,13 +17263,9 @@ in
flameshot = libsForQt5.callPackage ../tools/misc/flameshot { }; flameshot = libsForQt5.callPackage ../tools/misc/flameshot { };
flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer { flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer (config.flashplayer or {});
debug = config.flashplayer.debug or false;
};
flashplayer-standalone = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix { flashplayer-standalone = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix (config.flashplayer or {});
debug = config.flashplayer.debug or false;
};
flashplayer-standalone-debugger = flashplayer-standalone.override { flashplayer-standalone-debugger = flashplayer-standalone.override {
debug = true; debug = true;
@ -18227,7 +18182,6 @@ in
mercurial = callPackage ../applications/version-management/mercurial { mercurial = callPackage ../applications/version-management/mercurial {
inherit (darwin.apple_sdk.frameworks) ApplicationServices; inherit (darwin.apple_sdk.frameworks) ApplicationServices;
guiSupport = false; # use mercurialFull to get hgk GUI
}; };
mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; }); mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; });
@ -18945,12 +18899,9 @@ in
# And I don't want to rewrite all rules # And I don't want to rewrite all rules
procmail = callPackage ../applications/misc/procmail { }; procmail = callPackage ../applications/misc/procmail { };
profanity = callPackage ../applications/networking/instant-messengers/profanity { profanity = callPackage ../applications/networking/instant-messengers/profanity ({
notifySupport = config.profanity.notifySupport or true;
traySupport = config.profanity.traySupport or true;
autoAwaySupport = config.profanity.autoAwaySupport or true;
python = python3; python = python3;
}; } // (config.profanity or {}));
protonmail-bridge = libsForQt5.callPackage ../applications/networking/protonmail-bridge { }; protonmail-bridge = libsForQt5.callPackage ../applications/networking/protonmail-bridge { };
@ -19054,12 +19005,7 @@ in
quantomatic = callPackage ../applications/science/physics/quantomatic { }; quantomatic = callPackage ../applications/science/physics/quantomatic { };
quassel = libsForQt5.callPackage ../applications/networking/irc/quassel { quassel = libsForQt5.callPackage ../applications/networking/irc/quassel {
monolithic = true; inherit (gnome3) dconf;
daemon = false;
client = false;
withKDE = true;
dconf = gnome3.dconf;
tag = "-kf5";
}; };
quasselClient = quassel.override { quasselClient = quassel.override {
@ -19071,8 +19017,8 @@ in
quasselDaemon = quassel.override { quasselDaemon = quassel.override {
monolithic = false; monolithic = false;
daemon = true; daemon = true;
tag = "-daemon-qt5";
withKDE = false; withKDE = false;
tag = "-daemon-qt5";
}; };
quirc = callPackage ../tools/graphics/quirc {}; quirc = callPackage ../tools/graphics/quirc {};
@ -19202,10 +19148,7 @@ in
llvmPackages = llvmPackages_7; llvmPackages = llvmPackages_7;
}; };
rsync = callPackage ../applications/networking/sync/rsync { rsync = callPackage ../applications/networking/sync/rsync (config.rsync or {});
enableACLs = !(stdenv.isDarwin || stdenv.isSunOS || stdenv.isFreeBSD);
enableCopyDevicesPatch = (config.rsync.enableCopyDevicesPatch or false);
};
rrsync = callPackage ../applications/networking/sync/rsync/rrsync.nix {}; rrsync = callPackage ../applications/networking/sync/rsync/rrsync.nix {};
rtl_433 = callPackage ../applications/radio/rtl_433 { }; rtl_433 = callPackage ../applications/radio/rtl_433 { };
@ -19221,11 +19164,7 @@ in
rxvt = callPackage ../applications/misc/rxvt { }; rxvt = callPackage ../applications/misc/rxvt { };
# urxvt # urxvt
rxvt_unicode = callPackage ../applications/misc/rxvt_unicode { rxvt_unicode = callPackage ../applications/misc/rxvt_unicode { };
perlSupport = true;
gdkPixbufSupport = true;
unicode3Support = true;
};
rxvt_unicode-with-plugins = callPackage ../applications/misc/rxvt_unicode/wrapper.nix { rxvt_unicode-with-plugins = callPackage ../applications/misc/rxvt_unicode/wrapper.nix {
plugins = [ plugins = [
@ -19485,9 +19424,7 @@ in
}; };
}; };
libspotify = callPackage ../development/libraries/libspotify { libspotify = callPackage ../development/libraries/libspotify (config.libspotify or {});
apiKey = config.libspotify.apiKey or null;
};
sourcetrail = callPackage ../development/tools/sourcetrail { }; sourcetrail = callPackage ../development/tools/sourcetrail { };
@ -19530,16 +19467,7 @@ in
sublime3-dev = sublime3Packages.sublime3-dev; sublime3-dev = sublime3Packages.sublime3-dev;
inherit (callPackages ../applications/version-management/subversion { inherit (callPackages ../applications/version-management/subversion { sasl = cyrus_sasl; })
bdbSupport = true;
httpServer = false;
httpSupport = true;
pythonBindings = false;
perlBindings = false;
javahlBindings = false;
saslSupport = false;
sasl = cyrus_sasl;
})
subversion18 subversion19 subversion_1_10 subversion_1_11; subversion18 subversion19 subversion_1_10 subversion_1_11;
subversion = subversion_1_11; subversion = subversion_1_11;
@ -19725,14 +19653,11 @@ in
toggldesktop = libsForQt5.callPackage ../applications/misc/toggldesktop { }; toggldesktop = libsForQt5.callPackage ../applications/misc/toggldesktop { };
tomahawk = callPackage ../applications/audio/tomahawk { tomahawk = callPackage ../applications/audio/tomahawk ({
taglib = taglib_1_9; taglib = taglib_1_9;
enableXMPP = config.tomahawk.enableXMPP or true;
enableKDE = config.tomahawk.enableKDE or false;
enableTelepathy = config.tomahawk.enableTelepathy or false;
quazip = quazip_qt4; quazip = quazip_qt4;
boost = boost155; boost = boost155;
}; } // (config.tomahawk or {}));
topydo = callPackage ../applications/misc/topydo {}; topydo = callPackage ../applications/misc/topydo {};
@ -19997,9 +19922,7 @@ in
vym = qt5.callPackage ../applications/misc/vym { }; vym = qt5.callPackage ../applications/misc/vym { };
w3m = callPackage ../applications/networking/browsers/w3m { w3m = callPackage ../applications/networking/browsers/w3m { };
graphicsSupport = !stdenv.isDarwin;
};
# Should always be the version with the most features # Should always be the version with the most features
w3m-full = w3m; w3m-full = w3m;
@ -20994,9 +20917,7 @@ in
racer = callPackage ../games/racer { }; racer = callPackage ../games/racer { };
residualvm = callPackage ../games/residualvm { residualvm = callPackage ../games/residualvm { };
openglSupport = libGLSupported;
};
rftg = callPackage ../games/rftg { }; rftg = callPackage ../games/rftg { };
@ -22135,13 +22056,7 @@ in
singular = callPackage ../applications/science/math/singular { }; singular = callPackage ../applications/science/math/singular { };
scilab = callPackage ../applications/science/math/scilab { scilab = callPackage ../applications/science/math/scilab { };
withXaw3d = false;
withTk = true;
withGtk = false;
withOCaml = true;
withX = true;
};
scilab-bin = callPackage ../applications/science/math/scilab-bin {}; scilab-bin = callPackage ../applications/science/math/scilab-bin {};
@ -22451,10 +22366,7 @@ in
gensgs = pkgsi686Linux.callPackage ../misc/emulators/gens-gs { }; gensgs = pkgsi686Linux.callPackage ../misc/emulators/gens-gs { };
ghostscript = callPackage ../misc/ghostscript rec { ghostscript = callPackage ../misc/ghostscript { };
cupsSupport = config.ghostscript.cups or (!stdenv.isDarwin);
x11Support = cupsSupport; # with CUPS, X11 only adds very little
};
ghostscriptX = appendToName "with-X" (ghostscript.override { ghostscriptX = appendToName "with-X" (ghostscript.override {
cupsSupport = true; cupsSupport = true;
@ -22760,15 +22672,7 @@ in
disnix = callPackage ../tools/package-management/disnix { }; disnix = callPackage ../tools/package-management/disnix { };
dysnomia = callPackage ../tools/package-management/disnix/dysnomia { dysnomia = callPackage ../tools/package-management/disnix/dysnomia (config.disnix or {});
enableApacheWebApplication = config.disnix.enableApacheWebApplication or false;
enableAxis2WebService = config.disnix.enableAxis2WebService or false;
enableEjabberdDump = config.disnix.enableEjabberdDump or false;
enableMySQLDatabase = config.disnix.enableMySQLDatabase or false;
enablePostgreSQLDatabase = config.disnix.enablePostgreSQLDatabase or false;
enableSubversionRepository = config.disnix.enableSubversionRepository or false;
enableTomcatWebApplication = config.disnix.enableTomcatWebApplication or false;
};
disnixos = callPackage ../tools/package-management/disnix/disnixos { }; disnixos = callPackage ../tools/package-management/disnix/disnixos { };
@ -22910,15 +22814,9 @@ in
samsung-unified-linux-driver_4_01_17 = callPackage ../misc/cups/drivers/samsung/4.01.17.nix { }; samsung-unified-linux-driver_4_01_17 = callPackage ../misc/cups/drivers/samsung/4.01.17.nix { };
samsung-unified-linux-driver = res.samsung-unified-linux-driver_4_01_17; samsung-unified-linux-driver = res.samsung-unified-linux-driver_4_01_17;
sane-backends = callPackage ../applications/graphics/sane/backends { sane-backends = callPackage ../applications/graphics/sane/backends (config.sane or {});
gt68xxFirmware = config.sane.gt68xxFirmware or null;
snapscanFirmware = config.sane.snapscanFirmware or null;
};
sane-backends-git = callPackage ../applications/graphics/sane/backends/git.nix { sane-backends-git = callPackage ../applications/graphics/sane/backends/git.nix (config.sane or {});
gt68xxFirmware = config.sane.gt68xxFirmware or null;
snapscanFirmware = config.sane.snapscanFirmware or null;
};
brlaser = callPackage ../misc/cups/drivers/brlaser { }; brlaser = callPackage ../misc/cups/drivers/brlaser { };

2
pkgs/top-level/default.nix
View File

@ -73,7 +73,7 @@ in let
# whatever arguments it doesn't explicitly provide. This way, # whatever arguments it doesn't explicitly provide. This way,
# `all-packages.nix` doesn't know more than it needs too. # `all-packages.nix` doesn't know more than it needs too.
# #
# It's OK that `args` doesn't include default arguemtns from this file: # It's OK that `args` doesn't include default arguments from this file:
# they'll be deterministically inferred. In fact we must *not* include them, # they'll be deterministically inferred. In fact we must *not* include them,
# because it's important that if some parameter which affects the default is # because it's important that if some parameter which affects the default is
# substituted with a different argument, the default is re-inferred. # substituted with a different argument, the default is re-inferred.