From 0aa7bc03361e02666ad7841805220fb46f31eb58 Mon Sep 17 00:00:00 2001 From: aleksana Date: Thu, 7 Mar 2024 19:39:42 +0800 Subject: [PATCH] dfeet: remove --- .../development/tools/misc/d-feet/default.nix | 90 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 92 deletions(-) delete mode 100644 pkgs/development/tools/misc/d-feet/default.nix diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix deleted file mode 100644 index c59ed440b7c0..000000000000 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ /dev/null @@ -1,90 +0,0 @@ -{ lib -, pkg-config -, fetchurl -, fetchpatch -, meson -, ninja -, glib -, gtk3 -, python3 -, wrapGAppsHook -, gnome -, libwnck -, gobject-introspection -, gettext -, itstool -}: - -python3.pkgs.buildPythonApplication rec { - pname = "d-feet"; - version = "0.3.16"; - - format = "other"; - - src = fetchurl { - url = "mirror://gnome/sources/d-feet/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "hzPOS5qaVOwYWx2Fv02p2dEQUogqiAdg/2D5d5stHMs="; - }; - - patches = [ - # Fix build with meson 0.61 - # data/meson.build:15:0: ERROR: Function does not take positional arguments. - # data/meson.build:27:0: ERROR: Function does not take positional arguments. - # Patch taken from https://gitlab.gnome.org/GNOME/d-feet/-/merge_requests/32 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/d-feet/-/commit/05465d486afdba116dbc22fc22c1e6573aea4f22.patch"; - sha256 = "sFI3nd0YE/deGws/YcTpzC/em9QNgicyb4j7cTfOdhY="; - }) - ]; - - nativeBuildInputs = [ - gettext - gobject-introspection - itstool - meson - ninja - pkg-config - python3 - wrapGAppsHook - ]; - - buildInputs = [ - glib - gnome.adwaita-icon-theme - gtk3 - libwnck - ]; - - propagatedBuildInputs = with python3.pkgs; [ - pygobject3 - ]; - - mesonFlags = [ - "-Dtests=false" # needs dbus - ]; - - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - attrPath = "dfeet"; - versionPolicy = "none"; - }; - }; - - meta = with lib; { - description = "D-Feet is an easy to use D-Bus debugger"; - longDescription = '' - D-Feet can be used to inspect D-Bus interfaces of running programs - and invoke methods on those interfaces. - ''; - homepage = "https://wiki.gnome.org/Apps/DFeet"; - platforms = platforms.linux; - license = licenses.gpl2; - maintainers = teams.gnome.members; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8ab5ae61c711..70b823003ebb 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -216,6 +216,7 @@ mapAliases ({ demjson = with python3Packages; toPythonApplication demjson; # Added 2022-01-18 dep = throw "'dep' has been removed, because it is deprecated and archived in favor of Go modules"; # Added 2023-12-26 devserver = throw "'devserver' has been removed in favor of 'miniserve' or other alternatives"; # Added 2023-01-13 + dfeet = throw "'dfeet' has been removed because it is archived upstream. Please use 'd-spy' instead"; # Added 2024-03-07 dhcp = throw "dhcp (ISC DHCP) has been removed from nixpkgs, because it reached its end of life"; # Added 2023-04-04 dnnl = oneDNN; # Added 2020-04-22 docker-machine = throw "'docker-machine' has been removed, because the upstream project was archived"; # Added 2023-12-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c88ef6e59e19..8ea0aecca609 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18875,8 +18875,6 @@ with pkgs; devtodo = callPackage ../development/tools/devtodo { }; - dfeet = callPackage ../development/tools/misc/d-feet { }; - d-spy = callPackage ../development/tools/misc/d-spy { }; dfu-programmer = callPackage ../development/tools/misc/dfu-programmer { };