From 2a1c7b1f32e07edbe0f7e139367f758d1ee6bb1a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 21 Feb 2019 13:45:36 -0600 Subject: [PATCH 1/2] lua-modules/generated-packages.nix: fix 'lua' to propagate Otherwise 'lua' is from the argument populated by callPackage which means it's whatever the default is. (instead of the lua we're generating packages for!) --- pkgs/development/lua-modules/generated-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 7da4a9eeddf..8a9618e1f1e 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -5,7 +5,7 @@ nixpkgs$ maintainers/scripts/update-luarocks-packages pkgs/development/lua-modul These packages are manually refined in lua-overrides.nix */ -{ self, lua, stdenv, fetchurl, fetchgit, pkgs, ... } @ args: +{ self, stdenv, fetchurl, fetchgit, pkgs, ... } @ args: self: super: with self; { From e49175ceae9db92c10095b8f601c5d3b60a03318 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 25 Feb 2019 23:51:42 -0600 Subject: [PATCH 2/2] udpate-luarocks-package: drop 'lua' argument here as well --- maintainers/scripts/update-luarocks-packages | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/scripts/update-luarocks-packages b/maintainers/scripts/update-luarocks-packages index aa922c19860..171b49ee568 100755 --- a/maintainers/scripts/update-luarocks-packages +++ b/maintainers/scripts/update-luarocks-packages @@ -61,7 +61,7 @@ nixpkgs$ ${0} ${GENERATED_NIXFILE} These packages are manually refined in lua-overrides.nix */ -{ self, lua, stdenv, fetchurl, fetchgit, pkgs, ... } @ args: +{ self, stdenv, fetchurl, fetchgit, pkgs, ... } @ args: self: super: with self; {