mirror of
https://github.com/NixOS/nix.git
synced 2025-11-09 03:56:01 +01:00
flake: Apply nixfmt 1.0.0
This commit is contained in:
parent
2c57edd677
commit
448bbbe0fd
14 changed files with 184 additions and 187 deletions
|
|
@ -38,8 +38,7 @@ let
|
|||
]
|
||||
++ extraPkgs;
|
||||
|
||||
users =
|
||||
{
|
||||
users = {
|
||||
|
||||
root = {
|
||||
uid = 0;
|
||||
|
|
@ -82,8 +81,7 @@ let
|
|||
}) (lib.lists.range 1 32)
|
||||
);
|
||||
|
||||
groups =
|
||||
{
|
||||
groups = {
|
||||
root.gid = 0;
|
||||
nixbld.gid = 30000;
|
||||
nobody.gid = 65534;
|
||||
|
|
|
|||
|
|
@ -148,7 +148,8 @@ let
|
|||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
] ++ prevAttrs.nativeBuildInputs or [ ];
|
||||
]
|
||||
++ prevAttrs.nativeBuildInputs or [ ];
|
||||
mesonCheckFlags = prevAttrs.mesonCheckFlags or [ ] ++ [
|
||||
"--print-errorlogs"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -46,8 +46,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
libs =
|
||||
{
|
||||
libs = {
|
||||
inherit
|
||||
nix-util
|
||||
nix-util-c
|
||||
|
|
@ -63,7 +62,8 @@ let
|
|||
nix-cmd
|
||||
;
|
||||
}
|
||||
// lib.optionalAttrs
|
||||
//
|
||||
lib.optionalAttrs
|
||||
(!stdenv.hostPlatform.isStatic && stdenv.buildPlatform.canExecute stdenv.hostPlatform)
|
||||
{
|
||||
# Currently fails in static build
|
||||
|
|
@ -125,8 +125,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
*/
|
||||
dontFixup = true;
|
||||
|
||||
checkInputs =
|
||||
[
|
||||
checkInputs = [
|
||||
# Make sure the unit tests have passed
|
||||
nix-util-tests.tests.run
|
||||
nix-store-tests.tests.run
|
||||
|
|
@ -137,8 +136,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
# Make sure the functional tests have passed
|
||||
nix-functional-tests
|
||||
]
|
||||
++ lib.optionals
|
||||
(!stdenv.hostPlatform.isStatic && stdenv.buildPlatform.canExecute stdenv.hostPlatform)
|
||||
++
|
||||
lib.optionals (!stdenv.hostPlatform.isStatic && stdenv.buildPlatform.canExecute stdenv.hostPlatform)
|
||||
[
|
||||
# Perl currently fails in static build
|
||||
# TODO: Split out tests into a separate derivation?
|
||||
|
|
|
|||
|
|
@ -53,7 +53,8 @@ mkMesonLibrary (finalAttrs: {
|
|||
|
||||
buildInputs = [
|
||||
({ inherit editline readline; }.${readlineFlavor})
|
||||
] ++ lib.optional enableMarkdown lowdown;
|
||||
]
|
||||
++ lib.optional enableMarkdown lowdown;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
nix-util
|
||||
|
|
|
|||
|
|
@ -70,13 +70,15 @@ mkMesonLibrary (finalAttrs: {
|
|||
nix-util
|
||||
nix-store
|
||||
nix-fetchers
|
||||
] ++ finalAttrs.passthru.externalPropagatedBuildInputs;
|
||||
]
|
||||
++ finalAttrs.passthru.externalPropagatedBuildInputs;
|
||||
|
||||
# Hack for sake of the dev shell
|
||||
passthru.externalPropagatedBuildInputs = [
|
||||
boost
|
||||
nlohmann_json
|
||||
] ++ lib.optional enableGC boehmgc;
|
||||
]
|
||||
++ lib.optional enableGC boehmgc;
|
||||
|
||||
mesonFlags = [
|
||||
(lib.mesonEnable "gc" enableGC)
|
||||
|
|
|
|||
|
|
@ -58,8 +58,7 @@ mkMesonLibrary (finalAttrs: {
|
|||
|
||||
nativeBuildInputs = lib.optional embeddedSandboxShell unixtools.hexdump;
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
buildInputs = [
|
||||
boost
|
||||
curl
|
||||
sqlite
|
||||
|
|
@ -74,8 +73,7 @@ mkMesonLibrary (finalAttrs: {
|
|||
nlohmann_json
|
||||
];
|
||||
|
||||
mesonFlags =
|
||||
[
|
||||
mesonFlags = [
|
||||
(lib.mesonEnable "seccomp-sandboxing" stdenv.hostPlatform.isLinux)
|
||||
(lib.mesonBool "embedded-sandbox-shell" embeddedSandboxShell)
|
||||
]
|
||||
|
|
|
|||
|
|
@ -50,7 +50,8 @@ mkMesonLibrary (finalAttrs: {
|
|||
libblake3
|
||||
libsodium
|
||||
openssl
|
||||
] ++ lib.optional stdenv.hostPlatform.isx86_64 libcpuid;
|
||||
]
|
||||
++ lib.optional stdenv.hostPlatform.isx86_64 libcpuid;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
boost
|
||||
|
|
|
|||
|
|
@ -45,7 +45,8 @@ perl.pkgs.toPerlModule (
|
|||
|
||||
buildInputs = [
|
||||
nix-store
|
||||
] ++ finalAttrs.passthru.externalBuildInputs;
|
||||
]
|
||||
++ finalAttrs.passthru.externalBuildInputs;
|
||||
|
||||
# Hack for sake of the dev shell
|
||||
passthru.externalBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,8 +2,7 @@ with import ./lib.nix;
|
|||
|
||||
let
|
||||
|
||||
attrs =
|
||||
{
|
||||
attrs = {
|
||||
y = "y";
|
||||
x = "x";
|
||||
foo = "foo";
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
let {
|
||||
as =
|
||||
{
|
||||
as = {
|
||||
x = 123;
|
||||
y = 456;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
let {
|
||||
as =
|
||||
{
|
||||
as = {
|
||||
x = 123;
|
||||
y = 456;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,8 @@ let
|
|||
scopedImport = attrs: fn: scopedImport (overrides // attrs) fn;
|
||||
|
||||
builtins = builtins // overrides;
|
||||
} // import ./lib.nix;
|
||||
}
|
||||
// import ./lib.nix;
|
||||
|
||||
in
|
||||
scopedImport overrides ./imported.nix
|
||||
|
|
|
|||
|
|
@ -6,8 +6,7 @@ mkDerivation {
|
|||
name = "nested-sandboxing";
|
||||
busybox = builtins.getEnv "busybox";
|
||||
EXTRA_SANDBOX = builtins.getEnv "EXTRA_SANDBOX";
|
||||
buildCommand =
|
||||
''
|
||||
buildCommand = ''
|
||||
set -x
|
||||
set -eu -o pipefail
|
||||
''
|
||||
|
|
|
|||
|
|
@ -46,8 +46,7 @@ mkMesonDerivation (
|
|||
];
|
||||
|
||||
# Hack for sake of the dev shell
|
||||
passthru.externalNativeBuildInputs =
|
||||
[
|
||||
passthru.externalNativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue