diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-02 23:27:18 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-02 23:27:18 +0200 |
| commit | d20a59d2e575f84b300a8a1cb7747fea2a890b72 (patch) | |
| tree | b3a2606b0bb21d4657be92a193f0de359276a474 /pkgs/top-level/aliases.nix | |
| parent | 92f3ea646e287535e4978d5875b80e393ea8ea4e (diff) | |
| parent | 66644848cb2e801740970c89dc72a2c3a715bce2 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level/aliases.nix')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 09ca629d346a..a1ad553e0481 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -195,6 +195,8 @@ mapAliases ({ m3d-linux = m33-linux; # added 2016-08-13 man_db = man-db; # added 2016-05 manpages = man-pages; # added 2015-12-06 + mariadb-client = hiPrio mariadb.client; #added 2019.07.28 + mysql-client = hiPrio mariadb.client; memtest86 = memtest86plus; # added 2019-05-08 mesa_noglu = mesa; # added 2019-05-28 # NOTE: 2018-07-12: legacy alias: |