diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-24 06:44:02 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-24 06:44:02 +0000 |
| commit | a2994c588ade51270d8e50bc8c27a04b978afdbf (patch) | |
| tree | c52380339ab5b1726e49429e2b328b3282e3720d /maintainers | |
| parent | b88b52998be61d3959b3b3c17bc884576eedc1da (diff) | |
| parent | 2a9f33600cd8aa3c72fdcdbcc74bdd8096b81ab3 (diff) | |
Merge master into staging-next
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 6 | ||||
| -rw-r--r-- | maintainers/scripts/luarocks-packages.csv | 2 | ||||
| -rwxr-xr-x | maintainers/scripts/update-luarocks-packages | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 34bc802326e6..10a994c55da1 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"; diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index fb90e62769f8..ac9f22d23fb3 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 5c42080745eb..da4d224bd330 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; { |