Skip to content

Commit 62c39fb

Browse files
committed
inline interpolate function instead of having a lib folder
we rather not want this type to be a public api, until we have documentation on how to use it.
1 parent b1b9e44 commit 62c39fb

File tree

3 files changed

+7
-12
lines changed

3 files changed

+7
-12
lines changed

flake.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@
7171
in
7272
examplesFor "x86_64-linux" // examplesFor "aarch64-linux";
7373

74-
lib = import ./nix/lib.nix;
7574
};
7675
perSystem =
7776
{

nixosModules/cachix.nix

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
{
22
lib,
3-
pkgs,
43
config,
54
...
65
}:
76
let
87
cfg = config.services.buildbot-nix.master;
9-
bb-lib = import ./lib.nix;
8+
interpolate = value: {
9+
_type = "interpolate";
10+
inherit value;
11+
};
1012
in
1113
{
1214
options.services.buildbot-nix.master.cachix = {
@@ -117,17 +119,17 @@ in
117119
name = "Upload cachix";
118120
environment = lib.mkMerge [
119121
(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";
121123
})
122124
(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";
124126
})
125127
];
126128
command = [
127129
"cachix" # note that this is the cachix from the worker's $PATH
128130
"push"
129131
cfg.cachix.name
130-
(bb-lib.interpolate "result-%(prop:attr)s")
132+
(interpolate "result-%(prop:attr)s")
131133
];
132134
}
133135
];

nixosModules/lib.nix

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)