Skip to content

Commit

Permalink
fix nix workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
anmonteiro committed Aug 16, 2024
1 parent 4afc0bc commit d95fd08
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 77 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
ocamlVersion: [5_1]
ocamlVersion: [5_2]
steps:
- uses: actions/checkout@v2
- uses: cachix/install-nix-action@v21
Expand Down
79 changes: 13 additions & 66 deletions flake.lock

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

17 changes: 7 additions & 10 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,14 @@
url = "github:nix-ocaml/nix-overlays";
inputs.flake-utils.follows = "flake-utils";
};
inputs.melange-src = {
url = "github:melange-re/melange";
inputs.nix-filter.follows = "nix-filter";
inputs.flake-utils.follows = "flake-utils";
inputs.nixpkgs.follows = "nixpkgs";
};

outputs = { self, nixpkgs, flake-utils, nix-filter, melange-src }:
outputs = { self, nixpkgs, flake-utils, nix-filter }:
flake-utils.lib.eachDefaultSystem (system:
let
pkgs = nixpkgs.legacyPackages."${system}".appendOverlays [
(self: super: {
ocamlPackages = super.ocaml-ng.ocamlPackages_5_1;
ocamlPackages = super.ocaml-ng.ocamlPackages_5_2;
})
melange-src.overlays.default
];
inherit (pkgs) nodejs_latest lib stdenv darwin;

Expand All @@ -31,7 +24,11 @@

src = ./.;
nativeBuildInputs = with pkgs.ocamlPackages; [ melange ];
propagatedBuildInputs = with pkgs.ocamlPackages; [ melange ];
propagatedBuildInputs = with pkgs.ocamlPackages; [
melange
yojson
ppxlib
];
};

mkShell = { buildInputs ? [ ] }: pkgs.mkShell {
Expand Down

0 comments on commit d95fd08

Please sign in to comment.