diff options
Diffstat (limited to 'nix/templates')
| -rw-r--r-- | nix/templates/ctf/flake.nix | 2 | ||||
| -rw-r--r-- | nix/templates/goapp/flake.nix | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/nix/templates/ctf/flake.nix b/nix/templates/ctf/flake.nix index 0d92e08..e8b75b9 100644 --- a/nix/templates/ctf/flake.nix +++ b/nix/templates/ctf/flake.nix @@ -8,7 +8,7 @@ # Flake outputs outputs = - { self, nixpkgs, ... }: + { nixpkgs, ... }: let # Systems supported allSystems = [ diff --git a/nix/templates/goapp/flake.nix b/nix/templates/goapp/flake.nix index 132667d..8303eb3 100644 --- a/nix/templates/goapp/flake.nix +++ b/nix/templates/goapp/flake.nix @@ -3,7 +3,7 @@ inputs.flake-utils.url = "git+https://github.com/numtide/flake-utils"; outputs = - { self, nixpkgs, flake-utils, ... }: + { nixpkgs, flake-utils, ... }: flake-utils.lib.eachDefaultSystem ( system: let @@ -12,24 +12,26 @@ overlays = [ ]; }; - package-and-docker = name: system: (let + package-and-docker = name: (let pkgname = name + "-pkg"; dockername = name + "-docker"; + + package = import ./${name} { inherit pkgs name; }; in { # the raw package - ${pkgname} = import ./${name} { inherit pkgs name; }; + ${pkgname} = package; # the docker image ${dockername} = pkgs.dockerTools.buildImage { name = "${name}"; - config.Cmd = [ "${self.packages.${system}.${pkgname}}/bin/${name}" ]; + config.Cmd = [ "${package}/bin/${name}" ]; }; }); in { packages = { } - // (package-and-docker "backend" system) - // (package-and-docker "frontend" system); + // (package-and-docker "backend") + // (package-and-docker "frontend"); devShells.default = pkgs.mkShell { buildInputs = builtins.attrValues { |
