style: format entire depot with nixpkgs-fmt
This CL can be used to compare the style of nixpkgs-fmt against other formatters (nixpkgs, alejandra). Change-Id: I87c6abff6bcb546b02ead15ad0405f81e01b6d9e Reviewed-on: https://cl.tvl.fyi/c/depot/+/4397 Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org> Reviewed-by: lukegb <lukegb@tvl.fyi> Reviewed-by: wpcarro <wpcarro@gmail.com> Reviewed-by: Profpatsch <mail@profpatsch.de> Reviewed-by: kanepyork <rikingcoding@gmail.com> Reviewed-by: tazjin <tazjin@tvl.su> Reviewed-by: cynthia <cynthia@tvl.fyi> Reviewed-by: edef <edef@edef.eu> Reviewed-by: eta <tvl@eta.st> Reviewed-by: grfn <grfn@gws.fyi>
This commit is contained in:
parent
2d10d60fac
commit
aa122cbae7
310 changed files with 7278 additions and 5490 deletions
12
third_party/nix/corepkgs/buildenv.nix
vendored
12
third_party/nix/corepkgs/buildenv.nix
vendored
|
|
@ -9,11 +9,13 @@ derivation {
|
|||
|
||||
# !!! grmbl, need structured data for passing this in a clean way.
|
||||
derivations =
|
||||
map (d:
|
||||
[ (d.meta.active or "true")
|
||||
(d.meta.priority or 5)
|
||||
(builtins.length d.outputs)
|
||||
] ++ map (output: builtins.getAttr output d) d.outputs)
|
||||
map
|
||||
(d:
|
||||
[
|
||||
(d.meta.active or "true")
|
||||
(d.meta.priority or 5)
|
||||
(builtins.length d.outputs)
|
||||
] ++ map (output: builtins.getAttr output d) d.outputs)
|
||||
derivations;
|
||||
|
||||
# Building user environments remotely just causes huge amounts of
|
||||
|
|
|
|||
9
third_party/nix/corepkgs/derivation.nix
vendored
9
third_party/nix/corepkgs/derivation.nix
vendored
|
|
@ -8,12 +8,14 @@ let
|
|||
strict = derivationStrict drvAttrs;
|
||||
|
||||
commonAttrs = drvAttrs // (builtins.listToAttrs outputsList) //
|
||||
{ all = map (x: x.value) outputsList;
|
||||
{
|
||||
all = map (x: x.value) outputsList;
|
||||
inherit drvAttrs;
|
||||
};
|
||||
|
||||
outputToAttrListElement = outputName:
|
||||
{ name = outputName;
|
||||
{
|
||||
name = outputName;
|
||||
value = commonAttrs // {
|
||||
outPath = builtins.getAttr outputName strict;
|
||||
drvPath = strict.drvPath;
|
||||
|
|
@ -24,4 +26,5 @@ let
|
|||
|
||||
outputsList = map outputToAttrListElement outputs;
|
||||
|
||||
in (builtins.head outputsList).value
|
||||
in
|
||||
(builtins.head outputsList).value
|
||||
|
|
|
|||
19
third_party/nix/corepkgs/fetchurl.nix
vendored
19
third_party/nix/corepkgs/fetchurl.nix
vendored
|
|
@ -2,12 +2,13 @@
|
|||
, url
|
||||
, hash ? "" # an SRI ash
|
||||
|
||||
# Legacy hash specification
|
||||
, md5 ? "", sha1 ? "", sha256 ? "", sha512 ? ""
|
||||
, outputHash ?
|
||||
if hash != "" then hash else if sha512 != "" then sha512 else if sha1 != "" then sha1 else if md5 != "" then md5 else sha256
|
||||
, outputHashAlgo ?
|
||||
if hash != "" then "" else if sha512 != "" then "sha512" else if sha1 != "" then "sha1" else if md5 != "" then "md5" else "sha256"
|
||||
# Legacy hash specification
|
||||
, md5 ? ""
|
||||
, sha1 ? ""
|
||||
, sha256 ? ""
|
||||
, sha512 ? ""
|
||||
, outputHash ? if hash != "" then hash else if sha512 != "" then sha512 else if sha1 != "" then sha1 else if md5 != "" then md5 else sha256
|
||||
, outputHashAlgo ? if hash != "" then "" else if sha512 != "" then "sha512" else if sha1 != "" then "sha1" else if md5 != "" then "md5" else "sha256"
|
||||
|
||||
, executable ? false
|
||||
, unpack ? false
|
||||
|
|
@ -33,7 +34,11 @@ derivation {
|
|||
# easy proxy configuration. This is impure, but a fixed-output
|
||||
# derivation like fetchurl is allowed to do so since its result is
|
||||
# by definition pure.
|
||||
"http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy"
|
||||
"http_proxy"
|
||||
"https_proxy"
|
||||
"ftp_proxy"
|
||||
"all_proxy"
|
||||
"no_proxy"
|
||||
];
|
||||
|
||||
# To make "nix-prefetch-url" work.
|
||||
|
|
|
|||
|
|
@ -3,19 +3,22 @@ attrs @ { drvPath, outputs, name, ... }:
|
|||
let
|
||||
|
||||
commonAttrs = (builtins.listToAttrs outputsList) //
|
||||
{ all = map (x: x.value) outputsList;
|
||||
{
|
||||
all = map (x: x.value) outputsList;
|
||||
inherit drvPath name;
|
||||
type = "derivation";
|
||||
};
|
||||
|
||||
outputToAttrListElement = outputName:
|
||||
{ name = outputName;
|
||||
{
|
||||
name = outputName;
|
||||
value = commonAttrs // {
|
||||
outPath = builtins.getAttr outputName attrs;
|
||||
inherit outputName;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
outputsList = map outputToAttrListElement outputs;
|
||||
|
||||
in (builtins.head outputsList).value
|
||||
|
||||
in
|
||||
(builtins.head outputsList).value
|
||||
|
|
|
|||
58
third_party/nix/default.nix
vendored
58
third_party/nix/default.nix
vendored
|
|
@ -1,5 +1,4 @@
|
|||
args@{
|
||||
depot ? (import ../.. {})
|
||||
args@{ depot ? (import ../.. { })
|
||||
, pkgs ? depot.third_party.nixpkgs
|
||||
, lib
|
||||
, buildType ? "release"
|
||||
|
|
@ -8,39 +7,43 @@ args@{
|
|||
|
||||
let
|
||||
aws-s3-cpp = pkgs.aws-sdk-cpp.override {
|
||||
apis = ["s3" "transfer"];
|
||||
apis = [ "s3" "transfer" ];
|
||||
customMemoryManagement = false;
|
||||
};
|
||||
|
||||
src = let
|
||||
srcDir = ./.;
|
||||
# create relative paths for all the sources we are filtering
|
||||
asRelative = path:
|
||||
let
|
||||
srcS = toString srcDir;
|
||||
pathS = toString path;
|
||||
in
|
||||
src =
|
||||
let
|
||||
srcDir = ./.;
|
||||
# create relative paths for all the sources we are filtering
|
||||
asRelative = path:
|
||||
let
|
||||
srcS = toString srcDir;
|
||||
pathS = toString path;
|
||||
in
|
||||
if ! lib.hasPrefix srcS pathS then
|
||||
throw "Path is outside of the working directory."
|
||||
else
|
||||
lib.removePrefix srcS pathS;
|
||||
lib.removePrefix srcS pathS;
|
||||
|
||||
in builtins.filterSource (path: type:
|
||||
# Strip out .nix files that are in the root of the repository. Changing
|
||||
# the expression of tvix shouldn't cause a rebuild of tvix unless really
|
||||
# required.
|
||||
!(dirOf (asRelative path) == "/" && lib.hasSuffix ".nix" path) &&
|
||||
in
|
||||
builtins.filterSource
|
||||
(path: type:
|
||||
# Strip out .nix files that are in the root of the repository. Changing
|
||||
# the expression of tvix shouldn't cause a rebuild of tvix unless really
|
||||
# required.
|
||||
!(dirOf (asRelative path) == "/" && lib.hasSuffix ".nix" path) &&
|
||||
|
||||
# remove the proto files from the repo as those are compiled separately
|
||||
!(lib.hasPrefix "src/proto" (asRelative path)) &&
|
||||
# remove the proto files from the repo as those are compiled separately
|
||||
!(lib.hasPrefix "src/proto" (asRelative path)) &&
|
||||
|
||||
# ignore result symlinks
|
||||
!(type == "symlink" && lib.hasPrefix "result" (baseNameOf path))
|
||||
) srcDir;
|
||||
# ignore result symlinks
|
||||
!(type == "symlink" && lib.hasPrefix "result" (baseNameOf path))
|
||||
)
|
||||
srcDir;
|
||||
|
||||
# Proto generation in CMake is theoretically possible, but that is
|
||||
# very theoretical - this does it in Nix instead.
|
||||
protoSrcs = pkgs.runCommand "nix-proto-srcs" {} ''
|
||||
protoSrcs = pkgs.runCommand "nix-proto-srcs" { } ''
|
||||
export PROTO_SRCS=${./src/proto}
|
||||
mkdir -p $out/libproto
|
||||
${depot.third_party.protobuf}/bin/protoc -I=$PROTO_SRCS \
|
||||
|
|
@ -52,12 +55,13 @@ let
|
|||
|
||||
# Derivation for busybox that just has the `busybox` binary in bin/, not all
|
||||
# the symlinks, so cmake can find it
|
||||
busybox = pkgs.runCommand "busybox" {} ''
|
||||
busybox = pkgs.runCommand "busybox" { } ''
|
||||
mkdir -p $out/bin
|
||||
cp ${pkgs.busybox}/bin/busybox $out/bin
|
||||
'';
|
||||
|
||||
in lib.fix (self: pkgs.fullLlvm11Stdenv.mkDerivation {
|
||||
in
|
||||
lib.fix (self: pkgs.fullLlvm11Stdenv.mkDerivation {
|
||||
pname = "tvix";
|
||||
version = "2.3.4";
|
||||
inherit src;
|
||||
|
|
@ -141,7 +145,7 @@ in lib.fix (self: pkgs.fullLlvm11Stdenv.mkDerivation {
|
|||
# Work around broken system header include flags in the cxx toolchain.
|
||||
LIBCXX_INCLUDE = "${pkgs.llvmPackages_11.libcxx}/include/c++/v1";
|
||||
|
||||
SANDBOX_SHELL="${pkgs.busybox}/bin/busybox";
|
||||
SANDBOX_SHELL = "${pkgs.busybox}/bin/busybox";
|
||||
|
||||
# Install the various symlinks to the Nix binary which users expect
|
||||
# to exist.
|
||||
|
|
@ -190,7 +194,7 @@ in lib.fix (self: pkgs.fullLlvm11Stdenv.mkDerivation {
|
|||
${pkgs.jq}/bin/jq < compile_commands.json -r 'map(.file)|.[]' | grep -v '/generated/' | ${pkgs.parallel}/bin/parallel ${pkgs.clang-tools}/bin/clang-tidy -p compile_commands.json $@
|
||||
'';
|
||||
|
||||
installCheckInputs = up.installCheckInputs ++ [run_clang_tidy];
|
||||
installCheckInputs = up.installCheckInputs ++ [ run_clang_tidy ];
|
||||
|
||||
shellHook = ''
|
||||
export NIX_DATA_DIR="${toString depot.path}/third_party"
|
||||
|
|
|
|||
3
third_party/nix/test-vm.nix
vendored
3
third_party/nix/test-vm.nix
vendored
|
|
@ -16,4 +16,5 @@ let
|
|||
};
|
||||
|
||||
system = depot.third_party.nixos { inherit configuration; };
|
||||
in system.vm
|
||||
in
|
||||
system.vm
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue