movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-11 20:25:32 +03:00
Code Issues Projects Releases Packages Wiki Activity

treewide: format all inactive Nix files

Browse source 
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
This commit is contained in:
Silvan Mosberger 2024-12-10 20:26:33 +01:00
parent b32a094368
commit 4f0dadbf38
21293 changed files with 701351 additions and 428307 deletions
Download patch file Download diff file Expand all files Collapse all files

129
nixos/tests/gitdaemon.nix
View file

@ -1,78 +1,83 @@
import ./make-test-python.nix ({ pkgs, ... }:
import ./make-test-python.nix (
{ pkgs, ... }:
let
hashes = pkgs.writeText "hashes" ''
b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c /project/bar
'';
in {
name = "gitdaemon";
let
hashes = pkgs.writeText "hashes" ''
b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c /project/bar
'';
in
{
name = "gitdaemon";
meta = with pkgs.lib.maintainers; {
maintainers = [ tilpner ];
};
meta = with pkgs.lib.maintainers; {
maintainers = [ tilpner ];
};
nodes = {
server =
{ config, ... }: {
networking.firewall.allowedTCPPorts = [ config.services.gitDaemon.port ];
nodes = {
server =
{ config, ... }:
{
networking.firewall.allowedTCPPorts = [ config.services.gitDaemon.port ];
environment.systemPackages = [ pkgs.git ];
environment.systemPackages = [ pkgs.git ];
systemd.tmpfiles.rules = [
# type path mode user group age arg
" d /git 0755 git git - -"
];
systemd.tmpfiles.rules = [
# type path mode user group age arg
" d /git 0755 git git - -"
];
services.gitDaemon = {
enable = true;
basePath = "/git";
services.gitDaemon = {
enable = true;
basePath = "/git";
};
};
};
client =
{ pkgs, ... }: {
environment.systemPackages = [ pkgs.git ];
};
};
client =
{ pkgs, ... }:
{
environment.systemPackages = [ pkgs.git ];
};
};
testScript = ''
start_all()
testScript = ''
start_all()
with subtest("create project.git"):
server.succeed(
"git init --bare /git/project.git",
"touch /git/project.git/git-daemon-export-ok",
)
with subtest("create project.git"):
server.succeed(
"git init --bare /git/project.git",
"touch /git/project.git/git-daemon-export-ok",
)
with subtest("add file to project.git"):
server.succeed(
"git clone /git/project.git /project",
"echo foo > /project/bar",
"git config --global user.email 'you@example.com'",
"git config --global user.name 'Your Name'",
"git -C /project add bar",
"git -C /project commit -m 'quux'",
"git -C /project push",
"rm -r /project",
)
with subtest("add file to project.git"):
server.succeed(
"git clone /git/project.git /project",
"echo foo > /project/bar",
"git config --global user.email 'you@example.com'",
"git config --global user.name 'Your Name'",
"git -C /project add bar",
"git -C /project commit -m 'quux'",
"git -C /project push",
"rm -r /project",
)
# Change user/group to default daemon user/group from module
# to avoid "fatal: detected dubious ownership in repository at '/git/project.git'"
server.succeed("chown git:git -R /git/project.git")
# Change user/group to default daemon user/group from module
# to avoid "fatal: detected dubious ownership in repository at '/git/project.git'"
server.succeed("chown git:git -R /git/project.git")
with subtest("git daemon starts"):
server.wait_for_unit("git-daemon.service")
with subtest("git daemon starts"):
server.wait_for_unit("git-daemon.service")
server.systemctl("start network-online.target")
client.systemctl("start network-online.target")
server.wait_for_unit("network-online.target")
client.wait_for_unit("network-online.target")
server.systemctl("start network-online.target")
client.systemctl("start network-online.target")
server.wait_for_unit("network-online.target")
client.wait_for_unit("network-online.target")
with subtest("client can clone project.git"):
client.succeed(
"git clone git://server/project.git /project",
"sha256sum -c ${hashes}",
)
'';
})
with subtest("client can clone project.git"):
client.succeed(
"git clone git://server/project.git /project",
"sha256sum -c ${hashes}",
)
'';
}
)