diff options
author | Vincent Ambo <mail@tazj.in> | 2022-04-20T14·41+0200 |
---|---|---|
committer | clbot <clbot@tvl.fyi> | 2022-04-20T15·31+0000 |
commit | 6716bf018c465f4b943eef0e6716caa7a54940da (patch) | |
tree | 8e609da0ed0052f4088250ecc1033c28d35f5d6c /tools/nixery/builder | |
parent | 535ad8732a688bf6ff4c48283d89dae00262a719 (diff) |
chore(nixery): Housekeeping for depot compatibility r/3982
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 <tazjin@tvl.su> Autosubmit: tazjin <tazjin@tvl.su>
Diffstat (limited to 'tools/nixery/builder')
-rw-r--r-- | tools/nixery/builder/archive.go | 15 | ||||
-rw-r--r-- | tools/nixery/builder/builder.go | 15 | ||||
-rw-r--r-- | tools/nixery/builder/builder_test.go | 15 | ||||
-rw-r--r-- | tools/nixery/builder/cache.go | 15 | ||||
-rw-r--r-- | tools/nixery/builder/layers.go | 15 |
5 files changed, 10 insertions, 65 deletions
diff --git a/tools/nixery/builder/archive.go b/tools/nixery/builder/archive.go index ff822e389a7d..3bc02ab4d5b8 100644 --- a/tools/nixery/builder/archive.go +++ b/tools/nixery/builder/archive.go @@ -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 package builder // This file implements logic for walking through a directory and creating a diff --git a/tools/nixery/builder/builder.go b/tools/nixery/builder/builder.go index 4279cb0a1114..37c9b9fcb763 100644 --- a/tools/nixery/builder/builder.go +++ b/tools/nixery/builder/builder.go @@ -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 // Package builder implements the logic for assembling container // images. It shells out to Nix to retrieve all required Nix-packages diff --git a/tools/nixery/builder/builder_test.go b/tools/nixery/builder/builder_test.go index 3fbe2ab40e23..507f3eb15a83 100644 --- a/tools/nixery/builder/builder_test.go +++ b/tools/nixery/builder/builder_test.go @@ -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 package builder import ( diff --git a/tools/nixery/builder/cache.go b/tools/nixery/builder/cache.go index 35b563e52496..9e4283c0e5bb 100644 --- a/tools/nixery/builder/cache.go +++ b/tools/nixery/builder/cache.go @@ -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 package builder import ( diff --git a/tools/nixery/builder/layers.go b/tools/nixery/builder/layers.go index f769e43c5808..5e37e626810f 100644 --- a/tools/nixery/builder/layers.go +++ b/tools/nixery/builder/layers.go @@ -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 package reads an export reference graph (i.e. a graph representing the // runtime dependencies of a set of derivations) created by Nix and groups it in |