diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-08-14 00:02:54 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-08-14 00:02:54 +0000 |
| commit | f9abd30e11337cf07034f2cc8ad1691aa4a69386 (patch) | |
| tree | c3b5c34b1c533f5c231dc6707e96795fb3a9a138 /nixpkgs/maintainers | |
| parent | 44e04ea2730f8e3b863b81b0056babe233c244f6 (diff) | |
| parent | 1036dc664169b32613ec11b58cc1740c7511a340 (diff) | |
| download | nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.gz nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.bz2 nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.lz nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.xz nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.zst nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.zip | |
Merge commit '1036dc664169b32613ec11b58cc1740c7511a340'
Diffstat (limited to 'nixpkgs/maintainers')
| -rw-r--r-- | nixpkgs/maintainers/maintainer-list.nix | 10 | ||||
| -rw-r--r-- | nixpkgs/maintainers/scripts/nixpkgs-lint.nix | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/nixpkgs/maintainers/maintainer-list.nix b/nixpkgs/maintainers/maintainer-list.nix index 8f3a692b6844..ef2ab823acc7 100644 --- a/nixpkgs/maintainers/maintainer-list.nix +++ b/nixpkgs/maintainers/maintainer-list.nix @@ -3462,6 +3462,11 @@ github = "mpickering"; name = "Matthew Pickering"; }; + mpoquet = { + email = "millian.poquet@gmail.com"; + github = "mpoquet"; + name = "Millian Poquet"; + }; mpscholten = { email = "marc@mpscholten.de"; github = "mpscholten"; @@ -3482,6 +3487,11 @@ github = "mrkkrp"; name = "Mark Karpov"; }; + mrmebelman = { + email = "burzakovskij@protonmail.com"; + github = "MrMebelMan"; + name = "Vladyslav Burzakovskyy"; + }; mrVanDalo = { email = "contact@ingolf-wagner.de"; github = "mrVanDalo"; diff --git a/nixpkgs/maintainers/scripts/nixpkgs-lint.nix b/nixpkgs/maintainers/scripts/nixpkgs-lint.nix index be2a92509f87..6d99c94bf33e 100644 --- a/nixpkgs/maintainers/scripts/nixpkgs-lint.nix +++ b/nixpkgs/maintainers/scripts/nixpkgs-lint.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { buildInputs = [ makeWrapper perl perlPackages.XMLSimple ]; - unpackPhase = "true"; + dontUnpack = true; buildPhase = "true"; installPhase = |