From 9ece57315f2cfee0b2fb64d1fd9fb05fb7fb6301 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Sun, 21 Apr 2024 11:44:37 +0200 Subject: nix: save typing --- nix/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nix/default.nix b/nix/default.nix index 7e65d79..612e3e0 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -28,13 +28,13 @@ let mkDockerStream = mkDocker "streamLayeredImage"; mkDockerImage = mkDocker "buildLayeredImage"; in -rec { +with pkgs; rec{ default = server; - builder = pkgs.buildGoApplication { + builder = buildGoApplication { pname = "website-builder"; inherit version; CGO_ENABLED = 0; - src = with pkgs.lib.fileset; toSource { + src = with lib.fileset; toSource { root = ./..; fileset = unions [ ./../go.mod @@ -46,11 +46,11 @@ rec { modules = ./gomod2nix.toml; subPackages = [ "cmd/build" ]; }; - server = pkgs.buildGoApplication { + server = buildGoApplication { pname = "website"; inherit version; CGO_ENABLED = 0; - src = with pkgs.lib.fileset; toSource { + src = with lib.fileset; toSource { root = ./..; fileset = unions [ ./../go.mod -- cgit 1.4.1