Skip to content

build: update merlin and nix deps #915

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
Jan 31, 2026
Merged

build: update merlin and nix deps #915

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
14 changes: 7 additions & 7 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.

89 changes: 63 additions & 26 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,43 @@
nixpkgs.url = "github:nix-ocaml/nix-overlays";
};

outputs = { self, nixpkgs }:
outputs =
{ self, nixpkgs }:
let
forAllSystems = f: nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed (system:
let
pkgs = nixpkgs.legacyPackages.${system}.extend (self: super: {
ocamlPackages = super.ocaml-ng.ocamlPackages_5_2;
});
in
f pkgs);
forAllSystems =
f:
nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed (
system:
let
pkgs = nixpkgs.legacyPackages.${system}.extend (
self: super: {
ocamlPackages = super.ocaml-ng.ocamlPackages_5_4;
}
);
in
f pkgs
);
in
{
packages = forAllSystems (pkgs:
packages = forAllSystems (
pkgs:
let
inherit (pkgs.ocamlPackages)
buildDunePackage melange merlin ppxlib_gt_0_37 reason;
buildDunePackage
melange
merlin
ppxlib_gt_0_37
reason
;
packages = rec {
reason-react-ppx = buildDunePackage {
pname = "reason-react-ppx";
version = "n/a";

src =
let fs = pkgs.lib.fileset; in
let
fs = pkgs.lib.fileset;
in
fs.toSource {
root = ./.;
fileset = fs.unions [
Expand All @@ -48,7 +63,9 @@
version = "n/a";

src =
let fs = pkgs.lib.fileset; in
let
fs = pkgs.lib.fileset;
in
fs.toSource {
root = ./.;
fileset = fs.unions [
Expand All @@ -61,28 +78,47 @@
};

doCheck = true;
nativeBuildInputs = [ melange reason ];
propagatedBuildInputs = [ melange reason-react-ppx ];
nativeBuildInputs = [
melange
reason
];
propagatedBuildInputs = [
melange
reason-react-ppx
];
};
};
in
packages // { default = packages.reason-react; });
packages // { default = packages.reason-react; }
);

devShells = forAllSystems (pkgs:
devShells = forAllSystems (
pkgs:
let
makeDevShell = { packages, release-mode ? false }:
makeDevShell =
{
packages,
release-mode ? false,
}:
pkgs.mkShell {
dontDetectOcamlConflicts = true;
inputsFrom = pkgs.lib.attrValues packages;
nativeBuildInputs =
with pkgs.ocamlPackages; [ ocamlformat pkgs.nodejs_latest ]
++ pkgs.lib.optionals release-mode (with pkgs; [
cacert
curl
ocamlPackages.dune-release
ocamlPackages.odoc
git
]);
with pkgs.ocamlPackages;
[
ocamlformat
pkgs.nodejs_24
]
++ pkgs.lib.optionals release-mode (
with pkgs;
[
cacert
curl
ocamlPackages.dune-release
ocamlPackages.odoc
git
]
);
propagatedBuildInputs = with pkgs.ocamlPackages; [ merlin ];
};
packages = self.packages.${pkgs.stdenv.hostPlatform.system};
Expand All @@ -93,6 +129,7 @@
inherit packages;
release-mode = true;
};
});
}
);
};
}