Skip to content

Commit aa44941

Browse files
committed
Update nix expressions templates
1 parent 73a0cf8 commit aa44941

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

template/{% if nix %}flake.nix{% endif %}.jinja

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
} // pkgs.lib.optionalAttrs pkgs.stdenv.isLinux {
4545
image = pkgs.callPackage ./image.nix {
4646
inherit pkgs;
47-
{{project_name}} = pkgs.{{project_name}};
47+
app = pkgs.{{project_name}};
4848
};
4949
};
5050

@@ -136,4 +136,4 @@
136136
poetry = import ./shell.nix { inherit pkgs; };
137137
};
138138
}));
139-
}
139+
}

template/{% if nix %}image.nix{% endif %}.jinja

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{ pkgs ? import <nixpkgs> { }
2-
, {{project_name}}
2+
, app
33
, name ? "{{container_image_name}}"
44
, tag ? "latest"
55
}:
@@ -10,7 +10,7 @@ pkgs.dockerTools.buildImage {
1010
copyToRoot = pkgs.buildEnv {
1111
name = "image-root";
1212
paths = [
13-
{{project_name}}
13+
app
1414
pkgs.cacert
1515
pkgs.tzdata
1616
];

template/{% if nix %}shell.nix{% endif %}.jinja

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ pkgs.mkShell {
1010
buildInputs = [
1111
pkgs.gnumake
1212
pkgs.curl
13-
pkgs.git
1413
pythonPackage
1514
poetry
1615
];
@@ -20,4 +19,4 @@ pkgs.mkShell {
2019
export POETRY_VIRTUALENVS_IN_PROJECT=true
2120
unset SOURCE_DATE_EPOCH
2221
'';
23-
}
22+
}

0 commit comments

Comments
 (0)