Make progress on 4.12 build, update sources (#16)

nix-ocaml · Jan 31, 2021 · 9eb05ce · 9eb05ce
1 parent 50a9075
commit 9eb05ce
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 68 deletions.
diff --git a/ci.nix b/ci.nix
@@ -32,12 +32,16 @@ let
 
     # linking issues?
     "ocaml_libvirt" "ocaml-r" "tsdl" "owee" "spacetime_lib" "prof_spacetime"
+    "mariadb" "caqti-driver-mariadb"
 
     # not ppxlib >= 0.18 compatible (I don't use these, so I haven't bothered
     # to fix them)
     "ppx_bitstring" "ppx_irmin" "ppx_deriving_rpc" "rpclib-lwt" "pgocaml_ppx"
     "elpi" "eliom" "ocsigen-toolkit"
     "ppx_import" # mystery
+
+    # broken on 4.12
+    "ocaml-lsp" "batteries"
   ];
 
 in

diff --git a/ocaml/caqti/default.nix b/ocaml/caqti/default.nix
diff --git a/ocaml/default.nix b/ocaml/default.nix
@@ -14,10 +14,6 @@ let
     ocamlVersion = osuper.ocaml.version;
   };
 
-  caqti-packages = callPackage ./caqti {
-    ocamlPackages = oself;
-  };
-
   cookiePackages = callPackage ./cookie {
     ocamlPackages = oself;
   };
@@ -122,7 +118,6 @@ let
 in
   alcotestPackages //
   archiPackages //
-  caqti-packages //
   cookiePackages //
   cstructPackages //
   dataloader-packages //
@@ -276,6 +271,13 @@ in
       };
     });
 
+    merlin = osuper.merlin.overrideAttrs (_: {
+      src = builtins.fetchurl {
+        url = https://github.com/ocaml/merlin/archive/487eb6f.tar.gz;
+        sha256 = "0jy5ixzlhplx7yy7l9wlq2ix9j5a1w4mj7q8rggz0y95wp6xprnh";
+      };
+    });
+
     mirage-clock = osuper.mirage-clock.overrideAttrs (o: {
       buildInputs = o.buildInputs ++ [ dune-configurator ];
     });
@@ -320,8 +322,22 @@ in
       propagatedBuildInputs = [stdlib-shims];
     };
 
+    ocp-build = osuper.ocp-build.overrideAttrs (_: {
+      src = builtins.fetchurl {
+        url = https://github.com/OCamlPro/ocp-build/archive/104e4656ca6dba9edb03b62539c9f1e10abcaae8.tar.gz;
+        sha256 = "01qn6w6dc1g4pr4s031jblx41vv635r29hkasvlc71c5zs2szvwy";
+      };
+    });
+
     ocplib-endian = callPackage ./ocplib-endian { ocamlPackages = oself; };
 
+    ocp-index = osuper.ocp-index.overrideAttrs (_: {
+      src = builtins.fetchurl {
+        url = https://github.com/OCamlPro/ocp-index/archive/0cac3767d76b3bc8ed9b2854ad01c8015f989b05.tar.gz;
+        sha256 = "162q3vvpv60902wvch5v61nky37mqgij7qnlkfv30g0wvpw1gx4a";
+      };
+    });
+
     parmap = osuper.parmap.overrideAttrs (o: {
       buildInputs = o.buildInputs ++ [ dune-configurator ];
     });
@@ -332,16 +348,9 @@ in
 
     ppx_rapper = callPackage ./ppx_rapper { ocamlPackages = oself; };
 
-    postgresql = buildDunePackage rec {
-      pname = "postgresql";
-      version = "4.6.3";
-      src = builtins.fetchurl {
-        url = "https://github.com/mmottl/postgresql-ocaml/releases/download/${version}/${pname}-${version}.tbz";
-        sha256 = "0ya1jl75w8dand9pj1a7sfb0nwi8ll15g5alpvfnn11vn60am01w";
-      };
-      nativeBuildInputs = [ dune-configurator ];
-      propagatedBuildInputs = [ libpq ];
-    };
+    postgresql = osuper.postgresql.overrideAttrs (o: {
+      buildInputs = o.buildInputs ++ [ dune-configurator ];
+    });
 
     ppxfind = callPackage ./ppxfind { ocamlPackages = oself; };
 

diff --git a/sources.nix b/sources.nix
@@ -3,8 +3,8 @@ args@{ overlays ? [ (import ./.) ], ... }:
 # `git ls-remote https://github.com/nixos/nixpkgs-channels nixos-unstable`
 
 import (builtins.fetchTarball {
-  name = "nixos-unstable-2021-01-26";
-  url = https://github.com/nixos/nixpkgs/archive/891f607d5301d6730cb1f9dcf3618bcb1ab7f10e.tar.gz;
-  sha256 = "1cr39f0sbr0h5d83dv1q34mcpwnkwwbdk5fqlyqp2mnxghzwssng";
+  name = "nixos-unstable-2021-01-30";
+  url = https://github.com/nixos/nixpkgs/archive/1b6764da4e600e66c896a6746ceaa038a40a8f2b.tar.gz;
+  sha256 = "0srpa9nx1xczzn2idg92s7asdz6vwv6x09gmnxkifgcanjwp57z4";
 }) (args // { inherit overlays; })