Skip to content

flake: separate into hydraEmacsen and hydraPackageSet #512

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

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

flake: separate into hydraEmacsen and hydraPackageSet #512

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa1429c
flake: disable CI for packages
zowoq Aug 29, 2025
15793a6
flake: separate into hydraEmacsen and hydraPackageSet
zowoq Aug 31, 2025
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
30 changes: 18 additions & 12 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,18 +57,10 @@
# for backward compatibility, is safe to delete, not referenced anywhere
overlay = self.overlays.default;

hydraJobs =
hydraEmacsen =
lib.genAttrs [ "x86_64-linux" "aarch64-linux" ] (system:
let
mkHydraJobs = pkgs:
let
inherit (pkgs) lib;

filterNonDrvAttrs = s: lib.mapAttrs (_: v: if (lib.isDerivation v) then v else filterNonDrvAttrs v) (lib.filterAttrs (_: v: lib.isDerivation v || (builtins.typeOf v == "set" && ! builtins.hasAttr "__functor" v)) s);

mkEmacsSet = emacs: filterNonDrvAttrs (pkgs.recurseIntoAttrs (pkgs.emacsPackagesFor emacs));

in
{
emacsen = {
inherit (pkgs) emacs-unstable emacs-unstable-nox;
Expand All @@ -79,9 +71,6 @@
inherit (pkgs) emacs-lsp;
inherit (pkgs) commercial-emacs;
};

packages = mkEmacsSet pkgs.emacs;
packages-unstable = mkEmacsSet pkgs.emacs-unstable;
};

in
Expand All @@ -90,6 +79,23 @@
"unstable" = mkHydraJobs (importPkgs nixpkgs { inherit system; });
});

hydraPackageSet =
lib.genAttrs [ "x86_64-linux" ] (system:
let
mkHydraJobs = pkgs:
let
inherit (pkgs) lib;
filterNonDrvAttrs = s: lib.mapAttrs (_: v: if (lib.isDerivation v) then v else filterNonDrvAttrs v) (lib.filterAttrs (_: v: lib.isDerivation v || (builtins.typeOf v == "set" && ! builtins.hasAttr "__functor" v)) s);
mkEmacsSet = emacs: filterNonDrvAttrs (pkgs.recurseIntoAttrs (pkgs.emacsPackagesFor emacs));
in
{
packages = mkEmacsSet pkgs.emacs;
};
in
{
"unstable" = mkHydraJobs (importPkgs nixpkgs { inherit system; });
});

packages = forAllSystems (system: packages'.${system}.packages);
lib = forAllSystems (system: packages'.${system}.lib);
};
Expand Down