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:
Vincent Ambo 2022-01-30 19:06:58 +03:00 committed by tazjin
parent 2d10d60fac
commit aa122cbae7
310 changed files with 7278 additions and 5490 deletions

View file

@ -1,31 +1,36 @@
{ depot, pkgs, lib, ... }:
let
netencode-rs = depot.nix.writers.rustSimpleLib {
netencode-rs = depot.nix.writers.rustSimpleLib
{
name = "netencode";
dependencies = [
depot.third_party.rust-crates.nom
depot.users.Profpatsch.execline.exec-helpers
];
} (builtins.readFile ./netencode.rs);
}
(builtins.readFile ./netencode.rs);
gen = import ./gen.nix { inherit lib; };
pretty-rs = depot.nix.writers.rustSimpleLib {
name = "netencode-pretty";
dependencies = [
netencode-rs
];
} (builtins.readFile ./pretty.rs);
pretty-rs = depot.nix.writers.rustSimpleLib
{
name = "netencode-pretty";
dependencies = [
netencode-rs
];
}
(builtins.readFile ./pretty.rs);
pretty = depot.nix.writers.rustSimple {
name = "netencode-pretty";
dependencies = [
netencode-rs
pretty-rs
depot.users.Profpatsch.execline.exec-helpers
];
} ''
pretty = depot.nix.writers.rustSimple
{
name = "netencode-pretty";
dependencies = [
netencode-rs
pretty-rs
depot.users.Profpatsch.execline.exec-helpers
];
} ''
extern crate netencode;
extern crate netencode_pretty;
extern crate exec_helpers;
@ -41,24 +46,27 @@ let
}
'';
netencode-mustache = depot.nix.writers.rustSimple {
name = "netencode_mustache";
dependencies = [
depot.users.Profpatsch.arglib.netencode.rust
netencode-rs
depot.third_party.rust-crates.mustache
];
} (builtins.readFile ./netencode-mustache.rs);
netencode-mustache = depot.nix.writers.rustSimple
{
name = "netencode_mustache";
dependencies = [
depot.users.Profpatsch.arglib.netencode.rust
netencode-rs
depot.third_party.rust-crates.mustache
];
}
(builtins.readFile ./netencode-mustache.rs);
record-get = depot.nix.writers.rustSimple {
name = "record-get";
dependencies = [
netencode-rs
depot.users.Profpatsch.execline.exec-helpers
depot.users.Profpatsch.arglib.netencode.rust
];
} ''
record-get = depot.nix.writers.rustSimple
{
name = "record-get";
dependencies = [
netencode-rs
depot.users.Profpatsch.execline.exec-helpers
depot.users.Profpatsch.arglib.netencode.rust
];
} ''
extern crate netencode;
extern crate arglib_netencode;
extern crate exec_helpers;
@ -80,13 +88,14 @@ let
}
'';
record-splice-env = depot.nix.writers.rustSimple {
name = "record-splice-env";
dependencies = [
netencode-rs
depot.users.Profpatsch.execline.exec-helpers
];
} ''
record-splice-env = depot.nix.writers.rustSimple
{
name = "record-splice-env";
dependencies = [
netencode-rs
depot.users.Profpatsch.execline.exec-helpers
];
} ''
extern crate netencode;
extern crate exec_helpers;
use netencode::dec::{Record, Try, ScalarAsBytes, Decoder, DecodeError};
@ -109,13 +118,14 @@ let
}
'';
env-splice-record = depot.nix.writers.rustSimple {
name = "env-splice-record";
dependencies = [
netencode-rs
depot.users.Profpatsch.execline.exec-helpers
];
} ''
env-splice-record = depot.nix.writers.rustSimple
{
name = "env-splice-record";
dependencies = [
netencode-rs
depot.users.Profpatsch.execline.exec-helpers
];
} ''
extern crate netencode;
extern crate exec_helpers;
use netencode::{T};
@ -135,7 +145,8 @@ let
}
'';
in depot.nix.readTree.drvTargets {
in
depot.nix.readTree.drvTargets {
inherit
netencode-rs
pretty-rs

View file

@ -27,29 +27,33 @@ let
concatStrings = builtins.concatStringsSep "";
record = lokv: netstring "{" "}"
(concatStrings (map ({key, val}: tag key val) lokv));
(concatStrings (map ({ key, val }: tag key val) lokv));
list = l: netstring "[" "]" (concatStrings l);
dwim = val:
let match = {
"bool" = n1;
"int" = i6;
"string" = text;
"set" = attrs:
# it could be a derivation, then just return the path
if attrs.type or "" == "derivation" then text "${attrs}"
else
record (lib.mapAttrsToList
(k: v: {
key = k;
val = dwim v;
}) attrs);
"list" = l: list (map dwim l);
};
in match.${builtins.typeOf val} val;
let
match = {
"bool" = n1;
"int" = i6;
"string" = text;
"set" = attrs:
# it could be a derivation, then just return the path
if attrs.type or "" == "derivation" then text "${attrs}"
else
record (lib.mapAttrsToList
(k: v: {
key = k;
val = dwim v;
})
attrs);
"list" = l: list (map dwim l);
};
in
match.${builtins.typeOf val} val;
in {
in
{
inherit
unit
n1