add format.sh from labs, reformat tree (#18)
Co-authored-by: Jake Hamilton <jake.hamilton@hey.com> Reviewed-on: #18 Co-authored-by: 5225225 <5225225@mailbox.org> Co-committed-by: 5225225 <5225225@mailbox.org>
This commit is contained in:
parent
f67099f486
commit
0959de9f48
5 changed files with 23 additions and 17 deletions
|
|
@ -2,8 +2,8 @@
|
|||
system ? builtins.currentSystem,
|
||||
}:
|
||||
let
|
||||
pins = import ./npins;
|
||||
lib = import pins.lib;
|
||||
pins = import ./npins;
|
||||
lib = import pins.lib;
|
||||
|
||||
modules = import ./src;
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
system:
|
||||
let
|
||||
result = lib.modules.run {
|
||||
modules = (builtins.attrValues modules) ++ [{ config.aux.system = system; }];
|
||||
modules = (builtins.attrValues modules) ++ [ { config.aux.system = system; } ];
|
||||
};
|
||||
export = result: result.config.exports.resolved.packages // { extend = extend result; };
|
||||
extend = result: overrides: export (result.extend overrides);
|
||||
|
|
|
|||
6
format.sh
Executable file
6
format.sh
Executable file
|
|
@ -0,0 +1,6 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -I "nixpkgs=https://github.com/nixos/nixpkgs/archive/nixos-unstable.tar.gz" -p nixfmt-rfc-style
|
||||
|
||||
files=$(find . -name "*.nix" -type f)
|
||||
|
||||
nixfmt ${1:-"--verify"} ${files}
|
||||
|
|
@ -25,19 +25,18 @@ in
|
|||
...
|
||||
}:
|
||||
let
|
||||
script =
|
||||
''
|
||||
target=''${out}''${destination}
|
||||
''
|
||||
+ lib.strings.when (builtins.dirOf destination == ".") ''
|
||||
mkdir -p ''${out}''${destinationDir}
|
||||
''
|
||||
+ ''
|
||||
cp ''${contentsPath} ''${target}
|
||||
''
|
||||
+ lib.strings.when isExecutable ''
|
||||
chmod 555 ''${target}
|
||||
'';
|
||||
script = ''
|
||||
target=''${out}''${destination}
|
||||
''
|
||||
+ lib.strings.when (builtins.dirOf destination == ".") ''
|
||||
mkdir -p ''${out}''${destinationDir}
|
||||
''
|
||||
+ ''
|
||||
cp ''${contentsPath} ''${target}
|
||||
''
|
||||
+ lib.strings.when isExecutable ''
|
||||
chmod 555 ''${target}
|
||||
'';
|
||||
package = builtins.derivation (
|
||||
(builtins.removeAttrs settings [
|
||||
"meta"
|
||||
|
|
|
|||
|
|
@ -126,7 +126,8 @@ in
|
|||
"-DNO_OUTPUT_SYNC=1"
|
||||
# mes-libc doesn't define O_TMPFILE
|
||||
"-DO_TMPFILE=020000000"
|
||||
] ++ config;
|
||||
]
|
||||
++ config;
|
||||
|
||||
sources = {
|
||||
# Maintenance note: list of source files derived from Basic.mk
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue