mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-16 09:54:52 +00:00
4f0dadbf38
After final improvements to the official formatter implementation, this commit now performs the first treewide reformat of Nix files using it. This is part of the implementation of RFC 166. Only "inactive" files are reformatted, meaning only files that aren't being touched by any PR with activity in the past 2 months. This is to avoid conflicts for PRs that might soon be merged. Later we can do a full treewide reformat to get the rest, which should not cause as many conflicts. A CI check has already been running for some time to ensure that new and already-formatted files are formatted, so the files being reformatted here should also stay formatted. This commit was automatically created and can be verified using nix-builda08b3a4d19
.tar.gz \ --argstr baseRevb32a094368
result/bin/apply-formatting $NIXPKGS_PATH
274 lines
6.1 KiB
Nix
274 lines
6.1 KiB
Nix
{
|
|
lib,
|
|
writeText,
|
|
writeCBin,
|
|
writeShellScript,
|
|
makeWrapper,
|
|
runCommand,
|
|
which,
|
|
...
|
|
}:
|
|
|
|
let
|
|
# Testfiles
|
|
foofile = writeText "foofile" "foo";
|
|
barfile = writeText "barfile" "bar";
|
|
|
|
# Wrapped binaries
|
|
wrappedArgv0 = writeCBin "wrapped-argv0" ''
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
|
|
void main(int argc, char** argv) {
|
|
printf("argv0=%s", argv[0]);
|
|
exit(0);
|
|
}
|
|
'';
|
|
wrappedBinaryVar = writeShellScript "wrapped-var" ''
|
|
echo "VAR=$VAR"
|
|
'';
|
|
wrappedBinaryArgs = writeShellScript "wrapped-args" ''
|
|
echo "$@"
|
|
'';
|
|
|
|
mkWrapperBinary =
|
|
{
|
|
name,
|
|
args,
|
|
wrapped ? wrappedBinaryVar,
|
|
}:
|
|
runCommand name
|
|
{
|
|
nativeBuildInputs = [ makeWrapper ];
|
|
}
|
|
''
|
|
mkdir -p $out/bin
|
|
makeWrapper "${wrapped}" "$out/bin/${name}" ${lib.escapeShellArgs args}
|
|
'';
|
|
|
|
mkTest = cmd: toExpect: ''
|
|
output="$(${cmd})"
|
|
if [[ "$output" != '${toExpect}' ]]; then
|
|
echo "test failed: the output of ${cmd} was '$output', expected '${toExpect}'"
|
|
echo "the wrapper contents:"
|
|
for i in ${cmd}; do
|
|
if [[ $i =~ ^test- ]]; then
|
|
cat $(which $i)
|
|
fi
|
|
done
|
|
exit 1
|
|
fi
|
|
'';
|
|
in
|
|
runCommand "make-wrapper-test"
|
|
{
|
|
nativeBuildInputs = [
|
|
which
|
|
(mkWrapperBinary {
|
|
name = "test-argv0";
|
|
args = [
|
|
"--argv0"
|
|
"foo"
|
|
];
|
|
wrapped = "${wrappedArgv0}/bin/wrapped-argv0";
|
|
})
|
|
(mkWrapperBinary {
|
|
name = "test-set";
|
|
args = [
|
|
"--set"
|
|
"VAR"
|
|
"abc"
|
|
];
|
|
})
|
|
(mkWrapperBinary {
|
|
name = "test-set-default";
|
|
args = [
|
|
"--set-default"
|
|
"VAR"
|
|
"abc"
|
|
];
|
|
})
|
|
(mkWrapperBinary {
|
|
name = "test-unset";
|
|
args = [
|
|
"--unset"
|
|
"VAR"
|
|
];
|
|
})
|
|
(mkWrapperBinary {
|
|
name = "test-run";
|
|
args = [
|
|
"--run"
|
|
"echo bar"
|
|
];
|
|
})
|
|
(mkWrapperBinary {
|
|
name = "test-run-and-set";
|
|
args = [
|
|
"--run"
|
|
"export VAR=foo"
|
|
"--set"
|
|
"VAR"
|
|
"bar"
|
|
];
|
|
})
|
|
(mkWrapperBinary {
|
|
name = "test-args";
|
|
args = [
|
|
"--add-flags"
|
|
"abc"
|
|
"--append-flags"
|
|
"xyz"
|
|
];
|
|
wrapped = wrappedBinaryArgs;
|
|
})
|
|
(mkWrapperBinary {
|
|
name = "test-prefix";
|
|
args = [
|
|
"--prefix"
|
|
"VAR"
|
|
":"
|
|
"abc"
|
|
];
|
|
})
|
|
(mkWrapperBinary {
|
|
name = "test-prefix-noglob";
|
|
args = [
|
|
"--prefix"
|
|
"VAR"
|
|
":"
|
|
"./*"
|
|
];
|
|
})
|
|
(mkWrapperBinary {
|
|
name = "test-suffix";
|
|
args = [
|
|
"--suffix"
|
|
"VAR"
|
|
":"
|
|
"abc"
|
|
];
|
|
})
|
|
(mkWrapperBinary {
|
|
name = "test-prefix-and-suffix";
|
|
args = [
|
|
"--prefix"
|
|
"VAR"
|
|
":"
|
|
"foo"
|
|
"--suffix"
|
|
"VAR"
|
|
":"
|
|
"bar"
|
|
];
|
|
})
|
|
(mkWrapperBinary {
|
|
name = "test-prefix-multi";
|
|
args = [
|
|
"--prefix"
|
|
"VAR"
|
|
":"
|
|
"abc:foo:foo"
|
|
];
|
|
})
|
|
(mkWrapperBinary {
|
|
name = "test-suffix-each";
|
|
args = [
|
|
"--suffix-each"
|
|
"VAR"
|
|
":"
|
|
"foo bar:def"
|
|
];
|
|
})
|
|
(mkWrapperBinary {
|
|
name = "test-prefix-each";
|
|
args = [
|
|
"--prefix-each"
|
|
"VAR"
|
|
":"
|
|
"foo bar:def"
|
|
];
|
|
})
|
|
(mkWrapperBinary {
|
|
name = "test-suffix-contents";
|
|
args = [
|
|
"--suffix-contents"
|
|
"VAR"
|
|
":"
|
|
"${foofile} ${barfile}"
|
|
];
|
|
})
|
|
(mkWrapperBinary {
|
|
name = "test-prefix-contents";
|
|
args = [
|
|
"--prefix-contents"
|
|
"VAR"
|
|
":"
|
|
"${foofile} ${barfile}"
|
|
];
|
|
})
|
|
];
|
|
}
|
|
(
|
|
# --argv0 works
|
|
mkTest "test-argv0" "argv0=foo"
|
|
|
|
# --set works
|
|
+ mkTest "test-set" "VAR=abc"
|
|
# --set overwrites the variable
|
|
+ mkTest "VAR=foo test-set" "VAR=abc"
|
|
# --set-default works
|
|
+ mkTest "test-set-default" "VAR=abc"
|
|
# --set-default doesn"t overwrite the variable
|
|
+ mkTest "VAR=foo test-set-default" "VAR=foo"
|
|
# --unset works
|
|
+ mkTest "VAR=foo test-unset" "VAR="
|
|
|
|
# --add-flags and --append-flags work
|
|
+ mkTest "test-args" "abc xyz"
|
|
# given flags are kept
|
|
+ mkTest "test-args foo" "abc foo xyz"
|
|
|
|
# --run works
|
|
+ mkTest "test-run" "bar\nVAR="
|
|
# --run & --set works
|
|
+ mkTest "test-run-and-set" "VAR=bar"
|
|
|
|
# --prefix works
|
|
+ mkTest "VAR=foo test-prefix" "VAR=abc:foo"
|
|
# sets variable if not set yet
|
|
+ mkTest "test-prefix" "VAR=abc"
|
|
# prepends value only once
|
|
+ mkTest "VAR=abc test-prefix" "VAR=abc"
|
|
# Moves value to the front if it already existed
|
|
+ mkTest "VAR=foo:abc test-prefix" "VAR=abc:foo"
|
|
+ mkTest "VAR=abc:foo:bar test-prefix-multi" "VAR=abc:foo:bar"
|
|
# Doesn't overwrite parts of the string
|
|
+ mkTest "VAR=test:abcde:test test-prefix" "VAR=abc:test:abcde:test"
|
|
# Only append the value once when given multiple times in a parameter
|
|
# to makeWrapper
|
|
+ mkTest "test-prefix" "VAR=abc"
|
|
# --prefix doesn't expand globs
|
|
+ mkTest "VAR=f?oo test-prefix-noglob" "VAR=./*:f?oo"
|
|
|
|
# --suffix works
|
|
+ mkTest "VAR=foo test-suffix" "VAR=foo:abc"
|
|
# sets variable if not set yet
|
|
+ mkTest "test-suffix" "VAR=abc"
|
|
# adds the same value only once
|
|
+ mkTest "VAR=abc test-suffix" "VAR=abc"
|
|
+ mkTest "VAR=abc:foo test-suffix" "VAR=abc:foo"
|
|
# --prefix in combination with --suffix
|
|
+ mkTest "VAR=abc test-prefix-and-suffix" "VAR=foo:abc:bar"
|
|
|
|
# --suffix-each works
|
|
+ mkTest "VAR=abc test-suffix-each" "VAR=abc:foo:bar:def"
|
|
# --prefix-each works
|
|
+ mkTest "VAR=abc test-prefix-each" "VAR=bar:def:foo:abc"
|
|
# --suffix-contents works
|
|
+ mkTest "VAR=abc test-suffix-contents" "VAR=abc:foo:bar"
|
|
# --prefix-contents works
|
|
+ mkTest "VAR=abc test-prefix-contents" "VAR=bar:foo:abc"
|
|
+ "touch $out"
|
|
)
|