magpie: move from budgie scope to top-level

nixos/modules/services/x11/desktop-managers/budgie.nix

@@ -248,7 +248,7 @@ in {
 
     # Register packages for udev.
     services.udev.packages = with pkgs; [
-      budgie.magpie
+      magpie
     ];
 
     # Shell integration for MATE Terminal.

pkgs/by-name/bu/budgie-desktop/package.nix

@@ -4,7 +4,6 @@
   fetchFromGitHub,
   accountsservice,
   alsa-lib,
-  budgie,
   budgie-screensaver,
   docbook-xsl-nons,
   glib,
@@ -24,6 +23,7 @@
   libpulseaudio,
   libuuid,
   libwnck,
+  magpie,
   mesa,
   meson,
   ninja,
@@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
     libpulseaudio
     libuuid
     libwnck
-    budgie.magpie
+    magpie
     mesa
     polkit
     sassc

pkgs/desktops/budgie/default.nix

@@ -5,7 +5,5 @@ lib.makeScope newScope (
   let
     inherit (self) callPackage;
   in
-  {
+  { }
-    magpie = callPackage ./magpie { };
-  }
 )