Skip to content

Commit 47fc626

Browse files
committed
use meta attribute set instead of jinja2 template variables
1 parent dd714ce commit 47fc626

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

template/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
, dockerTag ? null
4141
}:
4242
rec {
43-
inherit cargo sources pkgs;
43+
inherit cargo sources pkgs meta;
4444
build = cargo.allWorkspaceMembers;
4545
entrypoint = build+"/bin/stackable-${meta.operator.name}";
4646
crds = pkgs.runCommand "${meta.operator.name}-crds.yaml" {}

template/shell.nix.j2 renamed to template/shell.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
let
22
self = import ./. {};
3-
inherit (self) sources pkgs;
3+
inherit (self) sources pkgs meta;
44

55
beku = pkgs.callPackage (sources."beku.py" + "/beku.nix") {};
66
cargoDependencySetOfCrate = crate: [ crate ] ++ pkgs.lib.concatMap cargoDependencySetOfCrate (crate.dependencies ++ crate.buildDependencies);
77
cargoDependencySet = pkgs.lib.unique (pkgs.lib.flatten (pkgs.lib.mapAttrsToList (crateName: crate: cargoDependencySetOfCrate crate.build) self.cargo.workspaceMembers));
88
in pkgs.mkShell rec {
9-
name = "{[ operator.name }]";
9+
name = meta.operator.name;
1010

1111
packages = with pkgs; [
1212
## cargo et-al

0 commit comments

Comments
 (0)