File tree Expand file tree Collapse file tree 2 files changed +20
-11
lines changed Expand file tree Collapse file tree 2 files changed +20
-11
lines changed Original file line number Diff line number Diff line change 1+ attribute = " buildbotJobs"
Original file line number Diff line number Diff line change 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 ;
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
You can’t perform that action at this time.
0 commit comments