From 3a6ba9ea5b27e6e5c749f04fec9a0b124bac5fdd Mon Sep 17 00:00:00 2001 From: jD91mZM2 Date: Sun, 28 Feb 2021 17:43:38 +0100 Subject: [PATCH 1/3] remove me as maintainer I don't use these tools anymore, so it makes sense I shouldn't have an opinion on PRs that change/update them. I know it's always unfortunate losing a reviewer, but I'm not very active anymore anyway, unfortunately. Apologies. From now on, I'm trying not to add too many packages into nixpkgs, since flakes are available. I guess when I first started using Nix I got overexcited by how easy it was to contribute, so I added things for the sake of adding things (not because I necessarily used them). --- pkgs/applications/virtualization/x11docker/default.nix | 2 +- .../xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix | 2 +- .../panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix | 2 +- pkgs/development/tools/scaff/default.nix | 2 +- pkgs/tools/X11/nx-libs/default.nix | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/pkgs/applications/virtualization/x11docker/default.nix index b671c1f6fa4..b90033e438d 100644 --- a/pkgs/applications/virtualization/x11docker/default.nix +++ b/pkgs/applications/virtualization/x11docker/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = "Run graphical applications with Docker"; homepage = "https://github.com/mviereck/x11docker"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ jD91mZM2 ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix index e35dc5922d9..44374c2822a 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Port of the Unity GTK Module"; license = licenses.lgpl3; - maintainers = with maintainers; [ jD91mZM2 ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix index d8946c98a38..76aea188e35 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Global Menu applet for XFCE4"; license = licenses.lgpl3; - maintainers = with maintainers; [ jD91mZM2 ]; + maintainers = with lib.maintainers; [ ]; broken = true; }; } diff --git a/pkgs/development/tools/scaff/default.nix b/pkgs/development/tools/scaff/default.nix index 2449769e07f..4b5540c699c 100644 --- a/pkgs/development/tools/scaff/default.nix +++ b/pkgs/development/tools/scaff/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Painless and powerful scaffolding of projects"; license = licenses.mit; - maintainers = with maintainers; [ jD91mZM2 ]; + maintainers = with lib.maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/X11/nx-libs/default.nix b/pkgs/tools/X11/nx-libs/default.nix index b92344bf9c4..022111e4b31 100644 --- a/pkgs/tools/X11/nx-libs/default.nix +++ b/pkgs/tools/X11/nx-libs/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { description = "NX X server based on Xnest"; homepage = "https://github.com/ArcticaProject/nx-libs"; license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ jD91mZM2 ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; } From ea5639fcf484f8f7e364315f6dabbc3c1f15a8ff Mon Sep 17 00:00:00 2001 From: jD91mZM2 Date: Mon, 1 Mar 2021 12:34:57 +0100 Subject: [PATCH 2/3] vala-panel-appmenu-plugin: delete --- pkgs/desktops/xfce/default.nix | 2 - .../appmenu-gtk-module.nix | 31 ---------- .../default.nix | 56 ------------------- .../fix-bamf-dependency.patch | 12 ---- 4 files changed, 101 deletions(-) delete mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix delete mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix delete mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/fix-bamf-dependency.patch diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index de8ae12b895..12f487f1784 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -102,8 +102,6 @@ lib.makeScope pkgs.newScope (self: with self; { #### PANEL PLUGINS - xfce4-vala-panel-appmenu-plugin = callPackage ./panel-plugins/xfce4-vala-panel-appmenu-plugin { }; - xfce4-battery-plugin = callPackage ./panel-plugins/xfce4-battery-plugin { }; xfce4-clipman-plugin = callPackage ./panel-plugins/xfce4-clipman-plugin { }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix deleted file mode 100644 index 44374c2822a..00000000000 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, vala, glib, gtk2, gtk3 }: -stdenv.mkDerivation rec { - pname = "vala-panel-appmenu-xfce"; - version = "0.6.94"; - - src = "${fetchFromGitHub { - owner = "rilian-la-te"; - repo = "vala-panel-appmenu"; - rev = version; - fetchSubmodules = true; - - sha256 = "0xxn3zs60a9nfix8wrdp056wviq281cm1031hznzf1l38lp3wr5p"; - }}/subprojects/appmenu-gtk-module"; - - nativeBuildInputs = [ cmake vala ]; - buildInputs = [ glib gtk2 gtk3 ]; - - configurePhase = '' - cmake . -DGTK3_INCLUDE_GDK= - ''; - installPhase = '' - make DESTDIR=output install - cp -r output/var/empty/* "$out" - ''; - - meta = with lib; { - description = "Port of the Unity GTK Module"; - license = licenses.lgpl3; - maintainers = with lib.maintainers; [ ]; - }; -} diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix deleted file mode 100644 index 76aea188e35..00000000000 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, callPackage, pkg-config, cmake, vala, libxml2, - glib, pcre, gtk2, gtk3, xorg, libxkbcommon, epoxy, at-spi2-core, dbus-glib, bamf, - xfce, libwnck3, libdbusmenu, gobject-introspection }: - -stdenv.mkDerivation rec { - pname = "xfce4-vala-panel-appmenu-plugin"; - version = "0.7.3"; - - src = fetchFromGitHub { - owner = "rilian-la-te"; - repo = "vala-panel-appmenu"; - rev = version; - fetchSubmodules = true; - - sha256 = "06rykdr2c9rnzxwinwdynd73v9wf0gjkx6qfva7sx2n94ajsdnaw"; - }; - - nativeBuildInputs = [ pkg-config cmake vala libxml2.bin ]; - buildInputs = [ (callPackage ./appmenu-gtk-module.nix {}) - glib pcre gtk2 gtk3 xorg.libpthreadstubs xorg.libXdmcp libxkbcommon epoxy - at-spi2-core dbus-glib bamf xfce.xfce4panel_gtk3 xfce.libxfce4util xfce.xfconf - libwnck3 libdbusmenu gobject-introspection ]; - - patches = [ - (substituteAll { - src = ./fix-bamf-dependency.patch; - bamf = bamf; - }) - ]; - - cmakeFlags = [ - "-DENABLE_XFCE=ON" - "-DENABLE_BUDGIE=OFF" - "-DENABLE_VALAPANEL=OFF" - "-DENABLE_MATE=OFF" - "-DENABLE_JAYATANA=OFF" - "-DENABLE_APPMENU_GTK_MODULE=OFF" - ]; - - preConfigure = '' - mv cmake/FallbackVersion.cmake.in cmake/FallbackVersion.cmake - ''; - - passthru.updateScript = xfce.updateScript { - inherit pname version; - attrPath = "xfce.${pname}"; - versionLister = xfce.gitLister src.meta.homepage; - }; - - meta = with lib; { - description = "Global Menu applet for XFCE4"; - license = licenses.lgpl3; - maintainers = with lib.maintainers; [ ]; - broken = true; - }; -} diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/fix-bamf-dependency.patch b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/fix-bamf-dependency.patch deleted file mode 100644 index 1ed86a67f72..00000000000 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/fix-bamf-dependency.patch +++ /dev/null @@ -1,12 +0,0 @@ -+++ source/cmake/FindBAMF.cmake 2018-05-11 17:03:44.385917811 +0200 -@@ -80,9 +80,7 @@ - - find_program(BAMF_DAEMON_EXECUTABLE - bamfdaemon -- HINTS ${CMAKE_INSTALL_FULL_LIBDIR} -- ${CMAKE_INSTALL_FULL_LIBEXECDIR} -- ${BAMF_LIBDIR} -+ HINTS "@bamf@/libexec/bamf/" - PATH_SUFFIXES bamf - ) - From 0799e016ab99c53b723f681bfd9b6732883c20db Mon Sep 17 00:00:00 2001 From: jD91mZM2 Date: Mon, 1 Mar 2021 22:42:27 +0100 Subject: [PATCH 3/3] scaff: delete --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 677c2b73b64..1349ce99341 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -618,6 +618,7 @@ mapAliases ({ saneBackendsGit = sane-backends-git; # added 2016-01-02 saneFrontends = sane-frontends; # added 2016-01-02 sapic = throw "sapic was deprecated on 2019-1-19: sapic is bundled with 'tamarin-prover' now"; + scaff = throw "scaff is deprecated - replaced by https://gitlab.com/jD91mZM2/inc (not in nixpkgs yet)"; # added 2020-03-01 scim = sc-im; # added 2016-01-22 scollector = bosun; # added 2018-04-25 sdlmame = mame; # added 2019-10-30 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e42ed1a0a00..39c2dc55ef2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12856,8 +12856,6 @@ in sauce-connect = callPackage ../development/tools/sauce-connect { }; - scaff = callPackage ../development/tools/scaff { }; - sd-local = callPackage ../development/tools/sd-local { }; selenium-server-standalone = callPackage ../development/tools/selenium/server { };