Update sources (#1821)

* Update sources * rm upstreamed --------- Co-authored-by: UpdateBot <[email protected]>
nix-ocaml · Dec 13, 2024 · 348b3e1 · 348b3e1
1 parent a8805f1
commit 348b3e1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 20 deletions.
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=26baeceed3a5ab67791b1456ff710fe97b661639";
+    nixpkgs.url = "github:NixOS/nixpkgs?rev=0b04b1f3548f38d045f46821d8f41cab5680fed7";
   };
 
   outputs = { self, nixpkgs }:

diff --git a/ocaml/default.nix b/ocaml/default.nix
@@ -2561,6 +2561,10 @@ with oself;
   timere = callPackage ./timere/default.nix { };
   timere-parse = callPackage ./timere/parse.nix { };
 
+  tls-eio =
+    if lib.versionAtLeast ocaml.version "5.0"
+    then osuper.tls-eio else null;
+
   torch = osuper.torch.overrideAttrs (o: {
     src = fetchFromGitHub {
       owner = "janestreet";
@@ -2675,15 +2679,6 @@ with oself;
     propagatedBuildInputs = [ uspf ];
   };
 
-  utop = osuper.utop.overrideAttrs (_: {
-    src = fetchFromGitHub {
-      owner = "ocaml-community";
-      repo = "utop";
-      rev = "2.15.0";
-      hash = "sha256-wfsMBx+2XPkgl+V2NCXBZ4X3wZa75bX7QnXsMrqysTw=";
-    };
-  });
-
   uutf = osuper.uutf.overrideAttrs (_: {
     pname = "uutf";
     patches = if isFlambda2 then [ ./uutf-locals.patch ] else [ ];

diff --git a/ocaml/ocaml5.nix b/ocaml/ocaml5.nix
@@ -164,12 +164,6 @@ with oself;
     };
   };
 
-  tls-eio = buildDunePackage {
-    pname = "tls-eio";
-    inherit (tls) version src;
-    propagatedBuildInputs = [ tls mirage-crypto-rng mirage-crypto-rng-eio x509 eio ];
-  };
-
   wayland = osuper.wayland.overrideAttrs (o: {
     src = builtins.fetchurl {
       url = "https://github.com/talex5/ocaml-wayland/releases/download/v2.0/wayland-2.0.tbz";