diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-11 14:55:52 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-11 14:55:52 +0200 |
| commit | ee6894ca1297afe0caf2f389c1f9a9220826b749 (patch) | |
| tree | 02f96b5744cef8bc55010fb8301f5b50c0748d4c /pkgs/top-level/aliases.nix | |
| parent | 392874b9b1411dc7b879997bd8776b921feea61d (diff) | |
| parent | 617c26df84d5670574864a9ccad0eaf8708bd86a (diff) | |
| download | nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.gz nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.bz2 nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.lz nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.xz nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.zst nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.zip | |
Merge staging into master
Diffstat (limited to 'pkgs/top-level/aliases.nix')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c6a9825a1d68..4fec9d928c1f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -119,6 +119,7 @@ mapAliases (rec { 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 libmysql = mysql.connector-c; # added # 2017-12-28, this was a misnomer refering to libmysqlclient libtidy = html-tidy; # added 2014-12-21 @@ -239,6 +240,10 @@ mapAliases (rec { wineStable = winePackages.stable; wineUnstable = winePackages.unstable; + # added 2018-03-26 + libva-full = libva; + libva1-full = libva1; + 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 |