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 <tazjin@tvl.su> Autosubmit: tazjin <tazjin@tvl.su>
This commit is contained in:
parent
535ad8732a
commit
6716bf018c
32 changed files with 192 additions and 478 deletions
|
@ -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
|
||||
|
||||
# Load a Nix package set from one of the supported source types
|
||||
# (nixpkgs, git, path).
|
||||
|
@ -24,7 +13,8 @@ let
|
|||
let
|
||||
url =
|
||||
"https://github.com/NixOS/nixpkgs/archive/${channel}.tar.gz";
|
||||
in import (fetchTarball url) importArgs;
|
||||
in
|
||||
import (fetchTarball url) importArgs;
|
||||
|
||||
# If a git repository is requested, it is retrieved via
|
||||
# builtins.fetchGit which defaults to the git configuration of the
|
||||
|
@ -35,7 +25,8 @@ let
|
|||
# No special handling is used for paths, so users are expected to pass one
|
||||
# that will work natively with Nix.
|
||||
importPath = path: import (toPath path) importArgs;
|
||||
in if srcType == "nixpkgs" then
|
||||
in
|
||||
if srcType == "nixpkgs" then
|
||||
fetchImportChannel srcArgs
|
||||
else if srcType == "git" then
|
||||
fetchImportGit (fromJSON srcArgs)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue