From 5c4362ae5aa95a04375243faabbc181891069452 Mon Sep 17 00:00:00 2001
From: wyvie <elijahrum@gmail.com>
Date: Mon, 22 Sep 2014 14:40:19 +0400
Subject: [PATCH] Simplified lua-packages function arguments to look nicer in
 all-packages

---
 pkgs/top-level/all-packages.nix | 12 ++----------
 pkgs/top-level/lua-packages.nix |  5 +++--
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c1a251b2a17..9648263ee52 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3755,17 +3755,9 @@ let
   lua5 = lua5_2_compat;
   lua = lua5;
 
-  lua51Packages = recurseIntoAttrs (import ./lua-packages.nix {
-    pkgs = pkgs // {
-      lua = lua5_1;
-    };
-  });
+  lua51Packages = recurseIntoAttrs (import ./lua-packages.nix pkgs lua5_1);
 
-  lua52Packages = recurseIntoAttrs (import ./lua-packages.nix {
-    pkgs = pkgs // {
-      lua = lua5_2;
-    };
-  });
+  lua52Packages = recurseIntoAttrs (import ./lua-packages.nix pkgs lua5_2);
 
   luaPackages = lua52Packages;
 
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index c900044f407..83db0bfb5ae 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -5,11 +5,12 @@
    for each package in a separate file: the call to the function would
    be almost as must code as the function itself. */
 
-{pkgs}:
+pkgs:
+lua:
 
 let self = _self; _self = with self; {
 
-  inherit (pkgs) fetchurl stdenv lua;
+  inherit (pkgs) fetchurl stdenv;
 
   inherit (stdenv.lib) maintainers;