Merge pull request #323868 from philiptaron/__attrsFailEvaluation/emacsPackages

emacsPackages: remove __attrsFailEvaluation
2024-07-16 23:06:47 +08:00
parent c0e4367e8f 882e48ea1a
commit b62b159c17
5 changed files with 6 additions and 8 deletions
@@ -121,4 +121,4 @@ self: let

  in elpaDevelPackages // { inherit elpaBuild; });

-in (generateElpa { }) // { __attrsFailEvaluation = true; }
+in generateElpa { }
@@ -210,4 +210,5 @@ self: let

  in elpaPackages // { inherit elpaBuild; });

-in (generateElpa { }) // { __attrsFailEvaluation = true; }
+in
+generateElpa { }
@@ -125,6 +125,4 @@ in
  emacsSessionManagement = self.session-management-for-emacs;
  rectMark = self.rect-mark;
  sunriseCommander = self.sunrise-commander;
-
-  __attrsFailEvaluation = true;
 }
@@ -755,5 +755,4 @@ let
    in lib.mapAttrs (n: v: if lib.hasAttr n overrides then overrides.${n} else v) super);

 in
-(generateMelpa { })
-// { __attrsFailEvaluation = true; }
+generateMelpa { }
@@ -20,12 +20,12 @@ self: let
    generated ? ./nongnu-generated.nix
  }: let

-    imported = (import generated {
+    imported = import generated {
      callPackage = pkgs: args: self.callPackage pkgs (args // {
        # Use custom elpa url fetcher with fallback/uncompress
        fetchurl = buildPackages.callPackage ./fetchelpa.nix { };
      });
-    }) // { __attrsFailEvaluation = true; };
+    };

    super = imported;