From 3a972f03f73c97fe4b79749f13d7bcc9cc8a0d25 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 26 May 2024 02:17:48 +0200
Subject: [PATCH] flake: move mediawiki-extensions back to packages

---
 flake.nix                                 | 17 ++++++++---------
 packages/mediawiki-extensions/default.nix | 14 +++++++-------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/flake.nix b/flake.nix
index 4f1acdac..929c79dc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -139,16 +139,15 @@
           (nixlib.getAttrs allMachines self.packages.x86_64-linux);
 
         simplesamlphp = pkgs.callPackage ./packages/simplesamlphp { };
-      } // nixlib.genAttrs allMachines
-        (machine: self.nixosConfigurations.${machine}.config.system.build.toplevel);
-    } ;
 
-    legacyPackages = {
-      "x86_64-linux" = let
-        pkgs = nixpkgs.legacyPackages."x86_64-linux";
-      in rec {
-        mediawiki-extensions = pkgs.callPackage ./packages/mediawiki-extensions { };
-      };
+      } //
+      (nixlib.pipe null [
+        (_: pkgs.callPackage ./packages/mediawiki-extensions { })
+        (nixlib.flip builtins.removeAttrs ["override" "overrideDerivation"])
+        (nixlib.mapAttrs' (name: nixlib.nameValuePair "mediawiki-${name}"))
+      ])
+      // nixlib.genAttrs allMachines
+        (machine: self.nixosConfigurations.${machine}.config.system.build.toplevel);
     };
   };
 }
diff --git a/packages/mediawiki-extensions/default.nix b/packages/mediawiki-extensions/default.nix
index b7195c8a..43c67e5c 100644
--- a/packages/mediawiki-extensions/default.nix
+++ b/packages/mediawiki-extensions/default.nix
@@ -1,8 +1,8 @@
 { pkgs, lib }:
-lib.makeScope pkgs.newScope (self: {
-  DeleteBatch = self.callPackage ./delete-batch { };
-  PluggableAuth = self.callPackage ./pluggable-auth { };
-  SimpleSAMLphp = self.callPackage ./simple-saml-php { };
-  UserMerge = self.callPackage ./user-merge { };
-  VisualEditor = self.callPackage ./visual-editor { };
-})
+{
+  DeleteBatch = pkgs.callPackage ./delete-batch { };
+  PluggableAuth = pkgs.callPackage ./pluggable-auth { };
+  SimpleSAMLphp = pkgs.callPackage ./simple-saml-php { };
+  UserMerge = pkgs.callPackage ./user-merge { };
+  VisualEditor = pkgs.callPackage ./visual-editor { };
+}