Skip to content

nix: remove nix-filter dependency #874

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anmonteiro merged 1 commit into from
Feb 10, 2025
Merged

nix: remove nix-filter dependency #874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

54 changes: 28 additions & 26 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@
description = "Reason React Nix Flake";

inputs = {
nix-filter.url = "github:numtide/nix-filter";
nixpkgs.url = "github:nix-ocaml/nix-overlays";
};

outputs = { self, nixpkgs, nix-filter }:
outputs = { self, nixpkgs }:
let
forAllSystems = f: nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed (system:
let
Expand All @@ -29,39 +28,42 @@
reason-react-ppx = buildDunePackage {
pname = "reason-react-ppx";
version = "n/a";
src = with nix-filter.lib; filter {
root = ./.;
include = [
"dune-project"
"dune"
"reason-react-ppx.opam"
"reason-react.opam"
"ppx"
];
};

src =
let fs = pkgs.lib.fileset; in
fs.toSource {
root = ./.;
fileset = fs.unions [
./dune-project
./dune
./reason-react-ppx.opam
./ppx
];
};

# Due to a Reason version mismatch, the generated OCaml PPX diff
# looks different
doCheck = false;
checkInputs = [ ];
checkPhase = "dune build @runtest -p reason-react,reason-react-ppx";
nativeCheckInputs = [ reason merlin pkgs.jq ];
propagatedBuildInputs = [ ppxlib ];
};

reason-react = buildDunePackage {
pname = "reason-react";
version = "n/a";
src = with nix-filter.lib; filter {
root = ./.;
include = [
"dune-project"
"dune"
"reason-react-ppx.opam"
"reason-react.opam"
"src"
"test"
];
};

src =
let fs = pkgs.lib.fileset; in
fs.toSource {
root = ./.;
fileset = fs.unions [
./dune-project
./dune
./reason-react.opam
./src
./test
];
};

doCheck = true;
nativeBuildInputs = [ melange reason ];
propagatedBuildInputs = [ melange reason-react-ppx ];
Expand Down
Loading