File tree Expand file tree Collapse file tree 5 files changed +193
-9
lines changed Expand file tree Collapse file tree 5 files changed +193
-9
lines changed Original file line number Diff line number Diff line change 9
9
{
10
10
inputs = {
11
11
nixpkgs . url = "github:NixOS/nixpkgs?ref=nixos-24.05" ;
12
+ buildbot-nix . url = "github:nix-community/buildbot-nix" ;
12
13
treefmt-nix . url = "github:numtide/treefmt-nix" ;
13
14
} ;
14
15
17
18
nixpkgs ,
18
19
self ,
19
20
treefmt-nix ,
20
- } :
21
+ ...
22
+ } @inputs :
21
23
let
22
24
supportedSystems = [
23
25
"x86_64-linux"
40
42
inherit ( nixpkgs . lib ) recurseIntoAttrs ;
41
43
in
42
44
{
43
- nglib = import ./lib nixpkgs . lib ;
45
+ nglib = import ./lib {
46
+ inherit ( nixpkgs ) lib ;
47
+ inherit inputs ;
48
+ } ;
44
49
examples = import ./examples {
45
50
inherit nixpkgs ;
46
51
inherit ( self ) nglib ;
Original file line number Diff line number Diff line change 1
- lib :
1
+ { lib , inputs } :
2
2
lib . fix (
3
3
nglib :
4
4
let
@@ -93,6 +93,6 @@ lib.fix (
93
93
getOptionFromPath
94
94
;
95
95
96
- makeSystem = import ./make-system.nix { inherit lib nglib overlay ; } ;
96
+ makeSystem = import ./make-system.nix { inherit nglib overlay inputs ; } ;
97
97
}
98
98
)
Original file line number Diff line number Diff line change 7
7
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
8
8
9
9
# These arguments are provided by the overarching NixNG repository and are not user confugurable.
10
- { nglib , overlay , ... } :
10
+ {
11
+ nglib ,
12
+ overlay ,
13
+ inputs ,
14
+ } :
11
15
# These arguments are user configurable
12
16
{
13
17
nixpkgs ,
26
30
inherit nglib ;
27
31
__enableExperimentalNixOSCompatibility =
28
32
specialArgs . __enableExperimentalNixOSCompatibility or false ;
33
+ nixngInputs = inputs ;
29
34
} ;
30
35
31
36
modules =
Original file line number Diff line number Diff line change
1
+ { lib , nixngInputs , ... } :
2
+ let
3
+ buildbotMasterModule =
4
+ nixngInputs . nixpkgs + "/nixos/modules/services/continuous-integration/buildbot/master.nix" ;
5
+ buildbotWorkerModule =
6
+ nixngInputs . nixpkgs + "/nixos/modules/services/continuous-integration/buildbot/worker.nix" ;
7
+ in
8
+ {
9
+ options . nixos = lib . mkOption {
10
+ type = lib . types . submodule {
11
+ imports = [
12
+ buildbotMasterModule
13
+ buildbotWorkerModule
14
+ nixngInputs . buildbot-nix . nixosModules . buildbot-master
15
+ nixngInputs . buildbot-nix . nixosModules . buildbot-worker
16
+ ] ;
17
+ } ;
18
+ } ;
19
+ imports = [
20
+ ( lib . mkAliasOptionModule
21
+ [
22
+ "services"
23
+ "buildbot-master"
24
+ ]
25
+ [
26
+ "nixos"
27
+ "services"
28
+ "buildbot-master"
29
+ ]
30
+ )
31
+ ( lib . mkAliasOptionModule
32
+ [
33
+ "services"
34
+ "buildbot-worker"
35
+ ]
36
+ [
37
+ "nixos"
38
+ "services"
39
+ "buildbot-worker"
40
+ ]
41
+ )
42
+ ( lib . mkAliasOptionModule
43
+ [
44
+ "services"
45
+ "buildbot-nix"
46
+ "master"
47
+ ]
48
+ [
49
+ "nixos"
50
+ "services"
51
+ "buildbot-nix"
52
+ "master"
53
+ ]
54
+ )
55
+ ( lib . mkAliasOptionModule
56
+ [
57
+ "services"
58
+ "buildbot-nix"
59
+ "worker"
60
+ ]
61
+ [
62
+ "nixos"
63
+ "services"
64
+ "buildbot-nix"
65
+ "worker"
66
+ ]
67
+ )
68
+ ] ;
69
+ }
You can’t perform that action at this time.
0 commit comments