max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-22 14:06:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix format errors

Browse source 
Fix formatting violations, update blacklist to reflect moved files.

PR #10556 passed CI before the new formating rules were added, and our
CI has the race condition of allowing old results, resulting in master
getting broken.
This commit is contained in:
John Ericson 2024-05-02 21:41:24 -04:00
parent 840267491e
commit 037c8d771d
3 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
maintainers/flake-module.nix
View file

@ -252,8 +252,8 @@
''^src/libstore/unix/pathlocks\.cc$'' ''^src/libstore/unix/pathlocks\.cc$''
''^src/libstore/unix/posix-fs-canonicalise\.cc$'' ''^src/libstore/unix/posix-fs-canonicalise\.cc$''
''^src/libstore/unix/posix-fs-canonicalise\.hh$'' ''^src/libstore/unix/posix-fs-canonicalise\.hh$''
''^src/libstore/unix/uds-remote-store\.cc$'' ''^src/libstore/uds-remote-store\.cc$''
''^src/libstore/unix/uds-remote-store\.hh$'' ''^src/libstore/uds-remote-store\.hh$''
''^src/libstore/windows/build\.cc$'' ''^src/libstore/windows/build\.cc$''
''^src/libstore/worker-protocol-impl\.hh$'' ''^src/libstore/worker-protocol-impl\.hh$''
''^src/libstore/worker-protocol\.cc$'' ''^src/libstore/worker-protocol\.cc$''
@ -350,7 +350,7 @@
''^src/libutil/unix/processes\.cc$'' ''^src/libutil/unix/processes\.cc$''
''^src/libutil/unix/signals-impl\.hh$'' ''^src/libutil/unix/signals-impl\.hh$''
''^src/libutil/unix/signals\.cc$'' ''^src/libutil/unix/signals\.cc$''
''^src/libutil/unix/unix-domain-socket\.cc$'' ''^src/libutil/unix-domain-socket\.cc$''
''^src/libutil/unix/users\.cc$'' ''^src/libutil/unix/users\.cc$''
''^src/libutil/url-parts\.hh$'' ''^src/libutil/url-parts\.hh$''
''^src/libutil/url\.cc$'' ''^src/libutil/url\.cc$''

6
src/libstore/indirect-root-store.cc
View file

@ -15,15 +15,15 @@ void IndirectRootStore::makeSymlink(const Path & link, const Path & target)
renameFile(tempLink, link); renameFile(tempLink, link);
} }
Path IndirectRootStore::addPermRoot(const StorePath & storePath, const Path & _gcRoot) Path IndirectRootStore::addPermRoot(const StorePath & storePath, const Path & _gcRoot)
{ {
Path gcRoot(canonPath(_gcRoot)); Path gcRoot(canonPath(_gcRoot));
if (isInStore(gcRoot)) if (isInStore(gcRoot))
throw Error( throw Error(
"creating a garbage collector root (%1%) in the Nix store is forbidden " "creating a garbage collector root (%1%) in the Nix store is forbidden "
"(are you running nix-build inside the store?)", gcRoot); "(are you running nix-build inside the store?)",
gcRoot);
/* Register this root with the garbage collector, if it's /* Register this root with the garbage collector, if it's
running. This should be superfluous since the caller should running. This should be superfluous since the caller should

6
src/libutil/unix-domain-socket.hh
View file

@ -5,7 +5,7 @@
#include "file-descriptor.hh" #include "file-descriptor.hh"
#ifdef _WIN32 #ifdef _WIN32
# include <winsock2.h> # include <winsock2.h>
#endif #endif
#include <unistd.h> #include <unistd.h>
@ -21,7 +21,6 @@ AutoCloseFD createUnixDomainSocket();
*/ */
AutoCloseFD createUnixDomainSocket(const Path & path, mode_t mode); AutoCloseFD createUnixDomainSocket(const Path & path, mode_t mode);
/** /**
* Often we want to use `Descriptor`, but Windows makes a slightly * Often we want to use `Descriptor`, but Windows makes a slightly
* stronger file descriptor vs socket distinction, at least at the level * stronger file descriptor vs socket distinction, at least at the level
@ -39,7 +38,7 @@ using Socket =
/** /**
* Windows gives this a different name * Windows gives this a different name
*/ */
# define SHUT_WR SD_SEND # define SHUT_WR SD_SEND
#endif #endif
/** /**
@ -70,7 +69,6 @@ static inline Descriptor fromSocket(Socket fd)
#endif #endif
} }
/** /**
* Bind a Unix domain socket to a path. * Bind a Unix domain socket to a path.
*/ */