From 0d820423e973727ddfc4b461a1063f719873743c Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@google.com>
Date: Thu, 3 Oct 2019 22:16:37 +0100
Subject: chore(build-image): Remove nixery-build-layers

This functionality has been rolled into the server component and is no
longer required.
---
 tools/nixery/build-image/build-layers.nix | 47 -------------------------------
 tools/nixery/build-image/default.nix      | 24 +++++-----------
 tools/nixery/default.nix                  |  9 ++----
 3 files changed, 10 insertions(+), 70 deletions(-)
 delete mode 100644 tools/nixery/build-image/build-layers.nix

(limited to 'tools')

diff --git a/tools/nixery/build-image/build-layers.nix b/tools/nixery/build-image/build-layers.nix
deleted file mode 100644
index 9a8742f13f73..000000000000
--- a/tools/nixery/build-image/build-layers.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2019 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-{
-  # Description of the package set to be used (will be loaded by load-pkgs.nix)
-  srcType ? "nixpkgs",
-  srcArgs ? "nixos-19.03",
-  importArgs ? { },
-  # Path to load-pkgs.nix
-  loadPkgs ? ./load-pkgs.nix,
-  # Layers to assemble into tarballs
-  layers ? "{}"
-}:
-
-let
-  inherit (builtins) fromJSON mapAttrs toJSON;
-  inherit (pkgs) lib runCommand writeText;
-
-  pkgs = import loadPkgs { inherit srcType srcArgs importArgs; };
-
-  # Given a list of store paths, create an image layer tarball with
-  # their contents.
-  pathsToLayer = paths: runCommand "layer.tar" {
-  } ''
-    tar --no-recursion -Prf "$out" \
-        --mtime="@$SOURCE_DATE_EPOCH" \
-        --owner=0 --group=0 /nix /nix/store
-
-    tar -Prpf "$out" --hard-dereference --sort=name \
-        --mtime="@$SOURCE_DATE_EPOCH" \
-        --owner=0 --group=0 ${lib.concatStringsSep " " paths}
-  '';
-
-
-  layerTarballs = mapAttrs (_: pathsToLayer ) (fromJSON layers);
-in writeText "layer-tarballs.json" (toJSON layerTarballs)
diff --git a/tools/nixery/build-image/default.nix b/tools/nixery/build-image/default.nix
index 0800eb95987f..a61ac06bdd92 100644
--- a/tools/nixery/build-image/default.nix
+++ b/tools/nixery/build-image/default.nix
@@ -20,20 +20,10 @@
 
 { pkgs ? import <nixpkgs> {} }:
 
-{
-  build-image = pkgs.writeShellScriptBin "nixery-build-image" ''
-    exec ${pkgs.nix}/bin/nix-build \
-      --show-trace \
-      --no-out-link "$@" \
-      --argstr loadPkgs ${./load-pkgs.nix} \
-      ${./build-image.nix}
-  '';
-
-  build-layers = pkgs.writeShellScriptBin "nixery-build-layers" ''
-    exec ${pkgs.nix}/bin/nix-build \
-      --show-trace \
-      --no-out-link "$@" \
-      --argstr loadPkgs ${./load-pkgs.nix} \
-      ${./build-layers.nix}
-  '';
-}
+pkgs.writeShellScriptBin "nixery-build-image" ''
+  exec ${pkgs.nix}/bin/nix-build \
+    --show-trace \
+    --no-out-link "$@" \
+    --argstr loadPkgs ${./load-pkgs.nix} \
+    ${./build-image.nix}
+''
diff --git a/tools/nixery/default.nix b/tools/nixery/default.nix
index af506eea32d2..b194079b9a29 100644
--- a/tools/nixery/default.nix
+++ b/tools/nixery/default.nix
@@ -18,8 +18,7 @@
 
 with pkgs;
 
-let builders = import ./build-image { inherit pkgs; };
-in rec {
+rec {
   # Go implementation of the Nixery server which implements the
   # container registry interface.
   #
@@ -29,8 +28,7 @@ in rec {
   nixery-server = callPackage ./server { };
 
   # Implementation of the Nix image building logic
-  nixery-build-image = builders.build-image;
-  nixery-build-layers = builders.build-layers;
+  nixery-build-image = import ./build-image { inherit pkgs; };
 
   # Use mdBook to build a static asset page which Nixery can then
   # serve. This is primarily used for the public instance at
@@ -44,7 +42,7 @@ in rec {
   # are installing Nixery directly.
   nixery-bin = writeShellScriptBin "nixery" ''
     export WEB_DIR="${nixery-book}"
-    export PATH="${nixery-build-layers}/bin:${nixery-build-image}/bin:$PATH"
+    export PATH="${nixery-build-image}/bin:$PATH"
     exec ${nixery-server}/bin/nixery
   '';
 
@@ -96,7 +94,6 @@ in rec {
       iana-etc
       nix
       nixery-build-image
-      nixery-build-layers
       nixery-launch-script
       openssh
       zlib
-- 
cgit 1.4.1