From ad9b3eb2629b0716d93ce07411831d859237edff Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@google.com>
Date: Sun, 22 Sep 2019 17:51:39 +0100
Subject: refactor(build): Add group-layers to top-level Nix derivations

This makes CI build the group-layers tool (and cache it to Cachix!)
---
 tools/nixery/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'tools/nixery/default.nix')

diff --git a/tools/nixery/default.nix b/tools/nixery/default.nix
index 66155eefa0..95540e11da 100644
--- a/tools/nixery/default.nix
+++ b/tools/nixery/default.nix
@@ -17,7 +17,11 @@
 
 with pkgs;
 
-rec {
+let buildImage = import ./build-image {
+  srcType = "path";
+  srcArgs = <nixpkgs>;
+};
+in rec {
   # Go implementation of the Nixery server which implements the
   # container registry interface.
   #
@@ -27,10 +31,8 @@ rec {
   nixery-server = callPackage ./server { };
 
   # Implementation of the image building & layering logic
-  nixery-build-image = (import ./build-image {
-    srcType = "path";
-    srcArgs = <nixpkgs>;
-  }).wrapper;
+  nixery-build-image = buildImage.wrapper;
+  nixery-group-layers = buildImage.groupLayers;
 
   # Use mdBook to build a static asset page which Nixery can then
   # serve. This is primarily used for the public instance at
-- 
cgit 1.4.1