File tree Expand file tree Collapse file tree 19 files changed +107
-87
lines changed Expand file tree Collapse file tree 19 files changed +107
-87
lines changed Original file line number Diff line number Diff line change
1
+ use flake .# dev-nix
Original file line number Diff line number Diff line change 7
7
} ;
8
8
9
9
# Makes it available in the system agnostic `lib` argument.
10
- config . _module . args . lib = config . flake . lib // {
11
- inherit ( config ) lbf-nix ;
12
- } ;
10
+ config = {
11
+ _module . args . lib = config . flake . lib // {
12
+ inherit ( config ) lbf-nix ;
13
+ } ;
13
14
14
- # Sets the above set option to system ones.
15
- config . lbf-nix = lib . genAttrs config . systems ( system : ( config . perSystem system ) . lbf-nix ) ;
15
+ # Sets the above set option to system ones.
16
+ lbf-nix = lib . genAttrs config . systems ( system : ( config . perSystem system ) . lbf-nix ) ;
16
17
17
- # Makes `lib.x86_64-linux.xyz` available
18
- config . flake . lib = config . lbf-nix ;
18
+ # Makes `lib.x86_64-linux.xyz` available
19
+ flake . lib = config . lbf-nix ;
20
+ } ;
19
21
20
22
options = {
21
23
30
32
31
33
# Sets a per system `lbf-nix` option.
32
34
config = {
35
+ devShells . dev-nix = pkgs . mkShell {
36
+ name = "dev-nix" ;
37
+ shellHook = config . settings . shell . hook ;
38
+ buildInputs = config . settings . shell . tools ;
39
+ } ;
40
+
33
41
lbf-nix = {
34
42
# NOTE(bladyjoker): If you need to add a function the export externally and use internally via config.lbf-nix, add it here.
35
43
Original file line number Diff line number Diff line change 44
44
hlint = { } ;
45
45
cabal-fmt = { } ;
46
46
fourmolu = { } ;
47
+ weeder = { } ;
47
48
} ;
48
49
49
50
shellHook = lib . mkForce devShellHook ;
Original file line number Diff line number Diff line change 36
36
} ;
37
37
} ;
38
38
39
- devShell = purs . devShell ;
39
+ inherit ( purs ) devShell ;
40
40
} ;
41
41
in
42
42
mkFlake pursProjOpts . projectName ( pkgs . purescriptProject pursProjOpts )
Original file line number Diff line number Diff line change 84
84
'' ;
85
85
} ;
86
86
87
- packages . "${ crateName } -rust" = craneLib . buildPackage ( commonArgs // {
88
- inherit cargoArtifacts ;
89
- doCheck = false ;
90
- doInstallCargoArtifacts = true ;
91
- } ) ;
87
+ packages = {
88
+ "${ crateName } -rust" = craneLib . buildPackage ( commonArgs // {
89
+ inherit cargoArtifacts ;
90
+ doCheck = false ;
91
+ doInstallCargoArtifacts = true ;
92
+ } ) ;
92
93
93
- packages . "${ crateName } -rust-src" = vendoredSrc ;
94
+ "${ crateName } -rust-src" = vendoredSrc ;
94
95
95
- packages . "${ crateName } -rust-build-env" = buildEnv ;
96
+ "${ crateName } -rust-build-env" = buildEnv ;
97
+ } ;
96
98
97
- checks . "${ crateName } -rust-test" = craneLib . cargoNextest ( commonArgs // {
98
- inherit cargoArtifacts ;
99
- nativeBuildInputs = testTools ;
100
- } ) ;
99
+ checks = {
100
+ "${ crateName } -rust-test" = craneLib . cargoNextest ( commonArgs // {
101
+ inherit cargoArtifacts ;
102
+ nativeBuildInputs = testTools ;
103
+ } ) ;
101
104
102
- checks . "${ crateName } -rust-clippy" = craneLib . cargoClippy ( commonArgs // {
103
- inherit cargoArtifacts ;
104
- } ) ;
105
+ "${ crateName } -rust-clippy" = craneLib . cargoClippy ( commonArgs // {
106
+ inherit cargoArtifacts ;
107
+ } ) ;
108
+ } ;
105
109
}
Original file line number Diff line number Diff line change 146
146
'' ;
147
147
148
148
node2nixDevelop = node2nixExprs { extraFlags = [ "--development" ] ; } ;
149
- node2nixDevelopAttrs = ( ( import node2nixDevelop ) { inherit nodejs pkgs ; inherit ( pkgs ) system ; } ) ;
149
+ node2nixDevelopAttrs = ( import node2nixDevelop ) { inherit nodejs pkgs ; inherit ( pkgs ) system ; } ;
150
150
151
151
# Build the project (runs `npm run build`), and puts the entire output in the
152
152
# nix store
Original file line number Diff line number Diff line change 27
27
packages = builtins . listToAttrs ( builtins . map
28
28
( name : {
29
29
inherit name ;
30
- value . components . library . setupHaddockFlags = [ "--haddock-options=@${ responseFile } " ] ;
31
- value . components . library . ghcOptions = [ "-XFlexibleContexts" "-Wwarn" "-fplugin-opt=PlutusTx.Plugin:defer-errors" ] ;
32
- value . components . library . extraSrcFiles = [ responseFile ] ;
30
+ value . components . library = {
31
+ setupHaddockFlags = [ "--haddock-options=@${ responseFile } " ] ;
32
+ ghcOptions = [ "-XFlexibleContexts" "-Wwarn" "-fplugin-opt=PlutusTx.Plugin:defer-errors" ] ;
33
+ extraSrcFiles = [ responseFile ] ;
34
+ } ;
33
35
} )
34
36
l ) ;
35
37
} ;
Original file line number Diff line number Diff line change 7
7
then overrides . ${ name } . override val
8
8
else val
9
9
)
10
- ( ( builtins . mapAttrs ( name : val : if attrs ? ${ name } then attrs . ${ name } else val . default ) overrides ) // attrs ) ;
10
+ ( ( builtins . mapAttrs ( name : val : attrs . ${ name } or val . default ) overrides ) // attrs ) ;
11
11
# Makes a shell flag
12
12
# Example: `mkFlag "foo" "bar" = "--foo='bar'"`
13
13
mkFlag = key : value : "--${ key } =${ pkgs . lib . escapeShellArg "${ value } " } " ;
Original file line number Diff line number Diff line change 4
4
] ;
5
5
perSystem = { pkgs , ... } :
6
6
let
7
- rustfmt = pkgs . rust-bin . stable . latest . rustfmt ;
8
- deno = pkgs . deno ;
7
+ inherit ( pkgs . rust-bin . stable . latest ) rustfmt ;
8
+ inherit ( pkgs ) deno ;
9
9
in
10
10
{
11
11
pre-commit . settings . hooks = {
Original file line number Diff line number Diff line change 3
3
./extras/pre-commit-hooks-extra.nix
4
4
inputs . proto-nix . lib . preCommitModule
5
5
] ;
6
- perSystem = { config , ... } :
6
+ perSystem = { config , pkgs , ... } :
7
7
{
8
- devShells . dev-pre-commit = config . pre-commit . devShell ;
9
- devShells . default = config . pre-commit . devShell ;
8
+ devShells . default = pkgs . mkShell {
9
+ name = "dev-default" ;
10
+ buildInputs = config . settings . shell . tools ;
11
+ shellHook = config . settings . shell . hook ;
12
+ } ;
10
13
11
14
pre-commit = {
12
15
settings = {
13
16
excludes = [
17
+ ".*spago-packages.nix$"
14
18
"lambda-buffers-codegen/data/goldens/.*"
15
19
"lambda-buffers-codegen/data/lamval-cases/.*"
16
20
"experimental/archive/.*"
17
21
"experimental/ctl-env/autogen/.*"
18
22
"experimental/plutustx-env/autogen/.*"
19
- "experimental/ctl-env/spago-packages.nix"
20
23
"lambda-buffers-frontend/data/goldens/good/work-dir/.*"
21
- "docs/compiler-api.md"
22
24
"lambda-buffers-testsuite/lbt-prelude/goldens/.*"
23
- "runtimes/purescript/lbr-prelude/spago-packages.nix"
24
- ".*/spago-packages.nix$"
25
25
] ;
26
26
27
27
hooks = {
28
28
nixpkgs-fmt . enable = true ;
29
29
deadnix . enable = true ;
30
+ statix . enable = true ;
30
31
cabal-fmt . enable = true ;
31
32
fourmolu . enable = true ;
32
33
shellcheck . enable = true ;
45
46
46
47
settings = {
47
48
ormolu . cabalDefaultExtensions = true ;
49
+ statix . ignore = [ "**spago-packages.nix" ] ;
48
50
} ;
49
51
} ;
50
52
} ;
You can’t perform that action at this time.
0 commit comments