diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-19 18:24:24 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-19 18:24:24 +0200 |
commit | 8213ff161c461655aaff7d43984384dbca64b312 (patch) | |
tree | 3b7c3138ff2222b9b6b8d247c3b1a0c8ea3305e3 /pkgs/top-level/aliases.nix | |
parent | 9f208b5d8aa10518eb92ed5b7d77e4a588b5154c (diff) | |
parent | e7e5aaa0b938ed53dd96f58c8ebf9e0f7f72e133 (diff) | |
download | nixlib-8213ff161c461655aaff7d43984384dbca64b312.tar nixlib-8213ff161c461655aaff7d43984384dbca64b312.tar.gz nixlib-8213ff161c461655aaff7d43984384dbca64b312.tar.bz2 nixlib-8213ff161c461655aaff7d43984384dbca64b312.tar.lz nixlib-8213ff161c461655aaff7d43984384dbca64b312.tar.xz nixlib-8213ff161c461655aaff7d43984384dbca64b312.tar.zst nixlib-8213ff161c461655aaff7d43984384dbca64b312.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level/aliases.nix')
-rw-r--r-- | pkgs/top-level/aliases.nix | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1a5bf546a204..fe77a591876f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -85,7 +85,6 @@ mapAliases ({ 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 @@ -98,10 +97,8 @@ mapAliases ({ 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 @@ -132,7 +129,6 @@ mapAliases ({ 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 @@ -140,7 +136,6 @@ mapAliases ({ 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 @@ -158,7 +153,6 @@ mapAliases ({ 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 @@ -170,7 +164,6 @@ mapAliases ({ 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 man_db = man-db; # added 2016-05 manpages = man-pages; # added 2015-12-06 @@ -182,7 +175,6 @@ mapAliases ({ 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 @@ -198,7 +190,6 @@ mapAliases ({ 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 @@ -217,7 +208,6 @@ mapAliases ({ pidginwindowmerge = pidgin-window-merge; # added 2018-01-08 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 procps-ng = procps; # added 2018-06-08 prometheus-statsd-bridge = prometheus-statsd-exporter; # added 2017-08-27 @@ -229,7 +219,6 @@ mapAliases ({ 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"; @@ -261,7 +250,6 @@ mapAliases ({ spice_protocol = spice-protocol; # added 2018-02-25 sqlite3_analyzer = sqlite-analyzer; # added 2018-05-22 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 @@ -289,7 +277,6 @@ mapAliases ({ 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 @@ -306,7 +293,6 @@ mapAliases ({ 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 @@ -319,6 +305,11 @@ mapAliases ({ libva-full = libva; libva1-full = libva1; + # forceSystem should not be used directly in Nixpkgs. + # added 2018-07-16 + forceSystem = system: _: + (import self.path { localSystem = { inherit system; }; }); + inherit (ocaml-ng) # added 2016-09-14 ocamlPackages_3_10_0 ocamlPackages_3_11_2 ocamlPackages_3_12_1 ocamlPackages_4_00_1 ocamlPackages_4_01_0 ocamlPackages_4_02 @@ -347,5 +338,4 @@ mapAliases ({ ocaml_4_01_0 = ocamlPackages_4_01_0.ocaml; ocaml_4_02 = ocamlPackages_4_02.ocaml; ocaml_4_03 = ocamlPackages_4_03.ocaml; - ocaml = ocamlPackages.ocaml; })) |