Skip to content

Commit 4f95a34

Browse files
authored
nix: remove nix-filter dependency (#874)
1 parent 4321639 commit 4f95a34

File tree

2 files changed

+28
-42
lines changed

2 files changed

+28
-42
lines changed

flake.lock

Lines changed: 0 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22
description = "Reason React Nix Flake";
33

44
inputs = {
5-
nix-filter.url = "github:numtide/nix-filter";
65
nixpkgs.url = "github:nix-ocaml/nix-overlays";
76
};
87

9-
outputs = { self, nixpkgs, nix-filter }:
8+
outputs = { self, nixpkgs }:
109
let
1110
forAllSystems = f: nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed (system:
1211
let
@@ -29,39 +28,42 @@
2928
reason-react-ppx = buildDunePackage {
3029
pname = "reason-react-ppx";
3130
version = "n/a";
32-
src = with nix-filter.lib; filter {
33-
root = ./.;
34-
include = [
35-
"dune-project"
36-
"dune"
37-
"reason-react-ppx.opam"
38-
"reason-react.opam"
39-
"ppx"
40-
];
41-
};
31+
32+
src =
33+
let fs = pkgs.lib.fileset; in
34+
fs.toSource {
35+
root = ./.;
36+
fileset = fs.unions [
37+
./dune-project
38+
./dune
39+
./reason-react-ppx.opam
40+
./ppx
41+
];
42+
};
43+
4244
# Due to a Reason version mismatch, the generated OCaml PPX diff
4345
# looks different
4446
doCheck = false;
45-
checkInputs = [ ];
46-
checkPhase = "dune build @runtest -p reason-react,reason-react-ppx";
47-
nativeCheckInputs = [ reason merlin pkgs.jq ];
4847
propagatedBuildInputs = [ ppxlib ];
4948
};
5049

5150
reason-react = buildDunePackage {
5251
pname = "reason-react";
5352
version = "n/a";
54-
src = with nix-filter.lib; filter {
55-
root = ./.;
56-
include = [
57-
"dune-project"
58-
"dune"
59-
"reason-react-ppx.opam"
60-
"reason-react.opam"
61-
"src"
62-
"test"
63-
];
64-
};
53+
54+
src =
55+
let fs = pkgs.lib.fileset; in
56+
fs.toSource {
57+
root = ./.;
58+
fileset = fs.unions [
59+
./dune-project
60+
./dune
61+
./reason-react.opam
62+
./src
63+
./test
64+
];
65+
};
66+
6567
doCheck = true;
6668
nativeBuildInputs = [ melange reason ];
6769
propagatedBuildInputs = [ melange reason-react-ppx ];

0 commit comments

Comments
 (0)