Revert "maintainers: drop edwtjo" (#469425)

2025-12-11 19:17:41 +00:00
parent 1a01d7df38 7d1bb2cb0f
commit 62ee344ff4
26 changed files with 33 additions and 1 deletions
@@ -7447,6 +7447,12 @@
    githubId = 494483;
    name = "Michael Francis";
  };
+  edwtjo = {
+    email = "ed@cflags.cc";
+    github = "edwtjo";
+    githubId = 54799;
+    name = "Edward Tjörnhammar";
+  };
  eeedean = {
    github = "eeedean";
    githubId = 8173116;
@@ -24,6 +24,7 @@ let
    description = "Design and visualize your future home";
    license = lib.licenses.gpl2Plus;
    maintainers = with lib.maintainers; [
+      edwtjo
      DimitarNestorov
    ];
    platforms = [
@@ -93,6 +93,7 @@ let
        homepage = "http://www.sweethome3d.com/index.jsp";
        inherit description;
        inherit license;
+        maintainers = [ lib.maintainers.edwtjo ];
        platforms = lib.platforms.linux;
        mainProgram = exec;
      };
@@ -39,6 +39,7 @@ stdenv.mkDerivation rec {
  meta = {
    description = "Rapidly extract unformatted, or unstandardized bibliographic references from email alerts, journal Web pages and PDF files";
    homepage = "http://www.molspaces.com/d_cb2bib-overview.php";
+    maintainers = with lib.maintainers; [ edwtjo ];
    license = lib.licenses.gpl3;
  };

@@ -264,6 +264,7 @@ stdenv.mkDerivation (finalAttrs: {
    homepage = "http://shogun-toolbox.org/";
    license = if withSvmLight then lib.licenses.unfree else lib.licenses.gpl3Plus;
    maintainers = with lib.maintainers; [
+      edwtjo
      smancill
    ];
  };
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
    description = "Retrieve WPA/WPA2 passphrase from a WPS enabled access point";
    homepage = "https://github.com/kimocoder/bully";
    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ edwtjo ];
    platforms = lib.platforms.linux;
    mainProgram = "bully";
  };
@@ -24,7 +24,9 @@ stdenv.mkDerivation rec {
    description = "Multi-paradigm automated test framework for C++ and Objective-C (and, maybe, C)";
    homepage = "http://catch-lib.net";
    license = lib.licenses.boost;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [
+      edwtjo
+    ];
    platforms = with lib.platforms; unix ++ windows;
  };
 }
@@ -43,5 +43,6 @@ stdenv.mkDerivation rec {
    homepage = "https://cscapes.cs.purdue.edu/coloringpage/software.htm#functionalities";
    license = lib.licenses.lgpl3Plus;
    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ edwtjo ];
  };
 }
@@ -68,5 +68,6 @@ stdenv.mkDerivation rec {
    mainProgram = "ezquake";
    license = lib.licenses.gpl2Plus;
    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ edwtjo ];
  };
 }
@@ -28,5 +28,6 @@ python3Packages.buildPythonApplication rec {
    description = "Command-line podcast aggregator";
    mainProgram = "greg";
    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ edwtjo ];
  };
 }
@@ -54,6 +54,7 @@ stdenv.mkDerivation rec {
    license = lib.licenses.libpng; # very close to it - the 3 clauses are identical
    homepage = "http://html-tidy.org";
    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ edwtjo ];
    mainProgram = "tidy";
  };
 }
@@ -53,6 +53,7 @@ stdenv.mkDerivation rec {
    homepage = "https://i2pd.website";
    description = "Minimal I2P router written in C++";
    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ edwtjo ];
    platforms = lib.platforms.unix;
    mainProgram = "i2pd";
  };
@@ -41,6 +41,7 @@ stdenv.mkDerivation rec {
    homepage = "https://languagetool.org";
    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
    license = lib.licenses.lgpl21Plus;
+    maintainers = with lib.maintainers; [ edwtjo ];
    platforms = jre.meta.platforms;
    description = "Proofreading program for English, French German, Polish, and more";
  };
@@ -32,6 +32,7 @@ stdenv.mkDerivation rec {
  meta = {
    description = "Lightweight cross platform C++ GUID/UUID library";
    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ edwtjo ];
    homepage = "https://github.com/graeme-hill/crossguid";
    platforms = with lib.platforms; linux;
  };
@@ -46,6 +46,7 @@ rustPlatform.buildRustPackage rec {
    homepage = "https://github.com/mdevctl/mdevctl";
    description = "Mediated device management utility for linux";
    license = lib.licenses.lgpl21Only;
+    maintainers = with lib.maintainers; [ edwtjo ];
    platforms = lib.platforms.linux;
  };
 }
@@ -33,6 +33,7 @@ stdenv.mkDerivation rec {
    homepage = "http://monkey.org/~marius/nylon";
    description = "Proxy server, supporting SOCKS 4 and 5, as well as a mirror mode";
    license = lib.licenses.bsdOriginal;
+    maintainers = with lib.maintainers; [ edwtjo ];
    platforms = lib.platforms.linux;
    mainProgram = "nylon";
  };
@@ -51,6 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
    homepage = "https://gitlab.com/ubports/development/core/lib-cpp/properties-cpp";
    description = "Very simple convenience library for handling properties and signals in C++11";
    license = lib.licenses.lgpl3Only;
+    maintainers = with lib.maintainers; [ edwtjo ];
    platforms = lib.platforms.linux;
    pkgConfigModules = [
      "properties-cpp"
@@ -53,5 +53,6 @@ stdenv.mkDerivation rec {
    homepage = "https://github.com/linux-rdma/qperf";
    license = lib.licenses.gpl2Only;
    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ edwtjo ];
  };
 }
@@ -28,6 +28,7 @@ stdenv.mkDerivation {
    '';
    homepage = "https://srm.sourceforge.net";
    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ edwtjo ];
    platforms = lib.platforms.unix;
  };
 }
@@ -62,6 +62,7 @@ stdenvNoCC.mkDerivation (
      description = "Storage Command Line Tool";
      sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
      license = lib.licenses.unfree;
+      maintainers = with lib.maintainers; [ edwtjo ];
      mainProgram = "storcli2";
      platforms = [
        "x86_64-linux"
@@ -39,6 +39,7 @@ stdenv.mkDerivation rec {
    mainProgram = "tsocks";
    homepage = "https://tsocks.sourceforge.net/";
    license = lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ edwtjo ];
    platforms = lib.platforms.unix;
    broken = stdenv.hostPlatform.isDarwin;
  };
@@ -62,6 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
    homepage = "https://x11-basic.codeberg.page";
    description = "Basic interpreter and compiler with graphics capabilities";
    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ edwtjo ];
    platforms = lib.platforms.unix;
  };
 })
@@ -83,6 +83,7 @@ buildPythonPackage rec {
      standard library and on the strengths of Python as a high-level
      programming language.
    '';
+    maintainers = with lib.maintainers; [ edwtjo ];
    license = lib.licenses.gpl3Plus;
  };
 }
@@ -21,6 +21,7 @@ buildPythonPackage rec {
  meta = {
    homepage = "http://rainwoodman.github.io/sharedmem/";
    description = "Easier parallel programming on shared memory computers";
+    maintainers = with lib.maintainers; [ edwtjo ];
    license = lib.licenses.gpl3;
  };
 }
@@ -59,5 +59,6 @@ stdenv.mkDerivation rec {
    license = lib.licenses.unfreeRedistributable;
    platforms = nvidia_x11.meta.platforms;
    mainProgram = "nv-fabricmanager";
+    maintainers = with lib.maintainers; [ edwtjo ];
  };
 }
@@ -340,6 +340,7 @@ stdenv.mkDerivation (finalAttrs: {
    ++ lib.optionals (sha256_aarch64 != null) [ "aarch64-linux" ];
    maintainers = with lib.maintainers; [
      kiskae
+      edwtjo
    ];
    priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so"
    inherit broken;