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

Merge pull request #39686 from matthewbauer/new-aliases

Browse Source 
all-packages: move aliases to aliases.nix
This commit is contained in:
Matthew Justin Bauer 2018-05-01 14:13:07 -05:00 committed by GitHub
commit e9be7fcb00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 291 additions and 340 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/networking/remote/citrix-receiver/default.nix
View File

@ -23,7 +23,7 @@
, alsaLib
, libidn
, zlib
, version ? null
, version ? "13.9.0"
}:
let

6
pkgs/development/interpreters/dart/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, unzip, version }:
{ stdenv, fetchurl, unzip, version ? "1.24.3" }:
let
@ -57,9 +57,9 @@ stdenv.mkDerivation {
'';
libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ];
dontStrip = true;
meta = {
platforms = [ "i686-linux" "x86_64-linux" ];
homepage = https://www.dartlang.org/;

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

@ -2,7 +2,7 @@
{ stdenv, fetchurl, lib, file
, pkgconfig, autoconf
, glib, dbus-glib, gtkVersion
, glib, dbus-glib, gtkVersion ? "3"
, gtk2 ? null, libindicator-gtk2 ? null, libdbusmenu-gtk2 ? null
, gtk3 ? null, libindicator-gtk3 ? null, libdbusmenu-gtk3 ? null
, python2Packages, gobjectIntrospection, vala

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

@ -3,7 +3,7 @@
{ stdenv, fetchurl, lib, file
, pkgconfig, autoconf
, glib, dbus-glib, libdbusmenu-glib
, gtkVersion, gtk2 ? null, gtk3 ? null
, gtkVersion ? "3", gtk2 ? null, gtk3 ? null
, pythonPackages, gobjectIntrospection, vala, gnome-doc-utils
, monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null
}:

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

@ -1,6 +1,6 @@
{ stdenv, fetchurl, lib, file
, pkgconfig
, gtkVersion, gtk2 ? null, gtk3 ? null }:
, gtkVersion ? "3", gtk2 ? null, gtk3 ? null }:
with lib;

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

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, pkgconfig
, abiVersion
, abiVersion ? "6"
, mouseSupport ? false
, unicode ? true
, enableStatic ? stdenv.hostPlatform.useAndroidPrebuilt

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

@ -17,15 +17,27 @@ let
dontDistribute alias
else alias;
# Make sure that we are not shadowing something from
# all-packages.nix.
checkInPkgs = n: alias: if builtins.hasAttr n self
then throw "Alias ${n} is still in all-packages.nix"
else alias;
mapAliases = aliases:
lib.mapAttrs (n: alias: removeDistribute (removeRecurseForDerivations alias)) aliases;
lib.mapAttrs (n: alias: removeDistribute
(removeRecurseForDerivations
(checkInPkgs n alias)))
aliases;
in
### Deprecated aliases - for backward compatibility
mapAliases (rec {
PPSSPP = ppsspp; # added 2017-10-01
QmidiNet = qmidinet; # added 2016-05-22
accounts-qt = libsForQt5.accounts-qt; # added 2015-12-19
adobeReader = adobe-reader; # added 2013-11-04
ag = silver-searcher; # added 2018-04-25
aircrackng = aircrack-ng; # added 2016-01-14
ammonite-repl = ammonite; # added 2017-05-02
arduino_core = arduino-core; # added 2015-02-04
@ -48,95 +60,129 @@ mapAliases (rec {
cupsBjnp = cups-bjnp; # added 2016-01-02
cups_filters = cups-filters; # added 2016-08
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_libs = dbus; # added 2018-04-25
dbus_tools = dbus.out; # added 2018-04-25
deadbeef-mpris2-plugin = deadbeefPlugins.mpris2; # added 2018-02-23
deadpixi-sam = deadpixi-sam-unstable;
debian_devscripts = debian-devscripts; # added 2016-03-23
desktop_file_utils = desktop-file-utils; # added 2018-02-25
devicemapper = lvm2; # added 2018-04-25
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
dwarf_fortress = dwarf-fortress; # added 2016-01-23
emacs25Macport_25_1 = emacs25Macport; # added 2018-04-25
enblendenfuse = enblend-enfuse; # 2015-09-30
evolution_data_server = evolution-data-server; # added 2018-02-25
etcdctl = etcd; # added 2018-04-25
exfat-utils = exfat; # 2015-09-11
fam = gamin; # added 2018-04-25
ffadoFull = ffado; # added 2018-05-01
fftwFloat = fftwSinglePrec; # 2018-04-25
firefox-esr-wrapper = firefox-esr; # 2016-01
firefox-wrapper = firefox; # 2016-01
firefoxWrapper = firefox; # 2015-09
flameGraph = flamegraph; # added 2018-04-25
font-awesome-ttf = font-awesome_4; # 2018-02-25
foomatic_filters = foomatic-filters; # 2016-08
fuse_exfat = exfat; # 2015-09-11
gettextWithExpat = gettext; # 2016-02-19
fuseki = apache-jena-fuseki; # added 2018-04-25
gccApple = throw "gccApple is no longer supported"; # added 2018-04-25
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
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
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
gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25
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_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_python = gst-python; # added 2017-02
gtk_doc = gtk-doc; # added 2018-02-25
guileCairo = guile-cairo; # 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
guile_lib = guile-lib; # added 2017-09-24
guile_ncurses = guile-ncurses; # added 2017-09-24
gupnp_av = gupnp-av; # added 2018-02-25
gupnp_dlna = gupnp-dlna; # added 2018-02-25
gupnp_igd = gupnp-igd; # added 2018-02-25
gupnptools = gupnp-tools; # added 2015-12-19
gnustep-make = gnustep.make; # added 2016-7-6
heimdalFull = heimdal; # added 2018-05-01
hicolor_icon_theme = hicolor-icon-theme; # added 2018-02-25
htmlTidy = html-tidy; # added 2014-12-06
iana_etc = iana-etc; # added 2017-03-08
idea = jetbrains; # added 2017-04-03
inotifyTools = inotify-tools;
jack2Full = jack2; # added 2018-04-25
joseki = apache-jena-fuseki; # added 2016-02-28
json_glib = json-glib; # added 2018-02-25
kdiff3-qt5 = kdiff3; # added 2017-02-18
keepassx2-http = keepassx-reboot; # added 2016-10-17
keepassx-reboot = keepassx-community; # added 2017-02-01
keepass-keefox = keepass-keepassrpc; # backwards compatibility alias, added 2018-02
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
krename-qt5 = krename; # added 2017-02-18
kvm = qemu_kvm; # added 2018-04-25
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_gtk3 = libcanberra-gtk3; # added 2018-02-25
libcap_manpages = libcap.doc; # 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
libdbusmenu_qt5 = libsForQt5.libdbusmenu; # added 2015-12-19
libdbusmenu-glib = libdbusmenu; # added 2018-05-01
libgnome_keyring = libgnome-keyring; # added 2018-02-25
libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25
libgumbo = gumbo; # added 2018-01-21
libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux || hostPlatform.libc != "glibc") gettext; # added 2018-03-14
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
librecad2 = librecad; # backwards compatibility alias, added 2015-10
libsysfs = sysfsutils; # added 2018-04-25
libtidy = html-tidy; # added 2014-12-21
libudev = udev; # added 2018-04-25
links = links2; # added 2016-01-31
lttngTools = lttng-tools; # 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_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
manpages = man-pages; # added 2015-12-06
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
mlt-qt5 = libsForQt5.mlt; # added 2015-12-19
mobile_broadband_provider_info = mobile-broadband-provider-info; # added 2018-02-25
module_init_tools = kmod; # added 2016-04-22
msf = metasploit; # added 2018-04-25
mssys = ms-sys; # added 2015-12-13
multipath_tools = multipath-tools; # added 2016-01-21
mupen64plus1_5 = mupen64plus; # added 2016-02-12
mysql = mariadb; # added 2018-04-25
mysqlWorkbench = mysql-workbench; # added 2017-01-19
nagiosPluginsOfficial = monitoring-plugins;
ncat = nmap; # added 2016-01-26
networkmanager_fortisslvpn = networkmanager-fortisslvpn; # added 2018-02-25
networkmanager_iodine = networkmanager-iodine; # added 2018-02-25
@ -144,33 +190,43 @@ mapAliases (rec {
networkmanager_openconnect = networkmanager-openconnect; # added 2018-02-25
networkmanager_openvpn = networkmanager-openvpn; # 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
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
openexr_ctl = ctl; # added 2018-04-25
openssh_with_kerberos = openssh; # added 2018-01-28
owncloudclient = owncloud-client; # added 2016-08
p11_kit = p11-kit; # added 2018-02-25
pgp-tools = signing-party; # added 2017-03-26
pidgin-with-plugins = pidgin; # added 2016-06
pidginlatexSF = pidgin-latex; # added 2014-11-02
pidginlatex = pidgin-latex; # added 2018-01-08
pidginlatexSF = pidgin-latex; # added 2014-11-02
pidginmsnpecan = pidgin-msn-pecan; # added 2018-01-08
pidginotr = pidgin-otr; # 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
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
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
pulseaudioLight = pulseaudio; # added 2018-04-25
qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19
QmidiNet = qmidinet; # added 2016-05-22
qt_gstreamer = qt-gstreamer; # added 2017-02
qt_gstreamer1 = qt-gstreamer1; # added 2017-02
quake3game = ioquake3; # added 2016-01-14
qwt6 = libsForQt5.qwt; # added 2015-12-19
rdiff_backup = rdiff-backup; # added 2014-11-23
rdmd = dtools; # added 2017-08-19
redland = librdf_redland; # added 2018-04-25
robomongo = robo3t; #added 2017-09-28
rssglx = rss-glx; #added 2015-03-25
ruby_2_0_0 = throw "deprecated 2018-0213: use a newer version of ruby";
@ -181,24 +237,33 @@ mapAliases (rec {
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";
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
saneBackends = sane-backends; # added 2016-01-02
saneBackendsGit = sane-backends-git; # added 2016-01-02
saneFrontends = sane-frontends; # added 2016-01-02
scim = sc-im; # added 2016-01-22
scollector = bosun; # added 2018-04-25
shared_mime_info = shared-mime-info; # added 2018-02-25
skrooge2 = skrooge; # added 2017-02-18
skype = skypeforlinux; # added 2017-07-27
slurm-llnl = slurm; # renamed July 2017
slurm-llnl-full = slurm-full; # renamed July 2017
slurm-full = slurm; # added 2018-05-1
smbclient = samba; # added 2018-04-25
spaceOrbit = space-orbit; # addewd 2016-05-23
speech_tools = speech-tools; # added 2018-04-25
speedtest_cli = speedtest-cli; # added 2015-02-17
spice_gtk = spice-gtk; # added 2018-02-25
spice_protocol = spice-protocol; # added 2018-02-25
sqliteInteractive = sqlite-interactive; # added 2014-12-06
sshfs = sshfs-fuse; # added 2017-08-14
sshfsFuse = sshfs-fuse; # added 2016-09
suil-qt5 = suil; # added 2018-05-01
surf-webkit2 = surf; # added 2017-04-02
tahoelafs = tahoe-lafs; # added 2018-03-26
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_gabble = telepathy-gabble; # added 2018-02-25
telepathy_glib = telepathy-glib; # added 2018-02-25
@ -214,9 +279,12 @@ mapAliases (rec {
tex-gyre-schola-math = tex-gyre-math.schola; # added 2018-04-03
tex-gyre-termes-math = tex-gyre-math.termes; # added 2018-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_remote_gtk = transmission-remote-gtk; # added 2018-01-06
tshark = wireshark-cli; # added 2018-04-25
ucsFonts = ucs-fonts; # added 2016-07-15
udev = systemd; # added 2018-04-25
ultrastardx-beta = ultrastardx; # added 2017-08-12
usb_modeswitch = usb-modeswitch; # added 2016-05-10
vimbWrapper = vimb; # added 2015-01
@ -226,8 +294,13 @@ mapAliases (rec {
wineStaging = wine-staging; # added 2018-01-08
winusb = woeusb; # added 2017-12-22
x11 = xlibsWrapper; # added 2015-09
xbmc = kodi; # added 2018-04-25
xbmcPlain = kodiPlain; # added 2018-04-25
xbmcPlugins = kodiPlugins; # added 2018-04-25
xmonad_log_applet_gnome3 = xmonad_log_applet; # added 2018-05-01
xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09
xlibs = xorg; # added 2015-09
yacc = bison; # added 2018-04-25
youtubeDL = youtube-dl; # added 2014-10-26
# added 2017-05-27
@ -245,6 +318,20 @@ mapAliases (rec {
ocamlPackages_4_00_1 ocamlPackages_4_01_0 ocamlPackages_4_02
ocamlPackages_4_03
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
ocaml_3_08_0 = ocamlPackages_3_08_0.ocaml;
ocaml_3_10_0 = ocamlPackages_3_10_0.ocaml;

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

File diff suppressed because it is too large Load Diff

4
pkgs/top-level/release.nix
View File

@ -43,7 +43,7 @@ let
jobs.ghc.x86_64-darwin
jobs.git.x86_64-darwin
jobs.go.x86_64-darwin
jobs.mysql.x86_64-darwin
jobs.mariadb.x86_64-darwin
jobs.nix-repl.x86_64-darwin
jobs.nix.x86_64-darwin
jobs.nox.x86_64-darwin
@ -99,7 +99,7 @@ let
jobs.thunderbird.x86_64-linux
# Ensure that basic stuff works on darwin
jobs.git.x86_64-darwin
jobs.mysql.x86_64-darwin
jobs.mariadb.x86_64-darwin
jobs.vim.x86_64-darwin
# Ensure that UI stuff works on darwin
jobs.inkscape.x86_64-darwin

3
pkgs/top-level/stage.nix
View File

@ -97,7 +97,8 @@ let
res self;
in res;
aliases = self: super: import ./aliases.nix super;
aliases = self: super: if config.skipAliases or false then {}
else import ./aliases.nix super;
# stdenvOverrides is used to avoid having multiple of versions
# of certain dependencies that were used in bootstrapping the