summary refs log tree commit diff
path: root/maintainers
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-10-26 18:01:19 +0000
committerGitHub <noreply@github.com>2021-10-26 18:01:19 +0000
commit9a27efeb34d572436e9e9f57bee1a8d28589a6ae (patch)
treeaede3e9be139d9082a69de17a90acf57af6db5ad /maintainers
parent6bb6e64046a99016e5510f2a73549ea055d056dd (diff)
parent4441cfb0e37637cc1954730401b0e166e587ef42 (diff)
downloadnixpkgs-9a27efeb34d572436e9e9f57bee1a8d28589a6ae.tar
nixpkgs-9a27efeb34d572436e9e9f57bee1a8d28589a6ae.tar.gz
nixpkgs-9a27efeb34d572436e9e9f57bee1a8d28589a6ae.tar.bz2
nixpkgs-9a27efeb34d572436e9e9f57bee1a8d28589a6ae.tar.lz
nixpkgs-9a27efeb34d572436e9e9f57bee1a8d28589a6ae.tar.xz
nixpkgs-9a27efeb34d572436e9e9f57bee1a8d28589a6ae.tar.zst
nixpkgs-9a27efeb34d572436e9e9f57bee1a8d28589a6ae.zip
Merge master into staging-next
Diffstat (limited to 'maintainers')
-rw-r--r--maintainers/maintainer-list.nix6
1 files changed, 6 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index e9949afe417..18331b69e0b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2885,6 +2885,12 @@
     githubId = 28980797;
     name = "David Leslie";
   };
+  dlip = {
+    email = "dane@lipscombe.com.au";
+    github = "dlip";
+    githubId = 283316;
+    name = "Dane Lipscombe";
+  };
   dmalikov = {
     email = "malikov.d.y@gmail.com";
     github = "dmalikov";