Unverified Commit b62b159c authored by Lin Jian's avatar Lin Jian Committed by GitHub
Browse files

Merge pull request #323868 from philiptaron/__attrsFailEvaluation/emacsPackages

emacsPackages: remove __attrsFailEvaluation
parents c0e4367e 882e48ea
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -121,4 +121,4 @@ self: let

  in elpaDevelPackages // { inherit elpaBuild; });

in (generateElpa { }) // { __attrsFailEvaluation = true; }
in generateElpa { }
+2 −1
Original line number Diff line number Diff line
@@ -210,4 +210,5 @@ self: let

  in elpaPackages // { inherit elpaBuild; });

in (generateElpa { }) // { __attrsFailEvaluation = true; }
in
generateElpa { }
+0 −2
Original line number Diff line number Diff line
@@ -125,6 +125,4 @@ in
  emacsSessionManagement = self.session-management-for-emacs;
  rectMark = self.rect-mark;
  sunriseCommander = self.sunrise-commander;

  __attrsFailEvaluation = true;
}
+1 −2
Original line number Diff line number Diff line
@@ -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 { }
+2 −2
Original line number Diff line number Diff line
@@ -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;