fix(nix): fix extension removal logic

remove extensions based on the platform (before trying to apply fixes from nixpkgs)

Author: deemp

flake.nix

@@ -173,35 +173,6 @@
                 # platform-specific extensions will overwrite universal extensions
                 # due to the sorting order of platforms in the Haskell script
                 (builtins.mapAttrs (_: builtins.foldl' (k: { name, value }: k // { ${name} = value; }) { }))
-                (
-                  x:
-                  builtins.foldl'
-                    (
-                      extensions: removedPublisherConfig:
-                      if !(extensions ? ${removedPublisherConfig.publisher}) then
-                        extensions
-                      else
-                        extensions
-                        // {
-                          "${removedPublisherConfig.publisher}" = builtins.foldl' (
-                            publisherExtensions: extensionName:
-                            publisherExtensions
-                            // {
-                              "${extensionName}" = builtins.throw ''
-                                The extension '${removedPublisherConfig.publisher}.${extensionName}' was removed.
-                                See '${./removed.nix}' for details.
-                              '';
-                            }
-                          ) extensions.${removedPublisherConfig.publisher} removedPublisherConfig.extensions;
-                        }
-                    )
-                    x
-                    (
-                      pkgs.lib.attrsets.mapAttrsToList (publisher: extensions: {
-                        inherit publisher extensions;
-                      }) (import ./removed.nix)
-                    )
-                )
               ];
             mkSet =
               attrs@{

mkExtension.nix

@@ -58,7 +58,8 @@ let
       '';
     };
   };
-  
+
+  extensionsRemoved = (import ./removed.nix).${pkgs.system} or [ ];
 
   mkExtensionNixpkgs =
     # apply fixes from nixpkgs
@@ -75,7 +76,7 @@ let
       # extensions with fixes
       # where mktplcRef and vsix are overridable
       haveFixesOverridable = [
-        # from the directory https://github.com/NixOS/nixpkgs/tree/555702214240ef048370f6c2fe27674ec73da765/pkgs/applications/editors/vscode/extensions
+        # have own directories in https://github.com/NixOS/nixpkgs/tree/555702214240ef048370f6c2fe27674ec73da765/pkgs/applications/editors/vscode/extensions
         "asciidoctor.asciidoctor-vscode"
         "azdavis.millet"
         "b4dm4n.vscode-nixpkgs-fmt"
@@ -122,6 +123,7 @@ let
       extensionsNixpkgs = callPackage extensionsNixpkgsPath { };
 
       fixed = lib.trivial.pipe haveFixesOverridable [
+        (builtins.filter (x: !(builtins.elem x extensionsRemoved)))
         (builtins.map (
           fullName:
           let
@@ -164,7 +166,17 @@ let
   chooseMkExtension =
     self:
     { mktplcRef, vsix }@extensionConfig:
-    ((self.${mktplcRef.publisher} or { }).${mktplcRef.name} or mkExtension) extensionConfig;
+    ((self.${mktplcRef.publisher} or { }).${mktplcRef.name} or (
+      if builtins.elem "${mktplcRef.publisher}.${mktplcRef.name}" extensionsRemoved then
+        builtins.throw ''
+          The extension '${mktplcRef.publisher}.${mktplcRef.name}' has been removed on ${pkgs.system}.
+          See '${./removed.nix}' for details.
+        ''
+      else
+        mkExtension
+    )
+    )
+      extensionConfig;
 in
 builtins.foldl' lib.attrsets.recursiveUpdate { } [
   mkExtensionNixpkgs