Update sources (#1778)

* Update sources * rm upstreamed --------- Co-authored-by: UpdateBot <[email protected]>
nix-ocaml · Nov 23, 2024 · c6c95d8 · c6c95d8
1 parent 486b0b6
commit c6c95d8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 12 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=a25e476c6a35d5fbc5c85754bba5eeba0ee3074e";
+    nixpkgs.url = "github:NixOS/nixpkgs?rev=72f68849662579c8d4e5d13bd4d400723a1d8edd";
     flake-utils.url = "github:numtide/flake-utils";
   };
 

diff --git a/ocaml/default.nix b/ocaml/default.nix
@@ -1506,13 +1506,6 @@ with oself;
     };
   });
 
-  merlin-extend = osuper.merlin-extend.overrideAttrs (_: {
-    src = builtins.fetchurl {
-      url = "https://github.com/let-def/merlin-extend/releases/download/v0.6.2/merlin-extend-0.6.2.tbz";
-      sha256 = "0yfpyjqf0j3qmnv5490ksnhcyfhkhzvvfby8p7r64i5n61zqwma7";
-    };
-  });
-
   merlin-lib =
     if lib.versionAtLeast ocaml.version "4.14" then
       callPackage ./merlin/lib.nix { }