diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-01-24 03:18:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-24 03:18:07 +0100 |
| commit | c58219fff6890b2a2cb801cdfef29d4f6729b9ef (patch) | |
| tree | 78d3cb5a4e2fbcf3a48d09048dc42e59af8582ed | |
| parent | 77f32f2f3c5d4ff04c3d62dd8d71f9c327a54f07 (diff) | |
| parent | b20b9f98b83b342576a72664a4bf35aa5b6366d3 (diff) | |
Merge pull request #110467 from teto/luarocks-update
4 files changed, 6 insertions, 9 deletions
diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index fb90e62769f82..ac9f22d23fb3f 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -6,7 +6,7 @@ basexx,,,,, binaryheap,,,,,vcunat bit32,,,,lua5_1,lblasc busted,,,,, -cassowary,,,,,marsam +cassowary,,,,,marsam alerque cjson,lua-cjson,,,, compat53,,,,,vcunat cosmo,,,,,marsam diff --git a/maintainers/scripts/update-luarocks-packages b/maintainers/scripts/update-luarocks-packages index 5c42080745ebc..da4d224bd3300 100755 --- a/maintainers/scripts/update-luarocks-packages +++ b/maintainers/scripts/update-luarocks-packages @@ -66,7 +66,7 @@ nixpkgs$ ${0} ${GENERATED_NIXFILE} These packages are manually refined in lua-overrides.nix */ -{ self, stdenv, fetchurl, fetchgit, pkgs, ... } @ args: +{ self, stdenv, lib, fetchurl, fetchgit, pkgs, ... } @ args: self: super: with self; { diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index fddb028b80ae8..8ec44d17016a2 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, lib, stdenv, fetchurl, fetchgit, pkgs, ... } @ args: +{ self, stdenv, lib, fetchurl, fetchgit, pkgs, ... } @ args: self: super: with self; { diff --git a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix index 57f200fd0fcb5..30e02a3623fa9 100644 --- a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix +++ b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix @@ -1,14 +1,11 @@ { luarocks, fetchFromGitHub }: luarocks.overrideAttrs(old: { pname = "luarocks-nix"; - version = "2019-09-07"; + version = "2021-01-22"; src = fetchFromGitHub { owner = "nix-community"; repo = "luarocks-nix"; - rev = "73b8772e56fd39dfffda9e3b13e9eb31e93d5cde"; - sha256 = "00jgshygw439pbaxg7yph3ijia6nid9r1br416wdbyl5wqhlhm1y"; + rev = "v3.5.0_nix"; + sha256 = "sha256-Ea3PVkCaUPO/mvVZtHtD1G9T/Yom28M9oN6duY4ovHk="; }; - patches = [ - ./darwin-3.1.3.patch - ]; }) |