Update sources (#1371)

* Update sources * rm upstreamed --------- Co-authored-by: UpdateBot <[email protected]>
nix-ocaml · Apr 6, 2024 · d2507b7 · d2507b7
1 parent ec7e132
commit d2507b7
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 23 deletions.
diff --git a/ci/filter.nix b/ci/filter.nix
@@ -81,9 +81,6 @@ let
     # Incompatible with omd 2.0
     "sail"
 
-    # Incompatible with ppxlib >= 0.31
-    "vcaml"
-
     # Doesn't build on 4.14. Re-enable when we remove 4.14
     "asai"
 

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -7,7 +7,7 @@
   };
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs?rev=61dbcaec5f100a6034cbc2fc6a7dffa5ade1a42d";
+    nixpkgs.url = "github:NixOS/nixpkgs?rev=d9d5b4dc496f827eec3d6ba9cd64ea45177456b3";
     flake-utils.url = "github:numtide/flake-utils";
   };
 

diff --git a/ocaml/default.nix b/ocaml/default.nix
@@ -89,6 +89,7 @@ let
       lib
       kerberos
       linuxHeaders
+      nixpkgs
       pam
       net-snmp;
     zstd = zstd-oc;
@@ -1448,13 +1449,6 @@ with oself;
     '';
   });
 
-  ocaml-version = osuper.ocaml-version.overrideAttrs (_: {
-    src = builtins.fetchurl {
-      url = https://github.com/ocurrent/ocaml-version/releases/download/v3.6.5/ocaml-version-3.6.5.tbz;
-      sha256 = "1lnzz7m0g8zc4kx11acf7x7v6zkl403x760hjwdddksw8abzcww4";
-    };
-  });
-
   ocamlformat-lib = osuper.ocamlformat-lib.overrideAttrs (_: {
     src = fetchFromGitHub {
       owner = "ocaml-ppx";
@@ -1887,9 +1881,6 @@ with oself;
   ppx_cstubs = osuper.ppx_cstubs.overrideAttrs (o: {
     buildInputs = o.buildInputs ++ [ findlib ];
     postPatch = ''
-      substituteInPlace src/internal/ppxc__script_real.ml \
-        --replace-fail "C_content_make ()" "C_content_make (struct end)"
-
       ${lib.optionalString (lib.versionOlder "5.2" ocaml.version) ''
         substituteInPlace src/custom/ppx_cstubs_custom.cppo.ml \
         --replace-fail "init_code fun_code" "init_code" \
@@ -1973,7 +1964,7 @@ with oself;
     then null
     else osuper.ppx_tools;
 
-  ppxlib = osuper.ppxlib.overrideAttrs (_: {
+  ppxlib = osuper.ppxlib.overrideAttrs (o: {
     src =
       if lib.versionAtLeast osuper.ocaml.version "5.2" then
         fetchFromGitHub
@@ -1983,10 +1974,7 @@ with oself;
             rev = "04e050cbe2cf3e5cdb4441c480e4f472a5033941";
             hash = "sha256-+qMxLVWgltXKackhZGHm21XPJukAbKFtvU1wgk97fCs=";
           } else
-        builtins.fetchurl {
-          url = https://github.com/ocaml-ppx/ppxlib/releases/download/0.32.0/ppxlib-0.32.0.tbz;
-          sha256 = "0as2an2i9ygfbvswypqh165a664chd1j4yi5npp24pw9rwycfz2h";
-        };
+        o.src;
     propagatedBuildInputs = [
       ocaml-compiler-libs
       ppx_derivers

diff --git a/ocaml/janestreet-0.16.nix b/ocaml/janestreet-0.16.nix
@@ -5,6 +5,7 @@
 , fzf
 , lib
 , linuxHeaders
+, nixpkgs
 , pam
 , kerberos
 , net-snmp
@@ -1717,6 +1718,7 @@ with self;
       angstrom-async
       faraday
     ];
+    patches = [ "${nixpkgs}/pkgs/development/ocaml-modules/janestreet/vcaml.patch" ];
   };
 
   virtual_dom = janePackage {
-Original file line number
+Diff line change
@@ Expand Up / @@ -81,9 +81,6 @@ let @@
         # Incompatible with omd 2.0
         "sail"
-        # Incompatible with ppxlib >= 0.31
-        "vcaml"
         # Doesn't build on 4.14. Re-enable when we remove 4.14
         "asai"
@@ Expand Down @@