File tree Expand file tree Collapse file tree 3 files changed +7
-12
lines changed Expand file tree Collapse file tree 3 files changed +7
-12
lines changed Original file line number Diff line number Diff line change 71
71
in
72
72
examplesFor "x86_64-linux" // examplesFor "aarch64-linux" ;
73
73
74
- lib = import ./nix/lib.nix ;
75
74
} ;
76
75
perSystem =
77
76
{
Original file line number Diff line number Diff line change 1
1
{
2
2
lib ,
3
- pkgs ,
4
3
config ,
5
4
...
6
5
} :
7
6
let
8
7
cfg = config . services . buildbot-nix . master ;
9
- bb-lib = import ./lib.nix ;
8
+ interpolate = value : {
9
+ _type = "interpolate" ;
10
+ inherit value ;
11
+ } ;
10
12
in
11
13
{
12
14
options . services . buildbot-nix . master . cachix = {
117
119
name = "Upload cachix" ;
118
120
environment = lib . mkMerge [
119
121
( lib . optionalAttrs ( cfg . cachix . auth ? "signingKey" ) {
120
- CACHIX_SIGNING_KEY = bb-lib . interpolate "%(secret:cachix-signing-key)s" ;
122
+ CACHIX_SIGNING_KEY = interpolate "%(secret:cachix-signing-key)s" ;
121
123
} )
122
124
( lib . optionalAttrs ( cfg . cachix . auth ? "authToken" ) {
123
- CACHIX_AUTH_TOKEN = bb-lib . interpolate "%(secret:cachix-auth-token)s" ;
125
+ CACHIX_AUTH_TOKEN = interpolate "%(secret:cachix-auth-token)s" ;
124
126
} )
125
127
] ;
126
128
command = [
127
129
"cachix" # note that this is the cachix from the worker's $PATH
128
130
"push"
129
131
cfg . cachix . name
130
- ( bb-lib . interpolate "result-%(prop:attr)s" )
132
+ ( interpolate "result-%(prop:attr)s" )
131
133
] ;
132
134
}
133
135
] ;
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments