From 2ea7cdf2e9c927f3f0fc47dc7834c3b4762dfad9 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 19 Nov 2025 22:15:37 +0800 Subject: [PATCH] magpie: drop No longer used by budgie-desktop. --- .../services/desktop-managers/budgie.nix | 5 - pkgs/by-name/ma/magpie/package.nix | 188 ------------------ pkgs/top-level/aliases.nix | 1 + 3 files changed, 1 insertion(+), 193 deletions(-) delete mode 100644 pkgs/by-name/ma/magpie/package.nix diff --git a/nixos/modules/services/desktop-managers/budgie.nix b/nixos/modules/services/desktop-managers/budgie.nix index a1b975f2d66f..a32caa838779 100644 --- a/nixos/modules/services/desktop-managers/budgie.nix +++ b/nixos/modules/services/desktop-managers/budgie.nix @@ -290,11 +290,6 @@ in pkgs.budgie-desktop-services ]; - # Register packages for udev. - services.udev.packages = with pkgs; [ - magpie - ]; - # Shell integration for MATE Terminal. programs.bash.vteIntegration = true; programs.zsh.vteIntegration = true; diff --git a/pkgs/by-name/ma/magpie/package.nix b/pkgs/by-name/ma/magpie/package.nix deleted file mode 100644 index a63fd4dfff81..000000000000 --- a/pkgs/by-name/ma/magpie/package.nix +++ /dev/null @@ -1,188 +0,0 @@ -{ - fetchFromGitHub, - runCommand, - lib, - fetchpatch, - stdenv, - pkg-config, - gnome-settings-daemon, - gettext, - gobject-introspection, - cairo, - colord, - lcms2, - pango, - json-glib, - libstartup_notification, - libcanberra, - ninja, - xvfb-run, - xkeyboard_config, - libxcvt, - libxkbfile, - libXdamage, - libxkbcommon, - libXtst, - libinput, - libdrm, - libgbm, - gsettings-desktop-schemas, - glib, - gtk3, - gnome-desktop, - pipewire, - libgudev, - libwacom, - mesa-gl-headers, - meson, - nix-update-script, - validatePkgConfig, - xorgserver, - python3, - wrapGAppsHook3, - gi-docgen, - sysprof, - testers, - libsysprof-capture, - desktop-file-utils, - libcap_ng, - graphene, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "magpie"; - version = "0.9.4"; - - outputs = [ - "out" - "dev" - "devdoc" - ]; - - src = fetchFromGitHub { - owner = "BuddiesOfBudgie"; - repo = "magpie"; - rev = "v${finalAttrs.version}"; - hash = "sha256-a8e0uzbS0HEH/0sOOnwIiQI0/BizKbpdlVdfb3IbmcU="; - }; - - patches = [ - # Fix build with separate sysprof. - # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2572 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/285a5a4d54ca83b136b787ce5ebf1d774f9499d5.patch"; - hash = "sha256-/npUE3idMSTVlFptsDpZmGWjZ/d2gqruVlJKq4eF4xU="; - }) - ]; - - mesonFlags = [ - "-Degl_device=true" - "-Dprofiler=true" - "-Ddocs=true" - ]; - - propagatedBuildInputs = [ - # required for pkg-config to detect magpie-clutter - json-glib - libXtst - libcap_ng - graphene - mesa-gl-headers - ]; - - nativeBuildInputs = [ - desktop-file-utils - gettext - libxcvt - meson - ninja - xvfb-run - pkg-config - python3 - validatePkgConfig - wrapGAppsHook3 - gi-docgen - xorgserver - ]; - - buildInputs = [ - cairo - glib - gnome-desktop - gnome-settings-daemon - gobject-introspection - gsettings-desktop-schemas - gtk3 - libcanberra - libdrm - libgbm - libgudev - libinput - libstartup_notification - libwacom - libxkbcommon - libxkbfile - libXdamage - colord - lcms2 - pango - pipewire - sysprof # for D-Bus interfaces - libsysprof-capture - xkeyboard_config - ]; - - postPatch = '' - patchShebangs src/backends/native/gen-default-modes.py - # Magpie does not install any .desktop files - substituteInPlace scripts/mesonPostInstall.sh --replace "update-desktop-database" "# update-desktop-database" - - # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3187 - substituteInPlace meson.build \ - --replace "dependency('sysprof-4')" "dependency('sysprof-6')" - ''; - - postFixup = '' - # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. - # TODO: Move this into a directory devhelp can find. - moveToOutput "share/magpie-0/doc" "$devdoc" - ''; - - # Install udev files into our own tree. - env.PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; - - separateDebugInfo = true; - - passthru = { - libdir = "${finalAttrs.finalPackage}/lib/magpie-0"; - - tests = { - libdirExists = runCommand "magpie-libdir-exists" { } '' - if [[ ! -d ${finalAttrs.finalPackage.libdir} ]]; then - echo "passthru.libdir should contain a directory, “${finalAttrs.finalPackage.libdir}” is not one." - exit 1 - fi - touch $out - ''; - - pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; - }; - - updateScript = nix-update-script { }; - }; - - meta = { - description = "Softish fork of Mutter 43.x"; - homepage = "https://github.com/BuddiesOfBudgie/magpie"; - changelog = "https://github.com/BuddiesOfBudgie/magpie/releases/tag/v${finalAttrs.version}"; - license = lib.licenses.gpl2Plus; - teams = [ lib.teams.budgie ]; - platforms = lib.platforms.linux; - pkgConfigModules = [ - "libmagpie-0" - "magpie-clutter-0" - "magpie-cogl-0" - "magpie-cogl-pango-0" - ]; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 87a447700925..a10b9f0cb61c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1148,6 +1148,7 @@ mapAliases { MACS2 = throw "'MACS2' has been renamed to/replaced by 'macs2'"; # Converted to throw 2025-10-27 magma_2_6_2 = throw "'magma_2_6_2' has been removed, use the latest 'magma' package instead."; # Added 2025-07-20 magma_2_7_2 = throw "'magma_2_7_2' has been removed, use the latest 'magma' package instead."; # Added 2025-07-20 + magpie = throw "'magpie' has been removed, no longer used by budgie-desktop."; # Added 2025-11-19 mailcore2 = throw "'mailcore2' has been removed due to lack of upstream maintenance."; # Added 2025-06-09 mailnag = throw "mailnag has been removed because it has been marked as broken since 2022."; # Added 2025-10-12 mailnagWithPlugins = throw "mailnagWithPlugins has been removed because mailnag has been marked as broken since 2022."; # Added 2025-10-12