diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2020-05-26 15:53:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-26 15:53:50 -0400 |
| commit | 7a36742c3687159e62a03773f8edf075dff23ac7 (patch) | |
| tree | 32ae60bdafa672d0c60449e45d1500e47a9062b9 /pkgs | |
| parent | 5035c65a600b5a8fbea10c41b41b7bd52c4a3ef1 (diff) | |
| parent | 5b32225cc15e4da4367d1343975a37d57ee1ff32 (diff) | |
Merge pull request #88957 from Mindavi/nomacs/maintainer-change
Nomacs/maintainer change
Diffstat (limited to 'pkgs')
4 files changed, 3 insertions, 29 deletions
diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index a6bda01ebb64a..67e95aec75855 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; diff --git a/pkgs/applications/graphics/nomacs/nomacs-iostream.patch b/pkgs/applications/graphics/nomacs/nomacs-iostream.patch deleted file mode 100644 index 53224e0260eb0..0000000000000 --- 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 <QApplication> - #pragma warning(pop) // no warnings from includes - end - -+#include <iostream> -+ - 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 <QWinTaskbarButton> - #endif - -+#include <iostream> -+ - namespace nmc { - - DkNomacsOSXEventFilter::DkNomacsOSXEventFilter(QObject *parent) : QObject(parent) { diff --git a/pkgs/development/python-modules/csscompressor/default.nix b/pkgs/development/python-modules/csscompressor/default.nix index 50f20164f6469..a7256a54e3bee 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 ee8a83a098c90..ccbc157837c3d 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 = []; }; } |