Skip to content
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.

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

chore: update nix flake #2692

Merged
merged 5 commits into from
Mar 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 7 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ common_steps: &common_steps
- run:
name: "Install npm"
command: |
sudo apt-get install -y nodejs npm
sudo apt update
sudo apt install -y nodejs npm
mkdir -p ~/.npm-global
npm config set prefix $NPM_CONFIG_PREFIX
- checkout
Expand All @@ -24,12 +25,12 @@ common_steps: &common_steps
- run:
name: "Initialize opam"
command: |
sudo apt-get install -y m4
sudo apt install -y m4
opam remote set-url default https://opam.ocaml.org
- run:
name: "Install deps"
command: |
sudo apt-get install -y pkg-config libncurses5-dev
sudo apt install -y pkg-config libncurses5-dev
opam update
opam install -y dune menhir utop
- run:
Expand Down Expand Up @@ -148,13 +149,14 @@ jobs:
name: "Install npm"
command: |
curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash -
sudo apt-get install -y nodejs
sudo apt update
sudo apt install -y nodejs
mkdir -p ~/.npm-global
npm config set prefix $NPM_CONFIG_PREFIX
- run:
name: "Install m4"
command: |
sudo apt-get install -y m4
sudo apt install -y m4
- restore_cache:
<<: *esy_cache_key
- restore_cache:
Expand Down
49 changes: 18 additions & 31 deletions flake.lock

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

5 changes: 3 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@

inputs.nix-filter.url = "github:numtide/nix-filter";
inputs.flake-utils.url = "github:numtide/flake-utils";
inputs.nixpkgs.url = "github:anmonteiro/nix-overlays";
inputs.nixpkgs.url = "github:nix-ocaml/nix-overlays";
inputs.nixpkgs.inputs.flake-utils.follows = "flake-utils";

outputs = { self, nixpkgs, flake-utils, nix-filter }:
flake-utils.lib.eachDefaultSystem (system:
let
pkgs = nixpkgs.legacyPackages."${system}".extend (self: super: {
ocamlPackages = super.ocaml-ng.ocamlPackages_5_00;
ocamlPackages = super.ocaml-ng.ocamlPackages_5_0;
});
in
rec {
Expand Down