Skip to content

Commit f64c920

Browse files
nix: vendor ocaml-repository, nixpkgs, and flake-utils
1 parent 9caf643 commit f64c920

File tree

2 files changed

+39
-24
lines changed

2 files changed

+39
-24
lines changed

flake.lock

+21-20
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

+18-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,21 @@
11
{
22
inputs = {
3-
opam-nix.url = "github:tweag/opam-nix";
4-
flake-utils.follows = "opam-nix/flake-utils";
5-
nixpkgs.follows = "opam-nix/nixpkgs";
3+
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
4+
flake-utils.url = "github:numtide/flake-utils";
5+
6+
opam-nix = {
7+
url = "github:tweag/opam-nix";
8+
inputs = {
9+
nixpkgs.follows = "nixpkgs";
10+
flake-utils.follows = "flake-utils";
11+
opam-repository.follows = "opam-repository";
12+
};
13+
};
14+
15+
opam-repository = {
16+
url = "github:ocaml/opam-repository";
17+
flake = false;
18+
};
619

720
waq-external-repo = {
821
url = "github:ushitora-anqou/waq-external-repo";
@@ -16,6 +29,7 @@
1629
flake-utils,
1730
opam-nix,
1831
waq-external-repo,
32+
opam-repository,
1933
} @ inputs:
2034
flake-utils.lib.eachDefaultSystem (
2135
system: let
@@ -65,7 +79,7 @@
6579
./.;
6680
scope =
6781
on.buildOpamProject' {
68-
repos = [on.opamRepository waq-external-repo];
82+
repos = [opam-repository waq-external-repo];
6983
resolveArgs = {
7084
with-test = true;
7185
with-doc = true;

0 commit comments

Comments
 (0)