2 files changed, 7 insertions, 64 deletions
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}
+''