From e964e6e35d8ecf954c1a0cdbc43fbcf91f32d377 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Fri, 22 Jan 2021 01:05:05 +0100 Subject: luaPackages.cassowary: add alerque as maintainer it was added in the generated file, move it to the source of truth for the generated files. --- maintainers/scripts/luarocks-packages.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'maintainers') 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 -- cgit 1.4.1 From b20b9f98b83b342576a72664a4bf35aa5b6366d3 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Fri, 22 Jan 2021 12:16:11 +0100 Subject: luarocks-update-packages: pass "lib" in arguments --- maintainers/scripts/update-luarocks-packages | 2 +- pkgs/development/lua-modules/generated-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'maintainers') 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; { -- cgit 1.4.1 From 448484345d3aeb5a2d9d076f4f92061dae34d3b0 Mon Sep 17 00:00:00 2001 From: Potato Hatsue <1793913507@qq.com> Date: Mon, 18 Jan 2021 19:56:07 +0800 Subject: maintainers: add berberman --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'maintainers') diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 11162af66d8cc..134805b386f1c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1084,6 +1084,12 @@ githubId = 75972; name = "Ben Booth"; }; + berberman = { + email = "berberman@yandex.com"; + github = "berberman"; + githubId = 26041945; + name = "Potato Hatsue"; + }; berce = { email = "bert.moens@gmail.com"; github = "berce"; -- cgit 1.4.1