Skip to content

emacsPackages: remove __attrsFailEvaluation #323868

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jian-lin merged 1 commit into from
Jul 16, 2024
Merged

emacsPackages: remove __attrsFailEvaluation #323868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,4 +121,4 @@ self: let

in elpaDevelPackages // { inherit elpaBuild; });

in (generateElpa { }) // { __attrsFailEvaluation = true; }
in generateElpa { }
3 changes: 2 additions & 1 deletion pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,4 +210,5 @@ self: let

in elpaPackages // { inherit elpaBuild; });

in (generateElpa { }) // { __attrsFailEvaluation = true; }
in
generateElpa { }
2 changes: 0 additions & 2 deletions pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,4 @@ in
emacsSessionManagement = self.session-management-for-emacs;
rectMark = self.rect-mark;
sunriseCommander = self.sunrise-commander;

__attrsFailEvaluation = true;
}
3 changes: 1 addition & 2 deletions pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,5 +750,4 @@ let
in lib.mapAttrs (n: v: if lib.hasAttr n overrides then overrides.${n} else v) super);

in
(generateMelpa { })
// { __attrsFailEvaluation = true; }
generateMelpa { }
4 changes: 2 additions & 2 deletions pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down