Skip to content

chore(nix): some cleanups #1286

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
merged 1 commit into from
May 18, 2024
Merged

chore(nix): some cleanups #1286

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
24 changes: 12 additions & 12 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
};
ocamlVersionOverlay =
(ocaml: self: super: { ocamlPackages = ocaml super.ocaml-ng; });
makePackages = pkgs:
makeLocalPackages = pkgs:
let buildDunePackage = pkgs.ocamlPackages.buildDunePackage;
in rec {
jsonrpc = buildDunePackage (basePackage // {
Expand Down Expand Up @@ -110,7 +110,7 @@
in {
overlays.default = (final: prev: {
ocamlPackages = prev.ocamlPackages.overrideScope
(oself: osuper: with oself; makePackages final);
(oself: osuper: with oself; makeLocalPackages final);
});
} // (flake-utils.lib.eachDefaultSystem (system:
let
Expand All @@ -124,40 +124,40 @@
makeNixpkgs (ocaml: ocaml.ocamlPackages_4_14) inputs.merlin4_14;
pkgs_5_1 =
makeNixpkgs (ocaml: ocaml.ocamlPackages_5_1) inputs.merlin5_1;
packages_4_14 = makePackages pkgs_4_14;
packages_5_1 = makePackages pkgs_5_1;
localPackages_4_14 = makeLocalPackages pkgs_4_14;
localPackages_5_1 = makeLocalPackages pkgs_5_1;
ocamlformat = pkgs: pkgs.ocamlformat_0_26_1;
testDeps = pkgs:
with pkgs; [
(ocamlformat pkgs)
yarn
pkgs.ocamlPackages.ppx_expect
];
devShell = packages: nixpkgs:
devShell = localPackages: nixpkgs:
nixpkgs.mkShell {
buildInputs = testDeps nixpkgs ++ (with nixpkgs; [
ocamlPackages.utop
ocamlPackages.cinaps
ocamlPackages.ppx_yojson_conv
]);
inputsFrom = with packages; [ ocaml-lsp jsonrpc lsp ];
inputsFrom = builtins.atttrValues localPackages;
};
in {
packages = (packages_4_14 // { default = packages_4_14.ocaml-lsp; });
packages = (localPackages_4_14 // { default = localPackages_4_14.ocaml-lsp; });

devShells = {
default = devShell packages_4_14 pkgs_4_14;
default = devShell localPackages_4_14 pkgs_4_14;

ocaml5_1 = devShell packages_5_1 pkgs_5_1;
ocaml5_1 = devShell localPackages_5_1 pkgs_5_1;

release = pkgsWithoutOverlays.mkShell {
buildInputs = [ pkgsWithoutOverlays.dune-release ];
};

fmt = pkgsWithoutOverlays.mkShell {
# TODO: get rid of ocaml once dune get format without ocaml being
# present
buildInputs = [
# TODO: get rid of ocaml once dune get format without ocaml being
# present
pkgsWithoutOverlays.ocaml
(ocamlformat pkgsWithoutOverlays)
pkgsWithoutOverlays.yarn
Expand All @@ -167,7 +167,7 @@

check = pkgs_4_14.mkShell {
buildInputs = testDeps pkgs_4_14;
inputsFrom = with packages_4_14; [ ocaml-lsp jsonrpc lsp ];
inputsFrom = builtins.attrValues localPackages_4_14;
};
};
}));
Expand Down