diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-01-22 00:14:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-22 00:14:05 +0000 |
| commit | 4b19a2dca31b89fdc333cf4db8244c3dd496a172 (patch) | |
| tree | ea4a87793ff4306f2e78078b639ac0fa51fc7fff /maintainers | |
| parent | 4684c03fe1819101e279127e8f1d14be9cdafec7 (diff) | |
| parent | a9d9ac9827026bfac442b1021c73421e8be9bf8a (diff) | |
Merge master into haskell-updates
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 12 | ||||
| -rw-r--r-- | maintainers/scripts/nix-generate-from-cpan.nix | 15 |
2 files changed, 19 insertions, 8 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b0ba625a0f169..4138bdd543949 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6172,6 +6172,12 @@ githubId = 4085046; name = "Imuli"; }; + inclyc = { + email = "i@lyc.dev"; + github = "inclyc"; + githubId = 36667224; + name = "Yingchi Long"; + }; ineol = { email = "leo.stefanesco@gmail.com"; github = "ineol"; @@ -16379,4 +16385,10 @@ github = "franzmondlichtmann"; githubId = 105480088; }; + srounce = { + name = "Samuel Rounce"; + email = "me@samuelrounce.co.uk"; + github = "srounce"; + githubId = 60792; + }; } diff --git a/maintainers/scripts/nix-generate-from-cpan.nix b/maintainers/scripts/nix-generate-from-cpan.nix index 9f9833d406073..bf48a53186119 100644 --- a/maintainers/scripts/nix-generate-from-cpan.nix +++ b/maintainers/scripts/nix-generate-from-cpan.nix @@ -9,15 +9,14 @@ stdenv.mkDerivation { perl GetoptLongDescriptive CPANPLUS Readonly LogLog4perl ]; - phases = [ "installPhase" ]; + dontUnpack = true; - installPhase = - '' - mkdir -p $out/bin - cp ${./nix-generate-from-cpan.pl} $out/bin/nix-generate-from-cpan - patchShebangs $out/bin/nix-generate-from-cpan - wrapProgram $out/bin/nix-generate-from-cpan --set PERL5LIB $PERL5LIB - ''; + installPhase = '' + mkdir -p $out/bin + cp ${./nix-generate-from-cpan.pl} $out/bin/nix-generate-from-cpan + patchShebangs $out/bin/nix-generate-from-cpan + wrapProgram $out/bin/nix-generate-from-cpan --set PERL5LIB $PERL5LIB + ''; meta = { maintainers = with lib.maintainers; [ eelco ]; |