
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-build a08b3a4d19
.tar.gz \
--argstr baseRev b32a0943687d2a5094a6d92f25a4b6e16a76b5b7
result/bin/apply-formatting $NIXPKGS_PATH
165 lines
4.3 KiB
Nix
165 lines
4.3 KiB
Nix
{
|
|
lib,
|
|
buildPackages,
|
|
callPackage,
|
|
stdenv,
|
|
nim1,
|
|
nim2,
|
|
nim_builder,
|
|
defaultNimVersion ? 2,
|
|
nimOverrides,
|
|
buildNimPackage,
|
|
}:
|
|
|
|
let
|
|
baseAttrs = {
|
|
strictDeps = true;
|
|
enableParallelBuilding = true;
|
|
doCheck = true;
|
|
configurePhase = ''
|
|
runHook preConfigure
|
|
export NIX_NIM_BUILD_INPUTS=''${pkgsHostTarget[@]} $NIX_NIM_BUILD_INPUTS
|
|
nim_builder --phase:configure
|
|
runHook postConfigure
|
|
'';
|
|
buildPhase = ''
|
|
runHook preBuild
|
|
nim_builder --phase:build
|
|
runHook postBuild
|
|
'';
|
|
checkPhase = ''
|
|
runHook preCheck
|
|
nim_builder --phase:check
|
|
runHook postCheck
|
|
'';
|
|
installPhase = ''
|
|
runHook preInstall
|
|
nim_builder --phase:install
|
|
runHook postInstall
|
|
'';
|
|
meta = { inherit (nim2.meta) maintainers platforms; };
|
|
};
|
|
|
|
fodFromLockEntry =
|
|
let
|
|
methods = {
|
|
fetchzip =
|
|
{ url, sha256, ... }:
|
|
buildPackages.fetchzip {
|
|
name = "source";
|
|
inherit url sha256;
|
|
};
|
|
git =
|
|
{
|
|
fetchSubmodules,
|
|
leaveDotGit,
|
|
rev,
|
|
sha256,
|
|
url,
|
|
...
|
|
}:
|
|
buildPackages.fetchgit {
|
|
inherit
|
|
fetchSubmodules
|
|
leaveDotGit
|
|
rev
|
|
sha256
|
|
url
|
|
;
|
|
};
|
|
};
|
|
in
|
|
attrs@{ method, ... }:
|
|
let
|
|
fod = methods.${method} attrs;
|
|
in
|
|
''--path:"${fod.outPath}/${attrs.srcDir}"'';
|
|
|
|
asFunc = x: if builtins.isFunction x then x else (_: x);
|
|
|
|
in
|
|
buildNimPackageArgs:
|
|
let
|
|
composition =
|
|
finalAttrs:
|
|
let
|
|
postPkg = baseAttrs // (asFunc ((asFunc buildNimPackageArgs) finalAttrs)) baseAttrs;
|
|
|
|
lockAttrs = lib.attrsets.optionalAttrs (builtins.hasAttr "lockFile" postPkg) (
|
|
builtins.fromJSON (builtins.readFile postPkg.lockFile)
|
|
);
|
|
|
|
lockDepends = lockAttrs.depends or [ ];
|
|
|
|
lockFileNimFlags = map fodFromLockEntry lockDepends;
|
|
|
|
postNimOverrides = builtins.foldl' (
|
|
prevAttrs:
|
|
{ packages, ... }@lockAttrs:
|
|
builtins.foldl' (
|
|
prevAttrs: name:
|
|
if (builtins.hasAttr name nimOverrides) then
|
|
(prevAttrs // (nimOverrides.${name} lockAttrs prevAttrs))
|
|
else
|
|
prevAttrs
|
|
) prevAttrs packages
|
|
) postPkg lockDepends;
|
|
|
|
finalOverride =
|
|
{
|
|
depsBuildBuild ? [ ],
|
|
nativeBuildInputs ? [ ],
|
|
nimFlags ? [ ],
|
|
requiredNimVersion ? defaultNimVersion,
|
|
passthru ? { },
|
|
...
|
|
}:
|
|
(
|
|
if requiredNimVersion == 1 then
|
|
{
|
|
depsBuildBuild = [ nim_builder ] ++ depsBuildBuild;
|
|
nativeBuildInputs = [ nim1 ] ++ nativeBuildInputs;
|
|
}
|
|
else if requiredNimVersion == 2 then
|
|
{
|
|
depsBuildBuild = [ nim_builder ] ++ depsBuildBuild;
|
|
nativeBuildInputs = [ nim2 ] ++ nativeBuildInputs;
|
|
}
|
|
else
|
|
throw "requiredNimVersion ${toString requiredNimVersion} is not valid"
|
|
)
|
|
// {
|
|
nimFlags = lockFileNimFlags ++ nimFlags;
|
|
passthru = passthru // {
|
|
# allow overriding the result of buildNimPackageArgs before this composition is applied
|
|
# this allows overriding the lockFile for packages built using buildNimPackage
|
|
# this is adapted from mkDerivationExtensible in stdenv.mkDerivation
|
|
overrideNimAttrs =
|
|
f0:
|
|
let
|
|
f =
|
|
self: super:
|
|
let
|
|
x = f0 super;
|
|
in
|
|
if builtins.isFunction x then f0 self super else x;
|
|
in
|
|
buildNimPackage (
|
|
self:
|
|
let
|
|
super = (asFunc ((asFunc buildNimPackageArgs) self)) baseAttrs;
|
|
in
|
|
super // (if builtins.isFunction f0 || f0 ? __functor then f self super else f0)
|
|
);
|
|
};
|
|
};
|
|
|
|
attrs = postNimOverrides // finalOverride postNimOverrides;
|
|
in
|
|
lib.trivial.warnIf (builtins.hasAttr "nimBinOnly" attrs)
|
|
"the nimBinOnly attribute is deprecated for buildNimPackage"
|
|
attrs;
|
|
|
|
in
|
|
stdenv.mkDerivation composition
|