maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

style: format entire depot with nixpkgs-fmt

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

19
users/sterni/nix/html/default.nix
View file

@ -20,7 +20,7 @@ let
=> "&lt;hello&gt;"
*/
escapeMinimal = builtins.replaceStrings
[ "<" ">" "&" "\"" "'" ]
[ "<" ">" "&" "\"" "'" ]
[ "&lt;" "&gt;" "&amp;" "&quot;" "&#039;" ];
/* Return a string with a correctly rendered tag of the given name,
@ -87,18 +87,20 @@ let
renderTag = tag: attrs: content:
let
attrs' = builtins.concatStringsSep "" (
builtins.map (n:
" ${escapeMinimal n}=\"${escapeMinimal (toString attrs.${n})}\""
) (builtins.attrNames attrs)
builtins.map
(n:
" ${escapeMinimal n}=\"${escapeMinimal (toString attrs.${n})}\""
)
(builtins.attrNames attrs)
);
content' =
if builtins.isList content
then builtins.concatStringsSep "" content
else content;
in
if content == null
then "<${tag}${attrs'}/>"
else "<${tag}${attrs'}>${content'}</${tag}>";
if content == null
then "<${tag}${attrs'}/>"
else "<${tag}${attrs'}>${content'}</${tag}>";
/* Prepend "<!DOCTYPE html>" to a string.
@ -111,7 +113,8 @@ let
*/
withDoctype = doc: "<!DOCTYPE html>" + doc;
in {
in
{
inherit escapeMinimal renderTag withDoctype;
__findFile = _: renderTag;

73
users/sterni/nix/html/tests/default.nix
View file

@ -8,15 +8,17 @@ let
;
exampleDocument = withDoctype (<html> { lang = "en"; } [
(<head> {} [
(<head> { } [
(<meta> { charset = "utf-8"; } null)
(<title> {} "html.nix example document")
(<link> {
rel = "license";
href = "https://code.tvl.fyi/about/LICENSE";
type = "text/html";
} null)
(<style> {} (esc ''
(<title> { } "html.nix example document")
(<link>
{
rel = "license";
href = "https://code.tvl.fyi/about/LICENSE";
type = "text/html";
}
null)
(<style> { } (esc ''
hgroup h2 {
font-weight: normal;
}
@ -26,39 +28,45 @@ let
}
''))
])
(<body> {} [
(<main> {} [
(<hgroup> {} [
(<h1> {} (esc "html.nix"))
(<h2> {} [
(<em> {} "the")
(<body> { } [
(<main> { } [
(<hgroup> { } [
(<h1> { } (esc "html.nix"))
(<h2> { } [
(<em> { } "the")
(esc " most cursed HTML DSL ever!")
])
])
(<dl> {} [
(<dt> {} [
(<dl> { } [
(<dt> { } [
(esc "Q: Wait, it's all ")
(<a> {
href = "https://cl.tvl.fyi/q/hashtag:cursed";
} (esc "cursed"))
(<a>
{
href = "https://cl.tvl.fyi/q/hashtag:cursed";
}
(esc "cursed"))
(esc " nix hacks?")
])
(<dd> {} (esc "A: Always has been. 🔫"))
(<dt> {} (esc "Q: Why does this work?"))
(<dd> {} [
(<dd> { } (esc "A: Always has been. 🔫"))
(<dt> { } (esc "Q: Why does this work?"))
(<dd> { } [
(esc "Because nix ")
(<a> {
href = "https://github.com/NixOS/nix/blob/293220bed5a75efc963e33c183787e87e55e28d9/src/libexpr/parser.y#L410-L416";
} (esc "translates "))
(<a> {
href = "https://github.com/NixOS/nix/blob/293220bed5a75efc963e33c183787e87e55e28d9/src/libexpr/lexer.l#L100";
} (esc "SPATH tokens"))
(<a>
{
href = "https://github.com/NixOS/nix/blob/293220bed5a75efc963e33c183787e87e55e28d9/src/libexpr/parser.y#L410-L416";
}
(esc "translates "))
(<a>
{
href = "https://github.com/NixOS/nix/blob/293220bed5a75efc963e33c183787e87e55e28d9/src/libexpr/lexer.l#L100";
}
(esc "SPATH tokens"))
(esc " like ")
(<code> {} (esc "<nixpkgs>"))
(<code> { } (esc "<nixpkgs>"))
(esc " into calls to ")
(<code> {} (esc "__findFile"))
(<code> { } (esc "__findFile"))
(esc " in the ")
(<em> {} (esc "current"))
(<em> { } (esc "current"))
(esc " scope.")
])
])
@ -67,7 +75,8 @@ let
]);
in
pkgs.runCommandNoCC "html.nix.html" {
pkgs.runCommandNoCC "html.nix.html"
{
passAsFile = [ "exampleDocument" ];
inherit exampleDocument;
nativeBuildInputs = [ pkgs.html5validator ];