diff --git a/flake.lock b/flake.lock index c332d822..0cb8ebf6 100644 --- a/flake.lock +++ b/flake.lock @@ -2,17 +2,17 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1733881728, - "narHash": "sha256-E/NfKTNHvBBjBHdSv1Dgn5kRzJcymH/xgXZ3sGoHmV8=", + "lastModified": 1734014226, + "narHash": "sha256-RcDCLav9GZYWYGoPcU5LzDxrqdDO+a4UYg4pSDyfV9c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "26baeceed3a5ab67791b1456ff710fe97b661639", + "rev": "0b04b1f3548f38d045f46821d8f41cab5680fed7", "type": "github" }, "original": { "owner": "NixOS", "repo": "nixpkgs", - "rev": "26baeceed3a5ab67791b1456ff710fe97b661639", + "rev": "0b04b1f3548f38d045f46821d8f41cab5680fed7", "type": "github" } }, diff --git a/flake.nix b/flake.nix index a0acca18..708fb044 100644 --- 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 index 25d9d5a6..49440a3c 100644 --- 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 index 817dcc95..37adc731 100644 --- 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";