diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-05-02 15:54:14 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-05-02 16:01:48 +0200 |
| commit | 1bcd56b6e659f22c89ac6ec0411c9dd30866f68f (patch) | |
| tree | 89fd7059e772408089852f935fbf4b3baced4221 /pkgs/top-level/aliases.nix | |
| parent | 2dd351114635c19e5ba6a62a7b201dee0d35e0f9 (diff) | |
| parent | a841935d4b7f6b0b8cf1d7b7fe3f342e61dafd67 (diff) | |
| download | nixlib-1bcd56b6e659f22c89ac6ec0411c9dd30866f68f.tar nixlib-1bcd56b6e659f22c89ac6ec0411c9dd30866f68f.tar.gz nixlib-1bcd56b6e659f22c89ac6ec0411c9dd30866f68f.tar.bz2 nixlib-1bcd56b6e659f22c89ac6ec0411c9dd30866f68f.tar.lz nixlib-1bcd56b6e659f22c89ac6ec0411c9dd30866f68f.tar.xz nixlib-1bcd56b6e659f22c89ac6ec0411c9dd30866f68f.tar.zst nixlib-1bcd56b6e659f22c89ac6ec0411c9dd30866f68f.zip | |
Merge branch 'master' into staging
There's been a very large rebuild on master, unfortunately. pytestcov conflict: I'm not really sure what should be propagated.
Diffstat (limited to 'pkgs/top-level/aliases.nix')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1046b86dbb44..94fedabd562d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -82,6 +82,9 @@ doNotDisplayTwice rec { 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 m3d-linux = m33-linux; # added 2016-08-13 manpages = man-pages; # added 2015-12-06 man_db = man-db; # added 2016-05 |