summary refs log tree commit diff
path: root/maintainers
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2021-12-06 08:33:14 +0000
committerGitHub <noreply@github.com>2021-12-06 08:33:14 +0000
commitc7fa870f5ad2697209e40cd39b4f7e580da17a83 (patch)
treec1d7765159181ae2fe944b9e834b5dd694500ccb /maintainers
parent3a9dad96f09151a357e1cc317cee9345689ba6fb (diff)
parentfa857bb4357937a20675ae1ef49cf37e54e2f20c (diff)
downloadnixpkgs-c7fa870f5ad2697209e40cd39b4f7e580da17a83.tar
nixpkgs-c7fa870f5ad2697209e40cd39b4f7e580da17a83.tar.gz
nixpkgs-c7fa870f5ad2697209e40cd39b4f7e580da17a83.tar.bz2
nixpkgs-c7fa870f5ad2697209e40cd39b4f7e580da17a83.tar.lz
nixpkgs-c7fa870f5ad2697209e40cd39b4f7e580da17a83.tar.xz
nixpkgs-c7fa870f5ad2697209e40cd39b4f7e580da17a83.tar.zst
nixpkgs-c7fa870f5ad2697209e40cd39b4f7e580da17a83.zip
Merge pull request #148535 from martinetd/bpf
bpf update: bcc remove linux kernel dep + devendor libbpf again, bpftrace 0.13.0 -> 0.14.0 + remove kernel dep, pahole 1.20 -> 1.22 + remove submodule, libbpf revert 0.6.0 -> 0.5.0 (unusable)
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 5ddc8b266ec..188936812ab 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7238,6 +7238,12 @@
     githubId = 623509;
     name = "Martijn Vermaat";
   };
+  martinetd = {
+    email = "f.ktfhrvnznqxacf@noclue.notk.org";
+    github = "martinetd";
+    githubId = 1729331;
+    name = "Dominique Martinet";
+  };
   martingms = {
     email = "martin@mg.am";
     github = "martingms";