mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-27 08:04:14 +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-build a08b3a4d19.tar.gz \
--argstr baseRev b32a094368
result/bin/apply-formatting $NIXPKGS_PATH
65 lines
1.6 KiB
Nix
65 lines
1.6 KiB
Nix
{
|
|
stdenv,
|
|
closureInfo,
|
|
pixz,
|
|
|
|
# The file name of the resulting tarball
|
|
fileName ? "nixos-system-${stdenv.hostPlatform.system}",
|
|
|
|
# The files and directories to be placed in the tarball.
|
|
# This is a list of attribute sets {source, target} where `source'
|
|
# is the file system object (regular file or directory) to be
|
|
# grafted in the file system at path `target'.
|
|
contents,
|
|
|
|
# In addition to `contents', the closure of the store paths listed
|
|
# in `packages' are also placed in the Nix store of the tarball. This is
|
|
# a list of attribute sets {object, symlink} where `object' if a
|
|
# store path whose closure will be copied, and `symlink' is a
|
|
# symlink to `object' that will be added to the tarball.
|
|
storeContents ? [ ],
|
|
|
|
# Extra commands to be executed before archiving files
|
|
extraCommands ? "",
|
|
|
|
# Extra tar arguments
|
|
extraArgs ? "",
|
|
# Command used for compression
|
|
compressCommand ? "pixz -t",
|
|
# Extension for the compressed tarball
|
|
compressionExtension ? ".xz",
|
|
# extra inputs, like the compressor to use
|
|
extraInputs ? [ pixz ],
|
|
}:
|
|
|
|
let
|
|
symlinks = map (x: x.symlink) storeContents;
|
|
objects = map (x: x.object) storeContents;
|
|
in
|
|
|
|
stdenv.mkDerivation {
|
|
name = "tarball";
|
|
builder = ./make-system-tarball.sh;
|
|
nativeBuildInputs = extraInputs;
|
|
|
|
inherit
|
|
fileName
|
|
extraArgs
|
|
extraCommands
|
|
compressCommand
|
|
;
|
|
|
|
# !!! should use XML.
|
|
sources = map (x: x.source) contents;
|
|
targets = map (x: x.target) contents;
|
|
|
|
# !!! should use XML.
|
|
inherit symlinks objects;
|
|
|
|
closureInfo = closureInfo {
|
|
rootPaths = objects;
|
|
};
|
|
|
|
extension = compressionExtension;
|
|
}
|