Update sources (#1125)

* Update sources * rm upstreamed --------- Co-authored-by: UpdateBot <[email protected]>
nix-ocaml · Oct 26, 2023 · 0c92841 · 0c92841
1 parent dab0002
commit 0c92841
Show file tree

Hide file tree

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

diff --git a/ocaml/default.nix b/ocaml/default.nix
@@ -408,13 +408,6 @@ with oself;
     buildPhase = "${topkg.buildPhase} --with-cmdliner true";
   });
 
-  carton = osuper.carton.overrideAttrs (_: {
-    src = builtins.fetchurl {
-      url = https://github.com/mirage/ocaml-git/releases/download/carton-v0.7.0/git-carton-v0.7.0.tbz;
-      sha256 = "1y8fybp97csszdzjqpm2bkhv4xklxk619sqc2d198rpqscjh2sdx";
-    };
-  });
-
   caqti = osuper.caqti.overrideAttrs (o: {
     version = "2.0.1";
     src = fetchFromGitHub {
@@ -2515,13 +2508,6 @@ with oself;
 
   why3 = callPackage ./why3 { inherit nixpkgs; };
 
-  yojson = osuper.yojson.overrideAttrs (_: {
-    src = builtins.fetchurl {
-      url = https://github.com/ocaml-community/yojson/releases/download/2.1.1/yojson-2.1.1.tbz;
-      sha256 = "0ww1x289g01qb8bw9nf077hzjd2c0xp0cfb2hrjw138rgch870fm";
-    };
-  });
-
   yuscii = disableTests osuper.yuscii;
 
   zarith = (osuper.zarith.override { gmp = gmp-oc; }).overrideAttrs (_: {