From 9ad1aaae5337bb55df9c64636d2c8b7f97381dd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 2 May 2017 12:44:00 +0200
Subject: [PATCH] lua5_{sec,1_sockets,expat}: convert to aliases

There's nothing better in these expressions than what we have in
lua-packages.nix
---
 pkgs/development/interpreters/lua-5/expat.nix | 26 -----------------
 pkgs/development/interpreters/lua-5/sec.nix   | 29 -------------------
 pkgs/top-level/aliases.nix                    |  3 ++
 pkgs/top-level/all-packages.nix               |  5 ----
 4 files changed, 3 insertions(+), 60 deletions(-)
 delete mode 100644 pkgs/development/interpreters/lua-5/expat.nix
 delete mode 100644 pkgs/development/interpreters/lua-5/sec.nix

diff --git a/pkgs/development/interpreters/lua-5/expat.nix b/pkgs/development/interpreters/lua-5/expat.nix
deleted file mode 100644
index fb0bb5e5ff5..00000000000
--- a/pkgs/development/interpreters/lua-5/expat.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, lua5, expat }:
-
-stdenv.mkDerivation rec {
-  version = "1.3.0";
-  name = "lua-expat-${version}";
-  isLibrary = true;
-  src = fetchurl {
-    url = "https://matthewwild.co.uk/projects/luaexpat/luaexpat-${version}.tar.gz";
-    sha256 = "1hvxqngn0wf5642i5p3vcyhg3pmp102k63s9ry4jqyyqc1wkjq6h";
-  };
-
-  buildInputs = [ lua5 expat ];
-
-  preBuild = ''
-    makeFlagsArray=(
-      LUA_LDIR="$out/share/lua/${lua5.luaversion}"
-      LUA_INC="-I${lua5}/include" LUA_CDIR="$out/lib/lua/${lua5.luaversion}"
-      EXPAT_INC="-I${expat.dev}/include");
-  '';
-
-  meta = {
-    homepage = "http://matthewwild.co.uk/projects/luaexpat";
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.flosse ];
-  };
-}
diff --git a/pkgs/development/interpreters/lua-5/sec.nix b/pkgs/development/interpreters/lua-5/sec.nix
deleted file mode 100644
index 478f65fd828..00000000000
--- a/pkgs/development/interpreters/lua-5/sec.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl, lua5, openssl }:
-
-stdenv.mkDerivation rec {
-  version = "0.5";
-  name = "lua-sec-${version}";
-  src = fetchurl {
-    url = "https://github.com/brunoos/luasec/archive/luasec-${version}.tar.gz";
-    sha256 = "08rm12cr1gjdnbv2jpk7xykby9l292qmz2v0dfdlgb4jfj7mk034";
-  };
-
-  buildInputs = [ lua5 openssl ];
-
-  hardeningDisable = stdenv.lib.optional stdenv.isi686 "stackprotector";
-
-  preBuild = ''
-    makeFlagsArray=(
-      linux
-      LUAPATH="$out/lib/lua/${lua5.luaversion}"
-      LUACPATH="$out/lib/lua/${lua5.luaversion}"
-      INC_PATH="-I${lua5}/include"
-      LIB_PATH="-L$out/lib");
-  '';
-
-  meta = {
-    homepage = "https://github.com/brunoos/luasec";
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.flosse ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 1046b86dbb4..94fedabd562 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
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c264059ae08..67014b02d9c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5970,11 +5970,6 @@ with pkgs;
 
   luaPackages = lua52Packages;
 
-  lua5_1_sockets = lua51Packages.luasocket;
-
-  lua5_expat = callPackage ../development/interpreters/lua-5/expat.nix {};
-  lua5_sec = callPackage ../development/interpreters/lua-5/sec.nix { };
-
   luajit = callPackage ../development/interpreters/luajit {};
 
   luarocks = luaPackages.luarocks;