From 6716bf018c465f4b943eef0e6716caa7a54940da Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Wed, 20 Apr 2022 16:41:20 +0200 Subject: chore(nixery): Housekeeping for depot compatibility Cleans up a whole bunch of things I wanted to get out of the door right away: * depot internal references to //third_party/nixery have been replaced with //tools/nixery * cleaned up files from Github * fixed SPDX & Copyright headers * code formatting and inclusion in //tools/depotfmt checks Change-Id: Iea79f0fdf3aa04f71741d4f4032f88605ae415bb Reviewed-on: https://cl.tvl.fyi/c/depot/+/5486 Tested-by: BuildkiteCI Reviewed-by: tazjin Autosubmit: tazjin --- tools/nixery/prepare-image/default.nix | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'tools/nixery/prepare-image/default.nix') diff --git a/tools/nixery/prepare-image/default.nix b/tools/nixery/prepare-image/default.nix index 60b208f522..efd9ed3404 100644 --- a/tools/nixery/prepare-image/default.nix +++ b/tools/nixery/prepare-image/default.nix @@ -1,16 +1,5 @@ -# 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. +# Copyright 2022 The TVL Contributors +# SPDX-License-Identifier: Apache-2.0 # This file builds a wrapper script called by Nixery to ask for the # content information for a given image. @@ -18,7 +7,7 @@ # The purpose of using a wrapper script is to ensure that the paths to # all required Nix files are set correctly at runtime. -{ pkgs ? import {} }: +{ pkgs ? import { } }: pkgs.writeShellScriptBin "nixery-prepare-image" '' exec ${pkgs.nix}/bin/nix-build \ -- cgit 1.4.1