hydra: Remove one level of indirection (emacsPackages) and deduplicate top-level packages

This commit is contained in:
adisbladis 2021-08-10 10:59:45 -05:00
parent 46190b74da
commit e6cf47e605
No known key found for this signature in database
GPG key ID: 110BFAD44C6249B7

View file

@ -3,8 +3,16 @@ nixpkgs:
import nixpkgs {
overlays = [
(import ../default.nix)
(self: super: {
mkEmacsSet = emacs: { emacsPackages = super.recurseIntoAttrs (self.emacsPackagesFor emacs); };
(self: super: let
inherit (self) lib;
in {
# Build package sets and remove merged root-level packages since they are
# both present in each respective sub set and in the top-level
mkEmacsSet = emacs: super.recurseIntoAttrs (
lib.filterAttrs
(n: v: builtins.typeOf v == "set" && ! lib.isDerivation v)
(self.emacsPackagesFor emacs)
);
})
];
}