Merge commit '5d3fd3674a66c5b1ada63e2eace140519849c967'

1 files changed, 15 insertions, 17 deletions

diff --git a/nixpkgs/pkgs/development/tools/misc/luarocks/default.nix b/nixpkgs/pkgs/development/tools/misc/luarocks/default.nix
index ad50e7e8e6df..5e418fcfdcfd 100644
--- a/nixpkgs/pkgs/development/tools/misc/luarocks/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/luarocks/default.nix
@@ -8,26 +8,17 @@
 }:
 
 let
-  s = # Generated upstream information
-  rec {
-    baseName="luarocks";
-    version="2.4.4";
-    name="${baseName}-${version}";
-    hash="0d7rl60dwh52qh5pfsphgx5ypp7k190h9ri6qpr2yx9kvqrxyf1r";
-    url="http://luarocks.org/releases/luarocks-2.4.4.tar.gz";
-    sha256="0d7rl60dwh52qh5pfsphgx5ypp7k190h9ri6qpr2yx9kvqrxyf1r";
-  };
-  buildInputs = [
-    lua curl makeWrapper which unzip
-  ];
 in
 
-stdenv.mkDerivation {
-  inherit (s) name version;
-  inherit buildInputs;
+stdenv.mkDerivation rec {
+  pname="luarocks";
+  version="2.4.4";
+
   src = fetchurl {
-    inherit (s) url sha256;
+    url="http://luarocks.org/releases/luarocks-${version}.tar.gz";
+    sha256="0d7rl60dwh52qh5pfsphgx5ypp7k190h9ri6qpr2yx9kvqrxyf1r";
   };
+
   patches = [ ./darwin.patch ];
   preConfigure = ''
     lua -e "" || {
@@ -41,6 +32,11 @@ stdenv.mkDerivation {
         configureFlags="$configureFlags --with-lua-include=$lua_inc"
     fi
   '';
+
+  buildInputs = [
+    lua curl makeWrapper which
+  ];
+
   postInstall = ''
     sed -e "1s@.*@#! ${lua}/bin/lua$LUA_SUFFIX@" -i "$out"/bin/*
     for i in "$out"/bin/*; do
@@ -68,10 +64,12 @@ stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    inherit (s) version;
+    inherit version;
     description = ''A package manager for Lua'';
     license = licenses.mit ;
     maintainers = with maintainers; [raskin teto];
     platforms = platforms.linux ++ platforms.darwin;
+    downloadPage = "http://luarocks.org/releases/";
+    updateWalker = true;
   };
 }