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

all-packages: move aliases to aliases.nix

Browse Source 
Lots of aliases have been left over. This is a massive edit that
changes many random lines.
This commit is contained in:
Matthew Bauer 2018-04-25 19:55:18 -05:00
parent 9395d05b65
commit 218d81bc9d
2 changed files with 95 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
pkgs/top-level/aliases.nix
View File

@ -24,10 +24,15 @@ in
### Deprecated aliases - for backward compatibility ### Deprecated aliases - for backward compatibility
mapAliases (rec { mapAliases (rec {
PPSSPP = ppsspp; # added 2017-10-01
QmidiNet = qmidinet; # added 2016-05-22
accounts-qt = libsForQt5.accounts-qt; # added 2015-12-19 accounts-qt = libsForQt5.accounts-qt; # added 2015-12-19
adobeReader = adobe-reader; # added 2013-11-04 adobeReader = adobe-reader; # added 2013-11-04
ag = silver-searcher; # added 2018-04-25
aircrackng = aircrack-ng; # added 2016-01-14 aircrackng = aircrack-ng; # added 2016-01-14
ammonite-repl = ammonite; # added 2017-05-02 ammonite-repl = ammonite; # added 2017-05-02
apacheAnt = ant; # added 2018-04-25
apacheAnt_1_9 = ant_1_9; # added 2018-04-25
arduino_core = arduino-core; # added 2015-02-04 arduino_core = arduino-core; # added 2015-02-04
asciidocFull = asciidoc-full; # added 2014-06-22 asciidocFull = asciidoc-full; # added 2014-06-22
at_spi2_atk = at-spi2-atk; # added 2018-02-25 at_spi2_atk = at-spi2-atk; # added 2018-02-25
@ -48,50 +53,68 @@ mapAliases (rec {
cupsBjnp = cups-bjnp; # added 2016-01-02 cupsBjnp = cups-bjnp; # added 2016-01-02
cups_filters = cups-filters; # added 2016-08 cups_filters = cups-filters; # added 2016-08
cv = progress; # added 2015-09-06 cv = progress; # added 2015-09-06
d1x_rebirth = dxx-rebirth; # added 2018-04-25
d2x_rebirth = dxx-rebirth; # added 2018-04-25
dbus_daemon = dbus.daemon; # added 2018-04-25
dbus_glib = dbus-glib; # added 2018-02-25 dbus_glib = dbus-glib; # added 2018-02-25
dbus_libs = dbus; # added 2018-04-25
dbus_tools = dbus.out; # added 2018-04-25
deadbeef-mpris2-plugin = deadbeefPlugins.mpris2; # added 2018-02-23 deadbeef-mpris2-plugin = deadbeefPlugins.mpris2; # added 2018-02-23
deadpixi-sam = deadpixi-sam-unstable;
debian_devscripts = debian-devscripts; # added 2016-03-23 debian_devscripts = debian-devscripts; # added 2016-03-23
desktop_file_utils = desktop-file-utils; # added 2018-02-25 desktop_file_utils = desktop-file-utils; # added 2018-02-25
devicemapper = lvm2; # added 2018-04-25
digikam5 = digikam; # added 2017-02-18 digikam5 = digikam; # added 2017-02-18
dmtx = dmtx-utils; # added 2018-04-25
docbook5_xsl = docbook_xsl_ns; # added 2018-04-25
docbook_xml_xslt = docbook_xsl; # added 2018-04-25
double_conversion = double-conversion; # 2017-11-22 double_conversion = double-conversion; # 2017-11-22
dwarf_fortress = dwarf-fortress; # added 2016-01-23 dwarf_fortress = dwarf-fortress; # added 2016-01-23
emacs25Macport_25_1 = emacs25Macport; # added 2018-04-25
enblendenfuse = enblend-enfuse; # 2015-09-30 enblendenfuse = enblend-enfuse; # 2015-09-30
evolution_data_server = evolution-data-server; # added 2018-02-25 evolution_data_server = evolution-data-server; # added 2018-02-25
etcdctl = etcd; # added 2018-04-25
exfat-utils = exfat; # 2015-09-11 exfat-utils = exfat; # 2015-09-11
fam = gamin; # added 2018-04-25
fftwFloat = fftwSinglePrec; # 2018-04-25
firefox-esr-wrapper = firefox-esr; # 2016-01 firefox-esr-wrapper = firefox-esr; # 2016-01
firefox-wrapper = firefox; # 2016-01 firefox-wrapper = firefox; # 2016-01
firefoxWrapper = firefox; # 2015-09 firefoxWrapper = firefox; # 2015-09
flameGraph = flamegraph; # added 2018-04-25
font-awesome-ttf = font-awesome_4; # 2018-02-25 font-awesome-ttf = font-awesome_4; # 2018-02-25
foomatic_filters = foomatic-filters; # 2016-08 foomatic_filters = foomatic-filters; # 2016-08
fuse_exfat = exfat; # 2015-09-11 fuse_exfat = exfat; # 2015-09-11
gettextWithExpat = gettext; # 2016-02-19 fuseki = apache-jena-fuseki; # added 2018-04-25
gdb-multitarget = gdb; # added 2017-11-13 gdb-multitarget = gdb; # added 2017-11-13
gettextWithExpat = gettext; # 2016-02-19
gflags = google-gflags; # added 2018-04-25
git-hub = gitAndTools.git-hub; # added 2016-04-29 git-hub = gitAndTools.git-hub; # added 2016-04-29
glib_networking = glib-networking; # added 2018-02-25 glib_networking = glib-networking; # added 2018-02-25
gmock = gtest; # added 2018-04-25
gnome-themes-standard = gnome-themes-extra; # added 2018-03-14
gnome_doc_utils = gnome-doc-utils; # added 2018-02-25
gnome_themes_standard = gnome-themes-standard; # added 2018-02-25
gnustep-make = gnustep.make; # added 2016-7-6
go-pup = pup; # added 2017-12-19 go-pup = pup; # added 2017-12-19
googleAuthenticator = google-authenticator; # added 2016-10-16 googleAuthenticator = google-authenticator; # added 2016-10-16
gnome_doc_utils = gnome-doc-utils; # added 2018-02-25
gnome-themes-standard = gnome-themes-extra; # added 2018-03-14
gnome_themes_standard = gnome-themes-standard; # added 2018-02-25
grantlee5 = libsForQt5.grantlee; # added 2015-12-19 grantlee5 = libsForQt5.grantlee; # added 2015-12-19
gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25 gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25
gst_ffmpeg = gst-ffmpeg; # added 2017-02 gst_ffmpeg = gst-ffmpeg; # added 2017-02
gst_plugins_bad = gst-plugins-bad; # added 2017-02
gst_plugins_base = gst-plugins-base; # added 2017-02 gst_plugins_base = gst-plugins-base; # added 2017-02
gst_plugins_good = gst-plugins-good; # added 2017-02 gst_plugins_good = gst-plugins-good; # added 2017-02
gst_plugins_bad = gst-plugins-bad; # added 2017-02
gst_plugins_ugly = gst-plugins-ugly; # added 2017-02 gst_plugins_ugly = gst-plugins-ugly; # added 2017-02
gst_python = gst-python; # added 2017-02 gst_python = gst-python; # added 2017-02
gtk_doc = gtk-doc; # added 2018-02-25 gtk_doc = gtk-doc; # added 2018-02-25
guileCairo = guile-cairo; # added 2017-09-24 guileCairo = guile-cairo; # added 2017-09-24
guileGnome = guile-gnome; # added 2017-09-24 guileGnome = guile-gnome; # added 2017-09-24
guile_lib = guile-lib; # added 2017-09-24
guileLint = guile-lint; # added 2017-09-27 guileLint = guile-lint; # added 2017-09-27
guile_lib = guile-lib; # added 2017-09-24
guile_ncurses = guile-ncurses; # added 2017-09-24 guile_ncurses = guile-ncurses; # added 2017-09-24
gupnp_av = gupnp-av; # added 2018-02-25 gupnp_av = gupnp-av; # added 2018-02-25
gupnp_dlna = gupnp-dlna; # added 2018-02-25 gupnp_dlna = gupnp-dlna; # added 2018-02-25
gupnp_igd = gupnp-igd; # added 2018-02-25 gupnp_igd = gupnp-igd; # added 2018-02-25
gupnptools = gupnp-tools; # added 2015-12-19 gupnptools = gupnp-tools; # added 2015-12-19
gnustep-make = gnustep.make; # added 2016-7-6
hicolor_icon_theme = hicolor-icon-theme; # added 2018-02-25 hicolor_icon_theme = hicolor-icon-theme; # added 2018-02-25
htmlTidy = html-tidy; # added 2014-12-06 htmlTidy = html-tidy; # added 2014-12-06
iana_etc = iana-etc; # added 2017-03-08 iana_etc = iana-etc; # added 2017-03-08
@ -100,43 +123,55 @@ mapAliases (rec {
joseki = apache-jena-fuseki; # added 2016-02-28 joseki = apache-jena-fuseki; # added 2016-02-28
json_glib = json-glib; # added 2018-02-25 json_glib = json-glib; # added 2018-02-25
kdiff3-qt5 = kdiff3; # added 2017-02-18 kdiff3-qt5 = kdiff3; # added 2017-02-18
keepassx2-http = keepassx-reboot; # added 2016-10-17 keepass-keefox = keepass-keepassrpc; # backwards compatibility alias, added 2018-02
keepassx-reboot = keepassx-community; # added 2017-02-01
keepassx-community = keepassxc; # added 2017-11 keepassx-community = keepassxc; # added 2017-11
keepassx-reboot = keepassx-community; # added 2017-02-01
keepassx2-http = keepassx-reboot; # added 2016-10-17
kerberos = libkrb5; # added 2018-04-25
keybase-go = keybase; # added 2016-08-24 keybase-go = keybase; # added 2016-08-24
krename-qt5 = krename; # added 2017-02-18 krename-qt5 = krename; # added 2017-02-18
kvm = qemu_kvm; # added 2018-04-25
letsencrypt = certbot; # added 2016-05-16 letsencrypt = certbot; # added 2016-05-16
libdbusmenu_qt5 = libsForQt5.libdbusmenu; # added 2015-12-19 libaudit = audit; # added 2018-04-25
libcanberra_gtk2 = libcanberra-gtk2; # added 2018-02-25 libcanberra_gtk2 = libcanberra-gtk2; # added 2018-02-25
libcanberra_gtk3 = libcanberra-gtk3; # added 2018-02-25 libcanberra_gtk3 = libcanberra-gtk3; # added 2018-02-25
libcap_manpages = libcap.doc; # added 2016-04-29 libcap_manpages = libcap.doc; # added 2016-04-29
libcap_pam = if stdenv.isLinux then libcap.pam else null; # added 2016-04-29 libcap_pam = if stdenv.isLinux then libcap.pam else null; # added 2016-04-29
libcap_progs = libcap.out; # added 2016-04-29 libcap_progs = libcap.out; # added 2016-04-29
libdbusmenu_qt5 = libsForQt5.libdbusmenu; # added 2015-12-19
libgnome_keyring = libgnome-keyring; # added 2018-02-25 libgnome_keyring = libgnome-keyring; # added 2018-02-25
libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25 libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25
libgumbo = gumbo; # added 2018-01-21 libgumbo = gumbo; # added 2018-01-21
libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux || hostPlatform.libc != "glibc") gettext; # added 2018-03-14 libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux || hostPlatform.libc != "glibc") gettext; # added 2018-03-14
libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28 libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28
liblrdf = librdf; # added 2018-04-25
libmysql = mysql.connector-c; # added # 2017-12-28, this was a misnomer refering to libmysqlclient libmysql = mysql.connector-c; # added # 2017-12-28, this was a misnomer refering to libmysqlclient
librecad2 = librecad; # backwards compatibility alias, added 2015-10
libsysfs = sysfsutils; # added 2018-04-25
libtidy = html-tidy; # added 2014-12-21 libtidy = html-tidy; # added 2014-12-21
libudev = udev; # added 2018-04-25
links = links2; # added 2016-01-31 links = links2; # added 2016-01-31
lttngTools = lttng-tools; # added 2014-07-31 lttngTools = lttng-tools; # added 2014-07-31
lttngUst = lttng-ust; # added 2014-07-31 lttngUst = lttng-ust; # added 2014-07-31
lua5_sec = luaPackages.luasec; # added 2017-05-02
lua5_1_sockets = lua51Packages.luasocket; # added 2017-05-02 lua5_1_sockets = lua51Packages.luasocket; # added 2017-05-02
lua5_expat = luaPackages.luaexpat; # added 2017-05-02 lua5_expat = luaPackages.luaexpat; # added 2017-05-02
lua5_sec = luaPackages.luasec; # added 2017-05-02
lzma = xz; # added 2018-04-25
m3d-linux = m33-linux; # added 2016-08-13 m3d-linux = m33-linux; # added 2016-08-13
manpages = man-pages; # added 2015-12-06 gnum4 = m4; # added 2018-04-25
man_db = man-db; # added 2016-05 man_db = man-db; # added 2016-05
piwik = matomo; # added 2018-01-16 manpages = man-pages; # added 2015-12-06
midoriWrapper = midori; # added 2015-01 midoriWrapper = midori; # added 2015-01
mlt-qt5 = libsForQt5.mlt; # added 2015-12-19 mlt-qt5 = libsForQt5.mlt; # added 2015-12-19
mobile_broadband_provider_info = mobile-broadband-provider-info; # added 2018-02-25 mobile_broadband_provider_info = mobile-broadband-provider-info; # added 2018-02-25
module_init_tools = kmod; # added 2016-04-22 module_init_tools = kmod; # added 2016-04-22
msf = metasploit; # added 2018-04-25
mssys = ms-sys; # added 2015-12-13 mssys = ms-sys; # added 2015-12-13
multipath_tools = multipath-tools; # added 2016-01-21 multipath_tools = multipath-tools; # added 2016-01-21
mupen64plus1_5 = mupen64plus; # added 2016-02-12 mupen64plus1_5 = mupen64plus; # added 2016-02-12
mysql = mariadb; # added 2018-04-25
mysqlWorkbench = mysql-workbench; # added 2017-01-19 mysqlWorkbench = mysql-workbench; # added 2017-01-19
nagiosPluginsOfficial = monitoring-plugins;
ncat = nmap; # added 2016-01-26 ncat = nmap; # added 2016-01-26
networkmanager_fortisslvpn = networkmanager-fortisslvpn; # added 2018-02-25 networkmanager_fortisslvpn = networkmanager-fortisslvpn; # added 2018-02-25
networkmanager_iodine = networkmanager-iodine; # added 2018-02-25 networkmanager_iodine = networkmanager-iodine; # added 2018-02-25
@ -144,33 +179,42 @@ mapAliases (rec {
networkmanager_openconnect = networkmanager-openconnect; # added 2018-02-25 networkmanager_openconnect = networkmanager-openconnect; # added 2018-02-25
networkmanager_openvpn = networkmanager-openvpn; # added 2018-02-25 networkmanager_openvpn = networkmanager-openvpn; # added 2018-02-25
networkmanager_vpnc = networkmanager-vpnc; # added 2018-02-25 networkmanager_vpnc = networkmanager-vpnc; # added 2018-02-25
nmap_graphical = nmap-graphical; # added 2017-01-19
nfsUtils = nfs-utils; # added 2014-12-06 nfsUtils = nfs-utils; # added 2014-12-06
nginxUnstable = nginxMainline; # added 2018-04-25
nilfs_utils = nilfs-utils; # added 2018-04-25
nmap_graphical = nmap-graphical; # added 2017-01-19
nologin = shadow; # added 2018-04-25
openal = openalSoft; # added 2018-04-25
opencascade_oce = opencascade; # added 2018-04-25
opencl-icd = ocl-icd; # added 2017-01-20 opencl-icd = ocl-icd; # added 2017-01-20
openexr_ctl = ctl; # added 2018-04-25
openssh_with_kerberos = openssh; # added 2018-01-28 openssh_with_kerberos = openssh; # added 2018-01-28
owncloudclient = owncloud-client; # added 2016-08 owncloudclient = owncloud-client; # added 2016-08
p11_kit = p11-kit; # added 2018-02-25 p11_kit = p11-kit; # added 2018-02-25
pgp-tools = signing-party; # added 2017-03-26 pgp-tools = signing-party; # added 2017-03-26
pidgin-with-plugins = pidgin; # added 2016-06 pidgin-with-plugins = pidgin; # added 2016-06
pidginlatexSF = pidgin-latex; # added 2014-11-02
pidginlatex = pidgin-latex; # added 2018-01-08 pidginlatex = pidgin-latex; # added 2018-01-08
pidginlatexSF = pidgin-latex; # added 2014-11-02
pidginmsnpecan = pidgin-msn-pecan; # added 2018-01-08 pidginmsnpecan = pidgin-msn-pecan; # added 2018-01-08
pidginotr = pidgin-otr; # added 2018-01-08
pidginosd = pidgin-osd; # added 2018-01-08 pidginosd = pidgin-osd; # added 2018-01-08
pidginotr = pidgin-otr; # added 2018-01-08
pidginsipe = pidgin-sipe; # added 2018-01-08 pidginsipe = pidgin-sipe; # added 2018-01-08
pidginwindowmerge = pidgin-window-merge; # added 2018-01-08 pidginwindowmerge = pidgin-window-merge; # added 2018-01-08
postage = pgmanage; # added 2017-11-03 piwik = matomo; # added 2018-01-16
pltScheme = racket; # just to be sure
polarssl = mbedtls; # added 2018-04-25
poppler_qt5 = libsForQt5.poppler; # added 2015-12-19 poppler_qt5 = libsForQt5.poppler; # added 2015-12-19
PPSSPP = ppsspp; # added 2017-10-01 postage = pgmanage; # added 2017-11-03
procps = procps-ng; # added 2018-04-25
prometheus-statsd-bridge = prometheus-statsd-exporter; # added 2017-08-27 prometheus-statsd-bridge = prometheus-statsd-exporter; # added 2017-08-27
qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19 qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19
QmidiNet = qmidinet; # added 2016-05-22
qt_gstreamer = qt-gstreamer; # added 2017-02 qt_gstreamer = qt-gstreamer; # added 2017-02
qt_gstreamer1 = qt-gstreamer1; # added 2017-02 qt_gstreamer1 = qt-gstreamer1; # added 2017-02
quake3game = ioquake3; # added 2016-01-14 quake3game = ioquake3; # added 2016-01-14
qwt6 = libsForQt5.qwt; # added 2015-12-19 qwt6 = libsForQt5.qwt; # added 2015-12-19
rdiff_backup = rdiff-backup; # added 2014-11-23 rdiff_backup = rdiff-backup; # added 2014-11-23
rdmd = dtools; # added 2017-08-19 rdmd = dtools; # added 2017-08-19
redland = librdf_redland; # added 2018-04-25
robomongo = robo3t; #added 2017-09-28 robomongo = robo3t; #added 2017-09-28
rssglx = rss-glx; #added 2015-03-25 rssglx = rss-glx; #added 2015-03-25
ruby_2_0_0 = throw "deprecated 2018-0213: use a newer version of ruby"; ruby_2_0_0 = throw "deprecated 2018-0213: use a newer version of ruby";
@ -181,15 +225,21 @@ mapAliases (rec {
ruby_2_5_0 = throw "deprecated 2018-0213: use ruby_2_5 instead"; ruby_2_5_0 = throw "deprecated 2018-0213: use ruby_2_5 instead";
rubygems = throw "deprecated 2016-03-02: rubygems is now bundled with ruby"; rubygems = throw "deprecated 2016-03-02: rubygems is now bundled with ruby";
rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; # added 2015-04-02 rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; # added 2015-04-02
sam = deadpixi-sam; # added 2018-04-25
samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # added 2016-01-25 samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # added 2016-01-25
saneBackends = sane-backends; # added 2016-01-02 saneBackends = sane-backends; # added 2016-01-02
saneBackendsGit = sane-backends-git; # added 2016-01-02 saneBackendsGit = sane-backends-git; # added 2016-01-02
saneFrontends = sane-frontends; # added 2016-01-02 saneFrontends = sane-frontends; # added 2016-01-02
scim = sc-im; # added 2016-01-22 scim = sc-im; # added 2016-01-22
scollector = bosun; # added 2018-04-25
shared_mime_info = shared-mime-info; # added 2018-02-25 shared_mime_info = shared-mime-info; # added 2018-02-25
skrooge2 = skrooge; # added 2017-02-18 skrooge2 = skrooge; # added 2017-02-18
skype = skypeforlinux; # added 2017-07-27 skype = skypeforlinux; # added 2017-07-27
slurm-llnl = slurm; # renamed July 2017
slurm-llnl-full = slurm-full; # renamed July 2017
smbclient = samba; # added 2018-04-25
spaceOrbit = space-orbit; # addewd 2016-05-23 spaceOrbit = space-orbit; # addewd 2016-05-23
speech_tools = speech-tools; # added 2018-04-25
speedtest_cli = speedtest-cli; # added 2015-02-17 speedtest_cli = speedtest-cli; # added 2015-02-17
spice_gtk = spice-gtk; # added 2018-02-25 spice_gtk = spice-gtk; # added 2018-02-25
spice_protocol = spice-protocol; # added 2018-02-25 spice_protocol = spice-protocol; # added 2018-02-25
@ -197,8 +247,9 @@ mapAliases (rec {
sshfs = sshfs-fuse; # added 2017-08-14 sshfs = sshfs-fuse; # added 2017-08-14
sshfsFuse = sshfs-fuse; # added 2016-09 sshfsFuse = sshfs-fuse; # added 2016-09
surf-webkit2 = surf; # added 2017-04-02 surf-webkit2 = surf; # added 2017-04-02
tahoelafs = tahoe-lafs; # added 2018-03-26
system_config_printer = system-config-printer; # added 2016-01-03 system_config_printer = system-config-printer; # added 2016-01-03
systool = sysfsutils; # added 2018-04-25
tahoelafs = tahoe-lafs; # added 2018-03-26
telepathy_farstream = telepathy-farstream; # added 2018-02-25 telepathy_farstream = telepathy-farstream; # added 2018-02-25
telepathy_gabble = telepathy-gabble; # added 2018-02-25 telepathy_gabble = telepathy-gabble; # added 2018-02-25
telepathy_glib = telepathy-glib; # added 2018-02-25 telepathy_glib = telepathy-glib; # added 2018-02-25
@ -214,9 +265,12 @@ mapAliases (rec {
tex-gyre-schola-math = tex-gyre-math.schola; # added 2018-04-03 tex-gyre-schola-math = tex-gyre-math.schola; # added 2018-04-03
tex-gyre-termes-math = tex-gyre-math.termes; # added 2018-04-03 tex-gyre-termes-math = tex-gyre-math.termes; # added 2018-04-03
tftp_hpa = tftp-hpa; # added 2015-04-03 tftp_hpa = tftp-hpa; # added 2015-04-03
trang = jing-trang; # added 2018-04-25
transmission_gtk = transmission-gtk; # added 2018-01-06 transmission_gtk = transmission-gtk; # added 2018-01-06
transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06 transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06
tshark = wireshark-cli; # added 2018-04-25
ucsFonts = ucs-fonts; # added 2016-07-15 ucsFonts = ucs-fonts; # added 2016-07-15
udev = systemd; # added 2018-04-25
ultrastardx-beta = ultrastardx; # added 2017-08-12 ultrastardx-beta = ultrastardx; # added 2017-08-12
usb_modeswitch = usb-modeswitch; # added 2016-05-10 usb_modeswitch = usb-modeswitch; # added 2016-05-10
vimbWrapper = vimb; # added 2015-01 vimbWrapper = vimb; # added 2015-01
@ -226,8 +280,12 @@ mapAliases (rec {
wineStaging = wine-staging; # added 2018-01-08 wineStaging = wine-staging; # added 2018-01-08
winusb = woeusb; # added 2017-12-22 winusb = woeusb; # added 2017-12-22
x11 = xlibsWrapper; # added 2015-09 x11 = xlibsWrapper; # added 2015-09
xbmc = kodi; # added 2018-04-25
xbmcPlain = kodiPlain; # added 2018-04-25
xbmcPlugins = kodiPlugins; # added 2018-04-25
xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09 xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09
xlibs = xorg; # added 2015-09 xlibs = xorg; # added 2015-09
yacc = bison; # added 2018-04-25
youtubeDL = youtube-dl; # added 2014-10-26 youtubeDL = youtube-dl; # added 2014-10-26
# added 2017-05-27 # added 2017-05-27
@ -245,6 +303,20 @@ mapAliases (rec {
ocamlPackages_4_00_1 ocamlPackages_4_01_0 ocamlPackages_4_02 ocamlPackages_4_00_1 ocamlPackages_4_01_0 ocamlPackages_4_02
ocamlPackages_4_03 ocamlPackages_4_03
ocamlPackages_latest; ocamlPackages_latest;
gst_all = { # added 2018-04-25
inherit (pkgs) gstreamer gnonlin gst-python qt-gstreamer;
gstPluginsBase = pkgs.gst-plugins-base;
gstPluginsBad = pkgs.gst-plugins-bad;
gstPluginsGood = pkgs.gst-plugins-good;
gstPluginsUgly = pkgs.gst-plugins-ugly;
gstFfmpeg = pkgs.gst-ffmpeg;
gst-plugins-base = pkgs.gst-plugins-base;
gst-plugins-bad = pkgs.gst-plugins-bad;
gst-plugins-good = pkgs.gst-plugins-good;
gst-plugins-ugly = pkgs.gst-plugins-ugly;
gst-ffmpeg = pkgs.gst-ffmpeg;
};
} // (with ocaml-ng; { # added 2016-09-14 } // (with ocaml-ng; { # added 2016-09-14
ocaml_3_08_0 = ocamlPackages_3_08_0.ocaml; ocaml_3_08_0 = ocamlPackages_3_08_0.ocaml;
ocaml_3_10_0 = ocamlPackages_3_10_0.ocaml; ocaml_3_10_0 = ocamlPackages_3_10_0.ocaml;

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

@ -2330,9 +2330,6 @@ with pkgs;
flamegraph = callPackage ../development/tools/flamegraph { }; flamegraph = callPackage ../development/tools/flamegraph { };
# Awkward historical capitalization for flamegraph. Remove eventually
flameGraph = flamegraph;
flvtool2 = callPackage ../tools/video/flvtool2 { }; flvtool2 = callPackage ../tools/video/flvtool2 { };
fmbt = callPackage ../development/tools/fmbt { fmbt = callPackage ../development/tools/fmbt {
@ -2735,7 +2732,6 @@ with pkgs;
gt5 = callPackage ../tools/system/gt5 { }; gt5 = callPackage ../tools/system/gt5 { };
gtest = callPackage ../development/libraries/gtest {}; gtest = callPackage ../development/libraries/gtest {};
gmock = gtest;
gbenchmark = callPackage ../development/libraries/gbenchmark {}; gbenchmark = callPackage ../development/libraries/gbenchmark {};
gtkdatabox = callPackage ../development/libraries/gtkdatabox {}; gtkdatabox = callPackage ../development/libraries/gtkdatabox {};
@ -3408,9 +3404,6 @@ with pkgs;
nodePackages = nodePackages_6_x; nodePackages = nodePackages_6_x;
# Can be used as a user shell
nologin = shadow;
npm2nix = nodePackages.npm2nix; npm2nix = nodePackages.npm2nix;
file-rename = callPackage ../tools/filesystems/file-rename { }; file-rename = callPackage ../tools/filesystems/file-rename { };
@ -3571,8 +3564,6 @@ with pkgs;
lzip = callPackage ../tools/compression/lzip { }; lzip = callPackage ../tools/compression/lzip { };
lzma = xz;
xz = callPackage ../tools/compression/xz { }; xz = callPackage ../tools/compression/xz { };
lz4 = callPackage ../tools/compression/lz4 { }; lz4 = callPackage ../tools/compression/lz4 { };
@ -3784,7 +3775,6 @@ with pkgs;
mscgen = callPackage ../tools/graphics/mscgen { }; mscgen = callPackage ../tools/graphics/mscgen { };
metasploit = callPackage ../tools/security/metasploit { }; metasploit = callPackage ../tools/security/metasploit { };
msf = metasploit;
ms-sys = callPackage ../tools/misc/ms-sys { }; ms-sys = callPackage ../tools/misc/ms-sys { };
@ -3963,7 +3953,6 @@ with pkgs;
nifskope = callPackage ../tools/graphics/nifskope { }; nifskope = callPackage ../tools/graphics/nifskope { };
nilfs-utils = callPackage ../tools/filesystems/nilfs-utils {}; nilfs-utils = callPackage ../tools/filesystems/nilfs-utils {};
nilfs_utils = nilfs-utils;
nitrogen = callPackage ../tools/X11/nitrogen {}; nitrogen = callPackage ../tools/X11/nitrogen {};
@ -4861,7 +4850,6 @@ with pkgs;
}; };
silver-searcher = callPackage ../tools/text/silver-searcher { }; silver-searcher = callPackage ../tools/text/silver-searcher { };
ag = self.silver-searcher;
simpleproxy = callPackage ../tools/networking/simpleproxy { }; simpleproxy = callPackage ../tools/networking/simpleproxy { };
@ -5495,8 +5483,6 @@ with pkgs;
tradcpp = callPackage ../development/tools/tradcpp { }; tradcpp = callPackage ../development/tools/tradcpp { };
trang = self.jing-trang;
tre = callPackage ../development/libraries/tre { }; tre = callPackage ../development/libraries/tre { };
ts = callPackage ../tools/system/ts { }; ts = callPackage ../tools/system/ts { };
@ -7202,8 +7188,6 @@ with pkgs;
picolisp = callPackage ../development/interpreters/picolisp {}; picolisp = callPackage ../development/interpreters/picolisp {};
pltScheme = racket; # just to be sure
polyml = callPackage ../development/compilers/polyml { }; polyml = callPackage ../development/compilers/polyml { };
polyml56 = callPackage ../development/compilers/polyml/5.6.nix { }; polyml56 = callPackage ../development/compilers/polyml/5.6.nix { };
@ -7489,11 +7473,9 @@ with pkgs;
antlr4_7 = callPackage ../development/tools/parsing/antlr/4.7.nix { }; antlr4_7 = callPackage ../development/tools/parsing/antlr/4.7.nix { };
antlr4 = antlr4_7; antlr4 = antlr4_7;
ant = apacheAnt; ant = callPackage ../development/tools/build-managers/apache-ant { };
apacheAnt = callPackage ../development/tools/build-managers/apache-ant { }; ant_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { };
apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { };
apacheKafka = apacheKafka_1_0; apacheKafka = apacheKafka_1_0;
apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; }; apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; };
@ -7857,8 +7839,6 @@ with pkgs;
flexcpp = callPackage ../development/tools/parsing/flexc++ { }; flexcpp = callPackage ../development/tools/parsing/flexc++ { };
m4 = gnum4;
geis = callPackage ../development/libraries/geis { geis = callPackage ../development/libraries/geis {
inherit (xorg) libX11 libXext libXi libXtst; inherit (xorg) libX11 libXext libXi libXtst;
}; };
@ -7873,7 +7853,7 @@ with pkgs;
gnome-usage = callPackage ../applications/misc/gnome-usage {}; gnome-usage = callPackage ../applications/misc/gnome-usage {};
gnum4 = callPackage ../development/tools/misc/gnum4 { }; m4 = callPackage ../development/tools/misc/gnum4 { };
gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { }; gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { };
gnumake3 = gnumake382; gnumake3 = gnumake382;
@ -8363,8 +8343,6 @@ with pkgs;
}; };
xxdiff-tip = libsForQt5.callPackage ../development/tools/misc/xxdiff/tip.nix { }; xxdiff-tip = libsForQt5.callPackage ../development/tools/misc/xxdiff/tip.nix { };
yacc = bison;
yaml2json = callPackage ../development/tools/yaml2json { }; yaml2json = callPackage ../development/tools/yaml2json { };
ycmd = callPackage ../development/tools/misc/ycmd { ycmd = callPackage ../development/tools/misc/ycmd {
@ -8687,11 +8665,6 @@ with pkgs;
dbus-sharp-glib-1_0 = callPackage ../development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix { }; dbus-sharp-glib-1_0 = callPackage ../development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix { };
dbus-sharp-glib-2_0 = callPackage ../development/libraries/dbus-sharp-glib { }; dbus-sharp-glib-2_0 = callPackage ../development/libraries/dbus-sharp-glib { };
# FIXME: deprecate these.
dbus_tools = dbus.out;
dbus_libs = dbus;
dbus_daemon = dbus.daemon;
makeDBusConf = { suidHelper, serviceDirectories }: makeDBusConf = { suidHelper, serviceDirectories }:
callPackage ../development/libraries/dbus/make-dbus-conf.nix { callPackage ../development/libraries/dbus/make-dbus-conf.nix {
inherit suidHelper serviceDirectories; inherit suidHelper serviceDirectories;
@ -8914,8 +8887,6 @@ with pkgs;
funambol = callPackage ../development/libraries/funambol { }; funambol = callPackage ../development/libraries/funambol { };
fam = gamin;
gamin = callPackage ../development/libraries/gamin { }; gamin = callPackage ../development/libraries/gamin { };
ganv = callPackage ../development/libraries/ganv { }; ganv = callPackage ../development/libraries/ganv { };
@ -8963,8 +8934,6 @@ with pkgs;
gettext = callPackage ../development/libraries/gettext { }; gettext = callPackage ../development/libraries/gettext { };
gflags = google-gflags;
gf2x = callPackage ../development/libraries/gf2x {}; gf2x = callPackage ../development/libraries/gf2x {};
gd = callPackage ../development/libraries/gd { gd = callPackage ../development/libraries/gd {
@ -9123,22 +9092,6 @@ with pkgs;
callPackage = pkgs.newScope (pkgs // { libav = pkgs.ffmpeg; }); callPackage = pkgs.newScope (pkgs // { libav = pkgs.ffmpeg; });
}); });
gst_all = {
inherit (pkgs) gstreamer gnonlin gst-python qt-gstreamer;
gstPluginsBase = pkgs.gst-plugins-base;
gstPluginsBad = pkgs.gst-plugins-bad;
gstPluginsGood = pkgs.gst-plugins-good;
gstPluginsUgly = pkgs.gst-plugins-ugly;
gstFfmpeg = pkgs.gst-ffmpeg;
# aliases with the dashed naming, same as in gst_all_1
gst-plugins-base = pkgs.gst-plugins-base;
gst-plugins-bad = pkgs.gst-plugins-bad;
gst-plugins-good = pkgs.gst-plugins-good;
gst-plugins-ugly = pkgs.gst-plugins-ugly;
gst-ffmpeg = pkgs.gst-ffmpeg;
};
gstreamer = callPackage ../development/libraries/gstreamer/legacy/gstreamer { gstreamer = callPackage ../development/libraries/gstreamer/legacy/gstreamer {
bison = bison2; bison = bison2;
}; };
@ -9338,10 +9291,6 @@ with pkgs;
hamlib = callPackage ../development/libraries/hamlib { }; hamlib = callPackage ../development/libraries/hamlib { };
# TODO : Let admin choose.
# We are using mit-krb5 because it is better maintained
kerberos = libkrb5;
heimdalFull = callPackage ../development/libraries/kerberos/heimdal.nix { }; heimdalFull = callPackage ../development/libraries/kerberos/heimdal.nix { };
libheimdal = heimdalFull.override { type = "lib"; }; libheimdal = heimdalFull.override { type = "lib"; };
@ -9863,8 +9812,6 @@ with pkgs;
liblo = callPackage ../development/libraries/liblo { }; liblo = callPackage ../development/libraries/liblo { };
liblrdf = librdf;
liblscp = callPackage ../development/libraries/liblscp { }; liblscp = callPackage ../development/libraries/liblscp { };
libe-book = callPackage ../development/libraries/libe-book {}; libe-book = callPackage ../development/libraries/libe-book {};
@ -10794,8 +10741,6 @@ with pkgs;
oobicpl = callPackage ../development/libraries/science/biology/oobicpl { }; oobicpl = callPackage ../development/libraries/science/biology/oobicpl { };
openal = self.openalSoft;
openalSoft = callPackage ../development/libraries/openal-soft { openalSoft = callPackage ../development/libraries/openal-soft {
inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox; inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox;
}; };
@ -10804,8 +10749,6 @@ with pkgs;
opencascade = callPackage ../development/libraries/opencascade { }; opencascade = callPackage ../development/libraries/opencascade { };
opencascade_oce = opencascade;
opencl-headersGen = v: callPackage ../development/libraries/opencl-headers { version = v; }; opencl-headersGen = v: callPackage ../development/libraries/opencl-headers { version = v; };
opencl-headers_1_2 = opencl-headersGen "12"; opencl-headers_1_2 = opencl-headersGen "12";
opencl-headers_2_2 = opencl-headersGen "22"; opencl-headers_2_2 = opencl-headersGen "22";
@ -10834,9 +10777,6 @@ with pkgs;
enableCuda = false; enableCuda = false;
}; };
# this ctl version is needed by openexr_viewers
openexr_ctl = ctl;
openexr = callPackage ../development/libraries/openexr { }; openexr = callPackage ../development/libraries/openexr { };
openexrid-unstable = callPackage ../development/libraries/openexrid-unstable { }; openexrid-unstable = callPackage ../development/libraries/openexrid-unstable { };
@ -10982,8 +10922,6 @@ with pkgs;
poker-eval = callPackage ../development/libraries/poker-eval { }; poker-eval = callPackage ../development/libraries/poker-eval { };
polarssl = mbedtls;
polkit = callPackage ../development/libraries/polkit { }; polkit = callPackage ../development/libraries/polkit { };
polkit_qt4 = callPackage ../development/libraries/polkit-qt-1/qt-4.nix { }; polkit_qt4 = callPackage ../development/libraries/polkit-qt-1/qt-4.nix { };
@ -11342,8 +11280,6 @@ with pkgs;
qrupdate = callPackage ../development/libraries/qrupdate { }; qrupdate = callPackage ../development/libraries/qrupdate { };
redland = pkgs.librdf_redland;
resolv_wrapper = callPackage ../development/libraries/resolv_wrapper { }; resolv_wrapper = callPackage ../development/libraries/resolv_wrapper { };
rhino = callPackage ../development/libraries/java/rhino { rhino = callPackage ../development/libraries/java/rhino {
@ -11490,7 +11426,6 @@ with pkgs;
speechd = callPackage ../development/libraries/speechd { }; speechd = callPackage ../development/libraries/speechd { };
speech-tools = callPackage ../development/libraries/speech-tools {}; speech-tools = callPackage ../development/libraries/speech-tools {};
speech_tools = speech-tools;
speex = callPackage ../development/libraries/speex { speex = callPackage ../development/libraries/speex {
fftw = fftwFloat; fftw = fftwFloat;
@ -12263,8 +12198,6 @@ with pkgs;
java = jdk; java = jdk;
}; };
fuseki = apache-jena-fuseki;
apcupsd = callPackage ../servers/apcupsd { }; apcupsd = callPackage ../servers/apcupsd { };
asterisk = asterisk-stable; asterisk = asterisk-stable;
@ -12286,7 +12219,6 @@ with pkgs;
bird bird6 bird2; bird bird6 bird2;
bosun = callPackage ../servers/monitoring/bosun { }; bosun = callPackage ../servers/monitoring/bosun { };
scollector = bosun;
cayley = callPackage ../servers/cayley { }; cayley = callPackage ../servers/cayley { };
@ -12359,8 +12291,6 @@ with pkgs;
v8 = v8_6_x; v8 = v8_6_x;
}; };
etcdctl = etcd;
exim = callPackage ../servers/mail/exim { }; exim = callPackage ../servers/mail/exim { };
fcgiwrap = callPackage ../servers/fcgiwrap { }; fcgiwrap = callPackage ../servers/fcgiwrap { };
@ -12487,8 +12417,6 @@ with pkgs;
modules = [ nginxModules.dav nginxModules.moreheaders ]; modules = [ nginxModules.dav nginxModules.moreheaders ];
}; };
nginxUnstable = nginxMainline;
nginxModules = callPackage ../servers/http/nginx/modules.nix { }; nginxModules = callPackage ../servers/http/nginx/modules.nix { };
# We should move to dynmaic modules and create a nginxFull package with all modules # We should move to dynmaic modules and create a nginxFull package with all modules
@ -12565,7 +12493,6 @@ with pkgs;
}; };
# libpulse implementations # libpulse implementations
libpulseaudio-vanilla = callPackage ../servers/pulseaudio { libpulseaudio-vanilla = callPackage ../servers/pulseaudio {
libOnly = true; libOnly = true;
inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa; inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa;
@ -12630,8 +12557,6 @@ with pkgs;
boost = boost159; boost = boost159;
}; };
mysql = mariadb;
mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { }; mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { };
nagios = callPackage ../servers/monitoring/nagios { }; nagios = callPackage ../servers/monitoring/nagios { };
@ -12639,7 +12564,6 @@ with pkgs;
munin = callPackage ../servers/monitoring/munin { }; munin = callPackage ../servers/monitoring/munin { };
monitoring-plugins = callPackage ../servers/monitoring/plugins { }; monitoring-plugins = callPackage ../servers/monitoring/plugins { };
nagiosPluginsOfficial = monitoring-plugins;
inherit (callPackage ../servers/monitoring/plugins/labs_consol_de.nix { inherit (perlPackages) NetSNMP; }) inherit (callPackage ../servers/monitoring/plugins/labs_consol_de.nix { inherit (perlPackages) NetSNMP; })
check-nwc-health check-nwc-health
@ -12795,7 +12719,6 @@ with pkgs;
deadpixi-sam-unstable = callPackage ../applications/editors/deadpixi-sam { }; deadpixi-sam-unstable = callPackage ../applications/editors/deadpixi-sam { };
deadpixi-sam = deadpixi-sam-unstable; deadpixi-sam = deadpixi-sam-unstable;
sam = deadpixi-sam;
samba3 = callPackage ../servers/samba/3.x.nix { }; samba3 = callPackage ../servers/samba/3.x.nix { };
@ -12807,8 +12730,6 @@ with pkgs;
samba = samba4; samba = samba4;
smbclient = samba;
# A lightweight Samba 3, useful for non-Linux-based OSes. # A lightweight Samba 3, useful for non-Linux-based OSes.
samba3_light = lowPrio (samba3.override { samba3_light = lowPrio (samba3.override {
pam = null; pam = null;
@ -12872,10 +12793,8 @@ with pkgs;
storm = callPackage ../servers/computing/storm { }; storm = callPackage ../servers/computing/storm { };
slurm = callPackage ../servers/computing/slurm { gtk2 = null; }; slurm = callPackage ../servers/computing/slurm { gtk2 = null; };
slurm-llnl = slurm; # renamed July 2017
slurm-full = appendToName "full" (callPackage ../servers/computing/slurm { }); slurm-full = appendToName "full" (callPackage ../servers/computing/slurm { });
slurm-llnl-full = slurm-full; # renamed July 2017
slurm-spank-x11 = callPackage ../servers/computing/slurm-spank-x11 { }; slurm-spank-x11 = callPackage ../servers/computing/slurm-spank-x11 { };
@ -13013,7 +12932,6 @@ with pkgs;
atop = callPackage ../os-specific/linux/atop { }; atop = callPackage ../os-specific/linux/atop { };
audit = callPackage ../os-specific/linux/audit { }; audit = callPackage ../os-specific/linux/audit { };
libaudit = audit;
b43Firmware_5_1_138 = callPackage ../os-specific/linux/firmware/b43-firmware/5.1.138.nix { }; b43Firmware_5_1_138 = callPackage ../os-specific/linux/firmware/b43-firmware/5.1.138.nix { };
@ -13079,8 +12997,6 @@ with pkgs;
# `.override` clobbered. C.F. `llvmPackages` which does the same. # `.override` clobbered. C.F. `llvmPackages` which does the same.
darwin = callPackage ./darwin-packages.nix { }; darwin = callPackage ./darwin-packages.nix { };
devicemapper = lvm2;
disk_indicator = callPackage ../os-specific/linux/disk-indicator { }; disk_indicator = callPackage ../os-specific/linux/disk-indicator { };
displaylink = callPackage ../os-specific/linux/displaylink { displaylink = callPackage ../os-specific/linux/displaylink {
@ -13708,8 +13624,6 @@ with pkgs;
kmod-debian-aliases = callPackage ../os-specific/linux/kmod-debian-aliases { }; kmod-debian-aliases = callPackage ../os-specific/linux/kmod-debian-aliases { };
kvm = qemu_kvm;
libcap = callPackage ../os-specific/linux/libcap { }; libcap = callPackage ../os-specific/linux/libcap { };
libcap_ng = callPackage ../os-specific/linux/libcap-ng { libcap_ng = callPackage ../os-specific/linux/libcap-ng {
@ -13883,8 +13797,6 @@ with pkgs;
prayer = callPackage ../servers/prayer { }; prayer = callPackage ../servers/prayer { };
procps = procps-ng;
procps-ng = if stdenv.isLinux then callPackage ../os-specific/linux/procps-ng { } procps-ng = if stdenv.isLinux then callPackage ../os-specific/linux/procps-ng { }
else unixtools.procps; else unixtools.procps;
@ -13975,10 +13887,6 @@ with pkgs;
inherit (gnome2) libglade; inherit (gnome2) libglade;
}; };
# Provided with sysfsutils.
libsysfs = sysfsutils;
systool = sysfsutils;
sysklogd = callPackage ../os-specific/linux/sysklogd { }; sysklogd = callPackage ../os-specific/linux/sysklogd { };
syslinux = callPackage ../os-specific/linux/syslinux { }; syslinux = callPackage ../os-specific/linux/syslinux { };
@ -14055,9 +13963,6 @@ with pkgs;
cross = assert targetPlatform != buildPlatform; targetPlatform; cross = assert targetPlatform != buildPlatform; targetPlatform;
}); });
udev = systemd;
libudev = udev;
eudev = callPackage ../os-specific/linux/eudev {}; eudev = callPackage ../os-specific/linux/eudev {};
libudev0-shim = callPackage ../os-specific/linux/libudev0-shim/default.nix { }; libudev0-shim = callPackage ../os-specific/linux/libudev0-shim/default.nix { };
@ -14265,10 +14170,6 @@ with pkgs;
docbook_xsl docbook_xsl
docbook_xsl_ns; docbook_xsl_ns;
docbook_xml_xslt = docbook_xsl;
docbook5_xsl = docbook_xsl_ns;
documentation-highlighter = callPackage ../misc/documentation-highlighter { }; documentation-highlighter = callPackage ../misc/documentation-highlighter { };
cabin = callPackage ../data/fonts/cabin { }; cabin = callPackage ../data/fonts/cabin { };
@ -15223,8 +15124,6 @@ with pkgs;
inherit (python3Packages) buildPythonApplication requests; inherit (python3Packages) buildPythonApplication requests;
}; };
dmtx = dmtx-utils;
dmtx-utils = callPackage (callPackage ../tools/graphics/dmtx-utils) { dmtx-utils = callPackage (callPackage ../tools/graphics/dmtx-utils) {
}; };
@ -15354,9 +15253,6 @@ with pkgs;
ImageCaptureCore GSS ImageIO; ImageCaptureCore GSS ImageIO;
}; };
# for backwards compatibility
emacs25Macport_25_1 = emacs25Macport;
emacsPackagesGen = emacs: self: let callPackage = newScope self; in rec { emacsPackagesGen = emacs: self: let callPackage = newScope self; in rec {
inherit emacs; inherit emacs;
@ -15589,7 +15485,6 @@ with pkgs;
keepass-keepasshttp = callPackage ../applications/misc/keepass-plugins/keepasshttp { }; keepass-keepasshttp = callPackage ../applications/misc/keepass-plugins/keepasshttp { };
keepass-keepassrpc = callPackage ../applications/misc/keepass-plugins/keepassrpc { }; keepass-keepassrpc = callPackage ../applications/misc/keepass-plugins/keepassrpc { };
keepass-keefox = keepass-keepassrpc; # backwards compatibility alias, added 2018-02
exrdisplay = callPackage ../applications/graphics/exrdisplay { }; exrdisplay = callPackage ../applications/graphics/exrdisplay { };
@ -15752,9 +15647,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) ApplicationServices SystemConfiguration; inherit (darwin.apple_sdk.frameworks) ApplicationServices SystemConfiguration;
}; };
# the cli binary is actually called tshark and often packaged under this name
tshark = wireshark-cli;
# The GTK UI is deprecated by upstream. You probably want the QT version. # The GTK UI is deprecated by upstream. You probably want the QT version.
wireshark-gtk = wireshark-cli.override { withGtk = true; }; wireshark-gtk = wireshark-cli.override { withGtk = true; };
wireshark-qt = wireshark-cli.override { withQt = true; }; wireshark-qt = wireshark-cli.override { withQt = true; };
@ -16532,7 +16424,6 @@ with pkgs;
libowfat = callPackage ../development/libraries/libowfat { }; libowfat = callPackage ../development/libraries/libowfat { };
librecad = callPackage ../applications/misc/librecad { }; librecad = callPackage ../applications/misc/librecad { };
librecad2 = librecad; # backwards compatibility alias, added 2015-10
libreoffice = hiPrio libreoffice-still; libreoffice = hiPrio libreoffice-still;
@ -18578,15 +18469,12 @@ with pkgs;
}; };
kodiPlain = callPackage ../applications/video/kodi { }; kodiPlain = callPackage ../applications/video/kodi { };
xbmcPlain = kodiPlain;
kodiPlugins = recurseIntoAttrs (callPackage ../applications/video/kodi/plugins.nix {}); kodiPlugins = recurseIntoAttrs (callPackage ../applications/video/kodi/plugins.nix {});
xbmcPlugins = kodiPlugins;
kodi = wrapKodi { kodi = wrapKodi {
kodi = kodiPlain; kodi = kodiPlain;
}; };
xbmc = kodi;
kodi-retroarch-advanced-launchers = kodi-retroarch-advanced-launchers =
callPackage ../misc/emulators/retroarch/kodi-advanced-launchers.nix { callPackage ../misc/emulators/retroarch/kodi-advanced-launchers.nix {
@ -18981,10 +18869,6 @@ with pkgs;
physfs = physfs_2; physfs = physfs_2;
}; };
# these are here for compatibility
d1x_rebirth = dxx-rebirth;
d2x_rebirth = dxx-rebirth;
inherit (callPackages ../games/dxx-rebirth/assets.nix { }) inherit (callPackages ../games/dxx-rebirth/assets.nix { })
descent1-assets descent1-assets
descent2-assets; descent2-assets;