Skip to content

Commit 5977a1d

Browse files
committed
flake: separate into buildbotJobs and hydraJobs
1 parent f069615 commit 5977a1d

File tree

2 files changed

+20
-11
lines changed

2 files changed

+20
-11
lines changed

buildbot-nix.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
attribute = "buildbotJobs"

flake.nix

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,18 +57,10 @@
5757
# for backward compatibility, is safe to delete, not referenced anywhere
5858
overlay = self.overlays.default;
5959

60-
hydraJobs =
60+
buildbotJobs =
6161
lib.genAttrs [ "x86_64-linux" "aarch64-linux" ] (system:
6262
let
63-
mkHydraJobs = pkgs:
64-
let
65-
inherit (pkgs) lib;
66-
67-
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);
68-
69-
mkEmacsSet = emacs: filterNonDrvAttrs (pkgs.recurseIntoAttrs (pkgs.emacsPackagesFor emacs));
70-
71-
in
63+
mkBuildbotJobs = pkgs:
7264
{
7365
emacsen = {
7466
inherit (pkgs) emacs-unstable emacs-unstable-nox;
@@ -80,10 +72,26 @@
8072
inherit (pkgs) commercial-emacs;
8173
};
8274
};
75+
in
76+
{
77+
"stable" = mkBuildbotJobs (importPkgs nixpkgs-stable { inherit system; });
78+
"unstable" = mkBuildbotJobs (importPkgs nixpkgs { inherit system; });
79+
});
8380

81+
hydraJobs =
82+
lib.genAttrs [ "x86_64-linux" ] (system:
83+
let
84+
mkHydraJobs = pkgs:
85+
let
86+
inherit (pkgs) lib;
87+
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);
88+
mkEmacsSet = emacs: filterNonDrvAttrs (pkgs.recurseIntoAttrs (pkgs.emacsPackagesFor emacs));
89+
in
90+
{
91+
packages = mkEmacsSet pkgs.emacs;
92+
};
8493
in
8594
{
86-
"stable" = mkHydraJobs (importPkgs nixpkgs-stable { inherit system; });
8795
"unstable" = mkHydraJobs (importPkgs nixpkgs { inherit system; });
8896
});
8997

0 commit comments

Comments
 (0)