diff --git a/ci/OWNERS b/ci/OWNERS index 10d5c5091bf6..e7b4fd3c2de4 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -262,7 +262,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /pkgs/top-level/java-packages.nix @NixOS/java # Jetbrains -/pkgs/applications/editors/jetbrains @edwtjo @leona-ya @theCapypara +/pkgs/applications/editors/jetbrains @leona-ya @theCapypara # Licenses /lib/licenses.nix @alyssais @emilazy @jopejoe1 diff --git a/maintainers/github-teams.json b/maintainers/github-teams.json index 500bd05ab5f6..3a8e7b351a6b 100644 --- a/maintainers/github-teams.json +++ b/maintainers/github-teams.json @@ -499,7 +499,6 @@ }, "members": { "cpages": 411324, - "edwtjo": 54799, "minijackson": 1200507, "peterhoeg": 722550, "sephalon": 893474 diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 82689502e79f..73321eafdca2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7447,12 +7447,6 @@ 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/maintainers/team-list.nix b/maintainers/team-list.nix index 167dcff8943d..49d7f8098484 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -494,7 +494,6 @@ with lib.maintainers; jetbrains = { members = [ - edwtjo leona theCapypara thiagokokada @@ -534,7 +533,6 @@ with lib.maintainers; aanderse cpages dschrempf - edwtjo kazenyuk minijackson peterhoeg @@ -550,7 +548,6 @@ with lib.maintainers; libretro = { members = [ aanderse - edwtjo hrdinka thiagokokada ]; diff --git a/pkgs/applications/editors/jetbrains/bin/ides.json b/pkgs/applications/editors/jetbrains/bin/ides.json index 86d9670b3a7f..a4ec3d82583f 100644 --- a/pkgs/applications/editors/jetbrains/bin/ides.json +++ b/pkgs/applications/editors/jetbrains/bin/ides.json @@ -16,7 +16,7 @@ "meta": { "isOpenSource": false, "description": "C/C++ IDE from JetBrains", - "maintainers": [ "edwtjo", "mic92", "tymscar" ], + "maintainers": [ "mic92", "tymscar" ], "longDescription": "Enhancing productivity for every C and C++ developer on Linux, macOS and Windows.", "homepage": "https://www.jetbrains.com/clion/" } @@ -73,7 +73,7 @@ "meta": { "isOpenSource": true, "description": "Free Java, Kotlin, Groovy and Scala IDE from jetbrains", - "maintainers": [ "edwtjo", "gytis-ivaskevicius", "tymscar" ], + "maintainers": [ "gytis-ivaskevicius", "tymscar" ], "longDescription": "IDE for Java SE, Groovy & Scala development Powerful environment for building Google Android apps Integration with JUnit, TestNG, popular SCMs, Ant & Maven. Also known as IntelliJ.", "homepage": "https://www.jetbrains.com/idea/" } @@ -85,7 +85,7 @@ "meta": { "isOpenSource": false, "description": "Paid-for Java, Kotlin, Groovy and Scala IDE from jetbrains", - "maintainers": [ "edwtjo", "gytis-ivaskevicius", "tymscar" ], + "maintainers": [ "gytis-ivaskevicius", "tymscar" ], "longDescription": "IDE for Java SE, Groovy & Scala development Powerful environment for building Google Android apps Integration with JUnit, TestNG, popular SCMs, Ant & Maven. Also known as IntelliJ.", "homepage": "https://www.jetbrains.com/idea/" } @@ -153,7 +153,7 @@ "meta": { "isOpenSource": false, "description": "Ruby IDE from JetBrains", - "maintainers": [ "edwtjo", "tymscar"], + "maintainers": [ "tymscar"], "longDescription": "Ruby IDE from JetBrains", "homepage": "https://www.jetbrains.com/ruby/" } diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index 17291bdc2cce..944b4030cf7f 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -24,7 +24,6 @@ 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 8a9959832da7..1e3322511bbf 100644 --- a/pkgs/applications/misc/sweethome3d/editors.nix +++ b/pkgs/applications/misc/sweethome3d/editors.nix @@ -93,7 +93,6 @@ 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 96e2ae202815..d177d6efffc7 100644 --- a/pkgs/applications/office/cb2bib/default.nix +++ b/pkgs/applications/office/cb2bib/default.nix @@ -39,7 +39,6 @@ stdenv.mkDerivation rec { meta = with lib; { 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 maintainers; [ edwtjo ]; license = licenses.gpl3; }; diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix index b96228fe468e..00230a9f89c3 100644 --- a/pkgs/applications/science/machine-learning/shogun/default.nix +++ b/pkgs/applications/science/machine-learning/shogun/default.nix @@ -264,7 +264,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://shogun-toolbox.org/"; license = if withSvmLight then licenses.unfree else licenses.gpl3Plus; maintainers = with maintainers; [ - edwtjo smancill ]; }; diff --git a/pkgs/by-name/ab/abook/package.nix b/pkgs/by-name/ab/abook/package.nix index f0cf91fb19e7..9f91e82a44d8 100644 --- a/pkgs/by-name/ab/abook/package.nix +++ b/pkgs/by-name/ab/abook/package.nix @@ -47,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://abook.sourceforge.net/"; description = "Text-based addressbook program designed to use with mutt mail client"; license = lib.licenses.gpl3Only; - maintainers = [ lib.maintainers.edwtjo ]; platforms = lib.platforms.unix; mainProgram = "abook"; }; diff --git a/pkgs/by-name/ac/acd-cli/package.nix b/pkgs/by-name/ac/acd-cli/package.nix index 54f2e51368ad..89c51bcd1731 100644 --- a/pkgs/by-name/ac/acd-cli/package.nix +++ b/pkgs/by-name/ac/acd-cli/package.nix @@ -46,6 +46,5 @@ python3Packages.buildPythonApplication rec { description = "Command line interface and FUSE filesystem for Amazon Cloud Drive"; homepage = "https://github.com/yadayada/acd_cli"; license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ edwtjo ]; }; } diff --git a/pkgs/by-name/bu/bully/package.nix b/pkgs/by-name/bu/bully/package.nix index a49c7559b328..0e9e50de1c7b 100644 --- a/pkgs/by-name/bu/bully/package.nix +++ b/pkgs/by-name/bu/bully/package.nix @@ -31,7 +31,6 @@ stdenv.mkDerivation rec { description = "Retrieve WPA/WPA2 passphrase from a WPS enabled access point"; homepage = "https://github.com/kimocoder/bully"; license = licenses.gpl3; - maintainers = with maintainers; [ edwtjo ]; platforms = platforms.linux; mainProgram = "bully"; }; diff --git a/pkgs/by-name/ca/catch2/package.nix b/pkgs/by-name/ca/catch2/package.nix index 087ad0923f26..0551ba9828ef 100644 --- a/pkgs/by-name/ca/catch2/package.nix +++ b/pkgs/by-name/ca/catch2/package.nix @@ -24,9 +24,7 @@ stdenv.mkDerivation rec { description = "Multi-paradigm automated test framework for C++ and Objective-C (and, maybe, C)"; homepage = "http://catch-lib.net"; license = licenses.boost; - maintainers = with maintainers; [ - edwtjo - ]; + maintainers = [ ]; platforms = with platforms; unix ++ windows; }; } diff --git a/pkgs/by-name/co/colpack/package.nix b/pkgs/by-name/co/colpack/package.nix index 56bb94293a0e..9aedffcd3368 100644 --- a/pkgs/by-name/co/colpack/package.nix +++ b/pkgs/by-name/co/colpack/package.nix @@ -43,6 +43,5 @@ stdenv.mkDerivation rec { homepage = "https://cscapes.cs.purdue.edu/coloringpage/software.htm#functionalities"; license = licenses.lgpl3Plus; platforms = platforms.unix; - maintainers = with maintainers; [ edwtjo ]; }; } diff --git a/pkgs/by-name/dc/dcadec/package.nix b/pkgs/by-name/dc/dcadec/package.nix index 7468427b3745..4d7dfe578f20 100644 --- a/pkgs/by-name/dc/dcadec/package.nix +++ b/pkgs/by-name/dc/dcadec/package.nix @@ -22,7 +22,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "DTS Coherent Acoustics decoder with support for HD extensions"; mainProgram = "dcadec"; - maintainers = with maintainers; [ edwtjo ]; homepage = "https://github.com/foo86/dcadec"; license = licenses.lgpl21; platforms = platforms.linux; diff --git a/pkgs/by-name/ez/ezquake/package.nix b/pkgs/by-name/ez/ezquake/package.nix index 2f30630226b5..d99fbdce7473 100644 --- a/pkgs/by-name/ez/ezquake/package.nix +++ b/pkgs/by-name/ez/ezquake/package.nix @@ -68,6 +68,5 @@ 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 da9eca5d24ff..d0833a2b5f7e 100644 --- a/pkgs/by-name/gr/greg/package.nix +++ b/pkgs/by-name/gr/greg/package.nix @@ -28,6 +28,5 @@ 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 fa5c7f20a965..7c158685a512 100644 --- a/pkgs/by-name/ht/html-tidy/package.nix +++ b/pkgs/by-name/ht/html-tidy/package.nix @@ -54,7 +54,6 @@ stdenv.mkDerivation rec { license = licenses.libpng; # very close to it - the 3 clauses are identical homepage = "http://html-tidy.org"; platforms = platforms.all; - maintainers = with maintainers; [ edwtjo ]; mainProgram = "tidy"; }; } diff --git a/pkgs/by-name/i2/i2pd/package.nix b/pkgs/by-name/i2/i2pd/package.nix index 83b9fa9aa0cb..a04b37442a18 100644 --- a/pkgs/by-name/i2/i2pd/package.nix +++ b/pkgs/by-name/i2/i2pd/package.nix @@ -53,7 +53,6 @@ stdenv.mkDerivation rec { homepage = "https://i2pd.website"; description = "Minimal I2P router written in C++"; license = licenses.bsd3; - maintainers = with maintainers; [ edwtjo ]; platforms = platforms.unix; mainProgram = "i2pd"; }; diff --git a/pkgs/by-name/la/languagetool/package.nix b/pkgs/by-name/la/languagetool/package.nix index 1efeed22615a..a9f97b25d964 100644 --- a/pkgs/by-name/la/languagetool/package.nix +++ b/pkgs/by-name/la/languagetool/package.nix @@ -41,7 +41,6 @@ stdenv.mkDerivation rec { homepage = "https://languagetool.org"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.lgpl21Plus; - maintainers = with 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 ac743a2452a7..bc9b0706738a 100644 --- a/pkgs/by-name/li/libcrossguid/package.nix +++ b/pkgs/by-name/li/libcrossguid/package.nix @@ -32,7 +32,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Lightweight cross platform C++ GUID/UUID library"; license = licenses.mit; - maintainers = with maintainers; [ edwtjo ]; homepage = "https://github.com/graeme-hill/crossguid"; platforms = with platforms; linux; }; diff --git a/pkgs/by-name/li/lightdm-tiny-greeter/package.nix b/pkgs/by-name/li/lightdm-tiny-greeter/package.nix index 46a5ff29365c..eb0f46c6d39e 100644 --- a/pkgs/by-name/li/lightdm-tiny-greeter/package.nix +++ b/pkgs/by-name/li/lightdm-tiny-greeter/package.nix @@ -62,7 +62,6 @@ stdenv.mkDerivation rec { mainProgram = "lightdm-tiny-greeter"; homepage = "https://github.com/off-world/lightdm-tiny-greeter"; license = licenses.bsd3; - maintainers = with maintainers; [ edwtjo ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/md/mdevctl/package.nix b/pkgs/by-name/md/mdevctl/package.nix index f0966dcc0dbf..25c6f677de56 100644 --- a/pkgs/by-name/md/mdevctl/package.nix +++ b/pkgs/by-name/md/mdevctl/package.nix @@ -46,7 +46,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/mdevctl/mdevctl"; description = "Mediated device management utility for linux"; license = licenses.lgpl21Only; - maintainers = with maintainers; [ edwtjo ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/ml/mlmmj/package.nix b/pkgs/by-name/ml/mlmmj/package.nix index 2da4ac7ab240..26e5dd2f1071 100644 --- a/pkgs/by-name/ml/mlmmj/package.nix +++ b/pkgs/by-name/ml/mlmmj/package.nix @@ -41,7 +41,6 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://mlmmj.org"; description = "Mailing List Management Made Joyful"; - maintainers = [ maintainers.edwtjo ]; platforms = platforms.linux; license = licenses.mit; }; diff --git a/pkgs/by-name/ny/nylon/package.nix b/pkgs/by-name/ny/nylon/package.nix index 3627cb2fdfeb..4ad702ff4bf9 100644 --- a/pkgs/by-name/ny/nylon/package.nix +++ b/pkgs/by-name/ny/nylon/package.nix @@ -33,7 +33,6 @@ stdenv.mkDerivation rec { homepage = "http://monkey.org/~marius/nylon"; description = "Proxy server, supporting SOCKS 4 and 5, as well as a mirror mode"; license = licenses.bsdOriginal; - maintainers = with maintainers; [ edwtjo ]; platforms = 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 46b608a71189..9bf4adab7d9b 100644 --- a/pkgs/by-name/pr/properties-cpp/package.nix +++ b/pkgs/by-name/pr/properties-cpp/package.nix @@ -51,7 +51,6 @@ 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 = licenses.lgpl3Only; - maintainers = with maintainers; [ edwtjo ]; platforms = platforms.linux; pkgConfigModules = [ "properties-cpp" diff --git a/pkgs/by-name/qp/qperf/package.nix b/pkgs/by-name/qp/qperf/package.nix index 4ec27077d532..162b546d2589 100644 --- a/pkgs/by-name/qp/qperf/package.nix +++ b/pkgs/by-name/qp/qperf/package.nix @@ -53,6 +53,5 @@ stdenv.mkDerivation rec { homepage = "https://github.com/linux-rdma/qperf"; license = licenses.gpl2Only; platforms = platforms.linux; - maintainers = with maintainers; [ edwtjo ]; }; } diff --git a/pkgs/by-name/ra/radarr/package.nix b/pkgs/by-name/ra/radarr/package.nix index c0c3590450c7..90f60bb6d22c 100644 --- a/pkgs/by-name/ra/radarr/package.nix +++ b/pkgs/by-name/ra/radarr/package.nix @@ -194,7 +194,6 @@ buildDotnetModule { changelog = "https://github.com/Radarr/Radarr/releases/tag/v${version}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ - edwtjo purcell nyanloutre ]; diff --git a/pkgs/by-name/sr/srm/package.nix b/pkgs/by-name/sr/srm/package.nix index ccecb22418e1..05738dc6b7bd 100644 --- a/pkgs/by-name/sr/srm/package.nix +++ b/pkgs/by-name/sr/srm/package.nix @@ -28,7 +28,6 @@ stdenv.mkDerivation { ''; homepage = "https://srm.sourceforge.net"; license = licenses.mit; - maintainers = with maintainers; [ edwtjo ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/st/storcli2/package.nix b/pkgs/by-name/st/storcli2/package.nix index c9d121743a28..5797ce75e42a 100644 --- a/pkgs/by-name/st/storcli2/package.nix +++ b/pkgs/by-name/st/storcli2/package.nix @@ -62,7 +62,6 @@ stdenvNoCC.mkDerivation ( description = "Storage Command Line Tool"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ edwtjo ]; mainProgram = "storcli2"; platforms = [ "x86_64-linux" diff --git a/pkgs/by-name/st/storm/package.nix b/pkgs/by-name/st/storm/package.nix index f617fa8c9afe..d8e04f914114 100644 --- a/pkgs/by-name/st/storm/package.nix +++ b/pkgs/by-name/st/storm/package.nix @@ -80,7 +80,6 @@ stdenv.mkDerivation (finalAttrs: { sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; maintainers = with maintainers; [ - edwtjo vizanto ]; platforms = with platforms; unix; diff --git a/pkgs/by-name/ts/tsocks/package.nix b/pkgs/by-name/ts/tsocks/package.nix index 03faca1336f4..4bd4c1f44ec5 100644 --- a/pkgs/by-name/ts/tsocks/package.nix +++ b/pkgs/by-name/ts/tsocks/package.nix @@ -39,7 +39,6 @@ stdenv.mkDerivation rec { mainProgram = "tsocks"; homepage = "https://tsocks.sourceforge.net/"; license = lib.licenses.gpl2; - maintainers = with maintainers; [ edwtjo ]; platforms = 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 a0756b46a437..5a6f8536cff5 100644 --- a/pkgs/by-name/x1/x11basic/package.nix +++ b/pkgs/by-name/x1/x11basic/package.nix @@ -62,7 +62,6 @@ 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/compilers/jetbrains-jdk/17.nix b/pkgs/development/compilers/jetbrains-jdk/17.nix index fe215fcf79ad..9d1445e074e6 100644 --- a/pkgs/development/compilers/jetbrains-jdk/17.nix +++ b/pkgs/development/compilers/jetbrains-jdk/17.nix @@ -162,7 +162,7 @@ openjdk17.overrideAttrs (oldAttrs: rec { ] ++ oldAttrs.nativeBuildInputs; - meta = with lib; { + meta = { description = "OpenJDK fork which better supports Jetbrains's products"; longDescription = '' JetBrains Runtime is a runtime environment for running IntelliJ Platform @@ -176,7 +176,6 @@ openjdk17.overrideAttrs (oldAttrs: rec { ''; homepage = "https://confluence.jetbrains.com/display/JBR/JetBrains+Runtime"; inherit (openjdk17.meta) license platforms mainProgram; - maintainers = with maintainers; [ edwtjo ]; broken = stdenv.hostPlatform.isDarwin; }; diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index 67e11e7082cf..b5c58fb1384b 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -198,7 +198,6 @@ jdk.overrideAttrs (oldAttrs: rec { homepage = "https://confluence.jetbrains.com/display/JBR/JetBrains+Runtime"; inherit (jdk.meta) license platforms mainProgram; maintainers = with maintainers; [ - edwtjo aoli-al ]; diff --git a/pkgs/development/compilers/openjdk/generic.nix b/pkgs/development/compilers/openjdk/generic.nix index b783cd7fbf0d..8b180376f10c 100644 --- a/pkgs/development/compilers/openjdk/generic.nix +++ b/pkgs/development/compilers/openjdk/generic.nix @@ -606,7 +606,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://openjdk.java.net/"; license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ - edwtjo infinidoge ]; teams = [ lib.teams.java ]; diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix index a5a5f32c6584..59158e100072 100644 --- a/pkgs/development/python-modules/cvxopt/default.nix +++ b/pkgs/development/python-modules/cvxopt/default.nix @@ -83,7 +83,6 @@ buildPythonPackage rec { standard library and on the strengths of Python as a high-level programming language. ''; - maintainers = with maintainers; [ edwtjo ]; license = licenses.gpl3Plus; }; } diff --git a/pkgs/development/python-modules/sharedmem/default.nix b/pkgs/development/python-modules/sharedmem/default.nix index 0615feb911df..9793f67a4691 100644 --- a/pkgs/development/python-modules/sharedmem/default.nix +++ b/pkgs/development/python-modules/sharedmem/default.nix @@ -21,7 +21,6 @@ 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 4d4e61a5942f..2f55aca3a92c 100644 --- a/pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix +++ b/pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix @@ -59,6 +59,5 @@ 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 6b5fa18531fe..15a0f84045ca 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -340,7 +340,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals (sha256_aarch64 != null) [ "aarch64-linux" ]; maintainers = with maintainers; [ kiskae - edwtjo ]; priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so" inherit broken; diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 6c69af569fdb..ae38ad050f84 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -58,7 +58,6 @@ buildDotnetModule rec { changelog = "https://github.com/Jackett/Jackett/releases/tag/v${version}"; license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ - edwtjo nyanloutre purcell ];