Skip to content

Commit 200b353

Browse files
committed
flake.nix: Refactor (DRY)
1 parent d066315 commit 200b353

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

flake.nix

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,19 @@
1919
exampleLock = builtins.fromJSON (builtins.readFile ./example/flake.lock);
2020
nixpkgs = "github:nixos/nixpkgs/" + exampleLock.nodes.nixpkgs.locked.rev;
2121
flake-parts = "github:hercules-ci/flake-parts/" + exampleLock.nodes.flake-parts.locked.rev;
22+
haskell-flake = ./.;
23+
haskell-parsers = ./nix/haskell-parsers;
2224
in
2325
{
2426
dev = {
2527
dir = "dev";
26-
overrideInputs."haskell-flake" = ./.;
28+
overrideInputs = { inherit haskell-flake; };
2729
};
2830

2931
doc = {
3032
dir = "doc";
3133
overrideInputs = {
32-
"haskell-flake" = ./.;
34+
inherit haskell-flake;
3335
# TODO: It is better to add a update-flake-lock.yaml CI action to
3436
# update this just like ./example inputs.
3537
"flake-parts-website" = "github:hercules-ci/flake.parts-website";
@@ -38,36 +40,33 @@
3840

3941
example = {
4042
dir = "example";
41-
overrideInputs."haskell-flake" = ./.;
43+
overrideInputs = { inherit haskell-flake; };
4244
};
4345

4446
# Tests
4547
haskell-parsers-test = {
4648
dir = ./nix/haskell-parsers/test;
47-
overrideInputs."haskell-parsers" = ./nix/haskell-parsers;
49+
overrideInputs = { inherit haskell-parsers; };
4850
};
4951

5052
test-simple = {
5153
dir = "test/simple";
5254
overrideInputs = {
53-
inherit nixpkgs flake-parts;
54-
"haskell-flake" = ./.;
55+
inherit nixpkgs flake-parts haskell-flake;
5556
};
5657
};
5758

5859
test-with-subdir = {
5960
dir = "test/with-subdir";
6061
overrideInputs = {
61-
inherit nixpkgs flake-parts;
62-
"haskell-flake" = ./.;
62+
inherit nixpkgs flake-parts haskell-flake;
6363
};
6464
};
6565

6666
test-project-module = {
6767
dir = "test/project-module";
6868
overrideInputs = {
69-
inherit nixpkgs flake-parts;
70-
"haskell-flake" = ./.;
69+
inherit nixpkgs flake-parts haskell-flake;
7170
};
7271
};
7372
};

0 commit comments

Comments
 (0)