diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 128 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 521 | ||||
| -rw-r--r-- | pkgs/top-level/lua-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/release.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/stage.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/unix-tools.nix | 13 |
7 files changed, 312 insertions, 361 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8b0812f8305..fdc6b58346b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -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,128 @@ 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 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 - go-pup = pup; # added 2017-12-19 - googleAuthenticator = google-authenticator; # added 2016-10-16 - gnome_doc_utils = gnome-doc-utils; # 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 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 netcat-openbsd = libressl.nc; # added 2018-04-25 networkmanager_fortisslvpn = networkmanager-fortisslvpn; # added 2018-02-25 @@ -145,34 +190,44 @@ 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 pass-otp = pass.withExtensions (ext: [ext.pass-otp]); # added 2018-05-04 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"; @@ -183,24 +238,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 @@ -216,9 +280,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 @@ -228,8 +295,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 @@ -247,6 +319,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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d6759098dfa..ffaaa1aa3ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -961,7 +961,6 @@ with pkgs; calamares = libsForQt5.callPackage ../tools/misc/calamares { python = python3; boost = pkgs.boost.override { python = python3; }; - libyamlcpp = callPackage ../development/libraries/libyaml-cpp { inherit boost; }; }; capstone = callPackage ../development/libraries/capstone { }; @@ -1634,13 +1633,13 @@ with pkgs; ciopfs = callPackage ../tools/filesystems/ciopfs { }; - citrix_receiver = hiPrio citrix_receiver_13_9_0; - citrix_receiver_13_9_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.9.0"; }; - citrix_receiver_13_8_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.8.0"; }; - citrix_receiver_13_7_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.7.0"; }; - citrix_receiver_13_6_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.6.0"; }; - citrix_receiver_13_5_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.5.0"; }; - citrix_receiver_13_4_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.4.0"; }; + citrix_receiver = callPackage ../applications/networking/remote/citrix-receiver { }; + citrix_receiver_13_9_0 = citrix_receiver.override { version = "13.9.0"; }; + citrix_receiver_13_8_0 = citrix_receiver.override { version = "13.8.0"; }; + citrix_receiver_13_7_0 = citrix_receiver.override { version = "13.7.0"; }; + citrix_receiver_13_6_0 = citrix_receiver.override { version = "13.6.0"; }; + citrix_receiver_13_5_0 = citrix_receiver.override { version = "13.5.0"; }; + citrix_receiver_13_4_0 = citrix_receiver.override { version = "13.4.0"; }; citra = libsForQt5.callPackage ../misc/emulators/citra { }; @@ -2349,9 +2348,6 @@ with pkgs; flamegraph = callPackage ../development/tools/flamegraph { }; - # Awkward historical capitalization for flamegraph. Remove eventually - flameGraph = flamegraph; - flvtool2 = callPackage ../tools/video/flvtool2 { }; fmbt = callPackage ../development/tools/fmbt { @@ -2361,7 +2357,7 @@ with pkgs; fontforge = lowPrio (callPackage ../tools/misc/fontforge { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }); - fontforge-gtk = callPackage ../tools/misc/fontforge { + fontforge-gtk = fontforge.override { withSpiro = true; withGTK = true; gtk2 = gtk2-x11; @@ -2483,7 +2479,7 @@ with pkgs; gazebo7 = callPackage ../applications/science/robotics/gazebo { }; - gazebo7-headless = callPackage ../applications/science/robotics/gazebo { withHeadless = true; }; + gazebo7-headless = gazebo7.override { withHeadless = true; }; }; @@ -2732,11 +2728,11 @@ with pkgs; grub2_full = callPackage ../tools/misc/grub/2.0x.nix { }; - grub2_efi = grub2_full.override { + grub2_efi = grub2.override { efiSupport = true; }; - grub2_light = grub2_full.override { + grub2_light = grub2.override { zfsSupport = false; }; @@ -2764,7 +2760,6 @@ with pkgs; gt5 = callPackage ../tools/system/gt5 { }; gtest = callPackage ../development/libraries/gtest {}; - gmock = gtest; gbenchmark = callPackage ../development/libraries/gbenchmark {}; gtkdatabox = callPackage ../development/libraries/gtkdatabox {}; @@ -3413,6 +3408,14 @@ with pkgs; nodejs-9_x = callPackage ../development/web/nodejs/v9.nix {}; nodejs-slim-9_x = callPackage ../development/web/nodejs/v9.nix { enableNpm = false; }; + nodejs-10_x = callPackage ../development/web/nodejs/v10.nix { + openssl = openssl_1_1_0; + }; + nodejs-slim-10_x = callPackage ../development/web/nodejs/v10.nix { + enableNpm = false; + openssl = openssl_1_1_0; + }; + nodePackages_8_x = callPackage ../development/node-packages/default-v8.nix { nodejs = pkgs.nodejs-8_x; }; @@ -3423,9 +3426,6 @@ with pkgs; nodePackages = nodePackages_6_x; - # Can be used as a user shell - nologin = shadow; - npm2nix = nodePackages.npm2nix; file-rename = callPackage ../tools/filesystems/file-rename { }; @@ -3521,7 +3521,7 @@ with pkgs; libiberty = callPackage ../development/libraries/libiberty { }; - libiberty_static = callPackage ../development/libraries/libiberty { staticBuild = true; }; + libiberty_static = libiberty.override { staticBuild = true; }; libibverbs = callPackage ../development/libraries/libibverbs { }; @@ -3593,8 +3593,6 @@ with pkgs; lzip = callPackage ../tools/compression/lzip { }; - lzma = xz; - xz = callPackage ../tools/compression/xz { }; lz4 = callPackage ../tools/compression/lz4 { }; @@ -3752,12 +3750,14 @@ with pkgs; mitmproxy = callPackage ../tools/networking/mitmproxy { }; - mjpegtoolsFull = callPackage ../tools/video/mjpegtools { }; - - mjpegtools = self.mjpegtoolsFull.override { + mjpegtools = callPackage ../tools/video/mjpegtools { withMinimal = true; }; + mjpegtoolsFull = mjpegtools.override { + withMinimal = false; + }; + mkcue = callPackage ../tools/cd-dvd/mkcue { }; mkpasswd = hiPrio (callPackage ../tools/security/mkpasswd { }); @@ -3804,7 +3804,6 @@ with pkgs; mscgen = callPackage ../tools/graphics/mscgen { }; metasploit = callPackage ../tools/security/metasploit { }; - msf = metasploit; ms-sys = callPackage ../tools/misc/ms-sys { }; @@ -3983,7 +3982,6 @@ with pkgs; nifskope = callPackage ../tools/graphics/nifskope { }; nilfs-utils = callPackage ../tools/filesystems/nilfs-utils {}; - nilfs_utils = nilfs-utils; nitrogen = callPackage ../tools/X11/nitrogen {}; @@ -3999,7 +3997,7 @@ with pkgs; nmap = callPackage ../tools/security/nmap { }; - nmap-graphical = callPackage ../tools/security/nmap { + nmap-graphical = nmap.override { graphicalSupport = true; }; @@ -4343,28 +4341,27 @@ with pkgs; philter = callPackage ../tools/networking/philter { }; - pinentry = pinentry_ncurses.override { - inherit gtk2; + pinentry = callPackage ../tools/security/pinentry { + libcap = if stdenv.isDarwin then null else libcap; }; - pinentry_ncurses = callPackage ../tools/security/pinentry { - libcap = if stdenv.isDarwin then null else libcap; + pinentry_ncurses = pinentry.override { gtk2 = null; }; - pinentry_emacs = pinentry_ncurses.override { + pinentry_emacs = pinentry.override { enableEmacs = true; }; - pinentry_gnome = pinentry_ncurses.override { + pinentry_gnome = pinentry.override { gcr = gnome3.gcr; }; - pinentry_qt4 = pinentry_ncurses.override { + pinentry_qt4 = pinentry.override { qt = qt4; }; - pinentry_qt5 = pinentry_ncurses.override { + pinentry_qt5 = pinentry.override { qt = qt5.qtbase; }; @@ -4387,7 +4384,7 @@ with pkgs; plan9port = callPackage ../tools/system/plan9port { }; platformioPackages = callPackage ../development/arduino/platformio { }; - platformio = platformioPackages.platformio-chrootenv.override {}; + platformio = platformioPackages.platformio-chrootenv; platinum-searcher = callPackage ../tools/text/platinum-searcher { }; @@ -4885,7 +4882,6 @@ with pkgs; }; silver-searcher = callPackage ../tools/text/silver-searcher { }; - ag = self.silver-searcher; simpleproxy = callPackage ../tools/networking/simpleproxy { }; @@ -5065,8 +5061,8 @@ with pkgs; }); strongswan = callPackage ../tools/networking/strongswan { }; - strongswanTNC = callPackage ../tools/networking/strongswan { enableTNC = true; }; - strongswanNM = callPackage ../tools/networking/strongswan { enableNetworkManager = true; }; + strongswanTNC = strongswan.override { enableTNC = true; }; + strongswanNM = strongswan.override { enableNetworkManager = true; }; su = shadow.su; @@ -5525,8 +5521,6 @@ with pkgs; tradcpp = callPackage ../development/tools/tradcpp { }; - trang = self.jing-trang; - tre = callPackage ../development/libraries/tre { }; ts = callPackage ../tools/system/ts { }; @@ -5887,15 +5881,13 @@ with pkgs; runtimeShell = "${runtimeShellPackage}/bin/bash"; runtimeShellPackage = bash; - bash = lowPrio (callPackage ../shells/bash/4.4.nix { - texinfo = null; - interactive = stdenv.isCygwin; # patch for cygwin requires readline support - }); + bash = lowPrio (callPackage ../shells/bash/4.4.nix { }); # WARNING: this attribute is used by nix-shell so it shouldn't be removed/renamed - bashInteractive = appendToName "interactive" (callPackage ../shells/bash/4.4.nix { + bashInteractive = callPackage ../shells/bash/4.4.nix { interactive = true; - }); + withDocs = true; + }; bash-completion = callPackage ../shells/bash/bash-completion { }; @@ -6148,8 +6140,6 @@ with pkgs; stripped = false; })); - gccApple = throw "gccApple is no longer supported"; - libstdcxxHook = makeSetupHook { substitutions = { gcc = gcc-unwrapped; }; } ../development/compilers/gcc/libstdc++-hook.sh; @@ -6175,7 +6165,6 @@ with pkgs; libc = libcCross1; }; in wrapCCWith { - name = "gcc-cross-wrapper"; cc = gccFun { # copy-pasted inherit noSysDirs; @@ -6510,18 +6499,19 @@ with pkgs; hugs = callPackage ../development/interpreters/hugs { }; + bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "10"; }; + openjdk8 = if stdenv.isDarwin then callPackage ../development/compilers/openjdk/darwin/8.nix { } else callPackage ../development/compilers/openjdk/8.nix { - bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "8"; }; + bootjdk = bootjdk.override { version = "8"; }; inherit (gnome2) GConf gnome_vfs; }; openjdk10 = callPackage ../development/compilers/openjdk/10.nix { - bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "10"; }; inherit (gnome2) GConf gnome_vfs; }; @@ -6744,7 +6734,7 @@ with pkgs; xlibsWrapper = null; }; - mitschemeX11 = callPackage ../development/compilers/mit-scheme { + mitschemeX11 = mitscheme.override { texLive = texlive.combine { inherit (texlive) scheme-small; }; texinfo = texinfo5; enableX11 = true; @@ -7103,7 +7093,7 @@ with pkgs; gtk2 = gtk2-x11; }; - lxappearance-gtk3 = callPackage ../desktops/lxde/core/lxappearance { + lxappearance-gtk3 = lxappearance.override { withGtk3 = true; }; @@ -7204,7 +7194,7 @@ with pkgs; octaveHg = lowPrio (callPackage ../development/interpreters/octave/hg.nix hgOctaveOptions); }) octave octaveHg; - octaveFull = (lowPrio (callPackage ../development/interpreters/octave { + octaveFull = (lowPrio (octave.override { qt = qt4; overridePlatforms = ["x86_64-linux" "x86_64-darwin"]; openblas = if stdenv.isDarwin then openblasCompat else openblas; @@ -7258,8 +7248,6 @@ with pkgs; picolisp = callPackage ../development/interpreters/picolisp {}; - pltScheme = racket; # just to be sure - polyml = callPackage ../development/compilers/polyml { }; polyml56 = callPackage ../development/compilers/polyml/5.6.nix { }; @@ -7436,22 +7424,21 @@ with pkgs; amdadlsdk = callPackage ../development/misc/amdadl-sdk { }; - amdappsdk26 = callPackage ../development/misc/amdapp-sdk { + amdappsdk26 = amdappsdk.override { version = "2.6"; }; - amdappsdk27 = callPackage ../development/misc/amdapp-sdk { + amdappsdk27 = amdappsdk.override { version = "2.7"; }; - amdappsdk28 = callPackage ../development/misc/amdapp-sdk { + amdappsdk28 = amdappsdk.override { version = "2.8"; }; - amdappsdk = amdappsdk28; + amdappsdk = callPackage ../development/misc/amdapp-sdk { }; - amdappsdkFull = callPackage ../development/misc/amdapp-sdk { - version = "2.8"; + amdappsdkFull = amdappsdk.override { samples = true; }; @@ -7548,17 +7535,15 @@ with pkgs; antlr4_7 = callPackage ../development/tools/parsing/antlr/4.7.nix { }; antlr4 = antlr4_7; - ant = apacheAnt; - apacheAnt = callPackage ../development/tools/build-managers/apache-ant { }; - apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { }; + ant = apacheAnt; - apacheKafka = apacheKafka_1_0; - apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; }; - apacheKafka_0_10 = callPackage ../servers/apache-kafka { majorVersion = "0.10"; }; - apacheKafka_0_11 = callPackage ../servers/apache-kafka { majorVersion = "0.11"; }; - apacheKafka_1_0 = callPackage ../servers/apache-kafka { majorVersion = "1.0"; }; + apacheKafka_1_0 = apacheKafka.override { majorVersion = "1.0"; }; + apacheKafka_0_9 = apacheKafka.override { majorVersion = "0.9"; }; + apacheKafka_0_10 = apacheKafka.override { majorVersion = "0.10"; }; + apacheKafka_0_11 = apacheKafka.override { majorVersion = "0.11"; }; + apacheKafka = callPackage ../servers/apache-kafka { }; kt = callPackage ../tools/misc/kt {}; @@ -7918,8 +7903,6 @@ with pkgs; flexcpp = callPackage ../development/tools/parsing/flexc++ { }; - m4 = gnum4; - geis = callPackage ../development/libraries/geis { inherit (xorg) libX11 libXext libXi libXtst; }; @@ -7935,6 +7918,7 @@ with pkgs; gnome-usage = callPackage ../applications/misc/gnome-usage {}; gnum4 = callPackage ../development/tools/misc/gnum4 { }; + m4 = gnum4; gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { }; gnumake3 = gnumake382; @@ -8245,7 +8229,7 @@ with pkgs; remake = callPackage ../development/tools/build-managers/remake { }; retdec = callPackage ../development/tools/analysis/retdec { }; - retdec-full = callPackage ../development/tools/analysis/retdec { + retdec-full = retdec.override { withPEPatterns = true; }; @@ -8424,8 +8408,6 @@ with pkgs; }; xxdiff-tip = libsForQt5.callPackage ../development/tools/misc/xxdiff/tip.nix { }; - yacc = bison; - yaml2json = callPackage ../development/tools/yaml2json { }; ycmd = callPackage ../development/tools/misc/ycmd { @@ -8750,11 +8732,6 @@ with pkgs; 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 { }; - # FIXME: deprecate these. - dbus_tools = dbus.out; - dbus_libs = dbus; - dbus_daemon = dbus.daemon; - makeDBusConf = { suidHelper, serviceDirectories }: callPackage ../development/libraries/dbus/make-dbus-conf.nix { inherit suidHelper serviceDirectories; @@ -8977,8 +8954,6 @@ with pkgs; funambol = callPackage ../development/libraries/funambol { }; - fam = gamin; - gamin = callPackage ../development/libraries/gamin { }; ganv = callPackage ../development/libraries/ganv { }; @@ -9030,8 +9005,6 @@ with pkgs; gettext = callPackage ../development/libraries/gettext { }; - gflags = google-gflags; - gf2x = callPackage ../development/libraries/gf2x {}; gd = callPackage ../development/libraries/gd { @@ -9093,7 +9066,7 @@ with pkgs; stdenv = crossLibcStdenv; }; - muslCross = callPackage ../os-specific/linux/musl { + muslCross = musl.override { stdenv = crossLibcStdenv; }; @@ -9190,22 +9163,6 @@ with pkgs; 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 { bison = bison2; }; @@ -9372,13 +9329,15 @@ with pkgs; gtk-sharp-beans = callPackage ../development/libraries/gtk-sharp-beans { }; gtk-mac-integration = callPackage ../development/libraries/gtk-mac-integration { - gtk = gtk2; + gtk = gtk3; }; - gtk-mac-integration-gtk3 = callPackage ../development/libraries/gtk-mac-integration { - gtk = gtk3; + gtk-mac-integration-gtk2 = gtk-mac-integration.override { + gtk = gtk2; }; + gtk-mac-integration-gtk3 = gtk-mac-integration; + gtk-mac-bundler = callPackage ../development/tools/gtk-mac-bundler {}; gtksourceview = gtksourceview3; @@ -9405,15 +9364,11 @@ with pkgs; 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 { }; - libheimdal = heimdalFull.override { type = "lib"; }; + heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { }; + libheimdal = heimdal.override { type = "lib"; }; harfbuzz = callPackage ../development/libraries/harfbuzz { }; - harfbuzz-icu = callPackage ../development/libraries/harfbuzz { + harfbuzz-icu = harfbuzz.override { withIcu = true; withGraphite2 = true; }; @@ -9463,7 +9418,7 @@ with pkgs; hwloc = callPackage ../development/libraries/hwloc {}; - hwloc-nox = callPackage ../development/libraries/hwloc { + hwloc-nox = hwloc.override { x11Support = false; }; @@ -9600,10 +9555,11 @@ with pkgs; kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { }; - krb5Full = callPackage ../development/libraries/kerberos/krb5.nix { + krb5 = callPackage ../development/libraries/kerberos/krb5.nix { inherit (darwin) bootstrap_cmds; }; - libkrb5 = krb5Full.override { + krb5Full = krb5; + libkrb5 = krb5.override { fetchurl = fetchurlBoot; type = "lib"; }; @@ -9662,8 +9618,9 @@ with pkgs; libaom = callPackage ../development/libraries/libaom { }; - libappindicator-gtk2 = callPackage ../development/libraries/libappindicator { gtkVersion = "2"; }; - libappindicator-gtk3 = callPackage ../development/libraries/libappindicator { gtkVersion = "3"; }; + libappindicator-gtk2 = libappindicator.override { gtkVersion = "2"; }; + libappindicator-gtk3 = libappindicator.override { gtkVersion = "3"; }; + libappindicator = callPackage ../development/libraries/libappindicator { }; libarchive = callPackage ../development/libraries/libarchive { }; @@ -9795,18 +9752,16 @@ with pkgs; libdbi = callPackage ../development/libraries/libdbi { }; - libdbiDriversBase = callPackage ../development/libraries/libdbi-drivers { + libdbiDriversBase = libdbiDrivers.override { mysql = null; sqlite = null; }; - libdbiDrivers = libdbiDriversBase.override { - inherit sqlite mysql; - }; + libdbiDrivers = callPackage ../development/libraries/libdbi-drivers { }; - libdbusmenu-glib = callPackage ../development/libraries/libdbusmenu { }; - libdbusmenu-gtk2 = callPackage ../development/libraries/libdbusmenu { gtkVersion = "2"; }; - libdbusmenu-gtk3 = callPackage ../development/libraries/libdbusmenu { gtkVersion = "3"; }; + libdbusmenu = callPackage ../development/libraries/libdbusmenu { }; + libdbusmenu-gtk2 = libdbusmenu.override { gtkVersion = "2"; }; + libdbusmenu-gtk3 = libdbusmenu.override { gtkVersion = "3"; }; libdbusmenu_qt = callPackage ../development/libraries/libdbusmenu-qt { }; @@ -9885,7 +9840,7 @@ with pkgs; libfilezilla = callPackage ../development/libraries/libfilezilla { }; libfm = callPackage ../development/libraries/libfm { }; - libfm-extra = callPackage ../development/libraries/libfm { + libfm-extra = libfm.override { extraOnly = true; }; @@ -9930,8 +9885,6 @@ with pkgs; liblo = callPackage ../development/libraries/liblo { }; - liblrdf = librdf; - liblscp = callPackage ../development/libraries/liblscp { }; libe-book = callPackage ../development/libraries/libe-book {}; @@ -10028,11 +9981,13 @@ with pkgs; libimobiledevice = callPackage ../development/libraries/libimobiledevice { }; - libindicate-gtk2 = callPackage ../development/libraries/libindicate { gtkVersion = "2"; }; - libindicate-gtk3 = callPackage ../development/libraries/libindicate { gtkVersion = "3"; }; + libindicate-gtk2 = libindicate.override { gtkVersion = "2"; }; + libindicate-gtk3 = libindicate.override { gtkVersion = "3"; }; + libindicate = callPackage ../development/libraries/libindicate { }; - libindicator-gtk2 = callPackage ../development/libraries/libindicator { gtkVersion = "2"; }; - libindicator-gtk3 = callPackage ../development/libraries/libindicator { gtkVersion = "3"; }; + libindicator-gtk2 = libindicator.override { gtkVersion = "2"; }; + libindicator-gtk3 = libindicator.override { gtkVersion = "3"; }; + libindicator = callPackage ../development/libraries/libindicator { }; libiodbc = callPackage ../development/libraries/libiodbc { useGTK = config.libiodbc.gtk or false; @@ -10626,7 +10581,7 @@ with pkgs; luabind = callPackage ../development/libraries/luabind { lua = lua5_1; }; - luabind_luajit = callPackage ../development/libraries/luabind { lua = luajit; }; + luabind_luajit = luabind.override { lua = luajit; }; luaffi = callPackage ../development/libraries/luaffi { lua = lua5_1; }; @@ -10784,13 +10739,13 @@ with pkgs; notify-sharp = callPackage ../development/libraries/notify-sharp { }; - ncurses5 = callPackage ../development/libraries/ncurses { + ncurses5 = ncurses.override { abiVersion = "5"; }; - ncurses6 = callPackage ../development/libraries/ncurses { + ncurses6 = ncurses.override { abiVersion = "6"; }; - ncurses = ncurses6; + ncurses = callPackage ../development/libraries/ncurses { }; neardal = callPackage ../development/libraries/neardal { }; @@ -10864,8 +10819,6 @@ with pkgs; oobicpl = callPackage ../development/libraries/science/biology/oobicpl { }; - openal = self.openalSoft; - openalSoft = callPackage ../development/libraries/openal-soft { inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox; }; @@ -10874,8 +10827,6 @@ with pkgs; opencascade = callPackage ../development/libraries/opencascade { }; - opencascade_oce = opencascade; - opencl-headersGen = v: callPackage ../development/libraries/opencl-headers { version = v; }; opencl-headers_1_2 = opencl-headersGen "12"; opencl-headers_2_2 = opencl-headersGen "22"; @@ -10904,9 +10855,6 @@ with pkgs; enableCuda = false; }; - # this ctl version is needed by openexr_viewers - openexr_ctl = ctl; - openexr = callPackage ../development/libraries/openexr { }; openexrid-unstable = callPackage ../development/libraries/openexrid-unstable { }; @@ -11052,8 +11000,6 @@ with pkgs; poker-eval = callPackage ../development/libraries/poker-eval { }; - polarssl = mbedtls; - polkit = callPackage ../development/libraries/polkit { }; polkit_qt4 = callPackage ../development/libraries/polkit-qt-1/qt-4.nix { }; @@ -11121,7 +11067,7 @@ with pkgs; qbs = callPackage ../development/tools/build-managers/qbs { }; qca2 = callPackage ../development/libraries/qca2 { qt = qt4; }; - qca2-qt5 = callPackage ../development/libraries/qca2 { qt = qt5.qtbase; }; + qca2-qt5 = qca2.override { qt = qt5.qtbase; }; qimageblitz = callPackage ../development/libraries/qimageblitz {}; @@ -11288,9 +11234,7 @@ with pkgs; withQt5 = true; }; - phonon-backend-vlc = callPackage ../development/libraries/phonon/backends/vlc.nix { - withQt5 = true; - }; + phonon-backend-vlc = callPackage ../development/libraries/phonon/backends/vlc.nix { }; polkit-qt = callPackage ../development/libraries/polkit-qt-1/qt-5.nix { }; @@ -11325,11 +11269,7 @@ with pkgs; telepathy = callPackage ../development/libraries/telepathy/qt { }; - vlc = lowPrio (callPackage ../applications/video/vlc { - qt4 = null; - withQt5 = true; - ffmpeg = ffmpeg_2; - }); + vlc = callPackage ../applications/video/vlc {}; qtwebkit-plugins = callPackage ../development/libraries/qtwebkit-plugins { }; @@ -11412,8 +11352,6 @@ with pkgs; qrupdate = callPackage ../development/libraries/qrupdate { }; - redland = pkgs.librdf_redland; - resolv_wrapper = callPackage ../development/libraries/resolv_wrapper { }; rhino = callPackage ../development/libraries/java/rhino { @@ -11584,7 +11522,6 @@ with pkgs; speechd = callPackage ../development/libraries/speechd { }; speech-tools = callPackage ../development/libraries/speech-tools {}; - speech_tools = speech-tools; speex = callPackage ../development/libraries/speex { fftw = fftwFloat; @@ -11648,17 +11585,16 @@ with pkgs; subtitleeditor = callPackage ../applications/video/subtitleeditor { }; - suil-qt4 = callPackage ../development/libraries/audio/suil { - withQt4 = true; - withQt5 = false; - }; + suil = callPackage ../development/libraries/audio/suil { }; - suil-qt5 = callPackage ../development/libraries/audio/suil { + suil-qt5 = suil.override { withQt4 = false; withQt5 = true; }; - - suil = suil-qt4; + suil-qt4 = suil.override { + withQt4 = true; + withQt5 = false; + }; sundials = callPackage ../development/libraries/sundials { }; @@ -12053,7 +11989,7 @@ with pkgs; zlog = callPackage ../development/libraries/zlog { }; - zlibStatic = lowPrio (appendToName "static" (callPackage ../development/libraries/zlib { + zlibStatic = lowPrio (appendToName "static" (zlib.override { static = true; })); @@ -12357,8 +12293,6 @@ with pkgs; java = jdk; }; - fuseki = apache-jena-fuseki; - apcupsd = callPackage ../servers/apcupsd { }; asterisk = asterisk-stable; @@ -12380,7 +12314,6 @@ with pkgs; bird bird6 bird2; bosun = callPackage ../servers/monitoring/bosun { }; - scollector = bosun; cayley = callPackage ../servers/cayley { }; @@ -12453,8 +12386,6 @@ with pkgs; v8 = v8_6_x; }; - etcdctl = etcd; - exim = callPackage ../servers/mail/exim { }; facette = callPackage ../servers/monitoring/facette { }; @@ -12468,7 +12399,7 @@ with pkgs; fingerd_bsd = callPackage ../servers/fingerd/bsd-fingerd { }; firebird = callPackage ../servers/firebird { icu = null; stdenv = overrideCC stdenv gcc5; }; - firebirdSuper = callPackage ../servers/firebird { icu = icu58; superServer = true; stdenv = overrideCC stdenv gcc5; }; + firebirdSuper = firebird.override { icu = icu58; superServer = true; stdenv = overrideCC stdenv gcc5; }; foswiki = callPackage ../servers/foswiki { }; @@ -12583,12 +12514,10 @@ with pkgs; modules = [ nginxModules.dav nginxModules.moreheaders ]; }; - nginxUnstable = nginxMainline; - nginxModules = callPackage ../servers/http/nginx/modules.nix { }; # We should move to dynmaic modules and create a nginxFull package with all modules - nginxShibboleth = callPackage ../servers/http/nginx/stable.nix { + nginxShibboleth = nginxStable.override { modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders nginxModules.shibboleth ]; }; @@ -12642,13 +12571,11 @@ with pkgs; # PulseAudio daemons - # Name is changed to prevent use in packages; - # please use libpulseaudio instead. - pulseaudioLight = callPackage ../servers/pulseaudio { + pulseaudio = callPackage ../servers/pulseaudio { inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa; }; - pulseaudioFull = callPackage ../servers/pulseaudio { + pulseaudioFull = pulseaudio.override { gconf = gnome3.gconf; x11Support = true; jackaudioSupport = true; @@ -12661,8 +12588,7 @@ with pkgs; }; # libpulse implementations - - libpulseaudio-vanilla = callPackage ../servers/pulseaudio { + libpulseaudio-vanilla = pulseaudio.override { libOnly = true; inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa; }; @@ -12726,8 +12652,6 @@ with pkgs; boost = boost159; }; - mysql = mariadb; - mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { }; nagios = callPackage ../servers/monitoring/nagios { }; @@ -12735,7 +12659,6 @@ with pkgs; munin = callPackage ../servers/monitoring/munin { }; monitoring-plugins = callPackage ../servers/monitoring/plugins { }; - nagiosPluginsOfficial = monitoring-plugins; inherit (callPackage ../servers/monitoring/plugins/labs_consol_de.nix { inherit (perlPackages) NetSNMP; }) check-nwc-health @@ -12772,8 +12695,8 @@ with pkgs; qboot = callPackage ../applications/virtualization/qboot { stdenv = stdenv_32bit; }; OVMF = callPackage ../applications/virtualization/OVMF { seabios = null; openssl = null; }; - OVMF-CSM = callPackage ../applications/virtualization/OVMF { openssl = null; }; - #WIP: OVMF-secureBoot = callPackage ../applications/virtualization/OVMF { seabios = null; secureBoot = true; }; + OVMF-CSM = OVMF.override { openssl = null; }; + #WIP: OVMF-secureBoot = OVMF.override { seabios = null; secureBoot = true; }; seabios = callPackage ../applications/virtualization/seabios { }; @@ -12892,7 +12815,6 @@ with pkgs; deadpixi-sam-unstable = callPackage ../applications/editors/deadpixi-sam { }; deadpixi-sam = deadpixi-sam-unstable; - sam = deadpixi-sam; samba3 = callPackage ../servers/samba/3.x.nix { }; @@ -12904,8 +12826,6 @@ with pkgs; samba = samba4; - smbclient = samba; - # A lightweight Samba 3, useful for non-Linux-based OSes. samba3_light = lowPrio (samba3.override { pam = null; @@ -12969,10 +12889,6 @@ with pkgs; storm = callPackage ../servers/computing/storm { }; slurm = callPackage ../servers/computing/slurm { gtk2 = null; }; - slurm-llnl = slurm; # renamed July 2017 - - 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 { }; @@ -13117,7 +13033,6 @@ with pkgs; atop = callPackage ../os-specific/linux/atop { }; audit = callPackage ../os-specific/linux/audit { }; - libaudit = audit; b43Firmware_5_1_138 = callPackage ../os-specific/linux/firmware/b43-firmware/5.1.138.nix { }; @@ -13183,8 +13098,6 @@ with pkgs; # `.override` clobbered. C.F. `llvmPackages` which does the same. darwin = callPackage ./darwin-packages.nix { }; - devicemapper = lvm2; - disk_indicator = callPackage ../os-specific/linux/disk-indicator { }; displaylink = callPackage ../os-specific/linux/displaylink { @@ -13246,10 +13159,10 @@ with pkgs; fatrace = callPackage ../os-specific/linux/fatrace { }; - ffadoFull = callPackage ../os-specific/linux/ffado { + ffado = callPackage ../os-specific/linux/ffado { inherit (python2Packages) python pyqt4 dbus-python; }; - libffado = ffadoFull.override { prefix = "lib"; }; + libffado = ffado.override { prefix = "lib"; }; fbterm = callPackage ../os-specific/linux/fbterm { }; @@ -13344,7 +13257,7 @@ with pkgs; iwd = callPackage ../os-specific/linux/iwd { }; jfbview = callPackage ../os-specific/linux/jfbview { }; - jfbpdf = callPackage ../os-specific/linux/jfbview { + jfbpdf = jfbview.override { imageSupport = false; }; @@ -13821,8 +13734,6 @@ with pkgs; kmod-debian-aliases = callPackage ../os-specific/linux/kmod-debian-aliases { }; - kvm = qemu_kvm; - libcap = callPackage ../os-specific/linux/libcap { }; libcap_ng = callPackage ../os-specific/linux/libcap-ng { @@ -13863,14 +13774,6 @@ with pkgs; musl-fts = callPackage ../os-specific/linux/musl/fts.nix { }; musl-getconf = callPackage ../os-specific/linux/musl/getconf.nix { }; musl-getent = callPackage ../os-specific/linux/musl/getent.nix { }; - getent = - if hostPlatform.isMusl then musl-getent - # This may not be right on other platforms, but preserves existing behavior - else /* if hostPlatform.libc == "glibc" then */ glibc.bin; - - getconf = - if hostPlatform.isMusl then musl-getconf - else lib.getBin stdenv.cc.libc; nettools = if stdenv.isLinux then callPackage ../os-specific/linux/net-tools { } else unixtools.nettools; @@ -14004,8 +13907,6 @@ with pkgs; prayer = callPackage ../servers/prayer { }; - procps = procps-ng; - procps-ng = if stdenv.isLinux then callPackage ../os-specific/linux/procps-ng { } else unixtools.procps; @@ -14096,10 +13997,6 @@ with pkgs; inherit (gnome2) libglade; }; - # Provided with sysfsutils. - libsysfs = sysfsutils; - systool = sysfsutils; - sysklogd = callPackage ../os-specific/linux/sysklogd { }; syslinux = callPackage ../os-specific/linux/syslinux { }; @@ -14123,7 +14020,7 @@ with pkgs; sysvinit = callPackage ../os-specific/linux/sysvinit { }; - sysvtools = callPackage ../os-specific/linux/sysvinit { + sysvtools = sysvinit.override { withoutInitTools = true; }; @@ -14176,9 +14073,6 @@ with pkgs; cross = assert targetPlatform != buildPlatform; targetPlatform; }); - udev = systemd; - libudev = udev; - eudev = callPackage ../os-specific/linux/eudev {}; libudev0-shim = callPackage ../os-specific/linux/libudev0-shim/default.nix { }; @@ -14386,10 +14280,6 @@ with pkgs; docbook_xsl docbook_xsl_ns; - docbook_xml_xslt = docbook_xsl; - - docbook5_xsl = docbook_xsl_ns; - documentation-highlighter = callPackage ../misc/documentation-highlighter { }; cabin = callPackage ../data/fonts/cabin { }; @@ -15220,7 +15110,7 @@ with pkgs; }; codeblocks = callPackage ../applications/editors/codeblocks { }; - codeblocksFull = callPackage ../applications/editors/codeblocks { contribPlugins = true; }; + codeblocksFull = codeblocks.override { contribPlugins = true; }; comical = callPackage ../applications/graphics/comical { }; @@ -15329,8 +15219,6 @@ with pkgs; inherit (python3Packages) buildPythonApplication requests; }; - dmtx = dmtx-utils; - dmtx-utils = callPackage (callPackage ../tools/graphics/dmtx-utils) { }; @@ -15460,9 +15348,6 @@ with pkgs; ImageCaptureCore GSS ImageIO; }; - # for backwards compatibility - emacs25Macport_25_1 = emacs25Macport; - emacsPackagesGen = emacs: self: let callPackage = newScope self; in rec { inherit emacs; @@ -15697,7 +15582,6 @@ with pkgs; keepass-keepasshttp = callPackage ../applications/misc/keepass-plugins/keepasshttp { }; keepass-keepassrpc = callPackage ../applications/misc/keepass-plugins/keepassrpc { }; - keepass-keefox = keepass-keepassrpc; # backwards compatibility alias, added 2018-02 exrdisplay = callPackage ../applications/graphics/exrdisplay { }; @@ -15719,9 +15603,9 @@ with pkgs; fldigi = callPackage ../applications/audio/fldigi { }; - flink = flink_1_4; - flink_1_3 = callPackage ../applications/networking/cluster/flink { version = "1.3"; }; - flink_1_4 = callPackage ../applications/networking/cluster/flink { version = "1.4"; }; + flink = callPackage ../applications/networking/cluster/flink { }; + flink_1_3 = flink.override { version = "1.3"; }; + flink_1_4 = flink.override { version = "1.4"; }; fluidsynth = callPackage ../applications/audio/fluidsynth { inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio CoreMIDI CoreServices; @@ -15854,19 +15738,16 @@ with pkgs; welle-io = libsForQt5.callPackage ../applications/misc/welle-io { }; - wireshark-cli = callPackage ../applications/networking/sniffers/wireshark { - withQt = false; + wireshark = callPackage ../applications/networking/sniffers/wireshark { + withQt = true; withGtk = false; inherit (darwin.apple_sdk.frameworks) ApplicationServices SystemConfiguration; }; - - # the cli binary is actually called tshark and often packaged under this name - tshark = wireshark-cli; + wireshark-qt = wireshark; # The GTK UI is deprecated by upstream. You probably want the QT version. - wireshark-gtk = wireshark-cli.override { withGtk = true; }; - wireshark-qt = wireshark-cli.override { withQt = true; }; - wireshark = wireshark-qt; + wireshark-gtk = wireshark.override { withGtk = true; }; + wireshark-cli = wireshark.override { withGtk = false; withQt = false; }; fbida = callPackage ../applications/graphics/fbida { }; @@ -15908,7 +15789,7 @@ with pkgs; desktopName = "Firefox"; }; - firefox-beta-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { + firefox-beta-bin-unwrapped = firefox-bin-unwrapped.override { channel = "beta"; generated = import ../applications/networking/browsers/firefox-bin/beta_sources.nix; gconf = pkgs.gnome2.GConf; @@ -16140,7 +16021,7 @@ with pkgs; }; graphicsmagick = callPackage ../applications/graphics/graphicsmagick { }; - graphicsmagick_q16 = callPackage ../applications/graphics/graphicsmagick { quantumdepth = 16; }; + graphicsmagick_q16 = graphicsmagick.override { quantumdepth = 16; }; grisbi = callPackage ../applications/office/grisbi { gtk = gtk2; }; @@ -16378,13 +16259,12 @@ with pkgs; libwebp = null; }; - imagemagick = imagemagickBig.override { + imagemagick = callPackage ../applications/graphics/ImageMagick { + inherit (darwin.apple_sdk.frameworks) ApplicationServices; ghostscript = null; }; - imagemagickBig = callPackage ../applications/graphics/ImageMagick { - inherit (darwin.apple_sdk.frameworks) ApplicationServices; - }; + imagemagickBig = imagemagick.override { inherit ghostscript; }; imagemagick7_light = lowPrio (imagemagick7.override { bzip2 = null; @@ -16640,58 +16520,39 @@ with pkgs; libowfat = callPackage ../development/libraries/libowfat { }; librecad = callPackage ../applications/misc/librecad { }; - librecad2 = librecad; # backwards compatibility alias, added 2015-10 libreoffice = hiPrio libreoffice-still; - libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix - { libreoffice = callPackage ../applications/office/libreoffice { - inherit (perlPackages) ArchiveZip CompressZlib; - inherit (gnome2) GConf ORBit2 gnome_vfs; - inherit (gnome3) defaultIconTheme; - zip = zip.override { enableNLS = false; }; - fontsConf = makeFontsConf { - fontDirectories = [ - carlito dejavu_fonts - freefont_ttf xorg.fontmiscmisc - liberation_ttf_v1_binary - liberation_ttf_v2_binary - ]; - }; - clucene_core = clucene_core_2; - lcms = lcms2; - harfbuzz = harfbuzz.override { - withIcu = true; withGraphite2 = true; - }; - # checking whether g++ supports C++14 or C++11... configure: error: no - # Still relevant: 2018-04-13 - stdenv = overrideCC stdenv gcc5; - };}); - - libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix - { libreoffice = callPackage ../applications/office/libreoffice/still.nix { - inherit (perlPackages) ArchiveZip CompressZlib; - inherit (gnome2) GConf ORBit2 gnome_vfs; - inherit (gnome3) defaultIconTheme; - zip = zip.override { enableNLS = false; }; + libreoffice-unwrapped =callPackage ../applications/office/libreoffice { + inherit (perlPackages) ArchiveZip CompressZlib; + inherit (gnome2) GConf ORBit2 gnome_vfs; + inherit (gnome3) defaultIconTheme; + zip = zip.override { enableNLS = false; }; + fontsConf = makeFontsConf { + fontDirectories = [ + carlito dejavu_fonts + freefont_ttf xorg.fontmiscmisc + liberation_ttf_v1_binary + liberation_ttf_v2_binary + ]; + }; + clucene_core = clucene_core_2; + lcms = lcms2; + harfbuzz = harfbuzz.override { + withIcu = true; withGraphite2 = true; + }; + # checking whether g++ supports C++14 or C++11... configure: error: no + # Still relevant: 2018-04-13 + stdenv = overrideCC stdenv gcc5; + }; + + libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { libreoffice = libreoffice-unwrapped; }); + + libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { + libreoffice = libreoffice-unwrapped.override { poppler = poppler_0_61; - fontsConf = makeFontsConf { - fontDirectories = [ - carlito dejavu_fonts - freefont_ttf xorg.fontmiscmisc - liberation_ttf_v1_binary - liberation_ttf_v2_binary - ]; - }; - clucene_core = clucene_core_2; - lcms = lcms2; - harfbuzz = harfbuzz.override { - withIcu = true; withGraphite2 = true; - }; - # checking whether g++ supports C++14 or C++11... configure: error: no - # Still relevant: 2018-04-13; gcc6 is not enough! - stdenv = overrideCC stdenv gcc5; - };}); + }; + }); liferea = callPackage ../applications/networking/newsreaders/liferea { inherit (gnome3) libpeas gsettings-desktop-schemas dconf; @@ -17058,7 +16919,7 @@ with pkgs; libsForQt5.callPackage ../applications/audio/musescore { }; mutt = callPackage ../applications/networking/mailreaders/mutt { }; - mutt-with-sidebar = callPackage ../applications/networking/mailreaders/mutt { + mutt-with-sidebar = mutt.override { withSidebar = true; }; @@ -18422,15 +18283,9 @@ with pkgs; vkeybd = callPackage ../applications/audio/vkeybd {}; - vlc = callPackage ../applications/video/vlc { - ffmpeg = ffmpeg_2; - }; - - vlc_npapi = callPackage ../applications/video/vlc/plugin.nix { - gtk = gtk2; - }; + vlc = libsForQt5.vlc; - vlc_qt5 = libsForQt5.vlc; + vlc_qt5 = vlc; vmpk = callPackage ../applications/audio/vmpk { }; @@ -18501,7 +18356,7 @@ with pkgs; weechat-xmpp = callPackage ../applications/networking/instant-messengers/weechat-xmpp {}; - westonLite = callPackage ../applications/window-managers/weston { + westonLite = weston.override { pango = null; freerdp = null; libunwind = null; @@ -18682,15 +18537,12 @@ with pkgs; }; kodiPlain = callPackage ../applications/video/kodi { }; - xbmcPlain = kodiPlain; kodiPlugins = recurseIntoAttrs (callPackage ../applications/video/kodi/plugins.nix {}); - xbmcPlugins = kodiPlugins; kodi = wrapKodi { kodi = kodiPlain; }; - xbmc = kodi; kodi-retroarch-advanced-launchers = callPackage ../misc/emulators/retroarch/kodi-advanced-launchers.nix { @@ -18799,21 +18651,21 @@ with pkgs; packages = self: []; }; - xmonad_log_applet_gnome2 = callPackage ../applications/window-managers/xmonad/log-applet { + xmonad_log_applet_gnome2 = xmonad_log_applet.override { desktopSupport = "gnome2"; inherit (xfce) libxfce4util xfce4-panel; gnome2_panel = gnome2.gnome_panel; GConf2 = gnome2.GConf; }; - xmonad_log_applet_gnome3 = callPackage ../applications/window-managers/xmonad/log-applet { + xmonad_log_applet = callPackage ../applications/window-managers/xmonad/log-applet { desktopSupport = "gnome3"; inherit (xfce) libxfce4util xfce4-panel; gnome2_panel = gnome2.gnome_panel; GConf2 = gnome2.GConf; }; - xmonad_log_applet_xfce = callPackage ../applications/window-managers/xmonad/log-applet { + xmonad_log_applet_xfce = xmonad_log_applet.override { desktopSupport = "xfce4"; inherit (xfce) libxfce4util xfce4-panel; gnome2_panel = gnome2.gnome_panel; @@ -19087,10 +18939,6 @@ with pkgs; physfs = physfs_2; }; - # these are here for compatibility - d1x_rebirth = dxx-rebirth; - d2x_rebirth = dxx-rebirth; - inherit (callPackages ../games/dxx-rebirth/assets.nix { }) descent1-assets descent2-assets; @@ -19123,13 +18971,13 @@ with pkgs; factorio = callPackage ../games/factorio { releaseType = "alpha"; }; - factorio-experimental = callPackage ../games/factorio { releaseType = "alpha"; experimental = true; }; + factorio-experimental = factorio.override { releaseType = "alpha"; experimental = true; }; - factorio-headless = callPackage ../games/factorio { releaseType = "headless"; }; + factorio-headless = factorio.override { releaseType = "headless"; }; - factorio-headless-experimental = callPackage ../games/factorio { releaseType = "headless"; experimental = true; }; + factorio-headless-experimental = factorio.override { releaseType = "headless"; experimental = true; }; - factorio-demo = callPackage ../games/factorio { releaseType = "demo"; }; + factorio-demo = factorio.override { releaseType = "demo"; }; factorio-mods = callPackage ../games/factorio/mods.nix { }; @@ -19149,7 +18997,7 @@ with pkgs; freeciv = callPackage ../games/freeciv { }; - freeciv_gtk = callPackage ../games/freeciv { + freeciv_gtk = freeciv.override { gtkClient = true; sdlClient = false; }; @@ -19361,7 +19209,7 @@ with pkgs; pokerth = callPackage ../games/pokerth { }; - pokerth-server = with callPackage ../games/pokerth { }; server; + pokerth-server = pokerth.server; prboom = callPackage ../games/prboom { }; @@ -19630,7 +19478,7 @@ with pkgs; lua = lua5_2; }; - worldofgoo_demo = callPackage ../games/worldofgoo { + worldofgoo_demo = worldofgoo.override { demo = true; }; @@ -20004,9 +19852,9 @@ with pkgs; # and with or without atlas as a dependency. The default `liblapack` is 3.4.1 # with atlas. Atlas, when built with liblapack as a dependency, uses 3.5.0 # without atlas. Etc. - liblapackWithAtlas = callPackage ../development/libraries/science/math/liblapack {}; + liblapack = callPackage ../development/libraries/science/math/liblapack {}; liblapackWithoutAtlas = liblapackWithAtlas.override { atlas = null; }; - liblapack = liblapackWithAtlas; + liblapackWithAtlas = liblapack; liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { }; @@ -20093,21 +19941,21 @@ with pkgs; cmake = cmakeCurses; }; - gromacsMpi = lowPrio (callPackage ../applications/science/molecular-dynamics/gromacs { + gromacsMpi = lowPrio (gromacs.override { singlePrec = true; mpiEnabled = true; fftw = fftwSinglePrec; cmake = cmakeCurses; }); - gromacsDouble = lowPrio (callPackage ../applications/science/molecular-dynamics/gromacs { + gromacsDouble = lowPrio (gromacs.override { singlePrec = false; mpiEnabled = false; fftw = fftw; cmake = cmakeCurses; }); - gromacsDoubleMpi = lowPrio (callPackage ../applications/science/molecular-dynamics/gromacs { + gromacsDoubleMpi = lowPrio (gromacs.override { singlePrec = false; mpiEnabled = true; fftw = fftw; @@ -20388,7 +20236,7 @@ with pkgs; maxima = callPackage ../applications/science/math/maxima { ecl = null; }; - maxima-ecl = callPackage ../applications/science/math/maxima { + maxima-ecl = maxima.override { ecl = ecl_16_1_2; ecl-fasl = true; sbcl = null; @@ -20543,7 +20391,7 @@ with pkgs; thepeg = callPackage ../development/libraries/physics/thepeg { }; yoda = callPackage ../development/libraries/physics/yoda { }; - yoda-with-root = lowPrio (callPackage ../development/libraries/physics/yoda { + yoda-with-root = lowPrio (yoda.override { withRootSupport = true; }); @@ -20764,11 +20612,11 @@ with pkgs; # using the new configuration style proposal which is unstable jack1 = callPackage ../misc/jackaudio/jack1.nix { }; - jack2Full = callPackage ../misc/jackaudio { + jack2 = callPackage ../misc/jackaudio { libopus = libopus.override { withCustomModes = true; }; inherit (darwin.apple_sdk.frameworks) AudioToolbox CoreAudio CoreFoundation; }; - libjack2 = jack2Full.override { prefix = "lib"; }; + libjack2 = jack2.override { prefix = "lib"; }; keynav = callPackage ../tools/X11/keynav { }; @@ -20832,7 +20680,7 @@ with pkgs; nix-diff = haskell.lib.justStaticExecutables haskellPackages.nix-diff; nix-info = callPackage ../tools/nix/info { }; - nix-info-tested = callPackage ../tools/nix/info { doCheck = true; }; + nix-info-tested = nix-info.override { doCheck = true; }; nix-index = callPackage ../tools/package-management/nix-index { }; @@ -21362,10 +21210,10 @@ with pkgs; spdlog = callPackage ../development/libraries/spdlog { }; - dart = dart_stable; - dart_old = callPackage ../development/interpreters/dart { version = "1.16.1"; }; - dart_stable = callPackage ../development/interpreters/dart { version = "1.24.3"; }; - dart_dev = callPackage ../development/interpreters/dart { version = "2.0.0-dev.26.0"; }; + dart = callPackage ../development/interpreters/dart { }; + dart_stable = dart.override { version = "1.24.3"; }; + dart_old = dart.override { version = "1.16.1"; }; + dart_dev = dart.override { version = "2.0.0-dev.26.0"; }; httrack = callPackage ../tools/backup/httrack { }; @@ -21500,7 +21348,8 @@ with pkgs; # Unix tools unixtools = recurseIntoAttrs (callPackages ./unix-tools.nix { }); inherit (unixtools) hexdump ps logger eject umount - mount wall hostname more sysctl; + mount wall hostname more sysctl getconf + getent; inherit (recurseIntoAttrs (callPackages ../os-specific/bsd { })) netbsd; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index e6ec2f8ed9d..41debeefc89 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -438,6 +438,8 @@ let ); ''; + doCheck = false; # fails to find itself + installTargets = [ "install" "install-unix" ]; meta = with stdenv.lib; { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7868f7d7ff0..61a396e56ef 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2079,6 +2079,8 @@ in { demjson = callPackage ../development/python-modules/demjson { }; + deprecation = callPackage ../development/python-modules/deprecation { }; + derpconf = callPackage ../development/python-modules/derpconf { }; deskcon = self.buildPythonPackage rec { diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 5233051cad8..5a2de846ade 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -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 diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index de676c5a421..e38f5442d3a 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -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 diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index 36fba3fbd47..a73f11e69a4 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -1,4 +1,5 @@ -{ pkgs, buildEnv, runCommand, hostPlatform, lib }: +{ pkgs, buildEnv, runCommand, hostPlatform, lib +, stdenv }: # These are some unix tools that are commonly included in the /usr/bin # and /usr/sbin directory under more normal distributions. Along with @@ -46,6 +47,16 @@ let eject = { linux = pkgs.utillinux; }; + getconf = singleBinary "getconf" { + linux = if hostPlatform.isMusl then pkgs.musl-getconf + else lib.getBin stdenv.cc.libc; + darwin = pkgs.darwin.system_cmds; + }; + getent = { + linux = if hostPlatform.isMusl then pkgs.musl-getent + # This may not be right on other platforms, but preserves existing behavior + else /* if hostPlatform.libc == "glibc" then */ pkgs.glibc.bin; + }; getopt = { linux = pkgs.utillinux; darwin = pkgs.getopt; |