Merge branch 'staging-next' into staging

2020-10-28 18:48:56 +01:00
parent 41822ddb93 31839c352e
commit 0b32140b34
86 changed files with 633 additions and 780 deletions
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
    '';
    homepage = "http://gnupg-pkcs11.sourceforge.net/";
    license = licenses.bsd3;
-    maintainers = with maintainers; [ lschuermann philandstuff ];
+    maintainers = with maintainers; [ matthiasbeyer philandstuff ];
    platforms = platforms.unix;
  };
 }
@@ -44,6 +44,6 @@ stdenv.mkDerivation rec {
    homepage = "https://github.com/tpm2-software/tpm2-tools";
    license = licenses.bsd3;
    platforms = platforms.linux;
-    maintainers = with maintainers; [ lschuermann ];
+    maintainers = with maintainers; [ matthiasbeyer ];
  };
 }