From 704253007546615784ba441d58726d25be0811f1 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Tue, 26 May 2020 19:44:00 +0200 Subject: [PATCH 1/3] nomacs: remove old maintainer, add myself as maintainer The old maintainer @ahmedtd sent me the following email: Title: Are you interested in being the NixPkgs maintainer for nomacs? Body: I don't run NixOS anymore, so I can't really build or check the PRs. --- pkgs/applications/graphics/nomacs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index a6bda01ebb6..67e95aec758 100644 --- a/pkgs/applications/graphics/nomacs/default.nix +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -55,7 +55,7 @@ mkDerivation rec { meta = with stdenv.lib; { homepage = "https://nomacs.org"; description = "Qt-based image viewer"; - maintainers = [maintainers.ahmedtd]; + maintainers = with stdenv.lib.maintainers; [ mindavi ]; license = licenses.gpl3Plus; repositories.git = "https://github.com/nomacs/nomacs.git"; inherit (qtbase.meta) platforms; From 0cf8e1d6456c836e0c9380074297e08ff9823531 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Tue, 26 May 2020 19:56:24 +0200 Subject: [PATCH 2/3] maintainers: remove @ahmedtd --- maintainers/maintainer-list.nix | 6 ------ pkgs/development/python-modules/csscompressor/default.nix | 2 +- pkgs/development/python-modules/htmlmin/default.nix | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b7ee7128513..2c8b39bd0d6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -247,12 +247,6 @@ githubId = 732652; name = "Andreas Herrmann"; }; - ahmedtd = { - email = "ahmed.taahir@gmail.com"; - github = "ahmedtd"; - githubId = 1017202; - name = "Taahir Ahmed"; - }; ahuzik = { email = "ales.guzik@gmail.com"; github = "alesguzik"; diff --git a/pkgs/development/python-modules/csscompressor/default.nix b/pkgs/development/python-modules/csscompressor/default.nix index 50f20164f64..a7256a54e3b 100644 --- a/pkgs/development/python-modules/csscompressor/default.nix +++ b/pkgs/development/python-modules/csscompressor/default.nix @@ -14,6 +14,6 @@ buildPythonPackage rec { description = "A python port of YUI CSS Compressor"; homepage = "https://pypi.python.org/pypi/csscompressor"; license = stdenv.lib.licenses.bsd3; - maintainers = [stdenv.lib.maintainers.ahmedtd]; + maintainers = []; }; } diff --git a/pkgs/development/python-modules/htmlmin/default.nix b/pkgs/development/python-modules/htmlmin/default.nix index ee8a83a098c..ccbc157837c 100644 --- a/pkgs/development/python-modules/htmlmin/default.nix +++ b/pkgs/development/python-modules/htmlmin/default.nix @@ -14,6 +14,6 @@ buildPythonPackage rec { description = "A configurable HTML Minifier with safety features"; homepage = "https://pypi.python.org/pypi/htmlmin"; license = stdenv.lib.licenses.bsd3; - maintainers = [stdenv.lib.maintainers.ahmedtd]; + maintainers = []; }; } From 5b32225cc15e4da4367d1343975a37d57ee1ff32 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Tue, 26 May 2020 19:56:37 +0200 Subject: [PATCH 3/3] nomacs: remove unused patch This patch became obsolete in the previous update, so can be removed. --- .../graphics/nomacs/nomacs-iostream.patch | 26 ------------------- 1 file changed, 26 deletions(-) delete mode 100644 pkgs/applications/graphics/nomacs/nomacs-iostream.patch diff --git a/pkgs/applications/graphics/nomacs/nomacs-iostream.patch b/pkgs/applications/graphics/nomacs/nomacs-iostream.patch deleted file mode 100644 index 53224e0260e..00000000000 --- a/pkgs/applications/graphics/nomacs/nomacs-iostream.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/DkCore/DkMetaData.cpp b/src/DkCore/DkMetaData.cpp -index d195757e..affec7be 100644 ---- a/src/DkCore/DkMetaData.cpp -+++ b/src/DkCore/DkMetaData.cpp -@@ -42,6 +42,8 @@ - #include - #pragma warning(pop) // no warnings from includes - end - -+#include -+ - namespace nmc { - - // DkMetaDataT -------------------------------------------------------------------- -diff --git a/src/DkGui/DkNoMacs.cpp b/src/DkGui/DkNoMacs.cpp -index 6a412f70..bbfba233 100644 ---- a/src/DkGui/DkNoMacs.cpp -+++ b/src/DkGui/DkNoMacs.cpp -@@ -96,6 +96,8 @@ - #include - #endif - -+#include -+ - namespace nmc { - - DkNomacsOSXEventFilter::DkNomacsOSXEventFilter(QObject *parent) : QObject(parent) {