diff --git a/pkgs/development/ocaml-modules/janestreet/0.15.nix b/pkgs/development/ocaml-modules/janestreet/0.15.nix index c25504d536a6..d9b0d004a77a 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.15.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.15.nix @@ -2,7 +2,6 @@ , fetchpatch , lib , openssl -, patdiff , zstd }: @@ -452,6 +451,15 @@ with self; propagatedBuildInputs = [ base sexplib0 ]; }; + patdiff = janePackage { + pname = "patdiff"; + hash = "0623a7n5r659rkxbp96g361mvxkcgc6x9lcbkm3glnppplk5kxr9"; + propagatedBuildInputs = [ core_unix patience_diff ocaml_pcre ]; + meta = { + description = "File Diff using the Patience Diff algorithm"; + }; + }; + patience_diff = janePackage { pname = "patience_diff"; hash = "17yrhn4qfi31m8g1ygb3m6i9z4fqd8f60fn6viazgx06s3x4xp3v"; diff --git a/pkgs/tools/misc/patdiff/default.nix b/pkgs/tools/misc/patdiff/default.nix deleted file mode 100644 index 2e84d0015d3a..000000000000 --- a/pkgs/tools/misc/patdiff/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ ocamlPackages }: - -with ocamlPackages; - -janePackage { - pname = "patdiff"; - hash = "0623a7n5r659rkxbp96g361mvxkcgc6x9lcbkm3glnppplk5kxr9"; - propagatedBuildInputs = [ core_unix patience_diff ocaml_pcre ]; - meta = { - description = "File Diff using the Patience Diff algorithm"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f60e268fc2e..66110b22d9a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4366,8 +4366,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - patdiff = callPackage ../tools/misc/patdiff { }; - patool = with python3Packages; toPythonApplication patool; pbgopy = callPackage ../tools/text/pbgopy { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 8add11f3d593..bbe7bdcc8c27 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1547,7 +1547,7 @@ let if lib.versionOlder "4.10.2" ocaml.version then import ../development/ocaml-modules/janestreet/0.15.nix { inherit self; - inherit (pkgs) fetchpatch lib openssl patdiff zstd; + inherit (pkgs) fetchpatch lib openssl zstd; } else if lib.versionOlder "4.08" ocaml.version then import ../development/ocaml-modules/janestreet/0.14.nix {