From e7d1be840ccf453a8320fdc09759638270b1129a Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 1 Jan 2021 14:39:41 +0100 Subject: [PATCH 1/2] treewide: remove maintainership of `ma27` from a few packages Those are packages I don't use anymore for a longer time and I therefore don't think that listing me as maintainer is a good idea. If those should be removed now, I'd be fine with that. SuperSandro2000 will take care of a few packages[1]. [1] https://github.com/NixOS/nixpkgs/pull/108126#pullrequestreview-560599381 --- pkgs/applications/science/math/geogebra/default.nix | 2 +- .../version-management/git-and-tools/delta/default.nix | 2 +- pkgs/applications/window-managers/yabar/build.nix | 2 +- pkgs/development/python-modules/htmltreediff/default.nix | 2 +- pkgs/development/python-modules/pyaxmlparser/default.nix | 2 +- pkgs/development/python-modules/yowsup/default.nix | 2 +- pkgs/tools/admin/chkcrontab/default.nix | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix index a6950ad3451caf..a0548ffb232b3f 100644 --- a/pkgs/applications/science/math/geogebra/default.nix +++ b/pkgs/applications/science/math/geogebra/default.nix @@ -27,7 +27,7 @@ let calculus in one easy-to-use package. ''; homepage = "https://www.geogebra.org/"; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; license = with licenses; [ gpl3 cc-by-nc-sa-30 geogebra ]; platforms = with platforms; linux ++ darwin; hydraPlatforms = []; diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix index f44987037aab6f..e3862a81b42737 100644 --- a/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -34,6 +34,6 @@ rustPlatform.buildRustPackage rec { description = "A syntax-highlighting pager for git"; changelog = "https://github.com/dandavison/delta/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ marsam ma27 zowoq ]; + maintainers = with maintainers; [ marsam zowoq ]; }; } diff --git a/pkgs/applications/window-managers/yabar/build.nix b/pkgs/applications/window-managers/yabar/build.nix index 10806ba78cfe6d..b9996e1b4666a5 100644 --- a/pkgs/applications/window-managers/yabar/build.nix +++ b/pkgs/applications/window-managers/yabar/build.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation { homepage = "https://github.com/geommer/yabar"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/htmltreediff/default.nix b/pkgs/development/python-modules/htmltreediff/default.nix index cd742606f8b967..b0acec6be44117 100644 --- a/pkgs/development/python-modules/htmltreediff/default.nix +++ b/pkgs/development/python-modules/htmltreediff/default.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { description = " Structure-aware diff for html and xml documents"; homepage = "https://github.com/christian-oudard/htmltreediff"; license = licenses.bsdOriginal; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pyaxmlparser/default.nix b/pkgs/development/python-modules/pyaxmlparser/default.nix index 045cf19c8c0014..372d2feff15c6c 100644 --- a/pkgs/development/python-modules/pyaxmlparser/default.nix +++ b/pkgs/development/python-modules/pyaxmlparser/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { homepage = "https://github.com/appknox/pyaxmlparser"; # Files from Androguard are licensed ASL 2.0 license = with licenses; [ mit asl20 ]; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/yowsup/default.nix b/pkgs/development/python-modules/yowsup/default.nix index 0436fe8a0f00e8..c1f6b6632aab0c 100644 --- a/pkgs/development/python-modules/yowsup/default.nix +++ b/pkgs/development/python-modules/yowsup/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { homepage = "https://github.com/tgalal/yowsup"; description = "The python WhatsApp library"; license = licenses.gpl3; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/tools/admin/chkcrontab/default.nix b/pkgs/tools/admin/chkcrontab/default.nix index 0740b0c1be6060..73076b65c58712 100644 --- a/pkgs/tools/admin/chkcrontab/default.nix +++ b/pkgs/tools/admin/chkcrontab/default.nix @@ -14,7 +14,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "A tool to detect crontab errors"; license = licenses.asl20; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ SuperSandro2000 ]; homepage = "https://github.com/lyda/chkcrontab"; }; } From 0d3f7b6f4a1735168b575f7f1b3aab5defc30038 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 1 Jan 2021 19:48:59 +0100 Subject: [PATCH 2/2] python3Packages.htmltreediff: remove Not used anywhere and also not updated for a long time. --- .../python-modules/htmltreediff/default.nix | 26 ------------------- pkgs/top-level/python-packages.nix | 2 -- 2 files changed, 28 deletions(-) delete mode 100644 pkgs/development/python-modules/htmltreediff/default.nix diff --git a/pkgs/development/python-modules/htmltreediff/default.nix b/pkgs/development/python-modules/htmltreediff/default.nix deleted file mode 100644 index b0acec6be44117..00000000000000 --- a/pkgs/development/python-modules/htmltreediff/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ buildPythonPackage, fetchFromGitHub, isPy3k, lxml, html5lib, nose, stdenv }: - -buildPythonPackage rec { - version = "0.1.2"; - pname = "htmltreediff"; - - disabled = isPy3k; - - src = fetchFromGitHub { - owner = "christian-oudard"; - repo = pname; - rev = "v${version}"; - sha256 = "16mqp2jyznrw1mgd3qzybq28h2k5wz7vmmz1m6xpgscazyjhvvd1"; - }; - - propagatedBuildInputs = [ lxml html5lib ]; - - checkInputs = [ nose ]; - - meta = with stdenv.lib; { - description = " Structure-aware diff for html and xml documents"; - homepage = "https://github.com/christian-oudard/htmltreediff"; - license = licenses.bsdOriginal; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 57458230bb11cc..eac21e0da19b22 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2826,8 +2826,6 @@ in { html-sanitizer = callPackage ../development/python-modules/html-sanitizer { }; - htmltreediff = callPackage ../development/python-modules/htmltreediff { }; - HTSeq = callPackage ../development/python-modules/HTSeq { }; httmock = callPackage ../development/python-modules/httmock { };