Skip to content

Commit dc5ef37

Browse files
anmonteiroSanderSpies
authored andcommitted
chore: update nix flake (#2692)
* chore: update nix flake * try debian-10 * update * try apt instead of apt-get * apt update
1 parent 545924f commit dc5ef37

File tree

3 files changed

+28
-38
lines changed

3 files changed

+28
-38
lines changed

.circleci/config.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ common_steps: &common_steps
1212
- run:
1313
name: "Install npm"
1414
command: |
15-
sudo apt-get install -y nodejs npm
15+
sudo apt update
16+
sudo apt install -y nodejs npm
1617
mkdir -p ~/.npm-global
1718
npm config set prefix $NPM_CONFIG_PREFIX
1819
- checkout
@@ -24,12 +25,12 @@ common_steps: &common_steps
2425
- run:
2526
name: "Initialize opam"
2627
command: |
27-
sudo apt-get install -y m4
28+
sudo apt install -y m4
2829
opam remote set-url default https://opam.ocaml.org
2930
- run:
3031
name: "Install deps"
3132
command: |
32-
sudo apt-get install -y pkg-config libncurses5-dev
33+
sudo apt install -y pkg-config libncurses5-dev
3334
opam update
3435
opam install -y dune menhir utop
3536
- run:
@@ -148,13 +149,14 @@ jobs:
148149
name: "Install npm"
149150
command: |
150151
curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash -
151-
sudo apt-get install -y nodejs
152+
sudo apt update
153+
sudo apt install -y nodejs
152154
mkdir -p ~/.npm-global
153155
npm config set prefix $NPM_CONFIG_PREFIX
154156
- run:
155157
name: "Install m4"
156158
command: |
157-
sudo apt-get install -y m4
159+
sudo apt install -y m4
158160
- restore_cache:
159161
<<: *esy_cache_key
160162
- restore_cache:

flake.lock

Lines changed: 18 additions & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@
33

44
inputs.nix-filter.url = "github:numtide/nix-filter";
55
inputs.flake-utils.url = "github:numtide/flake-utils";
6-
inputs.nixpkgs.url = "github:anmonteiro/nix-overlays";
6+
inputs.nixpkgs.url = "github:nix-ocaml/nix-overlays";
7+
inputs.nixpkgs.inputs.flake-utils.follows = "flake-utils";
78

89
outputs = { self, nixpkgs, flake-utils, nix-filter }:
910
flake-utils.lib.eachDefaultSystem (system:
1011
let
1112
pkgs = nixpkgs.legacyPackages."${system}".extend (self: super: {
12-
ocamlPackages = super.ocaml-ng.ocamlPackages_5_00;
13+
ocamlPackages = super.ocaml-ng.ocamlPackages_5_0;
1314
});
1415
in
1516
rec {

0 commit comments

Comments
 (0)