Support multiple opam repositories.

.ocamlformat

@@ -1,4 +1,3 @@
-version = 0.24.1
 profile = conventional
 
 leading-nested-match-parens = false

TODO.md

@@ -112,6 +112,7 @@
   - Support easy building of any package without nix lock.
   - Support offline mode.
   - Prefetch packages to compute sha256 when md5 is used.
+  - Support multiple opam repositories.
 - [ ] Help debug nix paths (eg show opam repo path)
 - [x] When the scope is built but there was a pkg override do we still build the pkg? Must not.
 - [x] Replace hardcoded ocaml nix versions with a call to get currently available version from ocaml-ng.

bootstrap.nix

@@ -2,9 +2,9 @@
 
 let
   ocamlPackages = pkgs.ocaml-ng.ocamlPackages_4_14;
-  onix = import ../default.nix { inherit pkgs; };
+  onix = import ./default.nix { inherit pkgs; };
 in {
-  scope = onix.build { lockFile = ../onix-lock.nix; };
+  scope = onix.build { lockFile = ./onix-lock.nix; };
   lock = onix.lock {
     repoUrl =
       "https://github.com/ocaml/opam-repository.git#f3dcd527e82e83facb92cd2727651938cb9fecf9";

nix/api.nix

@@ -1,7 +1,7 @@
 { pkgs ? import <nixpkgs> { }, onix }:
 
 let
-  defaultRepoUrl = "https://github.com/ocaml/opam-repository.git";
+  defaultRepos = [ "https://github.com/ocaml/opam-repository.git" ];
   defaultLockFile = "onix-lock.json";
   defaultLogLevel = "debug";
   defaultOverlay = import ./overlays/default.nix pkgs;
@@ -283,6 +283,12 @@ let
         self: super: defaultOverlay self super // overrides self super;
     in scope.overrideScope' overlay;
 
+  joinRepositories = repositories:
+    pkgs.symlinkJoin {
+      name = "onix-opam-repo";
+      paths = map builtins.fetchGit repositories;
+    };
+
 in rec {
   private = { };
 
@@ -291,24 +297,26 @@ in rec {
     , withDoc ? false, withDevSetup ? false }:
     let
       onixLock = lib.importJSON lockFile;
-      repoPath = builtins.fetchGit onixLock.repository;
+      repositories = onixLock.repositories;
+      repoPath = joinRepositories repositories;
       deps = onixLock.packages;
       scope = buildScope {
         inherit projectRoot repoPath withTest withDoc withDevSetup;
       } deps;
     in applyOverrides scope overrides;
 
-  lock = { repoUrl ? defaultRepoUrl, resolutions ? null
+  lock = { repositories ? defaultRepos, resolutions ? null
     , lockFile ? defaultLockFile, logLevel ? defaultLogLevel, withTest ? false
     , withDoc ? false, withDevSetup ? false, opamFiles ? [ ] }:
     let
+      repositoriesStr = lib.strings.concatStringsSep "," repositories;
       opamFilesStr = lib.strings.concatStrings
         (map (f: " " + builtins.toString f) opamFiles);
     in pkgs.mkShell {
       buildInputs = [ onix ];
       shellHook = if isNull resolutions then ''
         onix lock \
-          --repo-url='${repoUrl}' \
+          --repositories='${repositoriesStr}' \
           --lock-file='${builtins.toString lockFile}' \
           --with-test=${builtins.toJSON withTest} \
           --with-doc=${builtins.toJSON withDoc} \
@@ -317,7 +325,7 @@ in rec {
         exit $?
       '' else ''
         onix lock \
-          --repo-url='${repoUrl}' \
+          --repositories='${repositoriesStr}' \
           --resolutions='${mkResolutionsArg resolutions}' \
           --lock-file='${builtins.toString lockFile}' \
           --with-test=${builtins.toJSON withTest} \

nix/overlays/default.nix

@@ -56,6 +56,13 @@ let
     #   '';
     # });
 
+    num = super.num.overrideAttrs (selfAttrs: superAttrs: {
+      postInstall = ''
+        mkdir -p "$out/lib/ocaml/4.14.0/site-lib/stublibs"
+        mv $out/lib/ocaml/4.14.0/site-lib/num/*.so "$out/lib/ocaml/4.14.0/site-lib/stublibs"
+      '';
+    });
+
   };
 
   darwin = {