From 7d1bb2cb0fba1a5ddfad1c380240f6da13ae169d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Thu, 11 Dec 2025 20:03:47 +0100 Subject: [PATCH] Revert "maintainers: drop edwtjo" This partially reverts commit c0ec79be1d73c97dfdb980ad36a82951292e3ee6 as I intend to be more active. --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/applications/misc/sweethome3d/default.nix | 1 + pkgs/applications/misc/sweethome3d/editors.nix | 1 + pkgs/applications/office/cb2bib/default.nix | 1 + .../science/machine-learning/shogun/default.nix | 1 + pkgs/by-name/bu/bully/package.nix | 1 + pkgs/by-name/ca/catch2/package.nix | 4 +++- pkgs/by-name/co/colpack/package.nix | 1 + pkgs/by-name/ez/ezquake/package.nix | 1 + pkgs/by-name/gr/greg/package.nix | 1 + pkgs/by-name/ht/html-tidy/package.nix | 1 + pkgs/by-name/i2/i2pd/package.nix | 1 + pkgs/by-name/la/languagetool/package.nix | 1 + pkgs/by-name/li/libcrossguid/package.nix | 1 + pkgs/by-name/md/mdevctl/package.nix | 1 + pkgs/by-name/ny/nylon/package.nix | 1 + pkgs/by-name/pr/properties-cpp/package.nix | 1 + pkgs/by-name/qp/qperf/package.nix | 1 + pkgs/by-name/sr/srm/package.nix | 1 + pkgs/by-name/st/storcli2/package.nix | 1 + pkgs/by-name/ts/tsocks/package.nix | 1 + pkgs/by-name/x1/x11basic/package.nix | 1 + pkgs/development/python-modules/cvxopt/default.nix | 1 + pkgs/development/python-modules/sharedmem/default.nix | 1 + pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix | 1 + pkgs/os-specific/linux/nvidia-x11/generic.nix | 1 + 26 files changed, 33 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index fcb4b7e85466..84aee5448b7c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -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; diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index 944b4030cf7f..17291bdc2cce 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -24,6 +24,7 @@ let description = "Design and visualize your future home"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ + edwtjo DimitarNestorov ]; platforms = [ diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix index 1e3322511bbf..8a9959832da7 100644 --- a/pkgs/applications/misc/sweethome3d/editors.nix +++ b/pkgs/applications/misc/sweethome3d/editors.nix @@ -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; }; diff --git a/pkgs/applications/office/cb2bib/default.nix b/pkgs/applications/office/cb2bib/default.nix index da972b7e7463..ea3e5d9556cd 100644 --- a/pkgs/applications/office/cb2bib/default.nix +++ b/pkgs/applications/office/cb2bib/default.nix @@ -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; }; diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix index f2de71c05d22..e1e7c4d8a0ae 100644 --- a/pkgs/applications/science/machine-learning/shogun/default.nix +++ b/pkgs/applications/science/machine-learning/shogun/default.nix @@ -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 ]; }; diff --git a/pkgs/by-name/bu/bully/package.nix b/pkgs/by-name/bu/bully/package.nix index f823b19eea06..98a04088e911 100644 --- a/pkgs/by-name/bu/bully/package.nix +++ b/pkgs/by-name/bu/bully/package.nix @@ -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"; }; diff --git a/pkgs/by-name/ca/catch2/package.nix b/pkgs/by-name/ca/catch2/package.nix index 48e296cefded..2163b3696315 100644 --- a/pkgs/by-name/ca/catch2/package.nix +++ b/pkgs/by-name/ca/catch2/package.nix @@ -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; }; } diff --git a/pkgs/by-name/co/colpack/package.nix b/pkgs/by-name/co/colpack/package.nix index 5b617cbb52c7..2770cafacea8 100644 --- a/pkgs/by-name/co/colpack/package.nix +++ b/pkgs/by-name/co/colpack/package.nix @@ -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 ]; }; } diff --git a/pkgs/by-name/ez/ezquake/package.nix b/pkgs/by-name/ez/ezquake/package.nix index d99fbdce7473..2f30630226b5 100644 --- a/pkgs/by-name/ez/ezquake/package.nix +++ b/pkgs/by-name/ez/ezquake/package.nix @@ -68,5 +68,6 @@ stdenv.mkDerivation rec { mainProgram = "ezquake"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ edwtjo ]; }; } diff --git a/pkgs/by-name/gr/greg/package.nix b/pkgs/by-name/gr/greg/package.nix index d0833a2b5f7e..da9eca5d24ff 100644 --- a/pkgs/by-name/gr/greg/package.nix +++ b/pkgs/by-name/gr/greg/package.nix @@ -28,5 +28,6 @@ python3Packages.buildPythonApplication rec { description = "Command-line podcast aggregator"; mainProgram = "greg"; license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ edwtjo ]; }; } diff --git a/pkgs/by-name/ht/html-tidy/package.nix b/pkgs/by-name/ht/html-tidy/package.nix index 519e4f76d320..fe53847a3024 100644 --- a/pkgs/by-name/ht/html-tidy/package.nix +++ b/pkgs/by-name/ht/html-tidy/package.nix @@ -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"; }; } diff --git a/pkgs/by-name/i2/i2pd/package.nix b/pkgs/by-name/i2/i2pd/package.nix index a508e1922995..633baddaa3bf 100644 --- a/pkgs/by-name/i2/i2pd/package.nix +++ b/pkgs/by-name/i2/i2pd/package.nix @@ -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"; }; diff --git a/pkgs/by-name/la/languagetool/package.nix b/pkgs/by-name/la/languagetool/package.nix index d2d7c08b65e2..77a82ed8187f 100644 --- a/pkgs/by-name/la/languagetool/package.nix +++ b/pkgs/by-name/la/languagetool/package.nix @@ -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"; }; diff --git a/pkgs/by-name/li/libcrossguid/package.nix b/pkgs/by-name/li/libcrossguid/package.nix index 8b65fda2bb7c..4171220706a3 100644 --- a/pkgs/by-name/li/libcrossguid/package.nix +++ b/pkgs/by-name/li/libcrossguid/package.nix @@ -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; }; diff --git a/pkgs/by-name/md/mdevctl/package.nix b/pkgs/by-name/md/mdevctl/package.nix index e7985362ee10..dd5ca6aac258 100644 --- a/pkgs/by-name/md/mdevctl/package.nix +++ b/pkgs/by-name/md/mdevctl/package.nix @@ -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; }; } diff --git a/pkgs/by-name/ny/nylon/package.nix b/pkgs/by-name/ny/nylon/package.nix index ffb459be3213..17ffd478aa05 100644 --- a/pkgs/by-name/ny/nylon/package.nix +++ b/pkgs/by-name/ny/nylon/package.nix @@ -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"; }; diff --git a/pkgs/by-name/pr/properties-cpp/package.nix b/pkgs/by-name/pr/properties-cpp/package.nix index c368d27ecd27..c0e6f35dac6f 100644 --- a/pkgs/by-name/pr/properties-cpp/package.nix +++ b/pkgs/by-name/pr/properties-cpp/package.nix @@ -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" diff --git a/pkgs/by-name/qp/qperf/package.nix b/pkgs/by-name/qp/qperf/package.nix index 20d13c7af3d9..e4400af6bfb9 100644 --- a/pkgs/by-name/qp/qperf/package.nix +++ b/pkgs/by-name/qp/qperf/package.nix @@ -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 ]; }; } diff --git a/pkgs/by-name/sr/srm/package.nix b/pkgs/by-name/sr/srm/package.nix index 859b3993af30..55c7863e739b 100644 --- a/pkgs/by-name/sr/srm/package.nix +++ b/pkgs/by-name/sr/srm/package.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation { ''; homepage = "https://srm.sourceforge.net"; license = lib.licenses.mit; + maintainers = with lib.maintainers; [ edwtjo ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/st/storcli2/package.nix b/pkgs/by-name/st/storcli2/package.nix index 1ed23684e46f..afb83a6a1214 100644 --- a/pkgs/by-name/st/storcli2/package.nix +++ b/pkgs/by-name/st/storcli2/package.nix @@ -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" diff --git a/pkgs/by-name/ts/tsocks/package.nix b/pkgs/by-name/ts/tsocks/package.nix index 0b0328b51bc0..820cb0a7a17d 100644 --- a/pkgs/by-name/ts/tsocks/package.nix +++ b/pkgs/by-name/ts/tsocks/package.nix @@ -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; }; diff --git a/pkgs/by-name/x1/x11basic/package.nix b/pkgs/by-name/x1/x11basic/package.nix index 5a6f8536cff5..a0756b46a437 100644 --- a/pkgs/by-name/x1/x11basic/package.nix +++ b/pkgs/by-name/x1/x11basic/package.nix @@ -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; }; }) diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix index e8bc9c76ad1a..94dbff6ab5fa 100644 --- a/pkgs/development/python-modules/cvxopt/default.nix +++ b/pkgs/development/python-modules/cvxopt/default.nix @@ -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; }; } diff --git a/pkgs/development/python-modules/sharedmem/default.nix b/pkgs/development/python-modules/sharedmem/default.nix index 9793f67a4691..0615feb911df 100644 --- a/pkgs/development/python-modules/sharedmem/default.nix +++ b/pkgs/development/python-modules/sharedmem/default.nix @@ -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; }; } diff --git a/pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix b/pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix index 2f55aca3a92c..4d4e61a5942f 100644 --- a/pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix +++ b/pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix @@ -59,5 +59,6 @@ stdenv.mkDerivation rec { license = lib.licenses.unfreeRedistributable; platforms = nvidia_x11.meta.platforms; mainProgram = "nv-fabricmanager"; + maintainers = with lib.maintainers; [ edwtjo ]; }; } diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 7f9a5d32a7a4..ecc245e5a81d 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -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;